added a menu to temporally change the outgoing encoding to the composition window.

git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@175 ee746299-78ed-0310-b773-934348b2243d
author: hiro <hiro@ee746299-78ed-0310-b773-934348b2243d> 2005-03-16 06:20:01 +0000
committer: hiro <hiro@ee746299-78ed-0310-b773-934348b2243d> 2005-03-16 06:20:01 +0000
commit: a2c35308bd6815962c36a3108cefe0069cdc1b33 (patch)
tree: fa7497d735e2904a35e91f167ad7c279f0436b4f /po
parent: 8d574b9f4ca411ae7e3303fae8e2d365e3ece9c9 (diff)
27 files changed, 14916 insertions, 13803 deletions
diff --git a/po/bg.po b/po/bg.po
index 77741d60..dbab64d8 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: 2005-03-15 14:29+0900\n"
+"POT-Creation-Date: 2005-03-16 14:47+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"
@@ -97,7 +97,7 @@ msgstr ""
 "в колонка `G' за разрешаване на изтегляне на съобщенията от `Get All'."
 
 #: src/account.c:638 src/addressadd.c:186 src/addressbook.c:488
-#: src/compose.c:3650 src/editaddress.c:195 src/editaddress.c:936
+#: src/compose.c:3748 src/editaddress.c:195 src/editaddress.c:936
 #: src/editaddress.c:984 src/editbook.c:191 src/editgroup.c:257
 #: src/editjpilot.c:296 src/editldap.c:300 src/editvcard.c:211
 #: src/mimeview.c:151 src/prefs_filter.c:214 src/prefs_folder_item.c:170
@@ -150,13 +150,13 @@ msgstr "Изтриване на акаунт"
 msgid "Do you really want to delete this account?"
 msgstr "Желаете ли да изтриете този акаунт?"
 
-#: src/account.c:758 src/compose.c:2551 src/compose.c:4807
+#: src/account.c:758 src/compose.c:2632 src/compose.c:4943
 #: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
 #: src/folderview.c:2156 src/folderview.c:2192
 msgid "Yes"
 msgstr "Да"
 
-#: src/account.c:758 src/compose.c:2551 src/compose.c:4807
+#: src/account.c:758 src/compose.c:2632 src/compose.c:4943
 #: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
 #: src/folderview.c:2156 src/folderview.c:2192
 msgid "+No"
@@ -261,7 +261,7 @@ msgstr "Потребителски аргумент на действието"
 msgid "Add Address to Book"
 msgstr "Добавяне на Адреса към Книгата"
 
-#: src/addressadd.c:196 src/compose.c:4191 src/editaddress.c:196
+#: src/addressadd.c:196 src/compose.c:4292 src/editaddress.c:196
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "Адрес"
@@ -275,7 +275,7 @@ msgstr "Забележки"
 msgid "Select Address Book Folder"
 msgstr "Изберете папка от адресната книга"
 
-#: src/addressbook.c:334 src/compose.c:469 src/mainwindow.c:454
+#: src/addressbook.c:334 src/compose.c:477 src/mainwindow.c:454
 #: src/messageview.c:134
 msgid "/_File"
 msgstr "/_Файл"
@@ -296,8 +296,8 @@ msgstr "/_Файл/Нов _JPilot"
 msgid "/_File/New _Server"
 msgstr "/_Файл/Нов _Сървър"
 
-#: src/addressbook.c:343 src/addressbook.c:346 src/compose.c:474
-#: src/compose.c:479 src/compose.c:483 src/mainwindow.c:471
+#: src/addressbook.c:343 src/addressbook.c:346 src/compose.c:482
+#: src/compose.c:487 src/compose.c:491 src/mainwindow.c:471
 #: src/mainwindow.c:474 src/mainwindow.c:476 src/mainwindow.c:479
 #: src/mainwindow.c:481 src/messageview.c:137
 msgid "/_File/---"
@@ -315,7 +315,7 @@ msgstr "/_Файл/_Изтриване"
 msgid "/_File/_Save"
 msgstr "/_файл/_Запазване"
 
-#: src/addressbook.c:348 src/compose.c:484 src/messageview.c:138
+#: src/addressbook.c:348 src/compose.c:492 src/messageview.c:138
 msgid "/_File/_Close"
 msgstr "/_Файл/_Затваряне"
 
@@ -347,7 +347,7 @@ msgstr "/_Адрес/_Редактиране"
 msgid "/_Address/_Delete"
 msgstr "/_Адрес/_Изтриване"
 
-#: src/addressbook.c:356 src/compose.c:585 src/mainwindow.c:688
+#: src/addressbook.c:356 src/compose.c:664 src/mainwindow.c:697
 #: src/messageview.c:246
 msgid "/_Tools"
 msgstr "/_Инструменти"
@@ -356,12 +356,12 @@ msgstr "/_Инструменти"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Инструменти/Внасяне на _LDIF файл"
 
-#: src/addressbook.c:358 src/compose.c:598 src/mainwindow.c:733
+#: src/addressbook.c:358 src/compose.c:677 src/mainwindow.c:742
 #: src/messageview.c:264
 msgid "/_Help"
 msgstr "/_Помощ"
 
-#: src/addressbook.c:359 src/compose.c:599 src/mainwindow.c:744
+#: src/addressbook.c:359 src/compose.c:678 src/mainwindow.c:753
 #: src/messageview.c:265
 msgid "/_Help/_About"
 msgstr "/_Помощ/_Относно"
@@ -378,7 +378,7 @@ msgstr "/Нова _Група"
 msgid "/New _Folder"
 msgstr "/Нова _Папка"
 
-#: src/addressbook.c:381 src/addressbook.c:391 src/compose.c:463
+#: src/addressbook.c:381 src/addressbook.c:391 src/compose.c:471
 #: src/folderview.c:220 src/folderview.c:222 src/folderview.c:226
 #: src/folderview.c:236 src/folderview.c:238 src/folderview.c:240
 #: src/folderview.c:244 src/folderview.c:254 src/folderview.c:256
@@ -388,7 +388,7 @@ msgstr "/Нова _Папка"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:382 src/addressbook.c:392 src/compose.c:486
+#: src/addressbook.c:382 src/addressbook.c:392 src/compose.c:494
 #: src/mainwindow.c:485 src/messageview.c:140
 msgid "/_Edit"
 msgstr "/_Редактиране"
@@ -401,7 +401,7 @@ msgstr "/_Изтриване"
 msgid "E-Mail address"
 msgstr "E-Mail адрес"
 
-#: src/addressbook.c:493 src/compose.c:4192 src/prefs_common.c:2186
+#: src/addressbook.c:493 src/compose.c:4293 src/prefs_common.c:2198
 msgid "Address book"
 msgstr "Адресна книга"
 
@@ -411,7 +411,7 @@ msgstr "Име:"
 
 #. Buttons
 #: src/addressbook.c:625 src/addressbook.c:1665 src/addressbook.c:1671
-#: src/editaddress.c:878 src/editaddress.c:1011 src/mainwindow.c:2212
+#: src/editaddress.c:878 src/editaddress.c:1011 src/mainwindow.c:2221
 #: src/prefs_actions.c:263 src/prefs_display_header.c:275
 #: src/prefs_display_header.c:330 src/prefs_template.c:227
 msgid "Delete"
@@ -605,7 +605,7 @@ msgstr "Публичен адрес"
 msgid "Personal address"
 msgstr "Личен адрес"
 
-#: src/alertpanel.c:123 src/compose.c:4807 src/main.c:458
+#: src/alertpanel.c:123 src/compose.c:4943 src/main.c:458
 msgid "Notice"
 msgstr "Забележка"
 
@@ -613,7 +613,7 @@ msgstr "Забележка"
 msgid "Warning"
 msgstr "Предупреждение"
 
-#: src/alertpanel.c:149 src/compose.c:2551 src/inc.c:558
+#: src/alertpanel.c:149 src/compose.c:2632 src/inc.c:558
 msgid "Error"
 msgstr "Грешка"
 
@@ -661,307 +661,425 @@ msgstr "Кафяв"
 msgid "None"
 msgstr "Никой"
 
-#: src/compose.c:461
+#: src/compose.c:469
 msgid "/_Add..."
 msgstr "/_Добавяне"
 
-#: src/compose.c:462
+#: src/compose.c:470
 msgid "/_Remove"
 msgstr "/_Премахване"
 
-#: src/compose.c:464 src/folderview.c:228 src/folderview.c:246
+#: src/compose.c:472 src/folderview.c:228 src/folderview.c:246
 #: src/folderview.c:261
 msgid "/_Properties..."
 msgstr "/_Аксесоари..."
 
-#: src/compose.c:470
+#: src/compose.c:478
 #, fuzzy
 msgid "/_File/_Send"
 msgstr "/_файл/_Запазване"
 
-#: src/compose.c:472
+#: src/compose.c:480
 #, fuzzy
 msgid "/_File/Send _later"
 msgstr "/_Съобщение/Изпращане _по-късно"
 
-#: src/compose.c:475
+#: src/compose.c:483
 #, fuzzy
 msgid "/_File/Save to _draft folder"
 msgstr "/_Съобщение/_Запазване в папката с чернови"
 
-#: src/compose.c:477
+#: src/compose.c:485
 #, fuzzy
 msgid "/_File/Save and _keep editing"
 msgstr "/_Съобщение/Запазване и _продължаване на редакция"
 
-#: src/compose.c:480
+#: src/compose.c:488
 msgid "/_File/_Attach file"
 msgstr "/_Файл/_Прикрепване на файл"
 
-#: src/compose.c:481
+#: src/compose.c:489
 msgid "/_File/_Insert file"
 msgstr "/_Файл/_Внасяне на файл"
 
-#: src/compose.c:482
+#: src/compose.c:490
 msgid "/_File/Insert si_gnature"
 msgstr "/_Файл/Внасяне на _сигнатура"
 
-#: src/compose.c:487
+#: src/compose.c:495
 msgid "/_Edit/_Undo"
 msgstr "/_Редактиране/_Отмяна"
 
-#: src/compose.c:488
+#: src/compose.c:496
 msgid "/_Edit/_Redo"
 msgstr "/_Редактиране/_Повтаряне"
 
-#: src/compose.c:489 src/compose.c:567 src/mainwindow.c:489
+#: src/compose.c:497 src/compose.c:575 src/mainwindow.c:489
 #: src/messageview.c:143
 msgid "/_Edit/---"
 msgstr "/_Редактиране/---"
 
-#: src/compose.c:490
+#: src/compose.c:498
 msgid "/_Edit/Cu_t"
 msgstr "/_Редактиране/_Отрязване"
 
-#: src/compose.c:491 src/mainwindow.c:486 src/messageview.c:141
+#: src/compose.c:499 src/mainwindow.c:486 src/messageview.c:141
 msgid "/_Edit/_Copy"
 msgstr "/_Редактиране/_Копиране"
 
-#: src/compose.c:492
+#: src/compose.c:500
 msgid "/_Edit/_Paste"
 msgstr "/_Редактиране/_Вмъкване"
 
-#: src/compose.c:493
+#: src/compose.c:501
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Редактиране/Вмъкване като _цитат"
 
-#: src/compose.c:495 src/mainwindow.c:487 src/messageview.c:142
+#: src/compose.c:503 src/mainwindow.c:487 src/messageview.c:142
 msgid "/_Edit/Select _all"
 msgstr "/_Редактиране/_Избиране на всички"
 
-#: src/compose.c:496
+#: src/compose.c:504
 msgid "/_Edit/A_dvanced"
 msgstr "/_Редактиране/_Напреднал"
 
-#: src/compose.c:497
+#: src/compose.c:505
 msgid "/_Edit/A_dvanced/Move a character backward"
 msgstr "/_Редактиране/_Напреднал/Преместване на знак назад"
 
-#: src/compose.c:502
+#: src/compose.c:510
 msgid "/_Edit/A_dvanced/Move a character forward"
 msgstr "/_Редактиране/_Напреднал/Преместване на знак напред"
 
-#: src/compose.c:507
+#: src/compose.c:515
 msgid "/_Edit/A_dvanced/Move a word backward"
 msgstr "/_Редактиране/_Напреднал/Преместване на дума назад"
 
-#: src/compose.c:512
+#: src/compose.c:520
 msgid "/_Edit/A_dvanced/Move a word forward"
 msgstr "/_Редактиране/_Напреднал/Преместване на дума напред"
 
-#: src/compose.c:517
+#: src/compose.c:525
 msgid "/_Edit/A_dvanced/Move to beginning of line"
 msgstr "/_Редактиране/_Напреднал/Преместване до началото на ред"
 
-#: src/compose.c:522
+#: src/compose.c:530
 msgid "/_Edit/A_dvanced/Move to end of line"
 msgstr "/_Редактиране/_Напреднал/Преместване до края на ред"
 
-#: src/compose.c:527
+#: src/compose.c:535
 msgid "/_Edit/A_dvanced/Move to previous line"
 msgstr "/_Редактиране/_Напреднал/Преместване до предишен ред"
 
-#: src/compose.c:532
+#: src/compose.c:540
 msgid "/_Edit/A_dvanced/Move to next line"
 msgstr "/_Редактиране/_Напреднал/Преместване до следващ ред"
 
-#: src/compose.c:537
+#: src/compose.c:545
 msgid "/_Edit/A_dvanced/Delete a character backward"
 msgstr "/_Редактиране/_Напреднал/Изтриване на знак назад"
 
-#: src/compose.c:542
+#: src/compose.c:550
 msgid "/_Edit/A_dvanced/Delete a character forward"
 msgstr "/_Редактиране/_Напреднал/Изтриване на знак напред"
 
-#: src/compose.c:547
+#: src/compose.c:555
 msgid "/_Edit/A_dvanced/Delete a word backward"
 msgstr "/_Редактиране/_Напреднал/Изтриване на дума назад"
 
-#: src/compose.c:552
+#: src/compose.c:560
 msgid "/_Edit/A_dvanced/Delete a word forward"
 msgstr "/_Редактиране/_Напреднал/Изтриване на дума напред"
 
-#: src/compose.c:557
+#: src/compose.c:565
 msgid "/_Edit/A_dvanced/Delete line"
 msgstr "/_Редактиране/_Напреднал/Изтриване на ред"
 
-#: src/compose.c:562
+#: src/compose.c:570
 msgid "/_Edit/A_dvanced/Delete to end of line"
 msgstr "/_Редактиране/_Напреднал/Изтриване до края на ред"
 
-#: src/compose.c:568
+#: src/compose.c:576
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/_Редактиране/_Пренасяне на текущия абзац"
 
-#: src/compose.c:570
+#: src/compose.c:578
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/_Редактиране/П_ренасяне на всички дълги редове"
 
-#: src/compose.c:572
+#: src/compose.c:580
 #, fuzzy
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Редактиране/_Копиране"
 
-#: src/compose.c:573 src/mainwindow.c:494 src/messageview.c:147
+#: src/compose.c:581 src/mainwindow.c:494 src/messageview.c:147
 #: src/summaryview.c:370
 msgid "/_View"
 msgstr "/_Изглед"
 
-#: src/compose.c:574
+#: src/compose.c:582
 msgid "/_View/_To"
 msgstr "/_Изглед/_До"
 
-#: src/compose.c:575
+#: src/compose.c:583
 msgid "/_View/_Cc"
 msgstr "/_Изглед/_Сс"
 
-#: src/compose.c:576
+#: src/compose.c:584
 msgid "/_View/_Bcc"
 msgstr "/_Изглед/_Всс"
 
-#: src/compose.c:577
+#: src/compose.c:585
 msgid "/_View/_Reply to"
 msgstr "/_Изглед/_Отговор до"
 
-#: src/compose.c:578 src/compose.c:580 src/compose.c:582 src/mainwindow.c:512
-#: src/mainwindow.c:515 src/mainwindow.c:541 src/mainwindow.c:565
-#: src/mainwindow.c:641 src/mainwindow.c:645 src/messageview.c:223
+#: src/compose.c:586 src/compose.c:588 src/compose.c:590 src/compose.c:592
+#: src/mainwindow.c:512 src/mainwindow.c:515 src/mainwindow.c:541
+#: src/mainwindow.c:565 src/mainwindow.c:650 src/mainwindow.c:654
+#: src/messageview.c:223
 msgid "/_View/---"
 msgstr "/_Изглед/---"
 
-#: src/compose.c:579
+#: src/compose.c:587
 msgid "/_View/_Followup to"
 msgstr "/_Изглед/_Допълнителен до"
 
-#: src/compose.c:581
+#: src/compose.c:589
 msgid "/_View/R_uler"
 msgstr "/_Изглед/_Линия"
 
-#: src/compose.c:583
+#: src/compose.c:591
 msgid "/_View/_Attachment"
 msgstr "/_Изглед/_Притурка"
 
-#: src/compose.c:586 src/mainwindow.c:689 src/messageview.c:247
+#: src/compose.c:598 src/mainwindow.c:572 src/messageview.c:154
+#, fuzzy
+msgid "/_View/Character _encoding"
+msgstr "/_Изглед/_Сортиране/Низходящо"
+
+#: src/compose.c:599
+msgid "/_View/Character _encoding/_Automatic"
+msgstr ""
+
+#: src/compose.c:601 src/compose.c:607 src/compose.c:613 src/compose.c:617
+#: src/compose.c:623 src/compose.c:627 src/compose.c:631 src/compose.c:641
+#: src/compose.c:645 src/compose.c:653 src/compose.c:657 src/mainwindow.c:568
+#: src/mainwindow.c:575 src/messageview.c:150
+#, fuzzy
+msgid "/_View/Character _encoding/---"
+msgstr "/_Изглед/_Сортиране/Низходящо"
+
+#: src/compose.c:603 src/mainwindow.c:576 src/messageview.c:158
+#, fuzzy
+msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
+msgstr "/_Изглед/_Кодиране/7bit ascii (US-ASC_II)"
+
+#: src/compose.c:605 src/mainwindow.c:578 src/messageview.c:161
+#, fuzzy
+msgid "/_View/Character _encoding/Unicode (_UTF-8)"
+msgstr "/_Изглед/_Кодиране/Unicode (_UTF-8)"
+
+#: src/compose.c:609 src/mainwindow.c:582 src/messageview.c:164
+#, fuzzy
+msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
+msgstr "/_Изглед/_Кодиране/Western European (ISO-8859-_1)"
+
+#: src/compose.c:611 src/mainwindow.c:584 src/messageview.c:166
+#, fuzzy
+msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
+msgstr "/_Изглед/_Кодиране/Western European (ISO-8859-15)"
+
+#: src/compose.c:615 src/mainwindow.c:588 src/messageview.c:169
+#, fuzzy
+msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
+msgstr "/_Изглед/_Кодиране/Central European (ISO-8859-_2)"
+
+#: src/compose.c:619 src/mainwindow.c:592 src/messageview.c:172
+#, fuzzy
+msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
+msgstr "/_Изглед/_Кодиране/_Baltic (ISO-8859-13)"
+
+#: src/compose.c:621 src/mainwindow.c:594 src/messageview.c:174
+#, fuzzy
+msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
+msgstr "/_Изглед/_Кодиране/Baltic (ISO-8859-_4)"
+
+#: src/compose.c:625 src/mainwindow.c:598 src/messageview.c:177
+#, fuzzy
+msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
+msgstr "/_Изглед/_Кодиране/Greek (ISO-8859-_7)"
+
+#: src/compose.c:629 src/mainwindow.c:602 src/messageview.c:180
+#, fuzzy
+msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
+msgstr "/_Изглед/_Кодиране/Turkish (ISO-8859-_9)"
+
+#: src/compose.c:633 src/mainwindow.c:606 src/messageview.c:183
+#, fuzzy
+msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
+msgstr "/_Изглед/_Кодиране/Cyrillic (ISO-8859-_5)"
+
+#: src/compose.c:635 src/mainwindow.c:608 src/messageview.c:185
+#, fuzzy
+msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
+msgstr "/_Изглед/_Кодиране/Cyrillic (KOI8-_R)"
+
+#: src/compose.c:637 src/mainwindow.c:610 src/messageview.c:187
+#, fuzzy
+msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
+msgstr "/_Изглед/_Кодиране/Cyrillic (KOI8-_R)"
+
+#: src/compose.c:639 src/mainwindow.c:612 src/messageview.c:189
+#, fuzzy
+msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
+msgstr "/_Изглед/_Кодиране/Cyrillic (Windows-1251)"
+
+#: src/compose.c:643 src/mainwindow.c:616 src/messageview.c:192
+#, fuzzy
+msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
+msgstr "/_Изглед/_Кодиране/Japanese (ISO-2022-_JP)"
+
+#: src/compose.c:647 src/mainwindow.c:626 src/messageview.c:201
+#, fuzzy
+msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
+msgstr "/_Изглед/_Кодиране/Simplified Chinese (_GB2312)"
+
+#: src/compose.c:649 src/mainwindow.c:628 src/messageview.c:203
+#, fuzzy
+msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
+msgstr "/_Изглед/_Кодиране/Traditional Chinese (_Big5)"
+
+#: src/compose.c:651 src/mainwindow.c:630 src/messageview.c:205
+#, fuzzy
+msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
+msgstr "/_Изглед/_Кодиране/Traditional Chinese (EUC-_TW)"
+
+#: src/compose.c:655 src/mainwindow.c:636 src/messageview.c:210
+#, fuzzy
+msgid "/_View/Character _encoding/Korean (EUC-_KR)"
+msgstr "/_Изглед/_Кодиране/Korean (EUC-_KR)"
+
+#: src/compose.c:659 src/mainwindow.c:642 src/messageview.c:215
+#, fuzzy
+msgid "/_View/Character _encoding/Thai (TIS-620)"
+msgstr "/_Изглед/_Кодиране/Thai (TIS-620)"
+
+#: src/compose.c:661 src/mainwindow.c:644 src/messageview.c:217
+#, fuzzy
+msgid "/_View/Character _encoding/Thai (Windows-874)"
+msgstr "/_Изглед/_Кодиране/Thai (Windows-874)"
+
+#: src/compose.c:665 src/mainwindow.c:698 src/messageview.c:247
 msgid "/_Tools/_Address book"
 msgstr "/_Инструменти/_Адресна книга"
 
-#: src/compose.c:587
+#: src/compose.c:666
 msgid "/_Tools/_Template"
 msgstr "/_Инструменти/_Шаблон"
 
-#: src/compose.c:588 src/mainwindow.c:707 src/messageview.c:262
+#: src/compose.c:667 src/mainwindow.c:716 src/messageview.c:262
 msgid "/_Tools/Actio_ns"
 msgstr "/_Инструменти/_Действия"
 
-#: src/compose.c:589 src/compose.c:593 src/mainwindow.c:692
-#: src/mainwindow.c:706 src/mainwindow.c:708 src/mainwindow.c:711
-#: src/mainwindow.c:713 src/messageview.c:250 src/messageview.c:261
+#: src/compose.c:668 src/compose.c:672 src/mainwindow.c:701
+#: src/mainwindow.c:715 src/mainwindow.c:717 src/mainwindow.c:720
+#: src/mainwindow.c:722 src/messageview.c:250 src/messageview.c:261
 msgid "/_Tools/---"
 msgstr "/_Инструменти/---"
 
-#: src/compose.c:590
+#: src/compose.c:669
 #, fuzzy
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/_Редактиране/Редактиране с _външен редактор"
 
-#: src/compose.c:594
+#: src/compose.c:673
 #, fuzzy
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Инструменти/_Действия"
 
-#: src/compose.c:595
+#: src/compose.c:674
 #, fuzzy
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/_Съобщение/_Криптиране"
 
-#: src/compose.c:800
+#: src/compose.c:879
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: файлът не съществува\n"
 
-#: src/compose.c:899 src/compose.c:958 src/procmsg.c:1303
+#: src/compose.c:978 src/compose.c:1037 src/procmsg.c:1303
 msgid "Can't get text part\n"
 msgstr "Не може да се намери текстовата част\n"
 
-#: src/compose.c:1340
+#: src/compose.c:1419
 msgid "Quote mark format error."
 msgstr "Грешка в формата на цитат."
 
-#: src/compose.c:1352
+#: src/compose.c:1431
 msgid "Message reply/forward format error."
 msgstr "Грешка в reply/forward формата на съобщението."
 
-#: src/compose.c:1679
+#: src/compose.c:1758
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Файлът %s не съществува\n"
 
-#: src/compose.c:1683
+#: src/compose.c:1762
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Не може да се намери големината на %s\n"
 
-#: src/compose.c:1687
+#: src/compose.c:1766
 #, c-format
 msgid "File %s is empty."
 msgstr "Файлът %s е празен."
 
-#: src/compose.c:1691
+#: src/compose.c:1770
 #, c-format
 msgid "Can't read %s."
 msgstr "Не може да се прочете %s."
 
-#: src/compose.c:1726
+#: src/compose.c:1805
 #, c-format
 msgid "Message: %s"
 msgstr "Съобщение: %s"
 
-#: src/compose.c:1797 src/mimeview.c:491
+#: src/compose.c:1876 src/mimeview.c:491
 msgid "Can't get the part of multipart message."
 msgstr "Не може да се намери част от multipart съобщение."
 
-#: src/compose.c:2188
+#: src/compose.c:2267
 msgid " [Edited]"
 msgstr " [Редактирано]"
 
-#: src/compose.c:2190
+#: src/compose.c:2269
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Съставяне на съобщение%s"
 
-#: src/compose.c:2193
+#: src/compose.c:2272
 #, c-format
 msgid "Compose message%s"
 msgstr "Съставяне на съобщение%s"
 
-#: src/compose.c:2304
+#: src/compose.c:2383
 msgid "Recipient is not specified."
 msgstr "Не е указан получател"
 
-#: src/compose.c:2312 src/compose.c:4112 src/mainwindow.c:2144
+#: src/compose.c:2391 src/compose.c:4213 src/mainwindow.c:2153
 #: src/prefs_account.c:703 src/prefs_common.c:850
 msgid "Send"
 msgstr "Изпращане"
 
-#: src/compose.c:2313
+#: src/compose.c:2392
 msgid "Subject is empty. Send it anyway?"
 msgstr "Празна тема. Изпращане така?"
 
-#: src/compose.c:2364
+#: src/compose.c:2443
 msgid "can't get recipient list."
 msgstr "не може да се получи списък с получатели."
 
-#: src/compose.c:2384
+#: src/compose.c:2463
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -969,26 +1087,26 @@ msgstr ""
 "Не е указан акаунт за изпращане на пощата.\n"
 "Моля изберете пощенску акаунт преди изпращане."
 
-#: src/compose.c:2398 src/send_message.c:261
+#: src/compose.c:2477 src/send_message.c:261
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Възникна грешка при пращане на съобщението до %s."
 
-#: src/compose.c:2421
+#: src/compose.c:2500
 msgid "Can't save the message to outbox."
 msgstr "Не може да се запази съобщението в изходящата кутия."
 
-#: src/compose.c:2457
+#: src/compose.c:2536
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "Не можа да се намери бутон асоцииран с избрания `%s'."
 
-#: src/compose.c:2518 src/compose.c:2739 src/compose.c:2802 src/compose.c:2921
+#: src/compose.c:2597 src/compose.c:2820 src/compose.c:2883 src/compose.c:3003
 #: src/utils.c:2189
 msgid "can't change file mode\n"
 msgstr "не може да се смени вида на файла\n"
 
-#: src/compose.c:2546
+#: src/compose.c:2627
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -998,140 +1116,140 @@ msgstr ""
 "%s към %s.\n"
 "Изпращане така?"
 
-#: src/compose.c:2610
+#: src/compose.c:2691
 msgid "can't write headers\n"
 msgstr "Не може да се запишат хедърите\n"
 
-#: src/compose.c:2881
+#: src/compose.c:2963
 msgid "can't remove the old message\n"
 msgstr "не може да се изтрие старото съобщение\n"
 
-#: src/compose.c:2899
+#: src/compose.c:2981
 msgid "queueing message...\n"
 msgstr "нареждане на съобщението на опашката...\n"
 
-#: src/compose.c:2981
+#: src/compose.c:3063
 msgid "can't find queue folder\n"
 msgstr "не може да се намери папката за опашка\n"
 
-#: src/compose.c:2988
+#: src/compose.c:3070
 msgid "can't queue the message\n"
 msgstr "не може да се нареди съобщението на опашката\n"
 
-#: src/compose.c:3547
+#: src/compose.c:3645
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "генерирано Message-ID: %s\n"
 
-#: src/compose.c:3645
+#: src/compose.c:3743
 msgid "Creating compose window...\n"
 msgstr "Създаване на прозорец за съставяне...\n"
 
-#: src/compose.c:3648 src/compose.c:4598
+#: src/compose.c:3746 src/compose.c:4734
 msgid "MIME type"
 msgstr "MIME тип"
 
 #. S_COL_DATE
-#: src/compose.c:3649 src/mimeview.c:150 src/prefs_filter_edit.c:569
+#: src/compose.c:3747 src/mimeview.c:150 src/prefs_filter_edit.c:569
 #: src/prefs_summary_column.c:73 src/select-keys.c:317 src/summaryview.c:386
 msgid "Size"
 msgstr "Размер"
 
-#: src/compose.c:3700 src/headerview.c:53 src/summary_search.c:169
+#: src/compose.c:3798 src/headerview.c:53 src/summary_search.c:169
 msgid "From:"
 msgstr "От:"
 
-#: src/compose.c:4113
+#: src/compose.c:4214
 msgid "Send message"
 msgstr "Изпращане на съобщение"
 
-#: src/compose.c:4121
+#: src/compose.c:4222
 msgid "Send later"
 msgstr "Изпращане по-късно"
 
-#: src/compose.c:4122
+#: src/compose.c:4223
 msgid "Put into queue folder and send later"
 msgstr "Поставяне в папката за опашка и изпращане по-късно"
 
-#: src/compose.c:4130
+#: src/compose.c:4231
 msgid "Draft"
 msgstr "Чернови"
 
-#: src/compose.c:4131
+#: src/compose.c:4232
 msgid "Save to draft folder"
 msgstr "Запазване в папката с чернови"
 
-#: src/compose.c:4141 src/compose.c:5382
+#: src/compose.c:4242 src/compose.c:5527
 msgid "Insert"
 msgstr "Вмъкване"
 
-#: src/compose.c:4142
+#: src/compose.c:4243
 msgid "Insert file"
 msgstr "Вмъкване на файл"
 
-#: src/compose.c:4150
+#: src/compose.c:4251
 msgid "Attach"
 msgstr "Прикрепване"
 
-#: src/compose.c:4151
+#: src/compose.c:4252
 msgid "Attach file"
 msgstr "Прикрепване на файл"
 
 #. signature
-#: src/compose.c:4161 src/prefs_account.c:1339 src/prefs_common.c:1261
+#: src/compose.c:4262 src/prefs_account.c:1339 src/prefs_common.c:1273
 msgid "Signature"
 msgstr "Сигнатура"
 
-#: src/compose.c:4162
+#: src/compose.c:4263
 msgid "Insert signature"
 msgstr "Вмъкване на сигнатура"
 
-#: src/compose.c:4171 src/prefs_common.c:1283 src/prefs_common.c:2165
+#: src/compose.c:4272 src/prefs_common.c:1295 src/prefs_common.c:2177
 msgid "Editor"
 msgstr "Редактор"
 
-#: src/compose.c:4172
+#: src/compose.c:4273
 msgid "Edit with external editor"
 msgstr "Редакция с външен редактор"
 
-#: src/compose.c:4180
+#: src/compose.c:4281
 msgid "Linewrap"
 msgstr "Свиванен на редовете"
 
-#: src/compose.c:4181
+#: src/compose.c:4282
 msgid "Wrap all long lines"
 msgstr "Свиване на всички дълги редове"
 
-#: src/compose.c:4492
+#: src/compose.c:4628
 msgid "Invalid MIME type."
 msgstr "Невалиден MIME тип"
 
-#: src/compose.c:4511
+#: src/compose.c:4647
 msgid "File doesn't exist or is empty."
 msgstr "Файлът не съществува или е празен"
 
-#: src/compose.c:4580
+#: src/compose.c:4716
 msgid "Properties"
 msgstr "Аксесоари"
 
-#: src/compose.c:4600
+#: src/compose.c:4736
 msgid "Encoding"
 msgstr "Кодиране"
 
-#: src/compose.c:4623 src/prefs_folder_item.c:183
+#: src/compose.c:4759 src/prefs_folder_item.c:183
 msgid "Path"
 msgstr "Път"
 
-#: src/compose.c:4624
+#: src/compose.c:4760
 msgid "File name"
 msgstr "Име на файл"
 
-#: src/compose.c:4778
+#: src/compose.c:4914
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Командния ред за външен редактор е невалиден: `%s'\n"
 
-#: src/compose.c:4804
+#: src/compose.c:4940
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1142,72 +1260,72 @@ msgstr ""
 "Желаете ли принудително прекратяване на процеса?\n"
 "process group id: %d"
 
-#: src/compose.c:4817
+#: src/compose.c:4953
 #, c-format
 msgid "Terminated process group id: %d"
 msgstr "Прекратен process group id: %d"
 
-#: src/compose.c:4818
+#: src/compose.c:4954
 #, c-format
 msgid "Temporary file: %s"
 msgstr "Временен файл: %s"
 
-#: src/compose.c:4842
+#: src/compose.c:4978
 msgid "Compose: input from monitoring process\n"
 msgstr "Съставяне: вход от наблюдаващ процес\n"
 
 #. failed
-#: src/compose.c:4875
+#: src/compose.c:5011
 msgid "Couldn't exec external editor\n"
 msgstr "Не може да се стартира външен редактор\n"
 
-#: src/compose.c:4879
+#: src/compose.c:5015
 msgid "Couldn't write to file\n"
 msgstr "Не може да се запише във файл\n"
 
-#: src/compose.c:4881
+#: src/compose.c:5017
 msgid "Pipe read failed\n"
 msgstr "Четене на pipe провалено\n"
 
-#: src/compose.c:5182 src/compose.c:5190 src/compose.c:5196
+#: src/compose.c:5318 src/compose.c:5326 src/compose.c:5332
 msgid "Can't queue the message."
 msgstr "Не може да се нареди съобщението на опашката."
 
-#: src/compose.c:5287
+#: src/compose.c:5423
 #, fuzzy
 msgid "Select files"
 msgstr "Избор на файл"
 
-#: src/compose.c:5309
+#: src/compose.c:5445
 msgid "Select file"
 msgstr "Избор на файл"
 
-#: src/compose.c:5344
+#: src/compose.c:5480
 msgid "Discard message"
 msgstr "Изоставяне на съобщение"
 
-#: src/compose.c:5345
+#: src/compose.c:5481
 msgid "This message has been modified. discard it?"
 msgstr "Съобщението беше променено. Изоставяне?"
 
-#: src/compose.c:5346
+#: src/compose.c:5482
 msgid "Discard"
 msgstr "Изоставяне"
 
-#: src/compose.c:5346
+#: src/compose.c:5482
 msgid "to Draft"
 msgstr "при Чернови"
 
-#: src/compose.c:5379
+#: src/compose.c:5524
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Желаете ли да приложите шаблонът `%s' ?"
 
-#: src/compose.c:5381
+#: src/compose.c:5526
 msgid "Apply template"
 msgstr "Прилагане на шаблон"
 
-#: src/compose.c:5382
+#: src/compose.c:5527
 msgid "Replace"
 msgstr "Заменяне"
 
@@ -1648,12 +1766,12 @@ msgstr "Установяване информация за папка...\n"
 msgid "Setting folder info..."
 msgstr "Установяване информация за папка..."
 
-#: src/folderview.c:652 src/mainwindow.c:3190 src/setup.c:81
+#: src/folderview.c:652 src/mainwindow.c:3199 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Сканиране на папка %s%c%s ..."
 
-#: src/folderview.c:656 src/mainwindow.c:3195 src/setup.c:86
+#: src/folderview.c:656 src/mainwindow.c:3204 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Сканиране на папка %s ..."
@@ -2109,7 +2227,7 @@ msgstr "Внасяне на LDIF файл в Адресната книга"
 msgid "Prev"
 msgstr "Предишен"
 
-#: src/importldif.c:761 src/mainwindow.c:2230
+#: src/importldif.c:761 src/mainwindow.c:2239
 msgid "Next"
 msgstr "Следващ"
 
@@ -2570,7 +2688,8 @@ msgid "/_View/Separate f_older tree"
 msgstr "/_Изглед/_Отделно дърво на папките"
 
 #: src/mainwindow.c:514
-msgid "/_View/Separate m_essage view"
+#, fuzzy
+msgid "/_View/Separate _message view"
 msgstr "/_Изглед/Отделен изглед на съобщенията"
 
 #: src/mainwindow.c:516
@@ -2706,432 +2825,349 @@ msgstr "/_Изглед/П_реход до/Следващо о_цветено с�
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Изглед/П_реход до/_Друга папка"
 
-#: src/mainwindow.c:568 src/mainwindow.c:575 src/messageview.c:150
-msgid "/_View/_Code set/---"
-msgstr "/_Изглед/_Кодиране/---"
-
-#: src/mainwindow.c:572 src/messageview.c:154
-msgid "/_View/_Code set"
-msgstr "/_Изглед/_Кодиране"
-
 #: src/mainwindow.c:573 src/messageview.c:155
-msgid "/_View/_Code set/_Auto detect"
+#, fuzzy
+msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Изглед/_Кодиране/_Автоматично разпознаване"
 
-#: src/mainwindow.c:576 src/messageview.c:158
-msgid "/_View/_Code set/7bit ascii (US-ASC_II)"
-msgstr "/_Изглед/_Кодиране/7bit ascii (US-ASC_II)"
-
-#: src/mainwindow.c:579 src/messageview.c:161
-msgid "/_View/_Code set/Unicode (_UTF-8)"
-msgstr "/_Изглед/_Кодиране/Unicode (_UTF-8)"
-
-#: src/mainwindow.c:582 src/messageview.c:164
-msgid "/_View/_Code set/Western European (ISO-8859-_1)"
-msgstr "/_Изглед/_Кодиране/Western European (ISO-8859-_1)"
-
-#: src/mainwindow.c:584 src/messageview.c:166
-msgid "/_View/_Code set/Western European (ISO-8859-15)"
-msgstr "/_Изглед/_Кодиране/Western European (ISO-8859-15)"
-
-#: src/mainwindow.c:587 src/messageview.c:169
-msgid "/_View/_Code set/Central European (ISO-8859-_2)"
-msgstr "/_Изглед/_Кодиране/Central European (ISO-8859-_2)"
-
-#: src/mainwindow.c:590 src/messageview.c:172
-msgid "/_View/_Code set/_Baltic (ISO-8859-13)"
-msgstr "/_Изглед/_Кодиране/_Baltic (ISO-8859-13)"
-
-#: src/mainwindow.c:592 src/messageview.c:174
-msgid "/_View/_Code set/Baltic (ISO-8859-_4)"
-msgstr "/_Изглед/_Кодиране/Baltic (ISO-8859-_4)"
-
-#: src/mainwindow.c:595 src/messageview.c:177
-msgid "/_View/_Code set/Greek (ISO-8859-_7)"
-msgstr "/_Изглед/_Кодиране/Greek (ISO-8859-_7)"
-
-#: src/mainwindow.c:598 src/messageview.c:180
-msgid "/_View/_Code set/Turkish (ISO-8859-_9)"
-msgstr "/_Изглед/_Кодиране/Turkish (ISO-8859-_9)"
-
-#: src/mainwindow.c:601 src/messageview.c:183
-msgid "/_View/_Code set/Cyrillic (ISO-8859-_5)"
-msgstr "/_Изглед/_Кодиране/Cyrillic (ISO-8859-_5)"
-
-#: src/mainwindow.c:603 src/messageview.c:185
-msgid "/_View/_Code set/Cyrillic (KOI8-_R)"
-msgstr "/_Изглед/_Кодиране/Cyrillic (KOI8-_R)"
-
-#: src/mainwindow.c:605 src/messageview.c:187
+#: src/mainwindow.c:618 src/messageview.c:194
 #, fuzzy
-msgid "/_View/_Code set/Cyrillic (KOI8-U)"
-msgstr "/_Изглед/_Кодиране/Cyrillic (KOI8-_R)"
-
-#: src/mainwindow.c:607 src/messageview.c:189
-msgid "/_View/_Code set/Cyrillic (Windows-1251)"
-msgstr "/_Изглед/_Кодиране/Cyrillic (Windows-1251)"
-
-#: src/mainwindow.c:610 src/messageview.c:192
-msgid "/_View/_Code set/Japanese (ISO-2022-_JP)"
-msgstr "/_Изглед/_Кодиране/Japanese (ISO-2022-_JP)"
-
-#: src/mainwindow.c:612 src/messageview.c:194
-msgid "/_View/_Code set/Japanese (ISO-2022-JP-2)"
+msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Изглед/_Кодиране/Japanese (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:614 src/messageview.c:196
-msgid "/_View/_Code set/Japanese (_EUC-JP)"
+#: src/mainwindow.c:620 src/messageview.c:196
+#, fuzzy
+msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Изглед/_Кодиране/Japanese (_EUC-JP)"
 
-#: src/mainwindow.c:616 src/messageview.c:198
-msgid "/_View/_Code set/Japanese (_Shift__JIS)"
+#: src/mainwindow.c:622 src/messageview.c:198
+#, fuzzy
+msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Изглед/_Кодиране/Japanese (_Shift__JIS)"
 
-#: src/mainwindow.c:619 src/messageview.c:201
-msgid "/_View/_Code set/Simplified Chinese (_GB2312)"
-msgstr "/_Изглед/_Кодиране/Simplified Chinese (_GB2312)"
-
-#: src/mainwindow.c:621 src/messageview.c:203
-msgid "/_View/_Code set/Traditional Chinese (_Big5)"
-msgstr "/_Изглед/_Кодиране/Traditional Chinese (_Big5)"
-
-#: src/mainwindow.c:623 src/messageview.c:205
-msgid "/_View/_Code set/Traditional Chinese (EUC-_TW)"
-msgstr "/_Изглед/_Кодиране/Traditional Chinese (EUC-_TW)"
-
-#: src/mainwindow.c:625 src/messageview.c:207
-msgid "/_View/_Code set/Chinese (ISO-2022-_CN)"
+#: src/mainwindow.c:632 src/messageview.c:207
+#, fuzzy
+msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Изглед/_Кодиране/Chinese (ISO-2022-_CN)"
 
-#: src/mainwindow.c:628 src/messageview.c:210
-msgid "/_View/_Code set/Korean (EUC-_KR)"
-msgstr "/_Изглед/_Кодиране/Korean (EUC-_KR)"
-
-#: src/mainwindow.c:630 src/messageview.c:212
-msgid "/_View/_Code set/Korean (ISO-2022-KR)"
+#: src/mainwindow.c:638 src/messageview.c:212
+#, fuzzy
+msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Изглед/_Кодиране/Korean (ISO-2022-KR)"
 
-#: src/mainwindow.c:633 src/messageview.c:215
-msgid "/_View/_Code set/Thai (TIS-620)"
-msgstr "/_Изглед/_Кодиране/Thai (TIS-620)"
-
-#: src/mainwindow.c:635 src/messageview.c:217
-msgid "/_View/_Code set/Thai (Windows-874)"
-msgstr "/_Изглед/_Кодиране/Thai (Windows-874)"
-
-#: src/mainwindow.c:642 src/summaryview.c:371
+#: src/mainwindow.c:651 src/summaryview.c:371
 msgid "/_View/Open in new _window"
 msgstr "/_Изглед/Отваряне в _нов прозорец"
 
-#: src/mainwindow.c:643 src/messageview.c:224
+#: src/mainwindow.c:652 src/messageview.c:224
 msgid "/_View/Mess_age source"
 msgstr "/_Изглед/_Изходен код"
 
-#: src/mainwindow.c:644 src/messageview.c:225
+#: src/mainwindow.c:653 src/messageview.c:225
 msgid "/_View/Show all _header"
 msgstr "/_Изглед/_Показване на заглавните части(headers)"
 
-#: src/mainwindow.c:646
+#: src/mainwindow.c:655
 msgid "/_View/_Update summary"
 msgstr "/_Изглед/_Обновяване на извадката"
 
-#: src/mainwindow.c:648 src/messageview.c:227
+#: src/mainwindow.c:657 src/messageview.c:227
 msgid "/_Message"
 msgstr "/_Съобщение"
 
-#: src/mainwindow.c:649
+#: src/mainwindow.c:658
 #, fuzzy
 msgid "/_Message/Recei_ve"
 msgstr "/_Съобщение/_Редактиране"
 
-#: src/mainwindow.c:650
+#: src/mainwindow.c:659
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/_Съобщение/Получаване от _всички акаунти"
 
-#: src/mainwindow.c:652
+#: src/mainwindow.c:661
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/_Съобщение/Получаване от _всички акаунти"
 
-#: src/mainwindow.c:654
+#: src/mainwindow.c:663
 #, fuzzy
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/_Съобщение/_Отказ на получаване"
 
-#: src/mainwindow.c:656
+#: src/mainwindow.c:665
 #, fuzzy
 msgid "/_Message/Recei_ve/---"
 msgstr "/_Съобщение/---"
 
-#: src/mainwindow.c:657
+#: src/mainwindow.c:666
 msgid "/_Message/_Send queued messages"
 msgstr "/_Съобщение/_Изпращане на съобщенията в опашката"
 
-#: src/mainwindow.c:658 src/mainwindow.c:660 src/mainwindow.c:667
-#: src/mainwindow.c:672 src/mainwindow.c:676 src/mainwindow.c:685
+#: src/mainwindow.c:667 src/mainwindow.c:669 src/mainwindow.c:676
+#: src/mainwindow.c:681 src/mainwindow.c:685 src/mainwindow.c:694
 #: src/messageview.c:230 src/messageview.c:238 src/messageview.c:243
 msgid "/_Message/---"
 msgstr "/_Съобщение/---"
 
-#: src/mainwindow.c:659 src/messageview.c:228
+#: src/mainwindow.c:668 src/messageview.c:228
 msgid "/_Message/Compose _new message"
 msgstr "/_Съобщение/_Съставяне на ново съобщение"
 
-#: src/mainwindow.c:661 src/messageview.c:231
+#: src/mainwindow.c:670 src/messageview.c:231
 msgid "/_Message/_Reply"
 msgstr "/_Съобщение/_Отговор"
 
-#: src/mainwindow.c:662
+#: src/mainwindow.c:671
 msgid "/_Message/Repl_y to"
 msgstr "/_Съобщение/Отговор _до"
 
-#: src/mainwindow.c:663 src/messageview.c:232
+#: src/mainwindow.c:672 src/messageview.c:232
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Съобщение/Отговор _до/_всички"
 
-#: src/mainwindow.c:664 src/messageview.c:234
+#: src/mainwindow.c:673 src/messageview.c:234
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Съобщение/Отговор _до/_подател"
 
-#: src/mainwindow.c:665 src/messageview.c:236
+#: src/mainwindow.c:674 src/messageview.c:236
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Съобщение/Отговор _до/_пощенски списък"
 
-#: src/mainwindow.c:668 src/messageview.c:239
+#: src/mainwindow.c:677 src/messageview.c:239
 msgid "/_Message/_Forward"
 msgstr "/_Съобщение/П_репращане"
 
-#: src/mainwindow.c:669 src/messageview.c:240
+#: src/mainwindow.c:678 src/messageview.c:240
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Съобщение/Пр_епращане като притурка"
 
-#: src/mainwindow.c:671 src/messageview.c:242
+#: src/mainwindow.c:680 src/messageview.c:242
 msgid "/_Message/Redirec_t"
 msgstr "/_Съобщение/_Пренасочване"
 
-#: src/mainwindow.c:673
+#: src/mainwindow.c:682
 msgid "/_Message/M_ove..."
 msgstr "/_Съобщение/_Преместване"
 
-#: src/mainwindow.c:674
+#: src/mainwindow.c:683
 msgid "/_Message/_Copy..."
 msgstr "/_Съобщение/_Копиране"
 
-#: src/mainwindow.c:675
+#: src/mainwindow.c:684
 msgid "/_Message/_Delete"
 msgstr "/_Съобщение/_Изтриване"
 
-#: src/mainwindow.c:677
+#: src/mainwindow.c:686
 msgid "/_Message/_Mark"
 msgstr "/_Съобщение/_Маркиране"
 
-#: src/mainwindow.c:678
+#: src/mainwindow.c:687
 msgid "/_Message/_Mark/_Mark"
 msgstr "/_Съобщение/_Маркиране/_Маркиране"
 
-#: src/mainwindow.c:679
+#: src/mainwindow.c:688
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/_Съобщение/_Маркиране/_Размаркиране"
 
-#: src/mainwindow.c:680
+#: src/mainwindow.c:689
 msgid "/_Message/_Mark/---"
 msgstr "/_Съобщение/_Маркиране/---"
 
-#: src/mainwindow.c:681
+#: src/mainwindow.c:690
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/_Съобщение/_Маркиране/като _непрочетено"
 
-#: src/mainwindow.c:682
+#: src/mainwindow.c:691
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/_Съобщение/_Маркиране/като _прочетено"
 
-#: src/mainwindow.c:684
+#: src/mainwindow.c:693
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/_Съобщение/_Маркиране/_всички като прочетени"
 
-#: src/mainwindow.c:686 src/messageview.c:244
+#: src/mainwindow.c:695 src/messageview.c:244
 msgid "/_Message/Re-_edit"
 msgstr "/_Съобщение/_Редактиране"
 
-#: src/mainwindow.c:690 src/messageview.c:248
+#: src/mainwindow.c:699 src/messageview.c:248
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/_Инструменти/_Добавяне на подател в адресната книга"
 
-#: src/mainwindow.c:693
+#: src/mainwindow.c:702
 #, fuzzy
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/_Инструменти/_Филтриране на съобщенията"
 
-#: src/mainwindow.c:695
+#: src/mainwindow.c:704
 #, fuzzy
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Инструменти/_Филтриране на съобщенията"
 
-#: src/mainwindow.c:697 src/messageview.c:251
+#: src/mainwindow.c:706 src/messageview.c:251
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Инструменти/_Създаване на правило за филтриране"
 
-#: src/mainwindow.c:698 src/messageview.c:253
+#: src/mainwindow.c:707 src/messageview.c:253
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Инструменти/_Създаване на правило за филтриране/_Автоматично"
 
-#: src/mainwindow.c:700 src/messageview.c:255
+#: src/mainwindow.c:709 src/messageview.c:255
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Инструменти/_Създаване на правило за филтриране/по _Подател"
 
-#: src/mainwindow.c:702 src/messageview.c:257
+#: src/mainwindow.c:711 src/messageview.c:257
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Инструменти/_Създаване на правило за филтриране/по П_олучател"
 
-#: src/mainwindow.c:704 src/messageview.c:259
+#: src/mainwindow.c:713 src/messageview.c:259
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Инструменти/_Създаване на правило за филтриране/по _Тема"
 
-#: src/mainwindow.c:709
+#: src/mainwindow.c:718
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/_Инструменти/И_зтриване на повтарящи се съобщения"
 
-#: src/mainwindow.c:712
+#: src/mainwindow.c:721
 msgid "/_Tools/E_xecute"
 msgstr "/_Инструменти/_Изпълнение"
 
-#: src/mainwindow.c:714
+#: src/mainwindow.c:723
 msgid "/_Tools/_Log window"
 msgstr "/_Инструменти/_Журнален прозорец"
 
-#: src/mainwindow.c:716
+#: src/mainwindow.c:725
 msgid "/_Configuration"
 msgstr "/_Конфигуриране"
 
-#: src/mainwindow.c:717
+#: src/mainwindow.c:726
 msgid "/_Configuration/_Common preferences..."
 msgstr "/_Конфигуриране/_Общи предпочитания"
 
-#: src/mainwindow.c:719
+#: src/mainwindow.c:728
 msgid "/_Configuration/_Filter setting..."
 msgstr "/_Конфигуриране/_Установяване на филтър"
 
-#: src/mainwindow.c:721
+#: src/mainwindow.c:730
 msgid "/_Configuration/_Template..."
 msgstr "/_Конфигуриране/_Шаблон"
 
-#: src/mainwindow.c:722
+#: src/mainwindow.c:731
 msgid "/_Configuration/_Actions..."
 msgstr "/_Конфигуриране/_Действия"
 
-#: src/mainwindow.c:723
+#: src/mainwindow.c:732
 msgid "/_Configuration/---"
 msgstr "/_Конфигуриране/---"
 
-#: src/mainwindow.c:724
+#: src/mainwindow.c:733
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Конфигуриране/_Предпочитания за текущия акаунт"
 
-#: src/mainwindow.c:726
+#: src/mainwindow.c:735
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Конфигуриране/_Създаване на нов акаунт"
 
-#: src/mainwindow.c:728
+#: src/mainwindow.c:737
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Конфигуриране/_Редактиране на акаунтите"
 
-#: src/mainwindow.c:730
+#: src/mainwindow.c:739
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Конфигуриране/С_мяна на текущия акаунт"
 
-#: src/mainwindow.c:734
+#: src/mainwindow.c:743
 msgid "/_Help/_Manual"
 msgstr "/_Помощ/_Наръчник"
 
-#: src/mainwindow.c:735
+#: src/mainwindow.c:744
 msgid "/_Help/_Manual/_English"
 msgstr "/_Помощ/_Наръчник/_Английски"
 
-#: src/mainwindow.c:736
+#: src/mainwindow.c:745
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/_Помощ/_Наръчник/_Японски"
 
-#: src/mainwindow.c:737
+#: src/mainwindow.c:746
 msgid "/_Help/_FAQ"
 msgstr "/_Помощ/_Чести въпроси"
 
-#: src/mainwindow.c:738
+#: src/mainwindow.c:747
 msgid "/_Help/_FAQ/_English"
 msgstr "/_Помощ/_Чести въпроси/_Английски"
 
-#: src/mainwindow.c:739
+#: src/mainwindow.c:748
 msgid "/_Help/_FAQ/_German"
 msgstr "/_Помощ/_Чести въпроси/_Немски"
 
-#: src/mainwindow.c:740
+#: src/mainwindow.c:749
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/_Помощ/_Чести въпроси/_Испански"
 
-#: src/mainwindow.c:741
+#: src/mainwindow.c:750
 msgid "/_Help/_FAQ/_French"
 msgstr "/_Помощ/_Чести въпроси/_Френски"
 
-#: src/mainwindow.c:742
+#: src/mainwindow.c:751
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/_Помощ/_Чести въпроси/_Италиански"
 
-#: src/mainwindow.c:743
+#: src/mainwindow.c:752
 msgid "/_Help/---"
 msgstr "/_Помощ/---"
 
-#: src/mainwindow.c:783
+#: src/mainwindow.c:792
 msgid "Creating main window...\n"
 msgstr "Създаване на главен прозорец...\n"
 
-#: src/mainwindow.c:943
+#: src/mainwindow.c:952
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr ""
 
-#: src/mainwindow.c:1021 src/summaryview.c:1368 src/summaryview.c:1677
+#: src/mainwindow.c:1030 src/summaryview.c:1368 src/summaryview.c:1677
 #: src/summaryview.c:1785 src/summaryview.c:1831 src/summaryview.c:2453
 #: src/summaryview.c:3080 src/summaryview.c:3146 src/summaryview.c:3171
 #: src/summaryview.c:3284
 msgid "done.\n"
 msgstr "готово.\n"
 
-#: src/mainwindow.c:1137 src/mainwindow.c:1178 src/mainwindow.c:1206
+#: src/mainwindow.c:1146 src/mainwindow.c:1187 src/mainwindow.c:1215
 msgid "Untitled"
 msgstr "Неозаглавен"
 
-#: src/mainwindow.c:1207
+#: src/mainwindow.c:1216
 msgid "none"
 msgstr "липсва"
 
-#: src/mainwindow.c:1257
+#: src/mainwindow.c:1266
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "Промяна на разделението на прозореца от %d до %d\n"
 
-#: src/mainwindow.c:1477
+#: src/mainwindow.c:1486
 msgid "Offline"
 msgstr "Без достъп до мрежа"
 
-#: src/mainwindow.c:1478
+#: src/mainwindow.c:1487
 msgid "You are offline. Go online?"
 msgstr "Работите без достъп до мрежа. Желаете ли да включите мрежата?"
 
-#: src/mainwindow.c:1492
+#: src/mainwindow.c:1501
 #, fuzzy
 msgid "Empty all trash"
 msgstr "Изчистване на кошчето"
 
-#: src/mainwindow.c:1493
+#: src/mainwindow.c:1502
 #, fuzzy
 msgid "Empty messages in all trash?"
 msgstr "Желаете ли изчистване на кошчето?"
 
-#: src/mainwindow.c:1521
+#: src/mainwindow.c:1530
 msgid "Add mailbox"
 msgstr "Добавяне на пощенска кутия"
 
-#: src/mainwindow.c:1522
+#: src/mainwindow.c:1531
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3141,16 +3177,16 @@ msgstr ""
 "Ако е указана съществуваща кутия, тя ще бъде\n"
 "сканирана автоматично."
 
-#: src/mainwindow.c:1528
+#: src/mainwindow.c:1537
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Вече съществува пощенска кутия `%s'."
 
-#: src/mainwindow.c:1533 src/setup.c:57
+#: src/mainwindow.c:1542 src/setup.c:57
 msgid "Mailbox"
 msgstr "Пощенска кутия"
 
-#: src/mainwindow.c:1539 src/setup.c:63
+#: src/mainwindow.c:1548 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3159,144 +3195,144 @@ msgstr ""
 "Създаването на пощенска кутия се провали.\n"
 "Вече съществуват някакви файлове, или нямате права за запис."
 
-#: src/mainwindow.c:1912
+#: src/mainwindow.c:1921
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Изглед на папките"
 
-#: src/mainwindow.c:1932 src/messageview.c:358
+#: src/mainwindow.c:1941 src/messageview.c:358
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Изглед на съобщенията"
 
-#: src/mainwindow.c:2079 src/summaryview.c:340
+#: src/mainwindow.c:2088 src/summaryview.c:340
 msgid "/_Reply"
 msgstr "/_Отговор"
 
-#: src/mainwindow.c:2080
+#: src/mainwindow.c:2089
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "Отговаряне на всички"
 
-#: src/mainwindow.c:2081
+#: src/mainwindow.c:2090
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/Отговор _до/_подател"
 
-#: src/mainwindow.c:2082
+#: src/mainwindow.c:2091
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/Отговор _до/пощенски _списък"
 
-#: src/mainwindow.c:2087 src/summaryview.c:347
+#: src/mainwindow.c:2096 src/summaryview.c:347
 msgid "/_Forward"
 msgstr "/_Препращане"
 
-#: src/mainwindow.c:2088 src/summaryview.c:348
+#: src/mainwindow.c:2097 src/summaryview.c:348
 msgid "/For_ward as attachment"
 msgstr "/Пр_епращане като притурка"
 
-#: src/mainwindow.c:2089 src/summaryview.c:349
+#: src/mainwindow.c:2098 src/summaryview.c:349
 msgid "/Redirec_t"
 msgstr "/П_ренасочване"
 
-#: src/mainwindow.c:2125
+#: src/mainwindow.c:2134
 msgid "Get"
 msgstr "Получаване"
 
-#: src/mainwindow.c:2126
+#: src/mainwindow.c:2135
 msgid "Incorporate new mail"
 msgstr "Приемане на нова поща"
 
-#: src/mainwindow.c:2133
+#: src/mainwindow.c:2142
 msgid "Get all"
 msgstr "Получаване от всички"
 
-#: src/mainwindow.c:2134
+#: src/mainwindow.c:2143
 msgid "Incorporate new mail of all accounts"
 msgstr "Приемане на нова поща от всички акаунти"
 
-#: src/mainwindow.c:2145
+#: src/mainwindow.c:2154
 msgid "Send queued message(s)"
 msgstr "Изпращане на съобщенията в опашката"
 
-#: src/mainwindow.c:2155 src/prefs_account.c:705 src/prefs_common.c:852
+#: src/mainwindow.c:2164 src/prefs_account.c:705 src/prefs_common.c:852
 #: src/prefs_folder_item.c:137
 msgid "Compose"
 msgstr "Съставяне"
 
-#: src/mainwindow.c:2156
+#: src/mainwindow.c:2165
 msgid "Compose new message"
 msgstr "Съставяне на ново съобщение"
 
-#: src/mainwindow.c:2164 src/prefs_common.c:1353
+#: src/mainwindow.c:2173 src/prefs_common.c:1365
 msgid "Reply"
 msgstr "Отговаряне"
 
-#: src/mainwindow.c:2165 src/mainwindow.c:2178
+#: src/mainwindow.c:2174 src/mainwindow.c:2187
 msgid "Reply to the message"
 msgstr "Отговаряне на съобщение"
 
-#: src/mainwindow.c:2183
+#: src/mainwindow.c:2192
 msgid "Reply all"
 msgstr "На всички"
 
-#: src/mainwindow.c:2184
+#: src/mainwindow.c:2193
 msgid "Reply to all"
 msgstr "Отговаряне на всички"
 
-#: src/mainwindow.c:2192 src/prefs_filter_edit.c:719
+#: src/mainwindow.c:2201 src/prefs_filter_edit.c:719
 msgid "Forward"
 msgstr "Препращане"
 
-#: src/mainwindow.c:2193 src/mainwindow.c:2206
+#: src/mainwindow.c:2202 src/mainwindow.c:2215
 msgid "Forward the message"
 msgstr "Препращане на съобщението"
 
-#: src/mainwindow.c:2213
+#: src/mainwindow.c:2222
 msgid "Delete the message"
 msgstr "Изтриване на съобщението"
 
-#: src/mainwindow.c:2221
+#: src/mainwindow.c:2230
 msgid "Execute"
 msgstr "Изпълняване"
 
-#: src/mainwindow.c:2222
+#: src/mainwindow.c:2231
 msgid "Execute marked process"
 msgstr "Изпълняване на маркирания процес"
 
-#: src/mainwindow.c:2231
+#: src/mainwindow.c:2240
 msgid "Next unread message"
 msgstr "Следващо непрочетено съобщение"
 
-#: src/mainwindow.c:2242
+#: src/mainwindow.c:2251
 msgid "Prefs"
 msgstr "Предпочитания"
 
-#: src/mainwindow.c:2243
+#: src/mainwindow.c:2252
 msgid "Common preferences"
 msgstr "Общи предпочитания"
 
-#: src/mainwindow.c:2250 src/prefs_folder_item.c:258
+#: src/mainwindow.c:2259 src/prefs_folder_item.c:258
 #: src/prefs_folder_item.c:269 src/progressdialog.c:50
 msgid "Account"
 msgstr "Акаунт"
 
-#: src/mainwindow.c:2251
+#: src/mainwindow.c:2260
 msgid "Account setting"
 msgstr "Конфигуриране на акаунт"
 
-#: src/mainwindow.c:2425
+#: src/mainwindow.c:2434
 msgid "You are offline. Click the icon to go online."
 msgstr "Работите без достъп до мрежа. Щракнете иконата за да включите мрежата."
 
-#: src/mainwindow.c:2436
+#: src/mainwindow.c:2445
 msgid "You are online. Click the icon to go offline."
 msgstr "Работите с достъп до мрежа. Щракнете иконата за да изключите мрежата."
 
-#: src/mainwindow.c:2624
+#: src/mainwindow.c:2633
 msgid "Exit"
 msgstr "Изход"
 
-#: src/mainwindow.c:2624
+#: src/mainwindow.c:2633
 msgid "Exit this program?"
 msgstr "Желаете ли изход от програмата?"
 
@@ -3420,7 +3456,7 @@ msgstr "Търсенето приключи"
 msgid "Creating message view...\n"
 msgstr "Създаване на изглед на съобщениято...\n"
 
-#: src/messageview.c:303 src/prefs_common.c:1550
+#: src/messageview.c:303 src/prefs_common.c:1562
 msgid "Text"
 msgstr "Текст"
 
@@ -3433,7 +3469,7 @@ msgstr "Притурки"
 msgid "Can't save the file `%s'."
 msgstr "Не може да се запази файлът `%s'."
 
-#: src/messageview.c:697 src/prefs_common.c:2154 src/summaryview.c:2744
+#: src/messageview.c:697 src/prefs_common.c:2166 src/summaryview.c:2744
 msgid "Print"
 msgstr "Печат"
 
@@ -3908,7 +3944,7 @@ msgstr "(Нефилтрираните съобщения ще бъдат съх�
 msgid "Authentication method"
 msgstr "Метод на удостоверяване"
 
-#: src/prefs_account.c:1123 src/prefs_account.c:1239 src/prefs_common.c:1189
+#: src/prefs_account.c:1123 src/prefs_account.c:1239 src/prefs_common.c:1201
 msgid "Automatic"
 msgstr "Автоматично"
 
@@ -3932,7 +3968,7 @@ msgstr "Генериране на Message-ID"
 msgid "Add user-defined header"
 msgstr "Добавяне на заглавна част от потребителя"
 
-#: src/prefs_account.c:1196 src/prefs_common.c:1714 src/prefs_common.c:1739
+#: src/prefs_account.c:1196 src/prefs_common.c:1726 src/prefs_common.c:1751
 msgid " Edit... "
 msgstr " Редактиране... "
 
@@ -4328,106 +4364,107 @@ msgid "Save sent messages to outbox"
 msgstr "Запазване на изпратените съобщения в Изпратени"
 
 #: src/prefs_common.c:1113
-msgid "Outgoing codeset"
+#, fuzzy
+msgid "Outgoing encoding"
 msgstr "Изходяща кодова таблица"
 
 #: src/prefs_common.c:1128
 msgid "Automatic (Recommended)"
 msgstr "Автоматично (Препоръчително)"
 
-#: src/prefs_common.c:1129
+#: src/prefs_common.c:1130
 msgid "7bit ascii (US-ASCII)"
 msgstr "7bit ascii (US-ASCII)"
 
-#: src/prefs_common.c:1130
+#: src/prefs_common.c:1132
 msgid "Unicode (UTF-8)"
 msgstr "Уникод (UTF-8)"
 
-#: src/prefs_common.c:1131
+#: src/prefs_common.c:1134
 msgid "Western European (ISO-8859-1)"
 msgstr "Западно европейски (ISO-8859-1)"
 
-#: src/prefs_common.c:1132
+#: src/prefs_common.c:1135
 msgid "Western European (ISO-8859-15)"
 msgstr "Западно европейски (ISO-8859-15)"
 
-#: src/prefs_common.c:1133
+#: src/prefs_common.c:1137
 msgid "Central European (ISO-8859-2)"
 msgstr "Централно европейски (ISO-8859-2)"
 
-#: src/prefs_common.c:1134
+#: src/prefs_common.c:1139
 msgid "Baltic (ISO-8859-13)"
 msgstr "Балтийски (ISO-8859-13)"
 
-#: src/prefs_common.c:1135
+#: src/prefs_common.c:1140
 msgid "Baltic (ISO-8859-4)"
 msgstr "Балтийски (ISO-8859-4)"
 
-#: src/prefs_common.c:1136
+#: src/prefs_common.c:1142
 msgid "Greek (ISO-8859-7)"
 msgstr "Гръцки (ISO-8859-7)"
 
-#: src/prefs_common.c:1137
+#: src/prefs_common.c:1144
 msgid "Turkish (ISO-8859-9)"
 msgstr "Турски (ISO-8859-9)"
 
-#: src/prefs_common.c:1138
+#: src/prefs_common.c:1146
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Кирилица (ISO-8859-5)"
 
-#: src/prefs_common.c:1139
+#: src/prefs_common.c:1147
 msgid "Cyrillic (KOI8-R)"
 msgstr "Кирилица (KOI8-R)"
 
-#: src/prefs_common.c:1140
-msgid "Cyrillic (Windows-1251)"
-msgstr "Кирилица (Windows-1251)"
-
-#: src/prefs_common.c:1141
+#: src/prefs_common.c:1148
 msgid "Cyrillic (KOI8-U)"
 msgstr "Кирилица (KOI8-U)"
 
-#: src/prefs_common.c:1142
+#: src/prefs_common.c:1149
+msgid "Cyrillic (Windows-1251)"
+msgstr "Кирилица (Windows-1251)"
+
+#: src/prefs_common.c:1151
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Японски (ISO-2022-JP)"
 
-#: src/prefs_common.c:1144
+#: src/prefs_common.c:1153
 msgid "Japanese (EUC-JP)"
 msgstr "Японски (EUC-JP)"
 
-#: src/prefs_common.c:1145
+#: src/prefs_common.c:1154
 msgid "Japanese (Shift_JIS)"
 msgstr "Японски (Shift_JIS)"
 
-#: src/prefs_common.c:1147
+#: src/prefs_common.c:1157
 msgid "Simplified Chinese (GB2312)"
 msgstr "Опростен китайски (GB2312)"
 
-#: src/prefs_common.c:1148
+#: src/prefs_common.c:1158
 msgid "Traditional Chinese (Big5)"
 msgstr "Традиционен китайски (Big5)"
 
-#: src/prefs_common.c:1150
+#: src/prefs_common.c:1160
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Традиционен китайски (EUC-TW)"
 
-#: src/prefs_common.c:1151
+#: src/prefs_common.c:1161
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Китайски (ISO-2022-CN)"
 
-#: src/prefs_common.c:1153
+#: src/prefs_common.c:1164
 msgid "Korean (EUC-KR)"
 msgstr "Корейски (EUC-KR)"
 
-#: src/prefs_common.c:1154
+#: src/prefs_common.c:1166
 msgid "Thai (TIS-620)"
 msgstr "Тайландски (TIS-620)"
 
-#: src/prefs_common.c:1155
+#: src/prefs_common.c:1167
 msgid "Thai (Windows-874)"
 msgstr "Тайландски (Windows-874)"
 
-#: src/prefs_common.c:1165
+#: src/prefs_common.c:1177
 #, fuzzy
 msgid ""
 "If `Automatic' is selected, the optimal encoding for the current locale will "
@@ -4436,11 +4473,11 @@ msgstr ""
 "Ако е избрано `Автоматично', ще бъде избрано\n"
 "оптималното за текущия локал кодиране."
 
-#: src/prefs_common.c:1179
+#: src/prefs_common.c:1191
 msgid "Transfer encoding"
 msgstr "Преносно кодиране"
 
-#: src/prefs_common.c:1202
+#: src/prefs_common.c:1214
 #, fuzzy
 msgid ""
 "Specify Content-Transfer-Encoding used when message body contains non-ASCII "
@@ -4449,118 +4486,118 @@ msgstr ""
 "Укажете Преносно Кодиране на Съдържанието(Content-Transfer-Encoding)\n"
 "използвано когато тялото на съобщението съдържа не-ASCII знаци."
 
-#: src/prefs_common.c:1272
+#: src/prefs_common.c:1284
 msgid "Signature separator"
 msgstr "Разделител на сигнатурата"
 
-#: src/prefs_common.c:1281
+#: src/prefs_common.c:1293
 msgid "Insert automatically"
 msgstr "Автоматично вмъкване"
 
-#: src/prefs_common.c:1291
+#: src/prefs_common.c:1303
 msgid "Automatically launch the external editor"
 msgstr "Автоматично стартиране на външен редактор"
 
-#: src/prefs_common.c:1301
+#: src/prefs_common.c:1313
 msgid "Undo level"
 msgstr "Ниво на отмяна"
 
-#: src/prefs_common.c:1321
+#: src/prefs_common.c:1333
 msgid "Wrap messages at"
 msgstr "Пренасяне на съобщенията на"
 
-#: src/prefs_common.c:1333
+#: src/prefs_common.c:1345
 msgid "characters"
 msgstr "знака"
 
-#: src/prefs_common.c:1343
+#: src/prefs_common.c:1355
 msgid "Wrap quotation"
 msgstr "Пренасяне на цитат"
 
-#: src/prefs_common.c:1349
+#: src/prefs_common.c:1361
 msgid "Wrap on input"
 msgstr "Пренасяне при въвеждане"
 
-#: src/prefs_common.c:1351
+#: src/prefs_common.c:1363
 msgid "Wrap before sending"
 msgstr "Пренасяне преди изпращане"
 
-#: src/prefs_common.c:1361
+#: src/prefs_common.c:1373
 msgid "Automatically select account for replies"
 msgstr "Автоматично избиране на акаунт за отговор"
 
-#: src/prefs_common.c:1363
+#: src/prefs_common.c:1375
 msgid "Quote message when replying"
 msgstr "Цитиране на съобщението при отговаряне"
 
-#: src/prefs_common.c:1365
+#: src/prefs_common.c:1377
 msgid "Reply button invokes mailing list reply"
 msgstr "Бутона за отговор изпълнява отговор до пощенски списък"
 
 #. reply
-#: src/prefs_common.c:1411
+#: src/prefs_common.c:1423
 msgid "Reply format"
 msgstr "Формат на отговора"
 
-#: src/prefs_common.c:1426 src/prefs_common.c:1468
+#: src/prefs_common.c:1438 src/prefs_common.c:1480
 msgid "Quotation mark"
 msgstr "Маркиране на цитат"
 
 #. forward
-#: src/prefs_common.c:1453
+#: src/prefs_common.c:1465
 msgid "Forward format"
 msgstr "Формат на препращане"
 
-#: src/prefs_common.c:1500
+#: src/prefs_common.c:1512
 msgid " Description of symbols "
 msgstr " Описание на символите "
 
-#: src/prefs_common.c:1541
+#: src/prefs_common.c:1553
 msgid "Font"
 msgstr "Шрифт"
 
-#: src/prefs_common.c:1573
+#: src/prefs_common.c:1585
 msgid "Translate header name (such as `From:', `Subject:')"
 msgstr "Превеждане на име на заглавна част (като 'From:', 'Subject:')"
 
-#: src/prefs_common.c:1576
+#: src/prefs_common.c:1588
 msgid "Display unread number next to folder name"
 msgstr "Показване на броя на непрочетените до името на папката"
 
-#: src/prefs_common.c:1585
+#: src/prefs_common.c:1597
 msgid "Abbreviate newsgroups longer than"
 msgstr "Съкращаване на новинарски групи по дълги от"
 
-#: src/prefs_common.c:1600
+#: src/prefs_common.c:1612
 msgid "letters"
 msgstr "букви"
 
 #. ---- Summary ----
-#: src/prefs_common.c:1606
+#: src/prefs_common.c:1618
 msgid "Summary View"
 msgstr "Изглед на извадката"
 
-#: src/prefs_common.c:1615
+#: src/prefs_common.c:1627
 msgid "Display recipient on `From' column if sender is yourself"
 msgstr "Показване на получателя в `От' колоната, ако изпращача сте вие"
 
-#: src/prefs_common.c:1617
+#: src/prefs_common.c:1629
 msgid "Expand threads"
 msgstr "Развиване на нишките..."
 
-#: src/prefs_common.c:1625 src/prefs_common.c:2443 src/prefs_common.c:2481
+#: src/prefs_common.c:1637 src/prefs_common.c:2455 src/prefs_common.c:2493
 msgid "Date format"
 msgstr "Формат на датата"
 
-#: src/prefs_common.c:1646
+#: src/prefs_common.c:1658
 msgid " Set display item of summary... "
 msgstr "Определяне на атрибути на извадката"
 
-#: src/prefs_common.c:1710
+#: src/prefs_common.c:1722
 msgid "Enable coloration of message"
 msgstr "Позволяване на оцветяване на съобщение"
 
-#: src/prefs_common.c:1724
+#: src/prefs_common.c:1736
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
@@ -4568,324 +4605,324 @@ msgstr ""
 "Показване на multi-byte азбука и цифри като\n"
 "ASCII знаци (само за Японски)"
 
-#: src/prefs_common.c:1730
+#: src/prefs_common.c:1742
 msgid "Display header pane above message view"
 msgstr "Панел със заглавна част над изгледа на съобщението"
 
-#: src/prefs_common.c:1737
+#: src/prefs_common.c:1749
 msgid "Display short headers on message view"
 msgstr "Показване на кратки заглавни части в изгледа на съобщението"
 
-#: src/prefs_common.c:1758
+#: src/prefs_common.c:1770
 msgid "Line space"
 msgstr "Разстояние м/у редовете"
 
-#: src/prefs_common.c:1772 src/prefs_common.c:1810
+#: src/prefs_common.c:1784 src/prefs_common.c:1822
 msgid "pixel(s)"
 msgstr "пиксел(а)"
 
-#: src/prefs_common.c:1777
+#: src/prefs_common.c:1789
 msgid "Scroll"
 msgstr "Превъртане"
 
-#: src/prefs_common.c:1784
+#: src/prefs_common.c:1796
 msgid "Half page"
 msgstr "Половин страница"
 
-#: src/prefs_common.c:1790
+#: src/prefs_common.c:1802
 msgid "Smooth scroll"
 msgstr "Плавно превъртане"
 
-#: src/prefs_common.c:1796
+#: src/prefs_common.c:1808
 msgid "Step"
 msgstr "Стъпка"
 
-#: src/prefs_common.c:1816
+#: src/prefs_common.c:1828
 msgid "Images"
 msgstr ""
 
-#: src/prefs_common.c:1824
+#: src/prefs_common.c:1836
 #, fuzzy
 msgid "Resize attached large images to fit in the window"
 msgstr "Разпъване на прикрепени изображения"
 
-#: src/prefs_common.c:1826
+#: src/prefs_common.c:1838
 #, fuzzy
 msgid "Display images as inline"
 msgstr "Настройка на показваните заглавки части"
 
-#: src/prefs_common.c:1871
+#: src/prefs_common.c:1883
 msgid "Automatically check signatures"
 msgstr "Автоматична проверка на подписите"
 
-#: src/prefs_common.c:1874
+#: src/prefs_common.c:1886
 msgid "Show signature check result in a popup window"
 msgstr "Показване в отделен прозорец на резултата от проверка на подписа"
 
-#: src/prefs_common.c:1877
+#: src/prefs_common.c:1889
 msgid "Store passphrase in memory temporarily"
 msgstr "Временно съхраняване на паролата в паметта"
 
-#: src/prefs_common.c:1892
+#: src/prefs_common.c:1904
 msgid "Expired after"
 msgstr "Невалидно след"
 
-#: src/prefs_common.c:1905
+#: src/prefs_common.c:1917
 msgid "minute(s) "
 msgstr "минута(и)"
 
-#: src/prefs_common.c:1918
+#: src/prefs_common.c:1930
 #, fuzzy
 msgid "Setting to '0' will store the passphrase for the whole session."
 msgstr ""
 "(Установяване на `0' ще съхранява паролата\n"
 "през цялата сесия)"
 
-#: src/prefs_common.c:1932
+#: src/prefs_common.c:1944
 msgid "Grab input while entering a passphrase"
 msgstr "Прехващане на входа при въвеждане на парола"
 
-#: src/prefs_common.c:1937
+#: src/prefs_common.c:1949
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "Показване на предупреждение при стартиране, ако GnuPG не работи"
 
-#: src/prefs_common.c:1989
+#: src/prefs_common.c:2001
 msgid "Always open messages in summary when selected"
 msgstr "Отваряне винаги на съобщенията избрани в извадката"
 
-#: src/prefs_common.c:1993
+#: src/prefs_common.c:2005
 msgid "Open first unread message when entering a folder"
 msgstr "Отваряне на първото непрочетено съобщение при влизане в папка"
 
-#: src/prefs_common.c:1997
+#: src/prefs_common.c:2009
 msgid "Only mark message as read when opened in new window"
 msgstr "Маркиране като прочетено само на съобщение отворено в нов прозорец"
 
-#: src/prefs_common.c:2001
+#: src/prefs_common.c:2013
 msgid "Go to inbox after receiving new mail"
 msgstr "Влизане във входящата кутия след получаване на нови съобщения"
 
-#: src/prefs_common.c:2009
+#: src/prefs_common.c:2021
 msgid "Execute immediately when moving or deleting messages"
 msgstr "Незабавно изпълнение при местене или изтриване на съобщения"
 
-#: src/prefs_common.c:2021
+#: src/prefs_common.c:2033
 #, fuzzy
 msgid "Messages will be marked until execution if this is turned off."
 msgstr ""
 "(Съобщенията ще бъдат маркирани до изпълнението\n"
 "ако това е изключено)"
 
-#: src/prefs_common.c:2029
+#: src/prefs_common.c:2041
 msgid "Receive dialog"
 msgstr "Диалог при получаване"
 
-#: src/prefs_common.c:2039
+#: src/prefs_common.c:2051
 msgid "Show receive dialog"
 msgstr "Показване на диалог при получаване"
 
-#: src/prefs_common.c:2049
+#: src/prefs_common.c:2061
 msgid "Always"
 msgstr "Винаги"
 
-#: src/prefs_common.c:2050
+#: src/prefs_common.c:2062
 msgid "Only on manual receiving"
 msgstr "Само при ръчно получаване"
 
-#: src/prefs_common.c:2052
+#: src/prefs_common.c:2064
 msgid "Never"
 msgstr "Никога"
 
-#: src/prefs_common.c:2057
+#: src/prefs_common.c:2069
 msgid "Don't popup error dialog on receive error"
 msgstr "Без повдигане на диалог за грешка при грешка при получаване"
 
-#: src/prefs_common.c:2060
+#: src/prefs_common.c:2072
 msgid "Close receive dialog when finished"
 msgstr "Затваряне на диалога при получаване когато завърши"
 
-#: src/prefs_common.c:2066
+#: src/prefs_common.c:2078
 msgid " Set key bindings... "
 msgstr "Определяне на клавишни комбинации"
 
-#: src/prefs_common.c:2122
+#: src/prefs_common.c:2134
 #, c-format
 msgid "External commands (%s will be replaced with file name / URI)"
 msgstr "Външни команди (%s ще бъде заменен с име на файл / URI)"
 
-#: src/prefs_common.c:2131
+#: src/prefs_common.c:2143
 msgid "Web browser"
 msgstr "Уеб браузър"
 
-#: src/prefs_common.c:2195
+#: src/prefs_common.c:2207
 msgid "Add address to destination when double-clicked"
 msgstr "Добавяне на адреса в назначението при двойно щракване"
 
-#: src/prefs_common.c:2197
+#: src/prefs_common.c:2209
 msgid "On exit"
 msgstr "При излизане"
 
-#: src/prefs_common.c:2205
+#: src/prefs_common.c:2217
 msgid "Confirm on exit"
 msgstr "Потвърждение при излизане"
 
-#: src/prefs_common.c:2212
+#: src/prefs_common.c:2224
 msgid "Empty trash on exit"
 msgstr "Изчистване на Кошчето на излизане"
 
-#: src/prefs_common.c:2214
+#: src/prefs_common.c:2226
 msgid "Ask before emptying"
 msgstr "Питане преди изчистване"
 
-#: src/prefs_common.c:2218
+#: src/prefs_common.c:2230
 msgid "Warn if there are queued messages"
 msgstr "Предупреждение ако има съобщения в опашката"
 
-#: src/prefs_common.c:2224
+#: src/prefs_common.c:2236
 msgid "Socket I/O timeout:"
 msgstr "Просрочка на В/И порт:"
 
-#: src/prefs_common.c:2237
+#: src/prefs_common.c:2249
 msgid "second(s)"
 msgstr "секунда(и)"
 
-#: src/prefs_common.c:2419
+#: src/prefs_common.c:2431
 msgid "the full abbreviated weekday name"
 msgstr "напълно съкратеното име на делника"
 
-#: src/prefs_common.c:2420
+#: src/prefs_common.c:2432
 msgid "the full weekday name"
 msgstr "пълното име на делника"
 
-#: src/prefs_common.c:2421
+#: src/prefs_common.c:2433
 msgid "the abbreviated month name"
 msgstr "съкратеното име на месеца"
 
-#: src/prefs_common.c:2422
+#: src/prefs_common.c:2434
 msgid "the full month name"
 msgstr "пълното име на месеца"
 
-#: src/prefs_common.c:2423
+#: src/prefs_common.c:2435
 msgid "the preferred date and time for the current locale"
 msgstr "предпочитаната дата и час за текущия локал"
 
-#: src/prefs_common.c:2424
+#: src/prefs_common.c:2436
 msgid "the century number (year/100)"
 msgstr "век (годинa/100)"
 
-#: src/prefs_common.c:2425
+#: src/prefs_common.c:2437
 msgid "the day of the month as a decimal number"
 msgstr "денят от месеца като десетично число"
 
-#: src/prefs_common.c:2426
+#: src/prefs_common.c:2438
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "часа като десетично число ползвайки 24-часов часовник"
 
-#: src/prefs_common.c:2427
+#: src/prefs_common.c:2439
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "часа като десетично число ползвайки 12-часов часовник"
 
-#: src/prefs_common.c:2428
+#: src/prefs_common.c:2440
 msgid "the day of the year as a decimal number"
 msgstr "деня от годината като десетично число"
 
-#: src/prefs_common.c:2429
+#: src/prefs_common.c:2441
 msgid "the month as a decimal number"
 msgstr "месеца като десетично число"
 
-#: src/prefs_common.c:2430
+#: src/prefs_common.c:2442
 msgid "the minute as a decimal number"
 msgstr "минутата като десетично число"
 
-#: src/prefs_common.c:2431
+#: src/prefs_common.c:2443
 msgid "either AM or PM"
 msgstr "или AM или PM"
 
-#: src/prefs_common.c:2432
+#: src/prefs_common.c:2444
 msgid "the second as a decimal number"
 msgstr "секундата като десетично число"
 
-#: src/prefs_common.c:2433
+#: src/prefs_common.c:2445
 msgid "the day of the week as a decimal number"
 msgstr "деня от седмицата като десетично число"
 
-#: src/prefs_common.c:2434
+#: src/prefs_common.c:2446
 msgid "the preferred date for the current locale"
 msgstr "предпочитаната дата за текущия локал"
 
-#: src/prefs_common.c:2435
+#: src/prefs_common.c:2447
 msgid "the last two digits of a year"
 msgstr "последните две цифри от годината"
 
-#: src/prefs_common.c:2436
+#: src/prefs_common.c:2448
 msgid "the year as a decimal number"
 msgstr "годината като десетично число"
 
-#: src/prefs_common.c:2437
+#: src/prefs_common.c:2449
 msgid "the time zone or name or abbreviation"
 msgstr "времевата зона или име или съкращение"
 
-#: src/prefs_common.c:2458
+#: src/prefs_common.c:2470
 msgid "Specifier"
 msgstr "Идентификатор"
 
-#: src/prefs_common.c:2459
+#: src/prefs_common.c:2471
 msgid "Description"
 msgstr "Описание"
 
-#: src/prefs_common.c:2499
+#: src/prefs_common.c:2511
 msgid "Example"
 msgstr "Пример"
 
-#: src/prefs_common.c:2580
+#: src/prefs_common.c:2592
 msgid "Set message colors"
 msgstr "Определяне на цветове на съобщението"
 
-#: src/prefs_common.c:2588
+#: src/prefs_common.c:2600
 msgid "Colors"
 msgstr "Цветове"
 
-#: src/prefs_common.c:2622
+#: src/prefs_common.c:2634
 msgid "Quoted Text - First Level"
 msgstr "Цитиран Текст - Първо Ниво"
 
-#: src/prefs_common.c:2628
+#: src/prefs_common.c:2640
 msgid "Quoted Text - Second Level"
 msgstr "Цитиран Текст - Второ Ниво"
 
-#: src/prefs_common.c:2634
+#: src/prefs_common.c:2646
 msgid "Quoted Text - Third Level"
 msgstr "Цитиран Текст - Трето Ниво"
 
-#: src/prefs_common.c:2640
+#: src/prefs_common.c:2652
 msgid "URI link"
 msgstr "URI връзка"
 
-#: src/prefs_common.c:2647
+#: src/prefs_common.c:2659
 msgid "Recycle quote colors"
 msgstr "Преизползване на цветовете за цитат"
 
-#: src/prefs_common.c:2707
+#: src/prefs_common.c:2719
 msgid "Pick color for quotation level 1"
 msgstr "Изберете цвят за цитат първо ниво"
 
-#: src/prefs_common.c:2710
+#: src/prefs_common.c:2722
 msgid "Pick color for quotation level 2"
 msgstr "Изберете цвят за цитат второ ниво"
 
-#: src/prefs_common.c:2713
+#: src/prefs_common.c:2725
 msgid "Pick color for quotation level 3"
 msgstr "Изберете цвят за цитат трето ниво"
 
-#: src/prefs_common.c:2716
+#: src/prefs_common.c:2728
 msgid "Pick color for URI"
 msgstr "Изберете цвят за URL"
 
-#: src/prefs_common.c:2853
+#: src/prefs_common.c:2865
 msgid "Description of symbols"
 msgstr "Описание на символите"
 
-#: src/prefs_common.c:2909
+#: src/prefs_common.c:2921
 msgid ""
 "Date\n"
 "From\n"
@@ -4909,11 +4946,11 @@ msgstr ""
 "Новинарски групи\n"
 "Message-ID"
 
-#: src/prefs_common.c:2922
+#: src/prefs_common.c:2934
 msgid "If x is set, displays expr"
 msgstr "Ако x е установен, показва expr"
 
-#: src/prefs_common.c:2926
+#: src/prefs_common.c:2938
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -4927,7 +4964,7 @@ msgstr ""
 "Цитирано тяло на съобщение без подпис\n"
 "Символ %"
 
-#: src/prefs_common.c:2934
+#: src/prefs_common.c:2946
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -4939,15 +4976,15 @@ msgstr ""
 "Символ отваряща къдрава скоба\n"
 "Символ затваряща къдрава скоба"
 
-#: src/prefs_common.c:2971
+#: src/prefs_common.c:2983
 msgid "Font selection"
 msgstr "Избор на шрифт"
 
-#: src/prefs_common.c:3035
+#: src/prefs_common.c:3047
 msgid "Key bindings"
 msgstr "Клавишни комбинации"
 
-#: src/prefs_common.c:3049
+#: src/prefs_common.c:3061
 msgid ""
 "Select the preset of key bindings.\n"
 "You can also modify each menu's shortcuts by pressing\n"
@@ -4957,11 +4994,11 @@ msgstr ""
 "Можете също да променяте препратките на всяко меню като натиснете\n"
 "кой да е клавиш(и) при поставяне на показалеца на мишката върху тях."
 
-#: src/prefs_common.c:3061 src/prefs_common.c:3410
+#: src/prefs_common.c:3073 src/prefs_common.c:3422
 msgid "Default"
 msgstr "По подразбиране"
 
-#: src/prefs_common.c:3064 src/prefs_common.c:3419
+#: src/prefs_common.c:3076 src/prefs_common.c:3431
 msgid "Old Sylpheed"
 msgstr "Стар Sylpheed"
 
@@ -6125,6 +6162,12 @@ msgstr "%.2fGB"
 msgid "writing to %s failed.\n"
 msgstr "записът в %s се провали.\n"
 
+#~ msgid "/_View/_Code set/---"
+#~ msgstr "/_Изглед/_Кодиране/---"
+
+#~ msgid "/_View/_Code set"
+#~ msgstr "/_Изглед/_Кодиране"
+
 #~ msgid "To save this part, pop up the context menu with "
 #~ msgstr "За да запазите тази част, извикайте контекстното меню с"
 
diff --git a/po/cs.po b/po/cs.po
index 3b9b1e5f..d8cc214a 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-03-15 14:29+0900\n"
+"POT-Creation-Date: 2005-03-16 14:47+0900\n"
 "PO-Revision-Date: 2003-05-30 13:31GMT+0100\n"
 "Last-Translator: Radek Vybíral <Radek.Vybiral@vsb.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -96,7 +96,7 @@ msgstr ""
 "kontrolován při volbě 'Stáhnout vše, zaškrtněte políčko ve sloupci 'G'."
 
 #: src/account.c:638 src/addressadd.c:186 src/addressbook.c:488
-#: src/compose.c:3650 src/editaddress.c:195 src/editaddress.c:936
+#: src/compose.c:3748 src/editaddress.c:195 src/editaddress.c:936
 #: src/editaddress.c:984 src/editbook.c:191 src/editgroup.c:257
 #: src/editjpilot.c:296 src/editldap.c:300 src/editvcard.c:211
 #: src/mimeview.c:151 src/prefs_filter.c:214 src/prefs_folder_item.c:170
@@ -149,13 +149,13 @@ msgstr "Smazat účet"
 msgid "Do you really want to delete this account?"
 msgstr "Opravdu chcete tento účet smazat?"
 
-#: src/account.c:758 src/compose.c:2551 src/compose.c:4807
+#: src/account.c:758 src/compose.c:2632 src/compose.c:4943
 #: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
 #: src/folderview.c:2156 src/folderview.c:2192
 msgid "Yes"
 msgstr "Ano"
 
-#: src/account.c:758 src/compose.c:2551 src/compose.c:4807
+#: src/account.c:758 src/compose.c:2632 src/compose.c:4943
 #: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
 #: src/folderview.c:2156 src/folderview.c:2192
 msgid "+No"
@@ -260,7 +260,7 @@ msgstr "Argument uživatele pro akci"
 msgid "Add Address to Book"
 msgstr "Přidat adresu do databáze"
 
-#: src/addressadd.c:196 src/compose.c:4191 src/editaddress.c:196
+#: src/addressadd.c:196 src/compose.c:4292 src/editaddress.c:196
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "Adresa"
@@ -274,7 +274,7 @@ msgstr "Poznámky"
 msgid "Select Address Book Folder"
 msgstr "Vybrat složku pro databázi adres"
 
-#: src/addressbook.c:334 src/compose.c:469 src/mainwindow.c:454
+#: src/addressbook.c:334 src/compose.c:477 src/mainwindow.c:454
 #: src/messageview.c:134
 msgid "/_File"
 msgstr "/_Soubor"
@@ -295,8 +295,8 @@ msgstr "/_Soubor/Nový _JPilot"
 msgid "/_File/New _Server"
 msgstr "/_Soubor/Nový _server"
 
-#: src/addressbook.c:343 src/addressbook.c:346 src/compose.c:474
-#: src/compose.c:479 src/compose.c:483 src/mainwindow.c:471
+#: src/addressbook.c:343 src/addressbook.c:346 src/compose.c:482
+#: src/compose.c:487 src/compose.c:491 src/mainwindow.c:471
 #: src/mainwindow.c:474 src/mainwindow.c:476 src/mainwindow.c:479
 #: src/mainwindow.c:481 src/messageview.c:137
 msgid "/_File/---"
@@ -314,7 +314,7 @@ msgstr "/_Soubor/_Smazat"
 msgid "/_File/_Save"
 msgstr "/_Soubor/_Uložit"
 
-#: src/addressbook.c:348 src/compose.c:484 src/messageview.c:138
+#: src/addressbook.c:348 src/compose.c:492 src/messageview.c:138
 msgid "/_File/_Close"
 msgstr "/_Soubor/_Zavřít"
 
@@ -346,7 +346,7 @@ msgstr "/_Adresa/U_pravit"
 msgid "/_Address/_Delete"
 msgstr "/_Adresa/S_mazat"
 
-#: src/addressbook.c:356 src/compose.c:585 src/mainwindow.c:688
+#: src/addressbook.c:356 src/compose.c:664 src/mainwindow.c:697
 #: src/messageview.c:246
 msgid "/_Tools"
 msgstr "/_Nástroje"
@@ -355,12 +355,12 @@ msgstr "/_Nástroje"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Nástroje/Importovat _LDIF soubor"
 
-#: src/addressbook.c:358 src/compose.c:598 src/mainwindow.c:733
+#: src/addressbook.c:358 src/compose.c:677 src/mainwindow.c:742
 #: src/messageview.c:264
 msgid "/_Help"
 msgstr "/Nápo_věda"
 
-#: src/addressbook.c:359 src/compose.c:599 src/mainwindow.c:744
+#: src/addressbook.c:359 src/compose.c:678 src/mainwindow.c:753
 #: src/messageview.c:265
 msgid "/_Help/_About"
 msgstr "/Nápo_věda/_O aplikaci"
@@ -377,7 +377,7 @@ msgstr "/Nová _skupina"
 msgid "/New _Folder"
 msgstr "/Nová s_ložka"
 
-#: src/addressbook.c:381 src/addressbook.c:391 src/compose.c:463
+#: src/addressbook.c:381 src/addressbook.c:391 src/compose.c:471
 #: src/folderview.c:220 src/folderview.c:222 src/folderview.c:226
 #: src/folderview.c:236 src/folderview.c:238 src/folderview.c:240
 #: src/folderview.c:244 src/folderview.c:254 src/folderview.c:256
@@ -387,7 +387,7 @@ msgstr "/Nová s_ložka"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:382 src/addressbook.c:392 src/compose.c:486
+#: src/addressbook.c:382 src/addressbook.c:392 src/compose.c:494
 #: src/mainwindow.c:485 src/messageview.c:140
 msgid "/_Edit"
 msgstr "/Úp_ravy"
@@ -400,7 +400,7 @@ msgstr "/_Smazat"
 msgid "E-Mail address"
 msgstr "E-mail adresa"
 
-#: src/addressbook.c:493 src/compose.c:4192 src/prefs_common.c:2186
+#: src/addressbook.c:493 src/compose.c:4293 src/prefs_common.c:2198
 msgid "Address book"
 msgstr "Databáze adres"
 
@@ -410,7 +410,7 @@ msgstr "Jméno:"
 
 #. Buttons
 #: src/addressbook.c:625 src/addressbook.c:1665 src/addressbook.c:1671
-#: src/editaddress.c:878 src/editaddress.c:1011 src/mainwindow.c:2212
+#: src/editaddress.c:878 src/editaddress.c:1011 src/mainwindow.c:2221
 #: src/prefs_actions.c:263 src/prefs_display_header.c:275
 #: src/prefs_display_header.c:330 src/prefs_template.c:227
 msgid "Delete"
@@ -602,7 +602,7 @@ msgstr "Společná adresa"
 msgid "Personal address"
 msgstr "Osobní adresa"
 
-#: src/alertpanel.c:123 src/compose.c:4807 src/main.c:458
+#: src/alertpanel.c:123 src/compose.c:4943 src/main.c:458
 msgid "Notice"
 msgstr "Poznámka"
 
@@ -610,7 +610,7 @@ msgstr "Poznámka"
 msgid "Warning"
 msgstr "Varování"
 
-#: src/alertpanel.c:149 src/compose.c:2551 src/inc.c:558
+#: src/alertpanel.c:149 src/compose.c:2632 src/inc.c:558
 msgid "Error"
 msgstr "Chyba"
 
@@ -658,307 +658,425 @@ msgstr "Hnědá"
 msgid "None"
 msgstr "Žádná"
 
-#: src/compose.c:461
+#: src/compose.c:469
 msgid "/_Add..."
 msgstr "/_Přidat..."
 
-#: src/compose.c:462
+#: src/compose.c:470
 msgid "/_Remove"
 msgstr "/_Odstranit"
 
-#: src/compose.c:464 src/folderview.c:228 src/folderview.c:246
+#: src/compose.c:472 src/folderview.c:228 src/folderview.c:246
 #: src/folderview.c:261
 msgid "/_Properties..."
 msgstr "/_Vlastnosti..."
 
-#: src/compose.c:470
+#: src/compose.c:478
 #, fuzzy
 msgid "/_File/_Send"
 msgstr "/_Soubor/_Uložit"
 
-#: src/compose.c:472
+#: src/compose.c:480
 #, fuzzy
 msgid "/_File/Send _later"
 msgstr "/_Zpráva/Poslat p_ozději"
 
-#: src/compose.c:475
+#: src/compose.c:483
 #, fuzzy
 msgid "/_File/Save to _draft folder"
 msgstr "/_Zpráva/Uložit jako _koncept"
 
-#: src/compose.c:477
+#: src/compose.c:485
 #, fuzzy
 msgid "/_File/Save and _keep editing"
 msgstr "/_Zpráva/Uložit a pok_račovat v editaci"
 
-#: src/compose.c:480
+#: src/compose.c:488
 msgid "/_File/_Attach file"
 msgstr "/_Soubor/_Připojit soubor"
 
-#: src/compose.c:481
+#: src/compose.c:489
 msgid "/_File/_Insert file"
 msgstr "/_Soubor/_Vložit soubor"
 
-#: src/compose.c:482
+#: src/compose.c:490
 msgid "/_File/Insert si_gnature"
 msgstr "/_Soubor/Vložit p_odpis"
 
-#: src/compose.c:487
+#: src/compose.c:495
 msgid "/_Edit/_Undo"
 msgstr "/Úp_ravy/_Zpět"
 
-#: src/compose.c:488
+#: src/compose.c:496
 msgid "/_Edit/_Redo"
 msgstr "/Úp_ravy/Z_nova"
 
-#: src/compose.c:489 src/compose.c:567 src/mainwindow.c:489
+#: src/compose.c:497 src/compose.c:575 src/mainwindow.c:489
 #: src/messageview.c:143
 msgid "/_Edit/---"
 msgstr "/Úp_ravy/---"
 
-#: src/compose.c:490
+#: src/compose.c:498
 msgid "/_Edit/Cu_t"
 msgstr "/Úp_ravy/_Vyjmout"
 
-#: src/compose.c:491 src/mainwindow.c:486 src/messageview.c:141
+#: src/compose.c:499 src/mainwindow.c:486 src/messageview.c:141
 msgid "/_Edit/_Copy"
 msgstr "/Úp_ravy/_Kopírovat"
 
-#: src/compose.c:492
+#: src/compose.c:500
 msgid "/_Edit/_Paste"
 msgstr "/Úp_ravy/V_ložit"
 
-#: src/compose.c:493
+#: src/compose.c:501
 msgid "/_Edit/Paste as _quotation"
 msgstr "/Úp_ravy/Vložit jako _citaci"
 
-#: src/compose.c:495 src/mainwindow.c:487 src/messageview.c:142
+#: src/compose.c:503 src/mainwindow.c:487 src/messageview.c:142
 msgid "/_Edit/Select _all"
 msgstr "/Úp_ravy/Vybr_at vše"
 
-#: src/compose.c:496
+#: src/compose.c:504
 msgid "/_Edit/A_dvanced"
 msgstr "/Úp_ravy/_Rozšířené"
 
-#: src/compose.c:497
+#: src/compose.c:505
 msgid "/_Edit/A_dvanced/Move a character backward"
 msgstr "/Úp_ravy/_Rozšířené/Přesun o znak zpět"
 
-#: src/compose.c:502
+#: src/compose.c:510
 msgid "/_Edit/A_dvanced/Move a character forward"
 msgstr "/Úp_ravy/_Rozšířené/Přesun o znak dále"
 
-#: src/compose.c:507
+#: src/compose.c:515
 msgid "/_Edit/A_dvanced/Move a word backward"
 msgstr "/Úp_ravy/_Rozšířené/Přesun o slovo zpět"
 
-#: src/compose.c:512
+#: src/compose.c:520
 msgid "/_Edit/A_dvanced/Move a word forward"
 msgstr "/Úp_ravy/_Rozšířené/Přesun o slov dále"
 
-#: src/compose.c:517
+#: src/compose.c:525
 msgid "/_Edit/A_dvanced/Move to beginning of line"
 msgstr "/Úp_ravy/_Rozšířené/Přesun na začátek řádku"
 
-#: src/compose.c:522
+#: src/compose.c:530
 msgid "/_Edit/A_dvanced/Move to end of line"
 msgstr "/Úp_ravy/_Rozšířené/Přesun na konec řádku"
 
-#: src/compose.c:527
+#: src/compose.c:535
 msgid "/_Edit/A_dvanced/Move to previous line"
 msgstr "/Úp_ravy/_Rozšířené/Přesun na předchozí řádek"
 
-#: src/compose.c:532
+#: src/compose.c:540
 msgid "/_Edit/A_dvanced/Move to next line"
 msgstr "/Úp_ravy/_Rozšířené/Přesun na další řádek"
 
-#: src/compose.c:537
+#: src/compose.c:545
 msgid "/_Edit/A_dvanced/Delete a character backward"
 msgstr "/Úp_ravy/_Rozšířené/Smazat znak zpět"
 
-#: src/compose.c:542
+#: src/compose.c:550
 msgid "/_Edit/A_dvanced/Delete a character forward"
 msgstr "/Úp_ravy/_Rozšířené/Smazat znak vpředu"
 
-#: src/compose.c:547
+#: src/compose.c:555
 msgid "/_Edit/A_dvanced/Delete a word backward"
 msgstr "/Úp_ravy/_Rozšířené/Smazat slovo zpět"
 
-#: src/compose.c:552
+#: src/compose.c:560
 msgid "/_Edit/A_dvanced/Delete a word forward"
 msgstr "/Úp_ravy/_Rozšířené/Smazat slovo vpředu"
 
-#: src/compose.c:557
+#: src/compose.c:565
 msgid "/_Edit/A_dvanced/Delete line"
 msgstr "/Úp_ravy/_Rozšířené/Smazat řádek"
 
-#: src/compose.c:562
+#: src/compose.c:570
 msgid "/_Edit/A_dvanced/Delete to end of line"
 msgstr "/Úp_ravy/_Rozšířené/Smazat do konce řádku"
 
-#: src/compose.c:568
+#: src/compose.c:576
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/Úp_ravy/_Zarovnat aktuální odstavec"
 
-#: src/compose.c:570
+#: src/compose.c:578
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/Úp_ravy/Zarovnat _všechny dlouhá řádky"
 
-#: src/compose.c:572
+#: src/compose.c:580
 #, fuzzy
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/Úp_ravy/_Kopírovat"
 
-#: src/compose.c:573 src/mainwindow.c:494 src/messageview.c:147
+#: src/compose.c:581 src/mainwindow.c:494 src/messageview.c:147
 #: src/summaryview.c:370
 msgid "/_View"
 msgstr "/Z_obrazit"
 
-#: src/compose.c:574
+#: src/compose.c:582
 msgid "/_View/_To"
 msgstr "/Z_obrazit/_Komu"
 
-#: src/compose.c:575
+#: src/compose.c:583
 msgid "/_View/_Cc"
 msgstr "/Z_obrazit/K_opie"
 
-#: src/compose.c:576
+#: src/compose.c:584
 msgid "/_View/_Bcc"
 msgstr "/Z_obrazit/_Slepá kopie"
 
-#: src/compose.c:577
+#: src/compose.c:585
 msgid "/_View/_Reply to"
 msgstr "/Z_obrazit/_Odpověď komu "
 
-#: src/compose.c:578 src/compose.c:580 src/compose.c:582 src/mainwindow.c:512
-#: src/mainwindow.c:515 src/mainwindow.c:541 src/mainwindow.c:565
-#: src/mainwindow.c:641 src/mainwindow.c:645 src/messageview.c:223
+#: src/compose.c:586 src/compose.c:588 src/compose.c:590 src/compose.c:592
+#: src/mainwindow.c:512 src/mainwindow.c:515 src/mainwindow.c:541
+#: src/mainwindow.c:565 src/mainwindow.c:650 src/mainwindow.c:654
+#: src/messageview.c:223
 msgid "/_View/---"
 msgstr "/Z_obrazit/---"
 
-#: src/compose.c:579
+#: src/compose.c:587
 msgid "/_View/_Followup to"
 msgstr "/Z_obrazit/_Předat"
 
-#: src/compose.c:581
+#: src/compose.c:589
 msgid "/_View/R_uler"
 msgstr "/Z_obrazit/Praví_tko"
 
-#: src/compose.c:583
+#: src/compose.c:591
 msgid "/_View/_Attachment"
 msgstr "/Z_obrazit/Přílo_ha"
 
-#: src/compose.c:586 src/mainwindow.c:689 src/messageview.c:247
+#: src/compose.c:598 src/mainwindow.c:572 src/messageview.c:154
+#, fuzzy
+msgid "/_View/Character _encoding"
+msgstr "/Z_obrazit/Setříd_it/Sestupně"
+
+#: src/compose.c:599
+msgid "/_View/Character _encoding/_Automatic"
+msgstr ""
+
+#: src/compose.c:601 src/compose.c:607 src/compose.c:613 src/compose.c:617
+#: src/compose.c:623 src/compose.c:627 src/compose.c:631 src/compose.c:641
+#: src/compose.c:645 src/compose.c:653 src/compose.c:657 src/mainwindow.c:568
+#: src/mainwindow.c:575 src/messageview.c:150
+#, fuzzy
+msgid "/_View/Character _encoding/---"
+msgstr "/Z_obrazit/Setříd_it/Sestupně"
+
+#: src/compose.c:603 src/mainwindow.c:576 src/messageview.c:158
+#, fuzzy
+msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
+msgstr "/Z_obrazit/_Znaková sada/7bitová ascii (US-ASC_II)"
+
+#: src/compose.c:605 src/mainwindow.c:578 src/messageview.c:161
+#, fuzzy
+msgid "/_View/Character _encoding/Unicode (_UTF-8)"
+msgstr "/Z_obrazit/_Znaková sada/Unicode (_UTF-8)"
+
+#: src/compose.c:609 src/mainwindow.c:582 src/messageview.c:164
+#, fuzzy
+msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
+msgstr "/Z_obrazit/_Znaková sada/Západní Evropa (ISO-8859-_1)"
+
+#: src/compose.c:611 src/mainwindow.c:584 src/messageview.c:166
+#, fuzzy
+msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
+msgstr "/Z_obrazit/_Znaková sada/Západní Evropa (ISO-8859-15)"
+
+#: src/compose.c:615 src/mainwindow.c:588 src/messageview.c:169
+#, fuzzy
+msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
+msgstr "/Z_obrazit/_Znaková sada/Střední Evropa (ISO-8859-_2)"
+
+#: src/compose.c:619 src/mainwindow.c:592 src/messageview.c:172
+#, fuzzy
+msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
+msgstr "/Z_obrazit/_Znaková sada/_Baltská (ISO-8859-13)"
+
+#: src/compose.c:621 src/mainwindow.c:594 src/messageview.c:174
+#, fuzzy
+msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
+msgstr "/Z_obrazit/_Znaková sada/Baltská (ISO-8859-_4)"
+
+#: src/compose.c:625 src/mainwindow.c:598 src/messageview.c:177
+#, fuzzy
+msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
+msgstr "/Z_obrazit/_Znaková sada/Řecká (ISO-8859-_7)"
+
+#: src/compose.c:629 src/mainwindow.c:602 src/messageview.c:180
+#, fuzzy
+msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
+msgstr "/Z_obrazit/_Znaková sada/Turecká (ISO-8859-_9)"
+
+#: src/compose.c:633 src/mainwindow.c:606 src/messageview.c:183
+#, fuzzy
+msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
+msgstr "/Z_obrazit/_Znaková sada/Azbuka (ISO-8859-_5)"
+
+#: src/compose.c:635 src/mainwindow.c:608 src/messageview.c:185
+#, fuzzy
+msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
+msgstr "/Z_obrazit/_Znaková sada/Azbuka (KOI8-_R)"
+
+#: src/compose.c:637 src/mainwindow.c:610 src/messageview.c:187
+#, fuzzy
+msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
+msgstr "/Z_obrazit/_Znaková sada/Azbuka (KOI8-_R)"
+
+#: src/compose.c:639 src/mainwindow.c:612 src/messageview.c:189
+#, fuzzy
+msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
+msgstr "/Z_obrazit/_Znaková sada/Azbuka (Windows-1251)"
+
+#: src/compose.c:643 src/mainwindow.c:616 src/messageview.c:192
+#, fuzzy
+msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
+msgstr "/Z_obrazit/_Znaková sada/Japonská (ISO-2022-_JP)"
+
+#: src/compose.c:647 src/mainwindow.c:626 src/messageview.c:201
+#, fuzzy
+msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
+msgstr "/Z_obrazit/_Znaková sada/Zjednodušená čínská (_GB2312)"
+
+#: src/compose.c:649 src/mainwindow.c:628 src/messageview.c:203
+#, fuzzy
+msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
+msgstr "/Z_obrazit/_Znaková sada/Tradiční čínská (_Big5)"
+
+#: src/compose.c:651 src/mainwindow.c:630 src/messageview.c:205
+#, fuzzy
+msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
+msgstr "/Z_obrazit/_Znaková sada/Tradiční čínská (EUC-_TW)"
+
+#: src/compose.c:655 src/mainwindow.c:636 src/messageview.c:210
+#, fuzzy
+msgid "/_View/Character _encoding/Korean (EUC-_KR)"
+msgstr "/Z_obrazit/_Znaková sada/Korejská (EUC-_KR)"
+
+#: src/compose.c:659 src/mainwindow.c:642 src/messageview.c:215
+#, fuzzy
+msgid "/_View/Character _encoding/Thai (TIS-620)"
+msgstr "/Z_obrazit/_Znaková sada/Thajská (TIS-620)"
+
+#: src/compose.c:661 src/mainwindow.c:644 src/messageview.c:217
+#, fuzzy
+msgid "/_View/Character _encoding/Thai (Windows-874)"
+msgstr "/Z_obrazit/_Znaková sada/Thajská (Windows-874)"
+
+#: src/compose.c:665 src/mainwindow.c:698 src/messageview.c:247
 msgid "/_Tools/_Address book"
 msgstr "/_Nástroje/_Databáze adres"
 
-#: src/compose.c:587
+#: src/compose.c:666
 msgid "/_Tools/_Template"
 msgstr "/_Nástroje/Ša_blona"
 
-#: src/compose.c:588 src/mainwindow.c:707 src/messageview.c:262
+#: src/compose.c:667 src/mainwindow.c:716 src/messageview.c:262
 msgid "/_Tools/Actio_ns"
 msgstr "/_Nástroje/_Akce"
 
-#: src/compose.c:589 src/compose.c:593 src/mainwindow.c:692
-#: src/mainwindow.c:706 src/mainwindow.c:708 src/mainwindow.c:711
-#: src/mainwindow.c:713 src/messageview.c:250 src/messageview.c:261
+#: src/compose.c:668 src/compose.c:672 src/mainwindow.c:701
+#: src/mainwindow.c:715 src/mainwindow.c:717 src/mainwindow.c:720
+#: src/mainwindow.c:722 src/messageview.c:250 src/messageview.c:261
 msgid "/_Tools/---"
 msgstr "/_Nástroje/---"
 
-#: src/compose.c:590
+#: src/compose.c:669
 #, fuzzy
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/Úp_ravy/Upravit pomocí e_xterního editoru"
 
-#: src/compose.c:594
+#: src/compose.c:673
 #, fuzzy
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Nástroje/_Akce"
 
-#: src/compose.c:595
+#: src/compose.c:674
 #, fuzzy
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/_Zpráva/Zaši_frovat"
 
-#: src/compose.c:800
+#: src/compose.c:879
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: soubor neexistuje\n"
 
-#: src/compose.c:899 src/compose.c:958 src/procmsg.c:1303
+#: src/compose.c:978 src/compose.c:1037 src/procmsg.c:1303
 msgid "Can't get text part\n"
 msgstr "Nelze získat část textu\n"
 
-#: src/compose.c:1340
+#: src/compose.c:1419
 msgid "Quote mark format error."
 msgstr "Chyba v uvozovkách."
 
-#: src/compose.c:1352
+#: src/compose.c:1431
 msgid "Message reply/forward format error."
 msgstr "Chyba formátu odpovědi/přeposlání."
 
-#: src/compose.c:1679
+#: src/compose.c:1758
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Soubor %s neexistuje\n"
 
-#: src/compose.c:1683
+#: src/compose.c:1762
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Nemohu zjistit délku souboru %s\n"
 
-#: src/compose.c:1687
+#: src/compose.c:1766
 #, c-format
 msgid "File %s is empty."
 msgstr "Soubor %s je prázdný."
 
-#: src/compose.c:1691
+#: src/compose.c:1770
 #, c-format
 msgid "Can't read %s."
 msgstr "Nemohu načíst %s."
 
-#: src/compose.c:1726
+#: src/compose.c:1805
 #, c-format
 msgid "Message: %s"
 msgstr "Zpráva: %s"
 
-#: src/compose.c:1797 src/mimeview.c:491
+#: src/compose.c:1876 src/mimeview.c:491
 msgid "Can't get the part of multipart message."
 msgstr "Nemohu získat část z mnohačásťové zprávy."
 
-#: src/compose.c:2188
+#: src/compose.c:2267
 msgid " [Edited]"
 msgstr " [Upraveno]"
 
-#: src/compose.c:2190
+#: src/compose.c:2269
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Psaní zprávy%s"
 
-#: src/compose.c:2193
+#: src/compose.c:2272
 #, c-format
 msgid "Compose message%s"
 msgstr "Psaní zprávy%s"
 
-#: src/compose.c:2304
+#: src/compose.c:2383
 msgid "Recipient is not specified."
 msgstr "Není uveden příjemce."
 
-#: src/compose.c:2312 src/compose.c:4112 src/mainwindow.c:2144
+#: src/compose.c:2391 src/compose.c:4213 src/mainwindow.c:2153
 #: src/prefs_account.c:703 src/prefs_common.c:850
 msgid "Send"
 msgstr "Odeslat"
 
-#: src/compose.c:2313
+#: src/compose.c:2392
 msgid "Subject is empty. Send it anyway?"
 msgstr "Předmět je prázdný. Přesto mám zprávu odeslat?"
 
-#: src/compose.c:2364
+#: src/compose.c:2443
 msgid "can't get recipient list."
 msgstr "Nelze načíst seznam příjemců."
 
-#: src/compose.c:2384
+#: src/compose.c:2463
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -966,26 +1084,26 @@ msgstr ""
 "Není zadán účet pro odesílání mailů.\n"
 "Před odesláním vyberte prosím nějaký účet."
 
-#: src/compose.c:2398 src/send_message.c:261
+#: src/compose.c:2477 src/send_message.c:261
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Vyskytla se chyba při posílání zprávy na %s ."
 
-#: src/compose.c:2421
+#: src/compose.c:2500
 msgid "Can't save the message to outbox."
 msgstr "Zprávu nelze uložit do odeslané pošty."
 
-#: src/compose.c:2457
+#: src/compose.c:2536
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "Nemohu najít žádný klíč asociovaný s aktuálně vybraným id klíče '%s'."
 
-#: src/compose.c:2518 src/compose.c:2739 src/compose.c:2802 src/compose.c:2921
+#: src/compose.c:2597 src/compose.c:2820 src/compose.c:2883 src/compose.c:3003
 #: src/utils.c:2189
 msgid "can't change file mode\n"
 msgstr "nelze změnit mód souboru\n"
 
-#: src/compose.c:2546
+#: src/compose.c:2627
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -995,140 +1113,140 @@ msgstr ""
 "%s na %s.\n"
 "Přesto poslat?"
 
-#: src/compose.c:2610
+#: src/compose.c:2691
 msgid "can't write headers\n"
 msgstr "nelze zapsat záhlaví\n"
 
-#: src/compose.c:2881
+#: src/compose.c:2963
 msgid "can't remove the old message\n"
 msgstr "nelze smazat staré zprávy\n"
 
-#: src/compose.c:2899
+#: src/compose.c:2981
 msgid "queueing message...\n"
 msgstr "zařazuji zprávu...\n"
 
-#: src/compose.c:2981
+#: src/compose.c:3063
 msgid "can't find queue folder\n"
 msgstr "nelze najít složku s frontou zpráv\n"
 
-#: src/compose.c:2988
+#: src/compose.c:3070
 msgid "can't queue the message\n"
 msgstr "Zprávu nelze zařadit\n"
 
-#: src/compose.c:3547
+#: src/compose.c:3645
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "vytvářím číslo zprávy: %s\n"
 
-#: src/compose.c:3645
+#: src/compose.c:3743
 msgid "Creating compose window...\n"
 msgstr "Vytvářím okno pro psaní...\n"
 
-#: src/compose.c:3648 src/compose.c:4598
+#: src/compose.c:3746 src/compose.c:4734
 msgid "MIME type"
 msgstr "MIME typ"
 
 #. S_COL_DATE
-#: src/compose.c:3649 src/mimeview.c:150 src/prefs_filter_edit.c:569
+#: src/compose.c:3747 src/mimeview.c:150 src/prefs_filter_edit.c:569
 #: src/prefs_summary_column.c:73 src/select-keys.c:317 src/summaryview.c:386
 msgid "Size"
 msgstr "Délka"
 
-#: src/compose.c:3700 src/headerview.c:53 src/summary_search.c:169
+#: src/compose.c:3798 src/headerview.c:53 src/summary_search.c:169
 msgid "From:"
 msgstr "Od:"
 
-#: src/compose.c:4113
+#: src/compose.c:4214
 msgid "Send message"
 msgstr "Odešle zprávu"
 
-#: src/compose.c:4121
+#: src/compose.c:4222
 msgid "Send later"
 msgstr "Poslat později"
 
-#: src/compose.c:4122
+#: src/compose.c:4223
 msgid "Put into queue folder and send later"
 msgstr "Zařadí do výstupní fronty a odešle později"
 
-#: src/compose.c:4130
+#: src/compose.c:4231
 msgid "Draft"
 msgstr "Koncept"
 
-#: src/compose.c:4131
+#: src/compose.c:4232
 msgid "Save to draft folder"
 msgstr "Uloží koncept do složky"
 
-#: src/compose.c:4141 src/compose.c:5382
+#: src/compose.c:4242 src/compose.c:5527
 msgid "Insert"
 msgstr "Vložit"
 
-#: src/compose.c:4142
+#: src/compose.c:4243
 msgid "Insert file"
 msgstr "Vloží soubor"
 
-#: src/compose.c:4150
+#: src/compose.c:4251
 msgid "Attach"
 msgstr "Příloha"
 
-#: src/compose.c:4151
+#: src/compose.c:4252
 msgid "Attach file"
 msgstr "Připojí soubor"
 
 #. signature
-#: src/compose.c:4161 src/prefs_account.c:1339 src/prefs_common.c:1261
+#: src/compose.c:4262 src/prefs_account.c:1339 src/prefs_common.c:1273
 msgid "Signature"
 msgstr "Podpis"
 
-#: src/compose.c:4162
+#: src/compose.c:4263
 msgid "Insert signature"
 msgstr "Vloží podpis"
 
-#: src/compose.c:4171 src/prefs_common.c:1283 src/prefs_common.c:2165
+#: src/compose.c:4272 src/prefs_common.c:1295 src/prefs_common.c:2177
 msgid "Editor"
 msgstr "Editor"
 
-#: src/compose.c:4172
+#: src/compose.c:4273
 msgid "Edit with external editor"
 msgstr "Úprava externím editorem"
 
-#: src/compose.c:4180
+#: src/compose.c:4281
 msgid "Linewrap"
 msgstr "Zarovnání"
 
-#: src/compose.c:4181
+#: src/compose.c:4282
 msgid "Wrap all long lines"
 msgstr "Zarovnání dlouhých řádků"
 
-#: src/compose.c:4492
+#: src/compose.c:4628
 msgid "Invalid MIME type."
 msgstr "Neplatný MIME typ."
 
-#: src/compose.c:4511
+#: src/compose.c:4647
 msgid "File doesn't exist or is empty."
 msgstr "Soubor neexistuje nebo je prázdný."
 
-#: src/compose.c:4580
+#: src/compose.c:4716
 msgid "Properties"
 msgstr "Vlastnosti"
 
-#: src/compose.c:4600
+#: src/compose.c:4736
 msgid "Encoding"
 msgstr "Kódování"
 
-#: src/compose.c:4623 src/prefs_folder_item.c:183
+#: src/compose.c:4759 src/prefs_folder_item.c:183
 msgid "Path"
 msgstr "Cesta k souboru"
 
-#: src/compose.c:4624
+#: src/compose.c:4760
 msgid "File name"
 msgstr "Název souboru"
 
-#: src/compose.c:4778
+#: src/compose.c:4914
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Špatný příkaz v externím editoru: '%s'\n"
 
-#: src/compose.c:4804
+#: src/compose.c:4940
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1139,72 +1257,72 @@ msgstr ""
 "Mám přerušit proces?\n"
 "číslo procesu: %d"
 
-#: src/compose.c:4817
+#: src/compose.c:4953
 #, c-format
 msgid "Terminated process group id: %d"
 msgstr "Přerušen proces číslo: %d"
 
-#: src/compose.c:4818
+#: src/compose.c:4954
 #, c-format
 msgid "Temporary file: %s"
 msgstr "Dočasný soubor: %s"
 
-#: src/compose.c:4842
+#: src/compose.c:4978
 msgid "Compose: input from monitoring process\n"
 msgstr "Psaní: vstup z externího procesu\n"
 
 #. failed
-#: src/compose.c:4875
+#: src/compose.c:5011
 msgid "Couldn't exec external editor\n"
 msgstr "Nelze spustit externí editor\n"
 
-#: src/compose.c:4879
+#: src/compose.c:5015
 msgid "Couldn't write to file\n"
 msgstr "Nelze zapisovat do souboru\n"
 
-#: src/compose.c:4881
+#: src/compose.c:5017
 msgid "Pipe read failed\n"
 msgstr "Nelze číst\n"
 
-#: src/compose.c:5182 src/compose.c:5190 src/compose.c:5196
+#: src/compose.c:5318 src/compose.c:5326 src/compose.c:5332
 msgid "Can't queue the message."
 msgstr "Zprávu nelze zařadit."
 
-#: src/compose.c:5287
+#: src/compose.c:5423
 #, fuzzy
 msgid "Select files"
 msgstr "Vybrat soubor"
 
-#: src/compose.c:5309
+#: src/compose.c:5445
 msgid "Select file"
 msgstr "Vybrat soubor"
 
-#: src/compose.c:5344
+#: src/compose.c:5480
 msgid "Discard message"
 msgstr "Zrušit zprávu"
 
-#: src/compose.c:5345
+#: src/compose.c:5481
 msgid "This message has been modified. discard it?"
 msgstr "Obsah zprávy se změnil. Chcete ji stornovat?"
 
-#: src/compose.c:5346
+#: src/compose.c:5482
 msgid "Discard"
 msgstr "Stornovat"
 
-#: src/compose.c:5346
+#: src/compose.c:5482
 msgid "to Draft"
 msgstr "Uložit jako koncept"
 
-#: src/compose.c:5379
+#: src/compose.c:5524
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Opravdu chcete použít šablonu '%s' ?"
 
-#: src/compose.c:5381
+#: src/compose.c:5526
 msgid "Apply template"
 msgstr "Přidat šablonu"
 
-#: src/compose.c:5382
+#: src/compose.c:5527
 msgid "Replace"
 msgstr "Nahradit"
 
@@ -1646,12 +1764,12 @@ msgstr "Nastavuji informace o složce...\n"
 msgid "Setting folder info..."
 msgstr "Nastavuji informace o složce..."
 
-#: src/folderview.c:652 src/mainwindow.c:3190 src/setup.c:81
+#: src/folderview.c:652 src/mainwindow.c:3199 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Prohledávám složku %s%c%s ..."
 
-#: src/folderview.c:656 src/mainwindow.c:3195 src/setup.c:86
+#: src/folderview.c:656 src/mainwindow.c:3204 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Prohledávám složku %s ..."
@@ -2112,7 +2230,7 @@ msgstr "Importovat LDIF soubor do databáze adres"
 msgid "Prev"
 msgstr "Předchozí"
 
-#: src/importldif.c:761 src/mainwindow.c:2230
+#: src/importldif.c:761 src/mainwindow.c:2239
 msgid "Next"
 msgstr "Další"
 
@@ -2573,7 +2691,8 @@ msgid "/_View/Separate f_older tree"
 msgstr "/Z_obrazit/Samostatný s_trom složek "
 
 #: src/mainwindow.c:514
-msgid "/_View/Separate m_essage view"
+#, fuzzy
+msgid "/_View/Separate _message view"
 msgstr "/Z_obrazit/Samostatné pro_hlédnutí zprávy"
 
 #: src/mainwindow.c:516
@@ -2709,432 +2828,349 @@ msgstr "/Z_obrazit/_Přejít/Da_lší zpráva s návěštím"
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/Z_obrazit/_Přejít/Do _jiné složky"
 
-#: src/mainwindow.c:568 src/mainwindow.c:575 src/messageview.c:150
-msgid "/_View/_Code set/---"
-msgstr "/Z_obrazit/_Znaková sada/---"
-
-#: src/mainwindow.c:572 src/messageview.c:154
-msgid "/_View/_Code set"
-msgstr "/Z_obrazit/_Znaková sada"
-
 #: src/mainwindow.c:573 src/messageview.c:155
-msgid "/_View/_Code set/_Auto detect"
+#, fuzzy
+msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/Z_obrazit/_Znaková sada/_Autodetekce "
 
-#: src/mainwindow.c:576 src/messageview.c:158
-msgid "/_View/_Code set/7bit ascii (US-ASC_II)"
-msgstr "/Z_obrazit/_Znaková sada/7bitová ascii (US-ASC_II)"
-
-#: src/mainwindow.c:579 src/messageview.c:161
-msgid "/_View/_Code set/Unicode (_UTF-8)"
-msgstr "/Z_obrazit/_Znaková sada/Unicode (_UTF-8)"
-
-#: src/mainwindow.c:582 src/messageview.c:164
-msgid "/_View/_Code set/Western European (ISO-8859-_1)"
-msgstr "/Z_obrazit/_Znaková sada/Západní Evropa (ISO-8859-_1)"
-
-#: src/mainwindow.c:584 src/messageview.c:166
-msgid "/_View/_Code set/Western European (ISO-8859-15)"
-msgstr "/Z_obrazit/_Znaková sada/Západní Evropa (ISO-8859-15)"
-
-#: src/mainwindow.c:587 src/messageview.c:169
-msgid "/_View/_Code set/Central European (ISO-8859-_2)"
-msgstr "/Z_obrazit/_Znaková sada/Střední Evropa (ISO-8859-_2)"
-
-#: src/mainwindow.c:590 src/messageview.c:172
-msgid "/_View/_Code set/_Baltic (ISO-8859-13)"
-msgstr "/Z_obrazit/_Znaková sada/_Baltská (ISO-8859-13)"
-
-#: src/mainwindow.c:592 src/messageview.c:174
-msgid "/_View/_Code set/Baltic (ISO-8859-_4)"
-msgstr "/Z_obrazit/_Znaková sada/Baltská (ISO-8859-_4)"
-
-#: src/mainwindow.c:595 src/messageview.c:177
-msgid "/_View/_Code set/Greek (ISO-8859-_7)"
-msgstr "/Z_obrazit/_Znaková sada/Řecká (ISO-8859-_7)"
-
-#: src/mainwindow.c:598 src/messageview.c:180
-msgid "/_View/_Code set/Turkish (ISO-8859-_9)"
-msgstr "/Z_obrazit/_Znaková sada/Turecká (ISO-8859-_9)"
-
-#: src/mainwindow.c:601 src/messageview.c:183
-msgid "/_View/_Code set/Cyrillic (ISO-8859-_5)"
-msgstr "/Z_obrazit/_Znaková sada/Azbuka (ISO-8859-_5)"
-
-#: src/mainwindow.c:603 src/messageview.c:185
-msgid "/_View/_Code set/Cyrillic (KOI8-_R)"
-msgstr "/Z_obrazit/_Znaková sada/Azbuka (KOI8-_R)"
-
-#: src/mainwindow.c:605 src/messageview.c:187
+#: src/mainwindow.c:618 src/messageview.c:194
 #, fuzzy
-msgid "/_View/_Code set/Cyrillic (KOI8-U)"
-msgstr "/Z_obrazit/_Znaková sada/Azbuka (KOI8-_R)"
-
-#: src/mainwindow.c:607 src/messageview.c:189
-msgid "/_View/_Code set/Cyrillic (Windows-1251)"
-msgstr "/Z_obrazit/_Znaková sada/Azbuka (Windows-1251)"
-
-#: src/mainwindow.c:610 src/messageview.c:192
-msgid "/_View/_Code set/Japanese (ISO-2022-_JP)"
-msgstr "/Z_obrazit/_Znaková sada/Japonská (ISO-2022-_JP)"
-
-#: src/mainwindow.c:612 src/messageview.c:194
-msgid "/_View/_Code set/Japanese (ISO-2022-JP-2)"
+msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/Z_obrazit/_Znaková sada/Japonská (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:614 src/messageview.c:196
-msgid "/_View/_Code set/Japanese (_EUC-JP)"
+#: src/mainwindow.c:620 src/messageview.c:196
+#, fuzzy
+msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/Z_obrazit/_Znaková sada/Japonská (_EUC-JP)"
 
-#: src/mainwindow.c:616 src/messageview.c:198
-msgid "/_View/_Code set/Japanese (_Shift__JIS)"
+#: src/mainwindow.c:622 src/messageview.c:198
+#, fuzzy
+msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/Z_obrazit/_Znaková sada/Japonská (_Shift__JIS)"
 
-#: src/mainwindow.c:619 src/messageview.c:201
-msgid "/_View/_Code set/Simplified Chinese (_GB2312)"
-msgstr "/Z_obrazit/_Znaková sada/Zjednodušená čínská (_GB2312)"
-
-#: src/mainwindow.c:621 src/messageview.c:203
-msgid "/_View/_Code set/Traditional Chinese (_Big5)"
-msgstr "/Z_obrazit/_Znaková sada/Tradiční čínská (_Big5)"
-
-#: src/mainwindow.c:623 src/messageview.c:205
-msgid "/_View/_Code set/Traditional Chinese (EUC-_TW)"
-msgstr "/Z_obrazit/_Znaková sada/Tradiční čínská (EUC-_TW)"
-
-#: src/mainwindow.c:625 src/messageview.c:207
-msgid "/_View/_Code set/Chinese (ISO-2022-_CN)"
+#: src/mainwindow.c:632 src/messageview.c:207
+#, fuzzy
+msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/Z_obrazit/_Znaková sada/Čínská (ISO-2022-_CN)"
 
-#: src/mainwindow.c:628 src/messageview.c:210
-msgid "/_View/_Code set/Korean (EUC-_KR)"
-msgstr "/Z_obrazit/_Znaková sada/Korejská (EUC-_KR)"
-
-#: src/mainwindow.c:630 src/messageview.c:212
-msgid "/_View/_Code set/Korean (ISO-2022-KR)"
+#: src/mainwindow.c:638 src/messageview.c:212
+#, fuzzy
+msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/Z_obrazit/_Znaková sada/Korejská (ISO-2022-KR)"
 
-#: src/mainwindow.c:633 src/messageview.c:215
-msgid "/_View/_Code set/Thai (TIS-620)"
-msgstr "/Z_obrazit/_Znaková sada/Thajská (TIS-620)"
-
-#: src/mainwindow.c:635 src/messageview.c:217
-msgid "/_View/_Code set/Thai (Windows-874)"
-msgstr "/Z_obrazit/_Znaková sada/Thajská (Windows-874)"
-
-#: src/mainwindow.c:642 src/summaryview.c:371
+#: src/mainwindow.c:651 src/summaryview.c:371
 msgid "/_View/Open in new _window"
 msgstr "/Z_obrazit/Otevřít v _novém okně"
 
-#: src/mainwindow.c:643 src/messageview.c:224
+#: src/mainwindow.c:652 src/messageview.c:224
 msgid "/_View/Mess_age source"
 msgstr "/Z_obrazit/Zd_roj zprávy"
 
-#: src/mainwindow.c:644 src/messageview.c:225
+#: src/mainwindow.c:653 src/messageview.c:225
 msgid "/_View/Show all _header"
 msgstr "/Z_obrazit/Zobrazit všechna zá_hlaví"
 
-#: src/mainwindow.c:646
+#: src/mainwindow.c:655
 msgid "/_View/_Update summary"
 msgstr "/Z_obrazit/_Aktualizace souhrnu"
 
-#: src/mainwindow.c:648 src/messageview.c:227
+#: src/mainwindow.c:657 src/messageview.c:227
 msgid "/_Message"
 msgstr "/_Zpráva"
 
-#: src/mainwindow.c:649
+#: src/mainwindow.c:658
 #, fuzzy
 msgid "/_Message/Recei_ve"
 msgstr "/_Zpráva/Znov_u editovat"
 
-#: src/mainwindow.c:650
+#: src/mainwindow.c:659
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/_Zpráva/Přijmout _ze všech účtů"
 
-#: src/mainwindow.c:652
+#: src/mainwindow.c:661
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/_Zpráva/Přijmout _ze všech účtů"
 
-#: src/mainwindow.c:654
+#: src/mainwindow.c:663
 #, fuzzy
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/_Zpráva/Přerušit pří_jem zpráv"
 
-#: src/mainwindow.c:656
+#: src/mainwindow.c:665
 #, fuzzy
 msgid "/_Message/Recei_ve/---"
 msgstr "/_Zpráva/Znov_u editovat"
 
-#: src/mainwindow.c:657
+#: src/mainwindow.c:666
 msgid "/_Message/_Send queued messages"
 msgstr "/_Zpráva/Odeslat pozd_ržené zprávy"
 
-#: src/mainwindow.c:658 src/mainwindow.c:660 src/mainwindow.c:667
-#: src/mainwindow.c:672 src/mainwindow.c:676 src/mainwindow.c:685
+#: src/mainwindow.c:667 src/mainwindow.c:669 src/mainwindow.c:676
+#: src/mainwindow.c:681 src/mainwindow.c:685 src/mainwindow.c:694
 #: src/messageview.c:230 src/messageview.c:238 src/messageview.c:243
 msgid "/_Message/---"
 msgstr "/_Zpráva/---"
 
-#: src/mainwindow.c:659 src/messageview.c:228
+#: src/mainwindow.c:668 src/messageview.c:228
 msgid "/_Message/Compose _new message"
 msgstr "/_Zpráva/_Nová zpráva"
 
-#: src/mainwindow.c:661 src/messageview.c:231
+#: src/mainwindow.c:670 src/messageview.c:231
 msgid "/_Message/_Reply"
 msgstr "/_Zpráva/_Odpovědět"
 
-#: src/mainwindow.c:662
+#: src/mainwindow.c:671
 msgid "/_Message/Repl_y to"
 msgstr "/_Zpráva/Odpo_vědět komu"
 
-#: src/mainwindow.c:663 src/messageview.c:232
+#: src/mainwindow.c:672 src/messageview.c:232
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Zpráva/Odpo_vědět komu/_všem"
 
-#: src/mainwindow.c:664 src/messageview.c:234
+#: src/mainwindow.c:673 src/messageview.c:234
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Zpráva/Odpo_vědět komu/_odesílateli"
 
-#: src/mainwindow.c:665 src/messageview.c:236
+#: src/mainwindow.c:674 src/messageview.c:236
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Zpráva/Odpo_vědět komu/do _diskusního listu"
 
-#: src/mainwindow.c:668 src/messageview.c:239
+#: src/mainwindow.c:677 src/messageview.c:239
 msgid "/_Message/_Forward"
 msgstr "/_Zpráva/Předat dá_l"
 
-#: src/mainwindow.c:669 src/messageview.c:240
+#: src/mainwindow.c:678 src/messageview.c:240
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Zpráva/Přeposlat _jako přílohu"
 
-#: src/mainwindow.c:671 src/messageview.c:242
+#: src/mainwindow.c:680 src/messageview.c:242
 msgid "/_Message/Redirec_t"
 msgstr "/_Zpráva/Přesměrov_at"
 
-#: src/mainwindow.c:673
+#: src/mainwindow.c:682
 msgid "/_Message/M_ove..."
 msgstr "/_Zpráva/Pře_sunout..."
 
-#: src/mainwindow.c:674
+#: src/mainwindow.c:683
 msgid "/_Message/_Copy..."
 msgstr "/_Zpráva/_Kopírovat..."
 
-#: src/mainwindow.c:675
+#: src/mainwindow.c:684
 msgid "/_Message/_Delete"
 msgstr "/_Zpráva/S_mazat"
 
-#: src/mainwindow.c:677
+#: src/mainwindow.c:686
 msgid "/_Message/_Mark"
 msgstr "/_Zpráva/Označ_it"
 
-#: src/mainwindow.c:678
+#: src/mainwindow.c:687
 msgid "/_Message/_Mark/_Mark"
 msgstr "/_Zpráva/Označ_it/_Označit"
 
-#: src/mainwindow.c:679
+#: src/mainwindow.c:688
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/_Zpráva/Označ_it/_Zrušit označení"
 
-#: src/mainwindow.c:680
+#: src/mainwindow.c:689
 msgid "/_Message/_Mark/---"
 msgstr "/_Zpráva/Označ_it/---"
 
-#: src/mainwindow.c:681
+#: src/mainwindow.c:690
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/_Zpráva/Označ_it/Označit jako _nepřečtené"
 
-#: src/mainwindow.c:682
+#: src/mainwindow.c:691
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/_Zpráva/Označ_it/Označit jako _přečtenou"
 
-#: src/mainwindow.c:684
+#: src/mainwindow.c:693
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/_Zpráva/Označ_it/Označit _všechny jako přečtené"
 
-#: src/mainwindow.c:686 src/messageview.c:244
+#: src/mainwindow.c:695 src/messageview.c:244
 msgid "/_Message/Re-_edit"
 msgstr "/_Zpráva/Znov_u editovat"
 
-#: src/mainwindow.c:690 src/messageview.c:248
+#: src/mainwindow.c:699 src/messageview.c:248
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/_Nástroje/Přidat odesílatele do a_dresáře"
 
-#: src/mainwindow.c:693
+#: src/mainwindow.c:702
 #, fuzzy
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/_Nástroje/_Filtr zpráv "
 
-#: src/mainwindow.c:695
+#: src/mainwindow.c:704
 #, fuzzy
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Nástroje/_Filtr zpráv "
 
-#: src/mainwindow.c:697 src/messageview.c:251
+#: src/mainwindow.c:706 src/messageview.c:251
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Nástroje/_Vytvoření filtru"
 
-#: src/mainwindow.c:698 src/messageview.c:253
+#: src/mainwindow.c:707 src/messageview.c:253
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Nástroje/_Vytvoření filtru/_Automaticky"
 
-#: src/mainwindow.c:700 src/messageview.c:255
+#: src/mainwindow.c:709 src/messageview.c:255
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Nástroje/_Vytvoření filtru/podle _Od"
 
-#: src/mainwindow.c:702 src/messageview.c:257
+#: src/mainwindow.c:711 src/messageview.c:257
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Nástroje/_Vytvoření filtru/podle _Komu"
 
-#: src/mainwindow.c:704 src/messageview.c:259
+#: src/mainwindow.c:713 src/messageview.c:259
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Nástroje/_Vytvoření filtru/podle _Předmětu"
 
-#: src/mainwindow.c:709
+#: src/mainwindow.c:718
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/_Nástroje/_Smazat duplikované zprávy"
 
-#: src/mainwindow.c:712
+#: src/mainwindow.c:721
 msgid "/_Tools/E_xecute"
 msgstr "/_Nástroje/S_pustit"
 
-#: src/mainwindow.c:714
+#: src/mainwindow.c:723
 msgid "/_Tools/_Log window"
 msgstr "/_Nástroje/Okno _záznamů "
 
-#: src/mainwindow.c:716
+#: src/mainwindow.c:725
 msgid "/_Configuration"
 msgstr "/Nastav_ení"
 
-#: src/mainwindow.c:717
+#: src/mainwindow.c:726
 msgid "/_Configuration/_Common preferences..."
 msgstr "/Nastav_ení/_Společná nastavení..."
 
-#: src/mainwindow.c:719
+#: src/mainwindow.c:728
 msgid "/_Configuration/_Filter setting..."
 msgstr "/Nastav_ení/Nastavení _filtrů..."
 
-#: src/mainwindow.c:721
+#: src/mainwindow.c:730
 msgid "/_Configuration/_Template..."
 msgstr "/Nastav_ení/Ša_blona..."
 
-#: src/mainwindow.c:722
+#: src/mainwindow.c:731
 msgid "/_Configuration/_Actions..."
 msgstr "/Nastav_ení/_Akce..."
 
-#: src/mainwindow.c:723
+#: src/mainwindow.c:732
 msgid "/_Configuration/---"
 msgstr "/Nastav_ení/---"
 
-#: src/mainwindow.c:724
+#: src/mainwindow.c:733
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/Nastav_ení/Nas_tavení aktuálního účtu..."
 
-#: src/mainwindow.c:726
+#: src/mainwindow.c:735
 msgid "/_Configuration/Create _new account..."
 msgstr "/Nastav_ení/Založit _nový účet..."
 
-#: src/mainwindow.c:728
+#: src/mainwindow.c:737
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/Nastav_ení/Ú_pravy účtů..."
 
-#: src/mainwindow.c:730
+#: src/mainwindow.c:739
 msgid "/_Configuration/C_hange current account"
 msgstr "/Nastav_ení/_Změna aktuálního účtu"
 
-#: src/mainwindow.c:734
+#: src/mainwindow.c:743
 msgid "/_Help/_Manual"
 msgstr "/Nápo_věda/_Manuál"
 
-#: src/mainwindow.c:735
+#: src/mainwindow.c:744
 msgid "/_Help/_Manual/_English"
 msgstr "/Nápo_věda/_Manuál/_Anglicky"
 
-#: src/mainwindow.c:736
+#: src/mainwindow.c:745
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/Nápo_věda/_Manuál/_Japonsky"
 
-#: src/mainwindow.c:737
+#: src/mainwindow.c:746
 msgid "/_Help/_FAQ"
 msgstr "/Nápo_věda/_FAQ"
 
-#: src/mainwindow.c:738
+#: src/mainwindow.c:747
 msgid "/_Help/_FAQ/_English"
 msgstr "/Nápo_věda/_FAQ/_Anglicky"
 
-#: src/mainwindow.c:739
+#: src/mainwindow.c:748
 msgid "/_Help/_FAQ/_German"
 msgstr "/Nápo_věda/_FAQ/_Německy"
 
-#: src/mainwindow.c:740
+#: src/mainwindow.c:749
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/Nápo_věda/_FAQ/Š_panělsky"
 
-#: src/mainwindow.c:741
+#: src/mainwindow.c:750
 msgid "/_Help/_FAQ/_French"
 msgstr "/Nápo_věda/_FAQ/_Francouzsky"
 
-#: src/mainwindow.c:742
+#: src/mainwindow.c:751
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/Nápo_věda/_FAQ/_Italsky"
 
-#: src/mainwindow.c:743
+#: src/mainwindow.c:752
 msgid "/_Help/---"
 msgstr "/Nápo_věda/---"
 
-#: src/mainwindow.c:783
+#: src/mainwindow.c:792
 msgid "Creating main window...\n"
 msgstr "Vytvářím hlavní okno...\n"
 
-#: src/mainwindow.c:943
+#: src/mainwindow.c:952
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Hlavní okno: barevné rozvržení %d bylo neúspěšné\n"
 
-#: src/mainwindow.c:1021 src/summaryview.c:1368 src/summaryview.c:1677
+#: src/mainwindow.c:1030 src/summaryview.c:1368 src/summaryview.c:1677
 #: src/summaryview.c:1785 src/summaryview.c:1831 src/summaryview.c:2453
 #: src/summaryview.c:3080 src/summaryview.c:3146 src/summaryview.c:3171
 #: src/summaryview.c:3284
 msgid "done.\n"
 msgstr "hotovo.\n"
 
-#: src/mainwindow.c:1137 src/mainwindow.c:1178 src/mainwindow.c:1206
+#: src/mainwindow.c:1146 src/mainwindow.c:1187 src/mainwindow.c:1215
 msgid "Untitled"
 msgstr "Neoznačený"
 
-#: src/mainwindow.c:1207
+#: src/mainwindow.c:1216
 msgid "none"
 msgstr "žádný"
 
-#: src/mainwindow.c:1257
+#: src/mainwindow.c:1266
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "Měním typ oddělovače oken z %d na %d\n"
 
-#: src/mainwindow.c:1477
+#: src/mainwindow.c:1486
 msgid "Offline"
 msgstr ""
 
-#: src/mainwindow.c:1478
+#: src/mainwindow.c:1487
 msgid "You are offline. Go online?"
 msgstr ""
 
-#: src/mainwindow.c:1492
+#: src/mainwindow.c:1501
 #, fuzzy
 msgid "Empty all trash"
 msgstr "Vyprázdnit koš"
 
-#: src/mainwindow.c:1493
+#: src/mainwindow.c:1502
 #, fuzzy
 msgid "Empty messages in all trash?"
 msgstr "Vyprázdnit všechny zprávy v koši?"
 
-#: src/mainwindow.c:1521
+#: src/mainwindow.c:1530
 msgid "Add mailbox"
 msgstr "Přidat poštovní schránku"
 
-#: src/mainwindow.c:1522
+#: src/mainwindow.c:1531
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3144,16 +3180,16 @@ msgstr ""
 "Pokud je zadán existující, bude automaticky\n"
 "prohledán."
 
-#: src/mainwindow.c:1528
+#: src/mainwindow.c:1537
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Poštovní schránka '%s' již existuje."
 
-#: src/mainwindow.c:1533 src/setup.c:57
+#: src/mainwindow.c:1542 src/setup.c:57
 msgid "Mailbox"
 msgstr "Poštovní schránka"
 
-#: src/mainwindow.c:1539 src/setup.c:63
+#: src/mainwindow.c:1548 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3163,144 +3199,144 @@ msgstr ""
 "Může to být tím, že schránka již existuje, nebo nemáte dostatečná práva\n"
 "pro zápis."
 
-#: src/mainwindow.c:1912
+#: src/mainwindow.c:1921
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Zobrazení složky"
 
-#: src/mainwindow.c:1932 src/messageview.c:358
+#: src/mainwindow.c:1941 src/messageview.c:358
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Zobrazení zprávy"
 
-#: src/mainwindow.c:2079 src/summaryview.c:340
+#: src/mainwindow.c:2088 src/summaryview.c:340
 msgid "/_Reply"
 msgstr "/_Odpovědět"
 
-#: src/mainwindow.c:2080
+#: src/mainwindow.c:2089
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "Odpovídá všem"
 
-#: src/mainwindow.c:2081
+#: src/mainwindow.c:2090
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/Odpovědět _komu/_odesílateli"
 
-#: src/mainwindow.c:2082
+#: src/mainwindow.c:2091
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/Odpovědět _komu/do _diskusního listu"
 
-#: src/mainwindow.c:2087 src/summaryview.c:347
+#: src/mainwindow.c:2096 src/summaryview.c:347
 msgid "/_Forward"
 msgstr "/Př_edat dál"
 
-#: src/mainwindow.c:2088 src/summaryview.c:348
+#: src/mainwindow.c:2097 src/summaryview.c:348
 msgid "/For_ward as attachment"
 msgstr "/Přeposlat _jako přílohu"
 
-#: src/mainwindow.c:2089 src/summaryview.c:349
+#: src/mainwindow.c:2098 src/summaryview.c:349
 msgid "/Redirec_t"
 msgstr "/Přes_měrovat"
 
-#: src/mainwindow.c:2125
+#: src/mainwindow.c:2134
 msgid "Get"
 msgstr "Stáhnout"
 
-#: src/mainwindow.c:2126
+#: src/mainwindow.c:2135
 msgid "Incorporate new mail"
 msgstr "Začlenit novou poštu"
 
-#: src/mainwindow.c:2133
+#: src/mainwindow.c:2142
 msgid "Get all"
 msgstr "Stáhnout vše"
 
-#: src/mainwindow.c:2134
+#: src/mainwindow.c:2143
 msgid "Incorporate new mail of all accounts"
 msgstr "Začlení novou poštu ze všech účtů"
 
-#: src/mainwindow.c:2145
+#: src/mainwindow.c:2154
 msgid "Send queued message(s)"
 msgstr "Odešle pozdrženou zprávu(y)"
 
-#: src/mainwindow.c:2155 src/prefs_account.c:705 src/prefs_common.c:852
+#: src/mainwindow.c:2164 src/prefs_account.c:705 src/prefs_common.c:852
 #: src/prefs_folder_item.c:137
 msgid "Compose"
 msgstr "Napsat"
 
-#: src/mainwindow.c:2156
+#: src/mainwindow.c:2165
 msgid "Compose new message"
 msgstr "Vytváří novou zprávu"
 
-#: src/mainwindow.c:2164 src/prefs_common.c:1353
+#: src/mainwindow.c:2173 src/prefs_common.c:1365
 msgid "Reply"
 msgstr "Odpovědět"
 
-#: src/mainwindow.c:2165 src/mainwindow.c:2178
+#: src/mainwindow.c:2174 src/mainwindow.c:2187
 msgid "Reply to the message"
 msgstr "Odpovídá na zprávu"
 
-#: src/mainwindow.c:2183
+#: src/mainwindow.c:2192
 msgid "Reply all"
 msgstr "Odpov. všem"
 
-#: src/mainwindow.c:2184
+#: src/mainwindow.c:2193
 msgid "Reply to all"
 msgstr "Odpovídá všem"
 
-#: src/mainwindow.c:2192 src/prefs_filter_edit.c:719
+#: src/mainwindow.c:2201 src/prefs_filter_edit.c:719
 msgid "Forward"
 msgstr "Poslat dál"
 
-#: src/mainwindow.c:2193 src/mainwindow.c:2206
+#: src/mainwindow.c:2202 src/mainwindow.c:2215
 msgid "Forward the message"
 msgstr "Předává zprávu dál"
 
-#: src/mainwindow.c:2213
+#: src/mainwindow.c:2222
 msgid "Delete the message"
 msgstr "Smazat zprávu"
 
-#: src/mainwindow.c:2221
+#: src/mainwindow.c:2230
 msgid "Execute"
 msgstr "Provést"
 
-#: src/mainwindow.c:2222
+#: src/mainwindow.c:2231
 msgid "Execute marked process"
 msgstr "Provést označený proces "
 
-#: src/mainwindow.c:2231
+#: src/mainwindow.c:2240
 msgid "Next unread message"
 msgstr "Další nepřečtenou zprávu"
 
-#: src/mainwindow.c:2242
+#: src/mainwindow.c:2251
 msgid "Prefs"
 msgstr "Nastavení"
 
-#: src/mainwindow.c:2243
+#: src/mainwindow.c:2252
 msgid "Common preferences"
 msgstr "Společná nastavení"
 
-#: src/mainwindow.c:2250 src/prefs_folder_item.c:258
+#: src/mainwindow.c:2259 src/prefs_folder_item.c:258
 #: src/prefs_folder_item.c:269 src/progressdialog.c:50
 msgid "Account"
 msgstr "Účet"
 
-#: src/mainwindow.c:2251
+#: src/mainwindow.c:2260
 msgid "Account setting"
 msgstr "Nastavení účtu"
 
-#: src/mainwindow.c:2425
+#: src/mainwindow.c:2434
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 
-#: src/mainwindow.c:2436
+#: src/mainwindow.c:2445
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 
-#: src/mainwindow.c:2624
+#: src/mainwindow.c:2633
 msgid "Exit"
 msgstr "Ukončení programu"
 
-#: src/mainwindow.c:2624
+#: src/mainwindow.c:2633
 msgid "Exit this program?"
 msgstr "Chcete ukončit tento program?"
 
@@ -3424,7 +3460,7 @@ msgstr "Hledání ukončeno"
 msgid "Creating message view...\n"
 msgstr "Vyvolávám zobrazení zprávy...\n"
 
-#: src/messageview.c:303 src/prefs_common.c:1550
+#: src/messageview.c:303 src/prefs_common.c:1562
 msgid "Text"
 msgstr "Text"
 
@@ -3437,7 +3473,7 @@ msgstr "Přílohy"
 msgid "Can't save the file `%s'."
 msgstr "Nemohu uložit soubor '%s'."
 
-#: src/messageview.c:697 src/prefs_common.c:2154 src/summaryview.c:2744
+#: src/messageview.c:697 src/prefs_common.c:2166 src/summaryview.c:2744
 msgid "Print"
 msgstr "Tisk"
 
@@ -3912,7 +3948,7 @@ msgstr "(Nefiltrované zprávy budou uloženy v této složce)"
 msgid "Authentication method"
 msgstr "Metoda autentizace"
 
-#: src/prefs_account.c:1123 src/prefs_account.c:1239 src/prefs_common.c:1189
+#: src/prefs_account.c:1123 src/prefs_account.c:1239 src/prefs_common.c:1201
 msgid "Automatic"
 msgstr "Automaticky"
 
@@ -3936,7 +3972,7 @@ msgstr "Generovat číslo zprávy"
 msgid "Add user-defined header"
 msgstr "Přidat uživatelsky definované záhlaví"
 
-#: src/prefs_account.c:1196 src/prefs_common.c:1714 src/prefs_common.c:1739
+#: src/prefs_account.c:1196 src/prefs_common.c:1726 src/prefs_common.c:1751
 msgid " Edit... "
 msgstr " Upravit..."
 
@@ -4332,106 +4368,107 @@ msgid "Save sent messages to outbox"
 msgstr "Uložit odeslané zprávy do složky Odeslaná pošta"
 
 #: src/prefs_common.c:1113
-msgid "Outgoing codeset"
+#, fuzzy
+msgid "Outgoing encoding"
 msgstr "Výstupní znaková sada"
 
 #: src/prefs_common.c:1128
 msgid "Automatic (Recommended)"
 msgstr "Automatická (doporučeno)"
 
-#: src/prefs_common.c:1129
+#: src/prefs_common.c:1130
 msgid "7bit ascii (US-ASCII)"
 msgstr "7bitový ascii (US-ASCII)"
 
-#: src/prefs_common.c:1130
+#: src/prefs_common.c:1132
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
-#: src/prefs_common.c:1131
+#: src/prefs_common.c:1134
 msgid "Western European (ISO-8859-1)"
 msgstr "Západní Evropa (ISO-8859-1)"
 
-#: src/prefs_common.c:1132
+#: src/prefs_common.c:1135
 msgid "Western European (ISO-8859-15)"
 msgstr "Západní Evropa(ISO-8859-15)"
 
-#: src/prefs_common.c:1133
+#: src/prefs_common.c:1137
 msgid "Central European (ISO-8859-2)"
 msgstr "Středoevropská (ISO-8859-2)"
 
-#: src/prefs_common.c:1134
+#: src/prefs_common.c:1139
 msgid "Baltic (ISO-8859-13)"
 msgstr "Baltická (ISO-8859-13)"
 
-#: src/prefs_common.c:1135
+#: src/prefs_common.c:1140
 msgid "Baltic (ISO-8859-4)"
 msgstr "Baltická (ISO-8859-4)"
 
-#: src/prefs_common.c:1136
+#: src/prefs_common.c:1142
 msgid "Greek (ISO-8859-7)"
 msgstr "Řecká (ISO-8859-7)"
 
-#: src/prefs_common.c:1137
+#: src/prefs_common.c:1144
 msgid "Turkish (ISO-8859-9)"
 msgstr "Turecká (ISO-8859-9)"
 
-#: src/prefs_common.c:1138
+#: src/prefs_common.c:1146
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Azbuka (ISO-8859-5)"
 
-#: src/prefs_common.c:1139
+#: src/prefs_common.c:1147
 msgid "Cyrillic (KOI8-R)"
 msgstr "Azbuka (KOI8-R)"
 
-#: src/prefs_common.c:1140
-msgid "Cyrillic (Windows-1251)"
-msgstr "Azbuka (Windows-1251)"
-
-#: src/prefs_common.c:1141
+#: src/prefs_common.c:1148
 msgid "Cyrillic (KOI8-U)"
 msgstr "Azbuka (KOI8-U)"
 
-#: src/prefs_common.c:1142
+#: src/prefs_common.c:1149
+msgid "Cyrillic (Windows-1251)"
+msgstr "Azbuka (Windows-1251)"
+
+#: src/prefs_common.c:1151
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Japonská (ISO-2022-JP)"
 
-#: src/prefs_common.c:1144
+#: src/prefs_common.c:1153
 msgid "Japanese (EUC-JP)"
 msgstr "Japonská (EUC-JP)"
 
-#: src/prefs_common.c:1145
+#: src/prefs_common.c:1154
 msgid "Japanese (Shift_JIS)"
 msgstr "Japonská (Shift_JIS)"
 
-#: src/prefs_common.c:1147
+#: src/prefs_common.c:1157
 msgid "Simplified Chinese (GB2312)"
 msgstr "Zjednodušená čínská (GB2312)"
 
-#: src/prefs_common.c:1148
+#: src/prefs_common.c:1158
 msgid "Traditional Chinese (Big5)"
 msgstr "Tradiční čínská (Big5)"
 
-#: src/prefs_common.c:1150
+#: src/prefs_common.c:1160
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Tradiční čínská (EUC-TW)"
 
-#: src/prefs_common.c:1151
+#: src/prefs_common.c:1161
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Čínská (ISO-2022-CN)"
 
-#: src/prefs_common.c:1153
+#: src/prefs_common.c:1164
 msgid "Korean (EUC-KR)"
 msgstr "Korejská (EUC-KR)"
 
-#: src/prefs_common.c:1154
+#: src/prefs_common.c:1166
 msgid "Thai (TIS-620)"
 msgstr "Thajská (TIS-620)"
 
-#: src/prefs_common.c:1155
+#: src/prefs_common.c:1167
 msgid "Thai (Windows-874)"
 msgstr "Thajská (Windows-874)"
 
-#: src/prefs_common.c:1165
+#: src/prefs_common.c:1177
 #, fuzzy
 msgid ""
 "If `Automatic' is selected, the optimal encoding for the current locale will "
@@ -4440,11 +4477,11 @@ msgstr ""
 "Pokud je zvoleno 'Automatická', bude použita\n"
 "znaková sada podle locale."
 
-#: src/prefs_common.c:1179
+#: src/prefs_common.c:1191
 msgid "Transfer encoding"
 msgstr "Kódování přenosu"
 
-#: src/prefs_common.c:1202
+#: src/prefs_common.c:1214
 #, fuzzy
 msgid ""
 "Specify Content-Transfer-Encoding used when message body contains non-ASCII "
@@ -4453,118 +4490,118 @@ msgstr ""
 "Určuje jak v jaké znakové sadě bude zpráva\n"
 "poslána když obsahuje ne-ASCII znaky."
 
-#: src/prefs_common.c:1272
+#: src/prefs_common.c:1284
 msgid "Signature separator"
 msgstr "Oddělovač podpisu"
 
-#: src/prefs_common.c:1281
+#: src/prefs_common.c:1293
 msgid "Insert automatically"
 msgstr "Automaticky vložit"
 
-#: src/prefs_common.c:1291
+#: src/prefs_common.c:1303
 msgid "Automatically launch the external editor"
 msgstr "Automaticky spustit externí editor"
 
-#: src/prefs_common.c:1301
+#: src/prefs_common.c:1313
 msgid "Undo level"
 msgstr "Úroveň zpětných kroků"
 
-#: src/prefs_common.c:1321
+#: src/prefs_common.c:1333
 msgid "Wrap messages at"
 msgstr "Zarovnat zprávu na"
 
-#: src/prefs_common.c:1333
+#: src/prefs_common.c:1345
 msgid "characters"
 msgstr "znaků"
 
-#: src/prefs_common.c:1343
+#: src/prefs_common.c:1355
 msgid "Wrap quotation"
 msgstr "Zalomit citaci"
 
-#: src/prefs_common.c:1349
+#: src/prefs_common.c:1361
 msgid "Wrap on input"
 msgstr "Zalomit při přijmutí"
 
-#: src/prefs_common.c:1351
+#: src/prefs_common.c:1363
 msgid "Wrap before sending"
 msgstr "Zalomit před odesláním"
 
-#: src/prefs_common.c:1361
+#: src/prefs_common.c:1373
 msgid "Automatically select account for replies"
 msgstr "Automaticky vybrat účet pro odpovědi"
 
-#: src/prefs_common.c:1363
+#: src/prefs_common.c:1375
 msgid "Quote message when replying"
 msgstr "Citovat zprávy při odpovídání"
 
-#: src/prefs_common.c:1365
+#: src/prefs_common.c:1377
 msgid "Reply button invokes mailing list reply"
 msgstr "Tlačítko s odpovědí zvolí odpověď do diskusního listu"
 
 #. reply
-#: src/prefs_common.c:1411
+#: src/prefs_common.c:1423
 msgid "Reply format"
 msgstr "Formát odpovědi"
 
-#: src/prefs_common.c:1426 src/prefs_common.c:1468
+#: src/prefs_common.c:1438 src/prefs_common.c:1480
 msgid "Quotation mark"
 msgstr "Značka pro citaci"
 
 #. forward
-#: src/prefs_common.c:1453
+#: src/prefs_common.c:1465
 msgid "Forward format"
 msgstr "Formát přeposlání"
 
-#: src/prefs_common.c:1500
+#: src/prefs_common.c:1512
 msgid " Description of symbols "
 msgstr " Popis symbolů "
 
-#: src/prefs_common.c:1541
+#: src/prefs_common.c:1553
 msgid "Font"
 msgstr "Písmo"
 
-#: src/prefs_common.c:1573
+#: src/prefs_common.c:1585
 msgid "Translate header name (such as `From:', `Subject:')"
 msgstr "Překládat názvy záhlaví (jako například 'Od:', 'Předmět:')"
 
-#: src/prefs_common.c:1576
+#: src/prefs_common.c:1588
 msgid "Display unread number next to folder name"
 msgstr "Zobrazit počet nepřečtených za názvem složky"
 
-#: src/prefs_common.c:1585
+#: src/prefs_common.c:1597
 msgid "Abbreviate newsgroups longer than"
 msgstr "Zkrátit názvy diskuzních skupin delší než"
 
-#: src/prefs_common.c:1600
+#: src/prefs_common.c:1612
 msgid "letters"
 msgstr "dopisy(ů)"
 
 #. ---- Summary ----
-#: src/prefs_common.c:1606
+#: src/prefs_common.c:1618
 msgid "Summary View"
 msgstr "Souhrnný pohled"
 
-#: src/prefs_common.c:1615
+#: src/prefs_common.c:1627
 msgid "Display recipient on `From' column if sender is yourself"
 msgstr "Zobrazit příjemce ve sloupci 'Od', jestliže odesílatel jste vy sám"
 
-#: src/prefs_common.c:1617
+#: src/prefs_common.c:1629
 msgid "Expand threads"
 msgstr "Rozbalit vlákna"
 
-#: src/prefs_common.c:1625 src/prefs_common.c:2443 src/prefs_common.c:2481
+#: src/prefs_common.c:1637 src/prefs_common.c:2455 src/prefs_common.c:2493
 msgid "Date format"
 msgstr "Formát datumu"
 
-#: src/prefs_common.c:1646
+#: src/prefs_common.c:1658
 msgid " Set display item of summary... "
 msgstr " Nastavení zobrazených položek v souhrnu... "
 
-#: src/prefs_common.c:1710
+#: src/prefs_common.c:1722
 msgid "Enable coloration of message"
 msgstr "Povolit zabarvení zpráv"
 
-#: src/prefs_common.c:1724
+#: src/prefs_common.c:1736
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
@@ -4572,324 +4609,324 @@ msgstr ""
 "Zobrazit více-bytovou abecedu a číslice\n"
 "jako ASCII znaky (pouze pro Japonsko)"
 
-#: src/prefs_common.c:1730
+#: src/prefs_common.c:1742
 msgid "Display header pane above message view"
 msgstr "Zobrazit okno se záhlavím nad zprávou"
 
-#: src/prefs_common.c:1737
+#: src/prefs_common.c:1749
 msgid "Display short headers on message view"
 msgstr "Zobrazit krátké záhlaví při zobrazení zprávy"
 
-#: src/prefs_common.c:1758
+#: src/prefs_common.c:1770
 msgid "Line space"
 msgstr "Prázdná řádka"
 
-#: src/prefs_common.c:1772 src/prefs_common.c:1810
+#: src/prefs_common.c:1784 src/prefs_common.c:1822
 msgid "pixel(s)"
 msgstr "pixel(y)"
 
-#: src/prefs_common.c:1777
+#: src/prefs_common.c:1789
 msgid "Scroll"
 msgstr "Posun"
 
-#: src/prefs_common.c:1784
+#: src/prefs_common.c:1796
 msgid "Half page"
 msgstr "Polovina stránky"
 
-#: src/prefs_common.c:1790
+#: src/prefs_common.c:1802
 msgid "Smooth scroll"
 msgstr "Jemný posun"
 
-#: src/prefs_common.c:1796
+#: src/prefs_common.c:1808
 msgid "Step"
 msgstr "Krok"
 
-#: src/prefs_common.c:1816
+#: src/prefs_common.c:1828
 msgid "Images"
 msgstr ""
 
-#: src/prefs_common.c:1824
+#: src/prefs_common.c:1836
 #, fuzzy
 msgid "Resize attached large images to fit in the window"
 msgstr "Změnit velikost připojených obrázků"
 
-#: src/prefs_common.c:1826
+#: src/prefs_common.c:1838
 #, fuzzy
 msgid "Display images as inline"
 msgstr "Zobrazit nastavení záhlaví"
 
-#: src/prefs_common.c:1871
+#: src/prefs_common.c:1883
 msgid "Automatically check signatures"
 msgstr "Automaticky zkontrolovat podpis"
 
-#: src/prefs_common.c:1874
+#: src/prefs_common.c:1886
 msgid "Show signature check result in a popup window"
 msgstr "Zobrazit výsledek testování podpisu v popup okně"
 
-#: src/prefs_common.c:1877
+#: src/prefs_common.c:1889
 msgid "Store passphrase in memory temporarily"
 msgstr "Uložit passphrase dočasně v paměti"
 
-#: src/prefs_common.c:1892
+#: src/prefs_common.c:1904
 msgid "Expired after"
 msgstr "Vyprší za"
 
-#: src/prefs_common.c:1905
+#: src/prefs_common.c:1917
 msgid "minute(s) "
 msgstr "minut(y) "
 
-#: src/prefs_common.c:1918
+#: src/prefs_common.c:1930
 #, fuzzy
 msgid "Setting to '0' will store the passphrase for the whole session."
 msgstr ""
 "(Nastavení na '0' uloží passphrase\n"
 " pro celou relaci)"
 
-#: src/prefs_common.c:1932
+#: src/prefs_common.c:1944
 msgid "Grab input while entering a passphrase"
 msgstr ""
 
-#: src/prefs_common.c:1937
+#: src/prefs_common.c:1949
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "Zobrazit varování pokud GnuPG nefunguje"
 
-#: src/prefs_common.c:1989
+#: src/prefs_common.c:2001
 msgid "Always open messages in summary when selected"
 msgstr "Vybrané zprávy vždy otvírat v přehledu"
 
-#: src/prefs_common.c:1993
+#: src/prefs_common.c:2005
 msgid "Open first unread message when entering a folder"
 msgstr "Při vstupu do složky otevřít první nepřečtenou zprávu"
 
-#: src/prefs_common.c:1997
+#: src/prefs_common.c:2009
 msgid "Only mark message as read when opened in new window"
 msgstr "Označit zprávu za přečtěnou pouze při otevření v novém okně"
 
-#: src/prefs_common.c:2001
+#: src/prefs_common.c:2013
 msgid "Go to inbox after receiving new mail"
 msgstr "Po přijetí nových zpráv přejít na Doručenou poštu"
 
-#: src/prefs_common.c:2009
+#: src/prefs_common.c:2021
 msgid "Execute immediately when moving or deleting messages"
 msgstr "Vykonat ihned při přesunu nebo mazání zpráv"
 
-#: src/prefs_common.c:2021
+#: src/prefs_common.c:2033
 #, fuzzy
 msgid "Messages will be marked until execution if this is turned off."
 msgstr ""
 "(Pokud je tato volba vypnuta,\n"
 "zprávy budou označeny až do vykonání)"
 
-#: src/prefs_common.c:2029
+#: src/prefs_common.c:2041
 msgid "Receive dialog"
 msgstr "Dialog o přijetí"
 
-#: src/prefs_common.c:2039
+#: src/prefs_common.c:2051
 msgid "Show receive dialog"
 msgstr "Zobrazit dialog o přijetí"
 
-#: src/prefs_common.c:2049
+#: src/prefs_common.c:2061
 msgid "Always"
 msgstr "Vždy"
 
-#: src/prefs_common.c:2050
+#: src/prefs_common.c:2062
 msgid "Only on manual receiving"
 msgstr ""
 
-#: src/prefs_common.c:2052
+#: src/prefs_common.c:2064
 msgid "Never"
 msgstr "Nikdy"
 
-#: src/prefs_common.c:2057
+#: src/prefs_common.c:2069
 msgid "Don't popup error dialog on receive error"
 msgstr "Při příjmu chyby nezobrazovat popup dialog"
 
-#: src/prefs_common.c:2060
+#: src/prefs_common.c:2072
 msgid "Close receive dialog when finished"
 msgstr "Zavřít dialog o přijetí po dokončení"
 
-#: src/prefs_common.c:2066
+#: src/prefs_common.c:2078
 msgid " Set key bindings... "
 msgstr " Nastavit klávesové zkratky... "
 
-#: src/prefs_common.c:2122
+#: src/prefs_common.c:2134
 #, c-format
 msgid "External commands (%s will be replaced with file name / URI)"
 msgstr "Externí příkaz (%s bude nahrazen jménem souboru / URI)"
 
-#: src/prefs_common.c:2131
+#: src/prefs_common.c:2143
 msgid "Web browser"
 msgstr "Webový prohlížeč"
 
-#: src/prefs_common.c:2195
+#: src/prefs_common.c:2207
 msgid "Add address to destination when double-clicked"
 msgstr "Přidat adresu do cíle dvojklikem"
 
-#: src/prefs_common.c:2197
+#: src/prefs_common.c:2209
 msgid "On exit"
 msgstr "Při ukončení"
 
-#: src/prefs_common.c:2205
+#: src/prefs_common.c:2217
 msgid "Confirm on exit"
 msgstr "Potvrdit ukončení"
 
-#: src/prefs_common.c:2212
+#: src/prefs_common.c:2224
 msgid "Empty trash on exit"
 msgstr "Při ukončení vyprázdnit koš"
 
-#: src/prefs_common.c:2214
+#: src/prefs_common.c:2226
 msgid "Ask before emptying"
 msgstr "Potvrdit vyprázdnění"
 
-#: src/prefs_common.c:2218
+#: src/prefs_common.c:2230
 msgid "Warn if there are queued messages"
 msgstr "Varovat pokud jsou zprávy ve frontě"
 
-#: src/prefs_common.c:2224
+#: src/prefs_common.c:2236
 msgid "Socket I/O timeout:"
 msgstr "Čas vypršení pro I/O:"
 
-#: src/prefs_common.c:2237
+#: src/prefs_common.c:2249
 msgid "second(s)"
 msgstr "sekund(a)"
 
-#: src/prefs_common.c:2419
+#: src/prefs_common.c:2431
 msgid "the full abbreviated weekday name"
 msgstr "zkratky pro názvy dnů v týdnu"
 
-#: src/prefs_common.c:2420
+#: src/prefs_common.c:2432
 msgid "the full weekday name"
 msgstr "plný název dne v týdnu"
 
-#: src/prefs_common.c:2421
+#: src/prefs_common.c:2433
 msgid "the abbreviated month name"
 msgstr "zkratka pro měsíc"
 
-#: src/prefs_common.c:2422
+#: src/prefs_common.c:2434
 msgid "the full month name"
 msgstr "plný název měsíce"
 
-#: src/prefs_common.c:2423
+#: src/prefs_common.c:2435
 msgid "the preferred date and time for the current locale"
 msgstr "preferované datum a čas podle aktuálního locale"
 
-#: src/prefs_common.c:2424
+#: src/prefs_common.c:2436
 msgid "the century number (year/100)"
 msgstr "století (rok/100)"
 
-#: src/prefs_common.c:2425
+#: src/prefs_common.c:2437
 msgid "the day of the month as a decimal number"
 msgstr "den v měsíci číselně"
 
-#: src/prefs_common.c:2426
+#: src/prefs_common.c:2438
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "hodiny číselně s 24 hodinových cyklem"
 
-#: src/prefs_common.c:2427
+#: src/prefs_common.c:2439
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "hodiny číselně s 12 hodinových cyklem"
 
-#: src/prefs_common.c:2428
+#: src/prefs_common.c:2440
 msgid "the day of the year as a decimal number"
 msgstr "rok číselně"
 
-#: src/prefs_common.c:2429
+#: src/prefs_common.c:2441
 msgid "the month as a decimal number"
 msgstr "měsíc číselně"
 
-#: src/prefs_common.c:2430
+#: src/prefs_common.c:2442
 msgid "the minute as a decimal number"
 msgstr "minuty číselně"
 
-#: src/prefs_common.c:2431
+#: src/prefs_common.c:2443
 msgid "either AM or PM"
 msgstr "AM nebo PM"
 
-#: src/prefs_common.c:2432
+#: src/prefs_common.c:2444
 msgid "the second as a decimal number"
 msgstr "vteřiny číselně"
 
-#: src/prefs_common.c:2433
+#: src/prefs_common.c:2445
 msgid "the day of the week as a decimal number"
 msgstr "den v týdnu číselně"
 
-#: src/prefs_common.c:2434
+#: src/prefs_common.c:2446
 msgid "the preferred date for the current locale"
 msgstr "preferovaný datum pro aktuální locale"
 
-#: src/prefs_common.c:2435
+#: src/prefs_common.c:2447
 msgid "the last two digits of a year"
 msgstr "poslední dvě číslice z roku"
 
-#: src/prefs_common.c:2436
+#: src/prefs_common.c:2448
 msgid "the year as a decimal number"
 msgstr "rok jako desítkové číslo"
 
-#: src/prefs_common.c:2437
+#: src/prefs_common.c:2449
 msgid "the time zone or name or abbreviation"
 msgstr "časová zóna, název nebo zkratka"
 
-#: src/prefs_common.c:2458
+#: src/prefs_common.c:2470
 msgid "Specifier"
 msgstr "Specifikátor"
 
-#: src/prefs_common.c:2459
+#: src/prefs_common.c:2471
 msgid "Description"
 msgstr "Popis"
 
-#: src/prefs_common.c:2499
+#: src/prefs_common.c:2511
 msgid "Example"
 msgstr "Příklad"
 
-#: src/prefs_common.c:2580
+#: src/prefs_common.c:2592
 msgid "Set message colors"
 msgstr "Nastavení barev pro zprávy"
 
-#: src/prefs_common.c:2588
+#: src/prefs_common.c:2600
 msgid "Colors"
 msgstr "Barvy"
 
-#: src/prefs_common.c:2622
+#: src/prefs_common.c:2634
 msgid "Quoted Text - First Level"
 msgstr "Citovaný text - První úroveň"
 
-#: src/prefs_common.c:2628
+#: src/prefs_common.c:2640
 msgid "Quoted Text - Second Level"
 msgstr "Citovaný text - Druhá úroveň"
 
-#: src/prefs_common.c:2634
+#: src/prefs_common.c:2646
 msgid "Quoted Text - Third Level"
 msgstr "Citovaný text - Třetí úroveň"
 
-#: src/prefs_common.c:2640
+#: src/prefs_common.c:2652
 msgid "URI link"
 msgstr "URI odkaz"
 
-#: src/prefs_common.c:2647
+#: src/prefs_common.c:2659
 msgid "Recycle quote colors"
 msgstr "Rotovat barvy citací"
 
-#: src/prefs_common.c:2707
+#: src/prefs_common.c:2719
 msgid "Pick color for quotation level 1"
 msgstr "Zvolte barvu pro 1 úroveň citace"
 
-#: src/prefs_common.c:2710
+#: src/prefs_common.c:2722
 msgid "Pick color for quotation level 2"
 msgstr "Zvolte barvu pro 2 úroveň citace"
 
-#: src/prefs_common.c:2713
+#: src/prefs_common.c:2725
 msgid "Pick color for quotation level 3"
 msgstr "Zvolte barvu pro 3 úroveň citace"
 
-#: src/prefs_common.c:2716
+#: src/prefs_common.c:2728
 msgid "Pick color for URI"
 msgstr "Získat barvu z URI"
 
-#: src/prefs_common.c:2853
+#: src/prefs_common.c:2865
 msgid "Description of symbols"
 msgstr "Popis symbolů"
 
-#: src/prefs_common.c:2909
+#: src/prefs_common.c:2921
 msgid ""
 "Date\n"
 "From\n"
@@ -4913,11 +4950,11 @@ msgstr ""
 "Diskuzní skupina\n"
 "Číslo zprávy"
 
-#: src/prefs_common.c:2922
+#: src/prefs_common.c:2934
 msgid "If x is set, displays expr"
 msgstr ""
 
-#: src/prefs_common.c:2926
+#: src/prefs_common.c:2938
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -4931,7 +4968,7 @@ msgstr ""
 "Citované tělo zprávy bez podpisu\n"
 "Znak %"
 
-#: src/prefs_common.c:2934
+#: src/prefs_common.c:2946
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -4943,15 +4980,15 @@ msgstr ""
 "Znak levá složená závorka\n"
 "Znak pravá složená závorka"
 
-#: src/prefs_common.c:2971
+#: src/prefs_common.c:2983
 msgid "Font selection"
 msgstr "Výběr písma"
 
-#: src/prefs_common.c:3035
+#: src/prefs_common.c:3047
 msgid "Key bindings"
 msgstr "Klávesové zkratky"
 
-#: src/prefs_common.c:3049
+#: src/prefs_common.c:3061
 msgid ""
 "Select the preset of key bindings.\n"
 "You can also modify each menu's shortcuts by pressing\n"
@@ -4961,11 +4998,11 @@ msgstr ""
 "Klávesovou zkratku pro nabídku můžete také změnit tak,\n"
 "že při najetí myší na položku stisknete odpovídající klávesu."
 
-#: src/prefs_common.c:3061 src/prefs_common.c:3410
+#: src/prefs_common.c:3073 src/prefs_common.c:3422
 msgid "Default"
 msgstr "Výchozí"
 
-#: src/prefs_common.c:3064 src/prefs_common.c:3419
+#: src/prefs_common.c:3076 src/prefs_common.c:3431
 msgid "Old Sylpheed"
 msgstr "Starý Sylpheed"
 
@@ -6133,6 +6170,12 @@ msgstr "%.2fGB"
 msgid "writing to %s failed.\n"
 msgstr "Neúspěšný zápis do %s.\n"
 
+#~ msgid "/_View/_Code set/---"
+#~ msgstr "/Z_obrazit/_Znaková sada/---"
+
+#~ msgid "/_View/_Code set"
+#~ msgstr "/Z_obrazit/_Znaková sada"
+
 #~ msgid "To save this part, pop up the context menu with "
 #~ msgstr "Pro uložení této části vyvolejte kontextovou nabídku pomocí "
 
diff --git a/po/da.po b/po/da.po
index 4aa134e7..4aa06ff2 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: 2005-03-15 14:29+0900\n"
+"POT-Creation-Date: 2005-03-16 14:47+0900\n"
 "PO-Revision-Date: 2003-07-29 09:05+0200\n"
 "Last-Translator: Andreas Hinz <news3@acci.dk>\n"
 "Language-Team: \n"
@@ -95,7 +95,7 @@ msgstr ""
 "`G'-kolonnen, for at aktivere hentning via `hent alle'."
 
 #: src/account.c:638 src/addressadd.c:186 src/addressbook.c:488
-#: src/compose.c:3650 src/editaddress.c:195 src/editaddress.c:936
+#: src/compose.c:3748 src/editaddress.c:195 src/editaddress.c:936
 #: src/editaddress.c:984 src/editbook.c:191 src/editgroup.c:257
 #: src/editjpilot.c:296 src/editldap.c:300 src/editvcard.c:211
 #: src/mimeview.c:151 src/prefs_filter.c:214 src/prefs_folder_item.c:170
@@ -148,13 +148,13 @@ msgstr "Slet konto"
 msgid "Do you really want to delete this account?"
 msgstr "Vil du virkelig slette denne konto?"
 
-#: src/account.c:758 src/compose.c:2551 src/compose.c:4807
+#: src/account.c:758 src/compose.c:2632 src/compose.c:4943
 #: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
 #: src/folderview.c:2156 src/folderview.c:2192
 msgid "Yes"
 msgstr "Ja"
 
-#: src/account.c:758 src/compose.c:2551 src/compose.c:4807
+#: src/account.c:758 src/compose.c:2632 src/compose.c:4943
 #: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
 #: src/folderview.c:2156 src/folderview.c:2192
 msgid "+No"
@@ -259,7 +259,7 @@ msgstr "Handlingens bruger parameter"
 msgid "Add Address to Book"
 msgstr "Tilføj adresse i adressebog"
 
-#: src/addressadd.c:196 src/compose.c:4191 src/editaddress.c:196
+#: src/addressadd.c:196 src/compose.c:4292 src/editaddress.c:196
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "Adresse"
@@ -273,7 +273,7 @@ msgstr "Kommentar"
 msgid "Select Address Book Folder"
 msgstr "Vælg adressebog mappe"
 
-#: src/addressbook.c:334 src/compose.c:469 src/mainwindow.c:454
+#: src/addressbook.c:334 src/compose.c:477 src/mainwindow.c:454
 #: src/messageview.c:134
 msgid "/_File"
 msgstr "/_Filer"
@@ -294,8 +294,8 @@ msgstr "/_Filer/Ny _JPilot"
 msgid "/_File/New _Server"
 msgstr "/_Filer/Ny _server"
 
-#: src/addressbook.c:343 src/addressbook.c:346 src/compose.c:474
-#: src/compose.c:479 src/compose.c:483 src/mainwindow.c:471
+#: src/addressbook.c:343 src/addressbook.c:346 src/compose.c:482
+#: src/compose.c:487 src/compose.c:491 src/mainwindow.c:471
 #: src/mainwindow.c:474 src/mainwindow.c:476 src/mainwindow.c:479
 #: src/mainwindow.c:481 src/messageview.c:137
 msgid "/_File/---"
@@ -313,7 +313,7 @@ msgstr "/_Filer/_Slet"
 msgid "/_File/_Save"
 msgstr "/_Filer/_Gem"
 
-#: src/addressbook.c:348 src/compose.c:484 src/messageview.c:138
+#: src/addressbook.c:348 src/compose.c:492 src/messageview.c:138
 msgid "/_File/_Close"
 msgstr "/_Filer/_Luk"
 
@@ -345,7 +345,7 @@ msgstr "/_Adresse/_Redigér"
 msgid "/_Address/_Delete"
 msgstr "/_Adresse/_Slet"
 
-#: src/addressbook.c:356 src/compose.c:585 src/mainwindow.c:688
+#: src/addressbook.c:356 src/compose.c:664 src/mainwindow.c:697
 #: src/messageview.c:246
 msgid "/_Tools"
 msgstr "/_Funktioner"
@@ -354,12 +354,12 @@ msgstr "/_Funktioner"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Funktioner/Importer _LDIF-Fil"
 
-#: src/addressbook.c:358 src/compose.c:598 src/mainwindow.c:733
+#: src/addressbook.c:358 src/compose.c:677 src/mainwindow.c:742
 #: src/messageview.c:264
 msgid "/_Help"
 msgstr "/_Hjælp"
 
-#: src/addressbook.c:359 src/compose.c:599 src/mainwindow.c:744
+#: src/addressbook.c:359 src/compose.c:678 src/mainwindow.c:753
 #: src/messageview.c:265
 msgid "/_Help/_About"
 msgstr "/_Hjælp/_Om"
@@ -376,7 +376,7 @@ msgstr "/Ny _gruppe"
 msgid "/New _Folder"
 msgstr "/Ny _mappe"
 
-#: src/addressbook.c:381 src/addressbook.c:391 src/compose.c:463
+#: src/addressbook.c:381 src/addressbook.c:391 src/compose.c:471
 #: src/folderview.c:220 src/folderview.c:222 src/folderview.c:226
 #: src/folderview.c:236 src/folderview.c:238 src/folderview.c:240
 #: src/folderview.c:244 src/folderview.c:254 src/folderview.c:256
@@ -386,7 +386,7 @@ msgstr "/Ny _mappe"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:382 src/addressbook.c:392 src/compose.c:486
+#: src/addressbook.c:382 src/addressbook.c:392 src/compose.c:494
 #: src/mainwindow.c:485 src/messageview.c:140
 msgid "/_Edit"
 msgstr "/_Redigér"
@@ -399,7 +399,7 @@ msgstr "/_Slet"
 msgid "E-Mail address"
 msgstr "E-post adresse"
 
-#: src/addressbook.c:493 src/compose.c:4192 src/prefs_common.c:2186
+#: src/addressbook.c:493 src/compose.c:4293 src/prefs_common.c:2198
 msgid "Address book"
 msgstr "Adressebog"
 
@@ -409,7 +409,7 @@ msgstr "Navn:"
 
 #. Buttons
 #: src/addressbook.c:625 src/addressbook.c:1665 src/addressbook.c:1671
-#: src/editaddress.c:878 src/editaddress.c:1011 src/mainwindow.c:2212
+#: src/editaddress.c:878 src/editaddress.c:1011 src/mainwindow.c:2221
 #: src/prefs_actions.c:263 src/prefs_display_header.c:275
 #: src/prefs_display_header.c:330 src/prefs_template.c:227
 msgid "Delete"
@@ -597,7 +597,7 @@ msgstr "Normale adresser"
 msgid "Personal address"
 msgstr "Personlige adresser"
 
-#: src/alertpanel.c:123 src/compose.c:4807 src/main.c:458
+#: src/alertpanel.c:123 src/compose.c:4943 src/main.c:458
 msgid "Notice"
 msgstr "Note"
 
@@ -605,7 +605,7 @@ msgstr "Note"
 msgid "Warning"
 msgstr "Advarsel"
 
-#: src/alertpanel.c:149 src/compose.c:2551 src/inc.c:558
+#: src/alertpanel.c:149 src/compose.c:2632 src/inc.c:558
 msgid "Error"
 msgstr "Fejl"
 
@@ -653,307 +653,425 @@ msgstr "Brun"
 msgid "None"
 msgstr "Ingen"
 
-#: src/compose.c:461
+#: src/compose.c:469
 msgid "/_Add..."
 msgstr "/_Tilføj..."
 
-#: src/compose.c:462
+#: src/compose.c:470
 msgid "/_Remove"
 msgstr "/_Fjern"
 
-#: src/compose.c:464 src/folderview.c:228 src/folderview.c:246
+#: src/compose.c:472 src/folderview.c:228 src/folderview.c:246
 #: src/folderview.c:261
 msgid "/_Properties..."
 msgstr "/_Egenskaber..."
 
-#: src/compose.c:470
+#: src/compose.c:478
 #, fuzzy
 msgid "/_File/_Send"
 msgstr "/_Filer/_Gem"
 
-#: src/compose.c:472
+#: src/compose.c:480
 #, fuzzy
 msgid "/_File/Send _later"
 msgstr "/_Meddelelse/_Send senere"
 
-#: src/compose.c:475
+#: src/compose.c:483
 #, fuzzy
 msgid "/_File/Save to _draft folder"
 msgstr "/_Meddelelse/Gem i _kladde mappe"
 
-#: src/compose.c:477
+#: src/compose.c:485
 #, fuzzy
 msgid "/_File/Save and _keep editing"
 msgstr "/_Meddelelse/_Send senere"
 
-#: src/compose.c:480
+#: src/compose.c:488
 msgid "/_File/_Attach file"
 msgstr "/_Filer/_Vedhæft fil"
 
-#: src/compose.c:481
+#: src/compose.c:489
 msgid "/_File/_Insert file"
 msgstr "/_Filer/_Indsæt fil"
 
-#: src/compose.c:482
+#: src/compose.c:490
 msgid "/_File/Insert si_gnature"
 msgstr "/_Filer/Tilføj _underskrift"
 
-#: src/compose.c:487
+#: src/compose.c:495
 msgid "/_Edit/_Undo"
 msgstr "/_Redigér/_Fortryd"
 
-#: src/compose.c:488
+#: src/compose.c:496
 msgid "/_Edit/_Redo"
 msgstr "/_Redigér/_Gentag"
 
-#: src/compose.c:489 src/compose.c:567 src/mainwindow.c:489
+#: src/compose.c:497 src/compose.c:575 src/mainwindow.c:489
 #: src/messageview.c:143
 msgid "/_Edit/---"
 msgstr "/_Redigér/---"
 
-#: src/compose.c:490
+#: src/compose.c:498
 msgid "/_Edit/Cu_t"
 msgstr "/_Redigér/_Klip"
 
-#: src/compose.c:491 src/mainwindow.c:486 src/messageview.c:141
+#: src/compose.c:499 src/mainwindow.c:486 src/messageview.c:141
 msgid "/_Edit/_Copy"
 msgstr "/_Redigér/K_opiere"
 
-#: src/compose.c:492
+#: src/compose.c:500
 msgid "/_Edit/_Paste"
 msgstr "/_Redigér/_Sæt ind"
 
-#: src/compose.c:493
+#: src/compose.c:501
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Redigér/_Sæt ind som citat"
 
-#: src/compose.c:495 src/mainwindow.c:487 src/messageview.c:142
+#: src/compose.c:503 src/mainwindow.c:487 src/messageview.c:142
 msgid "/_Edit/Select _all"
 msgstr "/_Redigér/Markér _alle"
 
-#: src/compose.c:496
+#: src/compose.c:504
 msgid "/_Edit/A_dvanced"
 msgstr "/_Redigér/A_vanceret"
 
-#: src/compose.c:497
+#: src/compose.c:505
 msgid "/_Edit/A_dvanced/Move a character backward"
 msgstr "/_Redigér/A_vanceret/Flyt et tegn baglæns"
 
-#: src/compose.c:502
+#: src/compose.c:510
 msgid "/_Edit/A_dvanced/Move a character forward"
 msgstr "/_Redigér/A_vanceret/Flyt et tegn frem"
 
-#: src/compose.c:507
+#: src/compose.c:515
 msgid "/_Edit/A_dvanced/Move a word backward"
 msgstr "/_Redigér/A_vanceret/Flyt et ord baglæns"
 
-#: src/compose.c:512
+#: src/compose.c:520
 msgid "/_Edit/A_dvanced/Move a word forward"
 msgstr "/_Redigér/A_vanceret/Flyt et ord frem"
 
-#: src/compose.c:517
+#: src/compose.c:525
 msgid "/_Edit/A_dvanced/Move to beginning of line"
 msgstr "/_Redigér/A_vanceret/Flyt til linie start"
 
-#: src/compose.c:522
+#: src/compose.c:530
 msgid "/_Edit/A_dvanced/Move to end of line"
 msgstr "/_Redigér/A_vanceret/Flyt til linie slutning"
 
-#: src/compose.c:527
+#: src/compose.c:535
 msgid "/_Edit/A_dvanced/Move to previous line"
 msgstr "/_Redigér/A_vanceret/Flyt til forrige linie"
 
-#: src/compose.c:532
+#: src/compose.c:540
 msgid "/_Edit/A_dvanced/Move to next line"
 msgstr "/_Redigér/A_vanceret/Flyt til næste linie"
 
-#: src/compose.c:537
+#: src/compose.c:545
 msgid "/_Edit/A_dvanced/Delete a character backward"
 msgstr "/_Redigér/A_vanceret/Slet et tegn bagfra"
 
-#: src/compose.c:542
+#: src/compose.c:550
 msgid "/_Edit/A_dvanced/Delete a character forward"
 msgstr "/_Redigér/A_vanceret/Slet et tegn forlæns"
 
-#: src/compose.c:547
+#: src/compose.c:555
 msgid "/_Edit/A_dvanced/Delete a word backward"
 msgstr "/_Redigér/A_vanceret/Slet et tegn baglæns"
 
-#: src/compose.c:552
+#: src/compose.c:560
 msgid "/_Edit/A_dvanced/Delete a word forward"
 msgstr "/_Redigér/A_vanceret/Slett et ord forlæns"
 
-#: src/compose.c:557
+#: src/compose.c:565
 msgid "/_Edit/A_dvanced/Delete line"
 msgstr "/_Redigér/A_vanceret/Slet linie"
 
-#: src/compose.c:562
+#: src/compose.c:570
 msgid "/_Edit/A_dvanced/Delete to end of line"
 msgstr "/_Redigér/A_vanceret/Slet til linie slutning"
 
-#: src/compose.c:568
+#: src/compose.c:576
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/_Redigér/Formater a_ktuelt afsnit"
 
-#: src/compose.c:570
+#: src/compose.c:578
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/_Redigér/Formater _alle lange linier"
 
-#: src/compose.c:572
+#: src/compose.c:580
 #, fuzzy
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Redigér/K_opiere"
 
-#: src/compose.c:573 src/mainwindow.c:494 src/messageview.c:147
+#: src/compose.c:581 src/mainwindow.c:494 src/messageview.c:147
 #: src/summaryview.c:370
 msgid "/_View"
 msgstr "/_Vis"
 
-#: src/compose.c:574
+#: src/compose.c:582
 msgid "/_View/_To"
 msgstr "/_Vis/_Til"
 
-#: src/compose.c:575
+#: src/compose.c:583
 msgid "/_View/_Cc"
 msgstr "/_Vis/_Cc"
 
-#: src/compose.c:576
+#: src/compose.c:584
 msgid "/_View/_Bcc"
 msgstr "/_Vis/_Bcc"
 
-#: src/compose.c:577
+#: src/compose.c:585
 msgid "/_View/_Reply to"
 msgstr "/_Vis/_Svar til"
 
-#: src/compose.c:578 src/compose.c:580 src/compose.c:582 src/mainwindow.c:512
-#: src/mainwindow.c:515 src/mainwindow.c:541 src/mainwindow.c:565
-#: src/mainwindow.c:641 src/mainwindow.c:645 src/messageview.c:223
+#: src/compose.c:586 src/compose.c:588 src/compose.c:590 src/compose.c:592
+#: src/mainwindow.c:512 src/mainwindow.c:515 src/mainwindow.c:541
+#: src/mainwindow.c:565 src/mainwindow.c:650 src/mainwindow.c:654
+#: src/messageview.c:223
 msgid "/_View/---"
 msgstr "/_Vis/---"
 
-#: src/compose.c:579
+#: src/compose.c:587
 msgid "/_View/_Followup to"
 msgstr "/_Vis/_Followup to"
 
-#: src/compose.c:581
+#: src/compose.c:589
 msgid "/_View/R_uler"
 msgstr "/_Vis/_Linieal"
 
-#: src/compose.c:583
+#: src/compose.c:591
 msgid "/_View/_Attachment"
 msgstr "/_Vis/_Vedhæft"
 
-#: src/compose.c:586 src/mainwindow.c:689 src/messageview.c:247
+#: src/compose.c:598 src/mainwindow.c:572 src/messageview.c:154
+#, fuzzy
+msgid "/_View/Character _encoding"
+msgstr "/_Vis/_Sortere/Faldende"
+
+#: src/compose.c:599
+msgid "/_View/Character _encoding/_Automatic"
+msgstr ""
+
+#: src/compose.c:601 src/compose.c:607 src/compose.c:613 src/compose.c:617
+#: src/compose.c:623 src/compose.c:627 src/compose.c:631 src/compose.c:641
+#: src/compose.c:645 src/compose.c:653 src/compose.c:657 src/mainwindow.c:568
+#: src/mainwindow.c:575 src/messageview.c:150
+#, fuzzy
+msgid "/_View/Character _encoding/---"
+msgstr "/_Vis/_Sortere/Faldende"
+
+#: src/compose.c:603 src/mainwindow.c:576 src/messageview.c:158
+#, fuzzy
+msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
+msgstr "/_Vis/_Tegnsæt/7bit ascii (US-ASC_II)"
+
+#: src/compose.c:605 src/mainwindow.c:578 src/messageview.c:161
+#, fuzzy
+msgid "/_View/Character _encoding/Unicode (_UTF-8)"
+msgstr "/_Vis/_Tegnsæt/Unicode (_UTF-8)"
+
+#: src/compose.c:609 src/mainwindow.c:582 src/messageview.c:164
+#, fuzzy
+msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
+msgstr "/_Vis/_Tegnsæt/Western European (ISO-8859-_1)"
+
+#: src/compose.c:611 src/mainwindow.c:584 src/messageview.c:166
+#, fuzzy
+msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
+msgstr "/_Vis/_Tegnsæt/Western European (ISO-8859-_15)"
+
+#: src/compose.c:615 src/mainwindow.c:588 src/messageview.c:169
+#, fuzzy
+msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
+msgstr "/_Vis/_Tegnsæt/Central European (ISO-8859-_2)"
+
+#: src/compose.c:619 src/mainwindow.c:592 src/messageview.c:172
+#, fuzzy
+msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
+msgstr "/_Vis/_Tegnsæt/_Baltic (ISO-8859-13)"
+
+#: src/compose.c:621 src/mainwindow.c:594 src/messageview.c:174
+#, fuzzy
+msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
+msgstr "/_Vis/_Tegnsæt/Baltic (ISO-8859-_4)"
+
+#: src/compose.c:625 src/mainwindow.c:598 src/messageview.c:177
+#, fuzzy
+msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
+msgstr "/_Vis/_Tegnsæt/Greek (ISO-8859-_7)"
+
+#: src/compose.c:629 src/mainwindow.c:602 src/messageview.c:180
+#, fuzzy
+msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
+msgstr "/_Vis/_Tegnsæt/Turkish (ISO-8859-_9)"
+
+#: src/compose.c:633 src/mainwindow.c:606 src/messageview.c:183
+#, fuzzy
+msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
+msgstr "/_Vis/_Tegnsæt/Cyrillic (ISO-8859-_5)"
+
+#: src/compose.c:635 src/mainwindow.c:608 src/messageview.c:185
+#, fuzzy
+msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
+msgstr "/_Vis/_Tegnsæt/Cyrillic (KOI8-_R)"
+
+#: src/compose.c:637 src/mainwindow.c:610 src/messageview.c:187
+#, fuzzy
+msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
+msgstr "/_Vis/_Tegnsæt/Cyrillic (KOI8-_R)"
+
+#: src/compose.c:639 src/mainwindow.c:612 src/messageview.c:189
+#, fuzzy
+msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
+msgstr "/_Vis/_Tegnsæt/Cyrillic (Windows-1251)"
+
+#: src/compose.c:643 src/mainwindow.c:616 src/messageview.c:192
+#, fuzzy
+msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
+msgstr "/_Vis/_Tegnsæt/Japanese (ISO-2022-_JP)"
+
+#: src/compose.c:647 src/mainwindow.c:626 src/messageview.c:201
+#, fuzzy
+msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
+msgstr "/_Vis/_Tegnsæt/Simplified Chinese (_GB2312)"
+
+#: src/compose.c:649 src/mainwindow.c:628 src/messageview.c:203
+#, fuzzy
+msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
+msgstr "/_Vis/_Tegnsæt/Traditional Chinese (_Big5)"
+
+#: src/compose.c:651 src/mainwindow.c:630 src/messageview.c:205
+#, fuzzy
+msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
+msgstr "/_Vis/_Tegnsæt/Traditional Chinese (EUC-_TW)"
+
+#: src/compose.c:655 src/mainwindow.c:636 src/messageview.c:210
+#, fuzzy
+msgid "/_View/Character _encoding/Korean (EUC-_KR)"
+msgstr "/_Vis/_Tegnsæt/Korean (EUC-_KR)"
+
+#: src/compose.c:659 src/mainwindow.c:642 src/messageview.c:215
+#, fuzzy
+msgid "/_View/Character _encoding/Thai (TIS-620)"
+msgstr "/_Vis/_Tegnsæt/Thai (TIS-620)"
+
+#: src/compose.c:661 src/mainwindow.c:644 src/messageview.c:217
+#, fuzzy
+msgid "/_View/Character _encoding/Thai (Windows-874)"
+msgstr "/_Vis/_Tegnsæt/Thai (Windows-874)"
+
+#: src/compose.c:665 src/mainwindow.c:698 src/messageview.c:247
 msgid "/_Tools/_Address book"
 msgstr "/_Funktioner/_Adressebog"
 
-#: src/compose.c:587
+#: src/compose.c:666
 msgid "/_Tools/_Template"
 msgstr "/_Funktioner/_Skabelon"
 
-#: src/compose.c:588 src/mainwindow.c:707 src/messageview.c:262
+#: src/compose.c:667 src/mainwindow.c:716 src/messageview.c:262
 msgid "/_Tools/Actio_ns"
 msgstr "/_Funktioner/_Handlinger"
 
-#: src/compose.c:589 src/compose.c:593 src/mainwindow.c:692
-#: src/mainwindow.c:706 src/mainwindow.c:708 src/mainwindow.c:711
-#: src/mainwindow.c:713 src/messageview.c:250 src/messageview.c:261
+#: src/compose.c:668 src/compose.c:672 src/mainwindow.c:701
+#: src/mainwindow.c:715 src/mainwindow.c:717 src/mainwindow.c:720
+#: src/mainwindow.c:722 src/messageview.c:250 src/messageview.c:261
 msgid "/_Tools/---"
 msgstr "/_Funktioner/---"
 
-#: src/compose.c:590
+#: src/compose.c:669
 #, fuzzy
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/_Redigér/Redigér med e_kstern editor"
 
-#: src/compose.c:594
+#: src/compose.c:673
 #, fuzzy
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Funktioner/_Handlinger"
 
-#: src/compose.c:595
+#: src/compose.c:674
 #, fuzzy
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/_Meddelelse/_Kryptere"
 
-#: src/compose.c:800
+#: src/compose.c:879
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: fil findes ikke\n"
 
-#: src/compose.c:899 src/compose.c:958 src/procmsg.c:1303
+#: src/compose.c:978 src/compose.c:1037 src/procmsg.c:1303
 msgid "Can't get text part\n"
 msgstr "Kan ikke læse tekst afsnit\n"
 
-#: src/compose.c:1340
+#: src/compose.c:1419
 msgid "Quote mark format error."
 msgstr "Citat markérings format fejl."
 
-#: src/compose.c:1352
+#: src/compose.c:1431
 msgid "Message reply/forward format error."
 msgstr "Meddelelses svar / videresend fejl."
 
-#: src/compose.c:1679
+#: src/compose.c:1758
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Filen %s findes ikke\n"
 
-#: src/compose.c:1683
+#: src/compose.c:1762
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Kan ikke læse størrelse på %s\n"
 
-#: src/compose.c:1687
+#: src/compose.c:1766
 #, c-format
 msgid "File %s is empty."
 msgstr "Filen %s er tom."
 
-#: src/compose.c:1691
+#: src/compose.c:1770
 #, c-format
 msgid "Can't read %s."
 msgstr "kan ikke læse %s"
 
-#: src/compose.c:1726
+#: src/compose.c:1805
 #, c-format
 msgid "Message: %s"
 msgstr "Meddelelse: %s"
 
-#: src/compose.c:1797 src/mimeview.c:491
+#: src/compose.c:1876 src/mimeview.c:491
 msgid "Can't get the part of multipart message."
 msgstr "Kan ikke hente del af multipart meddelese."
 
-#: src/compose.c:2188
+#: src/compose.c:2267
 msgid " [Edited]"
 msgstr " [Redigéret]"
 
-#: src/compose.c:2190
+#: src/compose.c:2269
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Ny meddelelse%s"
 
-#: src/compose.c:2193
+#: src/compose.c:2272
 #, c-format
 msgid "Compose message%s"
 msgstr "Ny meddelelse%s"
 
-#: src/compose.c:2304
+#: src/compose.c:2383
 msgid "Recipient is not specified."
 msgstr "Mangler modtager"
 
-#: src/compose.c:2312 src/compose.c:4112 src/mainwindow.c:2144
+#: src/compose.c:2391 src/compose.c:4213 src/mainwindow.c:2153
 #: src/prefs_account.c:703 src/prefs_common.c:850
 msgid "Send"
 msgstr "Send"
 
-#: src/compose.c:2313
+#: src/compose.c:2392
 msgid "Subject is empty. Send it anyway?"
 msgstr "Emne er tom. Send alligevel?"
 
-#: src/compose.c:2364
+#: src/compose.c:2443
 msgid "can't get recipient list."
 msgstr "Kan ikke åbne modtager liste."
 
-#: src/compose.c:2384
+#: src/compose.c:2463
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -961,26 +1079,26 @@ msgstr ""
 "Konto til afsendelse af e-post er ikke valgt.\n"
 "Vælg konto før afsendelse er mulig."
 
-#: src/compose.c:2398 src/send_message.c:261
+#: src/compose.c:2477 src/send_message.c:261
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Fejl ved afsendelse af meddelelse til %s ."
 
-#: src/compose.c:2421
+#: src/compose.c:2500
 msgid "Can't save the message to outbox."
 msgstr "Kan ikke gemme meddelelse i Sendt"
 
-#: src/compose.c:2457
+#: src/compose.c:2536
 #, 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:2518 src/compose.c:2739 src/compose.c:2802 src/compose.c:2921
+#: src/compose.c:2597 src/compose.c:2820 src/compose.c:2883 src/compose.c:3003
 #: src/utils.c:2189
 msgid "can't change file mode\n"
 msgstr "kan ikke ændre fil mode\n"
 
-#: src/compose.c:2546
+#: src/compose.c:2627
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -990,140 +1108,140 @@ msgstr ""
 "%s til %s.\n"
 "Send den alligevel?"
 
-#: src/compose.c:2610
+#: src/compose.c:2691
 msgid "can't write headers\n"
 msgstr "kan ikke skrive hoved\n"
 
-#: src/compose.c:2881
+#: src/compose.c:2963
 msgid "can't remove the old message\n"
 msgstr "kan ikke slette gammel meddelelse\n"
 
-#: src/compose.c:2899
+#: src/compose.c:2981
 msgid "queueing message...\n"
 msgstr "meddelelse i kø...\n"
 
-#: src/compose.c:2981
+#: src/compose.c:3063
 msgid "can't find queue folder\n"
 msgstr "kan ikke vælge mappe %s\n"
 
-#: src/compose.c:2988
+#: src/compose.c:3070
 msgid "can't queue the message\n"
 msgstr "meddelelse kan ikke lægges i kø\n"
 
-#: src/compose.c:3547
+#: src/compose.c:3645
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "genereret meddelelses ID: %s\n"
 
-#: src/compose.c:3645
+#: src/compose.c:3743
 msgid "Creating compose window...\n"
 msgstr "Opretter instastnings vindue...\n"
 
-#: src/compose.c:3648 src/compose.c:4598
+#: src/compose.c:3746 src/compose.c:4734
 msgid "MIME type"
 msgstr "MIME type"
 
 #. S_COL_DATE
-#: src/compose.c:3649 src/mimeview.c:150 src/prefs_filter_edit.c:569
+#: src/compose.c:3747 src/mimeview.c:150 src/prefs_filter_edit.c:569
 #: src/prefs_summary_column.c:73 src/select-keys.c:317 src/summaryview.c:386
 msgid "Size"
 msgstr "Størrelse"
 
-#: src/compose.c:3700 src/headerview.c:53 src/summary_search.c:169
+#: src/compose.c:3798 src/headerview.c:53 src/summary_search.c:169
 msgid "From:"
 msgstr "Fra:"
 
-#: src/compose.c:4113
+#: src/compose.c:4214
 msgid "Send message"
 msgstr "Sende meddelelse"
 
-#: src/compose.c:4121
+#: src/compose.c:4222
 msgid "Send later"
 msgstr "Send senere"
 
-#: src/compose.c:4122
+#: src/compose.c:4223
 msgid "Put into queue folder and send later"
 msgstr "Læg i kø og send senere"
 
-#: src/compose.c:4130
+#: src/compose.c:4231
 msgid "Draft"
 msgstr "Kladde"
 
-#: src/compose.c:4131
+#: src/compose.c:4232
 msgid "Save to draft folder"
 msgstr "Gem i Kladde"
 
-#: src/compose.c:4141 src/compose.c:5382
+#: src/compose.c:4242 src/compose.c:5527
 msgid "Insert"
 msgstr "Indæst"
 
-#: src/compose.c:4142
+#: src/compose.c:4243
 msgid "Insert file"
 msgstr "Insæt fil"
 
-#: src/compose.c:4150
+#: src/compose.c:4251
 msgid "Attach"
 msgstr "Vedhæft"
 
-#: src/compose.c:4151
+#: src/compose.c:4252
 msgid "Attach file"
 msgstr "Vedhæft fil"
 
 #. signature
-#: src/compose.c:4161 src/prefs_account.c:1339 src/prefs_common.c:1261
+#: src/compose.c:4262 src/prefs_account.c:1339 src/prefs_common.c:1273
 msgid "Signature"
 msgstr "Underskrift"
 
-#: src/compose.c:4162
+#: src/compose.c:4263
 msgid "Insert signature"
 msgstr "Indsæt underskrift"
 
-#: src/compose.c:4171 src/prefs_common.c:1283 src/prefs_common.c:2165
+#: src/compose.c:4272 src/prefs_common.c:1295 src/prefs_common.c:2177
 msgid "Editor"
 msgstr "Editor"
 
-#: src/compose.c:4172
+#: src/compose.c:4273
 msgid "Edit with external editor"
 msgstr "Redigér med ekstern Editor"
 
-#: src/compose.c:4180
+#: src/compose.c:4281
 msgid "Linewrap"
 msgstr "Linie deling"
 
-#: src/compose.c:4181
+#: src/compose.c:4282
 msgid "Wrap all long lines"
 msgstr "/_Redigér/Formater _alle lange linier"
 
-#: src/compose.c:4492
+#: src/compose.c:4628
 msgid "Invalid MIME type."
 msgstr "Ugyldig MIME type"
 
-#: src/compose.c:4511
+#: src/compose.c:4647
 msgid "File doesn't exist or is empty."
 msgstr "Fil eksisterer ikke eller er tom."
 
-#: src/compose.c:4580
+#: src/compose.c:4716
 msgid "Properties"
 msgstr "Egenskaber"
 
-#: src/compose.c:4600
+#: src/compose.c:4736
 msgid "Encoding"
 msgstr "Tegnsæt kodning"
 
-#: src/compose.c:4623 src/prefs_folder_item.c:183
+#: src/compose.c:4759 src/prefs_folder_item.c:183
 msgid "Path"
 msgstr "Sti"
 
-#: src/compose.c:4624
+#: src/compose.c:4760
 msgid "File name"
 msgstr "Fil navn"
 
-#: src/compose.c:4778
+#: src/compose.c:4914
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Sti til ekstern editor er ugyldig: `%s'\n"
 
-#: src/compose.c:4804
+#: src/compose.c:4940
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1134,72 +1252,72 @@ msgstr ""
 "Afbryde?\n"
 "ID: %d"
 
-#: src/compose.c:4817
+#: src/compose.c:4953
 #, c-format
 msgid "Terminated process group id: %d"
 msgstr "Afbrudt proces gruppe ID: %d"
 
-#: src/compose.c:4818
+#: src/compose.c:4954
 #, c-format
 msgid "Temporary file: %s"
 msgstr "Midlertidig fil: %s"
 
-#: src/compose.c:4842
+#: src/compose.c:4978
 msgid "Compose: input from monitoring process\n"
 msgstr "Instast: fra monitor process\n"
 
 #. failed
-#: src/compose.c:4875
+#: src/compose.c:5011
 msgid "Couldn't exec external editor\n"
 msgstr "Kunne ikke starte ekstern editor\n"
 
-#: src/compose.c:4879
+#: src/compose.c:5015
 msgid "Couldn't write to file\n"
 msgstr "Kunne ikke gemme fil\n"
 
-#: src/compose.c:4881
+#: src/compose.c:5017
 msgid "Pipe read failed\n"
 msgstr "Fejl i læsning fra Pipe\n"
 
-#: src/compose.c:5182 src/compose.c:5190 src/compose.c:5196
+#: src/compose.c:5318 src/compose.c:5326 src/compose.c:5332
 msgid "Can't queue the message."
 msgstr "Meddelelse kan ikke lægges i kø."
 
-#: src/compose.c:5287
+#: src/compose.c:5423
 #, fuzzy
 msgid "Select files"
 msgstr "Vælg fil"
 
-#: src/compose.c:5309
+#: src/compose.c:5445
 msgid "Select file"
 msgstr "Vælg fil"
 
-#: src/compose.c:5344
+#: src/compose.c:5480
 msgid "Discard message"
 msgstr "Slet meddelelse"
 
-#: src/compose.c:5345
+#: src/compose.c:5481
 msgid "This message has been modified. discard it?"
 msgstr "Denne meddelelse er ændret. Slet?"
 
-#: src/compose.c:5346
+#: src/compose.c:5482
 msgid "Discard"
 msgstr "Slet"
 
-#: src/compose.c:5346
+#: src/compose.c:5482
 msgid "to Draft"
 msgstr "til Kladde"
 
-#: src/compose.c:5379
+#: src/compose.c:5524
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Vil du benytte skabelon `%s' ?"
 
-#: src/compose.c:5381
+#: src/compose.c:5526
 msgid "Apply template"
 msgstr "Benyt skabelon"
 
-#: src/compose.c:5382
+#: src/compose.c:5527
 msgid "Replace"
 msgstr "Erstat"
 
@@ -1640,12 +1758,12 @@ msgstr "Indtast mappe information...\n"
 msgid "Setting folder info..."
 msgstr "Indtast mappe information..."
 
-#: src/folderview.c:652 src/mainwindow.c:3190 src/setup.c:81
+#: src/folderview.c:652 src/mainwindow.c:3199 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Gennemsøger mappe %s%c%s ..."
 
-#: src/folderview.c:656 src/mainwindow.c:3195 src/setup.c:86
+#: src/folderview.c:656 src/mainwindow.c:3204 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Gennemsøger mappe %s ..."
@@ -2104,7 +2222,7 @@ msgstr "Importer LDIF fil til adressebog"
 msgid "Prev"
 msgstr "Forrige"
 
-#: src/importldif.c:761 src/mainwindow.c:2230
+#: src/importldif.c:761 src/mainwindow.c:2239
 msgid "Next"
 msgstr "Næste"
 
@@ -2569,7 +2687,8 @@ msgid "/_View/Separate f_older tree"
 msgstr "/_Vis/_Seperat mappe træ"
 
 #: src/mainwindow.c:514
-msgid "/_View/Separate m_essage view"
+#, fuzzy
+msgid "/_View/Separate _message view"
 msgstr "/_Vis/Seperat m_eddelelses vindue"
 
 #: src/mainwindow.c:516
@@ -2705,432 +2824,349 @@ msgstr "/_Vis/_Gå til/Næste _label meddelelse"
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Vis/_Gå til/Anden _mappe..."
 
-#: src/mainwindow.c:568 src/mainwindow.c:575 src/messageview.c:150
-msgid "/_View/_Code set/---"
-msgstr "/_Vis/_Tegnsæt/---"
-
-#: src/mainwindow.c:572 src/messageview.c:154
-msgid "/_View/_Code set"
-msgstr "/_Vis/_Tegnsæt"
-
 #: src/mainwindow.c:573 src/messageview.c:155
-msgid "/_View/_Code set/_Auto detect"
+#, fuzzy
+msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Vis/_Tegnsæt/_Automatisk"
 
-#: src/mainwindow.c:576 src/messageview.c:158
-msgid "/_View/_Code set/7bit ascii (US-ASC_II)"
-msgstr "/_Vis/_Tegnsæt/7bit ascii (US-ASC_II)"
-
-#: src/mainwindow.c:579 src/messageview.c:161
-msgid "/_View/_Code set/Unicode (_UTF-8)"
-msgstr "/_Vis/_Tegnsæt/Unicode (_UTF-8)"
-
-#: src/mainwindow.c:582 src/messageview.c:164
-msgid "/_View/_Code set/Western European (ISO-8859-_1)"
-msgstr "/_Vis/_Tegnsæt/Western European (ISO-8859-_1)"
-
-#: src/mainwindow.c:584 src/messageview.c:166
-msgid "/_View/_Code set/Western European (ISO-8859-15)"
-msgstr "/_Vis/_Tegnsæt/Western European (ISO-8859-_15)"
-
-#: src/mainwindow.c:587 src/messageview.c:169
-msgid "/_View/_Code set/Central European (ISO-8859-_2)"
-msgstr "/_Vis/_Tegnsæt/Central European (ISO-8859-_2)"
-
-#: src/mainwindow.c:590 src/messageview.c:172
-msgid "/_View/_Code set/_Baltic (ISO-8859-13)"
-msgstr "/_Vis/_Tegnsæt/_Baltic (ISO-8859-13)"
-
-#: src/mainwindow.c:592 src/messageview.c:174
-msgid "/_View/_Code set/Baltic (ISO-8859-_4)"
-msgstr "/_Vis/_Tegnsæt/Baltic (ISO-8859-_4)"
-
-#: src/mainwindow.c:595 src/messageview.c:177
-msgid "/_View/_Code set/Greek (ISO-8859-_7)"
-msgstr "/_Vis/_Tegnsæt/Greek (ISO-8859-_7)"
-
-#: src/mainwindow.c:598 src/messageview.c:180
-msgid "/_View/_Code set/Turkish (ISO-8859-_9)"
-msgstr "/_Vis/_Tegnsæt/Turkish (ISO-8859-_9)"
-
-#: src/mainwindow.c:601 src/messageview.c:183
-msgid "/_View/_Code set/Cyrillic (ISO-8859-_5)"
-msgstr "/_Vis/_Tegnsæt/Cyrillic (ISO-8859-_5)"
-
-#: src/mainwindow.c:603 src/messageview.c:185
-msgid "/_View/_Code set/Cyrillic (KOI8-_R)"
-msgstr "/_Vis/_Tegnsæt/Cyrillic (KOI8-_R)"
-
-#: src/mainwindow.c:605 src/messageview.c:187
+#: src/mainwindow.c:618 src/messageview.c:194
 #, fuzzy
-msgid "/_View/_Code set/Cyrillic (KOI8-U)"
-msgstr "/_Vis/_Tegnsæt/Cyrillic (KOI8-_R)"
-
-#: src/mainwindow.c:607 src/messageview.c:189
-msgid "/_View/_Code set/Cyrillic (Windows-1251)"
-msgstr "/_Vis/_Tegnsæt/Cyrillic (Windows-1251)"
-
-#: src/mainwindow.c:610 src/messageview.c:192
-msgid "/_View/_Code set/Japanese (ISO-2022-_JP)"
-msgstr "/_Vis/_Tegnsæt/Japanese (ISO-2022-_JP)"
-
-#: src/mainwindow.c:612 src/messageview.c:194
-msgid "/_View/_Code set/Japanese (ISO-2022-JP-2)"
+msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Vis/_TegnsætJapanese (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:614 src/messageview.c:196
-msgid "/_View/_Code set/Japanese (_EUC-JP)"
+#: src/mainwindow.c:620 src/messageview.c:196
+#, fuzzy
+msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Vis/_Tegnsæt/Japanese (_EUC-JP)"
 
-#: src/mainwindow.c:616 src/messageview.c:198
-msgid "/_View/_Code set/Japanese (_Shift__JIS)"
+#: src/mainwindow.c:622 src/messageview.c:198
+#, fuzzy
+msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Vis//_Tegnsæt/Japanese (_Shift_JIS)"
 
-#: src/mainwindow.c:619 src/messageview.c:201
-msgid "/_View/_Code set/Simplified Chinese (_GB2312)"
-msgstr "/_Vis/_Tegnsæt/Simplified Chinese (_GB2312)"
-
-#: src/mainwindow.c:621 src/messageview.c:203
-msgid "/_View/_Code set/Traditional Chinese (_Big5)"
-msgstr "/_Vis/_Tegnsæt/Traditional Chinese (_Big5)"
-
-#: src/mainwindow.c:623 src/messageview.c:205
-msgid "/_View/_Code set/Traditional Chinese (EUC-_TW)"
-msgstr "/_Vis/_Tegnsæt/Traditional Chinese (EUC-_TW)"
-
-#: src/mainwindow.c:625 src/messageview.c:207
-msgid "/_View/_Code set/Chinese (ISO-2022-_CN)"
+#: src/mainwindow.c:632 src/messageview.c:207
+#, fuzzy
+msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Vis/_Tegnsæt/Chinese (ISO-2022-_CN)"
 
-#: src/mainwindow.c:628 src/messageview.c:210
-msgid "/_View/_Code set/Korean (EUC-_KR)"
-msgstr "/_Vis/_Tegnsæt/Korean (EUC-_KR)"
-
-#: src/mainwindow.c:630 src/messageview.c:212
-msgid "/_View/_Code set/Korean (ISO-2022-KR)"
+#: src/mainwindow.c:638 src/messageview.c:212
+#, fuzzy
+msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Vis/_Tegnsæt/Korean (ISO-2022-KR)"
 
-#: src/mainwindow.c:633 src/messageview.c:215
-msgid "/_View/_Code set/Thai (TIS-620)"
-msgstr "/_Vis/_Tegnsæt/Thai (TIS-620)"
-
-#: src/mainwindow.c:635 src/messageview.c:217
-msgid "/_View/_Code set/Thai (Windows-874)"
-msgstr "/_Vis/_Tegnsæt/Thai (Windows-874)"
-
-#: src/mainwindow.c:642 src/summaryview.c:371
+#: src/mainwindow.c:651 src/summaryview.c:371
 msgid "/_View/Open in new _window"
 msgstr "/_Vis/Åbn i nyt vindue"
 
-#: src/mainwindow.c:643 src/messageview.c:224
+#: src/mainwindow.c:652 src/messageview.c:224
 msgid "/_View/Mess_age source"
 msgstr "/_Vis/_Kilde"
 
-#: src/mainwindow.c:644 src/messageview.c:225
+#: src/mainwindow.c:653 src/messageview.c:225
 msgid "/_View/Show all _header"
 msgstr "/_Vis/_Alle hoved linier"
 
-#: src/mainwindow.c:646
+#: src/mainwindow.c:655
 msgid "/_View/_Update summary"
 msgstr "/_Vis/_Opdatér oversigt"
 
-#: src/mainwindow.c:648 src/messageview.c:227
+#: src/mainwindow.c:657 src/messageview.c:227
 msgid "/_Message"
 msgstr "/_Meddelelse"
 
-#: src/mainwindow.c:649
+#: src/mainwindow.c:658
 #, fuzzy
 msgid "/_Message/Recei_ve"
 msgstr "/_Meddelelse/Redigér _igen"
 
-#: src/mainwindow.c:650
+#: src/mainwindow.c:659
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/_Meddelelse/Hent fra _alle konti"
 
-#: src/mainwindow.c:652
+#: src/mainwindow.c:661
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/_Meddelelse/Hent fra _alle konti"
 
-#: src/mainwindow.c:654
+#: src/mainwindow.c:663
 #, fuzzy
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/_Meddelelse/_Afbryd afsendelse"
 
-#: src/mainwindow.c:656
+#: src/mainwindow.c:665
 #, fuzzy
 msgid "/_Message/Recei_ve/---"
 msgstr "/_Meddelelse/Redigér _igen"
 
-#: src/mainwindow.c:657
+#: src/mainwindow.c:666
 msgid "/_Message/_Send queued messages"
 msgstr "/_Meddelelse/Send meddelelser i _kø"
 
-#: src/mainwindow.c:658 src/mainwindow.c:660 src/mainwindow.c:667
-#: src/mainwindow.c:672 src/mainwindow.c:676 src/mainwindow.c:685
+#: src/mainwindow.c:667 src/mainwindow.c:669 src/mainwindow.c:676
+#: src/mainwindow.c:681 src/mainwindow.c:685 src/mainwindow.c:694
 #: src/messageview.c:230 src/messageview.c:238 src/messageview.c:243
 msgid "/_Message/---"
 msgstr "/_Meddelelse/---"
 
-#: src/mainwindow.c:659 src/messageview.c:228
+#: src/mainwindow.c:668 src/messageview.c:228
 msgid "/_Message/Compose _new message"
 msgstr "/_Meddelelse/Opret _ny meddelelse"
 
-#: src/mainwindow.c:661 src/messageview.c:231
+#: src/mainwindow.c:670 src/messageview.c:231
 msgid "/_Message/_Reply"
 msgstr "/_Meddelelse/_Besvar"
 
-#: src/mainwindow.c:662
+#: src/mainwindow.c:671
 msgid "/_Message/Repl_y to"
 msgstr "/_Meddelelse/_Svar til"
 
-#: src/mainwindow.c:663 src/messageview.c:232
+#: src/mainwindow.c:672 src/messageview.c:232
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Meddelelse/_Svar til/A_lle"
 
-#: src/mainwindow.c:664 src/messageview.c:234
+#: src/mainwindow.c:673 src/messageview.c:234
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Meddelelse/_Svar til/Af_sender"
 
-#: src/mainwindow.c:665 src/messageview.c:236
+#: src/mainwindow.c:674 src/messageview.c:236
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Meddelelse/_Svar til/_Alle"
 
-#: src/mainwindow.c:668 src/messageview.c:239
+#: src/mainwindow.c:677 src/messageview.c:239
 msgid "/_Message/_Forward"
 msgstr "/_Meddelelse/_Videresend"
 
-#: src/mainwindow.c:669 src/messageview.c:240
+#: src/mainwindow.c:678 src/messageview.c:240
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Meddelelse/Videresend som _vedhæftet"
 
-#: src/mainwindow.c:671 src/messageview.c:242
+#: src/mainwindow.c:680 src/messageview.c:242
 msgid "/_Message/Redirec_t"
 msgstr "/_Meddelelse/_Omdirigér"
 
-#: src/mainwindow.c:673
+#: src/mainwindow.c:682
 msgid "/_Message/M_ove..."
 msgstr "/_Meddelelse/_Flyt..."
 
-#: src/mainwindow.c:674
+#: src/mainwindow.c:683
 msgid "/_Message/_Copy..."
 msgstr "/_Meddelelse/_Kopiere..."
 
-#: src/mainwindow.c:675
+#: src/mainwindow.c:684
 msgid "/_Message/_Delete"
 msgstr "/_Meddelelse/_Slet"
 
-#: src/mainwindow.c:677
+#: src/mainwindow.c:686
 msgid "/_Message/_Mark"
 msgstr "/_Meddelelse/_Markér"
 
-#: src/mainwindow.c:678
+#: src/mainwindow.c:687
 msgid "/_Message/_Mark/_Mark"
 msgstr "/_Meddelelse/_Markér/_Markér"
 
-#: src/mainwindow.c:679
+#: src/mainwindow.c:688
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/_Meddelelse/_Markér/_Slet markéring"
 
-#: src/mainwindow.c:680
+#: src/mainwindow.c:689
 msgid "/_Message/_Mark/---"
 msgstr "/_Meddelelse/_Markér/---"
 
-#: src/mainwindow.c:681
+#: src/mainwindow.c:690
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/_Meddelelse/_Markér/Som ulæst"
 
-#: src/mainwindow.c:682
+#: src/mainwindow.c:691
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/_Meddelelse/_Markér/Som læst"
 
-#: src/mainwindow.c:684
+#: src/mainwindow.c:693
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/_Meddelelse/_Markér/Alle som læst"
 
-#: src/mainwindow.c:686 src/messageview.c:244
+#: src/mainwindow.c:695 src/messageview.c:244
 msgid "/_Message/Re-_edit"
 msgstr "/_Meddelelse/Redigér _igen"
 
-#: src/mainwindow.c:690 src/messageview.c:248
+#: src/mainwindow.c:699 src/messageview.c:248
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/_Funktioner/Tilføj afsender til adressebog"
 
-#: src/mainwindow.c:693
+#: src/mainwindow.c:702
 #, fuzzy
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/_Funktioner/_Filtrere meddelelse"
 
-#: src/mainwindow.c:695
+#: src/mainwindow.c:704
 #, fuzzy
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Funktioner/_Filtrere meddelelse"
 
-#: src/mainwindow.c:697 src/messageview.c:251
+#: src/mainwindow.c:706 src/messageview.c:251
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Funktioner/_Opret filter"
 
-#: src/mainwindow.c:698 src/messageview.c:253
+#: src/mainwindow.c:707 src/messageview.c:253
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Funktioner/_Opret filter/_Automatisk"
 
-#: src/mainwindow.c:700 src/messageview.c:255
+#: src/mainwindow.c:709 src/messageview.c:255
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Funktioner/_Opret filter/Efter _Fra"
 
-#: src/mainwindow.c:702 src/messageview.c:257
+#: src/mainwindow.c:711 src/messageview.c:257
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Funktioner/_Opret filter/Efter _Til"
 
-#: src/mainwindow.c:704 src/messageview.c:259
+#: src/mainwindow.c:713 src/messageview.c:259
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Funktioner/_Opret filter/Efter _Emne"
 
-#: src/mainwindow.c:709
+#: src/mainwindow.c:718
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/_Meddelelse/Slet alle du_blikerede meddelelser"
 
-#: src/mainwindow.c:712
+#: src/mainwindow.c:721
 msgid "/_Tools/E_xecute"
 msgstr "/_Funktioner/_Udfør"
 
-#: src/mainwindow.c:714
+#: src/mainwindow.c:723
 msgid "/_Tools/_Log window"
 msgstr "/Funktioner/_Logbog vindue"
 
-#: src/mainwindow.c:716
+#: src/mainwindow.c:725
 msgid "/_Configuration"
 msgstr "/_Opsæt"
 
-#: src/mainwindow.c:717
+#: src/mainwindow.c:726
 msgid "/_Configuration/_Common preferences..."
 msgstr "/_Opsæt/Generelt _opsæt..."
 
-#: src/mainwindow.c:719
+#: src/mainwindow.c:728
 msgid "/_Configuration/_Filter setting..."
 msgstr "/_Opsæt/_Filter opsæt..."
 
-#: src/mainwindow.c:721
+#: src/mainwindow.c:730
 msgid "/_Configuration/_Template..."
 msgstr "/_Opsæt/_Skabelon..."
 
-#: src/mainwindow.c:722
+#: src/mainwindow.c:731
 msgid "/_Configuration/_Actions..."
 msgstr "/_Opsæt/_Handlinger..."
 
-#: src/mainwindow.c:723
+#: src/mainwindow.c:732
 msgid "/_Configuration/---"
 msgstr "/_Opsæt/---"
 
-#: src/mainwindow.c:724
+#: src/mainwindow.c:733
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Opsæt/_Den aktuelle konto..."
 
-#: src/mainwindow.c:726
+#: src/mainwindow.c:735
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Opsæt/_Opret ny konto..."
 
-#: src/mainwindow.c:728
+#: src/mainwindow.c:737
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Opsæt/_Redigér konti..."
 
-#: src/mainwindow.c:730
+#: src/mainwindow.c:739
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Opsæt/_Skift aktuel konto..."
 
-#: src/mainwindow.c:734
+#: src/mainwindow.c:743
 msgid "/_Help/_Manual"
 msgstr "/_Hjælp/_Vejledning"
 
-#: src/mainwindow.c:735
+#: src/mainwindow.c:744
 msgid "/_Help/_Manual/_English"
 msgstr "/_Hilfe/_Vejledning/_Engelsk"
 
-#: src/mainwindow.c:736
+#: src/mainwindow.c:745
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/_Hilfe/_Vejledning/_Japansk"
 
-#: src/mainwindow.c:737
+#: src/mainwindow.c:746
 msgid "/_Help/_FAQ"
 msgstr "/_Hjælp/_OSS"
 
-#: src/mainwindow.c:738
+#: src/mainwindow.c:747
 msgid "/_Help/_FAQ/_English"
 msgstr "/_Hjælp/_OSS/_Engelsk"
 
-#: src/mainwindow.c:739
+#: src/mainwindow.c:748
 msgid "/_Help/_FAQ/_German"
 msgstr "/_Hjælp/_OSS/_Tysk"
 
-#: src/mainwindow.c:740
+#: src/mainwindow.c:749
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/_Hjælp/_OSS/_Spansk"
 
-#: src/mainwindow.c:741
+#: src/mainwindow.c:750
 msgid "/_Help/_FAQ/_French"
 msgstr "/_Hjælp/_OSS/_Fransk"
 
-#: src/mainwindow.c:742
+#: src/mainwindow.c:751
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/_Hjælp/_OSS/_Italiensk"
 
-#: src/mainwindow.c:743
+#: src/mainwindow.c:752
 msgid "/_Help/---"
 msgstr "/_Hjælp/---"
 
-#: src/mainwindow.c:783
+#: src/mainwindow.c:792
 msgid "Creating main window...\n"
 msgstr "Opretter hoved vindue...\n"
 
-#: src/mainwindow.c:943
+#: src/mainwindow.c:952
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "HovedVindue: fejl i farve %d\n"
 
-#: src/mainwindow.c:1021 src/summaryview.c:1368 src/summaryview.c:1677
+#: src/mainwindow.c:1030 src/summaryview.c:1368 src/summaryview.c:1677
 #: src/summaryview.c:1785 src/summaryview.c:1831 src/summaryview.c:2453
 #: src/summaryview.c:3080 src/summaryview.c:3146 src/summaryview.c:3171
 #: src/summaryview.c:3284
 msgid "done.\n"
 msgstr "Afsluttet.\n"
 
-#: src/mainwindow.c:1137 src/mainwindow.c:1178 src/mainwindow.c:1206
+#: src/mainwindow.c:1146 src/mainwindow.c:1187 src/mainwindow.c:1215
 msgid "Untitled"
 msgstr "Uden titel"
 
-#: src/mainwindow.c:1207
+#: src/mainwindow.c:1216
 msgid "none"
 msgstr "ingen"
 
-#: src/mainwindow.c:1257
+#: src/mainwindow.c:1266
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "Ændre vindue adskillelse type fra %d til %d\n"
 
-#: src/mainwindow.c:1477
+#: src/mainwindow.c:1486
 msgid "Offline"
 msgstr ""
 
-#: src/mainwindow.c:1478
+#: src/mainwindow.c:1487
 msgid "You are offline. Go online?"
 msgstr ""
 
-#: src/mainwindow.c:1492
+#: src/mainwindow.c:1501
 #, fuzzy
 msgid "Empty all trash"
 msgstr "Tøm Slettet"
 
-#: src/mainwindow.c:1493
+#: src/mainwindow.c:1502
 #, fuzzy
 msgid "Empty messages in all trash?"
 msgstr "Slet alle meddelelser i Slettet?"
 
-#: src/mainwindow.c:1521
+#: src/mainwindow.c:1530
 msgid "Add mailbox"
 msgstr "Ny mailbox"
 
-#: src/mainwindow.c:1522
+#: src/mainwindow.c:1531
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3140,16 +3176,16 @@ msgstr ""
 "Hvis den eksisterende mailbox angives, vil den blive\n"
 "gennemsøgt automatisk."
 
-#: src/mainwindow.c:1528
+#: src/mainwindow.c:1537
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Mailbox `%s' eksisterer allerede."
 
-#: src/mainwindow.c:1533 src/setup.c:57
+#: src/mainwindow.c:1542 src/setup.c:57
 msgid "Mailbox"
 msgstr "Mailbox"
 
-#: src/mainwindow.c:1539 src/setup.c:63
+#: src/mainwindow.c:1548 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3158,144 +3194,144 @@ msgstr ""
 "Fejl i oprettelse af mailbox.\n"
 "Måske findes filerne allerede eller du har ikke skrive rettighedder."
 
-#: src/mainwindow.c:1912
+#: src/mainwindow.c:1921
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Mappe visning"
 
-#: src/mainwindow.c:1932 src/messageview.c:358
+#: src/mainwindow.c:1941 src/messageview.c:358
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Meddelelses visning"
 
-#: src/mainwindow.c:2079 src/summaryview.c:340
+#: src/mainwindow.c:2088 src/summaryview.c:340
 msgid "/_Reply"
 msgstr "/_Svar"
 
-#: src/mainwindow.c:2080
+#: src/mainwindow.c:2089
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "Svar til alle"
 
-#: src/mainwindow.c:2081
+#: src/mainwindow.c:2090
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/_Svar til/_Afsender"
 
-#: src/mainwindow.c:2082
+#: src/mainwindow.c:2091
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/_Svar til/_Mail liste"
 
-#: src/mainwindow.c:2087 src/summaryview.c:347
+#: src/mainwindow.c:2096 src/summaryview.c:347
 msgid "/_Forward"
 msgstr "/_Videresend"
 
-#: src/mainwindow.c:2088 src/summaryview.c:348
+#: src/mainwindow.c:2097 src/summaryview.c:348
 msgid "/For_ward as attachment"
 msgstr "/Videresend som _vedhæftet"
 
-#: src/mainwindow.c:2089 src/summaryview.c:349
+#: src/mainwindow.c:2098 src/summaryview.c:349
 msgid "/Redirec_t"
 msgstr "/_Omdirigér"
 
-#: src/mainwindow.c:2125
+#: src/mainwindow.c:2134
 msgid "Get"
 msgstr "Hent"
 
-#: src/mainwindow.c:2126
+#: src/mainwindow.c:2135
 msgid "Incorporate new mail"
 msgstr "Hent ny post"
 
-#: src/mainwindow.c:2133
+#: src/mainwindow.c:2142
 msgid "Get all"
 msgstr "Hent alt"
 
-#: src/mainwindow.c:2134
+#: src/mainwindow.c:2143
 msgid "Incorporate new mail of all accounts"
 msgstr "Hent ny post fra alle konti"
 
-#: src/mainwindow.c:2145
+#: src/mainwindow.c:2154
 msgid "Send queued message(s)"
 msgstr "Sender meddelelse(r) i kø"
 
-#: src/mainwindow.c:2155 src/prefs_account.c:705 src/prefs_common.c:852
+#: src/mainwindow.c:2164 src/prefs_account.c:705 src/prefs_common.c:852
 #: src/prefs_folder_item.c:137
 msgid "Compose"
 msgstr "Opret"
 
-#: src/mainwindow.c:2156
+#: src/mainwindow.c:2165
 msgid "Compose new message"
 msgstr "Opret ny meddelelse"
 
-#: src/mainwindow.c:2164 src/prefs_common.c:1353
+#: src/mainwindow.c:2173 src/prefs_common.c:1365
 msgid "Reply"
 msgstr "Besvar"
 
-#: src/mainwindow.c:2165 src/mainwindow.c:2178
+#: src/mainwindow.c:2174 src/mainwindow.c:2187
 msgid "Reply to the message"
 msgstr "Besvar meddelelse"
 
-#: src/mainwindow.c:2183
+#: src/mainwindow.c:2192
 msgid "Reply all"
 msgstr "Besvar alle"
 
-#: src/mainwindow.c:2184
+#: src/mainwindow.c:2193
 msgid "Reply to all"
 msgstr "Svar til alle"
 
-#: src/mainwindow.c:2192 src/prefs_filter_edit.c:719
+#: src/mainwindow.c:2201 src/prefs_filter_edit.c:719
 msgid "Forward"
 msgstr "Videresend"
 
-#: src/mainwindow.c:2193 src/mainwindow.c:2206
+#: src/mainwindow.c:2202 src/mainwindow.c:2215
 msgid "Forward the message"
 msgstr "Videresend meddelelse"
 
-#: src/mainwindow.c:2213
+#: src/mainwindow.c:2222
 msgid "Delete the message"
 msgstr "Slet meddelelse"
 
-#: src/mainwindow.c:2221
+#: src/mainwindow.c:2230
 msgid "Execute"
 msgstr "Udfør"
 
-#: src/mainwindow.c:2222
+#: src/mainwindow.c:2231
 msgid "Execute marked process"
 msgstr "Udfør markéret process"
 
-#: src/mainwindow.c:2231
+#: src/mainwindow.c:2240
 msgid "Next unread message"
 msgstr "Næste ulæste"
 
-#: src/mainwindow.c:2242
+#: src/mainwindow.c:2251
 msgid "Prefs"
 msgstr "Opsæt"
 
-#: src/mainwindow.c:2243
+#: src/mainwindow.c:2252
 msgid "Common preferences"
 msgstr "Generelt opsæt"
 
-#: src/mainwindow.c:2250 src/prefs_folder_item.c:258
+#: src/mainwindow.c:2259 src/prefs_folder_item.c:258
 #: src/prefs_folder_item.c:269 src/progressdialog.c:50
 msgid "Account"
 msgstr "Konto"
 
-#: src/mainwindow.c:2251
+#: src/mainwindow.c:2260
 msgid "Account setting"
 msgstr "Konto indstillinger"
 
-#: src/mainwindow.c:2425
+#: src/mainwindow.c:2434
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 
-#: src/mainwindow.c:2436
+#: src/mainwindow.c:2445
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 
-#: src/mainwindow.c:2624
+#: src/mainwindow.c:2633
 msgid "Exit"
 msgstr "Afslut"
 
-#: src/mainwindow.c:2624
+#: src/mainwindow.c:2633
 msgid "Exit this program?"
 msgstr "Afslut program?"
 
@@ -3421,7 +3457,7 @@ msgstr "Søgning afsluttet"
 msgid "Creating message view...\n"
 msgstr "Opretter meddelelses vindue...\n"
 
-#: src/messageview.c:303 src/prefs_common.c:1550
+#: src/messageview.c:303 src/prefs_common.c:1562
 msgid "Text"
 msgstr "Tekst"
 
@@ -3434,7 +3470,7 @@ msgstr "Vedhæftet"
 msgid "Can't save the file `%s'."
 msgstr "Kan ikke gemme fil `%s'."
 
-#: src/messageview.c:697 src/prefs_common.c:2154 src/summaryview.c:2744
+#: src/messageview.c:697 src/prefs_common.c:2166 src/summaryview.c:2744
 msgid "Print"
 msgstr "Udskriv"
 
@@ -3911,7 +3947,7 @@ msgstr "(Ufiltrerede meddelelser gemmes i denne mappe)"
 msgid "Authentication method"
 msgstr "Godkendelses metode"
 
-#: src/prefs_account.c:1123 src/prefs_account.c:1239 src/prefs_common.c:1189
+#: src/prefs_account.c:1123 src/prefs_account.c:1239 src/prefs_common.c:1201
 msgid "Automatic"
 msgstr "Automatisk"
 
@@ -3935,7 +3971,7 @@ msgstr "Opret meddelelses ID"
 msgid "Add user-defined header"
 msgstr "Tilføj bruger defineret hoved"
 
-#: src/prefs_account.c:1196 src/prefs_common.c:1714 src/prefs_common.c:1739
+#: src/prefs_account.c:1196 src/prefs_common.c:1726 src/prefs_common.c:1751
 msgid " Edit... "
 msgstr " Redigér... "
 
@@ -4329,106 +4365,107 @@ msgid "Save sent messages to outbox"
 msgstr "Gem sendte meddelelser i Sendt"
 
 #: src/prefs_common.c:1113
-msgid "Outgoing codeset"
+#, fuzzy
+msgid "Outgoing encoding"
 msgstr "Udgående tegnsæt"
 
 #: src/prefs_common.c:1128
 msgid "Automatic (Recommended)"
 msgstr "Automatisk (Anbefalet)"
 
-#: src/prefs_common.c:1129
+#: src/prefs_common.c:1130
 msgid "7bit ascii (US-ASCII)"
 msgstr "7bit ascii (US-ASCII)"
 
-#: src/prefs_common.c:1130
+#: src/prefs_common.c:1132
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
-#: src/prefs_common.c:1131
+#: src/prefs_common.c:1134
 msgid "Western European (ISO-8859-1)"
 msgstr "Western European (ISO-8859-1)"
 
-#: src/prefs_common.c:1132
+#: src/prefs_common.c:1135
 msgid "Western European (ISO-8859-15)"
 msgstr "Western European (ISO-8859-15)"
 
-#: src/prefs_common.c:1133
+#: src/prefs_common.c:1137
 msgid "Central European (ISO-8859-2)"
 msgstr "Central European (ISO-8859-2)"
 
-#: src/prefs_common.c:1134
+#: src/prefs_common.c:1139
 msgid "Baltic (ISO-8859-13)"
 msgstr "Baltic (ISO-8859-13)"
 
-#: src/prefs_common.c:1135
+#: src/prefs_common.c:1140
 msgid "Baltic (ISO-8859-4)"
 msgstr "Baltic (ISO-8859-4)"
 
-#: src/prefs_common.c:1136
+#: src/prefs_common.c:1142
 msgid "Greek (ISO-8859-7)"
 msgstr "Greek (ISO-8859-7)"
 
-#: src/prefs_common.c:1137
+#: src/prefs_common.c:1144
 msgid "Turkish (ISO-8859-9)"
 msgstr "Turkish (ISO-8859-9)"
 
-#: src/prefs_common.c:1138
+#: src/prefs_common.c:1146
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Cyrillic (ISO-8859-5)"
 
-#: src/prefs_common.c:1139
+#: src/prefs_common.c:1147
 msgid "Cyrillic (KOI8-R)"
 msgstr "Cyrillic (KOI8-R)"
 
-#: src/prefs_common.c:1140
-msgid "Cyrillic (Windows-1251)"
-msgstr "Cyrillic (Windows-1251)"
-
-#: src/prefs_common.c:1141
+#: src/prefs_common.c:1148
 msgid "Cyrillic (KOI8-U)"
 msgstr "Cyrillic (KOI8-U)"
 
-#: src/prefs_common.c:1142
+#: src/prefs_common.c:1149
+msgid "Cyrillic (Windows-1251)"
+msgstr "Cyrillic (Windows-1251)"
+
+#: src/prefs_common.c:1151
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Japanese (ISO-2022-JP)"
 
-#: src/prefs_common.c:1144
+#: src/prefs_common.c:1153
 msgid "Japanese (EUC-JP)"
 msgstr "Japanese (EUC-JP)"
 
-#: src/prefs_common.c:1145
+#: src/prefs_common.c:1154
 msgid "Japanese (Shift_JIS)"
 msgstr "Japanese (Shift_JIS)"
 
-#: src/prefs_common.c:1147
+#: src/prefs_common.c:1157
 msgid "Simplified Chinese (GB2312)"
 msgstr "Simplified Chinese (GB2312)"
 
-#: src/prefs_common.c:1148
+#: src/prefs_common.c:1158
 msgid "Traditional Chinese (Big5)"
 msgstr "Traditional Chinese (Big5)"
 
-#: src/prefs_common.c:1150
+#: src/prefs_common.c:1160
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Traditional Chinese (EUC-TW)"
 
-#: src/prefs_common.c:1151
+#: src/prefs_common.c:1161
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Chinese (ISO-2022-CN)"
 
-#: src/prefs_common.c:1153
+#: src/prefs_common.c:1164
 msgid "Korean (EUC-KR)"
 msgstr "Korean (EUC-KR)"
 
-#: src/prefs_common.c:1154
+#: src/prefs_common.c:1166
 msgid "Thai (TIS-620)"
 msgstr "Thai (TIS-620)"
 
-#: src/prefs_common.c:1155
+#: src/prefs_common.c:1167
 msgid "Thai (Windows-874)"
 msgstr "Thai (Windows-874)"
 
-#: src/prefs_common.c:1165
+#: src/prefs_common.c:1177
 #, fuzzy
 msgid ""
 "If `Automatic' is selected, the optimal encoding for the current locale will "
@@ -4437,11 +4474,11 @@ msgstr ""
 "Hvis `Automatisk' er valgt benyttes det optimale\n"
 "tegnsæt for den valgte locale."
 
-#: src/prefs_common.c:1179
+#: src/prefs_common.c:1191
 msgid "Transfer encoding"
 msgstr "Kodning af overførsel"
 
-#: src/prefs_common.c:1202
+#: src/prefs_common.c:1214
 #, fuzzy
 msgid ""
 "Specify Content-Transfer-Encoding used when message body contains non-ASCII "
@@ -4450,118 +4487,118 @@ msgstr ""
 "Angiv Content-Transfer-Encoding anvendt hvis\n"
 "besked inholder andet end ASCII tegn."
 
-#: src/prefs_common.c:1272
+#: src/prefs_common.c:1284
 msgid "Signature separator"
 msgstr "Underskriftsdeling"
 
-#: src/prefs_common.c:1281
+#: src/prefs_common.c:1293
 msgid "Insert automatically"
 msgstr "Tilføj automatisk"
 
-#: src/prefs_common.c:1291
+#: src/prefs_common.c:1303
 msgid "Automatically launch the external editor"
 msgstr "Start automatisk ekstern editor"
 
-#: src/prefs_common.c:1301
+#: src/prefs_common.c:1313
 msgid "Undo level"
 msgstr "Fortryd niveauer"
 
-#: src/prefs_common.c:1321
+#: src/prefs_common.c:1333
 msgid "Wrap messages at"
 msgstr "Del linier ved"
 
-#: src/prefs_common.c:1333
+#: src/prefs_common.c:1345
 msgid "characters"
 msgstr "tegn"
 
-#: src/prefs_common.c:1343
+#: src/prefs_common.c:1355
 msgid "Wrap quotation"
 msgstr "Del citat linier"
 
-#: src/prefs_common.c:1349
+#: src/prefs_common.c:1361
 msgid "Wrap on input"
 msgstr "Del ved indtastning"
 
-#: src/prefs_common.c:1351
+#: src/prefs_common.c:1363
 msgid "Wrap before sending"
 msgstr "Del linier før afsendelse"
 
-#: src/prefs_common.c:1361
+#: src/prefs_common.c:1373
 msgid "Automatically select account for replies"
 msgstr "Vælg automatisk konto ved besvarelse"
 
-#: src/prefs_common.c:1363
+#: src/prefs_common.c:1375
 msgid "Quote message when replying"
 msgstr "Citat af meddelelse i svar"
 
-#: src/prefs_common.c:1365
+#: src/prefs_common.c:1377
 msgid "Reply button invokes mailing list reply"
 msgstr "Svar knap starter svar til mail liste"
 
 #. reply
-#: src/prefs_common.c:1411
+#: src/prefs_common.c:1423
 msgid "Reply format"
 msgstr "Svar format"
 
-#: src/prefs_common.c:1426 src/prefs_common.c:1468
+#: src/prefs_common.c:1438 src/prefs_common.c:1480
 msgid "Quotation mark"
 msgstr "Citat tegn"
 
 #. forward
-#: src/prefs_common.c:1453
+#: src/prefs_common.c:1465
 msgid "Forward format"
 msgstr "Videresend format"
 
-#: src/prefs_common.c:1500
+#: src/prefs_common.c:1512
 msgid " Description of symbols "
 msgstr " Beskrivelse af symboler "
 
-#: src/prefs_common.c:1541
+#: src/prefs_common.c:1553
 msgid "Font"
 msgstr "Skrifttype"
 
-#: src/prefs_common.c:1573
+#: src/prefs_common.c:1585
 msgid "Translate header name (such as `From:', `Subject:')"
 msgstr "Oversæt hoved navn (fx. `Fra:', `Emne:')"
 
-#: src/prefs_common.c:1576
+#: src/prefs_common.c:1588
 msgid "Display unread number next to folder name"
 msgstr "Vis antal ulæste ved siden af mappe navn"
 
-#: src/prefs_common.c:1585
+#: src/prefs_common.c:1597
 msgid "Abbreviate newsgroups longer than"
 msgstr "Forkort nyhedsgruppe længere end"
 
-#: src/prefs_common.c:1600
+#: src/prefs_common.c:1612
 msgid "letters"
 msgstr "bogstaver"
 
 #. ---- Summary ----
-#: src/prefs_common.c:1606
+#: src/prefs_common.c:1618
 msgid "Summary View"
 msgstr "Meddelelses visning"
 
-#: src/prefs_common.c:1615
+#: src/prefs_common.c:1627
 msgid "Display recipient on `From' column if sender is yourself"
 msgstr "Vis modtager i `Fra' hvis du er afsender"
 
-#: src/prefs_common.c:1617
+#: src/prefs_common.c:1629
 msgid "Expand threads"
 msgstr "Åbn tråde"
 
-#: src/prefs_common.c:1625 src/prefs_common.c:2443 src/prefs_common.c:2481
+#: src/prefs_common.c:1637 src/prefs_common.c:2455 src/prefs_common.c:2493
 msgid "Date format"
 msgstr "Dato format"
 
-#: src/prefs_common.c:1646
+#: src/prefs_common.c:1658
 msgid " Set display item of summary... "
 msgstr " Vælg oplysninger i oversigt... "
 
-#: src/prefs_common.c:1710
+#: src/prefs_common.c:1722
 msgid "Enable coloration of message"
 msgstr "Benyt farver i meddelelser"
 
-#: src/prefs_common.c:1724
+#: src/prefs_common.c:1736
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
@@ -4569,322 +4606,322 @@ msgstr ""
 "Vis 2-byte alfabet og tal som ASCII\n"
 "tegn (kun japansk)"
 
-#: src/prefs_common.c:1730
+#: src/prefs_common.c:1742
 msgid "Display header pane above message view"
 msgstr "Vis hoved linier over meddelelses vindue"
 
-#: src/prefs_common.c:1737
+#: src/prefs_common.c:1749
 msgid "Display short headers on message view"
 msgstr "Vis korte hoved linier i meddelelses vindue"
 
-#: src/prefs_common.c:1758
+#: src/prefs_common.c:1770
 msgid "Line space"
 msgstr "Linie afstand"
 
-#: src/prefs_common.c:1772 src/prefs_common.c:1810
+#: src/prefs_common.c:1784 src/prefs_common.c:1822
 msgid "pixel(s)"
 msgstr "punkter"
 
-#: src/prefs_common.c:1777
+#: src/prefs_common.c:1789
 msgid "Scroll"
 msgstr "Scrol"
 
-#: src/prefs_common.c:1784
+#: src/prefs_common.c:1796
 msgid "Half page"
 msgstr "Halv side"
 
-#: src/prefs_common.c:1790
+#: src/prefs_common.c:1802
 msgid "Smooth scroll"
 msgstr "Blød scroll"
 
-#: src/prefs_common.c:1796
+#: src/prefs_common.c:1808
 msgid "Step"
 msgstr "Skrift"
 
-#: src/prefs_common.c:1816
+#: src/prefs_common.c:1828
 msgid "Images"
 msgstr ""
 
-#: src/prefs_common.c:1824
+#: src/prefs_common.c:1836
 #, fuzzy
 msgid "Resize attached large images to fit in the window"
 msgstr "Ændre størrelse på vedhæftede billeder"
 
-#: src/prefs_common.c:1826
+#: src/prefs_common.c:1838
 #, fuzzy
 msgid "Display images as inline"
 msgstr "Hoved opsæt"
 
-#: src/prefs_common.c:1871
+#: src/prefs_common.c:1883
 msgid "Automatically check signatures"
 msgstr "Check signatur automatisk"
 
-#: src/prefs_common.c:1874
+#: src/prefs_common.c:1886
 msgid "Show signature check result in a popup window"
 msgstr "Vis signatur check resultat i separat vindue"
 
-#: src/prefs_common.c:1877
+#: src/prefs_common.c:1889
 msgid "Store passphrase in memory temporarily"
 msgstr "Gem  adgangssætning midlertidigt i hukommelsen"
 
-#: src/prefs_common.c:1892
+#: src/prefs_common.c:1904
 msgid "Expired after"
 msgstr "Udløb efter"
 
-#: src/prefs_common.c:1905
+#: src/prefs_common.c:1917
 msgid "minute(s) "
 msgstr "minut(er)"
 
-#: src/prefs_common.c:1918
+#: src/prefs_common.c:1930
 #, 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.c:1932
+#: src/prefs_common.c:1944
 msgid "Grab input while entering a passphrase"
 msgstr "Overtag indtastning mens adgangssætning indtastes"
 
-#: src/prefs_common.c:1937
+#: src/prefs_common.c:1949
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "Advarsel ved start hvis GnuPG ikke virker"
 
-#: src/prefs_common.c:1989
+#: src/prefs_common.c:2001
 msgid "Always open messages in summary when selected"
 msgstr "Åbn altid besked i oversigtsbilledet hvis valgt"
 
-#: src/prefs_common.c:1993
+#: src/prefs_common.c:2005
 msgid "Open first unread message when entering a folder"
 msgstr "Åbn første ulæste meddelelse ved indgang til mappe"
 
-#: src/prefs_common.c:1997
+#: src/prefs_common.c:2009
 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.c:2001
+#: src/prefs_common.c:2013
 msgid "Go to inbox after receiving new mail"
 msgstr "Gå til Indbakke efter modtagelse af ny post"
 
-#: src/prefs_common.c:2009
+#: src/prefs_common.c:2021
 msgid "Execute immediately when moving or deleting messages"
 msgstr "Udfør straks ved flyt eller slet af meddelelse(r)"
 
-#: src/prefs_common.c:2021
+#: src/prefs_common.c:2033
 #, 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.c:2029
+#: src/prefs_common.c:2041
 msgid "Receive dialog"
 msgstr "Vis modtag billede"
 
-#: src/prefs_common.c:2039
+#: src/prefs_common.c:2051
 msgid "Show receive dialog"
 msgstr "Vis modtag billede"
 
-#: src/prefs_common.c:2049
+#: src/prefs_common.c:2061
 msgid "Always"
 msgstr "Altid"
 
-#: src/prefs_common.c:2050
+#: src/prefs_common.c:2062
 msgid "Only on manual receiving"
 msgstr ""
 
-#: src/prefs_common.c:2052
+#: src/prefs_common.c:2064
 msgid "Never"
 msgstr "Aldrig"
 
-#: src/prefs_common.c:2057
+#: src/prefs_common.c:2069
 msgid "Don't popup error dialog on receive error"
 msgstr "Vis ikke fejlmeddelelse ved fejl"
 
-#: src/prefs_common.c:2060
+#: src/prefs_common.c:2072
 msgid "Close receive dialog when finished"
 msgstr "Luk modtag vindue efter overførsel"
 
-#: src/prefs_common.c:2066
+#: src/prefs_common.c:2078
 msgid " Set key bindings... "
 msgstr " Vælg tast bindinger... "
 
-#: src/prefs_common.c:2122
+#: src/prefs_common.c:2134
 #, c-format
 msgid "External commands (%s will be replaced with file name / URI)"
 msgstr "Ekstern editor (%s erstattes af filnavn / URI)"
 
-#: src/prefs_common.c:2131
+#: src/prefs_common.c:2143
 msgid "Web browser"
 msgstr "Web browser"
 
-#: src/prefs_common.c:2195
+#: src/prefs_common.c:2207
 msgid "Add address to destination when double-clicked"
 msgstr "Tilføj adresse til 'Til' ved dobbeltklik"
 
-#: src/prefs_common.c:2197
+#: src/prefs_common.c:2209
 msgid "On exit"
 msgstr "Ved afslut"
 
-#: src/prefs_common.c:2205
+#: src/prefs_common.c:2217
 msgid "Confirm on exit"
 msgstr "Spørg ved afslut"
 
-#: src/prefs_common.c:2212
+#: src/prefs_common.c:2224
 msgid "Empty trash on exit"
 msgstr "Tøm Slettet ved afslut"
 
-#: src/prefs_common.c:2214
+#: src/prefs_common.c:2226
 msgid "Ask before emptying"
 msgstr "Spørg før tømning"
 
-#: src/prefs_common.c:2218
+#: src/prefs_common.c:2230
 msgid "Warn if there are queued messages"
 msgstr "Advar ved meddelelser i kø"
 
-#: src/prefs_common.c:2224
+#: src/prefs_common.c:2236
 msgid "Socket I/O timeout:"
 msgstr "Socket I/O timeout:"
 
-#: src/prefs_common.c:2237
+#: src/prefs_common.c:2249
 msgid "second(s)"
 msgstr "sekund(er)"
 
-#: src/prefs_common.c:2419
+#: src/prefs_common.c:2431
 msgid "the full abbreviated weekday name"
 msgstr "kort ugedags navn"
 
-#: src/prefs_common.c:2420
+#: src/prefs_common.c:2432
 msgid "the full weekday name"
 msgstr "Ugedags navn"
 
-#: src/prefs_common.c:2421
+#: src/prefs_common.c:2433
 msgid "the abbreviated month name"
 msgstr "kort måneds navn"
 
-#: src/prefs_common.c:2422
+#: src/prefs_common.c:2434
 msgid "the full month name"
 msgstr "måneds navn"
 
-#: src/prefs_common.c:2423
+#: src/prefs_common.c:2435
 msgid "the preferred date and time for the current locale"
 msgstr "ønsket dato format for nuværende locale"
 
-#: src/prefs_common.c:2424
+#: src/prefs_common.c:2436
 msgid "the century number (year/100)"
 msgstr "århundrede (år/100)"
 
-#: src/prefs_common.c:2425
+#: src/prefs_common.c:2437
 msgid "the day of the month as a decimal number"
 msgstr "dag i måned som tal"
 
-#: src/prefs_common.c:2426
+#: src/prefs_common.c:2438
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "time som tal (24 timers visning)"
 
-#: src/prefs_common.c:2427
+#: src/prefs_common.c:2439
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "time som tal (12 timers visning)"
 
-#: src/prefs_common.c:2428
+#: src/prefs_common.c:2440
 msgid "the day of the year as a decimal number"
 msgstr "århundrede som tal"
 
-#: src/prefs_common.c:2429
+#: src/prefs_common.c:2441
 msgid "the month as a decimal number"
 msgstr "måned som tal"
 
-#: src/prefs_common.c:2430
+#: src/prefs_common.c:2442
 msgid "the minute as a decimal number"
 msgstr "minut som tal"
 
-#: src/prefs_common.c:2431
+#: src/prefs_common.c:2443
 msgid "either AM or PM"
 msgstr "enten AM eller PM"
 
-#: src/prefs_common.c:2432
+#: src/prefs_common.c:2444
 msgid "the second as a decimal number"
 msgstr "sekund som tal"
 
-#: src/prefs_common.c:2433
+#: src/prefs_common.c:2445
 msgid "the day of the week as a decimal number"
 msgstr "ugedag som tal"
 
-#: src/prefs_common.c:2434
+#: src/prefs_common.c:2446
 msgid "the preferred date for the current locale"
 msgstr "ønsket dato format for nuværende locale"
 
-#: src/prefs_common.c:2435
+#: src/prefs_common.c:2447
 msgid "the last two digits of a year"
 msgstr "de sidste to cifre i året"
 
-#: src/prefs_common.c:2436
+#: src/prefs_common.c:2448
 msgid "the year as a decimal number"
 msgstr "året som tal"
 
-#: src/prefs_common.c:2437
+#: src/prefs_common.c:2449
 msgid "the time zone or name or abbreviation"
 msgstr "tidszone som navn eller forkortelse"
 
-#: src/prefs_common.c:2458
+#: src/prefs_common.c:2470
 msgid "Specifier"
 msgstr "Vælger"
 
-#: src/prefs_common.c:2459
+#: src/prefs_common.c:2471
 msgid "Description"
 msgstr "Beskrivelse"
 
-#: src/prefs_common.c:2499
+#: src/prefs_common.c:2511
 msgid "Example"
 msgstr "Eksempel"
 
-#: src/prefs_common.c:2580
+#: src/prefs_common.c:2592
 msgid "Set message colors"
 msgstr "Angiv meddelelses farve"
 
-#: src/prefs_common.c:2588
+#: src/prefs_common.c:2600
 msgid "Colors"
 msgstr "Farve"
 
-#: src/prefs_common.c:2622
+#: src/prefs_common.c:2634
 msgid "Quoted Text - First Level"
 msgstr "Citeret tekst - 1. niveau"
 
-#: src/prefs_common.c:2628
+#: src/prefs_common.c:2640
 msgid "Quoted Text - Second Level"
 msgstr "Citeret tekst - 2. niveau"
 
-#: src/prefs_common.c:2634
+#: src/prefs_common.c:2646
 msgid "Quoted Text - Third Level"
 msgstr "Citeret tekst - 3. nivaur"
 
-#: src/prefs_common.c:2640
+#: src/prefs_common.c:2652
 msgid "URI link"
 msgstr "URI-Link"
 
-#: src/prefs_common.c:2647
+#: src/prefs_common.c:2659
 msgid "Recycle quote colors"
 msgstr "Genbrug citat farver"
 
-#: src/prefs_common.c:2707
+#: src/prefs_common.c:2719
 msgid "Pick color for quotation level 1"
 msgstr "Vælg farve for nivau 1"
 
-#: src/prefs_common.c:2710
+#: src/prefs_common.c:2722
 msgid "Pick color for quotation level 2"
 msgstr "Vælg farve for nivau 2"
 
-#: src/prefs_common.c:2713
+#: src/prefs_common.c:2725
 msgid "Pick color for quotation level 3"
 msgstr "Vælg farve for nivau 3"
 
-#: src/prefs_common.c:2716
+#: src/prefs_common.c:2728
 msgid "Pick color for URI"
 msgstr "Vælg farve for URI"
 
-#: src/prefs_common.c:2853
+#: src/prefs_common.c:2865
 msgid "Description of symbols"
 msgstr "Beskrivelse af symboler"
 
-#: src/prefs_common.c:2909
+#: src/prefs_common.c:2921
 msgid ""
 "Date\n"
 "From\n"
@@ -4908,11 +4945,11 @@ msgstr ""
 "Nyhedsgrupper\n"
 "Meddelelses ID"
 
-#: src/prefs_common.c:2922
+#: src/prefs_common.c:2934
 msgid "If x is set, displays expr"
 msgstr "Hvis x er valgt vises expr"
 
-#: src/prefs_common.c:2926
+#: src/prefs_common.c:2938
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -4926,7 +4963,7 @@ msgstr ""
 "Citeret meddelelses krop uden signatur\n"
 "%"
 
-#: src/prefs_common.c:2934
+#: src/prefs_common.c:2946
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -4938,15 +4975,15 @@ msgstr ""
 "{\n"
 "}"
 
-#: src/prefs_common.c:2971
+#: src/prefs_common.c:2983
 msgid "Font selection"
 msgstr "Skrifttype"
 
-#: src/prefs_common.c:3035
+#: src/prefs_common.c:3047
 msgid "Key bindings"
 msgstr "Tast bindinger"
 
-#: src/prefs_common.c:3049
+#: src/prefs_common.c:3061
 msgid ""
 "Select the preset of key bindings.\n"
 "You can also modify each menu's shortcuts by pressing\n"
@@ -4956,11 +4993,11 @@ msgstr ""
 "Du kan også ændre hver menus genvejstast ved at taste enhver ved at placere\n"
 "mus over menu punkt og taste en tast."
 
-#: src/prefs_common.c:3061 src/prefs_common.c:3410
+#: src/prefs_common.c:3073 src/prefs_common.c:3422
 msgid "Default"
 msgstr "Standard"
 
-#: src/prefs_common.c:3064 src/prefs_common.c:3419
+#: src/prefs_common.c:3076 src/prefs_common.c:3431
 msgid "Old Sylpheed"
 msgstr "Gl. Sylpheed"
 
@@ -6131,6 +6168,12 @@ msgstr "%.2fGB"
 msgid "writing to %s failed.\n"
 msgstr "fejl ved skrivning til %s.\n"
 
+#~ msgid "/_View/_Code set/---"
+#~ msgstr "/_Vis/_Tegnsæt/---"
+
+#~ msgid "/_View/_Code set"
+#~ msgstr "/_Vis/_Tegnsæt"
+
 #~ msgid "To save this part, pop up the context menu with "
 #~ msgstr "For at gemme denne del, åbn menuen med  "
 
diff --git a/po/de.po b/po/de.po
index 26c27ecb..0ab05cee 100644
--- a/po/de.po
+++ b/po/de.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-03-15 14:29+0900\n"
+"POT-Creation-Date: 2005-03-16 14:47+0900\n"
 "PO-Revision-Date: 2005-02-08 22:49+0100\n"
 "Last-Translator: Manfred Usselmann <usselmann.m@icg-online.de>\n"
 "Language-Team: German <gnome-de@gnome.org>\n"
@@ -100,7 +100,7 @@ msgstr ""
 "in der `G'-Spalte, um den Nachrichten-Empfang bei `Hole alle' einzuschalten."
 
 #: src/account.c:638 src/addressadd.c:186 src/addressbook.c:488
-#: src/compose.c:3650 src/editaddress.c:195 src/editaddress.c:936
+#: src/compose.c:3748 src/editaddress.c:195 src/editaddress.c:936
 #: src/editaddress.c:984 src/editbook.c:191 src/editgroup.c:257
 #: src/editjpilot.c:296 src/editldap.c:300 src/editvcard.c:211
 #: src/mimeview.c:151 src/prefs_filter.c:214 src/prefs_folder_item.c:170
@@ -153,13 +153,13 @@ msgstr "Account löschen"
 msgid "Do you really want to delete this account?"
 msgstr "Wollen Sie diesen Account wirklich löschen?"
 
-#: src/account.c:758 src/compose.c:2551 src/compose.c:4807
+#: src/account.c:758 src/compose.c:2632 src/compose.c:4943
 #: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
 #: src/folderview.c:2156 src/folderview.c:2192
 msgid "Yes"
 msgstr "Ja"
 
-#: src/account.c:758 src/compose.c:2551 src/compose.c:4807
+#: src/account.c:758 src/compose.c:2632 src/compose.c:4943
 #: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
 #: src/folderview.c:2156 src/folderview.c:2192
 msgid "+No"
@@ -264,7 +264,7 @@ msgstr "Aktionen Benutzer-Parameter"
 msgid "Add Address to Book"
 msgstr "Adresse in Adressbuch einfügen"
 
-#: src/addressadd.c:196 src/compose.c:4191 src/editaddress.c:196
+#: src/addressadd.c:196 src/compose.c:4292 src/editaddress.c:196
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "Adresse"
@@ -278,7 +278,7 @@ msgstr "Kommentar"
 msgid "Select Address Book Folder"
 msgstr "Wähle Adressbuchablage"
 
-#: src/addressbook.c:334 src/compose.c:469 src/mainwindow.c:454
+#: src/addressbook.c:334 src/compose.c:477 src/mainwindow.c:454
 #: src/messageview.c:134
 msgid "/_File"
 msgstr "/_Datei"
@@ -299,8 +299,8 @@ msgstr "/_Datei/Neues _JPilot"
 msgid "/_File/New _Server"
 msgstr "/_Datei/Neuer _Server"
 
-#: src/addressbook.c:343 src/addressbook.c:346 src/compose.c:474
-#: src/compose.c:479 src/compose.c:483 src/mainwindow.c:471
+#: src/addressbook.c:343 src/addressbook.c:346 src/compose.c:482
+#: src/compose.c:487 src/compose.c:491 src/mainwindow.c:471
 #: src/mainwindow.c:474 src/mainwindow.c:476 src/mainwindow.c:479
 #: src/mainwindow.c:481 src/messageview.c:137
 msgid "/_File/---"
@@ -318,7 +318,7 @@ msgstr "/_Datei/_Löschen"
 msgid "/_File/_Save"
 msgstr "/_Datei/_Speichern"
 
-#: src/addressbook.c:348 src/compose.c:484 src/messageview.c:138
+#: src/addressbook.c:348 src/compose.c:492 src/messageview.c:138
 msgid "/_File/_Close"
 msgstr "/_Datei/S_chließen"
 
@@ -350,7 +350,7 @@ msgstr "/_Adresse/_Bearbeiten"
 msgid "/_Address/_Delete"
 msgstr "/_Adresse/_Löschen"
 
-#: src/addressbook.c:356 src/compose.c:585 src/mainwindow.c:688
+#: src/addressbook.c:356 src/compose.c:664 src/mainwindow.c:697
 #: src/messageview.c:246
 msgid "/_Tools"
 msgstr "/_Werkzeug"
@@ -359,12 +359,12 @@ msgstr "/_Werkzeug"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Werkzeug/Importiere _LDIF-Datei"
 
-#: src/addressbook.c:358 src/compose.c:598 src/mainwindow.c:733
+#: src/addressbook.c:358 src/compose.c:677 src/mainwindow.c:742
 #: src/messageview.c:264
 msgid "/_Help"
 msgstr "/_Hilfe"
 
-#: src/addressbook.c:359 src/compose.c:599 src/mainwindow.c:744
+#: src/addressbook.c:359 src/compose.c:678 src/mainwindow.c:753
 #: src/messageview.c:265
 msgid "/_Help/_About"
 msgstr "/_Hilfe/_Über"
@@ -381,7 +381,7 @@ msgstr "/Neue _Gruppe"
 msgid "/New _Folder"
 msgstr "/Neue Ab_lage"
 
-#: src/addressbook.c:381 src/addressbook.c:391 src/compose.c:463
+#: src/addressbook.c:381 src/addressbook.c:391 src/compose.c:471
 #: src/folderview.c:220 src/folderview.c:222 src/folderview.c:226
 #: src/folderview.c:236 src/folderview.c:238 src/folderview.c:240
 #: src/folderview.c:244 src/folderview.c:254 src/folderview.c:256
@@ -391,7 +391,7 @@ msgstr "/Neue Ab_lage"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:382 src/addressbook.c:392 src/compose.c:486
+#: src/addressbook.c:382 src/addressbook.c:392 src/compose.c:494
 #: src/mainwindow.c:485 src/messageview.c:140
 msgid "/_Edit"
 msgstr "/_Bearbeiten"
@@ -404,7 +404,7 @@ msgstr "/_Löschen"
 msgid "E-Mail address"
 msgstr "E-Mail Adresse"
 
-#: src/addressbook.c:493 src/compose.c:4192 src/prefs_common.c:2186
+#: src/addressbook.c:493 src/compose.c:4293 src/prefs_common.c:2198
 msgid "Address book"
 msgstr "Adressbuch"
 
@@ -414,7 +414,7 @@ msgstr "Name:"
 
 #. Buttons
 #: src/addressbook.c:625 src/addressbook.c:1665 src/addressbook.c:1671
-#: src/editaddress.c:878 src/editaddress.c:1011 src/mainwindow.c:2212
+#: src/editaddress.c:878 src/editaddress.c:1011 src/mainwindow.c:2221
 #: src/prefs_actions.c:263 src/prefs_display_header.c:275
 #: src/prefs_display_header.c:330 src/prefs_template.c:227
 msgid "Delete"
@@ -609,7 +609,7 @@ msgstr "Allgemeine Adressen"
 msgid "Personal address"
 msgstr "Persönliche Adressen"
 
-#: src/alertpanel.c:123 src/compose.c:4807 src/main.c:458
+#: src/alertpanel.c:123 src/compose.c:4943 src/main.c:458
 msgid "Notice"
 msgstr "Notiz"
 
@@ -617,7 +617,7 @@ msgstr "Notiz"
 msgid "Warning"
 msgstr "Warnung"
 
-#: src/alertpanel.c:149 src/compose.c:2551 src/inc.c:558
+#: src/alertpanel.c:149 src/compose.c:2632 src/inc.c:558
 msgid "Error"
 msgstr "Fehler"
 
@@ -665,299 +665,417 @@ msgstr "Braun"
 msgid "None"
 msgstr "Keine"
 
-#: src/compose.c:461
+#: src/compose.c:469
 msgid "/_Add..."
 msgstr "/_Hinzufügen..."
 
-#: src/compose.c:462
+#: src/compose.c:470
 msgid "/_Remove"
 msgstr "/_Entfernen"
 
-#: src/compose.c:464 src/folderview.c:228 src/folderview.c:246
+#: src/compose.c:472 src/folderview.c:228 src/folderview.c:246
 #: src/folderview.c:261
 msgid "/_Properties..."
 msgstr "/_Eigenschaften..."
 
-#: src/compose.c:470
+#: src/compose.c:478
 msgid "/_File/_Send"
 msgstr "/_Datei/_Senden"
 
-#: src/compose.c:472
+#: src/compose.c:480
 msgid "/_File/Send _later"
 msgstr "/_Datei/S_päter senden"
 
-#: src/compose.c:475
+#: src/compose.c:483
 msgid "/_File/Save to _draft folder"
 msgstr "/_Datei/In Ent_wurfablage speichern"
 
-#: src/compose.c:477
+#: src/compose.c:485
 msgid "/_File/Save and _keep editing"
 msgstr "/_Datei/Speichern und Bearbeitung _fortsetzen"
 
-#: src/compose.c:480
+#: src/compose.c:488
 msgid "/_File/_Attach file"
 msgstr "/_Datei/Datei _anhängen"
 
-#: src/compose.c:481
+#: src/compose.c:489
 msgid "/_File/_Insert file"
 msgstr "/_Datei/Datei _einfügen"
 
-#: src/compose.c:482
+#: src/compose.c:490
 msgid "/_File/Insert si_gnature"
 msgstr "/_Datei/_Unterschrift einfügen"
 
-#: src/compose.c:487
+#: src/compose.c:495
 msgid "/_Edit/_Undo"
 msgstr "/_Bearbeiten/_Zurück"
 
-#: src/compose.c:488
+#: src/compose.c:496
 msgid "/_Edit/_Redo"
 msgstr "/_Bearbeiten/_Wiederholen"
 
-#: src/compose.c:489 src/compose.c:567 src/mainwindow.c:489
+#: src/compose.c:497 src/compose.c:575 src/mainwindow.c:489
 #: src/messageview.c:143
 msgid "/_Edit/---"
 msgstr "/_Bearbeiten/---"
 
-#: src/compose.c:490
+#: src/compose.c:498
 msgid "/_Edit/Cu_t"
 msgstr "/_Bearbeiten/_Ausschneiden"
 
-#: src/compose.c:491 src/mainwindow.c:486 src/messageview.c:141
+#: src/compose.c:499 src/mainwindow.c:486 src/messageview.c:141
 msgid "/_Edit/_Copy"
 msgstr "/_Bearbeiten/_Kopieren"
 
-#: src/compose.c:492
+#: src/compose.c:500
 msgid "/_Edit/_Paste"
 msgstr "/_Bearbeiten/_Einfügen"
 
-#: src/compose.c:493
+#: src/compose.c:501
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Bearbeiten/Als Zitat _einfügen"
 
-#: src/compose.c:495 src/mainwindow.c:487 src/messageview.c:142
+#: src/compose.c:503 src/mainwindow.c:487 src/messageview.c:142
 msgid "/_Edit/Select _all"
 msgstr "/_Bearbeiten/Alle au_swählen"
 
-#: src/compose.c:496
+#: src/compose.c:504
 msgid "/_Edit/A_dvanced"
 msgstr "/_Bearbeiten/_Beschleunigen"
 
-#: src/compose.c:497
+#: src/compose.c:505
 msgid "/_Edit/A_dvanced/Move a character backward"
 msgstr "/_Bearbeiten/_Beschleunigen/Ein Zeichen zurück"
 
-#: src/compose.c:502
+#: src/compose.c:510
 msgid "/_Edit/A_dvanced/Move a character forward"
 msgstr "/_Bearbeiten/_Beschleunigen/Ein Zeichen vor"
 
-#: src/compose.c:507
+#: src/compose.c:515
 msgid "/_Edit/A_dvanced/Move a word backward"
 msgstr "/_Bearbeiten/_Beschleunigen/Ein Wort zurück"
 
-#: src/compose.c:512
+#: src/compose.c:520
 msgid "/_Edit/A_dvanced/Move a word forward"
 msgstr "/_Bearbeiten/_Beschleunigen/Ein Wort vor"
 
-#: src/compose.c:517
+#: src/compose.c:525
 msgid "/_Edit/A_dvanced/Move to beginning of line"
 msgstr "/_Bearbeiten/_Beschleunigen/Zum Anfang der Zeile"
 
-#: src/compose.c:522
+#: src/compose.c:530
 msgid "/_Edit/A_dvanced/Move to end of line"
 msgstr "/_Bearbeiten/_Beschleunigen/Zum Ende der Zeile"
 
-#: src/compose.c:527
+#: src/compose.c:535
 msgid "/_Edit/A_dvanced/Move to previous line"
 msgstr "/_Bearbeiten/_Beschleunigen/Zur vorherigen Zeile"
 
-#: src/compose.c:532
+#: src/compose.c:540
 msgid "/_Edit/A_dvanced/Move to next line"
 msgstr "/_Bearbeiten/_Beschleunigen/Zur nächsten Zeile"
 
-#: src/compose.c:537
+#: src/compose.c:545
 msgid "/_Edit/A_dvanced/Delete a character backward"
 msgstr "/_Bearbeiten/_Beschleunigen/Zeichen links vom Cursor löschen"
 
-#: src/compose.c:542
+#: src/compose.c:550
 msgid "/_Edit/A_dvanced/Delete a character forward"
 msgstr "/_Bearbeiten/_Beschleunigen/Zeichen rechts vom Cursor löschen"
 
-#: src/compose.c:547
+#: src/compose.c:555
 msgid "/_Edit/A_dvanced/Delete a word backward"
 msgstr "/_Bearbeiten/_Beschleunigen/Wort links vom Cursor löschen"
 
-#: src/compose.c:552
+#: src/compose.c:560
 msgid "/_Edit/A_dvanced/Delete a word forward"
 msgstr "/_Bearbeiten/_Beschleunigen/Wort rechts vom Cursor löschen"
 
-#: src/compose.c:557
+#: src/compose.c:565
 msgid "/_Edit/A_dvanced/Delete line"
 msgstr "/_Bearbeiten/_Beschleunigen/Zeile löschen"
 
-#: src/compose.c:562
+#: src/compose.c:570
 msgid "/_Edit/A_dvanced/Delete to end of line"
 msgstr "/_Bearbeiten/_Beschleunigen/Bis zum Ende der Zeile löschen"
 
-#: src/compose.c:568
+#: src/compose.c:576
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/_Bearbeiten/Aktuellen Absatz um_brechen"
 
-#: src/compose.c:570
+#: src/compose.c:578
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/_Bearbeiten/Alle langen Zeilen _umbrechen"
 
-#: src/compose.c:572
+#: src/compose.c:580
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Bearbeiten/Aut_omatisches umbrechen"
 
-#: src/compose.c:573 src/mainwindow.c:494 src/messageview.c:147
+#: src/compose.c:581 src/mainwindow.c:494 src/messageview.c:147
 #: src/summaryview.c:370
 msgid "/_View"
 msgstr "/_Ansicht"
 
-#: src/compose.c:574
+#: src/compose.c:582
 msgid "/_View/_To"
 msgstr "/_Ansicht/_An"
 
-#: src/compose.c:575
+#: src/compose.c:583
 msgid "/_View/_Cc"
 msgstr "/_Ansicht/_Cc"
 
-#: src/compose.c:576
+#: src/compose.c:584
 msgid "/_View/_Bcc"
 msgstr "/_Ansicht/_Bcc"
 
-#: src/compose.c:577
+#: src/compose.c:585
 msgid "/_View/_Reply to"
 msgstr "/_Ansicht/A_ntwort an"
 
-#: src/compose.c:578 src/compose.c:580 src/compose.c:582 src/mainwindow.c:512
-#: src/mainwindow.c:515 src/mainwindow.c:541 src/mainwindow.c:565
-#: src/mainwindow.c:641 src/mainwindow.c:645 src/messageview.c:223
+#: src/compose.c:586 src/compose.c:588 src/compose.c:590 src/compose.c:592
+#: src/mainwindow.c:512 src/mainwindow.c:515 src/mainwindow.c:541
+#: src/mainwindow.c:565 src/mainwindow.c:650 src/mainwindow.c:654
+#: src/messageview.c:223
 msgid "/_View/---"
 msgstr "/_Ansicht/---"
 
-#: src/compose.c:579
+#: src/compose.c:587
 msgid "/_View/_Followup to"
 msgstr "/_Ansicht/_Wiedervorlage an"
 
-#: src/compose.c:581
+#: src/compose.c:589
 msgid "/_View/R_uler"
 msgstr "/_Ansicht/_Lineal"
 
-#: src/compose.c:583
+#: src/compose.c:591
 msgid "/_View/_Attachment"
 msgstr "/_Ansicht/An_hang"
 
-#: src/compose.c:586 src/mainwindow.c:689 src/messageview.c:247
+#: src/compose.c:598 src/mainwindow.c:572 src/messageview.c:154
+#, fuzzy
+msgid "/_View/Character _encoding"
+msgstr "/_Ansicht/_Sortieren/Absteigend"
+
+#: src/compose.c:599
+msgid "/_View/Character _encoding/_Automatic"
+msgstr ""
+
+#: src/compose.c:601 src/compose.c:607 src/compose.c:613 src/compose.c:617
+#: src/compose.c:623 src/compose.c:627 src/compose.c:631 src/compose.c:641
+#: src/compose.c:645 src/compose.c:653 src/compose.c:657 src/mainwindow.c:568
+#: src/mainwindow.c:575 src/messageview.c:150
+#, fuzzy
+msgid "/_View/Character _encoding/---"
+msgstr "/_Ansicht/_Sortieren/Absteigend"
+
+#: src/compose.c:603 src/mainwindow.c:576 src/messageview.c:158
+#, fuzzy
+msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
+msgstr "/_Ansicht/_Zeichensatz/7bit ascii (US-ASC_II)"
+
+#: src/compose.c:605 src/mainwindow.c:578 src/messageview.c:161
+#, fuzzy
+msgid "/_View/Character _encoding/Unicode (_UTF-8)"
+msgstr "/_Ansicht/_Zeichensatz/Unicode (_UTF-8)"
+
+#: src/compose.c:609 src/mainwindow.c:582 src/messageview.c:164
+#, fuzzy
+msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
+msgstr "/_Ansicht/_Zeichensatz/Western European (ISO-8859-_1)"
+
+#: src/compose.c:611 src/mainwindow.c:584 src/messageview.c:166
+#, fuzzy
+msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
+msgstr "/_Ansicht/_Zeichensatz/Western European (ISO-8859-15)"
+
+#: src/compose.c:615 src/mainwindow.c:588 src/messageview.c:169
+#, fuzzy
+msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
+msgstr "/_Ansicht/_Zeichensatz/Central European (ISO-8859-_2)"
+
+#: src/compose.c:619 src/mainwindow.c:592 src/messageview.c:172
+#, fuzzy
+msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
+msgstr "/_Ansicht/_Zeichensatz/_Baltic (ISO-8859-13)"
+
+#: src/compose.c:621 src/mainwindow.c:594 src/messageview.c:174
+#, fuzzy
+msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
+msgstr "/_Ansicht/_Zeichensatz/Baltic (ISO-8859-_4)"
+
+#: src/compose.c:625 src/mainwindow.c:598 src/messageview.c:177
+#, fuzzy
+msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
+msgstr "/_Ansicht/_Zeichensatz/Greek (ISO-8859-_7)"
+
+#: src/compose.c:629 src/mainwindow.c:602 src/messageview.c:180
+#, fuzzy
+msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
+msgstr "/_Ansicht/_Zeichensatz/Turkish (ISO-8859-_9)"
+
+#: src/compose.c:633 src/mainwindow.c:606 src/messageview.c:183
+#, fuzzy
+msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
+msgstr "/_Ansicht/_Zeichensatz/Cyrillic (ISO-8859-_5)"
+
+#: src/compose.c:635 src/mainwindow.c:608 src/messageview.c:185
+#, fuzzy
+msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
+msgstr "/_Ansicht/_Zeichensatz/Cyrillic (KOI8-_R)"
+
+#: src/compose.c:637 src/mainwindow.c:610 src/messageview.c:187
+#, fuzzy
+msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
+msgstr "/_Ansicht/_Zeichensatz/Cyrillic (KOI8-_U)"
+
+#: src/compose.c:639 src/mainwindow.c:612 src/messageview.c:189
+#, fuzzy
+msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
+msgstr "/_Ansicht/_Zeichensatz/Cyrillic (Windows-1251)"
+
+#: src/compose.c:643 src/mainwindow.c:616 src/messageview.c:192
+#, fuzzy
+msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
+msgstr "/_Ansicht/_Zeichensatz/Japanese (ISO-2022-_JP)"
+
+#: src/compose.c:647 src/mainwindow.c:626 src/messageview.c:201
+#, fuzzy
+msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
+msgstr "/_Ansicht/_Zeichensatz/Simplified Chinese (_GB2312)"
+
+#: src/compose.c:649 src/mainwindow.c:628 src/messageview.c:203
+#, fuzzy
+msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
+msgstr "/_Ansicht/_Zeichensatz/Traditional Chinese (_Big5)"
+
+#: src/compose.c:651 src/mainwindow.c:630 src/messageview.c:205
+#, fuzzy
+msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
+msgstr "/_Ansicht/_Zeichensatz/Traditional Chinese (EUC-_TW)"
+
+#: src/compose.c:655 src/mainwindow.c:636 src/messageview.c:210
+#, fuzzy
+msgid "/_View/Character _encoding/Korean (EUC-_KR)"
+msgstr "/_Ansicht/_Zeichensatz/Korean (EUC-_KR)"
+
+#: src/compose.c:659 src/mainwindow.c:642 src/messageview.c:215
+#, fuzzy
+msgid "/_View/Character _encoding/Thai (TIS-620)"
+msgstr "/_Ansicht/_Zeichensatz/Thai (TIS-620)"
+
+#: src/compose.c:661 src/mainwindow.c:644 src/messageview.c:217
+#, fuzzy
+msgid "/_View/Character _encoding/Thai (Windows-874)"
+msgstr "/_Ansicht/_Zeichensatz/Thai (Windows-874)"
+
+#: src/compose.c:665 src/mainwindow.c:698 src/messageview.c:247
 msgid "/_Tools/_Address book"
 msgstr "/_Werkzeug/_Adressbuch"
 
-#: src/compose.c:587
+#: src/compose.c:666
 msgid "/_Tools/_Template"
 msgstr "/_Werkzeug/_Schablone"
 
-#: src/compose.c:588 src/mainwindow.c:707 src/messageview.c:262
+#: src/compose.c:667 src/mainwindow.c:716 src/messageview.c:262
 msgid "/_Tools/Actio_ns"
 msgstr "/_Werkzeug/Aktio_nen"
 
-#: src/compose.c:589 src/compose.c:593 src/mainwindow.c:692
-#: src/mainwindow.c:706 src/mainwindow.c:708 src/mainwindow.c:711
-#: src/mainwindow.c:713 src/messageview.c:250 src/messageview.c:261
+#: src/compose.c:668 src/compose.c:672 src/mainwindow.c:701
+#: src/mainwindow.c:715 src/mainwindow.c:717 src/mainwindow.c:720
+#: src/mainwindow.c:722 src/messageview.c:250 src/messageview.c:261
 msgid "/_Tools/---"
 msgstr "/_Werkzeug/---"
 
-#: src/compose.c:590
+#: src/compose.c:669
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/_Werkzeug/Mit e_xternem Editor bearbeiten"
 
-#: src/compose.c:594
+#: src/compose.c:673
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Werkzeug/PGP _Unterschreiben"
 
-#: src/compose.c:595
+#: src/compose.c:674
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/_Werkzeug/PGP _Verschlüsseln"
 
-#: src/compose.c:800
+#: src/compose.c:879
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: Datei existiert nicht\n"
 
-#: src/compose.c:899 src/compose.c:958 src/procmsg.c:1303
+#: src/compose.c:978 src/compose.c:1037 src/procmsg.c:1303
 msgid "Can't get text part\n"
 msgstr "Kann Textabschnitt nicht lesen\n"
 
-#: src/compose.c:1340
+#: src/compose.c:1419
 msgid "Quote mark format error."
 msgstr "Zitatzeichen Formatfehler."
 
-#: src/compose.c:1352
+#: src/compose.c:1431
 msgid "Message reply/forward format error."
 msgstr "Formatfehler in Nachrichtenantwort oder -Weiterleitung."
 
-#: src/compose.c:1679
+#: src/compose.c:1758
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Datei %s existiert nicht\n"
 
-#: src/compose.c:1683
+#: src/compose.c:1762
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Kann Dateigröße von %s nicht ermitteln\n"
 
-#: src/compose.c:1687
+#: src/compose.c:1766
 #, c-format
 msgid "File %s is empty."
 msgstr "Datei %s ist leer."
 
-#: src/compose.c:1691
+#: src/compose.c:1770
 #, c-format
 msgid "Can't read %s."
 msgstr "Kann %s nicht lesen."
 
-#: src/compose.c:1726
+#: src/compose.c:1805
 #, c-format
 msgid "Message: %s"
 msgstr "Nachricht: %s"
 
-#: src/compose.c:1797 src/mimeview.c:491
+#: src/compose.c:1876 src/mimeview.c:491
 msgid "Can't get the part of multipart message."
 msgstr "Kann einen Teil einer mehrteiligen Nachricht nicht bekommen."
 
-#: src/compose.c:2188
+#: src/compose.c:2267
 msgid " [Edited]"
 msgstr " [in Bearbeitung]"
 
-#: src/compose.c:2190
+#: src/compose.c:2269
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Verfasse Nachricht%s"
 
-#: src/compose.c:2193
+#: src/compose.c:2272
 #, c-format
 msgid "Compose message%s"
 msgstr "Verfasse Nachricht%s"
 
-#: src/compose.c:2304
+#: src/compose.c:2383
 msgid "Recipient is not specified."
 msgstr "Empfänger nicht angegeben"
 
-#: src/compose.c:2312 src/compose.c:4112 src/mainwindow.c:2144
+#: src/compose.c:2391 src/compose.c:4213 src/mainwindow.c:2153
 #: src/prefs_account.c:703 src/prefs_common.c:850
 msgid "Send"
 msgstr "Senden"
 
-#: src/compose.c:2313
+#: src/compose.c:2392
 msgid "Subject is empty. Send it anyway?"
 msgstr "Betreff ist leer. Trotzdem verschicken?"
 
-#: src/compose.c:2364
+#: src/compose.c:2443
 msgid "can't get recipient list."
 msgstr "Kann die Empfängerliste nicht holen."
 
-#: src/compose.c:2384
+#: src/compose.c:2463
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -965,26 +1083,26 @@ 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:2398 src/send_message.c:261
+#: src/compose.c:2477 src/send_message.c:261
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Fehler beim Senden der Nachricht an %s ."
 
-#: src/compose.c:2421
+#: src/compose.c:2500
 msgid "Can't save the message to outbox."
 msgstr "Kann die Nachricht nicht in der Gesendet-Ablage speichern."
 
-#: src/compose.c:2457
+#: src/compose.c:2536
 #, 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:2518 src/compose.c:2739 src/compose.c:2802 src/compose.c:2921
+#: src/compose.c:2597 src/compose.c:2820 src/compose.c:2883 src/compose.c:3003
 #: src/utils.c:2189
 msgid "can't change file mode\n"
 msgstr "kann Dateimodus nicht ändern\n"
 
-#: src/compose.c:2546
+#: src/compose.c:2627
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -994,140 +1112,140 @@ msgstr ""
 "(von %s zu %s).\n"
 "Trotzdem senden?"
 
-#: src/compose.c:2610
+#: src/compose.c:2691
 msgid "can't write headers\n"
 msgstr "kann Kopfzeilen nicht schreiben\n"
 
-#: src/compose.c:2881
+#: src/compose.c:2963
 msgid "can't remove the old message\n"
 msgstr "Kann die alte Nachricht nicht entfernen\n"
 
-#: src/compose.c:2899
+#: src/compose.c:2981
 msgid "queueing message...\n"
 msgstr "Nachricht einreihen...\n"
 
-#: src/compose.c:2981
+#: src/compose.c:3063
 msgid "can't find queue folder\n"
 msgstr "kann Queue-Ablage nicht finden\n"
 
-#: src/compose.c:2988
+#: src/compose.c:3070
 msgid "can't queue the message\n"
 msgstr "Nachricht kann nicht eingereiht werden\n"
 
-#: src/compose.c:3547
+#: src/compose.c:3645
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "erzeugte Nachrichten-ID: %s\n"
 
-#: src/compose.c:3645
+#: src/compose.c:3743
 msgid "Creating compose window...\n"
 msgstr "Erstelle Verfassenfenster...\n"
 
-#: src/compose.c:3648 src/compose.c:4598
+#: src/compose.c:3746 src/compose.c:4734
 msgid "MIME type"
 msgstr "MIME-Typ"
 
 #. S_COL_DATE
-#: src/compose.c:3649 src/mimeview.c:150 src/prefs_filter_edit.c:569
+#: src/compose.c:3747 src/mimeview.c:150 src/prefs_filter_edit.c:569
 #: src/prefs_summary_column.c:73 src/select-keys.c:317 src/summaryview.c:386
 msgid "Size"
 msgstr "Größe"
 
-#: src/compose.c:3700 src/headerview.c:53 src/summary_search.c:169
+#: src/compose.c:3798 src/headerview.c:53 src/summary_search.c:169
 msgid "From:"
 msgstr "Von:"
 
-#: src/compose.c:4113
+#: src/compose.c:4214
 msgid "Send message"
 msgstr "Sende Nachricht"
 
-#: src/compose.c:4121
+#: src/compose.c:4222
 msgid "Send later"
 msgstr "Später senden"
 
-#: src/compose.c:4122
+#: src/compose.c:4223
 msgid "Put into queue folder and send later"
 msgstr "In Queue-Ablage und später senden"
 
-#: src/compose.c:4130
+#: src/compose.c:4231
 msgid "Draft"
 msgstr "Entwurf"
 
-#: src/compose.c:4131
+#: src/compose.c:4232
 msgid "Save to draft folder"
 msgstr "Speichern in Entwurfablage"
 
-#: src/compose.c:4141 src/compose.c:5382
+#: src/compose.c:4242 src/compose.c:5527
 msgid "Insert"
 msgstr "Einfügen"
 
-#: src/compose.c:4142
+#: src/compose.c:4243
 msgid "Insert file"
 msgstr "Datei einfügen"
 
-#: src/compose.c:4150
+#: src/compose.c:4251
 msgid "Attach"
 msgstr "Anhängen"
 
-#: src/compose.c:4151
+#: src/compose.c:4252
 msgid "Attach file"
 msgstr "Datei anhängen"
 
 #. signature
-#: src/compose.c:4161 src/prefs_account.c:1339 src/prefs_common.c:1261
+#: src/compose.c:4262 src/prefs_account.c:1339 src/prefs_common.c:1273
 msgid "Signature"
 msgstr "Unterschrift"
 
-#: src/compose.c:4162
+#: src/compose.c:4263
 msgid "Insert signature"
 msgstr "Unterschrift einfügen"
 
-#: src/compose.c:4171 src/prefs_common.c:1283 src/prefs_common.c:2165
+#: src/compose.c:4272 src/prefs_common.c:1295 src/prefs_common.c:2177
 msgid "Editor"
 msgstr "Editor"
 
-#: src/compose.c:4172
+#: src/compose.c:4273
 msgid "Edit with external editor"
 msgstr "Bearbeiten mit externem Editor"
 
-#: src/compose.c:4180
+#: src/compose.c:4281
 msgid "Linewrap"
 msgstr "Zeilenumbruch"
 
-#: src/compose.c:4181
+#: src/compose.c:4282
 msgid "Wrap all long lines"
 msgstr "Alle langen Zeilen umbrechen"
 
-#: src/compose.c:4492
+#: src/compose.c:4628
 msgid "Invalid MIME type."
 msgstr "Ungültiger MIME Typ"
 
-#: src/compose.c:4511
+#: src/compose.c:4647
 msgid "File doesn't exist or is empty."
 msgstr "Datei existiert nicht oder ist leer."
 
-#: src/compose.c:4580
+#: src/compose.c:4716
 msgid "Properties"
 msgstr "Eigenschaften"
 
-#: src/compose.c:4600
+#: src/compose.c:4736
 msgid "Encoding"
 msgstr "Zeichensatzkodierung"
 
-#: src/compose.c:4623 src/prefs_folder_item.c:183
+#: src/compose.c:4759 src/prefs_folder_item.c:183
 msgid "Path"
 msgstr "Pfad"
 
-#: src/compose.c:4624
+#: src/compose.c:4760
 msgid "File name"
 msgstr "Dateiname"
 
-#: src/compose.c:4778
+#: src/compose.c:4914
 #, 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:4804
+#: src/compose.c:4940
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1138,72 +1256,72 @@ msgstr ""
 "Prozess terminieren?\n"
 "Prozessgruppen ID: %d"
 
-#: src/compose.c:4817
+#: src/compose.c:4953
 #, c-format
 msgid "Terminated process group id: %d"
 msgstr "Gruppen ID: %d des terminierten Prozesses"
 
-#: src/compose.c:4818
+#: src/compose.c:4954
 #, c-format
 msgid "Temporary file: %s"
 msgstr "Temporäre Datei: %s"
 
-#: src/compose.c:4842
+#: src/compose.c:4978
 msgid "Compose: input from monitoring process\n"
 msgstr "Verfassen: Eingabe vom Überwachungsprozess\n"
 
 #. failed
-#: src/compose.c:4875
+#: src/compose.c:5011
 msgid "Couldn't exec external editor\n"
 msgstr "Kann externen Editor nicht ausführen\n"
 
-#: src/compose.c:4879
+#: src/compose.c:5015
 msgid "Couldn't write to file\n"
 msgstr "Kann nicht in Datei schreiben\n"
 
-#: src/compose.c:4881
+#: src/compose.c:5017
 msgid "Pipe read failed\n"
 msgstr "Lesen von Pipe fehlgeschlagen\n"
 
-#: src/compose.c:5182 src/compose.c:5190 src/compose.c:5196
+#: src/compose.c:5318 src/compose.c:5326 src/compose.c:5332
 msgid "Can't queue the message."
 msgstr "Nachricht kann nicht eingereiht werden."
 
-#: src/compose.c:5287
+#: src/compose.c:5423
 #, fuzzy
 msgid "Select files"
 msgstr "Wähle Datei"
 
-#: src/compose.c:5309
+#: src/compose.c:5445
 msgid "Select file"
 msgstr "Wähle Datei"
 
-#: src/compose.c:5344
+#: src/compose.c:5480
 msgid "Discard message"
 msgstr "Nachricht verwerfen"
 
-#: src/compose.c:5345
+#: src/compose.c:5481
 msgid "This message has been modified. discard it?"
 msgstr "Diese Nachricht wurde geändert. Verwerfen?"
 
-#: src/compose.c:5346
+#: src/compose.c:5482
 msgid "Discard"
 msgstr "Verwerfen"
 
-#: src/compose.c:5346
+#: src/compose.c:5482
 msgid "to Draft"
 msgstr "zum Entwurf"
 
-#: src/compose.c:5379
+#: src/compose.c:5524
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Wollen Sie die Schablone `%s' übernehmen ?"
 
-#: src/compose.c:5381
+#: src/compose.c:5526
 msgid "Apply template"
 msgstr "Schablone übernehmen"
 
-#: src/compose.c:5382
+#: src/compose.c:5527
 msgid "Replace"
 msgstr "Ersetzen"
 
@@ -1642,12 +1760,12 @@ msgstr "Setze Ablageinformation...\n"
 msgid "Setting folder info..."
 msgstr "Setze Ablageinformation..."
 
-#: src/folderview.c:652 src/mainwindow.c:3190 src/setup.c:81
+#: src/folderview.c:652 src/mainwindow.c:3199 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Durchsuche Ablage %s%c%s ..."
 
-#: src/folderview.c:656 src/mainwindow.c:3195 src/setup.c:86
+#: src/folderview.c:656 src/mainwindow.c:3204 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Durchsuche Ablage %s ..."
@@ -2104,7 +2222,7 @@ msgstr "Importiere LDIF-Datei in Adressbuch"
 msgid "Prev"
 msgstr "Vorherige"
 
-#: src/importldif.c:761 src/mainwindow.c:2230
+#: src/importldif.c:761 src/mainwindow.c:2239
 msgid "Next"
 msgstr "Nächste"
 
@@ -2554,7 +2672,8 @@ msgid "/_View/Separate f_older tree"
 msgstr "/_Ansicht/Einzelner _Ablagebaum"
 
 #: src/mainwindow.c:514
-msgid "/_View/Separate m_essage view"
+#, fuzzy
+msgid "/_View/Separate _message view"
 msgstr "/_Ansicht/Einzelne _Nachrichtenansicht"
 
 #: src/mainwindow.c:516
@@ -2690,422 +2809,340 @@ msgstr "/_Ansicht/Gehe _zu/Nächster e_tikettierter Nachricht"
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Ansicht/_Gehe zu/Anderer Ab_lage..."
 
-#: src/mainwindow.c:568 src/mainwindow.c:575 src/messageview.c:150
-msgid "/_View/_Code set/---"
-msgstr "/_Ansicht/_Zeichensatz/---"
-
-#: src/mainwindow.c:572 src/messageview.c:154
-msgid "/_View/_Code set"
-msgstr "/_Ansicht/_Zeichensatz"
-
 #: src/mainwindow.c:573 src/messageview.c:155
-msgid "/_View/_Code set/_Auto detect"
+#, fuzzy
+msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Ansicht/_Zeichensatz/_Automatikerkennung"
 
-#: src/mainwindow.c:576 src/messageview.c:158
-msgid "/_View/_Code set/7bit ascii (US-ASC_II)"
-msgstr "/_Ansicht/_Zeichensatz/7bit ascii (US-ASC_II)"
-
-#: src/mainwindow.c:579 src/messageview.c:161
-msgid "/_View/_Code set/Unicode (_UTF-8)"
-msgstr "/_Ansicht/_Zeichensatz/Unicode (_UTF-8)"
-
-#: src/mainwindow.c:582 src/messageview.c:164
-msgid "/_View/_Code set/Western European (ISO-8859-_1)"
-msgstr "/_Ansicht/_Zeichensatz/Western European (ISO-8859-_1)"
-
-#: src/mainwindow.c:584 src/messageview.c:166
-msgid "/_View/_Code set/Western European (ISO-8859-15)"
-msgstr "/_Ansicht/_Zeichensatz/Western European (ISO-8859-15)"
-
-#: src/mainwindow.c:587 src/messageview.c:169
-msgid "/_View/_Code set/Central European (ISO-8859-_2)"
-msgstr "/_Ansicht/_Zeichensatz/Central European (ISO-8859-_2)"
-
-#: src/mainwindow.c:590 src/messageview.c:172
-msgid "/_View/_Code set/_Baltic (ISO-8859-13)"
-msgstr "/_Ansicht/_Zeichensatz/_Baltic (ISO-8859-13)"
-
-#: src/mainwindow.c:592 src/messageview.c:174
-msgid "/_View/_Code set/Baltic (ISO-8859-_4)"
-msgstr "/_Ansicht/_Zeichensatz/Baltic (ISO-8859-_4)"
-
-#: src/mainwindow.c:595 src/messageview.c:177
-msgid "/_View/_Code set/Greek (ISO-8859-_7)"
-msgstr "/_Ansicht/_Zeichensatz/Greek (ISO-8859-_7)"
-
-#: src/mainwindow.c:598 src/messageview.c:180
-msgid "/_View/_Code set/Turkish (ISO-8859-_9)"
-msgstr "/_Ansicht/_Zeichensatz/Turkish (ISO-8859-_9)"
-
-#: src/mainwindow.c:601 src/messageview.c:183
-msgid "/_View/_Code set/Cyrillic (ISO-8859-_5)"
-msgstr "/_Ansicht/_Zeichensatz/Cyrillic (ISO-8859-_5)"
-
-#: src/mainwindow.c:603 src/messageview.c:185
-msgid "/_View/_Code set/Cyrillic (KOI8-_R)"
-msgstr "/_Ansicht/_Zeichensatz/Cyrillic (KOI8-_R)"
-
-#: src/mainwindow.c:605 src/messageview.c:187
-msgid "/_View/_Code set/Cyrillic (KOI8-U)"
-msgstr "/_Ansicht/_Zeichensatz/Cyrillic (KOI8-_U)"
-
-#: src/mainwindow.c:607 src/messageview.c:189
-msgid "/_View/_Code set/Cyrillic (Windows-1251)"
-msgstr "/_Ansicht/_Zeichensatz/Cyrillic (Windows-1251)"
-
-#: src/mainwindow.c:610 src/messageview.c:192
-msgid "/_View/_Code set/Japanese (ISO-2022-_JP)"
-msgstr "/_Ansicht/_Zeichensatz/Japanese (ISO-2022-_JP)"
-
-#: src/mainwindow.c:612 src/messageview.c:194
-msgid "/_View/_Code set/Japanese (ISO-2022-JP-2)"
+#: src/mainwindow.c:618 src/messageview.c:194
+#, fuzzy
+msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Ansicht/_Zeichensatz/Japanese (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:614 src/messageview.c:196
-msgid "/_View/_Code set/Japanese (_EUC-JP)"
+#: src/mainwindow.c:620 src/messageview.c:196
+#, fuzzy
+msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Ansicht/_Zeichensatz/Japanese (_EUC-JP)"
 
-#: src/mainwindow.c:616 src/messageview.c:198
-msgid "/_View/_Code set/Japanese (_Shift__JIS)"
+#: src/mainwindow.c:622 src/messageview.c:198
+#, fuzzy
+msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Ansicht/_Zeichensatz/Japanese (_Shift_JIS)"
 
-#: src/mainwindow.c:619 src/messageview.c:201
-msgid "/_View/_Code set/Simplified Chinese (_GB2312)"
-msgstr "/_Ansicht/_Zeichensatz/Simplified Chinese (_GB2312)"
-
-#: src/mainwindow.c:621 src/messageview.c:203
-msgid "/_View/_Code set/Traditional Chinese (_Big5)"
-msgstr "/_Ansicht/_Zeichensatz/Traditional Chinese (_Big5)"
-
-#: src/mainwindow.c:623 src/messageview.c:205
-msgid "/_View/_Code set/Traditional Chinese (EUC-_TW)"
-msgstr "/_Ansicht/_Zeichensatz/Traditional Chinese (EUC-_TW)"
-
-#: src/mainwindow.c:625 src/messageview.c:207
-msgid "/_View/_Code set/Chinese (ISO-2022-_CN)"
+#: src/mainwindow.c:632 src/messageview.c:207
+#, fuzzy
+msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Ansicht/_Zeichensatz/Chinese (ISO-2022-_CN)"
 
-#: src/mainwindow.c:628 src/messageview.c:210
-msgid "/_View/_Code set/Korean (EUC-_KR)"
-msgstr "/_Ansicht/_Zeichensatz/Korean (EUC-_KR)"
-
-#: src/mainwindow.c:630 src/messageview.c:212
-msgid "/_View/_Code set/Korean (ISO-2022-KR)"
+#: src/mainwindow.c:638 src/messageview.c:212
+#, fuzzy
+msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Ansicht/_Zeichensatz/Korean (ISO-2022-KR)"
 
-#: src/mainwindow.c:633 src/messageview.c:215
-msgid "/_View/_Code set/Thai (TIS-620)"
-msgstr "/_Ansicht/_Zeichensatz/Thai (TIS-620)"
-
-#: src/mainwindow.c:635 src/messageview.c:217
-msgid "/_View/_Code set/Thai (Windows-874)"
-msgstr "/_Ansicht/_Zeichensatz/Thai (Windows-874)"
-
-#: src/mainwindow.c:642 src/summaryview.c:371
+#: src/mainwindow.c:651 src/summaryview.c:371
 msgid "/_View/Open in new _window"
 msgstr "/_Ansicht/Öffnen in _neuem Fenster"
 
-#: src/mainwindow.c:643 src/messageview.c:224
+#: src/mainwindow.c:652 src/messageview.c:224
 msgid "/_View/Mess_age source"
 msgstr "/_Ansicht/Nachrichten_quelle"
 
-#: src/mainwindow.c:644 src/messageview.c:225
+#: src/mainwindow.c:653 src/messageview.c:225
 msgid "/_View/Show all _header"
 msgstr "/_Ansicht/_Zeige alle Kopfzeilen"
 
-#: src/mainwindow.c:646
+#: src/mainwindow.c:655
 msgid "/_View/_Update summary"
 msgstr "/_Ansicht/Akt_ualisiere Ablageninhalt"
 
-#: src/mainwindow.c:648 src/messageview.c:227
+#: src/mainwindow.c:657 src/messageview.c:227
 msgid "/_Message"
 msgstr "/_Nachricht"
 
-#: src/mainwindow.c:649
+#: src/mainwindow.c:658
 msgid "/_Message/Recei_ve"
 msgstr "/_Nachricht/Empfang"
 
-#: src/mainwindow.c:650
+#: src/mainwindow.c:659
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/_Nachricht/Empfang/Empfange vom aktuellen Account"
 
-#: src/mainwindow.c:652
+#: src/mainwindow.c:661
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/_Nachricht/Empfang/Empfange von _allen Accounts"
 
-#: src/mainwindow.c:654
+#: src/mainwindow.c:663
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/_Nachricht/Empfang/Empfan_g abbrechen"
 
-#: src/mainwindow.c:656
+#: src/mainwindow.c:665
 msgid "/_Message/Recei_ve/---"
 msgstr "/_Nachricht/Empfang/---"
 
-#: src/mainwindow.c:657
+#: src/mainwindow.c:666
 msgid "/_Message/_Send queued messages"
 msgstr "/_Nachricht/Sende _wartende Nachrichten"
 
-#: src/mainwindow.c:658 src/mainwindow.c:660 src/mainwindow.c:667
-#: src/mainwindow.c:672 src/mainwindow.c:676 src/mainwindow.c:685
+#: src/mainwindow.c:667 src/mainwindow.c:669 src/mainwindow.c:676
+#: src/mainwindow.c:681 src/mainwindow.c:685 src/mainwindow.c:694
 #: src/messageview.c:230 src/messageview.c:238 src/messageview.c:243
 msgid "/_Message/---"
 msgstr "/_Nachricht/---"
 
-#: src/mainwindow.c:659 src/messageview.c:228
+#: src/mainwindow.c:668 src/messageview.c:228
 msgid "/_Message/Compose _new message"
 msgstr "/_Nachricht/Verfasse n_eue Nachricht"
 
-#: src/mainwindow.c:661 src/messageview.c:231
+#: src/mainwindow.c:670 src/messageview.c:231
 msgid "/_Message/_Reply"
 msgstr "/_Nachricht/An_twort"
 
-#: src/mainwindow.c:662
+#: src/mainwindow.c:671
 msgid "/_Message/Repl_y to"
 msgstr "/_Nachricht/Ant_wort an"
 
-#: src/mainwindow.c:663 src/messageview.c:232
+#: src/mainwindow.c:672 src/messageview.c:232
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Nachricht/Ant_wort an/_Alle"
 
-#: src/mainwindow.c:664 src/messageview.c:234
+#: src/mainwindow.c:673 src/messageview.c:234
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Nachricht/Ant_wort an/Ab_sender"
 
-#: src/mainwindow.c:665 src/messageview.c:236
+#: src/mainwindow.c:674 src/messageview.c:236
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Nachricht/Ant_wort an/Mailing-_Liste"
 
-#: src/mainwindow.c:668 src/messageview.c:239
+#: src/mainwindow.c:677 src/messageview.c:239
 msgid "/_Message/_Forward"
 msgstr "/_Nachricht/We_iterleiten"
 
-#: src/mainwindow.c:669 src/messageview.c:240
+#: src/mainwindow.c:678 src/messageview.c:240
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Nachricht/Weiterleiten als An_hang"
 
-#: src/mainwindow.c:671 src/messageview.c:242
+#: src/mainwindow.c:680 src/messageview.c:242
 msgid "/_Message/Redirec_t"
 msgstr "/_Nachricht/_Umadressieren"
 
-#: src/mainwindow.c:673
+#: src/mainwindow.c:682
 msgid "/_Message/M_ove..."
 msgstr "/_Nachricht/_Verschieben..."
 
-#: src/mainwindow.c:674
+#: src/mainwindow.c:683
 msgid "/_Message/_Copy..."
 msgstr "/_Nachricht/_Kopieren..."
 
-#: src/mainwindow.c:675
+#: src/mainwindow.c:684
 msgid "/_Message/_Delete"
 msgstr "/_Nachricht/_Löschen"
 
-#: src/mainwindow.c:677
+#: src/mainwindow.c:686
 msgid "/_Message/_Mark"
 msgstr "/_Nachricht/_Markieren"
 
-#: src/mainwindow.c:678
+#: src/mainwindow.c:687
 msgid "/_Message/_Mark/_Mark"
 msgstr "/_Nachricht/_Markieren/_Markieren"
 
-#: src/mainwindow.c:679
+#: src/mainwindow.c:688
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/_Nachricht/_Markieren/Markierung _entfernen"
 
-#: src/mainwindow.c:680
+#: src/mainwindow.c:689
 msgid "/_Message/_Mark/---"
 msgstr "/_Nachricht/_Markieren/---"
 
-#: src/mainwindow.c:681
+#: src/mainwindow.c:690
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/_Nachricht/_Markieren/Als _ungelesen"
 
-#: src/mainwindow.c:682
+#: src/mainwindow.c:691
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/_Nachricht/_Markieren/Als _gelesen"
 
-#: src/mainwindow.c:684
+#: src/mainwindow.c:693
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/_Nachricht/_Markieren/Alle _als gelesen"
 
-#: src/mainwindow.c:686 src/messageview.c:244
+#: src/mainwindow.c:695 src/messageview.c:244
 msgid "/_Message/Re-_edit"
 msgstr "/_Nachricht/Wieder_bearbeiten"
 
-#: src/mainwindow.c:690 src/messageview.c:248
+#: src/mainwindow.c:699 src/messageview.c:248
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/_Werkzeug/Absender in Adress_buch einfügen"
 
-#: src/mainwindow.c:693
+#: src/mainwindow.c:702
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/_Werkzeug/Alle Nachrichten einer Ablage _filtern"
 
-#: src/mainwindow.c:695
+#: src/mainwindow.c:704
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Werkzeug/Aus_gewählte Nachrichten filtern"
 
-#: src/mainwindow.c:697 src/messageview.c:251
+#: src/mainwindow.c:706 src/messageview.c:251
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Werkzeug/Filter _erstellen"
 
-#: src/mainwindow.c:698 src/messageview.c:253
+#: src/mainwindow.c:707 src/messageview.c:253
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Werkzeug/Filter _erstellen/_Automatisch"
 
-#: src/mainwindow.c:700 src/messageview.c:255
+#: src/mainwindow.c:709 src/messageview.c:255
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Werkzeug/Filter _erstellen/nach _Von"
 
-#: src/mainwindow.c:702 src/messageview.c:257
+#: src/mainwindow.c:711 src/messageview.c:257
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Werkzeug/Filter _erstellen/nach A_n"
 
-#: src/mainwindow.c:704 src/messageview.c:259
+#: src/mainwindow.c:713 src/messageview.c:259
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Werkzeug/Filter _erstellen/nach _Betreff"
 
-#: src/mainwindow.c:709
+#: src/mainwindow.c:718
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/_Werkzeug/_Lösche mehrfach vorhandene Nachrichten"
 
-#: src/mainwindow.c:712
+#: src/mainwindow.c:721
 msgid "/_Tools/E_xecute"
 msgstr "/_Werkzeug/A_usführen"
 
-#: src/mainwindow.c:714
+#: src/mainwindow.c:723
 msgid "/_Tools/_Log window"
 msgstr "/_Werkzeug/L_ogbuch-Fenster"
 
-#: src/mainwindow.c:716
+#: src/mainwindow.c:725
 msgid "/_Configuration"
 msgstr "/_Einstellungen"
 
-#: src/mainwindow.c:717
+#: src/mainwindow.c:726
 msgid "/_Configuration/_Common preferences..."
 msgstr "/_Einstellungen/Allgemeine _Einstellungen..."
 
-#: src/mainwindow.c:719
+#: src/mainwindow.c:728
 msgid "/_Configuration/_Filter setting..."
 msgstr "/_Einstellungen/_Filtereinstellungen..."
 
-#: src/mainwindow.c:721
+#: src/mainwindow.c:730
 msgid "/_Configuration/_Template..."
 msgstr "/_Einstellungen/_Schablone..."
 
-#: src/mainwindow.c:722
+#: src/mainwindow.c:731
 msgid "/_Configuration/_Actions..."
 msgstr "/_Einstellungen/Aktionen..."
 
-#: src/mainwindow.c:723
+#: src/mainwindow.c:732
 msgid "/_Configuration/---"
 msgstr "/_Einstellungen/---"
 
-#: src/mainwindow.c:724
+#: src/mainwindow.c:733
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Einstellungen/_Einstellungen für den aktuellen Account..."
 
-#: src/mainwindow.c:726
+#: src/mainwindow.c:735
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Einstellungen/_Neuen Account erstellen..."
 
-#: src/mainwindow.c:728
+#: src/mainwindow.c:737
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Einstellungen/Accounts _bearbeiten..."
 
-#: src/mainwindow.c:730
+#: src/mainwindow.c:739
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Einstellungen/Aktuellen Account _wechseln..."
 
-#: src/mainwindow.c:734
+#: src/mainwindow.c:743
 msgid "/_Help/_Manual"
 msgstr "/_Hilfe/_Anleitung"
 
-#: src/mainwindow.c:735
+#: src/mainwindow.c:744
 msgid "/_Help/_Manual/_English"
 msgstr "/_Hilfe/Anleitung/_English"
 
-#: src/mainwindow.c:736
+#: src/mainwindow.c:745
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/_Hilfe/Anleitung/_Japanese"
 
-#: src/mainwindow.c:737
+#: src/mainwindow.c:746
 msgid "/_Help/_FAQ"
 msgstr "/_Hilfe/_FAQ"
 
-#: src/mainwindow.c:738
+#: src/mainwindow.c:747
 msgid "/_Help/_FAQ/_English"
 msgstr "/_Hilfe/_FAQ/_English"
 
-#: src/mainwindow.c:739
+#: src/mainwindow.c:748
 msgid "/_Help/_FAQ/_German"
 msgstr "/_Hilfe/_FAQ/_German"
 
-#: src/mainwindow.c:740
+#: src/mainwindow.c:749
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/_Hilfe/_FAQ/_Spanish"
 
-#: src/mainwindow.c:741
+#: src/mainwindow.c:750
 msgid "/_Help/_FAQ/_French"
 msgstr "/_Hilfe/_FAQ/_French"
 
-#: src/mainwindow.c:742
+#: src/mainwindow.c:751
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/_Hilfe/_FAQ/_Italian"
 
-#: src/mainwindow.c:743
+#: src/mainwindow.c:752
 msgid "/_Help/---"
 msgstr "/_Hilfe/---"
 
-#: src/mainwindow.c:783
+#: src/mainwindow.c:792
 msgid "Creating main window...\n"
 msgstr "Erstelle Hauptfenster...\n"
 
-#: src/mainwindow.c:943
+#: src/mainwindow.c:952
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Haupt-Fenster: Bereitstellung von Farbe %d fehlgeschlagen\n"
 
-#: src/mainwindow.c:1021 src/summaryview.c:1368 src/summaryview.c:1677
+#: src/mainwindow.c:1030 src/summaryview.c:1368 src/summaryview.c:1677
 #: src/summaryview.c:1785 src/summaryview.c:1831 src/summaryview.c:2453
 #: src/summaryview.c:3080 src/summaryview.c:3146 src/summaryview.c:3171
 #: src/summaryview.c:3284
 msgid "done.\n"
 msgstr "Fertig.\n"
 
-#: src/mainwindow.c:1137 src/mainwindow.c:1178 src/mainwindow.c:1206
+#: src/mainwindow.c:1146 src/mainwindow.c:1187 src/mainwindow.c:1215
 msgid "Untitled"
 msgstr "Unbenannt"
 
-#: src/mainwindow.c:1207
+#: src/mainwindow.c:1216
 msgid "none"
 msgstr "nicht"
 
-#: src/mainwindow.c:1257
+#: src/mainwindow.c:1266
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "Wechsle Fenstertrennungstyp von %d zu %d\n"
 
-#: src/mainwindow.c:1477
+#: src/mainwindow.c:1486
 msgid "Offline"
 msgstr "Verbindungslos"
 
-#: src/mainwindow.c:1478
+#: src/mainwindow.c:1487
 msgid "You are offline. Go online?"
 msgstr "Sie sind nicht verbunden. Verbinden?"
 
-#: src/mainwindow.c:1492
+#: src/mainwindow.c:1501
 msgid "Empty all trash"
 msgstr "Leere alle Papierkörbe"
 
-#: src/mainwindow.c:1493
+#: src/mainwindow.c:1502
 msgid "Empty messages in all trash?"
 msgstr "Lösche alle Nachrichten in allen Papierkörben?"
 
-#: src/mainwindow.c:1521
+#: src/mainwindow.c:1530
 msgid "Add mailbox"
 msgstr "Neue Mailbox"
 
-#: src/mainwindow.c:1522
+#: src/mainwindow.c:1531
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3115,16 +3152,16 @@ msgstr ""
 "Wenn die existierende Mailbox angegeben wird, wird\n"
 "sie automatisch durchsucht."
 
-#: src/mainwindow.c:1528
+#: src/mainwindow.c:1537
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Die Mailbox `%s' existiert bereits."
 
-#: src/mainwindow.c:1533 src/setup.c:57
+#: src/mainwindow.c:1542 src/setup.c:57
 msgid "Mailbox"
 msgstr "Mailbox"
 
-#: src/mainwindow.c:1539 src/setup.c:63
+#: src/mainwindow.c:1548 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3133,141 +3170,141 @@ msgstr ""
 "Erstellen der Mailbox fehlgeschlagen.\n"
 "Vielleicht existieren einige Dateien, oder Sie haben keine Schreibrechte"
 
-#: src/mainwindow.c:1912
+#: src/mainwindow.c:1921
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Ablagenansicht"
 
-#: src/mainwindow.c:1932 src/messageview.c:358
+#: src/mainwindow.c:1941 src/messageview.c:358
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Nachrichtenansicht"
 
-#: src/mainwindow.c:2079 src/summaryview.c:340
+#: src/mainwindow.c:2088 src/summaryview.c:340
 msgid "/_Reply"
 msgstr "/An_twort"
 
-#: src/mainwindow.c:2080
+#: src/mainwindow.c:2089
 msgid "/Reply to _all"
 msgstr "/Antwort an alle"
 
-#: src/mainwindow.c:2081
+#: src/mainwindow.c:2090
 msgid "/Reply to _sender"
 msgstr "/Ant_wort an Ab_sender"
 
-#: src/mainwindow.c:2082
+#: src/mainwindow.c:2091
 msgid "/Reply to mailing _list"
 msgstr "/Antwort an Mailing-_Liste"
 
-#: src/mainwindow.c:2087 src/summaryview.c:347
+#: src/mainwindow.c:2096 src/summaryview.c:347
 msgid "/_Forward"
 msgstr "/_Weiterleiten"
 
-#: src/mainwindow.c:2088 src/summaryview.c:348
+#: src/mainwindow.c:2097 src/summaryview.c:348
 msgid "/For_ward as attachment"
 msgstr "/Weiterleiten als An_hang"
 
-#: src/mainwindow.c:2089 src/summaryview.c:349
+#: src/mainwindow.c:2098 src/summaryview.c:349
 msgid "/Redirec_t"
 msgstr "/_Umadressieren"
 
-#: src/mainwindow.c:2125
+#: src/mainwindow.c:2134
 msgid "Get"
 msgstr "Holen"
 
-#: src/mainwindow.c:2126
+#: src/mainwindow.c:2135
 msgid "Incorporate new mail"
 msgstr "Neue E-Mail aufnehmen"
 
-#: src/mainwindow.c:2133
+#: src/mainwindow.c:2142
 msgid "Get all"
 msgstr "Hole alle"
 
-#: src/mainwindow.c:2134
+#: src/mainwindow.c:2143
 msgid "Incorporate new mail of all accounts"
 msgstr "Neue E-Mail aller Accounts aufnehmen"
 
-#: src/mainwindow.c:2145
+#: src/mainwindow.c:2154
 msgid "Send queued message(s)"
 msgstr "Senden wartender Nachrichten"
 
-#: src/mainwindow.c:2155 src/prefs_account.c:705 src/prefs_common.c:852
+#: src/mainwindow.c:2164 src/prefs_account.c:705 src/prefs_common.c:852
 #: src/prefs_folder_item.c:137
 msgid "Compose"
 msgstr "Verfassen"
 
-#: src/mainwindow.c:2156
+#: src/mainwindow.c:2165
 msgid "Compose new message"
 msgstr "Neue Nachricht verfassen"
 
-#: src/mainwindow.c:2164 src/prefs_common.c:1353
+#: src/mainwindow.c:2173 src/prefs_common.c:1365
 msgid "Reply"
 msgstr "Antwort"
 
-#: src/mainwindow.c:2165 src/mainwindow.c:2178
+#: src/mainwindow.c:2174 src/mainwindow.c:2187
 msgid "Reply to the message"
 msgstr "Nachricht beantworten"
 
-#: src/mainwindow.c:2183
+#: src/mainwindow.c:2192
 msgid "Reply all"
 msgstr "Alle beantworten"
 
-#: src/mainwindow.c:2184
+#: src/mainwindow.c:2193
 msgid "Reply to all"
 msgstr "Antwort an alle"
 
-#: src/mainwindow.c:2192 src/prefs_filter_edit.c:719
+#: src/mainwindow.c:2201 src/prefs_filter_edit.c:719
 msgid "Forward"
 msgstr "Weiterleiten"
 
-#: src/mainwindow.c:2193 src/mainwindow.c:2206
+#: src/mainwindow.c:2202 src/mainwindow.c:2215
 msgid "Forward the message"
 msgstr "Nachricht weiterleiten"
 
-#: src/mainwindow.c:2213
+#: src/mainwindow.c:2222
 msgid "Delete the message"
 msgstr "Nachricht löschen"
 
-#: src/mainwindow.c:2221
+#: src/mainwindow.c:2230
 msgid "Execute"
 msgstr "Ausführen"
 
-#: src/mainwindow.c:2222
+#: src/mainwindow.c:2231
 msgid "Execute marked process"
 msgstr "Markierten Prozess ausführen"
 
-#: src/mainwindow.c:2231
+#: src/mainwindow.c:2240
 msgid "Next unread message"
 msgstr "Nächste ungelesene Nachricht"
 
-#: src/mainwindow.c:2242
+#: src/mainwindow.c:2251
 msgid "Prefs"
 msgstr "Einstellungen"
 
-#: src/mainwindow.c:2243
+#: src/mainwindow.c:2252
 msgid "Common preferences"
 msgstr "Allgemeine Einstellungen"
 
-#: src/mainwindow.c:2250 src/prefs_folder_item.c:258
+#: src/mainwindow.c:2259 src/prefs_folder_item.c:258
 #: src/prefs_folder_item.c:269 src/progressdialog.c:50
 msgid "Account"
 msgstr "Account"
 
-#: src/mainwindow.c:2251
+#: src/mainwindow.c:2260
 msgid "Account setting"
 msgstr "Accounteinstellungen"
 
-#: src/mainwindow.c:2425
+#: src/mainwindow.c:2434
 msgid "You are offline. Click the icon to go online."
 msgstr "Sie sind nicht verbunden. Wählen sie das Bild zum Verbinden."
 
-#: src/mainwindow.c:2436
+#: src/mainwindow.c:2445
 msgid "You are online. Click the icon to go offline."
 msgstr "Sie sind verbunden. Wählen sie das Bild, um die Verbindung zu beenden."
 
-#: src/mainwindow.c:2624
+#: src/mainwindow.c:2633
 msgid "Exit"
 msgstr "Beenden"
 
-#: src/mainwindow.c:2624
+#: src/mainwindow.c:2633
 msgid "Exit this program?"
 msgstr "Beenden des Programms?"
 
@@ -3393,7 +3430,7 @@ msgstr "Suche beendet"
 msgid "Creating message view...\n"
 msgstr "Erstelle Nachrichtenansicht...\n"
 
-#: src/messageview.c:303 src/prefs_common.c:1550
+#: src/messageview.c:303 src/prefs_common.c:1562
 msgid "Text"
 msgstr "Text"
 
@@ -3406,7 +3443,7 @@ msgstr "Anhänge"
 msgid "Can't save the file `%s'."
 msgstr "Kann Datei `%s' nicht speichern."
 
-#: src/messageview.c:697 src/prefs_common.c:2154 src/summaryview.c:2744
+#: src/messageview.c:697 src/prefs_common.c:2166 src/summaryview.c:2744
 msgid "Print"
 msgstr "Drucken"
 
@@ -3879,7 +3916,7 @@ msgstr "(Ungefilterte Nachrichten werden in dieser Ablage gespeichert)"
 msgid "Authentication method"
 msgstr "Beglaubigungsmethode"
 
-#: src/prefs_account.c:1123 src/prefs_account.c:1239 src/prefs_common.c:1189
+#: src/prefs_account.c:1123 src/prefs_account.c:1239 src/prefs_common.c:1201
 msgid "Automatic"
 msgstr "Automatisch"
 
@@ -3904,7 +3941,7 @@ msgstr "Erzeuge Nachrichten-ID"
 msgid "Add user-defined header"
 msgstr "Füge benutzerdefinierte Kopfzeile ein"
 
-#: src/prefs_account.c:1196 src/prefs_common.c:1714 src/prefs_common.c:1739
+#: src/prefs_account.c:1196 src/prefs_common.c:1726 src/prefs_common.c:1751
 msgid " Edit... "
 msgstr " Bearbeiten... "
 
@@ -4297,106 +4334,107 @@ msgid "Save sent messages to outbox"
 msgstr "Gesendete Nachrichten in Gesendet-Ablage speichern"
 
 #: src/prefs_common.c:1113
-msgid "Outgoing codeset"
+#, fuzzy
+msgid "Outgoing encoding"
 msgstr "Ausgehender Zeichensatz"
 
 #: src/prefs_common.c:1128
 msgid "Automatic (Recommended)"
 msgstr "Automatisch (Empfohlen)"
 
-#: src/prefs_common.c:1129
+#: src/prefs_common.c:1130
 msgid "7bit ascii (US-ASCII)"
 msgstr "7bit ascii (US-ASCII)"
 
-#: src/prefs_common.c:1130
+#: src/prefs_common.c:1132
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
-#: src/prefs_common.c:1131
+#: src/prefs_common.c:1134
 msgid "Western European (ISO-8859-1)"
 msgstr "Western European (ISO-8859-1)"
 
-#: src/prefs_common.c:1132
+#: src/prefs_common.c:1135
 msgid "Western European (ISO-8859-15)"
 msgstr "Western European (ISO-8859-15"
 
-#: src/prefs_common.c:1133
+#: src/prefs_common.c:1137
 msgid "Central European (ISO-8859-2)"
 msgstr "Central European (ISO-8859-2)"
 
-#: src/prefs_common.c:1134
+#: src/prefs_common.c:1139
 msgid "Baltic (ISO-8859-13)"
 msgstr "Baltic (ISO-8859-13)"
 
-#: src/prefs_common.c:1135
+#: src/prefs_common.c:1140
 msgid "Baltic (ISO-8859-4)"
 msgstr "Baltic (ISO-8859-4)"
 
-#: src/prefs_common.c:1136
+#: src/prefs_common.c:1142
 msgid "Greek (ISO-8859-7)"
 msgstr "Greek (ISO-8859-7)"
 
-#: src/prefs_common.c:1137
+#: src/prefs_common.c:1144
 msgid "Turkish (ISO-8859-9)"
 msgstr "Turkish (ISO-8859-9)"
 
-#: src/prefs_common.c:1138
+#: src/prefs_common.c:1146
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Cyrillic (ISO-8859-5)"
 
-#: src/prefs_common.c:1139
+#: src/prefs_common.c:1147
 msgid "Cyrillic (KOI8-R)"
 msgstr "Cyrillic (KOI8-R)"
 
-#: src/prefs_common.c:1140
-msgid "Cyrillic (Windows-1251)"
-msgstr "Cyrillic (Windows-1251)"
-
-#: src/prefs_common.c:1141
+#: src/prefs_common.c:1148
 msgid "Cyrillic (KOI8-U)"
 msgstr "Cyrillic (KOI8-U)"
 
-#: src/prefs_common.c:1142
+#: src/prefs_common.c:1149
+msgid "Cyrillic (Windows-1251)"
+msgstr "Cyrillic (Windows-1251)"
+
+#: src/prefs_common.c:1151
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Japanese (ISO-2022-JP)"
 
-#: src/prefs_common.c:1144
+#: src/prefs_common.c:1153
 msgid "Japanese (EUC-JP)"
 msgstr "Japanese (EUC-JP)"
 
-#: src/prefs_common.c:1145
+#: src/prefs_common.c:1154
 msgid "Japanese (Shift_JIS)"
 msgstr "Japanese (Shift_JIS)"
 
-#: src/prefs_common.c:1147
+#: src/prefs_common.c:1157
 msgid "Simplified Chinese (GB2312)"
 msgstr "Simplified Chinese (GB2312)"
 
-#: src/prefs_common.c:1148
+#: src/prefs_common.c:1158
 msgid "Traditional Chinese (Big5)"
 msgstr "Traditional Chinese (Big5)"
 
-#: src/prefs_common.c:1150
+#: src/prefs_common.c:1160
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Traditional Chinese (EUC-TW)"
 
-#: src/prefs_common.c:1151
+#: src/prefs_common.c:1161
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Chinese (ISO-2022-CN)"
 
-#: src/prefs_common.c:1153
+#: src/prefs_common.c:1164
 msgid "Korean (EUC-KR)"
 msgstr "Korean (EUC-KR)"
 
-#: src/prefs_common.c:1154
+#: src/prefs_common.c:1166
 msgid "Thai (TIS-620)"
 msgstr "Thai (TIS-620)"
 
-#: src/prefs_common.c:1155
+#: src/prefs_common.c:1167
 msgid "Thai (Windows-874)"
 msgstr "Thai (Windows-874)"
 
-#: src/prefs_common.c:1165
+#: src/prefs_common.c:1177
 msgid ""
 "If `Automatic' is selected, the optimal encoding for the current locale will "
 "be used."
@@ -4404,11 +4442,11 @@ msgstr ""
 "Wenn `Automatisch' gewählt ist, wird die optimale\n"
 "Zeichensatzkodierung für die aktuelle Locale-Einstellung benutzt."
 
-#: src/prefs_common.c:1179
+#: src/prefs_common.c:1191
 msgid "Transfer encoding"
 msgstr "Übertragungscodierung"
 
-#: src/prefs_common.c:1202
+#: src/prefs_common.c:1214
 msgid ""
 "Specify Content-Transfer-Encoding used when message body contains non-ASCII "
 "characters."
@@ -4416,118 +4454,118 @@ msgstr ""
 "Geben Sie die Inhalt-Übertragungs-Kodierung (Content-Transfer-Encoding) an\n"
 "die benutzt werden soll, wenn die Nachricht Nicht-ASCII-Zeichen enthält."
 
-#: src/prefs_common.c:1272
+#: src/prefs_common.c:1284
 msgid "Signature separator"
 msgstr "Unterschriftentrenner"
 
-#: src/prefs_common.c:1281
+#: src/prefs_common.c:1293
 msgid "Insert automatically"
 msgstr "Automatisch einfügen"
 
-#: src/prefs_common.c:1291
+#: src/prefs_common.c:1303
 msgid "Automatically launch the external editor"
 msgstr "Starte externen Editor automatisch"
 
-#: src/prefs_common.c:1301
+#: src/prefs_common.c:1313
 msgid "Undo level"
 msgstr "Stufen der Rückgängigmachung"
 
-#: src/prefs_common.c:1321
+#: src/prefs_common.c:1333
 msgid "Wrap messages at"
 msgstr "Zeilenumbruch nach"
 
-#: src/prefs_common.c:1333
+#: src/prefs_common.c:1345
 msgid "characters"
 msgstr "Zeichen"
 
-#: src/prefs_common.c:1343
+#: src/prefs_common.c:1355
 msgid "Wrap quotation"
 msgstr "Zitat umbrechen"
 
-#: src/prefs_common.c:1349
+#: src/prefs_common.c:1361
 msgid "Wrap on input"
 msgstr "Bei der Eingabe umbrechen"
 
-#: src/prefs_common.c:1351
+#: src/prefs_common.c:1363
 msgid "Wrap before sending"
 msgstr "Zeilenumbruch vor dem Senden"
 
-#: src/prefs_common.c:1361
+#: src/prefs_common.c:1373
 msgid "Automatically select account for replies"
 msgstr "Wähle automatisch den Account für die Antworten"
 
-#: src/prefs_common.c:1363
+#: src/prefs_common.c:1375
 msgid "Quote message when replying"
 msgstr "Zitiere Nachricht in der Antwort"
 
-#: src/prefs_common.c:1365
+#: src/prefs_common.c:1377
 msgid "Reply button invokes mailing list reply"
 msgstr "Antwort-Knopf führt Antwort an Mailing-Liste aus"
 
 #. reply
-#: src/prefs_common.c:1411
+#: src/prefs_common.c:1423
 msgid "Reply format"
 msgstr "Antwort-Format"
 
-#: src/prefs_common.c:1426 src/prefs_common.c:1468
+#: src/prefs_common.c:1438 src/prefs_common.c:1480
 msgid "Quotation mark"
 msgstr "Zitatzeichen"
 
 #. forward
-#: src/prefs_common.c:1453
+#: src/prefs_common.c:1465
 msgid "Forward format"
 msgstr "Weiterleiten-Format"
 
-#: src/prefs_common.c:1500
+#: src/prefs_common.c:1512
 msgid " Description of symbols "
 msgstr " Beschreibung der Symbole "
 
-#: src/prefs_common.c:1541
+#: src/prefs_common.c:1553
 msgid "Font"
 msgstr "Schriftart"
 
-#: src/prefs_common.c:1573
+#: src/prefs_common.c:1585
 msgid "Translate header name (such as `From:', `Subject:')"
 msgstr "Übersetze Kopfzeilennamen (wie `Von:', `Betreff:')"
 
-#: src/prefs_common.c:1576
+#: src/prefs_common.c:1588
 msgid "Display unread number next to folder name"
 msgstr "Zeige Anzahl der ungelesenen E-Mails nach Ablagenname"
 
-#: src/prefs_common.c:1585
+#: src/prefs_common.c:1597
 msgid "Abbreviate newsgroups longer than"
 msgstr "Kürze Newsgroups länger als"
 
-#: src/prefs_common.c:1600
+#: src/prefs_common.c:1612
 msgid "letters"
 msgstr "Zeichen"
 
 #. ---- Summary ----
-#: src/prefs_common.c:1606
+#: src/prefs_common.c:1618
 msgid "Summary View"
 msgstr "Ablageninhaltsansicht"
 
-#: src/prefs_common.c:1615
+#: src/prefs_common.c:1627
 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.c:1617
+#: src/prefs_common.c:1629
 msgid "Expand threads"
 msgstr "Threads entfalten"
 
-#: src/prefs_common.c:1625 src/prefs_common.c:2443 src/prefs_common.c:2481
+#: src/prefs_common.c:1637 src/prefs_common.c:2455 src/prefs_common.c:2493
 msgid "Date format"
 msgstr "Datumsformat"
 
-#: src/prefs_common.c:1646
+#: src/prefs_common.c:1658
 msgid " Set display item of summary... "
 msgstr " Setze Ablageninhalt-Einträge... "
 
-#: src/prefs_common.c:1710
+#: src/prefs_common.c:1722
 msgid "Enable coloration of message"
 msgstr "Benutze Farben für Nachrichten"
 
-#: src/prefs_common.c:1724
+#: src/prefs_common.c:1736
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
@@ -4535,324 +4573,324 @@ msgstr ""
 "Stelle Mehr-byte Alphabet und Zahlen als\n"
 "ASCII-Zeichen dar (nur Japanisch)"
 
-#: src/prefs_common.c:1730
+#: src/prefs_common.c:1742
 msgid "Display header pane above message view"
 msgstr "Zeige Kopfzeilenleiste über Nachrichtenansicht"
 
-#: src/prefs_common.c:1737
+#: src/prefs_common.c:1749
 msgid "Display short headers on message view"
 msgstr "Zeige kurze Kopfzeilen in der Nachrichtenansicht"
 
-#: src/prefs_common.c:1758
+#: src/prefs_common.c:1770
 msgid "Line space"
 msgstr "Zeilenabstand"
 
-#: src/prefs_common.c:1772 src/prefs_common.c:1810
+#: src/prefs_common.c:1784 src/prefs_common.c:1822
 msgid "pixel(s)"
 msgstr "Pixel"
 
-#: src/prefs_common.c:1777
+#: src/prefs_common.c:1789
 msgid "Scroll"
 msgstr "Scroll"
 
-#: src/prefs_common.c:1784
+#: src/prefs_common.c:1796
 msgid "Half page"
 msgstr "Halbe Seite"
 
-#: src/prefs_common.c:1790
+#: src/prefs_common.c:1802
 msgid "Smooth scroll"
 msgstr "Fließendes Scrollen"
 
-#: src/prefs_common.c:1796
+#: src/prefs_common.c:1808
 msgid "Step"
 msgstr "Schritt"
 
-#: src/prefs_common.c:1816
+#: src/prefs_common.c:1828
 msgid "Images"
 msgstr "Bilder"
 
-#: src/prefs_common.c:1824
+#: src/prefs_common.c:1836
 msgid "Resize attached large images to fit in the window"
 msgstr "Größe angehängter Bilder in das Fenster einpassen"
 
-#: src/prefs_common.c:1826
+#: src/prefs_common.c:1838
 msgid "Display images as inline"
 msgstr "Anzeige Bilder eingebettet an"
 
-#: src/prefs_common.c:1871
+#: src/prefs_common.c:1883
 msgid "Automatically check signatures"
 msgstr "Überprüfe digitale Unterschriften automatisch"
 
-#: src/prefs_common.c:1874
+#: src/prefs_common.c:1886
 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.c:1877
+#: src/prefs_common.c:1889
 msgid "Store passphrase in memory temporarily"
 msgstr "Mantra zeitweise speichern"
 
-#: src/prefs_common.c:1892
+#: src/prefs_common.c:1904
 msgid "Expired after"
 msgstr "Läuft aus nach"
 
-#: src/prefs_common.c:1905
+#: src/prefs_common.c:1917
 msgid "minute(s) "
 msgstr "Minute(n)"
 
-#: src/prefs_common.c:1918
+#: src/prefs_common.c:1930
 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.c:1932
+#: src/prefs_common.c:1944
 msgid "Grab input while entering a passphrase"
 msgstr "Eingabe sperren, bei der Eingabe eines Mantra"
 
-#: src/prefs_common.c:1937
+#: src/prefs_common.c:1949
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "Zeige Warnung beim Start, wenn GnuPG nicht funktioniert"
 
-#: src/prefs_common.c:1989
+#: src/prefs_common.c:2001
 msgid "Always open messages in summary when selected"
 msgstr "Nachrichten immer öffnen, wenn in der Ablageninhaltsansich ausgewählt"
 
-#: src/prefs_common.c:1993
+#: src/prefs_common.c:2005
 msgid "Open first unread message when entering a folder"
 msgstr "Erste Nachricht anzeigen beim Öffnen einer Ablage"
 
-#: src/prefs_common.c:1997
+#: src/prefs_common.c:2009
 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.c:2001
+#: src/prefs_common.c:2013
 msgid "Go to inbox after receiving new mail"
 msgstr "Zum Posteingang wechseln, nach dem Empfang neuer E-Mail"
 
-#: src/prefs_common.c:2009
+#: src/prefs_common.c:2021
 msgid "Execute immediately when moving or deleting messages"
 msgstr "Sofort Ausführen beim Bewegen oder Löschen von Nachrichten"
 
-#: src/prefs_common.c:2021
+#: src/prefs_common.c:2033
 msgid "Messages will be marked until execution if this is turned off."
 msgstr ""
 "(Nachricht wird markiert bis zur Ausführung,\n"
 " wenn das ausgeschaltet ist)"
 
-#: src/prefs_common.c:2029
+#: src/prefs_common.c:2041
 msgid "Receive dialog"
 msgstr "Empfangen-Dialog"
 
-#: src/prefs_common.c:2039
+#: src/prefs_common.c:2051
 msgid "Show receive dialog"
 msgstr "Zeige Empfangen-Dialog"
 
-#: src/prefs_common.c:2049
+#: src/prefs_common.c:2061
 msgid "Always"
 msgstr "Immer"
 
-#: src/prefs_common.c:2050
+#: src/prefs_common.c:2062
 msgid "Only on manual receiving"
 msgstr "Nur bei manuellem Empfang"
 
-#: src/prefs_common.c:2052
+#: src/prefs_common.c:2064
 msgid "Never"
 msgstr "Nie"
 
-#: src/prefs_common.c:2057
+#: src/prefs_common.c:2069
 msgid "Don't popup error dialog on receive error"
 msgstr "Keinen Fehler-Dialog bei Empfangsfehlern erscheinen lassen"
 
-#: src/prefs_common.c:2060
+#: src/prefs_common.c:2072
 msgid "Close receive dialog when finished"
 msgstr "Empfangen-Dialog schließen nach Beendigung"
 
-#: src/prefs_common.c:2066
+#: src/prefs_common.c:2078
 msgid " Set key bindings... "
 msgstr " Tastenkombinationen wählen... "
 
-#: src/prefs_common.c:2122
+#: src/prefs_common.c:2134
 #, 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.c:2131
+#: src/prefs_common.c:2143
 msgid "Web browser"
 msgstr "Internet-Browser"
 
-#: src/prefs_common.c:2195
+#: src/prefs_common.c:2207
 msgid "Add address to destination when double-clicked"
 msgstr "Adresse bei Doppel-Klick ins Ziel einfügen"
 
-#: src/prefs_common.c:2197
+#: src/prefs_common.c:2209
 msgid "On exit"
 msgstr "Beim Beenden"
 
-#: src/prefs_common.c:2205
+#: src/prefs_common.c:2217
 msgid "Confirm on exit"
 msgstr "Nachfragen beim Beenden"
 
-#: src/prefs_common.c:2212
+#: src/prefs_common.c:2224
 msgid "Empty trash on exit"
 msgstr "Leere Papierkorb beim Beenden"
 
-#: src/prefs_common.c:2214
+#: src/prefs_common.c:2226
 msgid "Ask before emptying"
 msgstr "Fragen vor dem Leeren"
 
-#: src/prefs_common.c:2218
+#: src/prefs_common.c:2230
 msgid "Warn if there are queued messages"
 msgstr "Warnen, wenn wartende Nachrichten vorhanden"
 
-#: src/prefs_common.c:2224
+#: src/prefs_common.c:2236
 msgid "Socket I/O timeout:"
 msgstr "Socket I/O timeout:"
 
-#: src/prefs_common.c:2237
+#: src/prefs_common.c:2249
 msgid "second(s)"
 msgstr "Sekunde(n)"
 
-#: src/prefs_common.c:2419
+#: src/prefs_common.c:2431
 msgid "the full abbreviated weekday name"
 msgstr "gekürzter Wochentagsname"
 
-#: src/prefs_common.c:2420
+#: src/prefs_common.c:2432
 msgid "the full weekday name"
 msgstr "Wochentagsname"
 
-#: src/prefs_common.c:2421
+#: src/prefs_common.c:2433
 msgid "the abbreviated month name"
 msgstr "gekürzter Monatsname"
 
-#: src/prefs_common.c:2422
+#: src/prefs_common.c:2434
 msgid "the full month name"
 msgstr "Monatsname"
 
-#: src/prefs_common.c:2423
+#: src/prefs_common.c:2435
 msgid "the preferred date and time for the current locale"
 msgstr "bevorzugtes Datums- und Zeitformat für die aktuelle Locale-Einstellung"
 
-#: src/prefs_common.c:2424
+#: src/prefs_common.c:2436
 msgid "the century number (year/100)"
 msgstr "Jahrhundert (Jahr/100)"
 
-#: src/prefs_common.c:2425
+#: src/prefs_common.c:2437
 msgid "the day of the month as a decimal number"
 msgstr "Tag des Monats als Zahl"
 
-#: src/prefs_common.c:2426
+#: src/prefs_common.c:2438
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "Stunde als Zahl (24h Anzeige)"
 
-#: src/prefs_common.c:2427
+#: src/prefs_common.c:2439
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "Stunde als Zahl (12h Anzeige)"
 
-#: src/prefs_common.c:2428
+#: src/prefs_common.c:2440
 msgid "the day of the year as a decimal number"
 msgstr "Tag des Jahres als Zahl"
 
-#: src/prefs_common.c:2429
+#: src/prefs_common.c:2441
 msgid "the month as a decimal number"
 msgstr "Monat als Zahl"
 
-#: src/prefs_common.c:2430
+#: src/prefs_common.c:2442
 msgid "the minute as a decimal number"
 msgstr "Minute als Zahl"
 
-#: src/prefs_common.c:2431
+#: src/prefs_common.c:2443
 msgid "either AM or PM"
 msgstr "entweder AM oder PM"
 
-#: src/prefs_common.c:2432
+#: src/prefs_common.c:2444
 msgid "the second as a decimal number"
 msgstr "Sekunde als Zahl"
 
-#: src/prefs_common.c:2433
+#: src/prefs_common.c:2445
 msgid "the day of the week as a decimal number"
 msgstr "Wochentag als Zahl"
 
-#: src/prefs_common.c:2434
+#: src/prefs_common.c:2446
 msgid "the preferred date for the current locale"
 msgstr "bevorzugtes Datumsformat für die aktuelle Locale-Einstellung"
 
-#: src/prefs_common.c:2435
+#: src/prefs_common.c:2447
 msgid "the last two digits of a year"
 msgstr "letzten beiden Stellen des Jahres"
 
-#: src/prefs_common.c:2436
+#: src/prefs_common.c:2448
 msgid "the year as a decimal number"
 msgstr "Jahr als Zahl"
 
-#: src/prefs_common.c:2437
+#: src/prefs_common.c:2449
 msgid "the time zone or name or abbreviation"
 msgstr "Zeitzone oder Name oder Abkürzung"
 
-#: src/prefs_common.c:2458
+#: src/prefs_common.c:2470
 msgid "Specifier"
 msgstr "Steuerzeichen"
 
-#: src/prefs_common.c:2459
+#: src/prefs_common.c:2471
 msgid "Description"
 msgstr "Beschreibung"
 
-#: src/prefs_common.c:2499
+#: src/prefs_common.c:2511
 msgid "Example"
 msgstr "Beispiel"
 
-#: src/prefs_common.c:2580
+#: src/prefs_common.c:2592
 msgid "Set message colors"
 msgstr "Setze Nachrichtenfarbe"
 
-#: src/prefs_common.c:2588
+#: src/prefs_common.c:2600
 msgid "Colors"
 msgstr "Farben"
 
-#: src/prefs_common.c:2622
+#: src/prefs_common.c:2634
 msgid "Quoted Text - First Level"
 msgstr "Zitierter Text - Erste Ebene"
 
-#: src/prefs_common.c:2628
+#: src/prefs_common.c:2640
 msgid "Quoted Text - Second Level"
 msgstr "Zitierter Text - Zweite Ebene"
 
-#: src/prefs_common.c:2634
+#: src/prefs_common.c:2646
 msgid "Quoted Text - Third Level"
 msgstr "Zitierter Text - Dritte Ebene"
 
-#: src/prefs_common.c:2640
+#: src/prefs_common.c:2652
 msgid "URI link"
 msgstr "URI-Link"
 
-#: src/prefs_common.c:2647
+#: src/prefs_common.c:2659
 msgid "Recycle quote colors"
 msgstr "Stelle Zitatfarben wiederher"
 
-#: src/prefs_common.c:2707
+#: src/prefs_common.c:2719
 msgid "Pick color for quotation level 1"
 msgstr "Wähle Farbe für Zitatebene 1"
 
-#: src/prefs_common.c:2710
+#: src/prefs_common.c:2722
 msgid "Pick color for quotation level 2"
 msgstr "Wähle Farbe für Zitatebene 2"
 
-#: src/prefs_common.c:2713
+#: src/prefs_common.c:2725
 msgid "Pick color for quotation level 3"
 msgstr "Wähle Farbe für Zitatebene 3"
 
-#: src/prefs_common.c:2716
+#: src/prefs_common.c:2728
 msgid "Pick color for URI"
 msgstr "Wähle Farbe für URI"
 
-#: src/prefs_common.c:2853
+#: src/prefs_common.c:2865
 msgid "Description of symbols"
 msgstr "Beschreibung der Symbole"
 
-#: src/prefs_common.c:2909
+#: src/prefs_common.c:2921
 msgid ""
 "Date\n"
 "From\n"
@@ -4876,11 +4914,11 @@ msgstr ""
 "News-Gruppen\n"
 "Nachrichten-ID"
 
-#: src/prefs_common.c:2922
+#: src/prefs_common.c:2934
 msgid "If x is set, displays expr"
 msgstr "Wenn x gesetzt ist, zeige expr"
 
-#: src/prefs_common.c:2926
+#: src/prefs_common.c:2938
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -4894,7 +4932,7 @@ msgstr ""
 "Zitierter Nachrichteninhalt ohne Unterschrift\n"
 "Wörtlich %"
 
-#: src/prefs_common.c:2934
+#: src/prefs_common.c:2946
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -4906,15 +4944,15 @@ msgstr ""
 "öffnende Klammer\n"
 "schließende Klammer"
 
-#: src/prefs_common.c:2971
+#: src/prefs_common.c:2983
 msgid "Font selection"
 msgstr "Schriftauswahl"
 
-#: src/prefs_common.c:3035
+#: src/prefs_common.c:3047
 msgid "Key bindings"
 msgstr "Tastenkombinationen"
 
-#: src/prefs_common.c:3049
+#: src/prefs_common.c:3061
 msgid ""
 "Select the preset of key bindings.\n"
 "You can also modify each menu's shortcuts by pressing\n"
@@ -4925,11 +4963,11 @@ msgstr ""
 "Menüeintrag\n"
 "ist, können Sie die Abkürzungstastenkombination jedes Menüeintrags ändern."
 
-#: src/prefs_common.c:3061 src/prefs_common.c:3410
+#: src/prefs_common.c:3073 src/prefs_common.c:3422
 msgid "Default"
 msgstr "Standard"
 
-#: src/prefs_common.c:3064 src/prefs_common.c:3419
+#: src/prefs_common.c:3076 src/prefs_common.c:3431
 msgid "Old Sylpheed"
 msgstr "Altes Sylpheed"
 
@@ -6089,6 +6127,12 @@ msgstr "%.2fGB"
 msgid "writing to %s failed.\n"
 msgstr "Schreiben in %s fehlgeschlagen.\n"
 
+#~ msgid "/_View/_Code set/---"
+#~ msgstr "/_Ansicht/_Zeichensatz/---"
+
+#~ msgid "/_View/_Code set"
+#~ msgstr "/_Ansicht/_Zeichensatz"
+
 #~ msgid "To save this part, pop up the context menu with "
 #~ msgstr "Zum Speichern dieses Teiles, öffnen Sie das Kontextmenü mit der "
 
diff --git a/po/el.po b/po/el.po
index 429bb7c0..920937bb 100644
--- a/po/el.po
+++ b/po/el.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-03-15 14:29+0900\n"
+"POT-Creation-Date: 2005-03-16 14:47+0900\n"
 "PO-Revision-Date: 2001-10-08\n"
 "Last-Translator: Michalis Kabrianis <Michalis@bigfoot.com>\n"
 "Language-Team: Greek <nls@tux.hellug.gr>\n"
@@ -98,7 +98,7 @@ msgid ""
 msgstr ""
 
 #: src/account.c:638 src/addressadd.c:186 src/addressbook.c:488
-#: src/compose.c:3650 src/editaddress.c:195 src/editaddress.c:936
+#: src/compose.c:3748 src/editaddress.c:195 src/editaddress.c:936
 #: src/editaddress.c:984 src/editbook.c:191 src/editgroup.c:257
 #: src/editjpilot.c:296 src/editldap.c:300 src/editvcard.c:211
 #: src/mimeview.c:151 src/prefs_filter.c:214 src/prefs_folder_item.c:170
@@ -151,13 +151,13 @@ msgstr "Διαγραφή λογαριασμού"
 msgid "Do you really want to delete this account?"
 msgstr "Θέλετε πράγματι να διαγράψετε αυτό το λογαριασμό;"
 
-#: src/account.c:758 src/compose.c:2551 src/compose.c:4807
+#: src/account.c:758 src/compose.c:2632 src/compose.c:4943
 #: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
 #: src/folderview.c:2156 src/folderview.c:2192
 msgid "Yes"
 msgstr "Ναι"
 
-#: src/account.c:758 src/compose.c:2551 src/compose.c:4807
+#: src/account.c:758 src/compose.c:2632 src/compose.c:4943
 #: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
 #: src/folderview.c:2156 src/folderview.c:2192
 msgid "+No"
@@ -257,7 +257,7 @@ msgstr ""
 msgid "Add Address to Book"
 msgstr "Προσθήκη διεύθυνσης στο βιβλίο"
 
-#: src/addressadd.c:196 src/compose.c:4191 src/editaddress.c:196
+#: src/addressadd.c:196 src/compose.c:4292 src/editaddress.c:196
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "Διεύθυνση"
@@ -271,7 +271,7 @@ msgstr "Σχόλια"
 msgid "Select Address Book Folder"
 msgstr "Επιλογή καταλόγου βιβλίου διευθύνσεων"
 
-#: src/addressbook.c:334 src/compose.c:469 src/mainwindow.c:454
+#: src/addressbook.c:334 src/compose.c:477 src/mainwindow.c:454
 #: src/messageview.c:134
 msgid "/_File"
 msgstr "/Αρχείο"
@@ -294,8 +294,8 @@ msgstr "/Αρχείο/Νέο _J-Pilot"
 msgid "/_File/New _Server"
 msgstr "/Αρχείο/Νέος εξυπηρετητής"
 
-#: src/addressbook.c:343 src/addressbook.c:346 src/compose.c:474
-#: src/compose.c:479 src/compose.c:483 src/mainwindow.c:471
+#: src/addressbook.c:343 src/addressbook.c:346 src/compose.c:482
+#: src/compose.c:487 src/compose.c:491 src/mainwindow.c:471
 #: src/mainwindow.c:474 src/mainwindow.c:476 src/mainwindow.c:479
 #: src/mainwindow.c:481 src/messageview.c:137
 msgid "/_File/---"
@@ -313,7 +313,7 @@ msgstr "/Αρχείο/Διαγραφή"
 msgid "/_File/_Save"
 msgstr "/Αρχείο/Αποθήκευση"
 
-#: src/addressbook.c:348 src/compose.c:484 src/messageview.c:138
+#: src/addressbook.c:348 src/compose.c:492 src/messageview.c:138
 msgid "/_File/_Close"
 msgstr "/Αρχείο/Κλείσιμο"
 
@@ -345,7 +345,7 @@ msgstr "/Διεύθυνση/Επεξεργασία"
 msgid "/_Address/_Delete"
 msgstr "/Διεύθυνση/Διαγραφή"
 
-#: src/addressbook.c:356 src/compose.c:585 src/mainwindow.c:688
+#: src/addressbook.c:356 src/compose.c:664 src/mainwindow.c:697
 #: src/messageview.c:246
 #, fuzzy
 msgid "/_Tools"
@@ -356,12 +356,12 @@ msgstr "/Εργαλεία"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/Αρχείο/Εισαγωγή αρχείου mbox..."
 
-#: src/addressbook.c:358 src/compose.c:598 src/mainwindow.c:733
+#: src/addressbook.c:358 src/compose.c:677 src/mainwindow.c:742
 #: src/messageview.c:264
 msgid "/_Help"
 msgstr "/Βοήθεια"
 
-#: src/addressbook.c:359 src/compose.c:599 src/mainwindow.c:744
+#: src/addressbook.c:359 src/compose.c:678 src/mainwindow.c:753
 #: src/messageview.c:265
 msgid "/_Help/_About"
 msgstr "/Βοήθεια/Σχετικά"
@@ -378,7 +378,7 @@ msgstr "/Νέα ομάδα"
 msgid "/New _Folder"
 msgstr "/Νέος κατάλογος"
 
-#: src/addressbook.c:381 src/addressbook.c:391 src/compose.c:463
+#: src/addressbook.c:381 src/addressbook.c:391 src/compose.c:471
 #: src/folderview.c:220 src/folderview.c:222 src/folderview.c:226
 #: src/folderview.c:236 src/folderview.c:238 src/folderview.c:240
 #: src/folderview.c:244 src/folderview.c:254 src/folderview.c:256
@@ -388,7 +388,7 @@ msgstr "/Νέος κατάλογος"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:382 src/addressbook.c:392 src/compose.c:486
+#: src/addressbook.c:382 src/addressbook.c:392 src/compose.c:494
 #: src/mainwindow.c:485 src/messageview.c:140
 msgid "/_Edit"
 msgstr "/Επεξεργασία"
@@ -401,7 +401,7 @@ msgstr "/Διαγραφή"
 msgid "E-Mail address"
 msgstr "Διεύθυνση e-mail"
 
-#: src/addressbook.c:493 src/compose.c:4192 src/prefs_common.c:2186
+#: src/addressbook.c:493 src/compose.c:4293 src/prefs_common.c:2198
 msgid "Address book"
 msgstr "Κατάλογος διευθύνσεων"
 
@@ -411,7 +411,7 @@ msgstr "Όνομα:"
 
 #. Buttons
 #: src/addressbook.c:625 src/addressbook.c:1665 src/addressbook.c:1671
-#: src/editaddress.c:878 src/editaddress.c:1011 src/mainwindow.c:2212
+#: src/editaddress.c:878 src/editaddress.c:1011 src/mainwindow.c:2221
 #: src/prefs_actions.c:263 src/prefs_display_header.c:275
 #: src/prefs_display_header.c:330 src/prefs_template.c:227
 msgid "Delete"
@@ -600,7 +600,7 @@ msgstr "Κοινές διευθύνσεις"
 msgid "Personal address"
 msgstr "Προσωπικές διευθύνσεις"
 
-#: src/alertpanel.c:123 src/compose.c:4807 src/main.c:458
+#: src/alertpanel.c:123 src/compose.c:4943 src/main.c:458
 msgid "Notice"
 msgstr "Σημείωση"
 
@@ -608,7 +608,7 @@ msgstr "Σημείωση"
 msgid "Warning"
 msgstr "Προειδοποίηση"
 
-#: src/alertpanel.c:149 src/compose.c:2551 src/inc.c:558
+#: src/alertpanel.c:149 src/compose.c:2632 src/inc.c:558
 msgid "Error"
 msgstr "Σφάλμα"
 
@@ -656,321 +656,439 @@ msgstr "Καφέ"
 msgid "None"
 msgstr "Τέλος"
 
-#: src/compose.c:461
+#: src/compose.c:469
 msgid "/_Add..."
 msgstr "/Προσθήκη..."
 
-#: src/compose.c:462
+#: src/compose.c:470
 msgid "/_Remove"
 msgstr "/Διαγραφή"
 
-#: src/compose.c:464 src/folderview.c:228 src/folderview.c:246
+#: src/compose.c:472 src/folderview.c:228 src/folderview.c:246
 #: src/folderview.c:261
 #, fuzzy
 msgid "/_Properties..."
 msgstr "/Ιδιότητες..."
 
-#: src/compose.c:470
+#: src/compose.c:478
 #, fuzzy
 msgid "/_File/_Send"
 msgstr "/Αρχείο/Αποθήκευση"
 
-#: src/compose.c:472
+#: src/compose.c:480
 #, fuzzy
 msgid "/_File/Send _later"
 msgstr "/Μήνυμα/Αποστολή αργότερα"
 
-#: src/compose.c:475
+#: src/compose.c:483
 #, fuzzy
 msgid "/_File/Save to _draft folder"
 msgstr "/Μήνυμα/Αποθήκευση στον κατάλογο προχείρων"
 
-#: src/compose.c:477
+#: src/compose.c:485
 #, fuzzy
 msgid "/_File/Save and _keep editing"
 msgstr "/Μήνυμα/Αποστολή αργότερα"
 
-#: src/compose.c:480
+#: src/compose.c:488
 msgid "/_File/_Attach file"
 msgstr "/Αρχείο/Προσάρτηση αρχείου"
 
-#: src/compose.c:481
+#: src/compose.c:489
 msgid "/_File/_Insert file"
 msgstr "/Αρχείο/Εισαγωγή αρχείου"
 
-#: src/compose.c:482
+#: src/compose.c:490
 msgid "/_File/Insert si_gnature"
 msgstr "/Αρχείο/Εισαγωγή υπογραφής"
 
-#: src/compose.c:487
+#: src/compose.c:495
 msgid "/_Edit/_Undo"
 msgstr "/Επεξεργασία/Αναίρεση"
 
-#: src/compose.c:488
+#: src/compose.c:496
 msgid "/_Edit/_Redo"
 msgstr "/Επεξεργασία/Επανάληψη"
 
-#: src/compose.c:489 src/compose.c:567 src/mainwindow.c:489
+#: src/compose.c:497 src/compose.c:575 src/mainwindow.c:489
 #: src/messageview.c:143
 msgid "/_Edit/---"
 msgstr "/Επεξεργασία/---"
 
-#: src/compose.c:490
+#: src/compose.c:498
 msgid "/_Edit/Cu_t"
 msgstr "/Επεξεργασία/Κοπή"
 
-#: src/compose.c:491 src/mainwindow.c:486 src/messageview.c:141
+#: src/compose.c:499 src/mainwindow.c:486 src/messageview.c:141
 msgid "/_Edit/_Copy"
 msgstr "/Επεξεργασία/Αντιγραφή"
 
-#: src/compose.c:492
+#: src/compose.c:500
 msgid "/_Edit/_Paste"
 msgstr "/Επεξεργασία/Επικόλληση"
 
-#: src/compose.c:493
+#: src/compose.c:501
 #, fuzzy
 msgid "/_Edit/Paste as _quotation"
 msgstr "/Επεξεργασία/Επικόλληση"
 
-#: src/compose.c:495 src/mainwindow.c:487 src/messageview.c:142
+#: src/compose.c:503 src/mainwindow.c:487 src/messageview.c:142
 msgid "/_Edit/Select _all"
 msgstr "/Επεξεργασία/Επιλογή όλων"
 
-#: src/compose.c:496
+#: src/compose.c:504
 #, fuzzy
 msgid "/_Edit/A_dvanced"
 msgstr "/Επεξεργασία/Αναίρεση"
 
-#: src/compose.c:497
+#: src/compose.c:505
 msgid "/_Edit/A_dvanced/Move a character backward"
 msgstr ""
 
-#: src/compose.c:502
+#: src/compose.c:510
 msgid "/_Edit/A_dvanced/Move a character forward"
 msgstr ""
 
-#: src/compose.c:507
+#: src/compose.c:515
 msgid "/_Edit/A_dvanced/Move a word backward"
 msgstr ""
 
-#: src/compose.c:512
+#: src/compose.c:520
 msgid "/_Edit/A_dvanced/Move a word forward"
 msgstr ""
 
-#: src/compose.c:517
+#: src/compose.c:525
 msgid "/_Edit/A_dvanced/Move to beginning of line"
 msgstr ""
 
-#: src/compose.c:522
+#: src/compose.c:530
 msgid "/_Edit/A_dvanced/Move to end of line"
 msgstr ""
 
-#: src/compose.c:527
+#: src/compose.c:535
 msgid "/_Edit/A_dvanced/Move to previous line"
 msgstr ""
 
-#: src/compose.c:532
+#: src/compose.c:540
 msgid "/_Edit/A_dvanced/Move to next line"
 msgstr ""
 
-#: src/compose.c:537
+#: src/compose.c:545
 msgid "/_Edit/A_dvanced/Delete a character backward"
 msgstr ""
 
-#: src/compose.c:542
+#: src/compose.c:550
 msgid "/_Edit/A_dvanced/Delete a character forward"
 msgstr ""
 
-#: src/compose.c:547
+#: src/compose.c:555
 msgid "/_Edit/A_dvanced/Delete a word backward"
 msgstr ""
 
-#: src/compose.c:552
+#: src/compose.c:560
 msgid "/_Edit/A_dvanced/Delete a word forward"
 msgstr ""
 
-#: src/compose.c:557
+#: src/compose.c:565
 msgid "/_Edit/A_dvanced/Delete line"
 msgstr ""
 
-#: src/compose.c:562
+#: src/compose.c:570
 msgid "/_Edit/A_dvanced/Delete to end of line"
 msgstr ""
 
-#: src/compose.c:568
+#: src/compose.c:576
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/Επεξεργασία/Αναδίπλωση τρέχουσας παραγράφου"
 
-#: src/compose.c:570
+#: src/compose.c:578
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/Επεξεργασία/Αναδίπλωση μακριών γραμμών"
 
-#: src/compose.c:572
+#: src/compose.c:580
 #, fuzzy
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/Επεξεργασία/Αντιγραφή"
 
-#: src/compose.c:573 src/mainwindow.c:494 src/messageview.c:147
+#: src/compose.c:581 src/mainwindow.c:494 src/messageview.c:147
 #: src/summaryview.c:370
 msgid "/_View"
 msgstr "/Απεικόνιση"
 
-#: src/compose.c:574
+#: src/compose.c:582
 #, fuzzy
 msgid "/_View/_To"
 msgstr "/Απεικόνιση/Εμφάνιση του πηγαίου"
 
-#: src/compose.c:575
+#: src/compose.c:583
 #, fuzzy
 msgid "/_View/_Cc"
 msgstr "/Απεικόνιση"
 
-#: src/compose.c:576
+#: src/compose.c:584
 #, fuzzy
 msgid "/_View/_Bcc"
 msgstr "/Απεικόνιση/Εμφάνιση του πηγαίου"
 
-#: src/compose.c:577
+#: src/compose.c:585
 #, fuzzy
 msgid "/_View/_Reply to"
 msgstr "/Απεικόνιση/Κωδικοσύνολο"
 
-#: src/compose.c:578 src/compose.c:580 src/compose.c:582 src/mainwindow.c:512
-#: src/mainwindow.c:515 src/mainwindow.c:541 src/mainwindow.c:565
-#: src/mainwindow.c:641 src/mainwindow.c:645 src/messageview.c:223
+#: src/compose.c:586 src/compose.c:588 src/compose.c:590 src/compose.c:592
+#: src/mainwindow.c:512 src/mainwindow.c:515 src/mainwindow.c:541
+#: src/mainwindow.c:565 src/mainwindow.c:650 src/mainwindow.c:654
+#: src/messageview.c:223
 msgid "/_View/---"
 msgstr "/Απεικόνιση/---"
 
-#: src/compose.c:579
+#: src/compose.c:587
 #, fuzzy
 msgid "/_View/_Followup to"
 msgstr "/Μήνυμα/Συνέχεια σε"
 
-#: src/compose.c:581
+#: src/compose.c:589
 #, fuzzy
 msgid "/_View/R_uler"
 msgstr "/Απεικόνιση/Εμφάνιση του πηγαίου"
 
-#: src/compose.c:583
+#: src/compose.c:591
 #, fuzzy
 msgid "/_View/_Attachment"
 msgstr "Προσάρτηση"
 
-#: src/compose.c:586 src/mainwindow.c:689 src/messageview.c:247
+#: src/compose.c:598 src/mainwindow.c:572 src/messageview.c:154
+#, fuzzy
+msgid "/_View/Character _encoding"
+msgstr "/Απεικόνιση/Εμφάνιση του πηγαίου"
+
+#: src/compose.c:599
+msgid "/_View/Character _encoding/_Automatic"
+msgstr ""
+
+#: src/compose.c:601 src/compose.c:607 src/compose.c:613 src/compose.c:617
+#: src/compose.c:623 src/compose.c:627 src/compose.c:631 src/compose.c:641
+#: src/compose.c:645 src/compose.c:653 src/compose.c:657 src/mainwindow.c:568
+#: src/mainwindow.c:575 src/messageview.c:150
+#, fuzzy
+msgid "/_View/Character _encoding/---"
+msgstr "/Απεικόνιση/Εμφάνιση του πηγαίου"
+
+#: src/compose.c:603 src/mainwindow.c:576 src/messageview.c:158
+#, fuzzy
+msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
+msgstr "/Απεικόνιση/Κωδικοσύνολο/7bit ascii (US-ASC_II)"
+
+#: src/compose.c:605 src/mainwindow.c:578 src/messageview.c:161
+#, fuzzy
+msgid "/_View/Character _encoding/Unicode (_UTF-8)"
+msgstr "/Απεικόνιση/Κωδικοσύνολο/Unicode (_UTF-8)"
+
+#: src/compose.c:609 src/mainwindow.c:582 src/messageview.c:164
+#, fuzzy
+msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
+msgstr "/Απεικόνιση/Κωδικοσύνολο/Δυτικής Ευρώπης (ISO-8859-_1)"
+
+#: src/compose.c:611 src/mainwindow.c:584 src/messageview.c:166
+#, fuzzy
+msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
+msgstr "/Απεικόνιση/Κωδικοσύνολο/Δυτικής Ευρώπης (ISO-8859-_1)"
+
+#: src/compose.c:615 src/mainwindow.c:588 src/messageview.c:169
+#, fuzzy
+msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
+msgstr "/Απεικόνιση/Κωδικοσύνολο/Κεντρικής Ευρώπης (ISO-8859-_2)"
+
+#: src/compose.c:619 src/mainwindow.c:592 src/messageview.c:172
+#, fuzzy
+msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
+msgstr "/Απεικόνιση/Κωδικοσύνολο/Βαλτικής (ISO-8859-13)"
+
+#: src/compose.c:621 src/mainwindow.c:594 src/messageview.c:174
+#, fuzzy
+msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
+msgstr "/Απεικόνιση/Κωδικοσύνολο/Βαλτικής (ISO-8859-_4)"
+
+#: src/compose.c:625 src/mainwindow.c:598 src/messageview.c:177
+#, fuzzy
+msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
+msgstr "/Απεικόνιση/Κωδικοσύνολο/Ελληνικό (ISO-8859-_7)"
+
+#: src/compose.c:629 src/mainwindow.c:602 src/messageview.c:180
+#, fuzzy
+msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
+msgstr "/Απεικόνιση/Κωδικοσύνολο/Τουρκικό (ISO-8859-_9)"
+
+#: src/compose.c:633 src/mainwindow.c:606 src/messageview.c:183
+#, fuzzy
+msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
+msgstr "/Απεικόνιση/Κωδικοσύνολο/Κυριλλικό (ISO-8859-_5)"
+
+#: src/compose.c:635 src/mainwindow.c:608 src/messageview.c:185
+#, fuzzy
+msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
+msgstr "/Απεικόνιση/Κωδικοσύνολο/Κυριλλικό (KOI8-_R)"
+
+#: src/compose.c:637 src/mainwindow.c:610 src/messageview.c:187
+#, fuzzy
+msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
+msgstr "/Απεικόνιση/Κωδικοσύνολο/Κυριλλικό (KOI8-_R)"
+
+#: src/compose.c:639 src/mainwindow.c:612 src/messageview.c:189
+#, fuzzy
+msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
+msgstr "/Απεικόνιση/Κωδικοσύνολο/Κυριλλικό (Windows-1251)"
+
+#: src/compose.c:643 src/mainwindow.c:616 src/messageview.c:192
+#, fuzzy
+msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
+msgstr "/Απεικόνιση/Κωδικοσύνολο/Ιαπωνέζικο (ISO-2022-_JP)"
+
+#: src/compose.c:647 src/mainwindow.c:626 src/messageview.c:201
+#, fuzzy
+msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
+msgstr "/Απεικόνιση/Κωδικοσύνολο/Απλοποιημένο Κινεζικό (_GB2312)"
+
+#: src/compose.c:649 src/mainwindow.c:628 src/messageview.c:203
+#, fuzzy
+msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
+msgstr "/Απεικόνιση/Κωδικοσύνολο/Παραδοσιακό Κινεζικό (_Big5)"
+
+#: src/compose.c:651 src/mainwindow.c:630 src/messageview.c:205
+#, fuzzy
+msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
+msgstr "/Απεικόνιση/Κωδικοσύνολο/Παραδοσιακό Κινεζικό (EUC-_TW)"
+
+#: src/compose.c:655 src/mainwindow.c:636 src/messageview.c:210
+#, fuzzy
+msgid "/_View/Character _encoding/Korean (EUC-_KR)"
+msgstr "/Απεικόνιση/Κωδικοσύνολο/Κορεάτικο (EUC-_KR)"
+
+#: src/compose.c:659 src/mainwindow.c:642 src/messageview.c:215
+#, fuzzy
+msgid "/_View/Character _encoding/Thai (TIS-620)"
+msgstr "/Απεικόνιση/Κωδικοσύνολο/Κινεζικό (ISO-2022-_CN)"
+
+#: src/compose.c:661 src/mainwindow.c:644 src/messageview.c:217
+#, fuzzy
+msgid "/_View/Character _encoding/Thai (Windows-874)"
+msgstr "/Απεικόνιση/Κωδικοσύνολο/Κυριλλικό (Windows-1251)"
+
+#: src/compose.c:665 src/mainwindow.c:698 src/messageview.c:247
 #, fuzzy
 msgid "/_Tools/_Address book"
 msgstr "/Εργαλεία/Κατάλογος διευθύνσεων"
 
-#: src/compose.c:587
+#: src/compose.c:666
 #, fuzzy
 msgid "/_Tools/_Template"
 msgstr "/Αρχείο/Διαγραφή"
 
-#: src/compose.c:588 src/mainwindow.c:707 src/messageview.c:262
+#: src/compose.c:667 src/mainwindow.c:716 src/messageview.c:262
 #, fuzzy
 msgid "/_Tools/Actio_ns"
 msgstr "/Εκτέλεση"
 
-#: src/compose.c:589 src/compose.c:593 src/mainwindow.c:692
-#: src/mainwindow.c:706 src/mainwindow.c:708 src/mainwindow.c:711
-#: src/mainwindow.c:713 src/messageview.c:250 src/messageview.c:261
+#: src/compose.c:668 src/compose.c:672 src/mainwindow.c:701
+#: src/mainwindow.c:715 src/mainwindow.c:717 src/mainwindow.c:720
+#: src/mainwindow.c:722 src/messageview.c:250 src/messageview.c:261
 #, fuzzy
 msgid "/_Tools/---"
 msgstr "/Εργαλεία"
 
-#: src/compose.c:590
+#: src/compose.c:669
 #, fuzzy
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/Επεξεργασία/Επεξεργασία με εξωτερικό πρόγραμμα"
 
-#: src/compose.c:594
+#: src/compose.c:673
 #, fuzzy
 msgid "/_Tools/PGP Si_gn"
 msgstr "/Εκτέλεση"
 
-#: src/compose.c:595
+#: src/compose.c:674
 #, fuzzy
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/Μήνυμα/Κρυπτογράφηση"
 
-#: src/compose.c:800
+#: src/compose.c:879
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: το αρχείο δεν υπάρχει\n"
 
-#: src/compose.c:899 src/compose.c:958 src/procmsg.c:1303
+#: src/compose.c:978 src/compose.c:1037 src/procmsg.c:1303
 msgid "Can't get text part\n"
 msgstr "Δεν μπορώ να λάβω το τμήμα κειμένου\n"
 
-#: src/compose.c:1340
+#: src/compose.c:1419
 msgid "Quote mark format error."
 msgstr ""
 
-#: src/compose.c:1352
+#: src/compose.c:1431
 msgid "Message reply/forward format error."
 msgstr ""
 
-#: src/compose.c:1679
+#: src/compose.c:1758
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Το αρχείο %s δεν υπάρχει\n"
 
-#: src/compose.c:1683
+#: src/compose.c:1762
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Δεν μπορώ να βρω το μέγεθος του αρχείου %s\n"
 
-#: src/compose.c:1687
+#: src/compose.c:1766
 #, fuzzy, c-format
 msgid "File %s is empty."
 msgstr "Το αρχείο %s είναι άδειο\n"
 
-#: src/compose.c:1691
+#: src/compose.c:1770
 #, fuzzy, c-format
 msgid "Can't read %s."
 msgstr "δεν μπορώ να δημιουργήσω %s\n"
 
-#: src/compose.c:1726
+#: src/compose.c:1805
 #, c-format
 msgid "Message: %s"
 msgstr "Μήνυμα: %s"
 
-#: src/compose.c:1797 src/mimeview.c:491
+#: src/compose.c:1876 src/mimeview.c:491
 msgid "Can't get the part of multipart message."
 msgstr "Δεν μπορώ να λάβω το τμήμα του πολυτμηματικού μηνύματος"
 
-#: src/compose.c:2188
+#: src/compose.c:2267
 msgid " [Edited]"
 msgstr " [Τροποποιημένο]"
 
-#: src/compose.c:2190
+#: src/compose.c:2269
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Σύνθεση μηνύματος%s"
 
-#: src/compose.c:2193
+#: src/compose.c:2272
 #, c-format
 msgid "Compose message%s"
 msgstr "Σύνθεση μηνύματος%s"
 
-#: src/compose.c:2304
+#: src/compose.c:2383
 msgid "Recipient is not specified."
 msgstr "Ο παραλήπτης δεν έχει οριστεί."
 
-#: src/compose.c:2312 src/compose.c:4112 src/mainwindow.c:2144
+#: src/compose.c:2391 src/compose.c:4213 src/mainwindow.c:2153
 #: src/prefs_account.c:703 src/prefs_common.c:850
 msgid "Send"
 msgstr "Αποστολή"
 
-#: src/compose.c:2313
+#: src/compose.c:2392
 msgid "Subject is empty. Send it anyway?"
 msgstr ""
 
-#: src/compose.c:2364
+#: src/compose.c:2443
 msgid "can't get recipient list."
 msgstr "δεν μπορώ να πάρω την λίστα παραληπτών"
 
-#: src/compose.c:2384
+#: src/compose.c:2463
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -978,173 +1096,173 @@ msgstr ""
 "Ο λογαριασμός για αποστολή μηνύματος δεν έχει οριστεί.\n"
 "Παρακαλώ επιλέξτε ένα λογαριασμό πριν στείλετε."
 
-#: src/compose.c:2398 src/send_message.c:261
+#: src/compose.c:2477 src/send_message.c:261
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Συνέβη σφάλμα κατά την αποστολή του μηνύματος σε %s ."
 
-#: src/compose.c:2421
+#: src/compose.c:2500
 msgid "Can't save the message to outbox."
 msgstr "Δεν μπορώ να αποθηκεύσω το μήνυμα στα εξερχόμενα."
 
-#: src/compose.c:2457
+#: src/compose.c:2536
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr ""
 
-#: src/compose.c:2518 src/compose.c:2739 src/compose.c:2802 src/compose.c:2921
+#: src/compose.c:2597 src/compose.c:2820 src/compose.c:2883 src/compose.c:3003
 #: src/utils.c:2189
 msgid "can't change file mode\n"
 msgstr "δεν μπορώ να αλλάξω το mode του αρχείου\n"
 
-#: src/compose.c:2546
+#: src/compose.c:2627
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
 "Send it as %s anyway?"
 msgstr "Δεν μπορώ να αλλάξω το κωδικοσύνολο του μηνύματος."
 
-#: src/compose.c:2610
+#: src/compose.c:2691
 msgid "can't write headers\n"
 msgstr "δεν μπορώ να γράψω την κεφαλίδα\n"
 
-#: src/compose.c:2881
+#: src/compose.c:2963
 msgid "can't remove the old message\n"
 msgstr "δεν μπορώ να αφαιρέσω το παλιό μήνυμα\n"
 
-#: src/compose.c:2899
+#: src/compose.c:2981
 msgid "queueing message...\n"
 msgstr "βάζω το μήνυμα στην ουρά...\n"
 
-#: src/compose.c:2981
+#: src/compose.c:3063
 #, fuzzy
 msgid "can't find queue folder\n"
 msgstr "δεν μπορώ να επιλέξω τον κατάλογο: %s\n"
 
-#: src/compose.c:2988
+#: src/compose.c:3070
 msgid "can't queue the message\n"
 msgstr "δεν μπορώ να βάλω το μήνυμα στην ουρά\n"
 
-#: src/compose.c:3547
+#: src/compose.c:3645
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "generated Message-ID: %s\n"
 
-#: src/compose.c:3645
+#: src/compose.c:3743
 msgid "Creating compose window...\n"
 msgstr "Δημιουργώ το παράθυρο σύνθεσης...\n"
 
-#: src/compose.c:3648 src/compose.c:4598
+#: src/compose.c:3746 src/compose.c:4734
 msgid "MIME type"
 msgstr "τύπος MIME"
 
 #. S_COL_DATE
-#: src/compose.c:3649 src/mimeview.c:150 src/prefs_filter_edit.c:569
+#: src/compose.c:3747 src/mimeview.c:150 src/prefs_filter_edit.c:569
 #: src/prefs_summary_column.c:73 src/select-keys.c:317 src/summaryview.c:386
 msgid "Size"
 msgstr "Μέγεθος"
 
-#: src/compose.c:3700 src/headerview.c:53 src/summary_search.c:169
+#: src/compose.c:3798 src/headerview.c:53 src/summary_search.c:169
 msgid "From:"
 msgstr "Από:"
 
-#: src/compose.c:4113
+#: src/compose.c:4214
 msgid "Send message"
 msgstr "Αποστολή μηνύματος"
 
-#: src/compose.c:4121
+#: src/compose.c:4222
 msgid "Send later"
 msgstr ""
 "Αποστολή\n"
 "αργότερα"
 
-#: src/compose.c:4122
+#: src/compose.c:4223
 msgid "Put into queue folder and send later"
 msgstr "Τοποθέτηση στον κατάλογο ουράς και αποστολή αργότερα"
 
-#: src/compose.c:4130
+#: src/compose.c:4231
 msgid "Draft"
 msgstr "Πρόχειρα"
 
-#: src/compose.c:4131
+#: src/compose.c:4232
 msgid "Save to draft folder"
 msgstr "Αποθήκευση στον κατάλογο προχείρων"
 
-#: src/compose.c:4141 src/compose.c:5382
+#: src/compose.c:4242 src/compose.c:5527
 msgid "Insert"
 msgstr "Εισαγωγή"
 
-#: src/compose.c:4142
+#: src/compose.c:4243
 msgid "Insert file"
 msgstr "Εισαγωγή αρχείου"
 
-#: src/compose.c:4150
+#: src/compose.c:4251
 msgid "Attach"
 msgstr "Προσάρτηση"
 
-#: src/compose.c:4151
+#: src/compose.c:4252
 msgid "Attach file"
 msgstr "Προσάρτηση αρχείου"
 
 #. signature
-#: src/compose.c:4161 src/prefs_account.c:1339 src/prefs_common.c:1261
+#: src/compose.c:4262 src/prefs_account.c:1339 src/prefs_common.c:1273
 msgid "Signature"
 msgstr "Yπογραφή"
 
-#: src/compose.c:4162
+#: src/compose.c:4263
 msgid "Insert signature"
 msgstr "Εισαγωγή υπογραφής"
 
-#: src/compose.c:4171 src/prefs_common.c:1283 src/prefs_common.c:2165
+#: src/compose.c:4272 src/prefs_common.c:1295 src/prefs_common.c:2177
 msgid "Editor"
 msgstr "Συνθέτης"
 
-#: src/compose.c:4172
+#: src/compose.c:4273
 msgid "Edit with external editor"
 msgstr "Επεξεργασία με εξωτερικό πρόγραμμα"
 
-#: src/compose.c:4180
+#: src/compose.c:4281
 msgid "Linewrap"
 msgstr ""
 "Τύλιξη\n"
 "γραμμής"
 
-#: src/compose.c:4181
+#: src/compose.c:4282
 #, fuzzy
 msgid "Wrap all long lines"
 msgstr "Αναδίπλωση γραμμών"
 
-#: src/compose.c:4492
+#: src/compose.c:4628
 msgid "Invalid MIME type."
 msgstr "Μη έγκυρος τύπος MIME"
 
-#: src/compose.c:4511
+#: src/compose.c:4647
 msgid "File doesn't exist or is empty."
 msgstr "Το αρχείο δεν υπάρχει, ή είναι άδειο."
 
-#: src/compose.c:4580
+#: src/compose.c:4716
 #, fuzzy
 msgid "Properties"
 msgstr "Ιδιότητες"
 
-#: src/compose.c:4600
+#: src/compose.c:4736
 msgid "Encoding"
 msgstr "Κωδικοποίηση"
 
-#: src/compose.c:4623 src/prefs_folder_item.c:183
+#: src/compose.c:4759 src/prefs_folder_item.c:183
 msgid "Path"
 msgstr "Διάδρομος"
 
-#: src/compose.c:4624
+#: src/compose.c:4760
 msgid "File name"
 msgstr "Όνομα αρχείου"
 
-#: src/compose.c:4778
+#: src/compose.c:4914
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Η εντολή για το εξωτερικό πρόγραμμα δεν είναι έγκυρη: `%s'\n"
 
-#: src/compose.c:4804
+#: src/compose.c:4940
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1155,73 +1273,73 @@ msgstr ""
 "Να επιβάλλω τερματισμό της διεργασίας;\n"
 "process group id:  %d"
 
-#: src/compose.c:4817
+#: src/compose.c:4953
 #, c-format
 msgid "Terminated process group id: %d"
 msgstr "Τερματίστηκε process group id: %d"
 
-#: src/compose.c:4818
+#: src/compose.c:4954
 #, c-format
 msgid "Temporary file: %s"
 msgstr "Προσωρινό αρχείο: %s"
 
-#: src/compose.c:4842
+#: src/compose.c:4978
 msgid "Compose: input from monitoring process\n"
 msgstr "Σύνθεση: εισαγωγή από παρακολουθούμενη διεργασία\n"
 
 #. failed
-#: src/compose.c:4875
+#: src/compose.c:5011
 msgid "Couldn't exec external editor\n"
 msgstr "Δεν μπόρεσα να καλέσω το εξωτερικό πρόγραμμα επεξεργασίας\n"
 
-#: src/compose.c:4879
+#: src/compose.c:5015
 msgid "Couldn't write to file\n"
 msgstr "Δεν μπόρεσα να γράψω στο αρχείο\n"
 
-#: src/compose.c:4881
+#: src/compose.c:5017
 msgid "Pipe read failed\n"
 msgstr "Αποτυχία ανάγνωσης από το pipe\n"
 
-#: src/compose.c:5182 src/compose.c:5190 src/compose.c:5196
+#: src/compose.c:5318 src/compose.c:5326 src/compose.c:5332
 msgid "Can't queue the message."
 msgstr "Δεν μπορώ να βάλω στην ουρά το μήνυμα."
 
-#: src/compose.c:5287
+#: src/compose.c:5423
 #, fuzzy
 msgid "Select files"
 msgstr "Επιλογή αρχείου"
 
-#: src/compose.c:5309
+#: src/compose.c:5445
 msgid "Select file"
 msgstr "Επιλογή αρχείου"
 
-#: src/compose.c:5344
+#: src/compose.c:5480
 msgid "Discard message"
 msgstr "Απόρριψη μηνύματος"
 
-#: src/compose.c:5345
+#: src/compose.c:5481
 msgid "This message has been modified. discard it?"
 msgstr "Αυτό το μήνυμα έχει τροποποιηθεί, να απορριφθεί;"
 
-#: src/compose.c:5346
+#: src/compose.c:5482
 msgid "Discard"
 msgstr "Απόρριψη"
 
-#: src/compose.c:5346
+#: src/compose.c:5482
 msgid "to Draft"
 msgstr "στα πρόχειρα"
 
-#: src/compose.c:5379
+#: src/compose.c:5524
 #, fuzzy, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Θέλετε πράγματι να διαγραφεί αυτή η κεφαλίδα;"
 
-#: src/compose.c:5381
+#: src/compose.c:5526
 #, fuzzy
 msgid "Apply template"
 msgstr "Διαγραφή μηνύματος"
 
-#: src/compose.c:5382
+#: src/compose.c:5527
 #, fuzzy
 msgid "Replace"
 msgstr "Απάντηση"
@@ -1677,12 +1795,12 @@ msgstr "Θέτω τις πληροφορίες καταλόγων...\n"
 msgid "Setting folder info..."
 msgstr "Θέτω τις πληροφορίες καταλόγων..."
 
-#: src/folderview.c:652 src/mainwindow.c:3190 src/setup.c:81
+#: src/folderview.c:652 src/mainwindow.c:3199 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Σάρωση καταλόγων %s%c%s ..."
 
-#: src/folderview.c:656 src/mainwindow.c:3195 src/setup.c:86
+#: src/folderview.c:656 src/mainwindow.c:3204 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Σάρωση καταλόγου %s ..."
@@ -2166,7 +2284,7 @@ msgstr ""
 msgid "Prev"
 msgstr "Επιλογές"
 
-#: src/importldif.c:761 src/mainwindow.c:2230
+#: src/importldif.c:761 src/mainwindow.c:2239
 msgid "Next"
 msgstr "Επόμενο"
 
@@ -2639,7 +2757,8 @@ msgid "/_View/Separate f_older tree"
 msgstr "/Απεικόνιση/Ξεχωριστό παράθυρο δομής καταλόγων"
 
 #: src/mainwindow.c:514
-msgid "/_View/Separate m_essage view"
+#, fuzzy
+msgid "/_View/Separate _message view"
 msgstr "/Απεικόνιση/Ξεχωριστή απεικόνιση μηνυμάτων"
 
 #: src/mainwindow.c:516
@@ -2808,462 +2927,376 @@ msgstr "/Περίληψη/Πήγαινε στο/Επόμενο μήνυμα με
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/Περίληψη/Μετακίνηση σε άλλο κατάλογο..."
 
-#: src/mainwindow.c:568 src/mainwindow.c:575 src/messageview.c:150
-msgid "/_View/_Code set/---"
-msgstr "/Απεικόνιση/Κωδικοσύνολο/---"
-
-#: src/mainwindow.c:572 src/messageview.c:154
-msgid "/_View/_Code set"
-msgstr "/Απεικόνιση/Κωδικοσύνολο"
-
 #: src/mainwindow.c:573 src/messageview.c:155
-msgid "/_View/_Code set/_Auto detect"
-msgstr "/Απεικόνιση/Κωδικοσύνολο/Αυτόματη αναγνώριση"
-
-#: src/mainwindow.c:576 src/messageview.c:158
-msgid "/_View/_Code set/7bit ascii (US-ASC_II)"
-msgstr "/Απεικόνιση/Κωδικοσύνολο/7bit ascii (US-ASC_II)"
-
-#: src/mainwindow.c:579 src/messageview.c:161
-msgid "/_View/_Code set/Unicode (_UTF-8)"
-msgstr "/Απεικόνιση/Κωδικοσύνολο/Unicode (_UTF-8)"
-
-#: src/mainwindow.c:582 src/messageview.c:164
-msgid "/_View/_Code set/Western European (ISO-8859-_1)"
-msgstr "/Απεικόνιση/Κωδικοσύνολο/Δυτικής Ευρώπης (ISO-8859-_1)"
-
-#: src/mainwindow.c:584 src/messageview.c:166
 #, fuzzy
-msgid "/_View/_Code set/Western European (ISO-8859-15)"
-msgstr "/Απεικόνιση/Κωδικοσύνολο/Δυτικής Ευρώπης (ISO-8859-_1)"
-
-#: src/mainwindow.c:587 src/messageview.c:169
-msgid "/_View/_Code set/Central European (ISO-8859-_2)"
-msgstr "/Απεικόνιση/Κωδικοσύνολο/Κεντρικής Ευρώπης (ISO-8859-_2)"
-
-#: src/mainwindow.c:590 src/messageview.c:172
-msgid "/_View/_Code set/_Baltic (ISO-8859-13)"
-msgstr "/Απεικόνιση/Κωδικοσύνολο/Βαλτικής (ISO-8859-13)"
-
-#: src/mainwindow.c:592 src/messageview.c:174
-msgid "/_View/_Code set/Baltic (ISO-8859-_4)"
-msgstr "/Απεικόνιση/Κωδικοσύνολο/Βαλτικής (ISO-8859-_4)"
-
-#: src/mainwindow.c:595 src/messageview.c:177
-msgid "/_View/_Code set/Greek (ISO-8859-_7)"
-msgstr "/Απεικόνιση/Κωδικοσύνολο/Ελληνικό (ISO-8859-_7)"
-
-#: src/mainwindow.c:598 src/messageview.c:180
-msgid "/_View/_Code set/Turkish (ISO-8859-_9)"
-msgstr "/Απεικόνιση/Κωδικοσύνολο/Τουρκικό (ISO-8859-_9)"
-
-#: src/mainwindow.c:601 src/messageview.c:183
-msgid "/_View/_Code set/Cyrillic (ISO-8859-_5)"
-msgstr "/Απεικόνιση/Κωδικοσύνολο/Κυριλλικό (ISO-8859-_5)"
-
-#: src/mainwindow.c:603 src/messageview.c:185
-msgid "/_View/_Code set/Cyrillic (KOI8-_R)"
-msgstr "/Απεικόνιση/Κωδικοσύνολο/Κυριλλικό (KOI8-_R)"
+msgid "/_View/Character _encoding/_Auto detect"
+msgstr "/Απεικόνιση/Κωδικοσύνολο/Αυτόματη αναγνώριση"
 
-#: src/mainwindow.c:605 src/messageview.c:187
+#: src/mainwindow.c:618 src/messageview.c:194
 #, fuzzy
-msgid "/_View/_Code set/Cyrillic (KOI8-U)"
-msgstr "/Απεικόνιση/Κωδικοσύνολο/Κυριλλικό (KOI8-_R)"
-
-#: src/mainwindow.c:607 src/messageview.c:189
-msgid "/_View/_Code set/Cyrillic (Windows-1251)"
-msgstr "/Απεικόνιση/Κωδικοσύνολο/Κυριλλικό (Windows-1251)"
-
-#: src/mainwindow.c:610 src/messageview.c:192
-msgid "/_View/_Code set/Japanese (ISO-2022-_JP)"
-msgstr "/Απεικόνιση/Κωδικοσύνολο/Ιαπωνέζικο (ISO-2022-_JP)"
-
-#: src/mainwindow.c:612 src/messageview.c:194
-msgid "/_View/_Code set/Japanese (ISO-2022-JP-2)"
+msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/Ιαπωνέζικο (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:614 src/messageview.c:196
-msgid "/_View/_Code set/Japanese (_EUC-JP)"
+#: src/mainwindow.c:620 src/messageview.c:196
+#, fuzzy
+msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/Ιαπωνέζικο (_EUC-JP)"
 
-#: src/mainwindow.c:616 src/messageview.c:198
-msgid "/_View/_Code set/Japanese (_Shift__JIS)"
+#: src/mainwindow.c:622 src/messageview.c:198
+#, fuzzy
+msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/Ιαπωνέζικο (_Shift__JIS)"
 
-#: src/mainwindow.c:619 src/messageview.c:201
-msgid "/_View/_Code set/Simplified Chinese (_GB2312)"
-msgstr "/Απεικόνιση/Κωδικοσύνολο/Απλοποιημένο Κινεζικό (_GB2312)"
-
-#: src/mainwindow.c:621 src/messageview.c:203
-msgid "/_View/_Code set/Traditional Chinese (_Big5)"
-msgstr "/Απεικόνιση/Κωδικοσύνολο/Παραδοσιακό Κινεζικό (_Big5)"
-
-#: src/mainwindow.c:623 src/messageview.c:205
-msgid "/_View/_Code set/Traditional Chinese (EUC-_TW)"
-msgstr "/Απεικόνιση/Κωδικοσύνολο/Παραδοσιακό Κινεζικό (EUC-_TW)"
-
-#: src/mainwindow.c:625 src/messageview.c:207
-msgid "/_View/_Code set/Chinese (ISO-2022-_CN)"
-msgstr "/Απεικόνιση/Κωδικοσύνολο/Κινεζικό (ISO-2022-_CN)"
-
-#: src/mainwindow.c:628 src/messageview.c:210
-msgid "/_View/_Code set/Korean (EUC-_KR)"
-msgstr "/Απεικόνιση/Κωδικοσύνολο/Κορεάτικο (EUC-_KR)"
-
-#: src/mainwindow.c:630 src/messageview.c:212
-msgid "/_View/_Code set/Korean (ISO-2022-KR)"
-msgstr "/Απεικόνιση/Κωδικοσύνολο/Κορεάτικο (ISO-2022-KR)"
-
-#: src/mainwindow.c:633 src/messageview.c:215
+#: src/mainwindow.c:632 src/messageview.c:207
 #, fuzzy
-msgid "/_View/_Code set/Thai (TIS-620)"
+msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/Κινεζικό (ISO-2022-_CN)"
 
-#: src/mainwindow.c:635 src/messageview.c:217
+#: src/mainwindow.c:638 src/messageview.c:212
 #, fuzzy
-msgid "/_View/_Code set/Thai (Windows-874)"
-msgstr "/Απεικόνιση/Κωδικοσύνολο/Κυριλλικό (Windows-1251)"
+msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
+msgstr "/Απεικόνιση/Κωδικοσύνολο/Κορεάτικο (ISO-2022-KR)"
 
-#: src/mainwindow.c:642 src/summaryview.c:371
+#: src/mainwindow.c:651 src/summaryview.c:371
 #, fuzzy
 msgid "/_View/Open in new _window"
 msgstr "/Άνοιγμα σε νέο παράθυρο"
 
-#: src/mainwindow.c:643 src/messageview.c:224
+#: src/mainwindow.c:652 src/messageview.c:224
 #, fuzzy
 msgid "/_View/Mess_age source"
 msgstr "/Απεικόνιση/Εμφάνιση του πηγαίου"
 
-#: src/mainwindow.c:644 src/messageview.c:225
+#: src/mainwindow.c:653 src/messageview.c:225
 msgid "/_View/Show all _header"
 msgstr "/Απεικόνιση/Εμφάνιση της πλήρους κεφαλίδας"
 
-#: src/mainwindow.c:646
+#: src/mainwindow.c:655
 #, fuzzy
 msgid "/_View/_Update summary"
 msgstr "/Απεικόνιση/Κωδικοσύνολο"
 
-#: src/mainwindow.c:648 src/messageview.c:227
+#: src/mainwindow.c:657 src/messageview.c:227
 msgid "/_Message"
 msgstr "/Μήνυμα"
 
-#: src/mainwindow.c:649
+#: src/mainwindow.c:658
 #, fuzzy
 msgid "/_Message/Recei_ve"
 msgstr "/Μήνυμα/Επαν-επεξεργασία"
 
-#: src/mainwindow.c:650
+#: src/mainwindow.c:659
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/Μήνυμα/Λήψη από όλους τους λογαριασμούς"
 
-#: src/mainwindow.c:652
+#: src/mainwindow.c:661
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/Μήνυμα/Λήψη από όλους τους λογαριασμούς"
 
-#: src/mainwindow.c:654
+#: src/mainwindow.c:663
 #, fuzzy
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/Μήνυμα/Αποστολή αργότερα"
 
-#: src/mainwindow.c:656
+#: src/mainwindow.c:665
 #, fuzzy
 msgid "/_Message/Recei_ve/---"
 msgstr "/Μήνυμα/Επαν-επεξεργασία"
 
-#: src/mainwindow.c:657
+#: src/mainwindow.c:666
 #, fuzzy
 msgid "/_Message/_Send queued messages"
 msgstr "/Μήνυμα/Αποστολή μηνυμάτων από την ουρά"
 
-#: src/mainwindow.c:658 src/mainwindow.c:660 src/mainwindow.c:667
-#: src/mainwindow.c:672 src/mainwindow.c:676 src/mainwindow.c:685
+#: src/mainwindow.c:667 src/mainwindow.c:669 src/mainwindow.c:676
+#: src/mainwindow.c:681 src/mainwindow.c:685 src/mainwindow.c:694
 #: src/messageview.c:230 src/messageview.c:238 src/messageview.c:243
 msgid "/_Message/---"
 msgstr "/Μήνυμα/---"
 
-#: src/mainwindow.c:659 src/messageview.c:228
+#: src/mainwindow.c:668 src/messageview.c:228
 msgid "/_Message/Compose _new message"
 msgstr "/Μήνυμα/Σύνθεση νέου μηνύματος"
 
-#: src/mainwindow.c:661 src/messageview.c:231
+#: src/mainwindow.c:670 src/messageview.c:231
 msgid "/_Message/_Reply"
 msgstr "/Μήνυμα/Απάντηση"
 
-#: src/mainwindow.c:662
+#: src/mainwindow.c:671
 #, fuzzy
 msgid "/_Message/Repl_y to"
 msgstr "/Μήνυμα/Απάντηση σε"
 
-#: src/mainwindow.c:663 src/messageview.c:232
+#: src/mainwindow.c:672 src/messageview.c:232
 #, fuzzy
 msgid "/_Message/Repl_y to/_all"
 msgstr "/Μήνυμα/Απάντηση σε όλους"
 
-#: src/mainwindow.c:664 src/messageview.c:234
+#: src/mainwindow.c:673 src/messageview.c:234
 #, fuzzy
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/Μήνυμα/Απάντηση στον αποστολέα"
 
-#: src/mainwindow.c:665 src/messageview.c:236
+#: src/mainwindow.c:674 src/messageview.c:236
 #, fuzzy
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/Μήνυμα/Απάντηση σε όλους"
 
-#: src/mainwindow.c:668 src/messageview.c:239
+#: src/mainwindow.c:677 src/messageview.c:239
 msgid "/_Message/_Forward"
 msgstr "/Μήνυμα/Προώθηση"
 
-#: src/mainwindow.c:669 src/messageview.c:240
+#: src/mainwindow.c:678 src/messageview.c:240
 #, fuzzy
 msgid "/_Message/For_ward as attachment"
 msgstr "/Μήνυμα/Προώθηση σαν προσάρτηση"
 
-#: src/mainwindow.c:671 src/messageview.c:242
+#: src/mainwindow.c:680 src/messageview.c:242
 #, fuzzy
 msgid "/_Message/Redirec_t"
 msgstr "/Μήνυμα/Επαν-επεξεργασία"
 
-#: src/mainwindow.c:673
+#: src/mainwindow.c:682
 msgid "/_Message/M_ove..."
 msgstr "/Μήνυμα/Μετακίνηση..."
 
-#: src/mainwindow.c:674
+#: src/mainwindow.c:683
 msgid "/_Message/_Copy..."
 msgstr "/Μήνυμα/Αντιγραφή..."
 
-#: src/mainwindow.c:675
+#: src/mainwindow.c:684
 msgid "/_Message/_Delete"
 msgstr "/Μήνυμα/Διαγραφή"
 
-#: src/mainwindow.c:677
+#: src/mainwindow.c:686
 msgid "/_Message/_Mark"
 msgstr "/Μήνυμα/Σήμανση"
 
-#: src/mainwindow.c:678
+#: src/mainwindow.c:687
 msgid "/_Message/_Mark/_Mark"
 msgstr "/Mήνυμα/Σήμανση/Σήμανση"
 
-#: src/mainwindow.c:679
+#: src/mainwindow.c:688
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/Mήνυμα/Σήμανση/Αναίρεση σήμανσης"
 
-#: src/mainwindow.c:680
+#: src/mainwindow.c:689
 msgid "/_Message/_Mark/---"
 msgstr "/Mήνυμα/Σήμανση/---"
 
-#: src/mainwindow.c:681
+#: src/mainwindow.c:690
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/Mήνυμα/Σήμανση/Σήμανση ως αδιάβαστο"
 
-#: src/mainwindow.c:682
+#: src/mainwindow.c:691
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/Mήνυμα/Σήμανση/Σήμανση ως διαβασμένο"
 
-#: src/mainwindow.c:684
+#: src/mainwindow.c:693
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/Mήνυμα/Σήμανση/Σήμανση όλων ως διαβασμένα"
 
-#: src/mainwindow.c:686 src/messageview.c:244
+#: src/mainwindow.c:695 src/messageview.c:244
 msgid "/_Message/Re-_edit"
 msgstr "/Μήνυμα/Επαν-επεξεργασία"
 
-#: src/mainwindow.c:690 src/messageview.c:248
+#: src/mainwindow.c:699 src/messageview.c:248
 #, fuzzy
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/Προσθήκη αποστολέα στον κατάλογο διευθύνσεων"
 
-#: src/mainwindow.c:693
+#: src/mainwindow.c:702
 #, fuzzy
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/Περίληψη/Φιλτράρισμα μηνυμάτων"
 
-#: src/mainwindow.c:695
+#: src/mainwindow.c:704
 #, fuzzy
 msgid "/_Tools/Filter _selected messages"
 msgstr "/Περίληψη/Φιλτράρισμα μηνυμάτων"
 
-#: src/mainwindow.c:697 src/messageview.c:251
+#: src/mainwindow.c:706 src/messageview.c:251
 #, fuzzy
 msgid "/_Tools/_Create filter rule"
 msgstr "/Περίληψη/Φιλτράρισμα μηνυμάτων"
 
-#: src/mainwindow.c:698 src/messageview.c:253
+#: src/mainwindow.c:707 src/messageview.c:253
 #, fuzzy
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/Περίληψη/Φιλτράρισμα μηνυμάτων"
 
-#: src/mainwindow.c:700 src/messageview.c:255
+#: src/mainwindow.c:709 src/messageview.c:255
 #, fuzzy
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/Περίληψη/Φιλτράρισμα μηνυμάτων"
 
-#: src/mainwindow.c:702 src/messageview.c:257
+#: src/mainwindow.c:711 src/messageview.c:257
 #, fuzzy
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/Περίληψη/Φιλτράρισμα μηνυμάτων"
 
-#: src/mainwindow.c:704 src/messageview.c:259
+#: src/mainwindow.c:713 src/messageview.c:259
 #, fuzzy
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/Περίληψη/Φιλτράρισμα μηνυμάτων"
 
-#: src/mainwindow.c:709
+#: src/mainwindow.c:718
 #, fuzzy
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/Περίληψη/Διαγραφή διπλών μηνυμάτων"
 
-#: src/mainwindow.c:712
+#: src/mainwindow.c:721
 #, fuzzy
 msgid "/_Tools/E_xecute"
 msgstr "/Εκτέλεση"
 
-#: src/mainwindow.c:714
+#: src/mainwindow.c:723
 #, fuzzy
 msgid "/_Tools/_Log window"
 msgstr "/Εργαλεία/Παράθυρο καταγραφής"
 
-#: src/mainwindow.c:716
+#: src/mainwindow.c:725
 msgid "/_Configuration"
 msgstr "/Ρυθμίσεις"
 
-#: src/mainwindow.c:717
+#: src/mainwindow.c:726
 msgid "/_Configuration/_Common preferences..."
 msgstr "/Ρυθμίσεις/Κοινές επιλογές..."
 
-#: src/mainwindow.c:719
+#: src/mainwindow.c:728
 msgid "/_Configuration/_Filter setting..."
 msgstr "/Ρυθμίσεις/Επιλογές φίλτρων..."
 
-#: src/mainwindow.c:721
+#: src/mainwindow.c:730
 #, fuzzy
 msgid "/_Configuration/_Template..."
 msgstr "/Ρυθμίσεις/Επιλογές φίλτρων..."
 
-#: src/mainwindow.c:722
+#: src/mainwindow.c:731
 #, fuzzy
 msgid "/_Configuration/_Actions..."
 msgstr "/Ρυθμίσεις/Επεξεργασία λογαριασμών..."
 
-#: src/mainwindow.c:723
+#: src/mainwindow.c:732
 msgid "/_Configuration/---"
 msgstr "/Ρυθμίσεις/---"
 
-#: src/mainwindow.c:724
+#: src/mainwindow.c:733
 #, fuzzy
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/Ρυθμίσεις/Επιλογές ανά λογαριασμό..."
 
-#: src/mainwindow.c:726
+#: src/mainwindow.c:735
 msgid "/_Configuration/Create _new account..."
 msgstr "/Ρυθμίσεις/Δημιουργία νέου λογαριασμού..."
 
-#: src/mainwindow.c:728
+#: src/mainwindow.c:737
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/Ρυθμίσεις/Επεξεργασία λογαριασμών..."
 
-#: src/mainwindow.c:730
+#: src/mainwindow.c:739
 msgid "/_Configuration/C_hange current account"
 msgstr "/Ρυθμίσεις/Αλλαγή τρέχοντος λογαριασμού"
 
-#: src/mainwindow.c:734
+#: src/mainwindow.c:743
 msgid "/_Help/_Manual"
 msgstr "/Βοήθεια/_Manual"
 
-#: src/mainwindow.c:735
+#: src/mainwindow.c:744
 msgid "/_Help/_Manual/_English"
 msgstr "/Βοήθεια/_Manual/Αγγλικό"
 
-#: src/mainwindow.c:736
+#: src/mainwindow.c:745
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/Βοήθεια/_Manual/Ιαπωνέζικο"
 
-#: src/mainwindow.c:737
+#: src/mainwindow.c:746
 #, fuzzy
 msgid "/_Help/_FAQ"
 msgstr "/Βοήθεια/Σχετικά"
 
-#: src/mainwindow.c:738
+#: src/mainwindow.c:747
 #, fuzzy
 msgid "/_Help/_FAQ/_English"
 msgstr "/Βοήθεια/_Manual/Αγγλικό"
 
-#: src/mainwindow.c:739
+#: src/mainwindow.c:748
 #, fuzzy
 msgid "/_Help/_FAQ/_German"
 msgstr "/Βοήθεια/_Manual/Αγγλικό"
 
-#: src/mainwindow.c:740
+#: src/mainwindow.c:749
 #, fuzzy
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/Βοήθεια/_Manual/Αγγλικό"
 
-#: src/mainwindow.c:741
+#: src/mainwindow.c:750
 msgid "/_Help/_FAQ/_French"
 msgstr ""
 
-#: src/mainwindow.c:742
+#: src/mainwindow.c:751
 #, fuzzy
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/Βοήθεια/_Manual/Αγγλικό"
 
-#: src/mainwindow.c:743
+#: src/mainwindow.c:752
 msgid "/_Help/---"
 msgstr "/Βοήθεια/---"
 
-#: src/mainwindow.c:783
+#: src/mainwindow.c:792
 msgid "Creating main window...\n"
 msgstr "Δημιουργώ το κυρίως παράθυρο...\n"
 
-#: src/mainwindow.c:943
+#: src/mainwindow.c:952
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "MainWindow: η κατανομή χρωμάτων %d απέτυχε\n"
 
-#: src/mainwindow.c:1021 src/summaryview.c:1368 src/summaryview.c:1677
+#: src/mainwindow.c:1030 src/summaryview.c:1368 src/summaryview.c:1677
 #: src/summaryview.c:1785 src/summaryview.c:1831 src/summaryview.c:2453
 #: src/summaryview.c:3080 src/summaryview.c:3146 src/summaryview.c:3171
 #: src/summaryview.c:3284
 msgid "done.\n"
 msgstr "έγινε.\n"
 
-#: src/mainwindow.c:1137 src/mainwindow.c:1178 src/mainwindow.c:1206
+#: src/mainwindow.c:1146 src/mainwindow.c:1187 src/mainwindow.c:1215
 msgid "Untitled"
 msgstr "Χωρίς τίτλο"
 
-#: src/mainwindow.c:1207
+#: src/mainwindow.c:1216
 msgid "none"
 msgstr "κανένα"
 
-#: src/mainwindow.c:1257
+#: src/mainwindow.c:1266
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr ""
 
-#: src/mainwindow.c:1477
+#: src/mainwindow.c:1486
 msgid "Offline"
 msgstr ""
 
-#: src/mainwindow.c:1478
+#: src/mainwindow.c:1487
 msgid "You are offline. Go online?"
 msgstr ""
 
-#: src/mainwindow.c:1492
+#: src/mainwindow.c:1501
 #, fuzzy
 msgid "Empty all trash"
 msgstr "Άδειασμα διαγραμμένων"
 
-#: src/mainwindow.c:1493
+#: src/mainwindow.c:1502
 #, fuzzy
 msgid "Empty messages in all trash?"
 msgstr "Να αδειάσω όλα τα διαγραμμένα μηνύματα"
 
-#: src/mainwindow.c:1521
+#: src/mainwindow.c:1530
 msgid "Add mailbox"
 msgstr "Προσθήκη mailbox"
 
-#: src/mainwindow.c:1522
+#: src/mainwindow.c:1531
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3273,16 +3306,16 @@ msgstr ""
 "Αν οριστεί το υπάρχον mailbox, θα\n"
 "σαρωθεί αυτόματα."
 
-#: src/mainwindow.c:1528
+#: src/mainwindow.c:1537
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Το mailbox `%s' υπάρχει ήδη"
 
-#: src/mainwindow.c:1533 src/setup.c:57
+#: src/mainwindow.c:1542 src/setup.c:57
 msgid "Mailbox"
 msgstr "Mailbox"
 
-#: src/mainwindow.c:1539 src/setup.c:63
+#: src/mainwindow.c:1548 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3291,151 +3324,151 @@ msgstr ""
 "Η δημιουργία του mailbox απέτυχε.\n"
 "Ίσως κάποια αρχεία να υπάρχουν ήδη, ή δεν έχετε δικαίωμα να γράψετε εκεί. "
 
-#: src/mainwindow.c:1912
+#: src/mainwindow.c:1921
 msgid "Sylpheed - Folder View"
 msgstr ""
 
-#: src/mainwindow.c:1932 src/messageview.c:358
+#: src/mainwindow.c:1941 src/messageview.c:358
 msgid "Sylpheed - Message View"
 msgstr ""
 
-#: src/mainwindow.c:2079 src/summaryview.c:340
+#: src/mainwindow.c:2088 src/summaryview.c:340
 msgid "/_Reply"
 msgstr "/Απάντηση"
 
-#: src/mainwindow.c:2080
+#: src/mainwindow.c:2089
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "Απάντηση σε όλους"
 
-#: src/mainwindow.c:2081
+#: src/mainwindow.c:2090
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/Απάντηση στον αποστολέα"
 
-#: src/mainwindow.c:2082
+#: src/mainwindow.c:2091
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/Απάντηση σε όλους"
 
-#: src/mainwindow.c:2087 src/summaryview.c:347
+#: src/mainwindow.c:2096 src/summaryview.c:347
 msgid "/_Forward"
 msgstr "/Προώθηση"
 
-#: src/mainwindow.c:2088 src/summaryview.c:348
+#: src/mainwindow.c:2097 src/summaryview.c:348
 #, fuzzy
 msgid "/For_ward as attachment"
 msgstr "/Προώθηση ως προσάρτηση"
 
-#: src/mainwindow.c:2089 src/summaryview.c:349
+#: src/mainwindow.c:2098 src/summaryview.c:349
 #, fuzzy
 msgid "/Redirec_t"
 msgstr "/Επαν-επεξεργασία"
 
-#: src/mainwindow.c:2125
+#: src/mainwindow.c:2134
 msgid "Get"
 msgstr "Λήψη"
 
-#: src/mainwindow.c:2126
+#: src/mainwindow.c:2135
 msgid "Incorporate new mail"
 msgstr "Λήψη νέου mail"
 
-#: src/mainwindow.c:2133
+#: src/mainwindow.c:2142
 msgid "Get all"
 msgstr ""
 "Λήψη\n"
 "όλων"
 
-#: src/mainwindow.c:2134
+#: src/mainwindow.c:2143
 msgid "Incorporate new mail of all accounts"
 msgstr "Λήψη νέου mail από όλους τους λογαριασμούς"
 
-#: src/mainwindow.c:2145
+#: src/mainwindow.c:2154
 msgid "Send queued message(s)"
 msgstr "Αποστολή όλων των μηνυμάτων από την ουρά"
 
-#: src/mainwindow.c:2155 src/prefs_account.c:705 src/prefs_common.c:852
+#: src/mainwindow.c:2164 src/prefs_account.c:705 src/prefs_common.c:852
 #: src/prefs_folder_item.c:137
 msgid "Compose"
 msgstr "Σύνθεση"
 
-#: src/mainwindow.c:2156
+#: src/mainwindow.c:2165
 msgid "Compose new message"
 msgstr "Σύνθεση νέου μηνύματος"
 
-#: src/mainwindow.c:2164 src/prefs_common.c:1353
+#: src/mainwindow.c:2173 src/prefs_common.c:1365
 msgid "Reply"
 msgstr "Απάντηση"
 
-#: src/mainwindow.c:2165 src/mainwindow.c:2178
+#: src/mainwindow.c:2174 src/mainwindow.c:2187
 msgid "Reply to the message"
 msgstr "Απάντηση στο μήνυμα"
 
-#: src/mainwindow.c:2183
+#: src/mainwindow.c:2192
 msgid "Reply all"
 msgstr ""
 "Απάντηση\n"
 "όλων"
 
-#: src/mainwindow.c:2184
+#: src/mainwindow.c:2193
 msgid "Reply to all"
 msgstr "Απάντηση σε όλους"
 
-#: src/mainwindow.c:2192 src/prefs_filter_edit.c:719
+#: src/mainwindow.c:2201 src/prefs_filter_edit.c:719
 msgid "Forward"
 msgstr "Προώθηση"
 
-#: src/mainwindow.c:2193 src/mainwindow.c:2206
+#: src/mainwindow.c:2202 src/mainwindow.c:2215
 msgid "Forward the message"
 msgstr "Προώθηση μηνύματος"
 
-#: src/mainwindow.c:2213
+#: src/mainwindow.c:2222
 msgid "Delete the message"
 msgstr "Διαγραφή μηνύματος"
 
-#: src/mainwindow.c:2221
+#: src/mainwindow.c:2230
 msgid "Execute"
 msgstr "Εκτέλεση"
 
-#: src/mainwindow.c:2222
+#: src/mainwindow.c:2231
 msgid "Execute marked process"
 msgstr "Εκτέλεση σημειωμένης εργασίας"
 
-#: src/mainwindow.c:2231
+#: src/mainwindow.c:2240
 msgid "Next unread message"
 msgstr "Επόμενο αδιάβαστο μήνυμα"
 
-#: src/mainwindow.c:2242
+#: src/mainwindow.c:2251
 msgid "Prefs"
 msgstr "Επιλογές"
 
-#: src/mainwindow.c:2243
+#: src/mainwindow.c:2252
 #, fuzzy
 msgid "Common preferences"
 msgstr "Κοινές Επιλογές"
 
-#: src/mainwindow.c:2250 src/prefs_folder_item.c:258
+#: src/mainwindow.c:2259 src/prefs_folder_item.c:258
 #: src/prefs_folder_item.c:269 src/progressdialog.c:50
 msgid "Account"
 msgstr "Λογ/σμός"
 
-#: src/mainwindow.c:2251
+#: src/mainwindow.c:2260
 msgid "Account setting"
 msgstr "Ρυθμίσεις λογαριασμού"
 
-#: src/mainwindow.c:2425
+#: src/mainwindow.c:2434
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 
-#: src/mainwindow.c:2436
+#: src/mainwindow.c:2445
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 
-#: src/mainwindow.c:2624
+#: src/mainwindow.c:2633
 msgid "Exit"
 msgstr "Έξοδος"
 
-#: src/mainwindow.c:2624
+#: src/mainwindow.c:2633
 msgid "Exit this program?"
 msgstr "Έξοδος από αυτό το πρόγραμμα;"
 
@@ -3562,7 +3595,7 @@ msgstr "Η αναζήτηση τελείωσε"
 msgid "Creating message view...\n"
 msgstr "Δημιουργώ απεικόνιση μηνύματος...\n"
 
-#: src/messageview.c:303 src/prefs_common.c:1550
+#: src/messageview.c:303 src/prefs_common.c:1562
 msgid "Text"
 msgstr "Κείμενο"
 
@@ -3576,7 +3609,7 @@ msgstr "Προσάρτηση"
 msgid "Can't save the file `%s'."
 msgstr "Δεν μπορώ να διαγράψω τον κατάλογο `%s'."
 
-#: src/messageview.c:697 src/prefs_common.c:2154 src/summaryview.c:2744
+#: src/messageview.c:697 src/prefs_common.c:2166 src/summaryview.c:2744
 msgid "Print"
 msgstr "Εκτύπωση"
 
@@ -4063,7 +4096,7 @@ msgstr ""
 msgid "Authentication method"
 msgstr "Πιστοποίηση"
 
-#: src/prefs_account.c:1123 src/prefs_account.c:1239 src/prefs_common.c:1189
+#: src/prefs_account.c:1123 src/prefs_account.c:1239 src/prefs_common.c:1201
 msgid "Automatic"
 msgstr "Αυτόματη"
 
@@ -4088,7 +4121,7 @@ msgstr "Δημιουργία Message-ID"
 msgid "Add user-defined header"
 msgstr "Προσθήκη κεφαλίδας ορισμένης από τον χρήστη"
 
-#: src/prefs_account.c:1196 src/prefs_common.c:1714 src/prefs_common.c:1739
+#: src/prefs_account.c:1196 src/prefs_common.c:1726 src/prefs_common.c:1751
 msgid " Edit... "
 msgstr "Επεξεργασία..."
 
@@ -4477,572 +4510,573 @@ msgid "Save sent messages to outbox"
 msgstr "Αποθήκευση σταλμένων μηνυμάτων στο outbox"
 
 #: src/prefs_common.c:1113
-msgid "Outgoing codeset"
+#, fuzzy
+msgid "Outgoing encoding"
 msgstr "Κωδικοσελίδα εξερχομένων"
 
 #: src/prefs_common.c:1128
 msgid "Automatic (Recommended)"
 msgstr "Αυτόματο (Προτεινόμενο)"
 
-#: src/prefs_common.c:1129
+#: src/prefs_common.c:1130
 msgid "7bit ascii (US-ASCII)"
 msgstr "7bit ascii (US-ASCII)"
 
-#: src/prefs_common.c:1130
+#: src/prefs_common.c:1132
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
-#: src/prefs_common.c:1131
+#: src/prefs_common.c:1134
 msgid "Western European (ISO-8859-1)"
 msgstr "Δυτικής Ευρώπης (ISO-8859-1)"
 
-#: src/prefs_common.c:1132
+#: src/prefs_common.c:1135
 #, fuzzy
 msgid "Western European (ISO-8859-15)"
 msgstr "Δυτικής Ευρώπης (ISO-8859-1)"
 
-#: src/prefs_common.c:1133
+#: src/prefs_common.c:1137
 msgid "Central European (ISO-8859-2)"
 msgstr "Κεντρικήs Ευρώπης (ISO-8859-2)"
 
-#: src/prefs_common.c:1134
+#: src/prefs_common.c:1139
 msgid "Baltic (ISO-8859-13)"
 msgstr "Βαλτικής (ISO-8859-13)"
 
-#: src/prefs_common.c:1135
+#: src/prefs_common.c:1140
 msgid "Baltic (ISO-8859-4)"
 msgstr "Βαλτικής (ISO-8859-4)"
 
-#: src/prefs_common.c:1136
+#: src/prefs_common.c:1142
 msgid "Greek (ISO-8859-7)"
 msgstr "Ελληνική (ISO-8859-7)"
 
-#: src/prefs_common.c:1137
+#: src/prefs_common.c:1144
 msgid "Turkish (ISO-8859-9)"
 msgstr "Τουρκική (ISO-8859-9)"
 
-#: src/prefs_common.c:1138
+#: src/prefs_common.c:1146
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Κυριλλική (ISO-8859-5)"
 
-#: src/prefs_common.c:1139
+#: src/prefs_common.c:1147
 msgid "Cyrillic (KOI8-R)"
 msgstr "Κυριλλική (KOI8-R)"
 
-#: src/prefs_common.c:1140
-msgid "Cyrillic (Windows-1251)"
-msgstr "Κυριλλική (Windows-1251)"
-
-#: src/prefs_common.c:1141
+#: src/prefs_common.c:1148
 msgid "Cyrillic (KOI8-U)"
 msgstr "Κυριλλική (KOI8-U)"
 
-#: src/prefs_common.c:1142
+#: src/prefs_common.c:1149
+msgid "Cyrillic (Windows-1251)"
+msgstr "Κυριλλική (Windows-1251)"
+
+#: src/prefs_common.c:1151
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Ιαπωνέζικη (ISO-2022-JP)"
 
-#: src/prefs_common.c:1144
+#: src/prefs_common.c:1153
 msgid "Japanese (EUC-JP)"
 msgstr "Ιαπωνέζικη (EUC-JP)"
 
-#: src/prefs_common.c:1145
+#: src/prefs_common.c:1154
 msgid "Japanese (Shift_JIS)"
 msgstr "Ιαπωνέζικη (Shift_JIS)"
 
-#: src/prefs_common.c:1147
+#: src/prefs_common.c:1157
 msgid "Simplified Chinese (GB2312)"
 msgstr "Απλοποιημένη Κινεζική (GB2312)"
 
-#: src/prefs_common.c:1148
+#: src/prefs_common.c:1158
 msgid "Traditional Chinese (Big5)"
 msgstr "Παραδοσιακή Κινεζική (Big5)"
 
-#: src/prefs_common.c:1150
+#: src/prefs_common.c:1160
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Παραδοσιακή Κινεζική (EUC-TW)"
 
-#: src/prefs_common.c:1151
+#: src/prefs_common.c:1161
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Κινεζική (ISO-2022-CN)"
 
-#: src/prefs_common.c:1153
+#: src/prefs_common.c:1164
 msgid "Korean (EUC-KR)"
 msgstr "Κορεατική (EUC-KR)"
 
-#: src/prefs_common.c:1154
+#: src/prefs_common.c:1166
 msgid "Thai (TIS-620)"
 msgstr ""
 
-#: src/prefs_common.c:1155
+#: src/prefs_common.c:1167
 msgid "Thai (Windows-874)"
 msgstr ""
 
-#: src/prefs_common.c:1165
+#: src/prefs_common.c:1177
 msgid ""
 "If `Automatic' is selected, the optimal encoding for the current locale will "
 "be used."
 msgstr ""
 
-#: src/prefs_common.c:1179
+#: src/prefs_common.c:1191
 #, fuzzy
 msgid "Transfer encoding"
 msgstr "Τύλιξη πριν την αποστολή"
 
-#: src/prefs_common.c:1202
+#: src/prefs_common.c:1214
 msgid ""
 "Specify Content-Transfer-Encoding used when message body contains non-ASCII "
 "characters."
 msgstr ""
 
-#: src/prefs_common.c:1272
+#: src/prefs_common.c:1284
 msgid "Signature separator"
 msgstr "Διαχωρισμός υπογραφής"
 
-#: src/prefs_common.c:1281
+#: src/prefs_common.c:1293
 msgid "Insert automatically"
 msgstr "Αυτόματη εισαγωγή"
 
-#: src/prefs_common.c:1291
+#: src/prefs_common.c:1303
 msgid "Automatically launch the external editor"
 msgstr "Αυτόματη χρήση εξωτερικού προγράμματος επεξεργασίας"
 
-#: src/prefs_common.c:1301
+#: src/prefs_common.c:1313
 msgid "Undo level"
 msgstr ""
 
-#: src/prefs_common.c:1321
+#: src/prefs_common.c:1333
 msgid "Wrap messages at"
 msgstr "Τύλιξη μηνυμάτων στους"
 
-#: src/prefs_common.c:1333
+#: src/prefs_common.c:1345
 msgid "characters"
 msgstr "χαρακτήρες"
 
-#: src/prefs_common.c:1343
+#: src/prefs_common.c:1355
 msgid "Wrap quotation"
 msgstr "Τύλιξη παράθεσης"
 
-#: src/prefs_common.c:1349
+#: src/prefs_common.c:1361
 #, fuzzy
 msgid "Wrap on input"
 msgstr "Αναδίπλωση γραμμών"
 
-#: src/prefs_common.c:1351
+#: src/prefs_common.c:1363
 msgid "Wrap before sending"
 msgstr "Τύλιξη πριν την αποστολή"
 
-#: src/prefs_common.c:1361
+#: src/prefs_common.c:1373
 msgid "Automatically select account for replies"
 msgstr "Αυτόματη επιλογή λογαριασμού για τις απαντήσεις"
 
-#: src/prefs_common.c:1363
+#: src/prefs_common.c:1375
 msgid "Quote message when replying"
 msgstr "Παράθεση του μηνύματος όταν απαντάτε"
 
-#: src/prefs_common.c:1365
+#: src/prefs_common.c:1377
 #, fuzzy
 msgid "Reply button invokes mailing list reply"
 msgstr "/Απάντηση σε όλους"
 
 #. reply
-#: src/prefs_common.c:1411
+#: src/prefs_common.c:1423
 #, fuzzy
 msgid "Reply format"
 msgstr "Μορφοποίηση ημερομηνίας"
 
-#: src/prefs_common.c:1426 src/prefs_common.c:1468
+#: src/prefs_common.c:1438 src/prefs_common.c:1480
 msgid "Quotation mark"
 msgstr "Σήμα παράθεσης"
 
 #. forward
-#: src/prefs_common.c:1453
+#: src/prefs_common.c:1465
 #, fuzzy
 msgid "Forward format"
 msgstr "Προώθηση"
 
-#: src/prefs_common.c:1500
+#: src/prefs_common.c:1512
 msgid " Description of symbols "
 msgstr " Περιγραφή συμβόλων"
 
-#: src/prefs_common.c:1541
+#: src/prefs_common.c:1553
 msgid "Font"
 msgstr "Γραμματοσειρά"
 
-#: src/prefs_common.c:1573
+#: src/prefs_common.c:1585
 msgid "Translate header name (such as `From:', `Subject:')"
 msgstr ""
 "Μετέφρασε τα ονόματα των πεδίων της επικεφαλίδας (όπως το `From:' σε `Από')"
 
-#: src/prefs_common.c:1576
+#: src/prefs_common.c:1588
 msgid "Display unread number next to folder name"
 msgstr "Εμφάνιση αριθμού αδιάβαστων δίπλα στο όνομα του καταλόγου"
 
-#: src/prefs_common.c:1585
+#: src/prefs_common.c:1597
 msgid "Abbreviate newsgroups longer than"
 msgstr ""
 
-#: src/prefs_common.c:1600
+#: src/prefs_common.c:1612
 #, fuzzy
 msgid "letters"
 msgstr "Διαγραφή"
 
 #. ---- Summary ----
-#: src/prefs_common.c:1606
+#: src/prefs_common.c:1618
 msgid "Summary View"
 msgstr "Απεικόνιση Περίληψης"
 
-#: src/prefs_common.c:1615
+#: src/prefs_common.c:1627
 msgid "Display recipient on `From' column if sender is yourself"
 msgstr ""
 "Εμφάνιση του παραλήπτη στη στήλη `Αποστολέα' αν ο αποστολέας είστε εσείς"
 
-#: src/prefs_common.c:1617
+#: src/prefs_common.c:1629
 msgid "Expand threads"
 msgstr ""
 
-#: src/prefs_common.c:1625 src/prefs_common.c:2443 src/prefs_common.c:2481
+#: src/prefs_common.c:1637 src/prefs_common.c:2455 src/prefs_common.c:2493
 msgid "Date format"
 msgstr "Μορφοποίηση ημερομηνίας"
 
-#: src/prefs_common.c:1646
+#: src/prefs_common.c:1658
 msgid " Set display item of summary... "
 msgstr " Ορισμός εμφανιζόμενων στοιχείων περίληψης... "
 
-#: src/prefs_common.c:1710
+#: src/prefs_common.c:1722
 msgid "Enable coloration of message"
 msgstr "Ενεργοποίηση χρωματισμού των μηνυμάτων"
 
-#: src/prefs_common.c:1724
+#: src/prefs_common.c:1736
 #, fuzzy
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
 msgstr "Display 2-byte alphabet and numeric with 1-byte character"
 
-#: src/prefs_common.c:1730
+#: src/prefs_common.c:1742
 msgid "Display header pane above message view"
 msgstr "Εμφάνιση τμήματος με την κεφαλίδα πάνω από την προβολή μηνύματος"
 
-#: src/prefs_common.c:1737
+#: src/prefs_common.c:1749
 msgid "Display short headers on message view"
 msgstr "Εμφάνιση βραχείας κεφαλίδας στην απεικόνιση μηνύματος"
 
-#: src/prefs_common.c:1758
+#: src/prefs_common.c:1770
 msgid "Line space"
 msgstr "Διάστημα γραμμών"
 
-#: src/prefs_common.c:1772 src/prefs_common.c:1810
+#: src/prefs_common.c:1784 src/prefs_common.c:1822
 msgid "pixel(s)"
 msgstr "pixel(s)"
 
-#: src/prefs_common.c:1777
+#: src/prefs_common.c:1789
 msgid "Scroll"
 msgstr "Κύλιση"
 
-#: src/prefs_common.c:1784
+#: src/prefs_common.c:1796
 msgid "Half page"
 msgstr "Μισή σελίδα"
 
-#: src/prefs_common.c:1790
+#: src/prefs_common.c:1802
 msgid "Smooth scroll"
 msgstr "Ομαλή κύλιση"
 
-#: src/prefs_common.c:1796
+#: src/prefs_common.c:1808
 msgid "Step"
 msgstr "Κατά βήματα"
 
-#: src/prefs_common.c:1816
+#: src/prefs_common.c:1828
 msgid "Images"
 msgstr ""
 
-#: src/prefs_common.c:1824
+#: src/prefs_common.c:1836
 msgid "Resize attached large images to fit in the window"
 msgstr ""
 
-#: src/prefs_common.c:1826
+#: src/prefs_common.c:1838
 #, fuzzy
 msgid "Display images as inline"
 msgstr "Ορισμός εμφάνισης κεφαλίδας"
 
-#: src/prefs_common.c:1871
+#: src/prefs_common.c:1883
 msgid "Automatically check signatures"
 msgstr "Αυτόματος έλεγχος υπογραφών"
 
-#: src/prefs_common.c:1874
+#: src/prefs_common.c:1886
 msgid "Show signature check result in a popup window"
 msgstr "Εμφάνιση του αποτελέσματος του ελέγχου σε ξεχωριστό παράθυρο"
 
-#: src/prefs_common.c:1877
+#: src/prefs_common.c:1889
 msgid "Store passphrase in memory temporarily"
 msgstr ""
 
-#: src/prefs_common.c:1892
+#: src/prefs_common.c:1904
 #, fuzzy
 msgid "Expired after"
 msgstr ""
 "Αποστολή\n"
 "αργότερα"
 
-#: src/prefs_common.c:1905
+#: src/prefs_common.c:1917
 #, fuzzy
 msgid "minute(s) "
 msgstr "λεπτά"
 
-#: src/prefs_common.c:1918
+#: src/prefs_common.c:1930
 msgid "Setting to '0' will store the passphrase for the whole session."
 msgstr ""
 
-#: src/prefs_common.c:1932
+#: src/prefs_common.c:1944
 msgid "Grab input while entering a passphrase"
 msgstr "Grab input while entering a passphrase"
 
-#: src/prefs_common.c:1937
+#: src/prefs_common.c:1949
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "Εμφάνιση ειδοποίησης κατά την εκκίνηση αν το GnuPG δεν λειτουργεί"
 
-#: src/prefs_common.c:1989
+#: src/prefs_common.c:2001
 #, fuzzy
 msgid "Always open messages in summary when selected"
 msgstr "ένα μήνυμα δεν θα παραληφθεί\n"
 
-#: src/prefs_common.c:1993
+#: src/prefs_common.c:2005
 msgid "Open first unread message when entering a folder"
 msgstr ""
 "Άνοιγμα του πρώτου αδιάβαστου μηνύματος κατά τη μετακίνηση σε ένα κατάλογο"
 
-#: src/prefs_common.c:1997
+#: src/prefs_common.c:2009
 #, fuzzy
 msgid "Only mark message as read when opened in new window"
 msgstr "/Μήνυμα/Άνοιγμα σε νέο παράθυρο"
 
-#: src/prefs_common.c:2001
+#: src/prefs_common.c:2013
 msgid "Go to inbox after receiving new mail"
 msgstr "Μετακίνηση στον κατάλογο εισερχομένων μετά τη λήψη νέων μηνυμάτων"
 
-#: src/prefs_common.c:2009
+#: src/prefs_common.c:2021
 msgid "Execute immediately when moving or deleting messages"
 msgstr "Αυτόματη εκτέλεση για τη μεταφορά και διαγραφή μηνυμάτων"
 
-#: src/prefs_common.c:2021
+#: src/prefs_common.c:2033
 #, fuzzy
 msgid "Messages will be marked until execution if this is turned off."
 msgstr ""
 "(Τα μηνύματα απλά θα σημανθούν μέχρι την εκτέλεση\n"
 "αν αυτό είναι απεπιλεγμένο)"
 
-#: src/prefs_common.c:2029
+#: src/prefs_common.c:2041
 #, fuzzy
 msgid "Receive dialog"
 msgstr "Εμφάνιση διαλόγου λήψης"
 
-#: src/prefs_common.c:2039
+#: src/prefs_common.c:2051
 msgid "Show receive dialog"
 msgstr "Εμφάνιση διαλόγου λήψης"
 
-#: src/prefs_common.c:2049
+#: src/prefs_common.c:2061
 msgid "Always"
 msgstr "Πάντα"
 
-#: src/prefs_common.c:2050
+#: src/prefs_common.c:2062
 msgid "Only on manual receiving"
 msgstr ""
 
-#: src/prefs_common.c:2052
+#: src/prefs_common.c:2064
 msgid "Never"
 msgstr "Ποτέ"
 
-#: src/prefs_common.c:2057
+#: src/prefs_common.c:2069
 msgid "Don't popup error dialog on receive error"
 msgstr ""
 
-#: src/prefs_common.c:2060
+#: src/prefs_common.c:2072
 #, fuzzy
 msgid "Close receive dialog when finished"
 msgstr "Εμφάνιση διαλόγου λήψης"
 
-#: src/prefs_common.c:2066
+#: src/prefs_common.c:2078
 msgid " Set key bindings... "
 msgstr ""
 
-#: src/prefs_common.c:2122
+#: src/prefs_common.c:2134
 #, fuzzy, c-format
 msgid "External commands (%s will be replaced with file name / URI)"
 msgstr ""
 "Εξωτερικό πρόγραμμα σύνθεσης (το %s θα αντικατασταθεί με το όνομα αρχείου)"
 
-#: src/prefs_common.c:2131
+#: src/prefs_common.c:2143
 msgid "Web browser"
 msgstr ""
 
-#: src/prefs_common.c:2195
+#: src/prefs_common.c:2207
 msgid "Add address to destination when double-clicked"
 msgstr "Προσθήκη διεύθυνσης στον προορισμό σε διπλό κλικ"
 
-#: src/prefs_common.c:2197
+#: src/prefs_common.c:2209
 msgid "On exit"
 msgstr "Κατά την έξοδο"
 
-#: src/prefs_common.c:2205
+#: src/prefs_common.c:2217
 msgid "Confirm on exit"
 msgstr "Επιβεβαίωση εξόδου"
 
-#: src/prefs_common.c:2212
+#: src/prefs_common.c:2224
 msgid "Empty trash on exit"
 msgstr "Άδειασμα των διαγραμμένων στην έξοδο"
 
-#: src/prefs_common.c:2214
+#: src/prefs_common.c:2226
 msgid "Ask before emptying"
 msgstr "Επιβεβαίωση πριν το άδειασμα"
 
-#: src/prefs_common.c:2218
+#: src/prefs_common.c:2230
 msgid "Warn if there are queued messages"
 msgstr "Προειδοποίηση αν υπάρχουν μηνύματα στην ουρά"
 
-#: src/prefs_common.c:2224
+#: src/prefs_common.c:2236
 msgid "Socket I/O timeout:"
 msgstr ""
 
-#: src/prefs_common.c:2237
+#: src/prefs_common.c:2249
 msgid "second(s)"
 msgstr ""
 
-#: src/prefs_common.c:2419
+#: src/prefs_common.c:2431
 msgid "the full abbreviated weekday name"
 msgstr "η συντομογραφία ημέρας της εβδομάδας"
 
-#: src/prefs_common.c:2420
+#: src/prefs_common.c:2432
 msgid "the full weekday name"
 msgstr "το πλήρες όνομα της μέρας της εβδομάδας"
 
-#: src/prefs_common.c:2421
+#: src/prefs_common.c:2433
 msgid "the abbreviated month name"
 msgstr "η συντομογραφία του μήνα"
 
-#: src/prefs_common.c:2422
+#: src/prefs_common.c:2434
 msgid "the full month name"
 msgstr "το πλήρες όνομα του μήνα"
 
-#: src/prefs_common.c:2423
+#: src/prefs_common.c:2435
 msgid "the preferred date and time for the current locale"
 msgstr "η προτιμώμενη ημερομηνία και ώρα για το τρέχον locale"
 
-#: src/prefs_common.c:2424
+#: src/prefs_common.c:2436
 msgid "the century number (year/100)"
 msgstr "ο αριθμός αιώνα (έτη / 100)"
 
-#: src/prefs_common.c:2425
+#: src/prefs_common.c:2437
 msgid "the day of the month as a decimal number"
 msgstr "η μέρα του μήνα ως δεκαδικός αριθμός"
 
-#: src/prefs_common.c:2426
+#: src/prefs_common.c:2438
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "η ώρα ως δεκαδικός αριθμός χρησιμοποιώντας 24ωρο ρολόι"
 
-#: src/prefs_common.c:2427
+#: src/prefs_common.c:2439
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "η ώρα ως δεκαδικός αριθμός χρησιμοποιώντας 12ωρο ρολόι"
 
-#: src/prefs_common.c:2428
+#: src/prefs_common.c:2440
 msgid "the day of the year as a decimal number"
 msgstr "η μέρα του έτους ως δεκαδικός αριθμός"
 
-#: src/prefs_common.c:2429
+#: src/prefs_common.c:2441
 msgid "the month as a decimal number"
 msgstr "ο μήνας ως δεκαδικός αριθμός"
 
-#: src/prefs_common.c:2430
+#: src/prefs_common.c:2442
 msgid "the minute as a decimal number"
 msgstr "το λεπτό ως δεκαδικός αριθμός"
 
-#: src/prefs_common.c:2431
+#: src/prefs_common.c:2443
 msgid "either AM or PM"
 msgstr "είτε ΠΜ ή ΜΜ"
 
-#: src/prefs_common.c:2432
+#: src/prefs_common.c:2444
 msgid "the second as a decimal number"
 msgstr "το δευτερόλεπτο ως δεκαδικός αριθμός"
 
-#: src/prefs_common.c:2433
+#: src/prefs_common.c:2445
 msgid "the day of the week as a decimal number"
 msgstr "η μέρα της εβδομάδας ως δεκαδικός αριθμός"
 
-#: src/prefs_common.c:2434
+#: src/prefs_common.c:2446
 msgid "the preferred date for the current locale"
 msgstr "η προτιμώμενη ημερομηνία για το τρέχον locale"
 
-#: src/prefs_common.c:2435
+#: src/prefs_common.c:2447
 msgid "the last two digits of a year"
 msgstr "τα τελευταία δύο ψηφία του έτους"
 
-#: src/prefs_common.c:2436
+#: src/prefs_common.c:2448
 msgid "the year as a decimal number"
 msgstr "το έτος ως δεκαδικός αριθμός"
 
-#: src/prefs_common.c:2437
+#: src/prefs_common.c:2449
 msgid "the time zone or name or abbreviation"
 msgstr "Η ζώνη ώρας ή όνομα, ή συνμτομογραφία"
 
-#: src/prefs_common.c:2458
+#: src/prefs_common.c:2470
 msgid "Specifier"
 msgstr "Προσδιοριστής"
 
-#: src/prefs_common.c:2459
+#: src/prefs_common.c:2471
 msgid "Description"
 msgstr "Περιγραφή"
 
-#: src/prefs_common.c:2499
+#: src/prefs_common.c:2511
 msgid "Example"
 msgstr "Παράδειγμα"
 
-#: src/prefs_common.c:2580
+#: src/prefs_common.c:2592
 msgid "Set message colors"
 msgstr "Όρισμος χρωμάτων μηνύματος"
 
-#: src/prefs_common.c:2588
+#: src/prefs_common.c:2600
 msgid "Colors"
 msgstr "Χρώματα"
 
-#: src/prefs_common.c:2622
+#: src/prefs_common.c:2634
 msgid "Quoted Text - First Level"
 msgstr "Παρατιθέμενο κείμενο - Πρώτο επίπεδο"
 
-#: src/prefs_common.c:2628
+#: src/prefs_common.c:2640
 msgid "Quoted Text - Second Level"
 msgstr "Παρατιθέμενο κείμενο - Δεύτερο επίπεδο"
 
-#: src/prefs_common.c:2634
+#: src/prefs_common.c:2646
 msgid "Quoted Text - Third Level"
 msgstr "Παρατιθέμενο κείμενο - Τρίτο επίπεδο"
 
-#: src/prefs_common.c:2640
+#: src/prefs_common.c:2652
 msgid "URI link"
 msgstr "Σύνδεσμος URI"
 
-#: src/prefs_common.c:2647
+#: src/prefs_common.c:2659
 msgid "Recycle quote colors"
 msgstr "Ανακύκλωση χρωμάτων παράθεσης"
 
-#: src/prefs_common.c:2707
+#: src/prefs_common.c:2719
 msgid "Pick color for quotation level 1"
 msgstr "Επιλογή χρώματος πρώτου επιπέδου παράθεσης"
 
-#: src/prefs_common.c:2710
+#: src/prefs_common.c:2722
 msgid "Pick color for quotation level 2"
 msgstr "Επιλογή χρώματος δεύτερου επιπέδου παράθεσης"
 
-#: src/prefs_common.c:2713
+#: src/prefs_common.c:2725
 msgid "Pick color for quotation level 3"
 msgstr "Επιλογή χρώματος τρίτου επιπέδου παράθεσης"
 
-#: src/prefs_common.c:2716
+#: src/prefs_common.c:2728
 msgid "Pick color for URI"
 msgstr "Επιλογή χρώματος για URI"
 
-#: src/prefs_common.c:2853
+#: src/prefs_common.c:2865
 msgid "Description of symbols"
 msgstr "Περιγραφή των συμβόλων"
 
-#: src/prefs_common.c:2909
+#: src/prefs_common.c:2921
 #, fuzzy
 msgid ""
 "Date\n"
@@ -5067,11 +5101,11 @@ msgstr ""
 "Message-ID\n"
 "%"
 
-#: src/prefs_common.c:2922
+#: src/prefs_common.c:2934
 msgid "If x is set, displays expr"
 msgstr ""
 
-#: src/prefs_common.c:2926
+#: src/prefs_common.c:2938
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -5080,7 +5114,7 @@ msgid ""
 "Literal %"
 msgstr ""
 
-#: src/prefs_common.c:2934
+#: src/prefs_common.c:2946
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -5088,28 +5122,28 @@ msgid ""
 "Literal closing curly brace"
 msgstr ""
 
-#: src/prefs_common.c:2971
+#: src/prefs_common.c:2983
 msgid "Font selection"
 msgstr "Επιλογή γραμματοσειράς"
 
-#: src/prefs_common.c:3035
+#: src/prefs_common.c:3047
 #, fuzzy
 msgid "Key bindings"
 msgstr "Στέλνω"
 
-#: src/prefs_common.c:3049
+#: src/prefs_common.c:3061
 msgid ""
 "Select the preset of key bindings.\n"
 "You can also modify each menu's shortcuts by pressing\n"
 "any key(s) when placing the mouse pointer on the item."
 msgstr ""
 
-#: src/prefs_common.c:3061 src/prefs_common.c:3410
+#: src/prefs_common.c:3073 src/prefs_common.c:3422
 #, fuzzy
 msgid "Default"
 msgstr "Προκαθορισμένο κλειδί υπογραφής"
 
-#: src/prefs_common.c:3064 src/prefs_common.c:3419
+#: src/prefs_common.c:3076 src/prefs_common.c:3431
 msgid "Old Sylpheed"
 msgstr ""
 
@@ -6307,6 +6341,12 @@ msgstr ""
 msgid "writing to %s failed.\n"
 msgstr "απέτυχε το γράψιμο στο %s.\n"
 
+#~ msgid "/_View/_Code set/---"
+#~ msgstr "/Απεικόνιση/Κωδικοσύνολο/---"
+
+#~ msgid "/_View/_Code set"
+#~ msgstr "/Απεικόνιση/Κωδικοσύνολο"
+
 #~ msgid "To save this part, pop up the context menu with "
 #~ msgstr "Για να αποθηκεύσετε αυτό το τμήμα, επιλέξτε το μενού με "
 
diff --git a/po/es.po b/po/es.po
index 6e654b99..60489c02 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: 2005-03-15 14:29+0900\n"
+"POT-Creation-Date: 2005-03-16 14:47+0900\n"
 "PO-Revision-Date: 2004-12-21 11:18+0100\n"
 "Last-Translator: Ricardo Mones Lastra <mones@aic.uniovi.es>\n"
 "Language-Team: Ricardo Mones Lastra <mones@aic.uniovi.es>\n"
@@ -97,7 +97,7 @@ msgstr ""
 "en la columna `G' para habilitar la descarga mediante `Traer todo'."
 
 #: src/account.c:638 src/addressadd.c:186 src/addressbook.c:488
-#: src/compose.c:3650 src/editaddress.c:195 src/editaddress.c:936
+#: src/compose.c:3748 src/editaddress.c:195 src/editaddress.c:936
 #: src/editaddress.c:984 src/editbook.c:191 src/editgroup.c:257
 #: src/editjpilot.c:296 src/editldap.c:300 src/editvcard.c:211
 #: src/mimeview.c:151 src/prefs_filter.c:214 src/prefs_folder_item.c:170
@@ -150,13 +150,13 @@ msgstr "Borrar cuenta"
 msgid "Do you really want to delete this account?"
 msgstr "¿Esta seguro de que quiere borrar esta cuenta?"
 
-#: src/account.c:758 src/compose.c:2551 src/compose.c:4807
+#: src/account.c:758 src/compose.c:2632 src/compose.c:4943
 #: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
 #: src/folderview.c:2156 src/folderview.c:2192
 msgid "Yes"
 msgstr "Si"
 
-#: src/account.c:758 src/compose.c:2551 src/compose.c:4807
+#: src/account.c:758 src/compose.c:2632 src/compose.c:4943
 #: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
 #: src/folderview.c:2156 src/folderview.c:2192
 msgid "+No"
@@ -261,7 +261,7 @@ msgstr "Parámetro de usuario de la acción"
 msgid "Add Address to Book"
 msgstr "Añadir dirección a la agenda"
 
-#: src/addressadd.c:196 src/compose.c:4191 src/editaddress.c:196
+#: src/addressadd.c:196 src/compose.c:4292 src/editaddress.c:196
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "Dirección"
@@ -275,7 +275,7 @@ msgstr "Notas"
 msgid "Select Address Book Folder"
 msgstr "Seleccionar carpeta de la agenda"
 
-#: src/addressbook.c:334 src/compose.c:469 src/mainwindow.c:454
+#: src/addressbook.c:334 src/compose.c:477 src/mainwindow.c:454
 #: src/messageview.c:134
 msgid "/_File"
 msgstr "/_Fichero"
@@ -296,8 +296,8 @@ msgstr "/_Fichero/Nuevo _JPilot"
 msgid "/_File/New _Server"
 msgstr "/_Fichero/Nuevo _servidor"
 
-#: src/addressbook.c:343 src/addressbook.c:346 src/compose.c:474
-#: src/compose.c:479 src/compose.c:483 src/mainwindow.c:471
+#: src/addressbook.c:343 src/addressbook.c:346 src/compose.c:482
+#: src/compose.c:487 src/compose.c:491 src/mainwindow.c:471
 #: src/mainwindow.c:474 src/mainwindow.c:476 src/mainwindow.c:479
 #: src/mainwindow.c:481 src/messageview.c:137
 msgid "/_File/---"
@@ -315,7 +315,7 @@ msgstr "/_Fichero/_Borrar"
 msgid "/_File/_Save"
 msgstr "/_Fichero/_Guardar"
 
-#: src/addressbook.c:348 src/compose.c:484 src/messageview.c:138
+#: src/addressbook.c:348 src/compose.c:492 src/messageview.c:138
 msgid "/_File/_Close"
 msgstr "/_Fichero/_Cerrar"
 
@@ -347,7 +347,7 @@ msgstr "/_Dirección/_Editar"
 msgid "/_Address/_Delete"
 msgstr "/_Dirección/_Borrar"
 
-#: src/addressbook.c:356 src/compose.c:585 src/mainwindow.c:688
+#: src/addressbook.c:356 src/compose.c:664 src/mainwindow.c:697
 #: src/messageview.c:246
 msgid "/_Tools"
 msgstr "/_Herramientas"
@@ -356,12 +356,12 @@ msgstr "/_Herramientas"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Herramientas/Importar fichero _LDIF"
 
-#: src/addressbook.c:358 src/compose.c:598 src/mainwindow.c:733
+#: src/addressbook.c:358 src/compose.c:677 src/mainwindow.c:742
 #: src/messageview.c:264
 msgid "/_Help"
 msgstr "/_Ayuda"
 
-#: src/addressbook.c:359 src/compose.c:599 src/mainwindow.c:744
+#: src/addressbook.c:359 src/compose.c:678 src/mainwindow.c:753
 #: src/messageview.c:265
 msgid "/_Help/_About"
 msgstr "/_Ayuda/_Acerca de"
@@ -378,7 +378,7 @@ msgstr "/Nuevo _grupo"
 msgid "/New _Folder"
 msgstr "/Nueva _carpeta"
 
-#: src/addressbook.c:381 src/addressbook.c:391 src/compose.c:463
+#: src/addressbook.c:381 src/addressbook.c:391 src/compose.c:471
 #: src/folderview.c:220 src/folderview.c:222 src/folderview.c:226
 #: src/folderview.c:236 src/folderview.c:238 src/folderview.c:240
 #: src/folderview.c:244 src/folderview.c:254 src/folderview.c:256
@@ -388,7 +388,7 @@ msgstr "/Nueva _carpeta"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:382 src/addressbook.c:392 src/compose.c:486
+#: src/addressbook.c:382 src/addressbook.c:392 src/compose.c:494
 #: src/mainwindow.c:485 src/messageview.c:140
 msgid "/_Edit"
 msgstr "/_Editar"
@@ -401,7 +401,7 @@ msgstr "/_Borrar"
 msgid "E-Mail address"
 msgstr "Dirección e-mail"
 
-#: src/addressbook.c:493 src/compose.c:4192 src/prefs_common.c:2186
+#: src/addressbook.c:493 src/compose.c:4293 src/prefs_common.c:2198
 msgid "Address book"
 msgstr "Agenda de direcciones"
 
@@ -411,7 +411,7 @@ msgstr "Nombre:"
 
 #. Buttons
 #: src/addressbook.c:625 src/addressbook.c:1665 src/addressbook.c:1671
-#: src/editaddress.c:878 src/editaddress.c:1011 src/mainwindow.c:2212
+#: src/editaddress.c:878 src/editaddress.c:1011 src/mainwindow.c:2221
 #: src/prefs_actions.c:263 src/prefs_display_header.c:275
 #: src/prefs_display_header.c:330 src/prefs_template.c:227
 msgid "Delete"
@@ -605,7 +605,7 @@ msgstr "Dirección común"
 msgid "Personal address"
 msgstr "Dirección personal"
 
-#: src/alertpanel.c:123 src/compose.c:4807 src/main.c:458
+#: src/alertpanel.c:123 src/compose.c:4943 src/main.c:458
 msgid "Notice"
 msgstr "Notificación"
 
@@ -613,7 +613,7 @@ msgstr "Notificación"
 msgid "Warning"
 msgstr "Aviso"
 
-#: src/alertpanel.c:149 src/compose.c:2551 src/inc.c:558
+#: src/alertpanel.c:149 src/compose.c:2632 src/inc.c:558
 msgid "Error"
 msgstr "Error"
 
@@ -661,299 +661,417 @@ msgstr "Marrón"
 msgid "None"
 msgstr "Ninguno"
 
-#: src/compose.c:461
+#: src/compose.c:469
 msgid "/_Add..."
 msgstr "/_Añadir"
 
-#: src/compose.c:462
+#: src/compose.c:470
 msgid "/_Remove"
 msgstr "/_Quitar"
 
-#: src/compose.c:464 src/folderview.c:228 src/folderview.c:246
+#: src/compose.c:472 src/folderview.c:228 src/folderview.c:246
 #: src/folderview.c:261
 msgid "/_Properties..."
 msgstr "/_Propiedades..."
 
-#: src/compose.c:470
+#: src/compose.c:478
 msgid "/_File/_Send"
 msgstr "/_Fichero/_Enviar"
 
-#: src/compose.c:472
+#: src/compose.c:480
 msgid "/_File/Send _later"
 msgstr "/_Mensaje/Enviar _más tarde"
 
-#: src/compose.c:475
+#: src/compose.c:483
 msgid "/_File/Save to _draft folder"
 msgstr "/_Mensaje/_Guardar en borradores"
 
-#: src/compose.c:477
+#: src/compose.c:485
 msgid "/_File/Save and _keep editing"
 msgstr "/_Mensaje/Guardar y _seguir editando"
 
-#: src/compose.c:480
+#: src/compose.c:488
 msgid "/_File/_Attach file"
 msgstr "/_Fichero/_Adjuntar fichero"
 
-#: src/compose.c:481
+#: src/compose.c:489
 msgid "/_File/_Insert file"
 msgstr "/_Fichero/_Insertar fichero"
 
-#: src/compose.c:482
+#: src/compose.c:490
 msgid "/_File/Insert si_gnature"
 msgstr "/_Fichero/Insertar _firma"
 
-#: src/compose.c:487
+#: src/compose.c:495
 msgid "/_Edit/_Undo"
 msgstr "/_Editar/_Deshacer"
 
-#: src/compose.c:488
+#: src/compose.c:496
 msgid "/_Edit/_Redo"
 msgstr "/_Editar/_Rehacer"
 
-#: src/compose.c:489 src/compose.c:567 src/mainwindow.c:489
+#: src/compose.c:497 src/compose.c:575 src/mainwindow.c:489
 #: src/messageview.c:143
 msgid "/_Edit/---"
 msgstr "/_Editar/---"
 
-#: src/compose.c:490
+#: src/compose.c:498
 msgid "/_Edit/Cu_t"
 msgstr "/_Editar/Cor_tar"
 
-#: src/compose.c:491 src/mainwindow.c:486 src/messageview.c:141
+#: src/compose.c:499 src/mainwindow.c:486 src/messageview.c:141
 msgid "/_Edit/_Copy"
 msgstr "/_Editar/_Copiar"
 
-#: src/compose.c:492
+#: src/compose.c:500
 msgid "/_Edit/_Paste"
 msgstr "/_Editar/_Pegar"
 
-#: src/compose.c:493
+#: src/compose.c:501
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Editar/Pegar como c_itación"
 
-#: src/compose.c:495 src/mainwindow.c:487 src/messageview.c:142
+#: src/compose.c:503 src/mainwindow.c:487 src/messageview.c:142
 msgid "/_Edit/Select _all"
 msgstr "/_Editar/_Seleccionar todo"
 
-#: src/compose.c:496
+#: src/compose.c:504
 msgid "/_Edit/A_dvanced"
 msgstr "/_Editar/Avanza_das"
 
-#: src/compose.c:497
+#: src/compose.c:505
 msgid "/_Edit/A_dvanced/Move a character backward"
 msgstr "/_Editar/Avanza_das/Ir al caracter anterior"
 
-#: src/compose.c:502
+#: src/compose.c:510
 msgid "/_Edit/A_dvanced/Move a character forward"
 msgstr "/_Editar/Avanza_das/Ir al caracter siguiente"
 
-#: src/compose.c:507
+#: src/compose.c:515
 msgid "/_Edit/A_dvanced/Move a word backward"
 msgstr "/_Editar/Avanza_das/Ir a la palabra anterior"
 
-#: src/compose.c:512
+#: src/compose.c:520
 msgid "/_Edit/A_dvanced/Move a word forward"
 msgstr "/_Editar/Avanza_das/Ir a la palabra siguiente"
 
-#: src/compose.c:517
+#: src/compose.c:525
 msgid "/_Edit/A_dvanced/Move to beginning of line"
 msgstr "/_Editar/Avanza_das/Ir al principio de la línea"
 
-#: src/compose.c:522
+#: src/compose.c:530
 msgid "/_Edit/A_dvanced/Move to end of line"
 msgstr "/_Editar/Avanza_das/Ir al final de la línea"
 
-#: src/compose.c:527
+#: src/compose.c:535
 msgid "/_Edit/A_dvanced/Move to previous line"
 msgstr "/_Editar/Avanza_das/Ir a la línea anterior"
 
-#: src/compose.c:532
+#: src/compose.c:540
 msgid "/_Edit/A_dvanced/Move to next line"
 msgstr "/_Editar/Avanza_das/Ir a la línea siguiente"
 
-#: src/compose.c:537
+#: src/compose.c:545
 msgid "/_Edit/A_dvanced/Delete a character backward"
 msgstr "/_Editar/Avanza_das/Borrar el caracter anterior"
 
-#: src/compose.c:542
+#: src/compose.c:550
 msgid "/_Edit/A_dvanced/Delete a character forward"
 msgstr "/_Editar/Avanza_das/Borrar el caracter siguiente"
 
-#: src/compose.c:547
+#: src/compose.c:555
 msgid "/_Edit/A_dvanced/Delete a word backward"
 msgstr "/_Editar/Avanza_das/Borrar la palabra anterior"
 
-#: src/compose.c:552
+#: src/compose.c:560
 msgid "/_Edit/A_dvanced/Delete a word forward"
 msgstr "/_Editar/Avanza_das/Borrar la palabra siguiente"
 
-#: src/compose.c:557
+#: src/compose.c:565
 msgid "/_Edit/A_dvanced/Delete line"
 msgstr "/_Editar/Avanza_das/Borrar línea"
 
-#: src/compose.c:562
+#: src/compose.c:570
 msgid "/_Edit/A_dvanced/Delete to end of line"
 msgstr "/_Editar/Avanza_das/Borrar hasta el final de la línea"
 
-#: src/compose.c:568
+#: src/compose.c:576
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/_Editar/_Recortar párrafo actual"
 
-#: src/compose.c:570
+#: src/compose.c:578
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/_Editar/_Cortar todas las líneas largas"
 
-#: src/compose.c:572
+#: src/compose.c:580
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Editar/Aut_o-recorte"
 
-#: src/compose.c:573 src/mainwindow.c:494 src/messageview.c:147
+#: src/compose.c:581 src/mainwindow.c:494 src/messageview.c:147
 #: src/summaryview.c:370
 msgid "/_View"
 msgstr "/_Ver"
 
-#: src/compose.c:574
+#: src/compose.c:582
 msgid "/_View/_To"
 msgstr "/_Ver/_Para"
 
-#: src/compose.c:575
+#: src/compose.c:583
 msgid "/_View/_Cc"
 msgstr "/_Ver/_Copia (Cc)"
 
-#: src/compose.c:576
+#: src/compose.c:584
 msgid "/_View/_Bcc"
 msgstr "/_Ver/C_opia oculta (Bcc)"
 
-#: src/compose.c:577
+#: src/compose.c:585
 msgid "/_View/_Reply to"
 msgstr "/_Ver/_Responder a"
 
-#: src/compose.c:578 src/compose.c:580 src/compose.c:582 src/mainwindow.c:512
-#: src/mainwindow.c:515 src/mainwindow.c:541 src/mainwindow.c:565
-#: src/mainwindow.c:641 src/mainwindow.c:645 src/messageview.c:223
+#: src/compose.c:586 src/compose.c:588 src/compose.c:590 src/compose.c:592
+#: src/mainwindow.c:512 src/mainwindow.c:515 src/mainwindow.c:541
+#: src/mainwindow.c:565 src/mainwindow.c:650 src/mainwindow.c:654
+#: src/messageview.c:223
 msgid "/_View/---"
 msgstr "/_Ver/---"
 
-#: src/compose.c:579
+#: src/compose.c:587
 msgid "/_View/_Followup to"
 msgstr "/_Ver/_Añadir a"
 
-#: src/compose.c:581
+#: src/compose.c:589
 msgid "/_View/R_uler"
 msgstr "/_Ver/_Regleta"
 
-#: src/compose.c:583
+#: src/compose.c:591
 msgid "/_View/_Attachment"
 msgstr "/_Ver/_Adjuntos"
 
-#: src/compose.c:586 src/mainwindow.c:689 src/messageview.c:247
+#: src/compose.c:598 src/mainwindow.c:572 src/messageview.c:154
+#, fuzzy
+msgid "/_View/Character _encoding"
+msgstr "/_Ver/_Ordenar/Descendente"
+
+#: src/compose.c:599
+msgid "/_View/Character _encoding/_Automatic"
+msgstr ""
+
+#: src/compose.c:601 src/compose.c:607 src/compose.c:613 src/compose.c:617
+#: src/compose.c:623 src/compose.c:627 src/compose.c:631 src/compose.c:641
+#: src/compose.c:645 src/compose.c:653 src/compose.c:657 src/mainwindow.c:568
+#: src/mainwindow.c:575 src/messageview.c:150
+#, fuzzy
+msgid "/_View/Character _encoding/---"
+msgstr "/_Ver/_Ordenar/Descendente"
+
+#: src/compose.c:603 src/mainwindow.c:576 src/messageview.c:158
+#, fuzzy
+msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
+msgstr "/_Ver/_Conjunto de códigos/ASCII de 7 bits (US-ASC_II)"
+
+#: src/compose.c:605 src/mainwindow.c:578 src/messageview.c:161
+#, fuzzy
+msgid "/_View/Character _encoding/Unicode (_UTF-8)"
+msgstr "/_Ver/_Conjunto de códigos/Unicode (_UTF-8)"
+
+#: src/compose.c:609 src/mainwindow.c:582 src/messageview.c:164
+#, fuzzy
+msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
+msgstr "/_Ver/_Conjunto de códigos/Europeo occidental (ISO-8859-_1)"
+
+#: src/compose.c:611 src/mainwindow.c:584 src/messageview.c:166
+#, fuzzy
+msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
+msgstr "/_Ver/_Conjunto de códigos/Europeo occidental (ISO-8859-_15)"
+
+#: src/compose.c:615 src/mainwindow.c:588 src/messageview.c:169
+#, fuzzy
+msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
+msgstr "/_Ver/_Conjunto de códigos/Centroeuropeo (ISO-8859-_2)"
+
+#: src/compose.c:619 src/mainwindow.c:592 src/messageview.c:172
+#, fuzzy
+msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
+msgstr "/_Ver/_Conjunto de códigos/Báltico (ISO-8859-13)"
+
+#: src/compose.c:621 src/mainwindow.c:594 src/messageview.c:174
+#, fuzzy
+msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
+msgstr "/_Ver/_Conjunto de códigos/Báltico (ISO-8859-_4)"
+
+#: src/compose.c:625 src/mainwindow.c:598 src/messageview.c:177
+#, fuzzy
+msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
+msgstr "/_Ver/_Conjunto de códigos/Griego (ISO-8859-_7)"
+
+#: src/compose.c:629 src/mainwindow.c:602 src/messageview.c:180
+#, fuzzy
+msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
+msgstr "/_Ver/_Conjunto de códigos/Turco (ISO-8859-_9)"
+
+#: src/compose.c:633 src/mainwindow.c:606 src/messageview.c:183
+#, fuzzy
+msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
+msgstr "/_Ver/_Conjunto de códigos/Cirílico (ISO-8859-_5)"
+
+#: src/compose.c:635 src/mainwindow.c:608 src/messageview.c:185
+#, fuzzy
+msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
+msgstr "/_Ver/_Conjunto de códigos/Cirílico (KOI8-_R)"
+
+#: src/compose.c:637 src/mainwindow.c:610 src/messageview.c:187
+#, fuzzy
+msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
+msgstr "/_Ver/_Conjunto de códigos/Cirílico (KOI8-U)"
+
+#: src/compose.c:639 src/mainwindow.c:612 src/messageview.c:189
+#, fuzzy
+msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
+msgstr "/_Ver/_Conjunto de códigos/Cirílico (Windows-1251)"
+
+#: src/compose.c:643 src/mainwindow.c:616 src/messageview.c:192
+#, fuzzy
+msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
+msgstr "/_Ver/_Conjunto de códigos/Japonés (ISO-2022-_JP)"
+
+#: src/compose.c:647 src/mainwindow.c:626 src/messageview.c:201
+#, fuzzy
+msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
+msgstr "/_Ver/_Conjunto de códigos/Chino simplificado (_GB2312)"
+
+#: src/compose.c:649 src/mainwindow.c:628 src/messageview.c:203
+#, fuzzy
+msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
+msgstr "/_Ver/_Conjunto de códigos/Chino tradicional (_Big5)"
+
+#: src/compose.c:651 src/mainwindow.c:630 src/messageview.c:205
+#, fuzzy
+msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
+msgstr "/_Ver/_Conjunto de códigos/Chino tradicional (EUC-_TW)"
+
+#: src/compose.c:655 src/mainwindow.c:636 src/messageview.c:210
+#, fuzzy
+msgid "/_View/Character _encoding/Korean (EUC-_KR)"
+msgstr "/_Ver/_Conjunto de códigos/Coreano (EUC-_KR)"
+
+#: src/compose.c:659 src/mainwindow.c:642 src/messageview.c:215
+#, fuzzy
+msgid "/_View/Character _encoding/Thai (TIS-620)"
+msgstr "/_Ver/_Conjunto de códigos/Tailandés (TIS-620)"
+
+#: src/compose.c:661 src/mainwindow.c:644 src/messageview.c:217
+#, fuzzy
+msgid "/_View/Character _encoding/Thai (Windows-874)"
+msgstr "/_Ver/_Conjunto de códigos/Tailandés (Windows-874)"
+
+#: src/compose.c:665 src/mainwindow.c:698 src/messageview.c:247
 msgid "/_Tools/_Address book"
 msgstr "/_Herramientas/_Agenda de direcciones"
 
-#: src/compose.c:587
+#: src/compose.c:666
 msgid "/_Tools/_Template"
 msgstr "/_Herramientas/Plan_tillas"
 
-#: src/compose.c:588 src/mainwindow.c:707 src/messageview.c:262
+#: src/compose.c:667 src/mainwindow.c:716 src/messageview.c:262
 msgid "/_Tools/Actio_ns"
 msgstr "/_Herramientas/Accio_nes"
 
-#: src/compose.c:589 src/compose.c:593 src/mainwindow.c:692
-#: src/mainwindow.c:706 src/mainwindow.c:708 src/mainwindow.c:711
-#: src/mainwindow.c:713 src/messageview.c:250 src/messageview.c:261
+#: src/compose.c:668 src/compose.c:672 src/mainwindow.c:701
+#: src/mainwindow.c:715 src/mainwindow.c:717 src/mainwindow.c:720
+#: src/mainwindow.c:722 src/messageview.c:250 src/messageview.c:261
 msgid "/_Tools/---"
 msgstr "/_Herramientas/---"
 
-#: src/compose.c:590
+#: src/compose.c:669
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/_Editar/Editar con el editor e_xterno"
 
-#: src/compose.c:594
+#: src/compose.c:673
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Herramientas/Fir_mar con PGP"
 
-#: src/compose.c:595
+#: src/compose.c:674
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/_Mensaje/_Encriptar con PGP"
 
-#: src/compose.c:800
+#: src/compose.c:879
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: el fichero no existe\n"
 
-#: src/compose.c:899 src/compose.c:958 src/procmsg.c:1303
+#: src/compose.c:978 src/compose.c:1037 src/procmsg.c:1303
 msgid "Can't get text part\n"
 msgstr "No se puede obtener la parte de texto\n"
 
-#: src/compose.c:1340
+#: src/compose.c:1419
 msgid "Quote mark format error."
 msgstr "Error en el formato de la marca de cita."
 
-#: src/compose.c:1352
+#: src/compose.c:1431
 msgid "Message reply/forward format error."
 msgstr "Error en el formato de responder/redirijir."
 
-#: src/compose.c:1679
+#: src/compose.c:1758
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "El fichero %s no existe\n"
 
-#: src/compose.c:1683
+#: src/compose.c:1762
 #, 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:1687
+#: src/compose.c:1766
 #, c-format
 msgid "File %s is empty."
 msgstr "El fichero %s esta vacío."
 
-#: src/compose.c:1691
+#: src/compose.c:1770
 #, c-format
 msgid "Can't read %s."
 msgstr "No se puede leer %s."
 
-#: src/compose.c:1726
+#: src/compose.c:1805
 #, c-format
 msgid "Message: %s"
 msgstr "Mensaje: %s"
 
-#: src/compose.c:1797 src/mimeview.c:491
+#: src/compose.c:1876 src/mimeview.c:491
 msgid "Can't get the part of multipart message."
 msgstr "No se puede obtener la parte del mensaje multipartes."
 
-#: src/compose.c:2188
+#: src/compose.c:2267
 msgid " [Edited]"
 msgstr " [Editado]"
 
-#: src/compose.c:2190
+#: src/compose.c:2269
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Componer mensaje%s"
 
-#: src/compose.c:2193
+#: src/compose.c:2272
 #, c-format
 msgid "Compose message%s"
 msgstr "Componer mensaje%s"
 
-#: src/compose.c:2304
+#: src/compose.c:2383
 msgid "Recipient is not specified."
 msgstr "No se especificó el destinatario."
 
-#: src/compose.c:2312 src/compose.c:4112 src/mainwindow.c:2144
+#: src/compose.c:2391 src/compose.c:4213 src/mainwindow.c:2153
 #: src/prefs_account.c:703 src/prefs_common.c:850
 msgid "Send"
 msgstr "Enviar"
 
-#: src/compose.c:2313
+#: src/compose.c:2392
 msgid "Subject is empty. Send it anyway?"
 msgstr "El asunto esta vacío. ¿Enviar de todas formas?"
 
-#: src/compose.c:2364
+#: src/compose.c:2443
 msgid "can't get recipient list."
 msgstr "no se puede obtener la lista de destinatarios."
 
-#: src/compose.c:2384
+#: src/compose.c:2463
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -961,28 +1079,28 @@ msgstr ""
 "No especificó ninguna cuenta para enviar.\n"
 "Seleccione alguna cuenta antes de enviar."
 
-#: src/compose.c:2398 src/send_message.c:261
+#: src/compose.c:2477 src/send_message.c:261
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Hubo un error enviando el mensaje a %s ."
 
-#: src/compose.c:2421
+#: src/compose.c:2500
 msgid "Can't save the message to outbox."
 msgstr "No se puede guardar el mensaje en Salida."
 
-#: src/compose.c:2457
+#: src/compose.c:2536
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr ""
 "No se encontró ninguna clave asociada al ID-clave seleccionado actualmente `%"
 "s'."
 
-#: src/compose.c:2518 src/compose.c:2739 src/compose.c:2802 src/compose.c:2921
+#: src/compose.c:2597 src/compose.c:2820 src/compose.c:2883 src/compose.c:3003
 #: src/utils.c:2189
 msgid "can't change file mode\n"
 msgstr "no se pueden cambiar los permisos de archivo\n"
 
-#: src/compose.c:2546
+#: src/compose.c:2627
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -992,140 +1110,140 @@ msgstr ""
 "de %s a %s.\n"
 "¿Enviarlo de todas formas?"
 
-#: src/compose.c:2610
+#: src/compose.c:2691
 msgid "can't write headers\n"
 msgstr "no se pueden escribir las cabeceras\n"
 
-#: src/compose.c:2881
+#: src/compose.c:2963
 msgid "can't remove the old message\n"
 msgstr "no se puede eliminar el mensaje antiguo\n"
 
-#: src/compose.c:2899
+#: src/compose.c:2981
 msgid "queueing message...\n"
 msgstr "poniendo en la cola...\n"
 
-#: src/compose.c:2981
+#: src/compose.c:3063
 msgid "can't find queue folder\n"
 msgstr "no puedo encontrar la carpeta de cola\n"
 
-#: src/compose.c:2988
+#: src/compose.c:3070
 msgid "can't queue the message\n"
 msgstr "El mensaje no se puede poner en la cola\n"
 
-#: src/compose.c:3547
+#: src/compose.c:3645
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "Message-ID generado: %s\n"
 
-#: src/compose.c:3645
+#: src/compose.c:3743
 msgid "Creating compose window...\n"
 msgstr "Creando ventana de composición...\n"
 
-#: src/compose.c:3648 src/compose.c:4598
+#: src/compose.c:3746 src/compose.c:4734
 msgid "MIME type"
 msgstr "Tipo MIME"
 
 #. S_COL_DATE
-#: src/compose.c:3649 src/mimeview.c:150 src/prefs_filter_edit.c:569
+#: src/compose.c:3747 src/mimeview.c:150 src/prefs_filter_edit.c:569
 #: src/prefs_summary_column.c:73 src/select-keys.c:317 src/summaryview.c:386
 msgid "Size"
 msgstr "Tamaño"
 
-#: src/compose.c:3700 src/headerview.c:53 src/summary_search.c:169
+#: src/compose.c:3798 src/headerview.c:53 src/summary_search.c:169
 msgid "From:"
 msgstr "Desde:"
 
-#: src/compose.c:4113
+#: src/compose.c:4214
 msgid "Send message"
 msgstr "Enviar mensaje"
 
-#: src/compose.c:4121
+#: src/compose.c:4222
 msgid "Send later"
 msgstr "Enviar después"
 
-#: src/compose.c:4122
+#: src/compose.c:4223
 msgid "Put into queue folder and send later"
 msgstr "Poner en la cola y enviar después"
 
-#: src/compose.c:4130
+#: src/compose.c:4231
 msgid "Draft"
 msgstr "Borrador"
 
-#: src/compose.c:4131
+#: src/compose.c:4232
 msgid "Save to draft folder"
 msgstr "Guardar como borrador"
 
-#: src/compose.c:4141 src/compose.c:5382
+#: src/compose.c:4242 src/compose.c:5527
 msgid "Insert"
 msgstr "Insertar"
 
-#: src/compose.c:4142
+#: src/compose.c:4243
 msgid "Insert file"
 msgstr "Insertar fichero"
 
-#: src/compose.c:4150
+#: src/compose.c:4251
 msgid "Attach"
 msgstr "Adjuntar"
 
-#: src/compose.c:4151
+#: src/compose.c:4252
 msgid "Attach file"
 msgstr "Adjuntar fichero"
 
 #. signature
-#: src/compose.c:4161 src/prefs_account.c:1339 src/prefs_common.c:1261
+#: src/compose.c:4262 src/prefs_account.c:1339 src/prefs_common.c:1273
 msgid "Signature"
 msgstr "Firma"
 
-#: src/compose.c:4162
+#: src/compose.c:4263
 msgid "Insert signature"
 msgstr "Insertar firma"
 
-#: src/compose.c:4171 src/prefs_common.c:1283 src/prefs_common.c:2165
+#: src/compose.c:4272 src/prefs_common.c:1295 src/prefs_common.c:2177
 msgid "Editor"
 msgstr "Editor"
 
-#: src/compose.c:4172
+#: src/compose.c:4273
 msgid "Edit with external editor"
 msgstr "Editar con un editor externo"
 
-#: src/compose.c:4180
+#: src/compose.c:4281
 msgid "Linewrap"
 msgstr "Recortar"
 
-#: src/compose.c:4181
+#: src/compose.c:4282
 msgid "Wrap all long lines"
 msgstr "Cortar todas las líneas largas"
 
-#: src/compose.c:4492
+#: src/compose.c:4628
 msgid "Invalid MIME type."
 msgstr "Tipo MIME inválido."
 
-#: src/compose.c:4511
+#: src/compose.c:4647
 msgid "File doesn't exist or is empty."
 msgstr "El fichero no existe o está vacío."
 
-#: src/compose.c:4580
+#: src/compose.c:4716
 msgid "Properties"
 msgstr "Propiedades"
 
-#: src/compose.c:4600
+#: src/compose.c:4736
 msgid "Encoding"
 msgstr "Codificación"
 
-#: src/compose.c:4623 src/prefs_folder_item.c:183
+#: src/compose.c:4759 src/prefs_folder_item.c:183
 msgid "Path"
 msgstr "Ruta"
 
-#: src/compose.c:4624
+#: src/compose.c:4760
 msgid "File name"
 msgstr "Nombre de fichero"
 
-#: src/compose.c:4778
+#: src/compose.c:4914
 #, 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:4804
+#: src/compose.c:4940
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1136,72 +1254,72 @@ msgstr ""
 "¿Desea terminar el proceso?\n"
 "Id. de grupo de proceso: %d"
 
-#: src/compose.c:4817
+#: src/compose.c:4953
 #, c-format
 msgid "Terminated process group id: %d"
 msgstr "Terminado grupo de proceso id.: %d"
 
-#: src/compose.c:4818
+#: src/compose.c:4954
 #, c-format
 msgid "Temporary file: %s"
 msgstr "Fichero temporal: %s"
 
-#: src/compose.c:4842
+#: src/compose.c:4978
 msgid "Compose: input from monitoring process\n"
 msgstr "Componer: entrada desde proceso monitor\n"
 
 #. failed
-#: src/compose.c:4875
+#: src/compose.c:5011
 msgid "Couldn't exec external editor\n"
 msgstr "No se pudo ejecutar el editor externo\n"
 
-#: src/compose.c:4879
+#: src/compose.c:5015
 msgid "Couldn't write to file\n"
 msgstr "No se pudo escribir en el fichero\n"
 
-#: src/compose.c:4881
+#: src/compose.c:5017
 msgid "Pipe read failed\n"
 msgstr "Fallo leyendo tubería\n"
 
-#: src/compose.c:5182 src/compose.c:5190 src/compose.c:5196
+#: src/compose.c:5318 src/compose.c:5326 src/compose.c:5332
 msgid "Can't queue the message."
 msgstr "El mensaje no se puede poner en la cola."
 
-#: src/compose.c:5287
+#: src/compose.c:5423
 #, fuzzy
 msgid "Select files"
 msgstr "Seleccionar fichero"
 
-#: src/compose.c:5309
+#: src/compose.c:5445
 msgid "Select file"
 msgstr "Seleccionar fichero"
 
-#: src/compose.c:5344
+#: src/compose.c:5480
 msgid "Discard message"
 msgstr "Descartar mensaje"
 
-#: src/compose.c:5345
+#: src/compose.c:5481
 msgid "This message has been modified. discard it?"
 msgstr "Este mensaje se ha modificado. ¿Desea descartarlo?"
 
-#: src/compose.c:5346
+#: src/compose.c:5482
 msgid "Discard"
 msgstr "Descartar"
 
-#: src/compose.c:5346
+#: src/compose.c:5482
 msgid "to Draft"
 msgstr "a Borradores"
 
-#: src/compose.c:5379
+#: src/compose.c:5524
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "¿Quiere aplicar la plantilla `%s' ?"
 
-#: src/compose.c:5381
+#: src/compose.c:5526
 msgid "Apply template"
 msgstr "Aplicar plantilla"
 
-#: src/compose.c:5382
+#: src/compose.c:5527
 msgid "Replace"
 msgstr "Reemplazar"
 
@@ -1641,12 +1759,12 @@ msgstr "Estableciendo información de carpeta...\n"
 msgid "Setting folder info..."
 msgstr "Estableciendo información de carpeta..."
 
-#: src/folderview.c:652 src/mainwindow.c:3190 src/setup.c:81
+#: src/folderview.c:652 src/mainwindow.c:3199 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Revisando carpeta %s%c%s ..."
 
-#: src/folderview.c:656 src/mainwindow.c:3195 src/setup.c:86
+#: src/folderview.c:656 src/mainwindow.c:3204 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Revisando carpeta %s ..."
@@ -2102,7 +2220,7 @@ msgstr "Importar fichero LDIF a la agenda"
 msgid "Prev"
 msgstr "Anterior"
 
-#: src/importldif.c:761 src/mainwindow.c:2230
+#: src/importldif.c:761 src/mainwindow.c:2239
 msgid "Next"
 msgstr "Siguiente"
 
@@ -2551,7 +2669,8 @@ msgid "/_View/Separate f_older tree"
 msgstr "/_Ver/Separar árb_ol de carpetas"
 
 #: src/mainwindow.c:514
-msgid "/_View/Separate m_essage view"
+#, fuzzy
+msgid "/_View/Separate _message view"
 msgstr "/_Ver/Separar vista de m_ensajes"
 
 #: src/mainwindow.c:516
@@ -2687,422 +2806,340 @@ msgstr "/_Ver/_Ir a/Siguiente mensaje etiquetado"
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Ver/_Ir a/_Ir a otra carpeta..."
 
-#: src/mainwindow.c:568 src/mainwindow.c:575 src/messageview.c:150
-msgid "/_View/_Code set/---"
-msgstr "/_Ver/_Conjunto de códigos/---"
-
-#: src/mainwindow.c:572 src/messageview.c:154
-msgid "/_View/_Code set"
-msgstr "/_Ver/_Conjunto de códigos"
-
 #: src/mainwindow.c:573 src/messageview.c:155
-msgid "/_View/_Code set/_Auto detect"
+#, fuzzy
+msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Ver/_Conjunto de códigos/_Autodetectar"
 
-#: src/mainwindow.c:576 src/messageview.c:158
-msgid "/_View/_Code set/7bit ascii (US-ASC_II)"
-msgstr "/_Ver/_Conjunto de códigos/ASCII de 7 bits (US-ASC_II)"
-
-#: src/mainwindow.c:579 src/messageview.c:161
-msgid "/_View/_Code set/Unicode (_UTF-8)"
-msgstr "/_Ver/_Conjunto de códigos/Unicode (_UTF-8)"
-
-#: src/mainwindow.c:582 src/messageview.c:164
-msgid "/_View/_Code set/Western European (ISO-8859-_1)"
-msgstr "/_Ver/_Conjunto de códigos/Europeo occidental (ISO-8859-_1)"
-
-#: src/mainwindow.c:584 src/messageview.c:166
-msgid "/_View/_Code set/Western European (ISO-8859-15)"
-msgstr "/_Ver/_Conjunto de códigos/Europeo occidental (ISO-8859-_15)"
-
-#: src/mainwindow.c:587 src/messageview.c:169
-msgid "/_View/_Code set/Central European (ISO-8859-_2)"
-msgstr "/_Ver/_Conjunto de códigos/Centroeuropeo (ISO-8859-_2)"
-
-#: src/mainwindow.c:590 src/messageview.c:172
-msgid "/_View/_Code set/_Baltic (ISO-8859-13)"
-msgstr "/_Ver/_Conjunto de códigos/Báltico (ISO-8859-13)"
-
-#: src/mainwindow.c:592 src/messageview.c:174
-msgid "/_View/_Code set/Baltic (ISO-8859-_4)"
-msgstr "/_Ver/_Conjunto de códigos/Báltico (ISO-8859-_4)"
-
-#: src/mainwindow.c:595 src/messageview.c:177
-msgid "/_View/_Code set/Greek (ISO-8859-_7)"
-msgstr "/_Ver/_Conjunto de códigos/Griego (ISO-8859-_7)"
-
-#: src/mainwindow.c:598 src/messageview.c:180
-msgid "/_View/_Code set/Turkish (ISO-8859-_9)"
-msgstr "/_Ver/_Conjunto de códigos/Turco (ISO-8859-_9)"
-
-#: src/mainwindow.c:601 src/messageview.c:183
-msgid "/_View/_Code set/Cyrillic (ISO-8859-_5)"
-msgstr "/_Ver/_Conjunto de códigos/Cirílico (ISO-8859-_5)"
-
-#: src/mainwindow.c:603 src/messageview.c:185
-msgid "/_View/_Code set/Cyrillic (KOI8-_R)"
-msgstr "/_Ver/_Conjunto de códigos/Cirílico (KOI8-_R)"
-
-#: src/mainwindow.c:605 src/messageview.c:187
-msgid "/_View/_Code set/Cyrillic (KOI8-U)"
-msgstr "/_Ver/_Conjunto de códigos/Cirílico (KOI8-U)"
-
-#: src/mainwindow.c:607 src/messageview.c:189
-msgid "/_View/_Code set/Cyrillic (Windows-1251)"
-msgstr "/_Ver/_Conjunto de códigos/Cirílico (Windows-1251)"
-
-#: src/mainwindow.c:610 src/messageview.c:192
-msgid "/_View/_Code set/Japanese (ISO-2022-_JP)"
-msgstr "/_Ver/_Conjunto de códigos/Japonés (ISO-2022-_JP)"
-
-#: src/mainwindow.c:612 src/messageview.c:194
-msgid "/_View/_Code set/Japanese (ISO-2022-JP-2)"
+#: src/mainwindow.c:618 src/messageview.c:194
+#, fuzzy
+msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Ver/_Conjunto de códigos/Japonés (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:614 src/messageview.c:196
-msgid "/_View/_Code set/Japanese (_EUC-JP)"
+#: src/mainwindow.c:620 src/messageview.c:196
+#, fuzzy
+msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Ver/_Conjunto de códigos/Japonés (_EUC-JP)"
 
-#: src/mainwindow.c:616 src/messageview.c:198
-msgid "/_View/_Code set/Japanese (_Shift__JIS)"
+#: src/mainwindow.c:622 src/messageview.c:198
+#, fuzzy
+msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Ver/_Conjunto de códigos/Japonés (_Shift__JIS)"
 
-#: src/mainwindow.c:619 src/messageview.c:201
-msgid "/_View/_Code set/Simplified Chinese (_GB2312)"
-msgstr "/_Ver/_Conjunto de códigos/Chino simplificado (_GB2312)"
-
-#: src/mainwindow.c:621 src/messageview.c:203
-msgid "/_View/_Code set/Traditional Chinese (_Big5)"
-msgstr "/_Ver/_Conjunto de códigos/Chino tradicional (_Big5)"
-
-#: src/mainwindow.c:623 src/messageview.c:205
-msgid "/_View/_Code set/Traditional Chinese (EUC-_TW)"
-msgstr "/_Ver/_Conjunto de códigos/Chino tradicional (EUC-_TW)"
-
-#: src/mainwindow.c:625 src/messageview.c:207
-msgid "/_View/_Code set/Chinese (ISO-2022-_CN)"
+#: src/mainwindow.c:632 src/messageview.c:207
+#, fuzzy
+msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Ver/_Conjunto de códigos/Chino (ISO-2022-_CN)"
 
-#: src/mainwindow.c:628 src/messageview.c:210
-msgid "/_View/_Code set/Korean (EUC-_KR)"
-msgstr "/_Ver/_Conjunto de códigos/Coreano (EUC-_KR)"
-
-#: src/mainwindow.c:630 src/messageview.c:212
-msgid "/_View/_Code set/Korean (ISO-2022-KR)"
+#: src/mainwindow.c:638 src/messageview.c:212
+#, fuzzy
+msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Ver/_Conjunto de códigos/Coreano (ISO-2022-KR)"
 
-#: src/mainwindow.c:633 src/messageview.c:215
-msgid "/_View/_Code set/Thai (TIS-620)"
-msgstr "/_Ver/_Conjunto de códigos/Tailandés (TIS-620)"
-
-#: src/mainwindow.c:635 src/messageview.c:217
-msgid "/_View/_Code set/Thai (Windows-874)"
-msgstr "/_Ver/_Conjunto de códigos/Tailandés (Windows-874)"
-
-#: src/mainwindow.c:642 src/summaryview.c:371
+#: src/mainwindow.c:651 src/summaryview.c:371
 msgid "/_View/Open in new _window"
 msgstr "/_Ver/Abrir en una ventana _nueva"
 
-#: src/mainwindow.c:643 src/messageview.c:224
+#: src/mainwindow.c:652 src/messageview.c:224
 msgid "/_View/Mess_age source"
 msgstr "/_Ver/Fuente del mens_aje"
 
-#: src/mainwindow.c:644 src/messageview.c:225
+#: src/mainwindow.c:653 src/messageview.c:225
 msgid "/_View/Show all _header"
 msgstr "/_Ver/Mostrar todas las cabeceras"
 
-#: src/mainwindow.c:646
+#: src/mainwindow.c:655
 msgid "/_View/_Update summary"
 msgstr "/_Ver/Actualizar res_umen"
 
-#: src/mainwindow.c:648 src/messageview.c:227
+#: src/mainwindow.c:657 src/messageview.c:227
 msgid "/_Message"
 msgstr "/_Mensaje"
 
-#: src/mainwindow.c:649
+#: src/mainwindow.c:658
 msgid "/_Message/Recei_ve"
 msgstr "/_Mensaje/Reci_bir"
 
-#: src/mainwindow.c:650
+#: src/mainwindow.c:659
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/_Mensaje/Reci_bir/De la cuenta a_ctual"
 
-#: src/mainwindow.c:652
+#: src/mainwindow.c:661
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/_Mensaje/Reci_bir/De tod_as las cuentas"
 
-#: src/mainwindow.c:654
+#: src/mainwindow.c:663
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/_Mensaje/Reci_bir/Ca_ncelar recepción"
 
-#: src/mainwindow.c:656
+#: src/mainwindow.c:665
 msgid "/_Message/Recei_ve/---"
 msgstr "/_Mensaje/Reci_bir/---"
 
-#: src/mainwindow.c:657
+#: src/mainwindow.c:666
 msgid "/_Message/_Send queued messages"
 msgstr "/_Mensaje/Enviar mensa_jes en cola"
 
-#: src/mainwindow.c:658 src/mainwindow.c:660 src/mainwindow.c:667
-#: src/mainwindow.c:672 src/mainwindow.c:676 src/mainwindow.c:685
+#: src/mainwindow.c:667 src/mainwindow.c:669 src/mainwindow.c:676
+#: src/mainwindow.c:681 src/mainwindow.c:685 src/mainwindow.c:694
 #: src/messageview.c:230 src/messageview.c:238 src/messageview.c:243
 msgid "/_Message/---"
 msgstr "/_Mensaje/---"
 
-#: src/mainwindow.c:659 src/messageview.c:228
+#: src/mainwindow.c:668 src/messageview.c:228
 msgid "/_Message/Compose _new message"
 msgstr "/_Mensaje/Componer _nuevo mensaje"
 
-#: src/mainwindow.c:661 src/messageview.c:231
+#: src/mainwindow.c:670 src/messageview.c:231
 msgid "/_Message/_Reply"
 msgstr "/_Mensaje/_Responder"
 
-#: src/mainwindow.c:662
+#: src/mainwindow.c:671
 msgid "/_Message/Repl_y to"
 msgstr "/_Mensaje/Respon_der a"
 
-#: src/mainwindow.c:663 src/messageview.c:232
+#: src/mainwindow.c:672 src/messageview.c:232
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Mensaje/Respon_der a/A _todos"
 
-#: src/mainwindow.c:664 src/messageview.c:234
+#: src/mainwindow.c:673 src/messageview.c:234
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Mensaje/Respon_der a/Al _remitente"
 
-#: src/mainwindow.c:665 src/messageview.c:236
+#: src/mainwindow.c:674 src/messageview.c:236
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Mensaje/Respon_der a/A la _lista de correo"
 
-#: src/mainwindow.c:668 src/messageview.c:239
+#: src/mainwindow.c:677 src/messageview.c:239
 msgid "/_Message/_Forward"
 msgstr "/_Mensaje/_Reenviar"
 
-#: src/mainwindow.c:669 src/messageview.c:240
+#: src/mainwindow.c:678 src/messageview.c:240
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Mensaje/Reen_viar como adjunto"
 
-#: src/mainwindow.c:671 src/messageview.c:242
+#: src/mainwindow.c:680 src/messageview.c:242
 msgid "/_Message/Redirec_t"
 msgstr "/_Mensaje/Red_irigir"
 
-#: src/mainwindow.c:673
+#: src/mainwindow.c:682
 msgid "/_Message/M_ove..."
 msgstr "/_Mensaje/M_over..."
 
-#: src/mainwindow.c:674
+#: src/mainwindow.c:683
 msgid "/_Message/_Copy..."
 msgstr "/_Mensaje/_Copiar..."
 
-#: src/mainwindow.c:675
+#: src/mainwindow.c:684
 msgid "/_Message/_Delete"
 msgstr "/_Mensaje/_Borrar"
 
-#: src/mainwindow.c:677
+#: src/mainwindow.c:686
 msgid "/_Message/_Mark"
 msgstr "/_Mensaje/_Marcar"
 
-#: src/mainwindow.c:678
+#: src/mainwindow.c:687
 msgid "/_Message/_Mark/_Mark"
 msgstr "/_Mensaje/_Marcar/_Marcar"
 
-#: src/mainwindow.c:679
+#: src/mainwindow.c:688
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/_Mensaje/_Marcar/_Desmarcar"
 
-#: src/mainwindow.c:680
+#: src/mainwindow.c:689
 msgid "/_Message/_Mark/---"
 msgstr "/_Mensaje/_Marcar/---"
 
-#: src/mainwindow.c:681
+#: src/mainwindow.c:690
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/_Mensaje/_Marcar/Marcar como no leído"
 
-#: src/mainwindow.c:682
+#: src/mainwindow.c:691
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/_Mensaje/_Marcar/Marcar como leído"
 
-#: src/mainwindow.c:684
+#: src/mainwindow.c:693
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/_Mensaje/_Marcar/Marcar todo como leído"
 
-#: src/mainwindow.c:686 src/messageview.c:244
+#: src/mainwindow.c:695 src/messageview.c:244
 msgid "/_Message/Re-_edit"
 msgstr "/_Mensaje/Re_editar"
 
-#: src/mainwindow.c:690 src/messageview.c:248
+#: src/mainwindow.c:699 src/messageview.c:248
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/_Herramientas/Añadir _remitente a la agenda"
 
-#: src/mainwindow.c:693
+#: src/mainwindow.c:702
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/_Herramientas/_Filtrar todos los mensajes de la carpeta"
 
-#: src/mainwindow.c:695
+#: src/mainwindow.c:704
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Herramientas/_Filtrar los mensajes seleccionados"
 
-#: src/mainwindow.c:697 src/messageview.c:251
+#: src/mainwindow.c:706 src/messageview.c:251
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Herramientas/_Crear regla de filtrado"
 
-#: src/mainwindow.c:698 src/messageview.c:253
+#: src/mainwindow.c:707 src/messageview.c:253
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Herramientas/_Crear regla de filtrado/_Automáticamente"
 
-#: src/mainwindow.c:700 src/messageview.c:255
+#: src/mainwindow.c:709 src/messageview.c:255
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Herramientas/_Crear regla de filtrado/Basada en _Desde"
 
-#: src/mainwindow.c:702 src/messageview.c:257
+#: src/mainwindow.c:711 src/messageview.c:257
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Herramientas/_Crear regla de filtrado/Basada en _Para"
 
-#: src/mainwindow.c:704 src/messageview.c:259
+#: src/mainwindow.c:713 src/messageview.c:259
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Herramientas/_Crear regla de filtrado/Basada en el _Asunto"
 
-#: src/mainwindow.c:709
+#: src/mainwindow.c:718
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/_Herramientas/Borrar los mensajes re_petidos"
 
-#: src/mainwindow.c:712
+#: src/mainwindow.c:721
 msgid "/_Tools/E_xecute"
 msgstr "/_Herramientas/E_jecutar"
 
-#: src/mainwindow.c:714
+#: src/mainwindow.c:723
 msgid "/_Tools/_Log window"
 msgstr "/_Herramientas/_Ventana de traza"
 
-#: src/mainwindow.c:716
+#: src/mainwindow.c:725
 msgid "/_Configuration"
 msgstr "/_Configuración"
 
-#: src/mainwindow.c:717
+#: src/mainwindow.c:726
 msgid "/_Configuration/_Common preferences..."
 msgstr "/_Configuración/Preferencias _comunes..."
 
-#: src/mainwindow.c:719
+#: src/mainwindow.c:728
 msgid "/_Configuration/_Filter setting..."
 msgstr "/_Configuración/Preferencias de _filtrado..."
 
-#: src/mainwindow.c:721
+#: src/mainwindow.c:730
 msgid "/_Configuration/_Template..."
 msgstr "/_Configuración/_Plantillas ..."
 
-#: src/mainwindow.c:722
+#: src/mainwindow.c:731
 msgid "/_Configuration/_Actions..."
 msgstr "/_Configuración/_Acciones..."
 
-#: src/mainwindow.c:723
+#: src/mainwindow.c:732
 msgid "/_Configuration/---"
 msgstr "/_Configuración/---"
 
-#: src/mainwindow.c:724
+#: src/mainwindow.c:733
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Configuración/_Preferencias de la cuenta actual..."
 
-#: src/mainwindow.c:726
+#: src/mainwindow.c:735
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Configuración/Crear _nueva cuenta..."
 
-#: src/mainwindow.c:728
+#: src/mainwindow.c:737
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Configuración/_Editar cuentas..."
 
-#: src/mainwindow.c:730
+#: src/mainwindow.c:739
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Configuración/_Cambiar cuenta actual"
 
-#: src/mainwindow.c:734
+#: src/mainwindow.c:743
 msgid "/_Help/_Manual"
 msgstr "/_Ayuda/_Manual"
 
-#: src/mainwindow.c:735
+#: src/mainwindow.c:744
 msgid "/_Help/_Manual/_English"
 msgstr "/_Ayuda/_Manual/_Inglés"
 
-#: src/mainwindow.c:736
+#: src/mainwindow.c:745
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/_Ayuda/_Manual/_Japonés"
 
-#: src/mainwindow.c:737
+#: src/mainwindow.c:746
 msgid "/_Help/_FAQ"
 msgstr "/_Ayuda/_FAQ"
 
-#: src/mainwindow.c:738
+#: src/mainwindow.c:747
 msgid "/_Help/_FAQ/_English"
 msgstr "/_Ayuda/_FAQ/_Inglés"
 
-#: src/mainwindow.c:739
+#: src/mainwindow.c:748
 msgid "/_Help/_FAQ/_German"
 msgstr "/_Ayuda/_FAQ/_Alemán"
 
-#: src/mainwindow.c:740
+#: src/mainwindow.c:749
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/_Ayuda/_FAQ/_Español"
 
-#: src/mainwindow.c:741
+#: src/mainwindow.c:750
 msgid "/_Help/_FAQ/_French"
 msgstr "/_Ayuda/_FAQ/_Francés"
 
-#: src/mainwindow.c:742
+#: src/mainwindow.c:751
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/_Ayuda/_FAQ/_Italiano"
 
-#: src/mainwindow.c:743
+#: src/mainwindow.c:752
 msgid "/_Help/---"
 msgstr "/_Ayuda/---"
 
-#: src/mainwindow.c:783
+#: src/mainwindow.c:792
 msgid "Creating main window...\n"
 msgstr "Creando ventana principal...\n"
 
-#: src/mainwindow.c:943
+#: src/mainwindow.c:952
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "MainWindow: fallo solicitando color %d\n"
 
-#: src/mainwindow.c:1021 src/summaryview.c:1368 src/summaryview.c:1677
+#: src/mainwindow.c:1030 src/summaryview.c:1368 src/summaryview.c:1677
 #: src/summaryview.c:1785 src/summaryview.c:1831 src/summaryview.c:2453
 #: src/summaryview.c:3080 src/summaryview.c:3146 src/summaryview.c:3171
 #: src/summaryview.c:3284
 msgid "done.\n"
 msgstr "hecho.\n"
 
-#: src/mainwindow.c:1137 src/mainwindow.c:1178 src/mainwindow.c:1206
+#: src/mainwindow.c:1146 src/mainwindow.c:1187 src/mainwindow.c:1215
 msgid "Untitled"
 msgstr "Sin título"
 
-#: src/mainwindow.c:1207
+#: src/mainwindow.c:1216
 msgid "none"
 msgstr "ninguna"
 
-#: src/mainwindow.c:1257
+#: src/mainwindow.c:1266
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "Cambiando el tipo de separación de ventana de %d a %d\n"
 
-#: src/mainwindow.c:1477
+#: src/mainwindow.c:1486
 msgid "Offline"
 msgstr "Desconectado"
 
-#: src/mainwindow.c:1478
+#: src/mainwindow.c:1487
 msgid "You are offline. Go online?"
 msgstr "Esta desconectado. ¿Conectar?"
 
-#: src/mainwindow.c:1492
+#: src/mainwindow.c:1501
 msgid "Empty all trash"
 msgstr "Vaciar todas las papeleras"
 
-#: src/mainwindow.c:1493
+#: src/mainwindow.c:1502
 msgid "Empty messages in all trash?"
 msgstr "¿Vaciar los mensajes de todas las papeleras?"
 
-#: src/mainwindow.c:1521
+#: src/mainwindow.c:1530
 msgid "Add mailbox"
 msgstr "Añadir buzón"
 
-#: src/mainwindow.c:1522
+#: src/mainwindow.c:1531
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3112,16 +3149,16 @@ msgstr ""
 "Si el buzón especificado ya existe será\n"
 "escaneado automáticamente."
 
-#: src/mainwindow.c:1528
+#: src/mainwindow.c:1537
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "El buzón `%s' ya existe."
 
-#: src/mainwindow.c:1533 src/setup.c:57
+#: src/mainwindow.c:1542 src/setup.c:57
 msgid "Mailbox"
 msgstr "Correo"
 
-#: src/mainwindow.c:1539 src/setup.c:63
+#: src/mainwindow.c:1548 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3131,141 +3168,141 @@ msgstr ""
 "Quizás ya existan los ficheros o no tenga permisos suficientes para "
 "escribir  en el directorio."
 
-#: src/mainwindow.c:1912
+#: src/mainwindow.c:1921
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Árbol de carpetas"
 
-#: src/mainwindow.c:1932 src/messageview.c:358
+#: src/mainwindow.c:1941 src/messageview.c:358
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Vista de mensaje"
 
-#: src/mainwindow.c:2079 src/summaryview.c:340
+#: src/mainwindow.c:2088 src/summaryview.c:340
 msgid "/_Reply"
 msgstr "/_Responder"
 
-#: src/mainwindow.c:2080
+#: src/mainwindow.c:2089
 msgid "/Reply to _all"
 msgstr "/Responder a _todos"
 
-#: src/mainwindow.c:2081
+#: src/mainwindow.c:2090
 msgid "/Reply to _sender"
 msgstr "/Responder al _remitente"
 
-#: src/mainwindow.c:2082
+#: src/mainwindow.c:2091
 msgid "/Reply to mailing _list"
 msgstr "/Responder a la _lista de correo"
 
-#: src/mainwindow.c:2087 src/summaryview.c:347
+#: src/mainwindow.c:2096 src/summaryview.c:347
 msgid "/_Forward"
 msgstr "/_Reenviar"
 
-#: src/mainwindow.c:2088 src/summaryview.c:348
+#: src/mainwindow.c:2097 src/summaryview.c:348
 msgid "/For_ward as attachment"
 msgstr "/Reen_viar como adjunto"
 
-#: src/mainwindow.c:2089 src/summaryview.c:349
+#: src/mainwindow.c:2098 src/summaryview.c:349
 msgid "/Redirec_t"
 msgstr "/Red_irigir"
 
-#: src/mainwindow.c:2125
+#: src/mainwindow.c:2134
 msgid "Get"
 msgstr "Traer"
 
-#: src/mainwindow.c:2126
+#: src/mainwindow.c:2135
 msgid "Incorporate new mail"
 msgstr "Incorporar correo nuevo"
 
-#: src/mainwindow.c:2133
+#: src/mainwindow.c:2142
 msgid "Get all"
 msgstr "Traer todo"
 
-#: src/mainwindow.c:2134
+#: src/mainwindow.c:2143
 msgid "Incorporate new mail of all accounts"
 msgstr "Incorporar correo nuevo de todas las cuentas"
 
-#: src/mainwindow.c:2145
+#: src/mainwindow.c:2154
 msgid "Send queued message(s)"
 msgstr "Enviar mensaje(s) en la cola"
 
-#: src/mainwindow.c:2155 src/prefs_account.c:705 src/prefs_common.c:852
+#: src/mainwindow.c:2164 src/prefs_account.c:705 src/prefs_common.c:852
 #: src/prefs_folder_item.c:137
 msgid "Compose"
 msgstr "Componer"
 
-#: src/mainwindow.c:2156
+#: src/mainwindow.c:2165
 msgid "Compose new message"
 msgstr "Componer mensaje nuevo"
 
-#: src/mainwindow.c:2164 src/prefs_common.c:1353
+#: src/mainwindow.c:2173 src/prefs_common.c:1365
 msgid "Reply"
 msgstr "Responder"
 
-#: src/mainwindow.c:2165 src/mainwindow.c:2178
+#: src/mainwindow.c:2174 src/mainwindow.c:2187
 msgid "Reply to the message"
 msgstr "Responder al mensaje"
 
-#: src/mainwindow.c:2183
+#: src/mainwindow.c:2192
 msgid "Reply all"
 msgstr "A todos"
 
-#: src/mainwindow.c:2184
+#: src/mainwindow.c:2193
 msgid "Reply to all"
 msgstr "Responder a todos"
 
-#: src/mainwindow.c:2192 src/prefs_filter_edit.c:719
+#: src/mainwindow.c:2201 src/prefs_filter_edit.c:719
 msgid "Forward"
 msgstr "Reenviar"
 
-#: src/mainwindow.c:2193 src/mainwindow.c:2206
+#: src/mainwindow.c:2202 src/mainwindow.c:2215
 msgid "Forward the message"
 msgstr "Reenviar el mensaje"
 
-#: src/mainwindow.c:2213
+#: src/mainwindow.c:2222
 msgid "Delete the message"
 msgstr "Borrar el mensaje"
 
-#: src/mainwindow.c:2221
+#: src/mainwindow.c:2230
 msgid "Execute"
 msgstr "Ejecutar"
 
-#: src/mainwindow.c:2222
+#: src/mainwindow.c:2231
 msgid "Execute marked process"
 msgstr "Ejecutar el proceso marcado"
 
-#: src/mainwindow.c:2231
+#: src/mainwindow.c:2240
 msgid "Next unread message"
 msgstr "Siguiente no leído"
 
-#: src/mainwindow.c:2242
+#: src/mainwindow.c:2251
 msgid "Prefs"
 msgstr "Preferencias"
 
-#: src/mainwindow.c:2243
+#: src/mainwindow.c:2252
 msgid "Common preferences"
 msgstr "Preferencias comunes"
 
-#: src/mainwindow.c:2250 src/prefs_folder_item.c:258
+#: src/mainwindow.c:2259 src/prefs_folder_item.c:258
 #: src/prefs_folder_item.c:269 src/progressdialog.c:50
 msgid "Account"
 msgstr "Cuenta"
 
-#: src/mainwindow.c:2251
+#: src/mainwindow.c:2260
 msgid "Account setting"
 msgstr "Preferencias de la cuenta"
 
-#: src/mainwindow.c:2425
+#: src/mainwindow.c:2434
 msgid "You are offline. Click the icon to go online."
 msgstr "Esta desconectado. Haga click en el icono para conectar."
 
-#: src/mainwindow.c:2436
+#: src/mainwindow.c:2445
 msgid "You are online. Click the icon to go offline."
 msgstr "Esta conectado. Haga click en el icono para desconectar."
 
-#: src/mainwindow.c:2624
+#: src/mainwindow.c:2633
 msgid "Exit"
 msgstr "Salir"
 
-#: src/mainwindow.c:2624
+#: src/mainwindow.c:2633
 msgid "Exit this program?"
 msgstr "¿Salir del programa?"
 
@@ -3391,7 +3428,7 @@ msgstr "Búsqueda concluida"
 msgid "Creating message view...\n"
 msgstr "Creando visor de mensaje...\n"
 
-#: src/messageview.c:303 src/prefs_common.c:1550
+#: src/messageview.c:303 src/prefs_common.c:1562
 msgid "Text"
 msgstr "Texto"
 
@@ -3404,7 +3441,7 @@ msgstr "Adjuntos"
 msgid "Can't save the file `%s'."
 msgstr "No puedo guardar el fichero `%s'."
 
-#: src/messageview.c:697 src/prefs_common.c:2154 src/summaryview.c:2744
+#: src/messageview.c:697 src/prefs_common.c:2166 src/summaryview.c:2744
 msgid "Print"
 msgstr "Imprimir"
 
@@ -3877,7 +3914,7 @@ msgstr "(Los mensajes sin filtrar se guardarán en esta carpeta)"
 msgid "Authentication method"
 msgstr "Método de autentificación"
 
-#: src/prefs_account.c:1123 src/prefs_account.c:1239 src/prefs_common.c:1189
+#: src/prefs_account.c:1123 src/prefs_account.c:1239 src/prefs_common.c:1201
 msgid "Automatic"
 msgstr "Automática"
 
@@ -3901,7 +3938,7 @@ msgstr "Generar ID-Mensaje"
 msgid "Add user-defined header"
 msgstr "Añadir cabecera de usuario"
 
-#: src/prefs_account.c:1196 src/prefs_common.c:1714 src/prefs_common.c:1739
+#: src/prefs_account.c:1196 src/prefs_common.c:1726 src/prefs_common.c:1751
 msgid " Edit... "
 msgstr " Editar... "
 
@@ -4297,106 +4334,107 @@ msgid "Save sent messages to outbox"
 msgstr "Guardar mensajes enviados en Salida"
 
 #: src/prefs_common.c:1113
-msgid "Outgoing codeset"
+#, fuzzy
+msgid "Outgoing encoding"
 msgstr "Conjunto de códigos para enviar"
 
 #: src/prefs_common.c:1128
 msgid "Automatic (Recommended)"
 msgstr "Automático (Recomendado)"
 
-#: src/prefs_common.c:1129
+#: src/prefs_common.c:1130
 msgid "7bit ascii (US-ASCII)"
 msgstr "ASCII de 7 bits (US-ASC_II)"
 
-#: src/prefs_common.c:1130
+#: src/prefs_common.c:1132
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
-#: src/prefs_common.c:1131
+#: src/prefs_common.c:1134
 msgid "Western European (ISO-8859-1)"
 msgstr "Europeo Occidental (ISO-8859-1)"
 
-#: src/prefs_common.c:1132
+#: src/prefs_common.c:1135
 msgid "Western European (ISO-8859-15)"
 msgstr "Europeo Occidental (ISO-8859-15)"
 
-#: src/prefs_common.c:1133
+#: src/prefs_common.c:1137
 msgid "Central European (ISO-8859-2)"
 msgstr "Centroeuropeo (ISO-8859-2)"
 
-#: src/prefs_common.c:1134
+#: src/prefs_common.c:1139
 msgid "Baltic (ISO-8859-13)"
 msgstr "Báltico (ISO-8859-13)"
 
-#: src/prefs_common.c:1135
+#: src/prefs_common.c:1140
 msgid "Baltic (ISO-8859-4)"
 msgstr "Báltico (ISO-8859-4)"
 
-#: src/prefs_common.c:1136
+#: src/prefs_common.c:1142
 msgid "Greek (ISO-8859-7)"
 msgstr "Griego (ISO-8859-7)"
 
-#: src/prefs_common.c:1137
+#: src/prefs_common.c:1144
 msgid "Turkish (ISO-8859-9)"
 msgstr "Turco (ISO-8859-9)"
 
-#: src/prefs_common.c:1138
+#: src/prefs_common.c:1146
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Cirílico (ISO-8859-5)"
 
-#: src/prefs_common.c:1139
+#: src/prefs_common.c:1147
 msgid "Cyrillic (KOI8-R)"
 msgstr "Cirílico (KOI8-R)"
 
-#: src/prefs_common.c:1140
-msgid "Cyrillic (Windows-1251)"
-msgstr "Cirílico (Windows-1251)"
-
-#: src/prefs_common.c:1141
+#: src/prefs_common.c:1148
 msgid "Cyrillic (KOI8-U)"
 msgstr "Cirílico (KOI8-U)"
 
-#: src/prefs_common.c:1142
+#: src/prefs_common.c:1149
+msgid "Cyrillic (Windows-1251)"
+msgstr "Cirílico (Windows-1251)"
+
+#: src/prefs_common.c:1151
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Japonés (ISO-2022-JP)"
 
-#: src/prefs_common.c:1144
+#: src/prefs_common.c:1153
 msgid "Japanese (EUC-JP)"
 msgstr "Japonés (EUC-JP)"
 
-#: src/prefs_common.c:1145
+#: src/prefs_common.c:1154
 msgid "Japanese (Shift_JIS)"
 msgstr "Japonés (Shift_JIS)"
 
-#: src/prefs_common.c:1147
+#: src/prefs_common.c:1157
 msgid "Simplified Chinese (GB2312)"
 msgstr "Chino simplificado (GB2312)"
 
-#: src/prefs_common.c:1148
+#: src/prefs_common.c:1158
 msgid "Traditional Chinese (Big5)"
 msgstr "Chino tradicional (Big5)"
 
-#: src/prefs_common.c:1150
+#: src/prefs_common.c:1160
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Chino tradicional (EUC-TW)"
 
-#: src/prefs_common.c:1151
+#: src/prefs_common.c:1161
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Chino (ISO-2022-CN)"
 
-#: src/prefs_common.c:1153
+#: src/prefs_common.c:1164
 msgid "Korean (EUC-KR)"
 msgstr "Coreano (EUC-KR)"
 
-#: src/prefs_common.c:1154
+#: src/prefs_common.c:1166
 msgid "Thai (TIS-620)"
 msgstr "Tailandés (TIS-620)"
 
-#: src/prefs_common.c:1155
+#: src/prefs_common.c:1167
 msgid "Thai (Windows-874)"
 msgstr "Tailandés (Windows-874)"
 
-#: src/prefs_common.c:1165
+#: src/prefs_common.c:1177
 #, fuzzy
 msgid ""
 "If `Automatic' is selected, the optimal encoding for the current locale will "
@@ -4405,11 +4443,11 @@ msgstr ""
 "Si se selecciona `Automático' se utilizará la\n"
 "codificación óptima para la localización actual."
 
-#: src/prefs_common.c:1179
+#: src/prefs_common.c:1191
 msgid "Transfer encoding"
 msgstr "Codificación de transferencia"
 
-#: src/prefs_common.c:1202
+#: src/prefs_common.c:1214
 #, fuzzy
 msgid ""
 "Specify Content-Transfer-Encoding used when message body contains non-ASCII "
@@ -4418,118 +4456,118 @@ msgstr ""
 "Especificar la codificación de transferencia (Content-Transfer-Encoding)\n"
 "cuando el cuerpo del mensaje contiene caracteres no-ASCII."
 
-#: src/prefs_common.c:1272
+#: src/prefs_common.c:1284
 msgid "Signature separator"
 msgstr "Separador de firma"
 
-#: src/prefs_common.c:1281
+#: src/prefs_common.c:1293
 msgid "Insert automatically"
 msgstr "Insertar automáticamente"
 
-#: src/prefs_common.c:1291
+#: src/prefs_common.c:1303
 msgid "Automatically launch the external editor"
 msgstr "Lanzar el editor externo automáticamente"
 
-#: src/prefs_common.c:1301
+#: src/prefs_common.c:1313
 msgid "Undo level"
 msgstr "Niveles de deshacer"
 
-#: src/prefs_common.c:1321
+#: src/prefs_common.c:1333
 msgid "Wrap messages at"
 msgstr "Recortar mensajes a los"
 
-#: src/prefs_common.c:1333
+#: src/prefs_common.c:1345
 msgid "characters"
 msgstr "caracteres"
 
-#: src/prefs_common.c:1343
+#: src/prefs_common.c:1355
 msgid "Wrap quotation"
 msgstr "Recortar citación"
 
-#: src/prefs_common.c:1349
+#: src/prefs_common.c:1361
 msgid "Wrap on input"
 msgstr "Recortar al escribir"
 
-#: src/prefs_common.c:1351
+#: src/prefs_common.c:1363
 msgid "Wrap before sending"
 msgstr "Recortar antes de enviar"
 
-#: src/prefs_common.c:1361
+#: src/prefs_common.c:1373
 msgid "Automatically select account for replies"
 msgstr "Seleccionar automáticamente la cuenta para responder"
 
-#: src/prefs_common.c:1363
+#: src/prefs_common.c:1375
 msgid "Quote message when replying"
 msgstr "Citar el mensaje al responder"
 
-#: src/prefs_common.c:1365
+#: src/prefs_common.c:1377
 msgid "Reply button invokes mailing list reply"
 msgstr "El botón Responder invoca responder a la lista de correo"
 
 #. reply
-#: src/prefs_common.c:1411
+#: src/prefs_common.c:1423
 msgid "Reply format"
 msgstr "Formato de réplica"
 
-#: src/prefs_common.c:1426 src/prefs_common.c:1468
+#: src/prefs_common.c:1438 src/prefs_common.c:1480
 msgid "Quotation mark"
 msgstr "Marca de citación"
 
 #. forward
-#: src/prefs_common.c:1453
+#: src/prefs_common.c:1465
 msgid "Forward format"
 msgstr "Formato de reenvio"
 
-#: src/prefs_common.c:1500
+#: src/prefs_common.c:1512
 msgid " Description of symbols "
 msgstr " Descripción de símbolos "
 
-#: src/prefs_common.c:1541
+#: src/prefs_common.c:1553
 msgid "Font"
 msgstr "Fuente"
 
-#: src/prefs_common.c:1573
+#: src/prefs_common.c:1585
 msgid "Translate header name (such as `From:', `Subject:')"
 msgstr "Traducir cabeceras (como `Desde:', `Asunto:')"
 
-#: src/prefs_common.c:1576
+#: src/prefs_common.c:1588
 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.c:1585
+#: src/prefs_common.c:1597
 msgid "Abbreviate newsgroups longer than"
 msgstr "Abreviar nombres de grupos con más de"
 
-#: src/prefs_common.c:1600
+#: src/prefs_common.c:1612
 msgid "letters"
 msgstr "letras"
 
 #. ---- Summary ----
-#: src/prefs_common.c:1606
+#: src/prefs_common.c:1618
 msgid "Summary View"
 msgstr "Vista resumen"
 
-#: src/prefs_common.c:1615
+#: src/prefs_common.c:1627
 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.c:1617
+#: src/prefs_common.c:1629
 msgid "Expand threads"
 msgstr "Expandir hilos"
 
-#: src/prefs_common.c:1625 src/prefs_common.c:2443 src/prefs_common.c:2481
+#: src/prefs_common.c:1637 src/prefs_common.c:2455 src/prefs_common.c:2493
 msgid "Date format"
 msgstr "Formato de fecha"
 
-#: src/prefs_common.c:1646
+#: src/prefs_common.c:1658
 msgid " Set display item of summary... "
 msgstr " Elementos visibles en cabecera... "
 
-#: src/prefs_common.c:1710
+#: src/prefs_common.c:1722
 msgid "Enable coloration of message"
 msgstr "Permitir colores en el mensaje"
 
-#: src/prefs_common.c:1724
+#: src/prefs_common.c:1736
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
@@ -4537,323 +4575,323 @@ msgstr ""
 "Mostrar alfabéticos y numéricos multi-byte como\n"
 "caracteres ASCII (sólo para Japonés)"
 
-#: src/prefs_common.c:1730
+#: src/prefs_common.c:1742
 msgid "Display header pane above message view"
 msgstr "Mostrar panel de cabeceras sobre el mensaje"
 
-#: src/prefs_common.c:1737
+#: src/prefs_common.c:1749
 msgid "Display short headers on message view"
 msgstr "Cabeceras breves en la vista del mensaje"
 
-#: src/prefs_common.c:1758
+#: src/prefs_common.c:1770
 msgid "Line space"
 msgstr "Interlineado"
 
-#: src/prefs_common.c:1772 src/prefs_common.c:1810
+#: src/prefs_common.c:1784 src/prefs_common.c:1822
 msgid "pixel(s)"
 msgstr "pixel(s)"
 
-#: src/prefs_common.c:1777
+#: src/prefs_common.c:1789
 msgid "Scroll"
 msgstr "Desplazamiento"
 
-#: src/prefs_common.c:1784
+#: src/prefs_common.c:1796
 msgid "Half page"
 msgstr "Media página"
 
-#: src/prefs_common.c:1790
+#: src/prefs_common.c:1802
 msgid "Smooth scroll"
 msgstr "Desplazamiento suave"
 
-#: src/prefs_common.c:1796
+#: src/prefs_common.c:1808
 msgid "Step"
 msgstr "Paso"
 
-#: src/prefs_common.c:1816
+#: src/prefs_common.c:1828
 msgid "Images"
 msgstr ""
 
-#: src/prefs_common.c:1824
+#: src/prefs_common.c:1836
 msgid "Resize attached large images to fit in the window"
 msgstr "Redimensionar las imágenes adjuntas para adecuarlas a la ventana"
 
-#: src/prefs_common.c:1826
+#: src/prefs_common.c:1838
 #, fuzzy
 msgid "Display images as inline"
 msgstr "Ver propiedades de cabeceras"
 
-#: src/prefs_common.c:1871
+#: src/prefs_common.c:1883
 msgid "Automatically check signatures"
 msgstr "Comprobar las firmas automáticamente"
 
-#: src/prefs_common.c:1874
+#: src/prefs_common.c:1886
 msgid "Show signature check result in a popup window"
 msgstr "Mostrar diálogo de comprobación de firma"
 
-#: src/prefs_common.c:1877
+#: src/prefs_common.c:1889
 msgid "Store passphrase in memory temporarily"
 msgstr "Mantener contraseña en memoria temporalmente"
 
-#: src/prefs_common.c:1892
+#: src/prefs_common.c:1904
 msgid "Expired after"
 msgstr "Expirar después de"
 
-#: src/prefs_common.c:1905
+#: src/prefs_common.c:1917
 msgid "minute(s) "
 msgstr "minuto(s) "
 
-#: src/prefs_common.c:1918
+#: src/prefs_common.c:1930
 #, fuzzy
 msgid "Setting to '0' will store the passphrase for the whole session."
 msgstr ""
 "(Poniendo '0' mantendrá la contraseña\n"
 " durante toda la sesión)"
 
-#: src/prefs_common.c:1932
+#: src/prefs_common.c:1944
 msgid "Grab input while entering a passphrase"
 msgstr "Capturar la entrada mientras se introducen contraseñas"
 
-#: src/prefs_common.c:1937
+#: src/prefs_common.c:1949
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "Mostrar aviso al arrancar si no funciona GnuPG"
 
-#: src/prefs_common.c:1989
+#: src/prefs_common.c:2001
 msgid "Always open messages in summary when selected"
 msgstr "Abrir siempre los mensajes del resumen al seleccionarlos"
 
-#: src/prefs_common.c:1993
+#: src/prefs_common.c:2005
 msgid "Open first unread message when entering a folder"
 msgstr "Abrir el primer mensaje no leído al abrir una carpeta"
 
-#: src/prefs_common.c:1997
+#: src/prefs_common.c:2009
 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.c:2001
+#: src/prefs_common.c:2013
 msgid "Go to inbox after receiving new mail"
 msgstr "Abrir entrada despues de recibir correo nuevo"
 
-#: src/prefs_common.c:2009
+#: src/prefs_common.c:2021
 msgid "Execute immediately when moving or deleting messages"
 msgstr "Ejecutar inmediatamente movimientos o borrados de mensajes"
 
-#: src/prefs_common.c:2021
+#: src/prefs_common.c:2033
 #, fuzzy
 msgid "Messages will be marked until execution if this is turned off."
 msgstr ""
 "(Los mensajes se marcarán hasta la ejecución\n"
 " si está desactivado)"
 
-#: src/prefs_common.c:2029
+#: src/prefs_common.c:2041
 msgid "Receive dialog"
 msgstr "Diálogo de recepción"
 
-#: src/prefs_common.c:2039
+#: src/prefs_common.c:2051
 msgid "Show receive dialog"
 msgstr "Mostrar diálogo de recepción"
 
-#: src/prefs_common.c:2049
+#: src/prefs_common.c:2061
 msgid "Always"
 msgstr "Siempre"
 
-#: src/prefs_common.c:2050
+#: src/prefs_common.c:2062
 msgid "Only on manual receiving"
 msgstr "Sólo al recibir manualmente"
 
-#: src/prefs_common.c:2052
+#: src/prefs_common.c:2064
 msgid "Never"
 msgstr "Nunca"
 
-#: src/prefs_common.c:2057
+#: src/prefs_common.c:2069
 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.c:2060
+#: src/prefs_common.c:2072
 msgid "Close receive dialog when finished"
 msgstr "Mostrar diálogo de recepción al finalizar"
 
-#: src/prefs_common.c:2066
+#: src/prefs_common.c:2078
 msgid " Set key bindings... "
 msgstr " Establecer atajos de teclado... "
 
-#: src/prefs_common.c:2122
+#: src/prefs_common.c:2134
 #, 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.c:2131
+#: src/prefs_common.c:2143
 msgid "Web browser"
 msgstr "Navegador web"
 
-#: src/prefs_common.c:2195
+#: src/prefs_common.c:2207
 msgid "Add address to destination when double-clicked"
 msgstr "Añadir dirección al destino con doble click"
 
-#: src/prefs_common.c:2197
+#: src/prefs_common.c:2209
 msgid "On exit"
 msgstr "Al salir"
 
-#: src/prefs_common.c:2205
+#: src/prefs_common.c:2217
 msgid "Confirm on exit"
 msgstr "Confirmar al salir"
 
-#: src/prefs_common.c:2212
+#: src/prefs_common.c:2224
 msgid "Empty trash on exit"
 msgstr "Vaciar papelera al salir"
 
-#: src/prefs_common.c:2214
+#: src/prefs_common.c:2226
 msgid "Ask before emptying"
 msgstr "Preguntar antes de vaciar"
 
-#: src/prefs_common.c:2218
+#: src/prefs_common.c:2230
 msgid "Warn if there are queued messages"
 msgstr "Avisar si existen mensajes en cola"
 
-#: src/prefs_common.c:2224
+#: src/prefs_common.c:2236
 msgid "Socket I/O timeout:"
 msgstr "Tiempo de espera agotado E/S socket:"
 
-#: src/prefs_common.c:2237
+#: src/prefs_common.c:2249
 msgid "second(s)"
 msgstr "segundo(s)"
 
-#: src/prefs_common.c:2419
+#: src/prefs_common.c:2431
 msgid "the full abbreviated weekday name"
 msgstr "el dia de la semana abreviado"
 
-#: src/prefs_common.c:2420
+#: src/prefs_common.c:2432
 msgid "the full weekday name"
 msgstr "el dia de la semana completo"
 
-#: src/prefs_common.c:2421
+#: src/prefs_common.c:2433
 msgid "the abbreviated month name"
 msgstr "el nombre del mes abreviado"
 
-#: src/prefs_common.c:2422
+#: src/prefs_common.c:2434
 msgid "the full month name"
 msgstr "el nombre del mes completo"
 
-#: src/prefs_common.c:2423
+#: src/prefs_common.c:2435
 msgid "the preferred date and time for the current locale"
 msgstr "la fecha y hora preferida para la localización actual"
 
-#: src/prefs_common.c:2424
+#: src/prefs_common.c:2436
 msgid "the century number (year/100)"
 msgstr "el número de siglo (año/100)"
 
-#: src/prefs_common.c:2425
+#: src/prefs_common.c:2437
 msgid "the day of the month as a decimal number"
 msgstr "el dia del mes como número decimal"
 
-#: src/prefs_common.c:2426
+#: src/prefs_common.c:2438
 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.c:2427
+#: src/prefs_common.c:2439
 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.c:2428
+#: src/prefs_common.c:2440
 msgid "the day of the year as a decimal number"
 msgstr "el dia del año como número decimal"
 
-#: src/prefs_common.c:2429
+#: src/prefs_common.c:2441
 msgid "the month as a decimal number"
 msgstr "el mes como número decimal"
 
-#: src/prefs_common.c:2430
+#: src/prefs_common.c:2442
 msgid "the minute as a decimal number"
 msgstr "el minuto como número decimal"
 
-#: src/prefs_common.c:2431
+#: src/prefs_common.c:2443
 msgid "either AM or PM"
 msgstr "AM o PM"
 
-#: src/prefs_common.c:2432
+#: src/prefs_common.c:2444
 msgid "the second as a decimal number"
 msgstr "el segundo como número decimal"
 
-#: src/prefs_common.c:2433
+#: src/prefs_common.c:2445
 msgid "the day of the week as a decimal number"
 msgstr "el dia de la semana como número decimal"
 
-#: src/prefs_common.c:2434
+#: src/prefs_common.c:2446
 msgid "the preferred date for the current locale"
 msgstr "la fecha preferida para la localización actual"
 
-#: src/prefs_common.c:2435
+#: src/prefs_common.c:2447
 msgid "the last two digits of a year"
 msgstr "los dos últimos dígitos del año"
 
-#: src/prefs_common.c:2436
+#: src/prefs_common.c:2448
 msgid "the year as a decimal number"
 msgstr "el año como número decimal"
 
-#: src/prefs_common.c:2437
+#: src/prefs_common.c:2449
 msgid "the time zone or name or abbreviation"
 msgstr "zona horaria o nombre o abreviatura"
 
-#: src/prefs_common.c:2458
+#: src/prefs_common.c:2470
 msgid "Specifier"
 msgstr "Especificador"
 
-#: src/prefs_common.c:2459
+#: src/prefs_common.c:2471
 msgid "Description"
 msgstr "Descripción"
 
-#: src/prefs_common.c:2499
+#: src/prefs_common.c:2511
 msgid "Example"
 msgstr "Ejemplo"
 
-#: src/prefs_common.c:2580
+#: src/prefs_common.c:2592
 msgid "Set message colors"
 msgstr "Colores del mensaje"
 
-#: src/prefs_common.c:2588
+#: src/prefs_common.c:2600
 msgid "Colors"
 msgstr "Colores"
 
-#: src/prefs_common.c:2622
+#: src/prefs_common.c:2634
 msgid "Quoted Text - First Level"
 msgstr "Texto citado - Primer nivel"
 
-#: src/prefs_common.c:2628
+#: src/prefs_common.c:2640
 msgid "Quoted Text - Second Level"
 msgstr "Texto citado - Segundo nivel"
 
-#: src/prefs_common.c:2634
+#: src/prefs_common.c:2646
 msgid "Quoted Text - Third Level"
 msgstr "Texto citado - Tercer nivel"
 
-#: src/prefs_common.c:2640
+#: src/prefs_common.c:2652
 msgid "URI link"
 msgstr "Enlace URI"
 
-#: src/prefs_common.c:2647
+#: src/prefs_common.c:2659
 msgid "Recycle quote colors"
 msgstr "Reutilizar colores de citación"
 
-#: src/prefs_common.c:2707
+#: src/prefs_common.c:2719
 msgid "Pick color for quotation level 1"
 msgstr "Elejir color para el nivel de citado 1"
 
-#: src/prefs_common.c:2710
+#: src/prefs_common.c:2722
 msgid "Pick color for quotation level 2"
 msgstr "Elejir color para el nivel de citado 2"
 
-#: src/prefs_common.c:2713
+#: src/prefs_common.c:2725
 msgid "Pick color for quotation level 3"
 msgstr "Elejir color para el nivel de citado 3"
 
-#: src/prefs_common.c:2716
+#: src/prefs_common.c:2728
 msgid "Pick color for URI"
 msgstr "Elejir color para URIs"
 
-#: src/prefs_common.c:2853
+#: src/prefs_common.c:2865
 msgid "Description of symbols"
 msgstr "Descripción de símbolos"
 
-#: src/prefs_common.c:2909
+#: src/prefs_common.c:2921
 msgid ""
 "Date\n"
 "From\n"
@@ -4877,11 +4915,11 @@ msgstr ""
 "Grupos de noticias\n"
 "ID-Mensaje"
 
-#: src/prefs_common.c:2922
+#: src/prefs_common.c:2934
 msgid "If x is set, displays expr"
 msgstr "Si x está, muestra expr"
 
-#: src/prefs_common.c:2926
+#: src/prefs_common.c:2938
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -4895,7 +4933,7 @@ msgstr ""
 "Cuerpo del mensaje citado sin firma\n"
 "El carácter %"
 
-#: src/prefs_common.c:2934
+#: src/prefs_common.c:2946
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -4907,15 +4945,15 @@ msgstr ""
 "Carácter llave abierta\n"
 "Carácter llave cerrada"
 
-#: src/prefs_common.c:2971
+#: src/prefs_common.c:2983
 msgid "Font selection"
 msgstr "Selección de tipografía"
 
-#: src/prefs_common.c:3035
+#: src/prefs_common.c:3047
 msgid "Key bindings"
 msgstr "Atajos de teclado"
 
-#: src/prefs_common.c:3049
+#: src/prefs_common.c:3061
 msgid ""
 "Select the preset of key bindings.\n"
 "You can also modify each menu's shortcuts by pressing\n"
@@ -4925,11 +4963,11 @@ msgstr ""
 "Se pueden modificar también los atajos de los menús pulsando\n"
 "cualquier tecla(s) al situar el ratón sobre el elemento del menú."
 
-#: src/prefs_common.c:3061 src/prefs_common.c:3410
+#: src/prefs_common.c:3073 src/prefs_common.c:3422
 msgid "Default"
 msgstr "Por defecto"
 
-#: src/prefs_common.c:3064 src/prefs_common.c:3419
+#: src/prefs_common.c:3076 src/prefs_common.c:3431
 msgid "Old Sylpheed"
 msgstr "Antiguos de Sylpheed"
 
@@ -6070,6 +6108,12 @@ msgstr "%.2fGb"
 msgid "writing to %s failed.\n"
 msgstr "fallo escribiendo en %s.\n"
 
+#~ msgid "/_View/_Code set/---"
+#~ msgstr "/_Ver/_Conjunto de códigos/---"
+
+#~ msgid "/_View/_Code set"
+#~ msgstr "/_Ver/_Conjunto de códigos"
+
 #~ msgid "To save this part, pop up the context menu with "
 #~ msgstr "Para guardar esta parte, abra el menu contextual con el "
 
diff --git a/po/et.po b/po/et.po
index 46014b25..ac80ceb7 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: 2005-03-15 14:29+0900\n"
+"POT-Creation-Date: 2005-03-16 14:47+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"
@@ -95,7 +95,7 @@ msgstr ""
 "'G' tulbas lubamaks kirjade võtmist kasutades 'Võta kõik'."
 
 #: src/account.c:638 src/addressadd.c:186 src/addressbook.c:488
-#: src/compose.c:3650 src/editaddress.c:195 src/editaddress.c:936
+#: src/compose.c:3748 src/editaddress.c:195 src/editaddress.c:936
 #: src/editaddress.c:984 src/editbook.c:191 src/editgroup.c:257
 #: src/editjpilot.c:296 src/editldap.c:300 src/editvcard.c:211
 #: src/mimeview.c:151 src/prefs_filter.c:214 src/prefs_folder_item.c:170
@@ -148,13 +148,13 @@ msgstr "Kustuta konto"
 msgid "Do you really want to delete this account?"
 msgstr "Kas te tõesti soovite kustutada kontot?"
 
-#: src/account.c:758 src/compose.c:2551 src/compose.c:4807
+#: src/account.c:758 src/compose.c:2632 src/compose.c:4943
 #: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
 #: src/folderview.c:2156 src/folderview.c:2192
 msgid "Yes"
 msgstr "Jah"
 
-#: src/account.c:758 src/compose.c:2551 src/compose.c:4807
+#: src/account.c:758 src/compose.c:2632 src/compose.c:4943
 #: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
 #: src/folderview.c:2156 src/folderview.c:2192
 msgid "+No"
@@ -257,7 +257,7 @@ msgstr ""
 msgid "Add Address to Book"
 msgstr "Lisa aadress raamatusse"
 
-#: src/addressadd.c:196 src/compose.c:4191 src/editaddress.c:196
+#: src/addressadd.c:196 src/compose.c:4292 src/editaddress.c:196
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "Aadress"
@@ -271,7 +271,7 @@ msgstr "Märkused"
 msgid "Select Address Book Folder"
 msgstr "Vali aadressiraamatu kaust"
 
-#: src/addressbook.c:334 src/compose.c:469 src/mainwindow.c:454
+#: src/addressbook.c:334 src/compose.c:477 src/mainwindow.c:454
 #: src/messageview.c:134
 msgid "/_File"
 msgstr "/_Fail"
@@ -292,8 +292,8 @@ msgstr "/_Fail/Uus _JPiloot"
 msgid "/_File/New _Server"
 msgstr "/_Fail/Uus _Server"
 
-#: src/addressbook.c:343 src/addressbook.c:346 src/compose.c:474
-#: src/compose.c:479 src/compose.c:483 src/mainwindow.c:471
+#: src/addressbook.c:343 src/addressbook.c:346 src/compose.c:482
+#: src/compose.c:487 src/compose.c:491 src/mainwindow.c:471
 #: src/mainwindow.c:474 src/mainwindow.c:476 src/mainwindow.c:479
 #: src/mainwindow.c:481 src/messageview.c:137
 msgid "/_File/---"
@@ -311,7 +311,7 @@ msgstr "/_Fail/Kustuta"
 msgid "/_File/_Save"
 msgstr "/_Fail/_Salvesta"
 
-#: src/addressbook.c:348 src/compose.c:484 src/messageview.c:138
+#: src/addressbook.c:348 src/compose.c:492 src/messageview.c:138
 msgid "/_File/_Close"
 msgstr "/_Fail/Sul_ge"
 
@@ -343,7 +343,7 @@ msgstr "/_Aadress/R_edigeeri"
 msgid "/_Address/_Delete"
 msgstr "/_Aadress/Kustuta"
 
-#: src/addressbook.c:356 src/compose.c:585 src/mainwindow.c:688
+#: src/addressbook.c:356 src/compose.c:664 src/mainwindow.c:697
 #: src/messageview.c:246
 msgid "/_Tools"
 msgstr "/_Tööriist"
@@ -352,12 +352,12 @@ msgstr "/_Tööriist"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Tööriist/Impordi _LDIF fail"
 
-#: src/addressbook.c:358 src/compose.c:598 src/mainwindow.c:733
+#: src/addressbook.c:358 src/compose.c:677 src/mainwindow.c:742
 #: src/messageview.c:264
 msgid "/_Help"
 msgstr "/_Abi"
 
-#: src/addressbook.c:359 src/compose.c:599 src/mainwindow.c:744
+#: src/addressbook.c:359 src/compose.c:678 src/mainwindow.c:753
 #: src/messageview.c:265
 msgid "/_Help/_About"
 msgstr "/_Abi/Sellest"
@@ -374,7 +374,7 @@ msgstr "/Uus _Grupp"
 msgid "/New _Folder"
 msgstr "/Uus Kaust"
 
-#: src/addressbook.c:381 src/addressbook.c:391 src/compose.c:463
+#: src/addressbook.c:381 src/addressbook.c:391 src/compose.c:471
 #: src/folderview.c:220 src/folderview.c:222 src/folderview.c:226
 #: src/folderview.c:236 src/folderview.c:238 src/folderview.c:240
 #: src/folderview.c:244 src/folderview.c:254 src/folderview.c:256
@@ -384,7 +384,7 @@ msgstr "/Uus Kaust"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:382 src/addressbook.c:392 src/compose.c:486
+#: src/addressbook.c:382 src/addressbook.c:392 src/compose.c:494
 #: src/mainwindow.c:485 src/messageview.c:140
 msgid "/_Edit"
 msgstr "/R_edaktor"
@@ -397,7 +397,7 @@ msgstr "/Kustuta"
 msgid "E-Mail address"
 msgstr "E-Posti aadress"
 
-#: src/addressbook.c:493 src/compose.c:4192 src/prefs_common.c:2186
+#: src/addressbook.c:493 src/compose.c:4293 src/prefs_common.c:2198
 msgid "Address book"
 msgstr "Aadressiraamat"
 
@@ -407,7 +407,7 @@ msgstr "Nimi:"
 
 #. Buttons
 #: src/addressbook.c:625 src/addressbook.c:1665 src/addressbook.c:1671
-#: src/editaddress.c:878 src/editaddress.c:1011 src/mainwindow.c:2212
+#: src/editaddress.c:878 src/editaddress.c:1011 src/mainwindow.c:2221
 #: src/prefs_actions.c:263 src/prefs_display_header.c:275
 #: src/prefs_display_header.c:330 src/prefs_template.c:227
 msgid "Delete"
@@ -600,7 +600,7 @@ msgstr "Üldine aadress"
 msgid "Personal address"
 msgstr "Isiklik aadress"
 
-#: src/alertpanel.c:123 src/compose.c:4807 src/main.c:458
+#: src/alertpanel.c:123 src/compose.c:4943 src/main.c:458
 msgid "Notice"
 msgstr "Märkus"
 
@@ -608,7 +608,7 @@ msgstr "Märkus"
 msgid "Warning"
 msgstr "Hoiatus"
 
-#: src/alertpanel.c:149 src/compose.c:2551 src/inc.c:558
+#: src/alertpanel.c:149 src/compose.c:2632 src/inc.c:558
 msgid "Error"
 msgstr "Viga"
 
@@ -656,308 +656,426 @@ msgstr "Pruun"
 msgid "None"
 msgstr "Mittemiski"
 
-#: src/compose.c:461
+#: src/compose.c:469
 msgid "/_Add..."
 msgstr "/Lis_a..."
 
-#: src/compose.c:462
+#: src/compose.c:470
 msgid "/_Remove"
 msgstr "/Eemalda"
 
-#: src/compose.c:464 src/folderview.c:228 src/folderview.c:246
+#: src/compose.c:472 src/folderview.c:228 src/folderview.c:246
 #: src/folderview.c:261
 #, fuzzy
 msgid "/_Properties..."
 msgstr "/Omadus..."
 
-#: src/compose.c:470
+#: src/compose.c:478
 #, fuzzy
 msgid "/_File/_Send"
 msgstr "/_Fail/_Salvesta"
 
-#: src/compose.c:472
+#: src/compose.c:480
 #, fuzzy
 msgid "/_File/Send _later"
 msgstr "/_Kiri/Saada _hiljem"
 
-#: src/compose.c:475
+#: src/compose.c:483
 #, fuzzy
 msgid "/_File/Save to _draft folder"
 msgstr "/_Kiri/Salvesta _mustandi kausta"
 
-#: src/compose.c:477
+#: src/compose.c:485
 #, fuzzy
 msgid "/_File/Save and _keep editing"
 msgstr "/_Kiri/Salvesta ja jätka kirjutamist"
 
-#: src/compose.c:480
+#: src/compose.c:488
 msgid "/_File/_Attach file"
 msgstr "/_Fail/M_anusta fail"
 
-#: src/compose.c:481
+#: src/compose.c:489
 msgid "/_File/_Insert file"
 msgstr "/_Fail/L_isa fail"
 
-#: src/compose.c:482
+#: src/compose.c:490
 msgid "/_File/Insert si_gnature"
 msgstr "/_Fail/Lisa allkiri"
 
-#: src/compose.c:487
+#: src/compose.c:495
 msgid "/_Edit/_Undo"
 msgstr "/R_edigeeri/_Tühista"
 
-#: src/compose.c:488
+#: src/compose.c:496
 msgid "/_Edit/_Redo"
 msgstr "R_edigeeri/_Ennista"
 
-#: src/compose.c:489 src/compose.c:567 src/mainwindow.c:489
+#: src/compose.c:497 src/compose.c:575 src/mainwindow.c:489
 #: src/messageview.c:143
 msgid "/_Edit/---"
 msgstr "/R-edaktor/---"
 
-#: src/compose.c:490
+#: src/compose.c:498
 msgid "/_Edit/Cu_t"
 msgstr "/R_edaktor/_Lõika"
 
-#: src/compose.c:491 src/mainwindow.c:486 src/messageview.c:141
+#: src/compose.c:499 src/mainwindow.c:486 src/messageview.c:141
 msgid "/_Edit/_Copy"
 msgstr "/R_edaktor/_Kopeeri"
 
-#: src/compose.c:492
+#: src/compose.c:500
 msgid "/_Edit/_Paste"
 msgstr "/R_edaktor/_Aseta"
 
-#: src/compose.c:493
+#: src/compose.c:501
 msgid "/_Edit/Paste as _quotation"
 msgstr "/R_edaktor/Aseta kui tsitaat"
 
-#: src/compose.c:495 src/mainwindow.c:487 src/messageview.c:142
+#: src/compose.c:503 src/mainwindow.c:487 src/messageview.c:142
 msgid "/_Edit/Select _all"
 msgstr "/R_edaktor/_Märgi kõik"
 
-#: src/compose.c:496
+#: src/compose.c:504
 msgid "/_Edit/A_dvanced"
 msgstr "/R_edigeeri/_Edendatud"
 
-#: src/compose.c:497
+#: src/compose.c:505
 msgid "/_Edit/A_dvanced/Move a character backward"
 msgstr "/_Redaktor/_Edendatud/Liigu tähe jagu tagasi"
 
-#: src/compose.c:502
+#: src/compose.c:510
 msgid "/_Edit/A_dvanced/Move a character forward"
 msgstr "/_Redaktor/_Edendatud/Liigu tähe jagu edasi"
 
-#: src/compose.c:507
+#: src/compose.c:515
 msgid "/_Edit/A_dvanced/Move a word backward"
 msgstr "/_Redaktor/_Edendatud/Liigu sõna jagu tagasi"
 
-#: src/compose.c:512
+#: src/compose.c:520
 msgid "/_Edit/A_dvanced/Move a word forward"
 msgstr "/_Redaktor/_Edendatud/Liigu sõna jagu edasi"
 
-#: src/compose.c:517
+#: src/compose.c:525
 msgid "/_Edit/A_dvanced/Move to beginning of line"
 msgstr "/_Redaktor/_Edendatud/Liigu rea algusesse"
 
-#: src/compose.c:522
+#: src/compose.c:530
 msgid "/_Edit/A_dvanced/Move to end of line"
 msgstr "/_Redaktor/_Edendatud/Liigu rea lõppu"
 
-#: src/compose.c:527
+#: src/compose.c:535
 msgid "/_Edit/A_dvanced/Move to previous line"
 msgstr "/_Redaktor/_Edendatud/Liigu eelmisele reale"
 
-#: src/compose.c:532
+#: src/compose.c:540
 msgid "/_Edit/A_dvanced/Move to next line"
 msgstr "/_Redaktor/_Edendatud/Liigu järgmisele reale"
 
-#: src/compose.c:537
+#: src/compose.c:545
 msgid "/_Edit/A_dvanced/Delete a character backward"
 msgstr "/_Redaktor/_Edendatud/Kustuta eelmine täht"
 
-#: src/compose.c:542
+#: src/compose.c:550
 msgid "/_Edit/A_dvanced/Delete a character forward"
 msgstr "/_Redaktor/_Edendatud/Kustuta järgmine täht"
 
-#: src/compose.c:547
+#: src/compose.c:555
 msgid "/_Edit/A_dvanced/Delete a word backward"
 msgstr "/_Redaktor/_Edendatud/Kustuta eelmine sõna"
 
-#: src/compose.c:552
+#: src/compose.c:560
 msgid "/_Edit/A_dvanced/Delete a word forward"
 msgstr "/_Redaktor/_Edendatud/Kustuta järgmine sõna"
 
-#: src/compose.c:557
+#: src/compose.c:565
 msgid "/_Edit/A_dvanced/Delete line"
 msgstr "/_Redaktor/_Edendatud/Kustuta rida"
 
-#: src/compose.c:562
+#: src/compose.c:570
 msgid "/_Edit/A_dvanced/Delete to end of line"
 msgstr "/_Redaktor/_Edendatud/Kustuta rea lõpp"
 
-#: src/compose.c:568
+#: src/compose.c:576
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/R_edaktor/_Äärista aktiivne lõik"
 
-#: src/compose.c:570
+#: src/compose.c:578
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/R_edaktor/Ää_rista kõik pikad read"
 
-#: src/compose.c:572
+#: src/compose.c:580
 #, fuzzy
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/R_edaktor/_Kopeeri"
 
-#: src/compose.c:573 src/mainwindow.c:494 src/messageview.c:147
+#: src/compose.c:581 src/mainwindow.c:494 src/messageview.c:147
 #: src/summaryview.c:370
 msgid "/_View"
 msgstr "/_Vaade"
 
-#: src/compose.c:574
+#: src/compose.c:582
 msgid "/_View/_To"
 msgstr "/_Vaadde/_Kellele"
 
-#: src/compose.c:575
+#: src/compose.c:583
 msgid "/_View/_Cc"
 msgstr "/_Vaade/Koopia"
 
-#: src/compose.c:576
+#: src/compose.c:584
 msgid "/_View/_Bcc"
 msgstr "/_Vaade/*_BCC"
 
-#: src/compose.c:577
+#: src/compose.c:585
 msgid "/_View/_Reply to"
 msgstr "/_Vaade/_Vasta"
 
-#: src/compose.c:578 src/compose.c:580 src/compose.c:582 src/mainwindow.c:512
-#: src/mainwindow.c:515 src/mainwindow.c:541 src/mainwindow.c:565
-#: src/mainwindow.c:641 src/mainwindow.c:645 src/messageview.c:223
+#: src/compose.c:586 src/compose.c:588 src/compose.c:590 src/compose.c:592
+#: src/mainwindow.c:512 src/mainwindow.c:515 src/mainwindow.c:541
+#: src/mainwindow.c:565 src/mainwindow.c:650 src/mainwindow.c:654
+#: src/messageview.c:223
 msgid "/_View/---"
 msgstr "/_vaade/---"
 
-#: src/compose.c:579
+#: src/compose.c:587
 msgid "/_View/_Followup to"
 msgstr "/_Vaade/*Järgneja"
 
-#: src/compose.c:581
+#: src/compose.c:589
 msgid "/_View/R_uler"
 msgstr "/_Vaade/Joonla_ud"
 
-#: src/compose.c:583
+#: src/compose.c:591
 msgid "/_View/_Attachment"
 msgstr "/_Vaade/_Manus"
 
-#: src/compose.c:586 src/mainwindow.c:689 src/messageview.c:247
+#: src/compose.c:598 src/mainwindow.c:572 src/messageview.c:154
+#, fuzzy
+msgid "/_View/Character _encoding"
+msgstr "/Vaade/_Sorteeri/Kahanevas järjekorras"
+
+#: src/compose.c:599
+msgid "/_View/Character _encoding/_Automatic"
+msgstr ""
+
+#: src/compose.c:601 src/compose.c:607 src/compose.c:613 src/compose.c:617
+#: src/compose.c:623 src/compose.c:627 src/compose.c:631 src/compose.c:641
+#: src/compose.c:645 src/compose.c:653 src/compose.c:657 src/mainwindow.c:568
+#: src/mainwindow.c:575 src/messageview.c:150
+#, fuzzy
+msgid "/_View/Character _encoding/---"
+msgstr "/Vaade/_Sorteeri/Kahanevas järjekorras"
+
+#: src/compose.c:603 src/mainwindow.c:576 src/messageview.c:158
+#, fuzzy
+msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
+msgstr "/_Vaade/_Kooditabel/7bitine ascii (US-ASCII)"
+
+#: src/compose.c:605 src/mainwindow.c:578 src/messageview.c:161
+#, fuzzy
+msgid "/_View/Character _encoding/Unicode (_UTF-8)"
+msgstr "/_Vaade/_Kooditabel/Unicode (_UTF-8)"
+
+#: src/compose.c:609 src/mainwindow.c:582 src/messageview.c:164
+#, fuzzy
+msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
+msgstr "/_Vaade/_Kooditabel/Lääne-Euroopa (ISO-8859-_1)"
+
+#: src/compose.c:611 src/mainwindow.c:584 src/messageview.c:166
+#, fuzzy
+msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
+msgstr "/_Vaade/_Kooditabel/Lääne-Euroopa (ISO-8859-_15)"
+
+#: src/compose.c:615 src/mainwindow.c:588 src/messageview.c:169
+#, fuzzy
+msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
+msgstr "/_Vaade/_Kooditabel/Kesk-Euroopa (ISO-8859-_2)"
+
+#: src/compose.c:619 src/mainwindow.c:592 src/messageview.c:172
+#, fuzzy
+msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
+msgstr "/_Vaade/_Kooditabel/_Balti (ISO-8859-13)"
+
+#: src/compose.c:621 src/mainwindow.c:594 src/messageview.c:174
+#, fuzzy
+msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
+msgstr "/_Vaade/_Kooditabel/Balti (ISO-8859-_4)"
+
+#: src/compose.c:625 src/mainwindow.c:598 src/messageview.c:177
+#, fuzzy
+msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
+msgstr "/_Vaade/_Kooditabel/Greeka (ISO-8859-_7)"
+
+#: src/compose.c:629 src/mainwindow.c:602 src/messageview.c:180
+#, fuzzy
+msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
+msgstr "/_Vaade/_Kooditabel/Türgi (ISO-8859-_9)"
+
+#: src/compose.c:633 src/mainwindow.c:606 src/messageview.c:183
+#, fuzzy
+msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
+msgstr "/_Vaade/_Kooditabel/Kirillits (ISO-8859-_5)"
+
+#: src/compose.c:635 src/mainwindow.c:608 src/messageview.c:185
+#, fuzzy
+msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
+msgstr "/_Vaade/_Kooditabel/Kirillits (KOI8-_R)"
+
+#: src/compose.c:637 src/mainwindow.c:610 src/messageview.c:187
+#, fuzzy
+msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
+msgstr "/_Vaade/_Kooditabel/Kirillits (KOI8-_R)"
+
+#: src/compose.c:639 src/mainwindow.c:612 src/messageview.c:189
+#, fuzzy
+msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
+msgstr "/_Vaade/_Kooditabel/Kirillits (Windows-1251)"
+
+#: src/compose.c:643 src/mainwindow.c:616 src/messageview.c:192
+#, fuzzy
+msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
+msgstr "/_Vaade/_Kooditabel/Jaapan (ISO-2022-_JP)"
+
+#: src/compose.c:647 src/mainwindow.c:626 src/messageview.c:201
+#, fuzzy
+msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
+msgstr "/_Vaade/_Kooditabel/Lihtsustatud Hiina (_GB2312)"
+
+#: src/compose.c:649 src/mainwindow.c:628 src/messageview.c:203
+#, fuzzy
+msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
+msgstr "/_Vaade/_Kooditabel/Traditsionaalne Hiine (_Big5)"
+
+#: src/compose.c:651 src/mainwindow.c:630 src/messageview.c:205
+#, fuzzy
+msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
+msgstr "/_Vaade/_Kooditabel/Traditsionaalne Hiina (EUC-_TW)"
+
+#: src/compose.c:655 src/mainwindow.c:636 src/messageview.c:210
+#, fuzzy
+msgid "/_View/Character _encoding/Korean (EUC-_KR)"
+msgstr "/_Vaade/_Kooditabel/Korea (EUC-_KR)"
+
+#: src/compose.c:659 src/mainwindow.c:642 src/messageview.c:215
+#, fuzzy
+msgid "/_View/Character _encoding/Thai (TIS-620)"
+msgstr "/_Vaade/_Kooditabel/Tai (TIS-620)"
+
+#: src/compose.c:661 src/mainwindow.c:644 src/messageview.c:217
+#, fuzzy
+msgid "/_View/Character _encoding/Thai (Windows-874)"
+msgstr "/_Vaade/_Kooditabel/Tai (Windows-874)"
+
+#: src/compose.c:665 src/mainwindow.c:698 src/messageview.c:247
 msgid "/_Tools/_Address book"
 msgstr "/_Tööriist/_Aadressiraamat"
 
-#: src/compose.c:587
+#: src/compose.c:666
 msgid "/_Tools/_Template"
 msgstr "/_Tööriist/_Mall"
 
-#: src/compose.c:588 src/mainwindow.c:707 src/messageview.c:262
+#: src/compose.c:667 src/mainwindow.c:716 src/messageview.c:262
 msgid "/_Tools/Actio_ns"
 msgstr "/_Tööriist/Tegevused"
 
-#: src/compose.c:589 src/compose.c:593 src/mainwindow.c:692
-#: src/mainwindow.c:706 src/mainwindow.c:708 src/mainwindow.c:711
-#: src/mainwindow.c:713 src/messageview.c:250 src/messageview.c:261
+#: src/compose.c:668 src/compose.c:672 src/mainwindow.c:701
+#: src/mainwindow.c:715 src/mainwindow.c:717 src/mainwindow.c:720
+#: src/mainwindow.c:722 src/messageview.c:250 src/messageview.c:261
 msgid "/_Tools/---"
 msgstr "/_Tööriist/---"
 
-#: src/compose.c:590
+#: src/compose.c:669
 #, fuzzy
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/R_edaktor/Redi_geeri välise redaktoriga"
 
-#: src/compose.c:594
+#: src/compose.c:673
 #, fuzzy
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Tööriist/Tegevused"
 
-#: src/compose.c:595
+#: src/compose.c:674
 #, fuzzy
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/_Kiri/Krüpteeri"
 
-#: src/compose.c:800
+#: src/compose.c:879
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "faili %s ei leidu\n"
 
-#: src/compose.c:899 src/compose.c:958 src/procmsg.c:1303
+#: src/compose.c:978 src/compose.c:1037 src/procmsg.c:1303
 msgid "Can't get text part\n"
 msgstr "Ei saa tekstiosa kätte\n"
 
-#: src/compose.c:1340
+#: src/compose.c:1419
 msgid "Quote mark format error."
 msgstr "*Tsitaadimärgi formaadi viga."
 
-#: src/compose.c:1352
+#: src/compose.c:1431
 msgid "Message reply/forward format error."
 msgstr "Kirja vasta/edasta formaadi viga."
 
-#: src/compose.c:1679
+#: src/compose.c:1758
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Faili %s ei leidu\n"
 
-#: src/compose.c:1683
+#: src/compose.c:1762
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Ei saanud failile %s suurust\n"
 
-#: src/compose.c:1687
+#: src/compose.c:1766
 #, c-format
 msgid "File %s is empty."
 msgstr "Fail %s on tühi."
 
-#: src/compose.c:1691
+#: src/compose.c:1770
 #, c-format
 msgid "Can't read %s."
 msgstr "ei suuda lugeda %s-i"
 
-#: src/compose.c:1726
+#: src/compose.c:1805
 #, c-format
 msgid "Message: %s"
 msgstr "Kiri: %s"
 
-#: src/compose.c:1797 src/mimeview.c:491
+#: src/compose.c:1876 src/mimeview.c:491
 msgid "Can't get the part of multipart message."
 msgstr "Ei saa mitmeosalise kirja osa kätte."
 
-#: src/compose.c:2188
+#: src/compose.c:2267
 msgid " [Edited]"
 msgstr " [Redigeeritud]"
 
-#: src/compose.c:2190
+#: src/compose.c:2269
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Kirjuta kiri%s"
 
-#: src/compose.c:2193
+#: src/compose.c:2272
 #, c-format
 msgid "Compose message%s"
 msgstr "Kirjuta kiri%s"
 
-#: src/compose.c:2304
+#: src/compose.c:2383
 msgid "Recipient is not specified."
 msgstr "Saaja pole määratud."
 
-#: src/compose.c:2312 src/compose.c:4112 src/mainwindow.c:2144
+#: src/compose.c:2391 src/compose.c:4213 src/mainwindow.c:2153
 #: src/prefs_account.c:703 src/prefs_common.c:850
 msgid "Send"
 msgstr "Saada"
 
-#: src/compose.c:2313
+#: src/compose.c:2392
 msgid "Subject is empty. Send it anyway?"
 msgstr "Päälkiri on tühi. Kas saadame igal juhul?"
 
-#: src/compose.c:2364
+#: src/compose.c:2443
 msgid "can't get recipient list."
 msgstr "ei leia saajate nimistut."
 
-#: src/compose.c:2384
+#: src/compose.c:2463
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -965,27 +1083,27 @@ msgstr ""
 "Kirja saatmiseks pole määratud kasutajtunnust.\n"
 "Palun vali kirja konto enne saatmist."
 
-#: src/compose.c:2398 src/send_message.c:261
+#: src/compose.c:2477 src/send_message.c:261
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Tekkis viga kirja saatmisel %s-le."
 
-#: src/compose.c:2421
+#: src/compose.c:2500
 msgid "Can't save the message to outbox."
 msgstr "Kirja ei õnnestunud asetada väljunute kausta."
 
-#: src/compose.c:2457
+#: src/compose.c:2536
 #, 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:2518 src/compose.c:2739 src/compose.c:2802 src/compose.c:2921
+#: src/compose.c:2597 src/compose.c:2820 src/compose.c:2883 src/compose.c:3003
 #: src/utils.c:2189
 msgid "can't change file mode\n"
 msgstr "Ei suuda muuta faili omadusi\n"
 
-#: src/compose.c:2546
+#: src/compose.c:2627
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -994,141 +1112,141 @@ msgstr ""
 "Ei suuda transleerida kirja tekstikoodi.\n"
 "Kas igatahes saata ?"
 
-#: src/compose.c:2610
+#: src/compose.c:2691
 msgid "can't write headers\n"
 msgstr "Ei suuda kirjutada päist\n"
 
-#: src/compose.c:2881
+#: src/compose.c:2963
 msgid "can't remove the old message\n"
 msgstr "Ei suuda eemaldada vana kirja\n"
 
-#: src/compose.c:2899
+#: src/compose.c:2981
 msgid "queueing message...\n"
 msgstr "Asetan kirja järjekorda...\n"
 
-#: src/compose.c:2981
+#: src/compose.c:3063
 msgid "can't find queue folder\n"
 msgstr "järjekorra kausta ei leidunud\n"
 
-#: src/compose.c:2988
+#: src/compose.c:3070
 msgid "can't queue the message\n"
 msgstr "Ei suutnud kirja järjekorda asetada\n"
 
-#: src/compose.c:3547
+#: src/compose.c:3645
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "Loodud Kirja-ID: %s\n"
 
-#: src/compose.c:3645
+#: src/compose.c:3743
 msgid "Creating compose window...\n"
 msgstr "Loon kirjutamise akent...\n"
 
-#: src/compose.c:3648 src/compose.c:4598
+#: src/compose.c:3746 src/compose.c:4734
 msgid "MIME type"
 msgstr "MIME tüüp"
 
 #. S_COL_DATE
-#: src/compose.c:3649 src/mimeview.c:150 src/prefs_filter_edit.c:569
+#: src/compose.c:3747 src/mimeview.c:150 src/prefs_filter_edit.c:569
 #: src/prefs_summary_column.c:73 src/select-keys.c:317 src/summaryview.c:386
 msgid "Size"
 msgstr "Suurus"
 
-#: src/compose.c:3700 src/headerview.c:53 src/summary_search.c:169
+#: src/compose.c:3798 src/headerview.c:53 src/summary_search.c:169
 msgid "From:"
 msgstr "Kellelt:"
 
-#: src/compose.c:4113
+#: src/compose.c:4214
 msgid "Send message"
 msgstr "Saada kiri"
 
-#: src/compose.c:4121
+#: src/compose.c:4222
 msgid "Send later"
 msgstr "Hiljem"
 
-#: src/compose.c:4122
+#: src/compose.c:4223
 msgid "Put into queue folder and send later"
 msgstr "Pane järjekorda ja saada hiljem"
 
-#: src/compose.c:4130
+#: src/compose.c:4231
 msgid "Draft"
 msgstr "Mustand"
 
-#: src/compose.c:4131
+#: src/compose.c:4232
 msgid "Save to draft folder"
 msgstr "Salvesta mustandite kausta"
 
-#: src/compose.c:4141 src/compose.c:5382
+#: src/compose.c:4242 src/compose.c:5527
 msgid "Insert"
 msgstr "Lisa"
 
-#: src/compose.c:4142
+#: src/compose.c:4243
 msgid "Insert file"
 msgstr "Lisa fail"
 
-#: src/compose.c:4150
+#: src/compose.c:4251
 msgid "Attach"
 msgstr "Manusta"
 
-#: src/compose.c:4151
+#: src/compose.c:4252
 msgid "Attach file"
 msgstr "Manusta fail"
 
 #. signature
-#: src/compose.c:4161 src/prefs_account.c:1339 src/prefs_common.c:1261
+#: src/compose.c:4262 src/prefs_account.c:1339 src/prefs_common.c:1273
 msgid "Signature"
 msgstr "Allkiri"
 
-#: src/compose.c:4162
+#: src/compose.c:4263
 msgid "Insert signature"
 msgstr "Lisa allkiri"
 
-#: src/compose.c:4171 src/prefs_common.c:1283 src/prefs_common.c:2165
+#: src/compose.c:4272 src/prefs_common.c:1295 src/prefs_common.c:2177
 msgid "Editor"
 msgstr "Redaktor"
 
-#: src/compose.c:4172
+#: src/compose.c:4273
 msgid "Edit with external editor"
 msgstr "Redigeeri välise redaktoriga"
 
-#: src/compose.c:4180
+#: src/compose.c:4281
 msgid "Linewrap"
 msgstr "Reaäär"
 
-#: src/compose.c:4181
+#: src/compose.c:4282
 msgid "Wrap all long lines"
 msgstr "Murra kõik pikad read"
 
-#: src/compose.c:4492
+#: src/compose.c:4628
 msgid "Invalid MIME type."
 msgstr "Vale MIME tüüp."
 
-#: src/compose.c:4511
+#: src/compose.c:4647
 msgid "File doesn't exist or is empty."
 msgstr "Faili ei eksisteeri või on see tühi."
 
-#: src/compose.c:4580
+#: src/compose.c:4716
 #, fuzzy
 msgid "Properties"
 msgstr "Omadus"
 
-#: src/compose.c:4600
+#: src/compose.c:4736
 msgid "Encoding"
 msgstr "Kodeerimine"
 
-#: src/compose.c:4623 src/prefs_folder_item.c:183
+#: src/compose.c:4759 src/prefs_folder_item.c:183
 msgid "Path"
 msgstr "Tee"
 
-#: src/compose.c:4624
+#: src/compose.c:4760
 msgid "File name"
 msgstr "Failinimi"
 
-#: src/compose.c:4778
+#: src/compose.c:4914
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Välise redaktori käsurida on vale: `%s'\n"
 
-#: src/compose.c:4804
+#: src/compose.c:4940
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1139,72 +1257,72 @@ msgstr ""
 "Kas hävitame protsessi?\n"
 "protsessi grupi id: %d"
 
-#: src/compose.c:4817
+#: src/compose.c:4953
 #, c-format
 msgid "Terminated process group id: %d"
 msgstr "Hävitatud protsessi grupi id: %d"
 
-#: src/compose.c:4818
+#: src/compose.c:4954
 #, c-format
 msgid "Temporary file: %s"
 msgstr "Ajutine fail: %s"
 
-#: src/compose.c:4842
+#: src/compose.c:4978
 msgid "Compose: input from monitoring process\n"
 msgstr "Kirjutaja: sisend monitoorprotsessilt\n"
 
 #. failed
-#: src/compose.c:4875
+#: src/compose.c:5011
 msgid "Couldn't exec external editor\n"
 msgstr "Ei suutnud välist redaktorit käivitada\n"
 
-#: src/compose.c:4879
+#: src/compose.c:5015
 msgid "Couldn't write to file\n"
 msgstr "Ei suutnud faili salvestada\n"
 
-#: src/compose.c:4881
+#: src/compose.c:5017
 msgid "Pipe read failed\n"
 msgstr "Torust lugemine ebaõnnestus\n"
 
-#: src/compose.c:5182 src/compose.c:5190 src/compose.c:5196
+#: src/compose.c:5318 src/compose.c:5326 src/compose.c:5332
 msgid "Can't queue the message."
 msgstr "Kirja ei õnnestunud järjekorda asetada."
 
-#: src/compose.c:5287
+#: src/compose.c:5423
 #, fuzzy
 msgid "Select files"
 msgstr "Määra fail"
 
-#: src/compose.c:5309
+#: src/compose.c:5445
 msgid "Select file"
 msgstr "Määra fail"
 
-#: src/compose.c:5344
+#: src/compose.c:5480
 msgid "Discard message"
 msgstr "Kaota kiri"
 
-#: src/compose.c:5345
+#: src/compose.c:5481
 msgid "This message has been modified. discard it?"
 msgstr "Seda kirja on muudetud. kas kaotame selle?"
 
-#: src/compose.c:5346
+#: src/compose.c:5482
 msgid "Discard"
 msgstr "Kaota"
 
-#: src/compose.c:5346
+#: src/compose.c:5482
 msgid "to Draft"
 msgstr "Mustanditesse"
 
-#: src/compose.c:5379
+#: src/compose.c:5524
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Kas te tahate seda malli lisada '%s'-e ?"
 
-#: src/compose.c:5381
+#: src/compose.c:5526
 msgid "Apply template"
 msgstr "Lisa mall"
 
-#: src/compose.c:5382
+#: src/compose.c:5527
 msgid "Replace"
 msgstr "Asenda"
 
@@ -1646,12 +1764,12 @@ msgstr "Sean kausta info...\n"
 msgid "Setting folder info..."
 msgstr "Sean kausta info..."
 
-#: src/folderview.c:652 src/mainwindow.c:3190 src/setup.c:81
+#: src/folderview.c:652 src/mainwindow.c:3199 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Tuhnin kaustas %s%c%s ..."
 
-#: src/folderview.c:656 src/mainwindow.c:3195 src/setup.c:86
+#: src/folderview.c:656 src/mainwindow.c:3204 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Tuhnin kaustas %s ..."
@@ -2116,7 +2234,7 @@ msgstr "Impordi LDIF fail aadressiraamatusse"
 msgid "Prev"
 msgstr "Eelm"
 
-#: src/importldif.c:761 src/mainwindow.c:2230
+#: src/importldif.c:761 src/mainwindow.c:2239
 msgid "Next"
 msgstr "Järgmine"
 
@@ -2573,7 +2691,8 @@ msgid "/_View/Separate f_older tree"
 msgstr "/_Vaade/Eraldi kausta puu"
 
 #: src/mainwindow.c:514
-msgid "/_View/Separate m_essage view"
+#, fuzzy
+msgid "/_View/Separate _message view"
 msgstr "/_Vaade/Eraldi kirja vaade"
 
 #: src/mainwindow.c:516
@@ -2710,432 +2829,349 @@ msgstr "/_Vaade/_Ava/Jägmine s_ildiga kiri"
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Vaade/_Ava/Teine kaust..."
 
-#: src/mainwindow.c:568 src/mainwindow.c:575 src/messageview.c:150
-msgid "/_View/_Code set/---"
-msgstr "/_Vaade/_Kooditabel/---"
-
-#: src/mainwindow.c:572 src/messageview.c:154
-msgid "/_View/_Code set"
-msgstr "/_Vaade/_Kooditabel"
-
 #: src/mainwindow.c:573 src/messageview.c:155
-msgid "/_View/_Code set/_Auto detect"
+#, fuzzy
+msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Vaade/_Kooditabel/Määra _Automaatselt"
 
-#: src/mainwindow.c:576 src/messageview.c:158
-msgid "/_View/_Code set/7bit ascii (US-ASC_II)"
-msgstr "/_Vaade/_Kooditabel/7bitine ascii (US-ASCII)"
-
-#: src/mainwindow.c:579 src/messageview.c:161
-msgid "/_View/_Code set/Unicode (_UTF-8)"
-msgstr "/_Vaade/_Kooditabel/Unicode (_UTF-8)"
-
-#: src/mainwindow.c:582 src/messageview.c:164
-msgid "/_View/_Code set/Western European (ISO-8859-_1)"
-msgstr "/_Vaade/_Kooditabel/Lääne-Euroopa (ISO-8859-_1)"
-
-#: src/mainwindow.c:584 src/messageview.c:166
-msgid "/_View/_Code set/Western European (ISO-8859-15)"
-msgstr "/_Vaade/_Kooditabel/Lääne-Euroopa (ISO-8859-_15)"
-
-#: src/mainwindow.c:587 src/messageview.c:169
-msgid "/_View/_Code set/Central European (ISO-8859-_2)"
-msgstr "/_Vaade/_Kooditabel/Kesk-Euroopa (ISO-8859-_2)"
-
-#: src/mainwindow.c:590 src/messageview.c:172
-msgid "/_View/_Code set/_Baltic (ISO-8859-13)"
-msgstr "/_Vaade/_Kooditabel/_Balti (ISO-8859-13)"
-
-#: src/mainwindow.c:592 src/messageview.c:174
-msgid "/_View/_Code set/Baltic (ISO-8859-_4)"
-msgstr "/_Vaade/_Kooditabel/Balti (ISO-8859-_4)"
-
-#: src/mainwindow.c:595 src/messageview.c:177
-msgid "/_View/_Code set/Greek (ISO-8859-_7)"
-msgstr "/_Vaade/_Kooditabel/Greeka (ISO-8859-_7)"
-
-#: src/mainwindow.c:598 src/messageview.c:180
-msgid "/_View/_Code set/Turkish (ISO-8859-_9)"
-msgstr "/_Vaade/_Kooditabel/Türgi (ISO-8859-_9)"
-
-#: src/mainwindow.c:601 src/messageview.c:183
-msgid "/_View/_Code set/Cyrillic (ISO-8859-_5)"
-msgstr "/_Vaade/_Kooditabel/Kirillits (ISO-8859-_5)"
-
-#: src/mainwindow.c:603 src/messageview.c:185
-msgid "/_View/_Code set/Cyrillic (KOI8-_R)"
-msgstr "/_Vaade/_Kooditabel/Kirillits (KOI8-_R)"
-
-#: src/mainwindow.c:605 src/messageview.c:187
+#: src/mainwindow.c:618 src/messageview.c:194
 #, fuzzy
-msgid "/_View/_Code set/Cyrillic (KOI8-U)"
-msgstr "/_Vaade/_Kooditabel/Kirillits (KOI8-_R)"
-
-#: src/mainwindow.c:607 src/messageview.c:189
-msgid "/_View/_Code set/Cyrillic (Windows-1251)"
-msgstr "/_Vaade/_Kooditabel/Kirillits (Windows-1251)"
-
-#: src/mainwindow.c:610 src/messageview.c:192
-msgid "/_View/_Code set/Japanese (ISO-2022-_JP)"
-msgstr "/_Vaade/_Kooditabel/Jaapan (ISO-2022-_JP)"
-
-#: src/mainwindow.c:612 src/messageview.c:194
-msgid "/_View/_Code set/Japanese (ISO-2022-JP-2)"
+msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Vaade/_Kooditabel/Jaapan (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:614 src/messageview.c:196
-msgid "/_View/_Code set/Japanese (_EUC-JP)"
+#: src/mainwindow.c:620 src/messageview.c:196
+#, fuzzy
+msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Vaade/_Kooditabel/Jaapan (_EUC-JP)"
 
-#: src/mainwindow.c:616 src/messageview.c:198
-msgid "/_View/_Code set/Japanese (_Shift__JIS)"
+#: src/mainwindow.c:622 src/messageview.c:198
+#, fuzzy
+msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Vaade/_Kooditabel/Jaapan (_Shift__JIS)"
 
-#: src/mainwindow.c:619 src/messageview.c:201
-msgid "/_View/_Code set/Simplified Chinese (_GB2312)"
-msgstr "/_Vaade/_Kooditabel/Lihtsustatud Hiina (_GB2312)"
-
-#: src/mainwindow.c:621 src/messageview.c:203
-msgid "/_View/_Code set/Traditional Chinese (_Big5)"
-msgstr "/_Vaade/_Kooditabel/Traditsionaalne Hiine (_Big5)"
-
-#: src/mainwindow.c:623 src/messageview.c:205
-msgid "/_View/_Code set/Traditional Chinese (EUC-_TW)"
-msgstr "/_Vaade/_Kooditabel/Traditsionaalne Hiina (EUC-_TW)"
-
-#: src/mainwindow.c:625 src/messageview.c:207
-msgid "/_View/_Code set/Chinese (ISO-2022-_CN)"
+#: src/mainwindow.c:632 src/messageview.c:207
+#, fuzzy
+msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Vaade/_Kooditabel/Hiina (ISO-2022-_CN)"
 
-#: src/mainwindow.c:628 src/messageview.c:210
-msgid "/_View/_Code set/Korean (EUC-_KR)"
-msgstr "/_Vaade/_Kooditabel/Korea (EUC-_KR)"
-
-#: src/mainwindow.c:630 src/messageview.c:212
-msgid "/_View/_Code set/Korean (ISO-2022-KR)"
+#: src/mainwindow.c:638 src/messageview.c:212
+#, fuzzy
+msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Vaade/_Kooditabel/Korea (ISO-2022-KR)"
 
-#: src/mainwindow.c:633 src/messageview.c:215
-msgid "/_View/_Code set/Thai (TIS-620)"
-msgstr "/_Vaade/_Kooditabel/Tai (TIS-620)"
-
-#: src/mainwindow.c:635 src/messageview.c:217
-msgid "/_View/_Code set/Thai (Windows-874)"
-msgstr "/_Vaade/_Kooditabel/Tai (Windows-874)"
-
-#: src/mainwindow.c:642 src/summaryview.c:371
+#: src/mainwindow.c:651 src/summaryview.c:371
 msgid "/_View/Open in new _window"
 msgstr "/Vaade/Ava uues aknas"
 
-#: src/mainwindow.c:643 src/messageview.c:224
+#: src/mainwindow.c:652 src/messageview.c:224
 msgid "/_View/Mess_age source"
 msgstr "/_Vaade/Näita kirja lähtekoodi"
 
-#: src/mainwindow.c:644 src/messageview.c:225
+#: src/mainwindow.c:653 src/messageview.c:225
 msgid "/_View/Show all _header"
 msgstr "/_Vaade/Näita ko_gu päist"
 
-#: src/mainwindow.c:646
+#: src/mainwindow.c:655
 msgid "/_View/_Update summary"
 msgstr "/_Vaade/_Uuenda koond"
 
-#: src/mainwindow.c:648 src/messageview.c:227
+#: src/mainwindow.c:657 src/messageview.c:227
 msgid "/_Message"
 msgstr "/_Kiri"
 
-#: src/mainwindow.c:649
+#: src/mainwindow.c:658
 #, fuzzy
 msgid "/_Message/Recei_ve"
 msgstr "/_Kiri/Kirjuta _ümber"
 
-#: src/mainwindow.c:650
+#: src/mainwindow.c:659
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/_Kiri/Võta _kõigilt kontodelt"
 
-#: src/mainwindow.c:652
+#: src/mainwindow.c:661
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/_Kiri/Võta _kõigilt kontodelt"
 
-#: src/mainwindow.c:654
+#: src/mainwindow.c:663
 #, fuzzy
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/_Kiri/Katkesta kirjade võtmine"
 
-#: src/mainwindow.c:656
+#: src/mainwindow.c:665
 #, fuzzy
 msgid "/_Message/Recei_ve/---"
 msgstr "/_Kiri/Kirjuta _ümber"
 
-#: src/mainwindow.c:657
+#: src/mainwindow.c:666
 msgid "/_Message/_Send queued messages"
 msgstr "/_Kiri/_Saada järjekorras olevad kirjad"
 
-#: src/mainwindow.c:658 src/mainwindow.c:660 src/mainwindow.c:667
-#: src/mainwindow.c:672 src/mainwindow.c:676 src/mainwindow.c:685
+#: src/mainwindow.c:667 src/mainwindow.c:669 src/mainwindow.c:676
+#: src/mainwindow.c:681 src/mainwindow.c:685 src/mainwindow.c:694
 #: src/messageview.c:230 src/messageview.c:238 src/messageview.c:243
 msgid "/_Message/---"
 msgstr "/_Kiri/---"
 
-#: src/mainwindow.c:659 src/messageview.c:228
+#: src/mainwindow.c:668 src/messageview.c:228
 msgid "/_Message/Compose _new message"
 msgstr "/_Kiri/Uus k_iri"
 
-#: src/mainwindow.c:661 src/messageview.c:231
+#: src/mainwindow.c:670 src/messageview.c:231
 msgid "/_Message/_Reply"
 msgstr "/_Kiri/_Vasta"
 
-#: src/mainwindow.c:662
+#: src/mainwindow.c:671
 msgid "/_Message/Repl_y to"
 msgstr "/_Kiri/_Vasta"
 
-#: src/mainwindow.c:663 src/messageview.c:232
+#: src/mainwindow.c:672 src/messageview.c:232
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Kiri/Vasta/k_õigile"
 
-#: src/mainwindow.c:664 src/messageview.c:234
+#: src/mainwindow.c:673 src/messageview.c:234
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Kiri/Vas_ta/_saatjale"
 
-#: src/mainwindow.c:665 src/messageview.c:236
+#: src/mainwindow.c:674 src/messageview.c:236
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Kiri/Vasta/kirja _listi"
 
-#: src/mainwindow.c:668 src/messageview.c:239
+#: src/mainwindow.c:677 src/messageview.c:239
 msgid "/_Message/_Forward"
 msgstr "/_Kiri/Saada _edasi"
 
-#: src/mainwindow.c:669 src/messageview.c:240
+#: src/mainwindow.c:678 src/messageview.c:240
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Kiri/Saada edasi _manusena"
 
-#: src/mainwindow.c:671 src/messageview.c:242
+#: src/mainwindow.c:680 src/messageview.c:242
 msgid "/_Message/Redirec_t"
 msgstr "/_Kiri/Suuna _ümber"
 
-#: src/mainwindow.c:673
+#: src/mainwindow.c:682
 msgid "/_Message/M_ove..."
 msgstr "/_Kiri/_Nihuta..."
 
-#: src/mainwindow.c:674
+#: src/mainwindow.c:683
 msgid "/_Message/_Copy..."
 msgstr "/_Kiri/K_opeeri..."
 
-#: src/mainwindow.c:675
+#: src/mainwindow.c:684
 msgid "/_Message/_Delete"
 msgstr "/_Kiri/Kustuta"
 
-#: src/mainwindow.c:677
+#: src/mainwindow.c:686
 msgid "/_Message/_Mark"
 msgstr "/_Kiri/M_ärk"
 
-#: src/mainwindow.c:678
+#: src/mainwindow.c:687
 msgid "/_Message/_Mark/_Mark"
 msgstr "/_Kiri/M_ärk/M_ärgi"
 
-#: src/mainwindow.c:679
+#: src/mainwindow.c:688
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/_Kiri/M_ärk/_Eemaldan märgi"
 
-#: src/mainwindow.c:680
+#: src/mainwindow.c:689
 msgid "/_Message/_Mark/---"
 msgstr "/_Kiri/M_ärk/---"
 
-#: src/mainwindow.c:681
+#: src/mainwindow.c:690
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/_Kiri/M_ärk/Märgin _mitteloetuks"
 
-#: src/mainwindow.c:682
+#: src/mainwindow.c:691
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/_Kiri/M_ärk/Märgin _loetuks"
 
-#: src/mainwindow.c:684
+#: src/mainwindow.c:693
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/_Kiri/M_ärk/Märgin _kõik loetuks"
 
-#: src/mainwindow.c:686 src/messageview.c:244
+#: src/mainwindow.c:695 src/messageview.c:244
 msgid "/_Message/Re-_edit"
 msgstr "/_Kiri/Kirjuta _ümber"
 
-#: src/mainwindow.c:690 src/messageview.c:248
+#: src/mainwindow.c:699 src/messageview.c:248
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/_Tööriist/Lisa saatja aadressi raamatusse"
 
-#: src/mainwindow.c:693
+#: src/mainwindow.c:702
 #, fuzzy
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/_Tööriist/_Filtreeri kirjad"
 
-#: src/mainwindow.c:695
+#: src/mainwindow.c:704
 #, fuzzy
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Tööriist/_Filtreeri kirjad"
 
-#: src/mainwindow.c:697 src/messageview.c:251
+#: src/mainwindow.c:706 src/messageview.c:251
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Tööriist/Loo filtri reeglistik"
 
-#: src/mainwindow.c:698 src/messageview.c:253
+#: src/mainwindow.c:707 src/messageview.c:253
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Tööriist/Loo filtri reeglistik/Automaatselt"
 
-#: src/mainwindow.c:700 src/messageview.c:255
+#: src/mainwindow.c:709 src/messageview.c:255
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Tööriist/Loo filtri reeglistik/ kasutades Kellelt"
 
-#: src/mainwindow.c:702 src/messageview.c:257
+#: src/mainwindow.c:711 src/messageview.c:257
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Tööriist/Loo filtri reeglistik/kasutades Kellele"
 
-#: src/mainwindow.c:704 src/messageview.c:259
+#: src/mainwindow.c:713 src/messageview.c:259
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Tööriist/Loo filtri reeglistik/ kasutades päälkirja"
 
-#: src/mainwindow.c:709
+#: src/mainwindow.c:718
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/_Tööriist/_Kustuta topelt kirjad"
 
-#: src/mainwindow.c:712
+#: src/mainwindow.c:721
 msgid "/_Tools/E_xecute"
 msgstr "/_Tööriist/Käivita"
 
-#: src/mainwindow.c:714
+#: src/mainwindow.c:723
 msgid "/_Tools/_Log window"
 msgstr "/_Tööriist/_Teadete aken"
 
-#: src/mainwindow.c:716
+#: src/mainwindow.c:725
 msgid "/_Configuration"
 msgstr "/_Häälestus"
 
-#: src/mainwindow.c:717
+#: src/mainwindow.c:726
 msgid "/_Configuration/_Common preferences..."
 msgstr "/_Häälestus/_Üldised omadused..."
 
-#: src/mainwindow.c:719
+#: src/mainwindow.c:728
 msgid "/_Configuration/_Filter setting..."
 msgstr "/_Häälestus/_Filtri seaded..."
 
-#: src/mainwindow.c:721
+#: src/mainwindow.c:730
 msgid "/_Configuration/_Template..."
 msgstr "/_Häälestus/_Mall..."
 
-#: src/mainwindow.c:722
+#: src/mainwindow.c:731
 msgid "/_Configuration/_Actions..."
 msgstr "/_Häälestus/Tegevused..."
 
-#: src/mainwindow.c:723
+#: src/mainwindow.c:732
 msgid "/_Configuration/---"
 msgstr "/_Häälestus/---"
 
-#: src/mainwindow.c:724
+#: src/mainwindow.c:733
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Häälestus/_Hetkel kasutatava konto omadused..."
 
-#: src/mainwindow.c:726
+#: src/mainwindow.c:735
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Häälestus/_Loo uus konto..."
 
-#: src/mainwindow.c:728
+#: src/mainwindow.c:737
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Häälestus/_Redigeeri kontosid..."
 
-#: src/mainwindow.c:730
+#: src/mainwindow.c:739
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Häälestus/_Muuda kasutatavat kontot"
 
-#: src/mainwindow.c:734
+#: src/mainwindow.c:743
 msgid "/_Help/_Manual"
 msgstr "/_Abi/_Juhend"
 
-#: src/mainwindow.c:735
+#: src/mainwindow.c:744
 msgid "/_Help/_Manual/_English"
 msgstr "/_Abi/_Juhend/_Inglise"
 
-#: src/mainwindow.c:736
+#: src/mainwindow.c:745
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/_Abi/_Juhend/_Jaapani"
 
-#: src/mainwindow.c:737
+#: src/mainwindow.c:746
 msgid "/_Help/_FAQ"
 msgstr "/_Abi/_KKK"
 
-#: src/mainwindow.c:738
+#: src/mainwindow.c:747
 msgid "/_Help/_FAQ/_English"
 msgstr "/_Abi/_KKK/_Inglise"
 
-#: src/mainwindow.c:739
+#: src/mainwindow.c:748
 msgid "/_Help/_FAQ/_German"
 msgstr "/_Abi/_KKK/_Saksa"
 
-#: src/mainwindow.c:740
+#: src/mainwindow.c:749
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/_Abi/_KKK/_Hispaania"
 
-#: src/mainwindow.c:741
+#: src/mainwindow.c:750
 msgid "/_Help/_FAQ/_French"
 msgstr "/_Abi/_KKK/_Prantsuse"
 
-#: src/mainwindow.c:742
+#: src/mainwindow.c:751
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/_Abi/_KKK/_Itaalia"
 
-#: src/mainwindow.c:743
+#: src/mainwindow.c:752
 msgid "/_Help/---"
 msgstr "/_Abi/---"
 
-#: src/mainwindow.c:783
+#: src/mainwindow.c:792
 msgid "Creating main window...\n"
 msgstr "Loon peamise akna...\n"
 
-#: src/mainwindow.c:943
+#: src/mainwindow.c:952
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "PeaAken: värvi haldamine %d ebaõnnestus\n"
 
-#: src/mainwindow.c:1021 src/summaryview.c:1368 src/summaryview.c:1677
+#: src/mainwindow.c:1030 src/summaryview.c:1368 src/summaryview.c:1677
 #: src/summaryview.c:1785 src/summaryview.c:1831 src/summaryview.c:2453
 #: src/summaryview.c:3080 src/summaryview.c:3146 src/summaryview.c:3171
 #: src/summaryview.c:3284
 msgid "done.\n"
 msgstr "tehtud.\n"
 
-#: src/mainwindow.c:1137 src/mainwindow.c:1178 src/mainwindow.c:1206
+#: src/mainwindow.c:1146 src/mainwindow.c:1187 src/mainwindow.c:1215
 msgid "Untitled"
 msgstr "Tiitlita"
 
-#: src/mainwindow.c:1207
+#: src/mainwindow.c:1216
 msgid "none"
 msgstr "mittemiski"
 
-#: src/mainwindow.c:1257
+#: src/mainwindow.c:1266
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "Muudan akna eraldamise tüüpi %d-lt %d-le\n"
 
-#: src/mainwindow.c:1477
+#: src/mainwindow.c:1486
 msgid "Offline"
 msgstr ""
 
-#: src/mainwindow.c:1478
+#: src/mainwindow.c:1487
 msgid "You are offline. Go online?"
 msgstr ""
 
-#: src/mainwindow.c:1492
+#: src/mainwindow.c:1501
 #, fuzzy
 msgid "Empty all trash"
 msgstr "Tühjenda prügikast"
 
-#: src/mainwindow.c:1493
+#: src/mainwindow.c:1502
 #, fuzzy
 msgid "Empty messages in all trash?"
 msgstr "Kas eemaldada kõik kirjad prügikastist?"
 
-#: src/mainwindow.c:1521
+#: src/mainwindow.c:1530
 msgid "Add mailbox"
 msgstr "Lisa kirjakast"
 
-#: src/mainwindow.c:1522
+#: src/mainwindow.c:1531
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3144,16 +3180,16 @@ msgstr ""
 "Sisesta kirjakasti asukoht.\n"
 "Kui määrate juba olemasoleva kirjakasti, siis seeskaneeritakse automaatselt."
 
-#: src/mainwindow.c:1528
+#: src/mainwindow.c:1537
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Kirjakast %s on juba olemas."
 
-#: src/mainwindow.c:1533 src/setup.c:57
+#: src/mainwindow.c:1542 src/setup.c:57
 msgid "Mailbox"
 msgstr "Kirjakast"
 
-#: src/mainwindow.c:1539 src/setup.c:63
+#: src/mainwindow.c:1548 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3162,144 +3198,144 @@ msgstr ""
 "Kirjakasti loomine ebaõnnestus.\n"
 "Võibolla mõned failid on olemas, või teil pole õigusi sinna kirjutamiseks."
 
-#: src/mainwindow.c:1912
+#: src/mainwindow.c:1921
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - kausta vaade"
 
-#: src/mainwindow.c:1932 src/messageview.c:358
+#: src/mainwindow.c:1941 src/messageview.c:358
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - kirja vaade"
 
-#: src/mainwindow.c:2079 src/summaryview.c:340
+#: src/mainwindow.c:2088 src/summaryview.c:340
 msgid "/_Reply"
 msgstr "/Vastan"
 
-#: src/mainwindow.c:2080
+#: src/mainwindow.c:2089
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "Vasta ja saada koopia kõigile, kes said selle kirja"
 
-#: src/mainwindow.c:2081
+#: src/mainwindow.c:2090
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/Vasta/_saatjale"
 
-#: src/mainwindow.c:2082
+#: src/mainwindow.c:2091
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/Vasta/kirja_listi"
 
-#: src/mainwindow.c:2087 src/summaryview.c:347
+#: src/mainwindow.c:2096 src/summaryview.c:347
 msgid "/_Forward"
 msgstr "/Saadan edasi"
 
-#: src/mainwindow.c:2088 src/summaryview.c:348
+#: src/mainwindow.c:2097 src/summaryview.c:348
 msgid "/For_ward as attachment"
 msgstr "/Saada edasi manusena"
 
-#: src/mainwindow.c:2089 src/summaryview.c:349
+#: src/mainwindow.c:2098 src/summaryview.c:349
 msgid "/Redirec_t"
 msgstr "/Suuna ümber"
 
-#: src/mainwindow.c:2125
+#: src/mainwindow.c:2134
 msgid "Get"
 msgstr "Võta"
 
-#: src/mainwindow.c:2126
+#: src/mainwindow.c:2135
 msgid "Incorporate new mail"
 msgstr "Võta uued kirjad"
 
-#: src/mainwindow.c:2133
+#: src/mainwindow.c:2142
 msgid "Get all"
 msgstr "Võta kõik"
 
-#: src/mainwindow.c:2134
+#: src/mainwindow.c:2143
 msgid "Incorporate new mail of all accounts"
 msgstr "Võta kõigilt kontodelt uued kirjad"
 
-#: src/mainwindow.c:2145
+#: src/mainwindow.c:2154
 msgid "Send queued message(s)"
 msgstr "Saada kirjad järjekorrast"
 
-#: src/mainwindow.c:2155 src/prefs_account.c:705 src/prefs_common.c:852
+#: src/mainwindow.c:2164 src/prefs_account.c:705 src/prefs_common.c:852
 #: src/prefs_folder_item.c:137
 msgid "Compose"
 msgstr "Kirjuta"
 
-#: src/mainwindow.c:2156
+#: src/mainwindow.c:2165
 msgid "Compose new message"
 msgstr "Kirjuta uus kiri"
 
-#: src/mainwindow.c:2164 src/prefs_common.c:1353
+#: src/mainwindow.c:2173 src/prefs_common.c:1365
 msgid "Reply"
 msgstr "Vasta"
 
-#: src/mainwindow.c:2165 src/mainwindow.c:2178
+#: src/mainwindow.c:2174 src/mainwindow.c:2187
 msgid "Reply to the message"
 msgstr "Vasta kirjale"
 
-#: src/mainwindow.c:2183
+#: src/mainwindow.c:2192
 msgid "Reply all"
 msgstr "Vasta ja"
 
-#: src/mainwindow.c:2184
+#: src/mainwindow.c:2193
 msgid "Reply to all"
 msgstr "Vasta ja saada koopia kõigile, kes said selle kirja"
 
-#: src/mainwindow.c:2192 src/prefs_filter_edit.c:719
+#: src/mainwindow.c:2201 src/prefs_filter_edit.c:719
 msgid "Forward"
 msgstr "Edasta"
 
-#: src/mainwindow.c:2193 src/mainwindow.c:2206
+#: src/mainwindow.c:2202 src/mainwindow.c:2215
 msgid "Forward the message"
 msgstr "Saada kiri edasi"
 
-#: src/mainwindow.c:2213
+#: src/mainwindow.c:2222
 msgid "Delete the message"
 msgstr "Kustuta kiri"
 
-#: src/mainwindow.c:2221
+#: src/mainwindow.c:2230
 msgid "Execute"
 msgstr "Käivita"
 
-#: src/mainwindow.c:2222
+#: src/mainwindow.c:2231
 msgid "Execute marked process"
 msgstr "Käivita märgitud protsess"
 
-#: src/mainwindow.c:2231
+#: src/mainwindow.c:2240
 msgid "Next unread message"
 msgstr "Järgmine kiri mida pole loetud"
 
-#: src/mainwindow.c:2242
+#: src/mainwindow.c:2251
 msgid "Prefs"
 msgstr "Seaded"
 
-#: src/mainwindow.c:2243
+#: src/mainwindow.c:2252
 msgid "Common preferences"
 msgstr "Üldised omaduse"
 
-#: src/mainwindow.c:2250 src/prefs_folder_item.c:258
+#: src/mainwindow.c:2259 src/prefs_folder_item.c:258
 #: src/prefs_folder_item.c:269 src/progressdialog.c:50
 msgid "Account"
 msgstr "Konto"
 
-#: src/mainwindow.c:2251
+#: src/mainwindow.c:2260
 msgid "Account setting"
 msgstr "Konto seaded"
 
-#: src/mainwindow.c:2425
+#: src/mainwindow.c:2434
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 
-#: src/mainwindow.c:2436
+#: src/mainwindow.c:2445
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 
-#: src/mainwindow.c:2624
+#: src/mainwindow.c:2633
 msgid "Exit"
 msgstr "Välju"
 
-#: src/mainwindow.c:2624
+#: src/mainwindow.c:2633
 msgid "Exit this program?"
 msgstr "Lõpetame programmi töö."
 
@@ -3425,7 +3461,7 @@ msgstr "Otsimine lõpetatud"
 msgid "Creating message view...\n"
 msgstr "Loon kirja vaate...\n"
 
-#: src/messageview.c:303 src/prefs_common.c:1550
+#: src/messageview.c:303 src/prefs_common.c:1562
 msgid "Text"
 msgstr "Tekst"
 
@@ -3438,7 +3474,7 @@ msgstr "Manused"
 msgid "Can't save the file `%s'."
 msgstr "Ei suuda faili '%s' salvestada."
 
-#: src/messageview.c:697 src/prefs_common.c:2154 src/summaryview.c:2744
+#: src/messageview.c:697 src/prefs_common.c:2166 src/summaryview.c:2744
 msgid "Print"
 msgstr "Trüki"
 
@@ -3915,7 +3951,7 @@ msgstr "(Filtreerimata kirjad salvestatakse sellesse kausta)"
 msgid "Authentication method"
 msgstr "Autoriseerimise meetod"
 
-#: src/prefs_account.c:1123 src/prefs_account.c:1239 src/prefs_common.c:1189
+#: src/prefs_account.c:1123 src/prefs_account.c:1239 src/prefs_common.c:1201
 msgid "Automatic"
 msgstr "Automaatne"
 
@@ -3939,7 +3975,7 @@ msgstr "Loo Kirja-ID"
 msgid "Add user-defined header"
 msgstr "Lisa kasutaja defineeritud päis"
 
-#: src/prefs_account.c:1196 src/prefs_common.c:1714 src/prefs_common.c:1739
+#: src/prefs_account.c:1196 src/prefs_common.c:1726 src/prefs_common.c:1751
 msgid " Edit... "
 msgstr " Redigeeri... "
 
@@ -4334,106 +4370,107 @@ msgid "Save sent messages to outbox"
 msgstr "Pane saadetud kirjad kausta Saadetud"
 
 #: src/prefs_common.c:1113
-msgid "Outgoing codeset"
+#, fuzzy
+msgid "Outgoing encoding"
 msgstr "Väljuva kirja kooditabel"
 
 #: src/prefs_common.c:1128
 msgid "Automatic (Recommended)"
 msgstr "Automaatne (Soovitatav)"
 
-#: src/prefs_common.c:1129
+#: src/prefs_common.c:1130
 msgid "7bit ascii (US-ASCII)"
 msgstr "7 bitine ascii (US-ASCII)"
 
-#: src/prefs_common.c:1130
+#: src/prefs_common.c:1132
 msgid "Unicode (UTF-8)"
 msgstr "Unikood (UTF-8)"
 
-#: src/prefs_common.c:1131
+#: src/prefs_common.c:1134
 msgid "Western European (ISO-8859-1)"
 msgstr "Lääne-Euroopa (ISO-8859-1)"
 
-#: src/prefs_common.c:1132
+#: src/prefs_common.c:1135
 msgid "Western European (ISO-8859-15)"
 msgstr "Lääne-Euroopa (ISO-8859-15)"
 
-#: src/prefs_common.c:1133
+#: src/prefs_common.c:1137
 msgid "Central European (ISO-8859-2)"
 msgstr "Kesk Euroopa (ISO-8859-2)"
 
-#: src/prefs_common.c:1134
+#: src/prefs_common.c:1139
 msgid "Baltic (ISO-8859-13)"
 msgstr "Balti (ISO-8859-13)"
 
-#: src/prefs_common.c:1135
+#: src/prefs_common.c:1140
 msgid "Baltic (ISO-8859-4)"
 msgstr "Balti (ISO-8859-4)"
 
-#: src/prefs_common.c:1136
+#: src/prefs_common.c:1142
 msgid "Greek (ISO-8859-7)"
 msgstr "Kreeka (ISO-8859-7)"
 
-#: src/prefs_common.c:1137
+#: src/prefs_common.c:1144
 msgid "Turkish (ISO-8859-9)"
 msgstr "Türgi (ISO-8859-9)"
 
-#: src/prefs_common.c:1138
+#: src/prefs_common.c:1146
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Kirillits (ISO-8859-5)"
 
-#: src/prefs_common.c:1139
+#: src/prefs_common.c:1147
 msgid "Cyrillic (KOI8-R)"
 msgstr "Kirillits (KOI8-R)"
 
-#: src/prefs_common.c:1140
-msgid "Cyrillic (Windows-1251)"
-msgstr "Kirillits (Windows-1251)"
-
-#: src/prefs_common.c:1141
+#: src/prefs_common.c:1148
 msgid "Cyrillic (KOI8-U)"
 msgstr "Kirillits (KOI8-U)"
 
-#: src/prefs_common.c:1142
+#: src/prefs_common.c:1149
+msgid "Cyrillic (Windows-1251)"
+msgstr "Kirillits (Windows-1251)"
+
+#: src/prefs_common.c:1151
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Jaapani (ISO-2022-JP)"
 
-#: src/prefs_common.c:1144
+#: src/prefs_common.c:1153
 msgid "Japanese (EUC-JP)"
 msgstr "Jaapani (EUC-JP)"
 
-#: src/prefs_common.c:1145
+#: src/prefs_common.c:1154
 msgid "Japanese (Shift_JIS)"
 msgstr "Jaapani (Shift_JIS)"
 
-#: src/prefs_common.c:1147
+#: src/prefs_common.c:1157
 msgid "Simplified Chinese (GB2312)"
 msgstr "Lihtsustatud Hiina (GB2312)"
 
-#: src/prefs_common.c:1148
+#: src/prefs_common.c:1158
 msgid "Traditional Chinese (Big5)"
 msgstr "Traditsionaalne Hiina (Big5)"
 
-#: src/prefs_common.c:1150
+#: src/prefs_common.c:1160
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Traditsionaalne Hiina (EUC-TW)"
 
-#: src/prefs_common.c:1151
+#: src/prefs_common.c:1161
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Hiina (ISO-2022-CN)"
 
-#: src/prefs_common.c:1153
+#: src/prefs_common.c:1164
 msgid "Korean (EUC-KR)"
 msgstr "Korea (EUC-KR)"
 
-#: src/prefs_common.c:1154
+#: src/prefs_common.c:1166
 msgid "Thai (TIS-620)"
 msgstr "Tai (TIS-620)"
 
-#: src/prefs_common.c:1155
+#: src/prefs_common.c:1167
 msgid "Thai (Windows-874)"
 msgstr "Tai (Windows-874)"
 
-#: src/prefs_common.c:1165
+#: src/prefs_common.c:1177
 #, fuzzy
 msgid ""
 "If `Automatic' is selected, the optimal encoding for the current locale will "
@@ -4442,454 +4479,454 @@ msgstr ""
 "Kui on märgitud 'Automaatne', siis kasutatakse praeguse\n"
 "lokaali jaoks optimaalset kodeeringut."
 
-#: src/prefs_common.c:1179
+#: src/prefs_common.c:1191
 #, fuzzy
 msgid "Transfer encoding"
 msgstr "Äärista enne saatmist"
 
-#: src/prefs_common.c:1202
+#: src/prefs_common.c:1214
 msgid ""
 "Specify Content-Transfer-Encoding used when message body contains non-ASCII "
 "characters."
 msgstr ""
 
-#: src/prefs_common.c:1272
+#: src/prefs_common.c:1284
 msgid "Signature separator"
 msgstr "Allkirja eraldaja"
 
-#: src/prefs_common.c:1281
+#: src/prefs_common.c:1293
 msgid "Insert automatically"
 msgstr "Lisa automaatselt"
 
-#: src/prefs_common.c:1291
+#: src/prefs_common.c:1303
 msgid "Automatically launch the external editor"
 msgstr "Käivita väline redaktor automaatselt"
 
-#: src/prefs_common.c:1301
+#: src/prefs_common.c:1313
 msgid "Undo level"
 msgstr "Meelespeetavaid muudatusi"
 
-#: src/prefs_common.c:1321
+#: src/prefs_common.c:1333
 msgid "Wrap messages at"
 msgstr "Äärista kirjaread"
 
-#: src/prefs_common.c:1333
+#: src/prefs_common.c:1345
 msgid "characters"
 msgstr "sümboli laiuseks"
 
-#: src/prefs_common.c:1343
+#: src/prefs_common.c:1355
 msgid "Wrap quotation"
 msgstr "Äärista tsitaati"
 
-#: src/prefs_common.c:1349
+#: src/prefs_common.c:1361
 msgid "Wrap on input"
 msgstr "Murra kõik pikad read sisestamisel"
 
-#: src/prefs_common.c:1351
+#: src/prefs_common.c:1363
 msgid "Wrap before sending"
 msgstr "Äärista enne saatmist"
 
-#: src/prefs_common.c:1361
+#: src/prefs_common.c:1373
 msgid "Automatically select account for replies"
 msgstr "Vali vastuste jaoks konto automaatselt"
 
-#: src/prefs_common.c:1363
+#: src/prefs_common.c:1375
 msgid "Quote message when replying"
 msgstr "Kirjale vastamisel tsiteeri seda."
 
-#: src/prefs_common.c:1365
+#: src/prefs_common.c:1377
 msgid "Reply button invokes mailing list reply"
 msgstr "Vasta nupp käivitab vastamise kirjalisti"
 
 #. reply
-#: src/prefs_common.c:1411
+#: src/prefs_common.c:1423
 msgid "Reply format"
 msgstr "Vastuse formaat"
 
-#: src/prefs_common.c:1426 src/prefs_common.c:1468
+#: src/prefs_common.c:1438 src/prefs_common.c:1480
 msgid "Quotation mark"
 msgstr "Tsitaadi märk"
 
 #. forward
-#: src/prefs_common.c:1453
+#: src/prefs_common.c:1465
 msgid "Forward format"
 msgstr "Edasta formaat"
 
-#: src/prefs_common.c:1500
+#: src/prefs_common.c:1512
 msgid " Description of symbols "
 msgstr " Sümbolite seletus "
 
-#: src/prefs_common.c:1541
+#: src/prefs_common.c:1553
 msgid "Font"
 msgstr "Tekstistiil"
 
-#: src/prefs_common.c:1573
+#: src/prefs_common.c:1585
 msgid "Translate header name (such as `From:', `Subject:')"
 msgstr "Tõlgi päise nimed (näiteks From: Subject: ...)"
 
-#: src/prefs_common.c:1576
+#: src/prefs_common.c:1588
 msgid "Display unread number next to folder name"
 msgstr "Näita arvu, mitu kirja pole loetud, kausta nime järel"
 
-#: src/prefs_common.c:1585
+#: src/prefs_common.c:1597
 msgid "Abbreviate newsgroups longer than"
 msgstr "lühenda uudistegruppe, mis on pikemad kui"
 
-#: src/prefs_common.c:1600
+#: src/prefs_common.c:1612
 msgid "letters"
 msgstr "tähte"
 
 #. ---- Summary ----
-#: src/prefs_common.c:1606
+#: src/prefs_common.c:1618
 msgid "Summary View"
 msgstr "Kirjaloendi vaade"
 
-#: src/prefs_common.c:1615
+#: src/prefs_common.c:1627
 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.c:1617
+#: src/prefs_common.c:1629
 msgid "Expand threads"
 msgstr "Paisuta teemad"
 
-#: src/prefs_common.c:1625 src/prefs_common.c:2443 src/prefs_common.c:2481
+#: src/prefs_common.c:1637 src/prefs_common.c:2455 src/prefs_common.c:2493
 msgid "Date format"
 msgstr "Kuupäeva formaat"
 
-#: src/prefs_common.c:1646
+#: src/prefs_common.c:1658
 msgid " Set display item of summary... "
 msgstr " Määra kirjaloendis näidatavad elemendid... "
 
-#: src/prefs_common.c:1710
+#: src/prefs_common.c:1722
 msgid "Enable coloration of message"
 msgstr "Kirja värvimine lubatud"
 
-#: src/prefs_common.c:1724
+#: src/prefs_common.c:1736
 #, 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.c:1730
+#: src/prefs_common.c:1742
 msgid "Display header pane above message view"
 msgstr "Näita kirja päist ülalpool kirja vaadet"
 
-#: src/prefs_common.c:1737
+#: src/prefs_common.c:1749
 msgid "Display short headers on message view"
 msgstr "Näita päiseid lühidalt"
 
-#: src/prefs_common.c:1758
+#: src/prefs_common.c:1770
 msgid "Line space"
 msgstr "Reavahe"
 
-#: src/prefs_common.c:1772 src/prefs_common.c:1810
+#: src/prefs_common.c:1784 src/prefs_common.c:1822
 msgid "pixel(s)"
 msgstr "pinkti"
 
-#: src/prefs_common.c:1777
+#: src/prefs_common.c:1789
 msgid "Scroll"
 msgstr "Kerimine"
 
-#: src/prefs_common.c:1784
+#: src/prefs_common.c:1796
 msgid "Half page"
 msgstr "Pool lehte"
 
-#: src/prefs_common.c:1790
+#: src/prefs_common.c:1802
 msgid "Smooth scroll"
 msgstr "Sujuv kerimine"
 
-#: src/prefs_common.c:1796
+#: src/prefs_common.c:1808
 msgid "Step"
 msgstr "Samm"
 
-#: src/prefs_common.c:1816
+#: src/prefs_common.c:1828
 msgid "Images"
 msgstr ""
 
-#: src/prefs_common.c:1824
+#: src/prefs_common.c:1836
 msgid "Resize attached large images to fit in the window"
 msgstr ""
 
-#: src/prefs_common.c:1826
+#: src/prefs_common.c:1838
 #, fuzzy
 msgid "Display images as inline"
 msgstr "Päise näitamine"
 
-#: src/prefs_common.c:1871
+#: src/prefs_common.c:1883
 msgid "Automatically check signatures"
 msgstr "Automaatselt kontrolli allkirju"
 
-#: src/prefs_common.c:1874
+#: src/prefs_common.c:1886
 msgid "Show signature check result in a popup window"
 msgstr "Näita allkirja kontrolli tulemusi ajutises aknas"
 
-#: src/prefs_common.c:1877
+#: src/prefs_common.c:1889
 msgid "Store passphrase in memory temporarily"
 msgstr "Säilita parooli ajutiselt mälus"
 
-#: src/prefs_common.c:1892
+#: src/prefs_common.c:1904
 msgid "Expired after"
 msgstr "Aegub pärast"
 
-#: src/prefs_common.c:1905
+#: src/prefs_common.c:1917
 msgid "minute(s) "
 msgstr "minuteid"
 
-#: src/prefs_common.c:1918
+#: src/prefs_common.c:1930
 #, 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.c:1932
+#: src/prefs_common.c:1944
 msgid "Grab input while entering a passphrase"
 msgstr "*Krahma sisendit senikaua kuni parooli sisestatakse"
 
-#: src/prefs_common.c:1937
+#: src/prefs_common.c:1949
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "Näita stardi ajal hoiatust kui GnuPG ei tööta"
 
-#: src/prefs_common.c:1989
+#: src/prefs_common.c:2001
 #, fuzzy
 msgid "Always open messages in summary when selected"
 msgstr "Teate faili ei ole valitud."
 
-#: src/prefs_common.c:1993
+#: src/prefs_common.c:2005
 msgid "Open first unread message when entering a folder"
 msgstr "Kausta sisenedes ava esimene lugemata kiri"
 
-#: src/prefs_common.c:1997
+#: src/prefs_common.c:2009
 msgid "Only mark message as read when opened in new window"
 msgstr "Kiri tuleb uues aknas avades märkida kui loetu"
 
-#: src/prefs_common.c:2001
+#: src/prefs_common.c:2013
 msgid "Go to inbox after receiving new mail"
 msgstr "Ava Sisendkaust peale uute kirjade vastuvõtmist"
 
-#: src/prefs_common.c:2009
+#: src/prefs_common.c:2021
 msgid "Execute immediately when moving or deleting messages"
 msgstr "Eemalda kohe peale liigutamist või kustutamist"
 
-#: src/prefs_common.c:2021
+#: src/prefs_common.c:2033
 #, 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.c:2029
+#: src/prefs_common.c:2041
 #, fuzzy
 msgid "Receive dialog"
 msgstr "Näita vastuvõtmise dialoogi"
 
-#: src/prefs_common.c:2039
+#: src/prefs_common.c:2051
 msgid "Show receive dialog"
 msgstr "Näita vastuvõtmise dialoogi"
 
-#: src/prefs_common.c:2049
+#: src/prefs_common.c:2061
 msgid "Always"
 msgstr "Alati"
 
-#: src/prefs_common.c:2050
+#: src/prefs_common.c:2062
 msgid "Only on manual receiving"
 msgstr ""
 
-#: src/prefs_common.c:2052
+#: src/prefs_common.c:2064
 msgid "Never"
 msgstr "Mitte iial"
 
-#: src/prefs_common.c:2057
+#: src/prefs_common.c:2069
 msgid "Don't popup error dialog on receive error"
 msgstr "Ära tekita vea teadet vastuvõtmise vea korral"
 
-#: src/prefs_common.c:2060
+#: src/prefs_common.c:2072
 msgid "Close receive dialog when finished"
 msgstr "Sulge vastuvõtmise dialoog kui lõpetatud"
 
-#: src/prefs_common.c:2066
+#: src/prefs_common.c:2078
 msgid " Set key bindings... "
 msgstr " Määra klahvi seosed... "
 
-#: src/prefs_common.c:2122
+#: src/prefs_common.c:2134
 #, 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.c:2131
+#: src/prefs_common.c:2143
 msgid "Web browser"
 msgstr "Weebi sirvur"
 
-#: src/prefs_common.c:2195
+#: src/prefs_common.c:2207
 msgid "Add address to destination when double-clicked"
 msgstr "Lisa aadress sihtlahtrisse kui topeltklõpsutan"
 
-#: src/prefs_common.c:2197
+#: src/prefs_common.c:2209
 msgid "On exit"
 msgstr "Programmist väljumisel"
 
-#: src/prefs_common.c:2205
+#: src/prefs_common.c:2217
 msgid "Confirm on exit"
 msgstr "Kontrolli väljumist"
 
-#: src/prefs_common.c:2212
+#: src/prefs_common.c:2224
 msgid "Empty trash on exit"
 msgstr "Tühjenda prügikast"
 
-#: src/prefs_common.c:2214
+#: src/prefs_common.c:2226
 msgid "Ask before emptying"
 msgstr "Küsi enne tühjendamist"
 
-#: src/prefs_common.c:2218
+#: src/prefs_common.c:2230
 msgid "Warn if there are queued messages"
 msgstr "Hoiata mind, kui järjekorras on kirju"
 
-#: src/prefs_common.c:2224
+#: src/prefs_common.c:2236
 msgid "Socket I/O timeout:"
 msgstr ""
 
-#: src/prefs_common.c:2237
+#: src/prefs_common.c:2249
 msgid "second(s)"
 msgstr ""
 
-#: src/prefs_common.c:2419
+#: src/prefs_common.c:2431
 msgid "the full abbreviated weekday name"
 msgstr "nädalapäeva esitähed"
 
-#: src/prefs_common.c:2420
+#: src/prefs_common.c:2432
 msgid "the full weekday name"
 msgstr "täielik nädalapäeva nimi"
 
-#: src/prefs_common.c:2421
+#: src/prefs_common.c:2433
 msgid "the abbreviated month name"
 msgstr "lühendatud kuu nimetus"
 
-#: src/prefs_common.c:2422
+#: src/prefs_common.c:2434
 msgid "the full month name"
 msgstr "täispikk kuu nimetus"
 
-#: src/prefs_common.c:2423
+#: src/prefs_common.c:2435
 msgid "the preferred date and time for the current locale"
 msgstr "eelistatud kuupäev ja aeg kasutusel lokaali jaoks"
 
-#: src/prefs_common.c:2424
+#: src/prefs_common.c:2436
 msgid "the century number (year/100)"
 msgstr "sajandi number (aasta/100)"
 
-#: src/prefs_common.c:2425
+#: src/prefs_common.c:2437
 msgid "the day of the month as a decimal number"
 msgstr "Kuupäev kümnendnumbrina"
 
-#: src/prefs_common.c:2426
+#: src/prefs_common.c:2438
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "tund kümnendnumbrina kasutades 24-tunnilist kella"
 
-#: src/prefs_common.c:2427
+#: src/prefs_common.c:2439
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "tund kümnendnumbrina kasutades 12-tunnilist kella"
 
-#: src/prefs_common.c:2428
+#: src/prefs_common.c:2440
 msgid "the day of the year as a decimal number"
 msgstr "päev aastas kui kümnendnumber"
 
-#: src/prefs_common.c:2429
+#: src/prefs_common.c:2441
 msgid "the month as a decimal number"
 msgstr "kuu kui kümnendnumber"
 
-#: src/prefs_common.c:2430
+#: src/prefs_common.c:2442
 msgid "the minute as a decimal number"
 msgstr "minutid kümnendnumbrina"
 
-#: src/prefs_common.c:2431
+#: src/prefs_common.c:2443
 msgid "either AM or PM"
 msgstr "kas EL või PL"
 
-#: src/prefs_common.c:2432
+#: src/prefs_common.c:2444
 msgid "the second as a decimal number"
 msgstr "sekundin kümnendnumbrina"
 
-#: src/prefs_common.c:2433
+#: src/prefs_common.c:2445
 msgid "the day of the week as a decimal number"
 msgstr "nädalapäev kümnendnumbrina"
 
-#: src/prefs_common.c:2434
+#: src/prefs_common.c:2446
 msgid "the preferred date for the current locale"
 msgstr "eelistatud kuupäev"
 
-#: src/prefs_common.c:2435
+#: src/prefs_common.c:2447
 msgid "the last two digits of a year"
 msgstr "viimased kaks aasta numbrit"
 
-#: src/prefs_common.c:2436
+#: src/prefs_common.c:2448
 msgid "the year as a decimal number"
 msgstr "aasta kümnendnumbrina"
 
-#: src/prefs_common.c:2437
+#: src/prefs_common.c:2449
 msgid "the time zone or name or abbreviation"
 msgstr "ajatsoon või nimi või lühend"
 
-#: src/prefs_common.c:2458
+#: src/prefs_common.c:2470
 msgid "Specifier"
 msgstr "*Määraja"
 
-#: src/prefs_common.c:2459
+#: src/prefs_common.c:2471
 msgid "Description"
 msgstr "Seletus"
 
-#: src/prefs_common.c:2499
+#: src/prefs_common.c:2511
 msgid "Example"
 msgstr "Näide"
 
-#: src/prefs_common.c:2580
+#: src/prefs_common.c:2592
 msgid "Set message colors"
 msgstr "Säti kirja värvid"
 
-#: src/prefs_common.c:2588
+#: src/prefs_common.c:2600
 msgid "Colors"
 msgstr "Värvid"
 
-#: src/prefs_common.c:2622
+#: src/prefs_common.c:2634
 msgid "Quoted Text - First Level"
 msgstr "Tsiteeritud tekst - Aste 1"
 
-#: src/prefs_common.c:2628
+#: src/prefs_common.c:2640
 msgid "Quoted Text - Second Level"
 msgstr "Tsiteeritud tekst - Aste 2"
 
-#: src/prefs_common.c:2634
+#: src/prefs_common.c:2646
 msgid "Quoted Text - Third Level"
 msgstr "Tsiteeritud tekst - Aste 3"
 
-#: src/prefs_common.c:2640
+#: src/prefs_common.c:2652
 msgid "URI link"
 msgstr "URI viide"
 
-#: src/prefs_common.c:2647
+#: src/prefs_common.c:2659
 msgid "Recycle quote colors"
 msgstr "Tsitaadi värvid ringelvad"
 
-#: src/prefs_common.c:2707
+#: src/prefs_common.c:2719
 msgid "Pick color for quotation level 1"
 msgstr "Vali astme 1 tsitaadile värv"
 
-#: src/prefs_common.c:2710
+#: src/prefs_common.c:2722
 msgid "Pick color for quotation level 2"
 msgstr "Vali astme 2 tsitaadile värv"
 
-#: src/prefs_common.c:2713
+#: src/prefs_common.c:2725
 msgid "Pick color for quotation level 3"
 msgstr "Vali astme 3 tsitaadile värv"
 
-#: src/prefs_common.c:2716
+#: src/prefs_common.c:2728
 msgid "Pick color for URI"
 msgstr "Vali URI-le värv"
 
-#: src/prefs_common.c:2853
+#: src/prefs_common.c:2865
 msgid "Description of symbols"
 msgstr "Sümbolite kirjeldus"
 
-#: src/prefs_common.c:2909
+#: src/prefs_common.c:2921
 msgid ""
 "Date\n"
 "From\n"
@@ -4913,11 +4950,11 @@ msgstr ""
 "Uudistegrupp\n"
 "Kirja-ID"
 
-#: src/prefs_common.c:2922
+#: src/prefs_common.c:2934
 msgid "If x is set, displays expr"
 msgstr "Kui x on seatud, näitab väljendit"
 
-#: src/prefs_common.c:2926
+#: src/prefs_common.c:2938
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -4931,7 +4968,7 @@ msgstr ""
 "Tsiteeritud teate keha allkirjata\n"
 "Literaal %"
 
-#: src/prefs_common.c:2934
+#: src/prefs_common.c:2946
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -4943,15 +4980,15 @@ msgstr ""
 "Täht avanev loogeline sulg\n"
 "Täht sulgev loogeline sulg"
 
-#: src/prefs_common.c:2971
+#: src/prefs_common.c:2983
 msgid "Font selection"
 msgstr "Fondi valik"
 
-#: src/prefs_common.c:3035
+#: src/prefs_common.c:3047
 msgid "Key bindings"
 msgstr "Klahvi seosed"
 
-#: src/prefs_common.c:3049
+#: src/prefs_common.c:3061
 msgid ""
 "Select the preset of key bindings.\n"
 "You can also modify each menu's shortcuts by pressing\n"
@@ -4961,11 +4998,11 @@ msgstr ""
 "Te võite ka modifitseerida iga menüü kiirklahve vajutades\n"
 "suvalistele klahvidele asetades samal ajal hiire sellele."
 
-#: src/prefs_common.c:3061 src/prefs_common.c:3410
+#: src/prefs_common.c:3073 src/prefs_common.c:3422
 msgid "Default"
 msgstr "Vaikimisi"
 
-#: src/prefs_common.c:3064 src/prefs_common.c:3419
+#: src/prefs_common.c:3076 src/prefs_common.c:3431
 msgid "Old Sylpheed"
 msgstr "Vana Sylpheed"
 
@@ -6136,6 +6173,12 @@ msgstr ""
 msgid "writing to %s failed.\n"
 msgstr "%s-i kirjutamine ebaõnnestus.\n"
 
+#~ msgid "/_View/_Code set/---"
+#~ msgstr "/_Vaade/_Kooditabel/---"
+
+#~ msgid "/_View/_Code set"
+#~ msgstr "/_Vaade/_Kooditabel"
+
 #~ msgid "To save this part, pop up the context menu with "
 #~ msgstr "Et seda osa salvestada, ava kontekstimenüü tehes "
 
diff --git a/po/fr.po b/po/fr.po
index 4eb05055..c3d50c79 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-03-15 14:29+0900\n"
+"POT-Creation-Date: 2005-03-16 14:47+0900\n"
 "PO-Revision-Date: 2004-12-09 20:16+0100\n"
 "Last-Translator: Nicolas Boos <nicolas.boos@wanadoo.fr>\n"
 "Language-Team: French <traduc@traduc.org>\n"
@@ -105,7 +105,7 @@ msgstr ""
 "correspondant lorsque « Tout relever » est activé"
 
 #: src/account.c:638 src/addressadd.c:186 src/addressbook.c:488
-#: src/compose.c:3650 src/editaddress.c:195 src/editaddress.c:936
+#: src/compose.c:3748 src/editaddress.c:195 src/editaddress.c:936
 #: src/editaddress.c:984 src/editbook.c:191 src/editgroup.c:257
 #: src/editjpilot.c:296 src/editldap.c:300 src/editvcard.c:211
 #: src/mimeview.c:151 src/prefs_filter.c:214 src/prefs_folder_item.c:170
@@ -158,13 +158,13 @@ msgstr "Supprimer le compte"
 msgid "Do you really want to delete this account?"
 msgstr "Voulez-vous vraiment supprimer ce compte ?"
 
-#: src/account.c:758 src/compose.c:2551 src/compose.c:4807
+#: src/account.c:758 src/compose.c:2632 src/compose.c:4943
 #: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
 #: src/folderview.c:2156 src/folderview.c:2192
 msgid "Yes"
 msgstr "Oui"
 
-#: src/account.c:758 src/compose.c:2551 src/compose.c:4807
+#: src/account.c:758 src/compose.c:2632 src/compose.c:4943
 #: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
 #: src/folderview.c:2156 src/folderview.c:2192
 msgid "+No"
@@ -269,7 +269,7 @@ msgstr "Argument de l'action"
 msgid "Add Address to Book"
 msgstr "Ajouter l'adresse au carnet"
 
-#: src/addressadd.c:196 src/compose.c:4191 src/editaddress.c:196
+#: src/addressadd.c:196 src/compose.c:4292 src/editaddress.c:196
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "Adresse"
@@ -283,7 +283,7 @@ msgstr "Remarques"
 msgid "Select Address Book Folder"
 msgstr "Choisissez un dossier"
 
-#: src/addressbook.c:334 src/compose.c:469 src/mainwindow.c:454
+#: src/addressbook.c:334 src/compose.c:477 src/mainwindow.c:454
 #: src/messageview.c:134
 msgid "/_File"
 msgstr "/_Fichier"
@@ -304,8 +304,8 @@ msgstr "/_Fichier/Nouveau carnet _JPilot"
 msgid "/_File/New _Server"
 msgstr "/_Fichier/Nouveau _serveur LDAP"
 
-#: src/addressbook.c:343 src/addressbook.c:346 src/compose.c:474
-#: src/compose.c:479 src/compose.c:483 src/mainwindow.c:471
+#: src/addressbook.c:343 src/addressbook.c:346 src/compose.c:482
+#: src/compose.c:487 src/compose.c:491 src/mainwindow.c:471
 #: src/mainwindow.c:474 src/mainwindow.c:476 src/mainwindow.c:479
 #: src/mainwindow.c:481 src/messageview.c:137
 msgid "/_File/---"
@@ -323,7 +323,7 @@ msgstr "/_Fichier/_Supprimer"
 msgid "/_File/_Save"
 msgstr "/_Fichier/En_registrer"
 
-#: src/addressbook.c:348 src/compose.c:484 src/messageview.c:138
+#: src/addressbook.c:348 src/compose.c:492 src/messageview.c:138
 msgid "/_File/_Close"
 msgstr "/_Fichier/_Fermer"
 
@@ -355,7 +355,7 @@ msgstr "/_Adresse/Édit_er"
 msgid "/_Address/_Delete"
 msgstr "/_Adresse/_Supprimer"
 
-#: src/addressbook.c:356 src/compose.c:585 src/mainwindow.c:688
+#: src/addressbook.c:356 src/compose.c:664 src/mainwindow.c:697
 #: src/messageview.c:246
 msgid "/_Tools"
 msgstr "/_Outils"
@@ -364,12 +364,12 @@ msgstr "/_Outils"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Outils/Importer un fichier _LDIF"
 
-#: src/addressbook.c:358 src/compose.c:598 src/mainwindow.c:733
+#: src/addressbook.c:358 src/compose.c:677 src/mainwindow.c:742
 #: src/messageview.c:264
 msgid "/_Help"
 msgstr "/A_ide"
 
-#: src/addressbook.c:359 src/compose.c:599 src/mainwindow.c:744
+#: src/addressbook.c:359 src/compose.c:678 src/mainwindow.c:753
 #: src/messageview.c:265
 msgid "/_Help/_About"
 msgstr "/A_ide/À _propos"
@@ -386,7 +386,7 @@ msgstr "/Nouveau _groupe"
 msgid "/New _Folder"
 msgstr "/Nouveau _dossier"
 
-#: src/addressbook.c:381 src/addressbook.c:391 src/compose.c:463
+#: src/addressbook.c:381 src/addressbook.c:391 src/compose.c:471
 #: src/folderview.c:220 src/folderview.c:222 src/folderview.c:226
 #: src/folderview.c:236 src/folderview.c:238 src/folderview.c:240
 #: src/folderview.c:244 src/folderview.c:254 src/folderview.c:256
@@ -396,7 +396,7 @@ msgstr "/Nouveau _dossier"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:382 src/addressbook.c:392 src/compose.c:486
+#: src/addressbook.c:382 src/addressbook.c:392 src/compose.c:494
 #: src/mainwindow.c:485 src/messageview.c:140
 msgid "/_Edit"
 msgstr "/É_dition"
@@ -409,7 +409,7 @@ msgstr "/_Supprimer"
 msgid "E-Mail address"
 msgstr "Adresse électronique"
 
-#: src/addressbook.c:493 src/compose.c:4192 src/prefs_common.c:2186
+#: src/addressbook.c:493 src/compose.c:4293 src/prefs_common.c:2198
 msgid "Address book"
 msgstr "Carnet d'adresses"
 
@@ -419,7 +419,7 @@ msgstr "Nom :"
 
 #. Buttons
 #: src/addressbook.c:625 src/addressbook.c:1665 src/addressbook.c:1671
-#: src/editaddress.c:878 src/editaddress.c:1011 src/mainwindow.c:2212
+#: src/editaddress.c:878 src/editaddress.c:1011 src/mainwindow.c:2221
 #: src/prefs_actions.c:263 src/prefs_display_header.c:275
 #: src/prefs_display_header.c:330 src/prefs_template.c:227
 msgid "Delete"
@@ -616,7 +616,7 @@ msgstr "Adresse courante :"
 msgid "Personal address"
 msgstr "Adresse personnelle :"
 
-#: src/alertpanel.c:123 src/compose.c:4807 src/main.c:458
+#: src/alertpanel.c:123 src/compose.c:4943 src/main.c:458
 msgid "Notice"
 msgstr "Information"
 
@@ -624,7 +624,7 @@ msgstr "Information"
 msgid "Warning"
 msgstr "Avertissement"
 
-#: src/alertpanel.c:149 src/compose.c:2551 src/inc.c:558
+#: src/alertpanel.c:149 src/compose.c:2632 src/inc.c:558
 msgid "Error"
 msgstr "Erreur"
 
@@ -672,301 +672,419 @@ msgstr "Brun"
 msgid "None"
 msgstr "Aucun"
 
-#: src/compose.c:461
+#: src/compose.c:469
 msgid "/_Add..."
 msgstr "/_Ajouter..."
 
-#: src/compose.c:462
+#: src/compose.c:470
 msgid "/_Remove"
 msgstr "/_Enlever"
 
-#: src/compose.c:464 src/folderview.c:228 src/folderview.c:246
+#: src/compose.c:472 src/folderview.c:228 src/folderview.c:246
 #: src/folderview.c:261
 msgid "/_Properties..."
 msgstr "/_Propriétés..."
 
-#: src/compose.c:470
+#: src/compose.c:478
 msgid "/_File/_Send"
 msgstr "/_Fichier/_Envoyer"
 
-#: src/compose.c:472
+#: src/compose.c:480
 msgid "/_File/Send _later"
 msgstr "/_Fichier/Envoyer _plus tard"
 
-#: src/compose.c:475
+#: src/compose.c:483
 msgid "/_File/Save to _draft folder"
 msgstr "/_Fichier/Enregistrer parmi les _brouillons"
 
-#: src/compose.c:477
+#: src/compose.c:485
 msgid "/_File/Save and _keep editing"
 msgstr "/_Fichier/Enregistrer et _poursuivre la composition"
 
-#: src/compose.c:480
+#: src/compose.c:488
 msgid "/_File/_Attach file"
 msgstr "/_Fichier/_Joindre un fichier"
 
-#: src/compose.c:481
+#: src/compose.c:489
 msgid "/_File/_Insert file"
 msgstr "/_Fichier/_Insérer un fichier"
 
-#: src/compose.c:482
+#: src/compose.c:490
 msgid "/_File/Insert si_gnature"
 msgstr "/_Fichier/Insérer la si_gnature"
 
-#: src/compose.c:487
+#: src/compose.c:495
 msgid "/_Edit/_Undo"
 msgstr "/É_dition/_Annuler"
 
-#: src/compose.c:488
+#: src/compose.c:496
 msgid "/_Edit/_Redo"
 msgstr "/É_dition/_Refaire"
 
-#: src/compose.c:489 src/compose.c:567 src/mainwindow.c:489
+#: src/compose.c:497 src/compose.c:575 src/mainwindow.c:489
 #: src/messageview.c:143
 msgid "/_Edit/---"
 msgstr "/É_dition/---"
 
-#: src/compose.c:490
+#: src/compose.c:498
 msgid "/_Edit/Cu_t"
 msgstr "/É_dition/Co_uper"
 
-#: src/compose.c:491 src/mainwindow.c:486 src/messageview.c:141
+#: src/compose.c:499 src/mainwindow.c:486 src/messageview.c:141
 msgid "/_Edit/_Copy"
 msgstr "/É_dition/_Copier"
 
-#: src/compose.c:492
+#: src/compose.c:500
 msgid "/_Edit/_Paste"
 msgstr "/É_dition/Co_ller"
 
-#: src/compose.c:493
+#: src/compose.c:501
 msgid "/_Edit/Paste as _quotation"
 msgstr "/É_dition/Coller comme ci_tation"
 
-#: src/compose.c:495 src/mainwindow.c:487 src/messageview.c:142
+#: src/compose.c:503 src/mainwindow.c:487 src/messageview.c:142
 msgid "/_Edit/Select _all"
 msgstr "/É_dition/Tout sélectio_nner"
 
-#: src/compose.c:496
+#: src/compose.c:504
 msgid "/_Edit/A_dvanced"
 msgstr "/É_dition/A_vancée"
 
-#: src/compose.c:497
+#: src/compose.c:505
 msgid "/_Edit/A_dvanced/Move a character backward"
 msgstr "/É_dition/A_vancée/Reculer d'un caractère"
 
-#: src/compose.c:502
+#: src/compose.c:510
 msgid "/_Edit/A_dvanced/Move a character forward"
 msgstr "/É_dition/A_vancée/Avancer d'un caractère"
 
-#: src/compose.c:507
+#: src/compose.c:515
 msgid "/_Edit/A_dvanced/Move a word backward"
 msgstr "/É_dition/A_vancée/Reculer d'un mot"
 
-#: src/compose.c:512
+#: src/compose.c:520
 msgid "/_Edit/A_dvanced/Move a word forward"
 msgstr "/É_dition/A_vancée/Avancer d'un mot"
 
-#: src/compose.c:517
+#: src/compose.c:525
 msgid "/_Edit/A_dvanced/Move to beginning of line"
 msgstr "/É_dition/A_vancée/Aller en début de ligne"
 
-#: src/compose.c:522
+#: src/compose.c:530
 msgid "/_Edit/A_dvanced/Move to end of line"
 msgstr "/É_dition/A_vancée/Aller en fin de ligne"
 
-#: src/compose.c:527
+#: src/compose.c:535
 msgid "/_Edit/A_dvanced/Move to previous line"
 msgstr "/É_dition/A_vancée/Aller à la ligne précédente"
 
-#: src/compose.c:532
+#: src/compose.c:540
 msgid "/_Edit/A_dvanced/Move to next line"
 msgstr "/É_dition/A_vancée/Aller à la ligne suivante"
 
-#: src/compose.c:537
+#: src/compose.c:545
 msgid "/_Edit/A_dvanced/Delete a character backward"
 msgstr "/É_dition/A_vancée/Supprimer le caractère précédent"
 
-#: src/compose.c:542
+#: src/compose.c:550
 msgid "/_Edit/A_dvanced/Delete a character forward"
 msgstr "/É_dition/A_vancée/Supprimer le caractère suivant"
 
-#: src/compose.c:547
+#: src/compose.c:555
 msgid "/_Edit/A_dvanced/Delete a word backward"
 msgstr "/É_dition/A_vancée/Supprimer le mot précédent"
 
-#: src/compose.c:552
+#: src/compose.c:560
 msgid "/_Edit/A_dvanced/Delete a word forward"
 msgstr "/É_dition/A_vancée/Supprimer le mot suivant"
 
-#: src/compose.c:557
+#: src/compose.c:565
 msgid "/_Edit/A_dvanced/Delete line"
 msgstr "/É_dition/A_vancée/Effacer la ligne"
 
-#: src/compose.c:562
+#: src/compose.c:570
 msgid "/_Edit/A_dvanced/Delete to end of line"
 msgstr "/É_dition/A_vancée/Supprimer jusqu'à la fin de la ligne"
 
-#: src/compose.c:568
+#: src/compose.c:576
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/É_dition/Justifier le _paragraphe actuel"
 
-#: src/compose.c:570
+#: src/compose.c:578
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/É_dition/Justifier tout le _message"
 
-#: src/compose.c:572
+#: src/compose.c:580
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/É_dition/Justification aut_omatique"
 
-#: src/compose.c:573 src/mainwindow.c:494 src/messageview.c:147
+#: src/compose.c:581 src/mainwindow.c:494 src/messageview.c:147
 #: src/summaryview.c:370
 msgid "/_View"
 msgstr "/_Affichage"
 
-#: src/compose.c:574
+#: src/compose.c:582
 msgid "/_View/_To"
 msgstr "/_Affichage/À"
 
-#: src/compose.c:575
+#: src/compose.c:583
 msgid "/_View/_Cc"
 msgstr "/_Affichage/_Copie"
 
-#: src/compose.c:576
+#: src/compose.c:584
 msgid "/_View/_Bcc"
 msgstr "/_Affichage/Copie _discrète"
 
-#: src/compose.c:577
+#: src/compose.c:585
 msgid "/_View/_Reply to"
 msgstr "/_Affichage/_Répondre à"
 
-#: src/compose.c:578 src/compose.c:580 src/compose.c:582 src/mainwindow.c:512
-#: src/mainwindow.c:515 src/mainwindow.c:541 src/mainwindow.c:565
-#: src/mainwindow.c:641 src/mainwindow.c:645 src/messageview.c:223
+#: src/compose.c:586 src/compose.c:588 src/compose.c:590 src/compose.c:592
+#: src/mainwindow.c:512 src/mainwindow.c:515 src/mainwindow.c:541
+#: src/mainwindow.c:565 src/mainwindow.c:650 src/mainwindow.c:654
+#: src/messageview.c:223
 msgid "/_View/---"
 msgstr "/_Affichage/---"
 
-#: src/compose.c:579
+#: src/compose.c:587
 msgid "/_View/_Followup to"
 msgstr "/_Affichage/_Faire suivre à"
 
-#: src/compose.c:581
+#: src/compose.c:589
 msgid "/_View/R_uler"
 msgstr "/_Affichage/_Afficher une règle"
 
-#: src/compose.c:583
+#: src/compose.c:591
 msgid "/_View/_Attachment"
 msgstr "/_Affichage/_Pièce(s) jointe(s)"
 
-#: src/compose.c:586 src/mainwindow.c:689 src/messageview.c:247
+#: src/compose.c:598 src/mainwindow.c:572 src/messageview.c:154
+#, fuzzy
+msgid "/_View/Character _encoding"
+msgstr "/_Affichage/_Trier/O_rdre décroissant"
+
+#: src/compose.c:599
+msgid "/_View/Character _encoding/_Automatic"
+msgstr ""
+
+#: src/compose.c:601 src/compose.c:607 src/compose.c:613 src/compose.c:617
+#: src/compose.c:623 src/compose.c:627 src/compose.c:631 src/compose.c:641
+#: src/compose.c:645 src/compose.c:653 src/compose.c:657 src/mainwindow.c:568
+#: src/mainwindow.c:575 src/messageview.c:150
+#, fuzzy
+msgid "/_View/Character _encoding/---"
+msgstr "/_Affichage/_Trier/O_rdre décroissant"
+
+#: src/compose.c:603 src/mainwindow.c:576 src/messageview.c:158
+#, fuzzy
+msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
+msgstr "/_Affichage/_Jeu de caractères/ASCII 7 bits (US-ASC_II)"
+
+#: src/compose.c:605 src/mainwindow.c:578 src/messageview.c:161
+#, fuzzy
+msgid "/_View/Character _encoding/Unicode (_UTF-8)"
+msgstr "/_Affichage/_Jeu de caractères/Unicode (_UTF-8)"
+
+#: src/compose.c:609 src/mainwindow.c:582 src/messageview.c:164
+#, fuzzy
+msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
+msgstr "/_Affichage/_Jeu de caractères/Europe occidentale (ISO-8859-_1)"
+
+#: src/compose.c:611 src/mainwindow.c:584 src/messageview.c:166
+#, fuzzy
+msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
+msgstr "/_Affichage/_Jeu de caractères/Europe occidentale (ISO-8859-15)"
+
+#: src/compose.c:615 src/mainwindow.c:588 src/messageview.c:169
+#, fuzzy
+msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
+msgstr "/_Affichage/_Jeu de caractères/Europe centrale (ISO-8859-_2)"
+
+#: src/compose.c:619 src/mainwindow.c:592 src/messageview.c:172
+#, fuzzy
+msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
+msgstr "/_Affichage/_Jeu de caractères/_Baltique (ISO-8859-13)"
+
+#: src/compose.c:621 src/mainwindow.c:594 src/messageview.c:174
+#, fuzzy
+msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
+msgstr "/_Affichage/_Jeu de caractères/Europe du Nord (ISO-8859-_4)"
+
+#: src/compose.c:625 src/mainwindow.c:598 src/messageview.c:177
+#, fuzzy
+msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
+msgstr "/_Affichage/_Jeu de caractères/Grec (ISO-8859-_7)"
+
+#: src/compose.c:629 src/mainwindow.c:602 src/messageview.c:180
+#, fuzzy
+msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
+msgstr "/_Affichage/_Jeu de caractères/Turc (ISO-8859-_9)"
+
+#: src/compose.c:633 src/mainwindow.c:606 src/messageview.c:183
+#, fuzzy
+msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
+msgstr "/_Affichage/_Jeu de caractères/Cyrillique (ISO-8859-_5)"
+
+#: src/compose.c:635 src/mainwindow.c:608 src/messageview.c:185
+#, fuzzy
+msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
+msgstr "/_Affichage/_Jeu de caractères/Cyrillique (KOI8-_R)"
+
+#: src/compose.c:637 src/mainwindow.c:610 src/messageview.c:187
+#, fuzzy
+msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
+msgstr "/_Affichage/_Jeu de caractères/Cyrillique (KOI8-U)"
+
+#: src/compose.c:639 src/mainwindow.c:612 src/messageview.c:189
+#, fuzzy
+msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
+msgstr "/_Affichage/_Jeu de caractères/Cyrillique (Windows-1251)"
+
+#: src/compose.c:643 src/mainwindow.c:616 src/messageview.c:192
+#, fuzzy
+msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
+msgstr "/_Affichage/_Jeu de caractères/Japonais (ISO-2022-_JP)"
+
+#: src/compose.c:647 src/mainwindow.c:626 src/messageview.c:201
+#, fuzzy
+msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
+msgstr "/_Affichage/_Jeu de caractères/Chinois simplifié (_GB2312)"
+
+#: src/compose.c:649 src/mainwindow.c:628 src/messageview.c:203
+#, fuzzy
+msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
+msgstr "/_Affichage/_Jeu de caractères/Chinois traditionnel (_Big5)"
+
+#: src/compose.c:651 src/mainwindow.c:630 src/messageview.c:205
+#, fuzzy
+msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
+msgstr "/_Affichage/_Jeu de caractères/Chinois traditionnel (EUC-_TW)"
+
+#: src/compose.c:655 src/mainwindow.c:636 src/messageview.c:210
+#, fuzzy
+msgid "/_View/Character _encoding/Korean (EUC-_KR)"
+msgstr "/_Affichage/_Jeu de caractères/Coréen (EUC-_KR)"
+
+#: src/compose.c:659 src/mainwindow.c:642 src/messageview.c:215
+#, fuzzy
+msgid "/_View/Character _encoding/Thai (TIS-620)"
+msgstr "/_Affichage/_Jeu de caractères/Thaï (TIS-620)"
+
+#: src/compose.c:661 src/mainwindow.c:644 src/messageview.c:217
+#, fuzzy
+msgid "/_View/Character _encoding/Thai (Windows-874)"
+msgstr "/_Affichage/_Jeu de caractères/Thaï (Windows-874)"
+
+#: src/compose.c:665 src/mainwindow.c:698 src/messageview.c:247
 msgid "/_Tools/_Address book"
 msgstr "/_Outils/_Carnet d'adresses"
 
-#: src/compose.c:587
+#: src/compose.c:666
 msgid "/_Tools/_Template"
 msgstr "/_Outils/_Modèle"
 
-#: src/compose.c:588 src/mainwindow.c:707 src/messageview.c:262
+#: src/compose.c:667 src/mainwindow.c:716 src/messageview.c:262
 msgid "/_Tools/Actio_ns"
 msgstr "/_Outils/_Actions"
 
-#: src/compose.c:589 src/compose.c:593 src/mainwindow.c:692
-#: src/mainwindow.c:706 src/mainwindow.c:708 src/mainwindow.c:711
-#: src/mainwindow.c:713 src/messageview.c:250 src/messageview.c:261
+#: src/compose.c:668 src/compose.c:672 src/mainwindow.c:701
+#: src/mainwindow.c:715 src/mainwindow.c:717 src/mainwindow.c:720
+#: src/mainwindow.c:722 src/messageview.c:250 src/messageview.c:261
 msgid "/_Tools/---"
 msgstr "/_Outils/---"
 
-#: src/compose.c:590
+#: src/compose.c:669
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/_Outils/Modifier avec un éditeur e_xterne"
 
-#: src/compose.c:594
+#: src/compose.c:673
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Outils/_Signer"
 
-#: src/compose.c:595
+#: src/compose.c:674
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/_Outils/_Chiffrer"
 
-#: src/compose.c:800
+#: src/compose.c:879
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s : le fichier n'existe pas\n"
 
-#: src/compose.c:899 src/compose.c:958 src/procmsg.c:1303
+#: src/compose.c:978 src/compose.c:1037 src/procmsg.c:1303
 msgid "Can't get text part\n"
 msgstr "Impossible d'obtenir la partie texte\n"
 
-#: src/compose.c:1340
+#: src/compose.c:1419
 msgid "Quote mark format error."
 msgstr "Erreur du format de citation."
 
-#: src/compose.c:1352
+#: src/compose.c:1431
 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:1679
+#: src/compose.c:1758
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Le fichier %s n'existe pas\n"
 
-#: src/compose.c:1683
+#: src/compose.c:1762
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Impossible d'obtenir la taille de %s\n"
 
-#: src/compose.c:1687
+#: src/compose.c:1766
 #, c-format
 msgid "File %s is empty."
 msgstr "Le fichier %s est vide."
 
-#: src/compose.c:1691
+#: src/compose.c:1770
 #, c-format
 msgid "Can't read %s."
 msgstr "Impossible de lire %s."
 
-#: src/compose.c:1726
+#: src/compose.c:1805
 #, c-format
 msgid "Message: %s"
 msgstr "Message : %s"
 
-#: src/compose.c:1797 src/mimeview.c:491
+#: src/compose.c:1876 src/mimeview.c:491
 msgid "Can't get the part of multipart message."
 msgstr "Impossible de lire une partie d'un message multipart."
 
-#: src/compose.c:2188
+#: src/compose.c:2267
 msgid " [Edited]"
 msgstr " [modifié]"
 
-#: src/compose.c:2190
+#: src/compose.c:2269
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Composition d'un message%s"
 
-#: src/compose.c:2193
+#: src/compose.c:2272
 #, c-format
 msgid "Compose message%s"
 msgstr "Composition d'un message%s"
 
-#: src/compose.c:2304
+#: src/compose.c:2383
 msgid "Recipient is not specified."
 msgstr "Destinataire non spécifié."
 
-#: src/compose.c:2312 src/compose.c:4112 src/mainwindow.c:2144
+#: src/compose.c:2391 src/compose.c:4213 src/mainwindow.c:2153
 #: src/prefs_account.c:703 src/prefs_common.c:850
 msgid "Send"
 msgstr "Envoyer"
 
-#: src/compose.c:2313
+#: src/compose.c:2392
 msgid "Subject is empty. Send it anyway?"
 msgstr "Le sujet est vide. Envoyer malgré cela ?"
 
-#: src/compose.c:2364
+#: src/compose.c:2443
 msgid "can't get recipient list."
 msgstr "liste de destinataires vide."
 
-#: src/compose.c:2384
+#: src/compose.c:2463
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -974,26 +1092,26 @@ 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:2398 src/send_message.c:261
+#: src/compose.c:2477 src/send_message.c:261
 #, 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:2421
+#: src/compose.c:2500
 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:2457
+#: src/compose.c:2536
 #, 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:2518 src/compose.c:2739 src/compose.c:2802 src/compose.c:2921
+#: src/compose.c:2597 src/compose.c:2820 src/compose.c:2883 src/compose.c:3003
 #: src/utils.c:2189
 msgid "can't change file mode\n"
 msgstr "impossible de modifier les droits d'accès du fichier\n"
 
-#: src/compose.c:2546
+#: src/compose.c:2627
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1002,140 +1120,140 @@ msgstr ""
 "Impossible de convertir le jeu de caractères du message\n"
 "de %s vers %s. Voulez-vous néanmoins l'envoyer ?"
 
-#: src/compose.c:2610
+#: src/compose.c:2691
 msgid "can't write headers\n"
 msgstr "impossible d'écrire les en-têtes\n"
 
-#: src/compose.c:2881
+#: src/compose.c:2963
 msgid "can't remove the old message\n"
 msgstr "Impossible d'enlever l'ancien message\n"
 
-#: src/compose.c:2899
+#: src/compose.c:2981
 msgid "queueing message...\n"
 msgstr "Mise en file d'attente des messages...\n"
 
-#: src/compose.c:2981
+#: src/compose.c:3063
 msgid "can't find queue folder\n"
 msgstr "Impossible de trouver le dossier de file d'attente\n"
 
-#: src/compose.c:2988
+#: src/compose.c:3070
 msgid "can't queue the message\n"
 msgstr "Impossible de mettre ce message dans la file d'attente\n"
 
-#: src/compose.c:3547
+#: src/compose.c:3645
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "Message-ID créé : %s\n"
 
-#: src/compose.c:3645
+#: src/compose.c:3743
 msgid "Creating compose window...\n"
 msgstr "Création de la fenêtre de composition...\n"
 
-#: src/compose.c:3648 src/compose.c:4598
+#: src/compose.c:3746 src/compose.c:4734
 msgid "MIME type"
 msgstr "Type MIME"
 
 #. S_COL_DATE
-#: src/compose.c:3649 src/mimeview.c:150 src/prefs_filter_edit.c:569
+#: src/compose.c:3747 src/mimeview.c:150 src/prefs_filter_edit.c:569
 #: src/prefs_summary_column.c:73 src/select-keys.c:317 src/summaryview.c:386
 msgid "Size"
 msgstr "Taille"
 
-#: src/compose.c:3700 src/headerview.c:53 src/summary_search.c:169
+#: src/compose.c:3798 src/headerview.c:53 src/summary_search.c:169
 msgid "From:"
 msgstr "De :"
 
-#: src/compose.c:4113
+#: src/compose.c:4214
 msgid "Send message"
 msgstr "Envoyer le message"
 
-#: src/compose.c:4121
+#: src/compose.c:4222
 msgid "Send later"
 msgstr "Envoi différé"
 
-#: src/compose.c:4122
+#: src/compose.c:4223
 msgid "Put into queue folder and send later"
 msgstr "Mettre en file d'attente et envoyer plus tard"
 
-#: src/compose.c:4130
+#: src/compose.c:4231
 msgid "Draft"
 msgstr "Brouillon"
 
-#: src/compose.c:4131
+#: src/compose.c:4232
 msgid "Save to draft folder"
 msgstr "Enregistrer dans le dossier brouillon"
 
-#: src/compose.c:4141 src/compose.c:5382
+#: src/compose.c:4242 src/compose.c:5527
 msgid "Insert"
 msgstr "Insertion"
 
-#: src/compose.c:4142
+#: src/compose.c:4243
 msgid "Insert file"
 msgstr "Insérer un fichier"
 
-#: src/compose.c:4150
+#: src/compose.c:4251
 msgid "Attach"
 msgstr "Joindre"
 
-#: src/compose.c:4151
+#: src/compose.c:4252
 msgid "Attach file"
 msgstr "Joindre un fichier"
 
 #. signature
-#: src/compose.c:4161 src/prefs_account.c:1339 src/prefs_common.c:1261
+#: src/compose.c:4262 src/prefs_account.c:1339 src/prefs_common.c:1273
 msgid "Signature"
 msgstr "Signature"
 
-#: src/compose.c:4162
+#: src/compose.c:4263
 msgid "Insert signature"
 msgstr "Insérer la signature"
 
-#: src/compose.c:4171 src/prefs_common.c:1283 src/prefs_common.c:2165
+#: src/compose.c:4272 src/prefs_common.c:1295 src/prefs_common.c:2177
 msgid "Editor"
 msgstr "Éditeur de texte"
 
-#: src/compose.c:4172
+#: src/compose.c:4273
 msgid "Edit with external editor"
 msgstr "Éditer avec un éditeur externe"
 
-#: src/compose.c:4180
+#: src/compose.c:4281
 msgid "Linewrap"
 msgstr "Justifier"
 
-#: src/compose.c:4181
+#: src/compose.c:4282
 msgid "Wrap all long lines"
 msgstr "Justifier tout le message"
 
-#: src/compose.c:4492
+#: src/compose.c:4628
 msgid "Invalid MIME type."
 msgstr "Type MIME invalide."
 
-#: src/compose.c:4511
+#: src/compose.c:4647
 msgid "File doesn't exist or is empty."
 msgstr "Le fichier n'existe pas ou est vide."
 
-#: src/compose.c:4580
+#: src/compose.c:4716
 msgid "Properties"
 msgstr "Propriétés"
 
-#: src/compose.c:4600
+#: src/compose.c:4736
 msgid "Encoding"
 msgstr "Encodage"
 
-#: src/compose.c:4623 src/prefs_folder_item.c:183
+#: src/compose.c:4759 src/prefs_folder_item.c:183
 msgid "Path"
 msgstr "Chemin d'accès"
 
-#: src/compose.c:4624
+#: src/compose.c:4760
 msgid "File name"
 msgstr "Nom du fichier"
 
-#: src/compose.c:4778
+#: src/compose.c:4914
 #, 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:4804
+#: src/compose.c:4940
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1146,74 +1264,74 @@ msgstr ""
 "Forcer sa fermeture ?\n"
 "id de traitement de groupe: %d"
 
-#: src/compose.c:4817
+#: src/compose.c:4953
 #, c-format
 msgid "Terminated process group id: %d"
 msgstr "Id de traitement de groupe terminé : %d"
 
-#: src/compose.c:4818
+#: src/compose.c:4954
 #, c-format
 msgid "Temporary file: %s"
 msgstr "Fichier temporaire : %s"
 
-#: src/compose.c:4842
+#: src/compose.c:4978
 msgid "Compose: input from monitoring process\n"
 msgstr "Compose : entrée à partir d'une surveillance de traitement\n"
 
 #. failed
-#: src/compose.c:4875
+#: src/compose.c:5011
 msgid "Couldn't exec external editor\n"
 msgstr "Impossible de lancer l'éditeur externe\n"
 
-#: src/compose.c:4879
+#: src/compose.c:5015
 msgid "Couldn't write to file\n"
 msgstr "Impossible d'écrire dans le fichier\n"
 
-#: src/compose.c:4881
+#: src/compose.c:5017
 msgid "Pipe read failed\n"
 msgstr "Échec de lecture de pipe\n"
 
-#: src/compose.c:5182 src/compose.c:5190 src/compose.c:5196
+#: src/compose.c:5318 src/compose.c:5326 src/compose.c:5332
 msgid "Can't queue the message."
 msgstr "Impossible de mettre ce message dans la file d'attente."
 
-#: src/compose.c:5287
+#: src/compose.c:5423
 #, fuzzy
 msgid "Select files"
 msgstr "Choisissez un fichier"
 
-#: src/compose.c:5309
+#: src/compose.c:5445
 msgid "Select file"
 msgstr "Choisissez un fichier"
 
-#: src/compose.c:5344
+#: src/compose.c:5480
 msgid "Discard message"
 msgstr "Interruption de la composition du message"
 
-#: src/compose.c:5345
+#: src/compose.c:5481
 msgid "This message has been modified. discard it?"
 msgstr ""
 "Ce message a été modifié mais pas envoyé. Voulez-vous interrompre la "
 "composition ?"
 
-#: src/compose.c:5346
+#: src/compose.c:5482
 msgid "Discard"
 msgstr "Interrompre"
 
-#: src/compose.c:5346
+#: src/compose.c:5482
 msgid "to Draft"
 msgstr "vers brouillon"
 
-#: src/compose.c:5379
+#: src/compose.c:5524
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Voulez-vous appliquer le modèle « %s » ?"
 
-#: src/compose.c:5381
+#: src/compose.c:5526
 msgid "Apply template"
 msgstr "Appliquer un modèle"
 
-#: src/compose.c:5382
+#: src/compose.c:5527
 msgid "Replace"
 msgstr "Remplacer"
 
@@ -1654,12 +1772,12 @@ msgstr "Enregistrement des données des dossiers...\n"
 msgid "Setting folder info..."
 msgstr "Initialisation des données des dossiers..."
 
-#: src/folderview.c:652 src/mainwindow.c:3190 src/setup.c:81
+#: src/folderview.c:652 src/mainwindow.c:3199 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Analyse du dossier %s%c%s ..."
 
-#: src/folderview.c:656 src/mainwindow.c:3195 src/setup.c:86
+#: src/folderview.c:656 src/mainwindow.c:3204 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Analyse du dossier %s ..."
@@ -2118,7 +2236,7 @@ msgstr "Importation d'un fichier LDIF dans un carnet d'adresses"
 msgid "Prev"
 msgstr "Précédent"
 
-#: src/importldif.c:761 src/mainwindow.c:2230
+#: src/importldif.c:761 src/mainwindow.c:2239
 msgid "Next"
 msgstr "Suivant"
 
@@ -2576,7 +2694,8 @@ msgid "/_View/Separate f_older tree"
 msgstr "/_Affichage/Séparer la fenêtre des _dossiers"
 
 #: src/mainwindow.c:514
-msgid "/_View/Separate m_essage view"
+#, fuzzy
+msgid "/_View/Separate _message view"
 msgstr "/_Affichage/Séparer la fenêtre des _messages"
 
 #: src/mainwindow.c:516
@@ -2712,422 +2831,340 @@ msgstr "/_Affichage/_Aller à/_Coloré suivant"
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Affichage/_Aller à/Autre _dossier..."
 
-#: src/mainwindow.c:568 src/mainwindow.c:575 src/messageview.c:150
-msgid "/_View/_Code set/---"
-msgstr "/_Affichage/_Jeu de caractères/---"
-
-#: src/mainwindow.c:572 src/messageview.c:154
-msgid "/_View/_Code set"
-msgstr "/_Affichage/_Jeu de caractères"
-
 #: src/mainwindow.c:573 src/messageview.c:155
-msgid "/_View/_Code set/_Auto detect"
+#, fuzzy
+msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Affichage/_Jeu de caractères/Détection _automatique"
 
-#: src/mainwindow.c:576 src/messageview.c:158
-msgid "/_View/_Code set/7bit ascii (US-ASC_II)"
-msgstr "/_Affichage/_Jeu de caractères/ASCII 7 bits (US-ASC_II)"
-
-#: src/mainwindow.c:579 src/messageview.c:161
-msgid "/_View/_Code set/Unicode (_UTF-8)"
-msgstr "/_Affichage/_Jeu de caractères/Unicode (_UTF-8)"
-
-#: src/mainwindow.c:582 src/messageview.c:164
-msgid "/_View/_Code set/Western European (ISO-8859-_1)"
-msgstr "/_Affichage/_Jeu de caractères/Europe occidentale (ISO-8859-_1)"
-
-#: src/mainwindow.c:584 src/messageview.c:166
-msgid "/_View/_Code set/Western European (ISO-8859-15)"
-msgstr "/_Affichage/_Jeu de caractères/Europe occidentale (ISO-8859-15)"
-
-#: src/mainwindow.c:587 src/messageview.c:169
-msgid "/_View/_Code set/Central European (ISO-8859-_2)"
-msgstr "/_Affichage/_Jeu de caractères/Europe centrale (ISO-8859-_2)"
-
-#: src/mainwindow.c:590 src/messageview.c:172
-msgid "/_View/_Code set/_Baltic (ISO-8859-13)"
-msgstr "/_Affichage/_Jeu de caractères/_Baltique (ISO-8859-13)"
-
-#: src/mainwindow.c:592 src/messageview.c:174
-msgid "/_View/_Code set/Baltic (ISO-8859-_4)"
-msgstr "/_Affichage/_Jeu de caractères/Europe du Nord (ISO-8859-_4)"
-
-#: src/mainwindow.c:595 src/messageview.c:177
-msgid "/_View/_Code set/Greek (ISO-8859-_7)"
-msgstr "/_Affichage/_Jeu de caractères/Grec (ISO-8859-_7)"
-
-#: src/mainwindow.c:598 src/messageview.c:180
-msgid "/_View/_Code set/Turkish (ISO-8859-_9)"
-msgstr "/_Affichage/_Jeu de caractères/Turc (ISO-8859-_9)"
-
-#: src/mainwindow.c:601 src/messageview.c:183
-msgid "/_View/_Code set/Cyrillic (ISO-8859-_5)"
-msgstr "/_Affichage/_Jeu de caractères/Cyrillique (ISO-8859-_5)"
-
-#: src/mainwindow.c:603 src/messageview.c:185
-msgid "/_View/_Code set/Cyrillic (KOI8-_R)"
-msgstr "/_Affichage/_Jeu de caractères/Cyrillique (KOI8-_R)"
-
-#: src/mainwindow.c:605 src/messageview.c:187
-msgid "/_View/_Code set/Cyrillic (KOI8-U)"
-msgstr "/_Affichage/_Jeu de caractères/Cyrillique (KOI8-U)"
-
-#: src/mainwindow.c:607 src/messageview.c:189
-msgid "/_View/_Code set/Cyrillic (Windows-1251)"
-msgstr "/_Affichage/_Jeu de caractères/Cyrillique (Windows-1251)"
-
-#: src/mainwindow.c:610 src/messageview.c:192
-msgid "/_View/_Code set/Japanese (ISO-2022-_JP)"
-msgstr "/_Affichage/_Jeu de caractères/Japonais (ISO-2022-_JP)"
-
-#: src/mainwindow.c:612 src/messageview.c:194
-msgid "/_View/_Code set/Japanese (ISO-2022-JP-2)"
+#: src/mainwindow.c:618 src/messageview.c:194
+#, fuzzy
+msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Affichage/_Jeu de caractères/Japonais (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:614 src/messageview.c:196
-msgid "/_View/_Code set/Japanese (_EUC-JP)"
+#: src/mainwindow.c:620 src/messageview.c:196
+#, fuzzy
+msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Affichage/_Jeu de caractères/Japonais (_EUC-JP)"
 
-#: src/mainwindow.c:616 src/messageview.c:198
-msgid "/_View/_Code set/Japanese (_Shift__JIS)"
+#: src/mainwindow.c:622 src/messageview.c:198
+#, fuzzy
+msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Affichage/_Jeu de caractères/Japonais (_Shift__JIS)"
 
-#: src/mainwindow.c:619 src/messageview.c:201
-msgid "/_View/_Code set/Simplified Chinese (_GB2312)"
-msgstr "/_Affichage/_Jeu de caractères/Chinois simplifié (_GB2312)"
-
-#: src/mainwindow.c:621 src/messageview.c:203
-msgid "/_View/_Code set/Traditional Chinese (_Big5)"
-msgstr "/_Affichage/_Jeu de caractères/Chinois traditionnel (_Big5)"
-
-#: src/mainwindow.c:623 src/messageview.c:205
-msgid "/_View/_Code set/Traditional Chinese (EUC-_TW)"
-msgstr "/_Affichage/_Jeu de caractères/Chinois traditionnel (EUC-_TW)"
-
-#: src/mainwindow.c:625 src/messageview.c:207
-msgid "/_View/_Code set/Chinese (ISO-2022-_CN)"
+#: src/mainwindow.c:632 src/messageview.c:207
+#, fuzzy
+msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Affichage/_Jeu de caractères/Chinois (ISO-2022-_CN)"
 
-#: src/mainwindow.c:628 src/messageview.c:210
-msgid "/_View/_Code set/Korean (EUC-_KR)"
-msgstr "/_Affichage/_Jeu de caractères/Coréen (EUC-_KR)"
-
-#: src/mainwindow.c:630 src/messageview.c:212
-msgid "/_View/_Code set/Korean (ISO-2022-KR)"
+#: src/mainwindow.c:638 src/messageview.c:212
+#, fuzzy
+msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Affichage/_Jeu de caractères/Coréen (ISO-2022-KR)"
 
-#: src/mainwindow.c:633 src/messageview.c:215
-msgid "/_View/_Code set/Thai (TIS-620)"
-msgstr "/_Affichage/_Jeu de caractères/Thaï (TIS-620)"
-
-#: src/mainwindow.c:635 src/messageview.c:217
-msgid "/_View/_Code set/Thai (Windows-874)"
-msgstr "/_Affichage/_Jeu de caractères/Thaï (Windows-874)"
-
-#: src/mainwindow.c:642 src/summaryview.c:371
+#: src/mainwindow.c:651 src/summaryview.c:371
 msgid "/_View/Open in new _window"
 msgstr "/_Affichage/_Ouvrir dans une nouvelle fenêtre"
 
-#: src/mainwindow.c:643 src/messageview.c:224
+#: src/mainwindow.c:652 src/messageview.c:224
 msgid "/_View/Mess_age source"
 msgstr "/_Affichage/_Voir le message complet"
 
-#: src/mainwindow.c:644 src/messageview.c:225
+#: src/mainwindow.c:653 src/messageview.c:225
 msgid "/_View/Show all _header"
 msgstr "/_Affichage/Afficher tous les e_n-têtes"
 
-#: src/mainwindow.c:646
+#: src/mainwindow.c:655
 msgid "/_View/_Update summary"
 msgstr "/_Affichage/Mettre à jo_ur le résumé des messages"
 
-#: src/mainwindow.c:648 src/messageview.c:227
+#: src/mainwindow.c:657 src/messageview.c:227
 msgid "/_Message"
 msgstr "/_Message"
 
-#: src/mainwindow.c:649
+#: src/mainwindow.c:658
 msgid "/_Message/Recei_ve"
 msgstr "/_Message/Réce_ptionner"
 
-#: src/mainwindow.c:650
+#: src/mainwindow.c:659
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/_Message/Réce_ptionner/le courrier du _compte courant"
 
-#: src/mainwindow.c:652
+#: src/mainwindow.c:661
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/_Message/Réce_ptionner/le courrier de _tous les comptes"
 
-#: src/mainwindow.c:654
+#: src/mainwindow.c:663
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/_Message/Réce_ptionner/_Annuler la réception"
 
-#: src/mainwindow.c:656
+#: src/mainwindow.c:665
 msgid "/_Message/Recei_ve/---"
 msgstr "/_Message/Réce_ptionner/---"
 
-#: src/mainwindow.c:657
+#: src/mainwindow.c:666
 msgid "/_Message/_Send queued messages"
 msgstr "/_Message/En_voyer les messages en file d'attente"
 
-#: src/mainwindow.c:658 src/mainwindow.c:660 src/mainwindow.c:667
-#: src/mainwindow.c:672 src/mainwindow.c:676 src/mainwindow.c:685
+#: src/mainwindow.c:667 src/mainwindow.c:669 src/mainwindow.c:676
+#: src/mainwindow.c:681 src/mainwindow.c:685 src/mainwindow.c:694
 #: src/messageview.c:230 src/messageview.c:238 src/messageview.c:243
 msgid "/_Message/---"
 msgstr "/_Message/---"
 
-#: src/mainwindow.c:659 src/messageview.c:228
+#: src/mainwindow.c:668 src/messageview.c:228
 msgid "/_Message/Compose _new message"
 msgstr "/_Message/Composer un _nouveau message"
 
-#: src/mainwindow.c:661 src/messageview.c:231
+#: src/mainwindow.c:670 src/messageview.c:231
 msgid "/_Message/_Reply"
 msgstr "/_Message/_Répondre"
 
-#: src/mainwindow.c:662
+#: src/mainwindow.c:671
 msgid "/_Message/Repl_y to"
 msgstr "/_Message/Rép_ondre à"
 
-#: src/mainwindow.c:663 src/messageview.c:232
+#: src/mainwindow.c:672 src/messageview.c:232
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Message/Rép_ondre à/_tous"
 
-#: src/mainwindow.c:664 src/messageview.c:234
+#: src/mainwindow.c:673 src/messageview.c:234
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Message/Rép_ondre à/l'_expéditeur"
 
-#: src/mainwindow.c:665 src/messageview.c:236
+#: src/mainwindow.c:674 src/messageview.c:236
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Message/Rép_ondre à/la _liste"
 
-#: src/mainwindow.c:668 src/messageview.c:239
+#: src/mainwindow.c:677 src/messageview.c:239
 msgid "/_Message/_Forward"
 msgstr "/_Message/_Transférer"
 
-#: src/mainwindow.c:669 src/messageview.c:240
+#: src/mainwindow.c:678 src/messageview.c:240
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Message/Transférer en tant que pièce _jointe"
 
-#: src/mainwindow.c:671 src/messageview.c:242
+#: src/mainwindow.c:680 src/messageview.c:242
 msgid "/_Message/Redirec_t"
 msgstr "/_Message/Rediri_ger"
 
-#: src/mainwindow.c:673
+#: src/mainwindow.c:682
 msgid "/_Message/M_ove..."
 msgstr "/_Message/_Déplacer..."
 
-#: src/mainwindow.c:674
+#: src/mainwindow.c:683
 msgid "/_Message/_Copy..."
 msgstr "/_Message/_Copier..."
 
-#: src/mainwindow.c:675
+#: src/mainwindow.c:684
 msgid "/_Message/_Delete"
 msgstr "/_Message/_Supprimer"
 
-#: src/mainwindow.c:677
+#: src/mainwindow.c:686
 msgid "/_Message/_Mark"
 msgstr "/_Message/_Marquer"
 
-#: src/mainwindow.c:678
+#: src/mainwindow.c:687
 msgid "/_Message/_Mark/_Mark"
 msgstr "/_Message/_Marquer/_Marquer"
 
-#: src/mainwindow.c:679
+#: src/mainwindow.c:688
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/_Message/_Marquer/_Démarquer"
 
-#: src/mainwindow.c:680
+#: src/mainwindow.c:689
 msgid "/_Message/_Mark/---"
 msgstr "/_Message/_Marquer/---"
 
-#: src/mainwindow.c:681
+#: src/mainwindow.c:690
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/_Message/_Marque/Marquer comme _non lu"
 
-#: src/mainwindow.c:682
+#: src/mainwindow.c:691
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/_Message/_Marque/Marquer comme _lu"
 
-#: src/mainwindow.c:684
+#: src/mainwindow.c:693
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/_Message/_Marque/Marquer _tous comme lu"
 
-#: src/mainwindow.c:686 src/messageview.c:244
+#: src/mainwindow.c:695 src/messageview.c:244
 msgid "/_Message/Re-_edit"
 msgstr "/_Message/Réédit_er"
 
-#: src/mainwindow.c:690 src/messageview.c:248
+#: src/mainwindow.c:699 src/messageview.c:248
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/_Outils/Aj_outer l'expéditeur dans le carnet d'adresses"
 
-#: src/mainwindow.c:693
+#: src/mainwindow.c:702
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/_Outils/_Filtrer les messages du dossier"
 
-#: src/mainwindow.c:695
+#: src/mainwindow.c:704
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Outils/Filtrer les messages _sélectionnés"
 
-#: src/mainwindow.c:697 src/messageview.c:251
+#: src/mainwindow.c:706 src/messageview.c:251
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Outils/Créer une règle de f_iltrage"
 
-#: src/mainwindow.c:698 src/messageview.c:253
+#: src/mainwindow.c:707 src/messageview.c:253
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Outils/Créer une règle de f_iltrage/automatiq_uement"
 
-#: src/mainwindow.c:700 src/messageview.c:255
+#: src/mainwindow.c:709 src/messageview.c:255
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Outils/Créer une règle de f_iltrage/basée sur l'_expéditeur"
 
-#: src/mainwindow.c:702 src/messageview.c:257
+#: src/mainwindow.c:711 src/messageview.c:257
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Outils/Créer une règle de f_iltrage/basée sur le(s) _destinataire(s)"
 
-#: src/mainwindow.c:704 src/messageview.c:259
+#: src/mainwindow.c:713 src/messageview.c:259
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Outils/Créer une règle de f_iltrage/basée sur le _sujet"
 
-#: src/mainwindow.c:709
+#: src/mainwindow.c:718
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/_Message/Supprimer les messages en dou_ble"
 
-#: src/mainwindow.c:712
+#: src/mainwindow.c:721
 msgid "/_Tools/E_xecute"
 msgstr "/_Outils/E_xécuter"
 
-#: src/mainwindow.c:714
+#: src/mainwindow.c:723
 msgid "/_Tools/_Log window"
 msgstr "/Ou_tils/_Journal de connexion"
 
-#: src/mainwindow.c:716
+#: src/mainwindow.c:725
 msgid "/_Configuration"
 msgstr "/_Configuration"
 
-#: src/mainwindow.c:717
+#: src/mainwindow.c:726
 msgid "/_Configuration/_Common preferences..."
 msgstr "/_Configuration/Préférences _générales..."
 
-#: src/mainwindow.c:719
+#: src/mainwindow.c:728
 msgid "/_Configuration/_Filter setting..."
 msgstr "/_Configuration/_Filtres..."
 
-#: src/mainwindow.c:721
+#: src/mainwindow.c:730
 msgid "/_Configuration/_Template..."
 msgstr "/_Configuration/_Modèles..."
 
-#: src/mainwindow.c:722
+#: src/mainwindow.c:731
 msgid "/_Configuration/_Actions..."
 msgstr "/_Configuration/_Actions..."
 
-#: src/mainwindow.c:723
+#: src/mainwindow.c:732
 msgid "/_Configuration/---"
 msgstr "/_Configuration/---"
 
-#: src/mainwindow.c:724
+#: src/mainwindow.c:733
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Configuration/_Configuration du compte courant..."
 
-#: src/mainwindow.c:726
+#: src/mainwindow.c:735
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Configuration/Création d'un _nouveau compte..."
 
-#: src/mainwindow.c:728
+#: src/mainwindow.c:737
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Configuration/Édition des compt_es..."
 
-#: src/mainwindow.c:730
+#: src/mainwindow.c:739
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Configuration/Choi_sir un autre compte"
 
-#: src/mainwindow.c:734
+#: src/mainwindow.c:743
 msgid "/_Help/_Manual"
 msgstr "/A_ide/_Manuel"
 
-#: src/mainwindow.c:735
+#: src/mainwindow.c:744
 msgid "/_Help/_Manual/_English"
 msgstr "/A_ide/_Manuel/_Anglais"
 
-#: src/mainwindow.c:736
+#: src/mainwindow.c:745
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/A_ide/_Manuel/_Japonais"
 
-#: src/mainwindow.c:737
+#: src/mainwindow.c:746
 msgid "/_Help/_FAQ"
 msgstr "/A_ide/_Foire Aux Questions (FAQ)"
 
-#: src/mainwindow.c:738
+#: src/mainwindow.c:747
 msgid "/_Help/_FAQ/_English"
 msgstr "/A_ide/_Foire Aux Questions (FAQ)/_Anglais"
 
-#: src/mainwindow.c:739
+#: src/mainwindow.c:748
 msgid "/_Help/_FAQ/_German"
 msgstr "/A_ide/_Foire Aux Questions (FAQ)/A_llemand"
 
-#: src/mainwindow.c:740
+#: src/mainwindow.c:749
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/A_ide/_Foire Aux Questions (FAQ)/_Espagnol"
 
-#: src/mainwindow.c:741
+#: src/mainwindow.c:750
 msgid "/_Help/_FAQ/_French"
 msgstr "/A_ide/_Foire Aux Questions (FAQ)/_Français"
 
-#: src/mainwindow.c:742
+#: src/mainwindow.c:751
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/A_ide/_Foire Aux Questions (FAQ)/_Italien"
 
-#: src/mainwindow.c:743
+#: src/mainwindow.c:752
 msgid "/_Help/---"
 msgstr "/A_ide/---"
 
-#: src/mainwindow.c:783
+#: src/mainwindow.c:792
 msgid "Creating main window...\n"
 msgstr "Création de la fenêtre principale...\n"
 
-#: src/mainwindow.c:943
+#: src/mainwindow.c:952
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Fenêtre principale : allocation de la couleur %d échouée\n"
 
-#: src/mainwindow.c:1021 src/summaryview.c:1368 src/summaryview.c:1677
+#: src/mainwindow.c:1030 src/summaryview.c:1368 src/summaryview.c:1677
 #: src/summaryview.c:1785 src/summaryview.c:1831 src/summaryview.c:2453
 #: src/summaryview.c:3080 src/summaryview.c:3146 src/summaryview.c:3171
 #: src/summaryview.c:3284
 msgid "done.\n"
 msgstr "terminé.\n"
 
-#: src/mainwindow.c:1137 src/mainwindow.c:1178 src/mainwindow.c:1206
+#: src/mainwindow.c:1146 src/mainwindow.c:1187 src/mainwindow.c:1215
 msgid "Untitled"
 msgstr "Sans titre"
 
-#: src/mainwindow.c:1207
+#: src/mainwindow.c:1216
 msgid "none"
 msgstr "aucun"
 
-#: src/mainwindow.c:1257
+#: src/mainwindow.c:1266
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "Changement du type de séparation de fenêtre de %d vers %d\n"
 
-#: src/mainwindow.c:1477
+#: src/mainwindow.c:1486
 msgid "Offline"
 msgstr "Déconnecté"
 
-#: src/mainwindow.c:1478
+#: src/mainwindow.c:1487
 msgid "You are offline. Go online?"
 msgstr "Vous êtes déconnecté. Voulez-vous vous connecter ?"
 
-#: src/mainwindow.c:1492
+#: src/mainwindow.c:1501
 msgid "Empty all trash"
 msgstr "Vider toutes les corbeilles"
 
-#: src/mainwindow.c:1493
+#: src/mainwindow.c:1502
 msgid "Empty messages in all trash?"
 msgstr "Supprimer tous les messages dans les corbeilles ?"
 
-#: src/mainwindow.c:1521
+#: src/mainwindow.c:1530
 msgid "Add mailbox"
 msgstr "Nouvelle boîte aux lettres"
 
-#: src/mainwindow.c:1522
+#: src/mainwindow.c:1531
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3136,16 +3173,16 @@ msgstr ""
 "Saisissez le nom de la nouvelle boîte aux lettres. Si elle\n"
 "existe déjà, elle sera automatiquement analysée."
 
-#: src/mainwindow.c:1528
+#: src/mainwindow.c:1537
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "La boîte aux lettres « %s » existe déjà."
 
-#: src/mainwindow.c:1533 src/setup.c:57
+#: src/mainwindow.c:1542 src/setup.c:57
 msgid "Mailbox"
 msgstr "Boîte aux lettres"
 
-#: src/mainwindow.c:1539 src/setup.c:63
+#: src/mainwindow.c:1548 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3155,141 +3192,141 @@ msgstr ""
 "Il se peut que les fichiers existent déjà, ou que vous n'ayez pas les droits "
 "en écriture."
 
-#: src/mainwindow.c:1912
+#: src/mainwindow.c:1921
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Dossiers"
 
-#: src/mainwindow.c:1932 src/messageview.c:358
+#: src/mainwindow.c:1941 src/messageview.c:358
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Message"
 
-#: src/mainwindow.c:2079 src/summaryview.c:340
+#: src/mainwindow.c:2088 src/summaryview.c:340
 msgid "/_Reply"
 msgstr "/_Répondre"
 
-#: src/mainwindow.c:2080
+#: src/mainwindow.c:2089
 msgid "/Reply to _all"
 msgstr "/Répondre à _tous"
 
-#: src/mainwindow.c:2081
+#: src/mainwindow.c:2090
 msgid "/Reply to _sender"
 msgstr "/Répondre à l'_expéditeur"
 
-#: src/mainwindow.c:2082
+#: src/mainwindow.c:2091
 msgid "/Reply to mailing _list"
 msgstr "/Répondre à la _liste"
 
-#: src/mainwindow.c:2087 src/summaryview.c:347
+#: src/mainwindow.c:2096 src/summaryview.c:347
 msgid "/_Forward"
 msgstr "/_Transférer"
 
-#: src/mainwindow.c:2088 src/summaryview.c:348
+#: src/mainwindow.c:2097 src/summaryview.c:348
 msgid "/For_ward as attachment"
 msgstr "/Transférer en pièce _jointe"
 
-#: src/mainwindow.c:2089 src/summaryview.c:349
+#: src/mainwindow.c:2098 src/summaryview.c:349
 msgid "/Redirec_t"
 msgstr "/Rediri_ger"
 
-#: src/mainwindow.c:2125
+#: src/mainwindow.c:2134
 msgid "Get"
 msgstr "Relever"
 
-#: src/mainwindow.c:2126
+#: src/mainwindow.c:2135
 msgid "Incorporate new mail"
 msgstr "Relever le courrier du compte courant"
 
-#: src/mainwindow.c:2133
+#: src/mainwindow.c:2142
 msgid "Get all"
 msgstr "Tout relever"
 
-#: src/mainwindow.c:2134
+#: src/mainwindow.c:2143
 msgid "Incorporate new mail of all accounts"
 msgstr "Relever le courrier de tous les comptes"
 
-#: src/mainwindow.c:2145
+#: src/mainwindow.c:2154
 msgid "Send queued message(s)"
 msgstr "Envoyer les messages en attente"
 
-#: src/mainwindow.c:2155 src/prefs_account.c:705 src/prefs_common.c:852
+#: src/mainwindow.c:2164 src/prefs_account.c:705 src/prefs_common.c:852
 #: src/prefs_folder_item.c:137
 msgid "Compose"
 msgstr "Composer"
 
-#: src/mainwindow.c:2156
+#: src/mainwindow.c:2165
 msgid "Compose new message"
 msgstr "Composer un nouveau message"
 
-#: src/mainwindow.c:2164 src/prefs_common.c:1353
+#: src/mainwindow.c:2173 src/prefs_common.c:1365
 msgid "Reply"
 msgstr "Répondre"
 
-#: src/mainwindow.c:2165 src/mainwindow.c:2178
+#: src/mainwindow.c:2174 src/mainwindow.c:2187
 msgid "Reply to the message"
 msgstr "Répondre au message"
 
-#: src/mainwindow.c:2183
+#: src/mainwindow.c:2192
 msgid "Reply all"
 msgstr "À tous"
 
-#: src/mainwindow.c:2184
+#: src/mainwindow.c:2193
 msgid "Reply to all"
 msgstr "Répondre à tous"
 
-#: src/mainwindow.c:2192 src/prefs_filter_edit.c:719
+#: src/mainwindow.c:2201 src/prefs_filter_edit.c:719
 msgid "Forward"
 msgstr "Transférer"
 
-#: src/mainwindow.c:2193 src/mainwindow.c:2206
+#: src/mainwindow.c:2202 src/mainwindow.c:2215
 msgid "Forward the message"
 msgstr "Transférer le message"
 
-#: src/mainwindow.c:2213
+#: src/mainwindow.c:2222
 msgid "Delete the message"
 msgstr "Supprimer le message"
 
-#: src/mainwindow.c:2221
+#: src/mainwindow.c:2230
 msgid "Execute"
 msgstr "Exécuter"
 
-#: src/mainwindow.c:2222
+#: src/mainwindow.c:2231
 msgid "Execute marked process"
 msgstr "Exécuter les commandes marquées"
 
-#: src/mainwindow.c:2231
+#: src/mainwindow.c:2240
 msgid "Next unread message"
 msgstr "Message non lu suivant"
 
-#: src/mainwindow.c:2242
+#: src/mainwindow.c:2251
 msgid "Prefs"
 msgstr "Préférences"
 
-#: src/mainwindow.c:2243
+#: src/mainwindow.c:2252
 msgid "Common preferences"
 msgstr "Préférences générales"
 
-#: src/mainwindow.c:2250 src/prefs_folder_item.c:258
+#: src/mainwindow.c:2259 src/prefs_folder_item.c:258
 #: src/prefs_folder_item.c:269 src/progressdialog.c:50
 msgid "Account"
 msgstr "Compte"
 
-#: src/mainwindow.c:2251
+#: src/mainwindow.c:2260
 msgid "Account setting"
 msgstr "Configuration du compte courant"
 
-#: src/mainwindow.c:2425
+#: src/mainwindow.c:2434
 msgid "You are offline. Click the icon to go online."
 msgstr "Vous êtes déconnecté. Cliquer sur l'icône pour vous connecter."
 
-#: src/mainwindow.c:2436
+#: src/mainwindow.c:2445
 msgid "You are online. Click the icon to go offline."
 msgstr "Vous êtes connecté. Cliquer sur l'icône pour vous déconnecter."
 
-#: src/mainwindow.c:2624
+#: src/mainwindow.c:2633
 msgid "Exit"
 msgstr "Quitter"
 
-#: src/mainwindow.c:2624
+#: src/mainwindow.c:2633
 msgid "Exit this program?"
 msgstr "Quitter Sylpheed ?"
 
@@ -3415,7 +3452,7 @@ msgstr "Recherche terminée"
 msgid "Creating message view...\n"
 msgstr "Création de la vue message...\n"
 
-#: src/messageview.c:303 src/prefs_common.c:1550
+#: src/messageview.c:303 src/prefs_common.c:1562
 msgid "Text"
 msgstr "Texte"
 
@@ -3428,7 +3465,7 @@ msgstr "Pièces jointes"
 msgid "Can't save the file `%s'."
 msgstr "Impossible d'enregistrer le fichier « %s »."
 
-#: src/messageview.c:697 src/prefs_common.c:2154 src/summaryview.c:2744
+#: src/messageview.c:697 src/prefs_common.c:2166 src/summaryview.c:2744
 msgid "Print"
 msgstr "Impression"
 
@@ -3903,7 +3940,7 @@ msgstr "(Les messages non filtrés seront placés dans ce dossier)"
 msgid "Authentication method"
 msgstr "Méthode d'authentification"
 
-#: src/prefs_account.c:1123 src/prefs_account.c:1239 src/prefs_common.c:1189
+#: src/prefs_account.c:1123 src/prefs_account.c:1239 src/prefs_common.c:1201
 msgid "Automatic"
 msgstr "Automatique"
 
@@ -3927,7 +3964,7 @@ msgstr "Génération d'un Message-ID"
 msgid "Add user-defined header"
 msgstr "Ajouter des en-têtes supplémentaires"
 
-#: src/prefs_account.c:1196 src/prefs_common.c:1714 src/prefs_common.c:1739
+#: src/prefs_account.c:1196 src/prefs_common.c:1726 src/prefs_common.c:1751
 msgid " Edit... "
 msgstr " Modifier... "
 
@@ -4324,106 +4361,107 @@ msgid "Save sent messages to outbox"
 msgstr "Enregistrer les messages envoyés dans la boîte d'envoi"
 
 #: src/prefs_common.c:1113
-msgid "Outgoing codeset"
+#, fuzzy
+msgid "Outgoing encoding"
 msgstr "Jeu de caractères pour l'envoi"
 
 #: src/prefs_common.c:1128
 msgid "Automatic (Recommended)"
 msgstr "Automatique (recommandé)"
 
-#: src/prefs_common.c:1129
+#: src/prefs_common.c:1130
 msgid "7bit ascii (US-ASCII)"
 msgstr "ASCII 7 bits (US-ASCII)"
 
-#: src/prefs_common.c:1130
+#: src/prefs_common.c:1132
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
-#: src/prefs_common.c:1131
+#: src/prefs_common.c:1134
 msgid "Western European (ISO-8859-1)"
 msgstr "Europe occidentale (ISO-8859-1)"
 
-#: src/prefs_common.c:1132
+#: src/prefs_common.c:1135
 msgid "Western European (ISO-8859-15)"
 msgstr "Europe occidentale (ISO-8859-15)"
 
-#: src/prefs_common.c:1133
+#: src/prefs_common.c:1137
 msgid "Central European (ISO-8859-2)"
 msgstr "Europe centrale (ISO-8859-2)"
 
-#: src/prefs_common.c:1134
+#: src/prefs_common.c:1139
 msgid "Baltic (ISO-8859-13)"
 msgstr "Baltique (ISO-8859-13)"
 
-#: src/prefs_common.c:1135
+#: src/prefs_common.c:1140
 msgid "Baltic (ISO-8859-4)"
 msgstr "Europe du Nord (ISO-8859-4)"
 
-#: src/prefs_common.c:1136
+#: src/prefs_common.c:1142
 msgid "Greek (ISO-8859-7)"
 msgstr "Grec (ISO-8859-7)"
 
-#: src/prefs_common.c:1137
+#: src/prefs_common.c:1144
 msgid "Turkish (ISO-8859-9)"
 msgstr "Turc (ISO-8859-9)"
 
-#: src/prefs_common.c:1138
+#: src/prefs_common.c:1146
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Cyrillique (ISO-8859-5)"
 
-#: src/prefs_common.c:1139
+#: src/prefs_common.c:1147
 msgid "Cyrillic (KOI8-R)"
 msgstr "Cyrillique (KOI8-R)"
 
-#: src/prefs_common.c:1140
-msgid "Cyrillic (Windows-1251)"
-msgstr "Cyrillique (Windows-1251)"
-
-#: src/prefs_common.c:1141
+#: src/prefs_common.c:1148
 msgid "Cyrillic (KOI8-U)"
 msgstr "Cyrillique (KOI8-U)"
 
-#: src/prefs_common.c:1142
+#: src/prefs_common.c:1149
+msgid "Cyrillic (Windows-1251)"
+msgstr "Cyrillique (Windows-1251)"
+
+#: src/prefs_common.c:1151
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Japonais (ISO-2022-JP)"
 
-#: src/prefs_common.c:1144
+#: src/prefs_common.c:1153
 msgid "Japanese (EUC-JP)"
 msgstr "Japonais (EUC-JP)"
 
-#: src/prefs_common.c:1145
+#: src/prefs_common.c:1154
 msgid "Japanese (Shift_JIS)"
 msgstr "Japonais (Shift_JIS)"
 
-#: src/prefs_common.c:1147
+#: src/prefs_common.c:1157
 msgid "Simplified Chinese (GB2312)"
 msgstr "Chinois simplifié (GB2312)"
 
-#: src/prefs_common.c:1148
+#: src/prefs_common.c:1158
 msgid "Traditional Chinese (Big5)"
 msgstr "Chinois traditionnel (Big5)"
 
-#: src/prefs_common.c:1150
+#: src/prefs_common.c:1160
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Chinois traditionnel (EUC-TW)"
 
-#: src/prefs_common.c:1151
+#: src/prefs_common.c:1161
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Chinois (ISO-2022-CN)"
 
-#: src/prefs_common.c:1153
+#: src/prefs_common.c:1164
 msgid "Korean (EUC-KR)"
 msgstr "Coréen (EUC-KR)"
 
-#: src/prefs_common.c:1154
+#: src/prefs_common.c:1166
 msgid "Thai (TIS-620)"
 msgstr "Thaï (TIS-620)"
 
-#: src/prefs_common.c:1155
+#: src/prefs_common.c:1167
 msgid "Thai (Windows-874)"
 msgstr "Thaï (Windows-874)"
 
-#: src/prefs_common.c:1165
+#: src/prefs_common.c:1177
 #, fuzzy
 msgid ""
 "If `Automatic' is selected, the optimal encoding for the current locale will "
@@ -4432,11 +4470,11 @@ msgstr ""
 "Si « Automatique » est sélectionné, le jeu de caractères optimal pour le\n"
 "language utilisé sera choisi automatiquement."
 
-#: src/prefs_common.c:1179
+#: src/prefs_common.c:1191
 msgid "Transfer encoding"
 msgstr "Algo. de transmission"
 
-#: src/prefs_common.c:1202
+#: src/prefs_common.c:1214
 #, fuzzy
 msgid ""
 "Specify Content-Transfer-Encoding used when message body contains non-ASCII "
@@ -4445,120 +4483,120 @@ msgstr ""
 "Précise le champ « Content-Transfer-Encoding » utilisé quand\n"
 "le corps du message contient des caractères non ASCII."
 
-#: src/prefs_common.c:1272
+#: src/prefs_common.c:1284
 msgid "Signature separator"
 msgstr "Séparateur de signature"
 
-#: src/prefs_common.c:1281
+#: src/prefs_common.c:1293
 msgid "Insert automatically"
 msgstr "Insérer automatiquement"
 
-#: src/prefs_common.c:1291
+#: src/prefs_common.c:1303
 msgid "Automatically launch the external editor"
 msgstr "Lancer automatiquement l'éditeur externe"
 
-#: src/prefs_common.c:1301
+#: src/prefs_common.c:1313
 msgid "Undo level"
 msgstr "Nombre maximal d'annulations"
 
-#: src/prefs_common.c:1321
+#: src/prefs_common.c:1333
 msgid "Wrap messages at"
 msgstr "Justifier les messages à"
 
-#: src/prefs_common.c:1333
+#: src/prefs_common.c:1345
 msgid "characters"
 msgstr "caractères"
 
-#: src/prefs_common.c:1343
+#: src/prefs_common.c:1355
 msgid "Wrap quotation"
 msgstr "Justifier la citation"
 
-#: src/prefs_common.c:1349
+#: src/prefs_common.c:1361
 msgid "Wrap on input"
 msgstr "Justification automatique"
 
-#: src/prefs_common.c:1351
+#: src/prefs_common.c:1363
 msgid "Wrap before sending"
 msgstr "Justifier avant d'envoyer"
 
-#: src/prefs_common.c:1361
+#: src/prefs_common.c:1373
 msgid "Automatically select account for replies"
 msgstr "Sélection automatique du compte lors d'une réponse"
 
-#: src/prefs_common.c:1363
+#: src/prefs_common.c:1375
 msgid "Quote message when replying"
 msgstr "Citer le message en répondant"
 
-#: src/prefs_common.c:1365
+#: src/prefs_common.c:1377
 msgid "Reply button invokes mailing list reply"
 msgstr "Le bouton répondre agit pour la liste de diffusion"
 
 #. reply
-#: src/prefs_common.c:1411
+#: src/prefs_common.c:1423
 msgid "Reply format"
 msgstr "Citation lors d'une réponse"
 
-#: src/prefs_common.c:1426 src/prefs_common.c:1468
+#: src/prefs_common.c:1438 src/prefs_common.c:1480
 msgid "Quotation mark"
 msgstr "Caractère de citation"
 
 #. forward
-#: src/prefs_common.c:1453
+#: src/prefs_common.c:1465
 msgid "Forward format"
 msgstr "Citation lors d'un transfert"
 
-#: src/prefs_common.c:1500
+#: src/prefs_common.c:1512
 msgid " Description of symbols "
 msgstr " Description des symboles "
 
-#: src/prefs_common.c:1541
+#: src/prefs_common.c:1553
 msgid "Font"
 msgstr "Police"
 
-#: src/prefs_common.c:1573
+#: src/prefs_common.c:1585
 msgid "Translate header name (such as `From:', `Subject:')"
 msgstr "Traduire le nom des en-têtes « From: », « Subject: », etc."
 
-#: src/prefs_common.c:1576
+#: src/prefs_common.c:1588
 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.c:1585
+#: src/prefs_common.c:1597
 msgid "Abbreviate newsgroups longer than"
 msgstr "Abréger les noms des groupes de discussion de plus de"
 
-#: src/prefs_common.c:1600
+#: src/prefs_common.c:1612
 msgid "letters"
 msgstr "lettres"
 
 #. ---- Summary ----
-#: src/prefs_common.c:1606
+#: src/prefs_common.c:1618
 msgid "Summary View"
 msgstr "Résumé des messages"
 
-#: src/prefs_common.c:1615
+#: src/prefs_common.c:1627
 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.c:1617
+#: src/prefs_common.c:1629
 msgid "Expand threads"
 msgstr "Déployer les fils de conversation"
 
-#: src/prefs_common.c:1625 src/prefs_common.c:2443 src/prefs_common.c:2481
+#: src/prefs_common.c:1637 src/prefs_common.c:2455 src/prefs_common.c:2493
 msgid "Date format"
 msgstr "Format de la date"
 
-#: src/prefs_common.c:1646
+#: src/prefs_common.c:1658
 msgid " Set display item of summary... "
 msgstr " Éléments affichés dans le résumé... "
 
-#: src/prefs_common.c:1710
+#: src/prefs_common.c:1722
 msgid "Enable coloration of message"
 msgstr "Coloration des messages"
 
-#: src/prefs_common.c:1724
+#: src/prefs_common.c:1736
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
@@ -4566,322 +4604,322 @@ msgstr ""
 "Afficher l'alphabet et les nombres multi-octets\n"
 "comme des caractères ASCII (Japonais seulement)"
 
-#: src/prefs_common.c:1730
+#: src/prefs_common.c:1742
 msgid "Display header pane above message view"
 msgstr "Afficher un panneau d'en-têtes au dessus du message"
 
-#: src/prefs_common.c:1737
+#: src/prefs_common.c:1749
 msgid "Display short headers on message view"
 msgstr "Afficher des en-têtes courts dans la fenêtre des messages"
 
-#: src/prefs_common.c:1758
+#: src/prefs_common.c:1770
 msgid "Line space"
 msgstr "Espacement des lignes"
 
-#: src/prefs_common.c:1772 src/prefs_common.c:1810
+#: src/prefs_common.c:1784 src/prefs_common.c:1822
 msgid "pixel(s)"
 msgstr "pixel(s)"
 
-#: src/prefs_common.c:1777
+#: src/prefs_common.c:1789
 msgid "Scroll"
 msgstr "Défilement"
 
-#: src/prefs_common.c:1784
+#: src/prefs_common.c:1796
 msgid "Half page"
 msgstr "Demi-page"
 
-#: src/prefs_common.c:1790
+#: src/prefs_common.c:1802
 msgid "Smooth scroll"
 msgstr "Défilement continu"
 
-#: src/prefs_common.c:1796
+#: src/prefs_common.c:1808
 msgid "Step"
 msgstr "par pas de"
 
-#: src/prefs_common.c:1816
+#: src/prefs_common.c:1828
 msgid "Images"
 msgstr ""
 
-#: src/prefs_common.c:1824
+#: src/prefs_common.c:1836
 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.c:1826
+#: src/prefs_common.c:1838
 #, fuzzy
 msgid "Display images as inline"
 msgstr "Options d'affichage des en-têtes"
 
-#: src/prefs_common.c:1871
+#: src/prefs_common.c:1883
 msgid "Automatically check signatures"
 msgstr "Vérifier automatiquement les signatures"
 
-#: src/prefs_common.c:1874
+#: src/prefs_common.c:1886
 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.c:1877
+#: src/prefs_common.c:1889
 msgid "Store passphrase in memory temporarily"
 msgstr "Mémoriser temporairement la phrase secrète"
 
-#: src/prefs_common.c:1892
+#: src/prefs_common.c:1904
 msgid "Expired after"
 msgstr "Expiration après"
 
-#: src/prefs_common.c:1905
+#: src/prefs_common.c:1917
 msgid "minute(s) "
 msgstr "minute(s) "
 
-#: src/prefs_common.c:1918
+#: src/prefs_common.c:1930
 #, fuzzy
 msgid "Setting to '0' will store the passphrase for the whole session."
 msgstr ""
 "(Mettre 0 pour mémoriser la phrase secrète\n"
 " pendant toute la durée de la session)"
 
-#: src/prefs_common.c:1932
+#: src/prefs_common.c:1944
 msgid "Grab input while entering a passphrase"
 msgstr "Monopoliser le clavier pendant la saisie de la phrase secrète"
 
-#: src/prefs_common.c:1937
+#: src/prefs_common.c:1949
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "Afficher un avertissement si GnuPG ne fonctionne pas"
 
-#: src/prefs_common.c:1989
+#: src/prefs_common.c:2001
 msgid "Always open messages in summary when selected"
 msgstr "Ouvrir automatiquement les messages sélectionnés dans le résumé"
 
-#: src/prefs_common.c:1993
+#: src/prefs_common.c:2005
 msgid "Open first unread message when entering a folder"
 msgstr "Ouvrir le premier message non lu en ouvrant un dossier"
 
-#: src/prefs_common.c:1997
+#: src/prefs_common.c:2009
 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.c:2001
+#: src/prefs_common.c:2013
 msgid "Go to 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.c:2009
+#: src/prefs_common.c:2021
 msgid "Execute immediately when moving or deleting messages"
 msgstr "Exécuter immédiatement la suppression ou le déplacement de messages"
 
-#: src/prefs_common.c:2021
+#: src/prefs_common.c:2033
 #, fuzzy
 msgid "Messages will be marked until execution if this is turned off."
 msgstr "(sinon, les messages resteront marqués jusqu'à exécution)"
 
-#: src/prefs_common.c:2029
+#: src/prefs_common.c:2041
 msgid "Receive dialog"
 msgstr "Message de réception"
 
-#: src/prefs_common.c:2039
+#: src/prefs_common.c:2051
 msgid "Show receive dialog"
 msgstr "Afficher une fenêtre lors de la réception :"
 
-#: src/prefs_common.c:2049
+#: src/prefs_common.c:2061
 msgid "Always"
 msgstr " toujours"
 
-#: src/prefs_common.c:2050
+#: src/prefs_common.c:2062
 msgid "Only on manual receiving"
 msgstr "Seulement lors d'une relève manuelle du courrier"
 
-#: src/prefs_common.c:2052
+#: src/prefs_common.c:2064
 msgid "Never"
 msgstr " jamais"
 
-#: src/prefs_common.c:2057
+#: src/prefs_common.c:2069
 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.c:2060
+#: src/prefs_common.c:2072
 msgid "Close receive dialog when finished"
 msgstr "Fermer la fenêtre de réception à la fin"
 
-#: src/prefs_common.c:2066
+#: src/prefs_common.c:2078
 msgid " Set key bindings... "
 msgstr " Choisir les raccourcis clavier... "
 
-#: src/prefs_common.c:2122
+#: src/prefs_common.c:2134
 #, c-format
 msgid "External commands (%s will be replaced with file name / URI)"
 msgstr "Commandes externes (%s sera remplacé par le nom du fichier/URI)"
 
-#: src/prefs_common.c:2131
+#: src/prefs_common.c:2143
 msgid "Web browser"
 msgstr "Navigateur web"
 
-#: src/prefs_common.c:2195
+#: src/prefs_common.c:2207
 msgid "Add address to destination when double-clicked"
 msgstr "Un double-clic sur une adresse l'ajoute à la liste des destinataires"
 
-#: src/prefs_common.c:2197
+#: src/prefs_common.c:2209
 msgid "On exit"
 msgstr "En quittant"
 
-#: src/prefs_common.c:2205
+#: src/prefs_common.c:2217
 msgid "Confirm on exit"
 msgstr "Confirmer en quittant"
 
-#: src/prefs_common.c:2212
+#: src/prefs_common.c:2224
 msgid "Empty trash on exit"
 msgstr "Vider la corbeille en quittant"
 
-#: src/prefs_common.c:2214
+#: src/prefs_common.c:2226
 msgid "Ask before emptying"
 msgstr "Demander avant de vider"
 
-#: src/prefs_common.c:2218
+#: src/prefs_common.c:2230
 msgid "Warn if there are queued messages"
 msgstr "Avertir s'il y a des messages à envoyer en file d'attente"
 
-#: src/prefs_common.c:2224
+#: src/prefs_common.c:2236
 msgid "Socket I/O timeout:"
 msgstr "Dépassement du délai de réponse (timeout) des E/S du socket :"
 
-#: src/prefs_common.c:2237
+#: src/prefs_common.c:2249
 msgid "second(s)"
 msgstr "seconde(s)"
 
-#: src/prefs_common.c:2419
+#: src/prefs_common.c:2431
 msgid "the full abbreviated weekday name"
 msgstr "nom du jour de la semaine (abrégé)"
 
-#: src/prefs_common.c:2420
+#: src/prefs_common.c:2432
 msgid "the full weekday name"
 msgstr "nom du jour de la semaine"
 
-#: src/prefs_common.c:2421
+#: src/prefs_common.c:2433
 msgid "the abbreviated month name"
 msgstr "nom du mois (abrégé)"
 
-#: src/prefs_common.c:2422
+#: src/prefs_common.c:2434
 msgid "the full month name"
 msgstr "nom du mois"
 
-#: src/prefs_common.c:2423
+#: src/prefs_common.c:2435
 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.c:2424
+#: src/prefs_common.c:2436
 msgid "the century number (year/100)"
 msgstr "le 'siècle' (année/100)"
 
-#: src/prefs_common.c:2425
+#: src/prefs_common.c:2437
 msgid "the day of the month as a decimal number"
 msgstr "le jour du mois"
 
-#: src/prefs_common.c:2426
+#: src/prefs_common.c:2438
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "l'heure en tant que nombre (0-23)"
 
-#: src/prefs_common.c:2427
+#: src/prefs_common.c:2439
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "l'heure en tant que nombre (1-12)"
 
-#: src/prefs_common.c:2428
+#: src/prefs_common.c:2440
 msgid "the day of the year as a decimal number"
 msgstr "le jour de l'année en tant que nombre"
 
-#: src/prefs_common.c:2429
+#: src/prefs_common.c:2441
 msgid "the month as a decimal number"
 msgstr "le mois en tant que nombre"
 
-#: src/prefs_common.c:2430
+#: src/prefs_common.c:2442
 msgid "the minute as a decimal number"
 msgstr "les minutes en tant que nombre"
 
-#: src/prefs_common.c:2431
+#: src/prefs_common.c:2443
 msgid "either AM or PM"
 msgstr "AM (matin) ou PM (après-midi)"
 
-#: src/prefs_common.c:2432
+#: src/prefs_common.c:2444
 msgid "the second as a decimal number"
 msgstr "les secondes en tant que nombre"
 
-#: src/prefs_common.c:2433
+#: src/prefs_common.c:2445
 msgid "the day of the week as a decimal number"
 msgstr "le jour de la semaine en tant que nombre"
 
-#: src/prefs_common.c:2434
+#: src/prefs_common.c:2446
 msgid "the preferred date for the current locale"
 msgstr "le format par défaut de la date"
 
-#: src/prefs_common.c:2435
+#: src/prefs_common.c:2447
 msgid "the last two digits of a year"
 msgstr "les deux derniers chiffres de l'année"
 
-#: src/prefs_common.c:2436
+#: src/prefs_common.c:2448
 msgid "the year as a decimal number"
 msgstr "l'année"
 
-#: src/prefs_common.c:2437
+#: src/prefs_common.c:2449
 msgid "the time zone or name or abbreviation"
 msgstr "le fuseau horaire, son nom ou abréviation"
 
-#: src/prefs_common.c:2458
+#: src/prefs_common.c:2470
 msgid "Specifier"
 msgstr "Code"
 
-#: src/prefs_common.c:2459
+#: src/prefs_common.c:2471
 msgid "Description"
 msgstr "Description"
 
-#: src/prefs_common.c:2499
+#: src/prefs_common.c:2511
 msgid "Example"
 msgstr "Exemple"
 
-#: src/prefs_common.c:2580
+#: src/prefs_common.c:2592
 msgid "Set message colors"
 msgstr "Paramétrer les couleurs de message"
 
-#: src/prefs_common.c:2588
+#: src/prefs_common.c:2600
 msgid "Colors"
 msgstr "Couleurs"
 
-#: src/prefs_common.c:2622
+#: src/prefs_common.c:2634
 msgid "Quoted Text - First Level"
 msgstr "Texte cité - 1er niveau"
 
-#: src/prefs_common.c:2628
+#: src/prefs_common.c:2640
 msgid "Quoted Text - Second Level"
 msgstr "Texte cité - 2e niveau"
 
-#: src/prefs_common.c:2634
+#: src/prefs_common.c:2646
 msgid "Quoted Text - Third Level"
 msgstr "Texte cité - 3e niveau"
 
-#: src/prefs_common.c:2640
+#: src/prefs_common.c:2652
 msgid "URI link"
 msgstr "Lien URI"
 
-#: src/prefs_common.c:2647
+#: src/prefs_common.c:2659
 msgid "Recycle quote colors"
 msgstr "Réutiliser les couleurs"
 
-#: src/prefs_common.c:2707
+#: src/prefs_common.c:2719
 msgid "Pick color for quotation level 1"
 msgstr "Choix de la couleur de la citation niveau 1"
 
-#: src/prefs_common.c:2710
+#: src/prefs_common.c:2722
 msgid "Pick color for quotation level 2"
 msgstr "Choix de la couleur de la citation niveau 2"
 
-#: src/prefs_common.c:2713
+#: src/prefs_common.c:2725
 msgid "Pick color for quotation level 3"
 msgstr "Choix de la couleur de la citation niveau 3"
 
-#: src/prefs_common.c:2716
+#: src/prefs_common.c:2728
 msgid "Pick color for URI"
 msgstr "Choix de la couleur pour les liens URI"
 
-#: src/prefs_common.c:2853
+#: src/prefs_common.c:2865
 msgid "Description of symbols"
 msgstr "Description des symboles"
 
-#: src/prefs_common.c:2909
+#: src/prefs_common.c:2921
 msgid ""
 "Date\n"
 "From\n"
@@ -4905,11 +4943,11 @@ msgstr ""
 "Groupes de discussions\n"
 "Message-ID"
 
-#: src/prefs_common.c:2922
+#: src/prefs_common.c:2934
 msgid "If x is set, displays expr"
 msgstr "Si x est défini, afficher expr"
 
-#: src/prefs_common.c:2926
+#: src/prefs_common.c:2938
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -4923,7 +4961,7 @@ msgstr ""
 "Corps du message sans signature en tant que citation\n"
 "Caractère pourcent « % »"
 
-#: src/prefs_common.c:2934
+#: src/prefs_common.c:2946
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -4935,15 +4973,15 @@ msgstr ""
 "Caractère « { »\n"
 "Caractère « } »"
 
-#: src/prefs_common.c:2971
+#: src/prefs_common.c:2983
 msgid "Font selection"
 msgstr "Sélection de la police"
 
-#: src/prefs_common.c:3035
+#: src/prefs_common.c:3047
 msgid "Key bindings"
 msgstr "Raccourcis clavier"
 
-#: src/prefs_common.c:3049
+#: src/prefs_common.c:3061
 msgid ""
 "Select the preset of key bindings.\n"
 "You can also modify each menu's shortcuts by pressing\n"
@@ -4955,11 +4993,11 @@ msgstr ""
 "en le pointant avec la souris et en pressant une\n"
 "combinaison de touches."
 
-#: src/prefs_common.c:3061 src/prefs_common.c:3410
+#: src/prefs_common.c:3073 src/prefs_common.c:3422
 msgid "Default"
 msgstr "Par défaut"
 
-#: src/prefs_common.c:3064 src/prefs_common.c:3419
+#: src/prefs_common.c:3076 src/prefs_common.c:3431
 msgid "Old Sylpheed"
 msgstr "Ancien Sylpheed"
 
@@ -6103,6 +6141,12 @@ msgstr "%.2f Go"
 msgid "writing to %s failed.\n"
 msgstr "L'écriture dans %s a échoué.\n"
 
+#~ msgid "/_View/_Code set/---"
+#~ msgstr "/_Affichage/_Jeu de caractères/---"
+
+#~ msgid "/_View/_Code set"
+#~ msgstr "/_Affichage/_Jeu de caractères"
+
 #~ msgid "To save this part, pop up the context menu with "
 #~ msgstr "Pour enregistrer cette pièce, activer le menu contextuel avec "
 
diff --git a/po/gl.po b/po/gl.po
index 55e55c6b..43b17f1e 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: 2005-03-15 14:29+0900\n"
+"POT-Creation-Date: 2005-03-16 14:47+0900\n"
 "PO-Revision-Date: 2003-01-17 10:05+0100\n"
 "Last-Translator: Jorge Rivas\n"
 "Language-Team: Jorge Rivas\n"
@@ -97,7 +97,7 @@ msgstr ""
 "na columna `G' para activar a descarga mediante `Traer todo'."
 
 #: src/account.c:638 src/addressadd.c:186 src/addressbook.c:488
-#: src/compose.c:3650 src/editaddress.c:195 src/editaddress.c:936
+#: src/compose.c:3748 src/editaddress.c:195 src/editaddress.c:936
 #: src/editaddress.c:984 src/editbook.c:191 src/editgroup.c:257
 #: src/editjpilot.c:296 src/editldap.c:300 src/editvcard.c:211
 #: src/mimeview.c:151 src/prefs_filter.c:214 src/prefs_folder_item.c:170
@@ -150,13 +150,13 @@ msgstr "Borrar conta"
 msgid "Do you really want to delete this account?"
 msgstr "¿Realmente quere borrar esta conta?"
 
-#: src/account.c:758 src/compose.c:2551 src/compose.c:4807
+#: src/account.c:758 src/compose.c:2632 src/compose.c:4943
 #: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
 #: src/folderview.c:2156 src/folderview.c:2192
 msgid "Yes"
 msgstr "Si"
 
-#: src/account.c:758 src/compose.c:2551 src/compose.c:4807
+#: src/account.c:758 src/compose.c:2632 src/compose.c:4943
 #: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
 #: src/folderview.c:2156 src/folderview.c:2192
 msgid "+No"
@@ -259,7 +259,7 @@ msgstr ""
 msgid "Add Address to Book"
 msgstr "Engadir enderezo á axenda"
 
-#: src/addressadd.c:196 src/compose.c:4191 src/editaddress.c:196
+#: src/addressadd.c:196 src/compose.c:4292 src/editaddress.c:196
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "Enderezo"
@@ -273,7 +273,7 @@ msgstr "Notas"
 msgid "Select Address Book Folder"
 msgstr "Seleccionar carpeta da axenda"
 
-#: src/addressbook.c:334 src/compose.c:469 src/mainwindow.c:454
+#: src/addressbook.c:334 src/compose.c:477 src/mainwindow.c:454
 #: src/messageview.c:134
 msgid "/_File"
 msgstr "/_Ficheiro"
@@ -294,8 +294,8 @@ msgstr "/_Ficheiro/Novo _JPilot"
 msgid "/_File/New _Server"
 msgstr "/_Ficheiro/Novo _servidor"
 
-#: src/addressbook.c:343 src/addressbook.c:346 src/compose.c:474
-#: src/compose.c:479 src/compose.c:483 src/mainwindow.c:471
+#: src/addressbook.c:343 src/addressbook.c:346 src/compose.c:482
+#: src/compose.c:487 src/compose.c:491 src/mainwindow.c:471
 #: src/mainwindow.c:474 src/mainwindow.c:476 src/mainwindow.c:479
 #: src/mainwindow.c:481 src/messageview.c:137
 msgid "/_File/---"
@@ -313,7 +313,7 @@ msgstr "/_Ficheiro/_Borrar"
 msgid "/_File/_Save"
 msgstr "/_Ficheiro/_Gardar"
 
-#: src/addressbook.c:348 src/compose.c:484 src/messageview.c:138
+#: src/addressbook.c:348 src/compose.c:492 src/messageview.c:138
 msgid "/_File/_Close"
 msgstr "/_Ficheiro/_Pechar"
 
@@ -345,7 +345,7 @@ msgstr "/_Enderezo/_Editar"
 msgid "/_Address/_Delete"
 msgstr "/_Enderezo/_Borrar"
 
-#: src/addressbook.c:356 src/compose.c:585 src/mainwindow.c:688
+#: src/addressbook.c:356 src/compose.c:664 src/mainwindow.c:697
 #: src/messageview.c:246
 msgid "/_Tools"
 msgstr "/_Ferramentas"
@@ -354,12 +354,12 @@ msgstr "/_Ferramentas"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Ferramentas/Importar ficheiro _LDIF"
 
-#: src/addressbook.c:358 src/compose.c:598 src/mainwindow.c:733
+#: src/addressbook.c:358 src/compose.c:677 src/mainwindow.c:742
 #: src/messageview.c:264
 msgid "/_Help"
 msgstr "/_Axuda"
 
-#: src/addressbook.c:359 src/compose.c:599 src/mainwindow.c:744
+#: src/addressbook.c:359 src/compose.c:678 src/mainwindow.c:753
 #: src/messageview.c:265
 msgid "/_Help/_About"
 msgstr "/_Ayuda/_Acerca de"
@@ -376,7 +376,7 @@ msgstr "/Novo _grupo"
 msgid "/New _Folder"
 msgstr "/Nova _carpeta"
 
-#: src/addressbook.c:381 src/addressbook.c:391 src/compose.c:463
+#: src/addressbook.c:381 src/addressbook.c:391 src/compose.c:471
 #: src/folderview.c:220 src/folderview.c:222 src/folderview.c:226
 #: src/folderview.c:236 src/folderview.c:238 src/folderview.c:240
 #: src/folderview.c:244 src/folderview.c:254 src/folderview.c:256
@@ -386,7 +386,7 @@ msgstr "/Nova _carpeta"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:382 src/addressbook.c:392 src/compose.c:486
+#: src/addressbook.c:382 src/addressbook.c:392 src/compose.c:494
 #: src/mainwindow.c:485 src/messageview.c:140
 msgid "/_Edit"
 msgstr "/_Editar"
@@ -399,7 +399,7 @@ msgstr "/_Borrar"
 msgid "E-Mail address"
 msgstr "Enderezo e-mail"
 
-#: src/addressbook.c:493 src/compose.c:4192 src/prefs_common.c:2186
+#: src/addressbook.c:493 src/compose.c:4293 src/prefs_common.c:2198
 msgid "Address book"
 msgstr "Axenda de enderezos"
 
@@ -409,7 +409,7 @@ msgstr "Nome:"
 
 #. Buttons
 #: src/addressbook.c:625 src/addressbook.c:1665 src/addressbook.c:1671
-#: src/editaddress.c:878 src/editaddress.c:1011 src/mainwindow.c:2212
+#: src/editaddress.c:878 src/editaddress.c:1011 src/mainwindow.c:2221
 #: src/prefs_actions.c:263 src/prefs_display_header.c:275
 #: src/prefs_display_header.c:330 src/prefs_template.c:227
 msgid "Delete"
@@ -603,7 +603,7 @@ msgstr "Enderezo común"
 msgid "Personal address"
 msgstr "Enderezo persoal"
 
-#: src/alertpanel.c:123 src/compose.c:4807 src/main.c:458
+#: src/alertpanel.c:123 src/compose.c:4943 src/main.c:458
 msgid "Notice"
 msgstr "Notificación"
 
@@ -611,7 +611,7 @@ msgstr "Notificación"
 msgid "Warning"
 msgstr "Aviso"
 
-#: src/alertpanel.c:149 src/compose.c:2551 src/inc.c:558
+#: src/alertpanel.c:149 src/compose.c:2632 src/inc.c:558
 msgid "Error"
 msgstr "Erro"
 
@@ -659,308 +659,426 @@ msgstr "Marrón"
 msgid "None"
 msgstr "Ningún"
 
-#: src/compose.c:461
+#: src/compose.c:469
 msgid "/_Add..."
 msgstr "/_Engadir"
 
-#: src/compose.c:462
+#: src/compose.c:470
 msgid "/_Remove"
 msgstr "/_Quitar"
 
-#: src/compose.c:464 src/folderview.c:228 src/folderview.c:246
+#: src/compose.c:472 src/folderview.c:228 src/folderview.c:246
 #: src/folderview.c:261
 msgid "/_Properties..."
 msgstr "/_Propiedades..."
 
-#: src/compose.c:470
+#: src/compose.c:478
 #, fuzzy
 msgid "/_File/_Send"
 msgstr "/_Ficheiro/_Gardar"
 
-#: src/compose.c:472
+#: src/compose.c:480
 #, fuzzy
 msgid "/_File/Send _later"
 msgstr "/_Mensaxe/Enviar _logo"
 
-#: src/compose.c:475
+#: src/compose.c:483
 #, fuzzy
 msgid "/_File/Save to _draft folder"
 msgstr "/_Mensaxe/_Gardar como borrador"
 
-#: src/compose.c:477
+#: src/compose.c:485
 #, fuzzy
 msgid "/_File/Save and _keep editing"
 msgstr "/_Mensaxe/Gardar e _seguir editando"
 
-#: src/compose.c:480
+#: src/compose.c:488
 msgid "/_File/_Attach file"
 msgstr "/_Ficheiro/_Adxuntar ficheiro"
 
-#: src/compose.c:481
+#: src/compose.c:489
 msgid "/_File/_Insert file"
 msgstr "/_Ficheiro/_Inserir ficheiro"
 
-#: src/compose.c:482
+#: src/compose.c:490
 msgid "/_File/Insert si_gnature"
 msgstr "/_Ficheiro/Inserir _sinatura"
 
-#: src/compose.c:487
+#: src/compose.c:495
 msgid "/_Edit/_Undo"
 msgstr "/_Editar/_Desfacer"
 
-#: src/compose.c:488
+#: src/compose.c:496
 msgid "/_Edit/_Redo"
 msgstr "/_Editar/_Refacer"
 
-#: src/compose.c:489 src/compose.c:567 src/mainwindow.c:489
+#: src/compose.c:497 src/compose.c:575 src/mainwindow.c:489
 #: src/messageview.c:143
 msgid "/_Edit/---"
 msgstr "/_Editar/---"
 
-#: src/compose.c:490
+#: src/compose.c:498
 msgid "/_Edit/Cu_t"
 msgstr "/_Editar/Cor_tar"
 
-#: src/compose.c:491 src/mainwindow.c:486 src/messageview.c:141
+#: src/compose.c:499 src/mainwindow.c:486 src/messageview.c:141
 msgid "/_Edit/_Copy"
 msgstr "/_Editar/_Copiar"
 
-#: src/compose.c:492
+#: src/compose.c:500
 msgid "/_Edit/_Paste"
 msgstr "/_Editar/_Pegar"
 
-#: src/compose.c:493
+#: src/compose.c:501
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Editar/Pegar como c_itación"
 
-#: src/compose.c:495 src/mainwindow.c:487 src/messageview.c:142
+#: src/compose.c:503 src/mainwindow.c:487 src/messageview.c:142
 msgid "/_Edit/Select _all"
 msgstr "/_Editar/_Seleccionar todo"
 
-#: src/compose.c:496
+#: src/compose.c:504
 msgid "/_Edit/A_dvanced"
 msgstr "/_Editar/Avanza_das"
 
-#: src/compose.c:497
+#: src/compose.c:505
 msgid "/_Edit/A_dvanced/Move a character backward"
 msgstr "/_Editar/Avanza_das/Ir ó caracter anterior"
 
-#: src/compose.c:502
+#: src/compose.c:510
 msgid "/_Edit/A_dvanced/Move a character forward"
 msgstr "/_Editar/Avanza_das/Ir ó caracter seguinte"
 
-#: src/compose.c:507
+#: src/compose.c:515
 msgid "/_Edit/A_dvanced/Move a word backward"
 msgstr "/_Editar/Avanza_das/Ir á palabra anterior"
 
-#: src/compose.c:512
+#: src/compose.c:520
 msgid "/_Edit/A_dvanced/Move a word forward"
 msgstr "/_Editar/Avanza_das/Ir á palabra seguinte"
 
-#: src/compose.c:517
+#: src/compose.c:525
 msgid "/_Edit/A_dvanced/Move to beginning of line"
 msgstr "/_Editar/Avanza_das/Ir ó principio da línea"
 
-#: src/compose.c:522
+#: src/compose.c:530
 msgid "/_Edit/A_dvanced/Move to end of line"
 msgstr "/_Editar/Avanza_das/Ir ó final da línea"
 
-#: src/compose.c:527
+#: src/compose.c:535
 msgid "/_Edit/A_dvanced/Move to previous line"
 msgstr "/_Editar/Avanza_das/Ir á línea anterior"
 
-#: src/compose.c:532
+#: src/compose.c:540
 msgid "/_Edit/A_dvanced/Move to next line"
 msgstr "/_Editar/Avanza_das/Ir á línea seguinte"
 
-#: src/compose.c:537
+#: src/compose.c:545
 msgid "/_Edit/A_dvanced/Delete a character backward"
 msgstr "/_Editar/Avanza_das/Borrar o caracter anterior"
 
-#: src/compose.c:542
+#: src/compose.c:550
 msgid "/_Edit/A_dvanced/Delete a character forward"
 msgstr "/_Editar/Avanza_das/Borrar o caracter seguinte"
 
-#: src/compose.c:547
+#: src/compose.c:555
 msgid "/_Edit/A_dvanced/Delete a word backward"
 msgstr "/_Editar/Avanza_das/Borrar a palabra anterior"
 
-#: src/compose.c:552
+#: src/compose.c:560
 msgid "/_Edit/A_dvanced/Delete a word forward"
 msgstr "/_Editar/Avanza_das/Borrar a palabra seguinte"
 
-#: src/compose.c:557
+#: src/compose.c:565
 msgid "/_Edit/A_dvanced/Delete line"
 msgstr "/_Editar/Avanza_das/Borrar línea"
 
-#: src/compose.c:562
+#: src/compose.c:570
 msgid "/_Edit/A_dvanced/Delete to end of line"
 msgstr "/_Editar/Avanza_das/Borrar ata o final da línea"
 
-#: src/compose.c:568
+#: src/compose.c:576
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/_Editar/_Recortar párrafo actual"
 
-#: src/compose.c:570
+#: src/compose.c:578
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/_Editar/_Cortar todas as líneas longas"
 
-#: src/compose.c:572
+#: src/compose.c:580
 #, fuzzy
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Editar/_Copiar"
 
-#: src/compose.c:573 src/mainwindow.c:494 src/messageview.c:147
+#: src/compose.c:581 src/mainwindow.c:494 src/messageview.c:147
 #: src/summaryview.c:370
 msgid "/_View"
 msgstr "/_Ver"
 
-#: src/compose.c:574
+#: src/compose.c:582
 msgid "/_View/_To"
 msgstr "/_Ver/_Para"
 
-#: src/compose.c:575
+#: src/compose.c:583
 msgid "/_View/_Cc"
 msgstr "/_Ver/_Copia"
 
-#: src/compose.c:576
+#: src/compose.c:584
 msgid "/_View/_Bcc"
 msgstr "/_Ver/C_opia oculta"
 
-#: src/compose.c:577
+#: src/compose.c:585
 msgid "/_View/_Reply to"
 msgstr "/_Ver/_Respostar a"
 
-#: src/compose.c:578 src/compose.c:580 src/compose.c:582 src/mainwindow.c:512
-#: src/mainwindow.c:515 src/mainwindow.c:541 src/mainwindow.c:565
-#: src/mainwindow.c:641 src/mainwindow.c:645 src/messageview.c:223
+#: src/compose.c:586 src/compose.c:588 src/compose.c:590 src/compose.c:592
+#: src/mainwindow.c:512 src/mainwindow.c:515 src/mainwindow.c:541
+#: src/mainwindow.c:565 src/mainwindow.c:650 src/mainwindow.c:654
+#: src/messageview.c:223
 msgid "/_View/---"
 msgstr "/_Ver/---"
 
-#: src/compose.c:579
+#: src/compose.c:587
 msgid "/_View/_Followup to"
 msgstr "/_Ver/_Engadir a"
 
-#: src/compose.c:581
+#: src/compose.c:589
 msgid "/_View/R_uler"
 msgstr "/_Ver/_Regra"
 
-#: src/compose.c:583
+#: src/compose.c:591
 msgid "/_View/_Attachment"
 msgstr "/_Ver/_Adxuntos"
 
-#: src/compose.c:586 src/mainwindow.c:689 src/messageview.c:247
+#: src/compose.c:598 src/mainwindow.c:572 src/messageview.c:154
+#, fuzzy
+msgid "/_View/Character _encoding"
+msgstr "/_Ver/_Ordear/Descendente"
+
+#: src/compose.c:599
+msgid "/_View/Character _encoding/_Automatic"
+msgstr ""
+
+#: src/compose.c:601 src/compose.c:607 src/compose.c:613 src/compose.c:617
+#: src/compose.c:623 src/compose.c:627 src/compose.c:631 src/compose.c:641
+#: src/compose.c:645 src/compose.c:653 src/compose.c:657 src/mainwindow.c:568
+#: src/mainwindow.c:575 src/messageview.c:150
+#, fuzzy
+msgid "/_View/Character _encoding/---"
+msgstr "/_Ver/_Ordear/Descendente"
+
+#: src/compose.c:603 src/mainwindow.c:576 src/messageview.c:158
+#, fuzzy
+msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
+msgstr "/_Ver/_Codificación/ASCII de 7 bits (US-ASC_II)"
+
+#: src/compose.c:605 src/mainwindow.c:578 src/messageview.c:161
+#, fuzzy
+msgid "/_View/Character _encoding/Unicode (_UTF-8)"
+msgstr "/_Ver/_Codificación/Unicode (_UTF-8)"
+
+#: src/compose.c:609 src/mainwindow.c:582 src/messageview.c:164
+#, fuzzy
+msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
+msgstr "/_Ver/_Codificación/Europeo Occidental (ISO-8859-_1)"
+
+#: src/compose.c:611 src/mainwindow.c:584 src/messageview.c:166
+#, fuzzy
+msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
+msgstr "/_Ver/_Codificación/Europeo Occidental (ISO-8859-_15)"
+
+#: src/compose.c:615 src/mainwindow.c:588 src/messageview.c:169
+#, fuzzy
+msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
+msgstr "/_Ver/_Codificación/Centroeuropeo (ISO-8859-_2)"
+
+#: src/compose.c:619 src/mainwindow.c:592 src/messageview.c:172
+#, fuzzy
+msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
+msgstr "/_Ver/_Codificación/Báltico (ISO-8859-13)"
+
+#: src/compose.c:621 src/mainwindow.c:594 src/messageview.c:174
+#, fuzzy
+msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
+msgstr "/_Ver/_Codificación/Báltico (ISO-8859-_4)"
+
+#: src/compose.c:625 src/mainwindow.c:598 src/messageview.c:177
+#, fuzzy
+msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
+msgstr "/_Ver/_Codificación/Grego (ISO-8859-_7)"
+
+#: src/compose.c:629 src/mainwindow.c:602 src/messageview.c:180
+#, fuzzy
+msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
+msgstr "/_Ver/_Codificación/Turco (ISO-8859-_9)"
+
+#: src/compose.c:633 src/mainwindow.c:606 src/messageview.c:183
+#, fuzzy
+msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
+msgstr "/_Ver/_Codificación/Cirílico (ISO-8859-_5)"
+
+#: src/compose.c:635 src/mainwindow.c:608 src/messageview.c:185
+#, fuzzy
+msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
+msgstr "/_Ver/_Codificación/Cirílico (KOI8-_R)"
+
+#: src/compose.c:637 src/mainwindow.c:610 src/messageview.c:187
+#, fuzzy
+msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
+msgstr "/_Ver/_Codificación/Cirílico (KOI8-_R)"
+
+#: src/compose.c:639 src/mainwindow.c:612 src/messageview.c:189
+#, fuzzy
+msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
+msgstr "/_Ver/_Codificación/Cirílico (Windows-1251)"
+
+#: src/compose.c:643 src/mainwindow.c:616 src/messageview.c:192
+#, fuzzy
+msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
+msgstr "/_Ver/_Codificación/Xaponés (ISO-2022-_JP)"
+
+#: src/compose.c:647 src/mainwindow.c:626 src/messageview.c:201
+#, fuzzy
+msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
+msgstr "/_Ver/_Codificación/Chines simplificado (_GB2312)"
+
+#: src/compose.c:649 src/mainwindow.c:628 src/messageview.c:203
+#, fuzzy
+msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
+msgstr "/_Ver/_Codificación/Chines tradicional (_Big5)"
+
+#: src/compose.c:651 src/mainwindow.c:630 src/messageview.c:205
+#, fuzzy
+msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
+msgstr "/_Ver/_Codificación/Chines tradicional (EUC-_TW)"
+
+#: src/compose.c:655 src/mainwindow.c:636 src/messageview.c:210
+#, fuzzy
+msgid "/_View/Character _encoding/Korean (EUC-_KR)"
+msgstr "/_Ver/_Codificación/Coreano (EUC-_KR)"
+
+#: src/compose.c:659 src/mainwindow.c:642 src/messageview.c:215
+#, fuzzy
+msgid "/_View/Character _encoding/Thai (TIS-620)"
+msgstr "/_Ver/_Codificación/Tailandés (TIS-620)"
+
+#: src/compose.c:661 src/mainwindow.c:644 src/messageview.c:217
+#, fuzzy
+msgid "/_View/Character _encoding/Thai (Windows-874)"
+msgstr "/_Ver/_Codificación/Tailandés (Windows-874)"
+
+#: src/compose.c:665 src/mainwindow.c:698 src/messageview.c:247
 msgid "/_Tools/_Address book"
 msgstr "/_Ferramentas/_Axenda de enderezos"
 
-#: src/compose.c:587
+#: src/compose.c:666
 msgid "/_Tools/_Template"
 msgstr "/_Ferramentas/Plan_tillas"
 
-#: src/compose.c:588 src/mainwindow.c:707 src/messageview.c:262
+#: src/compose.c:667 src/mainwindow.c:716 src/messageview.c:262
 msgid "/_Tools/Actio_ns"
 msgstr "/_Ferramentas/Acció_ns"
 
-#: src/compose.c:589 src/compose.c:593 src/mainwindow.c:692
-#: src/mainwindow.c:706 src/mainwindow.c:708 src/mainwindow.c:711
-#: src/mainwindow.c:713 src/messageview.c:250 src/messageview.c:261
+#: src/compose.c:668 src/compose.c:672 src/mainwindow.c:701
+#: src/mainwindow.c:715 src/mainwindow.c:717 src/mainwindow.c:720
+#: src/mainwindow.c:722 src/messageview.c:250 src/messageview.c:261
 msgid "/_Tools/---"
 msgstr "/_Ferramentas/---"
 
-#: src/compose.c:590
+#: src/compose.c:669
 #, fuzzy
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/_Editar/Editar con editor e_xterno"
 
-#: src/compose.c:594
+#: src/compose.c:673
 #, fuzzy
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Ferramentas/Acció_ns"
 
-#: src/compose.c:595
+#: src/compose.c:674
 #, fuzzy
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/_Mensaxe/_Encriptar"
 
-#: src/compose.c:800
+#: src/compose.c:879
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: o ficheiro non existe\n"
 
-#: src/compose.c:899 src/compose.c:958 src/procmsg.c:1303
+#: src/compose.c:978 src/compose.c:1037 src/procmsg.c:1303
 msgid "Can't get text part\n"
 msgstr "Non se pode obter o texto\n"
 
-#: src/compose.c:1340
+#: src/compose.c:1419
 #, fuzzy
 msgid "Quote mark format error."
 msgstr "Marca de cita para erro."
 
-#: src/compose.c:1352
+#: src/compose.c:1431
 msgid "Message reply/forward format error."
 msgstr "Erro no formato da mensaxe para respostar/redirixir "
 
-#: src/compose.c:1679
+#: src/compose.c:1758
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "o ficheiro %s non existe\n"
 
-#: src/compose.c:1683
+#: src/compose.c:1762
 #, 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:1687
+#: src/compose.c:1766
 #, c-format
 msgid "File %s is empty."
 msgstr "o Ficheiro %s esta valeiro."
 
-#: src/compose.c:1691
+#: src/compose.c:1770
 #, c-format
 msgid "Can't read %s."
 msgstr "Non poido ler %s."
 
-#: src/compose.c:1726
+#: src/compose.c:1805
 #, c-format
 msgid "Message: %s"
 msgstr "Mensaxe: %s"
 
-#: src/compose.c:1797 src/mimeview.c:491
+#: src/compose.c:1876 src/mimeview.c:491
 msgid "Can't get the part of multipart message."
 msgstr "Non se pode obter a parte do mensaxe multipartes."
 
-#: src/compose.c:2188
+#: src/compose.c:2267
 msgid " [Edited]"
 msgstr " [Editado]"
 
-#: src/compose.c:2190
+#: src/compose.c:2269
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Compoñer mensaxe%s"
 
-#: src/compose.c:2193
+#: src/compose.c:2272
 #, c-format
 msgid "Compose message%s"
 msgstr "Compoñer mensaxe%s"
 
-#: src/compose.c:2304
+#: src/compose.c:2383
 msgid "Recipient is not specified."
 msgstr "Non se especificou o destinatario."
 
-#: src/compose.c:2312 src/compose.c:4112 src/mainwindow.c:2144
+#: src/compose.c:2391 src/compose.c:4213 src/mainwindow.c:2153
 #: src/prefs_account.c:703 src/prefs_common.c:850
 msgid "Send"
 msgstr "Enviar"
 
-#: src/compose.c:2313
+#: src/compose.c:2392
 msgid "Subject is empty. Send it anyway?"
 msgstr "o asunto esta valeiro. ¿Enviar de todas formas?"
 
-#: src/compose.c:2364
+#: src/compose.c:2443
 msgid "can't get recipient list."
 msgstr "non se pode obter a lista de destinatarios."
 
-#: src/compose.c:2384
+#: src/compose.c:2463
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -968,26 +1086,26 @@ msgstr ""
 "Non especificó ningunha conta para enviar.\n"
 "Seleccione algunha conta antes de enviar."
 
-#: src/compose.c:2398 src/send_message.c:261
+#: src/compose.c:2477 src/send_message.c:261
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Ocurriu un erro enviando o mensaxe a %s ."
 
-#: src/compose.c:2421
+#: src/compose.c:2500
 msgid "Can't save the message to outbox."
 msgstr "Non se pode gardar a mensaxe en Saida."
 
-#: src/compose.c:2457
+#: src/compose.c:2536
 #, 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:2518 src/compose.c:2739 src/compose.c:2802 src/compose.c:2921
+#: src/compose.c:2597 src/compose.c:2820 src/compose.c:2883 src/compose.c:3003
 #: src/utils.c:2189
 msgid "can't change file mode\n"
 msgstr "non se pode cambiar os permisos de ficheiro\n"
 
-#: src/compose.c:2546
+#: src/compose.c:2627
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -997,140 +1115,140 @@ msgstr ""
 "%s a %s.\n"
 "¿Envia-lo de todo xeito?"
 
-#: src/compose.c:2610
+#: src/compose.c:2691
 msgid "can't write headers\n"
 msgstr "non se poden escribir as cabeceiras\n"
 
-#: src/compose.c:2881
+#: src/compose.c:2963
 msgid "can't remove the old message\n"
 msgstr "non se pode eliminar a mensaxe antiga\n"
 
-#: src/compose.c:2899
+#: src/compose.c:2981
 msgid "queueing message...\n"
 msgstr "poñendo na cola...\n"
 
-#: src/compose.c:2981
+#: src/compose.c:3063
 msgid "can't find queue folder\n"
 msgstr "non podo atopar a carpeta de cola\n"
 
-#: src/compose.c:2988
+#: src/compose.c:3070
 msgid "can't queue the message\n"
 msgstr "a mensaxe non se pode poñer na cola\n"
 
-#: src/compose.c:3547
+#: src/compose.c:3645
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "Message-ID generado: %s\n"
 
-#: src/compose.c:3645
+#: src/compose.c:3743
 msgid "Creating compose window...\n"
 msgstr "Creando fiestra de composicion...\n"
 
-#: src/compose.c:3648 src/compose.c:4598
+#: src/compose.c:3746 src/compose.c:4734
 msgid "MIME type"
 msgstr "Tipo MIME"
 
 #. S_COL_DATE
-#: src/compose.c:3649 src/mimeview.c:150 src/prefs_filter_edit.c:569
+#: src/compose.c:3747 src/mimeview.c:150 src/prefs_filter_edit.c:569
 #: src/prefs_summary_column.c:73 src/select-keys.c:317 src/summaryview.c:386
 msgid "Size"
 msgstr "Tamaño"
 
-#: src/compose.c:3700 src/headerview.c:53 src/summary_search.c:169
+#: src/compose.c:3798 src/headerview.c:53 src/summary_search.c:169
 msgid "From:"
 msgstr "Dende:"
 
-#: src/compose.c:4113
+#: src/compose.c:4214
 msgid "Send message"
 msgstr "Enviar Mensaxe"
 
-#: src/compose.c:4121
+#: src/compose.c:4222
 msgid "Send later"
 msgstr "Enviar mais tarde"
 
-#: src/compose.c:4122
+#: src/compose.c:4223
 msgid "Put into queue folder and send later"
 msgstr "Poñer na cola e enviar mais tarde"
 
-#: src/compose.c:4130
+#: src/compose.c:4231
 msgid "Draft"
 msgstr "Borrador"
 
-#: src/compose.c:4131
+#: src/compose.c:4232
 msgid "Save to draft folder"
 msgstr "Gardar como borrador"
 
-#: src/compose.c:4141 src/compose.c:5382
+#: src/compose.c:4242 src/compose.c:5527
 msgid "Insert"
 msgstr "Inserir"
 
-#: src/compose.c:4142
+#: src/compose.c:4243
 msgid "Insert file"
 msgstr "Inserir ficheiro"
 
-#: src/compose.c:4150
+#: src/compose.c:4251
 msgid "Attach"
 msgstr "Adxuntar"
 
-#: src/compose.c:4151
+#: src/compose.c:4252
 msgid "Attach file"
 msgstr "Adxuntar ficheiro"
 
 #. signature
-#: src/compose.c:4161 src/prefs_account.c:1339 src/prefs_common.c:1261
+#: src/compose.c:4262 src/prefs_account.c:1339 src/prefs_common.c:1273
 msgid "Signature"
 msgstr "Sinatura"
 
-#: src/compose.c:4162
+#: src/compose.c:4263
 msgid "Insert signature"
 msgstr "Inserir sinatura"
 
-#: src/compose.c:4171 src/prefs_common.c:1283 src/prefs_common.c:2165
+#: src/compose.c:4272 src/prefs_common.c:1295 src/prefs_common.c:2177
 msgid "Editor"
 msgstr "Editor"
 
-#: src/compose.c:4172
+#: src/compose.c:4273
 msgid "Edit with external editor"
 msgstr "Editar con un editor externo"
 
-#: src/compose.c:4180
+#: src/compose.c:4281
 msgid "Linewrap"
 msgstr "Recortar"
 
-#: src/compose.c:4181
+#: src/compose.c:4282
 msgid "Wrap all long lines"
 msgstr "Cortar todas as líneas longas"
 
-#: src/compose.c:4492
+#: src/compose.c:4628
 msgid "Invalid MIME type."
 msgstr "Tipo MIME inválido."
 
-#: src/compose.c:4511
+#: src/compose.c:4647
 msgid "File doesn't exist or is empty."
 msgstr "O ficheiro non existe ou está valeiro."
 
-#: src/compose.c:4580
+#: src/compose.c:4716
 msgid "Properties"
 msgstr "Propiedades"
 
-#: src/compose.c:4600
+#: src/compose.c:4736
 msgid "Encoding"
 msgstr "Codificación"
 
-#: src/compose.c:4623 src/prefs_folder_item.c:183
+#: src/compose.c:4759 src/prefs_folder_item.c:183
 msgid "Path"
 msgstr "Ruta"
 
-#: src/compose.c:4624
+#: src/compose.c:4760
 msgid "File name"
 msgstr "Nome de ficheiro"
 
-#: src/compose.c:4778
+#: src/compose.c:4914
 #, 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:4804
+#: src/compose.c:4940
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1141,72 +1259,72 @@ msgstr ""
 "¿Desea terminar o proceso?\n"
 "Id. de proceso: %d"
 
-#: src/compose.c:4817
+#: src/compose.c:4953
 #, c-format
 msgid "Terminated process group id: %d"
 msgstr "Terminado proceso id.: %d"
 
-#: src/compose.c:4818
+#: src/compose.c:4954
 #, c-format
 msgid "Temporary file: %s"
 msgstr "Ficheiro temporal: %s"
 
-#: src/compose.c:4842
+#: src/compose.c:4978
 msgid "Compose: input from monitoring process\n"
 msgstr "Compoñer: entrada dende proceso monitor\n"
 
 #. failed
-#: src/compose.c:4875
+#: src/compose.c:5011
 msgid "Couldn't exec external editor\n"
 msgstr "Non se puido executar o editor externo\n"
 
-#: src/compose.c:4879
+#: src/compose.c:5015
 msgid "Couldn't write to file\n"
 msgstr "Non se puido escribir no ficheiro\n"
 
-#: src/compose.c:4881
+#: src/compose.c:5017
 msgid "Pipe read failed\n"
 msgstr "Fallo lendo tubería\n"
 
-#: src/compose.c:5182 src/compose.c:5190 src/compose.c:5196
+#: src/compose.c:5318 src/compose.c:5326 src/compose.c:5332
 msgid "Can't queue the message."
 msgstr "O mensaxe non se pode poñer na cola."
 
-#: src/compose.c:5287
+#: src/compose.c:5423
 #, fuzzy
 msgid "Select files"
 msgstr "Seleccionar ficheiro"
 
-#: src/compose.c:5309
+#: src/compose.c:5445
 msgid "Select file"
 msgstr "Seleccionar ficheiro"
 
-#: src/compose.c:5344
+#: src/compose.c:5480
 msgid "Discard message"
 msgstr "Descartar Mensaxe"
 
-#: src/compose.c:5345
+#: src/compose.c:5481
 msgid "This message has been modified. discard it?"
 msgstr "Esta mensaxe foi modificado. ¿Desea descartala?"
 
-#: src/compose.c:5346
+#: src/compose.c:5482
 msgid "Discard"
 msgstr "Descartar"
 
-#: src/compose.c:5346
+#: src/compose.c:5482
 msgid "to Draft"
 msgstr "a Borrador"
 
-#: src/compose.c:5379
+#: src/compose.c:5524
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "¿Quere aplicar a plantilla `%s' ?"
 
-#: src/compose.c:5381
+#: src/compose.c:5526
 msgid "Apply template"
 msgstr "Aplicar plantilla"
 
-#: src/compose.c:5382
+#: src/compose.c:5527
 msgid "Replace"
 msgstr "Substituír"
 
@@ -1648,12 +1766,12 @@ msgstr "Establecendo información de carpeta...\n"
 msgid "Setting folder info..."
 msgstr "Establecendo información de carpeta..."
 
-#: src/folderview.c:652 src/mainwindow.c:3190 src/setup.c:81
+#: src/folderview.c:652 src/mainwindow.c:3199 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Revisando carpeta %s%c%s ..."
 
-#: src/folderview.c:656 src/mainwindow.c:3195 src/setup.c:86
+#: src/folderview.c:656 src/mainwindow.c:3204 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Revisando carpeta %s ..."
@@ -2114,7 +2232,7 @@ msgstr "Importar ficheiro LDIF na axenda"
 msgid "Prev"
 msgstr "Anterior"
 
-#: src/importldif.c:761 src/mainwindow.c:2230
+#: src/importldif.c:761 src/mainwindow.c:2239
 msgid "Next"
 msgstr "Seguinte"
 
@@ -2575,7 +2693,8 @@ msgid "/_View/Separate f_older tree"
 msgstr "/_Ver/Separar arb_re de carpetas"
 
 #: src/mainwindow.c:514
-msgid "/_View/Separate m_essage view"
+#, fuzzy
+msgid "/_View/Separate _message view"
 msgstr "/_Ver/Separar vista de m_ensaxes"
 
 #: src/mainwindow.c:516
@@ -2711,432 +2830,349 @@ msgstr "/_Ver/_Ir a/Seguinte Mensaxe e_tiquetada"
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Ver/_Ir a/_Ir a outra carpeta"
 
-#: src/mainwindow.c:568 src/mainwindow.c:575 src/messageview.c:150
-msgid "/_View/_Code set/---"
-msgstr "/_Ver/_Codificación/---"
-
-#: src/mainwindow.c:572 src/messageview.c:154
-msgid "/_View/_Code set"
-msgstr "/_Ver/_Codificación"
-
 #: src/mainwindow.c:573 src/messageview.c:155
-msgid "/_View/_Code set/_Auto detect"
+#, fuzzy
+msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Ver/_Codificación/_Autodetectar"
 
-#: src/mainwindow.c:576 src/messageview.c:158
-msgid "/_View/_Code set/7bit ascii (US-ASC_II)"
-msgstr "/_Ver/_Codificación/ASCII de 7 bits (US-ASC_II)"
-
-#: src/mainwindow.c:579 src/messageview.c:161
-msgid "/_View/_Code set/Unicode (_UTF-8)"
-msgstr "/_Ver/_Codificación/Unicode (_UTF-8)"
-
-#: src/mainwindow.c:582 src/messageview.c:164
-msgid "/_View/_Code set/Western European (ISO-8859-_1)"
-msgstr "/_Ver/_Codificación/Europeo Occidental (ISO-8859-_1)"
-
-#: src/mainwindow.c:584 src/messageview.c:166
-msgid "/_View/_Code set/Western European (ISO-8859-15)"
-msgstr "/_Ver/_Codificación/Europeo Occidental (ISO-8859-_15)"
-
-#: src/mainwindow.c:587 src/messageview.c:169
-msgid "/_View/_Code set/Central European (ISO-8859-_2)"
-msgstr "/_Ver/_Codificación/Centroeuropeo (ISO-8859-_2)"
-
-#: src/mainwindow.c:590 src/messageview.c:172
-msgid "/_View/_Code set/_Baltic (ISO-8859-13)"
-msgstr "/_Ver/_Codificación/Báltico (ISO-8859-13)"
-
-#: src/mainwindow.c:592 src/messageview.c:174
-msgid "/_View/_Code set/Baltic (ISO-8859-_4)"
-msgstr "/_Ver/_Codificación/Báltico (ISO-8859-_4)"
-
-#: src/mainwindow.c:595 src/messageview.c:177
-msgid "/_View/_Code set/Greek (ISO-8859-_7)"
-msgstr "/_Ver/_Codificación/Grego (ISO-8859-_7)"
-
-#: src/mainwindow.c:598 src/messageview.c:180
-msgid "/_View/_Code set/Turkish (ISO-8859-_9)"
-msgstr "/_Ver/_Codificación/Turco (ISO-8859-_9)"
-
-#: src/mainwindow.c:601 src/messageview.c:183
-msgid "/_View/_Code set/Cyrillic (ISO-8859-_5)"
-msgstr "/_Ver/_Codificación/Cirílico (ISO-8859-_5)"
-
-#: src/mainwindow.c:603 src/messageview.c:185
-msgid "/_View/_Code set/Cyrillic (KOI8-_R)"
-msgstr "/_Ver/_Codificación/Cirílico (KOI8-_R)"
-
-#: src/mainwindow.c:605 src/messageview.c:187
+#: src/mainwindow.c:618 src/messageview.c:194
 #, fuzzy
-msgid "/_View/_Code set/Cyrillic (KOI8-U)"
-msgstr "/_Ver/_Codificación/Cirílico (KOI8-_R)"
-
-#: src/mainwindow.c:607 src/messageview.c:189
-msgid "/_View/_Code set/Cyrillic (Windows-1251)"
-msgstr "/_Ver/_Codificación/Cirílico (Windows-1251)"
-
-#: src/mainwindow.c:610 src/messageview.c:192
-msgid "/_View/_Code set/Japanese (ISO-2022-_JP)"
-msgstr "/_Ver/_Codificación/Xaponés (ISO-2022-_JP)"
-
-#: src/mainwindow.c:612 src/messageview.c:194
-msgid "/_View/_Code set/Japanese (ISO-2022-JP-2)"
+msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Ver/_Codificación/Xaponés (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:614 src/messageview.c:196
-msgid "/_View/_Code set/Japanese (_EUC-JP)"
+#: src/mainwindow.c:620 src/messageview.c:196
+#, fuzzy
+msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Ver/_Codificación/Xaponés (_EUC-JP)"
 
-#: src/mainwindow.c:616 src/messageview.c:198
-msgid "/_View/_Code set/Japanese (_Shift__JIS)"
+#: src/mainwindow.c:622 src/messageview.c:198
+#, fuzzy
+msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Ver/_Codificación/Xaponés (_Shift__JIS)"
 
-#: src/mainwindow.c:619 src/messageview.c:201
-msgid "/_View/_Code set/Simplified Chinese (_GB2312)"
-msgstr "/_Ver/_Codificación/Chines simplificado (_GB2312)"
-
-#: src/mainwindow.c:621 src/messageview.c:203
-msgid "/_View/_Code set/Traditional Chinese (_Big5)"
-msgstr "/_Ver/_Codificación/Chines tradicional (_Big5)"
-
-#: src/mainwindow.c:623 src/messageview.c:205
-msgid "/_View/_Code set/Traditional Chinese (EUC-_TW)"
-msgstr "/_Ver/_Codificación/Chines tradicional (EUC-_TW)"
-
-#: src/mainwindow.c:625 src/messageview.c:207
-msgid "/_View/_Code set/Chinese (ISO-2022-_CN)"
+#: src/mainwindow.c:632 src/messageview.c:207
+#, fuzzy
+msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Ver/_Codificación/Chines (ISO-2022-_CN)"
 
-#: src/mainwindow.c:628 src/messageview.c:210
-msgid "/_View/_Code set/Korean (EUC-_KR)"
-msgstr "/_Ver/_Codificación/Coreano (EUC-_KR)"
-
-#: src/mainwindow.c:630 src/messageview.c:212
-msgid "/_View/_Code set/Korean (ISO-2022-KR)"
+#: src/mainwindow.c:638 src/messageview.c:212
+#, fuzzy
+msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Ver/_Codificación/Coreano (ISO-2022-KR)"
 
-#: src/mainwindow.c:633 src/messageview.c:215
-msgid "/_View/_Code set/Thai (TIS-620)"
-msgstr "/_Ver/_Codificación/Tailandés (TIS-620)"
-
-#: src/mainwindow.c:635 src/messageview.c:217
-msgid "/_View/_Code set/Thai (Windows-874)"
-msgstr "/_Ver/_Codificación/Tailandés (Windows-874)"
-
-#: src/mainwindow.c:642 src/summaryview.c:371
+#: src/mainwindow.c:651 src/summaryview.c:371
 msgid "/_View/Open in new _window"
 msgstr "/_Ver/Abrir en fiestra _nova"
 
-#: src/mainwindow.c:643 src/messageview.c:224
+#: src/mainwindow.c:652 src/messageview.c:224
 msgid "/_View/Mess_age source"
 msgstr "/_Ver/Fonte da mens_axe"
 
-#: src/mainwindow.c:644 src/messageview.c:225
+#: src/mainwindow.c:653 src/messageview.c:225
 msgid "/_View/Show all _header"
 msgstr "/_Ver/Mostrar todas as cabeceiras"
 
-#: src/mainwindow.c:646
+#: src/mainwindow.c:655
 msgid "/_View/_Update summary"
 msgstr "/_Ver/Actualizar res_umen"
 
-#: src/mainwindow.c:648 src/messageview.c:227
+#: src/mainwindow.c:657 src/messageview.c:227
 msgid "/_Message"
 msgstr "/_Mensaxe"
 
-#: src/mainwindow.c:649
+#: src/mainwindow.c:658
 #, fuzzy
 msgid "/_Message/Recei_ve"
 msgstr "/_Mensaxe/Re_editar"
 
-#: src/mainwindow.c:650
+#: src/mainwindow.c:659
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/_Mensaxe/Recibir de tod_as as contas"
 
-#: src/mainwindow.c:652
+#: src/mainwindow.c:661
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/_Mensaxe/Recibir de tod_as as contas"
 
-#: src/mainwindow.c:654
+#: src/mainwindow.c:663
 #, fuzzy
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/_Mensaxe/_Cancelar recepción"
 
-#: src/mainwindow.c:656
+#: src/mainwindow.c:665
 #, fuzzy
 msgid "/_Message/Recei_ve/---"
 msgstr "/_Mensaxe/Re_editar"
 
-#: src/mainwindow.c:657
+#: src/mainwindow.c:666
 msgid "/_Message/_Send queued messages"
 msgstr "/_Mensaxe/Enviar mensa_xes da cola"
 
-#: src/mainwindow.c:658 src/mainwindow.c:660 src/mainwindow.c:667
-#: src/mainwindow.c:672 src/mainwindow.c:676 src/mainwindow.c:685
+#: src/mainwindow.c:667 src/mainwindow.c:669 src/mainwindow.c:676
+#: src/mainwindow.c:681 src/mainwindow.c:685 src/mainwindow.c:694
 #: src/messageview.c:230 src/messageview.c:238 src/messageview.c:243
 msgid "/_Message/---"
 msgstr "/_Mensaxe/---"
 
-#: src/mainwindow.c:659 src/messageview.c:228
+#: src/mainwindow.c:668 src/messageview.c:228
 msgid "/_Message/Compose _new message"
 msgstr "/_Mensaxe/Compoñer _nova mensaxe"
 
-#: src/mainwindow.c:661 src/messageview.c:231
+#: src/mainwindow.c:670 src/messageview.c:231
 msgid "/_Message/_Reply"
 msgstr "/_Mensaxe/_Respostar"
 
-#: src/mainwindow.c:662
+#: src/mainwindow.c:671
 msgid "/_Message/Repl_y to"
 msgstr "/_Mensaxe/Respos_tar a"
 
-#: src/mainwindow.c:663 src/messageview.c:232
+#: src/mainwindow.c:672 src/messageview.c:232
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Mensaxe/Respos_tar a/A _todos"
 
-#: src/mainwindow.c:664 src/messageview.c:234
+#: src/mainwindow.c:673 src/messageview.c:234
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Mensaxe/Respos_tar a/Ó _remitente"
 
-#: src/mainwindow.c:665 src/messageview.c:236
+#: src/mainwindow.c:674 src/messageview.c:236
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Mensaxe/Respos_tar a/Á _lista de correo"
 
-#: src/mainwindow.c:668 src/messageview.c:239
+#: src/mainwindow.c:677 src/messageview.c:239
 msgid "/_Message/_Forward"
 msgstr "/_Mensaxe/_Reenviar"
 
-#: src/mainwindow.c:669 src/messageview.c:240
+#: src/mainwindow.c:678 src/messageview.c:240
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Mensaxe/Reen_viar como adxunto"
 
-#: src/mainwindow.c:671 src/messageview.c:242
+#: src/mainwindow.c:680 src/messageview.c:242
 msgid "/_Message/Redirec_t"
 msgstr "/_Mensaxe/Red_irixir"
 
-#: src/mainwindow.c:673
+#: src/mainwindow.c:682
 msgid "/_Message/M_ove..."
 msgstr "/_Mensaxe/M_over..."
 
-#: src/mainwindow.c:674
+#: src/mainwindow.c:683
 msgid "/_Message/_Copy..."
 msgstr "/_Mensaxe/_Copiar..."
 
-#: src/mainwindow.c:675
+#: src/mainwindow.c:684
 msgid "/_Message/_Delete"
 msgstr "/_Mensaxe/_Borrar"
 
-#: src/mainwindow.c:677
+#: src/mainwindow.c:686
 msgid "/_Message/_Mark"
 msgstr "/_Mensaxe/_Marcar"
 
-#: src/mainwindow.c:678
+#: src/mainwindow.c:687
 msgid "/_Message/_Mark/_Mark"
 msgstr "/_Mensaxe/_Marcar/_Marcar"
 
-#: src/mainwindow.c:679
+#: src/mainwindow.c:688
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/_Mensaxe/_Marcar/_Desmarcar"
 
-#: src/mainwindow.c:680
+#: src/mainwindow.c:689
 msgid "/_Message/_Mark/---"
 msgstr "/_Mensaxe/_Marcar/---"
 
-#: src/mainwindow.c:681
+#: src/mainwindow.c:690
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/_Mensaxe/_Marcar/Marcar como non leído"
 
-#: src/mainwindow.c:682
+#: src/mainwindow.c:691
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/_Mensaxe/_Marcar/Marcar como leído"
 
-#: src/mainwindow.c:684
+#: src/mainwindow.c:693
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/_Mensaxe/_Marcar/Marcar todo como leído"
 
-#: src/mainwindow.c:686 src/messageview.c:244
+#: src/mainwindow.c:695 src/messageview.c:244
 msgid "/_Message/Re-_edit"
 msgstr "/_Mensaxe/Re_editar"
 
-#: src/mainwindow.c:690 src/messageview.c:248
+#: src/mainwindow.c:699 src/messageview.c:248
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/_Ferramentas/Engadir _remitente á axenda"
 
-#: src/mainwindow.c:693
+#: src/mainwindow.c:702
 #, fuzzy
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/_Ferramentas/_Filtrar Mensaxes"
 
-#: src/mainwindow.c:695
+#: src/mainwindow.c:704
 #, fuzzy
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Ferramentas/_Filtrar Mensaxes"
 
-#: src/mainwindow.c:697 src/messageview.c:251
+#: src/mainwindow.c:706 src/messageview.c:251
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Ferramentas/_Crear Regra de filtrado"
 
-#: src/mainwindow.c:698 src/messageview.c:253
+#: src/mainwindow.c:707 src/messageview.c:253
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Ferramentas/_Crear Regra de filtrado/_Automáticamente"
 
-#: src/mainwindow.c:700 src/messageview.c:255
+#: src/mainwindow.c:709 src/messageview.c:255
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Ferramentas/_Crear Regra de filtrado/Baseada en _Dende"
 
-#: src/mainwindow.c:702 src/messageview.c:257
+#: src/mainwindow.c:711 src/messageview.c:257
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Ferramentas/_Crear Regra de filtrado/Baseada en _Para"
 
-#: src/mainwindow.c:704 src/messageview.c:259
+#: src/mainwindow.c:713 src/messageview.c:259
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Ferramentas/_Crear Regra de filtrado/Baseada no _Asunto"
 
-#: src/mainwindow.c:709
+#: src/mainwindow.c:718
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/_Ferramentas/Borrar as mensaxes re_petidas"
 
-#: src/mainwindow.c:712
+#: src/mainwindow.c:721
 msgid "/_Tools/E_xecute"
 msgstr "/_Ferramentas/E_xecutar"
 
-#: src/mainwindow.c:714
+#: src/mainwindow.c:723
 msgid "/_Tools/_Log window"
 msgstr "/_Ferramentas/_Fiestra de traza"
 
-#: src/mainwindow.c:716
+#: src/mainwindow.c:725
 msgid "/_Configuration"
 msgstr "/_Configuración"
 
-#: src/mainwindow.c:717
+#: src/mainwindow.c:726
 msgid "/_Configuration/_Common preferences..."
 msgstr "/_Configuración/Preferencias _comuns..."
 
-#: src/mainwindow.c:719
+#: src/mainwindow.c:728
 msgid "/_Configuration/_Filter setting..."
 msgstr "/_Configuración/Preferencias de _filtrado..."
 
-#: src/mainwindow.c:721
+#: src/mainwindow.c:730
 msgid "/_Configuration/_Template..."
 msgstr "/_Configuración/_Plantillas ..."
 
-#: src/mainwindow.c:722
+#: src/mainwindow.c:731
 msgid "/_Configuration/_Actions..."
 msgstr "/_Configuración/_Accions..."
 
-#: src/mainwindow.c:723
+#: src/mainwindow.c:732
 msgid "/_Configuration/---"
 msgstr "/_Configuración/---"
 
-#: src/mainwindow.c:724
+#: src/mainwindow.c:733
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Configuración/_Preferencias da conta actual..."
 
-#: src/mainwindow.c:726
+#: src/mainwindow.c:735
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Configuración/Crear _nova conta..."
 
-#: src/mainwindow.c:728
+#: src/mainwindow.c:737
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Configuración/_Editar contas..."
 
-#: src/mainwindow.c:730
+#: src/mainwindow.c:739
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Configuración/_Cambiar conta actual"
 
-#: src/mainwindow.c:734
+#: src/mainwindow.c:743
 msgid "/_Help/_Manual"
 msgstr "/_Axuda/_Manual"
 
-#: src/mainwindow.c:735
+#: src/mainwindow.c:744
 msgid "/_Help/_Manual/_English"
 msgstr "/_Axuda/_Manual/_Inglés"
 
-#: src/mainwindow.c:736
+#: src/mainwindow.c:745
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/_Axuda/_Manual/_Xaponés"
 
-#: src/mainwindow.c:737
+#: src/mainwindow.c:746
 msgid "/_Help/_FAQ"
 msgstr "/_Axuda/_FAQ"
 
-#: src/mainwindow.c:738
+#: src/mainwindow.c:747
 msgid "/_Help/_FAQ/_English"
 msgstr "/_Axuda/_FAQ/_Inglés"
 
-#: src/mainwindow.c:739
+#: src/mainwindow.c:748
 msgid "/_Help/_FAQ/_German"
 msgstr "/_Axyuda/_FAQ/_Alemán"
 
-#: src/mainwindow.c:740
+#: src/mainwindow.c:749
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/_Axuda/_FAQ/_Español"
 
-#: src/mainwindow.c:741
+#: src/mainwindow.c:750
 msgid "/_Help/_FAQ/_French"
 msgstr "/_Axuda/_FAQ/_Francés"
 
-#: src/mainwindow.c:742
+#: src/mainwindow.c:751
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/_Axuda/_FAQ/_Italiano"
 
-#: src/mainwindow.c:743
+#: src/mainwindow.c:752
 msgid "/_Help/---"
 msgstr "/_Axuda/---"
 
-#: src/mainwindow.c:783
+#: src/mainwindow.c:792
 msgid "Creating main window...\n"
 msgstr "Creando Fiestra principal...\n"
 
-#: src/mainwindow.c:943
+#: src/mainwindow.c:952
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "MainWindow: fallo solicitando cor %d\n"
 
-#: src/mainwindow.c:1021 src/summaryview.c:1368 src/summaryview.c:1677
+#: src/mainwindow.c:1030 src/summaryview.c:1368 src/summaryview.c:1677
 #: src/summaryview.c:1785 src/summaryview.c:1831 src/summaryview.c:2453
 #: src/summaryview.c:3080 src/summaryview.c:3146 src/summaryview.c:3171
 #: src/summaryview.c:3284
 msgid "done.\n"
 msgstr "feito.\n"
 
-#: src/mainwindow.c:1137 src/mainwindow.c:1178 src/mainwindow.c:1206
+#: src/mainwindow.c:1146 src/mainwindow.c:1187 src/mainwindow.c:1215
 msgid "Untitled"
 msgstr "Sen título"
 
-#: src/mainwindow.c:1207
+#: src/mainwindow.c:1216
 msgid "none"
 msgstr "ningunha"
 
-#: src/mainwindow.c:1257
+#: src/mainwindow.c:1266
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "Cambiando o tipo de separación de fiestra de %d a %d\n"
 
-#: src/mainwindow.c:1477
+#: src/mainwindow.c:1486
 msgid "Offline"
 msgstr ""
 
-#: src/mainwindow.c:1478
+#: src/mainwindow.c:1487
 msgid "You are offline. Go online?"
 msgstr ""
 
-#: src/mainwindow.c:1492
+#: src/mainwindow.c:1501
 #, fuzzy
 msgid "Empty all trash"
 msgstr "Baleirar papeleira"
 
-#: src/mainwindow.c:1493
+#: src/mainwindow.c:1502
 #, fuzzy
 msgid "Empty messages in all trash?"
 msgstr "¿Baleirar todas as mensaxes da papeleira?"
 
-#: src/mainwindow.c:1521
+#: src/mainwindow.c:1530
 msgid "Add mailbox"
 msgstr "Engadir caixa de correo"
 
-#: src/mainwindow.c:1522
+#: src/mainwindow.c:1531
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3146,16 +3182,16 @@ msgstr ""
 "Si xa existe será\n"
 "examinado automáticamente."
 
-#: src/mainwindow.c:1528
+#: src/mainwindow.c:1537
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "a caixa de correo `%s' xa existe."
 
-#: src/mainwindow.c:1533 src/setup.c:57
+#: src/mainwindow.c:1542 src/setup.c:57
 msgid "Mailbox"
 msgstr "Correo"
 
-#: src/mainwindow.c:1539 src/setup.c:63
+#: src/mainwindow.c:1548 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3165,144 +3201,144 @@ msgstr ""
 "Quizáis xa existan os ficheiros ou non teña permisos suficientes para "
 "escribir no directorio."
 
-#: src/mainwindow.c:1912
+#: src/mainwindow.c:1921
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Arbre de carpetas"
 
-#: src/mainwindow.c:1932 src/messageview.c:358
+#: src/mainwindow.c:1941 src/messageview.c:358
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Vista de mensaxe"
 
-#: src/mainwindow.c:2079 src/summaryview.c:340
+#: src/mainwindow.c:2088 src/summaryview.c:340
 msgid "/_Reply"
 msgstr "/_Respostar"
 
-#: src/mainwindow.c:2080
+#: src/mainwindow.c:2089
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "Respostar a todos"
 
-#: src/mainwindow.c:2081
+#: src/mainwindow.c:2090
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/Respon_der a/Ó _remitente"
 
-#: src/mainwindow.c:2082
+#: src/mainwindow.c:2091
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/Respon_der a/Á _lista de correo"
 
-#: src/mainwindow.c:2087 src/summaryview.c:347
+#: src/mainwindow.c:2096 src/summaryview.c:347
 msgid "/_Forward"
 msgstr "/_Reenviar"
 
-#: src/mainwindow.c:2088 src/summaryview.c:348
+#: src/mainwindow.c:2097 src/summaryview.c:348
 msgid "/For_ward as attachment"
 msgstr "/Reen_viar como adxunto"
 
-#: src/mainwindow.c:2089 src/summaryview.c:349
+#: src/mainwindow.c:2098 src/summaryview.c:349
 msgid "/Redirec_t"
 msgstr "/Red_irixir"
 
-#: src/mainwindow.c:2125
+#: src/mainwindow.c:2134
 msgid "Get"
 msgstr "Traer"
 
-#: src/mainwindow.c:2126
+#: src/mainwindow.c:2135
 msgid "Incorporate new mail"
 msgstr "Incorporar correo novo"
 
-#: src/mainwindow.c:2133
+#: src/mainwindow.c:2142
 msgid "Get all"
 msgstr "Traer todo"
 
-#: src/mainwindow.c:2134
+#: src/mainwindow.c:2143
 msgid "Incorporate new mail of all accounts"
 msgstr "Incorporar correo novo de todas as contas"
 
-#: src/mainwindow.c:2145
+#: src/mainwindow.c:2154
 msgid "Send queued message(s)"
 msgstr "Enviar mensaxe(s) na cola"
 
-#: src/mainwindow.c:2155 src/prefs_account.c:705 src/prefs_common.c:852
+#: src/mainwindow.c:2164 src/prefs_account.c:705 src/prefs_common.c:852
 #: src/prefs_folder_item.c:137
 msgid "Compose"
 msgstr "Compoñer"
 
-#: src/mainwindow.c:2156
+#: src/mainwindow.c:2165
 msgid "Compose new message"
 msgstr "Compoñer mensaxe novo"
 
-#: src/mainwindow.c:2164 src/prefs_common.c:1353
+#: src/mainwindow.c:2173 src/prefs_common.c:1365
 msgid "Reply"
 msgstr "Respostar"
 
-#: src/mainwindow.c:2165 src/mainwindow.c:2178
+#: src/mainwindow.c:2174 src/mainwindow.c:2187
 msgid "Reply to the message"
 msgstr "Respostar ó mensaxe"
 
-#: src/mainwindow.c:2183
+#: src/mainwindow.c:2192
 msgid "Reply all"
 msgstr "A todos"
 
-#: src/mainwindow.c:2184
+#: src/mainwindow.c:2193
 msgid "Reply to all"
 msgstr "Respostar a todos"
 
-#: src/mainwindow.c:2192 src/prefs_filter_edit.c:719
+#: src/mainwindow.c:2201 src/prefs_filter_edit.c:719
 msgid "Forward"
 msgstr "Reenviar"
 
-#: src/mainwindow.c:2193 src/mainwindow.c:2206
+#: src/mainwindow.c:2202 src/mainwindow.c:2215
 msgid "Forward the message"
 msgstr "Reenviar o mensaxe"
 
-#: src/mainwindow.c:2213
+#: src/mainwindow.c:2222
 msgid "Delete the message"
 msgstr "Borrar o mensaxe"
 
-#: src/mainwindow.c:2221
+#: src/mainwindow.c:2230
 msgid "Execute"
 msgstr "Executar"
 
-#: src/mainwindow.c:2222
+#: src/mainwindow.c:2231
 msgid "Execute marked process"
 msgstr "Executar o proceso marcado"
 
-#: src/mainwindow.c:2231
+#: src/mainwindow.c:2240
 msgid "Next unread message"
 msgstr "Seguinte non leído"
 
-#: src/mainwindow.c:2242
+#: src/mainwindow.c:2251
 msgid "Prefs"
 msgstr "Preferencias"
 
-#: src/mainwindow.c:2243
+#: src/mainwindow.c:2252
 msgid "Common preferences"
 msgstr "Preferencias comuns"
 
-#: src/mainwindow.c:2250 src/prefs_folder_item.c:258
+#: src/mainwindow.c:2259 src/prefs_folder_item.c:258
 #: src/prefs_folder_item.c:269 src/progressdialog.c:50
 msgid "Account"
 msgstr "conta"
 
-#: src/mainwindow.c:2251
+#: src/mainwindow.c:2260
 msgid "Account setting"
 msgstr "Preferencias da conta"
 
-#: src/mainwindow.c:2425
+#: src/mainwindow.c:2434
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 
-#: src/mainwindow.c:2436
+#: src/mainwindow.c:2445
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 
-#: src/mainwindow.c:2624
+#: src/mainwindow.c:2633
 msgid "Exit"
 msgstr "Sair"
 
-#: src/mainwindow.c:2624
+#: src/mainwindow.c:2633
 msgid "Exit this program?"
 msgstr "¿Sair do programa?"
 
@@ -3428,7 +3464,7 @@ msgstr "Búsqueda concluida"
 msgid "Creating message view...\n"
 msgstr "Creando visor de mensaxe...\n"
 
-#: src/messageview.c:303 src/prefs_common.c:1550
+#: src/messageview.c:303 src/prefs_common.c:1562
 msgid "Text"
 msgstr "Texto"
 
@@ -3441,7 +3477,7 @@ msgstr "Adxuntos"
 msgid "Can't save the file `%s'."
 msgstr "Non podo gardar o ficheiro `%s'."
 
-#: src/messageview.c:697 src/prefs_common.c:2154 src/summaryview.c:2744
+#: src/messageview.c:697 src/prefs_common.c:2166 src/summaryview.c:2744
 msgid "Print"
 msgstr "Imprimir"
 
@@ -3916,7 +3952,7 @@ msgstr "(As mensaxes sen filtrar gardaránse nesta carpeta)"
 msgid "Authentication method"
 msgstr "Método de autenticación"
 
-#: src/prefs_account.c:1123 src/prefs_account.c:1239 src/prefs_common.c:1189
+#: src/prefs_account.c:1123 src/prefs_account.c:1239 src/prefs_common.c:1201
 msgid "Automatic"
 msgstr "Automática"
 
@@ -3940,7 +3976,7 @@ msgstr "Xenerar ID-Mensaxe"
 msgid "Add user-defined header"
 msgstr "Engadir cabeceira de usuario"
 
-#: src/prefs_account.c:1196 src/prefs_common.c:1714 src/prefs_common.c:1739
+#: src/prefs_account.c:1196 src/prefs_common.c:1726 src/prefs_common.c:1751
 msgid " Edit... "
 msgstr " Editar... "
 
@@ -4332,106 +4368,107 @@ msgid "Save sent messages to outbox"
 msgstr "Gardar mensaxes enviados en Saida"
 
 #: src/prefs_common.c:1113
-msgid "Outgoing codeset"
+#, fuzzy
+msgid "Outgoing encoding"
 msgstr "Codificación para enviar"
 
 #: src/prefs_common.c:1128
 msgid "Automatic (Recommended)"
 msgstr "Automático (Recomendado)"
 
-#: src/prefs_common.c:1129
+#: src/prefs_common.c:1130
 msgid "7bit ascii (US-ASCII)"
 msgstr "ASCII de 7 bits (US-ASC_II)"
 
-#: src/prefs_common.c:1130
+#: src/prefs_common.c:1132
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
-#: src/prefs_common.c:1131
+#: src/prefs_common.c:1134
 msgid "Western European (ISO-8859-1)"
 msgstr "Europeo Occidental (ISO-8859-1)"
 
-#: src/prefs_common.c:1132
+#: src/prefs_common.c:1135
 msgid "Western European (ISO-8859-15)"
 msgstr "Europeo Occidental (ISO-8859-15)"
 
-#: src/prefs_common.c:1133
+#: src/prefs_common.c:1137
 msgid "Central European (ISO-8859-2)"
 msgstr "Centroeuropeo (ISO-8859-2)"
 
-#: src/prefs_common.c:1134
+#: src/prefs_common.c:1139
 msgid "Baltic (ISO-8859-13)"
 msgstr "Báltico (ISO-8859-13)"
 
-#: src/prefs_common.c:1135
+#: src/prefs_common.c:1140
 msgid "Baltic (ISO-8859-4)"
 msgstr "Báltico (ISO-8859-4)"
 
-#: src/prefs_common.c:1136
+#: src/prefs_common.c:1142
 msgid "Greek (ISO-8859-7)"
 msgstr "Grego (ISO-8859-7)"
 
-#: src/prefs_common.c:1137
+#: src/prefs_common.c:1144
 msgid "Turkish (ISO-8859-9)"
 msgstr "Turco (ISO-8859-9)"
 
-#: src/prefs_common.c:1138
+#: src/prefs_common.c:1146
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Cirílico (ISO-8859-5)"
 
-#: src/prefs_common.c:1139
+#: src/prefs_common.c:1147
 msgid "Cyrillic (KOI8-R)"
 msgstr "Cirílico (KOI8-R)"
 
-#: src/prefs_common.c:1140
-msgid "Cyrillic (Windows-1251)"
-msgstr "Cirílico (Windows-1251)"
-
-#: src/prefs_common.c:1141
+#: src/prefs_common.c:1148
 msgid "Cyrillic (KOI8-U)"
 msgstr "Cirílico (KOI8-U)"
 
-#: src/prefs_common.c:1142
+#: src/prefs_common.c:1149
+msgid "Cyrillic (Windows-1251)"
+msgstr "Cirílico (Windows-1251)"
+
+#: src/prefs_common.c:1151
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Xaponés (ISO-2022-JP)"
 
-#: src/prefs_common.c:1144
+#: src/prefs_common.c:1153
 msgid "Japanese (EUC-JP)"
 msgstr "Xaponés (EUC-JP)"
 
-#: src/prefs_common.c:1145
+#: src/prefs_common.c:1154
 msgid "Japanese (Shift_JIS)"
 msgstr "Xaponés (Shift_JIS)"
 
-#: src/prefs_common.c:1147
+#: src/prefs_common.c:1157
 msgid "Simplified Chinese (GB2312)"
 msgstr "Chines simplificado (GB2312)"
 
-#: src/prefs_common.c:1148
+#: src/prefs_common.c:1158
 msgid "Traditional Chinese (Big5)"
 msgstr "Chines tradicional (Big5)"
 
-#: src/prefs_common.c:1150
+#: src/prefs_common.c:1160
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Chines tradicional (EUC-TW)"
 
-#: src/prefs_common.c:1151
+#: src/prefs_common.c:1161
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Chines (ISO-2022-CN)"
 
-#: src/prefs_common.c:1153
+#: src/prefs_common.c:1164
 msgid "Korean (EUC-KR)"
 msgstr "Coreano (EUC-KR)"
 
-#: src/prefs_common.c:1154
+#: src/prefs_common.c:1166
 msgid "Thai (TIS-620)"
 msgstr "Tailandés (TIS-620)"
 
-#: src/prefs_common.c:1155
+#: src/prefs_common.c:1167
 msgid "Thai (Windows-874)"
 msgstr "Tailandés (Windows-874)"
 
-#: src/prefs_common.c:1165
+#: src/prefs_common.c:1177
 #, fuzzy
 msgid ""
 "If `Automatic' is selected, the optimal encoding for the current locale will "
@@ -4440,11 +4477,11 @@ msgstr ""
 "Si se selecciona `Automático' utilizarase a\n"
 "codificación óptima para a localización actual."
 
-#: src/prefs_common.c:1179
+#: src/prefs_common.c:1191
 msgid "Transfer encoding"
 msgstr "Codificación de transferencia"
 
-#: src/prefs_common.c:1202
+#: src/prefs_common.c:1214
 #, fuzzy
 msgid ""
 "Specify Content-Transfer-Encoding used when message body contains non-ASCII "
@@ -4453,118 +4490,118 @@ msgstr ""
 "Especificar a codificación de transferencia (Content-Transfer-Encoding)\n"
 "cando o corpo do mensaxe conten caracteres non-ASCII."
 
-#: src/prefs_common.c:1272
+#: src/prefs_common.c:1284
 msgid "Signature separator"
 msgstr "Separador de sinatura"
 
-#: src/prefs_common.c:1281
+#: src/prefs_common.c:1293
 msgid "Insert automatically"
 msgstr "Inserir automáticamente"
 
-#: src/prefs_common.c:1291
+#: src/prefs_common.c:1303
 msgid "Automatically launch the external editor"
 msgstr "Lanzar o editor externo automáticamente"
 
-#: src/prefs_common.c:1301
+#: src/prefs_common.c:1313
 msgid "Undo level"
 msgstr "Niveles de desfacer"
 
-#: src/prefs_common.c:1321
+#: src/prefs_common.c:1333
 msgid "Wrap messages at"
 msgstr "Recortar mensaxes ós"
 
-#: src/prefs_common.c:1333
+#: src/prefs_common.c:1345
 msgid "characters"
 msgstr "caracteres"
 
-#: src/prefs_common.c:1343
+#: src/prefs_common.c:1355
 msgid "Wrap quotation"
 msgstr "Recortar citación"
 
-#: src/prefs_common.c:1349
+#: src/prefs_common.c:1361
 msgid "Wrap on input"
 msgstr "Recortar mentras se escribe"
 
-#: src/prefs_common.c:1351
+#: src/prefs_common.c:1363
 msgid "Wrap before sending"
 msgstr "Recortar antes de enviar"
 
-#: src/prefs_common.c:1361
+#: src/prefs_common.c:1373
 msgid "Automatically select account for replies"
 msgstr "Seleccionar automáticamente a conta para respostar"
 
-#: src/prefs_common.c:1363
+#: src/prefs_common.c:1375
 msgid "Quote message when replying"
 msgstr "Citar a mensaxe ó respostar"
 
-#: src/prefs_common.c:1365
+#: src/prefs_common.c:1377
 msgid "Reply button invokes mailing list reply"
 msgstr "o botón Respostar invoca respostar á lista de correo"
 
 #. reply
-#: src/prefs_common.c:1411
+#: src/prefs_common.c:1423
 msgid "Reply format"
 msgstr "Formato de réplica"
 
-#: src/prefs_common.c:1426 src/prefs_common.c:1468
+#: src/prefs_common.c:1438 src/prefs_common.c:1480
 msgid "Quotation mark"
 msgstr "Marca de citación"
 
 #. forward
-#: src/prefs_common.c:1453
+#: src/prefs_common.c:1465
 msgid "Forward format"
 msgstr "Formato de reenvio"
 
-#: src/prefs_common.c:1500
+#: src/prefs_common.c:1512
 msgid " Description of symbols "
 msgstr " Descripción de símbolos "
 
-#: src/prefs_common.c:1541
+#: src/prefs_common.c:1553
 msgid "Font"
 msgstr "Fonte"
 
-#: src/prefs_common.c:1573
+#: src/prefs_common.c:1585
 msgid "Translate header name (such as `From:', `Subject:')"
 msgstr "Traducir cabeceiras (como `Dende:', `Asunto:')"
 
-#: src/prefs_common.c:1576
+#: src/prefs_common.c:1588
 msgid "Display unread number next to folder name"
 msgstr "Ver o número de non leídas xunto ó nome da carpeta"
 
-#: src/prefs_common.c:1585
+#: src/prefs_common.c:1597
 msgid "Abbreviate newsgroups longer than"
 msgstr "Abreviar nomes de grupos con mais de"
 
-#: src/prefs_common.c:1600
+#: src/prefs_common.c:1612
 msgid "letters"
 msgstr "letras"
 
 #. ---- Summary ----
-#: src/prefs_common.c:1606
+#: src/prefs_common.c:1618
 msgid "Summary View"
 msgstr "Vista resumo"
 
-#: src/prefs_common.c:1615
+#: src/prefs_common.c:1627
 msgid "Display recipient on `From' column if sender is yourself"
 msgstr "Ver destinatario na columna `Dende' si o remitente é vostede mismo"
 
-#: src/prefs_common.c:1617
+#: src/prefs_common.c:1629
 msgid "Expand threads"
 msgstr "Expandir fíos"
 
-#: src/prefs_common.c:1625 src/prefs_common.c:2443 src/prefs_common.c:2481
+#: src/prefs_common.c:1637 src/prefs_common.c:2455 src/prefs_common.c:2493
 msgid "Date format"
 msgstr "Formato de data"
 
-#: src/prefs_common.c:1646
+#: src/prefs_common.c:1658
 msgid " Set display item of summary... "
 msgstr " Elementos visibles no resumo... "
 
-#: src/prefs_common.c:1710
+#: src/prefs_common.c:1722
 msgid "Enable coloration of message"
 msgstr "Permitir cores na mensaxe"
 
-#: src/prefs_common.c:1724
+#: src/prefs_common.c:1736
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
@@ -4572,324 +4609,324 @@ msgstr ""
 "Mostrar alfabéticos e numéricos multi-byte como\n"
 "caracteres ASCII (só para Xaponés)"
 
-#: src/prefs_common.c:1730
+#: src/prefs_common.c:1742
 msgid "Display header pane above message view"
 msgstr "Mostrar panel de cabeceiras sobre a mensaxe"
 
-#: src/prefs_common.c:1737
+#: src/prefs_common.c:1749
 msgid "Display short headers on message view"
 msgstr "cabeceiras breves na vista da mensaxe"
 
-#: src/prefs_common.c:1758
+#: src/prefs_common.c:1770
 msgid "Line space"
 msgstr "Interlineado"
 
-#: src/prefs_common.c:1772 src/prefs_common.c:1810
+#: src/prefs_common.c:1784 src/prefs_common.c:1822
 msgid "pixel(s)"
 msgstr "pixel(s)"
 
-#: src/prefs_common.c:1777
+#: src/prefs_common.c:1789
 msgid "Scroll"
 msgstr "Desplazamento"
 
-#: src/prefs_common.c:1784
+#: src/prefs_common.c:1796
 msgid "Half page"
 msgstr "Media páxina"
 
-#: src/prefs_common.c:1790
+#: src/prefs_common.c:1802
 msgid "Smooth scroll"
 msgstr "Desplazamiento suave"
 
-#: src/prefs_common.c:1796
+#: src/prefs_common.c:1808
 msgid "Step"
 msgstr "Paso"
 
-#: src/prefs_common.c:1816
+#: src/prefs_common.c:1828
 msgid "Images"
 msgstr ""
 
-#: src/prefs_common.c:1824
+#: src/prefs_common.c:1836
 #, fuzzy
 msgid "Resize attached large images to fit in the window"
 msgstr "Redimensionar as imáxes adxuntas"
 
-#: src/prefs_common.c:1826
+#: src/prefs_common.c:1838
 #, fuzzy
 msgid "Display images as inline"
 msgstr "Ver propiedades de cabeceiras"
 
-#: src/prefs_common.c:1871
+#: src/prefs_common.c:1883
 msgid "Automatically check signatures"
 msgstr "Comprobar as sinaturas automáticamente"
 
-#: src/prefs_common.c:1874
+#: src/prefs_common.c:1886
 msgid "Show signature check result in a popup window"
 msgstr "Mostrar diálogo de comprobación de sinatura"
 
-#: src/prefs_common.c:1877
+#: src/prefs_common.c:1889
 msgid "Store passphrase in memory temporarily"
 msgstr "Manter contrasinal en memoria temporalmente"
 
-#: src/prefs_common.c:1892
+#: src/prefs_common.c:1904
 msgid "Expired after"
 msgstr "Expirar despois de"
 
-#: src/prefs_common.c:1905
+#: src/prefs_common.c:1917
 msgid "minute(s) "
 msgstr "minuto(s) "
 
-#: src/prefs_common.c:1918
+#: src/prefs_common.c:1930
 #, 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.c:1932
+#: src/prefs_common.c:1944
 msgid "Grab input while entering a passphrase"
 msgstr "Capturar a entrada mentras se introducen contrasinais"
 
-#: src/prefs_common.c:1937
+#: src/prefs_common.c:1949
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "Mostrar aviso no inicio si non funciona GnuPG"
 
-#: src/prefs_common.c:1989
+#: src/prefs_common.c:2001
 msgid "Always open messages in summary when selected"
 msgstr "Abrir sempre as mensaxes no sumario cando se seleccionan"
 
-#: src/prefs_common.c:1993
+#: src/prefs_common.c:2005
 msgid "Open first unread message when entering a folder"
 msgstr "Abrir a primeira mensaxe non leída ó abrir unha carpeta"
 
-#: src/prefs_common.c:1997
+#: src/prefs_common.c:2009
 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.c:2001
+#: src/prefs_common.c:2013
 msgid "Go to inbox after receiving new mail"
 msgstr "Abrir entrada despois de recibir correo novo"
 
-#: src/prefs_common.c:2009
+#: src/prefs_common.c:2021
 msgid "Execute immediately when moving or deleting messages"
 msgstr "Executar inmediatamente movimentos ou borrados de mensaxes"
 
-#: src/prefs_common.c:2021
+#: src/prefs_common.c:2033
 #, 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.c:2029
+#: src/prefs_common.c:2041
 msgid "Receive dialog"
 msgstr "Diálogo de recepción"
 
-#: src/prefs_common.c:2039
+#: src/prefs_common.c:2051
 msgid "Show receive dialog"
 msgstr "Mostrar diálogo de recepción"
 
-#: src/prefs_common.c:2049
+#: src/prefs_common.c:2061
 msgid "Always"
 msgstr "Sempre"
 
-#: src/prefs_common.c:2050
+#: src/prefs_common.c:2062
 msgid "Only on manual receiving"
 msgstr ""
 
-#: src/prefs_common.c:2052
+#: src/prefs_common.c:2064
 msgid "Never"
 msgstr "Nunca"
 
-#: src/prefs_common.c:2057
+#: src/prefs_common.c:2069
 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.c:2060
+#: src/prefs_common.c:2072
 msgid "Close receive dialog when finished"
 msgstr "Mostrar diálogo de recepción ó finalizar"
 
-#: src/prefs_common.c:2066
+#: src/prefs_common.c:2078
 msgid " Set key bindings... "
 msgstr " Establecer atallos de teclado... "
 
-#: src/prefs_common.c:2122
+#: src/prefs_common.c:2134
 #, 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.c:2131
+#: src/prefs_common.c:2143
 msgid "Web browser"
 msgstr "Navegador web"
 
-#: src/prefs_common.c:2195
+#: src/prefs_common.c:2207
 msgid "Add address to destination when double-clicked"
 msgstr "Engadir dirección ó destino con doble click"
 
-#: src/prefs_common.c:2197
+#: src/prefs_common.c:2209
 msgid "On exit"
 msgstr "Ó sair"
 
-#: src/prefs_common.c:2205
+#: src/prefs_common.c:2217
 msgid "Confirm on exit"
 msgstr "Confirmar ó sair"
 
-#: src/prefs_common.c:2212
+#: src/prefs_common.c:2224
 msgid "Empty trash on exit"
 msgstr "Baleirar papeleira ó sair"
 
-#: src/prefs_common.c:2214
+#: src/prefs_common.c:2226
 msgid "Ask before emptying"
 msgstr "Preguntar antes de baleirar"
 
-#: src/prefs_common.c:2218
+#: src/prefs_common.c:2230
 msgid "Warn if there are queued messages"
 msgstr "Avisar si existen mensaxes na cola"
 
-#: src/prefs_common.c:2224
+#: src/prefs_common.c:2236
 msgid "Socket I/O timeout:"
 msgstr ""
 
-#: src/prefs_common.c:2237
+#: src/prefs_common.c:2249
 msgid "second(s)"
 msgstr ""
 
-#: src/prefs_common.c:2419
+#: src/prefs_common.c:2431
 msgid "the full abbreviated weekday name"
 msgstr "o dia da semana abreviado"
 
-#: src/prefs_common.c:2420
+#: src/prefs_common.c:2432
 msgid "the full weekday name"
 msgstr "o dia da semana completo"
 
-#: src/prefs_common.c:2421
+#: src/prefs_common.c:2433
 msgid "the abbreviated month name"
 msgstr "o nome do mes abreviado"
 
-#: src/prefs_common.c:2422
+#: src/prefs_common.c:2434
 msgid "the full month name"
 msgstr "o nome do mes completo"
 
-#: src/prefs_common.c:2423
+#: src/prefs_common.c:2435
 msgid "the preferred date and time for the current locale"
 msgstr "a data e hora preferida para a localización actual"
 
-#: src/prefs_common.c:2424
+#: src/prefs_common.c:2436
 msgid "the century number (year/100)"
 msgstr "o número de século (año/100)"
 
-#: src/prefs_common.c:2425
+#: src/prefs_common.c:2437
 msgid "the day of the month as a decimal number"
 msgstr "o dia do mes como número decimal"
 
-#: src/prefs_common.c:2426
+#: src/prefs_common.c:2438
 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.c:2427
+#: src/prefs_common.c:2439
 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.c:2428
+#: src/prefs_common.c:2440
 msgid "the day of the year as a decimal number"
 msgstr "o dia do ano como número decimal"
 
-#: src/prefs_common.c:2429
+#: src/prefs_common.c:2441
 msgid "the month as a decimal number"
 msgstr "o mes como número decimal"
 
-#: src/prefs_common.c:2430
+#: src/prefs_common.c:2442
 msgid "the minute as a decimal number"
 msgstr "o minuto como número decimal"
 
-#: src/prefs_common.c:2431
+#: src/prefs_common.c:2443
 msgid "either AM or PM"
 msgstr "AM o PM"
 
-#: src/prefs_common.c:2432
+#: src/prefs_common.c:2444
 msgid "the second as a decimal number"
 msgstr "o segundo como número decimal"
 
-#: src/prefs_common.c:2433
+#: src/prefs_common.c:2445
 msgid "the day of the week as a decimal number"
 msgstr "o dia da semana como número decimal"
 
-#: src/prefs_common.c:2434
+#: src/prefs_common.c:2446
 msgid "the preferred date for the current locale"
 msgstr "a data preferida para a localización actual"
 
-#: src/prefs_common.c:2435
+#: src/prefs_common.c:2447
 msgid "the last two digits of a year"
 msgstr "os dous últimos díxitos do ano"
 
-#: src/prefs_common.c:2436
+#: src/prefs_common.c:2448
 msgid "the year as a decimal number"
 msgstr "o ano como número decimal"
 
-#: src/prefs_common.c:2437
+#: src/prefs_common.c:2449
 msgid "the time zone or name or abbreviation"
 msgstr "zona horaria ou nome ou abreviatura"
 
-#: src/prefs_common.c:2458
+#: src/prefs_common.c:2470
 msgid "Specifier"
 msgstr "Especificador"
 
-#: src/prefs_common.c:2459
+#: src/prefs_common.c:2471
 msgid "Description"
 msgstr "Descripción"
 
-#: src/prefs_common.c:2499
+#: src/prefs_common.c:2511
 msgid "Example"
 msgstr "Exemplo"
 
-#: src/prefs_common.c:2580
+#: src/prefs_common.c:2592
 msgid "Set message colors"
 msgstr "Cores do mensaxe"
 
-#: src/prefs_common.c:2588
+#: src/prefs_common.c:2600
 msgid "Colors"
 msgstr "Cores"
 
-#: src/prefs_common.c:2622
+#: src/prefs_common.c:2634
 msgid "Quoted Text - First Level"
 msgstr "Texto citado - Primer nivel"
 
-#: src/prefs_common.c:2628
+#: src/prefs_common.c:2640
 msgid "Quoted Text - Second Level"
 msgstr "Texto citado - Segundo nivel"
 
-#: src/prefs_common.c:2634
+#: src/prefs_common.c:2646
 msgid "Quoted Text - Third Level"
 msgstr "Texto citado - Tercer nivel"
 
-#: src/prefs_common.c:2640
+#: src/prefs_common.c:2652
 msgid "URI link"
 msgstr "Enlace URI"
 
-#: src/prefs_common.c:2647
+#: src/prefs_common.c:2659
 msgid "Recycle quote colors"
 msgstr "Reutilizar cores de citación"
 
-#: src/prefs_common.c:2707
+#: src/prefs_common.c:2719
 msgid "Pick color for quotation level 1"
 msgstr "Escoller cor para o nivel de citado 1"
 
-#: src/prefs_common.c:2710
+#: src/prefs_common.c:2722
 msgid "Pick color for quotation level 2"
 msgstr "Escoller cor para o nivel de citado 2"
 
-#: src/prefs_common.c:2713
+#: src/prefs_common.c:2725
 msgid "Pick color for quotation level 3"
 msgstr "Escoller cor para o nivel de citado 3"
 
-#: src/prefs_common.c:2716
+#: src/prefs_common.c:2728
 msgid "Pick color for URI"
 msgstr "Escoller cor para URIs"
 
-#: src/prefs_common.c:2853
+#: src/prefs_common.c:2865
 msgid "Description of symbols"
 msgstr "Descripción de símbolos"
 
-#: src/prefs_common.c:2909
+#: src/prefs_common.c:2921
 msgid ""
 "Date\n"
 "From\n"
@@ -4913,11 +4950,11 @@ msgstr ""
 "Grupos de novas\n"
 "ID-Mensaxe"
 
-#: src/prefs_common.c:2922
+#: src/prefs_common.c:2934
 msgid "If x is set, displays expr"
 msgstr "Si x está, mostra expr"
 
-#: src/prefs_common.c:2926
+#: src/prefs_common.c:2938
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -4931,7 +4968,7 @@ msgstr ""
 "Corpo da mensaxe citado sen sinatura\n"
 "o carácter %"
 
-#: src/prefs_common.c:2934
+#: src/prefs_common.c:2946
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -4943,15 +4980,15 @@ msgstr ""
 "Carácter chave aberta\n"
 "Carácter chave pechada"
 
-#: src/prefs_common.c:2971
+#: src/prefs_common.c:2983
 msgid "Font selection"
 msgstr "Selección de fonte"
 
-#: src/prefs_common.c:3035
+#: src/prefs_common.c:3047
 msgid "Key bindings"
 msgstr "Atallos de teclado"
 
-#: src/prefs_common.c:3049
+#: src/prefs_common.c:3061
 msgid ""
 "Select the preset of key bindings.\n"
 "You can also modify each menu's shortcuts by pressing\n"
@@ -4961,11 +4998,11 @@ msgstr ""
 "Se poden modificar tamén os atallos dos menús pulsando\n"
 "calquer tecla(s) ó situar o ratón sobre o elemento do menú."
 
-#: src/prefs_common.c:3061 src/prefs_common.c:3410
+#: src/prefs_common.c:3073 src/prefs_common.c:3422
 msgid "Default"
 msgstr "Por defecto"
 
-#: src/prefs_common.c:3064 src/prefs_common.c:3419
+#: src/prefs_common.c:3076 src/prefs_common.c:3431
 msgid "Old Sylpheed"
 msgstr "Antigos de Sylpheed"
 
@@ -6132,6 +6169,12 @@ msgstr ""
 msgid "writing to %s failed.\n"
 msgstr "fallo escribindo en %s.\n"
 
+#~ msgid "/_View/_Code set/---"
+#~ msgstr "/_Ver/_Codificación/---"
+
+#~ msgid "/_View/_Code set"
+#~ msgstr "/_Ver/_Codificación"
+
 #~ msgid "To save this part, pop up the context menu with "
 #~ msgstr "Para gardar esta parte, abra o menu contextual con o "
 
diff --git a/po/hr.po b/po/hr.po
index 77f6059f..7061e5c3 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: 2005-03-15 14:29+0900\n"
+"POT-Creation-Date: 2005-03-16 14:47+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"
@@ -96,7 +96,7 @@ msgstr ""
 "S one račune s kojih želite skinuti poštu sa `Primi sve'."
 
 #: src/account.c:638 src/addressadd.c:186 src/addressbook.c:488
-#: src/compose.c:3650 src/editaddress.c:195 src/editaddress.c:936
+#: src/compose.c:3748 src/editaddress.c:195 src/editaddress.c:936
 #: src/editaddress.c:984 src/editbook.c:191 src/editgroup.c:257
 #: src/editjpilot.c:296 src/editldap.c:300 src/editvcard.c:211
 #: src/mimeview.c:151 src/prefs_filter.c:214 src/prefs_folder_item.c:170
@@ -149,13 +149,13 @@ msgstr "Obriši račun"
 msgid "Do you really want to delete this account?"
 msgstr "Želite li usitinu obrisati ovaj račun?"
 
-#: src/account.c:758 src/compose.c:2551 src/compose.c:4807
+#: src/account.c:758 src/compose.c:2632 src/compose.c:4943
 #: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
 #: src/folderview.c:2156 src/folderview.c:2192
 msgid "Yes"
 msgstr "Da"
 
-#: src/account.c:758 src/compose.c:2551 src/compose.c:4807
+#: src/account.c:758 src/compose.c:2632 src/compose.c:4943
 #: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
 #: src/folderview.c:2156 src/folderview.c:2192
 msgid "+No"
@@ -255,7 +255,7 @@ msgstr ""
 msgid "Add Address to Book"
 msgstr "Dodaj adresu u adresar"
 
-#: src/addressadd.c:196 src/compose.c:4191 src/editaddress.c:196
+#: src/addressadd.c:196 src/compose.c:4292 src/editaddress.c:196
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "Adresa"
@@ -269,7 +269,7 @@ msgstr "Bilješke"
 msgid "Select Address Book Folder"
 msgstr "Odaberite spis adresara"
 
-#: src/addressbook.c:334 src/compose.c:469 src/mainwindow.c:454
+#: src/addressbook.c:334 src/compose.c:477 src/mainwindow.c:454
 #: src/messageview.c:134
 msgid "/_File"
 msgstr "/_Datoteka"
@@ -291,8 +291,8 @@ msgstr "/_Datoteka/Novi _J-Pilot"
 msgid "/_File/New _Server"
 msgstr "/_Datoteka/Novi _poslužitelj"
 
-#: src/addressbook.c:343 src/addressbook.c:346 src/compose.c:474
-#: src/compose.c:479 src/compose.c:483 src/mainwindow.c:471
+#: src/addressbook.c:343 src/addressbook.c:346 src/compose.c:482
+#: src/compose.c:487 src/compose.c:491 src/mainwindow.c:471
 #: src/mainwindow.c:474 src/mainwindow.c:476 src/mainwindow.c:479
 #: src/mainwindow.c:481 src/messageview.c:137
 msgid "/_File/---"
@@ -310,7 +310,7 @@ msgstr "/_Datoteka/_Obriši"
 msgid "/_File/_Save"
 msgstr "/_Datoteka/_Spremi"
 
-#: src/addressbook.c:348 src/compose.c:484 src/messageview.c:138
+#: src/addressbook.c:348 src/compose.c:492 src/messageview.c:138
 msgid "/_File/_Close"
 msgstr "/_Datoteka/_Zatvori"
 
@@ -342,7 +342,7 @@ msgstr "/_Adresa/_Uredi"
 msgid "/_Address/_Delete"
 msgstr "/_Adresa/O_briši"
 
-#: src/addressbook.c:356 src/compose.c:585 src/mainwindow.c:688
+#: src/addressbook.c:356 src/compose.c:664 src/mainwindow.c:697
 #: src/messageview.c:246
 msgid "/_Tools"
 msgstr "/_Alati"
@@ -351,12 +351,12 @@ msgstr "/_Alati"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Datoteka/Unesi _LDIF datoteku"
 
-#: src/addressbook.c:358 src/compose.c:598 src/mainwindow.c:733
+#: src/addressbook.c:358 src/compose.c:677 src/mainwindow.c:742
 #: src/messageview.c:264
 msgid "/_Help"
 msgstr "/_Pomoć"
 
-#: src/addressbook.c:359 src/compose.c:599 src/mainwindow.c:744
+#: src/addressbook.c:359 src/compose.c:678 src/mainwindow.c:753
 #: src/messageview.c:265
 msgid "/_Help/_About"
 msgstr "/_Pomoć/_O"
@@ -373,7 +373,7 @@ msgstr "/Nova _grupa"
 msgid "/New _Folder"
 msgstr "/Novi _spis"
 
-#: src/addressbook.c:381 src/addressbook.c:391 src/compose.c:463
+#: src/addressbook.c:381 src/addressbook.c:391 src/compose.c:471
 #: src/folderview.c:220 src/folderview.c:222 src/folderview.c:226
 #: src/folderview.c:236 src/folderview.c:238 src/folderview.c:240
 #: src/folderview.c:244 src/folderview.c:254 src/folderview.c:256
@@ -383,7 +383,7 @@ msgstr "/Novi _spis"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:382 src/addressbook.c:392 src/compose.c:486
+#: src/addressbook.c:382 src/addressbook.c:392 src/compose.c:494
 #: src/mainwindow.c:485 src/messageview.c:140
 msgid "/_Edit"
 msgstr "/_Uredi"
@@ -396,7 +396,7 @@ msgstr "/_Obriši"
 msgid "E-Mail address"
 msgstr "E-mail adresa"
 
-#: src/addressbook.c:493 src/compose.c:4192 src/prefs_common.c:2186
+#: src/addressbook.c:493 src/compose.c:4293 src/prefs_common.c:2198
 msgid "Address book"
 msgstr "Adresar"
 
@@ -406,7 +406,7 @@ msgstr "Ime:"
 
 #. Buttons
 #: src/addressbook.c:625 src/addressbook.c:1665 src/addressbook.c:1671
-#: src/editaddress.c:878 src/editaddress.c:1011 src/mainwindow.c:2212
+#: src/editaddress.c:878 src/editaddress.c:1011 src/mainwindow.c:2221
 #: src/prefs_actions.c:263 src/prefs_display_header.c:275
 #: src/prefs_display_header.c:330 src/prefs_template.c:227
 msgid "Delete"
@@ -593,7 +593,7 @@ msgstr "Uobičajene adrese"
 msgid "Personal address"
 msgstr "Osobne adrese"
 
-#: src/alertpanel.c:123 src/compose.c:4807 src/main.c:458
+#: src/alertpanel.c:123 src/compose.c:4943 src/main.c:458
 msgid "Notice"
 msgstr "Obavijest"
 
@@ -601,7 +601,7 @@ msgstr "Obavijest"
 msgid "Warning"
 msgstr "Upozorenje"
 
-#: src/alertpanel.c:149 src/compose.c:2551 src/inc.c:558
+#: src/alertpanel.c:149 src/compose.c:2632 src/inc.c:558
 msgid "Error"
 msgstr "Greška"
 
@@ -649,321 +649,439 @@ msgstr "Smeđa"
 msgid "None"
 msgstr "Ništa"
 
-#: src/compose.c:461
+#: src/compose.c:469
 msgid "/_Add..."
 msgstr "/_Dodaj..."
 
-#: src/compose.c:462
+#: src/compose.c:470
 msgid "/_Remove"
 msgstr "/_Ukloni"
 
-#: src/compose.c:464 src/folderview.c:228 src/folderview.c:246
+#: src/compose.c:472 src/folderview.c:228 src/folderview.c:246
 #: src/folderview.c:261
 #, fuzzy
 msgid "/_Properties..."
 msgstr "/_Postavke..."
 
-#: src/compose.c:470
+#: src/compose.c:478
 #, fuzzy
 msgid "/_File/_Send"
 msgstr "/_Datoteka/_Spremi"
 
-#: src/compose.c:472
+#: src/compose.c:480
 #, fuzzy
 msgid "/_File/Send _later"
 msgstr "/_Poruka/Pošalji _kasnije"
 
-#: src/compose.c:475
+#: src/compose.c:483
 #, fuzzy
 msgid "/_File/Save to _draft folder"
 msgstr "/_Poruka/Snimi u spis _nedovršeno"
 
-#: src/compose.c:477
+#: src/compose.c:485
 #, fuzzy
 msgid "/_File/Save and _keep editing"
 msgstr "/_Poruka/Pošalji _kasnije"
 
-#: src/compose.c:480
+#: src/compose.c:488
 msgid "/_File/_Attach file"
 msgstr "/_Datoeka/_Priloži datoteku"
 
-#: src/compose.c:481
+#: src/compose.c:489
 msgid "/_File/_Insert file"
 msgstr "/_Datoteka/_Unesi datoteku"
 
-#: src/compose.c:482
+#: src/compose.c:490
 msgid "/_File/Insert si_gnature"
 msgstr "/_Datoteka/Unesi _potpis"
 
-#: src/compose.c:487
+#: src/compose.c:495
 msgid "/_Edit/_Undo"
 msgstr "/_Uredi/_Undo"
 
-#: src/compose.c:488
+#: src/compose.c:496
 msgid "/_Edit/_Redo"
 msgstr "/_Uredi/_Redo"
 
-#: src/compose.c:489 src/compose.c:567 src/mainwindow.c:489
+#: src/compose.c:497 src/compose.c:575 src/mainwindow.c:489
 #: src/messageview.c:143
 msgid "/_Edit/---"
 msgstr "/_Uredi/---"
 
-#: src/compose.c:490
+#: src/compose.c:498
 msgid "/_Edit/Cu_t"
 msgstr "/_Uredi/R_eži"
 
-#: src/compose.c:491 src/mainwindow.c:486 src/messageview.c:141
+#: src/compose.c:499 src/mainwindow.c:486 src/messageview.c:141
 msgid "/_Edit/_Copy"
 msgstr "/_Uredi/_Kopiraj"
 
-#: src/compose.c:492
+#: src/compose.c:500
 msgid "/_Edit/_Paste"
 msgstr "/_Uredi/U_baci"
 
-#: src/compose.c:493
+#: src/compose.c:501
 #, fuzzy
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Uredi/U_baci"
 
-#: src/compose.c:495 src/mainwindow.c:487 src/messageview.c:142
+#: src/compose.c:503 src/mainwindow.c:487 src/messageview.c:142
 msgid "/_Edit/Select _all"
 msgstr "/_Uredi/Odaberi _sve"
 
-#: src/compose.c:496
+#: src/compose.c:504
 #, fuzzy
 msgid "/_Edit/A_dvanced"
 msgstr "/_Uredi/_Undo"
 
-#: src/compose.c:497
+#: src/compose.c:505
 msgid "/_Edit/A_dvanced/Move a character backward"
 msgstr ""
 
-#: src/compose.c:502
+#: src/compose.c:510
 msgid "/_Edit/A_dvanced/Move a character forward"
 msgstr ""
 
-#: src/compose.c:507
+#: src/compose.c:515
 msgid "/_Edit/A_dvanced/Move a word backward"
 msgstr ""
 
-#: src/compose.c:512
+#: src/compose.c:520
 msgid "/_Edit/A_dvanced/Move a word forward"
 msgstr ""
 
-#: src/compose.c:517
+#: src/compose.c:525
 msgid "/_Edit/A_dvanced/Move to beginning of line"
 msgstr ""
 
-#: src/compose.c:522
+#: src/compose.c:530
 msgid "/_Edit/A_dvanced/Move to end of line"
 msgstr ""
 
-#: src/compose.c:527
+#: src/compose.c:535
 msgid "/_Edit/A_dvanced/Move to previous line"
 msgstr ""
 
-#: src/compose.c:532
+#: src/compose.c:540
 msgid "/_Edit/A_dvanced/Move to next line"
 msgstr ""
 
-#: src/compose.c:537
+#: src/compose.c:545
 msgid "/_Edit/A_dvanced/Delete a character backward"
 msgstr ""
 
-#: src/compose.c:542
+#: src/compose.c:550
 msgid "/_Edit/A_dvanced/Delete a character forward"
 msgstr ""
 
-#: src/compose.c:547
+#: src/compose.c:555
 msgid "/_Edit/A_dvanced/Delete a word backward"
 msgstr ""
 
-#: src/compose.c:552
+#: src/compose.c:560
 msgid "/_Edit/A_dvanced/Delete a word forward"
 msgstr ""
 
-#: src/compose.c:557
+#: src/compose.c:565
 msgid "/_Edit/A_dvanced/Delete line"
 msgstr ""
 
-#: src/compose.c:562
+#: src/compose.c:570
 msgid "/_Edit/A_dvanced/Delete to end of line"
 msgstr ""
 
-#: src/compose.c:568
+#: src/compose.c:576
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/_Uredi/Sažmi _poglavlje"
 
-#: src/compose.c:570
+#: src/compose.c:578
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/_Uredi/Sažmi sve duge _linije"
 
-#: src/compose.c:572
+#: src/compose.c:580
 #, fuzzy
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Uredi/_Kopiraj"
 
-#: src/compose.c:573 src/mainwindow.c:494 src/messageview.c:147
+#: src/compose.c:581 src/mainwindow.c:494 src/messageview.c:147
 #: src/summaryview.c:370
 msgid "/_View"
 msgstr "/_Pregled"
 
-#: src/compose.c:574
+#: src/compose.c:582
 #, fuzzy
 msgid "/_View/_To"
 msgstr "/_Pregled/Pr_egledaj izvor"
 
-#: src/compose.c:575
+#: src/compose.c:583
 #, fuzzy
 msgid "/_View/_Cc"
 msgstr "/_Pregled"
 
-#: src/compose.c:576
+#: src/compose.c:584
 #, fuzzy
 msgid "/_View/_Bcc"
 msgstr "/_Pregled/Pr_egledaj izvor"
 
-#: src/compose.c:577
+#: src/compose.c:585
 #, fuzzy
 msgid "/_View/_Reply to"
 msgstr "/_Pregled/_Znakovni standard"
 
-#: src/compose.c:578 src/compose.c:580 src/compose.c:582 src/mainwindow.c:512
-#: src/mainwindow.c:515 src/mainwindow.c:541 src/mainwindow.c:565
-#: src/mainwindow.c:641 src/mainwindow.c:645 src/messageview.c:223
+#: src/compose.c:586 src/compose.c:588 src/compose.c:590 src/compose.c:592
+#: src/mainwindow.c:512 src/mainwindow.c:515 src/mainwindow.c:541
+#: src/mainwindow.c:565 src/mainwindow.c:650 src/mainwindow.c:654
+#: src/messageview.c:223
 msgid "/_View/---"
 msgstr "/_Pregled/---"
 
-#: src/compose.c:579
+#: src/compose.c:587
 #, fuzzy
 msgid "/_View/_Followup to"
 msgstr "/_Poruka/P_roslijedi"
 
-#: src/compose.c:581
+#: src/compose.c:589
 #, fuzzy
 msgid "/_View/R_uler"
 msgstr "/_Pregled/Pr_egledaj izvor"
 
-#: src/compose.c:583
+#: src/compose.c:591
 #, fuzzy
 msgid "/_View/_Attachment"
 msgstr "Prilog"
 
-#: src/compose.c:586 src/mainwindow.c:689 src/messageview.c:247
+#: src/compose.c:598 src/mainwindow.c:572 src/messageview.c:154
+#, fuzzy
+msgid "/_View/Character _encoding"
+msgstr "/_Pregled/Pr_egledaj izvor"
+
+#: src/compose.c:599
+msgid "/_View/Character _encoding/_Automatic"
+msgstr ""
+
+#: src/compose.c:601 src/compose.c:607 src/compose.c:613 src/compose.c:617
+#: src/compose.c:623 src/compose.c:627 src/compose.c:631 src/compose.c:641
+#: src/compose.c:645 src/compose.c:653 src/compose.c:657 src/mainwindow.c:568
+#: src/mainwindow.c:575 src/messageview.c:150
+#, fuzzy
+msgid "/_View/Character _encoding/---"
+msgstr "/_Pregled/Pr_egledaj izvor"
+
+#: src/compose.c:603 src/mainwindow.c:576 src/messageview.c:158
+#, fuzzy
+msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
+msgstr "/_Pregled/_Znakovni standard/7bit ascii (US-ASC_II)"
+
+#: src/compose.c:605 src/mainwindow.c:578 src/messageview.c:161
+#, fuzzy
+msgid "/_View/Character _encoding/Unicode (_UTF-8)"
+msgstr "/_Pregled/_Znakovni standard/Unicode (_UTF-8)"
+
+#: src/compose.c:609 src/mainwindow.c:582 src/messageview.c:164
+#, fuzzy
+msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
+msgstr "/_Pregled/_Znakovni standard/Zapadna Europa (ISO-8859-_1)"
+
+#: src/compose.c:611 src/mainwindow.c:584 src/messageview.c:166
+#, fuzzy
+msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
+msgstr "/_Pregled/_Znakovni standard/Zapadna Europa (ISO-8859-_1)"
+
+#: src/compose.c:615 src/mainwindow.c:588 src/messageview.c:169
+#, fuzzy
+msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
+msgstr "/_Pregled/_Znakovni standard/Srednja Europa (ISO-8859-_2)"
+
+#: src/compose.c:619 src/mainwindow.c:592 src/messageview.c:172
+#, fuzzy
+msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
+msgstr "/_Pregled/_Znakovni standard/_Baltik (ISO-8859-13)"
+
+#: src/compose.c:621 src/mainwindow.c:594 src/messageview.c:174
+#, fuzzy
+msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
+msgstr "/_Pregled/_Znakovni standard/Baltik (ISO-8859-_4)"
+
+#: src/compose.c:625 src/mainwindow.c:598 src/messageview.c:177
+#, fuzzy
+msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
+msgstr "/_Pregled/_Znakovni standard/Grčka (ISO-8859-_7)"
+
+#: src/compose.c:629 src/mainwindow.c:602 src/messageview.c:180
+#, fuzzy
+msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
+msgstr "/_Pregled/_Znakovni standard/Turska (ISO-8859-_9)"
+
+#: src/compose.c:633 src/mainwindow.c:606 src/messageview.c:183
+#, fuzzy
+msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
+msgstr "/_Pregled/_Znakovni standard/Čirilica (ISO-8859-_5)"
+
+#: src/compose.c:635 src/mainwindow.c:608 src/messageview.c:185
+#, fuzzy
+msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
+msgstr "/_Pregled/_Znakovni standard/Čirilica (KOI8-_R)"
+
+#: src/compose.c:637 src/mainwindow.c:610 src/messageview.c:187
+#, fuzzy
+msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
+msgstr "/_Pregled/_Znakovni standard/Čirilica (KOI8-_R)"
+
+#: src/compose.c:639 src/mainwindow.c:612 src/messageview.c:189
+#, fuzzy
+msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
+msgstr "/_Pregled/_Znakovni standard/Čirilica (Windows-1251)"
+
+#: src/compose.c:643 src/mainwindow.c:616 src/messageview.c:192
+#, fuzzy
+msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
+msgstr "/_Pregled/_Znakovni standard/Japan (ISO-2022-_JP)"
+
+#: src/compose.c:647 src/mainwindow.c:626 src/messageview.c:201
+#, fuzzy
+msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
+msgstr "/_Pregled/_Znakovni standard/Pojednostavljeni Kineski (_GB2312)"
+
+#: src/compose.c:649 src/mainwindow.c:628 src/messageview.c:203
+#, fuzzy
+msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
+msgstr "/_Pregled/_Znakovni standard/Tradicionalni Kineski (_Big5)"
+
+#: src/compose.c:651 src/mainwindow.c:630 src/messageview.c:205
+#, fuzzy
+msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
+msgstr "/_Pregled/_Znakovni standard/Tradicionalni Kineski (EUC-_TW)"
+
+#: src/compose.c:655 src/mainwindow.c:636 src/messageview.c:210
+#, fuzzy
+msgid "/_View/Character _encoding/Korean (EUC-_KR)"
+msgstr "/_Pregled/_Znakovni standard/Koreja (EUC-_KR)"
+
+#: src/compose.c:659 src/mainwindow.c:642 src/messageview.c:215
+#, fuzzy
+msgid "/_View/Character _encoding/Thai (TIS-620)"
+msgstr "/_Pregled/_Znakovni standard/Thai (TIS-620)"
+
+#: src/compose.c:661 src/mainwindow.c:644 src/messageview.c:217
+#, fuzzy
+msgid "/_View/Character _encoding/Thai (Windows-874)"
+msgstr "/_Pregled/_Znakovni standard/Thai (Windows-874)"
+
+#: src/compose.c:665 src/mainwindow.c:698 src/messageview.c:247
 #, fuzzy
 msgid "/_Tools/_Address book"
 msgstr "/_Alat/_Adresar"
 
-#: src/compose.c:587
+#: src/compose.c:666
 #, fuzzy
 msgid "/_Tools/_Template"
 msgstr "/_Alat/_Obrazac"
 
-#: src/compose.c:588 src/mainwindow.c:707 src/messageview.c:262
+#: src/compose.c:667 src/mainwindow.c:716 src/messageview.c:262
 #, fuzzy
 msgid "/_Tools/Actio_ns"
 msgstr "/_Izvrši"
 
-#: src/compose.c:589 src/compose.c:593 src/mainwindow.c:692
-#: src/mainwindow.c:706 src/mainwindow.c:708 src/mainwindow.c:711
-#: src/mainwindow.c:713 src/messageview.c:250 src/messageview.c:261
+#: src/compose.c:668 src/compose.c:672 src/mainwindow.c:701
+#: src/mainwindow.c:715 src/mainwindow.c:717 src/mainwindow.c:720
+#: src/mainwindow.c:722 src/messageview.c:250 src/messageview.c:261
 #, fuzzy
 msgid "/_Tools/---"
 msgstr "/_Alat"
 
-#: src/compose.c:590
+#: src/compose.c:669
 #, fuzzy
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/_Uredi/Uredi s _vanjskim uređivačem"
 
-#: src/compose.c:594
+#: src/compose.c:673
 #, fuzzy
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Izvrši"
 
-#: src/compose.c:595
+#: src/compose.c:674
 #, fuzzy
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/_Poruka/_Kriptiraj"
 
-#: src/compose.c:800
+#: src/compose.c:879
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: datoteka ne postoji\n"
 
-#: src/compose.c:899 src/compose.c:958 src/procmsg.c:1303
+#: src/compose.c:978 src/compose.c:1037 src/procmsg.c:1303
 msgid "Can't get text part\n"
 msgstr "Ne mogu dobiti dio tekst\n"
 
-#: src/compose.c:1340
+#: src/compose.c:1419
 msgid "Quote mark format error."
 msgstr "Greška formata citata."
 
-#: src/compose.c:1352
+#: src/compose.c:1431
 msgid "Message reply/forward format error."
 msgstr "Greška poruke odgovori/proslijedi."
 
-#: src/compose.c:1679
+#: src/compose.c:1758
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Datoteka %s ne postoji\n"
 
-#: src/compose.c:1683
+#: src/compose.c:1762
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Ne mogu dobiti veličinu datoteke %s\n"
 
-#: src/compose.c:1687
+#: src/compose.c:1766
 #, fuzzy, c-format
 msgid "File %s is empty."
 msgstr "Datoteka %s je prazna\n"
 
-#: src/compose.c:1691
+#: src/compose.c:1770
 #, fuzzy, c-format
 msgid "Can't read %s."
 msgstr "ne mogu kreirati %s\n"
 
-#: src/compose.c:1726
+#: src/compose.c:1805
 #, c-format
 msgid "Message: %s"
 msgstr "Poruka: %s"
 
-#: src/compose.c:1797 src/mimeview.c:491
+#: src/compose.c:1876 src/mimeview.c:491
 msgid "Can't get the part of multipart message."
 msgstr "Ne mogu dobiti dio višedjelne poruke."
 
-#: src/compose.c:2188
+#: src/compose.c:2267
 msgid " [Edited]"
 msgstr " [Uređeno]"
 
-#: src/compose.c:2190
+#: src/compose.c:2269
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Pisanje poruke%s"
 
-#: src/compose.c:2193
+#: src/compose.c:2272
 #, c-format
 msgid "Compose message%s"
 msgstr "Pisanje poruke%s"
 
-#: src/compose.c:2304
+#: src/compose.c:2383
 msgid "Recipient is not specified."
 msgstr "Nije upisan primatelj."
 
-#: src/compose.c:2312 src/compose.c:4112 src/mainwindow.c:2144
+#: src/compose.c:2391 src/compose.c:4213 src/mainwindow.c:2153
 #: src/prefs_account.c:703 src/prefs_common.c:850
 msgid "Send"
 msgstr "Pošalji"
 
-#: src/compose.c:2313
+#: src/compose.c:2392
 msgid "Subject is empty. Send it anyway?"
 msgstr ""
 
-#: src/compose.c:2364
+#: src/compose.c:2443
 msgid "can't get recipient list."
 msgstr "ne mogu dobiti listu primatelja."
 
-#: src/compose.c:2384
+#: src/compose.c:2463
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -971,169 +1089,169 @@ msgstr ""
 "Račun za slanje pošte nije definiran.\n"
 "Molim, odaberite račun prije slanja."
 
-#: src/compose.c:2398 src/send_message.c:261
+#: src/compose.c:2477 src/send_message.c:261
 #, 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:2421
+#: src/compose.c:2500
 msgid "Can't save the message to outbox."
 msgstr "Ne mogu snimiti poruku u spis poslano."
 
-#: src/compose.c:2457
+#: src/compose.c:2536
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr ""
 
-#: src/compose.c:2518 src/compose.c:2739 src/compose.c:2802 src/compose.c:2921
+#: src/compose.c:2597 src/compose.c:2820 src/compose.c:2883 src/compose.c:3003
 #: src/utils.c:2189
 msgid "can't change file mode\n"
 msgstr "ne mogu promjeniti atribut datoteke\n"
 
-#: src/compose.c:2546
+#: src/compose.c:2627
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
 "Send it as %s anyway?"
 msgstr "Ne mogu promjeniti charset poruke."
 
-#: src/compose.c:2610
+#: src/compose.c:2691
 msgid "can't write headers\n"
 msgstr "ne mogu pisati zaglavlje\n"
 
-#: src/compose.c:2881
+#: src/compose.c:2963
 msgid "can't remove the old message\n"
 msgstr "ne mogu ukloniti staru poruku\n"
 
-#: src/compose.c:2899
+#: src/compose.c:2981
 msgid "queueing message...\n"
 msgstr "odlažem poruku...\n"
 
-#: src/compose.c:2981
+#: src/compose.c:3063
 #, fuzzy
 msgid "can't find queue folder\n"
 msgstr "ne mogu odabrati spis: %s\n"
 
-#: src/compose.c:2988
+#: src/compose.c:3070
 msgid "can't queue the message\n"
 msgstr "ne mogu odložiti poruku\n"
 
-#: src/compose.c:3547
+#: src/compose.c:3645
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "generiran ID-poruke: %s\n"
 
-#: src/compose.c:3645
+#: src/compose.c:3743
 msgid "Creating compose window...\n"
 msgstr "Stvaram prozor za pisanje...\n"
 
-#: src/compose.c:3648 src/compose.c:4598
+#: src/compose.c:3746 src/compose.c:4734
 msgid "MIME type"
 msgstr "MIME tip"
 
 #. S_COL_DATE
-#: src/compose.c:3649 src/mimeview.c:150 src/prefs_filter_edit.c:569
+#: src/compose.c:3747 src/mimeview.c:150 src/prefs_filter_edit.c:569
 #: src/prefs_summary_column.c:73 src/select-keys.c:317 src/summaryview.c:386
 msgid "Size"
 msgstr "Veličina"
 
-#: src/compose.c:3700 src/headerview.c:53 src/summary_search.c:169
+#: src/compose.c:3798 src/headerview.c:53 src/summary_search.c:169
 msgid "From:"
 msgstr "Od:"
 
-#: src/compose.c:4113
+#: src/compose.c:4214
 msgid "Send message"
 msgstr "Pošalji poruku"
 
-#: src/compose.c:4121
+#: src/compose.c:4222
 msgid "Send later"
 msgstr "Pošalji kasnije"
 
-#: src/compose.c:4122
+#: src/compose.c:4223
 msgid "Put into queue folder and send later"
 msgstr "Odloži u spis odloženo i pošalji kasnije"
 
-#: src/compose.c:4130
+#: src/compose.c:4231
 msgid "Draft"
 msgstr "Nedovršeno"
 
-#: src/compose.c:4131
+#: src/compose.c:4232
 msgid "Save to draft folder"
 msgstr "Spremi u spis nedovršeno"
 
-#: src/compose.c:4141 src/compose.c:5382
+#: src/compose.c:4242 src/compose.c:5527
 msgid "Insert"
 msgstr "Unesi"
 
-#: src/compose.c:4142
+#: src/compose.c:4243
 msgid "Insert file"
 msgstr "Unesi datoteku"
 
-#: src/compose.c:4150
+#: src/compose.c:4251
 msgid "Attach"
 msgstr "Priloži"
 
-#: src/compose.c:4151
+#: src/compose.c:4252
 msgid "Attach file"
 msgstr "Priloži datoteku"
 
 #. signature
-#: src/compose.c:4161 src/prefs_account.c:1339 src/prefs_common.c:1261
+#: src/compose.c:4262 src/prefs_account.c:1339 src/prefs_common.c:1273
 msgid "Signature"
 msgstr "Potpis"
 
-#: src/compose.c:4162
+#: src/compose.c:4263
 msgid "Insert signature"
 msgstr "Unesi potpis"
 
-#: src/compose.c:4171 src/prefs_common.c:1283 src/prefs_common.c:2165
+#: src/compose.c:4272 src/prefs_common.c:1295 src/prefs_common.c:2177
 msgid "Editor"
 msgstr "Uređivač"
 
-#: src/compose.c:4172
+#: src/compose.c:4273
 msgid "Edit with external editor"
 msgstr "Uredi s vanjskim uređivačem"
 
-#: src/compose.c:4180
+#: src/compose.c:4281
 msgid "Linewrap"
 msgstr "Sažimanje"
 
-#: src/compose.c:4181
+#: src/compose.c:4282
 #, fuzzy
 msgid "Wrap all long lines"
 msgstr "/_Uredi/Sažmi sve duge _linije"
 
-#: src/compose.c:4492
+#: src/compose.c:4628
 msgid "Invalid MIME type."
 msgstr "Pogrešan MIME tip"
 
-#: src/compose.c:4511
+#: src/compose.c:4647
 msgid "File doesn't exist or is empty."
 msgstr "Datoteka ne postoji ili je prazna."
 
-#: src/compose.c:4580
+#: src/compose.c:4716
 #, fuzzy
 msgid "Properties"
 msgstr "Postavke"
 
-#: src/compose.c:4600
+#: src/compose.c:4736
 msgid "Encoding"
 msgstr "Kodiranje"
 
-#: src/compose.c:4623 src/prefs_folder_item.c:183
+#: src/compose.c:4759 src/prefs_folder_item.c:183
 msgid "Path"
 msgstr "Staza"
 
-#: src/compose.c:4624
+#: src/compose.c:4760
 msgid "File name"
 msgstr "Ime datoteke"
 
-#: src/compose.c:4778
+#: src/compose.c:4914
 #, 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:4804
+#: src/compose.c:4940
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1144,73 +1262,73 @@ msgstr ""
 "Ugasiti proces?\n"
 "grupa procesa: %d"
 
-#: src/compose.c:4817
+#: src/compose.c:4953
 #, c-format
 msgid "Terminated process group id: %d"
 msgstr "Ugašena grupa procesa: %d"
 
-#: src/compose.c:4818
+#: src/compose.c:4954
 #, c-format
 msgid "Temporary file: %s"
 msgstr "Privremena datoteka: %s"
 
-#: src/compose.c:4842
+#: src/compose.c:4978
 msgid "Compose: input from monitoring process\n"
 msgstr "Napiši: unos iz procesa motrenja\n"
 
 #. failed
-#: src/compose.c:4875
+#: src/compose.c:5011
 msgid "Couldn't exec external editor\n"
 msgstr "Ne mogu pokrenuti vanjski uređivač\n"
 
-#: src/compose.c:4879
+#: src/compose.c:5015
 msgid "Couldn't write to file\n"
 msgstr "Ne mogu pisati u datoteku\n"
 
-#: src/compose.c:4881
+#: src/compose.c:5017
 msgid "Pipe read failed\n"
 msgstr "Čitanje pipe-a nije uspjelo\n"
 
-#: src/compose.c:5182 src/compose.c:5190 src/compose.c:5196
+#: src/compose.c:5318 src/compose.c:5326 src/compose.c:5332
 msgid "Can't queue the message."
 msgstr "Ne mogu odložiti poruku."
 
-#: src/compose.c:5287
+#: src/compose.c:5423
 #, fuzzy
 msgid "Select files"
 msgstr "Odaberite datoteku"
 
-#: src/compose.c:5309
+#: src/compose.c:5445
 msgid "Select file"
 msgstr "Odaberite datoteku"
 
-#: src/compose.c:5344
+#: src/compose.c:5480
 msgid "Discard message"
 msgstr "Odbaci poruku"
 
-#: src/compose.c:5345
+#: src/compose.c:5481
 msgid "This message has been modified. discard it?"
 msgstr "Ova poruka je promijenjena, odbaciti?"
 
-#: src/compose.c:5346
+#: src/compose.c:5482
 msgid "Discard"
 msgstr "Odbaci"
 
-#: src/compose.c:5346
+#: src/compose.c:5482
 msgid "to Draft"
 msgstr "u Nedovršeno"
 
-#: src/compose.c:5379
+#: src/compose.c:5524
 #, fuzzy, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Uistinu obrisati ovaj obrazac?"
 
-#: src/compose.c:5381
+#: src/compose.c:5526
 #, fuzzy
 msgid "Apply template"
 msgstr "Briši obrazac"
 
-#: src/compose.c:5382
+#: src/compose.c:5527
 #, fuzzy
 msgid "Replace"
 msgstr "Obrazac"
@@ -1656,12 +1774,12 @@ msgstr "Postavljam info spisa...\n"
 msgid "Setting folder info..."
 msgstr "Postavljam info spisa..."
 
-#: src/folderview.c:652 src/mainwindow.c:3190 src/setup.c:81
+#: src/folderview.c:652 src/mainwindow.c:3199 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Pretražujem spise %s%c%s ..."
 
-#: src/folderview.c:656 src/mainwindow.c:3195 src/setup.c:86
+#: src/folderview.c:656 src/mainwindow.c:3204 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Pretražujem spis %s ..."
@@ -2139,7 +2257,7 @@ msgstr "Unesi LDIF datoteku u Adresar"
 msgid "Prev"
 msgstr "Postav"
 
-#: src/importldif.c:761 src/mainwindow.c:2230
+#: src/importldif.c:761 src/mainwindow.c:2239
 msgid "Next"
 msgstr "Slijedeća"
 
@@ -2614,7 +2732,8 @@ msgid "/_View/Separate f_older tree"
 msgstr "/_Pregled/Odvoji sta_blo spisa"
 
 #: src/mainwindow.c:514
-msgid "/_View/Separate m_essage view"
+#, fuzzy
+msgid "/_View/Separate _message view"
 msgstr "/_Pregled/Odvoji pre_gled poruka"
 
 #: src/mainwindow.c:516
@@ -2783,457 +2902,373 @@ msgstr "/_Održavanje/Idi pre_ma/Slijedeća _label poruka"
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Održavanje/_Idi u drugi spis..."
 
-#: src/mainwindow.c:568 src/mainwindow.c:575 src/messageview.c:150
-msgid "/_View/_Code set/---"
-msgstr "/_Pregled/_Znakovni standard/---"
-
-#: src/mainwindow.c:572 src/messageview.c:154
-msgid "/_View/_Code set"
-msgstr "/_Pregled/_Znakovni standard"
-
 #: src/mainwindow.c:573 src/messageview.c:155
-msgid "/_View/_Code set/_Auto detect"
-msgstr "/_Pregled/_Znakovni standard/_Auto detekcija"
-
-#: src/mainwindow.c:576 src/messageview.c:158
-msgid "/_View/_Code set/7bit ascii (US-ASC_II)"
-msgstr "/_Pregled/_Znakovni standard/7bit ascii (US-ASC_II)"
-
-#: src/mainwindow.c:579 src/messageview.c:161
-msgid "/_View/_Code set/Unicode (_UTF-8)"
-msgstr "/_Pregled/_Znakovni standard/Unicode (_UTF-8)"
-
-#: src/mainwindow.c:582 src/messageview.c:164
-msgid "/_View/_Code set/Western European (ISO-8859-_1)"
-msgstr "/_Pregled/_Znakovni standard/Zapadna Europa (ISO-8859-_1)"
-
-#: src/mainwindow.c:584 src/messageview.c:166
 #, fuzzy
-msgid "/_View/_Code set/Western European (ISO-8859-15)"
-msgstr "/_Pregled/_Znakovni standard/Zapadna Europa (ISO-8859-_1)"
-
-#: src/mainwindow.c:587 src/messageview.c:169
-msgid "/_View/_Code set/Central European (ISO-8859-_2)"
-msgstr "/_Pregled/_Znakovni standard/Srednja Europa (ISO-8859-_2)"
-
-#: src/mainwindow.c:590 src/messageview.c:172
-msgid "/_View/_Code set/_Baltic (ISO-8859-13)"
-msgstr "/_Pregled/_Znakovni standard/_Baltik (ISO-8859-13)"
-
-#: src/mainwindow.c:592 src/messageview.c:174
-msgid "/_View/_Code set/Baltic (ISO-8859-_4)"
-msgstr "/_Pregled/_Znakovni standard/Baltik (ISO-8859-_4)"
-
-#: src/mainwindow.c:595 src/messageview.c:177
-msgid "/_View/_Code set/Greek (ISO-8859-_7)"
-msgstr "/_Pregled/_Znakovni standard/Grčka (ISO-8859-_7)"
-
-#: src/mainwindow.c:598 src/messageview.c:180
-msgid "/_View/_Code set/Turkish (ISO-8859-_9)"
-msgstr "/_Pregled/_Znakovni standard/Turska (ISO-8859-_9)"
-
-#: src/mainwindow.c:601 src/messageview.c:183
-msgid "/_View/_Code set/Cyrillic (ISO-8859-_5)"
-msgstr "/_Pregled/_Znakovni standard/Čirilica (ISO-8859-_5)"
-
-#: src/mainwindow.c:603 src/messageview.c:185
-msgid "/_View/_Code set/Cyrillic (KOI8-_R)"
-msgstr "/_Pregled/_Znakovni standard/Čirilica (KOI8-_R)"
+msgid "/_View/Character _encoding/_Auto detect"
+msgstr "/_Pregled/_Znakovni standard/_Auto detekcija"
 
-#: src/mainwindow.c:605 src/messageview.c:187
+#: src/mainwindow.c:618 src/messageview.c:194
 #, fuzzy
-msgid "/_View/_Code set/Cyrillic (KOI8-U)"
-msgstr "/_Pregled/_Znakovni standard/Čirilica (KOI8-_R)"
-
-#: src/mainwindow.c:607 src/messageview.c:189
-msgid "/_View/_Code set/Cyrillic (Windows-1251)"
-msgstr "/_Pregled/_Znakovni standard/Čirilica (Windows-1251)"
-
-#: src/mainwindow.c:610 src/messageview.c:192
-msgid "/_View/_Code set/Japanese (ISO-2022-_JP)"
-msgstr "/_Pregled/_Znakovni standard/Japan (ISO-2022-_JP)"
-
-#: src/mainwindow.c:612 src/messageview.c:194
-msgid "/_View/_Code set/Japanese (ISO-2022-JP-2)"
+msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Pregled/_Znakovni standard/Japan (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:614 src/messageview.c:196
-msgid "/_View/_Code set/Japanese (_EUC-JP)"
+#: src/mainwindow.c:620 src/messageview.c:196
+#, fuzzy
+msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Pregled/_Znakovni standard/Japan (_EUC-JP)"
 
-#: src/mainwindow.c:616 src/messageview.c:198
-msgid "/_View/_Code set/Japanese (_Shift__JIS)"
+#: src/mainwindow.c:622 src/messageview.c:198
+#, fuzzy
+msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Pregled/_Znakovni standard/Japan (_Shift__JIS)"
 
-#: src/mainwindow.c:619 src/messageview.c:201
-msgid "/_View/_Code set/Simplified Chinese (_GB2312)"
-msgstr "/_Pregled/_Znakovni standard/Pojednostavljeni Kineski (_GB2312)"
-
-#: src/mainwindow.c:621 src/messageview.c:203
-msgid "/_View/_Code set/Traditional Chinese (_Big5)"
-msgstr "/_Pregled/_Znakovni standard/Tradicionalni Kineski (_Big5)"
-
-#: src/mainwindow.c:623 src/messageview.c:205
-msgid "/_View/_Code set/Traditional Chinese (EUC-_TW)"
-msgstr "/_Pregled/_Znakovni standard/Tradicionalni Kineski (EUC-_TW)"
-
-#: src/mainwindow.c:625 src/messageview.c:207
-msgid "/_View/_Code set/Chinese (ISO-2022-_CN)"
+#: src/mainwindow.c:632 src/messageview.c:207
+#, fuzzy
+msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Pregled/_Znakovni standard/Kina (ISO-2022-_CN)"
 
-#: src/mainwindow.c:628 src/messageview.c:210
-msgid "/_View/_Code set/Korean (EUC-_KR)"
-msgstr "/_Pregled/_Znakovni standard/Koreja (EUC-_KR)"
-
-#: src/mainwindow.c:630 src/messageview.c:212
-msgid "/_View/_Code set/Korean (ISO-2022-KR)"
+#: src/mainwindow.c:638 src/messageview.c:212
+#, fuzzy
+msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Pregled/_Znakovni standard/Koreja (ISO-2022-KR)"
 
-#: src/mainwindow.c:633 src/messageview.c:215
-msgid "/_View/_Code set/Thai (TIS-620)"
-msgstr "/_Pregled/_Znakovni standard/Thai (TIS-620)"
-
-#: src/mainwindow.c:635 src/messageview.c:217
-msgid "/_View/_Code set/Thai (Windows-874)"
-msgstr "/_Pregled/_Znakovni standard/Thai (Windows-874)"
-
-#: src/mainwindow.c:642 src/summaryview.c:371
+#: src/mainwindow.c:651 src/summaryview.c:371
 msgid "/_View/Open in new _window"
 msgstr "/_Pregled/Otvori u novom _prozoru"
 
-#: src/mainwindow.c:643 src/messageview.c:224
+#: src/mainwindow.c:652 src/messageview.c:224
 #, fuzzy
 msgid "/_View/Mess_age source"
 msgstr "/_Pregled/Pr_egledaj izvor"
 
-#: src/mainwindow.c:644 src/messageview.c:225
+#: src/mainwindow.c:653 src/messageview.c:225
 msgid "/_View/Show all _header"
 msgstr "/_Pregled/Prikaži s_vo zaglavlje"
 
-#: src/mainwindow.c:646
+#: src/mainwindow.c:655
 #, fuzzy
 msgid "/_View/_Update summary"
 msgstr "/_Pregled/_Znakovni standard"
 
-#: src/mainwindow.c:648 src/messageview.c:227
+#: src/mainwindow.c:657 src/messageview.c:227
 msgid "/_Message"
 msgstr "/_Poruka"
 
-#: src/mainwindow.c:649
+#: src/mainwindow.c:658
 #, fuzzy
 msgid "/_Message/Recei_ve"
 msgstr "/_Pošta/Pre_Uredi"
 
-#: src/mainwindow.c:650
+#: src/mainwindow.c:659
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/_Pošta/Primi poštu sa _svih računa"
 
-#: src/mainwindow.c:652
+#: src/mainwindow.c:661
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/_Pošta/Primi poštu sa _svih računa"
 
-#: src/mainwindow.c:654
+#: src/mainwindow.c:663
 #, fuzzy
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/_Poruka/Pošalji _kasnije"
 
-#: src/mainwindow.c:656
+#: src/mainwindow.c:665
 #, fuzzy
 msgid "/_Message/Recei_ve/---"
 msgstr "/_Pošta/Pre_Uredi"
 
-#: src/mainwindow.c:657
+#: src/mainwindow.c:666
 #, fuzzy
 msgid "/_Message/_Send queued messages"
 msgstr "/_Pošta/Pošalji _odložene poruke"
 
-#: src/mainwindow.c:658 src/mainwindow.c:660 src/mainwindow.c:667
-#: src/mainwindow.c:672 src/mainwindow.c:676 src/mainwindow.c:685
+#: src/mainwindow.c:667 src/mainwindow.c:669 src/mainwindow.c:676
+#: src/mainwindow.c:681 src/mainwindow.c:685 src/mainwindow.c:694
 #: src/messageview.c:230 src/messageview.c:238 src/messageview.c:243
 msgid "/_Message/---"
 msgstr "/_Poruka/---"
 
-#: src/mainwindow.c:659 src/messageview.c:228
+#: src/mainwindow.c:668 src/messageview.c:228
 msgid "/_Message/Compose _new message"
 msgstr "/_Pošta/Kreiraj _novu poruku"
 
-#: src/mainwindow.c:661 src/messageview.c:231
+#: src/mainwindow.c:670 src/messageview.c:231
 msgid "/_Message/_Reply"
 msgstr "/_Pošta/O_dgovori"
 
-#: src/mainwindow.c:662
+#: src/mainwindow.c:671
 #, fuzzy
 msgid "/_Message/Repl_y to"
 msgstr "/_Poruka/O_dgovori"
 
-#: src/mainwindow.c:663 src/messageview.c:232
+#: src/mainwindow.c:672 src/messageview.c:232
 #, fuzzy
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Pošta/Odgovori svi_ma"
 
-#: src/mainwindow.c:664 src/messageview.c:234
+#: src/mainwindow.c:673 src/messageview.c:234
 #, fuzzy
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Pošta/Od_govori pošiljatelju"
 
-#: src/mainwindow.c:665 src/messageview.c:236
+#: src/mainwindow.c:674 src/messageview.c:236
 #, fuzzy
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Pošta/Odgovori svi_ma"
 
-#: src/mainwindow.c:668 src/messageview.c:239
+#: src/mainwindow.c:677 src/messageview.c:239
 msgid "/_Message/_Forward"
 msgstr "/_Pošta/P_roslijedi"
 
-#: src/mainwindow.c:669 src/messageview.c:240
+#: src/mainwindow.c:678 src/messageview.c:240
 #, fuzzy
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Pošta/Proslijedi _kao prilog"
 
-#: src/mainwindow.c:671 src/messageview.c:242
+#: src/mainwindow.c:680 src/messageview.c:242
 #, fuzzy
 msgid "/_Message/Redirec_t"
 msgstr "/_Pošta/Pre_Uredi"
 
-#: src/mainwindow.c:673
+#: src/mainwindow.c:682
 msgid "/_Message/M_ove..."
 msgstr "/_Pošta/Prem_jesti..."
 
-#: src/mainwindow.c:674
+#: src/mainwindow.c:683
 msgid "/_Message/_Copy..."
 msgstr "/_Pošta/Kopir_aj"
 
-#: src/mainwindow.c:675
+#: src/mainwindow.c:684
 msgid "/_Message/_Delete"
 msgstr "/_Pošta/O_briši"
 
-#: src/mainwindow.c:677
+#: src/mainwindow.c:686
 msgid "/_Message/_Mark"
 msgstr "/_Pošta/O_znači"
 
-#: src/mainwindow.c:678
+#: src/mainwindow.c:687
 msgid "/_Message/_Mark/_Mark"
 msgstr "/_Pošta/O_znači/_Označi"
 
-#: src/mainwindow.c:679
+#: src/mainwindow.c:688
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/_Pošta/O_znači/_Ukloni oznaku"
 
-#: src/mainwindow.c:680
+#: src/mainwindow.c:689
 msgid "/_Message/_Mark/---"
 msgstr "/_Pošta/O_znači/---"
 
-#: src/mainwindow.c:681
+#: src/mainwindow.c:690
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/_Pošta/O_znači/Označi kao _nepročitano"
 
-#: src/mainwindow.c:682
+#: src/mainwindow.c:691
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/_Pošta/O_znači/Označi kao _pročitano"
 
-#: src/mainwindow.c:684
+#: src/mainwindow.c:693
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/_Pošta/O_znači/Označi sve _pročitano"
 
-#: src/mainwindow.c:686 src/messageview.c:244
+#: src/mainwindow.c:695 src/messageview.c:244
 msgid "/_Message/Re-_edit"
 msgstr "/_Pošta/Pre_Uredi"
 
-#: src/mainwindow.c:690 src/messageview.c:248
+#: src/mainwindow.c:699 src/messageview.c:248
 #, fuzzy
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/Dod_aj pošiljatelja u adresar"
 
-#: src/mainwindow.c:693
+#: src/mainwindow.c:702
 #, fuzzy
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/_Održavanje/_Filtriraj poštu"
 
-#: src/mainwindow.c:695
+#: src/mainwindow.c:704
 #, fuzzy
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Održavanje/_Filtriraj poštu"
 
-#: src/mainwindow.c:697 src/messageview.c:251
+#: src/mainwindow.c:706 src/messageview.c:251
 #, fuzzy
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Održavanje/_Filtriraj poštu"
 
-#: src/mainwindow.c:698 src/messageview.c:253
+#: src/mainwindow.c:707 src/messageview.c:253
 #, fuzzy
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Održavanje/_Filtriraj poštu"
 
-#: src/mainwindow.c:700 src/messageview.c:255
+#: src/mainwindow.c:709 src/messageview.c:255
 #, fuzzy
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Održavanje/_Filtriraj poštu"
 
-#: src/mainwindow.c:702 src/messageview.c:257
+#: src/mainwindow.c:711 src/messageview.c:257
 #, fuzzy
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Održavanje/_Filtriraj poštu"
 
-#: src/mainwindow.c:704 src/messageview.c:259
+#: src/mainwindow.c:713 src/messageview.c:259
 #, fuzzy
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Održavanje/_Filtriraj poštu"
 
-#: src/mainwindow.c:709
+#: src/mainwindow.c:718
 #, fuzzy
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/_Održavanje/_Obriši duplicirane poruke"
 
-#: src/mainwindow.c:712
+#: src/mainwindow.c:721
 #, fuzzy
 msgid "/_Tools/E_xecute"
 msgstr "/_Izvrši"
 
-#: src/mainwindow.c:714
+#: src/mainwindow.c:723
 #, fuzzy
 msgid "/_Tools/_Log window"
 msgstr "/_Alat/Zapisni prozor"
 
-#: src/mainwindow.c:716
+#: src/mainwindow.c:725
 msgid "/_Configuration"
 msgstr "/_Konfiguracija"
 
-#: src/mainwindow.c:717
+#: src/mainwindow.c:726
 msgid "/_Configuration/_Common preferences..."
 msgstr "/_Konfiguracija/U_običajene postavke..."
 
-#: src/mainwindow.c:719
+#: src/mainwindow.c:728
 msgid "/_Configuration/_Filter setting..."
 msgstr "/_Konfiguracija/Postavke _filtera..."
 
-#: src/mainwindow.c:721
+#: src/mainwindow.c:730
 msgid "/_Configuration/_Template..."
 msgstr "/_Konfiguracija/_Obrazac..."
 
-#: src/mainwindow.c:722
+#: src/mainwindow.c:731
 #, fuzzy
 msgid "/_Configuration/_Actions..."
 msgstr "/_Konfiguracija/_Uredi račune..."
 
-#: src/mainwindow.c:723
+#: src/mainwindow.c:732
 msgid "/_Configuration/---"
 msgstr "/_Konfiguracija/---"
 
-#: src/mainwindow.c:724
+#: src/mainwindow.c:733
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Konfiguracija/_Postavke za trenutni račun..."
 
-#: src/mainwindow.c:726
+#: src/mainwindow.c:735
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Konfiguracija/Kreiraj _novi račun..."
 
-#: src/mainwindow.c:728
+#: src/mainwindow.c:737
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Konfiguracija/_Uredi račune..."
 
-#: src/mainwindow.c:730
+#: src/mainwindow.c:739
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Konfiguracija/Promjeni _trenutni račun"
 
-#: src/mainwindow.c:734
+#: src/mainwindow.c:743
 msgid "/_Help/_Manual"
 msgstr "/_Pomoć/_Priručnik"
 
-#: src/mainwindow.c:735
+#: src/mainwindow.c:744
 msgid "/_Help/_Manual/_English"
 msgstr "/_Pomoć/_Priručnik/_Engleski"
 
-#: src/mainwindow.c:736
+#: src/mainwindow.c:745
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/_Pomoć/_Priručnik/_Japanski"
 
-#: src/mainwindow.c:737
+#: src/mainwindow.c:746
 #, fuzzy
 msgid "/_Help/_FAQ"
 msgstr "/_Pomoć/_O"
 
-#: src/mainwindow.c:738
+#: src/mainwindow.c:747
 #, fuzzy
 msgid "/_Help/_FAQ/_English"
 msgstr "/_Pomoć/_Priručnik/_Engleski"
 
-#: src/mainwindow.c:739
+#: src/mainwindow.c:748
 #, fuzzy
 msgid "/_Help/_FAQ/_German"
 msgstr "/_Pomoć/_Priručnik/_Engleski"
 
-#: src/mainwindow.c:740
+#: src/mainwindow.c:749
 #, fuzzy
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/_Pomoć/_Priručnik/_Engleski"
 
-#: src/mainwindow.c:741
+#: src/mainwindow.c:750
 msgid "/_Help/_FAQ/_French"
 msgstr ""
 
-#: src/mainwindow.c:742
+#: src/mainwindow.c:751
 #, fuzzy
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/_Pomoć/_Priručnik/_Engleski"
 
-#: src/mainwindow.c:743
+#: src/mainwindow.c:752
 msgid "/_Help/---"
 msgstr "/_Pomoć/---"
 
-#: src/mainwindow.c:783
+#: src/mainwindow.c:792
 msgid "Creating main window...\n"
 msgstr "Kreiram glavne prozore...\n"
 
-#: src/mainwindow.c:943
+#: src/mainwindow.c:952
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "MainWindow: prikaz boje %d nije uspio\n"
 
-#: src/mainwindow.c:1021 src/summaryview.c:1368 src/summaryview.c:1677
+#: src/mainwindow.c:1030 src/summaryview.c:1368 src/summaryview.c:1677
 #: src/summaryview.c:1785 src/summaryview.c:1831 src/summaryview.c:2453
 #: src/summaryview.c:3080 src/summaryview.c:3146 src/summaryview.c:3171
 #: src/summaryview.c:3284
 msgid "done.\n"
 msgstr "gotovo.\n"
 
-#: src/mainwindow.c:1137 src/mainwindow.c:1178 src/mainwindow.c:1206
+#: src/mainwindow.c:1146 src/mainwindow.c:1187 src/mainwindow.c:1215
 msgid "Untitled"
 msgstr "Neimenovano"
 
-#: src/mainwindow.c:1207
+#: src/mainwindow.c:1216
 msgid "none"
 msgstr "ništa"
 
-#: src/mainwindow.c:1257
+#: src/mainwindow.c:1266
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr ""
 
-#: src/mainwindow.c:1477
+#: src/mainwindow.c:1486
 msgid "Offline"
 msgstr ""
 
-#: src/mainwindow.c:1478
+#: src/mainwindow.c:1487
 msgid "You are offline. Go online?"
 msgstr ""
 
-#: src/mainwindow.c:1492
+#: src/mainwindow.c:1501
 #, fuzzy
 msgid "Empty all trash"
 msgstr "Isprazni smeće"
 
-#: src/mainwindow.c:1493
+#: src/mainwindow.c:1502
 #, fuzzy
 msgid "Empty messages in all trash?"
 msgstr "Isprazniti sve poruke u smeću?"
 
-#: src/mainwindow.c:1521
+#: src/mainwindow.c:1530
 msgid "Add mailbox"
 msgstr "Dodaj sandučić"
 
-#: src/mainwindow.c:1522
+#: src/mainwindow.c:1531
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3243,16 +3278,16 @@ msgstr ""
 "Ako je unešen postojeći sandučić, biti će\n"
 "automatski pretražen."
 
-#: src/mainwindow.c:1528
+#: src/mainwindow.c:1537
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Sandučić `%s' već postoji."
 
-#: src/mainwindow.c:1533 src/setup.c:57
+#: src/mainwindow.c:1542 src/setup.c:57
 msgid "Mailbox"
 msgstr "Sandučić"
 
-#: src/mainwindow.c:1539 src/setup.c:63
+#: src/mainwindow.c:1548 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3261,147 +3296,147 @@ msgstr ""
 "Kreiranje sandučića propalo.\n"
 "Možda neke datoteke već postoje ili nemate pravo pisanja u direktoriju."
 
-#: src/mainwindow.c:1912
+#: src/mainwindow.c:1921
 msgid "Sylpheed - Folder View"
 msgstr ""
 
-#: src/mainwindow.c:1932 src/messageview.c:358
+#: src/mainwindow.c:1941 src/messageview.c:358
 msgid "Sylpheed - Message View"
 msgstr ""
 
-#: src/mainwindow.c:2079 src/summaryview.c:340
+#: src/mainwindow.c:2088 src/summaryview.c:340
 msgid "/_Reply"
 msgstr "/Od_govori"
 
-#: src/mainwindow.c:2080
+#: src/mainwindow.c:2089
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "Odgovara svima"
 
-#: src/mainwindow.c:2081
+#: src/mainwindow.c:2090
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/Odgovor_i pošiljatelju"
 
-#: src/mainwindow.c:2082
+#: src/mainwindow.c:2091
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/Odgovori svi_ma"
 
-#: src/mainwindow.c:2087 src/summaryview.c:347
+#: src/mainwindow.c:2096 src/summaryview.c:347
 msgid "/_Forward"
 msgstr "/Prosli_jedi"
 
-#: src/mainwindow.c:2088 src/summaryview.c:348
+#: src/mainwindow.c:2097 src/summaryview.c:348
 #, fuzzy
 msgid "/For_ward as attachment"
 msgstr "/Proslijedi kao prilo_g"
 
-#: src/mainwindow.c:2089 src/summaryview.c:349
+#: src/mainwindow.c:2098 src/summaryview.c:349
 #, fuzzy
 msgid "/Redirec_t"
 msgstr "/Pre-_uredi"
 
-#: src/mainwindow.c:2125
+#: src/mainwindow.c:2134
 msgid "Get"
 msgstr "Primi"
 
-#: src/mainwindow.c:2126
+#: src/mainwindow.c:2135
 msgid "Incorporate new mail"
 msgstr "Prima novu poštu"
 
-#: src/mainwindow.c:2133
+#: src/mainwindow.c:2142
 msgid "Get all"
 msgstr "Primi sve"
 
-#: src/mainwindow.c:2134
+#: src/mainwindow.c:2143
 msgid "Incorporate new mail of all accounts"
 msgstr "Prima novu poštu sa svih računa"
 
-#: src/mainwindow.c:2145
+#: src/mainwindow.c:2154
 msgid "Send queued message(s)"
 msgstr "Šalje odložene poruke"
 
-#: src/mainwindow.c:2155 src/prefs_account.c:705 src/prefs_common.c:852
+#: src/mainwindow.c:2164 src/prefs_account.c:705 src/prefs_common.c:852
 #: src/prefs_folder_item.c:137
 msgid "Compose"
 msgstr "Kreiraj"
 
-#: src/mainwindow.c:2156
+#: src/mainwindow.c:2165
 msgid "Compose new message"
 msgstr "Kreiranje nove pošte"
 
-#: src/mainwindow.c:2164 src/prefs_common.c:1353
+#: src/mainwindow.c:2173 src/prefs_common.c:1365
 msgid "Reply"
 msgstr "Odgovori"
 
-#: src/mainwindow.c:2165 src/mainwindow.c:2178
+#: src/mainwindow.c:2174 src/mainwindow.c:2187
 msgid "Reply to the message"
 msgstr "Odgovara na poruku"
 
-#: src/mainwindow.c:2183
+#: src/mainwindow.c:2192
 msgid "Reply all"
 msgstr "Odgovori s."
 
-#: src/mainwindow.c:2184
+#: src/mainwindow.c:2193
 msgid "Reply to all"
 msgstr "Odgovara svima"
 
-#: src/mainwindow.c:2192 src/prefs_filter_edit.c:719
+#: src/mainwindow.c:2201 src/prefs_filter_edit.c:719
 msgid "Forward"
 msgstr "Proslijedi"
 
-#: src/mainwindow.c:2193 src/mainwindow.c:2206
+#: src/mainwindow.c:2202 src/mainwindow.c:2215
 msgid "Forward the message"
 msgstr "Prosljeđuje poruku"
 
-#: src/mainwindow.c:2213
+#: src/mainwindow.c:2222
 msgid "Delete the message"
 msgstr "Briše poruke"
 
-#: src/mainwindow.c:2221
+#: src/mainwindow.c:2230
 msgid "Execute"
 msgstr "Izvrši"
 
-#: src/mainwindow.c:2222
+#: src/mainwindow.c:2231
 msgid "Execute marked process"
 msgstr "Izvršava označene procese"
 
-#: src/mainwindow.c:2231
+#: src/mainwindow.c:2240
 msgid "Next unread message"
 msgstr "Slijedeća nepročitana poruka"
 
-#: src/mainwindow.c:2242
+#: src/mainwindow.c:2251
 msgid "Prefs"
 msgstr "Postav"
 
-#: src/mainwindow.c:2243
+#: src/mainwindow.c:2252
 #, fuzzy
 msgid "Common preferences"
 msgstr "Uobičajene postavke"
 
-#: src/mainwindow.c:2250 src/prefs_folder_item.c:258
+#: src/mainwindow.c:2259 src/prefs_folder_item.c:258
 #: src/prefs_folder_item.c:269 src/progressdialog.c:50
 msgid "Account"
 msgstr "Račun"
 
-#: src/mainwindow.c:2251
+#: src/mainwindow.c:2260
 msgid "Account setting"
 msgstr "Postavke računa"
 
-#: src/mainwindow.c:2425
+#: src/mainwindow.c:2434
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 
-#: src/mainwindow.c:2436
+#: src/mainwindow.c:2445
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 
-#: src/mainwindow.c:2624
+#: src/mainwindow.c:2633
 msgid "Exit"
 msgstr "Izlaz"
 
-#: src/mainwindow.c:2624
+#: src/mainwindow.c:2633
 msgid "Exit this program?"
 msgstr "Izlaz iz ovog programa?"
 
@@ -3527,7 +3562,7 @@ msgstr "Potraga završena"
 msgid "Creating message view...\n"
 msgstr "Kreiram pregled poruka...\n"
 
-#: src/messageview.c:303 src/prefs_common.c:1550
+#: src/messageview.c:303 src/prefs_common.c:1562
 msgid "Text"
 msgstr "Tekst"
 
@@ -3541,7 +3576,7 @@ msgstr "Prilog"
 msgid "Can't save the file `%s'."
 msgstr "Ne mogu premjestiti spis `%s'."
 
-#: src/messageview.c:697 src/prefs_common.c:2154 src/summaryview.c:2744
+#: src/messageview.c:697 src/prefs_common.c:2166 src/summaryview.c:2744
 msgid "Print"
 msgstr "Ispiši"
 
@@ -4023,7 +4058,7 @@ msgstr "(Nefiltrirane poruke biti će spremljene u ovaj spis)"
 msgid "Authentication method"
 msgstr "Autorizacija"
 
-#: src/prefs_account.c:1123 src/prefs_account.c:1239 src/prefs_common.c:1189
+#: src/prefs_account.c:1123 src/prefs_account.c:1239 src/prefs_common.c:1201
 msgid "Automatic"
 msgstr ""
 
@@ -4048,7 +4083,7 @@ msgstr "Generiraj ID poruke"
 msgid "Add user-defined header"
 msgstr "Dodatna zaglavlja"
 
-#: src/prefs_account.c:1196 src/prefs_common.c:1714 src/prefs_common.c:1739
+#: src/prefs_account.c:1196 src/prefs_common.c:1726 src/prefs_common.c:1751
 msgid " Edit... "
 msgstr " Uredi... "
 
@@ -4433,107 +4468,108 @@ msgid "Save sent messages to outbox"
 msgstr "Spremi poslane poruke u poslano"
 
 #: src/prefs_common.c:1113
-msgid "Outgoing codeset"
+#, fuzzy
+msgid "Outgoing encoding"
 msgstr "Izlazni charset"
 
 #: src/prefs_common.c:1128
 msgid "Automatic (Recommended)"
 msgstr "Automatsko (preporučeno)"
 
-#: src/prefs_common.c:1129
+#: src/prefs_common.c:1130
 msgid "7bit ascii (US-ASCII)"
 msgstr "7bit ascii (US-ASCII)"
 
-#: src/prefs_common.c:1130
+#: src/prefs_common.c:1132
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
-#: src/prefs_common.c:1131
+#: src/prefs_common.c:1134
 msgid "Western European (ISO-8859-1)"
 msgstr "Zapadno-Europski (ISO-8859-1)"
 
-#: src/prefs_common.c:1132
+#: src/prefs_common.c:1135
 #, fuzzy
 msgid "Western European (ISO-8859-15)"
 msgstr "Zapadno-Europski (ISO-8859-1)"
 
-#: src/prefs_common.c:1133
+#: src/prefs_common.c:1137
 msgid "Central European (ISO-8859-2)"
 msgstr "Srednje-Europski (ISO-8859-2)"
 
-#: src/prefs_common.c:1134
+#: src/prefs_common.c:1139
 msgid "Baltic (ISO-8859-13)"
 msgstr "Blatički (ISO-8859-13)"
 
-#: src/prefs_common.c:1135
+#: src/prefs_common.c:1140
 msgid "Baltic (ISO-8859-4)"
 msgstr "Blatički (ISO'8859-4)"
 
-#: src/prefs_common.c:1136
+#: src/prefs_common.c:1142
 msgid "Greek (ISO-8859-7)"
 msgstr "Grčki (ISO-8859-7)"
 
-#: src/prefs_common.c:1137
+#: src/prefs_common.c:1144
 msgid "Turkish (ISO-8859-9)"
 msgstr "Turski (ISO-8859-9)"
 
-#: src/prefs_common.c:1138
+#: src/prefs_common.c:1146
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Čirilica (ISO-8859-5)"
 
-#: src/prefs_common.c:1139
+#: src/prefs_common.c:1147
 msgid "Cyrillic (KOI8-R)"
 msgstr "Čirilica (KOI8-R)"
 
-#: src/prefs_common.c:1140
-msgid "Cyrillic (Windows-1251)"
-msgstr "Ćirilica (Windows-1251)"
-
-#: src/prefs_common.c:1141
+#: src/prefs_common.c:1148
 msgid "Cyrillic (KOI8-U)"
 msgstr "Čirilica (KOI8-U)"
 
-#: src/prefs_common.c:1142
+#: src/prefs_common.c:1149
+msgid "Cyrillic (Windows-1251)"
+msgstr "Ćirilica (Windows-1251)"
+
+#: src/prefs_common.c:1151
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Japanski (ISO-2022-JP)"
 
-#: src/prefs_common.c:1144
+#: src/prefs_common.c:1153
 msgid "Japanese (EUC-JP)"
 msgstr "Japanski (EUC-JP)"
 
-#: src/prefs_common.c:1145
+#: src/prefs_common.c:1154
 msgid "Japanese (Shift_JIS)"
 msgstr "Japanski (Shift_JIS)"
 
-#: src/prefs_common.c:1147
+#: src/prefs_common.c:1157
 msgid "Simplified Chinese (GB2312)"
 msgstr "Pojednostavljeni Kineski (GB2312)"
 
-#: src/prefs_common.c:1148
+#: src/prefs_common.c:1158
 msgid "Traditional Chinese (Big5)"
 msgstr "Tradicionalni Kineski (Big5)"
 
-#: src/prefs_common.c:1150
+#: src/prefs_common.c:1160
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Tradicionalni Kineski (EUC-TW)"
 
-#: src/prefs_common.c:1151
+#: src/prefs_common.c:1161
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Kineski (ISO-2022-CN)"
 
-#: src/prefs_common.c:1153
+#: src/prefs_common.c:1164
 msgid "Korean (EUC-KR)"
 msgstr "Korejski (EUC-KR)"
 
-#: src/prefs_common.c:1154
+#: src/prefs_common.c:1166
 msgid "Thai (TIS-620)"
 msgstr "Thai (TIS-620)"
 
-#: src/prefs_common.c:1155
+#: src/prefs_common.c:1167
 msgid "Thai (Windows-874)"
 msgstr "Thai (Windows-874)"
 
-#: src/prefs_common.c:1165
+#: src/prefs_common.c:1177
 #, fuzzy
 msgid ""
 "If `Automatic' is selected, the optimal encoding for the current locale will "
@@ -4542,458 +4578,458 @@ msgstr ""
 "Ako je `Automatski' odabrano, optimalni charset\n"
 "za locale će biti korišten."
 
-#: src/prefs_common.c:1179
+#: src/prefs_common.c:1191
 #, fuzzy
 msgid "Transfer encoding"
 msgstr "Sažmi prije slanja"
 
-#: src/prefs_common.c:1202
+#: src/prefs_common.c:1214
 msgid ""
 "Specify Content-Transfer-Encoding used when message body contains non-ASCII "
 "characters."
 msgstr ""
 
-#: src/prefs_common.c:1272
+#: src/prefs_common.c:1284
 msgid "Signature separator"
 msgstr "Razdjelnik potpisa"
 
-#: src/prefs_common.c:1281
+#: src/prefs_common.c:1293
 msgid "Insert automatically"
 msgstr "Ubaci automatski"
 
-#: src/prefs_common.c:1291
+#: src/prefs_common.c:1303
 msgid "Automatically launch the external editor"
 msgstr "Automatski pokreni vanjski uređivač"
 
-#: src/prefs_common.c:1301
+#: src/prefs_common.c:1313
 msgid "Undo level"
 msgstr ""
 
-#: src/prefs_common.c:1321
+#: src/prefs_common.c:1333
 msgid "Wrap messages at"
 msgstr "Sažmi poruke na"
 
-#: src/prefs_common.c:1333
+#: src/prefs_common.c:1345
 msgid "characters"
 msgstr "znakova"
 
-#: src/prefs_common.c:1343
+#: src/prefs_common.c:1355
 msgid "Wrap quotation"
 msgstr "Sažmi citat"
 
-#: src/prefs_common.c:1349
+#: src/prefs_common.c:1361
 #, fuzzy
 msgid "Wrap on input"
 msgstr "/_Uredi/Sažmi sve duge _linije"
 
-#: src/prefs_common.c:1351
+#: src/prefs_common.c:1363
 msgid "Wrap before sending"
 msgstr "Sažmi prije slanja"
 
-#: src/prefs_common.c:1361
+#: src/prefs_common.c:1373
 msgid "Automatically select account for replies"
 msgstr "Automatski odaberi račun pri odgovaranju"
 
-#: src/prefs_common.c:1363
+#: src/prefs_common.c:1375
 msgid "Quote message when replying"
 msgstr "Citiraj poruku pri odgovaranju"
 
-#: src/prefs_common.c:1365
+#: src/prefs_common.c:1377
 #, fuzzy
 msgid "Reply button invokes mailing list reply"
 msgstr "/Odgovori svi_ma"
 
 #. reply
-#: src/prefs_common.c:1411
+#: src/prefs_common.c:1423
 msgid "Reply format"
 msgstr "Format odgovora"
 
-#: src/prefs_common.c:1426 src/prefs_common.c:1468
+#: src/prefs_common.c:1438 src/prefs_common.c:1480
 msgid "Quotation mark"
 msgstr "Oznaka citata"
 
 #. forward
-#: src/prefs_common.c:1453
+#: src/prefs_common.c:1465
 msgid "Forward format"
 msgstr "Format prosljeđivanja"
 
-#: src/prefs_common.c:1500
+#: src/prefs_common.c:1512
 msgid " Description of symbols "
 msgstr " Objašnjenje simbola "
 
-#: src/prefs_common.c:1541
+#: src/prefs_common.c:1553
 msgid "Font"
 msgstr "Font"
 
-#: src/prefs_common.c:1573
+#: src/prefs_common.c:1585
 msgid "Translate header name (such as `From:', `Subject:')"
 msgstr "Prevedi ime zaglavlja (kao što su `Od:' i `Tema:')"
 
-#: src/prefs_common.c:1576
+#: src/prefs_common.c:1588
 msgid "Display unread number next to folder name"
 msgstr "Prikaži broj nepročitanih poruka kraj imena spisa"
 
-#: src/prefs_common.c:1585
+#: src/prefs_common.c:1597
 msgid "Abbreviate newsgroups longer than"
 msgstr ""
 
-#: src/prefs_common.c:1600
+#: src/prefs_common.c:1612
 #, fuzzy
 msgid "letters"
 msgstr "Obriši"
 
 #. ---- Summary ----
-#: src/prefs_common.c:1606
+#: src/prefs_common.c:1618
 msgid "Summary View"
 msgstr "Pregled održavanja"
 
-#: src/prefs_common.c:1615
+#: src/prefs_common.c:1627
 msgid "Display recipient on `From' column if sender is yourself"
 msgstr "Prikaži primatelja na `Od' ukoliko ste Vi autor"
 
-#: src/prefs_common.c:1617
+#: src/prefs_common.c:1629
 msgid "Expand threads"
 msgstr "Raširi stablo"
 
-#: src/prefs_common.c:1625 src/prefs_common.c:2443 src/prefs_common.c:2481
+#: src/prefs_common.c:1637 src/prefs_common.c:2455 src/prefs_common.c:2493
 msgid "Date format"
 msgstr "Format datuma"
 
-#: src/prefs_common.c:1646
+#: src/prefs_common.c:1658
 msgid " Set display item of summary... "
 msgstr " Postavi pojedinosti prikaza... "
 
-#: src/prefs_common.c:1710
+#: src/prefs_common.c:1722
 msgid "Enable coloration of message"
 msgstr "Omogući poruke u boji"
 
-#: src/prefs_common.c:1724
+#: src/prefs_common.c:1736
 #, 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.c:1730
+#: src/prefs_common.c:1742
 msgid "Display header pane above message view"
 msgstr "Prikaži zaglavlje iznad poruke"
 
-#: src/prefs_common.c:1737
+#: src/prefs_common.c:1749
 msgid "Display short headers on message view"
 msgstr "Prikaži kratko zaglavlje na pregledu poruka"
 
-#: src/prefs_common.c:1758
+#: src/prefs_common.c:1770
 msgid "Line space"
 msgstr "Razmak linija"
 
-#: src/prefs_common.c:1772 src/prefs_common.c:1810
+#: src/prefs_common.c:1784 src/prefs_common.c:1822
 msgid "pixel(s)"
 msgstr "pixel(a)"
 
-#: src/prefs_common.c:1777
+#: src/prefs_common.c:1789
 msgid "Scroll"
 msgstr "Scroll"
 
-#: src/prefs_common.c:1784
+#: src/prefs_common.c:1796
 msgid "Half page"
 msgstr "Pola stranice"
 
-#: src/prefs_common.c:1790
+#: src/prefs_common.c:1802
 msgid "Smooth scroll"
 msgstr "Miran scroll"
 
-#: src/prefs_common.c:1796
+#: src/prefs_common.c:1808
 msgid "Step"
 msgstr "Korak"
 
-#: src/prefs_common.c:1816
+#: src/prefs_common.c:1828
 msgid "Images"
 msgstr ""
 
-#: src/prefs_common.c:1824
+#: src/prefs_common.c:1836
 msgid "Resize attached large images to fit in the window"
 msgstr ""
 
-#: src/prefs_common.c:1826
+#: src/prefs_common.c:1838
 #, fuzzy
 msgid "Display images as inline"
 msgstr "Prikaz postavki zaglavlja"
 
-#: src/prefs_common.c:1871
+#: src/prefs_common.c:1883
 msgid "Automatically check signatures"
 msgstr "Automatski provjeri potpis"
 
-#: src/prefs_common.c:1874
+#: src/prefs_common.c:1886
 msgid "Show signature check result in a popup window"
 msgstr "Prikaži potpis u popup prozoru"
 
-#: src/prefs_common.c:1877
+#: src/prefs_common.c:1889
 msgid "Store passphrase in memory temporarily"
 msgstr ""
 
-#: src/prefs_common.c:1892
+#: src/prefs_common.c:1904
 #, fuzzy
 msgid "Expired after"
 msgstr "Pošalji kasnije"
 
-#: src/prefs_common.c:1905
+#: src/prefs_common.c:1917
 #, fuzzy
 msgid "minute(s) "
 msgstr "minuta"
 
-#: src/prefs_common.c:1918
+#: src/prefs_common.c:1930
 msgid "Setting to '0' will store the passphrase for the whole session."
 msgstr ""
 
-#: src/prefs_common.c:1932
+#: src/prefs_common.c:1944
 msgid "Grab input while entering a passphrase"
 msgstr "Uhvati unos pri upisivanju lozinke"
 
-#: src/prefs_common.c:1937
+#: src/prefs_common.c:1949
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "Prikaži upozorenje na startu ako GnuPG ne radi"
 
-#: src/prefs_common.c:1989
+#: src/prefs_common.c:2001
 #, fuzzy
 msgid "Always open messages in summary when selected"
 msgstr "poruka neće biti primljena\n"
 
-#: src/prefs_common.c:1993
+#: src/prefs_common.c:2005
 msgid "Open first unread message when entering a folder"
 msgstr "Otvori prvu nepročitanu poruku pri ulasku u spis"
 
-#: src/prefs_common.c:1997
+#: src/prefs_common.c:2009
 #, fuzzy
 msgid "Only mark message as read when opened in new window"
 msgstr "/_Pošta/O_tvori u novom prozoru"
 
-#: src/prefs_common.c:2001
+#: src/prefs_common.c:2013
 msgid "Go to inbox after receiving new mail"
 msgstr "Idi u sandučić nakon primanja pošte"
 
-#: src/prefs_common.c:2009
+#: src/prefs_common.c:2021
 msgid "Execute immediately when moving or deleting messages"
 msgstr "Izvrši odmah pri premještanju ili brisanju poruka"
 
-#: src/prefs_common.c:2021
+#: src/prefs_common.c:2033
 #, 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.c:2029
+#: src/prefs_common.c:2041
 #, fuzzy
 msgid "Receive dialog"
 msgstr "Prikaži dijalog primanja"
 
-#: src/prefs_common.c:2039
+#: src/prefs_common.c:2051
 msgid "Show receive dialog"
 msgstr "Prikaži dijalog primanja"
 
-#: src/prefs_common.c:2049
+#: src/prefs_common.c:2061
 msgid "Always"
 msgstr "Uvijek"
 
-#: src/prefs_common.c:2050
+#: src/prefs_common.c:2062
 msgid "Only on manual receiving"
 msgstr ""
 
-#: src/prefs_common.c:2052
+#: src/prefs_common.c:2064
 msgid "Never"
 msgstr "Nikada"
 
-#: src/prefs_common.c:2057
+#: src/prefs_common.c:2069
 msgid "Don't popup error dialog on receive error"
 msgstr ""
 
-#: src/prefs_common.c:2060
+#: src/prefs_common.c:2072
 #, fuzzy
 msgid "Close receive dialog when finished"
 msgstr "Prikaži dijalog primanja"
 
-#: src/prefs_common.c:2066
+#: src/prefs_common.c:2078
 msgid " Set key bindings... "
 msgstr ""
 
-#: src/prefs_common.c:2122
+#: src/prefs_common.c:2134
 #, 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.c:2131
+#: src/prefs_common.c:2143
 msgid "Web browser"
 msgstr ""
 
-#: src/prefs_common.c:2195
+#: src/prefs_common.c:2207
 msgid "Add address to destination when double-clicked"
 msgstr "Dodaj adresu u destinaciju kada se dva put klikne"
 
-#: src/prefs_common.c:2197
+#: src/prefs_common.c:2209
 msgid "On exit"
 msgstr "Na izlazu"
 
-#: src/prefs_common.c:2205
+#: src/prefs_common.c:2217
 msgid "Confirm on exit"
 msgstr "Potvrdi izlaz"
 
-#: src/prefs_common.c:2212
+#: src/prefs_common.c:2224
 msgid "Empty trash on exit"
 msgstr "Isprazni smeće pri izlazu"
 
-#: src/prefs_common.c:2214
+#: src/prefs_common.c:2226
 msgid "Ask before emptying"
 msgstr "Pitaj prije pražnjenja"
 
-#: src/prefs_common.c:2218
+#: src/prefs_common.c:2230
 msgid "Warn if there are queued messages"
 msgstr "Upozori ako ima odloženih poruka"
 
-#: src/prefs_common.c:2224
+#: src/prefs_common.c:2236
 msgid "Socket I/O timeout:"
 msgstr ""
 
-#: src/prefs_common.c:2237
+#: src/prefs_common.c:2249
 msgid "second(s)"
 msgstr ""
 
-#: src/prefs_common.c:2419
+#: src/prefs_common.c:2431
 msgid "the full abbreviated weekday name"
 msgstr "pojednostavljeno ime tjedna"
 
-#: src/prefs_common.c:2420
+#: src/prefs_common.c:2432
 msgid "the full weekday name"
 msgstr "puno ime tjedna"
 
-#: src/prefs_common.c:2421
+#: src/prefs_common.c:2433
 msgid "the abbreviated month name"
 msgstr "skraćeno ime mjeseca"
 
-#: src/prefs_common.c:2422
+#: src/prefs_common.c:2434
 msgid "the full month name"
 msgstr "puno ime mjeseca"
 
-#: src/prefs_common.c:2423
+#: src/prefs_common.c:2435
 msgid "the preferred date and time for the current locale"
 msgstr "željeni datum i vrijeme za trenutni locale"
 
-#: src/prefs_common.c:2424
+#: src/prefs_common.c:2436
 msgid "the century number (year/100)"
 msgstr "broj stoljeća (godina/100)"
 
-#: src/prefs_common.c:2425
+#: src/prefs_common.c:2437
 msgid "the day of the month as a decimal number"
 msgstr "dan u mjesecu kao decimalni broj"
 
-#: src/prefs_common.c:2426
+#: src/prefs_common.c:2438
 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.c:2427
+#: src/prefs_common.c:2439
 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.c:2428
+#: src/prefs_common.c:2440
 msgid "the day of the year as a decimal number"
 msgstr "dan u godini kao decimalni broj"
 
-#: src/prefs_common.c:2429
+#: src/prefs_common.c:2441
 msgid "the month as a decimal number"
 msgstr "mjesec kao decimalni broj"
 
-#: src/prefs_common.c:2430
+#: src/prefs_common.c:2442
 msgid "the minute as a decimal number"
 msgstr "minute kao decimalni broj"
 
-#: src/prefs_common.c:2431
+#: src/prefs_common.c:2443
 msgid "either AM or PM"
 msgstr "AP ili PM"
 
-#: src/prefs_common.c:2432
+#: src/prefs_common.c:2444
 msgid "the second as a decimal number"
 msgstr "sekunde kao decimalni broj"
 
-#: src/prefs_common.c:2433
+#: src/prefs_common.c:2445
 msgid "the day of the week as a decimal number"
 msgstr "dan u tjednu kao decimalni broj"
 
-#: src/prefs_common.c:2434
+#: src/prefs_common.c:2446
 msgid "the preferred date for the current locale"
 msgstr "željeni datum za trenutni locale"
 
-#: src/prefs_common.c:2435
+#: src/prefs_common.c:2447
 msgid "the last two digits of a year"
 msgstr "posljednje dvije znamenke godine"
 
-#: src/prefs_common.c:2436
+#: src/prefs_common.c:2448
 msgid "the year as a decimal number"
 msgstr "godina kao decimalni broj"
 
-#: src/prefs_common.c:2437
+#: src/prefs_common.c:2449
 msgid "the time zone or name or abbreviation"
 msgstr "vremenska zona"
 
-#: src/prefs_common.c:2458
+#: src/prefs_common.c:2470
 msgid "Specifier"
 msgstr "Označitelj"
 
-#: src/prefs_common.c:2459
+#: src/prefs_common.c:2471
 msgid "Description"
 msgstr "Opis"
 
-#: src/prefs_common.c:2499
+#: src/prefs_common.c:2511
 msgid "Example"
 msgstr "Primjer"
 
-#: src/prefs_common.c:2580
+#: src/prefs_common.c:2592
 msgid "Set message colors"
 msgstr "Postavi boje poruka"
 
-#: src/prefs_common.c:2588
+#: src/prefs_common.c:2600
 msgid "Colors"
 msgstr "Boje"
 
-#: src/prefs_common.c:2622
+#: src/prefs_common.c:2634
 msgid "Quoted Text - First Level"
 msgstr "Citirani tekst - prvi stupanj"
 
-#: src/prefs_common.c:2628
+#: src/prefs_common.c:2640
 msgid "Quoted Text - Second Level"
 msgstr "Citirani tekst - drugi stupanj"
 
-#: src/prefs_common.c:2634
+#: src/prefs_common.c:2646
 msgid "Quoted Text - Third Level"
 msgstr "Citirani tekst - treći stupanj"
 
-#: src/prefs_common.c:2640
+#: src/prefs_common.c:2652
 msgid "URI link"
 msgstr "URI poveznice"
 
-#: src/prefs_common.c:2647
+#: src/prefs_common.c:2659
 msgid "Recycle quote colors"
 msgstr "Ciklički mijenjaj boje citata"
 
-#: src/prefs_common.c:2707
+#: src/prefs_common.c:2719
 msgid "Pick color for quotation level 1"
 msgstr "Odaberite boju za citat 1. stupnja"
 
-#: src/prefs_common.c:2710
+#: src/prefs_common.c:2722
 msgid "Pick color for quotation level 2"
 msgstr "Odaberite boju za citat 2. stupnja"
 
-#: src/prefs_common.c:2713
+#: src/prefs_common.c:2725
 msgid "Pick color for quotation level 3"
 msgstr "Odaberite boju za citat 3. stupnja"
 
-#: src/prefs_common.c:2716
+#: src/prefs_common.c:2728
 msgid "Pick color for URI"
 msgstr "Odaberite boju za URI"
 
-#: src/prefs_common.c:2853
+#: src/prefs_common.c:2865
 msgid "Description of symbols"
 msgstr "Obajšnjenje znakova"
 
-#: src/prefs_common.c:2909
+#: src/prefs_common.c:2921
 msgid ""
 "Date\n"
 "From\n"
@@ -5017,11 +5053,11 @@ msgstr ""
 "News grupe\n"
 "ID poruke"
 
-#: src/prefs_common.c:2922
+#: src/prefs_common.c:2934
 msgid "If x is set, displays expr"
 msgstr "Ako je x odabrano, prikazuje expr"
 
-#: src/prefs_common.c:2926
+#: src/prefs_common.c:2938
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -5030,7 +5066,7 @@ msgid ""
 "Literal %"
 msgstr ""
 
-#: src/prefs_common.c:2934
+#: src/prefs_common.c:2946
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -5038,28 +5074,28 @@ msgid ""
 "Literal closing curly brace"
 msgstr ""
 
-#: src/prefs_common.c:2971
+#: src/prefs_common.c:2983
 msgid "Font selection"
 msgstr "Odabir fonta"
 
-#: src/prefs_common.c:3035
+#: src/prefs_common.c:3047
 #, fuzzy
 msgid "Key bindings"
 msgstr "Šaljem"
 
-#: src/prefs_common.c:3049
+#: src/prefs_common.c:3061
 msgid ""
 "Select the preset of key bindings.\n"
 "You can also modify each menu's shortcuts by pressing\n"
 "any key(s) when placing the mouse pointer on the item."
 msgstr ""
 
-#: src/prefs_common.c:3061 src/prefs_common.c:3410
+#: src/prefs_common.c:3073 src/prefs_common.c:3422
 #, fuzzy
 msgid "Default"
 msgstr "Uobičajeni sandučić"
 
-#: src/prefs_common.c:3064 src/prefs_common.c:3419
+#: src/prefs_common.c:3076 src/prefs_common.c:3431
 msgid "Old Sylpheed"
 msgstr ""
 
@@ -6243,6 +6279,12 @@ msgstr ""
 msgid "writing to %s failed.\n"
 msgstr "pisanje u %s nije uspjelo.\n"
 
+#~ msgid "/_View/_Code set/---"
+#~ msgstr "/_Pregled/_Znakovni standard/---"
+
+#~ msgid "/_View/_Code set"
+#~ msgstr "/_Pregled/_Znakovni standard"
+
 #~ msgid "To save this part, pop up the context menu with "
 #~ msgstr "Za spremanje ovog dijela, podignite menu konteksta s "
 
diff --git a/po/hu.po b/po/hu.po
index 20bf6224..06b8f27e 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-03-15 14:29+0900\n"
+"POT-Creation-Date: 2005-03-16 14:47+0900\n"
 "PO-Revision-Date: 2003-07-26 22:58-0100\n"
 "Last-Translator: Zahemszky Gábor <Gabor@Zahemszky.HU>\n"
 "Language-Team: Hungarian <gnome-hu@gnome.org>\n"
@@ -99,7 +99,7 @@ msgstr ""
 "funkció bekapcsolásához válaszd ki a 'G' oszlopban a jelölődobozt!"
 
 #: src/account.c:638 src/addressadd.c:186 src/addressbook.c:488
-#: src/compose.c:3650 src/editaddress.c:195 src/editaddress.c:936
+#: src/compose.c:3748 src/editaddress.c:195 src/editaddress.c:936
 #: src/editaddress.c:984 src/editbook.c:191 src/editgroup.c:257
 #: src/editjpilot.c:296 src/editldap.c:300 src/editvcard.c:211
 #: src/mimeview.c:151 src/prefs_filter.c:214 src/prefs_folder_item.c:170
@@ -152,13 +152,13 @@ msgstr "Hozzáférés törlése"
 msgid "Do you really want to delete this account?"
 msgstr "Tényleg töröljem ezt a hozzáférést?"
 
-#: src/account.c:758 src/compose.c:2551 src/compose.c:4807
+#: src/account.c:758 src/compose.c:2632 src/compose.c:4943
 #: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
 #: src/folderview.c:2156 src/folderview.c:2192
 msgid "Yes"
 msgstr "Igen"
 
-#: src/account.c:758 src/compose.c:2551 src/compose.c:4807
+#: src/account.c:758 src/compose.c:2632 src/compose.c:4943
 #: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
 #: src/folderview.c:2156 src/folderview.c:2192
 msgid "+No"
@@ -264,7 +264,7 @@ msgstr "A művelet felhasználói paramétere"
 msgid "Add Address to Book"
 msgstr "Cím hozzáadása a címlistához"
 
-#: src/addressadd.c:196 src/compose.c:4191 src/editaddress.c:196
+#: src/addressadd.c:196 src/compose.c:4292 src/editaddress.c:196
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "Cím"
@@ -278,7 +278,7 @@ msgstr "Megjegyzések"
 msgid "Select Address Book Folder"
 msgstr "Címjegyzék mappa választás"
 
-#: src/addressbook.c:334 src/compose.c:469 src/mainwindow.c:454
+#: src/addressbook.c:334 src/compose.c:477 src/mainwindow.c:454
 #: src/messageview.c:134
 msgid "/_File"
 msgstr "/_Fájl"
@@ -299,8 +299,8 @@ msgstr "/_Fájl/Új _JPilot"
 msgid "/_File/New _Server"
 msgstr "/_Fájl/Új _Szerver"
 
-#: src/addressbook.c:343 src/addressbook.c:346 src/compose.c:474
-#: src/compose.c:479 src/compose.c:483 src/mainwindow.c:471
+#: src/addressbook.c:343 src/addressbook.c:346 src/compose.c:482
+#: src/compose.c:487 src/compose.c:491 src/mainwindow.c:471
 #: src/mainwindow.c:474 src/mainwindow.c:476 src/mainwindow.c:479
 #: src/mainwindow.c:481 src/messageview.c:137
 msgid "/_File/---"
@@ -318,7 +318,7 @@ msgstr "/_Fájl/_Törlés"
 msgid "/_File/_Save"
 msgstr "/_Fájl/_Mentés"
 
-#: src/addressbook.c:348 src/compose.c:484 src/messageview.c:138
+#: src/addressbook.c:348 src/compose.c:492 src/messageview.c:138
 msgid "/_File/_Close"
 msgstr "/_Fájl/_Bezárás"
 
@@ -350,7 +350,7 @@ msgstr "/_Cím/_Szerkesztés"
 msgid "/_Address/_Delete"
 msgstr "/_Cím/_Törlés"
 
-#: src/addressbook.c:356 src/compose.c:585 src/mainwindow.c:688
+#: src/addressbook.c:356 src/compose.c:664 src/mainwindow.c:697
 #: src/messageview.c:246
 msgid "/_Tools"
 msgstr "/_Eszközök"
@@ -359,12 +359,12 @@ msgstr "/_Eszközök"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Eszközök/_LDIF fájl import"
 
-#: src/addressbook.c:358 src/compose.c:598 src/mainwindow.c:733
+#: src/addressbook.c:358 src/compose.c:677 src/mainwindow.c:742
 #: src/messageview.c:264
 msgid "/_Help"
 msgstr "/_Segítség"
 
-#: src/addressbook.c:359 src/compose.c:599 src/mainwindow.c:744
+#: src/addressbook.c:359 src/compose.c:678 src/mainwindow.c:753
 #: src/messageview.c:265
 msgid "/_Help/_About"
 msgstr "/_Segítség/_Névjegy"
@@ -381,7 +381,7 @@ msgstr "/Új cso_port"
 msgid "/New _Folder"
 msgstr "/Ú_j Mappa"
 
-#: src/addressbook.c:381 src/addressbook.c:391 src/compose.c:463
+#: src/addressbook.c:381 src/addressbook.c:391 src/compose.c:471
 #: src/folderview.c:220 src/folderview.c:222 src/folderview.c:226
 #: src/folderview.c:236 src/folderview.c:238 src/folderview.c:240
 #: src/folderview.c:244 src/folderview.c:254 src/folderview.c:256
@@ -391,7 +391,7 @@ msgstr "/Ú_j Mappa"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:382 src/addressbook.c:392 src/compose.c:486
+#: src/addressbook.c:382 src/addressbook.c:392 src/compose.c:494
 #: src/mainwindow.c:485 src/messageview.c:140
 msgid "/_Edit"
 msgstr "/_Szerkesztés"
@@ -404,7 +404,7 @@ msgstr "/_Törlés"
 msgid "E-Mail address"
 msgstr "E-Mail cím"
 
-#: src/addressbook.c:493 src/compose.c:4192 src/prefs_common.c:2186
+#: src/addressbook.c:493 src/compose.c:4293 src/prefs_common.c:2198
 msgid "Address book"
 msgstr "Címjegyzék"
 
@@ -414,7 +414,7 @@ msgstr "Név:"
 
 #. Buttons
 #: src/addressbook.c:625 src/addressbook.c:1665 src/addressbook.c:1671
-#: src/editaddress.c:878 src/editaddress.c:1011 src/mainwindow.c:2212
+#: src/editaddress.c:878 src/editaddress.c:1011 src/mainwindow.c:2221
 #: src/prefs_actions.c:263 src/prefs_display_header.c:275
 #: src/prefs_display_header.c:330 src/prefs_template.c:227
 msgid "Delete"
@@ -604,7 +604,7 @@ msgstr "Általános cím"
 msgid "Personal address"
 msgstr "Személyes cím"
 
-#: src/alertpanel.c:123 src/compose.c:4807 src/main.c:458
+#: src/alertpanel.c:123 src/compose.c:4943 src/main.c:458
 msgid "Notice"
 msgstr "Megjegyzés"
 
@@ -612,7 +612,7 @@ msgstr "Megjegyzés"
 msgid "Warning"
 msgstr "Figyelmeztetés"
 
-#: src/alertpanel.c:149 src/compose.c:2551 src/inc.c:558
+#: src/alertpanel.c:149 src/compose.c:2632 src/inc.c:558
 msgid "Error"
 msgstr "Hiba"
 
@@ -660,307 +660,425 @@ msgstr "Barna"
 msgid "None"
 msgstr "Semmi"
 
-#: src/compose.c:461
+#: src/compose.c:469
 msgid "/_Add..."
 msgstr "/_Hozzáadás..."
 
-#: src/compose.c:462
+#: src/compose.c:470
 msgid "/_Remove"
 msgstr "/_Eltávolítás"
 
-#: src/compose.c:464 src/folderview.c:228 src/folderview.c:246
+#: src/compose.c:472 src/folderview.c:228 src/folderview.c:246
 #: src/folderview.c:261
 msgid "/_Properties..."
 msgstr "/_Tulajdonságok..."
 
-#: src/compose.c:470
+#: src/compose.c:478
 #, fuzzy
 msgid "/_File/_Send"
 msgstr "/_Fájl/_Mentés"
 
-#: src/compose.c:472
+#: src/compose.c:480
 #, fuzzy
 msgid "/_File/Send _later"
 msgstr "/_Üzenet/Küldés később"
 
-#: src/compose.c:475
+#: src/compose.c:483
 #, fuzzy
 msgid "/_File/Save to _draft folder"
 msgstr "/_Üzenet/Mentés _vázlatként"
 
-#: src/compose.c:477
+#: src/compose.c:485
 #, fuzzy
 msgid "/_File/Save and _keep editing"
 msgstr "/_Üzenet/Mentés és marad _szerkesztésben"
 
-#: src/compose.c:480
+#: src/compose.c:488
 msgid "/_File/_Attach file"
 msgstr "/_Fájl/Fájl _csatolása"
 
-#: src/compose.c:481
+#: src/compose.c:489
 msgid "/_File/_Insert file"
 msgstr "/_Fájl/Fájl _beszúrása"
 
-#: src/compose.c:482
+#: src/compose.c:490
 msgid "/_File/Insert si_gnature"
 msgstr "/_Fájl/_Aláírás beszúrása"
 
-#: src/compose.c:487
+#: src/compose.c:495
 msgid "/_Edit/_Undo"
 msgstr "/_Szerkesztés/_Visszavonás"
 
-#: src/compose.c:488
+#: src/compose.c:496
 msgid "/_Edit/_Redo"
 msgstr "/_Szerkesztés/_Ismétlés"
 
-#: src/compose.c:489 src/compose.c:567 src/mainwindow.c:489
+#: src/compose.c:497 src/compose.c:575 src/mainwindow.c:489
 #: src/messageview.c:143
 msgid "/_Edit/---"
 msgstr "/_Szerkesztés/---"
 
-#: src/compose.c:490
+#: src/compose.c:498
 msgid "/_Edit/Cu_t"
 msgstr "/_Szerkesztés/_Kivágás"
 
-#: src/compose.c:491 src/mainwindow.c:486 src/messageview.c:141
+#: src/compose.c:499 src/mainwindow.c:486 src/messageview.c:141
 msgid "/_Edit/_Copy"
 msgstr "/_Szerkesztés/_Másolás"
 
-#: src/compose.c:492
+#: src/compose.c:500
 msgid "/_Edit/_Paste"
 msgstr "/_Szerkesztés/_Beillesztés"
 
-#: src/compose.c:493
+#: src/compose.c:501
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Szerkesztés/_Beillesztés idézetként"
 
-#: src/compose.c:495 src/mainwindow.c:487 src/messageview.c:142
+#: src/compose.c:503 src/mainwindow.c:487 src/messageview.c:142
 msgid "/_Edit/Select _all"
 msgstr "/_Szerkesztés/Mindet kijelöli"
 
-#: src/compose.c:496
+#: src/compose.c:504
 msgid "/_Edit/A_dvanced"
 msgstr "/_Szerkesztés/_Haladó"
 
-#: src/compose.c:497
+#: src/compose.c:505
 msgid "/_Edit/A_dvanced/Move a character backward"
 msgstr "/S_zerkesztés/_Haladó/Karakter mozgatása visszafelé"
 
-#: src/compose.c:502
+#: src/compose.c:510
 msgid "/_Edit/A_dvanced/Move a character forward"
 msgstr "/S_zerkesztés/_Haladó/Karakter mozgatása előrefelé"
 
-#: src/compose.c:507
+#: src/compose.c:515
 msgid "/_Edit/A_dvanced/Move a word backward"
 msgstr "/S_zerkesztés/_Haladó/Szó mozgatása visszafelé"
 
-#: src/compose.c:512
+#: src/compose.c:520
 msgid "/_Edit/A_dvanced/Move a word forward"
 msgstr "/S_zerkesztés/_Haladó/Szó mozgatása előrefelé"
 
-#: src/compose.c:517
+#: src/compose.c:525
 msgid "/_Edit/A_dvanced/Move to beginning of line"
 msgstr "/S_zerkesztés/_Haladó/Sor elejére mozgatás"
 
-#: src/compose.c:522
+#: src/compose.c:530
 msgid "/_Edit/A_dvanced/Move to end of line"
 msgstr "/S_zerkesztés/_Haladó/Sor végére mozgatás"
 
-#: src/compose.c:527
+#: src/compose.c:535
 msgid "/_Edit/A_dvanced/Move to previous line"
 msgstr "/S_zerkesztés/_Haladó/Előző sorba mozgatás"
 
-#: src/compose.c:532
+#: src/compose.c:540
 msgid "/_Edit/A_dvanced/Move to next line"
 msgstr "/S_zerkesztés/_Haladó/Következő sorba mozgatás"
 
-#: src/compose.c:537
+#: src/compose.c:545
 msgid "/_Edit/A_dvanced/Delete a character backward"
 msgstr "/S_zerkesztés/_Haladó/Karakter törlése visszafelé"
 
-#: src/compose.c:542
+#: src/compose.c:550
 msgid "/_Edit/A_dvanced/Delete a character forward"
 msgstr "/S_zerkesztés/_Haladó/Karakter törlése előrefelé"
 
-#: src/compose.c:547
+#: src/compose.c:555
 msgid "/_Edit/A_dvanced/Delete a word backward"
 msgstr "/S_zerkesztés/_Haladó/Szó törlése visszafelé"
 
-#: src/compose.c:552
+#: src/compose.c:560
 msgid "/_Edit/A_dvanced/Delete a word forward"
 msgstr "/S_zerkesztés/_Haladó/Szó törlése előrefelé"
 
-#: src/compose.c:557
+#: src/compose.c:565
 msgid "/_Edit/A_dvanced/Delete line"
 msgstr "/S_zerkesztés/_Haladó/Sor törlése"
 
-#: src/compose.c:562
+#: src/compose.c:570
 msgid "/_Edit/A_dvanced/Delete to end of line"
 msgstr "/S_zerkesztés/_Haladó/Törlés sor végéig"
 
-#: src/compose.c:568
+#: src/compose.c:576
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/_Szerkesztés/Aktuális bekez_dés törése"
 
-#: src/compose.c:570
+#: src/compose.c:578
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/__Szerkesztés/Minden hosszú _sor törése"
 
-#: src/compose.c:572
+#: src/compose.c:580
 #, fuzzy
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Szerkesztés/_Másolás"
 
-#: src/compose.c:573 src/mainwindow.c:494 src/messageview.c:147
+#: src/compose.c:581 src/mainwindow.c:494 src/messageview.c:147
 #: src/summaryview.c:370
 msgid "/_View"
 msgstr "/_Nézet"
 
-#: src/compose.c:574
+#: src/compose.c:582
 msgid "/_View/_To"
 msgstr "/_Nézet/_Címzett"
 
-#: src/compose.c:575
+#: src/compose.c:583
 msgid "/_View/_Cc"
 msgstr "/_Nézet/_Másolat"
 
-#: src/compose.c:576
+#: src/compose.c:584
 msgid "/_View/_Bcc"
 msgstr "/_Nézet/_Titkos másolat"
 
-#: src/compose.c:577
+#: src/compose.c:585
 msgid "/_View/_Reply to"
 msgstr "/_Nézet/_Válasz"
 
-#: src/compose.c:578 src/compose.c:580 src/compose.c:582 src/mainwindow.c:512
-#: src/mainwindow.c:515 src/mainwindow.c:541 src/mainwindow.c:565
-#: src/mainwindow.c:641 src/mainwindow.c:645 src/messageview.c:223
+#: src/compose.c:586 src/compose.c:588 src/compose.c:590 src/compose.c:592
+#: src/mainwindow.c:512 src/mainwindow.c:515 src/mainwindow.c:541
+#: src/mainwindow.c:565 src/mainwindow.c:650 src/mainwindow.c:654
+#: src/messageview.c:223
 msgid "/_View/---"
 msgstr "/_Nézet/---"
 
-#: src/compose.c:579
+#: src/compose.c:587
 msgid "/_View/_Followup to"
 msgstr "/_Nézet/_Nyomkövetés"
 
-#: src/compose.c:581
+#: src/compose.c:589
 msgid "/_View/R_uler"
 msgstr "/_Nézet/V_onalzó"
 
-#: src/compose.c:583
+#: src/compose.c:591
 msgid "/_View/_Attachment"
 msgstr "/_Nézet/_Csatolás"
 
-#: src/compose.c:586 src/mainwindow.c:689 src/messageview.c:247
+#: src/compose.c:598 src/mainwindow.c:572 src/messageview.c:154
+#, fuzzy
+msgid "/_View/Character _encoding"
+msgstr "/_Nézet/_Rendezés/_Csökkenő"
+
+#: src/compose.c:599
+msgid "/_View/Character _encoding/_Automatic"
+msgstr ""
+
+#: src/compose.c:601 src/compose.c:607 src/compose.c:613 src/compose.c:617
+#: src/compose.c:623 src/compose.c:627 src/compose.c:631 src/compose.c:641
+#: src/compose.c:645 src/compose.c:653 src/compose.c:657 src/mainwindow.c:568
+#: src/mainwindow.c:575 src/messageview.c:150
+#, fuzzy
+msgid "/_View/Character _encoding/---"
+msgstr "/_Nézet/_Rendezés/_Csökkenő"
+
+#: src/compose.c:603 src/mainwindow.c:576 src/messageview.c:158
+#, fuzzy
+msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
+msgstr "/_Nézet/_Kódkészlet/7 bites ascii (US-ASC_II)"
+
+#: src/compose.c:605 src/mainwindow.c:578 src/messageview.c:161
+#, fuzzy
+msgid "/_View/Character _encoding/Unicode (_UTF-8)"
+msgstr "/_Nézet/_Kódkészlet/Unicode (_UTF-8)"
+
+#: src/compose.c:609 src/mainwindow.c:582 src/messageview.c:164
+#, fuzzy
+msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
+msgstr "/_Nézet/_Kódkészlet/Nyugat-Európai (ISO-8859-_1)"
+
+#: src/compose.c:611 src/mainwindow.c:584 src/messageview.c:166
+#, fuzzy
+msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
+msgstr "/_Nézet/_Kódkészlet/Nyugat-Európai (ISO-8859-15)"
+
+#: src/compose.c:615 src/mainwindow.c:588 src/messageview.c:169
+#, fuzzy
+msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
+msgstr "/_Nézet/_Kódkészlet/Közép-Európai (ISO-8859-_2)"
+
+#: src/compose.c:619 src/mainwindow.c:592 src/messageview.c:172
+#, fuzzy
+msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
+msgstr "/_Nézet/_Kódkészlet/_Baltikumi (ISO-8859-13)"
+
+#: src/compose.c:621 src/mainwindow.c:594 src/messageview.c:174
+#, fuzzy
+msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
+msgstr "/_Nézet/_Kódkészlet/Baltikumi (ISO-8859-_4)"
+
+#: src/compose.c:625 src/mainwindow.c:598 src/messageview.c:177
+#, fuzzy
+msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
+msgstr "/_Nézet/_Kódkészlet/Görög (ISO-8859-_7)"
+
+#: src/compose.c:629 src/mainwindow.c:602 src/messageview.c:180
+#, fuzzy
+msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
+msgstr "/_Nézet/_Kódkészlet/Török (ISO-8859-_9)"
+
+#: src/compose.c:633 src/mainwindow.c:606 src/messageview.c:183
+#, fuzzy
+msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
+msgstr "/_Nézet/_Kódkészlet/Cirill (ISO-8859-_5)"
+
+#: src/compose.c:635 src/mainwindow.c:608 src/messageview.c:185
+#, fuzzy
+msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
+msgstr "/_Nézet/_Kódkészlet/Cirill (KOI8-_R)"
+
+#: src/compose.c:637 src/mainwindow.c:610 src/messageview.c:187
+#, fuzzy
+msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
+msgstr "/_Nézet/_Kódkészlet/Cirill (KOI8-_R)"
+
+#: src/compose.c:639 src/mainwindow.c:612 src/messageview.c:189
+#, fuzzy
+msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
+msgstr "/_Nézet/_Kódkészlet/Cirill (Windows-1251)"
+
+#: src/compose.c:643 src/mainwindow.c:616 src/messageview.c:192
+#, fuzzy
+msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
+msgstr "/_Nézet/_Kódkészlet/Japán (ISO-2022-_JP)"
+
+#: src/compose.c:647 src/mainwindow.c:626 src/messageview.c:201
+#, fuzzy
+msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
+msgstr "/_Nézet/_Kódkészlet/Egyszerűsített Kínai (_GB2312)"
+
+#: src/compose.c:649 src/mainwindow.c:628 src/messageview.c:203
+#, fuzzy
+msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
+msgstr "/_Nézet/_Kódkészlet/Tradicionális Kínai (_Big5)"
+
+#: src/compose.c:651 src/mainwindow.c:630 src/messageview.c:205
+#, fuzzy
+msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
+msgstr "/_Nézet/_Kódkészlet/Tradicionális Kínai (EUC-_TW)"
+
+#: src/compose.c:655 src/mainwindow.c:636 src/messageview.c:210
+#, fuzzy
+msgid "/_View/Character _encoding/Korean (EUC-_KR)"
+msgstr "/_Nézet/_Kódkészlet/Koreai (EUC-_KR)"
+
+#: src/compose.c:659 src/mainwindow.c:642 src/messageview.c:215
+#, fuzzy
+msgid "/_View/Character _encoding/Thai (TIS-620)"
+msgstr "/_Nézet/_Kódkészlet/Thai (TIS-620)"
+
+#: src/compose.c:661 src/mainwindow.c:644 src/messageview.c:217
+#, fuzzy
+msgid "/_View/Character _encoding/Thai (Windows-874)"
+msgstr "/_Nézet/_Kódkészlet/Thai (Windows-874)"
+
+#: src/compose.c:665 src/mainwindow.c:698 src/messageview.c:247
 msgid "/_Tools/_Address book"
 msgstr "/_Eszközök/_Címjegyzék"
 
-#: src/compose.c:587
+#: src/compose.c:666
 msgid "/_Tools/_Template"
 msgstr "/_Eszközök/_Sablon"
 
-#: src/compose.c:588 src/mainwindow.c:707 src/messageview.c:262
+#: src/compose.c:667 src/mainwindow.c:716 src/messageview.c:262
 msgid "/_Tools/Actio_ns"
 msgstr "/_Eszközök/_Akciók"
 
-#: src/compose.c:589 src/compose.c:593 src/mainwindow.c:692
-#: src/mainwindow.c:706 src/mainwindow.c:708 src/mainwindow.c:711
-#: src/mainwindow.c:713 src/messageview.c:250 src/messageview.c:261
+#: src/compose.c:668 src/compose.c:672 src/mainwindow.c:701
+#: src/mainwindow.c:715 src/mainwindow.c:717 src/mainwindow.c:720
+#: src/mainwindow.c:722 src/messageview.c:250 src/messageview.c:261
 msgid "/_Tools/---"
 msgstr "/_Eszközök/---"
 
-#: src/compose.c:590
+#: src/compose.c:669
 #, fuzzy
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/__Szerkesztés/Szerkesztés _külső programmal"
 
-#: src/compose.c:594
+#: src/compose.c:673
 #, fuzzy
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Eszközök/_Akciók"
 
-#: src/compose.c:595
+#: src/compose.c:674
 #, fuzzy
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/_Üzenet/_Titkosít"
 
-#: src/compose.c:800
+#: src/compose.c:879
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: fájl nem létezik\n"
 
-#: src/compose.c:899 src/compose.c:958 src/procmsg.c:1303
+#: src/compose.c:978 src/compose.c:1037 src/procmsg.c:1303
 msgid "Can't get text part\n"
 msgstr "Nem tudtam olvasni a szövegrészt\n"
 
-#: src/compose.c:1340
+#: src/compose.c:1419
 msgid "Quote mark format error."
 msgstr "Idézet jelölés formátum hiba."
 
-#: src/compose.c:1352
+#: src/compose.c:1431
 msgid "Message reply/forward format error."
 msgstr "Üzenet válasz/továbbítás formátum hiba."
 
-#: src/compose.c:1679
+#: src/compose.c:1758
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "%s fájl nem létezik\n"
 
-#: src/compose.c:1683
+#: src/compose.c:1762
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "%s mérete nem meghatározható\n"
 
-#: src/compose.c:1687
+#: src/compose.c:1766
 #, c-format
 msgid "File %s is empty."
 msgstr "A %s fájl üres."
 
-#: src/compose.c:1691
+#: src/compose.c:1770
 #, c-format
 msgid "Can't read %s."
 msgstr "%s nem olvasható."
 
-#: src/compose.c:1726
+#: src/compose.c:1805
 #, c-format
 msgid "Message: %s"
 msgstr "Üzenet: %s"
 
-#: src/compose.c:1797 src/mimeview.c:491
+#: src/compose.c:1876 src/mimeview.c:491
 msgid "Can't get the part of multipart message."
 msgstr "Egy több részes üzenet egy darabja nem hozzáférhető."
 
-#: src/compose.c:2188
+#: src/compose.c:2267
 msgid " [Edited]"
 msgstr " [Szerkesztett]"
 
-#: src/compose.c:2190
+#: src/compose.c:2269
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Üzenet írása%s"
 
-#: src/compose.c:2193
+#: src/compose.c:2272
 #, c-format
 msgid "Compose message%s"
 msgstr "Üzenet írása%s"
 
-#: src/compose.c:2304
+#: src/compose.c:2383
 msgid "Recipient is not specified."
 msgstr "Nincs címzett."
 
-#: src/compose.c:2312 src/compose.c:4112 src/mainwindow.c:2144
+#: src/compose.c:2391 src/compose.c:4213 src/mainwindow.c:2153
 #: src/prefs_account.c:703 src/prefs_common.c:850
 msgid "Send"
 msgstr "Küldés"
 
-#: src/compose.c:2313
+#: src/compose.c:2392
 msgid "Subject is empty. Send it anyway?"
 msgstr "A levél tárgya üres. Ennek ellenére elküldöd?"
 
-#: src/compose.c:2364
+#: src/compose.c:2443
 msgid "can't get recipient list."
 msgstr "címzett lista nem hozzáférhető."
 
-#: src/compose.c:2384
+#: src/compose.c:2463
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -968,27 +1086,27 @@ msgstr ""
 "Nincs megadva hozzáférés a levél küldéshez.\n"
 "Kérek válassz ki egy hozzáférést küldés előtt!"
 
-#: src/compose.c:2398 src/send_message.c:261
+#: src/compose.c:2477 src/send_message.c:261
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Hiba lépett fel a %s-nak küldendő üzenet küldése közben."
 
-#: src/compose.c:2421
+#: src/compose.c:2500
 msgid "Can't save the message to outbox."
 msgstr "Az üzenet nem menthető a kimenő mappába."
 
-#: src/compose.c:2457
+#: src/compose.c:2536
 #, 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:2518 src/compose.c:2739 src/compose.c:2802 src/compose.c:2921
+#: src/compose.c:2597 src/compose.c:2820 src/compose.c:2883 src/compose.c:3003
 #: src/utils.c:2189
 msgid "can't change file mode\n"
 msgstr "fájl módja nem változtatható\n"
 
-#: src/compose.c:2546
+#: src/compose.c:2627
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -998,140 +1116,140 @@ msgstr ""
 "%s-ról %s-ra.\n"
 "Elküldjem ennek ellenére?"
 
-#: src/compose.c:2610
+#: src/compose.c:2691
 msgid "can't write headers\n"
 msgstr "fejléc nem írható\n"
 
-#: src/compose.c:2881
+#: src/compose.c:2963
 msgid "can't remove the old message\n"
 msgstr "a régi üzenetet nem tudom eltávolítani\n"
 
-#: src/compose.c:2899
+#: src/compose.c:2981
 msgid "queueing message...\n"
 msgstr "üzenet a Várakozó sorba...\n"
 
-#: src/compose.c:2981
+#: src/compose.c:3063
 msgid "can't find queue folder\n"
 msgstr "nem találom a Várakozó sor mappáját\n"
 
-#: src/compose.c:2988
+#: src/compose.c:3070
 msgid "can't queue the message\n"
 msgstr "Az üzenetet nem sikerült a Várakozó sorba rakni\n"
 
-#: src/compose.c:3547
+#: src/compose.c:3645
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "generált Üzenet-azonosító: %s\n"
 
-#: src/compose.c:3645
+#: src/compose.c:3743
 msgid "Creating compose window...\n"
 msgstr "Szerkesztőablak létrehozása...\n"
 
-#: src/compose.c:3648 src/compose.c:4598
+#: src/compose.c:3746 src/compose.c:4734
 msgid "MIME type"
 msgstr "MIME típus"
 
 #. S_COL_DATE
-#: src/compose.c:3649 src/mimeview.c:150 src/prefs_filter_edit.c:569
+#: src/compose.c:3747 src/mimeview.c:150 src/prefs_filter_edit.c:569
 #: src/prefs_summary_column.c:73 src/select-keys.c:317 src/summaryview.c:386
 msgid "Size"
 msgstr "Méret"
 
-#: src/compose.c:3700 src/headerview.c:53 src/summary_search.c:169
+#: src/compose.c:3798 src/headerview.c:53 src/summary_search.c:169
 msgid "From:"
 msgstr "Feladó:"
 
-#: src/compose.c:4113
+#: src/compose.c:4214
 msgid "Send message"
 msgstr "Üzenet küldése"
 
-#: src/compose.c:4121
+#: src/compose.c:4222
 msgid "Send later"
 msgstr "Küldés később"
 
-#: src/compose.c:4122
+#: src/compose.c:4223
 msgid "Put into queue folder and send later"
 msgstr "Üzenet a Várakozó sorba, küldés később"
 
-#: src/compose.c:4130
+#: src/compose.c:4231
 msgid "Draft"
 msgstr "Vázlat"
 
-#: src/compose.c:4131
+#: src/compose.c:4232
 msgid "Save to draft folder"
 msgstr "Mentés a vázlat mappába"
 
-#: src/compose.c:4141 src/compose.c:5382
+#: src/compose.c:4242 src/compose.c:5527
 msgid "Insert"
 msgstr "Beszúrás"
 
-#: src/compose.c:4142
+#: src/compose.c:4243
 msgid "Insert file"
 msgstr "Fájl beszúrása"
 
-#: src/compose.c:4150
+#: src/compose.c:4251
 msgid "Attach"
 msgstr "Csatolás"
 
-#: src/compose.c:4151
+#: src/compose.c:4252
 msgid "Attach file"
 msgstr "Fájl csatolása"
 
 #. signature
-#: src/compose.c:4161 src/prefs_account.c:1339 src/prefs_common.c:1261
+#: src/compose.c:4262 src/prefs_account.c:1339 src/prefs_common.c:1273
 msgid "Signature"
 msgstr "Aláírás"
 
-#: src/compose.c:4162
+#: src/compose.c:4263
 msgid "Insert signature"
 msgstr "Aláírás beillesztése"
 
-#: src/compose.c:4171 src/prefs_common.c:1283 src/prefs_common.c:2165
+#: src/compose.c:4272 src/prefs_common.c:1295 src/prefs_common.c:2177
 msgid "Editor"
 msgstr "Szerkesztő"
 
-#: src/compose.c:4172
+#: src/compose.c:4273
 msgid "Edit with external editor"
 msgstr "Szerkesztés külső programmal"
 
-#: src/compose.c:4180
+#: src/compose.c:4281
 msgid "Linewrap"
 msgstr "Sortörés"
 
-#: src/compose.c:4181
+#: src/compose.c:4282
 msgid "Wrap all long lines"
 msgstr "Az összes hosszú sor törése"
 
-#: src/compose.c:4492
+#: src/compose.c:4628
 msgid "Invalid MIME type."
 msgstr "Érvénytelen MIME típus."
 
-#: src/compose.c:4511
+#: src/compose.c:4647
 msgid "File doesn't exist or is empty."
 msgstr "A fájl nem létezik vagy üres."
 
-#: src/compose.c:4580
+#: src/compose.c:4716
 msgid "Properties"
 msgstr "Tulajdonságok"
 
-#: src/compose.c:4600
+#: src/compose.c:4736
 msgid "Encoding"
 msgstr "Kódolás"
 
-#: src/compose.c:4623 src/prefs_folder_item.c:183
+#: src/compose.c:4759 src/prefs_folder_item.c:183
 msgid "Path"
 msgstr "Elérési út"
 
-#: src/compose.c:4624
+#: src/compose.c:4760
 msgid "File name"
 msgstr "Fájlnév"
 
-#: src/compose.c:4778
+#: src/compose.c:4914
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Külső szerkesztő parancssora érvénytelen: `%s'\n"
 
-#: src/compose.c:4804
+#: src/compose.c:4940
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1142,72 +1260,72 @@ msgstr ""
 "Processz kilövése?\n"
 "processz csoport azonosító: %d"
 
-#: src/compose.c:4817
+#: src/compose.c:4953
 #, c-format
 msgid "Terminated process group id: %d"
 msgstr "A leállított processz csoport azonosítója: %d"
 
-#: src/compose.c:4818
+#: src/compose.c:4954
 #, c-format
 msgid "Temporary file: %s"
 msgstr "Ideiglenes fájl: %s"
 
-#: src/compose.c:4842
+#: src/compose.c:4978
 msgid "Compose: input from monitoring process\n"
 msgstr "Szerkesztés: bemenet a monitorozó processzből\n"
 
 #. failed
-#: src/compose.c:4875
+#: src/compose.c:5011
 msgid "Couldn't exec external editor\n"
 msgstr "Külső szerkesztő nem indítható\n"
 
-#: src/compose.c:4879
+#: src/compose.c:5015
 msgid "Couldn't write to file\n"
 msgstr "Nem tudok a fájlba írni\n"
 
-#: src/compose.c:4881
+#: src/compose.c:5017
 msgid "Pipe read failed\n"
 msgstr "Hiba történt a csővezeték olvasása közben\n"
 
-#: src/compose.c:5182 src/compose.c:5190 src/compose.c:5196
+#: src/compose.c:5318 src/compose.c:5326 src/compose.c:5332
 msgid "Can't queue the message."
 msgstr "Az üzenetet nem sikerült a Várakozó sorba rakni"
 
-#: src/compose.c:5287
+#: src/compose.c:5423
 #, fuzzy
 msgid "Select files"
 msgstr "Fájl választás"
 
-#: src/compose.c:5309
+#: src/compose.c:5445
 msgid "Select file"
 msgstr "Fájl választás"
 
-#: src/compose.c:5344
+#: src/compose.c:5480
 msgid "Discard message"
 msgstr "Üzenet elvetése"
 
-#: src/compose.c:5345
+#: src/compose.c:5481
 msgid "This message has been modified. discard it?"
 msgstr "Az üzenet megváltozott. Eldobjam?"
 
-#: src/compose.c:5346
+#: src/compose.c:5482
 msgid "Discard"
 msgstr "Elvet"
 
-#: src/compose.c:5346
+#: src/compose.c:5482
 msgid "to Draft"
 msgstr "vázlatok közé"
 
-#: src/compose.c:5379
+#: src/compose.c:5524
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Tényleg alkalmazni akarod a `%s' sablont?"
 
-#: src/compose.c:5381
+#: src/compose.c:5526
 msgid "Apply template"
 msgstr "Sablon alkalmazása"
 
-#: src/compose.c:5382
+#: src/compose.c:5527
 msgid "Replace"
 msgstr "Helyettesít"
 
@@ -1649,12 +1767,12 @@ msgstr "Mappa információ beállítása...\n"
 msgid "Setting folder info..."
 msgstr "Mappa információ beállítása..."
 
-#: src/folderview.c:652 src/mainwindow.c:3190 src/setup.c:81
+#: src/folderview.c:652 src/mainwindow.c:3199 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "%s%c%s mappa átvizsgálása..."
 
-#: src/folderview.c:656 src/mainwindow.c:3195 src/setup.c:86
+#: src/folderview.c:656 src/mainwindow.c:3204 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "%s mappa átvizsgálása..."
@@ -2112,7 +2230,7 @@ msgstr "LDIF fájl importálása a címjegyzékbe"
 msgid "Prev"
 msgstr "Előző"
 
-#: src/importldif.c:761 src/mainwindow.c:2230
+#: src/importldif.c:761 src/mainwindow.c:2239
 msgid "Next"
 msgstr "Következő"
 
@@ -2572,7 +2690,8 @@ msgid "/_View/Separate f_older tree"
 msgstr "/_Nézet/_Külön mappa fa"
 
 #: src/mainwindow.c:514
-msgid "/_View/Separate m_essage view"
+#, fuzzy
+msgid "/_View/Separate _message view"
 msgstr "/_Nézet/Külön üz_enetnézet"
 
 #: src/mainwindow.c:516
@@ -2708,432 +2827,349 @@ msgstr "/_Nézet/_Ugrás/_Következő címkézett üzenethez"
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Nézet/_Ugrás/_Másik _mappához"
 
-#: src/mainwindow.c:568 src/mainwindow.c:575 src/messageview.c:150
-msgid "/_View/_Code set/---"
-msgstr "/_Nézet/_Kódkészlet/---"
-
-#: src/mainwindow.c:572 src/messageview.c:154
-msgid "/_View/_Code set"
-msgstr "/_Nézet/_Kódkészlet"
-
 #: src/mainwindow.c:573 src/messageview.c:155
-msgid "/_View/_Code set/_Auto detect"
+#, fuzzy
+msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Nézet/_Kódkészlet/_Automatikus felismerés"
 
-#: src/mainwindow.c:576 src/messageview.c:158
-msgid "/_View/_Code set/7bit ascii (US-ASC_II)"
-msgstr "/_Nézet/_Kódkészlet/7 bites ascii (US-ASC_II)"
-
-#: src/mainwindow.c:579 src/messageview.c:161
-msgid "/_View/_Code set/Unicode (_UTF-8)"
-msgstr "/_Nézet/_Kódkészlet/Unicode (_UTF-8)"
-
-#: src/mainwindow.c:582 src/messageview.c:164
-msgid "/_View/_Code set/Western European (ISO-8859-_1)"
-msgstr "/_Nézet/_Kódkészlet/Nyugat-Európai (ISO-8859-_1)"
-
-#: src/mainwindow.c:584 src/messageview.c:166
-msgid "/_View/_Code set/Western European (ISO-8859-15)"
-msgstr "/_Nézet/_Kódkészlet/Nyugat-Európai (ISO-8859-15)"
-
-#: src/mainwindow.c:587 src/messageview.c:169
-msgid "/_View/_Code set/Central European (ISO-8859-_2)"
-msgstr "/_Nézet/_Kódkészlet/Közép-Európai (ISO-8859-_2)"
-
-#: src/mainwindow.c:590 src/messageview.c:172
-msgid "/_View/_Code set/_Baltic (ISO-8859-13)"
-msgstr "/_Nézet/_Kódkészlet/_Baltikumi (ISO-8859-13)"
-
-#: src/mainwindow.c:592 src/messageview.c:174
-msgid "/_View/_Code set/Baltic (ISO-8859-_4)"
-msgstr "/_Nézet/_Kódkészlet/Baltikumi (ISO-8859-_4)"
-
-#: src/mainwindow.c:595 src/messageview.c:177
-msgid "/_View/_Code set/Greek (ISO-8859-_7)"
-msgstr "/_Nézet/_Kódkészlet/Görög (ISO-8859-_7)"
-
-#: src/mainwindow.c:598 src/messageview.c:180
-msgid "/_View/_Code set/Turkish (ISO-8859-_9)"
-msgstr "/_Nézet/_Kódkészlet/Török (ISO-8859-_9)"
-
-#: src/mainwindow.c:601 src/messageview.c:183
-msgid "/_View/_Code set/Cyrillic (ISO-8859-_5)"
-msgstr "/_Nézet/_Kódkészlet/Cirill (ISO-8859-_5)"
-
-#: src/mainwindow.c:603 src/messageview.c:185
-msgid "/_View/_Code set/Cyrillic (KOI8-_R)"
-msgstr "/_Nézet/_Kódkészlet/Cirill (KOI8-_R)"
-
-#: src/mainwindow.c:605 src/messageview.c:187
+#: src/mainwindow.c:618 src/messageview.c:194
 #, fuzzy
-msgid "/_View/_Code set/Cyrillic (KOI8-U)"
-msgstr "/_Nézet/_Kódkészlet/Cirill (KOI8-_R)"
-
-#: src/mainwindow.c:607 src/messageview.c:189
-msgid "/_View/_Code set/Cyrillic (Windows-1251)"
-msgstr "/_Nézet/_Kódkészlet/Cirill (Windows-1251)"
-
-#: src/mainwindow.c:610 src/messageview.c:192
-msgid "/_View/_Code set/Japanese (ISO-2022-_JP)"
-msgstr "/_Nézet/_Kódkészlet/Japán (ISO-2022-_JP)"
-
-#: src/mainwindow.c:612 src/messageview.c:194
-msgid "/_View/_Code set/Japanese (ISO-2022-JP-2)"
+msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Nézet/_Kódkészlet/Japán (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:614 src/messageview.c:196
-msgid "/_View/_Code set/Japanese (_EUC-JP)"
+#: src/mainwindow.c:620 src/messageview.c:196
+#, fuzzy
+msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Nézet/_Kódkészlet/Japán (_EUC-JP)"
 
-#: src/mainwindow.c:616 src/messageview.c:198
-msgid "/_View/_Code set/Japanese (_Shift__JIS)"
+#: src/mainwindow.c:622 src/messageview.c:198
+#, fuzzy
+msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Nézet/_Kódkészlet/Japán (_Shift__JIS)"
 
-#: src/mainwindow.c:619 src/messageview.c:201
-msgid "/_View/_Code set/Simplified Chinese (_GB2312)"
-msgstr "/_Nézet/_Kódkészlet/Egyszerűsített Kínai (_GB2312)"
-
-#: src/mainwindow.c:621 src/messageview.c:203
-msgid "/_View/_Code set/Traditional Chinese (_Big5)"
-msgstr "/_Nézet/_Kódkészlet/Tradicionális Kínai (_Big5)"
-
-#: src/mainwindow.c:623 src/messageview.c:205
-msgid "/_View/_Code set/Traditional Chinese (EUC-_TW)"
-msgstr "/_Nézet/_Kódkészlet/Tradicionális Kínai (EUC-_TW)"
-
-#: src/mainwindow.c:625 src/messageview.c:207
-msgid "/_View/_Code set/Chinese (ISO-2022-_CN)"
+#: src/mainwindow.c:632 src/messageview.c:207
+#, fuzzy
+msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Nézet/_Kódkészlet/Kínai (ISO-2022-_CN)"
 
-#: src/mainwindow.c:628 src/messageview.c:210
-msgid "/_View/_Code set/Korean (EUC-_KR)"
-msgstr "/_Nézet/_Kódkészlet/Koreai (EUC-_KR)"
-
-#: src/mainwindow.c:630 src/messageview.c:212
-msgid "/_View/_Code set/Korean (ISO-2022-KR)"
+#: src/mainwindow.c:638 src/messageview.c:212
+#, fuzzy
+msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Nézet/_Kódkészlet/Koreai (ISO-2022-KR)"
 
-#: src/mainwindow.c:633 src/messageview.c:215
-msgid "/_View/_Code set/Thai (TIS-620)"
-msgstr "/_Nézet/_Kódkészlet/Thai (TIS-620)"
-
-#: src/mainwindow.c:635 src/messageview.c:217
-msgid "/_View/_Code set/Thai (Windows-874)"
-msgstr "/_Nézet/_Kódkészlet/Thai (Windows-874)"
-
-#: src/mainwindow.c:642 src/summaryview.c:371
+#: src/mainwindow.c:651 src/summaryview.c:371
 msgid "/_View/Open in new _window"
 msgstr "/_Nézet/Me_gnyitás új ablakban"
 
-#: src/mainwindow.c:643 src/messageview.c:224
+#: src/mainwindow.c:652 src/messageview.c:224
 msgid "/_View/Mess_age source"
 msgstr "/_Nézet/Ü_zenet forrása"
 
-#: src/mainwindow.c:644 src/messageview.c:225
+#: src/mainwindow.c:653 src/messageview.c:225
 msgid "/_View/Show all _header"
 msgstr "/_Nézet/_Minden fejléc megjelenítése"
 
-#: src/mainwindow.c:646
+#: src/mainwindow.c:655
 msgid "/_View/_Update summary"
 msgstr "/_Nézet/Ö_sszegzés frissítése"
 
-#: src/mainwindow.c:648 src/messageview.c:227
+#: src/mainwindow.c:657 src/messageview.c:227
 msgid "/_Message"
 msgstr "/_Üzenet"
 
-#: src/mainwindow.c:649
+#: src/mainwindow.c:658
 #, fuzzy
 msgid "/_Message/Recei_ve"
 msgstr "/_Üzenet/_Szerkesztés újra"
 
-#: src/mainwindow.c:650
+#: src/mainwindow.c:659
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/_Üzenet/Fog_adás minden hozzáférésről"
 
-#: src/mainwindow.c:652
+#: src/mainwindow.c:661
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/_Üzenet/Fog_adás minden hozzáférésről"
 
-#: src/mainwindow.c:654
+#: src/mainwindow.c:663
 #, fuzzy
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/_Üzenet/Fo_gadás megszakítása"
 
-#: src/mainwindow.c:656
+#: src/mainwindow.c:665
 #, fuzzy
 msgid "/_Message/Recei_ve/---"
 msgstr "/_Üzenet/_Szerkesztés újra"
 
-#: src/mainwindow.c:657
+#: src/mainwindow.c:666
 msgid "/_Message/_Send queued messages"
 msgstr "/_Üzenet/Ü_zenetek küldése a Várakozó sorból"
 
-#: src/mainwindow.c:658 src/mainwindow.c:660 src/mainwindow.c:667
-#: src/mainwindow.c:672 src/mainwindow.c:676 src/mainwindow.c:685
+#: src/mainwindow.c:667 src/mainwindow.c:669 src/mainwindow.c:676
+#: src/mainwindow.c:681 src/mainwindow.c:685 src/mainwindow.c:694
 #: src/messageview.c:230 src/messageview.c:238 src/messageview.c:243
 msgid "/_Message/---"
 msgstr "/_Üzenet/---"
 
-#: src/mainwindow.c:659 src/messageview.c:228
+#: src/mainwindow.c:668 src/messageview.c:228
 msgid "/_Message/Compose _new message"
 msgstr "/_Üzenet/_Új üzenet szerkesztése"
 
-#: src/mainwindow.c:661 src/messageview.c:231
+#: src/mainwindow.c:670 src/messageview.c:231
 msgid "/_Message/_Reply"
 msgstr "/_Üzenet/Vá_lasz"
 
-#: src/mainwindow.c:662
+#: src/mainwindow.c:671
 msgid "/_Message/Repl_y to"
 msgstr "/_Üzenet/_Válasz másnak"
 
-#: src/mainwindow.c:663 src/messageview.c:232
+#: src/mainwindow.c:672 src/messageview.c:232
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Üzenet/Válasz _másnak/ _Mindenkinek"
 
-#: src/mainwindow.c:664 src/messageview.c:234
+#: src/mainwindow.c:673 src/messageview.c:234
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Üzenet/Válasz _másnak/A _feladónak"
 
-#: src/mainwindow.c:665 src/messageview.c:236
+#: src/mainwindow.c:674 src/messageview.c:236
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Üzenet/Válasz _másnak/_Levelező listának"
 
-#: src/mainwindow.c:668 src/messageview.c:239
+#: src/mainwindow.c:677 src/messageview.c:239
 msgid "/_Message/_Forward"
 msgstr "/_Üzenet/_Továbbítás"
 
-#: src/mainwindow.c:669 src/messageview.c:240
+#: src/mainwindow.c:678 src/messageview.c:240
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Üzenet/Továbbítás _csatolásként"
 
-#: src/mainwindow.c:671 src/messageview.c:242
+#: src/mainwindow.c:680 src/messageview.c:242
 msgid "/_Message/Redirec_t"
 msgstr "/_Üzenet/Á_tirányít"
 
-#: src/mainwindow.c:673
+#: src/mainwindow.c:682
 msgid "/_Message/M_ove..."
 msgstr "/_Üzenet/M_ozgatás..."
 
-#: src/mainwindow.c:674
+#: src/mainwindow.c:683
 msgid "/_Message/_Copy..."
 msgstr "/_Üzenet/_Másolás..."
 
-#: src/mainwindow.c:675
+#: src/mainwindow.c:684
 msgid "/_Message/_Delete"
 msgstr "/_Üzenet/_Törlés"
 
-#: src/mainwindow.c:677
+#: src/mainwindow.c:686
 msgid "/_Message/_Mark"
 msgstr "/_Üzenet/_Megjelöl"
 
-#: src/mainwindow.c:678
+#: src/mainwindow.c:687
 msgid "/_Message/_Mark/_Mark"
 msgstr "/_Üzenet/_Megjelöl/_Megjelöl"
 
-#: src/mainwindow.c:679
+#: src/mainwindow.c:688
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/_Üzenet/_Megjelöl/Megjelölés visszavonása"
 
-#: src/mainwindow.c:680
+#: src/mainwindow.c:689
 msgid "/_Message/_Mark/---"
 msgstr "/_Üzenet/_Megjelöl/---"
 
-#: src/mainwindow.c:681
+#: src/mainwindow.c:690
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/_Üzenet/_Megjelöl/Mint olvasatla_n"
 
-#: src/mainwindow.c:682
+#: src/mainwindow.c:691
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/_Üzenet/_Megjelöl/Mint olvaso_tt"
 
-#: src/mainwindow.c:684
+#: src/mainwindow.c:693
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/_Üzenet/_Megjelöl/_Minden olvasottat"
 
-#: src/mainwindow.c:686 src/messageview.c:244
+#: src/mainwindow.c:695 src/messageview.c:244
 msgid "/_Message/Re-_edit"
 msgstr "/_Üzenet/_Szerkesztés újra"
 
-#: src/mainwindow.c:690 src/messageview.c:248
+#: src/mainwindow.c:699 src/messageview.c:248
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/_Eszközök/_Küldő címét a címlistába"
 
-#: src/mainwindow.c:693
+#: src/mainwindow.c:702
 #, fuzzy
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/_Eszközök/Ü_zenetek szűrése"
 
-#: src/mainwindow.c:695
+#: src/mainwindow.c:704
 #, fuzzy
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Eszközök/Ü_zenetek szűrése"
 
-#: src/mainwindow.c:697 src/messageview.c:251
+#: src/mainwindow.c:706 src/messageview.c:251
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Eszközök/_Szűrési szabályok"
 
-#: src/mainwindow.c:698 src/messageview.c:253
+#: src/mainwindow.c:707 src/messageview.c:253
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Eszközök/_Szűrési szabályok/_Automatikusan"
 
-#: src/mainwindow.c:700 src/messageview.c:255
+#: src/mainwindow.c:709 src/messageview.c:255
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Eszközök/_Szűrési szabályok/_Feladó alapján"
 
-#: src/mainwindow.c:702 src/messageview.c:257
+#: src/mainwindow.c:711 src/messageview.c:257
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Eszközök/_Szűrési szabályok/_Címzett alapján"
 
-#: src/mainwindow.c:704 src/messageview.c:259
+#: src/mainwindow.c:713 src/messageview.c:259
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Eszközök/_Szűrési szabályok/_Tárgy alapján"
 
-#: src/mainwindow.c:709
+#: src/mainwindow.c:718
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/_Eszközök/_Duplikált levelek törlése"
 
-#: src/mainwindow.c:712
+#: src/mainwindow.c:721
 msgid "/_Tools/E_xecute"
 msgstr "/_Eszközök/_Futtatás"
 
-#: src/mainwindow.c:714
+#: src/mainwindow.c:723
 msgid "/_Tools/_Log window"
 msgstr "/_Eszközök/_Napló ablak"
 
-#: src/mainwindow.c:716
+#: src/mainwindow.c:725
 msgid "/_Configuration"
 msgstr "/_Beállítások"
 
-#: src/mainwindow.c:717
+#: src/mainwindow.c:726
 msgid "/_Configuration/_Common preferences..."
 msgstr "/_Beállítások/Közös _Beállítások..."
 
-#: src/mainwindow.c:719
+#: src/mainwindow.c:728
 msgid "/_Configuration/_Filter setting..."
 msgstr "/_Beállítások/_Szűrő beállítások..."
 
-#: src/mainwindow.c:721
+#: src/mainwindow.c:730
 msgid "/_Configuration/_Template..."
 msgstr "/_Beállítások/_Sablon..."
 
-#: src/mainwindow.c:722
+#: src/mainwindow.c:731
 msgid "/_Configuration/_Actions..."
 msgstr "/_Beállítások/_Akciók..."
 
-#: src/mainwindow.c:723
+#: src/mainwindow.c:732
 msgid "/_Configuration/---"
 msgstr "/_Beállítások/---"
 
-#: src/mainwindow.c:724
+#: src/mainwindow.c:733
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Beállítások/Aktuális _hozzáférés beállításai..."
 
-#: src/mainwindow.c:726
+#: src/mainwindow.c:735
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Beállítások/_Új hozzáférés létrehozása..."
 
-#: src/mainwindow.c:728
+#: src/mainwindow.c:737
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Beállítások/Hozzáférés _szerkesztése..."
 
-#: src/mainwindow.c:730
+#: src/mainwindow.c:739
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Beállítások/_Aktuális hozzáférés váltása..."
 
-#: src/mainwindow.c:734
+#: src/mainwindow.c:743
 msgid "/_Help/_Manual"
 msgstr "/_Segítség/_Kézikönyv"
 
-#: src/mainwindow.c:735
+#: src/mainwindow.c:744
 msgid "/_Help/_Manual/_English"
 msgstr "/_Segítség/Kézikönyv/_Angol"
 
-#: src/mainwindow.c:736
+#: src/mainwindow.c:745
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/_Segítség/Kézikönyv/_Japán"
 
-#: src/mainwindow.c:737
+#: src/mainwindow.c:746
 msgid "/_Help/_FAQ"
 msgstr "/_Segítség/_GYIK"
 
-#: src/mainwindow.c:738
+#: src/mainwindow.c:747
 msgid "/_Help/_FAQ/_English"
 msgstr "/_Segítség/_GYIK/_Angol"
 
-#: src/mainwindow.c:739
+#: src/mainwindow.c:748
 msgid "/_Help/_FAQ/_German"
 msgstr "/_Segítség/_GYIK/_Német"
 
-#: src/mainwindow.c:740
+#: src/mainwindow.c:749
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/_Segítség/_GYIK/_Spanyol"
 
-#: src/mainwindow.c:741
+#: src/mainwindow.c:750
 msgid "/_Help/_FAQ/_French"
 msgstr "/_Segítség/_GYIK/_Francia"
 
-#: src/mainwindow.c:742
+#: src/mainwindow.c:751
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/_Segítség/_GYIK/_Olasz"
 
-#: src/mainwindow.c:743
+#: src/mainwindow.c:752
 msgid "/_Help/---"
 msgstr "/_Segítség/---"
 
-#: src/mainwindow.c:783
+#: src/mainwindow.c:792
 msgid "Creating main window...\n"
 msgstr "Főablak létrehozása...\n"
 
-#: src/mainwindow.c:943
+#: src/mainwindow.c:952
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Főablak: %d szín foglalása nem sikerült\n"
 
-#: src/mainwindow.c:1021 src/summaryview.c:1368 src/summaryview.c:1677
+#: src/mainwindow.c:1030 src/summaryview.c:1368 src/summaryview.c:1677
 #: src/summaryview.c:1785 src/summaryview.c:1831 src/summaryview.c:2453
 #: src/summaryview.c:3080 src/summaryview.c:3146 src/summaryview.c:3171
 #: src/summaryview.c:3284
 msgid "done.\n"
 msgstr "kész.\n"
 
-#: src/mainwindow.c:1137 src/mainwindow.c:1178 src/mainwindow.c:1206
+#: src/mainwindow.c:1146 src/mainwindow.c:1187 src/mainwindow.c:1215
 msgid "Untitled"
 msgstr "Névtelen"
 
-#: src/mainwindow.c:1207
+#: src/mainwindow.c:1216
 msgid "none"
 msgstr "semmi"
 
-#: src/mainwindow.c:1257
+#: src/mainwindow.c:1266
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "Ablak elválasztás típus változtatása %d-ról, %d-ra\n"
 
-#: src/mainwindow.c:1477
+#: src/mainwindow.c:1486
 msgid "Offline"
 msgstr ""
 
-#: src/mainwindow.c:1478
+#: src/mainwindow.c:1487
 msgid "You are offline. Go online?"
 msgstr ""
 
-#: src/mainwindow.c:1492
+#: src/mainwindow.c:1501
 #, fuzzy
 msgid "Empty all trash"
 msgstr "Kuka ürítése"
 
-#: src/mainwindow.c:1493
+#: src/mainwindow.c:1502
 #, fuzzy
 msgid "Empty messages in all trash?"
 msgstr "Minden üzenet törlése a kukából?"
 
-#: src/mainwindow.c:1521
+#: src/mainwindow.c:1530
 msgid "Add mailbox"
 msgstr "Postaláda hozzáadása"
 
-#: src/mainwindow.c:1522
+#: src/mainwindow.c:1531
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3143,16 +3179,16 @@ msgstr ""
 "Ha már létezik a postaláda, akkor\n"
 "automatikusan átvizsgálom."
 
-#: src/mainwindow.c:1528
+#: src/mainwindow.c:1537
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "A `%s' postaláda már létezik."
 
-#: src/mainwindow.c:1533 src/setup.c:57
+#: src/mainwindow.c:1542 src/setup.c:57
 msgid "Mailbox"
 msgstr "Postaláda"
 
-#: src/mainwindow.c:1539 src/setup.c:63
+#: src/mainwindow.c:1548 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3161,144 +3197,144 @@ msgstr ""
 "A postaláda létrehozása nem sikerült.\n"
 "Talán néhány fájl már létezik, vagy nincs írási jogod."
 
-#: src/mainwindow.c:1912
+#: src/mainwindow.c:1921
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Mappa nézet"
 
-#: src/mainwindow.c:1932 src/messageview.c:358
+#: src/mainwindow.c:1941 src/messageview.c:358
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Üzenet nézet"
 
-#: src/mainwindow.c:2079 src/summaryview.c:340
+#: src/mainwindow.c:2088 src/summaryview.c:340
 msgid "/_Reply"
 msgstr "/_Válasz"
 
-#: src/mainwindow.c:2080
+#: src/mainwindow.c:2089
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "Válasz mindenkinek"
 
-#: src/mainwindow.c:2081
+#: src/mainwindow.c:2090
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/_Válasz másnak/a _feladónak"
 
-#: src/mainwindow.c:2082
+#: src/mainwindow.c:2091
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/_Válasz másnak/_levelezőlistának"
 
-#: src/mainwindow.c:2087 src/summaryview.c:347
+#: src/mainwindow.c:2096 src/summaryview.c:347
 msgid "/_Forward"
 msgstr "/_Továbbítás"
 
-#: src/mainwindow.c:2088 src/summaryview.c:348
+#: src/mainwindow.c:2097 src/summaryview.c:348
 msgid "/For_ward as attachment"
 msgstr "/Csatolásként továbbít"
 
-#: src/mainwindow.c:2089 src/summaryview.c:349
+#: src/mainwindow.c:2098 src/summaryview.c:349
 msgid "/Redirec_t"
 msgstr "/Átirányí_t"
 
-#: src/mainwindow.c:2125
+#: src/mainwindow.c:2134
 msgid "Get"
 msgstr "Fogadás"
 
-#: src/mainwindow.c:2126
+#: src/mainwindow.c:2135
 msgid "Incorporate new mail"
 msgstr "Új E-mailek fogadása"
 
-#: src/mainwindow.c:2133
+#: src/mainwindow.c:2142
 msgid "Get all"
 msgstr "Mind fogadása"
 
-#: src/mainwindow.c:2134
+#: src/mainwindow.c:2143
 msgid "Incorporate new mail of all accounts"
 msgstr "Új E-mail fogadása minden hozzáférésen"
 
-#: src/mainwindow.c:2145
+#: src/mainwindow.c:2154
 msgid "Send queued message(s)"
 msgstr "Várakozó sorból üzenet(ek) küldése"
 
-#: src/mainwindow.c:2155 src/prefs_account.c:705 src/prefs_common.c:852
+#: src/mainwindow.c:2164 src/prefs_account.c:705 src/prefs_common.c:852
 #: src/prefs_folder_item.c:137
 msgid "Compose"
 msgstr "Szerkesztés"
 
-#: src/mainwindow.c:2156
+#: src/mainwindow.c:2165
 msgid "Compose new message"
 msgstr "Új üzenet szerkesztése"
 
-#: src/mainwindow.c:2164 src/prefs_common.c:1353
+#: src/mainwindow.c:2173 src/prefs_common.c:1365
 msgid "Reply"
 msgstr "Válasz"
 
-#: src/mainwindow.c:2165 src/mainwindow.c:2178
+#: src/mainwindow.c:2174 src/mainwindow.c:2187
 msgid "Reply to the message"
 msgstr "Válasz az üzenetre"
 
-#: src/mainwindow.c:2183
+#: src/mainwindow.c:2192
 msgid "Reply all"
 msgstr "Válasz mindre"
 
-#: src/mainwindow.c:2184
+#: src/mainwindow.c:2193
 msgid "Reply to all"
 msgstr "Válasz mindenkinek"
 
-#: src/mainwindow.c:2192 src/prefs_filter_edit.c:719
+#: src/mainwindow.c:2201 src/prefs_filter_edit.c:719
 msgid "Forward"
 msgstr "Továbbít"
 
-#: src/mainwindow.c:2193 src/mainwindow.c:2206
+#: src/mainwindow.c:2202 src/mainwindow.c:2215
 msgid "Forward the message"
 msgstr "Üzenet továbbítása"
 
-#: src/mainwindow.c:2213
+#: src/mainwindow.c:2222
 msgid "Delete the message"
 msgstr "Üzenet törlése"
 
-#: src/mainwindow.c:2221
+#: src/mainwindow.c:2230
 msgid "Execute"
 msgstr "Futtatás"
 
-#: src/mainwindow.c:2222
+#: src/mainwindow.c:2231
 msgid "Execute marked process"
 msgstr "Megjelölt processz futtatása"
 
-#: src/mainwindow.c:2231
+#: src/mainwindow.c:2240
 msgid "Next unread message"
 msgstr "Következő olvasatlan üzenet"
 
-#: src/mainwindow.c:2242
+#: src/mainwindow.c:2251
 msgid "Prefs"
 msgstr "Beállítások"
 
-#: src/mainwindow.c:2243
+#: src/mainwindow.c:2252
 msgid "Common preferences"
 msgstr "Közös beállítások"
 
-#: src/mainwindow.c:2250 src/prefs_folder_item.c:258
+#: src/mainwindow.c:2259 src/prefs_folder_item.c:258
 #: src/prefs_folder_item.c:269 src/progressdialog.c:50
 msgid "Account"
 msgstr "Hozzáférés"
 
-#: src/mainwindow.c:2251
+#: src/mainwindow.c:2260
 msgid "Account setting"
 msgstr "Hozzáférés beállítások"
 
-#: src/mainwindow.c:2425
+#: src/mainwindow.c:2434
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 
-#: src/mainwindow.c:2436
+#: src/mainwindow.c:2445
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 
-#: src/mainwindow.c:2624
+#: src/mainwindow.c:2633
 msgid "Exit"
 msgstr "Kilépés"
 
-#: src/mainwindow.c:2624
+#: src/mainwindow.c:2633
 msgid "Exit this program?"
 msgstr "Kilépés a programból?"
 
@@ -3424,7 +3460,7 @@ msgstr "Keresés befejeződött"
 msgid "Creating message view...\n"
 msgstr "Üzenet nézet létrehozása...\n"
 
-#: src/messageview.c:303 src/prefs_common.c:1550
+#: src/messageview.c:303 src/prefs_common.c:1562
 msgid "Text"
 msgstr "Szöveg"
 
@@ -3437,7 +3473,7 @@ msgstr "Csatolások"
 msgid "Can't save the file `%s'."
 msgstr "`%s' fájlt nem tudom elmenteni."
 
-#: src/messageview.c:697 src/prefs_common.c:2154 src/summaryview.c:2744
+#: src/messageview.c:697 src/prefs_common.c:2166 src/summaryview.c:2744
 msgid "Print"
 msgstr "Nyomtatás"
 
@@ -3913,7 +3949,7 @@ msgstr "(A nem szűrt üzenetek ebbe a mappába kerülnek)"
 msgid "Authentication method"
 msgstr "Azonosítási módszer"
 
-#: src/prefs_account.c:1123 src/prefs_account.c:1239 src/prefs_common.c:1189
+#: src/prefs_account.c:1123 src/prefs_account.c:1239 src/prefs_common.c:1201
 msgid "Automatic"
 msgstr "Automatikus"
 
@@ -3937,7 +3973,7 @@ msgstr "Üzenet-azonosító generálása"
 msgid "Add user-defined header"
 msgstr "Felhasználó által definiált fejléc hozzáadása"
 
-#: src/prefs_account.c:1196 src/prefs_common.c:1714 src/prefs_common.c:1739
+#: src/prefs_account.c:1196 src/prefs_common.c:1726 src/prefs_common.c:1751
 msgid " Edit... "
 msgstr " Szerkesztés... "
 
@@ -4334,106 +4370,107 @@ msgid "Save sent messages to outbox"
 msgstr "Elküldött üzenetek mentése a Kimenő postafiókba"
 
 #: src/prefs_common.c:1113
-msgid "Outgoing codeset"
+#, fuzzy
+msgid "Outgoing encoding"
 msgstr "Kimenő üzenetek kódkészlete"
 
 #: src/prefs_common.c:1128
 msgid "Automatic (Recommended)"
 msgstr "Automatikus (Ajánlott)"
 
-#: src/prefs_common.c:1129
+#: src/prefs_common.c:1130
 msgid "7bit ascii (US-ASCII)"
 msgstr "7 bites ascii (US-ASCII)"
 
-#: src/prefs_common.c:1130
+#: src/prefs_common.c:1132
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
-#: src/prefs_common.c:1131
+#: src/prefs_common.c:1134
 msgid "Western European (ISO-8859-1)"
 msgstr "Nyugat Európai (ISO-8859-1)"
 
-#: src/prefs_common.c:1132
+#: src/prefs_common.c:1135
 msgid "Western European (ISO-8859-15)"
 msgstr "Nyugat Európai (ISO-8859-15)"
 
-#: src/prefs_common.c:1133
+#: src/prefs_common.c:1137
 msgid "Central European (ISO-8859-2)"
 msgstr "Közép Európai (ISO-8859-2)"
 
-#: src/prefs_common.c:1134
+#: src/prefs_common.c:1139
 msgid "Baltic (ISO-8859-13)"
 msgstr "Baltikumi (ISO-8859-13)"
 
-#: src/prefs_common.c:1135
+#: src/prefs_common.c:1140
 msgid "Baltic (ISO-8859-4)"
 msgstr "Baltikumi (ISO-8859-4)"
 
-#: src/prefs_common.c:1136
+#: src/prefs_common.c:1142
 msgid "Greek (ISO-8859-7)"
 msgstr "Görög (ISO-8859-7)"
 
-#: src/prefs_common.c:1137
+#: src/prefs_common.c:1144
 msgid "Turkish (ISO-8859-9)"
 msgstr "Török (ISO-8859-9)"
 
-#: src/prefs_common.c:1138
+#: src/prefs_common.c:1146
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Cirill (ISO-8859-5)"
 
-#: src/prefs_common.c:1139
+#: src/prefs_common.c:1147
 msgid "Cyrillic (KOI8-R)"
 msgstr "Cirill (KOI8-R)"
 
-#: src/prefs_common.c:1140
-msgid "Cyrillic (Windows-1251)"
-msgstr "Cirill (Windows-1251)"
-
-#: src/prefs_common.c:1141
+#: src/prefs_common.c:1148
 msgid "Cyrillic (KOI8-U)"
 msgstr "Cirill (KOI8-U)"
 
-#: src/prefs_common.c:1142
+#: src/prefs_common.c:1149
+msgid "Cyrillic (Windows-1251)"
+msgstr "Cirill (Windows-1251)"
+
+#: src/prefs_common.c:1151
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Japán (ISO-2022-JP)"
 
-#: src/prefs_common.c:1144
+#: src/prefs_common.c:1153
 msgid "Japanese (EUC-JP)"
 msgstr "Japán (EUC-JP)"
 
-#: src/prefs_common.c:1145
+#: src/prefs_common.c:1154
 msgid "Japanese (Shift_JIS)"
 msgstr "Japán (Shift_JIS)"
 
-#: src/prefs_common.c:1147
+#: src/prefs_common.c:1157
 msgid "Simplified Chinese (GB2312)"
 msgstr "Egyszerűsített Kínai (GB2312)"
 
-#: src/prefs_common.c:1148
+#: src/prefs_common.c:1158
 msgid "Traditional Chinese (Big5)"
 msgstr "Tradicionális Kínai (Big5)"
 
-#: src/prefs_common.c:1150
+#: src/prefs_common.c:1160
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Tradicionális Kínai (EUC-TW)"
 
-#: src/prefs_common.c:1151
+#: src/prefs_common.c:1161
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Kínai (ISO-2022-CN)"
 
-#: src/prefs_common.c:1153
+#: src/prefs_common.c:1164
 msgid "Korean (EUC-KR)"
 msgstr "Koreai (EUC-KR)"
 
-#: src/prefs_common.c:1154
+#: src/prefs_common.c:1166
 msgid "Thai (TIS-620)"
 msgstr "Thai (TIS-620)"
 
-#: src/prefs_common.c:1155
+#: src/prefs_common.c:1167
 msgid "Thai (Windows-874)"
 msgstr "Thai (Windows-874)"
 
-#: src/prefs_common.c:1165
+#: src/prefs_common.c:1177
 #, fuzzy
 msgid ""
 "If `Automatic' is selected, the optimal encoding for the current locale will "
@@ -4442,11 +4479,11 @@ msgstr ""
 "Ha az `Automatikus' be van kapcsolva, akkor az optimális kódolást\n"
 "használom a helyi nyelvi beállításoknak megfelelően."
 
-#: src/prefs_common.c:1179
+#: src/prefs_common.c:1191
 msgid "Transfer encoding"
 msgstr "Átvitel kódolása"
 
-#: src/prefs_common.c:1202
+#: src/prefs_common.c:1214
 #, fuzzy
 msgid ""
 "Specify Content-Transfer-Encoding used when message body contains non-ASCII "
@@ -4455,118 +4492,118 @@ msgstr ""
 "Határozd meg a Content-Transfer-Encoding értékét\n"
 "ha az üzenet tartalmaz nem-ASCII karaktereket is."
 
-#: src/prefs_common.c:1272
+#: src/prefs_common.c:1284
 msgid "Signature separator"
 msgstr "Aláírás elválasztó"
 
-#: src/prefs_common.c:1281
+#: src/prefs_common.c:1293
 msgid "Insert automatically"
 msgstr "Automatikus beillesztés"
 
-#: src/prefs_common.c:1291
+#: src/prefs_common.c:1303
 msgid "Automatically launch the external editor"
 msgstr "Külső szerkesztő automatikus indítása"
 
-#: src/prefs_common.c:1301
+#: src/prefs_common.c:1313
 msgid "Undo level"
 msgstr "Visszavonás mélysége"
 
-#: src/prefs_common.c:1321
+#: src/prefs_common.c:1333
 msgid "Wrap messages at"
 msgstr "Sortörés helye"
 
-#: src/prefs_common.c:1333
+#: src/prefs_common.c:1345
 msgid "characters"
 msgstr "karakter"
 
-#: src/prefs_common.c:1343
+#: src/prefs_common.c:1355
 msgid "Wrap quotation"
 msgstr "Idézet törése"
 
-#: src/prefs_common.c:1349
+#: src/prefs_common.c:1361
 msgid "Wrap on input"
 msgstr "Bevitel tördelése"
 
-#: src/prefs_common.c:1351
+#: src/prefs_common.c:1363
 msgid "Wrap before sending"
 msgstr "Sortördelés küldés előtt"
 
-#: src/prefs_common.c:1361
+#: src/prefs_common.c:1373
 msgid "Automatically select account for replies"
 msgstr "Automatikus hozzáférés választás válaszkor"
 
-#: src/prefs_common.c:1363
+#: src/prefs_common.c:1375
 msgid "Quote message when replying"
 msgstr "Üzenet idézése a válaszban"
 
-#: src/prefs_common.c:1365
+#: src/prefs_common.c:1377
 msgid "Reply button invokes mailing list reply"
 msgstr "A `Válasz' gomb a `Válasz levelező listára' funkciót hozza fel"
 
 #. reply
-#: src/prefs_common.c:1411
+#: src/prefs_common.c:1423
 msgid "Reply format"
 msgstr "Válasz formátuma"
 
-#: src/prefs_common.c:1426 src/prefs_common.c:1468
+#: src/prefs_common.c:1438 src/prefs_common.c:1480
 msgid "Quotation mark"
 msgstr "Idézet jele"
 
 #. forward
-#: src/prefs_common.c:1453
+#: src/prefs_common.c:1465
 msgid "Forward format"
 msgstr "Továbbítási formátuma"
 
-#: src/prefs_common.c:1500
+#: src/prefs_common.c:1512
 msgid " Description of symbols "
 msgstr " Szimbólumok leírása "
 
-#: src/prefs_common.c:1541
+#: src/prefs_common.c:1553
 msgid "Font"
 msgstr "Betűkészlet"
 
-#: src/prefs_common.c:1573
+#: src/prefs_common.c:1585
 msgid "Translate header name (such as `From:', `Subject:')"
 msgstr "Fejléc fordítása (mint `Feladó:', `Tárgy:')"
 
-#: src/prefs_common.c:1576
+#: src/prefs_common.c:1588
 msgid "Display unread number next to folder name"
 msgstr "Mappanév mellett az olvasatlan levelek számának kijelzése"
 
-#: src/prefs_common.c:1585
+#: src/prefs_common.c:1597
 msgid "Abbreviate newsgroups longer than"
 msgstr "Hírcsoportok rövidítése, ha hosszabb mint"
 
-#: src/prefs_common.c:1600
+#: src/prefs_common.c:1612
 msgid "letters"
 msgstr "levél"
 
 #. ---- Summary ----
-#: src/prefs_common.c:1606
+#: src/prefs_common.c:1618
 msgid "Summary View"
 msgstr "Összefoglaló nézet"
 
-#: src/prefs_common.c:1615
+#: src/prefs_common.c:1627
 msgid "Display recipient on `From' column if sender is yourself"
 msgstr "Címzett mutatása a `Feladó' oszlopban ha önmagadnak küldted"
 
-#: src/prefs_common.c:1617
+#: src/prefs_common.c:1629
 msgid "Expand threads"
 msgstr "Folyam kifejtése"
 
-#: src/prefs_common.c:1625 src/prefs_common.c:2443 src/prefs_common.c:2481
+#: src/prefs_common.c:1637 src/prefs_common.c:2455 src/prefs_common.c:2493
 msgid "Date format"
 msgstr "Dátum formátuma"
 
-#: src/prefs_common.c:1646
+#: src/prefs_common.c:1658
 msgid " Set display item of summary... "
 msgstr " Összefoglalás kijelzésének beállítása... "
 
-#: src/prefs_common.c:1710
+#: src/prefs_common.c:1722
 msgid "Enable coloration of message"
 msgstr "Színek használata az üzenetekhez"
 
-#: src/prefs_common.c:1724
+#: src/prefs_common.c:1736
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
@@ -4574,324 +4611,324 @@ msgstr ""
 "Több byte-os karakterek és számok megjelenítése\n"
 "ASCII karakterekkel (csak japán esetén)"
 
-#: src/prefs_common.c:1730
+#: src/prefs_common.c:1742
 msgid "Display header pane above message view"
 msgstr "Fejlécmező megjelenítése az üzenet fölött"
 
-#: src/prefs_common.c:1737
+#: src/prefs_common.c:1749
 msgid "Display short headers on message view"
 msgstr "Rövid fejlécek az üzenet nézetben"
 
-#: src/prefs_common.c:1758
+#: src/prefs_common.c:1770
 msgid "Line space"
 msgstr "Sortávolság"
 
-#: src/prefs_common.c:1772 src/prefs_common.c:1810
+#: src/prefs_common.c:1784 src/prefs_common.c:1822
 msgid "pixel(s)"
 msgstr "Képpont"
 
-#: src/prefs_common.c:1777
+#: src/prefs_common.c:1789
 msgid "Scroll"
 msgstr "Görgetés"
 
-#: src/prefs_common.c:1784
+#: src/prefs_common.c:1796
 msgid "Half page"
 msgstr "Fél oldal"
 
-#: src/prefs_common.c:1790
+#: src/prefs_common.c:1802
 msgid "Smooth scroll"
 msgstr "Finom görgetés"
 
-#: src/prefs_common.c:1796
+#: src/prefs_common.c:1808
 msgid "Step"
 msgstr "Lépés"
 
-#: src/prefs_common.c:1816
+#: src/prefs_common.c:1828
 msgid "Images"
 msgstr ""
 
-#: src/prefs_common.c:1824
+#: src/prefs_common.c:1836
 #, fuzzy
 msgid "Resize attached large images to fit in the window"
 msgstr "A csatolt képek átméretezése"
 
-#: src/prefs_common.c:1826
+#: src/prefs_common.c:1838
 #, fuzzy
 msgid "Display images as inline"
 msgstr "Fejléc beállítások"
 
-#: src/prefs_common.c:1871
+#: src/prefs_common.c:1883
 msgid "Automatically check signatures"
 msgstr "Digitális aláírás automatikus ellenőrzése"
 
-#: src/prefs_common.c:1874
+#: src/prefs_common.c:1886
 msgid "Show signature check result in a popup window"
 msgstr "Aláírásellenőrzés eredménye felbukkanó ablakban"
 
-#: src/prefs_common.c:1877
+#: src/prefs_common.c:1889
 msgid "Store passphrase in memory temporarily"
 msgstr "Jelmondat ideiglenes tárolása a memóriában"
 
-#: src/prefs_common.c:1892
+#: src/prefs_common.c:1904
 msgid "Expired after"
 msgstr "Lejár, után"
 
-#: src/prefs_common.c:1905
+#: src/prefs_common.c:1917
 msgid "minute(s) "
 msgstr "perc"
 
-#: src/prefs_common.c:1918
+#: src/prefs_common.c:1930
 #, fuzzy
 msgid "Setting to '0' will store the passphrase for the whole session."
 msgstr ""
 "('0'-ra állítva  a kapcsolódás teljes időtartamára\n"
 " tárolja a jelmondatot)"
 
-#: src/prefs_common.c:1932
+#: src/prefs_common.c:1944
 msgid "Grab input while entering a passphrase"
 msgstr "Bevitel elkapása egy jelmondat beadásakor"
 
-#: src/prefs_common.c:1937
+#: src/prefs_common.c:1949
 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.c:1989
+#: src/prefs_common.c:2001
 msgid "Always open messages in summary when selected"
 msgstr "Az üzenetek mindig összefoglalva jelennek meg, ha ez kiválasztott"
 
-#: src/prefs_common.c:1993
+#: src/prefs_common.c:2005
 msgid "Open first unread message when entering a folder"
 msgstr "Mappába lépéskor az első olvasatlan üzenet megnyitása"
 
-#: src/prefs_common.c:1997
+#: src/prefs_common.c:2009
 msgid "Only mark message as read when opened in new window"
 msgstr "Csak az új ablakban megnyitott üzeneteket jelölje olvasottként."
 
-#: src/prefs_common.c:2001
+#: src/prefs_common.c:2013
 msgid "Go to inbox after receiving new mail"
 msgstr "Váltson a bejövő postafiókra e-mail fogadás után"
 
-#: src/prefs_common.c:2009
+#: src/prefs_common.c:2021
 msgid "Execute immediately when moving or deleting messages"
 msgstr "Azonnali végrehajtás üzenet mozgatás vagy törlés esetén"
 
-#: src/prefs_common.c:2021
+#: src/prefs_common.c:2033
 #, fuzzy
 msgid "Messages will be marked until execution if this is turned off."
 msgstr ""
 "(Az üzenetek kijelölten láthatók a feldolgozáskor,\n"
 " ha ez kikapcsolt állapotban van)"
 
-#: src/prefs_common.c:2029
+#: src/prefs_common.c:2041
 msgid "Receive dialog"
 msgstr "Fogadó ablak"
 
-#: src/prefs_common.c:2039
+#: src/prefs_common.c:2051
 msgid "Show receive dialog"
 msgstr "Fogadó ablak mutatása"
 
-#: src/prefs_common.c:2049
+#: src/prefs_common.c:2061
 msgid "Always"
 msgstr "Mindig"
 
-#: src/prefs_common.c:2050
+#: src/prefs_common.c:2062
 msgid "Only on manual receiving"
 msgstr ""
 
-#: src/prefs_common.c:2052
+#: src/prefs_common.c:2064
 msgid "Never"
 msgstr "Soha"
 
-#: src/prefs_common.c:2057
+#: src/prefs_common.c:2069
 msgid "Don't popup error dialog on receive error"
 msgstr "Ne dobjon fel hibaablakot fogadási hiba esetén"
 
-#: src/prefs_common.c:2060
+#: src/prefs_common.c:2072
 msgid "Close receive dialog when finished"
 msgstr "Fogadó ablak bezárása ha végzett"
 
-#: src/prefs_common.c:2066
+#: src/prefs_common.c:2078
 msgid " Set key bindings... "
 msgstr " Billentyű hozzárendelések... "
 
-#: src/prefs_common.c:2122
+#: src/prefs_common.c:2134
 #, 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.c:2131
+#: src/prefs_common.c:2143
 msgid "Web browser"
 msgstr "Web böngésző"
 
-#: src/prefs_common.c:2195
+#: src/prefs_common.c:2207
 msgid "Add address to destination when double-clicked"
 msgstr "Dupla-klikk esetén cím a célmezőbe"
 
-#: src/prefs_common.c:2197
+#: src/prefs_common.c:2209
 msgid "On exit"
 msgstr "Kilépéskor"
 
-#: src/prefs_common.c:2205
+#: src/prefs_common.c:2217
 msgid "Confirm on exit"
 msgstr "Kilépéskor rákérdez"
 
-#: src/prefs_common.c:2212
+#: src/prefs_common.c:2224
 msgid "Empty trash on exit"
 msgstr "Kuka ürítése kilépéskor"
 
-#: src/prefs_common.c:2214
+#: src/prefs_common.c:2226
 msgid "Ask before emptying"
 msgstr "Ürítés előtt rákérdez"
 
-#: src/prefs_common.c:2218
+#: src/prefs_common.c:2230
 msgid "Warn if there are queued messages"
 msgstr "Elküldetlen üzenetek esetén figyelmeztet"
 
-#: src/prefs_common.c:2224
+#: src/prefs_common.c:2236
 msgid "Socket I/O timeout:"
 msgstr "Hálózati adatátvitel időtúllépés:"
 
-#: src/prefs_common.c:2237
+#: src/prefs_common.c:2249
 msgid "second(s)"
 msgstr "másodperc"
 
-#: src/prefs_common.c:2419
+#: src/prefs_common.c:2431
 msgid "the full abbreviated weekday name"
 msgstr "rövidített nap név"
 
-#: src/prefs_common.c:2420
+#: src/prefs_common.c:2432
 msgid "the full weekday name"
 msgstr "teljes nap név"
 
-#: src/prefs_common.c:2421
+#: src/prefs_common.c:2433
 msgid "the abbreviated month name"
 msgstr "rövidített hónapnév"
 
-#: src/prefs_common.c:2422
+#: src/prefs_common.c:2434
 msgid "the full month name"
 msgstr "a teljes hónapnév"
 
-#: src/prefs_common.c:2423
+#: src/prefs_common.c:2435
 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.c:2424
+#: src/prefs_common.c:2436
 msgid "the century number (year/100)"
 msgstr "évszázad (év/100)"
 
-#: src/prefs_common.c:2425
+#: src/prefs_common.c:2437
 msgid "the day of the month as a decimal number"
 msgstr "hónap napja számként"
 
-#: src/prefs_common.c:2426
+#: src/prefs_common.c:2438
 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.c:2427
+#: src/prefs_common.c:2439
 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.c:2428
+#: src/prefs_common.c:2440
 msgid "the day of the year as a decimal number"
 msgstr "Az év napja számként"
 
-#: src/prefs_common.c:2429
+#: src/prefs_common.c:2441
 msgid "the month as a decimal number"
 msgstr "hónap számként"
 
-#: src/prefs_common.c:2430
+#: src/prefs_common.c:2442
 msgid "the minute as a decimal number"
 msgstr "perc számként"
 
-#: src/prefs_common.c:2431
+#: src/prefs_common.c:2443
 msgid "either AM or PM"
 msgstr "DE vagy DU"
 
-#: src/prefs_common.c:2432
+#: src/prefs_common.c:2444
 msgid "the second as a decimal number"
 msgstr "másodperc számként"
 
-#: src/prefs_common.c:2433
+#: src/prefs_common.c:2445
 msgid "the day of the week as a decimal number"
 msgstr "hét napja számként"
 
-#: src/prefs_common.c:2434
+#: src/prefs_common.c:2446
 msgid "the preferred date for the current locale"
 msgstr "ajánlott dátum az aktuális nyelvi beállításhoz"
 
-#: src/prefs_common.c:2435
+#: src/prefs_common.c:2447
 msgid "the last two digits of a year"
 msgstr "az évszám utolsó két számjegye"
 
-#: src/prefs_common.c:2436
+#: src/prefs_common.c:2448
 msgid "the year as a decimal number"
 msgstr "év számként"
 
-#: src/prefs_common.c:2437
+#: src/prefs_common.c:2449
 msgid "the time zone or name or abbreviation"
 msgstr "időzóna vagy név vagy rövidítés"
 
-#: src/prefs_common.c:2458
+#: src/prefs_common.c:2470
 msgid "Specifier"
 msgstr "Vezérlőjel"
 
-#: src/prefs_common.c:2459
+#: src/prefs_common.c:2471
 msgid "Description"
 msgstr "Leírás"
 
-#: src/prefs_common.c:2499
+#: src/prefs_common.c:2511
 msgid "Example"
 msgstr "Példa"
 
-#: src/prefs_common.c:2580
+#: src/prefs_common.c:2592
 msgid "Set message colors"
 msgstr "Üzenetszín beállítása"
 
-#: src/prefs_common.c:2588
+#: src/prefs_common.c:2600
 msgid "Colors"
 msgstr "Színek"
 
-#: src/prefs_common.c:2622
+#: src/prefs_common.c:2634
 msgid "Quoted Text - First Level"
 msgstr "Idézett szöveg - első szint"
 
-#: src/prefs_common.c:2628
+#: src/prefs_common.c:2640
 msgid "Quoted Text - Second Level"
 msgstr "Idézett szöveg - második szint"
 
-#: src/prefs_common.c:2634
+#: src/prefs_common.c:2646
 msgid "Quoted Text - Third Level"
 msgstr "Idézett szöveg - harmadik szint"
 
-#: src/prefs_common.c:2640
+#: src/prefs_common.c:2652
 msgid "URI link"
 msgstr "URI-kapocs"
 
-#: src/prefs_common.c:2647
+#: src/prefs_common.c:2659
 msgid "Recycle quote colors"
 msgstr "Idézet színeinek újrahasznosítása"
 
-#: src/prefs_common.c:2707
+#: src/prefs_common.c:2719
 msgid "Pick color for quotation level 1"
 msgstr "1. szintű idézet színe"
 
-#: src/prefs_common.c:2710
+#: src/prefs_common.c:2722
 msgid "Pick color for quotation level 2"
 msgstr "2. szintű idézet színe"
 
-#: src/prefs_common.c:2713
+#: src/prefs_common.c:2725
 msgid "Pick color for quotation level 3"
 msgstr "3. szintű idézet színe"
 
-#: src/prefs_common.c:2716
+#: src/prefs_common.c:2728
 msgid "Pick color for URI"
 msgstr "URI színe"
 
-#: src/prefs_common.c:2853
+#: src/prefs_common.c:2865
 msgid "Description of symbols"
 msgstr "Szimbólumok leírása"
 
-#: src/prefs_common.c:2909
+#: src/prefs_common.c:2921
 msgid ""
 "Date\n"
 "From\n"
@@ -4915,11 +4952,11 @@ msgstr ""
 "Hírcsoportok\n"
 "Üzenet-azonosító"
 
-#: src/prefs_common.c:2922
+#: src/prefs_common.c:2934
 msgid "If x is set, displays expr"
 msgstr "Ha x beállítva, akkor kifejezés megjelenítése"
 
-#: src/prefs_common.c:2926
+#: src/prefs_common.c:2938
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -4933,7 +4970,7 @@ msgstr ""
 "Idézett üzenet törzs aláírás nélkül\n"
 "Szó szerint %"
 
-#: src/prefs_common.c:2934
+#: src/prefs_common.c:2946
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -4945,15 +4982,15 @@ msgstr ""
 "Nyitó kapcsos zárójel\n"
 "Záró kapcsos zárójel"
 
-#: src/prefs_common.c:2971
+#: src/prefs_common.c:2983
 msgid "Font selection"
 msgstr "Betűtípus választás"
 
-#: src/prefs_common.c:3035
+#: src/prefs_common.c:3047
 msgid "Key bindings"
 msgstr "Billentyű hozzárendelések"
 
-#: src/prefs_common.c:3049
+#: src/prefs_common.c:3061
 msgid ""
 "Select the preset of key bindings.\n"
 "You can also modify each menu's shortcuts by pressing\n"
@@ -4963,11 +5000,11 @@ msgstr ""
 "Módosíthatod minden menü gyorsbillentyűjét, ha az egérmutatóval\n"
 "rámutatva megnyomod a kívánt billentyűt."
 
-#: src/prefs_common.c:3061 src/prefs_common.c:3410
+#: src/prefs_common.c:3073 src/prefs_common.c:3422
 msgid "Default"
 msgstr "Alapértelmezés"
 
-#: src/prefs_common.c:3064 src/prefs_common.c:3419
+#: src/prefs_common.c:3076 src/prefs_common.c:3431
 msgid "Old Sylpheed"
 msgstr "Régi Sylpheed"
 
@@ -6132,6 +6169,12 @@ msgstr "%.2fGB"
 msgid "writing to %s failed.\n"
 msgstr "%s fájlba nem sikerült írni.\n"
 
+#~ msgid "/_View/_Code set/---"
+#~ msgstr "/_Nézet/_Kódkészlet/---"
+
+#~ msgid "/_View/_Code set"
+#~ msgstr "/_Nézet/_Kódkészlet"
+
 #~ msgid "To save this part, pop up the context menu with "
 #~ msgstr "E rész elmentéséhez nyisd meg a helyzetfüggő menüt a "
 
diff --git a/po/it.po b/po/it.po
index 0fc14e4b..02c7e9f3 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed 1.9.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-03-15 14:29+0900\n"
+"POT-Creation-Date: 2005-03-16 14:47+0900\n"
 "PO-Revision-Date: 2005-03-08 19:48+0100\n"
 "Last-Translator: Danilo Bodei <dbodei@lombardiacom.it>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -100,7 +100,7 @@ msgstr ""
 "tutti»."
 
 #: src/account.c:638 src/addressadd.c:186 src/addressbook.c:488
-#: src/compose.c:3650 src/editaddress.c:195 src/editaddress.c:936
+#: src/compose.c:3748 src/editaddress.c:195 src/editaddress.c:936
 #: src/editaddress.c:984 src/editbook.c:191 src/editgroup.c:257
 #: src/editjpilot.c:296 src/editldap.c:300 src/editvcard.c:211
 #: src/mimeview.c:151 src/prefs_filter.c:214 src/prefs_folder_item.c:170
@@ -153,13 +153,13 @@ msgstr "Elimina account"
 msgid "Do you really want to delete this account?"
 msgstr "Eliminare questo account?"
 
-#: src/account.c:758 src/compose.c:2551 src/compose.c:4807
+#: src/account.c:758 src/compose.c:2632 src/compose.c:4943
 #: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
 #: src/folderview.c:2156 src/folderview.c:2192
 msgid "Yes"
 msgstr "Sì"
 
-#: src/account.c:758 src/compose.c:2551 src/compose.c:4807
+#: src/account.c:758 src/compose.c:2632 src/compose.c:4943
 #: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
 #: src/folderview.c:2156 src/folderview.c:2192
 msgid "+No"
@@ -264,7 +264,7 @@ msgstr "Argomento dell'azione utente"
 msgid "Add Address to Book"
 msgstr "Aggiunta dell'indirizzo alla rubrica"
 
-#: src/addressadd.c:196 src/compose.c:4191 src/editaddress.c:196
+#: src/addressadd.c:196 src/compose.c:4292 src/editaddress.c:196
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "Indirizzo"
@@ -278,7 +278,7 @@ msgstr "Note"
 msgid "Select Address Book Folder"
 msgstr "Selezione della cartella della rubrica"
 
-#: src/addressbook.c:334 src/compose.c:469 src/mainwindow.c:454
+#: src/addressbook.c:334 src/compose.c:477 src/mainwindow.c:454
 #: src/messageview.c:134
 msgid "/_File"
 msgstr "/_File"
@@ -299,8 +299,8 @@ msgstr "/_File/Nuovo _JPilot"
 msgid "/_File/New _Server"
 msgstr "/_File/_Nuovo server"
 
-#: src/addressbook.c:343 src/addressbook.c:346 src/compose.c:474
-#: src/compose.c:479 src/compose.c:483 src/mainwindow.c:471
+#: src/addressbook.c:343 src/addressbook.c:346 src/compose.c:482
+#: src/compose.c:487 src/compose.c:491 src/mainwindow.c:471
 #: src/mainwindow.c:474 src/mainwindow.c:476 src/mainwindow.c:479
 #: src/mainwindow.c:481 src/messageview.c:137
 msgid "/_File/---"
@@ -318,7 +318,7 @@ msgstr "/_File/_Elimina"
 msgid "/_File/_Save"
 msgstr "/_File/_Salva"
 
-#: src/addressbook.c:348 src/compose.c:484 src/messageview.c:138
+#: src/addressbook.c:348 src/compose.c:492 src/messageview.c:138
 msgid "/_File/_Close"
 msgstr "/_File/_Chiudi"
 
@@ -350,7 +350,7 @@ msgstr "/_Indirizzo/_Modifica"
 msgid "/_Address/_Delete"
 msgstr "/_indirizzo/_Elimina"
 
-#: src/addressbook.c:356 src/compose.c:585 src/mainwindow.c:688
+#: src/addressbook.c:356 src/compose.c:664 src/mainwindow.c:697
 #: src/messageview.c:246
 msgid "/_Tools"
 msgstr "/S_trumenti"
@@ -359,12 +359,12 @@ msgstr "/S_trumenti"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/S_trumenti/Importa file _LDIF"
 
-#: src/addressbook.c:358 src/compose.c:598 src/mainwindow.c:733
+#: src/addressbook.c:358 src/compose.c:677 src/mainwindow.c:742
 #: src/messageview.c:264
 msgid "/_Help"
 msgstr "/A_iuto"
 
-#: src/addressbook.c:359 src/compose.c:599 src/mainwindow.c:744
+#: src/addressbook.c:359 src/compose.c:678 src/mainwindow.c:753
 #: src/messageview.c:265
 msgid "/_Help/_About"
 msgstr "/A_iuto/I_nformazioni"
@@ -381,7 +381,7 @@ msgstr "/Nuovo _gruppo"
 msgid "/New _Folder"
 msgstr "/Nuova _cartella"
 
-#: src/addressbook.c:381 src/addressbook.c:391 src/compose.c:463
+#: src/addressbook.c:381 src/addressbook.c:391 src/compose.c:471
 #: src/folderview.c:220 src/folderview.c:222 src/folderview.c:226
 #: src/folderview.c:236 src/folderview.c:238 src/folderview.c:240
 #: src/folderview.c:244 src/folderview.c:254 src/folderview.c:256
@@ -391,7 +391,7 @@ msgstr "/Nuova _cartella"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:382 src/addressbook.c:392 src/compose.c:486
+#: src/addressbook.c:382 src/addressbook.c:392 src/compose.c:494
 #: src/mainwindow.c:485 src/messageview.c:140
 msgid "/_Edit"
 msgstr "/_Modifica"
@@ -404,7 +404,7 @@ msgstr "/Eli_mina"
 msgid "E-Mail address"
 msgstr "Indirizzo e-mail"
 
-#: src/addressbook.c:493 src/compose.c:4192 src/prefs_common.c:2186
+#: src/addressbook.c:493 src/compose.c:4293 src/prefs_common.c:2198
 msgid "Address book"
 msgstr "Rubrica"
 
@@ -414,7 +414,7 @@ msgstr "Nome:"
 
 #. Buttons
 #: src/addressbook.c:625 src/addressbook.c:1665 src/addressbook.c:1671
-#: src/editaddress.c:878 src/editaddress.c:1011 src/mainwindow.c:2212
+#: src/editaddress.c:878 src/editaddress.c:1011 src/mainwindow.c:2221
 #: src/prefs_actions.c:263 src/prefs_display_header.c:275
 #: src/prefs_display_header.c:330 src/prefs_template.c:227
 msgid "Delete"
@@ -609,7 +609,7 @@ msgstr "Indirizzo comune"
 msgid "Personal address"
 msgstr "Indirizzo personale"
 
-#: src/alertpanel.c:123 src/compose.c:4807 src/main.c:458
+#: src/alertpanel.c:123 src/compose.c:4943 src/main.c:458
 msgid "Notice"
 msgstr "Avviso"
 
@@ -617,7 +617,7 @@ msgstr "Avviso"
 msgid "Warning"
 msgstr "Avvertimento"
 
-#: src/alertpanel.c:149 src/compose.c:2551 src/inc.c:558
+#: src/alertpanel.c:149 src/compose.c:2632 src/inc.c:558
 msgid "Error"
 msgstr "Errore"
 
@@ -665,299 +665,417 @@ msgstr "Marrone"
 msgid "None"
 msgstr "Niente"
 
-#: src/compose.c:461
+#: src/compose.c:469
 msgid "/_Add..."
 msgstr "/_Aggiungi..."
 
-#: src/compose.c:462
+#: src/compose.c:470
 msgid "/_Remove"
 msgstr "/_Rimuovi"
 
-#: src/compose.c:464 src/folderview.c:228 src/folderview.c:246
+#: src/compose.c:472 src/folderview.c:228 src/folderview.c:246
 #: src/folderview.c:261
 msgid "/_Properties..."
 msgstr "/_Proprietà..."
 
-#: src/compose.c:470
+#: src/compose.c:478
 msgid "/_File/_Send"
 msgstr "/_File/In_via"
 
-#: src/compose.c:472
+#: src/compose.c:480
 msgid "/_File/Send _later"
 msgstr "/_File/Invia _più tardi"
 
-#: src/compose.c:475
+#: src/compose.c:483
 msgid "/_File/Save to _draft folder"
 msgstr "/_File/_Salva nella cartella «Bozze»"
 
-#: src/compose.c:477
+#: src/compose.c:485
 msgid "/_File/Save and _keep editing"
 msgstr "/_File/Sa_lva e mantieni l'editazione"
 
-#: src/compose.c:480
+#: src/compose.c:488
 msgid "/_File/_Attach file"
 msgstr "/_File/_Allega file"
 
-#: src/compose.c:481
+#: src/compose.c:489
 msgid "/_File/_Insert file"
 msgstr "/_File/_Inserisci file"
 
-#: src/compose.c:482
+#: src/compose.c:490
 msgid "/_File/Insert si_gnature"
 msgstr "/_File/Inserisci fi_rma"
 
-#: src/compose.c:487
+#: src/compose.c:495
 msgid "/_Edit/_Undo"
 msgstr "/_Modifica/_Annulla"
 
-#: src/compose.c:488
+#: src/compose.c:496
 msgid "/_Edit/_Redo"
 msgstr "/_Modifica/_Ripeti"
 
-#: src/compose.c:489 src/compose.c:567 src/mainwindow.c:489
+#: src/compose.c:497 src/compose.c:575 src/mainwindow.c:489
 #: src/messageview.c:143
 msgid "/_Edit/---"
 msgstr "/_Modifica/---"
 
-#: src/compose.c:490
+#: src/compose.c:498
 msgid "/_Edit/Cu_t"
 msgstr "/_Modifica/_Taglia"
 
-#: src/compose.c:491 src/mainwindow.c:486 src/messageview.c:141
+#: src/compose.c:499 src/mainwindow.c:486 src/messageview.c:141
 msgid "/_Edit/_Copy"
 msgstr "/_Modifica/_Copia"
 
-#: src/compose.c:492
+#: src/compose.c:500
 msgid "/_Edit/_Paste"
 msgstr "/_Modifica/_Incolla"
 
-#: src/compose.c:493
+#: src/compose.c:501
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Modifica/Incolla co_me citazione"
 
-#: src/compose.c:495 src/mainwindow.c:487 src/messageview.c:142
+#: src/compose.c:503 src/mainwindow.c:487 src/messageview.c:142
 msgid "/_Edit/Select _all"
 msgstr "/_Modifica/_Seleziona tutto"
 
-#: src/compose.c:496
+#: src/compose.c:504
 msgid "/_Edit/A_dvanced"
 msgstr "/_Modifica/A_vanzato"
 
-#: src/compose.c:497
+#: src/compose.c:505
 msgid "/_Edit/A_dvanced/Move a character backward"
 msgstr "/_Modifica/A_vanzato/Un carattere indietro"
 
-#: src/compose.c:502
+#: src/compose.c:510
 msgid "/_Edit/A_dvanced/Move a character forward"
 msgstr "/_Modifica/A_vanzato/Un carattere avanti"
 
-#: src/compose.c:507
+#: src/compose.c:515
 msgid "/_Edit/A_dvanced/Move a word backward"
 msgstr "/_Modifica/A_vanzato/Una parola indietro"
 
-#: src/compose.c:512
+#: src/compose.c:520
 msgid "/_Edit/A_dvanced/Move a word forward"
 msgstr "/_Modifica/A_vanzato/Una parola avanti"
 
-#: src/compose.c:517
+#: src/compose.c:525
 msgid "/_Edit/A_dvanced/Move to beginning of line"
 msgstr "/_Modifica/A_vanzato/Inizio riga"
 
-#: src/compose.c:522
+#: src/compose.c:530
 msgid "/_Edit/A_dvanced/Move to end of line"
 msgstr "/_Modifica/A_vanzato/Fine riga"
 
-#: src/compose.c:527
+#: src/compose.c:535
 msgid "/_Edit/A_dvanced/Move to previous line"
 msgstr "/_Modifica/A_vanzato/Riga precedente"
 
-#: src/compose.c:532
+#: src/compose.c:540
 msgid "/_Edit/A_dvanced/Move to next line"
 msgstr "/_Modifica/A_vanzato/Riga successiva"
 
-#: src/compose.c:537
+#: src/compose.c:545
 msgid "/_Edit/A_dvanced/Delete a character backward"
 msgstr "/_Modifica/A_vanzato/Elimina carattere indietro"
 
-#: src/compose.c:542
+#: src/compose.c:550
 msgid "/_Edit/A_dvanced/Delete a character forward"
 msgstr "/_Modifica/A_vanzato/Elimina carattere avanti"
 
-#: src/compose.c:547
+#: src/compose.c:555
 msgid "/_Edit/A_dvanced/Delete a word backward"
 msgstr "/_Modifica/A_vanzato/Elimina parola indietro"
 
-#: src/compose.c:552
+#: src/compose.c:560
 msgid "/_Edit/A_dvanced/Delete a word forward"
 msgstr "/_Modifica/A_vanzato/Elimina parola avanti"
 
-#: src/compose.c:557
+#: src/compose.c:565
 msgid "/_Edit/A_dvanced/Delete line"
 msgstr "/_Modifica/A_vanzato/Elimina riga"
 
-#: src/compose.c:562
+#: src/compose.c:570
 msgid "/_Edit/A_dvanced/Delete to end of line"
 msgstr "/_Modifica/A_vanzato/Elimina fino al termine riga"
 
-#: src/compose.c:568
+#: src/compose.c:576
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/_Modifica/A capo _paragrafo attuale"
 
-#: src/compose.c:570
+#: src/compose.c:578
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/_Modifica/A capo tutte le righe _lunghe"
 
-#: src/compose.c:572
+#: src/compose.c:580
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Modifica/A cap_o automatico"
 
-#: src/compose.c:573 src/mainwindow.c:494 src/messageview.c:147
+#: src/compose.c:581 src/mainwindow.c:494 src/messageview.c:147
 #: src/summaryview.c:370
 msgid "/_View"
 msgstr "/_Visualizza"
 
-#: src/compose.c:574
+#: src/compose.c:582
 msgid "/_View/_To"
 msgstr "/_Visualizza/_A"
 
-#: src/compose.c:575
+#: src/compose.c:583
 msgid "/_View/_Cc"
 msgstr "/_Visualizza/_Cc"
 
-#: src/compose.c:576
+#: src/compose.c:584
 msgid "/_View/_Bcc"
 msgstr "/_Visualizza/_Bcc"
 
-#: src/compose.c:577
+#: src/compose.c:585
 msgid "/_View/_Reply to"
 msgstr "/_Visualizza/_Rispondi a"
 
-#: src/compose.c:578 src/compose.c:580 src/compose.c:582 src/mainwindow.c:512
-#: src/mainwindow.c:515 src/mainwindow.c:541 src/mainwindow.c:565
-#: src/mainwindow.c:641 src/mainwindow.c:645 src/messageview.c:223
+#: src/compose.c:586 src/compose.c:588 src/compose.c:590 src/compose.c:592
+#: src/mainwindow.c:512 src/mainwindow.c:515 src/mainwindow.c:541
+#: src/mainwindow.c:565 src/mainwindow.c:650 src/mainwindow.c:654
+#: src/messageview.c:223
 msgid "/_View/---"
 msgstr "/_Visualizza/---"
 
-#: src/compose.c:579
+#: src/compose.c:587
 msgid "/_View/_Followup to"
 msgstr "/_Visualizza/_Seguito di"
 
-#: src/compose.c:581
+#: src/compose.c:589
 msgid "/_View/R_uler"
 msgstr "/_Visualizza/R_ighello"
 
-#: src/compose.c:583
+#: src/compose.c:591
 msgid "/_View/_Attachment"
 msgstr "/_Visualizza/Alle_gato"
 
-#: src/compose.c:586 src/mainwindow.c:689 src/messageview.c:247
+#: src/compose.c:598 src/mainwindow.c:572 src/messageview.c:154
+#, fuzzy
+msgid "/_View/Character _encoding"
+msgstr "/_Visualizza/_Ordina/Dis_cendente"
+
+#: src/compose.c:599
+msgid "/_View/Character _encoding/_Automatic"
+msgstr ""
+
+#: src/compose.c:601 src/compose.c:607 src/compose.c:613 src/compose.c:617
+#: src/compose.c:623 src/compose.c:627 src/compose.c:631 src/compose.c:641
+#: src/compose.c:645 src/compose.c:653 src/compose.c:657 src/mainwindow.c:568
+#: src/mainwindow.c:575 src/messageview.c:150
+#, fuzzy
+msgid "/_View/Character _encoding/---"
+msgstr "/_Visualizza/_Ordina/Dis_cendente"
+
+#: src/compose.c:603 src/mainwindow.c:576 src/messageview.c:158
+#, fuzzy
+msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
+msgstr "/_Visualizza/Co_difica/ASCII a 7 bit (US-ASC_II)"
+
+#: src/compose.c:605 src/mainwindow.c:578 src/messageview.c:161
+#, fuzzy
+msgid "/_View/Character _encoding/Unicode (_UTF-8)"
+msgstr "/_Visualizza/Co_difica/Unicode (_UTF-8)"
+
+#: src/compose.c:609 src/mainwindow.c:582 src/messageview.c:164
+#, fuzzy
+msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
+msgstr "/_Visualizza/Co_difica/Europa Occidentale (ISO-8859-_1)"
+
+#: src/compose.c:611 src/mainwindow.c:584 src/messageview.c:166
+#, fuzzy
+msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
+msgstr "/_Visualizza/Co_difica/Europa Occidentale (IS_O-8859-15)"
+
+#: src/compose.c:615 src/mainwindow.c:588 src/messageview.c:169
+#, fuzzy
+msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
+msgstr "/_Visualizza/Co_difica/Europa Centrale (ISO-8859-_2)"
+
+#: src/compose.c:619 src/mainwindow.c:592 src/messageview.c:172
+#, fuzzy
+msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
+msgstr "/_Visualizza/Co_difica/Baltico (I_SO-8859-13)"
+
+#: src/compose.c:621 src/mainwindow.c:594 src/messageview.c:174
+#, fuzzy
+msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
+msgstr "/_Visualizza/Co_difica/Baltico (ISO-8859-_4)"
+
+#: src/compose.c:625 src/mainwindow.c:598 src/messageview.c:177
+#, fuzzy
+msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
+msgstr "/_Visualizza/Co_difica/Greco (ISO-8859-_7)"
+
+#: src/compose.c:629 src/mainwindow.c:602 src/messageview.c:180
+#, fuzzy
+msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
+msgstr "/_Visualizza/Co_difica/Turco (ISO-8859-_9)"
+
+#: src/compose.c:633 src/mainwindow.c:606 src/messageview.c:183
+#, fuzzy
+msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
+msgstr "/_Visualizza/Co_difica/Cirillico (ISO-8859-_5)"
+
+#: src/compose.c:635 src/mainwindow.c:608 src/messageview.c:185
+#, fuzzy
+msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
+msgstr "/_Visualizza/Co_difica/Cirillico (KOI8-_R)"
+
+#: src/compose.c:637 src/mainwindow.c:610 src/messageview.c:187
+#, fuzzy
+msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
+msgstr "/_Visualizza/Co_difica/Ciri_llico (KOI8-U)"
+
+#: src/compose.c:639 src/mainwindow.c:612 src/messageview.c:189
+#, fuzzy
+msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
+msgstr "/_Visualizza/Co_difica/Cirillico (_Windows-1251)"
+
+#: src/compose.c:643 src/mainwindow.c:616 src/messageview.c:192
+#, fuzzy
+msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
+msgstr "/_Visualizza/Co_difica/Giapponese (ISO-2022-_JP)"
+
+#: src/compose.c:647 src/mainwindow.c:626 src/messageview.c:201
+#, fuzzy
+msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
+msgstr "/_Visualizza/Co_difica/Cinese semplificato (_GB2312)"
+
+#: src/compose.c:649 src/mainwindow.c:628 src/messageview.c:203
+#, fuzzy
+msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
+msgstr "/_Visualizza/Co_difica/Cinese tradizionale (_Big5)"
+
+#: src/compose.c:651 src/mainwindow.c:630 src/messageview.c:205
+#, fuzzy
+msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
+msgstr "/_Visualizza/Co_difica/Cinese tradizionale (EUC-_TW)"
+
+#: src/compose.c:655 src/mainwindow.c:636 src/messageview.c:210
+#, fuzzy
+msgid "/_View/Character _encoding/Korean (EUC-_KR)"
+msgstr "/_Visualizza/Co_difica/Coreano (EUC-_KR)"
+
+#: src/compose.c:659 src/mainwindow.c:642 src/messageview.c:215
+#, fuzzy
+msgid "/_View/Character _encoding/Thai (TIS-620)"
+msgstr "/_Visualizza/Co_difica/Tailandese (TIS-_620)"
+
+#: src/compose.c:661 src/mainwindow.c:644 src/messageview.c:217
+#, fuzzy
+msgid "/_View/Character _encoding/Thai (Windows-874)"
+msgstr "/_Visualizza/Co_difica/Tailan_dese (Windows-874)"
+
+#: src/compose.c:665 src/mainwindow.c:698 src/messageview.c:247
 msgid "/_Tools/_Address book"
 msgstr "/S_trumenti/_Rubrica"
 
-#: src/compose.c:587
+#: src/compose.c:666
 msgid "/_Tools/_Template"
 msgstr "/S_trumenti/_Modello"
 
-#: src/compose.c:588 src/mainwindow.c:707 src/messageview.c:262
+#: src/compose.c:667 src/mainwindow.c:716 src/messageview.c:262
 msgid "/_Tools/Actio_ns"
 msgstr "/S_trumenti/A_zioni"
 
-#: src/compose.c:589 src/compose.c:593 src/mainwindow.c:692
-#: src/mainwindow.c:706 src/mainwindow.c:708 src/mainwindow.c:711
-#: src/mainwindow.c:713 src/messageview.c:250 src/messageview.c:261
+#: src/compose.c:668 src/compose.c:672 src/mainwindow.c:701
+#: src/mainwindow.c:715 src/mainwindow.c:717 src/mainwindow.c:720
+#: src/mainwindow.c:722 src/messageview.c:250 src/messageview.c:261
 msgid "/_Tools/---"
 msgstr "/S_trumenti/---"
 
-#: src/compose.c:590
+#: src/compose.c:669
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/_Strumenti/Modifica con l'_editor esterno"
 
-#: src/compose.c:594
+#: src/compose.c:673
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Strumenti/Firma P_GP"
 
-#: src/compose.c:595
+#: src/compose.c:674
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/_Strumenti/_Cifratura PGP"
 
-#: src/compose.c:800
+#: src/compose.c:879
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: il file non esiste\n"
 
-#: src/compose.c:899 src/compose.c:958 src/procmsg.c:1303
+#: src/compose.c:978 src/compose.c:1037 src/procmsg.c:1303
 msgid "Can't get text part\n"
 msgstr "Impossibile ricevere parte del testo\n"
 
-#: src/compose.c:1340
+#: src/compose.c:1419
 msgid "Quote mark format error."
 msgstr "Errore del formato del segno di citazione."
 
-#: src/compose.c:1352
+#: src/compose.c:1431
 msgid "Message reply/forward format error."
 msgstr "Errore del formato nel messaggio di risposta/inoltro."
 
-#: src/compose.c:1679
+#: src/compose.c:1758
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Il file %s non esiste\n"
 
-#: src/compose.c:1683
+#: src/compose.c:1762
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Impossibile ottenere la dimensione di %s\n"
 
-#: src/compose.c:1687
+#: src/compose.c:1766
 #, c-format
 msgid "File %s is empty."
 msgstr "Il file %s è vuoto."
 
-#: src/compose.c:1691
+#: src/compose.c:1770
 #, c-format
 msgid "Can't read %s."
 msgstr "Impossibile leggere %s."
 
-#: src/compose.c:1726
+#: src/compose.c:1805
 #, c-format
 msgid "Message: %s"
 msgstr "Messaggio: %s"
 
-#: src/compose.c:1797 src/mimeview.c:491
+#: src/compose.c:1876 src/mimeview.c:491
 msgid "Can't get the part of multipart message."
 msgstr "Impossibile ricevere parte del messaggio composto."
 
-#: src/compose.c:2188
+#: src/compose.c:2267
 msgid " [Edited]"
 msgstr " [Modificato]"
 
-#: src/compose.c:2190
+#: src/compose.c:2269
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Composizione messaggio %s"
 
-#: src/compose.c:2193
+#: src/compose.c:2272
 #, c-format
 msgid "Compose message%s"
 msgstr "Composizione messaggio %s"
 
-#: src/compose.c:2304
+#: src/compose.c:2383
 msgid "Recipient is not specified."
 msgstr "Il destinatario non è specificato."
 
-#: src/compose.c:2312 src/compose.c:4112 src/mainwindow.c:2144
+#: src/compose.c:2391 src/compose.c:4213 src/mainwindow.c:2153
 #: src/prefs_account.c:703 src/prefs_common.c:850
 msgid "Send"
 msgstr "Invia"
 
-#: src/compose.c:2313
+#: src/compose.c:2392
 msgid "Subject is empty. Send it anyway?"
 msgstr "L'oggetto è vuoto. Inviarlo comunque?"
 
-#: src/compose.c:2364
+#: src/compose.c:2443
 msgid "can't get recipient list."
 msgstr "impossibile ottenere la lista dei destinatari."
 
-#: src/compose.c:2384
+#: src/compose.c:2463
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -965,28 +1083,28 @@ msgstr ""
 "Non è specificato l'account per l'invio della posta.\n"
 "Scegliere un account di posta prima dell'invio."
 
-#: src/compose.c:2398 src/send_message.c:261
+#: src/compose.c:2477 src/send_message.c:261
 #, 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:2421
+#: src/compose.c:2500
 msgid "Can't save the message to outbox."
 msgstr "Impossibile salvare il messaggio nella cartella «Inviata»."
 
-#: src/compose.c:2457
+#: src/compose.c:2536
 #, 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:2518 src/compose.c:2739 src/compose.c:2802 src/compose.c:2921
+#: src/compose.c:2597 src/compose.c:2820 src/compose.c:2883 src/compose.c:3003
 #: src/utils.c:2189
 msgid "can't change file mode\n"
 msgstr "impossibile cambiare i permessi del file\n"
 
-#: src/compose.c:2546
+#: src/compose.c:2627
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -996,140 +1114,140 @@ msgstr ""
 "%s a %s.\n"
 "Spedirlo comunque?"
 
-#: src/compose.c:2610
+#: src/compose.c:2691
 msgid "can't write headers\n"
 msgstr "impossibile scrivere le intestazioni\n"
 
-#: src/compose.c:2881
+#: src/compose.c:2963
 msgid "can't remove the old message\n"
 msgstr "impossibile rimuovere il vecchio messaggio\n"
 
-#: src/compose.c:2899
+#: src/compose.c:2981
 msgid "queueing message...\n"
 msgstr "accodamento messaggio...\n"
 
-#: src/compose.c:2981
+#: src/compose.c:3063
 msgid "can't find queue folder\n"
 msgstr "impossibile trovare la cartella «Coda»\n"
 
-#: src/compose.c:2988
+#: src/compose.c:3070
 msgid "can't queue the message\n"
 msgstr "impossibile accodare il messaggio\n"
 
-#: src/compose.c:3547
+#: src/compose.c:3645
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "generato l'ID-messaggio: %s\n"
 
-#: src/compose.c:3645
+#: src/compose.c:3743
 msgid "Creating compose window...\n"
 msgstr "Creazione della finestra di composizione...\n"
 
-#: src/compose.c:3648 src/compose.c:4598
+#: src/compose.c:3746 src/compose.c:4734
 msgid "MIME type"
 msgstr "Tipo MIME"
 
 #. S_COL_DATE
-#: src/compose.c:3649 src/mimeview.c:150 src/prefs_filter_edit.c:569
+#: src/compose.c:3747 src/mimeview.c:150 src/prefs_filter_edit.c:569
 #: src/prefs_summary_column.c:73 src/select-keys.c:317 src/summaryview.c:386
 msgid "Size"
 msgstr "Dimensione"
 
-#: src/compose.c:3700 src/headerview.c:53 src/summary_search.c:169
+#: src/compose.c:3798 src/headerview.c:53 src/summary_search.c:169
 msgid "From:"
 msgstr "Da:"
 
-#: src/compose.c:4113
+#: src/compose.c:4214
 msgid "Send message"
 msgstr "Invia il messaggio"
 
-#: src/compose.c:4121
+#: src/compose.c:4222
 msgid "Send later"
 msgstr "Invia più tardi"
 
-#: src/compose.c:4122
+#: src/compose.c:4223
 msgid "Put into queue folder and send later"
 msgstr "Mette nella cartella «Coda» e invia più tardi"
 
-#: src/compose.c:4130
+#: src/compose.c:4231
 msgid "Draft"
 msgstr "Bozze"
 
-#: src/compose.c:4131
+#: src/compose.c:4232
 msgid "Save to draft folder"
 msgstr "Salva nella cartella «Bozze»"
 
-#: src/compose.c:4141 src/compose.c:5382
+#: src/compose.c:4242 src/compose.c:5527
 msgid "Insert"
 msgstr "Inserisci"
 
-#: src/compose.c:4142
+#: src/compose.c:4243
 msgid "Insert file"
 msgstr "Inserisce il file"
 
-#: src/compose.c:4150
+#: src/compose.c:4251
 msgid "Attach"
 msgstr "Allega"
 
-#: src/compose.c:4151
+#: src/compose.c:4252
 msgid "Attach file"
 msgstr "Allega il file"
 
 #. signature
-#: src/compose.c:4161 src/prefs_account.c:1339 src/prefs_common.c:1261
+#: src/compose.c:4262 src/prefs_account.c:1339 src/prefs_common.c:1273
 msgid "Signature"
 msgstr "Firma"
 
-#: src/compose.c:4162
+#: src/compose.c:4263
 msgid "Insert signature"
 msgstr "Inserisce la firma"
 
-#: src/compose.c:4171 src/prefs_common.c:1283 src/prefs_common.c:2165
+#: src/compose.c:4272 src/prefs_common.c:1295 src/prefs_common.c:2177
 msgid "Editor"
 msgstr "Editor"
 
-#: src/compose.c:4172
+#: src/compose.c:4273
 msgid "Edit with external editor"
 msgstr "Modifica con l'editor esterno"
 
-#: src/compose.c:4180
+#: src/compose.c:4281
 msgid "Linewrap"
 msgstr "A capo riga"
 
-#: src/compose.c:4181
+#: src/compose.c:4282
 msgid "Wrap all long lines"
 msgstr "Manda a capo tutte le righe lunghe"
 
-#: src/compose.c:4492
+#: src/compose.c:4628
 msgid "Invalid MIME type."
 msgstr "Tipo MIME non valido."
 
-#: src/compose.c:4511
+#: src/compose.c:4647
 msgid "File doesn't exist or is empty."
 msgstr "Il file non esiste o è vuoto."
 
-#: src/compose.c:4580
+#: src/compose.c:4716
 msgid "Properties"
 msgstr "Proprietà"
 
-#: src/compose.c:4600
+#: src/compose.c:4736
 msgid "Encoding"
 msgstr "Codifica"
 
-#: src/compose.c:4623 src/prefs_folder_item.c:183
+#: src/compose.c:4759 src/prefs_folder_item.c:183
 msgid "Path"
 msgstr "Percorso"
 
-#: src/compose.c:4624
+#: src/compose.c:4760
 msgid "File name"
 msgstr "Nome del file"
 
-#: src/compose.c:4778
+#: src/compose.c:4914
 #, 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:4804
+#: src/compose.c:4940
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1140,72 +1258,72 @@ msgstr ""
 "Forzare la conclusione del processo?\n"
 "group id del processo: %d"
 
-#: src/compose.c:4817
+#: src/compose.c:4953
 #, c-format
 msgid "Terminated process group id: %d"
 msgstr "Group id del processo terminato: %d"
 
-#: src/compose.c:4818
+#: src/compose.c:4954
 #, c-format
 msgid "Temporary file: %s"
 msgstr "File temporaneo: %s"
 
-#: src/compose.c:4842
+#: src/compose.c:4978
 msgid "Compose: input from monitoring process\n"
 msgstr "Composizione: input da un processo di controllo\n"
 
 #. failed
-#: src/compose.c:4875
+#: src/compose.c:5011
 msgid "Couldn't exec external editor\n"
 msgstr "Impossibile eseguire l'editor esterno\n"
 
-#: src/compose.c:4879
+#: src/compose.c:5015
 msgid "Couldn't write to file\n"
 msgstr "Impossibile scrivere sul file\n"
 
-#: src/compose.c:4881
+#: src/compose.c:5017
 msgid "Pipe read failed\n"
 msgstr "Lettura dalla pipe fallita\n"
 
-#: src/compose.c:5182 src/compose.c:5190 src/compose.c:5196
+#: src/compose.c:5318 src/compose.c:5326 src/compose.c:5332
 msgid "Can't queue the message."
 msgstr "Impossibile accodare il messaggio."
 
-#: src/compose.c:5287
+#: src/compose.c:5423
 #, fuzzy
 msgid "Select files"
 msgstr "Selezione del file"
 
-#: src/compose.c:5309
+#: src/compose.c:5445
 msgid "Select file"
 msgstr "Selezione del file"
 
-#: src/compose.c:5344
+#: src/compose.c:5480
 msgid "Discard message"
 msgstr "Scarta il messaggio"
 
-#: src/compose.c:5345
+#: src/compose.c:5481
 msgid "This message has been modified. discard it?"
 msgstr "Questo messaggio è stato modificato. Scartarlo?"
 
-#: src/compose.c:5346
+#: src/compose.c:5482
 msgid "Discard"
 msgstr "Scarta"
 
-#: src/compose.c:5346
+#: src/compose.c:5482
 msgid "to Draft"
 msgstr "nella cartella «Bozze»"
 
-#: src/compose.c:5379
+#: src/compose.c:5524
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Applicare il modello «%s» ?"
 
-#: src/compose.c:5381
+#: src/compose.c:5526
 msgid "Apply template"
 msgstr "Applica il modello"
 
-#: src/compose.c:5382
+#: src/compose.c:5527
 msgid "Replace"
 msgstr "Sostituisci"
 
@@ -1646,12 +1764,12 @@ msgstr "Impostazione delle informazioni della cartella...\n"
 msgid "Setting folder info..."
 msgstr "Impostazione delle informazioni della cartella..."
 
-#: src/folderview.c:652 src/mainwindow.c:3190 src/setup.c:81
+#: src/folderview.c:652 src/mainwindow.c:3199 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Analisi della cartella %s%c%s..."
 
-#: src/folderview.c:656 src/mainwindow.c:3195 src/setup.c:86
+#: src/folderview.c:656 src/mainwindow.c:3204 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Analisi della cartella %s..."
@@ -2107,7 +2225,7 @@ msgstr "Importazione del file LDIF nella rubrica"
 msgid "Prev"
 msgstr "Precedente"
 
-#: src/importldif.c:761 src/mainwindow.c:2230
+#: src/importldif.c:761 src/mainwindow.c:2239
 msgid "Next"
 msgstr "Successivo"
 
@@ -2557,7 +2675,8 @@ msgid "/_View/Separate f_older tree"
 msgstr "/_Visualizza/Albero _cartella separato"
 
 #: src/mainwindow.c:514
-msgid "/_View/Separate m_essage view"
+#, fuzzy
+msgid "/_View/Separate _message view"
 msgstr "/_Visualizza/Vista m_essaggio separata"
 
 #: src/mainwindow.c:516
@@ -2693,422 +2812,340 @@ msgstr "/_Visualizza/V_ai a/Messaggio e_tichettato successivo"
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Visualizza/V_ai a/Cartella di_fferente..."
 
-#: src/mainwindow.c:568 src/mainwindow.c:575 src/messageview.c:150
-msgid "/_View/_Code set/---"
-msgstr "/_Visualizza/Co_difica/---"
-
-#: src/mainwindow.c:572 src/messageview.c:154
-msgid "/_View/_Code set"
-msgstr "/_Visualizza/Co_difica"
-
 #: src/mainwindow.c:573 src/messageview.c:155
-msgid "/_View/_Code set/_Auto detect"
+#, fuzzy
+msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Visualizza/Co_difica/_Automatica"
 
-#: src/mainwindow.c:576 src/messageview.c:158
-msgid "/_View/_Code set/7bit ascii (US-ASC_II)"
-msgstr "/_Visualizza/Co_difica/ASCII a 7 bit (US-ASC_II)"
-
-#: src/mainwindow.c:579 src/messageview.c:161
-msgid "/_View/_Code set/Unicode (_UTF-8)"
-msgstr "/_Visualizza/Co_difica/Unicode (_UTF-8)"
-
-#: src/mainwindow.c:582 src/messageview.c:164
-msgid "/_View/_Code set/Western European (ISO-8859-_1)"
-msgstr "/_Visualizza/Co_difica/Europa Occidentale (ISO-8859-_1)"
-
-#: src/mainwindow.c:584 src/messageview.c:166
-msgid "/_View/_Code set/Western European (ISO-8859-15)"
-msgstr "/_Visualizza/Co_difica/Europa Occidentale (IS_O-8859-15)"
-
-#: src/mainwindow.c:587 src/messageview.c:169
-msgid "/_View/_Code set/Central European (ISO-8859-_2)"
-msgstr "/_Visualizza/Co_difica/Europa Centrale (ISO-8859-_2)"
-
-#: src/mainwindow.c:590 src/messageview.c:172
-msgid "/_View/_Code set/_Baltic (ISO-8859-13)"
-msgstr "/_Visualizza/Co_difica/Baltico (I_SO-8859-13)"
-
-#: src/mainwindow.c:592 src/messageview.c:174
-msgid "/_View/_Code set/Baltic (ISO-8859-_4)"
-msgstr "/_Visualizza/Co_difica/Baltico (ISO-8859-_4)"
-
-#: src/mainwindow.c:595 src/messageview.c:177
-msgid "/_View/_Code set/Greek (ISO-8859-_7)"
-msgstr "/_Visualizza/Co_difica/Greco (ISO-8859-_7)"
-
-#: src/mainwindow.c:598 src/messageview.c:180
-msgid "/_View/_Code set/Turkish (ISO-8859-_9)"
-msgstr "/_Visualizza/Co_difica/Turco (ISO-8859-_9)"
-
-#: src/mainwindow.c:601 src/messageview.c:183
-msgid "/_View/_Code set/Cyrillic (ISO-8859-_5)"
-msgstr "/_Visualizza/Co_difica/Cirillico (ISO-8859-_5)"
-
-#: src/mainwindow.c:603 src/messageview.c:185
-msgid "/_View/_Code set/Cyrillic (KOI8-_R)"
-msgstr "/_Visualizza/Co_difica/Cirillico (KOI8-_R)"
-
-#: src/mainwindow.c:605 src/messageview.c:187
-msgid "/_View/_Code set/Cyrillic (KOI8-U)"
-msgstr "/_Visualizza/Co_difica/Ciri_llico (KOI8-U)"
-
-#: src/mainwindow.c:607 src/messageview.c:189
-msgid "/_View/_Code set/Cyrillic (Windows-1251)"
-msgstr "/_Visualizza/Co_difica/Cirillico (_Windows-1251)"
-
-#: src/mainwindow.c:610 src/messageview.c:192
-msgid "/_View/_Code set/Japanese (ISO-2022-_JP)"
-msgstr "/_Visualizza/Co_difica/Giapponese (ISO-2022-_JP)"
-
-#: src/mainwindow.c:612 src/messageview.c:194
-msgid "/_View/_Code set/Japanese (ISO-2022-JP-2)"
+#: src/mainwindow.c:618 src/messageview.c:194
+#, fuzzy
+msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Visualizza/Co_difica/Gia_pponese (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:614 src/messageview.c:196
-msgid "/_View/_Code set/Japanese (_EUC-JP)"
+#: src/mainwindow.c:620 src/messageview.c:196
+#, fuzzy
+msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Visualizza/Co_difica/Giapponese (_EUC-JP)"
 
-#: src/mainwindow.c:616 src/messageview.c:198
-msgid "/_View/_Code set/Japanese (_Shift__JIS)"
+#: src/mainwindow.c:622 src/messageview.c:198
+#, fuzzy
+msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Visualizza/Co_difica/Giapponese (S_hift__JIS)"
 
-#: src/mainwindow.c:619 src/messageview.c:201
-msgid "/_View/_Code set/Simplified Chinese (_GB2312)"
-msgstr "/_Visualizza/Co_difica/Cinese semplificato (_GB2312)"
-
-#: src/mainwindow.c:621 src/messageview.c:203
-msgid "/_View/_Code set/Traditional Chinese (_Big5)"
-msgstr "/_Visualizza/Co_difica/Cinese tradizionale (_Big5)"
-
-#: src/mainwindow.c:623 src/messageview.c:205
-msgid "/_View/_Code set/Traditional Chinese (EUC-_TW)"
-msgstr "/_Visualizza/Co_difica/Cinese tradizionale (EUC-_TW)"
-
-#: src/mainwindow.c:625 src/messageview.c:207
-msgid "/_View/_Code set/Chinese (ISO-2022-_CN)"
+#: src/mainwindow.c:632 src/messageview.c:207
+#, fuzzy
+msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Visualizza/Co_difica/Cinese (ISO-2022-_CN)"
 
-#: src/mainwindow.c:628 src/messageview.c:210
-msgid "/_View/_Code set/Korean (EUC-_KR)"
-msgstr "/_Visualizza/Co_difica/Coreano (EUC-_KR)"
-
-#: src/mainwindow.c:630 src/messageview.c:212
-msgid "/_View/_Code set/Korean (ISO-2022-KR)"
+#: src/mainwindow.c:638 src/messageview.c:212
+#, fuzzy
+msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Visualizza/Co_difica/Corea_no (ISO-2022-KR)"
 
-#: src/mainwindow.c:633 src/messageview.c:215
-msgid "/_View/_Code set/Thai (TIS-620)"
-msgstr "/_Visualizza/Co_difica/Tailandese (TIS-_620)"
-
-#: src/mainwindow.c:635 src/messageview.c:217
-msgid "/_View/_Code set/Thai (Windows-874)"
-msgstr "/_Visualizza/Co_difica/Tailan_dese (Windows-874)"
-
-#: src/mainwindow.c:642 src/summaryview.c:371
+#: src/mainwindow.c:651 src/summaryview.c:371
 msgid "/_View/Open in new _window"
 msgstr "/_Visualizza/Apri nuova _finestra"
 
-#: src/mainwindow.c:643 src/messageview.c:224
+#: src/mainwindow.c:652 src/messageview.c:224
 msgid "/_View/Mess_age source"
 msgstr "/_Visualizza/Sorgente messagg_io"
 
-#: src/mainwindow.c:644 src/messageview.c:225
+#: src/mainwindow.c:653 src/messageview.c:225
 msgid "/_View/Show all _header"
 msgstr "/_Visualizza/Mostra intesta_zioni"
 
-#: src/mainwindow.c:646
+#: src/mainwindow.c:655
 msgid "/_View/_Update summary"
 msgstr "/_Visualizza/A_ggiorna sommario"
 
-#: src/mainwindow.c:648 src/messageview.c:227
+#: src/mainwindow.c:657 src/messageview.c:227
 msgid "/_Message"
 msgstr "/M_essaggio"
 
-#: src/mainwindow.c:649
+#: src/mainwindow.c:658
 msgid "/_Message/Recei_ve"
 msgstr "/M_essaggio/Rice_vi"
 
-#: src/mainwindow.c:650
+#: src/mainwindow.c:659
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/M_essaggio/Rice_vi/Ricevi dall'a_ccount attuale"
 
-#: src/mainwindow.c:652
+#: src/mainwindow.c:661
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/M_essaggio/Rice_vi/Ricevi da _tutti gli account"
 
-#: src/mainwindow.c:654
+#: src/mainwindow.c:663
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/M_essaggio/Rice_vi/Cancella in rice_zione"
 
-#: src/mainwindow.c:656
+#: src/mainwindow.c:665
 msgid "/_Message/Recei_ve/---"
 msgstr "/M_essaggio/Rice_vi/---"
 
-#: src/mainwindow.c:657
+#: src/mainwindow.c:666
 msgid "/_Message/_Send queued messages"
 msgstr "/M_essaggio/Invia messa_ggi accodati"
 
-#: src/mainwindow.c:658 src/mainwindow.c:660 src/mainwindow.c:667
-#: src/mainwindow.c:672 src/mainwindow.c:676 src/mainwindow.c:685
+#: src/mainwindow.c:667 src/mainwindow.c:669 src/mainwindow.c:676
+#: src/mainwindow.c:681 src/mainwindow.c:685 src/mainwindow.c:694
 #: src/messageview.c:230 src/messageview.c:238 src/messageview.c:243
 msgid "/_Message/---"
 msgstr "/M_essaggio/---"
 
-#: src/mainwindow.c:659 src/messageview.c:228
+#: src/mainwindow.c:668 src/messageview.c:228
 msgid "/_Message/Compose _new message"
 msgstr "/M_essaggio/Componi _nuovo messaggio"
 
-#: src/mainwindow.c:661 src/messageview.c:231
+#: src/mainwindow.c:670 src/messageview.c:231
 msgid "/_Message/_Reply"
 msgstr "/M_essaggio/_Rispondi"
 
-#: src/mainwindow.c:662
+#: src/mainwindow.c:671
 msgid "/_Message/Repl_y to"
 msgstr "/M_essaggio/Rispondi _a"
 
-#: src/mainwindow.c:663 src/messageview.c:232
+#: src/mainwindow.c:672 src/messageview.c:232
 msgid "/_Message/Repl_y to/_all"
 msgstr "/M_essaggio/Rispondi _a/_tutti"
 
-#: src/mainwindow.c:664 src/messageview.c:234
+#: src/mainwindow.c:673 src/messageview.c:234
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/M_essaggio/Rispondi _a/_mittente"
 
-#: src/mainwindow.c:665 src/messageview.c:236
+#: src/mainwindow.c:674 src/messageview.c:236
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/M_essaggio/Rispondi _a/mailing _list"
 
-#: src/mainwindow.c:668 src/messageview.c:239
+#: src/mainwindow.c:677 src/messageview.c:239
 msgid "/_Message/_Forward"
 msgstr "/M_essaggio/_Inoltra"
 
-#: src/mainwindow.c:669 src/messageview.c:240
+#: src/mainwindow.c:678 src/messageview.c:240
 msgid "/_Message/For_ward as attachment"
 msgstr "/M_essaggio/Inoltra come a_llegato"
 
-#: src/mainwindow.c:671 src/messageview.c:242
+#: src/mainwindow.c:680 src/messageview.c:242
 msgid "/_Message/Redirec_t"
 msgstr "/M_essaggio/Rispe_disci"
 
-#: src/mainwindow.c:673
+#: src/mainwindow.c:682
 msgid "/_Message/M_ove..."
 msgstr "/M_essaggio/Sp_osta..."
 
-#: src/mainwindow.c:674
+#: src/mainwindow.c:683
 msgid "/_Message/_Copy..."
 msgstr "M_essaggio/_Copia..."
 
-#: src/mainwindow.c:675
+#: src/mainwindow.c:684
 msgid "/_Message/_Delete"
 msgstr "/M_essaggio/Eli_mina"
 
-#: src/mainwindow.c:677
+#: src/mainwindow.c:686
 msgid "/_Message/_Mark"
 msgstr "/M_essaggio/_Segna"
 
-#: src/mainwindow.c:678
+#: src/mainwindow.c:687
 msgid "/_Message/_Mark/_Mark"
 msgstr "/M_essaggio/_Segna/Segn_a"
 
-#: src/mainwindow.c:679
+#: src/mainwindow.c:688
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/M_essaggio/_Segna/To_gli segno"
 
-#: src/mainwindow.c:680
+#: src/mainwindow.c:689
 msgid "/_Message/_Mark/---"
 msgstr "/M_essaggio/_Segna/---"
 
-#: src/mainwindow.c:681
+#: src/mainwindow.c:690
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/M_essaggio/_Segna/Segna co_me non letto"
 
-#: src/mainwindow.c:682
+#: src/mainwindow.c:691
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/M_essaggio/_Segna/Segna come _letto"
 
-#: src/mainwindow.c:684
+#: src/mainwindow.c:693
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/M_essaggio/_Segna/Segna come tutti l_etti"
 
-#: src/mainwindow.c:686 src/messageview.c:244
+#: src/mainwindow.c:695 src/messageview.c:244
 msgid "/_Message/Re-_edit"
 msgstr "/M_essaggio/Rimodi_fica"
 
-#: src/mainwindow.c:690 src/messageview.c:248
+#: src/mainwindow.c:699 src/messageview.c:248
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/S_trumenti/Aggiungi mittente alla ru_brica"
 
-#: src/mainwindow.c:693
+#: src/mainwindow.c:702
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/S_trumenti/_Filtra tutti i messaggi nella cartella"
 
-#: src/mainwindow.c:695
+#: src/mainwindow.c:704
 msgid "/_Tools/Filter _selected messages"
 msgstr "/S_trumenti/Filtra i messaggi _selezionati"
 
-#: src/mainwindow.c:697 src/messageview.c:251
+#: src/mainwindow.c:706 src/messageview.c:251
 msgid "/_Tools/_Create filter rule"
 msgstr "/S_trumenti/_Crea regola per il filtro"
 
-#: src/mainwindow.c:698 src/messageview.c:253
+#: src/mainwindow.c:707 src/messageview.c:253
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/S_trumenti/_Crea regola per il filtro/A_utomaticamente"
 
-#: src/mainwindow.c:700 src/messageview.c:255
+#: src/mainwindow.c:709 src/messageview.c:255
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/S_trumenti/_Crea regola per il filtro/con _Da"
 
-#: src/mainwindow.c:702 src/messageview.c:257
+#: src/mainwindow.c:711 src/messageview.c:257
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/S_trumenti/_Crea regola per il filtro/con _A"
 
-#: src/mainwindow.c:704 src/messageview.c:259
+#: src/mainwindow.c:713 src/messageview.c:259
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/S_trumenti/_Crea regola per il filtro/con l'_Oggetto"
 
-#: src/mainwindow.c:709
+#: src/mainwindow.c:718
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/S_trumenti/Elimina messaggi _duplicati"
 
-#: src/mainwindow.c:712
+#: src/mainwindow.c:721
 msgid "/_Tools/E_xecute"
 msgstr "/S_trumenti/Ese_gui"
 
-#: src/mainwindow.c:714
+#: src/mainwindow.c:723
 msgid "/_Tools/_Log window"
 msgstr "/S_trumenti/Finestra di _log"
 
-#: src/mainwindow.c:716
+#: src/mainwindow.c:725
 msgid "/_Configuration"
 msgstr "/_Configurazione"
 
-#: src/mainwindow.c:717
+#: src/mainwindow.c:726
 msgid "/_Configuration/_Common preferences..."
 msgstr "/_Configurazione/Preferenze _comuni..."
 
-#: src/mainwindow.c:719
+#: src/mainwindow.c:728
 msgid "/_Configuration/_Filter setting..."
 msgstr "/_Configurazione/Configurazione _filtri..."
 
-#: src/mainwindow.c:721
+#: src/mainwindow.c:730
 msgid "/_Configuration/_Template..."
 msgstr "/_Configurazione/Mo_dello..."
 
-#: src/mainwindow.c:722
+#: src/mainwindow.c:731
 msgid "/_Configuration/_Actions..."
 msgstr "/_Configurazione/_Azioni..."
 
-#: src/mainwindow.c:723
+#: src/mainwindow.c:732
 msgid "/_Configuration/---"
 msgstr "/_Configurazione/---"
 
-#: src/mainwindow.c:724
+#: src/mainwindow.c:733
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Configurazione/_Preferenze per l'account attuale..."
 
-#: src/mainwindow.c:726
+#: src/mainwindow.c:735
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Configurazione/Crea _nuovo account..."
 
-#: src/mainwindow.c:728
+#: src/mainwindow.c:737
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Configurazione/_Modifica account..."
 
-#: src/mainwindow.c:730
+#: src/mainwindow.c:739
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Configurazione/Ca_mbia account attuale"
 
-#: src/mainwindow.c:734
+#: src/mainwindow.c:743
 msgid "/_Help/_Manual"
 msgstr "/A_iuto/_Manuale"
 
-#: src/mainwindow.c:735
+#: src/mainwindow.c:744
 msgid "/_Help/_Manual/_English"
 msgstr "/A_iuto/_Manuale/Ingl_ese"
 
-#: src/mainwindow.c:736
+#: src/mainwindow.c:745
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/A_iuto/_Manuale/_Giapponese"
 
-#: src/mainwindow.c:737
+#: src/mainwindow.c:746
 msgid "/_Help/_FAQ"
 msgstr "/A_iuto/_FAQ"
 
-#: src/mainwindow.c:738
+#: src/mainwindow.c:747
 msgid "/_Help/_FAQ/_English"
 msgstr "/A_iuto/_FAQ/Ingl_ese"
 
-#: src/mainwindow.c:739
+#: src/mainwindow.c:748
 msgid "/_Help/_FAQ/_German"
 msgstr "/A_iuto/_FAQ/_Tedesco"
 
-#: src/mainwindow.c:740
+#: src/mainwindow.c:749
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/A_iuto/_FAQ/_Spagnolo"
 
-#: src/mainwindow.c:741
+#: src/mainwindow.c:750
 msgid "/_Help/_FAQ/_French"
 msgstr "/A_iuto/_FAQ/_Francese"
 
-#: src/mainwindow.c:742
+#: src/mainwindow.c:751
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/A_iuto/_FAQ/_Italiano"
 
-#: src/mainwindow.c:743
+#: src/mainwindow.c:752
 msgid "/_Help/---"
 msgstr "/A_iuto/---"
 
-#: src/mainwindow.c:783
+#: src/mainwindow.c:792
 msgid "Creating main window...\n"
 msgstr "Creazione della finestra principale...\n"
 
-#: src/mainwindow.c:943
+#: src/mainwindow.c:952
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "FinestraPrincipale: l'allocazione del colore %d è fallita.\n"
 
-#: src/mainwindow.c:1021 src/summaryview.c:1368 src/summaryview.c:1677
+#: src/mainwindow.c:1030 src/summaryview.c:1368 src/summaryview.c:1677
 #: src/summaryview.c:1785 src/summaryview.c:1831 src/summaryview.c:2453
 #: src/summaryview.c:3080 src/summaryview.c:3146 src/summaryview.c:3171
 #: src/summaryview.c:3284
 msgid "done.\n"
 msgstr "fatto.\n"
 
-#: src/mainwindow.c:1137 src/mainwindow.c:1178 src/mainwindow.c:1206
+#: src/mainwindow.c:1146 src/mainwindow.c:1187 src/mainwindow.c:1215
 msgid "Untitled"
 msgstr "Senza titolo"
 
-#: src/mainwindow.c:1207
+#: src/mainwindow.c:1216
 msgid "none"
 msgstr "niente"
 
-#: src/mainwindow.c:1257
+#: src/mainwindow.c:1266
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "Cambio del tipo di separazione della finestra da %d a %d\n"
 
-#: src/mainwindow.c:1477
+#: src/mainwindow.c:1486
 msgid "Offline"
 msgstr "Offline"
 
-#: src/mainwindow.c:1478
+#: src/mainwindow.c:1487
 msgid "You are offline. Go online?"
 msgstr "Siete offline. Andare online?"
 
-#: src/mainwindow.c:1492
+#: src/mainwindow.c:1501
 msgid "Empty all trash"
 msgstr "Svuota cestino"
 
-#: src/mainwindow.c:1493
+#: src/mainwindow.c:1502
 msgid "Empty messages in all trash?"
 msgstr "Svuotare tutti i messaggi nel cestino?"
 
-#: src/mainwindow.c:1521
+#: src/mainwindow.c:1530
 msgid "Add mailbox"
 msgstr "Aggiunta di una casella postale"
 
-#: src/mainwindow.c:1522
+#: src/mainwindow.c:1531
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3118,16 +3155,16 @@ msgstr ""
 "Se è specificata una casella postale esistente, sarà\n"
 "esaminata automaticamente."
 
-#: src/mainwindow.c:1528
+#: src/mainwindow.c:1537
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "La casella postale «%s» esiste già."
 
-#: src/mainwindow.c:1533 src/setup.c:57
+#: src/mainwindow.c:1542 src/setup.c:57
 msgid "Mailbox"
 msgstr "Casella postale"
 
-#: src/mainwindow.c:1539 src/setup.c:63
+#: src/mainwindow.c:1548 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3137,141 +3174,141 @@ msgstr ""
 "Può darsi che esistano già alcuni file, oppure non si ha il permesso di "
 "scrittura."
 
-#: src/mainwindow.c:1912
+#: src/mainwindow.c:1921
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Vista cartella"
 
-#: src/mainwindow.c:1932 src/messageview.c:358
+#: src/mainwindow.c:1941 src/messageview.c:358
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Vista messaggio"
 
-#: src/mainwindow.c:2079 src/summaryview.c:340
+#: src/mainwindow.c:2088 src/summaryview.c:340
 msgid "/_Reply"
 msgstr "/_Rispondi"
 
-#: src/mainwindow.c:2080
+#: src/mainwindow.c:2089
 msgid "/Reply to _all"
 msgstr "/Rispondi a _tutti"
 
-#: src/mainwindow.c:2081
+#: src/mainwindow.c:2090
 msgid "/Reply to _sender"
 msgstr "/Rispondi _al mittente"
 
-#: src/mainwindow.c:2082
+#: src/mainwindow.c:2091
 msgid "/Reply to mailing _list"
 msgstr "/Rispondi alla mailing _list"
 
-#: src/mainwindow.c:2087 src/summaryview.c:347
+#: src/mainwindow.c:2096 src/summaryview.c:347
 msgid "/_Forward"
 msgstr "/_Inoltra"
 
-#: src/mainwindow.c:2088 src/summaryview.c:348
+#: src/mainwindow.c:2097 src/summaryview.c:348
 msgid "/For_ward as attachment"
 msgstr "/Inoltra com_e allegato"
 
-#: src/mainwindow.c:2089 src/summaryview.c:349
+#: src/mainwindow.c:2098 src/summaryview.c:349
 msgid "/Redirec_t"
 msgstr "/Rispe_disci"
 
-#: src/mainwindow.c:2125
+#: src/mainwindow.c:2134
 msgid "Get"
 msgstr "Ricevi"
 
-#: src/mainwindow.c:2126
+#: src/mainwindow.c:2135
 msgid "Incorporate new mail"
 msgstr "Include la nuova posta"
 
-#: src/mainwindow.c:2133
+#: src/mainwindow.c:2142
 msgid "Get all"
 msgstr "Ricevi tutti"
 
-#: src/mainwindow.c:2134
+#: src/mainwindow.c:2143
 msgid "Incorporate new mail of all accounts"
 msgstr "Include la nuova posta di tutti gli account"
 
-#: src/mainwindow.c:2145
+#: src/mainwindow.c:2154
 msgid "Send queued message(s)"
 msgstr "Invia i messaggi accodati"
 
-#: src/mainwindow.c:2155 src/prefs_account.c:705 src/prefs_common.c:852
+#: src/mainwindow.c:2164 src/prefs_account.c:705 src/prefs_common.c:852
 #: src/prefs_folder_item.c:137
 msgid "Compose"
 msgstr "Componi"
 
-#: src/mainwindow.c:2156
+#: src/mainwindow.c:2165
 msgid "Compose new message"
 msgstr "Compone un nuovo messaggio"
 
-#: src/mainwindow.c:2164 src/prefs_common.c:1353
+#: src/mainwindow.c:2173 src/prefs_common.c:1365
 msgid "Reply"
 msgstr "Rispondi"
 
-#: src/mainwindow.c:2165 src/mainwindow.c:2178
+#: src/mainwindow.c:2174 src/mainwindow.c:2187
 msgid "Reply to the message"
 msgstr "Risponde al messaggio"
 
-#: src/mainwindow.c:2183
+#: src/mainwindow.c:2192
 msgid "Reply all"
 msgstr "Rispondi tutti"
 
-#: src/mainwindow.c:2184
+#: src/mainwindow.c:2193
 msgid "Reply to all"
 msgstr "Risponde a tutti"
 
-#: src/mainwindow.c:2192 src/prefs_filter_edit.c:719
+#: src/mainwindow.c:2201 src/prefs_filter_edit.c:719
 msgid "Forward"
 msgstr "Inoltra"
 
-#: src/mainwindow.c:2193 src/mainwindow.c:2206
+#: src/mainwindow.c:2202 src/mainwindow.c:2215
 msgid "Forward the message"
 msgstr "Inoltra il messaggio"
 
-#: src/mainwindow.c:2213
+#: src/mainwindow.c:2222
 msgid "Delete the message"
 msgstr "Elimina il messaggio"
 
-#: src/mainwindow.c:2221
+#: src/mainwindow.c:2230
 msgid "Execute"
 msgstr "Esegui"
 
-#: src/mainwindow.c:2222
+#: src/mainwindow.c:2231
 msgid "Execute marked process"
 msgstr "Esegue le operazioni segnate"
 
-#: src/mainwindow.c:2231
+#: src/mainwindow.c:2240
 msgid "Next unread message"
 msgstr "Successivo messaggio non letto"
 
-#: src/mainwindow.c:2242
+#: src/mainwindow.c:2251
 msgid "Prefs"
 msgstr "Preferenze"
 
-#: src/mainwindow.c:2243
+#: src/mainwindow.c:2252
 msgid "Common preferences"
 msgstr "Preferenze comuni"
 
-#: src/mainwindow.c:2250 src/prefs_folder_item.c:258
+#: src/mainwindow.c:2259 src/prefs_folder_item.c:258
 #: src/prefs_folder_item.c:269 src/progressdialog.c:50
 msgid "Account"
 msgstr "Account"
 
-#: src/mainwindow.c:2251
+#: src/mainwindow.c:2260
 msgid "Account setting"
 msgstr "Impostazione dell'account"
 
-#: src/mainwindow.c:2425
+#: src/mainwindow.c:2434
 msgid "You are offline. Click the icon to go online."
 msgstr "Siete offline. Fare click sull'icona per andare online."
 
-#: src/mainwindow.c:2436
+#: src/mainwindow.c:2445
 msgid "You are online. Click the icon to go offline."
 msgstr "Siete online. Fare click sull'icona per andare offline."
 
-#: src/mainwindow.c:2624
+#: src/mainwindow.c:2633
 msgid "Exit"
 msgstr "Esci"
 
-#: src/mainwindow.c:2624
+#: src/mainwindow.c:2633
 msgid "Exit this program?"
 msgstr "Uscire da questo programma?"
 
@@ -3397,7 +3434,7 @@ msgstr "Ricerca terminata"
 msgid "Creating message view...\n"
 msgstr "Creazione della vista del messaggio...\n"
 
-#: src/messageview.c:303 src/prefs_common.c:1550
+#: src/messageview.c:303 src/prefs_common.c:1562
 msgid "Text"
 msgstr "Testo"
 
@@ -3410,7 +3447,7 @@ msgstr "Allegati"
 msgid "Can't save the file `%s'."
 msgstr "Impossibile salvare il file «%s»."
 
-#: src/messageview.c:697 src/prefs_common.c:2154 src/summaryview.c:2744
+#: src/messageview.c:697 src/prefs_common.c:2166 src/summaryview.c:2744
 msgid "Print"
 msgstr "Stampa"
 
@@ -3881,7 +3918,7 @@ msgstr "(I messaggi non filtrati saranno memorizzati in questa cartella)"
 msgid "Authentication method"
 msgstr "Metodo di autenticazione"
 
-#: src/prefs_account.c:1123 src/prefs_account.c:1239 src/prefs_common.c:1189
+#: src/prefs_account.c:1123 src/prefs_account.c:1239 src/prefs_common.c:1201
 msgid "Automatic"
 msgstr "Automatico"
 
@@ -3905,7 +3942,7 @@ msgstr "Genera ID messaggio"
 msgid "Add user-defined header"
 msgstr "Aggiungi un'intestazione definita dall'utente"
 
-#: src/prefs_account.c:1196 src/prefs_common.c:1714 src/prefs_common.c:1739
+#: src/prefs_account.c:1196 src/prefs_common.c:1726 src/prefs_common.c:1751
 msgid " Edit... "
 msgstr " Modifica... "
 
@@ -4301,106 +4338,107 @@ msgid "Save sent messages to outbox"
 msgstr "Salva i messaggi inviati nella cartella «Inviata»"
 
 #: src/prefs_common.c:1113
-msgid "Outgoing codeset"
+#, fuzzy
+msgid "Outgoing encoding"
 msgstr "Codifica usata in uscita"
 
 #: src/prefs_common.c:1128
 msgid "Automatic (Recommended)"
 msgstr "Automatica (Raccomandata)"
 
-#: src/prefs_common.c:1129
+#: src/prefs_common.c:1130
 msgid "7bit ascii (US-ASCII)"
 msgstr "ASCII a 7 bit (US-ASCII)"
 
-#: src/prefs_common.c:1130
+#: src/prefs_common.c:1132
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
-#: src/prefs_common.c:1131
+#: src/prefs_common.c:1134
 msgid "Western European (ISO-8859-1)"
 msgstr "Europa Occidentale (ISO-8859-1)"
 
-#: src/prefs_common.c:1132
+#: src/prefs_common.c:1135
 msgid "Western European (ISO-8859-15)"
 msgstr "Europa Occidentale (ISO-8859-15)"
 
-#: src/prefs_common.c:1133
+#: src/prefs_common.c:1137
 msgid "Central European (ISO-8859-2)"
 msgstr "Europa Centrale (ISO-8859-2)"
 
-#: src/prefs_common.c:1134
+#: src/prefs_common.c:1139
 msgid "Baltic (ISO-8859-13)"
 msgstr "Baltico (ISO-8859-13)"
 
-#: src/prefs_common.c:1135
+#: src/prefs_common.c:1140
 msgid "Baltic (ISO-8859-4)"
 msgstr "Baltico (ISO-8859-4)"
 
-#: src/prefs_common.c:1136
+#: src/prefs_common.c:1142
 msgid "Greek (ISO-8859-7)"
 msgstr "Greco (ISO-8859-7)"
 
-#: src/prefs_common.c:1137
+#: src/prefs_common.c:1144
 msgid "Turkish (ISO-8859-9)"
 msgstr "Turco (ISO-8859-9)"
 
-#: src/prefs_common.c:1138
+#: src/prefs_common.c:1146
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Cirillico (ISO-8859-5)"
 
-#: src/prefs_common.c:1139
+#: src/prefs_common.c:1147
 msgid "Cyrillic (KOI8-R)"
 msgstr "Cirillico (KOI8-R)"
 
-#: src/prefs_common.c:1140
-msgid "Cyrillic (Windows-1251)"
-msgstr "Cirillico (Windows-1251)"
-
-#: src/prefs_common.c:1141
+#: src/prefs_common.c:1148
 msgid "Cyrillic (KOI8-U)"
 msgstr "Cirillico (KOI8-U)"
 
-#: src/prefs_common.c:1142
+#: src/prefs_common.c:1149
+msgid "Cyrillic (Windows-1251)"
+msgstr "Cirillico (Windows-1251)"
+
+#: src/prefs_common.c:1151
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Giapponese (ISO-2022-JP)"
 
-#: src/prefs_common.c:1144
+#: src/prefs_common.c:1153
 msgid "Japanese (EUC-JP)"
 msgstr "Giapponese (EUC-JP)"
 
-#: src/prefs_common.c:1145
+#: src/prefs_common.c:1154
 msgid "Japanese (Shift_JIS)"
 msgstr "Giapponese (Shift_JIS)"
 
-#: src/prefs_common.c:1147
+#: src/prefs_common.c:1157
 msgid "Simplified Chinese (GB2312)"
 msgstr "Cinese semplificato (GB2312)"
 
-#: src/prefs_common.c:1148
+#: src/prefs_common.c:1158
 msgid "Traditional Chinese (Big5)"
 msgstr "Cinese tradizionale (Big5)"
 
-#: src/prefs_common.c:1150
+#: src/prefs_common.c:1160
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Cinese tradizionale (EUC-TW)"
 
-#: src/prefs_common.c:1151
+#: src/prefs_common.c:1161
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Cinese (ISO-2022-CN)"
 
-#: src/prefs_common.c:1153
+#: src/prefs_common.c:1164
 msgid "Korean (EUC-KR)"
 msgstr "Coreano (EUC-KR)"
 
-#: src/prefs_common.c:1154
+#: src/prefs_common.c:1166
 msgid "Thai (TIS-620)"
 msgstr "Tailandese (TIS-620)"
 
-#: src/prefs_common.c:1155
+#: src/prefs_common.c:1167
 msgid "Thai (Windows-874)"
 msgstr "Tailandese (Windows-874)"
 
-#: src/prefs_common.c:1165
+#: src/prefs_common.c:1177
 msgid ""
 "If `Automatic' is selected, the optimal encoding for the current locale will "
 "be used."
@@ -4408,11 +4446,11 @@ msgstr ""
 "Selezionando «Automatico» verrà usata la codifica ottimale per la località "
 "attuale."
 
-#: src/prefs_common.c:1179
+#: src/prefs_common.c:1191
 msgid "Transfer encoding"
 msgstr "Codifica di trasferimento"
 
-#: src/prefs_common.c:1202
+#: src/prefs_common.c:1214
 msgid ""
 "Specify Content-Transfer-Encoding used when message body contains non-ASCII "
 "characters."
@@ -4420,118 +4458,118 @@ msgstr ""
 "Specificare il contenuto della codifica di trasferimento usata quando il "
 "corpo del messaggio contiene dei caratteri non-ASCII."
 
-#: src/prefs_common.c:1272
+#: src/prefs_common.c:1284
 msgid "Signature separator"
 msgstr "Separatore della firma"
 
-#: src/prefs_common.c:1281
+#: src/prefs_common.c:1293
 msgid "Insert automatically"
 msgstr "Inserisci automaticamente"
 
-#: src/prefs_common.c:1291
+#: src/prefs_common.c:1303
 msgid "Automatically launch the external editor"
 msgstr "Lancia automaticamente l'editor esterno"
 
-#: src/prefs_common.c:1301
+#: src/prefs_common.c:1313
 msgid "Undo level"
 msgstr "Livello di annulla"
 
-#: src/prefs_common.c:1321
+#: src/prefs_common.c:1333
 msgid "Wrap messages at"
 msgstr "Vai a capo nei messaggi dopo"
 
-#: src/prefs_common.c:1333
+#: src/prefs_common.c:1345
 msgid "characters"
 msgstr "caratteri"
 
-#: src/prefs_common.c:1343
+#: src/prefs_common.c:1355
 msgid "Wrap quotation"
 msgstr "A capo nella citazione"
 
-#: src/prefs_common.c:1349
+#: src/prefs_common.c:1361
 msgid "Wrap on input"
 msgstr "A capo durante l'input"
 
-#: src/prefs_common.c:1351
+#: src/prefs_common.c:1363
 msgid "Wrap before sending"
 msgstr "A capo prima dell'invio"
 
-#: src/prefs_common.c:1361
+#: src/prefs_common.c:1373
 msgid "Automatically select account for replies"
 msgstr "Seleziona automaticamente l'account per le risposte"
 
-#: src/prefs_common.c:1363
+#: src/prefs_common.c:1375
 msgid "Quote message when replying"
 msgstr "Cita il messaggio quando rispondi"
 
-#: src/prefs_common.c:1365
+#: src/prefs_common.c:1377
 msgid "Reply button invokes mailing list reply"
 msgstr "Il pulsante di risposta attiva la risposta alla mailing list"
 
 #. reply
-#: src/prefs_common.c:1411
+#: src/prefs_common.c:1423
 msgid "Reply format"
 msgstr "Formato della risposta"
 
-#: src/prefs_common.c:1426 src/prefs_common.c:1468
+#: src/prefs_common.c:1438 src/prefs_common.c:1480
 msgid "Quotation mark"
 msgstr "Simbolo di citazione"
 
 #. forward
-#: src/prefs_common.c:1453
+#: src/prefs_common.c:1465
 msgid "Forward format"
 msgstr "Formato di inoltro"
 
-#: src/prefs_common.c:1500
+#: src/prefs_common.c:1512
 msgid " Description of symbols "
 msgstr " Descrizione dei simboli "
 
-#: src/prefs_common.c:1541
+#: src/prefs_common.c:1553
 msgid "Font"
 msgstr "Carattere"
 
-#: src/prefs_common.c:1573
+#: src/prefs_common.c:1585
 msgid "Translate header name (such as `From:', `Subject:')"
 msgstr "Traduci il nome dell'intestazione (come «Da:», «Oggetto:»)"
 
-#: src/prefs_common.c:1576
+#: src/prefs_common.c:1588
 msgid "Display unread number next to folder name"
 msgstr "Mostra il numero dei messaggi non letti vicino al nome della cartella"
 
-#: src/prefs_common.c:1585
+#: src/prefs_common.c:1597
 msgid "Abbreviate newsgroups longer than"
 msgstr "Accorcia i newsgroup più lunghi di"
 
-#: src/prefs_common.c:1600
+#: src/prefs_common.c:1612
 msgid "letters"
 msgstr "lettere"
 
 #. ---- Summary ----
-#: src/prefs_common.c:1606
+#: src/prefs_common.c:1618
 msgid "Summary View"
 msgstr "Vista sommario"
 
-#: src/prefs_common.c:1615
+#: src/prefs_common.c:1627
 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.c:1617
+#: src/prefs_common.c:1629
 msgid "Expand threads"
 msgstr "Espandi i thread"
 
-#: src/prefs_common.c:1625 src/prefs_common.c:2443 src/prefs_common.c:2481
+#: src/prefs_common.c:1637 src/prefs_common.c:2455 src/prefs_common.c:2493
 msgid "Date format"
 msgstr "Formato della data"
 
-#: src/prefs_common.c:1646
+#: src/prefs_common.c:1658
 msgid " Set display item of summary... "
 msgstr " Imposta le voci visibili nel sommario... "
 
-#: src/prefs_common.c:1710
+#: src/prefs_common.c:1722
 msgid "Enable coloration of message"
 msgstr "Abilita la colorazione del messaggio"
 
-#: src/prefs_common.c:1724
+#: src/prefs_common.c:1736
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
@@ -4539,319 +4577,319 @@ msgstr ""
 "Mostra l'alfabeto e il numero multy-byte come\n"
 "carattere ASCII (solo Giapponese)"
 
-#: src/prefs_common.c:1730
+#: src/prefs_common.c:1742
 msgid "Display header pane above message view"
 msgstr "Mostra il riquadro intestazione sopra la vista messaggio"
 
-#: src/prefs_common.c:1737
+#: src/prefs_common.c:1749
 msgid "Display short headers on message view"
 msgstr "Mostra le intestazioni abbreviate nella vista messaggio"
 
-#: src/prefs_common.c:1758
+#: src/prefs_common.c:1770
 msgid "Line space"
 msgstr "Spazio tra le righe"
 
-#: src/prefs_common.c:1772 src/prefs_common.c:1810
+#: src/prefs_common.c:1784 src/prefs_common.c:1822
 msgid "pixel(s)"
 msgstr "pixel"
 
-#: src/prefs_common.c:1777
+#: src/prefs_common.c:1789
 msgid "Scroll"
 msgstr "Scorrimento"
 
-#: src/prefs_common.c:1784
+#: src/prefs_common.c:1796
 msgid "Half page"
 msgstr "Mezza pagina"
 
-#: src/prefs_common.c:1790
+#: src/prefs_common.c:1802
 msgid "Smooth scroll"
 msgstr "Scorrimento uniforme"
 
-#: src/prefs_common.c:1796
+#: src/prefs_common.c:1808
 msgid "Step"
 msgstr "Passo"
 
-#: src/prefs_common.c:1816
+#: src/prefs_common.c:1828
 msgid "Images"
 msgstr "Immagini"
 
-#: src/prefs_common.c:1824
+#: src/prefs_common.c:1836
 msgid "Resize attached large images to fit in the window"
 msgstr "Ridimensiona le immagini allegate per adattarle nella finestra"
 
-#: src/prefs_common.c:1826
+#: src/prefs_common.c:1838
 msgid "Display images as inline"
 msgstr "Mostra immagini in linea"
 
-#: src/prefs_common.c:1871
+#: src/prefs_common.c:1883
 msgid "Automatically check signatures"
 msgstr "Controlla automaticamente le firme"
 
-#: src/prefs_common.c:1874
+#: src/prefs_common.c:1886
 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.c:1877
+#: src/prefs_common.c:1889
 msgid "Store passphrase in memory temporarily"
 msgstr "Conserva temporaneamente in memoria la phassphrase"
 
-#: src/prefs_common.c:1892
+#: src/prefs_common.c:1904
 msgid "Expired after"
 msgstr "Scade dopo"
 
-#: src/prefs_common.c:1905
+#: src/prefs_common.c:1917
 msgid "minute(s) "
 msgstr "minuto(i)"
 
-#: src/prefs_common.c:1918
+#: src/prefs_common.c:1930
 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.c:1932
+#: src/prefs_common.c:1944
 msgid "Grab input while entering a passphrase"
 msgstr "Nascondi l'input durante l'inserimento della passphrase"
 
-#: src/prefs_common.c:1937
+#: src/prefs_common.c:1949
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "Mostra un avvertimento alla partenza se GnuPG non è attivo"
 
-#: src/prefs_common.c:1989
+#: src/prefs_common.c:2001
 msgid "Always open messages in summary when selected"
 msgstr "Apri sempre i messaggi nel sommario quando selezionati"
 
-#: src/prefs_common.c:1993
+#: src/prefs_common.c:2005
 msgid "Open first unread message when entering a folder"
 msgstr "Apri il primo messaggio non letto quando entri in una cartella"
 
-#: src/prefs_common.c:1997
+#: src/prefs_common.c:2009
 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.c:2001
+#: src/prefs_common.c:2013
 msgid "Go to inbox after receiving new mail"
 msgstr "Vai a «In entrata» dopo la ricezione di nuova posta"
 
-#: src/prefs_common.c:2009
+#: src/prefs_common.c:2021
 msgid "Execute immediately when moving or deleting messages"
 msgstr "Esegui immediatamente quando sposti o elimini dei messaggi"
 
-#: src/prefs_common.c:2021
+#: src/prefs_common.c:2033
 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.c:2029
+#: src/prefs_common.c:2041
 msgid "Receive dialog"
 msgstr "Finestra di ricezione"
 
-#: src/prefs_common.c:2039
+#: src/prefs_common.c:2051
 msgid "Show receive dialog"
 msgstr "Mostra la finestra di ricezione"
 
-#: src/prefs_common.c:2049
+#: src/prefs_common.c:2061
 msgid "Always"
 msgstr "Sempre"
 
-#: src/prefs_common.c:2050
+#: src/prefs_common.c:2062
 msgid "Only on manual receiving"
 msgstr "Solo in ricezione manuale"
 
-#: src/prefs_common.c:2052
+#: src/prefs_common.c:2064
 msgid "Never"
 msgstr "Mai"
 
-#: src/prefs_common.c:2057
+#: src/prefs_common.c:2069
 msgid "Don't popup error dialog on receive error"
 msgstr "Non mostrare la finestra di popup alla ricezione di un errore"
 
-#: src/prefs_common.c:2060
+#: src/prefs_common.c:2072
 msgid "Close receive dialog when finished"
 msgstr "Chiudi la finestra di ricezione quando finito"
 
-#: src/prefs_common.c:2066
+#: src/prefs_common.c:2078
 msgid " Set key bindings... "
 msgstr " Impostazione delle associazioni dei tasti... "
 
-#: src/prefs_common.c:2122
+#: src/prefs_common.c:2134
 #, 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.c:2131
+#: src/prefs_common.c:2143
 msgid "Web browser"
 msgstr "Browser web"
 
-#: src/prefs_common.c:2195
+#: src/prefs_common.c:2207
 msgid "Add address to destination when double-clicked"
 msgstr "Aggiungi l'indirizzo di destinazione con un doppio click"
 
-#: src/prefs_common.c:2197
+#: src/prefs_common.c:2209
 msgid "On exit"
 msgstr "In uscita"
 
-#: src/prefs_common.c:2205
+#: src/prefs_common.c:2217
 msgid "Confirm on exit"
 msgstr "Chiedi la conferma all'uscita"
 
-#: src/prefs_common.c:2212
+#: src/prefs_common.c:2224
 msgid "Empty trash on exit"
 msgstr "Svuota il cestino all'uscita"
 
-#: src/prefs_common.c:2214
+#: src/prefs_common.c:2226
 msgid "Ask before emptying"
 msgstr "Chiedi prima di svuotare"
 
-#: src/prefs_common.c:2218
+#: src/prefs_common.c:2230
 msgid "Warn if there are queued messages"
 msgstr "Avverti se ci sono messaggi accodati"
 
-#: src/prefs_common.c:2224
+#: src/prefs_common.c:2236
 msgid "Socket I/O timeout:"
 msgstr "Timeout del socket I/O:"
 
-#: src/prefs_common.c:2237
+#: src/prefs_common.c:2249
 msgid "second(s)"
 msgstr "secondo(i)"
 
-#: src/prefs_common.c:2419
+#: src/prefs_common.c:2431
 msgid "the full abbreviated weekday name"
 msgstr "il nome abbreviato del giorno della settimana"
 
-#: src/prefs_common.c:2420
+#: src/prefs_common.c:2432
 msgid "the full weekday name"
 msgstr "il nome completo del giorno della settimana"
 
-#: src/prefs_common.c:2421
+#: src/prefs_common.c:2433
 msgid "the abbreviated month name"
 msgstr "il nome abbreviato del mese"
 
-#: src/prefs_common.c:2422
+#: src/prefs_common.c:2434
 msgid "the full month name"
 msgstr "il nome completo del mese"
 
-#: src/prefs_common.c:2423
+#: src/prefs_common.c:2435
 msgid "the preferred date and time for the current locale"
 msgstr "la data e l'ora preferite per la località attuale"
 
-#: src/prefs_common.c:2424
+#: src/prefs_common.c:2436
 msgid "the century number (year/100)"
 msgstr "il numero del secolo (anno/100)"
 
-#: src/prefs_common.c:2425
+#: src/prefs_common.c:2437
 msgid "the day of the month as a decimal number"
 msgstr "il giorno del mese come numero decimale"
 
-#: src/prefs_common.c:2426
+#: src/prefs_common.c:2438
 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.c:2427
+#: src/prefs_common.c:2439
 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.c:2428
+#: src/prefs_common.c:2440
 msgid "the day of the year as a decimal number"
 msgstr "il giorno dell'anno come numero decimale"
 
-#: src/prefs_common.c:2429
+#: src/prefs_common.c:2441
 msgid "the month as a decimal number"
 msgstr "il mese come numero decimale"
 
-#: src/prefs_common.c:2430
+#: src/prefs_common.c:2442
 msgid "the minute as a decimal number"
 msgstr "i minuti come numero decimale"
 
-#: src/prefs_common.c:2431
+#: src/prefs_common.c:2443
 msgid "either AM or PM"
 msgstr "AM o PM"
 
-#: src/prefs_common.c:2432
+#: src/prefs_common.c:2444
 msgid "the second as a decimal number"
 msgstr "i secondi come numero decimale"
 
-#: src/prefs_common.c:2433
+#: src/prefs_common.c:2445
 msgid "the day of the week as a decimal number"
 msgstr "il giorno della settimana come numero decimale"
 
-#: src/prefs_common.c:2434
+#: src/prefs_common.c:2446
 msgid "the preferred date for the current locale"
 msgstr "la data preferita per la località attuale"
 
-#: src/prefs_common.c:2435
+#: src/prefs_common.c:2447
 msgid "the last two digits of a year"
 msgstr "le ultime due cifre dell'anno"
 
-#: src/prefs_common.c:2436
+#: src/prefs_common.c:2448
 msgid "the year as a decimal number"
 msgstr "l'anno come numero decimale"
 
-#: src/prefs_common.c:2437
+#: src/prefs_common.c:2449
 msgid "the time zone or name or abbreviation"
 msgstr "il fuso orario o l'abbreviazione"
 
-#: src/prefs_common.c:2458
+#: src/prefs_common.c:2470
 msgid "Specifier"
 msgstr "Specificatore"
 
-#: src/prefs_common.c:2459
+#: src/prefs_common.c:2471
 msgid "Description"
 msgstr "Descrizione"
 
-#: src/prefs_common.c:2499
+#: src/prefs_common.c:2511
 msgid "Example"
 msgstr "Esempio"
 
-#: src/prefs_common.c:2580
+#: src/prefs_common.c:2592
 msgid "Set message colors"
 msgstr "Impostazione dei colori del messaggio"
 
-#: src/prefs_common.c:2588
+#: src/prefs_common.c:2600
 msgid "Colors"
 msgstr "Colori"
 
-#: src/prefs_common.c:2622
+#: src/prefs_common.c:2634
 msgid "Quoted Text - First Level"
 msgstr "Testo citato - Primo livello"
 
-#: src/prefs_common.c:2628
+#: src/prefs_common.c:2640
 msgid "Quoted Text - Second Level"
 msgstr "Testo citato - Secondo livello"
 
-#: src/prefs_common.c:2634
+#: src/prefs_common.c:2646
 msgid "Quoted Text - Third Level"
 msgstr "Testo citato - Terzo livello"
 
-#: src/prefs_common.c:2640
+#: src/prefs_common.c:2652
 msgid "URI link"
 msgstr "Link URI"
 
-#: src/prefs_common.c:2647
+#: src/prefs_common.c:2659
 msgid "Recycle quote colors"
 msgstr "Ricicla i colori di citazione"
 
-#: src/prefs_common.c:2707
+#: src/prefs_common.c:2719
 msgid "Pick color for quotation level 1"
 msgstr "Scelta del colore per la citazione di livello 1"
 
-#: src/prefs_common.c:2710
+#: src/prefs_common.c:2722
 msgid "Pick color for quotation level 2"
 msgstr "Scelta del colore per la citazione di livello 2"
 
-#: src/prefs_common.c:2713
+#: src/prefs_common.c:2725
 msgid "Pick color for quotation level 3"
 msgstr "Scelta del colore per la citazione di livello 3"
 
-#: src/prefs_common.c:2716
+#: src/prefs_common.c:2728
 msgid "Pick color for URI"
 msgstr "Scelta del colore per l'URI"
 
-#: src/prefs_common.c:2853
+#: src/prefs_common.c:2865
 msgid "Description of symbols"
 msgstr "Descrizione dei simboli"
 
-#: src/prefs_common.c:2909
+#: src/prefs_common.c:2921
 msgid ""
 "Date\n"
 "From\n"
@@ -4875,11 +4913,11 @@ msgstr ""
 "Newsgroups\n"
 "ID-Messaggio"
 
-#: src/prefs_common.c:2922
+#: src/prefs_common.c:2934
 msgid "If x is set, displays expr"
 msgstr "Se è impostato x, mostra expr"
 
-#: src/prefs_common.c:2926
+#: src/prefs_common.c:2938
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -4893,7 +4931,7 @@ msgstr ""
 "Corpo del messaggio citato senza firma\n"
 "Percentuale"
 
-#: src/prefs_common.c:2934
+#: src/prefs_common.c:2946
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -4905,15 +4943,15 @@ msgstr ""
 "Parentesi graffa aperta\n"
 "Parentesi graffa chiusa"
 
-#: src/prefs_common.c:2971
+#: src/prefs_common.c:2983
 msgid "Font selection"
 msgstr "Selezione del carattere"
 
-#: src/prefs_common.c:3035
+#: src/prefs_common.c:3047
 msgid "Key bindings"
 msgstr "Associazioni dei tasti"
 
-#: src/prefs_common.c:3049
+#: src/prefs_common.c:3061
 msgid ""
 "Select the preset of key bindings.\n"
 "You can also modify each menu's shortcuts by pressing\n"
@@ -4923,11 +4961,11 @@ msgstr ""
 "Si può anche modificare ognuno dei tasti scorciatoia del menù premendo\n"
 "un(dei) tasto(i) quando il puntatore del mouse è sulla voce del menù."
 
-#: src/prefs_common.c:3061 src/prefs_common.c:3410
+#: src/prefs_common.c:3073 src/prefs_common.c:3422
 msgid "Default"
 msgstr "Predefinita"
 
-#: src/prefs_common.c:3064 src/prefs_common.c:3419
+#: src/prefs_common.c:3076 src/prefs_common.c:3431
 msgid "Old Sylpheed"
 msgstr "Vecchio sylpheed"
 
@@ -6072,3 +6110,9 @@ msgstr "%.2fGB"
 #, c-format
 msgid "writing to %s failed.\n"
 msgstr "la scrittura su %s è fallita.\n"
+
+#~ msgid "/_View/_Code set/---"
+#~ msgstr "/_Visualizza/Co_difica/---"
+
+#~ msgid "/_View/_Code set"
+#~ msgstr "/_Visualizza/Co_difica"
diff --git a/po/ja.po b/po/ja.po
index 58f6460a..ef21a28c 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: 2005-03-15 14:29+0900\n"
+"POT-Creation-Date: 2005-03-16 14:47+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"
@@ -97,7 +97,7 @@ msgstr ""
 "の取得を有効にするには、「G」カラムのボックスをチェックしてください。"
 
 #: src/account.c:638 src/addressadd.c:186 src/addressbook.c:488
-#: src/compose.c:3650 src/editaddress.c:195 src/editaddress.c:936
+#: src/compose.c:3748 src/editaddress.c:195 src/editaddress.c:936
 #: src/editaddress.c:984 src/editbook.c:191 src/editgroup.c:257
 #: src/editjpilot.c:296 src/editldap.c:300 src/editvcard.c:211
 #: src/mimeview.c:151 src/prefs_filter.c:214 src/prefs_folder_item.c:170
@@ -150,13 +150,13 @@ msgstr "アカウントの削除"
 msgid "Do you really want to delete this account?"
 msgstr "本当にこのアカウントを削除してもいいですか?"
 
-#: src/account.c:758 src/compose.c:2551 src/compose.c:4807
+#: src/account.c:758 src/compose.c:2632 src/compose.c:4943
 #: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
 #: src/folderview.c:2156 src/folderview.c:2192
 msgid "Yes"
 msgstr "はい"
 
-#: src/account.c:758 src/compose.c:2551 src/compose.c:4807
+#: src/account.c:758 src/compose.c:2632 src/compose.c:4943
 #: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
 #: src/folderview.c:2156 src/folderview.c:2192
 msgid "+No"
@@ -261,7 +261,7 @@ msgstr "アクションのユーザ引数"
 msgid "Add Address to Book"
 msgstr "アドレスをアドレス帳に追加"
 
-#: src/addressadd.c:196 src/compose.c:4191 src/editaddress.c:196
+#: src/addressadd.c:196 src/compose.c:4292 src/editaddress.c:196
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "アドレス"
@@ -275,7 +275,7 @@ msgstr "備考"
 msgid "Select Address Book Folder"
 msgstr "アドレス帳フォルダを選択"
 
-#: src/addressbook.c:334 src/compose.c:469 src/mainwindow.c:454
+#: src/addressbook.c:334 src/compose.c:477 src/mainwindow.c:454
 #: src/messageview.c:134
 msgid "/_File"
 msgstr "/ファイル(_F)"
@@ -296,8 +296,8 @@ msgstr "/ファイル(_F)/新規_JPilot"
 msgid "/_File/New _Server"
 msgstr "/ファイル(_F)/新規サーバ(_S)"
 
-#: src/addressbook.c:343 src/addressbook.c:346 src/compose.c:474
-#: src/compose.c:479 src/compose.c:483 src/mainwindow.c:471
+#: src/addressbook.c:343 src/addressbook.c:346 src/compose.c:482
+#: src/compose.c:487 src/compose.c:491 src/mainwindow.c:471
 #: src/mainwindow.c:474 src/mainwindow.c:476 src/mainwindow.c:479
 #: src/mainwindow.c:481 src/messageview.c:137
 msgid "/_File/---"
@@ -315,7 +315,7 @@ msgstr "/ファイル(_F)/削除(_D)"
 msgid "/_File/_Save"
 msgstr "/ファイル(_F)/保存(_S)"
 
-#: src/addressbook.c:348 src/compose.c:484 src/messageview.c:138
+#: src/addressbook.c:348 src/compose.c:492 src/messageview.c:138
 msgid "/_File/_Close"
 msgstr "/ファイル(_F)/閉じる(_C)"
 
@@ -347,7 +347,7 @@ msgstr "/アドレス(_A)/編集(_E)"
 msgid "/_Address/_Delete"
 msgstr "/アドレス(_A)/削除(_D)"
 
-#: src/addressbook.c:356 src/compose.c:585 src/mainwindow.c:688
+#: src/addressbook.c:356 src/compose.c:664 src/mainwindow.c:697
 #: src/messageview.c:246
 msgid "/_Tools"
 msgstr "/ツール(_T)"
@@ -356,12 +356,12 @@ msgstr "/ツール(_T)"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/ツール(_T)/_LDIFファイルをインポート"
 
-#: src/addressbook.c:358 src/compose.c:598 src/mainwindow.c:733
+#: src/addressbook.c:358 src/compose.c:677 src/mainwindow.c:742
 #: src/messageview.c:264
 msgid "/_Help"
 msgstr "/ヘルプ(_H)"
 
-#: src/addressbook.c:359 src/compose.c:599 src/mainwindow.c:744
+#: src/addressbook.c:359 src/compose.c:678 src/mainwindow.c:753
 #: src/messageview.c:265
 msgid "/_Help/_About"
 msgstr "/ヘルプ(_H)/このプログラムについて(_A)"
@@ -378,7 +378,7 @@ msgstr "/新規グループ(_G)"
 msgid "/New _Folder"
 msgstr "/新規フォルダ(_F)"
 
-#: src/addressbook.c:381 src/addressbook.c:391 src/compose.c:463
+#: src/addressbook.c:381 src/addressbook.c:391 src/compose.c:471
 #: src/folderview.c:220 src/folderview.c:222 src/folderview.c:226
 #: src/folderview.c:236 src/folderview.c:238 src/folderview.c:240
 #: src/folderview.c:244 src/folderview.c:254 src/folderview.c:256
@@ -388,7 +388,7 @@ msgstr "/新規フォルダ(_F)"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:382 src/addressbook.c:392 src/compose.c:486
+#: src/addressbook.c:382 src/addressbook.c:392 src/compose.c:494
 #: src/mainwindow.c:485 src/messageview.c:140
 msgid "/_Edit"
 msgstr "/編集(_E)"
@@ -401,7 +401,7 @@ msgstr "/削除(_D)"
 msgid "E-Mail address"
 msgstr "電子メール アドレス"
 
-#: src/addressbook.c:493 src/compose.c:4192 src/prefs_common.c:2186
+#: src/addressbook.c:493 src/compose.c:4293 src/prefs_common.c:2198
 msgid "Address book"
 msgstr "アドレス帳"
 
@@ -411,7 +411,7 @@ msgstr "名前:"
 
 #. Buttons
 #: src/addressbook.c:625 src/addressbook.c:1665 src/addressbook.c:1671
-#: src/editaddress.c:878 src/editaddress.c:1011 src/mainwindow.c:2212
+#: src/editaddress.c:878 src/editaddress.c:1011 src/mainwindow.c:2221
 #: src/prefs_actions.c:263 src/prefs_display_header.c:275
 #: src/prefs_display_header.c:330 src/prefs_template.c:227
 msgid "Delete"
@@ -603,7 +603,7 @@ msgstr "共有アドレス"
 msgid "Personal address"
 msgstr "個人用アドレス"
 
-#: src/alertpanel.c:123 src/compose.c:4807 src/main.c:458
+#: src/alertpanel.c:123 src/compose.c:4943 src/main.c:458
 msgid "Notice"
 msgstr "注意"
 
@@ -611,7 +611,7 @@ msgstr "注意"
 msgid "Warning"
 msgstr "警告"
 
-#: src/alertpanel.c:149 src/compose.c:2551 src/inc.c:558
+#: src/alertpanel.c:149 src/compose.c:2632 src/inc.c:558
 msgid "Error"
 msgstr "エラー"
 
@@ -659,299 +659,395 @@ msgstr "茶"
 msgid "None"
 msgstr "なし"
 
-#: src/compose.c:461
+#: src/compose.c:469
 msgid "/_Add..."
 msgstr "/追加(_A)..."
 
-#: src/compose.c:462
+#: src/compose.c:470
 msgid "/_Remove"
 msgstr "/削除(_R)"
 
-#: src/compose.c:464 src/folderview.c:228 src/folderview.c:246
+#: src/compose.c:472 src/folderview.c:228 src/folderview.c:246
 #: src/folderview.c:261
 msgid "/_Properties..."
 msgstr "/プロパティ(_P)..."
 
-#: src/compose.c:470
+#: src/compose.c:478
 msgid "/_File/_Send"
 msgstr "/ファイル(_F)/送信(_S)"
 
-#: src/compose.c:472
+#: src/compose.c:480
 msgid "/_File/Send _later"
 msgstr "/ファイル(_F)/後で送信(_L)"
 
-#: src/compose.c:475
+#: src/compose.c:483
 msgid "/_File/Save to _draft folder"
 msgstr "/ファイル(_F)/草稿フォルダに保存(_D)"
 
-#: src/compose.c:477
+#: src/compose.c:485
 msgid "/_File/Save and _keep editing"
 msgstr "/ファイル(_F)/保存して編集を続ける(_K)"
 
-#: src/compose.c:480
+#: src/compose.c:488
 msgid "/_File/_Attach file"
 msgstr "/ファイル(_F)/ファイルを添付(_A)"
 
-#: src/compose.c:481
+#: src/compose.c:489
 msgid "/_File/_Insert file"
 msgstr "/ファイル(_F)/ファイルを挿入(_I)"
 
-#: src/compose.c:482
+#: src/compose.c:490
 msgid "/_File/Insert si_gnature"
 msgstr "/ファイル(_F)/署名を挿入(_G)"
 
-#: src/compose.c:487
+#: src/compose.c:495
 msgid "/_Edit/_Undo"
 msgstr "/編集(_E)/元に戻す(_U)"
 
-#: src/compose.c:488
+#: src/compose.c:496
 msgid "/_Edit/_Redo"
 msgstr "/編集(_E)/やり直し(_R)"
 
-#: src/compose.c:489 src/compose.c:567 src/mainwindow.c:489
+#: src/compose.c:497 src/compose.c:575 src/mainwindow.c:489
 #: src/messageview.c:143
 msgid "/_Edit/---"
 msgstr "/編集(_E)/---"
 
-#: src/compose.c:490
+#: src/compose.c:498
 msgid "/_Edit/Cu_t"
 msgstr "/編集(_E)/カット(_T)"
 
-#: src/compose.c:491 src/mainwindow.c:486 src/messageview.c:141
+#: src/compose.c:499 src/mainwindow.c:486 src/messageview.c:141
 msgid "/_Edit/_Copy"
 msgstr "/編集(_E)/コピー(_C)"
 
-#: src/compose.c:492
+#: src/compose.c:500
 msgid "/_Edit/_Paste"
 msgstr "/編集(_E)/ペースト(_P)"
 
-#: src/compose.c:493
+#: src/compose.c:501
 msgid "/_Edit/Paste as _quotation"
 msgstr "/編集(_E)/引用としてペースト(_Q)"
 
-#: src/compose.c:495 src/mainwindow.c:487 src/messageview.c:142
+#: src/compose.c:503 src/mainwindow.c:487 src/messageview.c:142
 msgid "/_Edit/Select _all"
 msgstr "/編集(_E)/すべて選択(_A)"
 
-#: src/compose.c:496
+#: src/compose.c:504
 msgid "/_Edit/A_dvanced"
 msgstr "/編集(_E)/高度な操作(_D)"
 
-#: src/compose.c:497
+#: src/compose.c:505
 msgid "/_Edit/A_dvanced/Move a character backward"
 msgstr "/編集(_E)/高度な操作(_D)/1文字戻る"
 
-#: src/compose.c:502
+#: src/compose.c:510
 msgid "/_Edit/A_dvanced/Move a character forward"
 msgstr "/編集(_E)/高度な操作(_D)/1文字進む"
 
-#: src/compose.c:507
+#: src/compose.c:515
 msgid "/_Edit/A_dvanced/Move a word backward"
 msgstr "/編集(_E)/高度な操作(_D)/1単語戻る"
 
-#: src/compose.c:512
+#: src/compose.c:520
 msgid "/_Edit/A_dvanced/Move a word forward"
 msgstr "/編集(_E)/高度な操作(_D)/1単語進む"
 
-#: src/compose.c:517
+#: src/compose.c:525
 msgid "/_Edit/A_dvanced/Move to beginning of line"
 msgstr "/編集(_E)/高度な操作(_D)/行頭に移動"
 
-#: src/compose.c:522
+#: src/compose.c:530
 msgid "/_Edit/A_dvanced/Move to end of line"
 msgstr "/編集(_E)/高度な操作(_D)/行末に移動"
 
-#: src/compose.c:527
+#: src/compose.c:535
 msgid "/_Edit/A_dvanced/Move to previous line"
 msgstr "/編集(_E)/高度な操作(_D)/前の行に移動"
 
-#: src/compose.c:532
+#: src/compose.c:540
 msgid "/_Edit/A_dvanced/Move to next line"
 msgstr "/編集(_E)/高度な操作(_D)/次の行に移動"
 
-#: src/compose.c:537
+#: src/compose.c:545
 msgid "/_Edit/A_dvanced/Delete a character backward"
 msgstr "/編集(_E)/高度な操作(_D)/後ろの1文字を削除"
 
-#: src/compose.c:542
+#: src/compose.c:550
 msgid "/_Edit/A_dvanced/Delete a character forward"
 msgstr "/編集(_E)/高度な操作(_D)/次の1文字を削除"
 
-#: src/compose.c:547
+#: src/compose.c:555
 msgid "/_Edit/A_dvanced/Delete a word backward"
 msgstr "/編集(_E)/高度な操作(_D)/後ろの1単語を削除"
 
-#: src/compose.c:552
+#: src/compose.c:560
 msgid "/_Edit/A_dvanced/Delete a word forward"
 msgstr "/編集(_E)/高度な操作(_D)/次の1単語を削除"
 
-#: src/compose.c:557
+#: src/compose.c:565
 msgid "/_Edit/A_dvanced/Delete line"
 msgstr "/編集(_E)/高度な操作(_D)/行削除"
 
-#: src/compose.c:562
+#: src/compose.c:570
 msgid "/_Edit/A_dvanced/Delete to end of line"
 msgstr "/編集(_E)/高度な操作(_D)/行末までを削除"
 
-#: src/compose.c:568
+#: src/compose.c:576
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/編集(_E)/現在の段落を整形する(_W)"
 
-#: src/compose.c:570
+#: src/compose.c:578
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/編集(_E)/すべての長い行を折り返す(_L)"
 
-#: src/compose.c:572
+#: src/compose.c:580
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/編集(_E)/自動整形(_O)"
 
-#: src/compose.c:573 src/mainwindow.c:494 src/messageview.c:147
+#: src/compose.c:581 src/mainwindow.c:494 src/messageview.c:147
 #: src/summaryview.c:370
 msgid "/_View"
 msgstr "/表示(_V)"
 
-#: src/compose.c:574
+#: src/compose.c:582
 msgid "/_View/_To"
 msgstr "/表示(_V)/宛先(_T)"
 
-#: src/compose.c:575
+#: src/compose.c:583
 msgid "/_View/_Cc"
 msgstr "/表示(_V)/_Cc"
 
-#: src/compose.c:576
+#: src/compose.c:584
 msgid "/_View/_Bcc"
 msgstr "/表示(_V)/_Bcc"
 
-#: src/compose.c:577
+#: src/compose.c:585
 msgid "/_View/_Reply to"
 msgstr "/表示(_V)/返信先を指定(_R)"
 
-#: src/compose.c:578 src/compose.c:580 src/compose.c:582 src/mainwindow.c:512
-#: src/mainwindow.c:515 src/mainwindow.c:541 src/mainwindow.c:565
-#: src/mainwindow.c:641 src/mainwindow.c:645 src/messageview.c:223
+#: src/compose.c:586 src/compose.c:588 src/compose.c:590 src/compose.c:592
+#: src/mainwindow.c:512 src/mainwindow.c:515 src/mainwindow.c:541
+#: src/mainwindow.c:565 src/mainwindow.c:650 src/mainwindow.c:654
+#: src/messageview.c:223
 msgid "/_View/---"
 msgstr "/表示(_V)/---"
 
-#: src/compose.c:579
+#: src/compose.c:587
 msgid "/_View/_Followup to"
 msgstr "/表示(_V)/フォロー先を指定(_F)"
 
-#: src/compose.c:581
+#: src/compose.c:589
 msgid "/_View/R_uler"
 msgstr "/表示(_V)/ルーラ(_U)"
 
-#: src/compose.c:583
+#: src/compose.c:591
 msgid "/_View/_Attachment"
 msgstr "/表示(_V)/添付(_A)"
 
-#: src/compose.c:586 src/mainwindow.c:689 src/messageview.c:247
+#: src/compose.c:598 src/mainwindow.c:572 src/messageview.c:154
+msgid "/_View/Character _encoding"
+msgstr "/表示(_V)/文字エンコーディング(_E)"
+
+#: src/compose.c:599
+msgid "/_View/Character _encoding/_Automatic"
+msgstr "/表示(_V)/文字エンコーディング(_E)/自動(_A)"
+
+#: src/compose.c:601 src/compose.c:607 src/compose.c:613 src/compose.c:617
+#: src/compose.c:623 src/compose.c:627 src/compose.c:631 src/compose.c:641
+#: src/compose.c:645 src/compose.c:653 src/compose.c:657 src/mainwindow.c:568
+#: src/mainwindow.c:575 src/messageview.c:150
+msgid "/_View/Character _encoding/---"
+msgstr "/表示(_V)/文字エンコーディング(_E)/---"
+
+#: src/compose.c:603 src/mainwindow.c:576 src/messageview.c:158
+msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
+msgstr "/表示(_V)/文字エンコーディング(_E)/7bit ascii (US-ASC_II)"
+
+#: src/compose.c:605 src/mainwindow.c:578 src/messageview.c:161
+msgid "/_View/Character _encoding/Unicode (_UTF-8)"
+msgstr "/表示(_V)/文字エンコーディング(_E)/Unicode (_UTF-8)"
+
+#: src/compose.c:609 src/mainwindow.c:582 src/messageview.c:164
+msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
+msgstr "/表示(_V)/文字エンコーディング(_E)/欧米 (ISO-8859-_1)"
+
+#: src/compose.c:611 src/mainwindow.c:584 src/messageview.c:166
+msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
+msgstr "/表示(_V)/文字エンコーディング(_E)/欧米 (ISO-8859-15)"
+
+#: src/compose.c:615 src/mainwindow.c:588 src/messageview.c:169
+msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
+msgstr "/表示(_V)/文字エンコーディング(_E)/中欧 (ISO-8859-_2)"
+
+#: src/compose.c:619 src/mainwindow.c:592 src/messageview.c:172
+msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
+msgstr "/表示(_V)/文字エンコーディング(_E)/バルト諸国 (ISO-8859-13)"
+
+#: src/compose.c:621 src/mainwindow.c:594 src/messageview.c:174
+msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
+msgstr "/表示(_V)/文字エンコーディング(_E)/バルト諸国 (ISO-8859-_4)"
+
+#: src/compose.c:625 src/mainwindow.c:598 src/messageview.c:177
+msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
+msgstr "/表示(_V)/文字エンコーディング(_E)/ギリシャ語 (ISO-8859-_7)"
+
+#: src/compose.c:629 src/mainwindow.c:602 src/messageview.c:180
+msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
+msgstr "/表示(_V)/文字エンコーディング(_E)/トルコ語 (ISO-8859-_9)"
+
+#: src/compose.c:633 src/mainwindow.c:606 src/messageview.c:183
+msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
+msgstr "/表示(_V)/文字エンコーディング(_E)/キリル文字 (ISO-8859-_5)"
+
+#: src/compose.c:635 src/mainwindow.c:608 src/messageview.c:185
+msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
+msgstr "/表示(_V)/文字エンコーディング(_E)/キリル文字 (KOI8-_R)"
+
+#: src/compose.c:637 src/mainwindow.c:610 src/messageview.c:187
+msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
+msgstr "/表示(_V)/文字エンコーディング(_E)/キリル文字 (KOI8-U)"
+
+#: src/compose.c:639 src/mainwindow.c:612 src/messageview.c:189
+msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
+msgstr "/表示(_V)/文字エンコーディング(_E)/キリル文字 (Windows-1251)"
+
+#: src/compose.c:643 src/mainwindow.c:616 src/messageview.c:192
+msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
+msgstr "/表示(_V)/文字エンコーディング(_E)/日本語 (ISO-2022-_JP)"
+
+#: src/compose.c:647 src/mainwindow.c:626 src/messageview.c:201
+msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
+msgstr "/表示(_V)/文字エンコーディング(_E)/簡体字中国語 (_GB2312)"
+
+#: src/compose.c:649 src/mainwindow.c:628 src/messageview.c:203
+msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
+msgstr "/表示(_V)/文字エンコーディング(_E)/繁体字中国語 (_Big5)"
+
+#: src/compose.c:651 src/mainwindow.c:630 src/messageview.c:205
+msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
+msgstr "/表示(_V)/文字エンコーディング(_E)/繁体字中国語 (EUC-_TW)"
+
+#: src/compose.c:655 src/mainwindow.c:636 src/messageview.c:210
+msgid "/_View/Character _encoding/Korean (EUC-_KR)"
+msgstr "/表示(_V)/文字エンコーディング(_E)/韓国語 (EUC-_KR)"
+
+#: src/compose.c:659 src/mainwindow.c:642 src/messageview.c:215
+msgid "/_View/Character _encoding/Thai (TIS-620)"
+msgstr "/表示(_V)/文字エンコーディング(_E)/タイ語 (TIS-620)"
+
+#: src/compose.c:661 src/mainwindow.c:644 src/messageview.c:217
+msgid "/_View/Character _encoding/Thai (Windows-874)"
+msgstr "/表示(_V)/文字エンコーディング(_E)/タイ語 (Windows-874)"
+
+#: src/compose.c:665 src/mainwindow.c:698 src/messageview.c:247
 msgid "/_Tools/_Address book"
 msgstr "/ツール(_T)/アドレス帳(_A)"
 
-#: src/compose.c:587
+#: src/compose.c:666
 msgid "/_Tools/_Template"
 msgstr "/ツール(_T)/テンプレート(_T)"
 
-#: src/compose.c:588 src/mainwindow.c:707 src/messageview.c:262
+#: src/compose.c:667 src/mainwindow.c:716 src/messageview.c:262
 msgid "/_Tools/Actio_ns"
 msgstr "/ツール(_T)/アクション(_N)"
 
-#: src/compose.c:589 src/compose.c:593 src/mainwindow.c:692
-#: src/mainwindow.c:706 src/mainwindow.c:708 src/mainwindow.c:711
-#: src/mainwindow.c:713 src/messageview.c:250 src/messageview.c:261
+#: src/compose.c:668 src/compose.c:672 src/mainwindow.c:701
+#: src/mainwindow.c:715 src/mainwindow.c:717 src/mainwindow.c:720
+#: src/mainwindow.c:722 src/messageview.c:250 src/messageview.c:261
 msgid "/_Tools/---"
 msgstr "/ツール(_T)/---"
 
-#: src/compose.c:590
+#: src/compose.c:669
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/ツール(_T)/外部エディタで編集(_X)"
 
-#: src/compose.c:594
+#: src/compose.c:673
 msgid "/_Tools/PGP Si_gn"
 msgstr "/ツール(_T)/PGP署名(_G)"
 
-#: src/compose.c:595
+#: src/compose.c:674
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/ツール(_T)/PGP暗号化(_E)"
 
-#: src/compose.c:800
+#: src/compose.c:879
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: ファイルが存在しません\n"
 
-#: src/compose.c:899 src/compose.c:958 src/procmsg.c:1303
+#: src/compose.c:978 src/compose.c:1037 src/procmsg.c:1303
 msgid "Can't get text part\n"
 msgstr "テキストパートを取得できません\n"
 
-#: src/compose.c:1340
+#: src/compose.c:1419
 msgid "Quote mark format error."
 msgstr "引用符の書式が不正です。"
 
-#: src/compose.c:1352
+#: src/compose.c:1431
 msgid "Message reply/forward format error."
 msgstr "メッセージの返信/転送の書式が不正です。"
 
-#: src/compose.c:1679
+#: src/compose.c:1758
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "ファイル %s は存在しません\n"
 
-#: src/compose.c:1683
+#: src/compose.c:1762
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "ファイル %s のサイズを取得できません\n"
 
-#: src/compose.c:1687
+#: src/compose.c:1766
 #, c-format
 msgid "File %s is empty."
 msgstr "ファイル %s は空です。"
 
-#: src/compose.c:1691
+#: src/compose.c:1770
 #, c-format
 msgid "Can't read %s."
 msgstr "%s を読み込めません。"
 
-#: src/compose.c:1726
+#: src/compose.c:1805
 #, c-format
 msgid "Message: %s"
 msgstr "メッセージ: %s"
 
-#: src/compose.c:1797 src/mimeview.c:491
+#: src/compose.c:1876 src/mimeview.c:491
 msgid "Can't get the part of multipart message."
 msgstr "マルチパートメッセージのパートを取得できません。"
 
-#: src/compose.c:2188
+#: src/compose.c:2267
 msgid " [Edited]"
 msgstr " [更新]"
 
-#: src/compose.c:2190
+#: src/compose.c:2269
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - メッセージの作成%s"
 
-#: src/compose.c:2193
+#: src/compose.c:2272
 #, c-format
 msgid "Compose message%s"
 msgstr "メッセージの作成%s"
 
-#: src/compose.c:2304
+#: src/compose.c:2383
 msgid "Recipient is not specified."
 msgstr "宛先が指定されていません。"
 
-#: src/compose.c:2312 src/compose.c:4112 src/mainwindow.c:2144
+#: src/compose.c:2391 src/compose.c:4213 src/mainwindow.c:2153
 #: src/prefs_account.c:703 src/prefs_common.c:850
 msgid "Send"
 msgstr "送信"
 
-#: src/compose.c:2313
+#: src/compose.c:2392
 msgid "Subject is empty. Send it anyway?"
 msgstr "件名が空です。とにかく送信しますか?"
 
-#: src/compose.c:2364
+#: src/compose.c:2443
 msgid "can't get recipient list."
 msgstr "送信先のリストを取得できません。"
 
-#: src/compose.c:2384
+#: src/compose.c:2463
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -959,26 +1055,26 @@ msgstr ""
 "メールを送信するためのアカウントが指定されていません。\n"
 "送信する前にメールアカウントを選択してください。"
 
-#: src/compose.c:2398 src/send_message.c:261
+#: src/compose.c:2477 src/send_message.c:261
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "メッセージを %s にポストする途中にエラーが発生しました。"
 
-#: src/compose.c:2421
+#: src/compose.c:2500
 msgid "Can't save the message to outbox."
 msgstr "メッセージを送信控に保存できません。"
 
-#: src/compose.c:2457
+#: src/compose.c:2536
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "現在選択されている鍵ID `%s' に対応する鍵が見つかりませんでした。"
 
-#: src/compose.c:2518 src/compose.c:2739 src/compose.c:2802 src/compose.c:2921
+#: src/compose.c:2597 src/compose.c:2820 src/compose.c:2883 src/compose.c:3003
 #: src/utils.c:2189
 msgid "can't change file mode\n"
 msgstr "ファイルモードを変更できません\n"
 
-#: src/compose.c:2546
+#: src/compose.c:2627
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -987,140 +1083,140 @@ msgstr ""
 "メッセージ本文の文字エンコーディングを %s から %s に変換できません。\n"
 "%s のままとにかく送信しますか?"
 
-#: src/compose.c:2610
+#: src/compose.c:2691
 msgid "can't write headers\n"
 msgstr "ヘッダを書き込めません。\n"
 
-#: src/compose.c:2881
+#: src/compose.c:2963
 msgid "can't remove the old message\n"
 msgstr "古いメッセージを削除できません\n"
 
-#: src/compose.c:2899
+#: src/compose.c:2981
 msgid "queueing message...\n"
 msgstr "メッセージを送信待ちに入れています...\n"
 
-#: src/compose.c:2981
+#: src/compose.c:3063
 msgid "can't find queue folder\n"
 msgstr "送信待ちフォルダが見つかりません\n"
 
-#: src/compose.c:2988
+#: src/compose.c:3070
 msgid "can't queue the message\n"
 msgstr "メッセージを送信待機できません\n"
 
-#: src/compose.c:3547
+#: src/compose.c:3645
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "生成されたメッセージID: %s\n"
 
-#: src/compose.c:3645
+#: src/compose.c:3743
 msgid "Creating compose window...\n"
 msgstr "メッセージ作成ウィンドウを作成中...\n"
 
-#: src/compose.c:3648 src/compose.c:4598
+#: src/compose.c:3746 src/compose.c:4734
 msgid "MIME type"
 msgstr "MIME タイプ"
 
 #. S_COL_DATE
-#: src/compose.c:3649 src/mimeview.c:150 src/prefs_filter_edit.c:569
+#: src/compose.c:3747 src/mimeview.c:150 src/prefs_filter_edit.c:569
 #: src/prefs_summary_column.c:73 src/select-keys.c:317 src/summaryview.c:386
 msgid "Size"
 msgstr "サイズ"
 
-#: src/compose.c:3700 src/headerview.c:53 src/summary_search.c:169
+#: src/compose.c:3798 src/headerview.c:53 src/summary_search.c:169
 msgid "From:"
 msgstr "差出人:"
 
-#: src/compose.c:4113
+#: src/compose.c:4214
 msgid "Send message"
 msgstr "メッセージを送信"
 
-#: src/compose.c:4121
+#: src/compose.c:4222
 msgid "Send later"
 msgstr "後で送信"
 
-#: src/compose.c:4122
+#: src/compose.c:4223
 msgid "Put into queue folder and send later"
 msgstr "送信待ちフォルダに入れて後で送信"
 
-#: src/compose.c:4130
+#: src/compose.c:4231
 msgid "Draft"
 msgstr "草稿"
 
-#: src/compose.c:4131
+#: src/compose.c:4232
 msgid "Save to draft folder"
 msgstr "草稿フォルダに保存"
 
-#: src/compose.c:4141 src/compose.c:5382
+#: src/compose.c:4242 src/compose.c:5527
 msgid "Insert"
 msgstr "挿入"
 
-#: src/compose.c:4142
+#: src/compose.c:4243
 msgid "Insert file"
 msgstr "ファイルを挿入"
 
-#: src/compose.c:4150
+#: src/compose.c:4251
 msgid "Attach"
 msgstr "添付"
 
-#: src/compose.c:4151
+#: src/compose.c:4252
 msgid "Attach file"
 msgstr "ファイルを添付"
 
 #. signature
-#: src/compose.c:4161 src/prefs_account.c:1339 src/prefs_common.c:1261
+#: src/compose.c:4262 src/prefs_account.c:1339 src/prefs_common.c:1273
 msgid "Signature"
 msgstr "署名"
 
-#: src/compose.c:4162
+#: src/compose.c:4263
 msgid "Insert signature"
 msgstr "署名を挿入"
 
-#: src/compose.c:4171 src/prefs_common.c:1283 src/prefs_common.c:2165
+#: src/compose.c:4272 src/prefs_common.c:1295 src/prefs_common.c:2177
 msgid "Editor"
 msgstr "エディタ"
 
-#: src/compose.c:4172
+#: src/compose.c:4273
 msgid "Edit with external editor"
 msgstr "外部エディタで編集"
 
-#: src/compose.c:4180
+#: src/compose.c:4281
 msgid "Linewrap"
 msgstr "整形"
 
-#: src/compose.c:4181
+#: src/compose.c:4282
 msgid "Wrap all long lines"
 msgstr "すべての長い行を折り返す"
 
-#: src/compose.c:4492
+#: src/compose.c:4628
 msgid "Invalid MIME type."
 msgstr "無効な MIME タイプです。"
 
-#: src/compose.c:4511
+#: src/compose.c:4647
 msgid "File doesn't exist or is empty."
 msgstr "ファイルが存在しないかまたは空です。"
 
-#: src/compose.c:4580
+#: src/compose.c:4716
 msgid "Properties"
 msgstr "プロパティ"
 
-#: src/compose.c:4600
+#: src/compose.c:4736
 msgid "Encoding"
 msgstr "エンコーディング"
 
-#: src/compose.c:4623 src/prefs_folder_item.c:183
+#: src/compose.c:4759 src/prefs_folder_item.c:183
 msgid "Path"
 msgstr "パス"
 
-#: src/compose.c:4624
+#: src/compose.c:4760
 msgid "File name"
 msgstr "ファイル名"
 
-#: src/compose.c:4778
+#: src/compose.c:4914
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "外部エディタのコマンドラインが無効です: `%s'\n"
 
-#: src/compose.c:4804
+#: src/compose.c:4940
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1131,71 +1227,71 @@ msgstr ""
 "プロセスを強制終了しますか?\n"
 "プロセスグループID: %d"
 
-#: src/compose.c:4817
+#: src/compose.c:4953
 #, c-format
 msgid "Terminated process group id: %d"
 msgstr "終了したプロセスグループID: %d"
 
-#: src/compose.c:4818
+#: src/compose.c:4954
 #, c-format
 msgid "Temporary file: %s"
 msgstr "一時ファイル: %s"
 
-#: src/compose.c:4842
+#: src/compose.c:4978
 msgid "Compose: input from monitoring process\n"
 msgstr "Compose: 監視プロセスからの入力\n"
 
 #. failed
-#: src/compose.c:4875
+#: src/compose.c:5011
 msgid "Couldn't exec external editor\n"
 msgstr "外部エディタを実行できません\n"
 
-#: src/compose.c:4879
+#: src/compose.c:5015
 msgid "Couldn't write to file\n"
 msgstr "ファイルに書き込めません\n"
 
-#: src/compose.c:4881
+#: src/compose.c:5017
 msgid "Pipe read failed\n"
 msgstr "パイプの読み込みに失敗\n"
 
-#: src/compose.c:5182 src/compose.c:5190 src/compose.c:5196
+#: src/compose.c:5318 src/compose.c:5326 src/compose.c:5332
 msgid "Can't queue the message."
 msgstr "メッセージを送信待機できません。"
 
-#: src/compose.c:5287
+#: src/compose.c:5423
 msgid "Select files"
 msgstr "ファイルの選択"
 
-#: src/compose.c:5309
+#: src/compose.c:5445
 msgid "Select file"
 msgstr "ファイルの選択"
 
-#: src/compose.c:5344
+#: src/compose.c:5480
 msgid "Discard message"
 msgstr "メッセージの破棄"
 
-#: src/compose.c:5345
+#: src/compose.c:5481
 msgid "This message has been modified. discard it?"
 msgstr "このメッセージは変更されています。破棄しますか?"
 
-#: src/compose.c:5346
+#: src/compose.c:5482
 msgid "Discard"
 msgstr "破棄"
 
-#: src/compose.c:5346
+#: src/compose.c:5482
 msgid "to Draft"
 msgstr "草稿へ"
 
-#: src/compose.c:5379
+#: src/compose.c:5524
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "テンプレート `%s' を適用しますか?"
 
-#: src/compose.c:5381
+#: src/compose.c:5526
 msgid "Apply template"
 msgstr "テンプレートの適用"
 
-#: src/compose.c:5382
+#: src/compose.c:5527
 msgid "Replace"
 msgstr "置換"
 
@@ -1634,12 +1730,12 @@ msgstr "フォルダ情報を設定中...\n"
 msgid "Setting folder info..."
 msgstr "フォルダ情報を設定中..."
 
-#: src/folderview.c:652 src/mainwindow.c:3190 src/setup.c:81
+#: src/folderview.c:652 src/mainwindow.c:3199 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "フォルダをスキャン中 (%s%c%s) ..."
 
-#: src/folderview.c:656 src/mainwindow.c:3195 src/setup.c:86
+#: src/folderview.c:656 src/mainwindow.c:3204 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "フォルダをスキャン中 (%s)..."
@@ -2095,7 +2191,7 @@ msgstr "LDIFファイルをアドレス帳へインポート"
 msgid "Prev"
 msgstr "前へ"
 
-#: src/importldif.c:761 src/mainwindow.c:2230
+#: src/importldif.c:761 src/mainwindow.c:2239
 msgid "Next"
 msgstr "次へ"
 
@@ -2547,8 +2643,8 @@ msgid "/_View/Separate f_older tree"
 msgstr "/表示(_V)/フォルダツリーを分離(_O)"
 
 #: src/mainwindow.c:514
-msgid "/_View/Separate m_essage view"
-msgstr "/表示(_V)/メッセージビューを分離(_E)"
+msgid "/_View/Separate _message view"
+msgstr "/表示(_V)/メッセージビューを分離(_M)"
 
 #: src/mainwindow.c:516
 msgid "/_View/_Sort"
@@ -2683,422 +2779,334 @@ msgstr "/表示(_V)/移動(_G)/次のラベル付きメッセージ(_B)"
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/表示(_V)/移動(_G)/別のフォルダ(_F)..."
 
-#: src/mainwindow.c:568 src/mainwindow.c:575 src/messageview.c:150
-msgid "/_View/_Code set/---"
-msgstr "/表示(_V)/文字コードセット(_C)/---"
-
-#: src/mainwindow.c:572 src/messageview.c:154
-msgid "/_View/_Code set"
-msgstr "/表示(_V)/文字コードセット(_C)"
-
 #: src/mainwindow.c:573 src/messageview.c:155
-msgid "/_View/_Code set/_Auto detect"
-msgstr "/表示(_V)/文字コードセット(_C)/自動検出(_A)"
-
-#: src/mainwindow.c:576 src/messageview.c:158
-msgid "/_View/_Code set/7bit ascii (US-ASC_II)"
-msgstr "/表示(_V)/文字コードセット(_C)/7bit ascii (US-ASC_II)"
-
-#: src/mainwindow.c:579 src/messageview.c:161
-msgid "/_View/_Code set/Unicode (_UTF-8)"
-msgstr "/表示(_V)/文字コードセット(_C)/Unicode (_UTF-8)"
-
-#: src/mainwindow.c:582 src/messageview.c:164
-msgid "/_View/_Code set/Western European (ISO-8859-_1)"
-msgstr "/表示(_V)/文字コードセット(_C)/欧米 (ISO-8859-_1)"
-
-#: src/mainwindow.c:584 src/messageview.c:166
-msgid "/_View/_Code set/Western European (ISO-8859-15)"
-msgstr "/表示(_V)/文字コードセット(_C)/欧米 (ISO-8859-15)"
-
-#: src/mainwindow.c:587 src/messageview.c:169
-msgid "/_View/_Code set/Central European (ISO-8859-_2)"
-msgstr "/表示(_V)/文字コードセット(_C)/中欧 (ISO-8859-_2)"
-
-#: src/mainwindow.c:590 src/messageview.c:172
-msgid "/_View/_Code set/_Baltic (ISO-8859-13)"
-msgstr "/表示(_V)/文字コードセット(_C)/バルト諸国 (ISO-8859-13)"
-
-#: src/mainwindow.c:592 src/messageview.c:174
-msgid "/_View/_Code set/Baltic (ISO-8859-_4)"
-msgstr "/表示(_V)/文字コードセット(_C)/バルト諸国 (ISO-8859-_4)"
-
-#: src/mainwindow.c:595 src/messageview.c:177
-msgid "/_View/_Code set/Greek (ISO-8859-_7)"
-msgstr "/表示(_V)/文字コードセット(_C)/ギリシャ語 (ISO-8859-_7)"
-
-#: src/mainwindow.c:598 src/messageview.c:180
-msgid "/_View/_Code set/Turkish (ISO-8859-_9)"
-msgstr "/表示(_V)/文字コードセット(_C)/トルコ語 (ISO-8859-_9)"
-
-#: src/mainwindow.c:601 src/messageview.c:183
-msgid "/_View/_Code set/Cyrillic (ISO-8859-_5)"
-msgstr "/表示(_V)/文字コードセット(_C)/キリル文字 (ISO-8859-_5)"
-
-#: src/mainwindow.c:603 src/messageview.c:185
-msgid "/_View/_Code set/Cyrillic (KOI8-_R)"
-msgstr "/表示(_V)/文字コードセット(_C)/キリル文字 (KOI8-_R)"
-
-#: src/mainwindow.c:605 src/messageview.c:187
-msgid "/_View/_Code set/Cyrillic (KOI8-U)"
-msgstr "/表示(_V)/文字コードセット(_C)/キリル文字 (KOI8-U)"
-
-#: src/mainwindow.c:607 src/messageview.c:189
-msgid "/_View/_Code set/Cyrillic (Windows-1251)"
-msgstr "/表示(_V)/文字コードセット(_C)/キリル文字 (Windows-1251)"
-
-#: src/mainwindow.c:610 src/messageview.c:192
-msgid "/_View/_Code set/Japanese (ISO-2022-_JP)"
-msgstr "/表示(_V)/文字コードセット(_C)/日本語 (ISO-2022-_JP)"
-
-#: src/mainwindow.c:612 src/messageview.c:194
-msgid "/_View/_Code set/Japanese (ISO-2022-JP-2)"
-msgstr "/表示(_V)/文字コードセット(_C)/日本語 (ISO-2022-JP-2)"
-
-#: src/mainwindow.c:614 src/messageview.c:196
-msgid "/_View/_Code set/Japanese (_EUC-JP)"
-msgstr "/表示(_V)/文字コードセット(_C)/日本語 (_EUC-JP)"
-
-#: src/mainwindow.c:616 src/messageview.c:198
-msgid "/_View/_Code set/Japanese (_Shift__JIS)"
-msgstr "/表示(_V)/文字コードセット(_C)/日本語 (_Shift__JIS)"
-
-#: src/mainwindow.c:619 src/messageview.c:201
-msgid "/_View/_Code set/Simplified Chinese (_GB2312)"
-msgstr "/表示(_V)/文字コードセット(_C)/簡体字中国語 (_GB2312)"
-
-#: src/mainwindow.c:621 src/messageview.c:203
-msgid "/_View/_Code set/Traditional Chinese (_Big5)"
-msgstr "/表示(_V)/文字コードセット(_C)/繁体字中国語 (_Big5)"
+msgid "/_View/Character _encoding/_Auto detect"
+msgstr "/表示(_V)/文字エンコーディング(_E)/自動検出(_A)"
 
-#: src/mainwindow.c:623 src/messageview.c:205
-msgid "/_View/_Code set/Traditional Chinese (EUC-_TW)"
-msgstr "/表示(_V)/文字コードセット(_C)/繁体字中国語 (EUC-_TW)"
+#: src/mainwindow.c:618 src/messageview.c:194
+msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
+msgstr "/表示(_V)/文字エンコーディング(_E)/日本語 (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:625 src/messageview.c:207
-msgid "/_View/_Code set/Chinese (ISO-2022-_CN)"
-msgstr "/表示(_V)/文字コードセット(_C)/中国語 (ISO-2022-_CN)"
+#: src/mainwindow.c:620 src/messageview.c:196
+msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
+msgstr "/表示(_V)/文字エンコーディング(_E)/日本語 (_EUC-JP)"
 
-#: src/mainwindow.c:628 src/messageview.c:210
-msgid "/_View/_Code set/Korean (EUC-_KR)"
-msgstr "/表示(_V)/文字コードセット(_C)/韓国語 (EUC-_KR)"
+#: src/mainwindow.c:622 src/messageview.c:198
+msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
+msgstr "/表示(_V)/文字エンコーディング(_E)/日本語 (_Shift__JIS)"
 
-#: src/mainwindow.c:630 src/messageview.c:212
-msgid "/_View/_Code set/Korean (ISO-2022-KR)"
-msgstr "/表示(_V)/文字コードセット(_C)/韓国語 (ISO-2022-KR)"
+#: src/mainwindow.c:632 src/messageview.c:207
+msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
+msgstr "/表示(_V)/文字エンコーディング(_E)/中国語 (ISO-2022-_CN)"
 
-#: src/mainwindow.c:633 src/messageview.c:215
-msgid "/_View/_Code set/Thai (TIS-620)"
-msgstr "/表示(_V)/文字コードセット(_C)/タイ語 (TIS-620)"
+#: src/mainwindow.c:638 src/messageview.c:212
+msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
+msgstr "/表示(_V)/文字エンコーディング(_E)/韓国語 (ISO-2022-KR)"
 
-#: src/mainwindow.c:635 src/messageview.c:217
-msgid "/_View/_Code set/Thai (Windows-874)"
-msgstr "/表示(_V)/文字コードセット(_C)/タイ語 (Windows-874)"
-
-#: src/mainwindow.c:642 src/summaryview.c:371
+#: src/mainwindow.c:651 src/summaryview.c:371
 msgid "/_View/Open in new _window"
 msgstr "/表示(_V)/新しいウィンドウで開く(_W)"
 
-#: src/mainwindow.c:643 src/messageview.c:224
+#: src/mainwindow.c:652 src/messageview.c:224
 msgid "/_View/Mess_age source"
 msgstr "/表示(_V)/メッセージのソース(_A)"
 
-#: src/mainwindow.c:644 src/messageview.c:225
+#: src/mainwindow.c:653 src/messageview.c:225
 msgid "/_View/Show all _header"
 msgstr "/表示(_V)/すべてのヘッダを表示(_H)"
 
-#: src/mainwindow.c:646
+#: src/mainwindow.c:655
 msgid "/_View/_Update summary"
 msgstr "/表示(_V)/サマリを更新(_U)"
 
-#: src/mainwindow.c:648 src/messageview.c:227
+#: src/mainwindow.c:657 src/messageview.c:227
 msgid "/_Message"
 msgstr "/メッセージ(_M)"
 
-#: src/mainwindow.c:649
+#: src/mainwindow.c:658
 msgid "/_Message/Recei_ve"
 msgstr "/メッセージ(_M)/受信(_V)"
 
-#: src/mainwindow.c:650
+#: src/mainwindow.c:659
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/メッセージ(_M)/受信(_V)/現在のアカウントから受信(_C)"
 
-#: src/mainwindow.c:652
+#: src/mainwindow.c:661
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/メッセージ(_M)/受信(_V)/全アカウントから受信(_A)"
 
-#: src/mainwindow.c:654
+#: src/mainwindow.c:663
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/メッセージ(_M)/受信(_V)/受信を中止(_G)"
 
-#: src/mainwindow.c:656
+#: src/mainwindow.c:665
 msgid "/_Message/Recei_ve/---"
 msgstr "/メッセージ(_M)/受信(_V)/---"
 
-#: src/mainwindow.c:657
+#: src/mainwindow.c:666
 msgid "/_Message/_Send queued messages"
 msgstr "/メッセージ(_M)/送信待機中のメッセージを送信(_S)"
 
-#: src/mainwindow.c:658 src/mainwindow.c:660 src/mainwindow.c:667
-#: src/mainwindow.c:672 src/mainwindow.c:676 src/mainwindow.c:685
+#: src/mainwindow.c:667 src/mainwindow.c:669 src/mainwindow.c:676
+#: src/mainwindow.c:681 src/mainwindow.c:685 src/mainwindow.c:694
 #: src/messageview.c:230 src/messageview.c:238 src/messageview.c:243
 msgid "/_Message/---"
 msgstr "/メッセージ(_M)/---"
 
-#: src/mainwindow.c:659 src/messageview.c:228
+#: src/mainwindow.c:668 src/messageview.c:228
 msgid "/_Message/Compose _new message"
 msgstr "/メッセージ(_M)/新規メッセージを作成(_N)"
 
-#: src/mainwindow.c:661 src/messageview.c:231
+#: src/mainwindow.c:670 src/messageview.c:231
 msgid "/_Message/_Reply"
 msgstr "/メッセージ(_M)/返信(_R)"
 
-#: src/mainwindow.c:662
+#: src/mainwindow.c:671
 msgid "/_Message/Repl_y to"
 msgstr "/メッセージ(_M)/返信の宛先(_Y)"
 
-#: src/mainwindow.c:663 src/messageview.c:232
+#: src/mainwindow.c:672 src/messageview.c:232
 msgid "/_Message/Repl_y to/_all"
 msgstr "/メッセージ(_M)/返信の宛先(_Y)/全員に返信(_A)"
 
-#: src/mainwindow.c:664 src/messageview.c:234
+#: src/mainwindow.c:673 src/messageview.c:234
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/メッセージ(_M)/返信の宛先(_Y)/差出人に返信(_S)"
 
-#: src/mainwindow.c:665 src/messageview.c:236
+#: src/mainwindow.c:674 src/messageview.c:236
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/メッセージ(_M)/返信の宛先(_Y)/メーリングリストに返信(_L)"
 
-#: src/mainwindow.c:668 src/messageview.c:239
+#: src/mainwindow.c:677 src/messageview.c:239
 msgid "/_Message/_Forward"
 msgstr "/メッセージ(_M)/転送(_F)"
 
-#: src/mainwindow.c:669 src/messageview.c:240
+#: src/mainwindow.c:678 src/messageview.c:240
 msgid "/_Message/For_ward as attachment"
 msgstr "/メッセージ(_M)/添付として転送(_W)"
 
-#: src/mainwindow.c:671 src/messageview.c:242
+#: src/mainwindow.c:680 src/messageview.c:242
 msgid "/_Message/Redirec_t"
 msgstr "/メッセージ(_M)/手を加えずに転送(_T)"
 
-#: src/mainwindow.c:673
+#: src/mainwindow.c:682
 msgid "/_Message/M_ove..."
 msgstr "/メッセージ(_M)/移動(_O)..."
 
-#: src/mainwindow.c:674
+#: src/mainwindow.c:683
 msgid "/_Message/_Copy..."
 msgstr "/メッセージ(_M)/コピー(_C)..."
 
-#: src/mainwindow.c:675
+#: src/mainwindow.c:684
 msgid "/_Message/_Delete"
 msgstr "/メッセージ(_M)/削除(_D)"
 
-#: src/mainwindow.c:677
+#: src/mainwindow.c:686
 msgid "/_Message/_Mark"
 msgstr "/メッセージ(_M)/マーク(_M)"
 
-#: src/mainwindow.c:678
+#: src/mainwindow.c:687
 msgid "/_Message/_Mark/_Mark"
 msgstr "/メッセージ(_M)/マーク(_M)/マーク(_M)"
 
-#: src/mainwindow.c:679
+#: src/mainwindow.c:688
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/メッセージ(_M)/マーク(_M)/マーク解除(_U)"
 
-#: src/mainwindow.c:680
+#: src/mainwindow.c:689
 msgid "/_Message/_Mark/---"
 msgstr "/メッセージ(_M)/マーク(_M)/---"
 
-#: src/mainwindow.c:681
+#: src/mainwindow.c:690
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/メッセージ(_M)/マーク(_M)/未読としてマーク(_E)"
 
-#: src/mainwindow.c:682
+#: src/mainwindow.c:691
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/メッセージ(_M)/マーク(_M)/読んだことにする(_D)"
 
-#: src/mainwindow.c:684
+#: src/mainwindow.c:693
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/メッセージ(_M)/マーク(_M)/すべて読んだことにする(_R)"
 
-#: src/mainwindow.c:686 src/messageview.c:244
+#: src/mainwindow.c:695 src/messageview.c:244
 msgid "/_Message/Re-_edit"
 msgstr "/メッセージ(_M)/再編集(_E)"
 
-#: src/mainwindow.c:690 src/messageview.c:248
+#: src/mainwindow.c:699 src/messageview.c:248
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/ツール(_T)/差出人をアドレス帳に追加(_K)"
 
-#: src/mainwindow.c:693
+#: src/mainwindow.c:702
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/ツール(_T)/フォルダ中のすべてのメッセージを振り分け(_F)"
 
-#: src/mainwindow.c:695
+#: src/mainwindow.c:704
 msgid "/_Tools/Filter _selected messages"
 msgstr "/ツール(_T)/選択中のメッセージを振り分け(_F)"
 
-#: src/mainwindow.c:697 src/messageview.c:251
+#: src/mainwindow.c:706 src/messageview.c:251
 msgid "/_Tools/_Create filter rule"
 msgstr "/ツール(_T)/振り分けルールを作成(_C)"
 
-#: src/mainwindow.c:698 src/messageview.c:253
+#: src/mainwindow.c:707 src/messageview.c:253
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/ツール(_T)/振り分けルールを作成(_C)/自動(_A)"
 
-#: src/mainwindow.c:700 src/messageview.c:255
+#: src/mainwindow.c:709 src/messageview.c:255
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/ツール(_T)/振り分けルールを作成(_C)/_Fromから"
 
-#: src/mainwindow.c:702 src/messageview.c:257
+#: src/mainwindow.c:711 src/messageview.c:257
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/ツール(_T)/振り分けルールを作成(_C)/_Toから"
 
-#: src/mainwindow.c:704 src/messageview.c:259
+#: src/mainwindow.c:713 src/messageview.c:259
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/ツール(_T)/振り分けルールを作成(_C)/_Subjectから"
 
-#: src/mainwindow.c:709
+#: src/mainwindow.c:718
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/メッセージ(_M)/重複メッセージを削除(_P)"
 
-#: src/mainwindow.c:712
+#: src/mainwindow.c:721
 msgid "/_Tools/E_xecute"
 msgstr "/ツール(_T)/実行(_X)"
 
-#: src/mainwindow.c:714
+#: src/mainwindow.c:723
 msgid "/_Tools/_Log window"
 msgstr "/ツール(_T)/ログウィンドウ(_L)"
 
-#: src/mainwindow.c:716
+#: src/mainwindow.c:725
 msgid "/_Configuration"
 msgstr "/設定(_C)"
 
-#: src/mainwindow.c:717
+#: src/mainwindow.c:726
 msgid "/_Configuration/_Common preferences..."
 msgstr "/設定(_C)/全般の設定(_C)..."
 
-#: src/mainwindow.c:719
+#: src/mainwindow.c:728
 msgid "/_Configuration/_Filter setting..."
 msgstr "/設定(_C)/振り分けの設定(_F)..."
 
-#: src/mainwindow.c:721
+#: src/mainwindow.c:730
 msgid "/_Configuration/_Template..."
 msgstr "/設定(_C)/テンプレート(_T)..."
 
-#: src/mainwindow.c:722
+#: src/mainwindow.c:731
 msgid "/_Configuration/_Actions..."
 msgstr "/設定(_C)/アクション(_A)..."
 
-#: src/mainwindow.c:723
+#: src/mainwindow.c:732
 msgid "/_Configuration/---"
 msgstr "/設定(_C)/---"
 
-#: src/mainwindow.c:724
+#: src/mainwindow.c:733
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/設定(_C)/現在のアカウントの設定(_P)..."
 
-#: src/mainwindow.c:726
+#: src/mainwindow.c:735
 msgid "/_Configuration/Create _new account..."
 msgstr "/設定(_C)/新規アカウントの作成(_N)..."
 
-#: src/mainwindow.c:728
+#: src/mainwindow.c:737
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/設定(_C)/アカウントの編集(_E)..."
 
-#: src/mainwindow.c:730
+#: src/mainwindow.c:739
 msgid "/_Configuration/C_hange current account"
 msgstr "/設定(_C)/現在のアカウントを変更(_H)"
 
-#: src/mainwindow.c:734
+#: src/mainwindow.c:743
 msgid "/_Help/_Manual"
 msgstr "/ヘルプ(_H)/マニュアル(_M)"
 
-#: src/mainwindow.c:735
+#: src/mainwindow.c:744
 msgid "/_Help/_Manual/_English"
 msgstr "/ヘルプ(_H)/マニュアル(_M)/英語(_E)"
 
-#: src/mainwindow.c:736
+#: src/mainwindow.c:745
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/ヘルプ(_H)/マニュアル(_M)/日本語(_J)"
 
-#: src/mainwindow.c:737
+#: src/mainwindow.c:746
 msgid "/_Help/_FAQ"
 msgstr "/ヘルプ(_H)/_FAQ"
 
-#: src/mainwindow.c:738
+#: src/mainwindow.c:747
 msgid "/_Help/_FAQ/_English"
 msgstr "/ヘルプ(_H)/_FAQ/英語(_E)"
 
-#: src/mainwindow.c:739
+#: src/mainwindow.c:748
 msgid "/_Help/_FAQ/_German"
 msgstr "/ヘルプ(_H)/_FAQ/ドイツ語(_G)"
 
-#: src/mainwindow.c:740
+#: src/mainwindow.c:749
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/ヘルプ(_H)/_FAQ/スペイン語(_S)"
 
-#: src/mainwindow.c:741
+#: src/mainwindow.c:750
 msgid "/_Help/_FAQ/_French"
 msgstr "/ヘルプ(_H)/_FAQ/フランス語(_F)"
 
-#: src/mainwindow.c:742
+#: src/mainwindow.c:751
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/ヘルプ(_H)/_FAQ/イタリア語(_I)"
 
-#: src/mainwindow.c:743
+#: src/mainwindow.c:752
 msgid "/_Help/---"
 msgstr "/ヘルプ(_H)/---"
 
-#: src/mainwindow.c:783
+#: src/mainwindow.c:792
 msgid "Creating main window...\n"
 msgstr "メインウィンドウを作成中...\n"
 
-#: src/mainwindow.c:943
+#: src/mainwindow.c:952
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "MainWindow: 色の割り当て %d に失敗しました\n"
 
-#: src/mainwindow.c:1021 src/summaryview.c:1368 src/summaryview.c:1677
+#: src/mainwindow.c:1030 src/summaryview.c:1368 src/summaryview.c:1677
 #: src/summaryview.c:1785 src/summaryview.c:1831 src/summaryview.c:2453
 #: src/summaryview.c:3080 src/summaryview.c:3146 src/summaryview.c:3171
 #: src/summaryview.c:3284
 msgid "done.\n"
 msgstr "完了。\n"
 
-#: src/mainwindow.c:1137 src/mainwindow.c:1178 src/mainwindow.c:1206
+#: src/mainwindow.c:1146 src/mainwindow.c:1187 src/mainwindow.c:1215
 msgid "Untitled"
 msgstr "名称未設定"
 
-#: src/mainwindow.c:1207
+#: src/mainwindow.c:1216
 msgid "none"
 msgstr "なし"
 
-#: src/mainwindow.c:1257
+#: src/mainwindow.c:1266
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "ウィンドウの分離タイプを %d から %d に変更しています\n"
 
-#: src/mainwindow.c:1477
+#: src/mainwindow.c:1486
 msgid "Offline"
 msgstr "オフライン"
 
-#: src/mainwindow.c:1478
+#: src/mainwindow.c:1487
 msgid "You are offline. Go online?"
 msgstr "現在オフラインです。オンラインにしますか?"
 
-#: src/mainwindow.c:1492
+#: src/mainwindow.c:1501
 msgid "Empty all trash"
 msgstr "すべてのごみ箱を空にする"
 
-#: src/mainwindow.c:1493
+#: src/mainwindow.c:1502
 msgid "Empty messages in all trash?"
 msgstr "すべてのごみ箱の中のメッセージを削除しますか?"
 
-#: src/mainwindow.c:1521
+#: src/mainwindow.c:1530
 msgid "Add mailbox"
 msgstr "メールボックスを追加"
 
-#: src/mainwindow.c:1522
+#: src/mainwindow.c:1531
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3107,16 +3115,16 @@ msgstr ""
 "メールボックスの位置を入力してください。\n"
 "既存のメールボックスを指定すると自動的にスキャンします。"
 
-#: src/mainwindow.c:1528
+#: src/mainwindow.c:1537
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "メールボックス `%s' はすでに存在します。"
 
-#: src/mainwindow.c:1533 src/setup.c:57
+#: src/mainwindow.c:1542 src/setup.c:57
 msgid "Mailbox"
 msgstr "メール箱"
 
-#: src/mainwindow.c:1539 src/setup.c:63
+#: src/mainwindow.c:1548 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3125,141 +3133,141 @@ msgstr ""
 "メールボックスの作成に失敗しました。\n"
 "いくつかのファイルがすでに存在するか、あるいは書き込む権限がありません。"
 
-#: src/mainwindow.c:1912
+#: src/mainwindow.c:1921
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - フォルダビュー"
 
-#: src/mainwindow.c:1932 src/messageview.c:358
+#: src/mainwindow.c:1941 src/messageview.c:358
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - メッセージビュー"
 
-#: src/mainwindow.c:2079 src/summaryview.c:340
+#: src/mainwindow.c:2088 src/summaryview.c:340
 msgid "/_Reply"
 msgstr "/返信(_R)"
 
-#: src/mainwindow.c:2080
+#: src/mainwindow.c:2089
 msgid "/Reply to _all"
 msgstr "/全員に返信(_A)"
 
-#: src/mainwindow.c:2081
+#: src/mainwindow.c:2090
 msgid "/Reply to _sender"
 msgstr "/差出人に返信(_S)"
 
-#: src/mainwindow.c:2082
+#: src/mainwindow.c:2091
 msgid "/Reply to mailing _list"
 msgstr "/メーリングリストに返信(_L)"
 
-#: src/mainwindow.c:2087 src/summaryview.c:347
+#: src/mainwindow.c:2096 src/summaryview.c:347
 msgid "/_Forward"
 msgstr "/転送(_F)"
 
-#: src/mainwindow.c:2088 src/summaryview.c:348
+#: src/mainwindow.c:2097 src/summaryview.c:348
 msgid "/For_ward as attachment"
 msgstr "/添付として転送(_W)"
 
-#: src/mainwindow.c:2089 src/summaryview.c:349
+#: src/mainwindow.c:2098 src/summaryview.c:349
 msgid "/Redirec_t"
 msgstr "/手を加えずに転送(_T)"
 
-#: src/mainwindow.c:2125
+#: src/mainwindow.c:2134
 msgid "Get"
 msgstr "受信"
 
-#: src/mainwindow.c:2126
+#: src/mainwindow.c:2135
 msgid "Incorporate new mail"
 msgstr "新着メールの取込"
 
-#: src/mainwindow.c:2133
+#: src/mainwindow.c:2142
 msgid "Get all"
 msgstr "全受信"
 
-#: src/mainwindow.c:2134
+#: src/mainwindow.c:2143
 msgid "Incorporate new mail of all accounts"
 msgstr "全アカウントの新着メールの取込"
 
-#: src/mainwindow.c:2145
+#: src/mainwindow.c:2154
 msgid "Send queued message(s)"
 msgstr "送信待機中のメッセージを送信する"
 
-#: src/mainwindow.c:2155 src/prefs_account.c:705 src/prefs_common.c:852
+#: src/mainwindow.c:2164 src/prefs_account.c:705 src/prefs_common.c:852
 #: src/prefs_folder_item.c:137
 msgid "Compose"
 msgstr "作成"
 
-#: src/mainwindow.c:2156
+#: src/mainwindow.c:2165
 msgid "Compose new message"
 msgstr "新規メッセージの作成"
 
-#: src/mainwindow.c:2164 src/prefs_common.c:1353
+#: src/mainwindow.c:2173 src/prefs_common.c:1365
 msgid "Reply"
 msgstr "返信"
 
-#: src/mainwindow.c:2165 src/mainwindow.c:2178
+#: src/mainwindow.c:2174 src/mainwindow.c:2187
 msgid "Reply to the message"
 msgstr "メッセージに返信する"
 
-#: src/mainwindow.c:2183
+#: src/mainwindow.c:2192
 msgid "Reply all"
 msgstr "全員に返信"
 
-#: src/mainwindow.c:2184
+#: src/mainwindow.c:2193
 msgid "Reply to all"
 msgstr "全員に返信"
 
-#: src/mainwindow.c:2192 src/prefs_filter_edit.c:719
+#: src/mainwindow.c:2201 src/prefs_filter_edit.c:719
 msgid "Forward"
 msgstr "転送"
 
-#: src/mainwindow.c:2193 src/mainwindow.c:2206
+#: src/mainwindow.c:2202 src/mainwindow.c:2215
 msgid "Forward the message"
 msgstr "メッセージを転送する"
 
-#: src/mainwindow.c:2213
+#: src/mainwindow.c:2222
 msgid "Delete the message"
 msgstr "メッセージを削除する"
 
-#: src/mainwindow.c:2221
+#: src/mainwindow.c:2230
 msgid "Execute"
 msgstr "実行"
 
-#: src/mainwindow.c:2222
+#: src/mainwindow.c:2231
 msgid "Execute marked process"
 msgstr "マークされた処理を実行"
 
-#: src/mainwindow.c:2231
+#: src/mainwindow.c:2240
 msgid "Next unread message"
 msgstr "次の未読メッセージ"
 
-#: src/mainwindow.c:2242
+#: src/mainwindow.c:2251
 msgid "Prefs"
 msgstr "設定"
 
-#: src/mainwindow.c:2243
+#: src/mainwindow.c:2252
 msgid "Common preferences"
 msgstr "全般の設定"
 
-#: src/mainwindow.c:2250 src/prefs_folder_item.c:258
+#: src/mainwindow.c:2259 src/prefs_folder_item.c:258
 #: src/prefs_folder_item.c:269 src/progressdialog.c:50
 msgid "Account"
 msgstr "アカウント"
 
-#: src/mainwindow.c:2251
+#: src/mainwindow.c:2260
 msgid "Account setting"
 msgstr "アカウントの設定"
 
-#: src/mainwindow.c:2425
+#: src/mainwindow.c:2434
 msgid "You are offline. Click the icon to go online."
 msgstr "現在オフラインです。アイコンをクリックするとオンラインになります。"
 
-#: src/mainwindow.c:2436
+#: src/mainwindow.c:2445
 msgid "You are online. Click the icon to go offline."
 msgstr "現在オンラインです。アイコンをクリックするとオフラインになります。"
 
-#: src/mainwindow.c:2624
+#: src/mainwindow.c:2633
 msgid "Exit"
 msgstr "終了"
 
-#: src/mainwindow.c:2624
+#: src/mainwindow.c:2633
 msgid "Exit this program?"
 msgstr "このプログラムを終了しますか?"
 
@@ -3385,7 +3393,7 @@ msgstr "検索完了"
 msgid "Creating message view...\n"
 msgstr "メッセージビューを作成中...\n"
 
-#: src/messageview.c:303 src/prefs_common.c:1550
+#: src/messageview.c:303 src/prefs_common.c:1562
 msgid "Text"
 msgstr "テキスト"
 
@@ -3398,7 +3406,7 @@ msgstr "添付"
 msgid "Can't save the file `%s'."
 msgstr "ファイル `%s' を保存できません。"
 
-#: src/messageview.c:697 src/prefs_common.c:2154 src/summaryview.c:2744
+#: src/messageview.c:697 src/prefs_common.c:2166 src/summaryview.c:2744
 msgid "Print"
 msgstr "印刷"
 
@@ -3868,7 +3876,7 @@ msgstr "(振り分けされないメッセージはこのフォルダに格納�
 msgid "Authentication method"
 msgstr "認証方式"
 
-#: src/prefs_account.c:1123 src/prefs_account.c:1239 src/prefs_common.c:1189
+#: src/prefs_account.c:1123 src/prefs_account.c:1239 src/prefs_common.c:1201
 msgid "Automatic"
 msgstr "自動"
 
@@ -3892,7 +3900,7 @@ msgstr "メッセージIDを生成する"
 msgid "Add user-defined header"
 msgstr "ユーザ定義のヘッダを追加する"
 
-#: src/prefs_account.c:1196 src/prefs_common.c:1714 src/prefs_common.c:1739
+#: src/prefs_account.c:1196 src/prefs_common.c:1726 src/prefs_common.c:1751
 msgid " Edit... "
 msgstr " 編集... "
 
@@ -4286,106 +4294,106 @@ msgid "Save sent messages to outbox"
 msgstr "送信したメッセージを送信控に保存する"
 
 #: src/prefs_common.c:1113
-msgid "Outgoing codeset"
-msgstr "送信コードセット"
+msgid "Outgoing encoding"
+msgstr "送信エンコーディング"
 
 #: src/prefs_common.c:1128
 msgid "Automatic (Recommended)"
 msgstr "自動設定 (推奨)"
 
-#: src/prefs_common.c:1129
+#: src/prefs_common.c:1130
 msgid "7bit ascii (US-ASCII)"
 msgstr "7bit ascii (US-ASCII)"
 
-#: src/prefs_common.c:1130
+#: src/prefs_common.c:1132
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
-#: src/prefs_common.c:1131
+#: src/prefs_common.c:1134
 msgid "Western European (ISO-8859-1)"
 msgstr "欧米 (ISO-8859-1)"
 
-#: src/prefs_common.c:1132
+#: src/prefs_common.c:1135
 msgid "Western European (ISO-8859-15)"
 msgstr "欧米 (ISO-8859-15)"
 
-#: src/prefs_common.c:1133
+#: src/prefs_common.c:1137
 msgid "Central European (ISO-8859-2)"
 msgstr "中欧 (ISO-8859-2)"
 
-#: src/prefs_common.c:1134
+#: src/prefs_common.c:1139
 msgid "Baltic (ISO-8859-13)"
 msgstr "バルト諸国 (ISO-8859-13)"
 
-#: src/prefs_common.c:1135
+#: src/prefs_common.c:1140
 msgid "Baltic (ISO-8859-4)"
 msgstr "バルト諸国 (ISO-8859-4)"
 
-#: src/prefs_common.c:1136
+#: src/prefs_common.c:1142
 msgid "Greek (ISO-8859-7)"
 msgstr "ギリシャ語 (ISO-8859-7)"
 
-#: src/prefs_common.c:1137
+#: src/prefs_common.c:1144
 msgid "Turkish (ISO-8859-9)"
 msgstr "トルコ語 (ISO-8859-9)"
 
-#: src/prefs_common.c:1138
+#: src/prefs_common.c:1146
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "キリル文字 (ISO-8859-5)"
 
-#: src/prefs_common.c:1139
+#: src/prefs_common.c:1147
 msgid "Cyrillic (KOI8-R)"
 msgstr "キリル文字 (KOI8-R)"
 
-#: src/prefs_common.c:1140
-msgid "Cyrillic (Windows-1251)"
-msgstr "キリル文字 (Windows-1251)"
-
-#: src/prefs_common.c:1141
+#: src/prefs_common.c:1148
 msgid "Cyrillic (KOI8-U)"
 msgstr "キリル文字 (KOI8-U)"
 
-#: src/prefs_common.c:1142
+#: src/prefs_common.c:1149
+msgid "Cyrillic (Windows-1251)"
+msgstr "キリル文字 (Windows-1251)"
+
+#: src/prefs_common.c:1151
 msgid "Japanese (ISO-2022-JP)"
 msgstr "日本語 (ISO-2022-JP)"
 
-#: src/prefs_common.c:1144
+#: src/prefs_common.c:1153
 msgid "Japanese (EUC-JP)"
 msgstr "日本語 (EUC-JP)"
 
-#: src/prefs_common.c:1145
+#: src/prefs_common.c:1154
 msgid "Japanese (Shift_JIS)"
 msgstr "日本語 (Shift_JIS)"
 
-#: src/prefs_common.c:1147
+#: src/prefs_common.c:1157
 msgid "Simplified Chinese (GB2312)"
 msgstr "簡体字中国語 (GB2312)"
 
-#: src/prefs_common.c:1148
+#: src/prefs_common.c:1158
 msgid "Traditional Chinese (Big5)"
 msgstr "繁体字中国語 (Big5)"
 
-#: src/prefs_common.c:1150
+#: src/prefs_common.c:1160
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "繁体字中国語 (EUC-TW)"
 
-#: src/prefs_common.c:1151
+#: src/prefs_common.c:1161
 msgid "Chinese (ISO-2022-CN)"
 msgstr "中国語 (ISO-2022-CN)"
 
-#: src/prefs_common.c:1153
+#: src/prefs_common.c:1164
 msgid "Korean (EUC-KR)"
 msgstr "韓国語 (EUC-KR)"
 
-#: src/prefs_common.c:1154
+#: src/prefs_common.c:1166
 msgid "Thai (TIS-620)"
 msgstr "タイ語 (TIS-620)"
 
-#: src/prefs_common.c:1155
+#: src/prefs_common.c:1167
 msgid "Thai (Windows-874)"
 msgstr "タイ語 (Windows-874)"
 
-#: src/prefs_common.c:1165
+#: src/prefs_common.c:1177
 msgid ""
 "If `Automatic' is selected, the optimal encoding for the current locale will "
 "be used."
@@ -4393,11 +4401,11 @@ msgstr ""
 "「自動設定」を選択した場合は、現在の言語設定に最適なエンコーディングが使用さ"
 "れます。"
 
-#: src/prefs_common.c:1179
+#: src/prefs_common.c:1191
 msgid "Transfer encoding"
 msgstr "転送符号化方式"
 
-#: src/prefs_common.c:1202
+#: src/prefs_common.c:1214
 msgid ""
 "Specify Content-Transfer-Encoding used when message body contains non-ASCII "
 "characters."
@@ -4405,434 +4413,434 @@ msgstr ""
 "メッセージ本文が ASCII 文字以外を含む場合に使用する Content-Transfer-"
 "Encoding を指定してください。"
 
-#: src/prefs_common.c:1272
+#: src/prefs_common.c:1284
 msgid "Signature separator"
 msgstr "署名の区切り"
 
-#: src/prefs_common.c:1281
+#: src/prefs_common.c:1293
 msgid "Insert automatically"
 msgstr "自動的に挿入する"
 
-#: src/prefs_common.c:1291
+#: src/prefs_common.c:1303
 msgid "Automatically launch the external editor"
 msgstr "外部エディタを自動的に起動する"
 
-#: src/prefs_common.c:1301
+#: src/prefs_common.c:1313
 msgid "Undo level"
 msgstr "アンドゥの回数"
 
-#: src/prefs_common.c:1321
+#: src/prefs_common.c:1333
 msgid "Wrap messages at"
 msgstr "メッセージを半角"
 
-#: src/prefs_common.c:1333
+#: src/prefs_common.c:1345
 msgid "characters"
 msgstr "文字で改行"
 
-#: src/prefs_common.c:1343
+#: src/prefs_common.c:1355
 msgid "Wrap quotation"
 msgstr "引用部を自動整形する"
 
-#: src/prefs_common.c:1349
+#: src/prefs_common.c:1361
 msgid "Wrap on input"
 msgstr "入力時に自動整形する"
 
-#: src/prefs_common.c:1351
+#: src/prefs_common.c:1363
 msgid "Wrap before sending"
 msgstr "送信時に自動整形する"
 
-#: src/prefs_common.c:1361
+#: src/prefs_common.c:1373
 msgid "Automatically select account for replies"
 msgstr "返信時に自動的にアカウントを選択する"
 
-#: src/prefs_common.c:1363
+#: src/prefs_common.c:1375
 msgid "Quote message when replying"
 msgstr "返信時にメッセージを引用する"
 
-#: src/prefs_common.c:1365
+#: src/prefs_common.c:1377
 msgid "Reply button invokes mailing list reply"
 msgstr "返信ボタンでメーリングリストに返信する"
 
 #. reply
-#: src/prefs_common.c:1411
+#: src/prefs_common.c:1423
 msgid "Reply format"
 msgstr "返信の書式"
 
-#: src/prefs_common.c:1426 src/prefs_common.c:1468
+#: src/prefs_common.c:1438 src/prefs_common.c:1480
 msgid "Quotation mark"
 msgstr "引用符"
 
 #. forward
-#: src/prefs_common.c:1453
+#: src/prefs_common.c:1465
 msgid "Forward format"
 msgstr "転送の書式"
 
-#: src/prefs_common.c:1500
+#: src/prefs_common.c:1512
 msgid " Description of symbols "
 msgstr " 記号の説明 "
 
-#: src/prefs_common.c:1541
+#: src/prefs_common.c:1553
 msgid "Font"
 msgstr "フォント"
 
-#: src/prefs_common.c:1573
+#: src/prefs_common.c:1585
 msgid "Translate header name (such as `From:', `Subject:')"
 msgstr "ヘッダの項目を翻訳する (例えば `From:', `Subject:' 等)"
 
-#: src/prefs_common.c:1576
+#: src/prefs_common.c:1588
 msgid "Display unread number next to folder name"
 msgstr "フォルダ名の横に未読数を表示する"
 
-#: src/prefs_common.c:1585
+#: src/prefs_common.c:1597
 msgid "Abbreviate newsgroups longer than"
 msgstr "文字数が"
 
-#: src/prefs_common.c:1600
+#: src/prefs_common.c:1612
 msgid "letters"
 msgstr "字より長いニュースグループ名を簡略表示"
 
 #. ---- Summary ----
-#: src/prefs_common.c:1606
+#: src/prefs_common.c:1618
 msgid "Summary View"
 msgstr "サマリビュー"
 
-#: src/prefs_common.c:1615
+#: src/prefs_common.c:1627
 msgid "Display recipient on `From' column if sender is yourself"
 msgstr "差出人が自分の場合は `差出人' カラムに宛先を表示する"
 
-#: src/prefs_common.c:1617
+#: src/prefs_common.c:1629
 msgid "Expand threads"
 msgstr "スレッドを展開する"
 
-#: src/prefs_common.c:1625 src/prefs_common.c:2443 src/prefs_common.c:2481
+#: src/prefs_common.c:1637 src/prefs_common.c:2455 src/prefs_common.c:2493
 msgid "Date format"
 msgstr "日付の書式"
 
-#: src/prefs_common.c:1646
+#: src/prefs_common.c:1658
 msgid " Set display item of summary... "
 msgstr " サマリの表示項目を設定... "
 
-#: src/prefs_common.c:1710
+#: src/prefs_common.c:1722
 msgid "Enable coloration of message"
 msgstr "メッセージの色を有効にする"
 
-#: src/prefs_common.c:1724
+#: src/prefs_common.c:1736
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
 msgstr "マルチバイト英数字を ASCII 文字で表示する (日本語のみ)"
 
-#: src/prefs_common.c:1730
+#: src/prefs_common.c:1742
 msgid "Display header pane above message view"
 msgstr "メッセージビューの上部にヘッダペインを表示する"
 
-#: src/prefs_common.c:1737
+#: src/prefs_common.c:1749
 msgid "Display short headers on message view"
 msgstr "メッセージビューに簡略ヘッダを表示する"
 
-#: src/prefs_common.c:1758
+#: src/prefs_common.c:1770
 msgid "Line space"
 msgstr "行間を空ける"
 
-#: src/prefs_common.c:1772 src/prefs_common.c:1810
+#: src/prefs_common.c:1784 src/prefs_common.c:1822
 msgid "pixel(s)"
 msgstr "ピクセル"
 
-#: src/prefs_common.c:1777
+#: src/prefs_common.c:1789
 msgid "Scroll"
 msgstr "スクロール"
 
-#: src/prefs_common.c:1784
+#: src/prefs_common.c:1796
 msgid "Half page"
 msgstr "半ページ単位"
 
-#: src/prefs_common.c:1790
+#: src/prefs_common.c:1802
 msgid "Smooth scroll"
 msgstr "スムーズスクロール"
 
-#: src/prefs_common.c:1796
+#: src/prefs_common.c:1808
 msgid "Step"
 msgstr "間隔"
 
-#: src/prefs_common.c:1816
+#: src/prefs_common.c:1828
 msgid "Images"
 msgstr "画像"
 
-#: src/prefs_common.c:1824
+#: src/prefs_common.c:1836
 msgid "Resize attached large images to fit in the window"
 msgstr "大きな添付画像をウィンドウにあわせてリサイズする"
 
-#: src/prefs_common.c:1826
+#: src/prefs_common.c:1838
 msgid "Display images as inline"
 msgstr "画像をインラインで表示する"
 
-#: src/prefs_common.c:1871
+#: src/prefs_common.c:1883
 msgid "Automatically check signatures"
 msgstr "署名を自動的に検証する"
 
-#: src/prefs_common.c:1874
+#: src/prefs_common.c:1886
 msgid "Show signature check result in a popup window"
 msgstr "署名の検証結果をポップアップウィンドウで表示する"
 
-#: src/prefs_common.c:1877
+#: src/prefs_common.c:1889
 msgid "Store passphrase in memory temporarily"
 msgstr "パスフレーズをメモリ上に一時的に記憶する"
 
-#: src/prefs_common.c:1892
+#: src/prefs_common.c:1904
 msgid "Expired after"
 msgstr "有効期間"
 
-#: src/prefs_common.c:1905
+#: src/prefs_common.c:1917
 msgid "minute(s) "
 msgstr "分"
 
-#: src/prefs_common.c:1918
+#: src/prefs_common.c:1930
 msgid "Setting to '0' will store the passphrase for the whole session."
 msgstr "'0' に設定するとセッションの間中パスフレーズを記憶します。"
 
-#: src/prefs_common.c:1932
+#: src/prefs_common.c:1944
 msgid "Grab input while entering a passphrase"
 msgstr "パスフレーズの入力時に入力を捕捉する"
 
-#: src/prefs_common.c:1937
+#: src/prefs_common.c:1949
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "GnuPG が動作しない場合起動時に警告を表示する"
 
-#: src/prefs_common.c:1989
+#: src/prefs_common.c:2001
 msgid "Always open messages in summary when selected"
 msgstr "サマリでメッセージを選択したとき常に開く"
 
-#: src/prefs_common.c:1993
+#: src/prefs_common.c:2005
 msgid "Open first unread message when entering a folder"
 msgstr "フォルダに入ったときに最初の未読メッセージを開く"
 
-#: src/prefs_common.c:1997
+#: src/prefs_common.c:2009
 msgid "Only mark message as read when opened in new window"
 msgstr "新規ウィンドウで開いたときのみメッセージを既読としてマーク"
 
-#: src/prefs_common.c:2001
+#: src/prefs_common.c:2013
 msgid "Go to inbox after receiving new mail"
 msgstr "新着メールを受信した後受信箱に移動する"
 
-#: src/prefs_common.c:2009
+#: src/prefs_common.c:2021
 msgid "Execute immediately when moving or deleting messages"
 msgstr "メッセージを移動または削除したら即座に実行する"
 
-#: src/prefs_common.c:2021
+#: src/prefs_common.c:2033
 msgid "Messages will be marked until execution if this is turned off."
 msgstr ""
 "これを無効にすると、メッセージは実行されるまでマークされた状態になります。"
 
-#: src/prefs_common.c:2029
+#: src/prefs_common.c:2041
 msgid "Receive dialog"
 msgstr "受信ダイアログ"
 
-#: src/prefs_common.c:2039
+#: src/prefs_common.c:2051
 msgid "Show receive dialog"
 msgstr "受信ダイアログを"
 
-#: src/prefs_common.c:2049
+#: src/prefs_common.c:2061
 msgid "Always"
 msgstr "常に表示"
 
-#: src/prefs_common.c:2050
+#: src/prefs_common.c:2062
 msgid "Only on manual receiving"
 msgstr "手動で受信した場合のみ表示"
 
-#: src/prefs_common.c:2052
+#: src/prefs_common.c:2064
 msgid "Never"
 msgstr "表示しない"
 
-#: src/prefs_common.c:2057
+#: src/prefs_common.c:2069
 msgid "Don't popup error dialog on receive error"
 msgstr "受信エラー時にエラーダイアログをポップアップしない"
 
-#: src/prefs_common.c:2060
+#: src/prefs_common.c:2072
 msgid "Close receive dialog when finished"
 msgstr "完了時に受信ダイアログを閉じる"
 
-#: src/prefs_common.c:2066
+#: src/prefs_common.c:2078
 msgid " Set key bindings... "
 msgstr " キーバインドを設定... "
 
-#: src/prefs_common.c:2122
+#: src/prefs_common.c:2134
 #, c-format
 msgid "External commands (%s will be replaced with file name / URI)"
 msgstr "外部コマンド (%s はファイル名・URIで置き換えられます)"
 
-#: src/prefs_common.c:2131
+#: src/prefs_common.c:2143
 msgid "Web browser"
 msgstr "Webブラウザ"
 
-#: src/prefs_common.c:2195
+#: src/prefs_common.c:2207
 msgid "Add address to destination when double-clicked"
 msgstr "ダブルクリックしたときにアドレスを宛先に追加する"
 
-#: src/prefs_common.c:2197
+#: src/prefs_common.c:2209
 msgid "On exit"
 msgstr "終了時"
 
-#: src/prefs_common.c:2205
+#: src/prefs_common.c:2217
 msgid "Confirm on exit"
 msgstr "終了時に確認する"
 
-#: src/prefs_common.c:2212
+#: src/prefs_common.c:2224
 msgid "Empty trash on exit"
 msgstr "終了時にごみ箱を空にする"
 
-#: src/prefs_common.c:2214
+#: src/prefs_common.c:2226
 msgid "Ask before emptying"
 msgstr "空にする前に尋ねる"
 
-#: src/prefs_common.c:2218
+#: src/prefs_common.c:2230
 msgid "Warn if there are queued messages"
 msgstr "送信待機中のメッセージがあれば警告する"
 
-#: src/prefs_common.c:2224
+#: src/prefs_common.c:2236
 msgid "Socket I/O timeout:"
 msgstr "ソケット I/O のタイムアウト:"
 
-#: src/prefs_common.c:2237
+#: src/prefs_common.c:2249
 msgid "second(s)"
 msgstr "秒"
 
-#: src/prefs_common.c:2419
+#: src/prefs_common.c:2431
 msgid "the full abbreviated weekday name"
 msgstr "曜日の省略名"
 
-#: src/prefs_common.c:2420
+#: src/prefs_common.c:2432
 msgid "the full weekday name"
 msgstr "曜日の完全な名前"
 
-#: src/prefs_common.c:2421
+#: src/prefs_common.c:2433
 msgid "the abbreviated month name"
 msgstr "月の省略名"
 
-#: src/prefs_common.c:2422
+#: src/prefs_common.c:2434
 msgid "the full month name"
 msgstr "月の完全な名前"
 
-#: src/prefs_common.c:2423
+#: src/prefs_common.c:2435
 msgid "the preferred date and time for the current locale"
 msgstr "現在の地域における一般的な日付と時刻の表記"
 
-#: src/prefs_common.c:2424
+#: src/prefs_common.c:2436
 msgid "the century number (year/100)"
 msgstr "世紀(西暦年の上2桁)"
 
-#: src/prefs_common.c:2425
+#: src/prefs_common.c:2437
 msgid "the day of the month as a decimal number"
 msgstr "日(10進数表記)"
 
-#: src/prefs_common.c:2426
+#: src/prefs_common.c:2438
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "24時間時計での時"
 
-#: src/prefs_common.c:2427
+#: src/prefs_common.c:2439
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "12時間時計での時"
 
-#: src/prefs_common.c:2428
+#: src/prefs_common.c:2440
 msgid "the day of the year as a decimal number"
 msgstr "年の初めから通算の日数(10進数表記)"
 
-#: src/prefs_common.c:2429
+#: src/prefs_common.c:2441
 msgid "the month as a decimal number"
 msgstr "月(10進数表記)"
 
-#: src/prefs_common.c:2430
+#: src/prefs_common.c:2442
 msgid "the minute as a decimal number"
 msgstr "分(10進数表記)"
 
-#: src/prefs_common.c:2431
+#: src/prefs_common.c:2443
 msgid "either AM or PM"
 msgstr "午前または午後"
 
-#: src/prefs_common.c:2432
+#: src/prefs_common.c:2444
 msgid "the second as a decimal number"
 msgstr "秒(10進数表記)"
 
-#: src/prefs_common.c:2433
+#: src/prefs_common.c:2445
 msgid "the day of the week as a decimal number"
 msgstr "週の何番目の日か(10進数表記)"
 
-#: src/prefs_common.c:2434
+#: src/prefs_common.c:2446
 msgid "the preferred date for the current locale"
 msgstr "現在の地域における一般的な日付表記"
 
-#: src/prefs_common.c:2435
+#: src/prefs_common.c:2447
 msgid "the last two digits of a year"
 msgstr "西暦の下2桁(世紀部分を含まない年)"
 
-#: src/prefs_common.c:2436
+#: src/prefs_common.c:2448
 msgid "the year as a decimal number"
 msgstr "(4桁の)西暦年"
 
-#: src/prefs_common.c:2437
+#: src/prefs_common.c:2449
 msgid "the time zone or name or abbreviation"
 msgstr "タイムゾーンまたはゾーン名または省略名"
 
-#: src/prefs_common.c:2458
+#: src/prefs_common.c:2470
 msgid "Specifier"
 msgstr "指定子"
 
-#: src/prefs_common.c:2459
+#: src/prefs_common.c:2471
 msgid "Description"
 msgstr "説明"
 
-#: src/prefs_common.c:2499
+#: src/prefs_common.c:2511
 msgid "Example"
 msgstr "例"
 
-#: src/prefs_common.c:2580
+#: src/prefs_common.c:2592
 msgid "Set message colors"
 msgstr "メッセージの色を指定"
 
-#: src/prefs_common.c:2588
+#: src/prefs_common.c:2600
 msgid "Colors"
 msgstr "色"
 
-#: src/prefs_common.c:2622
+#: src/prefs_common.c:2634
 msgid "Quoted Text - First Level"
 msgstr "引用文 - 1段階"
 
-#: src/prefs_common.c:2628
+#: src/prefs_common.c:2640
 msgid "Quoted Text - Second Level"
 msgstr "引用文 - 2段階"
 
-#: src/prefs_common.c:2634
+#: src/prefs_common.c:2646
 msgid "Quoted Text - Third Level"
 msgstr "引用文 - 3段階"
 
-#: src/prefs_common.c:2640
+#: src/prefs_common.c:2652
 msgid "URI link"
 msgstr "URI リンク"
 
-#: src/prefs_common.c:2647
+#: src/prefs_common.c:2659
 msgid "Recycle quote colors"
 msgstr "引用色を循環"
 
-#: src/prefs_common.c:2707
+#: src/prefs_common.c:2719
 msgid "Pick color for quotation level 1"
 msgstr "引用レベル1の色を選択"
 
-#: src/prefs_common.c:2710
+#: src/prefs_common.c:2722
 msgid "Pick color for quotation level 2"
 msgstr "引用レベル2の色を選択"
 
-#: src/prefs_common.c:2713
+#: src/prefs_common.c:2725
 msgid "Pick color for quotation level 3"
 msgstr "引用レベル3の色を選択"
 
-#: src/prefs_common.c:2716
+#: src/prefs_common.c:2728
 msgid "Pick color for URI"
 msgstr "URI の色を選択"
 
-#: src/prefs_common.c:2853
+#: src/prefs_common.c:2865
 msgid "Description of symbols"
 msgstr "記号の説明"
 
-#: src/prefs_common.c:2909
+#: src/prefs_common.c:2921
 msgid ""
 "Date\n"
 "From\n"
@@ -4856,11 +4864,11 @@ msgstr ""
 "ニュースグループ\n"
 "メッセージID"
 
-#: src/prefs_common.c:2922
+#: src/prefs_common.c:2934
 msgid "If x is set, displays expr"
 msgstr "xが指定されていればexprを表示"
 
-#: src/prefs_common.c:2926
+#: src/prefs_common.c:2938
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -4874,7 +4882,7 @@ msgstr ""
 "引用符付きメッセージ本文(署名なし)\n"
 "文字 %"
 
-#: src/prefs_common.c:2934
+#: src/prefs_common.c:2946
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -4886,15 +4894,15 @@ msgstr ""
 "文字 開き中括弧\n"
 "文字 閉じ中括弧"
 
-#: src/prefs_common.c:2971
+#: src/prefs_common.c:2983
 msgid "Font selection"
 msgstr "フォントの選択"
 
-#: src/prefs_common.c:3035
+#: src/prefs_common.c:3047
 msgid "Key bindings"
 msgstr "キーバインド"
 
-#: src/prefs_common.c:3049
+#: src/prefs_common.c:3061
 msgid ""
 "Select the preset of key bindings.\n"
 "You can also modify each menu's shortcuts by pressing\n"
@@ -4904,11 +4912,11 @@ msgstr ""
 "また、マウスポインタをメニューの項目の上に置きキーを押す\n"
 "ことで各メニューのショートカットを変更することもできます。"
 
-#: src/prefs_common.c:3061 src/prefs_common.c:3410
+#: src/prefs_common.c:3073 src/prefs_common.c:3422
 msgid "Default"
 msgstr "標準"
 
-#: src/prefs_common.c:3064 src/prefs_common.c:3419
+#: src/prefs_common.c:3076 src/prefs_common.c:3431
 msgid "Old Sylpheed"
 msgstr "旧Sylpheed"
 
@@ -6049,3 +6057,9 @@ msgstr "%.2fGB"
 #, c-format
 msgid "writing to %s failed.\n"
 msgstr "%s への書き込みに失敗しました。\n"
+
+#~ msgid "/_View/_Code set/---"
+#~ msgstr "/表示(_V)/文字コードセット(_C)/---"
+
+#~ msgid "/_View/_Code set"
+#~ msgstr "/表示(_V)/文字コードセット(_C)"
diff --git a/po/ko.po b/po/ko.po
index 7e37a76f..3b87f1bf 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: 2005-03-15 14:29+0900\n"
+"POT-Creation-Date: 2005-03-16 14:47+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"
@@ -84,7 +84,7 @@ msgstr ""
 "받으려면 `G' 컬럼 상자를 선택하세요."
 
 #: src/account.c:638 src/addressadd.c:186 src/addressbook.c:488
-#: src/compose.c:3650 src/editaddress.c:195 src/editaddress.c:936
+#: src/compose.c:3748 src/editaddress.c:195 src/editaddress.c:936
 #: src/editaddress.c:984 src/editbook.c:191 src/editgroup.c:257
 #: src/editjpilot.c:296 src/editldap.c:300 src/editvcard.c:211
 #: src/mimeview.c:151 src/prefs_filter.c:214 src/prefs_folder_item.c:170
@@ -137,13 +137,13 @@ msgstr "계정 삭제"
 msgid "Do you really want to delete this account?"
 msgstr "정말로 이 계정을 삭제하시겠습니까?"
 
-#: src/account.c:758 src/compose.c:2551 src/compose.c:4807
+#: src/account.c:758 src/compose.c:2632 src/compose.c:4943
 #: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
 #: src/folderview.c:2156 src/folderview.c:2192
 msgid "Yes"
 msgstr "확인"
 
-#: src/account.c:758 src/compose.c:2551 src/compose.c:4807
+#: src/account.c:758 src/compose.c:2632 src/compose.c:4943
 #: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
 #: src/folderview.c:2156 src/folderview.c:2192
 msgid "+No"
@@ -246,7 +246,7 @@ msgstr ""
 msgid "Add Address to Book"
 msgstr "주소록에 추가"
 
-#: src/addressadd.c:196 src/compose.c:4191 src/editaddress.c:196
+#: src/addressadd.c:196 src/compose.c:4292 src/editaddress.c:196
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "주소"
@@ -260,7 +260,7 @@ msgstr "메모"
 msgid "Select Address Book Folder"
 msgstr "주소록 폴더 선택"
 
-#: src/addressbook.c:334 src/compose.c:469 src/mainwindow.c:454
+#: src/addressbook.c:334 src/compose.c:477 src/mainwindow.c:454
 #: src/messageview.c:134
 msgid "/_File"
 msgstr "/파일(_F)"
@@ -281,8 +281,8 @@ msgstr "/파일(_F)/새 JPilot(_J)"
 msgid "/_File/New _Server"
 msgstr "/파일(_F)/새 서버(_S)"
 
-#: src/addressbook.c:343 src/addressbook.c:346 src/compose.c:474
-#: src/compose.c:479 src/compose.c:483 src/mainwindow.c:471
+#: src/addressbook.c:343 src/addressbook.c:346 src/compose.c:482
+#: src/compose.c:487 src/compose.c:491 src/mainwindow.c:471
 #: src/mainwindow.c:474 src/mainwindow.c:476 src/mainwindow.c:479
 #: src/mainwindow.c:481 src/messageview.c:137
 msgid "/_File/---"
@@ -300,7 +300,7 @@ msgstr "/파일(_F)/삭제(_D)"
 msgid "/_File/_Save"
 msgstr "/파일(_F)/저장(_S)"
 
-#: src/addressbook.c:348 src/compose.c:484 src/messageview.c:138
+#: src/addressbook.c:348 src/compose.c:492 src/messageview.c:138
 msgid "/_File/_Close"
 msgstr "/파일(_F)/닫기(_C)"
 
@@ -332,7 +332,7 @@ msgstr "/주소(_A)/편집(_E)"
 msgid "/_Address/_Delete"
 msgstr "/주소(_A)/삭제(_D)"
 
-#: src/addressbook.c:356 src/compose.c:585 src/mainwindow.c:688
+#: src/addressbook.c:356 src/compose.c:664 src/mainwindow.c:697
 #: src/messageview.c:246
 msgid "/_Tools"
 msgstr "/도구(_T)"
@@ -341,12 +341,12 @@ msgstr "/도구(_T)"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/도구(_T)/LDIF 파일 가져오기(_L)"
 
-#: src/addressbook.c:358 src/compose.c:598 src/mainwindow.c:733
+#: src/addressbook.c:358 src/compose.c:677 src/mainwindow.c:742
 #: src/messageview.c:264
 msgid "/_Help"
 msgstr "/도움말(_H)"
 
-#: src/addressbook.c:359 src/compose.c:599 src/mainwindow.c:744
+#: src/addressbook.c:359 src/compose.c:678 src/mainwindow.c:753
 #: src/messageview.c:265
 msgid "/_Help/_About"
 msgstr "/도움말(_H)/sylpheed 정보(_A)"
@@ -363,7 +363,7 @@ msgstr "/새 그룹(_G)"
 msgid "/New _Folder"
 msgstr "/새 폴더(_F)"
 
-#: src/addressbook.c:381 src/addressbook.c:391 src/compose.c:463
+#: src/addressbook.c:381 src/addressbook.c:391 src/compose.c:471
 #: src/folderview.c:220 src/folderview.c:222 src/folderview.c:226
 #: src/folderview.c:236 src/folderview.c:238 src/folderview.c:240
 #: src/folderview.c:244 src/folderview.c:254 src/folderview.c:256
@@ -373,7 +373,7 @@ msgstr "/새 폴더(_F)"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:382 src/addressbook.c:392 src/compose.c:486
+#: src/addressbook.c:382 src/addressbook.c:392 src/compose.c:494
 #: src/mainwindow.c:485 src/messageview.c:140
 msgid "/_Edit"
 msgstr "/편집(_E)"
@@ -386,7 +386,7 @@ msgstr "/삭제(_D)"
 msgid "E-Mail address"
 msgstr "이메일 주소"
 
-#: src/addressbook.c:493 src/compose.c:4192 src/prefs_common.c:2186
+#: src/addressbook.c:493 src/compose.c:4293 src/prefs_common.c:2198
 msgid "Address book"
 msgstr "주소록"
 
@@ -396,7 +396,7 @@ msgstr "이름:"
 
 #. Buttons
 #: src/addressbook.c:625 src/addressbook.c:1665 src/addressbook.c:1671
-#: src/editaddress.c:878 src/editaddress.c:1011 src/mainwindow.c:2212
+#: src/editaddress.c:878 src/editaddress.c:1011 src/mainwindow.c:2221
 #: src/prefs_actions.c:263 src/prefs_display_header.c:275
 #: src/prefs_display_header.c:330 src/prefs_template.c:227
 msgid "Delete"
@@ -583,7 +583,7 @@ msgstr "공용 주소록"
 msgid "Personal address"
 msgstr "개인 주소록"
 
-#: src/alertpanel.c:123 src/compose.c:4807 src/main.c:458
+#: src/alertpanel.c:123 src/compose.c:4943 src/main.c:458
 msgid "Notice"
 msgstr "알림"
 
@@ -591,7 +591,7 @@ msgstr "알림"
 msgid "Warning"
 msgstr "경고"
 
-#: src/alertpanel.c:149 src/compose.c:2551 src/inc.c:558
+#: src/alertpanel.c:149 src/compose.c:2632 src/inc.c:558
 msgid "Error"
 msgstr "에러"
 
@@ -639,308 +639,426 @@ msgstr "갈색"
 msgid "None"
 msgstr "없음"
 
-#: src/compose.c:461
+#: src/compose.c:469
 msgid "/_Add..."
 msgstr "/추가(_A)..."
 
-#: src/compose.c:462
+#: src/compose.c:470
 msgid "/_Remove"
 msgstr "/삭제(_R)"
 
-#: src/compose.c:464 src/folderview.c:228 src/folderview.c:246
+#: src/compose.c:472 src/folderview.c:228 src/folderview.c:246
 #: src/folderview.c:261
 #, fuzzy
 msgid "/_Properties..."
 msgstr "/특성(_P)..."
 
-#: src/compose.c:470
+#: src/compose.c:478
 #, fuzzy
 msgid "/_File/_Send"
 msgstr "/파일(_F)/저장(_S)"
 
-#: src/compose.c:472
+#: src/compose.c:480
 #, fuzzy
 msgid "/_File/Send _later"
 msgstr "/메시지(_M)/나중에 보내기(_l)"
 
-#: src/compose.c:475
+#: src/compose.c:483
 #, fuzzy
 msgid "/_File/Save to _draft folder"
 msgstr "/메시지(_M)/임시 보관함으로 보내기(_d)"
 
-#: src/compose.c:477
+#: src/compose.c:485
 #, fuzzy
 msgid "/_File/Save and _keep editing"
 msgstr "/메시지(_M)/저장하고 편집 보존(_k)"
 
-#: src/compose.c:480
+#: src/compose.c:488
 msgid "/_File/_Attach file"
 msgstr "/파일(_F)/첨부 파일(_A)"
 
-#: src/compose.c:481
+#: src/compose.c:489
 msgid "/_File/_Insert file"
 msgstr "/파일(_F)/파일 삽입(_I)"
 
-#: src/compose.c:482
+#: src/compose.c:490
 msgid "/_File/Insert si_gnature"
 msgstr "/파일(_F)/서명 삽입(_g)"
 
-#: src/compose.c:487
+#: src/compose.c:495
 msgid "/_Edit/_Undo"
 msgstr "/편집(_E)/실행취소(_U)"
 
-#: src/compose.c:488
+#: src/compose.c:496
 msgid "/_Edit/_Redo"
 msgstr "/편집(_E)/다시 실행(_R)"
 
-#: src/compose.c:489 src/compose.c:567 src/mainwindow.c:489
+#: src/compose.c:497 src/compose.c:575 src/mainwindow.c:489
 #: src/messageview.c:143
 msgid "/_Edit/---"
 msgstr "/편집(_E)/---"
 
-#: src/compose.c:490
+#: src/compose.c:498
 msgid "/_Edit/Cu_t"
 msgstr "/편집(_E)/잘라내기(_t)"
 
-#: src/compose.c:491 src/mainwindow.c:486 src/messageview.c:141
+#: src/compose.c:499 src/mainwindow.c:486 src/messageview.c:141
 msgid "/_Edit/_Copy"
 msgstr "/편집(_E)/복사(_C)"
 
-#: src/compose.c:492
+#: src/compose.c:500
 msgid "/_Edit/_Paste"
 msgstr "/편집(_E)/붙여넣기(_P)"
 
-#: src/compose.c:493
+#: src/compose.c:501
 msgid "/_Edit/Paste as _quotation"
 msgstr "/편집(_E)/quotation으로 붙여넣기(_q)"
 
-#: src/compose.c:495 src/mainwindow.c:487 src/messageview.c:142
+#: src/compose.c:503 src/mainwindow.c:487 src/messageview.c:142
 msgid "/_Edit/Select _all"
 msgstr "/편집(_E)/모두 선택(_a)"
 
-#: src/compose.c:496
+#: src/compose.c:504
 msgid "/_Edit/A_dvanced"
 msgstr "/편집(_E)/고급(_d)"
 
-#: src/compose.c:497
+#: src/compose.c:505
 msgid "/_Edit/A_dvanced/Move a character backward"
 msgstr "/편집(_E)/고급(_d)/문자를 뒤로 이동"
 
-#: src/compose.c:502
+#: src/compose.c:510
 msgid "/_Edit/A_dvanced/Move a character forward"
 msgstr "/편집(_E)/고급(_d)/문자를 앞으로 이동"
 
-#: src/compose.c:507
+#: src/compose.c:515
 msgid "/_Edit/A_dvanced/Move a word backward"
 msgstr "/편집(_E)/고급(_d)/단어를 뒤로 이동"
 
-#: src/compose.c:512
+#: src/compose.c:520
 msgid "/_Edit/A_dvanced/Move a word forward"
 msgstr "/편집(_E)/고급(_d)/단어를 앞으로 이동"
 
-#: src/compose.c:517
+#: src/compose.c:525
 msgid "/_Edit/A_dvanced/Move to beginning of line"
 msgstr "/편집(_E)/고급(_d)/라인의 처음으로 이동"
 
-#: src/compose.c:522
+#: src/compose.c:530
 msgid "/_Edit/A_dvanced/Move to end of line"
 msgstr "/편집(_E)/고급(_d)/라인의 끝으로 이동"
 
-#: src/compose.c:527
+#: src/compose.c:535
 msgid "/_Edit/A_dvanced/Move to previous line"
 msgstr "/편집(_E)/고급(_d)/이전 라인으로 이동"
 
-#: src/compose.c:532
+#: src/compose.c:540
 msgid "/_Edit/A_dvanced/Move to next line"
 msgstr "/편집(_E)/고급(_d)/다음 라인으로 이동"
 
-#: src/compose.c:537
+#: src/compose.c:545
 msgid "/_Edit/A_dvanced/Delete a character backward"
 msgstr "/편집(_E)/고급(_d)/문자를 뒤로 삭제"
 
-#: src/compose.c:542
+#: src/compose.c:550
 msgid "/_Edit/A_dvanced/Delete a character forward"
 msgstr "/편집(_E)/고급(_d)/문자를 앞으로 삭제"
 
-#: src/compose.c:547
+#: src/compose.c:555
 msgid "/_Edit/A_dvanced/Delete a word backward"
 msgstr "/편집(_E)/고급(_d)/단어를 뒤로 삭제"
 
-#: src/compose.c:552
+#: src/compose.c:560
 msgid "/_Edit/A_dvanced/Delete a word forward"
 msgstr "/편집(_E)/고급(_d)/단어를 앞으로 삭제"
 
-#: src/compose.c:557
+#: src/compose.c:565
 msgid "/_Edit/A_dvanced/Delete line"
 msgstr "/편집(_E)/고급(_d)/라인 삭제"
 
-#: src/compose.c:562
+#: src/compose.c:570
 msgid "/_Edit/A_dvanced/Delete to end of line"
 msgstr "/편집(_E)/고급(_d)/라인 끝까지 삭제"
 
-#: src/compose.c:568
+#: src/compose.c:576
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/편집(_E)/현재 단락 자동 줄바꿈(_W)"
 
-#: src/compose.c:570
+#: src/compose.c:578
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/편집(_E)/모든 긴 라인 자동 줄바꿈(_l)"
 
-#: src/compose.c:572
+#: src/compose.c:580
 #, fuzzy
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/편집(_E)/복사(_C)"
 
-#: src/compose.c:573 src/mainwindow.c:494 src/messageview.c:147
+#: src/compose.c:581 src/mainwindow.c:494 src/messageview.c:147
 #: src/summaryview.c:370
 msgid "/_View"
 msgstr "/보기(_V)"
 
-#: src/compose.c:574
+#: src/compose.c:582
 msgid "/_View/_To"
 msgstr "/보기(_V)/To(_T)"
 
-#: src/compose.c:575
+#: src/compose.c:583
 msgid "/_View/_Cc"
 msgstr "/보기(_V)/Cc(_C)"
 
-#: src/compose.c:576
+#: src/compose.c:584
 msgid "/_View/_Bcc"
 msgstr "/보기(_V)/Bcc(_B)"
 
-#: src/compose.c:577
+#: src/compose.c:585
 msgid "/_View/_Reply to"
 msgstr "/보기(_V)/Reply to(_R)"
 
-#: src/compose.c:578 src/compose.c:580 src/compose.c:582 src/mainwindow.c:512
-#: src/mainwindow.c:515 src/mainwindow.c:541 src/mainwindow.c:565
-#: src/mainwindow.c:641 src/mainwindow.c:645 src/messageview.c:223
+#: src/compose.c:586 src/compose.c:588 src/compose.c:590 src/compose.c:592
+#: src/mainwindow.c:512 src/mainwindow.c:515 src/mainwindow.c:541
+#: src/mainwindow.c:565 src/mainwindow.c:650 src/mainwindow.c:654
+#: src/messageview.c:223
 msgid "/_View/---"
 msgstr "/보기(_V)/---"
 
-#: src/compose.c:579
+#: src/compose.c:587
 msgid "/_View/_Followup to"
 msgstr "/보기(_V)/따라올리기(_F)"
 
-#: src/compose.c:581
+#: src/compose.c:589
 msgid "/_View/R_uler"
 msgstr "/보기(_V)/Ruler(_u)"
 
-#: src/compose.c:583
+#: src/compose.c:591
 msgid "/_View/_Attachment"
 msgstr "/보기(_V)/첨부(_A)"
 
-#: src/compose.c:586 src/mainwindow.c:689 src/messageview.c:247
+#: src/compose.c:598 src/mainwindow.c:572 src/messageview.c:154
+#, fuzzy
+msgid "/_View/Character _encoding"
+msgstr "/보기(_V)/정렬(_S)/내림차순"
+
+#: src/compose.c:599
+msgid "/_View/Character _encoding/_Automatic"
+msgstr ""
+
+#: src/compose.c:601 src/compose.c:607 src/compose.c:613 src/compose.c:617
+#: src/compose.c:623 src/compose.c:627 src/compose.c:631 src/compose.c:641
+#: src/compose.c:645 src/compose.c:653 src/compose.c:657 src/mainwindow.c:568
+#: src/mainwindow.c:575 src/messageview.c:150
+#, fuzzy
+msgid "/_View/Character _encoding/---"
+msgstr "/보기(_V)/정렬(_S)/내림차순"
+
+#: src/compose.c:603 src/mainwindow.c:576 src/messageview.c:158
+#, fuzzy
+msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
+msgstr "/보기(_V)/문자셋(_C)/7bit 아스키 (US-ASC_II)"
+
+#: src/compose.c:605 src/mainwindow.c:578 src/messageview.c:161
+#, fuzzy
+msgid "/_View/Character _encoding/Unicode (_UTF-8)"
+msgstr "/보기(_V)/문자셋(_C)/유니코드(_UTF-8)"
+
+#: src/compose.c:609 src/mainwindow.c:582 src/messageview.c:164
+#, fuzzy
+msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
+msgstr "/보기(_V)/문자셋(_C)/서부 유럽(ISO-8859-_1)"
+
+#: src/compose.c:611 src/mainwindow.c:584 src/messageview.c:166
+#, fuzzy
+msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
+msgstr "/보기(_V)/문자셋(_C)/서부 유럽(ISO-8859-15)"
+
+#: src/compose.c:615 src/mainwindow.c:588 src/messageview.c:169
+#, fuzzy
+msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
+msgstr "/보기(_V)/문자셋(_C)/중앙 유럽(ISO-8859-_2)"
+
+#: src/compose.c:619 src/mainwindow.c:592 src/messageview.c:172
+#, fuzzy
+msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
+msgstr "/보기(_V)/문자셋(_C)/_Baltic (ISO-8859-13)"
+
+#: src/compose.c:621 src/mainwindow.c:594 src/messageview.c:174
+#, fuzzy
+msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
+msgstr "/보기(_V)/문자셋(_C)/Baltic (ISO-8859-_4)"
+
+#: src/compose.c:625 src/mainwindow.c:598 src/messageview.c:177
+#, fuzzy
+msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
+msgstr "/보기(_V)/문자셋(_C)/그리스(ISO-8859-_7)"
+
+#: src/compose.c:629 src/mainwindow.c:602 src/messageview.c:180
+#, fuzzy
+msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
+msgstr "/보기(_V)/문자셋(_C)/터기 (ISO-8859-_9)"
+
+#: src/compose.c:633 src/mainwindow.c:606 src/messageview.c:183
+#, fuzzy
+msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
+msgstr "/보기(_V)/문자셋(_C)/Cyrillic (ISo-8859-_5)"
+
+#: src/compose.c:635 src/mainwindow.c:608 src/messageview.c:185
+#, fuzzy
+msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
+msgstr "/보기(_V)/문자셋(_C)/Cyrillic (KOI8-_R)"
+
+#: src/compose.c:637 src/mainwindow.c:610 src/messageview.c:187
+#, fuzzy
+msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
+msgstr "/보기(_V)/문자셋(_C)/Cyrillic (KOI8-_R)"
+
+#: src/compose.c:639 src/mainwindow.c:612 src/messageview.c:189
+#, fuzzy
+msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
+msgstr "/보기(_V)/문자셋(_C)/Cyrillic (Windows-1251)"
+
+#: src/compose.c:643 src/mainwindow.c:616 src/messageview.c:192
+#, fuzzy
+msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
+msgstr "/보기(_V)/문자셋(_C)/일본 (ISO-2022-_JP)"
+
+#: src/compose.c:647 src/mainwindow.c:626 src/messageview.c:201
+#, fuzzy
+msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
+msgstr "/보기(_V)/문자셋(_C)/Simplified Chinese (_GB2312)"
+
+#: src/compose.c:649 src/mainwindow.c:628 src/messageview.c:203
+#, fuzzy
+msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
+msgstr "/보기(_V)/문자셋(_C)/Traditional Chinese (_Big5)"
+
+#: src/compose.c:651 src/mainwindow.c:630 src/messageview.c:205
+#, fuzzy
+msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
+msgstr "/보기(_V)/문자셋(_C)/Traditional Chinese (EUC-_TW)"
+
+#: src/compose.c:655 src/mainwindow.c:636 src/messageview.c:210
+#, fuzzy
+msgid "/_View/Character _encoding/Korean (EUC-_KR)"
+msgstr "/보기(_V)/문자셋(_C)/한국 (EUC-KR)"
+
+#: src/compose.c:659 src/mainwindow.c:642 src/messageview.c:215
+#, fuzzy
+msgid "/_View/Character _encoding/Thai (TIS-620)"
+msgstr "/보기(_V)/문자셋(_C)/Thai (TIS-620)"
+
+#: src/compose.c:661 src/mainwindow.c:644 src/messageview.c:217
+#, fuzzy
+msgid "/_View/Character _encoding/Thai (Windows-874)"
+msgstr "/보기(_V)/문자셋(_C)/Thai (Windows-874)"
+
+#: src/compose.c:665 src/mainwindow.c:698 src/messageview.c:247
 msgid "/_Tools/_Address book"
 msgstr "/도구(_T)/주소록(_A)"
 
-#: src/compose.c:587
+#: src/compose.c:666
 msgid "/_Tools/_Template"
 msgstr "/도구(_T)/템플릿(_T)"
 
-#: src/compose.c:588 src/mainwindow.c:707 src/messageview.c:262
+#: src/compose.c:667 src/mainwindow.c:716 src/messageview.c:262
 msgid "/_Tools/Actio_ns"
 msgstr "/도구(_T)/동작(_n)"
 
-#: src/compose.c:589 src/compose.c:593 src/mainwindow.c:692
-#: src/mainwindow.c:706 src/mainwindow.c:708 src/mainwindow.c:711
-#: src/mainwindow.c:713 src/messageview.c:250 src/messageview.c:261
+#: src/compose.c:668 src/compose.c:672 src/mainwindow.c:701
+#: src/mainwindow.c:715 src/mainwindow.c:717 src/mainwindow.c:720
+#: src/mainwindow.c:722 src/messageview.c:250 src/messageview.c:261
 msgid "/_Tools/---"
 msgstr "/도구(_T)/---"
 
-#: src/compose.c:590
+#: src/compose.c:669
 #, fuzzy
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/편집(_E)/외부 편집기로 편집(_x)"
 
-#: src/compose.c:594
+#: src/compose.c:673
 #, fuzzy
 msgid "/_Tools/PGP Si_gn"
 msgstr "/도구(_T)/동작(_n)"
 
-#: src/compose.c:595
+#: src/compose.c:674
 #, fuzzy
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/메시지(_M)/암호화(_E)"
 
-#: src/compose.c:800
+#: src/compose.c:879
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: 파일이 없습니다\n"
 
-#: src/compose.c:899 src/compose.c:958 src/procmsg.c:1303
+#: src/compose.c:978 src/compose.c:1037 src/procmsg.c:1303
 msgid "Can't get text part\n"
 msgstr "텍스트 부분을 얻을 수가 없습니다\n"
 
-#: src/compose.c:1340
+#: src/compose.c:1419
 msgid "Quote mark format error."
 msgstr "인용 부호 형식 에러."
 
-#: src/compose.c:1352
+#: src/compose.c:1431
 msgid "Message reply/forward format error."
 msgstr "메시지 회신/전달 형식 에러."
 
-#: src/compose.c:1679
+#: src/compose.c:1758
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "%s파일이 없습니다\n"
 
-#: src/compose.c:1683
+#: src/compose.c:1762
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "%s의 파일 크기를 알수가 없습니다\n"
 
-#: src/compose.c:1687
+#: src/compose.c:1766
 #, c-format
 msgid "File %s is empty."
 msgstr "%s 파일이 빈 파일입니다."
 
-#: src/compose.c:1691
+#: src/compose.c:1770
 #, c-format
 msgid "Can't read %s."
 msgstr "%s를 읽을 수가 없습니다."
 
-#: src/compose.c:1726
+#: src/compose.c:1805
 #, c-format
 msgid "Message: %s"
 msgstr "메시지: %s"
 
-#: src/compose.c:1797 src/mimeview.c:491
+#: src/compose.c:1876 src/mimeview.c:491
 msgid "Can't get the part of multipart message."
 msgstr "multipart 메시지의 부분을 얻을 수가 없습니다."
 
-#: src/compose.c:2188
+#: src/compose.c:2267
 msgid " [Edited]"
 msgstr " [수정됨]"
 
-#: src/compose.c:2190
+#: src/compose.c:2269
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - 메시지 편집%s "
 
-#: src/compose.c:2193
+#: src/compose.c:2272
 #, c-format
 msgid "Compose message%s"
 msgstr "메시지%s 편집"
 
-#: src/compose.c:2304
+#: src/compose.c:2383
 msgid "Recipient is not specified."
 msgstr "받는 사람이 지정되지않았습니다"
 
-#: src/compose.c:2312 src/compose.c:4112 src/mainwindow.c:2144
+#: src/compose.c:2391 src/compose.c:4213 src/mainwindow.c:2153
 #: src/prefs_account.c:703 src/prefs_common.c:850
 msgid "Send"
 msgstr "메일 발송"
 
-#: src/compose.c:2313
+#: src/compose.c:2392
 msgid "Subject is empty. Send it anyway?"
 msgstr "제목이 비었습니다. 그래도 보낼까요?"
 
-#: src/compose.c:2364
+#: src/compose.c:2443
 msgid "can't get recipient list."
 msgstr "받는 사람 목록을 얻을 수가 없습니다"
 
-#: src/compose.c:2384
+#: src/compose.c:2463
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -948,26 +1066,26 @@ msgstr ""
 "메일을 보내기위한 계정이 지정되어있지않습니다.\n"
 "보내기 전에 메일 계정을 선택하세요."
 
-#: src/compose.c:2398 src/send_message.c:261
+#: src/compose.c:2477 src/send_message.c:261
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "%s로 메시지를 보내는 중 에러가 발생했습니다."
 
-#: src/compose.c:2421
+#: src/compose.c:2500
 msgid "Can't save the message to outbox."
 msgstr "메시지를 보낸 편지함에 저장할 수가 없습니다"
 
-#: src/compose.c:2457
+#: src/compose.c:2536
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "현재 선택된 키 ID `%s'에 연결된 어떤 키도 찾을 수 없습니다."
 
-#: src/compose.c:2518 src/compose.c:2739 src/compose.c:2802 src/compose.c:2921
+#: src/compose.c:2597 src/compose.c:2820 src/compose.c:2883 src/compose.c:3003
 #: src/utils.c:2189
 msgid "can't change file mode\n"
 msgstr "파일 모드를 바꿀수가 없습니다\n"
 
-#: src/compose.c:2546
+#: src/compose.c:2627
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -976,141 +1094,141 @@ msgstr ""
 "메시지의 문자셋을 변경할 수가 없습니다.\n"
 "그래도 보낼까요?"
 
-#: src/compose.c:2610
+#: src/compose.c:2691
 msgid "can't write headers\n"
 msgstr "헤더를 쓸 수가 없습니다\n"
 
-#: src/compose.c:2881
+#: src/compose.c:2963
 msgid "can't remove the old message\n"
 msgstr "오래된 메시지를 제거할 수가 없습니다\n"
 
-#: src/compose.c:2899
+#: src/compose.c:2981
 msgid "queueing message...\n"
 msgstr "메시지를 임시 보관합니다...\n"
 
-#: src/compose.c:2981
+#: src/compose.c:3063
 msgid "can't find queue folder\n"
 msgstr "큐 폴더를 찾을 수가 없습니다\n"
 
-#: src/compose.c:2988
+#: src/compose.c:3070
 msgid "can't queue the message\n"
 msgstr "메시지를 임시 보관할 수가 없습니다\n"
 
-#: src/compose.c:3547
+#: src/compose.c:3645
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "생성된 Message-ID: %s\n"
 
-#: src/compose.c:3645
+#: src/compose.c:3743
 msgid "Creating compose window...\n"
 msgstr "편집창을 생성합니다...\n"
 
-#: src/compose.c:3648 src/compose.c:4598
+#: src/compose.c:3746 src/compose.c:4734
 msgid "MIME type"
 msgstr "마임 타입"
 
 #. S_COL_DATE
-#: src/compose.c:3649 src/mimeview.c:150 src/prefs_filter_edit.c:569
+#: src/compose.c:3747 src/mimeview.c:150 src/prefs_filter_edit.c:569
 #: src/prefs_summary_column.c:73 src/select-keys.c:317 src/summaryview.c:386
 msgid "Size"
 msgstr "크기"
 
-#: src/compose.c:3700 src/headerview.c:53 src/summary_search.c:169
+#: src/compose.c:3798 src/headerview.c:53 src/summary_search.c:169
 msgid "From:"
 msgstr "보낸 사람:"
 
-#: src/compose.c:4113
+#: src/compose.c:4214
 msgid "Send message"
 msgstr "메시지 보내기"
 
-#: src/compose.c:4121
+#: src/compose.c:4222
 msgid "Send later"
 msgstr "나중에 보내기"
 
-#: src/compose.c:4122
+#: src/compose.c:4223
 msgid "Put into queue folder and send later"
 msgstr "보낼 편지함에 넣어서 나중에 보내기"
 
-#: src/compose.c:4130
+#: src/compose.c:4231
 msgid "Draft"
 msgstr "임시 보관함"
 
-#: src/compose.c:4131
+#: src/compose.c:4232
 msgid "Save to draft folder"
 msgstr "임시 보관함에 넣기"
 
-#: src/compose.c:4141 src/compose.c:5382
+#: src/compose.c:4242 src/compose.c:5527
 msgid "Insert"
 msgstr "삽입"
 
-#: src/compose.c:4142
+#: src/compose.c:4243
 msgid "Insert file"
 msgstr "파일을 삽입합니다"
 
-#: src/compose.c:4150
+#: src/compose.c:4251
 msgid "Attach"
 msgstr "첨부"
 
-#: src/compose.c:4151
+#: src/compose.c:4252
 msgid "Attach file"
 msgstr "파일 첨부"
 
 #. signature
-#: src/compose.c:4161 src/prefs_account.c:1339 src/prefs_common.c:1261
+#: src/compose.c:4262 src/prefs_account.c:1339 src/prefs_common.c:1273
 msgid "Signature"
 msgstr "서명"
 
-#: src/compose.c:4162
+#: src/compose.c:4263
 msgid "Insert signature"
 msgstr "서명 파일을 끼워넣습니다"
 
-#: src/compose.c:4171 src/prefs_common.c:1283 src/prefs_common.c:2165
+#: src/compose.c:4272 src/prefs_common.c:1295 src/prefs_common.c:2177
 msgid "Editor"
 msgstr "편집기"
 
-#: src/compose.c:4172
+#: src/compose.c:4273
 msgid "Edit with external editor"
 msgstr "외부 편집기로 편집"
 
-#: src/compose.c:4180
+#: src/compose.c:4281
 msgid "Linewrap"
 msgstr "줄바꿈"
 
-#: src/compose.c:4181
+#: src/compose.c:4282
 msgid "Wrap all long lines"
 msgstr "긴 줄에대해 자동 줄바꿈을 합니다"
 
-#: src/compose.c:4492
+#: src/compose.c:4628
 msgid "Invalid MIME type."
 msgstr "올바르지않은 마임 타입."
 
-#: src/compose.c:4511
+#: src/compose.c:4647
 msgid "File doesn't exist or is empty."
 msgstr "파일이 없거나 비여있습니다."
 
-#: src/compose.c:4580
+#: src/compose.c:4716
 #, fuzzy
 msgid "Properties"
 msgstr "특성"
 
-#: src/compose.c:4600
+#: src/compose.c:4736
 msgid "Encoding"
 msgstr "인코딩"
 
-#: src/compose.c:4623 src/prefs_folder_item.c:183
+#: src/compose.c:4759 src/prefs_folder_item.c:183
 msgid "Path"
 msgstr "경로"
 
-#: src/compose.c:4624
+#: src/compose.c:4760
 msgid "File name"
 msgstr "파일 이름"
 
-#: src/compose.c:4778
+#: src/compose.c:4914
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "외부 편집기 명령어가 올바르지않습니다: `%s'\n"
 
-#: src/compose.c:4804
+#: src/compose.c:4940
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1121,72 +1239,72 @@ msgstr ""
 "이 프로세스를 강제로 종료시킬까요?\n"
 "프로세스 그룹 아이디: %d"
 
-#: src/compose.c:4817
+#: src/compose.c:4953
 #, c-format
 msgid "Terminated process group id: %d"
 msgstr "프로세스 그룹 id: %d를 종료시킴"
 
-#: src/compose.c:4818
+#: src/compose.c:4954
 #, c-format
 msgid "Temporary file: %s"
 msgstr "임시 파일: %s"
 
-#: src/compose.c:4842
+#: src/compose.c:4978
 msgid "Compose: input from monitoring process\n"
 msgstr "편집: 모니터링하는 프로세스로부터 입력이 있었습니다\n"
 
 #. failed
-#: src/compose.c:4875
+#: src/compose.c:5011
 msgid "Couldn't exec external editor\n"
 msgstr "외부 편집기를 실행할 수가 없습니다\n"
 
-#: src/compose.c:4879
+#: src/compose.c:5015
 msgid "Couldn't write to file\n"
 msgstr "파일로 쓸 수가 없습니다\n"
 
-#: src/compose.c:4881
+#: src/compose.c:5017
 msgid "Pipe read failed\n"
 msgstr "파이프 읽기 실패\n"
 
-#: src/compose.c:5182 src/compose.c:5190 src/compose.c:5196
+#: src/compose.c:5318 src/compose.c:5326 src/compose.c:5332
 msgid "Can't queue the message."
 msgstr "메시지를 임시 보관함에 넣을수가 없습니다."
 
-#: src/compose.c:5287
+#: src/compose.c:5423
 #, fuzzy
 msgid "Select files"
 msgstr "파일 선택"
 
-#: src/compose.c:5309
+#: src/compose.c:5445
 msgid "Select file"
 msgstr "파일 선택"
 
-#: src/compose.c:5344
+#: src/compose.c:5480
 msgid "Discard message"
 msgstr "메시지 버리기"
 
-#: src/compose.c:5345
+#: src/compose.c:5481
 msgid "This message has been modified. discard it?"
 msgstr "이 메시지는 수정되었습니다. 변경사항을 버릴까요?"
 
-#: src/compose.c:5346
+#: src/compose.c:5482
 msgid "Discard"
 msgstr "버리기"
 
-#: src/compose.c:5346
+#: src/compose.c:5482
 msgid "to Draft"
 msgstr "임시 보관함으로"
 
-#: src/compose.c:5379
+#: src/compose.c:5524
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "`%s' 템플릿을 적용할까요?"
 
-#: src/compose.c:5381
+#: src/compose.c:5526
 msgid "Apply template"
 msgstr "템플릿을 적용합니다."
 
-#: src/compose.c:5382
+#: src/compose.c:5527
 msgid "Replace"
 msgstr "대체"
 
@@ -1627,12 +1745,12 @@ msgstr "폴더 정보를 설정합니다...\n"
 msgid "Setting folder info..."
 msgstr "폴더 정보를 설정합니다..."
 
-#: src/folderview.c:652 src/mainwindow.c:3190 src/setup.c:81
+#: src/folderview.c:652 src/mainwindow.c:3199 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "%s%c%s를 스캔합니다..."
 
-#: src/folderview.c:656 src/mainwindow.c:3195 src/setup.c:86
+#: src/folderview.c:656 src/mainwindow.c:3204 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "%s 폴더를 스캔합니다..."
@@ -2094,7 +2212,7 @@ msgstr "LDIF 파일을 주소록으로 가져오기"
 msgid "Prev"
 msgstr "이전"
 
-#: src/importldif.c:761 src/mainwindow.c:2230
+#: src/importldif.c:761 src/mainwindow.c:2239
 msgid "Next"
 msgstr "다음"
 
@@ -2548,7 +2666,8 @@ msgid "/_View/Separate f_older tree"
 msgstr "/보기(_V)/별도의 폴더 트리 창(_o)"
 
 #: src/mainwindow.c:514
-msgid "/_View/Separate m_essage view"
+#, fuzzy
+msgid "/_View/Separate _message view"
 msgstr "/보기(_V)/별도의 메시지 창(_e)"
 
 #: src/mainwindow.c:516
@@ -2685,432 +2804,349 @@ msgstr "/보기(_V)/가기(_G)/꼬리표있는 다음 메시지(_b)"
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/보기(_V)/가기(_G)/다른 폴더로(_f)..."
 
-#: src/mainwindow.c:568 src/mainwindow.c:575 src/messageview.c:150
-msgid "/_View/_Code set/---"
-msgstr "/보기(_V)/문자셋(_C)/---"
-
-#: src/mainwindow.c:572 src/messageview.c:154
-msgid "/_View/_Code set"
-msgstr "/보기(_V)/문자셋(_C)"
-
 #: src/mainwindow.c:573 src/messageview.c:155
-msgid "/_View/_Code set/_Auto detect"
+#, fuzzy
+msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/보기(_V)/문자셋(_C)/자동(_A)"
 
-#: src/mainwindow.c:576 src/messageview.c:158
-msgid "/_View/_Code set/7bit ascii (US-ASC_II)"
-msgstr "/보기(_V)/문자셋(_C)/7bit 아스키 (US-ASC_II)"
-
-#: src/mainwindow.c:579 src/messageview.c:161
-msgid "/_View/_Code set/Unicode (_UTF-8)"
-msgstr "/보기(_V)/문자셋(_C)/유니코드(_UTF-8)"
-
-#: src/mainwindow.c:582 src/messageview.c:164
-msgid "/_View/_Code set/Western European (ISO-8859-_1)"
-msgstr "/보기(_V)/문자셋(_C)/서부 유럽(ISO-8859-_1)"
-
-#: src/mainwindow.c:584 src/messageview.c:166
-msgid "/_View/_Code set/Western European (ISO-8859-15)"
-msgstr "/보기(_V)/문자셋(_C)/서부 유럽(ISO-8859-15)"
-
-#: src/mainwindow.c:587 src/messageview.c:169
-msgid "/_View/_Code set/Central European (ISO-8859-_2)"
-msgstr "/보기(_V)/문자셋(_C)/중앙 유럽(ISO-8859-_2)"
-
-#: src/mainwindow.c:590 src/messageview.c:172
-msgid "/_View/_Code set/_Baltic (ISO-8859-13)"
-msgstr "/보기(_V)/문자셋(_C)/_Baltic (ISO-8859-13)"
-
-#: src/mainwindow.c:592 src/messageview.c:174
-msgid "/_View/_Code set/Baltic (ISO-8859-_4)"
-msgstr "/보기(_V)/문자셋(_C)/Baltic (ISO-8859-_4)"
-
-#: src/mainwindow.c:595 src/messageview.c:177
-msgid "/_View/_Code set/Greek (ISO-8859-_7)"
-msgstr "/보기(_V)/문자셋(_C)/그리스(ISO-8859-_7)"
-
-#: src/mainwindow.c:598 src/messageview.c:180
-msgid "/_View/_Code set/Turkish (ISO-8859-_9)"
-msgstr "/보기(_V)/문자셋(_C)/터기 (ISO-8859-_9)"
-
-#: src/mainwindow.c:601 src/messageview.c:183
-msgid "/_View/_Code set/Cyrillic (ISO-8859-_5)"
-msgstr "/보기(_V)/문자셋(_C)/Cyrillic (ISo-8859-_5)"
-
-#: src/mainwindow.c:603 src/messageview.c:185
-msgid "/_View/_Code set/Cyrillic (KOI8-_R)"
-msgstr "/보기(_V)/문자셋(_C)/Cyrillic (KOI8-_R)"
-
-#: src/mainwindow.c:605 src/messageview.c:187
+#: src/mainwindow.c:618 src/messageview.c:194
 #, fuzzy
-msgid "/_View/_Code set/Cyrillic (KOI8-U)"
-msgstr "/보기(_V)/문자셋(_C)/Cyrillic (KOI8-_R)"
-
-#: src/mainwindow.c:607 src/messageview.c:189
-msgid "/_View/_Code set/Cyrillic (Windows-1251)"
-msgstr "/보기(_V)/문자셋(_C)/Cyrillic (Windows-1251)"
-
-#: src/mainwindow.c:610 src/messageview.c:192
-msgid "/_View/_Code set/Japanese (ISO-2022-_JP)"
-msgstr "/보기(_V)/문자셋(_C)/일본 (ISO-2022-_JP)"
-
-#: src/mainwindow.c:612 src/messageview.c:194
-msgid "/_View/_Code set/Japanese (ISO-2022-JP-2)"
+msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/보기(_V)/문자셋(_C)/일본 (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:614 src/messageview.c:196
-msgid "/_View/_Code set/Japanese (_EUC-JP)"
+#: src/mainwindow.c:620 src/messageview.c:196
+#, fuzzy
+msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/보기(_V)/문자셋(_C)/일본 (_EUC-JP)"
 
-#: src/mainwindow.c:616 src/messageview.c:198
-msgid "/_View/_Code set/Japanese (_Shift__JIS)"
+#: src/mainwindow.c:622 src/messageview.c:198
+#, fuzzy
+msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/보기(_V)/문자셋(_C)/일본 (_Shift__JIS)"
 
-#: src/mainwindow.c:619 src/messageview.c:201
-msgid "/_View/_Code set/Simplified Chinese (_GB2312)"
-msgstr "/보기(_V)/문자셋(_C)/Simplified Chinese (_GB2312)"
-
-#: src/mainwindow.c:621 src/messageview.c:203
-msgid "/_View/_Code set/Traditional Chinese (_Big5)"
-msgstr "/보기(_V)/문자셋(_C)/Traditional Chinese (_Big5)"
-
-#: src/mainwindow.c:623 src/messageview.c:205
-msgid "/_View/_Code set/Traditional Chinese (EUC-_TW)"
-msgstr "/보기(_V)/문자셋(_C)/Traditional Chinese (EUC-_TW)"
-
-#: src/mainwindow.c:625 src/messageview.c:207
-msgid "/_View/_Code set/Chinese (ISO-2022-_CN)"
+#: src/mainwindow.c:632 src/messageview.c:207
+#, fuzzy
+msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/보기(_V)/문자셋(_C)/Chinese (ISO-2022-_CN)"
 
-#: src/mainwindow.c:628 src/messageview.c:210
-msgid "/_View/_Code set/Korean (EUC-_KR)"
-msgstr "/보기(_V)/문자셋(_C)/한국 (EUC-KR)"
-
-#: src/mainwindow.c:630 src/messageview.c:212
-msgid "/_View/_Code set/Korean (ISO-2022-KR)"
+#: src/mainwindow.c:638 src/messageview.c:212
+#, fuzzy
+msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/보기(_V)/문자셋(_C)/한국 (ISO-2022-KR)"
 
-#: src/mainwindow.c:633 src/messageview.c:215
-msgid "/_View/_Code set/Thai (TIS-620)"
-msgstr "/보기(_V)/문자셋(_C)/Thai (TIS-620)"
-
-#: src/mainwindow.c:635 src/messageview.c:217
-msgid "/_View/_Code set/Thai (Windows-874)"
-msgstr "/보기(_V)/문자셋(_C)/Thai (Windows-874)"
-
-#: src/mainwindow.c:642 src/summaryview.c:371
+#: src/mainwindow.c:651 src/summaryview.c:371
 msgid "/_View/Open in new _window"
 msgstr "/보기(_V)/새 창으로 열기(_w)"
 
-#: src/mainwindow.c:643 src/messageview.c:224
+#: src/mainwindow.c:652 src/messageview.c:224
 msgid "/_View/Mess_age source"
 msgstr "/보기(_V)/메시지 소스(_a)"
 
-#: src/mainwindow.c:644 src/messageview.c:225
+#: src/mainwindow.c:653 src/messageview.c:225
 msgid "/_View/Show all _header"
 msgstr "/보기(_V)/모든 헤더보기(_h)"
 
-#: src/mainwindow.c:646
+#: src/mainwindow.c:655
 msgid "/_View/_Update summary"
 msgstr "/보기(_V)/요약 갱신(_U)"
 
-#: src/mainwindow.c:648 src/messageview.c:227
+#: src/mainwindow.c:657 src/messageview.c:227
 msgid "/_Message"
 msgstr "/메시지(_M)"
 
-#: src/mainwindow.c:649
+#: src/mainwindow.c:658
 #, fuzzy
 msgid "/_Message/Recei_ve"
 msgstr "/메시지(_M)/다시 편집(_e)"
 
-#: src/mainwindow.c:650
+#: src/mainwindow.c:659
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/메시지(_M)/모든 계정에서 받기(_a)"
 
-#: src/mainwindow.c:652
+#: src/mainwindow.c:661
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/메시지(_M)/모든 계정에서 받기(_a)"
 
-#: src/mainwindow.c:654
+#: src/mainwindow.c:663
 #, fuzzy
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/메시지(_M)/받기 취소(_g)"
 
-#: src/mainwindow.c:656
+#: src/mainwindow.c:665
 #, fuzzy
 msgid "/_Message/Recei_ve/---"
 msgstr "/메시지(_M)/다시 편집(_e)"
 
-#: src/mainwindow.c:657
+#: src/mainwindow.c:666
 msgid "/_Message/_Send queued messages"
 msgstr "/메시지(_M)/임시 보관된 메시지 발송(_S)"
 
-#: src/mainwindow.c:658 src/mainwindow.c:660 src/mainwindow.c:667
-#: src/mainwindow.c:672 src/mainwindow.c:676 src/mainwindow.c:685
+#: src/mainwindow.c:667 src/mainwindow.c:669 src/mainwindow.c:676
+#: src/mainwindow.c:681 src/mainwindow.c:685 src/mainwindow.c:694
 #: src/messageview.c:230 src/messageview.c:238 src/messageview.c:243
 msgid "/_Message/---"
 msgstr "/메시지(_M)/---"
 
-#: src/mainwindow.c:659 src/messageview.c:228
+#: src/mainwindow.c:668 src/messageview.c:228
 msgid "/_Message/Compose _new message"
 msgstr "/메시지(_M)/새로 만들기(_n)"
 
-#: src/mainwindow.c:661 src/messageview.c:231
+#: src/mainwindow.c:670 src/messageview.c:231
 msgid "/_Message/_Reply"
 msgstr "/메시지(_M)/회신(_R)"
 
-#: src/mainwindow.c:662
+#: src/mainwindow.c:671
 msgid "/_Message/Repl_y to"
 msgstr "/메시지(_M)/회신(_y)"
 
-#: src/mainwindow.c:663 src/messageview.c:232
+#: src/mainwindow.c:672 src/messageview.c:232
 msgid "/_Message/Repl_y to/_all"
 msgstr "/메시지(_M)/회신(_y)/전체(_a)"
 
-#: src/mainwindow.c:664 src/messageview.c:234
+#: src/mainwindow.c:673 src/messageview.c:234
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/메시지(_M)/회신(_y)/보낸이(_s)"
 
-#: src/mainwindow.c:665 src/messageview.c:236
+#: src/mainwindow.c:674 src/messageview.c:236
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/메시지(_M)/회신(_y)/메일링리스트(_l)"
 
-#: src/mainwindow.c:668 src/messageview.c:239
+#: src/mainwindow.c:677 src/messageview.c:239
 msgid "/_Message/_Forward"
 msgstr "/메시지(_M)/전달(_F)"
 
-#: src/mainwindow.c:669 src/messageview.c:240
+#: src/mainwindow.c:678 src/messageview.c:240
 msgid "/_Message/For_ward as attachment"
 msgstr "/메시지(_M)/첨부파일로 전달(_w)"
 
-#: src/mainwindow.c:671 src/messageview.c:242
+#: src/mainwindow.c:680 src/messageview.c:242
 msgid "/_Message/Redirec_t"
 msgstr "/메시지(_M)/Redirec_t"
 
-#: src/mainwindow.c:673
+#: src/mainwindow.c:682
 msgid "/_Message/M_ove..."
 msgstr "/메시지(_M)/이동(_o)..."
 
-#: src/mainwindow.c:674
+#: src/mainwindow.c:683
 msgid "/_Message/_Copy..."
 msgstr "/메시지(_M)/복사(_C)..."
 
-#: src/mainwindow.c:675
+#: src/mainwindow.c:684
 msgid "/_Message/_Delete"
 msgstr "/메시지(_M)/삭제(_D)"
 
-#: src/mainwindow.c:677
+#: src/mainwindow.c:686
 msgid "/_Message/_Mark"
 msgstr "/메시지(_M)/표시(_M)"
 
-#: src/mainwindow.c:678
+#: src/mainwindow.c:687
 msgid "/_Message/_Mark/_Mark"
 msgstr "/메시지(_M)/표시(_M)/표시(_M)"
 
-#: src/mainwindow.c:679
+#: src/mainwindow.c:688
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/메시지(_M)/표시(_M)/표시 지움(_U)"
 
-#: src/mainwindow.c:680
+#: src/mainwindow.c:689
 msgid "/_Message/_Mark/---"
 msgstr "/메시지(_M)/표시(_M)/---"
 
-#: src/mainwindow.c:681
+#: src/mainwindow.c:690
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/메시지(_M)/표시(_M)/읽지않은 것으로 표시(_e)"
 
-#: src/mainwindow.c:682
+#: src/mainwindow.c:691
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/메시지(_M)/표시(_M)/읽은 것으로 표시(_d)"
 
-#: src/mainwindow.c:684
+#: src/mainwindow.c:693
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/메시지(_M)/표시(_M)/모두 읽은 것으로 표시(_r)"
 
-#: src/mainwindow.c:686 src/messageview.c:244
+#: src/mainwindow.c:695 src/messageview.c:244
 msgid "/_Message/Re-_edit"
 msgstr "/메시지(_M)/다시 편집(_e)"
 
-#: src/mainwindow.c:690 src/messageview.c:248
+#: src/mainwindow.c:699 src/messageview.c:248
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/도구(_T)/주소록에 보낸이 추가(_k)"
 
-#: src/mainwindow.c:693
+#: src/mainwindow.c:702
 #, fuzzy
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/도구(_T)/메시지 필터(_F)"
 
-#: src/mainwindow.c:695
+#: src/mainwindow.c:704
 #, fuzzy
 msgid "/_Tools/Filter _selected messages"
 msgstr "/도구(_T)/메시지 필터(_F)"
 
-#: src/mainwindow.c:697 src/messageview.c:251
+#: src/mainwindow.c:706 src/messageview.c:251
 msgid "/_Tools/_Create filter rule"
 msgstr "/도구(_T)/필터 규칙 생성(_C)"
 
-#: src/mainwindow.c:698 src/messageview.c:253
+#: src/mainwindow.c:707 src/messageview.c:253
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/도구(_T)/필터 규칙 생성(_C)/자동(_A)"
 
-#: src/mainwindow.c:700 src/messageview.c:255
+#: src/mainwindow.c:709 src/messageview.c:255
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/도구(_T)/필터 규칙 생성(_C)/보낸이로(_F)"
 
-#: src/mainwindow.c:702 src/messageview.c:257
+#: src/mainwindow.c:711 src/messageview.c:257
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/도구(_T)/필터 규칙 생성(_C)/받는이로(_T)"
 
-#: src/mainwindow.c:704 src/messageview.c:259
+#: src/mainwindow.c:713 src/messageview.c:259
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/도구(_T)/필터 규칙 생성(_C)/제목으로(_S)"
 
-#: src/mainwindow.c:709
+#: src/mainwindow.c:718
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/도구(_T)/중복된 메시지 지우기(_p)"
 
-#: src/mainwindow.c:712
+#: src/mainwindow.c:721
 msgid "/_Tools/E_xecute"
 msgstr "/도구(_T)/실행(_x)"
 
-#: src/mainwindow.c:714
+#: src/mainwindow.c:723
 msgid "/_Tools/_Log window"
 msgstr "/도구(_T)/로그 창(_L)"
 
-#: src/mainwindow.c:716
+#: src/mainwindow.c:725
 msgid "/_Configuration"
 msgstr "/설정(_C)"
 
-#: src/mainwindow.c:717
+#: src/mainwindow.c:726
 msgid "/_Configuration/_Common preferences..."
 msgstr "/설정(_C)/기본적인 설정(_C)..."
 
-#: src/mainwindow.c:719
+#: src/mainwindow.c:728
 msgid "/_Configuration/_Filter setting..."
 msgstr "/설정(_C)/필터 설정(_F)..."
 
-#: src/mainwindow.c:721
+#: src/mainwindow.c:730
 msgid "/_Configuration/_Template..."
 msgstr "/설정(_C)/템플릿(_T)..."
 
-#: src/mainwindow.c:722
+#: src/mainwindow.c:731
 msgid "/_Configuration/_Actions..."
 msgstr "/설정(_C)/동작(_A)..."
 
-#: src/mainwindow.c:723
+#: src/mainwindow.c:732
 msgid "/_Configuration/---"
 msgstr "/설정(_C)/---"
 
-#: src/mainwindow.c:724
+#: src/mainwindow.c:733
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/설정(_C)/계정에 따른 설정(_P)..."
 
-#: src/mainwindow.c:726
+#: src/mainwindow.c:735
 msgid "/_Configuration/Create _new account..."
 msgstr "/설정(_C)/새 계정 만들기(_n)..."
 
-#: src/mainwindow.c:728
+#: src/mainwindow.c:737
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/설정(_C)/계정 편집(_E)..."
 
-#: src/mainwindow.c:730
+#: src/mainwindow.c:739
 msgid "/_Configuration/C_hange current account"
 msgstr "/설정(_C)/현재 계정을 변경(_h)"
 
-#: src/mainwindow.c:734
+#: src/mainwindow.c:743
 msgid "/_Help/_Manual"
 msgstr "/도움말(_H)/설명서(_M)"
 
-#: src/mainwindow.c:735
+#: src/mainwindow.c:744
 msgid "/_Help/_Manual/_English"
 msgstr "/도움말(_H)/설명서(_M)/영어(_E)"
 
-#: src/mainwindow.c:736
+#: src/mainwindow.c:745
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/도움말(_H)/설명서(_M)/일본어(_J)"
 
-#: src/mainwindow.c:737
+#: src/mainwindow.c:746
 msgid "/_Help/_FAQ"
 msgstr "/도움말(_H)/FAQ(_F)"
 
-#: src/mainwindow.c:738
+#: src/mainwindow.c:747
 msgid "/_Help/_FAQ/_English"
 msgstr "/도움말(_H)/FAQ(_F)/영어(_E)"
 
-#: src/mainwindow.c:739
+#: src/mainwindow.c:748
 msgid "/_Help/_FAQ/_German"
 msgstr "/도움말(_H)/FAQ(_F)/독일어(_G)"
 
-#: src/mainwindow.c:740
+#: src/mainwindow.c:749
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/도움말(_H)/FAQ(_F)/스페인어(_S)"
 
-#: src/mainwindow.c:741
+#: src/mainwindow.c:750
 msgid "/_Help/_FAQ/_French"
 msgstr "/도움말(_H)/FAQ(_F)/프랑스어(_F)"
 
-#: src/mainwindow.c:742
+#: src/mainwindow.c:751
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/도움말(_H)/FAQ(_F)/이태리어(_I)"
 
-#: src/mainwindow.c:743
+#: src/mainwindow.c:752
 msgid "/_Help/---"
 msgstr "/도움말(_H)/---"
 
-#: src/mainwindow.c:783
+#: src/mainwindow.c:792
 msgid "Creating main window...\n"
 msgstr "새 창을 만듭니다...\n"
 
-#: src/mainwindow.c:943
+#: src/mainwindow.c:952
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "메인 창: 색 할당 %d 실패\n"
 
-#: src/mainwindow.c:1021 src/summaryview.c:1368 src/summaryview.c:1677
+#: src/mainwindow.c:1030 src/summaryview.c:1368 src/summaryview.c:1677
 #: src/summaryview.c:1785 src/summaryview.c:1831 src/summaryview.c:2453
 #: src/summaryview.c:3080 src/summaryview.c:3146 src/summaryview.c:3171
 #: src/summaryview.c:3284
 msgid "done.\n"
 msgstr "마침.\n"
 
-#: src/mainwindow.c:1137 src/mainwindow.c:1178 src/mainwindow.c:1206
+#: src/mainwindow.c:1146 src/mainwindow.c:1187 src/mainwindow.c:1215
 msgid "Untitled"
 msgstr "제목 없슴"
 
-#: src/mainwindow.c:1207
+#: src/mainwindow.c:1216
 msgid "none"
 msgstr "없음"
 
-#: src/mainwindow.c:1257
+#: src/mainwindow.c:1266
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "창 분리 형식을 %d에서 %d로 바꿉니다\n"
 
-#: src/mainwindow.c:1477
+#: src/mainwindow.c:1486
 msgid "Offline"
 msgstr ""
 
-#: src/mainwindow.c:1478
+#: src/mainwindow.c:1487
 msgid "You are offline. Go online?"
 msgstr ""
 
-#: src/mainwindow.c:1492
+#: src/mainwindow.c:1501
 #, fuzzy
 msgid "Empty all trash"
 msgstr "지운 편지함 비우기"
 
-#: src/mainwindow.c:1493
+#: src/mainwindow.c:1502
 #, fuzzy
 msgid "Empty messages in all trash?"
 msgstr "지운 편지함에있는 모든 메시지를 비울까요?"
 
-#: src/mainwindow.c:1521
+#: src/mainwindow.c:1530
 msgid "Add mailbox"
 msgstr "메일박스 추가"
 
-#: src/mainwindow.c:1522
+#: src/mainwindow.c:1531
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3120,16 +3156,16 @@ msgstr ""
 "기존의 메일 박스가 지정되면 자동으로\n"
 "스캔될것입니다."
 
-#: src/mainwindow.c:1528
+#: src/mainwindow.c:1537
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "메일 박스 `%s'가 이미 존재합니다."
 
-#: src/mainwindow.c:1533 src/setup.c:57
+#: src/mainwindow.c:1542 src/setup.c:57
 msgid "Mailbox"
 msgstr "메일박스"
 
-#: src/mainwindow.c:1539 src/setup.c:63
+#: src/mainwindow.c:1548 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3138,144 +3174,144 @@ msgstr ""
 "메일박스 생성이 실패했습니다.\n"
 "아마 어떤 파일이 이미 존재하거나 그 곳에 쓰기 권한이 없습니다."
 
-#: src/mainwindow.c:1912
+#: src/mainwindow.c:1921
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - 폴더 보기"
 
-#: src/mainwindow.c:1932 src/messageview.c:358
+#: src/mainwindow.c:1941 src/messageview.c:358
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - 메시지 보기"
 
-#: src/mainwindow.c:2079 src/summaryview.c:340
+#: src/mainwindow.c:2088 src/summaryview.c:340
 msgid "/_Reply"
 msgstr "/회신(_R)"
 
-#: src/mainwindow.c:2080
+#: src/mainwindow.c:2089
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "전부에게 회신을 보냅니다"
 
-#: src/mainwindow.c:2081
+#: src/mainwindow.c:2090
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/회신(_y)/보낸이(_s)"
 
-#: src/mainwindow.c:2082
+#: src/mainwindow.c:2091
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/회신(_y)/메일링리스트(_l)"
 
-#: src/mainwindow.c:2087 src/summaryview.c:347
+#: src/mainwindow.c:2096 src/summaryview.c:347
 msgid "/_Forward"
 msgstr "/전달(_F)"
 
-#: src/mainwindow.c:2088 src/summaryview.c:348
+#: src/mainwindow.c:2097 src/summaryview.c:348
 msgid "/For_ward as attachment"
 msgstr "/첨부로 전달(_w)"
 
-#: src/mainwindow.c:2089 src/summaryview.c:349
+#: src/mainwindow.c:2098 src/summaryview.c:349
 msgid "/Redirec_t"
 msgstr "/Redirec_t"
 
-#: src/mainwindow.c:2125
+#: src/mainwindow.c:2134
 msgid "Get"
 msgstr "받기"
 
-#: src/mainwindow.c:2126
+#: src/mainwindow.c:2135
 msgid "Incorporate new mail"
 msgstr "새 메일을 가져옵니다"
 
-#: src/mainwindow.c:2133
+#: src/mainwindow.c:2142
 msgid "Get all"
 msgstr "전부 받기"
 
-#: src/mainwindow.c:2134
+#: src/mainwindow.c:2143
 msgid "Incorporate new mail of all accounts"
 msgstr "모든 계정에서 새 메일을 가져옵니다"
 
-#: src/mainwindow.c:2145
+#: src/mainwindow.c:2154
 msgid "Send queued message(s)"
 msgstr "임시 보관된 메시지를 보냅니다"
 
-#: src/mainwindow.c:2155 src/prefs_account.c:705 src/prefs_common.c:852
+#: src/mainwindow.c:2164 src/prefs_account.c:705 src/prefs_common.c:852
 #: src/prefs_folder_item.c:137
 msgid "Compose"
 msgstr "작성"
 
-#: src/mainwindow.c:2156
+#: src/mainwindow.c:2165
 msgid "Compose new message"
 msgstr "새 메시지를 작성합니다"
 
-#: src/mainwindow.c:2164 src/prefs_common.c:1353
+#: src/mainwindow.c:2173 src/prefs_common.c:1365
 msgid "Reply"
 msgstr "회신"
 
-#: src/mainwindow.c:2165 src/mainwindow.c:2178
+#: src/mainwindow.c:2174 src/mainwindow.c:2187
 msgid "Reply to the message"
 msgstr "메시지에 회신을 보냅니다"
 
-#: src/mainwindow.c:2183
+#: src/mainwindow.c:2192
 msgid "Reply all"
 msgstr "전체 회신"
 
-#: src/mainwindow.c:2184
+#: src/mainwindow.c:2193
 msgid "Reply to all"
 msgstr "전부에게 회신을 보냅니다"
 
-#: src/mainwindow.c:2192 src/prefs_filter_edit.c:719
+#: src/mainwindow.c:2201 src/prefs_filter_edit.c:719
 msgid "Forward"
 msgstr "전달"
 
-#: src/mainwindow.c:2193 src/mainwindow.c:2206
+#: src/mainwindow.c:2202 src/mainwindow.c:2215
 msgid "Forward the message"
 msgstr "메시지를 다른 사람에게 전달합니다"
 
-#: src/mainwindow.c:2213
+#: src/mainwindow.c:2222
 msgid "Delete the message"
 msgstr "메시지를 지웁니다"
 
-#: src/mainwindow.c:2221
+#: src/mainwindow.c:2230
 msgid "Execute"
 msgstr "실행"
 
-#: src/mainwindow.c:2222
+#: src/mainwindow.c:2231
 msgid "Execute marked process"
 msgstr "표시된 프로세스들을 실행합니다"
 
-#: src/mainwindow.c:2231
+#: src/mainwindow.c:2240
 msgid "Next unread message"
 msgstr "다음 안 읽은 메시지를 보여줍니다"
 
-#: src/mainwindow.c:2242
+#: src/mainwindow.c:2251
 msgid "Prefs"
 msgstr "설정"
 
-#: src/mainwindow.c:2243
+#: src/mainwindow.c:2252
 msgid "Common preferences"
 msgstr "기본적인 환경 설정"
 
-#: src/mainwindow.c:2250 src/prefs_folder_item.c:258
+#: src/mainwindow.c:2259 src/prefs_folder_item.c:258
 #: src/prefs_folder_item.c:269 src/progressdialog.c:50
 msgid "Account"
 msgstr "계정"
 
-#: src/mainwindow.c:2251
+#: src/mainwindow.c:2260
 msgid "Account setting"
 msgstr "계정을 설정합니다"
 
-#: src/mainwindow.c:2425
+#: src/mainwindow.c:2434
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 
-#: src/mainwindow.c:2436
+#: src/mainwindow.c:2445
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 
-#: src/mainwindow.c:2624
+#: src/mainwindow.c:2633
 msgid "Exit"
 msgstr "끝내기"
 
-#: src/mainwindow.c:2624
+#: src/mainwindow.c:2633
 msgid "Exit this program?"
 msgstr "이 프로그램을 끝내시겠습니까?"
 
@@ -3401,7 +3437,7 @@ msgstr "찾기가 완료"
 msgid "Creating message view...\n"
 msgstr "메시지 뷰를 생성합니다...\n"
 
-#: src/messageview.c:303 src/prefs_common.c:1550
+#: src/messageview.c:303 src/prefs_common.c:1562
 msgid "Text"
 msgstr "텍스트"
 
@@ -3414,7 +3450,7 @@ msgstr "첨부"
 msgid "Can't save the file `%s'."
 msgstr "`%s' 파일을 저장할 수가 없습니다."
 
-#: src/messageview.c:697 src/prefs_common.c:2154 src/summaryview.c:2744
+#: src/messageview.c:697 src/prefs_common.c:2166 src/summaryview.c:2744
 msgid "Print"
 msgstr "인쇄"
 
@@ -3890,7 +3926,7 @@ msgstr "(필터링 되지 않은 메시지는 이 폴더에 저장될 것입니�
 msgid "Authentication method"
 msgstr "인증 방법"
 
-#: src/prefs_account.c:1123 src/prefs_account.c:1239 src/prefs_common.c:1189
+#: src/prefs_account.c:1123 src/prefs_account.c:1239 src/prefs_common.c:1201
 msgid "Automatic"
 msgstr "자동"
 
@@ -3914,7 +3950,7 @@ msgstr "Message-ID 생성"
 msgid "Add user-defined header"
 msgstr "사용자 정의된 헤더 추가"
 
-#: src/prefs_account.c:1196 src/prefs_common.c:1714 src/prefs_common.c:1739
+#: src/prefs_account.c:1196 src/prefs_common.c:1726 src/prefs_common.c:1751
 msgid " Edit... "
 msgstr " 편집..."
 
@@ -4289,106 +4325,107 @@ msgid "Save sent messages to outbox"
 msgstr "보낸 메시지를 '보낸 편지함'에 저장"
 
 #: src/prefs_common.c:1113
-msgid "Outgoing codeset"
+#, fuzzy
+msgid "Outgoing encoding"
 msgstr "보내는 메일의 문자셋"
 
 #: src/prefs_common.c:1128
 msgid "Automatic (Recommended)"
 msgstr "자동 (추천)"
 
-#: src/prefs_common.c:1129
+#: src/prefs_common.c:1130
 msgid "7bit ascii (US-ASCII)"
 msgstr "7bit 아스키 (US-ASCII)"
 
-#: src/prefs_common.c:1130
+#: src/prefs_common.c:1132
 msgid "Unicode (UTF-8)"
 msgstr "유니코드 (UTF-8)"
 
-#: src/prefs_common.c:1131
+#: src/prefs_common.c:1134
 msgid "Western European (ISO-8859-1)"
 msgstr "서부 유럽(ISO-8859-1)"
 
-#: src/prefs_common.c:1132
+#: src/prefs_common.c:1135
 msgid "Western European (ISO-8859-15)"
 msgstr "서부 유럽(ISO-8859-15)"
 
-#: src/prefs_common.c:1133
+#: src/prefs_common.c:1137
 msgid "Central European (ISO-8859-2)"
 msgstr "중부 유럽(ISO-8859-2)"
 
-#: src/prefs_common.c:1134
+#: src/prefs_common.c:1139
 msgid "Baltic (ISO-8859-13)"
 msgstr "Baltic (ISO-8859-13)"
 
-#: src/prefs_common.c:1135
+#: src/prefs_common.c:1140
 msgid "Baltic (ISO-8859-4)"
 msgstr "Baltic (ISO-8859-4)"
 
-#: src/prefs_common.c:1136
+#: src/prefs_common.c:1142
 msgid "Greek (ISO-8859-7)"
 msgstr "그리스 (ISO-8859-7)"
 
-#: src/prefs_common.c:1137
+#: src/prefs_common.c:1144
 msgid "Turkish (ISO-8859-9)"
 msgstr "터키 (ISO-8859-9)"
 
-#: src/prefs_common.c:1138
+#: src/prefs_common.c:1146
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Cyrillic (ISO-8859-5)"
 
-#: src/prefs_common.c:1139
+#: src/prefs_common.c:1147
 msgid "Cyrillic (KOI8-R)"
 msgstr "Cyrillic (KOI8-R)"
 
-#: src/prefs_common.c:1140
-msgid "Cyrillic (Windows-1251)"
-msgstr "Cyrillic (Windows-1251)"
-
-#: src/prefs_common.c:1141
+#: src/prefs_common.c:1148
 msgid "Cyrillic (KOI8-U)"
 msgstr "Cyrillic (KOI8-U)"
 
-#: src/prefs_common.c:1142
+#: src/prefs_common.c:1149
+msgid "Cyrillic (Windows-1251)"
+msgstr "Cyrillic (Windows-1251)"
+
+#: src/prefs_common.c:1151
 msgid "Japanese (ISO-2022-JP)"
 msgstr "일본 (ISO-2022-JP)"
 
-#: src/prefs_common.c:1144
+#: src/prefs_common.c:1153
 msgid "Japanese (EUC-JP)"
 msgstr "일본 (EUC-JP)"
 
-#: src/prefs_common.c:1145
+#: src/prefs_common.c:1154
 msgid "Japanese (Shift_JIS)"
 msgstr "일본 (Shift_JIS)"
 
-#: src/prefs_common.c:1147
+#: src/prefs_common.c:1157
 msgid "Simplified Chinese (GB2312)"
 msgstr "Simplified Chinese (GB2312)"
 
-#: src/prefs_common.c:1148
+#: src/prefs_common.c:1158
 msgid "Traditional Chinese (Big5)"
 msgstr "Traditional Chinese (Big5)"
 
-#: src/prefs_common.c:1150
+#: src/prefs_common.c:1160
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Traditional Chinese (EUC-TW)"
 
-#: src/prefs_common.c:1151
+#: src/prefs_common.c:1161
 msgid "Chinese (ISO-2022-CN)"
 msgstr "중국 (ISO-2022-CN)"
 
-#: src/prefs_common.c:1153
+#: src/prefs_common.c:1164
 msgid "Korean (EUC-KR)"
 msgstr "한국 (EUC-KR)"
 
-#: src/prefs_common.c:1154
+#: src/prefs_common.c:1166
 msgid "Thai (TIS-620)"
 msgstr "Thai (TIS-620)"
 
-#: src/prefs_common.c:1155
+#: src/prefs_common.c:1167
 msgid "Thai (Windows-874)"
 msgstr "Thai (Windows-874)"
 
-#: src/prefs_common.c:1165
+#: src/prefs_common.c:1177
 #, fuzzy
 msgid ""
 "If `Automatic' is selected, the optimal encoding for the current locale will "
@@ -4397,129 +4434,129 @@ msgstr ""
 "`자동'이 선택되면, 현재 로케일에 맞는 최적의\n"
 "인코딩 방식이 사용됩니다."
 
-#: src/prefs_common.c:1179
+#: src/prefs_common.c:1191
 #, fuzzy
 msgid "Transfer encoding"
 msgstr "보내기 전에 줄 바꿈"
 
-#: src/prefs_common.c:1202
+#: src/prefs_common.c:1214
 msgid ""
 "Specify Content-Transfer-Encoding used when message body contains non-ASCII "
 "characters."
 msgstr ""
 
-#: src/prefs_common.c:1272
+#: src/prefs_common.c:1284
 msgid "Signature separator"
 msgstr "서명 분리자"
 
-#: src/prefs_common.c:1281
+#: src/prefs_common.c:1293
 msgid "Insert automatically"
 msgstr "지동으로 삽입"
 
-#: src/prefs_common.c:1291
+#: src/prefs_common.c:1303
 msgid "Automatically launch the external editor"
 msgstr "자동으로 외부 편집기 사용"
 
-#: src/prefs_common.c:1301
+#: src/prefs_common.c:1313
 msgid "Undo level"
 msgstr ""
 
-#: src/prefs_common.c:1321
+#: src/prefs_common.c:1333
 msgid "Wrap messages at"
 msgstr "줄 바꿈 at"
 
-#: src/prefs_common.c:1333
+#: src/prefs_common.c:1345
 msgid "characters"
 msgstr "글자"
 
-#: src/prefs_common.c:1343
+#: src/prefs_common.c:1355
 msgid "Wrap quotation"
 msgstr "인용도 줄 바꿈"
 
-#: src/prefs_common.c:1349
+#: src/prefs_common.c:1361
 msgid "Wrap on input"
 msgstr ""
 
-#: src/prefs_common.c:1351
+#: src/prefs_common.c:1363
 msgid "Wrap before sending"
 msgstr "보내기 전에 줄 바꿈"
 
-#: src/prefs_common.c:1361
+#: src/prefs_common.c:1373
 msgid "Automatically select account for replies"
 msgstr "자동으로 회신할 계정 선택"
 
-#: src/prefs_common.c:1363
+#: src/prefs_common.c:1375
 msgid "Quote message when replying"
 msgstr "회신할 때 메시지를 인용"
 
-#: src/prefs_common.c:1365
+#: src/prefs_common.c:1377
 msgid "Reply button invokes mailing list reply"
 msgstr "회신 버튼이 메일링리스트에 대한 회신으로 동작"
 
 #. reply
-#: src/prefs_common.c:1411
+#: src/prefs_common.c:1423
 msgid "Reply format"
 msgstr "회신 형식"
 
-#: src/prefs_common.c:1426 src/prefs_common.c:1468
+#: src/prefs_common.c:1438 src/prefs_common.c:1480
 msgid "Quotation mark"
 msgstr "인용 부호"
 
 #. forward
-#: src/prefs_common.c:1453
+#: src/prefs_common.c:1465
 msgid "Forward format"
 msgstr "전달 형식"
 
-#: src/prefs_common.c:1500
+#: src/prefs_common.c:1512
 msgid " Description of symbols "
 msgstr " 부호 설명 "
 
-#: src/prefs_common.c:1541
+#: src/prefs_common.c:1553
 msgid "Font"
 msgstr "글꼴"
 
-#: src/prefs_common.c:1573
+#: src/prefs_common.c:1585
 msgid "Translate header name (such as `From:', `Subject:')"
 msgstr "헤더 이름을 번역(`From:', `Subject:' 등등)"
 
-#: src/prefs_common.c:1576
+#: src/prefs_common.c:1588
 msgid "Display unread number next to folder name"
 msgstr "폴더이름옆에 읽지않을 메시지 수를 표시"
 
-#: src/prefs_common.c:1585
+#: src/prefs_common.c:1597
 msgid "Abbreviate newsgroups longer than"
 msgstr ""
 
-#: src/prefs_common.c:1600
+#: src/prefs_common.c:1612
 msgid "letters"
 msgstr ""
 
 #. ---- Summary ----
-#: src/prefs_common.c:1606
+#: src/prefs_common.c:1618
 msgid "Summary View"
 msgstr "요약 보기"
 
-#: src/prefs_common.c:1615
+#: src/prefs_common.c:1627
 msgid "Display recipient on `From' column if sender is yourself"
 msgstr "보낸 사람이 본인인 경우 보낸 사람 칸에 받는 사람을 표시"
 
-#: src/prefs_common.c:1617
+#: src/prefs_common.c:1629
 msgid "Expand threads"
 msgstr "쓰레드 펴기"
 
-#: src/prefs_common.c:1625 src/prefs_common.c:2443 src/prefs_common.c:2481
+#: src/prefs_common.c:1637 src/prefs_common.c:2455 src/prefs_common.c:2493
 msgid "Date format"
 msgstr "날짜 형식"
 
-#: src/prefs_common.c:1646
+#: src/prefs_common.c:1658
 msgid " Set display item of summary... "
 msgstr "요약에 표시될 항목 설정... "
 
-#: src/prefs_common.c:1710
+#: src/prefs_common.c:1722
 msgid "Enable coloration of message"
 msgstr "메시지에 색을 이용하여 보여주기"
 
-#: src/prefs_common.c:1724
+#: src/prefs_common.c:1736
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
@@ -4527,322 +4564,322 @@ msgstr ""
 "다중바이트 알파벳과 숫자를 ASCII 문자로\n"
 "표시 (일본어인 경우에만)"
 
-#: src/prefs_common.c:1730
+#: src/prefs_common.c:1742
 msgid "Display header pane above message view"
 msgstr "메시지 보기 위에 헤더 창 표시"
 
-#: src/prefs_common.c:1737
+#: src/prefs_common.c:1749
 msgid "Display short headers on message view"
 msgstr "메시지를 볼때 간단한 헤더만 표시"
 
-#: src/prefs_common.c:1758
+#: src/prefs_common.c:1770
 msgid "Line space"
 msgstr "줄 간격"
 
-#: src/prefs_common.c:1772 src/prefs_common.c:1810
+#: src/prefs_common.c:1784 src/prefs_common.c:1822
 msgid "pixel(s)"
 msgstr "픽셀"
 
-#: src/prefs_common.c:1777
+#: src/prefs_common.c:1789
 msgid "Scroll"
 msgstr "스크롤"
 
-#: src/prefs_common.c:1784
+#: src/prefs_common.c:1796
 msgid "Half page"
 msgstr "반 페이지"
 
-#: src/prefs_common.c:1790
+#: src/prefs_common.c:1802
 msgid "Smooth scroll"
 msgstr "부드러운 스크롤"
 
-#: src/prefs_common.c:1796
+#: src/prefs_common.c:1808
 msgid "Step"
 msgstr ""
 
-#: src/prefs_common.c:1816
+#: src/prefs_common.c:1828
 msgid "Images"
 msgstr ""
 
-#: src/prefs_common.c:1824
+#: src/prefs_common.c:1836
 #, fuzzy
 msgid "Resize attached large images to fit in the window"
 msgstr "첨부된 이미지 크기 조정"
 
-#: src/prefs_common.c:1826
+#: src/prefs_common.c:1838
 #, fuzzy
 msgid "Display images as inline"
 msgstr "표시될 헤더 설정"
 
-#: src/prefs_common.c:1871
+#: src/prefs_common.c:1883
 msgid "Automatically check signatures"
 msgstr "자동으로 서명 확인"
 
-#: src/prefs_common.c:1874
+#: src/prefs_common.c:1886
 msgid "Show signature check result in a popup window"
 msgstr "팝업 창에 서명 확인 결과 보이기"
 
-#: src/prefs_common.c:1877
+#: src/prefs_common.c:1889
 msgid "Store passphrase in memory temporarily"
 msgstr "비밀번호를 메모리에 임시 보관"
 
-#: src/prefs_common.c:1892
+#: src/prefs_common.c:1904
 msgid "Expired after"
 msgstr ""
 
-#: src/prefs_common.c:1905
+#: src/prefs_common.c:1917
 msgid "minute(s) "
 msgstr "분 "
 
-#: src/prefs_common.c:1918
+#: src/prefs_common.c:1930
 msgid "Setting to '0' will store the passphrase for the whole session."
 msgstr ""
 
-#: src/prefs_common.c:1932
+#: src/prefs_common.c:1944
 msgid "Grab input while entering a passphrase"
 msgstr "passphrase를 입력할때 Grab input"
 
-#: src/prefs_common.c:1937
+#: src/prefs_common.c:1949
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "GnuPG가 동작하지 않을 경우 시작시 경고 표시"
 
-#: src/prefs_common.c:1989
+#: src/prefs_common.c:2001
 #, fuzzy
 msgid "Always open messages in summary when selected"
 msgstr "어떤 메시지 파일도 선택되지 않았습니다."
 
-#: src/prefs_common.c:1993
+#: src/prefs_common.c:2005
 msgid "Open first unread message when entering a folder"
 msgstr "폴더에 들어가면 첫번째 안읽은 메시지 열기"
 
-#: src/prefs_common.c:1997
+#: src/prefs_common.c:2009
 msgid "Only mark message as read when opened in new window"
 msgstr "새 창에서 열렸을 경우에만 메시지를 읽은 것으로 표시"
 
-#: src/prefs_common.c:2001
+#: src/prefs_common.c:2013
 msgid "Go to inbox after receiving new mail"
 msgstr "새 편지를 받은 후 받은 편지함으로 가기"
 
-#: src/prefs_common.c:2009
+#: src/prefs_common.c:2021
 msgid "Execute immediately when moving or deleting messages"
 msgstr "메시지를 이동하거나 지울때 즉시 실행"
 
-#: src/prefs_common.c:2021
+#: src/prefs_common.c:2033
 #, fuzzy
 msgid "Messages will be marked until execution if this is turned off."
 msgstr ""
 "(이것이 꺼져있는 경우 메시지는 실행때까지\n"
 "단지 표시만 될 것입니다)"
 
-#: src/prefs_common.c:2029
+#: src/prefs_common.c:2041
 msgid "Receive dialog"
 msgstr "받기 대화상자"
 
-#: src/prefs_common.c:2039
+#: src/prefs_common.c:2051
 msgid "Show receive dialog"
 msgstr "받기 대화상자 보기"
 
-#: src/prefs_common.c:2049
+#: src/prefs_common.c:2061
 msgid "Always"
 msgstr "항상"
 
-#: src/prefs_common.c:2050
+#: src/prefs_common.c:2062
 msgid "Only on manual receiving"
 msgstr ""
 
-#: src/prefs_common.c:2052
+#: src/prefs_common.c:2064
 msgid "Never"
 msgstr "보이지 않음"
 
-#: src/prefs_common.c:2057
+#: src/prefs_common.c:2069
 msgid "Don't popup error dialog on receive error"
 msgstr "받기 에러 발생시 에러 상자 보이지 않음"
 
-#: src/prefs_common.c:2060
+#: src/prefs_common.c:2072
 msgid "Close receive dialog when finished"
 msgstr "끝났을 때 받기 대화상자 닫기"
 
-#: src/prefs_common.c:2066
+#: src/prefs_common.c:2078
 msgid " Set key bindings... "
 msgstr " 키 바인딩 설정... "
 
-#: src/prefs_common.c:2122
+#: src/prefs_common.c:2134
 #, c-format
 msgid "External commands (%s will be replaced with file name / URI)"
 msgstr "외부 명령 (%s는 파일 이름 / URI로 대체됩니다)"
 
-#: src/prefs_common.c:2131
+#: src/prefs_common.c:2143
 msgid "Web browser"
 msgstr "웹 탐색기"
 
-#: src/prefs_common.c:2195
+#: src/prefs_common.c:2207
 msgid "Add address to destination when double-clicked"
 msgstr "더블클릭시에 대상에 주소 추가"
 
-#: src/prefs_common.c:2197
+#: src/prefs_common.c:2209
 msgid "On exit"
 msgstr "끝낼때"
 
-#: src/prefs_common.c:2205
+#: src/prefs_common.c:2217
 msgid "Confirm on exit"
 msgstr "끝냈때 확인"
 
-#: src/prefs_common.c:2212
+#: src/prefs_common.c:2224
 msgid "Empty trash on exit"
 msgstr "끝낼때 지운 편지함 비우기"
 
-#: src/prefs_common.c:2214
+#: src/prefs_common.c:2226
 msgid "Ask before emptying"
 msgstr "지운 편지함 비울때 확인하기"
 
-#: src/prefs_common.c:2218
+#: src/prefs_common.c:2230
 msgid "Warn if there are queued messages"
 msgstr "큐에 메시지가 있을 때 경고"
 
-#: src/prefs_common.c:2224
+#: src/prefs_common.c:2236
 msgid "Socket I/O timeout:"
 msgstr ""
 
-#: src/prefs_common.c:2237
+#: src/prefs_common.c:2249
 msgid "second(s)"
 msgstr ""
 
-#: src/prefs_common.c:2419
+#: src/prefs_common.c:2431
 msgid "the full abbreviated weekday name"
 msgstr ""
 
-#: src/prefs_common.c:2420
+#: src/prefs_common.c:2432
 msgid "the full weekday name"
 msgstr ""
 
-#: src/prefs_common.c:2421
+#: src/prefs_common.c:2433
 msgid "the abbreviated month name"
 msgstr ""
 
-#: src/prefs_common.c:2422
+#: src/prefs_common.c:2434
 msgid "the full month name"
 msgstr ""
 
-#: src/prefs_common.c:2423
+#: src/prefs_common.c:2435
 msgid "the preferred date and time for the current locale"
 msgstr "현재 로케일에 적당한 날짜와 시간"
 
-#: src/prefs_common.c:2424
+#: src/prefs_common.c:2436
 msgid "the century number (year/100)"
 msgstr "년도 (년/100)"
 
-#: src/prefs_common.c:2425
+#: src/prefs_common.c:2437
 msgid "the day of the month as a decimal number"
 msgstr ""
 
-#: src/prefs_common.c:2426
+#: src/prefs_common.c:2438
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr ""
 
-#: src/prefs_common.c:2427
+#: src/prefs_common.c:2439
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr ""
 
-#: src/prefs_common.c:2428
+#: src/prefs_common.c:2440
 msgid "the day of the year as a decimal number"
 msgstr ""
 
-#: src/prefs_common.c:2429
+#: src/prefs_common.c:2441
 msgid "the month as a decimal number"
 msgstr ""
 
-#: src/prefs_common.c:2430
+#: src/prefs_common.c:2442
 msgid "the minute as a decimal number"
 msgstr ""
 
-#: src/prefs_common.c:2431
+#: src/prefs_common.c:2443
 msgid "either AM or PM"
 msgstr ""
 
-#: src/prefs_common.c:2432
+#: src/prefs_common.c:2444
 msgid "the second as a decimal number"
 msgstr ""
 
-#: src/prefs_common.c:2433
+#: src/prefs_common.c:2445
 msgid "the day of the week as a decimal number"
 msgstr ""
 
-#: src/prefs_common.c:2434
+#: src/prefs_common.c:2446
 msgid "the preferred date for the current locale"
 msgstr ""
 
-#: src/prefs_common.c:2435
+#: src/prefs_common.c:2447
 msgid "the last two digits of a year"
 msgstr ""
 
-#: src/prefs_common.c:2436
+#: src/prefs_common.c:2448
 msgid "the year as a decimal number"
 msgstr ""
 
-#: src/prefs_common.c:2437
+#: src/prefs_common.c:2449
 msgid "the time zone or name or abbreviation"
 msgstr ""
 
-#: src/prefs_common.c:2458
+#: src/prefs_common.c:2470
 msgid "Specifier"
 msgstr ""
 
-#: src/prefs_common.c:2459
+#: src/prefs_common.c:2471
 msgid "Description"
 msgstr "설명"
 
-#: src/prefs_common.c:2499
+#: src/prefs_common.c:2511
 msgid "Example"
 msgstr "예제"
 
-#: src/prefs_common.c:2580
+#: src/prefs_common.c:2592
 msgid "Set message colors"
 msgstr "메시지 색 설정"
 
-#: src/prefs_common.c:2588
+#: src/prefs_common.c:2600
 msgid "Colors"
 msgstr "색"
 
-#: src/prefs_common.c:2622
+#: src/prefs_common.c:2634
 msgid "Quoted Text - First Level"
 msgstr "인용문 - 첫번째 단계"
 
-#: src/prefs_common.c:2628
+#: src/prefs_common.c:2640
 msgid "Quoted Text - Second Level"
 msgstr "인용문 - 두번째 단계"
 
-#: src/prefs_common.c:2634
+#: src/prefs_common.c:2646
 msgid "Quoted Text - Third Level"
 msgstr "인용문 - 세번째 단계"
 
-#: src/prefs_common.c:2640
+#: src/prefs_common.c:2652
 msgid "URI link"
 msgstr "URI 링크"
 
-#: src/prefs_common.c:2647
+#: src/prefs_common.c:2659
 msgid "Recycle quote colors"
 msgstr "인용 색 반복"
 
-#: src/prefs_common.c:2707
+#: src/prefs_common.c:2719
 msgid "Pick color for quotation level 1"
 msgstr "첫번째 단계 인용문 색 선택"
 
-#: src/prefs_common.c:2710
+#: src/prefs_common.c:2722
 msgid "Pick color for quotation level 2"
 msgstr "두번째 단계 인용문 색 선택"
 
-#: src/prefs_common.c:2713
+#: src/prefs_common.c:2725
 msgid "Pick color for quotation level 3"
 msgstr "세번째 단계 인용문 색 선택"
 
-#: src/prefs_common.c:2716
+#: src/prefs_common.c:2728
 msgid "Pick color for URI"
 msgstr "URI 색 선택"
 
-#: src/prefs_common.c:2853
+#: src/prefs_common.c:2865
 msgid "Description of symbols"
 msgstr "부호 설명"
 
-#: src/prefs_common.c:2909
+#: src/prefs_common.c:2921
 msgid ""
 "Date\n"
 "From\n"
@@ -4866,11 +4903,11 @@ msgstr ""
 "뉴스그룹\n"
 "메시지-ID"
 
-#: src/prefs_common.c:2922
+#: src/prefs_common.c:2934
 msgid "If x is set, displays expr"
 msgstr ""
 
-#: src/prefs_common.c:2926
+#: src/prefs_common.c:2938
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -4879,7 +4916,7 @@ msgid ""
 "Literal %"
 msgstr ""
 
-#: src/prefs_common.c:2934
+#: src/prefs_common.c:2946
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -4887,26 +4924,26 @@ msgid ""
 "Literal closing curly brace"
 msgstr ""
 
-#: src/prefs_common.c:2971
+#: src/prefs_common.c:2983
 msgid "Font selection"
 msgstr "글꼴 선택"
 
-#: src/prefs_common.c:3035
+#: src/prefs_common.c:3047
 msgid "Key bindings"
 msgstr "키 바인딩"
 
-#: src/prefs_common.c:3049
+#: src/prefs_common.c:3061
 msgid ""
 "Select the preset of key bindings.\n"
 "You can also modify each menu's shortcuts by pressing\n"
 "any key(s) when placing the mouse pointer on the item."
 msgstr ""
 
-#: src/prefs_common.c:3061 src/prefs_common.c:3410
+#: src/prefs_common.c:3073 src/prefs_common.c:3422
 msgid "Default"
 msgstr "기본"
 
-#: src/prefs_common.c:3064 src/prefs_common.c:3419
+#: src/prefs_common.c:3076 src/prefs_common.c:3431
 msgid "Old Sylpheed"
 msgstr "예전 Sylpheed"
 
@@ -6070,6 +6107,12 @@ msgstr ""
 msgid "writing to %s failed.\n"
 msgstr "%s로 쓰기가 실패했습니다.\n"
 
+#~ msgid "/_View/_Code set/---"
+#~ msgstr "/보기(_V)/문자셋(_C)/---"
+
+#~ msgid "/_View/_Code set"
+#~ msgstr "/보기(_V)/문자셋(_C)"
+
 #, fuzzy
 #~ msgid "Top"
 #~ msgstr "받는 사람:"
diff --git a/po/nl.po b/po/nl.po
index 11c5f961..1bf6e36d 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: 2005-03-15 14:29+0900\n"
+"POT-Creation-Date: 2005-03-16 14:47+0900\n"
 "PO-Revision-Date: 2003-02-18 13:03--100\n"
 "Last-Translator: Vincent van Adrighem <V.vanAdrighem@dirck.mine.nu>\n"
 "Language-Team: Dutch <vertaling@nl.linux.rg>\n"
@@ -99,7 +99,7 @@ msgstr ""
 "u op de knop 'Alles ophalen' klikt."
 
 #: src/account.c:638 src/addressadd.c:186 src/addressbook.c:488
-#: src/compose.c:3650 src/editaddress.c:195 src/editaddress.c:936
+#: src/compose.c:3748 src/editaddress.c:195 src/editaddress.c:936
 #: src/editaddress.c:984 src/editbook.c:191 src/editgroup.c:257
 #: src/editjpilot.c:296 src/editldap.c:300 src/editvcard.c:211
 #: src/mimeview.c:151 src/prefs_filter.c:214 src/prefs_folder_item.c:170
@@ -152,13 +152,13 @@ msgstr "Account verwijderen"
 msgid "Do you really want to delete this account?"
 msgstr "Wilt u dit account werkelijk verwijderen?"
 
-#: src/account.c:758 src/compose.c:2551 src/compose.c:4807
+#: src/account.c:758 src/compose.c:2632 src/compose.c:4943
 #: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
 #: src/folderview.c:2156 src/folderview.c:2192
 msgid "Yes"
 msgstr "Ja"
 
-#: src/account.c:758 src/compose.c:2551 src/compose.c:4807
+#: src/account.c:758 src/compose.c:2632 src/compose.c:4943
 #: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
 #: src/folderview.c:2156 src/folderview.c:2192
 msgid "+No"
@@ -261,7 +261,7 @@ msgstr ""
 msgid "Add Address to Book"
 msgstr "Adres toevoegen aan adresboek"
 
-#: src/addressadd.c:196 src/compose.c:4191 src/editaddress.c:196
+#: src/addressadd.c:196 src/compose.c:4292 src/editaddress.c:196
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "Adres"
@@ -275,7 +275,7 @@ msgstr "Opmerkingen"
 msgid "Select Address Book Folder"
 msgstr "Selecteer adresboekmap"
 
-#: src/addressbook.c:334 src/compose.c:469 src/mainwindow.c:454
+#: src/addressbook.c:334 src/compose.c:477 src/mainwindow.c:454
 #: src/messageview.c:134
 msgid "/_File"
 msgstr "/_Bestand"
@@ -296,8 +296,8 @@ msgstr "/_Bestand/Nieuwe _JPilot"
 msgid "/_File/New _Server"
 msgstr "/_Bestand/Nieuwe _Server"
 
-#: src/addressbook.c:343 src/addressbook.c:346 src/compose.c:474
-#: src/compose.c:479 src/compose.c:483 src/mainwindow.c:471
+#: src/addressbook.c:343 src/addressbook.c:346 src/compose.c:482
+#: src/compose.c:487 src/compose.c:491 src/mainwindow.c:471
 #: src/mainwindow.c:474 src/mainwindow.c:476 src/mainwindow.c:479
 #: src/mainwindow.c:481 src/messageview.c:137
 msgid "/_File/---"
@@ -315,7 +315,7 @@ msgstr "/_Bestand/_Verwijderen"
 msgid "/_File/_Save"
 msgstr "/_Bestand/_Opslaan"
 
-#: src/addressbook.c:348 src/compose.c:484 src/messageview.c:138
+#: src/addressbook.c:348 src/compose.c:492 src/messageview.c:138
 msgid "/_File/_Close"
 msgstr "/_Bestand/_Sluiten"
 
@@ -347,7 +347,7 @@ msgstr "/_Adres/_Bewerken"
 msgid "/_Address/_Delete"
 msgstr "/_Adres/_Verwijderen"
 
-#: src/addressbook.c:356 src/compose.c:585 src/mainwindow.c:688
+#: src/addressbook.c:356 src/compose.c:664 src/mainwindow.c:697
 #: src/messageview.c:246
 msgid "/_Tools"
 msgstr "/_Gereedschap"
@@ -356,12 +356,12 @@ msgstr "/_Gereedschap"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Gereedschap/_LDIF bestand importeren"
 
-#: src/addressbook.c:358 src/compose.c:598 src/mainwindow.c:733
+#: src/addressbook.c:358 src/compose.c:677 src/mainwindow.c:742
 #: src/messageview.c:264
 msgid "/_Help"
 msgstr "/_Hulp"
 
-#: src/addressbook.c:359 src/compose.c:599 src/mainwindow.c:744
+#: src/addressbook.c:359 src/compose.c:678 src/mainwindow.c:753
 #: src/messageview.c:265
 msgid "/_Help/_About"
 msgstr "/_Hulp/_Info"
@@ -378,7 +378,7 @@ msgstr "/Nieuwe _groep"
 msgid "/New _Folder"
 msgstr "/Nieuwe _map"
 
-#: src/addressbook.c:381 src/addressbook.c:391 src/compose.c:463
+#: src/addressbook.c:381 src/addressbook.c:391 src/compose.c:471
 #: src/folderview.c:220 src/folderview.c:222 src/folderview.c:226
 #: src/folderview.c:236 src/folderview.c:238 src/folderview.c:240
 #: src/folderview.c:244 src/folderview.c:254 src/folderview.c:256
@@ -388,7 +388,7 @@ msgstr "/Nieuwe _map"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:382 src/addressbook.c:392 src/compose.c:486
+#: src/addressbook.c:382 src/addressbook.c:392 src/compose.c:494
 #: src/mainwindow.c:485 src/messageview.c:140
 msgid "/_Edit"
 msgstr "/Be_werken"
@@ -401,7 +401,7 @@ msgstr "/Ver_wijderen"
 msgid "E-Mail address"
 msgstr "E-mail adres"
 
-#: src/addressbook.c:493 src/compose.c:4192 src/prefs_common.c:2186
+#: src/addressbook.c:493 src/compose.c:4293 src/prefs_common.c:2198
 msgid "Address book"
 msgstr "Adresboek"
 
@@ -411,7 +411,7 @@ msgstr "Naam:"
 
 #. Buttons
 #: src/addressbook.c:625 src/addressbook.c:1665 src/addressbook.c:1671
-#: src/editaddress.c:878 src/editaddress.c:1011 src/mainwindow.c:2212
+#: src/editaddress.c:878 src/editaddress.c:1011 src/mainwindow.c:2221
 #: src/prefs_actions.c:263 src/prefs_display_header.c:275
 #: src/prefs_display_header.c:330 src/prefs_template.c:227
 msgid "Delete"
@@ -604,7 +604,7 @@ msgstr "Algemene adressen"
 msgid "Personal address"
 msgstr "Persoonlijke adressen"
 
-#: src/alertpanel.c:123 src/compose.c:4807 src/main.c:458
+#: src/alertpanel.c:123 src/compose.c:4943 src/main.c:458
 msgid "Notice"
 msgstr "Bericht"
 
@@ -612,7 +612,7 @@ msgstr "Bericht"
 msgid "Warning"
 msgstr "Waarschuwing"
 
-#: src/alertpanel.c:149 src/compose.c:2551 src/inc.c:558
+#: src/alertpanel.c:149 src/compose.c:2632 src/inc.c:558
 msgid "Error"
 msgstr "Fout"
 
@@ -660,307 +660,425 @@ msgstr "Bruin"
 msgid "None"
 msgstr "Geen"
 
-#: src/compose.c:461
+#: src/compose.c:469
 msgid "/_Add..."
 msgstr "/_Toevoegen..."
 
-#: src/compose.c:462
+#: src/compose.c:470
 msgid "/_Remove"
 msgstr "/_Verwijderen"
 
-#: src/compose.c:464 src/folderview.c:228 src/folderview.c:246
+#: src/compose.c:472 src/folderview.c:228 src/folderview.c:246
 #: src/folderview.c:261
 msgid "/_Properties..."
 msgstr "/_Eigenschappen..."
 
-#: src/compose.c:470
+#: src/compose.c:478
 #, fuzzy
 msgid "/_File/_Send"
 msgstr "/_Bestand/_Opslaan"
 
-#: src/compose.c:472
+#: src/compose.c:480
 #, fuzzy
 msgid "/_File/Send _later"
 msgstr "/Be_richt/_Later verzenden"
 
-#: src/compose.c:475
+#: src/compose.c:483
 #, fuzzy
 msgid "/_File/Save to _draft folder"
 msgstr "/Be_richt/Klad opslaan"
 
-#: src/compose.c:477
+#: src/compose.c:485
 #, fuzzy
 msgid "/_File/Save and _keep editing"
 msgstr "/Be_richt/Opslaan en blijven bewer_ken"
 
-#: src/compose.c:480
+#: src/compose.c:488
 msgid "/_File/_Attach file"
 msgstr "/_Bestand/_Bijlage toevoegen"
 
-#: src/compose.c:481
+#: src/compose.c:489
 msgid "/_File/_Insert file"
 msgstr "/_Bestand/Bijlage _invoegen"
 
-#: src/compose.c:482
+#: src/compose.c:490
 msgid "/_File/Insert si_gnature"
 msgstr "/_Bestand/_Handtekening Invoegen"
 
-#: src/compose.c:487
+#: src/compose.c:495
 msgid "/_Edit/_Undo"
 msgstr "/B_ewerken/_Ongedaan maken"
 
-#: src/compose.c:488
+#: src/compose.c:496
 msgid "/_Edit/_Redo"
 msgstr "/B_ewerken/O_pnieuw toepassen"
 
-#: src/compose.c:489 src/compose.c:567 src/mainwindow.c:489
+#: src/compose.c:497 src/compose.c:575 src/mainwindow.c:489
 #: src/messageview.c:143
 msgid "/_Edit/---"
 msgstr "/B_ewerken/---"
 
-#: src/compose.c:490
+#: src/compose.c:498
 msgid "/_Edit/Cu_t"
 msgstr "/B_ewerken/Knippen"
 
-#: src/compose.c:491 src/mainwindow.c:486 src/messageview.c:141
+#: src/compose.c:499 src/mainwindow.c:486 src/messageview.c:141
 msgid "/_Edit/_Copy"
 msgstr "/B_ewerken/_Kopiëren"
 
-#: src/compose.c:492
+#: src/compose.c:500
 msgid "/_Edit/_Paste"
 msgstr "/B_ewerken/_Plakken"
 
-#: src/compose.c:493
+#: src/compose.c:501
 msgid "/_Edit/Paste as _quotation"
 msgstr "/B_ewerken/Plakken als _citaat"
 
-#: src/compose.c:495 src/mainwindow.c:487 src/messageview.c:142
+#: src/compose.c:503 src/mainwindow.c:487 src/messageview.c:142
 msgid "/_Edit/Select _all"
 msgstr "/B_ewerken/_Alles selecteren"
 
-#: src/compose.c:496
+#: src/compose.c:504
 msgid "/_Edit/A_dvanced"
 msgstr "/B_ewerken/Ge_avanceerd"
 
-#: src/compose.c:497
+#: src/compose.c:505
 msgid "/_Edit/A_dvanced/Move a character backward"
 msgstr "/B_ewerken/Ge_avanceerd/Ga een teken terug"
 
-#: src/compose.c:502
+#: src/compose.c:510
 msgid "/_Edit/A_dvanced/Move a character forward"
 msgstr "/B_ewerken/Ge_avanceerd/Ga een teken verder"
 
-#: src/compose.c:507
+#: src/compose.c:515
 msgid "/_Edit/A_dvanced/Move a word backward"
 msgstr "/B_ewerken/Ge_avanceerd/Ga een woord terug"
 
-#: src/compose.c:512
+#: src/compose.c:520
 msgid "/_Edit/A_dvanced/Move a word forward"
 msgstr "/B_ewerken/Ge_avanceerd/Ga een woord verder"
 
-#: src/compose.c:517
+#: src/compose.c:525
 msgid "/_Edit/A_dvanced/Move to beginning of line"
 msgstr "/B_ewerken/Ge_avanceerd/Ga naar begin van regel"
 
-#: src/compose.c:522
+#: src/compose.c:530
 msgid "/_Edit/A_dvanced/Move to end of line"
 msgstr "/B_ewerken/Ge_avanceerd/Ga naar einde van regel"
 
-#: src/compose.c:527
+#: src/compose.c:535
 msgid "/_Edit/A_dvanced/Move to previous line"
 msgstr "/B_ewerken/Ge_avanceerd/Ga naar vorige regel"
 
-#: src/compose.c:532
+#: src/compose.c:540
 msgid "/_Edit/A_dvanced/Move to next line"
 msgstr "/B_ewerken/Ge_avanceerd/Ga naar volgende regel"
 
-#: src/compose.c:537
+#: src/compose.c:545
 msgid "/_Edit/A_dvanced/Delete a character backward"
 msgstr "/B_ewerken/Ge_avanceerd/Verwijder vorig teken"
 
-#: src/compose.c:542
+#: src/compose.c:550
 msgid "/_Edit/A_dvanced/Delete a character forward"
 msgstr "/B_ewerken/Ge_avanceerd/Verwijder volgend teken"
 
-#: src/compose.c:547
+#: src/compose.c:555
 msgid "/_Edit/A_dvanced/Delete a word backward"
 msgstr "/B_ewerken/Ge_avanceerd/Verwijder vorig woord"
 
-#: src/compose.c:552
+#: src/compose.c:560
 msgid "/_Edit/A_dvanced/Delete a word forward"
 msgstr "/B_ewerken/Ge_avanceerd/Verwijder volgend woord"
 
-#: src/compose.c:557
+#: src/compose.c:565
 msgid "/_Edit/A_dvanced/Delete line"
 msgstr "/B_ewerken/Ge_avanceerd/Verwijder regel"
 
-#: src/compose.c:562
+#: src/compose.c:570
 msgid "/_Edit/A_dvanced/Delete to end of line"
 msgstr "/B_ewerken/Ge_avanceerd/Verwijder alles tot einde regel"
 
-#: src/compose.c:568
+#: src/compose.c:576
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/Be_werken/Regelterugloop in deze paragraaf"
 
-#: src/compose.c:570
+#: src/compose.c:578
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/B_ewerken/Regelterugloop in hele bericht"
 
-#: src/compose.c:572
+#: src/compose.c:580
 #, fuzzy
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/B_ewerken/_Kopiëren"
 
-#: src/compose.c:573 src/mainwindow.c:494 src/messageview.c:147
+#: src/compose.c:581 src/mainwindow.c:494 src/messageview.c:147
 #: src/summaryview.c:370
 msgid "/_View"
 msgstr "/B_eeld"
 
-#: src/compose.c:574
+#: src/compose.c:582
 msgid "/_View/_To"
 msgstr "/B_eeld/_Aan"
 
-#: src/compose.c:575
+#: src/compose.c:583
 msgid "/_View/_Cc"
 msgstr "/B_eeld/_Cc"
 
-#: src/compose.c:576
+#: src/compose.c:584
 msgid "/_View/_Bcc"
 msgstr "/B_eeld/_Bcc"
 
-#: src/compose.c:577
+#: src/compose.c:585
 msgid "/_View/_Reply to"
 msgstr "/B_eeld/Ant_woord naar"
 
-#: src/compose.c:578 src/compose.c:580 src/compose.c:582 src/mainwindow.c:512
-#: src/mainwindow.c:515 src/mainwindow.c:541 src/mainwindow.c:565
-#: src/mainwindow.c:641 src/mainwindow.c:645 src/messageview.c:223
+#: src/compose.c:586 src/compose.c:588 src/compose.c:590 src/compose.c:592
+#: src/mainwindow.c:512 src/mainwindow.c:515 src/mainwindow.c:541
+#: src/mainwindow.c:565 src/mainwindow.c:650 src/mainwindow.c:654
+#: src/messageview.c:223
 msgid "/_View/---"
 msgstr "/B_eeld/---"
 
-#: src/compose.c:579
+#: src/compose.c:587
 msgid "/_View/_Followup to"
 msgstr "/Be_richt/_Vervolg op"
 
-#: src/compose.c:581
+#: src/compose.c:589
 msgid "/_View/R_uler"
 msgstr "/B_eeld/_Lineaal"
 
-#: src/compose.c:583
+#: src/compose.c:591
 msgid "/_View/_Attachment"
 msgstr "/B_eeld/_Bijvoeging"
 
-#: src/compose.c:586 src/mainwindow.c:689 src/messageview.c:247
+#: src/compose.c:598 src/mainwindow.c:572 src/messageview.c:154
+#, fuzzy
+msgid "/_View/Character _encoding"
+msgstr "/B_eeld/_Sorteren/Aflopend"
+
+#: src/compose.c:599
+msgid "/_View/Character _encoding/_Automatic"
+msgstr ""
+
+#: src/compose.c:601 src/compose.c:607 src/compose.c:613 src/compose.c:617
+#: src/compose.c:623 src/compose.c:627 src/compose.c:631 src/compose.c:641
+#: src/compose.c:645 src/compose.c:653 src/compose.c:657 src/mainwindow.c:568
+#: src/mainwindow.c:575 src/messageview.c:150
+#, fuzzy
+msgid "/_View/Character _encoding/---"
+msgstr "/B_eeld/_Sorteren/Aflopend"
+
+#: src/compose.c:603 src/mainwindow.c:576 src/messageview.c:158
+#, fuzzy
+msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
+msgstr "/B_eeld/Codering/7bit ascii (US-ASC_II)"
+
+#: src/compose.c:605 src/mainwindow.c:578 src/messageview.c:161
+#, fuzzy
+msgid "/_View/Character _encoding/Unicode (_UTF-8)"
+msgstr "/B_eeld/Codering/Unicode (_UTF-8)"
+
+#: src/compose.c:609 src/mainwindow.c:582 src/messageview.c:164
+#, fuzzy
+msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
+msgstr "/B_eeld/Codering/Westeuropees (ISO-8859-_1)"
+
+#: src/compose.c:611 src/mainwindow.c:584 src/messageview.c:166
+#, fuzzy
+msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
+msgstr "/B_eeld/_Codering/Westeuropees (ISO-8859-_1)"
+
+#: src/compose.c:615 src/mainwindow.c:588 src/messageview.c:169
+#, fuzzy
+msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
+msgstr "/B_eeld/_Codering/Centraaleuropees (ISO-8859-_2)"
+
+#: src/compose.c:619 src/mainwindow.c:592 src/messageview.c:172
+#, fuzzy
+msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
+msgstr "/B_eeld/_Codering/Baltisch (ISO-8859-13)"
+
+#: src/compose.c:621 src/mainwindow.c:594 src/messageview.c:174
+#, fuzzy
+msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
+msgstr "/B_eeld/_Codering/Baltisch (ISO-8859-_4)"
+
+#: src/compose.c:625 src/mainwindow.c:598 src/messageview.c:177
+#, fuzzy
+msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
+msgstr "/B_eeld/_Codering/Grieks (ISO-8859-_7)"
+
+#: src/compose.c:629 src/mainwindow.c:602 src/messageview.c:180
+#, fuzzy
+msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
+msgstr "/B_eeld/_Codering/Turks (ISO-8859-_9)"
+
+#: src/compose.c:633 src/mainwindow.c:606 src/messageview.c:183
+#, fuzzy
+msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
+msgstr "/B_eeld/_Codering/Cyrillisch (ISO-8859-_5)"
+
+#: src/compose.c:635 src/mainwindow.c:608 src/messageview.c:185
+#, fuzzy
+msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
+msgstr "/B_eeld/_Codering/Cyrillisch (KOI8-_R)"
+
+#: src/compose.c:637 src/mainwindow.c:610 src/messageview.c:187
+#, fuzzy
+msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
+msgstr "/B_eeld/_Codering/Cyrillisch (KOI8-_R)"
+
+#: src/compose.c:639 src/mainwindow.c:612 src/messageview.c:189
+#, fuzzy
+msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
+msgstr "/B_eeld/_Codering/Cyrillisch (Windows-1251)"
+
+#: src/compose.c:643 src/mainwindow.c:616 src/messageview.c:192
+#, fuzzy
+msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
+msgstr "/B_eeld/_Codering/Japans (ISO-2022-_JP)"
+
+#: src/compose.c:647 src/mainwindow.c:626 src/messageview.c:201
+#, fuzzy
+msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
+msgstr "/B_eeld/_Codering/Simpel Chinees (_GB2312)"
+
+#: src/compose.c:649 src/mainwindow.c:628 src/messageview.c:203
+#, fuzzy
+msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
+msgstr "/B_eeld/_Codering/Traditioneel Chinees (_Big5)"
+
+#: src/compose.c:651 src/mainwindow.c:630 src/messageview.c:205
+#, fuzzy
+msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
+msgstr "/B_eeld/_Codering/Traditioneel Chinees (EUC-_TW)"
+
+#: src/compose.c:655 src/mainwindow.c:636 src/messageview.c:210
+#, fuzzy
+msgid "/_View/Character _encoding/Korean (EUC-_KR)"
+msgstr "/B_eeld/_Codering/Koreaans (EUC-_KR)"
+
+#: src/compose.c:659 src/mainwindow.c:642 src/messageview.c:215
+#, fuzzy
+msgid "/_View/Character _encoding/Thai (TIS-620)"
+msgstr "/B_eeld/_Codering/Thais (TIS-620)"
+
+#: src/compose.c:661 src/mainwindow.c:644 src/messageview.c:217
+#, fuzzy
+msgid "/_View/Character _encoding/Thai (Windows-874)"
+msgstr "/B_eeld/_Codering/Thais (Windows-874)"
+
+#: src/compose.c:665 src/mainwindow.c:698 src/messageview.c:247
 msgid "/_Tools/_Address book"
 msgstr "/_Gereedschap/_Adresboek"
 
-#: src/compose.c:587
+#: src/compose.c:666
 msgid "/_Tools/_Template"
 msgstr "/_Gereedschap/_Sjabloon"
 
-#: src/compose.c:588 src/mainwindow.c:707 src/messageview.c:262
+#: src/compose.c:667 src/mainwindow.c:716 src/messageview.c:262
 msgid "/_Tools/Actio_ns"
 msgstr "/_Gereedschap/A_cties"
 
-#: src/compose.c:589 src/compose.c:593 src/mainwindow.c:692
-#: src/mainwindow.c:706 src/mainwindow.c:708 src/mainwindow.c:711
-#: src/mainwindow.c:713 src/messageview.c:250 src/messageview.c:261
+#: src/compose.c:668 src/compose.c:672 src/mainwindow.c:701
+#: src/mainwindow.c:715 src/mainwindow.c:717 src/mainwindow.c:720
+#: src/mainwindow.c:722 src/messageview.c:250 src/messageview.c:261
 msgid "/_Tools/---"
 msgstr "/_Gereedschap/---"
 
-#: src/compose.c:590
+#: src/compose.c:669
 #, fuzzy
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/B_ewerken/Be_werken met externe editor"
 
-#: src/compose.c:594
+#: src/compose.c:673
 #, fuzzy
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Gereedschap/A_cties"
 
-#: src/compose.c:595
+#: src/compose.c:674
 #, fuzzy
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/Be_richt/Codeer"
 
-#: src/compose.c:800
+#: src/compose.c:879
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: bestand bestaat niet\n"
 
-#: src/compose.c:899 src/compose.c:958 src/procmsg.c:1303
+#: src/compose.c:978 src/compose.c:1037 src/procmsg.c:1303
 msgid "Can't get text part\n"
 msgstr "Kan tekstgedeelte niet ophalen\n"
 
-#: src/compose.c:1340
+#: src/compose.c:1419
 msgid "Quote mark format error."
 msgstr "Citeerteken opmaakfout."
 
-#: src/compose.c:1352
+#: src/compose.c:1431
 msgid "Message reply/forward format error."
 msgstr "Bericht beantwoorden/doorsturen opmaakfout."
 
-#: src/compose.c:1679
+#: src/compose.c:1758
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Bestand %s bestaat niet\n"
 
-#: src/compose.c:1683
+#: src/compose.c:1762
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Kan de bestandsgrootte niet bepalen van %s\n"
 
-#: src/compose.c:1687
+#: src/compose.c:1766
 #, c-format
 msgid "File %s is empty."
 msgstr "Bestand %s is leeg"
 
-#: src/compose.c:1691
+#: src/compose.c:1770
 #, c-format
 msgid "Can't read %s."
 msgstr "Kan %s niet inlezen."
 
-#: src/compose.c:1726
+#: src/compose.c:1805
 #, c-format
 msgid "Message: %s"
 msgstr "Bericht: %s"
 
-#: src/compose.c:1797 src/mimeview.c:491
+#: src/compose.c:1876 src/mimeview.c:491
 msgid "Can't get the part of multipart message."
 msgstr "Ik kan het deel van een meerdelig bericht niet ophalen."
 
-#: src/compose.c:2188
+#: src/compose.c:2267
 msgid " [Edited]"
 msgstr " [Aangepast]"
 
-#: src/compose.c:2190
+#: src/compose.c:2269
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - bericht opstellen%s"
 
-#: src/compose.c:2193
+#: src/compose.c:2272
 #, c-format
 msgid "Compose message%s"
 msgstr "Bericht opstellen%s"
 
-#: src/compose.c:2304
+#: src/compose.c:2383
 msgid "Recipient is not specified."
 msgstr "Ontvanger is niet gespecificeerd."
 
-#: src/compose.c:2312 src/compose.c:4112 src/mainwindow.c:2144
+#: src/compose.c:2391 src/compose.c:4213 src/mainwindow.c:2153
 #: src/prefs_account.c:703 src/prefs_common.c:850
 msgid "Send"
 msgstr "Verzenden"
 
-#: src/compose.c:2313
+#: src/compose.c:2392
 msgid "Subject is empty. Send it anyway?"
 msgstr "U heeft geen onderwerp ingevuld. Toch versturen?"
 
-#: src/compose.c:2364
+#: src/compose.c:2443
 msgid "can't get recipient list."
 msgstr "Kan geen ontvangerlijst opvragen."
 
-#: src/compose.c:2384
+#: src/compose.c:2463
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -968,26 +1086,26 @@ msgstr ""
 "Account voor het verzenden van email is niet gespecificeerd.\n"
 "Selecteer een account voordat u verzend."
 
-#: src/compose.c:2398 src/send_message.c:261
+#: src/compose.c:2477 src/send_message.c:261
 #, 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:2421
+#: src/compose.c:2500
 msgid "Can't save the message to outbox."
 msgstr "Het bericht kan niet opgeslagen worden in de outbox."
 
-#: src/compose.c:2457
+#: src/compose.c:2536
 #, 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:2518 src/compose.c:2739 src/compose.c:2802 src/compose.c:2921
+#: src/compose.c:2597 src/compose.c:2820 src/compose.c:2883 src/compose.c:3003
 #: src/utils.c:2189
 msgid "can't change file mode\n"
 msgstr "kan de bestandmodus niet veranderen\n"
 
-#: src/compose.c:2546
+#: src/compose.c:2627
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -997,140 +1115,140 @@ msgstr ""
 "%s naar %s.\n"
 "Toch versturen?"
 
-#: src/compose.c:2610
+#: src/compose.c:2691
 msgid "can't write headers\n"
 msgstr "kan geen headers schrijven\n"
 
-#: src/compose.c:2881
+#: src/compose.c:2963
 msgid "can't remove the old message\n"
 msgstr "kan het oude bericht niet verwijderen\n"
 
-#: src/compose.c:2899
+#: src/compose.c:2981
 msgid "queueing message...\n"
 msgstr "bericht wordt in de wachtrij geplaatst...\n"
 
-#: src/compose.c:2981
+#: src/compose.c:3063
 msgid "can't find queue folder\n"
 msgstr "kan de Wachtrij-map niet vinden\n"
 
-#: src/compose.c:2988
+#: src/compose.c:3070
 msgid "can't queue the message\n"
 msgstr "kan het bericht niet in de wachtrij plaatsen\n"
 
-#: src/compose.c:3547
+#: src/compose.c:3645
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "gegenereerd bericht-ID: %s\n"
 
-#: src/compose.c:3645
+#: src/compose.c:3743
 msgid "Creating compose window...\n"
 msgstr "Venster \"Bericht opstellen\" wordt aangemaakt...\n"
 
-#: src/compose.c:3648 src/compose.c:4598
+#: src/compose.c:3746 src/compose.c:4734
 msgid "MIME type"
 msgstr "MIME type"
 
 #. S_COL_DATE
-#: src/compose.c:3649 src/mimeview.c:150 src/prefs_filter_edit.c:569
+#: src/compose.c:3747 src/mimeview.c:150 src/prefs_filter_edit.c:569
 #: src/prefs_summary_column.c:73 src/select-keys.c:317 src/summaryview.c:386
 msgid "Size"
 msgstr "Grootte"
 
-#: src/compose.c:3700 src/headerview.c:53 src/summary_search.c:169
+#: src/compose.c:3798 src/headerview.c:53 src/summary_search.c:169
 msgid "From:"
 msgstr "Afzender:"
 
-#: src/compose.c:4113
+#: src/compose.c:4214
 msgid "Send message"
 msgstr "Verzend bericht"
 
-#: src/compose.c:4121
+#: src/compose.c:4222
 msgid "Send later"
 msgstr "Wachtrij"
 
-#: src/compose.c:4122
+#: src/compose.c:4223
 msgid "Put into queue folder and send later"
 msgstr "In de wachtrij plaatsen en later verzenden"
 
-#: src/compose.c:4130
+#: src/compose.c:4231
 msgid "Draft"
 msgstr "Klad"
 
-#: src/compose.c:4131
+#: src/compose.c:4232
 msgid "Save to draft folder"
 msgstr "Opslaan als klad"
 
-#: src/compose.c:4141 src/compose.c:5382
+#: src/compose.c:4242 src/compose.c:5527
 msgid "Insert"
 msgstr "Invoegen"
 
-#: src/compose.c:4142
+#: src/compose.c:4243
 msgid "Insert file"
 msgstr "Bestand invoegen"
 
-#: src/compose.c:4150
+#: src/compose.c:4251
 msgid "Attach"
 msgstr "Bijvoegen"
 
-#: src/compose.c:4151
+#: src/compose.c:4252
 msgid "Attach file"
 msgstr "Bestand bijvoegen"
 
 #. signature
-#: src/compose.c:4161 src/prefs_account.c:1339 src/prefs_common.c:1261
+#: src/compose.c:4262 src/prefs_account.c:1339 src/prefs_common.c:1273
 msgid "Signature"
 msgstr "Tekenen"
 
-#: src/compose.c:4162
+#: src/compose.c:4263
 msgid "Insert signature"
 msgstr "Handtekening (signature) invoegen"
 
-#: src/compose.c:4171 src/prefs_common.c:1283 src/prefs_common.c:2165
+#: src/compose.c:4272 src/prefs_common.c:1295 src/prefs_common.c:2177
 msgid "Editor"
 msgstr "Editor"
 
-#: src/compose.c:4172
+#: src/compose.c:4273
 msgid "Edit with external editor"
 msgstr "Bewerken met ander (extern) programma"
 
-#: src/compose.c:4180
+#: src/compose.c:4281
 msgid "Linewrap"
 msgstr "Terugloop"
 
-#: src/compose.c:4181
+#: src/compose.c:4282
 msgid "Wrap all long lines"
 msgstr "Lange regels op meerdere regels zetten"
 
-#: src/compose.c:4492
+#: src/compose.c:4628
 msgid "Invalid MIME type."
 msgstr "Ongeldig MIME type."
 
-#: src/compose.c:4511
+#: src/compose.c:4647
 msgid "File doesn't exist or is empty."
 msgstr "Bestand bestaat niet of is leeg."
 
-#: src/compose.c:4580
+#: src/compose.c:4716
 msgid "Properties"
 msgstr "Eigenschappen"
 
-#: src/compose.c:4600
+#: src/compose.c:4736
 msgid "Encoding"
 msgstr "Codering"
 
-#: src/compose.c:4623 src/prefs_folder_item.c:183
+#: src/compose.c:4759 src/prefs_folder_item.c:183
 msgid "Path"
 msgstr "Pad"
 
-#: src/compose.c:4624
+#: src/compose.c:4760
 msgid "File name"
 msgstr "Bestandsnaam"
 
-#: src/compose.c:4778
+#: src/compose.c:4914
 #, 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:4804
+#: src/compose.c:4940
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1141,72 +1259,72 @@ msgstr ""
 "Zal ik het programma afbreken?\n"
 "procesgroep id: %d"
 
-#: src/compose.c:4817
+#: src/compose.c:4953
 #, c-format
 msgid "Terminated process group id: %d"
 msgstr "Programma (id: %d) afgebroken."
 
-#: src/compose.c:4818
+#: src/compose.c:4954
 #, c-format
 msgid "Temporary file: %s"
 msgstr "Tijdelijk bestand: %s"
 
-#: src/compose.c:4842
+#: src/compose.c:4978
 msgid "Compose: input from monitoring process\n"
 msgstr "Opstellen: invoer van \"monitoring process\"\n"
 
 #. failed
-#: src/compose.c:4875
+#: src/compose.c:5011
 msgid "Couldn't exec external editor\n"
 msgstr "Kon het externe programma voor bewerken van e-mail niet aanroepen\n"
 
-#: src/compose.c:4879
+#: src/compose.c:5015
 msgid "Couldn't write to file\n"
 msgstr "Kon niet naar bestand schrijven\n"
 
-#: src/compose.c:4881
+#: src/compose.c:5017
 msgid "Pipe read failed\n"
 msgstr "Inlezen van pijp mislukt\n"
 
-#: src/compose.c:5182 src/compose.c:5190 src/compose.c:5196
+#: src/compose.c:5318 src/compose.c:5326 src/compose.c:5332
 msgid "Can't queue the message."
 msgstr "Kan bericht niet in de wachtrij plaatsen."
 
-#: src/compose.c:5287
+#: src/compose.c:5423
 #, fuzzy
 msgid "Select files"
 msgstr "Selecteer bestand"
 
-#: src/compose.c:5309
+#: src/compose.c:5445
 msgid "Select file"
 msgstr "Selecteer bestand"
 
-#: src/compose.c:5344
+#: src/compose.c:5480
 msgid "Discard message"
 msgstr "Gooi bericht weg"
 
-#: src/compose.c:5345
+#: src/compose.c:5481
 msgid "This message has been modified. discard it?"
 msgstr "Dit bericht is aangepast. weggooien?"
 
-#: src/compose.c:5346
+#: src/compose.c:5482
 msgid "Discard"
 msgstr "Gooi weg"
 
-#: src/compose.c:5346
+#: src/compose.c:5482
 msgid "to Draft"
 msgstr "opslaan als klad"
 
-#: src/compose.c:5379
+#: src/compose.c:5524
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Wilt u het sjabloon '%s' toepassen?"
 
-#: src/compose.c:5381
+#: src/compose.c:5526
 msgid "Apply template"
 msgstr "Sjabloon toepassen"
 
-#: src/compose.c:5382
+#: src/compose.c:5527
 msgid "Replace"
 msgstr "Vervangen"
 
@@ -1649,12 +1767,12 @@ msgstr "Mapinfo wordt ingesteld...\n"
 msgid "Setting folder info..."
 msgstr "Mapinfo wordt ingesteld..."
 
-#: src/folderview.c:652 src/mainwindow.c:3190 src/setup.c:81
+#: src/folderview.c:652 src/mainwindow.c:3199 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Bezig met inlezen van map %s%c%s ..."
 
-#: src/folderview.c:656 src/mainwindow.c:3195 src/setup.c:86
+#: src/folderview.c:656 src/mainwindow.c:3204 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Bezig met inlezen van map %s ..."
@@ -2120,7 +2238,7 @@ msgstr "Importeer LDIF bestand in het adresboek"
 msgid "Prev"
 msgstr "Vorig"
 
-#: src/importldif.c:761 src/mainwindow.c:2230
+#: src/importldif.c:761 src/mainwindow.c:2239
 msgid "Next"
 msgstr "Volgende"
 
@@ -2577,7 +2695,8 @@ msgid "/_View/Separate f_older tree"
 msgstr "/B_eeld/Acc_ountlijst los"
 
 #: src/mainwindow.c:514
-msgid "/_View/Separate m_essage view"
+#, fuzzy
+msgid "/_View/Separate _message view"
 msgstr "/B_eeld/_Bericht los"
 
 #: src/mainwindow.c:516
@@ -2713,432 +2832,349 @@ msgstr "/B_eeld/_Ga naar/Volgende gelab_eld bericht"
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/B_eeld/_Ga naar/Andere _map..."
 
-#: src/mainwindow.c:568 src/mainwindow.c:575 src/messageview.c:150
-msgid "/_View/_Code set/---"
-msgstr "/B_eeld/Codering/---"
-
-#: src/mainwindow.c:572 src/messageview.c:154
-msgid "/_View/_Code set"
-msgstr "/B_eeld/Codering"
-
 #: src/mainwindow.c:573 src/messageview.c:155
-msgid "/_View/_Code set/_Auto detect"
+#, fuzzy
+msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/B_eeld/Codering/Automatisch"
 
-#: src/mainwindow.c:576 src/messageview.c:158
-msgid "/_View/_Code set/7bit ascii (US-ASC_II)"
-msgstr "/B_eeld/Codering/7bit ascii (US-ASC_II)"
-
-#: src/mainwindow.c:579 src/messageview.c:161
-msgid "/_View/_Code set/Unicode (_UTF-8)"
-msgstr "/B_eeld/Codering/Unicode (_UTF-8)"
-
-#: src/mainwindow.c:582 src/messageview.c:164
-msgid "/_View/_Code set/Western European (ISO-8859-_1)"
-msgstr "/B_eeld/Codering/Westeuropees (ISO-8859-_1)"
-
-#: src/mainwindow.c:584 src/messageview.c:166
-msgid "/_View/_Code set/Western European (ISO-8859-15)"
-msgstr "/B_eeld/_Codering/Westeuropees (ISO-8859-_1)"
-
-#: src/mainwindow.c:587 src/messageview.c:169
-msgid "/_View/_Code set/Central European (ISO-8859-_2)"
-msgstr "/B_eeld/_Codering/Centraaleuropees (ISO-8859-_2)"
-
-#: src/mainwindow.c:590 src/messageview.c:172
-msgid "/_View/_Code set/_Baltic (ISO-8859-13)"
-msgstr "/B_eeld/_Codering/Baltisch (ISO-8859-13)"
-
-#: src/mainwindow.c:592 src/messageview.c:174
-msgid "/_View/_Code set/Baltic (ISO-8859-_4)"
-msgstr "/B_eeld/_Codering/Baltisch (ISO-8859-_4)"
-
-#: src/mainwindow.c:595 src/messageview.c:177
-msgid "/_View/_Code set/Greek (ISO-8859-_7)"
-msgstr "/B_eeld/_Codering/Grieks (ISO-8859-_7)"
-
-#: src/mainwindow.c:598 src/messageview.c:180
-msgid "/_View/_Code set/Turkish (ISO-8859-_9)"
-msgstr "/B_eeld/_Codering/Turks (ISO-8859-_9)"
-
-#: src/mainwindow.c:601 src/messageview.c:183
-msgid "/_View/_Code set/Cyrillic (ISO-8859-_5)"
-msgstr "/B_eeld/_Codering/Cyrillisch (ISO-8859-_5)"
-
-#: src/mainwindow.c:603 src/messageview.c:185
-msgid "/_View/_Code set/Cyrillic (KOI8-_R)"
-msgstr "/B_eeld/_Codering/Cyrillisch (KOI8-_R)"
-
-#: src/mainwindow.c:605 src/messageview.c:187
+#: src/mainwindow.c:618 src/messageview.c:194
 #, fuzzy
-msgid "/_View/_Code set/Cyrillic (KOI8-U)"
-msgstr "/B_eeld/_Codering/Cyrillisch (KOI8-_R)"
-
-#: src/mainwindow.c:607 src/messageview.c:189
-msgid "/_View/_Code set/Cyrillic (Windows-1251)"
-msgstr "/B_eeld/_Codering/Cyrillisch (Windows-1251)"
-
-#: src/mainwindow.c:610 src/messageview.c:192
-msgid "/_View/_Code set/Japanese (ISO-2022-_JP)"
-msgstr "/B_eeld/_Codering/Japans (ISO-2022-_JP)"
-
-#: src/mainwindow.c:612 src/messageview.c:194
-msgid "/_View/_Code set/Japanese (ISO-2022-JP-2)"
+msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/B_eeld/_Codering/Japans (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:614 src/messageview.c:196
-msgid "/_View/_Code set/Japanese (_EUC-JP)"
+#: src/mainwindow.c:620 src/messageview.c:196
+#, fuzzy
+msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/B_eeld/_Codering/Japans (_EUC-JP)"
 
-#: src/mainwindow.c:616 src/messageview.c:198
-msgid "/_View/_Code set/Japanese (_Shift__JIS)"
+#: src/mainwindow.c:622 src/messageview.c:198
+#, fuzzy
+msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/B_eeld/_Codering/Japans (_Shift__JIS)"
 
-#: src/mainwindow.c:619 src/messageview.c:201
-msgid "/_View/_Code set/Simplified Chinese (_GB2312)"
-msgstr "/B_eeld/_Codering/Simpel Chinees (_GB2312)"
-
-#: src/mainwindow.c:621 src/messageview.c:203
-msgid "/_View/_Code set/Traditional Chinese (_Big5)"
-msgstr "/B_eeld/_Codering/Traditioneel Chinees (_Big5)"
-
-#: src/mainwindow.c:623 src/messageview.c:205
-msgid "/_View/_Code set/Traditional Chinese (EUC-_TW)"
-msgstr "/B_eeld/_Codering/Traditioneel Chinees (EUC-_TW)"
-
-#: src/mainwindow.c:625 src/messageview.c:207
-msgid "/_View/_Code set/Chinese (ISO-2022-_CN)"
+#: src/mainwindow.c:632 src/messageview.c:207
+#, fuzzy
+msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/B_eeld/_Codering/Chinees (ISO-2022-_CN)"
 
-#: src/mainwindow.c:628 src/messageview.c:210
-msgid "/_View/_Code set/Korean (EUC-_KR)"
-msgstr "/B_eeld/_Codering/Koreaans (EUC-_KR)"
-
-#: src/mainwindow.c:630 src/messageview.c:212
-msgid "/_View/_Code set/Korean (ISO-2022-KR)"
+#: src/mainwindow.c:638 src/messageview.c:212
+#, fuzzy
+msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/B_eeld/_Codering/Koreaans (ISO-2022-KR)"
 
-#: src/mainwindow.c:633 src/messageview.c:215
-msgid "/_View/_Code set/Thai (TIS-620)"
-msgstr "/B_eeld/_Codering/Thais (TIS-620)"
-
-#: src/mainwindow.c:635 src/messageview.c:217
-msgid "/_View/_Code set/Thai (Windows-874)"
-msgstr "/B_eeld/_Codering/Thais (Windows-874)"
-
-#: src/mainwindow.c:642 src/summaryview.c:371
+#: src/mainwindow.c:651 src/summaryview.c:371
 msgid "/_View/Open in new _window"
 msgstr "/B_eeld/Open in _nieuw venster"
 
-#: src/mainwindow.c:643 src/messageview.c:224
+#: src/mainwindow.c:652 src/messageview.c:224
 msgid "/_View/Mess_age source"
 msgstr "/B_eeld/Bekijk _broncode"
 
-#: src/mainwindow.c:644 src/messageview.c:225
+#: src/mainwindow.c:653 src/messageview.c:225
 msgid "/_View/Show all _header"
 msgstr "/B_eeld/Vo_lledige header"
 
-#: src/mainwindow.c:646
+#: src/mainwindow.c:655
 msgid "/_View/_Update summary"
 msgstr "/B_eeld/_Verversen"
 
-#: src/mainwindow.c:648 src/messageview.c:227
+#: src/mainwindow.c:657 src/messageview.c:227
 msgid "/_Message"
 msgstr "/Be_richt"
 
-#: src/mainwindow.c:649
+#: src/mainwindow.c:658
 #, fuzzy
 msgid "/_Message/Recei_ve"
 msgstr "/Be_richt/Bewerken"
 
-#: src/mainwindow.c:650
+#: src/mainwindow.c:659
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/Be_richt/_Alle e-mail ophalen"
 
-#: src/mainwindow.c:652
+#: src/mainwindow.c:661
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/Be_richt/_Alle e-mail ophalen"
 
-#: src/mainwindow.c:654
+#: src/mainwindow.c:663
 #, fuzzy
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/Be_richt/Ontvangen af_breken"
 
-#: src/mainwindow.c:656
+#: src/mainwindow.c:665
 #, fuzzy
 msgid "/_Message/Recei_ve/---"
 msgstr "/Be_richt/Bewerken"
 
-#: src/mainwindow.c:657
+#: src/mainwindow.c:666
 msgid "/_Message/_Send queued messages"
 msgstr "/Be_richt/Berichten uit wachtrij verzenden"
 
-#: src/mainwindow.c:658 src/mainwindow.c:660 src/mainwindow.c:667
-#: src/mainwindow.c:672 src/mainwindow.c:676 src/mainwindow.c:685
+#: src/mainwindow.c:667 src/mainwindow.c:669 src/mainwindow.c:676
+#: src/mainwindow.c:681 src/mainwindow.c:685 src/mainwindow.c:694
 #: src/messageview.c:230 src/messageview.c:238 src/messageview.c:243
 msgid "/_Message/---"
 msgstr "/Be_richt/---"
 
-#: src/mainwindow.c:659 src/messageview.c:228
+#: src/mainwindow.c:668 src/messageview.c:228
 msgid "/_Message/Compose _new message"
 msgstr "/Be_richt/_Nieuw bericht opstellen"
 
-#: src/mainwindow.c:661 src/messageview.c:231
+#: src/mainwindow.c:670 src/messageview.c:231
 msgid "/_Message/_Reply"
 msgstr "/Be_richt/_Beantwoorden"
 
-#: src/mainwindow.c:662
+#: src/mainwindow.c:671
 msgid "/_Message/Repl_y to"
 msgstr "/Be_richt/Antwoord _sturen aan"
 
-#: src/mainwindow.c:663 src/messageview.c:232
+#: src/mainwindow.c:672 src/messageview.c:232
 msgid "/_Message/Repl_y to/_all"
 msgstr "/Be_richt/Antwoord _sturen aan/_iedereen"
 
-#: src/mainwindow.c:664 src/messageview.c:234
+#: src/mainwindow.c:673 src/messageview.c:234
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/Be_richt/Antwoord _sturen aan/_afzender"
 
-#: src/mainwindow.c:665 src/messageview.c:236
+#: src/mainwindow.c:674 src/messageview.c:236
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/Be_richt/Antwoord _sturen aan/_mailinglijst"
 
-#: src/mainwindow.c:668 src/messageview.c:239
+#: src/mainwindow.c:677 src/messageview.c:239
 msgid "/_Message/_Forward"
 msgstr "/Be_richt/_Doorsturen"
 
-#: src/mainwindow.c:669 src/messageview.c:240
+#: src/mainwindow.c:678 src/messageview.c:240
 msgid "/_Message/For_ward as attachment"
 msgstr "/Be_richt/Doorsturen als bij_voeging"
 
-#: src/mainwindow.c:671 src/messageview.c:242
+#: src/mainwindow.c:680 src/messageview.c:242
 msgid "/_Message/Redirec_t"
 msgstr "/Be_richt/Om_leiden"
 
-#: src/mainwindow.c:673
+#: src/mainwindow.c:682
 msgid "/_Message/M_ove..."
 msgstr "/Be_richt/_Verplaatsen..."
 
-#: src/mainwindow.c:674
+#: src/mainwindow.c:683
 msgid "/_Message/_Copy..."
 msgstr "/Be_richt/_Kopiëren..."
 
-#: src/mainwindow.c:675
+#: src/mainwindow.c:684
 msgid "/_Message/_Delete"
 msgstr "/Be_richt/Ver_wijderen"
 
-#: src/mainwindow.c:677
+#: src/mainwindow.c:686
 msgid "/_Message/_Mark"
 msgstr "/Be_richt/_Markeren"
 
-#: src/mainwindow.c:678
+#: src/mainwindow.c:687
 msgid "/_Message/_Mark/_Mark"
 msgstr "/Be_richt/_Markeren/_Markeren"
 
-#: src/mainwindow.c:679
+#: src/mainwindow.c:688
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/Be_richt/_Markeren/_Demarkeren"
 
-#: src/mainwindow.c:680
+#: src/mainwindow.c:689
 msgid "/_Message/_Mark/---"
 msgstr "/Be_richt/_Markeren/---"
 
-#: src/mainwindow.c:681
+#: src/mainwindow.c:690
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/Be_richt/_Markeren/Als _ongelezen"
 
-#: src/mainwindow.c:682
+#: src/mainwindow.c:691
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/Be_richt/_Markeren/Als _gelezen"
 
-#: src/mainwindow.c:684
+#: src/mainwindow.c:693
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/Be_richt/_Markeren/_Alles gelezen"
 
-#: src/mainwindow.c:686 src/messageview.c:244
+#: src/mainwindow.c:695 src/messageview.c:244
 msgid "/_Message/Re-_edit"
 msgstr "/Be_richt/Bewerken"
 
-#: src/mainwindow.c:690 src/messageview.c:248
+#: src/mainwindow.c:699 src/messageview.c:248
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/_Gereedschap/Af_zender toevoegen aan adresboek"
 
-#: src/mainwindow.c:693
+#: src/mainwindow.c:702
 #, fuzzy
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/_Gereedschap/Berichten _filteren"
 
-#: src/mainwindow.c:695
+#: src/mainwindow.c:704
 #, fuzzy
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Gereedschap/Berichten _filteren"
 
-#: src/mainwindow.c:697 src/messageview.c:251
+#: src/mainwindow.c:706 src/messageview.c:251
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Gereedschap/Filterregel _aanmaken"
 
-#: src/mainwindow.c:698 src/messageview.c:253
+#: src/mainwindow.c:707 src/messageview.c:253
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Gereedschap/_Creëer Filterregel/_Automatisch"
 
-#: src/mainwindow.c:700 src/messageview.c:255
+#: src/mainwindow.c:709 src/messageview.c:255
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Gereedschap/_Creëer filterregel/voor A_fzender"
 
-#: src/mainwindow.c:702 src/messageview.c:257
+#: src/mainwindow.c:711 src/messageview.c:257
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Gereedschap/_Creëer filterregel/voor _Geadresseerde"
 
-#: src/mainwindow.c:704 src/messageview.c:259
+#: src/mainwindow.c:713 src/messageview.c:259
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Gereedschap/_Creëer filterregel/voor _Onderwerp"
 
-#: src/mainwindow.c:709
+#: src/mainwindow.c:718
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/_Gereedschap/Du_bbele berichten verwijderen"
 
-#: src/mainwindow.c:712
+#: src/mainwindow.c:721
 msgid "/_Tools/E_xecute"
 msgstr "/_Gereedschap/_Uitvoeren"
 
-#: src/mainwindow.c:714
+#: src/mainwindow.c:723
 msgid "/_Tools/_Log window"
 msgstr "/_Gereedschap/_Logboek"
 
-#: src/mainwindow.c:716
+#: src/mainwindow.c:725
 msgid "/_Configuration"
 msgstr "/_Instellingen"
 
-#: src/mainwindow.c:717
+#: src/mainwindow.c:726
 msgid "/_Configuration/_Common preferences..."
 msgstr "/_Instellingen/Algemene voorkeuren..."
 
-#: src/mainwindow.c:719
+#: src/mainwindow.c:728
 msgid "/_Configuration/_Filter setting..."
 msgstr "/_Instellingen/_Filterbeheer..."
 
-#: src/mainwindow.c:721
+#: src/mainwindow.c:730
 msgid "/_Configuration/_Template..."
 msgstr "/_Instellingen/_Sjabloonbeheer..."
 
-#: src/mainwindow.c:722
+#: src/mainwindow.c:731
 msgid "/_Configuration/_Actions..."
 msgstr "/_Instellingen/A_cties..."
 
-#: src/mainwindow.c:723
+#: src/mainwindow.c:732
 msgid "/_Configuration/---"
 msgstr "/_Instellingen/---"
 
-#: src/mainwindow.c:724
+#: src/mainwindow.c:733
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Instellingen/Accountvoorkeuren..."
 
-#: src/mainwindow.c:726
+#: src/mainwindow.c:735
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Instellingen/Nieuw account aanmaken..."
 
-#: src/mainwindow.c:728
+#: src/mainwindow.c:737
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Instellingen/Accountbeheer..."
 
-#: src/mainwindow.c:730
+#: src/mainwindow.c:739
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Instellingen/Huidig account veranderen"
 
-#: src/mainwindow.c:734
+#: src/mainwindow.c:743
 msgid "/_Help/_Manual"
 msgstr "/_Hulp/_Handboek"
 
-#: src/mainwindow.c:735
+#: src/mainwindow.c:744
 msgid "/_Help/_Manual/_English"
 msgstr "/_Hulp/_Handboek/_Engels"
 
-#: src/mainwindow.c:736
+#: src/mainwindow.c:745
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/_Hulp/_Handboek/_Japans"
 
-#: src/mainwindow.c:737
+#: src/mainwindow.c:746
 msgid "/_Help/_FAQ"
 msgstr "/_Hulp/_FAQ"
 
-#: src/mainwindow.c:738
+#: src/mainwindow.c:747
 msgid "/_Help/_FAQ/_English"
 msgstr "/_Hulp/_FAQ/_Engels"
 
-#: src/mainwindow.c:739
+#: src/mainwindow.c:748
 msgid "/_Help/_FAQ/_German"
 msgstr "/_Hulp/_FAQ/_Duits"
 
-#: src/mainwindow.c:740
+#: src/mainwindow.c:749
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/_Hulp/_FAQ/_Spaans"
 
-#: src/mainwindow.c:741
+#: src/mainwindow.c:750
 msgid "/_Help/_FAQ/_French"
 msgstr "/_Hulp/_FAQ/_Frans"
 
-#: src/mainwindow.c:742
+#: src/mainwindow.c:751
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/_Hulp/_FAQ/_Italiaans"
 
-#: src/mainwindow.c:743
+#: src/mainwindow.c:752
 msgid "/_Help/---"
 msgstr "/_Hulp/---"
 
-#: src/mainwindow.c:783
+#: src/mainwindow.c:792
 msgid "Creating main window...\n"
 msgstr "Hoofdvenster wordt aangemaakt...\n"
 
-#: src/mainwindow.c:943
+#: src/mainwindow.c:952
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "HoofdVenster: kleur %d kon niet gealloceerd worden\n"
 
-#: src/mainwindow.c:1021 src/summaryview.c:1368 src/summaryview.c:1677
+#: src/mainwindow.c:1030 src/summaryview.c:1368 src/summaryview.c:1677
 #: src/summaryview.c:1785 src/summaryview.c:1831 src/summaryview.c:2453
 #: src/summaryview.c:3080 src/summaryview.c:3146 src/summaryview.c:3171
 #: src/summaryview.c:3284
 msgid "done.\n"
 msgstr "klaar.\n"
 
-#: src/mainwindow.c:1137 src/mainwindow.c:1178 src/mainwindow.c:1206
+#: src/mainwindow.c:1146 src/mainwindow.c:1187 src/mainwindow.c:1215
 msgid "Untitled"
 msgstr "Geen titel"
 
-#: src/mainwindow.c:1207
+#: src/mainwindow.c:1216
 msgid "none"
 msgstr "niets"
 
-#: src/mainwindow.c:1257
+#: src/mainwindow.c:1266
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "Vensterscheidingstype wordt gewijzigd van %d naar %d\n"
 
-#: src/mainwindow.c:1477
+#: src/mainwindow.c:1486
 msgid "Offline"
 msgstr ""
 
-#: src/mainwindow.c:1478
+#: src/mainwindow.c:1487
 msgid "You are offline. Go online?"
 msgstr ""
 
-#: src/mainwindow.c:1492
+#: src/mainwindow.c:1501
 #, fuzzy
 msgid "Empty all trash"
 msgstr "Prullenbak leegmaken"
 
-#: src/mainwindow.c:1493
+#: src/mainwindow.c:1502
 #, fuzzy
 msgid "Empty messages in all trash?"
 msgstr "Alle berichten uit de prullenbak weggooien?"
 
-#: src/mainwindow.c:1521
+#: src/mainwindow.c:1530
 msgid "Add mailbox"
 msgstr "Mailbox toevoegen"
 
-#: src/mainwindow.c:1522
+#: src/mainwindow.c:1531
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3148,16 +3184,16 @@ msgstr ""
 "Als een bestaande mailbox wordt ingevuld,\n"
 "dan wordt hij automatisch gescand."
 
-#: src/mainwindow.c:1528
+#: src/mainwindow.c:1537
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "De mailbox '%s' bestaat al."
 
-#: src/mainwindow.c:1533 src/setup.c:57
+#: src/mainwindow.c:1542 src/setup.c:57
 msgid "Mailbox"
 msgstr "Mailbox"
 
-#: src/mainwindow.c:1539 src/setup.c:63
+#: src/mainwindow.c:1548 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3167,144 +3203,144 @@ msgstr ""
 "Misschien bestaan er al wat bestanden, of heb je geen toestemming om er te "
 "schrijven."
 
-#: src/mainwindow.c:1912
+#: src/mainwindow.c:1921
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Mappenoverzicht"
 
-#: src/mainwindow.c:1932 src/messageview.c:358
+#: src/mainwindow.c:1941 src/messageview.c:358
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Berichtenoverzicht"
 
-#: src/mainwindow.c:2079 src/summaryview.c:340
+#: src/mainwindow.c:2088 src/summaryview.c:340
 msgid "/_Reply"
 msgstr "/_Antwoord"
 
-#: src/mainwindow.c:2080
+#: src/mainwindow.c:2089
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "Bericht naar iedereen terugsturen."
 
-#: src/mainwindow.c:2081
+#: src/mainwindow.c:2090
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/Ant_woord sturen aan/_afzender"
 
-#: src/mainwindow.c:2082
+#: src/mainwindow.c:2091
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/Ant_woord sturen aan/_mailinglijst"
 
-#: src/mainwindow.c:2087 src/summaryview.c:347
+#: src/mainwindow.c:2096 src/summaryview.c:347
 msgid "/_Forward"
 msgstr "/D_oorsturen"
 
-#: src/mainwindow.c:2088 src/summaryview.c:348
+#: src/mainwindow.c:2097 src/summaryview.c:348
 msgid "/For_ward as attachment"
 msgstr "/Doorsturen als _bijvoeging"
 
-#: src/mainwindow.c:2089 src/summaryview.c:349
+#: src/mainwindow.c:2098 src/summaryview.c:349
 msgid "/Redirec_t"
 msgstr "/_Omleiden"
 
-#: src/mainwindow.c:2125
+#: src/mainwindow.c:2134
 msgid "Get"
 msgstr "Ophalen"
 
-#: src/mainwindow.c:2126
+#: src/mainwindow.c:2135
 msgid "Incorporate new mail"
 msgstr "E-mail ophalen en in de lijst zetten."
 
-#: src/mainwindow.c:2133
+#: src/mainwindow.c:2142
 msgid "Get all"
 msgstr "Alles oph."
 
-#: src/mainwindow.c:2134
+#: src/mainwindow.c:2143
 msgid "Incorporate new mail of all accounts"
 msgstr "E-mail van alle accounts ophalen en in de lijsten zetten"
 
-#: src/mainwindow.c:2145
+#: src/mainwindow.c:2154
 msgid "Send queued message(s)"
 msgstr "Verzend berichten uit de wachtrij"
 
-#: src/mainwindow.c:2155 src/prefs_account.c:705 src/prefs_common.c:852
+#: src/mainwindow.c:2164 src/prefs_account.c:705 src/prefs_common.c:852
 #: src/prefs_folder_item.c:137
 msgid "Compose"
 msgstr "Opstellen"
 
-#: src/mainwindow.c:2156
+#: src/mainwindow.c:2165
 msgid "Compose new message"
 msgstr "Nieuw bericht opstellen"
 
-#: src/mainwindow.c:2164 src/prefs_common.c:1353
+#: src/mainwindow.c:2173 src/prefs_common.c:1365
 msgid "Reply"
 msgstr "Antwoord"
 
-#: src/mainwindow.c:2165 src/mainwindow.c:2178
+#: src/mainwindow.c:2174 src/mainwindow.c:2187
 msgid "Reply to the message"
 msgstr "Stuur een bericht terug naar de afzender"
 
-#: src/mainwindow.c:2183
+#: src/mainwindow.c:2192
 msgid "Reply all"
 msgstr "Iedereen"
 
-#: src/mainwindow.c:2184
+#: src/mainwindow.c:2193
 msgid "Reply to all"
 msgstr "Bericht naar iedereen terugsturen."
 
-#: src/mainwindow.c:2192 src/prefs_filter_edit.c:719
+#: src/mainwindow.c:2201 src/prefs_filter_edit.c:719
 msgid "Forward"
 msgstr "Doorsturen"
 
-#: src/mainwindow.c:2193 src/mainwindow.c:2206
+#: src/mainwindow.c:2202 src/mainwindow.c:2215
 msgid "Forward the message"
 msgstr "Stuur dit bericht door"
 
-#: src/mainwindow.c:2213
+#: src/mainwindow.c:2222
 msgid "Delete the message"
 msgstr "Verwijder dit bericht"
 
-#: src/mainwindow.c:2221
+#: src/mainwindow.c:2230
 msgid "Execute"
 msgstr "Uitvoeren"
 
-#: src/mainwindow.c:2222
+#: src/mainwindow.c:2231
 msgid "Execute marked process"
 msgstr "Voer de gemarkeerde acties uit"
 
-#: src/mainwindow.c:2231
+#: src/mainwindow.c:2240
 msgid "Next unread message"
 msgstr "Volgende ongelezen"
 
-#: src/mainwindow.c:2242
+#: src/mainwindow.c:2251
 msgid "Prefs"
 msgstr "Voork."
 
-#: src/mainwindow.c:2243
+#: src/mainwindow.c:2252
 msgid "Common preferences"
 msgstr "Algemene voorkeuren"
 
-#: src/mainwindow.c:2250 src/prefs_folder_item.c:258
+#: src/mainwindow.c:2259 src/prefs_folder_item.c:258
 #: src/prefs_folder_item.c:269 src/progressdialog.c:50
 msgid "Account"
 msgstr "Account"
 
-#: src/mainwindow.c:2251
+#: src/mainwindow.c:2260
 msgid "Account setting"
 msgstr "Accountinstellingen"
 
-#: src/mainwindow.c:2425
+#: src/mainwindow.c:2434
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 
-#: src/mainwindow.c:2436
+#: src/mainwindow.c:2445
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 
-#: src/mainwindow.c:2624
+#: src/mainwindow.c:2633
 msgid "Exit"
 msgstr "Afsluiten"
 
-#: src/mainwindow.c:2624
+#: src/mainwindow.c:2633
 msgid "Exit this program?"
 msgstr "Sylpheed afsluiten?"
 
@@ -3430,7 +3466,7 @@ msgstr "Zoeken voltooid"
 msgid "Creating message view...\n"
 msgstr "Berichtview wordt gemaakt...\n"
 
-#: src/messageview.c:303 src/prefs_common.c:1550
+#: src/messageview.c:303 src/prefs_common.c:1562
 msgid "Text"
 msgstr "Tekst"
 
@@ -3443,7 +3479,7 @@ msgstr "Bijvoegingen"
 msgid "Can't save the file `%s'."
 msgstr "Kan het bestand '%s' niet opslaan."
 
-#: src/messageview.c:697 src/prefs_common.c:2154 src/summaryview.c:2744
+#: src/messageview.c:697 src/prefs_common.c:2166 src/summaryview.c:2744
 msgid "Print"
 msgstr "Afdrukken"
 
@@ -3920,7 +3956,7 @@ msgstr "(Ongefilterde berichten zullen hier opgeslagen worden)"
 msgid "Authentication method"
 msgstr "Identificatiemethode"
 
-#: src/prefs_account.c:1123 src/prefs_account.c:1239 src/prefs_common.c:1189
+#: src/prefs_account.c:1123 src/prefs_account.c:1239 src/prefs_common.c:1201
 msgid "Automatic"
 msgstr "Automatisch"
 
@@ -3944,7 +3980,7 @@ msgstr "Bericht-ID aanmaken"
 msgid "Add user-defined header"
 msgstr "Voeg een door de gebruiker gespecificeerde header toe"
 
-#: src/prefs_account.c:1196 src/prefs_common.c:1714 src/prefs_common.c:1739
+#: src/prefs_account.c:1196 src/prefs_common.c:1726 src/prefs_common.c:1751
 msgid " Edit... "
 msgstr "Bewerken"
 
@@ -4339,106 +4375,107 @@ msgid "Save sent messages to outbox"
 msgstr "Verzonden berichten opslaan in de outbox"
 
 #: src/prefs_common.c:1113
-msgid "Outgoing codeset"
+#, fuzzy
+msgid "Outgoing encoding"
 msgstr "Codering voor uitgaande berichten"
 
 #: src/prefs_common.c:1128
 msgid "Automatic (Recommended)"
 msgstr "Automatisch (aanbevolen)"
 
-#: src/prefs_common.c:1129
+#: src/prefs_common.c:1130
 msgid "7bit ascii (US-ASCII)"
 msgstr "7bit ascii (US-ASCII)"
 
-#: src/prefs_common.c:1130
+#: src/prefs_common.c:1132
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
-#: src/prefs_common.c:1131
+#: src/prefs_common.c:1134
 msgid "Western European (ISO-8859-1)"
 msgstr "Westeuropees (ISO-8859-1)"
 
-#: src/prefs_common.c:1132
+#: src/prefs_common.c:1135
 msgid "Western European (ISO-8859-15)"
 msgstr "Westeuropees (ISO-8859-15)"
 
-#: src/prefs_common.c:1133
+#: src/prefs_common.c:1137
 msgid "Central European (ISO-8859-2)"
 msgstr "Centraaleuropees (ISO-8859-2)"
 
-#: src/prefs_common.c:1134
+#: src/prefs_common.c:1139
 msgid "Baltic (ISO-8859-13)"
 msgstr "Baltisch (ISO-8859-13)"
 
-#: src/prefs_common.c:1135
+#: src/prefs_common.c:1140
 msgid "Baltic (ISO-8859-4)"
 msgstr "Baltisch (ISO-8859-4)"
 
-#: src/prefs_common.c:1136
+#: src/prefs_common.c:1142
 msgid "Greek (ISO-8859-7)"
 msgstr "Grieks (ISO-8859-7)"
 
-#: src/prefs_common.c:1137
+#: src/prefs_common.c:1144
 msgid "Turkish (ISO-8859-9)"
 msgstr "Turks (ISO-8859-9)"
 
-#: src/prefs_common.c:1138
+#: src/prefs_common.c:1146
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Cyrillisch (ISO-8859-5)"
 
-#: src/prefs_common.c:1139
+#: src/prefs_common.c:1147
 msgid "Cyrillic (KOI8-R)"
 msgstr "Cyrillisch (KOI8-R)"
 
-#: src/prefs_common.c:1140
-msgid "Cyrillic (Windows-1251)"
-msgstr "Cyrillisch (Windows-1251)"
-
-#: src/prefs_common.c:1141
+#: src/prefs_common.c:1148
 msgid "Cyrillic (KOI8-U)"
 msgstr "Cyrillisch (KOI8-U)"
 
-#: src/prefs_common.c:1142
+#: src/prefs_common.c:1149
+msgid "Cyrillic (Windows-1251)"
+msgstr "Cyrillisch (Windows-1251)"
+
+#: src/prefs_common.c:1151
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Japans (ISO-2022-JP)"
 
-#: src/prefs_common.c:1144
+#: src/prefs_common.c:1153
 msgid "Japanese (EUC-JP)"
 msgstr "Japans (EUC-JP)"
 
-#: src/prefs_common.c:1145
+#: src/prefs_common.c:1154
 msgid "Japanese (Shift_JIS)"
 msgstr "Japans (Shift_JIS)"
 
-#: src/prefs_common.c:1147
+#: src/prefs_common.c:1157
 msgid "Simplified Chinese (GB2312)"
 msgstr "Vereenvoudigd Chinees (GB2312)"
 
-#: src/prefs_common.c:1148
+#: src/prefs_common.c:1158
 msgid "Traditional Chinese (Big5)"
 msgstr "Traditioneel Chinees (Big5)"
 
-#: src/prefs_common.c:1150
+#: src/prefs_common.c:1160
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Traditioneel Chinees (EUC-TW)"
 
-#: src/prefs_common.c:1151
+#: src/prefs_common.c:1161
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Chinees (ISO-2022-CN)"
 
-#: src/prefs_common.c:1153
+#: src/prefs_common.c:1164
 msgid "Korean (EUC-KR)"
 msgstr "Koreaans (EUC-KR)"
 
-#: src/prefs_common.c:1154
+#: src/prefs_common.c:1166
 msgid "Thai (TIS-620)"
 msgstr "Thais (TIS-620)"
 
-#: src/prefs_common.c:1155
+#: src/prefs_common.c:1167
 msgid "Thai (Windows-874)"
 msgstr "Thais (Windows-874)"
 
-#: src/prefs_common.c:1165
+#: src/prefs_common.c:1177
 #, fuzzy
 msgid ""
 "If `Automatic' is selected, the optimal encoding for the current locale will "
@@ -4447,11 +4484,11 @@ msgstr ""
 "Als 'Automatisch' is geselecteerd, wordt de meest\n"
 "optimale codering voor de huidige locale gebruikt."
 
-#: src/prefs_common.c:1179
+#: src/prefs_common.c:1191
 msgid "Transfer encoding"
 msgstr "Berichtcodering"
 
-#: src/prefs_common.c:1202
+#: src/prefs_common.c:1214
 #, fuzzy
 msgid ""
 "Specify Content-Transfer-Encoding used when message body contains non-ASCII "
@@ -4460,119 +4497,119 @@ msgstr ""
 "Geef de Content-Transfer-Encoding die gebruikt wordt om\n"
 "het bericht te coderen wanneer deze non-ASCII tekens bevat."
 
-#: src/prefs_common.c:1272
+#: src/prefs_common.c:1284
 msgid "Signature separator"
 msgstr "Handtekening scheidingsteken"
 
-#: src/prefs_common.c:1281
+#: src/prefs_common.c:1293
 msgid "Insert automatically"
 msgstr "Automatisch invoegen"
 
-#: src/prefs_common.c:1291
+#: src/prefs_common.c:1303
 msgid "Automatically launch the external editor"
 msgstr "Automatisch extern programma starten voor bewerken van e-mail bericht"
 
-#: src/prefs_common.c:1301
+#: src/prefs_common.c:1313
 msgid "Undo level"
 msgstr "niveau van ongedaan maken"
 
-#: src/prefs_common.c:1321
+#: src/prefs_common.c:1333
 msgid "Wrap messages at"
 msgstr "Regelterugloop na:"
 
-#: src/prefs_common.c:1333
+#: src/prefs_common.c:1345
 msgid "characters"
 msgstr "tekens"
 
-#: src/prefs_common.c:1343
+#: src/prefs_common.c:1355
 msgid "Wrap quotation"
 msgstr "Regelterugloop gebruiken bij citeren"
 
-#: src/prefs_common.c:1349
+#: src/prefs_common.c:1361
 msgid "Wrap on input"
 msgstr "Regelterugloop tijdens invoer"
 
-#: src/prefs_common.c:1351
+#: src/prefs_common.c:1363
 msgid "Wrap before sending"
 msgstr "Regelterugloop activeren bij het verzenden"
 
-#: src/prefs_common.c:1361
+#: src/prefs_common.c:1373
 msgid "Automatically select account for replies"
 msgstr "Account automatisch selecteren voor beantwoorden"
 
-#: src/prefs_common.c:1363
+#: src/prefs_common.c:1375
 msgid "Quote message when replying"
 msgstr "Originele bericht citeren bij beantwoorden"
 
-#: src/prefs_common.c:1365
+#: src/prefs_common.c:1377
 msgid "Reply button invokes mailing list reply"
 msgstr "Antwoorden roept de functie 'Mailinglijst beantwoorden' aan"
 
 #. reply
-#: src/prefs_common.c:1411
+#: src/prefs_common.c:1423
 msgid "Reply format"
 msgstr "Antwoordopmaak"
 
-#: src/prefs_common.c:1426 src/prefs_common.c:1468
+#: src/prefs_common.c:1438 src/prefs_common.c:1480
 msgid "Quotation mark"
 msgstr "Citeerteken"
 
 #. forward
-#: src/prefs_common.c:1453
+#: src/prefs_common.c:1465
 msgid "Forward format"
 msgstr "Doorstuuropmaak"
 
-#: src/prefs_common.c:1500
+#: src/prefs_common.c:1512
 msgid " Description of symbols "
 msgstr " Beschrijving der symbolen"
 
-#: src/prefs_common.c:1541
+#: src/prefs_common.c:1553
 msgid "Font"
 msgstr "Lettertype"
 
-#: src/prefs_common.c:1573
+#: src/prefs_common.c:1585
 msgid "Translate header name (such as `From:', `Subject:')"
 msgstr "Headervelden vertalen (zoals 'From:', 'Subject:')"
 
-#: src/prefs_common.c:1576
+#: src/prefs_common.c:1588
 msgid "Display unread number next to folder name"
 msgstr "Aantal ongelezen berichten weergeven naast mapnaam"
 
-#: src/prefs_common.c:1585
+#: src/prefs_common.c:1597
 msgid "Abbreviate newsgroups longer than"
 msgstr "Nieuwsgroepen inkorten die langer zijn dan"
 
-#: src/prefs_common.c:1600
+#: src/prefs_common.c:1612
 msgid "letters"
 msgstr "brieven"
 
 #. ---- Summary ----
-#: src/prefs_common.c:1606
+#: src/prefs_common.c:1618
 msgid "Summary View"
 msgstr "Berichtenlijst"
 
-#: src/prefs_common.c:1615
+#: src/prefs_common.c:1627
 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.c:1617
+#: src/prefs_common.c:1629
 msgid "Expand threads"
 msgstr "Discussies uitklappen"
 
-#: src/prefs_common.c:1625 src/prefs_common.c:2443 src/prefs_common.c:2481
+#: src/prefs_common.c:1637 src/prefs_common.c:2455 src/prefs_common.c:2493
 msgid "Date format"
 msgstr "Datumopmaak"
 
-#: src/prefs_common.c:1646
+#: src/prefs_common.c:1658
 msgid " Set display item of summary... "
 msgstr "Kies kolommen voor berichtenlijst..."
 
-#: src/prefs_common.c:1710
+#: src/prefs_common.c:1722
 msgid "Enable coloration of message"
 msgstr "Kleurmarkering in berichten aanzetten"
 
-#: src/prefs_common.c:1724
+#: src/prefs_common.c:1736
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
@@ -4580,327 +4617,327 @@ msgstr ""
 "Multi-byte tekens weergeven als ASCII tekens\n"
 "(alleen Japans)"
 
-#: src/prefs_common.c:1730
+#: src/prefs_common.c:1742
 msgid "Display header pane above message view"
 msgstr "Headerinformatie weergeven boven bericht"
 
-#: src/prefs_common.c:1737
+#: src/prefs_common.c:1749
 msgid "Display short headers on message view"
 msgstr "Korte headerinformatie weergeven boven bericht"
 
-#: src/prefs_common.c:1758
+#: src/prefs_common.c:1770
 msgid "Line space"
 msgstr "Regelafstand"
 
-#: src/prefs_common.c:1772 src/prefs_common.c:1810
+#: src/prefs_common.c:1784 src/prefs_common.c:1822
 msgid "pixel(s)"
 msgstr "pixel(s)"
 
-#: src/prefs_common.c:1777
+#: src/prefs_common.c:1789
 msgid "Scroll"
 msgstr "Schuiven"
 
-#: src/prefs_common.c:1784
+#: src/prefs_common.c:1796
 msgid "Half page"
 msgstr "Halve pagina"
 
-#: src/prefs_common.c:1790
+#: src/prefs_common.c:1802
 msgid "Smooth scroll"
 msgstr "Vloeiend schuiven"
 
-#: src/prefs_common.c:1796
+#: src/prefs_common.c:1808
 msgid "Step"
 msgstr "Stap"
 
-#: src/prefs_common.c:1816
+#: src/prefs_common.c:1828
 msgid "Images"
 msgstr ""
 
-#: src/prefs_common.c:1824
+#: src/prefs_common.c:1836
 #, fuzzy
 msgid "Resize attached large images to fit in the window"
 msgstr "Bijgevoegde afbeeldingen schalen"
 
-#: src/prefs_common.c:1826
+#: src/prefs_common.c:1838
 #, fuzzy
 msgid "Display images as inline"
 msgstr "Headerweergave instellingen"
 
-#: src/prefs_common.c:1871
+#: src/prefs_common.c:1883
 msgid "Automatically check signatures"
 msgstr "Controleer identificatiehandtekeningen automatisch"
 
-#: src/prefs_common.c:1874
+#: src/prefs_common.c:1886
 msgid "Show signature check result in a popup window"
 msgstr "Geef het resultaat van de controle weer in een popupvenster"
 
-#: src/prefs_common.c:1877
+#: src/prefs_common.c:1889
 msgid "Store passphrase in memory temporarily"
 msgstr "Wachtwoord tijdelijk in geheugen opslaan"
 
-#: src/prefs_common.c:1892
+#: src/prefs_common.c:1904
 msgid "Expired after"
 msgstr "Verloopt na"
 
-#: src/prefs_common.c:1905
+#: src/prefs_common.c:1917
 msgid "minute(s) "
 msgstr "minuten"
 
-#: src/prefs_common.c:1918
+#: src/prefs_common.c:1930
 #, fuzzy
 msgid "Setting to '0' will store the passphrase for the whole session."
 msgstr ""
 "(Instellen op '0' zal het wachtwoord tot het\n"
 " einde bam de sessie opslaan)"
 
-#: src/prefs_common.c:1932
+#: src/prefs_common.c:1944
 msgid "Grab input while entering a passphrase"
 msgstr "Toetsenbord vasthouden tijdens het intikken van het wachtwoord"
 
-#: src/prefs_common.c:1937
+#: src/prefs_common.c:1949
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "Waarschuw mij wanneer GnuPG bij het opstarten niet werkt"
 
-#: src/prefs_common.c:1989
+#: src/prefs_common.c:2001
 #, fuzzy
 msgid "Always open messages in summary when selected"
 msgstr "Geen berichtsbestand geselecteerd."
 
-#: src/prefs_common.c:1993
+#: src/prefs_common.c:2005
 msgid "Open first unread message when entering a folder"
 msgstr "Het eerste ongelezen e-mailtje openen wanneer een map geopend wordt"
 
-#: src/prefs_common.c:1997
+#: src/prefs_common.c:2009
 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.c:2001
+#: src/prefs_common.c:2013
 msgid "Go to inbox after receiving new mail"
 msgstr "Ga naar de inbox na het ophalen van nieuwe e-mail"
 
-#: src/prefs_common.c:2009
+#: src/prefs_common.c:2021
 msgid "Execute immediately when moving or deleting messages"
 msgstr "Meteen uitvoeren wanneer een bericht verplaatst of verwijderd wordt"
 
-#: src/prefs_common.c:2021
+#: src/prefs_common.c:2033
 #, fuzzy
 msgid "Messages will be marked until execution if this is turned off."
 msgstr ""
 "(Berichten worden gemarkeerd voor deze acties\n"
 "wanneer dit uitgeschakeld is)"
 
-#: src/prefs_common.c:2029
+#: src/prefs_common.c:2041
 msgid "Receive dialog"
 msgstr "Ontvangstvenster"
 
-#: src/prefs_common.c:2039
+#: src/prefs_common.c:2051
 msgid "Show receive dialog"
 msgstr "Ontvangstvenster weergeven"
 
-#: src/prefs_common.c:2049
+#: src/prefs_common.c:2061
 msgid "Always"
 msgstr "Altijd"
 
-#: src/prefs_common.c:2050
+#: src/prefs_common.c:2062
 msgid "Only on manual receiving"
 msgstr ""
 
-#: src/prefs_common.c:2052
+#: src/prefs_common.c:2064
 msgid "Never"
 msgstr "Nooit"
 
-#: src/prefs_common.c:2057
+#: src/prefs_common.c:2069
 msgid "Don't popup error dialog on receive error"
 msgstr "Geen foutmelding geven bij ontvangstfout"
 
-#: src/prefs_common.c:2060
+#: src/prefs_common.c:2072
 msgid "Close receive dialog when finished"
 msgstr "Ontvangstvenster sluiten wanneer het klaar is."
 
-#: src/prefs_common.c:2066
+#: src/prefs_common.c:2078
 msgid " Set key bindings... "
 msgstr " Sneltoetsen instellen..."
 
-#: src/prefs_common.c:2122
+#: src/prefs_common.c:2134
 #, c-format
 msgid "External commands (%s will be replaced with file name / URI)"
 msgstr "Externe opdrachten (%s is het bestand / URI)"
 
-#: src/prefs_common.c:2131
+#: src/prefs_common.c:2143
 msgid "Web browser"
 msgstr "Webbrowser"
 
-#: src/prefs_common.c:2195
+#: src/prefs_common.c:2207
 msgid "Add address to destination when double-clicked"
 msgstr "Adres toevoegen aan 'Geadresseerden' bij dubbelklikken"
 
-#: src/prefs_common.c:2197
+#: src/prefs_common.c:2209
 msgid "On exit"
 msgstr "Afsluiten"
 
-#: src/prefs_common.c:2205
+#: src/prefs_common.c:2217
 msgid "Confirm on exit"
 msgstr "Bevestigen bij het afsluiten"
 
-#: src/prefs_common.c:2212
+#: src/prefs_common.c:2224
 msgid "Empty trash on exit"
 msgstr "Prullenbak leegmaken bij het afsluiten"
 
-#: src/prefs_common.c:2214
+#: src/prefs_common.c:2226
 msgid "Ask before emptying"
 msgstr "Bevestigen bij het legen"
 
-#: src/prefs_common.c:2218
+#: src/prefs_common.c:2230
 msgid "Warn if there are queued messages"
 msgstr "Waarschuw wanneer er berichten in de wachtrij staan"
 
-#: src/prefs_common.c:2224
+#: src/prefs_common.c:2236
 msgid "Socket I/O timeout:"
 msgstr ""
 
-#: src/prefs_common.c:2237
+#: src/prefs_common.c:2249
 msgid "second(s)"
 msgstr ""
 
-#: src/prefs_common.c:2419
+#: src/prefs_common.c:2431
 msgid "the full abbreviated weekday name"
 msgstr "afgekorte dag van de week"
 
-#: src/prefs_common.c:2420
+#: src/prefs_common.c:2432
 msgid "the full weekday name"
 msgstr "volledige dag van de week"
 
-#: src/prefs_common.c:2421
+#: src/prefs_common.c:2433
 msgid "the abbreviated month name"
 msgstr "afgekorte naam van de maand"
 
-#: src/prefs_common.c:2422
+#: src/prefs_common.c:2434
 msgid "the full month name"
 msgstr "volledig naam van de maand"
 
-#: src/prefs_common.c:2423
+#: src/prefs_common.c:2435
 msgid "the preferred date and time for the current locale"
 msgstr "de voorkeurs datum en tijd voor de huidige locale"
 
-#: src/prefs_common.c:2424
+#: src/prefs_common.c:2436
 msgid "the century number (year/100)"
 msgstr "eeuwnummer (jaar/100)"
 
-#: src/prefs_common.c:2425
+#: src/prefs_common.c:2437
 msgid "the day of the month as a decimal number"
 msgstr "dag van de maand als decimaal nummer"
 
-#: src/prefs_common.c:2426
+#: src/prefs_common.c:2438
 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.c:2427
+#: src/prefs_common.c:2439
 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.c:2428
+#: src/prefs_common.c:2440
 msgid "the day of the year as a decimal number"
 msgstr "dag van het jaar als decimaal nummer"
 
-#: src/prefs_common.c:2429
+#: src/prefs_common.c:2441
 msgid "the month as a decimal number"
 msgstr "de maand als decimaal nummer"
 
-#: src/prefs_common.c:2430
+#: src/prefs_common.c:2442
 msgid "the minute as a decimal number"
 msgstr "de minuut als decimaal nummer"
 
-#: src/prefs_common.c:2431
+#: src/prefs_common.c:2443
 msgid "either AM or PM"
 msgstr "AM of PM"
 
-#: src/prefs_common.c:2432
+#: src/prefs_common.c:2444
 msgid "the second as a decimal number"
 msgstr "de seconde als decimaal nummer"
 
-#: src/prefs_common.c:2433
+#: src/prefs_common.c:2445
 msgid "the day of the week as a decimal number"
 msgstr "de dag van de week als decimaal nummer"
 
-#: src/prefs_common.c:2434
+#: src/prefs_common.c:2446
 msgid "the preferred date for the current locale"
 msgstr "de voorkeursdatum voor de huidige locale"
 
-#: src/prefs_common.c:2435
+#: src/prefs_common.c:2447
 msgid "the last two digits of a year"
 msgstr "de laatste twee cijfers van het jaartal"
 
-#: src/prefs_common.c:2436
+#: src/prefs_common.c:2448
 msgid "the year as a decimal number"
 msgstr "het jaartal als decimaal nummer"
 
-#: src/prefs_common.c:2437
+#: src/prefs_common.c:2449
 msgid "the time zone or name or abbreviation"
 msgstr "de tijdzone of naam of afkorting"
 
-#: src/prefs_common.c:2458
+#: src/prefs_common.c:2470
 msgid "Specifier"
 msgstr "Selecteer"
 
-#: src/prefs_common.c:2459
+#: src/prefs_common.c:2471
 msgid "Description"
 msgstr "Beschrijving"
 
-#: src/prefs_common.c:2499
+#: src/prefs_common.c:2511
 msgid "Example"
 msgstr "Voorbeeld"
 
-#: src/prefs_common.c:2580
+#: src/prefs_common.c:2592
 msgid "Set message colors"
 msgstr "Berichtkleuren instellen"
 
-#: src/prefs_common.c:2588
+#: src/prefs_common.c:2600
 msgid "Colors"
 msgstr "Kleuren"
 
-#: src/prefs_common.c:2622
+#: src/prefs_common.c:2634
 msgid "Quoted Text - First Level"
 msgstr "Geciteerde tekst - eerste niveau"
 
-#: src/prefs_common.c:2628
+#: src/prefs_common.c:2640
 msgid "Quoted Text - Second Level"
 msgstr "Geciteerde tekst - tweede niveau"
 
-#: src/prefs_common.c:2634
+#: src/prefs_common.c:2646
 msgid "Quoted Text - Third Level"
 msgstr "Geciteerde tekst - derde niveau"
 
-#: src/prefs_common.c:2640
+#: src/prefs_common.c:2652
 msgid "URI link"
 msgstr "URI link"
 
-#: src/prefs_common.c:2647
+#: src/prefs_common.c:2659
 msgid "Recycle quote colors"
 msgstr "Gebruikte kleuren opnieuw gebruiken"
 
-#: src/prefs_common.c:2707
+#: src/prefs_common.c:2719
 msgid "Pick color for quotation level 1"
 msgstr "Selecteer kleur voor niveau 1"
 
-#: src/prefs_common.c:2710
+#: src/prefs_common.c:2722
 msgid "Pick color for quotation level 2"
 msgstr "Selecteer kleur voor niveau 2"
 
-#: src/prefs_common.c:2713
+#: src/prefs_common.c:2725
 msgid "Pick color for quotation level 3"
 msgstr "Selecteer kleur voor niveau 3"
 
-#: src/prefs_common.c:2716
+#: src/prefs_common.c:2728
 msgid "Pick color for URI"
 msgstr "Selecteer kleur voor URI"
 
-#: src/prefs_common.c:2853
+#: src/prefs_common.c:2865
 msgid "Description of symbols"
 msgstr "Beschrijving der symbolen"
 
-#: src/prefs_common.c:2909
+#: src/prefs_common.c:2921
 msgid ""
 "Date\n"
 "From\n"
@@ -4924,11 +4961,11 @@ msgstr ""
 "Nieuwsgroepen\n"
 "Bericht-ID"
 
-#: src/prefs_common.c:2922
+#: src/prefs_common.c:2934
 msgid "If x is set, displays expr"
 msgstr "Als x ingesteld is, expr weergeven"
 
-#: src/prefs_common.c:2926
+#: src/prefs_common.c:2938
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -4942,7 +4979,7 @@ msgstr ""
 "Geciteerde berichtinhoud zonder handtekening\n"
 "Letterlijk %"
 
-#: src/prefs_common.c:2934
+#: src/prefs_common.c:2946
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -4954,15 +4991,15 @@ msgstr ""
 "Letterlijk haakje openen\n"
 "Letterlijk haakje sluiten"
 
-#: src/prefs_common.c:2971
+#: src/prefs_common.c:2983
 msgid "Font selection"
 msgstr "Lettertype"
 
-#: src/prefs_common.c:3035
+#: src/prefs_common.c:3047
 msgid "Key bindings"
 msgstr "Sneltoetsen"
 
-#: src/prefs_common.c:3049
+#: src/prefs_common.c:3061
 msgid ""
 "Select the preset of key bindings.\n"
 "You can also modify each menu's shortcuts by pressing\n"
@@ -4973,11 +5010,11 @@ msgstr ""
 "op de gewenste toetscombinatie te drukken wanneer de\n"
 "muis boven het menu item zweeft."
 
-#: src/prefs_common.c:3061 src/prefs_common.c:3410
+#: src/prefs_common.c:3073 src/prefs_common.c:3422
 msgid "Default"
 msgstr "Standaard"
 
-#: src/prefs_common.c:3064 src/prefs_common.c:3419
+#: src/prefs_common.c:3076 src/prefs_common.c:3431
 msgid "Old Sylpheed"
 msgstr "Oude Sylpheed"
 
@@ -6147,6 +6184,12 @@ msgstr "%.2fGB"
 msgid "writing to %s failed.\n"
 msgstr "schrijven naar %s is mislukt.\n"
 
+#~ msgid "/_View/_Code set/---"
+#~ msgstr "/B_eeld/Codering/---"
+
+#~ msgid "/_View/_Code set"
+#~ msgstr "/B_eeld/Codering"
+
 #~ msgid "To save this part, pop up the context menu with "
 #~ msgstr "Om dit deel te bewaren, kunt u met de rechter muisknop het "
 
diff --git a/po/pl.po b/po/pl.po
index 79533bb3..bef6a4cd 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed 1.9.4 \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-03-15 14:29+0900\n"
+"POT-Creation-Date: 2005-03-16 14:47+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"
@@ -98,7 +98,7 @@ msgstr ""
 "w kolumnie \"G\" konta, które mają być sprawdzone przez 'Odbierz wsz.'"
 
 #: src/account.c:638 src/addressadd.c:186 src/addressbook.c:488
-#: src/compose.c:3650 src/editaddress.c:195 src/editaddress.c:936
+#: src/compose.c:3748 src/editaddress.c:195 src/editaddress.c:936
 #: src/editaddress.c:984 src/editbook.c:191 src/editgroup.c:257
 #: src/editjpilot.c:296 src/editldap.c:300 src/editvcard.c:211
 #: src/mimeview.c:151 src/prefs_filter.c:214 src/prefs_folder_item.c:170
@@ -151,13 +151,13 @@ msgstr "Usuń konto"
 msgid "Do you really want to delete this account?"
 msgstr "Czy naprawdę chcesz usunąć to konto?"
 
-#: src/account.c:758 src/compose.c:2551 src/compose.c:4807
+#: src/account.c:758 src/compose.c:2632 src/compose.c:4943
 #: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
 #: src/folderview.c:2156 src/folderview.c:2192
 msgid "Yes"
 msgstr "Tak"
 
-#: src/account.c:758 src/compose.c:2551 src/compose.c:4807
+#: src/account.c:758 src/compose.c:2632 src/compose.c:4943
 #: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
 #: src/folderview.c:2156 src/folderview.c:2192
 msgid "+No"
@@ -262,7 +262,7 @@ msgstr "Argumenty użytkownika dla akcji"
 msgid "Add Address to Book"
 msgstr "Dodaj do książki adresowej"
 
-#: src/addressadd.c:196 src/compose.c:4191 src/editaddress.c:196
+#: src/addressadd.c:196 src/compose.c:4292 src/editaddress.c:196
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "Adres"
@@ -276,7 +276,7 @@ msgstr "Uwagi"
 msgid "Select Address Book Folder"
 msgstr "Wybierz katalog książki adresowej"
 
-#: src/addressbook.c:334 src/compose.c:469 src/mainwindow.c:454
+#: src/addressbook.c:334 src/compose.c:477 src/mainwindow.c:454
 #: src/messageview.c:134
 msgid "/_File"
 msgstr "/_Plik"
@@ -297,8 +297,8 @@ msgstr "/_Plik/Nowy _J-Pilot"
 msgid "/_File/New _Server"
 msgstr "/_Plik/Nowy _Serwer"
 
-#: src/addressbook.c:343 src/addressbook.c:346 src/compose.c:474
-#: src/compose.c:479 src/compose.c:483 src/mainwindow.c:471
+#: src/addressbook.c:343 src/addressbook.c:346 src/compose.c:482
+#: src/compose.c:487 src/compose.c:491 src/mainwindow.c:471
 #: src/mainwindow.c:474 src/mainwindow.c:476 src/mainwindow.c:479
 #: src/mainwindow.c:481 src/messageview.c:137
 msgid "/_File/---"
@@ -316,7 +316,7 @@ msgstr "/_Plik/_Usuń"
 msgid "/_File/_Save"
 msgstr "/_Plik/Zapi_sz"
 
-#: src/addressbook.c:348 src/compose.c:484 src/messageview.c:138
+#: src/addressbook.c:348 src/compose.c:492 src/messageview.c:138
 msgid "/_File/_Close"
 msgstr "/_Plik/_Zamknij"
 
@@ -348,7 +348,7 @@ msgstr "/_Adres/_Edycja"
 msgid "/_Address/_Delete"
 msgstr "/_Adres/_Usuń"
 
-#: src/addressbook.c:356 src/compose.c:585 src/mainwindow.c:688
+#: src/addressbook.c:356 src/compose.c:664 src/mainwindow.c:697
 #: src/messageview.c:246
 msgid "/_Tools"
 msgstr "/_Narzędzia"
@@ -357,12 +357,12 @@ msgstr "/_Narzędzia"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Plik/Importuj plik _LDIF"
 
-#: src/addressbook.c:358 src/compose.c:598 src/mainwindow.c:733
+#: src/addressbook.c:358 src/compose.c:677 src/mainwindow.c:742
 #: src/messageview.c:264
 msgid "/_Help"
 msgstr "/Pomo_c"
 
-#: src/addressbook.c:359 src/compose.c:599 src/mainwindow.c:744
+#: src/addressbook.c:359 src/compose.c:678 src/mainwindow.c:753
 #: src/messageview.c:265
 msgid "/_Help/_About"
 msgstr "/Pomo_c/_O programie"
@@ -379,7 +379,7 @@ msgstr "/Nowa _grupa"
 msgid "/New _Folder"
 msgstr "/Nowy _katalog"
 
-#: src/addressbook.c:381 src/addressbook.c:391 src/compose.c:463
+#: src/addressbook.c:381 src/addressbook.c:391 src/compose.c:471
 #: src/folderview.c:220 src/folderview.c:222 src/folderview.c:226
 #: src/folderview.c:236 src/folderview.c:238 src/folderview.c:240
 #: src/folderview.c:244 src/folderview.c:254 src/folderview.c:256
@@ -389,7 +389,7 @@ msgstr "/Nowy _katalog"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:382 src/addressbook.c:392 src/compose.c:486
+#: src/addressbook.c:382 src/addressbook.c:392 src/compose.c:494
 #: src/mainwindow.c:485 src/messageview.c:140
 msgid "/_Edit"
 msgstr "/_Edycja"
@@ -402,7 +402,7 @@ msgstr "/_Usuń"
 msgid "E-Mail address"
 msgstr "Adres e-mail"
 
-#: src/addressbook.c:493 src/compose.c:4192 src/prefs_common.c:2186
+#: src/addressbook.c:493 src/compose.c:4293 src/prefs_common.c:2198
 msgid "Address book"
 msgstr "Książka adresowa"
 
@@ -412,7 +412,7 @@ msgstr "Nazwa:"
 
 #. Buttons
 #: src/addressbook.c:625 src/addressbook.c:1665 src/addressbook.c:1671
-#: src/editaddress.c:878 src/editaddress.c:1011 src/mainwindow.c:2212
+#: src/editaddress.c:878 src/editaddress.c:1011 src/mainwindow.c:2221
 #: src/prefs_actions.c:263 src/prefs_display_header.c:275
 #: src/prefs_display_header.c:330 src/prefs_template.c:227
 msgid "Delete"
@@ -607,7 +607,7 @@ msgstr "Wspólny adres:"
 msgid "Personal address"
 msgstr "Osobisty adres:"
 
-#: src/alertpanel.c:123 src/compose.c:4807 src/main.c:458
+#: src/alertpanel.c:123 src/compose.c:4943 src/main.c:458
 msgid "Notice"
 msgstr "Notatka"
 
@@ -615,7 +615,7 @@ msgstr "Notatka"
 msgid "Warning"
 msgstr "Ostrzeżenie"
 
-#: src/alertpanel.c:149 src/compose.c:2551 src/inc.c:558
+#: src/alertpanel.c:149 src/compose.c:2632 src/inc.c:558
 msgid "Error"
 msgstr "Błąd"
 
@@ -663,300 +663,418 @@ msgstr "Brązowy"
 msgid "None"
 msgstr "Brak"
 
-#: src/compose.c:461
+#: src/compose.c:469
 msgid "/_Add..."
 msgstr "/Dod_aj..."
 
-#: src/compose.c:462
+#: src/compose.c:470
 msgid "/_Remove"
 msgstr "/_Usuń"
 
-#: src/compose.c:464 src/folderview.c:228 src/folderview.c:246
+#: src/compose.c:472 src/folderview.c:228 src/folderview.c:246
 #: src/folderview.c:261
 msgid "/_Properties..."
 msgstr "/_Właściwości..."
 
-#: src/compose.c:470
+#: src/compose.c:478
 msgid "/_File/_Send"
 msgstr "/_Plik/Wyślij"
 
-#: src/compose.c:472
+#: src/compose.c:480
 msgid "/_File/Send _later"
 msgstr "/_Plik/Wyś_lij później"
 
-#: src/compose.c:475
+#: src/compose.c:483
 msgid "/_File/Save to _draft folder"
 msgstr "/_Plik/Zapisz w katalogu _szablonów"
 
-#: src/compose.c:477
+#: src/compose.c:485
 msgid "/_File/Save and _keep editing"
 msgstr "/_Plik/Zapisz i kontynuuj _edycję"
 
-#: src/compose.c:480
+#: src/compose.c:488
 msgid "/_File/_Attach file"
 msgstr "/_Plik/_Dołącz plik"
 
-#: src/compose.c:481
+#: src/compose.c:489
 msgid "/_File/_Insert file"
 msgstr "/_Plik/Wstaw pl_ik"
 
-#: src/compose.c:482
+#: src/compose.c:490
 msgid "/_File/Insert si_gnature"
 msgstr "/_Plik/Wstaw p_odpis"
 
-#: src/compose.c:487
+#: src/compose.c:495
 msgid "/_Edit/_Undo"
 msgstr "/_Edycja/_Cofnij"
 
-#: src/compose.c:488
+#: src/compose.c:496
 msgid "/_Edit/_Redo"
 msgstr "/_Edycja/Po_nów"
 
-#: src/compose.c:489 src/compose.c:567 src/mainwindow.c:489
+#: src/compose.c:497 src/compose.c:575 src/mainwindow.c:489
 #: src/messageview.c:143
 msgid "/_Edit/---"
 msgstr "/_Edycja/---"
 
-#: src/compose.c:490
+#: src/compose.c:498
 msgid "/_Edit/Cu_t"
 msgstr "/_Edycja/Wy_tnij"
 
-#: src/compose.c:491 src/mainwindow.c:486 src/messageview.c:141
+#: src/compose.c:499 src/mainwindow.c:486 src/messageview.c:141
 msgid "/_Edit/_Copy"
 msgstr "/_Edycja/_Kopiuj"
 
-#: src/compose.c:492
+#: src/compose.c:500
 msgid "/_Edit/_Paste"
 msgstr "/_Edycja/_Wstaw"
 
-#: src/compose.c:493
+#: src/compose.c:501
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Edycja/Wstaw jako c_ytat"
 
-#: src/compose.c:495 src/mainwindow.c:487 src/messageview.c:142
+#: src/compose.c:503 src/mainwindow.c:487 src/messageview.c:142
 msgid "/_Edit/Select _all"
 msgstr "/_Edycja/W_ybierz wszystko"
 
-#: src/compose.c:496
+#: src/compose.c:504
 msgid "/_Edit/A_dvanced"
 msgstr "/_Edycja/_Zaawansowane"
 
-#: src/compose.c:497
+#: src/compose.c:505
 msgid "/_Edit/A_dvanced/Move a character backward"
 msgstr "/_Edycja/_Zaawansowane/Przejdź znak do tyłu"
 
-#: src/compose.c:502
+#: src/compose.c:510
 msgid "/_Edit/A_dvanced/Move a character forward"
 msgstr "/_Edycja/_Zaawansowane/Przejdź znak do przodu"
 
-#: src/compose.c:507
+#: src/compose.c:515
 msgid "/_Edit/A_dvanced/Move a word backward"
 msgstr "/_Edycja/_Zaawansowane/Przejdź słowo do tyłu"
 
-#: src/compose.c:512
+#: src/compose.c:520
 msgid "/_Edit/A_dvanced/Move a word forward"
 msgstr "/_Edycja/_Zaawansowane/Przejdź słowo do przodu"
 
-#: src/compose.c:517
+#: src/compose.c:525
 msgid "/_Edit/A_dvanced/Move to beginning of line"
 msgstr "/_Edycja/_Zaawansowane/Przejdź do początku linii"
 
-#: src/compose.c:522
+#: src/compose.c:530
 msgid "/_Edit/A_dvanced/Move to end of line"
 msgstr "/_Edycja/_Zaawansowane/Przejdź do końca linii"
 
-#: src/compose.c:527
+#: src/compose.c:535
 msgid "/_Edit/A_dvanced/Move to previous line"
 msgstr "/_Edycja/_Zaawansowane/Przejdź do poprzedniej linii"
 
-#: src/compose.c:532
+#: src/compose.c:540
 msgid "/_Edit/A_dvanced/Move to next line"
 msgstr "/_Edycja/_Zaawansowane/Przejdź do następnej linii"
 
-#: src/compose.c:537
+#: src/compose.c:545
 msgid "/_Edit/A_dvanced/Delete a character backward"
 msgstr "/_Edycja/_Zaawansowane/Usuń znak z tyłu"
 
-#: src/compose.c:542
+#: src/compose.c:550
 msgid "/_Edit/A_dvanced/Delete a character forward"
 msgstr "/_Edycja/_Zaawansowane/Usuń znak z przodu"
 
-#: src/compose.c:547
+#: src/compose.c:555
 msgid "/_Edit/A_dvanced/Delete a word backward"
 msgstr "/_Edycja/_Zaawansowane/Usuń słowo z tyłu"
 
-#: src/compose.c:552
+#: src/compose.c:560
 msgid "/_Edit/A_dvanced/Delete a word forward"
 msgstr "/_Edycja/_Zaawansowane/Usuń słowo z przodu"
 
-#: src/compose.c:557
+#: src/compose.c:565
 msgid "/_Edit/A_dvanced/Delete line"
 msgstr "/_Edycja/_Zaawansowane/Usuń linię"
 
-#: src/compose.c:562
+#: src/compose.c:570
 msgid "/_Edit/A_dvanced/Delete to end of line"
 msgstr "/_Edycja/_Zaawansowane/Usuń do końca linii"
 
-#: src/compose.c:568
+#: src/compose.c:576
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/_Edit/Za_wiń bieżący akapit"
 
-#: src/compose.c:570
+#: src/compose.c:578
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/_Edycja/Zawijaj wszystkie długie _linie"
 
-#: src/compose.c:572
+#: src/compose.c:580
 #, fuzzy
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Edycja/_Kopiuj"
 
-#: src/compose.c:573 src/mainwindow.c:494 src/messageview.c:147
+#: src/compose.c:581 src/mainwindow.c:494 src/messageview.c:147
 #: src/summaryview.c:370
 msgid "/_View"
 msgstr "/_Widok"
 
-#: src/compose.c:574
+#: src/compose.c:582
 msgid "/_View/_To"
 msgstr "/_Widok/_Do"
 
-#: src/compose.c:575
+#: src/compose.c:583
 msgid "/_View/_Cc"
 msgstr "/_Widok/_Kopia"
 
-#: src/compose.c:576
+#: src/compose.c:584
 msgid "/_View/_Bcc"
 msgstr "/_Widok/_Ukryta kopia"
 
-#: src/compose.c:577
+#: src/compose.c:585
 msgid "/_View/_Reply to"
 msgstr "/_Widok/_Odpowiedz do"
 
-#: src/compose.c:578 src/compose.c:580 src/compose.c:582 src/mainwindow.c:512
-#: src/mainwindow.c:515 src/mainwindow.c:541 src/mainwindow.c:565
-#: src/mainwindow.c:641 src/mainwindow.c:645 src/messageview.c:223
+#: src/compose.c:586 src/compose.c:588 src/compose.c:590 src/compose.c:592
+#: src/mainwindow.c:512 src/mainwindow.c:515 src/mainwindow.c:541
+#: src/mainwindow.c:565 src/mainwindow.c:650 src/mainwindow.c:654
+#: src/messageview.c:223
 msgid "/_View/---"
 msgstr "/_Widok/---"
 
-#: src/compose.c:579
+#: src/compose.c:587
 msgid "/_View/_Followup to"
 msgstr "/_Widok/_Przekaż do"
 
-#: src/compose.c:581
+#: src/compose.c:589
 msgid "/_View/R_uler"
 msgstr "/_Widok/_Linijka"
 
-#: src/compose.c:583
+#: src/compose.c:591
 msgid "/_View/_Attachment"
 msgstr "/_Widok/Załącznik"
 
-#: src/compose.c:586 src/mainwindow.c:689 src/messageview.c:247
+#: src/compose.c:598 src/mainwindow.c:572 src/messageview.c:154
+#, fuzzy
+msgid "/_View/Character _encoding"
+msgstr "/_Widok/_Sortuj/Malejąco"
+
+#: src/compose.c:599
+msgid "/_View/Character _encoding/_Automatic"
+msgstr ""
+
+#: src/compose.c:601 src/compose.c:607 src/compose.c:613 src/compose.c:617
+#: src/compose.c:623 src/compose.c:627 src/compose.c:631 src/compose.c:641
+#: src/compose.c:645 src/compose.c:653 src/compose.c:657 src/mainwindow.c:568
+#: src/mainwindow.c:575 src/messageview.c:150
+#, fuzzy
+msgid "/_View/Character _encoding/---"
+msgstr "/_Widok/_Sortuj/Malejąco"
+
+#: src/compose.c:603 src/mainwindow.c:576 src/messageview.c:158
+#, fuzzy
+msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
+msgstr "/_Widok/_Strona kodowa/7 bitów ascii (US-ASC_II)"
+
+#: src/compose.c:605 src/mainwindow.c:578 src/messageview.c:161
+#, fuzzy
+msgid "/_View/Character _encoding/Unicode (_UTF-8)"
+msgstr "/_Widok/_Strona kodowa/Unicode (_UTF-8)"
+
+#: src/compose.c:609 src/mainwindow.c:582 src/messageview.c:164
+#, fuzzy
+msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
+msgstr "/_Widok/_Strona kodowa/Europa Zachodnia (ISO-8859-_1)"
+
+#: src/compose.c:611 src/mainwindow.c:584 src/messageview.c:166
+#, fuzzy
+msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
+msgstr "/_Widok/_Strona kodowa/Europa Zachodnia (ISO-8859-15)"
+
+#: src/compose.c:615 src/mainwindow.c:588 src/messageview.c:169
+#, fuzzy
+msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
+msgstr "/_Widok/_Strona kodowa/Europa Środkowa (ISO-8859-_2)"
+
+#: src/compose.c:619 src/mainwindow.c:592 src/messageview.c:172
+#, fuzzy
+msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
+msgstr "/_Widok/_Strona kodowa/Kraje _Bałtyckie (ISO-8859-13)"
+
+#: src/compose.c:621 src/mainwindow.c:594 src/messageview.c:174
+#, fuzzy
+msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
+msgstr "/_Widok/_Strona kodowa/Kraje Bałtyckie (ISO-8859-_4)"
+
+#: src/compose.c:625 src/mainwindow.c:598 src/messageview.c:177
+#, fuzzy
+msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
+msgstr "/_Widok/_Strona kodowa/Grecja (ISO-8859-_7)"
+
+#: src/compose.c:629 src/mainwindow.c:602 src/messageview.c:180
+#, fuzzy
+msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
+msgstr "/_Widok/_Strona kodowa/Turcja (ISO-8859-_9)"
+
+#: src/compose.c:633 src/mainwindow.c:606 src/messageview.c:183
+#, fuzzy
+msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
+msgstr "/_Widok/_Strona kodowa/Cyrylica (ISO-8859-_5)"
+
+#: src/compose.c:635 src/mainwindow.c:608 src/messageview.c:185
+#, fuzzy
+msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
+msgstr "/_Widok/_Strona kodowa/Cyrylica (KOI8-_R)"
+
+#: src/compose.c:637 src/mainwindow.c:610 src/messageview.c:187
+#, fuzzy
+msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
+msgstr "/_Widok/_Strona kodowa/Cyrylica (KOI8-_R)"
+
+#: src/compose.c:639 src/mainwindow.c:612 src/messageview.c:189
+#, fuzzy
+msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
+msgstr "/_Widok/_Strona kodowa/Cyrylica (Windows-1251)"
+
+#: src/compose.c:643 src/mainwindow.c:616 src/messageview.c:192
+#, fuzzy
+msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
+msgstr "/_Widok/_Strona kodowa/Japonia (ISO-2022-_JP)"
+
+#: src/compose.c:647 src/mainwindow.c:626 src/messageview.c:201
+#, fuzzy
+msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
+msgstr "/_Widok/_Strona kodowa/Uproszczony Chiny (_GB2312)"
+
+#: src/compose.c:649 src/mainwindow.c:628 src/messageview.c:203
+#, fuzzy
+msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
+msgstr "/_Widok/_Strona kodowa/Tradycyjny Chiny (_Big5)"
+
+#: src/compose.c:651 src/mainwindow.c:630 src/messageview.c:205
+#, fuzzy
+msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
+msgstr "/_Widok/_Strona kodowa/Tradycyjny Chiny (EUC-_TW)"
+
+#: src/compose.c:655 src/mainwindow.c:636 src/messageview.c:210
+#, fuzzy
+msgid "/_View/Character _encoding/Korean (EUC-_KR)"
+msgstr "/_Widok/_Strona kodowa/Korea(EUC-_KR)"
+
+#: src/compose.c:659 src/mainwindow.c:642 src/messageview.c:215
+#, fuzzy
+msgid "/_View/Character _encoding/Thai (TIS-620)"
+msgstr "/_Widok/_Strona kodowa/Tajlandia (TIS-620)"
+
+#: src/compose.c:661 src/mainwindow.c:644 src/messageview.c:217
+#, fuzzy
+msgid "/_View/Character _encoding/Thai (Windows-874)"
+msgstr "/_Widok/_Strona kodowa/Tajlandia (Windows-874)"
+
+#: src/compose.c:665 src/mainwindow.c:698 src/messageview.c:247
 msgid "/_Tools/_Address book"
 msgstr "/_Narzędzia/_Książka adresowa"
 
-#: src/compose.c:587
+#: src/compose.c:666
 msgid "/_Tools/_Template"
 msgstr "/_Narzędzia/_Szablon"
 
-#: src/compose.c:588 src/mainwindow.c:707 src/messageview.c:262
+#: src/compose.c:667 src/mainwindow.c:716 src/messageview.c:262
 msgid "/_Tools/Actio_ns"
 msgstr "/_Narzędzia/Polecen_ia"
 
-#: src/compose.c:589 src/compose.c:593 src/mainwindow.c:692
-#: src/mainwindow.c:706 src/mainwindow.c:708 src/mainwindow.c:711
-#: src/mainwindow.c:713 src/messageview.c:250 src/messageview.c:261
+#: src/compose.c:668 src/compose.c:672 src/mainwindow.c:701
+#: src/mainwindow.c:715 src/mainwindow.c:717 src/mainwindow.c:720
+#: src/mainwindow.c:722 src/messageview.c:250 src/messageview.c:261
 msgid "/_Tools/---"
 msgstr "/_Narzędzia/---"
 
-#: src/compose.c:590
+#: src/compose.c:669
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/_Narzędzia/Edytuj za pomocą z_ewnętrznego edytora"
 
-#: src/compose.c:594
+#: src/compose.c:673
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Narzędzia/Podpis _PGP"
 
-#: src/compose.c:595
+#: src/compose.c:674
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/_Narzędzia/Szyfrowani_e GPG"
 
-#: src/compose.c:800
+#: src/compose.c:879
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: brak pliku\n"
 
-#: src/compose.c:899 src/compose.c:958 src/procmsg.c:1303
+#: src/compose.c:978 src/compose.c:1037 src/procmsg.c:1303
 msgid "Can't get text part\n"
 msgstr "Nie mogę pobrać części tekstu\n"
 
-#: src/compose.c:1340
+#: src/compose.c:1419
 msgid "Quote mark format error."
 msgstr "Błąd formatu znacznika cytatu."
 
-#: src/compose.c:1352
+#: src/compose.c:1431
 msgid "Message reply/forward format error."
 msgstr "Błąd formatu odpowiedz/przekaż wiadomość."
 
-#: src/compose.c:1679
+#: src/compose.c:1758
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Plik %s nie istnieje\n"
 
-#: src/compose.c:1683
+#: src/compose.c:1762
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Nie można odczytać wielkości pliku %s\n"
 
-#: src/compose.c:1687
+#: src/compose.c:1766
 #, c-format
 msgid "File %s is empty."
 msgstr "Plik %s jest pusty."
 
-#: src/compose.c:1691
+#: src/compose.c:1770
 #, c-format
 msgid "Can't read %s."
 msgstr "Nie można odczytać %s."
 
-#: src/compose.c:1726
+#: src/compose.c:1805
 #, c-format
 msgid "Message: %s"
 msgstr "Wiadomość: %s"
 
-#: src/compose.c:1797 src/mimeview.c:491
+#: src/compose.c:1876 src/mimeview.c:491
 msgid "Can't get the part of multipart message."
 msgstr "Nie można pobrać części wiadomości wieloczęściowej."
 
-#: src/compose.c:2188
+#: src/compose.c:2267
 msgid " [Edited]"
 msgstr " [Edytowany]"
 
-#: src/compose.c:2190
+#: src/compose.c:2269
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Utwórz wiadomość%s"
 
-#: src/compose.c:2193
+#: src/compose.c:2272
 #, c-format
 msgid "Compose message%s"
 msgstr "Utwórz wiadomość%s"
 
-#: src/compose.c:2304
+#: src/compose.c:2383
 msgid "Recipient is not specified."
 msgstr "Nie podano odbiorcy."
 
-#: src/compose.c:2312 src/compose.c:4112 src/mainwindow.c:2144
+#: src/compose.c:2391 src/compose.c:4213 src/mainwindow.c:2153
 #: src/prefs_account.c:703 src/prefs_common.c:850
 msgid "Send"
 msgstr "Wyślij"
 
-#: src/compose.c:2313
+#: src/compose.c:2392
 msgid "Subject is empty. Send it anyway?"
 msgstr "Wiadomość nie posiada tematu. Czy wysłać ją mimo tego ?"
 
-#: src/compose.c:2364
+#: src/compose.c:2443
 msgid "can't get recipient list."
 msgstr "nie można pobrać listy odbiorców."
 
-#: src/compose.c:2384
+#: src/compose.c:2463
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -964,27 +1082,27 @@ msgstr ""
 "Nie podano konta pocztowego do wysyłania wiadomości.\n"
 "Należy wybrać konto przed wysłaniem."
 
-#: src/compose.c:2398 src/send_message.c:261
+#: src/compose.c:2477 src/send_message.c:261
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Błąd podczas wysyłania wiadomości do %s."
 
-#: src/compose.c:2421
+#: src/compose.c:2500
 msgid "Can't save the message to outbox."
 msgstr "Nie można zapisać wiadomości do outbox."
 
-#: src/compose.c:2457
+#: src/compose.c:2536
 #, 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:2518 src/compose.c:2739 src/compose.c:2802 src/compose.c:2921
+#: src/compose.c:2597 src/compose.c:2820 src/compose.c:2883 src/compose.c:3003
 #: src/utils.c:2189
 msgid "can't change file mode\n"
 msgstr "nie można zmienić trybu pliku\n"
 
-#: src/compose.c:2546
+#: src/compose.c:2627
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -994,140 +1112,140 @@ msgstr ""
 "%s na %s.\n"
 "Czy mimo to wysłać wiadomość?"
 
-#: src/compose.c:2610
+#: src/compose.c:2691
 msgid "can't write headers\n"
 msgstr "nie można zapisać nagłówków\n"
 
-#: src/compose.c:2881
+#: src/compose.c:2963
 msgid "can't remove the old message\n"
 msgstr "Nie można usunąć starej wiadomości\n"
 
-#: src/compose.c:2899
+#: src/compose.c:2981
 msgid "queueing message...\n"
 msgstr "kolejkowanie wiadomości...\n"
 
-#: src/compose.c:2981
+#: src/compose.c:3063
 msgid "can't find queue folder\n"
 msgstr "nie można znaleźć katalogu kolejki\n"
 
-#: src/compose.c:2988
+#: src/compose.c:3070
 msgid "can't queue the message\n"
 msgstr "nie można zapisać wiadomości do kolejki\n"
 
-#: src/compose.c:3547
+#: src/compose.c:3645
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "wygenerowany Message-ID: %s\n"
 
-#: src/compose.c:3645
+#: src/compose.c:3743
 msgid "Creating compose window...\n"
 msgstr "Tworzenie okna edycji...\n"
 
-#: src/compose.c:3648 src/compose.c:4598
+#: src/compose.c:3746 src/compose.c:4734
 msgid "MIME type"
 msgstr "typ MIME"
 
 #. S_COL_DATE
-#: src/compose.c:3649 src/mimeview.c:150 src/prefs_filter_edit.c:569
+#: src/compose.c:3747 src/mimeview.c:150 src/prefs_filter_edit.c:569
 #: src/prefs_summary_column.c:73 src/select-keys.c:317 src/summaryview.c:386
 msgid "Size"
 msgstr "Rozmiar"
 
-#: src/compose.c:3700 src/headerview.c:53 src/summary_search.c:169
+#: src/compose.c:3798 src/headerview.c:53 src/summary_search.c:169
 msgid "From:"
 msgstr "Od:"
 
-#: src/compose.c:4113
+#: src/compose.c:4214
 msgid "Send message"
 msgstr "Wyślij wiadomość"
 
-#: src/compose.c:4121
+#: src/compose.c:4222
 msgid "Send later"
 msgstr "Wyślij później"
 
-#: src/compose.c:4122
+#: src/compose.c:4223
 msgid "Put into queue folder and send later"
 msgstr "Umieść w katalogu kolejki i wyślij później"
 
-#: src/compose.c:4130
+#: src/compose.c:4231
 msgid "Draft"
 msgstr "Draft"
 
-#: src/compose.c:4131
+#: src/compose.c:4232
 msgid "Save to draft folder"
 msgstr "Zapisz w katalogu szablonów"
 
-#: src/compose.c:4141 src/compose.c:5382
+#: src/compose.c:4242 src/compose.c:5527
 msgid "Insert"
 msgstr "Wstaw"
 
-#: src/compose.c:4142
+#: src/compose.c:4243
 msgid "Insert file"
 msgstr "Wstaw plik"
 
-#: src/compose.c:4150
+#: src/compose.c:4251
 msgid "Attach"
 msgstr "Dołącz"
 
-#: src/compose.c:4151
+#: src/compose.c:4252
 msgid "Attach file"
 msgstr "Dołącz plik"
 
 #. signature
-#: src/compose.c:4161 src/prefs_account.c:1339 src/prefs_common.c:1261
+#: src/compose.c:4262 src/prefs_account.c:1339 src/prefs_common.c:1273
 msgid "Signature"
 msgstr "Podpis"
 
-#: src/compose.c:4162
+#: src/compose.c:4263
 msgid "Insert signature"
 msgstr "Wstaw podpis"
 
-#: src/compose.c:4171 src/prefs_common.c:1283 src/prefs_common.c:2165
+#: src/compose.c:4272 src/prefs_common.c:1295 src/prefs_common.c:2177
 msgid "Editor"
 msgstr "Edytor"
 
-#: src/compose.c:4172
+#: src/compose.c:4273
 msgid "Edit with external editor"
 msgstr "Edytuj w zewnętrznym edytorze"
 
-#: src/compose.c:4180
+#: src/compose.c:4281
 msgid "Linewrap"
 msgstr "Zawijanie linii"
 
-#: src/compose.c:4181
+#: src/compose.c:4282
 msgid "Wrap all long lines"
 msgstr "Zawijaj wszystkie długie linie"
 
-#: src/compose.c:4492
+#: src/compose.c:4628
 msgid "Invalid MIME type."
 msgstr "Niepoprawny typ MIME."
 
-#: src/compose.c:4511
+#: src/compose.c:4647
 msgid "File doesn't exist or is empty."
 msgstr "Brak pliku lub pusty plik."
 
-#: src/compose.c:4580
+#: src/compose.c:4716
 msgid "Properties"
 msgstr "Właściwości"
 
-#: src/compose.c:4600
+#: src/compose.c:4736
 msgid "Encoding"
 msgstr "Kodowanie"
 
-#: src/compose.c:4623 src/prefs_folder_item.c:183
+#: src/compose.c:4759 src/prefs_folder_item.c:183
 msgid "Path"
 msgstr "Ścieżka"
 
-#: src/compose.c:4624
+#: src/compose.c:4760
 msgid "File name"
 msgstr "Nazwa pliku"
 
-#: src/compose.c:4778
+#: src/compose.c:4914
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Niepoprawna linia wywołania zewnętrznego edytora: \"%s\"\n"
 
-#: src/compose.c:4804
+#: src/compose.c:4940
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1138,72 +1256,72 @@ msgstr ""
 "Czy wymusić zakończenie procesu?\n"
 "identyfikator grupy procesów: %d"
 
-#: src/compose.c:4817
+#: src/compose.c:4953
 #, c-format
 msgid "Terminated process group id: %d"
 msgstr "Identyfikator zakończonej grupy procesów: %d"
 
-#: src/compose.c:4818
+#: src/compose.c:4954
 #, c-format
 msgid "Temporary file: %s"
 msgstr "Plik tymczasowy: %s"
 
-#: src/compose.c:4842
+#: src/compose.c:4978
 msgid "Compose: input from monitoring process\n"
 msgstr "Edycja: wejście z procesu monitorującego\n"
 
 #. failed
-#: src/compose.c:4875
+#: src/compose.c:5011
 msgid "Couldn't exec external editor\n"
 msgstr "Nie można uruchomić zewnętrznego edytora\n"
 
-#: src/compose.c:4879
+#: src/compose.c:5015
 msgid "Couldn't write to file\n"
 msgstr "Nie można zapisać do pliku\n"
 
-#: src/compose.c:4881
+#: src/compose.c:5017
 msgid "Pipe read failed\n"
 msgstr "Błędny odczyt z potoku\n"
 
-#: src/compose.c:5182 src/compose.c:5190 src/compose.c:5196
+#: src/compose.c:5318 src/compose.c:5326 src/compose.c:5332
 msgid "Can't queue the message."
 msgstr "Nie można wstawić wiadomości do kolejki."
 
-#: src/compose.c:5287
+#: src/compose.c:5423
 #, fuzzy
 msgid "Select files"
 msgstr "Wybierz plik"
 
-#: src/compose.c:5309
+#: src/compose.c:5445
 msgid "Select file"
 msgstr "Wybierz plik"
 
-#: src/compose.c:5344
+#: src/compose.c:5480
 msgid "Discard message"
 msgstr "Porzuć wiadomość"
 
-#: src/compose.c:5345
+#: src/compose.c:5481
 msgid "This message has been modified. discard it?"
 msgstr "Wiadomość została zmieniona, czy porzucić ją?"
 
-#: src/compose.c:5346
+#: src/compose.c:5482
 msgid "Discard"
 msgstr "Porzuć"
 
-#: src/compose.c:5346
+#: src/compose.c:5482
 msgid "to Draft"
 msgstr "do Draft"
 
-#: src/compose.c:5379
+#: src/compose.c:5524
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Czy chcesz zastosować szablon \"%s\"?"
 
-#: src/compose.c:5381
+#: src/compose.c:5526
 msgid "Apply template"
 msgstr "Zastosuj szablon"
 
-#: src/compose.c:5382
+#: src/compose.c:5527
 msgid "Replace"
 msgstr "Zamień"
 
@@ -1642,12 +1760,12 @@ msgstr "Ustawianie informacji o katalogu...\n"
 msgid "Setting folder info..."
 msgstr "Ustawianie informacji o katalogu..."
 
-#: src/folderview.c:652 src/mainwindow.c:3190 src/setup.c:81
+#: src/folderview.c:652 src/mainwindow.c:3199 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Przeszukiwanie katalogu %s%c%s ..."
 
-#: src/folderview.c:656 src/mainwindow.c:3195 src/setup.c:86
+#: src/folderview.c:656 src/mainwindow.c:3204 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Przeszukiwanie katalogu %s ..."
@@ -2104,7 +2222,7 @@ msgstr "Importuj plik LDIF do książki adresowej"
 msgid "Prev"
 msgstr "Poprzednia"
 
-#: src/importldif.c:761 src/mainwindow.c:2230
+#: src/importldif.c:761 src/mainwindow.c:2239
 msgid "Next"
 msgstr "Następna"
 
@@ -2560,7 +2678,8 @@ msgid "/_View/Separate f_older tree"
 msgstr "/_Widok/_Oddzielne drzewo katalogów"
 
 #: src/mainwindow.c:514
-msgid "/_View/Separate m_essage view"
+#, fuzzy
+msgid "/_View/Separate _message view"
 msgstr "/_Widok/Oddzielny widok wiado_mości"
 
 #: src/mainwindow.c:516
@@ -2696,423 +2815,340 @@ msgstr "/_Widok/_Idź do/_Następna etykietowana wiadomość"
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Widok/Idź do inne_go katalogu..."
 
-#: src/mainwindow.c:568 src/mainwindow.c:575 src/messageview.c:150
-msgid "/_View/_Code set/---"
-msgstr "/_Widok/_Strona kodowa/---"
-
-#: src/mainwindow.c:572 src/messageview.c:154
-msgid "/_View/_Code set"
-msgstr "/_Widok/_Strona kodowa"
-
 #: src/mainwindow.c:573 src/messageview.c:155
-msgid "/_View/_Code set/_Auto detect"
+#, fuzzy
+msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Widok/_Strona kodowa/_Automatycznie"
 
-#: src/mainwindow.c:576 src/messageview.c:158
-msgid "/_View/_Code set/7bit ascii (US-ASC_II)"
-msgstr "/_Widok/_Strona kodowa/7 bitów ascii (US-ASC_II)"
-
-#: src/mainwindow.c:579 src/messageview.c:161
-msgid "/_View/_Code set/Unicode (_UTF-8)"
-msgstr "/_Widok/_Strona kodowa/Unicode (_UTF-8)"
-
-#: src/mainwindow.c:582 src/messageview.c:164
-msgid "/_View/_Code set/Western European (ISO-8859-_1)"
-msgstr "/_Widok/_Strona kodowa/Europa Zachodnia (ISO-8859-_1)"
-
-#: src/mainwindow.c:584 src/messageview.c:166
-msgid "/_View/_Code set/Western European (ISO-8859-15)"
-msgstr "/_Widok/_Strona kodowa/Europa Zachodnia (ISO-8859-15)"
-
-#: src/mainwindow.c:587 src/messageview.c:169
-msgid "/_View/_Code set/Central European (ISO-8859-_2)"
-msgstr "/_Widok/_Strona kodowa/Europa Środkowa (ISO-8859-_2)"
-
-#: src/mainwindow.c:590 src/messageview.c:172
-msgid "/_View/_Code set/_Baltic (ISO-8859-13)"
-msgstr "/_Widok/_Strona kodowa/Kraje _Bałtyckie (ISO-8859-13)"
-
-#: src/mainwindow.c:592 src/messageview.c:174
-msgid "/_View/_Code set/Baltic (ISO-8859-_4)"
-msgstr "/_Widok/_Strona kodowa/Kraje Bałtyckie (ISO-8859-_4)"
-
-#: src/mainwindow.c:595 src/messageview.c:177
-msgid "/_View/_Code set/Greek (ISO-8859-_7)"
-msgstr "/_Widok/_Strona kodowa/Grecja (ISO-8859-_7)"
-
-#: src/mainwindow.c:598 src/messageview.c:180
-msgid "/_View/_Code set/Turkish (ISO-8859-_9)"
-msgstr "/_Widok/_Strona kodowa/Turcja (ISO-8859-_9)"
-
-#: src/mainwindow.c:601 src/messageview.c:183
-msgid "/_View/_Code set/Cyrillic (ISO-8859-_5)"
-msgstr "/_Widok/_Strona kodowa/Cyrylica (ISO-8859-_5)"
-
-#: src/mainwindow.c:603 src/messageview.c:185
-msgid "/_View/_Code set/Cyrillic (KOI8-_R)"
-msgstr "/_Widok/_Strona kodowa/Cyrylica (KOI8-_R)"
-
-#: src/mainwindow.c:605 src/messageview.c:187
+#: src/mainwindow.c:618 src/messageview.c:194
 #, fuzzy
-msgid "/_View/_Code set/Cyrillic (KOI8-U)"
-msgstr "/_Widok/_Strona kodowa/Cyrylica (KOI8-_R)"
-
-#: src/mainwindow.c:607 src/messageview.c:189
-msgid "/_View/_Code set/Cyrillic (Windows-1251)"
-msgstr "/_Widok/_Strona kodowa/Cyrylica (Windows-1251)"
-
-#: src/mainwindow.c:610 src/messageview.c:192
-msgid "/_View/_Code set/Japanese (ISO-2022-_JP)"
-msgstr "/_Widok/_Strona kodowa/Japonia (ISO-2022-_JP)"
-
-#: src/mainwindow.c:612 src/messageview.c:194
-msgid "/_View/_Code set/Japanese (ISO-2022-JP-2)"
+msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Widok/_Strona kodowa/Japonia (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:614 src/messageview.c:196
-msgid "/_View/_Code set/Japanese (_EUC-JP)"
+#: src/mainwindow.c:620 src/messageview.c:196
+#, fuzzy
+msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Widok/_Strona kodowa/Japonia (_EUC-JP)"
 
-#: src/mainwindow.c:616 src/messageview.c:198
-msgid "/_View/_Code set/Japanese (_Shift__JIS)"
+#: src/mainwindow.c:622 src/messageview.c:198
+#, fuzzy
+msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Widok/_Strona kodowa/Japonia (_Shift__JIS)"
 
-#: src/mainwindow.c:619 src/messageview.c:201
-msgid "/_View/_Code set/Simplified Chinese (_GB2312)"
-msgstr "/_Widok/_Strona kodowa/Uproszczony Chiny (_GB2312)"
-
-#: src/mainwindow.c:621 src/messageview.c:203
-msgid "/_View/_Code set/Traditional Chinese (_Big5)"
-msgstr "/_Widok/_Strona kodowa/Tradycyjny Chiny (_Big5)"
-
-#: src/mainwindow.c:623 src/messageview.c:205
-msgid "/_View/_Code set/Traditional Chinese (EUC-_TW)"
-msgstr "/_Widok/_Strona kodowa/Tradycyjny Chiny (EUC-_TW)"
-
-#: src/mainwindow.c:625 src/messageview.c:207
-msgid "/_View/_Code set/Chinese (ISO-2022-_CN)"
+#: src/mainwindow.c:632 src/messageview.c:207
+#, fuzzy
+msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Widok/_Strona kodowa/Chiny (ISO-2022-_CN)"
 
-#: src/mainwindow.c:628 src/messageview.c:210
-msgid "/_View/_Code set/Korean (EUC-_KR)"
-msgstr "/_Widok/_Strona kodowa/Korea(EUC-_KR)"
-
-#: src/mainwindow.c:630 src/messageview.c:212
-msgid "/_View/_Code set/Korean (ISO-2022-KR)"
+#: src/mainwindow.c:638 src/messageview.c:212
+#, fuzzy
+msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Widok/_Strona kodowa/Korea (ISO-2022-KR)"
 
-#: src/mainwindow.c:633 src/messageview.c:215
-msgid "/_View/_Code set/Thai (TIS-620)"
-msgstr "/_Widok/_Strona kodowa/Tajlandia (TIS-620)"
-
-#: src/mainwindow.c:635 src/messageview.c:217
-msgid "/_View/_Code set/Thai (Windows-874)"
-msgstr "/_Widok/_Strona kodowa/Tajlandia (Windows-874)"
-
-#: src/mainwindow.c:642 src/summaryview.c:371
+#: src/mainwindow.c:651 src/summaryview.c:371
 msgid "/_View/Open in new _window"
 msgstr "/W_Widok/Ot_wórz w nowym oknie"
 
-#: src/mainwindow.c:643 src/messageview.c:224
+#: src/mainwindow.c:652 src/messageview.c:224
 msgid "/_View/Mess_age source"
 msgstr "/_Widok/P_okaż źródło"
 
-#: src/mainwindow.c:644 src/messageview.c:225
+#: src/mainwindow.c:653 src/messageview.c:225
 msgid "/_View/Show all _header"
 msgstr "/_Widok/Pokaż wszystkie na_główki"
 
-#: src/mainwindow.c:646
+#: src/mainwindow.c:655
 msgid "/_View/_Update summary"
 msgstr "/_Widok/_Odśwież podsumowanie"
 
-#: src/mainwindow.c:648 src/messageview.c:227
+#: src/mainwindow.c:657 src/messageview.c:227
 msgid "/_Message"
 msgstr "/_Wiadomość"
 
-#: src/mainwindow.c:649
+#: src/mainwindow.c:658
 msgid "/_Message/Recei_ve"
 msgstr "/Wiado_mość/Odbier_z"
 
-#: src/mainwindow.c:650
+#: src/mainwindow.c:659
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/Wiado_mość/Odbier_z/Pobierz z bieżą_cego konta"
 
-#: src/mainwindow.c:652
+#: src/mainwindow.c:661
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/Wiado_mość/Odbier_z/Pobierz ze _wszystkich kont"
 
-#: src/mainwindow.c:654
+#: src/mainwindow.c:663
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/_Wiadomość/Odbier_z/Anuluj pob_ieranie"
 
-#: src/mainwindow.c:656
+#: src/mainwindow.c:665
 msgid "/_Message/Recei_ve/---"
 msgstr "/Wiado_mość/Odbier_z/---"
 
-#: src/mainwindow.c:657
+#: src/mainwindow.c:666
 msgid "/_Message/_Send queued messages"
 msgstr "/Wiado_mość/Wyślij wia_domości z kolejki"
 
-#: src/mainwindow.c:658 src/mainwindow.c:660 src/mainwindow.c:667
-#: src/mainwindow.c:672 src/mainwindow.c:676 src/mainwindow.c:685
+#: src/mainwindow.c:667 src/mainwindow.c:669 src/mainwindow.c:676
+#: src/mainwindow.c:681 src/mainwindow.c:685 src/mainwindow.c:694
 #: src/messageview.c:230 src/messageview.c:238 src/messageview.c:243
 msgid "/_Message/---"
 msgstr "/_Wiadomość/---"
 
-#: src/mainwindow.c:659 src/messageview.c:228
+#: src/mainwindow.c:668 src/messageview.c:228
 msgid "/_Message/Compose _new message"
 msgstr "/Wiado_mość/Twórz _nową wiadomość"
 
-#: src/mainwindow.c:661 src/messageview.c:231
+#: src/mainwindow.c:670 src/messageview.c:231
 msgid "/_Message/_Reply"
 msgstr "/Wiado_mość/_Odpowiedz"
 
-#: src/mainwindow.c:662
+#: src/mainwindow.c:671
 msgid "/_Message/Repl_y to"
 msgstr "/Wiado_mość/Odpowied_z"
 
-#: src/mainwindow.c:663 src/messageview.c:232
+#: src/mainwindow.c:672 src/messageview.c:232
 msgid "/_Message/Repl_y to/_all"
 msgstr "/Wiado_mość/Odpowied_z/w_szystkim"
 
-#: src/mainwindow.c:664 src/messageview.c:234
+#: src/mainwindow.c:673 src/messageview.c:234
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/Wiado_mość/Odpowied_z/nadawc_y"
 
-#: src/mainwindow.c:665 src/messageview.c:236
+#: src/mainwindow.c:674 src/messageview.c:236
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/Wiado_mość/Odpowiedz/_liście dyskusyjnej"
 
-#: src/mainwindow.c:668 src/messageview.c:239
+#: src/mainwindow.c:677 src/messageview.c:239
 msgid "/_Message/_Forward"
 msgstr "/Wiado_mość/Przekaż da_lej"
 
-#: src/mainwindow.c:669 src/messageview.c:240
+#: src/mainwindow.c:678 src/messageview.c:240
 msgid "/_Message/For_ward as attachment"
 msgstr "/Wiado_mość/Przekaż j_ako załącznik"
 
-#: src/mainwindow.c:671 src/messageview.c:242
+#: src/mainwindow.c:680 src/messageview.c:242
 msgid "/_Message/Redirec_t"
 msgstr "/Wiado_mość/Prze_kieruj"
 
-#: src/mainwindow.c:673
+#: src/mainwindow.c:682
 msgid "/_Message/M_ove..."
 msgstr "/Wiado_mość/_Przesuń..."
 
-#: src/mainwindow.c:674
+#: src/mainwindow.c:683
 msgid "/_Message/_Copy..."
 msgstr "/Wiado_mość/_Kopiuj"
 
-#: src/mainwindow.c:675
+#: src/mainwindow.c:684
 msgid "/_Message/_Delete"
 msgstr "/Wiado_mość/_Usuń"
 
-#: src/mainwindow.c:677
+#: src/mainwindow.c:686
 msgid "/_Message/_Mark"
 msgstr "/Wiado_mość/_Zaznacz"
 
-#: src/mainwindow.c:678
+#: src/mainwindow.c:687
 msgid "/_Message/_Mark/_Mark"
 msgstr "/Wiado_mość/_Zaznacz/_Zaznacz"
 
-#: src/mainwindow.c:679
+#: src/mainwindow.c:688
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/Wiado_mość/_Zaznacz/_Odznacz"
 
-#: src/mainwindow.c:680
+#: src/mainwindow.c:689
 msgid "/_Message/_Mark/---"
 msgstr "/Wiado_mość/_Zaznacz/---"
 
-#: src/mainwindow.c:681
+#: src/mainwindow.c:690
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/Wiado_mość/_Zaznacz/Zaznacz jako ni_eprzeczytane"
 
-#: src/mainwindow.c:682
+#: src/mainwindow.c:691
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/Wiado_mość/_Zaznacz/Zaznacz jako przecz_ytane"
 
-#: src/mainwindow.c:684
+#: src/mainwindow.c:693
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/Wiado_mość/_Zaznacz/Zaznacz wszystkie jako przecz_ytane"
 
-#: src/mainwindow.c:686 src/messageview.c:244
+#: src/mainwindow.c:695 src/messageview.c:244
 msgid "/_Message/Re-_edit"
 msgstr "/Wiado_mość/Prz_eedytuj"
 
-#: src/mainwindow.c:690 src/messageview.c:248
+#: src/mainwindow.c:699 src/messageview.c:248
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/_Narzędzia/Dodaj nadawcę do _książki adresowej"
 
-#: src/mainwindow.c:693
+#: src/mainwindow.c:702
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/_Narzędzia/_Filtruj wiadomości w katalogu"
 
-#: src/mainwindow.c:695
+#: src/mainwindow.c:704
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Narzędzia/Filtruj zaznaczonne wiadomości"
 
-#: src/mainwindow.c:697 src/messageview.c:251
+#: src/mainwindow.c:706 src/messageview.c:251
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Narzędzia/_Utwórz regułę filtrowania"
 
-#: src/mainwindow.c:698 src/messageview.c:253
+#: src/mainwindow.c:707 src/messageview.c:253
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Narzędzia/_Utwórz regułę filtrowania/_Automatycznie"
 
-#: src/mainwindow.c:700 src/messageview.c:255
+#: src/mainwindow.c:709 src/messageview.c:255
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Narzędzia/_Utwórz regułę filtrowania/_Od"
 
-#: src/mainwindow.c:702 src/messageview.c:257
+#: src/mainwindow.c:711 src/messageview.c:257
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Narzędzia/_Utwórz regułę filtrowania/_Do"
 
-#: src/mainwindow.c:704 src/messageview.c:259
+#: src/mainwindow.c:713 src/messageview.c:259
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Narzędzia/_Utwórz regułę filtrowania/_Temat"
 
-#: src/mainwindow.c:709
+#: src/mainwindow.c:718
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/Wiado_mość/Usuń z_duplikowane wiadomości"
 
-#: src/mainwindow.c:712
+#: src/mainwindow.c:721
 msgid "/_Tools/E_xecute"
 msgstr "/_Narzędzia/_Wykonaj"
 
-#: src/mainwindow.c:714
+#: src/mainwindow.c:723
 msgid "/_Tools/_Log window"
 msgstr "/_Narzędzia/Okno _logów"
 
-#: src/mainwindow.c:716
+#: src/mainwindow.c:725
 msgid "/_Configuration"
 msgstr "/Konfigura_cja"
 
-#: src/mainwindow.c:717
+#: src/mainwindow.c:726
 msgid "/_Configuration/_Common preferences..."
 msgstr "/Konfigura_cja/Preferen_cje..."
 
-#: src/mainwindow.c:719
+#: src/mainwindow.c:728
 msgid "/_Configuration/_Filter setting..."
 msgstr "/Konfigura_cja/Ustawienia _filtrowania"
 
-#: src/mainwindow.c:721
+#: src/mainwindow.c:730
 msgid "/_Configuration/_Template..."
 msgstr "/Konfigura_cja/_Szablon..."
 
-#: src/mainwindow.c:722
+#: src/mainwindow.c:731
 msgid "/_Configuration/_Actions..."
 msgstr "/Konfigura_cja/Poleceni_a..."
 
-#: src/mainwindow.c:723
+#: src/mainwindow.c:732
 msgid "/_Configuration/---"
 msgstr "/Konfigura_cja/---"
 
-#: src/mainwindow.c:724
+#: src/mainwindow.c:733
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/Konfigura_cja/_Preferencje bieżącego konta..."
 
-#: src/mainwindow.c:726
+#: src/mainwindow.c:735
 msgid "/_Configuration/Create _new account..."
 msgstr "/Konfigura_cja/Utwórz _nowe konto..."
 
-#: src/mainwindow.c:728
+#: src/mainwindow.c:737
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/Konfigura_cja/_Edytuj konta..."
 
-#: src/mainwindow.c:730
+#: src/mainwindow.c:739
 msgid "/_Configuration/C_hange current account"
 msgstr "/Konfigura_cja/Zmień bieżą_ce konto"
 
-#: src/mainwindow.c:734
+#: src/mainwindow.c:743
 msgid "/_Help/_Manual"
 msgstr "/_Pomoc/_Podręcznik"
 
-#: src/mainwindow.c:735
+#: src/mainwindow.c:744
 msgid "/_Help/_Manual/_English"
 msgstr "/_Pomoc/_Podręcznik/Angi_elski"
 
-#: src/mainwindow.c:736
+#: src/mainwindow.c:745
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/_Pomoc/_Podręcznik/_Japoński"
 
-#: src/mainwindow.c:737
+#: src/mainwindow.c:746
 msgid "/_Help/_FAQ"
 msgstr "/Pomo_c/_FAQ"
 
-#: src/mainwindow.c:738
+#: src/mainwindow.c:747
 msgid "/_Help/_FAQ/_English"
 msgstr "/_Pomoc/_FAQ/Angi_elskie"
 
-#: src/mainwindow.c:739
+#: src/mainwindow.c:748
 msgid "/_Help/_FAQ/_German"
 msgstr "/_Pomoc/_FAQ/_Niemieckie"
 
-#: src/mainwindow.c:740
+#: src/mainwindow.c:749
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/_Pomoc/_FAQ/Hi_szpańskie"
 
-#: src/mainwindow.c:741
+#: src/mainwindow.c:750
 msgid "/_Help/_FAQ/_French"
 msgstr "/_Pomoc/_FAQ/_Francuskie"
 
-#: src/mainwindow.c:742
+#: src/mainwindow.c:751
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/_Pomoc/_FAQ/_Włoskie"
 
-#: src/mainwindow.c:743
+#: src/mainwindow.c:752
 msgid "/_Help/---"
 msgstr "/_Pomoc/---"
 
-#: src/mainwindow.c:783
+#: src/mainwindow.c:792
 msgid "Creating main window...\n"
 msgstr "Tworzenie głównego okna...\n"
 
-#: src/mainwindow.c:943
+#: src/mainwindow.c:952
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Okno główne: błąd alokacji kolorów %d\n"
 
-#: src/mainwindow.c:1021 src/summaryview.c:1368 src/summaryview.c:1677
+#: src/mainwindow.c:1030 src/summaryview.c:1368 src/summaryview.c:1677
 #: src/summaryview.c:1785 src/summaryview.c:1831 src/summaryview.c:2453
 #: src/summaryview.c:3080 src/summaryview.c:3146 src/summaryview.c:3171
 #: src/summaryview.c:3284
 msgid "done.\n"
 msgstr "gotowe.\n"
 
-#: src/mainwindow.c:1137 src/mainwindow.c:1178 src/mainwindow.c:1206
+#: src/mainwindow.c:1146 src/mainwindow.c:1187 src/mainwindow.c:1215
 msgid "Untitled"
 msgstr "Bez tytułu"
 
-#: src/mainwindow.c:1207
+#: src/mainwindow.c:1216
 msgid "none"
 msgstr "żaden"
 
-#: src/mainwindow.c:1257
+#: src/mainwindow.c:1266
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "Zmiana typu rozdzielania okna z %d na %d\n"
 
-#: src/mainwindow.c:1477
+#: src/mainwindow.c:1486
 msgid "Offline"
 msgstr "Offline"
 
-#: src/mainwindow.c:1478
+#: src/mainwindow.c:1487
 msgid "You are offline. Go online?"
 msgstr "Jesteś offline. Przejść do trybu online?"
 
-#: src/mainwindow.c:1492
+#: src/mainwindow.c:1501
 msgid "Empty all trash"
 msgstr "Opróżnij śmietnik"
 
-#: src/mainwindow.c:1493
+#: src/mainwindow.c:1502
 msgid "Empty messages in all trash?"
 msgstr "Usunąć wszystkie wiadomości ze śmietnika?"
 
-#: src/mainwindow.c:1521
+#: src/mainwindow.c:1530
 msgid "Add mailbox"
 msgstr "Dodaj skrzynkę"
 
-#: src/mainwindow.c:1522
+#: src/mainwindow.c:1531
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3122,16 +3158,16 @@ msgstr ""
 "Jeśli zostanie podana istniejąca skrzynka, będzie ona\n"
 "automatycznie skanowana."
 
-#: src/mainwindow.c:1528
+#: src/mainwindow.c:1537
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Skrzynka \"%s\" już istnieje."
 
-#: src/mainwindow.c:1533 src/setup.c:57
+#: src/mainwindow.c:1542 src/setup.c:57
 msgid "Mailbox"
 msgstr "Skrzynka"
 
-#: src/mainwindow.c:1539 src/setup.c:63
+#: src/mainwindow.c:1548 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3141,141 +3177,141 @@ msgstr ""
 "Być może pliki już istnieją lub brak jest wystarczających uprawnień do "
 "zapisu w tym miejscu."
 
-#: src/mainwindow.c:1912
+#: src/mainwindow.c:1921
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Widok Katalogów"
 
-#: src/mainwindow.c:1932 src/messageview.c:358
+#: src/mainwindow.c:1941 src/messageview.c:358
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Widok Wiadomości"
 
-#: src/mainwindow.c:2079 src/summaryview.c:340
+#: src/mainwindow.c:2088 src/summaryview.c:340
 msgid "/_Reply"
 msgstr "/_Odpowiedz"
 
-#: src/mainwindow.c:2080
+#: src/mainwindow.c:2089
 msgid "/Reply to _all"
 msgstr "/Odpowiedz wszystkim"
 
-#: src/mainwindow.c:2081
+#: src/mainwindow.c:2090
 msgid "/Reply to _sender"
 msgstr "/Odpowiedz nadawcy"
 
-#: src/mainwindow.c:2082
+#: src/mainwindow.c:2091
 msgid "/Reply to mailing _list"
 msgstr "/Odpowiedz _liście dyskusyjnej"
 
-#: src/mainwindow.c:2087 src/summaryview.c:347
+#: src/mainwindow.c:2096 src/summaryview.c:347
 msgid "/_Forward"
 msgstr "/Prze_każ"
 
-#: src/mainwindow.c:2088 src/summaryview.c:348
+#: src/mainwindow.c:2097 src/summaryview.c:348
 msgid "/For_ward as attachment"
 msgstr "/Przekaż jako załącznik"
 
-#: src/mainwindow.c:2089 src/summaryview.c:349
+#: src/mainwindow.c:2098 src/summaryview.c:349
 msgid "/Redirec_t"
 msgstr "/Prze_kieruj"
 
-#: src/mainwindow.c:2125
+#: src/mainwindow.c:2134
 msgid "Get"
 msgstr "Odbierz"
 
-#: src/mainwindow.c:2126
+#: src/mainwindow.c:2135
 msgid "Incorporate new mail"
 msgstr "Odbierz nową pocztę"
 
-#: src/mainwindow.c:2133
+#: src/mainwindow.c:2142
 msgid "Get all"
 msgstr "Odbierz wsz."
 
-#: src/mainwindow.c:2134
+#: src/mainwindow.c:2143
 msgid "Incorporate new mail of all accounts"
 msgstr "Odbierz nową pocztę z wszystkich kont"
 
-#: src/mainwindow.c:2145
+#: src/mainwindow.c:2154
 msgid "Send queued message(s)"
 msgstr "Wyślij wiadomości z kolejki"
 
-#: src/mainwindow.c:2155 src/prefs_account.c:705 src/prefs_common.c:852
+#: src/mainwindow.c:2164 src/prefs_account.c:705 src/prefs_common.c:852
 #: src/prefs_folder_item.c:137
 msgid "Compose"
 msgstr "Utwórz"
 
-#: src/mainwindow.c:2156
+#: src/mainwindow.c:2165
 msgid "Compose new message"
 msgstr "Utwórz nową wiadomość"
 
-#: src/mainwindow.c:2164 src/prefs_common.c:1353
+#: src/mainwindow.c:2173 src/prefs_common.c:1365
 msgid "Reply"
 msgstr "Odpowiedz"
 
-#: src/mainwindow.c:2165 src/mainwindow.c:2178
+#: src/mainwindow.c:2174 src/mainwindow.c:2187
 msgid "Reply to the message"
 msgstr "Odpowiedz na wiadomość"
 
-#: src/mainwindow.c:2183
+#: src/mainwindow.c:2192
 msgid "Reply all"
 msgstr "Odp. na wsz."
 
-#: src/mainwindow.c:2184
+#: src/mainwindow.c:2193
 msgid "Reply to all"
 msgstr "Odpowiedz na wszystkie"
 
-#: src/mainwindow.c:2192 src/prefs_filter_edit.c:719
+#: src/mainwindow.c:2201 src/prefs_filter_edit.c:719
 msgid "Forward"
 msgstr "Przekaż"
 
-#: src/mainwindow.c:2193 src/mainwindow.c:2206
+#: src/mainwindow.c:2202 src/mainwindow.c:2215
 msgid "Forward the message"
 msgstr "Przekaż wiadomość dalej"
 
-#: src/mainwindow.c:2213
+#: src/mainwindow.c:2222
 msgid "Delete the message"
 msgstr "Usuń wiadomość"
 
-#: src/mainwindow.c:2221
+#: src/mainwindow.c:2230
 msgid "Execute"
 msgstr "Wykonaj"
 
-#: src/mainwindow.c:2222
+#: src/mainwindow.c:2231
 msgid "Execute marked process"
 msgstr "Wykonaj zaznaczony proces"
 
-#: src/mainwindow.c:2231
+#: src/mainwindow.c:2240
 msgid "Next unread message"
 msgstr "Następna nieprzeczytana wiadomość"
 
-#: src/mainwindow.c:2242
+#: src/mainwindow.c:2251
 msgid "Prefs"
 msgstr "Preferencje"
 
-#: src/mainwindow.c:2243
+#: src/mainwindow.c:2252
 msgid "Common preferences"
 msgstr "Wspólne preferencje "
 
-#: src/mainwindow.c:2250 src/prefs_folder_item.c:258
+#: src/mainwindow.c:2259 src/prefs_folder_item.c:258
 #: src/prefs_folder_item.c:269 src/progressdialog.c:50
 msgid "Account"
 msgstr "Konto"
 
-#: src/mainwindow.c:2251
+#: src/mainwindow.c:2260
 msgid "Account setting"
 msgstr "Ustawienia konta"
 
-#: src/mainwindow.c:2425
+#: src/mainwindow.c:2434
 msgid "You are offline. Click the icon to go online."
 msgstr "Jesteś offline. Kliknij ikonę by przejść do trybu online."
 
-#: src/mainwindow.c:2436
+#: src/mainwindow.c:2445
 msgid "You are online. Click the icon to go offline."
 msgstr "Jesteś online. Kliknij ikonę, by przejść do trybu offline."
 
-#: src/mainwindow.c:2624
+#: src/mainwindow.c:2633
 msgid "Exit"
 msgstr "Koniec programu"
 
-#: src/mainwindow.c:2624
+#: src/mainwindow.c:2633
 msgid "Exit this program?"
 msgstr "Czy zakończyć program?"
 
@@ -3401,7 +3437,7 @@ msgstr "Przeszukiwanie zakończone"
 msgid "Creating message view...\n"
 msgstr "Tworzenie widoku wiadomości...\n"
 
-#: src/messageview.c:303 src/prefs_common.c:1550
+#: src/messageview.c:303 src/prefs_common.c:1562
 msgid "Text"
 msgstr "Tekst"
 
@@ -3414,7 +3450,7 @@ msgstr "Załączniki"
 msgid "Can't save the file `%s'."
 msgstr "Nie można zapisać pliku \"%s\"."
 
-#: src/messageview.c:697 src/prefs_common.c:2154 src/summaryview.c:2744
+#: src/messageview.c:697 src/prefs_common.c:2166 src/summaryview.c:2744
 msgid "Print"
 msgstr "Drukuj"
 
@@ -3886,7 +3922,7 @@ msgstr "(Nieprzefiltrowane wiadomości zostaną zachowane w tym katalogu)"
 msgid "Authentication method"
 msgstr "Sposób uwierzytelniania"
 
-#: src/prefs_account.c:1123 src/prefs_account.c:1239 src/prefs_common.c:1189
+#: src/prefs_account.c:1123 src/prefs_account.c:1239 src/prefs_common.c:1201
 msgid "Automatic"
 msgstr "Automatycznie"
 
@@ -3910,7 +3946,7 @@ msgstr "Generowanie identyrikatora wiadomości"
 msgid "Add user-defined header"
 msgstr "Dodawanie nagłówka zdefiniowanego przez użytkownika"
 
-#: src/prefs_account.c:1196 src/prefs_common.c:1714 src/prefs_common.c:1739
+#: src/prefs_account.c:1196 src/prefs_common.c:1726 src/prefs_common.c:1751
 msgid " Edit... "
 msgstr "Edycja..."
 
@@ -4306,106 +4342,107 @@ msgid "Save sent messages to outbox"
 msgstr "Zapisywanie wysłanych wiadomości do Poczta wysłana"
 
 #: src/prefs_common.c:1113
-msgid "Outgoing codeset"
+#, fuzzy
+msgid "Outgoing encoding"
 msgstr "Strona kodowa dla wychodzących"
 
 #: src/prefs_common.c:1128
 msgid "Automatic (Recommended)"
 msgstr "Automatycznie (Zalecane)"
 
-#: src/prefs_common.c:1129
+#: src/prefs_common.c:1130
 msgid "7bit ascii (US-ASCII)"
 msgstr "7 bitów ascii (US-ASCII)"
 
-#: src/prefs_common.c:1130
+#: src/prefs_common.c:1132
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
-#: src/prefs_common.c:1131
+#: src/prefs_common.c:1134
 msgid "Western European (ISO-8859-1)"
 msgstr "Europa Zachodnia (ISO-8859-1)"
 
-#: src/prefs_common.c:1132
+#: src/prefs_common.c:1135
 msgid "Western European (ISO-8859-15)"
 msgstr "Europa Zachodnia (ISO-8859-15)"
 
-#: src/prefs_common.c:1133
+#: src/prefs_common.c:1137
 msgid "Central European (ISO-8859-2)"
 msgstr "Europa Śodkowa (ISO-8859-2)"
 
-#: src/prefs_common.c:1134
+#: src/prefs_common.c:1139
 msgid "Baltic (ISO-8859-13)"
 msgstr "Kraje Bałtyckie (ISO-8859-13)"
 
-#: src/prefs_common.c:1135
+#: src/prefs_common.c:1140
 msgid "Baltic (ISO-8859-4)"
 msgstr "Kraje Bałtyckie (ISO-8859-4)"
 
-#: src/prefs_common.c:1136
+#: src/prefs_common.c:1142
 msgid "Greek (ISO-8859-7)"
 msgstr "Grecja (ISO-8859-7)"
 
-#: src/prefs_common.c:1137
+#: src/prefs_common.c:1144
 msgid "Turkish (ISO-8859-9)"
 msgstr "Turcja (ISO-8859-9)"
 
-#: src/prefs_common.c:1138
+#: src/prefs_common.c:1146
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Cyrylica (ISO-8859-5)"
 
-#: src/prefs_common.c:1139
+#: src/prefs_common.c:1147
 msgid "Cyrillic (KOI8-R)"
 msgstr "Cyrylica (KOI8-R)"
 
-#: src/prefs_common.c:1140
-msgid "Cyrillic (Windows-1251)"
-msgstr "Cyrylica (Windows-1251)"
-
-#: src/prefs_common.c:1141
+#: src/prefs_common.c:1148
 msgid "Cyrillic (KOI8-U)"
 msgstr "Cyrylica (KOI8-U)"
 
-#: src/prefs_common.c:1142
+#: src/prefs_common.c:1149
+msgid "Cyrillic (Windows-1251)"
+msgstr "Cyrylica (Windows-1251)"
+
+#: src/prefs_common.c:1151
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Japonia (ISO-2022-JP)"
 
-#: src/prefs_common.c:1144
+#: src/prefs_common.c:1153
 msgid "Japanese (EUC-JP)"
 msgstr "Japonia (EUC-JP)"
 
-#: src/prefs_common.c:1145
+#: src/prefs_common.c:1154
 msgid "Japanese (Shift_JIS)"
 msgstr "Japonia (Shift_JIS)"
 
-#: src/prefs_common.c:1147
+#: src/prefs_common.c:1157
 msgid "Simplified Chinese (GB2312)"
 msgstr "Uproszczony Chiny (GB2312)"
 
-#: src/prefs_common.c:1148
+#: src/prefs_common.c:1158
 msgid "Traditional Chinese (Big5)"
 msgstr "Tradycyjny Chiny (Big5)"
 
-#: src/prefs_common.c:1150
+#: src/prefs_common.c:1160
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Tradycyjny Chiny (EUC-TW)"
 
-#: src/prefs_common.c:1151
+#: src/prefs_common.c:1161
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Chiny (ISO-2022-CN)"
 
-#: src/prefs_common.c:1153
+#: src/prefs_common.c:1164
 msgid "Korean (EUC-KR)"
 msgstr "Korea (EUC-KR)"
 
-#: src/prefs_common.c:1154
+#: src/prefs_common.c:1166
 msgid "Thai (TIS-620)"
 msgstr "Tajlandia (TIS-620)"
 
-#: src/prefs_common.c:1155
+#: src/prefs_common.c:1167
 msgid "Thai (Windows-874)"
 msgstr "Tajlandia (Windows-874)"
 
-#: src/prefs_common.c:1165
+#: src/prefs_common.c:1177
 #, fuzzy
 msgid ""
 "If `Automatic' is selected, the optimal encoding for the current locale will "
@@ -4414,11 +4451,11 @@ msgstr ""
 "Jeśli wybrano \"Automatycznie\" to zostanie użyte\n"
 "optymalne kodowanie dla bieżących ustawień lokalnych."
 
-#: src/prefs_common.c:1179
+#: src/prefs_common.c:1191
 msgid "Transfer encoding"
 msgstr "Kodowanie przesyłanych danych"
 
-#: src/prefs_common.c:1202
+#: src/prefs_common.c:1214
 #, fuzzy
 msgid ""
 "Specify Content-Transfer-Encoding used when message body contains non-ASCII "
@@ -4427,442 +4464,442 @@ msgstr ""
 "Opcja ta określa Content-Transfer-Encoding dla sytuacji,\n"
 "gdzie treść listu zawiera znaki nie-ASCII."
 
-#: src/prefs_common.c:1272
+#: src/prefs_common.c:1284
 msgid "Signature separator"
 msgstr "Oddzielenie podpisu"
 
-#: src/prefs_common.c:1281
+#: src/prefs_common.c:1293
 msgid "Insert automatically"
 msgstr "Automatyczne wstawianie podpisu"
 
-#: src/prefs_common.c:1291
+#: src/prefs_common.c:1303
 msgid "Automatically launch the external editor"
 msgstr "Automatyczne uruchamianie zewnętrznego edytora"
 
-#: src/prefs_common.c:1301
+#: src/prefs_common.c:1313
 msgid "Undo level"
 msgstr "Poziom Cofnij"
 
-#: src/prefs_common.c:1321
+#: src/prefs_common.c:1333
 msgid "Wrap messages at"
 msgstr "Zawijaj wiadomości przy"
 
-#: src/prefs_common.c:1333
+#: src/prefs_common.c:1345
 msgid "characters"
 msgstr "znakach"
 
-#: src/prefs_common.c:1343
+#: src/prefs_common.c:1355
 msgid "Wrap quotation"
 msgstr "Zawijanie cytatu"
 
-#: src/prefs_common.c:1349
+#: src/prefs_common.c:1361
 msgid "Wrap on input"
 msgstr "Zawijanie podczas wprowadzania"
 
-#: src/prefs_common.c:1351
+#: src/prefs_common.c:1363
 msgid "Wrap before sending"
 msgstr "Zawijanie przed wysłaniem"
 
-#: src/prefs_common.c:1361
+#: src/prefs_common.c:1373
 msgid "Automatically select account for replies"
 msgstr "Automatyczne ustawianie konta dla odpowiedzi"
 
-#: src/prefs_common.c:1363
+#: src/prefs_common.c:1375
 msgid "Quote message when replying"
 msgstr "Cytowanie wiadomości przy odpowiedzi"
 
-#: src/prefs_common.c:1365
+#: src/prefs_common.c:1377
 msgid "Reply button invokes mailing list reply"
 msgstr "Przycisk Odpowiedz wysyła odpowiedź na listę dyskusyjną"
 
 #. reply
-#: src/prefs_common.c:1411
+#: src/prefs_common.c:1423
 msgid "Reply format"
 msgstr "Format odpowiedzi"
 
-#: src/prefs_common.c:1426 src/prefs_common.c:1468
+#: src/prefs_common.c:1438 src/prefs_common.c:1480
 msgid "Quotation mark"
 msgstr "Znak cytowania"
 
 #. forward
-#: src/prefs_common.c:1453
+#: src/prefs_common.c:1465
 msgid "Forward format"
 msgstr "Format przekazywania"
 
-#: src/prefs_common.c:1500
+#: src/prefs_common.c:1512
 msgid " Description of symbols "
 msgstr " Opis symboli "
 
-#: src/prefs_common.c:1541
+#: src/prefs_common.c:1553
 msgid "Font"
 msgstr "Czcionka"
 
-#: src/prefs_common.c:1573
+#: src/prefs_common.c:1585
 msgid "Translate header name (such as `From:', `Subject:')"
 msgstr "Tłumaczenie nazwy nagłówka (jak np. 'Od:', 'Temat:')"
 
-#: src/prefs_common.c:1576
+#: src/prefs_common.c:1588
 msgid "Display unread number next to folder name"
 msgstr "Wyświetlanie ilości nieprzeczytanych przy nazwie katalogu"
 
-#: src/prefs_common.c:1585
+#: src/prefs_common.c:1597
 msgid "Abbreviate newsgroups longer than"
 msgstr "Skracanie nazwy grup dłuższych niż "
 
-#: src/prefs_common.c:1600
+#: src/prefs_common.c:1612
 msgid "letters"
 msgstr "liter"
 
 #. ---- Summary ----
-#: src/prefs_common.c:1606
+#: src/prefs_common.c:1618
 msgid "Summary View"
 msgstr "Widok listy wiadomości"
 
-#: src/prefs_common.c:1615
+#: src/prefs_common.c:1627
 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.c:1617
+#: src/prefs_common.c:1629
 msgid "Expand threads"
 msgstr "Rozwijanie wątków"
 
-#: src/prefs_common.c:1625 src/prefs_common.c:2443 src/prefs_common.c:2481
+#: src/prefs_common.c:1637 src/prefs_common.c:2455 src/prefs_common.c:2493
 msgid "Date format"
 msgstr "Format daty"
 
-#: src/prefs_common.c:1646
+#: src/prefs_common.c:1658
 msgid " Set display item of summary... "
 msgstr " Ustaw element wyświetlania podsumowania... "
 
-#: src/prefs_common.c:1710
+#: src/prefs_common.c:1722
 msgid "Enable coloration of message"
 msgstr "Włączenie kolorowania wiadomości"
 
-#: src/prefs_common.c:1724
+#: src/prefs_common.c:1736
 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.c:1730
+#: src/prefs_common.c:1742
 msgid "Display header pane above message view"
 msgstr "Wyświetlanie panelu nagłówków ponad oknem wiadomości"
 
-#: src/prefs_common.c:1737
+#: src/prefs_common.c:1749
 msgid "Display short headers on message view"
 msgstr "Wyświetlanie krótkich nagłówków w widoku wiadomości"
 
-#: src/prefs_common.c:1758
+#: src/prefs_common.c:1770
 msgid "Line space"
 msgstr "Odstęp międzywierszowy"
 
-#: src/prefs_common.c:1772 src/prefs_common.c:1810
+#: src/prefs_common.c:1784 src/prefs_common.c:1822
 msgid "pixel(s)"
 msgstr "piksel(e)"
 
-#: src/prefs_common.c:1777
+#: src/prefs_common.c:1789
 msgid "Scroll"
 msgstr "Przewijanie"
 
-#: src/prefs_common.c:1784
+#: src/prefs_common.c:1796
 msgid "Half page"
 msgstr "Pół strony"
 
-#: src/prefs_common.c:1790
+#: src/prefs_common.c:1802
 msgid "Smooth scroll"
 msgstr "Wygładzone przewijanie"
 
-#: src/prefs_common.c:1796
+#: src/prefs_common.c:1808
 msgid "Step"
 msgstr "Krok"
 
-#: src/prefs_common.c:1816
+#: src/prefs_common.c:1828
 msgid "Images"
 msgstr ""
 
-#: src/prefs_common.c:1824
+#: src/prefs_common.c:1836
 #, fuzzy
 msgid "Resize attached large images to fit in the window"
 msgstr "Dopasowywanie rozmiaru dołączonych obrazków"
 
-#: src/prefs_common.c:1826
+#: src/prefs_common.c:1838
 msgid "Display images as inline"
 msgstr "Pokaż grafikę w treści"
 
-#: src/prefs_common.c:1871
+#: src/prefs_common.c:1883
 msgid "Automatically check signatures"
 msgstr "Automatyczne sprawdzanie podpisów"
 
-#: src/prefs_common.c:1874
+#: src/prefs_common.c:1886
 msgid "Show signature check result in a popup window"
 msgstr "Wyświetlanie wyniku sprawdzania podpisu w oknie komunikatów"
 
-#: src/prefs_common.c:1877
+#: src/prefs_common.c:1889
 msgid "Store passphrase in memory temporarily"
 msgstr "Tymczasowe zapamiętywanie hasła w pamięci"
 
-#: src/prefs_common.c:1892
+#: src/prefs_common.c:1904
 msgid "Expired after"
 msgstr "Wygasanie po"
 
-#: src/prefs_common.c:1905
+#: src/prefs_common.c:1917
 msgid "minute(s) "
 msgstr "minuta(y)"
 
-#: src/prefs_common.c:1918
+#: src/prefs_common.c:1930
 #, fuzzy
 msgid "Setting to '0' will store the passphrase for the whole session."
 msgstr ""
 "(Wartość \"0\" ustawi zapamiętywanie hasła na czas\n"
 " całej sesji)"
 
-#: src/prefs_common.c:1932
+#: src/prefs_common.c:1944
 msgid "Grab input while entering a passphrase"
 msgstr "Przechwytywanie wejścia podczas wprowadzania hasła"
 
-#: src/prefs_common.c:1937
+#: src/prefs_common.c:1949
 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.c:1989
+#: src/prefs_common.c:2001
 msgid "Always open messages in summary when selected"
 msgstr "Zawsze otwieraj wiadomości gdy wybrano widok podsumowania."
 
-#: src/prefs_common.c:1993
+#: src/prefs_common.c:2005
 msgid "Open first unread message when entering a folder"
 msgstr ""
 "Otwieranie pierwszej nieprzeczytanej wiadomości przy wchodzeniu do katalogu"
 
-#: src/prefs_common.c:1997
+#: src/prefs_common.c:2009
 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.c:2001
+#: src/prefs_common.c:2013
 msgid "Go to inbox after receiving new mail"
 msgstr "Przechodzenie do Poczty przychodzącej po odbiorze poczty"
 
-#: src/prefs_common.c:2009
+#: src/prefs_common.c:2021
 msgid "Execute immediately when moving or deleting messages"
 msgstr "Natychmiastowe wykonywanie przy przenoszeniu lub kasowaniu wiadomości"
 
-#: src/prefs_common.c:2021
+#: src/prefs_common.c:2033
 #, fuzzy
 msgid "Messages will be marked until execution if this is turned off."
 msgstr ""
 "(Wiadomości pozostaną zaznaczone do wykonania\n"
 " gdy opcja ta jest wyłączona)"
 
-#: src/prefs_common.c:2029
+#: src/prefs_common.c:2041
 msgid "Receive dialog"
 msgstr "Okno dialogowe odbierania"
 
-#: src/prefs_common.c:2039
+#: src/prefs_common.c:2051
 msgid "Show receive dialog"
 msgstr "Wyświetlanie okna dialogowego odbierania"
 
-#: src/prefs_common.c:2049
+#: src/prefs_common.c:2061
 msgid "Always"
 msgstr "Zawsze"
 
-#: src/prefs_common.c:2050
+#: src/prefs_common.c:2062
 msgid "Only on manual receiving"
 msgstr "Tylko przy ręcznym odbieraniu"
 
-#: src/prefs_common.c:2052
+#: src/prefs_common.c:2064
 msgid "Never"
 msgstr "Nigdy"
 
-#: src/prefs_common.c:2057
+#: src/prefs_common.c:2069
 msgid "Don't popup error dialog on receive error"
 msgstr "Okno błędu pobierania wiadomości nie jest wyświetlane"
 
-#: src/prefs_common.c:2060
+#: src/prefs_common.c:2072
 msgid "Close receive dialog when finished"
 msgstr "Zamykanie okna dialogowego odbierania po zakończeniu"
 
-#: src/prefs_common.c:2066
+#: src/prefs_common.c:2078
 msgid " Set key bindings... "
 msgstr " Ustaw dowiązania klawiszy... "
 
-#: src/prefs_common.c:2122
+#: src/prefs_common.c:2134
 #, 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.c:2131
+#: src/prefs_common.c:2143
 msgid "Web browser"
 msgstr "Przeglądarka Web"
 
-#: src/prefs_common.c:2195
+#: src/prefs_common.c:2207
 msgid "Add address to destination when double-clicked"
 msgstr "Dodawanie adresu do docelowego po dwukrotnym kliknięciu"
 
-#: src/prefs_common.c:2197
+#: src/prefs_common.c:2209
 msgid "On exit"
 msgstr "Podczas wyjścia"
 
-#: src/prefs_common.c:2205
+#: src/prefs_common.c:2217
 msgid "Confirm on exit"
 msgstr "Potwierdzanie zamykania programu"
 
-#: src/prefs_common.c:2212
+#: src/prefs_common.c:2224
 msgid "Empty trash on exit"
 msgstr "Opróżnianie śmietnika przy zamykaniu programu"
 
-#: src/prefs_common.c:2214
+#: src/prefs_common.c:2226
 msgid "Ask before emptying"
 msgstr "Wyświetlanie pytania przed opróżnieniem"
 
-#: src/prefs_common.c:2218
+#: src/prefs_common.c:2230
 msgid "Warn if there are queued messages"
 msgstr "Ostrzeganie jeśli są wiadomości w kolejce"
 
-#: src/prefs_common.c:2224
+#: src/prefs_common.c:2236
 msgid "Socket I/O timeout:"
 msgstr "Limit czasu gniazda I/O:"
 
-#: src/prefs_common.c:2237
+#: src/prefs_common.c:2249
 msgid "second(s)"
 msgstr "sekund(y)"
 
-#: src/prefs_common.c:2419
+#: src/prefs_common.c:2431
 msgid "the full abbreviated weekday name"
 msgstr "skrócona nazwa dnia tygodnia"
 
-#: src/prefs_common.c:2420
+#: src/prefs_common.c:2432
 msgid "the full weekday name"
 msgstr "pełna nazwa dnia tygodnia"
 
-#: src/prefs_common.c:2421
+#: src/prefs_common.c:2433
 msgid "the abbreviated month name"
 msgstr "skrócona nazwa miesiąca"
 
-#: src/prefs_common.c:2422
+#: src/prefs_common.c:2434
 msgid "the full month name"
 msgstr "pełna nazwa miesiąca"
 
-#: src/prefs_common.c:2423
+#: src/prefs_common.c:2435
 msgid "the preferred date and time for the current locale"
 msgstr "preferowana data i czas dla ustawień lokalnych"
 
-#: src/prefs_common.c:2424
+#: src/prefs_common.c:2436
 msgid "the century number (year/100)"
 msgstr "numer roku (rok/100)"
 
-#: src/prefs_common.c:2425
+#: src/prefs_common.c:2437
 msgid "the day of the month as a decimal number"
 msgstr "dzień miesiąca jako liczba dziesiętna"
 
-#: src/prefs_common.c:2426
+#: src/prefs_common.c:2438
 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.c:2427
+#: src/prefs_common.c:2439
 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.c:2428
+#: src/prefs_common.c:2440
 msgid "the day of the year as a decimal number"
 msgstr "dzień roku jako liczba dziesiętna"
 
-#: src/prefs_common.c:2429
+#: src/prefs_common.c:2441
 msgid "the month as a decimal number"
 msgstr "miesiąc jako liczba dziesiętna"
 
-#: src/prefs_common.c:2430
+#: src/prefs_common.c:2442
 msgid "the minute as a decimal number"
 msgstr "minuta jako liczba dziesiętna"
 
-#: src/prefs_common.c:2431
+#: src/prefs_common.c:2443
 msgid "either AM or PM"
 msgstr "albo AM albo PM"
 
-#: src/prefs_common.c:2432
+#: src/prefs_common.c:2444
 msgid "the second as a decimal number"
 msgstr "sekunda jako liczba dziesiętna"
 
-#: src/prefs_common.c:2433
+#: src/prefs_common.c:2445
 msgid "the day of the week as a decimal number"
 msgstr "dzień tygodnia jako liczba dziesiętna"
 
-#: src/prefs_common.c:2434
+#: src/prefs_common.c:2446
 msgid "the preferred date for the current locale"
 msgstr "preferowana data dla ustawień lokalnych"
 
-#: src/prefs_common.c:2435
+#: src/prefs_common.c:2447
 msgid "the last two digits of a year"
 msgstr "ostatnie dwie cyfry roku"
 
-#: src/prefs_common.c:2436
+#: src/prefs_common.c:2448
 msgid "the year as a decimal number"
 msgstr "rok jako liczba dziesiętna"
 
-#: src/prefs_common.c:2437
+#: src/prefs_common.c:2449
 msgid "the time zone or name or abbreviation"
 msgstr "strefa czasowa jako nazwa lub skrót"
 
-#: src/prefs_common.c:2458
+#: src/prefs_common.c:2470
 msgid "Specifier"
 msgstr "Wyszczególniacz"
 
-#: src/prefs_common.c:2459
+#: src/prefs_common.c:2471
 msgid "Description"
 msgstr "Opis"
 
-#: src/prefs_common.c:2499
+#: src/prefs_common.c:2511
 msgid "Example"
 msgstr "Przykład"
 
-#: src/prefs_common.c:2580
+#: src/prefs_common.c:2592
 msgid "Set message colors"
 msgstr "Ustaw kolory wiadomości"
 
-#: src/prefs_common.c:2588
+#: src/prefs_common.c:2600
 msgid "Colors"
 msgstr "Kolory"
 
-#: src/prefs_common.c:2622
+#: src/prefs_common.c:2634
 msgid "Quoted Text - First Level"
 msgstr "Cytowany tekst - poziom pierwszy"
 
-#: src/prefs_common.c:2628
+#: src/prefs_common.c:2640
 msgid "Quoted Text - Second Level"
 msgstr "Cytowany tekst - poziom drugi"
 
-#: src/prefs_common.c:2634
+#: src/prefs_common.c:2646
 msgid "Quoted Text - Third Level"
 msgstr "Cytowany tekst - poziom trzeci"
 
-#: src/prefs_common.c:2640
+#: src/prefs_common.c:2652
 msgid "URI link"
 msgstr "Łącze URI"
 
-#: src/prefs_common.c:2647
+#: src/prefs_common.c:2659
 msgid "Recycle quote colors"
 msgstr "Powtarzanie kolorów cytowania"
 
-#: src/prefs_common.c:2707
+#: src/prefs_common.c:2719
 msgid "Pick color for quotation level 1"
 msgstr "Wybierz kolor dla pierwszego poziomu cytowania"
 
-#: src/prefs_common.c:2710
+#: src/prefs_common.c:2722
 msgid "Pick color for quotation level 2"
 msgstr "Wybierz kolor dla drugiego poziomu cytowania"
 
-#: src/prefs_common.c:2713
+#: src/prefs_common.c:2725
 msgid "Pick color for quotation level 3"
 msgstr "Wybierz kolor dla trzeciego poziomu cytowania"
 
-#: src/prefs_common.c:2716
+#: src/prefs_common.c:2728
 msgid "Pick color for URI"
 msgstr "Wybierz kolor dla URI"
 
-#: src/prefs_common.c:2853
+#: src/prefs_common.c:2865
 msgid "Description of symbols"
 msgstr "Opis symboli"
 
-#: src/prefs_common.c:2909
+#: src/prefs_common.c:2921
 msgid ""
 "Date\n"
 "From\n"
@@ -4886,11 +4923,11 @@ msgstr ""
 "Grupy news\n"
 "ID wiadomości"
 
-#: src/prefs_common.c:2922
+#: src/prefs_common.c:2934
 msgid "If x is set, displays expr"
 msgstr "Wyświetla expr jeśli ustawiono x"
 
-#: src/prefs_common.c:2926
+#: src/prefs_common.c:2938
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -4904,7 +4941,7 @@ msgstr ""
 "Ciało cytowanej wiadomości bez sygnatury\n"
 "Literalny %"
 
-#: src/prefs_common.c:2934
+#: src/prefs_common.c:2946
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -4916,15 +4953,15 @@ msgstr ""
 "Literalny nawias klamrowy otwierający\n"
 "Literalny nawias klamrowy zamykający"
 
-#: src/prefs_common.c:2971
+#: src/prefs_common.c:2983
 msgid "Font selection"
 msgstr "Wybór czcionki"
 
-#: src/prefs_common.c:3035
+#: src/prefs_common.c:3047
 msgid "Key bindings"
 msgstr "Dowiązania klawiszy"
 
-#: src/prefs_common.c:3049
+#: src/prefs_common.c:3061
 msgid ""
 "Select the preset of key bindings.\n"
 "You can also modify each menu's shortcuts by pressing\n"
@@ -4934,11 +4971,11 @@ msgstr ""
 "Można również zmienić każdy skrót klawiaturowy w menu\n"
 "naciskając klawisze gdy kursor myszy znajduje się nad elementem."
 
-#: src/prefs_common.c:3061 src/prefs_common.c:3410
+#: src/prefs_common.c:3073 src/prefs_common.c:3422
 msgid "Default"
 msgstr "Domyślny"
 
-#: src/prefs_common.c:3064 src/prefs_common.c:3419
+#: src/prefs_common.c:3076 src/prefs_common.c:3431
 msgid "Old Sylpheed"
 msgstr "Dawny Sylpheed"
 
@@ -6095,3 +6132,9 @@ msgstr "%.2fGB"
 #, c-format
 msgid "writing to %s failed.\n"
 msgstr "błąd zapisu do %s.\n"
+
+#~ msgid "/_View/_Code set/---"
+#~ msgstr "/_Widok/_Strona kodowa/---"
+
+#~ msgid "/_View/_Code set"
+#~ msgstr "/_Widok/_Strona kodowa"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index eb6ed18c..64a143ca 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-03-15 14:29+0900\n"
+"POT-Creation-Date: 2005-03-16 14:47+0900\n"
 "PO-Revision-Date: 2002-07-15 13:06-0300\n"
 "Last-Translator: André Casteliano <digitalcoder@users.sourceforge.net>\n"
 "Language-Team: André Casteliano <digitalcoder@users.sourceforge.net> Isaías "
@@ -98,7 +98,7 @@ msgstr ""
 "na coluna `G' para habilitar essa caixa no `Baixar tudo'."
 
 #: src/account.c:638 src/addressadd.c:186 src/addressbook.c:488
-#: src/compose.c:3650 src/editaddress.c:195 src/editaddress.c:936
+#: src/compose.c:3748 src/editaddress.c:195 src/editaddress.c:936
 #: src/editaddress.c:984 src/editbook.c:191 src/editgroup.c:257
 #: src/editjpilot.c:296 src/editldap.c:300 src/editvcard.c:211
 #: src/mimeview.c:151 src/prefs_filter.c:214 src/prefs_folder_item.c:170
@@ -151,13 +151,13 @@ msgstr "Apagar conta"
 msgid "Do you really want to delete this account?"
 msgstr "Você realmente deseja apagar esta conta?"
 
-#: src/account.c:758 src/compose.c:2551 src/compose.c:4807
+#: src/account.c:758 src/compose.c:2632 src/compose.c:4943
 #: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
 #: src/folderview.c:2156 src/folderview.c:2192
 msgid "Yes"
 msgstr "Sim"
 
-#: src/account.c:758 src/compose.c:2551 src/compose.c:4807
+#: src/account.c:758 src/compose.c:2632 src/compose.c:4943
 #: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
 #: src/folderview.c:2156 src/folderview.c:2192
 msgid "+No"
@@ -260,7 +260,7 @@ msgstr ""
 msgid "Add Address to Book"
 msgstr "Adicionar ao Livro de endereços"
 
-#: src/addressadd.c:196 src/compose.c:4191 src/editaddress.c:196
+#: src/addressadd.c:196 src/compose.c:4292 src/editaddress.c:196
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "Endereço"
@@ -274,7 +274,7 @@ msgstr "Notas"
 msgid "Select Address Book Folder"
 msgstr "Selecione Pasta do Livro de Endereços"
 
-#: src/addressbook.c:334 src/compose.c:469 src/mainwindow.c:454
+#: src/addressbook.c:334 src/compose.c:477 src/mainwindow.c:454
 #: src/messageview.c:134
 msgid "/_File"
 msgstr "/_Arquivo"
@@ -295,8 +295,8 @@ msgstr "/_Arquivo/Novo _JPilot"
 msgid "/_File/New _Server"
 msgstr "/_Arquivo/Novo _Servidor"
 
-#: src/addressbook.c:343 src/addressbook.c:346 src/compose.c:474
-#: src/compose.c:479 src/compose.c:483 src/mainwindow.c:471
+#: src/addressbook.c:343 src/addressbook.c:346 src/compose.c:482
+#: src/compose.c:487 src/compose.c:491 src/mainwindow.c:471
 #: src/mainwindow.c:474 src/mainwindow.c:476 src/mainwindow.c:479
 #: src/mainwindow.c:481 src/messageview.c:137
 msgid "/_File/---"
@@ -314,7 +314,7 @@ msgstr "/_Arquivo/_Apagar"
 msgid "/_File/_Save"
 msgstr "/_Arquivo/_Salvar"
 
-#: src/addressbook.c:348 src/compose.c:484 src/messageview.c:138
+#: src/addressbook.c:348 src/compose.c:492 src/messageview.c:138
 msgid "/_File/_Close"
 msgstr "/_Arquivo/_Fechar"
 
@@ -346,7 +346,7 @@ msgstr "/_Endereço/_Editar"
 msgid "/_Address/_Delete"
 msgstr "/_Endereço/_Apagar"
 
-#: src/addressbook.c:356 src/compose.c:585 src/mainwindow.c:688
+#: src/addressbook.c:356 src/compose.c:664 src/mainwindow.c:697
 #: src/messageview.c:246
 msgid "/_Tools"
 msgstr "/_Ferramentas"
@@ -355,12 +355,12 @@ msgstr "/_Ferramentas"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Ferramentas/Importar arquivo _LDIF"
 
-#: src/addressbook.c:358 src/compose.c:598 src/mainwindow.c:733
+#: src/addressbook.c:358 src/compose.c:677 src/mainwindow.c:742
 #: src/messageview.c:264
 msgid "/_Help"
 msgstr "/_Ajuda"
 
-#: src/addressbook.c:359 src/compose.c:599 src/mainwindow.c:744
+#: src/addressbook.c:359 src/compose.c:678 src/mainwindow.c:753
 #: src/messageview.c:265
 msgid "/_Help/_About"
 msgstr "/_Ajuda/_Sobre"
@@ -377,7 +377,7 @@ msgstr "/Novo _Grupo"
 msgid "/New _Folder"
 msgstr "/Nova _Pasta"
 
-#: src/addressbook.c:381 src/addressbook.c:391 src/compose.c:463
+#: src/addressbook.c:381 src/addressbook.c:391 src/compose.c:471
 #: src/folderview.c:220 src/folderview.c:222 src/folderview.c:226
 #: src/folderview.c:236 src/folderview.c:238 src/folderview.c:240
 #: src/folderview.c:244 src/folderview.c:254 src/folderview.c:256
@@ -387,7 +387,7 @@ msgstr "/Nova _Pasta"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:382 src/addressbook.c:392 src/compose.c:486
+#: src/addressbook.c:382 src/addressbook.c:392 src/compose.c:494
 #: src/mainwindow.c:485 src/messageview.c:140
 msgid "/_Edit"
 msgstr "/_Editar"
@@ -400,7 +400,7 @@ msgstr "/_Apagar"
 msgid "E-Mail address"
 msgstr "Endereço de e-mail"
 
-#: src/addressbook.c:493 src/compose.c:4192 src/prefs_common.c:2186
+#: src/addressbook.c:493 src/compose.c:4293 src/prefs_common.c:2198
 msgid "Address book"
 msgstr "Livro de endereços"
 
@@ -410,7 +410,7 @@ msgstr "Nome:"
 
 #. Buttons
 #: src/addressbook.c:625 src/addressbook.c:1665 src/addressbook.c:1671
-#: src/editaddress.c:878 src/editaddress.c:1011 src/mainwindow.c:2212
+#: src/editaddress.c:878 src/editaddress.c:1011 src/mainwindow.c:2221
 #: src/prefs_actions.c:263 src/prefs_display_header.c:275
 #: src/prefs_display_header.c:330 src/prefs_template.c:227
 msgid "Delete"
@@ -604,7 +604,7 @@ msgstr "Endereços comuns"
 msgid "Personal address"
 msgstr "Endereços pessoais"
 
-#: src/alertpanel.c:123 src/compose.c:4807 src/main.c:458
+#: src/alertpanel.c:123 src/compose.c:4943 src/main.c:458
 msgid "Notice"
 msgstr "Notificação"
 
@@ -612,7 +612,7 @@ msgstr "Notificação"
 msgid "Warning"
 msgstr "Aviso"
 
-#: src/alertpanel.c:149 src/compose.c:2551 src/inc.c:558
+#: src/alertpanel.c:149 src/compose.c:2632 src/inc.c:558
 msgid "Error"
 msgstr "Erro"
 
@@ -660,308 +660,426 @@ msgstr "Marrom"
 msgid "None"
 msgstr "Nenhuma"
 
-#: src/compose.c:461
+#: src/compose.c:469
 msgid "/_Add..."
 msgstr "/_Adicionar"
 
-#: src/compose.c:462
+#: src/compose.c:470
 msgid "/_Remove"
 msgstr "/_Remover"
 
-#: src/compose.c:464 src/folderview.c:228 src/folderview.c:246
+#: src/compose.c:472 src/folderview.c:228 src/folderview.c:246
 #: src/folderview.c:261
 #, fuzzy
 msgid "/_Properties..."
 msgstr "/_Propriedades..."
 
-#: src/compose.c:470
+#: src/compose.c:478
 #, fuzzy
 msgid "/_File/_Send"
 msgstr "/_Arquivo/_Salvar"
 
-#: src/compose.c:472
+#: src/compose.c:480
 #, fuzzy
 msgid "/_File/Send _later"
 msgstr "/_Mensagem/Enviar _depois"
 
-#: src/compose.c:475
+#: src/compose.c:483
 #, fuzzy
 msgid "/_File/Save to _draft folder"
 msgstr "/_Mensagem/Salvar na pasta rascunho"
 
-#: src/compose.c:477
+#: src/compose.c:485
 #, fuzzy
 msgid "/_File/Save and _keep editing"
 msgstr "/_Mensagem/Salvar e _continuar editando"
 
-#: src/compose.c:480
+#: src/compose.c:488
 msgid "/_File/_Attach file"
 msgstr "/_Arquivo/_Anexar arquivo"
 
-#: src/compose.c:481
+#: src/compose.c:489
 msgid "/_File/_Insert file"
 msgstr "/_Arquivo/_Inserir arquivo"
 
-#: src/compose.c:482
+#: src/compose.c:490
 msgid "/_File/Insert si_gnature"
 msgstr "/_Arquivo/Inserir as_sinatura"
 
-#: src/compose.c:487
+#: src/compose.c:495
 msgid "/_Edit/_Undo"
 msgstr "/_Editar/_Desfazer"
 
-#: src/compose.c:488
+#: src/compose.c:496
 msgid "/_Edit/_Redo"
 msgstr "/_Editar/_Refazer"
 
-#: src/compose.c:489 src/compose.c:567 src/mainwindow.c:489
+#: src/compose.c:497 src/compose.c:575 src/mainwindow.c:489
 #: src/messageview.c:143
 msgid "/_Edit/---"
 msgstr "/_Editar/---"
 
-#: src/compose.c:490
+#: src/compose.c:498
 msgid "/_Edit/Cu_t"
 msgstr "/_Editar/_Cortar"
 
-#: src/compose.c:491 src/mainwindow.c:486 src/messageview.c:141
+#: src/compose.c:499 src/mainwindow.c:486 src/messageview.c:141
 msgid "/_Edit/_Copy"
 msgstr "/_Editar/C_opiar"
 
-#: src/compose.c:492
+#: src/compose.c:500
 msgid "/_Edit/_Paste"
 msgstr "/_Editar/Co_lar"
 
-#: src/compose.c:493
+#: src/compose.c:501
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Editar/Colar como ci_tação"
 
-#: src/compose.c:495 src/mainwindow.c:487 src/messageview.c:142
+#: src/compose.c:503 src/mainwindow.c:487 src/messageview.c:142
 msgid "/_Edit/Select _all"
 msgstr "/_Editar/_Selecionar tudo"
 
-#: src/compose.c:496
+#: src/compose.c:504
 msgid "/_Edit/A_dvanced"
 msgstr "/_Editar/_Avançado"
 
-#: src/compose.c:497
+#: src/compose.c:505
 msgid "/_Edit/A_dvanced/Move a character backward"
 msgstr "/_Editar/_Avançado/Mover um caractere para trás"
 
-#: src/compose.c:502
+#: src/compose.c:510
 msgid "/_Edit/A_dvanced/Move a character forward"
 msgstr "/_Editar/_Avançado/Mover um caractere para frente"
 
-#: src/compose.c:507
+#: src/compose.c:515
 msgid "/_Edit/A_dvanced/Move a word backward"
 msgstr "/_Editar/_Avançado/Mover uma palavra para a trás"
 
-#: src/compose.c:512
+#: src/compose.c:520
 msgid "/_Edit/A_dvanced/Move a word forward"
 msgstr "/_Editar/_Avançado/Mover uma palavra para frente"
 
-#: src/compose.c:517
+#: src/compose.c:525
 msgid "/_Edit/A_dvanced/Move to beginning of line"
 msgstr "/_Editar/_Avançado/Mover para o início da linha"
 
-#: src/compose.c:522
+#: src/compose.c:530
 msgid "/_Edit/A_dvanced/Move to end of line"
 msgstr "/_Editar/_Avançado/Mover para o fim da linha"
 
-#: src/compose.c:527
+#: src/compose.c:535
 msgid "/_Edit/A_dvanced/Move to previous line"
 msgstr "/_Editar/_Avançado/Mover para a linha anterior"
 
-#: src/compose.c:532
+#: src/compose.c:540
 msgid "/_Edit/A_dvanced/Move to next line"
 msgstr "/_Editar/_Avançado/Mover para a próxima linha"
 
-#: src/compose.c:537
+#: src/compose.c:545
 msgid "/_Edit/A_dvanced/Delete a character backward"
 msgstr "/_Editar/_Avançado/Apagar um caractere para trás"
 
-#: src/compose.c:542
+#: src/compose.c:550
 msgid "/_Edit/A_dvanced/Delete a character forward"
 msgstr "/_Editar/_Avançado/Apagar um caractere para frente"
 
-#: src/compose.c:547
+#: src/compose.c:555
 msgid "/_Edit/A_dvanced/Delete a word backward"
 msgstr "/_Editar/_Avançado/Apagar uma palavra para trás"
 
-#: src/compose.c:552
+#: src/compose.c:560
 msgid "/_Edit/A_dvanced/Delete a word forward"
 msgstr "/_Editar/_Avançado/Apagar uma palavra para frente"
 
-#: src/compose.c:557
+#: src/compose.c:565
 msgid "/_Edit/A_dvanced/Delete line"
 msgstr "/_Editar/_Avançado/Apagar linha"
 
-#: src/compose.c:562
+#: src/compose.c:570
 msgid "/_Edit/A_dvanced/Delete to end of line"
 msgstr "/_Editar/_Avançado/Apagar até o fim da linha"
 
-#: src/compose.c:568
+#: src/compose.c:576
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/_Editar/_Quebrar parágrafo atual"
 
-#: src/compose.c:570
+#: src/compose.c:578
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/_Editar/Quebrar todas as _linhas grandes"
 
-#: src/compose.c:572
+#: src/compose.c:580
 #, fuzzy
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Editar/C_opiar"
 
-#: src/compose.c:573 src/mainwindow.c:494 src/messageview.c:147
+#: src/compose.c:581 src/mainwindow.c:494 src/messageview.c:147
 #: src/summaryview.c:370
 msgid "/_View"
 msgstr "/E_xibir"
 
-#: src/compose.c:574
+#: src/compose.c:582
 msgid "/_View/_To"
 msgstr "/E_xibir/_Para"
 
-#: src/compose.c:575
+#: src/compose.c:583
 msgid "/_View/_Cc"
 msgstr "/E_xibir/_Cc"
 
-#: src/compose.c:576
+#: src/compose.c:584
 msgid "/_View/_Bcc"
 msgstr "/E_xibir/_Bcc"
 
-#: src/compose.c:577
+#: src/compose.c:585
 msgid "/_View/_Reply to"
 msgstr "/E_xibir/_Responder para"
 
-#: src/compose.c:578 src/compose.c:580 src/compose.c:582 src/mainwindow.c:512
-#: src/mainwindow.c:515 src/mainwindow.c:541 src/mainwindow.c:565
-#: src/mainwindow.c:641 src/mainwindow.c:645 src/messageview.c:223
+#: src/compose.c:586 src/compose.c:588 src/compose.c:590 src/compose.c:592
+#: src/mainwindow.c:512 src/mainwindow.c:515 src/mainwindow.c:541
+#: src/mainwindow.c:565 src/mainwindow.c:650 src/mainwindow.c:654
+#: src/messageview.c:223
 msgid "/_View/---"
 msgstr "/E_xibir/---"
 
-#: src/compose.c:579
+#: src/compose.c:587
 msgid "/_View/_Followup to"
 msgstr "/E_xibir/_Seguir respondendo"
 
-#: src/compose.c:581
+#: src/compose.c:589
 msgid "/_View/R_uler"
 msgstr "/E_xibir/_Régua"
 
-#: src/compose.c:583
+#: src/compose.c:591
 msgid "/_View/_Attachment"
 msgstr "/E_xibir/_Anexo"
 
-#: src/compose.c:586 src/mainwindow.c:689 src/messageview.c:247
+#: src/compose.c:598 src/mainwindow.c:572 src/messageview.c:154
+#, fuzzy
+msgid "/_View/Character _encoding"
+msgstr "/E_xibir/_Ordenar/Decrescente"
+
+#: src/compose.c:599
+msgid "/_View/Character _encoding/_Automatic"
+msgstr ""
+
+#: src/compose.c:601 src/compose.c:607 src/compose.c:613 src/compose.c:617
+#: src/compose.c:623 src/compose.c:627 src/compose.c:631 src/compose.c:641
+#: src/compose.c:645 src/compose.c:653 src/compose.c:657 src/mainwindow.c:568
+#: src/mainwindow.c:575 src/messageview.c:150
+#, fuzzy
+msgid "/_View/Character _encoding/---"
+msgstr "/E_xibir/_Ordenar/Decrescente"
+
+#: src/compose.c:603 src/mainwindow.c:576 src/messageview.c:158
+#, fuzzy
+msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
+msgstr "/E_xibir/Conjunto de ca_racteres/ASCII de 7 bits (US-ASC_II)"
+
+#: src/compose.c:605 src/mainwindow.c:578 src/messageview.c:161
+#, fuzzy
+msgid "/_View/Character _encoding/Unicode (_UTF-8)"
+msgstr "/E_xibir/Conjunto de ca_racteres/Unicode (_UTF-8)"
+
+#: src/compose.c:609 src/mainwindow.c:582 src/messageview.c:164
+#, fuzzy
+msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
+msgstr "/E_xibir/Conjunto de ca_racteres/Europa Ocidental (ISO-8859-_1)"
+
+#: src/compose.c:611 src/mainwindow.c:584 src/messageview.c:166
+#, fuzzy
+msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
+msgstr "/E_xibir/Conjunto de ca_racteres/Europa Ocidental (ISO-8859-15)"
+
+#: src/compose.c:615 src/mainwindow.c:588 src/messageview.c:169
+#, fuzzy
+msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
+msgstr "/E_xibir/Conjunto de ca_racteres/Europa Central (ISO-8859-_2)"
+
+#: src/compose.c:619 src/mainwindow.c:592 src/messageview.c:172
+#, fuzzy
+msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
+msgstr "/E_xibir/Conjunto de ca_racteres/_Báltico (ISO-8859-13)"
+
+#: src/compose.c:621 src/mainwindow.c:594 src/messageview.c:174
+#, fuzzy
+msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
+msgstr "/E_xibir/_Conjunto de ca_racteres/Báltico (ISO-8859-4)"
+
+#: src/compose.c:625 src/mainwindow.c:598 src/messageview.c:177
+#, fuzzy
+msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
+msgstr "/E_xibir/_Conjunto de ca_racteres/Grego (ISO-8859-_7)"
+
+#: src/compose.c:629 src/mainwindow.c:602 src/messageview.c:180
+#, fuzzy
+msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
+msgstr "/E_xibir/_Conjunto de ca_racteres/Turco (ISO-8859-_9)"
+
+#: src/compose.c:633 src/mainwindow.c:606 src/messageview.c:183
+#, fuzzy
+msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
+msgstr "/E_xibir/_Conjunto de ca_racteres/Cirílico (ISO-8859-_5)"
+
+#: src/compose.c:635 src/mainwindow.c:608 src/messageview.c:185
+#, fuzzy
+msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
+msgstr "/E_xibir/_Conjunto de ca_racteres/Cirílico (KOI8-_R)"
+
+#: src/compose.c:637 src/mainwindow.c:610 src/messageview.c:187
+#, fuzzy
+msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
+msgstr "/E_xibir/_Conjunto de ca_racteres/Cirílico (KOI8-_R)"
+
+#: src/compose.c:639 src/mainwindow.c:612 src/messageview.c:189
+#, fuzzy
+msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
+msgstr "/E_xibir/_Conjunto de ca_racteres/Cirílico (Windows-1251)"
+
+#: src/compose.c:643 src/mainwindow.c:616 src/messageview.c:192
+#, fuzzy
+msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
+msgstr "/E_xibir/_Conjunto de ca_racteres/Japonês (ISO-2022-_JP)"
+
+#: src/compose.c:647 src/mainwindow.c:626 src/messageview.c:201
+#, fuzzy
+msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
+msgstr "/E_xibir/_Conjunto de ca_racteres/Chinês simplificado (_GB2312)"
+
+#: src/compose.c:649 src/mainwindow.c:628 src/messageview.c:203
+#, fuzzy
+msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
+msgstr "/E_xibir/_Conjunto de ca_racteres/Chinês tradicional (_Big5)"
+
+#: src/compose.c:651 src/mainwindow.c:630 src/messageview.c:205
+#, fuzzy
+msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
+msgstr "/E_xibir/_Conjunto de ca_racteres/Chinês tradicional (EUC-_TW)"
+
+#: src/compose.c:655 src/mainwindow.c:636 src/messageview.c:210
+#, fuzzy
+msgid "/_View/Character _encoding/Korean (EUC-_KR)"
+msgstr "/E_xibir/_Conjunto de ca_racteres/Coreano (EUC-_KR)"
+
+#: src/compose.c:659 src/mainwindow.c:642 src/messageview.c:215
+#, fuzzy
+msgid "/_View/Character _encoding/Thai (TIS-620)"
+msgstr "/E_xibir/_Conjunto de ca_racteres/Thai (TIS-620)"
+
+#: src/compose.c:661 src/mainwindow.c:644 src/messageview.c:217
+#, fuzzy
+msgid "/_View/Character _encoding/Thai (Windows-874)"
+msgstr "/E_xibir/_Conjunto de ca_racteres/Thai (Windows-874)"
+
+#: src/compose.c:665 src/mainwindow.c:698 src/messageview.c:247
 msgid "/_Tools/_Address book"
 msgstr "/_Ferramentas/_Livro de endereços"
 
-#: src/compose.c:587
+#: src/compose.c:666
 msgid "/_Tools/_Template"
 msgstr "/_Ferramenta/_Modelo"
 
-#: src/compose.c:588 src/mainwindow.c:707 src/messageview.c:262
+#: src/compose.c:667 src/mainwindow.c:716 src/messageview.c:262
 msgid "/_Tools/Actio_ns"
 msgstr "/_Ferramentas/_Ações"
 
-#: src/compose.c:589 src/compose.c:593 src/mainwindow.c:692
-#: src/mainwindow.c:706 src/mainwindow.c:708 src/mainwindow.c:711
-#: src/mainwindow.c:713 src/messageview.c:250 src/messageview.c:261
+#: src/compose.c:668 src/compose.c:672 src/mainwindow.c:701
+#: src/mainwindow.c:715 src/mainwindow.c:717 src/mainwindow.c:720
+#: src/mainwindow.c:722 src/messageview.c:250 src/messageview.c:261
 msgid "/_Tools/---"
 msgstr "/_Ferramentas/---"
 
-#: src/compose.c:590
+#: src/compose.c:669
 #, fuzzy
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/_Editar/Editar com editor e_xterno"
 
-#: src/compose.c:594
+#: src/compose.c:673
 #, fuzzy
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Ferramentas/_Ações"
 
-#: src/compose.c:595
+#: src/compose.c:674
 #, fuzzy
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/_Mensagem/_Encriptar"
 
-#: src/compose.c:800
+#: src/compose.c:879
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: o arquivo não existe\n"
 
-#: src/compose.c:899 src/compose.c:958 src/procmsg.c:1303
+#: src/compose.c:978 src/compose.c:1037 src/procmsg.c:1303
 msgid "Can't get text part\n"
 msgstr "Não foi possível obter o texto\n"
 
-#: src/compose.c:1340
+#: src/compose.c:1419
 msgid "Quote mark format error."
 msgstr "Erro no formato de marca de citação."
 
-#: src/compose.c:1352
+#: src/compose.c:1431
 msgid "Message reply/forward format error."
 msgstr "Erro no formato de mensagem de resposta/encaminhada."
 
-#: src/compose.c:1679
+#: src/compose.c:1758
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "O arquivo %s não existe\n"
 
-#: src/compose.c:1683
+#: src/compose.c:1762
 #, 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:1687
+#: src/compose.c:1766
 #, c-format
 msgid "File %s is empty."
 msgstr "O arquivo %s está vazio."
 
-#: src/compose.c:1691
+#: src/compose.c:1770
 #, c-format
 msgid "Can't read %s."
 msgstr "Não foi possível ler %s."
 
-#: src/compose.c:1726
+#: src/compose.c:1805
 #, c-format
 msgid "Message: %s"
 msgstr "Mensagem: %s"
 
-#: src/compose.c:1797 src/mimeview.c:491
+#: src/compose.c:1876 src/mimeview.c:491
 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:2188
+#: src/compose.c:2267
 msgid " [Edited]"
 msgstr " [Editado]"
 
-#: src/compose.c:2190
+#: src/compose.c:2269
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Compondo mensagem%s"
 
-#: src/compose.c:2193
+#: src/compose.c:2272
 #, c-format
 msgid "Compose message%s"
 msgstr "Compondo mensagem%s"
 
-#: src/compose.c:2304
+#: src/compose.c:2383
 msgid "Recipient is not specified."
 msgstr "Destinatário não especificado."
 
-#: src/compose.c:2312 src/compose.c:4112 src/mainwindow.c:2144
+#: src/compose.c:2391 src/compose.c:4213 src/mainwindow.c:2153
 #: src/prefs_account.c:703 src/prefs_common.c:850
 msgid "Send"
 msgstr "Enviar"
 
-#: src/compose.c:2313
+#: src/compose.c:2392
 msgid "Subject is empty. Send it anyway?"
 msgstr "Assunto vazio. Enviar assim mesmo?"
 
-#: src/compose.c:2364
+#: src/compose.c:2443
 msgid "can't get recipient list."
 msgstr "não pude obter a lista de destinatários."
 
-#: src/compose.c:2384
+#: src/compose.c:2463
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -969,26 +1087,26 @@ msgstr ""
 "Conta para envio de mensagem não está especificada.\n"
 "Por favor selecione uma conta de e-mail antes de enviar."
 
-#: src/compose.c:2398 src/send_message.c:261
+#: src/compose.c:2477 src/send_message.c:261
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Ocorreu um erro enquanto tentava postar a mensagem para %s ."
 
-#: src/compose.c:2421
+#: src/compose.c:2500
 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:2457
+#: src/compose.c:2536
 #, 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:2518 src/compose.c:2739 src/compose.c:2802 src/compose.c:2921
+#: src/compose.c:2597 src/compose.c:2820 src/compose.c:2883 src/compose.c:3003
 #: src/utils.c:2189
 msgid "can't change file mode\n"
 msgstr "Não foi possível modificar as permissões do arquivo\n"
 
-#: src/compose.c:2546
+#: src/compose.c:2627
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -997,141 +1115,141 @@ msgstr ""
 "Não foi possível converter o código de caracteres da mensagem.\n"
 "Enviar assim mesmo?"
 
-#: src/compose.c:2610
+#: src/compose.c:2691
 msgid "can't write headers\n"
 msgstr "não foi possível escrever o cabeçalho\n"
 
-#: src/compose.c:2881
+#: src/compose.c:2963
 msgid "can't remove the old message\n"
 msgstr "não posso remover a mensagem antiga\n"
 
-#: src/compose.c:2899
+#: src/compose.c:2981
 msgid "queueing message...\n"
 msgstr "colocando mensagem na fila...\n"
 
-#: src/compose.c:2981
+#: src/compose.c:3063
 msgid "can't find queue folder\n"
 msgstr "não foi possível encontrar a pasta da fila\n"
 
-#: src/compose.c:2988
+#: src/compose.c:3070
 msgid "can't queue the message\n"
 msgstr "Não foi possível por a mensagem na fila\n"
 
-#: src/compose.c:3547
+#: src/compose.c:3645
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "Message-ID gerado: %s\n"
 
-#: src/compose.c:3645
+#: src/compose.c:3743
 msgid "Creating compose window...\n"
 msgstr "Criando janela de composição...\n"
 
-#: src/compose.c:3648 src/compose.c:4598
+#: src/compose.c:3746 src/compose.c:4734
 msgid "MIME type"
 msgstr "Tipo MIME"
 
 #. S_COL_DATE
-#: src/compose.c:3649 src/mimeview.c:150 src/prefs_filter_edit.c:569
+#: src/compose.c:3747 src/mimeview.c:150 src/prefs_filter_edit.c:569
 #: src/prefs_summary_column.c:73 src/select-keys.c:317 src/summaryview.c:386
 msgid "Size"
 msgstr "Tamanho"
 
-#: src/compose.c:3700 src/headerview.c:53 src/summary_search.c:169
+#: src/compose.c:3798 src/headerview.c:53 src/summary_search.c:169
 msgid "From:"
 msgstr "De:"
 
-#: src/compose.c:4113
+#: src/compose.c:4214
 msgid "Send message"
 msgstr "Enviar mensagem"
 
-#: src/compose.c:4121
+#: src/compose.c:4222
 msgid "Send later"
 msgstr "Enviar depois"
 
-#: src/compose.c:4122
+#: src/compose.c:4223
 msgid "Put into queue folder and send later"
 msgstr "Por na 'fila de saída' e enviar depois"
 
-#: src/compose.c:4130
+#: src/compose.c:4231
 msgid "Draft"
 msgstr "Rascunho"
 
-#: src/compose.c:4131
+#: src/compose.c:4232
 msgid "Save to draft folder"
 msgstr "Salvar na pasta Rascunho"
 
-#: src/compose.c:4141 src/compose.c:5382
+#: src/compose.c:4242 src/compose.c:5527
 msgid "Insert"
 msgstr "Inserir"
 
-#: src/compose.c:4142
+#: src/compose.c:4243
 msgid "Insert file"
 msgstr "Inserir arquivo"
 
-#: src/compose.c:4150
+#: src/compose.c:4251
 msgid "Attach"
 msgstr "Anexar"
 
-#: src/compose.c:4151
+#: src/compose.c:4252
 msgid "Attach file"
 msgstr "Anexar arquivo"
 
 #. signature
-#: src/compose.c:4161 src/prefs_account.c:1339 src/prefs_common.c:1261
+#: src/compose.c:4262 src/prefs_account.c:1339 src/prefs_common.c:1273
 msgid "Signature"
 msgstr "Assinatura"
 
-#: src/compose.c:4162
+#: src/compose.c:4263
 msgid "Insert signature"
 msgstr "Inserir assinatura"
 
-#: src/compose.c:4171 src/prefs_common.c:1283 src/prefs_common.c:2165
+#: src/compose.c:4272 src/prefs_common.c:1295 src/prefs_common.c:2177
 msgid "Editor"
 msgstr "Editor"
 
-#: src/compose.c:4172
+#: src/compose.c:4273
 msgid "Edit with external editor"
 msgstr "Editar com um editor externo"
 
-#: src/compose.c:4180
+#: src/compose.c:4281
 msgid "Linewrap"
 msgstr "Quebra de linha"
 
-#: src/compose.c:4181
+#: src/compose.c:4282
 msgid "Wrap all long lines"
 msgstr "Quebrar todas as linhas grandes"
 
-#: src/compose.c:4492
+#: src/compose.c:4628
 msgid "Invalid MIME type."
 msgstr "Tipo MIME inválido."
 
-#: src/compose.c:4511
+#: src/compose.c:4647
 msgid "File doesn't exist or is empty."
 msgstr "O arquivo não existe ou está vazio."
 
-#: src/compose.c:4580
+#: src/compose.c:4716
 #, fuzzy
 msgid "Properties"
 msgstr "Propriedades"
 
-#: src/compose.c:4600
+#: src/compose.c:4736
 msgid "Encoding"
 msgstr "Codificação"
 
-#: src/compose.c:4623 src/prefs_folder_item.c:183
+#: src/compose.c:4759 src/prefs_folder_item.c:183
 msgid "Path"
 msgstr "Caminho"
 
-#: src/compose.c:4624
+#: src/compose.c:4760
 msgid "File name"
 msgstr "Nome do arquivo"
 
-#: src/compose.c:4778
+#: src/compose.c:4914
 #, 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:4804
+#: src/compose.c:4940
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1142,72 +1260,72 @@ msgstr ""
 "Deseja matar o processo?\n"
 "Id. do grupo do processo : %d"
 
-#: src/compose.c:4817
+#: src/compose.c:4953
 #, c-format
 msgid "Terminated process group id: %d"
 msgstr "Terminado grupo de processo id.: %d"
 
-#: src/compose.c:4818
+#: src/compose.c:4954
 #, c-format
 msgid "Temporary file: %s"
 msgstr "Arquivo temporário: %s"
 
-#: src/compose.c:4842
+#: src/compose.c:4978
 msgid "Compose: input from monitoring process\n"
 msgstr "Compositor: entrada para monitorar processo\n"
 
 #. failed
-#: src/compose.c:4875
+#: src/compose.c:5011
 msgid "Couldn't exec external editor\n"
 msgstr "Não foi possível executar o editor externo\n"
 
-#: src/compose.c:4879
+#: src/compose.c:5015
 msgid "Couldn't write to file\n"
 msgstr "Não foi possível gravar o arquivo\n"
 
-#: src/compose.c:4881
+#: src/compose.c:5017
 msgid "Pipe read failed\n"
 msgstr "Fallhou ao ler o pipe\n"
 
-#: src/compose.c:5182 src/compose.c:5190 src/compose.c:5196
+#: src/compose.c:5318 src/compose.c:5326 src/compose.c:5332
 msgid "Can't queue the message."
 msgstr "Não foi possível por a mensagem na fila."
 
-#: src/compose.c:5287
+#: src/compose.c:5423
 #, fuzzy
 msgid "Select files"
 msgstr "Selecionar arquivo"
 
-#: src/compose.c:5309
+#: src/compose.c:5445
 msgid "Select file"
 msgstr "Selecionar arquivo"
 
-#: src/compose.c:5344
+#: src/compose.c:5480
 msgid "Discard message"
 msgstr "Descartar mensagem"
 
-#: src/compose.c:5345
+#: src/compose.c:5481
 msgid "This message has been modified. discard it?"
 msgstr "Esta mensagem foi modificada. Deseja descartá-la ?"
 
-#: src/compose.c:5346
+#: src/compose.c:5482
 msgid "Discard"
 msgstr "Descartar"
 
-#: src/compose.c:5346
+#: src/compose.c:5482
 msgid "to Draft"
 msgstr "como rascunho"
 
-#: src/compose.c:5379
+#: src/compose.c:5524
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Quer aplicar o modelo `%s'?"
 
-#: src/compose.c:5381
+#: src/compose.c:5526
 msgid "Apply template"
 msgstr "Aplicar Modelo"
 
-#: src/compose.c:5382
+#: src/compose.c:5527
 msgid "Replace"
 msgstr "Substituir"
 
@@ -1651,12 +1769,12 @@ msgstr "Configurando informações da pasta...\n"
 msgid "Setting folder info..."
 msgstr "Configurando informações da pasta..."
 
-#: src/folderview.c:652 src/mainwindow.c:3190 src/setup.c:81
+#: src/folderview.c:652 src/mainwindow.c:3199 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Revisando pasta %s%c%s ..."
 
-#: src/folderview.c:656 src/mainwindow.c:3195 src/setup.c:86
+#: src/folderview.c:656 src/mainwindow.c:3204 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Revisando pasta %s ..."
@@ -2119,7 +2237,7 @@ msgstr "Importar arquivo LDIF para o Livro de Endereços"
 msgid "Prev"
 msgstr "Anterior"
 
-#: src/importldif.c:761 src/mainwindow.c:2230
+#: src/importldif.c:761 src/mainwindow.c:2239
 msgid "Next"
 msgstr "Próxima"
 
@@ -2571,7 +2689,8 @@ msgid "/_View/Separate f_older tree"
 msgstr "/E_xibir/Á_rvore de pastas separadas"
 
 #: src/mainwindow.c:514
-msgid "/_View/Separate m_essage view"
+#, fuzzy
+msgid "/_View/Separate _message view"
 msgstr "/E_xibir/Separar m_ensagens"
 
 #: src/mainwindow.c:516
@@ -2707,432 +2826,349 @@ msgstr "/E_xibir/Ir _Para/Próxima mensagem etique_tada"
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/E_xibir/Ir _Para/Outra _pasta..."
 
-#: src/mainwindow.c:568 src/mainwindow.c:575 src/messageview.c:150
-msgid "/_View/_Code set/---"
-msgstr "/E_xibir/Conjunto de ca_racteres/---"
-
-#: src/mainwindow.c:572 src/messageview.c:154
-msgid "/_View/_Code set"
-msgstr "/E_xibir/Conjunto de ca_racteres"
-
 #: src/mainwindow.c:573 src/messageview.c:155
-msgid "/_View/_Code set/_Auto detect"
+#, fuzzy
+msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/E_xibir/Conjunto de ca_racteres/_Autodetectar"
 
-#: src/mainwindow.c:576 src/messageview.c:158
-msgid "/_View/_Code set/7bit ascii (US-ASC_II)"
-msgstr "/E_xibir/Conjunto de ca_racteres/ASCII de 7 bits (US-ASC_II)"
-
-#: src/mainwindow.c:579 src/messageview.c:161
-msgid "/_View/_Code set/Unicode (_UTF-8)"
-msgstr "/E_xibir/Conjunto de ca_racteres/Unicode (_UTF-8)"
-
-#: src/mainwindow.c:582 src/messageview.c:164
-msgid "/_View/_Code set/Western European (ISO-8859-_1)"
-msgstr "/E_xibir/Conjunto de ca_racteres/Europa Ocidental (ISO-8859-_1)"
-
-#: src/mainwindow.c:584 src/messageview.c:166
-msgid "/_View/_Code set/Western European (ISO-8859-15)"
-msgstr "/E_xibir/Conjunto de ca_racteres/Europa Ocidental (ISO-8859-15)"
-
-#: src/mainwindow.c:587 src/messageview.c:169
-msgid "/_View/_Code set/Central European (ISO-8859-_2)"
-msgstr "/E_xibir/Conjunto de ca_racteres/Europa Central (ISO-8859-_2)"
-
-#: src/mainwindow.c:590 src/messageview.c:172
-msgid "/_View/_Code set/_Baltic (ISO-8859-13)"
-msgstr "/E_xibir/Conjunto de ca_racteres/_Báltico (ISO-8859-13)"
-
-#: src/mainwindow.c:592 src/messageview.c:174
-msgid "/_View/_Code set/Baltic (ISO-8859-_4)"
-msgstr "/E_xibir/_Conjunto de ca_racteres/Báltico (ISO-8859-4)"
-
-#: src/mainwindow.c:595 src/messageview.c:177
-msgid "/_View/_Code set/Greek (ISO-8859-_7)"
-msgstr "/E_xibir/_Conjunto de ca_racteres/Grego (ISO-8859-_7)"
-
-#: src/mainwindow.c:598 src/messageview.c:180
-msgid "/_View/_Code set/Turkish (ISO-8859-_9)"
-msgstr "/E_xibir/_Conjunto de ca_racteres/Turco (ISO-8859-_9)"
-
-#: src/mainwindow.c:601 src/messageview.c:183
-msgid "/_View/_Code set/Cyrillic (ISO-8859-_5)"
-msgstr "/E_xibir/_Conjunto de ca_racteres/Cirílico (ISO-8859-_5)"
-
-#: src/mainwindow.c:603 src/messageview.c:185
-msgid "/_View/_Code set/Cyrillic (KOI8-_R)"
-msgstr "/E_xibir/_Conjunto de ca_racteres/Cirílico (KOI8-_R)"
-
-#: src/mainwindow.c:605 src/messageview.c:187
+#: src/mainwindow.c:618 src/messageview.c:194
 #, fuzzy
-msgid "/_View/_Code set/Cyrillic (KOI8-U)"
-msgstr "/E_xibir/_Conjunto de ca_racteres/Cirílico (KOI8-_R)"
-
-#: src/mainwindow.c:607 src/messageview.c:189
-msgid "/_View/_Code set/Cyrillic (Windows-1251)"
-msgstr "/E_xibir/_Conjunto de ca_racteres/Cirílico (Windows-1251)"
-
-#: src/mainwindow.c:610 src/messageview.c:192
-msgid "/_View/_Code set/Japanese (ISO-2022-_JP)"
-msgstr "/E_xibir/_Conjunto de ca_racteres/Japonês (ISO-2022-_JP)"
-
-#: src/mainwindow.c:612 src/messageview.c:194
-msgid "/_View/_Code set/Japanese (ISO-2022-JP-2)"
+msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/E_xibir/_Conjunto de ca_racteres/Japonês (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:614 src/messageview.c:196
-msgid "/_View/_Code set/Japanese (_EUC-JP)"
+#: src/mainwindow.c:620 src/messageview.c:196
+#, fuzzy
+msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/E_xibir/_Conjunto de ca_racteres/Japonês (_EUC-JP)"
 
-#: src/mainwindow.c:616 src/messageview.c:198
-msgid "/_View/_Code set/Japanese (_Shift__JIS)"
+#: src/mainwindow.c:622 src/messageview.c:198
+#, fuzzy
+msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/E_xibir/_Conjunto de ca_racteres/Japonês (_Shift__JIS)"
 
-#: src/mainwindow.c:619 src/messageview.c:201
-msgid "/_View/_Code set/Simplified Chinese (_GB2312)"
-msgstr "/E_xibir/_Conjunto de ca_racteres/Chinês simplificado (_GB2312)"
-
-#: src/mainwindow.c:621 src/messageview.c:203
-msgid "/_View/_Code set/Traditional Chinese (_Big5)"
-msgstr "/E_xibir/_Conjunto de ca_racteres/Chinês tradicional (_Big5)"
-
-#: src/mainwindow.c:623 src/messageview.c:205
-msgid "/_View/_Code set/Traditional Chinese (EUC-_TW)"
-msgstr "/E_xibir/_Conjunto de ca_racteres/Chinês tradicional (EUC-_TW)"
-
-#: src/mainwindow.c:625 src/messageview.c:207
-msgid "/_View/_Code set/Chinese (ISO-2022-_CN)"
+#: src/mainwindow.c:632 src/messageview.c:207
+#, fuzzy
+msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/E_xibir/_Conjunto de ca_racteres/Chinês (ISO-2022-_CN)"
 
-#: src/mainwindow.c:628 src/messageview.c:210
-msgid "/_View/_Code set/Korean (EUC-_KR)"
-msgstr "/E_xibir/_Conjunto de ca_racteres/Coreano (EUC-_KR)"
-
-#: src/mainwindow.c:630 src/messageview.c:212
-msgid "/_View/_Code set/Korean (ISO-2022-KR)"
+#: src/mainwindow.c:638 src/messageview.c:212
+#, fuzzy
+msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/E_xibir/_Conjunto de ca_racteres/Coreano (ISO-2022-KR)"
 
-#: src/mainwindow.c:633 src/messageview.c:215
-msgid "/_View/_Code set/Thai (TIS-620)"
-msgstr "/E_xibir/_Conjunto de ca_racteres/Thai (TIS-620)"
-
-#: src/mainwindow.c:635 src/messageview.c:217
-msgid "/_View/_Code set/Thai (Windows-874)"
-msgstr "/E_xibir/_Conjunto de ca_racteres/Thai (Windows-874)"
-
-#: src/mainwindow.c:642 src/summaryview.c:371
+#: src/mainwindow.c:651 src/summaryview.c:371
 msgid "/_View/Open in new _window"
 msgstr "/E_xibir/Abrir em uma n_ova janela"
 
-#: src/mainwindow.c:643 src/messageview.c:224
+#: src/mainwindow.c:652 src/messageview.c:224
 msgid "/_View/Mess_age source"
 msgstr "/E_xibir/Ver _fonte"
 
-#: src/mainwindow.c:644 src/messageview.c:225
+#: src/mainwindow.c:653 src/messageview.c:225
 msgid "/_View/Show all _header"
 msgstr "/E_xibir/_Mostrar todos os cabeçalhos"
 
-#: src/mainwindow.c:646
+#: src/mainwindow.c:655
 msgid "/_View/_Update summary"
 msgstr "/E_xibir/A_tualizar sumário"
 
-#: src/mainwindow.c:648 src/messageview.c:227
+#: src/mainwindow.c:657 src/messageview.c:227
 msgid "/_Message"
 msgstr "/_Mensagem"
 
-#: src/mainwindow.c:649
+#: src/mainwindow.c:658
 #, fuzzy
 msgid "/_Message/Recei_ve"
 msgstr "/_Mensagem/Ed_itar novamente"
 
-#: src/mainwindow.c:650
+#: src/mainwindow.c:659
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/_Mensagem/Receber de _todas as contas"
 
-#: src/mainwindow.c:652
+#: src/mainwindow.c:661
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/_Mensagem/Receber de _todas as contas"
 
-#: src/mainwindow.c:654
+#: src/mainwindow.c:663
 #, fuzzy
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/_Mensagem/_Cancelar recebimento"
 
-#: src/mainwindow.c:656
+#: src/mainwindow.c:665
 #, fuzzy
 msgid "/_Message/Recei_ve/---"
 msgstr "/_Mensagem/Ed_itar novamente"
 
-#: src/mainwindow.c:657
+#: src/mainwindow.c:666
 msgid "/_Message/_Send queued messages"
 msgstr "/_Mensagem/Enviar mensagens da _fila"
 
-#: src/mainwindow.c:658 src/mainwindow.c:660 src/mainwindow.c:667
-#: src/mainwindow.c:672 src/mainwindow.c:676 src/mainwindow.c:685
+#: src/mainwindow.c:667 src/mainwindow.c:669 src/mainwindow.c:676
+#: src/mainwindow.c:681 src/mainwindow.c:685 src/mainwindow.c:694
 #: src/messageview.c:230 src/messageview.c:238 src/messageview.c:243
 msgid "/_Message/---"
 msgstr "/_Mensagem/---"
 
-#: src/mainwindow.c:659 src/messageview.c:228
+#: src/mainwindow.c:668 src/messageview.c:228
 msgid "/_Message/Compose _new message"
 msgstr "/_Mensagem/Compor _nova mensagem"
 
-#: src/mainwindow.c:661 src/messageview.c:231
+#: src/mainwindow.c:670 src/messageview.c:231
 msgid "/_Message/_Reply"
 msgstr "/_Mensagem/_Responder"
 
-#: src/mainwindow.c:662
+#: src/mainwindow.c:671
 msgid "/_Message/Repl_y to"
 msgstr "/_Mensagem/_Responder para"
 
-#: src/mainwindow.c:663 src/messageview.c:232
+#: src/mainwindow.c:672 src/messageview.c:232
 msgid "/_Message/Repl_y to/_all"
 msgstr "/Mensagem/Responder para/_todos"
 
-#: src/mainwindow.c:664 src/messageview.c:234
+#: src/mainwindow.c:673 src/messageview.c:234
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Mensagem/Responder para/_quem enviou"
 
-#: src/mainwindow.c:665 src/messageview.c:236
+#: src/mainwindow.c:674 src/messageview.c:236
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/Mensagem/Responder para/_lista"
 
-#: src/mainwindow.c:668 src/messageview.c:239
+#: src/mainwindow.c:677 src/messageview.c:239
 msgid "/_Message/_Forward"
 msgstr "/_Mensagem/Encam_inhar"
 
-#: src/mainwindow.c:669 src/messageview.c:240
+#: src/mainwindow.c:678 src/messageview.c:240
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Mensagem/Encaminhar como ane_xo"
 
-#: src/mainwindow.c:671 src/messageview.c:242
+#: src/mainwindow.c:680 src/messageview.c:242
 msgid "/_Message/Redirec_t"
 msgstr "/_Mensagem/Redire_cionar"
 
-#: src/mainwindow.c:673
+#: src/mainwindow.c:682
 msgid "/_Message/M_ove..."
 msgstr "/_Mensagem/Mo_ver..."
 
-#: src/mainwindow.c:674
+#: src/mainwindow.c:683
 msgid "/_Message/_Copy..."
 msgstr "/_Mensagem/_Copiar..."
 
-#: src/mainwindow.c:675
+#: src/mainwindow.c:684
 msgid "/_Message/_Delete"
 msgstr "/_Mensagem/_Apagar"
 
-#: src/mainwindow.c:677
+#: src/mainwindow.c:686
 msgid "/_Message/_Mark"
 msgstr "/_Mensagem/_Marcar"
 
-#: src/mainwindow.c:678
+#: src/mainwindow.c:687
 msgid "/_Message/_Mark/_Mark"
 msgstr "/_Mensagem/_Marcar/_Marcar"
 
-#: src/mainwindow.c:679
+#: src/mainwindow.c:688
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/_Mensagem/_Marcar/_Desmarcar"
 
-#: src/mainwindow.c:680
+#: src/mainwindow.c:689
 msgid "/_Message/_Mark/---"
 msgstr "/_Mensagem/_Marcar/---"
 
-#: src/mainwindow.c:681
+#: src/mainwindow.c:690
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/_Mensagem/_Marcar/Marcar como _não lida"
 
-#: src/mainwindow.c:682
+#: src/mainwindow.c:691
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/_Mensagem/_Marcar/Marcar como l_ida"
 
-#: src/mainwindow.c:684
+#: src/mainwindow.c:693
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/_Mensagem/_Marcar/Marcar todas como _lidas"
 
-#: src/mainwindow.c:686 src/messageview.c:244
+#: src/mainwindow.c:695 src/messageview.c:244
 msgid "/_Message/Re-_edit"
 msgstr "/_Mensagem/Ed_itar novamente"
 
-#: src/mainwindow.c:690 src/messageview.c:248
+#: src/mainwindow.c:699 src/messageview.c:248
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/_Ferramentas/Adicionar remetente ao Livro de _Endereços"
 
-#: src/mainwindow.c:693
+#: src/mainwindow.c:702
 #, fuzzy
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/_Ferramentas/_Filtrar mensagens"
 
-#: src/mainwindow.c:695
+#: src/mainwindow.c:704
 #, fuzzy
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Ferramentas/_Filtrar mensagens"
 
-#: src/mainwindow.c:697 src/messageview.c:251
+#: src/mainwindow.c:706 src/messageview.c:251
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Ferramentas/_Criar regra de filtro"
 
-#: src/mainwindow.c:698 src/messageview.c:253
+#: src/mainwindow.c:707 src/messageview.c:253
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Ferramentas/_Criar regra de filtro/_Automaticamente"
 
-#: src/mainwindow.c:700 src/messageview.c:255
+#: src/mainwindow.c:709 src/messageview.c:255
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Ferramentas/_Criar regra de filtro/pelo _remtente"
 
-#: src/mainwindow.c:702 src/messageview.c:257
+#: src/mainwindow.c:711 src/messageview.c:257
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Ferramentas/_Criar regra de filtro/pelo _destinatário"
 
-#: src/mainwindow.c:704 src/messageview.c:259
+#: src/mainwindow.c:713 src/messageview.c:259
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Ferramentas/_Criar regra de filtro/pelo A_ssunto"
 
-#: src/mainwindow.c:709
+#: src/mainwindow.c:718
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/_Ferramentas/_Apagar mensagens duplicadas"
 
-#: src/mainwindow.c:712
+#: src/mainwindow.c:721
 msgid "/_Tools/E_xecute"
 msgstr "/_Ferramentas/E_xecutar"
 
-#: src/mainwindow.c:714
+#: src/mainwindow.c:723
 msgid "/_Tools/_Log window"
 msgstr "/_Ferramentas/_Janela de log"
 
-#: src/mainwindow.c:716
+#: src/mainwindow.c:725
 msgid "/_Configuration"
 msgstr "/_Configuração"
 
-#: src/mainwindow.c:717
+#: src/mainwindow.c:726
 msgid "/_Configuration/_Common preferences..."
 msgstr "/_Configuração/_Preferências comuns..."
 
-#: src/mainwindow.c:719
+#: src/mainwindow.c:728
 msgid "/_Configuration/_Filter setting..."
 msgstr "/_Configuração/Configuração de _filtros..."
 
-#: src/mainwindow.c:721
+#: src/mainwindow.c:730
 msgid "/_Configuration/_Template..."
 msgstr "/_Configuração/_Modelo..."
 
-#: src/mainwindow.c:722
+#: src/mainwindow.c:731
 msgid "/_Configuration/_Actions..."
 msgstr "/_Configuração/_Ações..."
 
-#: src/mainwindow.c:723
+#: src/mainwindow.c:732
 msgid "/_Configuration/---"
 msgstr "/_Configuração/---"
 
-#: src/mainwindow.c:724
+#: src/mainwindow.c:733
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Configuração/Preferências da conta _atual..."
 
-#: src/mainwindow.c:726
+#: src/mainwindow.c:735
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Configuração/Criar uma _nova conta..."
 
-#: src/mainwindow.c:728
+#: src/mainwindow.c:737
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Configuração/_Editar contas..."
 
-#: src/mainwindow.c:730
+#: src/mainwindow.c:739
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Configuração/_Mudar conta atual"
 
-#: src/mainwindow.c:734
+#: src/mainwindow.c:743
 msgid "/_Help/_Manual"
 msgstr "/_Ajuda/_Manual"
 
-#: src/mainwindow.c:735
+#: src/mainwindow.c:744
 msgid "/_Help/_Manual/_English"
 msgstr "/_Ajuda/_Manual/_Inglês"
 
-#: src/mainwindow.c:736
+#: src/mainwindow.c:745
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/_Ajuda/_Manual/_Japonês"
 
-#: src/mainwindow.c:737
+#: src/mainwindow.c:746
 msgid "/_Help/_FAQ"
 msgstr "/_Ajuda/_FAQ"
 
-#: src/mainwindow.c:738
+#: src/mainwindow.c:747
 msgid "/_Help/_FAQ/_English"
 msgstr "/_Ajuda/_FAQ/_Inglês"
 
-#: src/mainwindow.c:739
+#: src/mainwindow.c:748
 msgid "/_Help/_FAQ/_German"
 msgstr "/_Ajuda/_FAQ/_Alemão"
 
-#: src/mainwindow.c:740
+#: src/mainwindow.c:749
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/_Ajuda/_FAQ/_Espanhol"
 
-#: src/mainwindow.c:741
+#: src/mainwindow.c:750
 msgid "/_Help/_FAQ/_French"
 msgstr "/_Ajuda/_FAQ/_Francês"
 
-#: src/mainwindow.c:742
+#: src/mainwindow.c:751
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/_Ajuda/_FAQ/_Italiano"
 
-#: src/mainwindow.c:743
+#: src/mainwindow.c:752
 msgid "/_Help/---"
 msgstr "/_Ajuda/---"
 
-#: src/mainwindow.c:783
+#: src/mainwindow.c:792
 msgid "Creating main window...\n"
 msgstr "Criando janela principal...\n"
 
-#: src/mainwindow.c:943
+#: src/mainwindow.c:952
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "MainWindow: falhou ao alocar cores %d\n"
 
-#: src/mainwindow.c:1021 src/summaryview.c:1368 src/summaryview.c:1677
+#: src/mainwindow.c:1030 src/summaryview.c:1368 src/summaryview.c:1677
 #: src/summaryview.c:1785 src/summaryview.c:1831 src/summaryview.c:2453
 #: src/summaryview.c:3080 src/summaryview.c:3146 src/summaryview.c:3171
 #: src/summaryview.c:3284
 msgid "done.\n"
 msgstr "Pronto.\n"
 
-#: src/mainwindow.c:1137 src/mainwindow.c:1178 src/mainwindow.c:1206
+#: src/mainwindow.c:1146 src/mainwindow.c:1187 src/mainwindow.c:1215
 msgid "Untitled"
 msgstr "Sem título"
 
-#: src/mainwindow.c:1207
+#: src/mainwindow.c:1216
 msgid "none"
 msgstr "nenhuma"
 
-#: src/mainwindow.c:1257
+#: src/mainwindow.c:1266
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "Mudando tipo de separação de janela de %d para %d\n"
 
-#: src/mainwindow.c:1477
+#: src/mainwindow.c:1486
 msgid "Offline"
 msgstr ""
 
-#: src/mainwindow.c:1478
+#: src/mainwindow.c:1487
 msgid "You are offline. Go online?"
 msgstr ""
 
-#: src/mainwindow.c:1492
+#: src/mainwindow.c:1501
 #, fuzzy
 msgid "Empty all trash"
 msgstr "Esvaziar lixeira"
 
-#: src/mainwindow.c:1493
+#: src/mainwindow.c:1502
 #, fuzzy
 msgid "Empty messages in all trash?"
 msgstr "Limpar todas as mensagens na lixeira ?"
 
-#: src/mainwindow.c:1521
+#: src/mainwindow.c:1530
 msgid "Add mailbox"
 msgstr "Adicionar caixa de correio"
 
-#: src/mainwindow.c:1522
+#: src/mainwindow.c:1531
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3142,16 +3178,16 @@ msgstr ""
 "Se uma caixa de correio existente é especificada, ela será\n"
 "mapeada automaticamente."
 
-#: src/mainwindow.c:1528
+#: src/mainwindow.c:1537
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "A caixa de correio `%s' já existe."
 
-#: src/mainwindow.c:1533 src/setup.c:57
+#: src/mainwindow.c:1542 src/setup.c:57
 msgid "Mailbox"
 msgstr "Correio"
 
-#: src/mainwindow.c:1539 src/setup.c:63
+#: src/mainwindow.c:1548 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3161,144 +3197,144 @@ msgstr ""
 "Talvez alguns arquivos já existam, ou você não tem permissão para escrever "
 "lá."
 
-#: src/mainwindow.c:1912
+#: src/mainwindow.c:1921
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Visão de Pastas"
 
-#: src/mainwindow.c:1932 src/messageview.c:358
+#: src/mainwindow.c:1941 src/messageview.c:358
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Visão de Mensagens"
 
-#: src/mainwindow.c:2079 src/summaryview.c:340
+#: src/mainwindow.c:2088 src/summaryview.c:340
 msgid "/_Reply"
 msgstr "/_Responder"
 
-#: src/mainwindow.c:2080
+#: src/mainwindow.c:2089
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "Responder para todos"
 
-#: src/mainwindow.c:2081
+#: src/mainwindow.c:2090
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "Res_ponder para/_quem enviou"
 
-#: src/mainwindow.c:2082
+#: src/mainwindow.c:2091
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "Responder para/_lista"
 
-#: src/mainwindow.c:2087 src/summaryview.c:347
+#: src/mainwindow.c:2096 src/summaryview.c:347
 msgid "/_Forward"
 msgstr "/En_caminhar"
 
-#: src/mainwindow.c:2088 src/summaryview.c:348
+#: src/mainwindow.c:2097 src/summaryview.c:348
 msgid "/For_ward as attachment"
 msgstr "/Encaminhar como ane_xo"
 
-#: src/mainwindow.c:2089 src/summaryview.c:349
+#: src/mainwindow.c:2098 src/summaryview.c:349
 msgid "/Redirec_t"
 msgstr "/Re_direcionar"
 
-#: src/mainwindow.c:2125
+#: src/mainwindow.c:2134
 msgid "Get"
 msgstr "Baixar"
 
-#: src/mainwindow.c:2126
+#: src/mainwindow.c:2135
 msgid "Incorporate new mail"
 msgstr "Incorporar mensagens novas"
 
-#: src/mainwindow.c:2133
+#: src/mainwindow.c:2142
 msgid "Get all"
 msgstr "Baixar tudo"
 
-#: src/mainwindow.c:2134
+#: src/mainwindow.c:2143
 msgid "Incorporate new mail of all accounts"
 msgstr "Incorporar novas mensagens de todas as contas"
 
-#: src/mainwindow.c:2145
+#: src/mainwindow.c:2154
 msgid "Send queued message(s)"
 msgstr "Enviar Mensagem(s) da fila"
 
-#: src/mainwindow.c:2155 src/prefs_account.c:705 src/prefs_common.c:852
+#: src/mainwindow.c:2164 src/prefs_account.c:705 src/prefs_common.c:852
 #: src/prefs_folder_item.c:137
 msgid "Compose"
 msgstr "Escrever"
 
-#: src/mainwindow.c:2156
+#: src/mainwindow.c:2165
 msgid "Compose new message"
 msgstr "Escrever nova mensagem"
 
-#: src/mainwindow.c:2164 src/prefs_common.c:1353
+#: src/mainwindow.c:2173 src/prefs_common.c:1365
 msgid "Reply"
 msgstr "Responder"
 
-#: src/mainwindow.c:2165 src/mainwindow.c:2178
+#: src/mainwindow.c:2174 src/mainwindow.c:2187
 msgid "Reply to the message"
 msgstr "Responder à Mensagem"
 
-#: src/mainwindow.c:2183
+#: src/mainwindow.c:2192
 msgid "Reply all"
 msgstr "Responder todas"
 
-#: src/mainwindow.c:2184
+#: src/mainwindow.c:2193
 msgid "Reply to all"
 msgstr "Responder para todos"
 
-#: src/mainwindow.c:2192 src/prefs_filter_edit.c:719
+#: src/mainwindow.c:2201 src/prefs_filter_edit.c:719
 msgid "Forward"
 msgstr "Encaminhar"
 
-#: src/mainwindow.c:2193 src/mainwindow.c:2206
+#: src/mainwindow.c:2202 src/mainwindow.c:2215
 msgid "Forward the message"
 msgstr "Encaminhar a mensagem"
 
-#: src/mainwindow.c:2213
+#: src/mainwindow.c:2222
 msgid "Delete the message"
 msgstr "Apagar a mensagem"
 
-#: src/mainwindow.c:2221
+#: src/mainwindow.c:2230
 msgid "Execute"
 msgstr "Executar"
 
-#: src/mainwindow.c:2222
+#: src/mainwindow.c:2231
 msgid "Execute marked process"
 msgstr "Executar os processos marcados"
 
-#: src/mainwindow.c:2231
+#: src/mainwindow.c:2240
 msgid "Next unread message"
 msgstr "Próxima mensagem não lida"
 
-#: src/mainwindow.c:2242
+#: src/mainwindow.c:2251
 msgid "Prefs"
 msgstr "Preferências"
 
-#: src/mainwindow.c:2243
+#: src/mainwindow.c:2252
 msgid "Common preferences"
 msgstr "Preferências comuns"
 
-#: src/mainwindow.c:2250 src/prefs_folder_item.c:258
+#: src/mainwindow.c:2259 src/prefs_folder_item.c:258
 #: src/prefs_folder_item.c:269 src/progressdialog.c:50
 msgid "Account"
 msgstr "Conta"
 
-#: src/mainwindow.c:2251
+#: src/mainwindow.c:2260
 msgid "Account setting"
 msgstr "Preferências da conta"
 
-#: src/mainwindow.c:2425
+#: src/mainwindow.c:2434
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 
-#: src/mainwindow.c:2436
+#: src/mainwindow.c:2445
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 
-#: src/mainwindow.c:2624
+#: src/mainwindow.c:2633
 msgid "Exit"
 msgstr "Sair"
 
-#: src/mainwindow.c:2624
+#: src/mainwindow.c:2633
 msgid "Exit this program?"
 msgstr "Sair do programa?"
 
@@ -3424,7 +3460,7 @@ msgstr "Procura concluída"
 msgid "Creating message view...\n"
 msgstr "Criando visualizador de mensagem...\n"
 
-#: src/messageview.c:303 src/prefs_common.c:1550
+#: src/messageview.c:303 src/prefs_common.c:1562
 msgid "Text"
 msgstr "Texto"
 
@@ -3437,7 +3473,7 @@ msgstr "Anexos"
 msgid "Can't save the file `%s'."
 msgstr "Não foi possível salvar arquivo `%s'."
 
-#: src/messageview.c:697 src/prefs_common.c:2154 src/summaryview.c:2744
+#: src/messageview.c:697 src/prefs_common.c:2166 src/summaryview.c:2744
 msgid "Print"
 msgstr "Imprimir"
 
@@ -3914,7 +3950,7 @@ msgstr "(Mensagens não filtradas serão guardadas nesta pasta)"
 msgid "Authentication method"
 msgstr "Método de Autenticação"
 
-#: src/prefs_account.c:1123 src/prefs_account.c:1239 src/prefs_common.c:1189
+#: src/prefs_account.c:1123 src/prefs_account.c:1239 src/prefs_common.c:1201
 msgid "Automatic"
 msgstr "Automático"
 
@@ -3938,7 +3974,7 @@ msgstr "Gerar Message-ID"
 msgid "Add user-defined header"
 msgstr "Adicionar cabeçalho do usuário"
 
-#: src/prefs_account.c:1196 src/prefs_common.c:1714 src/prefs_common.c:1739
+#: src/prefs_account.c:1196 src/prefs_common.c:1726 src/prefs_common.c:1751
 msgid " Edit... "
 msgstr " Editar... "
 
@@ -4333,106 +4369,107 @@ msgid "Save sent messages to outbox"
 msgstr "Salvar mensagens enviadas na Caixa de saída"
 
 #: src/prefs_common.c:1113
-msgid "Outgoing codeset"
+#, fuzzy
+msgid "Outgoing encoding"
 msgstr "Conjunto de caracteres para enviar"
 
 #: src/prefs_common.c:1128
 msgid "Automatic (Recommended)"
 msgstr "Automático (Recomendado)"
 
-#: src/prefs_common.c:1129
+#: src/prefs_common.c:1130
 msgid "7bit ascii (US-ASCII)"
 msgstr "ASCII de 7 bits (US-ASC_II)"
 
-#: src/prefs_common.c:1130
+#: src/prefs_common.c:1132
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
-#: src/prefs_common.c:1131
+#: src/prefs_common.c:1134
 msgid "Western European (ISO-8859-1)"
 msgstr "Europeu Ocidental (ISO-8859-1)"
 
-#: src/prefs_common.c:1132
+#: src/prefs_common.c:1135
 msgid "Western European (ISO-8859-15)"
 msgstr "Europeu Ocidental (ISO-8859-15)"
 
-#: src/prefs_common.c:1133
+#: src/prefs_common.c:1137
 msgid "Central European (ISO-8859-2)"
 msgstr "Europeu Central (ISO-8859-2)"
 
-#: src/prefs_common.c:1134
+#: src/prefs_common.c:1139
 msgid "Baltic (ISO-8859-13)"
 msgstr "Báltico (ISO-8859-4)"
 
-#: src/prefs_common.c:1135
+#: src/prefs_common.c:1140
 msgid "Baltic (ISO-8859-4)"
 msgstr "Báltico (ISO-8859-4)"
 
-#: src/prefs_common.c:1136
+#: src/prefs_common.c:1142
 msgid "Greek (ISO-8859-7)"
 msgstr "Grego (ISO-8859-7)"
 
-#: src/prefs_common.c:1137
+#: src/prefs_common.c:1144
 msgid "Turkish (ISO-8859-9)"
 msgstr "Turco (ISO-8859-9)"
 
-#: src/prefs_common.c:1138
+#: src/prefs_common.c:1146
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Cirílico (ISO-8859-5)"
 
-#: src/prefs_common.c:1139
+#: src/prefs_common.c:1147
 msgid "Cyrillic (KOI8-R)"
 msgstr "Cirílico (KOI8-R)"
 
-#: src/prefs_common.c:1140
-msgid "Cyrillic (Windows-1251)"
-msgstr "Cirílico (Windows-1251)"
-
-#: src/prefs_common.c:1141
+#: src/prefs_common.c:1148
 msgid "Cyrillic (KOI8-U)"
 msgstr "Cirílico (KOI8-U)"
 
-#: src/prefs_common.c:1142
+#: src/prefs_common.c:1149
+msgid "Cyrillic (Windows-1251)"
+msgstr "Cirílico (Windows-1251)"
+
+#: src/prefs_common.c:1151
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Japonês (ISO-2022-JP)"
 
-#: src/prefs_common.c:1144
+#: src/prefs_common.c:1153
 msgid "Japanese (EUC-JP)"
 msgstr "Japonês (EUC-JP)"
 
-#: src/prefs_common.c:1145
+#: src/prefs_common.c:1154
 msgid "Japanese (Shift_JIS)"
 msgstr "Japonês (Shift_JIS)"
 
-#: src/prefs_common.c:1147
+#: src/prefs_common.c:1157
 msgid "Simplified Chinese (GB2312)"
 msgstr "Chinês simplificado (GB2312)"
 
-#: src/prefs_common.c:1148
+#: src/prefs_common.c:1158
 msgid "Traditional Chinese (Big5)"
 msgstr "Chinês tradicional (Big5)"
 
-#: src/prefs_common.c:1150
+#: src/prefs_common.c:1160
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Chinês tradicional (EUC-TW)"
 
-#: src/prefs_common.c:1151
+#: src/prefs_common.c:1161
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Chinês (ISO-2022-CN)"
 
-#: src/prefs_common.c:1153
+#: src/prefs_common.c:1164
 msgid "Korean (EUC-KR)"
 msgstr "Coreano (EUC-KR)"
 
-#: src/prefs_common.c:1154
+#: src/prefs_common.c:1166
 msgid "Thai (TIS-620)"
 msgstr "Thai (TIS-620)"
 
-#: src/prefs_common.c:1155
+#: src/prefs_common.c:1167
 msgid "Thai (Windows-874)"
 msgstr "Thai (Windows-874)"
 
-#: src/prefs_common.c:1165
+#: src/prefs_common.c:1177
 #, fuzzy
 msgid ""
 "If `Automatic' is selected, the optimal encoding for the current locale will "
@@ -4441,129 +4478,129 @@ msgstr ""
 "Se `Automático' for selecionado, a melhor codificação\n"
 "para o locale atual será usada."
 
-#: src/prefs_common.c:1179
+#: src/prefs_common.c:1191
 #, fuzzy
 msgid "Transfer encoding"
 msgstr "Quebrar antes de enviar"
 
-#: src/prefs_common.c:1202
+#: src/prefs_common.c:1214
 msgid ""
 "Specify Content-Transfer-Encoding used when message body contains non-ASCII "
 "characters."
 msgstr ""
 
-#: src/prefs_common.c:1272
+#: src/prefs_common.c:1284
 msgid "Signature separator"
 msgstr "Separador de assinatura"
 
-#: src/prefs_common.c:1281
+#: src/prefs_common.c:1293
 msgid "Insert automatically"
 msgstr "Inserir automaticamente"
 
-#: src/prefs_common.c:1291
+#: src/prefs_common.c:1303
 msgid "Automatically launch the external editor"
 msgstr "Executar o editor externo automaticamente"
 
-#: src/prefs_common.c:1301
+#: src/prefs_common.c:1313
 msgid "Undo level"
 msgstr "Nível de desfazer"
 
-#: src/prefs_common.c:1321
+#: src/prefs_common.c:1333
 msgid "Wrap messages at"
 msgstr "Quebrar mensagens em"
 
-#: src/prefs_common.c:1333
+#: src/prefs_common.c:1345
 msgid "characters"
 msgstr "caracteres"
 
-#: src/prefs_common.c:1343
+#: src/prefs_common.c:1355
 msgid "Wrap quotation"
 msgstr "Quebrar quote"
 
-#: src/prefs_common.c:1349
+#: src/prefs_common.c:1361
 msgid "Wrap on input"
 msgstr "Quebrar na entrada"
 
-#: src/prefs_common.c:1351
+#: src/prefs_common.c:1363
 msgid "Wrap before sending"
 msgstr "Quebrar antes de enviar"
 
-#: src/prefs_common.c:1361
+#: src/prefs_common.c:1373
 msgid "Automatically select account for replies"
 msgstr "Escolher conta para respostas automaticamente"
 
-#: src/prefs_common.c:1363
+#: src/prefs_common.c:1375
 msgid "Quote message when replying"
 msgstr "Quotar mensagem ao responder"
 
-#: src/prefs_common.c:1365
+#: src/prefs_common.c:1377
 msgid "Reply button invokes mailing list reply"
 msgstr "Botão de responder chama resposta para a lista"
 
 #. reply
-#: src/prefs_common.c:1411
+#: src/prefs_common.c:1423
 msgid "Reply format"
 msgstr "Formato de resposta"
 
-#: src/prefs_common.c:1426 src/prefs_common.c:1468
+#: src/prefs_common.c:1438 src/prefs_common.c:1480
 msgid "Quotation mark"
 msgstr "Marca de citação"
 
 #. forward
-#: src/prefs_common.c:1453
+#: src/prefs_common.c:1465
 msgid "Forward format"
 msgstr "Formato de Mensagem Encaminhada"
 
-#: src/prefs_common.c:1500
+#: src/prefs_common.c:1512
 msgid " Description of symbols "
 msgstr " Descrição dos símbolos "
 
-#: src/prefs_common.c:1541
+#: src/prefs_common.c:1553
 msgid "Font"
 msgstr "Fonte"
 
-#: src/prefs_common.c:1573
+#: src/prefs_common.c:1585
 msgid "Translate header name (such as `From:', `Subject:')"
 msgstr "Traduzir cabeçalhos (como `De:', `Assunto:')"
 
-#: src/prefs_common.c:1576
+#: src/prefs_common.c:1588
 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.c:1585
+#: src/prefs_common.c:1597
 msgid "Abbreviate newsgroups longer than"
 msgstr "Abreviar newsgroups maiores que"
 
-#: src/prefs_common.c:1600
+#: src/prefs_common.c:1612
 msgid "letters"
 msgstr "letras"
 
 #. ---- Summary ----
-#: src/prefs_common.c:1606
+#: src/prefs_common.c:1618
 msgid "Summary View"
 msgstr "Visão de Sumário "
 
-#: src/prefs_common.c:1615
+#: src/prefs_common.c:1627
 msgid "Display recipient on `From' column if sender is yourself"
 msgstr "Mostrar remetente na coluna `De' se ele for o mesmo"
 
-#: src/prefs_common.c:1617
+#: src/prefs_common.c:1629
 msgid "Expand threads"
 msgstr "Expandir threads"
 
-#: src/prefs_common.c:1625 src/prefs_common.c:2443 src/prefs_common.c:2481
+#: src/prefs_common.c:1637 src/prefs_common.c:2455 src/prefs_common.c:2493
 msgid "Date format"
 msgstr "Formato de data"
 
-#: src/prefs_common.c:1646
+#: src/prefs_common.c:1658
 msgid " Set display item of summary... "
 msgstr " Elementos visíveis no cabeçalho... "
 
-#: src/prefs_common.c:1710
+#: src/prefs_common.c:1722
 msgid "Enable coloration of message"
 msgstr "Permitir cores na mensagem"
 
-#: src/prefs_common.c:1724
+#: src/prefs_common.c:1736
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
@@ -4571,325 +4608,325 @@ msgstr ""
 "Exibir alfabetos de 2-bytes e numéricos com \n"
 "caracteres ASCII (1-byte)"
 
-#: src/prefs_common.c:1730
+#: src/prefs_common.c:1742
 msgid "Display header pane above message view"
 msgstr "Exibir cabeçalho acima da visão da mensagem"
 
-#: src/prefs_common.c:1737
+#: src/prefs_common.c:1749
 msgid "Display short headers on message view"
 msgstr "Cabeçalhos pequenos na visualização da mensagem"
 
-#: src/prefs_common.c:1758
+#: src/prefs_common.c:1770
 msgid "Line space"
 msgstr "Linha de espaço"
 
-#: src/prefs_common.c:1772 src/prefs_common.c:1810
+#: src/prefs_common.c:1784 src/prefs_common.c:1822
 msgid "pixel(s)"
 msgstr "pixel(s)"
 
-#: src/prefs_common.c:1777
+#: src/prefs_common.c:1789
 msgid "Scroll"
 msgstr "Rolagem"
 
-#: src/prefs_common.c:1784
+#: src/prefs_common.c:1796
 msgid "Half page"
 msgstr "Meia página"
 
-#: src/prefs_common.c:1790
+#: src/prefs_common.c:1802
 msgid "Smooth scroll"
 msgstr "Rolagem silenciosa"
 
-#: src/prefs_common.c:1796
+#: src/prefs_common.c:1808
 msgid "Step"
 msgstr "Passo"
 
-#: src/prefs_common.c:1816
+#: src/prefs_common.c:1828
 msgid "Images"
 msgstr ""
 
-#: src/prefs_common.c:1824
+#: src/prefs_common.c:1836
 #, fuzzy
 msgid "Resize attached large images to fit in the window"
 msgstr "Redimensionar imagens em anexo"
 
-#: src/prefs_common.c:1826
+#: src/prefs_common.c:1838
 #, fuzzy
 msgid "Display images as inline"
 msgstr "/E_xibir configuração de cabeçalho"
 
-#: src/prefs_common.c:1871
+#: src/prefs_common.c:1883
 msgid "Automatically check signatures"
 msgstr "Automaticamente checar assinatura"
 
-#: src/prefs_common.c:1874
+#: src/prefs_common.c:1886
 msgid "Show signature check result in a popup window"
 msgstr "Exibir resultado de checagem de assinatura em uma janela popup"
 
-#: src/prefs_common.c:1877
+#: src/prefs_common.c:1889
 msgid "Store passphrase in memory temporarily"
 msgstr "Armazenar senha temporariamente na memória"
 
-#: src/prefs_common.c:1892
+#: src/prefs_common.c:1904
 msgid "Expired after"
 msgstr "Expirado depois"
 
-#: src/prefs_common.c:1905
+#: src/prefs_common.c:1917
 msgid "minute(s) "
 msgstr "minuto(s)"
 
-#: src/prefs_common.c:1918
+#: src/prefs_common.c:1930
 #, fuzzy
 msgid "Setting to '0' will store the passphrase for the whole session."
 msgstr ""
 "(Definindo '0' irá guardar a senha para\n"
 " toda a sessão)"
 
-#: src/prefs_common.c:1932
+#: src/prefs_common.c:1944
 msgid "Grab input while entering a passphrase"
 msgstr "Obter entrada quando informando uma passphrase"
 
-#: src/prefs_common.c:1937
+#: src/prefs_common.c:1949
 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.c:1989
+#: src/prefs_common.c:2001
 #, fuzzy
 msgid "Always open messages in summary when selected"
 msgstr "Nenhum arquivo de mensagem selecionado."
 
-#: src/prefs_common.c:1993
+#: src/prefs_common.c:2005
 msgid "Open first unread message when entering a folder"
 msgstr "Abrir a primeira mensagem não lida ao abrir uma pasta"
 
-#: src/prefs_common.c:1997
+#: src/prefs_common.c:2009
 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.c:2001
+#: src/prefs_common.c:2013
 msgid "Go to inbox after receiving new mail"
 msgstr "Ir para Caixa de Entrada depois de receber novas mensagens"
 
-#: src/prefs_common.c:2009
+#: src/prefs_common.c:2021
 msgid "Execute immediately when moving or deleting messages"
 msgstr "Executar imediatamente enquanto movendo ou apagando mensagens"
 
-#: src/prefs_common.c:2021
+#: src/prefs_common.c:2033
 #, fuzzy
 msgid "Messages will be marked until execution if this is turned off."
 msgstr ""
 "(Mensagens serão marcadas até a execução\n"
 " se isto estiver desligado)"
 
-#: src/prefs_common.c:2029
+#: src/prefs_common.c:2041
 msgid "Receive dialog"
 msgstr "Diálogo de recepção"
 
-#: src/prefs_common.c:2039
+#: src/prefs_common.c:2051
 msgid "Show receive dialog"
 msgstr "Exibir diálogo de recepção"
 
-#: src/prefs_common.c:2049
+#: src/prefs_common.c:2061
 msgid "Always"
 msgstr "Sempre"
 
-#: src/prefs_common.c:2050
+#: src/prefs_common.c:2062
 msgid "Only on manual receiving"
 msgstr ""
 
-#: src/prefs_common.c:2052
+#: src/prefs_common.c:2064
 msgid "Never"
 msgstr "Nunca"
 
-#: src/prefs_common.c:2057
+#: src/prefs_common.c:2069
 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.c:2060
+#: src/prefs_common.c:2072
 msgid "Close receive dialog when finished"
 msgstr "Fechar diálogo de recepção quando terminar"
 
-#: src/prefs_common.c:2066
+#: src/prefs_common.c:2078
 msgid " Set key bindings... "
 msgstr " Definir atalhos de teclado... "
 
-#: src/prefs_common.c:2122
+#: src/prefs_common.c:2134
 #, 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.c:2131
+#: src/prefs_common.c:2143
 msgid "Web browser"
 msgstr "Navegador Web"
 
-#: src/prefs_common.c:2195
+#: src/prefs_common.c:2207
 msgid "Add address to destination when double-clicked"
 msgstr "Adicionar endereço para o destino quando clicado duas vezes"
 
-#: src/prefs_common.c:2197
+#: src/prefs_common.c:2209
 msgid "On exit"
 msgstr "Ao sair"
 
-#: src/prefs_common.c:2205
+#: src/prefs_common.c:2217
 msgid "Confirm on exit"
 msgstr "Confirmar ao sair"
 
-#: src/prefs_common.c:2212
+#: src/prefs_common.c:2224
 msgid "Empty trash on exit"
 msgstr "Esvaziar lixeira ao sair"
 
-#: src/prefs_common.c:2214
+#: src/prefs_common.c:2226
 msgid "Ask before emptying"
 msgstr "Pergunte antes de esvaziar"
 
-#: src/prefs_common.c:2218
+#: src/prefs_common.c:2230
 msgid "Warn if there are queued messages"
 msgstr "Avise se existirem mensagens na fila"
 
-#: src/prefs_common.c:2224
+#: src/prefs_common.c:2236
 msgid "Socket I/O timeout:"
 msgstr ""
 
-#: src/prefs_common.c:2237
+#: src/prefs_common.c:2249
 msgid "second(s)"
 msgstr ""
 
-#: src/prefs_common.c:2419
+#: src/prefs_common.c:2431
 msgid "the full abbreviated weekday name"
 msgstr "o nome completo do mês abreviado"
 
-#: src/prefs_common.c:2420
+#: src/prefs_common.c:2432
 msgid "the full weekday name"
 msgstr "o nome completo do dia da semana"
 
-#: src/prefs_common.c:2421
+#: src/prefs_common.c:2433
 msgid "the abbreviated month name"
 msgstr "o nome do mês abreviado"
 
-#: src/prefs_common.c:2422
+#: src/prefs_common.c:2434
 msgid "the full month name"
 msgstr "o nome completo do mês"
 
-#: src/prefs_common.c:2423
+#: src/prefs_common.c:2435
 msgid "the preferred date and time for the current locale"
 msgstr "a data é hora preferida para a localização atual"
 
-#: src/prefs_common.c:2424
+#: src/prefs_common.c:2436
 msgid "the century number (year/100)"
 msgstr "o número do século (ano/100)"
 
-#: src/prefs_common.c:2425
+#: src/prefs_common.c:2437
 msgid "the day of the month as a decimal number"
 msgstr "o dia do mês como um número decimal"
 
-#: src/prefs_common.c:2426
+#: src/prefs_common.c:2438
 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.c:2427
+#: src/prefs_common.c:2439
 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.c:2428
+#: src/prefs_common.c:2440
 msgid "the day of the year as a decimal number"
 msgstr "o dia do ano como um número decimal"
 
-#: src/prefs_common.c:2429
+#: src/prefs_common.c:2441
 msgid "the month as a decimal number"
 msgstr "o mês como um número decimal"
 
-#: src/prefs_common.c:2430
+#: src/prefs_common.c:2442
 msgid "the minute as a decimal number"
 msgstr "o minuto como um número decimal"
 
-#: src/prefs_common.c:2431
+#: src/prefs_common.c:2443
 msgid "either AM or PM"
 msgstr "ou AM ou PM"
 
-#: src/prefs_common.c:2432
+#: src/prefs_common.c:2444
 msgid "the second as a decimal number"
 msgstr "o segundo como um número decimal"
 
-#: src/prefs_common.c:2433
+#: src/prefs_common.c:2445
 msgid "the day of the week as a decimal number"
 msgstr "o dia da semana como um número decimal"
 
-#: src/prefs_common.c:2434
+#: src/prefs_common.c:2446
 msgid "the preferred date for the current locale"
 msgstr "a data preferida para localização atual"
 
-#: src/prefs_common.c:2435
+#: src/prefs_common.c:2447
 msgid "the last two digits of a year"
 msgstr "os últimos dois dígitos de um ano"
 
-#: src/prefs_common.c:2436
+#: src/prefs_common.c:2448
 msgid "the year as a decimal number"
 msgstr "o ano como um número decimal"
 
-#: src/prefs_common.c:2437
+#: src/prefs_common.c:2449
 msgid "the time zone or name or abbreviation"
 msgstr "o zona de tempo ou nome ou abreviação"
 
-#: src/prefs_common.c:2458
+#: src/prefs_common.c:2470
 msgid "Specifier"
 msgstr "Especificador"
 
-#: src/prefs_common.c:2459
+#: src/prefs_common.c:2471
 msgid "Description"
 msgstr "Descrição"
 
-#: src/prefs_common.c:2499
+#: src/prefs_common.c:2511
 msgid "Example"
 msgstr "Exemplo"
 
-#: src/prefs_common.c:2580
+#: src/prefs_common.c:2592
 msgid "Set message colors"
 msgstr "Defina as cores de mensagens"
 
-#: src/prefs_common.c:2588
+#: src/prefs_common.c:2600
 msgid "Colors"
 msgstr "Cores"
 
-#: src/prefs_common.c:2622
+#: src/prefs_common.c:2634
 msgid "Quoted Text - First Level"
 msgstr "Texto Quotado - Primeiro Nível"
 
-#: src/prefs_common.c:2628
+#: src/prefs_common.c:2640
 msgid "Quoted Text - Second Level"
 msgstr "Texto Quotado - Segundo Nível"
 
-#: src/prefs_common.c:2634
+#: src/prefs_common.c:2646
 msgid "Quoted Text - Third Level"
 msgstr "Texto Quotado - Terceiro Nível"
 
-#: src/prefs_common.c:2640
+#: src/prefs_common.c:2652
 msgid "URI link"
 msgstr "Ligação URI"
 
-#: src/prefs_common.c:2647
+#: src/prefs_common.c:2659
 msgid "Recycle quote colors"
 msgstr "Reaproveitar cores de quote"
 
-#: src/prefs_common.c:2707
+#: src/prefs_common.c:2719
 msgid "Pick color for quotation level 1"
 msgstr "Escolher cor para quotação nível 1"
 
-#: src/prefs_common.c:2710
+#: src/prefs_common.c:2722
 msgid "Pick color for quotation level 2"
 msgstr "Escolher cor para quotação nível 2"
 
-#: src/prefs_common.c:2713
+#: src/prefs_common.c:2725
 msgid "Pick color for quotation level 3"
 msgstr "Escolher cor para quotação nível 3"
 
-#: src/prefs_common.c:2716
+#: src/prefs_common.c:2728
 msgid "Pick color for URI"
 msgstr "Escolher cor para URI"
 
-#: src/prefs_common.c:2853
+#: src/prefs_common.c:2865
 msgid "Description of symbols"
 msgstr "Descrição dos símbolos"
 
-#: src/prefs_common.c:2909
+#: src/prefs_common.c:2921
 msgid ""
 "Date\n"
 "From\n"
@@ -4914,11 +4951,11 @@ msgstr ""
 "Message-ID\n"
 "%"
 
-#: src/prefs_common.c:2922
+#: src/prefs_common.c:2934
 msgid "If x is set, displays expr"
 msgstr "Se x estiver definido, mostra expr"
 
-#: src/prefs_common.c:2926
+#: src/prefs_common.c:2938
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -4932,7 +4969,7 @@ msgstr ""
 "Corpo da mensagem citada sem assinatura\n"
 "%% literal"
 
-#: src/prefs_common.c:2934
+#: src/prefs_common.c:2946
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -4944,15 +4981,15 @@ msgstr ""
 "Abre-chave literal\n"
 "Fecha-chave literal"
 
-#: src/prefs_common.c:2971
+#: src/prefs_common.c:2983
 msgid "Font selection"
 msgstr "Seleção de fonte"
 
-#: src/prefs_common.c:3035
+#: src/prefs_common.c:3047
 msgid "Key bindings"
 msgstr "Atalhos de teclado"
 
-#: src/prefs_common.c:3049
+#: src/prefs_common.c:3061
 msgid ""
 "Select the preset of key bindings.\n"
 "You can also modify each menu's shortcuts by pressing\n"
@@ -4963,11 +5000,11 @@ msgstr ""
 "pressionando qualquer tecla enquanto coloca o ponteiro\n"
 "do mouse sobre o item."
 
-#: src/prefs_common.c:3061 src/prefs_common.c:3410
+#: src/prefs_common.c:3073 src/prefs_common.c:3422
 msgid "Default"
 msgstr "Padrão"
 
-#: src/prefs_common.c:3064 src/prefs_common.c:3419
+#: src/prefs_common.c:3076 src/prefs_common.c:3431
 msgid "Old Sylpheed"
 msgstr "Sylpheed antigo"
 
@@ -6136,6 +6173,12 @@ msgstr ""
 msgid "writing to %s failed.\n"
 msgstr "Erro ao gravar em %s.\n"
 
+#~ msgid "/_View/_Code set/---"
+#~ msgstr "/E_xibir/Conjunto de ca_racteres/---"
+
+#~ msgid "/_View/_Code set"
+#~ msgstr "/E_xibir/Conjunto de ca_racteres"
+
 #~ msgid "To save this part, pop up the context menu with "
 #~ msgstr "Para salvar esta parte, abra o menu contextual com o"
 
diff --git a/po/ro.po b/po/ro.po
index 8fa3e861..46c9e041 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-03-15 14:29+0900\n"
+"POT-Creation-Date: 2005-03-16 14:47+0900\n"
 "PO-Revision-Date: 2000-08-28\n"
 "Last-Translator: Little Dragon <littledragon@altern.org>\n"
 "Language-Team: Little Dragon <littledragon@altern.org>\n"
@@ -101,7 +101,7 @@ msgstr ""
 "mesajelor de comanda `Ia tot'."
 
 #: src/account.c:638 src/addressadd.c:186 src/addressbook.c:488
-#: src/compose.c:3650 src/editaddress.c:195 src/editaddress.c:936
+#: src/compose.c:3748 src/editaddress.c:195 src/editaddress.c:936
 #: src/editaddress.c:984 src/editbook.c:191 src/editgroup.c:257
 #: src/editjpilot.c:296 src/editldap.c:300 src/editvcard.c:211
 #: src/mimeview.c:151 src/prefs_filter.c:214 src/prefs_folder_item.c:170
@@ -155,13 +155,13 @@ msgstr "Ştergere cont"
 msgid "Do you really want to delete this account?"
 msgstr "Sunteţi sigur că doriţi să ştergeţi acest cont ?"
 
-#: src/account.c:758 src/compose.c:2551 src/compose.c:4807
+#: src/account.c:758 src/compose.c:2632 src/compose.c:4943
 #: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
 #: src/folderview.c:2156 src/folderview.c:2192
 msgid "Yes"
 msgstr "Da"
 
-#: src/account.c:758 src/compose.c:2551 src/compose.c:4807
+#: src/account.c:758 src/compose.c:2632 src/compose.c:4943
 #: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
 #: src/folderview.c:2156 src/folderview.c:2192
 msgid "+No"
@@ -261,7 +261,7 @@ msgstr ""
 msgid "Add Address to Book"
 msgstr "Adăugare în agendă"
 
-#: src/addressadd.c:196 src/compose.c:4191 src/editaddress.c:196
+#: src/addressadd.c:196 src/compose.c:4292 src/editaddress.c:196
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "Adresă"
@@ -275,7 +275,7 @@ msgstr "Observaţii"
 msgid "Select Address Book Folder"
 msgstr "Selectaţi un director"
 
-#: src/addressbook.c:334 src/compose.c:469 src/mainwindow.c:454
+#: src/addressbook.c:334 src/compose.c:477 src/mainwindow.c:454
 #: src/messageview.c:134
 msgid "/_File"
 msgstr "/_Fişier"
@@ -296,8 +296,8 @@ msgstr "/_Fişier/_JPilot nou"
 msgid "/_File/New _Server"
 msgstr "/_Fişier/Server _LDAP nou"
 
-#: src/addressbook.c:343 src/addressbook.c:346 src/compose.c:474
-#: src/compose.c:479 src/compose.c:483 src/mainwindow.c:471
+#: src/addressbook.c:343 src/addressbook.c:346 src/compose.c:482
+#: src/compose.c:487 src/compose.c:491 src/mainwindow.c:471
 #: src/mainwindow.c:474 src/mainwindow.c:476 src/mainwindow.c:479
 #: src/mainwindow.c:481 src/messageview.c:137
 msgid "/_File/---"
@@ -316,7 +316,7 @@ msgstr "/_Fişier/Ş_tergere"
 msgid "/_File/_Save"
 msgstr "/_Fişier/_Salvare ca..."
 
-#: src/addressbook.c:348 src/compose.c:484 src/messageview.c:138
+#: src/addressbook.c:348 src/compose.c:492 src/messageview.c:138
 msgid "/_File/_Close"
 msgstr "/_Fişier/Î_nchidere"
 
@@ -348,7 +348,7 @@ msgstr "/_Adresă/_Editare"
 msgid "/_Address/_Delete"
 msgstr "/_Adresă/Ş_tergere"
 
-#: src/addressbook.c:356 src/compose.c:585 src/mainwindow.c:688
+#: src/addressbook.c:356 src/compose.c:664 src/mainwindow.c:697
 #: src/messageview.c:246
 #, fuzzy
 msgid "/_Tools"
@@ -358,12 +358,12 @@ msgstr "/_Utilitare"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Utilitare/Importare fişier _LDIF"
 
-#: src/addressbook.c:358 src/compose.c:598 src/mainwindow.c:733
+#: src/addressbook.c:358 src/compose.c:677 src/mainwindow.c:742
 #: src/messageview.c:264
 msgid "/_Help"
 msgstr "/A_jutor"
 
-#: src/addressbook.c:359 src/compose.c:599 src/mainwindow.c:744
+#: src/addressbook.c:359 src/compose.c:678 src/mainwindow.c:753
 #: src/messageview.c:265
 msgid "/_Help/_About"
 msgstr "/A_jutor/_Despre"
@@ -383,7 +383,7 @@ msgstr "/_Grup nou"
 msgid "/New _Folder"
 msgstr "/_Director nou"
 
-#: src/addressbook.c:381 src/addressbook.c:391 src/compose.c:463
+#: src/addressbook.c:381 src/addressbook.c:391 src/compose.c:471
 #: src/folderview.c:220 src/folderview.c:222 src/folderview.c:226
 #: src/folderview.c:236 src/folderview.c:238 src/folderview.c:240
 #: src/folderview.c:244 src/folderview.c:254 src/folderview.c:256
@@ -393,7 +393,7 @@ msgstr "/_Director nou"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:382 src/addressbook.c:392 src/compose.c:486
+#: src/addressbook.c:382 src/addressbook.c:392 src/compose.c:494
 #: src/mainwindow.c:485 src/messageview.c:140
 msgid "/_Edit"
 msgstr "/_Editare"
@@ -406,7 +406,7 @@ msgstr "/Ş_tergere"
 msgid "E-Mail address"
 msgstr "Adresă E-Mail"
 
-#: src/addressbook.c:493 src/compose.c:4192 src/prefs_common.c:2186
+#: src/addressbook.c:493 src/compose.c:4293 src/prefs_common.c:2198
 msgid "Address book"
 msgstr "Agendă"
 
@@ -416,7 +416,7 @@ msgstr " Nume:"
 
 #. Buttons
 #: src/addressbook.c:625 src/addressbook.c:1665 src/addressbook.c:1671
-#: src/editaddress.c:878 src/editaddress.c:1011 src/mainwindow.c:2212
+#: src/editaddress.c:878 src/editaddress.c:1011 src/mainwindow.c:2221
 #: src/prefs_actions.c:263 src/prefs_display_header.c:275
 #: src/prefs_display_header.c:330 src/prefs_template.c:227
 msgid "Delete"
@@ -611,7 +611,7 @@ msgstr "Adresse comună:"
 msgid "Personal address"
 msgstr "Adresse personală:"
 
-#: src/alertpanel.c:123 src/compose.c:4807 src/main.c:458
+#: src/alertpanel.c:123 src/compose.c:4943 src/main.c:458
 msgid "Notice"
 msgstr "Informaţie"
 
@@ -619,7 +619,7 @@ msgstr "Informaţie"
 msgid "Warning"
 msgstr "Avertisment"
 
-#: src/alertpanel.c:149 src/compose.c:2551 src/inc.c:558
+#: src/alertpanel.c:149 src/compose.c:2632 src/inc.c:558
 msgid "Error"
 msgstr "Eroare"
 
@@ -667,316 +667,434 @@ msgstr "Maro"
 msgid "None"
 msgstr "Niciunul"
 
-#: src/compose.c:461
+#: src/compose.c:469
 msgid "/_Add..."
 msgstr "/_Adăugare..."
 
-#: src/compose.c:462
+#: src/compose.c:470
 msgid "/_Remove"
 msgstr "/Ş_tergere"
 
-#: src/compose.c:464 src/folderview.c:228 src/folderview.c:246
+#: src/compose.c:472 src/folderview.c:228 src/folderview.c:246
 #: src/folderview.c:261
 #, fuzzy
 msgid "/_Properties..."
 msgstr "/_Proprietăţi..."
 
-#: src/compose.c:470
+#: src/compose.c:478
 #, fuzzy
 msgid "/_File/_Send"
 msgstr "/_Fişier/_Salvare ca..."
 
-#: src/compose.c:472
+#: src/compose.c:480
 #, fuzzy
 msgid "/_File/Send _later"
 msgstr "/_Mesaj/Tr_imitere mai târziu"
 
-#: src/compose.c:475
+#: src/compose.c:483
 #, fuzzy
 msgid "/_File/Save to _draft folder"
 msgstr "/_Mesaj/Sal_vare"
 
-#: src/compose.c:477
+#: src/compose.c:485
 #, fuzzy
 msgid "/_File/Save and _keep editing"
 msgstr "/_Message/Salvare şi _continuare"
 
-#: src/compose.c:480
+#: src/compose.c:488
 msgid "/_File/_Attach file"
 msgstr "/_Fişier/_Ataşare fişier"
 
-#: src/compose.c:481
+#: src/compose.c:489
 msgid "/_File/_Insert file"
 msgstr "/_Fişier/_Inserare fişier"
 
-#: src/compose.c:482
+#: src/compose.c:490
 msgid "/_File/Insert si_gnature"
 msgstr "/_Fişier/Inserare sem_nătură"
 
-#: src/compose.c:487
+#: src/compose.c:495
 msgid "/_Edit/_Undo"
 msgstr "/_Editare/An_ulare"
 
-#: src/compose.c:488
+#: src/compose.c:496
 msgid "/_Edit/_Redo"
 msgstr "/_Editare/_Repetare"
 
-#: src/compose.c:489 src/compose.c:567 src/mainwindow.c:489
+#: src/compose.c:497 src/compose.c:575 src/mainwindow.c:489
 #: src/messageview.c:143
 msgid "/_Edit/---"
 msgstr "/_Editare/---"
 
-#: src/compose.c:490
+#: src/compose.c:498
 msgid "/_Edit/Cu_t"
 msgstr "/_Editare/_Tăiere"
 
-#: src/compose.c:491 src/mainwindow.c:486 src/messageview.c:141
+#: src/compose.c:499 src/mainwindow.c:486 src/messageview.c:141
 msgid "/_Edit/_Copy"
 msgstr "/_Editare/_Copiere"
 
-#: src/compose.c:492
+#: src/compose.c:500
 msgid "/_Edit/_Paste"
 msgstr "/_Editare/Li_pire"
 
-#: src/compose.c:493
+#: src/compose.c:501
 #, fuzzy
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Editare/Li_pire"
 
-#: src/compose.c:495 src/mainwindow.c:487 src/messageview.c:142
+#: src/compose.c:503 src/mainwindow.c:487 src/messageview.c:142
 msgid "/_Edit/Select _all"
 msgstr "/_Editare/Select_are tot"
 
-#: src/compose.c:496
+#: src/compose.c:504
 #, fuzzy
 msgid "/_Edit/A_dvanced"
 msgstr "/_Editare/An_ulare"
 
-#: src/compose.c:497
+#: src/compose.c:505
 msgid "/_Edit/A_dvanced/Move a character backward"
 msgstr ""
 
-#: src/compose.c:502
+#: src/compose.c:510
 msgid "/_Edit/A_dvanced/Move a character forward"
 msgstr ""
 
-#: src/compose.c:507
+#: src/compose.c:515
 msgid "/_Edit/A_dvanced/Move a word backward"
 msgstr ""
 
-#: src/compose.c:512
+#: src/compose.c:520
 msgid "/_Edit/A_dvanced/Move a word forward"
 msgstr ""
 
-#: src/compose.c:517
+#: src/compose.c:525
 msgid "/_Edit/A_dvanced/Move to beginning of line"
 msgstr ""
 
-#: src/compose.c:522
+#: src/compose.c:530
 msgid "/_Edit/A_dvanced/Move to end of line"
 msgstr ""
 
-#: src/compose.c:527
+#: src/compose.c:535
 msgid "/_Edit/A_dvanced/Move to previous line"
 msgstr ""
 
-#: src/compose.c:532
+#: src/compose.c:540
 msgid "/_Edit/A_dvanced/Move to next line"
 msgstr ""
 
-#: src/compose.c:537
+#: src/compose.c:545
 msgid "/_Edit/A_dvanced/Delete a character backward"
 msgstr ""
 
-#: src/compose.c:542
+#: src/compose.c:550
 msgid "/_Edit/A_dvanced/Delete a character forward"
 msgstr ""
 
-#: src/compose.c:547
+#: src/compose.c:555
 msgid "/_Edit/A_dvanced/Delete a word backward"
 msgstr ""
 
-#: src/compose.c:552
+#: src/compose.c:560
 msgid "/_Edit/A_dvanced/Delete a word forward"
 msgstr ""
 
-#: src/compose.c:557
+#: src/compose.c:565
 msgid "/_Edit/A_dvanced/Delete line"
 msgstr ""
 
-#: src/compose.c:562
+#: src/compose.c:570
 msgid "/_Edit/A_dvanced/Delete to end of line"
 msgstr ""
 
-#: src/compose.c:568
+#: src/compose.c:576
 msgid "/_Edit/_Wrap current paragraph"
 msgstr ""
 
-#: src/compose.c:570
+#: src/compose.c:578
 #, fuzzy
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/_Editare/Tăie_re linii lungi"
 
-#: src/compose.c:572
+#: src/compose.c:580
 #, fuzzy
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Editare/_Copiere"
 
-#: src/compose.c:573 src/mainwindow.c:494 src/messageview.c:147
+#: src/compose.c:581 src/mainwindow.c:494 src/messageview.c:147
 #: src/summaryview.c:370
 msgid "/_View"
 msgstr "/_Vedere"
 
-#: src/compose.c:574
+#: src/compose.c:582
 msgid "/_View/_To"
 msgstr "/_Vedere/_La"
 
-#: src/compose.c:575
+#: src/compose.c:583
 msgid "/_View/_Cc"
 msgstr "/_Vedere/_Cc"
 
-#: src/compose.c:576
+#: src/compose.c:584
 msgid "/_View/_Bcc"
 msgstr "/_Vedere/_Bcc"
 
-#: src/compose.c:577
+#: src/compose.c:585
 msgid "/_View/_Reply to"
 msgstr "/_Vedere/_Răspuns"
 
-#: src/compose.c:578 src/compose.c:580 src/compose.c:582 src/mainwindow.c:512
-#: src/mainwindow.c:515 src/mainwindow.c:541 src/mainwindow.c:565
-#: src/mainwindow.c:641 src/mainwindow.c:645 src/messageview.c:223
+#: src/compose.c:586 src/compose.c:588 src/compose.c:590 src/compose.c:592
+#: src/mainwindow.c:512 src/mainwindow.c:515 src/mainwindow.c:541
+#: src/mainwindow.c:565 src/mainwindow.c:650 src/mainwindow.c:654
+#: src/messageview.c:223
 msgid "/_View/---"
 msgstr "/_Vedere/---"
 
-#: src/compose.c:579
+#: src/compose.c:587
 msgid "/_View/_Followup to"
 msgstr "/_Vedere/_Urmare"
 
-#: src/compose.c:581
+#: src/compose.c:589
 msgid "/_View/R_uler"
 msgstr "/_Vedere/Ri_glă"
 
-#: src/compose.c:583
+#: src/compose.c:591
 msgid "/_View/_Attachment"
 msgstr "/_Vedere/_Ataşamente"
 
-#: src/compose.c:586 src/mainwindow.c:689 src/messageview.c:247
+#: src/compose.c:598 src/mainwindow.c:572 src/messageview.c:154
+#, fuzzy
+msgid "/_View/Character _encoding"
+msgstr "/_Vedere/_La"
+
+#: src/compose.c:599
+msgid "/_View/Character _encoding/_Automatic"
+msgstr ""
+
+#: src/compose.c:601 src/compose.c:607 src/compose.c:613 src/compose.c:617
+#: src/compose.c:623 src/compose.c:627 src/compose.c:631 src/compose.c:641
+#: src/compose.c:645 src/compose.c:653 src/compose.c:657 src/mainwindow.c:568
+#: src/mainwindow.c:575 src/messageview.c:150
+#, fuzzy
+msgid "/_View/Character _encoding/---"
+msgstr "/_Vedere/_La"
+
+#: src/compose.c:603 src/mainwindow.c:576 src/messageview.c:158
+#, fuzzy
+msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
+msgstr "/_Mesaj/Set de _caractere/7bit ASCII (US-ASC_II)"
+
+#: src/compose.c:605 src/mainwindow.c:578 src/messageview.c:161
+#, fuzzy
+msgid "/_View/Character _encoding/Unicode (_UTF-8)"
+msgstr "/_Mesaj/Set de _caractere/Unicode (_UTF-8)"
+
+#: src/compose.c:609 src/mainwindow.c:582 src/messageview.c:164
+#, fuzzy
+msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
+msgstr "/_Mesaj/Set de _caractere/Vest European (ISO-8859-_1)"
+
+#: src/compose.c:611 src/mainwindow.c:584 src/messageview.c:166
+#, fuzzy
+msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
+msgstr "/_Mesaj/Set de _caractere/Vest European (ISO-8859-_1)"
+
+#: src/compose.c:615 src/mainwindow.c:588 src/messageview.c:169
+#, fuzzy
+msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
+msgstr "/_Mesaj/Set de _caractere/Central European (ISO-8859-_2)"
+
+#: src/compose.c:619 src/mainwindow.c:592 src/messageview.c:172
+#, fuzzy
+msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
+msgstr "/_Mesaj/Set de _caractere/_Baltic (ISO-8859-13)"
+
+#: src/compose.c:621 src/mainwindow.c:594 src/messageview.c:174
+#, fuzzy
+msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
+msgstr "/_Mesaj/Set de _caractere/Baltic (ISO-8859-_4)"
+
+#: src/compose.c:625 src/mainwindow.c:598 src/messageview.c:177
+#, fuzzy
+msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
+msgstr "/_Mesaj/Set de _caractere/Grec (ISO-8859-_7)"
+
+#: src/compose.c:629 src/mainwindow.c:602 src/messageview.c:180
+#, fuzzy
+msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
+msgstr "/_Mesaj/Set de _caractere/Turcesc (ISO-8859-_9)"
+
+#: src/compose.c:633 src/mainwindow.c:606 src/messageview.c:183
+#, fuzzy
+msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
+msgstr "/_Mesaj/Set de _caractere/Chirilic (ISO-8859-_5)"
+
+#: src/compose.c:635 src/mainwindow.c:608 src/messageview.c:185
+#, fuzzy
+msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
+msgstr "/_Mesaj/Set de _caractere/Chirilic (KOI8-_R)"
+
+#: src/compose.c:637 src/mainwindow.c:610 src/messageview.c:187
+#, fuzzy
+msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
+msgstr "/_Mesaj/Set de _caractere/Chirilic (KOI8-_R)"
+
+#: src/compose.c:639 src/mainwindow.c:612 src/messageview.c:189
+#, fuzzy
+msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
+msgstr "/_Mesaj/Set de _caractere/Chirilic (Windows-1251)"
+
+#: src/compose.c:643 src/mainwindow.c:616 src/messageview.c:192
+#, fuzzy
+msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
+msgstr "/_Mesaj/Set de _caractere/Japonez (ISO-2022-_JP)"
+
+#: src/compose.c:647 src/mainwindow.c:626 src/messageview.c:201
+#, fuzzy
+msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
+msgstr "/_Mesaj/Set de _caractere/Chinezesc Simplificat (_GB2312)"
+
+#: src/compose.c:649 src/mainwindow.c:628 src/messageview.c:203
+#, fuzzy
+msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
+msgstr "/_Mesaj/Set de _caractere/Chinezesc Tradiţional (_Big5)"
+
+#: src/compose.c:651 src/mainwindow.c:630 src/messageview.c:205
+#, fuzzy
+msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
+msgstr "/_Mesaj/Set de _caractere/Chinezesc Tradiţional (EUC-_TW)"
+
+#: src/compose.c:655 src/mainwindow.c:636 src/messageview.c:210
+#, fuzzy
+msgid "/_View/Character _encoding/Korean (EUC-_KR)"
+msgstr "/_Mesaj/Set de _caractere/Corean (EUC-_KR)"
+
+#: src/compose.c:659 src/mainwindow.c:642 src/messageview.c:215
+#, fuzzy
+msgid "/_View/Character _encoding/Thai (TIS-620)"
+msgstr "/_Mesaj/Set de _caractere/Chinezesc (ISO-2022-_CN)"
+
+#: src/compose.c:661 src/mainwindow.c:644 src/messageview.c:217
+#, fuzzy
+msgid "/_View/Character _encoding/Thai (Windows-874)"
+msgstr "/_Mesaj/Set de _caractere/Chirilic (Windows-1251)"
+
+#: src/compose.c:665 src/mainwindow.c:698 src/messageview.c:247
 #, fuzzy
 msgid "/_Tools/_Address book"
 msgstr "/_Utilitare/_Agendă"
 
-#: src/compose.c:587
+#: src/compose.c:666
 #, fuzzy
 msgid "/_Tools/_Template"
 msgstr "/_Utilitare/_Modele"
 
-#: src/compose.c:588 src/mainwindow.c:707 src/messageview.c:262
+#: src/compose.c:667 src/mainwindow.c:716 src/messageview.c:262
 #, fuzzy
 msgid "/_Tools/Actio_ns"
 msgstr "/E_xecutare"
 
-#: src/compose.c:589 src/compose.c:593 src/mainwindow.c:692
-#: src/mainwindow.c:706 src/mainwindow.c:708 src/mainwindow.c:711
-#: src/mainwindow.c:713 src/messageview.c:250 src/messageview.c:261
+#: src/compose.c:668 src/compose.c:672 src/mainwindow.c:701
+#: src/mainwindow.c:715 src/mainwindow.c:717 src/mainwindow.c:720
+#: src/mainwindow.c:722 src/messageview.c:250 src/messageview.c:261
 #, fuzzy
 msgid "/_Tools/---"
 msgstr "/_Utilitare/---"
 
-#: src/compose.c:590
+#: src/compose.c:669
 #, fuzzy
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/_Editare/Editare cu un editor e_xtern"
 
-#: src/compose.c:594
+#: src/compose.c:673
 #, fuzzy
 msgid "/_Tools/PGP Si_gn"
 msgstr "/E_xecutare"
 
-#: src/compose.c:595
+#: src/compose.c:674
 #, fuzzy
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/_Message/Cr_iptare"
 
-#: src/compose.c:800
+#: src/compose.c:879
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: fişierul nu există\n"
 
-#: src/compose.c:899 src/compose.c:958 src/procmsg.c:1303
+#: src/compose.c:978 src/compose.c:1037 src/procmsg.c:1303
 #, fuzzy
 msgid "Can't get text part\n"
 msgstr "xover imposibil\n"
 
-#: src/compose.c:1340
+#: src/compose.c:1419
 msgid "Quote mark format error."
 msgstr "Eroare de formatare a citaţiei."
 
-#: src/compose.c:1352
+#: src/compose.c:1431
 msgid "Message reply/forward format error."
 msgstr "Eroare de formatare a răspunsului/mesajului înaintat."
 
-#: src/compose.c:1679
+#: src/compose.c:1758
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Fişierul %s nu există\n"
 
-#: src/compose.c:1683
+#: src/compose.c:1762
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Obţinerea dimensiunii fişierului %s este imposibilă\n"
 
-#: src/compose.c:1687
+#: src/compose.c:1766
 #, fuzzy, c-format
 msgid "File %s is empty."
 msgstr "Fişierul %s este gol\n"
 
-#: src/compose.c:1691
+#: src/compose.c:1770
 #, fuzzy, c-format
 msgid "Can't read %s."
 msgstr "nu poate fi creat %s\n"
 
-#: src/compose.c:1726
+#: src/compose.c:1805
 #, c-format
 msgid "Message: %s"
 msgstr "Mesaj: %s"
 
-#: src/compose.c:1797 src/mimeview.c:491
+#: src/compose.c:1876 src/mimeview.c:491
 msgid "Can't get the part of multipart message."
 msgstr "Citirea unei parţi din mesajul multipart este imposibilă."
 
-#: src/compose.c:2188
+#: src/compose.c:2267
 msgid " [Edited]"
 msgstr " [Editat] "
 
-#: src/compose.c:2190
+#: src/compose.c:2269
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Compunere mesaj%s"
 
-#: src/compose.c:2193
+#: src/compose.c:2272
 #, c-format
 msgid "Compose message%s"
 msgstr "Compunere mesaj%s"
 
-#: src/compose.c:2304
+#: src/compose.c:2383
 msgid "Recipient is not specified."
 msgstr "Destinatarul nu a fost specificat."
 
-#: src/compose.c:2312 src/compose.c:4112 src/mainwindow.c:2144
+#: src/compose.c:2391 src/compose.c:4213 src/mainwindow.c:2153
 #: src/prefs_account.c:703 src/prefs_common.c:850
 msgid "Send"
 msgstr "Trimitere"
 
-#: src/compose.c:2313
+#: src/compose.c:2392
 msgid "Subject is empty. Send it anyway?"
 msgstr ""
 
-#: src/compose.c:2364
+#: src/compose.c:2443
 msgid "can't get recipient list."
 msgstr "nu pot obţine lista destinatarilor."
 
-#: src/compose.c:2384
+#: src/compose.c:2463
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -984,168 +1102,168 @@ msgstr ""
 "Nu a fost specificat contul de pe care se doreşte trimiterea de mail.\n"
 "Vă rugăm să selectaţi un cont înainte de a trimite."
 
-#: src/compose.c:2398 src/send_message.c:261
+#: src/compose.c:2477 src/send_message.c:261
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "A avut loc o eroare la încercarea de a posta mesajul pe %s ."
 
-#: src/compose.c:2421
+#: src/compose.c:2500
 msgid "Can't save the message to outbox."
 msgstr "Salvarea mesajului în outbox este imposibilă."
 
-#: src/compose.c:2457
+#: src/compose.c:2536
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr ""
 
-#: src/compose.c:2518 src/compose.c:2739 src/compose.c:2802 src/compose.c:2921
+#: src/compose.c:2597 src/compose.c:2820 src/compose.c:2883 src/compose.c:3003
 #: src/utils.c:2189
 msgid "can't change file mode\n"
 msgstr "schimbarea permisiunilor fişierului este imposibilă\n"
 
-#: src/compose.c:2546
+#: src/compose.c:2627
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
 "Send it as %s anyway?"
 msgstr "Convertirea codificării mesajului este imposibilă."
 
-#: src/compose.c:2610
+#: src/compose.c:2691
 msgid "can't write headers\n"
 msgstr "scrierea antetelor este imposibilă\n"
 
-#: src/compose.c:2881
+#: src/compose.c:2963
 msgid "can't remove the old message\n"
 msgstr "ştergerea mesajului vechi a eşuat\n"
 
-#: src/compose.c:2899
+#: src/compose.c:2981
 msgid "queueing message...\n"
 msgstr "punere mesaj în lista de aşteptare...\n"
 
-#: src/compose.c:2981
+#: src/compose.c:3063
 #, fuzzy
 msgid "can't find queue folder\n"
 msgstr "directorul nu a putut fi selectat: %s\n"
 
-#: src/compose.c:2988
+#: src/compose.c:3070
 msgid "can't queue the message\n"
 msgstr "punerea mesajului în lista de aşteptare este imposibilă\n"
 
-#: src/compose.c:3547
+#: src/compose.c:3645
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "Message-ID creat: %s\n"
 
-#: src/compose.c:3645
+#: src/compose.c:3743
 msgid "Creating compose window...\n"
 msgstr "Creare fereastra de compunere...\n"
 
-#: src/compose.c:3648 src/compose.c:4598
+#: src/compose.c:3746 src/compose.c:4734
 msgid "MIME type"
 msgstr "Tip MIME"
 
 #. S_COL_DATE
-#: src/compose.c:3649 src/mimeview.c:150 src/prefs_filter_edit.c:569
+#: src/compose.c:3747 src/mimeview.c:150 src/prefs_filter_edit.c:569
 #: src/prefs_summary_column.c:73 src/select-keys.c:317 src/summaryview.c:386
 msgid "Size"
 msgstr "Dimensiune"
 
-#: src/compose.c:3700 src/headerview.c:53 src/summary_search.c:169
+#: src/compose.c:3798 src/headerview.c:53 src/summary_search.c:169
 msgid "From:"
 msgstr "De la:"
 
-#: src/compose.c:4113
+#: src/compose.c:4214
 msgid "Send message"
 msgstr "Trimitere mesaj"
 
-#: src/compose.c:4121
+#: src/compose.c:4222
 msgid "Send later"
 msgstr "Mai târziu"
 
-#: src/compose.c:4122
+#: src/compose.c:4223
 msgid "Put into queue folder and send later"
 msgstr "Punere în lista de aşteptare şi trimitere mai târziu"
 
-#: src/compose.c:4130
+#: src/compose.c:4231
 msgid "Draft"
 msgstr "Salvare"
 
-#: src/compose.c:4131
+#: src/compose.c:4232
 msgid "Save to draft folder"
 msgstr "Salvare"
 
-#: src/compose.c:4141 src/compose.c:5382
+#: src/compose.c:4242 src/compose.c:5527
 msgid "Insert"
 msgstr "Inserare"
 
-#: src/compose.c:4142
+#: src/compose.c:4243
 msgid "Insert file"
 msgstr "Isertion fişier"
 
-#: src/compose.c:4150
+#: src/compose.c:4251
 msgid "Attach"
 msgstr "Ataşament"
 
-#: src/compose.c:4151
+#: src/compose.c:4252
 msgid "Attach file"
 msgstr "Ataşare fişier"
 
 #. signature
-#: src/compose.c:4161 src/prefs_account.c:1339 src/prefs_common.c:1261
+#: src/compose.c:4262 src/prefs_account.c:1339 src/prefs_common.c:1273
 msgid "Signature"
 msgstr "Semnătură"
 
-#: src/compose.c:4162
+#: src/compose.c:4263
 msgid "Insert signature"
 msgstr "Inserare semnătură"
 
-#: src/compose.c:4171 src/prefs_common.c:1283 src/prefs_common.c:2165
+#: src/compose.c:4272 src/prefs_common.c:1295 src/prefs_common.c:2177
 msgid "Editor"
 msgstr "Editor"
 
-#: src/compose.c:4172
+#: src/compose.c:4273
 msgid "Edit with external editor"
 msgstr "Editare cu editor extern"
 
-#: src/compose.c:4180
+#: src/compose.c:4281
 msgid "Linewrap"
 msgstr "Tăiere linii"
 
-#: src/compose.c:4181
+#: src/compose.c:4282
 msgid "Wrap all long lines"
 msgstr "Tăiere toate liniile lungi"
 
-#: src/compose.c:4492
+#: src/compose.c:4628
 msgid "Invalid MIME type."
 msgstr "Tip MIME invalid."
 
-#: src/compose.c:4511
+#: src/compose.c:4647
 msgid "File doesn't exist or is empty."
 msgstr "Fişierul nu există sau este gol."
 
-#: src/compose.c:4580
+#: src/compose.c:4716
 #, fuzzy
 msgid "Properties"
 msgstr "Proprietate"
 
-#: src/compose.c:4600
+#: src/compose.c:4736
 msgid "Encoding"
 msgstr "Codare"
 
-#: src/compose.c:4623 src/prefs_folder_item.c:183
+#: src/compose.c:4759 src/prefs_folder_item.c:183
 msgid "Path"
 msgstr "Cale"
 
-#: src/compose.c:4624
+#: src/compose.c:4760
 msgid "File name"
 msgstr "Numele fişierului"
 
-#: src/compose.c:4778
+#: src/compose.c:4914
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Linia de comandă este invalidă: '%s'\n"
 
-#: src/compose.c:4804
+#: src/compose.c:4940
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1156,73 +1274,73 @@ msgstr ""
 "Doriţi terminarea forţată a procesului ?\n"
 "process group id: %d"
 
-#: src/compose.c:4817
+#: src/compose.c:4953
 #, c-format
 msgid "Terminated process group id: %d"
 msgstr "Procesul a fost terminat: %d"
 
-#: src/compose.c:4818
+#: src/compose.c:4954
 #, c-format
 msgid "Temporary file: %s"
 msgstr "Fişier temporar: %s"
 
-#: src/compose.c:4842
+#: src/compose.c:4978
 msgid "Compose: input from monitoring process\n"
 msgstr "Compunere: introducere din proces monitorizat\n"
 
 #. failed
-#: src/compose.c:4875
+#: src/compose.c:5011
 msgid "Couldn't exec external editor\n"
 msgstr "Editorul extern nu poate fi executat\n"
 
-#: src/compose.c:4879
+#: src/compose.c:5015
 msgid "Couldn't write to file\n"
 msgstr "Scrierea în fişier este imposibilă\n"
 
-#: src/compose.c:4881
+#: src/compose.c:5017
 msgid "Pipe read failed\n"
 msgstr "Citirea din pipe a eşuat\n"
 
-#: src/compose.c:5182 src/compose.c:5190 src/compose.c:5196
+#: src/compose.c:5318 src/compose.c:5326 src/compose.c:5332
 msgid "Can't queue the message."
 msgstr "Este imposibilă punerea mesajului în lista de aşteptare."
 
-#: src/compose.c:5287
+#: src/compose.c:5423
 #, fuzzy
 msgid "Select files"
 msgstr "Selectare fişier"
 
-#: src/compose.c:5309
+#: src/compose.c:5445
 msgid "Select file"
 msgstr "Selectare fişier"
 
-#: src/compose.c:5344
+#: src/compose.c:5480
 msgid "Discard message"
 msgstr "Anulare mesaj"
 
-#: src/compose.c:5345
+#: src/compose.c:5481
 msgid "This message has been modified. discard it?"
 msgstr "Acest mesaj a fost modificat. Doriţi sa anulaţi schimbările ?"
 
-#: src/compose.c:5346
+#: src/compose.c:5482
 msgid "Discard"
 msgstr "Anulare schimbări"
 
-#: src/compose.c:5346
+#: src/compose.c:5482
 msgid "to Draft"
 msgstr "Salvare"
 
-#: src/compose.c:5379
+#: src/compose.c:5524
 #, fuzzy, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Sunteţi sigur că doriţi să ştergeţi această regulă ?"
 
-#: src/compose.c:5381
+#: src/compose.c:5526
 #, fuzzy
 msgid "Apply template"
 msgstr "Ştergere mesaj"
 
-#: src/compose.c:5382
+#: src/compose.c:5527
 #, fuzzy
 msgid "Replace"
 msgstr "/_Utilitare/_Modele"
@@ -1674,12 +1792,12 @@ msgstr "Setare informaţii despre director...\n"
 msgid "Setting folder info..."
 msgstr "Setare informaţii despre director..."
 
-#: src/folderview.c:652 src/mainwindow.c:3190 src/setup.c:81
+#: src/folderview.c:652 src/mainwindow.c:3199 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Scanare director %s%c%s ..."
 
-#: src/folderview.c:656 src/mainwindow.c:3195 src/setup.c:86
+#: src/folderview.c:656 src/mainwindow.c:3204 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Scanare director %s ..."
@@ -2148,7 +2266,7 @@ msgstr "Importare fişier LDIF în agendă"
 msgid "Prev"
 msgstr "Înapio"
 
-#: src/importldif.c:761 src/mainwindow.c:2230
+#: src/importldif.c:761 src/mainwindow.c:2239
 msgid "Next"
 msgstr "Înainte"
 
@@ -2631,7 +2749,8 @@ msgid "/_View/Separate f_older tree"
 msgstr "/_Vedere/Separare arbore de direct_oare"
 
 #: src/mainwindow.c:514
-msgid "/_View/Separate m_essage view"
+#, fuzzy
+msgid "/_View/Separate _message view"
 msgstr "/_Vedere/Separare arbore de m_esaje"
 
 #: src/mainwindow.c:516
@@ -2798,492 +2917,382 @@ msgstr ""
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/Re_zumat/Alt di_rector"
 
-#: src/mainwindow.c:568 src/mainwindow.c:575 src/messageview.c:150
-#, fuzzy
-msgid "/_View/_Code set/---"
-msgstr "/_Mesaj/Set de _caractere/---"
-
-#: src/mainwindow.c:572 src/messageview.c:154
-#, fuzzy
-msgid "/_View/_Code set"
-msgstr "/_Mesaj/Set de _caractere"
-
 #: src/mainwindow.c:573 src/messageview.c:155
 #, fuzzy
-msgid "/_View/_Code set/_Auto detect"
+msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Mesaj/Set de _caractere/Detectare _automată"
 
-#: src/mainwindow.c:576 src/messageview.c:158
-#, fuzzy
-msgid "/_View/_Code set/7bit ascii (US-ASC_II)"
-msgstr "/_Mesaj/Set de _caractere/7bit ASCII (US-ASC_II)"
-
-#: src/mainwindow.c:579 src/messageview.c:161
-#, fuzzy
-msgid "/_View/_Code set/Unicode (_UTF-8)"
-msgstr "/_Mesaj/Set de _caractere/Unicode (_UTF-8)"
-
-#: src/mainwindow.c:582 src/messageview.c:164
-#, fuzzy
-msgid "/_View/_Code set/Western European (ISO-8859-_1)"
-msgstr "/_Mesaj/Set de _caractere/Vest European (ISO-8859-_1)"
-
-#: src/mainwindow.c:584 src/messageview.c:166
-#, fuzzy
-msgid "/_View/_Code set/Western European (ISO-8859-15)"
-msgstr "/_Mesaj/Set de _caractere/Vest European (ISO-8859-_1)"
-
-#: src/mainwindow.c:587 src/messageview.c:169
-#, fuzzy
-msgid "/_View/_Code set/Central European (ISO-8859-_2)"
-msgstr "/_Mesaj/Set de _caractere/Central European (ISO-8859-_2)"
-
-#: src/mainwindow.c:590 src/messageview.c:172
-#, fuzzy
-msgid "/_View/_Code set/_Baltic (ISO-8859-13)"
-msgstr "/_Mesaj/Set de _caractere/_Baltic (ISO-8859-13)"
-
-#: src/mainwindow.c:592 src/messageview.c:174
-#, fuzzy
-msgid "/_View/_Code set/Baltic (ISO-8859-_4)"
-msgstr "/_Mesaj/Set de _caractere/Baltic (ISO-8859-_4)"
-
-#: src/mainwindow.c:595 src/messageview.c:177
-#, fuzzy
-msgid "/_View/_Code set/Greek (ISO-8859-_7)"
-msgstr "/_Mesaj/Set de _caractere/Grec (ISO-8859-_7)"
-
-#: src/mainwindow.c:598 src/messageview.c:180
-#, fuzzy
-msgid "/_View/_Code set/Turkish (ISO-8859-_9)"
-msgstr "/_Mesaj/Set de _caractere/Turcesc (ISO-8859-_9)"
-
-#: src/mainwindow.c:601 src/messageview.c:183
-#, fuzzy
-msgid "/_View/_Code set/Cyrillic (ISO-8859-_5)"
-msgstr "/_Mesaj/Set de _caractere/Chirilic (ISO-8859-_5)"
-
-#: src/mainwindow.c:603 src/messageview.c:185
-#, fuzzy
-msgid "/_View/_Code set/Cyrillic (KOI8-_R)"
-msgstr "/_Mesaj/Set de _caractere/Chirilic (KOI8-_R)"
-
-#: src/mainwindow.c:605 src/messageview.c:187
-#, fuzzy
-msgid "/_View/_Code set/Cyrillic (KOI8-U)"
-msgstr "/_Mesaj/Set de _caractere/Chirilic (KOI8-_R)"
-
-#: src/mainwindow.c:607 src/messageview.c:189
-#, fuzzy
-msgid "/_View/_Code set/Cyrillic (Windows-1251)"
-msgstr "/_Mesaj/Set de _caractere/Chirilic (Windows-1251)"
-
-#: src/mainwindow.c:610 src/messageview.c:192
-#, fuzzy
-msgid "/_View/_Code set/Japanese (ISO-2022-_JP)"
-msgstr "/_Mesaj/Set de _caractere/Japonez (ISO-2022-_JP)"
-
-#: src/mainwindow.c:612 src/messageview.c:194
+#: src/mainwindow.c:618 src/messageview.c:194
 #, fuzzy
-msgid "/_View/_Code set/Japanese (ISO-2022-JP-2)"
+msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Message/Set de _caractere/Japonez (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:614 src/messageview.c:196
+#: src/mainwindow.c:620 src/messageview.c:196
 #, fuzzy
-msgid "/_View/_Code set/Japanese (_EUC-JP)"
+msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Message/Set de _caractere/Japonez (_EUC-JP)"
 
-#: src/mainwindow.c:616 src/messageview.c:198
+#: src/mainwindow.c:622 src/messageview.c:198
 #, fuzzy
-msgid "/_View/_Code set/Japanese (_Shift__JIS)"
+msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Message/Set de _caractere/Japonez (_Shift__JIS)"
 
-#: src/mainwindow.c:619 src/messageview.c:201
+#: src/mainwindow.c:632 src/messageview.c:207
 #, fuzzy
-msgid "/_View/_Code set/Simplified Chinese (_GB2312)"
-msgstr "/_Mesaj/Set de _caractere/Chinezesc Simplificat (_GB2312)"
-
-#: src/mainwindow.c:621 src/messageview.c:203
-#, fuzzy
-msgid "/_View/_Code set/Traditional Chinese (_Big5)"
-msgstr "/_Mesaj/Set de _caractere/Chinezesc Tradiţional (_Big5)"
-
-#: src/mainwindow.c:623 src/messageview.c:205
-#, fuzzy
-msgid "/_View/_Code set/Traditional Chinese (EUC-_TW)"
-msgstr "/_Mesaj/Set de _caractere/Chinezesc Tradiţional (EUC-_TW)"
-
-#: src/mainwindow.c:625 src/messageview.c:207
-#, fuzzy
-msgid "/_View/_Code set/Chinese (ISO-2022-_CN)"
+msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Mesaj/Set de _caractere/Chinezesc (ISO-2022-_CN)"
 
-#: src/mainwindow.c:628 src/messageview.c:210
-#, fuzzy
-msgid "/_View/_Code set/Korean (EUC-_KR)"
-msgstr "/_Mesaj/Set de _caractere/Corean (EUC-_KR)"
-
-#: src/mainwindow.c:630 src/messageview.c:212
+#: src/mainwindow.c:638 src/messageview.c:212
 #, fuzzy
-msgid "/_View/_Code set/Korean (ISO-2022-KR)"
+msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Mesaj/Set de _caractere/Corean (ISO-2022-KR)"
 
-#: src/mainwindow.c:633 src/messageview.c:215
-#, fuzzy
-msgid "/_View/_Code set/Thai (TIS-620)"
-msgstr "/_Mesaj/Set de _caractere/Chinezesc (ISO-2022-_CN)"
-
-#: src/mainwindow.c:635 src/messageview.c:217
-#, fuzzy
-msgid "/_View/_Code set/Thai (Windows-874)"
-msgstr "/_Mesaj/Set de _caractere/Chirilic (Windows-1251)"
-
-#: src/mainwindow.c:642 src/summaryview.c:371
+#: src/mainwindow.c:651 src/summaryview.c:371
 #, fuzzy
 msgid "/_View/Open in new _window"
 msgstr "/Deschidere în _fereastră nouă"
 
-#: src/mainwindow.c:643 src/messageview.c:224
+#: src/mainwindow.c:652 src/messageview.c:224
 #, fuzzy
 msgid "/_View/Mess_age source"
 msgstr "/_Vedere/Ar_bore"
 
-#: src/mainwindow.c:644 src/messageview.c:225
+#: src/mainwindow.c:653 src/messageview.c:225
 #, fuzzy
 msgid "/_View/Show all _header"
 msgstr "/_Afişare antet"
 
-#: src/mainwindow.c:646
+#: src/mainwindow.c:655
 #, fuzzy
 msgid "/_View/_Update summary"
 msgstr "/_Vedere/Ar_bore"
 
-#: src/mainwindow.c:648 src/messageview.c:227
+#: src/mainwindow.c:657 src/messageview.c:227
 msgid "/_Message"
 msgstr "/_Mesaj"
 
-#: src/mainwindow.c:649
+#: src/mainwindow.c:658
 #, fuzzy
 msgid "/_Message/Recei_ve"
 msgstr "/_Mesaj/Re_editare"
 
-#: src/mainwindow.c:650
+#: src/mainwindow.c:659
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/_Mesaj/Recepţion_are poştă pentru toate conturile"
 
-#: src/mainwindow.c:652
+#: src/mainwindow.c:661
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/_Mesaj/Recepţion_are poştă pentru toate conturile"
 
-#: src/mainwindow.c:654
+#: src/mainwindow.c:663
 #, fuzzy
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/_Message/Salvare şi _continuare"
 
-#: src/mainwindow.c:656
+#: src/mainwindow.c:665
 #, fuzzy
 msgid "/_Message/Recei_ve/---"
 msgstr "/_Mesaj/Re_editare"
 
-#: src/mainwindow.c:657
+#: src/mainwindow.c:666
 #, fuzzy
 msgid "/_Message/_Send queued messages"
 msgstr "/_Mesaj/Trimite mesa_jele din lista de aşteptare"
 
-#: src/mainwindow.c:658 src/mainwindow.c:660 src/mainwindow.c:667
-#: src/mainwindow.c:672 src/mainwindow.c:676 src/mainwindow.c:685
+#: src/mainwindow.c:667 src/mainwindow.c:669 src/mainwindow.c:676
+#: src/mainwindow.c:681 src/mainwindow.c:685 src/mainwindow.c:694
 #: src/messageview.c:230 src/messageview.c:238 src/messageview.c:243
 msgid "/_Message/---"
 msgstr "/_Mesaj/---"
 
-#: src/mainwindow.c:659 src/messageview.c:228
+#: src/mainwindow.c:668 src/messageview.c:228
 msgid "/_Message/Compose _new message"
 msgstr "/_Mesaj/Compunere mesaj _nou"
 
-#: src/mainwindow.c:661 src/messageview.c:231
+#: src/mainwindow.c:670 src/messageview.c:231
 msgid "/_Message/_Reply"
 msgstr "/_Mesaj/_Răspunde"
 
-#: src/mainwindow.c:662
+#: src/mainwindow.c:671
 #, fuzzy
 msgid "/_Message/Repl_y to"
 msgstr "/_Mesaj/Răspunde _la toţi"
 
-#: src/mainwindow.c:663 src/messageview.c:232
+#: src/mainwindow.c:672 src/messageview.c:232
 #, fuzzy
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Mesaj/Răspunde _la toţi"
 
-#: src/mainwindow.c:664 src/messageview.c:234
+#: src/mainwindow.c:673 src/messageview.c:234
 #, fuzzy
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Mesaj/_Răspuns"
 
-#: src/mainwindow.c:665 src/messageview.c:236
+#: src/mainwindow.c:674 src/messageview.c:236
 #, fuzzy
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Mesaj/Răspunde _la toţi"
 
-#: src/mainwindow.c:668 src/messageview.c:239
+#: src/mainwindow.c:677 src/messageview.c:239
 msgid "/_Message/_Forward"
 msgstr "/_Mesaj/Î_naintare"
 
-#: src/mainwindow.c:669 src/messageview.c:240
+#: src/mainwindow.c:678 src/messageview.c:240
 #, fuzzy
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Mesaj/Înaintare ca a_taşament"
 
-#: src/mainwindow.c:671 src/messageview.c:242
+#: src/mainwindow.c:680 src/messageview.c:242
 #, fuzzy
 msgid "/_Message/Redirec_t"
 msgstr "/_Mesaj/Re_editare"
 
-#: src/mainwindow.c:673
+#: src/mainwindow.c:682
 msgid "/_Message/M_ove..."
 msgstr "/_Mesaj/M_utare..."
 
-#: src/mainwindow.c:674
+#: src/mainwindow.c:683
 #, fuzzy
 msgid "/_Message/_Copy..."
 msgstr "/_Mesaj/M_utare..."
 
-#: src/mainwindow.c:675
+#: src/mainwindow.c:684
 msgid "/_Message/_Delete"
 msgstr "/_Mesaj/Şter_gere"
 
-#: src/mainwindow.c:677
+#: src/mainwindow.c:686
 msgid "/_Message/_Mark"
 msgstr "/_Mesaj/_Marcare"
 
-#: src/mainwindow.c:678
+#: src/mainwindow.c:687
 msgid "/_Message/_Mark/_Mark"
 msgstr "/_Mesaj/_Marcare/_Marcare"
 
-#: src/mainwindow.c:679
+#: src/mainwindow.c:688
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/_Mesaj/_Marcare/_Demarcare"
 
-#: src/mainwindow.c:680
+#: src/mainwindow.c:689
 msgid "/_Message/_Mark/---"
 msgstr "/_Mesaj/_Marcare/---"
 
-#: src/mainwindow.c:681
+#: src/mainwindow.c:690
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/_Mesaj/_Marcare/Marcare mesaj n_ecitit"
 
-#: src/mainwindow.c:682
+#: src/mainwindow.c:691
 #, fuzzy
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/_Mesaj/_Marcare/Marcare mesaj n_ecitit"
 
-#: src/mainwindow.c:684
+#: src/mainwindow.c:693
 #, fuzzy
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/_Mesaj/_Marcare/Marcare mesaj n_ecitit"
 
-#: src/mainwindow.c:686 src/messageview.c:244
+#: src/mainwindow.c:695 src/messageview.c:244
 #, fuzzy
 msgid "/_Message/Re-_edit"
 msgstr "/_Mesaj/Re_editare"
 
-#: src/mainwindow.c:690 src/messageview.c:248
+#: src/mainwindow.c:699 src/messageview.c:248
 #, fuzzy
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/_Utilitare/_Agendă"
 
-#: src/mainwindow.c:693
+#: src/mainwindow.c:702
 #, fuzzy
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/Re_zumat/_Filtrare mesaje"
 
-#: src/mainwindow.c:695
+#: src/mainwindow.c:704
 #, fuzzy
 msgid "/_Tools/Filter _selected messages"
 msgstr "/Re_zumat/_Filtrare mesaje"
 
-#: src/mainwindow.c:697 src/messageview.c:251
+#: src/mainwindow.c:706 src/messageview.c:251
 #, fuzzy
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Fişier/Act_ualizare directoare"
 
-#: src/mainwindow.c:698 src/messageview.c:253
+#: src/mainwindow.c:707 src/messageview.c:253
 #, fuzzy
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Fişier/Act_ualizare directoare"
 
-#: src/mainwindow.c:700 src/messageview.c:255
+#: src/mainwindow.c:709 src/messageview.c:255
 #, fuzzy
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Fişier/Act_ualizare directoare"
 
-#: src/mainwindow.c:702 src/messageview.c:257
+#: src/mainwindow.c:711 src/messageview.c:257
 #, fuzzy
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Fişier/Act_ualizare directoare"
 
-#: src/mainwindow.c:704 src/messageview.c:259
+#: src/mainwindow.c:713 src/messageview.c:259
 #, fuzzy
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Fişier/Act_ualizare directoare"
 
-#: src/mainwindow.c:709
+#: src/mainwindow.c:718
 #, fuzzy
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/Re_zumat/Ştergere mesaje _duplicate"
 
-#: src/mainwindow.c:712
+#: src/mainwindow.c:721
 #, fuzzy
 msgid "/_Tools/E_xecute"
 msgstr "/E_xecutare"
 
-#: src/mainwindow.c:714
+#: src/mainwindow.c:723
 #, fuzzy
 msgid "/_Tools/_Log window"
 msgstr "/_Utilitare/Fereastră _jurnal"
 
-#: src/mainwindow.c:716
+#: src/mainwindow.c:725
 msgid "/_Configuration"
 msgstr "/_Configuraţie"
 
-#: src/mainwindow.c:717
+#: src/mainwindow.c:726
 msgid "/_Configuration/_Common preferences..."
 msgstr "/_Configuraţie/Preferinţe _comune..."
 
-#: src/mainwindow.c:719
+#: src/mainwindow.c:728
 #, fuzzy
 msgid "/_Configuration/_Filter setting..."
 msgstr "/_Configuraţie/_Editare conturi..."
 
-#: src/mainwindow.c:721
+#: src/mainwindow.c:730
 #, fuzzy
 msgid "/_Configuration/_Template..."
 msgstr "/_Configuraţie/_Editare conturi..."
 
-#: src/mainwindow.c:722
+#: src/mainwindow.c:731
 #, fuzzy
 msgid "/_Configuration/_Actions..."
 msgstr "/_Configuraţie/_Editare conturi..."
 
-#: src/mainwindow.c:723
+#: src/mainwindow.c:732
 msgid "/_Configuration/---"
 msgstr "/_Configuraţie/---"
 
-#: src/mainwindow.c:724
+#: src/mainwindow.c:733
 #, fuzzy
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Configuraţie/_Preferinţe per cont..."
 
-#: src/mainwindow.c:726
+#: src/mainwindow.c:735
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Configuraţie/Creare cont _nou..."
 
-#: src/mainwindow.c:728
+#: src/mainwindow.c:737
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Configuraţie/_Editare conturi..."
 
-#: src/mainwindow.c:730
+#: src/mainwindow.c:739
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Configuraţie/_Selectare cont curent"
 
-#: src/mainwindow.c:734
+#: src/mainwindow.c:743
 msgid "/_Help/_Manual"
 msgstr "/_Ajutor/_Manual"
 
-#: src/mainwindow.c:735
+#: src/mainwindow.c:744
 msgid "/_Help/_Manual/_English"
 msgstr "/_Ajutor/_Manual/_Engleză"
 
-#: src/mainwindow.c:736
+#: src/mainwindow.c:745
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/_Ajutor/_Manual/_Japoneză"
 
-#: src/mainwindow.c:737
+#: src/mainwindow.c:746
 #, fuzzy
 msgid "/_Help/_FAQ"
 msgstr "/A_jutor/_Despre"
 
-#: src/mainwindow.c:738
+#: src/mainwindow.c:747
 #, fuzzy
 msgid "/_Help/_FAQ/_English"
 msgstr "/_Ajutor/_Manual/_Engleză"
 
-#: src/mainwindow.c:739
+#: src/mainwindow.c:748
 #, fuzzy
 msgid "/_Help/_FAQ/_German"
 msgstr "/_Ajutor/_Manual/_Engleză"
 
-#: src/mainwindow.c:740
+#: src/mainwindow.c:749
 #, fuzzy
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/_Ajutor/_Manual/_Engleză"
 
-#: src/mainwindow.c:741
+#: src/mainwindow.c:750
 msgid "/_Help/_FAQ/_French"
 msgstr ""
 
-#: src/mainwindow.c:742
+#: src/mainwindow.c:751
 #, fuzzy
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/_Ajutor/_Manual/_Engleză"
 
-#: src/mainwindow.c:743
+#: src/mainwindow.c:752
 msgid "/_Help/---"
 msgstr "/_Ajutor/---"
 
-#: src/mainwindow.c:783
+#: src/mainwindow.c:792
 msgid "Creating main window...\n"
 msgstr "Creare fereastră principală...\n"
 
-#: src/mainwindow.c:943
+#: src/mainwindow.c:952
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Fereastra principală: alocarea culorii %d a eşuat\n"
 
-#: src/mainwindow.c:1021 src/summaryview.c:1368 src/summaryview.c:1677
+#: src/mainwindow.c:1030 src/summaryview.c:1368 src/summaryview.c:1677
 #: src/summaryview.c:1785 src/summaryview.c:1831 src/summaryview.c:2453
 #: src/summaryview.c:3080 src/summaryview.c:3146 src/summaryview.c:3171
 #: src/summaryview.c:3284
 msgid "done.\n"
 msgstr "gata.\n"
 
-#: src/mainwindow.c:1137 src/mainwindow.c:1178 src/mainwindow.c:1206
+#: src/mainwindow.c:1146 src/mainwindow.c:1187 src/mainwindow.c:1215
 msgid "Untitled"
 msgstr "Neintitulat"
 
-#: src/mainwindow.c:1207
+#: src/mainwindow.c:1216
 msgid "none"
 msgstr "nimic"
 
-#: src/mainwindow.c:1257
+#: src/mainwindow.c:1266
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr ""
 
-#: src/mainwindow.c:1477
+#: src/mainwindow.c:1486
 msgid "Offline"
 msgstr ""
 
-#: src/mainwindow.c:1478
+#: src/mainwindow.c:1487
 msgid "You are offline. Go online?"
 msgstr ""
 
-#: src/mainwindow.c:1492
+#: src/mainwindow.c:1501
 #, fuzzy
 msgid "Empty all trash"
 msgstr "/_Fişier/_Curăţare gunoi"
 
-#: src/mainwindow.c:1493
+#: src/mainwindow.c:1502
 #, fuzzy
 msgid "Empty messages in all trash?"
 msgstr "Doriţi ştergerea tuturor mesajelor din gunoi ?"
 
-#: src/mainwindow.c:1521
+#: src/mainwindow.c:1530
 msgid "Add mailbox"
 msgstr "Adăugare cutie poştală"
 
-#: src/mainwindow.c:1522
+#: src/mainwindow.c:1531
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3293,16 +3302,16 @@ msgstr ""
 "Dacă este specificată o cutie poştală existentă, aceasta\n"
 "va fi scanată automat."
 
-#: src/mainwindow.c:1528
+#: src/mainwindow.c:1537
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Cutia poştală '%s' există deja."
 
-#: src/mainwindow.c:1533 src/setup.c:57
+#: src/mainwindow.c:1542 src/setup.c:57
 msgid "Mailbox"
 msgstr "Cutie poştală"
 
-#: src/mainwindow.c:1539 src/setup.c:63
+#: src/mainwindow.c:1548 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3312,147 +3321,147 @@ msgstr ""
 "Probabil că anumite fişiere există deja, sau nu aveţi permisiuni de "
 "scriereadecvate."
 
-#: src/mainwindow.c:1912
+#: src/mainwindow.c:1921
 msgid "Sylpheed - Folder View"
 msgstr ""
 
-#: src/mainwindow.c:1932 src/messageview.c:358
+#: src/mainwindow.c:1941 src/messageview.c:358
 msgid "Sylpheed - Message View"
 msgstr ""
 
-#: src/mainwindow.c:2079 src/summaryview.c:340
+#: src/mainwindow.c:2088 src/summaryview.c:340
 msgid "/_Reply"
 msgstr "/_Răspunde"
 
-#: src/mainwindow.c:2080
+#: src/mainwindow.c:2089
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "Răspunde la toţi"
 
-#: src/mainwindow.c:2081
+#: src/mainwindow.c:2090
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/Răspunde _la toţi"
 
-#: src/mainwindow.c:2082
+#: src/mainwindow.c:2091
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/Răspunde _la toţi"
 
-#: src/mainwindow.c:2087 src/summaryview.c:347
+#: src/mainwindow.c:2096 src/summaryview.c:347
 msgid "/_Forward"
 msgstr "/Î_naintare"
 
-#: src/mainwindow.c:2088 src/summaryview.c:348
+#: src/mainwindow.c:2097 src/summaryview.c:348
 #, fuzzy
 msgid "/For_ward as attachment"
 msgstr "/Înaintare ca a_taşament"
 
-#: src/mainwindow.c:2089 src/summaryview.c:349
+#: src/mainwindow.c:2098 src/summaryview.c:349
 #, fuzzy
 msgid "/Redirec_t"
 msgstr "/Re_editare"
 
-#: src/mainwindow.c:2125
+#: src/mainwindow.c:2134
 msgid "Get"
 msgstr "Ia"
 
-#: src/mainwindow.c:2126
+#: src/mainwindow.c:2135
 msgid "Incorporate new mail"
 msgstr "Recepţionare mesaje noi pentru contul curent"
 
-#: src/mainwindow.c:2133
+#: src/mainwindow.c:2142
 msgid "Get all"
 msgstr "Ia tot"
 
-#: src/mainwindow.c:2134
+#: src/mainwindow.c:2143
 msgid "Incorporate new mail of all accounts"
 msgstr "Recepţionare mesaje noi pentru toate conturile"
 
-#: src/mainwindow.c:2145
+#: src/mainwindow.c:2154
 msgid "Send queued message(s)"
 msgstr "Trimiterea mesajului(lor) din lista de aşteptare"
 
-#: src/mainwindow.c:2155 src/prefs_account.c:705 src/prefs_common.c:852
+#: src/mainwindow.c:2164 src/prefs_account.c:705 src/prefs_common.c:852
 #: src/prefs_folder_item.c:137
 msgid "Compose"
 msgstr "Creare"
 
-#: src/mainwindow.c:2156
+#: src/mainwindow.c:2165
 msgid "Compose new message"
 msgstr "Creare mesaj nou"
 
-#: src/mainwindow.c:2164 src/prefs_common.c:1353
+#: src/mainwindow.c:2173 src/prefs_common.c:1365
 msgid "Reply"
 msgstr "Răspuns"
 
-#: src/mainwindow.c:2165 src/mainwindow.c:2178
+#: src/mainwindow.c:2174 src/mainwindow.c:2187
 msgid "Reply to the message"
 msgstr "Răspunde la mesaj"
 
-#: src/mainwindow.c:2183
+#: src/mainwindow.c:2192
 msgid "Reply all"
 msgstr "Răspuns toţi"
 
-#: src/mainwindow.c:2184
+#: src/mainwindow.c:2193
 msgid "Reply to all"
 msgstr "Răspunde la toţi"
 
-#: src/mainwindow.c:2192 src/prefs_filter_edit.c:719
+#: src/mainwindow.c:2201 src/prefs_filter_edit.c:719
 msgid "Forward"
 msgstr "Înaintare"
 
-#: src/mainwindow.c:2193 src/mainwindow.c:2206
+#: src/mainwindow.c:2202 src/mainwindow.c:2215
 msgid "Forward the message"
 msgstr "Înaintare mesaj"
 
-#: src/mainwindow.c:2213
+#: src/mainwindow.c:2222
 msgid "Delete the message"
 msgstr "Ştergere mesaj"
 
-#: src/mainwindow.c:2221
+#: src/mainwindow.c:2230
 msgid "Execute"
 msgstr "Executare"
 
-#: src/mainwindow.c:2222
+#: src/mainwindow.c:2231
 msgid "Execute marked process"
 msgstr "Execută toate procesele marcate"
 
-#: src/mainwindow.c:2231
+#: src/mainwindow.c:2240
 msgid "Next unread message"
 msgstr "Următorul mesaj necitit"
 
-#: src/mainwindow.c:2242
+#: src/mainwindow.c:2251
 msgid "Prefs"
 msgstr "Preferinţe"
 
-#: src/mainwindow.c:2243
+#: src/mainwindow.c:2252
 #, fuzzy
 msgid "Common preferences"
 msgstr "Preferinţe comune"
 
-#: src/mainwindow.c:2250 src/prefs_folder_item.c:258
+#: src/mainwindow.c:2259 src/prefs_folder_item.c:258
 #: src/prefs_folder_item.c:269 src/progressdialog.c:50
 msgid "Account"
 msgstr "Cont"
 
-#: src/mainwindow.c:2251
+#: src/mainwindow.c:2260
 msgid "Account setting"
 msgstr "Setări cont curent"
 
-#: src/mainwindow.c:2425
+#: src/mainwindow.c:2434
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 
-#: src/mainwindow.c:2436
+#: src/mainwindow.c:2445
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 
-#: src/mainwindow.c:2624
+#: src/mainwindow.c:2633
 msgid "Exit"
 msgstr "Ieşire"
 
-#: src/mainwindow.c:2624
+#: src/mainwindow.c:2633
 msgid "Exit this program?"
 msgstr "Doriţi să părăsiţi acest program ?"
 
@@ -3581,7 +3590,7 @@ msgstr "Căutarea a luat sfârşit"
 msgid "Creating message view...\n"
 msgstr "Creare vedere mesaj...\n"
 
-#: src/messageview.c:303 src/prefs_common.c:1550
+#: src/messageview.c:303 src/prefs_common.c:1562
 #, fuzzy
 msgid "Text"
 msgstr "Înainte"
@@ -3595,7 +3604,7 @@ msgstr "Ataşamente"
 msgid "Can't save the file `%s'."
 msgstr "Directorul `%s' nu a putut fi creat."
 
-#: src/messageview.c:697 src/prefs_common.c:2154 src/summaryview.c:2744
+#: src/messageview.c:697 src/prefs_common.c:2166 src/summaryview.c:2744
 msgid "Print"
 msgstr "Imprimare"
 
@@ -4079,7 +4088,7 @@ msgstr "Deschide primul mesaj necitit la intrarea într-un director"
 msgid "Authentication method"
 msgstr "Autentificare..."
 
-#: src/prefs_account.c:1123 src/prefs_account.c:1239 src/prefs_common.c:1189
+#: src/prefs_account.c:1123 src/prefs_account.c:1239 src/prefs_common.c:1201
 msgid "Automatic"
 msgstr "Automat"
 
@@ -4103,7 +4112,7 @@ msgstr "Generare Message-ID"
 msgid "Add user-defined header"
 msgstr "Adăugare de câmpuri definite de utilizator"
 
-#: src/prefs_account.c:1196 src/prefs_common.c:1714 src/prefs_common.c:1739
+#: src/prefs_account.c:1196 src/prefs_common.c:1726 src/prefs_common.c:1751
 msgid " Edit... "
 msgstr " Editare..."
 
@@ -4502,578 +4511,579 @@ msgid "Save sent messages to outbox"
 msgstr "Salvare mesaje trimise în outbox"
 
 #: src/prefs_common.c:1113
-msgid "Outgoing codeset"
+#, fuzzy
+msgid "Outgoing encoding"
 msgstr "Set de caractere"
 
 #: src/prefs_common.c:1128
 msgid "Automatic (Recommended)"
 msgstr ""
 
-#: src/prefs_common.c:1129
+#: src/prefs_common.c:1130
 msgid "7bit ascii (US-ASCII)"
 msgstr "7bit ASCII (US-ASCII)"
 
-#: src/prefs_common.c:1130
+#: src/prefs_common.c:1132
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
-#: src/prefs_common.c:1131
+#: src/prefs_common.c:1134
 msgid "Western European (ISO-8859-1)"
 msgstr "Vest European (ISO-8859-1)"
 
-#: src/prefs_common.c:1132
+#: src/prefs_common.c:1135
 #, fuzzy
 msgid "Western European (ISO-8859-15)"
 msgstr "Vest European (ISO-8859-1)"
 
-#: src/prefs_common.c:1133
+#: src/prefs_common.c:1137
 msgid "Central European (ISO-8859-2)"
 msgstr "Central European (ISO-8859-2)"
 
-#: src/prefs_common.c:1134
+#: src/prefs_common.c:1139
 msgid "Baltic (ISO-8859-13)"
 msgstr "Baltic (ISO-8859-13)"
 
-#: src/prefs_common.c:1135
+#: src/prefs_common.c:1140
 msgid "Baltic (ISO-8859-4)"
 msgstr "Baltic (ISO-8859-4)"
 
-#: src/prefs_common.c:1136
+#: src/prefs_common.c:1142
 msgid "Greek (ISO-8859-7)"
 msgstr "Grec (ISO-8859-7)"
 
-#: src/prefs_common.c:1137
+#: src/prefs_common.c:1144
 msgid "Turkish (ISO-8859-9)"
 msgstr "Turcesc (ISO-8859-9)"
 
-#: src/prefs_common.c:1138
+#: src/prefs_common.c:1146
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Chirilic (ISO-8859-5)"
 
-#: src/prefs_common.c:1139
+#: src/prefs_common.c:1147
 msgid "Cyrillic (KOI8-R)"
 msgstr "Chirilic (KOI8-R)"
 
-#: src/prefs_common.c:1140
-msgid "Cyrillic (Windows-1251)"
-msgstr "Chirilic (Windows-1251)"
-
-#: src/prefs_common.c:1141
+#: src/prefs_common.c:1148
 msgid "Cyrillic (KOI8-U)"
 msgstr "Chirilic (KOI8-U)"
 
-#: src/prefs_common.c:1142
+#: src/prefs_common.c:1149
+msgid "Cyrillic (Windows-1251)"
+msgstr "Chirilic (Windows-1251)"
+
+#: src/prefs_common.c:1151
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Japonez (ISO-2022-JP)"
 
-#: src/prefs_common.c:1144
+#: src/prefs_common.c:1153
 msgid "Japanese (EUC-JP)"
 msgstr "Japonez (EUC-JP)"
 
-#: src/prefs_common.c:1145
+#: src/prefs_common.c:1154
 msgid "Japanese (Shift_JIS)"
 msgstr "Japonez (Shift_JIS)"
 
-#: src/prefs_common.c:1147
+#: src/prefs_common.c:1157
 msgid "Simplified Chinese (GB2312)"
 msgstr "Chinezesc Simplificat (GB2312)"
 
-#: src/prefs_common.c:1148
+#: src/prefs_common.c:1158
 msgid "Traditional Chinese (Big5)"
 msgstr "Chinezesc Tradiţional (Big5)"
 
-#: src/prefs_common.c:1150
+#: src/prefs_common.c:1160
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Chinezesc Tradiţional (EUC-TW)"
 
-#: src/prefs_common.c:1151
+#: src/prefs_common.c:1161
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Chinezesc"
 
-#: src/prefs_common.c:1153
+#: src/prefs_common.c:1164
 msgid "Korean (EUC-KR)"
 msgstr "Corean"
 
-#: src/prefs_common.c:1154
+#: src/prefs_common.c:1166
 msgid "Thai (TIS-620)"
 msgstr ""
 
-#: src/prefs_common.c:1155
+#: src/prefs_common.c:1167
 msgid "Thai (Windows-874)"
 msgstr ""
 
-#: src/prefs_common.c:1165
+#: src/prefs_common.c:1177
 msgid ""
 "If `Automatic' is selected, the optimal encoding for the current locale will "
 "be used."
 msgstr ""
 
-#: src/prefs_common.c:1179
+#: src/prefs_common.c:1191
 #, fuzzy
 msgid "Transfer encoding"
 msgstr "Taie liniile înainte de trimitere"
 
-#: src/prefs_common.c:1202
+#: src/prefs_common.c:1214
 msgid ""
 "Specify Content-Transfer-Encoding used when message body contains non-ASCII "
 "characters."
 msgstr ""
 
-#: src/prefs_common.c:1272
+#: src/prefs_common.c:1284
 msgid "Signature separator"
 msgstr "Separator de semnătură"
 
-#: src/prefs_common.c:1281
+#: src/prefs_common.c:1293
 #, fuzzy
 msgid "Insert automatically"
 msgstr "Inserează semnătura automat"
 
-#: src/prefs_common.c:1291
+#: src/prefs_common.c:1303
 #, fuzzy
 msgid "Automatically launch the external editor"
 msgstr "Editare cu editor extern"
 
-#: src/prefs_common.c:1301
+#: src/prefs_common.c:1313
 msgid "Undo level"
 msgstr ""
 
-#: src/prefs_common.c:1321
+#: src/prefs_common.c:1333
 msgid "Wrap messages at"
 msgstr "Taie liniile mesajului la"
 
-#: src/prefs_common.c:1333
+#: src/prefs_common.c:1345
 msgid "characters"
 msgstr "caractere"
 
-#: src/prefs_common.c:1343
+#: src/prefs_common.c:1355
 msgid "Wrap quotation"
 msgstr "Taie liniile semnăturii"
 
-#: src/prefs_common.c:1349
+#: src/prefs_common.c:1361
 #, fuzzy
 msgid "Wrap on input"
 msgstr "Tăiere toate liniile lungi"
 
-#: src/prefs_common.c:1351
+#: src/prefs_common.c:1363
 msgid "Wrap before sending"
 msgstr "Taie liniile înainte de trimitere"
 
-#: src/prefs_common.c:1361
+#: src/prefs_common.c:1373
 #, fuzzy
 msgid "Automatically select account for replies"
 msgstr "Setare automată a adreselor următoare"
 
-#: src/prefs_common.c:1363
+#: src/prefs_common.c:1375
 msgid "Quote message when replying"
 msgstr "Citează mesajul la care se răspunde"
 
-#: src/prefs_common.c:1365
+#: src/prefs_common.c:1377
 #, fuzzy
 msgid "Reply button invokes mailing list reply"
 msgstr "/Răspunde _la toţi"
 
 #. reply
-#: src/prefs_common.c:1411
+#: src/prefs_common.c:1423
 #, fuzzy
 msgid "Reply format"
 msgstr "Răspunde la toţi"
 
-#: src/prefs_common.c:1426 src/prefs_common.c:1468
+#: src/prefs_common.c:1438 src/prefs_common.c:1480
 msgid "Quotation mark"
 msgstr "Semn de citare"
 
 #. forward
-#: src/prefs_common.c:1453
+#: src/prefs_common.c:1465
 #, fuzzy
 msgid "Forward format"
 msgstr "Înaintare"
 
-#: src/prefs_common.c:1500
+#: src/prefs_common.c:1512
 msgid " Description of symbols "
 msgstr " Descrierea simbolurilor "
 
-#: src/prefs_common.c:1541
+#: src/prefs_common.c:1553
 msgid "Font"
 msgstr "Font"
 
-#: src/prefs_common.c:1573
+#: src/prefs_common.c:1585
 msgid "Translate header name (such as `From:', `Subject:')"
 msgstr "Traducere antet (cu ar fi 'From:', 'Subject:')"
 
-#: src/prefs_common.c:1576
+#: src/prefs_common.c:1588
 msgid "Display unread number next to folder name"
 msgstr "Afişare număr de mesaje necitite lângă numele directorului"
 
-#: src/prefs_common.c:1585
+#: src/prefs_common.c:1597
 msgid "Abbreviate newsgroups longer than"
 msgstr ""
 
-#: src/prefs_common.c:1600
+#: src/prefs_common.c:1612
 #, fuzzy
 msgid "letters"
 msgstr "Ştergere"
 
 #. ---- Summary ----
-#: src/prefs_common.c:1606
+#: src/prefs_common.c:1618
 #, fuzzy
 msgid "Summary View"
 msgstr "/Re_zumat"
 
-#: src/prefs_common.c:1615
+#: src/prefs_common.c:1627
 msgid "Display recipient on `From' column if sender is yourself"
 msgstr "Destinatarul pe coloana 'From', daca sunteţi expeditorul"
 
-#: src/prefs_common.c:1617
+#: src/prefs_common.c:1629
 msgid "Expand threads"
 msgstr ""
 
-#: src/prefs_common.c:1625 src/prefs_common.c:2443 src/prefs_common.c:2481
+#: src/prefs_common.c:1637 src/prefs_common.c:2455 src/prefs_common.c:2493
 #, fuzzy
 msgid "Date format"
 msgstr "Format de citare:"
 
-#: src/prefs_common.c:1646
+#: src/prefs_common.c:1658
 msgid " Set display item of summary... "
 msgstr " Elemente afişate... "
 
-#: src/prefs_common.c:1710
+#: src/prefs_common.c:1722
 msgid "Enable coloration of message"
 msgstr "Colorare mesaje"
 
-#: src/prefs_common.c:1724
+#: src/prefs_common.c:1736
 #, fuzzy
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
 msgstr "Afişare caractere pe 2 biţi cu un alfabet pe 1 bit"
 
-#: src/prefs_common.c:1730
+#: src/prefs_common.c:1742
 #, fuzzy
 msgid "Display header pane above message view"
 msgstr "Afişare antet scurt"
 
-#: src/prefs_common.c:1737
+#: src/prefs_common.c:1749
 msgid "Display short headers on message view"
 msgstr "Afişare antet scurt"
 
-#: src/prefs_common.c:1758
+#: src/prefs_common.c:1770
 msgid "Line space"
 msgstr "Spaţiere linii"
 
-#: src/prefs_common.c:1772 src/prefs_common.c:1810
+#: src/prefs_common.c:1784 src/prefs_common.c:1822
 msgid "pixel(s)"
 msgstr "pixel(i)"
 
-#: src/prefs_common.c:1777
+#: src/prefs_common.c:1789
 msgid "Scroll"
 msgstr ""
 
-#: src/prefs_common.c:1784
+#: src/prefs_common.c:1796
 msgid "Half page"
 msgstr ""
 
-#: src/prefs_common.c:1790
+#: src/prefs_common.c:1802
 msgid "Smooth scroll"
 msgstr ""
 
-#: src/prefs_common.c:1796
+#: src/prefs_common.c:1808
 msgid "Step"
 msgstr ""
 
-#: src/prefs_common.c:1816
+#: src/prefs_common.c:1828
 msgid "Images"
 msgstr ""
 
-#: src/prefs_common.c:1824
+#: src/prefs_common.c:1836
 msgid "Resize attached large images to fit in the window"
 msgstr ""
 
-#: src/prefs_common.c:1826
+#: src/prefs_common.c:1838
 #, fuzzy
 msgid "Display images as inline"
 msgstr "/Afişare ca te_xt"
 
-#: src/prefs_common.c:1871
+#: src/prefs_common.c:1883
 #, fuzzy
 msgid "Automatically check signatures"
 msgstr "Setare automată a adreselor următoare"
 
-#: src/prefs_common.c:1874
+#: src/prefs_common.c:1886
 msgid "Show signature check result in a popup window"
 msgstr ""
 
-#: src/prefs_common.c:1877
+#: src/prefs_common.c:1889
 msgid "Store passphrase in memory temporarily"
 msgstr ""
 
-#: src/prefs_common.c:1892
+#: src/prefs_common.c:1904
 #, fuzzy
 msgid "Expired after"
 msgstr "Mai târziu"
 
-#: src/prefs_common.c:1905
+#: src/prefs_common.c:1917
 #, fuzzy
 msgid "minute(s) "
 msgstr "minut(e)"
 
-#: src/prefs_common.c:1918
+#: src/prefs_common.c:1930
 msgid "Setting to '0' will store the passphrase for the whole session."
 msgstr ""
 
-#: src/prefs_common.c:1932
+#: src/prefs_common.c:1944
 msgid "Grab input while entering a passphrase"
 msgstr ""
 
-#: src/prefs_common.c:1937
+#: src/prefs_common.c:1949
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr ""
 
-#: src/prefs_common.c:1989
+#: src/prefs_common.c:2001
 #, fuzzy
 msgid "Always open messages in summary when selected"
 msgstr "un mesaj nu a putut fi recepţionat\n"
 
-#: src/prefs_common.c:1993
+#: src/prefs_common.c:2005
 msgid "Open first unread message when entering a folder"
 msgstr "Deschide primul mesaj necitit la intrarea într-un director"
 
-#: src/prefs_common.c:1997
+#: src/prefs_common.c:2009
 #, fuzzy
 msgid "Only mark message as read when opened in new window"
 msgstr "/_Mesaj/Desc_hidere în fereastră nouă"
 
-#: src/prefs_common.c:2001
+#: src/prefs_common.c:2013
 msgid "Go to inbox after receiving new mail"
 msgstr ""
 
-#: src/prefs_common.c:2009
+#: src/prefs_common.c:2021
 msgid "Execute immediately when moving or deleting messages"
 msgstr ""
 
-#: src/prefs_common.c:2021
+#: src/prefs_common.c:2033
 msgid "Messages will be marked until execution if this is turned off."
 msgstr ""
 
-#: src/prefs_common.c:2029
+#: src/prefs_common.c:2041
 #, fuzzy
 msgid "Receive dialog"
 msgstr "Recepţionare"
 
-#: src/prefs_common.c:2039
+#: src/prefs_common.c:2051
 msgid "Show receive dialog"
 msgstr ""
 
-#: src/prefs_common.c:2049
+#: src/prefs_common.c:2061
 #, fuzzy
 msgid "Always"
 msgstr "Alias"
 
-#: src/prefs_common.c:2050
+#: src/prefs_common.c:2062
 msgid "Only on manual receiving"
 msgstr ""
 
-#: src/prefs_common.c:2052
+#: src/prefs_common.c:2064
 #, fuzzy
 msgid "Never"
 msgstr "Server"
 
-#: src/prefs_common.c:2057
+#: src/prefs_common.c:2069
 msgid "Don't popup error dialog on receive error"
 msgstr ""
 
-#: src/prefs_common.c:2060
+#: src/prefs_common.c:2072
 msgid "Close receive dialog when finished"
 msgstr ""
 
-#: src/prefs_common.c:2066
+#: src/prefs_common.c:2078
 msgid " Set key bindings... "
 msgstr ""
 
-#: src/prefs_common.c:2122
+#: src/prefs_common.c:2134
 #, fuzzy, c-format
 msgid "External commands (%s will be replaced with file name / URI)"
 msgstr "Editor extern (%s va fi înlocuit de numele fişierului)"
 
-#: src/prefs_common.c:2131
+#: src/prefs_common.c:2143
 msgid "Web browser"
 msgstr ""
 
-#: src/prefs_common.c:2195
+#: src/prefs_common.c:2207
 msgid "Add address to destination when double-clicked"
 msgstr ""
 
-#: src/prefs_common.c:2197
+#: src/prefs_common.c:2209
 msgid "On exit"
 msgstr "La ieşire"
 
-#: src/prefs_common.c:2205
+#: src/prefs_common.c:2217
 msgid "Confirm on exit"
 msgstr "Confirmare ieşire"
 
-#: src/prefs_common.c:2212
+#: src/prefs_common.c:2224
 #, fuzzy
 msgid "Empty trash on exit"
 msgstr "Curăţare gunoi"
 
-#: src/prefs_common.c:2214
+#: src/prefs_common.c:2226
 #, fuzzy
 msgid "Ask before emptying"
 msgstr "Întreabă înainte de curăţare"
 
-#: src/prefs_common.c:2218
+#: src/prefs_common.c:2230
 #, fuzzy
 msgid "Warn if there are queued messages"
 msgstr "Trimiterea mesajului(lor) din lista de aşteptare"
 
-#: src/prefs_common.c:2224
+#: src/prefs_common.c:2236
 msgid "Socket I/O timeout:"
 msgstr ""
 
-#: src/prefs_common.c:2237
+#: src/prefs_common.c:2249
 msgid "second(s)"
 msgstr ""
 
-#: src/prefs_common.c:2419
+#: src/prefs_common.c:2431
 msgid "the full abbreviated weekday name"
 msgstr ""
 
-#: src/prefs_common.c:2420
+#: src/prefs_common.c:2432
 msgid "the full weekday name"
 msgstr ""
 
-#: src/prefs_common.c:2421
+#: src/prefs_common.c:2433
 msgid "the abbreviated month name"
 msgstr ""
 
-#: src/prefs_common.c:2422
+#: src/prefs_common.c:2434
 msgid "the full month name"
 msgstr ""
 
-#: src/prefs_common.c:2423
+#: src/prefs_common.c:2435
 msgid "the preferred date and time for the current locale"
 msgstr ""
 
-#: src/prefs_common.c:2424
+#: src/prefs_common.c:2436
 msgid "the century number (year/100)"
 msgstr ""
 
-#: src/prefs_common.c:2425
+#: src/prefs_common.c:2437
 msgid "the day of the month as a decimal number"
 msgstr ""
 
-#: src/prefs_common.c:2426
+#: src/prefs_common.c:2438
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr ""
 
-#: src/prefs_common.c:2427
+#: src/prefs_common.c:2439
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr ""
 
-#: src/prefs_common.c:2428
+#: src/prefs_common.c:2440
 msgid "the day of the year as a decimal number"
 msgstr ""
 
-#: src/prefs_common.c:2429
+#: src/prefs_common.c:2441
 msgid "the month as a decimal number"
 msgstr ""
 
-#: src/prefs_common.c:2430
+#: src/prefs_common.c:2442
 msgid "the minute as a decimal number"
 msgstr ""
 
-#: src/prefs_common.c:2431
+#: src/prefs_common.c:2443
 msgid "either AM or PM"
 msgstr ""
 
-#: src/prefs_common.c:2432
+#: src/prefs_common.c:2444
 msgid "the second as a decimal number"
 msgstr ""
 
-#: src/prefs_common.c:2433
+#: src/prefs_common.c:2445
 msgid "the day of the week as a decimal number"
 msgstr ""
 
-#: src/prefs_common.c:2434
+#: src/prefs_common.c:2446
 msgid "the preferred date for the current locale"
 msgstr ""
 
-#: src/prefs_common.c:2435
+#: src/prefs_common.c:2447
 msgid "the last two digits of a year"
 msgstr ""
 
-#: src/prefs_common.c:2436
+#: src/prefs_common.c:2448
 msgid "the year as a decimal number"
 msgstr ""
 
-#: src/prefs_common.c:2437
+#: src/prefs_common.c:2449
 msgid "the time zone or name or abbreviation"
 msgstr ""
 
-#: src/prefs_common.c:2458
+#: src/prefs_common.c:2470
 #, fuzzy
 msgid "Specifier"
 msgstr "Selectare fişier"
 
-#: src/prefs_common.c:2459
+#: src/prefs_common.c:2471
 #, fuzzy
 msgid "Description"
 msgstr "Destinaţie"
 
-#: src/prefs_common.c:2499
+#: src/prefs_common.c:2511
 msgid "Example"
 msgstr ""
 
-#: src/prefs_common.c:2580
+#: src/prefs_common.c:2592
 #, fuzzy
 msgid "Set message colors"
 msgstr "Trimitere mesaj"
 
-#: src/prefs_common.c:2588
+#: src/prefs_common.c:2600
 #, fuzzy
 msgid "Colors"
 msgstr "Închidere"
 
-#: src/prefs_common.c:2622
+#: src/prefs_common.c:2634
 msgid "Quoted Text - First Level"
 msgstr ""
 
-#: src/prefs_common.c:2628
+#: src/prefs_common.c:2640
 msgid "Quoted Text - Second Level"
 msgstr ""
 
-#: src/prefs_common.c:2634
+#: src/prefs_common.c:2646
 msgid "Quoted Text - Third Level"
 msgstr ""
 
-#: src/prefs_common.c:2640
+#: src/prefs_common.c:2652
 msgid "URI link"
 msgstr ""
 
-#: src/prefs_common.c:2647
+#: src/prefs_common.c:2659
 msgid "Recycle quote colors"
 msgstr ""
 
-#: src/prefs_common.c:2707
+#: src/prefs_common.c:2719
 msgid "Pick color for quotation level 1"
 msgstr ""
 
-#: src/prefs_common.c:2710
+#: src/prefs_common.c:2722
 msgid "Pick color for quotation level 2"
 msgstr ""
 
-#: src/prefs_common.c:2713
+#: src/prefs_common.c:2725
 msgid "Pick color for quotation level 3"
 msgstr ""
 
-#: src/prefs_common.c:2716
+#: src/prefs_common.c:2728
 msgid "Pick color for URI"
 msgstr ""
 
-#: src/prefs_common.c:2853
+#: src/prefs_common.c:2865
 msgid "Description of symbols"
 msgstr "Descrierea simbolurilor"
 
-#: src/prefs_common.c:2909
+#: src/prefs_common.c:2921
 #, fuzzy
 msgid ""
 "Date\n"
@@ -5097,11 +5107,11 @@ msgstr ""
 "Message-ID\n"
 "Semnul %"
 
-#: src/prefs_common.c:2922
+#: src/prefs_common.c:2934
 msgid "If x is set, displays expr"
 msgstr ""
 
-#: src/prefs_common.c:2926
+#: src/prefs_common.c:2938
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -5110,7 +5120,7 @@ msgid ""
 "Literal %"
 msgstr ""
 
-#: src/prefs_common.c:2934
+#: src/prefs_common.c:2946
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -5118,27 +5128,27 @@ msgid ""
 "Literal closing curly brace"
 msgstr ""
 
-#: src/prefs_common.c:2971
+#: src/prefs_common.c:2983
 msgid "Font selection"
 msgstr "Selectare font"
 
-#: src/prefs_common.c:3035
+#: src/prefs_common.c:3047
 msgid "Key bindings"
 msgstr ""
 
-#: src/prefs_common.c:3049
+#: src/prefs_common.c:3061
 msgid ""
 "Select the preset of key bindings.\n"
 "You can also modify each menu's shortcuts by pressing\n"
 "any key(s) when placing the mouse pointer on the item."
 msgstr ""
 
-#: src/prefs_common.c:3061 src/prefs_common.c:3410
+#: src/prefs_common.c:3073 src/prefs_common.c:3422
 #, fuzzy
 msgid "Default"
 msgstr "Ştergere"
 
-#: src/prefs_common.c:3064 src/prefs_common.c:3419
+#: src/prefs_common.c:3076 src/prefs_common.c:3431
 msgid "Old Sylpheed"
 msgstr ""
 
@@ -6394,6 +6404,14 @@ msgid "writing to %s failed.\n"
 msgstr "scrierea în %s a eşuat.\n"
 
 #, fuzzy
+#~ msgid "/_View/_Code set/---"
+#~ msgstr "/_Mesaj/Set de _caractere/---"
+
+#, fuzzy
+#~ msgid "/_View/_Code set"
+#~ msgstr "/_Mesaj/Set de _caractere"
+
+#, fuzzy
 #~ msgid "To save this part, pop up the context menu with "
 #~ msgstr " Pentru salvare, activaţi meniul contextual cu\n"
 
diff --git a/po/ru.po b/po/ru.po
index 6a4d2079..38b8cf12 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed 1.0.0beta4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-03-15 14:29+0900\n"
+"POT-Creation-Date: 2005-03-16 14:47+0900\n"
 "PO-Revision-Date: 2004-12-05 17:16+0300\n"
 "Last-Translator: Sergey Vlasov <vsu@altlinux.ru>\n"
 "Language-Team: Russian <ru@li.org>\n"
@@ -99,7 +99,7 @@ msgstr ""
 "по команде 'Получить все'."
 
 #: src/account.c:638 src/addressadd.c:186 src/addressbook.c:488
-#: src/compose.c:3650 src/editaddress.c:195 src/editaddress.c:936
+#: src/compose.c:3748 src/editaddress.c:195 src/editaddress.c:936
 #: src/editaddress.c:984 src/editbook.c:191 src/editgroup.c:257
 #: src/editjpilot.c:296 src/editldap.c:300 src/editvcard.c:211
 #: src/mimeview.c:151 src/prefs_filter.c:214 src/prefs_folder_item.c:170
@@ -152,13 +152,13 @@ msgstr "Удалить учетную запись"
 msgid "Do you really want to delete this account?"
 msgstr "Вы действительно хотите удалить эту запись?"
 
-#: src/account.c:758 src/compose.c:2551 src/compose.c:4807
+#: src/account.c:758 src/compose.c:2632 src/compose.c:4943
 #: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
 #: src/folderview.c:2156 src/folderview.c:2192
 msgid "Yes"
 msgstr "Да"
 
-#: src/account.c:758 src/compose.c:2551 src/compose.c:4807
+#: src/account.c:758 src/compose.c:2632 src/compose.c:4943
 #: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
 #: src/folderview.c:2156 src/folderview.c:2192
 msgid "+No"
@@ -263,7 +263,7 @@ msgstr "Пользовательский параметр действия"
 msgid "Add Address to Book"
 msgstr "Добавление адреса в книгу"
 
-#: src/addressadd.c:196 src/compose.c:4191 src/editaddress.c:196
+#: src/addressadd.c:196 src/compose.c:4292 src/editaddress.c:196
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "Адрес"
@@ -277,7 +277,7 @@ msgstr "Примечание"
 msgid "Select Address Book Folder"
 msgstr "Выберите папку в адресной книге"
 
-#: src/addressbook.c:334 src/compose.c:469 src/mainwindow.c:454
+#: src/addressbook.c:334 src/compose.c:477 src/mainwindow.c:454
 #: src/messageview.c:134
 msgid "/_File"
 msgstr "/Файл"
@@ -298,8 +298,8 @@ msgstr "/Файл/Новый файл JPilot"
 msgid "/_File/New _Server"
 msgstr "/Файл/Новый сервер"
 
-#: src/addressbook.c:343 src/addressbook.c:346 src/compose.c:474
-#: src/compose.c:479 src/compose.c:483 src/mainwindow.c:471
+#: src/addressbook.c:343 src/addressbook.c:346 src/compose.c:482
+#: src/compose.c:487 src/compose.c:491 src/mainwindow.c:471
 #: src/mainwindow.c:474 src/mainwindow.c:476 src/mainwindow.c:479
 #: src/mainwindow.c:481 src/messageview.c:137
 msgid "/_File/---"
@@ -317,7 +317,7 @@ msgstr "/Файл/Удалить"
 msgid "/_File/_Save"
 msgstr "/Файл/Сохранить"
 
-#: src/addressbook.c:348 src/compose.c:484 src/messageview.c:138
+#: src/addressbook.c:348 src/compose.c:492 src/messageview.c:138
 msgid "/_File/_Close"
 msgstr "/Файл/Закрыть"
 
@@ -349,7 +349,7 @@ msgstr "/Адрес/Правка"
 msgid "/_Address/_Delete"
 msgstr "/Адрес/Удалить"
 
-#: src/addressbook.c:356 src/compose.c:585 src/mainwindow.c:688
+#: src/addressbook.c:356 src/compose.c:664 src/mainwindow.c:697
 #: src/messageview.c:246
 msgid "/_Tools"
 msgstr "/Инструменты"
@@ -358,12 +358,12 @@ msgstr "/Инструменты"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/Инструменты/Импорт файла LDIF"
 
-#: src/addressbook.c:358 src/compose.c:598 src/mainwindow.c:733
+#: src/addressbook.c:358 src/compose.c:677 src/mainwindow.c:742
 #: src/messageview.c:264
 msgid "/_Help"
 msgstr "/Справка"
 
-#: src/addressbook.c:359 src/compose.c:599 src/mainwindow.c:744
+#: src/addressbook.c:359 src/compose.c:678 src/mainwindow.c:753
 #: src/messageview.c:265
 msgid "/_Help/_About"
 msgstr "/Справка/О программе"
@@ -380,7 +380,7 @@ msgstr "/Новая группа"
 msgid "/New _Folder"
 msgstr "/Новая папка"
 
-#: src/addressbook.c:381 src/addressbook.c:391 src/compose.c:463
+#: src/addressbook.c:381 src/addressbook.c:391 src/compose.c:471
 #: src/folderview.c:220 src/folderview.c:222 src/folderview.c:226
 #: src/folderview.c:236 src/folderview.c:238 src/folderview.c:240
 #: src/folderview.c:244 src/folderview.c:254 src/folderview.c:256
@@ -390,7 +390,7 @@ msgstr "/Новая папка"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:382 src/addressbook.c:392 src/compose.c:486
+#: src/addressbook.c:382 src/addressbook.c:392 src/compose.c:494
 #: src/mainwindow.c:485 src/messageview.c:140
 msgid "/_Edit"
 msgstr "/Правка"
@@ -403,7 +403,7 @@ msgstr "/Удалить"
 msgid "E-Mail address"
 msgstr "Адрес E-Mail"
 
-#: src/addressbook.c:493 src/compose.c:4192 src/prefs_common.c:2186
+#: src/addressbook.c:493 src/compose.c:4293 src/prefs_common.c:2198
 msgid "Address book"
 msgstr "Адресная книга"
 
@@ -413,7 +413,7 @@ msgstr "Имя:"
 
 #. Buttons
 #: src/addressbook.c:625 src/addressbook.c:1665 src/addressbook.c:1671
-#: src/editaddress.c:878 src/editaddress.c:1011 src/mainwindow.c:2212
+#: src/editaddress.c:878 src/editaddress.c:1011 src/mainwindow.c:2221
 #: src/prefs_actions.c:263 src/prefs_display_header.c:275
 #: src/prefs_display_header.c:330 src/prefs_template.c:227
 msgid "Delete"
@@ -606,7 +606,7 @@ msgstr "Адреса организаций"
 msgid "Personal address"
 msgstr "Личные адреса"
 
-#: src/alertpanel.c:123 src/compose.c:4807 src/main.c:458
+#: src/alertpanel.c:123 src/compose.c:4943 src/main.c:458
 msgid "Notice"
 msgstr "Уведомление"
 
@@ -614,7 +614,7 @@ msgstr "Уведомление"
 msgid "Warning"
 msgstr "Предупреждение"
 
-#: src/alertpanel.c:149 src/compose.c:2551 src/inc.c:558
+#: src/alertpanel.c:149 src/compose.c:2632 src/inc.c:558
 msgid "Error"
 msgstr "Ошибка"
 
@@ -662,299 +662,417 @@ msgstr "Коричневый"
 msgid "None"
 msgstr "Нет"
 
-#: src/compose.c:461
+#: src/compose.c:469
 msgid "/_Add..."
 msgstr "/Добавить..."
 
-#: src/compose.c:462
+#: src/compose.c:470
 msgid "/_Remove"
 msgstr "/Удалить"
 
-#: src/compose.c:464 src/folderview.c:228 src/folderview.c:246
+#: src/compose.c:472 src/folderview.c:228 src/folderview.c:246
 #: src/folderview.c:261
 msgid "/_Properties..."
 msgstr "/Свойства..."
 
-#: src/compose.c:470
+#: src/compose.c:478
 msgid "/_File/_Send"
 msgstr "/Файл/Отправить"
 
-#: src/compose.c:472
+#: src/compose.c:480
 msgid "/_File/Send _later"
 msgstr "/Файл/Отправить позже"
 
-#: src/compose.c:475
+#: src/compose.c:483
 msgid "/_File/Save to _draft folder"
 msgstr "/Файл/Сохранить в папке черновиков"
 
-#: src/compose.c:477
+#: src/compose.c:485
 msgid "/_File/Save and _keep editing"
 msgstr "/Файл/Сохранить и продолжить правку"
 
-#: src/compose.c:480
+#: src/compose.c:488
 msgid "/_File/_Attach file"
 msgstr "/Файл/Вложить файл"
 
-#: src/compose.c:481
+#: src/compose.c:489
 msgid "/_File/_Insert file"
 msgstr "/Файл/Вставить текст из файла"
 
-#: src/compose.c:482
+#: src/compose.c:490
 msgid "/_File/Insert si_gnature"
 msgstr "/Файл/Добавить подпись"
 
-#: src/compose.c:487
+#: src/compose.c:495
 msgid "/_Edit/_Undo"
 msgstr "/Правка/Откат"
 
-#: src/compose.c:488
+#: src/compose.c:496
 msgid "/_Edit/_Redo"
 msgstr "/Правка/Откат отката"
 
-#: src/compose.c:489 src/compose.c:567 src/mainwindow.c:489
+#: src/compose.c:497 src/compose.c:575 src/mainwindow.c:489
 #: src/messageview.c:143
 msgid "/_Edit/---"
 msgstr "/Правка/---"
 
-#: src/compose.c:490
+#: src/compose.c:498
 msgid "/_Edit/Cu_t"
 msgstr "/Правка/Вырезать"
 
-#: src/compose.c:491 src/mainwindow.c:486 src/messageview.c:141
+#: src/compose.c:499 src/mainwindow.c:486 src/messageview.c:141
 msgid "/_Edit/_Copy"
 msgstr "/Правка/Копировать"
 
-#: src/compose.c:492
+#: src/compose.c:500
 msgid "/_Edit/_Paste"
 msgstr "/Правка/Вставить"
 
-#: src/compose.c:493
+#: src/compose.c:501
 msgid "/_Edit/Paste as _quotation"
 msgstr "/Правка/Вставить как цитату"
 
-#: src/compose.c:495 src/mainwindow.c:487 src/messageview.c:142
+#: src/compose.c:503 src/mainwindow.c:487 src/messageview.c:142
 msgid "/_Edit/Select _all"
 msgstr "/Правка/Выделить все"
 
-#: src/compose.c:496
+#: src/compose.c:504
 msgid "/_Edit/A_dvanced"
 msgstr "/Правка/Дополнительно"
 
-#: src/compose.c:497
+#: src/compose.c:505
 msgid "/_Edit/A_dvanced/Move a character backward"
 msgstr "/Правка/Дополнительно/Перейти на символ назад"
 
-#: src/compose.c:502
+#: src/compose.c:510
 msgid "/_Edit/A_dvanced/Move a character forward"
 msgstr "/Правка/Дополнительно/Перейти на символ вперед"
 
-#: src/compose.c:507
+#: src/compose.c:515
 msgid "/_Edit/A_dvanced/Move a word backward"
 msgstr "/Правка/Дополнительно/Перейти на слово назад"
 
-#: src/compose.c:512
+#: src/compose.c:520
 msgid "/_Edit/A_dvanced/Move a word forward"
 msgstr "/Правка/Дополнительно/Перейти на слово вперед"
 
-#: src/compose.c:517
+#: src/compose.c:525
 msgid "/_Edit/A_dvanced/Move to beginning of line"
 msgstr "/Правка/Дополнительно/Перейти в начало строки"
 
-#: src/compose.c:522
+#: src/compose.c:530
 msgid "/_Edit/A_dvanced/Move to end of line"
 msgstr "/Правка/Дополнительно/Перейти в конец строки"
 
-#: src/compose.c:527
+#: src/compose.c:535
 msgid "/_Edit/A_dvanced/Move to previous line"
 msgstr "/Правка/Дополнительно/Перейти к предыдущей строке"
 
-#: src/compose.c:532
+#: src/compose.c:540
 msgid "/_Edit/A_dvanced/Move to next line"
 msgstr "/Правка/Дополнительно/Перейти к следующей строке"
 
-#: src/compose.c:537
+#: src/compose.c:545
 msgid "/_Edit/A_dvanced/Delete a character backward"
 msgstr "/Правка/Дополнительно/Удалить символ перед курсором"
 
-#: src/compose.c:542
+#: src/compose.c:550
 msgid "/_Edit/A_dvanced/Delete a character forward"
 msgstr "/Правка/Дополнительно/Удалить символ после курсора"
 
-#: src/compose.c:547
+#: src/compose.c:555
 msgid "/_Edit/A_dvanced/Delete a word backward"
 msgstr "/Правка/Дополнительно/Удалить предыдущее слово"
 
-#: src/compose.c:552
+#: src/compose.c:560
 msgid "/_Edit/A_dvanced/Delete a word forward"
 msgstr "/Правка/Дополнительно/Удалить следующее слово"
 
-#: src/compose.c:557
+#: src/compose.c:565
 msgid "/_Edit/A_dvanced/Delete line"
 msgstr "/Правка/Дополнительно/Удалить строку"
 
-#: src/compose.c:562
+#: src/compose.c:570
 msgid "/_Edit/A_dvanced/Delete to end of line"
 msgstr "/Правка/Дополнительно/Удалить до конца строки"
 
-#: src/compose.c:568
+#: src/compose.c:576
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/Правка/Отформатировать абзац"
 
-#: src/compose.c:570
+#: src/compose.c:578
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/Правка/Отформатировать все сообщение"
 
-#: src/compose.c:572
+#: src/compose.c:580
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/Правка/Перенос по словам при вводе"
 
-#: src/compose.c:573 src/mainwindow.c:494 src/messageview.c:147
+#: src/compose.c:581 src/mainwindow.c:494 src/messageview.c:147
 #: src/summaryview.c:370
 msgid "/_View"
 msgstr "/Вид"
 
-#: src/compose.c:574
+#: src/compose.c:582
 msgid "/_View/_To"
 msgstr "/Вид/Кому"
 
-#: src/compose.c:575
+#: src/compose.c:583
 msgid "/_View/_Cc"
 msgstr "/Вид/Копия"
 
-#: src/compose.c:576
+#: src/compose.c:584
 msgid "/_View/_Bcc"
 msgstr "/Вид/Скрытая копия"
 
-#: src/compose.c:577
+#: src/compose.c:585
 msgid "/_View/_Reply to"
 msgstr "/Вид/Адрес для ответа"
 
-#: src/compose.c:578 src/compose.c:580 src/compose.c:582 src/mainwindow.c:512
-#: src/mainwindow.c:515 src/mainwindow.c:541 src/mainwindow.c:565
-#: src/mainwindow.c:641 src/mainwindow.c:645 src/messageview.c:223
+#: src/compose.c:586 src/compose.c:588 src/compose.c:590 src/compose.c:592
+#: src/mainwindow.c:512 src/mainwindow.c:515 src/mainwindow.c:541
+#: src/mainwindow.c:565 src/mainwindow.c:650 src/mainwindow.c:654
+#: src/messageview.c:223
 msgid "/_View/---"
 msgstr "/Вид/---"
 
-#: src/compose.c:579
+#: src/compose.c:587
 msgid "/_View/_Followup to"
 msgstr "/Вид/Группы новостей для ответа"
 
-#: src/compose.c:581
+#: src/compose.c:589
 msgid "/_View/R_uler"
 msgstr "/Вид/Линейка"
 
-#: src/compose.c:583
+#: src/compose.c:591
 msgid "/_View/_Attachment"
 msgstr "/Вид/Вложения"
 
-#: src/compose.c:586 src/mainwindow.c:689 src/messageview.c:247
+#: src/compose.c:598 src/mainwindow.c:572 src/messageview.c:154
+#, fuzzy
+msgid "/_View/Character _encoding"
+msgstr "/Вид/Сортировка/По убыванию"
+
+#: src/compose.c:599
+msgid "/_View/Character _encoding/_Automatic"
+msgstr ""
+
+#: src/compose.c:601 src/compose.c:607 src/compose.c:613 src/compose.c:617
+#: src/compose.c:623 src/compose.c:627 src/compose.c:631 src/compose.c:641
+#: src/compose.c:645 src/compose.c:653 src/compose.c:657 src/mainwindow.c:568
+#: src/mainwindow.c:575 src/messageview.c:150
+#, fuzzy
+msgid "/_View/Character _encoding/---"
+msgstr "/Вид/Сортировка/По убыванию"
+
+#: src/compose.c:603 src/mainwindow.c:576 src/messageview.c:158
+#, fuzzy
+msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
+msgstr "/Вид/Кодировка/7-битный ascii (US-ASC_II)"
+
+#: src/compose.c:605 src/mainwindow.c:578 src/messageview.c:161
+#, fuzzy
+msgid "/_View/Character _encoding/Unicode (_UTF-8)"
+msgstr "/Вид/Кодировка/Unicode (_UTF-8)"
+
+#: src/compose.c:609 src/mainwindow.c:582 src/messageview.c:164
+#, fuzzy
+msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
+msgstr "/Вид/Кодировка/Западноевропейская (ISO-8859-_1)"
+
+#: src/compose.c:611 src/mainwindow.c:584 src/messageview.c:166
+#, fuzzy
+msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
+msgstr "/Вид/Кодировка/Западноевропейская (ISO-8859-15)"
+
+#: src/compose.c:615 src/mainwindow.c:588 src/messageview.c:169
+#, fuzzy
+msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
+msgstr "/Вид/Кодировка/Центральноевропейская (ISO-8859-_2)"
+
+#: src/compose.c:619 src/mainwindow.c:592 src/messageview.c:172
+#, fuzzy
+msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
+msgstr "/Вид/Кодировка/Балтийская (ISO-8859-13)"
+
+#: src/compose.c:621 src/mainwindow.c:594 src/messageview.c:174
+#, fuzzy
+msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
+msgstr "/Вид/Кодировка/Балтийская (ISO-8859-_4)"
+
+#: src/compose.c:625 src/mainwindow.c:598 src/messageview.c:177
+#, fuzzy
+msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
+msgstr "/Вид/Кодировка/Греческая (ISO-8859-_7)"
+
+#: src/compose.c:629 src/mainwindow.c:602 src/messageview.c:180
+#, fuzzy
+msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
+msgstr "/Вид/Кодировка/Турецкая (ISO-8859-_9)"
+
+#: src/compose.c:633 src/mainwindow.c:606 src/messageview.c:183
+#, fuzzy
+msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
+msgstr "/Вид/Кодировка/Кириллическая (ISO-8859-_5)"
+
+#: src/compose.c:635 src/mainwindow.c:608 src/messageview.c:185
+#, fuzzy
+msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
+msgstr "/Вид/Кодировка/Русская (KOI8-_R)"
+
+#: src/compose.c:637 src/mainwindow.c:610 src/messageview.c:187
+#, fuzzy
+msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
+msgstr "/Вид/Кодировка/Украинская (KOI8-_U)"
+
+#: src/compose.c:639 src/mainwindow.c:612 src/messageview.c:189
+#, fuzzy
+msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
+msgstr "/Вид/Кодировка/Кириллическая _Win (Windows-1251)"
+
+#: src/compose.c:643 src/mainwindow.c:616 src/messageview.c:192
+#, fuzzy
+msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
+msgstr "/Вид/Кодировка/Японская (ISO-2022-_JP)"
+
+#: src/compose.c:647 src/mainwindow.c:626 src/messageview.c:201
+#, fuzzy
+msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
+msgstr "/Вид/Кодировка/Упрощенная китайская (_GB2312)"
+
+#: src/compose.c:649 src/mainwindow.c:628 src/messageview.c:203
+#, fuzzy
+msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
+msgstr "/Вид/Кодировка/Традиционная китайская (_Big5)"
+
+#: src/compose.c:651 src/mainwindow.c:630 src/messageview.c:205
+#, fuzzy
+msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
+msgstr "/Вид/Кодировка/Традиционная китайская (EUC-_TW)"
+
+#: src/compose.c:655 src/mainwindow.c:636 src/messageview.c:210
+#, fuzzy
+msgid "/_View/Character _encoding/Korean (EUC-_KR)"
+msgstr "/Вид/Кодировка/Корейская (EUC-_KR)"
+
+#: src/compose.c:659 src/mainwindow.c:642 src/messageview.c:215
+#, fuzzy
+msgid "/_View/Character _encoding/Thai (TIS-620)"
+msgstr "/Вид/Кодировка/Тайская (TIS-620)"
+
+#: src/compose.c:661 src/mainwindow.c:644 src/messageview.c:217
+#, fuzzy
+msgid "/_View/Character _encoding/Thai (Windows-874)"
+msgstr "/Вид/Кодировка/Тайская (Windows-874)"
+
+#: src/compose.c:665 src/mainwindow.c:698 src/messageview.c:247
 msgid "/_Tools/_Address book"
 msgstr "/Инструменты/Адресная книга"
 
-#: src/compose.c:587
+#: src/compose.c:666
 msgid "/_Tools/_Template"
 msgstr "/Инструменты/Шаблон"
 
-#: src/compose.c:588 src/mainwindow.c:707 src/messageview.c:262
+#: src/compose.c:667 src/mainwindow.c:716 src/messageview.c:262
 msgid "/_Tools/Actio_ns"
 msgstr "/Инструменты/Действия"
 
-#: src/compose.c:589 src/compose.c:593 src/mainwindow.c:692
-#: src/mainwindow.c:706 src/mainwindow.c:708 src/mainwindow.c:711
-#: src/mainwindow.c:713 src/messageview.c:250 src/messageview.c:261
+#: src/compose.c:668 src/compose.c:672 src/mainwindow.c:701
+#: src/mainwindow.c:715 src/mainwindow.c:717 src/mainwindow.c:720
+#: src/mainwindow.c:722 src/messageview.c:250 src/messageview.c:261
 msgid "/_Tools/---"
 msgstr "/Инструменты/---"
 
-#: src/compose.c:590
+#: src/compose.c:669
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/Инструменты/Вызвать внешний редактор"
 
-#: src/compose.c:594
+#: src/compose.c:673
 msgid "/_Tools/PGP Si_gn"
 msgstr "/Инструменты/Подписать сообщение (PGP)"
 
-#: src/compose.c:595
+#: src/compose.c:674
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/Инструменты/Шифровать сообщение (PGP)"
 
-#: src/compose.c:800
+#: src/compose.c:879
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: файл не существует\n"
 
-#: src/compose.c:899 src/compose.c:958 src/procmsg.c:1303
+#: src/compose.c:978 src/compose.c:1037 src/procmsg.c:1303
 msgid "Can't get text part\n"
 msgstr "Ошибка получения части текста\n"
 
-#: src/compose.c:1340
+#: src/compose.c:1419
 msgid "Quote mark format error."
 msgstr "Неверный формат метки цитирования."
 
-#: src/compose.c:1352
+#: src/compose.c:1431
 msgid "Message reply/forward format error."
 msgstr "Неверный формат шаблона ответа или пересылки."
 
-#: src/compose.c:1679
+#: src/compose.c:1758
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Файл %s не найден\n"
 
-#: src/compose.c:1683
+#: src/compose.c:1762
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Ошибка определения размера файла %s\n"
 
-#: src/compose.c:1687
+#: src/compose.c:1766
 #, c-format
 msgid "File %s is empty."
 msgstr "Файл %s пустой."
 
-#: src/compose.c:1691
+#: src/compose.c:1770
 #, c-format
 msgid "Can't read %s."
 msgstr "Невозможно прочитать %s."
 
-#: src/compose.c:1726
+#: src/compose.c:1805
 #, c-format
 msgid "Message: %s"
 msgstr "Сообщение: %s"
 
-#: src/compose.c:1797 src/mimeview.c:491
+#: src/compose.c:1876 src/mimeview.c:491
 msgid "Can't get the part of multipart message."
 msgstr "Ошибка при получении одного из компонентов сообщения."
 
-#: src/compose.c:2188
+#: src/compose.c:2267
 msgid " [Edited]"
 msgstr " [Изменено]"
 
-#: src/compose.c:2190
+#: src/compose.c:2269
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Подготовка сообщения%s"
 
-#: src/compose.c:2193
+#: src/compose.c:2272
 #, c-format
 msgid "Compose message%s"
 msgstr "Подготовка сообщения%s"
 
-#: src/compose.c:2304
+#: src/compose.c:2383
 msgid "Recipient is not specified."
 msgstr "Получатель сообщения не указан."
 
-#: src/compose.c:2312 src/compose.c:4112 src/mainwindow.c:2144
+#: src/compose.c:2391 src/compose.c:4213 src/mainwindow.c:2153
 #: src/prefs_account.c:703 src/prefs_common.c:850
 msgid "Send"
 msgstr "Отправить"
 
-#: src/compose.c:2313
+#: src/compose.c:2392
 msgid "Subject is empty. Send it anyway?"
 msgstr "Тема сообщения не указана. Отправить без темы?"
 
-#: src/compose.c:2364
+#: src/compose.c:2443
 msgid "can't get recipient list."
 msgstr "ошибка определения списка получателей."
 
-#: src/compose.c:2384
+#: src/compose.c:2463
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -962,26 +1080,26 @@ msgstr ""
 "Учетная запись для отправки почты не определена.\n"
 "Пожалуйста, выберите ее перед отправкой."
 
-#: src/compose.c:2398 src/send_message.c:261
+#: src/compose.c:2477 src/send_message.c:261
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Произошла ошибка при отправке сообщения на %s ."
 
-#: src/compose.c:2421
+#: src/compose.c:2500
 msgid "Can't save the message to outbox."
 msgstr "Ошибка сохранения сообщения в папке отправленных."
 
-#: src/compose.c:2457
+#: src/compose.c:2536
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "Не найден ключ, соответствующий выбранному идентификатору '%s'."
 
-#: src/compose.c:2518 src/compose.c:2739 src/compose.c:2802 src/compose.c:2921
+#: src/compose.c:2597 src/compose.c:2820 src/compose.c:2883 src/compose.c:3003
 #: src/utils.c:2189
 msgid "can't change file mode\n"
 msgstr "не удалось изменить свойства файла\n"
 
-#: src/compose.c:2546
+#: src/compose.c:2627
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -991,140 +1109,140 @@ msgstr ""
 "из %s в %s.\n"
 "Все равно послать его?"
 
-#: src/compose.c:2610
+#: src/compose.c:2691
 msgid "can't write headers\n"
 msgstr "ошибка записи заголовков\n"
 
-#: src/compose.c:2881
+#: src/compose.c:2963
 msgid "can't remove the old message\n"
 msgstr "ошибка удаления старого сообщения\n"
 
-#: src/compose.c:2899
+#: src/compose.c:2981
 msgid "queueing message...\n"
 msgstr "постановка сообщения в очередь...\n"
 
-#: src/compose.c:2981
+#: src/compose.c:3063
 msgid "can't find queue folder\n"
 msgstr "невозможно найти папку очереди\n"
 
-#: src/compose.c:2988
+#: src/compose.c:3070
 msgid "can't queue the message\n"
 msgstr "ошибка размещения в очереди\n"
 
-#: src/compose.c:3547
+#: src/compose.c:3645
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "создан Message-ID: %s\n"
 
-#: src/compose.c:3645
+#: src/compose.c:3743
 msgid "Creating compose window...\n"
 msgstr "Создание окна подготовки сообщения...\n"
 
-#: src/compose.c:3648 src/compose.c:4598
+#: src/compose.c:3746 src/compose.c:4734
 msgid "MIME type"
 msgstr "Тип MIME"
 
 #. S_COL_DATE
-#: src/compose.c:3649 src/mimeview.c:150 src/prefs_filter_edit.c:569
+#: src/compose.c:3747 src/mimeview.c:150 src/prefs_filter_edit.c:569
 #: src/prefs_summary_column.c:73 src/select-keys.c:317 src/summaryview.c:386
 msgid "Size"
 msgstr "Размер"
 
-#: src/compose.c:3700 src/headerview.c:53 src/summary_search.c:169
+#: src/compose.c:3798 src/headerview.c:53 src/summary_search.c:169
 msgid "From:"
 msgstr "От:"
 
-#: src/compose.c:4113
+#: src/compose.c:4214
 msgid "Send message"
 msgstr "Отправить сообщение"
 
-#: src/compose.c:4121
+#: src/compose.c:4222
 msgid "Send later"
 msgstr "Отправить позже"
 
-#: src/compose.c:4122
+#: src/compose.c:4223
 msgid "Put into queue folder and send later"
 msgstr "Поместить в очередь и отправить позже"
 
-#: src/compose.c:4130
+#: src/compose.c:4231
 msgid "Draft"
 msgstr "Черновики"
 
-#: src/compose.c:4131
+#: src/compose.c:4232
 msgid "Save to draft folder"
 msgstr "Сохранить в папке черновиков"
 
-#: src/compose.c:4141 src/compose.c:5382
+#: src/compose.c:4242 src/compose.c:5527
 msgid "Insert"
 msgstr "Вставить"
 
-#: src/compose.c:4142
+#: src/compose.c:4243
 msgid "Insert file"
 msgstr "Вставить файл"
 
-#: src/compose.c:4150
+#: src/compose.c:4251
 msgid "Attach"
 msgstr "Вложение"
 
-#: src/compose.c:4151
+#: src/compose.c:4252
 msgid "Attach file"
 msgstr "Вложить файл"
 
 #. signature
-#: src/compose.c:4161 src/prefs_account.c:1339 src/prefs_common.c:1261
+#: src/compose.c:4262 src/prefs_account.c:1339 src/prefs_common.c:1273
 msgid "Signature"
 msgstr "Подпись"
 
-#: src/compose.c:4162
+#: src/compose.c:4263
 msgid "Insert signature"
 msgstr "Добавить подпись"
 
-#: src/compose.c:4171 src/prefs_common.c:1283 src/prefs_common.c:2165
+#: src/compose.c:4272 src/prefs_common.c:1295 src/prefs_common.c:2177
 msgid "Editor"
 msgstr "Редактор"
 
-#: src/compose.c:4172
+#: src/compose.c:4273
 msgid "Edit with external editor"
 msgstr "Править внешним редактором"
 
-#: src/compose.c:4180
+#: src/compose.c:4281
 msgid "Linewrap"
 msgstr "Перенос строк"
 
-#: src/compose.c:4181
+#: src/compose.c:4282
 msgid "Wrap all long lines"
 msgstr "Отформатировать все сообщение"
 
-#: src/compose.c:4492
+#: src/compose.c:4628
 msgid "Invalid MIME type."
 msgstr "Неверный тип MIME."
 
-#: src/compose.c:4511
+#: src/compose.c:4647
 msgid "File doesn't exist or is empty."
 msgstr "Файл не существует или пуст."
 
-#: src/compose.c:4580
+#: src/compose.c:4716
 msgid "Properties"
 msgstr "Свойства"
 
-#: src/compose.c:4600
+#: src/compose.c:4736
 msgid "Encoding"
 msgstr "Кодировка"
 
-#: src/compose.c:4623 src/prefs_folder_item.c:183
+#: src/compose.c:4759 src/prefs_folder_item.c:183
 msgid "Path"
 msgstr "Путь"
 
-#: src/compose.c:4624
+#: src/compose.c:4760
 msgid "File name"
 msgstr "Имя файла"
 
-#: src/compose.c:4778
+#: src/compose.c:4914
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Неверная команда вызова внешнего редактора: '%s'\n"
 
-#: src/compose.c:4804
+#: src/compose.c:4940
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1135,72 +1253,72 @@ msgstr ""
 "Завершить процесс принудительно?\n"
 "Идентификатор группы процессов: %d"
 
-#: src/compose.c:4817
+#: src/compose.c:4953
 #, c-format
 msgid "Terminated process group id: %d"
 msgstr "Завершен процесс группы: %d"
 
-#: src/compose.c:4818
+#: src/compose.c:4954
 #, c-format
 msgid "Temporary file: %s"
 msgstr "Временный файл: %s"
 
-#: src/compose.c:4842
+#: src/compose.c:4978
 msgid "Compose: input from monitoring process\n"
 msgstr "Подготовка сообщения: ввод из процесса слежения\n"
 
 #. failed
-#: src/compose.c:4875
+#: src/compose.c:5011
 msgid "Couldn't exec external editor\n"
 msgstr "Не удалось запустить внешний редактор\n"
 
-#: src/compose.c:4879
+#: src/compose.c:5015
 msgid "Couldn't write to file\n"
 msgstr "Ошибка записи в файл\n"
 
-#: src/compose.c:4881
+#: src/compose.c:5017
 msgid "Pipe read failed\n"
 msgstr "Ошибка чтения из канала\n"
 
-#: src/compose.c:5182 src/compose.c:5190 src/compose.c:5196
+#: src/compose.c:5318 src/compose.c:5326 src/compose.c:5332
 msgid "Can't queue the message."
 msgstr "Ошибка постановки в очередь."
 
-#: src/compose.c:5287
+#: src/compose.c:5423
 #, fuzzy
 msgid "Select files"
 msgstr "Выбор файла"
 
-#: src/compose.c:5309
+#: src/compose.c:5445
 msgid "Select file"
 msgstr "Выбор файла"
 
-#: src/compose.c:5344
+#: src/compose.c:5480
 msgid "Discard message"
 msgstr "Отказ от сообщения"
 
-#: src/compose.c:5345
+#: src/compose.c:5481
 msgid "This message has been modified. discard it?"
 msgstr "Это сообщение изменено. Отказаться от него?"
 
-#: src/compose.c:5346
+#: src/compose.c:5482
 msgid "Discard"
 msgstr "Отказаться"
 
-#: src/compose.c:5346
+#: src/compose.c:5482
 msgid "to Draft"
 msgstr "В черновики"
 
-#: src/compose.c:5379
+#: src/compose.c:5524
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Применить шаблон '%s'?"
 
-#: src/compose.c:5381
+#: src/compose.c:5526
 msgid "Apply template"
 msgstr "Применить шаблон"
 
-#: src/compose.c:5382
+#: src/compose.c:5527
 msgid "Replace"
 msgstr "Заменить"
 
@@ -1640,12 +1758,12 @@ msgstr "Установка информации о папке...\n"
 msgid "Setting folder info..."
 msgstr "Установка информации о папке..."
 
-#: src/folderview.c:652 src/mainwindow.c:3190 src/setup.c:81
+#: src/folderview.c:652 src/mainwindow.c:3199 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Просмотр папки %s%c%s ..."
 
-#: src/folderview.c:656 src/mainwindow.c:3195 src/setup.c:86
+#: src/folderview.c:656 src/mainwindow.c:3204 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Просмотр папки %s ..."
@@ -2101,7 +2219,7 @@ msgstr "Импорт файла LDIF в адресную книгу"
 msgid "Prev"
 msgstr "Назад"
 
-#: src/importldif.c:761 src/mainwindow.c:2230
+#: src/importldif.c:761 src/mainwindow.c:2239
 msgid "Next"
 msgstr "Далее"
 
@@ -2551,7 +2669,8 @@ msgid "/_View/Separate f_older tree"
 msgstr "/Вид/Отдельное дерево папок"
 
 #: src/mainwindow.c:514
-msgid "/_View/Separate m_essage view"
+#, fuzzy
+msgid "/_View/Separate _message view"
 msgstr "/Вид/Отдельная область просмотра"
 
 #: src/mainwindow.c:516
@@ -2687,422 +2806,340 @@ msgstr "/Вид/Перейти/Следующее выделенное цвет�
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/Вид/Перейти/К другой папке..."
 
-#: src/mainwindow.c:568 src/mainwindow.c:575 src/messageview.c:150
-msgid "/_View/_Code set/---"
-msgstr "/Вид/Кодировка/---"
-
-#: src/mainwindow.c:572 src/messageview.c:154
-msgid "/_View/_Code set"
-msgstr "/Вид/Кодировка"
-
 #: src/mainwindow.c:573 src/messageview.c:155
-msgid "/_View/_Code set/_Auto detect"
+#, fuzzy
+msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/Вид/Кодировка/Автоопределение"
 
-#: src/mainwindow.c:576 src/messageview.c:158
-msgid "/_View/_Code set/7bit ascii (US-ASC_II)"
-msgstr "/Вид/Кодировка/7-битный ascii (US-ASC_II)"
-
-#: src/mainwindow.c:579 src/messageview.c:161
-msgid "/_View/_Code set/Unicode (_UTF-8)"
-msgstr "/Вид/Кодировка/Unicode (_UTF-8)"
-
-#: src/mainwindow.c:582 src/messageview.c:164
-msgid "/_View/_Code set/Western European (ISO-8859-_1)"
-msgstr "/Вид/Кодировка/Западноевропейская (ISO-8859-_1)"
-
-#: src/mainwindow.c:584 src/messageview.c:166
-msgid "/_View/_Code set/Western European (ISO-8859-15)"
-msgstr "/Вид/Кодировка/Западноевропейская (ISO-8859-15)"
-
-#: src/mainwindow.c:587 src/messageview.c:169
-msgid "/_View/_Code set/Central European (ISO-8859-_2)"
-msgstr "/Вид/Кодировка/Центральноевропейская (ISO-8859-_2)"
-
-#: src/mainwindow.c:590 src/messageview.c:172
-msgid "/_View/_Code set/_Baltic (ISO-8859-13)"
-msgstr "/Вид/Кодировка/Балтийская (ISO-8859-13)"
-
-#: src/mainwindow.c:592 src/messageview.c:174
-msgid "/_View/_Code set/Baltic (ISO-8859-_4)"
-msgstr "/Вид/Кодировка/Балтийская (ISO-8859-_4)"
-
-#: src/mainwindow.c:595 src/messageview.c:177
-msgid "/_View/_Code set/Greek (ISO-8859-_7)"
-msgstr "/Вид/Кодировка/Греческая (ISO-8859-_7)"
-
-#: src/mainwindow.c:598 src/messageview.c:180
-msgid "/_View/_Code set/Turkish (ISO-8859-_9)"
-msgstr "/Вид/Кодировка/Турецкая (ISO-8859-_9)"
-
-#: src/mainwindow.c:601 src/messageview.c:183
-msgid "/_View/_Code set/Cyrillic (ISO-8859-_5)"
-msgstr "/Вид/Кодировка/Кириллическая (ISO-8859-_5)"
-
-#: src/mainwindow.c:603 src/messageview.c:185
-msgid "/_View/_Code set/Cyrillic (KOI8-_R)"
-msgstr "/Вид/Кодировка/Русская (KOI8-_R)"
-
-#: src/mainwindow.c:605 src/messageview.c:187
-msgid "/_View/_Code set/Cyrillic (KOI8-U)"
-msgstr "/Вид/Кодировка/Украинская (KOI8-_U)"
-
-#: src/mainwindow.c:607 src/messageview.c:189
-msgid "/_View/_Code set/Cyrillic (Windows-1251)"
-msgstr "/Вид/Кодировка/Кириллическая _Win (Windows-1251)"
-
-#: src/mainwindow.c:610 src/messageview.c:192
-msgid "/_View/_Code set/Japanese (ISO-2022-_JP)"
-msgstr "/Вид/Кодировка/Японская (ISO-2022-_JP)"
-
-#: src/mainwindow.c:612 src/messageview.c:194
-msgid "/_View/_Code set/Japanese (ISO-2022-JP-2)"
+#: src/mainwindow.c:618 src/messageview.c:194
+#, fuzzy
+msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/Вид/Кодировка/Японская (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:614 src/messageview.c:196
-msgid "/_View/_Code set/Japanese (_EUC-JP)"
+#: src/mainwindow.c:620 src/messageview.c:196
+#, fuzzy
+msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/Вид/Кодировка/Японская (_EUC-JP)"
 
-#: src/mainwindow.c:616 src/messageview.c:198
-msgid "/_View/_Code set/Japanese (_Shift__JIS)"
+#: src/mainwindow.c:622 src/messageview.c:198
+#, fuzzy
+msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/Вид/Кодировка/Японская (_Shift__JIS)"
 
-#: src/mainwindow.c:619 src/messageview.c:201
-msgid "/_View/_Code set/Simplified Chinese (_GB2312)"
-msgstr "/Вид/Кодировка/Упрощенная китайская (_GB2312)"
-
-#: src/mainwindow.c:621 src/messageview.c:203
-msgid "/_View/_Code set/Traditional Chinese (_Big5)"
-msgstr "/Вид/Кодировка/Традиционная китайская (_Big5)"
-
-#: src/mainwindow.c:623 src/messageview.c:205
-msgid "/_View/_Code set/Traditional Chinese (EUC-_TW)"
-msgstr "/Вид/Кодировка/Традиционная китайская (EUC-_TW)"
-
-#: src/mainwindow.c:625 src/messageview.c:207
-msgid "/_View/_Code set/Chinese (ISO-2022-_CN)"
+#: src/mainwindow.c:632 src/messageview.c:207
+#, fuzzy
+msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/Вид/Кодировка/Китайская (ISO-2022-_CN)"
 
-#: src/mainwindow.c:628 src/messageview.c:210
-msgid "/_View/_Code set/Korean (EUC-_KR)"
-msgstr "/Вид/Кодировка/Корейская (EUC-_KR)"
-
-#: src/mainwindow.c:630 src/messageview.c:212
-msgid "/_View/_Code set/Korean (ISO-2022-KR)"
+#: src/mainwindow.c:638 src/messageview.c:212
+#, fuzzy
+msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/Вид/Кодировка/Корейская (ISO-2022-KR)"
 
-#: src/mainwindow.c:633 src/messageview.c:215
-msgid "/_View/_Code set/Thai (TIS-620)"
-msgstr "/Вид/Кодировка/Тайская (TIS-620)"
-
-#: src/mainwindow.c:635 src/messageview.c:217
-msgid "/_View/_Code set/Thai (Windows-874)"
-msgstr "/Вид/Кодировка/Тайская (Windows-874)"
-
-#: src/mainwindow.c:642 src/summaryview.c:371
+#: src/mainwindow.c:651 src/summaryview.c:371
 msgid "/_View/Open in new _window"
 msgstr "/Вид/Открыть в новом окне"
 
-#: src/mainwindow.c:643 src/messageview.c:224
+#: src/mainwindow.c:652 src/messageview.c:224
 msgid "/_View/Mess_age source"
 msgstr "/Вид/Показать исходный текст"
 
-#: src/mainwindow.c:644 src/messageview.c:225
+#: src/mainwindow.c:653 src/messageview.c:225
 msgid "/_View/Show all _header"
 msgstr "/Вид/Показать все заголовки"
 
-#: src/mainwindow.c:646
+#: src/mainwindow.c:655
 msgid "/_View/_Update summary"
 msgstr "/Вид/Обновить список сообщений"
 
-#: src/mainwindow.c:648 src/messageview.c:227
+#: src/mainwindow.c:657 src/messageview.c:227
 msgid "/_Message"
 msgstr "/Сообщение"
 
-#: src/mainwindow.c:649
+#: src/mainwindow.c:658
 msgid "/_Message/Recei_ve"
 msgstr "/Сообщение/Получить"
 
-#: src/mainwindow.c:650
+#: src/mainwindow.c:659
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/Сообщение/Получить/Получить с текущей учетной записи"
 
-#: src/mainwindow.c:652
+#: src/mainwindow.c:661
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/Сообщение/Получить/Получить со всех учетных записей"
 
-#: src/mainwindow.c:654
+#: src/mainwindow.c:663
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/Сообщение/Получить/Прервать получение сообщений"
 
-#: src/mainwindow.c:656
+#: src/mainwindow.c:665
 msgid "/_Message/Recei_ve/---"
 msgstr "/Сообщение/Получить/---"
 
-#: src/mainwindow.c:657
+#: src/mainwindow.c:666
 msgid "/_Message/_Send queued messages"
 msgstr "/Сообщение/Отправить сообщения из очереди"
 
-#: src/mainwindow.c:658 src/mainwindow.c:660 src/mainwindow.c:667
-#: src/mainwindow.c:672 src/mainwindow.c:676 src/mainwindow.c:685
+#: src/mainwindow.c:667 src/mainwindow.c:669 src/mainwindow.c:676
+#: src/mainwindow.c:681 src/mainwindow.c:685 src/mainwindow.c:694
 #: src/messageview.c:230 src/messageview.c:238 src/messageview.c:243
 msgid "/_Message/---"
 msgstr "/Сообщение/---"
 
-#: src/mainwindow.c:659 src/messageview.c:228
+#: src/mainwindow.c:668 src/messageview.c:228
 msgid "/_Message/Compose _new message"
 msgstr "/Сообщение/Написать новое сообщение"
 
-#: src/mainwindow.c:661 src/messageview.c:231
+#: src/mainwindow.c:670 src/messageview.c:231
 msgid "/_Message/_Reply"
 msgstr "/Сообщение/Ответить"
 
-#: src/mainwindow.c:662
+#: src/mainwindow.c:671
 msgid "/_Message/Repl_y to"
 msgstr "/Сообщение/Ответить..."
 
-#: src/mainwindow.c:663 src/messageview.c:232
+#: src/mainwindow.c:672 src/messageview.c:232
 msgid "/_Message/Repl_y to/_all"
 msgstr "/Сообщение/Ответить.../Всем"
 
-#: src/mainwindow.c:664 src/messageview.c:234
+#: src/mainwindow.c:673 src/messageview.c:234
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/Сообщение/Ответить.../Отправителю"
 
-#: src/mainwindow.c:665 src/messageview.c:236
+#: src/mainwindow.c:674 src/messageview.c:236
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/Сообщение/Ответить.../В список рассылки"
 
-#: src/mainwindow.c:668 src/messageview.c:239
+#: src/mainwindow.c:677 src/messageview.c:239
 msgid "/_Message/_Forward"
 msgstr "/Сообщение/Переслать"
 
-#: src/mainwindow.c:669 src/messageview.c:240
+#: src/mainwindow.c:678 src/messageview.c:240
 msgid "/_Message/For_ward as attachment"
 msgstr "/Сообщение/Переслать как вложение"
 
-#: src/mainwindow.c:671 src/messageview.c:242
+#: src/mainwindow.c:680 src/messageview.c:242
 msgid "/_Message/Redirec_t"
 msgstr "/Сообщение/Перенаправить без изменений"
 
-#: src/mainwindow.c:673
+#: src/mainwindow.c:682
 msgid "/_Message/M_ove..."
 msgstr "/Сообщение/Переместить..."
 
-#: src/mainwindow.c:674
+#: src/mainwindow.c:683
 msgid "/_Message/_Copy..."
 msgstr "/Сообщение/Копировать..."
 
-#: src/mainwindow.c:675
+#: src/mainwindow.c:684
 msgid "/_Message/_Delete"
 msgstr "/Сообщение/Удалить"
 
-#: src/mainwindow.c:677
+#: src/mainwindow.c:686
 msgid "/_Message/_Mark"
 msgstr "/Сообщение/Отметить"
 
-#: src/mainwindow.c:678
+#: src/mainwindow.c:687
 msgid "/_Message/_Mark/_Mark"
 msgstr "/Сообщение/Отметить/Отметить"
 
-#: src/mainwindow.c:679
+#: src/mainwindow.c:688
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/Сообщение/Отметить/Снять отметку"
 
-#: src/mainwindow.c:680
+#: src/mainwindow.c:689
 msgid "/_Message/_Mark/---"
 msgstr "/Сообщение/Отметить/---"
 
-#: src/mainwindow.c:681
+#: src/mainwindow.c:690
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/Сообщение/Отметить/Пометить как непрочитанное"
 
-#: src/mainwindow.c:682
+#: src/mainwindow.c:691
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/Сообщение/Отметить/Пометить как прочитанное"
 
-#: src/mainwindow.c:684
+#: src/mainwindow.c:693
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/Сообщение/Отметить/Пометить все сообщения как прочитанные"
 
-#: src/mainwindow.c:686 src/messageview.c:244
+#: src/mainwindow.c:695 src/messageview.c:244
 msgid "/_Message/Re-_edit"
 msgstr "/Сообщение/Изменить"
 
-#: src/mainwindow.c:690 src/messageview.c:248
+#: src/mainwindow.c:699 src/messageview.c:248
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/Инструменты/Добавить отправителя в адресную книгу"
 
-#: src/mainwindow.c:693
+#: src/mainwindow.c:702
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/Инструменты/Отфильтровать все сообщения в папке"
 
-#: src/mainwindow.c:695
+#: src/mainwindow.c:704
 msgid "/_Tools/Filter _selected messages"
 msgstr "/Инструменты/Отфильтровать выбранные сообщения"
 
-#: src/mainwindow.c:697 src/messageview.c:251
+#: src/mainwindow.c:706 src/messageview.c:251
 msgid "/_Tools/_Create filter rule"
 msgstr "/Инструменты/Создать правило фильтрации"
 
-#: src/mainwindow.c:698 src/messageview.c:253
+#: src/mainwindow.c:707 src/messageview.c:253
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/Инструменты/Создать правило фильтрации/Автоматически"
 
-#: src/mainwindow.c:700 src/messageview.c:255
+#: src/mainwindow.c:709 src/messageview.c:255
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/Инструменты/Создать правило фильтрации/По отправителю"
 
-#: src/mainwindow.c:702 src/messageview.c:257
+#: src/mainwindow.c:711 src/messageview.c:257
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/Инструменты/Создать правило фильтрации/По получателю"
 
-#: src/mainwindow.c:704 src/messageview.c:259
+#: src/mainwindow.c:713 src/messageview.c:259
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/Инструменты/Создать правило фильтрации/По теме"
 
-#: src/mainwindow.c:709
+#: src/mainwindow.c:718
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/Инструменты/Удалить повторяющиеся сообщения"
 
-#: src/mainwindow.c:712
+#: src/mainwindow.c:721
 msgid "/_Tools/E_xecute"
 msgstr "/Инструменты/Выполнить"
 
-#: src/mainwindow.c:714
+#: src/mainwindow.c:723
 msgid "/_Tools/_Log window"
 msgstr "/Инструменты/Окно журнала"
 
-#: src/mainwindow.c:716
+#: src/mainwindow.c:725
 msgid "/_Configuration"
 msgstr "/Настройка"
 
-#: src/mainwindow.c:717
+#: src/mainwindow.c:726
 msgid "/_Configuration/_Common preferences..."
 msgstr "/Настройка/Общие настройки..."
 
-#: src/mainwindow.c:719
+#: src/mainwindow.c:728
 msgid "/_Configuration/_Filter setting..."
 msgstr "/Настройка/Настройка фильтров..."
 
-#: src/mainwindow.c:721
+#: src/mainwindow.c:730
 msgid "/_Configuration/_Template..."
 msgstr "/Настройка/Шаблоны..."
 
-#: src/mainwindow.c:722
+#: src/mainwindow.c:731
 msgid "/_Configuration/_Actions..."
 msgstr "/Настройка/Действия..."
 
-#: src/mainwindow.c:723
+#: src/mainwindow.c:732
 msgid "/_Configuration/---"
 msgstr "/Настройка/---"
 
-#: src/mainwindow.c:724
+#: src/mainwindow.c:733
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/Настройка/Настройка текущей учетной записи... "
 
-#: src/mainwindow.c:726
+#: src/mainwindow.c:735
 msgid "/_Configuration/Create _new account..."
 msgstr "/Настройка/Создать новую учетную запись..."
 
-#: src/mainwindow.c:728
+#: src/mainwindow.c:737
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/Настройка/Редактирование учетных записей..."
 
-#: src/mainwindow.c:730
+#: src/mainwindow.c:739
 msgid "/_Configuration/C_hange current account"
 msgstr "/Настройка/Переключить текущую учетную запись"
 
-#: src/mainwindow.c:734
+#: src/mainwindow.c:743
 msgid "/_Help/_Manual"
 msgstr "/Справка/Руководство"
 
-#: src/mainwindow.c:735
+#: src/mainwindow.c:744
 msgid "/_Help/_Manual/_English"
 msgstr "/Справка/Руководство/Английское"
 
-#: src/mainwindow.c:736
+#: src/mainwindow.c:745
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/Справка/Руководство/Японское"
 
-#: src/mainwindow.c:737
+#: src/mainwindow.c:746
 msgid "/_Help/_FAQ"
 msgstr "/Справка/FAQ"
 
-#: src/mainwindow.c:738
+#: src/mainwindow.c:747
 msgid "/_Help/_FAQ/_English"
 msgstr "/Справка/FAQ/Английский"
 
-#: src/mainwindow.c:739
+#: src/mainwindow.c:748
 msgid "/_Help/_FAQ/_German"
 msgstr "/Справка/FAQ/Немецкий"
 
-#: src/mainwindow.c:740
+#: src/mainwindow.c:749
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/Справка/FAQ/Испанский"
 
-#: src/mainwindow.c:741
+#: src/mainwindow.c:750
 msgid "/_Help/_FAQ/_French"
 msgstr "/Справка/FAQ/Французский"
 
-#: src/mainwindow.c:742
+#: src/mainwindow.c:751
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/Справка/FAQ/Итальянский"
 
-#: src/mainwindow.c:743
+#: src/mainwindow.c:752
 msgid "/_Help/---"
 msgstr "/Справка/---"
 
-#: src/mainwindow.c:783
+#: src/mainwindow.c:792
 msgid "Creating main window...\n"
 msgstr "Создание главного окна...\n"
 
-#: src/mainwindow.c:943
+#: src/mainwindow.c:952
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Главное окно: проблема с цветом %d\n"
 
-#: src/mainwindow.c:1021 src/summaryview.c:1368 src/summaryview.c:1677
+#: src/mainwindow.c:1030 src/summaryview.c:1368 src/summaryview.c:1677
 #: src/summaryview.c:1785 src/summaryview.c:1831 src/summaryview.c:2453
 #: src/summaryview.c:3080 src/summaryview.c:3146 src/summaryview.c:3171
 #: src/summaryview.c:3284
 msgid "done.\n"
 msgstr "выполнено.\n"
 
-#: src/mainwindow.c:1137 src/mainwindow.c:1178 src/mainwindow.c:1206
+#: src/mainwindow.c:1146 src/mainwindow.c:1187 src/mainwindow.c:1215
 msgid "Untitled"
 msgstr "Без названия"
 
-#: src/mainwindow.c:1207
+#: src/mainwindow.c:1216
 msgid "none"
 msgstr "нет"
 
-#: src/mainwindow.c:1257
+#: src/mainwindow.c:1266
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "Изменение типа разделения окна с %d на %d\n"
 
-#: src/mainwindow.c:1477
+#: src/mainwindow.c:1486
 msgid "Offline"
 msgstr "Автономная работа"
 
-#: src/mainwindow.c:1478
+#: src/mainwindow.c:1487
 msgid "You are offline. Go online?"
 msgstr "Вы работаете в автономном режиме. Подключиться к сети?"
 
-#: src/mainwindow.c:1492
+#: src/mainwindow.c:1501
 msgid "Empty all trash"
 msgstr "Очистить все корзины"
 
-#: src/mainwindow.c:1493
+#: src/mainwindow.c:1502
 msgid "Empty messages in all trash?"
 msgstr "Удалить все сообщения из всех корзин?"
 
-#: src/mainwindow.c:1521
+#: src/mainwindow.c:1530
 msgid "Add mailbox"
 msgstr "Добавить почтовый ящик"
 
-#: src/mainwindow.c:1522
+#: src/mainwindow.c:1531
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3112,16 +3149,16 @@ msgstr ""
 "Если будет указан существующий ящик, то он\n"
 "будет автоматически прочитан."
 
-#: src/mainwindow.c:1528
+#: src/mainwindow.c:1537
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Почтовый ящик '%s' уже существует."
 
-#: src/mainwindow.c:1533 src/setup.c:57
+#: src/mainwindow.c:1542 src/setup.c:57
 msgid "Mailbox"
 msgstr "Почтовый ящик"
 
-#: src/mainwindow.c:1539 src/setup.c:63
+#: src/mainwindow.c:1548 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3131,142 +3168,142 @@ msgstr ""
 "Может быть, некоторые файлы уже существуют, или вы не имеете прав на запись "
 "в каталоге."
 
-#: src/mainwindow.c:1912
+#: src/mainwindow.c:1921
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Папки"
 
-#: src/mainwindow.c:1932 src/messageview.c:358
+#: src/mainwindow.c:1941 src/messageview.c:358
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Сообщение"
 
-#: src/mainwindow.c:2079 src/summaryview.c:340
+#: src/mainwindow.c:2088 src/summaryview.c:340
 msgid "/_Reply"
 msgstr "/Ответить"
 
-#: src/mainwindow.c:2080
+#: src/mainwindow.c:2089
 msgid "/Reply to _all"
 msgstr "/Ответить всем"
 
-#: src/mainwindow.c:2081
+#: src/mainwindow.c:2090
 msgid "/Reply to _sender"
 msgstr "/Ответить отправителю"
 
-#: src/mainwindow.c:2082
+#: src/mainwindow.c:2091
 msgid "/Reply to mailing _list"
 msgstr "/Ответить в список рассылки"
 
-#: src/mainwindow.c:2087 src/summaryview.c:347
+#: src/mainwindow.c:2096 src/summaryview.c:347
 msgid "/_Forward"
 msgstr "/Переслать"
 
-#: src/mainwindow.c:2088 src/summaryview.c:348
+#: src/mainwindow.c:2097 src/summaryview.c:348
 msgid "/For_ward as attachment"
 msgstr "/Переслать как вложение"
 
-#: src/mainwindow.c:2089 src/summaryview.c:349
+#: src/mainwindow.c:2098 src/summaryview.c:349
 msgid "/Redirec_t"
 msgstr "/Перенаправить без изменений"
 
-#: src/mainwindow.c:2125
+#: src/mainwindow.c:2134
 msgid "Get"
 msgstr "Принять"
 
-#: src/mainwindow.c:2126
+#: src/mainwindow.c:2135
 msgid "Incorporate new mail"
 msgstr "Получить новые сообщения"
 
-#: src/mainwindow.c:2133
+#: src/mainwindow.c:2142
 msgid "Get all"
 msgstr "Принять все"
 
-#: src/mainwindow.c:2134
+#: src/mainwindow.c:2143
 msgid "Incorporate new mail of all accounts"
 msgstr "Получить сообщения со всех учетных записей"
 
-#: src/mainwindow.c:2145
+#: src/mainwindow.c:2154
 msgid "Send queued message(s)"
 msgstr "Послать сообщения из очереди"
 
-#: src/mainwindow.c:2155 src/prefs_account.c:705 src/prefs_common.c:852
+#: src/mainwindow.c:2164 src/prefs_account.c:705 src/prefs_common.c:852
 #: src/prefs_folder_item.c:137
 msgid "Compose"
 msgstr "Написать"
 
-#: src/mainwindow.c:2156
+#: src/mainwindow.c:2165
 msgid "Compose new message"
 msgstr "Написать новое сообщение"
 
-#: src/mainwindow.c:2164 src/prefs_common.c:1353
+#: src/mainwindow.c:2173 src/prefs_common.c:1365
 msgid "Reply"
 msgstr "Ответить"
 
-#: src/mainwindow.c:2165 src/mainwindow.c:2178
+#: src/mainwindow.c:2174 src/mainwindow.c:2187
 msgid "Reply to the message"
 msgstr "Ответить на сообщение"
 
-#: src/mainwindow.c:2183
+#: src/mainwindow.c:2192
 msgid "Reply all"
 msgstr "Ответить всем"
 
-#: src/mainwindow.c:2184
+#: src/mainwindow.c:2193
 msgid "Reply to all"
 msgstr "Ответить всем"
 
-#: src/mainwindow.c:2192 src/prefs_filter_edit.c:719
+#: src/mainwindow.c:2201 src/prefs_filter_edit.c:719
 msgid "Forward"
 msgstr "Переслать"
 
-#: src/mainwindow.c:2193 src/mainwindow.c:2206
+#: src/mainwindow.c:2202 src/mainwindow.c:2215
 msgid "Forward the message"
 msgstr "Переслать сообщение"
 
-#: src/mainwindow.c:2213
+#: src/mainwindow.c:2222
 msgid "Delete the message"
 msgstr "Удалить сообщение"
 
-#: src/mainwindow.c:2221
+#: src/mainwindow.c:2230
 msgid "Execute"
 msgstr "Выполнить"
 
-#: src/mainwindow.c:2222
+#: src/mainwindow.c:2231
 msgid "Execute marked process"
 msgstr "Выполнить отмеченный процесс"
 
-#: src/mainwindow.c:2231
+#: src/mainwindow.c:2240
 msgid "Next unread message"
 msgstr "Следующее непрочитанное сообщение"
 
-#: src/mainwindow.c:2242
+#: src/mainwindow.c:2251
 msgid "Prefs"
 msgstr "Свойства"
 
-#: src/mainwindow.c:2243
+#: src/mainwindow.c:2252
 msgid "Common preferences"
 msgstr "Общие настройки"
 
-#: src/mainwindow.c:2250 src/prefs_folder_item.c:258
+#: src/mainwindow.c:2259 src/prefs_folder_item.c:258
 #: src/prefs_folder_item.c:269 src/progressdialog.c:50
 msgid "Account"
 msgstr "Учетная запись"
 
-#: src/mainwindow.c:2251
+#: src/mainwindow.c:2260
 msgid "Account setting"
 msgstr "Настройка учетной записи"
 
-#: src/mainwindow.c:2425
+#: src/mainwindow.c:2434
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 "Вы работаете в автономном режиме. Щелкните по значку, чтобы подключиться."
 
-#: src/mainwindow.c:2436
+#: src/mainwindow.c:2445
 msgid "You are online. Click the icon to go offline."
 msgstr "Вы подключены. Щелкните по значку, чтобы работать автономно."
 
-#: src/mainwindow.c:2624
+#: src/mainwindow.c:2633
 msgid "Exit"
 msgstr "Выход"
 
-#: src/mainwindow.c:2624
+#: src/mainwindow.c:2633
 msgid "Exit this program?"
 msgstr "Выйти из программы?"
 
@@ -3393,7 +3430,7 @@ msgstr "Поиск закончен"
 msgid "Creating message view...\n"
 msgstr "Создание области просмотра сообщения...\n"
 
-#: src/messageview.c:303 src/prefs_common.c:1550
+#: src/messageview.c:303 src/prefs_common.c:1562
 msgid "Text"
 msgstr "Текст"
 
@@ -3406,7 +3443,7 @@ msgstr "Вложения"
 msgid "Can't save the file `%s'."
 msgstr "Ошибка при сохранении файла '%s'."
 
-#: src/messageview.c:697 src/prefs_common.c:2154 src/summaryview.c:2744
+#: src/messageview.c:697 src/prefs_common.c:2166 src/summaryview.c:2744
 msgid "Print"
 msgstr "Печать"
 
@@ -3879,7 +3916,7 @@ msgstr "(Неотфильтрованные сообщения будут сох
 msgid "Authentication method"
 msgstr "Метод аутентификации"
 
-#: src/prefs_account.c:1123 src/prefs_account.c:1239 src/prefs_common.c:1189
+#: src/prefs_account.c:1123 src/prefs_account.c:1239 src/prefs_common.c:1201
 msgid "Automatic"
 msgstr "Автоматически"
 
@@ -3903,7 +3940,7 @@ msgstr "Создавать Message-ID"
 msgid "Add user-defined header"
 msgstr "Добавить дополнительные заголовки"
 
-#: src/prefs_account.c:1196 src/prefs_common.c:1714 src/prefs_common.c:1739
+#: src/prefs_account.c:1196 src/prefs_common.c:1726 src/prefs_common.c:1751
 msgid " Edit... "
 msgstr " Определить... "
 
@@ -4298,106 +4335,107 @@ msgid "Save sent messages to outbox"
 msgstr "Сохранять отправленные сообщения в папке \"Отправленные\""
 
 #: src/prefs_common.c:1113
-msgid "Outgoing codeset"
+#, fuzzy
+msgid "Outgoing encoding"
 msgstr "Кодировка отправляемых сообщений"
 
 #: src/prefs_common.c:1128
 msgid "Automatic (Recommended)"
 msgstr "Автоматически (Рекомендуется)"
 
-#: src/prefs_common.c:1129
+#: src/prefs_common.c:1130
 msgid "7bit ascii (US-ASCII)"
 msgstr "7 бит ascii (US-ASCII)"
 
-#: src/prefs_common.c:1130
+#: src/prefs_common.c:1132
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
-#: src/prefs_common.c:1131
+#: src/prefs_common.c:1134
 msgid "Western European (ISO-8859-1)"
 msgstr "Западноевропейская (ISO-8859-1)"
 
-#: src/prefs_common.c:1132
+#: src/prefs_common.c:1135
 msgid "Western European (ISO-8859-15)"
 msgstr "Западноевропейская (ISO-8859-15)"
 
-#: src/prefs_common.c:1133
+#: src/prefs_common.c:1137
 msgid "Central European (ISO-8859-2)"
 msgstr "Центральноевропейская (ISO-8859-2)"
 
-#: src/prefs_common.c:1134
+#: src/prefs_common.c:1139
 msgid "Baltic (ISO-8859-13)"
 msgstr "Балтийская (ISO-8859-13)"
 
-#: src/prefs_common.c:1135
+#: src/prefs_common.c:1140
 msgid "Baltic (ISO-8859-4)"
 msgstr "Балтийская (ISO-8859-4)"
 
-#: src/prefs_common.c:1136
+#: src/prefs_common.c:1142
 msgid "Greek (ISO-8859-7)"
 msgstr "Греческая (ISO-8859-7)"
 
-#: src/prefs_common.c:1137
+#: src/prefs_common.c:1144
 msgid "Turkish (ISO-8859-9)"
 msgstr "Турецкая (ISO-8859-9)"
 
-#: src/prefs_common.c:1138
+#: src/prefs_common.c:1146
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Кириллица (ISO-8859-5)"
 
-#: src/prefs_common.c:1139
+#: src/prefs_common.c:1147
 msgid "Cyrillic (KOI8-R)"
 msgstr "Русская (KOI8-R)"
 
-#: src/prefs_common.c:1140
-msgid "Cyrillic (Windows-1251)"
-msgstr "Кириллица Win (Windows-1251)"
-
-#: src/prefs_common.c:1141
+#: src/prefs_common.c:1148
 msgid "Cyrillic (KOI8-U)"
 msgstr "Украинская (KOI8-U)"
 
-#: src/prefs_common.c:1142
+#: src/prefs_common.c:1149
+msgid "Cyrillic (Windows-1251)"
+msgstr "Кириллица Win (Windows-1251)"
+
+#: src/prefs_common.c:1151
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Японская (ISO-2022-JP)"
 
-#: src/prefs_common.c:1144
+#: src/prefs_common.c:1153
 msgid "Japanese (EUC-JP)"
 msgstr "Японская (EUC-JP)"
 
-#: src/prefs_common.c:1145
+#: src/prefs_common.c:1154
 msgid "Japanese (Shift_JIS)"
 msgstr "Японская (Shift_JIS)"
 
-#: src/prefs_common.c:1147
+#: src/prefs_common.c:1157
 msgid "Simplified Chinese (GB2312)"
 msgstr "Упрощенная китайская (GB2312)"
 
-#: src/prefs_common.c:1148
+#: src/prefs_common.c:1158
 msgid "Traditional Chinese (Big5)"
 msgstr "Традиционная китайская (Big5)"
 
-#: src/prefs_common.c:1150
+#: src/prefs_common.c:1160
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Традиционная китайская (EUC-TW)"
 
-#: src/prefs_common.c:1151
+#: src/prefs_common.c:1161
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Китайская (ISO-2022-CN)"
 
-#: src/prefs_common.c:1153
+#: src/prefs_common.c:1164
 msgid "Korean (EUC-KR)"
 msgstr "Корейская (EUC-KR)"
 
-#: src/prefs_common.c:1154
+#: src/prefs_common.c:1166
 msgid "Thai (TIS-620)"
 msgstr "Тайская (TIS-620)"
 
-#: src/prefs_common.c:1155
+#: src/prefs_common.c:1167
 msgid "Thai (Windows-874)"
 msgstr "Тайская (Windows-874)"
 
-#: src/prefs_common.c:1165
+#: src/prefs_common.c:1177
 #, fuzzy
 msgid ""
 "If `Automatic' is selected, the optimal encoding for the current locale will "
@@ -4406,11 +4444,11 @@ msgstr ""
 "При выборе варианта 'Автоматически' будет использована\n"
 "оптимальная кодировка для текущего языка и страны."
 
-#: src/prefs_common.c:1179
+#: src/prefs_common.c:1191
 msgid "Transfer encoding"
 msgstr "Кодирование текста сообщений"
 
-#: src/prefs_common.c:1202
+#: src/prefs_common.c:1214
 #, fuzzy
 msgid ""
 "Specify Content-Transfer-Encoding used when message body contains non-ASCII "
@@ -4419,118 +4457,118 @@ msgstr ""
 "Укажите метод кодирования текстов сообщений, содержащих символы\n"
 "не из диапазона ASCII (Content-Transfer-Encoding)."
 
-#: src/prefs_common.c:1272
+#: src/prefs_common.c:1284
 msgid "Signature separator"
 msgstr "Разделитель подписи"
 
-#: src/prefs_common.c:1281
+#: src/prefs_common.c:1293
 msgid "Insert automatically"
 msgstr "Добавлять автоматически"
 
-#: src/prefs_common.c:1291
+#: src/prefs_common.c:1303
 msgid "Automatically launch the external editor"
 msgstr "Автоматически запускать внешний редактор"
 
-#: src/prefs_common.c:1301
+#: src/prefs_common.c:1313
 msgid "Undo level"
 msgstr "Число уровней отката"
 
-#: src/prefs_common.c:1321
+#: src/prefs_common.c:1333
 msgid "Wrap messages at"
 msgstr "Переносить строки с"
 
-#: src/prefs_common.c:1333
+#: src/prefs_common.c:1345
 msgid "characters"
 msgstr "символа"
 
-#: src/prefs_common.c:1343
+#: src/prefs_common.c:1355
 msgid "Wrap quotation"
 msgstr "Переносить цитаты"
 
-#: src/prefs_common.c:1349
+#: src/prefs_common.c:1361
 msgid "Wrap on input"
 msgstr "Переносить при вводе"
 
-#: src/prefs_common.c:1351
+#: src/prefs_common.c:1363
 msgid "Wrap before sending"
 msgstr "Переносить перед отправкой"
 
-#: src/prefs_common.c:1361
+#: src/prefs_common.c:1373
 msgid "Automatically select account for replies"
 msgstr "Автоматически выбирать учетную запись при ответе"
 
-#: src/prefs_common.c:1363
+#: src/prefs_common.c:1375
 msgid "Quote message when replying"
 msgstr "Цитировать при ответе"
 
-#: src/prefs_common.c:1365
+#: src/prefs_common.c:1377
 msgid "Reply button invokes mailing list reply"
 msgstr "По кнопке \"Ответить\" отвечать в список рассылки"
 
 #. reply
-#: src/prefs_common.c:1411
+#: src/prefs_common.c:1423
 msgid "Reply format"
 msgstr "Формат ответа"
 
-#: src/prefs_common.c:1426 src/prefs_common.c:1468
+#: src/prefs_common.c:1438 src/prefs_common.c:1480
 msgid "Quotation mark"
 msgstr "Знак цитаты"
 
 #. forward
-#: src/prefs_common.c:1453
+#: src/prefs_common.c:1465
 msgid "Forward format"
 msgstr "Формат пересылаемого сообщения"
 
-#: src/prefs_common.c:1500
+#: src/prefs_common.c:1512
 msgid " Description of symbols "
 msgstr " Описание символов "
 
-#: src/prefs_common.c:1541
+#: src/prefs_common.c:1553
 msgid "Font"
 msgstr "Шрифт"
 
-#: src/prefs_common.c:1573
+#: src/prefs_common.c:1585
 msgid "Translate header name (such as `From:', `Subject:')"
 msgstr "Переводить имена заголовков ('From:', 'Subject:')"
 
-#: src/prefs_common.c:1576
+#: src/prefs_common.c:1588
 msgid "Display unread number next to folder name"
 msgstr "Показывать число непрочитанных сообщений рядом с именем папки"
 
-#: src/prefs_common.c:1585
+#: src/prefs_common.c:1597
 msgid "Abbreviate newsgroups longer than"
 msgstr "Сокращать названия групп новостей длиннее"
 
-#: src/prefs_common.c:1600
+#: src/prefs_common.c:1612
 msgid "letters"
 msgstr "букв"
 
 #. ---- Summary ----
-#: src/prefs_common.c:1606
+#: src/prefs_common.c:1618
 msgid "Summary View"
 msgstr "Список сообщений"
 
-#: src/prefs_common.c:1615
+#: src/prefs_common.c:1627
 msgid "Display recipient on `From' column if sender is yourself"
 msgstr "Показывать получателя в колонке 'От', если отправитель - Вы"
 
-#: src/prefs_common.c:1617
+#: src/prefs_common.c:1629
 msgid "Expand threads"
 msgstr "Разворачивать обсуждения"
 
-#: src/prefs_common.c:1625 src/prefs_common.c:2443 src/prefs_common.c:2481
+#: src/prefs_common.c:1637 src/prefs_common.c:2455 src/prefs_common.c:2493
 msgid "Date format"
 msgstr "Формат даты"
 
-#: src/prefs_common.c:1646
+#: src/prefs_common.c:1658
 msgid " Set display item of summary... "
 msgstr "Установить показываемые поля..."
 
-#: src/prefs_common.c:1710
+#: src/prefs_common.c:1722
 msgid "Enable coloration of message"
 msgstr "Разрешить раскраску сообщений"
 
-#: src/prefs_common.c:1724
+#: src/prefs_common.c:1736
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
@@ -4538,323 +4576,323 @@ msgstr ""
 "Отображать многобайтовые алфавитно-цифровые символы\n"
 "как ASCII (только для японских кодировок)"
 
-#: src/prefs_common.c:1730
+#: src/prefs_common.c:1742
 msgid "Display header pane above message view"
 msgstr "Показывать панель заголовков над областью просмотра сообщений"
 
-#: src/prefs_common.c:1737
+#: src/prefs_common.c:1749
 msgid "Display short headers on message view"
 msgstr "Показывать сокращенные заголовки при просмотре сообщений"
 
-#: src/prefs_common.c:1758
+#: src/prefs_common.c:1770
 msgid "Line space"
 msgstr "Расстояние между строками"
 
-#: src/prefs_common.c:1772 src/prefs_common.c:1810
+#: src/prefs_common.c:1784 src/prefs_common.c:1822
 msgid "pixel(s)"
 msgstr "пикселей"
 
-#: src/prefs_common.c:1777
+#: src/prefs_common.c:1789
 msgid "Scroll"
 msgstr "Прокрутка"
 
-#: src/prefs_common.c:1784
+#: src/prefs_common.c:1796
 msgid "Half page"
 msgstr "Половина страницы"
 
-#: src/prefs_common.c:1790
+#: src/prefs_common.c:1802
 msgid "Smooth scroll"
 msgstr "Плавная прокрутка"
 
-#: src/prefs_common.c:1796
+#: src/prefs_common.c:1808
 msgid "Step"
 msgstr "Шаг"
 
-#: src/prefs_common.c:1816
+#: src/prefs_common.c:1828
 msgid "Images"
 msgstr ""
 
-#: src/prefs_common.c:1824
+#: src/prefs_common.c:1836
 msgid "Resize attached large images to fit in the window"
 msgstr "Масштабировать присоединенные изображения по размеру окна"
 
-#: src/prefs_common.c:1826
+#: src/prefs_common.c:1838
 #, fuzzy
 msgid "Display images as inline"
 msgstr "Настройка отображения заголовков"
 
-#: src/prefs_common.c:1871
+#: src/prefs_common.c:1883
 msgid "Automatically check signatures"
 msgstr "Автоматически проверять подписи"
 
-#: src/prefs_common.c:1874
+#: src/prefs_common.c:1886
 msgid "Show signature check result in a popup window"
 msgstr "Показывать результат проверки подписи в отдельном окне"
 
-#: src/prefs_common.c:1877
+#: src/prefs_common.c:1889
 msgid "Store passphrase in memory temporarily"
 msgstr "Сохранять парольную фразу в памяти"
 
-#: src/prefs_common.c:1892
+#: src/prefs_common.c:1904
 msgid "Expired after"
 msgstr "Удалять через"
 
-#: src/prefs_common.c:1905
+#: src/prefs_common.c:1917
 msgid "minute(s) "
 msgstr "минут"
 
-#: src/prefs_common.c:1918
+#: src/prefs_common.c:1930
 #, fuzzy
 msgid "Setting to '0' will store the passphrase for the whole session."
 msgstr ""
 "(При установке в 0 парольная фраза будет храниться\n"
 " в течение всего сеанса)"
 
-#: src/prefs_common.c:1932
+#: src/prefs_common.c:1944
 msgid "Grab input while entering a passphrase"
 msgstr "Захватить ввод при запросе пароля"
 
-#: src/prefs_common.c:1937
+#: src/prefs_common.c:1949
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "Выводить предупреждение при запуске, если GnuPG не работает"
 
-#: src/prefs_common.c:1989
+#: src/prefs_common.c:2001
 msgid "Always open messages in summary when selected"
 msgstr "Всегда открывать сообщение для просмотра при выделении в списке"
 
-#: src/prefs_common.c:1993
+#: src/prefs_common.c:2005
 msgid "Open first unread message when entering a folder"
 msgstr "Открыть первое непрочитанное сообщение при входе в папку"
 
-#: src/prefs_common.c:1997
+#: src/prefs_common.c:2009
 msgid "Only mark message as read when opened in new window"
 msgstr "Помечать сообщение как прочитанное только после открытия в новом окне"
 
-#: src/prefs_common.c:2001
+#: src/prefs_common.c:2013
 msgid "Go to inbox after receiving new mail"
 msgstr "Перейти в папку \"Входящие\" после приема новых сообщений"
 
-#: src/prefs_common.c:2009
+#: src/prefs_common.c:2021
 msgid "Execute immediately when moving or deleting messages"
 msgstr "Немедленно выполнять перемещение и удаление сообщений"
 
-#: src/prefs_common.c:2021
+#: src/prefs_common.c:2033
 #, fuzzy
 msgid "Messages will be marked until execution if this is turned off."
 msgstr ""
 "(Сообщения будут просто помечены до выполнения, если\n"
 " эта опция не включена)"
 
-#: src/prefs_common.c:2029
+#: src/prefs_common.c:2041
 msgid "Receive dialog"
 msgstr "Окно приема сообщений"
 
-#: src/prefs_common.c:2039
+#: src/prefs_common.c:2051
 msgid "Show receive dialog"
 msgstr "Показывать окно приема сообщений"
 
-#: src/prefs_common.c:2049
+#: src/prefs_common.c:2061
 msgid "Always"
 msgstr "Всегда"
 
-#: src/prefs_common.c:2050
+#: src/prefs_common.c:2062
 msgid "Only on manual receiving"
 msgstr "Только при ручном запуске приема"
 
-#: src/prefs_common.c:2052
+#: src/prefs_common.c:2064
 msgid "Never"
 msgstr "Никогда"
 
-#: src/prefs_common.c:2057
+#: src/prefs_common.c:2069
 msgid "Don't popup error dialog on receive error"
 msgstr "Не отображать сообщение об ошибке при получении сообщений"
 
-#: src/prefs_common.c:2060
+#: src/prefs_common.c:2072
 msgid "Close receive dialog when finished"
 msgstr "Закрывать окно приема сообщений после завершения"
 
-#: src/prefs_common.c:2066
+#: src/prefs_common.c:2078
 msgid " Set key bindings... "
 msgstr " Установить клавиатурные команды... "
 
-#: src/prefs_common.c:2122
+#: src/prefs_common.c:2134
 #, c-format
 msgid "External commands (%s will be replaced with file name / URI)"
 msgstr "Внешние команды (%s будет заменен на имя файла/URI)"
 
-#: src/prefs_common.c:2131
+#: src/prefs_common.c:2143
 msgid "Web browser"
 msgstr "Web-браузер"
 
-#: src/prefs_common.c:2195
+#: src/prefs_common.c:2207
 msgid "Add address to destination when double-clicked"
 msgstr "Добавлять адрес в список адресатов по двойному щелчку"
 
-#: src/prefs_common.c:2197
+#: src/prefs_common.c:2209
 msgid "On exit"
 msgstr "При выходе"
 
-#: src/prefs_common.c:2205
+#: src/prefs_common.c:2217
 msgid "Confirm on exit"
 msgstr "Подтверждение при выходе"
 
-#: src/prefs_common.c:2212
+#: src/prefs_common.c:2224
 msgid "Empty trash on exit"
 msgstr "Очищать корзину при выходе"
 
-#: src/prefs_common.c:2214
+#: src/prefs_common.c:2226
 msgid "Ask before emptying"
 msgstr "Спрашивать перед очисткой"
 
-#: src/prefs_common.c:2218
+#: src/prefs_common.c:2230
 msgid "Warn if there are queued messages"
 msgstr "Предупреждать о наличии сообщений в очереди"
 
-#: src/prefs_common.c:2224
+#: src/prefs_common.c:2236
 msgid "Socket I/O timeout:"
 msgstr "Время ожидания ответа из сети:"
 
-#: src/prefs_common.c:2237
+#: src/prefs_common.c:2249
 msgid "second(s)"
 msgstr "секунд"
 
-#: src/prefs_common.c:2419
+#: src/prefs_common.c:2431
 msgid "the full abbreviated weekday name"
 msgstr "сокращенное название дня недели"
 
-#: src/prefs_common.c:2420
+#: src/prefs_common.c:2432
 msgid "the full weekday name"
 msgstr "полное название дня недели"
 
-#: src/prefs_common.c:2421
+#: src/prefs_common.c:2433
 msgid "the abbreviated month name"
 msgstr "сокращенное название месяца"
 
-#: src/prefs_common.c:2422
+#: src/prefs_common.c:2434
 msgid "the full month name"
 msgstr "полное название месяца"
 
-#: src/prefs_common.c:2423
+#: src/prefs_common.c:2435
 msgid "the preferred date and time for the current locale"
 msgstr "предпочтительный формат даты и времени для выбранной страны"
 
-#: src/prefs_common.c:2424
+#: src/prefs_common.c:2436
 msgid "the century number (year/100)"
 msgstr "век (год/100)"
 
-#: src/prefs_common.c:2425
+#: src/prefs_common.c:2437
 msgid "the day of the month as a decimal number"
 msgstr "день месяца"
 
-#: src/prefs_common.c:2426
+#: src/prefs_common.c:2438
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "час, 24-часовое представление"
 
-#: src/prefs_common.c:2427
+#: src/prefs_common.c:2439
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "час, 12-часовое представление"
 
-#: src/prefs_common.c:2428
+#: src/prefs_common.c:2440
 msgid "the day of the year as a decimal number"
 msgstr "день года"
 
-#: src/prefs_common.c:2429
+#: src/prefs_common.c:2441
 msgid "the month as a decimal number"
 msgstr "номер месяца"
 
-#: src/prefs_common.c:2430
+#: src/prefs_common.c:2442
 msgid "the minute as a decimal number"
 msgstr "минута"
 
-#: src/prefs_common.c:2431
+#: src/prefs_common.c:2443
 msgid "either AM or PM"
 msgstr "AM или PM"
 
-#: src/prefs_common.c:2432
+#: src/prefs_common.c:2444
 msgid "the second as a decimal number"
 msgstr "секунда"
 
-#: src/prefs_common.c:2433
+#: src/prefs_common.c:2445
 msgid "the day of the week as a decimal number"
 msgstr "номер дня недели"
 
-#: src/prefs_common.c:2434
+#: src/prefs_common.c:2446
 msgid "the preferred date for the current locale"
 msgstr "предпочтительный формат даты для выбранной страны"
 
-#: src/prefs_common.c:2435
+#: src/prefs_common.c:2447
 msgid "the last two digits of a year"
 msgstr "последние две цифры года"
 
-#: src/prefs_common.c:2436
+#: src/prefs_common.c:2448
 msgid "the year as a decimal number"
 msgstr "год полностью"
 
-#: src/prefs_common.c:2437
+#: src/prefs_common.c:2449
 msgid "the time zone or name or abbreviation"
 msgstr "имя или сокращение временной зоны"
 
-#: src/prefs_common.c:2458
+#: src/prefs_common.c:2470
 msgid "Specifier"
 msgstr "Элемент формата"
 
-#: src/prefs_common.c:2459
+#: src/prefs_common.c:2471
 msgid "Description"
 msgstr "Описание"
 
-#: src/prefs_common.c:2499
+#: src/prefs_common.c:2511
 msgid "Example"
 msgstr "Пример"
 
-#: src/prefs_common.c:2580
+#: src/prefs_common.c:2592
 msgid "Set message colors"
 msgstr "Настройка цветов сообщений"
 
-#: src/prefs_common.c:2588
+#: src/prefs_common.c:2600
 msgid "Colors"
 msgstr "Цвета"
 
-#: src/prefs_common.c:2622
+#: src/prefs_common.c:2634
 msgid "Quoted Text - First Level"
 msgstr "Цитата - Первый уровень"
 
-#: src/prefs_common.c:2628
+#: src/prefs_common.c:2640
 msgid "Quoted Text - Second Level"
 msgstr "Цитата - Второй уровень"
 
-#: src/prefs_common.c:2634
+#: src/prefs_common.c:2646
 msgid "Quoted Text - Third Level"
 msgstr "Цитата - Третий уровень"
 
-#: src/prefs_common.c:2640
+#: src/prefs_common.c:2652
 msgid "URI link"
 msgstr "Ссылка (URI)"
 
-#: src/prefs_common.c:2647
+#: src/prefs_common.c:2659
 msgid "Recycle quote colors"
 msgstr "Циклически использовать цвета цитат"
 
-#: src/prefs_common.c:2707
+#: src/prefs_common.c:2719
 msgid "Pick color for quotation level 1"
 msgstr "Выберите цвет для цитат уровня 1"
 
-#: src/prefs_common.c:2710
+#: src/prefs_common.c:2722
 msgid "Pick color for quotation level 2"
 msgstr "Выберите цвет для цитат уровня 2"
 
-#: src/prefs_common.c:2713
+#: src/prefs_common.c:2725
 msgid "Pick color for quotation level 3"
 msgstr "Выберите цвет для цитат уровня 3"
 
-#: src/prefs_common.c:2716
+#: src/prefs_common.c:2728
 msgid "Pick color for URI"
 msgstr "Выберите цвет для ссылок (URI)"
 
-#: src/prefs_common.c:2853
+#: src/prefs_common.c:2865
 msgid "Description of symbols"
 msgstr "Описание символов"
 
-#: src/prefs_common.c:2909
+#: src/prefs_common.c:2921
 msgid ""
 "Date\n"
 "From\n"
@@ -4878,11 +4916,11 @@ msgstr ""
 "Группы новостей\n"
 "Message-ID"
 
-#: src/prefs_common.c:2922
+#: src/prefs_common.c:2934
 msgid "If x is set, displays expr"
 msgstr "Если x установлено, отображает expr"
 
-#: src/prefs_common.c:2926
+#: src/prefs_common.c:2938
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -4896,7 +4934,7 @@ msgstr ""
 "Содержимое сообщения без подписи со знаком цитаты\n"
 "Символ '%'"
 
-#: src/prefs_common.c:2934
+#: src/prefs_common.c:2946
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -4908,15 +4946,15 @@ msgstr ""
 "Символ '{'\n"
 "Символ '}'"
 
-#: src/prefs_common.c:2971
+#: src/prefs_common.c:2983
 msgid "Font selection"
 msgstr "Выбор шрифта"
 
-#: src/prefs_common.c:3035
+#: src/prefs_common.c:3047
 msgid "Key bindings"
 msgstr "Клавиатурные команды"
 
-#: src/prefs_common.c:3049
+#: src/prefs_common.c:3061
 msgid ""
 "Select the preset of key bindings.\n"
 "You can also modify each menu's shortcuts by pressing\n"
@@ -4927,11 +4965,11 @@ msgstr ""
 "нажмите эту клавишу (или комбинацию клавиш), установив указатель\n"
 "на нужную команду в меню."
 
-#: src/prefs_common.c:3061 src/prefs_common.c:3410
+#: src/prefs_common.c:3073 src/prefs_common.c:3422
 msgid "Default"
 msgstr "По умолчанию"
 
-#: src/prefs_common.c:3064 src/prefs_common.c:3419
+#: src/prefs_common.c:3076 src/prefs_common.c:3431
 msgid "Old Sylpheed"
 msgstr "Старая Sylpheed"
 
@@ -6073,6 +6111,12 @@ msgstr "%.2f Гб"
 msgid "writing to %s failed.\n"
 msgstr "запись в %s не удалась.\n"
 
+#~ msgid "/_View/_Code set/---"
+#~ msgstr "/Вид/Кодировка/---"
+
+#~ msgid "/_View/_Code set"
+#~ msgstr "/Вид/Кодировка"
+
 #~ msgid "To save this part, pop up the context menu with "
 #~ msgstr "Чтобы сохранить эту часть, вызовите контекстное меню, "
 
diff --git a/po/sk.po b/po/sk.po
index 6fa7ffe4..b49ea4e5 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: 2005-03-15 14:29+0900\n"
+"POT-Creation-Date: 2005-03-16 14:47+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"
@@ -97,7 +97,7 @@ msgstr ""
 "pri voľbe 'Prijať všetko', zatrhnite políčko v stĺpci označenom 'G'."
 
 #: src/account.c:638 src/addressadd.c:186 src/addressbook.c:488
-#: src/compose.c:3650 src/editaddress.c:195 src/editaddress.c:936
+#: src/compose.c:3748 src/editaddress.c:195 src/editaddress.c:936
 #: src/editaddress.c:984 src/editbook.c:191 src/editgroup.c:257
 #: src/editjpilot.c:296 src/editldap.c:300 src/editvcard.c:211
 #: src/mimeview.c:151 src/prefs_filter.c:214 src/prefs_folder_item.c:170
@@ -150,13 +150,13 @@ msgstr "Zmazať konto"
 msgid "Do you really want to delete this account?"
 msgstr "Naozaj chcete zmazať toto konto?"
 
-#: src/account.c:758 src/compose.c:2551 src/compose.c:4807
+#: src/account.c:758 src/compose.c:2632 src/compose.c:4943
 #: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
 #: src/folderview.c:2156 src/folderview.c:2192
 msgid "Yes"
 msgstr "Áno"
 
-#: src/account.c:758 src/compose.c:2551 src/compose.c:4807
+#: src/account.c:758 src/compose.c:2632 src/compose.c:4943
 #: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
 #: src/folderview.c:2156 src/folderview.c:2192
 msgid "+No"
@@ -261,7 +261,7 @@ msgstr "Používateľský parameter pre akciu"
 msgid "Add Address to Book"
 msgstr "Pridať adresu do adresára"
 
-#: src/addressadd.c:196 src/compose.c:4191 src/editaddress.c:196
+#: src/addressadd.c:196 src/compose.c:4292 src/editaddress.c:196
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "Adresár"
@@ -275,7 +275,7 @@ msgstr "Poznámky"
 msgid "Select Address Book Folder"
 msgstr "Vyberte priečinok adresára"
 
-#: src/addressbook.c:334 src/compose.c:469 src/mainwindow.c:454
+#: src/addressbook.c:334 src/compose.c:477 src/mainwindow.c:454
 #: src/messageview.c:134
 msgid "/_File"
 msgstr "/_Súbor"
@@ -296,8 +296,8 @@ msgstr "/_Súbor/Nový _JPilot"
 msgid "/_File/New _Server"
 msgstr "/_Súbor/Nový _Server"
 
-#: src/addressbook.c:343 src/addressbook.c:346 src/compose.c:474
-#: src/compose.c:479 src/compose.c:483 src/mainwindow.c:471
+#: src/addressbook.c:343 src/addressbook.c:346 src/compose.c:482
+#: src/compose.c:487 src/compose.c:491 src/mainwindow.c:471
 #: src/mainwindow.c:474 src/mainwindow.c:476 src/mainwindow.c:479
 #: src/mainwindow.c:481 src/messageview.c:137
 msgid "/_File/---"
@@ -315,7 +315,7 @@ msgstr "/_Súbor/Z_mazať"
 msgid "/_File/_Save"
 msgstr "/_Súbor/U_ložiť"
 
-#: src/addressbook.c:348 src/compose.c:484 src/messageview.c:138
+#: src/addressbook.c:348 src/compose.c:492 src/messageview.c:138
 msgid "/_File/_Close"
 msgstr "/_Súbor/_Zavrieť"
 
@@ -347,7 +347,7 @@ msgstr "/_Adresa/_Upraviť"
 msgid "/_Address/_Delete"
 msgstr "/_Adresa/Z_mazať"
 
-#: src/addressbook.c:356 src/compose.c:585 src/mainwindow.c:688
+#: src/addressbook.c:356 src/compose.c:664 src/mainwindow.c:697
 #: src/messageview.c:246
 msgid "/_Tools"
 msgstr "/_Nástroje"
@@ -356,12 +356,12 @@ msgstr "/_Nástroje"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Nástroje/Importovať súbor _LDIF"
 
-#: src/addressbook.c:358 src/compose.c:598 src/mainwindow.c:733
+#: src/addressbook.c:358 src/compose.c:677 src/mainwindow.c:742
 #: src/messageview.c:264
 msgid "/_Help"
 msgstr "/Nápo_veda"
 
-#: src/addressbook.c:359 src/compose.c:599 src/mainwindow.c:744
+#: src/addressbook.c:359 src/compose.c:678 src/mainwindow.c:753
 #: src/messageview.c:265
 msgid "/_Help/_About"
 msgstr "/Nápo_veda/_O programe"
@@ -378,7 +378,7 @@ msgstr "/Nová _Skupina"
 msgid "/New _Folder"
 msgstr "/Nový _Priečinok"
 
-#: src/addressbook.c:381 src/addressbook.c:391 src/compose.c:463
+#: src/addressbook.c:381 src/addressbook.c:391 src/compose.c:471
 #: src/folderview.c:220 src/folderview.c:222 src/folderview.c:226
 #: src/folderview.c:236 src/folderview.c:238 src/folderview.c:240
 #: src/folderview.c:244 src/folderview.c:254 src/folderview.c:256
@@ -388,7 +388,7 @@ msgstr "/Nový _Priečinok"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:382 src/addressbook.c:392 src/compose.c:486
+#: src/addressbook.c:382 src/addressbook.c:392 src/compose.c:494
 #: src/mainwindow.c:485 src/messageview.c:140
 msgid "/_Edit"
 msgstr "/_Upraviť"
@@ -401,7 +401,7 @@ msgstr "/Z_mazať"
 msgid "E-Mail address"
 msgstr "E-mailová adresa"
 
-#: src/addressbook.c:493 src/compose.c:4192 src/prefs_common.c:2186
+#: src/addressbook.c:493 src/compose.c:4293 src/prefs_common.c:2198
 msgid "Address book"
 msgstr "Otvoriť adresár"
 
@@ -411,7 +411,7 @@ msgstr "Meno:"
 
 #. Buttons
 #: src/addressbook.c:625 src/addressbook.c:1665 src/addressbook.c:1671
-#: src/editaddress.c:878 src/editaddress.c:1011 src/mainwindow.c:2212
+#: src/editaddress.c:878 src/editaddress.c:1011 src/mainwindow.c:2221
 #: src/prefs_actions.c:263 src/prefs_display_header.c:275
 #: src/prefs_display_header.c:330 src/prefs_template.c:227
 msgid "Delete"
@@ -605,7 +605,7 @@ msgstr "Spoločná adresa"
 msgid "Personal address"
 msgstr "Súkromná adresa"
 
-#: src/alertpanel.c:123 src/compose.c:4807 src/main.c:458
+#: src/alertpanel.c:123 src/compose.c:4943 src/main.c:458
 msgid "Notice"
 msgstr "Upozornenie"
 
@@ -613,7 +613,7 @@ msgstr "Upozornenie"
 msgid "Warning"
 msgstr "Varovanie"
 
-#: src/alertpanel.c:149 src/compose.c:2551 src/inc.c:558
+#: src/alertpanel.c:149 src/compose.c:2632 src/inc.c:558
 msgid "Error"
 msgstr "Chyba"
 
@@ -661,307 +661,425 @@ msgstr "Hnedá"
 msgid "None"
 msgstr "Žiadna"
 
-#: src/compose.c:461
+#: src/compose.c:469
 msgid "/_Add..."
 msgstr "/_Pridať..."
 
-#: src/compose.c:462
+#: src/compose.c:470
 msgid "/_Remove"
 msgstr "/_Odstrániť"
 
-#: src/compose.c:464 src/folderview.c:228 src/folderview.c:246
+#: src/compose.c:472 src/folderview.c:228 src/folderview.c:246
 #: src/folderview.c:261
 msgid "/_Properties..."
 msgstr "/_Vlastnosti..."
 
-#: src/compose.c:470
+#: src/compose.c:478
 #, fuzzy
 msgid "/_File/_Send"
 msgstr "/_Súbor/U_ložiť"
 
-#: src/compose.c:472
+#: src/compose.c:480
 #, fuzzy
 msgid "/_File/Send _later"
 msgstr "/Sp_ráva/Odoslať _neskôr"
 
-#: src/compose.c:475
+#: src/compose.c:483
 #, fuzzy
 msgid "/_File/Save to _draft folder"
 msgstr "/Sp_ráva/_Uložiť medzi koncepty"
 
-#: src/compose.c:477
+#: src/compose.c:485
 #, fuzzy
 msgid "/_File/Save and _keep editing"
 msgstr "/Sp_ráva/Uložiť a _pokračovať v editácii"
 
-#: src/compose.c:480
+#: src/compose.c:488
 msgid "/_File/_Attach file"
 msgstr "/_Súbor/_Pripojiť súbor"
 
-#: src/compose.c:481
+#: src/compose.c:489
 msgid "/_File/_Insert file"
 msgstr "/_Súbor/_Vložiť súbor"
 
-#: src/compose.c:482
+#: src/compose.c:490
 msgid "/_File/Insert si_gnature"
 msgstr "/_Súbor/V_ložiť podpis"
 
-#: src/compose.c:487
+#: src/compose.c:495
 msgid "/_Edit/_Undo"
 msgstr "/Úp_ravy"
 
-#: src/compose.c:488
+#: src/compose.c:496
 msgid "/_Edit/_Redo"
 msgstr "/Úp_ravy/Z_novu urobiť"
 
-#: src/compose.c:489 src/compose.c:567 src/mainwindow.c:489
+#: src/compose.c:497 src/compose.c:575 src/mainwindow.c:489
 #: src/messageview.c:143
 msgid "/_Edit/---"
 msgstr "/Úp_ravy/---"
 
-#: src/compose.c:490
+#: src/compose.c:498
 msgid "/_Edit/Cu_t"
 msgstr "/Úp_ravy/_Vystrihnúť"
 
-#: src/compose.c:491 src/mainwindow.c:486 src/messageview.c:141
+#: src/compose.c:499 src/mainwindow.c:486 src/messageview.c:141
 msgid "/_Edit/_Copy"
 msgstr "/Úp_ravy/_Kopírovať"
 
-#: src/compose.c:492
+#: src/compose.c:500
 msgid "/_Edit/_Paste"
 msgstr "/Úp_ravy/_Prilepiť"
 
-#: src/compose.c:493
+#: src/compose.c:501
 msgid "/_Edit/Paste as _quotation"
 msgstr "/Úp_ravy/Prilepiť ako _citáciu"
 
-#: src/compose.c:495 src/mainwindow.c:487 src/messageview.c:142
+#: src/compose.c:503 src/mainwindow.c:487 src/messageview.c:142
 msgid "/_Edit/Select _all"
 msgstr "/Úp_ravy/Vy_brať všetko"
 
-#: src/compose.c:496
+#: src/compose.c:504
 msgid "/_Edit/A_dvanced"
 msgstr "/Úp_ravy/R_ozšírené"
 
-#: src/compose.c:497
+#: src/compose.c:505
 msgid "/_Edit/A_dvanced/Move a character backward"
 msgstr "/Úp_ravy/R_ozšírené/Presunúť o znak dozadu"
 
-#: src/compose.c:502
+#: src/compose.c:510
 msgid "/_Edit/A_dvanced/Move a character forward"
 msgstr "/Úp_ravy/R_ozšírené/Presunúť o znak dopredu"
 
-#: src/compose.c:507
+#: src/compose.c:515
 msgid "/_Edit/A_dvanced/Move a word backward"
 msgstr "/Úp_ravy/R_ozšírené/Presunúť o slovo dozadu"
 
-#: src/compose.c:512
+#: src/compose.c:520
 msgid "/_Edit/A_dvanced/Move a word forward"
 msgstr "/Úp_ravy/R_ozšírené/Presunúť o slovo dopredu"
 
-#: src/compose.c:517
+#: src/compose.c:525
 msgid "/_Edit/A_dvanced/Move to beginning of line"
 msgstr "/Úp_ravy/R_ozšírené/Presunúť na začiatok riadku"
 
-#: src/compose.c:522
+#: src/compose.c:530
 msgid "/_Edit/A_dvanced/Move to end of line"
 msgstr "/Úp_ravy/R_ozšírené/Presunúť na koniec riadku"
 
-#: src/compose.c:527
+#: src/compose.c:535
 msgid "/_Edit/A_dvanced/Move to previous line"
 msgstr "/Úp_ravy/R_ozšírené/Presunúť na predchodzí riadok"
 
-#: src/compose.c:532
+#: src/compose.c:540
 msgid "/_Edit/A_dvanced/Move to next line"
 msgstr "/Úp_ravy/R_ozšírené/Presunúť na ďalší riadok"
 
-#: src/compose.c:537
+#: src/compose.c:545
 msgid "/_Edit/A_dvanced/Delete a character backward"
 msgstr "/Úp_ravy/R_ozšírené/Zmazať znak naľavo od kurzora"
 
-#: src/compose.c:542
+#: src/compose.c:550
 msgid "/_Edit/A_dvanced/Delete a character forward"
 msgstr "/Úp_ravy/R_ozšírené/Zmazať znak napravo od kurzora"
 
-#: src/compose.c:547
+#: src/compose.c:555
 msgid "/_Edit/A_dvanced/Delete a word backward"
 msgstr "/Úp_ravy/R_ozšírené/Zmazať slovo naľavo od kurzora"
 
-#: src/compose.c:552
+#: src/compose.c:560
 msgid "/_Edit/A_dvanced/Delete a word forward"
 msgstr "/Úp_ravy/R_ozšírené/Zmazať slovo napravo od kurzora"
 
-#: src/compose.c:557
+#: src/compose.c:565
 msgid "/_Edit/A_dvanced/Delete line"
 msgstr "/Úp_ravy/R_ozšírené/Zmazať riadok"
 
-#: src/compose.c:562
+#: src/compose.c:570
 msgid "/_Edit/A_dvanced/Delete to end of line"
 msgstr "/Úp_ravy/R_ozšírené/Zmazať text do konca riadku"
 
-#: src/compose.c:568
+#: src/compose.c:576
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/Úp_ravy/_Zalomiť aktuálny odstavec"
 
-#: src/compose.c:570
+#: src/compose.c:578
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/Úp_ravy/Zalomiť všetky _dlhé riadky"
 
-#: src/compose.c:572
+#: src/compose.c:580
 #, fuzzy
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/Úp_ravy/_Kopírovať"
 
-#: src/compose.c:573 src/mainwindow.c:494 src/messageview.c:147
+#: src/compose.c:581 src/mainwindow.c:494 src/messageview.c:147
 #: src/summaryview.c:370
 msgid "/_View"
 msgstr "/_Zobraziť"
 
-#: src/compose.c:574
+#: src/compose.c:582
 msgid "/_View/_To"
 msgstr "/_Zobraziť/_Komu"
 
-#: src/compose.c:575
+#: src/compose.c:583
 msgid "/_View/_Cc"
 msgstr "/_Zobraziť/Kó_pia"
 
-#: src/compose.c:576
+#: src/compose.c:584
 msgid "/_View/_Bcc"
 msgstr "/_Zobraziť/_Slepá kópia"
 
-#: src/compose.c:577
+#: src/compose.c:585
 msgid "/_View/_Reply to"
 msgstr "/_Zobraziť/_Odpoveď komu"
 
-#: src/compose.c:578 src/compose.c:580 src/compose.c:582 src/mainwindow.c:512
-#: src/mainwindow.c:515 src/mainwindow.c:541 src/mainwindow.c:565
-#: src/mainwindow.c:641 src/mainwindow.c:645 src/messageview.c:223
+#: src/compose.c:586 src/compose.c:588 src/compose.c:590 src/compose.c:592
+#: src/mainwindow.c:512 src/mainwindow.c:515 src/mainwindow.c:541
+#: src/mainwindow.c:565 src/mainwindow.c:650 src/mainwindow.c:654
+#: src/messageview.c:223
 msgid "/_View/---"
 msgstr "/_Zobraziť/---"
 
-#: src/compose.c:579
+#: src/compose.c:587
 msgid "/_View/_Followup to"
 msgstr "/_Zobraziť/O_dovzdať komu"
 
-#: src/compose.c:581
+#: src/compose.c:589
 msgid "/_View/R_uler"
 msgstr "/_Zobraziť/P_ravítko"
 
-#: src/compose.c:583
+#: src/compose.c:591
 msgid "/_View/_Attachment"
 msgstr "/_Zobraziť/Prí_lohy"
 
-#: src/compose.c:586 src/mainwindow.c:689 src/messageview.c:247
+#: src/compose.c:598 src/mainwindow.c:572 src/messageview.c:154
+#, fuzzy
+msgid "/_View/Character _encoding"
+msgstr "/_Zobraziť/_Triediť/Zostupne"
+
+#: src/compose.c:599
+msgid "/_View/Character _encoding/_Automatic"
+msgstr ""
+
+#: src/compose.c:601 src/compose.c:607 src/compose.c:613 src/compose.c:617
+#: src/compose.c:623 src/compose.c:627 src/compose.c:631 src/compose.c:641
+#: src/compose.c:645 src/compose.c:653 src/compose.c:657 src/mainwindow.c:568
+#: src/mainwindow.c:575 src/messageview.c:150
+#, fuzzy
+msgid "/_View/Character _encoding/---"
+msgstr "/_Zobraziť/_Triediť/Zostupne"
+
+#: src/compose.c:603 src/mainwindow.c:576 src/messageview.c:158
+#, fuzzy
+msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
+msgstr "/_Zobraziť/_Kódovanie/7bit ascii (US-ASC_II)"
+
+#: src/compose.c:605 src/mainwindow.c:578 src/messageview.c:161
+#, fuzzy
+msgid "/_View/Character _encoding/Unicode (_UTF-8)"
+msgstr "/_Zobraziť/_Kódovanie/Unicode (_UTF-8)"
+
+#: src/compose.c:609 src/mainwindow.c:582 src/messageview.c:164
+#, fuzzy
+msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
+msgstr "/_Zobraziť/_Kódovanie/Západná Európa (ISO-8859-_1)"
+
+#: src/compose.c:611 src/mainwindow.c:584 src/messageview.c:166
+#, fuzzy
+msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
+msgstr "/_Zobraziť/_Kódovanie/Západná Európa (ISO-8859-15)"
+
+#: src/compose.c:615 src/mainwindow.c:588 src/messageview.c:169
+#, fuzzy
+msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
+msgstr "/_Zobraziť/_Kódovanie/Stredná Európa (ISO-8859-_2)"
+
+#: src/compose.c:619 src/mainwindow.c:592 src/messageview.c:172
+#, fuzzy
+msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
+msgstr "/_Zobraziť/_Kódovanie/_Pobaltie (ISO-8859-13)"
+
+#: src/compose.c:621 src/mainwindow.c:594 src/messageview.c:174
+#, fuzzy
+msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
+msgstr "/_Zobraziť/_Kódovanie/Pobaltie (ISO-8859-_4)"
+
+#: src/compose.c:625 src/mainwindow.c:598 src/messageview.c:177
+#, fuzzy
+msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
+msgstr "/_Zobraziť/_Kódovanie/Grécko (ISO-8859-_7)"
+
+#: src/compose.c:629 src/mainwindow.c:602 src/messageview.c:180
+#, fuzzy
+msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
+msgstr "/_Zobraziť/_Kódovanie/Turecko (ISO-8859-_9)"
+
+#: src/compose.c:633 src/mainwindow.c:606 src/messageview.c:183
+#, fuzzy
+msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
+msgstr "/_Zobraziť/_Kódovanie/Cyrilika (ISO-8859-_5)"
+
+#: src/compose.c:635 src/mainwindow.c:608 src/messageview.c:185
+#, fuzzy
+msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
+msgstr "/_Zobraziť/_Kódovanie/Cyrilika (KOI8-_R)"
+
+#: src/compose.c:637 src/mainwindow.c:610 src/messageview.c:187
+#, fuzzy
+msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
+msgstr "/_Zobraziť/_Kódovanie/Cyrilika (KOI8-_R)"
+
+#: src/compose.c:639 src/mainwindow.c:612 src/messageview.c:189
+#, fuzzy
+msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
+msgstr "/_Zobraziť/_Kódovanie/Cyrilika (Windows-1251)"
+
+#: src/compose.c:643 src/mainwindow.c:616 src/messageview.c:192
+#, fuzzy
+msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
+msgstr "/_Zobraziť/_Kódovanie/Japonsko (ISO-2022-_JP)"
+
+#: src/compose.c:647 src/mainwindow.c:626 src/messageview.c:201
+#, fuzzy
+msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
+msgstr "/_Zobraziť/_Kódovanie/Zjednodušená čínština (_GB2312)"
+
+#: src/compose.c:649 src/mainwindow.c:628 src/messageview.c:203
+#, fuzzy
+msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
+msgstr "/_Zobraziť/_Kódovanie/Tradičná čínština (_Big5)"
+
+#: src/compose.c:651 src/mainwindow.c:630 src/messageview.c:205
+#, fuzzy
+msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
+msgstr "/_Zobraziť/_Kódovanie/Tradičná čínština (EUC-_TW)"
+
+#: src/compose.c:655 src/mainwindow.c:636 src/messageview.c:210
+#, fuzzy
+msgid "/_View/Character _encoding/Korean (EUC-_KR)"
+msgstr "/_Zobraziť/_Kódovanie/Kórea (EUC-_KR)"
+
+#: src/compose.c:659 src/mainwindow.c:642 src/messageview.c:215
+#, fuzzy
+msgid "/_View/Character _encoding/Thai (TIS-620)"
+msgstr "/_Zobraziť/_Kódovanie/Thajsko (TIS-620)"
+
+#: src/compose.c:661 src/mainwindow.c:644 src/messageview.c:217
+#, fuzzy
+msgid "/_View/Character _encoding/Thai (Windows-874)"
+msgstr "/_Zobraziť/_Kódovanie/Thajsko (Windows-874)"
+
+#: src/compose.c:665 src/mainwindow.c:698 src/messageview.c:247
 msgid "/_Tools/_Address book"
 msgstr "/_Nástroje/_Adresár"
 
-#: src/compose.c:587
+#: src/compose.c:666
 msgid "/_Tools/_Template"
 msgstr "/_Nástroje/Ša_blóna"
 
-#: src/compose.c:588 src/mainwindow.c:707 src/messageview.c:262
+#: src/compose.c:667 src/mainwindow.c:716 src/messageview.c:262
 msgid "/_Tools/Actio_ns"
 msgstr "/_Nástroje/A_kcie"
 
-#: src/compose.c:589 src/compose.c:593 src/mainwindow.c:692
-#: src/mainwindow.c:706 src/mainwindow.c:708 src/mainwindow.c:711
-#: src/mainwindow.c:713 src/messageview.c:250 src/messageview.c:261
+#: src/compose.c:668 src/compose.c:672 src/mainwindow.c:701
+#: src/mainwindow.c:715 src/mainwindow.c:717 src/mainwindow.c:720
+#: src/mainwindow.c:722 src/messageview.c:250 src/messageview.c:261
 msgid "/_Tools/---"
 msgstr "/_Nástroje/---"
 
-#: src/compose.c:590
+#: src/compose.c:669
 #, fuzzy
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/Úp_ravy/Upraviť e_xterným editorom"
 
-#: src/compose.c:594
+#: src/compose.c:673
 #, fuzzy
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Nástroje/A_kcie"
 
-#: src/compose.c:595
+#: src/compose.c:674
 #, fuzzy
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/Sp_ráva/_Zašifrovať"
 
-#: src/compose.c:800
+#: src/compose.c:879
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: súbor neexistuje\n"
 
-#: src/compose.c:899 src/compose.c:958 src/procmsg.c:1303
+#: src/compose.c:978 src/compose.c:1037 src/procmsg.c:1303
 msgid "Can't get text part\n"
 msgstr "Nedá sa získať časť textu\n"
 
-#: src/compose.c:1340
+#: src/compose.c:1419
 msgid "Quote mark format error."
 msgstr "Chyba v úvodzovkách."
 
-#: src/compose.c:1352
+#: src/compose.c:1431
 msgid "Message reply/forward format error."
 msgstr "Chyba formátu odpovede/preposielania."
 
-#: src/compose.c:1679
+#: src/compose.c:1758
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Súbor %s neexistuje\n"
 
-#: src/compose.c:1683
+#: src/compose.c:1762
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Nedá sa zistiť dĺžka súboru %s\n"
 
-#: src/compose.c:1687
+#: src/compose.c:1766
 #, c-format
 msgid "File %s is empty."
 msgstr "Súbor %s je prázdny."
 
-#: src/compose.c:1691
+#: src/compose.c:1770
 #, c-format
 msgid "Can't read %s."
 msgstr "Nedá sa čítať %s."
 
-#: src/compose.c:1726
+#: src/compose.c:1805
 #, c-format
 msgid "Message: %s"
 msgstr "Správa: %s"
 
-#: src/compose.c:1797 src/mimeview.c:491
+#: src/compose.c:1876 src/mimeview.c:491
 msgid "Can't get the part of multipart message."
 msgstr "Nedá sa získať časť viacdielnej správy."
 
-#: src/compose.c:2188
+#: src/compose.c:2267
 msgid " [Edited]"
 msgstr "[Upravené]"
 
-#: src/compose.c:2190
+#: src/compose.c:2269
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Písanie správy%s"
 
-#: src/compose.c:2193
+#: src/compose.c:2272
 #, c-format
 msgid "Compose message%s"
 msgstr "Písanie správy%s"
 
-#: src/compose.c:2304
+#: src/compose.c:2383
 msgid "Recipient is not specified."
 msgstr "Nie je určený príjemca."
 
-#: src/compose.c:2312 src/compose.c:4112 src/mainwindow.c:2144
+#: src/compose.c:2391 src/compose.c:4213 src/mainwindow.c:2153
 #: src/prefs_account.c:703 src/prefs_common.c:850
 msgid "Send"
 msgstr "Odoslať"
 
-#: src/compose.c:2313
+#: src/compose.c:2392
 msgid "Subject is empty. Send it anyway?"
 msgstr "Predmet je prázdny. Odoslať napriek tomu?"
 
-#: src/compose.c:2364
+#: src/compose.c:2443
 msgid "can't get recipient list."
 msgstr "nedá sa získať zoznam príjemcov."
 
-#: src/compose.c:2384
+#: src/compose.c:2463
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -969,26 +1087,26 @@ msgstr ""
 "Nie je určené konto pre odosielanie správ.\n"
 "Pred odosielaním prosím zvoľte poštové konto."
 
-#: src/compose.c:2398 src/send_message.c:261
+#: src/compose.c:2477 src/send_message.c:261
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Pri odosielaní správy na %s nastala chyba."
 
-#: src/compose.c:2421
+#: src/compose.c:2500
 msgid "Can't save the message to outbox."
 msgstr "Správa sa nedá uložiť medzi odoslané správy."
 
-#: src/compose.c:2457
+#: src/compose.c:2536
 #, 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:2518 src/compose.c:2739 src/compose.c:2802 src/compose.c:2921
+#: src/compose.c:2597 src/compose.c:2820 src/compose.c:2883 src/compose.c:3003
 #: src/utils.c:2189
 msgid "can't change file mode\n"
 msgstr "nedá sa zmeniť mód súboru\n"
 
-#: src/compose.c:2546
+#: src/compose.c:2627
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -998,140 +1116,140 @@ msgstr ""
 "%s na %s.\n"
 "Odoslať správu aj napriek tomu?"
 
-#: src/compose.c:2610
+#: src/compose.c:2691
 msgid "can't write headers\n"
 msgstr "nedá sa zapísať hlavička\n"
 
-#: src/compose.c:2881
+#: src/compose.c:2963
 msgid "can't remove the old message\n"
 msgstr "nedá sa odstrániť stará správa\n"
 
-#: src/compose.c:2899
+#: src/compose.c:2981
 msgid "queueing message...\n"
 msgstr "zaraďujem správu do fronty...\n"
 
-#: src/compose.c:2981
+#: src/compose.c:3063
 msgid "can't find queue folder\n"
 msgstr "nemôžem nájsť priečinok Na odoslanie\n"
 
-#: src/compose.c:2988
+#: src/compose.c:3070
 msgid "can't queue the message\n"
 msgstr "nemôžem zaradiť správu do fronty\n"
 
-#: src/compose.c:3547
+#: src/compose.c:3645
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "vygenerovaný Message-ID: %s\n"
 
-#: src/compose.c:3645
+#: src/compose.c:3743
 msgid "Creating compose window...\n"
 msgstr "Vytváram okno pre písanie správy...\n"
 
-#: src/compose.c:3648 src/compose.c:4598
+#: src/compose.c:3746 src/compose.c:4734
 msgid "MIME type"
 msgstr "MIME typ"
 
 #. S_COL_DATE
-#: src/compose.c:3649 src/mimeview.c:150 src/prefs_filter_edit.c:569
+#: src/compose.c:3747 src/mimeview.c:150 src/prefs_filter_edit.c:569
 #: src/prefs_summary_column.c:73 src/select-keys.c:317 src/summaryview.c:386
 msgid "Size"
 msgstr "Veľkosť"
 
-#: src/compose.c:3700 src/headerview.c:53 src/summary_search.c:169
+#: src/compose.c:3798 src/headerview.c:53 src/summary_search.c:169
 msgid "From:"
 msgstr "Od:"
 
-#: src/compose.c:4113
+#: src/compose.c:4214
 msgid "Send message"
 msgstr "Odoslať správu"
 
-#: src/compose.c:4121
+#: src/compose.c:4222
 msgid "Send later"
 msgstr "Odoslať neskôr"
 
-#: src/compose.c:4122
+#: src/compose.c:4223
 msgid "Put into queue folder and send later"
 msgstr "Zaradiť správu do priečinka Na odoslanie a odoslať neskôr"
 
-#: src/compose.c:4130
+#: src/compose.c:4231
 msgid "Draft"
 msgstr "Koncept"
 
-#: src/compose.c:4131
+#: src/compose.c:4232
 msgid "Save to draft folder"
 msgstr "Uložiť medzi koncepty"
 
-#: src/compose.c:4141 src/compose.c:5382
+#: src/compose.c:4242 src/compose.c:5527
 msgid "Insert"
 msgstr "Vložiť"
 
-#: src/compose.c:4142
+#: src/compose.c:4243
 msgid "Insert file"
 msgstr "Vložiť obsah súboru"
 
-#: src/compose.c:4150
+#: src/compose.c:4251
 msgid "Attach"
 msgstr "Pripojiť"
 
-#: src/compose.c:4151
+#: src/compose.c:4252
 msgid "Attach file"
 msgstr "Pripojiť súbor"
 
 #. signature
-#: src/compose.c:4161 src/prefs_account.c:1339 src/prefs_common.c:1261
+#: src/compose.c:4262 src/prefs_account.c:1339 src/prefs_common.c:1273
 msgid "Signature"
 msgstr "Podpis"
 
-#: src/compose.c:4162
+#: src/compose.c:4263
 msgid "Insert signature"
 msgstr "Vložiť podpis"
 
-#: src/compose.c:4171 src/prefs_common.c:1283 src/prefs_common.c:2165
+#: src/compose.c:4272 src/prefs_common.c:1295 src/prefs_common.c:2177
 msgid "Editor"
 msgstr "Editor"
 
-#: src/compose.c:4172
+#: src/compose.c:4273
 msgid "Edit with external editor"
 msgstr "Upraviť pomocou externého editoru"
 
-#: src/compose.c:4180
+#: src/compose.c:4281
 msgid "Linewrap"
 msgstr "Riadkovanie"
 
-#: src/compose.c:4181
+#: src/compose.c:4282
 msgid "Wrap all long lines"
 msgstr "Zalomiť všetky dlhé riadky"
 
-#: src/compose.c:4492
+#: src/compose.c:4628
 msgid "Invalid MIME type."
 msgstr "Neplatný MIME typ."
 
-#: src/compose.c:4511
+#: src/compose.c:4647
 msgid "File doesn't exist or is empty."
 msgstr "Súbor neexistuje alebo je prázdny."
 
-#: src/compose.c:4580
+#: src/compose.c:4716
 msgid "Properties"
 msgstr "Vlastnosti"
 
-#: src/compose.c:4600
+#: src/compose.c:4736
 msgid "Encoding"
 msgstr "Kódová stránka"
 
-#: src/compose.c:4623 src/prefs_folder_item.c:183
+#: src/compose.c:4759 src/prefs_folder_item.c:183
 msgid "Path"
 msgstr "Cesta"
 
-#: src/compose.c:4624
+#: src/compose.c:4760
 msgid "File name"
 msgstr "Názov súboru"
 
-#: src/compose.c:4778
+#: src/compose.c:4914
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Neplatný príkaz pre externý editor: `%s'\n"
 
-#: src/compose.c:4804
+#: src/compose.c:4940
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1142,72 +1260,72 @@ msgstr ""
 "Ukončiť ho násilne?\n"
 "skupinový ID procesu: %d"
 
-#: src/compose.c:4817
+#: src/compose.c:4953
 #, c-format
 msgid "Terminated process group id: %d"
 msgstr "Ukončená skupina procesov s ID: %d"
 
-#: src/compose.c:4818
+#: src/compose.c:4954
 #, c-format
 msgid "Temporary file: %s"
 msgstr "Dočasný súbor: %s"
 
-#: src/compose.c:4842
+#: src/compose.c:4978
 msgid "Compose: input from monitoring process\n"
 msgstr "Písanie: vstup z externého procesu\n"
 
 #. failed
-#: src/compose.c:4875
+#: src/compose.c:5011
 msgid "Couldn't exec external editor\n"
 msgstr "Nedá sa spustiť externý editor\n"
 
-#: src/compose.c:4879
+#: src/compose.c:5015
 msgid "Couldn't write to file\n"
 msgstr "Nedá sa zapisovať do súboru\n"
 
-#: src/compose.c:4881
+#: src/compose.c:5017
 msgid "Pipe read failed\n"
 msgstr "Nedá sa čítať z potrubia\n"
 
-#: src/compose.c:5182 src/compose.c:5190 src/compose.c:5196
+#: src/compose.c:5318 src/compose.c:5326 src/compose.c:5332
 msgid "Can't queue the message."
 msgstr "Správa sa nedá zaradiť do fronty."
 
-#: src/compose.c:5287
+#: src/compose.c:5423
 #, fuzzy
 msgid "Select files"
 msgstr "Vybrať súbor"
 
-#: src/compose.c:5309
+#: src/compose.c:5445
 msgid "Select file"
 msgstr "Vybrať súbor"
 
-#: src/compose.c:5344
+#: src/compose.c:5480
 msgid "Discard message"
 msgstr "Zrušiť správu"
 
-#: src/compose.c:5345
+#: src/compose.c:5481
 msgid "This message has been modified. discard it?"
 msgstr "Obsah správy sa zmenil. Chcete zahodiť zmeny?"
 
-#: src/compose.c:5346
+#: src/compose.c:5482
 msgid "Discard"
 msgstr "Zahodiť"
 
-#: src/compose.c:5346
+#: src/compose.c:5482
 msgid "to Draft"
 msgstr "medzi Koncepty"
 
-#: src/compose.c:5379
+#: src/compose.c:5524
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Chcete použiť šablónu `%s' ?"
 
-#: src/compose.c:5381
+#: src/compose.c:5526
 msgid "Apply template"
 msgstr "Použiť šablónu"
 
-#: src/compose.c:5382
+#: src/compose.c:5527
 msgid "Replace"
 msgstr "Nahradiť"
 
@@ -1650,12 +1768,12 @@ msgstr "Nastavujem informácie o priečinku...\n"
 msgid "Setting folder info..."
 msgstr "Nastavujem informácie o priečinku..."
 
-#: src/folderview.c:652 src/mainwindow.c:3190 src/setup.c:81
+#: src/folderview.c:652 src/mainwindow.c:3199 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Prehľadávam priečinok %s%c%s ..."
 
-#: src/folderview.c:656 src/mainwindow.c:3195 src/setup.c:86
+#: src/folderview.c:656 src/mainwindow.c:3204 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Prehľadávam priečinok %s ..."
@@ -2111,7 +2229,7 @@ msgstr "Importovať súbor LDIF do adresára"
 msgid "Prev"
 msgstr "Predchádzajúci"
 
-#: src/importldif.c:761 src/mainwindow.c:2230
+#: src/importldif.c:761 src/mainwindow.c:2239
 msgid "Next"
 msgstr "Nasledujúca"
 
@@ -2572,7 +2690,8 @@ msgid "/_View/Separate f_older tree"
 msgstr "/_Zobraziť/Samostatný str_om priečinkov"
 
 #: src/mainwindow.c:514
-msgid "/_View/Separate m_essage view"
+#, fuzzy
+msgid "/_View/Separate _message view"
 msgstr "/_Zobraziť/Samostatné zobraz_enie správy"
 
 #: src/mainwindow.c:516
@@ -2708,427 +2827,344 @@ msgstr "/_Zobraziť/Pre_jsť na/Ďa_lšiu správu s návestím"
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Zobraziť/Pre_jsť na/Iný priečino_k..."
 
-#: src/mainwindow.c:568 src/mainwindow.c:575 src/messageview.c:150
-msgid "/_View/_Code set/---"
-msgstr "/_Zobraziť/_Kódovanie/---"
-
-#: src/mainwindow.c:572 src/messageview.c:154
-msgid "/_View/_Code set"
-msgstr "/_Zobraziť/_Kódovanie"
-
 #: src/mainwindow.c:573 src/messageview.c:155
-msgid "/_View/_Code set/_Auto detect"
+#, fuzzy
+msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Zobraziť/_Kódovanie/_Automatické"
 
-#: src/mainwindow.c:576 src/messageview.c:158
-msgid "/_View/_Code set/7bit ascii (US-ASC_II)"
-msgstr "/_Zobraziť/_Kódovanie/7bit ascii (US-ASC_II)"
-
-#: src/mainwindow.c:579 src/messageview.c:161
-msgid "/_View/_Code set/Unicode (_UTF-8)"
-msgstr "/_Zobraziť/_Kódovanie/Unicode (_UTF-8)"
-
-#: src/mainwindow.c:582 src/messageview.c:164
-msgid "/_View/_Code set/Western European (ISO-8859-_1)"
-msgstr "/_Zobraziť/_Kódovanie/Západná Európa (ISO-8859-_1)"
-
-#: src/mainwindow.c:584 src/messageview.c:166
-msgid "/_View/_Code set/Western European (ISO-8859-15)"
-msgstr "/_Zobraziť/_Kódovanie/Západná Európa (ISO-8859-15)"
-
-#: src/mainwindow.c:587 src/messageview.c:169
-msgid "/_View/_Code set/Central European (ISO-8859-_2)"
-msgstr "/_Zobraziť/_Kódovanie/Stredná Európa (ISO-8859-_2)"
-
-#: src/mainwindow.c:590 src/messageview.c:172
-msgid "/_View/_Code set/_Baltic (ISO-8859-13)"
-msgstr "/_Zobraziť/_Kódovanie/_Pobaltie (ISO-8859-13)"
-
-#: src/mainwindow.c:592 src/messageview.c:174
-msgid "/_View/_Code set/Baltic (ISO-8859-_4)"
-msgstr "/_Zobraziť/_Kódovanie/Pobaltie (ISO-8859-_4)"
-
-#: src/mainwindow.c:595 src/messageview.c:177
-msgid "/_View/_Code set/Greek (ISO-8859-_7)"
-msgstr "/_Zobraziť/_Kódovanie/Grécko (ISO-8859-_7)"
-
-#: src/mainwindow.c:598 src/messageview.c:180
-msgid "/_View/_Code set/Turkish (ISO-8859-_9)"
-msgstr "/_Zobraziť/_Kódovanie/Turecko (ISO-8859-_9)"
-
-#: src/mainwindow.c:601 src/messageview.c:183
-msgid "/_View/_Code set/Cyrillic (ISO-8859-_5)"
-msgstr "/_Zobraziť/_Kódovanie/Cyrilika (ISO-8859-_5)"
-
-#: src/mainwindow.c:603 src/messageview.c:185
-msgid "/_View/_Code set/Cyrillic (KOI8-_R)"
-msgstr "/_Zobraziť/_Kódovanie/Cyrilika (KOI8-_R)"
-
-#: src/mainwindow.c:605 src/messageview.c:187
+#: src/mainwindow.c:618 src/messageview.c:194
 #, fuzzy
-msgid "/_View/_Code set/Cyrillic (KOI8-U)"
-msgstr "/_Zobraziť/_Kódovanie/Cyrilika (KOI8-_R)"
-
-#: src/mainwindow.c:607 src/messageview.c:189
-msgid "/_View/_Code set/Cyrillic (Windows-1251)"
-msgstr "/_Zobraziť/_Kódovanie/Cyrilika (Windows-1251)"
-
-#: src/mainwindow.c:610 src/messageview.c:192
-msgid "/_View/_Code set/Japanese (ISO-2022-_JP)"
-msgstr "/_Zobraziť/_Kódovanie/Japonsko (ISO-2022-_JP)"
-
-#: src/mainwindow.c:612 src/messageview.c:194
-msgid "/_View/_Code set/Japanese (ISO-2022-JP-2)"
+msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Zobraziť/_Kódovanie/Japonsko (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:614 src/messageview.c:196
-msgid "/_View/_Code set/Japanese (_EUC-JP)"
+#: src/mainwindow.c:620 src/messageview.c:196
+#, fuzzy
+msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Zobraziť/_Kódovanie/Japonsko (_EUC-JP)"
 
-#: src/mainwindow.c:616 src/messageview.c:198
-msgid "/_View/_Code set/Japanese (_Shift__JIS)"
+#: src/mainwindow.c:622 src/messageview.c:198
+#, fuzzy
+msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Zobraziť/_Kódovanie/Japonsko (_Shift__JIS)"
 
-#: src/mainwindow.c:619 src/messageview.c:201
-msgid "/_View/_Code set/Simplified Chinese (_GB2312)"
-msgstr "/_Zobraziť/_Kódovanie/Zjednodušená čínština (_GB2312)"
-
-#: src/mainwindow.c:621 src/messageview.c:203
-msgid "/_View/_Code set/Traditional Chinese (_Big5)"
-msgstr "/_Zobraziť/_Kódovanie/Tradičná čínština (_Big5)"
-
-#: src/mainwindow.c:623 src/messageview.c:205
-msgid "/_View/_Code set/Traditional Chinese (EUC-_TW)"
-msgstr "/_Zobraziť/_Kódovanie/Tradičná čínština (EUC-_TW)"
-
-#: src/mainwindow.c:625 src/messageview.c:207
-msgid "/_View/_Code set/Chinese (ISO-2022-_CN)"
+#: src/mainwindow.c:632 src/messageview.c:207
+#, fuzzy
+msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Zobraziť/_Kódovanie/Čínština (ISO-2022-_CN)"
 
-#: src/mainwindow.c:628 src/messageview.c:210
-msgid "/_View/_Code set/Korean (EUC-_KR)"
-msgstr "/_Zobraziť/_Kódovanie/Kórea (EUC-_KR)"
-
-#: src/mainwindow.c:630 src/messageview.c:212
-msgid "/_View/_Code set/Korean (ISO-2022-KR)"
+#: src/mainwindow.c:638 src/messageview.c:212
+#, fuzzy
+msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Zobraziť/_Kódovanie/Kórea (ISO-2022-KR)"
 
-#: src/mainwindow.c:633 src/messageview.c:215
-msgid "/_View/_Code set/Thai (TIS-620)"
-msgstr "/_Zobraziť/_Kódovanie/Thajsko (TIS-620)"
-
-#: src/mainwindow.c:635 src/messageview.c:217
-msgid "/_View/_Code set/Thai (Windows-874)"
-msgstr "/_Zobraziť/_Kódovanie/Thajsko (Windows-874)"
-
-#: src/mainwindow.c:642 src/summaryview.c:371
+#: src/mainwindow.c:651 src/summaryview.c:371
 msgid "/_View/Open in new _window"
 msgstr "/_Zobraziť/Otvoriť v _novom okne"
 
-#: src/mainwindow.c:643 src/messageview.c:224
+#: src/mainwindow.c:652 src/messageview.c:224
 msgid "/_View/Mess_age source"
 msgstr "/_Zobraziť/Zdrojový kód správ_y"
 
-#: src/mainwindow.c:644 src/messageview.c:225
+#: src/mainwindow.c:653 src/messageview.c:225
 msgid "/_View/Show all _header"
 msgstr "/_Zobraziť/Zobraziť všetky _hlavičky"
 
-#: src/mainwindow.c:646
+#: src/mainwindow.c:655
 msgid "/_View/_Update summary"
 msgstr "/_Zobraziť/_Aktualizovať zoznam"
 
-#: src/mainwindow.c:648 src/messageview.c:227
+#: src/mainwindow.c:657 src/messageview.c:227
 msgid "/_Message"
 msgstr "/Sp_ráva"
 
-#: src/mainwindow.c:649
+#: src/mainwindow.c:658
 msgid "/_Message/Recei_ve"
 msgstr "/Sp_ráva/_Prijať"
 
-#: src/mainwindow.c:650
+#: src/mainwindow.c:659
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/Sp_ráva/_Prijať/Z _aktuálneho konta"
 
-#: src/mainwindow.c:652
+#: src/mainwindow.c:661
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/Sp_ráva/_Prijať/Zo _všetkých kônt"
 
-#: src/mainwindow.c:654
+#: src/mainwindow.c:663
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/Sp_ráva/_Prijať/_Ukončiť prijímanie"
 
-#: src/mainwindow.c:656
+#: src/mainwindow.c:665
 msgid "/_Message/Recei_ve/---"
 msgstr "/Sp_ráva/_Prijať/---"
 
-#: src/mainwindow.c:657
+#: src/mainwindow.c:666
 msgid "/_Message/_Send queued messages"
 msgstr "/Sp_ráva/_Odoslať správy vo fronte"
 
-#: src/mainwindow.c:658 src/mainwindow.c:660 src/mainwindow.c:667
-#: src/mainwindow.c:672 src/mainwindow.c:676 src/mainwindow.c:685
+#: src/mainwindow.c:667 src/mainwindow.c:669 src/mainwindow.c:676
+#: src/mainwindow.c:681 src/mainwindow.c:685 src/mainwindow.c:694
 #: src/messageview.c:230 src/messageview.c:238 src/messageview.c:243
 msgid "/_Message/---"
 msgstr "/Sp_ráva/---"
 
-#: src/mainwindow.c:659 src/messageview.c:228
+#: src/mainwindow.c:668 src/messageview.c:228
 msgid "/_Message/Compose _new message"
 msgstr "/Sp_ráva/_Napísať novú správu"
 
-#: src/mainwindow.c:661 src/messageview.c:231
+#: src/mainwindow.c:670 src/messageview.c:231
 msgid "/_Message/_Reply"
 msgstr "/Sp_ráva/O_dpovedať"
 
-#: src/mainwindow.c:662
+#: src/mainwindow.c:671
 msgid "/_Message/Repl_y to"
 msgstr "/Sp_ráva/Odpo_vedať komu"
 
-#: src/mainwindow.c:663 src/messageview.c:232
+#: src/mainwindow.c:672 src/messageview.c:232
 msgid "/_Message/Repl_y to/_all"
 msgstr "/Sp_ráva/Odpoved_ať komu/_všetkým"
 
-#: src/mainwindow.c:664 src/messageview.c:234
+#: src/mainwindow.c:673 src/messageview.c:234
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/Sp_ráva/Od_povedať komu/_odosielateľovi"
 
-#: src/mainwindow.c:665 src/messageview.c:236
+#: src/mainwindow.c:674 src/messageview.c:236
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/Sp_ráva/Od_povedať komu/do _diskusnej skupiny"
 
-#: src/mainwindow.c:668 src/messageview.c:239
+#: src/mainwindow.c:677 src/messageview.c:239
 msgid "/_Message/_Forward"
 msgstr "/Sp_ráva/_Poslať ďalej"
 
-#: src/mainwindow.c:669 src/messageview.c:240
+#: src/mainwindow.c:678 src/messageview.c:240
 msgid "/_Message/For_ward as attachment"
 msgstr "/Sp_ráva/Poslať ako p_rílohu"
 
-#: src/mainwindow.c:671 src/messageview.c:242
+#: src/mainwindow.c:680 src/messageview.c:242
 msgid "/_Message/Redirec_t"
 msgstr "/Sp_ráva/Pre_smerovať"
 
-#: src/mainwindow.c:673
+#: src/mainwindow.c:682
 msgid "/_Message/M_ove..."
 msgstr "/Sp_ráva/Pres_unúť"
 
-#: src/mainwindow.c:674
+#: src/mainwindow.c:683
 msgid "/_Message/_Copy..."
 msgstr "/Sp_ráva/_Kopírovať"
 
-#: src/mainwindow.c:675
+#: src/mainwindow.c:684
 msgid "/_Message/_Delete"
 msgstr "/Sp_ráva/Z_mazať"
 
-#: src/mainwindow.c:677
+#: src/mainwindow.c:686
 msgid "/_Message/_Mark"
 msgstr "/Sp_ráva/O_značiť"
 
-#: src/mainwindow.c:678
+#: src/mainwindow.c:687
 msgid "/_Message/_Mark/_Mark"
 msgstr "/Sp_ráva/O_značiť/O_značiť"
 
-#: src/mainwindow.c:679
+#: src/mainwindow.c:688
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/Sp_ráva/O_značiť/O_dznačiť"
 
-#: src/mainwindow.c:680
+#: src/mainwindow.c:689
 msgid "/_Message/_Mark/---"
 msgstr "/Sp_ráva/O_značiť/---"
 
-#: src/mainwindow.c:681
+#: src/mainwindow.c:690
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/Sp_ráva/O_značiť/Označiť ako _neprečítané"
 
-#: src/mainwindow.c:682
+#: src/mainwindow.c:691
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/Sp_ráva/O_značiť/Označiť ako _prečítané"
 
-#: src/mainwindow.c:684
+#: src/mainwindow.c:693
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/Sp_ráva/O_značiť/Označiť _všetky ako prečítané"
 
-#: src/mainwindow.c:686 src/messageview.c:244
+#: src/mainwindow.c:695 src/messageview.c:244
 msgid "/_Message/Re-_edit"
 msgstr "/Sp_ráva/Znovu _editovať"
 
-#: src/mainwindow.c:690 src/messageview.c:248
+#: src/mainwindow.c:699 src/messageview.c:248
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/_Nástroje/Pridať _odosielateľa do adresára"
 
-#: src/mainwindow.c:693
+#: src/mainwindow.c:702
 #, fuzzy
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/_Nástroje/_Filtrovať správy"
 
-#: src/mainwindow.c:695
+#: src/mainwindow.c:704
 #, fuzzy
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Nástroje/_Filtrovať správy"
 
-#: src/mainwindow.c:697 src/messageview.c:251
+#: src/mainwindow.c:706 src/messageview.c:251
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Nástroje/Vytvoriť pravidlo fi_ltra"
 
-#: src/mainwindow.c:698 src/messageview.c:253
+#: src/mainwindow.c:707 src/messageview.c:253
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Nástroje/Vytvoriť pravidlo fi_ltra/_Automaticky"
 
-#: src/mainwindow.c:700 src/messageview.c:255
+#: src/mainwindow.c:709 src/messageview.c:255
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Nástroje/Vytvoriť pravidlo fi_ltra/podľa _odosielateľa"
 
-#: src/mainwindow.c:702 src/messageview.c:257
+#: src/mainwindow.c:711 src/messageview.c:257
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Nástroje/Vytvoriť pravidlo fi_ltra/podľa _príjemcu"
 
-#: src/mainwindow.c:704 src/messageview.c:259
+#: src/mainwindow.c:713 src/messageview.c:259
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Nástroje/Vytvoriť pravidlo fi_ltra/podľa p_redmetu"
 
-#: src/mainwindow.c:709
+#: src/mainwindow.c:718
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/_Nástroje/Zmazať du_plikátne správy"
 
-#: src/mainwindow.c:712
+#: src/mainwindow.c:721
 msgid "/_Tools/E_xecute"
 msgstr "/_Nástroje/V_ykonať"
 
-#: src/mainwindow.c:714
+#: src/mainwindow.c:723
 msgid "/_Tools/_Log window"
 msgstr "/_Nástroje/Okno _záznamu"
 
-#: src/mainwindow.c:716
+#: src/mainwindow.c:725
 msgid "/_Configuration"
 msgstr "/Nastav_enia"
 
-#: src/mainwindow.c:717
+#: src/mainwindow.c:726
 msgid "/_Configuration/_Common preferences..."
 msgstr "/Nastav_enia/_Všeobecné nastavenia..."
 
-#: src/mainwindow.c:719
+#: src/mainwindow.c:728
 msgid "/_Configuration/_Filter setting..."
 msgstr "/Nastav_enia/Nastavenie _filtru..."
 
-#: src/mainwindow.c:721
+#: src/mainwindow.c:730
 msgid "/_Configuration/_Template..."
 msgstr "/Nastav_enia/Š_ablóna..."
 
-#: src/mainwindow.c:722
+#: src/mainwindow.c:731
 msgid "/_Configuration/_Actions..."
 msgstr "/Nastav_enia/_Akcie..."
 
-#: src/mainwindow.c:723
+#: src/mainwindow.c:732
 msgid "/_Configuration/---"
 msgstr "/Nastav_enia/---"
 
-#: src/mainwindow.c:724
+#: src/mainwindow.c:733
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/Nastav_enia/Nastavenia aktívneho _konta..."
 
-#: src/mainwindow.c:726
+#: src/mainwindow.c:735
 msgid "/_Configuration/Create _new account..."
 msgstr "/Nastav_enia/Vytvoriť _nové konto..."
 
-#: src/mainwindow.c:728
+#: src/mainwindow.c:737
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/Nastav_enia/_Upraviť kontá..."
 
-#: src/mainwindow.c:730
+#: src/mainwindow.c:739
 msgid "/_Configuration/C_hange current account"
 msgstr "/Nastav_enia/_Zmeniť aktívne konto"
 
-#: src/mainwindow.c:734
+#: src/mainwindow.c:743
 msgid "/_Help/_Manual"
 msgstr "/Nápo_veda/_Manuál"
 
-#: src/mainwindow.c:735
+#: src/mainwindow.c:744
 msgid "/_Help/_Manual/_English"
 msgstr "/Nápo_veda/_Manuál/_Anglicky"
 
-#: src/mainwindow.c:736
+#: src/mainwindow.c:745
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/Nápo_veda/_Manuál/_Japonsky"
 
-#: src/mainwindow.c:737
+#: src/mainwindow.c:746
 msgid "/_Help/_FAQ"
 msgstr "/Nápo_veda/_FAQ"
 
-#: src/mainwindow.c:738
+#: src/mainwindow.c:747
 msgid "/_Help/_FAQ/_English"
 msgstr "/Nápo_veda/_FAQ/_Anglicky"
 
-#: src/mainwindow.c:739
+#: src/mainwindow.c:748
 msgid "/_Help/_FAQ/_German"
 msgstr "/Nápo_veda/_FAQ/_Japonsky"
 
-#: src/mainwindow.c:740
+#: src/mainwindow.c:749
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/Nápo_veda/_FAQ/Š_panielsky"
 
-#: src/mainwindow.c:741
+#: src/mainwindow.c:750
 msgid "/_Help/_FAQ/_French"
 msgstr "/Nápo_veda/_FAQ/_Francúzky"
 
-#: src/mainwindow.c:742
+#: src/mainwindow.c:751
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/Nápo_veda/_FAQ/_Taliansky"
 
-#: src/mainwindow.c:743
+#: src/mainwindow.c:752
 msgid "/_Help/---"
 msgstr "/Nápo_veda/---"
 
-#: src/mainwindow.c:783
+#: src/mainwindow.c:792
 msgid "Creating main window...\n"
 msgstr "Vytváram hlavné okno...\n"
 
-#: src/mainwindow.c:943
+#: src/mainwindow.c:952
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Hlavné Okno: alokácia farieb %d bola neúspešná\n"
 
-#: src/mainwindow.c:1021 src/summaryview.c:1368 src/summaryview.c:1677
+#: src/mainwindow.c:1030 src/summaryview.c:1368 src/summaryview.c:1677
 #: src/summaryview.c:1785 src/summaryview.c:1831 src/summaryview.c:2453
 #: src/summaryview.c:3080 src/summaryview.c:3146 src/summaryview.c:3171
 #: src/summaryview.c:3284
 msgid "done.\n"
 msgstr "hotovo.\n"
 
-#: src/mainwindow.c:1137 src/mainwindow.c:1178 src/mainwindow.c:1206
+#: src/mainwindow.c:1146 src/mainwindow.c:1187 src/mainwindow.c:1215
 msgid "Untitled"
 msgstr "Bez názvu"
 
-#: src/mainwindow.c:1207
+#: src/mainwindow.c:1216
 msgid "none"
 msgstr "žiadny"
 
-#: src/mainwindow.c:1257
+#: src/mainwindow.c:1266
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "Mením typ oddeľovača okien z %d na %d\n"
 
-#: src/mainwindow.c:1477
+#: src/mainwindow.c:1486
 msgid "Offline"
 msgstr "Odpojené"
 
-#: src/mainwindow.c:1478
+#: src/mainwindow.c:1487
 msgid "You are offline. Go online?"
 msgstr "Ste odpojený. Pripojiť sa?"
 
-#: src/mainwindow.c:1492
+#: src/mainwindow.c:1501
 #, fuzzy
 msgid "Empty all trash"
 msgstr "Vyprázdniť kôš"
 
-#: src/mainwindow.c:1493
+#: src/mainwindow.c:1502
 #, fuzzy
 msgid "Empty messages in all trash?"
 msgstr "Zmazať všetky správy v koši?"
 
-#: src/mainwindow.c:1521
+#: src/mainwindow.c:1530
 msgid "Add mailbox"
 msgstr "Pridať mailbox"
 
-#: src/mainwindow.c:1522
+#: src/mainwindow.c:1531
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3138,16 +3174,16 @@ msgstr ""
 "Ak zadáte existujúci mailbox, bude\n"
 "automaticky prehľadaný."
 
-#: src/mainwindow.c:1528
+#: src/mainwindow.c:1537
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Mailbox '%s' už existuje."
 
-#: src/mainwindow.c:1533 src/setup.c:57
+#: src/mainwindow.c:1542 src/setup.c:57
 msgid "Mailbox"
 msgstr "Mailbox"
 
-#: src/mainwindow.c:1539 src/setup.c:63
+#: src/mainwindow.c:1548 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3157,144 +3193,144 @@ msgstr ""
 "Pravdepodobne už niektoré súbory existujú, alebo tam nemáte práva na "
 "zapisovanie."
 
-#: src/mainwindow.c:1912
+#: src/mainwindow.c:1921
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Zobrazenie priečinku"
 
-#: src/mainwindow.c:1932 src/messageview.c:358
+#: src/mainwindow.c:1941 src/messageview.c:358
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Zobrazenie správy"
 
-#: src/mainwindow.c:2079 src/summaryview.c:340
+#: src/mainwindow.c:2088 src/summaryview.c:340
 msgid "/_Reply"
 msgstr "/_Odpovedať"
 
-#: src/mainwindow.c:2080
+#: src/mainwindow.c:2089
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "Odpovedať odosielateľovi i všetkým príjemcom"
 
-#: src/mainwindow.c:2081
+#: src/mainwindow.c:2090
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/O_dpovedať komu/_odosielateľovi"
 
-#: src/mainwindow.c:2082
+#: src/mainwindow.c:2091
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/O_dpovedať komu/do _diskusnej skupiny"
 
-#: src/mainwindow.c:2087 src/summaryview.c:347
+#: src/mainwindow.c:2096 src/summaryview.c:347
 msgid "/_Forward"
 msgstr "/_Poslať ďalej"
 
-#: src/mainwindow.c:2088 src/summaryview.c:348
+#: src/mainwindow.c:2097 src/summaryview.c:348
 msgid "/For_ward as attachment"
 msgstr "/Poslať ďalej ako p_rílohu"
 
-#: src/mainwindow.c:2089 src/summaryview.c:349
+#: src/mainwindow.c:2098 src/summaryview.c:349
 msgid "/Redirec_t"
 msgstr "/Pr_esmerovať"
 
-#: src/mainwindow.c:2125
+#: src/mainwindow.c:2134
 msgid "Get"
 msgstr "Prijať"
 
-#: src/mainwindow.c:2126
+#: src/mainwindow.c:2135
 msgid "Incorporate new mail"
 msgstr "Prijať novú poštu"
 
-#: src/mainwindow.c:2133
+#: src/mainwindow.c:2142
 msgid "Get all"
 msgstr "Prijať všetko"
 
-#: src/mainwindow.c:2134
+#: src/mainwindow.c:2143
 msgid "Incorporate new mail of all accounts"
 msgstr "Prijať novú poštu pre všetky kontá"
 
-#: src/mainwindow.c:2145
+#: src/mainwindow.c:2154
 msgid "Send queued message(s)"
 msgstr "Odoslať správy vo fronte"
 
-#: src/mainwindow.c:2155 src/prefs_account.c:705 src/prefs_common.c:852
+#: src/mainwindow.c:2164 src/prefs_account.c:705 src/prefs_common.c:852
 #: src/prefs_folder_item.c:137
 msgid "Compose"
 msgstr "Nová správa"
 
-#: src/mainwindow.c:2156
+#: src/mainwindow.c:2165
 msgid "Compose new message"
 msgstr "Napísať novú správu"
 
-#: src/mainwindow.c:2164 src/prefs_common.c:1353
+#: src/mainwindow.c:2173 src/prefs_common.c:1365
 msgid "Reply"
 msgstr "Odpovedať"
 
-#: src/mainwindow.c:2165 src/mainwindow.c:2178
+#: src/mainwindow.c:2174 src/mainwindow.c:2187
 msgid "Reply to the message"
 msgstr "Odpovedať na správu"
 
-#: src/mainwindow.c:2183
+#: src/mainwindow.c:2192
 msgid "Reply all"
 msgstr "Odp. všetkým"
 
-#: src/mainwindow.c:2184
+#: src/mainwindow.c:2193
 msgid "Reply to all"
 msgstr "Odpovedať odosielateľovi i všetkým príjemcom"
 
-#: src/mainwindow.c:2192 src/prefs_filter_edit.c:719
+#: src/mainwindow.c:2201 src/prefs_filter_edit.c:719
 msgid "Forward"
 msgstr "Poslať ďalej"
 
-#: src/mainwindow.c:2193 src/mainwindow.c:2206
+#: src/mainwindow.c:2202 src/mainwindow.c:2215
 msgid "Forward the message"
 msgstr "Poslať správu ďalej"
 
-#: src/mainwindow.c:2213
+#: src/mainwindow.c:2222
 msgid "Delete the message"
 msgstr "Zmazať správu"
 
-#: src/mainwindow.c:2221
+#: src/mainwindow.c:2230
 msgid "Execute"
 msgstr "Vykonať"
 
-#: src/mainwindow.c:2222
+#: src/mainwindow.c:2231
 msgid "Execute marked process"
 msgstr "Vykonať označený proces"
 
-#: src/mainwindow.c:2231
+#: src/mainwindow.c:2240
 msgid "Next unread message"
 msgstr "Ďalšia neprečítaná správa"
 
-#: src/mainwindow.c:2242
+#: src/mainwindow.c:2251
 msgid "Prefs"
 msgstr "Nastavenia"
 
-#: src/mainwindow.c:2243
+#: src/mainwindow.c:2252
 msgid "Common preferences"
 msgstr "Všeobecné nastavenia"
 
-#: src/mainwindow.c:2250 src/prefs_folder_item.c:258
+#: src/mainwindow.c:2259 src/prefs_folder_item.c:258
 #: src/prefs_folder_item.c:269 src/progressdialog.c:50
 msgid "Account"
 msgstr "Konto"
 
-#: src/mainwindow.c:2251
+#: src/mainwindow.c:2260
 msgid "Account setting"
 msgstr "Nastavenie konta"
 
-#: src/mainwindow.c:2425
+#: src/mainwindow.c:2434
 msgid "You are offline. Click the icon to go online."
 msgstr "Ste odpojený. Kliknite na ikonu, ak sa chcete pripojiť."
 
-#: src/mainwindow.c:2436
+#: src/mainwindow.c:2445
 msgid "You are online. Click the icon to go offline."
 msgstr "Ste pripojený. Kliknite na ikonu, ak sa chcete odpojiť."
 
-#: src/mainwindow.c:2624
+#: src/mainwindow.c:2633
 msgid "Exit"
 msgstr "Ukončiť"
 
-#: src/mainwindow.c:2624
+#: src/mainwindow.c:2633
 msgid "Exit this program?"
 msgstr "Ukončiť program"
 
@@ -3420,7 +3456,7 @@ msgstr "Hľadanie dokončené"
 msgid "Creating message view...\n"
 msgstr "Vytváram zobrazenie správy...\n"
 
-#: src/messageview.c:303 src/prefs_common.c:1550
+#: src/messageview.c:303 src/prefs_common.c:1562
 msgid "Text"
 msgstr "Text"
 
@@ -3433,7 +3469,7 @@ msgstr "Prílohy"
 msgid "Can't save the file `%s'."
 msgstr "Nemôžem uložiť súbor '%s'."
 
-#: src/messageview.c:697 src/prefs_common.c:2154 src/summaryview.c:2744
+#: src/messageview.c:697 src/prefs_common.c:2166 src/summaryview.c:2744
 msgid "Print"
 msgstr "Tlačiť"
 
@@ -3908,7 +3944,7 @@ msgstr "(Nefiltrované správy budú umiestnené v tomto priečinku)"
 msgid "Authentication method"
 msgstr "Metóda autentizácie"
 
-#: src/prefs_account.c:1123 src/prefs_account.c:1239 src/prefs_common.c:1189
+#: src/prefs_account.c:1123 src/prefs_account.c:1239 src/prefs_common.c:1201
 msgid "Automatic"
 msgstr "Automatická"
 
@@ -3932,7 +3968,7 @@ msgstr "Generovať Message-ID"
 msgid "Add user-defined header"
 msgstr "Pridať uživateľom definované hlavičky"
 
-#: src/prefs_account.c:1196 src/prefs_common.c:1714 src/prefs_common.c:1739
+#: src/prefs_account.c:1196 src/prefs_common.c:1726 src/prefs_common.c:1751
 msgid " Edit... "
 msgstr " Upresniť... "
 
@@ -4328,106 +4364,107 @@ msgid "Save sent messages to outbox"
 msgstr "Uložiť odoslané správy"
 
 #: src/prefs_common.c:1113
-msgid "Outgoing codeset"
+#, fuzzy
+msgid "Outgoing encoding"
 msgstr "Výstupné kódovanie znakov"
 
 #: src/prefs_common.c:1128
 msgid "Automatic (Recommended)"
 msgstr "Automatické (doporučené)"
 
-#: src/prefs_common.c:1129
+#: src/prefs_common.c:1130
 msgid "7bit ascii (US-ASCII)"
 msgstr "7bit ascii (US-ASCII)"
 
-#: src/prefs_common.c:1130
+#: src/prefs_common.c:1132
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
-#: src/prefs_common.c:1131
+#: src/prefs_common.c:1134
 msgid "Western European (ISO-8859-1)"
 msgstr "Západná Európa (ISO-8859-1)"
 
-#: src/prefs_common.c:1132
+#: src/prefs_common.c:1135
 msgid "Western European (ISO-8859-15)"
 msgstr "Západná Európa (ISO-8859-15)"
 
-#: src/prefs_common.c:1133
+#: src/prefs_common.c:1137
 msgid "Central European (ISO-8859-2)"
 msgstr "Stredná Európa (ISO-8859-2)"
 
-#: src/prefs_common.c:1134
+#: src/prefs_common.c:1139
 msgid "Baltic (ISO-8859-13)"
 msgstr "Pobaltie (ISO-8859-13)"
 
-#: src/prefs_common.c:1135
+#: src/prefs_common.c:1140
 msgid "Baltic (ISO-8859-4)"
 msgstr "Pobaltie (ISO-8859-4)"
 
-#: src/prefs_common.c:1136
+#: src/prefs_common.c:1142
 msgid "Greek (ISO-8859-7)"
 msgstr "Grécko (ISO-8859-7)"
 
-#: src/prefs_common.c:1137
+#: src/prefs_common.c:1144
 msgid "Turkish (ISO-8859-9)"
 msgstr "Turecko (ISO-8859-9)"
 
-#: src/prefs_common.c:1138
+#: src/prefs_common.c:1146
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Cyrilika (ISO-8859-5)"
 
-#: src/prefs_common.c:1139
+#: src/prefs_common.c:1147
 msgid "Cyrillic (KOI8-R)"
 msgstr "Cyrilika (KOI8-R)"
 
-#: src/prefs_common.c:1140
-msgid "Cyrillic (Windows-1251)"
-msgstr "Cyrilika (Windows-1251)"
-
-#: src/prefs_common.c:1141
+#: src/prefs_common.c:1148
 msgid "Cyrillic (KOI8-U)"
 msgstr "Cyrilika (KOI8-U)"
 
-#: src/prefs_common.c:1142
+#: src/prefs_common.c:1149
+msgid "Cyrillic (Windows-1251)"
+msgstr "Cyrilika (Windows-1251)"
+
+#: src/prefs_common.c:1151
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Japonsko (ISO-2022-JP)"
 
-#: src/prefs_common.c:1144
+#: src/prefs_common.c:1153
 msgid "Japanese (EUC-JP)"
 msgstr "Japonsko (EUC-JP)"
 
-#: src/prefs_common.c:1145
+#: src/prefs_common.c:1154
 msgid "Japanese (Shift_JIS)"
 msgstr "Japonsko (Shift_JIS)"
 
-#: src/prefs_common.c:1147
+#: src/prefs_common.c:1157
 msgid "Simplified Chinese (GB2312)"
 msgstr "Zjednodušená čínština (GB2312)"
 
-#: src/prefs_common.c:1148
+#: src/prefs_common.c:1158
 msgid "Traditional Chinese (Big5)"
 msgstr "Tradičná čínština (Big5)"
 
-#: src/prefs_common.c:1150
+#: src/prefs_common.c:1160
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Tradičná čínština (EUC-TW)"
 
-#: src/prefs_common.c:1151
+#: src/prefs_common.c:1161
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Čínština (ISO-2022-CN)"
 
-#: src/prefs_common.c:1153
+#: src/prefs_common.c:1164
 msgid "Korean (EUC-KR)"
 msgstr "Kórea (EUC-KR)"
 
-#: src/prefs_common.c:1154
+#: src/prefs_common.c:1166
 msgid "Thai (TIS-620)"
 msgstr "Thajsko (TIS-620)"
 
-#: src/prefs_common.c:1155
+#: src/prefs_common.c:1167
 msgid "Thai (Windows-874)"
 msgstr "Thajsko (Windows-874)"
 
-#: src/prefs_common.c:1165
+#: src/prefs_common.c:1177
 #, fuzzy
 msgid ""
 "If `Automatic' is selected, the optimal encoding for the current locale will "
@@ -4436,11 +4473,11 @@ msgstr ""
 "Po zvolení 'Automatické' bude zvolené optimálne kódovanie\n"
 "pre súčasnú lokalizáciu."
 
-#: src/prefs_common.c:1179
+#: src/prefs_common.c:1191
 msgid "Transfer encoding"
 msgstr "Kódovanie pri prenose"
 
-#: src/prefs_common.c:1202
+#: src/prefs_common.c:1214
 #, fuzzy
 msgid ""
 "Specify Content-Transfer-Encoding used when message body contains non-ASCII "
@@ -4449,441 +4486,441 @@ msgstr ""
 "Zadajte hodnotu Content-Transfer-Encoding, ktorá bude použitá,\n"
 "keď bude správa obsahovať iné znaky ako ASCII."
 
-#: src/prefs_common.c:1272
+#: src/prefs_common.c:1284
 msgid "Signature separator"
 msgstr "Oddeľovač podpisu"
 
-#: src/prefs_common.c:1281
+#: src/prefs_common.c:1293
 msgid "Insert automatically"
 msgstr "Vložiť automaticky"
 
-#: src/prefs_common.c:1291
+#: src/prefs_common.c:1303
 msgid "Automatically launch the external editor"
 msgstr "Automaticky spustiť externý editor"
 
-#: src/prefs_common.c:1301
+#: src/prefs_common.c:1313
 msgid "Undo level"
 msgstr "Počet spätných krokov"
 
-#: src/prefs_common.c:1321
+#: src/prefs_common.c:1333
 msgid "Wrap messages at"
 msgstr "Zalomiť správy na"
 
-#: src/prefs_common.c:1333
+#: src/prefs_common.c:1345
 msgid "characters"
 msgstr "znakoch"
 
-#: src/prefs_common.c:1343
+#: src/prefs_common.c:1355
 msgid "Wrap quotation"
 msgstr "Zalomiť citáciu"
 
-#: src/prefs_common.c:1349
+#: src/prefs_common.c:1361
 msgid "Wrap on input"
 msgstr "Zalamovať pri písaní"
 
-#: src/prefs_common.c:1351
+#: src/prefs_common.c:1363
 msgid "Wrap before sending"
 msgstr "Zalomiť pred odoslaním"
 
-#: src/prefs_common.c:1361
+#: src/prefs_common.c:1373
 msgid "Automatically select account for replies"
 msgstr "Automaticky zvoliť konto pri odpovedaní"
 
-#: src/prefs_common.c:1363
+#: src/prefs_common.c:1375
 msgid "Quote message when replying"
 msgstr "Pri odpovedaní citovať správu"
 
-#: src/prefs_common.c:1365
+#: src/prefs_common.c:1377
 msgid "Reply button invokes mailing list reply"
 msgstr "Tlačítko Odpovedať zvolí odpoveď do mailinglistu"
 
 #. reply
-#: src/prefs_common.c:1411
+#: src/prefs_common.c:1423
 msgid "Reply format"
 msgstr "Formát odpovede"
 
-#: src/prefs_common.c:1426 src/prefs_common.c:1468
+#: src/prefs_common.c:1438 src/prefs_common.c:1480
 msgid "Quotation mark"
 msgstr "Značka citácie"
 
 #. forward
-#: src/prefs_common.c:1453
+#: src/prefs_common.c:1465
 msgid "Forward format"
 msgstr "Formát posielania ďalej"
 
-#: src/prefs_common.c:1500
+#: src/prefs_common.c:1512
 msgid " Description of symbols "
 msgstr " Popis znakov "
 
-#: src/prefs_common.c:1541
+#: src/prefs_common.c:1553
 msgid "Font"
 msgstr "Písmo"
 
-#: src/prefs_common.c:1573
+#: src/prefs_common.c:1585
 msgid "Translate header name (such as `From:', `Subject:')"
 msgstr "Preložiť názov hlavičky (ako napríklad 'From:', 'Subject:')"
 
-#: src/prefs_common.c:1576
+#: src/prefs_common.c:1588
 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.c:1585
+#: src/prefs_common.c:1597
 msgid "Abbreviate newsgroups longer than"
 msgstr "Skrátiť diskusné skupiny dlhšie ako"
 
-#: src/prefs_common.c:1600
+#: src/prefs_common.c:1612
 msgid "letters"
 msgstr "písmen"
 
 #. ---- Summary ----
-#: src/prefs_common.c:1606
+#: src/prefs_common.c:1618
 msgid "Summary View"
 msgstr "Zoznam správ"
 
-#: src/prefs_common.c:1615
+#: src/prefs_common.c:1627
 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.c:1617
+#: src/prefs_common.c:1629
 msgid "Expand threads"
 msgstr "Rozbaliť vlákna"
 
-#: src/prefs_common.c:1625 src/prefs_common.c:2443 src/prefs_common.c:2481
+#: src/prefs_common.c:1637 src/prefs_common.c:2455 src/prefs_common.c:2493
 msgid "Date format"
 msgstr "Formát dátumu"
 
-#: src/prefs_common.c:1646
+#: src/prefs_common.c:1658
 msgid " Set display item of summary... "
 msgstr " Nastavenie zobrazovaných položiek v zozname správ... "
 
-#: src/prefs_common.c:1710
+#: src/prefs_common.c:1722
 msgid "Enable coloration of message"
 msgstr "Povoliť farby v správe"
 
-#: src/prefs_common.c:1724
+#: src/prefs_common.c:1736
 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.c:1730
+#: src/prefs_common.c:1742
 msgid "Display header pane above message view"
 msgstr "Zobraziť panel s hlavičkami nad správou"
 
-#: src/prefs_common.c:1737
+#: src/prefs_common.c:1749
 msgid "Display short headers on message view"
 msgstr "Zobraziť vybrané hlavičky v správe"
 
-#: src/prefs_common.c:1758
+#: src/prefs_common.c:1770
 msgid "Line space"
 msgstr "Medzera medzi riadkami"
 
-#: src/prefs_common.c:1772 src/prefs_common.c:1810
+#: src/prefs_common.c:1784 src/prefs_common.c:1822
 msgid "pixel(s)"
 msgstr "pixel(ov)"
 
-#: src/prefs_common.c:1777
+#: src/prefs_common.c:1789
 msgid "Scroll"
 msgstr "Posúvanie"
 
-#: src/prefs_common.c:1784
+#: src/prefs_common.c:1796
 msgid "Half page"
 msgstr "Pol stránky"
 
-#: src/prefs_common.c:1790
+#: src/prefs_common.c:1802
 msgid "Smooth scroll"
 msgstr "Plynulé posúvanie"
 
-#: src/prefs_common.c:1796
+#: src/prefs_common.c:1808
 msgid "Step"
 msgstr "Posun"
 
-#: src/prefs_common.c:1816
+#: src/prefs_common.c:1828
 msgid "Images"
 msgstr ""
 
-#: src/prefs_common.c:1824
+#: src/prefs_common.c:1836
 #, fuzzy
 msgid "Resize attached large images to fit in the window"
 msgstr "Prispôsobiť veľkosť priložených obrázkov"
 
-#: src/prefs_common.c:1826
+#: src/prefs_common.c:1838
 #, fuzzy
 msgid "Display images as inline"
 msgstr "Zobrazované hlavičky"
 
-#: src/prefs_common.c:1871
+#: src/prefs_common.c:1883
 msgid "Automatically check signatures"
 msgstr "Automaticky overovať podpisy"
 
-#: src/prefs_common.c:1874
+#: src/prefs_common.c:1886
 msgid "Show signature check result in a popup window"
 msgstr "Zobraziť výsledok overenia ako upozornenie"
 
-#: src/prefs_common.c:1877
+#: src/prefs_common.c:1889
 msgid "Store passphrase in memory temporarily"
 msgstr "Uložiť heslo dočasne v pamäti"
 
-#: src/prefs_common.c:1892
+#: src/prefs_common.c:1904
 msgid "Expired after"
 msgstr "Vymazať z pamäte za"
 
-#: src/prefs_common.c:1905
+#: src/prefs_common.c:1917
 msgid "minute(s) "
 msgstr "minút "
 
-#: src/prefs_common.c:1918
+#: src/prefs_common.c:1930
 #, 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.c:1932
+#: src/prefs_common.c:1944
 msgid "Grab input while entering a passphrase"
 msgstr "Zachytiť vstup počas zadávania hesla"
 
-#: src/prefs_common.c:1937
+#: src/prefs_common.c:1949
 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.c:1989
+#: src/prefs_common.c:2001
 msgid "Always open messages in summary when selected"
 msgstr "Otvoriť správu hneď pri zvolení v zozname"
 
-#: src/prefs_common.c:1993
+#: src/prefs_common.c:2005
 msgid "Open first unread message when entering a folder"
 msgstr "Pri vstupe do priečinka otvoriť prvú neprečítanú správu"
 
-#: src/prefs_common.c:1997
+#: src/prefs_common.c:2009
 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.c:2001
+#: src/prefs_common.c:2013
 msgid "Go to inbox after receiving new mail"
 msgstr "Po prijatí novej pošty sa presunúť do priečinka prijatých správ"
 
-#: src/prefs_common.c:2009
+#: src/prefs_common.c:2021
 msgid "Execute immediately when moving or deleting messages"
 msgstr "Pri presúvaní alebo mazaní správ toto vykonať okamžite"
 
-#: src/prefs_common.c:2021
+#: src/prefs_common.c:2033
 #, 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.c:2029
+#: src/prefs_common.c:2041
 msgid "Receive dialog"
 msgstr "Okno prijímania"
 
-#: src/prefs_common.c:2039
+#: src/prefs_common.c:2051
 msgid "Show receive dialog"
 msgstr "Zobraziť okno prijímania"
 
-#: src/prefs_common.c:2049
+#: src/prefs_common.c:2061
 msgid "Always"
 msgstr "Vždy"
 
-#: src/prefs_common.c:2050
+#: src/prefs_common.c:2062
 msgid "Only on manual receiving"
 msgstr "Len pri manuálnom prijímaní"
 
-#: src/prefs_common.c:2052
+#: src/prefs_common.c:2064
 msgid "Never"
 msgstr "Nikdy"
 
-#: src/prefs_common.c:2057
+#: src/prefs_common.c:2069
 msgid "Don't popup error dialog on receive error"
 msgstr "Nezobrazovať upozornenie pri chybe pri prijímaní"
 
-#: src/prefs_common.c:2060
+#: src/prefs_common.c:2072
 msgid "Close receive dialog when finished"
 msgstr "Po skončení zavrieť okno prijímania"
 
-#: src/prefs_common.c:2066
+#: src/prefs_common.c:2078
 msgid " Set key bindings... "
 msgstr " Nastaviť klávesové skratky... "
 
-#: src/prefs_common.c:2122
+#: src/prefs_common.c:2134
 #, 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.c:2131
+#: src/prefs_common.c:2143
 msgid "Web browser"
 msgstr "Webový prehliadač"
 
-#: src/prefs_common.c:2195
+#: src/prefs_common.c:2207
 msgid "Add address to destination when double-clicked"
 msgstr "Pridať adresu k príjemcom pri dvojkliknutí"
 
-#: src/prefs_common.c:2197
+#: src/prefs_common.c:2209
 msgid "On exit"
 msgstr "Pri ukončení"
 
-#: src/prefs_common.c:2205
+#: src/prefs_common.c:2217
 msgid "Confirm on exit"
 msgstr "Potvrdiť ukončenie"
 
-#: src/prefs_common.c:2212
+#: src/prefs_common.c:2224
 msgid "Empty trash on exit"
 msgstr "Vyprázdniť kôš pri ukončení"
 
-#: src/prefs_common.c:2214
+#: src/prefs_common.c:2226
 msgid "Ask before emptying"
 msgstr "Opýtať sa pred vyprázdnením"
 
-#: src/prefs_common.c:2218
+#: src/prefs_common.c:2230
 msgid "Warn if there are queued messages"
 msgstr "Upozorniť, ak sú správy vo fronte"
 
-#: src/prefs_common.c:2224
+#: src/prefs_common.c:2236
 msgid "Socket I/O timeout:"
 msgstr "Časový limit spojení:"
 
-#: src/prefs_common.c:2237
+#: src/prefs_common.c:2249
 msgid "second(s)"
 msgstr "sekúnd"
 
-#: src/prefs_common.c:2419
+#: src/prefs_common.c:2431
 msgid "the full abbreviated weekday name"
 msgstr "skrátený názov dňa v týždni"
 
-#: src/prefs_common.c:2420
+#: src/prefs_common.c:2432
 msgid "the full weekday name"
 msgstr "názov dňa v týždni"
 
-#: src/prefs_common.c:2421
+#: src/prefs_common.c:2433
 msgid "the abbreviated month name"
 msgstr "skrátený názov mesiaca"
 
-#: src/prefs_common.c:2422
+#: src/prefs_common.c:2434
 msgid "the full month name"
 msgstr "názov mesiaca"
 
-#: src/prefs_common.c:2423
+#: src/prefs_common.c:2435
 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.c:2424
+#: src/prefs_common.c:2436
 msgid "the century number (year/100)"
 msgstr "storočie (rok/100)"
 
-#: src/prefs_common.c:2425
+#: src/prefs_common.c:2437
 msgid "the day of the month as a decimal number"
 msgstr "deň v mesiaci"
 
-#: src/prefs_common.c:2426
+#: src/prefs_common.c:2438
 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.c:2427
+#: src/prefs_common.c:2439
 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.c:2428
+#: src/prefs_common.c:2440
 msgid "the day of the year as a decimal number"
 msgstr "číslo dňa v roku"
 
-#: src/prefs_common.c:2429
+#: src/prefs_common.c:2441
 msgid "the month as a decimal number"
 msgstr "číslo mesiaca"
 
-#: src/prefs_common.c:2430
+#: src/prefs_common.c:2442
 msgid "the minute as a decimal number"
 msgstr "minúty"
 
-#: src/prefs_common.c:2431
+#: src/prefs_common.c:2443
 msgid "either AM or PM"
 msgstr "AM alebo PM"
 
-#: src/prefs_common.c:2432
+#: src/prefs_common.c:2444
 msgid "the second as a decimal number"
 msgstr "sekundy"
 
-#: src/prefs_common.c:2433
+#: src/prefs_common.c:2445
 msgid "the day of the week as a decimal number"
 msgstr "poradie dňa v týždni"
 
-#: src/prefs_common.c:2434
+#: src/prefs_common.c:2446
 msgid "the preferred date for the current locale"
 msgstr "uprednostňovaný dátum pre súčasnú lokalizáciu"
 
-#: src/prefs_common.c:2435
+#: src/prefs_common.c:2447
 msgid "the last two digits of a year"
 msgstr "posledné dve číslice roku"
 
-#: src/prefs_common.c:2436
+#: src/prefs_common.c:2448
 msgid "the year as a decimal number"
 msgstr "rok"
 
-#: src/prefs_common.c:2437
+#: src/prefs_common.c:2449
 msgid "the time zone or name or abbreviation"
 msgstr "časová zóna, jej názov alebo skratka"
 
-#: src/prefs_common.c:2458
+#: src/prefs_common.c:2470
 msgid "Specifier"
 msgstr "Symbol"
 
-#: src/prefs_common.c:2459
+#: src/prefs_common.c:2471
 msgid "Description"
 msgstr "Popis"
 
-#: src/prefs_common.c:2499
+#: src/prefs_common.c:2511
 msgid "Example"
 msgstr "Príklad"
 
-#: src/prefs_common.c:2580
+#: src/prefs_common.c:2592
 msgid "Set message colors"
 msgstr "Nastaviť farby správy"
 
-#: src/prefs_common.c:2588
+#: src/prefs_common.c:2600
 msgid "Colors"
 msgstr "Farby"
 
-#: src/prefs_common.c:2622
+#: src/prefs_common.c:2634
 msgid "Quoted Text - First Level"
 msgstr "Citovaný text - Prvá úroveň"
 
-#: src/prefs_common.c:2628
+#: src/prefs_common.c:2640
 msgid "Quoted Text - Second Level"
 msgstr "Citovaný text - Druhá úroveň"
 
-#: src/prefs_common.c:2634
+#: src/prefs_common.c:2646
 msgid "Quoted Text - Third Level"
 msgstr "Citovaný text - Tretia úroveň"
 
-#: src/prefs_common.c:2640
+#: src/prefs_common.c:2652
 msgid "URI link"
 msgstr "URI odkaz"
 
-#: src/prefs_common.c:2647
+#: src/prefs_common.c:2659
 msgid "Recycle quote colors"
 msgstr "Opakovať farby"
 
-#: src/prefs_common.c:2707
+#: src/prefs_common.c:2719
 msgid "Pick color for quotation level 1"
 msgstr "Vyberte farbu pre 1. úroveň citácie"
 
-#: src/prefs_common.c:2710
+#: src/prefs_common.c:2722
 msgid "Pick color for quotation level 2"
 msgstr "Vyberte farbu pre 2. úroveň citácie"
 
-#: src/prefs_common.c:2713
+#: src/prefs_common.c:2725
 msgid "Pick color for quotation level 3"
 msgstr "Vyberte farbu pre 3. úroveň citácie"
 
-#: src/prefs_common.c:2716
+#: src/prefs_common.c:2728
 msgid "Pick color for URI"
 msgstr "Vyberte farbu pre URI odkazy"
 
-#: src/prefs_common.c:2853
+#: src/prefs_common.c:2865
 msgid "Description of symbols"
 msgstr "Popis symbolov"
 
-#: src/prefs_common.c:2909
+#: src/prefs_common.c:2921
 msgid ""
 "Date\n"
 "From\n"
@@ -4907,11 +4944,11 @@ msgstr ""
 "Diskusné skupiny\n"
 "Message-ID"
 
-#: src/prefs_common.c:2922
+#: src/prefs_common.c:2934
 msgid "If x is set, displays expr"
 msgstr "Ak je x zadané, zobrazí expr"
 
-#: src/prefs_common.c:2926
+#: src/prefs_common.c:2938
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -4925,7 +4962,7 @@ msgstr ""
 "Telo citovanej správy bez podpisu\n"
 "Znak %"
 
-#: src/prefs_common.c:2934
+#: src/prefs_common.c:2946
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -4937,15 +4974,15 @@ msgstr ""
 "Ľavá zložená zátvorka\n"
 "Pravá zložená zátvorka"
 
-#: src/prefs_common.c:2971
+#: src/prefs_common.c:2983
 msgid "Font selection"
 msgstr "Voľba písma"
 
-#: src/prefs_common.c:3035
+#: src/prefs_common.c:3047
 msgid "Key bindings"
 msgstr "Klávesové skratky"
 
-#: src/prefs_common.c:3049
+#: src/prefs_common.c:3061
 msgid ""
 "Select the preset of key bindings.\n"
 "You can also modify each menu's shortcuts by pressing\n"
@@ -4955,11 +4992,11 @@ msgstr ""
 "Môžete modifikovať skratky každého menu stlačením\n"
 "požadovanej skratky po ukázaní myšou na položku."
 
-#: src/prefs_common.c:3061 src/prefs_common.c:3410
+#: src/prefs_common.c:3073 src/prefs_common.c:3422
 msgid "Default"
 msgstr "Štandardné"
 
-#: src/prefs_common.c:3064 src/prefs_common.c:3419
+#: src/prefs_common.c:3076 src/prefs_common.c:3431
 msgid "Old Sylpheed"
 msgstr "Starší Sylpheed"
 
@@ -6125,6 +6162,12 @@ msgstr "%.2fGB"
 msgid "writing to %s failed.\n"
 msgstr "nepodaril sa zápis do %s.\n"
 
+#~ msgid "/_View/_Code set/---"
+#~ msgstr "/_Zobraziť/_Kódovanie/---"
+
+#~ msgid "/_View/_Code set"
+#~ msgstr "/_Zobraziť/_Kódovanie"
+
 #~ msgid "To save this part, pop up the context menu with "
 #~ msgstr "Pre uloženie tejto časti, vyvolajte kontextové menu "
 
diff --git a/po/sl.po b/po/sl.po
index a3195cfd..6efc82d5 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: 2005-03-15 14:29+0900\n"
+"POT-Creation-Date: 2005-03-16 14:47+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"
@@ -97,7 +97,7 @@ msgstr ""
 "v stolpcu `G', da omogočite pobiranje sporočil z ukazom `Poberi vsa'."
 
 #: src/account.c:638 src/addressadd.c:186 src/addressbook.c:488
-#: src/compose.c:3650 src/editaddress.c:195 src/editaddress.c:936
+#: src/compose.c:3748 src/editaddress.c:195 src/editaddress.c:936
 #: src/editaddress.c:984 src/editbook.c:191 src/editgroup.c:257
 #: src/editjpilot.c:296 src/editldap.c:300 src/editvcard.c:211
 #: src/mimeview.c:151 src/prefs_filter.c:214 src/prefs_folder_item.c:170
@@ -150,13 +150,13 @@ msgstr "Brisanje računa"
 msgid "Do you really want to delete this account?"
 msgstr "Ali resnično želite izbrisati ta račun?"
 
-#: src/account.c:758 src/compose.c:2551 src/compose.c:4807
+#: src/account.c:758 src/compose.c:2632 src/compose.c:4943
 #: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
 #: src/folderview.c:2156 src/folderview.c:2192
 msgid "Yes"
 msgstr "Da"
 
-#: src/account.c:758 src/compose.c:2551 src/compose.c:4807
+#: src/account.c:758 src/compose.c:2632 src/compose.c:4943
 #: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
 #: src/folderview.c:2156 src/folderview.c:2192
 msgid "+No"
@@ -259,7 +259,7 @@ msgstr ""
 msgid "Add Address to Book"
 msgstr "Dodaj naslov v adresar"
 
-#: src/addressadd.c:196 src/compose.c:4191 src/editaddress.c:196
+#: src/addressadd.c:196 src/compose.c:4292 src/editaddress.c:196
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "Naslov"
@@ -273,7 +273,7 @@ msgstr "Opombe"
 msgid "Select Address Book Folder"
 msgstr "Izberite mapo za adresar"
 
-#: src/addressbook.c:334 src/compose.c:469 src/mainwindow.c:454
+#: src/addressbook.c:334 src/compose.c:477 src/mainwindow.c:454
 #: src/messageview.c:134
 msgid "/_File"
 msgstr "/_Datoteka"
@@ -294,8 +294,8 @@ msgstr "/_Datoteka/Nov _JPilot"
 msgid "/_File/New _Server"
 msgstr "/_Datoteka/Nov _strežnik"
 
-#: src/addressbook.c:343 src/addressbook.c:346 src/compose.c:474
-#: src/compose.c:479 src/compose.c:483 src/mainwindow.c:471
+#: src/addressbook.c:343 src/addressbook.c:346 src/compose.c:482
+#: src/compose.c:487 src/compose.c:491 src/mainwindow.c:471
 #: src/mainwindow.c:474 src/mainwindow.c:476 src/mainwindow.c:479
 #: src/mainwindow.c:481 src/messageview.c:137
 msgid "/_File/---"
@@ -313,7 +313,7 @@ msgstr "/_Datoteka/_Brisanje"
 msgid "/_File/_Save"
 msgstr "/_Datoteka/_Shranjevanje"
 
-#: src/addressbook.c:348 src/compose.c:484 src/messageview.c:138
+#: src/addressbook.c:348 src/compose.c:492 src/messageview.c:138
 msgid "/_File/_Close"
 msgstr "/_Datoteka/_Zapri"
 
@@ -345,7 +345,7 @@ msgstr "/_Naslov/_Urejanje"
 msgid "/_Address/_Delete"
 msgstr "/_Naslov/_Brisanje"
 
-#: src/addressbook.c:356 src/compose.c:585 src/mainwindow.c:688
+#: src/addressbook.c:356 src/compose.c:664 src/mainwindow.c:697
 #: src/messageview.c:246
 msgid "/_Tools"
 msgstr "/_Orodja"
@@ -354,12 +354,12 @@ msgstr "/_Orodja"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Orodja/Uvoz datoteke _LDIF"
 
-#: src/addressbook.c:358 src/compose.c:598 src/mainwindow.c:733
+#: src/addressbook.c:358 src/compose.c:677 src/mainwindow.c:742
 #: src/messageview.c:264
 msgid "/_Help"
 msgstr "/_Pomoč"
 
-#: src/addressbook.c:359 src/compose.c:599 src/mainwindow.c:744
+#: src/addressbook.c:359 src/compose.c:678 src/mainwindow.c:753
 #: src/messageview.c:265
 msgid "/_Help/_About"
 msgstr "/_Pomoč/_O programu"
@@ -376,7 +376,7 @@ msgstr "/Nova _skupina"
 msgid "/New _Folder"
 msgstr "/Nova _mapa"
 
-#: src/addressbook.c:381 src/addressbook.c:391 src/compose.c:463
+#: src/addressbook.c:381 src/addressbook.c:391 src/compose.c:471
 #: src/folderview.c:220 src/folderview.c:222 src/folderview.c:226
 #: src/folderview.c:236 src/folderview.c:238 src/folderview.c:240
 #: src/folderview.c:244 src/folderview.c:254 src/folderview.c:256
@@ -386,7 +386,7 @@ msgstr "/Nova _mapa"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:382 src/addressbook.c:392 src/compose.c:486
+#: src/addressbook.c:382 src/addressbook.c:392 src/compose.c:494
 #: src/mainwindow.c:485 src/messageview.c:140
 msgid "/_Edit"
 msgstr "/_Urejanje"
@@ -399,7 +399,7 @@ msgstr "/_Brisanje"
 msgid "E-Mail address"
 msgstr "Elektronski naslov"
 
-#: src/addressbook.c:493 src/compose.c:4192 src/prefs_common.c:2186
+#: src/addressbook.c:493 src/compose.c:4293 src/prefs_common.c:2198
 msgid "Address book"
 msgstr "Imenik naslovov"
 
@@ -409,7 +409,7 @@ msgstr "Ime:"
 
 #. Buttons
 #: src/addressbook.c:625 src/addressbook.c:1665 src/addressbook.c:1671
-#: src/editaddress.c:878 src/editaddress.c:1011 src/mainwindow.c:2212
+#: src/editaddress.c:878 src/editaddress.c:1011 src/mainwindow.c:2221
 #: src/prefs_actions.c:263 src/prefs_display_header.c:275
 #: src/prefs_display_header.c:330 src/prefs_template.c:227
 msgid "Delete"
@@ -602,7 +602,7 @@ msgstr "Skupni naslov"
 msgid "Personal address"
 msgstr "Osebni naslov"
 
-#: src/alertpanel.c:123 src/compose.c:4807 src/main.c:458
+#: src/alertpanel.c:123 src/compose.c:4943 src/main.c:458
 msgid "Notice"
 msgstr "Opomba"
 
@@ -610,7 +610,7 @@ msgstr "Opomba"
 msgid "Warning"
 msgstr "Opozorilo"
 
-#: src/alertpanel.c:149 src/compose.c:2551 src/inc.c:558
+#: src/alertpanel.c:149 src/compose.c:2632 src/inc.c:558
 msgid "Error"
 msgstr "Napaka"
 
@@ -658,308 +658,426 @@ msgstr "Rjava"
 msgid "None"
 msgstr "Nič"
 
-#: src/compose.c:461
+#: src/compose.c:469
 msgid "/_Add..."
 msgstr "/_Dodaj"
 
-#: src/compose.c:462
+#: src/compose.c:470
 msgid "/_Remove"
 msgstr "/_Odstrani"
 
-#: src/compose.c:464 src/folderview.c:228 src/folderview.c:246
+#: src/compose.c:472 src/folderview.c:228 src/folderview.c:246
 #: src/folderview.c:261
 #, fuzzy
 msgid "/_Properties..."
 msgstr "/_Lastnost..."
 
-#: src/compose.c:470
+#: src/compose.c:478
 #, fuzzy
 msgid "/_File/_Send"
 msgstr "/_Datoteka/_Shranjevanje"
 
-#: src/compose.c:472
+#: src/compose.c:480
 #, fuzzy
 msgid "/_File/Send _later"
 msgstr "/_Sporočilo/Poš_lji pozneje"
 
-#: src/compose.c:475
+#: src/compose.c:483
 #, fuzzy
 msgid "/_File/Save to _draft folder"
 msgstr "/_Sporočilo/Shrani v mapo _draft"
 
-#: src/compose.c:477
+#: src/compose.c:485
 #, fuzzy
 msgid "/_File/Save and _keep editing"
 msgstr "/_Sporočilo/Poš_lji in nadaljuj z urejanjem"
 
-#: src/compose.c:480
+#: src/compose.c:488
 msgid "/_File/_Attach file"
 msgstr "/_Datoteka/Pripni d_atoteko"
 
-#: src/compose.c:481
+#: src/compose.c:489
 msgid "/_File/_Insert file"
 msgstr "/Datoteka/Vr_ini datoteko"
 
-#: src/compose.c:482
+#: src/compose.c:490
 msgid "/_File/Insert si_gnature"
 msgstr "/Datoteka/Vrini _podpis"
 
-#: src/compose.c:487
+#: src/compose.c:495
 msgid "/_Edit/_Undo"
 msgstr "/_Uredi/_Razveljavi"
 
-#: src/compose.c:488
+#: src/compose.c:496
 msgid "/_Edit/_Redo"
 msgstr "/_Uredi/_Obnovi"
 
-#: src/compose.c:489 src/compose.c:567 src/mainwindow.c:489
+#: src/compose.c:497 src/compose.c:575 src/mainwindow.c:489
 #: src/messageview.c:143
 msgid "/_Edit/---"
 msgstr "/_Uredi/---"
 
-#: src/compose.c:490
+#: src/compose.c:498
 msgid "/_Edit/Cu_t"
 msgstr "/_Uredi/I_zreži"
 
-#: src/compose.c:491 src/mainwindow.c:486 src/messageview.c:141
+#: src/compose.c:499 src/mainwindow.c:486 src/messageview.c:141
 msgid "/_Edit/_Copy"
 msgstr "/Uredi/_Kopiraj"
 
-#: src/compose.c:492
+#: src/compose.c:500
 msgid "/_Edit/_Paste"
 msgstr "/_Uredi/_Prilepi"
 
-#: src/compose.c:493
+#: src/compose.c:501
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Uredi/Prilepi kot _citat"
 
-#: src/compose.c:495 src/mainwindow.c:487 src/messageview.c:142
+#: src/compose.c:503 src/mainwindow.c:487 src/messageview.c:142
 msgid "/_Edit/Select _all"
 msgstr "/_Uredi/Izberi _vse"
 
-#: src/compose.c:496
+#: src/compose.c:504
 msgid "/_Edit/A_dvanced"
 msgstr "/_Uredi/_Napredno"
 
-#: src/compose.c:497
+#: src/compose.c:505
 msgid "/_Edit/A_dvanced/Move a character backward"
 msgstr "/_Uredi/_Napredno/Pojdi za znak nazaj"
 
-#: src/compose.c:502
+#: src/compose.c:510
 msgid "/_Edit/A_dvanced/Move a character forward"
 msgstr "/_Uredi/_Napredno/Pojdi za znak naprej"
 
-#: src/compose.c:507
+#: src/compose.c:515
 msgid "/_Edit/A_dvanced/Move a word backward"
 msgstr "/_Uredi/_Napredno/Pojdi za besedo nazaj"
 
-#: src/compose.c:512
+#: src/compose.c:520
 msgid "/_Edit/A_dvanced/Move a word forward"
 msgstr "/_Uredi/_Napredno/Pojdi za besedo naprej"
 
-#: src/compose.c:517
+#: src/compose.c:525
 msgid "/_Edit/A_dvanced/Move to beginning of line"
 msgstr "/_Uredi/_Napredno/Pojdi na začetek vrstice"
 
-#: src/compose.c:522
+#: src/compose.c:530
 msgid "/_Edit/A_dvanced/Move to end of line"
 msgstr "/_Uredi/_Napredno/Pojdi na konec vrstice"
 
-#: src/compose.c:527
+#: src/compose.c:535
 msgid "/_Edit/A_dvanced/Move to previous line"
 msgstr "/_Uredi/_Napredno/Pojdi v prejšnjo vrstico"
 
-#: src/compose.c:532
+#: src/compose.c:540
 msgid "/_Edit/A_dvanced/Move to next line"
 msgstr "/_Uredi/_Napredno/Pojdi v naslednjo vrstico"
 
-#: src/compose.c:537
+#: src/compose.c:545
 msgid "/_Edit/A_dvanced/Delete a character backward"
 msgstr "/_Uredi/_Napredno/Izbriši prejšnji znak"
 
-#: src/compose.c:542
+#: src/compose.c:550
 msgid "/_Edit/A_dvanced/Delete a character forward"
 msgstr "/_Uredi/_Napredno/Zbriši naslednji znak"
 
-#: src/compose.c:547
+#: src/compose.c:555
 msgid "/_Edit/A_dvanced/Delete a word backward"
 msgstr "/_Uredi/_Napredno/Izbriši prejšnjo besedo"
 
-#: src/compose.c:552
+#: src/compose.c:560
 msgid "/_Edit/A_dvanced/Delete a word forward"
 msgstr "/_Uredi/_Napredno/Izbriši naslednjo besedo"
 
-#: src/compose.c:557
+#: src/compose.c:565
 msgid "/_Edit/A_dvanced/Delete line"
 msgstr "/_Uredi/_Napredno/Izbriši vrstico"
 
-#: src/compose.c:562
+#: src/compose.c:570
 msgid "/_Edit/A_dvanced/Delete to end of line"
 msgstr "/_Uredi/_Napredno/Izbriši do konca vrstice"
 
-#: src/compose.c:568
+#: src/compose.c:576
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/_Uredi/Prelomi trenutni odstavek"
 
-#: src/compose.c:570
+#: src/compose.c:578
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/_Uredi/_Prelomi vse _dolge vrstice"
 
-#: src/compose.c:572
+#: src/compose.c:580
 #, fuzzy
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/Uredi/_Kopiraj"
 
-#: src/compose.c:573 src/mainwindow.c:494 src/messageview.c:147
+#: src/compose.c:581 src/mainwindow.c:494 src/messageview.c:147
 #: src/summaryview.c:370
 msgid "/_View"
 msgstr "/_Pogled"
 
-#: src/compose.c:574
+#: src/compose.c:582
 msgid "/_View/_To"
 msgstr "/_Ogled/_Komu"
 
-#: src/compose.c:575
+#: src/compose.c:583
 msgid "/_View/_Cc"
 msgstr "/_Ogled/K_p"
 
-#: src/compose.c:576
+#: src/compose.c:584
 msgid "/_View/_Bcc"
 msgstr "/_Ogled/_SKp"
 
-#: src/compose.c:577
+#: src/compose.c:585
 msgid "/_View/_Reply to"
 msgstr "/_Ogled/_Odgovor za"
 
-#: src/compose.c:578 src/compose.c:580 src/compose.c:582 src/mainwindow.c:512
-#: src/mainwindow.c:515 src/mainwindow.c:541 src/mainwindow.c:565
-#: src/mainwindow.c:641 src/mainwindow.c:645 src/messageview.c:223
+#: src/compose.c:586 src/compose.c:588 src/compose.c:590 src/compose.c:592
+#: src/mainwindow.c:512 src/mainwindow.c:515 src/mainwindow.c:541
+#: src/mainwindow.c:565 src/mainwindow.c:650 src/mainwindow.c:654
+#: src/messageview.c:223
 msgid "/_View/---"
 msgstr "/_Pogled/---"
 
-#: src/compose.c:579
+#: src/compose.c:587
 msgid "/_View/_Followup to"
 msgstr "/_Pogled/_Sledi do"
 
-#: src/compose.c:581
+#: src/compose.c:589
 msgid "/_View/R_uler"
 msgstr "/_Pogled/R_avnilo"
 
-#: src/compose.c:583
+#: src/compose.c:591
 msgid "/_View/_Attachment"
 msgstr "/_Pogled/_Priloga"
 
-#: src/compose.c:586 src/mainwindow.c:689 src/messageview.c:247
+#: src/compose.c:598 src/mainwindow.c:572 src/messageview.c:154
+#, fuzzy
+msgid "/_View/Character _encoding"
+msgstr "/_Pogled/_Razvrščanje/Pa_dajoče"
+
+#: src/compose.c:599
+msgid "/_View/Character _encoding/_Automatic"
+msgstr ""
+
+#: src/compose.c:601 src/compose.c:607 src/compose.c:613 src/compose.c:617
+#: src/compose.c:623 src/compose.c:627 src/compose.c:631 src/compose.c:641
+#: src/compose.c:645 src/compose.c:653 src/compose.c:657 src/mainwindow.c:568
+#: src/mainwindow.c:575 src/messageview.c:150
+#, fuzzy
+msgid "/_View/Character _encoding/---"
+msgstr "/_Pogled/_Razvrščanje/Pa_dajoče"
+
+#: src/compose.c:603 src/mainwindow.c:576 src/messageview.c:158
+#, fuzzy
+msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
+msgstr "/_Pogled/Nabor zna_kov/7 bitni ASCII (US-ASC_II)"
+
+#: src/compose.c:605 src/mainwindow.c:578 src/messageview.c:161
+#, fuzzy
+msgid "/_View/Character _encoding/Unicode (_UTF-8)"
+msgstr "/Videz/Nabor zna_kov/Unicode (_UTF-8)"
+
+#: src/compose.c:609 src/mainwindow.c:582 src/messageview.c:164
+#, fuzzy
+msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
+msgstr "_Pogled/Nabor zna_kov/Zahodnoevropski (ISO-8859-_1)"
+
+#: src/compose.c:611 src/mainwindow.c:584 src/messageview.c:166
+#, fuzzy
+msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
+msgstr "_Pogled/Nabor zna_kov/Zahodnoevropski (ISO-8859-15)"
+
+#: src/compose.c:615 src/mainwindow.c:588 src/messageview.c:169
+#, fuzzy
+msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
+msgstr "/_Pogled/Nabor zna_kov/Srednjeevropski (ISO-8859-_2)"
+
+#: src/compose.c:619 src/mainwindow.c:592 src/messageview.c:172
+#, fuzzy
+msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
+msgstr "/_Pogled/Nabor zna_kov/_Baltski (ISO-8859-13)"
+
+#: src/compose.c:621 src/mainwindow.c:594 src/messageview.c:174
+#, fuzzy
+msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
+msgstr "/_Pogled/Nabor zna_kov/Baltski (ISO-8859-_4)"
+
+#: src/compose.c:625 src/mainwindow.c:598 src/messageview.c:177
+#, fuzzy
+msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
+msgstr "/_Pogled/Nabor zna_kov/Grški (ISO-8859-_7)"
+
+#: src/compose.c:629 src/mainwindow.c:602 src/messageview.c:180
+#, fuzzy
+msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
+msgstr "/_Pogled/Nabor zna_kov/Turški (ISO-8859-_9)"
+
+#: src/compose.c:633 src/mainwindow.c:606 src/messageview.c:183
+#, fuzzy
+msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
+msgstr "/_Pogled/Nabor zna_kov/Cirilica (ISO-8859-_5)"
+
+#: src/compose.c:635 src/mainwindow.c:608 src/messageview.c:185
+#, fuzzy
+msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
+msgstr "/_Pogled/Nabor zna_kov/Cirilica (KOI8-_R)"
+
+#: src/compose.c:637 src/mainwindow.c:610 src/messageview.c:187
+#, fuzzy
+msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
+msgstr "/_Pogled/Nabor zna_kov/Cirilica (KOI8-_R)"
+
+#: src/compose.c:639 src/mainwindow.c:612 src/messageview.c:189
+#, fuzzy
+msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
+msgstr "/_Pogled/Nabor zna_kov/Cirilica (Windows-1251)"
+
+#: src/compose.c:643 src/mainwindow.c:616 src/messageview.c:192
+#, fuzzy
+msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
+msgstr "/_Pogled/Nabor zna_kov/Japonski (ISO-2022-_JP)"
+
+#: src/compose.c:647 src/mainwindow.c:626 src/messageview.c:201
+#, fuzzy
+msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
+msgstr "/_Pogled/Nabor zna_kov/Poenostavljena kitajščina (_GB2312)"
+
+#: src/compose.c:649 src/mainwindow.c:628 src/messageview.c:203
+#, fuzzy
+msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
+msgstr "/_Pogled/Nabor zna_kov/Tradicionalna kitajščina (_Big5)"
+
+#: src/compose.c:651 src/mainwindow.c:630 src/messageview.c:205
+#, fuzzy
+msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
+msgstr "/_Pogled/Nabor zna_kov/Tradicionalna kitajščina (EUC-_TW)"
+
+#: src/compose.c:655 src/mainwindow.c:636 src/messageview.c:210
+#, fuzzy
+msgid "/_View/Character _encoding/Korean (EUC-_KR)"
+msgstr "/_Pogled/Nabor zna_kov/Korejski (EUC-_KR)"
+
+#: src/compose.c:659 src/mainwindow.c:642 src/messageview.c:215
+#, fuzzy
+msgid "/_View/Character _encoding/Thai (TIS-620)"
+msgstr "/_Pogled/Nabor zna_kov/Tajski (TIS-620)"
+
+#: src/compose.c:661 src/mainwindow.c:644 src/messageview.c:217
+#, fuzzy
+msgid "/_View/Character _encoding/Thai (Windows-874)"
+msgstr "/_Pogled/Nabor zna_kov/Tajski (Windows-874)"
+
+#: src/compose.c:665 src/mainwindow.c:698 src/messageview.c:247
 msgid "/_Tools/_Address book"
 msgstr "/_Orodja/_Adresar"
 
-#: src/compose.c:587
+#: src/compose.c:666
 msgid "/_Tools/_Template"
 msgstr "/_Orodja/_Predloga"
 
-#: src/compose.c:588 src/mainwindow.c:707 src/messageview.c:262
+#: src/compose.c:667 src/mainwindow.c:716 src/messageview.c:262
 msgid "/_Tools/Actio_ns"
 msgstr "/_Orodja/Deja_nja"
 
-#: src/compose.c:589 src/compose.c:593 src/mainwindow.c:692
-#: src/mainwindow.c:706 src/mainwindow.c:708 src/mainwindow.c:711
-#: src/mainwindow.c:713 src/messageview.c:250 src/messageview.c:261
+#: src/compose.c:668 src/compose.c:672 src/mainwindow.c:701
+#: src/mainwindow.c:715 src/mainwindow.c:717 src/mainwindow.c:720
+#: src/mainwindow.c:722 src/messageview.c:250 src/messageview.c:261
 msgid "/_Tools/---"
 msgstr "/_Orodja/---"
 
-#: src/compose.c:590
+#: src/compose.c:669
 #, fuzzy
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/_Uredi/Uredi z _zunanjim urejevalnikom"
 
-#: src/compose.c:594
+#: src/compose.c:673
 #, fuzzy
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Orodja/Deja_nja"
 
-#: src/compose.c:595
+#: src/compose.c:674
 #, fuzzy
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/_Sporočilo/_Enkripcija"
 
-#: src/compose.c:800
+#: src/compose.c:879
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: datoteka ne obstaja\n"
 
-#: src/compose.c:899 src/compose.c:958 src/procmsg.c:1303
+#: src/compose.c:978 src/compose.c:1037 src/procmsg.c:1303
 msgid "Can't get text part\n"
 msgstr "Ne morem dobiti tekstovnega dela\n"
 
-#: src/compose.c:1340
+#: src/compose.c:1419
 msgid "Quote mark format error."
 msgstr "Napaka pri oblikovanju znaka za citiranje."
 
-#: src/compose.c:1352
+#: src/compose.c:1431
 msgid "Message reply/forward format error."
 msgstr "Napaka pri oblikovanju odgovora/posredovanja sporočila."
 
-#: src/compose.c:1679
+#: src/compose.c:1758
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Datoteka %s ne obstaja\n"
 
-#: src/compose.c:1683
+#: src/compose.c:1762
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Ne morem dobiti velikosti datoteke %s\n"
 
-#: src/compose.c:1687
+#: src/compose.c:1766
 #, c-format
 msgid "File %s is empty."
 msgstr "Datoteka %s je prazna."
 
-#: src/compose.c:1691
+#: src/compose.c:1770
 #, c-format
 msgid "Can't read %s."
 msgstr "Ne morem prebrati %s."
 
-#: src/compose.c:1726
+#: src/compose.c:1805
 #, c-format
 msgid "Message: %s"
 msgstr "Sporočilo: %s"
 
-#: src/compose.c:1797 src/mimeview.c:491
+#: src/compose.c:1876 src/mimeview.c:491
 msgid "Can't get the part of multipart message."
 msgstr "Ne morem dobiti dela večdelnega sporočila."
 
-#: src/compose.c:2188
+#: src/compose.c:2267
 msgid " [Edited]"
 msgstr " [V urejanju]"
 
-#: src/compose.c:2190
+#: src/compose.c:2269
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Sestavi sporočilo%s"
 
-#: src/compose.c:2193
+#: src/compose.c:2272
 #, c-format
 msgid "Compose message%s"
 msgstr "Sestavi sporočilo%s"
 
-#: src/compose.c:2304
+#: src/compose.c:2383
 msgid "Recipient is not specified."
 msgstr "Naslovnik ni določen."
 
-#: src/compose.c:2312 src/compose.c:4112 src/mainwindow.c:2144
+#: src/compose.c:2391 src/compose.c:4213 src/mainwindow.c:2153
 #: src/prefs_account.c:703 src/prefs_common.c:850
 msgid "Send"
 msgstr "Pošlji"
 
-#: src/compose.c:2313
+#: src/compose.c:2392
 msgid "Subject is empty. Send it anyway?"
 msgstr "Zadeva sporočila je prazna. Naj kljub temu pošljem?"
 
-#: src/compose.c:2364
+#: src/compose.c:2443
 msgid "can't get recipient list."
 msgstr "ne morem dobiti seznama naslovnikov"
 
-#: src/compose.c:2384
+#: src/compose.c:2463
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -967,26 +1085,26 @@ msgstr ""
 "Račun za pošiljanje pošte ni določen.\n"
 "Prosim, pred pošiljanjem izberite poštni račun."
 
-#: src/compose.c:2398 src/send_message.c:261
+#: src/compose.c:2477 src/send_message.c:261
 #, 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:2421
+#: src/compose.c:2500
 msgid "Can't save the message to outbox."
 msgstr "Ne morem shraniti sporočila v imenik Outbox."
 
-#: src/compose.c:2457
+#: src/compose.c:2536
 #, 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:2518 src/compose.c:2739 src/compose.c:2802 src/compose.c:2921
+#: src/compose.c:2597 src/compose.c:2820 src/compose.c:2883 src/compose.c:3003
 #: src/utils.c:2189
 msgid "can't change file mode\n"
 msgstr "Ne morem spremeniti pravic do dostopa do datoteke\n"
 
-#: src/compose.c:2546
+#: src/compose.c:2627
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -995,141 +1113,141 @@ msgstr ""
 "Ne morem pretvoriti nabora znakov sporočila.\n"
 "Naj ga kljub temu pošljem?"
 
-#: src/compose.c:2610
+#: src/compose.c:2691
 msgid "can't write headers\n"
 msgstr "Ne morem zapisati zaglavij\n"
 
-#: src/compose.c:2881
+#: src/compose.c:2963
 msgid "can't remove the old message\n"
 msgstr "ne morem odstraniti starega sporočila\n"
 
-#: src/compose.c:2899
+#: src/compose.c:2981
 msgid "queueing message...\n"
 msgstr "prestavljam sporočilo v mapo Čakajoče...\n"
 
-#: src/compose.c:2981
+#: src/compose.c:3063
 msgid "can't find queue folder\n"
 msgstr "ne najdem mape s čakajočimi sporočili\n"
 
-#: src/compose.c:2988
+#: src/compose.c:3070
 msgid "can't queue the message\n"
 msgstr "ne morem preložiti sporočila\n"
 
-#: src/compose.c:3547
+#: src/compose.c:3645
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "generiran Message-ID: %s\n"
 
-#: src/compose.c:3645
+#: src/compose.c:3743
 msgid "Creating compose window...\n"
 msgstr "Odpiram okno za sestavljanje sporočila...\n"
 
-#: src/compose.c:3648 src/compose.c:4598
+#: src/compose.c:3746 src/compose.c:4734
 msgid "MIME type"
 msgstr "Tip MIME"
 
 #. S_COL_DATE
-#: src/compose.c:3649 src/mimeview.c:150 src/prefs_filter_edit.c:569
+#: src/compose.c:3747 src/mimeview.c:150 src/prefs_filter_edit.c:569
 #: src/prefs_summary_column.c:73 src/select-keys.c:317 src/summaryview.c:386
 msgid "Size"
 msgstr "Velikost"
 
-#: src/compose.c:3700 src/headerview.c:53 src/summary_search.c:169
+#: src/compose.c:3798 src/headerview.c:53 src/summary_search.c:169
 msgid "From:"
 msgstr "Pošiljatelj:"
 
-#: src/compose.c:4113
+#: src/compose.c:4214
 msgid "Send message"
 msgstr "Pošlji sporočilo"
 
-#: src/compose.c:4121
+#: src/compose.c:4222
 msgid "Send later"
 msgstr "Pošlji kasneje"
 
-#: src/compose.c:4122
+#: src/compose.c:4223
 msgid "Put into queue folder and send later"
 msgstr "Postavi v mapo Čakajoče in pošlji kasneje"
 
-#: src/compose.c:4130
+#: src/compose.c:4231
 msgid "Draft"
 msgstr "Osnutek"
 
-#: src/compose.c:4131
+#: src/compose.c:4232
 msgid "Save to draft folder"
 msgstr "Shrani v imenik Draft"
 
-#: src/compose.c:4141 src/compose.c:5382
+#: src/compose.c:4242 src/compose.c:5527
 msgid "Insert"
 msgstr "Vstavi"
 
-#: src/compose.c:4142
+#: src/compose.c:4243
 msgid "Insert file"
 msgstr "Vstavi datoteko"
 
-#: src/compose.c:4150
+#: src/compose.c:4251
 msgid "Attach"
 msgstr "Pripni"
 
-#: src/compose.c:4151
+#: src/compose.c:4252
 msgid "Attach file"
 msgstr "Pripni datoteko"
 
 #. signature
-#: src/compose.c:4161 src/prefs_account.c:1339 src/prefs_common.c:1261
+#: src/compose.c:4262 src/prefs_account.c:1339 src/prefs_common.c:1273
 msgid "Signature"
 msgstr "Podpis"
 
-#: src/compose.c:4162
+#: src/compose.c:4263
 msgid "Insert signature"
 msgstr "Vstavi podpis"
 
-#: src/compose.c:4171 src/prefs_common.c:1283 src/prefs_common.c:2165
+#: src/compose.c:4272 src/prefs_common.c:1295 src/prefs_common.c:2177
 msgid "Editor"
 msgstr "Urejevalnik"
 
-#: src/compose.c:4172
+#: src/compose.c:4273
 msgid "Edit with external editor"
 msgstr "Urejanje z zunanjim urejevalnikom"
 
-#: src/compose.c:4180
+#: src/compose.c:4281
 msgid "Linewrap"
 msgstr "Prelom vrstic"
 
-#: src/compose.c:4181
+#: src/compose.c:4282
 msgid "Wrap all long lines"
 msgstr "Prelomi vse dolge vrstice"
 
-#: src/compose.c:4492
+#: src/compose.c:4628
 msgid "Invalid MIME type."
 msgstr "Napačen tip MIME"
 
-#: src/compose.c:4511
+#: src/compose.c:4647
 msgid "File doesn't exist or is empty."
 msgstr "Datoteka ne obstaja ali pa je prazna."
 
-#: src/compose.c:4580
+#: src/compose.c:4716
 #, fuzzy
 msgid "Properties"
 msgstr "Lastnost"
 
-#: src/compose.c:4600
+#: src/compose.c:4736
 msgid "Encoding"
 msgstr "Nabor znakov"
 
-#: src/compose.c:4623 src/prefs_folder_item.c:183
+#: src/compose.c:4759 src/prefs_folder_item.c:183
 msgid "Path"
 msgstr "Pot"
 
-#: src/compose.c:4624
+#: src/compose.c:4760
 msgid "File name"
 msgstr "Ime datoteke"
 
-#: src/compose.c:4778
+#: src/compose.c:4914
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Ukazna vrstica za zunanji urejevalnik je neveljavna: '%s'\n"
 
-#: src/compose.c:4804
+#: src/compose.c:4940
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1140,72 +1258,72 @@ msgstr ""
 "Ali naj ga prisilim k prekinitvi?\n"
 "Št. skupine procesov: %d"
 
-#: src/compose.c:4817
+#: src/compose.c:4953
 #, c-format
 msgid "Terminated process group id: %d"
 msgstr "Št. prekinjene skupine procesov: %d"
 
-#: src/compose.c:4818
+#: src/compose.c:4954
 #, c-format
 msgid "Temporary file: %s"
 msgstr "Začasna datoteka: %s"
 
-#: src/compose.c:4842
+#: src/compose.c:4978
 msgid "Compose: input from monitoring process\n"
 msgstr "Sestavljanje: vhod iz opazovanega procesa\n"
 
 #. failed
-#: src/compose.c:4875
+#: src/compose.c:5011
 msgid "Couldn't exec external editor\n"
 msgstr "Ne morem pognati zunanjega urejevalnika\n"
 
-#: src/compose.c:4879
+#: src/compose.c:5015
 msgid "Couldn't write to file\n"
 msgstr "Ne morem pisati v datoteko\n"
 
-#: src/compose.c:4881
+#: src/compose.c:5017
 msgid "Pipe read failed\n"
 msgstr "Branje preko cevi ni uspelo\n"
 
-#: src/compose.c:5182 src/compose.c:5190 src/compose.c:5196
+#: src/compose.c:5318 src/compose.c:5326 src/compose.c:5332
 msgid "Can't queue the message."
 msgstr "Ne morem preložiti pošiljanja sporočila."
 
-#: src/compose.c:5287
+#: src/compose.c:5423
 #, fuzzy
 msgid "Select files"
 msgstr "Izberi datoteko"
 
-#: src/compose.c:5309
+#: src/compose.c:5445
 msgid "Select file"
 msgstr "Izberi datoteko"
 
-#: src/compose.c:5344
+#: src/compose.c:5480
 msgid "Discard message"
 msgstr "Zavrzi sporočilo"
 
-#: src/compose.c:5345
+#: src/compose.c:5481
 msgid "This message has been modified. discard it?"
 msgstr "To sporočilo je bilo spremenjeno. Naj ga zavržem?"
 
-#: src/compose.c:5346
+#: src/compose.c:5482
 msgid "Discard"
 msgstr "Zavrži"
 
-#: src/compose.c:5346
+#: src/compose.c:5482
 msgid "to Draft"
 msgstr "v Draft"
 
-#: src/compose.c:5379
+#: src/compose.c:5524
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Ali želite uporabiti predlogo `%s' ?"
 
-#: src/compose.c:5381
+#: src/compose.c:5526
 msgid "Apply template"
 msgstr "Uporabi predlogo"
 
-#: src/compose.c:5382
+#: src/compose.c:5527
 msgid "Replace"
 msgstr "Zamenjaj"
 
@@ -1646,12 +1764,12 @@ msgstr "Nastavljam informacije o mapi...\n"
 msgid "Setting folder info..."
 msgstr "Nastavljam informacije o mapi..."
 
-#: src/folderview.c:652 src/mainwindow.c:3190 src/setup.c:81
+#: src/folderview.c:652 src/mainwindow.c:3199 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Preiskujem mapo %s%c%s ..."
 
-#: src/folderview.c:656 src/mainwindow.c:3195 src/setup.c:86
+#: src/folderview.c:656 src/mainwindow.c:3204 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Preiskujem mapo %s ..."
@@ -2113,7 +2231,7 @@ msgstr "Uvozi datoteko LDIF v imenik naslovov"
 msgid "Prev"
 msgstr "Prejšnji"
 
-#: src/importldif.c:761 src/mainwindow.c:2230
+#: src/importldif.c:761 src/mainwindow.c:2239
 msgid "Next"
 msgstr "Naslednji"
 
@@ -2568,7 +2686,8 @@ msgid "/_View/Separate f_older tree"
 msgstr "_Pogled/Posebno drev_o map"
 
 #: src/mainwindow.c:514
-msgid "/_View/Separate m_essage view"
+#, fuzzy
+msgid "/_View/Separate _message view"
 msgstr "/_Pogled/Poseben ogled _sporočila"
 
 #: src/mainwindow.c:516
@@ -2704,432 +2823,349 @@ msgstr "/_Pogled/_Pojdi na/Naslednje sporočilo z oznako"
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Pogled/_Pojdi na/_Druga mapa"
 
-#: src/mainwindow.c:568 src/mainwindow.c:575 src/messageview.c:150
-msgid "/_View/_Code set/---"
-msgstr "/_Pogled/Nabor zna_kov/---"
-
-#: src/mainwindow.c:572 src/messageview.c:154
-msgid "/_View/_Code set"
-msgstr "/_Pogled/Nabor zna_kov"
-
 #: src/mainwindow.c:573 src/messageview.c:155
-msgid "/_View/_Code set/_Auto detect"
+#, fuzzy
+msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Pogled/Nabor zna_kov/_Samodejno"
 
-#: src/mainwindow.c:576 src/messageview.c:158
-msgid "/_View/_Code set/7bit ascii (US-ASC_II)"
-msgstr "/_Pogled/Nabor zna_kov/7 bitni ASCII (US-ASC_II)"
-
-#: src/mainwindow.c:579 src/messageview.c:161
-msgid "/_View/_Code set/Unicode (_UTF-8)"
-msgstr "/Videz/Nabor zna_kov/Unicode (_UTF-8)"
-
-#: src/mainwindow.c:582 src/messageview.c:164
-msgid "/_View/_Code set/Western European (ISO-8859-_1)"
-msgstr "_Pogled/Nabor zna_kov/Zahodnoevropski (ISO-8859-_1)"
-
-#: src/mainwindow.c:584 src/messageview.c:166
-msgid "/_View/_Code set/Western European (ISO-8859-15)"
-msgstr "_Pogled/Nabor zna_kov/Zahodnoevropski (ISO-8859-15)"
-
-#: src/mainwindow.c:587 src/messageview.c:169
-msgid "/_View/_Code set/Central European (ISO-8859-_2)"
-msgstr "/_Pogled/Nabor zna_kov/Srednjeevropski (ISO-8859-_2)"
-
-#: src/mainwindow.c:590 src/messageview.c:172
-msgid "/_View/_Code set/_Baltic (ISO-8859-13)"
-msgstr "/_Pogled/Nabor zna_kov/_Baltski (ISO-8859-13)"
-
-#: src/mainwindow.c:592 src/messageview.c:174
-msgid "/_View/_Code set/Baltic (ISO-8859-_4)"
-msgstr "/_Pogled/Nabor zna_kov/Baltski (ISO-8859-_4)"
-
-#: src/mainwindow.c:595 src/messageview.c:177
-msgid "/_View/_Code set/Greek (ISO-8859-_7)"
-msgstr "/_Pogled/Nabor zna_kov/Grški (ISO-8859-_7)"
-
-#: src/mainwindow.c:598 src/messageview.c:180
-msgid "/_View/_Code set/Turkish (ISO-8859-_9)"
-msgstr "/_Pogled/Nabor zna_kov/Turški (ISO-8859-_9)"
-
-#: src/mainwindow.c:601 src/messageview.c:183
-msgid "/_View/_Code set/Cyrillic (ISO-8859-_5)"
-msgstr "/_Pogled/Nabor zna_kov/Cirilica (ISO-8859-_5)"
-
-#: src/mainwindow.c:603 src/messageview.c:185
-msgid "/_View/_Code set/Cyrillic (KOI8-_R)"
-msgstr "/_Pogled/Nabor zna_kov/Cirilica (KOI8-_R)"
-
-#: src/mainwindow.c:605 src/messageview.c:187
+#: src/mainwindow.c:618 src/messageview.c:194
 #, fuzzy
-msgid "/_View/_Code set/Cyrillic (KOI8-U)"
-msgstr "/_Pogled/Nabor zna_kov/Cirilica (KOI8-_R)"
-
-#: src/mainwindow.c:607 src/messageview.c:189
-msgid "/_View/_Code set/Cyrillic (Windows-1251)"
-msgstr "/_Pogled/Nabor zna_kov/Cirilica (Windows-1251)"
-
-#: src/mainwindow.c:610 src/messageview.c:192
-msgid "/_View/_Code set/Japanese (ISO-2022-_JP)"
-msgstr "/_Pogled/Nabor zna_kov/Japonski (ISO-2022-_JP)"
-
-#: src/mainwindow.c:612 src/messageview.c:194
-msgid "/_View/_Code set/Japanese (ISO-2022-JP-2)"
+msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Pogled/Nabor zna_kov/Japonski (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:614 src/messageview.c:196
-msgid "/_View/_Code set/Japanese (_EUC-JP)"
+#: src/mainwindow.c:620 src/messageview.c:196
+#, fuzzy
+msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Pogled/Nabor zna_kov/Japonski (_EUC-JP)"
 
-#: src/mainwindow.c:616 src/messageview.c:198
-msgid "/_View/_Code set/Japanese (_Shift__JIS)"
+#: src/mainwindow.c:622 src/messageview.c:198
+#, fuzzy
+msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Pogled/Nabor zna_kov/Japonski (_Shift__JIS)"
 
-#: src/mainwindow.c:619 src/messageview.c:201
-msgid "/_View/_Code set/Simplified Chinese (_GB2312)"
-msgstr "/_Pogled/Nabor zna_kov/Poenostavljena kitajščina (_GB2312)"
-
-#: src/mainwindow.c:621 src/messageview.c:203
-msgid "/_View/_Code set/Traditional Chinese (_Big5)"
-msgstr "/_Pogled/Nabor zna_kov/Tradicionalna kitajščina (_Big5)"
-
-#: src/mainwindow.c:623 src/messageview.c:205
-msgid "/_View/_Code set/Traditional Chinese (EUC-_TW)"
-msgstr "/_Pogled/Nabor zna_kov/Tradicionalna kitajščina (EUC-_TW)"
-
-#: src/mainwindow.c:625 src/messageview.c:207
-msgid "/_View/_Code set/Chinese (ISO-2022-_CN)"
+#: src/mainwindow.c:632 src/messageview.c:207
+#, fuzzy
+msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Pogled/Nabor zna_kov/Kitajski (ISO-2022-_CN)"
 
-#: src/mainwindow.c:628 src/messageview.c:210
-msgid "/_View/_Code set/Korean (EUC-_KR)"
-msgstr "/_Pogled/Nabor zna_kov/Korejski (EUC-_KR)"
-
-#: src/mainwindow.c:630 src/messageview.c:212
-msgid "/_View/_Code set/Korean (ISO-2022-KR)"
+#: src/mainwindow.c:638 src/messageview.c:212
+#, fuzzy
+msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Pogled/Kodni nabor/Korejski (ISO-2022-KR)"
 
-#: src/mainwindow.c:633 src/messageview.c:215
-msgid "/_View/_Code set/Thai (TIS-620)"
-msgstr "/_Pogled/Nabor zna_kov/Tajski (TIS-620)"
-
-#: src/mainwindow.c:635 src/messageview.c:217
-msgid "/_View/_Code set/Thai (Windows-874)"
-msgstr "/_Pogled/Nabor zna_kov/Tajski (Windows-874)"
-
-#: src/mainwindow.c:642 src/summaryview.c:371
+#: src/mainwindow.c:651 src/summaryview.c:371
 msgid "/_View/Open in new _window"
 msgstr "/_Poglej/Odpri v _novem oknu"
 
-#: src/mainwindow.c:643 src/messageview.c:224
+#: src/mainwindow.c:652 src/messageview.c:224
 msgid "/_View/Mess_age source"
 msgstr "/_Pogled/I_zvirnik sporočila"
 
-#: src/mainwindow.c:644 src/messageview.c:225
+#: src/mainwindow.c:653 src/messageview.c:225
 msgid "/_View/Show all _header"
 msgstr "/_Pogled/Pokaži vsa _zaglavja"
 
-#: src/mainwindow.c:646
+#: src/mainwindow.c:655
 msgid "/_View/_Update summary"
 msgstr "/_Pogled/_Posodobi povzetek"
 
-#: src/mainwindow.c:648 src/messageview.c:227
+#: src/mainwindow.c:657 src/messageview.c:227
 msgid "/_Message"
 msgstr "/_Sporočilo"
 
-#: src/mainwindow.c:649
+#: src/mainwindow.c:658
 #, fuzzy
 msgid "/_Message/Recei_ve"
 msgstr "/_Sporočilo/Znova ur_edi"
 
-#: src/mainwindow.c:650
+#: src/mainwindow.c:659
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "_Sporočilo/Poberi z vseh _računov"
 
-#: src/mainwindow.c:652
+#: src/mainwindow.c:661
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "_Sporočilo/Poberi z vseh _računov"
 
-#: src/mainwindow.c:654
+#: src/mainwindow.c:663
 #, fuzzy
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/_Sporočilo/Odpoved sprejeman_ja"
 
-#: src/mainwindow.c:656
+#: src/mainwindow.c:665
 #, fuzzy
 msgid "/_Message/Recei_ve/---"
 msgstr "/_Sporočilo/Znova ur_edi"
 
-#: src/mainwindow.c:657
+#: src/mainwindow.c:666
 msgid "/_Message/_Send queued messages"
 msgstr "/_Sporočilo/Pošlji čakajoča sporoč_ila"
 
-#: src/mainwindow.c:658 src/mainwindow.c:660 src/mainwindow.c:667
-#: src/mainwindow.c:672 src/mainwindow.c:676 src/mainwindow.c:685
+#: src/mainwindow.c:667 src/mainwindow.c:669 src/mainwindow.c:676
+#: src/mainwindow.c:681 src/mainwindow.c:685 src/mainwindow.c:694
 #: src/messageview.c:230 src/messageview.c:238 src/messageview.c:243
 msgid "/_Message/---"
 msgstr "/_Sporočilo/---"
 
-#: src/mainwindow.c:659 src/messageview.c:228
+#: src/mainwindow.c:668 src/messageview.c:228
 msgid "/_Message/Compose _new message"
 msgstr "/_Sporočilo/_Novo sporočilo"
 
-#: src/mainwindow.c:661 src/messageview.c:231
+#: src/mainwindow.c:670 src/messageview.c:231
 msgid "/_Message/_Reply"
 msgstr "/_Sporočilo/_Odgovori"
 
-#: src/mainwindow.c:662
+#: src/mainwindow.c:671
 msgid "/_Message/Repl_y to"
 msgstr "/_Sporočilo/Odgovor _na"
 
-#: src/mainwindow.c:663 src/messageview.c:232
+#: src/mainwindow.c:672 src/messageview.c:232
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Sporočilo/Odgovor _na/_vsem"
 
-#: src/mainwindow.c:664 src/messageview.c:234
+#: src/mainwindow.c:673 src/messageview.c:234
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Sporočilo/Odgovori _na/_pošiljatelju"
 
-#: src/mainwindow.c:665 src/messageview.c:236
+#: src/mainwindow.c:674 src/messageview.c:236
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Sporočilo/Odgovor _na/_dopisni seznam"
 
-#: src/mainwindow.c:668 src/messageview.c:239
+#: src/mainwindow.c:677 src/messageview.c:239
 msgid "/_Message/_Forward"
 msgstr "/Sporočilo/_Posreduj"
 
-#: src/mainwindow.c:669 src/messageview.c:240
+#: src/mainwindow.c:678 src/messageview.c:240
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Sporočilo/Posreduj kot prilo_go"
 
-#: src/mainwindow.c:671 src/messageview.c:242
+#: src/mainwindow.c:680 src/messageview.c:242
 msgid "/_Message/Redirec_t"
 msgstr "/_Sporočilo/Pre_usmeri"
 
-#: src/mainwindow.c:673
+#: src/mainwindow.c:682
 msgid "/_Message/M_ove..."
 msgstr "/_Sporočilo/Pres_tavi..."
 
-#: src/mainwindow.c:674
+#: src/mainwindow.c:683
 msgid "/_Message/_Copy..."
 msgstr "/_Sporočilo/_Kopiraj..."
 
-#: src/mainwindow.c:675
+#: src/mainwindow.c:684
 msgid "/_Message/_Delete"
 msgstr "/_Sporočilo/Z_briši"
 
-#: src/mainwindow.c:677
+#: src/mainwindow.c:686
 msgid "/_Message/_Mark"
 msgstr "/_Sporočilo/O_znači"
 
-#: src/mainwindow.c:678
+#: src/mainwindow.c:687
 msgid "/_Message/_Mark/_Mark"
 msgstr "/_Sporočilo/O_znači/_Označi"
 
-#: src/mainwindow.c:679
+#: src/mainwindow.c:688
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/_Sporočilo/O_znači/O_dznači"
 
-#: src/mainwindow.c:680
+#: src/mainwindow.c:689
 msgid "/_Message/_Mark/---"
 msgstr "/_Sporočilo/O_znači/---"
 
-#: src/mainwindow.c:681
+#: src/mainwindow.c:690
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/_Sporočilo/O_znači/Označi kot _neprebrano"
 
-#: src/mainwindow.c:682
+#: src/mainwindow.c:691
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/_Sporočilo/O_znači/Označi kot _prebrano"
 
-#: src/mainwindow.c:684
+#: src/mainwindow.c:693
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/_Sporočilo/O_znači/Označi _vsa kot prebrana"
 
-#: src/mainwindow.c:686 src/messageview.c:244
+#: src/mainwindow.c:695 src/messageview.c:244
 msgid "/_Message/Re-_edit"
 msgstr "/_Sporočilo/Znova ur_edi"
 
-#: src/mainwindow.c:690 src/messageview.c:248
+#: src/mainwindow.c:699 src/messageview.c:248
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/_Orodja/Doda_j pošiljatelja v adresar"
 
-#: src/mainwindow.c:693
+#: src/mainwindow.c:702
 #, fuzzy
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/_Orodja/_Filtriraj sporočila"
 
-#: src/mainwindow.c:695
+#: src/mainwindow.c:704
 #, fuzzy
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Orodja/_Filtriraj sporočila"
 
-#: src/mainwindow.c:697 src/messageview.c:251
+#: src/mainwindow.c:706 src/messageview.c:251
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Orodja/_Ustvari pravilo za filtriranje"
 
-#: src/mainwindow.c:698 src/messageview.c:253
+#: src/mainwindow.c:707 src/messageview.c:253
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Orodja/_Ustvari pravilo za filtriranje/S_amodejno"
 
-#: src/mainwindow.c:700 src/messageview.c:255
+#: src/mainwindow.c:709 src/messageview.c:255
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Orodja/_Ustvari pravilo za filtriranje/po p_ošiljatelju"
 
-#: src/mainwindow.c:702 src/messageview.c:257
+#: src/mainwindow.c:711 src/messageview.c:257
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Orodja/_Ustvari pravilo za filtriranje/po _naslovniku"
 
-#: src/mainwindow.c:704 src/messageview.c:259
+#: src/mainwindow.c:713 src/messageview.c:259
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Orodja/_Ustvari pravilo za filtriranje/po _zadevi"
 
-#: src/mainwindow.c:709
+#: src/mainwindow.c:718
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/_Orodja/_Briši podvojena sporočila"
 
-#: src/mainwindow.c:712
+#: src/mainwindow.c:721
 msgid "/_Tools/E_xecute"
 msgstr "/_Orodja/_Izvrši"
 
-#: src/mainwindow.c:714
+#: src/mainwindow.c:723
 msgid "/_Tools/_Log window"
 msgstr "/_Orodja/_Dnevniško okno"
 
-#: src/mainwindow.c:716
+#: src/mainwindow.c:725
 msgid "/_Configuration"
 msgstr "/_Prikrojitev"
 
-#: src/mainwindow.c:717
+#: src/mainwindow.c:726
 msgid "/_Configuration/_Common preferences..."
 msgstr "/_Prikrojitev/_Splošne nastavitve..."
 
-#: src/mainwindow.c:719
+#: src/mainwindow.c:728
 msgid "/_Configuration/_Filter setting..."
 msgstr "/_Prikrojitev/_Nastavitve _filtra..."
 
-#: src/mainwindow.c:721
+#: src/mainwindow.c:730
 msgid "/_Configuration/_Template..."
 msgstr "/_Prikrojitev/_Predloga..."
 
-#: src/mainwindow.c:722
+#: src/mainwindow.c:731
 msgid "/_Configuration/_Actions..."
 msgstr "/_Prikrojitev/_Dejanja..."
 
-#: src/mainwindow.c:723
+#: src/mainwindow.c:732
 msgid "/_Configuration/---"
 msgstr "/_Prikrojitev/---"
 
-#: src/mainwindow.c:724
+#: src/mainwindow.c:733
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Prikrojitev/_Nastavitve za trenutni _račun..."
 
-#: src/mainwindow.c:726
+#: src/mainwindow.c:735
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Prikrojitev/Naredi _nov račun..."
 
-#: src/mainwindow.c:728
+#: src/mainwindow.c:737
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Prikrojitev/_Uredi račune..."
 
-#: src/mainwindow.c:730
+#: src/mainwindow.c:739
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Prikrojitev/Spremeni _trenutni račun"
 
-#: src/mainwindow.c:734
+#: src/mainwindow.c:743
 msgid "/_Help/_Manual"
 msgstr "/_Pomoč/_Priročnik"
 
-#: src/mainwindow.c:735
+#: src/mainwindow.c:744
 msgid "/_Help/_Manual/_English"
 msgstr "/_Pomoč/_Priročnik/_Angleščina"
 
-#: src/mainwindow.c:736
+#: src/mainwindow.c:745
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/_Pomoč/_Priročnik/_Japonščina"
 
-#: src/mainwindow.c:737
+#: src/mainwindow.c:746
 msgid "/_Help/_FAQ"
 msgstr "/_Pomoč/Pogosto _zastavljena vprašanja"
 
-#: src/mainwindow.c:738
+#: src/mainwindow.c:747
 msgid "/_Help/_FAQ/_English"
 msgstr "/_Pomoč/Pogosto _zastavljena vprašanja/_Angleščina"
 
-#: src/mainwindow.c:739
+#: src/mainwindow.c:748
 msgid "/_Help/_FAQ/_German"
 msgstr "/_Pomoč/Pogosto _zastavljena vprašanja/_Nemščina"
 
-#: src/mainwindow.c:740
+#: src/mainwindow.c:749
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/_Pomoč/Pogosto _zastavljena vprašanja/Š_panščina"
 
-#: src/mainwindow.c:741
+#: src/mainwindow.c:750
 msgid "/_Help/_FAQ/_French"
 msgstr "/_Pomoč/Pogosto _zastavljena vprašanja/_Francoščina"
 
-#: src/mainwindow.c:742
+#: src/mainwindow.c:751
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/_Pomoč/Pogosto _zastavljena vprašanja/_Italijanščina"
 
-#: src/mainwindow.c:743
+#: src/mainwindow.c:752
 msgid "/_Help/---"
 msgstr "/_Pomoč/---"
 
-#: src/mainwindow.c:783
+#: src/mainwindow.c:792
 msgid "Creating main window...\n"
 msgstr "Ustvarjam glavno okno...\n"
 
-#: src/mainwindow.c:943
+#: src/mainwindow.c:952
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "GlavnoOkno: alokacija barve %d ni uspela\n"
 
-#: src/mainwindow.c:1021 src/summaryview.c:1368 src/summaryview.c:1677
+#: src/mainwindow.c:1030 src/summaryview.c:1368 src/summaryview.c:1677
 #: src/summaryview.c:1785 src/summaryview.c:1831 src/summaryview.c:2453
 #: src/summaryview.c:3080 src/summaryview.c:3146 src/summaryview.c:3171
 #: src/summaryview.c:3284
 msgid "done.\n"
 msgstr "opravljeno.\n"
 
-#: src/mainwindow.c:1137 src/mainwindow.c:1178 src/mainwindow.c:1206
+#: src/mainwindow.c:1146 src/mainwindow.c:1187 src/mainwindow.c:1215
 msgid "Untitled"
 msgstr "Brez naslova"
 
-#: src/mainwindow.c:1207
+#: src/mainwindow.c:1216
 msgid "none"
 msgstr "nič"
 
-#: src/mainwindow.c:1257
+#: src/mainwindow.c:1266
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "Spreminjam tip ločevanja oken z %d na %d\n"
 
-#: src/mainwindow.c:1477
+#: src/mainwindow.c:1486
 msgid "Offline"
 msgstr ""
 
-#: src/mainwindow.c:1478
+#: src/mainwindow.c:1487
 msgid "You are offline. Go online?"
 msgstr ""
 
-#: src/mainwindow.c:1492
+#: src/mainwindow.c:1501
 #, fuzzy
 msgid "Empty all trash"
 msgstr "Izprazni smetnjak"
 
-#: src/mainwindow.c:1493
+#: src/mainwindow.c:1502
 #, fuzzy
 msgid "Empty messages in all trash?"
 msgstr "Izbrišem vsa sporočila v smetnjaku?"
 
-#: src/mainwindow.c:1521
+#: src/mainwindow.c:1530
 msgid "Add mailbox"
 msgstr "Dodaj poštni predal"
 
-#: src/mainwindow.c:1522
+#: src/mainwindow.c:1531
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3139,16 +3175,16 @@ msgstr ""
 "Če je določen obstoječi poštni predal,\n"
 "bo pregledan samodejno."
 
-#: src/mainwindow.c:1528
+#: src/mainwindow.c:1537
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Poštni predal `%s' že obstaja."
 
-#: src/mainwindow.c:1533 src/setup.c:57
+#: src/mainwindow.c:1542 src/setup.c:57
 msgid "Mailbox"
 msgstr "Poštni predal"
 
-#: src/mainwindow.c:1539 src/setup.c:63
+#: src/mainwindow.c:1548 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3157,144 +3193,144 @@ msgstr ""
 "Izdelava poštnega predala ni uspela.\n"
 "Morda obstajajo nekatere datoteke ali pa tam nimate dovoljenja za pisanje."
 
-#: src/mainwindow.c:1912
+#: src/mainwindow.c:1921
 msgid "Sylpheed - Folder View"
 msgstr "Syčpheed - ogled mape"
 
-#: src/mainwindow.c:1932 src/messageview.c:358
+#: src/mainwindow.c:1941 src/messageview.c:358
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - ogled sporočila"
 
-#: src/mainwindow.c:2079 src/summaryview.c:340
+#: src/mainwindow.c:2088 src/summaryview.c:340
 msgid "/_Reply"
 msgstr "/O_dgovori"
 
-#: src/mainwindow.c:2080
+#: src/mainwindow.c:2089
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "Odgovori vsem"
 
-#: src/mainwindow.c:2081
+#: src/mainwindow.c:2090
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/Odgovor _za/_pošiljatelja"
 
-#: src/mainwindow.c:2082
+#: src/mainwindow.c:2091
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/Odgovor _za/_dopisni seznam"
 
-#: src/mainwindow.c:2087 src/summaryview.c:347
+#: src/mainwindow.c:2096 src/summaryview.c:347
 msgid "/_Forward"
 msgstr "/P_osreduj"
 
-#: src/mainwindow.c:2088 src/summaryview.c:348
+#: src/mainwindow.c:2097 src/summaryview.c:348
 msgid "/For_ward as attachment"
 msgstr "/Posreduj kot prilo_go"
 
-#: src/mainwindow.c:2089 src/summaryview.c:349
+#: src/mainwindow.c:2098 src/summaryview.c:349
 msgid "/Redirec_t"
 msgstr "/Pre_usmeri"
 
-#: src/mainwindow.c:2125
+#: src/mainwindow.c:2134
 msgid "Get"
 msgstr "Poberi"
 
-#: src/mainwindow.c:2126
+#: src/mainwindow.c:2135
 msgid "Incorporate new mail"
 msgstr "Pripoji novo pošto"
 
-#: src/mainwindow.c:2133
+#: src/mainwindow.c:2142
 msgid "Get all"
 msgstr "Poberi vsa"
 
-#: src/mainwindow.c:2134
+#: src/mainwindow.c:2143
 msgid "Incorporate new mail of all accounts"
 msgstr "Pripoji novo pošto z vseh računov"
 
-#: src/mainwindow.c:2145
+#: src/mainwindow.c:2154
 msgid "Send queued message(s)"
 msgstr "Pošlji čakajoča sporočila"
 
-#: src/mainwindow.c:2155 src/prefs_account.c:705 src/prefs_common.c:852
+#: src/mainwindow.c:2164 src/prefs_account.c:705 src/prefs_common.c:852
 #: src/prefs_folder_item.c:137
 msgid "Compose"
 msgstr "Sestavi"
 
-#: src/mainwindow.c:2156
+#: src/mainwindow.c:2165
 msgid "Compose new message"
 msgstr "Sestavi novo sporočilo"
 
-#: src/mainwindow.c:2164 src/prefs_common.c:1353
+#: src/mainwindow.c:2173 src/prefs_common.c:1365
 msgid "Reply"
 msgstr "Odgovori"
 
-#: src/mainwindow.c:2165 src/mainwindow.c:2178
+#: src/mainwindow.c:2174 src/mainwindow.c:2187
 msgid "Reply to the message"
 msgstr "Odgovori na sporočilo"
 
-#: src/mainwindow.c:2183
+#: src/mainwindow.c:2192
 msgid "Reply all"
 msgstr "Odgovori vsem"
 
-#: src/mainwindow.c:2184
+#: src/mainwindow.c:2193
 msgid "Reply to all"
 msgstr "Odgovori vsem"
 
-#: src/mainwindow.c:2192 src/prefs_filter_edit.c:719
+#: src/mainwindow.c:2201 src/prefs_filter_edit.c:719
 msgid "Forward"
 msgstr "Posreduj"
 
-#: src/mainwindow.c:2193 src/mainwindow.c:2206
+#: src/mainwindow.c:2202 src/mainwindow.c:2215
 msgid "Forward the message"
 msgstr "Posreduj sporočilo"
 
-#: src/mainwindow.c:2213
+#: src/mainwindow.c:2222
 msgid "Delete the message"
 msgstr "Izbriši sporočilo"
 
-#: src/mainwindow.c:2221
+#: src/mainwindow.c:2230
 msgid "Execute"
 msgstr "Izvedi"
 
-#: src/mainwindow.c:2222
+#: src/mainwindow.c:2231
 msgid "Execute marked process"
 msgstr "Izvedi označen proces"
 
-#: src/mainwindow.c:2231
+#: src/mainwindow.c:2240
 msgid "Next unread message"
 msgstr "Naslednje neprebrano sporočilo"
 
-#: src/mainwindow.c:2242
+#: src/mainwindow.c:2251
 msgid "Prefs"
 msgstr "Nastavitve"
 
-#: src/mainwindow.c:2243
+#: src/mainwindow.c:2252
 msgid "Common preferences"
 msgstr "Splošne preference"
 
-#: src/mainwindow.c:2250 src/prefs_folder_item.c:258
+#: src/mainwindow.c:2259 src/prefs_folder_item.c:258
 #: src/prefs_folder_item.c:269 src/progressdialog.c:50
 msgid "Account"
 msgstr "Račun"
 
-#: src/mainwindow.c:2251
+#: src/mainwindow.c:2260
 msgid "Account setting"
 msgstr "Nastavitev računa"
 
-#: src/mainwindow.c:2425
+#: src/mainwindow.c:2434
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 
-#: src/mainwindow.c:2436
+#: src/mainwindow.c:2445
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 
-#: src/mainwindow.c:2624
+#: src/mainwindow.c:2633
 msgid "Exit"
 msgstr "Končaj"
 
-#: src/mainwindow.c:2624
+#: src/mainwindow.c:2633
 msgid "Exit this program?"
 msgstr "Ali naj končam ta program?"
 
@@ -3420,7 +3456,7 @@ msgstr "Iskanje končano"
 msgid "Creating message view...\n"
 msgstr "Ustvarjam videz sporočila...\n"
 
-#: src/messageview.c:303 src/prefs_common.c:1550
+#: src/messageview.c:303 src/prefs_common.c:1562
 msgid "Text"
 msgstr "Besedilo"
 
@@ -3433,7 +3469,7 @@ msgstr "Priloge"
 msgid "Can't save the file `%s'."
 msgstr "Ne morem odstraniti datoteke `%s'."
 
-#: src/messageview.c:697 src/prefs_common.c:2154 src/summaryview.c:2744
+#: src/messageview.c:697 src/prefs_common.c:2166 src/summaryview.c:2744
 msgid "Print"
 msgstr "Tiskanje"
 
@@ -3910,7 +3946,7 @@ msgstr "(Nefiltrirana sporočila bodo shranjena v tej mapi)"
 msgid "Authentication method"
 msgstr "Overovitvena metoda"
 
-#: src/prefs_account.c:1123 src/prefs_account.c:1239 src/prefs_common.c:1189
+#: src/prefs_account.c:1123 src/prefs_account.c:1239 src/prefs_common.c:1201
 msgid "Automatic"
 msgstr "Samodejno"
 
@@ -3934,7 +3970,7 @@ msgstr "Generiran ID sporočila"
 msgid "Add user-defined header"
 msgstr "Dodaj uporabniško definirano zaglavje"
 
-#: src/prefs_account.c:1196 src/prefs_common.c:1714 src/prefs_common.c:1739
+#: src/prefs_account.c:1196 src/prefs_common.c:1726 src/prefs_common.c:1751
 msgid " Edit... "
 msgstr " Uredi... "
 
@@ -4329,106 +4365,107 @@ msgid "Save sent messages to outbox"
 msgstr "Shrani poslana sporočila v izhodno mapo"
 
 #: src/prefs_common.c:1113
-msgid "Outgoing codeset"
+#, fuzzy
+msgid "Outgoing encoding"
 msgstr "Izhodni nabor znakov"
 
 #: src/prefs_common.c:1128
 msgid "Automatic (Recommended)"
 msgstr "Samodejno (priporočeno)"
 
-#: src/prefs_common.c:1129
+#: src/prefs_common.c:1130
 msgid "7bit ascii (US-ASCII)"
 msgstr "7-bitni ASCII (US-ASCII)"
 
-#: src/prefs_common.c:1130
+#: src/prefs_common.c:1132
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
-#: src/prefs_common.c:1131
+#: src/prefs_common.c:1134
 msgid "Western European (ISO-8859-1)"
 msgstr "Zahodnoevropski (ISO-8859-1)"
 
-#: src/prefs_common.c:1132
+#: src/prefs_common.c:1135
 msgid "Western European (ISO-8859-15)"
 msgstr "Zahodnoevropski (ISO-8859-15)"
 
-#: src/prefs_common.c:1133
+#: src/prefs_common.c:1137
 msgid "Central European (ISO-8859-2)"
 msgstr "Srednjeevropski (ISO-8859-2)"
 
-#: src/prefs_common.c:1134
+#: src/prefs_common.c:1139
 msgid "Baltic (ISO-8859-13)"
 msgstr "Baltski (ISO-8859-13)"
 
-#: src/prefs_common.c:1135
+#: src/prefs_common.c:1140
 msgid "Baltic (ISO-8859-4)"
 msgstr "Baltski (ISO-8859-4)"
 
-#: src/prefs_common.c:1136
+#: src/prefs_common.c:1142
 msgid "Greek (ISO-8859-7)"
 msgstr "Grški (ISO-8859-7)"
 
-#: src/prefs_common.c:1137
+#: src/prefs_common.c:1144
 msgid "Turkish (ISO-8859-9)"
 msgstr "Turški (ISO-8859-9)"
 
-#: src/prefs_common.c:1138
+#: src/prefs_common.c:1146
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Cirilica (ISO-8859-5)"
 
-#: src/prefs_common.c:1139
+#: src/prefs_common.c:1147
 msgid "Cyrillic (KOI8-R)"
 msgstr "Cirilica (KOI8-R)"
 
-#: src/prefs_common.c:1140
-msgid "Cyrillic (Windows-1251)"
-msgstr "Cirilica (Windows-1251)"
-
-#: src/prefs_common.c:1141
+#: src/prefs_common.c:1148
 msgid "Cyrillic (KOI8-U)"
 msgstr "Cirilica (KOI8-U)"
 
-#: src/prefs_common.c:1142
+#: src/prefs_common.c:1149
+msgid "Cyrillic (Windows-1251)"
+msgstr "Cirilica (Windows-1251)"
+
+#: src/prefs_common.c:1151
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Japonski (ISO-2022-JP)"
 
-#: src/prefs_common.c:1144
+#: src/prefs_common.c:1153
 msgid "Japanese (EUC-JP)"
 msgstr "Japonski (EUC-JP)"
 
-#: src/prefs_common.c:1145
+#: src/prefs_common.c:1154
 msgid "Japanese (Shift_JIS)"
 msgstr "Japonski (Shift_JIS)"
 
-#: src/prefs_common.c:1147
+#: src/prefs_common.c:1157
 msgid "Simplified Chinese (GB2312)"
 msgstr "Poenostavljena kitajščina (GB2312)"
 
-#: src/prefs_common.c:1148
+#: src/prefs_common.c:1158
 msgid "Traditional Chinese (Big5)"
 msgstr "Tradicionalna kitajščina (Big5)"
 
-#: src/prefs_common.c:1150
+#: src/prefs_common.c:1160
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Tradicionalna kitajščina (EUC-TW)"
 
-#: src/prefs_common.c:1151
+#: src/prefs_common.c:1161
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Kitajski (ISO-2022-CN)"
 
-#: src/prefs_common.c:1153
+#: src/prefs_common.c:1164
 msgid "Korean (EUC-KR)"
 msgstr "Korejski (EUC-KR)"
 
-#: src/prefs_common.c:1154
+#: src/prefs_common.c:1166
 msgid "Thai (TIS-620)"
 msgstr "Tajski (TIS-620)"
 
-#: src/prefs_common.c:1155
+#: src/prefs_common.c:1167
 msgid "Thai (Windows-874)"
 msgstr "Tajski (Windows-874)"
 
-#: src/prefs_common.c:1165
+#: src/prefs_common.c:1177
 #, fuzzy
 msgid ""
 "If `Automatic' is selected, the optimal encoding for the current locale will "
@@ -4437,129 +4474,129 @@ msgstr ""
 "Če je izbrano `Samodejno', bo uporabljeno\n"
 "optimalno kodiranje za trenutni locale."
 
-#: src/prefs_common.c:1179
+#: src/prefs_common.c:1191
 #, fuzzy
 msgid "Transfer encoding"
 msgstr "Prelomi pred pošiljanjem"
 
-#: src/prefs_common.c:1202
+#: src/prefs_common.c:1214
 msgid ""
 "Specify Content-Transfer-Encoding used when message body contains non-ASCII "
 "characters."
 msgstr ""
 
-#: src/prefs_common.c:1272
+#: src/prefs_common.c:1284
 msgid "Signature separator"
 msgstr "Ločilo podpisa"
 
-#: src/prefs_common.c:1281
+#: src/prefs_common.c:1293
 msgid "Insert automatically"
 msgstr "Vrini samodejno"
 
-#: src/prefs_common.c:1291
+#: src/prefs_common.c:1303
 msgid "Automatically launch the external editor"
 msgstr "Samodejni zaženi zunanji urejevalnik"
 
-#: src/prefs_common.c:1301
+#: src/prefs_common.c:1313
 msgid "Undo level"
 msgstr "Razveljavi nivo"
 
-#: src/prefs_common.c:1321
+#: src/prefs_common.c:1333
 msgid "Wrap messages at"
 msgstr "Prelom sporočila ob"
 
-#: src/prefs_common.c:1333
+#: src/prefs_common.c:1345
 msgid "characters"
 msgstr "znakov"
 
-#: src/prefs_common.c:1343
+#: src/prefs_common.c:1355
 msgid "Wrap quotation"
 msgstr "Prelom citata"
 
-#: src/prefs_common.c:1349
+#: src/prefs_common.c:1361
 msgid "Wrap on input"
 msgstr "Prelomi ob vnosu"
 
-#: src/prefs_common.c:1351
+#: src/prefs_common.c:1363
 msgid "Wrap before sending"
 msgstr "Prelomi pred pošiljanjem"
 
-#: src/prefs_common.c:1361
+#: src/prefs_common.c:1373
 msgid "Automatically select account for replies"
 msgstr "Samodejno izberi račun za odgovore"
 
-#: src/prefs_common.c:1363
+#: src/prefs_common.c:1375
 msgid "Quote message when replying"
 msgstr "Citiraj sporočila ob odgovarjanju"
 
-#: src/prefs_common.c:1365
+#: src/prefs_common.c:1377
 msgid "Reply button invokes mailing list reply"
 msgstr "Gumb Odgovori izvede odgovor na dopisni seznam"
 
 #. reply
-#: src/prefs_common.c:1411
+#: src/prefs_common.c:1423
 msgid "Reply format"
 msgstr "Oblika odgovora"
 
-#: src/prefs_common.c:1426 src/prefs_common.c:1468
+#: src/prefs_common.c:1438 src/prefs_common.c:1480
 msgid "Quotation mark"
 msgstr "Znak za citiranje"
 
 #. forward
-#: src/prefs_common.c:1453
+#: src/prefs_common.c:1465
 msgid "Forward format"
 msgstr "Oblika posredovanja"
 
-#: src/prefs_common.c:1500
+#: src/prefs_common.c:1512
 msgid " Description of symbols "
 msgstr "Opis simbolov"
 
-#: src/prefs_common.c:1541
+#: src/prefs_common.c:1553
 msgid "Font"
 msgstr "Pisava"
 
-#: src/prefs_common.c:1573
+#: src/prefs_common.c:1585
 msgid "Translate header name (such as `From:', `Subject:')"
 msgstr "Prevedi ime zaglavja (kot `From:', `Subject:')"
 
-#: src/prefs_common.c:1576
+#: src/prefs_common.c:1588
 msgid "Display unread number next to folder name"
 msgstr "Prikaži število neprebranih poleg imena mape"
 
-#: src/prefs_common.c:1585
+#: src/prefs_common.c:1597
 msgid "Abbreviate newsgroups longer than"
 msgstr "Skrajšaj novičarske skupine daljše od"
 
-#: src/prefs_common.c:1600
+#: src/prefs_common.c:1612
 msgid "letters"
 msgstr "Izbriši"
 
 #. ---- Summary ----
-#: src/prefs_common.c:1606
+#: src/prefs_common.c:1618
 msgid "Summary View"
 msgstr "Ogled povzetka"
 
-#: src/prefs_common.c:1615
+#: src/prefs_common.c:1627
 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.c:1617
+#: src/prefs_common.c:1629
 msgid "Expand threads"
 msgstr "Razširi niti"
 
-#: src/prefs_common.c:1625 src/prefs_common.c:2443 src/prefs_common.c:2481
+#: src/prefs_common.c:1637 src/prefs_common.c:2455 src/prefs_common.c:2493
 msgid "Date format"
 msgstr "Oblika datuma"
 
-#: src/prefs_common.c:1646
+#: src/prefs_common.c:1658
 msgid " Set display item of summary... "
 msgstr "Nastavi del za prikaz povzetka..."
 
-#: src/prefs_common.c:1710
+#: src/prefs_common.c:1722
 msgid "Enable coloration of message"
 msgstr "Omogoči barvanje sporočila"
 
-#: src/prefs_common.c:1724
+#: src/prefs_common.c:1736
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
@@ -4567,325 +4604,325 @@ msgstr ""
 "Prikaži večzložno abecedo in števila kot\n"
 "znake ASCII (samo japonščina)"
 
-#: src/prefs_common.c:1730
+#: src/prefs_common.c:1742
 msgid "Display header pane above message view"
 msgstr "Prikaži zaglavje nad ogledom sporočila"
 
-#: src/prefs_common.c:1737
+#: src/prefs_common.c:1749
 msgid "Display short headers on message view"
 msgstr "Prikaži kratko zaglavje ob ogledu sporočila"
 
-#: src/prefs_common.c:1758
+#: src/prefs_common.c:1770
 msgid "Line space"
 msgstr "Prostor za vrstico"
 
-#: src/prefs_common.c:1772 src/prefs_common.c:1810
+#: src/prefs_common.c:1784 src/prefs_common.c:1822
 msgid "pixel(s)"
 msgstr "točk(e)"
 
-#: src/prefs_common.c:1777
+#: src/prefs_common.c:1789
 msgid "Scroll"
 msgstr "Drsenje"
 
-#: src/prefs_common.c:1784
+#: src/prefs_common.c:1796
 msgid "Half page"
 msgstr "Polovica strani"
 
-#: src/prefs_common.c:1790
+#: src/prefs_common.c:1802
 msgid "Smooth scroll"
 msgstr "Nadzor gladkosti"
 
-#: src/prefs_common.c:1796
+#: src/prefs_common.c:1808
 msgid "Step"
 msgstr "Korak"
 
-#: src/prefs_common.c:1816
+#: src/prefs_common.c:1828
 msgid "Images"
 msgstr ""
 
-#: src/prefs_common.c:1824
+#: src/prefs_common.c:1836
 #, fuzzy
 msgid "Resize attached large images to fit in the window"
 msgstr "Spremeni velikost pripetim slikam"
 
-#: src/prefs_common.c:1826
+#: src/prefs_common.c:1838
 #, fuzzy
 msgid "Display images as inline"
 msgstr "Nastavitev prikaza zaglavja"
 
-#: src/prefs_common.c:1871
+#: src/prefs_common.c:1883
 msgid "Automatically check signatures"
 msgstr "Samodejno preveri podpise"
 
-#: src/prefs_common.c:1874
+#: src/prefs_common.c:1886
 msgid "Show signature check result in a popup window"
 msgstr "Prikaži rezultat preverjanja podpisa v novem oknu"
 
-#: src/prefs_common.c:1877
+#: src/prefs_common.c:1889
 msgid "Store passphrase in memory temporarily"
 msgstr "Začasno shrani prepustno frazo v pomnilnik"
 
-#: src/prefs_common.c:1892
+#: src/prefs_common.c:1904
 msgid "Expired after"
 msgstr "Poteče po"
 
-#: src/prefs_common.c:1905
+#: src/prefs_common.c:1917
 msgid "minute(s) "
 msgstr "minut(e) "
 
-#: src/prefs_common.c:1918
+#: src/prefs_common.c:1930
 #, 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.c:1932
+#: src/prefs_common.c:1944
 msgid "Grab input while entering a passphrase"
 msgstr "Zagrabi vnos med vnašanjem gesla"
 
-#: src/prefs_common.c:1937
+#: src/prefs_common.c:1949
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "Prikaži opozorilo ob zagonu, če GnuPG ne deluje"
 
-#: src/prefs_common.c:1989
+#: src/prefs_common.c:2001
 #, fuzzy
 msgid "Always open messages in summary when selected"
 msgstr "Nobena datoteka s sporočilom ni izbrana."
 
-#: src/prefs_common.c:1993
+#: src/prefs_common.c:2005
 msgid "Open first unread message when entering a folder"
 msgstr "Odpri prvo neprebrano sporočilo ob vstopu v mapo"
 
-#: src/prefs_common.c:1997
+#: src/prefs_common.c:2009
 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.c:2001
+#: src/prefs_common.c:2013
 msgid "Go to inbox after receiving new mail"
 msgstr "Ob prejemu novih sporočil pojdi v mapo Prejeto"
 
-#: src/prefs_common.c:2009
+#: src/prefs_common.c:2021
 msgid "Execute immediately when moving or deleting messages"
 msgstr "IZvrši takoj, ko prestavljaš ali brišeš sporočilo"
 
-#: src/prefs_common.c:2021
+#: src/prefs_common.c:2033
 #, 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.c:2029
+#: src/prefs_common.c:2041
 msgid "Receive dialog"
 msgstr "Dialog za sprejem"
 
-#: src/prefs_common.c:2039
+#: src/prefs_common.c:2051
 msgid "Show receive dialog"
 msgstr "Prikaži pogovorno okno za sprejem"
 
-#: src/prefs_common.c:2049
+#: src/prefs_common.c:2061
 msgid "Always"
 msgstr "Vedno"
 
-#: src/prefs_common.c:2050
+#: src/prefs_common.c:2062
 msgid "Only on manual receiving"
 msgstr ""
 
-#: src/prefs_common.c:2052
+#: src/prefs_common.c:2064
 msgid "Never"
 msgstr "Nikoli"
 
-#: src/prefs_common.c:2057
+#: src/prefs_common.c:2069
 msgid "Don't popup error dialog on receive error"
 msgstr "Ob napaki pri sprejemanju ne prikaži okna z napako"
 
-#: src/prefs_common.c:2060
+#: src/prefs_common.c:2072
 msgid "Close receive dialog when finished"
 msgstr "Na koncu zapri pogovorno okno za sprejemanje"
 
-#: src/prefs_common.c:2066
+#: src/prefs_common.c:2078
 msgid " Set key bindings... "
 msgstr " Nastavi povezave na tipke... "
 
-#: src/prefs_common.c:2122
+#: src/prefs_common.c:2134
 #, 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.c:2131
+#: src/prefs_common.c:2143
 msgid "Web browser"
 msgstr "Spletni brskalnik"
 
-#: src/prefs_common.c:2195
+#: src/prefs_common.c:2207
 msgid "Add address to destination when double-clicked"
 msgstr "Ob dvojnem kliku dodaj naslov na cilj"
 
-#: src/prefs_common.c:2197
+#: src/prefs_common.c:2209
 msgid "On exit"
 msgstr "Ob izhodu"
 
-#: src/prefs_common.c:2205
+#: src/prefs_common.c:2217
 msgid "Confirm on exit"
 msgstr "Potrdi ob izhodu"
 
-#: src/prefs_common.c:2212
+#: src/prefs_common.c:2224
 msgid "Empty trash on exit"
 msgstr "Izprazni smetnjak ob izhodu"
 
-#: src/prefs_common.c:2214
+#: src/prefs_common.c:2226
 msgid "Ask before emptying"
 msgstr "Vprašaj pred izpranjenjem"
 
-#: src/prefs_common.c:2218
+#: src/prefs_common.c:2230
 msgid "Warn if there are queued messages"
 msgstr "Opozori, če so čakajoča sporočila"
 
-#: src/prefs_common.c:2224
+#: src/prefs_common.c:2236
 msgid "Socket I/O timeout:"
 msgstr ""
 
-#: src/prefs_common.c:2237
+#: src/prefs_common.c:2249
 msgid "second(s)"
 msgstr ""
 
-#: src/prefs_common.c:2419
+#: src/prefs_common.c:2431
 msgid "the full abbreviated weekday name"
 msgstr "polno okrajšano ime dneva v tednu"
 
-#: src/prefs_common.c:2420
+#: src/prefs_common.c:2432
 msgid "the full weekday name"
 msgstr "polno ime dneva v tednu"
 
-#: src/prefs_common.c:2421
+#: src/prefs_common.c:2433
 msgid "the abbreviated month name"
 msgstr "okrajšano ime meseca"
 
-#: src/prefs_common.c:2422
+#: src/prefs_common.c:2434
 msgid "the full month name"
 msgstr "polno ime meseca"
 
-#: src/prefs_common.c:2423
+#: src/prefs_common.c:2435
 msgid "the preferred date and time for the current locale"
 msgstr "najustreznejša oblika datuma in časa za trenutni locale"
 
-#: src/prefs_common.c:2424
+#: src/prefs_common.c:2436
 msgid "the century number (year/100)"
 msgstr "številka stoletja (leto/100)"
 
-#: src/prefs_common.c:2425
+#: src/prefs_common.c:2437
 msgid "the day of the month as a decimal number"
 msgstr "dan v mesecu kot desetiško število"
 
-#: src/prefs_common.c:2426
+#: src/prefs_common.c:2438
 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.c:2427
+#: src/prefs_common.c:2439
 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.c:2428
+#: src/prefs_common.c:2440
 msgid "the day of the year as a decimal number"
 msgstr "dan v letu kot desetiško število"
 
-#: src/prefs_common.c:2429
+#: src/prefs_common.c:2441
 msgid "the month as a decimal number"
 msgstr "mesec kot desetiško število"
 
-#: src/prefs_common.c:2430
+#: src/prefs_common.c:2442
 msgid "the minute as a decimal number"
 msgstr "minute kot desetiško število"
 
-#: src/prefs_common.c:2431
+#: src/prefs_common.c:2443
 msgid "either AM or PM"
 msgstr "AM oz. PM"
 
-#: src/prefs_common.c:2432
+#: src/prefs_common.c:2444
 msgid "the second as a decimal number"
 msgstr "sekunde kot desetiško število"
 
-#: src/prefs_common.c:2433
+#: src/prefs_common.c:2445
 msgid "the day of the week as a decimal number"
 msgstr "dan v tednu kot desetiško število"
 
-#: src/prefs_common.c:2434
+#: src/prefs_common.c:2446
 msgid "the preferred date for the current locale"
 msgstr "najustreznejši datum za trenutni locale"
 
-#: src/prefs_common.c:2435
+#: src/prefs_common.c:2447
 msgid "the last two digits of a year"
 msgstr "zadnji dve števki leta"
 
-#: src/prefs_common.c:2436
+#: src/prefs_common.c:2448
 msgid "the year as a decimal number"
 msgstr "leto kot desetiško število"
 
-#: src/prefs_common.c:2437
+#: src/prefs_common.c:2449
 msgid "the time zone or name or abbreviation"
 msgstr "časovni pas ali ime ali okrajšava"
 
-#: src/prefs_common.c:2458
+#: src/prefs_common.c:2470
 msgid "Specifier"
 msgstr "Določevalec"
 
-#: src/prefs_common.c:2459
+#: src/prefs_common.c:2471
 msgid "Description"
 msgstr "Opis"
 
-#: src/prefs_common.c:2499
+#: src/prefs_common.c:2511
 msgid "Example"
 msgstr "Primer"
 
-#: src/prefs_common.c:2580
+#: src/prefs_common.c:2592
 msgid "Set message colors"
 msgstr "Nastavi barve sporočila"
 
-#: src/prefs_common.c:2588
+#: src/prefs_common.c:2600
 msgid "Colors"
 msgstr "Barve"
 
-#: src/prefs_common.c:2622
+#: src/prefs_common.c:2634
 msgid "Quoted Text - First Level"
 msgstr "Citirano besedilo - prvi nivo"
 
-#: src/prefs_common.c:2628
+#: src/prefs_common.c:2640
 msgid "Quoted Text - Second Level"
 msgstr "Citirano besedilo - drugi nivo"
 
-#: src/prefs_common.c:2634
+#: src/prefs_common.c:2646
 msgid "Quoted Text - Third Level"
 msgstr "Citirano besedilo - tretji nivo"
 
-#: src/prefs_common.c:2640
+#: src/prefs_common.c:2652
 msgid "URI link"
 msgstr "povezava URI"
 
-#: src/prefs_common.c:2647
+#: src/prefs_common.c:2659
 msgid "Recycle quote colors"
 msgstr "Obnovi barve za citiranje"
 
-#: src/prefs_common.c:2707
+#: src/prefs_common.c:2719
 msgid "Pick color for quotation level 1"
 msgstr "Izberite barvo za citiranje na prvem nivoju"
 
-#: src/prefs_common.c:2710
+#: src/prefs_common.c:2722
 msgid "Pick color for quotation level 2"
 msgstr "Izberite barvo za citiranje na drugem nivoju"
 
-#: src/prefs_common.c:2713
+#: src/prefs_common.c:2725
 msgid "Pick color for quotation level 3"
 msgstr "Izberite barvo za citiranje na tretjem nivoju"
 
-#: src/prefs_common.c:2716
+#: src/prefs_common.c:2728
 msgid "Pick color for URI"
 msgstr "Izberite barvo za URI"
 
-#: src/prefs_common.c:2853
+#: src/prefs_common.c:2865
 msgid "Description of symbols"
 msgstr "Opis simbolov"
 
-#: src/prefs_common.c:2909
+#: src/prefs_common.c:2921
 msgid ""
 "Date\n"
 "From\n"
@@ -4909,11 +4946,11 @@ msgstr ""
 "Novičarske skupine\n"
 "ID sporočila"
 
-#: src/prefs_common.c:2922
+#: src/prefs_common.c:2934
 msgid "If x is set, displays expr"
 msgstr "Če je x nastavljen, prikaži expr"
 
-#: src/prefs_common.c:2926
+#: src/prefs_common.c:2938
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -4927,7 +4964,7 @@ msgstr ""
 "Telo citiranega sporočila brez podpisa\n"
 "Dobesedno %"
 
-#: src/prefs_common.c:2934
+#: src/prefs_common.c:2946
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -4939,15 +4976,15 @@ msgstr ""
 "Dobesedni zaviti oklepaj\n"
 "Dobesedni zaviti zaklepaj"
 
-#: src/prefs_common.c:2971
+#: src/prefs_common.c:2983
 msgid "Font selection"
 msgstr "Izbira pisave"
 
-#: src/prefs_common.c:3035
+#: src/prefs_common.c:3047
 msgid "Key bindings"
 msgstr "Povezave na tipke"
 
-#: src/prefs_common.c:3049
+#: src/prefs_common.c:3061
 msgid ""
 "Select the preset of key bindings.\n"
 "You can also modify each menu's shortcuts by pressing\n"
@@ -4957,11 +4994,11 @@ msgstr ""
 "Lahko tudi spremenite bližnjice do vsakega menija, čepritisnete katerokoli "
 "tipko, ko na kos kaže miškin kazalec"
 
-#: src/prefs_common.c:3061 src/prefs_common.c:3410
+#: src/prefs_common.c:3073 src/prefs_common.c:3422
 msgid "Default"
 msgstr "Privzeto"
 
-#: src/prefs_common.c:3064 src/prefs_common.c:3419
+#: src/prefs_common.c:3076 src/prefs_common.c:3431
 msgid "Old Sylpheed"
 msgstr "Stari Sylpheed"
 
@@ -6129,6 +6166,12 @@ msgstr ""
 msgid "writing to %s failed.\n"
 msgstr "pisanje v %s ni uspelo.\n"
 
+#~ msgid "/_View/_Code set/---"
+#~ msgstr "/_Pogled/Nabor zna_kov/---"
+
+#~ msgid "/_View/_Code set"
+#~ msgstr "/_Pogled/Nabor zna_kov"
+
 #~ msgid "To save this part, pop up the context menu with "
 #~ msgstr "Za shranitev tega dela, odprite kontekstni meni z "
 
diff --git a/po/sr.po b/po/sr.po
index 04b23c9b..7becd821 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: 2005-03-15 14:29+0900\n"
+"POT-Creation-Date: 2005-03-16 14:47+0900\n"
 "PO-Revision-Date: 2002-11-29 21:08+0100\n"
 "Last-Translator: garret <garret@garrets.tk>\n"
 "Language-Team: Serbian\n"
@@ -97,7 +97,7 @@ msgstr ""
 "`G' one naloge sa kojih želite skinuti e-poštu sa `Primi sve'."
 
 #: src/account.c:638 src/addressadd.c:186 src/addressbook.c:488
-#: src/compose.c:3650 src/editaddress.c:195 src/editaddress.c:936
+#: src/compose.c:3748 src/editaddress.c:195 src/editaddress.c:936
 #: src/editaddress.c:984 src/editbook.c:191 src/editgroup.c:257
 #: src/editjpilot.c:296 src/editldap.c:300 src/editvcard.c:211
 #: src/mimeview.c:151 src/prefs_filter.c:214 src/prefs_folder_item.c:170
@@ -150,13 +150,13 @@ msgstr "Obriši nalog"
 msgid "Do you really want to delete this account?"
 msgstr "Želite li zaista obrisati ovaj nalog?"
 
-#: src/account.c:758 src/compose.c:2551 src/compose.c:4807
+#: src/account.c:758 src/compose.c:2632 src/compose.c:4943
 #: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
 #: src/folderview.c:2156 src/folderview.c:2192
 msgid "Yes"
 msgstr "Da"
 
-#: src/account.c:758 src/compose.c:2551 src/compose.c:4807
+#: src/account.c:758 src/compose.c:2632 src/compose.c:4943
 #: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
 #: src/folderview.c:2156 src/folderview.c:2192
 msgid "+No"
@@ -259,7 +259,7 @@ msgstr ""
 msgid "Add Address to Book"
 msgstr "Dodaj adresu u adresar"
 
-#: src/addressadd.c:196 src/compose.c:4191 src/editaddress.c:196
+#: src/addressadd.c:196 src/compose.c:4292 src/editaddress.c:196
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "Adresa"
@@ -273,7 +273,7 @@ msgstr "Beleške"
 msgid "Select Address Book Folder"
 msgstr "Odaberite direktorijum adresara"
 
-#: src/addressbook.c:334 src/compose.c:469 src/mainwindow.c:454
+#: src/addressbook.c:334 src/compose.c:477 src/mainwindow.c:454
 #: src/messageview.c:134
 msgid "/_File"
 msgstr "/_Datoteka"
@@ -294,8 +294,8 @@ msgstr "/_Datoteka/Novi _JPilot"
 msgid "/_File/New _Server"
 msgstr "/_Datoteka/Novi _server"
 
-#: src/addressbook.c:343 src/addressbook.c:346 src/compose.c:474
-#: src/compose.c:479 src/compose.c:483 src/mainwindow.c:471
+#: src/addressbook.c:343 src/addressbook.c:346 src/compose.c:482
+#: src/compose.c:487 src/compose.c:491 src/mainwindow.c:471
 #: src/mainwindow.c:474 src/mainwindow.c:476 src/mainwindow.c:479
 #: src/mainwindow.c:481 src/messageview.c:137
 msgid "/_File/---"
@@ -313,7 +313,7 @@ msgstr "/_Datoteka/_Obriši"
 msgid "/_File/_Save"
 msgstr "/_Datoteka/_Sačuvaj"
 
-#: src/addressbook.c:348 src/compose.c:484 src/messageview.c:138
+#: src/addressbook.c:348 src/compose.c:492 src/messageview.c:138
 msgid "/_File/_Close"
 msgstr "/_Datoteka/_Zatvori"
 
@@ -345,7 +345,7 @@ msgstr "/_Adresa/_Izmeni"
 msgid "/_Address/_Delete"
 msgstr "/_Adresa/O_briši"
 
-#: src/addressbook.c:356 src/compose.c:585 src/mainwindow.c:688
+#: src/addressbook.c:356 src/compose.c:664 src/mainwindow.c:697
 #: src/messageview.c:246
 msgid "/_Tools"
 msgstr "/_Alati"
@@ -354,12 +354,12 @@ msgstr "/_Alati"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Datoteka/Unesi _LDIF datoteku"
 
-#: src/addressbook.c:358 src/compose.c:598 src/mainwindow.c:733
+#: src/addressbook.c:358 src/compose.c:677 src/mainwindow.c:742
 #: src/messageview.c:264
 msgid "/_Help"
 msgstr "/_Pomoć"
 
-#: src/addressbook.c:359 src/compose.c:599 src/mainwindow.c:744
+#: src/addressbook.c:359 src/compose.c:678 src/mainwindow.c:753
 #: src/messageview.c:265
 msgid "/_Help/_About"
 msgstr "/_Pomoć/_O"
@@ -376,7 +376,7 @@ msgstr "/Nova _grupa"
 msgid "/New _Folder"
 msgstr "/Novi _direktorijum"
 
-#: src/addressbook.c:381 src/addressbook.c:391 src/compose.c:463
+#: src/addressbook.c:381 src/addressbook.c:391 src/compose.c:471
 #: src/folderview.c:220 src/folderview.c:222 src/folderview.c:226
 #: src/folderview.c:236 src/folderview.c:238 src/folderview.c:240
 #: src/folderview.c:244 src/folderview.c:254 src/folderview.c:256
@@ -386,7 +386,7 @@ msgstr "/Novi _direktorijum"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:382 src/addressbook.c:392 src/compose.c:486
+#: src/addressbook.c:382 src/addressbook.c:392 src/compose.c:494
 #: src/mainwindow.c:485 src/messageview.c:140
 msgid "/_Edit"
 msgstr "/_Izmeni"
@@ -399,7 +399,7 @@ msgstr "/_Obriši"
 msgid "E-Mail address"
 msgstr "Adresa e-pošte"
 
-#: src/addressbook.c:493 src/compose.c:4192 src/prefs_common.c:2186
+#: src/addressbook.c:493 src/compose.c:4293 src/prefs_common.c:2198
 msgid "Address book"
 msgstr "Adresar"
 
@@ -409,7 +409,7 @@ msgstr "Ime:"
 
 #. Buttons
 #: src/addressbook.c:625 src/addressbook.c:1665 src/addressbook.c:1671
-#: src/editaddress.c:878 src/editaddress.c:1011 src/mainwindow.c:2212
+#: src/editaddress.c:878 src/editaddress.c:1011 src/mainwindow.c:2221
 #: src/prefs_actions.c:263 src/prefs_display_header.c:275
 #: src/prefs_display_header.c:330 src/prefs_template.c:227
 msgid "Delete"
@@ -596,7 +596,7 @@ msgstr "Uobičajene adrese"
 msgid "Personal address"
 msgstr "Lične adrese"
 
-#: src/alertpanel.c:123 src/compose.c:4807 src/main.c:458
+#: src/alertpanel.c:123 src/compose.c:4943 src/main.c:458
 msgid "Notice"
 msgstr "Obaveštenje"
 
@@ -604,7 +604,7 @@ msgstr "Obaveštenje"
 msgid "Warning"
 msgstr "Upozorenje"
 
-#: src/alertpanel.c:149 src/compose.c:2551 src/inc.c:558
+#: src/alertpanel.c:149 src/compose.c:2632 src/inc.c:558
 msgid "Error"
 msgstr "Greška"
 
@@ -652,308 +652,426 @@ msgstr "Smeđa"
 msgid "None"
 msgstr "Ništa"
 
-#: src/compose.c:461
+#: src/compose.c:469
 msgid "/_Add..."
 msgstr "/_Dodaj..."
 
-#: src/compose.c:462
+#: src/compose.c:470
 msgid "/_Remove"
 msgstr "/_Skloni"
 
-#: src/compose.c:464 src/folderview.c:228 src/folderview.c:246
+#: src/compose.c:472 src/folderview.c:228 src/folderview.c:246
 #: src/folderview.c:261
 #, fuzzy
 msgid "/_Properties..."
 msgstr "/_Svojstva..."
 
-#: src/compose.c:470
+#: src/compose.c:478
 #, fuzzy
 msgid "/_File/_Send"
 msgstr "/_Datoteka/_Sačuvaj"
 
-#: src/compose.c:472
+#: src/compose.c:480
 #, fuzzy
 msgid "/_File/Send _later"
 msgstr "/_Poruka/Pošalji _kasnije"
 
-#: src/compose.c:475
+#: src/compose.c:483
 #, fuzzy
 msgid "/_File/Save to _draft folder"
 msgstr "/_Poruka/Snimi u direktorijum _nedovršeno"
 
-#: src/compose.c:477
+#: src/compose.c:485
 #, fuzzy
 msgid "/_File/Save and _keep editing"
 msgstr "/_Poruka/Pošalji _kasnije i nastavi da pišeš"
 
-#: src/compose.c:480
+#: src/compose.c:488
 msgid "/_File/_Attach file"
 msgstr "/_Datoeka/_Prikači datoteku"
 
-#: src/compose.c:481
+#: src/compose.c:489
 msgid "/_File/_Insert file"
 msgstr "/_Datoteka/_Unesi datoteku"
 
-#: src/compose.c:482
+#: src/compose.c:490
 msgid "/_File/Insert si_gnature"
 msgstr "/_Datoteka/Unesi _potpis"
 
-#: src/compose.c:487
+#: src/compose.c:495
 msgid "/_Edit/_Undo"
 msgstr "/_Izmeni/_Undo"
 
-#: src/compose.c:488
+#: src/compose.c:496
 msgid "/_Edit/_Redo"
 msgstr "/_Izmeni/_Redo"
 
-#: src/compose.c:489 src/compose.c:567 src/mainwindow.c:489
+#: src/compose.c:497 src/compose.c:575 src/mainwindow.c:489
 #: src/messageview.c:143
 msgid "/_Edit/---"
 msgstr "/_Izmeni/---"
 
-#: src/compose.c:490
+#: src/compose.c:498
 msgid "/_Edit/Cu_t"
 msgstr "/_Izmeni/S_eci"
 
-#: src/compose.c:491 src/mainwindow.c:486 src/messageview.c:141
+#: src/compose.c:499 src/mainwindow.c:486 src/messageview.c:141
 msgid "/_Edit/_Copy"
 msgstr "/_Izmeni/_Kopiraj"
 
-#: src/compose.c:492
+#: src/compose.c:500
 msgid "/_Edit/_Paste"
 msgstr "/_Izmeni/U_baci"
 
-#: src/compose.c:493
+#: src/compose.c:501
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Izmeni/Ubaci kao _citat"
 
-#: src/compose.c:495 src/mainwindow.c:487 src/messageview.c:142
+#: src/compose.c:503 src/mainwindow.c:487 src/messageview.c:142
 msgid "/_Edit/Select _all"
 msgstr "/_Izmeni/Odaberi _sve"
 
-#: src/compose.c:496
+#: src/compose.c:504
 msgid "/_Edit/A_dvanced"
 msgstr "/_Izmeni/_Napredno"
 
-#: src/compose.c:497
+#: src/compose.c:505
 msgid "/_Edit/A_dvanced/Move a character backward"
 msgstr "/_Izmeni/_Napredno/Pomeri znak unazad"
 
-#: src/compose.c:502
+#: src/compose.c:510
 msgid "/_Edit/A_dvanced/Move a character forward"
 msgstr "/_Izmeni/_Napredno/Pomeri znak unapred"
 
-#: src/compose.c:507
+#: src/compose.c:515
 msgid "/_Edit/A_dvanced/Move a word backward"
 msgstr "/_Izmeni/_Napredno/Pomeri reč unazad"
 
-#: src/compose.c:512
+#: src/compose.c:520
 msgid "/_Edit/A_dvanced/Move a word forward"
 msgstr "/_Izmeni/_Napredno/Pomeri reč unapred"
 
-#: src/compose.c:517
+#: src/compose.c:525
 msgid "/_Edit/A_dvanced/Move to beginning of line"
 msgstr "/_Izmeni/_Napredno/Pomeri na početak linije"
 
-#: src/compose.c:522
+#: src/compose.c:530
 msgid "/_Edit/A_dvanced/Move to end of line"
 msgstr "/_Izmeni/_Napredno/Pomeri na kraj linije"
 
-#: src/compose.c:527
+#: src/compose.c:535
 msgid "/_Edit/A_dvanced/Move to previous line"
 msgstr "/_Izmeni/_Napredno/Pomeri na prethodnu liniju"
 
-#: src/compose.c:532
+#: src/compose.c:540
 msgid "/_Edit/A_dvanced/Move to next line"
 msgstr "/_Izmeni/_Napredno/Pomeri na sledeću liniju"
 
-#: src/compose.c:537
+#: src/compose.c:545
 msgid "/_Edit/A_dvanced/Delete a character backward"
 msgstr "/_Izmeni/_Napredno/Obriši prethodni znak"
 
-#: src/compose.c:542
+#: src/compose.c:550
 msgid "/_Edit/A_dvanced/Delete a character forward"
 msgstr "/_Izmeni/_Napredno/Obriši sledeći znak"
 
-#: src/compose.c:547
+#: src/compose.c:555
 msgid "/_Edit/A_dvanced/Delete a word backward"
 msgstr "/_Izmeni/_Napredno/Obriši prethodnu reč"
 
-#: src/compose.c:552
+#: src/compose.c:560
 msgid "/_Edit/A_dvanced/Delete a word forward"
 msgstr "/_Izmeni/_Napredno/Obriši sledeću"
 
-#: src/compose.c:557
+#: src/compose.c:565
 msgid "/_Edit/A_dvanced/Delete line"
 msgstr "/_Izmeni/_Napredno/Obriši liniju"
 
-#: src/compose.c:562
+#: src/compose.c:570
 msgid "/_Edit/A_dvanced/Delete to end of line"
 msgstr "/_Izmeni/_Napredno/Obriši do kraja linije"
 
-#: src/compose.c:568
+#: src/compose.c:576
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/_Izmeni/Sažmi trenutni _paragraf"
 
-#: src/compose.c:570
+#: src/compose.c:578
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/_Izmeni/Sažmi sve dugačke _linije"
 
-#: src/compose.c:572
+#: src/compose.c:580
 #, fuzzy
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Izmeni/_Kopiraj"
 
-#: src/compose.c:573 src/mainwindow.c:494 src/messageview.c:147
+#: src/compose.c:581 src/mainwindow.c:494 src/messageview.c:147
 #: src/summaryview.c:370
 msgid "/_View"
 msgstr "/_Pregled"
 
-#: src/compose.c:574
+#: src/compose.c:582
 msgid "/_View/_To"
 msgstr "/_Pregled/_Za"
 
-#: src/compose.c:575
+#: src/compose.c:583
 msgid "/_View/_Cc"
 msgstr "/_Pregled/_Cc"
 
-#: src/compose.c:576
+#: src/compose.c:584
 msgid "/_View/_Bcc"
 msgstr "/_Pregled/_Bcc"
 
-#: src/compose.c:577
+#: src/compose.c:585
 msgid "/_View/_Reply to"
 msgstr "/_Pregled/_Odgovori"
 
-#: src/compose.c:578 src/compose.c:580 src/compose.c:582 src/mainwindow.c:512
-#: src/mainwindow.c:515 src/mainwindow.c:541 src/mainwindow.c:565
-#: src/mainwindow.c:641 src/mainwindow.c:645 src/messageview.c:223
+#: src/compose.c:586 src/compose.c:588 src/compose.c:590 src/compose.c:592
+#: src/mainwindow.c:512 src/mainwindow.c:515 src/mainwindow.c:541
+#: src/mainwindow.c:565 src/mainwindow.c:650 src/mainwindow.c:654
+#: src/messageview.c:223
 msgid "/_View/---"
 msgstr "/_Pregled/---"
 
-#: src/compose.c:579
+#: src/compose.c:587
 msgid "/_View/_Followup to"
 msgstr "/_Pregled/P_rosledi"
 
-#: src/compose.c:581
+#: src/compose.c:589
 msgid "/_View/R_uler"
 msgstr "/_Pregled/Len_jir"
 
-#: src/compose.c:583
+#: src/compose.c:591
 msgid "/_View/_Attachment"
 msgstr "/_Pregled/_Spajalica"
 
-#: src/compose.c:586 src/mainwindow.c:689 src/messageview.c:247
+#: src/compose.c:598 src/mainwindow.c:572 src/messageview.c:154
+#, fuzzy
+msgid "/_View/Character _encoding"
+msgstr "/_Pregled/_Složi/Opadajuće"
+
+#: src/compose.c:599
+msgid "/_View/Character _encoding/_Automatic"
+msgstr ""
+
+#: src/compose.c:601 src/compose.c:607 src/compose.c:613 src/compose.c:617
+#: src/compose.c:623 src/compose.c:627 src/compose.c:631 src/compose.c:641
+#: src/compose.c:645 src/compose.c:653 src/compose.c:657 src/mainwindow.c:568
+#: src/mainwindow.c:575 src/messageview.c:150
+#, fuzzy
+msgid "/_View/Character _encoding/---"
+msgstr "/_Pregled/_Složi/Opadajuće"
+
+#: src/compose.c:603 src/mainwindow.c:576 src/messageview.c:158
+#, fuzzy
+msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
+msgstr "/_Pregled/_Znakovni standard/7bit ascii (US-ASC_II)"
+
+#: src/compose.c:605 src/mainwindow.c:578 src/messageview.c:161
+#, fuzzy
+msgid "/_View/Character _encoding/Unicode (_UTF-8)"
+msgstr "/_Pregled/_Znakovni standard/Unicode (_UTF-8)"
+
+#: src/compose.c:609 src/mainwindow.c:582 src/messageview.c:164
+#, fuzzy
+msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
+msgstr "/_Pregled/_Znakovni standard/Zapadna Evropa (ISO-8859-_1)"
+
+#: src/compose.c:611 src/mainwindow.c:584 src/messageview.c:166
+#, fuzzy
+msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
+msgstr "/_Pregled/_Znakovni standard/Zapadna Evropa (ISO-8859-15)"
+
+#: src/compose.c:615 src/mainwindow.c:588 src/messageview.c:169
+#, fuzzy
+msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
+msgstr "/_Pregled/_Znakovni standard/Srednja Evropa (ISO-8859-_2)"
+
+#: src/compose.c:619 src/mainwindow.c:592 src/messageview.c:172
+#, fuzzy
+msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
+msgstr "/_Pregled/_Znakovni standard/_Baltik (ISO-8859-13)"
+
+#: src/compose.c:621 src/mainwindow.c:594 src/messageview.c:174
+#, fuzzy
+msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
+msgstr "/_Pregled/_Znakovni standard/Baltik (ISO-8859-_4)"
+
+#: src/compose.c:625 src/mainwindow.c:598 src/messageview.c:177
+#, fuzzy
+msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
+msgstr "/_Pregled/_Znakovni standard/Grčka (ISO-8859-_7)"
+
+#: src/compose.c:629 src/mainwindow.c:602 src/messageview.c:180
+#, fuzzy
+msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
+msgstr "/_Pregled/_Znakovni standard/Turska (ISO-8859-_9)"
+
+#: src/compose.c:633 src/mainwindow.c:606 src/messageview.c:183
+#, fuzzy
+msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
+msgstr "/_Pregled/_Znakovni standard/Ćirilica (ISO-8859-_5)"
+
+#: src/compose.c:635 src/mainwindow.c:608 src/messageview.c:185
+#, fuzzy
+msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
+msgstr "/_Pregled/_Znakovni standard/Ćirilica (KOI8-_R)"
+
+#: src/compose.c:637 src/mainwindow.c:610 src/messageview.c:187
+#, fuzzy
+msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
+msgstr "/_Pregled/_Znakovni standard/Ćirilica (KOI8-_R)"
+
+#: src/compose.c:639 src/mainwindow.c:612 src/messageview.c:189
+#, fuzzy
+msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
+msgstr "/_Pregled/_Znakovni standard/Ćirilica (Windows-1251)"
+
+#: src/compose.c:643 src/mainwindow.c:616 src/messageview.c:192
+#, fuzzy
+msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
+msgstr "/_Pregled/_Znakovni standard/Japan (ISO-2022-_JP)"
+
+#: src/compose.c:647 src/mainwindow.c:626 src/messageview.c:201
+#, fuzzy
+msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
+msgstr "/_Pregled/_Znakovni standard/Pojednostavljeni Kineski (_GB2312)"
+
+#: src/compose.c:649 src/mainwindow.c:628 src/messageview.c:203
+#, fuzzy
+msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
+msgstr "/_Pregled/_Znakovni standard/Tradicionalni Kineski (_Big5)"
+
+#: src/compose.c:651 src/mainwindow.c:630 src/messageview.c:205
+#, fuzzy
+msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
+msgstr "/_Pregled/_Znakovni standard/Tradicionalni Kineski (EUC-_TW)"
+
+#: src/compose.c:655 src/mainwindow.c:636 src/messageview.c:210
+#, fuzzy
+msgid "/_View/Character _encoding/Korean (EUC-_KR)"
+msgstr "/_Pregled/_Znakovni standard/Koreja (EUC-_KR)"
+
+#: src/compose.c:659 src/mainwindow.c:642 src/messageview.c:215
+#, fuzzy
+msgid "/_View/Character _encoding/Thai (TIS-620)"
+msgstr "/_Pregled/_Znakovni standard/Thai (TIS-620)"
+
+#: src/compose.c:661 src/mainwindow.c:644 src/messageview.c:217
+#, fuzzy
+msgid "/_View/Character _encoding/Thai (Windows-874)"
+msgstr "/_Pregled/_Znakovni standard/Thai (Windows-874)"
+
+#: src/compose.c:665 src/mainwindow.c:698 src/messageview.c:247
 msgid "/_Tools/_Address book"
 msgstr "/_Alat/_Adresar"
 
-#: src/compose.c:587
+#: src/compose.c:666
 msgid "/_Tools/_Template"
 msgstr "/_Alat/_Šablon"
 
-#: src/compose.c:588 src/mainwindow.c:707 src/messageview.c:262
+#: src/compose.c:667 src/mainwindow.c:716 src/messageview.c:262
 msgid "/_Tools/Actio_ns"
 msgstr "/_Alat/Akci_je"
 
-#: src/compose.c:589 src/compose.c:593 src/mainwindow.c:692
-#: src/mainwindow.c:706 src/mainwindow.c:708 src/mainwindow.c:711
-#: src/mainwindow.c:713 src/messageview.c:250 src/messageview.c:261
+#: src/compose.c:668 src/compose.c:672 src/mainwindow.c:701
+#: src/mainwindow.c:715 src/mainwindow.c:717 src/mainwindow.c:720
+#: src/mainwindow.c:722 src/messageview.c:250 src/messageview.c:261
 msgid "/_Tools/---"
 msgstr "/_Alati/---"
 
-#: src/compose.c:590
+#: src/compose.c:669
 #, fuzzy
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/_Izmeni/Izmeni sa neza_visnim editorom"
 
-#: src/compose.c:594
+#: src/compose.c:673
 #, fuzzy
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Alat/Akci_je"
 
-#: src/compose.c:595
+#: src/compose.c:674
 #, fuzzy
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/_Poruka/_Enkriptuj"
 
-#: src/compose.c:800
+#: src/compose.c:879
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: datoteka ne postoji\n"
 
-#: src/compose.c:899 src/compose.c:958 src/procmsg.c:1303
+#: src/compose.c:978 src/compose.c:1037 src/procmsg.c:1303
 msgid "Can't get text part\n"
 msgstr "Ne mogu dobiti deo teksta\n"
 
-#: src/compose.c:1340
+#: src/compose.c:1419
 msgid "Quote mark format error."
 msgstr "Greška u formatu citata."
 
-#: src/compose.c:1352
+#: src/compose.c:1431
 msgid "Message reply/forward format error."
 msgstr "Greška u poruci odgovori/prosledi."
 
-#: src/compose.c:1679
+#: src/compose.c:1758
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Datoteka %s ne postoji\n"
 
-#: src/compose.c:1683
+#: src/compose.c:1762
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Ne mogu dobiti veličinu datoteke %s\n"
 
-#: src/compose.c:1687
+#: src/compose.c:1766
 #, c-format
 msgid "File %s is empty."
 msgstr "Datoteka %s je prazna."
 
-#: src/compose.c:1691
+#: src/compose.c:1770
 #, c-format
 msgid "Can't read %s."
 msgstr "Ne mogu pročitati %s."
 
-#: src/compose.c:1726
+#: src/compose.c:1805
 #, c-format
 msgid "Message: %s"
 msgstr "Poruka: %s"
 
-#: src/compose.c:1797 src/mimeview.c:491
+#: src/compose.c:1876 src/mimeview.c:491
 msgid "Can't get the part of multipart message."
 msgstr "Ne mogu dobiti deo poruke iz više delova."
 
-#: src/compose.c:2188
+#: src/compose.c:2267
 msgid " [Edited]"
 msgstr " [Izmenjeno]"
 
-#: src/compose.c:2190
+#: src/compose.c:2269
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Pisanje poruke%s"
 
-#: src/compose.c:2193
+#: src/compose.c:2272
 #, c-format
 msgid "Compose message%s"
 msgstr "Pisanje poruke%s"
 
-#: src/compose.c:2304
+#: src/compose.c:2383
 msgid "Recipient is not specified."
 msgstr "Primalac nije upisan."
 
-#: src/compose.c:2312 src/compose.c:4112 src/mainwindow.c:2144
+#: src/compose.c:2391 src/compose.c:4213 src/mainwindow.c:2153
 #: src/prefs_account.c:703 src/prefs_common.c:850
 msgid "Send"
 msgstr "Pošalji"
 
-#: src/compose.c:2313
+#: src/compose.c:2392
 msgid "Subject is empty. Send it anyway?"
 msgstr "Tema je prazna. Ipak poslati?"
 
-#: src/compose.c:2364
+#: src/compose.c:2443
 msgid "can't get recipient list."
 msgstr "ne mogu dobiti listu prilmalaca."
 
-#: src/compose.c:2384
+#: src/compose.c:2463
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -961,27 +1079,27 @@ msgstr ""
 "Nalog za slanje pošte nije definisan.\n"
 "Odaberite nalog pre slanja."
 
-#: src/compose.c:2398 src/send_message.c:261
+#: src/compose.c:2477 src/send_message.c:261
 #, 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:2421
+#: src/compose.c:2500
 msgid "Can't save the message to outbox."
 msgstr "Ne mogu sačuvati poruku u direktorijumu poslato."
 
-#: src/compose.c:2457
+#: src/compose.c:2536
 #, 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:2518 src/compose.c:2739 src/compose.c:2802 src/compose.c:2921
+#: src/compose.c:2597 src/compose.c:2820 src/compose.c:2883 src/compose.c:3003
 #: src/utils.c:2189
 msgid "can't change file mode\n"
 msgstr "ne mogu promeniti atribut datoteke\n"
 
-#: src/compose.c:2546
+#: src/compose.c:2627
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -990,141 +1108,141 @@ msgstr ""
 "Ne mogu promeniti kodni raspored poruke.\n"
 "Da je ipak pošaljem?"
 
-#: src/compose.c:2610
+#: src/compose.c:2691
 msgid "can't write headers\n"
 msgstr "ne mogu upisati zaglavlje\n"
 
-#: src/compose.c:2881
+#: src/compose.c:2963
 msgid "can't remove the old message\n"
 msgstr "ne mogu skloniti staru poruku\n"
 
-#: src/compose.c:2899
+#: src/compose.c:2981
 msgid "queueing message...\n"
 msgstr "odlaganje poruke...\n"
 
-#: src/compose.c:2981
+#: src/compose.c:3063
 msgid "can't find queue folder\n"
 msgstr "ne mogu da pronađem direktorijum odloženo\n"
 
-#: src/compose.c:2988
+#: src/compose.c:3070
 msgid "can't queue the message\n"
 msgstr "ne mogu odložiti poruku\n"
 
-#: src/compose.c:3547
+#: src/compose.c:3645
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "generisan ID-poruke: %s\n"
 
-#: src/compose.c:3645
+#: src/compose.c:3743
 msgid "Creating compose window...\n"
 msgstr "Stvaranje prozora za pisanje...\n"
 
-#: src/compose.c:3648 src/compose.c:4598
+#: src/compose.c:3746 src/compose.c:4734
 msgid "MIME type"
 msgstr "MIME tip"
 
 #. S_COL_DATE
-#: src/compose.c:3649 src/mimeview.c:150 src/prefs_filter_edit.c:569
+#: src/compose.c:3747 src/mimeview.c:150 src/prefs_filter_edit.c:569
 #: src/prefs_summary_column.c:73 src/select-keys.c:317 src/summaryview.c:386
 msgid "Size"
 msgstr "Veličina"
 
-#: src/compose.c:3700 src/headerview.c:53 src/summary_search.c:169
+#: src/compose.c:3798 src/headerview.c:53 src/summary_search.c:169
 msgid "From:"
 msgstr "Od:"
 
-#: src/compose.c:4113
+#: src/compose.c:4214
 msgid "Send message"
 msgstr "Pošalji poruku"
 
-#: src/compose.c:4121
+#: src/compose.c:4222
 msgid "Send later"
 msgstr "Pošalji kasnije"
 
-#: src/compose.c:4122
+#: src/compose.c:4223
 msgid "Put into queue folder and send later"
 msgstr "Odloži u direktotijum odloženo i pošalji kasnije"
 
-#: src/compose.c:4130
+#: src/compose.c:4231
 msgid "Draft"
 msgstr "Nedovršeno"
 
-#: src/compose.c:4131
+#: src/compose.c:4232
 msgid "Save to draft folder"
 msgstr "Sačuvaj u direktorijum nedovršeno"
 
-#: src/compose.c:4141 src/compose.c:5382
+#: src/compose.c:4242 src/compose.c:5527
 msgid "Insert"
 msgstr "Unesi"
 
-#: src/compose.c:4142
+#: src/compose.c:4243
 msgid "Insert file"
 msgstr "Unesi datoteku"
 
-#: src/compose.c:4150
+#: src/compose.c:4251
 msgid "Attach"
 msgstr "Prikači"
 
-#: src/compose.c:4151
+#: src/compose.c:4252
 msgid "Attach file"
 msgstr "Prikači datoteku"
 
 #. signature
-#: src/compose.c:4161 src/prefs_account.c:1339 src/prefs_common.c:1261
+#: src/compose.c:4262 src/prefs_account.c:1339 src/prefs_common.c:1273
 msgid "Signature"
 msgstr "Potpis"
 
-#: src/compose.c:4162
+#: src/compose.c:4263
 msgid "Insert signature"
 msgstr "Unesi potpis"
 
-#: src/compose.c:4171 src/prefs_common.c:1283 src/prefs_common.c:2165
+#: src/compose.c:4272 src/prefs_common.c:1295 src/prefs_common.c:2177
 msgid "Editor"
 msgstr "Editor"
 
-#: src/compose.c:4172
+#: src/compose.c:4273
 msgid "Edit with external editor"
 msgstr "Izmeni sa nezavisnim ediorom"
 
-#: src/compose.c:4180
+#: src/compose.c:4281
 msgid "Linewrap"
 msgstr "Sažimanje"
 
-#: src/compose.c:4181
+#: src/compose.c:4282
 msgid "Wrap all long lines"
 msgstr "Sažmi sve duge linije"
 
-#: src/compose.c:4492
+#: src/compose.c:4628
 msgid "Invalid MIME type."
 msgstr "Pogrešan MIME tip"
 
-#: src/compose.c:4511
+#: src/compose.c:4647
 msgid "File doesn't exist or is empty."
 msgstr "Datoteka ne postoji ili je prazna."
 
-#: src/compose.c:4580
+#: src/compose.c:4716
 #, fuzzy
 msgid "Properties"
 msgstr "Svojstva"
 
-#: src/compose.c:4600
+#: src/compose.c:4736
 msgid "Encoding"
 msgstr "Kodiranje"
 
-#: src/compose.c:4623 src/prefs_folder_item.c:183
+#: src/compose.c:4759 src/prefs_folder_item.c:183
 msgid "Path"
 msgstr "Putanja"
 
-#: src/compose.c:4624
+#: src/compose.c:4760
 msgid "File name"
 msgstr "Ime datoteke"
 
-#: src/compose.c:4778
+#: src/compose.c:4914
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Naredba za nezavisni editor je pogrešna: `%s'\n"
 
-#: src/compose.c:4804
+#: src/compose.c:4940
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1135,72 +1253,72 @@ msgstr ""
 "Nasilno prekinuti proces?\n"
 "grupa procesa: %d"
 
-#: src/compose.c:4817
+#: src/compose.c:4953
 #, c-format
 msgid "Terminated process group id: %d"
 msgstr "Prekinuta grupa procesa: %d"
 
-#: src/compose.c:4818
+#: src/compose.c:4954
 #, c-format
 msgid "Temporary file: %s"
 msgstr "Privremena datoteka: %s"
 
-#: src/compose.c:4842
+#: src/compose.c:4978
 msgid "Compose: input from monitoring process\n"
 msgstr "Napiši: unos iz procesa praćenja\n"
 
 #. failed
-#: src/compose.c:4875
+#: src/compose.c:5011
 msgid "Couldn't exec external editor\n"
 msgstr "Ne mogu pokrenuti nezavisni editor\n"
 
-#: src/compose.c:4879
+#: src/compose.c:5015
 msgid "Couldn't write to file\n"
 msgstr "Ne mogu snimiti u datoteku\n"
 
-#: src/compose.c:4881
+#: src/compose.c:5017
 msgid "Pipe read failed\n"
 msgstr "Čitanje pipe-a nije uspelo\n"
 
-#: src/compose.c:5182 src/compose.c:5190 src/compose.c:5196
+#: src/compose.c:5318 src/compose.c:5326 src/compose.c:5332
 msgid "Can't queue the message."
 msgstr "Ne mogu odložiti poruku."
 
-#: src/compose.c:5287
+#: src/compose.c:5423
 #, fuzzy
 msgid "Select files"
 msgstr "Odaberite datoteku"
 
-#: src/compose.c:5309
+#: src/compose.c:5445
 msgid "Select file"
 msgstr "Odaberite datoteku"
 
-#: src/compose.c:5344
+#: src/compose.c:5480
 msgid "Discard message"
 msgstr "Odbaci poruku"
 
-#: src/compose.c:5345
+#: src/compose.c:5481
 msgid "This message has been modified. discard it?"
 msgstr "Ova poruka je promenjena, odbaciti?"
 
-#: src/compose.c:5346
+#: src/compose.c:5482
 msgid "Discard"
 msgstr "Odbaci"
 
-#: src/compose.c:5346
+#: src/compose.c:5482
 msgid "to Draft"
 msgstr "u Nedovršeno"
 
-#: src/compose.c:5379
+#: src/compose.c:5524
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Želite li primeniti šablon `%s'?"
 
-#: src/compose.c:5381
+#: src/compose.c:5526
 msgid "Apply template"
 msgstr "Primeni šablon"
 
-#: src/compose.c:5382
+#: src/compose.c:5527
 msgid "Replace"
 msgstr "Zameni"
 
@@ -1641,12 +1759,12 @@ msgstr "Postavljam info direktorijuma...\n"
 msgid "Setting folder info..."
 msgstr "Postavljam info direktorijuma..."
 
-#: src/folderview.c:652 src/mainwindow.c:3190 src/setup.c:81
+#: src/folderview.c:652 src/mainwindow.c:3199 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Pretražujem direktorijume %s%c%s ..."
 
-#: src/folderview.c:656 src/mainwindow.c:3195 src/setup.c:86
+#: src/folderview.c:656 src/mainwindow.c:3204 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Pretražujem direktorijum %s ..."
@@ -2108,7 +2226,7 @@ msgstr "Unesi LDIF datoteku u Adresar"
 msgid "Prev"
 msgstr "Preth."
 
-#: src/importldif.c:761 src/mainwindow.c:2230
+#: src/importldif.c:761 src/mainwindow.c:2239
 msgid "Next"
 msgstr "Sled."
 
@@ -2563,7 +2681,8 @@ msgid "/_View/Separate f_older tree"
 msgstr "/_Pregled/Odvoji sta_blo direktorijuma"
 
 #: src/mainwindow.c:514
-msgid "/_View/Separate m_essage view"
+#, fuzzy
+msgid "/_View/Separate _message view"
 msgstr "/_Pregled/Odvoji pre_gled poruka"
 
 #: src/mainwindow.c:516
@@ -2700,432 +2819,349 @@ msgstr "/_Pregled/_Idi do/Sledeće etiketirane poruke"
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Pregled/_Idi do/Dru_gog direktorijuma..."
 
-#: src/mainwindow.c:568 src/mainwindow.c:575 src/messageview.c:150
-msgid "/_View/_Code set/---"
-msgstr "/_Pregled/_Znakovni standard/---"
-
-#: src/mainwindow.c:572 src/messageview.c:154
-msgid "/_View/_Code set"
-msgstr "/_Pregled/_Znakovni standard"
-
 #: src/mainwindow.c:573 src/messageview.c:155
-msgid "/_View/_Code set/_Auto detect"
+#, fuzzy
+msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Pregled/_Znakovni standard/_Auto detekcija"
 
-#: src/mainwindow.c:576 src/messageview.c:158
-msgid "/_View/_Code set/7bit ascii (US-ASC_II)"
-msgstr "/_Pregled/_Znakovni standard/7bit ascii (US-ASC_II)"
-
-#: src/mainwindow.c:579 src/messageview.c:161
-msgid "/_View/_Code set/Unicode (_UTF-8)"
-msgstr "/_Pregled/_Znakovni standard/Unicode (_UTF-8)"
-
-#: src/mainwindow.c:582 src/messageview.c:164
-msgid "/_View/_Code set/Western European (ISO-8859-_1)"
-msgstr "/_Pregled/_Znakovni standard/Zapadna Evropa (ISO-8859-_1)"
-
-#: src/mainwindow.c:584 src/messageview.c:166
-msgid "/_View/_Code set/Western European (ISO-8859-15)"
-msgstr "/_Pregled/_Znakovni standard/Zapadna Evropa (ISO-8859-15)"
-
-#: src/mainwindow.c:587 src/messageview.c:169
-msgid "/_View/_Code set/Central European (ISO-8859-_2)"
-msgstr "/_Pregled/_Znakovni standard/Srednja Evropa (ISO-8859-_2)"
-
-#: src/mainwindow.c:590 src/messageview.c:172
-msgid "/_View/_Code set/_Baltic (ISO-8859-13)"
-msgstr "/_Pregled/_Znakovni standard/_Baltik (ISO-8859-13)"
-
-#: src/mainwindow.c:592 src/messageview.c:174
-msgid "/_View/_Code set/Baltic (ISO-8859-_4)"
-msgstr "/_Pregled/_Znakovni standard/Baltik (ISO-8859-_4)"
-
-#: src/mainwindow.c:595 src/messageview.c:177
-msgid "/_View/_Code set/Greek (ISO-8859-_7)"
-msgstr "/_Pregled/_Znakovni standard/Grčka (ISO-8859-_7)"
-
-#: src/mainwindow.c:598 src/messageview.c:180
-msgid "/_View/_Code set/Turkish (ISO-8859-_9)"
-msgstr "/_Pregled/_Znakovni standard/Turska (ISO-8859-_9)"
-
-#: src/mainwindow.c:601 src/messageview.c:183
-msgid "/_View/_Code set/Cyrillic (ISO-8859-_5)"
-msgstr "/_Pregled/_Znakovni standard/Ćirilica (ISO-8859-_5)"
-
-#: src/mainwindow.c:603 src/messageview.c:185
-msgid "/_View/_Code set/Cyrillic (KOI8-_R)"
-msgstr "/_Pregled/_Znakovni standard/Ćirilica (KOI8-_R)"
-
-#: src/mainwindow.c:605 src/messageview.c:187
+#: src/mainwindow.c:618 src/messageview.c:194
 #, fuzzy
-msgid "/_View/_Code set/Cyrillic (KOI8-U)"
-msgstr "/_Pregled/_Znakovni standard/Ćirilica (KOI8-_R)"
-
-#: src/mainwindow.c:607 src/messageview.c:189
-msgid "/_View/_Code set/Cyrillic (Windows-1251)"
-msgstr "/_Pregled/_Znakovni standard/Ćirilica (Windows-1251)"
-
-#: src/mainwindow.c:610 src/messageview.c:192
-msgid "/_View/_Code set/Japanese (ISO-2022-_JP)"
-msgstr "/_Pregled/_Znakovni standard/Japan (ISO-2022-_JP)"
-
-#: src/mainwindow.c:612 src/messageview.c:194
-msgid "/_View/_Code set/Japanese (ISO-2022-JP-2)"
+msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Pregled/_Znakovni standard/Japan (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:614 src/messageview.c:196
-msgid "/_View/_Code set/Japanese (_EUC-JP)"
+#: src/mainwindow.c:620 src/messageview.c:196
+#, fuzzy
+msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Pregled/_Znakovni standard/Japan (_EUC-JP)"
 
-#: src/mainwindow.c:616 src/messageview.c:198
-msgid "/_View/_Code set/Japanese (_Shift__JIS)"
+#: src/mainwindow.c:622 src/messageview.c:198
+#, fuzzy
+msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Pregled/_Znakovni standard/Japan (_Shift__JIS)"
 
-#: src/mainwindow.c:619 src/messageview.c:201
-msgid "/_View/_Code set/Simplified Chinese (_GB2312)"
-msgstr "/_Pregled/_Znakovni standard/Pojednostavljeni Kineski (_GB2312)"
-
-#: src/mainwindow.c:621 src/messageview.c:203
-msgid "/_View/_Code set/Traditional Chinese (_Big5)"
-msgstr "/_Pregled/_Znakovni standard/Tradicionalni Kineski (_Big5)"
-
-#: src/mainwindow.c:623 src/messageview.c:205
-msgid "/_View/_Code set/Traditional Chinese (EUC-_TW)"
-msgstr "/_Pregled/_Znakovni standard/Tradicionalni Kineski (EUC-_TW)"
-
-#: src/mainwindow.c:625 src/messageview.c:207
-msgid "/_View/_Code set/Chinese (ISO-2022-_CN)"
+#: src/mainwindow.c:632 src/messageview.c:207
+#, fuzzy
+msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Pregled/_Znakovni standard/Kina (ISO-2022-_CN)"
 
-#: src/mainwindow.c:628 src/messageview.c:210
-msgid "/_View/_Code set/Korean (EUC-_KR)"
-msgstr "/_Pregled/_Znakovni standard/Koreja (EUC-_KR)"
-
-#: src/mainwindow.c:630 src/messageview.c:212
-msgid "/_View/_Code set/Korean (ISO-2022-KR)"
+#: src/mainwindow.c:638 src/messageview.c:212
+#, fuzzy
+msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Pregled/_Znakovni standard/Koreja (ISO-2022-KR)"
 
-#: src/mainwindow.c:633 src/messageview.c:215
-msgid "/_View/_Code set/Thai (TIS-620)"
-msgstr "/_Pregled/_Znakovni standard/Thai (TIS-620)"
-
-#: src/mainwindow.c:635 src/messageview.c:217
-msgid "/_View/_Code set/Thai (Windows-874)"
-msgstr "/_Pregled/_Znakovni standard/Thai (Windows-874)"
-
-#: src/mainwindow.c:642 src/summaryview.c:371
+#: src/mainwindow.c:651 src/summaryview.c:371
 msgid "/_View/Open in new _window"
 msgstr "/_Pregled/Otvori u novom _prozoru"
 
-#: src/mainwindow.c:643 src/messageview.c:224
+#: src/mainwindow.c:652 src/messageview.c:224
 msgid "/_View/Mess_age source"
 msgstr "/_Pregled/Iz_vor poruke"
 
-#: src/mainwindow.c:644 src/messageview.c:225
+#: src/mainwindow.c:653 src/messageview.c:225
 msgid "/_View/Show all _header"
 msgstr "/_Pregled/Prikaži kompletno _zaglavlje"
 
-#: src/mainwindow.c:646
+#: src/mainwindow.c:655
 msgid "/_View/_Update summary"
 msgstr "/_Pregled/_Osveži rezime"
 
-#: src/mainwindow.c:648 src/messageview.c:227
+#: src/mainwindow.c:657 src/messageview.c:227
 msgid "/_Message"
 msgstr "/_Poruka"
 
-#: src/mainwindow.c:649
+#: src/mainwindow.c:658
 #, fuzzy
 msgid "/_Message/Recei_ve"
 msgstr "/_Poruka/I_zmeni/"
 
-#: src/mainwindow.c:650
+#: src/mainwindow.c:659
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/_Poruka/Prove_ri sa svih naloga"
 
-#: src/mainwindow.c:652
+#: src/mainwindow.c:661
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/_Poruka/Prove_ri sa svih naloga"
 
-#: src/mainwindow.c:654
+#: src/mainwindow.c:663
 #, fuzzy
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/_Poruka/Prekini pri_manje"
 
-#: src/mainwindow.c:656
+#: src/mainwindow.c:665
 #, fuzzy
 msgid "/_Message/Recei_ve/---"
 msgstr "/_Poruka/I_zmeni/"
 
-#: src/mainwindow.c:657
+#: src/mainwindow.c:666
 msgid "/_Message/_Send queued messages"
 msgstr "/_Poruka/Pošalji _odložene poruke"
 
-#: src/mainwindow.c:658 src/mainwindow.c:660 src/mainwindow.c:667
-#: src/mainwindow.c:672 src/mainwindow.c:676 src/mainwindow.c:685
+#: src/mainwindow.c:667 src/mainwindow.c:669 src/mainwindow.c:676
+#: src/mainwindow.c:681 src/mainwindow.c:685 src/mainwindow.c:694
 #: src/messageview.c:230 src/messageview.c:238 src/messageview.c:243
 msgid "/_Message/---"
 msgstr "/_Poruka/---"
 
-#: src/mainwindow.c:659 src/messageview.c:228
+#: src/mainwindow.c:668 src/messageview.c:228
 msgid "/_Message/Compose _new message"
 msgstr "/_Poruka/Sastavi _novu poruku"
 
-#: src/mainwindow.c:661 src/messageview.c:231
+#: src/mainwindow.c:670 src/messageview.c:231
 msgid "/_Message/_Reply"
 msgstr "/_Poruka/O_dgovor"
 
-#: src/mainwindow.c:662
+#: src/mainwindow.c:671
 msgid "/_Message/Repl_y to"
 msgstr "/_Poruka/O_dgovori"
 
-#: src/mainwindow.c:663 src/messageview.c:232
+#: src/mainwindow.c:672 src/messageview.c:232
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Poruka/Odgovori/svim_a"
 
-#: src/mainwindow.c:664 src/messageview.c:234
+#: src/mainwindow.c:673 src/messageview.c:234
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Poruka/Odgovori/pošil_jaocu"
 
-#: src/mainwindow.c:665 src/messageview.c:236
+#: src/mainwindow.c:674 src/messageview.c:236
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Poruka/Odgovori/li_sti"
 
-#: src/mainwindow.c:668 src/messageview.c:239
+#: src/mainwindow.c:677 src/messageview.c:239
 msgid "/_Message/_Forward"
 msgstr "/_Poruka/_Prosledi"
 
-#: src/mainwindow.c:669 src/messageview.c:240
+#: src/mainwindow.c:678 src/messageview.c:240
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Poruka/P_rosledi kao spajalicu"
 
-#: src/mainwindow.c:671 src/messageview.c:242
+#: src/mainwindow.c:680 src/messageview.c:242
 msgid "/_Message/Redirec_t"
 msgstr "/_Poruka/Preus_meri"
 
-#: src/mainwindow.c:673
+#: src/mainwindow.c:682
 msgid "/_Message/M_ove..."
 msgstr "/_Poruka/Premeštanje..."
 
-#: src/mainwindow.c:674
+#: src/mainwindow.c:683
 msgid "/_Message/_Copy..."
 msgstr "/_Poruka/_Kopiranje..."
 
-#: src/mainwindow.c:675
+#: src/mainwindow.c:684
 msgid "/_Message/_Delete"
 msgstr "/_Poruka/Brisanje..."
 
-#: src/mainwindow.c:677
+#: src/mainwindow.c:686
 msgid "/_Message/_Mark"
 msgstr "/_Poruka/Označi"
 
-#: src/mainwindow.c:678
+#: src/mainwindow.c:687
 msgid "/_Message/_Mark/_Mark"
 msgstr "/_Poruka/O_znači/_Označi"
 
-#: src/mainwindow.c:679
+#: src/mainwindow.c:688
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/_Poruka/O_znači/_Ukloni oznaku"
 
-#: src/mainwindow.c:680
+#: src/mainwindow.c:689
 msgid "/_Message/_Mark/---"
 msgstr "/_Poruka/O_znači/---"
 
-#: src/mainwindow.c:681
+#: src/mainwindow.c:690
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/_Poruka/O_znači/Označi kao _nepročitano"
 
-#: src/mainwindow.c:682
+#: src/mainwindow.c:691
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/_Poruka/O_znači/Označi kao _pročitano"
 
-#: src/mainwindow.c:684
+#: src/mainwindow.c:693
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/_Poruka/O_znači/Označi sve _pročitano"
 
-#: src/mainwindow.c:686 src/messageview.c:244
+#: src/mainwindow.c:695 src/messageview.c:244
 msgid "/_Message/Re-_edit"
 msgstr "/_Poruka/I_zmeni/"
 
-#: src/mainwindow.c:690 src/messageview.c:248
+#: src/mainwindow.c:699 src/messageview.c:248
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/_Alati/Dodaj pošiljaoca u adresar"
 
-#: src/mainwindow.c:693
+#: src/mainwindow.c:702
 #, fuzzy
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/_Alati/_Filtriraj poruke"
 
-#: src/mainwindow.c:695
+#: src/mainwindow.c:704
 #, fuzzy
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Alati/_Filtriraj poruke"
 
-#: src/mainwindow.c:697 src/messageview.c:251
+#: src/mainwindow.c:706 src/messageview.c:251
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Alati/_Napravi pravilo za filtriranje"
 
-#: src/mainwindow.c:698 src/messageview.c:253
+#: src/mainwindow.c:707 src/messageview.c:253
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Alati/_Napravi pravilo za filtriranje/_Automatski"
 
-#: src/mainwindow.c:700 src/messageview.c:255
+#: src/mainwindow.c:709 src/messageview.c:255
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Alati/_Napravi pravilo za filtriranje/Po _Od"
 
-#: src/mainwindow.c:702 src/messageview.c:257
+#: src/mainwindow.c:711 src/messageview.c:257
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Alati/_Napravi pravilo za filtriranje/Po _Za"
 
-#: src/mainwindow.c:704 src/messageview.c:259
+#: src/mainwindow.c:713 src/messageview.c:259
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Alati/_Napravi pravilo za filtriranje/Po _temi"
 
-#: src/mainwindow.c:709
+#: src/mainwindow.c:718
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/_Alati/_Obriši duple poruke"
 
-#: src/mainwindow.c:712
+#: src/mainwindow.c:721
 msgid "/_Tools/E_xecute"
 msgstr "/_Alati/_Izvrši"
 
-#: src/mainwindow.c:714
+#: src/mainwindow.c:723
 msgid "/_Tools/_Log window"
 msgstr "/_Alati/Proyor za logove"
 
-#: src/mainwindow.c:716
+#: src/mainwindow.c:725
 msgid "/_Configuration"
 msgstr "/_Konfiguracija"
 
-#: src/mainwindow.c:717
+#: src/mainwindow.c:726
 msgid "/_Configuration/_Common preferences..."
 msgstr "/_Konfiguracija/U_običajene postavke..."
 
-#: src/mainwindow.c:719
+#: src/mainwindow.c:728
 msgid "/_Configuration/_Filter setting..."
 msgstr "/_Konfiguracija/Postavke _filtera..."
 
-#: src/mainwindow.c:721
+#: src/mainwindow.c:730
 msgid "/_Configuration/_Template..."
 msgstr "/_Konfiguracija/_Šablon..."
 
-#: src/mainwindow.c:722
+#: src/mainwindow.c:731
 msgid "/_Configuration/_Actions..."
 msgstr "/_Konfiguracija/_Akcije..."
 
-#: src/mainwindow.c:723
+#: src/mainwindow.c:732
 msgid "/_Configuration/---"
 msgstr "/_Konfiguracija/---"
 
-#: src/mainwindow.c:724
+#: src/mainwindow.c:733
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Konfiguracija/_Postavke za trenutni nalog..."
 
-#: src/mainwindow.c:726
+#: src/mainwindow.c:735
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Konfiguracija/Napravi _nov nalog..."
 
-#: src/mainwindow.c:728
+#: src/mainwindow.c:737
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Konfiguracija/_Izmeni naloge..."
 
-#: src/mainwindow.c:730
+#: src/mainwindow.c:739
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Konfiguracija/Promeni _trenutni nalog"
 
-#: src/mainwindow.c:734
+#: src/mainwindow.c:743
 msgid "/_Help/_Manual"
 msgstr "/_Pomoć/_Priručnik"
 
-#: src/mainwindow.c:735
+#: src/mainwindow.c:744
 msgid "/_Help/_Manual/_English"
 msgstr "/_Pomoć/_Priručnik/_Engleski"
 
-#: src/mainwindow.c:736
+#: src/mainwindow.c:745
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/_Pomoć/_Priručnik/_Japanski"
 
-#: src/mainwindow.c:737
+#: src/mainwindow.c:746
 msgid "/_Help/_FAQ"
 msgstr "/_Pomoć/_FAQ"
 
-#: src/mainwindow.c:738
+#: src/mainwindow.c:747
 msgid "/_Help/_FAQ/_English"
 msgstr "/_Pomoć/_FAQ/_Engleski"
 
-#: src/mainwindow.c:739
+#: src/mainwindow.c:748
 msgid "/_Help/_FAQ/_German"
 msgstr "/_Pomoć/_FAQ/_Nemački"
 
-#: src/mainwindow.c:740
+#: src/mainwindow.c:749
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/_Pomoć/_FAQ/_Španski"
 
-#: src/mainwindow.c:741
+#: src/mainwindow.c:750
 msgid "/_Help/_FAQ/_French"
 msgstr "/_Pomoć/_FAQ/_Francuski"
 
-#: src/mainwindow.c:742
+#: src/mainwindow.c:751
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/_Pomoć/_FAQ/_Italijanski"
 
-#: src/mainwindow.c:743
+#: src/mainwindow.c:752
 msgid "/_Help/---"
 msgstr "/_Pomoć/---"
 
-#: src/mainwindow.c:783
+#: src/mainwindow.c:792
 msgid "Creating main window...\n"
 msgstr "Kreiranje glavnih prozora...\n"
 
-#: src/mainwindow.c:943
+#: src/mainwindow.c:952
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Glavni Prozor: prikaz boje %d nije uspeo\n"
 
-#: src/mainwindow.c:1021 src/summaryview.c:1368 src/summaryview.c:1677
+#: src/mainwindow.c:1030 src/summaryview.c:1368 src/summaryview.c:1677
 #: src/summaryview.c:1785 src/summaryview.c:1831 src/summaryview.c:2453
 #: src/summaryview.c:3080 src/summaryview.c:3146 src/summaryview.c:3171
 #: src/summaryview.c:3284
 msgid "done.\n"
 msgstr "gotovo.\n"
 
-#: src/mainwindow.c:1137 src/mainwindow.c:1178 src/mainwindow.c:1206
+#: src/mainwindow.c:1146 src/mainwindow.c:1187 src/mainwindow.c:1215
 msgid "Untitled"
 msgstr "Neimenovano"
 
-#: src/mainwindow.c:1207
+#: src/mainwindow.c:1216
 msgid "none"
 msgstr "ništa"
 
-#: src/mainwindow.c:1257
+#: src/mainwindow.c:1266
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "Menjanje vrste podele prozora iz %d u %d\n"
 
-#: src/mainwindow.c:1477
+#: src/mainwindow.c:1486
 msgid "Offline"
 msgstr ""
 
-#: src/mainwindow.c:1478
+#: src/mainwindow.c:1487
 msgid "You are offline. Go online?"
 msgstr ""
 
-#: src/mainwindow.c:1492
+#: src/mainwindow.c:1501
 #, fuzzy
 msgid "Empty all trash"
 msgstr "Isprazni smeće"
 
-#: src/mainwindow.c:1493
+#: src/mainwindow.c:1502
 #, fuzzy
 msgid "Empty messages in all trash?"
 msgstr "Isprazniti sve poruke iz smeća?"
 
-#: src/mainwindow.c:1521
+#: src/mainwindow.c:1530
 msgid "Add mailbox"
 msgstr "Dodaj sanduče"
 
-#: src/mainwindow.c:1522
+#: src/mainwindow.c:1531
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3135,16 +3171,16 @@ msgstr ""
 "Ako je unešen postojeće sanduče, automatski\n"
 "će biti pretražen."
 
-#: src/mainwindow.c:1528
+#: src/mainwindow.c:1537
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Sanduče`%s' već postoji."
 
-#: src/mainwindow.c:1533 src/setup.c:57
+#: src/mainwindow.c:1542 src/setup.c:57
 msgid "Mailbox"
 msgstr "Sanduče"
 
-#: src/mainwindow.c:1539 src/setup.c:63
+#: src/mainwindow.c:1548 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3153,144 +3189,144 @@ msgstr ""
 "Kreiranje sandučeta nije uspelo.\n"
 "Možda neke datoteke već postoje ili nemate pravo pisanja u direktoriju."
 
-#: src/mainwindow.c:1912
+#: src/mainwindow.c:1921
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Direktorijumi"
 
-#: src/mainwindow.c:1932 src/messageview.c:358
+#: src/mainwindow.c:1941 src/messageview.c:358
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Poruke"
 
-#: src/mainwindow.c:2079 src/summaryview.c:340
+#: src/mainwindow.c:2088 src/summaryview.c:340
 msgid "/_Reply"
 msgstr "/Od_govor"
 
-#: src/mainwindow.c:2080
+#: src/mainwindow.c:2089
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "Odgovori svima"
 
-#: src/mainwindow.c:2081
+#: src/mainwindow.c:2090
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/O_dgovori/_pošiljaocu"
 
-#: src/mainwindow.c:2082
+#: src/mainwindow.c:2091
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/O_dgovori/na mailing _listu"
 
-#: src/mainwindow.c:2087 src/summaryview.c:347
+#: src/mainwindow.c:2096 src/summaryview.c:347
 msgid "/_Forward"
 msgstr "/P_rosledi"
 
-#: src/mainwindow.c:2088 src/summaryview.c:348
+#: src/mainwindow.c:2097 src/summaryview.c:348
 msgid "/For_ward as attachment"
 msgstr "/Pro_sledi kao dodatak"
 
-#: src/mainwindow.c:2089 src/summaryview.c:349
+#: src/mainwindow.c:2098 src/summaryview.c:349
 msgid "/Redirec_t"
 msgstr "/Pre_usmeri"
 
-#: src/mainwindow.c:2125
+#: src/mainwindow.c:2134
 msgid "Get"
 msgstr "Primi"
 
-#: src/mainwindow.c:2126
+#: src/mainwindow.c:2135
 msgid "Incorporate new mail"
 msgstr "Prima novu poštu"
 
-#: src/mainwindow.c:2133
+#: src/mainwindow.c:2142
 msgid "Get all"
 msgstr "Primi sve"
 
-#: src/mainwindow.c:2134
+#: src/mainwindow.c:2143
 msgid "Incorporate new mail of all accounts"
 msgstr "Prima novu poštu sa svih naloga"
 
-#: src/mainwindow.c:2145
+#: src/mainwindow.c:2154
 msgid "Send queued message(s)"
 msgstr "Šalje odložene poruku/e"
 
-#: src/mainwindow.c:2155 src/prefs_account.c:705 src/prefs_common.c:852
+#: src/mainwindow.c:2164 src/prefs_account.c:705 src/prefs_common.c:852
 #: src/prefs_folder_item.c:137
 msgid "Compose"
 msgstr "Napiši"
 
-#: src/mainwindow.c:2156
+#: src/mainwindow.c:2165
 msgid "Compose new message"
 msgstr "Napiši novu poruku"
 
-#: src/mainwindow.c:2164 src/prefs_common.c:1353
+#: src/mainwindow.c:2173 src/prefs_common.c:1365
 msgid "Reply"
 msgstr "Odgovori"
 
-#: src/mainwindow.c:2165 src/mainwindow.c:2178
+#: src/mainwindow.c:2174 src/mainwindow.c:2187
 msgid "Reply to the message"
 msgstr "Odgovari na poruku"
 
-#: src/mainwindow.c:2183
+#: src/mainwindow.c:2192
 msgid "Reply all"
 msgstr "Odgovori na sve"
 
-#: src/mainwindow.c:2184
+#: src/mainwindow.c:2193
 msgid "Reply to all"
 msgstr "Odgovori svima"
 
-#: src/mainwindow.c:2192 src/prefs_filter_edit.c:719
+#: src/mainwindow.c:2201 src/prefs_filter_edit.c:719
 msgid "Forward"
 msgstr "Prosledi"
 
-#: src/mainwindow.c:2193 src/mainwindow.c:2206
+#: src/mainwindow.c:2202 src/mainwindow.c:2215
 msgid "Forward the message"
 msgstr "Prosleđuje poruku"
 
-#: src/mainwindow.c:2213
+#: src/mainwindow.c:2222
 msgid "Delete the message"
 msgstr "Obriši poruku"
 
-#: src/mainwindow.c:2221
+#: src/mainwindow.c:2230
 msgid "Execute"
 msgstr "Izvrši"
 
-#: src/mainwindow.c:2222
+#: src/mainwindow.c:2231
 msgid "Execute marked process"
 msgstr "Izvrši označene procese"
 
-#: src/mainwindow.c:2231
+#: src/mainwindow.c:2240
 msgid "Next unread message"
 msgstr "Sledeća nepročitana poruka"
 
-#: src/mainwindow.c:2242
+#: src/mainwindow.c:2251
 msgid "Prefs"
 msgstr "Svojstva"
 
-#: src/mainwindow.c:2243
+#: src/mainwindow.c:2252
 msgid "Common preferences"
 msgstr "Uobičajena svojstva"
 
-#: src/mainwindow.c:2250 src/prefs_folder_item.c:258
+#: src/mainwindow.c:2259 src/prefs_folder_item.c:258
 #: src/prefs_folder_item.c:269 src/progressdialog.c:50
 msgid "Account"
 msgstr "Nalog"
 
-#: src/mainwindow.c:2251
+#: src/mainwindow.c:2260
 msgid "Account setting"
 msgstr "Podešavanja naloga"
 
-#: src/mainwindow.c:2425
+#: src/mainwindow.c:2434
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 
-#: src/mainwindow.c:2436
+#: src/mainwindow.c:2445
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 
-#: src/mainwindow.c:2624
+#: src/mainwindow.c:2633
 msgid "Exit"
 msgstr "Izlaz"
 
-#: src/mainwindow.c:2624
+#: src/mainwindow.c:2633
 msgid "Exit this program?"
 msgstr "Izlaz iz ovog programa?"
 
@@ -3416,7 +3452,7 @@ msgstr "Pretraga završena"
 msgid "Creating message view...\n"
 msgstr "Pravljenje pregleda poruka...\n"
 
-#: src/messageview.c:303 src/prefs_common.c:1550
+#: src/messageview.c:303 src/prefs_common.c:1562
 msgid "Text"
 msgstr "Tekst"
 
@@ -3429,7 +3465,7 @@ msgstr "Dodatak"
 msgid "Can't save the file `%s'."
 msgstr "Ne mogu sačuvati datoteku `%s'."
 
-#: src/messageview.c:697 src/prefs_common.c:2154 src/summaryview.c:2744
+#: src/messageview.c:697 src/prefs_common.c:2166 src/summaryview.c:2744
 msgid "Print"
 msgstr "Štampaj"
 
@@ -3906,7 +3942,7 @@ msgstr "(Nefiltrirane poruke biti će stavljene u ovaj direktorijum)"
 msgid "Authentication method"
 msgstr "Način provere identieta"
 
-#: src/prefs_account.c:1123 src/prefs_account.c:1239 src/prefs_common.c:1189
+#: src/prefs_account.c:1123 src/prefs_account.c:1239 src/prefs_common.c:1201
 msgid "Automatic"
 msgstr "Automatski"
 
@@ -3930,7 +3966,7 @@ msgstr "Generiši ID poruke"
 msgid "Add user-defined header"
 msgstr "Dodaj zaglavlje korisnika"
 
-#: src/prefs_account.c:1196 src/prefs_common.c:1714 src/prefs_common.c:1739
+#: src/prefs_account.c:1196 src/prefs_common.c:1726 src/prefs_common.c:1751
 msgid " Edit... "
 msgstr " Izmeni... "
 
@@ -4325,106 +4361,107 @@ msgid "Save sent messages to outbox"
 msgstr "Sačuvaj poslate poruke u poslato"
 
 #: src/prefs_common.c:1113
-msgid "Outgoing codeset"
+#, fuzzy
+msgid "Outgoing encoding"
 msgstr "Izlazni charset"
 
 #: src/prefs_common.c:1128
 msgid "Automatic (Recommended)"
 msgstr "Automatsko (preporučeno)"
 
-#: src/prefs_common.c:1129
+#: src/prefs_common.c:1130
 msgid "7bit ascii (US-ASCII)"
 msgstr "7bit ascii (US-ASCII)"
 
-#: src/prefs_common.c:1130
+#: src/prefs_common.c:1132
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
-#: src/prefs_common.c:1131
+#: src/prefs_common.c:1134
 msgid "Western European (ISO-8859-1)"
 msgstr "Zapadno-Evropski (ISO-8859-1)"
 
-#: src/prefs_common.c:1132
+#: src/prefs_common.c:1135
 msgid "Western European (ISO-8859-15)"
 msgstr "Zapadno-Europski (ISO-8859-15)"
 
-#: src/prefs_common.c:1133
+#: src/prefs_common.c:1137
 msgid "Central European (ISO-8859-2)"
 msgstr "Srednje-Evropski (ISO-8859-2)"
 
-#: src/prefs_common.c:1134
+#: src/prefs_common.c:1139
 msgid "Baltic (ISO-8859-13)"
 msgstr "Blatički (ISO-8859-13)"
 
-#: src/prefs_common.c:1135
+#: src/prefs_common.c:1140
 msgid "Baltic (ISO-8859-4)"
 msgstr "Blatički (ISO'8859-4)"
 
-#: src/prefs_common.c:1136
+#: src/prefs_common.c:1142
 msgid "Greek (ISO-8859-7)"
 msgstr "Grčki (ISO-8859-7)"
 
-#: src/prefs_common.c:1137
+#: src/prefs_common.c:1144
 msgid "Turkish (ISO-8859-9)"
 msgstr "Turski (ISO-8859-9)"
 
-#: src/prefs_common.c:1138
+#: src/prefs_common.c:1146
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Ćirilica (ISO-8859-5)"
 
-#: src/prefs_common.c:1139
+#: src/prefs_common.c:1147
 msgid "Cyrillic (KOI8-R)"
 msgstr "Ćirilica (KOI8-R)"
 
-#: src/prefs_common.c:1140
-msgid "Cyrillic (Windows-1251)"
-msgstr "Ćirilica (Windows-1251)"
-
-#: src/prefs_common.c:1141
+#: src/prefs_common.c:1148
 msgid "Cyrillic (KOI8-U)"
 msgstr "Ćirilica (KOI8-U)"
 
-#: src/prefs_common.c:1142
+#: src/prefs_common.c:1149
+msgid "Cyrillic (Windows-1251)"
+msgstr "Ćirilica (Windows-1251)"
+
+#: src/prefs_common.c:1151
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Japanski (ISO-2022-JP)"
 
-#: src/prefs_common.c:1144
+#: src/prefs_common.c:1153
 msgid "Japanese (EUC-JP)"
 msgstr "Japanski (EUC-JP)"
 
-#: src/prefs_common.c:1145
+#: src/prefs_common.c:1154
 msgid "Japanese (Shift_JIS)"
 msgstr "Japanski (Shift_JIS)"
 
-#: src/prefs_common.c:1147
+#: src/prefs_common.c:1157
 msgid "Simplified Chinese (GB2312)"
 msgstr "Pojednostavljeni Kineski (GB2312)"
 
-#: src/prefs_common.c:1148
+#: src/prefs_common.c:1158
 msgid "Traditional Chinese (Big5)"
 msgstr "Tradicionalni Kineski (Big5)"
 
-#: src/prefs_common.c:1150
+#: src/prefs_common.c:1160
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Tradicionalni Kineski (EUC-TW)"
 
-#: src/prefs_common.c:1151
+#: src/prefs_common.c:1161
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Kineski (ISO-2022-CN)"
 
-#: src/prefs_common.c:1153
+#: src/prefs_common.c:1164
 msgid "Korean (EUC-KR)"
 msgstr "Korejski (EUC-KR)"
 
-#: src/prefs_common.c:1154
+#: src/prefs_common.c:1166
 msgid "Thai (TIS-620)"
 msgstr "Thai (TIS-620)"
 
-#: src/prefs_common.c:1155
+#: src/prefs_common.c:1167
 msgid "Thai (Windows-874)"
 msgstr "Thai (Windows-874)"
 
-#: src/prefs_common.c:1165
+#: src/prefs_common.c:1177
 #, fuzzy
 msgid ""
 "If `Automatic' is selected, the optimal encoding for the current locale will "
@@ -4433,454 +4470,454 @@ msgstr ""
 "Ako je `Automatski' odabrano, optimalni charset\n"
 "za locale će biti korišćen."
 
-#: src/prefs_common.c:1179
+#: src/prefs_common.c:1191
 #, fuzzy
 msgid "Transfer encoding"
 msgstr "Sažmi pre slanja"
 
-#: src/prefs_common.c:1202
+#: src/prefs_common.c:1214
 msgid ""
 "Specify Content-Transfer-Encoding used when message body contains non-ASCII "
 "characters."
 msgstr ""
 
-#: src/prefs_common.c:1272
+#: src/prefs_common.c:1284
 msgid "Signature separator"
 msgstr "Odvaja potpis"
 
-#: src/prefs_common.c:1281
+#: src/prefs_common.c:1293
 msgid "Insert automatically"
 msgstr "Ubaci automatski"
 
-#: src/prefs_common.c:1291
+#: src/prefs_common.c:1303
 msgid "Automatically launch the external editor"
 msgstr "Automatski pokreni spoljašnji editor"
 
-#: src/prefs_common.c:1301
+#: src/prefs_common.c:1313
 msgid "Undo level"
 msgstr "Undo nivo"
 
-#: src/prefs_common.c:1321
+#: src/prefs_common.c:1333
 msgid "Wrap messages at"
 msgstr "Sažmi poruke na"
 
-#: src/prefs_common.c:1333
+#: src/prefs_common.c:1345
 msgid "characters"
 msgstr "znakova"
 
-#: src/prefs_common.c:1343
+#: src/prefs_common.c:1355
 msgid "Wrap quotation"
 msgstr "Sažmi citat"
 
-#: src/prefs_common.c:1349
+#: src/prefs_common.c:1361
 msgid "Wrap on input"
 msgstr "Sažmi pri unosu"
 
-#: src/prefs_common.c:1351
+#: src/prefs_common.c:1363
 msgid "Wrap before sending"
 msgstr "Sažmi pre slanja"
 
-#: src/prefs_common.c:1361
+#: src/prefs_common.c:1373
 msgid "Automatically select account for replies"
 msgstr "Automatski odaberi nalog za odgovore"
 
-#: src/prefs_common.c:1363
+#: src/prefs_common.c:1375
 msgid "Quote message when replying"
 msgstr "Citiraj poruku pri odgovaranju"
 
-#: src/prefs_common.c:1365
+#: src/prefs_common.c:1377
 msgid "Reply button invokes mailing list reply"
 msgstr "Taster za odgovor povlači odgovor za listu"
 
 #. reply
-#: src/prefs_common.c:1411
+#: src/prefs_common.c:1423
 msgid "Reply format"
 msgstr "Format odgovora"
 
-#: src/prefs_common.c:1426 src/prefs_common.c:1468
+#: src/prefs_common.c:1438 src/prefs_common.c:1480
 msgid "Quotation mark"
 msgstr "Oznaka citata"
 
 #. forward
-#: src/prefs_common.c:1453
+#: src/prefs_common.c:1465
 msgid "Forward format"
 msgstr "Format proseđivanja"
 
-#: src/prefs_common.c:1500
+#: src/prefs_common.c:1512
 msgid " Description of symbols "
 msgstr " Objašnjenje simbola "
 
-#: src/prefs_common.c:1541
+#: src/prefs_common.c:1553
 msgid "Font"
 msgstr "Font"
 
-#: src/prefs_common.c:1573
+#: src/prefs_common.c:1585
 msgid "Translate header name (such as `From:', `Subject:')"
 msgstr "Prevedi ime zaglavlja (kao što su `Od:' i `Tema:')"
 
-#: src/prefs_common.c:1576
+#: src/prefs_common.c:1588
 msgid "Display unread number next to folder name"
 msgstr "Prikaži broj nepročitanih poruka pored imena direktorijuma"
 
-#: src/prefs_common.c:1585
+#: src/prefs_common.c:1597
 msgid "Abbreviate newsgroups longer than"
 msgstr "Skrati news grupe duže od"
 
-#: src/prefs_common.c:1600
+#: src/prefs_common.c:1612
 msgid "letters"
 msgstr "slova"
 
 #. ---- Summary ----
-#: src/prefs_common.c:1606
+#: src/prefs_common.c:1618
 msgid "Summary View"
 msgstr "Pregled održavanja"
 
-#: src/prefs_common.c:1615
+#: src/prefs_common.c:1627
 msgid "Display recipient on `From' column if sender is yourself"
 msgstr "Prikaži primaoca na `Od' ukoliko ste Vi autor"
 
-#: src/prefs_common.c:1617
+#: src/prefs_common.c:1629
 msgid "Expand threads"
 msgstr "Raširi stablo"
 
-#: src/prefs_common.c:1625 src/prefs_common.c:2443 src/prefs_common.c:2481
+#: src/prefs_common.c:1637 src/prefs_common.c:2455 src/prefs_common.c:2493
 msgid "Date format"
 msgstr "Format datuma"
 
-#: src/prefs_common.c:1646
+#: src/prefs_common.c:1658
 msgid " Set display item of summary... "
 msgstr " Postavljanje pojedinosti prikaza... "
 
-#: src/prefs_common.c:1710
+#: src/prefs_common.c:1722
 msgid "Enable coloration of message"
 msgstr "Omogući poruke u boji"
 
-#: src/prefs_common.c:1724
+#: src/prefs_common.c:1736
 #, 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.c:1730
+#: src/prefs_common.c:1742
 msgid "Display header pane above message view"
 msgstr "Prikaži zaglavlje iznad poruke"
 
-#: src/prefs_common.c:1737
+#: src/prefs_common.c:1749
 msgid "Display short headers on message view"
 msgstr "Prikaži kratko zaglavlje na pregledu poruka"
 
-#: src/prefs_common.c:1758
+#: src/prefs_common.c:1770
 msgid "Line space"
 msgstr "Razmak linija"
 
-#: src/prefs_common.c:1772 src/prefs_common.c:1810
+#: src/prefs_common.c:1784 src/prefs_common.c:1822
 msgid "pixel(s)"
 msgstr "pixel(a)"
 
-#: src/prefs_common.c:1777
+#: src/prefs_common.c:1789
 msgid "Scroll"
 msgstr "Scroll"
 
-#: src/prefs_common.c:1784
+#: src/prefs_common.c:1796
 msgid "Half page"
 msgstr "Pola stranice"
 
-#: src/prefs_common.c:1790
+#: src/prefs_common.c:1802
 msgid "Smooth scroll"
 msgstr "Miran scroll"
 
-#: src/prefs_common.c:1796
+#: src/prefs_common.c:1808
 msgid "Step"
 msgstr "Korak"
 
-#: src/prefs_common.c:1816
+#: src/prefs_common.c:1828
 msgid "Images"
 msgstr ""
 
-#: src/prefs_common.c:1824
+#: src/prefs_common.c:1836
 msgid "Resize attached large images to fit in the window"
 msgstr ""
 
-#: src/prefs_common.c:1826
+#: src/prefs_common.c:1838
 #, fuzzy
 msgid "Display images as inline"
 msgstr "Prikaz podešavanje zaglavlja"
 
-#: src/prefs_common.c:1871
+#: src/prefs_common.c:1883
 msgid "Automatically check signatures"
 msgstr "Automatski proveri potpis"
 
-#: src/prefs_common.c:1874
+#: src/prefs_common.c:1886
 msgid "Show signature check result in a popup window"
 msgstr "Prikaži potpis u popup prozoru"
 
-#: src/prefs_common.c:1877
+#: src/prefs_common.c:1889
 msgid "Store passphrase in memory temporarily"
 msgstr "Smesti lozinku privremeno u memoriju"
 
-#: src/prefs_common.c:1892
+#: src/prefs_common.c:1904
 msgid "Expired after"
 msgstr "Ističe posle"
 
-#: src/prefs_common.c:1905
+#: src/prefs_common.c:1917
 msgid "minute(s) "
 msgstr "minut(a)"
 
-#: src/prefs_common.c:1918
+#: src/prefs_common.c:1930
 #, 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.c:1932
+#: src/prefs_common.c:1944
 msgid "Grab input while entering a passphrase"
 msgstr "Uhvati unos pri upisivanju lozinke"
 
-#: src/prefs_common.c:1937
+#: src/prefs_common.c:1949
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "Prikaži upozorenje na startu ako GnuPG ne radi"
 
-#: src/prefs_common.c:1989
+#: src/prefs_common.c:2001
 #, fuzzy
 msgid "Always open messages in summary when selected"
 msgstr "Nijedna datoteka poruke nije odabrana."
 
-#: src/prefs_common.c:1993
+#: src/prefs_common.c:2005
 msgid "Open first unread message when entering a folder"
 msgstr "Otvori prvu nepročitanu poruku pri ulasku u direktorijum"
 
-#: src/prefs_common.c:1997
+#: src/prefs_common.c:2009
 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.c:2001
+#: src/prefs_common.c:2013
 msgid "Go to inbox after receiving new mail"
 msgstr "Idi u sanduče posle primanja pošte"
 
-#: src/prefs_common.c:2009
+#: src/prefs_common.c:2021
 msgid "Execute immediately when moving or deleting messages"
 msgstr "Izvrši odmah pri premeštanju ili brisanju poruka"
 
-#: src/prefs_common.c:2021
+#: src/prefs_common.c:2033
 #, 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.c:2029
+#: src/prefs_common.c:2041
 #, fuzzy
 msgid "Receive dialog"
 msgstr "Prikaži dijalog primanja"
 
-#: src/prefs_common.c:2039
+#: src/prefs_common.c:2051
 msgid "Show receive dialog"
 msgstr "Prikaži dijalog primanja"
 
-#: src/prefs_common.c:2049
+#: src/prefs_common.c:2061
 msgid "Always"
 msgstr "Uvek"
 
-#: src/prefs_common.c:2050
+#: src/prefs_common.c:2062
 msgid "Only on manual receiving"
 msgstr ""
 
-#: src/prefs_common.c:2052
+#: src/prefs_common.c:2064
 msgid "Never"
 msgstr "Nikada"
 
-#: src/prefs_common.c:2057
+#: src/prefs_common.c:2069
 msgid "Don't popup error dialog on receive error"
 msgstr "Ne izbacuj prozor sa porukom o grešci u primanju"
 
-#: src/prefs_common.c:2060
+#: src/prefs_common.c:2072
 msgid "Close receive dialog when finished"
 msgstr "Zatvori dijalog primanja kada se završi"
 
-#: src/prefs_common.c:2066
+#: src/prefs_common.c:2078
 msgid " Set key bindings... "
 msgstr " Podešavanje prečica na tastaturi..."
 
-#: src/prefs_common.c:2122
+#: src/prefs_common.c:2134
 #, 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.c:2131
+#: src/prefs_common.c:2143
 msgid "Web browser"
 msgstr "Web čitač"
 
-#: src/prefs_common.c:2195
+#: src/prefs_common.c:2207
 msgid "Add address to destination when double-clicked"
 msgstr "Dodaj adresu u odredište kada se dva put klikne"
 
-#: src/prefs_common.c:2197
+#: src/prefs_common.c:2209
 msgid "On exit"
 msgstr "Na izlazu"
 
-#: src/prefs_common.c:2205
+#: src/prefs_common.c:2217
 msgid "Confirm on exit"
 msgstr "Potvrdi izlaz"
 
-#: src/prefs_common.c:2212
+#: src/prefs_common.c:2224
 msgid "Empty trash on exit"
 msgstr "Isprazni smeće pri izlazu"
 
-#: src/prefs_common.c:2214
+#: src/prefs_common.c:2226
 msgid "Ask before emptying"
 msgstr "Pitaj pre pražnjenja"
 
-#: src/prefs_common.c:2218
+#: src/prefs_common.c:2230
 msgid "Warn if there are queued messages"
 msgstr "Upozori ako ima odloženih poruka"
 
-#: src/prefs_common.c:2224
+#: src/prefs_common.c:2236
 msgid "Socket I/O timeout:"
 msgstr ""
 
-#: src/prefs_common.c:2237
+#: src/prefs_common.c:2249
 msgid "second(s)"
 msgstr ""
 
-#: src/prefs_common.c:2419
+#: src/prefs_common.c:2431
 msgid "the full abbreviated weekday name"
 msgstr "pojednostavljeno ime dana u nedelji"
 
-#: src/prefs_common.c:2420
+#: src/prefs_common.c:2432
 msgid "the full weekday name"
 msgstr "puno ime dana u nedelji"
 
-#: src/prefs_common.c:2421
+#: src/prefs_common.c:2433
 msgid "the abbreviated month name"
 msgstr "skraćeno ime meseca"
 
-#: src/prefs_common.c:2422
+#: src/prefs_common.c:2434
 msgid "the full month name"
 msgstr "puno ime meseca"
 
-#: src/prefs_common.c:2423
+#: src/prefs_common.c:2435
 msgid "the preferred date and time for the current locale"
 msgstr "željeni datum i vreme za trenutni locale"
 
-#: src/prefs_common.c:2424
+#: src/prefs_common.c:2436
 msgid "the century number (year/100)"
 msgstr "broj veka (godina/100)"
 
-#: src/prefs_common.c:2425
+#: src/prefs_common.c:2437
 msgid "the day of the month as a decimal number"
 msgstr "dan u mesecu kao decimalni broj"
 
-#: src/prefs_common.c:2426
+#: src/prefs_common.c:2438
 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.c:2427
+#: src/prefs_common.c:2439
 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.c:2428
+#: src/prefs_common.c:2440
 msgid "the day of the year as a decimal number"
 msgstr "dan u godini kao decimalni broj"
 
-#: src/prefs_common.c:2429
+#: src/prefs_common.c:2441
 msgid "the month as a decimal number"
 msgstr "mesec kao decimalni broj"
 
-#: src/prefs_common.c:2430
+#: src/prefs_common.c:2442
 msgid "the minute as a decimal number"
 msgstr "minuti kao decimalni broj"
 
-#: src/prefs_common.c:2431
+#: src/prefs_common.c:2443
 msgid "either AM or PM"
 msgstr "AM ili PM"
 
-#: src/prefs_common.c:2432
+#: src/prefs_common.c:2444
 msgid "the second as a decimal number"
 msgstr "sekunde kao decimalni broj"
 
-#: src/prefs_common.c:2433
+#: src/prefs_common.c:2445
 msgid "the day of the week as a decimal number"
 msgstr "dan u nedelji kao decimalni broj"
 
-#: src/prefs_common.c:2434
+#: src/prefs_common.c:2446
 msgid "the preferred date for the current locale"
 msgstr "željeni datum za trenutni locale"
 
-#: src/prefs_common.c:2435
+#: src/prefs_common.c:2447
 msgid "the last two digits of a year"
 msgstr "posljednje dve cifre godine"
 
-#: src/prefs_common.c:2436
+#: src/prefs_common.c:2448
 msgid "the year as a decimal number"
 msgstr "godina kao decimalni broj"
 
-#: src/prefs_common.c:2437
+#: src/prefs_common.c:2449
 msgid "the time zone or name or abbreviation"
 msgstr "vremenska zona ili ime ili skraćenica"
 
-#: src/prefs_common.c:2458
+#: src/prefs_common.c:2470
 msgid "Specifier"
 msgstr "Specifier"
 
-#: src/prefs_common.c:2459
+#: src/prefs_common.c:2471
 msgid "Description"
 msgstr "Opis"
 
-#: src/prefs_common.c:2499
+#: src/prefs_common.c:2511
 msgid "Example"
 msgstr "Primer"
 
-#: src/prefs_common.c:2580
+#: src/prefs_common.c:2592
 msgid "Set message colors"
 msgstr "Podesi boje poruka"
 
-#: src/prefs_common.c:2588
+#: src/prefs_common.c:2600
 msgid "Colors"
 msgstr "Boje"
 
-#: src/prefs_common.c:2622
+#: src/prefs_common.c:2634
 msgid "Quoted Text - First Level"
 msgstr "Citirani tekst - prvi nivo"
 
-#: src/prefs_common.c:2628
+#: src/prefs_common.c:2640
 msgid "Quoted Text - Second Level"
 msgstr "Citirani tekst - drugi nivo"
 
-#: src/prefs_common.c:2634
+#: src/prefs_common.c:2646
 msgid "Quoted Text - Third Level"
 msgstr "Citirani tekst - treći nivo"
 
-#: src/prefs_common.c:2640
+#: src/prefs_common.c:2652
 msgid "URI link"
 msgstr "URI link"
 
-#: src/prefs_common.c:2647
+#: src/prefs_common.c:2659
 msgid "Recycle quote colors"
 msgstr "Ciklično menjaj boje citata"
 
-#: src/prefs_common.c:2707
+#: src/prefs_common.c:2719
 msgid "Pick color for quotation level 1"
 msgstr "Odaberite boju za citat 1. stepena"
 
-#: src/prefs_common.c:2710
+#: src/prefs_common.c:2722
 msgid "Pick color for quotation level 2"
 msgstr "Odaberite boju za citat 2. stepena"
 
-#: src/prefs_common.c:2713
+#: src/prefs_common.c:2725
 msgid "Pick color for quotation level 3"
 msgstr "Odaberite boju za citat 3. tepena"
 
-#: src/prefs_common.c:2716
+#: src/prefs_common.c:2728
 msgid "Pick color for URI"
 msgstr "Odaberite boju za URI"
 
-#: src/prefs_common.c:2853
+#: src/prefs_common.c:2865
 msgid "Description of symbols"
 msgstr "Obajšnjenje znakova"
 
-#: src/prefs_common.c:2909
+#: src/prefs_common.c:2921
 msgid ""
 "Date\n"
 "From\n"
@@ -4904,11 +4941,11 @@ msgstr ""
 "News grupe\n"
 "ID poruke"
 
-#: src/prefs_common.c:2922
+#: src/prefs_common.c:2934
 msgid "If x is set, displays expr"
 msgstr "Ako je x odabrano, prikazuje expr"
 
-#: src/prefs_common.c:2926
+#: src/prefs_common.c:2938
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -4922,7 +4959,7 @@ msgstr ""
 "Citirano telo poruke sa potpisom\n"
 "Literal %"
 
-#: src/prefs_common.c:2934
+#: src/prefs_common.c:2946
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -4934,15 +4971,15 @@ msgstr ""
 "Literal početna zagrada\n"
 "Literal završna zagrada"
 
-#: src/prefs_common.c:2971
+#: src/prefs_common.c:2983
 msgid "Font selection"
 msgstr "Izbor fonta"
 
-#: src/prefs_common.c:3035
+#: src/prefs_common.c:3047
 msgid "Key bindings"
 msgstr "Prečice sa tastature"
 
-#: src/prefs_common.c:3049
+#: src/prefs_common.c:3061
 msgid ""
 "Select the preset of key bindings.\n"
 "You can also modify each menu's shortcuts by pressing\n"
@@ -4952,11 +4989,11 @@ msgstr ""
 "Takođe možete menjati prečice svakog menija pritiskom na\n"
 "bilo koji taster kada postavite kursor miša na pojedinu stvar."
 
-#: src/prefs_common.c:3061 src/prefs_common.c:3410
+#: src/prefs_common.c:3073 src/prefs_common.c:3422
 msgid "Default"
 msgstr "Uobičajeno"
 
-#: src/prefs_common.c:3064 src/prefs_common.c:3419
+#: src/prefs_common.c:3076 src/prefs_common.c:3431
 msgid "Old Sylpheed"
 msgstr "Stari Sylpheed"
 
@@ -6126,6 +6163,12 @@ msgstr ""
 msgid "writing to %s failed.\n"
 msgstr "pisanje u %s nije uspelo.\n"
 
+#~ msgid "/_View/_Code set/---"
+#~ msgstr "/_Pregled/_Znakovni standard/---"
+
+#~ msgid "/_View/_Code set"
+#~ msgstr "/_Pregled/_Znakovni standard"
+
 #~ msgid "To save this part, pop up the context menu with "
 #~ msgstr "Za snimanje ovog dela, otovrite meni konteksta sa "
 
diff --git a/po/sv.po b/po/sv.po
index e5ac31b0..dd3ca155 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: 2005-03-15 14:29+0900\n"
+"POT-Creation-Date: 2005-03-16 14:47+0900\n"
 "PO-Revision-Date: 2004-12-05 14:40+0100\n"
 "Last-Translator: Mattias Ostergren <spikboll@gmx.net>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -99,7 +99,7 @@ msgstr ""
 "via \"Hämta alla\""
 
 #: src/account.c:638 src/addressadd.c:186 src/addressbook.c:488
-#: src/compose.c:3650 src/editaddress.c:195 src/editaddress.c:936
+#: src/compose.c:3748 src/editaddress.c:195 src/editaddress.c:936
 #: src/editaddress.c:984 src/editbook.c:191 src/editgroup.c:257
 #: src/editjpilot.c:296 src/editldap.c:300 src/editvcard.c:211
 #: src/mimeview.c:151 src/prefs_filter.c:214 src/prefs_folder_item.c:170
@@ -152,13 +152,13 @@ msgstr "Ta bort konto"
 msgid "Do you really want to delete this account?"
 msgstr "Vill du verkligen ta bort detta konto?"
 
-#: src/account.c:758 src/compose.c:2551 src/compose.c:4807
+#: src/account.c:758 src/compose.c:2632 src/compose.c:4943
 #: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
 #: src/folderview.c:2156 src/folderview.c:2192
 msgid "Yes"
 msgstr "Ja"
 
-#: src/account.c:758 src/compose.c:2551 src/compose.c:4807
+#: src/account.c:758 src/compose.c:2632 src/compose.c:4943
 #: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
 #: src/folderview.c:2156 src/folderview.c:2192
 msgid "+No"
@@ -263,7 +263,7 @@ msgstr "Åtgärdens användarargument"
 msgid "Add Address to Book"
 msgstr "Lägg till i adressbok"
 
-#: src/addressadd.c:196 src/compose.c:4191 src/editaddress.c:196
+#: src/addressadd.c:196 src/compose.c:4292 src/editaddress.c:196
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "Adress"
@@ -277,7 +277,7 @@ msgstr "Kommentarer"
 msgid "Select Address Book Folder"
 msgstr "Välj adressboksmapp"
 
-#: src/addressbook.c:334 src/compose.c:469 src/mainwindow.c:454
+#: src/addressbook.c:334 src/compose.c:477 src/mainwindow.c:454
 #: src/messageview.c:134
 msgid "/_File"
 msgstr "/_Arkiv"
@@ -298,8 +298,8 @@ msgstr "/_Arkiv/Ny _JPilot"
 msgid "/_File/New _Server"
 msgstr "/_Arkiv/Ny _Server"
 
-#: src/addressbook.c:343 src/addressbook.c:346 src/compose.c:474
-#: src/compose.c:479 src/compose.c:483 src/mainwindow.c:471
+#: src/addressbook.c:343 src/addressbook.c:346 src/compose.c:482
+#: src/compose.c:487 src/compose.c:491 src/mainwindow.c:471
 #: src/mainwindow.c:474 src/mainwindow.c:476 src/mainwindow.c:479
 #: src/mainwindow.c:481 src/messageview.c:137
 msgid "/_File/---"
@@ -317,7 +317,7 @@ msgstr "/_Arkiv/_Ta bort"
 msgid "/_File/_Save"
 msgstr "/_Arkiv/_Spara"
 
-#: src/addressbook.c:348 src/compose.c:484 src/messageview.c:138
+#: src/addressbook.c:348 src/compose.c:492 src/messageview.c:138
 msgid "/_File/_Close"
 msgstr "/_Arkiv/St_äng"
 
@@ -349,7 +349,7 @@ msgstr "/A_dress/_Redigera"
 msgid "/_Address/_Delete"
 msgstr "/_A_dress/_Ta bort"
 
-#: src/addressbook.c:356 src/compose.c:585 src/mainwindow.c:688
+#: src/addressbook.c:356 src/compose.c:664 src/mainwindow.c:697
 #: src/messageview.c:246
 msgid "/_Tools"
 msgstr "/V_erktyg"
@@ -358,12 +358,12 @@ msgstr "/V_erktyg"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/V_erktyg/Importera _LDIF-fil"
 
-#: src/addressbook.c:358 src/compose.c:598 src/mainwindow.c:733
+#: src/addressbook.c:358 src/compose.c:677 src/mainwindow.c:742
 #: src/messageview.c:264
 msgid "/_Help"
 msgstr "/_Hjälp"
 
-#: src/addressbook.c:359 src/compose.c:599 src/mainwindow.c:744
+#: src/addressbook.c:359 src/compose.c:678 src/mainwindow.c:753
 #: src/messageview.c:265
 msgid "/_Help/_About"
 msgstr "/_Hjälp/_Om"
@@ -380,7 +380,7 @@ msgstr "/Ny _grupp"
 msgid "/New _Folder"
 msgstr "/Ny _mapp"
 
-#: src/addressbook.c:381 src/addressbook.c:391 src/compose.c:463
+#: src/addressbook.c:381 src/addressbook.c:391 src/compose.c:471
 #: src/folderview.c:220 src/folderview.c:222 src/folderview.c:226
 #: src/folderview.c:236 src/folderview.c:238 src/folderview.c:240
 #: src/folderview.c:244 src/folderview.c:254 src/folderview.c:256
@@ -390,7 +390,7 @@ msgstr "/Ny _mapp"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:382 src/addressbook.c:392 src/compose.c:486
+#: src/addressbook.c:382 src/addressbook.c:392 src/compose.c:494
 #: src/mainwindow.c:485 src/messageview.c:140
 msgid "/_Edit"
 msgstr "/_Redigera"
@@ -403,7 +403,7 @@ msgstr "/_Ta bort"
 msgid "E-Mail address"
 msgstr "E-postadress"
 
-#: src/addressbook.c:493 src/compose.c:4192 src/prefs_common.c:2186
+#: src/addressbook.c:493 src/compose.c:4293 src/prefs_common.c:2198
 msgid "Address book"
 msgstr "Adressbok"
 
@@ -413,7 +413,7 @@ msgstr "Namn:"
 
 #. Buttons
 #: src/addressbook.c:625 src/addressbook.c:1665 src/addressbook.c:1671
-#: src/editaddress.c:878 src/editaddress.c:1011 src/mainwindow.c:2212
+#: src/editaddress.c:878 src/editaddress.c:1011 src/mainwindow.c:2221
 #: src/prefs_actions.c:263 src/prefs_display_header.c:275
 #: src/prefs_display_header.c:330 src/prefs_template.c:227
 msgid "Delete"
@@ -602,7 +602,7 @@ msgstr "Vanlig adress"
 msgid "Personal address"
 msgstr "Privat adress"
 
-#: src/alertpanel.c:123 src/compose.c:4807 src/main.c:458
+#: src/alertpanel.c:123 src/compose.c:4943 src/main.c:458
 msgid "Notice"
 msgstr "Notera"
 
@@ -610,7 +610,7 @@ msgstr "Notera"
 msgid "Warning"
 msgstr "Varning"
 
-#: src/alertpanel.c:149 src/compose.c:2551 src/inc.c:558
+#: src/alertpanel.c:149 src/compose.c:2632 src/inc.c:558
 msgid "Error"
 msgstr "Fel"
 
@@ -658,299 +658,417 @@ msgstr "Brun"
 msgid "None"
 msgstr "Ingen"
 
-#: src/compose.c:461
+#: src/compose.c:469
 msgid "/_Add..."
 msgstr "/_Lägg till..."
 
-#: src/compose.c:462
+#: src/compose.c:470
 msgid "/_Remove"
 msgstr "/_Ta bort"
 
-#: src/compose.c:464 src/folderview.c:228 src/folderview.c:246
+#: src/compose.c:472 src/folderview.c:228 src/folderview.c:246
 #: src/folderview.c:261
 msgid "/_Properties..."
 msgstr "/_Egenskaper..."
 
-#: src/compose.c:470
+#: src/compose.c:478
 msgid "/_File/_Send"
 msgstr "/_Arkiv/_Skicka"
 
-#: src/compose.c:472
+#: src/compose.c:480
 msgid "/_File/Send _later"
 msgstr "/_Arkiv/S_kicka senare"
 
-#: src/compose.c:475
+#: src/compose.c:483
 msgid "/_File/Save to _draft folder"
 msgstr "/_Arkiv/Spara i _utkast-mappen"
 
-#: src/compose.c:477
+#: src/compose.c:485
 msgid "/_File/Save and _keep editing"
 msgstr "/_Arkiv/Spara och _fortsätt redigera"
 
-#: src/compose.c:480
+#: src/compose.c:488
 msgid "/_File/_Attach file"
 msgstr "/_Arkiv/_Bifoga fil"
 
-#: src/compose.c:481
+#: src/compose.c:489
 msgid "/_File/_Insert file"
 msgstr "/_Arkiv/_Infoga fil"
 
-#: src/compose.c:482
+#: src/compose.c:490
 msgid "/_File/Insert si_gnature"
 msgstr "/_Arkiv/Infoga si_gnatur"
 
-#: src/compose.c:487
+#: src/compose.c:495
 msgid "/_Edit/_Undo"
 msgstr "/_Redigera/_Ångra"
 
-#: src/compose.c:488
+#: src/compose.c:496
 msgid "/_Edit/_Redo"
 msgstr "/_Redigera/Gör _om"
 
-#: src/compose.c:489 src/compose.c:567 src/mainwindow.c:489
+#: src/compose.c:497 src/compose.c:575 src/mainwindow.c:489
 #: src/messageview.c:143
 msgid "/_Edit/---"
 msgstr "/_Redigera/---"
 
-#: src/compose.c:490
+#: src/compose.c:498
 msgid "/_Edit/Cu_t"
 msgstr "/_Redigera/Klipp _ut"
 
-#: src/compose.c:491 src/mainwindow.c:486 src/messageview.c:141
+#: src/compose.c:499 src/mainwindow.c:486 src/messageview.c:141
 msgid "/_Edit/_Copy"
 msgstr "/_Redigera/_Kopiera"
 
-#: src/compose.c:492
+#: src/compose.c:500
 msgid "/_Edit/_Paste"
 msgstr "/_Redigera/Klistra _in"
 
-#: src/compose.c:493
+#: src/compose.c:501
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Redigera/Klistra in som _citat"
 
-#: src/compose.c:495 src/mainwindow.c:487 src/messageview.c:142
+#: src/compose.c:503 src/mainwindow.c:487 src/messageview.c:142
 msgid "/_Edit/Select _all"
 msgstr "/_Redigera/Markera _allt"
 
-#: src/compose.c:496
+#: src/compose.c:504
 msgid "/_Edit/A_dvanced"
 msgstr "/_Redigera/A_vancerat"
 
-#: src/compose.c:497
+#: src/compose.c:505
 msgid "/_Edit/A_dvanced/Move a character backward"
 msgstr "/_Redigera/A_vancerat/Gå ett tecken bakåt"
 
-#: src/compose.c:502
+#: src/compose.c:510
 msgid "/_Edit/A_dvanced/Move a character forward"
 msgstr "/_Redigera/A_vancerat/Gå ett tecken framåt"
 
-#: src/compose.c:507
+#: src/compose.c:515
 msgid "/_Edit/A_dvanced/Move a word backward"
 msgstr "/_Redigera/A_vancerat/Gå ett ord bakåt"
 
-#: src/compose.c:512
+#: src/compose.c:520
 msgid "/_Edit/A_dvanced/Move a word forward"
 msgstr "/_Redigera/A_vancerat/Gå ett ord framåt"
 
-#: src/compose.c:517
+#: src/compose.c:525
 msgid "/_Edit/A_dvanced/Move to beginning of line"
 msgstr "/_Redigera/A_vancerat/Gå till början av raden"
 
-#: src/compose.c:522
+#: src/compose.c:530
 msgid "/_Edit/A_dvanced/Move to end of line"
 msgstr "/_Redigera/A_vancerat/Gå till slutet av raden"
 
-#: src/compose.c:527
+#: src/compose.c:535
 msgid "/_Edit/A_dvanced/Move to previous line"
 msgstr "/_Redigera/A_vancerat/Gå till föregående rad"
 
-#: src/compose.c:532
+#: src/compose.c:540
 msgid "/_Edit/A_dvanced/Move to next line"
 msgstr "/_Redigera/A_vancerat/Gå till nästa rad"
 
-#: src/compose.c:537
+#: src/compose.c:545
 msgid "/_Edit/A_dvanced/Delete a character backward"
 msgstr "/_Redigera/A_vancerat/Radera ett tecken bakåt"
 
-#: src/compose.c:542
+#: src/compose.c:550
 msgid "/_Edit/A_dvanced/Delete a character forward"
 msgstr "/_Redigera/A_vancerat/Radera ett tecken framåt"
 
-#: src/compose.c:547
+#: src/compose.c:555
 msgid "/_Edit/A_dvanced/Delete a word backward"
 msgstr "/_Redigera/A_vancerat/Radera ett ord bakåt"
 
-#: src/compose.c:552
+#: src/compose.c:560
 msgid "/_Edit/A_dvanced/Delete a word forward"
 msgstr "/_Redigera/A_vancerat/Radera ett ord framåt"
 
-#: src/compose.c:557
+#: src/compose.c:565
 msgid "/_Edit/A_dvanced/Delete line"
 msgstr "/_Redigera/A_vancerat/Radera rad"
 
-#: src/compose.c:562
+#: src/compose.c:570
 msgid "/_Edit/A_dvanced/Delete to end of line"
 msgstr "/_Redigera/A_vancerat/Radera till slutet av raden"
 
-#: src/compose.c:568
+#: src/compose.c:576
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/_Redigera/Bryt rader i _stycke"
 
-#: src/compose.c:570
+#: src/compose.c:578
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/_Redigera/Bryt _långa rader"
 
-#: src/compose.c:572
+#: src/compose.c:580
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Redigera/Automatisk _radbrytning"
 
-#: src/compose.c:573 src/mainwindow.c:494 src/messageview.c:147
+#: src/compose.c:581 src/mainwindow.c:494 src/messageview.c:147
 #: src/summaryview.c:370
 msgid "/_View"
 msgstr "/_Visa"
 
-#: src/compose.c:574
+#: src/compose.c:582
 msgid "/_View/_To"
 msgstr "/_Visa/_Till"
 
-#: src/compose.c:575
+#: src/compose.c:583
 msgid "/_View/_Cc"
 msgstr "/_Visa/_Kopia"
 
-#: src/compose.c:576
+#: src/compose.c:584
 msgid "/_View/_Bcc"
 msgstr "/_Visa/_Dold kopia"
 
-#: src/compose.c:577
+#: src/compose.c:585
 msgid "/_View/_Reply to"
 msgstr "/_Visa/_Svara till"
 
-#: src/compose.c:578 src/compose.c:580 src/compose.c:582 src/mainwindow.c:512
-#: src/mainwindow.c:515 src/mainwindow.c:541 src/mainwindow.c:565
-#: src/mainwindow.c:641 src/mainwindow.c:645 src/messageview.c:223
+#: src/compose.c:586 src/compose.c:588 src/compose.c:590 src/compose.c:592
+#: src/mainwindow.c:512 src/mainwindow.c:515 src/mainwindow.c:541
+#: src/mainwindow.c:565 src/mainwindow.c:650 src/mainwindow.c:654
+#: src/messageview.c:223
 msgid "/_View/---"
 msgstr "/_Visa/---"
 
-#: src/compose.c:579
+#: src/compose.c:587
 msgid "/_View/_Followup to"
 msgstr "/_Visa/_Följ upp till"
 
-#: src/compose.c:581
+#: src/compose.c:589
 msgid "/_View/R_uler"
 msgstr "/_Visa/_Linjal"
 
-#: src/compose.c:583
+#: src/compose.c:591
 msgid "/_View/_Attachment"
 msgstr "/_Visa/_Bilagor"
 
-#: src/compose.c:586 src/mainwindow.c:689 src/messageview.c:247
+#: src/compose.c:598 src/mainwindow.c:572 src/messageview.c:154
+#, fuzzy
+msgid "/_View/Character _encoding"
+msgstr "/_Visa/_Sortera/Nedstigande"
+
+#: src/compose.c:599
+msgid "/_View/Character _encoding/_Automatic"
+msgstr ""
+
+#: src/compose.c:601 src/compose.c:607 src/compose.c:613 src/compose.c:617
+#: src/compose.c:623 src/compose.c:627 src/compose.c:631 src/compose.c:641
+#: src/compose.c:645 src/compose.c:653 src/compose.c:657 src/mainwindow.c:568
+#: src/mainwindow.c:575 src/messageview.c:150
+#, fuzzy
+msgid "/_View/Character _encoding/---"
+msgstr "/_Visa/_Sortera/Nedstigande"
+
+#: src/compose.c:603 src/mainwindow.c:576 src/messageview.c:158
+#, fuzzy
+msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
+msgstr "/_Visa/_Kodning/7 bitars ascii (US-ASC_II)"
+
+#: src/compose.c:605 src/mainwindow.c:578 src/messageview.c:161
+#, fuzzy
+msgid "/_View/Character _encoding/Unicode (_UTF-8)"
+msgstr "/_Visa/_Kodning/Unicode (_UTF-8)"
+
+#: src/compose.c:609 src/mainwindow.c:582 src/messageview.c:164
+#, fuzzy
+msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
+msgstr "/_Visa/_Kodning/Västeuropeisk (ISO-8859-_1)"
+
+#: src/compose.c:611 src/mainwindow.c:584 src/messageview.c:166
+#, fuzzy
+msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
+msgstr "/_Visa/_Kodning/_Västeuropeisk (ISO-8859-15)"
+
+#: src/compose.c:615 src/mainwindow.c:588 src/messageview.c:169
+#, fuzzy
+msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
+msgstr "/_Visa/_Kodning/Centraleuropeisk (ISO-8859-_2)"
+
+#: src/compose.c:619 src/mainwindow.c:592 src/messageview.c:172
+#, fuzzy
+msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
+msgstr "/_Visa/_Kodning/_Baltisk (ISO-8859-13)"
+
+#: src/compose.c:621 src/mainwindow.c:594 src/messageview.c:174
+#, fuzzy
+msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
+msgstr "/_Visa/_Kodning/Baltisk (ISO-8859-_4)"
+
+#: src/compose.c:625 src/mainwindow.c:598 src/messageview.c:177
+#, fuzzy
+msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
+msgstr "/_Visa/_Kodning/Grekisk (ISO-8859-_7)"
+
+#: src/compose.c:629 src/mainwindow.c:602 src/messageview.c:180
+#, fuzzy
+msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
+msgstr "/_Visa/_Kodning/Turkisk (ISO-8859-_9)"
+
+#: src/compose.c:633 src/mainwindow.c:606 src/messageview.c:183
+#, fuzzy
+msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
+msgstr "/_Visa/_Kodning/Kyrillisk (ISO-8859-_5)"
+
+#: src/compose.c:635 src/mainwindow.c:608 src/messageview.c:185
+#, fuzzy
+msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
+msgstr "/_Visa/_Kodning/Kyrillisk (KOI8-_R)"
+
+#: src/compose.c:637 src/mainwindow.c:610 src/messageview.c:187
+#, fuzzy
+msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
+msgstr "/_Visa/_Kodning/Kyrillisk (KOI8-_U)"
+
+#: src/compose.c:639 src/mainwindow.c:612 src/messageview.c:189
+#, fuzzy
+msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
+msgstr "/_Visa/_Kodning/Kyrillisk (Windows-1251)"
+
+#: src/compose.c:643 src/mainwindow.c:616 src/messageview.c:192
+#, fuzzy
+msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
+msgstr "/_Visa/_Kodning/Japansk (ISO-2022-_JP)"
+
+#: src/compose.c:647 src/mainwindow.c:626 src/messageview.c:201
+#, fuzzy
+msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
+msgstr "/_Visa/_Kodning/Förenklad kinesisk (_GB2312)"
+
+#: src/compose.c:649 src/mainwindow.c:628 src/messageview.c:203
+#, fuzzy
+msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
+msgstr "/_Visa/_Kodning/Traditionell kinesisk (_Big5)"
+
+#: src/compose.c:651 src/mainwindow.c:630 src/messageview.c:205
+#, fuzzy
+msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
+msgstr "/_Visa/_Kodning/Traditionell kinesisk (EUC-_TW)"
+
+#: src/compose.c:655 src/mainwindow.c:636 src/messageview.c:210
+#, fuzzy
+msgid "/_View/Character _encoding/Korean (EUC-_KR)"
+msgstr "/_Visa/_Kodning/Koreansk (EUC-_KR)"
+
+#: src/compose.c:659 src/mainwindow.c:642 src/messageview.c:215
+#, fuzzy
+msgid "/_View/Character _encoding/Thai (TIS-620)"
+msgstr "/_Visa/_Kodning/Thai (TIS-620)"
+
+#: src/compose.c:661 src/mainwindow.c:644 src/messageview.c:217
+#, fuzzy
+msgid "/_View/Character _encoding/Thai (Windows-874)"
+msgstr "/_Visa/_Kodning/Thai (Windows-874)"
+
+#: src/compose.c:665 src/mainwindow.c:698 src/messageview.c:247
 msgid "/_Tools/_Address book"
 msgstr "/V_erktyg/_Adressbok"
 
-#: src/compose.c:587
+#: src/compose.c:666
 msgid "/_Tools/_Template"
 msgstr "/V_erktyg/_Mall"
 
-#: src/compose.c:588 src/mainwindow.c:707 src/messageview.c:262
+#: src/compose.c:667 src/mainwindow.c:716 src/messageview.c:262
 msgid "/_Tools/Actio_ns"
 msgstr "/V_erktyg/_Åtgärder"
 
-#: src/compose.c:589 src/compose.c:593 src/mainwindow.c:692
-#: src/mainwindow.c:706 src/mainwindow.c:708 src/mainwindow.c:711
-#: src/mainwindow.c:713 src/messageview.c:250 src/messageview.c:261
+#: src/compose.c:668 src/compose.c:672 src/mainwindow.c:701
+#: src/mainwindow.c:715 src/mainwindow.c:717 src/mainwindow.c:720
+#: src/mainwindow.c:722 src/messageview.c:250 src/messageview.c:261
 msgid "/_Tools/---"
 msgstr "/V_erktyg/---"
 
-#: src/compose.c:590
+#: src/compose.c:669
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/V_erktyg/Redigera med e_xtern redigerare"
 
-#: src/compose.c:594
+#: src/compose.c:673
 msgid "/_Tools/PGP Si_gn"
 msgstr "/V_erktyg/_Signera"
 
-#: src/compose.c:595
+#: src/compose.c:674
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/V_erktyg/_Kryptera"
 
-#: src/compose.c:800
+#: src/compose.c:879
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: filen finns inte\n"
 
-#: src/compose.c:899 src/compose.c:958 src/procmsg.c:1303
+#: src/compose.c:978 src/compose.c:1037 src/procmsg.c:1303
 msgid "Can't get text part\n"
 msgstr "Kan inte läsa textdel\n"
 
-#: src/compose.c:1340
+#: src/compose.c:1419
 msgid "Quote mark format error."
 msgstr "Citationsteckensformatfel."
 
-#: src/compose.c:1352
+#: src/compose.c:1431
 msgid "Message reply/forward format error."
 msgstr "Formatfel vid meddelandesvar eller -vidarebefordran"
 
-#: src/compose.c:1679
+#: src/compose.c:1758
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Filen %s finns inte\n"
 
-#: src/compose.c:1683
+#: src/compose.c:1762
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Kan inte läsa filstorlek på %s\n"
 
-#: src/compose.c:1687
+#: src/compose.c:1766
 #, c-format
 msgid "File %s is empty."
 msgstr "Filen %s är tom."
 
-#: src/compose.c:1691
+#: src/compose.c:1770
 #, c-format
 msgid "Can't read %s."
 msgstr "kan inte läsa %s"
 
-#: src/compose.c:1726
+#: src/compose.c:1805
 #, c-format
 msgid "Message: %s"
 msgstr "Meddelande: %s"
 
-#: src/compose.c:1797 src/mimeview.c:491
+#: src/compose.c:1876 src/mimeview.c:491
 msgid "Can't get the part of multipart message."
 msgstr "Kan inte läsa delen av multipart-meddelandet."
 
-#: src/compose.c:2188
+#: src/compose.c:2267
 msgid " [Edited]"
 msgstr " [Redigerat]"
 
-#: src/compose.c:2190
+#: src/compose.c:2269
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Skriv meddelande%s"
 
-#: src/compose.c:2193
+#: src/compose.c:2272
 #, c-format
 msgid "Compose message%s"
 msgstr "Skriv meddelande%s"
 
-#: src/compose.c:2304
+#: src/compose.c:2383
 msgid "Recipient is not specified."
 msgstr "Mottagare är inte angiven."
 
-#: src/compose.c:2312 src/compose.c:4112 src/mainwindow.c:2144
+#: src/compose.c:2391 src/compose.c:4213 src/mainwindow.c:2153
 #: src/prefs_account.c:703 src/prefs_common.c:850
 msgid "Send"
 msgstr "Skicka"
 
-#: src/compose.c:2313
+#: src/compose.c:2392
 msgid "Subject is empty. Send it anyway?"
 msgstr "Ämnesraden är tom. Skicka ändå?"
 
-#: src/compose.c:2364
+#: src/compose.c:2443
 msgid "can't get recipient list."
 msgstr "kan inte läsa mottagarlista"
 
-#: src/compose.c:2384
+#: src/compose.c:2463
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -958,27 +1076,27 @@ msgstr ""
 "Konto för att skicka post är inte specificerat.\n"
 "Välj ett e-postkonto innan du skickar."
 
-#: src/compose.c:2398 src/send_message.c:261
+#: src/compose.c:2477 src/send_message.c:261
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Fel uppstod när meddelandet skulle skickas till %s."
 
-#: src/compose.c:2421
+#: src/compose.c:2500
 msgid "Can't save the message to outbox."
 msgstr "Kan inte spara meddelande i kö-mappen."
 
-#: src/compose.c:2457
+#: src/compose.c:2536
 #, 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:2518 src/compose.c:2739 src/compose.c:2802 src/compose.c:2921
+#: src/compose.c:2597 src/compose.c:2820 src/compose.c:2883 src/compose.c:3003
 #: src/utils.c:2189
 msgid "can't change file mode\n"
 msgstr "kan inte ändra filrättigheter\n"
 
-#: src/compose.c:2546
+#: src/compose.c:2627
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -988,140 +1106,140 @@ msgstr ""
 "%s till %s.\n"
 "Skicka ändå?"
 
-#: src/compose.c:2610
+#: src/compose.c:2691
 msgid "can't write headers\n"
 msgstr "kan inte skriva brevhuvud\n"
 
-#: src/compose.c:2881
+#: src/compose.c:2963
 msgid "can't remove the old message\n"
 msgstr "kan inte ta bort det gamla meddelandet\n"
 
-#: src/compose.c:2899
+#: src/compose.c:2981
 msgid "queueing message...\n"
 msgstr "lägger meddelandet i kö...\n"
 
-#: src/compose.c:2981
+#: src/compose.c:3063
 msgid "can't find queue folder\n"
 msgstr "kan inte hitta kömapp\n"
 
-#: src/compose.c:2988
+#: src/compose.c:3070
 msgid "can't queue the message\n"
 msgstr "kan inte lägga meddelandet i kö\n"
 
-#: src/compose.c:3547
+#: src/compose.c:3645
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "skapat Meddelande-ID: %s\n"
 
-#: src/compose.c:3645
+#: src/compose.c:3743
 msgid "Creating compose window...\n"
 msgstr "Skapar skrivfönster...\n"
 
-#: src/compose.c:3648 src/compose.c:4598
+#: src/compose.c:3746 src/compose.c:4734
 msgid "MIME type"
 msgstr "MIME-typ"
 
 #. S_COL_DATE
-#: src/compose.c:3649 src/mimeview.c:150 src/prefs_filter_edit.c:569
+#: src/compose.c:3747 src/mimeview.c:150 src/prefs_filter_edit.c:569
 #: src/prefs_summary_column.c:73 src/select-keys.c:317 src/summaryview.c:386
 msgid "Size"
 msgstr "Storlek"
 
-#: src/compose.c:3700 src/headerview.c:53 src/summary_search.c:169
+#: src/compose.c:3798 src/headerview.c:53 src/summary_search.c:169
 msgid "From:"
 msgstr "Från:"
 
-#: src/compose.c:4113
+#: src/compose.c:4214
 msgid "Send message"
 msgstr "Skicka meddelande"
 
-#: src/compose.c:4121
+#: src/compose.c:4222
 msgid "Send later"
 msgstr "Skicka senare"
 
-#: src/compose.c:4122
+#: src/compose.c:4223
 msgid "Put into queue folder and send later"
 msgstr "Placera i kömapp och skicka senare"
 
-#: src/compose.c:4130
+#: src/compose.c:4231
 msgid "Draft"
 msgstr "Utkast"
 
-#: src/compose.c:4131
+#: src/compose.c:4232
 msgid "Save to draft folder"
 msgstr "Spara i utkastsmapp"
 
-#: src/compose.c:4141 src/compose.c:5382
+#: src/compose.c:4242 src/compose.c:5527
 msgid "Insert"
 msgstr "Infoga"
 
-#: src/compose.c:4142
+#: src/compose.c:4243
 msgid "Insert file"
 msgstr "Infoga fil"
 
-#: src/compose.c:4150
+#: src/compose.c:4251
 msgid "Attach"
 msgstr "Bifoga"
 
-#: src/compose.c:4151
+#: src/compose.c:4252
 msgid "Attach file"
 msgstr "Bifoga fil"
 
 #. signature
-#: src/compose.c:4161 src/prefs_account.c:1339 src/prefs_common.c:1261
+#: src/compose.c:4262 src/prefs_account.c:1339 src/prefs_common.c:1273
 msgid "Signature"
 msgstr "Signatur"
 
-#: src/compose.c:4162
+#: src/compose.c:4263
 msgid "Insert signature"
 msgstr "Infoga signatur"
 
-#: src/compose.c:4171 src/prefs_common.c:1283 src/prefs_common.c:2165
+#: src/compose.c:4272 src/prefs_common.c:1295 src/prefs_common.c:2177
 msgid "Editor"
 msgstr "Redigerare"
 
-#: src/compose.c:4172
+#: src/compose.c:4273
 msgid "Edit with external editor"
 msgstr "Redigera med extern redigerare"
 
-#: src/compose.c:4180
+#: src/compose.c:4281
 msgid "Linewrap"
 msgstr "Radbrytning"
 
-#: src/compose.c:4181
+#: src/compose.c:4282
 msgid "Wrap all long lines"
 msgstr "Radbryt långa rader"
 
-#: src/compose.c:4492
+#: src/compose.c:4628
 msgid "Invalid MIME type."
 msgstr "Ogiltig MIME-typ"
 
-#: src/compose.c:4511
+#: src/compose.c:4647
 msgid "File doesn't exist or is empty."
 msgstr "Filen finns inte eller är tom."
 
-#: src/compose.c:4580
+#: src/compose.c:4716
 msgid "Properties"
 msgstr "Egenskaper"
 
-#: src/compose.c:4600
+#: src/compose.c:4736
 msgid "Encoding"
 msgstr "Kodning"
 
-#: src/compose.c:4623 src/prefs_folder_item.c:183
+#: src/compose.c:4759 src/prefs_folder_item.c:183
 msgid "Path"
 msgstr "Sökväg"
 
-#: src/compose.c:4624
+#: src/compose.c:4760
 msgid "File name"
 msgstr "Filnamn"
 
-#: src/compose.c:4778
+#: src/compose.c:4914
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Ogiltig kommandorad för extern redigerare: \"%s\"\n"
 
-#: src/compose.c:4804
+#: src/compose.c:4940
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1132,72 +1250,72 @@ msgstr ""
 "Framtvinga avslutning av processen?\n"
 "processgrupps-id: %d"
 
-#: src/compose.c:4817
+#: src/compose.c:4953
 #, c-format
 msgid "Terminated process group id: %d"
 msgstr "Avslutade processgrupps-id: %d"
 
-#: src/compose.c:4818
+#: src/compose.c:4954
 #, c-format
 msgid "Temporary file: %s"
 msgstr "Temporär fil: %s"
 
-#: src/compose.c:4842
+#: src/compose.c:4978
 msgid "Compose: input from monitoring process\n"
 msgstr "Skriv: indata från bevakad process\n"
 
 #. failed
-#: src/compose.c:4875
+#: src/compose.c:5011
 msgid "Couldn't exec external editor\n"
 msgstr "Kunde inte köra extern redigerare\n"
 
-#: src/compose.c:4879
+#: src/compose.c:5015
 msgid "Couldn't write to file\n"
 msgstr "Kunde inte skriva till fil\n"
 
-#: src/compose.c:4881
+#: src/compose.c:5017
 msgid "Pipe read failed\n"
 msgstr "Kunde inte läsa från rör\n"
 
-#: src/compose.c:5182 src/compose.c:5190 src/compose.c:5196
+#: src/compose.c:5318 src/compose.c:5326 src/compose.c:5332
 msgid "Can't queue the message."
 msgstr "Kan inte lägga meddelandet i kö."
 
-#: src/compose.c:5287
+#: src/compose.c:5423
 #, fuzzy
 msgid "Select files"
 msgstr "Välj fil"
 
-#: src/compose.c:5309
+#: src/compose.c:5445
 msgid "Select file"
 msgstr "Välj fil"
 
-#: src/compose.c:5344
+#: src/compose.c:5480
 msgid "Discard message"
 msgstr "Kasta meddelande"
 
-#: src/compose.c:5345
+#: src/compose.c:5481
 msgid "This message has been modified. discard it?"
 msgstr "Detta meddelande har ändrats. Kasta det?"
 
-#: src/compose.c:5346
+#: src/compose.c:5482
 msgid "Discard"
 msgstr "Kasta"
 
-#: src/compose.c:5346
+#: src/compose.c:5482
 msgid "to Draft"
 msgstr "till Utkast"
 
-#: src/compose.c:5379
+#: src/compose.c:5524
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Vill du använda mallen \"%s\" ?"
 
-#: src/compose.c:5381
+#: src/compose.c:5526
 msgid "Apply template"
 msgstr "Använd mall"
 
-#: src/compose.c:5382
+#: src/compose.c:5527
 msgid "Replace"
 msgstr "Ersätt"
 
@@ -1636,12 +1754,12 @@ msgstr "Ställer in mappinfo...\n"
 msgid "Setting folder info..."
 msgstr "Ställer in mappinfo..."
 
-#: src/folderview.c:652 src/mainwindow.c:3190 src/setup.c:81
+#: src/folderview.c:652 src/mainwindow.c:3199 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Söker igenom mapp %s%c%s..."
 
-#: src/folderview.c:656 src/mainwindow.c:3195 src/setup.c:86
+#: src/folderview.c:656 src/mainwindow.c:3204 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Söker igenom mapp %s ..."
@@ -2097,7 +2215,7 @@ msgstr "Importera LDIF-fil till adressboken"
 msgid "Prev"
 msgstr "Föregående"
 
-#: src/importldif.c:761 src/mainwindow.c:2230
+#: src/importldif.c:761 src/mainwindow.c:2239
 msgid "Next"
 msgstr "Nästa"
 
@@ -2546,7 +2664,8 @@ msgid "/_View/Separate f_older tree"
 msgstr "/_Visa/Separat ma_ppträd"
 
 #: src/mainwindow.c:514
-msgid "/_View/Separate m_essage view"
+#, fuzzy
+msgid "/_View/Separate _message view"
 msgstr "/_Visa/Separat m_eddelandevy"
 
 #: src/mainwindow.c:516
@@ -2682,422 +2801,340 @@ msgstr "/_Visa/_Gå till/Nästa fä_rgade meddelande"
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Visa/_Gå till/_En annan mapp..."
 
-#: src/mainwindow.c:568 src/mainwindow.c:575 src/messageview.c:150
-msgid "/_View/_Code set/---"
-msgstr "/_Visa/_Kodning/---"
-
-#: src/mainwindow.c:572 src/messageview.c:154
-msgid "/_View/_Code set"
-msgstr "/_Visa/_Kodning"
-
 #: src/mainwindow.c:573 src/messageview.c:155
-msgid "/_View/_Code set/_Auto detect"
+#, fuzzy
+msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Visa/_Kodning/_Automatisk igenkänning"
 
-#: src/mainwindow.c:576 src/messageview.c:158
-msgid "/_View/_Code set/7bit ascii (US-ASC_II)"
-msgstr "/_Visa/_Kodning/7 bitars ascii (US-ASC_II)"
-
-#: src/mainwindow.c:579 src/messageview.c:161
-msgid "/_View/_Code set/Unicode (_UTF-8)"
-msgstr "/_Visa/_Kodning/Unicode (_UTF-8)"
-
-#: src/mainwindow.c:582 src/messageview.c:164
-msgid "/_View/_Code set/Western European (ISO-8859-_1)"
-msgstr "/_Visa/_Kodning/Västeuropeisk (ISO-8859-_1)"
-
-#: src/mainwindow.c:584 src/messageview.c:166
-msgid "/_View/_Code set/Western European (ISO-8859-15)"
-msgstr "/_Visa/_Kodning/_Västeuropeisk (ISO-8859-15)"
-
-#: src/mainwindow.c:587 src/messageview.c:169
-msgid "/_View/_Code set/Central European (ISO-8859-_2)"
-msgstr "/_Visa/_Kodning/Centraleuropeisk (ISO-8859-_2)"
-
-#: src/mainwindow.c:590 src/messageview.c:172
-msgid "/_View/_Code set/_Baltic (ISO-8859-13)"
-msgstr "/_Visa/_Kodning/_Baltisk (ISO-8859-13)"
-
-#: src/mainwindow.c:592 src/messageview.c:174
-msgid "/_View/_Code set/Baltic (ISO-8859-_4)"
-msgstr "/_Visa/_Kodning/Baltisk (ISO-8859-_4)"
-
-#: src/mainwindow.c:595 src/messageview.c:177
-msgid "/_View/_Code set/Greek (ISO-8859-_7)"
-msgstr "/_Visa/_Kodning/Grekisk (ISO-8859-_7)"
-
-#: src/mainwindow.c:598 src/messageview.c:180
-msgid "/_View/_Code set/Turkish (ISO-8859-_9)"
-msgstr "/_Visa/_Kodning/Turkisk (ISO-8859-_9)"
-
-#: src/mainwindow.c:601 src/messageview.c:183
-msgid "/_View/_Code set/Cyrillic (ISO-8859-_5)"
-msgstr "/_Visa/_Kodning/Kyrillisk (ISO-8859-_5)"
-
-#: src/mainwindow.c:603 src/messageview.c:185
-msgid "/_View/_Code set/Cyrillic (KOI8-_R)"
-msgstr "/_Visa/_Kodning/Kyrillisk (KOI8-_R)"
-
-#: src/mainwindow.c:605 src/messageview.c:187
-msgid "/_View/_Code set/Cyrillic (KOI8-U)"
-msgstr "/_Visa/_Kodning/Kyrillisk (KOI8-_U)"
-
-#: src/mainwindow.c:607 src/messageview.c:189
-msgid "/_View/_Code set/Cyrillic (Windows-1251)"
-msgstr "/_Visa/_Kodning/Kyrillisk (Windows-1251)"
-
-#: src/mainwindow.c:610 src/messageview.c:192
-msgid "/_View/_Code set/Japanese (ISO-2022-_JP)"
-msgstr "/_Visa/_Kodning/Japansk (ISO-2022-_JP)"
-
-#: src/mainwindow.c:612 src/messageview.c:194
-msgid "/_View/_Code set/Japanese (ISO-2022-JP-2)"
+#: src/mainwindow.c:618 src/messageview.c:194
+#, fuzzy
+msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Visa/_Kodning/Japansk (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:614 src/messageview.c:196
-msgid "/_View/_Code set/Japanese (_EUC-JP)"
+#: src/mainwindow.c:620 src/messageview.c:196
+#, fuzzy
+msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Visa/_Kodning/Japansk (_EUC-JP)"
 
-#: src/mainwindow.c:616 src/messageview.c:198
-msgid "/_View/_Code set/Japanese (_Shift__JIS)"
+#: src/mainwindow.c:622 src/messageview.c:198
+#, fuzzy
+msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Visa/_Kodning/Japansk (_Shift__JIS)"
 
-#: src/mainwindow.c:619 src/messageview.c:201
-msgid "/_View/_Code set/Simplified Chinese (_GB2312)"
-msgstr "/_Visa/_Kodning/Förenklad kinesisk (_GB2312)"
-
-#: src/mainwindow.c:621 src/messageview.c:203
-msgid "/_View/_Code set/Traditional Chinese (_Big5)"
-msgstr "/_Visa/_Kodning/Traditionell kinesisk (_Big5)"
-
-#: src/mainwindow.c:623 src/messageview.c:205
-msgid "/_View/_Code set/Traditional Chinese (EUC-_TW)"
-msgstr "/_Visa/_Kodning/Traditionell kinesisk (EUC-_TW)"
-
-#: src/mainwindow.c:625 src/messageview.c:207
-msgid "/_View/_Code set/Chinese (ISO-2022-_CN)"
+#: src/mainwindow.c:632 src/messageview.c:207
+#, fuzzy
+msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Visa/_Kodning/Kinesisk (ISO-2022-_CN)"
 
-#: src/mainwindow.c:628 src/messageview.c:210
-msgid "/_View/_Code set/Korean (EUC-_KR)"
-msgstr "/_Visa/_Kodning/Koreansk (EUC-_KR)"
-
-#: src/mainwindow.c:630 src/messageview.c:212
-msgid "/_View/_Code set/Korean (ISO-2022-KR)"
+#: src/mainwindow.c:638 src/messageview.c:212
+#, fuzzy
+msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Visa/_Kodning/Koreansk (ISO-2022-KR)"
 
-#: src/mainwindow.c:633 src/messageview.c:215
-msgid "/_View/_Code set/Thai (TIS-620)"
-msgstr "/_Visa/_Kodning/Thai (TIS-620)"
-
-#: src/mainwindow.c:635 src/messageview.c:217
-msgid "/_View/_Code set/Thai (Windows-874)"
-msgstr "/_Visa/_Kodning/Thai (Windows-874)"
-
-#: src/mainwindow.c:642 src/summaryview.c:371
+#: src/mainwindow.c:651 src/summaryview.c:371
 msgid "/_View/Open in new _window"
 msgstr "/_Visa/_Öppna i nytt fönster"
 
-#: src/mainwindow.c:643 src/messageview.c:224
+#: src/mainwindow.c:652 src/messageview.c:224
 msgid "/_View/Mess_age source"
 msgstr "/_Visa/_Meddelandekällkod"
 
-#: src/mainwindow.c:644 src/messageview.c:225
+#: src/mainwindow.c:653 src/messageview.c:225
 msgid "/_View/Show all _header"
 msgstr "/_Visa/_Hela brevhuvudet"
 
-#: src/mainwindow.c:646
+#: src/mainwindow.c:655
 msgid "/_View/_Update summary"
 msgstr "/_Visa/_Uppdatera summering"
 
-#: src/mainwindow.c:648 src/messageview.c:227
+#: src/mainwindow.c:657 src/messageview.c:227
 msgid "/_Message"
 msgstr "/_Meddelande"
 
-#: src/mainwindow.c:649
+#: src/mainwindow.c:658
 msgid "/_Message/Recei_ve"
 msgstr "/_Meddelande/Mott_ag"
 
-#: src/mainwindow.c:650
+#: src/mainwindow.c:659
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/_Meddelande/Mottag/Hämta från _detta konto"
 
-#: src/mainwindow.c:652
+#: src/mainwindow.c:661
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/_Meddelande/Mottag/Hämta från alla _konton"
 
-#: src/mainwindow.c:654
+#: src/mainwindow.c:663
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/_Meddelande/Mottag/Avbryt hämtnin_g"
 
-#: src/mainwindow.c:656
+#: src/mainwindow.c:665
 msgid "/_Message/Recei_ve/---"
 msgstr "/_Meddelande/Mottag/---"
 
-#: src/mainwindow.c:657
+#: src/mainwindow.c:666
 msgid "/_Message/_Send queued messages"
 msgstr "/_Meddelande/Skicka _köade meddelanden"
 
-#: src/mainwindow.c:658 src/mainwindow.c:660 src/mainwindow.c:667
-#: src/mainwindow.c:672 src/mainwindow.c:676 src/mainwindow.c:685
+#: src/mainwindow.c:667 src/mainwindow.c:669 src/mainwindow.c:676
+#: src/mainwindow.c:681 src/mainwindow.c:685 src/mainwindow.c:694
 #: src/messageview.c:230 src/messageview.c:238 src/messageview.c:243
 msgid "/_Message/---"
 msgstr "/_Meddelande/---"
 
-#: src/mainwindow.c:659 src/messageview.c:228
+#: src/mainwindow.c:668 src/messageview.c:228
 msgid "/_Message/Compose _new message"
 msgstr "/_Meddelande/Skriv _nytt meddelande"
 
-#: src/mainwindow.c:661 src/messageview.c:231
+#: src/mainwindow.c:670 src/messageview.c:231
 msgid "/_Message/_Reply"
 msgstr "/_Meddelande/Sva_ra"
 
-#: src/mainwindow.c:662
+#: src/mainwindow.c:671
 msgid "/_Message/Repl_y to"
 msgstr "/_Meddelande/_Svara till"
 
-#: src/mainwindow.c:663 src/messageview.c:232
+#: src/mainwindow.c:672 src/messageview.c:232
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Meddelande/_Svara till/a_lla"
 
-#: src/mainwindow.c:664 src/messageview.c:234
+#: src/mainwindow.c:673 src/messageview.c:234
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Meddelande/_Svara till/_avsändaren"
 
-#: src/mainwindow.c:665 src/messageview.c:236
+#: src/mainwindow.c:674 src/messageview.c:236
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Meddelande/_Svara till/_e-postlista"
 
-#: src/mainwindow.c:668 src/messageview.c:239
+#: src/mainwindow.c:677 src/messageview.c:239
 msgid "/_Message/_Forward"
 msgstr "/_Meddelande/Vi_darebefordra"
 
-#: src/mainwindow.c:669 src/messageview.c:240
+#: src/mainwindow.c:678 src/messageview.c:240
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Meddelande/Vidarebefordra som bil_aga"
 
-#: src/mainwindow.c:671 src/messageview.c:242
+#: src/mainwindow.c:680 src/messageview.c:242
 msgid "/_Message/Redirec_t"
 msgstr "/_Meddelande/_Omdirigera"
 
-#: src/mainwindow.c:673
+#: src/mainwindow.c:682
 msgid "/_Message/M_ove..."
 msgstr "/_Meddelande/Fl_ytta..."
 
-#: src/mainwindow.c:674
+#: src/mainwindow.c:683
 msgid "/_Message/_Copy..."
 msgstr "/_Meddelande/_Kopiera"
 
-#: src/mainwindow.c:675
+#: src/mainwindow.c:684
 msgid "/_Message/_Delete"
 msgstr "/_Meddelande/_Ta bort"
 
-#: src/mainwindow.c:677
+#: src/mainwindow.c:686
 msgid "/_Message/_Mark"
 msgstr "/_Meddelande/_Markera"
 
-#: src/mainwindow.c:678
+#: src/mainwindow.c:687
 msgid "/_Message/_Mark/_Mark"
 msgstr "/_Meddelande/_Markera/_Markera"
 
-#: src/mainwindow.c:679
+#: src/mainwindow.c:688
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/_Meddelande/_Markera/_Avmarkera"
 
-#: src/mainwindow.c:680
+#: src/mainwindow.c:689
 msgid "/_Message/_Mark/---"
 msgstr "/_Meddelande/_Markera/---"
 
-#: src/mainwindow.c:681
+#: src/mainwindow.c:690
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/_Meddelande/_Markera/Markera som _oläst"
 
-#: src/mainwindow.c:682
+#: src/mainwindow.c:691
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/_Meddelande/_Markera/Markera som _läst"
 
-#: src/mainwindow.c:684
+#: src/mainwindow.c:693
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/_Meddelande/_Markera/Markera alla som l_ästa"
 
-#: src/mainwindow.c:686 src/messageview.c:244
+#: src/mainwindow.c:695 src/messageview.c:244
 msgid "/_Message/Re-_edit"
 msgstr "/_Meddelande/Redigera _om"
 
-#: src/mainwindow.c:690 src/messageview.c:248
+#: src/mainwindow.c:699 src/messageview.c:248
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/V_erktyg/Lägg till avsändaren i adressbo_ken"
 
-#: src/mainwindow.c:693
+#: src/mainwindow.c:702
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/V_erktyg/_Filtrera alla meddelanden i mappen"
 
-#: src/mainwindow.c:695
+#: src/mainwindow.c:704
 msgid "/_Tools/Filter _selected messages"
 msgstr "/V_erktyg/Filtrera _valda meddelanden"
 
-#: src/mainwindow.c:697 src/messageview.c:251
+#: src/mainwindow.c:706 src/messageview.c:251
 msgid "/_Tools/_Create filter rule"
 msgstr "/V_erktyg/_Skapa filterregel"
 
-#: src/mainwindow.c:698 src/messageview.c:253
+#: src/mainwindow.c:707 src/messageview.c:253
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/V_erktyg/_Skapa filterregel/_Automatiskt"
 
-#: src/mainwindow.c:700 src/messageview.c:255
+#: src/mainwindow.c:709 src/messageview.c:255
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/V_erktyg/_Skapa filterregel/genom _Från"
 
-#: src/mainwindow.c:702 src/messageview.c:257
+#: src/mainwindow.c:711 src/messageview.c:257
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/V_erktyg/_Skapa filterregel/genom _Till"
 
-#: src/mainwindow.c:704 src/messageview.c:259
+#: src/mainwindow.c:713 src/messageview.c:259
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/V_erktyg/_Skapa filterregel/genom _Ämne"
 
-#: src/mainwindow.c:709
+#: src/mainwindow.c:718
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/V_erktyg/Ta bort meddelande_dubbletter"
 
-#: src/mainwindow.c:712
+#: src/mainwindow.c:721
 msgid "/_Tools/E_xecute"
 msgstr "/V_erktyg/Utför _köade åtgärder"
 
-#: src/mainwindow.c:714
+#: src/mainwindow.c:723
 msgid "/_Tools/_Log window"
 msgstr "/V_erktyg/_Loggfönster"
 
-#: src/mainwindow.c:716
+#: src/mainwindow.c:725
 msgid "/_Configuration"
 msgstr "/_Konfiguration"
 
-#: src/mainwindow.c:717
+#: src/mainwindow.c:726
 msgid "/_Configuration/_Common preferences..."
 msgstr "/_Konfiguration/_Allmänna inställningar..."
 
-#: src/mainwindow.c:719
+#: src/mainwindow.c:728
 msgid "/_Configuration/_Filter setting..."
 msgstr "/_Konfiguration/_Filterinställningar..."
 
-#: src/mainwindow.c:721
+#: src/mainwindow.c:730
 msgid "/_Configuration/_Template..."
 msgstr "/_Konfiguration/_Mall..."
 
-#: src/mainwindow.c:722
+#: src/mainwindow.c:731
 msgid "/_Configuration/_Actions..."
 msgstr "/_Konfiguration/_Åtgärder..."
 
-#: src/mainwindow.c:723
+#: src/mainwindow.c:732
 msgid "/_Configuration/---"
 msgstr "/_Konfiguration/---"
 
-#: src/mainwindow.c:724
+#: src/mainwindow.c:733
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Konfiguration/_Inställningar för aktuellt konto..."
 
-#: src/mainwindow.c:726
+#: src/mainwindow.c:735
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Konfiguration/Skapa _nytt konto..."
 
-#: src/mainwindow.c:728
+#: src/mainwindow.c:737
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Konfiguration/_Redigera konton..."
 
-#: src/mainwindow.c:730
+#: src/mainwindow.c:739
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Konfiguration/_Ändra aktuellt konto"
 
-#: src/mainwindow.c:734
+#: src/mainwindow.c:743
 msgid "/_Help/_Manual"
 msgstr "/_Hjälp/_Handbok"
 
-#: src/mainwindow.c:735
+#: src/mainwindow.c:744
 msgid "/_Help/_Manual/_English"
 msgstr "/_Hjälp/_Handbok/_Engelsk"
 
-#: src/mainwindow.c:736
+#: src/mainwindow.c:745
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/_Hjälp/_Handbok/_Japansk"
 
-#: src/mainwindow.c:737
+#: src/mainwindow.c:746
 msgid "/_Help/_FAQ"
 msgstr "/_Hjälp/_FAQ"
 
-#: src/mainwindow.c:738
+#: src/mainwindow.c:747
 msgid "/_Help/_FAQ/_English"
 msgstr "/_Hjälp/_FAQ/_Engelsk"
 
-#: src/mainwindow.c:739
+#: src/mainwindow.c:748
 msgid "/_Help/_FAQ/_German"
 msgstr "/_Hjälp/_FAQ/_Tysk"
 
-#: src/mainwindow.c:740
+#: src/mainwindow.c:749
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/_Hjälp/_FAQ/_Spansk"
 
-#: src/mainwindow.c:741
+#: src/mainwindow.c:750
 msgid "/_Help/_FAQ/_French"
 msgstr "/_Hjälp/_FAQ/_Fransk"
 
-#: src/mainwindow.c:742
+#: src/mainwindow.c:751
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/_Hjälp/_FAQ/_Italiensk"
 
-#: src/mainwindow.c:743
+#: src/mainwindow.c:752
 msgid "/_Help/---"
 msgstr "/_Hjälp/---"
 
-#: src/mainwindow.c:783
+#: src/mainwindow.c:792
 msgid "Creating main window...\n"
 msgstr "Skapar huvudfönster...\n"
 
-#: src/mainwindow.c:943
+#: src/mainwindow.c:952
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Huvudfönster: färgtilldelning %d misslyckades\n"
 
-#: src/mainwindow.c:1021 src/summaryview.c:1368 src/summaryview.c:1677
+#: src/mainwindow.c:1030 src/summaryview.c:1368 src/summaryview.c:1677
 #: src/summaryview.c:1785 src/summaryview.c:1831 src/summaryview.c:2453
 #: src/summaryview.c:3080 src/summaryview.c:3146 src/summaryview.c:3171
 #: src/summaryview.c:3284
 msgid "done.\n"
 msgstr "färdigt.\n"
 
-#: src/mainwindow.c:1137 src/mainwindow.c:1178 src/mainwindow.c:1206
+#: src/mainwindow.c:1146 src/mainwindow.c:1187 src/mainwindow.c:1215
 msgid "Untitled"
 msgstr "Namnlös"
 
-#: src/mainwindow.c:1207
+#: src/mainwindow.c:1216
 msgid "none"
 msgstr "inget"
 
-#: src/mainwindow.c:1257
+#: src/mainwindow.c:1266
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "Byter fönsterseparationstyp från %d till %d\n"
 
-#: src/mainwindow.c:1477
+#: src/mainwindow.c:1486
 msgid "Offline"
 msgstr "Frånkopplad"
 
-#: src/mainwindow.c:1478
+#: src/mainwindow.c:1487
 msgid "You are offline. Go online?"
 msgstr "Du är frånkopplad. Vill du ansluta?"
 
-#: src/mainwindow.c:1492
+#: src/mainwindow.c:1501
 msgid "Empty all trash"
 msgstr "Töm alla papperskorgar"
 
-#: src/mainwindow.c:1493
+#: src/mainwindow.c:1502
 msgid "Empty messages in all trash?"
 msgstr "Töm alla meddelanden i alla papperskorgar?"
 
-#: src/mainwindow.c:1521
+#: src/mainwindow.c:1530
 msgid "Add mailbox"
 msgstr "Lägg till brevlåda"
 
-#: src/mainwindow.c:1522
+#: src/mainwindow.c:1531
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3107,16 +3144,16 @@ msgstr ""
 "Om en existerande brevlåda specificeras, kommer den\n"
 "att sökas igenom automatiskt."
 
-#: src/mainwindow.c:1528
+#: src/mainwindow.c:1537
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Brevlådan \"%s\" finns redan."
 
-#: src/mainwindow.c:1533 src/setup.c:57
+#: src/mainwindow.c:1542 src/setup.c:57
 msgid "Mailbox"
 msgstr "Brevlåda"
 
-#: src/mainwindow.c:1539 src/setup.c:63
+#: src/mainwindow.c:1548 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3125,141 +3162,141 @@ msgstr ""
 "Brevlådan kunde inte skapas.\n"
 "Några filer finns redan eller så saknar du skrivrättigheter där."
 
-#: src/mainwindow.c:1912
+#: src/mainwindow.c:1921
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Mappvy"
 
-#: src/mainwindow.c:1932 src/messageview.c:358
+#: src/mainwindow.c:1941 src/messageview.c:358
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Meddelandevy"
 
-#: src/mainwindow.c:2079 src/summaryview.c:340
+#: src/mainwindow.c:2088 src/summaryview.c:340
 msgid "/_Reply"
 msgstr "/Sva_ra"
 
-#: src/mainwindow.c:2080
+#: src/mainwindow.c:2089
 msgid "/Reply to _all"
 msgstr "/Svara till _alla"
 
-#: src/mainwindow.c:2081
+#: src/mainwindow.c:2090
 msgid "/Reply to _sender"
 msgstr "/Svara till av_sändaren"
 
-#: src/mainwindow.c:2082
+#: src/mainwindow.c:2091
 msgid "/Reply to mailing _list"
 msgstr "/Svara till e-post_lista"
 
-#: src/mainwindow.c:2087 src/summaryview.c:347
+#: src/mainwindow.c:2096 src/summaryview.c:347
 msgid "/_Forward"
 msgstr "/Vi_darebefordra"
 
-#: src/mainwindow.c:2088 src/summaryview.c:348
+#: src/mainwindow.c:2097 src/summaryview.c:348
 msgid "/For_ward as attachment"
 msgstr "/Vidarebefordra som _bilaga"
 
-#: src/mainwindow.c:2089 src/summaryview.c:349
+#: src/mainwindow.c:2098 src/summaryview.c:349
 msgid "/Redirec_t"
 msgstr "/_Omdirigera"
 
-#: src/mainwindow.c:2125
+#: src/mainwindow.c:2134
 msgid "Get"
 msgstr "Hämta"
 
-#: src/mainwindow.c:2126
+#: src/mainwindow.c:2135
 msgid "Incorporate new mail"
 msgstr "Hämta ny post"
 
-#: src/mainwindow.c:2133
+#: src/mainwindow.c:2142
 msgid "Get all"
 msgstr "Hämta allt"
 
-#: src/mainwindow.c:2134
+#: src/mainwindow.c:2143
 msgid "Incorporate new mail of all accounts"
 msgstr "Hämta ny post från alla konton"
 
-#: src/mainwindow.c:2145
+#: src/mainwindow.c:2154
 msgid "Send queued message(s)"
 msgstr "Skicka köade meddelanden"
 
-#: src/mainwindow.c:2155 src/prefs_account.c:705 src/prefs_common.c:852
+#: src/mainwindow.c:2164 src/prefs_account.c:705 src/prefs_common.c:852
 #: src/prefs_folder_item.c:137
 msgid "Compose"
 msgstr "Skriv"
 
-#: src/mainwindow.c:2156
+#: src/mainwindow.c:2165
 msgid "Compose new message"
 msgstr "Skriv nytt meddelande"
 
-#: src/mainwindow.c:2164 src/prefs_common.c:1353
+#: src/mainwindow.c:2173 src/prefs_common.c:1365
 msgid "Reply"
 msgstr "Svara"
 
-#: src/mainwindow.c:2165 src/mainwindow.c:2178
+#: src/mainwindow.c:2174 src/mainwindow.c:2187
 msgid "Reply to the message"
 msgstr "Svara på meddelandet"
 
-#: src/mainwindow.c:2183
+#: src/mainwindow.c:2192
 msgid "Reply all"
 msgstr "Svara alla"
 
-#: src/mainwindow.c:2184
+#: src/mainwindow.c:2193
 msgid "Reply to all"
 msgstr "Svara till alla"
 
-#: src/mainwindow.c:2192 src/prefs_filter_edit.c:719
+#: src/mainwindow.c:2201 src/prefs_filter_edit.c:719
 msgid "Forward"
 msgstr "Vidarebefordra"
 
-#: src/mainwindow.c:2193 src/mainwindow.c:2206
+#: src/mainwindow.c:2202 src/mainwindow.c:2215
 msgid "Forward the message"
 msgstr "Vidarebefordra meddelandet"
 
-#: src/mainwindow.c:2213
+#: src/mainwindow.c:2222
 msgid "Delete the message"
 msgstr "Ta bort meddelandet"
 
-#: src/mainwindow.c:2221
+#: src/mainwindow.c:2230
 msgid "Execute"
 msgstr "Utför köade åtgärder"
 
-#: src/mainwindow.c:2222
+#: src/mainwindow.c:2231
 msgid "Execute marked process"
 msgstr "Kör markerad process"
 
-#: src/mainwindow.c:2231
+#: src/mainwindow.c:2240
 msgid "Next unread message"
 msgstr "Nästa olästa meddelande"
 
-#: src/mainwindow.c:2242
+#: src/mainwindow.c:2251
 msgid "Prefs"
 msgstr "Inst."
 
-#: src/mainwindow.c:2243
+#: src/mainwindow.c:2252
 msgid "Common preferences"
 msgstr "Allmänna inställningar"
 
-#: src/mainwindow.c:2250 src/prefs_folder_item.c:258
+#: src/mainwindow.c:2259 src/prefs_folder_item.c:258
 #: src/prefs_folder_item.c:269 src/progressdialog.c:50
 msgid "Account"
 msgstr "Konto"
 
-#: src/mainwindow.c:2251
+#: src/mainwindow.c:2260
 msgid "Account setting"
 msgstr "Kontoinställningar"
 
-#: src/mainwindow.c:2425
+#: src/mainwindow.c:2434
 msgid "You are offline. Click the icon to go online."
 msgstr "Du är frånkopplad. Klicka på ikonen för att ansluta."
 
-#: src/mainwindow.c:2436
+#: src/mainwindow.c:2445
 msgid "You are online. Click the icon to go offline."
 msgstr "Du är ansluten. Klicka på ikonen för att koppla från."
 
-#: src/mainwindow.c:2624
+#: src/mainwindow.c:2633
 msgid "Exit"
 msgstr "Avsluta"
 
-#: src/mainwindow.c:2624
+#: src/mainwindow.c:2633
 msgid "Exit this program?"
 msgstr "Avsluta detta program?"
 
@@ -3385,7 +3422,7 @@ msgstr "Sökning klar"
 msgid "Creating message view...\n"
 msgstr "Skapar meddelandevy...\n"
 
-#: src/messageview.c:303 src/prefs_common.c:1550
+#: src/messageview.c:303 src/prefs_common.c:1562
 msgid "Text"
 msgstr "Text"
 
@@ -3398,7 +3435,7 @@ msgstr "Bilagor"
 msgid "Can't save the file `%s'."
 msgstr "Kan inte spara filen \"%s\"."
 
-#: src/messageview.c:697 src/prefs_common.c:2154 src/summaryview.c:2744
+#: src/messageview.c:697 src/prefs_common.c:2166 src/summaryview.c:2744
 msgid "Print"
 msgstr "Skriv ut"
 
@@ -3871,7 +3908,7 @@ msgstr "(Ofiltrerade meddelanden kommer att lagras i denna mapp)"
 msgid "Authentication method"
 msgstr "Autentiseringsmetod"
 
-#: src/prefs_account.c:1123 src/prefs_account.c:1239 src/prefs_common.c:1189
+#: src/prefs_account.c:1123 src/prefs_account.c:1239 src/prefs_common.c:1201
 msgid "Automatic"
 msgstr "Automatisk"
 
@@ -3895,7 +3932,7 @@ msgstr "Skapa Meddelande-ID"
 msgid "Add user-defined header"
 msgstr "Lägg till användardefinierat brevhuvud"
 
-#: src/prefs_account.c:1196 src/prefs_common.c:1714 src/prefs_common.c:1739
+#: src/prefs_account.c:1196 src/prefs_common.c:1726 src/prefs_common.c:1751
 msgid " Edit... "
 msgstr "Redigera..."
 
@@ -4291,106 +4328,107 @@ msgid "Save sent messages to outbox"
 msgstr "Spara skickade meddelanden i kö-mappen"
 
 #: src/prefs_common.c:1113
-msgid "Outgoing codeset"
+#, fuzzy
+msgid "Outgoing encoding"
 msgstr "Utgående kodning"
 
 #: src/prefs_common.c:1128
 msgid "Automatic (Recommended)"
 msgstr "Automatisk (Rekommenderad)"
 
-#: src/prefs_common.c:1129
+#: src/prefs_common.c:1130
 msgid "7bit ascii (US-ASCII)"
 msgstr "7 bitars ascii (US-ASCII)"
 
-#: src/prefs_common.c:1130
+#: src/prefs_common.c:1132
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
-#: src/prefs_common.c:1131
+#: src/prefs_common.c:1134
 msgid "Western European (ISO-8859-1)"
 msgstr "Västeuropeisk (ISO-8859-1)"
 
-#: src/prefs_common.c:1132
+#: src/prefs_common.c:1135
 msgid "Western European (ISO-8859-15)"
 msgstr "Västeuropeisk (ISO-8859-15)"
 
-#: src/prefs_common.c:1133
+#: src/prefs_common.c:1137
 msgid "Central European (ISO-8859-2)"
 msgstr "Centraleuropeisk (ISO-8859-2)"
 
-#: src/prefs_common.c:1134
+#: src/prefs_common.c:1139
 msgid "Baltic (ISO-8859-13)"
 msgstr "Baltisk (ISO-8859-13)"
 
-#: src/prefs_common.c:1135
+#: src/prefs_common.c:1140
 msgid "Baltic (ISO-8859-4)"
 msgstr "Baltisk (ISO-8859-4)"
 
-#: src/prefs_common.c:1136
+#: src/prefs_common.c:1142
 msgid "Greek (ISO-8859-7)"
 msgstr "Grekisk (ISO-8859-7)"
 
-#: src/prefs_common.c:1137
+#: src/prefs_common.c:1144
 msgid "Turkish (ISO-8859-9)"
 msgstr "Turkisk (ISO-8859-9)"
 
-#: src/prefs_common.c:1138
+#: src/prefs_common.c:1146
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Kyrillisk (ISO-8859-5)"
 
-#: src/prefs_common.c:1139
+#: src/prefs_common.c:1147
 msgid "Cyrillic (KOI8-R)"
 msgstr "Kyrillisk (KOI8-R)"
 
-#: src/prefs_common.c:1140
-msgid "Cyrillic (Windows-1251)"
-msgstr "Kyrillisk (Windows-1251)"
-
-#: src/prefs_common.c:1141
+#: src/prefs_common.c:1148
 msgid "Cyrillic (KOI8-U)"
 msgstr "Kyrillisk (KOI8-U)"
 
-#: src/prefs_common.c:1142
+#: src/prefs_common.c:1149
+msgid "Cyrillic (Windows-1251)"
+msgstr "Kyrillisk (Windows-1251)"
+
+#: src/prefs_common.c:1151
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Japansk (ISO-2022-JP)"
 
-#: src/prefs_common.c:1144
+#: src/prefs_common.c:1153
 msgid "Japanese (EUC-JP)"
 msgstr "Japansk (EUC-JP)"
 
-#: src/prefs_common.c:1145
+#: src/prefs_common.c:1154
 msgid "Japanese (Shift_JIS)"
 msgstr "Japansk (Shift_JIS)"
 
-#: src/prefs_common.c:1147
+#: src/prefs_common.c:1157
 msgid "Simplified Chinese (GB2312)"
 msgstr "Förenklad kinesisk (GB2312)"
 
-#: src/prefs_common.c:1148
+#: src/prefs_common.c:1158
 msgid "Traditional Chinese (Big5)"
 msgstr "Traditionell kinesisk (Big5)"
 
-#: src/prefs_common.c:1150
+#: src/prefs_common.c:1160
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Traditionell kinesisk (EUC-TW)"
 
-#: src/prefs_common.c:1151
+#: src/prefs_common.c:1161
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Kinesisk (ISO-2022-CN)"
 
-#: src/prefs_common.c:1153
+#: src/prefs_common.c:1164
 msgid "Korean (EUC-KR)"
 msgstr "Koreansk (EUC-KR)"
 
-#: src/prefs_common.c:1154
+#: src/prefs_common.c:1166
 msgid "Thai (TIS-620)"
 msgstr "Thai (TIS-620)"
 
-#: src/prefs_common.c:1155
+#: src/prefs_common.c:1167
 msgid "Thai (Windows-874)"
 msgstr "Thai (Windows-874)"
 
-#: src/prefs_common.c:1165
+#: src/prefs_common.c:1177
 #, fuzzy
 msgid ""
 "If `Automatic' is selected, the optimal encoding for the current locale will "
@@ -4399,11 +4437,11 @@ msgstr ""
 "Om \"Automatisk\" är vald, kommer den optimala\n"
 "kodningen för det nuvarande språket att användas."
 
-#: src/prefs_common.c:1179
+#: src/prefs_common.c:1191
 msgid "Transfer encoding"
 msgstr "Kodning för överföring"
 
-#: src/prefs_common.c:1202
+#: src/prefs_common.c:1214
 #, fuzzy
 msgid ""
 "Specify Content-Transfer-Encoding used when message body contains non-ASCII "
@@ -4412,118 +4450,118 @@ msgstr ""
 "Ange vilken kodning för överföring meddelandetexten\n"
 "ska ha när det innehåller icke-ASCII-tecken."
 
-#: src/prefs_common.c:1272
+#: src/prefs_common.c:1284
 msgid "Signature separator"
 msgstr "Signaturseparator"
 
-#: src/prefs_common.c:1281
+#: src/prefs_common.c:1293
 msgid "Insert automatically"
 msgstr "Infoga automatiskt"
 
-#: src/prefs_common.c:1291
+#: src/prefs_common.c:1303
 msgid "Automatically launch the external editor"
 msgstr "Starta automatiskt extern redigerare"
 
-#: src/prefs_common.c:1301
+#: src/prefs_common.c:1313
 msgid "Undo level"
 msgstr "Ångranivå"
 
-#: src/prefs_common.c:1321
+#: src/prefs_common.c:1333
 msgid "Wrap messages at"
 msgstr "Radbryt meddelanden vid"
 
-#: src/prefs_common.c:1333
+#: src/prefs_common.c:1345
 msgid "characters"
 msgstr "tecken"
 
-#: src/prefs_common.c:1343
+#: src/prefs_common.c:1355
 msgid "Wrap quotation"
 msgstr "Radbryt citering"
 
-#: src/prefs_common.c:1349
+#: src/prefs_common.c:1361
 msgid "Wrap on input"
 msgstr "Radbryt vid indata"
 
-#: src/prefs_common.c:1351
+#: src/prefs_common.c:1363
 msgid "Wrap before sending"
 msgstr "Radbryt innan brevet skickas"
 
-#: src/prefs_common.c:1361
+#: src/prefs_common.c:1373
 msgid "Automatically select account for replies"
 msgstr "Välj automatiskt konto för svar"
 
-#: src/prefs_common.c:1363
+#: src/prefs_common.c:1375
 msgid "Quote message when replying"
 msgstr "Citera meddelande vid svar"
 
-#: src/prefs_common.c:1365
+#: src/prefs_common.c:1377
 msgid "Reply button invokes mailing list reply"
 msgstr "Svara-knappen ger svar till e-postlista"
 
 #. reply
-#: src/prefs_common.c:1411
+#: src/prefs_common.c:1423
 msgid "Reply format"
 msgstr "Svarsformat"
 
-#: src/prefs_common.c:1426 src/prefs_common.c:1468
+#: src/prefs_common.c:1438 src/prefs_common.c:1480
 msgid "Quotation mark"
 msgstr "Citationstecken"
 
 #. forward
-#: src/prefs_common.c:1453
+#: src/prefs_common.c:1465
 msgid "Forward format"
 msgstr "Vidarebefordringsformat"
 
-#: src/prefs_common.c:1500
+#: src/prefs_common.c:1512
 msgid " Description of symbols "
 msgstr " Beskrivning av symboler "
 
-#: src/prefs_common.c:1541
+#: src/prefs_common.c:1553
 msgid "Font"
 msgstr "Typsnitt"
 
-#: src/prefs_common.c:1573
+#: src/prefs_common.c:1585
 msgid "Translate header name (such as `From:', `Subject:')"
 msgstr "Översätt brevhuvudsnamn (t.ex. \"Från:\", \"Ärende:\")"
 
-#: src/prefs_common.c:1576
+#: src/prefs_common.c:1588
 msgid "Display unread number next to folder name"
 msgstr "Visa antal olästa bredvid mappnamn"
 
-#: src/prefs_common.c:1585
+#: src/prefs_common.c:1597
 msgid "Abbreviate newsgroups longer than"
 msgstr "Förkorta diskussionsgrupper längre än"
 
-#: src/prefs_common.c:1600
+#: src/prefs_common.c:1612
 msgid "letters"
 msgstr "bokstäver"
 
 #. ---- Summary ----
-#: src/prefs_common.c:1606
+#: src/prefs_common.c:1618
 msgid "Summary View"
 msgstr "Summeringsvy"
 
-#: src/prefs_common.c:1615
+#: src/prefs_common.c:1627
 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.c:1617
+#: src/prefs_common.c:1629
 msgid "Expand threads"
 msgstr "Expandera trådar"
 
-#: src/prefs_common.c:1625 src/prefs_common.c:2443 src/prefs_common.c:2481
+#: src/prefs_common.c:1637 src/prefs_common.c:2455 src/prefs_common.c:2493
 msgid "Date format"
 msgstr "Datumformat"
 
-#: src/prefs_common.c:1646
+#: src/prefs_common.c:1658
 msgid " Set display item of summary... "
 msgstr " Ställ in fält att visa i summeringen... "
 
-#: src/prefs_common.c:1710
+#: src/prefs_common.c:1722
 msgid "Enable coloration of message"
 msgstr "Aktivera färgläggning av meddelande"
 
-#: src/prefs_common.c:1724
+#: src/prefs_common.c:1736
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
@@ -4531,323 +4569,323 @@ msgstr ""
 "Visa multi-byte-alfabet och -siffror som\n"
 "ASCII-tecken (endast Japanska)"
 
-#: src/prefs_common.c:1730
+#: src/prefs_common.c:1742
 msgid "Display header pane above message view"
 msgstr "Visa brevhuvudspanel ovanför meddelandevy"
 
-#: src/prefs_common.c:1737
+#: src/prefs_common.c:1749
 msgid "Display short headers on message view"
 msgstr "Visa korta brevhuvuden i meddelandevy"
 
-#: src/prefs_common.c:1758
+#: src/prefs_common.c:1770
 msgid "Line space"
 msgstr "Radavstånd"
 
-#: src/prefs_common.c:1772 src/prefs_common.c:1810
+#: src/prefs_common.c:1784 src/prefs_common.c:1822
 msgid "pixel(s)"
 msgstr "bildpunkter"
 
-#: src/prefs_common.c:1777
+#: src/prefs_common.c:1789
 msgid "Scroll"
 msgstr "Rulla"
 
-#: src/prefs_common.c:1784
+#: src/prefs_common.c:1796
 msgid "Half page"
 msgstr "Halvsida"
 
-#: src/prefs_common.c:1790
+#: src/prefs_common.c:1802
 msgid "Smooth scroll"
 msgstr "Mjuk rullning"
 
-#: src/prefs_common.c:1796
+#: src/prefs_common.c:1808
 msgid "Step"
 msgstr "Steg"
 
-#: src/prefs_common.c:1816
+#: src/prefs_common.c:1828
 msgid "Images"
 msgstr ""
 
-#: src/prefs_common.c:1824
+#: src/prefs_common.c:1836
 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.c:1826
+#: src/prefs_common.c:1838
 #, fuzzy
 msgid "Display images as inline"
 msgstr "Brevhuvudsinställning"
 
-#: src/prefs_common.c:1871
+#: src/prefs_common.c:1883
 msgid "Automatically check signatures"
 msgstr "Undersök signaturer automatiskt"
 
-#: src/prefs_common.c:1874
+#: src/prefs_common.c:1886
 msgid "Show signature check result in a popup window"
 msgstr "Visa resultat av signaturundersökning i ett extrafönster"
 
-#: src/prefs_common.c:1877
+#: src/prefs_common.c:1889
 msgid "Store passphrase in memory temporarily"
 msgstr "Lagra lösenfras temporärt i minnet"
 
-#: src/prefs_common.c:1892
+#: src/prefs_common.c:1904
 msgid "Expired after"
 msgstr "Utgår efter"
 
-#: src/prefs_common.c:1905
+#: src/prefs_common.c:1917
 msgid "minute(s) "
 msgstr "minut(er)"
 
-#: src/prefs_common.c:1918
+#: src/prefs_common.c:1930
 #, fuzzy
 msgid "Setting to '0' will store the passphrase for the whole session."
 msgstr ""
 "(Lösenfrasen kommer att lagras hela sessionen\n"
 "om 0 angivits)"
 
-#: src/prefs_common.c:1932
+#: src/prefs_common.c:1944
 msgid "Grab input while entering a passphrase"
 msgstr "Håll fokus under inskrivning av lösenfas"
 
-#: src/prefs_common.c:1937
+#: src/prefs_common.c:1949
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "Visa varning vid start om GnuPG inte fungerar"
 
-#: src/prefs_common.c:1989
+#: src/prefs_common.c:2001
 msgid "Always open messages in summary when selected"
 msgstr "Öppna alltid meddelanden i summering, när de valts"
 
-#: src/prefs_common.c:1993
+#: src/prefs_common.c:2005
 msgid "Open first unread message when entering a folder"
 msgstr "Öppna första olästa meddelande vid öppning av mapp"
 
-#: src/prefs_common.c:1997
+#: src/prefs_common.c:2009
 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.c:2001
+#: src/prefs_common.c:2013
 msgid "Go to inbox after receiving new mail"
 msgstr "Gå till inkorgen efter att ny post kommit"
 
-#: src/prefs_common.c:2009
+#: src/prefs_common.c:2021
 msgid "Execute immediately when moving or deleting messages"
 msgstr "Utför omedelbart vid flyttning eller borttagande av meddelanden"
 
-#: src/prefs_common.c:2021
+#: src/prefs_common.c:2033
 #, fuzzy
 msgid "Messages will be marked until execution if this is turned off."
 msgstr ""
 "(Meddelanden kommer endast vara markerade tills du väljer\n"
 " \"Utför köade meddelanden\" om detta är avstängt)"
 
-#: src/prefs_common.c:2029
+#: src/prefs_common.c:2041
 msgid "Receive dialog"
 msgstr "Mottagningsdialog"
 
-#: src/prefs_common.c:2039
+#: src/prefs_common.c:2051
 msgid "Show receive dialog"
 msgstr "Visa mottagningsdialog"
 
-#: src/prefs_common.c:2049
+#: src/prefs_common.c:2061
 msgid "Always"
 msgstr "Alltid"
 
-#: src/prefs_common.c:2050
+#: src/prefs_common.c:2062
 msgid "Only on manual receiving"
 msgstr "Bara vid manuell mottagning"
 
-#: src/prefs_common.c:2052
+#: src/prefs_common.c:2064
 msgid "Never"
 msgstr "Aldrig"
 
-#: src/prefs_common.c:2057
+#: src/prefs_common.c:2069
 msgid "Don't popup error dialog on receive error"
 msgstr "Visa inte feldialog vid hämtningsfel"
 
-#: src/prefs_common.c:2060
+#: src/prefs_common.c:2072
 msgid "Close receive dialog when finished"
 msgstr "Stäng mottagningsdialog efteråt"
 
-#: src/prefs_common.c:2066
+#: src/prefs_common.c:2078
 msgid " Set key bindings... "
 msgstr "Ställ in tangentbindningar..."
 
-#: src/prefs_common.c:2122
+#: src/prefs_common.c:2134
 #, 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.c:2131
+#: src/prefs_common.c:2143
 msgid "Web browser"
 msgstr "Webbläsare"
 
-#: src/prefs_common.c:2195
+#: src/prefs_common.c:2207
 msgid "Add address to destination when double-clicked"
 msgstr "Lägg till adress till destination vid dubbelklick"
 
-#: src/prefs_common.c:2197
+#: src/prefs_common.c:2209
 msgid "On exit"
 msgstr "Vid avslut"
 
-#: src/prefs_common.c:2205
+#: src/prefs_common.c:2217
 msgid "Confirm on exit"
 msgstr "Bekräfta avslut"
 
-#: src/prefs_common.c:2212
+#: src/prefs_common.c:2224
 msgid "Empty trash on exit"
 msgstr "Töm papperskorg vid avslut"
 
-#: src/prefs_common.c:2214
+#: src/prefs_common.c:2226
 msgid "Ask before emptying"
 msgstr "Fråga innan tömning"
 
-#: src/prefs_common.c:2218
+#: src/prefs_common.c:2230
 msgid "Warn if there are queued messages"
 msgstr "Varna om det finns köade meddelanden"
 
-#: src/prefs_common.c:2224
+#: src/prefs_common.c:2236
 msgid "Socket I/O timeout:"
 msgstr "Väntetid för uttags-I/O (socket I/O):"
 
-#: src/prefs_common.c:2237
+#: src/prefs_common.c:2249
 msgid "second(s)"
 msgstr "sekunder"
 
-#: src/prefs_common.c:2419
+#: src/prefs_common.c:2431
 msgid "the full abbreviated weekday name"
 msgstr "förkortat veckodagsnamn"
 
-#: src/prefs_common.c:2420
+#: src/prefs_common.c:2432
 msgid "the full weekday name"
 msgstr "fullständigt veckodagsnamn"
 
-#: src/prefs_common.c:2421
+#: src/prefs_common.c:2433
 msgid "the abbreviated month name"
 msgstr "förkortat månadsnamn"
 
-#: src/prefs_common.c:2422
+#: src/prefs_common.c:2434
 msgid "the full month name"
 msgstr "fullständigt månadsnamn"
 
-#: src/prefs_common.c:2423
+#: src/prefs_common.c:2435
 msgid "the preferred date and time for the current locale"
 msgstr "datum och tid gällande lokalt"
 
-#: src/prefs_common.c:2424
+#: src/prefs_common.c:2436
 msgid "the century number (year/100)"
 msgstr "århundradetal (årtal/100)"
 
-#: src/prefs_common.c:2425
+#: src/prefs_common.c:2437
 msgid "the day of the month as a decimal number"
 msgstr "dagen i månaden som decimaltal"
 
-#: src/prefs_common.c:2426
+#: src/prefs_common.c:2438
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "timmen som decimaltal enligt 24-timmarsräkning"
 
-#: src/prefs_common.c:2427
+#: src/prefs_common.c:2439
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "timmen som decimaltal enligt 12-timmarsräkning"
 
-#: src/prefs_common.c:2428
+#: src/prefs_common.c:2440
 msgid "the day of the year as a decimal number"
 msgstr "dagen på året som ett decimaltal"
 
-#: src/prefs_common.c:2429
+#: src/prefs_common.c:2441
 msgid "the month as a decimal number"
 msgstr "månaden som ett decimaltal"
 
-#: src/prefs_common.c:2430
+#: src/prefs_common.c:2442
 msgid "the minute as a decimal number"
 msgstr "minuten som ett decimaltal"
 
-#: src/prefs_common.c:2431
+#: src/prefs_common.c:2443
 msgid "either AM or PM"
 msgstr "antingen AM eller PM"
 
-#: src/prefs_common.c:2432
+#: src/prefs_common.c:2444
 msgid "the second as a decimal number"
 msgstr "sekunden som ett decimaltal"
 
-#: src/prefs_common.c:2433
+#: src/prefs_common.c:2445
 msgid "the day of the week as a decimal number"
 msgstr "veckodagen som ett decimaltal"
 
-#: src/prefs_common.c:2434
+#: src/prefs_common.c:2446
 msgid "the preferred date for the current locale"
 msgstr "datum gällande lokalt"
 
-#: src/prefs_common.c:2435
+#: src/prefs_common.c:2447
 msgid "the last two digits of a year"
 msgstr "de sista två siffrorna av ett årtal"
 
-#: src/prefs_common.c:2436
+#: src/prefs_common.c:2448
 msgid "the year as a decimal number"
 msgstr "årtalet som ett decimaltal"
 
-#: src/prefs_common.c:2437
+#: src/prefs_common.c:2449
 msgid "the time zone or name or abbreviation"
 msgstr "tidszon eller namn eller förkortning"
 
-#: src/prefs_common.c:2458
+#: src/prefs_common.c:2470
 msgid "Specifier"
 msgstr "Symbol"
 
-#: src/prefs_common.c:2459
+#: src/prefs_common.c:2471
 msgid "Description"
 msgstr "Beskrivning"
 
-#: src/prefs_common.c:2499
+#: src/prefs_common.c:2511
 msgid "Example"
 msgstr "Exempel"
 
-#: src/prefs_common.c:2580
+#: src/prefs_common.c:2592
 msgid "Set message colors"
 msgstr "Ställ in meddelandefärger"
 
-#: src/prefs_common.c:2588
+#: src/prefs_common.c:2600
 msgid "Colors"
 msgstr "Färger"
 
-#: src/prefs_common.c:2622
+#: src/prefs_common.c:2634
 msgid "Quoted Text - First Level"
 msgstr "Citerad text - Första nivån"
 
-#: src/prefs_common.c:2628
+#: src/prefs_common.c:2640
 msgid "Quoted Text - Second Level"
 msgstr "Citerad text - Andra nivån"
 
-#: src/prefs_common.c:2634
+#: src/prefs_common.c:2646
 msgid "Quoted Text - Third Level"
 msgstr "Citerad text - Tredje nivån"
 
-#: src/prefs_common.c:2640
+#: src/prefs_common.c:2652
 msgid "URI link"
 msgstr "URI-länk"
 
-#: src/prefs_common.c:2647
+#: src/prefs_common.c:2659
 msgid "Recycle quote colors"
 msgstr "Återanvänd citeringsfärger"
 
-#: src/prefs_common.c:2707
+#: src/prefs_common.c:2719
 msgid "Pick color for quotation level 1"
 msgstr "Välj färg för citeringsnivå 1"
 
-#: src/prefs_common.c:2710
+#: src/prefs_common.c:2722
 msgid "Pick color for quotation level 2"
 msgstr "Välj färg för citeringsnivå 2"
 
-#: src/prefs_common.c:2713
+#: src/prefs_common.c:2725
 msgid "Pick color for quotation level 3"
 msgstr "Välj färg för citeringsnivå 3"
 
-#: src/prefs_common.c:2716
+#: src/prefs_common.c:2728
 msgid "Pick color for URI"
 msgstr "Välj färg för URI"
 
-#: src/prefs_common.c:2853
+#: src/prefs_common.c:2865
 msgid "Description of symbols"
 msgstr "Beskrivning av symboler"
 
-#: src/prefs_common.c:2909
+#: src/prefs_common.c:2921
 msgid ""
 "Date\n"
 "From\n"
@@ -4871,11 +4909,11 @@ msgstr ""
 "Diskussionsgrupper\n"
 "Meddelande-ID"
 
-#: src/prefs_common.c:2922
+#: src/prefs_common.c:2934
 msgid "If x is set, displays expr"
 msgstr "Om x är inställd, visas expr"
 
-#: src/prefs_common.c:2926
+#: src/prefs_common.c:2938
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -4889,7 +4927,7 @@ msgstr ""
 "Citerad meddelandetext utan signatur\n"
 "Bokstavligt %"
 
-#: src/prefs_common.c:2934
+#: src/prefs_common.c:2946
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -4901,15 +4939,15 @@ msgstr ""
 "Bokstavlig öppnande klammerparentes\n"
 "Bokstavlig avslutande klammerparentes"
 
-#: src/prefs_common.c:2971
+#: src/prefs_common.c:2983
 msgid "Font selection"
 msgstr "Typsnittsval"
 
-#: src/prefs_common.c:3035
+#: src/prefs_common.c:3047
 msgid "Key bindings"
 msgstr "Tangentbindningar"
 
-#: src/prefs_common.c:3049
+#: src/prefs_common.c:3061
 msgid ""
 "Select the preset of key bindings.\n"
 "You can also modify each menu's shortcuts by pressing\n"
@@ -4920,11 +4958,11 @@ msgstr ""
 "att trycka valfri tangent eller tangentkombination\n"
 "när muspekaren är över genvägen."
 
-#: src/prefs_common.c:3061 src/prefs_common.c:3410
+#: src/prefs_common.c:3073 src/prefs_common.c:3422
 msgid "Default"
 msgstr "Standard"
 
-#: src/prefs_common.c:3064 src/prefs_common.c:3419
+#: src/prefs_common.c:3076 src/prefs_common.c:3431
 msgid "Old Sylpheed"
 msgstr "Gamla Sylpheed"
 
@@ -6066,6 +6104,12 @@ msgstr "%.2fGB"
 msgid "writing to %s failed.\n"
 msgstr "skrivning till %s misslyckades.\n"
 
+#~ msgid "/_View/_Code set/---"
+#~ msgstr "/_Visa/_Kodning/---"
+
+#~ msgid "/_View/_Code set"
+#~ msgstr "/_Visa/_Kodning"
+
 #~ msgid "To save this part, pop up the context menu with "
 #~ msgstr "För att spara denna del, ta fram snabbmenyn genom att "
 
diff --git a/po/tr.po b/po/tr.po
index e65f8f52..6b1b7b6f 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: 2005-03-15 14:29+0900\n"
+"POT-Creation-Date: 2005-03-16 14:47+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"
@@ -100,7 +100,7 @@ msgstr ""
 "etkin duruma getirilebilir."
 
 #: src/account.c:638 src/addressadd.c:186 src/addressbook.c:488
-#: src/compose.c:3650 src/editaddress.c:195 src/editaddress.c:936
+#: src/compose.c:3748 src/editaddress.c:195 src/editaddress.c:936
 #: src/editaddress.c:984 src/editbook.c:191 src/editgroup.c:257
 #: src/editjpilot.c:296 src/editldap.c:300 src/editvcard.c:211
 #: src/mimeview.c:151 src/prefs_filter.c:214 src/prefs_folder_item.c:170
@@ -153,13 +153,13 @@ msgstr "Hesabı sil"
 msgid "Do you really want to delete this account?"
 msgstr "Bu hesabı silmek istiyor musunuz?"
 
-#: src/account.c:758 src/compose.c:2551 src/compose.c:4807
+#: src/account.c:758 src/compose.c:2632 src/compose.c:4943
 #: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
 #: src/folderview.c:2156 src/folderview.c:2192
 msgid "Yes"
 msgstr "Evet"
 
-#: src/account.c:758 src/compose.c:2551 src/compose.c:4807
+#: src/account.c:758 src/compose.c:2632 src/compose.c:4943
 #: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
 #: src/folderview.c:2156 src/folderview.c:2192
 msgid "+No"
@@ -264,7 +264,7 @@ msgstr "Eylemin kullanıcı argümanı"
 msgid "Add Address to Book"
 msgstr "Adres Defterine Ekle"
 
-#: src/addressadd.c:196 src/compose.c:4191 src/editaddress.c:196
+#: src/addressadd.c:196 src/compose.c:4292 src/editaddress.c:196
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "Adres"
@@ -278,7 +278,7 @@ msgstr "Notlar"
 msgid "Select Address Book Folder"
 msgstr "Adres Defteri Dizinini Seç"
 
-#: src/addressbook.c:334 src/compose.c:469 src/mainwindow.c:454
+#: src/addressbook.c:334 src/compose.c:477 src/mainwindow.c:454
 #: src/messageview.c:134
 msgid "/_File"
 msgstr "/_Dosya"
@@ -299,8 +299,8 @@ msgstr "/_Dosya/Yeni _JPilot"
 msgid "/_File/New _Server"
 msgstr "/_Dosya/Yeni _Sunucu"
 
-#: src/addressbook.c:343 src/addressbook.c:346 src/compose.c:474
-#: src/compose.c:479 src/compose.c:483 src/mainwindow.c:471
+#: src/addressbook.c:343 src/addressbook.c:346 src/compose.c:482
+#: src/compose.c:487 src/compose.c:491 src/mainwindow.c:471
 #: src/mainwindow.c:474 src/mainwindow.c:476 src/mainwindow.c:479
 #: src/mainwindow.c:481 src/messageview.c:137
 msgid "/_File/---"
@@ -318,7 +318,7 @@ msgstr "/_Dosya/_Sil"
 msgid "/_File/_Save"
 msgstr "/_Dosya/_Kaydet"
 
-#: src/addressbook.c:348 src/compose.c:484 src/messageview.c:138
+#: src/addressbook.c:348 src/compose.c:492 src/messageview.c:138
 msgid "/_File/_Close"
 msgstr "/_Dosya/K_apat"
 
@@ -350,7 +350,7 @@ msgstr "/_Adres/Dü_zenle"
 msgid "/_Address/_Delete"
 msgstr "/_Adres/_Sil"
 
-#: src/addressbook.c:356 src/compose.c:585 src/mainwindow.c:688
+#: src/addressbook.c:356 src/compose.c:664 src/mainwindow.c:697
 #: src/messageview.c:246
 msgid "/_Tools"
 msgstr "/A_raçlar"
@@ -359,12 +359,12 @@ msgstr "/A_raçlar"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/A_raçlar/_LDIF dosyasını ekle"
 
-#: src/addressbook.c:358 src/compose.c:598 src/mainwindow.c:733
+#: src/addressbook.c:358 src/compose.c:677 src/mainwindow.c:742
 #: src/messageview.c:264
 msgid "/_Help"
 msgstr "/_Yardım"
 
-#: src/addressbook.c:359 src/compose.c:599 src/mainwindow.c:744
+#: src/addressbook.c:359 src/compose.c:678 src/mainwindow.c:753
 #: src/messageview.c:265
 msgid "/_Help/_About"
 msgstr "/_Yardım/_Hakkında"
@@ -381,7 +381,7 @@ msgstr "/Yeni _Grup"
 msgid "/New _Folder"
 msgstr "/Yeni _Dizin"
 
-#: src/addressbook.c:381 src/addressbook.c:391 src/compose.c:463
+#: src/addressbook.c:381 src/addressbook.c:391 src/compose.c:471
 #: src/folderview.c:220 src/folderview.c:222 src/folderview.c:226
 #: src/folderview.c:236 src/folderview.c:238 src/folderview.c:240
 #: src/folderview.c:244 src/folderview.c:254 src/folderview.c:256
@@ -391,7 +391,7 @@ msgstr "/Yeni _Dizin"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:382 src/addressbook.c:392 src/compose.c:486
+#: src/addressbook.c:382 src/addressbook.c:392 src/compose.c:494
 #: src/mainwindow.c:485 src/messageview.c:140
 msgid "/_Edit"
 msgstr "/Dü_zenle"
@@ -404,7 +404,7 @@ msgstr "/_Sil"
 msgid "E-Mail address"
 msgstr "İleti adresi"
 
-#: src/addressbook.c:493 src/compose.c:4192 src/prefs_common.c:2186
+#: src/addressbook.c:493 src/compose.c:4293 src/prefs_common.c:2198
 msgid "Address book"
 msgstr "Adres defteri"
 
@@ -414,7 +414,7 @@ msgstr "İsim:"
 
 #. Buttons
 #: src/addressbook.c:625 src/addressbook.c:1665 src/addressbook.c:1671
-#: src/editaddress.c:878 src/editaddress.c:1011 src/mainwindow.c:2212
+#: src/editaddress.c:878 src/editaddress.c:1011 src/mainwindow.c:2221
 #: src/prefs_actions.c:263 src/prefs_display_header.c:275
 #: src/prefs_display_header.c:330 src/prefs_template.c:227
 msgid "Delete"
@@ -606,7 +606,7 @@ msgstr "Ortak adres"
 msgid "Personal address"
 msgstr "Kişisel adres"
 
-#: src/alertpanel.c:123 src/compose.c:4807 src/main.c:458
+#: src/alertpanel.c:123 src/compose.c:4943 src/main.c:458
 msgid "Notice"
 msgstr "Not"
 
@@ -614,7 +614,7 @@ msgstr "Not"
 msgid "Warning"
 msgstr "Uyarı"
 
-#: src/alertpanel.c:149 src/compose.c:2551 src/inc.c:558
+#: src/alertpanel.c:149 src/compose.c:2632 src/inc.c:558
 msgid "Error"
 msgstr "Hata"
 
@@ -662,299 +662,417 @@ msgstr "Kahverengi"
 msgid "None"
 msgstr "Hiçbiri"
 
-#: src/compose.c:461
+#: src/compose.c:469
 msgid "/_Add..."
 msgstr "/_Ekle..."
 
-#: src/compose.c:462
+#: src/compose.c:470
 msgid "/_Remove"
 msgstr "/_Sil"
 
-#: src/compose.c:464 src/folderview.c:228 src/folderview.c:246
+#: src/compose.c:472 src/folderview.c:228 src/folderview.c:246
 #: src/folderview.c:261
 msgid "/_Properties..."
 msgstr "/Ö_zellikler..."
 
-#: src/compose.c:470
+#: src/compose.c:478
 msgid "/_File/_Send"
 msgstr "/_Dosya/_Gönder"
 
-#: src/compose.c:472
+#: src/compose.c:480
 msgid "/_File/Send _later"
 msgstr "/_Dosya/_Sonra gönder"
 
-#: src/compose.c:475
+#: src/compose.c:483
 msgid "/_File/Save to _draft folder"
 msgstr "/_Dosya/T_aslak dizinine kaydet"
 
-#: src/compose.c:477
+#: src/compose.c:485
 msgid "/_File/Save and _keep editing"
 msgstr "/_Dosya/_Kaydet ve düzenlemeye devam et"
 
-#: src/compose.c:480
+#: src/compose.c:488
 msgid "/_File/_Attach file"
 msgstr "/_Dosya/_Dosya ekle"
 
-#: src/compose.c:481
+#: src/compose.c:489
 msgid "/_File/_Insert file"
 msgstr "/_Dosya/Dosya _içer"
 
-#: src/compose.c:482
+#: src/compose.c:490
 msgid "/_File/Insert si_gnature"
 msgstr "/_Dosya/İ_mza ekle"
 
-#: src/compose.c:487
+#: src/compose.c:495
 msgid "/_Edit/_Undo"
 msgstr "/Dü_zenle/_Geri al"
 
-#: src/compose.c:488
+#: src/compose.c:496
 msgid "/_Edit/_Redo"
 msgstr "/Dü_zenle/_Yenile"
 
-#: src/compose.c:489 src/compose.c:567 src/mainwindow.c:489
+#: src/compose.c:497 src/compose.c:575 src/mainwindow.c:489
 #: src/messageview.c:143
 msgid "/_Edit/---"
 msgstr "/Dü_zenle/---"
 
-#: src/compose.c:490
+#: src/compose.c:498
 msgid "/_Edit/Cu_t"
 msgstr "/Dü_zenle/_Kes"
 
-#: src/compose.c:491 src/mainwindow.c:486 src/messageview.c:141
+#: src/compose.c:499 src/mainwindow.c:486 src/messageview.c:141
 msgid "/_Edit/_Copy"
 msgstr "/Dü_zenle/K_opyala"
 
-#: src/compose.c:492
+#: src/compose.c:500
 msgid "/_Edit/_Paste"
 msgstr "/Dü_zenle/_Yapıştır"
 
-#: src/compose.c:493
+#: src/compose.c:501
 msgid "/_Edit/Paste as _quotation"
 msgstr "/Dü_zenle/_Alıntı Yaparak Yapıştır"
 
-#: src/compose.c:495 src/mainwindow.c:487 src/messageview.c:142
+#: src/compose.c:503 src/mainwindow.c:487 src/messageview.c:142
 msgid "/_Edit/Select _all"
 msgstr "/Dü_zenle/_Tümünü seç"
 
-#: src/compose.c:496
+#: src/compose.c:504
 msgid "/_Edit/A_dvanced"
 msgstr "/Dü_zenle/G_elişmiş"
 
-#: src/compose.c:497
+#: src/compose.c:505
 msgid "/_Edit/A_dvanced/Move a character backward"
 msgstr "/Dü_zenle/G_elişmiş/Bir karakteir geri taşı"
 
-#: src/compose.c:502
+#: src/compose.c:510
 msgid "/_Edit/A_dvanced/Move a character forward"
 msgstr "/Dü_zenle/G_elişmiş/Bir karakteri ileri taşı"
 
-#: src/compose.c:507
+#: src/compose.c:515
 msgid "/_Edit/A_dvanced/Move a word backward"
 msgstr "/Dü_zenle/G_elişmiş/Bir kelimeyi geri taşı"
 
-#: src/compose.c:512
+#: src/compose.c:520
 msgid "/_Edit/A_dvanced/Move a word forward"
 msgstr "/Dü_zenle/G_elişmiş/Bir kelimeyi ileri taşı"
 
-#: src/compose.c:517
+#: src/compose.c:525
 msgid "/_Edit/A_dvanced/Move to beginning of line"
 msgstr "/Dü_zenle/G_elişmiş/Satırın başına taşı"
 
-#: src/compose.c:522
+#: src/compose.c:530
 msgid "/_Edit/A_dvanced/Move to end of line"
 msgstr "/Dü_zenle/G_elişmiş/Satırın sonuna taşı"
 
-#: src/compose.c:527
+#: src/compose.c:535
 msgid "/_Edit/A_dvanced/Move to previous line"
 msgstr "/Dü_zenle/G_elişmiş/Önceki satıra taşı"
 
-#: src/compose.c:532
+#: src/compose.c:540
 msgid "/_Edit/A_dvanced/Move to next line"
 msgstr "/Dü_zenle/G_elişmiş/Sonraki satıra taşı"
 
-#: src/compose.c:537
+#: src/compose.c:545
 msgid "/_Edit/A_dvanced/Delete a character backward"
 msgstr "/Dü_zenle/G_elişmiş/Bir karakter gerisini sil"
 
-#: src/compose.c:542
+#: src/compose.c:550
 msgid "/_Edit/A_dvanced/Delete a character forward"
 msgstr "/Dü_zenle/G_elişmiş/Bir karakter ilerisini sil"
 
-#: src/compose.c:547
+#: src/compose.c:555
 msgid "/_Edit/A_dvanced/Delete a word backward"
 msgstr "/Dü_zenle/G_elişmiş/Bir kelime sonrasını sil"
 
-#: src/compose.c:552
+#: src/compose.c:560
 msgid "/_Edit/A_dvanced/Delete a word forward"
 msgstr "/Dü_zenle/G_elişmiş/Bir kelime öncesini sil"
 
-#: src/compose.c:557
+#: src/compose.c:565
 msgid "/_Edit/A_dvanced/Delete line"
 msgstr "/Dü_zenle/G_elişmiş/Satırı sil"
 
-#: src/compose.c:562
+#: src/compose.c:570
 msgid "/_Edit/A_dvanced/Delete to end of line"
 msgstr "/Dü_zenle/G_elişmiş/Satır sonunu sil"
 
-#: src/compose.c:568
+#: src/compose.c:576
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/Dü_zenle/_Şuanki paragrafı kaydır"
 
-#: src/compose.c:570
+#: src/compose.c:578
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/Dü_zenle/Tüm _uzun satırları kaydır"
 
-#: src/compose.c:572
+#: src/compose.c:580
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/Dü_zenle/Otomatik ka_ydır"
 
-#: src/compose.c:573 src/mainwindow.c:494 src/messageview.c:147
+#: src/compose.c:581 src/mainwindow.c:494 src/messageview.c:147
 #: src/summaryview.c:370
 msgid "/_View"
 msgstr "/_Görünüm"
 
-#: src/compose.c:574
+#: src/compose.c:582
 msgid "/_View/_To"
 msgstr "/_Görünüm/_Alıcı"
 
-#: src/compose.c:575
+#: src/compose.c:583
 msgid "/_View/_Cc"
 msgstr "/_Görünüm/_Cc"
 
-#: src/compose.c:576
+#: src/compose.c:584
 msgid "/_View/_Bcc"
 msgstr "/_Görünüm/_Bcc"
 
-#: src/compose.c:577
+#: src/compose.c:585
 msgid "/_View/_Reply to"
 msgstr "/_Görünüm/_Yanıtla/"
 
-#: src/compose.c:578 src/compose.c:580 src/compose.c:582 src/mainwindow.c:512
-#: src/mainwindow.c:515 src/mainwindow.c:541 src/mainwindow.c:565
-#: src/mainwindow.c:641 src/mainwindow.c:645 src/messageview.c:223
+#: src/compose.c:586 src/compose.c:588 src/compose.c:590 src/compose.c:592
+#: src/mainwindow.c:512 src/mainwindow.c:515 src/mainwindow.c:541
+#: src/mainwindow.c:565 src/mainwindow.c:650 src/mainwindow.c:654
+#: src/messageview.c:223
 msgid "/_View/---"
 msgstr "/_Görünüm/---"
 
-#: src/compose.c:579
+#: src/compose.c:587
 msgid "/_View/_Followup to"
 msgstr "/_Görünüm/_Kodlama/"
 
-#: src/compose.c:581
+#: src/compose.c:589
 msgid "/_View/R_uler"
 msgstr "/_Görünüm/_Cetvel"
 
-#: src/compose.c:583
+#: src/compose.c:591
 msgid "/_View/_Attachment"
 msgstr "/_Görünüm/_Ek"
 
-#: src/compose.c:586 src/mainwindow.c:689 src/messageview.c:247
+#: src/compose.c:598 src/mainwindow.c:572 src/messageview.c:154
+#, fuzzy
+msgid "/_View/Character _encoding"
+msgstr "/_Görünüm/_Sırala/Azalan sırala"
+
+#: src/compose.c:599
+msgid "/_View/Character _encoding/_Automatic"
+msgstr ""
+
+#: src/compose.c:601 src/compose.c:607 src/compose.c:613 src/compose.c:617
+#: src/compose.c:623 src/compose.c:627 src/compose.c:631 src/compose.c:641
+#: src/compose.c:645 src/compose.c:653 src/compose.c:657 src/mainwindow.c:568
+#: src/mainwindow.c:575 src/messageview.c:150
+#, fuzzy
+msgid "/_View/Character _encoding/---"
+msgstr "/_Görünüm/_Sırala/Azalan sırala"
+
+#: src/compose.c:603 src/mainwindow.c:576 src/messageview.c:158
+#, 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:605 src/mainwindow.c:578 src/messageview.c:161
+#, fuzzy
+msgid "/_View/Character _encoding/Unicode (_UTF-8)"
+msgstr "/_Görünüm/_Kodlama/Unicode (_UTF-8)"
+
+#: src/compose.c:609 src/mainwindow.c:582 src/messageview.c:164
+#, fuzzy
+msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
+msgstr "/_Görünüm/_Kodlama/Batı Avrupa (ISO-8859-_1)"
+
+#: src/compose.c:611 src/mainwindow.c:584 src/messageview.c:166
+#, fuzzy
+msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
+msgstr "/_Görünüm/_Kodlama/Batı Avrupa (ISO-8859-_15)"
+
+#: src/compose.c:615 src/mainwindow.c:588 src/messageview.c:169
+#, fuzzy
+msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
+msgstr "/_Görünüm/_Kodlama/Orta Avrupa (ISO-8859-_2)"
+
+#: src/compose.c:619 src/mainwindow.c:592 src/messageview.c:172
+#, fuzzy
+msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
+msgstr "/_Görünüm/_Kodlama/_Baltık (ISO-8859-13)"
+
+#: src/compose.c:621 src/mainwindow.c:594 src/messageview.c:174
+#, fuzzy
+msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
+msgstr "/_Görünüm/_Kodlama/Baltık (ISO-8859-_4)"
+
+#: src/compose.c:625 src/mainwindow.c:598 src/messageview.c:177
+#, fuzzy
+msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
+msgstr "/_Görünüm/_Kodlama/Yunanca (ISO-8859-_7)"
+
+#: src/compose.c:629 src/mainwindow.c:602 src/messageview.c:180
+#, fuzzy
+msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
+msgstr "/_Görünüm/_Kodlama/Türkçe (ISO-8859-_9)"
+
+#: src/compose.c:633 src/mainwindow.c:606 src/messageview.c:183
+#, fuzzy
+msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
+msgstr "/_Görünüm/_Kodlama/Kiril (ISO-8859-_5)"
+
+#: src/compose.c:635 src/mainwindow.c:608 src/messageview.c:185
+#, fuzzy
+msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
+msgstr "/_Görünüm/_Kodlama/Kiril (ISO-8859-_5)"
+
+#: src/compose.c:637 src/mainwindow.c:610 src/messageview.c:187
+#, fuzzy
+msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
+msgstr "/_Görünüm/_Kodlama/Kiril (KOI8-U)"
+
+#: src/compose.c:639 src/mainwindow.c:612 src/messageview.c:189
+#, fuzzy
+msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
+msgstr "/_Görünüm/_Kodlama/Kiril (Windows-1251)"
+
+#: src/compose.c:643 src/mainwindow.c:616 src/messageview.c:192
+#, fuzzy
+msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
+msgstr "/_Görünüm/_Kodlama/Japonca (ISO-2022-_JP)"
+
+#: src/compose.c:647 src/mainwindow.c:626 src/messageview.c:201
+#, fuzzy
+msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
+msgstr "/_Görünüm/_Kodlama/Basit Çince (_GB2312)"
+
+#: src/compose.c:649 src/mainwindow.c:628 src/messageview.c:203
+#, fuzzy
+msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
+msgstr "/_Görünüm/_Kodlama/Geleneksel Çince (_Big5)"
+
+#: src/compose.c:651 src/mainwindow.c:630 src/messageview.c:205
+#, fuzzy
+msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
+msgstr "/_Görünüm/_Kodlama/Geleneksel Çince (EUC-_TW)"
+
+#: src/compose.c:655 src/mainwindow.c:636 src/messageview.c:210
+#, fuzzy
+msgid "/_View/Character _encoding/Korean (EUC-_KR)"
+msgstr "/_Görünüm/_Kodlama/Korece (EUC-_KR)"
+
+#: src/compose.c:659 src/mainwindow.c:642 src/messageview.c:215
+#, fuzzy
+msgid "/_View/Character _encoding/Thai (TIS-620)"
+msgstr "/_Görünüm/_Kodlama/Tayca (TIS-620)"
+
+#: src/compose.c:661 src/mainwindow.c:644 src/messageview.c:217
+#, fuzzy
+msgid "/_View/Character _encoding/Thai (Windows-874)"
+msgstr "/_Görünüm/_Kodlama/Tayca (Windows-874)"
+
+#: src/compose.c:665 src/mainwindow.c:698 src/messageview.c:247
 msgid "/_Tools/_Address book"
 msgstr "/A_raçlar/_Adres defteri"
 
-#: src/compose.c:587
+#: src/compose.c:666
 msgid "/_Tools/_Template"
 msgstr "/A_raçlar/Ş_ablon"
 
-#: src/compose.c:588 src/mainwindow.c:707 src/messageview.c:262
+#: src/compose.c:667 src/mainwindow.c:716 src/messageview.c:262
 msgid "/_Tools/Actio_ns"
 msgstr "/A_raçlar/E_ylemler"
 
-#: src/compose.c:589 src/compose.c:593 src/mainwindow.c:692
-#: src/mainwindow.c:706 src/mainwindow.c:708 src/mainwindow.c:711
-#: src/mainwindow.c:713 src/messageview.c:250 src/messageview.c:261
+#: src/compose.c:668 src/compose.c:672 src/mainwindow.c:701
+#: src/mainwindow.c:715 src/mainwindow.c:717 src/mainwindow.c:720
+#: src/mainwindow.c:722 src/messageview.c:250 src/messageview.c:261
 msgid "/_Tools/---"
 msgstr "/A_raçlar/---"
 
-#: src/compose.c:590
+#: src/compose.c:669
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/A_raçlar/Harici _düzenleyicide aç"
 
-#: src/compose.c:594
+#: src/compose.c:673
 msgid "/_Tools/PGP Si_gn"
 msgstr "/A_raçlar/PGP İ_mza"
 
-#: src/compose.c:595
+#: src/compose.c:674
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/A_raçlar/PGP ile Ş_ifrele"
 
-#: src/compose.c:800
+#: src/compose.c:879
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: dosya bulunamadı\n"
 
-#: src/compose.c:899 src/compose.c:958 src/procmsg.c:1303
+#: src/compose.c:978 src/compose.c:1037 src/procmsg.c:1303
 msgid "Can't get text part\n"
 msgstr "Metin bölümü alınamadı\n"
 
-#: src/compose.c:1340
+#: src/compose.c:1419
 msgid "Quote mark format error."
 msgstr "Alıntı formatı hatası."
 
-#: src/compose.c:1352
+#: src/compose.c:1431
 msgid "Message reply/forward format error."
 msgstr "Posta cevapla/ilet formatı hatası"
 
-#: src/compose.c:1679
+#: src/compose.c:1758
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "%s dosyası bulunamadı\n"
 
-#: src/compose.c:1683
+#: src/compose.c:1762
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "%s dosyasının boyu bulunamadı\n"
 
-#: src/compose.c:1687
+#: src/compose.c:1766
 #, c-format
 msgid "File %s is empty."
 msgstr "%s dosyası boş."
 
-#: src/compose.c:1691
+#: src/compose.c:1770
 #, c-format
 msgid "Can't read %s."
 msgstr "%s okunamadı."
 
-#: src/compose.c:1726
+#: src/compose.c:1805
 #, c-format
 msgid "Message: %s"
 msgstr "İleti: %s"
 
-#: src/compose.c:1797 src/mimeview.c:491
+#: src/compose.c:1876 src/mimeview.c:491
 msgid "Can't get the part of multipart message."
 msgstr "Çok parçalı mesajın bir kısmı alınamadı"
 
-#: src/compose.c:2188
+#: src/compose.c:2267
 msgid " [Edited]"
 msgstr " [Düzenlendi]"
 
-#: src/compose.c:2190
+#: src/compose.c:2269
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - İleti düzenle (%s)"
 
-#: src/compose.c:2193
+#: src/compose.c:2272
 #, c-format
 msgid "Compose message%s"
 msgstr "İleti düzenle (%s)"
 
-#: src/compose.c:2304
+#: src/compose.c:2383
 msgid "Recipient is not specified."
 msgstr "Alıcı belirtilmedi."
 
-#: src/compose.c:2312 src/compose.c:4112 src/mainwindow.c:2144
+#: src/compose.c:2391 src/compose.c:4213 src/mainwindow.c:2153
 #: src/prefs_account.c:703 src/prefs_common.c:850
 msgid "Send"
 msgstr "Gönder"
 
-#: src/compose.c:2313
+#: src/compose.c:2392
 msgid "Subject is empty. Send it anyway?"
 msgstr "Konuyu boş bıraktınız. Yine de göndermek istiyor musunuz?"
 
-#: src/compose.c:2364
+#: src/compose.c:2443
 msgid "can't get recipient list."
 msgstr "alıcı listesi alınamadı."
 
-#: src/compose.c:2384
+#: src/compose.c:2463
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -962,26 +1080,26 @@ msgstr ""
 "İletinin gönderileceği hesap belirtilmedi.\n"
 "Lütfen göndermeden önce bir e-posta hesabı girin."
 
-#: src/compose.c:2398 src/send_message.c:261
+#: src/compose.c:2477 src/send_message.c:261
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "İleti, %s adresine gönderilirken bir hata oluştu."
 
-#: src/compose.c:2421
+#: src/compose.c:2500
 msgid "Can't save the message to outbox."
 msgstr "İleti, giden kutusuna kaydedilemiyor."
 
-#: src/compose.c:2457
+#: src/compose.c:2536
 #, 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:2518 src/compose.c:2739 src/compose.c:2802 src/compose.c:2921
+#: src/compose.c:2597 src/compose.c:2820 src/compose.c:2883 src/compose.c:3003
 #: src/utils.c:2189
 msgid "can't change file mode\n"
 msgstr "dosya modu değiştirilemedi\n"
 
-#: src/compose.c:2546
+#: src/compose.c:2627
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -991,140 +1109,140 @@ msgstr ""
 "%s / %s\n"
 "Yine de gönderilsin mi?"
 
-#: src/compose.c:2610
+#: src/compose.c:2691
 msgid "can't write headers\n"
 msgstr "başlıklar yazılamadı\n"
 
-#: src/compose.c:2881
+#: src/compose.c:2963
 msgid "can't remove the old message\n"
 msgstr "eski ileti silinemedi\n"
 
-#: src/compose.c:2899
+#: src/compose.c:2981
 msgid "queueing message...\n"
 msgstr "ileti kuyruğa gönderiliyor...\n"
 
-#: src/compose.c:2981
+#: src/compose.c:3063
 msgid "can't find queue folder\n"
 msgstr "kuyruk dizini bulunamadı\n"
 
-#: src/compose.c:2988
+#: src/compose.c:3070
 msgid "can't queue the message\n"
 msgstr "ileti kuyruğa gönderilemedi\n"
 
-#: src/compose.c:3547
+#: src/compose.c:3645
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "İleti numarası oluşturuldu: %s\n"
 
-#: src/compose.c:3645
+#: src/compose.c:3743
 msgid "Creating compose window...\n"
 msgstr "Düzenleme penceresi oluşturuluyor...\n"
 
-#: src/compose.c:3648 src/compose.c:4598
+#: src/compose.c:3746 src/compose.c:4734
 msgid "MIME type"
 msgstr "MIME türü"
 
 #. S_COL_DATE
-#: src/compose.c:3649 src/mimeview.c:150 src/prefs_filter_edit.c:569
+#: src/compose.c:3747 src/mimeview.c:150 src/prefs_filter_edit.c:569
 #: src/prefs_summary_column.c:73 src/select-keys.c:317 src/summaryview.c:386
 msgid "Size"
 msgstr "Boyut"
 
-#: src/compose.c:3700 src/headerview.c:53 src/summary_search.c:169
+#: src/compose.c:3798 src/headerview.c:53 src/summary_search.c:169
 msgid "From:"
 msgstr "Kimden:"
 
-#: src/compose.c:4113
+#: src/compose.c:4214
 msgid "Send message"
 msgstr "İletiyi gönder"
 
-#: src/compose.c:4121
+#: src/compose.c:4222
 msgid "Send later"
 msgstr "Sonra gönder"
 
-#: src/compose.c:4122
+#: src/compose.c:4223
 msgid "Put into queue folder and send later"
 msgstr "İletiyi kuyruğa aktar ve sonra gönder"
 
-#: src/compose.c:4130
+#: src/compose.c:4231
 msgid "Draft"
 msgstr "Taslak"
 
-#: src/compose.c:4131
+#: src/compose.c:4232
 msgid "Save to draft folder"
 msgstr "Taslak dizinine kaydet"
 
-#: src/compose.c:4141 src/compose.c:5382
+#: src/compose.c:4242 src/compose.c:5527
 msgid "Insert"
 msgstr "İçer"
 
-#: src/compose.c:4142
+#: src/compose.c:4243
 msgid "Insert file"
 msgstr "Dosya içer"
 
-#: src/compose.c:4150
+#: src/compose.c:4251
 msgid "Attach"
 msgstr "Ekle"
 
-#: src/compose.c:4151
+#: src/compose.c:4252
 msgid "Attach file"
 msgstr "Dosya ekle"
 
 #. signature
-#: src/compose.c:4161 src/prefs_account.c:1339 src/prefs_common.c:1261
+#: src/compose.c:4262 src/prefs_account.c:1339 src/prefs_common.c:1273
 msgid "Signature"
 msgstr "İmza"
 
-#: src/compose.c:4162
+#: src/compose.c:4263
 msgid "Insert signature"
 msgstr "İmza ekle"
 
-#: src/compose.c:4171 src/prefs_common.c:1283 src/prefs_common.c:2165
+#: src/compose.c:4272 src/prefs_common.c:1295 src/prefs_common.c:2177
 msgid "Editor"
 msgstr "Düzenleyici"
 
-#: src/compose.c:4172
+#: src/compose.c:4273
 msgid "Edit with external editor"
 msgstr "Harici bir düzenleyici kullan"
 
-#: src/compose.c:4180
+#: src/compose.c:4281
 msgid "Linewrap"
 msgstr "Satır kaydır"
 
-#: src/compose.c:4181
+#: src/compose.c:4282
 msgid "Wrap all long lines"
 msgstr "Tüm uzun satırları kaydır"
 
-#: src/compose.c:4492
+#: src/compose.c:4628
 msgid "Invalid MIME type."
 msgstr "Geçersiz MIME türü."
 
-#: src/compose.c:4511
+#: src/compose.c:4647
 msgid "File doesn't exist or is empty."
 msgstr "Dosya yok, ya da boş."
 
-#: src/compose.c:4580
+#: src/compose.c:4716
 msgid "Properties"
 msgstr "Özellikler"
 
-#: src/compose.c:4600
+#: src/compose.c:4736
 msgid "Encoding"
 msgstr "Kodlama"
 
-#: src/compose.c:4623 src/prefs_folder_item.c:183
+#: src/compose.c:4759 src/prefs_folder_item.c:183
 msgid "Path"
 msgstr "Yol"
 
-#: src/compose.c:4624
+#: src/compose.c:4760
 msgid "File name"
 msgstr "Dosya adı"
 
-#: src/compose.c:4778
+#: src/compose.c:4914
 #, 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:4804
+#: src/compose.c:4940
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1135,72 +1253,72 @@ msgstr ""
 "Bu süreci sonlandırayım mı?\n"
 "Programın grup numarası (GID): %d"
 
-#: src/compose.c:4817
+#: src/compose.c:4953
 #, c-format
 msgid "Terminated process group id: %d"
 msgstr "Grup numarası %d olan süreç sonlandırıldı"
 
-#: src/compose.c:4818
+#: src/compose.c:4954
 #, c-format
 msgid "Temporary file: %s"
 msgstr "Geçici dosya: %s"
 
-#: src/compose.c:4842
+#: src/compose.c:4978
 msgid "Compose: input from monitoring process\n"
 msgstr "Düzenle: süreç görüntüsünü içer\n"
 
 #. failed
-#: src/compose.c:4875
+#: src/compose.c:5011
 msgid "Couldn't exec external editor\n"
 msgstr "Harici düzenleyici çalıştırılamadı\n"
 
-#: src/compose.c:4879
+#: src/compose.c:5015
 msgid "Couldn't write to file\n"
 msgstr "Dosyaya yazılamadı\n"
 
-#: src/compose.c:4881
+#: src/compose.c:5017
 msgid "Pipe read failed\n"
 msgstr "Boru okumada hata\n"
 
-#: src/compose.c:5182 src/compose.c:5190 src/compose.c:5196
+#: src/compose.c:5318 src/compose.c:5326 src/compose.c:5332
 msgid "Can't queue the message."
 msgstr "İleti kuyruğa gönderilemedi."
 
-#: src/compose.c:5287
+#: src/compose.c:5423
 #, fuzzy
 msgid "Select files"
 msgstr "Dosya seç"
 
-#: src/compose.c:5309
+#: src/compose.c:5445
 msgid "Select file"
 msgstr "Dosya seç"
 
-#: src/compose.c:5344
+#: src/compose.c:5480
 msgid "Discard message"
 msgstr "İletiyi sil"
 
-#: src/compose.c:5345
+#: src/compose.c:5481
 msgid "This message has been modified. discard it?"
 msgstr "Bu ileti değiştirildi. Silinsin mi?"
 
-#: src/compose.c:5346
+#: src/compose.c:5482
 msgid "Discard"
 msgstr "Sil"
 
-#: src/compose.c:5346
+#: src/compose.c:5482
 msgid "to Draft"
 msgstr "Taslağa Gönder"
 
-#: src/compose.c:5379
+#: src/compose.c:5524
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "%s şablonunu uygulamak istiyor musunuz?"
 
-#: src/compose.c:5381
+#: src/compose.c:5526
 msgid "Apply template"
 msgstr "Şablonu uygula"
 
-#: src/compose.c:5382
+#: src/compose.c:5527
 msgid "Replace"
 msgstr "Değiştir"
 
@@ -1640,12 +1758,12 @@ msgstr "Dizin bilgisi ayarlanıyor...\n"
 msgid "Setting folder info..."
 msgstr "Dizin bilgisi ayarlanıyor..."
 
-#: src/folderview.c:652 src/mainwindow.c:3190 src/setup.c:81
+#: src/folderview.c:652 src/mainwindow.c:3199 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "%s%c%s dizini taranıyor..."
 
-#: src/folderview.c:656 src/mainwindow.c:3195 src/setup.c:86
+#: src/folderview.c:656 src/mainwindow.c:3204 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "%s dizini taranıyor..."
@@ -2101,7 +2219,7 @@ msgstr "LDIF dosyasını Adres Defterine aktar"
 msgid "Prev"
 msgstr "Önceki"
 
-#: src/importldif.c:761 src/mainwindow.c:2230
+#: src/importldif.c:761 src/mainwindow.c:2239
 msgid "Next"
 msgstr "Sonraki"
 
@@ -2551,7 +2669,8 @@ msgid "/_View/Separate f_older tree"
 msgstr "/_Görünüm/D_izin ağacını ayır"
 
 #: src/mainwindow.c:514
-msgid "/_View/Separate m_essage view"
+#, fuzzy
+msgid "/_View/Separate _message view"
 msgstr "/_Görünüm/Ayrı _ileti görünümü"
 
 #: src/mainwindow.c:516
@@ -2687,422 +2806,340 @@ msgstr "/_Görünüm/Gi_t/Son_raki etiketli ileti"
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Görünüm/Gi_t/_Başka dizine git..."
 
-#: src/mainwindow.c:568 src/mainwindow.c:575 src/messageview.c:150
-msgid "/_View/_Code set/---"
-msgstr "/_Görünüm/_Kodlama/---"
-
-#: src/mainwindow.c:572 src/messageview.c:154
-msgid "/_View/_Code set"
-msgstr "/_Görünüm/_Kodlama"
-
 #: src/mainwindow.c:573 src/messageview.c:155
-msgid "/_View/_Code set/_Auto detect"
+#, fuzzy
+msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Görünüm/_Kodlama/_Otomatik tanı"
 
-#: src/mainwindow.c:576 src/messageview.c:158
-msgid "/_View/_Code set/7bit ascii (US-ASC_II)"
-msgstr "/_Görünüm/_Kodlama/7 bit ascii (US-ASC_II)"
-
-#: src/mainwindow.c:579 src/messageview.c:161
-msgid "/_View/_Code set/Unicode (_UTF-8)"
-msgstr "/_Görünüm/_Kodlama/Unicode (_UTF-8)"
-
-#: src/mainwindow.c:582 src/messageview.c:164
-msgid "/_View/_Code set/Western European (ISO-8859-_1)"
-msgstr "/_Görünüm/_Kodlama/Batı Avrupa (ISO-8859-_1)"
-
-#: src/mainwindow.c:584 src/messageview.c:166
-msgid "/_View/_Code set/Western European (ISO-8859-15)"
-msgstr "/_Görünüm/_Kodlama/Batı Avrupa (ISO-8859-_15)"
-
-#: src/mainwindow.c:587 src/messageview.c:169
-msgid "/_View/_Code set/Central European (ISO-8859-_2)"
-msgstr "/_Görünüm/_Kodlama/Orta Avrupa (ISO-8859-_2)"
-
-#: src/mainwindow.c:590 src/messageview.c:172
-msgid "/_View/_Code set/_Baltic (ISO-8859-13)"
-msgstr "/_Görünüm/_Kodlama/_Baltık (ISO-8859-13)"
-
-#: src/mainwindow.c:592 src/messageview.c:174
-msgid "/_View/_Code set/Baltic (ISO-8859-_4)"
-msgstr "/_Görünüm/_Kodlama/Baltık (ISO-8859-_4)"
-
-#: src/mainwindow.c:595 src/messageview.c:177
-msgid "/_View/_Code set/Greek (ISO-8859-_7)"
-msgstr "/_Görünüm/_Kodlama/Yunanca (ISO-8859-_7)"
-
-#: src/mainwindow.c:598 src/messageview.c:180
-msgid "/_View/_Code set/Turkish (ISO-8859-_9)"
-msgstr "/_Görünüm/_Kodlama/Türkçe (ISO-8859-_9)"
-
-#: src/mainwindow.c:601 src/messageview.c:183
-msgid "/_View/_Code set/Cyrillic (ISO-8859-_5)"
-msgstr "/_Görünüm/_Kodlama/Kiril (ISO-8859-_5)"
-
-#: src/mainwindow.c:603 src/messageview.c:185
-msgid "/_View/_Code set/Cyrillic (KOI8-_R)"
-msgstr "/_Görünüm/_Kodlama/Kiril (ISO-8859-_5)"
-
-#: src/mainwindow.c:605 src/messageview.c:187
-msgid "/_View/_Code set/Cyrillic (KOI8-U)"
-msgstr "/_Görünüm/_Kodlama/Kiril (KOI8-U)"
-
-#: src/mainwindow.c:607 src/messageview.c:189
-msgid "/_View/_Code set/Cyrillic (Windows-1251)"
-msgstr "/_Görünüm/_Kodlama/Kiril (Windows-1251)"
-
-#: src/mainwindow.c:610 src/messageview.c:192
-msgid "/_View/_Code set/Japanese (ISO-2022-_JP)"
-msgstr "/_Görünüm/_Kodlama/Japonca (ISO-2022-_JP)"
-
-#: src/mainwindow.c:612 src/messageview.c:194
-msgid "/_View/_Code set/Japanese (ISO-2022-JP-2)"
+#: src/mainwindow.c:618 src/messageview.c:194
+#, fuzzy
+msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Görünüm/_Kodlama/Japonca (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:614 src/messageview.c:196
-msgid "/_View/_Code set/Japanese (_EUC-JP)"
+#: src/mainwindow.c:620 src/messageview.c:196
+#, fuzzy
+msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Görünüm/_Kodlama/Japonca (_EUC-JP)"
 
-#: src/mainwindow.c:616 src/messageview.c:198
-msgid "/_View/_Code set/Japanese (_Shift__JIS)"
+#: src/mainwindow.c:622 src/messageview.c:198
+#, fuzzy
+msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Görünüm/_Kodlama/Japonca (_Shift__JIS)"
 
-#: src/mainwindow.c:619 src/messageview.c:201
-msgid "/_View/_Code set/Simplified Chinese (_GB2312)"
-msgstr "/_Görünüm/_Kodlama/Basit Çince (_GB2312)"
-
-#: src/mainwindow.c:621 src/messageview.c:203
-msgid "/_View/_Code set/Traditional Chinese (_Big5)"
-msgstr "/_Görünüm/_Kodlama/Geleneksel Çince (_Big5)"
-
-#: src/mainwindow.c:623 src/messageview.c:205
-msgid "/_View/_Code set/Traditional Chinese (EUC-_TW)"
-msgstr "/_Görünüm/_Kodlama/Geleneksel Çince (EUC-_TW)"
-
-#: src/mainwindow.c:625 src/messageview.c:207
-msgid "/_View/_Code set/Chinese (ISO-2022-_CN)"
+#: src/mainwindow.c:632 src/messageview.c:207
+#, fuzzy
+msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Görünüm/_Kodlama/Çince (ISO-2022-_CN)"
 
-#: src/mainwindow.c:628 src/messageview.c:210
-msgid "/_View/_Code set/Korean (EUC-_KR)"
-msgstr "/_Görünüm/_Kodlama/Korece (EUC-_KR)"
-
-#: src/mainwindow.c:630 src/messageview.c:212
-msgid "/_View/_Code set/Korean (ISO-2022-KR)"
+#: src/mainwindow.c:638 src/messageview.c:212
+#, fuzzy
+msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Görünüm/_Kodlama/Korece (ISO-2022-KR)"
 
-#: src/mainwindow.c:633 src/messageview.c:215
-msgid "/_View/_Code set/Thai (TIS-620)"
-msgstr "/_Görünüm/_Kodlama/Tayca (TIS-620)"
-
-#: src/mainwindow.c:635 src/messageview.c:217
-msgid "/_View/_Code set/Thai (Windows-874)"
-msgstr "/_Görünüm/_Kodlama/Tayca (Windows-874)"
-
-#: src/mainwindow.c:642 src/summaryview.c:371
+#: src/mainwindow.c:651 src/summaryview.c:371
 msgid "/_View/Open in new _window"
 msgstr "/_Görünüm/Yeni _pencerede aç"
 
-#: src/mainwindow.c:643 src/messageview.c:224
+#: src/mainwindow.c:652 src/messageview.c:224
 msgid "/_View/Mess_age source"
 msgstr "/_Görünüm/İ_leti kaynağı"
 
-#: src/mainwindow.c:644 src/messageview.c:225
+#: src/mainwindow.c:653 src/messageview.c:225
 msgid "/_View/Show all _header"
 msgstr "/_Görünüm/Tüm _başlıkları görüntüle"
 
-#: src/mainwindow.c:646
+#: src/mainwindow.c:655
 msgid "/_View/_Update summary"
 msgstr "/_Görünüm/_Görünümü güncelle"
 
-#: src/mainwindow.c:648 src/messageview.c:227
+#: src/mainwindow.c:657 src/messageview.c:227
 msgid "/_Message"
 msgstr "/İ_leti"
 
-#: src/mainwindow.c:649
+#: src/mainwindow.c:658
 msgid "/_Message/Recei_ve"
 msgstr "/İ_leti/_Al"
 
-#: src/mainwindow.c:650
+#: src/mainwindow.c:659
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/İ_leti/_Al/Ge_çerli hesaptan al"
 
-#: src/mainwindow.c:652
+#: src/mainwindow.c:661
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/İ_leti/_Al/T_üm hesaplardan al"
 
-#: src/mainwindow.c:654
+#: src/mainwindow.c:663
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/İ_leti/_Al/İ_ptal Et"
 
-#: src/mainwindow.c:656
+#: src/mainwindow.c:665
 msgid "/_Message/Recei_ve/---"
 msgstr "/İ_leti/_Al/---"
 
-#: src/mainwindow.c:657
+#: src/mainwindow.c:666
 msgid "/_Message/_Send queued messages"
 msgstr "/İ_leti/_Kuyruktaki iletileri gönder"
 
-#: src/mainwindow.c:658 src/mainwindow.c:660 src/mainwindow.c:667
-#: src/mainwindow.c:672 src/mainwindow.c:676 src/mainwindow.c:685
+#: src/mainwindow.c:667 src/mainwindow.c:669 src/mainwindow.c:676
+#: src/mainwindow.c:681 src/mainwindow.c:685 src/mainwindow.c:694
 #: src/messageview.c:230 src/messageview.c:238 src/messageview.c:243
 msgid "/_Message/---"
 msgstr "/İ_leti/---"
 
-#: src/mainwindow.c:659 src/messageview.c:228
+#: src/mainwindow.c:668 src/messageview.c:228
 msgid "/_Message/Compose _new message"
 msgstr "/İ_leti/Yeni _ileti gönder"
 
-#: src/mainwindow.c:661 src/messageview.c:231
+#: src/mainwindow.c:670 src/messageview.c:231
 msgid "/_Message/_Reply"
 msgstr "/İ_leti/Yanıtl_a"
 
-#: src/mainwindow.c:662
+#: src/mainwindow.c:671
 msgid "/_Message/Repl_y to"
 msgstr "/İ_leti/B_aşkasına yanıtla"
 
-#: src/mainwindow.c:663 src/messageview.c:232
+#: src/mainwindow.c:672 src/messageview.c:232
 msgid "/_Message/Repl_y to/_all"
 msgstr "/İ_leti/B_aşkasına yanıtla/_herkese"
 
-#: src/mainwindow.c:664 src/messageview.c:234
+#: src/mainwindow.c:673 src/messageview.c:234
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/İ_leti/B_aşkasına yanıtla/_gönderene"
 
-#: src/mainwindow.c:665 src/messageview.c:236
+#: src/mainwindow.c:674 src/messageview.c:236
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/İ_leti/B_aşkasına yanıtla/eposta l_istesine"
 
-#: src/mainwindow.c:668 src/messageview.c:239
+#: src/mainwindow.c:677 src/messageview.c:239
 msgid "/_Message/_Forward"
 msgstr "/İ_leti/Yö_nlendir"
 
-#: src/mainwindow.c:669 src/messageview.c:240
+#: src/mainwindow.c:678 src/messageview.c:240
 msgid "/_Message/For_ward as attachment"
 msgstr "/İ_leti/E_k olarak yönlendir"
 
-#: src/mainwindow.c:671 src/messageview.c:242
+#: src/mainwindow.c:680 src/messageview.c:242
 msgid "/_Message/Redirec_t"
 msgstr "/İ_leti/Yö_nlendir"
 
-#: src/mainwindow.c:673
+#: src/mainwindow.c:682
 msgid "/_Message/M_ove..."
 msgstr "/İ_leti/Taşı..."
 
-#: src/mainwindow.c:674
+#: src/mainwindow.c:683
 msgid "/_Message/_Copy..."
 msgstr "/İ_leti/_Kopyala..."
 
-#: src/mainwindow.c:675
+#: src/mainwindow.c:684
 msgid "/_Message/_Delete"
 msgstr "/İ_leti/_Sil"
 
-#: src/mainwindow.c:677
+#: src/mainwindow.c:686
 msgid "/_Message/_Mark"
 msgstr "/İ_leti/İş_aretle"
 
-#: src/mainwindow.c:678
+#: src/mainwindow.c:687
 msgid "/_Message/_Mark/_Mark"
 msgstr "/İ_leti/İş_aretle/İş_aretle"
 
-#: src/mainwindow.c:679
+#: src/mainwindow.c:688
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/İ_leti/İş_aretle/İşareti _kaldır"
 
-#: src/mainwindow.c:680
+#: src/mainwindow.c:689
 msgid "/_Message/_Mark/---"
 msgstr "/İ_leti/İş_aretle/---"
 
-#: src/mainwindow.c:681
+#: src/mainwindow.c:690
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/İ_leti/İş_aretle/O_kunmamış olarak işaretle"
 
-#: src/mainwindow.c:682
+#: src/mainwindow.c:691
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/İ_leti/İş_aretle/Ok_unmuş olarak işaretle"
 
-#: src/mainwindow.c:684
+#: src/mainwindow.c:693
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/İ_leti/İş_aretle/Hepsini _okunmuş olarak işaretle"
 
-#: src/mainwindow.c:686 src/messageview.c:244
+#: src/mainwindow.c:695 src/messageview.c:244
 msgid "/_Message/Re-_edit"
 msgstr "/İ_leti/Ye_niden düzenle"
 
-#: src/mainwindow.c:690 src/messageview.c:248
+#: src/mainwindow.c:699 src/messageview.c:248
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/A_raçlar/Göndereni adres defterine ekle"
 
-#: src/mainwindow.c:693
+#: src/mainwindow.c:702
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/A_raçlar/_Dizin içindeki tüm iletileri filtrele"
 
-#: src/mainwindow.c:695
+#: src/mainwindow.c:704
 msgid "/_Tools/Filter _selected messages"
 msgstr "/A_raçlar/S_eçilen tüm mesajları filtrele"
 
-#: src/mainwindow.c:697 src/messageview.c:251
+#: src/mainwindow.c:706 src/messageview.c:251
 msgid "/_Tools/_Create filter rule"
 msgstr "/A_raçlar/Filtre _kuralı oluştur"
 
-#: src/mainwindow.c:698 src/messageview.c:253
+#: src/mainwindow.c:707 src/messageview.c:253
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/A_raçlar/Filtre _kuralı oluştur/_Otomatik oluştur"
 
-#: src/mainwindow.c:700 src/messageview.c:255
+#: src/mainwindow.c:709 src/messageview.c:255
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/A_raçlar/Filtre _kuralı oluştur/_Gönderene göre oluştur"
 
-#: src/mainwindow.c:702 src/messageview.c:257
+#: src/mainwindow.c:711 src/messageview.c:257
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/A_raçlar/Filtre _kuralı oluştur/_Alıcıya göre oluştur"
 
-#: src/mainwindow.c:704 src/messageview.c:259
+#: src/mainwindow.c:713 src/messageview.c:259
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/A_raçlar/Filtre _kuralı oluştur/_Konuya göre oluştur"
 
-#: src/mainwindow.c:709
+#: src/mainwindow.c:718
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/A_raçlar/Ç_ift iletileri sil"
 
-#: src/mainwindow.c:712
+#: src/mainwindow.c:721
 msgid "/_Tools/E_xecute"
 msgstr "/A_raçlar/Ç_alıştır"
 
-#: src/mainwindow.c:714
+#: src/mainwindow.c:723
 msgid "/_Tools/_Log window"
 msgstr "/A_raçlar/_Kayıt penceresi"
 
-#: src/mainwindow.c:716
+#: src/mainwindow.c:725
 msgid "/_Configuration"
 msgstr "/_Yapılandırma"
 
-#: src/mainwindow.c:717
+#: src/mainwindow.c:726
 msgid "/_Configuration/_Common preferences..."
 msgstr "/_Yapılandırma/_Genel tercihler..."
 
-#: src/mainwindow.c:719
+#: src/mainwindow.c:728
 msgid "/_Configuration/_Filter setting..."
 msgstr "/_Yapılandırma/F_iltre ayarları..."
 
-#: src/mainwindow.c:721
+#: src/mainwindow.c:730
 msgid "/_Configuration/_Template..."
 msgstr "/_Yapılandırma/Ş_ablon..."
 
-#: src/mainwindow.c:722
+#: src/mainwindow.c:731
 msgid "/_Configuration/_Actions..."
 msgstr "/_Yapılandırma/_Eylemler..."
 
-#: src/mainwindow.c:723
+#: src/mainwindow.c:732
 msgid "/_Configuration/---"
 msgstr "/_Yapılandırma/---"
 
-#: src/mainwindow.c:724
+#: src/mainwindow.c:733
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Yapılandırma/_Güncel hesap tercihleri..."
 
-#: src/mainwindow.c:726
+#: src/mainwindow.c:735
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Yapılandırma/Y_eni hesap oluştur..."
 
-#: src/mainwindow.c:728
+#: src/mainwindow.c:737
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Yapılandırma/Hesapları _düzenle..."
 
-#: src/mainwindow.c:730
+#: src/mainwindow.c:739
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Yapılandırma/_Güncel hesabı değiştir"
 
-#: src/mainwindow.c:734
+#: src/mainwindow.c:743
 msgid "/_Help/_Manual"
 msgstr "/Yardı_m/_Kılavuz"
 
-#: src/mainwindow.c:735
+#: src/mainwindow.c:744
 msgid "/_Help/_Manual/_English"
 msgstr "/Yardı_m/_Kılavuz/İ_ngilizce"
 
-#: src/mainwindow.c:736
+#: src/mainwindow.c:745
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/Yardı_m/_Kılavuz/_Japonca"
 
-#: src/mainwindow.c:737
+#: src/mainwindow.c:746
 msgid "/_Help/_FAQ"
 msgstr "/Yardı_m/_SSS"
 
-#: src/mainwindow.c:738
+#: src/mainwindow.c:747
 msgid "/_Help/_FAQ/_English"
 msgstr "/Yardı_m/_SSS/İ_ngilizce"
 
-#: src/mainwindow.c:739
+#: src/mainwindow.c:748
 msgid "/_Help/_FAQ/_German"
 msgstr "/Yardı_m/_SSS/_Almanca"
 
-#: src/mainwindow.c:740
+#: src/mainwindow.c:749
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/Yardı_m/_SSS/İ_spanyolca"
 
-#: src/mainwindow.c:741
+#: src/mainwindow.c:750
 msgid "/_Help/_FAQ/_French"
 msgstr "/Yardı_m/_SSS/_Fransızca"
 
-#: src/mainwindow.c:742
+#: src/mainwindow.c:751
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/Yardı_m/_SSS/İ_talyanca"
 
-#: src/mainwindow.c:743
+#: src/mainwindow.c:752
 msgid "/_Help/---"
 msgstr "/Yardı_m/---"
 
-#: src/mainwindow.c:783
+#: src/mainwindow.c:792
 msgid "Creating main window...\n"
 msgstr "Yeni pencere oluşturuluyor...\n"
 
-#: src/mainwindow.c:943
+#: src/mainwindow.c:952
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "AnaPencere: renk bölüştürmesi %d sırasında hata oluştu\n"
 
-#: src/mainwindow.c:1021 src/summaryview.c:1368 src/summaryview.c:1677
+#: src/mainwindow.c:1030 src/summaryview.c:1368 src/summaryview.c:1677
 #: src/summaryview.c:1785 src/summaryview.c:1831 src/summaryview.c:2453
 #: src/summaryview.c:3080 src/summaryview.c:3146 src/summaryview.c:3171
 #: src/summaryview.c:3284
 msgid "done.\n"
 msgstr "bitti.\n"
 
-#: src/mainwindow.c:1137 src/mainwindow.c:1178 src/mainwindow.c:1206
+#: src/mainwindow.c:1146 src/mainwindow.c:1187 src/mainwindow.c:1215
 msgid "Untitled"
 msgstr "Başlıksız"
 
-#: src/mainwindow.c:1207
+#: src/mainwindow.c:1216
 msgid "none"
 msgstr "hiçbiri"
 
-#: src/mainwindow.c:1257
+#: src/mainwindow.c:1266
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "Pencere ayırma tarzı %d den %d e çevriliyor\n"
 
-#: src/mainwindow.c:1477
+#: src/mainwindow.c:1486
 msgid "Offline"
 msgstr "Çevrimdışı"
 
-#: src/mainwindow.c:1478
+#: src/mainwindow.c:1487
 msgid "You are offline. Go online?"
 msgstr "Çevrimdışısınız. Çevrimiçi olunsun mu?"
 
-#: src/mainwindow.c:1492
+#: src/mainwindow.c:1501
 msgid "Empty all trash"
 msgstr "Tüm çöpü boşalt"
 
-#: src/mainwindow.c:1493
+#: src/mainwindow.c:1502
 msgid "Empty messages in all trash?"
 msgstr "Çöpteki tüm iletiler silinsin mi?"
 
-#: src/mainwindow.c:1521
+#: src/mainwindow.c:1530
 msgid "Add mailbox"
 msgstr "Posta kutusu ekle"
 
-#: src/mainwindow.c:1522
+#: src/mainwindow.c:1531
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3112,16 +3149,16 @@ msgstr ""
 "Eğer varolan potsa kutusu verilirse, otomatik\n"
 "olarak taranacaktır."
 
-#: src/mainwindow.c:1528
+#: src/mainwindow.c:1537
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "`%s' posta kutusu zaten var."
 
-#: src/mainwindow.c:1533 src/setup.c:57
+#: src/mainwindow.c:1542 src/setup.c:57
 msgid "Mailbox"
 msgstr "Posta kutusu"
 
-#: src/mainwindow.c:1539 src/setup.c:63
+#: src/mainwindow.c:1548 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3130,141 +3167,141 @@ msgstr ""
 "Posta kutusu oluşturulurken hata oluştu.\n"
 "Bazı dosyalar bulunuyor olabilir veya yeterli izine sahip olmayabilirsiniz."
 
-#: src/mainwindow.c:1912
+#: src/mainwindow.c:1921
 msgid "Sylpheed - Folder View"
 msgstr "Sylheed - Dizin Görünümü"
 
-#: src/mainwindow.c:1932 src/messageview.c:358
+#: src/mainwindow.c:1941 src/messageview.c:358
 msgid "Sylpheed - Message View"
 msgstr "Sylpeed - İleti Görünümü"
 
-#: src/mainwindow.c:2079 src/summaryview.c:340
+#: src/mainwindow.c:2088 src/summaryview.c:340
 msgid "/_Reply"
 msgstr "/_Yanıtla"
 
-#: src/mainwindow.c:2080
+#: src/mainwindow.c:2089
 msgid "/Reply to _all"
 msgstr "/Her_kese yanıtla"
 
-#: src/mainwindow.c:2081
+#: src/mainwindow.c:2090
 msgid "/Reply to _sender"
 msgstr "/_Gönderene yanıtla"
 
-#: src/mainwindow.c:2082
+#: src/mainwindow.c:2091
 msgid "/Reply to mailing _list"
 msgstr "/_E-posta listesine yanıtla"
 
-#: src/mainwindow.c:2087 src/summaryview.c:347
+#: src/mainwindow.c:2096 src/summaryview.c:347
 msgid "/_Forward"
 msgstr "/_Yönlendir"
 
-#: src/mainwindow.c:2088 src/summaryview.c:348
+#: src/mainwindow.c:2097 src/summaryview.c:348
 msgid "/For_ward as attachment"
 msgstr "/_Ek olarak yönlendir"
 
-#: src/mainwindow.c:2089 src/summaryview.c:349
+#: src/mainwindow.c:2098 src/summaryview.c:349
 msgid "/Redirec_t"
 msgstr "/Ye_niden yönlendir"
 
-#: src/mainwindow.c:2125
+#: src/mainwindow.c:2134
 msgid "Get"
 msgstr "Al"
 
-#: src/mainwindow.c:2126
+#: src/mainwindow.c:2135
 msgid "Incorporate new mail"
 msgstr "Yeni postaları dağıt"
 
-#: src/mainwindow.c:2133
+#: src/mainwindow.c:2142
 msgid "Get all"
 msgstr "Hepsini al"
 
-#: src/mainwindow.c:2134
+#: src/mainwindow.c:2143
 msgid "Incorporate new mail of all accounts"
 msgstr "Tüm hesaplardaki postaları dağıt"
 
-#: src/mainwindow.c:2145
+#: src/mainwindow.c:2154
 msgid "Send queued message(s)"
 msgstr "Kuyruktaki iletileri gönder"
 
-#: src/mainwindow.c:2155 src/prefs_account.c:705 src/prefs_common.c:852
+#: src/mainwindow.c:2164 src/prefs_account.c:705 src/prefs_common.c:852
 #: src/prefs_folder_item.c:137
 msgid "Compose"
 msgstr "Düzenle"
 
-#: src/mainwindow.c:2156
+#: src/mainwindow.c:2165
 msgid "Compose new message"
 msgstr "Yeni ileti düzenle"
 
-#: src/mainwindow.c:2164 src/prefs_common.c:1353
+#: src/mainwindow.c:2173 src/prefs_common.c:1365
 msgid "Reply"
 msgstr "Yanıtla"
 
-#: src/mainwindow.c:2165 src/mainwindow.c:2178
+#: src/mainwindow.c:2174 src/mainwindow.c:2187
 msgid "Reply to the message"
 msgstr "İletiyi yanıtla"
 
-#: src/mainwindow.c:2183
+#: src/mainwindow.c:2192
 msgid "Reply all"
 msgstr "Hepsine ynt."
 
-#: src/mainwindow.c:2184
+#: src/mainwindow.c:2193
 msgid "Reply to all"
 msgstr "Herkese yanıtla"
 
-#: src/mainwindow.c:2192 src/prefs_filter_edit.c:719
+#: src/mainwindow.c:2201 src/prefs_filter_edit.c:719
 msgid "Forward"
 msgstr "Yönlendir"
 
-#: src/mainwindow.c:2193 src/mainwindow.c:2206
+#: src/mainwindow.c:2202 src/mainwindow.c:2215
 msgid "Forward the message"
 msgstr "İletiyi yönlendir"
 
-#: src/mainwindow.c:2213
+#: src/mainwindow.c:2222
 msgid "Delete the message"
 msgstr "İletiyi sil"
 
-#: src/mainwindow.c:2221
+#: src/mainwindow.c:2230
 msgid "Execute"
 msgstr "Çalıştır"
 
-#: src/mainwindow.c:2222
+#: src/mainwindow.c:2231
 msgid "Execute marked process"
 msgstr "İşaretli süreçleri çalıştır"
 
-#: src/mainwindow.c:2231
+#: src/mainwindow.c:2240
 msgid "Next unread message"
 msgstr "Sonraki okunmamış ileti"
 
-#: src/mainwindow.c:2242
+#: src/mainwindow.c:2251
 msgid "Prefs"
 msgstr "Tercihler"
 
-#: src/mainwindow.c:2243
+#: src/mainwindow.c:2252
 msgid "Common preferences"
 msgstr "Ortak tercihler"
 
-#: src/mainwindow.c:2250 src/prefs_folder_item.c:258
+#: src/mainwindow.c:2259 src/prefs_folder_item.c:258
 #: src/prefs_folder_item.c:269 src/progressdialog.c:50
 msgid "Account"
 msgstr "Hesap"
 
-#: src/mainwindow.c:2251
+#: src/mainwindow.c:2260
 msgid "Account setting"
 msgstr "Hesap ayarları"
 
-#: src/mainwindow.c:2425
+#: src/mainwindow.c:2434
 msgid "You are offline. Click the icon to go online."
 msgstr "Çevrimdışısınız. Çevrimiçi olmak için simgeye tıklayın."
 
-#: src/mainwindow.c:2436
+#: src/mainwindow.c:2445
 msgid "You are online. Click the icon to go offline."
 msgstr "Çevrimiçisiniz. Çevrimdışı olmak için simgeye tıklayın."
 
-#: src/mainwindow.c:2624
+#: src/mainwindow.c:2633
 msgid "Exit"
 msgstr "Çık"
 
-#: src/mainwindow.c:2624
+#: src/mainwindow.c:2633
 msgid "Exit this program?"
 msgstr "Programdan çıkılsın mı?"
 
@@ -3391,7 +3428,7 @@ msgstr "Arama tamamlandı"
 msgid "Creating message view...\n"
 msgstr "İleti görüntüsü oluşturuluyor...\n"
 
-#: src/messageview.c:303 src/prefs_common.c:1550
+#: src/messageview.c:303 src/prefs_common.c:1562
 msgid "Text"
 msgstr "Metin"
 
@@ -3404,7 +3441,7 @@ msgstr "Ekler"
 msgid "Can't save the file `%s'."
 msgstr "`%s' dosyası kaydedilemedi."
 
-#: src/messageview.c:697 src/prefs_common.c:2154 src/summaryview.c:2744
+#: src/messageview.c:697 src/prefs_common.c:2166 src/summaryview.c:2744
 msgid "Print"
 msgstr "Yazdır"
 
@@ -3877,7 +3914,7 @@ msgstr "(Filtrelenmemiş iletiler bu kutuda bekleyecektir)"
 msgid "Authentication method"
 msgstr "Kimlik denetim yöntemi"
 
-#: src/prefs_account.c:1123 src/prefs_account.c:1239 src/prefs_common.c:1189
+#: src/prefs_account.c:1123 src/prefs_account.c:1239 src/prefs_common.c:1201
 msgid "Automatic"
 msgstr "Otomatik"
 
@@ -3901,7 +3938,7 @@ msgstr "İleti Numarası Oluştur"
 msgid "Add user-defined header"
 msgstr "Kullanıcı tanımlı başlık ekle"
 
-#: src/prefs_account.c:1196 src/prefs_common.c:1714 src/prefs_common.c:1739
+#: src/prefs_account.c:1196 src/prefs_common.c:1726 src/prefs_common.c:1751
 msgid " Edit... "
 msgstr " Düzenle... "
 
@@ -4298,106 +4335,107 @@ msgid "Save sent messages to outbox"
 msgstr "Gönderilen iletileri giden kutusuna kaydet"
 
 #: src/prefs_common.c:1113
-msgid "Outgoing codeset"
+#, fuzzy
+msgid "Outgoing encoding"
 msgstr "Giden ileti kod kümesi"
 
 #: src/prefs_common.c:1128
 msgid "Automatic (Recommended)"
 msgstr "Otomatik (Önerilen)"
 
-#: src/prefs_common.c:1129
+#: src/prefs_common.c:1130
 msgid "7bit ascii (US-ASCII)"
 msgstr "7bit ascii (US-ASCII)"
 
-#: src/prefs_common.c:1130
+#: src/prefs_common.c:1132
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
-#: src/prefs_common.c:1131
+#: src/prefs_common.c:1134
 msgid "Western European (ISO-8859-1)"
 msgstr "Batı Avrupa (ISO-8859-1)"
 
-#: src/prefs_common.c:1132
+#: src/prefs_common.c:1135
 msgid "Western European (ISO-8859-15)"
 msgstr "Batı Avrupa (ISO-8859-15)"
 
-#: src/prefs_common.c:1133
+#: src/prefs_common.c:1137
 msgid "Central European (ISO-8859-2)"
 msgstr "Orta Avrupa (ISO-8859-2)"
 
-#: src/prefs_common.c:1134
+#: src/prefs_common.c:1139
 msgid "Baltic (ISO-8859-13)"
 msgstr "Baltık (ISO-8859-13)"
 
-#: src/prefs_common.c:1135
+#: src/prefs_common.c:1140
 msgid "Baltic (ISO-8859-4)"
 msgstr "Baltık (ISO-8859-4)"
 
-#: src/prefs_common.c:1136
+#: src/prefs_common.c:1142
 msgid "Greek (ISO-8859-7)"
 msgstr "Yunanca (ISO-8859-7)"
 
-#: src/prefs_common.c:1137
+#: src/prefs_common.c:1144
 msgid "Turkish (ISO-8859-9)"
 msgstr "Türkçe (ISO-8859-9)"
 
-#: src/prefs_common.c:1138
+#: src/prefs_common.c:1146
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Kiril (ISO-8859-5)"
 
-#: src/prefs_common.c:1139
+#: src/prefs_common.c:1147
 msgid "Cyrillic (KOI8-R)"
 msgstr "Kiril (KOI8-R)"
 
-#: src/prefs_common.c:1140
-msgid "Cyrillic (Windows-1251)"
-msgstr "Kiril (Windows-1251)"
-
-#: src/prefs_common.c:1141
+#: src/prefs_common.c:1148
 msgid "Cyrillic (KOI8-U)"
 msgstr "Kiril (KOI8-U)"
 
-#: src/prefs_common.c:1142
+#: src/prefs_common.c:1149
+msgid "Cyrillic (Windows-1251)"
+msgstr "Kiril (Windows-1251)"
+
+#: src/prefs_common.c:1151
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Japonca (ISO-2022-JP)"
 
-#: src/prefs_common.c:1144
+#: src/prefs_common.c:1153
 msgid "Japanese (EUC-JP)"
 msgstr "Japonca (EUC-JP)"
 
-#: src/prefs_common.c:1145
+#: src/prefs_common.c:1154
 msgid "Japanese (Shift_JIS)"
 msgstr "Japonca (Shift_JIS)"
 
-#: src/prefs_common.c:1147
+#: src/prefs_common.c:1157
 msgid "Simplified Chinese (GB2312)"
 msgstr "Basitleştirilmiş Çince (GB2312)"
 
-#: src/prefs_common.c:1148
+#: src/prefs_common.c:1158
 msgid "Traditional Chinese (Big5)"
 msgstr "Geleneksel Çince (Big5)"
 
-#: src/prefs_common.c:1150
+#: src/prefs_common.c:1160
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Geleneksel Çince (EUC-TW)"
 
-#: src/prefs_common.c:1151
+#: src/prefs_common.c:1161
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Çince (ISO-2022-CN)"
 
-#: src/prefs_common.c:1153
+#: src/prefs_common.c:1164
 msgid "Korean (EUC-KR)"
 msgstr "Korece (EUC-KR)"
 
-#: src/prefs_common.c:1154
+#: src/prefs_common.c:1166
 msgid "Thai (TIS-620)"
 msgstr "Tayca (TIS-620)"
 
-#: src/prefs_common.c:1155
+#: src/prefs_common.c:1167
 msgid "Thai (Windows-874)"
 msgstr "Tayca (Windows-874)"
 
-#: src/prefs_common.c:1165
+#: src/prefs_common.c:1177
 #, fuzzy
 msgid ""
 "If `Automatic' is selected, the optimal encoding for the current locale will "
@@ -4406,11 +4444,11 @@ msgstr ""
 "Eğer 'Otomatik' seçili ise yerelde kullanılan kod\n"
 "kümesi kullanılacaktır."
 
-#: src/prefs_common.c:1179
+#: src/prefs_common.c:1191
 msgid "Transfer encoding"
 msgstr "Transfer kod kümesi"
 
-#: src/prefs_common.c:1202
+#: src/prefs_common.c:1214
 #, fuzzy
 msgid ""
 "Specify Content-Transfer-Encoding used when message body contains non-ASCII "
@@ -4419,118 +4457,118 @@ msgstr ""
 "Mesaj gövdesi ASCII karakter içermediği zaman kullanılacak\n"
 "İçerik Transfer Kodlamasını seçiniz."
 
-#: src/prefs_common.c:1272
+#: src/prefs_common.c:1284
 msgid "Signature separator"
 msgstr "İmza ayıracı"
 
-#: src/prefs_common.c:1281
+#: src/prefs_common.c:1293
 msgid "Insert automatically"
 msgstr "Otomatik ekle"
 
-#: src/prefs_common.c:1291
+#: src/prefs_common.c:1303
 msgid "Automatically launch the external editor"
 msgstr "Harici düzenleyici otomatik çalıştır"
 
-#: src/prefs_common.c:1301
+#: src/prefs_common.c:1313
 msgid "Undo level"
 msgstr "Geri alma seviyesi"
 
-#: src/prefs_common.c:1321
+#: src/prefs_common.c:1333
 msgid "Wrap messages at"
 msgstr "İletileri kaydır: "
 
-#: src/prefs_common.c:1333
+#: src/prefs_common.c:1345
 msgid "characters"
 msgstr "karakter"
 
-#: src/prefs_common.c:1343
+#: src/prefs_common.c:1355
 msgid "Wrap quotation"
 msgstr "Alıntı Kaydırması"
 
-#: src/prefs_common.c:1349
+#: src/prefs_common.c:1361
 msgid "Wrap on input"
 msgstr "Girdide Kaydır"
 
-#: src/prefs_common.c:1351
+#: src/prefs_common.c:1363
 msgid "Wrap before sending"
 msgstr "Göndermeden önce kaydır"
 
-#: src/prefs_common.c:1361
+#: src/prefs_common.c:1373
 msgid "Automatically select account for replies"
 msgstr "Yanıtlamalarda hesabı otomatik seç"
 
-#: src/prefs_common.c:1363
+#: src/prefs_common.c:1375
 msgid "Quote message when replying"
 msgstr "Yanıtlarken alıntı yap"
 
-#: src/prefs_common.c:1365
+#: src/prefs_common.c:1377
 msgid "Reply button invokes mailing list reply"
 msgstr "Yanıtla tuşu eposta listelerine de yanıtlasın"
 
 #. reply
-#: src/prefs_common.c:1411
+#: src/prefs_common.c:1423
 msgid "Reply format"
 msgstr "Yanıtlama formatı"
 
-#: src/prefs_common.c:1426 src/prefs_common.c:1468
+#: src/prefs_common.c:1438 src/prefs_common.c:1480
 msgid "Quotation mark"
 msgstr "Alıntı işareti"
 
 #. forward
-#: src/prefs_common.c:1453
+#: src/prefs_common.c:1465
 msgid "Forward format"
 msgstr "Yönlendirme biçimi"
 
-#: src/prefs_common.c:1500
+#: src/prefs_common.c:1512
 msgid " Description of symbols "
 msgstr " Sembollerin açıklaması "
 
-#: src/prefs_common.c:1541
+#: src/prefs_common.c:1553
 msgid "Font"
 msgstr "Yazıtipi"
 
-#: src/prefs_common.c:1573
+#: src/prefs_common.c:1585
 msgid "Translate header name (such as `From:', `Subject:')"
 msgstr "Başlık adlarını çevir('Kimden','Konu' gibi)"
 
-#: src/prefs_common.c:1576
+#: src/prefs_common.c:1588
 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.c:1585
+#: src/prefs_common.c:1597
 msgid "Abbreviate newsgroups longer than"
 msgstr "Belirtilenden daha uzun olan haber gruplarını kısalt"
 
-#: src/prefs_common.c:1600
+#: src/prefs_common.c:1612
 msgid "letters"
 msgstr "posta"
 
 #. ---- Summary ----
-#: src/prefs_common.c:1606
+#: src/prefs_common.c:1618
 msgid "Summary View"
 msgstr "Özet Görünüm"
 
-#: src/prefs_common.c:1615
+#: src/prefs_common.c:1627
 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.c:1617
+#: src/prefs_common.c:1629
 msgid "Expand threads"
 msgstr "Dizileri Genişlet"
 
-#: src/prefs_common.c:1625 src/prefs_common.c:2443 src/prefs_common.c:2481
+#: src/prefs_common.c:1637 src/prefs_common.c:2455 src/prefs_common.c:2493
 msgid "Date format"
 msgstr "Tarih biçimi"
 
-#: src/prefs_common.c:1646
+#: src/prefs_common.c:1658
 msgid " Set display item of summary... "
 msgstr " Özetin görüntü nesnesini belirt"
 
-#: src/prefs_common.c:1710
+#: src/prefs_common.c:1722
 msgid "Enable coloration of message"
 msgstr "İletileri renklendir"
 
-#: src/prefs_common.c:1724
+#: src/prefs_common.c:1736
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
@@ -4538,323 +4576,323 @@ msgstr ""
 "Çok bytelı alfabe veya numaraları \n"
 "ASCII karakter olarak göster(Sadece Japonca)"
 
-#: src/prefs_common.c:1730
+#: src/prefs_common.c:1742
 msgid "Display header pane above message view"
 msgstr "Postaları gösterirken üst kısımda başlıkları göster"
 
-#: src/prefs_common.c:1737
+#: src/prefs_common.c:1749
 msgid "Display short headers on message view"
 msgstr "Postaları gösterirken kısa başlıkları göster"
 
-#: src/prefs_common.c:1758
+#: src/prefs_common.c:1770
 msgid "Line space"
 msgstr "Satır boşluğu"
 
-#: src/prefs_common.c:1772 src/prefs_common.c:1810
+#: src/prefs_common.c:1784 src/prefs_common.c:1822
 msgid "pixel(s)"
 msgstr "benek"
 
-#: src/prefs_common.c:1777
+#: src/prefs_common.c:1789
 msgid "Scroll"
 msgstr "Kaydır"
 
-#: src/prefs_common.c:1784
+#: src/prefs_common.c:1796
 msgid "Half page"
 msgstr "Yarım sayfa"
 
-#: src/prefs_common.c:1790
+#: src/prefs_common.c:1802
 msgid "Smooth scroll"
 msgstr "Yumuşak kaydır"
 
-#: src/prefs_common.c:1796
+#: src/prefs_common.c:1808
 msgid "Step"
 msgstr "Adım"
 
-#: src/prefs_common.c:1816
+#: src/prefs_common.c:1828
 msgid "Images"
 msgstr ""
 
-#: src/prefs_common.c:1824
+#: src/prefs_common.c:1836
 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.c:1826
+#: src/prefs_common.c:1838
 #, fuzzy
 msgid "Display images as inline"
 msgstr "Görüntü başlığı ayarları"
 
-#: src/prefs_common.c:1871
+#: src/prefs_common.c:1883
 msgid "Automatically check signatures"
 msgstr "İmzaları otomatik denetle"
 
-#: src/prefs_common.c:1874
+#: src/prefs_common.c:1886
 msgid "Show signature check result in a popup window"
 msgstr "İmza kontrol sonuçlarını ek pencerede göster"
 
-#: src/prefs_common.c:1877
+#: src/prefs_common.c:1889
 msgid "Store passphrase in memory temporarily"
 msgstr "Parolayı geçici olarak hafızada sakla"
 
-#: src/prefs_common.c:1892
+#: src/prefs_common.c:1904
 msgid "Expired after"
 msgstr "Belirtilen süre sonra geçerliliğini yitir"
 
-#: src/prefs_common.c:1905
+#: src/prefs_common.c:1917
 msgid "minute(s) "
 msgstr " dakikada"
 
-#: src/prefs_common.c:1918
+#: src/prefs_common.c:1930
 #, 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.c:1932
+#: src/prefs_common.c:1944
 msgid "Grab input while entering a passphrase"
 msgstr "Parolayı girerken girdiyi yakala"
 
-#: src/prefs_common.c:1937
+#: src/prefs_common.c:1949
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "GnuPG çalışmazsa başlangıçta uyarı mesajı göster"
 
-#: src/prefs_common.c:1989
+#: src/prefs_common.c:2001
 msgid "Always open messages in summary when selected"
 msgstr "Mesajlar seçildiğinde her zaman özet halinda göster"
 
-#: src/prefs_common.c:1993
+#: src/prefs_common.c:2005
 msgid "Open first unread message when entering a folder"
 msgstr "Bir dizine girildiğinde ilk okunmamış iletiyi aç"
 
-#: src/prefs_common.c:1997
+#: src/prefs_common.c:2009
 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.c:2001
+#: src/prefs_common.c:2013
 msgid "Go to inbox after receiving new mail"
 msgstr "İleti geldiğinde gelen kutusuna git"
 
-#: src/prefs_common.c:2009
+#: src/prefs_common.c:2021
 msgid "Execute immediately when moving or deleting messages"
 msgstr "Postayı silerken ve taşırken çalıştır"
 
-#: src/prefs_common.c:2021
+#: src/prefs_common.c:2033
 #, 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.c:2029
+#: src/prefs_common.c:2041
 msgid "Receive dialog"
 msgstr "Alma penceresi"
 
-#: src/prefs_common.c:2039
+#: src/prefs_common.c:2051
 msgid "Show receive dialog"
 msgstr "Alma penceresini göster"
 
-#: src/prefs_common.c:2049
+#: src/prefs_common.c:2061
 msgid "Always"
 msgstr "Her zaman"
 
-#: src/prefs_common.c:2050
+#: src/prefs_common.c:2062
 msgid "Only on manual receiving"
 msgstr "Sadece kullanıcı kendi aldığında"
 
-#: src/prefs_common.c:2052
+#: src/prefs_common.c:2064
 msgid "Never"
 msgstr "Hiç bir zaman"
 
-#: src/prefs_common.c:2057
+#: src/prefs_common.c:2069
 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.c:2060
+#: src/prefs_common.c:2072
 msgid "Close receive dialog when finished"
 msgstr "İşlemler tamamlandığında alma penceresini kapat"
 
-#: src/prefs_common.c:2066
+#: src/prefs_common.c:2078
 msgid " Set key bindings... "
 msgstr " Tuş kombinasyonları..."
 
-#: src/prefs_common.c:2122
+#: src/prefs_common.c:2134
 #, 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.c:2131
+#: src/prefs_common.c:2143
 msgid "Web browser"
 msgstr "Tarayıcı"
 
-#: src/prefs_common.c:2195
+#: src/prefs_common.c:2207
 msgid "Add address to destination when double-clicked"
 msgstr "Çift tıklandığında adresi hedefe ekle"
 
-#: src/prefs_common.c:2197
+#: src/prefs_common.c:2209
 msgid "On exit"
 msgstr "Çıkışta"
 
-#: src/prefs_common.c:2205
+#: src/prefs_common.c:2217
 msgid "Confirm on exit"
 msgstr "Çıkışta sor"
 
-#: src/prefs_common.c:2212
+#: src/prefs_common.c:2224
 msgid "Empty trash on exit"
 msgstr "Çıkışta çöpü boşalt"
 
-#: src/prefs_common.c:2214
+#: src/prefs_common.c:2226
 msgid "Ask before emptying"
 msgstr "Boşaltmadan önce sor"
 
-#: src/prefs_common.c:2218
+#: src/prefs_common.c:2230
 msgid "Warn if there are queued messages"
 msgstr "Kuyrukta ileti varsa uyar"
 
-#: src/prefs_common.c:2224
+#: src/prefs_common.c:2236
 msgid "Socket I/O timeout:"
 msgstr "Soket I/O zaman aşımı:"
 
-#: src/prefs_common.c:2237
+#: src/prefs_common.c:2249
 msgid "second(s)"
 msgstr "saniye"
 
-#: src/prefs_common.c:2419
+#: src/prefs_common.c:2431
 msgid "the full abbreviated weekday name"
 msgstr "kısa hafta adı"
 
-#: src/prefs_common.c:2420
+#: src/prefs_common.c:2432
 msgid "the full weekday name"
 msgstr "tam hafta adı"
 
-#: src/prefs_common.c:2421
+#: src/prefs_common.c:2433
 msgid "the abbreviated month name"
 msgstr "kısa ay adı"
 
-#: src/prefs_common.c:2422
+#: src/prefs_common.c:2434
 msgid "the full month name"
 msgstr "tam ay adı"
 
-#: src/prefs_common.c:2423
+#: src/prefs_common.c:2435
 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.c:2424
+#: src/prefs_common.c:2436
 msgid "the century number (year/100)"
 msgstr "yüzyıl numarası (yıl/100)"
 
-#: src/prefs_common.c:2425
+#: src/prefs_common.c:2437
 msgid "the day of the month as a decimal number"
 msgstr "sayı değerinde ayın günü"
 
-#: src/prefs_common.c:2426
+#: src/prefs_common.c:2438
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "24 saatlik format kullanılarak saat"
 
-#: src/prefs_common.c:2427
+#: src/prefs_common.c:2439
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "12 saatlik format kullanılarak saat"
 
-#: src/prefs_common.c:2428
+#: src/prefs_common.c:2440
 msgid "the day of the year as a decimal number"
 msgstr "yılın gününün sayı değeri"
 
-#: src/prefs_common.c:2429
+#: src/prefs_common.c:2441
 msgid "the month as a decimal number"
 msgstr "ay sayı değerinde"
 
-#: src/prefs_common.c:2430
+#: src/prefs_common.c:2442
 msgid "the minute as a decimal number"
 msgstr "dakika"
 
-#: src/prefs_common.c:2431
+#: src/prefs_common.c:2443
 msgid "either AM or PM"
 msgstr "AM veya PM"
 
-#: src/prefs_common.c:2432
+#: src/prefs_common.c:2444
 msgid "the second as a decimal number"
 msgstr "saniye"
 
-#: src/prefs_common.c:2433
+#: src/prefs_common.c:2445
 msgid "the day of the week as a decimal number"
 msgstr "haftanın günü"
 
-#: src/prefs_common.c:2434
+#: src/prefs_common.c:2446
 msgid "the preferred date for the current locale"
 msgstr "tercih edilen yerek saat"
 
-#: src/prefs_common.c:2435
+#: src/prefs_common.c:2447
 msgid "the last two digits of a year"
 msgstr "yılın son iki rakamı"
 
-#: src/prefs_common.c:2436
+#: src/prefs_common.c:2448
 msgid "the year as a decimal number"
 msgstr "yıl"
 
-#: src/prefs_common.c:2437
+#: src/prefs_common.c:2449
 msgid "the time zone or name or abbreviation"
 msgstr "Zaman dilimi veya adı"
 
-#: src/prefs_common.c:2458
+#: src/prefs_common.c:2470
 msgid "Specifier"
 msgstr "Belirtici"
 
-#: src/prefs_common.c:2459
+#: src/prefs_common.c:2471
 msgid "Description"
 msgstr "Tanım"
 
-#: src/prefs_common.c:2499
+#: src/prefs_common.c:2511
 msgid "Example"
 msgstr "Örnek"
 
-#: src/prefs_common.c:2580
+#: src/prefs_common.c:2592
 msgid "Set message colors"
 msgstr "Posta renklerini belirt"
 
-#: src/prefs_common.c:2588
+#: src/prefs_common.c:2600
 msgid "Colors"
 msgstr "Renkler"
 
-#: src/prefs_common.c:2622
+#: src/prefs_common.c:2634
 msgid "Quoted Text - First Level"
 msgstr "Birinci derecen alıntı metin"
 
-#: src/prefs_common.c:2628
+#: src/prefs_common.c:2640
 msgid "Quoted Text - Second Level"
 msgstr "İkinci dereceden alıntı metin"
 
-#: src/prefs_common.c:2634
+#: src/prefs_common.c:2646
 msgid "Quoted Text - Third Level"
 msgstr "Üçüncü dereceden alıntı metin"
 
-#: src/prefs_common.c:2640
+#: src/prefs_common.c:2652
 msgid "URI link"
 msgstr "URL bağlantısı"
 
-#: src/prefs_common.c:2647
+#: src/prefs_common.c:2659
 msgid "Recycle quote colors"
 msgstr "Alıntı renklerini dönüştür"
 
-#: src/prefs_common.c:2707
+#: src/prefs_common.c:2719
 msgid "Pick color for quotation level 1"
 msgstr "Birinci dereceden alıntı rengini seçiniz"
 
-#: src/prefs_common.c:2710
+#: src/prefs_common.c:2722
 msgid "Pick color for quotation level 2"
 msgstr "İkinci dereceden alıntı rengini seçiniz"
 
-#: src/prefs_common.c:2713
+#: src/prefs_common.c:2725
 msgid "Pick color for quotation level 3"
 msgstr "Üçüncü dereceden alıntı rengini seçiniz"
 
-#: src/prefs_common.c:2716
+#: src/prefs_common.c:2728
 msgid "Pick color for URI"
 msgstr "URL için renk seçiniz"
 
-#: src/prefs_common.c:2853
+#: src/prefs_common.c:2865
 msgid "Description of symbols"
 msgstr "sembollerin açıklamaları"
 
-#: src/prefs_common.c:2909
+#: src/prefs_common.c:2921
 msgid ""
 "Date\n"
 "From\n"
@@ -4877,11 +4915,11 @@ msgstr ""
 "Habergrubu\n"
 "Mesaj Nosu"
 
-#: src/prefs_common.c:2922
+#: src/prefs_common.c:2934
 msgid "If x is set, displays expr"
 msgstr "Eğer x belirtilmişse expr göster"
 
-#: src/prefs_common.c:2926
+#: src/prefs_common.c:2938
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -4895,7 +4933,7 @@ msgstr ""
 "İmzasız alıntı yapılan metin\n"
 "Tam %"
 
-#: src/prefs_common.c:2934
+#: src/prefs_common.c:2946
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -4907,15 +4945,15 @@ msgstr ""
 "Tam <\n"
 "Tam >"
 
-#: src/prefs_common.c:2971
+#: src/prefs_common.c:2983
 msgid "Font selection"
 msgstr "Yazıtipi seçimi"
 
-#: src/prefs_common.c:3035
+#: src/prefs_common.c:3047
 msgid "Key bindings"
 msgstr "Tuş bağıntıları"
 
-#: src/prefs_common.c:3049
+#: src/prefs_common.c:3061
 msgid ""
 "Select the preset of key bindings.\n"
 "You can also modify each menu's shortcuts by pressing\n"
@@ -4925,11 +4963,11 @@ msgstr ""
 "Ayrıca menüde mousunuzun imleci üzerindeyken herhangi bir tuşa\n"
 "basarak nesnelerin kısayollarını değiştirebilirsiniz."
 
-#: src/prefs_common.c:3061 src/prefs_common.c:3410
+#: src/prefs_common.c:3073 src/prefs_common.c:3422
 msgid "Default"
 msgstr "Öntanımlı"
 
-#: src/prefs_common.c:3064 src/prefs_common.c:3419
+#: src/prefs_common.c:3076 src/prefs_common.c:3431
 msgid "Old Sylpheed"
 msgstr "Eski Sylpheed"
 
@@ -6069,6 +6107,12 @@ msgstr "%.2fGB"
 msgid "writing to %s failed.\n"
 msgstr "yazarken hata oluştu: %s\n"
 
+#~ msgid "/_View/_Code set/---"
+#~ msgstr "/_Görünüm/_Kodlama/---"
+
+#~ msgid "/_View/_Code set"
+#~ msgstr "/_Görünüm/_Kodlama"
+
 #~ msgid "To save this part, pop up the context menu with "
 #~ msgstr "Bu bölümü kaydetmek için, üstteki pencerede işaretli "
 
diff --git a/po/uk.po b/po/uk.po
index 264259c4..0375b6f0 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed 1.0.0beta1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-03-15 14:29+0900\n"
+"POT-Creation-Date: 2005-03-16 14:47+0900\n"
 "PO-Revision-Date: Sun 31 Oct 2004 23:17:57\n"
 "Last-Translator: O. Nykyforchyn <nick@pu.if,ua>, 2004.\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
@@ -100,7 +100,7 @@ msgstr ""
 "account'и, які поповнюються через `Отримати всі'."
 
 #: src/account.c:638 src/addressadd.c:186 src/addressbook.c:488
-#: src/compose.c:3650 src/editaddress.c:195 src/editaddress.c:936
+#: src/compose.c:3748 src/editaddress.c:195 src/editaddress.c:936
 #: src/editaddress.c:984 src/editbook.c:191 src/editgroup.c:257
 #: src/editjpilot.c:296 src/editldap.c:300 src/editvcard.c:211
 #: src/mimeview.c:151 src/prefs_filter.c:214 src/prefs_folder_item.c:170
@@ -153,13 +153,13 @@ msgstr "Видалити обліковий запис"
 msgid "Do you really want to delete this account?"
 msgstr "Ви дійсно бажаєте видалити цей запис?"
 
-#: src/account.c:758 src/compose.c:2551 src/compose.c:4807
+#: src/account.c:758 src/compose.c:2632 src/compose.c:4943
 #: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
 #: src/folderview.c:2156 src/folderview.c:2192
 msgid "Yes"
 msgstr "Авжеж"
 
-#: src/account.c:758 src/compose.c:2551 src/compose.c:4807
+#: src/account.c:758 src/compose.c:2632 src/compose.c:4943
 #: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
 #: src/folderview.c:2156 src/folderview.c:2192
 msgid "+No"
@@ -264,7 +264,7 @@ msgstr "Аргумент користувача"
 msgid "Add Address to Book"
 msgstr "Додати адресу до книги"
 
-#: src/addressadd.c:196 src/compose.c:4191 src/editaddress.c:196
+#: src/addressadd.c:196 src/compose.c:4292 src/editaddress.c:196
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "Адреса"
@@ -278,7 +278,7 @@ msgstr "Нотатки"
 msgid "Select Address Book Folder"
 msgstr "Обрати папку адресної книги"
 
-#: src/addressbook.c:334 src/compose.c:469 src/mainwindow.c:454
+#: src/addressbook.c:334 src/compose.c:477 src/mainwindow.c:454
 #: src/messageview.c:134
 msgid "/_File"
 msgstr "/Файл"
@@ -299,8 +299,8 @@ msgstr "/Файл/Новий JPilot"
 msgid "/_File/New _Server"
 msgstr "/Файл/Новий сервер"
 
-#: src/addressbook.c:343 src/addressbook.c:346 src/compose.c:474
-#: src/compose.c:479 src/compose.c:483 src/mainwindow.c:471
+#: src/addressbook.c:343 src/addressbook.c:346 src/compose.c:482
+#: src/compose.c:487 src/compose.c:491 src/mainwindow.c:471
 #: src/mainwindow.c:474 src/mainwindow.c:476 src/mainwindow.c:479
 #: src/mainwindow.c:481 src/messageview.c:137
 msgid "/_File/---"
@@ -318,7 +318,7 @@ msgstr "/Файл/Видалити"
 msgid "/_File/_Save"
 msgstr "/Файл/Зберегти"
 
-#: src/addressbook.c:348 src/compose.c:484 src/messageview.c:138
+#: src/addressbook.c:348 src/compose.c:492 src/messageview.c:138
 msgid "/_File/_Close"
 msgstr "/Файл/Закрити"
 
@@ -350,7 +350,7 @@ msgstr "/Адреса/Редагувати"
 msgid "/_Address/_Delete"
 msgstr "/Адреса/Видалити"
 
-#: src/addressbook.c:356 src/compose.c:585 src/mainwindow.c:688
+#: src/addressbook.c:356 src/compose.c:664 src/mainwindow.c:697
 #: src/messageview.c:246
 msgid "/_Tools"
 msgstr "/Інструменти"
@@ -359,12 +359,12 @@ msgstr "/Інструменти"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/Інструменти/Імпортувати файл LDIF"
 
-#: src/addressbook.c:358 src/compose.c:598 src/mainwindow.c:733
+#: src/addressbook.c:358 src/compose.c:677 src/mainwindow.c:742
 #: src/messageview.c:264
 msgid "/_Help"
 msgstr "/Допомога"
 
-#: src/addressbook.c:359 src/compose.c:599 src/mainwindow.c:744
+#: src/addressbook.c:359 src/compose.c:678 src/mainwindow.c:753
 #: src/messageview.c:265
 msgid "/_Help/_About"
 msgstr "/Допомога/Про програму"
@@ -381,7 +381,7 @@ msgstr "/Нова група"
 msgid "/New _Folder"
 msgstr "/Нова папка"
 
-#: src/addressbook.c:381 src/addressbook.c:391 src/compose.c:463
+#: src/addressbook.c:381 src/addressbook.c:391 src/compose.c:471
 #: src/folderview.c:220 src/folderview.c:222 src/folderview.c:226
 #: src/folderview.c:236 src/folderview.c:238 src/folderview.c:240
 #: src/folderview.c:244 src/folderview.c:254 src/folderview.c:256
@@ -391,7 +391,7 @@ msgstr "/Нова папка"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:382 src/addressbook.c:392 src/compose.c:486
+#: src/addressbook.c:382 src/addressbook.c:392 src/compose.c:494
 #: src/mainwindow.c:485 src/messageview.c:140
 msgid "/_Edit"
 msgstr "/Редагувати"
@@ -404,7 +404,7 @@ msgstr "/Видалити"
 msgid "E-Mail address"
 msgstr "Адреса e-mail"
 
-#: src/addressbook.c:493 src/compose.c:4192 src/prefs_common.c:2186
+#: src/addressbook.c:493 src/compose.c:4293 src/prefs_common.c:2198
 msgid "Address book"
 msgstr "Адресна книга"
 
@@ -414,7 +414,7 @@ msgstr "Ім'я:"
 
 #. Buttons
 #: src/addressbook.c:625 src/addressbook.c:1665 src/addressbook.c:1671
-#: src/editaddress.c:878 src/editaddress.c:1011 src/mainwindow.c:2212
+#: src/editaddress.c:878 src/editaddress.c:1011 src/mainwindow.c:2221
 #: src/prefs_actions.c:263 src/prefs_display_header.c:275
 #: src/prefs_display_header.c:330 src/prefs_template.c:227
 msgid "Delete"
@@ -601,7 +601,7 @@ msgstr "Адреса організації"
 msgid "Personal address"
 msgstr "Особиста адреса"
 
-#: src/alertpanel.c:123 src/compose.c:4807 src/main.c:458
+#: src/alertpanel.c:123 src/compose.c:4943 src/main.c:458
 msgid "Notice"
 msgstr "Примітка"
 
@@ -609,7 +609,7 @@ msgstr "Примітка"
 msgid "Warning"
 msgstr "Попередження"
 
-#: src/alertpanel.c:149 src/compose.c:2551 src/inc.c:558
+#: src/alertpanel.c:149 src/compose.c:2632 src/inc.c:558
 msgid "Error"
 msgstr "Помилка"
 
@@ -657,299 +657,417 @@ msgstr "Коричневий"
 msgid "None"
 msgstr "Ніякий"
 
-#: src/compose.c:461
+#: src/compose.c:469
 msgid "/_Add..."
 msgstr "/Додати..."
 
-#: src/compose.c:462
+#: src/compose.c:470
 msgid "/_Remove"
 msgstr "/Видалити"
 
-#: src/compose.c:464 src/folderview.c:228 src/folderview.c:246
+#: src/compose.c:472 src/folderview.c:228 src/folderview.c:246
 #: src/folderview.c:261
 msgid "/_Properties..."
 msgstr "/Властивості..."
 
-#: src/compose.c:470
+#: src/compose.c:478
 msgid "/_File/_Send"
 msgstr "/Файл/Послати"
 
-#: src/compose.c:472
+#: src/compose.c:480
 msgid "/_File/Send _later"
 msgstr "/Файл/Послати пізніше"
 
-#: src/compose.c:475
+#: src/compose.c:483
 msgid "/_File/Save to _draft folder"
 msgstr "/Файл/Зберегти в папці чорновиків"
 
-#: src/compose.c:477
+#: src/compose.c:485
 msgid "/_File/Save and _keep editing"
 msgstr "/Файл/Зберегти і редагувати далі"
 
-#: src/compose.c:480
+#: src/compose.c:488
 msgid "/_File/_Attach file"
 msgstr "/Файл/Приєднати файл"
 
-#: src/compose.c:481
+#: src/compose.c:489
 msgid "/_File/_Insert file"
 msgstr "/Файл/Вставити файл"
 
-#: src/compose.c:482
+#: src/compose.c:490
 msgid "/_File/Insert si_gnature"
 msgstr "/Файл/Вставити підпис"
 
-#: src/compose.c:487
+#: src/compose.c:495
 msgid "/_Edit/_Undo"
 msgstr "/Редагувати/Undo"
 
-#: src/compose.c:488
+#: src/compose.c:496
 msgid "/_Edit/_Redo"
 msgstr "/Редагувати/Redo"
 
-#: src/compose.c:489 src/compose.c:567 src/mainwindow.c:489
+#: src/compose.c:497 src/compose.c:575 src/mainwindow.c:489
 #: src/messageview.c:143
 msgid "/_Edit/---"
 msgstr "/Редагувати/---"
 
-#: src/compose.c:490
+#: src/compose.c:498
 msgid "/_Edit/Cu_t"
 msgstr "/Редагувати/Вирізати"
 
-#: src/compose.c:491 src/mainwindow.c:486 src/messageview.c:141
+#: src/compose.c:499 src/mainwindow.c:486 src/messageview.c:141
 msgid "/_Edit/_Copy"
 msgstr "/Редагувати/Копіювати"
 
-#: src/compose.c:492
+#: src/compose.c:500
 msgid "/_Edit/_Paste"
 msgstr "/Редагувати/Вставити"
 
-#: src/compose.c:493
+#: src/compose.c:501
 msgid "/_Edit/Paste as _quotation"
 msgstr "/Редагувати/Вставити як цитату"
 
-#: src/compose.c:495 src/mainwindow.c:487 src/messageview.c:142
+#: src/compose.c:503 src/mainwindow.c:487 src/messageview.c:142
 msgid "/_Edit/Select _all"
 msgstr "/Редагувати/Виділити все"
 
-#: src/compose.c:496
+#: src/compose.c:504
 msgid "/_Edit/A_dvanced"
 msgstr "/Редагувати/Advanced"
 
-#: src/compose.c:497
+#: src/compose.c:505
 msgid "/_Edit/A_dvanced/Move a character backward"
 msgstr "/Редагувати/Advanced/На літеру назад"
 
-#: src/compose.c:502
+#: src/compose.c:510
 msgid "/_Edit/A_dvanced/Move a character forward"
 msgstr "/Редагувати/Advanced/На літеру вперед"
 
-#: src/compose.c:507
+#: src/compose.c:515
 msgid "/_Edit/A_dvanced/Move a word backward"
 msgstr "/Редагувати/Advanced/На слово назад"
 
-#: src/compose.c:512
+#: src/compose.c:520
 msgid "/_Edit/A_dvanced/Move a word forward"
 msgstr "/Редагувати/Advanced/На слово вперед"
 
-#: src/compose.c:517
+#: src/compose.c:525
 msgid "/_Edit/A_dvanced/Move to beginning of line"
 msgstr "/Редагувати/Advanced/На початок рядка"
 
-#: src/compose.c:522
+#: src/compose.c:530
 msgid "/_Edit/A_dvanced/Move to end of line"
 msgstr "/Редагувати/Advanced/На кінець рядка"
 
-#: src/compose.c:527
+#: src/compose.c:535
 msgid "/_Edit/A_dvanced/Move to previous line"
 msgstr "/Редагувати/Advanced/На попередній рядок"
 
-#: src/compose.c:532
+#: src/compose.c:540
 msgid "/_Edit/A_dvanced/Move to next line"
 msgstr "/Редагувати/Advanced/На наступний рядок"
 
-#: src/compose.c:537
+#: src/compose.c:545
 msgid "/_Edit/A_dvanced/Delete a character backward"
 msgstr "/Редагувати/Advanced/Видалити літеру назад"
 
-#: src/compose.c:542
+#: src/compose.c:550
 msgid "/_Edit/A_dvanced/Delete a character forward"
 msgstr "/Редагувати/Advanced/Видалити літеру вперед"
 
-#: src/compose.c:547
+#: src/compose.c:555
 msgid "/_Edit/A_dvanced/Delete a word backward"
 msgstr "/Редагувати/Advanced/Видалити слово назад"
 
-#: src/compose.c:552
+#: src/compose.c:560
 msgid "/_Edit/A_dvanced/Delete a word forward"
 msgstr "/Редагувати/Advanced/Видалити слово вперед"
 
-#: src/compose.c:557
+#: src/compose.c:565
 msgid "/_Edit/A_dvanced/Delete line"
 msgstr "/Редагувати/Advanced/Видалити рядок"
 
-#: src/compose.c:562
+#: src/compose.c:570
 msgid "/_Edit/A_dvanced/Delete to end of line"
 msgstr "/Редагувати/Advanced/Видалити до кінця рядка"
 
-#: src/compose.c:568
+#: src/compose.c:576
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/Редагувати/Згорнути поточний абзац"
 
-#: src/compose.c:570
+#: src/compose.c:578
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/Редагувати/Згорнути всі довгі рядки"
 
-#: src/compose.c:572
+#: src/compose.c:580
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/Редагувати/Автозгортання"
 
-#: src/compose.c:573 src/mainwindow.c:494 src/messageview.c:147
+#: src/compose.c:581 src/mainwindow.c:494 src/messageview.c:147
 #: src/summaryview.c:370
 msgid "/_View"
 msgstr "/Вигляд"
 
-#: src/compose.c:574
+#: src/compose.c:582
 msgid "/_View/_To"
 msgstr "/Вигляд/Кому"
 
-#: src/compose.c:575
+#: src/compose.c:583
 msgid "/_View/_Cc"
 msgstr "/Вигляд/Копія"
 
-#: src/compose.c:576
+#: src/compose.c:584
 msgid "/_View/_Bcc"
 msgstr "/Вигляд/Приховано"
 
-#: src/compose.c:577
+#: src/compose.c:585
 msgid "/_View/_Reply to"
 msgstr "/Вигляд/Зворотня адреса"
 
-#: src/compose.c:578 src/compose.c:580 src/compose.c:582 src/mainwindow.c:512
-#: src/mainwindow.c:515 src/mainwindow.c:541 src/mainwindow.c:565
-#: src/mainwindow.c:641 src/mainwindow.c:645 src/messageview.c:223
+#: src/compose.c:586 src/compose.c:588 src/compose.c:590 src/compose.c:592
+#: src/mainwindow.c:512 src/mainwindow.c:515 src/mainwindow.c:541
+#: src/mainwindow.c:565 src/mainwindow.c:650 src/mainwindow.c:654
+#: src/messageview.c:223
 msgid "/_View/---"
 msgstr "/Вигляд/---"
 
-#: src/compose.c:579
+#: src/compose.c:587
 msgid "/_View/_Followup to"
 msgstr "/Вигляд/Конференції для відповіді"
 
-#: src/compose.c:581
+#: src/compose.c:589
 msgid "/_View/R_uler"
 msgstr "/Вигляд/Лінійка"
 
-#: src/compose.c:583
+#: src/compose.c:591
 msgid "/_View/_Attachment"
 msgstr "/Вигляд/Вкладення"
 
-#: src/compose.c:586 src/mainwindow.c:689 src/messageview.c:247
+#: src/compose.c:598 src/mainwindow.c:572 src/messageview.c:154
+#, fuzzy
+msgid "/_View/Character _encoding"
+msgstr "/Вигляд/Сортувати/За спаданням"
+
+#: src/compose.c:599
+msgid "/_View/Character _encoding/_Automatic"
+msgstr ""
+
+#: src/compose.c:601 src/compose.c:607 src/compose.c:613 src/compose.c:617
+#: src/compose.c:623 src/compose.c:627 src/compose.c:631 src/compose.c:641
+#: src/compose.c:645 src/compose.c:653 src/compose.c:657 src/mainwindow.c:568
+#: src/mainwindow.c:575 src/messageview.c:150
+#, fuzzy
+msgid "/_View/Character _encoding/---"
+msgstr "/Вигляд/Сортувати/За спаданням"
+
+#: src/compose.c:603 src/mainwindow.c:576 src/messageview.c:158
+#, fuzzy
+msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
+msgstr "/Вигляд/Кодова таблиця/7bit ascii (US-ASC_II)"
+
+#: src/compose.c:605 src/mainwindow.c:578 src/messageview.c:161
+#, fuzzy
+msgid "/_View/Character _encoding/Unicode (_UTF-8)"
+msgstr "/Вигляд/Кодова таблиця/Unicode (UT_F-8)"
+
+#: src/compose.c:609 src/mainwindow.c:582 src/messageview.c:164
+#, fuzzy
+msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
+msgstr "/Вигляд/Кодова таблиця/Західноєвропейська (ISO-8859-_1)"
+
+#: src/compose.c:611 src/mainwindow.c:584 src/messageview.c:166
+#, fuzzy
+msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
+msgstr "/Вигляд/Кодова таблиця/Західноєвропейська (ISO-8859-15)"
+
+#: src/compose.c:615 src/mainwindow.c:588 src/messageview.c:169
+#, fuzzy
+msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
+msgstr "/Вигляд/Кодова таблиця/Західноєвропейська (ISO-8859-_2)"
+
+#: src/compose.c:619 src/mainwindow.c:592 src/messageview.c:172
+#, fuzzy
+msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
+msgstr "/Вигляд/Кодова таблиця/Балтійська (ISO-8859-1_3)"
+
+#: src/compose.c:621 src/mainwindow.c:594 src/messageview.c:174
+#, fuzzy
+msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
+msgstr "/Вигляд/Кодова таблиця/Балтійська (ISO-8859-_4)"
+
+#: src/compose.c:625 src/mainwindow.c:598 src/messageview.c:177
+#, fuzzy
+msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
+msgstr "/Вигляд/Кодова таблиця/Грецька (ISO-8859-_7)"
+
+#: src/compose.c:629 src/mainwindow.c:602 src/messageview.c:180
+#, fuzzy
+msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
+msgstr "/Вигляд/Кодова таблиця/Турецька (ISO-8859-_9)"
+
+#: src/compose.c:633 src/mainwindow.c:606 src/messageview.c:183
+#, fuzzy
+msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
+msgstr "/Вигляд/Кодова таблиця/Кирилиця (ISO-8859-_5)"
+
+#: src/compose.c:635 src/mainwindow.c:608 src/messageview.c:185
+#, fuzzy
+msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
+msgstr "/Вигляд/Кодова таблиця/Кирилиця (KOI8-_R)"
+
+#: src/compose.c:637 src/mainwindow.c:610 src/messageview.c:187
+#, fuzzy
+msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
+msgstr "/Вигляд/Кодова таблиця/Кирилиця (KOI8-_U)"
+
+#: src/compose.c:639 src/mainwindow.c:612 src/messageview.c:189
+#, fuzzy
+msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
+msgstr "/Вигляд/Кодова таблиця/Кирилиця (_Windows-1251)"
+
+#: src/compose.c:643 src/mainwindow.c:616 src/messageview.c:192
+#, fuzzy
+msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
+msgstr "/Вигляд/Кодова таблиця/Японська (ISO-2022-_JP)"
+
+#: src/compose.c:647 src/mainwindow.c:626 src/messageview.c:201
+#, fuzzy
+msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
+msgstr "/Вигляд/Кодова таблиця/Спрощена китайська (_GB2312)"
+
+#: src/compose.c:649 src/mainwindow.c:628 src/messageview.c:203
+#, fuzzy
+msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
+msgstr "/Вигляд/Кодова таблиця/Традиційна китайська (_Big5)"
+
+#: src/compose.c:651 src/mainwindow.c:630 src/messageview.c:205
+#, fuzzy
+msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
+msgstr "/Вигляд/Кодова таблиця/Традиційна китайська (EUC-_TW)"
+
+#: src/compose.c:655 src/mainwindow.c:636 src/messageview.c:210
+#, fuzzy
+msgid "/_View/Character _encoding/Korean (EUC-_KR)"
+msgstr "/Вигляд/Кодова таблиця/Корейська (EUC-_KR)"
+
+#: src/compose.c:659 src/mainwindow.c:642 src/messageview.c:215
+#, fuzzy
+msgid "/_View/Character _encoding/Thai (TIS-620)"
+msgstr "/Вигляд/Кодова таблиця/Тайська (TIS-620)"
+
+#: src/compose.c:661 src/mainwindow.c:644 src/messageview.c:217
+#, fuzzy
+msgid "/_View/Character _encoding/Thai (Windows-874)"
+msgstr "/Вигляд/Кодова таблиця/Тайська (Windows-874)"
+
+#: src/compose.c:665 src/mainwindow.c:698 src/messageview.c:247
 msgid "/_Tools/_Address book"
 msgstr "/Інструменти/Адресна книга"
 
-#: src/compose.c:587
+#: src/compose.c:666
 msgid "/_Tools/_Template"
 msgstr "/Інструменти/Шаблон"
 
-#: src/compose.c:588 src/mainwindow.c:707 src/messageview.c:262
+#: src/compose.c:667 src/mainwindow.c:716 src/messageview.c:262
 msgid "/_Tools/Actio_ns"
 msgstr "/Інструменти/Дії"
 
-#: src/compose.c:589 src/compose.c:593 src/mainwindow.c:692
-#: src/mainwindow.c:706 src/mainwindow.c:708 src/mainwindow.c:711
-#: src/mainwindow.c:713 src/messageview.c:250 src/messageview.c:261
+#: src/compose.c:668 src/compose.c:672 src/mainwindow.c:701
+#: src/mainwindow.c:715 src/mainwindow.c:717 src/mainwindow.c:720
+#: src/mainwindow.c:722 src/messageview.c:250 src/messageview.c:261
 msgid "/_Tools/---"
 msgstr "/Інструменти/---"
 
-#: src/compose.c:590
+#: src/compose.c:669
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/Інструменти/Редагувати зовнішнім редактором"
 
-#: src/compose.c:594
+#: src/compose.c:673
 msgid "/_Tools/PGP Si_gn"
 msgstr "/Інструменти/Підпис PGP"
 
-#: src/compose.c:595
+#: src/compose.c:674
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/Інструменти/Шифрування PGP"
 
-#: src/compose.c:800
+#: src/compose.c:879
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: файл не існує\n"
 
-#: src/compose.c:899 src/compose.c:958 src/procmsg.c:1303
+#: src/compose.c:978 src/compose.c:1037 src/procmsg.c:1303
 msgid "Can't get text part\n"
 msgstr "Не вдалось отримати текстову частину\n"
 
-#: src/compose.c:1340
+#: src/compose.c:1419
 msgid "Quote mark format error."
 msgstr "Помилка у форматі цитування."
 
-#: src/compose.c:1352
+#: src/compose.c:1431
 msgid "Message reply/forward format error."
 msgstr "Помилка у форматі message reply/forward."
 
-#: src/compose.c:1679
+#: src/compose.c:1758
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Файл %s не існує\n"
 
-#: src/compose.c:1683
+#: src/compose.c:1762
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Не вдалось отримати розмір %s\n"
 
-#: src/compose.c:1687
+#: src/compose.c:1766
 #, c-format
 msgid "File %s is empty."
 msgstr "Файл %s порожній."
 
-#: src/compose.c:1691
+#: src/compose.c:1770
 #, c-format
 msgid "Can't read %s."
 msgstr "Не вдалось прочитати %s."
 
-#: src/compose.c:1726
+#: src/compose.c:1805
 #, c-format
 msgid "Message: %s"
 msgstr "Лист: %s"
 
-#: src/compose.c:1797 src/mimeview.c:491
+#: src/compose.c:1876 src/mimeview.c:491
 msgid "Can't get the part of multipart message."
 msgstr "Не вдалось отримати одну з частин листа."
 
-#: src/compose.c:2188
+#: src/compose.c:2267
 msgid " [Edited]"
 msgstr " [Редагований]"
 
-#: src/compose.c:2190
+#: src/compose.c:2269
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Створити лист%s"
 
-#: src/compose.c:2193
+#: src/compose.c:2272
 #, c-format
 msgid "Compose message%s"
 msgstr "Створити лист%s"
 
-#: src/compose.c:2304
+#: src/compose.c:2383
 msgid "Recipient is not specified."
 msgstr "Не вказано отримувача."
 
-#: src/compose.c:2312 src/compose.c:4112 src/mainwindow.c:2144
+#: src/compose.c:2391 src/compose.c:4213 src/mainwindow.c:2153
 #: src/prefs_account.c:703 src/prefs_common.c:850
 msgid "Send"
 msgstr "Послати"
 
-#: src/compose.c:2313
+#: src/compose.c:2392
 msgid "Subject is empty. Send it anyway?"
 msgstr "Поле Subject порожнє. Все ж послати?"
 
-#: src/compose.c:2364
+#: src/compose.c:2443
 msgid "can't get recipient list."
 msgstr "не вдалось отримати список отримувачів."
 
-#: src/compose.c:2384
+#: src/compose.c:2463
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -957,26 +1075,26 @@ msgstr ""
 "Обліковий запис для відсилання пошти не вказано.\n"
 "Оберіть, будь-ласка, запис перед відправкою."
 
-#: src/compose.c:2398 src/send_message.c:261
+#: src/compose.c:2477 src/send_message.c:261
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Трапилась помилка при відсиланні листа до %s ."
 
-#: src/compose.c:2421
+#: src/compose.c:2500
 msgid "Can't save the message to outbox."
 msgstr "Не вдалось зберегти лист в outbox."
 
-#: src/compose.c:2457
+#: src/compose.c:2536
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "Не вдалось знайти ключа, відповідного обраному ідентифікатору `%s'."
 
-#: src/compose.c:2518 src/compose.c:2739 src/compose.c:2802 src/compose.c:2921
+#: src/compose.c:2597 src/compose.c:2820 src/compose.c:2883 src/compose.c:3003
 #: src/utils.c:2189
 msgid "can't change file mode\n"
 msgstr "не вдалось змінити права доступу файла\n"
 
-#: src/compose.c:2546
+#: src/compose.c:2627
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -986,140 +1104,140 @@ msgstr ""
 "%s на %s.\n"
 "Все ж послати?"
 
-#: src/compose.c:2610
+#: src/compose.c:2691
 msgid "can't write headers\n"
 msgstr "не вдалось записати заголовки\n"
 
-#: src/compose.c:2881
+#: src/compose.c:2963
 msgid "can't remove the old message\n"
 msgstr "не вдалось видалити старий лист\n"
 
-#: src/compose.c:2899
+#: src/compose.c:2981
 msgid "queueing message...\n"
 msgstr "лист в чергу...\n"
 
-#: src/compose.c:2981
+#: src/compose.c:3063
 msgid "can't find queue folder\n"
 msgstr "не вдалось знайти папку черги\n"
 
-#: src/compose.c:2988
+#: src/compose.c:3070
 msgid "can't queue the message\n"
 msgstr "не вдалось поставити лист в чергу\n"
 
-#: src/compose.c:3547
+#: src/compose.c:3645
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "генерований Message-ID: %s\n"
 
-#: src/compose.c:3645
+#: src/compose.c:3743
 msgid "Creating compose window...\n"
 msgstr "Відкриваємо вікно створення листа...\n"
 
-#: src/compose.c:3648 src/compose.c:4598
+#: src/compose.c:3746 src/compose.c:4734
 msgid "MIME type"
 msgstr "тип MIME"
 
 #. S_COL_DATE
-#: src/compose.c:3649 src/mimeview.c:150 src/prefs_filter_edit.c:569
+#: src/compose.c:3747 src/mimeview.c:150 src/prefs_filter_edit.c:569
 #: src/prefs_summary_column.c:73 src/select-keys.c:317 src/summaryview.c:386
 msgid "Size"
 msgstr "Розмір"
 
-#: src/compose.c:3700 src/headerview.c:53 src/summary_search.c:169
+#: src/compose.c:3798 src/headerview.c:53 src/summary_search.c:169
 msgid "From:"
 msgstr "Від:"
 
-#: src/compose.c:4113
+#: src/compose.c:4214
 msgid "Send message"
 msgstr "Послати лист"
 
-#: src/compose.c:4121
+#: src/compose.c:4222
 msgid "Send later"
 msgstr "Послати пізніше"
 
-#: src/compose.c:4122
+#: src/compose.c:4223
 msgid "Put into queue folder and send later"
 msgstr "Покласти в папку черги і послати пізніше"
 
-#: src/compose.c:4130
+#: src/compose.c:4231
 msgid "Draft"
 msgstr "Чорновик"
 
-#: src/compose.c:4131
+#: src/compose.c:4232
 msgid "Save to draft folder"
 msgstr "Зберегти в папці чорновиків"
 
-#: src/compose.c:4141 src/compose.c:5382
+#: src/compose.c:4242 src/compose.c:5527
 msgid "Insert"
 msgstr "Вставити"
 
-#: src/compose.c:4142
+#: src/compose.c:4243
 msgid "Insert file"
 msgstr "Вставити файл"
 
-#: src/compose.c:4150
+#: src/compose.c:4251
 msgid "Attach"
 msgstr "Приєднати"
 
-#: src/compose.c:4151
+#: src/compose.c:4252
 msgid "Attach file"
 msgstr "Приєднати файл"
 
 #. signature
-#: src/compose.c:4161 src/prefs_account.c:1339 src/prefs_common.c:1261
+#: src/compose.c:4262 src/prefs_account.c:1339 src/prefs_common.c:1273
 msgid "Signature"
 msgstr "Підпис"
 
-#: src/compose.c:4162
+#: src/compose.c:4263
 msgid "Insert signature"
 msgstr "Вставити підпис"
 
-#: src/compose.c:4171 src/prefs_common.c:1283 src/prefs_common.c:2165
+#: src/compose.c:4272 src/prefs_common.c:1295 src/prefs_common.c:2177
 msgid "Editor"
 msgstr "Редактор"
 
-#: src/compose.c:4172
+#: src/compose.c:4273
 msgid "Edit with external editor"
 msgstr "Редагувати зовнішнім редактором"
 
-#: src/compose.c:4180
+#: src/compose.c:4281
 msgid "Linewrap"
 msgstr "Згортання рядків"
 
-#: src/compose.c:4181
+#: src/compose.c:4282
 msgid "Wrap all long lines"
 msgstr "Згорнути всі довгі рядки"
 
-#: src/compose.c:4492
+#: src/compose.c:4628
 msgid "Invalid MIME type."
 msgstr "Неправильний тип MIME."
 
-#: src/compose.c:4511
+#: src/compose.c:4647
 msgid "File doesn't exist or is empty."
 msgstr "Файл не існує або порожній."
 
-#: src/compose.c:4580
+#: src/compose.c:4716
 msgid "Properties"
 msgstr "Властивості"
 
-#: src/compose.c:4600
+#: src/compose.c:4736
 msgid "Encoding"
 msgstr "Кодування"
 
-#: src/compose.c:4623 src/prefs_folder_item.c:183
+#: src/compose.c:4759 src/prefs_folder_item.c:183
 msgid "Path"
 msgstr "Шлях"
 
-#: src/compose.c:4624
+#: src/compose.c:4760
 msgid "File name"
 msgstr "Ім'я файлу"
 
-#: src/compose.c:4778
+#: src/compose.c:4914
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Командний рядок зовнішнього редактора неправильний: `%s'\n"
 
-#: src/compose.c:4804
+#: src/compose.c:4940
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1130,72 +1248,72 @@ msgstr ""
 "Примусово обірвати процес?\n"
 "group id процесу: %d"
 
-#: src/compose.c:4817
+#: src/compose.c:4953
 #, c-format
 msgid "Terminated process group id: %d"
 msgstr "Обірвано процес з group id: %d"
 
-#: src/compose.c:4818
+#: src/compose.c:4954
 #, c-format
 msgid "Temporary file: %s"
 msgstr "Тимчасовий файл: %s"
 
-#: src/compose.c:4842
+#: src/compose.c:4978
 msgid "Compose: input from monitoring process\n"
 msgstr "Створення: ввід від спостерігаючого процесу\n"
 
 #. failed
-#: src/compose.c:4875
+#: src/compose.c:5011
 msgid "Couldn't exec external editor\n"
 msgstr "Не вдалось запустити зовнішній редактор\n"
 
-#: src/compose.c:4879
+#: src/compose.c:5015
 msgid "Couldn't write to file\n"
 msgstr "Не вдалось записати в файл\n"
 
-#: src/compose.c:4881
+#: src/compose.c:5017
 msgid "Pipe read failed\n"
 msgstr "Не вдалось прочитати з каналу\n"
 
-#: src/compose.c:5182 src/compose.c:5190 src/compose.c:5196
+#: src/compose.c:5318 src/compose.c:5326 src/compose.c:5332
 msgid "Can't queue the message."
 msgstr "Не вдалось поставити лист в чергу."
 
-#: src/compose.c:5287
+#: src/compose.c:5423
 #, fuzzy
 msgid "Select files"
 msgstr "Обрати файл"
 
-#: src/compose.c:5309
+#: src/compose.c:5445
 msgid "Select file"
 msgstr "Обрати файл"
 
-#: src/compose.c:5344
+#: src/compose.c:5480
 msgid "Discard message"
 msgstr "Відмовитись від листа"
 
-#: src/compose.c:5345
+#: src/compose.c:5481
 msgid "This message has been modified. discard it?"
 msgstr "Цей лист було змінено. Відмовитись від нього?"
 
-#: src/compose.c:5346
+#: src/compose.c:5482
 msgid "Discard"
 msgstr "Відмовитись"
 
-#: src/compose.c:5346
+#: src/compose.c:5482
 msgid "to Draft"
 msgstr "В чорновики"
 
-#: src/compose.c:5379
+#: src/compose.c:5524
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Чи бажаєте Ви застосувати шаблон `%s' ?"
 
-#: src/compose.c:5381
+#: src/compose.c:5526
 msgid "Apply template"
 msgstr "Застосувати шаблон"
 
-#: src/compose.c:5382
+#: src/compose.c:5527
 msgid "Replace"
 msgstr "Замінити"
 
@@ -1635,12 +1753,12 @@ msgstr "Встановлюємо інформацію папки...\n"
 msgid "Setting folder info..."
 msgstr "Встановлюємо інформацію папки..."
 
-#: src/folderview.c:652 src/mainwindow.c:3190 src/setup.c:81
+#: src/folderview.c:652 src/mainwindow.c:3199 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Перечитуємо папку %s%c%s ..."
 
-#: src/folderview.c:656 src/mainwindow.c:3195 src/setup.c:86
+#: src/folderview.c:656 src/mainwindow.c:3204 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Перечитуємо папку %s ..."
@@ -2096,7 +2214,7 @@ msgstr "Імпортувати файл LDIF в адресну книгу"
 msgid "Prev"
 msgstr "Назад"
 
-#: src/importldif.c:761 src/mainwindow.c:2230
+#: src/importldif.c:761 src/mainwindow.c:2239
 msgid "Next"
 msgstr "Далі"
 
@@ -2553,7 +2671,8 @@ msgid "/_View/Separate f_older tree"
 msgstr "/Вигляд/Окреме дерево папок"
 
 #: src/mainwindow.c:514
-msgid "/_View/Separate m_essage view"
+#, fuzzy
+msgid "/_View/Separate _message view"
 msgstr "/Вигляд/Окрема область перегляду змісту"
 
 #: src/mainwindow.c:516
@@ -2689,424 +2808,342 @@ msgstr "/Вигляд/Перейти до/Наступного листа, ви�
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/Вигляд/Перейти до/Іншої папки"
 
-#: src/mainwindow.c:568 src/mainwindow.c:575 src/messageview.c:150
-msgid "/_View/_Code set/---"
-msgstr "/Вигляд/Кодова таблиця/---"
-
-#: src/mainwindow.c:572 src/messageview.c:154
-msgid "/_View/_Code set"
-msgstr "/Вигляд/Кодова таблиця"
-
 #: src/mainwindow.c:573 src/messageview.c:155
-msgid "/_View/_Code set/_Auto detect"
+#, fuzzy
+msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/Вигляд/Кодова таблиця/_Aвтоматична"
 
-#: src/mainwindow.c:576 src/messageview.c:158
-msgid "/_View/_Code set/7bit ascii (US-ASC_II)"
-msgstr "/Вигляд/Кодова таблиця/7bit ascii (US-ASC_II)"
-
-#: src/mainwindow.c:579 src/messageview.c:161
-msgid "/_View/_Code set/Unicode (_UTF-8)"
-msgstr "/Вигляд/Кодова таблиця/Unicode (UT_F-8)"
-
-#: src/mainwindow.c:582 src/messageview.c:164
-msgid "/_View/_Code set/Western European (ISO-8859-_1)"
-msgstr "/Вигляд/Кодова таблиця/Західноєвропейська (ISO-8859-_1)"
-
-#: src/mainwindow.c:584 src/messageview.c:166
-msgid "/_View/_Code set/Western European (ISO-8859-15)"
-msgstr "/Вигляд/Кодова таблиця/Західноєвропейська (ISO-8859-15)"
-
-#: src/mainwindow.c:587 src/messageview.c:169
-msgid "/_View/_Code set/Central European (ISO-8859-_2)"
-msgstr "/Вигляд/Кодова таблиця/Західноєвропейська (ISO-8859-_2)"
-
-#: src/mainwindow.c:590 src/messageview.c:172
-msgid "/_View/_Code set/_Baltic (ISO-8859-13)"
-msgstr "/Вигляд/Кодова таблиця/Балтійська (ISO-8859-1_3)"
-
-#: src/mainwindow.c:592 src/messageview.c:174
-msgid "/_View/_Code set/Baltic (ISO-8859-_4)"
-msgstr "/Вигляд/Кодова таблиця/Балтійська (ISO-8859-_4)"
-
-#: src/mainwindow.c:595 src/messageview.c:177
-msgid "/_View/_Code set/Greek (ISO-8859-_7)"
-msgstr "/Вигляд/Кодова таблиця/Грецька (ISO-8859-_7)"
-
-#: src/mainwindow.c:598 src/messageview.c:180
-msgid "/_View/_Code set/Turkish (ISO-8859-_9)"
-msgstr "/Вигляд/Кодова таблиця/Турецька (ISO-8859-_9)"
-
-#: src/mainwindow.c:601 src/messageview.c:183
-msgid "/_View/_Code set/Cyrillic (ISO-8859-_5)"
-msgstr "/Вигляд/Кодова таблиця/Кирилиця (ISO-8859-_5)"
-
-#: src/mainwindow.c:603 src/messageview.c:185
-msgid "/_View/_Code set/Cyrillic (KOI8-_R)"
-msgstr "/Вигляд/Кодова таблиця/Кирилиця (KOI8-_R)"
-
-#: src/mainwindow.c:605 src/messageview.c:187
-msgid "/_View/_Code set/Cyrillic (KOI8-U)"
-msgstr "/Вигляд/Кодова таблиця/Кирилиця (KOI8-_U)"
-
-#: src/mainwindow.c:607 src/messageview.c:189
-msgid "/_View/_Code set/Cyrillic (Windows-1251)"
-msgstr "/Вигляд/Кодова таблиця/Кирилиця (_Windows-1251)"
-
-#: src/mainwindow.c:610 src/messageview.c:192
-msgid "/_View/_Code set/Japanese (ISO-2022-_JP)"
-msgstr "/Вигляд/Кодова таблиця/Японська (ISO-2022-_JP)"
-
-#: src/mainwindow.c:612 src/messageview.c:194
-msgid "/_View/_Code set/Japanese (ISO-2022-JP-2)"
+#: src/mainwindow.c:618 src/messageview.c:194
+#, fuzzy
+msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/Вигляд/Кодова таблиця/Японська (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:614 src/messageview.c:196
-msgid "/_View/_Code set/Japanese (_EUC-JP)"
+#: src/mainwindow.c:620 src/messageview.c:196
+#, fuzzy
+msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/Вигляд/Кодова таблиця/Японська (_EUC-JP)"
 
-#: src/mainwindow.c:616 src/messageview.c:198
-msgid "/_View/_Code set/Japanese (_Shift__JIS)"
+#: src/mainwindow.c:622 src/messageview.c:198
+#, fuzzy
+msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/Вигляд/Кодова таблиця/Японська (_Shift__JIS)"
 
-#: src/mainwindow.c:619 src/messageview.c:201
-msgid "/_View/_Code set/Simplified Chinese (_GB2312)"
-msgstr "/Вигляд/Кодова таблиця/Спрощена китайська (_GB2312)"
-
-#: src/mainwindow.c:621 src/messageview.c:203
-msgid "/_View/_Code set/Traditional Chinese (_Big5)"
-msgstr "/Вигляд/Кодова таблиця/Традиційна китайська (_Big5)"
-
-#: src/mainwindow.c:623 src/messageview.c:205
-msgid "/_View/_Code set/Traditional Chinese (EUC-_TW)"
-msgstr "/Вигляд/Кодова таблиця/Традиційна китайська (EUC-_TW)"
-
-#: src/mainwindow.c:625 src/messageview.c:207
-msgid "/_View/_Code set/Chinese (ISO-2022-_CN)"
+#: src/mainwindow.c:632 src/messageview.c:207
+#, fuzzy
+msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/Вигляд/Кодова таблиця/Китайська (ISO-2022-_CN)"
 
-#: src/mainwindow.c:628 src/messageview.c:210
-msgid "/_View/_Code set/Korean (EUC-_KR)"
-msgstr "/Вигляд/Кодова таблиця/Корейська (EUC-_KR)"
-
-#: src/mainwindow.c:630 src/messageview.c:212
-msgid "/_View/_Code set/Korean (ISO-2022-KR)"
+#: src/mainwindow.c:638 src/messageview.c:212
+#, fuzzy
+msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/Вигляд/Кодова таблиця/Корейська (ISO-2022-KR)"
 
-#: src/mainwindow.c:633 src/messageview.c:215
-msgid "/_View/_Code set/Thai (TIS-620)"
-msgstr "/Вигляд/Кодова таблиця/Тайська (TIS-620)"
-
-#: src/mainwindow.c:635 src/messageview.c:217
-msgid "/_View/_Code set/Thai (Windows-874)"
-msgstr "/Вигляд/Кодова таблиця/Тайська (Windows-874)"
-
-#: src/mainwindow.c:642 src/summaryview.c:371
+#: src/mainwindow.c:651 src/summaryview.c:371
 msgid "/_View/Open in new _window"
 msgstr "/Вигляд/Відкрити в новому вікні"
 
-#: src/mainwindow.c:643 src/messageview.c:224
+#: src/mainwindow.c:652 src/messageview.c:224
 msgid "/_View/Mess_age source"
 msgstr "/Вигляд/Вихідний текст листа"
 
-#: src/mainwindow.c:644 src/messageview.c:225
+#: src/mainwindow.c:653 src/messageview.c:225
 msgid "/_View/Show all _header"
 msgstr "/Вигляд/Показати весь заголовок"
 
-#: src/mainwindow.c:646
+#: src/mainwindow.c:655
 msgid "/_View/_Update summary"
 msgstr "/Вигляд/Оновити список"
 
-#: src/mainwindow.c:648 src/messageview.c:227
+#: src/mainwindow.c:657 src/messageview.c:227
 msgid "/_Message"
 msgstr "/Лист"
 
-#: src/mainwindow.c:649
+#: src/mainwindow.c:658
 msgid "/_Message/Recei_ve"
 msgstr "/Лист/Отримати"
 
-#: src/mainwindow.c:650
+#: src/mainwindow.c:659
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/Лист/Отримати/Для поточного запису"
 
-#: src/mainwindow.c:652
+#: src/mainwindow.c:661
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/Лист/Отримати/Для всіх записів"
 
-#: src/mainwindow.c:654
+#: src/mainwindow.c:663
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/Лист/Отримати/Скасувати отримання"
 
-#: src/mainwindow.c:656
+#: src/mainwindow.c:665
 msgid "/_Message/Recei_ve/---"
 msgstr "/Лист/Отримати/---"
 
-#: src/mainwindow.c:657
+#: src/mainwindow.c:666
 msgid "/_Message/_Send queued messages"
 msgstr "/Лист/Відіслати відкладені листи"
 
-#: src/mainwindow.c:658 src/mainwindow.c:660 src/mainwindow.c:667
-#: src/mainwindow.c:672 src/mainwindow.c:676 src/mainwindow.c:685
+#: src/mainwindow.c:667 src/mainwindow.c:669 src/mainwindow.c:676
+#: src/mainwindow.c:681 src/mainwindow.c:685 src/mainwindow.c:694
 #: src/messageview.c:230 src/messageview.c:238 src/messageview.c:243
 msgid "/_Message/---"
 msgstr "/Лист/---"
 
-#: src/mainwindow.c:659 src/messageview.c:228
+#: src/mainwindow.c:668 src/messageview.c:228
 msgid "/_Message/Compose _new message"
 msgstr "/Лист/Написати новий лист"
 
-#: src/mainwindow.c:661 src/messageview.c:231
+#: src/mainwindow.c:670 src/messageview.c:231
 msgid "/_Message/_Reply"
 msgstr "/Лист/Відповісти"
 
-#: src/mainwindow.c:662
+#: src/mainwindow.c:671
 msgid "/_Message/Repl_y to"
 msgstr "/Лист/Відповісти"
 
-#: src/mainwindow.c:663 src/messageview.c:232
+#: src/mainwindow.c:672 src/messageview.c:232
 msgid "/_Message/Repl_y to/_all"
 msgstr "/Лист/Відповісти/всім"
 
-#: src/mainwindow.c:664 src/messageview.c:234
+#: src/mainwindow.c:673 src/messageview.c:234
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/Лист/Відповісти/відправнику"
 
-#: src/mainwindow.c:665 src/messageview.c:236
+#: src/mainwindow.c:674 src/messageview.c:236
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/Лист/Відповісти/конференції"
 
-#: src/mainwindow.c:668 src/messageview.c:239
+#: src/mainwindow.c:677 src/messageview.c:239
 msgid "/_Message/_Forward"
 msgstr "/Лист/Переслати"
 
-#: src/mainwindow.c:669 src/messageview.c:240
+#: src/mainwindow.c:678 src/messageview.c:240
 msgid "/_Message/For_ward as attachment"
 msgstr "/Лист/Переслати як вкладення"
 
-#: src/mainwindow.c:671 src/messageview.c:242
+#: src/mainwindow.c:680 src/messageview.c:242
 msgid "/_Message/Redirec_t"
 msgstr "/Лист/Переспрямувати"
 
-#: src/mainwindow.c:673
+#: src/mainwindow.c:682
 msgid "/_Message/M_ove..."
 msgstr "/Лист/Перемістити"
 
-#: src/mainwindow.c:674
+#: src/mainwindow.c:683
 msgid "/_Message/_Copy..."
 msgstr "/Лист/Копіювати"
 
-#: src/mainwindow.c:675
+#: src/mainwindow.c:684
 msgid "/_Message/_Delete"
 msgstr "/Лист/Видалити"
 
-#: src/mainwindow.c:677
+#: src/mainwindow.c:686
 msgid "/_Message/_Mark"
 msgstr "/Лист/Позначка"
 
-#: src/mainwindow.c:678
+#: src/mainwindow.c:687
 msgid "/_Message/_Mark/_Mark"
 msgstr "/Лист/Позначка/Зробити"
 
-#: src/mainwindow.c:679
+#: src/mainwindow.c:688
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/Лист/Позначка/Зняти"
 
-#: src/mainwindow.c:680
+#: src/mainwindow.c:689
 msgid "/_Message/_Mark/---"
 msgstr "/Лист/Позначка/---"
 
-#: src/mainwindow.c:681
+#: src/mainwindow.c:690
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/Лист/Позначка/Позначити як непрочитаний"
 
-#: src/mainwindow.c:682
+#: src/mainwindow.c:691
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/Лист/Позначка/Позначити як прочитаний"
 
-#: src/mainwindow.c:684
+#: src/mainwindow.c:693
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/Лист/Позначка/Позначити всі як прочитані"
 
-#: src/mainwindow.c:686 src/messageview.c:244
+#: src/mainwindow.c:695 src/messageview.c:244
 msgid "/_Message/Re-_edit"
 msgstr "/Лист/Змінити"
 
-#: src/mainwindow.c:690 src/messageview.c:248
+#: src/mainwindow.c:699 src/messageview.c:248
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/Інструменти/Додати відправника до адресної книги"
 
-#: src/mainwindow.c:693
+#: src/mainwindow.c:702
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/Інструменти/Фільтрувати всі листи в папці"
 
-#: src/mainwindow.c:695
+#: src/mainwindow.c:704
 msgid "/_Tools/Filter _selected messages"
 msgstr "/Інструменти/Фільтрувати виділені листи"
 
-#: src/mainwindow.c:697 src/messageview.c:251
+#: src/mainwindow.c:706 src/messageview.c:251
 msgid "/_Tools/_Create filter rule"
 msgstr "/Інструменти/Створити правило фільтрування"
 
-#: src/mainwindow.c:698 src/messageview.c:253
+#: src/mainwindow.c:707 src/messageview.c:253
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/Інструменти/Створити правило фільтрування/Автоматично"
 
-#: src/mainwindow.c:700 src/messageview.c:255
+#: src/mainwindow.c:709 src/messageview.c:255
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/Інструменти/Створити правило фільтрування/За полем `Від'"
 
-#: src/mainwindow.c:702 src/messageview.c:257
+#: src/mainwindow.c:711 src/messageview.c:257
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/Інструменти/Створити правило фільтрування/За полем `Кому'"
 
-#: src/mainwindow.c:704 src/messageview.c:259
+#: src/mainwindow.c:713 src/messageview.c:259
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/Інструменти/Створити правило фільтрування/За полем `Тема'"
 
-#: src/mainwindow.c:709
+#: src/mainwindow.c:718
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/Інструменти/Видалити повторювані листи"
 
-#: src/mainwindow.c:712
+#: src/mainwindow.c:721
 msgid "/_Tools/E_xecute"
 msgstr "/Інструменти/Виконати"
 
-#: src/mainwindow.c:714
+#: src/mainwindow.c:723
 msgid "/_Tools/_Log window"
 msgstr "/Інструменти/Вікно журналу"
 
-#: src/mainwindow.c:716
+#: src/mainwindow.c:725
 msgid "/_Configuration"
 msgstr "/Конфігурація"
 
-#: src/mainwindow.c:717
+#: src/mainwindow.c:726
 msgid "/_Configuration/_Common preferences..."
 msgstr "/Конфігурація/Спільні налаштування..."
 
-#: src/mainwindow.c:719
+#: src/mainwindow.c:728
 msgid "/_Configuration/_Filter setting..."
 msgstr "/Конфігурація/Налаштування фільтра..."
 
-#: src/mainwindow.c:721
+#: src/mainwindow.c:730
 msgid "/_Configuration/_Template..."
 msgstr "/Конфігурація/Шаблон..."
 
-#: src/mainwindow.c:722
+#: src/mainwindow.c:731
 msgid "/_Configuration/_Actions..."
 msgstr "/Конфігурація/Дії..."
 
-#: src/mainwindow.c:723
+#: src/mainwindow.c:732
 msgid "/_Configuration/---"
 msgstr "/Конфігурація/---"
 
-#: src/mainwindow.c:724
+#: src/mainwindow.c:733
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/Конфігурація/Налаштування поточного запису..."
 
-#: src/mainwindow.c:726
+#: src/mainwindow.c:735
 msgid "/_Configuration/Create _new account..."
 msgstr "/Конфігурація/Створити новий обліковий запис..."
 
-#: src/mainwindow.c:728
+#: src/mainwindow.c:737
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/Конфігурація/Редагувати облікові записи..."
 
-#: src/mainwindow.c:730
+#: src/mainwindow.c:739
 msgid "/_Configuration/C_hange current account"
 msgstr "/Конфігурація/Змінити поточний запис"
 
-#: src/mainwindow.c:734
+#: src/mainwindow.c:743
 msgid "/_Help/_Manual"
 msgstr "/Довідка/Посібник"
 
-#: src/mainwindow.c:735
+#: src/mainwindow.c:744
 msgid "/_Help/_Manual/_English"
 msgstr "/Довідка/Посібник/Англійський"
 
-#: src/mainwindow.c:736
+#: src/mainwindow.c:745
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/Довідка/Посібник/Японський"
 
-#: src/mainwindow.c:737
+#: src/mainwindow.c:746
 msgid "/_Help/_FAQ"
 msgstr "/Довідка/FAQ"
 
-#: src/mainwindow.c:738
+#: src/mainwindow.c:747
 msgid "/_Help/_FAQ/_English"
 msgstr "/Довідка/FAQ/Англійський"
 
-#: src/mainwindow.c:739
+#: src/mainwindow.c:748
 msgid "/_Help/_FAQ/_German"
 msgstr "/Довідка/FAQ/Німецький"
 
-#: src/mainwindow.c:740
+#: src/mainwindow.c:749
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/Довідка/FAQ/Іспанський"
 
-#: src/mainwindow.c:741
+#: src/mainwindow.c:750
 msgid "/_Help/_FAQ/_French"
 msgstr "/Довідка/FAQ/Французький"
 
-#: src/mainwindow.c:742
+#: src/mainwindow.c:751
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/Довідка/FAQ/Італійський"
 
-#: src/mainwindow.c:743
+#: src/mainwindow.c:752
 msgid "/_Help/---"
 msgstr "/Довідка/---"
 
-#: src/mainwindow.c:783
+#: src/mainwindow.c:792
 msgid "Creating main window...\n"
 msgstr "Створюємо головне вікно...\n"
 
-#: src/mainwindow.c:943
+#: src/mainwindow.c:952
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Головне Вікно: невдача розміщення кольору %d\n"
 
-#: src/mainwindow.c:1021 src/summaryview.c:1368 src/summaryview.c:1677
+#: src/mainwindow.c:1030 src/summaryview.c:1368 src/summaryview.c:1677
 #: src/summaryview.c:1785 src/summaryview.c:1831 src/summaryview.c:2453
 #: src/summaryview.c:3080 src/summaryview.c:3146 src/summaryview.c:3171
 #: src/summaryview.c:3284
 msgid "done.\n"
 msgstr "виконано.\n"
 
-#: src/mainwindow.c:1137 src/mainwindow.c:1178 src/mainwindow.c:1206
+#: src/mainwindow.c:1146 src/mainwindow.c:1187 src/mainwindow.c:1215
 msgid "Untitled"
 msgstr "БезНазви"
 
-#: src/mainwindow.c:1207
+#: src/mainwindow.c:1216
 msgid "none"
 msgstr "немає"
 
-#: src/mainwindow.c:1257
+#: src/mainwindow.c:1266
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "Зміна типу розділення вікна з %d на %d\n"
 
-#: src/mainwindow.c:1477
+#: src/mainwindow.c:1486
 msgid "Offline"
 msgstr "Без з'єднання"
 
-#: src/mainwindow.c:1478
+#: src/mainwindow.c:1487
 msgid "You are offline. Go online?"
 msgstr "З'єднання немає. Під'єднатись?"
 
-#: src/mainwindow.c:1492
+#: src/mainwindow.c:1501
 #, fuzzy
 msgid "Empty all trash"
 msgstr "Спорожнити кошик"
 
-#: src/mainwindow.c:1493
+#: src/mainwindow.c:1502
 #, fuzzy
 msgid "Empty messages in all trash?"
 msgstr "Видалити всі листи з кошика?"
 
-#: src/mainwindow.c:1521
+#: src/mainwindow.c:1530
 msgid "Add mailbox"
 msgstr "Додати скриньку"
 
-#: src/mainwindow.c:1522
+#: src/mainwindow.c:1531
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3116,16 +3153,16 @@ msgstr ""
 "Якщо вона вже існує, її буде перечитано\n"
 "автоматично."
 
-#: src/mainwindow.c:1528
+#: src/mainwindow.c:1537
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Скринька `%s' вже існує."
 
-#: src/mainwindow.c:1533 src/setup.c:57
+#: src/mainwindow.c:1542 src/setup.c:57
 msgid "Mailbox"
 msgstr "Скринька"
 
-#: src/mainwindow.c:1539 src/setup.c:63
+#: src/mainwindow.c:1548 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3135,141 +3172,141 @@ msgstr ""
 "Можливо, деякі файли вже існують, або Ви не маєте\n"
 "права запису тут."
 
-#: src/mainwindow.c:1912
+#: src/mainwindow.c:1921
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Папки"
 
-#: src/mainwindow.c:1932 src/messageview.c:358
+#: src/mainwindow.c:1941 src/messageview.c:358
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Листи"
 
-#: src/mainwindow.c:2079 src/summaryview.c:340
+#: src/mainwindow.c:2088 src/summaryview.c:340
 msgid "/_Reply"
 msgstr "/Відповісти"
 
-#: src/mainwindow.c:2080
+#: src/mainwindow.c:2089
 msgid "/Reply to _all"
 msgstr "/Відповісти всім"
 
-#: src/mainwindow.c:2081
+#: src/mainwindow.c:2090
 msgid "/Reply to _sender"
 msgstr "/Відповісти відправникові"
 
-#: src/mainwindow.c:2082
+#: src/mainwindow.c:2091
 msgid "/Reply to mailing _list"
 msgstr "/Відповісти конференції"
 
-#: src/mainwindow.c:2087 src/summaryview.c:347
+#: src/mainwindow.c:2096 src/summaryview.c:347
 msgid "/_Forward"
 msgstr "/Переслати далі"
 
-#: src/mainwindow.c:2088 src/summaryview.c:348
+#: src/mainwindow.c:2097 src/summaryview.c:348
 msgid "/For_ward as attachment"
 msgstr "/Переслати далі як вкладення"
 
-#: src/mainwindow.c:2089 src/summaryview.c:349
+#: src/mainwindow.c:2098 src/summaryview.c:349
 msgid "/Redirec_t"
 msgstr "/Переспрямувати"
 
-#: src/mainwindow.c:2125
+#: src/mainwindow.c:2134
 msgid "Get"
 msgstr "Отримати"
 
-#: src/mainwindow.c:2126
+#: src/mainwindow.c:2135
 msgid "Incorporate new mail"
 msgstr "Отримати нові листи"
 
-#: src/mainwindow.c:2133
+#: src/mainwindow.c:2142
 msgid "Get all"
 msgstr "Отримати всі"
 
-#: src/mainwindow.c:2134
+#: src/mainwindow.c:2143
 msgid "Incorporate new mail of all accounts"
 msgstr "Отримати нові листи для всіх записів"
 
-#: src/mainwindow.c:2145
+#: src/mainwindow.c:2154
 msgid "Send queued message(s)"
 msgstr "Відіслати лист(и) з черги"
 
-#: src/mainwindow.c:2155 src/prefs_account.c:705 src/prefs_common.c:852
+#: src/mainwindow.c:2164 src/prefs_account.c:705 src/prefs_common.c:852
 #: src/prefs_folder_item.c:137
 msgid "Compose"
 msgstr "Створення листа"
 
-#: src/mainwindow.c:2156
+#: src/mainwindow.c:2165
 msgid "Compose new message"
 msgstr "Новий лист"
 
-#: src/mainwindow.c:2164 src/prefs_common.c:1353
+#: src/mainwindow.c:2173 src/prefs_common.c:1365
 msgid "Reply"
 msgstr "Відповісти"
 
-#: src/mainwindow.c:2165 src/mainwindow.c:2178
+#: src/mainwindow.c:2174 src/mainwindow.c:2187
 msgid "Reply to the message"
 msgstr "Відповісти на лист"
 
-#: src/mainwindow.c:2183
+#: src/mainwindow.c:2192
 msgid "Reply all"
 msgstr "Відповісти всім"
 
-#: src/mainwindow.c:2184
+#: src/mainwindow.c:2193
 msgid "Reply to all"
 msgstr "Відповісти всім"
 
-#: src/mainwindow.c:2192 src/prefs_filter_edit.c:719
+#: src/mainwindow.c:2201 src/prefs_filter_edit.c:719
 msgid "Forward"
 msgstr "Переслати"
 
-#: src/mainwindow.c:2193 src/mainwindow.c:2206
+#: src/mainwindow.c:2202 src/mainwindow.c:2215
 msgid "Forward the message"
 msgstr "Переслати лист"
 
-#: src/mainwindow.c:2213
+#: src/mainwindow.c:2222
 msgid "Delete the message"
 msgstr "Видалити лист"
 
-#: src/mainwindow.c:2221
+#: src/mainwindow.c:2230
 msgid "Execute"
 msgstr "Виконати"
 
-#: src/mainwindow.c:2222
+#: src/mainwindow.c:2231
 msgid "Execute marked process"
 msgstr "Виконати позначений процес"
 
-#: src/mainwindow.c:2231
+#: src/mainwindow.c:2240
 msgid "Next unread message"
 msgstr "Наступний непрочитаний лист"
 
-#: src/mainwindow.c:2242
+#: src/mainwindow.c:2251
 msgid "Prefs"
 msgstr "Налаштування"
 
-#: src/mainwindow.c:2243
+#: src/mainwindow.c:2252
 msgid "Common preferences"
 msgstr "Спільні налаштування"
 
-#: src/mainwindow.c:2250 src/prefs_folder_item.c:258
+#: src/mainwindow.c:2259 src/prefs_folder_item.c:258
 #: src/prefs_folder_item.c:269 src/progressdialog.c:50
 msgid "Account"
 msgstr "Обліковий запис"
 
-#: src/mainwindow.c:2251
+#: src/mainwindow.c:2260
 msgid "Account setting"
 msgstr "Налаштування запису"
 
-#: src/mainwindow.c:2425
+#: src/mainwindow.c:2434
 msgid "You are offline. Click the icon to go online."
 msgstr "З'єднання немає. Клацніть на іконці, щоб під'єднатись."
 
-#: src/mainwindow.c:2436
+#: src/mainwindow.c:2445
 msgid "You are online. Click the icon to go offline."
 msgstr "Ви під'єднані. Клацніть на іконці, щоб від'єднатись."
 
-#: src/mainwindow.c:2624
+#: src/mainwindow.c:2633
 msgid "Exit"
 msgstr "Вихід"
 
-#: src/mainwindow.c:2624
+#: src/mainwindow.c:2633
 msgid "Exit this program?"
 msgstr "Вийти з цієї програми?"
 
@@ -3395,7 +3432,7 @@ msgstr "Пошук закінчено"
 msgid "Creating message view...\n"
 msgstr "Створюємо область перегляду листа...\n"
 
-#: src/messageview.c:303 src/prefs_common.c:1550
+#: src/messageview.c:303 src/prefs_common.c:1562
 msgid "Text"
 msgstr "Текст"
 
@@ -3408,7 +3445,7 @@ msgstr "Вкладення"
 msgid "Can't save the file `%s'."
 msgstr "Не вдалось зберегти файл `%s'."
 
-#: src/messageview.c:697 src/prefs_common.c:2154 src/summaryview.c:2744
+#: src/messageview.c:697 src/prefs_common.c:2166 src/summaryview.c:2744
 msgid "Print"
 msgstr "Друк"
 
@@ -3882,7 +3919,7 @@ msgstr "(Тут складаємо невідфільтровані листи)"
 msgid "Authentication method"
 msgstr "Метод аутентифікації"
 
-#: src/prefs_account.c:1123 src/prefs_account.c:1239 src/prefs_common.c:1189
+#: src/prefs_account.c:1123 src/prefs_account.c:1239 src/prefs_common.c:1201
 msgid "Automatic"
 msgstr "Автоматично"
 
@@ -3906,7 +3943,7 @@ msgstr "Генерувати Message-ID"
 msgid "Add user-defined header"
 msgstr "Вживати заголовок, визначений користувачем"
 
-#: src/prefs_account.c:1196 src/prefs_common.c:1714 src/prefs_common.c:1739
+#: src/prefs_account.c:1196 src/prefs_common.c:1726 src/prefs_common.c:1751
 msgid " Edit... "
 msgstr " Редагувати... "
 
@@ -4302,106 +4339,107 @@ msgid "Save sent messages to outbox"
 msgstr "Зберігати відіслані листи в outbox"
 
 #: src/prefs_common.c:1113
-msgid "Outgoing codeset"
+#, fuzzy
+msgid "Outgoing encoding"
 msgstr "Кодова таблиця для вихідної пошти"
 
 #: src/prefs_common.c:1128
 msgid "Automatic (Recommended)"
 msgstr "Автоматична (рекомендовано)"
 
-#: src/prefs_common.c:1129
+#: src/prefs_common.c:1130
 msgid "7bit ascii (US-ASCII)"
 msgstr "7bit ascii (US-ASCII)"
 
-#: src/prefs_common.c:1130
+#: src/prefs_common.c:1132
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
-#: src/prefs_common.c:1131
+#: src/prefs_common.c:1134
 msgid "Western European (ISO-8859-1)"
 msgstr "Західноєвропейська (ISO-8859-1)"
 
-#: src/prefs_common.c:1132
+#: src/prefs_common.c:1135
 msgid "Western European (ISO-8859-15)"
 msgstr "Західноєвропейська (ISO-8859-15)"
 
-#: src/prefs_common.c:1133
+#: src/prefs_common.c:1137
 msgid "Central European (ISO-8859-2)"
 msgstr "Цнтральноєвропейська (ISO-8859-2)"
 
-#: src/prefs_common.c:1134
+#: src/prefs_common.c:1139
 msgid "Baltic (ISO-8859-13)"
 msgstr "Балтійська (ISO-8859-13)"
 
-#: src/prefs_common.c:1135
+#: src/prefs_common.c:1140
 msgid "Baltic (ISO-8859-4)"
 msgstr "Балтійська (ISO-8859-4)"
 
-#: src/prefs_common.c:1136
+#: src/prefs_common.c:1142
 msgid "Greek (ISO-8859-7)"
 msgstr "Грецька (ISO-8859-7)"
 
-#: src/prefs_common.c:1137
+#: src/prefs_common.c:1144
 msgid "Turkish (ISO-8859-9)"
 msgstr "Турецька (ISO-8859-9)"
 
-#: src/prefs_common.c:1138
+#: src/prefs_common.c:1146
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Кирилиця (ISO-8859-5)"
 
-#: src/prefs_common.c:1139
+#: src/prefs_common.c:1147
 msgid "Cyrillic (KOI8-R)"
 msgstr "Кирилиця (KOI8-R)"
 
-#: src/prefs_common.c:1140
-msgid "Cyrillic (Windows-1251)"
-msgstr "Кирилиця (Windows-1251)"
-
-#: src/prefs_common.c:1141
+#: src/prefs_common.c:1148
 msgid "Cyrillic (KOI8-U)"
 msgstr "Кирилиця (KOI8-U)"
 
-#: src/prefs_common.c:1142
+#: src/prefs_common.c:1149
+msgid "Cyrillic (Windows-1251)"
+msgstr "Кирилиця (Windows-1251)"
+
+#: src/prefs_common.c:1151
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Японська (ISO-2022-JP)"
 
-#: src/prefs_common.c:1144
+#: src/prefs_common.c:1153
 msgid "Japanese (EUC-JP)"
 msgstr "Японська (EUC-JP)"
 
-#: src/prefs_common.c:1145
+#: src/prefs_common.c:1154
 msgid "Japanese (Shift_JIS)"
 msgstr "Японська (Shift_JIS)"
 
-#: src/prefs_common.c:1147
+#: src/prefs_common.c:1157
 msgid "Simplified Chinese (GB2312)"
 msgstr "Спрощена китайська (GB2312)"
 
-#: src/prefs_common.c:1148
+#: src/prefs_common.c:1158
 msgid "Traditional Chinese (Big5)"
 msgstr "Традиційна китайська (Big5)"
 
-#: src/prefs_common.c:1150
+#: src/prefs_common.c:1160
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Традиційна китайська (EUC-TW)"
 
-#: src/prefs_common.c:1151
+#: src/prefs_common.c:1161
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Китайська (ISO-2022-CN)"
 
-#: src/prefs_common.c:1153
+#: src/prefs_common.c:1164
 msgid "Korean (EUC-KR)"
 msgstr "Корейська (EUC-KR)"
 
-#: src/prefs_common.c:1154
+#: src/prefs_common.c:1166
 msgid "Thai (TIS-620)"
 msgstr "Тайська (TIS-620)"
 
-#: src/prefs_common.c:1155
+#: src/prefs_common.c:1167
 msgid "Thai (Windows-874)"
 msgstr "Тайська (Windows-874)"
 
-#: src/prefs_common.c:1165
+#: src/prefs_common.c:1177
 #, fuzzy
 msgid ""
 "If `Automatic' is selected, the optimal encoding for the current locale will "
@@ -4410,11 +4448,11 @@ msgstr ""
 "Якщо включено `Автоматична', буде обрано оптимальне\n"
 "кодування для діючої locale."
 
-#: src/prefs_common.c:1179
+#: src/prefs_common.c:1191
 msgid "Transfer encoding"
 msgstr "Кодування пересилки"
 
-#: src/prefs_common.c:1202
+#: src/prefs_common.c:1214
 #, fuzzy
 msgid ""
 "Specify Content-Transfer-Encoding used when message body contains non-ASCII "
@@ -4423,118 +4461,118 @@ msgstr ""
 "Вкажіть Content-Transfer-Encoding для вживання,\n"
 "якщо тіло листа містить не-ASCII символи."
 
-#: src/prefs_common.c:1272
+#: src/prefs_common.c:1284
 msgid "Signature separator"
 msgstr "Розділювач підпису"
 
-#: src/prefs_common.c:1281
+#: src/prefs_common.c:1293
 msgid "Insert automatically"
 msgstr "Вставити автоматично"
 
-#: src/prefs_common.c:1291
+#: src/prefs_common.c:1303
 msgid "Automatically launch the external editor"
 msgstr "Автоматично запускати зовнішній редактор"
 
-#: src/prefs_common.c:1301
+#: src/prefs_common.c:1313
 msgid "Undo level"
 msgstr "Рівень Undo"
 
-#: src/prefs_common.c:1321
+#: src/prefs_common.c:1333
 msgid "Wrap messages at"
 msgstr "Згортати рядки листів після"
 
-#: src/prefs_common.c:1333
+#: src/prefs_common.c:1345
 msgid "characters"
 msgstr "символів"
 
-#: src/prefs_common.c:1343
+#: src/prefs_common.c:1355
 msgid "Wrap quotation"
 msgstr "Згортати цитування"
 
-#: src/prefs_common.c:1349
+#: src/prefs_common.c:1361
 msgid "Wrap on input"
 msgstr "Згорнути при вводі"
 
-#: src/prefs_common.c:1351
+#: src/prefs_common.c:1363
 msgid "Wrap before sending"
 msgstr "Згортати перед відсиланням"
 
-#: src/prefs_common.c:1361
+#: src/prefs_common.c:1373
 msgid "Automatically select account for replies"
 msgstr "Автоматично вибирати запис для відповідей"
 
-#: src/prefs_common.c:1363
+#: src/prefs_common.c:1375
 msgid "Quote message when replying"
 msgstr "Цитувати лист при відповіді"
 
-#: src/prefs_common.c:1365
+#: src/prefs_common.c:1377
 msgid "Reply button invokes mailing list reply"
 msgstr "Кнопка відповіді запускає відповідь конференції"
 
 #. reply
-#: src/prefs_common.c:1411
+#: src/prefs_common.c:1423
 msgid "Reply format"
 msgstr "Формат відповіді"
 
-#: src/prefs_common.c:1426 src/prefs_common.c:1468
+#: src/prefs_common.c:1438 src/prefs_common.c:1480
 msgid "Quotation mark"
 msgstr "Знак цитати"
 
 #. forward
-#: src/prefs_common.c:1453
+#: src/prefs_common.c:1465
 msgid "Forward format"
 msgstr "Формат пересилання"
 
-#: src/prefs_common.c:1500
+#: src/prefs_common.c:1512
 msgid " Description of symbols "
 msgstr " Опис символів "
 
-#: src/prefs_common.c:1541
+#: src/prefs_common.c:1553
 msgid "Font"
 msgstr "Шрифт"
 
-#: src/prefs_common.c:1573
+#: src/prefs_common.c:1585
 msgid "Translate header name (such as `From:', `Subject:')"
 msgstr "Перекладати назви полів заголовка (як `From:', `Subject:')"
 
-#: src/prefs_common.c:1576
+#: src/prefs_common.c:1588
 msgid "Display unread number next to folder name"
 msgstr "Показувати кількість непрочитаного після назви папки"
 
-#: src/prefs_common.c:1585
+#: src/prefs_common.c:1597
 msgid "Abbreviate newsgroups longer than"
 msgstr "Скорочувати назви конференцій, довші ніж"
 
-#: src/prefs_common.c:1600
+#: src/prefs_common.c:1612
 msgid "letters"
 msgstr "літер"
 
 #. ---- Summary ----
-#: src/prefs_common.c:1606
+#: src/prefs_common.c:1618
 msgid "Summary View"
 msgstr "Список повідомлень"
 
-#: src/prefs_common.c:1615
+#: src/prefs_common.c:1627
 msgid "Display recipient on `From' column if sender is yourself"
 msgstr "Показувати отримувача в колонці `Від', якщо відправник - Ви"
 
-#: src/prefs_common.c:1617
+#: src/prefs_common.c:1629
 msgid "Expand threads"
 msgstr "Розгортати обговорення"
 
-#: src/prefs_common.c:1625 src/prefs_common.c:2443 src/prefs_common.c:2481
+#: src/prefs_common.c:1637 src/prefs_common.c:2455 src/prefs_common.c:2493
 msgid "Date format"
 msgstr "Формат дати"
 
-#: src/prefs_common.c:1646
+#: src/prefs_common.c:1658
 msgid " Set display item of summary... "
 msgstr " Показувати наступні поля... "
 
-#: src/prefs_common.c:1710
+#: src/prefs_common.c:1722
 msgid "Enable coloration of message"
 msgstr "Дозволити розфарбування листів"
 
-#: src/prefs_common.c:1724
+#: src/prefs_common.c:1736
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
@@ -4542,323 +4580,323 @@ msgstr ""
 "Відображати 2-байтний алфавіт і числа\n"
 "однобайтним символом (для японської мови)"
 
-#: src/prefs_common.c:1730
+#: src/prefs_common.c:1742
 msgid "Display header pane above message view"
 msgstr "Показувати панель заголовка над листом"
 
-#: src/prefs_common.c:1737
+#: src/prefs_common.c:1749
 msgid "Display short headers on message view"
 msgstr "Показувати скорочені заголовки при перегляді листів"
 
-#: src/prefs_common.c:1758
+#: src/prefs_common.c:1770
 msgid "Line space"
 msgstr "Міжрядковий інтервал"
 
-#: src/prefs_common.c:1772 src/prefs_common.c:1810
+#: src/prefs_common.c:1784 src/prefs_common.c:1822
 msgid "pixel(s)"
 msgstr "пікселів"
 
-#: src/prefs_common.c:1777
+#: src/prefs_common.c:1789
 msgid "Scroll"
 msgstr "Прокрутка"
 
-#: src/prefs_common.c:1784
+#: src/prefs_common.c:1796
 msgid "Half page"
 msgstr "Півсторінки"
 
-#: src/prefs_common.c:1790
+#: src/prefs_common.c:1802
 msgid "Smooth scroll"
 msgstr "Плавна прокрутка"
 
-#: src/prefs_common.c:1796
+#: src/prefs_common.c:1808
 msgid "Step"
 msgstr "Крок"
 
-#: src/prefs_common.c:1816
+#: src/prefs_common.c:1828
 msgid "Images"
 msgstr ""
 
-#: src/prefs_common.c:1824
+#: src/prefs_common.c:1836
 msgid "Resize attached large images to fit in the window"
 msgstr "Масштабувати приєднані картинки відповідно до вікна"
 
-#: src/prefs_common.c:1826
+#: src/prefs_common.c:1838
 #, fuzzy
 msgid "Display images as inline"
 msgstr "Налаштування відображення заголовка"
 
-#: src/prefs_common.c:1871
+#: src/prefs_common.c:1883
 msgid "Automatically check signatures"
 msgstr "Автоматично перевіряти підписи"
 
-#: src/prefs_common.c:1874
+#: src/prefs_common.c:1886
 msgid "Show signature check result in a popup window"
 msgstr "Показувати результат перевірки підпису у спливаючому вікні"
 
-#: src/prefs_common.c:1877
+#: src/prefs_common.c:1889
 msgid "Store passphrase in memory temporarily"
 msgstr "Тимчасово зберігати пароль в пам'яті"
 
-#: src/prefs_common.c:1892
+#: src/prefs_common.c:1904
 msgid "Expired after"
 msgstr "Недійсний після"
 
-#: src/prefs_common.c:1905
+#: src/prefs_common.c:1917
 msgid "minute(s) "
 msgstr "хвилин "
 
-#: src/prefs_common.c:1918
+#: src/prefs_common.c:1930
 #, fuzzy
 msgid "Setting to '0' will store the passphrase for the whole session."
 msgstr ""
 "(Присвоєння '0' зберігає пароль протягом\n"
 " всієї сесії)"
 
-#: src/prefs_common.c:1932
+#: src/prefs_common.c:1944
 msgid "Grab input while entering a passphrase"
 msgstr "Захопити ввід при введенні паролю"
 
-#: src/prefs_common.c:1937
+#: src/prefs_common.c:1949
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "Попереджати при запуску, якщо GnuPG не працює"
 
-#: src/prefs_common.c:1989
+#: src/prefs_common.c:2001
 msgid "Always open messages in summary when selected"
 msgstr "Завжди відкривати листи у списку при виділенні"
 
-#: src/prefs_common.c:1993
+#: src/prefs_common.c:2005
 msgid "Open first unread message when entering a folder"
 msgstr "Відкривати перший непрочитаний лист, входячи в папку"
 
-#: src/prefs_common.c:1997
+#: src/prefs_common.c:2009
 msgid "Only mark message as read when opened in new window"
 msgstr "Позначати як прочитаний тільки лист, відкритий у новому вікні"
 
-#: src/prefs_common.c:2001
+#: src/prefs_common.c:2013
 msgid "Go to inbox after receiving new mail"
 msgstr "Переходити у папку `Вхідні', отримавши нову пошту"
 
-#: src/prefs_common.c:2009
+#: src/prefs_common.c:2021
 msgid "Execute immediately when moving or deleting messages"
 msgstr "Виконувати негайно після видалення чи переміщення листів"
 
-#: src/prefs_common.c:2021
+#: src/prefs_common.c:2033
 #, fuzzy
 msgid "Messages will be marked until execution if this is turned off."
 msgstr ""
 "(Листи буде позначено до виконання,\n"
 " якщо це вимкнути)"
 
-#: src/prefs_common.c:2029
+#: src/prefs_common.c:2041
 msgid "Receive dialog"
 msgstr "Діалог отримання"
 
-#: src/prefs_common.c:2039
+#: src/prefs_common.c:2051
 msgid "Show receive dialog"
 msgstr "Показувати діалог отримання"
 
-#: src/prefs_common.c:2049
+#: src/prefs_common.c:2061
 msgid "Always"
 msgstr "Завжди"
 
-#: src/prefs_common.c:2050
+#: src/prefs_common.c:2062
 msgid "Only on manual receiving"
 msgstr "Тільки при ручному отриманні"
 
-#: src/prefs_common.c:2052
+#: src/prefs_common.c:2064
 msgid "Never"
 msgstr "Ніколи"
 
-#: src/prefs_common.c:2057
+#: src/prefs_common.c:2069
 msgid "Don't popup error dialog on receive error"
 msgstr "Не видавати діалог при помилці отримання"
 
-#: src/prefs_common.c:2060
+#: src/prefs_common.c:2072
 msgid "Close receive dialog when finished"
 msgstr "Закрити діалог отримання після завершення"
 
-#: src/prefs_common.c:2066
+#: src/prefs_common.c:2078
 msgid " Set key bindings... "
 msgstr " Встановити гарячі клавіші... "
 
-#: src/prefs_common.c:2122
+#: src/prefs_common.c:2134
 #, c-format
 msgid "External commands (%s will be replaced with file name / URI)"
 msgstr "Зовнішні команди (%s буде замінено на ім'я файлу / URI)"
 
-#: src/prefs_common.c:2131
+#: src/prefs_common.c:2143
 msgid "Web browser"
 msgstr "Web-браузер"
 
-#: src/prefs_common.c:2195
+#: src/prefs_common.c:2207
 msgid "Add address to destination when double-clicked"
 msgstr "Додати адресу до призначення, коли клацнути двічі"
 
-#: src/prefs_common.c:2197
+#: src/prefs_common.c:2209
 msgid "On exit"
 msgstr "При виході"
 
-#: src/prefs_common.c:2205
+#: src/prefs_common.c:2217
 msgid "Confirm on exit"
 msgstr "Підтвердити при виході"
 
-#: src/prefs_common.c:2212
+#: src/prefs_common.c:2224
 msgid "Empty trash on exit"
 msgstr "При виході очищати кошик"
 
-#: src/prefs_common.c:2214
+#: src/prefs_common.c:2226
 msgid "Ask before emptying"
 msgstr "Питати перед очищенням"
 
-#: src/prefs_common.c:2218
+#: src/prefs_common.c:2230
 msgid "Warn if there are queued messages"
 msgstr "Попереджати, якщо є листи в черзі"
 
-#: src/prefs_common.c:2224
+#: src/prefs_common.c:2236
 msgid "Socket I/O timeout:"
 msgstr "Таймаут сокета вводу/виводу"
 
-#: src/prefs_common.c:2237
+#: src/prefs_common.c:2249
 msgid "second(s)"
 msgstr "секунд"
 
-#: src/prefs_common.c:2419
+#: src/prefs_common.c:2431
 msgid "the full abbreviated weekday name"
 msgstr "повна скорочена назва дня тижня"
 
-#: src/prefs_common.c:2420
+#: src/prefs_common.c:2432
 msgid "the full weekday name"
 msgstr "повна назва дня тижня"
 
-#: src/prefs_common.c:2421
+#: src/prefs_common.c:2433
 msgid "the abbreviated month name"
 msgstr "скорочена назва місяця"
 
-#: src/prefs_common.c:2422
+#: src/prefs_common.c:2434
 msgid "the full month name"
 msgstr "повна назва місяця"
 
-#: src/prefs_common.c:2423
+#: src/prefs_common.c:2435
 msgid "the preferred date and time for the current locale"
 msgstr "бажана дата і час для поточної locale"
 
-#: src/prefs_common.c:2424
+#: src/prefs_common.c:2436
 msgid "the century number (year/100)"
 msgstr "номер сторіччя (рік/100)"
 
-#: src/prefs_common.c:2425
+#: src/prefs_common.c:2437
 msgid "the day of the month as a decimal number"
 msgstr "день місяця як десяткове число"
 
-#: src/prefs_common.c:2426
+#: src/prefs_common.c:2438
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "година як десяткове число за 24-годинним циферблатом"
 
-#: src/prefs_common.c:2427
+#: src/prefs_common.c:2439
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "година як десяткове число за 12-годинним циферблатом"
 
-#: src/prefs_common.c:2428
+#: src/prefs_common.c:2440
 msgid "the day of the year as a decimal number"
 msgstr "день року як десяткове число"
 
-#: src/prefs_common.c:2429
+#: src/prefs_common.c:2441
 msgid "the month as a decimal number"
 msgstr "місяць як десяткове число"
 
-#: src/prefs_common.c:2430
+#: src/prefs_common.c:2442
 msgid "the minute as a decimal number"
 msgstr "хвилини як десяткове число"
 
-#: src/prefs_common.c:2431
+#: src/prefs_common.c:2443
 msgid "either AM or PM"
 msgstr "AM чи PM"
 
-#: src/prefs_common.c:2432
+#: src/prefs_common.c:2444
 msgid "the second as a decimal number"
 msgstr "секунди як десяткове число"
 
-#: src/prefs_common.c:2433
+#: src/prefs_common.c:2445
 msgid "the day of the week as a decimal number"
 msgstr "день тижня як десяткове число"
 
-#: src/prefs_common.c:2434
+#: src/prefs_common.c:2446
 msgid "the preferred date for the current locale"
 msgstr "бажана дата для поточної locale"
 
-#: src/prefs_common.c:2435
+#: src/prefs_common.c:2447
 msgid "the last two digits of a year"
 msgstr "останні дві цифри року"
 
-#: src/prefs_common.c:2436
+#: src/prefs_common.c:2448
 msgid "the year as a decimal number"
 msgstr "рік як десяткове число"
 
-#: src/prefs_common.c:2437
+#: src/prefs_common.c:2449
 msgid "the time zone or name or abbreviation"
 msgstr "часова зона або ім'я або скорочення"
 
-#: src/prefs_common.c:2458
+#: src/prefs_common.c:2470
 msgid "Specifier"
 msgstr "Специфікатор"
 
-#: src/prefs_common.c:2459
+#: src/prefs_common.c:2471
 msgid "Description"
 msgstr "Опис"
 
-#: src/prefs_common.c:2499
+#: src/prefs_common.c:2511
 msgid "Example"
 msgstr "Приклад"
 
-#: src/prefs_common.c:2580
+#: src/prefs_common.c:2592
 msgid "Set message colors"
 msgstr "Встановити кольори листа"
 
-#: src/prefs_common.c:2588
+#: src/prefs_common.c:2600
 msgid "Colors"
 msgstr "Кольори"
 
-#: src/prefs_common.c:2622
+#: src/prefs_common.c:2634
 msgid "Quoted Text - First Level"
 msgstr "Цитований текст - перший рівень"
 
-#: src/prefs_common.c:2628
+#: src/prefs_common.c:2640
 msgid "Quoted Text - Second Level"
 msgstr "Цитований текст - другий рівень"
 
-#: src/prefs_common.c:2634
+#: src/prefs_common.c:2646
 msgid "Quoted Text - Third Level"
 msgstr "Цитований текст - третій рівень"
 
-#: src/prefs_common.c:2640
+#: src/prefs_common.c:2652
 msgid "URI link"
 msgstr "URI link"
 
-#: src/prefs_common.c:2647
+#: src/prefs_common.c:2659
 msgid "Recycle quote colors"
 msgstr "Повторно використати кольори цитування"
 
-#: src/prefs_common.c:2707
+#: src/prefs_common.c:2719
 msgid "Pick color for quotation level 1"
 msgstr "Обрати колір для цитування рівня 1"
 
-#: src/prefs_common.c:2710
+#: src/prefs_common.c:2722
 msgid "Pick color for quotation level 2"
 msgstr "Обрати колір для цитування рівня 2"
 
-#: src/prefs_common.c:2713
+#: src/prefs_common.c:2725
 msgid "Pick color for quotation level 3"
 msgstr "Обрати колір для цитування рівня 3"
 
-#: src/prefs_common.c:2716
+#: src/prefs_common.c:2728
 msgid "Pick color for URI"
 msgstr "Обрати колір для URI"
 
-#: src/prefs_common.c:2853
+#: src/prefs_common.c:2865
 msgid "Description of symbols"
 msgstr "Опис символів"
 
-#: src/prefs_common.c:2909
+#: src/prefs_common.c:2921
 msgid ""
 "Date\n"
 "From\n"
@@ -4882,11 +4920,11 @@ msgstr ""
 "Newsgroups\n"
 "Message-ID"
 
-#: src/prefs_common.c:2922
+#: src/prefs_common.c:2934
 msgid "If x is set, displays expr"
 msgstr "якщо встановлено x, показує expr"
 
-#: src/prefs_common.c:2926
+#: src/prefs_common.c:2938
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -4900,7 +4938,7 @@ msgstr ""
 "Тіло цитованого повідомлення без підпису\n"
 "Буквально %"
 
-#: src/prefs_common.c:2934
+#: src/prefs_common.c:2946
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -4912,15 +4950,15 @@ msgstr ""
 "Буквальна відкриваюча фігурна дужка\n"
 "Буквальна закриваюча фігурна дужка"
 
-#: src/prefs_common.c:2971
+#: src/prefs_common.c:2983
 msgid "Font selection"
 msgstr "Вибір шрифта"
 
-#: src/prefs_common.c:3035
+#: src/prefs_common.c:3047
 msgid "Key bindings"
 msgstr "Гарячі клавіші"
 
-#: src/prefs_common.c:3049
+#: src/prefs_common.c:3061
 msgid ""
 "Select the preset of key bindings.\n"
 "You can also modify each menu's shortcuts by pressing\n"
@@ -4930,11 +4968,11 @@ msgstr ""
 "Ви також можете змінити кожен shortcut меню, натиснувши\n"
 "будь-яку(і) клавішу(і), тримаючи вказівник миші на пункті."
 
-#: src/prefs_common.c:3061 src/prefs_common.c:3410
+#: src/prefs_common.c:3073 src/prefs_common.c:3422
 msgid "Default"
 msgstr "По замовчуванню"
 
-#: src/prefs_common.c:3064 src/prefs_common.c:3419
+#: src/prefs_common.c:3076 src/prefs_common.c:3431
 msgid "Old Sylpheed"
 msgstr "Старий Sylpheed"
 
@@ -6077,6 +6115,12 @@ msgstr "%.2fGB"
 msgid "writing to %s failed.\n"
 msgstr "Невдача запису в %s.\n"
 
+#~ msgid "/_View/_Code set/---"
+#~ msgstr "/Вигляд/Кодова таблиця/---"
+
+#~ msgid "/_View/_Code set"
+#~ msgstr "/Вигляд/Кодова таблиця"
+
 #~ msgid "To save this part, pop up the context menu with "
 #~ msgstr "Щоб зберегти цю частину, викличте контекстне меню "
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 76a3c7f0..91df1a09 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: 2005-03-15 14:29+0900\n"
+"POT-Creation-Date: 2005-03-16 14:47+0900\n"
 "PO-Revision-Date: 2005-02-02 09:02+0800\n"
 "Last-Translator: Wang Jian <lark@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
@@ -95,7 +95,7 @@ msgstr ""
 "时会检查新邮件。"
 
 #: src/account.c:638 src/addressadd.c:186 src/addressbook.c:488
-#: src/compose.c:3650 src/editaddress.c:195 src/editaddress.c:936
+#: src/compose.c:3748 src/editaddress.c:195 src/editaddress.c:936
 #: src/editaddress.c:984 src/editbook.c:191 src/editgroup.c:257
 #: src/editjpilot.c:296 src/editldap.c:300 src/editvcard.c:211
 #: src/mimeview.c:151 src/prefs_filter.c:214 src/prefs_folder_item.c:170
@@ -148,13 +148,13 @@ msgstr "删除帐号"
 msgid "Do you really want to delete this account?"
 msgstr "您真的要删除该帐号吗？"
 
-#: src/account.c:758 src/compose.c:2551 src/compose.c:4807
+#: src/account.c:758 src/compose.c:2632 src/compose.c:4943
 #: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
 #: src/folderview.c:2156 src/folderview.c:2192
 msgid "Yes"
 msgstr "是"
 
-#: src/account.c:758 src/compose.c:2551 src/compose.c:4807
+#: src/account.c:758 src/compose.c:2632 src/compose.c:4943
 #: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
 #: src/folderview.c:2156 src/folderview.c:2192
 msgid "+No"
@@ -259,7 +259,7 @@ msgstr "动作的用户参数"
 msgid "Add Address to Book"
 msgstr "将地址添加到地址簿"
 
-#: src/addressadd.c:196 src/compose.c:4191 src/editaddress.c:196
+#: src/addressadd.c:196 src/compose.c:4292 src/editaddress.c:196
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "地址"
@@ -273,7 +273,7 @@ msgstr "注释"
 msgid "Select Address Book Folder"
 msgstr "选择地址簿文件夹"
 
-#: src/addressbook.c:334 src/compose.c:469 src/mainwindow.c:454
+#: src/addressbook.c:334 src/compose.c:477 src/mainwindow.c:454
 #: src/messageview.c:134
 msgid "/_File"
 msgstr "/文件(_F)"
@@ -294,8 +294,8 @@ msgstr "/文件(_F)/新建 JPilot(_J)"
 msgid "/_File/New _Server"
 msgstr "/文件(_F)/新建服务器(_S)"
 
-#: src/addressbook.c:343 src/addressbook.c:346 src/compose.c:474
-#: src/compose.c:479 src/compose.c:483 src/mainwindow.c:471
+#: src/addressbook.c:343 src/addressbook.c:346 src/compose.c:482
+#: src/compose.c:487 src/compose.c:491 src/mainwindow.c:471
 #: src/mainwindow.c:474 src/mainwindow.c:476 src/mainwindow.c:479
 #: src/mainwindow.c:481 src/messageview.c:137
 msgid "/_File/---"
@@ -313,7 +313,7 @@ msgstr "/文件(_F)/删除(_D)"
 msgid "/_File/_Save"
 msgstr "/文件(_F)/保存(_S)"
 
-#: src/addressbook.c:348 src/compose.c:484 src/messageview.c:138
+#: src/addressbook.c:348 src/compose.c:492 src/messageview.c:138
 msgid "/_File/_Close"
 msgstr "/文件(_F)/关闭(_C)"
 
@@ -345,7 +345,7 @@ msgstr "/地址(_A)/编辑(_E)"
 msgid "/_Address/_Delete"
 msgstr "/地址(_A)/删除(_D)"
 
-#: src/addressbook.c:356 src/compose.c:585 src/mainwindow.c:688
+#: src/addressbook.c:356 src/compose.c:664 src/mainwindow.c:697
 #: src/messageview.c:246
 msgid "/_Tools"
 msgstr "/工具(_T)"
@@ -354,12 +354,12 @@ msgstr "/工具(_T)"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/工具(_T)/导入LDIF文件(_L)"
 
-#: src/addressbook.c:358 src/compose.c:598 src/mainwindow.c:733
+#: src/addressbook.c:358 src/compose.c:677 src/mainwindow.c:742
 #: src/messageview.c:264
 msgid "/_Help"
 msgstr "/帮助(_H)"
 
-#: src/addressbook.c:359 src/compose.c:599 src/mainwindow.c:744
+#: src/addressbook.c:359 src/compose.c:678 src/mainwindow.c:753
 #: src/messageview.c:265
 msgid "/_Help/_About"
 msgstr "/帮助(_H)/关于(_A)"
@@ -376,7 +376,7 @@ msgstr "/新建组(_G)"
 msgid "/New _Folder"
 msgstr "/新建文件夹(_F)"
 
-#: src/addressbook.c:381 src/addressbook.c:391 src/compose.c:463
+#: src/addressbook.c:381 src/addressbook.c:391 src/compose.c:471
 #: src/folderview.c:220 src/folderview.c:222 src/folderview.c:226
 #: src/folderview.c:236 src/folderview.c:238 src/folderview.c:240
 #: src/folderview.c:244 src/folderview.c:254 src/folderview.c:256
@@ -386,7 +386,7 @@ msgstr "/新建文件夹(_F)"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:382 src/addressbook.c:392 src/compose.c:486
+#: src/addressbook.c:382 src/addressbook.c:392 src/compose.c:494
 #: src/mainwindow.c:485 src/messageview.c:140
 msgid "/_Edit"
 msgstr "/编辑(_E)"
@@ -399,7 +399,7 @@ msgstr "/删除(_D)"
 msgid "E-Mail address"
 msgstr "电子邮件地址"
 
-#: src/addressbook.c:493 src/compose.c:4192 src/prefs_common.c:2186
+#: src/addressbook.c:493 src/compose.c:4293 src/prefs_common.c:2198
 msgid "Address book"
 msgstr "地址簿"
 
@@ -409,7 +409,7 @@ msgstr "姓名："
 
 #. Buttons
 #: src/addressbook.c:625 src/addressbook.c:1665 src/addressbook.c:1671
-#: src/editaddress.c:878 src/editaddress.c:1011 src/mainwindow.c:2212
+#: src/editaddress.c:878 src/editaddress.c:1011 src/mainwindow.c:2221
 #: src/prefs_actions.c:263 src/prefs_display_header.c:275
 #: src/prefs_display_header.c:330 src/prefs_template.c:227
 msgid "Delete"
@@ -593,7 +593,7 @@ msgstr "公用地址"
 msgid "Personal address"
 msgstr "个人地址"
 
-#: src/alertpanel.c:123 src/compose.c:4807 src/main.c:458
+#: src/alertpanel.c:123 src/compose.c:4943 src/main.c:458
 msgid "Notice"
 msgstr "注意"
 
@@ -601,7 +601,7 @@ msgstr "注意"
 msgid "Warning"
 msgstr "警告"
 
-#: src/alertpanel.c:149 src/compose.c:2551 src/inc.c:558
+#: src/alertpanel.c:149 src/compose.c:2632 src/inc.c:558
 msgid "Error"
 msgstr "错误"
 
@@ -649,299 +649,417 @@ msgstr "棕色"
 msgid "None"
 msgstr "没有"
 
-#: src/compose.c:461
+#: src/compose.c:469
 msgid "/_Add..."
 msgstr "/添加(_A)..."
 
-#: src/compose.c:462
+#: src/compose.c:470
 msgid "/_Remove"
 msgstr "/删除(_R)"
 
-#: src/compose.c:464 src/folderview.c:228 src/folderview.c:246
+#: src/compose.c:472 src/folderview.c:228 src/folderview.c:246
 #: src/folderview.c:261
 msgid "/_Properties..."
 msgstr "/属性(_P)..."
 
-#: src/compose.c:470
+#: src/compose.c:478
 msgid "/_File/_Send"
 msgstr "/文件(_F)/发送(_S)"
 
-#: src/compose.c:472
+#: src/compose.c:480
 msgid "/_File/Send _later"
 msgstr "/文件(_F)/以后发送(_L)"
 
-#: src/compose.c:475
+#: src/compose.c:483
 msgid "/_File/Save to _draft folder"
 msgstr "/文件(_F)/保存到草稿夹(_D)"
 
-#: src/compose.c:477
+#: src/compose.c:485
 msgid "/_File/Save and _keep editing"
 msgstr "/文件(_F)/保存并继续编辑(_K)"
 
-#: src/compose.c:480
+#: src/compose.c:488
 msgid "/_File/_Attach file"
 msgstr "/文件(_F)/添加附件(_A)"
 
-#: src/compose.c:481
+#: src/compose.c:489
 msgid "/_File/_Insert file"
 msgstr "/文件(_F)/插入文件(_I)"
 
-#: src/compose.c:482
+#: src/compose.c:490
 msgid "/_File/Insert si_gnature"
 msgstr "/文件(_F)/插入签名(_G)"
 
-#: src/compose.c:487
+#: src/compose.c:495
 msgid "/_Edit/_Undo"
 msgstr "/编辑(_E)/撤销(_U)"
 
-#: src/compose.c:488
+#: src/compose.c:496
 msgid "/_Edit/_Redo"
 msgstr "/编辑(_E)/重复(_R)"
 
-#: src/compose.c:489 src/compose.c:567 src/mainwindow.c:489
+#: src/compose.c:497 src/compose.c:575 src/mainwindow.c:489
 #: src/messageview.c:143
 msgid "/_Edit/---"
 msgstr "/编辑(_E)/---"
 
-#: src/compose.c:490
+#: src/compose.c:498
 msgid "/_Edit/Cu_t"
 msgstr "/编辑(_E)/剪切(_T)"
 
-#: src/compose.c:491 src/mainwindow.c:486 src/messageview.c:141
+#: src/compose.c:499 src/mainwindow.c:486 src/messageview.c:141
 msgid "/_Edit/_Copy"
 msgstr "/编辑(_E)/复制(_C)"
 
-#: src/compose.c:492
+#: src/compose.c:500
 msgid "/_Edit/_Paste"
 msgstr "/编辑(_E)/粘贴(_P)"
 
-#: src/compose.c:493
+#: src/compose.c:501
 msgid "/_Edit/Paste as _quotation"
 msgstr "/编辑(_E)/作为引文粘贴(_Q)"
 
-#: src/compose.c:495 src/mainwindow.c:487 src/messageview.c:142
+#: src/compose.c:503 src/mainwindow.c:487 src/messageview.c:142
 msgid "/_Edit/Select _all"
 msgstr "/编辑(_E)/全选(_A)"
 
-#: src/compose.c:496
+#: src/compose.c:504
 msgid "/_Edit/A_dvanced"
 msgstr "/编辑(_E)/高级(_D)"
 
-#: src/compose.c:497
+#: src/compose.c:505
 msgid "/_Edit/A_dvanced/Move a character backward"
 msgstr "/编辑(_E)/高级(_D)/向后移动一个字符"
 
-#: src/compose.c:502
+#: src/compose.c:510
 msgid "/_Edit/A_dvanced/Move a character forward"
 msgstr "/编辑(_E)/高级(_D)/向前移动一个字符"
 
-#: src/compose.c:507
+#: src/compose.c:515
 msgid "/_Edit/A_dvanced/Move a word backward"
 msgstr "/编辑(_E)/高级(_D)/向后移动一个单词"
 
-#: src/compose.c:512
+#: src/compose.c:520
 msgid "/_Edit/A_dvanced/Move a word forward"
 msgstr "/编辑(_E)/高级(_D)/向前移动一个单词"
 
-#: src/compose.c:517
+#: src/compose.c:525
 msgid "/_Edit/A_dvanced/Move to beginning of line"
 msgstr "/编辑(_E)/高级(_D)/移至行首"
 
-#: src/compose.c:522
+#: src/compose.c:530
 msgid "/_Edit/A_dvanced/Move to end of line"
 msgstr "/编辑(_E)/高级(_D)/移至行尾"
 
-#: src/compose.c:527
+#: src/compose.c:535
 msgid "/_Edit/A_dvanced/Move to previous line"
 msgstr "/编辑(_E)/高级(_D)/移至上一行"
 
-#: src/compose.c:532
+#: src/compose.c:540
 msgid "/_Edit/A_dvanced/Move to next line"
 msgstr "/编辑(_E)/高级(_D)/移至下一行"
 
-#: src/compose.c:537
+#: src/compose.c:545
 msgid "/_Edit/A_dvanced/Delete a character backward"
 msgstr "/编辑(_E)/高级(_D)/回删一个字符"
 
-#: src/compose.c:542
+#: src/compose.c:550
 msgid "/_Edit/A_dvanced/Delete a character forward"
 msgstr "编辑(_E)/高级(_D)/前删一个字符"
 
-#: src/compose.c:547
+#: src/compose.c:555
 msgid "/_Edit/A_dvanced/Delete a word backward"
 msgstr "/编辑(_E)/高级(_D)/回删一个单词"
 
-#: src/compose.c:552
+#: src/compose.c:560
 msgid "/_Edit/A_dvanced/Delete a word forward"
 msgstr "/编辑(_E)/高级(_D)/前删一个单词"
 
-#: src/compose.c:557
+#: src/compose.c:565
 msgid "/_Edit/A_dvanced/Delete line"
 msgstr "/编辑(_E)/高级(_D)/删除一行"
 
-#: src/compose.c:562
+#: src/compose.c:570
 msgid "/_Edit/A_dvanced/Delete to end of line"
 msgstr "/编辑(_E)/高级(_D)/删除至行尾"
 
-#: src/compose.c:568
+#: src/compose.c:576
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/编辑(_E)/当前段落折行(_W)"
 
-#: src/compose.c:570
+#: src/compose.c:578
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/编辑(_E)/所有长行折行(_L)"
 
-#: src/compose.c:572
+#: src/compose.c:580
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/编辑(_E)/自动折行(_O)"
 
-#: src/compose.c:573 src/mainwindow.c:494 src/messageview.c:147
+#: src/compose.c:581 src/mainwindow.c:494 src/messageview.c:147
 #: src/summaryview.c:370
 msgid "/_View"
 msgstr "/查看(_V)"
 
-#: src/compose.c:574
+#: src/compose.c:582
 msgid "/_View/_To"
 msgstr "/查看(_V)/收件人(_T)"
 
-#: src/compose.c:575
+#: src/compose.c:583
 msgid "/_View/_Cc"
 msgstr "/查看(_V)/抄送(_C)"
 
-#: src/compose.c:576
+#: src/compose.c:584
 msgid "/_View/_Bcc"
 msgstr "/查看(_V)/密件抄送(_B)"
 
-#: src/compose.c:577
+#: src/compose.c:585
 msgid "/_View/_Reply to"
 msgstr "/查看(_V)/回复至(_R)"
 
-#: src/compose.c:578 src/compose.c:580 src/compose.c:582 src/mainwindow.c:512
-#: src/mainwindow.c:515 src/mainwindow.c:541 src/mainwindow.c:565
-#: src/mainwindow.c:641 src/mainwindow.c:645 src/messageview.c:223
+#: src/compose.c:586 src/compose.c:588 src/compose.c:590 src/compose.c:592
+#: src/mainwindow.c:512 src/mainwindow.c:515 src/mainwindow.c:541
+#: src/mainwindow.c:565 src/mainwindow.c:650 src/mainwindow.c:654
+#: src/messageview.c:223
 msgid "/_View/---"
 msgstr "/查看(_V)/---"
 
-#: src/compose.c:579
+#: src/compose.c:587
 msgid "/_View/_Followup to"
 msgstr "/查看(_V)/跟贴(_F)"
 
-#: src/compose.c:581
+#: src/compose.c:589
 msgid "/_View/R_uler"
 msgstr "/查看(_V)/标尺(_U)"
 
-#: src/compose.c:583
+#: src/compose.c:591
 msgid "/_View/_Attachment"
 msgstr "/查看(_V)/附件(_A)"
 
-#: src/compose.c:586 src/mainwindow.c:689 src/messageview.c:247
+#: src/compose.c:598 src/mainwindow.c:572 src/messageview.c:154
+#, fuzzy
+msgid "/_View/Character _encoding"
+msgstr "/查看(_V)/排序(_S)/降序"
+
+#: src/compose.c:599
+msgid "/_View/Character _encoding/_Automatic"
+msgstr ""
+
+#: src/compose.c:601 src/compose.c:607 src/compose.c:613 src/compose.c:617
+#: src/compose.c:623 src/compose.c:627 src/compose.c:631 src/compose.c:641
+#: src/compose.c:645 src/compose.c:653 src/compose.c:657 src/mainwindow.c:568
+#: src/mainwindow.c:575 src/messageview.c:150
+#, fuzzy
+msgid "/_View/Character _encoding/---"
+msgstr "/查看(_V)/排序(_S)/降序"
+
+#: src/compose.c:603 src/mainwindow.c:576 src/messageview.c:158
+#, fuzzy
+msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
+msgstr "/查看(_V)/字符集(_C)/7位 ASCII (US-ASC_II)"
+
+#: src/compose.c:605 src/mainwindow.c:578 src/messageview.c:161
+#, fuzzy
+msgid "/_View/Character _encoding/Unicode (_UTF-8)"
+msgstr "/查看(_V)/字符集(_C)/Unicode (_UTF-8)"
+
+#: src/compose.c:609 src/mainwindow.c:582 src/messageview.c:164
+#, fuzzy
+msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
+msgstr "/查看(_V)/字符集(_C)/西欧 (ISO-8859-_1)"
+
+#: src/compose.c:611 src/mainwindow.c:584 src/messageview.c:166
+#, fuzzy
+msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
+msgstr "/查看(_V)/字符集(_C)/西欧 (ISO-8859-15)"
+
+#: src/compose.c:615 src/mainwindow.c:588 src/messageview.c:169
+#, fuzzy
+msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
+msgstr "/查看(_V)/字符集(_C)/中欧 (ISO-8859-_2)"
+
+#: src/compose.c:619 src/mainwindow.c:592 src/messageview.c:172
+#, fuzzy
+msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
+msgstr "/查看(_V)/字符集(_C)/波罗的语 (ISO-8859-13)"
+
+#: src/compose.c:621 src/mainwindow.c:594 src/messageview.c:174
+#, fuzzy
+msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
+msgstr "/查看(_V)/字符集(_C)/波罗的语 (ISO-8859-_4)"
+
+#: src/compose.c:625 src/mainwindow.c:598 src/messageview.c:177
+#, fuzzy
+msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
+msgstr "/查看(_V)/字符集(_C)/希腊语 (ISO-8859-_7)"
+
+#: src/compose.c:629 src/mainwindow.c:602 src/messageview.c:180
+#, fuzzy
+msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
+msgstr "/查看(_V)/字符集(_C)/土耳其语 (ISO-8859-_9)"
+
+#: src/compose.c:633 src/mainwindow.c:606 src/messageview.c:183
+#, fuzzy
+msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
+msgstr "/查看(_V)/字符集(_C)/斯拉夫语 (ISO-8859-_5)"
+
+#: src/compose.c:635 src/mainwindow.c:608 src/messageview.c:185
+#, fuzzy
+msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
+msgstr "/查看(_V)/字符集(_C)/斯拉夫语 (KOI8-_R)"
+
+#: src/compose.c:637 src/mainwindow.c:610 src/messageview.c:187
+#, fuzzy
+msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
+msgstr "/查看(_V)/字符集(_C)/斯拉夫语 (KOI8-U)"
+
+#: src/compose.c:639 src/mainwindow.c:612 src/messageview.c:189
+#, fuzzy
+msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
+msgstr "/查看(_V)/字符集(_C)/斯拉夫语 (Windows-1251)"
+
+#: src/compose.c:643 src/mainwindow.c:616 src/messageview.c:192
+#, fuzzy
+msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
+msgstr "/查看(_V)/字符集(_C)/日语 (ISO-2022-_JP)"
+
+#: src/compose.c:647 src/mainwindow.c:626 src/messageview.c:201
+#, fuzzy
+msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
+msgstr "/查看(_V)/字符集(_C)/简体中文 (_GB2312)"
+
+#: src/compose.c:649 src/mainwindow.c:628 src/messageview.c:203
+#, fuzzy
+msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
+msgstr "/查看(_V)/字符集(_C)/繁体中文 (_Big5)"
+
+#: src/compose.c:651 src/mainwindow.c:630 src/messageview.c:205
+#, fuzzy
+msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
+msgstr "/查看(_V)/字符集(_C)/繁体中文 (EUC-_TW)"
+
+#: src/compose.c:655 src/mainwindow.c:636 src/messageview.c:210
+#, fuzzy
+msgid "/_View/Character _encoding/Korean (EUC-_KR)"
+msgstr "/查看(_V)/字符集(_C)/朝鲜语 (EUC-_KR)"
+
+#: src/compose.c:659 src/mainwindow.c:642 src/messageview.c:215
+#, fuzzy
+msgid "/_View/Character _encoding/Thai (TIS-620)"
+msgstr "/查看(_V)/字符集(_C)/泰国语 (TIS-620)"
+
+#: src/compose.c:661 src/mainwindow.c:644 src/messageview.c:217
+#, fuzzy
+msgid "/_View/Character _encoding/Thai (Windows-874)"
+msgstr "/查看(_V)/字符集(_C)/泰国语 (Windows-874)"
+
+#: src/compose.c:665 src/mainwindow.c:698 src/messageview.c:247
 msgid "/_Tools/_Address book"
 msgstr "/工具(_T)/地址簿(_A)"
 
-#: src/compose.c:587
+#: src/compose.c:666
 msgid "/_Tools/_Template"
 msgstr "/工具(_T)/模板(_T)"
 
-#: src/compose.c:588 src/mainwindow.c:707 src/messageview.c:262
+#: src/compose.c:667 src/mainwindow.c:716 src/messageview.c:262
 msgid "/_Tools/Actio_ns"
 msgstr "/工具(_T)/动作(_N)"
 
-#: src/compose.c:589 src/compose.c:593 src/mainwindow.c:692
-#: src/mainwindow.c:706 src/mainwindow.c:708 src/mainwindow.c:711
-#: src/mainwindow.c:713 src/messageview.c:250 src/messageview.c:261
+#: src/compose.c:668 src/compose.c:672 src/mainwindow.c:701
+#: src/mainwindow.c:715 src/mainwindow.c:717 src/mainwindow.c:720
+#: src/mainwindow.c:722 src/messageview.c:250 src/messageview.c:261
 msgid "/_Tools/---"
 msgstr "/工具(_T)/---"
 
-#: src/compose.c:590
+#: src/compose.c:669
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/工具(_T)/用外部编辑器编辑(_X)"
 
-#: src/compose.c:594
+#: src/compose.c:673
 msgid "/_Tools/PGP Si_gn"
 msgstr "/工具(_T)/PGP 签名(_G)"
 
-#: src/compose.c:595
+#: src/compose.c:674
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/工具(_T)/PGP 加密(_E)"
 
-#: src/compose.c:800
+#: src/compose.c:879
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s：文件不存在\n"
 
-#: src/compose.c:899 src/compose.c:958 src/procmsg.c:1303
+#: src/compose.c:978 src/compose.c:1037 src/procmsg.c:1303
 msgid "Can't get text part\n"
 msgstr "无法得到文本分块\n"
 
-#: src/compose.c:1340
+#: src/compose.c:1419
 msgid "Quote mark format error."
 msgstr "引文标记格式错误。"
 
-#: src/compose.c:1352
+#: src/compose.c:1431
 msgid "Message reply/forward format error."
 msgstr "邮件回复/转发格式错误。"
 
-#: src/compose.c:1679
+#: src/compose.c:1758
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "文件 %s 不存在\n"
 
-#: src/compose.c:1683
+#: src/compose.c:1762
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "无法获得文件 %s 的大小\n"
 
-#: src/compose.c:1687
+#: src/compose.c:1766
 #, c-format
 msgid "File %s is empty."
 msgstr "文件 %s 是空的。"
 
-#: src/compose.c:1691
+#: src/compose.c:1770
 #, c-format
 msgid "Can't read %s."
 msgstr "无法读取 %s。"
 
-#: src/compose.c:1726
+#: src/compose.c:1805
 #, c-format
 msgid "Message: %s"
 msgstr "邮件：%s"
 
-#: src/compose.c:1797 src/mimeview.c:491
+#: src/compose.c:1876 src/mimeview.c:491
 msgid "Can't get the part of multipart message."
 msgstr "无法获得分块邮件的分块。"
 
-#: src/compose.c:2188
+#: src/compose.c:2267
 msgid " [Edited]"
 msgstr " [已编辑]"
 
-#: src/compose.c:2190
+#: src/compose.c:2269
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - 撰写邮件%s"
 
-#: src/compose.c:2193
+#: src/compose.c:2272
 #, c-format
 msgid "Compose message%s"
 msgstr "撰写邮件%s"
 
-#: src/compose.c:2304
+#: src/compose.c:2383
 msgid "Recipient is not specified."
 msgstr "没有指定收件人。"
 
-#: src/compose.c:2312 src/compose.c:4112 src/mainwindow.c:2144
+#: src/compose.c:2391 src/compose.c:4213 src/mainwindow.c:2153
 #: src/prefs_account.c:703 src/prefs_common.c:850
 msgid "Send"
 msgstr "发送"
 
-#: src/compose.c:2313
+#: src/compose.c:2392
 msgid "Subject is empty. Send it anyway?"
 msgstr "主题是空的。还要发送吗？"
 
-#: src/compose.c:2364
+#: src/compose.c:2443
 msgid "can't get recipient list."
 msgstr "无法获得收件人列表。"
 
-#: src/compose.c:2384
+#: src/compose.c:2463
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -949,26 +1067,26 @@ msgstr ""
 "没有指定发送邮件要用的帐号。\n"
 "请在发送前选择一个邮件帐号。"
 
-#: src/compose.c:2398 src/send_message.c:261
+#: src/compose.c:2477 src/send_message.c:261
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "发送邮件到 %s 时发生错误。"
 
-#: src/compose.c:2421
+#: src/compose.c:2500
 msgid "Can't save the message to outbox."
 msgstr "无法将该邮件保存到发件箱。"
 
-#: src/compose.c:2457
+#: src/compose.c:2536
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "无法找到和当前选中的密钥标识“%s”相联系的钥匙。"
 
-#: src/compose.c:2518 src/compose.c:2739 src/compose.c:2802 src/compose.c:2921
+#: src/compose.c:2597 src/compose.c:2820 src/compose.c:2883 src/compose.c:3003
 #: src/utils.c:2189
 msgid "can't change file mode\n"
 msgstr "无法改变文件属性\n"
 
-#: src/compose.c:2546
+#: src/compose.c:2627
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -978,140 +1096,140 @@ msgstr ""
 "从 %s 转换到 %s。\n"
 "仍然发送吗？"
 
-#: src/compose.c:2610
+#: src/compose.c:2691
 msgid "can't write headers\n"
 msgstr "无法写邮件头\n"
 
-#: src/compose.c:2881
+#: src/compose.c:2963
 msgid "can't remove the old message\n"
 msgstr "无法删除旧邮件\n"
 
-#: src/compose.c:2899
+#: src/compose.c:2981
 msgid "queueing message...\n"
 msgstr "正在排队邮件...\n"
 
-#: src/compose.c:2981
+#: src/compose.c:3063
 msgid "can't find queue folder\n"
 msgstr "无法找到队列文件夹：%s\n"
 
-#: src/compose.c:2988
+#: src/compose.c:3070
 msgid "can't queue the message\n"
 msgstr "无法排队该邮件\n"
 
-#: src/compose.c:3547
+#: src/compose.c:3645
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "生成邮件标识号：%s\n"
 
-#: src/compose.c:3645
+#: src/compose.c:3743
 msgid "Creating compose window...\n"
 msgstr "正在创建撰写窗口...\n"
 
-#: src/compose.c:3648 src/compose.c:4598
+#: src/compose.c:3746 src/compose.c:4734
 msgid "MIME type"
 msgstr "MIME 类型"
 
 #. S_COL_DATE
-#: src/compose.c:3649 src/mimeview.c:150 src/prefs_filter_edit.c:569
+#: src/compose.c:3747 src/mimeview.c:150 src/prefs_filter_edit.c:569
 #: src/prefs_summary_column.c:73 src/select-keys.c:317 src/summaryview.c:386
 msgid "Size"
 msgstr "大小"
 
-#: src/compose.c:3700 src/headerview.c:53 src/summary_search.c:169
+#: src/compose.c:3798 src/headerview.c:53 src/summary_search.c:169
 msgid "From:"
 msgstr "发件人："
 
-#: src/compose.c:4113
+#: src/compose.c:4214
 msgid "Send message"
 msgstr "立即发送邮件"
 
-#: src/compose.c:4121
+#: src/compose.c:4222
 msgid "Send later"
 msgstr "以后发送"
 
-#: src/compose.c:4122
+#: src/compose.c:4223
 msgid "Put into queue folder and send later"
 msgstr "放入队列文件夹，在以后发送"
 
-#: src/compose.c:4130
+#: src/compose.c:4231
 msgid "Draft"
 msgstr "草稿"
 
-#: src/compose.c:4131
+#: src/compose.c:4232
 msgid "Save to draft folder"
 msgstr "保存到草稿文件夹"
 
-#: src/compose.c:4141 src/compose.c:5382
+#: src/compose.c:4242 src/compose.c:5527
 msgid "Insert"
 msgstr "插入"
 
-#: src/compose.c:4142
+#: src/compose.c:4243
 msgid "Insert file"
 msgstr "插入文件内容"
 
-#: src/compose.c:4150
+#: src/compose.c:4251
 msgid "Attach"
 msgstr "附件"
 
-#: src/compose.c:4151
+#: src/compose.c:4252
 msgid "Attach file"
 msgstr "加入附件"
 
 #. signature
-#: src/compose.c:4161 src/prefs_account.c:1339 src/prefs_common.c:1261
+#: src/compose.c:4262 src/prefs_account.c:1339 src/prefs_common.c:1273
 msgid "Signature"
 msgstr "签名"
 
-#: src/compose.c:4162
+#: src/compose.c:4263
 msgid "Insert signature"
 msgstr "插入签名"
 
-#: src/compose.c:4171 src/prefs_common.c:1283 src/prefs_common.c:2165
+#: src/compose.c:4272 src/prefs_common.c:1295 src/prefs_common.c:2177
 msgid "Editor"
 msgstr "编辑器"
 
-#: src/compose.c:4172
+#: src/compose.c:4273
 msgid "Edit with external editor"
 msgstr "使用外部编辑器编辑"
 
-#: src/compose.c:4180
+#: src/compose.c:4281
 msgid "Linewrap"
 msgstr "换行"
 
-#: src/compose.c:4181
+#: src/compose.c:4282
 msgid "Wrap all long lines"
 msgstr "长行换行"
 
-#: src/compose.c:4492
+#: src/compose.c:4628
 msgid "Invalid MIME type."
 msgstr "无效的MIME类型。"
 
-#: src/compose.c:4511
+#: src/compose.c:4647
 msgid "File doesn't exist or is empty."
 msgstr "文件不存在或为空。"
 
-#: src/compose.c:4580
+#: src/compose.c:4716
 msgid "Properties"
 msgstr "属性"
 
-#: src/compose.c:4600
+#: src/compose.c:4736
 msgid "Encoding"
 msgstr "编码方式"
 
-#: src/compose.c:4623 src/prefs_folder_item.c:183
+#: src/compose.c:4759 src/prefs_folder_item.c:183
 msgid "Path"
 msgstr "路径"
 
-#: src/compose.c:4624
+#: src/compose.c:4760
 msgid "File name"
 msgstr "文件名"
 
-#: src/compose.c:4778
+#: src/compose.c:4914
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "外部编辑器命令行无效：“%s”\n"
 
-#: src/compose.c:4804
+#: src/compose.c:4940
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1122,72 +1240,72 @@ msgstr ""
 "强制结束程序？\n"
 "程序组标识号：%d"
 
-#: src/compose.c:4817
+#: src/compose.c:4953
 #, c-format
 msgid "Terminated process group id: %d"
 msgstr "已结束程序组标识号：%d"
 
-#: src/compose.c:4818
+#: src/compose.c:4954
 #, c-format
 msgid "Temporary file: %s"
 msgstr "临时文件：%s"
 
-#: src/compose.c:4842
+#: src/compose.c:4978
 msgid "Compose: input from monitoring process\n"
 msgstr "撰写：从监听进程中输入\n"
 
 #. failed
-#: src/compose.c:4875
+#: src/compose.c:5011
 msgid "Couldn't exec external editor\n"
 msgstr "无法执行外部编辑器\n"
 
-#: src/compose.c:4879
+#: src/compose.c:5015
 msgid "Couldn't write to file\n"
 msgstr "无法写入文件\n"
 
-#: src/compose.c:4881
+#: src/compose.c:5017
 msgid "Pipe read failed\n"
 msgstr "管道读取失败\n"
 
-#: src/compose.c:5182 src/compose.c:5190 src/compose.c:5196
+#: src/compose.c:5318 src/compose.c:5326 src/compose.c:5332
 msgid "Can't queue the message."
 msgstr "无法将该邮件排队。"
 
-#: src/compose.c:5287
+#: src/compose.c:5423
 #, fuzzy
 msgid "Select files"
 msgstr "选择文件"
 
-#: src/compose.c:5309
+#: src/compose.c:5445
 msgid "Select file"
 msgstr "选择文件"
 
-#: src/compose.c:5344
+#: src/compose.c:5480
 msgid "Discard message"
 msgstr "丢弃邮件"
 
-#: src/compose.c:5345
+#: src/compose.c:5481
 msgid "This message has been modified. discard it?"
 msgstr "该邮件已修改。丢弃它？"
 
-#: src/compose.c:5346
+#: src/compose.c:5482
 msgid "Discard"
 msgstr "丢弃"
 
-#: src/compose.c:5346
+#: src/compose.c:5482
 msgid "to Draft"
 msgstr "放入草稿箱"
 
-#: src/compose.c:5379
+#: src/compose.c:5524
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "您要使用模板“%s”吗？"
 
-#: src/compose.c:5381
+#: src/compose.c:5526
 msgid "Apply template"
 msgstr "使用模板"
 
-#: src/compose.c:5382
+#: src/compose.c:5527
 msgid "Replace"
 msgstr "替换"
 
@@ -1626,12 +1744,12 @@ msgstr "正在设置文件夹信息...\n"
 msgid "Setting folder info..."
 msgstr "正在设置文件夹信息..."
 
-#: src/folderview.c:652 src/mainwindow.c:3190 src/setup.c:81
+#: src/folderview.c:652 src/mainwindow.c:3199 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "正在扫描文件夹 %s%c%s ..."
 
-#: src/folderview.c:656 src/mainwindow.c:3195 src/setup.c:86
+#: src/folderview.c:656 src/mainwindow.c:3204 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "正在扫描文件夹 %s ..."
@@ -2087,7 +2205,7 @@ msgstr "导入 LDIF 文件到地址簿"
 msgid "Prev"
 msgstr "上一个"
 
-#: src/importldif.c:761 src/mainwindow.c:2230
+#: src/importldif.c:761 src/mainwindow.c:2239
 msgid "Next"
 msgstr "下一个"
 
@@ -2536,7 +2654,8 @@ msgid "/_View/Separate f_older tree"
 msgstr "/查看(_V)/分离文件夹树窗口(_O)"
 
 #: src/mainwindow.c:514
-msgid "/_View/Separate m_essage view"
+#, fuzzy
+msgid "/_View/Separate _message view"
 msgstr "/查看(_V)/分离邮件视图窗口(_E)"
 
 #: src/mainwindow.c:516
@@ -2672,422 +2791,340 @@ msgstr "/查看(_V)/转到(_G)/下一个用颜色标注的邮件(_B)"
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/查看(_V)/转到(_G)/其它文件夹(_F)..."
 
-#: src/mainwindow.c:568 src/mainwindow.c:575 src/messageview.c:150
-msgid "/_View/_Code set/---"
-msgstr "/查看(_V)/字符集(_C)/---"
-
-#: src/mainwindow.c:572 src/messageview.c:154
-msgid "/_View/_Code set"
-msgstr "/查看(_V)/字符集(_C)"
-
 #: src/mainwindow.c:573 src/messageview.c:155
-msgid "/_View/_Code set/_Auto detect"
+#, fuzzy
+msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/查看(_V)/字符集(_C)/自动检测(_A)"
 
-#: src/mainwindow.c:576 src/messageview.c:158
-msgid "/_View/_Code set/7bit ascii (US-ASC_II)"
-msgstr "/查看(_V)/字符集(_C)/7位 ASCII (US-ASC_II)"
-
-#: src/mainwindow.c:579 src/messageview.c:161
-msgid "/_View/_Code set/Unicode (_UTF-8)"
-msgstr "/查看(_V)/字符集(_C)/Unicode (_UTF-8)"
-
-#: src/mainwindow.c:582 src/messageview.c:164
-msgid "/_View/_Code set/Western European (ISO-8859-_1)"
-msgstr "/查看(_V)/字符集(_C)/西欧 (ISO-8859-_1)"
-
-#: src/mainwindow.c:584 src/messageview.c:166
-msgid "/_View/_Code set/Western European (ISO-8859-15)"
-msgstr "/查看(_V)/字符集(_C)/西欧 (ISO-8859-15)"
-
-#: src/mainwindow.c:587 src/messageview.c:169
-msgid "/_View/_Code set/Central European (ISO-8859-_2)"
-msgstr "/查看(_V)/字符集(_C)/中欧 (ISO-8859-_2)"
-
-#: src/mainwindow.c:590 src/messageview.c:172
-msgid "/_View/_Code set/_Baltic (ISO-8859-13)"
-msgstr "/查看(_V)/字符集(_C)/波罗的语 (ISO-8859-13)"
-
-#: src/mainwindow.c:592 src/messageview.c:174
-msgid "/_View/_Code set/Baltic (ISO-8859-_4)"
-msgstr "/查看(_V)/字符集(_C)/波罗的语 (ISO-8859-_4)"
-
-#: src/mainwindow.c:595 src/messageview.c:177
-msgid "/_View/_Code set/Greek (ISO-8859-_7)"
-msgstr "/查看(_V)/字符集(_C)/希腊语 (ISO-8859-_7)"
-
-#: src/mainwindow.c:598 src/messageview.c:180
-msgid "/_View/_Code set/Turkish (ISO-8859-_9)"
-msgstr "/查看(_V)/字符集(_C)/土耳其语 (ISO-8859-_9)"
-
-#: src/mainwindow.c:601 src/messageview.c:183
-msgid "/_View/_Code set/Cyrillic (ISO-8859-_5)"
-msgstr "/查看(_V)/字符集(_C)/斯拉夫语 (ISO-8859-_5)"
-
-#: src/mainwindow.c:603 src/messageview.c:185
-msgid "/_View/_Code set/Cyrillic (KOI8-_R)"
-msgstr "/查看(_V)/字符集(_C)/斯拉夫语 (KOI8-_R)"
-
-#: src/mainwindow.c:605 src/messageview.c:187
-msgid "/_View/_Code set/Cyrillic (KOI8-U)"
-msgstr "/查看(_V)/字符集(_C)/斯拉夫语 (KOI8-U)"
-
-#: src/mainwindow.c:607 src/messageview.c:189
-msgid "/_View/_Code set/Cyrillic (Windows-1251)"
-msgstr "/查看(_V)/字符集(_C)/斯拉夫语 (Windows-1251)"
-
-#: src/mainwindow.c:610 src/messageview.c:192
-msgid "/_View/_Code set/Japanese (ISO-2022-_JP)"
-msgstr "/查看(_V)/字符集(_C)/日语 (ISO-2022-_JP)"
-
-#: src/mainwindow.c:612 src/messageview.c:194
-msgid "/_View/_Code set/Japanese (ISO-2022-JP-2)"
+#: src/mainwindow.c:618 src/messageview.c:194
+#, fuzzy
+msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/查看(_V)/字符集(_C)/日语 (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:614 src/messageview.c:196
-msgid "/_View/_Code set/Japanese (_EUC-JP)"
+#: src/mainwindow.c:620 src/messageview.c:196
+#, fuzzy
+msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/查看(_V)/字符集(_C)/日语 (_EUC-JP)"
 
-#: src/mainwindow.c:616 src/messageview.c:198
-msgid "/_View/_Code set/Japanese (_Shift__JIS)"
+#: src/mainwindow.c:622 src/messageview.c:198
+#, fuzzy
+msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/查看(_V)/字符集(_C)/日语 (_Shift__JIS)"
 
-#: src/mainwindow.c:619 src/messageview.c:201
-msgid "/_View/_Code set/Simplified Chinese (_GB2312)"
-msgstr "/查看(_V)/字符集(_C)/简体中文 (_GB2312)"
-
-#: src/mainwindow.c:621 src/messageview.c:203
-msgid "/_View/_Code set/Traditional Chinese (_Big5)"
-msgstr "/查看(_V)/字符集(_C)/繁体中文 (_Big5)"
-
-#: src/mainwindow.c:623 src/messageview.c:205
-msgid "/_View/_Code set/Traditional Chinese (EUC-_TW)"
-msgstr "/查看(_V)/字符集(_C)/繁体中文 (EUC-_TW)"
-
-#: src/mainwindow.c:625 src/messageview.c:207
-msgid "/_View/_Code set/Chinese (ISO-2022-_CN)"
+#: src/mainwindow.c:632 src/messageview.c:207
+#, fuzzy
+msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/查看(_V)/字符集(_C)/中文 (ISO-2022-_CN)"
 
-#: src/mainwindow.c:628 src/messageview.c:210
-msgid "/_View/_Code set/Korean (EUC-_KR)"
-msgstr "/查看(_V)/字符集(_C)/朝鲜语 (EUC-_KR)"
-
-#: src/mainwindow.c:630 src/messageview.c:212
-msgid "/_View/_Code set/Korean (ISO-2022-KR)"
+#: src/mainwindow.c:638 src/messageview.c:212
+#, fuzzy
+msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/查看(_V)/字符集(_C)/朝鲜语 (ISO-2022-KR)"
 
-#: src/mainwindow.c:633 src/messageview.c:215
-msgid "/_View/_Code set/Thai (TIS-620)"
-msgstr "/查看(_V)/字符集(_C)/泰国语 (TIS-620)"
-
-#: src/mainwindow.c:635 src/messageview.c:217
-msgid "/_View/_Code set/Thai (Windows-874)"
-msgstr "/查看(_V)/字符集(_C)/泰国语 (Windows-874)"
-
-#: src/mainwindow.c:642 src/summaryview.c:371
+#: src/mainwindow.c:651 src/summaryview.c:371
 msgid "/_View/Open in new _window"
 msgstr "/查看(_V)/在新窗口中打开(_W)"
 
-#: src/mainwindow.c:643 src/messageview.c:224
+#: src/mainwindow.c:652 src/messageview.c:224
 msgid "/_View/Mess_age source"
 msgstr "/查看(_V)/邮件源文件(_A)"
 
-#: src/mainwindow.c:644 src/messageview.c:225
+#: src/mainwindow.c:653 src/messageview.c:225
 msgid "/_View/Show all _header"
 msgstr "/查看(_V)/显示所有邮件头(_H)"
 
-#: src/mainwindow.c:646
+#: src/mainwindow.c:655
 msgid "/_View/_Update summary"
 msgstr "/查看(_V)/更新摘要(_U)"
 
-#: src/mainwindow.c:648 src/messageview.c:227
+#: src/mainwindow.c:657 src/messageview.c:227
 msgid "/_Message"
 msgstr "/邮件(_M)"
 
-#: src/mainwindow.c:649
+#: src/mainwindow.c:658
 msgid "/_Message/Recei_ve"
 msgstr "/邮件(_M)/接收(_V)"
 
-#: src/mainwindow.c:650
+#: src/mainwindow.c:659
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/邮件(_M)/接收(_V)/当前帐号(_C)"
 
-#: src/mainwindow.c:652
+#: src/mainwindow.c:661
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/邮件(_M)/接收(_V)/所有帐号(_A)"
 
-#: src/mainwindow.c:654
+#: src/mainwindow.c:663
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/邮件(_M)/接收(_V)/取消(_G)"
 
-#: src/mainwindow.c:656
+#: src/mainwindow.c:665
 msgid "/_Message/Recei_ve/---"
 msgstr "/邮件(_M)/接收(_V)/---"
 
-#: src/mainwindow.c:657
+#: src/mainwindow.c:666
 msgid "/_Message/_Send queued messages"
 msgstr "/邮件(_M)/发送队列中的邮件(_S)"
 
-#: src/mainwindow.c:658 src/mainwindow.c:660 src/mainwindow.c:667
-#: src/mainwindow.c:672 src/mainwindow.c:676 src/mainwindow.c:685
+#: src/mainwindow.c:667 src/mainwindow.c:669 src/mainwindow.c:676
+#: src/mainwindow.c:681 src/mainwindow.c:685 src/mainwindow.c:694
 #: src/messageview.c:230 src/messageview.c:238 src/messageview.c:243
 msgid "/_Message/---"
 msgstr "/邮件(_M)/---"
 
-#: src/mainwindow.c:659 src/messageview.c:228
+#: src/mainwindow.c:668 src/messageview.c:228
 msgid "/_Message/Compose _new message"
 msgstr "/邮件(_M)/撰写新邮件(_N)"
 
-#: src/mainwindow.c:661 src/messageview.c:231
+#: src/mainwindow.c:670 src/messageview.c:231
 msgid "/_Message/_Reply"
 msgstr "/邮件(_M)/回复(_R)"
 
-#: src/mainwindow.c:662
+#: src/mainwindow.c:671
 msgid "/_Message/Repl_y to"
 msgstr "/邮件(_M)/回复到(_Y)"
 
-#: src/mainwindow.c:663 src/messageview.c:232
+#: src/mainwindow.c:672 src/messageview.c:232
 msgid "/_Message/Repl_y to/_all"
 msgstr "/邮件(_M)/回复到(_Y)/所有人(_AL)"
 
-#: src/mainwindow.c:664 src/messageview.c:234
+#: src/mainwindow.c:673 src/messageview.c:234
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/邮件(_M)/回复到(_Y)/发件人(_S)"
 
-#: src/mainwindow.c:665 src/messageview.c:236
+#: src/mainwindow.c:674 src/messageview.c:236
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/邮件(_M)/回复到(_Y)/邮件列表(_L)"
 
-#: src/mainwindow.c:668 src/messageview.c:239
+#: src/mainwindow.c:677 src/messageview.c:239
 msgid "/_Message/_Forward"
 msgstr "/邮件(_M)/转发(_F)"
 
-#: src/mainwindow.c:669 src/messageview.c:240
+#: src/mainwindow.c:678 src/messageview.c:240
 msgid "/_Message/For_ward as attachment"
 msgstr "/邮件(_M)/作为附件转发(_W)"
 
-#: src/mainwindow.c:671 src/messageview.c:242
+#: src/mainwindow.c:680 src/messageview.c:242
 msgid "/_Message/Redirec_t"
 msgstr "/邮件(_M)/重定向(_T)"
 
-#: src/mainwindow.c:673
+#: src/mainwindow.c:682
 msgid "/_Message/M_ove..."
 msgstr "/邮件(_M)/移动(_O)..."
 
-#: src/mainwindow.c:674
+#: src/mainwindow.c:683
 msgid "/_Message/_Copy..."
 msgstr "/邮件(_M)/复制(_C)..."
 
-#: src/mainwindow.c:675
+#: src/mainwindow.c:684
 msgid "/_Message/_Delete"
 msgstr "/邮件(_M)/删除(_D)"
 
-#: src/mainwindow.c:677
+#: src/mainwindow.c:686
 msgid "/_Message/_Mark"
 msgstr "/邮件(_M)/标记(_M)"
 
-#: src/mainwindow.c:678
+#: src/mainwindow.c:687
 msgid "/_Message/_Mark/_Mark"
 msgstr "/邮件(_M)/标记(_M)/标记(_M)"
 
-#: src/mainwindow.c:679
+#: src/mainwindow.c:688
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/邮件(_M)/标记(_M)/取消标记(_U)"
 
-#: src/mainwindow.c:680
+#: src/mainwindow.c:689
 msgid "/_Message/_Mark/---"
 msgstr "/邮件(_M)/标记(_M)/---"
 
-#: src/mainwindow.c:681
+#: src/mainwindow.c:690
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/邮件(_M)/标记(_M)/标记为未读(_E)"
 
-#: src/mainwindow.c:682
+#: src/mainwindow.c:691
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/邮件(_M)/标记(_M)/标记为已读(_D)"
 
-#: src/mainwindow.c:684
+#: src/mainwindow.c:693
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/邮件(_M)/标记(_M)/全部标记为已读(_R)"
 
-#: src/mainwindow.c:686 src/messageview.c:244
+#: src/mainwindow.c:695 src/messageview.c:244
 msgid "/_Message/Re-_edit"
 msgstr "/邮件(_M)/重新编辑(_E)"
 
-#: src/mainwindow.c:690 src/messageview.c:248
+#: src/mainwindow.c:699 src/messageview.c:248
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/工具(_T)/将发件人添加到地址簿中(_K)"
 
-#: src/mainwindow.c:693
+#: src/mainwindow.c:702
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/工具(_T)/过滤文件夹中所有的邮件(_F)"
 
-#: src/mainwindow.c:695
+#: src/mainwindow.c:704
 msgid "/_Tools/Filter _selected messages"
 msgstr "/工具(_T)/过滤选中的邮件(_S)"
 
-#: src/mainwindow.c:697 src/messageview.c:251
+#: src/mainwindow.c:706 src/messageview.c:251
 msgid "/_Tools/_Create filter rule"
 msgstr "/工具(_T)/创建过滤规则(_C)"
 
-#: src/mainwindow.c:698 src/messageview.c:253
+#: src/mainwindow.c:707 src/messageview.c:253
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/工具(_T)/创建过滤规则(_C)/自动(_A)"
 
-#: src/mainwindow.c:700 src/messageview.c:255
+#: src/mainwindow.c:709 src/messageview.c:255
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/工具(_T)/创建过滤规则(_C)/按发件人(_F)"
 
-#: src/mainwindow.c:702 src/messageview.c:257
+#: src/mainwindow.c:711 src/messageview.c:257
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/工具(_T)/创建过滤规则(_C)/按收件人(_T)"
 
-#: src/mainwindow.c:704 src/messageview.c:259
+#: src/mainwindow.c:713 src/messageview.c:259
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/工具(_T)/创建过滤规则(_C)/按主题(_S)"
 
-#: src/mainwindow.c:709
+#: src/mainwindow.c:718
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/工具(_T)/删除重复的邮件(_P)"
 
-#: src/mainwindow.c:712
+#: src/mainwindow.c:721
 msgid "/_Tools/E_xecute"
 msgstr "/工具(_T)/执行(_X)"
 
-#: src/mainwindow.c:714
+#: src/mainwindow.c:723
 msgid "/_Tools/_Log window"
 msgstr "/工具(_T)/记录窗口(_L)"
 
-#: src/mainwindow.c:716
+#: src/mainwindow.c:725
 msgid "/_Configuration"
 msgstr "/配置(_C)"
 
-#: src/mainwindow.c:717
+#: src/mainwindow.c:726
 msgid "/_Configuration/_Common preferences..."
 msgstr "/配置(_C)/通用首选项(_C)..."
 
-#: src/mainwindow.c:719
+#: src/mainwindow.c:728
 msgid "/_Configuration/_Filter setting..."
 msgstr "/配置(_C)/过滤设置(_F)..."
 
-#: src/mainwindow.c:721
+#: src/mainwindow.c:730
 msgid "/_Configuration/_Template..."
 msgstr "/配置(_C)/模板(_T)..."
 
-#: src/mainwindow.c:722
+#: src/mainwindow.c:731
 msgid "/_Configuration/_Actions..."
 msgstr "/配置(_C)/动作(_A)..."
 
-#: src/mainwindow.c:723
+#: src/mainwindow.c:732
 msgid "/_Configuration/---"
 msgstr "/配置(_C)/---"
 
-#: src/mainwindow.c:724
+#: src/mainwindow.c:733
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/配置(_C)/当前帐号首选项(_P)..."
 
-#: src/mainwindow.c:726
+#: src/mainwindow.c:735
 msgid "/_Configuration/Create _new account..."
 msgstr "/配置(_C)/创建新帐号(_N)..."
 
-#: src/mainwindow.c:728
+#: src/mainwindow.c:737
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/配置(_C)/编辑帐号(_E)..."
 
-#: src/mainwindow.c:730
+#: src/mainwindow.c:739
 msgid "/_Configuration/C_hange current account"
 msgstr "/配置(_C)/改变当前帐号(_H)"
 
-#: src/mainwindow.c:734
+#: src/mainwindow.c:743
 msgid "/_Help/_Manual"
 msgstr "/帮助(_H)/手册(_M)"
 
-#: src/mainwindow.c:735
+#: src/mainwindow.c:744
 msgid "/_Help/_Manual/_English"
 msgstr "/帮助(_H)/手册(_M)/英语(_E)"
 
-#: src/mainwindow.c:736
+#: src/mainwindow.c:745
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/帮助(_H)/手册(_M)/日语(_J)"
 
-#: src/mainwindow.c:737
+#: src/mainwindow.c:746
 msgid "/_Help/_FAQ"
 msgstr "/帮助(_H)/常见问题(_F)"
 
-#: src/mainwindow.c:738
+#: src/mainwindow.c:747
 msgid "/_Help/_FAQ/_English"
 msgstr "/帮助(_H)/常见问题(_F)/英语(_E)"
 
-#: src/mainwindow.c:739
+#: src/mainwindow.c:748
 msgid "/_Help/_FAQ/_German"
 msgstr "/帮助(_H)/常见问题(_F)/德语(_G)"
 
-#: src/mainwindow.c:740
+#: src/mainwindow.c:749
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/帮助(_H)/常见问题(_F)/西班牙语(_S)"
 
-#: src/mainwindow.c:741
+#: src/mainwindow.c:750
 msgid "/_Help/_FAQ/_French"
 msgstr "/帮助(_H)/常见问题(_F)/法语(_F)"
 
-#: src/mainwindow.c:742
+#: src/mainwindow.c:751
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/帮助(_H)/常见问题(_F)/意大利语(_I)"
 
-#: src/mainwindow.c:743
+#: src/mainwindow.c:752
 msgid "/_Help/---"
 msgstr "/帮助(_H)/---"
 
-#: src/mainwindow.c:783
+#: src/mainwindow.c:792
 msgid "Creating main window...\n"
 msgstr "正在创建主窗口...\n"
 
-#: src/mainwindow.c:943
+#: src/mainwindow.c:952
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "主窗口：分配颜色 %d 失败\n"
 
-#: src/mainwindow.c:1021 src/summaryview.c:1368 src/summaryview.c:1677
+#: src/mainwindow.c:1030 src/summaryview.c:1368 src/summaryview.c:1677
 #: src/summaryview.c:1785 src/summaryview.c:1831 src/summaryview.c:2453
 #: src/summaryview.c:3080 src/summaryview.c:3146 src/summaryview.c:3171
 #: src/summaryview.c:3284
 msgid "done.\n"
 msgstr "完成。\n"
 
-#: src/mainwindow.c:1137 src/mainwindow.c:1178 src/mainwindow.c:1206
+#: src/mainwindow.c:1146 src/mainwindow.c:1187 src/mainwindow.c:1215
 msgid "Untitled"
 msgstr "无标题"
 
-#: src/mainwindow.c:1207
+#: src/mainwindow.c:1216
 msgid "none"
 msgstr "无"
 
-#: src/mainwindow.c:1257
+#: src/mainwindow.c:1266
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "正在把窗口分隔方式从 %d 改到 %d\n"
 
-#: src/mainwindow.c:1477
+#: src/mainwindow.c:1486
 msgid "Offline"
 msgstr "离线"
 
-#: src/mainwindow.c:1478
+#: src/mainwindow.c:1487
 msgid "You are offline. Go online?"
 msgstr "您处于离线状态。切换到在线状态吗？"
 
-#: src/mainwindow.c:1492
+#: src/mainwindow.c:1501
 msgid "Empty all trash"
 msgstr "清空所有废件箱"
 
-#: src/mainwindow.c:1493
+#: src/mainwindow.c:1502
 msgid "Empty messages in all trash?"
 msgstr "清空所有废件箱里的信件？"
 
-#: src/mainwindow.c:1521
+#: src/mainwindow.c:1530
 msgid "Add mailbox"
 msgstr "添加邮箱"
 
-#: src/mainwindow.c:1522
+#: src/mainwindow.c:1531
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3096,16 +3133,16 @@ msgstr ""
 "输入邮箱位置。\n"
 "如果指定了已存在的邮箱，它将被自动扫描。"
 
-#: src/mainwindow.c:1528
+#: src/mainwindow.c:1537
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "邮箱“%s”已经存在。"
 
-#: src/mainwindow.c:1533 src/setup.c:57
+#: src/mainwindow.c:1542 src/setup.c:57
 msgid "Mailbox"
 msgstr "邮箱"
 
-#: src/mainwindow.c:1539 src/setup.c:63
+#: src/mainwindow.c:1548 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3114,141 +3151,141 @@ msgstr ""
 "创建邮件箱失败。\n"
 "也许某些文件已经存在，或者您没有写权限。"
 
-#: src/mainwindow.c:1912
+#: src/mainwindow.c:1921
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed－文件夹视图"
 
-#: src/mainwindow.c:1932 src/messageview.c:358
+#: src/mainwindow.c:1941 src/messageview.c:358
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed－邮件视图"
 
-#: src/mainwindow.c:2079 src/summaryview.c:340
+#: src/mainwindow.c:2088 src/summaryview.c:340
 msgid "/_Reply"
 msgstr "/回复(_R)"
 
-#: src/mainwindow.c:2080
+#: src/mainwindow.c:2089
 msgid "/Reply to _all"
 msgstr "/回复到所有人(_A)"
 
-#: src/mainwindow.c:2081
+#: src/mainwindow.c:2090
 msgid "/Reply to _sender"
 msgstr "/回复到发件人(_S)"
 
-#: src/mainwindow.c:2082
+#: src/mainwindow.c:2091
 msgid "/Reply to mailing _list"
 msgstr "/回复到邮件列表(_L)"
 
-#: src/mainwindow.c:2087 src/summaryview.c:347
+#: src/mainwindow.c:2096 src/summaryview.c:347
 msgid "/_Forward"
 msgstr "/转发(_F)"
 
-#: src/mainwindow.c:2088 src/summaryview.c:348
+#: src/mainwindow.c:2097 src/summaryview.c:348
 msgid "/For_ward as attachment"
 msgstr "/作为附件转发(_W)"
 
-#: src/mainwindow.c:2089 src/summaryview.c:349
+#: src/mainwindow.c:2098 src/summaryview.c:349
 msgid "/Redirec_t"
 msgstr "/重定向(_T)"
 
-#: src/mainwindow.c:2125
+#: src/mainwindow.c:2134
 msgid "Get"
 msgstr "接收"
 
-#: src/mainwindow.c:2126
+#: src/mainwindow.c:2135
 msgid "Incorporate new mail"
 msgstr "合并新邮件"
 
-#: src/mainwindow.c:2133
+#: src/mainwindow.c:2142
 msgid "Get all"
 msgstr "全部接收"
 
-#: src/mainwindow.c:2134
+#: src/mainwindow.c:2143
 msgid "Incorporate new mail of all accounts"
 msgstr "合并所有帐号的新邮件"
 
-#: src/mainwindow.c:2145
+#: src/mainwindow.c:2154
 msgid "Send queued message(s)"
 msgstr "发送队列中的邮件"
 
-#: src/mainwindow.c:2155 src/prefs_account.c:705 src/prefs_common.c:852
+#: src/mainwindow.c:2164 src/prefs_account.c:705 src/prefs_common.c:852
 #: src/prefs_folder_item.c:137
 msgid "Compose"
 msgstr "撰写"
 
-#: src/mainwindow.c:2156
+#: src/mainwindow.c:2165
 msgid "Compose new message"
 msgstr "撰写新邮件"
 
-#: src/mainwindow.c:2164 src/prefs_common.c:1353
+#: src/mainwindow.c:2173 src/prefs_common.c:1365
 msgid "Reply"
 msgstr "回复"
 
-#: src/mainwindow.c:2165 src/mainwindow.c:2178
+#: src/mainwindow.c:2174 src/mainwindow.c:2187
 msgid "Reply to the message"
 msgstr "回复该邮件"
 
-#: src/mainwindow.c:2183
+#: src/mainwindow.c:2192
 msgid "Reply all"
 msgstr "全部回复"
 
-#: src/mainwindow.c:2184
+#: src/mainwindow.c:2193
 msgid "Reply to all"
 msgstr "回复给所有人"
 
-#: src/mainwindow.c:2192 src/prefs_filter_edit.c:719
+#: src/mainwindow.c:2201 src/prefs_filter_edit.c:719
 msgid "Forward"
 msgstr "转发"
 
-#: src/mainwindow.c:2193 src/mainwindow.c:2206
+#: src/mainwindow.c:2202 src/mainwindow.c:2215
 msgid "Forward the message"
 msgstr "转发该邮件"
 
-#: src/mainwindow.c:2213
+#: src/mainwindow.c:2222
 msgid "Delete the message"
 msgstr "删除该邮件"
 
-#: src/mainwindow.c:2221
+#: src/mainwindow.c:2230
 msgid "Execute"
 msgstr "执行"
 
-#: src/mainwindow.c:2222
+#: src/mainwindow.c:2231
 msgid "Execute marked process"
 msgstr "执行标记的处理"
 
-#: src/mainwindow.c:2231
+#: src/mainwindow.c:2240
 msgid "Next unread message"
 msgstr "下一个未读的邮件"
 
-#: src/mainwindow.c:2242
+#: src/mainwindow.c:2251
 msgid "Prefs"
 msgstr "首选项"
 
-#: src/mainwindow.c:2243
+#: src/mainwindow.c:2252
 msgid "Common preferences"
 msgstr "通用首选项"
 
-#: src/mainwindow.c:2250 src/prefs_folder_item.c:258
+#: src/mainwindow.c:2259 src/prefs_folder_item.c:258
 #: src/prefs_folder_item.c:269 src/progressdialog.c:50
 msgid "Account"
 msgstr "帐号"
 
-#: src/mainwindow.c:2251
+#: src/mainwindow.c:2260
 msgid "Account setting"
 msgstr "帐号设置"
 
-#: src/mainwindow.c:2425
+#: src/mainwindow.c:2434
 msgid "You are offline. Click the icon to go online."
 msgstr "您处于离线状态。单击图标切换到在线状态。"
 
-#: src/mainwindow.c:2436
+#: src/mainwindow.c:2445
 msgid "You are online. Click the icon to go offline."
 msgstr "您处于在线状态。单击图标切换到离线状态。"
 
-#: src/mainwindow.c:2624
+#: src/mainwindow.c:2633
 msgid "Exit"
 msgstr "退出"
 
-#: src/mainwindow.c:2624
+#: src/mainwindow.c:2633
 msgid "Exit this program?"
 msgstr "要退出本程序吗？"
 
@@ -3374,7 +3411,7 @@ msgstr "搜索结束"
 msgid "Creating message view...\n"
 msgstr "正在创建邮件视图...\n"
 
-#: src/messageview.c:303 src/prefs_common.c:1550
+#: src/messageview.c:303 src/prefs_common.c:1562
 msgid "Text"
 msgstr "文本"
 
@@ -3387,7 +3424,7 @@ msgstr "附件"
 msgid "Can't save the file `%s'."
 msgstr "无法保存文件“%s”'。"
 
-#: src/messageview.c:697 src/prefs_common.c:2154 src/summaryview.c:2744
+#: src/messageview.c:697 src/prefs_common.c:2166 src/summaryview.c:2744
 msgid "Print"
 msgstr "打印"
 
@@ -3860,7 +3897,7 @@ msgstr "(没有过滤的邮件会保存在该文件夹中)"
 msgid "Authentication method"
 msgstr "验证方法"
 
-#: src/prefs_account.c:1123 src/prefs_account.c:1239 src/prefs_common.c:1189
+#: src/prefs_account.c:1123 src/prefs_account.c:1239 src/prefs_common.c:1201
 msgid "Automatic"
 msgstr "自动"
 
@@ -3884,7 +3921,7 @@ msgstr "生成邮件标识"
 msgid "Add user-defined header"
 msgstr "添加用户定义的头域"
 
-#: src/prefs_account.c:1196 src/prefs_common.c:1714 src/prefs_common.c:1739
+#: src/prefs_account.c:1196 src/prefs_common.c:1726 src/prefs_common.c:1751
 msgid " Edit... "
 msgstr " 编辑... "
 
@@ -4279,106 +4316,107 @@ msgid "Save sent messages to outbox"
 msgstr "将已发出的邮件保存在发件箱"
 
 #: src/prefs_common.c:1113
-msgid "Outgoing codeset"
+#, fuzzy
+msgid "Outgoing encoding"
 msgstr "发送时使用的字符集"
 
 #: src/prefs_common.c:1128
 msgid "Automatic (Recommended)"
 msgstr "自动 (建议使用)"
 
-#: src/prefs_common.c:1129
+#: src/prefs_common.c:1130
 msgid "7bit ascii (US-ASCII)"
 msgstr "7位 ASCII (US-ASCII) "
 
-#: src/prefs_common.c:1130
+#: src/prefs_common.c:1132
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
-#: src/prefs_common.c:1131
+#: src/prefs_common.c:1134
 msgid "Western European (ISO-8859-1)"
 msgstr "西欧 (ISO-8859-1)"
 
-#: src/prefs_common.c:1132
+#: src/prefs_common.c:1135
 msgid "Western European (ISO-8859-15)"
 msgstr "西欧 (ISO-8859-15)"
 
-#: src/prefs_common.c:1133
+#: src/prefs_common.c:1137
 msgid "Central European (ISO-8859-2)"
 msgstr "中欧 (ISO-8859-2)"
 
-#: src/prefs_common.c:1134
+#: src/prefs_common.c:1139
 msgid "Baltic (ISO-8859-13)"
 msgstr "波罗的语 (ISO-8859-13)"
 
-#: src/prefs_common.c:1135
+#: src/prefs_common.c:1140
 msgid "Baltic (ISO-8859-4)"
 msgstr "波罗的语 (ISO-8859-4)"
 
-#: src/prefs_common.c:1136
+#: src/prefs_common.c:1142
 msgid "Greek (ISO-8859-7)"
 msgstr "希腊语 (ISO-8859-7)"
 
-#: src/prefs_common.c:1137
+#: src/prefs_common.c:1144
 msgid "Turkish (ISO-8859-9)"
 msgstr "土耳其语 (ISO-8859-9)"
 
-#: src/prefs_common.c:1138
+#: src/prefs_common.c:1146
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "斯拉夫语 (ISO-8859-5)"
 
-#: src/prefs_common.c:1139
+#: src/prefs_common.c:1147
 msgid "Cyrillic (KOI8-R)"
 msgstr "斯拉夫语 (KOI8-R)"
 
-#: src/prefs_common.c:1140
-msgid "Cyrillic (Windows-1251)"
-msgstr "斯拉夫语 (Windows-1251)"
-
-#: src/prefs_common.c:1141
+#: src/prefs_common.c:1148
 msgid "Cyrillic (KOI8-U)"
 msgstr "斯拉夫语 (KOI8-U)"
 
-#: src/prefs_common.c:1142
+#: src/prefs_common.c:1149
+msgid "Cyrillic (Windows-1251)"
+msgstr "斯拉夫语 (Windows-1251)"
+
+#: src/prefs_common.c:1151
 msgid "Japanese (ISO-2022-JP)"
 msgstr "日语 (ISO-2022-JP)"
 
-#: src/prefs_common.c:1144
+#: src/prefs_common.c:1153
 msgid "Japanese (EUC-JP)"
 msgstr "日语 (EUC-JP)"
 
-#: src/prefs_common.c:1145
+#: src/prefs_common.c:1154
 msgid "Japanese (Shift_JIS)"
 msgstr "日语 (Shift_JIS)"
 
-#: src/prefs_common.c:1147
+#: src/prefs_common.c:1157
 msgid "Simplified Chinese (GB2312)"
 msgstr "简体中文 (GB2312)"
 
-#: src/prefs_common.c:1148
+#: src/prefs_common.c:1158
 msgid "Traditional Chinese (Big5)"
 msgstr "繁体中文 (Big5)"
 
-#: src/prefs_common.c:1150
+#: src/prefs_common.c:1160
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "繁体中文 (EUC-TW)"
 
-#: src/prefs_common.c:1151
+#: src/prefs_common.c:1161
 msgid "Chinese (ISO-2022-CN)"
 msgstr "中文 (ISO-2022-CN)"
 
-#: src/prefs_common.c:1153
+#: src/prefs_common.c:1164
 msgid "Korean (EUC-KR)"
 msgstr "朝鲜文 (EUC-KR)"
 
-#: src/prefs_common.c:1154
+#: src/prefs_common.c:1166
 msgid "Thai (TIS-620)"
 msgstr "泰文 (TIS-620)"
 
-#: src/prefs_common.c:1155
+#: src/prefs_common.c:1167
 msgid "Thai (Windows-874)"
 msgstr "泰文 (Windows-874)"
 
-#: src/prefs_common.c:1165
+#: src/prefs_common.c:1177
 #, fuzzy
 msgid ""
 "If `Automatic' is selected, the optimal encoding for the current locale will "
@@ -4387,11 +4425,11 @@ msgstr ""
 "如果选择“自动”，将使用最适合当前区域设置\n"
 "的编码方式。"
 
-#: src/prefs_common.c:1179
+#: src/prefs_common.c:1191
 msgid "Transfer encoding"
 msgstr "发送编码方式"
 
-#: src/prefs_common.c:1202
+#: src/prefs_common.c:1214
 #, fuzzy
 msgid ""
 "Specify Content-Transfer-Encoding used when message body contains non-ASCII "
@@ -4400,118 +4438,118 @@ msgstr ""
 "指定当邮件内容包含非 ASCII 字符时使用的\n"
 "Content-Transfer-Encoding。"
 
-#: src/prefs_common.c:1272
+#: src/prefs_common.c:1284
 msgid "Signature separator"
 msgstr "签名分隔符"
 
-#: src/prefs_common.c:1281
+#: src/prefs_common.c:1293
 msgid "Insert automatically"
 msgstr "自动插入"
 
-#: src/prefs_common.c:1291
+#: src/prefs_common.c:1303
 msgid "Automatically launch the external editor"
 msgstr "自动启动外部编辑器"
 
-#: src/prefs_common.c:1301
+#: src/prefs_common.c:1313
 msgid "Undo level"
 msgstr "撤销次数"
 
-#: src/prefs_common.c:1321
+#: src/prefs_common.c:1333
 msgid "Wrap messages at"
 msgstr "邮件折行于第"
 
-#: src/prefs_common.c:1333
+#: src/prefs_common.c:1345
 msgid "characters"
 msgstr "个字符"
 
-#: src/prefs_common.c:1343
+#: src/prefs_common.c:1355
 msgid "Wrap quotation"
 msgstr "引文折行"
 
-#: src/prefs_common.c:1349
+#: src/prefs_common.c:1361
 msgid "Wrap on input"
 msgstr "输入时折行"
 
-#: src/prefs_common.c:1351
+#: src/prefs_common.c:1363
 msgid "Wrap before sending"
 msgstr "发送前折行"
 
-#: src/prefs_common.c:1361
+#: src/prefs_common.c:1373
 msgid "Automatically select account for replies"
 msgstr "自动选择回复用的帐号"
 
-#: src/prefs_common.c:1363
+#: src/prefs_common.c:1375
 msgid "Quote message when replying"
 msgstr "回复时引用原文"
 
-#: src/prefs_common.c:1365
+#: src/prefs_common.c:1377
 msgid "Reply button invokes mailing list reply"
 msgstr "回复按钮会回复到邮件列表"
 
 #. reply
-#: src/prefs_common.c:1411
+#: src/prefs_common.c:1423
 msgid "Reply format"
 msgstr "回复格式"
 
-#: src/prefs_common.c:1426 src/prefs_common.c:1468
+#: src/prefs_common.c:1438 src/prefs_common.c:1480
 msgid "Quotation mark"
 msgstr "引文符号"
 
 #. forward
-#: src/prefs_common.c:1453
+#: src/prefs_common.c:1465
 msgid "Forward format"
 msgstr "转发格式"
 
-#: src/prefs_common.c:1500
+#: src/prefs_common.c:1512
 msgid " Description of symbols "
 msgstr " 符号描述 "
 
-#: src/prefs_common.c:1541
+#: src/prefs_common.c:1553
 msgid "Font"
 msgstr "字体"
 
-#: src/prefs_common.c:1573
+#: src/prefs_common.c:1585
 msgid "Translate header name (such as `From:', `Subject:')"
 msgstr "翻译邮件头名(如“发件人：”、“主题：”)"
 
-#: src/prefs_common.c:1576
+#: src/prefs_common.c:1588
 msgid "Display unread number next to folder name"
 msgstr "在文件夹名后显示未读邮件的数量"
 
-#: src/prefs_common.c:1585
+#: src/prefs_common.c:1597
 msgid "Abbreviate newsgroups longer than"
 msgstr "缩写新闻组长于"
 
-#: src/prefs_common.c:1600
+#: src/prefs_common.c:1612
 msgid "letters"
 msgstr "信件"
 
 #. ---- Summary ----
-#: src/prefs_common.c:1606
+#: src/prefs_common.c:1618
 msgid "Summary View"
 msgstr "摘要视图"
 
-#: src/prefs_common.c:1615
+#: src/prefs_common.c:1627
 msgid "Display recipient on `From' column if sender is yourself"
 msgstr "如果发件人是您自己，“发件人”栏中显示的是收件人"
 
-#: src/prefs_common.c:1617
+#: src/prefs_common.c:1629
 msgid "Expand threads"
 msgstr "展开线索"
 
-#: src/prefs_common.c:1625 src/prefs_common.c:2443 src/prefs_common.c:2481
+#: src/prefs_common.c:1637 src/prefs_common.c:2455 src/prefs_common.c:2493
 msgid "Date format"
 msgstr "日期格式"
 
-#: src/prefs_common.c:1646
+#: src/prefs_common.c:1658
 msgid " Set display item of summary... "
 msgstr " 设置摘要中显示的项... "
 
-#: src/prefs_common.c:1710
+#: src/prefs_common.c:1722
 msgid "Enable coloration of message"
 msgstr "启用邮件的颜色表示"
 
-#: src/prefs_common.c:1724
+#: src/prefs_common.c:1736
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
@@ -4519,319 +4557,319 @@ msgstr ""
 "用单字节字符显示多字节字母和数字\n"
 "(仅适用于日语)"
 
-#: src/prefs_common.c:1730
+#: src/prefs_common.c:1742
 msgid "Display header pane above message view"
 msgstr "在邮件视图之上显示邮件头面板"
 
-#: src/prefs_common.c:1737
+#: src/prefs_common.c:1749
 msgid "Display short headers on message view"
 msgstr "在邮件视图中显示简短的邮件头"
 
-#: src/prefs_common.c:1758
+#: src/prefs_common.c:1770
 msgid "Line space"
 msgstr "邮件内容行间距"
 
-#: src/prefs_common.c:1772 src/prefs_common.c:1810
+#: src/prefs_common.c:1784 src/prefs_common.c:1822
 msgid "pixel(s)"
 msgstr "个像素"
 
-#: src/prefs_common.c:1777
+#: src/prefs_common.c:1789
 msgid "Scroll"
 msgstr "滚动"
 
-#: src/prefs_common.c:1784
+#: src/prefs_common.c:1796
 msgid "Half page"
 msgstr "半页滚动"
 
-#: src/prefs_common.c:1790
+#: src/prefs_common.c:1802
 msgid "Smooth scroll"
 msgstr "平滑滚动"
 
-#: src/prefs_common.c:1796
+#: src/prefs_common.c:1808
 msgid "Step"
 msgstr "每次滚动"
 
-#: src/prefs_common.c:1816
+#: src/prefs_common.c:1828
 msgid "Images"
 msgstr ""
 
-#: src/prefs_common.c:1824
+#: src/prefs_common.c:1836
 msgid "Resize attached large images to fit in the window"
 msgstr "将附件中的图像缩放至适合窗口大小"
 
-#: src/prefs_common.c:1826
+#: src/prefs_common.c:1838
 #, fuzzy
 msgid "Display images as inline"
 msgstr "邮件头显示设置"
 
-#: src/prefs_common.c:1871
+#: src/prefs_common.c:1883
 msgid "Automatically check signatures"
 msgstr "自动检查签名"
 
-#: src/prefs_common.c:1874
+#: src/prefs_common.c:1886
 msgid "Show signature check result in a popup window"
 msgstr "在弹出窗口中显示签名检查结果"
 
-#: src/prefs_common.c:1877
+#: src/prefs_common.c:1889
 msgid "Store passphrase in memory temporarily"
 msgstr "将口令串临时存放在内存中"
 
-#: src/prefs_common.c:1892
+#: src/prefs_common.c:1904
 msgid "Expired after"
 msgstr "过期时间"
 
-#: src/prefs_common.c:1905
+#: src/prefs_common.c:1917
 msgid "minute(s) "
 msgstr "分钟后"
 
-#: src/prefs_common.c:1918
+#: src/prefs_common.c:1930
 #, fuzzy
 msgid "Setting to '0' will store the passphrase for the whole session."
 msgstr "(设置“0”将在整个会话过程中储存口令串)"
 
-#: src/prefs_common.c:1932
+#: src/prefs_common.c:1944
 msgid "Grab input while entering a passphrase"
 msgstr "输入口令串时捕获输入(更安全)"
 
-#: src/prefs_common.c:1937
+#: src/prefs_common.c:1949
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "如果 GnuPG 无法工作，在启动时显示警告"
 
-#: src/prefs_common.c:1989
+#: src/prefs_common.c:2001
 msgid "Always open messages in summary when selected"
 msgstr ""
 
-#: src/prefs_common.c:1993
+#: src/prefs_common.c:2005
 msgid "Open first unread message when entering a folder"
 msgstr "进入文件夹时打开第一个未读的邮件"
 
-#: src/prefs_common.c:1997
+#: src/prefs_common.c:2009
 msgid "Only mark message as read when opened in new window"
 msgstr "仅在新窗口中打开邮件时标记邮件为已读"
 
-#: src/prefs_common.c:2001
+#: src/prefs_common.c:2013
 msgid "Go to inbox after receiving new mail"
 msgstr "收到新邮件时转到收件箱"
 
-#: src/prefs_common.c:2009
+#: src/prefs_common.c:2021
 msgid "Execute immediately when moving or deleting messages"
 msgstr "当移动或删除邮件时立即执行"
 
-#: src/prefs_common.c:2021
+#: src/prefs_common.c:2033
 #, fuzzy
 msgid "Messages will be marked until execution if this is turned off."
 msgstr "(如果该选项关闭，标记邮件直到完成执行)"
 
-#: src/prefs_common.c:2029
+#: src/prefs_common.c:2041
 msgid "Receive dialog"
 msgstr "收对话框"
 
-#: src/prefs_common.c:2039
+#: src/prefs_common.c:2051
 msgid "Show receive dialog"
 msgstr "显示接收对话框"
 
-#: src/prefs_common.c:2049
+#: src/prefs_common.c:2061
 msgid "Always"
 msgstr "总是"
 
-#: src/prefs_common.c:2050
+#: src/prefs_common.c:2062
 msgid "Only on manual receiving"
 msgstr "仅在手工接收时"
 
-#: src/prefs_common.c:2052
+#: src/prefs_common.c:2064
 msgid "Never"
 msgstr "从不"
 
-#: src/prefs_common.c:2057
+#: src/prefs_common.c:2069
 msgid "Don't popup error dialog on receive error"
 msgstr "在接收错误时不弹出错误对话框"
 
-#: src/prefs_common.c:2060
+#: src/prefs_common.c:2072
 msgid "Close receive dialog when finished"
 msgstr "完成后关闭接收对话框"
 
-#: src/prefs_common.c:2066
+#: src/prefs_common.c:2078
 msgid " Set key bindings... "
 msgstr " 设置键盘关联... "
 
-#: src/prefs_common.c:2122
+#: src/prefs_common.c:2134
 #, c-format
 msgid "External commands (%s will be replaced with file name / URI)"
 msgstr "外部命令 (%s 将被替换为文件名或URI)"
 
-#: src/prefs_common.c:2131
+#: src/prefs_common.c:2143
 msgid "Web browser"
 msgstr "网页浏览器"
 
-#: src/prefs_common.c:2195
+#: src/prefs_common.c:2207
 msgid "Add address to destination when double-clicked"
 msgstr "双击时将地址添加为收件人"
 
-#: src/prefs_common.c:2197
+#: src/prefs_common.c:2209
 msgid "On exit"
 msgstr "退出程序时"
 
-#: src/prefs_common.c:2205
+#: src/prefs_common.c:2217
 msgid "Confirm on exit"
 msgstr "退出时进行确认"
 
-#: src/prefs_common.c:2212
+#: src/prefs_common.c:2224
 msgid "Empty trash on exit"
 msgstr "退出时清空废件箱"
 
-#: src/prefs_common.c:2214
+#: src/prefs_common.c:2226
 msgid "Ask before emptying"
 msgstr "在清空前询问"
 
-#: src/prefs_common.c:2218
+#: src/prefs_common.c:2230
 msgid "Warn if there are queued messages"
 msgstr "如果队列中有邮件就发出警告"
 
-#: src/prefs_common.c:2224
+#: src/prefs_common.c:2236
 msgid "Socket I/O timeout:"
 msgstr "套接字 I/O 超时："
 
-#: src/prefs_common.c:2237
+#: src/prefs_common.c:2249
 msgid "second(s)"
 msgstr "秒"
 
-#: src/prefs_common.c:2419
+#: src/prefs_common.c:2431
 msgid "the full abbreviated weekday name"
 msgstr "缩写的星期名"
 
-#: src/prefs_common.c:2420
+#: src/prefs_common.c:2432
 msgid "the full weekday name"
 msgstr "完整的星期名"
 
-#: src/prefs_common.c:2421
+#: src/prefs_common.c:2433
 msgid "the abbreviated month name"
 msgstr "缩写的月份名"
 
-#: src/prefs_common.c:2422
+#: src/prefs_common.c:2434
 msgid "the full month name"
 msgstr "完整的月份名"
 
-#: src/prefs_common.c:2423
+#: src/prefs_common.c:2435
 msgid "the preferred date and time for the current locale"
 msgstr "当前区域设置首选的日期和时间格式"
 
-#: src/prefs_common.c:2424
+#: src/prefs_common.c:2436
 msgid "the century number (year/100)"
 msgstr "世纪(年份/100)"
 
-#: src/prefs_common.c:2425
+#: src/prefs_common.c:2437
 msgid "the day of the month as a decimal number"
 msgstr "十进制表示的月中的天数"
 
-#: src/prefs_common.c:2426
+#: src/prefs_common.c:2438
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "24小时时钟的十进制小时"
 
-#: src/prefs_common.c:2427
+#: src/prefs_common.c:2439
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "12小时时钟的十进制小时"
 
-#: src/prefs_common.c:2428
+#: src/prefs_common.c:2440
 msgid "the day of the year as a decimal number"
 msgstr "十进制表示的一年中的天数"
 
-#: src/prefs_common.c:2429
+#: src/prefs_common.c:2441
 msgid "the month as a decimal number"
 msgstr "十进制表示的月份"
 
-#: src/prefs_common.c:2430
+#: src/prefs_common.c:2442
 msgid "the minute as a decimal number"
 msgstr "十进制表示的天数"
 
-#: src/prefs_common.c:2431
+#: src/prefs_common.c:2443
 msgid "either AM or PM"
 msgstr "AM或PM"
 
-#: src/prefs_common.c:2432
+#: src/prefs_common.c:2444
 msgid "the second as a decimal number"
 msgstr "十进制表示的秒"
 
-#: src/prefs_common.c:2433
+#: src/prefs_common.c:2445
 msgid "the day of the week as a decimal number"
 msgstr "十进制表示的星期中的天数"
 
-#: src/prefs_common.c:2434
+#: src/prefs_common.c:2446
 msgid "the preferred date for the current locale"
 msgstr "当前区域设置的首选日期格式"
 
-#: src/prefs_common.c:2435
+#: src/prefs_common.c:2447
 msgid "the last two digits of a year"
 msgstr "年份的最后两个数字"
 
-#: src/prefs_common.c:2436
+#: src/prefs_common.c:2448
 msgid "the year as a decimal number"
 msgstr "十进制的年份"
 
-#: src/prefs_common.c:2437
+#: src/prefs_common.c:2449
 msgid "the time zone or name or abbreviation"
 msgstr "时区、名字或缩写"
 
-#: src/prefs_common.c:2458
+#: src/prefs_common.c:2470
 msgid "Specifier"
 msgstr "说明符"
 
-#: src/prefs_common.c:2459
+#: src/prefs_common.c:2471
 msgid "Description"
 msgstr "描述"
 
-#: src/prefs_common.c:2499
+#: src/prefs_common.c:2511
 msgid "Example"
 msgstr "示例"
 
-#: src/prefs_common.c:2580
+#: src/prefs_common.c:2592
 msgid "Set message colors"
 msgstr "设置邮件颜色"
 
-#: src/prefs_common.c:2588
+#: src/prefs_common.c:2600
 msgid "Colors"
 msgstr "颜色"
 
-#: src/prefs_common.c:2622
+#: src/prefs_common.c:2634
 msgid "Quoted Text - First Level"
 msgstr "引文－第一级"
 
-#: src/prefs_common.c:2628
+#: src/prefs_common.c:2640
 msgid "Quoted Text - Second Level"
 msgstr "引文－第二级"
 
-#: src/prefs_common.c:2634
+#: src/prefs_common.c:2646
 msgid "Quoted Text - Third Level"
 msgstr "引文－第三级"
 
-#: src/prefs_common.c:2640
+#: src/prefs_common.c:2652
 msgid "URI link"
 msgstr "URI 链接"
 
-#: src/prefs_common.c:2647
+#: src/prefs_common.c:2659
 msgid "Recycle quote colors"
 msgstr "循环使用引文颜色"
 
-#: src/prefs_common.c:2707
+#: src/prefs_common.c:2719
 msgid "Pick color for quotation level 1"
 msgstr "选择引文级别 1 的颜色"
 
-#: src/prefs_common.c:2710
+#: src/prefs_common.c:2722
 msgid "Pick color for quotation level 2"
 msgstr "选择引文级别 2 的颜色"
 
-#: src/prefs_common.c:2713
+#: src/prefs_common.c:2725
 msgid "Pick color for quotation level 3"
 msgstr "选择引文级别 3 的颜色"
 
-#: src/prefs_common.c:2716
+#: src/prefs_common.c:2728
 msgid "Pick color for URI"
 msgstr "选择URI的颜色"
 
-#: src/prefs_common.c:2853
+#: src/prefs_common.c:2865
 msgid "Description of symbols"
 msgstr "符号的描述"
 
-#: src/prefs_common.c:2909
+#: src/prefs_common.c:2921
 msgid ""
 "Date\n"
 "From\n"
@@ -4855,11 +4893,11 @@ msgstr ""
 "新闻组\n"
 "邮件标识号"
 
-#: src/prefs_common.c:2922
+#: src/prefs_common.c:2934
 msgid "If x is set, displays expr"
 msgstr "如果 x 设置了值则显示 expr"
 
-#: src/prefs_common.c:2926
+#: src/prefs_common.c:2938
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -4873,7 +4911,7 @@ msgstr ""
 "没有签名的引文内容\n"
 "%"
 
-#: src/prefs_common.c:2934
+#: src/prefs_common.c:2946
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -4885,15 +4923,15 @@ msgstr ""
 "左括号\n"
 "右括号"
 
-#: src/prefs_common.c:2971
+#: src/prefs_common.c:2983
 msgid "Font selection"
 msgstr "字体选择"
 
-#: src/prefs_common.c:3035
+#: src/prefs_common.c:3047
 msgid "Key bindings"
 msgstr "键盘关联"
 
-#: src/prefs_common.c:3049
+#: src/prefs_common.c:3061
 msgid ""
 "Select the preset of key bindings.\n"
 "You can also modify each menu's shortcuts by pressing\n"
@@ -4903,11 +4941,11 @@ msgstr ""
 "您也可以将鼠标放在菜单项上并按下任何键\n"
 "(或组合键)来修改菜单快捷键。"
 
-#: src/prefs_common.c:3061 src/prefs_common.c:3410
+#: src/prefs_common.c:3073 src/prefs_common.c:3422
 msgid "Default"
 msgstr "默认"
 
-#: src/prefs_common.c:3064 src/prefs_common.c:3419
+#: src/prefs_common.c:3076 src/prefs_common.c:3431
 msgid "Old Sylpheed"
 msgstr "旧式的Sylpheed"
 
@@ -6050,6 +6088,12 @@ msgstr "%.2fGB"
 msgid "writing to %s failed.\n"
 msgstr "写入 %s 时失败。\n"
 
+#~ msgid "/_View/_Code set/---"
+#~ msgstr "/查看(_V)/字符集(_C)/---"
+
+#~ msgid "/_View/_Code set"
+#~ msgstr "/查看(_V)/字符集(_C)"
+
 #~ msgid "To save this part, pop up the context menu with "
 #~ msgstr "要保存该分块，单击右键弹出上下文菜单"
 
diff --git a/po/zh_TW.Big5.po b/po/zh_TW.Big5.po
index 0f9ca6eb..e54e377d 100644
--- a/po/zh_TW.Big5.po
+++ b/po/zh_TW.Big5.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-03-15 14:29+0900\n"
+"POT-Creation-Date: 2005-03-16 14:47+0900\n"
 "PO-Revision-Date: 2004-12-04 08:24+0800\n"
 "Last-Translator: Frank J. J. Weng <franklin@goodhorse.idv.tw>\n"
 "Language-Team: zh-l10n <zh-l10n@linux.org.tw>\n"
@@ -82,7 +82,7 @@ msgstr ""
 "來決定是否在「全部檢查」時要檢查該帳號的郵件。"
 
 #: src/account.c:638 src/addressadd.c:186 src/addressbook.c:488
-#: src/compose.c:3650 src/editaddress.c:195 src/editaddress.c:936
+#: src/compose.c:3748 src/editaddress.c:195 src/editaddress.c:936
 #: src/editaddress.c:984 src/editbook.c:191 src/editgroup.c:257
 #: src/editjpilot.c:296 src/editldap.c:300 src/editvcard.c:211
 #: src/mimeview.c:151 src/prefs_filter.c:214 src/prefs_folder_item.c:170
@@ -135,13 +135,13 @@ msgstr "刪除帳號"
 msgid "Do you really want to delete this account?"
 msgstr "您確定要刪除這個帳號嗎？"
 
-#: src/account.c:758 src/compose.c:2551 src/compose.c:4807
+#: src/account.c:758 src/compose.c:2632 src/compose.c:4943
 #: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
 #: src/folderview.c:2156 src/folderview.c:2192
 msgid "Yes"
 msgstr "是的"
 
-#: src/account.c:758 src/compose.c:2551 src/compose.c:4807
+#: src/account.c:758 src/compose.c:2632 src/compose.c:4943
 #: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
 #: src/folderview.c:2156 src/folderview.c:2192
 msgid "+No"
@@ -246,7 +246,7 @@ msgstr "使用者設定之命令參數"
 msgid "Add Address to Book"
 msgstr "將位址加入位址簿"
 
-#: src/addressadd.c:196 src/compose.c:4191 src/editaddress.c:196
+#: src/addressadd.c:196 src/compose.c:4292 src/editaddress.c:196
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "位址"
@@ -260,7 +260,7 @@ msgstr "備註"
 msgid "Select Address Book Folder"
 msgstr "選擇位址簿資料夾"
 
-#: src/addressbook.c:334 src/compose.c:469 src/mainwindow.c:454
+#: src/addressbook.c:334 src/compose.c:477 src/mainwindow.c:454
 #: src/messageview.c:134
 msgid "/_File"
 msgstr "/檔案(_F)"
@@ -281,8 +281,8 @@ msgstr "/檔案(_F)/新增J-Pilot(_J)"
 msgid "/_File/New _Server"
 msgstr "/檔案(_F)/新增伺服器(_S)"
 
-#: src/addressbook.c:343 src/addressbook.c:346 src/compose.c:474
-#: src/compose.c:479 src/compose.c:483 src/mainwindow.c:471
+#: src/addressbook.c:343 src/addressbook.c:346 src/compose.c:482
+#: src/compose.c:487 src/compose.c:491 src/mainwindow.c:471
 #: src/mainwindow.c:474 src/mainwindow.c:476 src/mainwindow.c:479
 #: src/mainwindow.c:481 src/messageview.c:137
 msgid "/_File/---"
@@ -300,7 +300,7 @@ msgstr "/檔案(_F)/刪除(_D)"
 msgid "/_File/_Save"
 msgstr "/檔案(_F)/儲存(_S)"
 
-#: src/addressbook.c:348 src/compose.c:484 src/messageview.c:138
+#: src/addressbook.c:348 src/compose.c:492 src/messageview.c:138
 msgid "/_File/_Close"
 msgstr "/檔案(_F)/關閉(_C)"
 
@@ -332,7 +332,7 @@ msgstr "/位址(_A)/編輯(_E)"
 msgid "/_Address/_Delete"
 msgstr "/位址(_A)/刪除(_D)"
 
-#: src/addressbook.c:356 src/compose.c:585 src/mainwindow.c:688
+#: src/addressbook.c:356 src/compose.c:664 src/mainwindow.c:697
 #: src/messageview.c:246
 msgid "/_Tools"
 msgstr "/工具(_T)"
@@ -341,12 +341,12 @@ msgstr "/工具(_T)"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/工具(_T)/匯入 LDIF 檔(_L)"
 
-#: src/addressbook.c:358 src/compose.c:598 src/mainwindow.c:733
+#: src/addressbook.c:358 src/compose.c:677 src/mainwindow.c:742
 #: src/messageview.c:264
 msgid "/_Help"
 msgstr "/說明(_H)"
 
-#: src/addressbook.c:359 src/compose.c:599 src/mainwindow.c:744
+#: src/addressbook.c:359 src/compose.c:678 src/mainwindow.c:753
 #: src/messageview.c:265
 msgid "/_Help/_About"
 msgstr "/說明(_H)/關於(_A)"
@@ -363,7 +363,7 @@ msgstr "/新增群組(_G)"
 msgid "/New _Folder"
 msgstr "/新增資料夾(_F)"
 
-#: src/addressbook.c:381 src/addressbook.c:391 src/compose.c:463
+#: src/addressbook.c:381 src/addressbook.c:391 src/compose.c:471
 #: src/folderview.c:220 src/folderview.c:222 src/folderview.c:226
 #: src/folderview.c:236 src/folderview.c:238 src/folderview.c:240
 #: src/folderview.c:244 src/folderview.c:254 src/folderview.c:256
@@ -373,7 +373,7 @@ msgstr "/新增資料夾(_F)"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:382 src/addressbook.c:392 src/compose.c:486
+#: src/addressbook.c:382 src/addressbook.c:392 src/compose.c:494
 #: src/mainwindow.c:485 src/messageview.c:140
 msgid "/_Edit"
 msgstr "/編輯(_E)"
@@ -386,7 +386,7 @@ msgstr "/刪除(_D)"
 msgid "E-Mail address"
 msgstr "E-Mail位址"
 
-#: src/addressbook.c:493 src/compose.c:4192 src/prefs_common.c:2186
+#: src/addressbook.c:493 src/compose.c:4293 src/prefs_common.c:2198
 msgid "Address book"
 msgstr "位址簿"
 
@@ -396,7 +396,7 @@ msgstr "姓名："
 
 #. Buttons
 #: src/addressbook.c:625 src/addressbook.c:1665 src/addressbook.c:1671
-#: src/editaddress.c:878 src/editaddress.c:1011 src/mainwindow.c:2212
+#: src/editaddress.c:878 src/editaddress.c:1011 src/mainwindow.c:2221
 #: src/prefs_actions.c:263 src/prefs_display_header.c:275
 #: src/prefs_display_header.c:330 src/prefs_template.c:227
 msgid "Delete"
@@ -584,7 +584,7 @@ msgstr "共用位址紀錄"
 msgid "Personal address"
 msgstr "私人位址紀錄"
 
-#: src/alertpanel.c:123 src/compose.c:4807 src/main.c:458
+#: src/alertpanel.c:123 src/compose.c:4943 src/main.c:458
 msgid "Notice"
 msgstr "注意"
 
@@ -592,7 +592,7 @@ msgstr "注意"
 msgid "Warning"
 msgstr "警告"
 
-#: src/alertpanel.c:149 src/compose.c:2551 src/inc.c:558
+#: src/alertpanel.c:149 src/compose.c:2632 src/inc.c:558
 msgid "Error"
 msgstr "錯誤"
 
@@ -640,299 +640,417 @@ msgstr "棕色"
 msgid "None"
 msgstr "無"
 
-#: src/compose.c:461
+#: src/compose.c:469
 msgid "/_Add..."
 msgstr "/新增...(_A)"
 
-#: src/compose.c:462
+#: src/compose.c:470
 msgid "/_Remove"
 msgstr "/刪除(_R)"
 
-#: src/compose.c:464 src/folderview.c:228 src/folderview.c:246
+#: src/compose.c:472 src/folderview.c:228 src/folderview.c:246
 #: src/folderview.c:261
 msgid "/_Properties..."
 msgstr "/內容...(_P)"
 
-#: src/compose.c:470
+#: src/compose.c:478
 msgid "/_File/_Send"
 msgstr "/檔案(_F)/傳送(_S)"
 
-#: src/compose.c:472
+#: src/compose.c:480
 msgid "/_File/Send _later"
 msgstr "/信件(_M)/待會傳送(_l)"
 
-#: src/compose.c:475
+#: src/compose.c:483
 msgid "/_File/Save to _draft folder"
 msgstr "/信件(_M)/儲存至草稿資料夾(_d)"
 
-#: src/compose.c:477
+#: src/compose.c:485
 msgid "/_File/Save and _keep editing"
 msgstr "/信件(_M)/儲存並繼續編輯(_k)"
 
-#: src/compose.c:480
+#: src/compose.c:488
 msgid "/_File/_Attach file"
 msgstr "/檔案(_F)/附加檔案(_A)"
 
-#: src/compose.c:481
+#: src/compose.c:489
 msgid "/_File/_Insert file"
 msgstr "/檔案(_F)/插入檔案(_I)"
 
-#: src/compose.c:482
+#: src/compose.c:490
 msgid "/_File/Insert si_gnature"
 msgstr "/檔案(_F)/插入簽名(_g)"
 
-#: src/compose.c:487
+#: src/compose.c:495
 msgid "/_Edit/_Undo"
 msgstr "/編輯(_E)/復原(_U)"
 
-#: src/compose.c:488
+#: src/compose.c:496
 msgid "/_Edit/_Redo"
 msgstr "/編輯(_E)/重複前一個動作(_R)"
 
-#: src/compose.c:489 src/compose.c:567 src/mainwindow.c:489
+#: src/compose.c:497 src/compose.c:575 src/mainwindow.c:489
 #: src/messageview.c:143
 msgid "/_Edit/---"
 msgstr "/編輯(_E)/---"
 
-#: src/compose.c:490
+#: src/compose.c:498
 msgid "/_Edit/Cu_t"
 msgstr "/編輯(_E)/剪下(_t)"
 
-#: src/compose.c:491 src/mainwindow.c:486 src/messageview.c:141
+#: src/compose.c:499 src/mainwindow.c:486 src/messageview.c:141
 msgid "/_Edit/_Copy"
 msgstr "/編輯(_E)/複製(_C)"
 
-#: src/compose.c:492
+#: src/compose.c:500
 msgid "/_Edit/_Paste"
 msgstr "/編輯(_E)/貼上(_P)"
 
-#: src/compose.c:493
+#: src/compose.c:501
 msgid "/_Edit/Paste as _quotation"
 msgstr "/編輯(_E)/貼進引言(_q)"
 
-#: src/compose.c:495 src/mainwindow.c:487 src/messageview.c:142
+#: src/compose.c:503 src/mainwindow.c:487 src/messageview.c:142
 msgid "/_Edit/Select _all"
 msgstr "/編輯(_E)/全選(_a)"
 
-#: src/compose.c:496
+#: src/compose.c:504
 msgid "/_Edit/A_dvanced"
 msgstr "/編輯(_E)/進階(_d)"
 
-#: src/compose.c:497
+#: src/compose.c:505
 msgid "/_Edit/A_dvanced/Move a character backward"
 msgstr "/編輯(_E)/進階(_d)/後移一字元"
 
-#: src/compose.c:502
+#: src/compose.c:510
 msgid "/_Edit/A_dvanced/Move a character forward"
 msgstr "/編輯(_E)/進階(_d)/前移一字元"
 
-#: src/compose.c:507
+#: src/compose.c:515
 msgid "/_Edit/A_dvanced/Move a word backward"
 msgstr "/編輯(_E)/進階(_d)/後移一字"
 
-#: src/compose.c:512
+#: src/compose.c:520
 msgid "/_Edit/A_dvanced/Move a word forward"
 msgstr "/編輯(_E)/進階(_d)/前移一字"
 
-#: src/compose.c:517
+#: src/compose.c:525
 msgid "/_Edit/A_dvanced/Move to beginning of line"
 msgstr "/編輯(_E)/進階(_d)/移到行開頭"
 
-#: src/compose.c:522
+#: src/compose.c:530
 msgid "/_Edit/A_dvanced/Move to end of line"
 msgstr "/編輯(_E)/進階(_d)/移到行尾"
 
-#: src/compose.c:527
+#: src/compose.c:535
 msgid "/_Edit/A_dvanced/Move to previous line"
 msgstr "/編輯(_E)/進階(_d)/移到前一行"
 
-#: src/compose.c:532
+#: src/compose.c:540
 msgid "/_Edit/A_dvanced/Move to next line"
 msgstr "/編輯(_E)/進階(_d)/移到下一行"
 
-#: src/compose.c:537
+#: src/compose.c:545
 msgid "/_Edit/A_dvanced/Delete a character backward"
 msgstr "/編輯(_E)/進階(_d)/往後刪除一字元"
 
-#: src/compose.c:542
+#: src/compose.c:550
 msgid "/_Edit/A_dvanced/Delete a character forward"
 msgstr "/編輯(_E)/進階(_d)/往前刪除一字元"
 
-#: src/compose.c:547
+#: src/compose.c:555
 msgid "/_Edit/A_dvanced/Delete a word backward"
 msgstr "/編輯(_E)/進階(_d)/往後刪除一字"
 
-#: src/compose.c:552
+#: src/compose.c:560
 msgid "/_Edit/A_dvanced/Delete a word forward"
 msgstr "/編輯(_E)/進階(_d)/往前刪除一字"
 
-#: src/compose.c:557
+#: src/compose.c:565
 msgid "/_Edit/A_dvanced/Delete line"
 msgstr "/編輯(_E)/進階(_d)/刪除一行"
 
-#: src/compose.c:562
+#: src/compose.c:570
 msgid "/_Edit/A_dvanced/Delete to end of line"
 msgstr "/編輯(_E)/進階(_d)/從游標處起刪除至行尾"
 
-#: src/compose.c:568
+#: src/compose.c:576
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/編輯(_E)/將目前段落折行(_W)"
 
-#: src/compose.c:570
+#: src/compose.c:578
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/編輯(_E)/將所有過長的行折行(_l)"
 
-#: src/compose.c:572
+#: src/compose.c:580
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/編輯(_E)/自動換行(_o)"
 
-#: src/compose.c:573 src/mainwindow.c:494 src/messageview.c:147
+#: src/compose.c:581 src/mainwindow.c:494 src/messageview.c:147
 #: src/summaryview.c:370
 msgid "/_View"
 msgstr "/顯示(_V)"
 
-#: src/compose.c:574
+#: src/compose.c:582
 msgid "/_View/_To"
 msgstr "/顯示(_V)/收件人(_T)"
 
-#: src/compose.c:575
+#: src/compose.c:583
 msgid "/_View/_Cc"
 msgstr "/顯示(_V)/副本(_C)"
 
-#: src/compose.c:576
+#: src/compose.c:584
 msgid "/_View/_Bcc"
 msgstr "/顯示(_V)/密件副本(_s)"
 
-#: src/compose.c:577
+#: src/compose.c:585
 msgid "/_View/_Reply to"
 msgstr "/顯示(_V)/回覆(_R)"
 
-#: src/compose.c:578 src/compose.c:580 src/compose.c:582 src/mainwindow.c:512
-#: src/mainwindow.c:515 src/mainwindow.c:541 src/mainwindow.c:565
-#: src/mainwindow.c:641 src/mainwindow.c:645 src/messageview.c:223
+#: src/compose.c:586 src/compose.c:588 src/compose.c:590 src/compose.c:592
+#: src/mainwindow.c:512 src/mainwindow.c:515 src/mainwindow.c:541
+#: src/mainwindow.c:565 src/mainwindow.c:650 src/mainwindow.c:654
+#: src/messageview.c:223
 msgid "/_View/---"
 msgstr "/顯示(_V)/---"
 
-#: src/compose.c:579
+#: src/compose.c:587
 msgid "/_View/_Followup to"
 msgstr "/顯示(_V)/回應文章(_F)"
 
-#: src/compose.c:581
+#: src/compose.c:589
 msgid "/_View/R_uler"
 msgstr "/顯示(_V)/尺規(_u)"
 
-#: src/compose.c:583
+#: src/compose.c:591
 msgid "/_View/_Attachment"
 msgstr "/顯示(_V)/附加(_A)"
 
-#: src/compose.c:586 src/mainwindow.c:689 src/messageview.c:247
+#: src/compose.c:598 src/mainwindow.c:572 src/messageview.c:154
+#, fuzzy
+msgid "/_View/Character _encoding"
+msgstr "/顯示(_V)/排序(_S)/遞減排序"
+
+#: src/compose.c:599
+msgid "/_View/Character _encoding/_Automatic"
+msgstr ""
+
+#: src/compose.c:601 src/compose.c:607 src/compose.c:613 src/compose.c:617
+#: src/compose.c:623 src/compose.c:627 src/compose.c:631 src/compose.c:641
+#: src/compose.c:645 src/compose.c:653 src/compose.c:657 src/mainwindow.c:568
+#: src/mainwindow.c:575 src/messageview.c:150
+#, fuzzy
+msgid "/_View/Character _encoding/---"
+msgstr "/顯示(_V)/排序(_S)/遞減排序"
+
+#: src/compose.c:603 src/mainwindow.c:576 src/messageview.c:158
+#, fuzzy
+msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
+msgstr "/顯示(_V)/字集(_C)/7位元 ASCII 字集(US-ASC_II)"
+
+#: src/compose.c:605 src/mainwindow.c:578 src/messageview.c:161
+#, fuzzy
+msgid "/_View/Character _encoding/Unicode (_UTF-8)"
+msgstr "/顯示(_V)/字集(_C)/Unicode (_UTF-8)"
+
+#: src/compose.c:609 src/mainwindow.c:582 src/messageview.c:164
+#, fuzzy
+msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
+msgstr "/顯示(_V)/字集(_C)/西歐語系 (ISO-8859-_1)"
+
+#: src/compose.c:611 src/mainwindow.c:584 src/messageview.c:166
+#, fuzzy
+msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
+msgstr "/顯示(_V)/字集(_C)/西歐語系 (ISO-8859-15)"
+
+#: src/compose.c:615 src/mainwindow.c:588 src/messageview.c:169
+#, fuzzy
+msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
+msgstr "/顯示(_V)/字集(_C)/中歐語系 (ISO-8859-_2)"
+
+#: src/compose.c:619 src/mainwindow.c:592 src/messageview.c:172
+#, fuzzy
+msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
+msgstr "/顯示(_V)/字集(_C)/_波羅的海語系 (ISO-8859-13)(_B)"
+
+#: src/compose.c:621 src/mainwindow.c:594 src/messageview.c:174
+#, fuzzy
+msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
+msgstr "/顯示(_V)/字集(_C)/波羅的海語系 (ISO-8859-_4)"
+
+#: src/compose.c:625 src/mainwindow.c:598 src/messageview.c:177
+#, fuzzy
+msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
+msgstr "/顯示(_V)/字集(_C)/希臘語 (ISO-8859-_7)"
+
+#: src/compose.c:629 src/mainwindow.c:602 src/messageview.c:180
+#, fuzzy
+msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
+msgstr "/顯示(_V)/字集(_C)/土耳其語 (ISO-8859-_9)"
+
+#: src/compose.c:633 src/mainwindow.c:606 src/messageview.c:183
+#, fuzzy
+msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
+msgstr "/顯示(_V)/字集(_C)/斯拉夫語 (ISO-8859-_5)"
+
+#: src/compose.c:635 src/mainwindow.c:608 src/messageview.c:185
+#, fuzzy
+msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
+msgstr "/顯示(_V)/字集(_C)/斯拉夫語 (KOI8-_R)"
+
+#: src/compose.c:637 src/mainwindow.c:610 src/messageview.c:187
+#, fuzzy
+msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
+msgstr "/顯示(_V)/字集(_C)/斯拉夫語 (KOI8-U)"
+
+#: src/compose.c:639 src/mainwindow.c:612 src/messageview.c:189
+#, fuzzy
+msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
+msgstr "/顯示(_V)/字集(_C)/斯拉夫語 (Windows-1251)"
+
+#: src/compose.c:643 src/mainwindow.c:616 src/messageview.c:192
+#, fuzzy
+msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
+msgstr "/顯示(_V)/字集(_C)/日文 (ISO-2022-_JP)"
+
+#: src/compose.c:647 src/mainwindow.c:626 src/messageview.c:201
+#, fuzzy
+msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
+msgstr "/顯示(_V)/字集(_C)/簡體中文 (_GB2312)"
+
+#: src/compose.c:649 src/mainwindow.c:628 src/messageview.c:203
+#, fuzzy
+msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
+msgstr "/顯示(_V)/字集(_C)/繁體中文 (_Big5)"
+
+#: src/compose.c:651 src/mainwindow.c:630 src/messageview.c:205
+#, fuzzy
+msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
+msgstr "/顯示(_V)/字集(_C)/繁體中文 (EUC-_TW)"
+
+#: src/compose.c:655 src/mainwindow.c:636 src/messageview.c:210
+#, fuzzy
+msgid "/_View/Character _encoding/Korean (EUC-_KR)"
+msgstr "/顯示(_V)/字集(_C)/韓文 (EUC-_KR)"
+
+#: src/compose.c:659 src/mainwindow.c:642 src/messageview.c:215
+#, fuzzy
+msgid "/_View/Character _encoding/Thai (TIS-620)"
+msgstr "/顯示(_V)/字集(_C)/泰文 (TIS-620)"
+
+#: src/compose.c:661 src/mainwindow.c:644 src/messageview.c:217
+#, fuzzy
+msgid "/_View/Character _encoding/Thai (Windows-874)"
+msgstr "/顯示(_V)/字集(_C)/泰文 (Windows-874)"
+
+#: src/compose.c:665 src/mainwindow.c:698 src/messageview.c:247
 msgid "/_Tools/_Address book"
 msgstr "/工具(_T)/位址簿(_A)"
 
-#: src/compose.c:587
+#: src/compose.c:666
 msgid "/_Tools/_Template"
 msgstr "/工具(_T)/套用信件樣板(_T)"
 
-#: src/compose.c:588 src/mainwindow.c:707 src/messageview.c:262
+#: src/compose.c:667 src/mainwindow.c:716 src/messageview.c:262
 msgid "/_Tools/Actio_ns"
 msgstr "/工具(_T)/執行外部指令(_n)"
 
-#: src/compose.c:589 src/compose.c:593 src/mainwindow.c:692
-#: src/mainwindow.c:706 src/mainwindow.c:708 src/mainwindow.c:711
-#: src/mainwindow.c:713 src/messageview.c:250 src/messageview.c:261
+#: src/compose.c:668 src/compose.c:672 src/mainwindow.c:701
+#: src/mainwindow.c:715 src/mainwindow.c:717 src/mainwindow.c:720
+#: src/mainwindow.c:722 src/messageview.c:250 src/messageview.c:261
 msgid "/_Tools/---"
 msgstr "/工具(_T)"
 
-#: src/compose.c:590
+#: src/compose.c:669
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/工具(_T)/使用其他的編輯器(_x)"
 
-#: src/compose.c:594
+#: src/compose.c:673
 msgid "/_Tools/PGP Si_gn"
 msgstr "/工具(_T)/PGP 簽章(_g)"
 
-#: src/compose.c:595
+#: src/compose.c:674
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/工具(_T)/PGP 加密(_E)"
 
-#: src/compose.c:800
+#: src/compose.c:879
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: 檔案不存在\n"
 
-#: src/compose.c:899 src/compose.c:958 src/procmsg.c:1303
+#: src/compose.c:978 src/compose.c:1037 src/procmsg.c:1303
 msgid "Can't get text part\n"
 msgstr "沒有文字\n"
 
-#: src/compose.c:1340
+#: src/compose.c:1419
 msgid "Quote mark format error."
 msgstr "引言格式錯誤。"
 
-#: src/compose.c:1352
+#: src/compose.c:1431
 msgid "Message reply/forward format error."
 msgstr "回覆/轉寄信件格式錯誤。"
 
-#: src/compose.c:1679
+#: src/compose.c:1758
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "檔案 %s 不存在 \n"
 
-#: src/compose.c:1683
+#: src/compose.c:1762
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "無法取得檔案 %s 的大小 \n"
 
-#: src/compose.c:1687
+#: src/compose.c:1766
 #, c-format
 msgid "File %s is empty."
 msgstr "檔案 %s 是空的。"
 
-#: src/compose.c:1691
+#: src/compose.c:1770
 #, c-format
 msgid "Can't read %s."
 msgstr "無法讀取 %s。"
 
-#: src/compose.c:1726
+#: src/compose.c:1805
 #, c-format
 msgid "Message: %s"
 msgstr "信件：%s"
 
-#: src/compose.c:1797 src/mimeview.c:491
+#: src/compose.c:1876 src/mimeview.c:491
 msgid "Can't get the part of multipart message."
 msgstr "無法取得這個附加檔。"
 
-#: src/compose.c:2188
+#: src/compose.c:2267
 msgid " [Edited]"
 msgstr " [已修改]"
 
-#: src/compose.c:2190
+#: src/compose.c:2269
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - 新郵件%s"
 
-#: src/compose.c:2193
+#: src/compose.c:2272
 #, c-format
 msgid "Compose message%s"
 msgstr "新郵件%s"
 
-#: src/compose.c:2304
+#: src/compose.c:2383
 msgid "Recipient is not specified."
 msgstr "沒有指定收件人。"
 
-#: src/compose.c:2312 src/compose.c:4112 src/mainwindow.c:2144
+#: src/compose.c:2391 src/compose.c:4213 src/mainwindow.c:2153
 #: src/prefs_account.c:703 src/prefs_common.c:850
 msgid "Send"
 msgstr "送出"
 
-#: src/compose.c:2313
+#: src/compose.c:2392
 msgid "Subject is empty. Send it anyway?"
 msgstr "沒有標題。確定要送出？"
 
-#: src/compose.c:2364
+#: src/compose.c:2443
 msgid "can't get recipient list."
 msgstr "無法取得收件人或收件新聞群組名單。"
 
-#: src/compose.c:2384
+#: src/compose.c:2463
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -940,26 +1058,26 @@ msgstr ""
 "您選用的帳號並非一個電子郵件帳號，可能是用來在新聞群組上發表文章用的。\n"
 "要發送郵件請選擇電子郵件帳號。"
 
-#: src/compose.c:2398 src/send_message.c:261
+#: src/compose.c:2477 src/send_message.c:261
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "向 %s 發出文章時出現錯誤。"
 
-#: src/compose.c:2421
+#: src/compose.c:2500
 msgid "Can't save the message to outbox."
 msgstr "無法將信件送至寄件夾中。"
 
-#: src/compose.c:2457
+#: src/compose.c:2536
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "無法找到所指定的 key id '%s'"
 
-#: src/compose.c:2518 src/compose.c:2739 src/compose.c:2802 src/compose.c:2921
+#: src/compose.c:2597 src/compose.c:2820 src/compose.c:2883 src/compose.c:3003
 #: src/utils.c:2189
 msgid "can't change file mode\n"
 msgstr "無法改變檔案型態 \n"
 
-#: src/compose.c:2546
+#: src/compose.c:2627
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -968,140 +1086,140 @@ msgstr ""
 "無法轉換將信件的編碼設定由 %s 轉換為 %s。\n"
 "仍舊要傳送嗎？"
 
-#: src/compose.c:2610
+#: src/compose.c:2691
 msgid "can't write headers\n"
 msgstr "無法寫入標頭\n"
 
-#: src/compose.c:2881
+#: src/compose.c:2963
 msgid "can't remove the old message\n"
 msgstr "無法刪除原有的舊信件。\n"
 
-#: src/compose.c:2899
+#: src/compose.c:2981
 msgid "queueing message...\n"
 msgstr "送進暫存資料夾中...\n"
 
-#: src/compose.c:2981
+#: src/compose.c:3063
 msgid "can't find queue folder\n"
 msgstr "找不到暫存資料夾。\n"
 
-#: src/compose.c:2988
+#: src/compose.c:3070
 msgid "can't queue the message\n"
 msgstr "無法放進暫存資料夾。\n"
 
-#: src/compose.c:3547
+#: src/compose.c:3645
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "產生信件的編號：%s\n"
 
-#: src/compose.c:3645
+#: src/compose.c:3743
 msgid "Creating compose window...\n"
 msgstr "產生新郵件...\n"
 
-#: src/compose.c:3648 src/compose.c:4598
+#: src/compose.c:3746 src/compose.c:4734
 msgid "MIME type"
 msgstr "MIME 型態"
 
 #. S_COL_DATE
-#: src/compose.c:3649 src/mimeview.c:150 src/prefs_filter_edit.c:569
+#: src/compose.c:3747 src/mimeview.c:150 src/prefs_filter_edit.c:569
 #: src/prefs_summary_column.c:73 src/select-keys.c:317 src/summaryview.c:386
 msgid "Size"
 msgstr "大小"
 
-#: src/compose.c:3700 src/headerview.c:53 src/summary_search.c:169
+#: src/compose.c:3798 src/headerview.c:53 src/summary_search.c:169
 msgid "From:"
 msgstr "來自："
 
-#: src/compose.c:4113
+#: src/compose.c:4214
 msgid "Send message"
 msgstr "送出信件"
 
-#: src/compose.c:4121
+#: src/compose.c:4222
 msgid "Send later"
 msgstr "待會再送出"
 
-#: src/compose.c:4122
+#: src/compose.c:4223
 msgid "Put into queue folder and send later"
 msgstr "放到寄件夾中待會再送出"
 
-#: src/compose.c:4130
+#: src/compose.c:4231
 msgid "Draft"
 msgstr "草稿"
 
-#: src/compose.c:4131
+#: src/compose.c:4232
 msgid "Save to draft folder"
 msgstr "儲存至草稿資料夾"
 
-#: src/compose.c:4141 src/compose.c:5382
+#: src/compose.c:4242 src/compose.c:5527
 msgid "Insert"
 msgstr "插入"
 
-#: src/compose.c:4142
+#: src/compose.c:4243
 msgid "Insert file"
 msgstr "插入檔案"
 
-#: src/compose.c:4150
+#: src/compose.c:4251
 msgid "Attach"
 msgstr "附加"
 
-#: src/compose.c:4151
+#: src/compose.c:4252
 msgid "Attach file"
 msgstr "附加檔案"
 
 #. signature
-#: src/compose.c:4161 src/prefs_account.c:1339 src/prefs_common.c:1261
+#: src/compose.c:4262 src/prefs_account.c:1339 src/prefs_common.c:1273
 msgid "Signature"
 msgstr "簽名"
 
-#: src/compose.c:4162
+#: src/compose.c:4263
 msgid "Insert signature"
 msgstr "插入簽名"
 
-#: src/compose.c:4171 src/prefs_common.c:1283 src/prefs_common.c:2165
+#: src/compose.c:4272 src/prefs_common.c:1295 src/prefs_common.c:2177
 msgid "Editor"
 msgstr "編輯器"
 
-#: src/compose.c:4172
+#: src/compose.c:4273
 msgid "Edit with external editor"
 msgstr "使用其他的編輯器"
 
-#: src/compose.c:4180
+#: src/compose.c:4281
 msgid "Linewrap"
 msgstr "切割"
 
-#: src/compose.c:4181
+#: src/compose.c:4282
 msgid "Wrap all long lines"
 msgstr "切割所有過長的文字行"
 
-#: src/compose.c:4492
+#: src/compose.c:4628
 msgid "Invalid MIME type."
 msgstr "不合法的 MIME 型態"
 
-#: src/compose.c:4511
+#: src/compose.c:4647
 msgid "File doesn't exist or is empty."
 msgstr "檔案不存在, 或檔案是空的"
 
-#: src/compose.c:4580
+#: src/compose.c:4716
 msgid "Properties"
 msgstr "內容"
 
-#: src/compose.c:4600
+#: src/compose.c:4736
 msgid "Encoding"
 msgstr "編碼"
 
-#: src/compose.c:4623 src/prefs_folder_item.c:183
+#: src/compose.c:4759 src/prefs_folder_item.c:183
 msgid "Path"
 msgstr "路徑"
 
-#: src/compose.c:4624
+#: src/compose.c:4760
 msgid "File name"
 msgstr "檔名"
 
-#: src/compose.c:4778
+#: src/compose.c:4914
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "外用編輯器的命令是錯誤的：`%s'\n"
 
-#: src/compose.c:4804
+#: src/compose.c:4940
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1112,72 +1230,72 @@ msgstr ""
 "要強迫結束該行程嗎？\n"
 "行程的群組代碼是：%d"
 
-#: src/compose.c:4817
+#: src/compose.c:4953
 #, c-format
 msgid "Terminated process group id: %d"
 msgstr "結束群組代碼為 %d 的行程"
 
-#: src/compose.c:4818
+#: src/compose.c:4954
 #, c-format
 msgid "Temporary file: %s"
 msgstr "暫存檔案：%s"
 
-#: src/compose.c:4842
+#: src/compose.c:4978
 msgid "Compose: input from monitoring process\n"
 msgstr ""
 
 #. failed
-#: src/compose.c:4875
+#: src/compose.c:5011
 msgid "Couldn't exec external editor\n"
 msgstr "無法執行外部編輯器。\n"
 
-#: src/compose.c:4879
+#: src/compose.c:5015
 msgid "Couldn't write to file\n"
 msgstr "無法寫入檔案。\n"
 
-#: src/compose.c:4881
+#: src/compose.c:5017
 msgid "Pipe read failed\n"
 msgstr "Pipe 讀取失敗。\n"
 
-#: src/compose.c:5182 src/compose.c:5190 src/compose.c:5196
+#: src/compose.c:5318 src/compose.c:5326 src/compose.c:5332
 msgid "Can't queue the message."
 msgstr "無法放進暫存資料夾。"
 
-#: src/compose.c:5287
+#: src/compose.c:5423
 #, fuzzy
 msgid "Select files"
 msgstr "選擇檔案"
 
-#: src/compose.c:5309
+#: src/compose.c:5445
 msgid "Select file"
 msgstr "選擇檔案"
 
-#: src/compose.c:5344
+#: src/compose.c:5480
 msgid "Discard message"
 msgstr "放棄信件"
 
-#: src/compose.c:5345
+#: src/compose.c:5481
 msgid "This message has been modified. discard it?"
 msgstr "信件已被修改過。要放棄它嗎？"
 
-#: src/compose.c:5346
+#: src/compose.c:5482
 msgid "Discard"
 msgstr "放棄"
 
-#: src/compose.c:5346
+#: src/compose.c:5482
 msgid "to Draft"
 msgstr "放入草稿資料夾"
 
-#: src/compose.c:5379
+#: src/compose.c:5524
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "您確定要套用 '%s' 這個信件樣板嗎？"
 
-#: src/compose.c:5381
+#: src/compose.c:5526
 msgid "Apply template"
 msgstr "套用信件樣板"
 
-#: src/compose.c:5382
+#: src/compose.c:5527
 msgid "Replace"
 msgstr "置換"
 
@@ -1616,12 +1734,12 @@ msgstr "設定資料夾...\n"
 msgid "Setting folder info..."
 msgstr "設定資料夾..."
 
-#: src/folderview.c:652 src/mainwindow.c:3190 src/setup.c:81
+#: src/folderview.c:652 src/mainwindow.c:3199 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "掃描資料夾 %s%c%s ..."
 
-#: src/folderview.c:656 src/mainwindow.c:3195 src/setup.c:86
+#: src/folderview.c:656 src/mainwindow.c:3204 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "掃描資料夾 %s ..."
@@ -2077,7 +2195,7 @@ msgstr "將 LDIF 檔匯入位址簿"
 msgid "Prev"
 msgstr "前一封"
 
-#: src/importldif.c:761 src/mainwindow.c:2230
+#: src/importldif.c:761 src/mainwindow.c:2239
 msgid "Next"
 msgstr "下一封"
 
@@ -2521,7 +2639,8 @@ msgid "/_View/Separate f_older tree"
 msgstr "/顯示(_V)/將資料夾列表分離(_o)"
 
 #: src/mainwindow.c:514
-msgid "/_View/Separate m_essage view"
+#, fuzzy
+msgid "/_View/Separate _message view"
 msgstr "/顯示(_V)/將信件預覽分離(_e)"
 
 #: src/mainwindow.c:516
@@ -2657,422 +2776,340 @@ msgstr "/顯示(_V)/前往...(_G)/下一封已標記顏色之信件(_b)"
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/顯示(_V)/前往...(_G)/到其他資料夾(_f)"
 
-#: src/mainwindow.c:568 src/mainwindow.c:575 src/messageview.c:150
-msgid "/_View/_Code set/---"
-msgstr "/顯示(_V)/字集(_C)/---"
-
-#: src/mainwindow.c:572 src/messageview.c:154
-msgid "/_View/_Code set"
-msgstr "/顯示(_V)/字集(_C)"
-
 #: src/mainwindow.c:573 src/messageview.c:155
-msgid "/_View/_Code set/_Auto detect"
+#, fuzzy
+msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/顯示(_V)/字集(_C)/自動偵測(_A)"
 
-#: src/mainwindow.c:576 src/messageview.c:158
-msgid "/_View/_Code set/7bit ascii (US-ASC_II)"
-msgstr "/顯示(_V)/字集(_C)/7位元 ASCII 字集(US-ASC_II)"
-
-#: src/mainwindow.c:579 src/messageview.c:161
-msgid "/_View/_Code set/Unicode (_UTF-8)"
-msgstr "/顯示(_V)/字集(_C)/Unicode (_UTF-8)"
-
-#: src/mainwindow.c:582 src/messageview.c:164
-msgid "/_View/_Code set/Western European (ISO-8859-_1)"
-msgstr "/顯示(_V)/字集(_C)/西歐語系 (ISO-8859-_1)"
-
-#: src/mainwindow.c:584 src/messageview.c:166
-msgid "/_View/_Code set/Western European (ISO-8859-15)"
-msgstr "/顯示(_V)/字集(_C)/西歐語系 (ISO-8859-15)"
-
-#: src/mainwindow.c:587 src/messageview.c:169
-msgid "/_View/_Code set/Central European (ISO-8859-_2)"
-msgstr "/顯示(_V)/字集(_C)/中歐語系 (ISO-8859-_2)"
-
-#: src/mainwindow.c:590 src/messageview.c:172
-msgid "/_View/_Code set/_Baltic (ISO-8859-13)"
-msgstr "/顯示(_V)/字集(_C)/_波羅的海語系 (ISO-8859-13)(_B)"
-
-#: src/mainwindow.c:592 src/messageview.c:174
-msgid "/_View/_Code set/Baltic (ISO-8859-_4)"
-msgstr "/顯示(_V)/字集(_C)/波羅的海語系 (ISO-8859-_4)"
-
-#: src/mainwindow.c:595 src/messageview.c:177
-msgid "/_View/_Code set/Greek (ISO-8859-_7)"
-msgstr "/顯示(_V)/字集(_C)/希臘語 (ISO-8859-_7)"
-
-#: src/mainwindow.c:598 src/messageview.c:180
-msgid "/_View/_Code set/Turkish (ISO-8859-_9)"
-msgstr "/顯示(_V)/字集(_C)/土耳其語 (ISO-8859-_9)"
-
-#: src/mainwindow.c:601 src/messageview.c:183
-msgid "/_View/_Code set/Cyrillic (ISO-8859-_5)"
-msgstr "/顯示(_V)/字集(_C)/斯拉夫語 (ISO-8859-_5)"
-
-#: src/mainwindow.c:603 src/messageview.c:185
-msgid "/_View/_Code set/Cyrillic (KOI8-_R)"
-msgstr "/顯示(_V)/字集(_C)/斯拉夫語 (KOI8-_R)"
-
-#: src/mainwindow.c:605 src/messageview.c:187
-msgid "/_View/_Code set/Cyrillic (KOI8-U)"
-msgstr "/顯示(_V)/字集(_C)/斯拉夫語 (KOI8-U)"
-
-#: src/mainwindow.c:607 src/messageview.c:189
-msgid "/_View/_Code set/Cyrillic (Windows-1251)"
-msgstr "/顯示(_V)/字集(_C)/斯拉夫語 (Windows-1251)"
-
-#: src/mainwindow.c:610 src/messageview.c:192
-msgid "/_View/_Code set/Japanese (ISO-2022-_JP)"
-msgstr "/顯示(_V)/字集(_C)/日文 (ISO-2022-_JP)"
-
-#: src/mainwindow.c:612 src/messageview.c:194
-msgid "/_View/_Code set/Japanese (ISO-2022-JP-2)"
+#: src/mainwindow.c:618 src/messageview.c:194
+#, fuzzy
+msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/顯示(_V)/字集(_C)/日文 (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:614 src/messageview.c:196
-msgid "/_View/_Code set/Japanese (_EUC-JP)"
+#: src/mainwindow.c:620 src/messageview.c:196
+#, fuzzy
+msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/顯示(_V)/字集(_C)/日文 (_EUC-JP)"
 
-#: src/mainwindow.c:616 src/messageview.c:198
-msgid "/_View/_Code set/Japanese (_Shift__JIS)"
+#: src/mainwindow.c:622 src/messageview.c:198
+#, fuzzy
+msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/顯示(_V)/字集(_C)/日文 (_Shift__JIS)"
 
-#: src/mainwindow.c:619 src/messageview.c:201
-msgid "/_View/_Code set/Simplified Chinese (_GB2312)"
-msgstr "/顯示(_V)/字集(_C)/簡體中文 (_GB2312)"
-
-#: src/mainwindow.c:621 src/messageview.c:203
-msgid "/_View/_Code set/Traditional Chinese (_Big5)"
-msgstr "/顯示(_V)/字集(_C)/繁體中文 (_Big5)"
-
-#: src/mainwindow.c:623 src/messageview.c:205
-msgid "/_View/_Code set/Traditional Chinese (EUC-_TW)"
-msgstr "/顯示(_V)/字集(_C)/繁體中文 (EUC-_TW)"
-
-#: src/mainwindow.c:625 src/messageview.c:207
-msgid "/_View/_Code set/Chinese (ISO-2022-_CN)"
+#: src/mainwindow.c:632 src/messageview.c:207
+#, fuzzy
+msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/顯示(_V)/字集(_C)/中文 (ISO-2022-_CN)"
 
-#: src/mainwindow.c:628 src/messageview.c:210
-msgid "/_View/_Code set/Korean (EUC-_KR)"
-msgstr "/顯示(_V)/字集(_C)/韓文 (EUC-_KR)"
-
-#: src/mainwindow.c:630 src/messageview.c:212
-msgid "/_View/_Code set/Korean (ISO-2022-KR)"
+#: src/mainwindow.c:638 src/messageview.c:212
+#, fuzzy
+msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/顯示(_V)/字集(_C)/韓文 (ISO-2022-KR)"
 
-#: src/mainwindow.c:633 src/messageview.c:215
-msgid "/_View/_Code set/Thai (TIS-620)"
-msgstr "/顯示(_V)/字集(_C)/泰文 (TIS-620)"
-
-#: src/mainwindow.c:635 src/messageview.c:217
-msgid "/_View/_Code set/Thai (Windows-874)"
-msgstr "/顯示(_V)/字集(_C)/泰文 (Windows-874)"
-
-#: src/mainwindow.c:642 src/summaryview.c:371
+#: src/mainwindow.c:651 src/summaryview.c:371
 msgid "/_View/Open in new _window"
 msgstr "/顯示(_V)/在新視窗開啟(_w)"
 
-#: src/mainwindow.c:643 src/messageview.c:224
+#: src/mainwindow.c:652 src/messageview.c:224
 msgid "/_View/Mess_age source"
 msgstr "/顯示(_V)/觀看信件原始碼(_a)"
 
-#: src/mainwindow.c:644 src/messageview.c:225
+#: src/mainwindow.c:653 src/messageview.c:225
 msgid "/_View/Show all _header"
 msgstr "/顯示(_V)/顯示所有的標頭(_h)"
 
-#: src/mainwindow.c:646
+#: src/mainwindow.c:655
 msgid "/_View/_Update summary"
 msgstr "/顯示(_V)/更新信件列表(_U)"
 
-#: src/mainwindow.c:648 src/messageview.c:227
+#: src/mainwindow.c:657 src/messageview.c:227
 msgid "/_Message"
 msgstr "/信件(_M)"
 
-#: src/mainwindow.c:649
+#: src/mainwindow.c:658
 msgid "/_Message/Recei_ve"
 msgstr "/信件(_M)/接收(_v)"
 
-#: src/mainwindow.c:650
+#: src/mainwindow.c:659
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/信件(_M)/接收(_v)/從目前帳號中接收新郵件(_c)"
 
-#: src/mainwindow.c:652
+#: src/mainwindow.c:661
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/信件(_M)/接收(_v)/從所有帳號中接收新郵件(_a)"
 
-#: src/mainwindow.c:654
+#: src/mainwindow.c:663
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/信件(_M)/接收(_v)/取消接收(_g)"
 
-#: src/mainwindow.c:656
+#: src/mainwindow.c:665
 msgid "/_Message/Recei_ve/---"
 msgstr "/信件(_M)/接收(_v)/---"
 
-#: src/mainwindow.c:657
+#: src/mainwindow.c:666
 msgid "/_Message/_Send queued messages"
 msgstr "/信件(_M)/將暫存資料夾中的信件送出(_S)"
 
-#: src/mainwindow.c:658 src/mainwindow.c:660 src/mainwindow.c:667
-#: src/mainwindow.c:672 src/mainwindow.c:676 src/mainwindow.c:685
+#: src/mainwindow.c:667 src/mainwindow.c:669 src/mainwindow.c:676
+#: src/mainwindow.c:681 src/mainwindow.c:685 src/mainwindow.c:694
 #: src/messageview.c:230 src/messageview.c:238 src/messageview.c:243
 msgid "/_Message/---"
 msgstr "/信件(_M)/---"
 
-#: src/mainwindow.c:659 src/messageview.c:228
+#: src/mainwindow.c:668 src/messageview.c:228
 msgid "/_Message/Compose _new message"
 msgstr "/信件(_M)/撰寫郵件(_n)"
 
-#: src/mainwindow.c:661 src/messageview.c:231
+#: src/mainwindow.c:670 src/messageview.c:231
 msgid "/_Message/_Reply"
 msgstr "/信件(_M)/直接回覆(_R)"
 
-#: src/mainwindow.c:662
+#: src/mainwindow.c:671
 msgid "/_Message/Repl_y to"
 msgstr "/信件(_M)/回覆給(_y)"
 
-#: src/mainwindow.c:663 src/messageview.c:232
+#: src/mainwindow.c:672 src/messageview.c:232
 msgid "/_Message/Repl_y to/_all"
 msgstr "/信件(_M)/回覆給(_y)/所有收件人(_a)"
 
-#: src/mainwindow.c:664 src/messageview.c:234
+#: src/mainwindow.c:673 src/messageview.c:234
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/信件(_M)/回覆給(_y)/原作者(_s)"
 
-#: src/mainwindow.c:665 src/messageview.c:236
+#: src/mainwindow.c:674 src/messageview.c:236
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/信件(_M)/回覆給(_y)/Mailing List(_l)"
 
-#: src/mainwindow.c:668 src/messageview.c:239
+#: src/mainwindow.c:677 src/messageview.c:239
 msgid "/_Message/_Forward"
 msgstr "/信件(_M)/轉寄(_F)"
 
-#: src/mainwindow.c:669 src/messageview.c:240
+#: src/mainwindow.c:678 src/messageview.c:240
 msgid "/_Message/For_ward as attachment"
 msgstr "/信件(_M)/將信件當成附加檔轉寄(_w)"
 
-#: src/mainwindow.c:671 src/messageview.c:242
+#: src/mainwindow.c:680 src/messageview.c:242
 msgid "/_Message/Redirec_t"
 msgstr "/信件(_M)/信件導向(_t)"
 
-#: src/mainwindow.c:673
+#: src/mainwindow.c:682
 msgid "/_Message/M_ove..."
 msgstr "/信件(_M)/移動...(_o)"
 
-#: src/mainwindow.c:674
+#: src/mainwindow.c:683
 msgid "/_Message/_Copy..."
 msgstr "/信件(_M)/複製...(_C)"
 
-#: src/mainwindow.c:675
+#: src/mainwindow.c:684
 msgid "/_Message/_Delete"
 msgstr "/信件(_M)/刪除(_D)"
 
-#: src/mainwindow.c:677
+#: src/mainwindow.c:686
 msgid "/_Message/_Mark"
 msgstr "/信件(_M)/標記(_M)"
 
-#: src/mainwindow.c:678
+#: src/mainwindow.c:687
 msgid "/_Message/_Mark/_Mark"
 msgstr "/信件(_M)/標記(_M)/標記(_M)"
 
-#: src/mainwindow.c:679
+#: src/mainwindow.c:688
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/信件(_M)/標記(_M)/去除標記(_U)"
 
-#: src/mainwindow.c:680
+#: src/mainwindow.c:689
 msgid "/_Message/_Mark/---"
 msgstr "/信件(_M)/標記(_M)/---"
 
-#: src/mainwindow.c:681
+#: src/mainwindow.c:690
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/信件(_M)/標記(_M)/標記成未讀(_e)"
 
-#: src/mainwindow.c:682
+#: src/mainwindow.c:691
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/信件(_M)/標記(_M)/標記成已讀(_d)"
 
-#: src/mainwindow.c:684
+#: src/mainwindow.c:693
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/信件(_M)/標記(_M)/標記所有信件成已讀(_d)"
 
-#: src/mainwindow.c:686 src/messageview.c:244
+#: src/mainwindow.c:695 src/messageview.c:244
 msgid "/_Message/Re-_edit"
 msgstr "/信件(_M)/重新編輯(_e)"
 
-#: src/mainwindow.c:690 src/messageview.c:248
+#: src/mainwindow.c:699 src/messageview.c:248
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/工具(_T)/將寄信人加入位址簿(_k)"
 
-#: src/mainwindow.c:693
+#: src/mainwindow.c:702
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/工具(_T)/過濾資料夾中所有信件(_F)"
 
-#: src/mainwindow.c:695
+#: src/mainwindow.c:704
 msgid "/_Tools/Filter _selected messages"
 msgstr "/工具(_T)/過濾選擇的信件(_F)"
 
-#: src/mainwindow.c:697 src/messageview.c:251
+#: src/mainwindow.c:706 src/messageview.c:251
 msgid "/_Tools/_Create filter rule"
 msgstr "/工具(_T)/產生信件過濾規則(_C)"
 
-#: src/mainwindow.c:698 src/messageview.c:253
+#: src/mainwindow.c:707 src/messageview.c:253
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/工具(_T)/產生信件過濾規則(_C)/自動產生"
 
-#: src/mainwindow.c:700 src/messageview.c:255
+#: src/mainwindow.c:709 src/messageview.c:255
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/工具(_T)/產生信件過濾規則(_C)/依來源(_F)"
 
-#: src/mainwindow.c:702 src/messageview.c:257
+#: src/mainwindow.c:711 src/messageview.c:257
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/工具(_T)/產生信件過濾規則(_C)/依收信人(_T)"
 
-#: src/mainwindow.c:704 src/messageview.c:259
+#: src/mainwindow.c:713 src/messageview.c:259
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/工具(_T)/產生信件過濾規則(_C)/依標題(_S)"
 
-#: src/mainwindow.c:709
+#: src/mainwindow.c:718
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/工具(_T)/刪除重覆的信件(_p)"
 
-#: src/mainwindow.c:712
+#: src/mainwindow.c:721
 msgid "/_Tools/E_xecute"
 msgstr "/工具(_T)/執行(_x)"
 
-#: src/mainwindow.c:714
+#: src/mainwindow.c:723
 msgid "/_Tools/_Log window"
 msgstr "/工具(_T)/紀錄視窗(_L)"
 
-#: src/mainwindow.c:716
+#: src/mainwindow.c:725
 msgid "/_Configuration"
 msgstr "/設定(_C)"
 
-#: src/mainwindow.c:717
+#: src/mainwindow.c:726
 msgid "/_Configuration/_Common preferences..."
 msgstr "/設定(_C)/一般設定...(_C)"
 
-#: src/mainwindow.c:719
+#: src/mainwindow.c:728
 msgid "/_Configuration/_Filter setting..."
 msgstr "/設定(_C)/信件過濾設定...(_F)"
 
-#: src/mainwindow.c:721
+#: src/mainwindow.c:730
 msgid "/_Configuration/_Template..."
 msgstr "/設定(_C)/信件樣板設定...(_T)"
 
-#: src/mainwindow.c:722
+#: src/mainwindow.c:731
 msgid "/_Configuration/_Actions..."
 msgstr "/設定(_C)/外部指令設定...(_A)"
 
-#: src/mainwindow.c:723
+#: src/mainwindow.c:732
 msgid "/_Configuration/---"
 msgstr "/設定(_C)/---"
 
-#: src/mainwindow.c:724
+#: src/mainwindow.c:733
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/設定(_C)/目前帳號設定(_P)"
 
-#: src/mainwindow.c:726
+#: src/mainwindow.c:735
 msgid "/_Configuration/Create _new account..."
 msgstr "/設定(_C)/新增帳號...(_n)"
 
-#: src/mainwindow.c:728
+#: src/mainwindow.c:737
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/設定(_C)/編輯帳號...(_E)"
 
-#: src/mainwindow.c:730
+#: src/mainwindow.c:739
 msgid "/_Configuration/C_hange current account"
 msgstr "/設定(_C)/改變現有帳號(_h)"
 
-#: src/mainwindow.c:734
+#: src/mainwindow.c:743
 msgid "/_Help/_Manual"
 msgstr "/說明(_H)/說明文件(_M)"
 
-#: src/mainwindow.c:735
+#: src/mainwindow.c:744
 msgid "/_Help/_Manual/_English"
 msgstr "/說明(_H)/說明文件(_M)/英文(_E)"
 
-#: src/mainwindow.c:736
+#: src/mainwindow.c:745
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/說明(_H)/說明文件(_M)/日文(_J)"
 
-#: src/mainwindow.c:737
+#: src/mainwindow.c:746
 msgid "/_Help/_FAQ"
 msgstr "/說明(_H)/常問問題解答(_F)"
 
-#: src/mainwindow.c:738
+#: src/mainwindow.c:747
 msgid "/_Help/_FAQ/_English"
 msgstr "/說明(_H)/常問問題解答(_F)/英文(_E)"
 
-#: src/mainwindow.c:739
+#: src/mainwindow.c:748
 msgid "/_Help/_FAQ/_German"
 msgstr "/說明(_H)/常問問題解答(_F)/德文(_F)"
 
-#: src/mainwindow.c:740
+#: src/mainwindow.c:749
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/說明(_H)/常問問題解答(_F)/西班牙文(_S)"
 
-#: src/mainwindow.c:741
+#: src/mainwindow.c:750
 msgid "/_Help/_FAQ/_French"
 msgstr "/說明(_H)/常問問題解答(_F)/法文(_F)"
 
-#: src/mainwindow.c:742
+#: src/mainwindow.c:751
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/說明(_H)/常問問題解答(_F)/義大利文(_E)"
 
-#: src/mainwindow.c:743
+#: src/mainwindow.c:752
 msgid "/_Help/---"
 msgstr "/說明(_H)/---"
 
-#: src/mainwindow.c:783
+#: src/mainwindow.c:792
 msgid "Creating main window...\n"
 msgstr "產生主視窗...\n"
 
-#: src/mainwindow.c:943
+#: src/mainwindow.c:952
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "主視窗：顏色 %d 配置失敗。\n"
 
-#: src/mainwindow.c:1021 src/summaryview.c:1368 src/summaryview.c:1677
+#: src/mainwindow.c:1030 src/summaryview.c:1368 src/summaryview.c:1677
 #: src/summaryview.c:1785 src/summaryview.c:1831 src/summaryview.c:2453
 #: src/summaryview.c:3080 src/summaryview.c:3146 src/summaryview.c:3171
 #: src/summaryview.c:3284
 msgid "done.\n"
 msgstr "完成。\n"
 
-#: src/mainwindow.c:1137 src/mainwindow.c:1178 src/mainwindow.c:1206
+#: src/mainwindow.c:1146 src/mainwindow.c:1187 src/mainwindow.c:1215
 msgid "Untitled"
 msgstr "無標題"
 
-#: src/mainwindow.c:1207
+#: src/mainwindow.c:1216
 msgid "none"
 msgstr "無"
 
-#: src/mainwindow.c:1257
+#: src/mainwindow.c:1266
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "Changing window separation type from %d to %d\n"
 
-#: src/mainwindow.c:1477
+#: src/mainwindow.c:1486
 msgid "Offline"
 msgstr "離線"
 
-#: src/mainwindow.c:1478
+#: src/mainwindow.c:1487
 msgid "You are offline. Go online?"
 msgstr "您目前正離線中。要連線嗎？"
 
-#: src/mainwindow.c:1492
+#: src/mainwindow.c:1501
 msgid "Empty all trash"
 msgstr "清空刪除的郵件"
 
-#: src/mainwindow.c:1493
+#: src/mainwindow.c:1502
 msgid "Empty messages in all trash?"
 msgstr "您確定要清除所有被刪除的郵件？"
 
-#: src/mainwindow.c:1521
+#: src/mainwindow.c:1530
 msgid "Add mailbox"
 msgstr "新增信箱"
 
-#: src/mainwindow.c:1522
+#: src/mainwindow.c:1531
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3082,16 +3119,16 @@ msgstr ""
 "並請注意不要輸入已存在的信箱名稱。\n"
 "系統將會自動判別是否信箱已存在。"
 
-#: src/mainwindow.c:1528
+#: src/mainwindow.c:1537
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "信箱 %s 已存在。"
 
-#: src/mainwindow.c:1533 src/setup.c:57
+#: src/mainwindow.c:1542 src/setup.c:57
 msgid "Mailbox"
 msgstr "信箱"
 
-#: src/mainwindow.c:1539 src/setup.c:63
+#: src/mainwindow.c:1548 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3100,141 +3137,141 @@ msgstr ""
 "無法產生信箱目錄。\n"
 "可能是因為同樣名稱的檔案已經存在，或者是你沒有權限可以開新目錄。"
 
-#: src/mainwindow.c:1912
+#: src/mainwindow.c:1921
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - 資料夾列表"
 
-#: src/mainwindow.c:1932 src/messageview.c:358
+#: src/mainwindow.c:1941 src/messageview.c:358
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - 信件列表"
 
-#: src/mainwindow.c:2079 src/summaryview.c:340
+#: src/mainwindow.c:2088 src/summaryview.c:340
 msgid "/_Reply"
 msgstr "/直接回覆(_R)"
 
-#: src/mainwindow.c:2080
+#: src/mainwindow.c:2089
 msgid "/Reply to _all"
 msgstr "/全部回覆(_a)"
 
-#: src/mainwindow.c:2081
+#: src/mainwindow.c:2090
 msgid "/Reply to _sender"
 msgstr "/回覆給原作者(_s)"
 
-#: src/mainwindow.c:2082
+#: src/mainwindow.c:2091
 msgid "/Reply to mailing _list"
 msgstr "/回覆到 Mailing list(_l)"
 
-#: src/mainwindow.c:2087 src/summaryview.c:347
+#: src/mainwindow.c:2096 src/summaryview.c:347
 msgid "/_Forward"
 msgstr "/轉寄(_F)"
 
-#: src/mainwindow.c:2088 src/summaryview.c:348
+#: src/mainwindow.c:2097 src/summaryview.c:348
 msgid "/For_ward as attachment"
 msgstr "/將信件當成附加檔轉寄(_w)"
 
-#: src/mainwindow.c:2089 src/summaryview.c:349
+#: src/mainwindow.c:2098 src/summaryview.c:349
 msgid "/Redirec_t"
 msgstr "/信件導向(_t)"
 
-#: src/mainwindow.c:2125
+#: src/mainwindow.c:2134
 msgid "Get"
 msgstr "檢查郵件"
 
-#: src/mainwindow.c:2126
+#: src/mainwindow.c:2135
 msgid "Incorporate new mail"
 msgstr "檢查目前帳號的新郵件"
 
-#: src/mainwindow.c:2133
+#: src/mainwindow.c:2142
 msgid "Get all"
 msgstr "全部檢查"
 
-#: src/mainwindow.c:2134
+#: src/mainwindow.c:2143
 msgid "Incorporate new mail of all accounts"
 msgstr "檢查所有帳號的新郵件"
 
-#: src/mainwindow.c:2145
+#: src/mainwindow.c:2154
 msgid "Send queued message(s)"
 msgstr "將暫存資料夾中的信件送出"
 
-#: src/mainwindow.c:2155 src/prefs_account.c:705 src/prefs_common.c:852
+#: src/mainwindow.c:2164 src/prefs_account.c:705 src/prefs_common.c:852
 #: src/prefs_folder_item.c:137
 msgid "Compose"
 msgstr "撰寫郵件"
 
-#: src/mainwindow.c:2156
+#: src/mainwindow.c:2165
 msgid "Compose new message"
 msgstr "編輯新郵件"
 
-#: src/mainwindow.c:2164 src/prefs_common.c:1353
+#: src/mainwindow.c:2173 src/prefs_common.c:1365
 msgid "Reply"
 msgstr "回覆"
 
-#: src/mainwindow.c:2165 src/mainwindow.c:2178
+#: src/mainwindow.c:2174 src/mainwindow.c:2187
 msgid "Reply to the message"
 msgstr "回覆信件"
 
-#: src/mainwindow.c:2183
+#: src/mainwindow.c:2192
 msgid "Reply all"
 msgstr "全部回覆"
 
-#: src/mainwindow.c:2184
+#: src/mainwindow.c:2193
 msgid "Reply to all"
 msgstr "全部回覆"
 
-#: src/mainwindow.c:2192 src/prefs_filter_edit.c:719
+#: src/mainwindow.c:2201 src/prefs_filter_edit.c:719
 msgid "Forward"
 msgstr "轉寄"
 
-#: src/mainwindow.c:2193 src/mainwindow.c:2206
+#: src/mainwindow.c:2202 src/mainwindow.c:2215
 msgid "Forward the message"
 msgstr "轉寄信件"
 
-#: src/mainwindow.c:2213
+#: src/mainwindow.c:2222
 msgid "Delete the message"
 msgstr "刪除信件"
 
-#: src/mainwindow.c:2221
+#: src/mainwindow.c:2230
 msgid "Execute"
 msgstr "執行"
 
-#: src/mainwindow.c:2222
+#: src/mainwindow.c:2231
 msgid "Execute marked process"
 msgstr "執行標記的行程"
 
-#: src/mainwindow.c:2231
+#: src/mainwindow.c:2240
 msgid "Next unread message"
 msgstr "下一封未讀郵件"
 
-#: src/mainwindow.c:2242
+#: src/mainwindow.c:2251
 msgid "Prefs"
 msgstr "設定"
 
-#: src/mainwindow.c:2243
+#: src/mainwindow.c:2252
 msgid "Common preferences"
 msgstr "一般設定"
 
-#: src/mainwindow.c:2250 src/prefs_folder_item.c:258
+#: src/mainwindow.c:2259 src/prefs_folder_item.c:258
 #: src/prefs_folder_item.c:269 src/progressdialog.c:50
 msgid "Account"
 msgstr "帳號"
 
-#: src/mainwindow.c:2251
+#: src/mainwindow.c:2260
 msgid "Account setting"
 msgstr "帳號設定"
 
-#: src/mainwindow.c:2425
+#: src/mainwindow.c:2434
 msgid "You are offline. Click the icon to go online."
 msgstr "您目前正離線中。按下按鈕恢復連線。"
 
-#: src/mainwindow.c:2436
+#: src/mainwindow.c:2445
 msgid "You are online. Click the icon to go offline."
 msgstr "您目前正連線中。按下按鈕離線工作。"
 
-#: src/mainwindow.c:2624
+#: src/mainwindow.c:2633
 msgid "Exit"
 msgstr "離開"
 
-#: src/mainwindow.c:2624
+#: src/mainwindow.c:2633
 msgid "Exit this program?"
 msgstr "您確定要離開嗎？"
 
@@ -3360,7 +3397,7 @@ msgstr "搜尋結束"
 msgid "Creating message view...\n"
 msgstr "產生信件視窗...\n"
 
-#: src/messageview.c:303 src/prefs_common.c:1550
+#: src/messageview.c:303 src/prefs_common.c:1562
 msgid "Text"
 msgstr "文字"
 
@@ -3373,7 +3410,7 @@ msgstr "附加檔"
 msgid "Can't save the file `%s'."
 msgstr "無法儲存檔案 `%s'。"
 
-#: src/messageview.c:697 src/prefs_common.c:2154 src/summaryview.c:2744
+#: src/messageview.c:697 src/prefs_common.c:2166 src/summaryview.c:2744
 msgid "Print"
 msgstr "列印"
 
@@ -3842,7 +3879,7 @@ msgstr "（未經過濾的信件將會被送到這個資料夾上）"
 msgid "Authentication method"
 msgstr "認證方法"
 
-#: src/prefs_account.c:1123 src/prefs_account.c:1239 src/prefs_common.c:1189
+#: src/prefs_account.c:1123 src/prefs_account.c:1239 src/prefs_common.c:1201
 msgid "Automatic"
 msgstr "自動"
 
@@ -3866,7 +3903,7 @@ msgstr "產生郵件識別碼"
 msgid "Add user-defined header"
 msgstr "加入使用者定義的標頭"
 
-#: src/prefs_account.c:1196 src/prefs_common.c:1714 src/prefs_common.c:1739
+#: src/prefs_account.c:1196 src/prefs_common.c:1726 src/prefs_common.c:1751
 msgid " Edit... "
 msgstr "編輯..."
 
@@ -4254,106 +4291,107 @@ msgid "Save sent messages to outbox"
 msgstr "將已送出之信件存到寄件夾"
 
 #: src/prefs_common.c:1113
-msgid "Outgoing codeset"
+#, fuzzy
+msgid "Outgoing encoding"
 msgstr "輸出字集"
 
 #: src/prefs_common.c:1128
 msgid "Automatic (Recommended)"
 msgstr "自動選擇（推薦使用）"
 
-#: src/prefs_common.c:1129
+#: src/prefs_common.c:1130
 msgid "7bit ascii (US-ASCII)"
 msgstr "7位元 ASCII 字集"
 
-#: src/prefs_common.c:1130
+#: src/prefs_common.c:1132
 msgid "Unicode (UTF-8)"
 msgstr ""
 
-#: src/prefs_common.c:1131
+#: src/prefs_common.c:1134
 msgid "Western European (ISO-8859-1)"
 msgstr "西歐語系 (ISO-8859-1)"
 
-#: src/prefs_common.c:1132
+#: src/prefs_common.c:1135
 msgid "Western European (ISO-8859-15)"
 msgstr "西歐語系 (ISO-8859-15)"
 
-#: src/prefs_common.c:1133
+#: src/prefs_common.c:1137
 msgid "Central European (ISO-8859-2)"
 msgstr "中歐語系 (ISO-8859-2)"
 
-#: src/prefs_common.c:1134
+#: src/prefs_common.c:1139
 msgid "Baltic (ISO-8859-13)"
 msgstr "波羅的海語系 (ISO-8859-13)"
 
-#: src/prefs_common.c:1135
+#: src/prefs_common.c:1140
 msgid "Baltic (ISO-8859-4)"
 msgstr "波羅的海語系 (ISO-8859-4)"
 
-#: src/prefs_common.c:1136
+#: src/prefs_common.c:1142
 msgid "Greek (ISO-8859-7)"
 msgstr "希臘語 (ISO-8859-7)"
 
-#: src/prefs_common.c:1137
+#: src/prefs_common.c:1144
 msgid "Turkish (ISO-8859-9)"
 msgstr "土耳其語 (ISO-8859-9)"
 
-#: src/prefs_common.c:1138
+#: src/prefs_common.c:1146
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "斯拉夫語 (ISO-8859-5)"
 
-#: src/prefs_common.c:1139
+#: src/prefs_common.c:1147
 msgid "Cyrillic (KOI8-R)"
 msgstr "斯拉夫語 (KOI8-R)"
 
-#: src/prefs_common.c:1140
-msgid "Cyrillic (Windows-1251)"
-msgstr "斯拉夫語 (Windows-1251)"
-
-#: src/prefs_common.c:1141
+#: src/prefs_common.c:1148
 msgid "Cyrillic (KOI8-U)"
 msgstr "斯拉夫語 (KOI8-U)"
 
-#: src/prefs_common.c:1142
+#: src/prefs_common.c:1149
+msgid "Cyrillic (Windows-1251)"
+msgstr "斯拉夫語 (Windows-1251)"
+
+#: src/prefs_common.c:1151
 msgid "Japanese (ISO-2022-JP)"
 msgstr "日文 (ISO-2022-JP)"
 
-#: src/prefs_common.c:1144
+#: src/prefs_common.c:1153
 msgid "Japanese (EUC-JP)"
 msgstr "日文 (EUC-JP)"
 
-#: src/prefs_common.c:1145
+#: src/prefs_common.c:1154
 msgid "Japanese (Shift_JIS)"
 msgstr "日文 (Shift_JIS)"
 
-#: src/prefs_common.c:1147
+#: src/prefs_common.c:1157
 msgid "Simplified Chinese (GB2312)"
 msgstr "簡體中文 (GB2312)"
 
-#: src/prefs_common.c:1148
+#: src/prefs_common.c:1158
 msgid "Traditional Chinese (Big5)"
 msgstr "繁體中文 (Big5)"
 
-#: src/prefs_common.c:1150
+#: src/prefs_common.c:1160
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "繁體中文 (EUC-TW)"
 
-#: src/prefs_common.c:1151
+#: src/prefs_common.c:1161
 msgid "Chinese (ISO-2022-CN)"
 msgstr "中文 (ISO-2022-CN)"
 
-#: src/prefs_common.c:1153
+#: src/prefs_common.c:1164
 msgid "Korean (EUC-KR)"
 msgstr "韓文 (EUC-KR)"
 
-#: src/prefs_common.c:1154
+#: src/prefs_common.c:1166
 msgid "Thai (TIS-620)"
 msgstr "泰文 (TIS-620)"
 
-#: src/prefs_common.c:1155
+#: src/prefs_common.c:1167
 msgid "Thai (Windows-874)"
 msgstr "泰文 (Windows-874)"
 
-#: src/prefs_common.c:1165
+#: src/prefs_common.c:1177
 #, fuzzy
 msgid ""
 "If `Automatic' is selected, the optimal encoding for the current locale will "
@@ -4362,447 +4400,447 @@ msgstr ""
 "若是選用「自動選擇」，系統將為自動為您判斷使用最\n"
 "合用的語系設定。"
 
-#: src/prefs_common.c:1179
+#: src/prefs_common.c:1191
 msgid "Transfer encoding"
 msgstr "傳送之編碼"
 
-#: src/prefs_common.c:1202
+#: src/prefs_common.c:1214
 #, fuzzy
 msgid ""
 "Specify Content-Transfer-Encoding used when message body contains non-ASCII "
 "characters."
 msgstr "請指定當郵件主體內容包含非 ASCII 字元時，使用哪種編碼來傳送內容。"
 
-#: src/prefs_common.c:1272
+#: src/prefs_common.c:1284
 msgid "Signature separator"
 msgstr "簽名分隔符號"
 
-#: src/prefs_common.c:1281
+#: src/prefs_common.c:1293
 msgid "Insert automatically"
 msgstr "自動加入簽名"
 
-#: src/prefs_common.c:1291
+#: src/prefs_common.c:1303
 msgid "Automatically launch the external editor"
 msgstr "自動呼叫外部編輯器"
 
-#: src/prefs_common.c:1301
+#: src/prefs_common.c:1313
 msgid "Undo level"
 msgstr "復原紀錄"
 
-#: src/prefs_common.c:1321
+#: src/prefs_common.c:1333
 msgid "Wrap messages at"
 msgstr "每行最多"
 
-#: src/prefs_common.c:1333
+#: src/prefs_common.c:1345
 msgid "characters"
 msgstr "個字元"
 
-#: src/prefs_common.c:1343
+#: src/prefs_common.c:1355
 msgid "Wrap quotation"
 msgstr "折行時顯示符號"
 
-#: src/prefs_common.c:1349
+#: src/prefs_common.c:1361
 msgid "Wrap on input"
 msgstr "切割輸入過長的文字行"
 
-#: src/prefs_common.c:1351
+#: src/prefs_common.c:1363
 msgid "Wrap before sending"
 msgstr "寄送之前自動折行"
 
-#: src/prefs_common.c:1361
+#: src/prefs_common.c:1373
 msgid "Automatically select account for replies"
 msgstr "回信時在相關欄位上自動加入下列電子郵件信箱："
 
-#: src/prefs_common.c:1363
+#: src/prefs_common.c:1375
 msgid "Quote message when replying"
 msgstr "回信時引用原文"
 
-#: src/prefs_common.c:1365
+#: src/prefs_common.c:1377
 msgid "Reply button invokes mailing list reply"
 msgstr "讀取 Mailing List 信件時按下「回覆」鈕表示回覆給 Mailing list"
 
 #. reply
-#: src/prefs_common.c:1411
+#: src/prefs_common.c:1423
 msgid "Reply format"
 msgstr "回覆格式"
 
-#: src/prefs_common.c:1426 src/prefs_common.c:1468
+#: src/prefs_common.c:1438 src/prefs_common.c:1480
 msgid "Quotation mark"
 msgstr "引言符號"
 
 #. forward
-#: src/prefs_common.c:1453
+#: src/prefs_common.c:1465
 msgid "Forward format"
 msgstr "轉寄格式"
 
-#: src/prefs_common.c:1500
+#: src/prefs_common.c:1512
 msgid " Description of symbols "
 msgstr "特殊符號代表的意義"
 
-#: src/prefs_common.c:1541
+#: src/prefs_common.c:1553
 msgid "Font"
 msgstr "字型"
 
-#: src/prefs_common.c:1573
+#: src/prefs_common.c:1585
 msgid "Translate header name (such as `From:', `Subject:')"
 msgstr "將標頭名稱翻譯出來"
 
-#: src/prefs_common.c:1576
+#: src/prefs_common.c:1588
 msgid "Display unread number next to folder name"
 msgstr "若有未讀信件，就顯示在資料夾名稱後面"
 
-#: src/prefs_common.c:1585
+#: src/prefs_common.c:1597
 msgid "Abbreviate newsgroups longer than"
 msgstr "新聞群組縮寫長度大於"
 
-#: src/prefs_common.c:1600
+#: src/prefs_common.c:1612
 msgid "letters"
 msgstr "個字母"
 
 #. ---- Summary ----
-#: src/prefs_common.c:1606
+#: src/prefs_common.c:1618
 msgid "Summary View"
 msgstr "信件列表"
 
-#: src/prefs_common.c:1615
+#: src/prefs_common.c:1627
 msgid "Display recipient on `From' column if sender is yourself"
 msgstr "若發信人是你自己，就在信件列表的來源中顯示收信人"
 
-#: src/prefs_common.c:1617
+#: src/prefs_common.c:1629
 msgid "Expand threads"
 msgstr "自動展開信件串列"
 
-#: src/prefs_common.c:1625 src/prefs_common.c:2443 src/prefs_common.c:2481
+#: src/prefs_common.c:1637 src/prefs_common.c:2455 src/prefs_common.c:2493
 msgid "Date format"
 msgstr "日期格式"
 
-#: src/prefs_common.c:1646
+#: src/prefs_common.c:1658
 msgid " Set display item of summary... "
 msgstr "設定信件列表選項..."
 
-#: src/prefs_common.c:1710
+#: src/prefs_common.c:1722
 msgid "Enable coloration of message"
 msgstr "信件中的引言與超連結顯示變色"
 
-#: src/prefs_common.c:1724
+#: src/prefs_common.c:1736
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
 msgstr "將全形英文與數字以半形來顯示 (只適用日文)"
 
-#: src/prefs_common.c:1730
+#: src/prefs_common.c:1742
 msgid "Display header pane above message view"
 msgstr "在顯示信件欄上方加入標頭資訊"
 
-#: src/prefs_common.c:1737
+#: src/prefs_common.c:1749
 msgid "Display short headers on message view"
 msgstr "在信件預覽中顯示信件標頭"
 
-#: src/prefs_common.c:1758
+#: src/prefs_common.c:1770
 msgid "Line space"
 msgstr "行間距"
 
-#: src/prefs_common.c:1772 src/prefs_common.c:1810
+#: src/prefs_common.c:1784 src/prefs_common.c:1822
 msgid "pixel(s)"
 msgstr "像素 (pixels)"
 
-#: src/prefs_common.c:1777
+#: src/prefs_common.c:1789
 msgid "Scroll"
 msgstr "捲軸"
 
-#: src/prefs_common.c:1784
+#: src/prefs_common.c:1796
 msgid "Half page"
 msgstr "一次半頁"
 
-#: src/prefs_common.c:1790
+#: src/prefs_common.c:1802
 msgid "Smooth scroll"
 msgstr "平滑捲動"
 
-#: src/prefs_common.c:1796
+#: src/prefs_common.c:1808
 msgid "Step"
 msgstr "每次捲動"
 
-#: src/prefs_common.c:1816
+#: src/prefs_common.c:1828
 msgid "Images"
 msgstr ""
 
-#: src/prefs_common.c:1824
+#: src/prefs_common.c:1836
 msgid "Resize attached large images to fit in the window"
 msgstr "調整附加影像大小"
 
-#: src/prefs_common.c:1826
+#: src/prefs_common.c:1838
 #, fuzzy
 msgid "Display images as inline"
 msgstr "顯示標頭設定"
 
-#: src/prefs_common.c:1871
+#: src/prefs_common.c:1883
 msgid "Automatically check signatures"
 msgstr "自動檢查數位簽章"
 
-#: src/prefs_common.c:1874
+#: src/prefs_common.c:1886
 msgid "Show signature check result in a popup window"
 msgstr "將數位簽章檢查結果顯示在另一視窗"
 
-#: src/prefs_common.c:1877
+#: src/prefs_common.c:1889
 msgid "Store passphrase in memory temporarily"
 msgstr "將密碼片語暫時存在記憶體中"
 
-#: src/prefs_common.c:1892
+#: src/prefs_common.c:1904
 msgid "Expired after"
 msgstr "期限："
 
-#: src/prefs_common.c:1905
+#: src/prefs_common.c:1917
 msgid "minute(s) "
 msgstr "分鐘"
 
-#: src/prefs_common.c:1918
+#: src/prefs_common.c:1930
 #, fuzzy
 msgid "Setting to '0' will store the passphrase for the whole session."
 msgstr "（若設定為 '0' 則表示沒有期限）"
 
-#: src/prefs_common.c:1932
+#: src/prefs_common.c:1944
 msgid "Grab input while entering a passphrase"
 msgstr "輸入 passphrase 時抓取輸入"
 
-#: src/prefs_common.c:1937
+#: src/prefs_common.c:1949
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "若 GnuPG 無法運作，則在啟動時發出警告"
 
-#: src/prefs_common.c:1989
+#: src/prefs_common.c:2001
 msgid "Always open messages in summary when selected"
 msgstr "在信件列表選擇信件時開啟信件。"
 
-#: src/prefs_common.c:1993
+#: src/prefs_common.c:2005
 msgid "Open first unread message when entering a folder"
 msgstr "進入資料夾時直接跳到第一封未讀信件上"
 
-#: src/prefs_common.c:1997
+#: src/prefs_common.c:2009
 msgid "Only mark message as read when opened in new window"
 msgstr "只在開啟新信件時標示為未讀"
 
-#: src/prefs_common.c:2001
+#: src/prefs_common.c:2013
 msgid "Go to inbox after receiving new mail"
 msgstr "接收完新郵件後直接進入收件夾中"
 
-#: src/prefs_common.c:2009
+#: src/prefs_common.c:2021
 msgid "Execute immediately when moving or deleting messages"
 msgstr "移動或刪除信件時立即執行"
 
-#: src/prefs_common.c:2021
+#: src/prefs_common.c:2033
 #, fuzzy
 msgid "Messages will be marked until execution if this is turned off."
 msgstr "（若此選項關閉，則必須按下「執行」才會執行移動或刪除）"
 
-#: src/prefs_common.c:2029
+#: src/prefs_common.c:2041
 msgid "Receive dialog"
 msgstr "接收進度對話盒"
 
-#: src/prefs_common.c:2039
+#: src/prefs_common.c:2051
 msgid "Show receive dialog"
 msgstr "顯示接收信件的進度對話盒"
 
-#: src/prefs_common.c:2049
+#: src/prefs_common.c:2061
 msgid "Always"
 msgstr "一律顯示"
 
-#: src/prefs_common.c:2050
+#: src/prefs_common.c:2062
 msgid "Only on manual receiving"
 msgstr "只在手動收取郵件時顯示"
 
-#: src/prefs_common.c:2052
+#: src/prefs_common.c:2064
 msgid "Never"
 msgstr "不顯示"
 
-#: src/prefs_common.c:2057
+#: src/prefs_common.c:2069
 msgid "Don't popup error dialog on receive error"
 msgstr "接收錯誤時不要開啟錯誤視窗。"
 
-#: src/prefs_common.c:2060
+#: src/prefs_common.c:2072
 msgid "Close receive dialog when finished"
 msgstr "完成時關閉接收信件的進度對話盒"
 
-#: src/prefs_common.c:2066
+#: src/prefs_common.c:2078
 msgid " Set key bindings... "
 msgstr "設定熱鍵"
 
-#: src/prefs_common.c:2122
+#: src/prefs_common.c:2134
 #, c-format
 msgid "External commands (%s will be replaced with file name / URI)"
 msgstr "外部指令（%s 將會被置換成檔名或 URI）"
 
-#: src/prefs_common.c:2131
+#: src/prefs_common.c:2143
 msgid "Web browser"
 msgstr "瀏覽器"
 
-#: src/prefs_common.c:2195
+#: src/prefs_common.c:2207
 msgid "Add address to destination when double-clicked"
 msgstr "在位址簿中，可利用雙擊直接將該電子郵件加入收信人中"
 
-#: src/prefs_common.c:2197
+#: src/prefs_common.c:2209
 msgid "On exit"
 msgstr "離開設定"
 
-#: src/prefs_common.c:2205
+#: src/prefs_common.c:2217
 msgid "Confirm on exit"
 msgstr "離開時確認"
 
-#: src/prefs_common.c:2212
+#: src/prefs_common.c:2224
 msgid "Empty trash on exit"
 msgstr "離開時清空刪除的郵件"
 
-#: src/prefs_common.c:2214
+#: src/prefs_common.c:2226
 msgid "Ask before emptying"
 msgstr "清除時確認"
 
-#: src/prefs_common.c:2218
+#: src/prefs_common.c:2230
 msgid "Warn if there are queued messages"
 msgstr "離開時若有尚未送出之信件即發出警告"
 
-#: src/prefs_common.c:2224
+#: src/prefs_common.c:2236
 msgid "Socket I/O timeout:"
 msgstr "Socket I/O 等待時間："
 
-#: src/prefs_common.c:2237
+#: src/prefs_common.c:2249
 msgid "second(s)"
 msgstr "秒"
 
-#: src/prefs_common.c:2419
+#: src/prefs_common.c:2431
 msgid "the full abbreviated weekday name"
 msgstr "週一、週二、..."
 
-#: src/prefs_common.c:2420
+#: src/prefs_common.c:2432
 msgid "the full weekday name"
 msgstr "星期一、星期二、..."
 
-#: src/prefs_common.c:2421
+#: src/prefs_common.c:2433
 msgid "the abbreviated month name"
 msgstr "1月、2月、..."
 
-#: src/prefs_common.c:2422
+#: src/prefs_common.c:2434
 msgid "the full month name"
 msgstr "一月、二月、..."
 
-#: src/prefs_common.c:2423
+#: src/prefs_common.c:2435
 msgid "the preferred date and time for the current locale"
 msgstr "完整的西元日期與時間（本地時間）"
 
-#: src/prefs_common.c:2424
+#: src/prefs_common.c:2436
 msgid "the century number (year/100)"
 msgstr "世紀 (年/100)"
 
-#: src/prefs_common.c:2425
+#: src/prefs_common.c:2437
 msgid "the day of the month as a decimal number"
 msgstr "今天是幾號 (以數字表示)"
 
-#: src/prefs_common.c:2426
+#: src/prefs_common.c:2438
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "現在幾點鐘 (廿四時制，以數字表示)"
 
-#: src/prefs_common.c:2427
+#: src/prefs_common.c:2439
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "現在幾點鐘 (十二時制，以數字表示)"
 
-#: src/prefs_common.c:2428
+#: src/prefs_common.c:2440
 msgid "the day of the year as a decimal number"
 msgstr "今天是今年的第幾天 (以數字表示)"
 
-#: src/prefs_common.c:2429
+#: src/prefs_common.c:2441
 msgid "the month as a decimal number"
 msgstr "現在是幾月 (以數字表示)"
 
-#: src/prefs_common.c:2430
+#: src/prefs_common.c:2442
 msgid "the minute as a decimal number"
 msgstr "現在是幾分 (以數字表示)"
 
-#: src/prefs_common.c:2431
+#: src/prefs_common.c:2443
 msgid "either AM or PM"
 msgstr "上午或下午"
 
-#: src/prefs_common.c:2432
+#: src/prefs_common.c:2444
 msgid "the second as a decimal number"
 msgstr "現在是幾秒 (以數字表示)"
 
-#: src/prefs_common.c:2433
+#: src/prefs_common.c:2445
 msgid "the day of the week as a decimal number"
 msgstr "現在是一週的第幾天 (以數字表示)"
 
-#: src/prefs_common.c:2434
+#: src/prefs_common.c:2446
 msgid "the preferred date for the current locale"
 msgstr "完整的西元日期 (本地時間)"
 
-#: src/prefs_common.c:2435
+#: src/prefs_common.c:2447
 msgid "the last two digits of a year"
 msgstr "西元年份的後兩位數字"
 
-#: src/prefs_common.c:2436
+#: src/prefs_common.c:2448
 msgid "the year as a decimal number"
 msgstr "西元年份 (以數字表示)"
 
-#: src/prefs_common.c:2437
+#: src/prefs_common.c:2449
 msgid "the time zone or name or abbreviation"
 msgstr "時區"
 
-#: src/prefs_common.c:2458
+#: src/prefs_common.c:2470
 msgid "Specifier"
 msgstr "特殊符號"
 
-#: src/prefs_common.c:2459
+#: src/prefs_common.c:2471
 msgid "Description"
 msgstr "描述"
 
-#: src/prefs_common.c:2499
+#: src/prefs_common.c:2511
 msgid "Example"
 msgstr "範例"
 
-#: src/prefs_common.c:2580
+#: src/prefs_common.c:2592
 msgid "Set message colors"
 msgstr "設定顏色"
 
-#: src/prefs_common.c:2588
+#: src/prefs_common.c:2600
 msgid "Colors"
 msgstr "顏色"
 
-#: src/prefs_common.c:2622
+#: src/prefs_common.c:2634
 msgid "Quoted Text - First Level"
 msgstr "引言內容 - 第一層"
 
-#: src/prefs_common.c:2628
+#: src/prefs_common.c:2640
 msgid "Quoted Text - Second Level"
 msgstr "引言內容 - 第二層"
 
-#: src/prefs_common.c:2634
+#: src/prefs_common.c:2646
 msgid "Quoted Text - Third Level"
 msgstr "引言內容 - 第三層"
 
-#: src/prefs_common.c:2640
+#: src/prefs_common.c:2652
 msgid "URI link"
 msgstr "超連結"
 
-#: src/prefs_common.c:2647
+#: src/prefs_common.c:2659
 msgid "Recycle quote colors"
 msgstr "三層以上引言則重複使用指定的顏色"
 
-#: src/prefs_common.c:2707
+#: src/prefs_common.c:2719
 msgid "Pick color for quotation level 1"
 msgstr "選擇第一層引言的顏色"
 
-#: src/prefs_common.c:2710
+#: src/prefs_common.c:2722
 msgid "Pick color for quotation level 2"
 msgstr "選擇第二層引言的顏色"
 
-#: src/prefs_common.c:2713
+#: src/prefs_common.c:2725
 msgid "Pick color for quotation level 3"
 msgstr "選擇第三層引言的顏色"
 
-#: src/prefs_common.c:2716
+#: src/prefs_common.c:2728
 msgid "Pick color for URI"
 msgstr "選擇超連結的顏色"
 
-#: src/prefs_common.c:2853
+#: src/prefs_common.c:2865
 msgid "Description of symbols"
 msgstr "特殊符號代表的意義"
 
-#: src/prefs_common.c:2909
+#: src/prefs_common.c:2921
 msgid ""
 "Date\n"
 "From\n"
@@ -4826,11 +4864,11 @@ msgstr ""
 "新聞群組\n"
 "信件識別碼"
 
-#: src/prefs_common.c:2922
+#: src/prefs_common.c:2934
 msgid "If x is set, displays expr"
 msgstr "若 x 已設定則顯示常規表示式"
 
-#: src/prefs_common.c:2926
+#: src/prefs_common.c:2938
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -4844,7 +4882,7 @@ msgstr ""
 "引言（不含簽名）\n"
 "% 符號"
 
-#: src/prefs_common.c:2934
+#: src/prefs_common.c:2946
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -4856,15 +4894,15 @@ msgstr ""
 "左大括弧\n"
 "右大括弧"
 
-#: src/prefs_common.c:2971
+#: src/prefs_common.c:2983
 msgid "Font selection"
 msgstr "選擇字型"
 
-#: src/prefs_common.c:3035
+#: src/prefs_common.c:3047
 msgid "Key bindings"
 msgstr "熱鍵設定"
 
-#: src/prefs_common.c:3049
+#: src/prefs_common.c:3061
 msgid ""
 "Select the preset of key bindings.\n"
 "You can also modify each menu's shortcuts by pressing\n"
@@ -4874,11 +4912,11 @@ msgstr ""
 "您也可以更改每個目錄的熱鍵，您只需要將滑鼠指標指過去，\n"
 "並按下任何鍵即可。"
 
-#: src/prefs_common.c:3061 src/prefs_common.c:3410
+#: src/prefs_common.c:3073 src/prefs_common.c:3422
 msgid "Default"
 msgstr "預設值"
 
-#: src/prefs_common.c:3064 src/prefs_common.c:3419
+#: src/prefs_common.c:3076 src/prefs_common.c:3431
 msgid "Old Sylpheed"
 msgstr "舊設定"
 
@@ -6018,6 +6056,12 @@ msgstr ""
 msgid "writing to %s failed.\n"
 msgstr "寫入到 %s 的動作失敗。\n"
 
+#~ msgid "/_View/_Code set/---"
+#~ msgstr "/顯示(_V)/字集(_C)/---"
+
+#~ msgid "/_View/_Code set"
+#~ msgstr "/顯示(_V)/字集(_C)"
+
 #~ msgid "To save this part, pop up the context menu with "
 #~ msgstr "要儲存這個檔案，請按滑鼠右鍵並在目錄中"
author	hiro <hiro@ee746299-78ed-0310-b773-934348b2243d>	2005-03-16 06:20:01 +0000
committer	hiro <hiro@ee746299-78ed-0310-b773-934348b2243d>	2005-03-16 06:20:01 +0000
commit	a2c35308bd6815962c36a3108cefe0069cdc1b33 (patch)
tree	fa7497d735e2904a35e91f167ad7c279f0436b4f /po
parent	8d574b9f4ca411ae7e3303fae8e2d365e3ece9c9 (diff)