added the option 'Text at the right of icon' for the toolbar.

git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@1516 ee746299-78ed-0310-b773-934348b2243d
author: hiro <hiro@ee746299-78ed-0310-b773-934348b2243d> 2007-01-31 08:36:46 +0000
committer: hiro <hiro@ee746299-78ed-0310-b773-934348b2243d> 2007-01-31 08:36:46 +0000
commit: f21da65fd163dc94e5440fbf21ba97c7825df39e (patch)
tree: 91936b30ae750b153e925d13647a6696a3b0cf02 /po
parent: f319e36f2e97904017924de7a5281d2cae4b2900 (diff)
29 files changed, 6843 insertions, 6699 deletions
diff --git a/po/bg.po b/po/bg.po
index 0a0464e6..5df803ea 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed 0.9.8\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-01-31 16:49+0900\n"
+"POT-Creation-Date: 2007-01-31 17:29+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"
@@ -905,7 +905,7 @@ msgstr "/_Адрес/_Редактиране"
 msgid "/_Address/_Delete"
 msgstr "/_Адрес/_Изтриване"
 
-#: src/addressbook.c:359 src/compose.c:673 src/mainwindow.c:787
+#: src/addressbook.c:359 src/compose.c:673 src/mainwindow.c:789
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Инструменти"
@@ -914,12 +914,12 @@ msgstr "/_Инструменти"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Инструменти/Внасяне на _LDIF файл"
 
-#: src/addressbook.c:361 src/compose.c:694 src/mainwindow.c:841
+#: src/addressbook.c:361 src/compose.c:694 src/mainwindow.c:843
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Помощ"
 
-#: src/addressbook.c:362 src/compose.c:695 src/mainwindow.c:853
+#: src/addressbook.c:362 src/compose.c:695 src/mainwindow.c:855
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Помощ/_Относно"
@@ -961,7 +961,7 @@ msgstr "/_Изтриване"
 msgid "E-Mail address"
 msgstr "E-Mail адрес"
 
-#: src/addressbook.c:496 src/compose.c:4873 src/mainwindow.c:2408
+#: src/addressbook.c:496 src/compose.c:4873 src/mainwindow.c:2416
 #: src/prefs_common_dialog.c:2274
 msgid "Address book"
 msgstr "Адресна книга"
@@ -1182,7 +1182,7 @@ msgstr "Публичен адрес"
 msgid "Personal address"
 msgstr "Личен адрес"
 
-#: src/alertpanel.c:142 src/compose.c:5717 src/main.c:638
+#: src/alertpanel.c:142 src/compose.c:5720 src/main.c:638
 msgid "Notice"
 msgstr "Забележка"
 
@@ -1355,9 +1355,9 @@ msgid "/_View/_Reply to"
 msgstr "/_Изглед/_Отговор до"
 
 #: src/compose.c:578 src/compose.c:580 src/compose.c:582 src/compose.c:584
-#: src/compose.c:587 src/mainwindow.c:577 src/mainwindow.c:580
-#: src/mainwindow.c:607 src/mainwindow.c:631 src/mainwindow.c:734
-#: src/mainwindow.c:738 src/messageview.c:258
+#: src/compose.c:587 src/mainwindow.c:579 src/mainwindow.c:582
+#: src/mainwindow.c:609 src/mainwindow.c:633 src/mainwindow.c:736
+#: src/mainwindow.c:740 src/messageview.c:258
 msgid "/_View/---"
 msgstr "/_Изглед/---"
 
@@ -1378,7 +1378,7 @@ msgstr "/_Изглед/_Притурка"
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/_Изглед/П_реход до/_Друга папка"
 
-#: src/compose.c:593 src/mainwindow.c:638 src/messageview.c:173
+#: src/compose.c:593 src/mainwindow.c:640 src/messageview.c:173
 #, fuzzy
 msgid "/_View/Character _encoding"
 msgstr "/_Изглед/_Сортиране/Низходящо"
@@ -1390,138 +1390,138 @@ msgstr ""
 #: src/compose.c:596 src/compose.c:602 src/compose.c:608 src/compose.c:612
 #: src/compose.c:620 src/compose.c:624 src/compose.c:630 src/compose.c:636
 #: src/compose.c:640 src/compose.c:650 src/compose.c:654 src/compose.c:662
-#: src/compose.c:666 src/mainwindow.c:634 src/mainwindow.c:641
+#: src/compose.c:666 src/mainwindow.c:636 src/mainwindow.c:643
 #: src/messageview.c:169
 #, fuzzy
 msgid "/_View/Character _encoding/---"
 msgstr "/_Изглед/_Сортиране/Низходящо"
 
-#: src/compose.c:598 src/mainwindow.c:642 src/messageview.c:177
+#: src/compose.c:598 src/mainwindow.c:644 src/messageview.c:177
 #, fuzzy
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Изглед/_Кодиране/7bit ascii (US-ASC_II)"
 
-#: src/compose.c:600 src/mainwindow.c:644 src/messageview.c:180
+#: src/compose.c:600 src/mainwindow.c:646 src/messageview.c:180
 #, fuzzy
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Изглед/_Кодиране/Unicode (_UTF-8)"
 
-#: src/compose.c:604 src/mainwindow.c:648 src/messageview.c:183
+#: src/compose.c:604 src/mainwindow.c:650 src/messageview.c:183
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Изглед/_Кодиране/Western European (ISO-8859-_1)"
 
-#: src/compose.c:606 src/mainwindow.c:650 src/messageview.c:185
+#: src/compose.c:606 src/mainwindow.c:652 src/messageview.c:185
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Изглед/_Кодиране/Western European (ISO-8859-15)"
 
-#: src/compose.c:610 src/mainwindow.c:656 src/messageview.c:190
+#: src/compose.c:610 src/mainwindow.c:658 src/messageview.c:190
 #, fuzzy
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Изглед/_Кодиране/Central European (ISO-8859-_2)"
 
-#: src/compose.c:614 src/mainwindow.c:660 src/messageview.c:193
+#: src/compose.c:614 src/mainwindow.c:662 src/messageview.c:193
 #, fuzzy
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Изглед/_Кодиране/_Baltic (ISO-8859-13)"
 
-#: src/compose.c:616 src/mainwindow.c:662 src/messageview.c:195
+#: src/compose.c:616 src/mainwindow.c:664 src/messageview.c:195
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Изглед/_Кодиране/Baltic (ISO-8859-_4)"
 
-#: src/compose.c:618 src/mainwindow.c:664 src/messageview.c:197
+#: src/compose.c:618 src/mainwindow.c:666 src/messageview.c:197
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/_Изглед/_Кодиране/Cyrillic (Windows-1251)"
 
-#: src/compose.c:622 src/mainwindow.c:668 src/messageview.c:200
+#: src/compose.c:622 src/mainwindow.c:670 src/messageview.c:200
 #, fuzzy
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Изглед/_Кодиране/Greek (ISO-8859-_7)"
 
-#: src/compose.c:626 src/mainwindow.c:672 src/messageview.c:203
+#: src/compose.c:626 src/mainwindow.c:674 src/messageview.c:203
 #, fuzzy
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/_Изглед/_Кодиране/Baltic (ISO-8859-_4)"
 
-#: src/compose.c:628 src/mainwindow.c:674 src/messageview.c:205
+#: src/compose.c:628 src/mainwindow.c:676 src/messageview.c:205
 #, fuzzy
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/_Изглед/_Кодиране/Cyrillic (Windows-1251)"
 
-#: src/compose.c:632 src/mainwindow.c:678 src/messageview.c:208
+#: src/compose.c:632 src/mainwindow.c:680 src/messageview.c:208
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Изглед/_Кодиране/Greek (ISO-8859-_7)"
 
-#: src/compose.c:634 src/mainwindow.c:680 src/messageview.c:210
+#: src/compose.c:634 src/mainwindow.c:682 src/messageview.c:210
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Изглед/_Кодиране/Cyrillic (Windows-1251)"
 
-#: src/compose.c:638 src/mainwindow.c:684 src/messageview.c:213
+#: src/compose.c:638 src/mainwindow.c:686 src/messageview.c:213
 #, fuzzy
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Изглед/_Кодиране/Turkish (ISO-8859-_9)"
 
-#: src/compose.c:642 src/mainwindow.c:688 src/messageview.c:216
+#: src/compose.c:642 src/mainwindow.c:690 src/messageview.c:216
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Изглед/_Кодиране/Cyrillic (ISO-8859-_5)"
 
-#: src/compose.c:644 src/mainwindow.c:690 src/messageview.c:218
+#: src/compose.c:644 src/mainwindow.c:692 src/messageview.c:218
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Изглед/_Кодиране/Cyrillic (KOI8-_R)"
 
-#: src/compose.c:646 src/mainwindow.c:692 src/messageview.c:220
+#: src/compose.c:646 src/mainwindow.c:694 src/messageview.c:220
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Изглед/_Кодиране/Cyrillic (KOI8-_R)"
 
-#: src/compose.c:648 src/mainwindow.c:694 src/messageview.c:222
+#: src/compose.c:648 src/mainwindow.c:696 src/messageview.c:222
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Изглед/_Кодиране/Cyrillic (Windows-1251)"
 
-#: src/compose.c:652 src/mainwindow.c:698 src/messageview.c:225
+#: src/compose.c:652 src/mainwindow.c:700 src/messageview.c:225
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Изглед/_Кодиране/Japanese (ISO-2022-_JP)"
 
-#: src/compose.c:656 src/mainwindow.c:708 src/messageview.c:234
+#: src/compose.c:656 src/mainwindow.c:710 src/messageview.c:234
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Изглед/_Кодиране/Simplified Chinese (_GB2312)"
 
-#: src/compose.c:658 src/mainwindow.c:710 src/messageview.c:236
+#: src/compose.c:658 src/mainwindow.c:712 src/messageview.c:236
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Изглед/_Кодиране/Simplified Chinese (_GB2312)"
 
-#: src/compose.c:660 src/mainwindow.c:712 src/messageview.c:238
+#: src/compose.c:660 src/mainwindow.c:714 src/messageview.c:238
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Изглед/_Кодиране/Traditional Chinese (_Big5)"
 
-#: src/compose.c:664 src/mainwindow.c:720 src/messageview.c:245
+#: src/compose.c:664 src/mainwindow.c:722 src/messageview.c:245
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Изглед/_Кодиране/Korean (EUC-_KR)"
 
-#: src/compose.c:668 src/mainwindow.c:726 src/messageview.c:250
+#: src/compose.c:668 src/mainwindow.c:728 src/messageview.c:250
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Изглед/_Кодиране/Thai (TIS-620)"
 
-#: src/compose.c:670 src/mainwindow.c:728 src/messageview.c:252
+#: src/compose.c:670 src/mainwindow.c:730 src/messageview.c:252
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Изглед/_Кодиране/Thai (Windows-874)"
 
-#: src/compose.c:674 src/mainwindow.c:788 src/messageview.c:283
+#: src/compose.c:674 src/mainwindow.c:790 src/messageview.c:283
 msgid "/_Tools/_Address book"
 msgstr "/_Инструменти/_Адресна книга"
 
@@ -1529,13 +1529,13 @@ msgstr "/_Инструменти/_Адресна книга"
 msgid "/_Tools/_Template"
 msgstr "/_Инструменти/_Шаблон"
 
-#: src/compose.c:677 src/mainwindow.c:812 src/messageview.c:299
+#: src/compose.c:677 src/mainwindow.c:814 src/messageview.c:299
 msgid "/_Tools/Actio_ns"
 msgstr "/_Инструменти/_Действия"
 
-#: src/compose.c:679 src/compose.c:683 src/compose.c:689 src/mainwindow.c:791
-#: src/mainwindow.c:805 src/mainwindow.c:810 src/mainwindow.c:813
-#: src/mainwindow.c:817 src/mainwindow.c:819 src/messageview.c:286
+#: src/compose.c:679 src/compose.c:683 src/compose.c:689 src/mainwindow.c:793
+#: src/mainwindow.c:807 src/mainwindow.c:812 src/mainwindow.c:815
+#: src/mainwindow.c:819 src/mainwindow.c:821 src/messageview.c:286
 #: src/messageview.c:298
 msgid "/_Tools/---"
 msgstr "/_Инструменти/---"
@@ -1741,7 +1741,7 @@ msgstr "/_Инструменти/_Действия"
 msgid "PGP Encrypt"
 msgstr "/_Съобщение/_Криптиране"
 
-#: src/compose.c:4442 src/compose.c:5543
+#: src/compose.c:4442 src/compose.c:5546
 msgid "MIME type"
 msgstr "MIME тип"
 
@@ -1784,36 +1784,36 @@ msgstr "Редакция с външен редактор"
 msgid "Wrap all long lines"
 msgstr "Свиване на всички дълги редове"
 
-#: src/compose.c:5439
+#: src/compose.c:5442
 msgid "Invalid MIME type."
 msgstr "Невалиден MIME тип"
 
-#: src/compose.c:5457
+#: src/compose.c:5460
 msgid "File doesn't exist or is empty."
 msgstr "Файлът не съществува или е празен"
 
-#: src/compose.c:5525
+#: src/compose.c:5528
 msgid "Properties"
 msgstr "Аксесоари"
 
-#: src/compose.c:5545 src/prefs_common_dialog.c:1504
+#: src/compose.c:5548 src/prefs_common_dialog.c:1504
 msgid "Encoding"
 msgstr "Кодиране"
 
-#: src/compose.c:5568 src/prefs_folder_item.c:202
+#: src/compose.c:5571 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Път"
 
-#: src/compose.c:5569
+#: src/compose.c:5572
 msgid "File name"
 msgstr "Име на файл"
 
-#: src/compose.c:5659
+#: src/compose.c:5662
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Командния ред за външен редактор е невалиден: `%s'\n"
 
-#: src/compose.c:5714
+#: src/compose.c:5717
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1823,52 +1823,52 @@ msgstr ""
 "Желаете ли принудително прекратяване на процеса?\n"
 "process group id: %d"
 
-#: src/compose.c:6040 src/mainwindow.c:2752
+#: src/compose.c:6043 src/mainwindow.c:2761
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:6156 src/compose.c:6161 src/compose.c:6167
+#: src/compose.c:6159 src/compose.c:6164 src/compose.c:6170
 msgid "Can't queue the message."
 msgstr "Не може да се нареди съобщението на опашката."
 
-#: src/compose.c:6258
+#: src/compose.c:6261
 #, fuzzy
 msgid "Select files"
 msgstr "Избор на файл"
 
-#: src/compose.c:6281
+#: src/compose.c:6284
 msgid "Select file"
 msgstr "Избор на файл"
 
-#: src/compose.c:6316
+#: src/compose.c:6319
 #, fuzzy
 msgid "Save message"
 msgstr "Изпращане на съобщение"
 
-#: src/compose.c:6317
+#: src/compose.c:6320
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Съобщението беше променено. Изоставяне?"
 
-#: src/compose.c:6319
+#: src/compose.c:6322
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:6361
+#: src/compose.c:6364
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Желаете ли да приложите шаблонът `%s' ?"
 
-#: src/compose.c:6363
+#: src/compose.c:6366
 msgid "Apply template"
 msgstr "Прилагане на шаблон"
 
-#: src/compose.c:6364
+#: src/compose.c:6367
 #, fuzzy
 msgid "_Replace"
 msgstr "Заменяне"
 
-#: src/compose.c:6364
+#: src/compose.c:6367
 #, fuzzy
 msgid "_Insert"
 msgstr "Вмъкване"
@@ -2330,12 +2330,12 @@ msgstr "Установяване информация за папка...\n"
 msgid "Setting folder info..."
 msgstr "Установяване информация за папка..."
 
-#: src/folderview.c:868 src/mainwindow.c:3748 src/setup.c:80
+#: src/folderview.c:868 src/mainwindow.c:3757 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Сканиране на папка %s%c%s ..."
 
-#: src/folderview.c:872 src/mainwindow.c:3753 src/setup.c:85
+#: src/folderview.c:872 src/mainwindow.c:3762 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Сканиране на папка %s ..."
@@ -3102,563 +3102,568 @@ msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/_Изглед/Показване или _скриване/_Лента/Икони и _текст"
 
 #: src/mainwindow.c:566
-msgid "/_View/Show or hi_de/_Toolbar/_Icon"
+#, fuzzy
+msgid "/_View/Show or hi_de/_Toolbar/Text at the _right of icon"
 msgstr "/_Изглед/Показване или _скриване/_Лента/_Икони"
 
 #: src/mainwindow.c:568
+msgid "/_View/Show or hi_de/_Toolbar/_Icon"
+msgstr "/_Изглед/Показване или _скриване/_Лента/_Икони"
+
+#: src/mainwindow.c:570
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/_Изглед/Показване или _скриване/_Лента/Т_екст"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:572
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/_Изглед/Показване или _скриване/_Лента/_Без показване"
 
-#: src/mainwindow.c:572
+#: src/mainwindow.c:574
 #, fuzzy
 msgid "/_View/Show or hi_de/_Search bar"
 msgstr "/_Изглед/Показване или _скриване/Лента на _състоянието"
 
-#: src/mainwindow.c:574
+#: src/mainwindow.c:576
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/_Изглед/Показване или _скриване/Лента на _състоянието"
 
-#: src/mainwindow.c:576
+#: src/mainwindow.c:578
 #, fuzzy
 msgid "/_View/_Customize toolbar..."
 msgstr "/_Изглед/П_реход до/_Друга папка"
 
-#: src/mainwindow.c:578
+#: src/mainwindow.c:580
 msgid "/_View/Separate f_older tree"
 msgstr "/_Изглед/_Отделно дърво на папките"
 
-#: src/mainwindow.c:579
+#: src/mainwindow.c:581
 #, fuzzy
 msgid "/_View/Separate _message view"
 msgstr "/_Изглед/Отделен изглед на съобщенията"
 
-#: src/mainwindow.c:581
+#: src/mainwindow.c:583
 msgid "/_View/_Sort"
 msgstr "/_Изглед/_Сортиране"
 
-#: src/mainwindow.c:582
+#: src/mainwindow.c:584
 msgid "/_View/_Sort/by _number"
 msgstr "/_Изглед/_Сортиране/по _номер"
 
-#: src/mainwindow.c:583
+#: src/mainwindow.c:585
 msgid "/_View/_Sort/by s_ize"
 msgstr "/_Изглед/_Сортиране/по _размер"
 
-#: src/mainwindow.c:584
+#: src/mainwindow.c:586
 msgid "/_View/_Sort/by _date"
 msgstr "/_Изглед/_Сортиране/по _дата"
 
-#: src/mainwindow.c:585
+#: src/mainwindow.c:587
 #, fuzzy
 msgid "/_View/_Sort/by t_hread date"
 msgstr "/_Изглед/_Сортиране/по _дата"
 
-#: src/mainwindow.c:586
+#: src/mainwindow.c:588
 msgid "/_View/_Sort/by _from"
 msgstr "/_Изглед/_Сортиране/по _подател"
 
-#: src/mainwindow.c:587
+#: src/mainwindow.c:589
 msgid "/_View/_Sort/by _recipient"
 msgstr "/_Изглед/_Сортиране/по п_олучател"
 
-#: src/mainwindow.c:588
+#: src/mainwindow.c:590
 msgid "/_View/_Sort/by _subject"
 msgstr "/_Изглед/_Сортиране/по _тема"
 
-#: src/mainwindow.c:589
+#: src/mainwindow.c:591
 msgid "/_View/_Sort/by _color label"
 msgstr "/_Изглед/_Сортиране/по _цвят"
 
-#: src/mainwindow.c:591
+#: src/mainwindow.c:593
 msgid "/_View/_Sort/by _mark"
 msgstr "/_Изглед/_Сортиране/по _отбелязване"
 
-#: src/mainwindow.c:592
+#: src/mainwindow.c:594
 msgid "/_View/_Sort/by _unread"
 msgstr "/_Изглед/_Сортиране/по _непрочетени"
 
-#: src/mainwindow.c:593
+#: src/mainwindow.c:595
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/_Изглед/_Сортиране/по _притурка"
 
-#: src/mainwindow.c:595
+#: src/mainwindow.c:597
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/_Изглед/_Сортиране/_Без сортиране"
 
-#: src/mainwindow.c:596 src/mainwindow.c:599
+#: src/mainwindow.c:598 src/mainwindow.c:601
 msgid "/_View/_Sort/---"
 msgstr "/_Изглед/_Сортиране/---"
 
-#: src/mainwindow.c:597
+#: src/mainwindow.c:599
 msgid "/_View/_Sort/Ascending"
 msgstr "/_Изглед/_Сортиране/Възходящо"
 
-#: src/mainwindow.c:598
+#: src/mainwindow.c:600
 msgid "/_View/_Sort/Descending"
 msgstr "/_Изглед/_Сортиране/Низходящо"
 
-#: src/mainwindow.c:600
+#: src/mainwindow.c:602
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/_Изглед/_Сортиране/_Привличане по тема"
 
-#: src/mainwindow.c:602
+#: src/mainwindow.c:604
 msgid "/_View/Th_read view"
 msgstr "/_Изглед/_Нишков изглед"
 
-#: src/mainwindow.c:603
+#: src/mainwindow.c:605
 msgid "/_View/E_xpand all threads"
 msgstr "/_Изглед/_Развиване на всички нишки"
 
-#: src/mainwindow.c:604
+#: src/mainwindow.c:606
 msgid "/_View/Co_llapse all threads"
 msgstr "/_Изглед/_Свиване на всички нишки"
 
-#: src/mainwindow.c:605
+#: src/mainwindow.c:607
 msgid "/_View/Set display _item..."
 msgstr "/_Изглед/Атрибути на извадката"
 
-#: src/mainwindow.c:608
+#: src/mainwindow.c:610
 msgid "/_View/_Go to"
 msgstr "/_Изглед/П_реход до"
 
-#: src/mainwindow.c:609
+#: src/mainwindow.c:611
 msgid "/_View/_Go to/_Prev message"
 msgstr "/_Изглед/П_реход до/_Предишно съобщение"
 
-#: src/mainwindow.c:610
+#: src/mainwindow.c:612
 msgid "/_View/_Go to/_Next message"
 msgstr "/_Изглед/П_реход до/_Следващо съобщение"
 
-#: src/mainwindow.c:611 src/mainwindow.c:616 src/mainwindow.c:619
-#: src/mainwindow.c:624 src/mainwindow.c:629
+#: src/mainwindow.c:613 src/mainwindow.c:618 src/mainwindow.c:621
+#: src/mainwindow.c:626 src/mainwindow.c:631
 msgid "/_View/_Go to/---"
 msgstr "/_Изглед/П_реход до/---"
 
-#: src/mainwindow.c:612
+#: src/mainwindow.c:614
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/_Изглед/П_реход до/П_редишно непрочетено съобщение"
 
-#: src/mainwindow.c:614
+#: src/mainwindow.c:616
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/_Изглед/П_реход до/С_ледващо непрочетено съобщение"
 
-#: src/mainwindow.c:617
+#: src/mainwindow.c:619
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/_Изглед/П_реход до/Предишно _ново съобщение"
 
-#: src/mainwindow.c:618
+#: src/mainwindow.c:620
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/_Изглед/П_реход до/Следващо н_ово съобщение"
 
-#: src/mainwindow.c:620
+#: src/mainwindow.c:622
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/_Изглед/П_реход до/Предишно _маркирано съобщение"
 
-#: src/mainwindow.c:622
+#: src/mainwindow.c:624
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/_Изглед/П_реход до/Следващо м_аркирано съобщение"
 
-#: src/mainwindow.c:625
+#: src/mainwindow.c:627
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/_Изглед/П_реход до/Предишно _оцветено съобщение"
 
-#: src/mainwindow.c:627
+#: src/mainwindow.c:629
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/_Изглед/П_реход до/Следващо о_цветено съобщение"
 
-#: src/mainwindow.c:630
+#: src/mainwindow.c:632
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Изглед/П_реход до/_Друга папка"
 
-#: src/mainwindow.c:639 src/messageview.c:174
+#: src/mainwindow.c:641 src/messageview.c:174
 #, fuzzy
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Изглед/_Кодиране/_Автоматично разпознаване"
 
-#: src/mainwindow.c:652 src/messageview.c:187
+#: src/mainwindow.c:654 src/messageview.c:187
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr "/_Изглед/_Кодиране/Western European (ISO-8859-15)"
 
-#: src/mainwindow.c:700 src/messageview.c:227
+#: src/mainwindow.c:702 src/messageview.c:227
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Изглед/_Кодиране/Japanese (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:702 src/messageview.c:229
+#: src/mainwindow.c:704 src/messageview.c:229
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Изглед/_Кодиране/Japanese (_EUC-JP)"
 
-#: src/mainwindow.c:704 src/messageview.c:231
+#: src/mainwindow.c:706 src/messageview.c:231
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Изглед/_Кодиране/Japanese (_Shift__JIS)"
 
-#: src/mainwindow.c:714 src/messageview.c:240
+#: src/mainwindow.c:716 src/messageview.c:240
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Изглед/_Кодиране/Traditional Chinese (EUC-_TW)"
 
-#: src/mainwindow.c:716 src/messageview.c:242
+#: src/mainwindow.c:718 src/messageview.c:242
 #, fuzzy
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Изглед/_Кодиране/Chinese (ISO-2022-_CN)"
 
-#: src/mainwindow.c:722 src/messageview.c:247
+#: src/mainwindow.c:724 src/messageview.c:247
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Изглед/_Кодиране/Korean (ISO-2022-KR)"
 
-#: src/mainwindow.c:735 src/summaryview.c:464
+#: src/mainwindow.c:737 src/summaryview.c:464
 msgid "/_View/Open in new _window"
 msgstr "/_Изглед/Отваряне в _нов прозорец"
 
-#: src/mainwindow.c:736 src/messageview.c:259 src/summaryview.c:466
+#: src/mainwindow.c:738 src/messageview.c:259 src/summaryview.c:466
 msgid "/_View/Mess_age source"
 msgstr "/_Изглед/_Изходен код"
 
-#: src/mainwindow.c:737 src/messageview.c:260 src/summaryview.c:467
+#: src/mainwindow.c:739 src/messageview.c:260 src/summaryview.c:467
 #, fuzzy
 msgid "/_View/All _headers"
 msgstr "/_Изглед/_Цялата заглавна част"
 
-#: src/mainwindow.c:739
+#: src/mainwindow.c:741
 msgid "/_View/_Update summary"
 msgstr "/_Изглед/_Обновяване на извадката"
 
-#: src/mainwindow.c:741 src/messageview.c:263
+#: src/mainwindow.c:743 src/messageview.c:263
 msgid "/_Message"
 msgstr "/_Съобщение"
 
-#: src/mainwindow.c:742
+#: src/mainwindow.c:744
 #, fuzzy
 msgid "/_Message/Recei_ve"
 msgstr "/_Съобщение/_Редактиране"
 
-#: src/mainwindow.c:743
+#: src/mainwindow.c:745
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/_Съобщение/Получаване от _всички акаунти"
 
-#: src/mainwindow.c:745
+#: src/mainwindow.c:747
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/_Съобщение/Получаване от _всички акаунти"
 
-#: src/mainwindow.c:747
+#: src/mainwindow.c:749
 #, fuzzy
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/_Съобщение/_Отказ на получаване"
 
-#: src/mainwindow.c:749
+#: src/mainwindow.c:751
 #, fuzzy
 msgid "/_Message/Recei_ve/---"
 msgstr "/_Съобщение/---"
 
-#: src/mainwindow.c:750
+#: src/mainwindow.c:752
 msgid "/_Message/_Send queued messages"
 msgstr "/_Съобщение/_Изпращане на съобщенията в опашката"
 
-#: src/mainwindow.c:751 src/mainwindow.c:753 src/mainwindow.c:760
-#: src/mainwindow.c:765 src/mainwindow.c:768 src/mainwindow.c:779
-#: src/mainwindow.c:781 src/mainwindow.c:784 src/messageview.c:266
+#: src/mainwindow.c:753 src/mainwindow.c:755 src/mainwindow.c:762
+#: src/mainwindow.c:767 src/mainwindow.c:770 src/mainwindow.c:781
+#: src/mainwindow.c:783 src/mainwindow.c:786 src/messageview.c:266
 #: src/messageview.c:274 src/messageview.c:279
 msgid "/_Message/---"
 msgstr "/_Съобщение/---"
 
-#: src/mainwindow.c:752 src/messageview.c:264
+#: src/mainwindow.c:754 src/messageview.c:264
 msgid "/_Message/Compose _new message"
 msgstr "/_Съобщение/_Съставяне на ново съобщение"
 
-#: src/mainwindow.c:754 src/messageview.c:267
+#: src/mainwindow.c:756 src/messageview.c:267
 msgid "/_Message/_Reply"
 msgstr "/_Съобщение/_Отговор"
 
-#: src/mainwindow.c:755
+#: src/mainwindow.c:757
 msgid "/_Message/Repl_y to"
 msgstr "/_Съобщение/Отговор _до"
 
-#: src/mainwindow.c:756 src/messageview.c:268
+#: src/mainwindow.c:758 src/messageview.c:268
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Съобщение/Отговор _до/_всички"
 
-#: src/mainwindow.c:757 src/messageview.c:270
+#: src/mainwindow.c:759 src/messageview.c:270
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Съобщение/Отговор _до/_подател"
 
-#: src/mainwindow.c:758 src/messageview.c:272
+#: src/mainwindow.c:760 src/messageview.c:272
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Съобщение/Отговор _до/_пощенски списък"
 
-#: src/mainwindow.c:761 src/messageview.c:275
+#: src/mainwindow.c:763 src/messageview.c:275
 msgid "/_Message/_Forward"
 msgstr "/_Съобщение/П_репращане"
 
-#: src/mainwindow.c:762 src/messageview.c:276
+#: src/mainwindow.c:764 src/messageview.c:276
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Съобщение/Пр_епращане като притурка"
 
-#: src/mainwindow.c:764 src/messageview.c:278
+#: src/mainwindow.c:766 src/messageview.c:278
 msgid "/_Message/Redirec_t"
 msgstr "/_Съобщение/_Пренасочване"
 
-#: src/mainwindow.c:766
+#: src/mainwindow.c:768
 msgid "/_Message/M_ove..."
 msgstr "/_Съобщение/_Преместване"
 
-#: src/mainwindow.c:767
+#: src/mainwindow.c:769
 msgid "/_Message/_Copy..."
 msgstr "/_Съобщение/_Копиране"
 
-#: src/mainwindow.c:769
+#: src/mainwindow.c:771
 msgid "/_Message/_Mark"
 msgstr "/_Съобщение/_Маркиране"
 
-#: src/mainwindow.c:770
+#: src/mainwindow.c:772
 msgid "/_Message/_Mark/_Mark"
 msgstr "/_Съобщение/_Маркиране/_Маркиране"
 
-#: src/mainwindow.c:771
+#: src/mainwindow.c:773
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/_Съобщение/_Маркиране/_Размаркиране"
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:774
 msgid "/_Message/_Mark/---"
 msgstr "/_Съобщение/_Маркиране/---"
 
-#: src/mainwindow.c:773
+#: src/mainwindow.c:775
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/_Съобщение/_Маркиране/като _непрочетено"
 
-#: src/mainwindow.c:774
+#: src/mainwindow.c:776
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/_Съобщение/_Маркиране/като _прочетено"
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:778
 #, fuzzy
 msgid "/_Message/_Mark/Mark _thread as read"
 msgstr "/_Съобщение/_Маркиране/като _прочетено"
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:780
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/_Съобщение/_Маркиране/_всички като прочетени"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:782
 msgid "/_Message/_Delete"
 msgstr "/_Съобщение/_Изтриване"
 
-#: src/mainwindow.c:782
+#: src/mainwindow.c:784
 #, fuzzy
 msgid "/_Message/Set as _junk mail"
 msgstr "/_Съобщение/_Получаване на нова поща"
 
-#: src/mainwindow.c:783
+#: src/mainwindow.c:785
 #, fuzzy
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/_Съобщение/_Получаване на нова поща"
 
-#: src/mainwindow.c:785 src/messageview.c:280
+#: src/mainwindow.c:787 src/messageview.c:280
 msgid "/_Message/Re-_edit"
 msgstr "/_Съобщение/_Редактиране"
 
-#: src/mainwindow.c:789
+#: src/mainwindow.c:791
 #, fuzzy
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/_Инструменти/_Добавяне на подател в адресната книга"
 
-#: src/mainwindow.c:792
+#: src/mainwindow.c:794
 #, fuzzy
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/_Инструменти/_Филтриране на съобщенията"
 
-#: src/mainwindow.c:794
+#: src/mainwindow.c:796
 #, fuzzy
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Инструменти/_Филтриране на съобщенията"
 
-#: src/mainwindow.c:796 src/messageview.c:287
+#: src/mainwindow.c:798 src/messageview.c:287
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Инструменти/_Създаване на правило за филтриране"
 
-#: src/mainwindow.c:797 src/messageview.c:289
+#: src/mainwindow.c:799 src/messageview.c:289
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Инструменти/_Създаване на правило за филтриране/_Автоматично"
 
-#: src/mainwindow.c:799 src/messageview.c:291
+#: src/mainwindow.c:801 src/messageview.c:291
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Инструменти/_Създаване на правило за филтриране/по _Подател"
 
-#: src/mainwindow.c:801 src/messageview.c:293
+#: src/mainwindow.c:803 src/messageview.c:293
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Инструменти/_Създаване на правило за филтриране/по П_олучател"
 
-#: src/mainwindow.c:803 src/messageview.c:295
+#: src/mainwindow.c:805 src/messageview.c:295
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Инструменти/_Създаване на правило за филтриране/по _Тема"
 
-#: src/mainwindow.c:806
+#: src/mainwindow.c:808
 #, fuzzy
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/_Инструменти/_Филтриране на съобщенията"
 
-#: src/mainwindow.c:808
+#: src/mainwindow.c:810
 #, fuzzy
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/_Инструменти/_Филтриране на съобщенията"
 
-#: src/mainwindow.c:815
+#: src/mainwindow.c:817
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/_Инструменти/И_зтриване на повтарящи се съобщения"
 
-#: src/mainwindow.c:818
+#: src/mainwindow.c:820
 #, fuzzy
 msgid "/_Tools/E_xecute marked process"
 msgstr "Изпълняване на маркирания процес"
 
-#: src/mainwindow.c:820
+#: src/mainwindow.c:822
 msgid "/_Tools/_Log window"
 msgstr "/_Инструменти/_Журнален прозорец"
 
-#: src/mainwindow.c:822
+#: src/mainwindow.c:824
 msgid "/_Configuration"
 msgstr "/_Конфигуриране"
 
-#: src/mainwindow.c:823
+#: src/mainwindow.c:825
 msgid "/_Configuration/_Common preferences..."
 msgstr "/_Конфигуриране/_Общи предпочитания"
 
-#: src/mainwindow.c:825
+#: src/mainwindow.c:827
 msgid "/_Configuration/_Filter setting..."
 msgstr "/_Конфигуриране/_Установяване на филтър"
 
-#: src/mainwindow.c:827
+#: src/mainwindow.c:829
 msgid "/_Configuration/_Template..."
 msgstr "/_Конфигуриране/_Шаблон"
 
-#: src/mainwindow.c:829
+#: src/mainwindow.c:831
 msgid "/_Configuration/_Actions..."
 msgstr "/_Конфигуриране/_Действия"
 
-#: src/mainwindow.c:831
+#: src/mainwindow.c:833
 msgid "/_Configuration/---"
 msgstr "/_Конфигуриране/---"
 
-#: src/mainwindow.c:832
+#: src/mainwindow.c:834
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Конфигуриране/_Предпочитания за текущия акаунт"
 
-#: src/mainwindow.c:834
+#: src/mainwindow.c:836
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Конфигуриране/_Създаване на нов акаунт"
 
-#: src/mainwindow.c:836
+#: src/mainwindow.c:838
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Конфигуриране/_Редактиране на акаунтите"
 
-#: src/mainwindow.c:838
+#: src/mainwindow.c:840
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Конфигуриране/С_мяна на текущия акаунт"
 
-#: src/mainwindow.c:842
+#: src/mainwindow.c:844
 msgid "/_Help/_Manual"
 msgstr "/_Помощ/_Наръчник"
 
-#: src/mainwindow.c:843
+#: src/mainwindow.c:845
 msgid "/_Help/_Manual/_English"
 msgstr "/_Помощ/_Наръчник/_Английски"
 
-#: src/mainwindow.c:844
+#: src/mainwindow.c:846
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/_Помощ/_Наръчник/_Японски"
 
-#: src/mainwindow.c:845
+#: src/mainwindow.c:847
 msgid "/_Help/_FAQ"
 msgstr "/_Помощ/_Чести въпроси"
 
-#: src/mainwindow.c:846
+#: src/mainwindow.c:848
 msgid "/_Help/_FAQ/_English"
 msgstr "/_Помощ/_Чести въпроси/_Английски"
 
-#: src/mainwindow.c:847
+#: src/mainwindow.c:849
 msgid "/_Help/_FAQ/_German"
 msgstr "/_Помощ/_Чести въпроси/_Немски"
 
-#: src/mainwindow.c:848
+#: src/mainwindow.c:850
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/_Помощ/_Чести въпроси/_Испански"
 
-#: src/mainwindow.c:849
+#: src/mainwindow.c:851
 msgid "/_Help/_FAQ/_French"
 msgstr "/_Помощ/_Чести въпроси/_Френски"
 
-#: src/mainwindow.c:850
+#: src/mainwindow.c:852
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/_Помощ/_Чести въпроси/_Италиански"
 
-#: src/mainwindow.c:851
+#: src/mainwindow.c:853
 #, fuzzy
 msgid "/_Help/_Command line options"
 msgstr "Не е въведен команден ред."
 
-#: src/mainwindow.c:852
+#: src/mainwindow.c:854
 msgid "/_Help/---"
 msgstr "/_Помощ/---"
 
-#: src/mainwindow.c:895
+#: src/mainwindow.c:897
 msgid "Creating main window...\n"
 msgstr "Създаване на главен прозорец...\n"
 
-#: src/mainwindow.c:1071
+#: src/mainwindow.c:1073
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr ""
 
-#: src/mainwindow.c:1175 src/summaryview.c:2387 src/summaryview.c:2472
+#: src/mainwindow.c:1181 src/summaryview.c:2387 src/summaryview.c:2472
 #: src/summaryview.c:4009 src/summaryview.c:4138 src/summaryview.c:4507
 msgid "done.\n"
 msgstr "готово.\n"
 
-#: src/mainwindow.c:1293 src/mainwindow.c:1334 src/mainwindow.c:1359
+#: src/mainwindow.c:1299 src/mainwindow.c:1340 src/mainwindow.c:1365
 msgid "Untitled"
 msgstr "Неозаглавен"
 
-#: src/mainwindow.c:1360
+#: src/mainwindow.c:1366
 msgid "none"
 msgstr "липсва"
 
-#: src/mainwindow.c:1413
+#: src/mainwindow.c:1419
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "Промяна на разделението на прозореца от %d до %d\n"
 
-#: src/mainwindow.c:1663
+#: src/mainwindow.c:1669
 msgid "Offline"
 msgstr "Без достъп до мрежа"
 
-#: src/mainwindow.c:1664
+#: src/mainwindow.c:1670
 msgid "You are offline. Go online?"
 msgstr "Работите без достъп до мрежа. Желаете ли да включите мрежата?"
 
-#: src/mainwindow.c:1681
+#: src/mainwindow.c:1687
 #, fuzzy
 msgid "Empty all trash"
 msgstr "Изчистване на кошчето"
 
-#: src/mainwindow.c:1682
+#: src/mainwindow.c:1688
 #, fuzzy
 msgid "Delete all messages in trash folders?"
 msgstr "Желаете ли изчистване на кошчето?"
 
-#: src/mainwindow.c:1712
+#: src/mainwindow.c:1718
 msgid "Add mailbox"
 msgstr "Добавяне на пощенска кутия"
 
-#: src/mainwindow.c:1713
+#: src/mainwindow.c:1719
 #, fuzzy
 msgid ""
 "Specify the location of mailbox.\n"
@@ -3669,16 +3674,16 @@ msgstr ""
 "Ако е указана съществуваща кутия, тя ще бъде\n"
 "сканирана автоматично."
 
-#: src/mainwindow.c:1719 src/setup.c:49
+#: src/mainwindow.c:1725 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Вече съществува пощенска кутия `%s'."
 
-#: src/mainwindow.c:1724 src/setup.c:56
+#: src/mainwindow.c:1730 src/setup.c:56
 msgid "Mailbox"
 msgstr "Пощенска кутия"
 
-#: src/mainwindow.c:1730 src/setup.c:62
+#: src/mainwindow.c:1736 src/setup.c:62
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3687,135 +3692,135 @@ msgstr ""
 "Създаването на пощенска кутия се провали.\n"
 "Вече съществуват някакви файлове, или нямате права за запис."
 
-#: src/mainwindow.c:2198
+#: src/mainwindow.c:2206
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Изглед на папките"
 
-#: src/mainwindow.c:2217
+#: src/mainwindow.c:2225
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Изглед на съобщенията"
 
-#: src/mainwindow.c:2369 src/summaryview.c:418
+#: src/mainwindow.c:2377 src/summaryview.c:418
 msgid "/_Reply"
 msgstr "/_Отговор"
 
-#: src/mainwindow.c:2370
+#: src/mainwindow.c:2378
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "Отговаряне на всички"
 
-#: src/mainwindow.c:2371
+#: src/mainwindow.c:2379
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/Отговор _до/_подател"
 
-#: src/mainwindow.c:2372
+#: src/mainwindow.c:2380
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/Отговор _до/пощенски _списък"
 
-#: src/mainwindow.c:2377 src/summaryview.c:425
+#: src/mainwindow.c:2385 src/summaryview.c:425
 msgid "/_Forward"
 msgstr "/_Препращане"
 
-#: src/mainwindow.c:2378 src/summaryview.c:426
+#: src/mainwindow.c:2386 src/summaryview.c:426
 msgid "/For_ward as attachment"
 msgstr "/Пр_епращане като притурка"
 
-#: src/mainwindow.c:2379 src/summaryview.c:427
+#: src/mainwindow.c:2387 src/summaryview.c:427
 msgid "/Redirec_t"
 msgstr "/П_ренасочване"
 
-#: src/mainwindow.c:2384
+#: src/mainwindow.c:2392
 msgid "Incorporate new mail"
 msgstr "Приемане на нова поща"
 
-#: src/mainwindow.c:2386
+#: src/mainwindow.c:2394
 msgid "Incorporate new mail of all accounts"
 msgstr "Приемане на нова поща от всички акаунти"
 
-#: src/mainwindow.c:2388
+#: src/mainwindow.c:2396
 msgid "Send queued message(s)"
 msgstr "Изпращане на съобщенията в опашката"
 
-#: src/mainwindow.c:2390
+#: src/mainwindow.c:2398
 msgid "Compose new message"
 msgstr "Съставяне на ново съобщение"
 
-#: src/mainwindow.c:2392
+#: src/mainwindow.c:2400
 msgid "Reply to the message"
 msgstr "Отговаряне на съобщение"
 
-#: src/mainwindow.c:2394
+#: src/mainwindow.c:2402
 msgid "Reply to all"
 msgstr "Отговаряне на всички"
 
-#: src/mainwindow.c:2396
+#: src/mainwindow.c:2404
 msgid "Forward the message"
 msgstr "Препращане на съобщението"
 
-#: src/mainwindow.c:2398
+#: src/mainwindow.c:2406
 msgid "Delete the message"
 msgstr "Изтриване на съобщението"
 
-#: src/mainwindow.c:2400
+#: src/mainwindow.c:2408
 #, fuzzy
 msgid "Set as junk mail"
 msgstr "Установяване като подразбиращ се"
 
-#: src/mainwindow.c:2402
+#: src/mainwindow.c:2410
 msgid "Execute marked process"
 msgstr "Изпълняване на маркирания процес"
 
-#: src/mainwindow.c:2404
+#: src/mainwindow.c:2412
 msgid "Next unread message"
 msgstr "Следващо непрочетено съобщение"
 
-#: src/mainwindow.c:2406
+#: src/mainwindow.c:2414
 #, fuzzy
 msgid "Previous unread message"
 msgstr "Следващо непрочетено съобщение"
 
-#: src/mainwindow.c:2410
+#: src/mainwindow.c:2418
 #, fuzzy
 msgid "Print message"
 msgstr "Изпращане на съобщение"
 
-#: src/mainwindow.c:2412
+#: src/mainwindow.c:2420
 msgid "Common preferences"
 msgstr "Общи предпочитания"
 
-#: src/mainwindow.c:2414 src/prefs_account_dialog.c:511
+#: src/mainwindow.c:2422 src/prefs_account_dialog.c:511
 msgid "Account preferences"
 msgstr "Предпочитания за акаунт"
 
-#: src/mainwindow.c:2779
+#: src/mainwindow.c:2788
 msgid "You are offline. Click the icon to go online."
 msgstr "Работите без достъп до мрежа. Щракнете иконата за да включите мрежата."
 
-#: src/mainwindow.c:2790
+#: src/mainwindow.c:2799
 msgid "You are online. Click the icon to go offline."
 msgstr "Работите с достъп до мрежа. Щракнете иконата за да изключите мрежата."
 
-#: src/mainwindow.c:3062
+#: src/mainwindow.c:3071
 msgid "Exit"
 msgstr "Изход"
 
-#: src/mainwindow.c:3062
+#: src/mainwindow.c:3071
 msgid "Exit this program?"
 msgstr "Желаете ли изход от програмата?"
 
-#: src/mainwindow.c:3666
+#: src/mainwindow.c:3675
 #, fuzzy
 msgid "Command line options"
 msgstr "Не е въведен команден ред."
 
-#: src/mainwindow.c:3679
+#: src/mainwindow.c:3688
 #, fuzzy
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Употреба: %s [ОПЦИЯ]...\n"
 
-#: src/mainwindow.c:3687
+#: src/mainwindow.c:3696
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -3831,7 +3836,7 @@ msgid ""
 "--version"
 msgstr ""
 
-#: src/mainwindow.c:3703
+#: src/mainwindow.c:3712
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
diff --git a/po/cs.po b/po/cs.po
index 36566d23..f8593214 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: 2007-01-31 16:49+0900\n"
+"POT-Creation-Date: 2007-01-31 17:29+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"
@@ -908,7 +908,7 @@ msgstr "/_Adresa/U_pravit"
 msgid "/_Address/_Delete"
 msgstr "/_Adresa/S_mazat"
 
-#: src/addressbook.c:359 src/compose.c:673 src/mainwindow.c:787
+#: src/addressbook.c:359 src/compose.c:673 src/mainwindow.c:789
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Nástroje"
@@ -917,12 +917,12 @@ msgstr "/_Nástroje"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Nástroje/Importovat _LDIF soubor"
 
-#: src/addressbook.c:361 src/compose.c:694 src/mainwindow.c:841
+#: src/addressbook.c:361 src/compose.c:694 src/mainwindow.c:843
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/Nápo_věda"
 
-#: src/addressbook.c:362 src/compose.c:695 src/mainwindow.c:853
+#: src/addressbook.c:362 src/compose.c:695 src/mainwindow.c:855
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/Nápo_věda/_O aplikaci"
@@ -964,7 +964,7 @@ msgstr "/_Smazat"
 msgid "E-Mail address"
 msgstr "E-mail adresa"
 
-#: src/addressbook.c:496 src/compose.c:4873 src/mainwindow.c:2408
+#: src/addressbook.c:496 src/compose.c:4873 src/mainwindow.c:2416
 #: src/prefs_common_dialog.c:2274
 msgid "Address book"
 msgstr "Databáze adres"
@@ -1183,7 +1183,7 @@ msgstr "Společná adresa"
 msgid "Personal address"
 msgstr "Osobní adresa"
 
-#: src/alertpanel.c:142 src/compose.c:5717 src/main.c:638
+#: src/alertpanel.c:142 src/compose.c:5720 src/main.c:638
 msgid "Notice"
 msgstr "Poznámka"
 
@@ -1356,9 +1356,9 @@ msgid "/_View/_Reply to"
 msgstr "/Z_obrazit/_Odpověď komu "
 
 #: src/compose.c:578 src/compose.c:580 src/compose.c:582 src/compose.c:584
-#: src/compose.c:587 src/mainwindow.c:577 src/mainwindow.c:580
-#: src/mainwindow.c:607 src/mainwindow.c:631 src/mainwindow.c:734
-#: src/mainwindow.c:738 src/messageview.c:258
+#: src/compose.c:587 src/mainwindow.c:579 src/mainwindow.c:582
+#: src/mainwindow.c:609 src/mainwindow.c:633 src/mainwindow.c:736
+#: src/mainwindow.c:740 src/messageview.c:258
 msgid "/_View/---"
 msgstr "/Z_obrazit/---"
 
@@ -1379,7 +1379,7 @@ msgstr "/Z_obrazit/Přílo_ha"
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/Z_obrazit/_Přejít/Do _jiné složky"
 
-#: src/compose.c:593 src/mainwindow.c:638 src/messageview.c:173
+#: src/compose.c:593 src/mainwindow.c:640 src/messageview.c:173
 #, fuzzy
 msgid "/_View/Character _encoding"
 msgstr "/Z_obrazit/Setříd_it/Sestupně"
@@ -1391,138 +1391,138 @@ msgstr ""
 #: src/compose.c:596 src/compose.c:602 src/compose.c:608 src/compose.c:612
 #: src/compose.c:620 src/compose.c:624 src/compose.c:630 src/compose.c:636
 #: src/compose.c:640 src/compose.c:650 src/compose.c:654 src/compose.c:662
-#: src/compose.c:666 src/mainwindow.c:634 src/mainwindow.c:641
+#: src/compose.c:666 src/mainwindow.c:636 src/mainwindow.c:643
 #: src/messageview.c:169
 #, fuzzy
 msgid "/_View/Character _encoding/---"
 msgstr "/Z_obrazit/Setříd_it/Sestupně"
 
-#: src/compose.c:598 src/mainwindow.c:642 src/messageview.c:177
+#: src/compose.c:598 src/mainwindow.c:644 src/messageview.c:177
 #, fuzzy
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/Z_obrazit/_Znaková sada/7bitová ascii (US-ASC_II)"
 
-#: src/compose.c:600 src/mainwindow.c:644 src/messageview.c:180
+#: src/compose.c:600 src/mainwindow.c:646 src/messageview.c:180
 #, fuzzy
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/Z_obrazit/_Znaková sada/Unicode (_UTF-8)"
 
-#: src/compose.c:604 src/mainwindow.c:648 src/messageview.c:183
+#: src/compose.c:604 src/mainwindow.c:650 src/messageview.c:183
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/Z_obrazit/_Znaková sada/Západní Evropa (ISO-8859-_1)"
 
-#: src/compose.c:606 src/mainwindow.c:650 src/messageview.c:185
+#: src/compose.c:606 src/mainwindow.c:652 src/messageview.c:185
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/Z_obrazit/_Znaková sada/Západní Evropa (ISO-8859-15)"
 
-#: src/compose.c:610 src/mainwindow.c:656 src/messageview.c:190
+#: src/compose.c:610 src/mainwindow.c:658 src/messageview.c:190
 #, fuzzy
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/Z_obrazit/_Znaková sada/Střední Evropa (ISO-8859-_2)"
 
-#: src/compose.c:614 src/mainwindow.c:660 src/messageview.c:193
+#: src/compose.c:614 src/mainwindow.c:662 src/messageview.c:193
 #, fuzzy
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/Z_obrazit/_Znaková sada/_Baltská (ISO-8859-13)"
 
-#: src/compose.c:616 src/mainwindow.c:662 src/messageview.c:195
+#: src/compose.c:616 src/mainwindow.c:664 src/messageview.c:195
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/Z_obrazit/_Znaková sada/Baltská (ISO-8859-_4)"
 
-#: src/compose.c:618 src/mainwindow.c:664 src/messageview.c:197
+#: src/compose.c:618 src/mainwindow.c:666 src/messageview.c:197
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/Z_obrazit/_Znaková sada/Azbuka (Windows-1251)"
 
-#: src/compose.c:622 src/mainwindow.c:668 src/messageview.c:200
+#: src/compose.c:622 src/mainwindow.c:670 src/messageview.c:200
 #, fuzzy
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/Z_obrazit/_Znaková sada/Řecká (ISO-8859-_7)"
 
-#: src/compose.c:626 src/mainwindow.c:672 src/messageview.c:203
+#: src/compose.c:626 src/mainwindow.c:674 src/messageview.c:203
 #, fuzzy
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/Z_obrazit/_Znaková sada/Baltská (ISO-8859-_4)"
 
-#: src/compose.c:628 src/mainwindow.c:674 src/messageview.c:205
+#: src/compose.c:628 src/mainwindow.c:676 src/messageview.c:205
 #, fuzzy
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/Z_obrazit/_Znaková sada/Azbuka (Windows-1251)"
 
-#: src/compose.c:632 src/mainwindow.c:678 src/messageview.c:208
+#: src/compose.c:632 src/mainwindow.c:680 src/messageview.c:208
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/Z_obrazit/_Znaková sada/Řecká (ISO-8859-_7)"
 
-#: src/compose.c:634 src/mainwindow.c:680 src/messageview.c:210
+#: src/compose.c:634 src/mainwindow.c:682 src/messageview.c:210
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/Z_obrazit/_Znaková sada/Azbuka (Windows-1251)"
 
-#: src/compose.c:638 src/mainwindow.c:684 src/messageview.c:213
+#: src/compose.c:638 src/mainwindow.c:686 src/messageview.c:213
 #, fuzzy
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/Z_obrazit/_Znaková sada/Turecká (ISO-8859-_9)"
 
-#: src/compose.c:642 src/mainwindow.c:688 src/messageview.c:216
+#: src/compose.c:642 src/mainwindow.c:690 src/messageview.c:216
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/Z_obrazit/_Znaková sada/Azbuka (ISO-8859-_5)"
 
-#: src/compose.c:644 src/mainwindow.c:690 src/messageview.c:218
+#: src/compose.c:644 src/mainwindow.c:692 src/messageview.c:218
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/Z_obrazit/_Znaková sada/Azbuka (KOI8-_R)"
 
-#: src/compose.c:646 src/mainwindow.c:692 src/messageview.c:220
+#: src/compose.c:646 src/mainwindow.c:694 src/messageview.c:220
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/Z_obrazit/_Znaková sada/Azbuka (KOI8-_R)"
 
-#: src/compose.c:648 src/mainwindow.c:694 src/messageview.c:222
+#: src/compose.c:648 src/mainwindow.c:696 src/messageview.c:222
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/Z_obrazit/_Znaková sada/Azbuka (Windows-1251)"
 
-#: src/compose.c:652 src/mainwindow.c:698 src/messageview.c:225
+#: src/compose.c:652 src/mainwindow.c:700 src/messageview.c:225
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/Z_obrazit/_Znaková sada/Japonská (ISO-2022-_JP)"
 
-#: src/compose.c:656 src/mainwindow.c:708 src/messageview.c:234
+#: src/compose.c:656 src/mainwindow.c:710 src/messageview.c:234
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/Z_obrazit/_Znaková sada/Zjednodušená čínská (_GB2312)"
 
-#: src/compose.c:658 src/mainwindow.c:710 src/messageview.c:236
+#: src/compose.c:658 src/mainwindow.c:712 src/messageview.c:236
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/Z_obrazit/_Znaková sada/Zjednodušená čínská (_GB2312)"
 
-#: src/compose.c:660 src/mainwindow.c:712 src/messageview.c:238
+#: src/compose.c:660 src/mainwindow.c:714 src/messageview.c:238
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/Z_obrazit/_Znaková sada/Tradiční čínská (_Big5)"
 
-#: src/compose.c:664 src/mainwindow.c:720 src/messageview.c:245
+#: src/compose.c:664 src/mainwindow.c:722 src/messageview.c:245
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/Z_obrazit/_Znaková sada/Korejská (EUC-_KR)"
 
-#: src/compose.c:668 src/mainwindow.c:726 src/messageview.c:250
+#: src/compose.c:668 src/mainwindow.c:728 src/messageview.c:250
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/Z_obrazit/_Znaková sada/Thajská (TIS-620)"
 
-#: src/compose.c:670 src/mainwindow.c:728 src/messageview.c:252
+#: src/compose.c:670 src/mainwindow.c:730 src/messageview.c:252
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/Z_obrazit/_Znaková sada/Thajská (Windows-874)"
 
-#: src/compose.c:674 src/mainwindow.c:788 src/messageview.c:283
+#: src/compose.c:674 src/mainwindow.c:790 src/messageview.c:283
 msgid "/_Tools/_Address book"
 msgstr "/_Nástroje/_Databáze adres"
 
@@ -1530,13 +1530,13 @@ msgstr "/_Nástroje/_Databáze adres"
 msgid "/_Tools/_Template"
 msgstr "/_Nástroje/Ša_blona"
 
-#: src/compose.c:677 src/mainwindow.c:812 src/messageview.c:299
+#: src/compose.c:677 src/mainwindow.c:814 src/messageview.c:299
 msgid "/_Tools/Actio_ns"
 msgstr "/_Nástroje/_Akce"
 
-#: src/compose.c:679 src/compose.c:683 src/compose.c:689 src/mainwindow.c:791
-#: src/mainwindow.c:805 src/mainwindow.c:810 src/mainwindow.c:813
-#: src/mainwindow.c:817 src/mainwindow.c:819 src/messageview.c:286
+#: src/compose.c:679 src/compose.c:683 src/compose.c:689 src/mainwindow.c:793
+#: src/mainwindow.c:807 src/mainwindow.c:812 src/mainwindow.c:815
+#: src/mainwindow.c:819 src/mainwindow.c:821 src/messageview.c:286
 #: src/messageview.c:298
 msgid "/_Tools/---"
 msgstr "/_Nástroje/---"
@@ -1742,7 +1742,7 @@ msgstr "/_Nástroje/_Akce"
 msgid "PGP Encrypt"
 msgstr "/_Zpráva/Zaši_frovat"
 
-#: src/compose.c:4442 src/compose.c:5543
+#: src/compose.c:4442 src/compose.c:5546
 msgid "MIME type"
 msgstr "MIME typ"
 
@@ -1785,36 +1785,36 @@ msgstr "Úprava externím editorem"
 msgid "Wrap all long lines"
 msgstr "Zarovnání dlouhých řádků"
 
-#: src/compose.c:5439
+#: src/compose.c:5442
 msgid "Invalid MIME type."
 msgstr "Neplatný MIME typ."
 
-#: src/compose.c:5457
+#: src/compose.c:5460
 msgid "File doesn't exist or is empty."
 msgstr "Soubor neexistuje nebo je prázdný."
 
-#: src/compose.c:5525
+#: src/compose.c:5528
 msgid "Properties"
 msgstr "Vlastnosti"
 
-#: src/compose.c:5545 src/prefs_common_dialog.c:1504
+#: src/compose.c:5548 src/prefs_common_dialog.c:1504
 msgid "Encoding"
 msgstr "Kódování"
 
-#: src/compose.c:5568 src/prefs_folder_item.c:202
+#: src/compose.c:5571 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Cesta k souboru"
 
-#: src/compose.c:5569
+#: src/compose.c:5572
 msgid "File name"
 msgstr "Název souboru"
 
-#: src/compose.c:5659
+#: src/compose.c:5662
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Špatný příkaz v externím editoru: '%s'\n"
 
-#: src/compose.c:5714
+#: src/compose.c:5717
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1824,52 +1824,52 @@ msgstr ""
 "Mám přerušit proces?\n"
 "číslo procesu: %d"
 
-#: src/compose.c:6040 src/mainwindow.c:2752
+#: src/compose.c:6043 src/mainwindow.c:2761
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:6156 src/compose.c:6161 src/compose.c:6167
+#: src/compose.c:6159 src/compose.c:6164 src/compose.c:6170
 msgid "Can't queue the message."
 msgstr "Zprávu nelze zařadit."
 
-#: src/compose.c:6258
+#: src/compose.c:6261
 #, fuzzy
 msgid "Select files"
 msgstr "Vybrat soubor"
 
-#: src/compose.c:6281
+#: src/compose.c:6284
 msgid "Select file"
 msgstr "Vybrat soubor"
 
-#: src/compose.c:6316
+#: src/compose.c:6319
 #, fuzzy
 msgid "Save message"
 msgstr "Odešle zprávu"
 
-#: src/compose.c:6317
+#: src/compose.c:6320
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Obsah zprávy se změnil. Chcete ji stornovat?"
 
-#: src/compose.c:6319
+#: src/compose.c:6322
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:6361
+#: src/compose.c:6364
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Opravdu chcete použít šablonu '%s' ?"
 
-#: src/compose.c:6363
+#: src/compose.c:6366
 msgid "Apply template"
 msgstr "Přidat šablonu"
 
-#: src/compose.c:6364
+#: src/compose.c:6367
 #, fuzzy
 msgid "_Replace"
 msgstr "Nahradit"
 
-#: src/compose.c:6364
+#: src/compose.c:6367
 #, fuzzy
 msgid "_Insert"
 msgstr "Vložit"
@@ -2332,12 +2332,12 @@ msgstr "Nastavuji informace o složce...\n"
 msgid "Setting folder info..."
 msgstr "Nastavuji informace o složce..."
 
-#: src/folderview.c:868 src/mainwindow.c:3748 src/setup.c:80
+#: src/folderview.c:868 src/mainwindow.c:3757 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Prohledávám složku %s%c%s ..."
 
-#: src/folderview.c:872 src/mainwindow.c:3753 src/setup.c:85
+#: src/folderview.c:872 src/mainwindow.c:3762 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Prohledávám složku %s ..."
@@ -3105,563 +3105,568 @@ msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/Z_obrazit/Zobrazit nebo s_krýt/_Nástrojová lišta/Ikony _a text"
 
 #: src/mainwindow.c:566
-msgid "/_View/Show or hi_de/_Toolbar/_Icon"
+#, fuzzy
+msgid "/_View/Show or hi_de/_Toolbar/Text at the _right of icon"
 msgstr "/Z_obrazit/Zobrazit nebo s_krýt/_Nástrojová lišta/_Ikony"
 
 #: src/mainwindow.c:568
+msgid "/_View/Show or hi_de/_Toolbar/_Icon"
+msgstr "/Z_obrazit/Zobrazit nebo s_krýt/_Nástrojová lišta/_Ikony"
+
+#: src/mainwindow.c:570
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/Z_obrazit/Zobrazit nebo s_krýt/_Nástrojová lišta/_Text"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:572
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/Z_obrazit/Zobrazit nebo s_krýt/_Nástrojová lišta/_Nic"
 
-#: src/mainwindow.c:572
+#: src/mainwindow.c:574
 #, fuzzy
 msgid "/_View/Show or hi_de/_Search bar"
 msgstr "/Z_obrazit/Zobrazit nebo s_krýt/Stavová _lišta"
 
-#: src/mainwindow.c:574
+#: src/mainwindow.c:576
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/Z_obrazit/Zobrazit nebo s_krýt/Stavová _lišta"
 
-#: src/mainwindow.c:576
+#: src/mainwindow.c:578
 #, fuzzy
 msgid "/_View/_Customize toolbar..."
 msgstr "/Z_obrazit/_Přejít/Do _jiné složky"
 
-#: src/mainwindow.c:578
+#: src/mainwindow.c:580
 msgid "/_View/Separate f_older tree"
 msgstr "/Z_obrazit/Samostatný s_trom složek "
 
-#: src/mainwindow.c:579
+#: src/mainwindow.c:581
 #, fuzzy
 msgid "/_View/Separate _message view"
 msgstr "/Z_obrazit/Samostatné pro_hlédnutí zprávy"
 
-#: src/mainwindow.c:581
+#: src/mainwindow.c:583
 msgid "/_View/_Sort"
 msgstr "/Z_obrazit/Setříd_it"
 
-#: src/mainwindow.c:582
+#: src/mainwindow.c:584
 msgid "/_View/_Sort/by _number"
 msgstr "/Z_obrazit/Setříd_it/podle čí_sla"
 
-#: src/mainwindow.c:583
+#: src/mainwindow.c:585
 msgid "/_View/_Sort/by s_ize"
 msgstr "/Z_obrazit/Setříd_it/podle _velikosti"
 
-#: src/mainwindow.c:584
+#: src/mainwindow.c:586
 msgid "/_View/_Sort/by _date"
 msgstr "/Z_obrazit/Setříd_it/podle _data"
 
-#: src/mainwindow.c:585
+#: src/mainwindow.c:587
 #, fuzzy
 msgid "/_View/_Sort/by t_hread date"
 msgstr "/Z_obrazit/Setříd_it/podle _data"
 
-#: src/mainwindow.c:586
+#: src/mainwindow.c:588
 msgid "/_View/_Sort/by _from"
 msgstr "/Z_obrazit/Setříd_it/podle _od koho"
 
-#: src/mainwindow.c:587
+#: src/mainwindow.c:589
 msgid "/_View/_Sort/by _recipient"
 msgstr "/Z_obrazit/Setříd_it/podle odesí_latele"
 
-#: src/mainwindow.c:588
+#: src/mainwindow.c:590
 msgid "/_View/_Sort/by _subject"
 msgstr "/Z_obrazit/Setříd_it/podle př_edmětu"
 
-#: src/mainwindow.c:589
+#: src/mainwindow.c:591
 msgid "/_View/_Sort/by _color label"
 msgstr "/Z_obrazit/Setříd_it/podle _barevné značky"
 
-#: src/mainwindow.c:591
+#: src/mainwindow.c:593
 msgid "/_View/_Sort/by _mark"
 msgstr "/Z_obrazit/Setříd_it/podle o_značení"
 
-#: src/mainwindow.c:592
+#: src/mainwindow.c:594
 msgid "/_View/_Sort/by _unread"
 msgstr "/Z_obrazit/Setříd_it/podle ne_přečtených"
 
-#: src/mainwindow.c:593
+#: src/mainwindow.c:595
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/Z_obrazit/Setříd_it/podle připo_jených souborů"
 
-#: src/mainwindow.c:595
+#: src/mainwindow.c:597
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/Z_obrazit/Setříd_it/_Netřídit"
 
-#: src/mainwindow.c:596 src/mainwindow.c:599
+#: src/mainwindow.c:598 src/mainwindow.c:601
 msgid "/_View/_Sort/---"
 msgstr "/Z_obrazit/Setříd_it/---"
 
-#: src/mainwindow.c:597
+#: src/mainwindow.c:599
 msgid "/_View/_Sort/Ascending"
 msgstr "/Z_obrazit/Setříd_it/Vzestupně"
 
-#: src/mainwindow.c:598
+#: src/mainwindow.c:600
 msgid "/_View/_Sort/Descending"
 msgstr "/Z_obrazit/Setříd_it/Sestupně"
 
-#: src/mainwindow.c:600
+#: src/mainwindow.c:602
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/Z_obrazit/Setříd_it/_Získat z předmětu"
 
-#: src/mainwindow.c:602
+#: src/mainwindow.c:604
 msgid "/_View/Th_read view"
 msgstr "/Z_obrazit/Zobrazit _vlákna"
 
-#: src/mainwindow.c:603
+#: src/mainwindow.c:605
 msgid "/_View/E_xpand all threads"
 msgstr "/Z_obrazit/Rozbalit vše_chna vlákna"
 
-#: src/mainwindow.c:604
+#: src/mainwindow.c:606
 msgid "/_View/Co_llapse all threads"
 msgstr "/Z_obrazit/_Sbalit všechna vlákna"
 
-#: src/mainwindow.c:605
+#: src/mainwindow.c:607
 msgid "/_View/Set display _item..."
 msgstr "/Z_obrazit/Nastavit zobrazené po_ložky..."
 
-#: src/mainwindow.c:608
+#: src/mainwindow.c:610
 msgid "/_View/_Go to"
 msgstr "/Z_obrazit/_Přejít"
 
-#: src/mainwindow.c:609
+#: src/mainwindow.c:611
 msgid "/_View/_Go to/_Prev message"
 msgstr "/Z_obrazit/_Přejít/Př_edchozí zpráva"
 
-#: src/mainwindow.c:610
+#: src/mainwindow.c:612
 msgid "/_View/_Go to/_Next message"
 msgstr "/Z_obrazit/_Přejít/_Další zpráva"
 
-#: src/mainwindow.c:611 src/mainwindow.c:616 src/mainwindow.c:619
-#: src/mainwindow.c:624 src/mainwindow.c:629
+#: src/mainwindow.c:613 src/mainwindow.c:618 src/mainwindow.c:621
+#: src/mainwindow.c:626 src/mainwindow.c:631
 msgid "/_View/_Go to/---"
 msgstr "/Z_obrazit/_Přejít/---"
 
-#: src/mainwindow.c:612
+#: src/mainwindow.c:614
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/Z_obrazit/_Přejít/Předchozí nepřečtená zp_ráva"
 
-#: src/mainwindow.c:614
+#: src/mainwindow.c:616
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/Z_obrazit/_Přejít/Další nepřeč_tená zpráva"
 
-#: src/mainwindow.c:617
+#: src/mainwindow.c:619
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/Z_obrazit/_Přejít/_Předchozí nová zpráva"
 
-#: src/mainwindow.c:618
+#: src/mainwindow.c:620
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/Z_obrazit/_Přejít/Další n_ová zpráva"
 
-#: src/mainwindow.c:620
+#: src/mainwindow.c:622
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/Z_obrazit/_Přejít/Před_chozí označená zpráva"
 
-#: src/mainwindow.c:622
+#: src/mainwindow.c:624
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/Z_obrazit/_Přejít/Další oz_načená zpráva"
 
-#: src/mainwindow.c:625
+#: src/mainwindow.c:627
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/Z_obrazit/_Přejít/Předchozí _zpráva s návěštím"
 
-#: src/mainwindow.c:627
+#: src/mainwindow.c:629
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/Z_obrazit/_Přejít/Da_lší zpráva s návěštím"
 
-#: src/mainwindow.c:630
+#: src/mainwindow.c:632
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/Z_obrazit/_Přejít/Do _jiné složky"
 
-#: src/mainwindow.c:639 src/messageview.c:174
+#: src/mainwindow.c:641 src/messageview.c:174
 #, fuzzy
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/Z_obrazit/_Znaková sada/_Autodetekce "
 
-#: src/mainwindow.c:652 src/messageview.c:187
+#: src/mainwindow.c:654 src/messageview.c:187
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr "/Z_obrazit/_Znaková sada/Západní Evropa (ISO-8859-15)"
 
-#: src/mainwindow.c:700 src/messageview.c:227
+#: src/mainwindow.c:702 src/messageview.c:227
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/Z_obrazit/_Znaková sada/Japonská (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:702 src/messageview.c:229
+#: src/mainwindow.c:704 src/messageview.c:229
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/Z_obrazit/_Znaková sada/Japonská (_EUC-JP)"
 
-#: src/mainwindow.c:704 src/messageview.c:231
+#: src/mainwindow.c:706 src/messageview.c:231
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/Z_obrazit/_Znaková sada/Japonská (_Shift__JIS)"
 
-#: src/mainwindow.c:714 src/messageview.c:240
+#: src/mainwindow.c:716 src/messageview.c:240
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/Z_obrazit/_Znaková sada/Tradiční čínská (EUC-_TW)"
 
-#: src/mainwindow.c:716 src/messageview.c:242
+#: src/mainwindow.c:718 src/messageview.c:242
 #, fuzzy
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/Z_obrazit/_Znaková sada/Čínská (ISO-2022-_CN)"
 
-#: src/mainwindow.c:722 src/messageview.c:247
+#: src/mainwindow.c:724 src/messageview.c:247
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/Z_obrazit/_Znaková sada/Korejská (ISO-2022-KR)"
 
-#: src/mainwindow.c:735 src/summaryview.c:464
+#: src/mainwindow.c:737 src/summaryview.c:464
 msgid "/_View/Open in new _window"
 msgstr "/Z_obrazit/Otevřít v _novém okně"
 
-#: src/mainwindow.c:736 src/messageview.c:259 src/summaryview.c:466
+#: src/mainwindow.c:738 src/messageview.c:259 src/summaryview.c:466
 msgid "/_View/Mess_age source"
 msgstr "/Z_obrazit/Zd_roj zprávy"
 
-#: src/mainwindow.c:737 src/messageview.c:260 src/summaryview.c:467
+#: src/mainwindow.c:739 src/messageview.c:260 src/summaryview.c:467
 #, fuzzy
 msgid "/_View/All _headers"
 msgstr "/_Zobrazit/Všechna zá_hlaví"
 
-#: src/mainwindow.c:739
+#: src/mainwindow.c:741
 msgid "/_View/_Update summary"
 msgstr "/Z_obrazit/_Aktualizace souhrnu"
 
-#: src/mainwindow.c:741 src/messageview.c:263
+#: src/mainwindow.c:743 src/messageview.c:263
 msgid "/_Message"
 msgstr "/_Zpráva"
 
-#: src/mainwindow.c:742
+#: src/mainwindow.c:744
 #, fuzzy
 msgid "/_Message/Recei_ve"
 msgstr "/_Zpráva/Znov_u editovat"
 
-#: src/mainwindow.c:743
+#: src/mainwindow.c:745
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/_Zpráva/Přijmout _ze všech účtů"
 
-#: src/mainwindow.c:745
+#: src/mainwindow.c:747
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/_Zpráva/Přijmout _ze všech účtů"
 
-#: src/mainwindow.c:747
+#: src/mainwindow.c:749
 #, fuzzy
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/_Zpráva/Přerušit pří_jem zpráv"
 
-#: src/mainwindow.c:749
+#: src/mainwindow.c:751
 #, fuzzy
 msgid "/_Message/Recei_ve/---"
 msgstr "/_Zpráva/Znov_u editovat"
 
-#: src/mainwindow.c:750
+#: src/mainwindow.c:752
 msgid "/_Message/_Send queued messages"
 msgstr "/_Zpráva/Odeslat pozd_ržené zprávy"
 
-#: src/mainwindow.c:751 src/mainwindow.c:753 src/mainwindow.c:760
-#: src/mainwindow.c:765 src/mainwindow.c:768 src/mainwindow.c:779
-#: src/mainwindow.c:781 src/mainwindow.c:784 src/messageview.c:266
+#: src/mainwindow.c:753 src/mainwindow.c:755 src/mainwindow.c:762
+#: src/mainwindow.c:767 src/mainwindow.c:770 src/mainwindow.c:781
+#: src/mainwindow.c:783 src/mainwindow.c:786 src/messageview.c:266
 #: src/messageview.c:274 src/messageview.c:279
 msgid "/_Message/---"
 msgstr "/_Zpráva/---"
 
-#: src/mainwindow.c:752 src/messageview.c:264
+#: src/mainwindow.c:754 src/messageview.c:264
 msgid "/_Message/Compose _new message"
 msgstr "/_Zpráva/_Nová zpráva"
 
-#: src/mainwindow.c:754 src/messageview.c:267
+#: src/mainwindow.c:756 src/messageview.c:267
 msgid "/_Message/_Reply"
 msgstr "/_Zpráva/_Odpovědět"
 
-#: src/mainwindow.c:755
+#: src/mainwindow.c:757
 msgid "/_Message/Repl_y to"
 msgstr "/_Zpráva/Odpo_vědět komu"
 
-#: src/mainwindow.c:756 src/messageview.c:268
+#: src/mainwindow.c:758 src/messageview.c:268
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Zpráva/Odpo_vědět komu/_všem"
 
-#: src/mainwindow.c:757 src/messageview.c:270
+#: src/mainwindow.c:759 src/messageview.c:270
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Zpráva/Odpo_vědět komu/_odesílateli"
 
-#: src/mainwindow.c:758 src/messageview.c:272
+#: src/mainwindow.c:760 src/messageview.c:272
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Zpráva/Odpo_vědět komu/do _diskusního listu"
 
-#: src/mainwindow.c:761 src/messageview.c:275
+#: src/mainwindow.c:763 src/messageview.c:275
 msgid "/_Message/_Forward"
 msgstr "/_Zpráva/Předat dá_l"
 
-#: src/mainwindow.c:762 src/messageview.c:276
+#: src/mainwindow.c:764 src/messageview.c:276
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Zpráva/Přeposlat _jako přílohu"
 
-#: src/mainwindow.c:764 src/messageview.c:278
+#: src/mainwindow.c:766 src/messageview.c:278
 msgid "/_Message/Redirec_t"
 msgstr "/_Zpráva/Přesměrov_at"
 
-#: src/mainwindow.c:766
+#: src/mainwindow.c:768
 msgid "/_Message/M_ove..."
 msgstr "/_Zpráva/Pře_sunout..."
 
-#: src/mainwindow.c:767
+#: src/mainwindow.c:769
 msgid "/_Message/_Copy..."
 msgstr "/_Zpráva/_Kopírovat..."
 
-#: src/mainwindow.c:769
+#: src/mainwindow.c:771
 msgid "/_Message/_Mark"
 msgstr "/_Zpráva/Označ_it"
 
-#: src/mainwindow.c:770
+#: src/mainwindow.c:772
 msgid "/_Message/_Mark/_Mark"
 msgstr "/_Zpráva/Označ_it/_Označit"
 
-#: src/mainwindow.c:771
+#: src/mainwindow.c:773
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/_Zpráva/Označ_it/_Zrušit označení"
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:774
 msgid "/_Message/_Mark/---"
 msgstr "/_Zpráva/Označ_it/---"
 
-#: src/mainwindow.c:773
+#: src/mainwindow.c:775
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/_Zpráva/Označ_it/Označit jako _nepřečtené"
 
-#: src/mainwindow.c:774
+#: src/mainwindow.c:776
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/_Zpráva/Označ_it/Označit jako _přečtenou"
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:778
 #, fuzzy
 msgid "/_Message/_Mark/Mark _thread as read"
 msgstr "/_Zpráva/Označ_it/Označit jako _přečtenou"
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:780
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/_Zpráva/Označ_it/Označit _všechny jako přečtené"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:782
 msgid "/_Message/_Delete"
 msgstr "/_Zpráva/S_mazat"
 
-#: src/mainwindow.c:782
+#: src/mainwindow.c:784
 #, fuzzy
 msgid "/_Message/Set as _junk mail"
 msgstr "/_Zpráva/_Příjem nové pošty"
 
-#: src/mainwindow.c:783
+#: src/mainwindow.c:785
 #, fuzzy
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/_Zpráva/_Příjem nové pošty"
 
-#: src/mainwindow.c:785 src/messageview.c:280
+#: src/mainwindow.c:787 src/messageview.c:280
 msgid "/_Message/Re-_edit"
 msgstr "/_Zpráva/Znov_u editovat"
 
-#: src/mainwindow.c:789
+#: src/mainwindow.c:791
 #, fuzzy
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/_Nástroje/Přidat odesílatele do a_dresáře"
 
-#: src/mainwindow.c:792
+#: src/mainwindow.c:794
 #, fuzzy
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/_Nástroje/_Filtr zpráv "
 
-#: src/mainwindow.c:794
+#: src/mainwindow.c:796
 #, fuzzy
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Nástroje/_Filtr zpráv "
 
-#: src/mainwindow.c:796 src/messageview.c:287
+#: src/mainwindow.c:798 src/messageview.c:287
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Nástroje/_Vytvoření filtru"
 
-#: src/mainwindow.c:797 src/messageview.c:289
+#: src/mainwindow.c:799 src/messageview.c:289
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Nástroje/_Vytvoření filtru/_Automaticky"
 
-#: src/mainwindow.c:799 src/messageview.c:291
+#: src/mainwindow.c:801 src/messageview.c:291
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Nástroje/_Vytvoření filtru/podle _Od"
 
-#: src/mainwindow.c:801 src/messageview.c:293
+#: src/mainwindow.c:803 src/messageview.c:293
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Nástroje/_Vytvoření filtru/podle _Komu"
 
-#: src/mainwindow.c:803 src/messageview.c:295
+#: src/mainwindow.c:805 src/messageview.c:295
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Nástroje/_Vytvoření filtru/podle _Předmětu"
 
-#: src/mainwindow.c:806
+#: src/mainwindow.c:808
 #, fuzzy
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/_Nástroje/_Filtr zpráv "
 
-#: src/mainwindow.c:808
+#: src/mainwindow.c:810
 #, fuzzy
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/_Nástroje/_Filtr zpráv "
 
-#: src/mainwindow.c:815
+#: src/mainwindow.c:817
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/_Nástroje/_Smazat duplikované zprávy"
 
-#: src/mainwindow.c:818
+#: src/mainwindow.c:820
 #, fuzzy
 msgid "/_Tools/E_xecute marked process"
 msgstr "Provést označený proces "
 
-#: src/mainwindow.c:820
+#: src/mainwindow.c:822
 msgid "/_Tools/_Log window"
 msgstr "/_Nástroje/Okno _záznamů "
 
-#: src/mainwindow.c:822
+#: src/mainwindow.c:824
 msgid "/_Configuration"
 msgstr "/Nastav_ení"
 
-#: src/mainwindow.c:823
+#: src/mainwindow.c:825
 msgid "/_Configuration/_Common preferences..."
 msgstr "/Nastav_ení/_Společná nastavení..."
 
-#: src/mainwindow.c:825
+#: src/mainwindow.c:827
 msgid "/_Configuration/_Filter setting..."
 msgstr "/Nastav_ení/Nastavení _filtrů..."
 
-#: src/mainwindow.c:827
+#: src/mainwindow.c:829
 msgid "/_Configuration/_Template..."
 msgstr "/Nastav_ení/Ša_blona..."
 
-#: src/mainwindow.c:829
+#: src/mainwindow.c:831
 msgid "/_Configuration/_Actions..."
 msgstr "/Nastav_ení/_Akce..."
 
-#: src/mainwindow.c:831
+#: src/mainwindow.c:833
 msgid "/_Configuration/---"
 msgstr "/Nastav_ení/---"
 
-#: src/mainwindow.c:832
+#: src/mainwindow.c:834
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/Nastav_ení/Nas_tavení aktuálního účtu..."
 
-#: src/mainwindow.c:834
+#: src/mainwindow.c:836
 msgid "/_Configuration/Create _new account..."
 msgstr "/Nastav_ení/Založit _nový účet..."
 
-#: src/mainwindow.c:836
+#: src/mainwindow.c:838
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/Nastav_ení/Ú_pravy účtů..."
 
-#: src/mainwindow.c:838
+#: src/mainwindow.c:840
 msgid "/_Configuration/C_hange current account"
 msgstr "/Nastav_ení/_Změna aktuálního účtu"
 
-#: src/mainwindow.c:842
+#: src/mainwindow.c:844
 msgid "/_Help/_Manual"
 msgstr "/Nápo_věda/_Manuál"
 
-#: src/mainwindow.c:843
+#: src/mainwindow.c:845
 msgid "/_Help/_Manual/_English"
 msgstr "/Nápo_věda/_Manuál/_Anglicky"
 
-#: src/mainwindow.c:844
+#: src/mainwindow.c:846
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/Nápo_věda/_Manuál/_Japonsky"
 
-#: src/mainwindow.c:845
+#: src/mainwindow.c:847
 msgid "/_Help/_FAQ"
 msgstr "/Nápo_věda/_FAQ"
 
-#: src/mainwindow.c:846
+#: src/mainwindow.c:848
 msgid "/_Help/_FAQ/_English"
 msgstr "/Nápo_věda/_FAQ/_Anglicky"
 
-#: src/mainwindow.c:847
+#: src/mainwindow.c:849
 msgid "/_Help/_FAQ/_German"
 msgstr "/Nápo_věda/_FAQ/_Německy"
 
-#: src/mainwindow.c:848
+#: src/mainwindow.c:850
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/Nápo_věda/_FAQ/Š_panělsky"
 
-#: src/mainwindow.c:849
+#: src/mainwindow.c:851
 msgid "/_Help/_FAQ/_French"
 msgstr "/Nápo_věda/_FAQ/_Francouzsky"
 
-#: src/mainwindow.c:850
+#: src/mainwindow.c:852
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/Nápo_věda/_FAQ/_Italsky"
 
-#: src/mainwindow.c:851
+#: src/mainwindow.c:853
 #, fuzzy
 msgid "/_Help/_Command line options"
 msgstr "Není nastavena příkazová řádka."
 
-#: src/mainwindow.c:852
+#: src/mainwindow.c:854
 msgid "/_Help/---"
 msgstr "/Nápo_věda/---"
 
-#: src/mainwindow.c:895
+#: src/mainwindow.c:897
 msgid "Creating main window...\n"
 msgstr "Vytvářím hlavní okno...\n"
 
-#: src/mainwindow.c:1071
+#: src/mainwindow.c:1073
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Hlavní okno: barevné rozvržení %d bylo neúspěšné\n"
 
-#: src/mainwindow.c:1175 src/summaryview.c:2387 src/summaryview.c:2472
+#: src/mainwindow.c:1181 src/summaryview.c:2387 src/summaryview.c:2472
 #: src/summaryview.c:4009 src/summaryview.c:4138 src/summaryview.c:4507
 msgid "done.\n"
 msgstr "hotovo.\n"
 
-#: src/mainwindow.c:1293 src/mainwindow.c:1334 src/mainwindow.c:1359
+#: src/mainwindow.c:1299 src/mainwindow.c:1340 src/mainwindow.c:1365
 msgid "Untitled"
 msgstr "Neoznačený"
 
-#: src/mainwindow.c:1360
+#: src/mainwindow.c:1366
 msgid "none"
 msgstr "žádný"
 
-#: src/mainwindow.c:1413
+#: src/mainwindow.c:1419
 #, 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:1663
+#: src/mainwindow.c:1669
 msgid "Offline"
 msgstr ""
 
-#: src/mainwindow.c:1664
+#: src/mainwindow.c:1670
 msgid "You are offline. Go online?"
 msgstr ""
 
-#: src/mainwindow.c:1681
+#: src/mainwindow.c:1687
 #, fuzzy
 msgid "Empty all trash"
 msgstr "Vyprázdnit koš"
 
-#: src/mainwindow.c:1682
+#: src/mainwindow.c:1688
 #, fuzzy
 msgid "Delete all messages in trash folders?"
 msgstr "Vyprázdnit všechny zprávy v koši?"
 
-#: src/mainwindow.c:1712
+#: src/mainwindow.c:1718
 msgid "Add mailbox"
 msgstr "Přidat poštovní schránku"
 
-#: src/mainwindow.c:1713
+#: src/mainwindow.c:1719
 #, fuzzy
 msgid ""
 "Specify the location of mailbox.\n"
@@ -3672,16 +3677,16 @@ msgstr ""
 "Pokud je zadán existující, bude automaticky\n"
 "prohledán."
 
-#: src/mainwindow.c:1719 src/setup.c:49
+#: src/mainwindow.c:1725 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Poštovní schránka '%s' již existuje."
 
-#: src/mainwindow.c:1724 src/setup.c:56
+#: src/mainwindow.c:1730 src/setup.c:56
 msgid "Mailbox"
 msgstr "Poštovní schránka"
 
-#: src/mainwindow.c:1730 src/setup.c:62
+#: src/mainwindow.c:1736 src/setup.c:62
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3691,135 +3696,135 @@ 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:2198
+#: src/mainwindow.c:2206
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Zobrazení složky"
 
-#: src/mainwindow.c:2217
+#: src/mainwindow.c:2225
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Zobrazení zprávy"
 
-#: src/mainwindow.c:2369 src/summaryview.c:418
+#: src/mainwindow.c:2377 src/summaryview.c:418
 msgid "/_Reply"
 msgstr "/_Odpovědět"
 
-#: src/mainwindow.c:2370
+#: src/mainwindow.c:2378
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "Odpovídá všem"
 
-#: src/mainwindow.c:2371
+#: src/mainwindow.c:2379
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/Odpovědět _komu/_odesílateli"
 
-#: src/mainwindow.c:2372
+#: src/mainwindow.c:2380
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/Odpovědět _komu/do _diskusního listu"
 
-#: src/mainwindow.c:2377 src/summaryview.c:425
+#: src/mainwindow.c:2385 src/summaryview.c:425
 msgid "/_Forward"
 msgstr "/Př_edat dál"
 
-#: src/mainwindow.c:2378 src/summaryview.c:426
+#: src/mainwindow.c:2386 src/summaryview.c:426
 msgid "/For_ward as attachment"
 msgstr "/Přeposlat _jako přílohu"
 
-#: src/mainwindow.c:2379 src/summaryview.c:427
+#: src/mainwindow.c:2387 src/summaryview.c:427
 msgid "/Redirec_t"
 msgstr "/Přes_měrovat"
 
-#: src/mainwindow.c:2384
+#: src/mainwindow.c:2392
 msgid "Incorporate new mail"
 msgstr "Začlenit novou poštu"
 
-#: src/mainwindow.c:2386
+#: src/mainwindow.c:2394
 msgid "Incorporate new mail of all accounts"
 msgstr "Začlení novou poštu ze všech účtů"
 
-#: src/mainwindow.c:2388
+#: src/mainwindow.c:2396
 msgid "Send queued message(s)"
 msgstr "Odešle pozdrženou zprávu(y)"
 
-#: src/mainwindow.c:2390
+#: src/mainwindow.c:2398
 msgid "Compose new message"
 msgstr "Vytváří novou zprávu"
 
-#: src/mainwindow.c:2392
+#: src/mainwindow.c:2400
 msgid "Reply to the message"
 msgstr "Odpovídá na zprávu"
 
-#: src/mainwindow.c:2394
+#: src/mainwindow.c:2402
 msgid "Reply to all"
 msgstr "Odpovídá všem"
 
-#: src/mainwindow.c:2396
+#: src/mainwindow.c:2404
 msgid "Forward the message"
 msgstr "Předává zprávu dál"
 
-#: src/mainwindow.c:2398
+#: src/mainwindow.c:2406
 msgid "Delete the message"
 msgstr "Smazat zprávu"
 
-#: src/mainwindow.c:2400
+#: src/mainwindow.c:2408
 #, fuzzy
 msgid "Set as junk mail"
 msgstr "Nastavit jako výchozí"
 
-#: src/mainwindow.c:2402
+#: src/mainwindow.c:2410
 msgid "Execute marked process"
 msgstr "Provést označený proces "
 
-#: src/mainwindow.c:2404
+#: src/mainwindow.c:2412
 msgid "Next unread message"
 msgstr "Další nepřečtenou zprávu"
 
-#: src/mainwindow.c:2406
+#: src/mainwindow.c:2414
 #, fuzzy
 msgid "Previous unread message"
 msgstr "Další nepřečtenou zprávu"
 
-#: src/mainwindow.c:2410
+#: src/mainwindow.c:2418
 #, fuzzy
 msgid "Print message"
 msgstr "Odešle zprávu"
 
-#: src/mainwindow.c:2412
+#: src/mainwindow.c:2420
 msgid "Common preferences"
 msgstr "Společná nastavení"
 
-#: src/mainwindow.c:2414 src/prefs_account_dialog.c:511
+#: src/mainwindow.c:2422 src/prefs_account_dialog.c:511
 msgid "Account preferences"
 msgstr "Nastavení účtu"
 
-#: src/mainwindow.c:2779
+#: src/mainwindow.c:2788
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 
-#: src/mainwindow.c:2790
+#: src/mainwindow.c:2799
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 
-#: src/mainwindow.c:3062
+#: src/mainwindow.c:3071
 msgid "Exit"
 msgstr "Ukončení programu"
 
-#: src/mainwindow.c:3062
+#: src/mainwindow.c:3071
 msgid "Exit this program?"
 msgstr "Chcete ukončit tento program?"
 
-#: src/mainwindow.c:3666
+#: src/mainwindow.c:3675
 #, fuzzy
 msgid "Command line options"
 msgstr "Není nastavena příkazová řádka."
 
-#: src/mainwindow.c:3679
+#: src/mainwindow.c:3688
 #, fuzzy
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Použití: %s [VOLBY]...\n"
 
-#: src/mainwindow.c:3687
+#: src/mainwindow.c:3696
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -3835,7 +3840,7 @@ msgid ""
 "--version"
 msgstr ""
 
-#: src/mainwindow.c:3703
+#: src/mainwindow.c:3712
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
diff --git a/po/da.po b/po/da.po
index 5c004141..4d143ff3 100644
--- a/po/da.po
+++ b/po/da.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed    \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-01-31 16:49+0900\n"
+"POT-Creation-Date: 2007-01-31 17:29+0900\n"
 "PO-Revision-Date: 2003-07-29 09:05+0200\n"
 "Last-Translator: Andreas Hinz <news3@acci.dk>\n"
 "Language-Team: \n"
@@ -909,7 +909,7 @@ msgstr "/_Adresse/_Redigér"
 msgid "/_Address/_Delete"
 msgstr "/_Adresse/_Slet"
 
-#: src/addressbook.c:359 src/compose.c:673 src/mainwindow.c:787
+#: src/addressbook.c:359 src/compose.c:673 src/mainwindow.c:789
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Funktioner"
@@ -918,12 +918,12 @@ msgstr "/_Funktioner"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Funktioner/Importer _LDIF-Fil"
 
-#: src/addressbook.c:361 src/compose.c:694 src/mainwindow.c:841
+#: src/addressbook.c:361 src/compose.c:694 src/mainwindow.c:843
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Hjælp"
 
-#: src/addressbook.c:362 src/compose.c:695 src/mainwindow.c:853
+#: src/addressbook.c:362 src/compose.c:695 src/mainwindow.c:855
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Hjælp/_Om"
@@ -965,7 +965,7 @@ msgstr "/_Slet"
 msgid "E-Mail address"
 msgstr "E-post adresse"
 
-#: src/addressbook.c:496 src/compose.c:4873 src/mainwindow.c:2408
+#: src/addressbook.c:496 src/compose.c:4873 src/mainwindow.c:2416
 #: src/prefs_common_dialog.c:2274
 msgid "Address book"
 msgstr "Adressebog"
@@ -1180,7 +1180,7 @@ msgstr "Normale adresser"
 msgid "Personal address"
 msgstr "Personlige adresser"
 
-#: src/alertpanel.c:142 src/compose.c:5717 src/main.c:638
+#: src/alertpanel.c:142 src/compose.c:5720 src/main.c:638
 msgid "Notice"
 msgstr "Note"
 
@@ -1353,9 +1353,9 @@ msgid "/_View/_Reply to"
 msgstr "/_Vis/_Svar til"
 
 #: src/compose.c:578 src/compose.c:580 src/compose.c:582 src/compose.c:584
-#: src/compose.c:587 src/mainwindow.c:577 src/mainwindow.c:580
-#: src/mainwindow.c:607 src/mainwindow.c:631 src/mainwindow.c:734
-#: src/mainwindow.c:738 src/messageview.c:258
+#: src/compose.c:587 src/mainwindow.c:579 src/mainwindow.c:582
+#: src/mainwindow.c:609 src/mainwindow.c:633 src/mainwindow.c:736
+#: src/mainwindow.c:740 src/messageview.c:258
 msgid "/_View/---"
 msgstr "/_Vis/---"
 
@@ -1376,7 +1376,7 @@ msgstr "/_Vis/_Vedhæft"
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/_Vis/_Gå til/Anden _mappe..."
 
-#: src/compose.c:593 src/mainwindow.c:638 src/messageview.c:173
+#: src/compose.c:593 src/mainwindow.c:640 src/messageview.c:173
 #, fuzzy
 msgid "/_View/Character _encoding"
 msgstr "/_Vis/_Sortere/Faldende"
@@ -1388,138 +1388,138 @@ msgstr ""
 #: src/compose.c:596 src/compose.c:602 src/compose.c:608 src/compose.c:612
 #: src/compose.c:620 src/compose.c:624 src/compose.c:630 src/compose.c:636
 #: src/compose.c:640 src/compose.c:650 src/compose.c:654 src/compose.c:662
-#: src/compose.c:666 src/mainwindow.c:634 src/mainwindow.c:641
+#: src/compose.c:666 src/mainwindow.c:636 src/mainwindow.c:643
 #: src/messageview.c:169
 #, fuzzy
 msgid "/_View/Character _encoding/---"
 msgstr "/_Vis/_Sortere/Faldende"
 
-#: src/compose.c:598 src/mainwindow.c:642 src/messageview.c:177
+#: src/compose.c:598 src/mainwindow.c:644 src/messageview.c:177
 #, fuzzy
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Vis/_Tegnsæt/7bit ascii (US-ASC_II)"
 
-#: src/compose.c:600 src/mainwindow.c:644 src/messageview.c:180
+#: src/compose.c:600 src/mainwindow.c:646 src/messageview.c:180
 #, fuzzy
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Vis/_Tegnsæt/Unicode (_UTF-8)"
 
-#: src/compose.c:604 src/mainwindow.c:648 src/messageview.c:183
+#: src/compose.c:604 src/mainwindow.c:650 src/messageview.c:183
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Vis/_Tegnsæt/Western European (ISO-8859-_1)"
 
-#: src/compose.c:606 src/mainwindow.c:650 src/messageview.c:185
+#: src/compose.c:606 src/mainwindow.c:652 src/messageview.c:185
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Vis/_Tegnsæt/Western European (ISO-8859-_15)"
 
-#: src/compose.c:610 src/mainwindow.c:656 src/messageview.c:190
+#: src/compose.c:610 src/mainwindow.c:658 src/messageview.c:190
 #, fuzzy
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Vis/_Tegnsæt/Central European (ISO-8859-_2)"
 
-#: src/compose.c:614 src/mainwindow.c:660 src/messageview.c:193
+#: src/compose.c:614 src/mainwindow.c:662 src/messageview.c:193
 #, fuzzy
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Vis/_Tegnsæt/_Baltic (ISO-8859-13)"
 
-#: src/compose.c:616 src/mainwindow.c:662 src/messageview.c:195
+#: src/compose.c:616 src/mainwindow.c:664 src/messageview.c:195
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Vis/_Tegnsæt/Baltic (ISO-8859-_4)"
 
-#: src/compose.c:618 src/mainwindow.c:664 src/messageview.c:197
+#: src/compose.c:618 src/mainwindow.c:666 src/messageview.c:197
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/_Vis/_Tegnsæt/Cyrillic (Windows-1251)"
 
-#: src/compose.c:622 src/mainwindow.c:668 src/messageview.c:200
+#: src/compose.c:622 src/mainwindow.c:670 src/messageview.c:200
 #, fuzzy
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Vis/_Tegnsæt/Greek (ISO-8859-_7)"
 
-#: src/compose.c:626 src/mainwindow.c:672 src/messageview.c:203
+#: src/compose.c:626 src/mainwindow.c:674 src/messageview.c:203
 #, fuzzy
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/_Vis/_Tegnsæt/Baltic (ISO-8859-_4)"
 
-#: src/compose.c:628 src/mainwindow.c:674 src/messageview.c:205
+#: src/compose.c:628 src/mainwindow.c:676 src/messageview.c:205
 #, fuzzy
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/_Vis/_Tegnsæt/Cyrillic (Windows-1251)"
 
-#: src/compose.c:632 src/mainwindow.c:678 src/messageview.c:208
+#: src/compose.c:632 src/mainwindow.c:680 src/messageview.c:208
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Vis/_Tegnsæt/Greek (ISO-8859-_7)"
 
-#: src/compose.c:634 src/mainwindow.c:680 src/messageview.c:210
+#: src/compose.c:634 src/mainwindow.c:682 src/messageview.c:210
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Vis/_Tegnsæt/Cyrillic (Windows-1251)"
 
-#: src/compose.c:638 src/mainwindow.c:684 src/messageview.c:213
+#: src/compose.c:638 src/mainwindow.c:686 src/messageview.c:213
 #, fuzzy
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Vis/_Tegnsæt/Turkish (ISO-8859-_9)"
 
-#: src/compose.c:642 src/mainwindow.c:688 src/messageview.c:216
+#: src/compose.c:642 src/mainwindow.c:690 src/messageview.c:216
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Vis/_Tegnsæt/Cyrillic (ISO-8859-_5)"
 
-#: src/compose.c:644 src/mainwindow.c:690 src/messageview.c:218
+#: src/compose.c:644 src/mainwindow.c:692 src/messageview.c:218
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Vis/_Tegnsæt/Cyrillic (KOI8-_R)"
 
-#: src/compose.c:646 src/mainwindow.c:692 src/messageview.c:220
+#: src/compose.c:646 src/mainwindow.c:694 src/messageview.c:220
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Vis/_Tegnsæt/Cyrillic (KOI8-_R)"
 
-#: src/compose.c:648 src/mainwindow.c:694 src/messageview.c:222
+#: src/compose.c:648 src/mainwindow.c:696 src/messageview.c:222
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Vis/_Tegnsæt/Cyrillic (Windows-1251)"
 
-#: src/compose.c:652 src/mainwindow.c:698 src/messageview.c:225
+#: src/compose.c:652 src/mainwindow.c:700 src/messageview.c:225
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Vis/_Tegnsæt/Japanese (ISO-2022-_JP)"
 
-#: src/compose.c:656 src/mainwindow.c:708 src/messageview.c:234
+#: src/compose.c:656 src/mainwindow.c:710 src/messageview.c:234
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Vis/_Tegnsæt/Simplified Chinese (_GB2312)"
 
-#: src/compose.c:658 src/mainwindow.c:710 src/messageview.c:236
+#: src/compose.c:658 src/mainwindow.c:712 src/messageview.c:236
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Vis/_Tegnsæt/Simplified Chinese (_GB2312)"
 
-#: src/compose.c:660 src/mainwindow.c:712 src/messageview.c:238
+#: src/compose.c:660 src/mainwindow.c:714 src/messageview.c:238
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Vis/_Tegnsæt/Traditional Chinese (_Big5)"
 
-#: src/compose.c:664 src/mainwindow.c:720 src/messageview.c:245
+#: src/compose.c:664 src/mainwindow.c:722 src/messageview.c:245
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Vis/_Tegnsæt/Korean (EUC-_KR)"
 
-#: src/compose.c:668 src/mainwindow.c:726 src/messageview.c:250
+#: src/compose.c:668 src/mainwindow.c:728 src/messageview.c:250
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Vis/_Tegnsæt/Thai (TIS-620)"
 
-#: src/compose.c:670 src/mainwindow.c:728 src/messageview.c:252
+#: src/compose.c:670 src/mainwindow.c:730 src/messageview.c:252
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Vis/_Tegnsæt/Thai (Windows-874)"
 
-#: src/compose.c:674 src/mainwindow.c:788 src/messageview.c:283
+#: src/compose.c:674 src/mainwindow.c:790 src/messageview.c:283
 msgid "/_Tools/_Address book"
 msgstr "/_Funktioner/_Adressebog"
 
@@ -1527,13 +1527,13 @@ msgstr "/_Funktioner/_Adressebog"
 msgid "/_Tools/_Template"
 msgstr "/_Funktioner/_Skabelon"
 
-#: src/compose.c:677 src/mainwindow.c:812 src/messageview.c:299
+#: src/compose.c:677 src/mainwindow.c:814 src/messageview.c:299
 msgid "/_Tools/Actio_ns"
 msgstr "/_Funktioner/_Handlinger"
 
-#: src/compose.c:679 src/compose.c:683 src/compose.c:689 src/mainwindow.c:791
-#: src/mainwindow.c:805 src/mainwindow.c:810 src/mainwindow.c:813
-#: src/mainwindow.c:817 src/mainwindow.c:819 src/messageview.c:286
+#: src/compose.c:679 src/compose.c:683 src/compose.c:689 src/mainwindow.c:793
+#: src/mainwindow.c:807 src/mainwindow.c:812 src/mainwindow.c:815
+#: src/mainwindow.c:819 src/mainwindow.c:821 src/messageview.c:286
 #: src/messageview.c:298
 msgid "/_Tools/---"
 msgstr "/_Funktioner/---"
@@ -1739,7 +1739,7 @@ msgstr "/_Funktioner/_Handlinger"
 msgid "PGP Encrypt"
 msgstr "/_Meddelelse/_Kryptere"
 
-#: src/compose.c:4442 src/compose.c:5543
+#: src/compose.c:4442 src/compose.c:5546
 msgid "MIME type"
 msgstr "MIME type"
 
@@ -1782,36 +1782,36 @@ msgstr "Redigér med ekstern Editor"
 msgid "Wrap all long lines"
 msgstr "/_Redigér/Formater _alle lange linier"
 
-#: src/compose.c:5439
+#: src/compose.c:5442
 msgid "Invalid MIME type."
 msgstr "Ugyldig MIME type"
 
-#: src/compose.c:5457
+#: src/compose.c:5460
 msgid "File doesn't exist or is empty."
 msgstr "Fil eksisterer ikke eller er tom."
 
-#: src/compose.c:5525
+#: src/compose.c:5528
 msgid "Properties"
 msgstr "Egenskaber"
 
-#: src/compose.c:5545 src/prefs_common_dialog.c:1504
+#: src/compose.c:5548 src/prefs_common_dialog.c:1504
 msgid "Encoding"
 msgstr "Tegnsæt kodning"
 
-#: src/compose.c:5568 src/prefs_folder_item.c:202
+#: src/compose.c:5571 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Sti"
 
-#: src/compose.c:5569
+#: src/compose.c:5572
 msgid "File name"
 msgstr "Fil navn"
 
-#: src/compose.c:5659
+#: src/compose.c:5662
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Sti til ekstern editor er ugyldig: `%s'\n"
 
-#: src/compose.c:5714
+#: src/compose.c:5717
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1821,52 +1821,52 @@ msgstr ""
 "Afbryde?\n"
 "ID: %d"
 
-#: src/compose.c:6040 src/mainwindow.c:2752
+#: src/compose.c:6043 src/mainwindow.c:2761
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:6156 src/compose.c:6161 src/compose.c:6167
+#: src/compose.c:6159 src/compose.c:6164 src/compose.c:6170
 msgid "Can't queue the message."
 msgstr "Meddelelse kan ikke lægges i kø."
 
-#: src/compose.c:6258
+#: src/compose.c:6261
 #, fuzzy
 msgid "Select files"
 msgstr "Vælg fil"
 
-#: src/compose.c:6281
+#: src/compose.c:6284
 msgid "Select file"
 msgstr "Vælg fil"
 
-#: src/compose.c:6316
+#: src/compose.c:6319
 #, fuzzy
 msgid "Save message"
 msgstr "Sende meddelelse"
 
-#: src/compose.c:6317
+#: src/compose.c:6320
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Denne meddelelse er ændret. Slet?"
 
-#: src/compose.c:6319
+#: src/compose.c:6322
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:6361
+#: src/compose.c:6364
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Vil du benytte skabelon `%s' ?"
 
-#: src/compose.c:6363
+#: src/compose.c:6366
 msgid "Apply template"
 msgstr "Benyt skabelon"
 
-#: src/compose.c:6364
+#: src/compose.c:6367
 #, fuzzy
 msgid "_Replace"
 msgstr "Erstat"
 
-#: src/compose.c:6364
+#: src/compose.c:6367
 #, fuzzy
 msgid "_Insert"
 msgstr "Indæst"
@@ -2328,12 +2328,12 @@ msgstr "Indtast mappe information...\n"
 msgid "Setting folder info..."
 msgstr "Indtast mappe information..."
 
-#: src/folderview.c:868 src/mainwindow.c:3748 src/setup.c:80
+#: src/folderview.c:868 src/mainwindow.c:3757 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Gennemsøger mappe %s%c%s ..."
 
-#: src/folderview.c:872 src/mainwindow.c:3753 src/setup.c:85
+#: src/folderview.c:872 src/mainwindow.c:3762 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Gennemsøger mappe %s ..."
@@ -3105,563 +3105,568 @@ msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/_Vis/_Vis eller skjul/_Værktøjslinie/Ikon _og tekst"
 
 #: src/mainwindow.c:566
-msgid "/_View/Show or hi_de/_Toolbar/_Icon"
+#, fuzzy
+msgid "/_View/Show or hi_de/_Toolbar/Text at the _right of icon"
 msgstr "/_Vis/_Vis eller skjul/_Værktøjslinie/_Ikon"
 
 #: src/mainwindow.c:568
+msgid "/_View/Show or hi_de/_Toolbar/_Icon"
+msgstr "/_Vis/_Vis eller skjul/_Værktøjslinie/_Ikon"
+
+#: src/mainwindow.c:570
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/_Vis/_Vis eller skjul/_Værktøjslinie/_Tekst"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:572
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/_Vis/_Vis eller skjul/_Værktøjslinie/_Ingen"
 
-#: src/mainwindow.c:572
+#: src/mainwindow.c:574
 #, fuzzy
 msgid "/_View/Show or hi_de/_Search bar"
 msgstr "/_Vis/_Vis eller skjul/_Status linie"
 
-#: src/mainwindow.c:574
+#: src/mainwindow.c:576
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/_Vis/_Vis eller skjul/_Status linie"
 
-#: src/mainwindow.c:576
+#: src/mainwindow.c:578
 #, fuzzy
 msgid "/_View/_Customize toolbar..."
 msgstr "/_Vis/_Gå til/Anden _mappe..."
 
-#: src/mainwindow.c:578
+#: src/mainwindow.c:580
 msgid "/_View/Separate f_older tree"
 msgstr "/_Vis/_Seperat mappe træ"
 
-#: src/mainwindow.c:579
+#: src/mainwindow.c:581
 #, fuzzy
 msgid "/_View/Separate _message view"
 msgstr "/_Vis/Seperat m_eddelelses vindue"
 
-#: src/mainwindow.c:581
+#: src/mainwindow.c:583
 msgid "/_View/_Sort"
 msgstr "/_Vis/_Sortere"
 
-#: src/mainwindow.c:582
+#: src/mainwindow.c:584
 msgid "/_View/_Sort/by _number"
 msgstr "/_Vis/_Sortere/_Nummer orden"
 
-#: src/mainwindow.c:583
+#: src/mainwindow.c:585
 msgid "/_View/_Sort/by s_ize"
 msgstr "/_Vis/_Sortere/_Størrelses orden"
 
-#: src/mainwindow.c:584
+#: src/mainwindow.c:586
 msgid "/_View/_Sort/by _date"
 msgstr "/_Vis/_Sortere/_Dato orden"
 
-#: src/mainwindow.c:585
+#: src/mainwindow.c:587
 #, fuzzy
 msgid "/_View/_Sort/by t_hread date"
 msgstr "/_Vis/_Sortere/_Dato orden"
 
-#: src/mainwindow.c:586
+#: src/mainwindow.c:588
 msgid "/_View/_Sort/by _from"
 msgstr "/_Vis/_Sortere/_Fra orden"
 
-#: src/mainwindow.c:587
+#: src/mainwindow.c:589
 msgid "/_View/_Sort/by _recipient"
 msgstr "/_Vis/_Sortere/Efter _modtager"
 
-#: src/mainwindow.c:588
+#: src/mainwindow.c:590
 msgid "/_View/_Sort/by _subject"
 msgstr "/_Vis/_Sortere/_Emne orden"
 
-#: src/mainwindow.c:589
+#: src/mainwindow.c:591
 msgid "/_View/_Sort/by _color label"
 msgstr "/_Vis/_Sortere/_Farvet label orden"
 
-#: src/mainwindow.c:591
+#: src/mainwindow.c:593
 msgid "/_View/_Sort/by _mark"
 msgstr "/_Vis/_Sortere/_Markéret orden"
 
-#: src/mainwindow.c:592
+#: src/mainwindow.c:594
 msgid "/_View/_Sort/by _unread"
 msgstr "/_Vis/_Sortere/_Ulæst orden"
 
-#: src/mainwindow.c:593
+#: src/mainwindow.c:595
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/_Vis/_Sortere/_Vedhæft orden"
 
-#: src/mainwindow.c:595
+#: src/mainwindow.c:597
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/_Vis/_Sortere/Sorter _ikke"
 
-#: src/mainwindow.c:596 src/mainwindow.c:599
+#: src/mainwindow.c:598 src/mainwindow.c:601
 msgid "/_View/_Sort/---"
 msgstr "/_Vis/_Sortere/---"
 
-#: src/mainwindow.c:597
+#: src/mainwindow.c:599
 msgid "/_View/_Sort/Ascending"
 msgstr "/_Vis/_Sortere/Stigende"
 
-#: src/mainwindow.c:598
+#: src/mainwindow.c:600
 msgid "/_View/_Sort/Descending"
 msgstr "/_Vis/_Sortere/Faldende"
 
-#: src/mainwindow.c:600
+#: src/mainwindow.c:602
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/_Vis/_Sortere/_Emne orden"
 
-#: src/mainwindow.c:602
+#: src/mainwindow.c:604
 msgid "/_View/Th_read view"
 msgstr "/_Vis/_Trådet"
 
-#: src/mainwindow.c:603
+#: src/mainwindow.c:605
 msgid "/_View/E_xpand all threads"
 msgstr "_Vis/Åbn tråde"
 
-#: src/mainwindow.c:604
+#: src/mainwindow.c:606
 msgid "/_View/Co_llapse all threads"
 msgstr "/_Vis/_Saml alle tråde"
 
-#: src/mainwindow.c:605
+#: src/mainwindow.c:607
 msgid "/_View/Set display _item..."
 msgstr "/_Vis/_Sæt visning ..."
 
-#: src/mainwindow.c:608
+#: src/mainwindow.c:610
 msgid "/_View/_Go to"
 msgstr "/_Vis/_Gå til"
 
-#: src/mainwindow.c:609
+#: src/mainwindow.c:611
 msgid "/_View/_Go to/_Prev message"
 msgstr "/_Vis/_Gå til/_Forrige meddelelse"
 
-#: src/mainwindow.c:610
+#: src/mainwindow.c:612
 msgid "/_View/_Go to/_Next message"
 msgstr "/_Vis/_Gå til/_Næste meddelelse"
 
-#: src/mainwindow.c:611 src/mainwindow.c:616 src/mainwindow.c:619
-#: src/mainwindow.c:624 src/mainwindow.c:629
+#: src/mainwindow.c:613 src/mainwindow.c:618 src/mainwindow.c:621
+#: src/mainwindow.c:626 src/mainwindow.c:631
 msgid "/_View/_Go to/---"
 msgstr "/_Vis/_Gå til/---"
 
-#: src/mainwindow.c:612
+#: src/mainwindow.c:614
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/Vis/_Gå til/Forrige ulæste meddelelse"
 
-#: src/mainwindow.c:614
+#: src/mainwindow.c:616
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/_Vis/_Gå til/Næste ulæste meddelelse"
 
-#: src/mainwindow.c:617
+#: src/mainwindow.c:619
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/_Vis/_Gå til/_Forrige nye meddelelse"
 
-#: src/mainwindow.c:618
+#: src/mainwindow.c:620
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/_Vis/_Gå til/_Næste nye meddelelse"
 
-#: src/mainwindow.c:620
+#: src/mainwindow.c:622
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/_Vis/_Gå til/Forrige _markéret meddelelse"
 
-#: src/mainwindow.c:622
+#: src/mainwindow.c:624
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/_Vis/_Gå til/Næste  _markéret meddelelse"
 
-#: src/mainwindow.c:625
+#: src/mainwindow.c:627
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/_Vis/_Gå til/Forrige _label meddelelse"
 
-#: src/mainwindow.c:627
+#: src/mainwindow.c:629
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/_Vis/_Gå til/Næste _label meddelelse"
 
-#: src/mainwindow.c:630
+#: src/mainwindow.c:632
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Vis/_Gå til/Anden _mappe..."
 
-#: src/mainwindow.c:639 src/messageview.c:174
+#: src/mainwindow.c:641 src/messageview.c:174
 #, fuzzy
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Vis/_Tegnsæt/_Automatisk"
 
-#: src/mainwindow.c:652 src/messageview.c:187
+#: src/mainwindow.c:654 src/messageview.c:187
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr "/_Vis/_Tegnsæt/Western European (ISO-8859-_15)"
 
-#: src/mainwindow.c:700 src/messageview.c:227
+#: src/mainwindow.c:702 src/messageview.c:227
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Vis/_TegnsætJapanese (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:702 src/messageview.c:229
+#: src/mainwindow.c:704 src/messageview.c:229
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Vis/_Tegnsæt/Japanese (_EUC-JP)"
 
-#: src/mainwindow.c:704 src/messageview.c:231
+#: src/mainwindow.c:706 src/messageview.c:231
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Vis//_Tegnsæt/Japanese (_Shift_JIS)"
 
-#: src/mainwindow.c:714 src/messageview.c:240
+#: src/mainwindow.c:716 src/messageview.c:240
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Vis/_Tegnsæt/Traditional Chinese (EUC-_TW)"
 
-#: src/mainwindow.c:716 src/messageview.c:242
+#: src/mainwindow.c:718 src/messageview.c:242
 #, fuzzy
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Vis/_Tegnsæt/Chinese (ISO-2022-_CN)"
 
-#: src/mainwindow.c:722 src/messageview.c:247
+#: src/mainwindow.c:724 src/messageview.c:247
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Vis/_Tegnsæt/Korean (ISO-2022-KR)"
 
-#: src/mainwindow.c:735 src/summaryview.c:464
+#: src/mainwindow.c:737 src/summaryview.c:464
 msgid "/_View/Open in new _window"
 msgstr "/_Vis/Åbn i nyt vindue"
 
-#: src/mainwindow.c:736 src/messageview.c:259 src/summaryview.c:466
+#: src/mainwindow.c:738 src/messageview.c:259 src/summaryview.c:466
 msgid "/_View/Mess_age source"
 msgstr "/_Vis/_Kilde"
 
-#: src/mainwindow.c:737 src/messageview.c:260 src/summaryview.c:467
+#: src/mainwindow.c:739 src/messageview.c:260 src/summaryview.c:467
 #, fuzzy
 msgid "/_View/All _headers"
 msgstr "/_Vis/Alle _hoveder"
 
-#: src/mainwindow.c:739
+#: src/mainwindow.c:741
 msgid "/_View/_Update summary"
 msgstr "/_Vis/_Opdatér oversigt"
 
-#: src/mainwindow.c:741 src/messageview.c:263
+#: src/mainwindow.c:743 src/messageview.c:263
 msgid "/_Message"
 msgstr "/_Meddelelse"
 
-#: src/mainwindow.c:742
+#: src/mainwindow.c:744
 #, fuzzy
 msgid "/_Message/Recei_ve"
 msgstr "/_Meddelelse/Redigér _igen"
 
-#: src/mainwindow.c:743
+#: src/mainwindow.c:745
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/_Meddelelse/Hent fra _alle konti"
 
-#: src/mainwindow.c:745
+#: src/mainwindow.c:747
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/_Meddelelse/Hent fra _alle konti"
 
-#: src/mainwindow.c:747
+#: src/mainwindow.c:749
 #, fuzzy
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/_Meddelelse/_Afbryd afsendelse"
 
-#: src/mainwindow.c:749
+#: src/mainwindow.c:751
 #, fuzzy
 msgid "/_Message/Recei_ve/---"
 msgstr "/_Meddelelse/Redigér _igen"
 
-#: src/mainwindow.c:750
+#: src/mainwindow.c:752
 msgid "/_Message/_Send queued messages"
 msgstr "/_Meddelelse/Send meddelelser i _kø"
 
-#: src/mainwindow.c:751 src/mainwindow.c:753 src/mainwindow.c:760
-#: src/mainwindow.c:765 src/mainwindow.c:768 src/mainwindow.c:779
-#: src/mainwindow.c:781 src/mainwindow.c:784 src/messageview.c:266
+#: src/mainwindow.c:753 src/mainwindow.c:755 src/mainwindow.c:762
+#: src/mainwindow.c:767 src/mainwindow.c:770 src/mainwindow.c:781
+#: src/mainwindow.c:783 src/mainwindow.c:786 src/messageview.c:266
 #: src/messageview.c:274 src/messageview.c:279
 msgid "/_Message/---"
 msgstr "/_Meddelelse/---"
 
-#: src/mainwindow.c:752 src/messageview.c:264
+#: src/mainwindow.c:754 src/messageview.c:264
 msgid "/_Message/Compose _new message"
 msgstr "/_Meddelelse/Opret _ny meddelelse"
 
-#: src/mainwindow.c:754 src/messageview.c:267
+#: src/mainwindow.c:756 src/messageview.c:267
 msgid "/_Message/_Reply"
 msgstr "/_Meddelelse/_Besvar"
 
-#: src/mainwindow.c:755
+#: src/mainwindow.c:757
 msgid "/_Message/Repl_y to"
 msgstr "/_Meddelelse/_Svar til"
 
-#: src/mainwindow.c:756 src/messageview.c:268
+#: src/mainwindow.c:758 src/messageview.c:268
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Meddelelse/_Svar til/A_lle"
 
-#: src/mainwindow.c:757 src/messageview.c:270
+#: src/mainwindow.c:759 src/messageview.c:270
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Meddelelse/_Svar til/Af_sender"
 
-#: src/mainwindow.c:758 src/messageview.c:272
+#: src/mainwindow.c:760 src/messageview.c:272
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Meddelelse/_Svar til/_Alle"
 
-#: src/mainwindow.c:761 src/messageview.c:275
+#: src/mainwindow.c:763 src/messageview.c:275
 msgid "/_Message/_Forward"
 msgstr "/_Meddelelse/_Videresend"
 
-#: src/mainwindow.c:762 src/messageview.c:276
+#: src/mainwindow.c:764 src/messageview.c:276
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Meddelelse/Videresend som _vedhæftet"
 
-#: src/mainwindow.c:764 src/messageview.c:278
+#: src/mainwindow.c:766 src/messageview.c:278
 msgid "/_Message/Redirec_t"
 msgstr "/_Meddelelse/_Omdirigér"
 
-#: src/mainwindow.c:766
+#: src/mainwindow.c:768
 msgid "/_Message/M_ove..."
 msgstr "/_Meddelelse/_Flyt..."
 
-#: src/mainwindow.c:767
+#: src/mainwindow.c:769
 msgid "/_Message/_Copy..."
 msgstr "/_Meddelelse/_Kopiere..."
 
-#: src/mainwindow.c:769
+#: src/mainwindow.c:771
 msgid "/_Message/_Mark"
 msgstr "/_Meddelelse/_Markér"
 
-#: src/mainwindow.c:770
+#: src/mainwindow.c:772
 msgid "/_Message/_Mark/_Mark"
 msgstr "/_Meddelelse/_Markér/_Markér"
 
-#: src/mainwindow.c:771
+#: src/mainwindow.c:773
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/_Meddelelse/_Markér/_Slet markéring"
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:774
 msgid "/_Message/_Mark/---"
 msgstr "/_Meddelelse/_Markér/---"
 
-#: src/mainwindow.c:773
+#: src/mainwindow.c:775
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/_Meddelelse/_Markér/Som ulæst"
 
-#: src/mainwindow.c:774
+#: src/mainwindow.c:776
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/_Meddelelse/_Markér/Som læst"
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:778
 #, fuzzy
 msgid "/_Message/_Mark/Mark _thread as read"
 msgstr "/_Meddelelse/_Markér/Som læst"
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:780
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/_Meddelelse/_Markér/Alle som læst"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:782
 msgid "/_Message/_Delete"
 msgstr "/_Meddelelse/_Slet"
 
-#: src/mainwindow.c:782
+#: src/mainwindow.c:784
 #, fuzzy
 msgid "/_Message/Set as _junk mail"
 msgstr "/_Meddelelse/Hent _ny post"
 
-#: src/mainwindow.c:783
+#: src/mainwindow.c:785
 #, fuzzy
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/_Meddelelse/Hent _ny post"
 
-#: src/mainwindow.c:785 src/messageview.c:280
+#: src/mainwindow.c:787 src/messageview.c:280
 msgid "/_Message/Re-_edit"
 msgstr "/_Meddelelse/Redigér _igen"
 
-#: src/mainwindow.c:789
+#: src/mainwindow.c:791
 #, fuzzy
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/_Funktioner/Tilføj afsender til adressebog"
 
-#: src/mainwindow.c:792
+#: src/mainwindow.c:794
 #, fuzzy
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/_Funktioner/_Filtrere meddelelse"
 
-#: src/mainwindow.c:794
+#: src/mainwindow.c:796
 #, fuzzy
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Funktioner/_Filtrere meddelelse"
 
-#: src/mainwindow.c:796 src/messageview.c:287
+#: src/mainwindow.c:798 src/messageview.c:287
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Funktioner/_Opret filter"
 
-#: src/mainwindow.c:797 src/messageview.c:289
+#: src/mainwindow.c:799 src/messageview.c:289
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Funktioner/_Opret filter/_Automatisk"
 
-#: src/mainwindow.c:799 src/messageview.c:291
+#: src/mainwindow.c:801 src/messageview.c:291
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Funktioner/_Opret filter/Efter _Fra"
 
-#: src/mainwindow.c:801 src/messageview.c:293
+#: src/mainwindow.c:803 src/messageview.c:293
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Funktioner/_Opret filter/Efter _Til"
 
-#: src/mainwindow.c:803 src/messageview.c:295
+#: src/mainwindow.c:805 src/messageview.c:295
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Funktioner/_Opret filter/Efter _Emne"
 
-#: src/mainwindow.c:806
+#: src/mainwindow.c:808
 #, fuzzy
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/_Funktioner/_Filtrere meddelelse"
 
-#: src/mainwindow.c:808
+#: src/mainwindow.c:810
 #, fuzzy
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/_Funktioner/_Filtrere meddelelse"
 
-#: src/mainwindow.c:815
+#: src/mainwindow.c:817
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/_Meddelelse/Slet alle du_blikerede meddelelser"
 
-#: src/mainwindow.c:818
+#: src/mainwindow.c:820
 #, fuzzy
 msgid "/_Tools/E_xecute marked process"
 msgstr "Udfør markéret process"
 
-#: src/mainwindow.c:820
+#: src/mainwindow.c:822
 msgid "/_Tools/_Log window"
 msgstr "/Funktioner/_Logbog vindue"
 
-#: src/mainwindow.c:822
+#: src/mainwindow.c:824
 msgid "/_Configuration"
 msgstr "/_Opsæt"
 
-#: src/mainwindow.c:823
+#: src/mainwindow.c:825
 msgid "/_Configuration/_Common preferences..."
 msgstr "/_Opsæt/Generelt _opsæt..."
 
-#: src/mainwindow.c:825
+#: src/mainwindow.c:827
 msgid "/_Configuration/_Filter setting..."
 msgstr "/_Opsæt/_Filter opsæt..."
 
-#: src/mainwindow.c:827
+#: src/mainwindow.c:829
 msgid "/_Configuration/_Template..."
 msgstr "/_Opsæt/_Skabelon..."
 
-#: src/mainwindow.c:829
+#: src/mainwindow.c:831
 msgid "/_Configuration/_Actions..."
 msgstr "/_Opsæt/_Handlinger..."
 
-#: src/mainwindow.c:831
+#: src/mainwindow.c:833
 msgid "/_Configuration/---"
 msgstr "/_Opsæt/---"
 
-#: src/mainwindow.c:832
+#: src/mainwindow.c:834
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Opsæt/_Den aktuelle konto..."
 
-#: src/mainwindow.c:834
+#: src/mainwindow.c:836
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Opsæt/_Opret ny konto..."
 
-#: src/mainwindow.c:836
+#: src/mainwindow.c:838
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Opsæt/_Redigér konti..."
 
-#: src/mainwindow.c:838
+#: src/mainwindow.c:840
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Opsæt/_Skift aktuel konto..."
 
-#: src/mainwindow.c:842
+#: src/mainwindow.c:844
 msgid "/_Help/_Manual"
 msgstr "/_Hjælp/_Vejledning"
 
-#: src/mainwindow.c:843
+#: src/mainwindow.c:845
 msgid "/_Help/_Manual/_English"
 msgstr "/_Hilfe/_Vejledning/_Engelsk"
 
-#: src/mainwindow.c:844
+#: src/mainwindow.c:846
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/_Hilfe/_Vejledning/_Japansk"
 
-#: src/mainwindow.c:845
+#: src/mainwindow.c:847
 msgid "/_Help/_FAQ"
 msgstr "/_Hjælp/_OSS"
 
-#: src/mainwindow.c:846
+#: src/mainwindow.c:848
 msgid "/_Help/_FAQ/_English"
 msgstr "/_Hjælp/_OSS/_Engelsk"
 
-#: src/mainwindow.c:847
+#: src/mainwindow.c:849
 msgid "/_Help/_FAQ/_German"
 msgstr "/_Hjælp/_OSS/_Tysk"
 
-#: src/mainwindow.c:848
+#: src/mainwindow.c:850
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/_Hjælp/_OSS/_Spansk"
 
-#: src/mainwindow.c:849
+#: src/mainwindow.c:851
 msgid "/_Help/_FAQ/_French"
 msgstr "/_Hjælp/_OSS/_Fransk"
 
-#: src/mainwindow.c:850
+#: src/mainwindow.c:852
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/_Hjælp/_OSS/_Italiensk"
 
-#: src/mainwindow.c:851
+#: src/mainwindow.c:853
 #, fuzzy
 msgid "/_Help/_Command line options"
 msgstr "Kommando linie ikke opsat."
 
-#: src/mainwindow.c:852
+#: src/mainwindow.c:854
 msgid "/_Help/---"
 msgstr "/_Hjælp/---"
 
-#: src/mainwindow.c:895
+#: src/mainwindow.c:897
 msgid "Creating main window...\n"
 msgstr "Opretter hoved vindue...\n"
 
-#: src/mainwindow.c:1071
+#: src/mainwindow.c:1073
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "HovedVindue: fejl i farve %d\n"
 
-#: src/mainwindow.c:1175 src/summaryview.c:2387 src/summaryview.c:2472
+#: src/mainwindow.c:1181 src/summaryview.c:2387 src/summaryview.c:2472
 #: src/summaryview.c:4009 src/summaryview.c:4138 src/summaryview.c:4507
 msgid "done.\n"
 msgstr "Afsluttet.\n"
 
-#: src/mainwindow.c:1293 src/mainwindow.c:1334 src/mainwindow.c:1359
+#: src/mainwindow.c:1299 src/mainwindow.c:1340 src/mainwindow.c:1365
 msgid "Untitled"
 msgstr "Uden titel"
 
-#: src/mainwindow.c:1360
+#: src/mainwindow.c:1366
 msgid "none"
 msgstr "ingen"
 
-#: src/mainwindow.c:1413
+#: src/mainwindow.c:1419
 #, 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:1663
+#: src/mainwindow.c:1669
 msgid "Offline"
 msgstr ""
 
-#: src/mainwindow.c:1664
+#: src/mainwindow.c:1670
 msgid "You are offline. Go online?"
 msgstr ""
 
-#: src/mainwindow.c:1681
+#: src/mainwindow.c:1687
 #, fuzzy
 msgid "Empty all trash"
 msgstr "Tøm Slettet"
 
-#: src/mainwindow.c:1682
+#: src/mainwindow.c:1688
 #, fuzzy
 msgid "Delete all messages in trash folders?"
 msgstr "Slet alle meddelelser i Slettet?"
 
-#: src/mainwindow.c:1712
+#: src/mainwindow.c:1718
 msgid "Add mailbox"
 msgstr "Ny mailbox"
 
-#: src/mainwindow.c:1713
+#: src/mainwindow.c:1719
 #, fuzzy
 msgid ""
 "Specify the location of mailbox.\n"
@@ -3672,16 +3677,16 @@ msgstr ""
 "Hvis den eksisterende mailbox angives, vil den blive\n"
 "gennemsøgt automatisk."
 
-#: src/mainwindow.c:1719 src/setup.c:49
+#: src/mainwindow.c:1725 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Mailbox `%s' eksisterer allerede."
 
-#: src/mainwindow.c:1724 src/setup.c:56
+#: src/mainwindow.c:1730 src/setup.c:56
 msgid "Mailbox"
 msgstr "Mailbox"
 
-#: src/mainwindow.c:1730 src/setup.c:62
+#: src/mainwindow.c:1736 src/setup.c:62
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3690,135 +3695,135 @@ msgstr ""
 "Fejl i oprettelse af mailbox.\n"
 "Måske findes filerne allerede eller du har ikke skrive rettighedder."
 
-#: src/mainwindow.c:2198
+#: src/mainwindow.c:2206
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Mappe visning"
 
-#: src/mainwindow.c:2217
+#: src/mainwindow.c:2225
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Meddelelses visning"
 
-#: src/mainwindow.c:2369 src/summaryview.c:418
+#: src/mainwindow.c:2377 src/summaryview.c:418
 msgid "/_Reply"
 msgstr "/_Svar"
 
-#: src/mainwindow.c:2370
+#: src/mainwindow.c:2378
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "Svar til alle"
 
-#: src/mainwindow.c:2371
+#: src/mainwindow.c:2379
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/_Svar til/_Afsender"
 
-#: src/mainwindow.c:2372
+#: src/mainwindow.c:2380
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/_Svar til/_Mail liste"
 
-#: src/mainwindow.c:2377 src/summaryview.c:425
+#: src/mainwindow.c:2385 src/summaryview.c:425
 msgid "/_Forward"
 msgstr "/_Videresend"
 
-#: src/mainwindow.c:2378 src/summaryview.c:426
+#: src/mainwindow.c:2386 src/summaryview.c:426
 msgid "/For_ward as attachment"
 msgstr "/Videresend som _vedhæftet"
 
-#: src/mainwindow.c:2379 src/summaryview.c:427
+#: src/mainwindow.c:2387 src/summaryview.c:427
 msgid "/Redirec_t"
 msgstr "/_Omdirigér"
 
-#: src/mainwindow.c:2384
+#: src/mainwindow.c:2392
 msgid "Incorporate new mail"
 msgstr "Hent ny post"
 
-#: src/mainwindow.c:2386
+#: src/mainwindow.c:2394
 msgid "Incorporate new mail of all accounts"
 msgstr "Hent ny post fra alle konti"
 
-#: src/mainwindow.c:2388
+#: src/mainwindow.c:2396
 msgid "Send queued message(s)"
 msgstr "Sender meddelelse(r) i kø"
 
-#: src/mainwindow.c:2390
+#: src/mainwindow.c:2398
 msgid "Compose new message"
 msgstr "Opret ny meddelelse"
 
-#: src/mainwindow.c:2392
+#: src/mainwindow.c:2400
 msgid "Reply to the message"
 msgstr "Besvar meddelelse"
 
-#: src/mainwindow.c:2394
+#: src/mainwindow.c:2402
 msgid "Reply to all"
 msgstr "Svar til alle"
 
-#: src/mainwindow.c:2396
+#: src/mainwindow.c:2404
 msgid "Forward the message"
 msgstr "Videresend meddelelse"
 
-#: src/mainwindow.c:2398
+#: src/mainwindow.c:2406
 msgid "Delete the message"
 msgstr "Slet meddelelse"
 
-#: src/mainwindow.c:2400
+#: src/mainwindow.c:2408
 #, fuzzy
 msgid "Set as junk mail"
 msgstr "Standard konto"
 
-#: src/mainwindow.c:2402
+#: src/mainwindow.c:2410
 msgid "Execute marked process"
 msgstr "Udfør markéret process"
 
-#: src/mainwindow.c:2404
+#: src/mainwindow.c:2412
 msgid "Next unread message"
 msgstr "Næste ulæste"
 
-#: src/mainwindow.c:2406
+#: src/mainwindow.c:2414
 #, fuzzy
 msgid "Previous unread message"
 msgstr "Næste ulæste"
 
-#: src/mainwindow.c:2410
+#: src/mainwindow.c:2418
 #, fuzzy
 msgid "Print message"
 msgstr "Sende meddelelse"
 
-#: src/mainwindow.c:2412
+#: src/mainwindow.c:2420
 msgid "Common preferences"
 msgstr "Generelt opsæt"
 
-#: src/mainwindow.c:2414 src/prefs_account_dialog.c:511
+#: src/mainwindow.c:2422 src/prefs_account_dialog.c:511
 msgid "Account preferences"
 msgstr "Konto opsæt"
 
-#: src/mainwindow.c:2779
+#: src/mainwindow.c:2788
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 
-#: src/mainwindow.c:2790
+#: src/mainwindow.c:2799
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 
-#: src/mainwindow.c:3062
+#: src/mainwindow.c:3071
 msgid "Exit"
 msgstr "Afslut"
 
-#: src/mainwindow.c:3062
+#: src/mainwindow.c:3071
 msgid "Exit this program?"
 msgstr "Afslut program?"
 
-#: src/mainwindow.c:3666
+#: src/mainwindow.c:3675
 #, fuzzy
 msgid "Command line options"
 msgstr "Kommando linie ikke opsat."
 
-#: src/mainwindow.c:3679
+#: src/mainwindow.c:3688
 #, fuzzy
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Bruges som: %s [OPTION]...\n"
 
-#: src/mainwindow.c:3687
+#: src/mainwindow.c:3696
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -3834,7 +3839,7 @@ msgid ""
 "--version"
 msgstr ""
 
-#: src/mainwindow.c:3703
+#: src/mainwindow.c:3712
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
diff --git a/po/de.po b/po/de.po
index 5ca49e42..d3573e92 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: 2007-01-31 16:49+0900\n"
+"POT-Creation-Date: 2007-01-31 17:29+0900\n"
 "PO-Revision-Date: 2006-12-09 08:22+0100\n"
 "Last-Translator: Fridtjof Busse <fridtjof@fbunet.de>\n"
 "Language-Team: German <gnome-de@gnome.org>\n"
@@ -908,7 +908,7 @@ msgstr "/_Adresse/_Bearbeiten"
 msgid "/_Address/_Delete"
 msgstr "/_Adresse/_Löschen"
 
-#: src/addressbook.c:359 src/compose.c:673 src/mainwindow.c:787
+#: src/addressbook.c:359 src/compose.c:673 src/mainwindow.c:789
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Werkzeug"
@@ -917,12 +917,12 @@ msgstr "/_Werkzeug"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Werkzeug/Importiere _LDIF-Datei"
 
-#: src/addressbook.c:361 src/compose.c:694 src/mainwindow.c:841
+#: src/addressbook.c:361 src/compose.c:694 src/mainwindow.c:843
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Hilfe"
 
-#: src/addressbook.c:362 src/compose.c:695 src/mainwindow.c:853
+#: src/addressbook.c:362 src/compose.c:695 src/mainwindow.c:855
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Hilfe/_Über"
@@ -964,7 +964,7 @@ msgstr "/_Löschen"
 msgid "E-Mail address"
 msgstr "E-Mail Adresse"
 
-#: src/addressbook.c:496 src/compose.c:4873 src/mainwindow.c:2408
+#: src/addressbook.c:496 src/compose.c:4873 src/mainwindow.c:2416
 #: src/prefs_common_dialog.c:2274
 msgid "Address book"
 msgstr "Adressbuch"
@@ -1184,7 +1184,7 @@ msgstr "Allgemeine Adressen"
 msgid "Personal address"
 msgstr "Persönliche Adressen"
 
-#: src/alertpanel.c:142 src/compose.c:5717 src/main.c:638
+#: src/alertpanel.c:142 src/compose.c:5720 src/main.c:638
 msgid "Notice"
 msgstr "Notiz"
 
@@ -1351,9 +1351,9 @@ msgid "/_View/_Reply to"
 msgstr "/_Ansicht/A_ntwort an"
 
 #: src/compose.c:578 src/compose.c:580 src/compose.c:582 src/compose.c:584
-#: src/compose.c:587 src/mainwindow.c:577 src/mainwindow.c:580
-#: src/mainwindow.c:607 src/mainwindow.c:631 src/mainwindow.c:734
-#: src/mainwindow.c:738 src/messageview.c:258
+#: src/compose.c:587 src/mainwindow.c:579 src/mainwindow.c:582
+#: src/mainwindow.c:609 src/mainwindow.c:633 src/mainwindow.c:736
+#: src/mainwindow.c:740 src/messageview.c:258
 msgid "/_View/---"
 msgstr "/_Ansicht/---"
 
@@ -1374,7 +1374,7 @@ msgstr "/_Ansicht/An_hang"
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/_Ansicht/_Gehe zu/Anderer Ab_lage..."
 
-#: src/compose.c:593 src/mainwindow.c:638 src/messageview.c:173
+#: src/compose.c:593 src/mainwindow.c:640 src/messageview.c:173
 msgid "/_View/Character _encoding"
 msgstr "/_Ansicht/_Zeichensatz"
 
@@ -1385,112 +1385,112 @@ msgstr "/_Ansicht/_Zeichensatz/_Automatisch"
 #: src/compose.c:596 src/compose.c:602 src/compose.c:608 src/compose.c:612
 #: src/compose.c:620 src/compose.c:624 src/compose.c:630 src/compose.c:636
 #: src/compose.c:640 src/compose.c:650 src/compose.c:654 src/compose.c:662
-#: src/compose.c:666 src/mainwindow.c:634 src/mainwindow.c:641
+#: src/compose.c:666 src/mainwindow.c:636 src/mainwindow.c:643
 #: src/messageview.c:169
 msgid "/_View/Character _encoding/---"
 msgstr "/_Ansicht/_Zeichensatz/---"
 
-#: src/compose.c:598 src/mainwindow.c:642 src/messageview.c:177
+#: src/compose.c:598 src/mainwindow.c:644 src/messageview.c:177
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Ansicht/_Zeichensatz/7bit ascii (US-ASC_II)"
 
-#: src/compose.c:600 src/mainwindow.c:644 src/messageview.c:180
+#: src/compose.c:600 src/mainwindow.c:646 src/messageview.c:180
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Ansicht/_Zeichensatz/Unicode (_UTF-8)"
 
-#: src/compose.c:604 src/mainwindow.c:648 src/messageview.c:183
+#: src/compose.c:604 src/mainwindow.c:650 src/messageview.c:183
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Ansicht/_Zeichensatz/West Europa (ISO-8859-_1)"
 
-#: src/compose.c:606 src/mainwindow.c:650 src/messageview.c:185
+#: src/compose.c:606 src/mainwindow.c:652 src/messageview.c:185
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Ansicht/_Zeichensatz/West Europa (ISO-8859-15)"
 
-#: src/compose.c:610 src/mainwindow.c:656 src/messageview.c:190
+#: src/compose.c:610 src/mainwindow.c:658 src/messageview.c:190
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Ansicht/_Zeichensatz/Zentral Europa (ISO-8859-_2)"
 
-#: src/compose.c:614 src/mainwindow.c:660 src/messageview.c:193
+#: src/compose.c:614 src/mainwindow.c:662 src/messageview.c:193
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Ansicht/_Zeichensatz/_Baltisch (ISO-8859-13)"
 
-#: src/compose.c:616 src/mainwindow.c:662 src/messageview.c:195
+#: src/compose.c:616 src/mainwindow.c:664 src/messageview.c:195
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Ansicht/_Zeichensatz/Baltisch (ISO-8859-_4)"
 
-#: src/compose.c:618 src/mainwindow.c:664 src/messageview.c:197
+#: src/compose.c:618 src/mainwindow.c:666 src/messageview.c:197
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/_Ansicht/_Zeichensatz/Baltisch (Windows-1257)"
 
-#: src/compose.c:622 src/mainwindow.c:668 src/messageview.c:200
+#: src/compose.c:622 src/mainwindow.c:670 src/messageview.c:200
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Ansicht/_Zeichensatz/Griechisch (ISO-8859-_7)"
 
-#: src/compose.c:626 src/mainwindow.c:672 src/messageview.c:203
+#: src/compose.c:626 src/mainwindow.c:674 src/messageview.c:203
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/_Ansicht/_Zeichensatz/Arabisch (ISO-8859-_6)"
 
-#: src/compose.c:628 src/mainwindow.c:674 src/messageview.c:205
+#: src/compose.c:628 src/mainwindow.c:676 src/messageview.c:205
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/_Ansicht/_Zeichensatz/Arabisch (Windows-1256)"
 
-#: src/compose.c:632 src/mainwindow.c:678 src/messageview.c:208
+#: src/compose.c:632 src/mainwindow.c:680 src/messageview.c:208
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Ansicht/_Zeichensatz/Griechisch (ISO-8859-_7)"
 
-#: src/compose.c:634 src/mainwindow.c:680 src/messageview.c:210
+#: src/compose.c:634 src/mainwindow.c:682 src/messageview.c:210
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Ansicht/_Zeichensatz/Hebräisch (Windows-1255)"
 
-#: src/compose.c:638 src/mainwindow.c:684 src/messageview.c:213
+#: src/compose.c:638 src/mainwindow.c:686 src/messageview.c:213
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Ansicht/_Zeichensatz/Türkisch (ISO-8859-_9)"
 
-#: src/compose.c:642 src/mainwindow.c:688 src/messageview.c:216
+#: src/compose.c:642 src/mainwindow.c:690 src/messageview.c:216
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Ansicht/_Zeichensatz/Kyrillisch (ISO-8859-_5)"
 
-#: src/compose.c:644 src/mainwindow.c:690 src/messageview.c:218
+#: src/compose.c:644 src/mainwindow.c:692 src/messageview.c:218
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Ansicht/_Zeichensatz/Kyrillisch (KOI8-_R)"
 
-#: src/compose.c:646 src/mainwindow.c:692 src/messageview.c:220
+#: src/compose.c:646 src/mainwindow.c:694 src/messageview.c:220
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Ansicht/_Zeichensatz/Kyrillisch (KOI8-_U)"
 
-#: src/compose.c:648 src/mainwindow.c:694 src/messageview.c:222
+#: src/compose.c:648 src/mainwindow.c:696 src/messageview.c:222
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Ansicht/_Zeichensatz/Kyrillisch (Windows-1251)"
 
-#: src/compose.c:652 src/mainwindow.c:698 src/messageview.c:225
+#: src/compose.c:652 src/mainwindow.c:700 src/messageview.c:225
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Ansicht/_Zeichensatz/Japanisch (ISO-2022-_JP)"
 
-#: src/compose.c:656 src/mainwindow.c:708 src/messageview.c:234
+#: src/compose.c:656 src/mainwindow.c:710 src/messageview.c:234
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Ansicht/_Zeichensatz/Einfaches Chinesisch (_GB2312)"
 
-#: src/compose.c:658 src/mainwindow.c:710 src/messageview.c:236
+#: src/compose.c:658 src/mainwindow.c:712 src/messageview.c:236
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Ansicht/_Zeichensatz/Einfaches Chinesisch (_GB2312)"
 
-#: src/compose.c:660 src/mainwindow.c:712 src/messageview.c:238
+#: src/compose.c:660 src/mainwindow.c:714 src/messageview.c:238
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Ansicht/_Zeichensatz/Traditionelles Chinesisch (_Big5)"
 
-#: src/compose.c:664 src/mainwindow.c:720 src/messageview.c:245
+#: src/compose.c:664 src/mainwindow.c:722 src/messageview.c:245
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Ansicht/_Zeichensatz/Koreanisch (EUC-_KR)"
 
-#: src/compose.c:668 src/mainwindow.c:726 src/messageview.c:250
+#: src/compose.c:668 src/mainwindow.c:728 src/messageview.c:250
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Ansicht/_Zeichensatz/Thai (TIS-620)"
 
-#: src/compose.c:670 src/mainwindow.c:728 src/messageview.c:252
+#: src/compose.c:670 src/mainwindow.c:730 src/messageview.c:252
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Ansicht/_Zeichensatz/Thai (Windows-874)"
 
-#: src/compose.c:674 src/mainwindow.c:788 src/messageview.c:283
+#: src/compose.c:674 src/mainwindow.c:790 src/messageview.c:283
 msgid "/_Tools/_Address book"
 msgstr "/_Werkzeug/_Adressbuch"
 
@@ -1498,13 +1498,13 @@ msgstr "/_Werkzeug/_Adressbuch"
 msgid "/_Tools/_Template"
 msgstr "/_Werkzeug/_Schablone"
 
-#: src/compose.c:677 src/mainwindow.c:812 src/messageview.c:299
+#: src/compose.c:677 src/mainwindow.c:814 src/messageview.c:299
 msgid "/_Tools/Actio_ns"
 msgstr "/_Werkzeug/Aktio_nen"
 
-#: src/compose.c:679 src/compose.c:683 src/compose.c:689 src/mainwindow.c:791
-#: src/mainwindow.c:805 src/mainwindow.c:810 src/mainwindow.c:813
-#: src/mainwindow.c:817 src/mainwindow.c:819 src/messageview.c:286
+#: src/compose.c:679 src/compose.c:683 src/compose.c:689 src/mainwindow.c:793
+#: src/mainwindow.c:807 src/mainwindow.c:812 src/mainwindow.c:815
+#: src/mainwindow.c:819 src/mainwindow.c:821 src/messageview.c:286
 #: src/messageview.c:298
 msgid "/_Tools/---"
 msgstr "/_Werkzeug/---"
@@ -1710,7 +1710,7 @@ msgstr "PGP Unterschreiben"
 msgid "PGP Encrypt"
 msgstr "PGP Verschlüsseln"
 
-#: src/compose.c:4442 src/compose.c:5543
+#: src/compose.c:4442 src/compose.c:5546
 msgid "MIME type"
 msgstr "MIME-Typ"
 
@@ -1752,36 +1752,36 @@ msgstr "Bearbeiten mit externem Editor"
 msgid "Wrap all long lines"
 msgstr "Alle langen Zeilen umbrechen"
 
-#: src/compose.c:5439
+#: src/compose.c:5442
 msgid "Invalid MIME type."
 msgstr "Ungültiger MIME Typ"
 
-#: src/compose.c:5457
+#: src/compose.c:5460
 msgid "File doesn't exist or is empty."
 msgstr "Datei existiert nicht oder ist leer."
 
-#: src/compose.c:5525
+#: src/compose.c:5528
 msgid "Properties"
 msgstr "Eigenschaften"
 
-#: src/compose.c:5545 src/prefs_common_dialog.c:1504
+#: src/compose.c:5548 src/prefs_common_dialog.c:1504
 msgid "Encoding"
 msgstr "Zeichensatzkodierung"
 
-#: src/compose.c:5568 src/prefs_folder_item.c:202
+#: src/compose.c:5571 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Pfad"
 
-#: src/compose.c:5569
+#: src/compose.c:5572
 msgid "File name"
 msgstr "Dateiname"
 
-#: src/compose.c:5659
+#: src/compose.c:5662
 #, 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:5714
+#: src/compose.c:5717
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1790,48 +1790,48 @@ msgstr ""
 "Der externe Editor arbeitet noch.\n"
 "Prozess terminieren (pid: %d)?\n"
 
-#: src/compose.c:6040 src/mainwindow.c:2752
+#: src/compose.c:6043 src/mainwindow.c:2761
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:6156 src/compose.c:6161 src/compose.c:6167
+#: src/compose.c:6159 src/compose.c:6164 src/compose.c:6170
 msgid "Can't queue the message."
 msgstr "Nachricht kann nicht eingereiht werden."
 
-#: src/compose.c:6258
+#: src/compose.c:6261
 msgid "Select files"
 msgstr "Wähle Datei(en)"
 
-#: src/compose.c:6281
+#: src/compose.c:6284
 msgid "Select file"
 msgstr "Wähle Datei"
 
-#: src/compose.c:6316
+#: src/compose.c:6319
 msgid "Save message"
 msgstr "Speichern der Nachricht"
 
-#: src/compose.c:6317
+#: src/compose.c:6320
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Diese Nachricht wurde geändert. Speichern als Entwurf?"
 
-#: src/compose.c:6319
+#: src/compose.c:6322
 msgid "Close _without saving"
 msgstr "Schließen _ohne Speichern"
 
-#: src/compose.c:6361
+#: src/compose.c:6364
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Wollen Sie die Schablone '%s' übernehmen ?"
 
-#: src/compose.c:6363
+#: src/compose.c:6366
 msgid "Apply template"
 msgstr "Schablone übernehmen"
 
-#: src/compose.c:6364
+#: src/compose.c:6367
 msgid "_Replace"
 msgstr "E_rsetzen"
 
-#: src/compose.c:6364
+#: src/compose.c:6367
 msgid "_Insert"
 msgstr "_Einfügen"
 
@@ -2286,12 +2286,12 @@ msgstr "Setze Ablageinformation...\n"
 msgid "Setting folder info..."
 msgstr "Setze Ablageinformation..."
 
-#: src/folderview.c:868 src/mainwindow.c:3748 src/setup.c:80
+#: src/folderview.c:868 src/mainwindow.c:3757 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Durchsuche Ablage %s%c%s ..."
 
-#: src/folderview.c:872 src/mainwindow.c:3753 src/setup.c:85
+#: src/folderview.c:872 src/mainwindow.c:3762 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Durchsuche Ablage %s ..."
@@ -3053,535 +3053,540 @@ msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/_Ansicht/Zeigen oder _Verstecken/_Werkzeugleiste/Bilder _und Text"
 
 #: src/mainwindow.c:566
-msgid "/_View/Show or hi_de/_Toolbar/_Icon"
+#, fuzzy
+msgid "/_View/Show or hi_de/_Toolbar/Text at the _right of icon"
 msgstr "/_Ansicht/Zeigen oder _Verstecken/_Werkzeugleiste/_Bilder"
 
 #: src/mainwindow.c:568
+msgid "/_View/Show or hi_de/_Toolbar/_Icon"
+msgstr "/_Ansicht/Zeigen oder _Verstecken/_Werkzeugleiste/_Bilder"
+
+#: src/mainwindow.c:570
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/_Ansicht/Zeigen oder _Verstecken/_Werkzeugleiste/_Text"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:572
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/_Ansicht/Zeigen oder _Verstecken/_Werkzeugleiste/_Nichts"
 
-#: src/mainwindow.c:572
+#: src/mainwindow.c:574
 msgid "/_View/Show or hi_de/_Search bar"
 msgstr "/_Ansicht/Zeigen oder _Verstecken/_Suchleiste"
 
-#: src/mainwindow.c:574
+#: src/mainwindow.c:576
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/_Ansicht/Zeigen oder _Verstecken/_Statuszeile"
 
-#: src/mainwindow.c:576
+#: src/mainwindow.c:578
 #, fuzzy
 msgid "/_View/_Customize toolbar..."
 msgstr "/_Ansicht/_Gehe zu/Anderer Ab_lage..."
 
-#: src/mainwindow.c:578
+#: src/mainwindow.c:580
 msgid "/_View/Separate f_older tree"
 msgstr "/_Ansicht/Einzelner _Ablagebaum"
 
-#: src/mainwindow.c:579
+#: src/mainwindow.c:581
 msgid "/_View/Separate _message view"
 msgstr "/_Ansicht/Einzelne _Nachrichtenansicht"
 
-#: src/mainwindow.c:581
+#: src/mainwindow.c:583
 msgid "/_View/_Sort"
 msgstr "/_Ansicht/_Sortieren"
 
-#: src/mainwindow.c:582
+#: src/mainwindow.c:584
 msgid "/_View/_Sort/by _number"
 msgstr "/_Ansicht/_Sortieren/nach _Nummer"
 
-#: src/mainwindow.c:583
+#: src/mainwindow.c:585
 msgid "/_View/_Sort/by s_ize"
 msgstr "/_Ansicht/_Sortieren/nach _Größe"
 
-#: src/mainwindow.c:584
+#: src/mainwindow.c:586
 msgid "/_View/_Sort/by _date"
 msgstr "/_Ansicht/_Sortieren/nach _Datum"
 
-#: src/mainwindow.c:585
+#: src/mainwindow.c:587
 msgid "/_View/_Sort/by t_hread date"
 msgstr "/_Ansicht/_Sortieren/nach _Threaddatum"
 
-#: src/mainwindow.c:586
+#: src/mainwindow.c:588
 msgid "/_View/_Sort/by _from"
 msgstr "/_Ansicht/_Sortieren/nach _Absender"
 
-#: src/mainwindow.c:587
+#: src/mainwindow.c:589
 msgid "/_View/_Sort/by _recipient"
 msgstr "/_Ansicht/_Sortieren/nach _Sender"
 
-#: src/mainwindow.c:588
+#: src/mainwindow.c:590
 msgid "/_View/_Sort/by _subject"
 msgstr "/_Ansicht/_Sortieren/nach _Betreff"
 
-#: src/mainwindow.c:589
+#: src/mainwindow.c:591
 msgid "/_View/_Sort/by _color label"
 msgstr "/_Ansicht/_Sortieren/nach _Farbetikett"
 
-#: src/mainwindow.c:591
+#: src/mainwindow.c:593
 msgid "/_View/_Sort/by _mark"
 msgstr "/_Ansicht/_Sortieren/nach _Markierung"
 
-#: src/mainwindow.c:592
+#: src/mainwindow.c:594
 msgid "/_View/_Sort/by _unread"
 msgstr "/_Ansicht/_Sortieren/nach _Ungelesen"
 
-#: src/mainwindow.c:593
+#: src/mainwindow.c:595
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/_Ansicht/_Sortieren/nach An_hang"
 
-#: src/mainwindow.c:595
+#: src/mainwindow.c:597
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/_Ansicht/_Sortieren/Nicht S_ortieren"
 
-#: src/mainwindow.c:596 src/mainwindow.c:599
+#: src/mainwindow.c:598 src/mainwindow.c:601
 msgid "/_View/_Sort/---"
 msgstr "/_Ansicht/_Sortieren/---"
 
-#: src/mainwindow.c:597
+#: src/mainwindow.c:599
 msgid "/_View/_Sort/Ascending"
 msgstr "/_Ansicht/_Sortieren/Aufsteigend"
 
-#: src/mainwindow.c:598
+#: src/mainwindow.c:600
 msgid "/_View/_Sort/Descending"
 msgstr "/_Ansicht/_Sortieren/Absteigend"
 
-#: src/mainwindow.c:600
+#: src/mainwindow.c:602
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/_Ansicht/_Sortieren/Threads nach Betreff _aufbauen"
 
-#: src/mainwindow.c:602
+#: src/mainwindow.c:604
 msgid "/_View/Th_read view"
 msgstr "/_Ansicht/_Threads einschalten"
 
-#: src/mainwindow.c:603
+#: src/mainwindow.c:605
 msgid "/_View/E_xpand all threads"
 msgstr "/_Ansicht/Alle Threads entfalten"
 
-#: src/mainwindow.c:604
+#: src/mainwindow.c:606
 msgid "/_View/Co_llapse all threads"
 msgstr "/_Ansicht/Alle Threads zusammenfalten"
 
-#: src/mainwindow.c:605
+#: src/mainwindow.c:607
 msgid "/_View/Set display _item..."
 msgstr "/_Ansicht/Anzuzeigende _Informationen setzen..."
 
-#: src/mainwindow.c:608
+#: src/mainwindow.c:610
 msgid "/_View/_Go to"
 msgstr "/_Ansicht/Gehe _zu"
 
-#: src/mainwindow.c:609
+#: src/mainwindow.c:611
 msgid "/_View/_Go to/_Prev message"
 msgstr "/_Ansicht/Gehe _zu/_Vorheriger Nachricht"
 
-#: src/mainwindow.c:610
+#: src/mainwindow.c:612
 msgid "/_View/_Go to/_Next message"
 msgstr "/_Ansicht/Gehe _zu/_Nächster Nachricht"
 
-#: src/mainwindow.c:611 src/mainwindow.c:616 src/mainwindow.c:619
-#: src/mainwindow.c:624 src/mainwindow.c:629
+#: src/mainwindow.c:613 src/mainwindow.c:618 src/mainwindow.c:621
+#: src/mainwindow.c:626 src/mainwindow.c:631
 msgid "/_View/_Go to/---"
 msgstr "/_Ansicht/_Gehe _zu/---"
 
-#: src/mainwindow.c:612
+#: src/mainwindow.c:614
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/_Ansicht/Gehe _zu/V_orheriger ungelesener Nachricht"
 
-#: src/mainwindow.c:614
+#: src/mainwindow.c:616
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/_Ansicht/Gehe _zu/N_ächster ungelesener Nachricht"
 
-#: src/mainwindow.c:617
+#: src/mainwindow.c:619
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/_Ansicht/Gehe _zu/Vorheriger ne_uer Nachricht"
 
-#: src/mainwindow.c:618
+#: src/mainwindow.c:620
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/_Ansicht/Gehe _zu/Nächster _neuer Nachricht"
 
-#: src/mainwindow.c:620
+#: src/mainwindow.c:622
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/_Ansicht/Gehe _zu/Vorheriger _markierter Nachricht"
 
-#: src/mainwindow.c:622
+#: src/mainwindow.c:624
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/_Ansicht/Gehe _zu/Nächster m_arkierter Nachricht"
 
-#: src/mainwindow.c:625
+#: src/mainwindow.c:627
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/_Ansicht/Gehe _zu/Vorheriger _etikettierter Nachricht"
 
-#: src/mainwindow.c:627
+#: src/mainwindow.c:629
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/_Ansicht/Gehe _zu/Nächster e_tikettierter Nachricht"
 
-#: src/mainwindow.c:630
+#: src/mainwindow.c:632
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Ansicht/_Gehe zu/Anderer Ab_lage..."
 
-#: src/mainwindow.c:639 src/messageview.c:174
+#: src/mainwindow.c:641 src/messageview.c:174
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Ansicht/_Zeichensatz/_Automatische Erkennung"
 
-#: src/mainwindow.c:652 src/messageview.c:187
+#: src/mainwindow.c:654 src/messageview.c:187
 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr "/_Ansicht/_Zeichensatz/West Europa (Windows-1252)"
 
-#: src/mainwindow.c:700 src/messageview.c:227
+#: src/mainwindow.c:702 src/messageview.c:227
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Ansicht/_Zeichensatz/Japanisch (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:702 src/messageview.c:229
+#: src/mainwindow.c:704 src/messageview.c:229
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Ansicht/_Zeichensatz/Japanisch (_EUC-JP)"
 
-#: src/mainwindow.c:704 src/messageview.c:231
+#: src/mainwindow.c:706 src/messageview.c:231
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Ansicht/_Zeichensatz/Japanisch (_Shift_JIS)"
 
-#: src/mainwindow.c:714 src/messageview.c:240
+#: src/mainwindow.c:716 src/messageview.c:240
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Ansicht/_Zeichensatz/Traditionelles Chinesisch (EUC-_TW)"
 
-#: src/mainwindow.c:716 src/messageview.c:242
+#: src/mainwindow.c:718 src/messageview.c:242
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Ansicht/_Zeichensatz/Chinesisch (ISO-2022-_CN)"
 
-#: src/mainwindow.c:722 src/messageview.c:247
+#: src/mainwindow.c:724 src/messageview.c:247
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Ansicht/_Zeichensatz/Koreanisch (ISO-2022-KR)"
 
-#: src/mainwindow.c:735 src/summaryview.c:464
+#: src/mainwindow.c:737 src/summaryview.c:464
 msgid "/_View/Open in new _window"
 msgstr "/_Ansicht/Öffnen in _neuem Fenster"
 
-#: src/mainwindow.c:736 src/messageview.c:259 src/summaryview.c:466
+#: src/mainwindow.c:738 src/messageview.c:259 src/summaryview.c:466
 msgid "/_View/Mess_age source"
 msgstr "/_Ansicht/Nachrichten_quelle"
 
-#: src/mainwindow.c:737 src/messageview.c:260 src/summaryview.c:467
+#: src/mainwindow.c:739 src/messageview.c:260 src/summaryview.c:467
 msgid "/_View/All _headers"
 msgstr "/_Ansicht/_Alle Kopfzeilen anzeigen"
 
-#: src/mainwindow.c:739
+#: src/mainwindow.c:741
 msgid "/_View/_Update summary"
 msgstr "/_Ansicht/Akt_ualisiere Ablageninhalt"
 
-#: src/mainwindow.c:741 src/messageview.c:263
+#: src/mainwindow.c:743 src/messageview.c:263
 msgid "/_Message"
 msgstr "/_Nachricht"
 
-#: src/mainwindow.c:742
+#: src/mainwindow.c:744
 msgid "/_Message/Recei_ve"
 msgstr "/_Nachricht/Empfang"
 
-#: src/mainwindow.c:743
+#: src/mainwindow.c:745
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/_Nachricht/Empfang/Empfange vom aktuellen Account"
 
-#: src/mainwindow.c:745
+#: src/mainwindow.c:747
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/_Nachricht/Empfang/Empfange von _allen Accounts"
 
-#: src/mainwindow.c:747
+#: src/mainwindow.c:749
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/_Nachricht/Empfang/Empfan_g abbrechen"
 
-#: src/mainwindow.c:749
+#: src/mainwindow.c:751
 msgid "/_Message/Recei_ve/---"
 msgstr "/_Nachricht/Empfang/---"
 
-#: src/mainwindow.c:750
+#: src/mainwindow.c:752
 msgid "/_Message/_Send queued messages"
 msgstr "/_Nachricht/Sende _wartende Nachrichten"
 
-#: src/mainwindow.c:751 src/mainwindow.c:753 src/mainwindow.c:760
-#: src/mainwindow.c:765 src/mainwindow.c:768 src/mainwindow.c:779
-#: src/mainwindow.c:781 src/mainwindow.c:784 src/messageview.c:266
+#: src/mainwindow.c:753 src/mainwindow.c:755 src/mainwindow.c:762
+#: src/mainwindow.c:767 src/mainwindow.c:770 src/mainwindow.c:781
+#: src/mainwindow.c:783 src/mainwindow.c:786 src/messageview.c:266
 #: src/messageview.c:274 src/messageview.c:279
 msgid "/_Message/---"
 msgstr "/_Nachricht/---"
 
-#: src/mainwindow.c:752 src/messageview.c:264
+#: src/mainwindow.c:754 src/messageview.c:264
 msgid "/_Message/Compose _new message"
 msgstr "/_Nachricht/Verfasse n_eue Nachricht"
 
-#: src/mainwindow.c:754 src/messageview.c:267
+#: src/mainwindow.c:756 src/messageview.c:267
 msgid "/_Message/_Reply"
 msgstr "/_Nachricht/An_twort"
 
-#: src/mainwindow.c:755
+#: src/mainwindow.c:757
 msgid "/_Message/Repl_y to"
 msgstr "/_Nachricht/Ant_wort an"
 
-#: src/mainwindow.c:756 src/messageview.c:268
+#: src/mainwindow.c:758 src/messageview.c:268
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Nachricht/Ant_wort an/_Alle"
 
-#: src/mainwindow.c:757 src/messageview.c:270
+#: src/mainwindow.c:759 src/messageview.c:270
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Nachricht/Ant_wort an/Ab_sender"
 
-#: src/mainwindow.c:758 src/messageview.c:272
+#: src/mainwindow.c:760 src/messageview.c:272
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Nachricht/Ant_wort an/Mailing-_Liste"
 
-#: src/mainwindow.c:761 src/messageview.c:275
+#: src/mainwindow.c:763 src/messageview.c:275
 msgid "/_Message/_Forward"
 msgstr "/_Nachricht/We_iterleiten"
 
-#: src/mainwindow.c:762 src/messageview.c:276
+#: src/mainwindow.c:764 src/messageview.c:276
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Nachricht/Weiterleiten als An_hang"
 
-#: src/mainwindow.c:764 src/messageview.c:278
+#: src/mainwindow.c:766 src/messageview.c:278
 msgid "/_Message/Redirec_t"
 msgstr "/_Nachricht/_Umadressieren"
 
-#: src/mainwindow.c:766
+#: src/mainwindow.c:768
 msgid "/_Message/M_ove..."
 msgstr "/_Nachricht/_Verschieben..."
 
-#: src/mainwindow.c:767
+#: src/mainwindow.c:769
 msgid "/_Message/_Copy..."
 msgstr "/_Nachricht/_Kopieren..."
 
-#: src/mainwindow.c:769
+#: src/mainwindow.c:771
 msgid "/_Message/_Mark"
 msgstr "/_Nachricht/_Markieren"
 
-#: src/mainwindow.c:770
+#: src/mainwindow.c:772
 msgid "/_Message/_Mark/_Mark"
 msgstr "/_Nachricht/_Markieren/_Markieren"
 
-#: src/mainwindow.c:771
+#: src/mainwindow.c:773
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/_Nachricht/_Markieren/Markierung _entfernen"
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:774
 msgid "/_Message/_Mark/---"
 msgstr "/_Nachricht/_Markieren/---"
 
-#: src/mainwindow.c:773
+#: src/mainwindow.c:775
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/_Nachricht/_Markieren/Als _ungelesen"
 
-#: src/mainwindow.c:774
+#: src/mainwindow.c:776
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/_Nachricht/_Markieren/Als _gelesen"
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:778
 msgid "/_Message/_Mark/Mark _thread as read"
 msgstr "/_Nachricht/_Markieren/_Thread als gelesen markieren"
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:780
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/_Nachricht/_Markieren/Alle _als gelesen"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:782
 msgid "/_Message/_Delete"
 msgstr "/_Nachricht/_Löschen"
 
-#: src/mainwindow.c:782
+#: src/mainwindow.c:784
 msgid "/_Message/Set as _junk mail"
 msgstr "/_Nachricht/Markiere als Spam-Mail"
 
-#: src/mainwindow.c:783
+#: src/mainwindow.c:785
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/_Nachricht/Markiere als Nicht-Spam-Mail"
 
-#: src/mainwindow.c:785 src/messageview.c:280
+#: src/mainwindow.c:787 src/messageview.c:280
 msgid "/_Message/Re-_edit"
 msgstr "/_Nachricht/Wieder_bearbeiten"
 
-#: src/mainwindow.c:789
+#: src/mainwindow.c:791
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/_Werkzeug/Absender in Adress_buch einfügen"
 
-#: src/mainwindow.c:792
+#: src/mainwindow.c:794
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/_Werkzeug/Alle Nachrichten einer Ablage _filtern"
 
-#: src/mainwindow.c:794
+#: src/mainwindow.c:796
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Werkzeug/Aus_gewählte Nachrichten filtern"
 
-#: src/mainwindow.c:796 src/messageview.c:287
+#: src/mainwindow.c:798 src/messageview.c:287
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Werkzeug/Filter _erstellen"
 
-#: src/mainwindow.c:797 src/messageview.c:289
+#: src/mainwindow.c:799 src/messageview.c:289
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Werkzeug/Filter _erstellen/_Automatisch"
 
-#: src/mainwindow.c:799 src/messageview.c:291
+#: src/mainwindow.c:801 src/messageview.c:291
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Werkzeug/Filter _erstellen/nach _Von"
 
-#: src/mainwindow.c:801 src/messageview.c:293
+#: src/mainwindow.c:803 src/messageview.c:293
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Werkzeug/Filter _erstellen/nach A_n"
 
-#: src/mainwindow.c:803 src/messageview.c:295
+#: src/mainwindow.c:805 src/messageview.c:295
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Werkzeug/Filter _erstellen/nach _Betreff"
 
-#: src/mainwindow.c:806
+#: src/mainwindow.c:808
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/_Werkzeug/Nachrichten einer Ablage nach Spams _filtern"
 
-#: src/mainwindow.c:808
+#: src/mainwindow.c:810
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/_Werkzeug/Aus_gewählte Nachrichten nach Spams filtern"
 
-#: src/mainwindow.c:815
+#: src/mainwindow.c:817
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/_Werkzeug/_Lösche mehrfach vorhandene Nachrichten"
 
-#: src/mainwindow.c:818
+#: src/mainwindow.c:820
 #, fuzzy
 msgid "/_Tools/E_xecute marked process"
 msgstr "Markierten Prozess ausführen"
 
-#: src/mainwindow.c:820
+#: src/mainwindow.c:822
 msgid "/_Tools/_Log window"
 msgstr "/_Werkzeug/L_ogbuch-Fenster"
 
-#: src/mainwindow.c:822
+#: src/mainwindow.c:824
 msgid "/_Configuration"
 msgstr "/_Einstellungen"
 
-#: src/mainwindow.c:823
+#: src/mainwindow.c:825
 msgid "/_Configuration/_Common preferences..."
 msgstr "/_Einstellungen/Allgemeine _Einstellungen..."
 
-#: src/mainwindow.c:825
+#: src/mainwindow.c:827
 msgid "/_Configuration/_Filter setting..."
 msgstr "/_Einstellungen/_Filtereinstellungen..."
 
-#: src/mainwindow.c:827
+#: src/mainwindow.c:829
 msgid "/_Configuration/_Template..."
 msgstr "/_Einstellungen/_Schablone..."
 
-#: src/mainwindow.c:829
+#: src/mainwindow.c:831
 msgid "/_Configuration/_Actions..."
 msgstr "/_Einstellungen/Aktionen..."
 
-#: src/mainwindow.c:831
+#: src/mainwindow.c:833
 msgid "/_Configuration/---"
 msgstr "/_Einstellungen/---"
 
-#: src/mainwindow.c:832
+#: src/mainwindow.c:834
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Einstellungen/_Einstellungen für den aktuellen Account..."
 
-#: src/mainwindow.c:834
+#: src/mainwindow.c:836
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Einstellungen/_Neuen Account erstellen..."
 
-#: src/mainwindow.c:836
+#: src/mainwindow.c:838
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Einstellungen/Accounts _bearbeiten..."
 
-#: src/mainwindow.c:838
+#: src/mainwindow.c:840
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Einstellungen/Aktuellen Account _wechseln..."
 
-#: src/mainwindow.c:842
+#: src/mainwindow.c:844
 msgid "/_Help/_Manual"
 msgstr "/_Hilfe/_Anleitung"
 
-#: src/mainwindow.c:843
+#: src/mainwindow.c:845
 msgid "/_Help/_Manual/_English"
 msgstr "/_Hilfe/Anleitung/_English"
 
-#: src/mainwindow.c:844
+#: src/mainwindow.c:846
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/_Hilfe/Anleitung/_Japanese"
 
-#: src/mainwindow.c:845
+#: src/mainwindow.c:847
 msgid "/_Help/_FAQ"
 msgstr "/_Hilfe/_FAQ"
 
-#: src/mainwindow.c:846
+#: src/mainwindow.c:848
 msgid "/_Help/_FAQ/_English"
 msgstr "/_Hilfe/_FAQ/_English"
 
-#: src/mainwindow.c:847
+#: src/mainwindow.c:849
 msgid "/_Help/_FAQ/_German"
 msgstr "/_Hilfe/_FAQ/_German"
 
-#: src/mainwindow.c:848
+#: src/mainwindow.c:850
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/_Hilfe/_FAQ/_Spanish"
 
-#: src/mainwindow.c:849
+#: src/mainwindow.c:851
 msgid "/_Help/_FAQ/_French"
 msgstr "/_Hilfe/_FAQ/_French"
 
-#: src/mainwindow.c:850
+#: src/mainwindow.c:852
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/_Hilfe/_FAQ/_Italian"
 
-#: src/mainwindow.c:851
+#: src/mainwindow.c:853
 msgid "/_Help/_Command line options"
 msgstr "/_Hilfe/_Kommandozeilenoptionen"
 
-#: src/mainwindow.c:852
+#: src/mainwindow.c:854
 msgid "/_Help/---"
 msgstr "/_Hilfe/---"
 
-#: src/mainwindow.c:895
+#: src/mainwindow.c:897
 msgid "Creating main window...\n"
 msgstr "Erstelle Hauptfenster...\n"
 
-#: src/mainwindow.c:1071
+#: src/mainwindow.c:1073
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Haupt-Fenster: Bereitstellung von Farbe %d fehlgeschlagen\n"
 
-#: src/mainwindow.c:1175 src/summaryview.c:2387 src/summaryview.c:2472
+#: src/mainwindow.c:1181 src/summaryview.c:2387 src/summaryview.c:2472
 #: src/summaryview.c:4009 src/summaryview.c:4138 src/summaryview.c:4507
 msgid "done.\n"
 msgstr "Fertig.\n"
 
-#: src/mainwindow.c:1293 src/mainwindow.c:1334 src/mainwindow.c:1359
+#: src/mainwindow.c:1299 src/mainwindow.c:1340 src/mainwindow.c:1365
 msgid "Untitled"
 msgstr "Unbenannt"
 
-#: src/mainwindow.c:1360
+#: src/mainwindow.c:1366
 msgid "none"
 msgstr "nicht"
 
-#: src/mainwindow.c:1413
+#: src/mainwindow.c:1419
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "Wechsle Fenstertrennungstyp von %d zu %d\n"
 
-#: src/mainwindow.c:1663
+#: src/mainwindow.c:1669
 msgid "Offline"
 msgstr "Verbindungslos"
 
-#: src/mainwindow.c:1664
+#: src/mainwindow.c:1670
 msgid "You are offline. Go online?"
 msgstr "Sie sind nicht verbunden. Verbinden?"
 
-#: src/mainwindow.c:1681
+#: src/mainwindow.c:1687
 msgid "Empty all trash"
 msgstr "Leere alle Papierkörbe"
 
-#: src/mainwindow.c:1682
+#: src/mainwindow.c:1688
 msgid "Delete all messages in trash folders?"
 msgstr "Lösche alle Nachrichten in den Papierkörben?"
 
-#: src/mainwindow.c:1712
+#: src/mainwindow.c:1718
 msgid "Add mailbox"
 msgstr "Neue Mailbox"
 
-#: src/mainwindow.c:1713
+#: src/mainwindow.c:1719
 msgid ""
 "Specify the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3591,16 +3596,16 @@ msgstr ""
 "Wenn die existierende Mailbox angegeben wurde, wird\n"
 "sie automatisch durchsucht."
 
-#: src/mainwindow.c:1719 src/setup.c:49
+#: src/mainwindow.c:1725 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Die Mailbox `%s' existiert bereits."
 
-#: src/mainwindow.c:1724 src/setup.c:56
+#: src/mainwindow.c:1730 src/setup.c:56
 msgid "Mailbox"
 msgstr "Mailbox"
 
-#: src/mainwindow.c:1730 src/setup.c:62
+#: src/mainwindow.c:1736 src/setup.c:62
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3609,129 +3614,129 @@ msgstr ""
 "Erstellen der Mailbox fehlgeschlagen.\n"
 "Vielleicht existieren einige Dateien, oder Sie haben keine Schreibrechte"
 
-#: src/mainwindow.c:2198
+#: src/mainwindow.c:2206
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Ablagenansicht"
 
-#: src/mainwindow.c:2217
+#: src/mainwindow.c:2225
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Nachrichtenansicht"
 
-#: src/mainwindow.c:2369 src/summaryview.c:418
+#: src/mainwindow.c:2377 src/summaryview.c:418
 msgid "/_Reply"
 msgstr "/An_twort"
 
-#: src/mainwindow.c:2370
+#: src/mainwindow.c:2378
 msgid "/Reply to _all"
 msgstr "/Antwort an alle"
 
-#: src/mainwindow.c:2371
+#: src/mainwindow.c:2379
 msgid "/Reply to _sender"
 msgstr "/Ant_wort an Ab_sender"
 
-#: src/mainwindow.c:2372
+#: src/mainwindow.c:2380
 msgid "/Reply to mailing _list"
 msgstr "/Antwort an Mailing-_Liste"
 
-#: src/mainwindow.c:2377 src/summaryview.c:425
+#: src/mainwindow.c:2385 src/summaryview.c:425
 msgid "/_Forward"
 msgstr "/_Weiterleiten"
 
-#: src/mainwindow.c:2378 src/summaryview.c:426
+#: src/mainwindow.c:2386 src/summaryview.c:426
 msgid "/For_ward as attachment"
 msgstr "/Weiterleiten als An_hang"
 
-#: src/mainwindow.c:2379 src/summaryview.c:427
+#: src/mainwindow.c:2387 src/summaryview.c:427
 msgid "/Redirec_t"
 msgstr "/_Umadressieren"
 
-#: src/mainwindow.c:2384
+#: src/mainwindow.c:2392
 msgid "Incorporate new mail"
 msgstr "Neue E-Mail aufnehmen"
 
-#: src/mainwindow.c:2386
+#: src/mainwindow.c:2394
 msgid "Incorporate new mail of all accounts"
 msgstr "Neue E-Mail aller Accounts aufnehmen"
 
-#: src/mainwindow.c:2388
+#: src/mainwindow.c:2396
 msgid "Send queued message(s)"
 msgstr "Senden wartender Nachrichten"
 
-#: src/mainwindow.c:2390
+#: src/mainwindow.c:2398
 msgid "Compose new message"
 msgstr "Neue Nachricht verfassen"
 
-#: src/mainwindow.c:2392
+#: src/mainwindow.c:2400
 msgid "Reply to the message"
 msgstr "Nachricht beantworten"
 
-#: src/mainwindow.c:2394
+#: src/mainwindow.c:2402
 msgid "Reply to all"
 msgstr "Antwort an alle"
 
-#: src/mainwindow.c:2396
+#: src/mainwindow.c:2404
 msgid "Forward the message"
 msgstr "Nachricht weiterleiten"
 
-#: src/mainwindow.c:2398
+#: src/mainwindow.c:2406
 msgid "Delete the message"
 msgstr "Nachricht löschen"
 
-#: src/mainwindow.c:2400
+#: src/mainwindow.c:2408
 msgid "Set as junk mail"
 msgstr "Markiere als Spam-Mail"
 
-#: src/mainwindow.c:2402
+#: src/mainwindow.c:2410
 msgid "Execute marked process"
 msgstr "Markierten Prozess ausführen"
 
-#: src/mainwindow.c:2404
+#: src/mainwindow.c:2412
 msgid "Next unread message"
 msgstr "Nächste ungelesene Nachricht"
 
-#: src/mainwindow.c:2406
+#: src/mainwindow.c:2414
 #, fuzzy
 msgid "Previous unread message"
 msgstr "Nächste ungelesene Nachricht"
 
-#: src/mainwindow.c:2410
+#: src/mainwindow.c:2418
 #, fuzzy
 msgid "Print message"
 msgstr "Sende Nachricht"
 
-#: src/mainwindow.c:2412
+#: src/mainwindow.c:2420
 msgid "Common preferences"
 msgstr "Allgemeine Einstellungen"
 
-#: src/mainwindow.c:2414 src/prefs_account_dialog.c:511
+#: src/mainwindow.c:2422 src/prefs_account_dialog.c:511
 msgid "Account preferences"
 msgstr "Accounteinstellungen"
 
-#: src/mainwindow.c:2779
+#: src/mainwindow.c:2788
 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:2790
+#: src/mainwindow.c:2799
 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:3062
+#: src/mainwindow.c:3071
 msgid "Exit"
 msgstr "Beenden"
 
-#: src/mainwindow.c:3062
+#: src/mainwindow.c:3071
 msgid "Exit this program?"
 msgstr "Beenden des Programms?"
 
-#: src/mainwindow.c:3666
+#: src/mainwindow.c:3675
 msgid "Command line options"
 msgstr "Kommandozeilenoptionen"
 
-#: src/mainwindow.c:3679
+#: src/mainwindow.c:3688
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Aufruf: sylpheed [OPTION]..."
 
-#: src/mainwindow.c:3687
+#: src/mainwindow.c:3696
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -3759,7 +3764,7 @@ msgstr ""
 "--help\n"
 "--version"
 
-#: src/mainwindow.c:3703
+#: src/mainwindow.c:3712
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
diff --git a/po/el.po b/po/el.po
index 4ef3834a..90df5cfa 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: 2007-01-31 16:49+0900\n"
+"POT-Creation-Date: 2007-01-31 17:29+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"
@@ -916,7 +916,7 @@ msgstr "/Διεύθυνση/Επεξεργασία"
 msgid "/_Address/_Delete"
 msgstr "/Διεύθυνση/Διαγραφή"
 
-#: src/addressbook.c:359 src/compose.c:673 src/mainwindow.c:787
+#: src/addressbook.c:359 src/compose.c:673 src/mainwindow.c:789
 #: src/messageview.c:282
 #, fuzzy
 msgid "/_Tools"
@@ -927,12 +927,12 @@ msgstr "/Εργαλεία"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/Αρχείο/Εισαγωγή αρχείου mbox..."
 
-#: src/addressbook.c:361 src/compose.c:694 src/mainwindow.c:841
+#: src/addressbook.c:361 src/compose.c:694 src/mainwindow.c:843
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/Βοήθεια"
 
-#: src/addressbook.c:362 src/compose.c:695 src/mainwindow.c:853
+#: src/addressbook.c:362 src/compose.c:695 src/mainwindow.c:855
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/Βοήθεια/Σχετικά"
@@ -974,7 +974,7 @@ msgstr "/Διαγραφή"
 msgid "E-Mail address"
 msgstr "Διεύθυνση e-mail"
 
-#: src/addressbook.c:496 src/compose.c:4873 src/mainwindow.c:2408
+#: src/addressbook.c:496 src/compose.c:4873 src/mainwindow.c:2416
 #: src/prefs_common_dialog.c:2274
 msgid "Address book"
 msgstr "Κατάλογος διευθύνσεων"
@@ -1190,7 +1190,7 @@ msgstr "Κοινές διευθύνσεις"
 msgid "Personal address"
 msgstr "Προσωπικές διευθύνσεις"
 
-#: src/alertpanel.c:142 src/compose.c:5717 src/main.c:638
+#: src/alertpanel.c:142 src/compose.c:5720 src/main.c:638
 msgid "Notice"
 msgstr "Σημείωση"
 
@@ -1369,9 +1369,9 @@ msgid "/_View/_Reply to"
 msgstr "/Απεικόνιση/Κωδικοσύνολο"
 
 #: src/compose.c:578 src/compose.c:580 src/compose.c:582 src/compose.c:584
-#: src/compose.c:587 src/mainwindow.c:577 src/mainwindow.c:580
-#: src/mainwindow.c:607 src/mainwindow.c:631 src/mainwindow.c:734
-#: src/mainwindow.c:738 src/messageview.c:258
+#: src/compose.c:587 src/mainwindow.c:579 src/mainwindow.c:582
+#: src/mainwindow.c:609 src/mainwindow.c:633 src/mainwindow.c:736
+#: src/mainwindow.c:740 src/messageview.c:258
 msgid "/_View/---"
 msgstr "/Απεικόνιση/---"
 
@@ -1395,7 +1395,7 @@ msgstr "Προσάρτηση"
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/Περίληψη/Μετακίνηση σε άλλο κατάλογο..."
 
-#: src/compose.c:593 src/mainwindow.c:638 src/messageview.c:173
+#: src/compose.c:593 src/mainwindow.c:640 src/messageview.c:173
 #, fuzzy
 msgid "/_View/Character _encoding"
 msgstr "/Απεικόνιση/Εμφάνιση του πηγαίου"
@@ -1407,138 +1407,138 @@ msgstr ""
 #: src/compose.c:596 src/compose.c:602 src/compose.c:608 src/compose.c:612
 #: src/compose.c:620 src/compose.c:624 src/compose.c:630 src/compose.c:636
 #: src/compose.c:640 src/compose.c:650 src/compose.c:654 src/compose.c:662
-#: src/compose.c:666 src/mainwindow.c:634 src/mainwindow.c:641
+#: src/compose.c:666 src/mainwindow.c:636 src/mainwindow.c:643
 #: src/messageview.c:169
 #, fuzzy
 msgid "/_View/Character _encoding/---"
 msgstr "/Απεικόνιση/Εμφάνιση του πηγαίου"
 
-#: src/compose.c:598 src/mainwindow.c:642 src/messageview.c:177
+#: src/compose.c:598 src/mainwindow.c:644 src/messageview.c:177
 #, fuzzy
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/7bit ascii (US-ASC_II)"
 
-#: src/compose.c:600 src/mainwindow.c:644 src/messageview.c:180
+#: src/compose.c:600 src/mainwindow.c:646 src/messageview.c:180
 #, fuzzy
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/Unicode (_UTF-8)"
 
-#: src/compose.c:604 src/mainwindow.c:648 src/messageview.c:183
+#: src/compose.c:604 src/mainwindow.c:650 src/messageview.c:183
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/Δυτικής Ευρώπης (ISO-8859-_1)"
 
-#: src/compose.c:606 src/mainwindow.c:650 src/messageview.c:185
+#: src/compose.c:606 src/mainwindow.c:652 src/messageview.c:185
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/Δυτικής Ευρώπης (ISO-8859-_1)"
 
-#: src/compose.c:610 src/mainwindow.c:656 src/messageview.c:190
+#: src/compose.c:610 src/mainwindow.c:658 src/messageview.c:190
 #, fuzzy
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/Κεντρικής Ευρώπης (ISO-8859-_2)"
 
-#: src/compose.c:614 src/mainwindow.c:660 src/messageview.c:193
+#: src/compose.c:614 src/mainwindow.c:662 src/messageview.c:193
 #, fuzzy
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/Βαλτικής (ISO-8859-13)"
 
-#: src/compose.c:616 src/mainwindow.c:662 src/messageview.c:195
+#: src/compose.c:616 src/mainwindow.c:664 src/messageview.c:195
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/Βαλτικής (ISO-8859-_4)"
 
-#: src/compose.c:618 src/mainwindow.c:664 src/messageview.c:197
+#: src/compose.c:618 src/mainwindow.c:666 src/messageview.c:197
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/Κυριλλικό (Windows-1251)"
 
-#: src/compose.c:622 src/mainwindow.c:668 src/messageview.c:200
+#: src/compose.c:622 src/mainwindow.c:670 src/messageview.c:200
 #, fuzzy
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/Ελληνικό (ISO-8859-_7)"
 
-#: src/compose.c:626 src/mainwindow.c:672 src/messageview.c:203
+#: src/compose.c:626 src/mainwindow.c:674 src/messageview.c:203
 #, fuzzy
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/Βαλτικής (ISO-8859-_4)"
 
-#: src/compose.c:628 src/mainwindow.c:674 src/messageview.c:205
+#: src/compose.c:628 src/mainwindow.c:676 src/messageview.c:205
 #, fuzzy
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/Κυριλλικό (Windows-1251)"
 
-#: src/compose.c:632 src/mainwindow.c:678 src/messageview.c:208
+#: src/compose.c:632 src/mainwindow.c:680 src/messageview.c:208
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/Ελληνικό (ISO-8859-_7)"
 
-#: src/compose.c:634 src/mainwindow.c:680 src/messageview.c:210
+#: src/compose.c:634 src/mainwindow.c:682 src/messageview.c:210
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/Κυριλλικό (Windows-1251)"
 
-#: src/compose.c:638 src/mainwindow.c:684 src/messageview.c:213
+#: src/compose.c:638 src/mainwindow.c:686 src/messageview.c:213
 #, fuzzy
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/Τουρκικό (ISO-8859-_9)"
 
-#: src/compose.c:642 src/mainwindow.c:688 src/messageview.c:216
+#: src/compose.c:642 src/mainwindow.c:690 src/messageview.c:216
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/Κυριλλικό (ISO-8859-_5)"
 
-#: src/compose.c:644 src/mainwindow.c:690 src/messageview.c:218
+#: src/compose.c:644 src/mainwindow.c:692 src/messageview.c:218
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/Κυριλλικό (KOI8-_R)"
 
-#: src/compose.c:646 src/mainwindow.c:692 src/messageview.c:220
+#: src/compose.c:646 src/mainwindow.c:694 src/messageview.c:220
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/Κυριλλικό (KOI8-_R)"
 
-#: src/compose.c:648 src/mainwindow.c:694 src/messageview.c:222
+#: src/compose.c:648 src/mainwindow.c:696 src/messageview.c:222
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/Κυριλλικό (Windows-1251)"
 
-#: src/compose.c:652 src/mainwindow.c:698 src/messageview.c:225
+#: src/compose.c:652 src/mainwindow.c:700 src/messageview.c:225
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/Ιαπωνέζικο (ISO-2022-_JP)"
 
-#: src/compose.c:656 src/mainwindow.c:708 src/messageview.c:234
+#: src/compose.c:656 src/mainwindow.c:710 src/messageview.c:234
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/Απλοποιημένο Κινεζικό (_GB2312)"
 
-#: src/compose.c:658 src/mainwindow.c:710 src/messageview.c:236
+#: src/compose.c:658 src/mainwindow.c:712 src/messageview.c:236
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/Απλοποιημένο Κινεζικό (_GB2312)"
 
-#: src/compose.c:660 src/mainwindow.c:712 src/messageview.c:238
+#: src/compose.c:660 src/mainwindow.c:714 src/messageview.c:238
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/Παραδοσιακό Κινεζικό (_Big5)"
 
-#: src/compose.c:664 src/mainwindow.c:720 src/messageview.c:245
+#: src/compose.c:664 src/mainwindow.c:722 src/messageview.c:245
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/Κορεάτικο (EUC-_KR)"
 
-#: src/compose.c:668 src/mainwindow.c:726 src/messageview.c:250
+#: src/compose.c:668 src/mainwindow.c:728 src/messageview.c:250
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/Κινεζικό (ISO-2022-_CN)"
 
-#: src/compose.c:670 src/mainwindow.c:728 src/messageview.c:252
+#: src/compose.c:670 src/mainwindow.c:730 src/messageview.c:252
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/Κυριλλικό (Windows-1251)"
 
-#: src/compose.c:674 src/mainwindow.c:788 src/messageview.c:283
+#: src/compose.c:674 src/mainwindow.c:790 src/messageview.c:283
 #, fuzzy
 msgid "/_Tools/_Address book"
 msgstr "/Εργαλεία/Κατάλογος διευθύνσεων"
@@ -1548,14 +1548,14 @@ msgstr "/Εργαλεία/Κατάλογος διευθύνσεων"
 msgid "/_Tools/_Template"
 msgstr "/Αρχείο/Διαγραφή"
 
-#: src/compose.c:677 src/mainwindow.c:812 src/messageview.c:299
+#: src/compose.c:677 src/mainwindow.c:814 src/messageview.c:299
 #, fuzzy
 msgid "/_Tools/Actio_ns"
 msgstr "/Εκτέλεση"
 
-#: src/compose.c:679 src/compose.c:683 src/compose.c:689 src/mainwindow.c:791
-#: src/mainwindow.c:805 src/mainwindow.c:810 src/mainwindow.c:813
-#: src/mainwindow.c:817 src/mainwindow.c:819 src/messageview.c:286
+#: src/compose.c:679 src/compose.c:683 src/compose.c:689 src/mainwindow.c:793
+#: src/mainwindow.c:807 src/mainwindow.c:812 src/mainwindow.c:815
+#: src/mainwindow.c:819 src/mainwindow.c:821 src/messageview.c:286
 #: src/messageview.c:298
 #, fuzzy
 msgid "/_Tools/---"
@@ -1760,7 +1760,7 @@ msgstr "/Εκτέλεση"
 msgid "PGP Encrypt"
 msgstr "/Μήνυμα/Κρυπτογράφηση"
 
-#: src/compose.c:4442 src/compose.c:5543
+#: src/compose.c:4442 src/compose.c:5546
 msgid "MIME type"
 msgstr "τύπος MIME"
 
@@ -1804,37 +1804,37 @@ msgstr "Επεξεργασία με εξωτερικό πρόγραμμα"
 msgid "Wrap all long lines"
 msgstr "Αναδίπλωση γραμμών"
 
-#: src/compose.c:5439
+#: src/compose.c:5442
 msgid "Invalid MIME type."
 msgstr "Μη έγκυρος τύπος MIME"
 
-#: src/compose.c:5457
+#: src/compose.c:5460
 msgid "File doesn't exist or is empty."
 msgstr "Το αρχείο δεν υπάρχει, ή είναι άδειο."
 
-#: src/compose.c:5525
+#: src/compose.c:5528
 #, fuzzy
 msgid "Properties"
 msgstr "Ιδιότητες"
 
-#: src/compose.c:5545 src/prefs_common_dialog.c:1504
+#: src/compose.c:5548 src/prefs_common_dialog.c:1504
 msgid "Encoding"
 msgstr "Κωδικοποίηση"
 
-#: src/compose.c:5568 src/prefs_folder_item.c:202
+#: src/compose.c:5571 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Διάδρομος"
 
-#: src/compose.c:5569
+#: src/compose.c:5572
 msgid "File name"
 msgstr "Όνομα αρχείου"
 
-#: src/compose.c:5659
+#: src/compose.c:5662
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Η εντολή για το εξωτερικό πρόγραμμα δεν είναι έγκυρη: `%s'\n"
 
-#: src/compose.c:5714
+#: src/compose.c:5717
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1844,53 +1844,53 @@ msgstr ""
 "Να επιβάλλω τερματισμό της διεργασίας;\n"
 "process group id:  %d"
 
-#: src/compose.c:6040 src/mainwindow.c:2752
+#: src/compose.c:6043 src/mainwindow.c:2761
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:6156 src/compose.c:6161 src/compose.c:6167
+#: src/compose.c:6159 src/compose.c:6164 src/compose.c:6170
 msgid "Can't queue the message."
 msgstr "Δεν μπορώ να βάλω στην ουρά το μήνυμα."
 
-#: src/compose.c:6258
+#: src/compose.c:6261
 #, fuzzy
 msgid "Select files"
 msgstr "Επιλογή αρχείου"
 
-#: src/compose.c:6281
+#: src/compose.c:6284
 msgid "Select file"
 msgstr "Επιλογή αρχείου"
 
-#: src/compose.c:6316
+#: src/compose.c:6319
 #, fuzzy
 msgid "Save message"
 msgstr "Αποστολή μηνύματος"
 
-#: src/compose.c:6317
+#: src/compose.c:6320
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Αυτό το μήνυμα έχει τροποποιηθεί, να απορριφθεί;"
 
-#: src/compose.c:6319
+#: src/compose.c:6322
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:6361
+#: src/compose.c:6364
 #, fuzzy, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Θέλετε πράγματι να διαγραφεί αυτή η κεφαλίδα;"
 
-#: src/compose.c:6363
+#: src/compose.c:6366
 #, fuzzy
 msgid "Apply template"
 msgstr "Διαγραφή μηνύματος"
 
-#: src/compose.c:6364
+#: src/compose.c:6367
 #, fuzzy
 msgid "_Replace"
 msgstr "Απάντηση"
 
-#: src/compose.c:6364
+#: src/compose.c:6367
 #, fuzzy
 msgid "_Insert"
 msgstr "Εισαγωγή"
@@ -2366,12 +2366,12 @@ msgstr "Θέτω τις πληροφορίες καταλόγων...\n"
 msgid "Setting folder info..."
 msgstr "Θέτω τις πληροφορίες καταλόγων..."
 
-#: src/folderview.c:868 src/mainwindow.c:3748 src/setup.c:80
+#: src/folderview.c:868 src/mainwindow.c:3757 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Σάρωση καταλόγων %s%c%s ..."
 
-#: src/folderview.c:872 src/mainwindow.c:3753 src/setup.c:85
+#: src/folderview.c:872 src/mainwindow.c:3762 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Σάρωση καταλόγου %s ..."
@@ -3163,624 +3163,629 @@ msgstr "/Απεικόνιση/Ράβδος εργαλείων/Εικόνες κ�
 
 #: src/mainwindow.c:566
 #, fuzzy
-msgid "/_View/Show or hi_de/_Toolbar/_Icon"
+msgid "/_View/Show or hi_de/_Toolbar/Text at the _right of icon"
 msgstr "/Απεικόνιση/Ράβδος εργαλείων/Εικόνες"
 
 #: src/mainwindow.c:568
 #, fuzzy
+msgid "/_View/Show or hi_de/_Toolbar/_Icon"
+msgstr "/Απεικόνιση/Ράβδος εργαλείων/Εικόνες"
+
+#: src/mainwindow.c:570
+#, fuzzy
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/Απεικόνιση/Ράβδος εργαλείων/Κείμενο"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:572
 #, fuzzy
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/Απεικόνιση/Ράβδος εργαλείων/Καμία"
 
-#: src/mainwindow.c:572
+#: src/mainwindow.c:574
 #, fuzzy
 msgid "/_View/Show or hi_de/_Search bar"
 msgstr "/Απεικόνιση/Ράβδος κατάστασης"
 
-#: src/mainwindow.c:574
+#: src/mainwindow.c:576
 #, fuzzy
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/Απεικόνιση/Ράβδος κατάστασης"
 
-#: src/mainwindow.c:576
+#: src/mainwindow.c:578
 #, fuzzy
 msgid "/_View/_Customize toolbar..."
 msgstr "/Περίληψη/Μετακίνηση σε άλλο κατάλογο..."
 
-#: src/mainwindow.c:578
+#: src/mainwindow.c:580
 msgid "/_View/Separate f_older tree"
 msgstr "/Απεικόνιση/Ξεχωριστό παράθυρο δομής καταλόγων"
 
-#: src/mainwindow.c:579
+#: src/mainwindow.c:581
 #, fuzzy
 msgid "/_View/Separate _message view"
 msgstr "/Απεικόνιση/Ξεχωριστή απεικόνιση μηνυμάτων"
 
-#: src/mainwindow.c:581
+#: src/mainwindow.c:583
 #, fuzzy
 msgid "/_View/_Sort"
 msgstr "/Απεικόνιση/Εμφάνιση του πηγαίου"
 
-#: src/mainwindow.c:582
+#: src/mainwindow.c:584
 #, fuzzy
 msgid "/_View/_Sort/by _number"
 msgstr "/Περίληψη/Ταξινόμηση/Ταξινόμηση κατά αριθμό"
 
-#: src/mainwindow.c:583
+#: src/mainwindow.c:585
 #, fuzzy
 msgid "/_View/_Sort/by s_ize"
 msgstr "/Περίληψη/Ταξινόμηση/Ταξινόμηση κατά μέγεθος"
 
-#: src/mainwindow.c:584
+#: src/mainwindow.c:586
 #, fuzzy
 msgid "/_View/_Sort/by _date"
 msgstr "/Περίληψη/Ταξινόμηση/Ταξινόμηση κατά ημερομηνία"
 
-#: src/mainwindow.c:585
+#: src/mainwindow.c:587
 #, fuzzy
 msgid "/_View/_Sort/by t_hread date"
 msgstr "/Περίληψη/Ταξινόμηση/Ταξινόμηση κατά ημερομηνία"
 
-#: src/mainwindow.c:586
+#: src/mainwindow.c:588
 #, fuzzy
 msgid "/_View/_Sort/by _from"
 msgstr "/Περίληψη/Ταξινόμηση/Ταξινόμηση κατά αποστολέα"
 
-#: src/mainwindow.c:587
+#: src/mainwindow.c:589
 #, fuzzy
 msgid "/_View/_Sort/by _recipient"
 msgstr "/Περίληψη/Ταξινόμηση/Ταξινόμηση κατά μέγεθος"
 
-#: src/mainwindow.c:588
+#: src/mainwindow.c:590
 #, fuzzy
 msgid "/_View/_Sort/by _subject"
 msgstr "/Περίληψη/Ταξινόμηση/Ταξινόμηση κατά θέμα"
 
-#: src/mainwindow.c:589
+#: src/mainwindow.c:591
 #, fuzzy
 msgid "/_View/_Sort/by _color label"
 msgstr "/Περίληψη/Ταξινόμηση/Ταξινόμηση κατά χρώμα ετικέτας"
 
-#: src/mainwindow.c:591
+#: src/mainwindow.c:593
 #, fuzzy
 msgid "/_View/_Sort/by _mark"
 msgstr "/Περίληψη/Ταξινόμηση/Ταξινόμηση κατά σήμανση"
 
-#: src/mainwindow.c:592
+#: src/mainwindow.c:594
 #, fuzzy
 msgid "/_View/_Sort/by _unread"
 msgstr "/Περίληψη/Ταξινόμηση/Ταξινόμηση κατά αδιάβαστα"
 
-#: src/mainwindow.c:593
+#: src/mainwindow.c:595
 #, fuzzy
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/Περίληψη/Ταξινόμηση/Ταξινόμηση κατά προσάρτηση"
 
-#: src/mainwindow.c:595
+#: src/mainwindow.c:597
 #, fuzzy
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/Περίληψη/Ταξινόμηση/Ταξινόμηση κατά αδιάβαστα"
 
-#: src/mainwindow.c:596 src/mainwindow.c:599
+#: src/mainwindow.c:598 src/mainwindow.c:601
 #, fuzzy
 msgid "/_View/_Sort/---"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/---"
 
-#: src/mainwindow.c:597
+#: src/mainwindow.c:599
 #, fuzzy
 msgid "/_View/_Sort/Ascending"
 msgstr "/Απεικόνιση/Εμφάνιση του πηγαίου"
 
-#: src/mainwindow.c:598
+#: src/mainwindow.c:600
 #, fuzzy
 msgid "/_View/_Sort/Descending"
 msgstr "/Απεικόνιση/Εμφάνιση του πηγαίου"
 
-#: src/mainwindow.c:600
+#: src/mainwindow.c:602
 #, fuzzy
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/Περίληψη/Ταξινόμηση/_Attract by subject"
 
-#: src/mainwindow.c:602
+#: src/mainwindow.c:604
 #, fuzzy
 msgid "/_View/Th_read view"
 msgstr "/Απεικόνιση/Απεικόνιση μηνυνάτων"
 
-#: src/mainwindow.c:603
+#: src/mainwindow.c:605
 #, fuzzy
 msgid "/_View/E_xpand all threads"
 msgstr "/Απεικόνιση/Εμφάνιση της πλήρους κεφαλίδας"
 
-#: src/mainwindow.c:604
+#: src/mainwindow.c:606
 #, fuzzy
 msgid "/_View/Co_llapse all threads"
 msgstr "/Απεικόνιση/Εμφάνιση της πλήρους κεφαλίδας"
 
-#: src/mainwindow.c:605
+#: src/mainwindow.c:607
 #, fuzzy
 msgid "/_View/Set display _item..."
 msgstr "/Περίληψη/Ορισμός εμφανιζόμενων στοιχείων..."
 
-#: src/mainwindow.c:608
+#: src/mainwindow.c:610
 #, fuzzy
 msgid "/_View/_Go to"
 msgstr "/Απεικόνιση/Κωδικοσύνολο"
 
-#: src/mainwindow.c:609
+#: src/mainwindow.c:611
 #, fuzzy
 msgid "/_View/_Go to/_Prev message"
 msgstr "/Περίληψη/Πήγαινε στο/Προηγούμενο μήνυμα"
 
-#: src/mainwindow.c:610
+#: src/mainwindow.c:612
 #, fuzzy
 msgid "/_View/_Go to/_Next message"
 msgstr "/Περίληψη/Πήγαινε στο/Επόμενο μήνυμα"
 
-#: src/mainwindow.c:611 src/mainwindow.c:616 src/mainwindow.c:619
-#: src/mainwindow.c:624 src/mainwindow.c:629
+#: src/mainwindow.c:613 src/mainwindow.c:618 src/mainwindow.c:621
+#: src/mainwindow.c:626 src/mainwindow.c:631
 #, fuzzy
 msgid "/_View/_Go to/---"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/---"
 
-#: src/mainwindow.c:612
+#: src/mainwindow.c:614
 #, fuzzy
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/Περίληψη/Πήγαινε στο/Προηγούμενο αδιάβαστο μήνυμα"
 
-#: src/mainwindow.c:614
+#: src/mainwindow.c:616
 #, fuzzy
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/Περίληψη/Πήγαινε στο/Επόμενο αδιάβαστο μήνυμα"
 
-#: src/mainwindow.c:617
+#: src/mainwindow.c:619
 #, fuzzy
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/Περίληψη/Πήγαινε στο/Προηγούμενο μήνυμα"
 
-#: src/mainwindow.c:618
+#: src/mainwindow.c:620
 #, fuzzy
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/Περίληψη/Πήγαινε στο/Επόμενο μήνυμα"
 
-#: src/mainwindow.c:620
+#: src/mainwindow.c:622
 #, fuzzy
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/Περίληψη/Πήγαινε στο/Προηγούμενο σημειωμένο μήνυμα"
 
-#: src/mainwindow.c:622
+#: src/mainwindow.c:624
 #, fuzzy
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/Περίληψη/Πήγαινε στο/Επόμενο σημειωμένο μήνυμα"
 
-#: src/mainwindow.c:625
+#: src/mainwindow.c:627
 #, fuzzy
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/Περίληψη/Πήγαινε στο/Προηγούμενο μήνυμα με ετικέτα"
 
-#: src/mainwindow.c:627
+#: src/mainwindow.c:629
 #, fuzzy
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/Περίληψη/Πήγαινε στο/Επόμενο μήνυμα με ετικέτα"
 
-#: src/mainwindow.c:630
+#: src/mainwindow.c:632
 #, fuzzy
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/Περίληψη/Μετακίνηση σε άλλο κατάλογο..."
 
-#: src/mainwindow.c:639 src/messageview.c:174
+#: src/mainwindow.c:641 src/messageview.c:174
 #, fuzzy
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/Αυτόματη αναγνώριση"
 
-#: src/mainwindow.c:652 src/messageview.c:187
+#: src/mainwindow.c:654 src/messageview.c:187
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/Δυτικής Ευρώπης (ISO-8859-_1)"
 
-#: src/mainwindow.c:700 src/messageview.c:227
+#: src/mainwindow.c:702 src/messageview.c:227
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/Ιαπωνέζικο (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:702 src/messageview.c:229
+#: src/mainwindow.c:704 src/messageview.c:229
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/Ιαπωνέζικο (_EUC-JP)"
 
-#: src/mainwindow.c:704 src/messageview.c:231
+#: src/mainwindow.c:706 src/messageview.c:231
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/Ιαπωνέζικο (_Shift__JIS)"
 
-#: src/mainwindow.c:714 src/messageview.c:240
+#: src/mainwindow.c:716 src/messageview.c:240
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/Παραδοσιακό Κινεζικό (EUC-_TW)"
 
-#: src/mainwindow.c:716 src/messageview.c:242
+#: src/mainwindow.c:718 src/messageview.c:242
 #, fuzzy
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/Κινεζικό (ISO-2022-_CN)"
 
-#: src/mainwindow.c:722 src/messageview.c:247
+#: src/mainwindow.c:724 src/messageview.c:247
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/Κορεάτικο (ISO-2022-KR)"
 
-#: src/mainwindow.c:735 src/summaryview.c:464
+#: src/mainwindow.c:737 src/summaryview.c:464
 #, fuzzy
 msgid "/_View/Open in new _window"
 msgstr "/Άνοιγμα σε νέο παράθυρο"
 
-#: src/mainwindow.c:736 src/messageview.c:259 src/summaryview.c:466
+#: src/mainwindow.c:738 src/messageview.c:259 src/summaryview.c:466
 #, fuzzy
 msgid "/_View/Mess_age source"
 msgstr "/Απεικόνιση/Εμφάνιση του πηγαίου"
 
-#: src/mainwindow.c:737 src/messageview.c:260 src/summaryview.c:467
+#: src/mainwindow.c:739 src/messageview.c:260 src/summaryview.c:467
 #, fuzzy
 msgid "/_View/All _headers"
 msgstr "/Απεικόνιση/Εμφάνιση της πλήρους κεφαλίδας"
 
-#: src/mainwindow.c:739
+#: src/mainwindow.c:741
 #, fuzzy
 msgid "/_View/_Update summary"
 msgstr "/Απεικόνιση/Κωδικοσύνολο"
 
-#: src/mainwindow.c:741 src/messageview.c:263
+#: src/mainwindow.c:743 src/messageview.c:263
 msgid "/_Message"
 msgstr "/Μήνυμα"
 
-#: src/mainwindow.c:742
+#: src/mainwindow.c:744
 #, fuzzy
 msgid "/_Message/Recei_ve"
 msgstr "/Μήνυμα/Επαν-επεξεργασία"
 
-#: src/mainwindow.c:743
+#: src/mainwindow.c:745
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/Μήνυμα/Λήψη από όλους τους λογαριασμούς"
 
-#: src/mainwindow.c:745
+#: src/mainwindow.c:747
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/Μήνυμα/Λήψη από όλους τους λογαριασμούς"
 
-#: src/mainwindow.c:747
+#: src/mainwindow.c:749
 #, fuzzy
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/Μήνυμα/Αποστολή αργότερα"
 
-#: src/mainwindow.c:749
+#: src/mainwindow.c:751
 #, fuzzy
 msgid "/_Message/Recei_ve/---"
 msgstr "/Μήνυμα/Επαν-επεξεργασία"
 
-#: src/mainwindow.c:750
+#: src/mainwindow.c:752
 #, fuzzy
 msgid "/_Message/_Send queued messages"
 msgstr "/Μήνυμα/Αποστολή μηνυμάτων από την ουρά"
 
-#: src/mainwindow.c:751 src/mainwindow.c:753 src/mainwindow.c:760
-#: src/mainwindow.c:765 src/mainwindow.c:768 src/mainwindow.c:779
-#: src/mainwindow.c:781 src/mainwindow.c:784 src/messageview.c:266
+#: src/mainwindow.c:753 src/mainwindow.c:755 src/mainwindow.c:762
+#: src/mainwindow.c:767 src/mainwindow.c:770 src/mainwindow.c:781
+#: src/mainwindow.c:783 src/mainwindow.c:786 src/messageview.c:266
 #: src/messageview.c:274 src/messageview.c:279
 msgid "/_Message/---"
 msgstr "/Μήνυμα/---"
 
-#: src/mainwindow.c:752 src/messageview.c:264
+#: src/mainwindow.c:754 src/messageview.c:264
 msgid "/_Message/Compose _new message"
 msgstr "/Μήνυμα/Σύνθεση νέου μηνύματος"
 
-#: src/mainwindow.c:754 src/messageview.c:267
+#: src/mainwindow.c:756 src/messageview.c:267
 msgid "/_Message/_Reply"
 msgstr "/Μήνυμα/Απάντηση"
 
-#: src/mainwindow.c:755
+#: src/mainwindow.c:757
 #, fuzzy
 msgid "/_Message/Repl_y to"
 msgstr "/Μήνυμα/Απάντηση σε"
 
-#: src/mainwindow.c:756 src/messageview.c:268
+#: src/mainwindow.c:758 src/messageview.c:268
 #, fuzzy
 msgid "/_Message/Repl_y to/_all"
 msgstr "/Μήνυμα/Απάντηση σε όλους"
 
-#: src/mainwindow.c:757 src/messageview.c:270
+#: src/mainwindow.c:759 src/messageview.c:270
 #, fuzzy
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/Μήνυμα/Απάντηση στον αποστολέα"
 
-#: src/mainwindow.c:758 src/messageview.c:272
+#: src/mainwindow.c:760 src/messageview.c:272
 #, fuzzy
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/Μήνυμα/Απάντηση σε όλους"
 
-#: src/mainwindow.c:761 src/messageview.c:275
+#: src/mainwindow.c:763 src/messageview.c:275
 msgid "/_Message/_Forward"
 msgstr "/Μήνυμα/Προώθηση"
 
-#: src/mainwindow.c:762 src/messageview.c:276
+#: src/mainwindow.c:764 src/messageview.c:276
 #, fuzzy
 msgid "/_Message/For_ward as attachment"
 msgstr "/Μήνυμα/Προώθηση σαν προσάρτηση"
 
-#: src/mainwindow.c:764 src/messageview.c:278
+#: src/mainwindow.c:766 src/messageview.c:278
 #, fuzzy
 msgid "/_Message/Redirec_t"
 msgstr "/Μήνυμα/Επαν-επεξεργασία"
 
-#: src/mainwindow.c:766
+#: src/mainwindow.c:768
 msgid "/_Message/M_ove..."
 msgstr "/Μήνυμα/Μετακίνηση..."
 
-#: src/mainwindow.c:767
+#: src/mainwindow.c:769
 msgid "/_Message/_Copy..."
 msgstr "/Μήνυμα/Αντιγραφή..."
 
-#: src/mainwindow.c:769
+#: src/mainwindow.c:771
 msgid "/_Message/_Mark"
 msgstr "/Μήνυμα/Σήμανση"
 
-#: src/mainwindow.c:770
+#: src/mainwindow.c:772
 msgid "/_Message/_Mark/_Mark"
 msgstr "/Mήνυμα/Σήμανση/Σήμανση"
 
-#: src/mainwindow.c:771
+#: src/mainwindow.c:773
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/Mήνυμα/Σήμανση/Αναίρεση σήμανσης"
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:774
 msgid "/_Message/_Mark/---"
 msgstr "/Mήνυμα/Σήμανση/---"
 
-#: src/mainwindow.c:773
+#: src/mainwindow.c:775
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/Mήνυμα/Σήμανση/Σήμανση ως αδιάβαστο"
 
-#: src/mainwindow.c:774
+#: src/mainwindow.c:776
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/Mήνυμα/Σήμανση/Σήμανση ως διαβασμένο"
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:778
 #, fuzzy
 msgid "/_Message/_Mark/Mark _thread as read"
 msgstr "/Mήνυμα/Σήμανση/Σήμανση ως διαβασμένο"
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:780
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/Mήνυμα/Σήμανση/Σήμανση όλων ως διαβασμένα"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:782
 msgid "/_Message/_Delete"
 msgstr "/Μήνυμα/Διαγραφή"
 
-#: src/mainwindow.c:782
+#: src/mainwindow.c:784
 #, fuzzy
 msgid "/_Message/Set as _junk mail"
 msgstr "/Μήνυμα/Λήψη νέων μηνυμάτων"
 
-#: src/mainwindow.c:783
+#: src/mainwindow.c:785
 #, fuzzy
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/Μήνυμα/Λήψη νέων μηνυμάτων"
 
-#: src/mainwindow.c:785 src/messageview.c:280
+#: src/mainwindow.c:787 src/messageview.c:280
 msgid "/_Message/Re-_edit"
 msgstr "/Μήνυμα/Επαν-επεξεργασία"
 
-#: src/mainwindow.c:789
+#: src/mainwindow.c:791
 #, fuzzy
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/Προσθήκη αποστολέα στον κατάλογο διευθύνσεων"
 
-#: src/mainwindow.c:792
+#: src/mainwindow.c:794
 #, fuzzy
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/Περίληψη/Φιλτράρισμα μηνυμάτων"
 
-#: src/mainwindow.c:794
+#: src/mainwindow.c:796
 #, fuzzy
 msgid "/_Tools/Filter _selected messages"
 msgstr "/Περίληψη/Φιλτράρισμα μηνυμάτων"
 
-#: src/mainwindow.c:796 src/messageview.c:287
+#: src/mainwindow.c:798 src/messageview.c:287
 #, fuzzy
 msgid "/_Tools/_Create filter rule"
 msgstr "/Περίληψη/Φιλτράρισμα μηνυμάτων"
 
-#: src/mainwindow.c:797 src/messageview.c:289
+#: src/mainwindow.c:799 src/messageview.c:289
 #, fuzzy
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/Περίληψη/Φιλτράρισμα μηνυμάτων"
 
-#: src/mainwindow.c:799 src/messageview.c:291
+#: src/mainwindow.c:801 src/messageview.c:291
 #, fuzzy
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/Περίληψη/Φιλτράρισμα μηνυμάτων"
 
-#: src/mainwindow.c:801 src/messageview.c:293
+#: src/mainwindow.c:803 src/messageview.c:293
 #, fuzzy
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/Περίληψη/Φιλτράρισμα μηνυμάτων"
 
-#: src/mainwindow.c:803 src/messageview.c:295
+#: src/mainwindow.c:805 src/messageview.c:295
 #, fuzzy
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/Περίληψη/Φιλτράρισμα μηνυμάτων"
 
-#: src/mainwindow.c:806
+#: src/mainwindow.c:808
 #, fuzzy
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/Περίληψη/Φιλτράρισμα μηνυμάτων"
 
-#: src/mainwindow.c:808
+#: src/mainwindow.c:810
 #, fuzzy
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/Περίληψη/Φιλτράρισμα μηνυμάτων"
 
-#: src/mainwindow.c:815
+#: src/mainwindow.c:817
 #, fuzzy
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/Περίληψη/Διαγραφή διπλών μηνυμάτων"
 
-#: src/mainwindow.c:818
+#: src/mainwindow.c:820
 #, fuzzy
 msgid "/_Tools/E_xecute marked process"
 msgstr "Εκτέλεση σημειωμένης εργασίας"
 
-#: src/mainwindow.c:820
+#: src/mainwindow.c:822
 #, fuzzy
 msgid "/_Tools/_Log window"
 msgstr "/Εργαλεία/Παράθυρο καταγραφής"
 
-#: src/mainwindow.c:822
+#: src/mainwindow.c:824
 msgid "/_Configuration"
 msgstr "/Ρυθμίσεις"
 
-#: src/mainwindow.c:823
+#: src/mainwindow.c:825
 msgid "/_Configuration/_Common preferences..."
 msgstr "/Ρυθμίσεις/Κοινές επιλογές..."
 
-#: src/mainwindow.c:825
+#: src/mainwindow.c:827
 msgid "/_Configuration/_Filter setting..."
 msgstr "/Ρυθμίσεις/Επιλογές φίλτρων..."
 
-#: src/mainwindow.c:827
+#: src/mainwindow.c:829
 #, fuzzy
 msgid "/_Configuration/_Template..."
 msgstr "/Ρυθμίσεις/Επιλογές φίλτρων..."
 
-#: src/mainwindow.c:829
+#: src/mainwindow.c:831
 #, fuzzy
 msgid "/_Configuration/_Actions..."
 msgstr "/Ρυθμίσεις/Επεξεργασία λογαριασμών..."
 
-#: src/mainwindow.c:831
+#: src/mainwindow.c:833
 msgid "/_Configuration/---"
 msgstr "/Ρυθμίσεις/---"
 
-#: src/mainwindow.c:832
+#: src/mainwindow.c:834
 #, fuzzy
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/Ρυθμίσεις/Επιλογές ανά λογαριασμό..."
 
-#: src/mainwindow.c:834
+#: src/mainwindow.c:836
 msgid "/_Configuration/Create _new account..."
 msgstr "/Ρυθμίσεις/Δημιουργία νέου λογαριασμού..."
 
-#: src/mainwindow.c:836
+#: src/mainwindow.c:838
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/Ρυθμίσεις/Επεξεργασία λογαριασμών..."
 
-#: src/mainwindow.c:838
+#: src/mainwindow.c:840
 msgid "/_Configuration/C_hange current account"
 msgstr "/Ρυθμίσεις/Αλλαγή τρέχοντος λογαριασμού"
 
-#: src/mainwindow.c:842
+#: src/mainwindow.c:844
 msgid "/_Help/_Manual"
 msgstr "/Βοήθεια/_Manual"
 
-#: src/mainwindow.c:843
+#: src/mainwindow.c:845
 msgid "/_Help/_Manual/_English"
 msgstr "/Βοήθεια/_Manual/Αγγλικό"
 
-#: src/mainwindow.c:844
+#: src/mainwindow.c:846
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/Βοήθεια/_Manual/Ιαπωνέζικο"
 
-#: src/mainwindow.c:845
+#: src/mainwindow.c:847
 #, fuzzy
 msgid "/_Help/_FAQ"
 msgstr "/Βοήθεια/Σχετικά"
 
-#: src/mainwindow.c:846
+#: src/mainwindow.c:848
 #, fuzzy
 msgid "/_Help/_FAQ/_English"
 msgstr "/Βοήθεια/_Manual/Αγγλικό"
 
-#: src/mainwindow.c:847
+#: src/mainwindow.c:849
 #, fuzzy
 msgid "/_Help/_FAQ/_German"
 msgstr "/Βοήθεια/_Manual/Αγγλικό"
 
-#: src/mainwindow.c:848
+#: src/mainwindow.c:850
 #, fuzzy
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/Βοήθεια/_Manual/Αγγλικό"
 
-#: src/mainwindow.c:849
+#: src/mainwindow.c:851
 msgid "/_Help/_FAQ/_French"
 msgstr ""
 
-#: src/mainwindow.c:850
+#: src/mainwindow.c:852
 #, fuzzy
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/Βοήθεια/_Manual/Αγγλικό"
 
-#: src/mainwindow.c:851
+#: src/mainwindow.c:853
 #, fuzzy
 msgid "/_Help/_Command line options"
 msgstr "Το όνομα της κεφαλίδας δεν έχει οριστεί."
 
-#: src/mainwindow.c:852
+#: src/mainwindow.c:854
 msgid "/_Help/---"
 msgstr "/Βοήθεια/---"
 
-#: src/mainwindow.c:895
+#: src/mainwindow.c:897
 msgid "Creating main window...\n"
 msgstr "Δημιουργώ το κυρίως παράθυρο...\n"
 
-#: src/mainwindow.c:1071
+#: src/mainwindow.c:1073
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "MainWindow: η κατανομή χρωμάτων %d απέτυχε\n"
 
-#: src/mainwindow.c:1175 src/summaryview.c:2387 src/summaryview.c:2472
+#: src/mainwindow.c:1181 src/summaryview.c:2387 src/summaryview.c:2472
 #: src/summaryview.c:4009 src/summaryview.c:4138 src/summaryview.c:4507
 msgid "done.\n"
 msgstr "έγινε.\n"
 
-#: src/mainwindow.c:1293 src/mainwindow.c:1334 src/mainwindow.c:1359
+#: src/mainwindow.c:1299 src/mainwindow.c:1340 src/mainwindow.c:1365
 msgid "Untitled"
 msgstr "Χωρίς τίτλο"
 
-#: src/mainwindow.c:1360
+#: src/mainwindow.c:1366
 msgid "none"
 msgstr "κανένα"
 
-#: src/mainwindow.c:1413
+#: src/mainwindow.c:1419
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr ""
 
-#: src/mainwindow.c:1663
+#: src/mainwindow.c:1669
 msgid "Offline"
 msgstr ""
 
-#: src/mainwindow.c:1664
+#: src/mainwindow.c:1670
 msgid "You are offline. Go online?"
 msgstr ""
 
-#: src/mainwindow.c:1681
+#: src/mainwindow.c:1687
 #, fuzzy
 msgid "Empty all trash"
 msgstr "Άδειασμα διαγραμμένων"
 
-#: src/mainwindow.c:1682
+#: src/mainwindow.c:1688
 #, fuzzy
 msgid "Delete all messages in trash folders?"
 msgstr "Να αδειάσω όλα τα διαγραμμένα μηνύματα"
 
-#: src/mainwindow.c:1712
+#: src/mainwindow.c:1718
 msgid "Add mailbox"
 msgstr "Προσθήκη mailbox"
 
-#: src/mainwindow.c:1713
+#: src/mainwindow.c:1719
 #, fuzzy
 msgid ""
 "Specify the location of mailbox.\n"
@@ -3791,16 +3796,16 @@ msgstr ""
 "Αν οριστεί το υπάρχον mailbox, θα\n"
 "σαρωθεί αυτόματα."
 
-#: src/mainwindow.c:1719 src/setup.c:49
+#: src/mainwindow.c:1725 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Το mailbox `%s' υπάρχει ήδη"
 
-#: src/mainwindow.c:1724 src/setup.c:56
+#: src/mainwindow.c:1730 src/setup.c:56
 msgid "Mailbox"
 msgstr "Mailbox"
 
-#: src/mainwindow.c:1730 src/setup.c:62
+#: src/mainwindow.c:1736 src/setup.c:62
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3809,139 +3814,139 @@ msgstr ""
 "Η δημιουργία του mailbox απέτυχε.\n"
 "Ίσως κάποια αρχεία να υπάρχουν ήδη, ή δεν έχετε δικαίωμα να γράψετε εκεί. "
 
-#: src/mainwindow.c:2198
+#: src/mainwindow.c:2206
 msgid "Sylpheed - Folder View"
 msgstr ""
 
-#: src/mainwindow.c:2217
+#: src/mainwindow.c:2225
 msgid "Sylpheed - Message View"
 msgstr ""
 
-#: src/mainwindow.c:2369 src/summaryview.c:418
+#: src/mainwindow.c:2377 src/summaryview.c:418
 msgid "/_Reply"
 msgstr "/Απάντηση"
 
-#: src/mainwindow.c:2370
+#: src/mainwindow.c:2378
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "Απάντηση σε όλους"
 
-#: src/mainwindow.c:2371
+#: src/mainwindow.c:2379
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/Απάντηση στον αποστολέα"
 
-#: src/mainwindow.c:2372
+#: src/mainwindow.c:2380
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/Απάντηση σε όλους"
 
-#: src/mainwindow.c:2377 src/summaryview.c:425
+#: src/mainwindow.c:2385 src/summaryview.c:425
 msgid "/_Forward"
 msgstr "/Προώθηση"
 
-#: src/mainwindow.c:2378 src/summaryview.c:426
+#: src/mainwindow.c:2386 src/summaryview.c:426
 #, fuzzy
 msgid "/For_ward as attachment"
 msgstr "/Προώθηση ως προσάρτηση"
 
-#: src/mainwindow.c:2379 src/summaryview.c:427
+#: src/mainwindow.c:2387 src/summaryview.c:427
 #, fuzzy
 msgid "/Redirec_t"
 msgstr "/Επαν-επεξεργασία"
 
-#: src/mainwindow.c:2384
+#: src/mainwindow.c:2392
 msgid "Incorporate new mail"
 msgstr "Λήψη νέου mail"
 
-#: src/mainwindow.c:2386
+#: src/mainwindow.c:2394
 msgid "Incorporate new mail of all accounts"
 msgstr "Λήψη νέου mail από όλους τους λογαριασμούς"
 
-#: src/mainwindow.c:2388
+#: src/mainwindow.c:2396
 msgid "Send queued message(s)"
 msgstr "Αποστολή όλων των μηνυμάτων από την ουρά"
 
-#: src/mainwindow.c:2390
+#: src/mainwindow.c:2398
 msgid "Compose new message"
 msgstr "Σύνθεση νέου μηνύματος"
 
-#: src/mainwindow.c:2392
+#: src/mainwindow.c:2400
 msgid "Reply to the message"
 msgstr "Απάντηση στο μήνυμα"
 
-#: src/mainwindow.c:2394
+#: src/mainwindow.c:2402
 msgid "Reply to all"
 msgstr "Απάντηση σε όλους"
 
-#: src/mainwindow.c:2396
+#: src/mainwindow.c:2404
 msgid "Forward the message"
 msgstr "Προώθηση μηνύματος"
 
-#: src/mainwindow.c:2398
+#: src/mainwindow.c:2406
 msgid "Delete the message"
 msgstr "Διαγραφή μηνύματος"
 
-#: src/mainwindow.c:2400
+#: src/mainwindow.c:2408
 #, fuzzy
 msgid "Set as junk mail"
 msgstr " Θέσε ως σύνηθη λογαριασμό "
 
-#: src/mainwindow.c:2402
+#: src/mainwindow.c:2410
 msgid "Execute marked process"
 msgstr "Εκτέλεση σημειωμένης εργασίας"
 
-#: src/mainwindow.c:2404
+#: src/mainwindow.c:2412
 msgid "Next unread message"
 msgstr "Επόμενο αδιάβαστο μήνυμα"
 
-#: src/mainwindow.c:2406
+#: src/mainwindow.c:2414
 #, fuzzy
 msgid "Previous unread message"
 msgstr "Επόμενο αδιάβαστο μήνυμα"
 
-#: src/mainwindow.c:2410
+#: src/mainwindow.c:2418
 #, fuzzy
 msgid "Print message"
 msgstr "Αποστολή μηνύματος"
 
-#: src/mainwindow.c:2412
+#: src/mainwindow.c:2420
 #, fuzzy
 msgid "Common preferences"
 msgstr "Κοινές Επιλογές"
 
-#: src/mainwindow.c:2414 src/prefs_account_dialog.c:511
+#: src/mainwindow.c:2422 src/prefs_account_dialog.c:511
 #, fuzzy
 msgid "Account preferences"
 msgstr "Κοινές Επιλογές"
 
-#: src/mainwindow.c:2779
+#: src/mainwindow.c:2788
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 
-#: src/mainwindow.c:2790
+#: src/mainwindow.c:2799
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 
-#: src/mainwindow.c:3062
+#: src/mainwindow.c:3071
 msgid "Exit"
 msgstr "Έξοδος"
 
-#: src/mainwindow.c:3062
+#: src/mainwindow.c:3071
 msgid "Exit this program?"
 msgstr "Έξοδος από αυτό το πρόγραμμα;"
 
-#: src/mainwindow.c:3666
+#: src/mainwindow.c:3675
 #, fuzzy
 msgid "Command line options"
 msgstr "Το όνομα της κεφαλίδας δεν έχει οριστεί."
 
-#: src/mainwindow.c:3679
+#: src/mainwindow.c:3688
 #, fuzzy
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Χρήση: %s [ΕΠΙΛΟΓΗ]...\n"
 
-#: src/mainwindow.c:3687
+#: src/mainwindow.c:3696
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -3957,7 +3962,7 @@ msgid ""
 "--version"
 msgstr ""
 
-#: src/mainwindow.c:3703
+#: src/mainwindow.c:3712
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
diff --git a/po/es.po b/po/es.po
index 2ff3df36..a2e98617 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-01-31 16:49+0900\n"
+"POT-Creation-Date: 2007-01-31 17:29+0900\n"
 "PO-Revision-Date: 2006-12-02 13:12+0100\n"
 "Last-Translator: Ricardo Mones <ricardo@mones.org>\n"
 "Language-Team: Ricardo Mones <ricardo@mones.org>\n"
@@ -906,7 +906,7 @@ msgstr "/_Dirección/_Editar"
 msgid "/_Address/_Delete"
 msgstr "/_Dirección/_Borrar"
 
-#: src/addressbook.c:359 src/compose.c:673 src/mainwindow.c:787
+#: src/addressbook.c:359 src/compose.c:673 src/mainwindow.c:789
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Herramientas"
@@ -915,12 +915,12 @@ msgstr "/_Herramientas"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Herramientas/Importar fichero _LDIF"
 
-#: src/addressbook.c:361 src/compose.c:694 src/mainwindow.c:841
+#: src/addressbook.c:361 src/compose.c:694 src/mainwindow.c:843
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Ayuda"
 
-#: src/addressbook.c:362 src/compose.c:695 src/mainwindow.c:853
+#: src/addressbook.c:362 src/compose.c:695 src/mainwindow.c:855
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Ayuda/_Acerca de"
@@ -962,7 +962,7 @@ msgstr "/_Borrar"
 msgid "E-Mail address"
 msgstr "Dirección e-mail"
 
-#: src/addressbook.c:496 src/compose.c:4873 src/mainwindow.c:2408
+#: src/addressbook.c:496 src/compose.c:4873 src/mainwindow.c:2416
 #: src/prefs_common_dialog.c:2274
 msgid "Address book"
 msgstr "Agenda de direcciones"
@@ -1181,7 +1181,7 @@ msgstr "Dirección común"
 msgid "Personal address"
 msgstr "Dirección personal"
 
-#: src/alertpanel.c:142 src/compose.c:5717 src/main.c:638
+#: src/alertpanel.c:142 src/compose.c:5720 src/main.c:638
 msgid "Notice"
 msgstr "Notificación"
 
@@ -1348,9 +1348,9 @@ msgid "/_View/_Reply to"
 msgstr "/_Ver/_Responder a"
 
 #: src/compose.c:578 src/compose.c:580 src/compose.c:582 src/compose.c:584
-#: src/compose.c:587 src/mainwindow.c:577 src/mainwindow.c:580
-#: src/mainwindow.c:607 src/mainwindow.c:631 src/mainwindow.c:734
-#: src/mainwindow.c:738 src/messageview.c:258
+#: src/compose.c:587 src/mainwindow.c:579 src/mainwindow.c:582
+#: src/mainwindow.c:609 src/mainwindow.c:633 src/mainwindow.c:736
+#: src/mainwindow.c:740 src/messageview.c:258
 msgid "/_View/---"
 msgstr "/_Ver/---"
 
@@ -1371,7 +1371,7 @@ msgstr "/_Ver/_Adjuntos"
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/_Ver/_Ir a/_Ir a otra carpeta..."
 
-#: src/compose.c:593 src/mainwindow.c:638 src/messageview.c:173
+#: src/compose.c:593 src/mainwindow.c:640 src/messageview.c:173
 msgid "/_View/Character _encoding"
 msgstr "/_Ver/Codificación de caract_eres"
 
@@ -1382,112 +1382,112 @@ msgstr "/_Ver/Codificación de caract_eres/_Automática"
 #: src/compose.c:596 src/compose.c:602 src/compose.c:608 src/compose.c:612
 #: src/compose.c:620 src/compose.c:624 src/compose.c:630 src/compose.c:636
 #: src/compose.c:640 src/compose.c:650 src/compose.c:654 src/compose.c:662
-#: src/compose.c:666 src/mainwindow.c:634 src/mainwindow.c:641
+#: src/compose.c:666 src/mainwindow.c:636 src/mainwindow.c:643
 #: src/messageview.c:169
 msgid "/_View/Character _encoding/---"
 msgstr "/_Ver/Codificación de caract_eres/---"
 
-#: src/compose.c:598 src/mainwindow.c:642 src/messageview.c:177
+#: src/compose.c:598 src/mainwindow.c:644 src/messageview.c:177
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Ver/Codificación de caract_eres/ASCII de 7 bits (US-ASC_II)"
 
-#: src/compose.c:600 src/mainwindow.c:644 src/messageview.c:180
+#: src/compose.c:600 src/mainwindow.c:646 src/messageview.c:180
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Ver/Codificación de caract_eres/Unicode (_UTF-8)"
 
-#: src/compose.c:604 src/mainwindow.c:648 src/messageview.c:183
+#: src/compose.c:604 src/mainwindow.c:650 src/messageview.c:183
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Ver/Codificación de caract_eres/Europeo occidental (ISO-8859-_1)"
 
-#: src/compose.c:606 src/mainwindow.c:650 src/messageview.c:185
+#: src/compose.c:606 src/mainwindow.c:652 src/messageview.c:185
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Ver/Codificación de caract_eres/Europeo occidental (ISO-8859-15)"
 
-#: src/compose.c:610 src/mainwindow.c:656 src/messageview.c:190
+#: src/compose.c:610 src/mainwindow.c:658 src/messageview.c:190
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Ver/Codificación de caract_eres/Centroeuropeo (ISO-8859-_2)"
 
-#: src/compose.c:614 src/mainwindow.c:660 src/messageview.c:193
+#: src/compose.c:614 src/mainwindow.c:662 src/messageview.c:193
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Ver/Codificación de caract_eres/_Báltico (ISO-8859-13)"
 
-#: src/compose.c:616 src/mainwindow.c:662 src/messageview.c:195
+#: src/compose.c:616 src/mainwindow.c:664 src/messageview.c:195
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Ver/Codificación de caract_eres/Báltico (ISO-8859-_4)"
 
-#: src/compose.c:618 src/mainwindow.c:664 src/messageview.c:197
+#: src/compose.c:618 src/mainwindow.c:666 src/messageview.c:197
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/_Ver/Codificación de caract_eres/Báltico (Windows-1257)"
 
-#: src/compose.c:622 src/mainwindow.c:668 src/messageview.c:200
+#: src/compose.c:622 src/mainwindow.c:670 src/messageview.c:200
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Ver/Codificación de caract_eres/Griego (ISO-8859-_7)"
 
-#: src/compose.c:626 src/mainwindow.c:672 src/messageview.c:203
+#: src/compose.c:626 src/mainwindow.c:674 src/messageview.c:203
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/_Ver/Codificación de caract_eres/Arábigo (ISO-8859-_6)"
 
-#: src/compose.c:628 src/mainwindow.c:674 src/messageview.c:205
+#: src/compose.c:628 src/mainwindow.c:676 src/messageview.c:205
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/_Ver/Codificación de caract_eres/Arábigo (Windows-1256)"
 
-#: src/compose.c:632 src/mainwindow.c:678 src/messageview.c:208
+#: src/compose.c:632 src/mainwindow.c:680 src/messageview.c:208
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Ver/Codificación de caract_eres/Hebreo (ISO-8859-_8)"
 
-#: src/compose.c:634 src/mainwindow.c:680 src/messageview.c:210
+#: src/compose.c:634 src/mainwindow.c:682 src/messageview.c:210
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Ver/Codificación de caract_eres/Hebreo (Windows-1255)"
 
-#: src/compose.c:638 src/mainwindow.c:684 src/messageview.c:213
+#: src/compose.c:638 src/mainwindow.c:686 src/messageview.c:213
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Ver/Codificación de caract_eres/Turco (ISO-8859-_9)"
 
-#: src/compose.c:642 src/mainwindow.c:688 src/messageview.c:216
+#: src/compose.c:642 src/mainwindow.c:690 src/messageview.c:216
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Ver/Codificación de caract_eres/Cirílico (ISO-8859-_5)"
 
-#: src/compose.c:644 src/mainwindow.c:690 src/messageview.c:218
+#: src/compose.c:644 src/mainwindow.c:692 src/messageview.c:218
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Ver/Codificación de caract_eres/Cirílico (KOI8-_R)"
 
-#: src/compose.c:646 src/mainwindow.c:692 src/messageview.c:220
+#: src/compose.c:646 src/mainwindow.c:694 src/messageview.c:220
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Ver/Codificación de caract_eres/Cirílico (KOI8-U)"
 
-#: src/compose.c:648 src/mainwindow.c:694 src/messageview.c:222
+#: src/compose.c:648 src/mainwindow.c:696 src/messageview.c:222
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Ver/Codificación de caract_eres/Cirílico (Windows-1251)"
 
-#: src/compose.c:652 src/mainwindow.c:698 src/messageview.c:225
+#: src/compose.c:652 src/mainwindow.c:700 src/messageview.c:225
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Ver/Codificación de caract_eres/Japonés (ISO-2022-_JP)"
 
-#: src/compose.c:656 src/mainwindow.c:708 src/messageview.c:234
+#: src/compose.c:656 src/mainwindow.c:710 src/messageview.c:234
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Ver/Codificación de caract_eres/Chino simplificado (_GB2312)"
 
-#: src/compose.c:658 src/mainwindow.c:710 src/messageview.c:236
+#: src/compose.c:658 src/mainwindow.c:712 src/messageview.c:236
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Ver/Codificación de caract_eres/Chino simplificado (GBK)"
 
-#: src/compose.c:660 src/mainwindow.c:712 src/messageview.c:238
+#: src/compose.c:660 src/mainwindow.c:714 src/messageview.c:238
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Ver/Codificación de caract_eres/Chino tradicional (_Big5)"
 
-#: src/compose.c:664 src/mainwindow.c:720 src/messageview.c:245
+#: src/compose.c:664 src/mainwindow.c:722 src/messageview.c:245
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Ver/Codificación de caract_eres/Coreano (EUC-_KR)"
 
-#: src/compose.c:668 src/mainwindow.c:726 src/messageview.c:250
+#: src/compose.c:668 src/mainwindow.c:728 src/messageview.c:250
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Ver/Codificación de caract_eres/Tailandés (TIS-620)"
 
-#: src/compose.c:670 src/mainwindow.c:728 src/messageview.c:252
+#: src/compose.c:670 src/mainwindow.c:730 src/messageview.c:252
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Ver/Codificación de caract_eres/Tailandés (Windows-874)"
 
-#: src/compose.c:674 src/mainwindow.c:788 src/messageview.c:283
+#: src/compose.c:674 src/mainwindow.c:790 src/messageview.c:283
 msgid "/_Tools/_Address book"
 msgstr "/_Herramientas/_Agenda de direcciones"
 
@@ -1495,13 +1495,13 @@ msgstr "/_Herramientas/_Agenda de direcciones"
 msgid "/_Tools/_Template"
 msgstr "/_Herramientas/Plan_tillas"
 
-#: src/compose.c:677 src/mainwindow.c:812 src/messageview.c:299
+#: src/compose.c:677 src/mainwindow.c:814 src/messageview.c:299
 msgid "/_Tools/Actio_ns"
 msgstr "/_Herramientas/Accio_nes"
 
-#: src/compose.c:679 src/compose.c:683 src/compose.c:689 src/mainwindow.c:791
-#: src/mainwindow.c:805 src/mainwindow.c:810 src/mainwindow.c:813
-#: src/mainwindow.c:817 src/mainwindow.c:819 src/messageview.c:286
+#: src/compose.c:679 src/compose.c:683 src/compose.c:689 src/mainwindow.c:793
+#: src/mainwindow.c:807 src/mainwindow.c:812 src/mainwindow.c:815
+#: src/mainwindow.c:819 src/mainwindow.c:821 src/messageview.c:286
 #: src/messageview.c:298
 msgid "/_Tools/---"
 msgstr "/_Herramientas/---"
@@ -1704,7 +1704,7 @@ msgstr "Firmar con PGP"
 msgid "PGP Encrypt"
 msgstr "Cifrar con PGP"
 
-#: src/compose.c:4442 src/compose.c:5543
+#: src/compose.c:4442 src/compose.c:5546
 msgid "MIME type"
 msgstr "Tipo MIME"
 
@@ -1746,36 +1746,36 @@ msgstr "Editar con un editor externo"
 msgid "Wrap all long lines"
 msgstr "Recortar todas las líneas largas"
 
-#: src/compose.c:5439
+#: src/compose.c:5442
 msgid "Invalid MIME type."
 msgstr "Tipo MIME inválido."
 
-#: src/compose.c:5457
+#: src/compose.c:5460
 msgid "File doesn't exist or is empty."
 msgstr "El fichero no existe o está vacío."
 
-#: src/compose.c:5525
+#: src/compose.c:5528
 msgid "Properties"
 msgstr "Propiedades"
 
-#: src/compose.c:5545 src/prefs_common_dialog.c:1504
+#: src/compose.c:5548 src/prefs_common_dialog.c:1504
 msgid "Encoding"
 msgstr "Codificación"
 
-#: src/compose.c:5568 src/prefs_folder_item.c:202
+#: src/compose.c:5571 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Ruta"
 
-#: src/compose.c:5569
+#: src/compose.c:5572
 msgid "File name"
 msgstr "Nombre de fichero"
 
-#: src/compose.c:5659
+#: src/compose.c:5662
 #, 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:5714
+#: src/compose.c:5717
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1784,48 +1784,48 @@ msgstr ""
 "El editor externo aún esta activo.\n"
 "¿Forzar la finalización del proceso (pid: %d)?\n"
 
-#: src/compose.c:6040 src/mainwindow.c:2752
+#: src/compose.c:6043 src/mainwindow.c:2761
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:6156 src/compose.c:6161 src/compose.c:6167
+#: src/compose.c:6159 src/compose.c:6164 src/compose.c:6170
 msgid "Can't queue the message."
 msgstr "El mensaje no se puede poner en la cola."
 
-#: src/compose.c:6258
+#: src/compose.c:6261
 msgid "Select files"
 msgstr "Seleccionar ficheros"
 
-#: src/compose.c:6281
+#: src/compose.c:6284
 msgid "Select file"
 msgstr "Seleccionar fichero"
 
-#: src/compose.c:6316
+#: src/compose.c:6319
 msgid "Save message"
 msgstr "Guardar mensaje"
 
-#: src/compose.c:6317
+#: src/compose.c:6320
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Este mensaje ha sido modificado. ¿Guardarlo en la carpeta Borradores?"
 
-#: src/compose.c:6319
+#: src/compose.c:6322
 msgid "Close _without saving"
 msgstr "Cerrar _sin guardar"
 
-#: src/compose.c:6361
+#: src/compose.c:6364
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "¿Quiere aplicar la plantilla «%s»?"
 
-#: src/compose.c:6363
+#: src/compose.c:6366
 msgid "Apply template"
 msgstr "Aplicar plantilla"
 
-#: src/compose.c:6364
+#: src/compose.c:6367
 msgid "_Replace"
 msgstr "_Reemplazar"
 
-#: src/compose.c:6364
+#: src/compose.c:6367
 msgid "_Insert"
 msgstr "_Insertar"
 
@@ -2282,12 +2282,12 @@ msgstr "Estableciendo la información de la carpeta...\n"
 msgid "Setting folder info..."
 msgstr "Estableciendo la información de la carpeta..."
 
-#: src/folderview.c:868 src/mainwindow.c:3748 src/setup.c:80
+#: src/folderview.c:868 src/mainwindow.c:3757 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Revisando carpeta %s%c%s ..."
 
-#: src/folderview.c:872 src/mainwindow.c:3753 src/setup.c:85
+#: src/folderview.c:872 src/mainwindow.c:3762 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Revisando carpeta %s ..."
@@ -3048,536 +3048,541 @@ msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/_Ver/Mostrar u o_cultar/_Herramientas/Iconos _y texto"
 
 #: src/mainwindow.c:566
-msgid "/_View/Show or hi_de/_Toolbar/_Icon"
+#, fuzzy
+msgid "/_View/Show or hi_de/_Toolbar/Text at the _right of icon"
 msgstr "/_Ver/Mostrar u o_cultar/_Herramientas/_Iconos"
 
 #: src/mainwindow.c:568
+msgid "/_View/Show or hi_de/_Toolbar/_Icon"
+msgstr "/_Ver/Mostrar u o_cultar/_Herramientas/_Iconos"
+
+#: src/mainwindow.c:570
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/_Ver/Mostrar u o_cultar/_Herramientas/_Texto"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:572
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/_Ver/Mostrar u o_cultar/_Herramientas/_Ocultar"
 
-#: src/mainwindow.c:572
+#: src/mainwindow.c:574
 msgid "/_View/Show or hi_de/_Search bar"
 msgstr "/_Ver/Mostrar u o_cultar/Barra de bú_squeda"
 
-#: src/mainwindow.c:574
+#: src/mainwindow.c:576
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/_Ver/Mostrar u o_cultar/_Barra de estado"
 
-#: src/mainwindow.c:576
+#: src/mainwindow.c:578
 #, fuzzy
 msgid "/_View/_Customize toolbar..."
 msgstr "/_Ver/_Ir a/_Ir a otra carpeta..."
 
-#: src/mainwindow.c:578
+#: src/mainwindow.c:580
 msgid "/_View/Separate f_older tree"
 msgstr "/_Ver/Separar árb_ol de carpetas"
 
-#: src/mainwindow.c:579
+#: src/mainwindow.c:581
 msgid "/_View/Separate _message view"
 msgstr "/_Ver/Separar vista de m_ensajes"
 
-#: src/mainwindow.c:581
+#: src/mainwindow.c:583
 msgid "/_View/_Sort"
 msgstr "/_Ver/_Ordenar"
 
-#: src/mainwindow.c:582
+#: src/mainwindow.c:584
 msgid "/_View/_Sort/by _number"
 msgstr "/_Ver/_Ordenar/Por _número"
 
-#: src/mainwindow.c:583
+#: src/mainwindow.c:585
 msgid "/_View/_Sort/by s_ize"
 msgstr "/_Ver/_Ordenar/Por _tamaño"
 
-#: src/mainwindow.c:584
+#: src/mainwindow.c:586
 msgid "/_View/_Sort/by _date"
 msgstr "/_Ver/_Ordenar/Por _fecha"
 
-#: src/mainwindow.c:585
+#: src/mainwindow.c:587
 msgid "/_View/_Sort/by t_hread date"
 msgstr "/_Ver/_Ordenar/Por _fecha del hilo"
 
-#: src/mainwindow.c:586
+#: src/mainwindow.c:588
 msgid "/_View/_Sort/by _from"
 msgstr "/_Ver/_Ordenar/Por _remitente"
 
-#: src/mainwindow.c:587
+#: src/mainwindow.c:589
 msgid "/_View/_Sort/by _recipient"
 msgstr "/_Ver/_Ordenar/Por _destinatario"
 
-#: src/mainwindow.c:588
+#: src/mainwindow.c:590
 msgid "/_View/_Sort/by _subject"
 msgstr "/_Ver/_Ordenar/Por a_sunto"
 
-#: src/mainwindow.c:589
+#: src/mainwindow.c:591
 msgid "/_View/_Sort/by _color label"
 msgstr "/_Ver/_Ordenar/Por _color de la etiqueta"
 
-#: src/mainwindow.c:591
+#: src/mainwindow.c:593
 msgid "/_View/_Sort/by _mark"
 msgstr "/_Ver/_Ordenar/Por _marca"
 
-#: src/mainwindow.c:592
+#: src/mainwindow.c:594
 msgid "/_View/_Sort/by _unread"
 msgstr "/_Ver/_Ordenar/Por _no leído"
 
-#: src/mainwindow.c:593
+#: src/mainwindow.c:595
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/_Ver/_Ordenar/Por adj_unto"
 
-#: src/mainwindow.c:595
+#: src/mainwindow.c:597
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/_Ver/_Ordenar/N_o ordenar"
 
-#: src/mainwindow.c:596 src/mainwindow.c:599
+#: src/mainwindow.c:598 src/mainwindow.c:601
 msgid "/_View/_Sort/---"
 msgstr "/_Ver/_Ordenar/---"
 
-#: src/mainwindow.c:597
+#: src/mainwindow.c:599
 msgid "/_View/_Sort/Ascending"
 msgstr "/_Ver/_Ordenar/Ascendente"
 
-#: src/mainwindow.c:598
+#: src/mainwindow.c:600
 msgid "/_View/_Sort/Descending"
 msgstr "/_Ver/_Ordenar/Descendente"
 
-#: src/mainwindow.c:600
+#: src/mainwindow.c:602
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/_Ver/_Ordenar/Atraer _por asunto"
 
-#: src/mainwindow.c:602
+#: src/mainwindow.c:604
 msgid "/_View/Th_read view"
 msgstr "/_Ver/_Vista jerárquica"
 
-#: src/mainwindow.c:603
+#: src/mainwindow.c:605
 msgid "/_View/E_xpand all threads"
 msgstr "/_Ver/E_xpandir todos los hilos"
 
-#: src/mainwindow.c:604
+#: src/mainwindow.c:606
 msgid "/_View/Co_llapse all threads"
 msgstr "/_Ver/Co_lapsar todos los hilos"
 
-#: src/mainwindow.c:605
+#: src/mainwindow.c:607
 msgid "/_View/Set display _item..."
 msgstr "/_Ver/Elementos visibles..."
 
-#: src/mainwindow.c:608
+#: src/mainwindow.c:610
 msgid "/_View/_Go to"
 msgstr "/_Ver/_Ir a"
 
-#: src/mainwindow.c:609
+#: src/mainwindow.c:611
 msgid "/_View/_Go to/_Prev message"
 msgstr "/_Ver/_Ir a/Mensaje a_nterior"
 
-#: src/mainwindow.c:610
+#: src/mainwindow.c:612
 msgid "/_View/_Go to/_Next message"
 msgstr "/_Ver/_Ir a/Mensaje s_iguiente"
 
-#: src/mainwindow.c:611 src/mainwindow.c:616 src/mainwindow.c:619
-#: src/mainwindow.c:624 src/mainwindow.c:629
+#: src/mainwindow.c:613 src/mainwindow.c:618 src/mainwindow.c:621
+#: src/mainwindow.c:626 src/mainwindow.c:631
 msgid "/_View/_Go to/---"
 msgstr "/_Ver/_Ir a/---"
 
-#: src/mainwindow.c:612
+#: src/mainwindow.c:614
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/_Ver/_Ir a/_Anterior sin leer"
 
-#: src/mainwindow.c:614
+#: src/mainwindow.c:616
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/_Ver/_Ir a/_Siguiente sin leer"
 
-#: src/mainwindow.c:617
+#: src/mainwindow.c:619
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/_Ver/_Ir a/Mensaje nue_vo anterior"
 
-#: src/mainwindow.c:618
+#: src/mainwindow.c:620
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/_Ver/_Ir a/Mensaje n_uevo s_iguiente"
 
-#: src/mainwindow.c:620
+#: src/mainwindow.c:622
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/_Ver/_Ir a/Mensaje marcado a_nterior"
 
-#: src/mainwindow.c:622
+#: src/mainwindow.c:624
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/_Ver/_Ir a/Siguiente mensaje marcado"
 
-#: src/mainwindow.c:625
+#: src/mainwindow.c:627
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/_Ver/_Ir a/Mensaje etiquetado anterior"
 
-#: src/mainwindow.c:627
+#: src/mainwindow.c:629
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/_Ver/_Ir a/Siguiente mensaje etiquetado"
 
-#: src/mainwindow.c:630
+#: src/mainwindow.c:632
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Ver/_Ir a/_Ir a otra carpeta..."
 
-#: src/mainwindow.c:639 src/messageview.c:174
+#: src/mainwindow.c:641 src/messageview.c:174
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Ver/Codificación de caract_eres/_Autodetectar"
 
-#: src/mainwindow.c:652 src/messageview.c:187
+#: src/mainwindow.c:654 src/messageview.c:187
 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr "/_Ver/Codificación de caract_eres/Europeo occidental (Windows-1252)"
 
-#: src/mainwindow.c:700 src/messageview.c:227
+#: src/mainwindow.c:702 src/messageview.c:227
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Ver/Codificación de caract_eres/Japonés (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:702 src/messageview.c:229
+#: src/mainwindow.c:704 src/messageview.c:229
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Ver/Codificación de caract_eres/Japonés (_EUC-JP)"
 
-#: src/mainwindow.c:704 src/messageview.c:231
+#: src/mainwindow.c:706 src/messageview.c:231
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Ver/Codificación de caract_eres/Japonés (_Shift__JIS)"
 
-#: src/mainwindow.c:714 src/messageview.c:240
+#: src/mainwindow.c:716 src/messageview.c:240
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Ver/Codificación de caract_eres/Chino tradicional (EUC-_TW)"
 
-#: src/mainwindow.c:716 src/messageview.c:242
+#: src/mainwindow.c:718 src/messageview.c:242
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Ver/Codificación de caract_eres/Chino (ISO-2022-_CN)"
 
-#: src/mainwindow.c:722 src/messageview.c:247
+#: src/mainwindow.c:724 src/messageview.c:247
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Ver/Codificación de caract_eres/Coreano (ISO-2022-KR)"
 
-#: src/mainwindow.c:735 src/summaryview.c:464
+#: src/mainwindow.c:737 src/summaryview.c:464
 msgid "/_View/Open in new _window"
 msgstr "/_Ver/Abrir en una ventana _nueva"
 
-#: src/mainwindow.c:736 src/messageview.c:259 src/summaryview.c:466
+#: src/mainwindow.c:738 src/messageview.c:259 src/summaryview.c:466
 msgid "/_View/Mess_age source"
 msgstr "/_Ver/Fuente del mens_aje"
 
-#: src/mainwindow.c:737 src/messageview.c:260 src/summaryview.c:467
+#: src/mainwindow.c:739 src/messageview.c:260 src/summaryview.c:467
 #, fuzzy
 msgid "/_View/All _headers"
 msgstr "/_Ver/Todas las cabeceras"
 
-#: src/mainwindow.c:739
+#: src/mainwindow.c:741
 msgid "/_View/_Update summary"
 msgstr "/_Ver/Actualizar res_umen"
 
-#: src/mainwindow.c:741 src/messageview.c:263
+#: src/mainwindow.c:743 src/messageview.c:263
 msgid "/_Message"
 msgstr "/_Mensaje"
 
-#: src/mainwindow.c:742
+#: src/mainwindow.c:744
 msgid "/_Message/Recei_ve"
 msgstr "/_Mensaje/Reci_bir"
 
-#: src/mainwindow.c:743
+#: src/mainwindow.c:745
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/_Mensaje/Reci_bir/De la cuenta a_ctual"
 
-#: src/mainwindow.c:745
+#: src/mainwindow.c:747
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/_Mensaje/Reci_bir/De tod_as las cuentas"
 
-#: src/mainwindow.c:747
+#: src/mainwindow.c:749
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/_Mensaje/Reci_bir/Ca_ncelar recepción"
 
-#: src/mainwindow.c:749
+#: src/mainwindow.c:751
 msgid "/_Message/Recei_ve/---"
 msgstr "/_Mensaje/Reci_bir/---"
 
-#: src/mainwindow.c:750
+#: src/mainwindow.c:752
 msgid "/_Message/_Send queued messages"
 msgstr "/_Mensaje/Enviar mensa_jes en cola"
 
-#: src/mainwindow.c:751 src/mainwindow.c:753 src/mainwindow.c:760
-#: src/mainwindow.c:765 src/mainwindow.c:768 src/mainwindow.c:779
-#: src/mainwindow.c:781 src/mainwindow.c:784 src/messageview.c:266
+#: src/mainwindow.c:753 src/mainwindow.c:755 src/mainwindow.c:762
+#: src/mainwindow.c:767 src/mainwindow.c:770 src/mainwindow.c:781
+#: src/mainwindow.c:783 src/mainwindow.c:786 src/messageview.c:266
 #: src/messageview.c:274 src/messageview.c:279
 msgid "/_Message/---"
 msgstr "/_Mensaje/---"
 
-#: src/mainwindow.c:752 src/messageview.c:264
+#: src/mainwindow.c:754 src/messageview.c:264
 msgid "/_Message/Compose _new message"
 msgstr "/_Mensaje/Componer _nuevo mensaje"
 
-#: src/mainwindow.c:754 src/messageview.c:267
+#: src/mainwindow.c:756 src/messageview.c:267
 msgid "/_Message/_Reply"
 msgstr "/_Mensaje/_Responder"
 
-#: src/mainwindow.c:755
+#: src/mainwindow.c:757
 msgid "/_Message/Repl_y to"
 msgstr "/_Mensaje/Respon_der a"
 
-#: src/mainwindow.c:756 src/messageview.c:268
+#: src/mainwindow.c:758 src/messageview.c:268
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Mensaje/Respon_der a/A _todos"
 
-#: src/mainwindow.c:757 src/messageview.c:270
+#: src/mainwindow.c:759 src/messageview.c:270
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Mensaje/Respon_der a/Al _remitente"
 
-#: src/mainwindow.c:758 src/messageview.c:272
+#: src/mainwindow.c:760 src/messageview.c:272
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Mensaje/Respon_der a/A la _lista de correo"
 
-#: src/mainwindow.c:761 src/messageview.c:275
+#: src/mainwindow.c:763 src/messageview.c:275
 msgid "/_Message/_Forward"
 msgstr "/_Mensaje/_Reenviar"
 
-#: src/mainwindow.c:762 src/messageview.c:276
+#: src/mainwindow.c:764 src/messageview.c:276
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Mensaje/Reen_viar como adjunto"
 
-#: src/mainwindow.c:764 src/messageview.c:278
+#: src/mainwindow.c:766 src/messageview.c:278
 msgid "/_Message/Redirec_t"
 msgstr "/_Mensaje/Red_irigir"
 
-#: src/mainwindow.c:766
+#: src/mainwindow.c:768
 msgid "/_Message/M_ove..."
 msgstr "/_Mensaje/M_over..."
 
-#: src/mainwindow.c:767
+#: src/mainwindow.c:769
 msgid "/_Message/_Copy..."
 msgstr "/_Mensaje/_Copiar..."
 
-#: src/mainwindow.c:769
+#: src/mainwindow.c:771
 msgid "/_Message/_Mark"
 msgstr "/_Mensaje/_Marcar"
 
-#: src/mainwindow.c:770
+#: src/mainwindow.c:772
 msgid "/_Message/_Mark/_Mark"
 msgstr "/_Mensaje/_Marcar/_Marcar"
 
-#: src/mainwindow.c:771
+#: src/mainwindow.c:773
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/_Mensaje/_Marcar/_Desmarcar"
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:774
 msgid "/_Message/_Mark/---"
 msgstr "/_Mensaje/_Marcar/---"
 
-#: src/mainwindow.c:773
+#: src/mainwindow.c:775
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/_Mensaje/_Marcar/Marcar como no leído"
 
-#: src/mainwindow.c:774
+#: src/mainwindow.c:776
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/_Mensaje/_Marcar/Marcar como leído"
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:778
 msgid "/_Message/_Mark/Mark _thread as read"
 msgstr "/_Mensaje/_Marcar/Marcar hilo como leído"
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:780
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/_Mensaje/_Marcar/Marcar todo como leído"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:782
 msgid "/_Message/_Delete"
 msgstr "/_Mensaje/_Borrar"
 
-#: src/mainwindow.c:782
+#: src/mainwindow.c:784
 msgid "/_Message/Set as _junk mail"
 msgstr "/_Mensaje/Es un correo _basura"
 
-#: src/mainwindow.c:783
+#: src/mainwindow.c:785
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/_Mensaje/No es un correo _basura"
 
-#: src/mainwindow.c:785 src/messageview.c:280
+#: src/mainwindow.c:787 src/messageview.c:280
 msgid "/_Message/Re-_edit"
 msgstr "/_Mensaje/Re_editar"
 
-#: src/mainwindow.c:789
+#: src/mainwindow.c:791
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/_Herramientas/Añadir remitente a la age_nda..."
 
-#: src/mainwindow.c:792
+#: src/mainwindow.c:794
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/_Herramientas/_Filtrar todos los mensajes de la carpeta"
 
-#: src/mainwindow.c:794
+#: src/mainwindow.c:796
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Herramientas/_Filtrar los mensajes seleccionados"
 
-#: src/mainwindow.c:796 src/messageview.c:287
+#: src/mainwindow.c:798 src/messageview.c:287
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Herramientas/_Crear regla de filtrado"
 
-#: src/mainwindow.c:797 src/messageview.c:289
+#: src/mainwindow.c:799 src/messageview.c:289
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Herramientas/_Crear regla de filtrado/_Automáticamente"
 
-#: src/mainwindow.c:799 src/messageview.c:291
+#: src/mainwindow.c:801 src/messageview.c:291
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Herramientas/_Crear regla de filtrado/Basada en _Desde"
 
-#: src/mainwindow.c:801 src/messageview.c:293
+#: src/mainwindow.c:803 src/messageview.c:293
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Herramientas/_Crear regla de filtrado/Basada en _Para"
 
-#: src/mainwindow.c:803 src/messageview.c:295
+#: src/mainwindow.c:805 src/messageview.c:295
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Herramientas/_Crear regla de filtrado/Basada en el _Asunto"
 
-#: src/mainwindow.c:806
+#: src/mainwindow.c:808
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/_Herramientas/_Filtrar mensajes basura en la carpeta"
 
-#: src/mainwindow.c:808
+#: src/mainwindow.c:810
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/_Herramientas/_Filtrar mensajes basura en los seleccionados"
 
-#: src/mainwindow.c:815
+#: src/mainwindow.c:817
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/_Herramientas/Borrar los mensajes re_petidos"
 
-#: src/mainwindow.c:818
+#: src/mainwindow.c:820
 #, fuzzy
 msgid "/_Tools/E_xecute marked process"
 msgstr "Ejecutar el proceso marcado"
 
-#: src/mainwindow.c:820
+#: src/mainwindow.c:822
 msgid "/_Tools/_Log window"
 msgstr "/_Herramientas/_Ventana de traza"
 
-#: src/mainwindow.c:822
+#: src/mainwindow.c:824
 msgid "/_Configuration"
 msgstr "/_Configuración"
 
-#: src/mainwindow.c:823
+#: src/mainwindow.c:825
 msgid "/_Configuration/_Common preferences..."
 msgstr "/_Configuración/Preferencias _comunes..."
 
-#: src/mainwindow.c:825
+#: src/mainwindow.c:827
 msgid "/_Configuration/_Filter setting..."
 msgstr "/_Configuración/Preferencias de _filtrado..."
 
-#: src/mainwindow.c:827
+#: src/mainwindow.c:829
 msgid "/_Configuration/_Template..."
 msgstr "/_Configuración/_Plantillas ..."
 
-#: src/mainwindow.c:829
+#: src/mainwindow.c:831
 msgid "/_Configuration/_Actions..."
 msgstr "/_Configuración/_Acciones..."
 
-#: src/mainwindow.c:831
+#: src/mainwindow.c:833
 msgid "/_Configuration/---"
 msgstr "/_Configuración/---"
 
-#: src/mainwindow.c:832
+#: src/mainwindow.c:834
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Configuración/_Preferencias de la cuenta actual..."
 
-#: src/mainwindow.c:834
+#: src/mainwindow.c:836
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Configuración/Crear una _nueva cuenta..."
 
-#: src/mainwindow.c:836
+#: src/mainwindow.c:838
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Configuración/_Editar cuentas..."
 
-#: src/mainwindow.c:838
+#: src/mainwindow.c:840
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Configuración/_Cambiar la cuenta actual"
 
-#: src/mainwindow.c:842
+#: src/mainwindow.c:844
 msgid "/_Help/_Manual"
 msgstr "/_Ayuda/_Manual"
 
-#: src/mainwindow.c:843
+#: src/mainwindow.c:845
 msgid "/_Help/_Manual/_English"
 msgstr "/_Ayuda/_Manual/_Inglés"
 
-#: src/mainwindow.c:844
+#: src/mainwindow.c:846
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/_Ayuda/_Manual/_Japonés"
 
-#: src/mainwindow.c:845
+#: src/mainwindow.c:847
 msgid "/_Help/_FAQ"
 msgstr "/_Ayuda/_FAQ"
 
-#: src/mainwindow.c:846
+#: src/mainwindow.c:848
 msgid "/_Help/_FAQ/_English"
 msgstr "/_Ayuda/_FAQ/_Inglés"
 
-#: src/mainwindow.c:847
+#: src/mainwindow.c:849
 msgid "/_Help/_FAQ/_German"
 msgstr "/_Ayuda/_FAQ/_Alemán"
 
-#: src/mainwindow.c:848
+#: src/mainwindow.c:850
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/_Ayuda/_FAQ/_Español"
 
-#: src/mainwindow.c:849
+#: src/mainwindow.c:851
 msgid "/_Help/_FAQ/_French"
 msgstr "/_Ayuda/_FAQ/_Francés"
 
-#: src/mainwindow.c:850
+#: src/mainwindow.c:852
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/_Ayuda/_FAQ/_Italiano"
 
-#: src/mainwindow.c:851
+#: src/mainwindow.c:853
 msgid "/_Help/_Command line options"
 msgstr "/_Ayuda/Opciones de línea de ordenes"
 
-#: src/mainwindow.c:852
+#: src/mainwindow.c:854
 msgid "/_Help/---"
 msgstr "/_Ayuda/---"
 
-#: src/mainwindow.c:895
+#: src/mainwindow.c:897
 msgid "Creating main window...\n"
 msgstr "Creando ventana principal...\n"
 
-#: src/mainwindow.c:1071
+#: src/mainwindow.c:1073
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "MainWindow: fallo solicitando color %d\n"
 
-#: src/mainwindow.c:1175 src/summaryview.c:2387 src/summaryview.c:2472
+#: src/mainwindow.c:1181 src/summaryview.c:2387 src/summaryview.c:2472
 #: src/summaryview.c:4009 src/summaryview.c:4138 src/summaryview.c:4507
 msgid "done.\n"
 msgstr "hecho.\n"
 
-#: src/mainwindow.c:1293 src/mainwindow.c:1334 src/mainwindow.c:1359
+#: src/mainwindow.c:1299 src/mainwindow.c:1340 src/mainwindow.c:1365
 msgid "Untitled"
 msgstr "Sin título"
 
-#: src/mainwindow.c:1360
+#: src/mainwindow.c:1366
 msgid "none"
 msgstr "ninguna"
 
-#: src/mainwindow.c:1413
+#: src/mainwindow.c:1419
 #, 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:1663
+#: src/mainwindow.c:1669
 msgid "Offline"
 msgstr "Desconectado"
 
-#: src/mainwindow.c:1664
+#: src/mainwindow.c:1670
 msgid "You are offline. Go online?"
 msgstr "Esta desconectado. ¿Conectar?"
 
-#: src/mainwindow.c:1681
+#: src/mainwindow.c:1687
 msgid "Empty all trash"
 msgstr "Vaciar todas las papeleras"
 
-#: src/mainwindow.c:1682
+#: src/mainwindow.c:1688
 msgid "Delete all messages in trash folders?"
 msgstr "¿Borrar todos los mensajes de las papeleras?"
 
-#: src/mainwindow.c:1712
+#: src/mainwindow.c:1718
 msgid "Add mailbox"
 msgstr "Añadir buzón"
 
-#: src/mainwindow.c:1713
+#: src/mainwindow.c:1719
 msgid ""
 "Specify the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3587,16 +3592,16 @@ msgstr ""
 "Si el buzón especificado ya existe entonces será\n"
 "escaneado automáticamente."
 
-#: src/mainwindow.c:1719 src/setup.c:49
+#: src/mainwindow.c:1725 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "El buzón «%s» ya existe."
 
-#: src/mainwindow.c:1724 src/setup.c:56
+#: src/mainwindow.c:1730 src/setup.c:56
 msgid "Mailbox"
 msgstr "Correo"
 
-#: src/mainwindow.c:1730 src/setup.c:62
+#: src/mainwindow.c:1736 src/setup.c:62
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3606,129 +3611,129 @@ msgstr ""
 "Quizás ya existan los ficheros o no tenga permisos suficientes para "
 "escribir  en el directorio."
 
-#: src/mainwindow.c:2198
+#: src/mainwindow.c:2206
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Árbol de carpetas"
 
-#: src/mainwindow.c:2217
+#: src/mainwindow.c:2225
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Vista de mensaje"
 
-#: src/mainwindow.c:2369 src/summaryview.c:418
+#: src/mainwindow.c:2377 src/summaryview.c:418
 msgid "/_Reply"
 msgstr "/_Responder"
 
-#: src/mainwindow.c:2370
+#: src/mainwindow.c:2378
 msgid "/Reply to _all"
 msgstr "/Responder a _todos"
 
-#: src/mainwindow.c:2371
+#: src/mainwindow.c:2379
 msgid "/Reply to _sender"
 msgstr "/Responder al _remitente"
 
-#: src/mainwindow.c:2372
+#: src/mainwindow.c:2380
 msgid "/Reply to mailing _list"
 msgstr "/Responder a la _lista de correo"
 
-#: src/mainwindow.c:2377 src/summaryview.c:425
+#: src/mainwindow.c:2385 src/summaryview.c:425
 msgid "/_Forward"
 msgstr "/_Reenviar"
 
-#: src/mainwindow.c:2378 src/summaryview.c:426
+#: src/mainwindow.c:2386 src/summaryview.c:426
 msgid "/For_ward as attachment"
 msgstr "/Reen_viar como adjunto"
 
-#: src/mainwindow.c:2379 src/summaryview.c:427
+#: src/mainwindow.c:2387 src/summaryview.c:427
 msgid "/Redirec_t"
 msgstr "/Red_irigir"
 
-#: src/mainwindow.c:2384
+#: src/mainwindow.c:2392
 msgid "Incorporate new mail"
 msgstr "Incorporar correo nuevo"
 
-#: src/mainwindow.c:2386
+#: src/mainwindow.c:2394
 msgid "Incorporate new mail of all accounts"
 msgstr "Incorporar correo nuevo de todas las cuentas"
 
-#: src/mainwindow.c:2388
+#: src/mainwindow.c:2396
 msgid "Send queued message(s)"
 msgstr "Enviar mensaje(s) en la cola"
 
-#: src/mainwindow.c:2390
+#: src/mainwindow.c:2398
 msgid "Compose new message"
 msgstr "Componer mensaje nuevo"
 
-#: src/mainwindow.c:2392
+#: src/mainwindow.c:2400
 msgid "Reply to the message"
 msgstr "Responder al mensaje"
 
-#: src/mainwindow.c:2394
+#: src/mainwindow.c:2402
 msgid "Reply to all"
 msgstr "Responder a todos"
 
-#: src/mainwindow.c:2396
+#: src/mainwindow.c:2404
 msgid "Forward the message"
 msgstr "Reenviar el mensaje"
 
-#: src/mainwindow.c:2398
+#: src/mainwindow.c:2406
 msgid "Delete the message"
 msgstr "Borrar el mensaje"
 
-#: src/mainwindow.c:2400
+#: src/mainwindow.c:2408
 msgid "Set as junk mail"
 msgstr "Es correo basura"
 
-#: src/mainwindow.c:2402
+#: src/mainwindow.c:2410
 msgid "Execute marked process"
 msgstr "Ejecutar el proceso marcado"
 
-#: src/mainwindow.c:2404
+#: src/mainwindow.c:2412
 msgid "Next unread message"
 msgstr "Siguiente no leído"
 
-#: src/mainwindow.c:2406
+#: src/mainwindow.c:2414
 #, fuzzy
 msgid "Previous unread message"
 msgstr "Siguiente no leído"
 
-#: src/mainwindow.c:2410
+#: src/mainwindow.c:2418
 #, fuzzy
 msgid "Print message"
 msgstr "Enviar mensaje"
 
-#: src/mainwindow.c:2412
+#: src/mainwindow.c:2420
 msgid "Common preferences"
 msgstr "Preferencias comunes"
 
-#: src/mainwindow.c:2414 src/prefs_account_dialog.c:511
+#: src/mainwindow.c:2422 src/prefs_account_dialog.c:511
 msgid "Account preferences"
 msgstr "Preferencias de la cuenta"
 
-#: src/mainwindow.c:2779
+#: src/mainwindow.c:2788
 msgid "You are offline. Click the icon to go online."
 msgstr "Esta desconectado. Haga click en el icono para conectar."
 
-#: src/mainwindow.c:2790
+#: src/mainwindow.c:2799
 msgid "You are online. Click the icon to go offline."
 msgstr "Esta conectado. Haga click en el icono para desconectar."
 
-#: src/mainwindow.c:3062
+#: src/mainwindow.c:3071
 msgid "Exit"
 msgstr "Salir"
 
-#: src/mainwindow.c:3062
+#: src/mainwindow.c:3071
 msgid "Exit this program?"
 msgstr "¿Salir del programa?"
 
-#: src/mainwindow.c:3666
+#: src/mainwindow.c:3675
 msgid "Command line options"
 msgstr "Opciones de línea de ordenes"
 
-#: src/mainwindow.c:3679
+#: src/mainwindow.c:3688
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Uso: sylpheed [OPCIÓN]..."
 
-#: src/mainwindow.c:3687
+#: src/mainwindow.c:3696
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -3756,7 +3761,7 @@ msgstr ""
 "--help\n"
 "--version"
 
-#: src/mainwindow.c:3703
+#: src/mainwindow.c:3712
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
diff --git a/po/et.po b/po/et.po
index b04db9e0..d2428681 100644
--- a/po/et.po
+++ b/po/et.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-01-31 16:49+0900\n"
+"POT-Creation-Date: 2007-01-31 17:29+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"
@@ -911,7 +911,7 @@ msgstr "/_Aadress/R_edigeeri"
 msgid "/_Address/_Delete"
 msgstr "/_Aadress/Kustuta"
 
-#: src/addressbook.c:359 src/compose.c:673 src/mainwindow.c:787
+#: src/addressbook.c:359 src/compose.c:673 src/mainwindow.c:789
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Tööriist"
@@ -920,12 +920,12 @@ msgstr "/_Tööriist"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Tööriist/Impordi _LDIF fail"
 
-#: src/addressbook.c:361 src/compose.c:694 src/mainwindow.c:841
+#: src/addressbook.c:361 src/compose.c:694 src/mainwindow.c:843
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Abi"
 
-#: src/addressbook.c:362 src/compose.c:695 src/mainwindow.c:853
+#: src/addressbook.c:362 src/compose.c:695 src/mainwindow.c:855
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Abi/Sellest"
@@ -967,7 +967,7 @@ msgstr "/Kustuta"
 msgid "E-Mail address"
 msgstr "E-Posti aadress"
 
-#: src/addressbook.c:496 src/compose.c:4873 src/mainwindow.c:2408
+#: src/addressbook.c:496 src/compose.c:4873 src/mainwindow.c:2416
 #: src/prefs_common_dialog.c:2274
 msgid "Address book"
 msgstr "Aadressiraamat"
@@ -1187,7 +1187,7 @@ msgstr "Üldine aadress"
 msgid "Personal address"
 msgstr "Isiklik aadress"
 
-#: src/alertpanel.c:142 src/compose.c:5717 src/main.c:638
+#: src/alertpanel.c:142 src/compose.c:5720 src/main.c:638
 msgid "Notice"
 msgstr "Märkus"
 
@@ -1361,9 +1361,9 @@ msgid "/_View/_Reply to"
 msgstr "/_Vaade/_Vasta"
 
 #: src/compose.c:578 src/compose.c:580 src/compose.c:582 src/compose.c:584
-#: src/compose.c:587 src/mainwindow.c:577 src/mainwindow.c:580
-#: src/mainwindow.c:607 src/mainwindow.c:631 src/mainwindow.c:734
-#: src/mainwindow.c:738 src/messageview.c:258
+#: src/compose.c:587 src/mainwindow.c:579 src/mainwindow.c:582
+#: src/mainwindow.c:609 src/mainwindow.c:633 src/mainwindow.c:736
+#: src/mainwindow.c:740 src/messageview.c:258
 msgid "/_View/---"
 msgstr "/_vaade/---"
 
@@ -1384,7 +1384,7 @@ msgstr "/_Vaade/_Manus"
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/_Vaade/_Ava/Teine kaust..."
 
-#: src/compose.c:593 src/mainwindow.c:638 src/messageview.c:173
+#: src/compose.c:593 src/mainwindow.c:640 src/messageview.c:173
 #, fuzzy
 msgid "/_View/Character _encoding"
 msgstr "/Vaade/_Sorteeri/Kahanevas järjekorras"
@@ -1396,138 +1396,138 @@ msgstr ""
 #: src/compose.c:596 src/compose.c:602 src/compose.c:608 src/compose.c:612
 #: src/compose.c:620 src/compose.c:624 src/compose.c:630 src/compose.c:636
 #: src/compose.c:640 src/compose.c:650 src/compose.c:654 src/compose.c:662
-#: src/compose.c:666 src/mainwindow.c:634 src/mainwindow.c:641
+#: src/compose.c:666 src/mainwindow.c:636 src/mainwindow.c:643
 #: src/messageview.c:169
 #, fuzzy
 msgid "/_View/Character _encoding/---"
 msgstr "/Vaade/_Sorteeri/Kahanevas järjekorras"
 
-#: src/compose.c:598 src/mainwindow.c:642 src/messageview.c:177
+#: src/compose.c:598 src/mainwindow.c:644 src/messageview.c:177
 #, fuzzy
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Vaade/_Kooditabel/7bitine ascii (US-ASCII)"
 
-#: src/compose.c:600 src/mainwindow.c:644 src/messageview.c:180
+#: src/compose.c:600 src/mainwindow.c:646 src/messageview.c:180
 #, fuzzy
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Vaade/_Kooditabel/Unicode (_UTF-8)"
 
-#: src/compose.c:604 src/mainwindow.c:648 src/messageview.c:183
+#: src/compose.c:604 src/mainwindow.c:650 src/messageview.c:183
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Vaade/_Kooditabel/Lääne-Euroopa (ISO-8859-_1)"
 
-#: src/compose.c:606 src/mainwindow.c:650 src/messageview.c:185
+#: src/compose.c:606 src/mainwindow.c:652 src/messageview.c:185
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Vaade/_Kooditabel/Lääne-Euroopa (ISO-8859-_15)"
 
-#: src/compose.c:610 src/mainwindow.c:656 src/messageview.c:190
+#: src/compose.c:610 src/mainwindow.c:658 src/messageview.c:190
 #, fuzzy
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Vaade/_Kooditabel/Kesk-Euroopa (ISO-8859-_2)"
 
-#: src/compose.c:614 src/mainwindow.c:660 src/messageview.c:193
+#: src/compose.c:614 src/mainwindow.c:662 src/messageview.c:193
 #, fuzzy
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Vaade/_Kooditabel/_Balti (ISO-8859-13)"
 
-#: src/compose.c:616 src/mainwindow.c:662 src/messageview.c:195
+#: src/compose.c:616 src/mainwindow.c:664 src/messageview.c:195
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Vaade/_Kooditabel/Balti (ISO-8859-_4)"
 
-#: src/compose.c:618 src/mainwindow.c:664 src/messageview.c:197
+#: src/compose.c:618 src/mainwindow.c:666 src/messageview.c:197
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/_Vaade/_Kooditabel/Kirillits (Windows-1251)"
 
-#: src/compose.c:622 src/mainwindow.c:668 src/messageview.c:200
+#: src/compose.c:622 src/mainwindow.c:670 src/messageview.c:200
 #, fuzzy
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Vaade/_Kooditabel/Greeka (ISO-8859-_7)"
 
-#: src/compose.c:626 src/mainwindow.c:672 src/messageview.c:203
+#: src/compose.c:626 src/mainwindow.c:674 src/messageview.c:203
 #, fuzzy
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/_Vaade/_Kooditabel/Balti (ISO-8859-_4)"
 
-#: src/compose.c:628 src/mainwindow.c:674 src/messageview.c:205
+#: src/compose.c:628 src/mainwindow.c:676 src/messageview.c:205
 #, fuzzy
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/_Vaade/_Kooditabel/Kirillits (Windows-1251)"
 
-#: src/compose.c:632 src/mainwindow.c:678 src/messageview.c:208
+#: src/compose.c:632 src/mainwindow.c:680 src/messageview.c:208
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Vaade/_Kooditabel/Greeka (ISO-8859-_7)"
 
-#: src/compose.c:634 src/mainwindow.c:680 src/messageview.c:210
+#: src/compose.c:634 src/mainwindow.c:682 src/messageview.c:210
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Vaade/_Kooditabel/Kirillits (Windows-1251)"
 
-#: src/compose.c:638 src/mainwindow.c:684 src/messageview.c:213
+#: src/compose.c:638 src/mainwindow.c:686 src/messageview.c:213
 #, fuzzy
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Vaade/_Kooditabel/Türgi (ISO-8859-_9)"
 
-#: src/compose.c:642 src/mainwindow.c:688 src/messageview.c:216
+#: src/compose.c:642 src/mainwindow.c:690 src/messageview.c:216
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Vaade/_Kooditabel/Kirillits (ISO-8859-_5)"
 
-#: src/compose.c:644 src/mainwindow.c:690 src/messageview.c:218
+#: src/compose.c:644 src/mainwindow.c:692 src/messageview.c:218
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Vaade/_Kooditabel/Kirillits (KOI8-_R)"
 
-#: src/compose.c:646 src/mainwindow.c:692 src/messageview.c:220
+#: src/compose.c:646 src/mainwindow.c:694 src/messageview.c:220
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Vaade/_Kooditabel/Kirillits (KOI8-_R)"
 
-#: src/compose.c:648 src/mainwindow.c:694 src/messageview.c:222
+#: src/compose.c:648 src/mainwindow.c:696 src/messageview.c:222
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Vaade/_Kooditabel/Kirillits (Windows-1251)"
 
-#: src/compose.c:652 src/mainwindow.c:698 src/messageview.c:225
+#: src/compose.c:652 src/mainwindow.c:700 src/messageview.c:225
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Vaade/_Kooditabel/Jaapan (ISO-2022-_JP)"
 
-#: src/compose.c:656 src/mainwindow.c:708 src/messageview.c:234
+#: src/compose.c:656 src/mainwindow.c:710 src/messageview.c:234
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Vaade/_Kooditabel/Lihtsustatud Hiina (_GB2312)"
 
-#: src/compose.c:658 src/mainwindow.c:710 src/messageview.c:236
+#: src/compose.c:658 src/mainwindow.c:712 src/messageview.c:236
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Vaade/_Kooditabel/Lihtsustatud Hiina (_GB2312)"
 
-#: src/compose.c:660 src/mainwindow.c:712 src/messageview.c:238
+#: src/compose.c:660 src/mainwindow.c:714 src/messageview.c:238
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Vaade/_Kooditabel/Traditsionaalne Hiine (_Big5)"
 
-#: src/compose.c:664 src/mainwindow.c:720 src/messageview.c:245
+#: src/compose.c:664 src/mainwindow.c:722 src/messageview.c:245
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Vaade/_Kooditabel/Korea (EUC-_KR)"
 
-#: src/compose.c:668 src/mainwindow.c:726 src/messageview.c:250
+#: src/compose.c:668 src/mainwindow.c:728 src/messageview.c:250
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Vaade/_Kooditabel/Tai (TIS-620)"
 
-#: src/compose.c:670 src/mainwindow.c:728 src/messageview.c:252
+#: src/compose.c:670 src/mainwindow.c:730 src/messageview.c:252
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Vaade/_Kooditabel/Tai (Windows-874)"
 
-#: src/compose.c:674 src/mainwindow.c:788 src/messageview.c:283
+#: src/compose.c:674 src/mainwindow.c:790 src/messageview.c:283
 msgid "/_Tools/_Address book"
 msgstr "/_Tööriist/_Aadressiraamat"
 
@@ -1535,13 +1535,13 @@ msgstr "/_Tööriist/_Aadressiraamat"
 msgid "/_Tools/_Template"
 msgstr "/_Tööriist/_Mall"
 
-#: src/compose.c:677 src/mainwindow.c:812 src/messageview.c:299
+#: src/compose.c:677 src/mainwindow.c:814 src/messageview.c:299
 msgid "/_Tools/Actio_ns"
 msgstr "/_Tööriist/Tegevused"
 
-#: src/compose.c:679 src/compose.c:683 src/compose.c:689 src/mainwindow.c:791
-#: src/mainwindow.c:805 src/mainwindow.c:810 src/mainwindow.c:813
-#: src/mainwindow.c:817 src/mainwindow.c:819 src/messageview.c:286
+#: src/compose.c:679 src/compose.c:683 src/compose.c:689 src/mainwindow.c:793
+#: src/mainwindow.c:807 src/mainwindow.c:812 src/mainwindow.c:815
+#: src/mainwindow.c:819 src/mainwindow.c:821 src/messageview.c:286
 #: src/messageview.c:298
 msgid "/_Tools/---"
 msgstr "/_Tööriist/---"
@@ -1747,7 +1747,7 @@ msgstr "/_Tööriist/Tegevused"
 msgid "PGP Encrypt"
 msgstr "/_Kiri/Krüpteeri"
 
-#: src/compose.c:4442 src/compose.c:5543
+#: src/compose.c:4442 src/compose.c:5546
 msgid "MIME type"
 msgstr "MIME tüüp"
 
@@ -1790,37 +1790,37 @@ msgstr "Redigeeri välise redaktoriga"
 msgid "Wrap all long lines"
 msgstr "Murra kõik pikad read"
 
-#: src/compose.c:5439
+#: src/compose.c:5442
 msgid "Invalid MIME type."
 msgstr "Vale MIME tüüp."
 
-#: src/compose.c:5457
+#: src/compose.c:5460
 msgid "File doesn't exist or is empty."
 msgstr "Faili ei eksisteeri või on see tühi."
 
-#: src/compose.c:5525
+#: src/compose.c:5528
 #, fuzzy
 msgid "Properties"
 msgstr "Omadus"
 
-#: src/compose.c:5545 src/prefs_common_dialog.c:1504
+#: src/compose.c:5548 src/prefs_common_dialog.c:1504
 msgid "Encoding"
 msgstr "Kodeerimine"
 
-#: src/compose.c:5568 src/prefs_folder_item.c:202
+#: src/compose.c:5571 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Tee"
 
-#: src/compose.c:5569
+#: src/compose.c:5572
 msgid "File name"
 msgstr "Failinimi"
 
-#: src/compose.c:5659
+#: src/compose.c:5662
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Välise redaktori käsurida on vale: `%s'\n"
 
-#: src/compose.c:5714
+#: src/compose.c:5717
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1830,52 +1830,52 @@ msgstr ""
 "Kas hävitame protsessi?\n"
 "protsessi grupi id: %d"
 
-#: src/compose.c:6040 src/mainwindow.c:2752
+#: src/compose.c:6043 src/mainwindow.c:2761
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:6156 src/compose.c:6161 src/compose.c:6167
+#: src/compose.c:6159 src/compose.c:6164 src/compose.c:6170
 msgid "Can't queue the message."
 msgstr "Kirja ei õnnestunud järjekorda asetada."
 
-#: src/compose.c:6258
+#: src/compose.c:6261
 #, fuzzy
 msgid "Select files"
 msgstr "Määra fail"
 
-#: src/compose.c:6281
+#: src/compose.c:6284
 msgid "Select file"
 msgstr "Määra fail"
 
-#: src/compose.c:6316
+#: src/compose.c:6319
 #, fuzzy
 msgid "Save message"
 msgstr "Saada kiri"
 
-#: src/compose.c:6317
+#: src/compose.c:6320
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Seda kirja on muudetud. kas kaotame selle?"
 
-#: src/compose.c:6319
+#: src/compose.c:6322
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:6361
+#: src/compose.c:6364
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Kas te tahate seda malli lisada '%s'-e ?"
 
-#: src/compose.c:6363
+#: src/compose.c:6366
 msgid "Apply template"
 msgstr "Lisa mall"
 
-#: src/compose.c:6364
+#: src/compose.c:6367
 #, fuzzy
 msgid "_Replace"
 msgstr "Asenda"
 
-#: src/compose.c:6364
+#: src/compose.c:6367
 #, fuzzy
 msgid "_Insert"
 msgstr "Lisa"
@@ -2338,12 +2338,12 @@ msgstr "Sean kausta info...\n"
 msgid "Setting folder info..."
 msgstr "Sean kausta info..."
 
-#: src/folderview.c:868 src/mainwindow.c:3748 src/setup.c:80
+#: src/folderview.c:868 src/mainwindow.c:3757 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Tuhnin kaustas %s%c%s ..."
 
-#: src/folderview.c:872 src/mainwindow.c:3753 src/setup.c:85
+#: src/folderview.c:872 src/mainwindow.c:3762 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Tuhnin kaustas %s ..."
@@ -3109,564 +3109,569 @@ msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/_Vaade/Näita või varja/_Nupuribal/Pilti _ja teksti"
 
 #: src/mainwindow.c:566
-msgid "/_View/Show or hi_de/_Toolbar/_Icon"
+#, fuzzy
+msgid "/_View/Show or hi_de/_Toolbar/Text at the _right of icon"
 msgstr "/_Vaade/Näita või varja/_Nupuribal/_Pilti"
 
 #: src/mainwindow.c:568
+msgid "/_View/Show or hi_de/_Toolbar/_Icon"
+msgstr "/_Vaade/Näita või varja/_Nupuribal/_Pilti"
+
+#: src/mainwindow.c:570
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/_Vaade/Näita või varja/_Nupuribal/_Teksti"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:572
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/_Vaade/Näita või varja/_Nupuribal/_Mitte midagi"
 
-#: src/mainwindow.c:572
+#: src/mainwindow.c:574
 #, fuzzy
 msgid "/_View/Show or hi_de/_Search bar"
 msgstr "/_Vaade/Näita või varja/Staatusri_ba"
 
-#: src/mainwindow.c:574
+#: src/mainwindow.c:576
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/_Vaade/Näita või varja/Staatusri_ba"
 
-#: src/mainwindow.c:576
+#: src/mainwindow.c:578
 #, fuzzy
 msgid "/_View/_Customize toolbar..."
 msgstr "/_Vaade/_Ava/Teine kaust..."
 
-#: src/mainwindow.c:578
+#: src/mainwindow.c:580
 msgid "/_View/Separate f_older tree"
 msgstr "/_Vaade/Eraldi kausta puu"
 
-#: src/mainwindow.c:579
+#: src/mainwindow.c:581
 #, fuzzy
 msgid "/_View/Separate _message view"
 msgstr "/_Vaade/Eraldi kirja vaade"
 
-#: src/mainwindow.c:581
+#: src/mainwindow.c:583
 msgid "/_View/_Sort"
 msgstr "/_Vaade/_Sorteeri"
 
-#: src/mainwindow.c:582
+#: src/mainwindow.c:584
 msgid "/_View/_Sort/by _number"
 msgstr "/_Vaade/_Sorteeri/_numbri järgi"
 
-#: src/mainwindow.c:583
+#: src/mainwindow.c:585
 msgid "/_View/_Sort/by s_ize"
 msgstr "/_Vaade/_Sorteeri/_suuruse järgi"
 
-#: src/mainwindow.c:584
+#: src/mainwindow.c:586
 msgid "/_View/_Sort/by _date"
 msgstr "/_Vaade/_Sorteeri/_kuupäeva järgi"
 
-#: src/mainwindow.c:585
+#: src/mainwindow.c:587
 #, fuzzy
 msgid "/_View/_Sort/by t_hread date"
 msgstr "/_Vaade/_Sorteeri/_kuupäeva järgi"
 
-#: src/mainwindow.c:586
+#: src/mainwindow.c:588
 msgid "/_View/_Sort/by _from"
 msgstr "/_Vaade/_Sorteeri/_vormi järgi"
 
-#: src/mainwindow.c:587
+#: src/mainwindow.c:589
 #, fuzzy
 msgid "/_View/_Sort/by _recipient"
 msgstr "/_Vaade/_Sorteeri/_suuruse järgi"
 
-#: src/mainwindow.c:588
+#: src/mainwindow.c:590
 msgid "/_View/_Sort/by _subject"
 msgstr "/_Vaade/_Sorteeri/_pealkirja järgi"
 
-#: src/mainwindow.c:589
+#: src/mainwindow.c:591
 msgid "/_View/_Sort/by _color label"
 msgstr "/_Vaade/_Sorteeri/v_ärvi järgi"
 
-#: src/mainwindow.c:591
+#: src/mainwindow.c:593
 msgid "/_View/_Sort/by _mark"
 msgstr "/_Vaade/_Sorteeri/_märgi järgi"
 
-#: src/mainwindow.c:592
+#: src/mainwindow.c:594
 msgid "/_View/_Sort/by _unread"
 msgstr "/_Vaade/_Sorteeri/m_itteloetute järgi"
 
-#: src/mainwindow.c:593
+#: src/mainwindow.c:595
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/_Vaade/_Sorteeri/kirja_lisade järgi"
 
-#: src/mainwindow.c:595
+#: src/mainwindow.c:597
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/_Vaade/_Sorteeri/Ära sorteeri"
 
-#: src/mainwindow.c:596 src/mainwindow.c:599
+#: src/mainwindow.c:598 src/mainwindow.c:601
 msgid "/_View/_Sort/---"
 msgstr "/_Vaade/_Sorteeri/---"
 
-#: src/mainwindow.c:597
+#: src/mainwindow.c:599
 msgid "/_View/_Sort/Ascending"
 msgstr "/Vaade/_Sorteeri/Kasvavas järjekorras"
 
-#: src/mainwindow.c:598
+#: src/mainwindow.c:600
 msgid "/_View/_Sort/Descending"
 msgstr "/Vaade/_Sorteeri/Kahanevas järjekorras"
 
-#: src/mainwindow.c:600
+#: src/mainwindow.c:602
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/_Vaade/_Sorteeri/*'_Attract' subjekti järgi"
 
-#: src/mainwindow.c:602
+#: src/mainwindow.c:604
 msgid "/_View/Th_read view"
 msgstr "/_Vaade/Teema_vaade"
 
-#: src/mainwindow.c:603
+#: src/mainwindow.c:605
 msgid "/_View/E_xpand all threads"
 msgstr "/_Vaade/Paisuta kõik teemad"
 
-#: src/mainwindow.c:604
+#: src/mainwindow.c:606
 msgid "/_View/Co_llapse all threads"
 msgstr "/_Vaade/Sulge kõik teemad"
 
-#: src/mainwindow.c:605
+#: src/mainwindow.c:607
 msgid "/_View/Set display _item..."
 msgstr "/_Vaade/Mää_ra näidatavad parameetrid"
 
-#: src/mainwindow.c:608
+#: src/mainwindow.c:610
 msgid "/_View/_Go to"
 msgstr "/_Vaade/_Ava"
 
-#: src/mainwindow.c:609
+#: src/mainwindow.c:611
 msgid "/_View/_Go to/_Prev message"
 msgstr "/_Vaade/_Ava/Eelmine kiri"
 
-#: src/mainwindow.c:610
+#: src/mainwindow.c:612
 msgid "/_View/_Go to/_Next message"
 msgstr "/_Vaade/_Ava/Järgmine kiri"
 
-#: src/mainwindow.c:611 src/mainwindow.c:616 src/mainwindow.c:619
-#: src/mainwindow.c:624 src/mainwindow.c:629
+#: src/mainwindow.c:613 src/mainwindow.c:618 src/mainwindow.c:621
+#: src/mainwindow.c:626 src/mainwindow.c:631
 msgid "/_View/_Go to/---"
 msgstr "/_Vaade/_Ava/---"
 
-#: src/mainwindow.c:612
+#: src/mainwindow.c:614
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/_Vaade/_Ava/_Eelmine mitteloetud kiri"
 
-#: src/mainwindow.c:614
+#: src/mainwindow.c:616
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/_Vaade/_Ava/_Järgmine mitteloetud kiri"
 
-#: src/mainwindow.c:617
+#: src/mainwindow.c:619
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/_Vaade/Mine/Eelmisele uuele kirjale"
 
-#: src/mainwindow.c:618
+#: src/mainwindow.c:620
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/_Vaade/Mine/Järgmisele uuele kirjale"
 
-#: src/mainwindow.c:620
+#: src/mainwindow.c:622
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/_Vaade/_Ava/Eelmine _märgitud kiri"
 
-#: src/mainwindow.c:622
+#: src/mainwindow.c:624
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/_Vaade/_Ava/Järgmine m_ärgitud kiri"
 
-#: src/mainwindow.c:625
+#: src/mainwindow.c:627
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/_Vaade/_Ava/Eelmine _sildiga kiri"
 
-#: src/mainwindow.c:627
+#: src/mainwindow.c:629
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/_Vaade/_Ava/Jägmine s_ildiga kiri"
 
-#: src/mainwindow.c:630
+#: src/mainwindow.c:632
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Vaade/_Ava/Teine kaust..."
 
-#: src/mainwindow.c:639 src/messageview.c:174
+#: src/mainwindow.c:641 src/messageview.c:174
 #, fuzzy
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Vaade/_Kooditabel/Määra _Automaatselt"
 
-#: src/mainwindow.c:652 src/messageview.c:187
+#: src/mainwindow.c:654 src/messageview.c:187
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr "/_Vaade/_Kooditabel/Lääne-Euroopa (ISO-8859-_15)"
 
-#: src/mainwindow.c:700 src/messageview.c:227
+#: src/mainwindow.c:702 src/messageview.c:227
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Vaade/_Kooditabel/Jaapan (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:702 src/messageview.c:229
+#: src/mainwindow.c:704 src/messageview.c:229
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Vaade/_Kooditabel/Jaapan (_EUC-JP)"
 
-#: src/mainwindow.c:704 src/messageview.c:231
+#: src/mainwindow.c:706 src/messageview.c:231
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Vaade/_Kooditabel/Jaapan (_Shift__JIS)"
 
-#: src/mainwindow.c:714 src/messageview.c:240
+#: src/mainwindow.c:716 src/messageview.c:240
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Vaade/_Kooditabel/Traditsionaalne Hiina (EUC-_TW)"
 
-#: src/mainwindow.c:716 src/messageview.c:242
+#: src/mainwindow.c:718 src/messageview.c:242
 #, fuzzy
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Vaade/_Kooditabel/Hiina (ISO-2022-_CN)"
 
-#: src/mainwindow.c:722 src/messageview.c:247
+#: src/mainwindow.c:724 src/messageview.c:247
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Vaade/_Kooditabel/Korea (ISO-2022-KR)"
 
-#: src/mainwindow.c:735 src/summaryview.c:464
+#: src/mainwindow.c:737 src/summaryview.c:464
 msgid "/_View/Open in new _window"
 msgstr "/Vaade/Ava uues aknas"
 
-#: src/mainwindow.c:736 src/messageview.c:259 src/summaryview.c:466
+#: src/mainwindow.c:738 src/messageview.c:259 src/summaryview.c:466
 msgid "/_View/Mess_age source"
 msgstr "/_Vaade/Näita kirja lähtekoodi"
 
-#: src/mainwindow.c:737 src/messageview.c:260 src/summaryview.c:467
+#: src/mainwindow.c:739 src/messageview.c:260 src/summaryview.c:467
 #, fuzzy
 msgid "/_View/All _headers"
 msgstr "/Vaade/Kõik päised"
 
-#: src/mainwindow.c:739
+#: src/mainwindow.c:741
 msgid "/_View/_Update summary"
 msgstr "/_Vaade/_Uuenda koond"
 
-#: src/mainwindow.c:741 src/messageview.c:263
+#: src/mainwindow.c:743 src/messageview.c:263
 msgid "/_Message"
 msgstr "/_Kiri"
 
-#: src/mainwindow.c:742
+#: src/mainwindow.c:744
 #, fuzzy
 msgid "/_Message/Recei_ve"
 msgstr "/_Kiri/Kirjuta _ümber"
 
-#: src/mainwindow.c:743
+#: src/mainwindow.c:745
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/_Kiri/Võta _kõigilt kontodelt"
 
-#: src/mainwindow.c:745
+#: src/mainwindow.c:747
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/_Kiri/Võta _kõigilt kontodelt"
 
-#: src/mainwindow.c:747
+#: src/mainwindow.c:749
 #, fuzzy
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/_Kiri/Katkesta kirjade võtmine"
 
-#: src/mainwindow.c:749
+#: src/mainwindow.c:751
 #, fuzzy
 msgid "/_Message/Recei_ve/---"
 msgstr "/_Kiri/Kirjuta _ümber"
 
-#: src/mainwindow.c:750
+#: src/mainwindow.c:752
 msgid "/_Message/_Send queued messages"
 msgstr "/_Kiri/_Saada järjekorras olevad kirjad"
 
-#: src/mainwindow.c:751 src/mainwindow.c:753 src/mainwindow.c:760
-#: src/mainwindow.c:765 src/mainwindow.c:768 src/mainwindow.c:779
-#: src/mainwindow.c:781 src/mainwindow.c:784 src/messageview.c:266
+#: src/mainwindow.c:753 src/mainwindow.c:755 src/mainwindow.c:762
+#: src/mainwindow.c:767 src/mainwindow.c:770 src/mainwindow.c:781
+#: src/mainwindow.c:783 src/mainwindow.c:786 src/messageview.c:266
 #: src/messageview.c:274 src/messageview.c:279
 msgid "/_Message/---"
 msgstr "/_Kiri/---"
 
-#: src/mainwindow.c:752 src/messageview.c:264
+#: src/mainwindow.c:754 src/messageview.c:264
 msgid "/_Message/Compose _new message"
 msgstr "/_Kiri/Uus k_iri"
 
-#: src/mainwindow.c:754 src/messageview.c:267
+#: src/mainwindow.c:756 src/messageview.c:267
 msgid "/_Message/_Reply"
 msgstr "/_Kiri/_Vasta"
 
-#: src/mainwindow.c:755
+#: src/mainwindow.c:757
 msgid "/_Message/Repl_y to"
 msgstr "/_Kiri/_Vasta"
 
-#: src/mainwindow.c:756 src/messageview.c:268
+#: src/mainwindow.c:758 src/messageview.c:268
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Kiri/Vasta/k_õigile"
 
-#: src/mainwindow.c:757 src/messageview.c:270
+#: src/mainwindow.c:759 src/messageview.c:270
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Kiri/Vas_ta/_saatjale"
 
-#: src/mainwindow.c:758 src/messageview.c:272
+#: src/mainwindow.c:760 src/messageview.c:272
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Kiri/Vasta/kirja _listi"
 
-#: src/mainwindow.c:761 src/messageview.c:275
+#: src/mainwindow.c:763 src/messageview.c:275
 msgid "/_Message/_Forward"
 msgstr "/_Kiri/Saada _edasi"
 
-#: src/mainwindow.c:762 src/messageview.c:276
+#: src/mainwindow.c:764 src/messageview.c:276
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Kiri/Saada edasi _manusena"
 
-#: src/mainwindow.c:764 src/messageview.c:278
+#: src/mainwindow.c:766 src/messageview.c:278
 msgid "/_Message/Redirec_t"
 msgstr "/_Kiri/Suuna _ümber"
 
-#: src/mainwindow.c:766
+#: src/mainwindow.c:768
 msgid "/_Message/M_ove..."
 msgstr "/_Kiri/_Nihuta..."
 
-#: src/mainwindow.c:767
+#: src/mainwindow.c:769
 msgid "/_Message/_Copy..."
 msgstr "/_Kiri/K_opeeri..."
 
-#: src/mainwindow.c:769
+#: src/mainwindow.c:771
 msgid "/_Message/_Mark"
 msgstr "/_Kiri/M_ärk"
 
-#: src/mainwindow.c:770
+#: src/mainwindow.c:772
 msgid "/_Message/_Mark/_Mark"
 msgstr "/_Kiri/M_ärk/M_ärgi"
 
-#: src/mainwindow.c:771
+#: src/mainwindow.c:773
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/_Kiri/M_ärk/_Eemaldan märgi"
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:774
 msgid "/_Message/_Mark/---"
 msgstr "/_Kiri/M_ärk/---"
 
-#: src/mainwindow.c:773
+#: src/mainwindow.c:775
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/_Kiri/M_ärk/Märgin _mitteloetuks"
 
-#: src/mainwindow.c:774
+#: src/mainwindow.c:776
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/_Kiri/M_ärk/Märgin _loetuks"
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:778
 #, fuzzy
 msgid "/_Message/_Mark/Mark _thread as read"
 msgstr "/_Kiri/M_ärk/Märgin _loetuks"
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:780
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/_Kiri/M_ärk/Märgin _kõik loetuks"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:782
 msgid "/_Message/_Delete"
 msgstr "/_Kiri/Kustuta"
 
-#: src/mainwindow.c:782
+#: src/mainwindow.c:784
 #, fuzzy
 msgid "/_Message/Set as _junk mail"
 msgstr "/_Kiri/Võta _uued kirjad"
 
-#: src/mainwindow.c:783
+#: src/mainwindow.c:785
 #, fuzzy
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/_Kiri/Võta _uued kirjad"
 
-#: src/mainwindow.c:785 src/messageview.c:280
+#: src/mainwindow.c:787 src/messageview.c:280
 msgid "/_Message/Re-_edit"
 msgstr "/_Kiri/Kirjuta _ümber"
 
-#: src/mainwindow.c:789
+#: src/mainwindow.c:791
 #, fuzzy
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/_Tööriist/Lisa saatja aadressi raamatusse"
 
-#: src/mainwindow.c:792
+#: src/mainwindow.c:794
 #, fuzzy
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/_Tööriist/_Filtreeri kirjad"
 
-#: src/mainwindow.c:794
+#: src/mainwindow.c:796
 #, fuzzy
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Tööriist/_Filtreeri kirjad"
 
-#: src/mainwindow.c:796 src/messageview.c:287
+#: src/mainwindow.c:798 src/messageview.c:287
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Tööriist/Loo filtri reeglistik"
 
-#: src/mainwindow.c:797 src/messageview.c:289
+#: src/mainwindow.c:799 src/messageview.c:289
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Tööriist/Loo filtri reeglistik/Automaatselt"
 
-#: src/mainwindow.c:799 src/messageview.c:291
+#: src/mainwindow.c:801 src/messageview.c:291
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Tööriist/Loo filtri reeglistik/ kasutades Kellelt"
 
-#: src/mainwindow.c:801 src/messageview.c:293
+#: src/mainwindow.c:803 src/messageview.c:293
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Tööriist/Loo filtri reeglistik/kasutades Kellele"
 
-#: src/mainwindow.c:803 src/messageview.c:295
+#: src/mainwindow.c:805 src/messageview.c:295
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Tööriist/Loo filtri reeglistik/ kasutades päälkirja"
 
-#: src/mainwindow.c:806
+#: src/mainwindow.c:808
 #, fuzzy
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/_Tööriist/_Filtreeri kirjad"
 
-#: src/mainwindow.c:808
+#: src/mainwindow.c:810
 #, fuzzy
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/_Tööriist/_Filtreeri kirjad"
 
-#: src/mainwindow.c:815
+#: src/mainwindow.c:817
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/_Tööriist/_Kustuta topelt kirjad"
 
-#: src/mainwindow.c:818
+#: src/mainwindow.c:820
 #, fuzzy
 msgid "/_Tools/E_xecute marked process"
 msgstr "Käivita märgitud protsess"
 
-#: src/mainwindow.c:820
+#: src/mainwindow.c:822
 msgid "/_Tools/_Log window"
 msgstr "/_Tööriist/_Teadete aken"
 
-#: src/mainwindow.c:822
+#: src/mainwindow.c:824
 msgid "/_Configuration"
 msgstr "/_Häälestus"
 
-#: src/mainwindow.c:823
+#: src/mainwindow.c:825
 msgid "/_Configuration/_Common preferences..."
 msgstr "/_Häälestus/_Üldised omadused..."
 
-#: src/mainwindow.c:825
+#: src/mainwindow.c:827
 msgid "/_Configuration/_Filter setting..."
 msgstr "/_Häälestus/_Filtri seaded..."
 
-#: src/mainwindow.c:827
+#: src/mainwindow.c:829
 msgid "/_Configuration/_Template..."
 msgstr "/_Häälestus/_Mall..."
 
-#: src/mainwindow.c:829
+#: src/mainwindow.c:831
 msgid "/_Configuration/_Actions..."
 msgstr "/_Häälestus/Tegevused..."
 
-#: src/mainwindow.c:831
+#: src/mainwindow.c:833
 msgid "/_Configuration/---"
 msgstr "/_Häälestus/---"
 
-#: src/mainwindow.c:832
+#: src/mainwindow.c:834
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Häälestus/_Hetkel kasutatava konto omadused..."
 
-#: src/mainwindow.c:834
+#: src/mainwindow.c:836
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Häälestus/_Loo uus konto..."
 
-#: src/mainwindow.c:836
+#: src/mainwindow.c:838
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Häälestus/_Redigeeri kontosid..."
 
-#: src/mainwindow.c:838
+#: src/mainwindow.c:840
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Häälestus/_Muuda kasutatavat kontot"
 
-#: src/mainwindow.c:842
+#: src/mainwindow.c:844
 msgid "/_Help/_Manual"
 msgstr "/_Abi/_Juhend"
 
-#: src/mainwindow.c:843
+#: src/mainwindow.c:845
 msgid "/_Help/_Manual/_English"
 msgstr "/_Abi/_Juhend/_Inglise"
 
-#: src/mainwindow.c:844
+#: src/mainwindow.c:846
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/_Abi/_Juhend/_Jaapani"
 
-#: src/mainwindow.c:845
+#: src/mainwindow.c:847
 msgid "/_Help/_FAQ"
 msgstr "/_Abi/_KKK"
 
-#: src/mainwindow.c:846
+#: src/mainwindow.c:848
 msgid "/_Help/_FAQ/_English"
 msgstr "/_Abi/_KKK/_Inglise"
 
-#: src/mainwindow.c:847
+#: src/mainwindow.c:849
 msgid "/_Help/_FAQ/_German"
 msgstr "/_Abi/_KKK/_Saksa"
 
-#: src/mainwindow.c:848
+#: src/mainwindow.c:850
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/_Abi/_KKK/_Hispaania"
 
-#: src/mainwindow.c:849
+#: src/mainwindow.c:851
 msgid "/_Help/_FAQ/_French"
 msgstr "/_Abi/_KKK/_Prantsuse"
 
-#: src/mainwindow.c:850
+#: src/mainwindow.c:852
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/_Abi/_KKK/_Itaalia"
 
-#: src/mainwindow.c:851
+#: src/mainwindow.c:853
 #, fuzzy
 msgid "/_Help/_Command line options"
 msgstr "Käsurida ei ole sisestatud."
 
-#: src/mainwindow.c:852
+#: src/mainwindow.c:854
 msgid "/_Help/---"
 msgstr "/_Abi/---"
 
-#: src/mainwindow.c:895
+#: src/mainwindow.c:897
 msgid "Creating main window...\n"
 msgstr "Loon peamise akna...\n"
 
-#: src/mainwindow.c:1071
+#: src/mainwindow.c:1073
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "PeaAken: värvi haldamine %d ebaõnnestus\n"
 
-#: src/mainwindow.c:1175 src/summaryview.c:2387 src/summaryview.c:2472
+#: src/mainwindow.c:1181 src/summaryview.c:2387 src/summaryview.c:2472
 #: src/summaryview.c:4009 src/summaryview.c:4138 src/summaryview.c:4507
 msgid "done.\n"
 msgstr "tehtud.\n"
 
-#: src/mainwindow.c:1293 src/mainwindow.c:1334 src/mainwindow.c:1359
+#: src/mainwindow.c:1299 src/mainwindow.c:1340 src/mainwindow.c:1365
 msgid "Untitled"
 msgstr "Tiitlita"
 
-#: src/mainwindow.c:1360
+#: src/mainwindow.c:1366
 msgid "none"
 msgstr "mittemiski"
 
-#: src/mainwindow.c:1413
+#: src/mainwindow.c:1419
 #, 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:1663
+#: src/mainwindow.c:1669
 msgid "Offline"
 msgstr ""
 
-#: src/mainwindow.c:1664
+#: src/mainwindow.c:1670
 msgid "You are offline. Go online?"
 msgstr ""
 
-#: src/mainwindow.c:1681
+#: src/mainwindow.c:1687
 #, fuzzy
 msgid "Empty all trash"
 msgstr "Tühjenda prügikast"
 
-#: src/mainwindow.c:1682
+#: src/mainwindow.c:1688
 #, fuzzy
 msgid "Delete all messages in trash folders?"
 msgstr "Kas eemaldada kõik kirjad prügikastist?"
 
-#: src/mainwindow.c:1712
+#: src/mainwindow.c:1718
 msgid "Add mailbox"
 msgstr "Lisa kirjakast"
 
-#: src/mainwindow.c:1713
+#: src/mainwindow.c:1719
 #, fuzzy
 msgid ""
 "Specify the location of mailbox.\n"
@@ -3676,16 +3681,16 @@ msgstr ""
 "Sisesta kirjakasti asukoht.\n"
 "Kui määrate juba olemasoleva kirjakasti, siis seeskaneeritakse automaatselt."
 
-#: src/mainwindow.c:1719 src/setup.c:49
+#: src/mainwindow.c:1725 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Kirjakast %s on juba olemas."
 
-#: src/mainwindow.c:1724 src/setup.c:56
+#: src/mainwindow.c:1730 src/setup.c:56
 msgid "Mailbox"
 msgstr "Kirjakast"
 
-#: src/mainwindow.c:1730 src/setup.c:62
+#: src/mainwindow.c:1736 src/setup.c:62
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3694,135 +3699,135 @@ msgstr ""
 "Kirjakasti loomine ebaõnnestus.\n"
 "Võibolla mõned failid on olemas, või teil pole õigusi sinna kirjutamiseks."
 
-#: src/mainwindow.c:2198
+#: src/mainwindow.c:2206
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - kausta vaade"
 
-#: src/mainwindow.c:2217
+#: src/mainwindow.c:2225
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - kirja vaade"
 
-#: src/mainwindow.c:2369 src/summaryview.c:418
+#: src/mainwindow.c:2377 src/summaryview.c:418
 msgid "/_Reply"
 msgstr "/Vastan"
 
-#: src/mainwindow.c:2370
+#: src/mainwindow.c:2378
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "Vasta ja saada koopia kõigile, kes said selle kirja"
 
-#: src/mainwindow.c:2371
+#: src/mainwindow.c:2379
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/Vasta/_saatjale"
 
-#: src/mainwindow.c:2372
+#: src/mainwindow.c:2380
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/Vasta/kirja_listi"
 
-#: src/mainwindow.c:2377 src/summaryview.c:425
+#: src/mainwindow.c:2385 src/summaryview.c:425
 msgid "/_Forward"
 msgstr "/Saadan edasi"
 
-#: src/mainwindow.c:2378 src/summaryview.c:426
+#: src/mainwindow.c:2386 src/summaryview.c:426
 msgid "/For_ward as attachment"
 msgstr "/Saada edasi manusena"
 
-#: src/mainwindow.c:2379 src/summaryview.c:427
+#: src/mainwindow.c:2387 src/summaryview.c:427
 msgid "/Redirec_t"
 msgstr "/Suuna ümber"
 
-#: src/mainwindow.c:2384
+#: src/mainwindow.c:2392
 msgid "Incorporate new mail"
 msgstr "Võta uued kirjad"
 
-#: src/mainwindow.c:2386
+#: src/mainwindow.c:2394
 msgid "Incorporate new mail of all accounts"
 msgstr "Võta kõigilt kontodelt uued kirjad"
 
-#: src/mainwindow.c:2388
+#: src/mainwindow.c:2396
 msgid "Send queued message(s)"
 msgstr "Saada kirjad järjekorrast"
 
-#: src/mainwindow.c:2390
+#: src/mainwindow.c:2398
 msgid "Compose new message"
 msgstr "Kirjuta uus kiri"
 
-#: src/mainwindow.c:2392
+#: src/mainwindow.c:2400
 msgid "Reply to the message"
 msgstr "Vasta kirjale"
 
-#: src/mainwindow.c:2394
+#: src/mainwindow.c:2402
 msgid "Reply to all"
 msgstr "Vasta ja saada koopia kõigile, kes said selle kirja"
 
-#: src/mainwindow.c:2396
+#: src/mainwindow.c:2404
 msgid "Forward the message"
 msgstr "Saada kiri edasi"
 
-#: src/mainwindow.c:2398
+#: src/mainwindow.c:2406
 msgid "Delete the message"
 msgstr "Kustuta kiri"
 
-#: src/mainwindow.c:2400
+#: src/mainwindow.c:2408
 #, fuzzy
 msgid "Set as junk mail"
 msgstr " Määra vaikimisi kontoks "
 
-#: src/mainwindow.c:2402
+#: src/mainwindow.c:2410
 msgid "Execute marked process"
 msgstr "Käivita märgitud protsess"
 
-#: src/mainwindow.c:2404
+#: src/mainwindow.c:2412
 msgid "Next unread message"
 msgstr "Järgmine kiri mida pole loetud"
 
-#: src/mainwindow.c:2406
+#: src/mainwindow.c:2414
 #, fuzzy
 msgid "Previous unread message"
 msgstr "Järgmine kiri mida pole loetud"
 
-#: src/mainwindow.c:2410
+#: src/mainwindow.c:2418
 #, fuzzy
 msgid "Print message"
 msgstr "Saada kiri"
 
-#: src/mainwindow.c:2412
+#: src/mainwindow.c:2420
 msgid "Common preferences"
 msgstr "Üldised omaduse"
 
-#: src/mainwindow.c:2414 src/prefs_account_dialog.c:511
+#: src/mainwindow.c:2422 src/prefs_account_dialog.c:511
 msgid "Account preferences"
 msgstr "Konto omadused"
 
-#: src/mainwindow.c:2779
+#: src/mainwindow.c:2788
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 
-#: src/mainwindow.c:2790
+#: src/mainwindow.c:2799
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 
-#: src/mainwindow.c:3062
+#: src/mainwindow.c:3071
 msgid "Exit"
 msgstr "Välju"
 
-#: src/mainwindow.c:3062
+#: src/mainwindow.c:3071
 msgid "Exit this program?"
 msgstr "Lõpetame programmi töö."
 
-#: src/mainwindow.c:3666
+#: src/mainwindow.c:3675
 #, fuzzy
 msgid "Command line options"
 msgstr "Käsurida ei ole sisestatud."
 
-#: src/mainwindow.c:3679
+#: src/mainwindow.c:3688
 #, fuzzy
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Kauta: %s [SEADED]...\n"
 
-#: src/mainwindow.c:3687
+#: src/mainwindow.c:3696
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -3838,7 +3843,7 @@ msgid ""
 "--version"
 msgstr ""
 
-#: src/mainwindow.c:3703
+#: src/mainwindow.c:3712
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
diff --git a/po/fr.po b/po/fr.po
index 2d2fca92..450178be 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-01-31 16:49+0900\n"
+"POT-Creation-Date: 2007-01-31 17:29+0900\n"
 "PO-Revision-Date: 2007-01-14 02:22+0100\n"
 "Last-Translator: tvY <mr.somewhere@yahoo.fr>\n"
 "Language-Team: French\n"
@@ -920,7 +920,7 @@ msgstr "/_Adresse/Édit_er"
 msgid "/_Address/_Delete"
 msgstr "/_Adresse/_Supprimer"
 
-#: src/addressbook.c:359 src/compose.c:673 src/mainwindow.c:787
+#: src/addressbook.c:359 src/compose.c:673 src/mainwindow.c:789
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Outils"
@@ -929,12 +929,12 @@ msgstr "/_Outils"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Outils/Importer un fichier _LDIF"
 
-#: src/addressbook.c:361 src/compose.c:694 src/mainwindow.c:841
+#: src/addressbook.c:361 src/compose.c:694 src/mainwindow.c:843
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/A_ide"
 
-#: src/addressbook.c:362 src/compose.c:695 src/mainwindow.c:853
+#: src/addressbook.c:362 src/compose.c:695 src/mainwindow.c:855
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/A_ide/À _propos"
@@ -976,7 +976,7 @@ msgstr "/_Supprimer"
 msgid "E-Mail address"
 msgstr "Adresse électronique"
 
-#: src/addressbook.c:496 src/compose.c:4873 src/mainwindow.c:2408
+#: src/addressbook.c:496 src/compose.c:4873 src/mainwindow.c:2416
 #: src/prefs_common_dialog.c:2274
 msgid "Address book"
 msgstr "Carnet d'adresses"
@@ -1197,7 +1197,7 @@ msgstr "Adresse courante :"
 msgid "Personal address"
 msgstr "Adresse personnelle :"
 
-#: src/alertpanel.c:142 src/compose.c:5717 src/main.c:638
+#: src/alertpanel.c:142 src/compose.c:5720 src/main.c:638
 msgid "Notice"
 msgstr "Information"
 
@@ -1364,9 +1364,9 @@ msgid "/_View/_Reply to"
 msgstr "/_Affichage/_Répondre à"
 
 #: src/compose.c:578 src/compose.c:580 src/compose.c:582 src/compose.c:584
-#: src/compose.c:587 src/mainwindow.c:577 src/mainwindow.c:580
-#: src/mainwindow.c:607 src/mainwindow.c:631 src/mainwindow.c:734
-#: src/mainwindow.c:738 src/messageview.c:258
+#: src/compose.c:587 src/mainwindow.c:579 src/mainwindow.c:582
+#: src/mainwindow.c:609 src/mainwindow.c:633 src/mainwindow.c:736
+#: src/mainwindow.c:740 src/messageview.c:258
 msgid "/_View/---"
 msgstr "/_Affichage/---"
 
@@ -1387,7 +1387,7 @@ msgstr "/_Affichage/_Pièce(s) jointe(s)"
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/_Affichage/_Aller à/Autre _dossier..."
 
-#: src/compose.c:593 src/mainwindow.c:638 src/messageview.c:173
+#: src/compose.c:593 src/mainwindow.c:640 src/messageview.c:173
 msgid "/_View/Character _encoding"
 msgstr "/_Affichage/_Jeu de caractères"
 
@@ -1398,112 +1398,112 @@ msgstr "/_Affichage/_Jeu de caractères/_Automatique"
 #: src/compose.c:596 src/compose.c:602 src/compose.c:608 src/compose.c:612
 #: src/compose.c:620 src/compose.c:624 src/compose.c:630 src/compose.c:636
 #: src/compose.c:640 src/compose.c:650 src/compose.c:654 src/compose.c:662
-#: src/compose.c:666 src/mainwindow.c:634 src/mainwindow.c:641
+#: src/compose.c:666 src/mainwindow.c:636 src/mainwindow.c:643
 #: src/messageview.c:169
 msgid "/_View/Character _encoding/---"
 msgstr "/_Affichage/_Jeu de caractères/---"
 
-#: src/compose.c:598 src/mainwindow.c:642 src/messageview.c:177
+#: src/compose.c:598 src/mainwindow.c:644 src/messageview.c:177
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Affichage/_Jeu de caractères/ASCII 7 bits (US-ASC_II)"
 
-#: src/compose.c:600 src/mainwindow.c:644 src/messageview.c:180
+#: src/compose.c:600 src/mainwindow.c:646 src/messageview.c:180
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Affichage/_Jeu de caractères/Unicode (_UTF-8)"
 
-#: src/compose.c:604 src/mainwindow.c:648 src/messageview.c:183
+#: src/compose.c:604 src/mainwindow.c:650 src/messageview.c:183
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Affichage/_Jeu de caractères/Europe occidentale (ISO-8859-_1)"
 
-#: src/compose.c:606 src/mainwindow.c:650 src/messageview.c:185
+#: src/compose.c:606 src/mainwindow.c:652 src/messageview.c:185
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Affichage/_Jeu de caractères/Europe occidentale (ISO-8859-15)"
 
-#: src/compose.c:610 src/mainwindow.c:656 src/messageview.c:190
+#: src/compose.c:610 src/mainwindow.c:658 src/messageview.c:190
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Affichage/_Jeu de caractères/Europe centrale (ISO-8859-_2)"
 
-#: src/compose.c:614 src/mainwindow.c:660 src/messageview.c:193
+#: src/compose.c:614 src/mainwindow.c:662 src/messageview.c:193
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Affichage/_Jeu de caractères/Balte (ISO-8859-13)"
 
-#: src/compose.c:616 src/mainwindow.c:662 src/messageview.c:195
+#: src/compose.c:616 src/mainwindow.c:664 src/messageview.c:195
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Affichage/_Jeu de caractères/Balte (ISO-8859-_4)"
 
-#: src/compose.c:618 src/mainwindow.c:664 src/messageview.c:197
+#: src/compose.c:618 src/mainwindow.c:666 src/messageview.c:197
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/_Affichage/_Jeu de caractères/Balte (Windows-1257)"
 
-#: src/compose.c:622 src/mainwindow.c:668 src/messageview.c:200
+#: src/compose.c:622 src/mainwindow.c:670 src/messageview.c:200
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Affichage/_Jeu de caractères/Grec (ISO-8859-_7)"
 
-#: src/compose.c:626 src/mainwindow.c:672 src/messageview.c:203
+#: src/compose.c:626 src/mainwindow.c:674 src/messageview.c:203
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/_Affichage/_Jeu de caractères/Arabe (ISO-8859-_6)"
 
-#: src/compose.c:628 src/mainwindow.c:674 src/messageview.c:205
+#: src/compose.c:628 src/mainwindow.c:676 src/messageview.c:205
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/_Affichage/_Jeu de caractères/Arabe (Windows-1256)"
 
-#: src/compose.c:632 src/mainwindow.c:678 src/messageview.c:208
+#: src/compose.c:632 src/mainwindow.c:680 src/messageview.c:208
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Affichage/_Jeu de caractères/Hébreu (ISO-8859-_8)"
 
-#: src/compose.c:634 src/mainwindow.c:680 src/messageview.c:210
+#: src/compose.c:634 src/mainwindow.c:682 src/messageview.c:210
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Affichage/_Jeu de caractères/Hébreu (Windows-1255)"
 
-#: src/compose.c:638 src/mainwindow.c:684 src/messageview.c:213
+#: src/compose.c:638 src/mainwindow.c:686 src/messageview.c:213
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Affichage/_Jeu de caractères/Turc (ISO-8859-_9)"
 
-#: src/compose.c:642 src/mainwindow.c:688 src/messageview.c:216
+#: src/compose.c:642 src/mainwindow.c:690 src/messageview.c:216
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Affichage/_Jeu de caractères/Cyrillique (ISO-8859-_5)"
 
-#: src/compose.c:644 src/mainwindow.c:690 src/messageview.c:218
+#: src/compose.c:644 src/mainwindow.c:692 src/messageview.c:218
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Affichage/_Jeu de caractères/Cyrillique (KOI8-_R)"
 
-#: src/compose.c:646 src/mainwindow.c:692 src/messageview.c:220
+#: src/compose.c:646 src/mainwindow.c:694 src/messageview.c:220
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Affichage/_Jeu de caractères/Cyrillique (KOI8-U)"
 
-#: src/compose.c:648 src/mainwindow.c:694 src/messageview.c:222
+#: src/compose.c:648 src/mainwindow.c:696 src/messageview.c:222
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Affichage/_Jeu de caractères/Cyrillique (Windows-1251)"
 
-#: src/compose.c:652 src/mainwindow.c:698 src/messageview.c:225
+#: src/compose.c:652 src/mainwindow.c:700 src/messageview.c:225
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Affichage/_Jeu de caractères/Japonais (ISO-2022-_JP)"
 
-#: src/compose.c:656 src/mainwindow.c:708 src/messageview.c:234
+#: src/compose.c:656 src/mainwindow.c:710 src/messageview.c:234
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Affichage/_Jeu de caractères/Chinois simplifié (_GB2312)"
 
-#: src/compose.c:658 src/mainwindow.c:710 src/messageview.c:236
+#: src/compose.c:658 src/mainwindow.c:712 src/messageview.c:236
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Affichage/_Jeu de caractères/Chinois simplifié (GBK)"
 
-#: src/compose.c:660 src/mainwindow.c:712 src/messageview.c:238
+#: src/compose.c:660 src/mainwindow.c:714 src/messageview.c:238
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Affichage/_Jeu de caractères/Chinois traditionnel (_Big5)"
 
-#: src/compose.c:664 src/mainwindow.c:720 src/messageview.c:245
+#: src/compose.c:664 src/mainwindow.c:722 src/messageview.c:245
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Affichage/_Jeu de caractères/Coréen (EUC-_KR)"
 
-#: src/compose.c:668 src/mainwindow.c:726 src/messageview.c:250
+#: src/compose.c:668 src/mainwindow.c:728 src/messageview.c:250
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Affichage/_Jeu de caractères/Thaï (TIS-620)"
 
-#: src/compose.c:670 src/mainwindow.c:728 src/messageview.c:252
+#: src/compose.c:670 src/mainwindow.c:730 src/messageview.c:252
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Affichage/_Jeu de caractères/Thaï (Windows-874)"
 
-#: src/compose.c:674 src/mainwindow.c:788 src/messageview.c:283
+#: src/compose.c:674 src/mainwindow.c:790 src/messageview.c:283
 msgid "/_Tools/_Address book"
 msgstr "/_Outils/_Carnet d'adresses"
 
@@ -1511,13 +1511,13 @@ msgstr "/_Outils/_Carnet d'adresses"
 msgid "/_Tools/_Template"
 msgstr "/_Outils/_Modèle"
 
-#: src/compose.c:677 src/mainwindow.c:812 src/messageview.c:299
+#: src/compose.c:677 src/mainwindow.c:814 src/messageview.c:299
 msgid "/_Tools/Actio_ns"
 msgstr "/_Outils/_Actions"
 
-#: src/compose.c:679 src/compose.c:683 src/compose.c:689 src/mainwindow.c:791
-#: src/mainwindow.c:805 src/mainwindow.c:810 src/mainwindow.c:813
-#: src/mainwindow.c:817 src/mainwindow.c:819 src/messageview.c:286
+#: src/compose.c:679 src/compose.c:683 src/compose.c:689 src/mainwindow.c:793
+#: src/mainwindow.c:807 src/mainwindow.c:812 src/mainwindow.c:815
+#: src/mainwindow.c:819 src/mainwindow.c:821 src/messageview.c:286
 #: src/messageview.c:298
 msgid "/_Tools/---"
 msgstr "/_Outils/---"
@@ -1725,7 +1725,7 @@ msgstr "Signature PGP"
 msgid "PGP Encrypt"
 msgstr "Chiffrement PGP"
 
-#: src/compose.c:4442 src/compose.c:5543
+#: src/compose.c:4442 src/compose.c:5546
 msgid "MIME type"
 msgstr "Type MIME"
 
@@ -1767,36 +1767,36 @@ msgstr "Éditer avec un éditeur externe"
 msgid "Wrap all long lines"
 msgstr "Justifier tout le message"
 
-#: src/compose.c:5439
+#: src/compose.c:5442
 msgid "Invalid MIME type."
 msgstr "Type MIME invalide."
 
-#: src/compose.c:5457
+#: src/compose.c:5460
 msgid "File doesn't exist or is empty."
 msgstr "Le fichier n'existe pas ou est vide."
 
-#: src/compose.c:5525
+#: src/compose.c:5528
 msgid "Properties"
 msgstr "Propriétés"
 
-#: src/compose.c:5545 src/prefs_common_dialog.c:1504
+#: src/compose.c:5548 src/prefs_common_dialog.c:1504
 msgid "Encoding"
 msgstr "Encodage"
 
-#: src/compose.c:5568 src/prefs_folder_item.c:202
+#: src/compose.c:5571 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Chemin d'accès"
 
-#: src/compose.c:5569
+#: src/compose.c:5572
 msgid "File name"
 msgstr "Nom du fichier"
 
-#: src/compose.c:5659
+#: src/compose.c:5662
 #, 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:5714
+#: src/compose.c:5717
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1805,50 +1805,50 @@ msgstr ""
 "L'éditeur externe est encore ouvert.\n"
 "Forcer sa fermeture (id de traitement de groupe : %d) ?\n"
 
-#: src/compose.c:6040 src/mainwindow.c:2752
+#: src/compose.c:6043 src/mainwindow.c:2761
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:6156 src/compose.c:6161 src/compose.c:6167
+#: src/compose.c:6159 src/compose.c:6164 src/compose.c:6170
 msgid "Can't queue the message."
 msgstr "Impossible de mettre ce message dans la file d'attente."
 
-#: src/compose.c:6258
+#: src/compose.c:6261
 msgid "Select files"
 msgstr "Sélection de fichier"
 
-#: src/compose.c:6281
+#: src/compose.c:6284
 msgid "Select file"
 msgstr "Choisissez un fichier"
 
-#: src/compose.c:6316
+#: src/compose.c:6319
 msgid "Save message"
 msgstr "Enregistrer le message"
 
-#: src/compose.c:6317
+#: src/compose.c:6320
 msgid "This message has been modified. Save it to draft folder?"
 msgstr ""
 "Ce message a été modifié. Voulez-vous l'enregistrer dans le dossier des "
 "brouillons ?"
 
-#: src/compose.c:6319
+#: src/compose.c:6322
 msgid "Close _without saving"
 msgstr "Fermer _sans enregistrer"
 
-#: src/compose.c:6361
+#: src/compose.c:6364
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Voulez-vous appliquer le modèle « %s » ?"
 
-#: src/compose.c:6363
+#: src/compose.c:6366
 msgid "Apply template"
 msgstr "Appliquer un modèle"
 
-#: src/compose.c:6364
+#: src/compose.c:6367
 msgid "_Replace"
 msgstr "_Remplacer"
 
-#: src/compose.c:6364
+#: src/compose.c:6367
 msgid "_Insert"
 msgstr "_Insérer"
 
@@ -2306,12 +2306,12 @@ msgstr "Enregistrement des données des dossiers...\n"
 msgid "Setting folder info..."
 msgstr "Initialisation des données des dossiers..."
 
-#: src/folderview.c:868 src/mainwindow.c:3748 src/setup.c:80
+#: src/folderview.c:868 src/mainwindow.c:3757 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Analyse du dossier %s%c%s ..."
 
-#: src/folderview.c:872 src/mainwindow.c:3753 src/setup.c:85
+#: src/folderview.c:872 src/mainwindow.c:3762 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Analyse du dossier %s ..."
@@ -3082,536 +3082,541 @@ msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/_Affichage/Affic_her ou masquer/Barre d'_outils/Icônes _et textes"
 
 #: src/mainwindow.c:566
-msgid "/_View/Show or hi_de/_Toolbar/_Icon"
+#, fuzzy
+msgid "/_View/Show or hi_de/_Toolbar/Text at the _right of icon"
 msgstr "/_Affichage/Affic_her ou masquer/Barre d'_outils/_Icônes seulement"
 
 #: src/mainwindow.c:568
+msgid "/_View/Show or hi_de/_Toolbar/_Icon"
+msgstr "/_Affichage/Affic_her ou masquer/Barre d'_outils/_Icônes seulement"
+
+#: src/mainwindow.c:570
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/_Affichage/Affic_her ou masquer/Barre d'_outils/_Textes seulement"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:572
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr ""
 "/_Affichage/Affic_her ou masquer/Barre d'_outils/_Pas de barre d'outils"
 
-#: src/mainwindow.c:572
+#: src/mainwindow.c:574
 msgid "/_View/Show or hi_de/_Search bar"
 msgstr "/_Affichage/Affic_her ou masquer/_Barre de recherche"
 
-#: src/mainwindow.c:574
+#: src/mainwindow.c:576
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/_Affichage/Affic_her ou masquer/_Barre d'état"
 
-#: src/mainwindow.c:576
+#: src/mainwindow.c:578
 #, fuzzy
 msgid "/_View/_Customize toolbar..."
 msgstr "/_Affichage/_Aller à/Autre _dossier..."
 
-#: src/mainwindow.c:578
+#: src/mainwindow.c:580
 msgid "/_View/Separate f_older tree"
 msgstr "/_Affichage/Séparer la fenêtre des _dossiers"
 
-#: src/mainwindow.c:579
+#: src/mainwindow.c:581
 msgid "/_View/Separate _message view"
 msgstr "/_Affichage/Séparer la fenêtre des _messages"
 
-#: src/mainwindow.c:581
+#: src/mainwindow.c:583
 msgid "/_View/_Sort"
 msgstr "/_Affichage/_Trier"
 
-#: src/mainwindow.c:582
+#: src/mainwindow.c:584
 msgid "/_View/_Sort/by _number"
 msgstr "/_Affichage/_Trier/Trier par _numéro"
 
-#: src/mainwindow.c:583
+#: src/mainwindow.c:585
 msgid "/_View/_Sort/by s_ize"
 msgstr "/_Affichage/_Trier/Trier par _taille"
 
-#: src/mainwindow.c:584
+#: src/mainwindow.c:586
 msgid "/_View/_Sort/by _date"
 msgstr "/_Affichage/_Trier/Trier par _date"
 
-#: src/mainwindow.c:585
+#: src/mainwindow.c:587
 msgid "/_View/_Sort/by t_hread date"
 msgstr "/_Affichage/_Trier/Trier par date (en_filades)"
 
-#: src/mainwindow.c:586
+#: src/mainwindow.c:588
 msgid "/_View/_Sort/by _from"
 msgstr "/_Affichage/_Trier/Trier par e_xpéditeur"
 
-#: src/mainwindow.c:587
+#: src/mainwindow.c:589
 msgid "/_View/_Sort/by _recipient"
 msgstr "/_Affichage/_Trier/Trier par d_estinataire"
 
-#: src/mainwindow.c:588
+#: src/mainwindow.c:590
 msgid "/_View/_Sort/by _subject"
 msgstr "/_Affichage/_Trier/Trier par _sujet"
 
-#: src/mainwindow.c:589
+#: src/mainwindow.c:591
 msgid "/_View/_Sort/by _color label"
 msgstr "/_Affichage/_Trier/Trier par _couleur"
 
-#: src/mainwindow.c:591
+#: src/mainwindow.c:593
 msgid "/_View/_Sort/by _mark"
 msgstr "/_Affichage/_Trier/Trier par _marque"
 
-#: src/mainwindow.c:592
+#: src/mainwindow.c:594
 msgid "/_View/_Sort/by _unread"
 msgstr "/_Affichage/_Trier/Trier par non _lu"
 
-#: src/mainwindow.c:593
+#: src/mainwindow.c:595
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/_Affichage/_Trier/Trier par pièce _jointe"
 
-#: src/mainwindow.c:595
+#: src/mainwindow.c:597
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/_Affichage/_Trier/Ne _pas trier"
 
-#: src/mainwindow.c:596 src/mainwindow.c:599
+#: src/mainwindow.c:598 src/mainwindow.c:601
 msgid "/_View/_Sort/---"
 msgstr "/_Affichage/_Trier/---"
 
-#: src/mainwindow.c:597
+#: src/mainwindow.c:599
 msgid "/_View/_Sort/Ascending"
 msgstr "/_Affichage/_Trier/_Ordre croissant"
 
-#: src/mainwindow.c:598
+#: src/mainwindow.c:600
 msgid "/_View/_Sort/Descending"
 msgstr "/_Affichage/_Trier/O_rdre décroissant"
 
-#: src/mainwindow.c:600
+#: src/mainwindow.c:602
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/_Affichage/_Trier/_Attirer par sujet"
 
-#: src/mainwindow.c:602
+#: src/mainwindow.c:604
 msgid "/_View/Th_read view"
 msgstr "/_Affichage/Affichage par _fil de conversation"
 
-#: src/mainwindow.c:603
+#: src/mainwindow.c:605
 msgid "/_View/E_xpand all threads"
 msgstr "/_Affichage/Dé_ployer les fils de conversation"
 
-#: src/mainwindow.c:604
+#: src/mainwindow.c:606
 msgid "/_View/Co_llapse all threads"
 msgstr "/_Affichage/_Compacter les fils de conversation"
 
-#: src/mainwindow.c:605
+#: src/mainwindow.c:607
 msgid "/_View/Set display _item..."
 msgstr "/_Affichage/Sélect_ion des éléments affichés..."
 
-#: src/mainwindow.c:608
+#: src/mainwindow.c:610
 msgid "/_View/_Go to"
 msgstr "/_Affichage/_Aller à"
 
-#: src/mainwindow.c:609
+#: src/mainwindow.c:611
 msgid "/_View/_Go to/_Prev message"
 msgstr "/_Affichage/_Aller à/Message _précédent"
 
-#: src/mainwindow.c:610
+#: src/mainwindow.c:612
 msgid "/_View/_Go to/_Next message"
 msgstr "/_Affichage/_Aller à/Message suiva_nt"
 
-#: src/mainwindow.c:611 src/mainwindow.c:616 src/mainwindow.c:619
-#: src/mainwindow.c:624 src/mainwindow.c:629
+#: src/mainwindow.c:613 src/mainwindow.c:618 src/mainwindow.c:621
+#: src/mainwindow.c:626 src/mainwindow.c:631
 msgid "/_View/_Go to/---"
 msgstr "/_Affichage/_Aller à/---"
 
-#: src/mainwindow.c:612
+#: src/mainwindow.c:614
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/_Affichage/_Aller à/Non l_u précédent"
 
-#: src/mainwindow.c:614
+#: src/mainwindow.c:616
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/_Affichage/_Aller à/Non _lu suivant"
 
-#: src/mainwindow.c:617
+#: src/mainwindow.c:619
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/_Affichage/_Aller à/Message nouveau précédent"
 
-#: src/mainwindow.c:618
+#: src/mainwindow.c:620
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/_Affichage/_Aller à/Message nouveau suivant"
 
-#: src/mainwindow.c:620
+#: src/mainwindow.c:622
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/_Affichage/_Aller à/M_arqué précédent"
 
-#: src/mainwindow.c:622
+#: src/mainwindow.c:624
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/_Affichage/_Aller à/_Marqué suivant"
 
-#: src/mainwindow.c:625
+#: src/mainwindow.c:627
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/_Affichage/_Aller à/C_oloré précédent"
 
-#: src/mainwindow.c:627
+#: src/mainwindow.c:629
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/_Affichage/_Aller à/_Coloré suivant"
 
-#: src/mainwindow.c:630
+#: src/mainwindow.c:632
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Affichage/_Aller à/Autre _dossier..."
 
-#: src/mainwindow.c:639 src/messageview.c:174
+#: src/mainwindow.c:641 src/messageview.c:174
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Affichage/_Jeu de caractères/Détection _automatique"
 
-#: src/mainwindow.c:652 src/messageview.c:187
+#: src/mainwindow.c:654 src/messageview.c:187
 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr "/_Affichage/_Jeu de caractères/Europe occidentale (Windows-1252)"
 
-#: src/mainwindow.c:700 src/messageview.c:227
+#: src/mainwindow.c:702 src/messageview.c:227
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Affichage/_Jeu de caractères/Japonais (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:702 src/messageview.c:229
+#: src/mainwindow.c:704 src/messageview.c:229
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Affichage/_Jeu de caractères/Japonais (_EUC-JP)"
 
-#: src/mainwindow.c:704 src/messageview.c:231
+#: src/mainwindow.c:706 src/messageview.c:231
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Affichage/_Jeu de caractères/Japonais (_Shift__JIS)"
 
-#: src/mainwindow.c:714 src/messageview.c:240
+#: src/mainwindow.c:716 src/messageview.c:240
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Affichage/_Jeu de caractères/Chinois traditionnel (EUC-_TW)"
 
-#: src/mainwindow.c:716 src/messageview.c:242
+#: src/mainwindow.c:718 src/messageview.c:242
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Affichage/_Jeu de caractères/Chinois (ISO-2022-_CN)"
 
-#: src/mainwindow.c:722 src/messageview.c:247
+#: src/mainwindow.c:724 src/messageview.c:247
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Affichage/_Jeu de caractères/Coréen (ISO-2022-KR)"
 
-#: src/mainwindow.c:735 src/summaryview.c:464
+#: src/mainwindow.c:737 src/summaryview.c:464
 msgid "/_View/Open in new _window"
 msgstr "/_Affichage/_Ouvrir dans une nouvelle fenêtre"
 
-#: src/mainwindow.c:736 src/messageview.c:259 src/summaryview.c:466
+#: src/mainwindow.c:738 src/messageview.c:259 src/summaryview.c:466
 msgid "/_View/Mess_age source"
 msgstr "/_Affichage/_Voir le message complet"
 
-#: src/mainwindow.c:737 src/messageview.c:260 src/summaryview.c:467
+#: src/mainwindow.c:739 src/messageview.c:260 src/summaryview.c:467
 msgid "/_View/All _headers"
 msgstr "/_Affichage/Afficher tous le_s en-têtes"
 
-#: src/mainwindow.c:739
+#: src/mainwindow.c:741
 msgid "/_View/_Update summary"
 msgstr "/_Affichage/Mettre à jo_ur le résumé des messages"
 
-#: src/mainwindow.c:741 src/messageview.c:263
+#: src/mainwindow.c:743 src/messageview.c:263
 msgid "/_Message"
 msgstr "/_Message"
 
-#: src/mainwindow.c:742
+#: src/mainwindow.c:744
 msgid "/_Message/Recei_ve"
 msgstr "/_Message/Réce_ptionner"
 
-#: src/mainwindow.c:743
+#: src/mainwindow.c:745
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/_Message/Réce_ptionner/le courrier du _compte courant"
 
-#: src/mainwindow.c:745
+#: src/mainwindow.c:747
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/_Message/Réce_ptionner/le courrier de _tous les comptes"
 
-#: src/mainwindow.c:747
+#: src/mainwindow.c:749
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/_Message/Réce_ptionner/_Annuler la réception"
 
-#: src/mainwindow.c:749
+#: src/mainwindow.c:751
 msgid "/_Message/Recei_ve/---"
 msgstr "/_Message/Réce_ptionner/---"
 
-#: src/mainwindow.c:750
+#: src/mainwindow.c:752
 msgid "/_Message/_Send queued messages"
 msgstr "/_Message/En_voyer les messages en file d'attente"
 
-#: src/mainwindow.c:751 src/mainwindow.c:753 src/mainwindow.c:760
-#: src/mainwindow.c:765 src/mainwindow.c:768 src/mainwindow.c:779
-#: src/mainwindow.c:781 src/mainwindow.c:784 src/messageview.c:266
+#: src/mainwindow.c:753 src/mainwindow.c:755 src/mainwindow.c:762
+#: src/mainwindow.c:767 src/mainwindow.c:770 src/mainwindow.c:781
+#: src/mainwindow.c:783 src/mainwindow.c:786 src/messageview.c:266
 #: src/messageview.c:274 src/messageview.c:279
 msgid "/_Message/---"
 msgstr "/_Message/---"
 
-#: src/mainwindow.c:752 src/messageview.c:264
+#: src/mainwindow.c:754 src/messageview.c:264
 msgid "/_Message/Compose _new message"
 msgstr "/_Message/Composer un nou_veau message"
 
-#: src/mainwindow.c:754 src/messageview.c:267
+#: src/mainwindow.c:756 src/messageview.c:267
 msgid "/_Message/_Reply"
 msgstr "/_Message/_Répondre"
 
-#: src/mainwindow.c:755
+#: src/mainwindow.c:757
 msgid "/_Message/Repl_y to"
 msgstr "/_Message/Rép_ondre à"
 
-#: src/mainwindow.c:756 src/messageview.c:268
+#: src/mainwindow.c:758 src/messageview.c:268
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Message/Rép_ondre à/_tous"
 
-#: src/mainwindow.c:757 src/messageview.c:270
+#: src/mainwindow.c:759 src/messageview.c:270
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Message/Rép_ondre à/l'_expéditeur"
 
-#: src/mainwindow.c:758 src/messageview.c:272
+#: src/mainwindow.c:760 src/messageview.c:272
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Message/Rép_ondre à/la _liste"
 
-#: src/mainwindow.c:761 src/messageview.c:275
+#: src/mainwindow.c:763 src/messageview.c:275
 msgid "/_Message/_Forward"
 msgstr "/_Message/_Transférer"
 
-#: src/mainwindow.c:762 src/messageview.c:276
+#: src/mainwindow.c:764 src/messageview.c:276
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Message/Transférer en tant que pièce _jointe"
 
-#: src/mainwindow.c:764 src/messageview.c:278
+#: src/mainwindow.c:766 src/messageview.c:278
 msgid "/_Message/Redirec_t"
 msgstr "/_Message/Rediri_ger"
 
-#: src/mainwindow.c:766
+#: src/mainwindow.c:768
 msgid "/_Message/M_ove..."
 msgstr "/_Message/_Déplacer..."
 
-#: src/mainwindow.c:767
+#: src/mainwindow.c:769
 msgid "/_Message/_Copy..."
 msgstr "/_Message/_Copier..."
 
-#: src/mainwindow.c:769
+#: src/mainwindow.c:771
 msgid "/_Message/_Mark"
 msgstr "/_Message/_Marquer"
 
-#: src/mainwindow.c:770
+#: src/mainwindow.c:772
 msgid "/_Message/_Mark/_Mark"
 msgstr "/_Message/_Marquer/_Marquer"
 
-#: src/mainwindow.c:771
+#: src/mainwindow.c:773
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/_Message/_Marquer/_Démarquer"
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:774
 msgid "/_Message/_Mark/---"
 msgstr "/_Message/_Marquer/---"
 
-#: src/mainwindow.c:773
+#: src/mainwindow.c:775
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/_Message/_Marque/Marquer comme _non lu"
 
-#: src/mainwindow.c:774
+#: src/mainwindow.c:776
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/_Message/_Marque/Marquer comme _lu"
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:778
 msgid "/_Message/_Mark/Mark _thread as read"
 msgstr "/_Message/_Marque/Marquer l'en_filade comme lue"
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:780
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/_Message/_Marque/Marquer _tous comme lu"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:782
 msgid "/_Message/_Delete"
 msgstr "/_Message/_Supprimer"
 
-#: src/mainwindow.c:782
+#: src/mainwindow.c:784
 msgid "/_Message/Set as _junk mail"
 msgstr "/_Message/Marquer comme indésira_ble"
 
-#: src/mainwindow.c:783
+#: src/mainwindow.c:785
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/_Message/Marquer comme acc_eptable"
 
-#: src/mainwindow.c:785 src/messageview.c:280
+#: src/mainwindow.c:787 src/messageview.c:280
 msgid "/_Message/Re-_edit"
 msgstr "/_Message/Réédit_er"
 
-#: src/mainwindow.c:789
+#: src/mainwindow.c:791
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/_Outils/Aj_outer l'expéditeur dans le carnet d'adresses..."
 
-#: src/mainwindow.c:792
+#: src/mainwindow.c:794
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/_Outils/_Filtrer les messages du dossier"
 
-#: src/mainwindow.c:794
+#: src/mainwindow.c:796
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Outils/Filtrer les messages _sélectionnés"
 
-#: src/mainwindow.c:796 src/messageview.c:287
+#: src/mainwindow.c:798 src/messageview.c:287
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Outils/Créer une règle de f_iltrage"
 
-#: src/mainwindow.c:797 src/messageview.c:289
+#: src/mainwindow.c:799 src/messageview.c:289
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Outils/Créer une règle de f_iltrage/automatiq_uement"
 
-#: src/mainwindow.c:799 src/messageview.c:291
+#: src/mainwindow.c:801 src/messageview.c:291
 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:801 src/messageview.c:293
+#: src/mainwindow.c:803 src/messageview.c:293
 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:803 src/messageview.c:295
+#: src/mainwindow.c:805 src/messageview.c:295
 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:806
+#: src/mainwindow.c:808
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/_Outils/Filtrer les _indésirables du dossier"
 
-#: src/mainwindow.c:808
+#: src/mainwindow.c:810
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/_Outils/Filtrer les indésirables dans les _messages sélectionnés"
 
-#: src/mainwindow.c:815
+#: src/mainwindow.c:817
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/_Message/Supprimer les messages en dou_ble"
 
-#: src/mainwindow.c:818
+#: src/mainwindow.c:820
 #, fuzzy
 msgid "/_Tools/E_xecute marked process"
 msgstr "Exécuter les commandes marquées"
 
-#: src/mainwindow.c:820
+#: src/mainwindow.c:822
 msgid "/_Tools/_Log window"
 msgstr "/Ou_tils/_Journal de connexion"
 
-#: src/mainwindow.c:822
+#: src/mainwindow.c:824
 msgid "/_Configuration"
 msgstr "/_Configuration"
 
-#: src/mainwindow.c:823
+#: src/mainwindow.c:825
 msgid "/_Configuration/_Common preferences..."
 msgstr "/_Configuration/Préférences _générales..."
 
-#: src/mainwindow.c:825
+#: src/mainwindow.c:827
 msgid "/_Configuration/_Filter setting..."
 msgstr "/_Configuration/_Filtres..."
 
-#: src/mainwindow.c:827
+#: src/mainwindow.c:829
 msgid "/_Configuration/_Template..."
 msgstr "/_Configuration/_Modèles..."
 
-#: src/mainwindow.c:829
+#: src/mainwindow.c:831
 msgid "/_Configuration/_Actions..."
 msgstr "/_Configuration/_Actions..."
 
-#: src/mainwindow.c:831
+#: src/mainwindow.c:833
 msgid "/_Configuration/---"
 msgstr "/_Configuration/---"
 
-#: src/mainwindow.c:832
+#: src/mainwindow.c:834
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Configuration/_Configuration du compte courant..."
 
-#: src/mainwindow.c:834
+#: src/mainwindow.c:836
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Configuration/Création d'un _nouveau compte..."
 
-#: src/mainwindow.c:836
+#: src/mainwindow.c:838
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Configuration/Édition des compt_es..."
 
-#: src/mainwindow.c:838
+#: src/mainwindow.c:840
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Configuration/Choi_sir un autre compte"
 
-#: src/mainwindow.c:842
+#: src/mainwindow.c:844
 msgid "/_Help/_Manual"
 msgstr "/A_ide/_Manuel"
 
-#: src/mainwindow.c:843
+#: src/mainwindow.c:845
 msgid "/_Help/_Manual/_English"
 msgstr "/A_ide/_Manuel/_Anglais"
 
-#: src/mainwindow.c:844
+#: src/mainwindow.c:846
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/A_ide/_Manuel/_Japonais"
 
-#: src/mainwindow.c:845
+#: src/mainwindow.c:847
 msgid "/_Help/_FAQ"
 msgstr "/A_ide/_Foire Aux Questions (FAQ)"
 
-#: src/mainwindow.c:846
+#: src/mainwindow.c:848
 msgid "/_Help/_FAQ/_English"
 msgstr "/A_ide/_Foire Aux Questions (FAQ)/_Anglais"
 
-#: src/mainwindow.c:847
+#: src/mainwindow.c:849
 msgid "/_Help/_FAQ/_German"
 msgstr "/A_ide/_Foire Aux Questions (FAQ)/A_llemand"
 
-#: src/mainwindow.c:848
+#: src/mainwindow.c:850
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/A_ide/_Foire Aux Questions (FAQ)/_Espagnol"
 
-#: src/mainwindow.c:849
+#: src/mainwindow.c:851
 msgid "/_Help/_FAQ/_French"
 msgstr "/A_ide/_Foire Aux Questions (FAQ)/_Français"
 
-#: src/mainwindow.c:850
+#: src/mainwindow.c:852
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/A_ide/_Foire Aux Questions (FAQ)/_Italien"
 
-#: src/mainwindow.c:851
+#: src/mainwindow.c:853
 msgid "/_Help/_Command line options"
 msgstr "/A_ide/_Options de ligne de commande"
 
-#: src/mainwindow.c:852
+#: src/mainwindow.c:854
 msgid "/_Help/---"
 msgstr "/A_ide/---"
 
-#: src/mainwindow.c:895
+#: src/mainwindow.c:897
 msgid "Creating main window...\n"
 msgstr "Création de la fenêtre principale...\n"
 
-#: src/mainwindow.c:1071
+#: src/mainwindow.c:1073
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Fenêtre principale : allocation de la couleur %d échouée\n"
 
-#: src/mainwindow.c:1175 src/summaryview.c:2387 src/summaryview.c:2472
+#: src/mainwindow.c:1181 src/summaryview.c:2387 src/summaryview.c:2472
 #: src/summaryview.c:4009 src/summaryview.c:4138 src/summaryview.c:4507
 msgid "done.\n"
 msgstr "terminé.\n"
 
-#: src/mainwindow.c:1293 src/mainwindow.c:1334 src/mainwindow.c:1359
+#: src/mainwindow.c:1299 src/mainwindow.c:1340 src/mainwindow.c:1365
 msgid "Untitled"
 msgstr "Sans titre"
 
-#: src/mainwindow.c:1360
+#: src/mainwindow.c:1366
 msgid "none"
 msgstr "aucun"
 
-#: src/mainwindow.c:1413
+#: src/mainwindow.c:1419
 #, 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:1663
+#: src/mainwindow.c:1669
 msgid "Offline"
 msgstr "Déconnecté"
 
-#: src/mainwindow.c:1664
+#: src/mainwindow.c:1670
 msgid "You are offline. Go online?"
 msgstr "Vous êtes déconnecté. Voulez-vous vous connecter ?"
 
-#: src/mainwindow.c:1681
+#: src/mainwindow.c:1687
 msgid "Empty all trash"
 msgstr "Vider toutes les corbeilles"
 
-#: src/mainwindow.c:1682
+#: src/mainwindow.c:1688
 msgid "Delete all messages in trash folders?"
 msgstr "Effacer tous les messages des corbeilles ?"
 
-#: src/mainwindow.c:1712
+#: src/mainwindow.c:1718
 msgid "Add mailbox"
 msgstr "Nouvelle boîte aux lettres"
 
-#: src/mainwindow.c:1713
+#: src/mainwindow.c:1719
 msgid ""
 "Specify the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3620,16 +3625,16 @@ msgstr ""
 "Saisissez l'emplacement de la nouvelle boîte aux lettres. Si elle\n"
 "existe déjà, elle sera automatiquement analysée."
 
-#: src/mainwindow.c:1719 src/setup.c:49
+#: src/mainwindow.c:1725 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "La boîte aux lettres « %s » existe déjà."
 
-#: src/mainwindow.c:1724 src/setup.c:56
+#: src/mainwindow.c:1730 src/setup.c:56
 msgid "Mailbox"
 msgstr "Boîte aux lettres"
 
-#: src/mainwindow.c:1730 src/setup.c:62
+#: src/mainwindow.c:1736 src/setup.c:62
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3639,129 +3644,129 @@ msgstr ""
 "Il se peut que les fichiers existent déjà, ou que vous n'ayez pas les droits "
 "en écriture."
 
-#: src/mainwindow.c:2198
+#: src/mainwindow.c:2206
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Dossiers"
 
-#: src/mainwindow.c:2217
+#: src/mainwindow.c:2225
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Message"
 
-#: src/mainwindow.c:2369 src/summaryview.c:418
+#: src/mainwindow.c:2377 src/summaryview.c:418
 msgid "/_Reply"
 msgstr "/_Répondre"
 
-#: src/mainwindow.c:2370
+#: src/mainwindow.c:2378
 msgid "/Reply to _all"
 msgstr "/Répondre à _tous"
 
-#: src/mainwindow.c:2371
+#: src/mainwindow.c:2379
 msgid "/Reply to _sender"
 msgstr "/Répondre à l'_expéditeur"
 
-#: src/mainwindow.c:2372
+#: src/mainwindow.c:2380
 msgid "/Reply to mailing _list"
 msgstr "/Répondre à la _liste"
 
-#: src/mainwindow.c:2377 src/summaryview.c:425
+#: src/mainwindow.c:2385 src/summaryview.c:425
 msgid "/_Forward"
 msgstr "/_Transférer"
 
-#: src/mainwindow.c:2378 src/summaryview.c:426
+#: src/mainwindow.c:2386 src/summaryview.c:426
 msgid "/For_ward as attachment"
 msgstr "/Transférer en pièce _jointe"
 
-#: src/mainwindow.c:2379 src/summaryview.c:427
+#: src/mainwindow.c:2387 src/summaryview.c:427
 msgid "/Redirec_t"
 msgstr "/Rediri_ger"
 
-#: src/mainwindow.c:2384
+#: src/mainwindow.c:2392
 msgid "Incorporate new mail"
 msgstr "Relever le courrier du compte courant"
 
-#: src/mainwindow.c:2386
+#: src/mainwindow.c:2394
 msgid "Incorporate new mail of all accounts"
 msgstr "Relever le courrier de tous les comptes"
 
-#: src/mainwindow.c:2388
+#: src/mainwindow.c:2396
 msgid "Send queued message(s)"
 msgstr "Envoyer les messages en attente"
 
-#: src/mainwindow.c:2390
+#: src/mainwindow.c:2398
 msgid "Compose new message"
 msgstr "Composer un nouveau message"
 
-#: src/mainwindow.c:2392
+#: src/mainwindow.c:2400
 msgid "Reply to the message"
 msgstr "Répondre au message"
 
-#: src/mainwindow.c:2394
+#: src/mainwindow.c:2402
 msgid "Reply to all"
 msgstr "Répondre à tous"
 
-#: src/mainwindow.c:2396
+#: src/mainwindow.c:2404
 msgid "Forward the message"
 msgstr "Transférer le message"
 
-#: src/mainwindow.c:2398
+#: src/mainwindow.c:2406
 msgid "Delete the message"
 msgstr "Supprimer le message"
 
-#: src/mainwindow.c:2400
+#: src/mainwindow.c:2408
 msgid "Set as junk mail"
 msgstr "Marquer comme indésirable"
 
-#: src/mainwindow.c:2402
+#: src/mainwindow.c:2410
 msgid "Execute marked process"
 msgstr "Exécuter les commandes marquées"
 
-#: src/mainwindow.c:2404
+#: src/mainwindow.c:2412
 msgid "Next unread message"
 msgstr "Message non lu suivant"
 
-#: src/mainwindow.c:2406
+#: src/mainwindow.c:2414
 #, fuzzy
 msgid "Previous unread message"
 msgstr "Message non lu suivant"
 
-#: src/mainwindow.c:2410
+#: src/mainwindow.c:2418
 #, fuzzy
 msgid "Print message"
 msgstr "Envoyer le message"
 
-#: src/mainwindow.c:2412
+#: src/mainwindow.c:2420
 msgid "Common preferences"
 msgstr "Préférences générales"
 
-#: src/mainwindow.c:2414 src/prefs_account_dialog.c:511
+#: src/mainwindow.c:2422 src/prefs_account_dialog.c:511
 msgid "Account preferences"
 msgstr "Configuration du compte"
 
-#: src/mainwindow.c:2779
+#: src/mainwindow.c:2788
 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:2790
+#: src/mainwindow.c:2799
 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:3062
+#: src/mainwindow.c:3071
 msgid "Exit"
 msgstr "Quitter"
 
-#: src/mainwindow.c:3062
+#: src/mainwindow.c:3071
 msgid "Exit this program?"
 msgstr "Quitter Sylpheed ?"
 
-#: src/mainwindow.c:3666
+#: src/mainwindow.c:3675
 msgid "Command line options"
 msgstr "Options de la ligne de commande"
 
-#: src/mainwindow.c:3679
+#: src/mainwindow.c:3688
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Utilisation : sylpheed [OPTION]..."
 
-#: src/mainwindow.c:3687
+#: src/mainwindow.c:3696
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -3789,7 +3794,7 @@ msgstr ""
 "--help\n"
 "--version"
 
-#: src/mainwindow.c:3703
+#: src/mainwindow.c:3712
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
diff --git a/po/gl.po b/po/gl.po
index ebbf5677..e574d0df 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-01-31 16:49+0900\n"
+"POT-Creation-Date: 2007-01-31 17:29+0900\n"
 "PO-Revision-Date: 2003-01-17 10:05+0100\n"
 "Last-Translator: Jorge Rivas\n"
 "Language-Team: Jorge Rivas\n"
@@ -909,7 +909,7 @@ msgstr "/_Enderezo/_Editar"
 msgid "/_Address/_Delete"
 msgstr "/_Enderezo/_Borrar"
 
-#: src/addressbook.c:359 src/compose.c:673 src/mainwindow.c:787
+#: src/addressbook.c:359 src/compose.c:673 src/mainwindow.c:789
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Ferramentas"
@@ -918,12 +918,12 @@ msgstr "/_Ferramentas"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Ferramentas/Importar ficheiro _LDIF"
 
-#: src/addressbook.c:361 src/compose.c:694 src/mainwindow.c:841
+#: src/addressbook.c:361 src/compose.c:694 src/mainwindow.c:843
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Axuda"
 
-#: src/addressbook.c:362 src/compose.c:695 src/mainwindow.c:853
+#: src/addressbook.c:362 src/compose.c:695 src/mainwindow.c:855
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Ayuda/_Acerca de"
@@ -965,7 +965,7 @@ msgstr "/_Borrar"
 msgid "E-Mail address"
 msgstr "Enderezo e-mail"
 
-#: src/addressbook.c:496 src/compose.c:4873 src/mainwindow.c:2408
+#: src/addressbook.c:496 src/compose.c:4873 src/mainwindow.c:2416
 #: src/prefs_common_dialog.c:2274
 msgid "Address book"
 msgstr "Axenda de enderezos"
@@ -1186,7 +1186,7 @@ msgstr "Enderezo común"
 msgid "Personal address"
 msgstr "Enderezo persoal"
 
-#: src/alertpanel.c:142 src/compose.c:5717 src/main.c:638
+#: src/alertpanel.c:142 src/compose.c:5720 src/main.c:638
 msgid "Notice"
 msgstr "Notificación"
 
@@ -1359,9 +1359,9 @@ msgid "/_View/_Reply to"
 msgstr "/_Ver/_Respostar a"
 
 #: src/compose.c:578 src/compose.c:580 src/compose.c:582 src/compose.c:584
-#: src/compose.c:587 src/mainwindow.c:577 src/mainwindow.c:580
-#: src/mainwindow.c:607 src/mainwindow.c:631 src/mainwindow.c:734
-#: src/mainwindow.c:738 src/messageview.c:258
+#: src/compose.c:587 src/mainwindow.c:579 src/mainwindow.c:582
+#: src/mainwindow.c:609 src/mainwindow.c:633 src/mainwindow.c:736
+#: src/mainwindow.c:740 src/messageview.c:258
 msgid "/_View/---"
 msgstr "/_Ver/---"
 
@@ -1382,7 +1382,7 @@ msgstr "/_Ver/_Adxuntos"
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/_Ver/_Ir a/_Ir a outra carpeta"
 
-#: src/compose.c:593 src/mainwindow.c:638 src/messageview.c:173
+#: src/compose.c:593 src/mainwindow.c:640 src/messageview.c:173
 #, fuzzy
 msgid "/_View/Character _encoding"
 msgstr "/_Ver/_Ordear/Descendente"
@@ -1394,138 +1394,138 @@ msgstr ""
 #: src/compose.c:596 src/compose.c:602 src/compose.c:608 src/compose.c:612
 #: src/compose.c:620 src/compose.c:624 src/compose.c:630 src/compose.c:636
 #: src/compose.c:640 src/compose.c:650 src/compose.c:654 src/compose.c:662
-#: src/compose.c:666 src/mainwindow.c:634 src/mainwindow.c:641
+#: src/compose.c:666 src/mainwindow.c:636 src/mainwindow.c:643
 #: src/messageview.c:169
 #, fuzzy
 msgid "/_View/Character _encoding/---"
 msgstr "/_Ver/_Ordear/Descendente"
 
-#: src/compose.c:598 src/mainwindow.c:642 src/messageview.c:177
+#: src/compose.c:598 src/mainwindow.c:644 src/messageview.c:177
 #, fuzzy
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Ver/_Codificación/ASCII de 7 bits (US-ASC_II)"
 
-#: src/compose.c:600 src/mainwindow.c:644 src/messageview.c:180
+#: src/compose.c:600 src/mainwindow.c:646 src/messageview.c:180
 #, fuzzy
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Ver/_Codificación/Unicode (_UTF-8)"
 
-#: src/compose.c:604 src/mainwindow.c:648 src/messageview.c:183
+#: src/compose.c:604 src/mainwindow.c:650 src/messageview.c:183
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Ver/_Codificación/Europeo Occidental (ISO-8859-_1)"
 
-#: src/compose.c:606 src/mainwindow.c:650 src/messageview.c:185
+#: src/compose.c:606 src/mainwindow.c:652 src/messageview.c:185
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Ver/_Codificación/Europeo Occidental (ISO-8859-_15)"
 
-#: src/compose.c:610 src/mainwindow.c:656 src/messageview.c:190
+#: src/compose.c:610 src/mainwindow.c:658 src/messageview.c:190
 #, fuzzy
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Ver/_Codificación/Centroeuropeo (ISO-8859-_2)"
 
-#: src/compose.c:614 src/mainwindow.c:660 src/messageview.c:193
+#: src/compose.c:614 src/mainwindow.c:662 src/messageview.c:193
 #, fuzzy
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Ver/_Codificación/Báltico (ISO-8859-13)"
 
-#: src/compose.c:616 src/mainwindow.c:662 src/messageview.c:195
+#: src/compose.c:616 src/mainwindow.c:664 src/messageview.c:195
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Ver/_Codificación/Báltico (ISO-8859-_4)"
 
-#: src/compose.c:618 src/mainwindow.c:664 src/messageview.c:197
+#: src/compose.c:618 src/mainwindow.c:666 src/messageview.c:197
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/_Ver/_Codificación/Cirílico (Windows-1251)"
 
-#: src/compose.c:622 src/mainwindow.c:668 src/messageview.c:200
+#: src/compose.c:622 src/mainwindow.c:670 src/messageview.c:200
 #, fuzzy
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Ver/_Codificación/Grego (ISO-8859-_7)"
 
-#: src/compose.c:626 src/mainwindow.c:672 src/messageview.c:203
+#: src/compose.c:626 src/mainwindow.c:674 src/messageview.c:203
 #, fuzzy
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/_Ver/_Codificación/Báltico (ISO-8859-_4)"
 
-#: src/compose.c:628 src/mainwindow.c:674 src/messageview.c:205
+#: src/compose.c:628 src/mainwindow.c:676 src/messageview.c:205
 #, fuzzy
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/_Ver/_Codificación/Cirílico (Windows-1251)"
 
-#: src/compose.c:632 src/mainwindow.c:678 src/messageview.c:208
+#: src/compose.c:632 src/mainwindow.c:680 src/messageview.c:208
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Ver/_Codificación/Grego (ISO-8859-_7)"
 
-#: src/compose.c:634 src/mainwindow.c:680 src/messageview.c:210
+#: src/compose.c:634 src/mainwindow.c:682 src/messageview.c:210
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Ver/_Codificación/Cirílico (Windows-1251)"
 
-#: src/compose.c:638 src/mainwindow.c:684 src/messageview.c:213
+#: src/compose.c:638 src/mainwindow.c:686 src/messageview.c:213
 #, fuzzy
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Ver/_Codificación/Turco (ISO-8859-_9)"
 
-#: src/compose.c:642 src/mainwindow.c:688 src/messageview.c:216
+#: src/compose.c:642 src/mainwindow.c:690 src/messageview.c:216
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Ver/_Codificación/Cirílico (ISO-8859-_5)"
 
-#: src/compose.c:644 src/mainwindow.c:690 src/messageview.c:218
+#: src/compose.c:644 src/mainwindow.c:692 src/messageview.c:218
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Ver/_Codificación/Cirílico (KOI8-_R)"
 
-#: src/compose.c:646 src/mainwindow.c:692 src/messageview.c:220
+#: src/compose.c:646 src/mainwindow.c:694 src/messageview.c:220
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Ver/_Codificación/Cirílico (KOI8-_R)"
 
-#: src/compose.c:648 src/mainwindow.c:694 src/messageview.c:222
+#: src/compose.c:648 src/mainwindow.c:696 src/messageview.c:222
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Ver/_Codificación/Cirílico (Windows-1251)"
 
-#: src/compose.c:652 src/mainwindow.c:698 src/messageview.c:225
+#: src/compose.c:652 src/mainwindow.c:700 src/messageview.c:225
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Ver/_Codificación/Xaponés (ISO-2022-_JP)"
 
-#: src/compose.c:656 src/mainwindow.c:708 src/messageview.c:234
+#: src/compose.c:656 src/mainwindow.c:710 src/messageview.c:234
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Ver/_Codificación/Chines simplificado (_GB2312)"
 
-#: src/compose.c:658 src/mainwindow.c:710 src/messageview.c:236
+#: src/compose.c:658 src/mainwindow.c:712 src/messageview.c:236
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Ver/_Codificación/Chines simplificado (_GB2312)"
 
-#: src/compose.c:660 src/mainwindow.c:712 src/messageview.c:238
+#: src/compose.c:660 src/mainwindow.c:714 src/messageview.c:238
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Ver/_Codificación/Chines tradicional (_Big5)"
 
-#: src/compose.c:664 src/mainwindow.c:720 src/messageview.c:245
+#: src/compose.c:664 src/mainwindow.c:722 src/messageview.c:245
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Ver/_Codificación/Coreano (EUC-_KR)"
 
-#: src/compose.c:668 src/mainwindow.c:726 src/messageview.c:250
+#: src/compose.c:668 src/mainwindow.c:728 src/messageview.c:250
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Ver/_Codificación/Tailandés (TIS-620)"
 
-#: src/compose.c:670 src/mainwindow.c:728 src/messageview.c:252
+#: src/compose.c:670 src/mainwindow.c:730 src/messageview.c:252
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Ver/_Codificación/Tailandés (Windows-874)"
 
-#: src/compose.c:674 src/mainwindow.c:788 src/messageview.c:283
+#: src/compose.c:674 src/mainwindow.c:790 src/messageview.c:283
 msgid "/_Tools/_Address book"
 msgstr "/_Ferramentas/_Axenda de enderezos"
 
@@ -1533,13 +1533,13 @@ msgstr "/_Ferramentas/_Axenda de enderezos"
 msgid "/_Tools/_Template"
 msgstr "/_Ferramentas/Plan_tillas"
 
-#: src/compose.c:677 src/mainwindow.c:812 src/messageview.c:299
+#: src/compose.c:677 src/mainwindow.c:814 src/messageview.c:299
 msgid "/_Tools/Actio_ns"
 msgstr "/_Ferramentas/Acció_ns"
 
-#: src/compose.c:679 src/compose.c:683 src/compose.c:689 src/mainwindow.c:791
-#: src/mainwindow.c:805 src/mainwindow.c:810 src/mainwindow.c:813
-#: src/mainwindow.c:817 src/mainwindow.c:819 src/messageview.c:286
+#: src/compose.c:679 src/compose.c:683 src/compose.c:689 src/mainwindow.c:793
+#: src/mainwindow.c:807 src/mainwindow.c:812 src/mainwindow.c:815
+#: src/mainwindow.c:819 src/mainwindow.c:821 src/messageview.c:286
 #: src/messageview.c:298
 msgid "/_Tools/---"
 msgstr "/_Ferramentas/---"
@@ -1746,7 +1746,7 @@ msgstr "/_Ferramentas/Acció_ns"
 msgid "PGP Encrypt"
 msgstr "/_Mensaxe/_Encriptar"
 
-#: src/compose.c:4442 src/compose.c:5543
+#: src/compose.c:4442 src/compose.c:5546
 msgid "MIME type"
 msgstr "Tipo MIME"
 
@@ -1789,36 +1789,36 @@ msgstr "Editar con un editor externo"
 msgid "Wrap all long lines"
 msgstr "Cortar todas as líneas longas"
 
-#: src/compose.c:5439
+#: src/compose.c:5442
 msgid "Invalid MIME type."
 msgstr "Tipo MIME inválido."
 
-#: src/compose.c:5457
+#: src/compose.c:5460
 msgid "File doesn't exist or is empty."
 msgstr "O ficheiro non existe ou está valeiro."
 
-#: src/compose.c:5525
+#: src/compose.c:5528
 msgid "Properties"
 msgstr "Propiedades"
 
-#: src/compose.c:5545 src/prefs_common_dialog.c:1504
+#: src/compose.c:5548 src/prefs_common_dialog.c:1504
 msgid "Encoding"
 msgstr "Codificación"
 
-#: src/compose.c:5568 src/prefs_folder_item.c:202
+#: src/compose.c:5571 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Ruta"
 
-#: src/compose.c:5569
+#: src/compose.c:5572
 msgid "File name"
 msgstr "Nome de ficheiro"
 
-#: src/compose.c:5659
+#: src/compose.c:5662
 #, 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:5714
+#: src/compose.c:5717
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1828,52 +1828,52 @@ msgstr ""
 "¿Desea terminar o proceso?\n"
 "Id. de proceso: %d"
 
-#: src/compose.c:6040 src/mainwindow.c:2752
+#: src/compose.c:6043 src/mainwindow.c:2761
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:6156 src/compose.c:6161 src/compose.c:6167
+#: src/compose.c:6159 src/compose.c:6164 src/compose.c:6170
 msgid "Can't queue the message."
 msgstr "O mensaxe non se pode poñer na cola."
 
-#: src/compose.c:6258
+#: src/compose.c:6261
 #, fuzzy
 msgid "Select files"
 msgstr "Seleccionar ficheiro"
 
-#: src/compose.c:6281
+#: src/compose.c:6284
 msgid "Select file"
 msgstr "Seleccionar ficheiro"
 
-#: src/compose.c:6316
+#: src/compose.c:6319
 #, fuzzy
 msgid "Save message"
 msgstr "Enviar Mensaxe"
 
-#: src/compose.c:6317
+#: src/compose.c:6320
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Esta mensaxe foi modificado. ¿Desea descartala?"
 
-#: src/compose.c:6319
+#: src/compose.c:6322
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:6361
+#: src/compose.c:6364
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "¿Quere aplicar a plantilla `%s' ?"
 
-#: src/compose.c:6363
+#: src/compose.c:6366
 msgid "Apply template"
 msgstr "Aplicar plantilla"
 
-#: src/compose.c:6364
+#: src/compose.c:6367
 #, fuzzy
 msgid "_Replace"
 msgstr "Substituír"
 
-#: src/compose.c:6364
+#: src/compose.c:6367
 #, fuzzy
 msgid "_Insert"
 msgstr "Inserir"
@@ -2336,12 +2336,12 @@ msgstr "Establecendo información de carpeta...\n"
 msgid "Setting folder info..."
 msgstr "Establecendo información de carpeta..."
 
-#: src/folderview.c:868 src/mainwindow.c:3748 src/setup.c:80
+#: src/folderview.c:868 src/mainwindow.c:3757 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Revisando carpeta %s%c%s ..."
 
-#: src/folderview.c:872 src/mainwindow.c:3753 src/setup.c:85
+#: src/folderview.c:872 src/mainwindow.c:3762 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Revisando carpeta %s ..."
@@ -3109,563 +3109,568 @@ msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/_Ver/Mostrar ou o_cultar/_Ferramentas/Iconos _e texto"
 
 #: src/mainwindow.c:566
-msgid "/_View/Show or hi_de/_Toolbar/_Icon"
+#, fuzzy
+msgid "/_View/Show or hi_de/_Toolbar/Text at the _right of icon"
 msgstr "/_Ver/Mostrar ou o_cultar/_Ferramentas/_Iconos"
 
 #: src/mainwindow.c:568
+msgid "/_View/Show or hi_de/_Toolbar/_Icon"
+msgstr "/_Ver/Mostrar ou o_cultar/_Ferramentas/_Iconos"
+
+#: src/mainwindow.c:570
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/_Ver/Mostrar ou o_cultar/_Ferramentas/_Texto"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:572
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/_Ver/Mostrar ou o_cultar/_Ferramentas/_Ocultar"
 
-#: src/mainwindow.c:572
+#: src/mainwindow.c:574
 #, fuzzy
 msgid "/_View/Show or hi_de/_Search bar"
 msgstr "/_Ver/Mostrar ou o_cultar/_Barra de estado"
 
-#: src/mainwindow.c:574
+#: src/mainwindow.c:576
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/_Ver/Mostrar ou o_cultar/_Barra de estado"
 
-#: src/mainwindow.c:576
+#: src/mainwindow.c:578
 #, fuzzy
 msgid "/_View/_Customize toolbar..."
 msgstr "/_Ver/_Ir a/_Ir a outra carpeta"
 
-#: src/mainwindow.c:578
+#: src/mainwindow.c:580
 msgid "/_View/Separate f_older tree"
 msgstr "/_Ver/Separar arb_re de carpetas"
 
-#: src/mainwindow.c:579
+#: src/mainwindow.c:581
 #, fuzzy
 msgid "/_View/Separate _message view"
 msgstr "/_Ver/Separar vista de m_ensaxes"
 
-#: src/mainwindow.c:581
+#: src/mainwindow.c:583
 msgid "/_View/_Sort"
 msgstr "/_Ver/_Ordear"
 
-#: src/mainwindow.c:582
+#: src/mainwindow.c:584
 msgid "/_View/_Sort/by _number"
 msgstr "/_Ver/_Ordear/Por _número"
 
-#: src/mainwindow.c:583
+#: src/mainwindow.c:585
 msgid "/_View/_Sort/by s_ize"
 msgstr "/_Ver/_Ordear/Por tamañ_o"
 
-#: src/mainwindow.c:584
+#: src/mainwindow.c:586
 msgid "/_View/_Sort/by _date"
 msgstr "/_Ver/_Ordear/Por _data"
 
-#: src/mainwindow.c:585
+#: src/mainwindow.c:587
 #, fuzzy
 msgid "/_View/_Sort/by t_hread date"
 msgstr "/_Ver/_Ordear/Por _data"
 
-#: src/mainwindow.c:586
+#: src/mainwindow.c:588
 msgid "/_View/_Sort/by _from"
 msgstr "/_Ver/_Ordear/Por _remitente"
 
-#: src/mainwindow.c:587
+#: src/mainwindow.c:589
 msgid "/_View/_Sort/by _recipient"
 msgstr "/_Ver/_Ordear/Por _destinatario"
 
-#: src/mainwindow.c:588
+#: src/mainwindow.c:590
 msgid "/_View/_Sort/by _subject"
 msgstr "/_Ver/_Ordear/Por as_unto"
 
-#: src/mainwindow.c:589
+#: src/mainwindow.c:591
 msgid "/_View/_Sort/by _color label"
 msgstr "/_Ver/_Ordear/Por _cor da etiqueta"
 
-#: src/mainwindow.c:591
+#: src/mainwindow.c:593
 msgid "/_View/_Sort/by _mark"
 msgstr "/_Ver/_Ordear/Por _marca"
 
-#: src/mainwindow.c:592
+#: src/mainwindow.c:594
 msgid "/_View/_Sort/by _unread"
 msgstr "/_Ver/_Ordear/Por _non leído"
 
-#: src/mainwindow.c:593
+#: src/mainwindow.c:595
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/_Ver/_Ordear/Por adxun_to"
 
-#: src/mainwindow.c:595
+#: src/mainwindow.c:597
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/_Ver/_Ordear/N_on ordear"
 
-#: src/mainwindow.c:596 src/mainwindow.c:599
+#: src/mainwindow.c:598 src/mainwindow.c:601
 msgid "/_View/_Sort/---"
 msgstr "/_Ver/_Ordear/---"
 
-#: src/mainwindow.c:597
+#: src/mainwindow.c:599
 msgid "/_View/_Sort/Ascending"
 msgstr "/_Ver/_Ordear/Ascendente"
 
-#: src/mainwindow.c:598
+#: src/mainwindow.c:600
 msgid "/_View/_Sort/Descending"
 msgstr "/_Ver/_Ordear/Descendente"
 
-#: src/mainwindow.c:600
+#: src/mainwindow.c:602
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/_Ver/_Ordear/Atraer _por asunto"
 
-#: src/mainwindow.c:602
+#: src/mainwindow.c:604
 msgid "/_View/Th_read view"
 msgstr "/_Ver/_Vista xerárquica"
 
-#: src/mainwindow.c:603
+#: src/mainwindow.c:605
 msgid "/_View/E_xpand all threads"
 msgstr "/_Ver/E_xpandir todos os fios"
 
-#: src/mainwindow.c:604
+#: src/mainwindow.c:606
 msgid "/_View/Co_llapse all threads"
 msgstr "/_Ver/Co_lapsar todos os fios"
 
-#: src/mainwindow.c:605
+#: src/mainwindow.c:607
 msgid "/_View/Set display _item..."
 msgstr "/_Ver/Elementos visibles..."
 
-#: src/mainwindow.c:608
+#: src/mainwindow.c:610
 msgid "/_View/_Go to"
 msgstr "/_Ver/_Ir a"
 
-#: src/mainwindow.c:609
+#: src/mainwindow.c:611
 msgid "/_View/_Go to/_Prev message"
 msgstr "/_Ver/_Ir a/Mensaxe a_nterior"
 
-#: src/mainwindow.c:610
+#: src/mainwindow.c:612
 msgid "/_View/_Go to/_Next message"
 msgstr "/_Ver/_Ir a/Mensaxe s_eguinte"
 
-#: src/mainwindow.c:611 src/mainwindow.c:616 src/mainwindow.c:619
-#: src/mainwindow.c:624 src/mainwindow.c:629
+#: src/mainwindow.c:613 src/mainwindow.c:618 src/mainwindow.c:621
+#: src/mainwindow.c:626 src/mainwindow.c:631
 msgid "/_View/_Go to/---"
 msgstr "/_Ver/_Ir a/---"
 
-#: src/mainwindow.c:612
+#: src/mainwindow.c:614
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/_Ver/_Ir a/_Anterior sin ler"
 
-#: src/mainwindow.c:614
+#: src/mainwindow.c:616
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/_Ver/_Ir a/_Seguinte sin ler"
 
-#: src/mainwindow.c:617
+#: src/mainwindow.c:619
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/_Ver/_Ir a/Mensaxe no_va anterior"
 
-#: src/mainwindow.c:618
+#: src/mainwindow.c:620
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/_Ver/_Ir a/Mensaxe nova s_eguinte"
 
-#: src/mainwindow.c:620
+#: src/mainwindow.c:622
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/_Ver/_Ir a/Mensaxe marcada a_nterior"
 
-#: src/mainwindow.c:622
+#: src/mainwindow.c:624
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/_Ver/_Ir a/Seguinte mensaxe _marcada"
 
-#: src/mainwindow.c:625
+#: src/mainwindow.c:627
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/_Ver/_Ir a/Mensaxe etiqueta_da anterior"
 
-#: src/mainwindow.c:627
+#: src/mainwindow.c:629
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/_Ver/_Ir a/Seguinte Mensaxe e_tiquetada"
 
-#: src/mainwindow.c:630
+#: src/mainwindow.c:632
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Ver/_Ir a/_Ir a outra carpeta"
 
-#: src/mainwindow.c:639 src/messageview.c:174
+#: src/mainwindow.c:641 src/messageview.c:174
 #, fuzzy
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Ver/_Codificación/_Autodetectar"
 
-#: src/mainwindow.c:652 src/messageview.c:187
+#: src/mainwindow.c:654 src/messageview.c:187
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr "/_Ver/_Codificación/Europeo Occidental (ISO-8859-_15)"
 
-#: src/mainwindow.c:700 src/messageview.c:227
+#: src/mainwindow.c:702 src/messageview.c:227
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Ver/_Codificación/Xaponés (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:702 src/messageview.c:229
+#: src/mainwindow.c:704 src/messageview.c:229
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Ver/_Codificación/Xaponés (_EUC-JP)"
 
-#: src/mainwindow.c:704 src/messageview.c:231
+#: src/mainwindow.c:706 src/messageview.c:231
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Ver/_Codificación/Xaponés (_Shift__JIS)"
 
-#: src/mainwindow.c:714 src/messageview.c:240
+#: src/mainwindow.c:716 src/messageview.c:240
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Ver/_Codificación/Chines tradicional (EUC-_TW)"
 
-#: src/mainwindow.c:716 src/messageview.c:242
+#: src/mainwindow.c:718 src/messageview.c:242
 #, fuzzy
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Ver/_Codificación/Chines (ISO-2022-_CN)"
 
-#: src/mainwindow.c:722 src/messageview.c:247
+#: src/mainwindow.c:724 src/messageview.c:247
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Ver/_Codificación/Coreano (ISO-2022-KR)"
 
-#: src/mainwindow.c:735 src/summaryview.c:464
+#: src/mainwindow.c:737 src/summaryview.c:464
 msgid "/_View/Open in new _window"
 msgstr "/_Ver/Abrir en fiestra _nova"
 
-#: src/mainwindow.c:736 src/messageview.c:259 src/summaryview.c:466
+#: src/mainwindow.c:738 src/messageview.c:259 src/summaryview.c:466
 msgid "/_View/Mess_age source"
 msgstr "/_Ver/Fonte da mens_axe"
 
-#: src/mainwindow.c:737 src/messageview.c:260 src/summaryview.c:467
+#: src/mainwindow.c:739 src/messageview.c:260 src/summaryview.c:467
 #, fuzzy
 msgid "/_View/All _headers"
 msgstr "/_Ver/Todas as cabeceiras"
 
-#: src/mainwindow.c:739
+#: src/mainwindow.c:741
 msgid "/_View/_Update summary"
 msgstr "/_Ver/Actualizar res_umen"
 
-#: src/mainwindow.c:741 src/messageview.c:263
+#: src/mainwindow.c:743 src/messageview.c:263
 msgid "/_Message"
 msgstr "/_Mensaxe"
 
-#: src/mainwindow.c:742
+#: src/mainwindow.c:744
 #, fuzzy
 msgid "/_Message/Recei_ve"
 msgstr "/_Mensaxe/Re_editar"
 
-#: src/mainwindow.c:743
+#: src/mainwindow.c:745
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/_Mensaxe/Recibir de tod_as as contas"
 
-#: src/mainwindow.c:745
+#: src/mainwindow.c:747
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/_Mensaxe/Recibir de tod_as as contas"
 
-#: src/mainwindow.c:747
+#: src/mainwindow.c:749
 #, fuzzy
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/_Mensaxe/_Cancelar recepción"
 
-#: src/mainwindow.c:749
+#: src/mainwindow.c:751
 #, fuzzy
 msgid "/_Message/Recei_ve/---"
 msgstr "/_Mensaxe/Re_editar"
 
-#: src/mainwindow.c:750
+#: src/mainwindow.c:752
 msgid "/_Message/_Send queued messages"
 msgstr "/_Mensaxe/Enviar mensa_xes da cola"
 
-#: src/mainwindow.c:751 src/mainwindow.c:753 src/mainwindow.c:760
-#: src/mainwindow.c:765 src/mainwindow.c:768 src/mainwindow.c:779
-#: src/mainwindow.c:781 src/mainwindow.c:784 src/messageview.c:266
+#: src/mainwindow.c:753 src/mainwindow.c:755 src/mainwindow.c:762
+#: src/mainwindow.c:767 src/mainwindow.c:770 src/mainwindow.c:781
+#: src/mainwindow.c:783 src/mainwindow.c:786 src/messageview.c:266
 #: src/messageview.c:274 src/messageview.c:279
 msgid "/_Message/---"
 msgstr "/_Mensaxe/---"
 
-#: src/mainwindow.c:752 src/messageview.c:264
+#: src/mainwindow.c:754 src/messageview.c:264
 msgid "/_Message/Compose _new message"
 msgstr "/_Mensaxe/Compoñer _nova mensaxe"
 
-#: src/mainwindow.c:754 src/messageview.c:267
+#: src/mainwindow.c:756 src/messageview.c:267
 msgid "/_Message/_Reply"
 msgstr "/_Mensaxe/_Respostar"
 
-#: src/mainwindow.c:755
+#: src/mainwindow.c:757
 msgid "/_Message/Repl_y to"
 msgstr "/_Mensaxe/Respos_tar a"
 
-#: src/mainwindow.c:756 src/messageview.c:268
+#: src/mainwindow.c:758 src/messageview.c:268
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Mensaxe/Respos_tar a/A _todos"
 
-#: src/mainwindow.c:757 src/messageview.c:270
+#: src/mainwindow.c:759 src/messageview.c:270
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Mensaxe/Respos_tar a/Ó _remitente"
 
-#: src/mainwindow.c:758 src/messageview.c:272
+#: src/mainwindow.c:760 src/messageview.c:272
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Mensaxe/Respos_tar a/Á _lista de correo"
 
-#: src/mainwindow.c:761 src/messageview.c:275
+#: src/mainwindow.c:763 src/messageview.c:275
 msgid "/_Message/_Forward"
 msgstr "/_Mensaxe/_Reenviar"
 
-#: src/mainwindow.c:762 src/messageview.c:276
+#: src/mainwindow.c:764 src/messageview.c:276
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Mensaxe/Reen_viar como adxunto"
 
-#: src/mainwindow.c:764 src/messageview.c:278
+#: src/mainwindow.c:766 src/messageview.c:278
 msgid "/_Message/Redirec_t"
 msgstr "/_Mensaxe/Red_irixir"
 
-#: src/mainwindow.c:766
+#: src/mainwindow.c:768
 msgid "/_Message/M_ove..."
 msgstr "/_Mensaxe/M_over..."
 
-#: src/mainwindow.c:767
+#: src/mainwindow.c:769
 msgid "/_Message/_Copy..."
 msgstr "/_Mensaxe/_Copiar..."
 
-#: src/mainwindow.c:769
+#: src/mainwindow.c:771
 msgid "/_Message/_Mark"
 msgstr "/_Mensaxe/_Marcar"
 
-#: src/mainwindow.c:770
+#: src/mainwindow.c:772
 msgid "/_Message/_Mark/_Mark"
 msgstr "/_Mensaxe/_Marcar/_Marcar"
 
-#: src/mainwindow.c:771
+#: src/mainwindow.c:773
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/_Mensaxe/_Marcar/_Desmarcar"
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:774
 msgid "/_Message/_Mark/---"
 msgstr "/_Mensaxe/_Marcar/---"
 
-#: src/mainwindow.c:773
+#: src/mainwindow.c:775
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/_Mensaxe/_Marcar/Marcar como non leído"
 
-#: src/mainwindow.c:774
+#: src/mainwindow.c:776
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/_Mensaxe/_Marcar/Marcar como leído"
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:778
 #, fuzzy
 msgid "/_Message/_Mark/Mark _thread as read"
 msgstr "/_Mensaxe/_Marcar/Marcar como leído"
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:780
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/_Mensaxe/_Marcar/Marcar todo como leído"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:782
 msgid "/_Message/_Delete"
 msgstr "/_Mensaxe/_Borrar"
 
-#: src/mainwindow.c:782
+#: src/mainwindow.c:784
 #, fuzzy
 msgid "/_Message/Set as _junk mail"
 msgstr "/_Mensaxe/Rec_ibir correo novo"
 
-#: src/mainwindow.c:783
+#: src/mainwindow.c:785
 #, fuzzy
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/_Mensaxe/Rec_ibir correo novo"
 
-#: src/mainwindow.c:785 src/messageview.c:280
+#: src/mainwindow.c:787 src/messageview.c:280
 msgid "/_Message/Re-_edit"
 msgstr "/_Mensaxe/Re_editar"
 
-#: src/mainwindow.c:789
+#: src/mainwindow.c:791
 #, fuzzy
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/_Ferramentas/Engadir _remitente á axenda"
 
-#: src/mainwindow.c:792
+#: src/mainwindow.c:794
 #, fuzzy
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/_Ferramentas/_Filtrar Mensaxes"
 
-#: src/mainwindow.c:794
+#: src/mainwindow.c:796
 #, fuzzy
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Ferramentas/_Filtrar Mensaxes"
 
-#: src/mainwindow.c:796 src/messageview.c:287
+#: src/mainwindow.c:798 src/messageview.c:287
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Ferramentas/_Crear Regra de filtrado"
 
-#: src/mainwindow.c:797 src/messageview.c:289
+#: src/mainwindow.c:799 src/messageview.c:289
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Ferramentas/_Crear Regra de filtrado/_Automáticamente"
 
-#: src/mainwindow.c:799 src/messageview.c:291
+#: src/mainwindow.c:801 src/messageview.c:291
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Ferramentas/_Crear Regra de filtrado/Baseada en _Dende"
 
-#: src/mainwindow.c:801 src/messageview.c:293
+#: src/mainwindow.c:803 src/messageview.c:293
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Ferramentas/_Crear Regra de filtrado/Baseada en _Para"
 
-#: src/mainwindow.c:803 src/messageview.c:295
+#: src/mainwindow.c:805 src/messageview.c:295
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Ferramentas/_Crear Regra de filtrado/Baseada no _Asunto"
 
-#: src/mainwindow.c:806
+#: src/mainwindow.c:808
 #, fuzzy
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/_Ferramentas/_Filtrar Mensaxes"
 
-#: src/mainwindow.c:808
+#: src/mainwindow.c:810
 #, fuzzy
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/_Ferramentas/_Filtrar Mensaxes"
 
-#: src/mainwindow.c:815
+#: src/mainwindow.c:817
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/_Ferramentas/Borrar as mensaxes re_petidas"
 
-#: src/mainwindow.c:818
+#: src/mainwindow.c:820
 #, fuzzy
 msgid "/_Tools/E_xecute marked process"
 msgstr "Executar o proceso marcado"
 
-#: src/mainwindow.c:820
+#: src/mainwindow.c:822
 msgid "/_Tools/_Log window"
 msgstr "/_Ferramentas/_Fiestra de traza"
 
-#: src/mainwindow.c:822
+#: src/mainwindow.c:824
 msgid "/_Configuration"
 msgstr "/_Configuración"
 
-#: src/mainwindow.c:823
+#: src/mainwindow.c:825
 msgid "/_Configuration/_Common preferences..."
 msgstr "/_Configuración/Preferencias _comuns..."
 
-#: src/mainwindow.c:825
+#: src/mainwindow.c:827
 msgid "/_Configuration/_Filter setting..."
 msgstr "/_Configuración/Preferencias de _filtrado..."
 
-#: src/mainwindow.c:827
+#: src/mainwindow.c:829
 msgid "/_Configuration/_Template..."
 msgstr "/_Configuración/_Plantillas ..."
 
-#: src/mainwindow.c:829
+#: src/mainwindow.c:831
 msgid "/_Configuration/_Actions..."
 msgstr "/_Configuración/_Accions..."
 
-#: src/mainwindow.c:831
+#: src/mainwindow.c:833
 msgid "/_Configuration/---"
 msgstr "/_Configuración/---"
 
-#: src/mainwindow.c:832
+#: src/mainwindow.c:834
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Configuración/_Preferencias da conta actual..."
 
-#: src/mainwindow.c:834
+#: src/mainwindow.c:836
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Configuración/Crear _nova conta..."
 
-#: src/mainwindow.c:836
+#: src/mainwindow.c:838
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Configuración/_Editar contas..."
 
-#: src/mainwindow.c:838
+#: src/mainwindow.c:840
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Configuración/_Cambiar conta actual"
 
-#: src/mainwindow.c:842
+#: src/mainwindow.c:844
 msgid "/_Help/_Manual"
 msgstr "/_Axuda/_Manual"
 
-#: src/mainwindow.c:843
+#: src/mainwindow.c:845
 msgid "/_Help/_Manual/_English"
 msgstr "/_Axuda/_Manual/_Inglés"
 
-#: src/mainwindow.c:844
+#: src/mainwindow.c:846
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/_Axuda/_Manual/_Xaponés"
 
-#: src/mainwindow.c:845
+#: src/mainwindow.c:847
 msgid "/_Help/_FAQ"
 msgstr "/_Axuda/_FAQ"
 
-#: src/mainwindow.c:846
+#: src/mainwindow.c:848
 msgid "/_Help/_FAQ/_English"
 msgstr "/_Axuda/_FAQ/_Inglés"
 
-#: src/mainwindow.c:847
+#: src/mainwindow.c:849
 msgid "/_Help/_FAQ/_German"
 msgstr "/_Axyuda/_FAQ/_Alemán"
 
-#: src/mainwindow.c:848
+#: src/mainwindow.c:850
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/_Axuda/_FAQ/_Español"
 
-#: src/mainwindow.c:849
+#: src/mainwindow.c:851
 msgid "/_Help/_FAQ/_French"
 msgstr "/_Axuda/_FAQ/_Francés"
 
-#: src/mainwindow.c:850
+#: src/mainwindow.c:852
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/_Axuda/_FAQ/_Italiano"
 
-#: src/mainwindow.c:851
+#: src/mainwindow.c:853
 #, fuzzy
 msgid "/_Help/_Command line options"
 msgstr "Non se estableceu o comando."
 
-#: src/mainwindow.c:852
+#: src/mainwindow.c:854
 msgid "/_Help/---"
 msgstr "/_Axuda/---"
 
-#: src/mainwindow.c:895
+#: src/mainwindow.c:897
 msgid "Creating main window...\n"
 msgstr "Creando Fiestra principal...\n"
 
-#: src/mainwindow.c:1071
+#: src/mainwindow.c:1073
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "MainWindow: fallo solicitando cor %d\n"
 
-#: src/mainwindow.c:1175 src/summaryview.c:2387 src/summaryview.c:2472
+#: src/mainwindow.c:1181 src/summaryview.c:2387 src/summaryview.c:2472
 #: src/summaryview.c:4009 src/summaryview.c:4138 src/summaryview.c:4507
 msgid "done.\n"
 msgstr "feito.\n"
 
-#: src/mainwindow.c:1293 src/mainwindow.c:1334 src/mainwindow.c:1359
+#: src/mainwindow.c:1299 src/mainwindow.c:1340 src/mainwindow.c:1365
 msgid "Untitled"
 msgstr "Sen título"
 
-#: src/mainwindow.c:1360
+#: src/mainwindow.c:1366
 msgid "none"
 msgstr "ningunha"
 
-#: src/mainwindow.c:1413
+#: src/mainwindow.c:1419
 #, 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:1663
+#: src/mainwindow.c:1669
 msgid "Offline"
 msgstr ""
 
-#: src/mainwindow.c:1664
+#: src/mainwindow.c:1670
 msgid "You are offline. Go online?"
 msgstr ""
 
-#: src/mainwindow.c:1681
+#: src/mainwindow.c:1687
 #, fuzzy
 msgid "Empty all trash"
 msgstr "Baleirar papeleira"
 
-#: src/mainwindow.c:1682
+#: src/mainwindow.c:1688
 #, fuzzy
 msgid "Delete all messages in trash folders?"
 msgstr "¿Baleirar todas as mensaxes da papeleira?"
 
-#: src/mainwindow.c:1712
+#: src/mainwindow.c:1718
 msgid "Add mailbox"
 msgstr "Engadir caixa de correo"
 
-#: src/mainwindow.c:1713
+#: src/mainwindow.c:1719
 #, fuzzy
 msgid ""
 "Specify the location of mailbox.\n"
@@ -3676,16 +3681,16 @@ msgstr ""
 "Si xa existe será\n"
 "examinado automáticamente."
 
-#: src/mainwindow.c:1719 src/setup.c:49
+#: src/mainwindow.c:1725 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "a caixa de correo `%s' xa existe."
 
-#: src/mainwindow.c:1724 src/setup.c:56
+#: src/mainwindow.c:1730 src/setup.c:56
 msgid "Mailbox"
 msgstr "Correo"
 
-#: src/mainwindow.c:1730 src/setup.c:62
+#: src/mainwindow.c:1736 src/setup.c:62
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3695,135 +3700,135 @@ msgstr ""
 "Quizáis xa existan os ficheiros ou non teña permisos suficientes para "
 "escribir no directorio."
 
-#: src/mainwindow.c:2198
+#: src/mainwindow.c:2206
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Arbre de carpetas"
 
-#: src/mainwindow.c:2217
+#: src/mainwindow.c:2225
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Vista de mensaxe"
 
-#: src/mainwindow.c:2369 src/summaryview.c:418
+#: src/mainwindow.c:2377 src/summaryview.c:418
 msgid "/_Reply"
 msgstr "/_Respostar"
 
-#: src/mainwindow.c:2370
+#: src/mainwindow.c:2378
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "Respostar a todos"
 
-#: src/mainwindow.c:2371
+#: src/mainwindow.c:2379
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/Respon_der a/Ó _remitente"
 
-#: src/mainwindow.c:2372
+#: src/mainwindow.c:2380
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/Respon_der a/Á _lista de correo"
 
-#: src/mainwindow.c:2377 src/summaryview.c:425
+#: src/mainwindow.c:2385 src/summaryview.c:425
 msgid "/_Forward"
 msgstr "/_Reenviar"
 
-#: src/mainwindow.c:2378 src/summaryview.c:426
+#: src/mainwindow.c:2386 src/summaryview.c:426
 msgid "/For_ward as attachment"
 msgstr "/Reen_viar como adxunto"
 
-#: src/mainwindow.c:2379 src/summaryview.c:427
+#: src/mainwindow.c:2387 src/summaryview.c:427
 msgid "/Redirec_t"
 msgstr "/Red_irixir"
 
-#: src/mainwindow.c:2384
+#: src/mainwindow.c:2392
 msgid "Incorporate new mail"
 msgstr "Incorporar correo novo"
 
-#: src/mainwindow.c:2386
+#: src/mainwindow.c:2394
 msgid "Incorporate new mail of all accounts"
 msgstr "Incorporar correo novo de todas as contas"
 
-#: src/mainwindow.c:2388
+#: src/mainwindow.c:2396
 msgid "Send queued message(s)"
 msgstr "Enviar mensaxe(s) na cola"
 
-#: src/mainwindow.c:2390
+#: src/mainwindow.c:2398
 msgid "Compose new message"
 msgstr "Compoñer mensaxe novo"
 
-#: src/mainwindow.c:2392
+#: src/mainwindow.c:2400
 msgid "Reply to the message"
 msgstr "Respostar ó mensaxe"
 
-#: src/mainwindow.c:2394
+#: src/mainwindow.c:2402
 msgid "Reply to all"
 msgstr "Respostar a todos"
 
-#: src/mainwindow.c:2396
+#: src/mainwindow.c:2404
 msgid "Forward the message"
 msgstr "Reenviar o mensaxe"
 
-#: src/mainwindow.c:2398
+#: src/mainwindow.c:2406
 msgid "Delete the message"
 msgstr "Borrar o mensaxe"
 
-#: src/mainwindow.c:2400
+#: src/mainwindow.c:2408
 #, fuzzy
 msgid "Set as junk mail"
 msgstr "conta por defecto"
 
-#: src/mainwindow.c:2402
+#: src/mainwindow.c:2410
 msgid "Execute marked process"
 msgstr "Executar o proceso marcado"
 
-#: src/mainwindow.c:2404
+#: src/mainwindow.c:2412
 msgid "Next unread message"
 msgstr "Seguinte non leído"
 
-#: src/mainwindow.c:2406
+#: src/mainwindow.c:2414
 #, fuzzy
 msgid "Previous unread message"
 msgstr "Seguinte non leído"
 
-#: src/mainwindow.c:2410
+#: src/mainwindow.c:2418
 #, fuzzy
 msgid "Print message"
 msgstr "Enviar Mensaxe"
 
-#: src/mainwindow.c:2412
+#: src/mainwindow.c:2420
 msgid "Common preferences"
 msgstr "Preferencias comuns"
 
-#: src/mainwindow.c:2414 src/prefs_account_dialog.c:511
+#: src/mainwindow.c:2422 src/prefs_account_dialog.c:511
 msgid "Account preferences"
 msgstr "Preferencias da conta"
 
-#: src/mainwindow.c:2779
+#: src/mainwindow.c:2788
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 
-#: src/mainwindow.c:2790
+#: src/mainwindow.c:2799
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 
-#: src/mainwindow.c:3062
+#: src/mainwindow.c:3071
 msgid "Exit"
 msgstr "Sair"
 
-#: src/mainwindow.c:3062
+#: src/mainwindow.c:3071
 msgid "Exit this program?"
 msgstr "¿Sair do programa?"
 
-#: src/mainwindow.c:3666
+#: src/mainwindow.c:3675
 #, fuzzy
 msgid "Command line options"
 msgstr "Non se estableceu o comando."
 
-#: src/mainwindow.c:3679
+#: src/mainwindow.c:3688
 #, fuzzy
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Uso: %s [OPCIÓN]...\n"
 
-#: src/mainwindow.c:3687
+#: src/mainwindow.c:3696
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -3839,7 +3844,7 @@ msgid ""
 "--version"
 msgstr ""
 
-#: src/mainwindow.c:3703
+#: src/mainwindow.c:3712
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
diff --git a/po/hr.po b/po/hr.po
index 6959362b..60c2cd0a 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-01-31 16:49+0900\n"
+"POT-Creation-Date: 2007-01-31 17:29+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"
@@ -914,7 +914,7 @@ msgstr "/_Adresa/_Uredi"
 msgid "/_Address/_Delete"
 msgstr "/_Adresa/O_briši"
 
-#: src/addressbook.c:359 src/compose.c:673 src/mainwindow.c:787
+#: src/addressbook.c:359 src/compose.c:673 src/mainwindow.c:789
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Alati"
@@ -923,12 +923,12 @@ msgstr "/_Alati"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Datoteka/Unesi _LDIF datoteku"
 
-#: src/addressbook.c:361 src/compose.c:694 src/mainwindow.c:841
+#: src/addressbook.c:361 src/compose.c:694 src/mainwindow.c:843
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Pomoć"
 
-#: src/addressbook.c:362 src/compose.c:695 src/mainwindow.c:853
+#: src/addressbook.c:362 src/compose.c:695 src/mainwindow.c:855
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Pomoć/_O"
@@ -970,7 +970,7 @@ msgstr "/_Obriši"
 msgid "E-Mail address"
 msgstr "E-mail adresa"
 
-#: src/addressbook.c:496 src/compose.c:4873 src/mainwindow.c:2408
+#: src/addressbook.c:496 src/compose.c:4873 src/mainwindow.c:2416
 #: src/prefs_common_dialog.c:2274
 msgid "Address book"
 msgstr "Adresar"
@@ -1184,7 +1184,7 @@ msgstr "Uobičajene adrese"
 msgid "Personal address"
 msgstr "Osobne adrese"
 
-#: src/alertpanel.c:142 src/compose.c:5717 src/main.c:638
+#: src/alertpanel.c:142 src/compose.c:5720 src/main.c:638
 msgid "Notice"
 msgstr "Obavijest"
 
@@ -1363,9 +1363,9 @@ msgid "/_View/_Reply to"
 msgstr "/_Pregled/_Znakovni standard"
 
 #: src/compose.c:578 src/compose.c:580 src/compose.c:582 src/compose.c:584
-#: src/compose.c:587 src/mainwindow.c:577 src/mainwindow.c:580
-#: src/mainwindow.c:607 src/mainwindow.c:631 src/mainwindow.c:734
-#: src/mainwindow.c:738 src/messageview.c:258
+#: src/compose.c:587 src/mainwindow.c:579 src/mainwindow.c:582
+#: src/mainwindow.c:609 src/mainwindow.c:633 src/mainwindow.c:736
+#: src/mainwindow.c:740 src/messageview.c:258
 msgid "/_View/---"
 msgstr "/_Pregled/---"
 
@@ -1389,7 +1389,7 @@ msgstr "Prilog"
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/_Održavanje/_Idi u drugi spis..."
 
-#: src/compose.c:593 src/mainwindow.c:638 src/messageview.c:173
+#: src/compose.c:593 src/mainwindow.c:640 src/messageview.c:173
 #, fuzzy
 msgid "/_View/Character _encoding"
 msgstr "/_Pregled/Pr_egledaj izvor"
@@ -1401,138 +1401,138 @@ msgstr ""
 #: src/compose.c:596 src/compose.c:602 src/compose.c:608 src/compose.c:612
 #: src/compose.c:620 src/compose.c:624 src/compose.c:630 src/compose.c:636
 #: src/compose.c:640 src/compose.c:650 src/compose.c:654 src/compose.c:662
-#: src/compose.c:666 src/mainwindow.c:634 src/mainwindow.c:641
+#: src/compose.c:666 src/mainwindow.c:636 src/mainwindow.c:643
 #: src/messageview.c:169
 #, fuzzy
 msgid "/_View/Character _encoding/---"
 msgstr "/_Pregled/Pr_egledaj izvor"
 
-#: src/compose.c:598 src/mainwindow.c:642 src/messageview.c:177
+#: src/compose.c:598 src/mainwindow.c:644 src/messageview.c:177
 #, fuzzy
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Pregled/_Znakovni standard/7bit ascii (US-ASC_II)"
 
-#: src/compose.c:600 src/mainwindow.c:644 src/messageview.c:180
+#: src/compose.c:600 src/mainwindow.c:646 src/messageview.c:180
 #, fuzzy
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Pregled/_Znakovni standard/Unicode (_UTF-8)"
 
-#: src/compose.c:604 src/mainwindow.c:648 src/messageview.c:183
+#: src/compose.c:604 src/mainwindow.c:650 src/messageview.c:183
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Pregled/_Znakovni standard/Zapadna Europa (ISO-8859-_1)"
 
-#: src/compose.c:606 src/mainwindow.c:650 src/messageview.c:185
+#: src/compose.c:606 src/mainwindow.c:652 src/messageview.c:185
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Pregled/_Znakovni standard/Zapadna Europa (ISO-8859-_1)"
 
-#: src/compose.c:610 src/mainwindow.c:656 src/messageview.c:190
+#: src/compose.c:610 src/mainwindow.c:658 src/messageview.c:190
 #, fuzzy
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Pregled/_Znakovni standard/Srednja Europa (ISO-8859-_2)"
 
-#: src/compose.c:614 src/mainwindow.c:660 src/messageview.c:193
+#: src/compose.c:614 src/mainwindow.c:662 src/messageview.c:193
 #, fuzzy
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Pregled/_Znakovni standard/_Baltik (ISO-8859-13)"
 
-#: src/compose.c:616 src/mainwindow.c:662 src/messageview.c:195
+#: src/compose.c:616 src/mainwindow.c:664 src/messageview.c:195
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Pregled/_Znakovni standard/Baltik (ISO-8859-_4)"
 
-#: src/compose.c:618 src/mainwindow.c:664 src/messageview.c:197
+#: src/compose.c:618 src/mainwindow.c:666 src/messageview.c:197
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/_Pregled/_Znakovni standard/Čirilica (Windows-1251)"
 
-#: src/compose.c:622 src/mainwindow.c:668 src/messageview.c:200
+#: src/compose.c:622 src/mainwindow.c:670 src/messageview.c:200
 #, fuzzy
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Pregled/_Znakovni standard/Grčka (ISO-8859-_7)"
 
-#: src/compose.c:626 src/mainwindow.c:672 src/messageview.c:203
+#: src/compose.c:626 src/mainwindow.c:674 src/messageview.c:203
 #, fuzzy
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/_Pregled/_Znakovni standard/Baltik (ISO-8859-_4)"
 
-#: src/compose.c:628 src/mainwindow.c:674 src/messageview.c:205
+#: src/compose.c:628 src/mainwindow.c:676 src/messageview.c:205
 #, fuzzy
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/_Pregled/_Znakovni standard/Čirilica (Windows-1251)"
 
-#: src/compose.c:632 src/mainwindow.c:678 src/messageview.c:208
+#: src/compose.c:632 src/mainwindow.c:680 src/messageview.c:208
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Pregled/_Znakovni standard/Grčka (ISO-8859-_7)"
 
-#: src/compose.c:634 src/mainwindow.c:680 src/messageview.c:210
+#: src/compose.c:634 src/mainwindow.c:682 src/messageview.c:210
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Pregled/_Znakovni standard/Čirilica (Windows-1251)"
 
-#: src/compose.c:638 src/mainwindow.c:684 src/messageview.c:213
+#: src/compose.c:638 src/mainwindow.c:686 src/messageview.c:213
 #, fuzzy
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Pregled/_Znakovni standard/Turska (ISO-8859-_9)"
 
-#: src/compose.c:642 src/mainwindow.c:688 src/messageview.c:216
+#: src/compose.c:642 src/mainwindow.c:690 src/messageview.c:216
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Pregled/_Znakovni standard/Čirilica (ISO-8859-_5)"
 
-#: src/compose.c:644 src/mainwindow.c:690 src/messageview.c:218
+#: src/compose.c:644 src/mainwindow.c:692 src/messageview.c:218
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Pregled/_Znakovni standard/Čirilica (KOI8-_R)"
 
-#: src/compose.c:646 src/mainwindow.c:692 src/messageview.c:220
+#: src/compose.c:646 src/mainwindow.c:694 src/messageview.c:220
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Pregled/_Znakovni standard/Čirilica (KOI8-_R)"
 
-#: src/compose.c:648 src/mainwindow.c:694 src/messageview.c:222
+#: src/compose.c:648 src/mainwindow.c:696 src/messageview.c:222
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Pregled/_Znakovni standard/Čirilica (Windows-1251)"
 
-#: src/compose.c:652 src/mainwindow.c:698 src/messageview.c:225
+#: src/compose.c:652 src/mainwindow.c:700 src/messageview.c:225
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Pregled/_Znakovni standard/Japan (ISO-2022-_JP)"
 
-#: src/compose.c:656 src/mainwindow.c:708 src/messageview.c:234
+#: src/compose.c:656 src/mainwindow.c:710 src/messageview.c:234
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Pregled/_Znakovni standard/Pojednostavljeni Kineski (_GB2312)"
 
-#: src/compose.c:658 src/mainwindow.c:710 src/messageview.c:236
+#: src/compose.c:658 src/mainwindow.c:712 src/messageview.c:236
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Pregled/_Znakovni standard/Pojednostavljeni Kineski (_GB2312)"
 
-#: src/compose.c:660 src/mainwindow.c:712 src/messageview.c:238
+#: src/compose.c:660 src/mainwindow.c:714 src/messageview.c:238
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Pregled/_Znakovni standard/Tradicionalni Kineski (_Big5)"
 
-#: src/compose.c:664 src/mainwindow.c:720 src/messageview.c:245
+#: src/compose.c:664 src/mainwindow.c:722 src/messageview.c:245
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Pregled/_Znakovni standard/Koreja (EUC-_KR)"
 
-#: src/compose.c:668 src/mainwindow.c:726 src/messageview.c:250
+#: src/compose.c:668 src/mainwindow.c:728 src/messageview.c:250
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Pregled/_Znakovni standard/Thai (TIS-620)"
 
-#: src/compose.c:670 src/mainwindow.c:728 src/messageview.c:252
+#: src/compose.c:670 src/mainwindow.c:730 src/messageview.c:252
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Pregled/_Znakovni standard/Thai (Windows-874)"
 
-#: src/compose.c:674 src/mainwindow.c:788 src/messageview.c:283
+#: src/compose.c:674 src/mainwindow.c:790 src/messageview.c:283
 #, fuzzy
 msgid "/_Tools/_Address book"
 msgstr "/_Alat/_Adresar"
@@ -1542,14 +1542,14 @@ msgstr "/_Alat/_Adresar"
 msgid "/_Tools/_Template"
 msgstr "/_Alat/_Obrazac"
 
-#: src/compose.c:677 src/mainwindow.c:812 src/messageview.c:299
+#: src/compose.c:677 src/mainwindow.c:814 src/messageview.c:299
 #, fuzzy
 msgid "/_Tools/Actio_ns"
 msgstr "/_Izvrši"
 
-#: src/compose.c:679 src/compose.c:683 src/compose.c:689 src/mainwindow.c:791
-#: src/mainwindow.c:805 src/mainwindow.c:810 src/mainwindow.c:813
-#: src/mainwindow.c:817 src/mainwindow.c:819 src/messageview.c:286
+#: src/compose.c:679 src/compose.c:683 src/compose.c:689 src/mainwindow.c:793
+#: src/mainwindow.c:807 src/mainwindow.c:812 src/mainwindow.c:815
+#: src/mainwindow.c:819 src/mainwindow.c:821 src/messageview.c:286
 #: src/messageview.c:298
 #, fuzzy
 msgid "/_Tools/---"
@@ -1754,7 +1754,7 @@ msgstr "/_Izvrši"
 msgid "PGP Encrypt"
 msgstr "/_Poruka/_Kriptiraj"
 
-#: src/compose.c:4442 src/compose.c:5543
+#: src/compose.c:4442 src/compose.c:5546
 msgid "MIME type"
 msgstr "MIME tip"
 
@@ -1798,37 +1798,37 @@ msgstr "Uredi s vanjskim uređivačem"
 msgid "Wrap all long lines"
 msgstr "/_Uredi/Sažmi sve duge _linije"
 
-#: src/compose.c:5439
+#: src/compose.c:5442
 msgid "Invalid MIME type."
 msgstr "Pogrešan MIME tip"
 
-#: src/compose.c:5457
+#: src/compose.c:5460
 msgid "File doesn't exist or is empty."
 msgstr "Datoteka ne postoji ili je prazna."
 
-#: src/compose.c:5525
+#: src/compose.c:5528
 #, fuzzy
 msgid "Properties"
 msgstr "Postavke"
 
-#: src/compose.c:5545 src/prefs_common_dialog.c:1504
+#: src/compose.c:5548 src/prefs_common_dialog.c:1504
 msgid "Encoding"
 msgstr "Kodiranje"
 
-#: src/compose.c:5568 src/prefs_folder_item.c:202
+#: src/compose.c:5571 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Staza"
 
-#: src/compose.c:5569
+#: src/compose.c:5572
 msgid "File name"
 msgstr "Ime datoteke"
 
-#: src/compose.c:5659
+#: src/compose.c:5662
 #, 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:5714
+#: src/compose.c:5717
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1838,53 +1838,53 @@ msgstr ""
 "Ugasiti proces?\n"
 "grupa procesa: %d"
 
-#: src/compose.c:6040 src/mainwindow.c:2752
+#: src/compose.c:6043 src/mainwindow.c:2761
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:6156 src/compose.c:6161 src/compose.c:6167
+#: src/compose.c:6159 src/compose.c:6164 src/compose.c:6170
 msgid "Can't queue the message."
 msgstr "Ne mogu odložiti poruku."
 
-#: src/compose.c:6258
+#: src/compose.c:6261
 #, fuzzy
 msgid "Select files"
 msgstr "Odaberite datoteku"
 
-#: src/compose.c:6281
+#: src/compose.c:6284
 msgid "Select file"
 msgstr "Odaberite datoteku"
 
-#: src/compose.c:6316
+#: src/compose.c:6319
 #, fuzzy
 msgid "Save message"
 msgstr "Pošalji poruku"
 
-#: src/compose.c:6317
+#: src/compose.c:6320
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Ova poruka je promijenjena, odbaciti?"
 
-#: src/compose.c:6319
+#: src/compose.c:6322
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:6361
+#: src/compose.c:6364
 #, fuzzy, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Uistinu obrisati ovaj obrazac?"
 
-#: src/compose.c:6363
+#: src/compose.c:6366
 #, fuzzy
 msgid "Apply template"
 msgstr "Briši obrazac"
 
-#: src/compose.c:6364
+#: src/compose.c:6367
 #, fuzzy
 msgid "_Replace"
 msgstr "Obrazac"
 
-#: src/compose.c:6364
+#: src/compose.c:6367
 #, fuzzy
 msgid "_Insert"
 msgstr "Unesi"
@@ -2350,12 +2350,12 @@ msgstr "Postavljam info spisa...\n"
 msgid "Setting folder info..."
 msgstr "Postavljam info spisa..."
 
-#: src/folderview.c:868 src/mainwindow.c:3748 src/setup.c:80
+#: src/folderview.c:868 src/mainwindow.c:3757 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Pretražujem spise %s%c%s ..."
 
-#: src/folderview.c:872 src/mainwindow.c:3753 src/setup.c:85
+#: src/folderview.c:872 src/mainwindow.c:3762 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Pretražujem spis %s ..."
@@ -3148,621 +3148,626 @@ msgstr "/_Pregled/_Traka alata/Slike i tekst"
 
 #: src/mainwindow.c:566
 #, fuzzy
-msgid "/_View/Show or hi_de/_Toolbar/_Icon"
+msgid "/_View/Show or hi_de/_Toolbar/Text at the _right of icon"
 msgstr "/_Pregled/_Traka alata/_Slike"
 
 #: src/mainwindow.c:568
 #, fuzzy
+msgid "/_View/Show or hi_de/_Toolbar/_Icon"
+msgstr "/_Pregled/_Traka alata/_Slike"
+
+#: src/mainwindow.c:570
+#, fuzzy
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/_Pregled/_Traka alata/_Tekst"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:572
 #, fuzzy
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/_Pregled/_Traka alata/_Ništa"
 
-#: src/mainwindow.c:572
+#: src/mainwindow.c:574
 #, fuzzy
 msgid "/_View/Show or hi_de/_Search bar"
 msgstr "/_Pregled/Stat_us traka"
 
-#: src/mainwindow.c:574
+#: src/mainwindow.c:576
 #, fuzzy
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/_Pregled/Stat_us traka"
 
-#: src/mainwindow.c:576
+#: src/mainwindow.c:578
 #, fuzzy
 msgid "/_View/_Customize toolbar..."
 msgstr "/_Održavanje/_Idi u drugi spis..."
 
-#: src/mainwindow.c:578
+#: src/mainwindow.c:580
 msgid "/_View/Separate f_older tree"
 msgstr "/_Pregled/Odvoji sta_blo spisa"
 
-#: src/mainwindow.c:579
+#: src/mainwindow.c:581
 #, fuzzy
 msgid "/_View/Separate _message view"
 msgstr "/_Pregled/Odvoji pre_gled poruka"
 
-#: src/mainwindow.c:581
+#: src/mainwindow.c:583
 #, fuzzy
 msgid "/_View/_Sort"
 msgstr "/_Pregled/Pr_egledaj izvor"
 
-#: src/mainwindow.c:582
+#: src/mainwindow.c:584
 #, fuzzy
 msgid "/_View/_Sort/by _number"
 msgstr "/_Održavanje/Pos_loži/Posloži po _broju"
 
-#: src/mainwindow.c:583
+#: src/mainwindow.c:585
 #, fuzzy
 msgid "/_View/_Sort/by s_ize"
 msgstr "/_Održavanje/Pos_loži/Posloži po _veličini"
 
-#: src/mainwindow.c:584
+#: src/mainwindow.c:586
 #, fuzzy
 msgid "/_View/_Sort/by _date"
 msgstr "/_Održavanje/Pos_loži/Posloži po _datumu"
 
-#: src/mainwindow.c:585
+#: src/mainwindow.c:587
 #, fuzzy
 msgid "/_View/_Sort/by t_hread date"
 msgstr "/_Održavanje/Pos_loži/Posloži po _datumu"
 
-#: src/mainwindow.c:586
+#: src/mainwindow.c:588
 #, fuzzy
 msgid "/_View/_Sort/by _from"
 msgstr "/_Održavanje/Pos_loži/Posloži po _pošiljatelju"
 
-#: src/mainwindow.c:587
+#: src/mainwindow.c:589
 #, fuzzy
 msgid "/_View/_Sort/by _recipient"
 msgstr "/_Održavanje/Pos_loži/Posloži po _veličini"
 
-#: src/mainwindow.c:588
+#: src/mainwindow.c:590
 #, fuzzy
 msgid "/_View/_Sort/by _subject"
 msgstr "/_Održavanje/Pos_loži/Posloži po _temi"
 
-#: src/mainwindow.c:589
+#: src/mainwindow.c:591
 #, fuzzy
 msgid "/_View/_Sort/by _color label"
 msgstr "/_Održavanje/Pos_loži/Posloži oznaci _boje"
 
-#: src/mainwindow.c:591
+#: src/mainwindow.c:593
 #, fuzzy
 msgid "/_View/_Sort/by _mark"
 msgstr "/_Održavanje/Pos_loži/Posloži po _oznaci"
 
-#: src/mainwindow.c:592
+#: src/mainwindow.c:594
 #, fuzzy
 msgid "/_View/_Sort/by _unread"
 msgstr "/_Održavanje/Pos_loži/Posloži po _nepročitanom"
 
-#: src/mainwindow.c:593
+#: src/mainwindow.c:595
 #, fuzzy
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/_Održavanje/Pos_loži/Posloži po _prilogu"
 
-#: src/mainwindow.c:595
+#: src/mainwindow.c:597
 #, fuzzy
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/_Održavanje/Pos_loži/Posloži po _nepročitanom"
 
-#: src/mainwindow.c:596 src/mainwindow.c:599
+#: src/mainwindow.c:598 src/mainwindow.c:601
 #, fuzzy
 msgid "/_View/_Sort/---"
 msgstr "/_Pregled/_Znakovni standard/---"
 
-#: src/mainwindow.c:597
+#: src/mainwindow.c:599
 #, fuzzy
 msgid "/_View/_Sort/Ascending"
 msgstr "/_Pregled/Pr_egledaj izvor"
 
-#: src/mainwindow.c:598
+#: src/mainwindow.c:600
 #, fuzzy
 msgid "/_View/_Sort/Descending"
 msgstr "/_Pregled/Pr_egledaj izvor"
 
-#: src/mainwindow.c:600
+#: src/mainwindow.c:602
 #, fuzzy
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/_Održavanje/Pos_loži/P_rivuci po temi"
 
-#: src/mainwindow.c:602
+#: src/mainwindow.c:604
 #, fuzzy
 msgid "/_View/Th_read view"
 msgstr "/_Pregled/_Pregled poruka"
 
-#: src/mainwindow.c:603
+#: src/mainwindow.c:605
 #, fuzzy
 msgid "/_View/E_xpand all threads"
 msgstr "Raširi stablo"
 
-#: src/mainwindow.c:604
+#: src/mainwindow.c:606
 #, fuzzy
 msgid "/_View/Co_llapse all threads"
 msgstr "/_Pregled/Prikaži s_vo zaglavlje"
 
-#: src/mainwindow.c:605
+#: src/mainwindow.c:607
 #, fuzzy
 msgid "/_View/Set display _item..."
 msgstr "/Održavanje/Postavi po_jedinosti prikaza"
 
-#: src/mainwindow.c:608
+#: src/mainwindow.c:610
 #, fuzzy
 msgid "/_View/_Go to"
 msgstr "/_Pregled/_Znakovni standard"
 
-#: src/mainwindow.c:609
+#: src/mainwindow.c:611
 #, fuzzy
 msgid "/_View/_Go to/_Prev message"
 msgstr "/_Održavanje/Idi pre_ma/_Prethodna poruka"
 
-#: src/mainwindow.c:610
+#: src/mainwindow.c:612
 #, fuzzy
 msgid "/_View/_Go to/_Next message"
 msgstr "/_Održavanje/Idi pre_ma/Slij_edeća poruka"
 
-#: src/mainwindow.c:611 src/mainwindow.c:616 src/mainwindow.c:619
-#: src/mainwindow.c:624 src/mainwindow.c:629
+#: src/mainwindow.c:613 src/mainwindow.c:618 src/mainwindow.c:621
+#: src/mainwindow.c:626 src/mainwindow.c:631
 #, fuzzy
 msgid "/_View/_Go to/---"
 msgstr "/_Pregled/_Znakovni standard/---"
 
-#: src/mainwindow.c:612
+#: src/mainwindow.c:614
 #, fuzzy
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/_Održavanje/Idi pre_ma/Prethodna _nepročitana poruka"
 
-#: src/mainwindow.c:614
+#: src/mainwindow.c:616
 #, fuzzy
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/_Održavanje/Idi pre_ma/_Slijedeća nepročitana poruka"
 
-#: src/mainwindow.c:617
+#: src/mainwindow.c:619
 #, fuzzy
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/_Održavanje/Idi pre_ma/_Prethodna poruka"
 
-#: src/mainwindow.c:618
+#: src/mainwindow.c:620
 #, fuzzy
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/_Održavanje/Idi pre_ma/Slij_edeća poruka"
 
-#: src/mainwindow.c:620
+#: src/mainwindow.c:622
 #, fuzzy
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/_Održavanje/P_rethodna označena poruka"
 
-#: src/mainwindow.c:622
+#: src/mainwindow.c:624
 #, fuzzy
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/_Održavanje/Idi pre_ma/Slijedeća _označena poruka"
 
-#: src/mainwindow.c:625
+#: src/mainwindow.c:627
 #, fuzzy
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/_Održavanje/Idi pre_ma/Pre_thodna label poruka"
 
-#: src/mainwindow.c:627
+#: src/mainwindow.c:629
 #, fuzzy
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/_Održavanje/Idi pre_ma/Slijedeća _label poruka"
 
-#: src/mainwindow.c:630
+#: src/mainwindow.c:632
 #, fuzzy
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Održavanje/_Idi u drugi spis..."
 
-#: src/mainwindow.c:639 src/messageview.c:174
+#: src/mainwindow.c:641 src/messageview.c:174
 #, fuzzy
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Pregled/_Znakovni standard/_Auto detekcija"
 
-#: src/mainwindow.c:652 src/messageview.c:187
+#: src/mainwindow.c:654 src/messageview.c:187
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr "/_Pregled/_Znakovni standard/Zapadna Europa (ISO-8859-_1)"
 
-#: src/mainwindow.c:700 src/messageview.c:227
+#: src/mainwindow.c:702 src/messageview.c:227
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Pregled/_Znakovni standard/Japan (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:702 src/messageview.c:229
+#: src/mainwindow.c:704 src/messageview.c:229
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Pregled/_Znakovni standard/Japan (_EUC-JP)"
 
-#: src/mainwindow.c:704 src/messageview.c:231
+#: src/mainwindow.c:706 src/messageview.c:231
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Pregled/_Znakovni standard/Japan (_Shift__JIS)"
 
-#: src/mainwindow.c:714 src/messageview.c:240
+#: src/mainwindow.c:716 src/messageview.c:240
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Pregled/_Znakovni standard/Tradicionalni Kineski (EUC-_TW)"
 
-#: src/mainwindow.c:716 src/messageview.c:242
+#: src/mainwindow.c:718 src/messageview.c:242
 #, fuzzy
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Pregled/_Znakovni standard/Kina (ISO-2022-_CN)"
 
-#: src/mainwindow.c:722 src/messageview.c:247
+#: src/mainwindow.c:724 src/messageview.c:247
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Pregled/_Znakovni standard/Koreja (ISO-2022-KR)"
 
-#: src/mainwindow.c:735 src/summaryview.c:464
+#: src/mainwindow.c:737 src/summaryview.c:464
 msgid "/_View/Open in new _window"
 msgstr "/_Pregled/Otvori u novom _prozoru"
 
-#: src/mainwindow.c:736 src/messageview.c:259 src/summaryview.c:466
+#: src/mainwindow.c:738 src/messageview.c:259 src/summaryview.c:466
 #, fuzzy
 msgid "/_View/Mess_age source"
 msgstr "/_Pregled/Pr_egledaj izvor"
 
-#: src/mainwindow.c:737 src/messageview.c:260 src/summaryview.c:467
+#: src/mainwindow.c:739 src/messageview.c:260 src/summaryview.c:467
 #, fuzzy
 msgid "/_View/All _headers"
 msgstr "/_Pregled/Prikaži s_vo zaglavlje"
 
-#: src/mainwindow.c:739
+#: src/mainwindow.c:741
 #, fuzzy
 msgid "/_View/_Update summary"
 msgstr "/_Pregled/_Znakovni standard"
 
-#: src/mainwindow.c:741 src/messageview.c:263
+#: src/mainwindow.c:743 src/messageview.c:263
 msgid "/_Message"
 msgstr "/_Poruka"
 
-#: src/mainwindow.c:742
+#: src/mainwindow.c:744
 #, fuzzy
 msgid "/_Message/Recei_ve"
 msgstr "/_Pošta/Pre_Uredi"
 
-#: src/mainwindow.c:743
+#: src/mainwindow.c:745
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/_Pošta/Primi poštu sa _svih računa"
 
-#: src/mainwindow.c:745
+#: src/mainwindow.c:747
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/_Pošta/Primi poštu sa _svih računa"
 
-#: src/mainwindow.c:747
+#: src/mainwindow.c:749
 #, fuzzy
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/_Poruka/Pošalji _kasnije"
 
-#: src/mainwindow.c:749
+#: src/mainwindow.c:751
 #, fuzzy
 msgid "/_Message/Recei_ve/---"
 msgstr "/_Pošta/Pre_Uredi"
 
-#: src/mainwindow.c:750
+#: src/mainwindow.c:752
 #, fuzzy
 msgid "/_Message/_Send queued messages"
 msgstr "/_Pošta/Pošalji _odložene poruke"
 
-#: src/mainwindow.c:751 src/mainwindow.c:753 src/mainwindow.c:760
-#: src/mainwindow.c:765 src/mainwindow.c:768 src/mainwindow.c:779
-#: src/mainwindow.c:781 src/mainwindow.c:784 src/messageview.c:266
+#: src/mainwindow.c:753 src/mainwindow.c:755 src/mainwindow.c:762
+#: src/mainwindow.c:767 src/mainwindow.c:770 src/mainwindow.c:781
+#: src/mainwindow.c:783 src/mainwindow.c:786 src/messageview.c:266
 #: src/messageview.c:274 src/messageview.c:279
 msgid "/_Message/---"
 msgstr "/_Poruka/---"
 
-#: src/mainwindow.c:752 src/messageview.c:264
+#: src/mainwindow.c:754 src/messageview.c:264
 msgid "/_Message/Compose _new message"
 msgstr "/_Pošta/Kreiraj _novu poruku"
 
-#: src/mainwindow.c:754 src/messageview.c:267
+#: src/mainwindow.c:756 src/messageview.c:267
 msgid "/_Message/_Reply"
 msgstr "/_Pošta/O_dgovori"
 
-#: src/mainwindow.c:755
+#: src/mainwindow.c:757
 #, fuzzy
 msgid "/_Message/Repl_y to"
 msgstr "/_Poruka/O_dgovori"
 
-#: src/mainwindow.c:756 src/messageview.c:268
+#: src/mainwindow.c:758 src/messageview.c:268
 #, fuzzy
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Pošta/Odgovori svi_ma"
 
-#: src/mainwindow.c:757 src/messageview.c:270
+#: src/mainwindow.c:759 src/messageview.c:270
 #, fuzzy
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Pošta/Od_govori pošiljatelju"
 
-#: src/mainwindow.c:758 src/messageview.c:272
+#: src/mainwindow.c:760 src/messageview.c:272
 #, fuzzy
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Pošta/Odgovori svi_ma"
 
-#: src/mainwindow.c:761 src/messageview.c:275
+#: src/mainwindow.c:763 src/messageview.c:275
 msgid "/_Message/_Forward"
 msgstr "/_Pošta/P_roslijedi"
 
-#: src/mainwindow.c:762 src/messageview.c:276
+#: src/mainwindow.c:764 src/messageview.c:276
 #, fuzzy
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Pošta/Proslijedi _kao prilog"
 
-#: src/mainwindow.c:764 src/messageview.c:278
+#: src/mainwindow.c:766 src/messageview.c:278
 #, fuzzy
 msgid "/_Message/Redirec_t"
 msgstr "/_Pošta/Pre_Uredi"
 
-#: src/mainwindow.c:766
+#: src/mainwindow.c:768
 msgid "/_Message/M_ove..."
 msgstr "/_Pošta/Prem_jesti..."
 
-#: src/mainwindow.c:767
+#: src/mainwindow.c:769
 msgid "/_Message/_Copy..."
 msgstr "/_Pošta/Kopir_aj"
 
-#: src/mainwindow.c:769
+#: src/mainwindow.c:771
 msgid "/_Message/_Mark"
 msgstr "/_Pošta/O_znači"
 
-#: src/mainwindow.c:770
+#: src/mainwindow.c:772
 msgid "/_Message/_Mark/_Mark"
 msgstr "/_Pošta/O_znači/_Označi"
 
-#: src/mainwindow.c:771
+#: src/mainwindow.c:773
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/_Pošta/O_znači/_Ukloni oznaku"
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:774
 msgid "/_Message/_Mark/---"
 msgstr "/_Pošta/O_znači/---"
 
-#: src/mainwindow.c:773
+#: src/mainwindow.c:775
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/_Pošta/O_znači/Označi kao _nepročitano"
 
-#: src/mainwindow.c:774
+#: src/mainwindow.c:776
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/_Pošta/O_znači/Označi kao _pročitano"
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:778
 #, fuzzy
 msgid "/_Message/_Mark/Mark _thread as read"
 msgstr "/_Pošta/O_znači/Označi kao _pročitano"
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:780
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/_Pošta/O_znači/Označi sve _pročitano"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:782
 msgid "/_Message/_Delete"
 msgstr "/_Pošta/O_briši"
 
-#: src/mainwindow.c:782
+#: src/mainwindow.c:784
 #, fuzzy
 msgid "/_Message/Set as _junk mail"
 msgstr "/_Pošta/Primi novu _poštu"
 
-#: src/mainwindow.c:783
+#: src/mainwindow.c:785
 #, fuzzy
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/_Pošta/Primi novu _poštu"
 
-#: src/mainwindow.c:785 src/messageview.c:280
+#: src/mainwindow.c:787 src/messageview.c:280
 msgid "/_Message/Re-_edit"
 msgstr "/_Pošta/Pre_Uredi"
 
-#: src/mainwindow.c:789
+#: src/mainwindow.c:791
 #, fuzzy
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/Dod_aj pošiljatelja u adresar"
 
-#: src/mainwindow.c:792
+#: src/mainwindow.c:794
 #, fuzzy
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/_Održavanje/_Filtriraj poštu"
 
-#: src/mainwindow.c:794
+#: src/mainwindow.c:796
 #, fuzzy
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Održavanje/_Filtriraj poštu"
 
-#: src/mainwindow.c:796 src/messageview.c:287
+#: src/mainwindow.c:798 src/messageview.c:287
 #, fuzzy
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Održavanje/_Filtriraj poštu"
 
-#: src/mainwindow.c:797 src/messageview.c:289
+#: src/mainwindow.c:799 src/messageview.c:289
 #, fuzzy
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Održavanje/_Filtriraj poštu"
 
-#: src/mainwindow.c:799 src/messageview.c:291
+#: src/mainwindow.c:801 src/messageview.c:291
 #, fuzzy
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Održavanje/_Filtriraj poštu"
 
-#: src/mainwindow.c:801 src/messageview.c:293
+#: src/mainwindow.c:803 src/messageview.c:293
 #, fuzzy
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Održavanje/_Filtriraj poštu"
 
-#: src/mainwindow.c:803 src/messageview.c:295
+#: src/mainwindow.c:805 src/messageview.c:295
 #, fuzzy
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Održavanje/_Filtriraj poštu"
 
-#: src/mainwindow.c:806
+#: src/mainwindow.c:808
 #, fuzzy
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/_Održavanje/_Filtriraj poštu"
 
-#: src/mainwindow.c:808
+#: src/mainwindow.c:810
 #, fuzzy
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/_Održavanje/_Filtriraj poštu"
 
-#: src/mainwindow.c:815
+#: src/mainwindow.c:817
 #, fuzzy
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/_Održavanje/_Obriši duplicirane poruke"
 
-#: src/mainwindow.c:818
+#: src/mainwindow.c:820
 #, fuzzy
 msgid "/_Tools/E_xecute marked process"
 msgstr "Izvršava označene procese"
 
-#: src/mainwindow.c:820
+#: src/mainwindow.c:822
 #, fuzzy
 msgid "/_Tools/_Log window"
 msgstr "/_Alat/Zapisni prozor"
 
-#: src/mainwindow.c:822
+#: src/mainwindow.c:824
 msgid "/_Configuration"
 msgstr "/_Konfiguracija"
 
-#: src/mainwindow.c:823
+#: src/mainwindow.c:825
 msgid "/_Configuration/_Common preferences..."
 msgstr "/_Konfiguracija/U_običajene postavke..."
 
-#: src/mainwindow.c:825
+#: src/mainwindow.c:827
 msgid "/_Configuration/_Filter setting..."
 msgstr "/_Konfiguracija/Postavke _filtera..."
 
-#: src/mainwindow.c:827
+#: src/mainwindow.c:829
 msgid "/_Configuration/_Template..."
 msgstr "/_Konfiguracija/_Obrazac..."
 
-#: src/mainwindow.c:829
+#: src/mainwindow.c:831
 #, fuzzy
 msgid "/_Configuration/_Actions..."
 msgstr "/_Konfiguracija/_Uredi račune..."
 
-#: src/mainwindow.c:831
+#: src/mainwindow.c:833
 msgid "/_Configuration/---"
 msgstr "/_Konfiguracija/---"
 
-#: src/mainwindow.c:832
+#: src/mainwindow.c:834
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Konfiguracija/_Postavke za trenutni račun..."
 
-#: src/mainwindow.c:834
+#: src/mainwindow.c:836
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Konfiguracija/Kreiraj _novi račun..."
 
-#: src/mainwindow.c:836
+#: src/mainwindow.c:838
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Konfiguracija/_Uredi račune..."
 
-#: src/mainwindow.c:838
+#: src/mainwindow.c:840
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Konfiguracija/Promjeni _trenutni račun"
 
-#: src/mainwindow.c:842
+#: src/mainwindow.c:844
 msgid "/_Help/_Manual"
 msgstr "/_Pomoć/_Priručnik"
 
-#: src/mainwindow.c:843
+#: src/mainwindow.c:845
 msgid "/_Help/_Manual/_English"
 msgstr "/_Pomoć/_Priručnik/_Engleski"
 
-#: src/mainwindow.c:844
+#: src/mainwindow.c:846
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/_Pomoć/_Priručnik/_Japanski"
 
-#: src/mainwindow.c:845
+#: src/mainwindow.c:847
 #, fuzzy
 msgid "/_Help/_FAQ"
 msgstr "/_Pomoć/_O"
 
-#: src/mainwindow.c:846
+#: src/mainwindow.c:848
 #, fuzzy
 msgid "/_Help/_FAQ/_English"
 msgstr "/_Pomoć/_Priručnik/_Engleski"
 
-#: src/mainwindow.c:847
+#: src/mainwindow.c:849
 #, fuzzy
 msgid "/_Help/_FAQ/_German"
 msgstr "/_Pomoć/_Priručnik/_Engleski"
 
-#: src/mainwindow.c:848
+#: src/mainwindow.c:850
 #, fuzzy
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/_Pomoć/_Priručnik/_Engleski"
 
-#: src/mainwindow.c:849
+#: src/mainwindow.c:851
 msgid "/_Help/_FAQ/_French"
 msgstr ""
 
-#: src/mainwindow.c:850
+#: src/mainwindow.c:852
 #, fuzzy
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/_Pomoć/_Priručnik/_Engleski"
 
-#: src/mainwindow.c:851
+#: src/mainwindow.c:853
 #, fuzzy
 msgid "/_Help/_Command line options"
 msgstr "Ime zaglavlja nije postavljeno."
 
-#: src/mainwindow.c:852
+#: src/mainwindow.c:854
 msgid "/_Help/---"
 msgstr "/_Pomoć/---"
 
-#: src/mainwindow.c:895
+#: src/mainwindow.c:897
 msgid "Creating main window...\n"
 msgstr "Kreiram glavne prozore...\n"
 
-#: src/mainwindow.c:1071
+#: src/mainwindow.c:1073
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "MainWindow: prikaz boje %d nije uspio\n"
 
-#: src/mainwindow.c:1175 src/summaryview.c:2387 src/summaryview.c:2472
+#: src/mainwindow.c:1181 src/summaryview.c:2387 src/summaryview.c:2472
 #: src/summaryview.c:4009 src/summaryview.c:4138 src/summaryview.c:4507
 msgid "done.\n"
 msgstr "gotovo.\n"
 
-#: src/mainwindow.c:1293 src/mainwindow.c:1334 src/mainwindow.c:1359
+#: src/mainwindow.c:1299 src/mainwindow.c:1340 src/mainwindow.c:1365
 msgid "Untitled"
 msgstr "Neimenovano"
 
-#: src/mainwindow.c:1360
+#: src/mainwindow.c:1366
 msgid "none"
 msgstr "ništa"
 
-#: src/mainwindow.c:1413
+#: src/mainwindow.c:1419
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr ""
 
-#: src/mainwindow.c:1663
+#: src/mainwindow.c:1669
 msgid "Offline"
 msgstr ""
 
-#: src/mainwindow.c:1664
+#: src/mainwindow.c:1670
 msgid "You are offline. Go online?"
 msgstr ""
 
-#: src/mainwindow.c:1681
+#: src/mainwindow.c:1687
 #, fuzzy
 msgid "Empty all trash"
 msgstr "Isprazni smeće"
 
-#: src/mainwindow.c:1682
+#: src/mainwindow.c:1688
 #, fuzzy
 msgid "Delete all messages in trash folders?"
 msgstr "Isprazniti sve poruke u smeću?"
 
-#: src/mainwindow.c:1712
+#: src/mainwindow.c:1718
 msgid "Add mailbox"
 msgstr "Dodaj sandučić"
 
-#: src/mainwindow.c:1713
+#: src/mainwindow.c:1719
 #, fuzzy
 msgid ""
 "Specify the location of mailbox.\n"
@@ -3773,16 +3778,16 @@ msgstr ""
 "Ako je unešen postojeći sandučić, biti će\n"
 "automatski pretražen."
 
-#: src/mainwindow.c:1719 src/setup.c:49
+#: src/mainwindow.c:1725 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Sandučić `%s' već postoji."
 
-#: src/mainwindow.c:1724 src/setup.c:56
+#: src/mainwindow.c:1730 src/setup.c:56
 msgid "Mailbox"
 msgstr "Sandučić"
 
-#: src/mainwindow.c:1730 src/setup.c:62
+#: src/mainwindow.c:1736 src/setup.c:62
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3791,138 +3796,138 @@ msgstr ""
 "Kreiranje sandučića propalo.\n"
 "Možda neke datoteke već postoje ili nemate pravo pisanja u direktoriju."
 
-#: src/mainwindow.c:2198
+#: src/mainwindow.c:2206
 msgid "Sylpheed - Folder View"
 msgstr ""
 
-#: src/mainwindow.c:2217
+#: src/mainwindow.c:2225
 msgid "Sylpheed - Message View"
 msgstr ""
 
-#: src/mainwindow.c:2369 src/summaryview.c:418
+#: src/mainwindow.c:2377 src/summaryview.c:418
 msgid "/_Reply"
 msgstr "/Od_govori"
 
-#: src/mainwindow.c:2370
+#: src/mainwindow.c:2378
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "Odgovara svima"
 
-#: src/mainwindow.c:2371
+#: src/mainwindow.c:2379
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/Odgovor_i pošiljatelju"
 
-#: src/mainwindow.c:2372
+#: src/mainwindow.c:2380
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/Odgovori svi_ma"
 
-#: src/mainwindow.c:2377 src/summaryview.c:425
+#: src/mainwindow.c:2385 src/summaryview.c:425
 msgid "/_Forward"
 msgstr "/Prosli_jedi"
 
-#: src/mainwindow.c:2378 src/summaryview.c:426
+#: src/mainwindow.c:2386 src/summaryview.c:426
 #, fuzzy
 msgid "/For_ward as attachment"
 msgstr "/Proslijedi kao prilo_g"
 
-#: src/mainwindow.c:2379 src/summaryview.c:427
+#: src/mainwindow.c:2387 src/summaryview.c:427
 #, fuzzy
 msgid "/Redirec_t"
 msgstr "/Pre-_uredi"
 
-#: src/mainwindow.c:2384
+#: src/mainwindow.c:2392
 msgid "Incorporate new mail"
 msgstr "Prima novu poštu"
 
-#: src/mainwindow.c:2386
+#: src/mainwindow.c:2394
 msgid "Incorporate new mail of all accounts"
 msgstr "Prima novu poštu sa svih računa"
 
-#: src/mainwindow.c:2388
+#: src/mainwindow.c:2396
 msgid "Send queued message(s)"
 msgstr "Šalje odložene poruke"
 
-#: src/mainwindow.c:2390
+#: src/mainwindow.c:2398
 msgid "Compose new message"
 msgstr "Kreiranje nove pošte"
 
-#: src/mainwindow.c:2392
+#: src/mainwindow.c:2400
 msgid "Reply to the message"
 msgstr "Odgovara na poruku"
 
-#: src/mainwindow.c:2394
+#: src/mainwindow.c:2402
 msgid "Reply to all"
 msgstr "Odgovara svima"
 
-#: src/mainwindow.c:2396
+#: src/mainwindow.c:2404
 msgid "Forward the message"
 msgstr "Prosljeđuje poruku"
 
-#: src/mainwindow.c:2398
+#: src/mainwindow.c:2406
 msgid "Delete the message"
 msgstr "Briše poruke"
 
-#: src/mainwindow.c:2400
+#: src/mainwindow.c:2408
 #, fuzzy
 msgid "Set as junk mail"
 msgstr "Postavi kao uobičajeni"
 
-#: src/mainwindow.c:2402
+#: src/mainwindow.c:2410
 msgid "Execute marked process"
 msgstr "Izvršava označene procese"
 
-#: src/mainwindow.c:2404
+#: src/mainwindow.c:2412
 msgid "Next unread message"
 msgstr "Slijedeća nepročitana poruka"
 
-#: src/mainwindow.c:2406
+#: src/mainwindow.c:2414
 #, fuzzy
 msgid "Previous unread message"
 msgstr "Slijedeća nepročitana poruka"
 
-#: src/mainwindow.c:2410
+#: src/mainwindow.c:2418
 #, fuzzy
 msgid "Print message"
 msgstr "Pošalji poruku"
 
-#: src/mainwindow.c:2412
+#: src/mainwindow.c:2420
 #, fuzzy
 msgid "Common preferences"
 msgstr "Uobičajene postavke"
 
-#: src/mainwindow.c:2414 src/prefs_account_dialog.c:511
+#: src/mainwindow.c:2422 src/prefs_account_dialog.c:511
 msgid "Account preferences"
 msgstr "Postavke računa"
 
-#: src/mainwindow.c:2779
+#: src/mainwindow.c:2788
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 
-#: src/mainwindow.c:2790
+#: src/mainwindow.c:2799
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 
-#: src/mainwindow.c:3062
+#: src/mainwindow.c:3071
 msgid "Exit"
 msgstr "Izlaz"
 
-#: src/mainwindow.c:3062
+#: src/mainwindow.c:3071
 msgid "Exit this program?"
 msgstr "Izlaz iz ovog programa?"
 
-#: src/mainwindow.c:3666
+#: src/mainwindow.c:3675
 #, fuzzy
 msgid "Command line options"
 msgstr "Ime zaglavlja nije postavljeno."
 
-#: src/mainwindow.c:3679
+#: src/mainwindow.c:3688
 #, fuzzy
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Upotreba: %s [OPCIJA]...\n"
 
-#: src/mainwindow.c:3687
+#: src/mainwindow.c:3696
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -3938,7 +3943,7 @@ msgid ""
 "--version"
 msgstr ""
 
-#: src/mainwindow.c:3703
+#: src/mainwindow.c:3712
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
diff --git a/po/hu.po b/po/hu.po
index b35e565f..cca5c2e1 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-01-31 16:49+0900\n"
+"POT-Creation-Date: 2007-01-31 17:29+0900\n"
 "PO-Revision-Date: 2006-12-23 10:50+0100\n"
 "Last-Translator: Németh Tamás <ntomasz@vipmail.hu>\n"
 "Language-Team: HUNGARIAN <NONE>\n"
@@ -910,7 +910,7 @@ msgstr "/_Cím/_Szerkesztés"
 msgid "/_Address/_Delete"
 msgstr "/_Cím/_Törlés"
 
-#: src/addressbook.c:359 src/compose.c:673 src/mainwindow.c:787
+#: src/addressbook.c:359 src/compose.c:673 src/mainwindow.c:789
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Eszközök"
@@ -919,12 +919,12 @@ msgstr "/_Eszközök"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Eszközök/_LDIF fájl importálása"
 
-#: src/addressbook.c:361 src/compose.c:694 src/mainwindow.c:841
+#: src/addressbook.c:361 src/compose.c:694 src/mainwindow.c:843
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Súgó"
 
-#: src/addressbook.c:362 src/compose.c:695 src/mainwindow.c:853
+#: src/addressbook.c:362 src/compose.c:695 src/mainwindow.c:855
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Súgó/_Névjegy"
@@ -966,7 +966,7 @@ msgstr "/_Törlés"
 msgid "E-Mail address"
 msgstr "Email cím"
 
-#: src/addressbook.c:496 src/compose.c:4873 src/mainwindow.c:2408
+#: src/addressbook.c:496 src/compose.c:4873 src/mainwindow.c:2416
 #: src/prefs_common_dialog.c:2274
 msgid "Address book"
 msgstr "Címjegyzék"
@@ -1181,7 +1181,7 @@ msgstr "Általános cím"
 msgid "Personal address"
 msgstr "Személyes cím"
 
-#: src/alertpanel.c:142 src/compose.c:5717 src/main.c:638
+#: src/alertpanel.c:142 src/compose.c:5720 src/main.c:638
 msgid "Notice"
 msgstr "Megjegyzés"
 
@@ -1348,9 +1348,9 @@ msgid "/_View/_Reply to"
 msgstr "/_Nézet/_Válasz"
 
 #: src/compose.c:578 src/compose.c:580 src/compose.c:582 src/compose.c:584
-#: src/compose.c:587 src/mainwindow.c:577 src/mainwindow.c:580
-#: src/mainwindow.c:607 src/mainwindow.c:631 src/mainwindow.c:734
-#: src/mainwindow.c:738 src/messageview.c:258
+#: src/compose.c:587 src/mainwindow.c:579 src/mainwindow.c:582
+#: src/mainwindow.c:609 src/mainwindow.c:633 src/mainwindow.c:736
+#: src/mainwindow.c:740 src/messageview.c:258
 msgid "/_View/---"
 msgstr "/_Nézet/---"
 
@@ -1371,7 +1371,7 @@ msgstr "/_Nézet/_Csatolás"
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/_Nézet/_Ugrás/_Másik _mappához"
 
-#: src/compose.c:593 src/mainwindow.c:638 src/messageview.c:173
+#: src/compose.c:593 src/mainwindow.c:640 src/messageview.c:173
 msgid "/_View/Character _encoding"
 msgstr "/_Nézet/_Karakterkódolás"
 
@@ -1382,112 +1382,112 @@ msgstr "/_Nézet/_Karakterkódolás/_Automatikus"
 #: src/compose.c:596 src/compose.c:602 src/compose.c:608 src/compose.c:612
 #: src/compose.c:620 src/compose.c:624 src/compose.c:630 src/compose.c:636
 #: src/compose.c:640 src/compose.c:650 src/compose.c:654 src/compose.c:662
-#: src/compose.c:666 src/mainwindow.c:634 src/mainwindow.c:641
+#: src/compose.c:666 src/mainwindow.c:636 src/mainwindow.c:643
 #: src/messageview.c:169
 msgid "/_View/Character _encoding/---"
 msgstr "/_Nézet/_Karakterkódolás/---"
 
-#: src/compose.c:598 src/mainwindow.c:642 src/messageview.c:177
+#: src/compose.c:598 src/mainwindow.c:644 src/messageview.c:177
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Nézet/_Karakterkódolás/7 bites ascii (US-ASC_II)"
 
-#: src/compose.c:600 src/mainwindow.c:644 src/messageview.c:180
+#: src/compose.c:600 src/mainwindow.c:646 src/messageview.c:180
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Nézet/_Karakterkódolás/Unicode (_UTF-8)"
 
-#: src/compose.c:604 src/mainwindow.c:648 src/messageview.c:183
+#: src/compose.c:604 src/mainwindow.c:650 src/messageview.c:183
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Nézet/_Karakterkódolás/Nyugat-Európai (ISO-8859-_1)"
 
-#: src/compose.c:606 src/mainwindow.c:650 src/messageview.c:185
+#: src/compose.c:606 src/mainwindow.c:652 src/messageview.c:185
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Nézet/_Karakterkódolás/Nyugat-Európai (ISO-8859-15)"
 
-#: src/compose.c:610 src/mainwindow.c:656 src/messageview.c:190
+#: src/compose.c:610 src/mainwindow.c:658 src/messageview.c:190
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Nézet/_Karakterkódolás/Közép-Európai (ISO-8859-_2)"
 
-#: src/compose.c:614 src/mainwindow.c:660 src/messageview.c:193
+#: src/compose.c:614 src/mainwindow.c:662 src/messageview.c:193
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Nézet/_Karakterkódolás/_Baltikumi (ISO-8859-13)"
 
-#: src/compose.c:616 src/mainwindow.c:662 src/messageview.c:195
+#: src/compose.c:616 src/mainwindow.c:664 src/messageview.c:195
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Nézet/_Karakterkódolás/Baltikumi (ISO-8859-_4)"
 
-#: src/compose.c:618 src/mainwindow.c:664 src/messageview.c:197
+#: src/compose.c:618 src/mainwindow.c:666 src/messageview.c:197
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/_Nézet/_Karakterkódolás/Baltikumi (Windows-1257)"
 
-#: src/compose.c:622 src/mainwindow.c:668 src/messageview.c:200
+#: src/compose.c:622 src/mainwindow.c:670 src/messageview.c:200
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Nézet/_Karakterkódolás/Görög (ISO-8859-_7)"
 
-#: src/compose.c:626 src/mainwindow.c:672 src/messageview.c:203
+#: src/compose.c:626 src/mainwindow.c:674 src/messageview.c:203
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/_Nézet/_Karakterkódolás/Arab (ISO-8859-_6)"
 
-#: src/compose.c:628 src/mainwindow.c:674 src/messageview.c:205
+#: src/compose.c:628 src/mainwindow.c:676 src/messageview.c:205
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/_Nézet/_Karakterkódolás/Arab (Windows-1256)"
 
-#: src/compose.c:632 src/mainwindow.c:678 src/messageview.c:208
+#: src/compose.c:632 src/mainwindow.c:680 src/messageview.c:208
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Nézet/_Karakterkódolás/Héber (ISO-8859-_8)"
 
-#: src/compose.c:634 src/mainwindow.c:680 src/messageview.c:210
+#: src/compose.c:634 src/mainwindow.c:682 src/messageview.c:210
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Nézet/_Karakterkódolás/Héber (Windows-1255)"
 
-#: src/compose.c:638 src/mainwindow.c:684 src/messageview.c:213
+#: src/compose.c:638 src/mainwindow.c:686 src/messageview.c:213
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Nézet/_Karakterkódolás/Török (ISO-8859-_9)"
 
-#: src/compose.c:642 src/mainwindow.c:688 src/messageview.c:216
+#: src/compose.c:642 src/mainwindow.c:690 src/messageview.c:216
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Nézet/_Karakterkódolás/Cirill (ISO-8859-_5)"
 
-#: src/compose.c:644 src/mainwindow.c:690 src/messageview.c:218
+#: src/compose.c:644 src/mainwindow.c:692 src/messageview.c:218
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Nézet/_Karakterkódolás/Cirill (KOI8-_R)"
 
-#: src/compose.c:646 src/mainwindow.c:692 src/messageview.c:220
+#: src/compose.c:646 src/mainwindow.c:694 src/messageview.c:220
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Nézet/_Karakterkódolás/Cirill (KOI8-_U)"
 
-#: src/compose.c:648 src/mainwindow.c:694 src/messageview.c:222
+#: src/compose.c:648 src/mainwindow.c:696 src/messageview.c:222
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Nézet/_Karakterkódolás/Cirill (Windows-1251)"
 
-#: src/compose.c:652 src/mainwindow.c:698 src/messageview.c:225
+#: src/compose.c:652 src/mainwindow.c:700 src/messageview.c:225
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Nézet/_Karakterkódolás/Japán (ISO-2022-_JP)"
 
-#: src/compose.c:656 src/mainwindow.c:708 src/messageview.c:234
+#: src/compose.c:656 src/mainwindow.c:710 src/messageview.c:234
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Nézet/_Karakterkódolás/Egyszerűsített Kínai (_GB2312)"
 
-#: src/compose.c:658 src/mainwindow.c:710 src/messageview.c:236
+#: src/compose.c:658 src/mainwindow.c:712 src/messageview.c:236
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Nézet/_Karakterkódolás/Egyszerűsített Kínai (GBK)"
 
-#: src/compose.c:660 src/mainwindow.c:712 src/messageview.c:238
+#: src/compose.c:660 src/mainwindow.c:714 src/messageview.c:238
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Nézet/_Karakterkódolás/Tradicionális Kínai (_Big5)"
 
-#: src/compose.c:664 src/mainwindow.c:720 src/messageview.c:245
+#: src/compose.c:664 src/mainwindow.c:722 src/messageview.c:245
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Nézet/_Karakterkódolás/Koreai (EUC-_KR)"
 
-#: src/compose.c:668 src/mainwindow.c:726 src/messageview.c:250
+#: src/compose.c:668 src/mainwindow.c:728 src/messageview.c:250
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Nézet/_Karakterkódolás/Thai (TIS-620)"
 
-#: src/compose.c:670 src/mainwindow.c:728 src/messageview.c:252
+#: src/compose.c:670 src/mainwindow.c:730 src/messageview.c:252
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Nézet/_Karakterkódolás/Thai (Windows-874)"
 
-#: src/compose.c:674 src/mainwindow.c:788 src/messageview.c:283
+#: src/compose.c:674 src/mainwindow.c:790 src/messageview.c:283
 msgid "/_Tools/_Address book"
 msgstr "/_Eszközök/_Címjegyzék"
 
@@ -1495,13 +1495,13 @@ msgstr "/_Eszközök/_Címjegyzék"
 msgid "/_Tools/_Template"
 msgstr "/_Eszközök/_Sablon"
 
-#: src/compose.c:677 src/mainwindow.c:812 src/messageview.c:299
+#: src/compose.c:677 src/mainwindow.c:814 src/messageview.c:299
 msgid "/_Tools/Actio_ns"
 msgstr "/_Eszközök/_Műveletek"
 
-#: src/compose.c:679 src/compose.c:683 src/compose.c:689 src/mainwindow.c:791
-#: src/mainwindow.c:805 src/mainwindow.c:810 src/mainwindow.c:813
-#: src/mainwindow.c:817 src/mainwindow.c:819 src/messageview.c:286
+#: src/compose.c:679 src/compose.c:683 src/compose.c:689 src/mainwindow.c:793
+#: src/mainwindow.c:807 src/mainwindow.c:812 src/mainwindow.c:815
+#: src/mainwindow.c:819 src/mainwindow.c:821 src/messageview.c:286
 #: src/messageview.c:298
 msgid "/_Tools/---"
 msgstr "/_Eszközök/---"
@@ -1709,7 +1709,7 @@ msgstr "PGP Aláírás"
 msgid "PGP Encrypt"
 msgstr "PGP Titkosítás"
 
-#: src/compose.c:4442 src/compose.c:5543
+#: src/compose.c:4442 src/compose.c:5546
 msgid "MIME type"
 msgstr "MIME típus"
 
@@ -1751,36 +1751,36 @@ msgstr "Szerkesztés külső programmal"
 msgid "Wrap all long lines"
 msgstr "Az összes hosszú sor törése"
 
-#: src/compose.c:5439
+#: src/compose.c:5442
 msgid "Invalid MIME type."
 msgstr "Érvénytelen MIME típus."
 
-#: src/compose.c:5457
+#: src/compose.c:5460
 msgid "File doesn't exist or is empty."
 msgstr "A fájl nem létezik vagy üres."
 
-#: src/compose.c:5525
+#: src/compose.c:5528
 msgid "Properties"
 msgstr "Tulajdonságok"
 
-#: src/compose.c:5545 src/prefs_common_dialog.c:1504
+#: src/compose.c:5548 src/prefs_common_dialog.c:1504
 msgid "Encoding"
 msgstr "Kódolás"
 
-#: src/compose.c:5568 src/prefs_folder_item.c:202
+#: src/compose.c:5571 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Elérési út"
 
-#: src/compose.c:5569
+#: src/compose.c:5572
 msgid "File name"
 msgstr "Fájlnév"
 
-#: src/compose.c:5659
+#: src/compose.c:5662
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Külső szerkesztő parancssora érvénytelen: `%s'\n"
 
-#: src/compose.c:5714
+#: src/compose.c:5717
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1789,48 +1789,48 @@ msgstr ""
 "A külső szerkesztő még dolgozik.\n"
 "A processz kényszerített kilövése (pid: %d)?\n"
 
-#: src/compose.c:6040 src/mainwindow.c:2752
+#: src/compose.c:6043 src/mainwindow.c:2761
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:6156 src/compose.c:6161 src/compose.c:6167
+#: src/compose.c:6159 src/compose.c:6164 src/compose.c:6170
 msgid "Can't queue the message."
 msgstr "Az üzenetet nem sikerült a Várakozó sorba rakni"
 
-#: src/compose.c:6258
+#: src/compose.c:6261
 msgid "Select files"
 msgstr "Fájlok választása"
 
-#: src/compose.c:6281
+#: src/compose.c:6284
 msgid "Select file"
 msgstr "Fájl választás"
 
-#: src/compose.c:6316
+#: src/compose.c:6319
 msgid "Save message"
 msgstr "Üzenet mentése"
 
-#: src/compose.c:6317
+#: src/compose.c:6320
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Az üzenet megváltozott. Menti a Vázlatok mappába?"
 
-#: src/compose.c:6319
+#: src/compose.c:6322
 msgid "Close _without saving"
 msgstr "Bezárás mentés _nélkül"
 
-#: src/compose.c:6361
+#: src/compose.c:6364
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Tényleg alkalmazni szeretné a(z) `%s' sablont?"
 
-#: src/compose.c:6363
+#: src/compose.c:6366
 msgid "Apply template"
 msgstr "Sablon alkalmazása"
 
-#: src/compose.c:6364
+#: src/compose.c:6367
 msgid "_Replace"
 msgstr "_Helyettesít"
 
-#: src/compose.c:6364
+#: src/compose.c:6367
 msgid "_Insert"
 msgstr "_Beszúrás"
 
@@ -2285,12 +2285,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:868 src/mainwindow.c:3748 src/setup.c:80
+#: src/folderview.c:868 src/mainwindow.c:3757 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "%s%c%s mappa átvizsgálása..."
 
-#: src/folderview.c:872 src/mainwindow.c:3753 src/setup.c:85
+#: src/folderview.c:872 src/mainwindow.c:3762 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "%s mappa átvizsgálása..."
@@ -3050,535 +3050,540 @@ msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/_Nézet/_Megjelenít vagy elrejt/_Eszközsáv/Ikon és Szöveg"
 
 #: src/mainwindow.c:566
-msgid "/_View/Show or hi_de/_Toolbar/_Icon"
+#, fuzzy
+msgid "/_View/Show or hi_de/_Toolbar/Text at the _right of icon"
 msgstr "/_Nézet/_Megjelenít vagy elrejt/_Eszközsáv/_Ikon"
 
 #: src/mainwindow.c:568
+msgid "/_View/Show or hi_de/_Toolbar/_Icon"
+msgstr "/_Nézet/_Megjelenít vagy elrejt/_Eszközsáv/_Ikon"
+
+#: src/mainwindow.c:570
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/_Nézet/_Megjelenít vagy elrejt/_Eszközsáv/_Szöveg"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:572
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/_Nézet/_Megjelenít vagy elrejt/_Eszközsáv/Se_mmi"
 
-#: src/mainwindow.c:572
+#: src/mainwindow.c:574
 msgid "/_View/Show or hi_de/_Search bar"
 msgstr "/_Nézet/_Megjelenít vagy elrejt/_Keresősor"
 
-#: src/mainwindow.c:574
+#: src/mainwindow.c:576
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/_Nézet/_Megjelenít vagy elrejt/Á_llapotsor"
 
-#: src/mainwindow.c:576
+#: src/mainwindow.c:578
 #, fuzzy
 msgid "/_View/_Customize toolbar..."
 msgstr "/_Nézet/_Ugrás/_Másik _mappához"
 
-#: src/mainwindow.c:578
+#: src/mainwindow.c:580
 msgid "/_View/Separate f_older tree"
 msgstr "/_Nézet/_Külön mappafa"
 
-#: src/mainwindow.c:579
+#: src/mainwindow.c:581
 msgid "/_View/Separate _message view"
 msgstr "/_Nézet/Külön üz_enetnézet"
 
-#: src/mainwindow.c:581
+#: src/mainwindow.c:583
 msgid "/_View/_Sort"
 msgstr "/_Nézet/_Rendezés"
 
-#: src/mainwindow.c:582
+#: src/mainwindow.c:584
 msgid "/_View/_Sort/by _number"
 msgstr "/_Nézet/_Rendezés/_Szám szerint"
 
-#: src/mainwindow.c:583
+#: src/mainwindow.c:585
 msgid "/_View/_Sort/by s_ize"
 msgstr "/_Nézet/_Rendezés/_Méret szerint"
 
-#: src/mainwindow.c:584
+#: src/mainwindow.c:586
 msgid "/_View/_Sort/by _date"
 msgstr "/_Nézet/_Rendezés/_Dátum szerint"
 
-#: src/mainwindow.c:585
+#: src/mainwindow.c:587
 msgid "/_View/_Sort/by t_hread date"
 msgstr "/_Nézet/_Rendezés/_Szál dátuma szerint"
 
-#: src/mainwindow.c:586
+#: src/mainwindow.c:588
 msgid "/_View/_Sort/by _from"
 msgstr "/_Nézet/_Rendezés/_Feladó szerint"
 
-#: src/mainwindow.c:587
+#: src/mainwindow.c:589
 msgid "/_View/_Sort/by _recipient"
 msgstr "/_Nézet/_Rendezés/_Címzett szerint"
 
-#: src/mainwindow.c:588
+#: src/mainwindow.c:590
 msgid "/_View/_Sort/by _subject"
 msgstr "/_Nézet/_Rendezés/_Tárgy szerint"
 
-#: src/mainwindow.c:589
+#: src/mainwindow.c:591
 msgid "/_View/_Sort/by _color label"
 msgstr "/_Nézet/_Rendezés/S_zínes címke szerint"
 
-#: src/mainwindow.c:591
+#: src/mainwindow.c:593
 msgid "/_View/_Sort/by _mark"
 msgstr "/_Nézet/_Rendezés/_Jelölés szerint"
 
-#: src/mainwindow.c:592
+#: src/mainwindow.c:594
 msgid "/_View/_Sort/by _unread"
 msgstr "/_Nézet/_Rendezés/_Olvasatlan szerint"
 
-#: src/mainwindow.c:593
+#: src/mainwindow.c:595
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/_Nézet/_Rendezés/Cs_atolás szerint"
 
-#: src/mainwindow.c:595
+#: src/mainwindow.c:597
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/_Nézet/_Rendezés/Nem _rendez"
 
-#: src/mainwindow.c:596 src/mainwindow.c:599
+#: src/mainwindow.c:598 src/mainwindow.c:601
 msgid "/_View/_Sort/---"
 msgstr "/_Nézet/_Rendez/---"
 
-#: src/mainwindow.c:597
+#: src/mainwindow.c:599
 msgid "/_View/_Sort/Ascending"
 msgstr "/_Nézet/_Rendezés/_Növekvő"
 
-#: src/mainwindow.c:598
+#: src/mainwindow.c:600
 msgid "/_View/_Sort/Descending"
 msgstr "/_Nézet/_Rendezés/_Csökkenő"
 
-#: src/mainwindow.c:600
+#: src/mainwindow.c:602
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/_Nézet/_Rendezés/_Tárgyhoz vonz"
 
-#: src/mainwindow.c:602
+#: src/mainwindow.c:604
 msgid "/_View/Th_read view"
 msgstr "/_Nézet/Ü_zenetfolyam nézet"
 
-#: src/mainwindow.c:603
+#: src/mainwindow.c:605
 msgid "/_View/E_xpand all threads"
 msgstr "/_Nézet/_Minden üzenetfolyam kifejtése"
 
-#: src/mainwindow.c:604
+#: src/mainwindow.c:606
 msgid "/_View/Co_llapse all threads"
 msgstr "/_Nézet/_Minden üzenetfolyam bezárása"
 
-#: src/mainwindow.c:605
+#: src/mainwindow.c:607
 msgid "/_View/Set display _item..."
 msgstr "/_Nézet/K_ijelzett cikk beállítás..."
 
-#: src/mainwindow.c:608
+#: src/mainwindow.c:610
 msgid "/_View/_Go to"
 msgstr "/_Nézet/_Ugrás"
 
-#: src/mainwindow.c:609
+#: src/mainwindow.c:611
 msgid "/_View/_Go to/_Prev message"
 msgstr "/_Nézet/_Ugrás/_Előző üzenethez"
 
-#: src/mainwindow.c:610
+#: src/mainwindow.c:612
 msgid "/_View/_Go to/_Next message"
 msgstr "/_Nézet/_Ugrás/_Következő üzenethez"
 
-#: src/mainwindow.c:611 src/mainwindow.c:616 src/mainwindow.c:619
-#: src/mainwindow.c:624 src/mainwindow.c:629
+#: src/mainwindow.c:613 src/mainwindow.c:618 src/mainwindow.c:621
+#: src/mainwindow.c:626 src/mainwindow.c:631
 msgid "/_View/_Go to/---"
 msgstr "/_Nézet/_Ugrás/---"
 
-#: src/mainwindow.c:612
+#: src/mainwindow.c:614
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/_Nézet/_Ugrás/_Előző olvasatlan üzenethez"
 
-#: src/mainwindow.c:614
+#: src/mainwindow.c:616
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/_Nézet/_Ugrás/_Következő olvasatlan üzenethez"
 
-#: src/mainwindow.c:617
+#: src/mainwindow.c:619
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/_Nézet/_Ugrás/_Előző új üzenethez"
 
-#: src/mainwindow.c:618
+#: src/mainwindow.c:620
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/_Nézet/_Ugrás/_Következő új üzenethez"
 
-#: src/mainwindow.c:620
+#: src/mainwindow.c:622
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/_Nézet/_Ugrás/_Előző megjelölt üzenethez"
 
-#: src/mainwindow.c:622
+#: src/mainwindow.c:624
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/_Nézet/_Ugrás/_Következő megjelölt üzenethez"
 
-#: src/mainwindow.c:625
+#: src/mainwindow.c:627
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/_Nézet/_Ugrás/_Előző címkézett üzenethez"
 
-#: src/mainwindow.c:627
+#: src/mainwindow.c:629
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/_Nézet/_Ugrás/_Következő címkézett üzenethez"
 
-#: src/mainwindow.c:630
+#: src/mainwindow.c:632
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Nézet/_Ugrás/_Másik _mappához"
 
-#: src/mainwindow.c:639 src/messageview.c:174
+#: src/mainwindow.c:641 src/messageview.c:174
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Nézet/_Karakterkódolás/_Automatikus felismerés"
 
-#: src/mainwindow.c:652 src/messageview.c:187
+#: src/mainwindow.c:654 src/messageview.c:187
 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr "/_Nézet/_Karakterkódolás/Nyugat-Európai (Windows-1252)"
 
-#: src/mainwindow.c:700 src/messageview.c:227
+#: src/mainwindow.c:702 src/messageview.c:227
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Nézet/_Karakterkódolás/Japán (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:702 src/messageview.c:229
+#: src/mainwindow.c:704 src/messageview.c:229
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Nézet/_Karakterkódolás/Japán (_EUC-JP)"
 
-#: src/mainwindow.c:704 src/messageview.c:231
+#: src/mainwindow.c:706 src/messageview.c:231
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Nézet/_Karakterkódolás/Japán (_Shift__JIS)"
 
-#: src/mainwindow.c:714 src/messageview.c:240
+#: src/mainwindow.c:716 src/messageview.c:240
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Nézet/_Karakterkódolás/Tradicionális Kínai (EUC-_TW)"
 
-#: src/mainwindow.c:716 src/messageview.c:242
+#: src/mainwindow.c:718 src/messageview.c:242
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Nézet/_Karakterkódolás/Kínai (ISO-2022-_CN)"
 
-#: src/mainwindow.c:722 src/messageview.c:247
+#: src/mainwindow.c:724 src/messageview.c:247
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Nézet/_Karakterkódolás/Koreai (ISO-2022-KR)"
 
-#: src/mainwindow.c:735 src/summaryview.c:464
+#: src/mainwindow.c:737 src/summaryview.c:464
 msgid "/_View/Open in new _window"
 msgstr "/_Nézet/Me_gnyitás új ablakban"
 
-#: src/mainwindow.c:736 src/messageview.c:259 src/summaryview.c:466
+#: src/mainwindow.c:738 src/messageview.c:259 src/summaryview.c:466
 msgid "/_View/Mess_age source"
 msgstr "/_Nézet/Ü_zenet forrása"
 
-#: src/mainwindow.c:737 src/messageview.c:260 src/summaryview.c:467
+#: src/mainwindow.c:739 src/messageview.c:260 src/summaryview.c:467
 msgid "/_View/All _headers"
 msgstr "/_Nézet/_Összes fejléc"
 
-#: src/mainwindow.c:739
+#: src/mainwindow.c:741
 msgid "/_View/_Update summary"
 msgstr "/_Nézet/Ö_sszegzés frissítése"
 
-#: src/mainwindow.c:741 src/messageview.c:263
+#: src/mainwindow.c:743 src/messageview.c:263
 msgid "/_Message"
 msgstr "/_Üzenet"
 
-#: src/mainwindow.c:742
+#: src/mainwindow.c:744
 msgid "/_Message/Recei_ve"
 msgstr "/_Üzenet/Fog_adás"
 
-#: src/mainwindow.c:743
+#: src/mainwindow.c:745
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/_Üzenet/Fog_adás/_Aktuális hozzáférésről"
 
-#: src/mainwindow.c:745
+#: src/mainwindow.c:747
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/_Üzenet/Fog_adás/_Minden hozzáférésről"
 
-#: src/mainwindow.c:747
+#: src/mainwindow.c:749
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/_Üzenet/Fo_gadás/Fogadás me_gszakítása"
 
-#: src/mainwindow.c:749
+#: src/mainwindow.c:751
 msgid "/_Message/Recei_ve/---"
 msgstr "/_Üzenet/Fog_adás/---"
 
-#: src/mainwindow.c:750
+#: src/mainwindow.c:752
 msgid "/_Message/_Send queued messages"
 msgstr "/_Üzenet/Ü_zenetek küldése a Várakozó sorból"
 
-#: src/mainwindow.c:751 src/mainwindow.c:753 src/mainwindow.c:760
-#: src/mainwindow.c:765 src/mainwindow.c:768 src/mainwindow.c:779
-#: src/mainwindow.c:781 src/mainwindow.c:784 src/messageview.c:266
+#: src/mainwindow.c:753 src/mainwindow.c:755 src/mainwindow.c:762
+#: src/mainwindow.c:767 src/mainwindow.c:770 src/mainwindow.c:781
+#: src/mainwindow.c:783 src/mainwindow.c:786 src/messageview.c:266
 #: src/messageview.c:274 src/messageview.c:279
 msgid "/_Message/---"
 msgstr "/_Üzenet/---"
 
-#: src/mainwindow.c:752 src/messageview.c:264
+#: src/mainwindow.c:754 src/messageview.c:264
 msgid "/_Message/Compose _new message"
 msgstr "/_Üzenet/_Új üzenet szerkesztése"
 
-#: src/mainwindow.c:754 src/messageview.c:267
+#: src/mainwindow.c:756 src/messageview.c:267
 msgid "/_Message/_Reply"
 msgstr "/_Üzenet/Vá_lasz"
 
-#: src/mainwindow.c:755
+#: src/mainwindow.c:757
 msgid "/_Message/Repl_y to"
 msgstr "/_Üzenet/_Válasz másnak"
 
-#: src/mainwindow.c:756 src/messageview.c:268
+#: src/mainwindow.c:758 src/messageview.c:268
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Üzenet/Válasz _másnak/_Mindenkinek"
 
-#: src/mainwindow.c:757 src/messageview.c:270
+#: src/mainwindow.c:759 src/messageview.c:270
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Üzenet/Válasz _másnak/A _küldőnek"
 
-#: src/mainwindow.c:758 src/messageview.c:272
+#: src/mainwindow.c:760 src/messageview.c:272
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Üzenet/Válasz _másnak/_Levelező listának"
 
-#: src/mainwindow.c:761 src/messageview.c:275
+#: src/mainwindow.c:763 src/messageview.c:275
 msgid "/_Message/_Forward"
 msgstr "/_Üzenet/_Továbbítás"
 
-#: src/mainwindow.c:762 src/messageview.c:276
+#: src/mainwindow.c:764 src/messageview.c:276
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Üzenet/Továbbítás _csatolásként"
 
-#: src/mainwindow.c:764 src/messageview.c:278
+#: src/mainwindow.c:766 src/messageview.c:278
 msgid "/_Message/Redirec_t"
 msgstr "/_Üzenet/Á_tirányít"
 
-#: src/mainwindow.c:766
+#: src/mainwindow.c:768
 msgid "/_Message/M_ove..."
 msgstr "/_Üzenet/M_ozgatás..."
 
-#: src/mainwindow.c:767
+#: src/mainwindow.c:769
 msgid "/_Message/_Copy..."
 msgstr "/_Üzenet/_Másolás..."
 
-#: src/mainwindow.c:769
+#: src/mainwindow.c:771
 msgid "/_Message/_Mark"
 msgstr "/_Üzenet/_Megjelöl"
 
-#: src/mainwindow.c:770
+#: src/mainwindow.c:772
 msgid "/_Message/_Mark/_Mark"
 msgstr "/_Üzenet/_Megjelöl/_Megjelöl"
 
-#: src/mainwindow.c:771
+#: src/mainwindow.c:773
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/_Üzenet/_Megjelöl/Megjelölés visszavonása"
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:774
 msgid "/_Message/_Mark/---"
 msgstr "/_Üzenet/_Megjelöl/---"
 
-#: src/mainwindow.c:773
+#: src/mainwindow.c:775
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/_Üzenet/_Megjelöl/Mint olvasatla_n"
 
-#: src/mainwindow.c:774
+#: src/mainwindow.c:776
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/_Üzenet/_Megjelöl/Mint olvaso_tt"
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:778
 msgid "/_Message/_Mark/Mark _thread as read"
 msgstr "/_Üzenet/_Megjelöl/Mint olvasott _szál"
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:780
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/_Üzenet/_Megjelöl/_Minden olvasottat"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:782
 msgid "/_Message/_Delete"
 msgstr "/_Üzenet/_Törlés"
 
-#: src/mainwindow.c:782
+#: src/mainwindow.c:784
 msgid "/_Message/Set as _junk mail"
 msgstr "/_Üzenet/_Levélszemétként beállítás"
 
-#: src/mainwindow.c:783
+#: src/mainwindow.c:785
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/_Üzenet/_Nem levélszemétként beállítás"
 
-#: src/mainwindow.c:785 src/messageview.c:280
+#: src/mainwindow.c:787 src/messageview.c:280
 msgid "/_Message/Re-_edit"
 msgstr "/_Üzenet/_Szerkesztés újra"
 
-#: src/mainwindow.c:789
+#: src/mainwindow.c:791
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/_Eszközök/Küldő hozzáadása a cím_jegyzékhez..."
 
-#: src/mainwindow.c:792
+#: src/mainwindow.c:794
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/_Eszközök/Összes üzenet szűrése a mappában"
 
-#: src/mainwindow.c:794
+#: src/mainwindow.c:796
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Eszközök/Kivá_lasztott üzenetek szűrése"
 
-#: src/mainwindow.c:796 src/messageview.c:287
+#: src/mainwindow.c:798 src/messageview.c:287
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Eszközök/_Szűrési szabályok"
 
-#: src/mainwindow.c:797 src/messageview.c:289
+#: src/mainwindow.c:799 src/messageview.c:289
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Eszközök/_Szűrési szabályok/_Automatikusan"
 
-#: src/mainwindow.c:799 src/messageview.c:291
+#: src/mainwindow.c:801 src/messageview.c:291
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Eszközök/_Szűrési szabályok/_Feladó alapján"
 
-#: src/mainwindow.c:801 src/messageview.c:293
+#: src/mainwindow.c:803 src/messageview.c:293
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Eszközök/_Szűrési szabályok/_Címzett alapján"
 
-#: src/mainwindow.c:803 src/messageview.c:295
+#: src/mainwindow.c:805 src/messageview.c:295
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Eszközök/_Szűrési szabályok/_Tárgy alapján"
 
-#: src/mainwindow.c:806
+#: src/mainwindow.c:808
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/_Eszközök/Levélszemét szűrése a mappában"
 
-#: src/mainwindow.c:808
+#: src/mainwindow.c:810
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/_Eszközök/Kiválasztott üzenetek levélsze_mét szűrése"
 
-#: src/mainwindow.c:815
+#: src/mainwindow.c:817
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/_Eszközök/_Duplikált levelek törlése"
 
-#: src/mainwindow.c:818
+#: src/mainwindow.c:820
 #, fuzzy
 msgid "/_Tools/E_xecute marked process"
 msgstr "Megjelölt processz futtatása"
 
-#: src/mainwindow.c:820
+#: src/mainwindow.c:822
 msgid "/_Tools/_Log window"
 msgstr "/_Eszközök/_Napló ablak"
 
-#: src/mainwindow.c:822
+#: src/mainwindow.c:824
 msgid "/_Configuration"
 msgstr "/_Beállítások"
 
-#: src/mainwindow.c:823
+#: src/mainwindow.c:825
 msgid "/_Configuration/_Common preferences..."
 msgstr "/_Beállítások/Általános _beállítások..."
 
-#: src/mainwindow.c:825
+#: src/mainwindow.c:827
 msgid "/_Configuration/_Filter setting..."
 msgstr "/_Beállítások/_Szűrő beállítások..."
 
-#: src/mainwindow.c:827
+#: src/mainwindow.c:829
 msgid "/_Configuration/_Template..."
 msgstr "/_Beállítások/_Sablon..."
 
-#: src/mainwindow.c:829
+#: src/mainwindow.c:831
 msgid "/_Configuration/_Actions..."
 msgstr "/_Beállítások/Mű_veletek..."
 
-#: src/mainwindow.c:831
+#: src/mainwindow.c:833
 msgid "/_Configuration/---"
 msgstr "/_Beállítások/---"
 
-#: src/mainwindow.c:832
+#: src/mainwindow.c:834
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Beállítások/Aktuális _hozzáférés beállításai..."
 
-#: src/mainwindow.c:834
+#: src/mainwindow.c:836
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Beállítások/_Új hozzáférés létrehozása..."
 
-#: src/mainwindow.c:836
+#: src/mainwindow.c:838
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Beállítások/Hozzáférés _szerkesztése..."
 
-#: src/mainwindow.c:838
+#: src/mainwindow.c:840
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Beállítások/_Aktuális hozzáférés váltása..."
 
-#: src/mainwindow.c:842
+#: src/mainwindow.c:844
 msgid "/_Help/_Manual"
 msgstr "/Sú_gó/_Kézikönyv"
 
-#: src/mainwindow.c:843
+#: src/mainwindow.c:845
 msgid "/_Help/_Manual/_English"
 msgstr "/Sú_gó/Kézikönyv/_Angol"
 
-#: src/mainwindow.c:844
+#: src/mainwindow.c:846
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/Sú_gó/Kézikönyv/_Japán"
 
-#: src/mainwindow.c:845
+#: src/mainwindow.c:847
 msgid "/_Help/_FAQ"
 msgstr "/Sú_gó/_GYIK"
 
-#: src/mainwindow.c:846
+#: src/mainwindow.c:848
 msgid "/_Help/_FAQ/_English"
 msgstr "/Sú_gó/_GYIK/_Angol"
 
-#: src/mainwindow.c:847
+#: src/mainwindow.c:849
 msgid "/_Help/_FAQ/_German"
 msgstr "/Sú_gó/_GYIK/_Német"
 
-#: src/mainwindow.c:848
+#: src/mainwindow.c:850
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/Sú_gó/_GYIK/_Spanyol"
 
-#: src/mainwindow.c:849
+#: src/mainwindow.c:851
 msgid "/_Help/_FAQ/_French"
 msgstr "/Sú_gó/_GYIK/_Francia"
 
-#: src/mainwindow.c:850
+#: src/mainwindow.c:852
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/Sú_gó/_GYIK/_Olasz"
 
-#: src/mainwindow.c:851
+#: src/mainwindow.c:853
 msgid "/_Help/_Command line options"
 msgstr "/Sú_gó/Para_ncssor opciói"
 
-#: src/mainwindow.c:852
+#: src/mainwindow.c:854
 msgid "/_Help/---"
 msgstr "/Sú_gó/---"
 
-#: src/mainwindow.c:895
+#: src/mainwindow.c:897
 msgid "Creating main window...\n"
 msgstr "Főablak létrehozása...\n"
 
-#: src/mainwindow.c:1071
+#: src/mainwindow.c:1073
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Főablak: %d szín foglalása nem sikerült\n"
 
-#: src/mainwindow.c:1175 src/summaryview.c:2387 src/summaryview.c:2472
+#: src/mainwindow.c:1181 src/summaryview.c:2387 src/summaryview.c:2472
 #: src/summaryview.c:4009 src/summaryview.c:4138 src/summaryview.c:4507
 msgid "done.\n"
 msgstr "kész.\n"
 
-#: src/mainwindow.c:1293 src/mainwindow.c:1334 src/mainwindow.c:1359
+#: src/mainwindow.c:1299 src/mainwindow.c:1340 src/mainwindow.c:1365
 msgid "Untitled"
 msgstr "Névtelen"
 
-#: src/mainwindow.c:1360
+#: src/mainwindow.c:1366
 msgid "none"
 msgstr "semmi"
 
-#: src/mainwindow.c:1413
+#: src/mainwindow.c:1419
 #, 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:1663
+#: src/mainwindow.c:1669
 msgid "Offline"
 msgstr "Kapcsolat nélkül"
 
-#: src/mainwindow.c:1664
+#: src/mainwindow.c:1670
 msgid "You are offline. Go online?"
 msgstr "Ön kapcsolat nélküli módban van. Kapcsolódik?"
 
-#: src/mainwindow.c:1681
+#: src/mainwindow.c:1687
 msgid "Empty all trash"
 msgstr "Kuka ürítése"
 
-#: src/mainwindow.c:1682
+#: src/mainwindow.c:1688
 msgid "Delete all messages in trash folders?"
 msgstr "Minden üzenet törlése a kukából?"
 
-#: src/mainwindow.c:1712
+#: src/mainwindow.c:1718
 msgid "Add mailbox"
 msgstr "Postaláda hozzáadása"
 
-#: src/mainwindow.c:1713
+#: src/mainwindow.c:1719
 msgid ""
 "Specify the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3588,16 +3593,16 @@ msgstr ""
 "Ha létező postaládát ad meg, akkor\n"
 "automatikusan átvizsgálom."
 
-#: src/mainwindow.c:1719 src/setup.c:49
+#: src/mainwindow.c:1725 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "A(z) `%s' postaláda már létezik."
 
-#: src/mainwindow.c:1724 src/setup.c:56
+#: src/mainwindow.c:1730 src/setup.c:56
 msgid "Mailbox"
 msgstr "Postaláda"
 
-#: src/mainwindow.c:1730 src/setup.c:62
+#: src/mainwindow.c:1736 src/setup.c:62
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3606,130 +3611,130 @@ 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:2198
+#: src/mainwindow.c:2206
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Mappa nézet"
 
-#: src/mainwindow.c:2217
+#: src/mainwindow.c:2225
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Üzenet nézet"
 
-#: src/mainwindow.c:2369 src/summaryview.c:418
+#: src/mainwindow.c:2377 src/summaryview.c:418
 msgid "/_Reply"
 msgstr "/_Válasz"
 
-#: src/mainwindow.c:2370
+#: src/mainwindow.c:2378
 msgid "/Reply to _all"
 msgstr "Válasz _mindenkinek"
 
-#: src/mainwindow.c:2371
+#: src/mainwindow.c:2379
 msgid "/Reply to _sender"
 msgstr "/Válasz a _küldőnek"
 
-#: src/mainwindow.c:2372
+#: src/mainwindow.c:2380
 msgid "/Reply to mailing _list"
 msgstr "/Válasz a _levelezőlistának"
 
-#: src/mainwindow.c:2377 src/summaryview.c:425
+#: src/mainwindow.c:2385 src/summaryview.c:425
 msgid "/_Forward"
 msgstr "/_Továbbítás"
 
-#: src/mainwindow.c:2378 src/summaryview.c:426
+#: src/mainwindow.c:2386 src/summaryview.c:426
 msgid "/For_ward as attachment"
 msgstr "/Csatoláské_nt továbbít"
 
-#: src/mainwindow.c:2379 src/summaryview.c:427
+#: src/mainwindow.c:2387 src/summaryview.c:427
 msgid "/Redirec_t"
 msgstr "/Átirányí_t"
 
-#: src/mainwindow.c:2384
+#: src/mainwindow.c:2392
 msgid "Incorporate new mail"
 msgstr "Új levelek fogadása"
 
-#: src/mainwindow.c:2386
+#: src/mainwindow.c:2394
 msgid "Incorporate new mail of all accounts"
 msgstr "Új levelek fogadása minden hozzáférésen"
 
-#: src/mainwindow.c:2388
+#: src/mainwindow.c:2396
 msgid "Send queued message(s)"
 msgstr "Várakozó sorból üzenet(ek) küldése"
 
-#: src/mainwindow.c:2390
+#: src/mainwindow.c:2398
 msgid "Compose new message"
 msgstr "Új üzenet szerkesztése"
 
-#: src/mainwindow.c:2392
+#: src/mainwindow.c:2400
 msgid "Reply to the message"
 msgstr "Válasz az üzenetre"
 
-#: src/mainwindow.c:2394
+#: src/mainwindow.c:2402
 msgid "Reply to all"
 msgstr "Válasz mindenkinek"
 
-#: src/mainwindow.c:2396
+#: src/mainwindow.c:2404
 msgid "Forward the message"
 msgstr "Üzenet továbbítása"
 
-#: src/mainwindow.c:2398
+#: src/mainwindow.c:2406
 msgid "Delete the message"
 msgstr "Üzenet törlése"
 
-#: src/mainwindow.c:2400
+#: src/mainwindow.c:2408
 msgid "Set as junk mail"
 msgstr "Levélszemétként beállítás"
 
-#: src/mainwindow.c:2402
+#: src/mainwindow.c:2410
 msgid "Execute marked process"
 msgstr "Megjelölt processz futtatása"
 
-#: src/mainwindow.c:2404
+#: src/mainwindow.c:2412
 msgid "Next unread message"
 msgstr "Következő olvasatlan üzenet"
 
-#: src/mainwindow.c:2406
+#: src/mainwindow.c:2414
 #, fuzzy
 msgid "Previous unread message"
 msgstr "Következő olvasatlan üzenet"
 
-#: src/mainwindow.c:2410
+#: src/mainwindow.c:2418
 #, fuzzy
 msgid "Print message"
 msgstr "Üzenet küldése"
 
-#: src/mainwindow.c:2412
+#: src/mainwindow.c:2420
 msgid "Common preferences"
 msgstr "Közös beállítások"
 
-#: src/mainwindow.c:2414 src/prefs_account_dialog.c:511
+#: src/mainwindow.c:2422 src/prefs_account_dialog.c:511
 msgid "Account preferences"
 msgstr "Hozzáférés beállítások"
 
-#: src/mainwindow.c:2779
+#: src/mainwindow.c:2788
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 "Ön kapcsolat nélküli módban van. Kattintson az ikonra a kapcsolódáshoz."
 
-#: src/mainwindow.c:2790
+#: src/mainwindow.c:2799
 msgid "You are online. Click the icon to go offline."
 msgstr "Ön kapcsolódva van. Kattintson az ikonra a kapcsolat nélküli módhoz."
 
-#: src/mainwindow.c:3062
+#: src/mainwindow.c:3071
 msgid "Exit"
 msgstr "Kilépés"
 
-#: src/mainwindow.c:3062
+#: src/mainwindow.c:3071
 msgid "Exit this program?"
 msgstr "Kilépés a programból?"
 
-#: src/mainwindow.c:3666
+#: src/mainwindow.c:3675
 msgid "Command line options"
 msgstr "Parancssori opciók"
 
-#: src/mainwindow.c:3679
+#: src/mainwindow.c:3688
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Használat: sylpheed [OPCIÓ]..."
 
-#: src/mainwindow.c:3687
+#: src/mainwindow.c:3696
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -3757,7 +3762,7 @@ msgstr ""
 "--help\n"
 "--version"
 
-#: src/mainwindow.c:3703
+#: src/mainwindow.c:3712
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
diff --git a/po/it.po b/po/it.po
index c7bf42a6..5d5955de 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed 2.2.9\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-01-31 16:49+0900\n"
+"POT-Creation-Date: 2007-01-31 17:29+0900\n"
 "PO-Revision-Date: 2006-10-14 11:32+0200\n"
 "Last-Translator: Danilo Bodei <dbodei@lombardiacom.it,dbodei@katamail.com>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -909,7 +909,7 @@ msgstr "/_Indirizzo/_Modifica"
 msgid "/_Address/_Delete"
 msgstr "/_indirizzo/_Elimina"
 
-#: src/addressbook.c:359 src/compose.c:673 src/mainwindow.c:787
+#: src/addressbook.c:359 src/compose.c:673 src/mainwindow.c:789
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/S_trumenti"
@@ -918,12 +918,12 @@ msgstr "/S_trumenti"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/S_trumenti/Importa file _LDIF"
 
-#: src/addressbook.c:361 src/compose.c:694 src/mainwindow.c:841
+#: src/addressbook.c:361 src/compose.c:694 src/mainwindow.c:843
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/A_iuto"
 
-#: src/addressbook.c:362 src/compose.c:695 src/mainwindow.c:853
+#: src/addressbook.c:362 src/compose.c:695 src/mainwindow.c:855
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/A_iuto/I_nformazioni"
@@ -965,7 +965,7 @@ msgstr "/Eli_mina"
 msgid "E-Mail address"
 msgstr "Indirizzo e-mail"
 
-#: src/addressbook.c:496 src/compose.c:4873 src/mainwindow.c:2408
+#: src/addressbook.c:496 src/compose.c:4873 src/mainwindow.c:2416
 #: src/prefs_common_dialog.c:2274
 msgid "Address book"
 msgstr "Rubrica"
@@ -1185,7 +1185,7 @@ msgstr "Indirizzo comune"
 msgid "Personal address"
 msgstr "Indirizzo personale"
 
-#: src/alertpanel.c:142 src/compose.c:5717 src/main.c:638
+#: src/alertpanel.c:142 src/compose.c:5720 src/main.c:638
 msgid "Notice"
 msgstr "Avviso"
 
@@ -1352,9 +1352,9 @@ msgid "/_View/_Reply to"
 msgstr "/_Visualizza/_Rispondi a"
 
 #: src/compose.c:578 src/compose.c:580 src/compose.c:582 src/compose.c:584
-#: src/compose.c:587 src/mainwindow.c:577 src/mainwindow.c:580
-#: src/mainwindow.c:607 src/mainwindow.c:631 src/mainwindow.c:734
-#: src/mainwindow.c:738 src/messageview.c:258
+#: src/compose.c:587 src/mainwindow.c:579 src/mainwindow.c:582
+#: src/mainwindow.c:609 src/mainwindow.c:633 src/mainwindow.c:736
+#: src/mainwindow.c:740 src/messageview.c:258
 msgid "/_View/---"
 msgstr "/_Visualizza/---"
 
@@ -1375,7 +1375,7 @@ msgstr "/_Visualizza/Alle_gato"
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/_Visualizza/V_ai a/Cartella di_fferente..."
 
-#: src/compose.c:593 src/mainwindow.c:638 src/messageview.c:173
+#: src/compose.c:593 src/mainwindow.c:640 src/messageview.c:173
 msgid "/_View/Character _encoding"
 msgstr "/_Visualizza/Co_difica caratteri"
 
@@ -1386,112 +1386,112 @@ msgstr "/_Visualizza/Co_difica caratteri/_Automatica"
 #: src/compose.c:596 src/compose.c:602 src/compose.c:608 src/compose.c:612
 #: src/compose.c:620 src/compose.c:624 src/compose.c:630 src/compose.c:636
 #: src/compose.c:640 src/compose.c:650 src/compose.c:654 src/compose.c:662
-#: src/compose.c:666 src/mainwindow.c:634 src/mainwindow.c:641
+#: src/compose.c:666 src/mainwindow.c:636 src/mainwindow.c:643
 #: src/messageview.c:169
 msgid "/_View/Character _encoding/---"
 msgstr "/_Visualizza/Co_difica·caratteri/---"
 
-#: src/compose.c:598 src/mainwindow.c:642 src/messageview.c:177
+#: src/compose.c:598 src/mainwindow.c:644 src/messageview.c:177
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Visualizza/Co_difica·caratteri/ASCII a 7 bit (US-ASC_II)"
 
-#: src/compose.c:600 src/mainwindow.c:644 src/messageview.c:180
+#: src/compose.c:600 src/mainwindow.c:646 src/messageview.c:180
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Visualizza/Co_difica caratteri/Unicode (_UTF-8)"
 
-#: src/compose.c:604 src/mainwindow.c:648 src/messageview.c:183
+#: src/compose.c:604 src/mainwindow.c:650 src/messageview.c:183
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Visualizza/Co_difica caratteri/Europa Occidentale (ISO-8859-_1)"
 
-#: src/compose.c:606 src/mainwindow.c:650 src/messageview.c:185
+#: src/compose.c:606 src/mainwindow.c:652 src/messageview.c:185
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Visualizza/Co_difica caratteri/Europa Occidentale (IS_O-8859-15)"
 
-#: src/compose.c:610 src/mainwindow.c:656 src/messageview.c:190
+#: src/compose.c:610 src/mainwindow.c:658 src/messageview.c:190
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Visualizza/Co_difica caratteri/Europa Centrale (ISO-8859-_2)"
 
-#: src/compose.c:614 src/mainwindow.c:660 src/messageview.c:193
+#: src/compose.c:614 src/mainwindow.c:662 src/messageview.c:193
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Visualizza/Co_difica caratteri/Baltico (I_SO-8859-13)"
 
-#: src/compose.c:616 src/mainwindow.c:662 src/messageview.c:195
+#: src/compose.c:616 src/mainwindow.c:664 src/messageview.c:195
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Visualizza/Co_difica caratteri/Baltico (ISO-8859-_4)"
 
-#: src/compose.c:618 src/mainwindow.c:664 src/messageview.c:197
+#: src/compose.c:618 src/mainwindow.c:666 src/messageview.c:197
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/_Visualizza/Co_difica caratteri/Baltico (Windows-1257)"
 
-#: src/compose.c:622 src/mainwindow.c:668 src/messageview.c:200
+#: src/compose.c:622 src/mainwindow.c:670 src/messageview.c:200
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Visualizza/Co_difica caratteri/Greco (ISO-8859-_7)"
 
-#: src/compose.c:626 src/mainwindow.c:672 src/messageview.c:203
+#: src/compose.c:626 src/mainwindow.c:674 src/messageview.c:203
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/_Visualizza/Co_difica caratteri/Arabo (ISO-8859-_6)"
 
-#: src/compose.c:628 src/mainwindow.c:674 src/messageview.c:205
+#: src/compose.c:628 src/mainwindow.c:676 src/messageview.c:205
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/_Visualizza/Co_difica caratteri/Arabo (_Windows-1256)"
 
-#: src/compose.c:632 src/mainwindow.c:678 src/messageview.c:208
+#: src/compose.c:632 src/mainwindow.c:680 src/messageview.c:208
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Visualizza/Co_difica caratteri/Ebreo (ISO-8859-_8)"
 
-#: src/compose.c:634 src/mainwindow.c:680 src/messageview.c:210
+#: src/compose.c:634 src/mainwindow.c:682 src/messageview.c:210
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Visualizza/Co_difica caratteri/Ebreo (Windows-1255)"
 
-#: src/compose.c:638 src/mainwindow.c:684 src/messageview.c:213
+#: src/compose.c:638 src/mainwindow.c:686 src/messageview.c:213
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Visualizza/Co_difica caratteri/Turco (ISO-8859-_9)"
 
-#: src/compose.c:642 src/mainwindow.c:688 src/messageview.c:216
+#: src/compose.c:642 src/mainwindow.c:690 src/messageview.c:216
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Visualizza/Co_difica caratteri/Cirillico (ISO-8859-_5)"
 
-#: src/compose.c:644 src/mainwindow.c:690 src/messageview.c:218
+#: src/compose.c:644 src/mainwindow.c:692 src/messageview.c:218
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Visualizza/Co_difica caratteri/Cirillico (KOI8-_R)"
 
-#: src/compose.c:646 src/mainwindow.c:692 src/messageview.c:220
+#: src/compose.c:646 src/mainwindow.c:694 src/messageview.c:220
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Visualizza/Co_difica caratteri/Ciri_llico (KOI8-U)"
 
-#: src/compose.c:648 src/mainwindow.c:694 src/messageview.c:222
+#: src/compose.c:648 src/mainwindow.c:696 src/messageview.c:222
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Visualizza/Co_difica caratteri/Cirillico (_Windows-1251)"
 
-#: src/compose.c:652 src/mainwindow.c:698 src/messageview.c:225
+#: src/compose.c:652 src/mainwindow.c:700 src/messageview.c:225
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Visualizza/Co_difica caratteri/Giapponese (ISO-2022-_JP)"
 
-#: src/compose.c:656 src/mainwindow.c:708 src/messageview.c:234
+#: src/compose.c:656 src/mainwindow.c:710 src/messageview.c:234
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Visualizza/Co_difica caratteri/Cinese semplificato (_GB2312)"
 
-#: src/compose.c:658 src/mainwindow.c:710 src/messageview.c:236
+#: src/compose.c:658 src/mainwindow.c:712 src/messageview.c:236
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Visualizza/Co_difica caratteri/Cinese semplificato (GBK)"
 
-#: src/compose.c:660 src/mainwindow.c:712 src/messageview.c:238
+#: src/compose.c:660 src/mainwindow.c:714 src/messageview.c:238
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Visualizza/Co_difica caratteri/Cinese tradizionale (_Big5)"
 
-#: src/compose.c:664 src/mainwindow.c:720 src/messageview.c:245
+#: src/compose.c:664 src/mainwindow.c:722 src/messageview.c:245
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Visualizza/Co_difica caratteri/Coreano (EUC-_KR)"
 
-#: src/compose.c:668 src/mainwindow.c:726 src/messageview.c:250
+#: src/compose.c:668 src/mainwindow.c:728 src/messageview.c:250
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Visualizza/Co_difica caratteri/Tailandese (TIS-_620)"
 
-#: src/compose.c:670 src/mainwindow.c:728 src/messageview.c:252
+#: src/compose.c:670 src/mainwindow.c:730 src/messageview.c:252
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Visualizza/Co_difica caratteri/Tailan_dese (Windows-874)"
 
-#: src/compose.c:674 src/mainwindow.c:788 src/messageview.c:283
+#: src/compose.c:674 src/mainwindow.c:790 src/messageview.c:283
 msgid "/_Tools/_Address book"
 msgstr "/S_trumenti/_Rubrica"
 
@@ -1499,13 +1499,13 @@ msgstr "/S_trumenti/_Rubrica"
 msgid "/_Tools/_Template"
 msgstr "/S_trumenti/_Modello"
 
-#: src/compose.c:677 src/mainwindow.c:812 src/messageview.c:299
+#: src/compose.c:677 src/mainwindow.c:814 src/messageview.c:299
 msgid "/_Tools/Actio_ns"
 msgstr "/S_trumenti/A_zioni"
 
-#: src/compose.c:679 src/compose.c:683 src/compose.c:689 src/mainwindow.c:791
-#: src/mainwindow.c:805 src/mainwindow.c:810 src/mainwindow.c:813
-#: src/mainwindow.c:817 src/mainwindow.c:819 src/messageview.c:286
+#: src/compose.c:679 src/compose.c:683 src/compose.c:689 src/mainwindow.c:793
+#: src/mainwindow.c:807 src/mainwindow.c:812 src/mainwindow.c:815
+#: src/mainwindow.c:819 src/mainwindow.c:821 src/messageview.c:286
 #: src/messageview.c:298
 msgid "/_Tools/---"
 msgstr "/S_trumenti/---"
@@ -1715,7 +1715,7 @@ msgstr "Firma PGP"
 msgid "PGP Encrypt"
 msgstr "Cifratura PGP"
 
-#: src/compose.c:4442 src/compose.c:5543
+#: src/compose.c:4442 src/compose.c:5546
 msgid "MIME type"
 msgstr "Tipo MIME"
 
@@ -1757,36 +1757,36 @@ msgstr "Modifica con l'editor esterno"
 msgid "Wrap all long lines"
 msgstr "Manda a capo tutte le righe lunghe"
 
-#: src/compose.c:5439
+#: src/compose.c:5442
 msgid "Invalid MIME type."
 msgstr "Tipo MIME non valido."
 
-#: src/compose.c:5457
+#: src/compose.c:5460
 msgid "File doesn't exist or is empty."
 msgstr "Il file non esiste o è vuoto."
 
-#: src/compose.c:5525
+#: src/compose.c:5528
 msgid "Properties"
 msgstr "Proprietà"
 
-#: src/compose.c:5545 src/prefs_common_dialog.c:1504
+#: src/compose.c:5548 src/prefs_common_dialog.c:1504
 msgid "Encoding"
 msgstr "Codifica"
 
-#: src/compose.c:5568 src/prefs_folder_item.c:202
+#: src/compose.c:5571 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Percorso"
 
-#: src/compose.c:5569
+#: src/compose.c:5572
 msgid "File name"
 msgstr "Nome del file"
 
-#: src/compose.c:5659
+#: src/compose.c:5662
 #, 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:5714
+#: src/compose.c:5717
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1795,48 +1795,48 @@ msgstr ""
 "L'editor esterno è ancora attivo.\n"
 "Forzare la conclusione del processo (pid:%d)?\n"
 
-#: src/compose.c:6040 src/mainwindow.c:2752
+#: src/compose.c:6043 src/mainwindow.c:2761
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:6156 src/compose.c:6161 src/compose.c:6167
+#: src/compose.c:6159 src/compose.c:6164 src/compose.c:6170
 msgid "Can't queue the message."
 msgstr "Impossibile accodare il messaggio."
 
-#: src/compose.c:6258
+#: src/compose.c:6261
 msgid "Select files"
 msgstr "Seleziona i file"
 
-#: src/compose.c:6281
+#: src/compose.c:6284
 msgid "Select file"
 msgstr "Selezione del file"
 
-#: src/compose.c:6316
+#: src/compose.c:6319
 msgid "Save message"
 msgstr "Salva il messaggio"
 
-#: src/compose.c:6317
+#: src/compose.c:6320
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Questo messaggio è stato modificato. Salvarlo nella cartella bozze?"
 
-#: src/compose.c:6319
+#: src/compose.c:6322
 msgid "Close _without saving"
 msgstr "Chiudi sen_za salvare"
 
-#: src/compose.c:6361
+#: src/compose.c:6364
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Applicare il modello «%s» ?"
 
-#: src/compose.c:6363
+#: src/compose.c:6366
 msgid "Apply template"
 msgstr "Applica il modello"
 
-#: src/compose.c:6364
+#: src/compose.c:6367
 msgid "_Replace"
 msgstr "_Sostituisci"
 
-#: src/compose.c:6364
+#: src/compose.c:6367
 msgid "_Insert"
 msgstr "_Inserisci"
 
@@ -2293,12 +2293,12 @@ msgstr "Impostazione delle informazioni della cartella...\n"
 msgid "Setting folder info..."
 msgstr "Impostazione delle informazioni della cartella..."
 
-#: src/folderview.c:868 src/mainwindow.c:3748 src/setup.c:80
+#: src/folderview.c:868 src/mainwindow.c:3757 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Analisi della cartella %s%c%s..."
 
-#: src/folderview.c:872 src/mainwindow.c:3753 src/setup.c:85
+#: src/folderview.c:872 src/mainwindow.c:3762 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Analisi della cartella %s..."
@@ -3061,535 +3061,540 @@ msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/_Visualizza/Mostra o _nascondi/Barra degli _strumenti/Icone _e testo"
 
 #: src/mainwindow.c:566
-msgid "/_View/Show or hi_de/_Toolbar/_Icon"
+#, fuzzy
+msgid "/_View/Show or hi_de/_Toolbar/Text at the _right of icon"
 msgstr "/_Visualizza/Mostra o _nascondi/Barra degli _strumenti/I_cone"
 
 #: src/mainwindow.c:568
+msgid "/_View/Show or hi_de/_Toolbar/_Icon"
+msgstr "/_Visualizza/Mostra o _nascondi/Barra degli _strumenti/I_cone"
+
+#: src/mainwindow.c:570
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/_Visualizza/Mostra o _nascondi/Barra degli _strumenti/_Testo"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:572
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/_Visualizza/Mostra o _nascondi/Barra degli _strumenti/_Niente"
 
-#: src/mainwindow.c:572
+#: src/mainwindow.c:574
 msgid "/_View/Show or hi_de/_Search bar"
 msgstr "/_Visualizza/Mostra o _nascondi/_Barra di ricerca"
 
-#: src/mainwindow.c:574
+#: src/mainwindow.c:576
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/_Visualizza/Mostra o _nascondi/Barra di s_tato"
 
-#: src/mainwindow.c:576
+#: src/mainwindow.c:578
 #, fuzzy
 msgid "/_View/_Customize toolbar..."
 msgstr "/_Visualizza/V_ai a/Cartella di_fferente..."
 
-#: src/mainwindow.c:578
+#: src/mainwindow.c:580
 msgid "/_View/Separate f_older tree"
 msgstr "/_Visualizza/Albero _cartella separato"
 
-#: src/mainwindow.c:579
+#: src/mainwindow.c:581
 msgid "/_View/Separate _message view"
 msgstr "/_Visualizza/Vista m_essaggio separata"
 
-#: src/mainwindow.c:581
+#: src/mainwindow.c:583
 msgid "/_View/_Sort"
 msgstr "/_Visualizza/_Ordina"
 
-#: src/mainwindow.c:582
+#: src/mainwindow.c:584
 msgid "/_View/_Sort/by _number"
 msgstr "/_Visualizza/_Ordina/per n_umero"
 
-#: src/mainwindow.c:583
+#: src/mainwindow.c:585
 msgid "/_View/_Sort/by s_ize"
 msgstr "/_Visualizza/_Ordina/per dim_ensione"
 
-#: src/mainwindow.c:584
+#: src/mainwindow.c:586
 msgid "/_View/_Sort/by _date"
 msgstr "/_Visualizza/_Ordina/per _data"
 
-#: src/mainwindow.c:585
+#: src/mainwindow.c:587
 msgid "/_View/_Sort/by t_hread date"
 msgstr "/_Visualizza/_Ordina/pe_r data del thread"
 
-#: src/mainwindow.c:586
+#: src/mainwindow.c:588
 msgid "/_View/_Sort/by _from"
 msgstr "/_Visualizza/_Ordina/per _mittente"
 
-#: src/mainwindow.c:587
+#: src/mainwindow.c:589
 msgid "/_View/_Sort/by _recipient"
 msgstr "/_Visualizza/_Ordina/per dest_inatario"
 
-#: src/mainwindow.c:588
+#: src/mainwindow.c:590
 msgid "/_View/_Sort/by _subject"
 msgstr "/_Visualizza/_Ordina/per _oggetto"
 
-#: src/mainwindow.c:589
+#: src/mainwindow.c:591
 msgid "/_View/_Sort/by _color label"
 msgstr "/_Visualizza/_Ordina/per colore etic_hetta"
 
-#: src/mainwindow.c:591
+#: src/mainwindow.c:593
 msgid "/_View/_Sort/by _mark"
 msgstr "/_Visualizza/_Ordina/per _segno"
 
-#: src/mainwindow.c:592
+#: src/mainwindow.c:594
 msgid "/_View/_Sort/by _unread"
 msgstr "/_Visualizza/_Ordina/per non le_tti"
 
-#: src/mainwindow.c:593
+#: src/mainwindow.c:595
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/_Visualizza/_Ordina/per a_llegato"
 
-#: src/mainwindow.c:595
+#: src/mainwindow.c:597
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/_Visualizza/_Ordina/No_n ordinare"
 
-#: src/mainwindow.c:596 src/mainwindow.c:599
+#: src/mainwindow.c:598 src/mainwindow.c:601
 msgid "/_View/_Sort/---"
 msgstr "/_Visualizza/_Ordina/---"
 
-#: src/mainwindow.c:597
+#: src/mainwindow.c:599
 msgid "/_View/_Sort/Ascending"
 msgstr "/_Visualizza/_Ordina/_Ascendente"
 
-#: src/mainwindow.c:598
+#: src/mainwindow.c:600
 msgid "/_View/_Sort/Descending"
 msgstr "/_Visualizza/_Ordina/Dis_cendente"
 
-#: src/mainwindow.c:600
+#: src/mainwindow.c:602
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/_Visualizza/_Ordina/_Raggruppa per oggetto"
 
-#: src/mainwindow.c:602
+#: src/mainwindow.c:604
 msgid "/_View/Th_read view"
 msgstr "/_Visualizza/Vista _thread"
 
-#: src/mainwindow.c:603
+#: src/mainwindow.c:605
 msgid "/_View/E_xpand all threads"
 msgstr "/_Visualizza/E_spandi tutti i thread"
 
-#: src/mainwindow.c:604
+#: src/mainwindow.c:606
 msgid "/_View/Co_llapse all threads"
 msgstr "/_Visualizza/Nascondi tutti i t_hread"
 
-#: src/mainwindow.c:605
+#: src/mainwindow.c:607
 msgid "/_View/Set display _item..."
 msgstr "/_Visualizza/I_mposta voci da visualizzare..."
 
-#: src/mainwindow.c:608
+#: src/mainwindow.c:610
 msgid "/_View/_Go to"
 msgstr "/_Visualizza/V_ai a"
 
-#: src/mainwindow.c:609
+#: src/mainwindow.c:611
 msgid "/_View/_Go to/_Prev message"
 msgstr "/_Visualizza/V_ai a/Messaggio preced_ente"
 
-#: src/mainwindow.c:610
+#: src/mainwindow.c:612
 msgid "/_View/_Go to/_Next message"
 msgstr "/_Visualizza/V_ai a/Messaggio successi_vo"
 
-#: src/mainwindow.c:611 src/mainwindow.c:616 src/mainwindow.c:619
-#: src/mainwindow.c:624 src/mainwindow.c:629
+#: src/mainwindow.c:613 src/mainwindow.c:618 src/mainwindow.c:621
+#: src/mainwindow.c:626 src/mainwindow.c:631
 msgid "/_View/_Go to/---"
 msgstr "/_Visualizza/V_ai a/---"
 
-#: src/mainwindow.c:612
+#: src/mainwindow.c:614
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/_Visualizza/V_ai a/Messaggio non letto p_recedente"
 
-#: src/mainwindow.c:614
+#: src/mainwindow.c:616
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/_Visualizza/V_ai a/Messaggio non _letto successivo"
 
-#: src/mainwindow.c:617
+#: src/mainwindow.c:619
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/_Visualizza/V_ai a/Messaggio nuovo pre_cedente"
 
-#: src/mainwindow.c:618
+#: src/mainwindow.c:620
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/_Visualizza/V_ai a/Messaggio nu_ovo successivo"
 
-#: src/mainwindow.c:620
+#: src/mainwindow.c:622
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/_Visualizza/V_ai a/Messaggio _segnato precedente"
 
-#: src/mainwindow.c:622
+#: src/mainwindow.c:624
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/_Visualizza/V_ai a/Messaggio se_gnato successivo"
 
-#: src/mainwindow.c:625
+#: src/mainwindow.c:627
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/_Visualizza/V_ai a/Messaggio etic_hettato precedente"
 
-#: src/mainwindow.c:627
+#: src/mainwindow.c:629
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/_Visualizza/V_ai a/Messaggio e_tichettato successivo"
 
-#: src/mainwindow.c:630
+#: src/mainwindow.c:632
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Visualizza/V_ai a/Cartella di_fferente..."
 
-#: src/mainwindow.c:639 src/messageview.c:174
+#: src/mainwindow.c:641 src/messageview.c:174
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Visualizza/Co_difica caratteri/_Autorilevamento"
 
-#: src/mainwindow.c:652 src/messageview.c:187
+#: src/mainwindow.c:654 src/messageview.c:187
 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr "/_Visualizza/Co_difica caratteri/Europa Occidentale (Windows-1252)"
 
-#: src/mainwindow.c:700 src/messageview.c:227
+#: src/mainwindow.c:702 src/messageview.c:227
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Visualizza/Co_difica caratteri/Gia_pponese (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:702 src/messageview.c:229
+#: src/mainwindow.c:704 src/messageview.c:229
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Visualizza/Co_difica caratteri/Giapponese (_EUC-JP)"
 
-#: src/mainwindow.c:704 src/messageview.c:231
+#: src/mainwindow.c:706 src/messageview.c:231
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Visualizza/Co_difica caratteri/Giapponese (S_hift__JIS)"
 
-#: src/mainwindow.c:714 src/messageview.c:240
+#: src/mainwindow.c:716 src/messageview.c:240
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Visualizza/Co_difica caratteri/Cinese tradizionale (EUC-_TW)"
 
-#: src/mainwindow.c:716 src/messageview.c:242
+#: src/mainwindow.c:718 src/messageview.c:242
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Visualizza/Co_difica caratteri/Cinese (ISO-2022-_CN)"
 
-#: src/mainwindow.c:722 src/messageview.c:247
+#: src/mainwindow.c:724 src/messageview.c:247
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Visualizza/Co_difica caratteri/Corea_no (ISO-2022-KR)"
 
-#: src/mainwindow.c:735 src/summaryview.c:464
+#: src/mainwindow.c:737 src/summaryview.c:464
 msgid "/_View/Open in new _window"
 msgstr "/_Visualizza/Apri nuova _finestra"
 
-#: src/mainwindow.c:736 src/messageview.c:259 src/summaryview.c:466
+#: src/mainwindow.c:738 src/messageview.c:259 src/summaryview.c:466
 msgid "/_View/Mess_age source"
 msgstr "/_Visualizza/Sorgente messagg_io"
 
-#: src/mainwindow.c:737 src/messageview.c:260 src/summaryview.c:467
+#: src/mainwindow.c:739 src/messageview.c:260 src/summaryview.c:467
 msgid "/_View/All _headers"
 msgstr "/_Visualizza/Tutte le intesta_zioni"
 
-#: src/mainwindow.c:739
+#: src/mainwindow.c:741
 msgid "/_View/_Update summary"
 msgstr "/_Visualizza/A_ggiorna sommario"
 
-#: src/mainwindow.c:741 src/messageview.c:263
+#: src/mainwindow.c:743 src/messageview.c:263
 msgid "/_Message"
 msgstr "/M_essaggio"
 
-#: src/mainwindow.c:742
+#: src/mainwindow.c:744
 msgid "/_Message/Recei_ve"
 msgstr "/M_essaggio/Rice_vi"
 
-#: src/mainwindow.c:743
+#: src/mainwindow.c:745
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/M_essaggio/Rice_vi/Ricevi dall'a_ccount attuale"
 
-#: src/mainwindow.c:745
+#: src/mainwindow.c:747
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/M_essaggio/Rice_vi/Ricevi da _tutti gli account"
 
-#: src/mainwindow.c:747
+#: src/mainwindow.c:749
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/M_essaggio/Rice_vi/Cancella in rice_zione"
 
-#: src/mainwindow.c:749
+#: src/mainwindow.c:751
 msgid "/_Message/Recei_ve/---"
 msgstr "/M_essaggio/Rice_vi/---"
 
-#: src/mainwindow.c:750
+#: src/mainwindow.c:752
 msgid "/_Message/_Send queued messages"
 msgstr "/M_essaggio/Invia messa_ggi accodati"
 
-#: src/mainwindow.c:751 src/mainwindow.c:753 src/mainwindow.c:760
-#: src/mainwindow.c:765 src/mainwindow.c:768 src/mainwindow.c:779
-#: src/mainwindow.c:781 src/mainwindow.c:784 src/messageview.c:266
+#: src/mainwindow.c:753 src/mainwindow.c:755 src/mainwindow.c:762
+#: src/mainwindow.c:767 src/mainwindow.c:770 src/mainwindow.c:781
+#: src/mainwindow.c:783 src/mainwindow.c:786 src/messageview.c:266
 #: src/messageview.c:274 src/messageview.c:279
 msgid "/_Message/---"
 msgstr "/M_essaggio/---"
 
-#: src/mainwindow.c:752 src/messageview.c:264
+#: src/mainwindow.c:754 src/messageview.c:264
 msgid "/_Message/Compose _new message"
 msgstr "/M_essaggio/Componi _nuovo messaggio"
 
-#: src/mainwindow.c:754 src/messageview.c:267
+#: src/mainwindow.c:756 src/messageview.c:267
 msgid "/_Message/_Reply"
 msgstr "/M_essaggio/_Rispondi"
 
-#: src/mainwindow.c:755
+#: src/mainwindow.c:757
 msgid "/_Message/Repl_y to"
 msgstr "/M_essaggio/Rispondi _a"
 
-#: src/mainwindow.c:756 src/messageview.c:268
+#: src/mainwindow.c:758 src/messageview.c:268
 msgid "/_Message/Repl_y to/_all"
 msgstr "/M_essaggio/Rispondi _a/_tutti"
 
-#: src/mainwindow.c:757 src/messageview.c:270
+#: src/mainwindow.c:759 src/messageview.c:270
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/M_essaggio/Rispondi _a/_mittente"
 
-#: src/mainwindow.c:758 src/messageview.c:272
+#: src/mainwindow.c:760 src/messageview.c:272
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/M_essaggio/Rispondi _a/mailing _list"
 
-#: src/mainwindow.c:761 src/messageview.c:275
+#: src/mainwindow.c:763 src/messageview.c:275
 msgid "/_Message/_Forward"
 msgstr "/M_essaggio/_Inoltra"
 
-#: src/mainwindow.c:762 src/messageview.c:276
+#: src/mainwindow.c:764 src/messageview.c:276
 msgid "/_Message/For_ward as attachment"
 msgstr "/M_essaggio/Inoltra come a_llegato"
 
-#: src/mainwindow.c:764 src/messageview.c:278
+#: src/mainwindow.c:766 src/messageview.c:278
 msgid "/_Message/Redirec_t"
 msgstr "/M_essaggio/Rispe_disci"
 
-#: src/mainwindow.c:766
+#: src/mainwindow.c:768
 msgid "/_Message/M_ove..."
 msgstr "/M_essaggio/Sp_osta..."
 
-#: src/mainwindow.c:767
+#: src/mainwindow.c:769
 msgid "/_Message/_Copy..."
 msgstr "M_essaggio/_Copia..."
 
-#: src/mainwindow.c:769
+#: src/mainwindow.c:771
 msgid "/_Message/_Mark"
 msgstr "/M_essaggio/_Segna"
 
-#: src/mainwindow.c:770
+#: src/mainwindow.c:772
 msgid "/_Message/_Mark/_Mark"
 msgstr "/M_essaggio/_Segna/Segn_a"
 
-#: src/mainwindow.c:771
+#: src/mainwindow.c:773
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/M_essaggio/_Segna/To_gli segno"
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:774
 msgid "/_Message/_Mark/---"
 msgstr "/M_essaggio/_Segna/---"
 
-#: src/mainwindow.c:773
+#: src/mainwindow.c:775
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/M_essaggio/_Segna/Segna co_me non letto"
 
-#: src/mainwindow.c:774
+#: src/mainwindow.c:776
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/M_essaggio/_Segna/Segna come _letto"
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:778
 msgid "/_Message/_Mark/Mark _thread as read"
 msgstr "/M_essaggio/_Segna/Segna il _thread come letto"
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:780
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/M_essaggio/_Segna/Segna come tutti l_etti"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:782
 msgid "/_Message/_Delete"
 msgstr "/M_essaggio/Eli_mina"
 
-#: src/mainwindow.c:782
+#: src/mainwindow.c:784
 msgid "/_Message/Set as _junk mail"
 msgstr "/M_essaggio/Imposta come mail spa_zzatura"
 
-#: src/mainwindow.c:783
+#: src/mainwindow.c:785
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/_Messaggio/Im_posta come mail normale"
 
-#: src/mainwindow.c:785 src/messageview.c:280
+#: src/mainwindow.c:787 src/messageview.c:280
 msgid "/_Message/Re-_edit"
 msgstr "/M_essaggio/Rimodi_fica"
 
-#: src/mainwindow.c:789
+#: src/mainwindow.c:791
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/S_trumenti/Aggiungi mittente alla ru_brica..."
 
-#: src/mainwindow.c:792
+#: src/mainwindow.c:794
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/S_trumenti/_Filtra tutti i messaggi nella cartella"
 
-#: src/mainwindow.c:794
+#: src/mainwindow.c:796
 msgid "/_Tools/Filter _selected messages"
 msgstr "/S_trumenti/Filtra i messaggi _selezionati"
 
-#: src/mainwindow.c:796 src/messageview.c:287
+#: src/mainwindow.c:798 src/messageview.c:287
 msgid "/_Tools/_Create filter rule"
 msgstr "/S_trumenti/_Crea regola per il filtro"
 
-#: src/mainwindow.c:797 src/messageview.c:289
+#: src/mainwindow.c:799 src/messageview.c:289
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/S_trumenti/_Crea regola per il filtro/A_utomaticamente"
 
-#: src/mainwindow.c:799 src/messageview.c:291
+#: src/mainwindow.c:801 src/messageview.c:291
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/S_trumenti/_Crea regola per il filtro/con _Da"
 
-#: src/mainwindow.c:801 src/messageview.c:293
+#: src/mainwindow.c:803 src/messageview.c:293
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/S_trumenti/_Crea regola per il filtro/con _A"
 
-#: src/mainwindow.c:803 src/messageview.c:295
+#: src/mainwindow.c:805 src/messageview.c:295
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/S_trumenti/_Crea regola per il filtro/con l'_Oggetto"
 
-#: src/mainwindow.c:806
+#: src/mainwindow.c:808
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/S_trumenti/Filtra le mail s_pazzatura nella cartella"
 
-#: src/mainwindow.c:808
+#: src/mainwindow.c:810
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/S_trumenti/Filtra le _mail spazzatura nei messaggi selezionati"
 
-#: src/mainwindow.c:815
+#: src/mainwindow.c:817
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/S_trumenti/Elimina messaggi _duplicati"
 
-#: src/mainwindow.c:818
+#: src/mainwindow.c:820
 #, fuzzy
 msgid "/_Tools/E_xecute marked process"
 msgstr "Esegue le operazioni segnate"
 
-#: src/mainwindow.c:820
+#: src/mainwindow.c:822
 msgid "/_Tools/_Log window"
 msgstr "/S_trumenti/Finestra di _log"
 
-#: src/mainwindow.c:822
+#: src/mainwindow.c:824
 msgid "/_Configuration"
 msgstr "/_Configurazione"
 
-#: src/mainwindow.c:823
+#: src/mainwindow.c:825
 msgid "/_Configuration/_Common preferences..."
 msgstr "/_Configurazione/Preferenze _comuni..."
 
-#: src/mainwindow.c:825
+#: src/mainwindow.c:827
 msgid "/_Configuration/_Filter setting..."
 msgstr "/_Configurazione/Configurazione _filtri..."
 
-#: src/mainwindow.c:827
+#: src/mainwindow.c:829
 msgid "/_Configuration/_Template..."
 msgstr "/_Configurazione/Mo_dello..."
 
-#: src/mainwindow.c:829
+#: src/mainwindow.c:831
 msgid "/_Configuration/_Actions..."
 msgstr "/_Configurazione/_Azioni..."
 
-#: src/mainwindow.c:831
+#: src/mainwindow.c:833
 msgid "/_Configuration/---"
 msgstr "/_Configurazione/---"
 
-#: src/mainwindow.c:832
+#: src/mainwindow.c:834
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Configurazione/_Preferenze per l'account attuale..."
 
-#: src/mainwindow.c:834
+#: src/mainwindow.c:836
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Configurazione/Crea _nuovo account..."
 
-#: src/mainwindow.c:836
+#: src/mainwindow.c:838
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Configurazione/_Modifica account..."
 
-#: src/mainwindow.c:838
+#: src/mainwindow.c:840
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Configurazione/Cam_bia account attuale"
 
-#: src/mainwindow.c:842
+#: src/mainwindow.c:844
 msgid "/_Help/_Manual"
 msgstr "/A_iuto/_Manuale"
 
-#: src/mainwindow.c:843
+#: src/mainwindow.c:845
 msgid "/_Help/_Manual/_English"
 msgstr "/A_iuto/_Manuale/Ingl_ese"
 
-#: src/mainwindow.c:844
+#: src/mainwindow.c:846
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/A_iuto/_Manuale/_Giapponese"
 
-#: src/mainwindow.c:845
+#: src/mainwindow.c:847
 msgid "/_Help/_FAQ"
 msgstr "/A_iuto/_FAQ"
 
-#: src/mainwindow.c:846
+#: src/mainwindow.c:848
 msgid "/_Help/_FAQ/_English"
 msgstr "/A_iuto/_FAQ/Ingl_ese"
 
-#: src/mainwindow.c:847
+#: src/mainwindow.c:849
 msgid "/_Help/_FAQ/_German"
 msgstr "/A_iuto/_FAQ/_Tedesco"
 
-#: src/mainwindow.c:848
+#: src/mainwindow.c:850
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/A_iuto/_FAQ/_Spagnolo"
 
-#: src/mainwindow.c:849
+#: src/mainwindow.c:851
 msgid "/_Help/_FAQ/_French"
 msgstr "/A_iuto/_FAQ/_Francese"
 
-#: src/mainwindow.c:850
+#: src/mainwindow.c:852
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/A_iuto/_FAQ/_Italiano"
 
-#: src/mainwindow.c:851
+#: src/mainwindow.c:853
 msgid "/_Help/_Command line options"
 msgstr "/A_iuto/Opzioni linea _comando"
 
-#: src/mainwindow.c:852
+#: src/mainwindow.c:854
 msgid "/_Help/---"
 msgstr "/A_iuto/---"
 
-#: src/mainwindow.c:895
+#: src/mainwindow.c:897
 msgid "Creating main window...\n"
 msgstr "Creazione della finestra principale...\n"
 
-#: src/mainwindow.c:1071
+#: src/mainwindow.c:1073
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "FinestraPrincipale: l'allocazione del colore %d è fallita.\n"
 
-#: src/mainwindow.c:1175 src/summaryview.c:2387 src/summaryview.c:2472
+#: src/mainwindow.c:1181 src/summaryview.c:2387 src/summaryview.c:2472
 #: src/summaryview.c:4009 src/summaryview.c:4138 src/summaryview.c:4507
 msgid "done.\n"
 msgstr "fatto.\n"
 
-#: src/mainwindow.c:1293 src/mainwindow.c:1334 src/mainwindow.c:1359
+#: src/mainwindow.c:1299 src/mainwindow.c:1340 src/mainwindow.c:1365
 msgid "Untitled"
 msgstr "Senza titolo"
 
-#: src/mainwindow.c:1360
+#: src/mainwindow.c:1366
 msgid "none"
 msgstr "niente"
 
-#: src/mainwindow.c:1413
+#: src/mainwindow.c:1419
 #, 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:1663
+#: src/mainwindow.c:1669
 msgid "Offline"
 msgstr "Offline"
 
-#: src/mainwindow.c:1664
+#: src/mainwindow.c:1670
 msgid "You are offline. Go online?"
 msgstr "Siete offline. Andare online?"
 
-#: src/mainwindow.c:1681
+#: src/mainwindow.c:1687
 msgid "Empty all trash"
 msgstr "Svuota cestino"
 
-#: src/mainwindow.c:1682
+#: src/mainwindow.c:1688
 msgid "Delete all messages in trash folders?"
 msgstr "Svuotare tutti i messaggi nei cestini?"
 
-#: src/mainwindow.c:1712
+#: src/mainwindow.c:1718
 msgid "Add mailbox"
 msgstr "Aggiunta di una casella postale"
 
-#: src/mainwindow.c:1713
+#: src/mainwindow.c:1719
 msgid ""
 "Specify the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3599,16 +3604,16 @@ msgstr ""
 "Se è specificata una casella postale esistente, sarà\n"
 "esaminata automaticamente."
 
-#: src/mainwindow.c:1719 src/setup.c:49
+#: src/mainwindow.c:1725 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "La casella postale «%s» esiste già."
 
-#: src/mainwindow.c:1724 src/setup.c:56
+#: src/mainwindow.c:1730 src/setup.c:56
 msgid "Mailbox"
 msgstr "Casella postale"
 
-#: src/mainwindow.c:1730 src/setup.c:62
+#: src/mainwindow.c:1736 src/setup.c:62
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3618,129 +3623,129 @@ msgstr ""
 "Può darsi che esistano già alcuni file, oppure non si ha il permesso di "
 "scrittura."
 
-#: src/mainwindow.c:2198
+#: src/mainwindow.c:2206
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Vista cartella"
 
-#: src/mainwindow.c:2217
+#: src/mainwindow.c:2225
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Vista messaggio"
 
-#: src/mainwindow.c:2369 src/summaryview.c:418
+#: src/mainwindow.c:2377 src/summaryview.c:418
 msgid "/_Reply"
 msgstr "/_Rispondi"
 
-#: src/mainwindow.c:2370
+#: src/mainwindow.c:2378
 msgid "/Reply to _all"
 msgstr "/Rispondi a _tutti"
 
-#: src/mainwindow.c:2371
+#: src/mainwindow.c:2379
 msgid "/Reply to _sender"
 msgstr "/Rispondi _al mittente"
 
-#: src/mainwindow.c:2372
+#: src/mainwindow.c:2380
 msgid "/Reply to mailing _list"
 msgstr "/Rispondi alla mailing _list"
 
-#: src/mainwindow.c:2377 src/summaryview.c:425
+#: src/mainwindow.c:2385 src/summaryview.c:425
 msgid "/_Forward"
 msgstr "/_Inoltra"
 
-#: src/mainwindow.c:2378 src/summaryview.c:426
+#: src/mainwindow.c:2386 src/summaryview.c:426
 msgid "/For_ward as attachment"
 msgstr "/Inoltra com_e allegato"
 
-#: src/mainwindow.c:2379 src/summaryview.c:427
+#: src/mainwindow.c:2387 src/summaryview.c:427
 msgid "/Redirec_t"
 msgstr "/Rispe_disci"
 
-#: src/mainwindow.c:2384
+#: src/mainwindow.c:2392
 msgid "Incorporate new mail"
 msgstr "Include la nuova posta"
 
-#: src/mainwindow.c:2386
+#: src/mainwindow.c:2394
 msgid "Incorporate new mail of all accounts"
 msgstr "Include la nuova posta di tutti gli account"
 
-#: src/mainwindow.c:2388
+#: src/mainwindow.c:2396
 msgid "Send queued message(s)"
 msgstr "Invia i messaggi accodati"
 
-#: src/mainwindow.c:2390
+#: src/mainwindow.c:2398
 msgid "Compose new message"
 msgstr "Compone un nuovo messaggio"
 
-#: src/mainwindow.c:2392
+#: src/mainwindow.c:2400
 msgid "Reply to the message"
 msgstr "Risponde al messaggio"
 
-#: src/mainwindow.c:2394
+#: src/mainwindow.c:2402
 msgid "Reply to all"
 msgstr "Risponde a tutti"
 
-#: src/mainwindow.c:2396
+#: src/mainwindow.c:2404
 msgid "Forward the message"
 msgstr "Inoltra il messaggio"
 
-#: src/mainwindow.c:2398
+#: src/mainwindow.c:2406
 msgid "Delete the message"
 msgstr "Elimina il messaggio"
 
-#: src/mainwindow.c:2400
+#: src/mainwindow.c:2408
 msgid "Set as junk mail"
 msgstr "Imposta come mail spazzatura"
 
-#: src/mainwindow.c:2402
+#: src/mainwindow.c:2410
 msgid "Execute marked process"
 msgstr "Esegue le operazioni segnate"
 
-#: src/mainwindow.c:2404
+#: src/mainwindow.c:2412
 msgid "Next unread message"
 msgstr "Successivo messaggio non letto"
 
-#: src/mainwindow.c:2406
+#: src/mainwindow.c:2414
 #, fuzzy
 msgid "Previous unread message"
 msgstr "Successivo messaggio non letto"
 
-#: src/mainwindow.c:2410
+#: src/mainwindow.c:2418
 #, fuzzy
 msgid "Print message"
 msgstr "Invia il messaggio"
 
-#: src/mainwindow.c:2412
+#: src/mainwindow.c:2420
 msgid "Common preferences"
 msgstr "Preferenze comuni"
 
-#: src/mainwindow.c:2414 src/prefs_account_dialog.c:511
+#: src/mainwindow.c:2422 src/prefs_account_dialog.c:511
 msgid "Account preferences"
 msgstr "Preferenze dell'account"
 
-#: src/mainwindow.c:2779
+#: src/mainwindow.c:2788
 msgid "You are offline. Click the icon to go online."
 msgstr "Siete offline. Fare click sull'icona per andare online."
 
-#: src/mainwindow.c:2790
+#: src/mainwindow.c:2799
 msgid "You are online. Click the icon to go offline."
 msgstr "Siete online. Fare click sull'icona per andare offline."
 
-#: src/mainwindow.c:3062
+#: src/mainwindow.c:3071
 msgid "Exit"
 msgstr "Esci"
 
-#: src/mainwindow.c:3062
+#: src/mainwindow.c:3071
 msgid "Exit this program?"
 msgstr "Uscire da questo programma?"
 
-#: src/mainwindow.c:3666
+#: src/mainwindow.c:3675
 msgid "Command line options"
 msgstr "Opzioni della linea di comando"
 
-#: src/mainwindow.c:3679
+#: src/mainwindow.c:3688
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Uso: sylpheed [OPZIONE]..."
 
-#: src/mainwindow.c:3687
+#: src/mainwindow.c:3696
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -3768,7 +3773,7 @@ msgstr ""
 "--help\n"
 "--version"
 
-#: src/mainwindow.c:3703
+#: src/mainwindow.c:3712
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
diff --git a/po/ja.po b/po/ja.po
index 3881c716..149bdee1 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-01-31 16:49+0900\n"
+"POT-Creation-Date: 2007-01-31 17:29+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"
@@ -906,7 +906,7 @@ msgstr "/アドレス(_A)/編集(_E)"
 msgid "/_Address/_Delete"
 msgstr "/アドレス(_A)/削除(_D)"
 
-#: src/addressbook.c:359 src/compose.c:673 src/mainwindow.c:787
+#: src/addressbook.c:359 src/compose.c:673 src/mainwindow.c:789
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/ツール(_T)"
@@ -915,12 +915,12 @@ msgstr "/ツール(_T)"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/ツール(_T)/_LDIFファイルをインポート"
 
-#: src/addressbook.c:361 src/compose.c:694 src/mainwindow.c:841
+#: src/addressbook.c:361 src/compose.c:694 src/mainwindow.c:843
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/ヘルプ(_H)"
 
-#: src/addressbook.c:362 src/compose.c:695 src/mainwindow.c:853
+#: src/addressbook.c:362 src/compose.c:695 src/mainwindow.c:855
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/ヘルプ(_H)/このプログラムについて(_A)"
@@ -962,7 +962,7 @@ msgstr "/削除(_D)"
 msgid "E-Mail address"
 msgstr "電子メール アドレス"
 
-#: src/addressbook.c:496 src/compose.c:4873 src/mainwindow.c:2408
+#: src/addressbook.c:496 src/compose.c:4873 src/mainwindow.c:2416
 #: src/prefs_common_dialog.c:2274
 msgid "Address book"
 msgstr "アドレス帳"
@@ -1179,7 +1179,7 @@ msgstr "共有アドレス"
 msgid "Personal address"
 msgstr "個人用アドレス"
 
-#: src/alertpanel.c:142 src/compose.c:5717 src/main.c:638
+#: src/alertpanel.c:142 src/compose.c:5720 src/main.c:638
 msgid "Notice"
 msgstr "注意"
 
@@ -1346,9 +1346,9 @@ msgid "/_View/_Reply to"
 msgstr "/表示(_V)/返信先を指定(_R)"
 
 #: src/compose.c:578 src/compose.c:580 src/compose.c:582 src/compose.c:584
-#: src/compose.c:587 src/mainwindow.c:577 src/mainwindow.c:580
-#: src/mainwindow.c:607 src/mainwindow.c:631 src/mainwindow.c:734
-#: src/mainwindow.c:738 src/messageview.c:258
+#: src/compose.c:587 src/mainwindow.c:579 src/mainwindow.c:582
+#: src/mainwindow.c:609 src/mainwindow.c:633 src/mainwindow.c:736
+#: src/mainwindow.c:740 src/messageview.c:258
 msgid "/_View/---"
 msgstr "/表示(_V)/---"
 
@@ -1368,7 +1368,7 @@ msgstr "/表示(_V)/添付(_A)"
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/表示(_V)/ツールバーをカスタマイズ(_S)..."
 
-#: src/compose.c:593 src/mainwindow.c:638 src/messageview.c:173
+#: src/compose.c:593 src/mainwindow.c:640 src/messageview.c:173
 msgid "/_View/Character _encoding"
 msgstr "/表示(_V)/文字エンコーディング(_E)"
 
@@ -1379,112 +1379,112 @@ msgstr "/表示(_V)/文字エンコーディング(_E)/自動(_A)"
 #: src/compose.c:596 src/compose.c:602 src/compose.c:608 src/compose.c:612
 #: src/compose.c:620 src/compose.c:624 src/compose.c:630 src/compose.c:636
 #: src/compose.c:640 src/compose.c:650 src/compose.c:654 src/compose.c:662
-#: src/compose.c:666 src/mainwindow.c:634 src/mainwindow.c:641
+#: src/compose.c:666 src/mainwindow.c:636 src/mainwindow.c:643
 #: src/messageview.c:169
 msgid "/_View/Character _encoding/---"
 msgstr "/表示(_V)/文字エンコーディング(_E)/---"
 
-#: src/compose.c:598 src/mainwindow.c:642 src/messageview.c:177
+#: src/compose.c:598 src/mainwindow.c:644 src/messageview.c:177
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/7bit ascii (US-ASC_II)"
 
-#: src/compose.c:600 src/mainwindow.c:644 src/messageview.c:180
+#: src/compose.c:600 src/mainwindow.c:646 src/messageview.c:180
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/Unicode (_UTF-8)"
 
-#: src/compose.c:604 src/mainwindow.c:648 src/messageview.c:183
+#: src/compose.c:604 src/mainwindow.c:650 src/messageview.c:183
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/欧米 (ISO-8859-_1)"
 
-#: src/compose.c:606 src/mainwindow.c:650 src/messageview.c:185
+#: src/compose.c:606 src/mainwindow.c:652 src/messageview.c:185
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/欧米 (ISO-8859-15)"
 
-#: src/compose.c:610 src/mainwindow.c:656 src/messageview.c:190
+#: src/compose.c:610 src/mainwindow.c:658 src/messageview.c:190
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/中欧 (ISO-8859-_2)"
 
-#: src/compose.c:614 src/mainwindow.c:660 src/messageview.c:193
+#: src/compose.c:614 src/mainwindow.c:662 src/messageview.c:193
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/バルト諸国 (ISO-8859-13)"
 
-#: src/compose.c:616 src/mainwindow.c:662 src/messageview.c:195
+#: src/compose.c:616 src/mainwindow.c:664 src/messageview.c:195
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/バルト諸国 (ISO-8859-_4)"
 
-#: src/compose.c:618 src/mainwindow.c:664 src/messageview.c:197
+#: src/compose.c:618 src/mainwindow.c:666 src/messageview.c:197
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/バルト諸国 (Windows-1257)"
 
-#: src/compose.c:622 src/mainwindow.c:668 src/messageview.c:200
+#: src/compose.c:622 src/mainwindow.c:670 src/messageview.c:200
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/ギリシャ語 (ISO-8859-_7)"
 
-#: src/compose.c:626 src/mainwindow.c:672 src/messageview.c:203
+#: src/compose.c:626 src/mainwindow.c:674 src/messageview.c:203
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/アラビア語 (ISO-8859-_6)"
 
-#: src/compose.c:628 src/mainwindow.c:674 src/messageview.c:205
+#: src/compose.c:628 src/mainwindow.c:676 src/messageview.c:205
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/アラビア語 (Windows-1256)"
 
-#: src/compose.c:632 src/mainwindow.c:678 src/messageview.c:208
+#: src/compose.c:632 src/mainwindow.c:680 src/messageview.c:208
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/ヘブライ語 (ISO-8859-_8)"
 
-#: src/compose.c:634 src/mainwindow.c:680 src/messageview.c:210
+#: src/compose.c:634 src/mainwindow.c:682 src/messageview.c:210
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/ヘブライ語 (Windows-1255)"
 
-#: src/compose.c:638 src/mainwindow.c:684 src/messageview.c:213
+#: src/compose.c:638 src/mainwindow.c:686 src/messageview.c:213
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/トルコ語 (ISO-8859-_9)"
 
-#: src/compose.c:642 src/mainwindow.c:688 src/messageview.c:216
+#: src/compose.c:642 src/mainwindow.c:690 src/messageview.c:216
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/キリル文字 (ISO-8859-_5)"
 
-#: src/compose.c:644 src/mainwindow.c:690 src/messageview.c:218
+#: src/compose.c:644 src/mainwindow.c:692 src/messageview.c:218
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/キリル文字 (KOI8-_R)"
 
-#: src/compose.c:646 src/mainwindow.c:692 src/messageview.c:220
+#: src/compose.c:646 src/mainwindow.c:694 src/messageview.c:220
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/キリル文字 (KOI8-U)"
 
-#: src/compose.c:648 src/mainwindow.c:694 src/messageview.c:222
+#: src/compose.c:648 src/mainwindow.c:696 src/messageview.c:222
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/キリル文字 (Windows-1251)"
 
-#: src/compose.c:652 src/mainwindow.c:698 src/messageview.c:225
+#: src/compose.c:652 src/mainwindow.c:700 src/messageview.c:225
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/日本語 (ISO-2022-_JP)"
 
-#: src/compose.c:656 src/mainwindow.c:708 src/messageview.c:234
+#: src/compose.c:656 src/mainwindow.c:710 src/messageview.c:234
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/簡体字中国語 (_GB2312)"
 
-#: src/compose.c:658 src/mainwindow.c:710 src/messageview.c:236
+#: src/compose.c:658 src/mainwindow.c:712 src/messageview.c:236
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/簡体字中国語 (GBK)"
 
-#: src/compose.c:660 src/mainwindow.c:712 src/messageview.c:238
+#: src/compose.c:660 src/mainwindow.c:714 src/messageview.c:238
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/繁体字中国語 (_Big5)"
 
-#: src/compose.c:664 src/mainwindow.c:720 src/messageview.c:245
+#: src/compose.c:664 src/mainwindow.c:722 src/messageview.c:245
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/韓国語 (EUC-_KR)"
 
-#: src/compose.c:668 src/mainwindow.c:726 src/messageview.c:250
+#: src/compose.c:668 src/mainwindow.c:728 src/messageview.c:250
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/タイ語 (TIS-620)"
 
-#: src/compose.c:670 src/mainwindow.c:728 src/messageview.c:252
+#: src/compose.c:670 src/mainwindow.c:730 src/messageview.c:252
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/タイ語 (Windows-874)"
 
-#: src/compose.c:674 src/mainwindow.c:788 src/messageview.c:283
+#: src/compose.c:674 src/mainwindow.c:790 src/messageview.c:283
 msgid "/_Tools/_Address book"
 msgstr "/ツール(_T)/アドレス帳(_A)"
 
@@ -1492,13 +1492,13 @@ msgstr "/ツール(_T)/アドレス帳(_A)"
 msgid "/_Tools/_Template"
 msgstr "/ツール(_T)/テンプレート(_T)"
 
-#: src/compose.c:677 src/mainwindow.c:812 src/messageview.c:299
+#: src/compose.c:677 src/mainwindow.c:814 src/messageview.c:299
 msgid "/_Tools/Actio_ns"
 msgstr "/ツール(_T)/アクション(_N)"
 
-#: src/compose.c:679 src/compose.c:683 src/compose.c:689 src/mainwindow.c:791
-#: src/mainwindow.c:805 src/mainwindow.c:810 src/mainwindow.c:813
-#: src/mainwindow.c:817 src/mainwindow.c:819 src/messageview.c:286
+#: src/compose.c:679 src/compose.c:683 src/compose.c:689 src/mainwindow.c:793
+#: src/mainwindow.c:807 src/mainwindow.c:812 src/mainwindow.c:815
+#: src/mainwindow.c:819 src/mainwindow.c:821 src/messageview.c:286
 #: src/messageview.c:298
 msgid "/_Tools/---"
 msgstr "/ツール(_T)/---"
@@ -1704,7 +1704,7 @@ msgstr "PGP署名"
 msgid "PGP Encrypt"
 msgstr "PGP暗号化"
 
-#: src/compose.c:4442 src/compose.c:5543
+#: src/compose.c:4442 src/compose.c:5546
 msgid "MIME type"
 msgstr "MIME タイプ"
 
@@ -1746,36 +1746,36 @@ msgstr "外部エディタで編集"
 msgid "Wrap all long lines"
 msgstr "すべての長い行を折り返す"
 
-#: src/compose.c:5439
+#: src/compose.c:5442
 msgid "Invalid MIME type."
 msgstr "無効な MIME タイプです。"
 
-#: src/compose.c:5457
+#: src/compose.c:5460
 msgid "File doesn't exist or is empty."
 msgstr "ファイルが存在しないかまたは空です。"
 
-#: src/compose.c:5525
+#: src/compose.c:5528
 msgid "Properties"
 msgstr "プロパティ"
 
-#: src/compose.c:5545 src/prefs_common_dialog.c:1504
+#: src/compose.c:5548 src/prefs_common_dialog.c:1504
 msgid "Encoding"
 msgstr "エンコーディング"
 
-#: src/compose.c:5568 src/prefs_folder_item.c:202
+#: src/compose.c:5571 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "パス"
 
-#: src/compose.c:5569
+#: src/compose.c:5572
 msgid "File name"
 msgstr "ファイル名"
 
-#: src/compose.c:5659
+#: src/compose.c:5662
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "外部エディタのコマンドラインが無効です: `%s'\n"
 
-#: src/compose.c:5714
+#: src/compose.c:5717
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1784,48 +1784,48 @@ msgstr ""
 "外部エディタが動作中です。\n"
 "プロセスを強制終了しますか(pid: %d)?\n"
 
-#: src/compose.c:6040 src/mainwindow.c:2752
+#: src/compose.c:6043 src/mainwindow.c:2761
 msgid "_Customize toolbar..."
 msgstr "ツールバーをカスタマイズ(_C)..."
 
-#: src/compose.c:6156 src/compose.c:6161 src/compose.c:6167
+#: src/compose.c:6159 src/compose.c:6164 src/compose.c:6170
 msgid "Can't queue the message."
 msgstr "メッセージを送信待機できません。"
 
-#: src/compose.c:6258
+#: src/compose.c:6261
 msgid "Select files"
 msgstr "ファイルの選択"
 
-#: src/compose.c:6281
+#: src/compose.c:6284
 msgid "Select file"
 msgstr "ファイルの選択"
 
-#: src/compose.c:6316
+#: src/compose.c:6319
 msgid "Save message"
 msgstr "メッセージの保存"
 
-#: src/compose.c:6317
+#: src/compose.c:6320
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "このメッセージは変更されています。草稿に保存しますか?"
 
-#: src/compose.c:6319
+#: src/compose.c:6322
 msgid "Close _without saving"
 msgstr "保存せずに閉じる(_W)"
 
-#: src/compose.c:6361
+#: src/compose.c:6364
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "テンプレート `%s' を適用しますか?"
 
-#: src/compose.c:6363
+#: src/compose.c:6366
 msgid "Apply template"
 msgstr "テンプレートの適用"
 
-#: src/compose.c:6364
+#: src/compose.c:6367
 msgid "_Replace"
 msgstr "置換(_R)"
 
-#: src/compose.c:6364
+#: src/compose.c:6367
 msgid "_Insert"
 msgstr "挿入(_I)"
 
@@ -2280,12 +2280,12 @@ msgstr "フォルダ情報を設定中...\n"
 msgid "Setting folder info..."
 msgstr "フォルダ情報を設定中..."
 
-#: src/folderview.c:868 src/mainwindow.c:3748 src/setup.c:80
+#: src/folderview.c:868 src/mainwindow.c:3757 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "フォルダをスキャン中 (%s%c%s) ..."
 
-#: src/folderview.c:872 src/mainwindow.c:3753 src/setup.c:85
+#: src/folderview.c:872 src/mainwindow.c:3762 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "フォルダをスキャン中 (%s)..."
@@ -3044,533 +3044,537 @@ msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/表示(_V)/表示・非表示(_D)/ツールバー(_T)/アイコンと文字(_A)"
 
 #: src/mainwindow.c:566
+msgid "/_View/Show or hi_de/_Toolbar/Text at the _right of icon"
+msgstr "/表示(_V)/表示・非表示(_D)/ツールバー(_T)/アイコンの右に文字(_R)"
+
+#: src/mainwindow.c:568
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/表示(_V)/表示・非表示(_D)/ツールバー(_T)/アイコン(_I)"
 
-#: src/mainwindow.c:568
+#: src/mainwindow.c:570
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/表示(_V)/表示・非表示(_D)/ツールバー(_T)/文字(_T)"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:572
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/表示(_V)/表示・非表示(_D)/ツールバー(_T)/非表示(_N)"
 
-#: src/mainwindow.c:572
+#: src/mainwindow.c:574
 msgid "/_View/Show or hi_de/_Search bar"
 msgstr "/表示(_V)/表示・非表示(_D)/検索バー(_S)"
 
-#: src/mainwindow.c:574
+#: src/mainwindow.c:576
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/表示(_V)/表示・非表示(_D)/ステータスバー(_B)"
 
-#: src/mainwindow.c:576
+#: src/mainwindow.c:578
 msgid "/_View/_Customize toolbar..."
 msgstr "/表示(_V)/ツールバーをカスタマイズ(_C)..."
 
-#: src/mainwindow.c:578
+#: src/mainwindow.c:580
 msgid "/_View/Separate f_older tree"
 msgstr "/表示(_V)/フォルダツリーを分離(_O)"
 
-#: src/mainwindow.c:579
+#: src/mainwindow.c:581
 msgid "/_View/Separate _message view"
 msgstr "/表示(_V)/メッセージビューを分離(_M)"
 
-#: src/mainwindow.c:581
+#: src/mainwindow.c:583
 msgid "/_View/_Sort"
 msgstr "/表示(_V)/ソート(_S)"
 
-#: src/mainwindow.c:582
+#: src/mainwindow.c:584
 msgid "/_View/_Sort/by _number"
 msgstr "/表示(_V)/ソート(_S)/番号順(_N)"
 
-#: src/mainwindow.c:583
+#: src/mainwindow.c:585
 msgid "/_View/_Sort/by s_ize"
 msgstr "/表示(_V)/ソート(_S)/サイズ順(_I)"
 
-#: src/mainwindow.c:584
+#: src/mainwindow.c:586
 msgid "/_View/_Sort/by _date"
 msgstr "/表示(_V)/ソート(_S)/日付順(_D)"
 
-#: src/mainwindow.c:585
+#: src/mainwindow.c:587
 msgid "/_View/_Sort/by t_hread date"
 msgstr "/表示(_V)/ソート(_S)/スレッドの日付順(_H)"
 
-#: src/mainwindow.c:586
+#: src/mainwindow.c:588
 msgid "/_View/_Sort/by _from"
 msgstr "/表示(_V)/ソート(_S)/差出人順(_F)"
 
-#: src/mainwindow.c:587
+#: src/mainwindow.c:589
 msgid "/_View/_Sort/by _recipient"
 msgstr "/表示(_V)/ソート(_S)/宛先順(_R)"
 
-#: src/mainwindow.c:588
+#: src/mainwindow.c:590
 msgid "/_View/_Sort/by _subject"
 msgstr "/表示(_V)/ソート(_S)/件名順(_S)"
 
-#: src/mainwindow.c:589
+#: src/mainwindow.c:591
 msgid "/_View/_Sort/by _color label"
 msgstr "/表示(_V)/ソート(_S)/カラーラベル順(_C)"
 
-#: src/mainwindow.c:591
+#: src/mainwindow.c:593
 msgid "/_View/_Sort/by _mark"
 msgstr "/表示(_V)/ソート(_S)/マーク(_M)"
 
-#: src/mainwindow.c:592
+#: src/mainwindow.c:594
 msgid "/_View/_Sort/by _unread"
 msgstr "/表示(_V)/ソート(_S)/未読(_U)"
 
-#: src/mainwindow.c:593
+#: src/mainwindow.c:595
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/表示(_V)/ソート(_S)/添付(_T)"
 
-#: src/mainwindow.c:595
+#: src/mainwindow.c:597
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/表示(_V)/ソート(_S)/ソートしない(_O)"
 
-#: src/mainwindow.c:596 src/mainwindow.c:599
+#: src/mainwindow.c:598 src/mainwindow.c:601
 msgid "/_View/_Sort/---"
 msgstr "/表示(_V)/ソート(_S)/---"
 
-#: src/mainwindow.c:597
+#: src/mainwindow.c:599
 msgid "/_View/_Sort/Ascending"
 msgstr "/表示(_V)/ソート(_S)/昇順"
 
-#: src/mainwindow.c:598
+#: src/mainwindow.c:600
 msgid "/_View/_Sort/Descending"
 msgstr "/表示(_V)/ソート(_S)/降順"
 
-#: src/mainwindow.c:600
+#: src/mainwindow.c:602
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/表示(_V)/ソート(_S)/件名でまとめる(_A)"
 
-#: src/mainwindow.c:602
+#: src/mainwindow.c:604
 msgid "/_View/Th_read view"
 msgstr "/表示(_V)/スレッド表示(_R)"
 
-#: src/mainwindow.c:603
+#: src/mainwindow.c:605
 msgid "/_View/E_xpand all threads"
 msgstr "/表示(_V)/すべてのスレッドを展開(_X)"
 
-#: src/mainwindow.c:604
+#: src/mainwindow.c:606
 msgid "/_View/Co_llapse all threads"
 msgstr "/表示(_V)/すべてのスレッドを閉じる(_L)"
 
-#: src/mainwindow.c:605
+#: src/mainwindow.c:607
 msgid "/_View/Set display _item..."
 msgstr "/表示(_V)/表示項目の設定(_I)..."
 
-#: src/mainwindow.c:608
+#: src/mainwindow.c:610
 msgid "/_View/_Go to"
 msgstr "/表示(_V)/移動(_G)"
 
-#: src/mainwindow.c:609
+#: src/mainwindow.c:611
 msgid "/_View/_Go to/_Prev message"
 msgstr "/表示(_V)/移動(_G)/前のメッセージ(_P)"
 
-#: src/mainwindow.c:610
+#: src/mainwindow.c:612
 msgid "/_View/_Go to/_Next message"
 msgstr "/表示(_V)/移動(_G)/次のメッセージ(_N)"
 
-#: src/mainwindow.c:611 src/mainwindow.c:616 src/mainwindow.c:619
-#: src/mainwindow.c:624 src/mainwindow.c:629
+#: src/mainwindow.c:613 src/mainwindow.c:618 src/mainwindow.c:621
+#: src/mainwindow.c:626 src/mainwindow.c:631
 msgid "/_View/_Go to/---"
 msgstr "/表示(_V)/移動(_G)/---"
 
-#: src/mainwindow.c:612
+#: src/mainwindow.c:614
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/表示(_V)/移動(_G)/前の未読メッセージ(_R)"
 
-#: src/mainwindow.c:614
+#: src/mainwindow.c:616
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/表示(_V)/移動(_G)/次の未読メッセージ(_E)"
 
-#: src/mainwindow.c:617
+#: src/mainwindow.c:619
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/表示(_V)/移動(_G)/前の新着メッセージ(_W)"
 
-#: src/mainwindow.c:618
+#: src/mainwindow.c:620
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/表示(_V)/移動(_G)/次の新着メッセージ(_X)"
 
-#: src/mainwindow.c:620
+#: src/mainwindow.c:622
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/表示(_V)/移動(_G)/前のマーク付きメッセージ(_M)"
 
-#: src/mainwindow.c:622
+#: src/mainwindow.c:624
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/表示(_V)/移動(_G)/次のマーク付きメッセージ(_A)"
 
-#: src/mainwindow.c:625
+#: src/mainwindow.c:627
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/表示(_V)/移動(_G)/前のラベル付きメッセージ(_L)"
 
-#: src/mainwindow.c:627
+#: src/mainwindow.c:629
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/表示(_V)/移動(_G)/次のラベル付きメッセージ(_B)"
 
-#: src/mainwindow.c:630
+#: src/mainwindow.c:632
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/表示(_V)/移動(_G)/別のフォルダ(_F)..."
 
-#: src/mainwindow.c:639 src/messageview.c:174
+#: src/mainwindow.c:641 src/messageview.c:174
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/表示(_V)/文字エンコーディング(_E)/自動検出(_A)"
 
-#: src/mainwindow.c:652 src/messageview.c:187
+#: src/mainwindow.c:654 src/messageview.c:187
 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/欧米 (Windows-1252)"
 
-#: src/mainwindow.c:700 src/messageview.c:227
+#: src/mainwindow.c:702 src/messageview.c:227
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/日本語 (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:702 src/messageview.c:229
+#: src/mainwindow.c:704 src/messageview.c:229
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/日本語 (_EUC-JP)"
 
-#: src/mainwindow.c:704 src/messageview.c:231
+#: src/mainwindow.c:706 src/messageview.c:231
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/日本語 (_Shift__JIS)"
 
-#: src/mainwindow.c:714 src/messageview.c:240
+#: src/mainwindow.c:716 src/messageview.c:240
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/繁体字中国語 (EUC-_TW)"
 
-#: src/mainwindow.c:716 src/messageview.c:242
+#: src/mainwindow.c:718 src/messageview.c:242
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/中国語 (ISO-2022-_CN)"
 
-#: src/mainwindow.c:722 src/messageview.c:247
+#: src/mainwindow.c:724 src/messageview.c:247
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/韓国語 (ISO-2022-KR)"
 
-#: src/mainwindow.c:735 src/summaryview.c:464
+#: src/mainwindow.c:737 src/summaryview.c:464
 msgid "/_View/Open in new _window"
 msgstr "/表示(_V)/新しいウィンドウで開く(_W)"
 
-#: src/mainwindow.c:736 src/messageview.c:259 src/summaryview.c:466
+#: src/mainwindow.c:738 src/messageview.c:259 src/summaryview.c:466
 msgid "/_View/Mess_age source"
 msgstr "/表示(_V)/メッセージのソース(_A)"
 
-#: src/mainwindow.c:737 src/messageview.c:260 src/summaryview.c:467
+#: src/mainwindow.c:739 src/messageview.c:260 src/summaryview.c:467
 msgid "/_View/All _headers"
 msgstr "/表示(_V)/すべてのヘッダ(_H)"
 
-#: src/mainwindow.c:739
+#: src/mainwindow.c:741
 msgid "/_View/_Update summary"
 msgstr "/表示(_V)/サマリを更新(_U)"
 
-#: src/mainwindow.c:741 src/messageview.c:263
+#: src/mainwindow.c:743 src/messageview.c:263
 msgid "/_Message"
 msgstr "/メッセージ(_M)"
 
-#: src/mainwindow.c:742
+#: src/mainwindow.c:744
 msgid "/_Message/Recei_ve"
 msgstr "/メッセージ(_M)/受信(_V)"
 
-#: src/mainwindow.c:743
+#: src/mainwindow.c:745
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/メッセージ(_M)/受信(_V)/現在のアカウントから受信(_C)"
 
-#: src/mainwindow.c:745
+#: src/mainwindow.c:747
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/メッセージ(_M)/受信(_V)/全アカウントから受信(_A)"
 
-#: src/mainwindow.c:747
+#: src/mainwindow.c:749
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/メッセージ(_M)/受信(_V)/受信を中止(_G)"
 
-#: src/mainwindow.c:749
+#: src/mainwindow.c:751
 msgid "/_Message/Recei_ve/---"
 msgstr "/メッセージ(_M)/受信(_V)/---"
 
-#: src/mainwindow.c:750
+#: src/mainwindow.c:752
 msgid "/_Message/_Send queued messages"
 msgstr "/メッセージ(_M)/送信待機中のメッセージを送信(_S)"
 
-#: src/mainwindow.c:751 src/mainwindow.c:753 src/mainwindow.c:760
-#: src/mainwindow.c:765 src/mainwindow.c:768 src/mainwindow.c:779
-#: src/mainwindow.c:781 src/mainwindow.c:784 src/messageview.c:266
+#: src/mainwindow.c:753 src/mainwindow.c:755 src/mainwindow.c:762
+#: src/mainwindow.c:767 src/mainwindow.c:770 src/mainwindow.c:781
+#: src/mainwindow.c:783 src/mainwindow.c:786 src/messageview.c:266
 #: src/messageview.c:274 src/messageview.c:279
 msgid "/_Message/---"
 msgstr "/メッセージ(_M)/---"
 
-#: src/mainwindow.c:752 src/messageview.c:264
+#: src/mainwindow.c:754 src/messageview.c:264
 msgid "/_Message/Compose _new message"
 msgstr "/メッセージ(_M)/新規メッセージを作成(_N)"
 
-#: src/mainwindow.c:754 src/messageview.c:267
+#: src/mainwindow.c:756 src/messageview.c:267
 msgid "/_Message/_Reply"
 msgstr "/メッセージ(_M)/返信(_R)"
 
-#: src/mainwindow.c:755
+#: src/mainwindow.c:757
 msgid "/_Message/Repl_y to"
 msgstr "/メッセージ(_M)/返信の宛先(_Y)"
 
-#: src/mainwindow.c:756 src/messageview.c:268
+#: src/mainwindow.c:758 src/messageview.c:268
 msgid "/_Message/Repl_y to/_all"
 msgstr "/メッセージ(_M)/返信の宛先(_Y)/全員に返信(_A)"
 
-#: src/mainwindow.c:757 src/messageview.c:270
+#: src/mainwindow.c:759 src/messageview.c:270
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/メッセージ(_M)/返信の宛先(_Y)/差出人に返信(_S)"
 
-#: src/mainwindow.c:758 src/messageview.c:272
+#: src/mainwindow.c:760 src/messageview.c:272
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/メッセージ(_M)/返信の宛先(_Y)/メーリングリストに返信(_L)"
 
-#: src/mainwindow.c:761 src/messageview.c:275
+#: src/mainwindow.c:763 src/messageview.c:275
 msgid "/_Message/_Forward"
 msgstr "/メッセージ(_M)/転送(_F)"
 
-#: src/mainwindow.c:762 src/messageview.c:276
+#: src/mainwindow.c:764 src/messageview.c:276
 msgid "/_Message/For_ward as attachment"
 msgstr "/メッセージ(_M)/添付として転送(_W)"
 
-#: src/mainwindow.c:764 src/messageview.c:278
+#: src/mainwindow.c:766 src/messageview.c:278
 msgid "/_Message/Redirec_t"
 msgstr "/メッセージ(_M)/手を加えずに転送(_T)"
 
-#: src/mainwindow.c:766
+#: src/mainwindow.c:768
 msgid "/_Message/M_ove..."
 msgstr "/メッセージ(_M)/移動(_O)..."
 
-#: src/mainwindow.c:767
+#: src/mainwindow.c:769
 msgid "/_Message/_Copy..."
 msgstr "/メッセージ(_M)/コピー(_C)..."
 
-#: src/mainwindow.c:769
+#: src/mainwindow.c:771
 msgid "/_Message/_Mark"
 msgstr "/メッセージ(_M)/マーク(_M)"
 
-#: src/mainwindow.c:770
+#: src/mainwindow.c:772
 msgid "/_Message/_Mark/_Mark"
 msgstr "/メッセージ(_M)/マーク(_M)/マーク(_M)"
 
-#: src/mainwindow.c:771
+#: src/mainwindow.c:773
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/メッセージ(_M)/マーク(_M)/マーク解除(_U)"
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:774
 msgid "/_Message/_Mark/---"
 msgstr "/メッセージ(_M)/マーク(_M)/---"
 
-#: src/mainwindow.c:773
+#: src/mainwindow.c:775
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/メッセージ(_M)/マーク(_M)/未読としてマーク(_E)"
 
-#: src/mainwindow.c:774
+#: src/mainwindow.c:776
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/メッセージ(_M)/マーク(_M)/読んだことにする(_D)"
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:778
 msgid "/_Message/_Mark/Mark _thread as read"
 msgstr "/メッセージ(_M)/マーク(_M)/スレッドを読んだことにする(_T)"
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:780
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/メッセージ(_M)/マーク(_M)/すべて読んだことにする(_R)"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:782
 msgid "/_Message/_Delete"
 msgstr "/メッセージ(_M)/削除(_D)"
 
-#: src/mainwindow.c:782
+#: src/mainwindow.c:784
 msgid "/_Message/Set as _junk mail"
 msgstr "/メッセージ(_M)/迷惑メールに指定(_J)"
 
-#: src/mainwindow.c:783
+#: src/mainwindow.c:785
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/メッセージ(_M)/迷惑メールではない(_U)"
 
-#: src/mainwindow.c:785 src/messageview.c:280
+#: src/mainwindow.c:787 src/messageview.c:280
 msgid "/_Message/Re-_edit"
 msgstr "/メッセージ(_M)/再編集(_E)"
 
-#: src/mainwindow.c:789
+#: src/mainwindow.c:791
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/ツール(_T)/差出人をアドレス帳に追加(_K)..."
 
-#: src/mainwindow.c:792
+#: src/mainwindow.c:794
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/ツール(_T)/フォルダ中のすべてのメッセージを振り分け(_F)"
 
-#: src/mainwindow.c:794
+#: src/mainwindow.c:796
 msgid "/_Tools/Filter _selected messages"
 msgstr "/ツール(_T)/選択中のメッセージを振り分け(_S)"
 
-#: src/mainwindow.c:796 src/messageview.c:287
+#: src/mainwindow.c:798 src/messageview.c:287
 msgid "/_Tools/_Create filter rule"
 msgstr "/ツール(_T)/振り分けルールを作成(_C)"
 
-#: src/mainwindow.c:797 src/messageview.c:289
+#: src/mainwindow.c:799 src/messageview.c:289
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/ツール(_T)/振り分けルールを作成(_C)/自動(_A)"
 
-#: src/mainwindow.c:799 src/messageview.c:291
+#: src/mainwindow.c:801 src/messageview.c:291
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/ツール(_T)/振り分けルールを作成(_C)/_Fromから"
 
-#: src/mainwindow.c:801 src/messageview.c:293
+#: src/mainwindow.c:803 src/messageview.c:293
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/ツール(_T)/振り分けルールを作成(_C)/_Toから"
 
-#: src/mainwindow.c:803 src/messageview.c:295
+#: src/mainwindow.c:805 src/messageview.c:295
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/ツール(_T)/振り分けルールを作成(_C)/_Subjectから"
 
-#: src/mainwindow.c:806
+#: src/mainwindow.c:808
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/ツール(_T)/フォルダ中の迷惑メールを振り分け(_J)"
 
-#: src/mainwindow.c:808
+#: src/mainwindow.c:810
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/ツール(_T)/選択メッセージ中の迷惑メールを振り分け(_M)"
 
-#: src/mainwindow.c:815
+#: src/mainwindow.c:817
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/メッセージ(_M)/重複メッセージを削除(_P)"
 
-#: src/mainwindow.c:818
+#: src/mainwindow.c:820
 msgid "/_Tools/E_xecute marked process"
 msgstr "/ツール(_T)/マークされた処理を実行(_X)"
 
-#: src/mainwindow.c:820
+#: src/mainwindow.c:822
 msgid "/_Tools/_Log window"
 msgstr "/ツール(_T)/ログウィンドウ(_L)"
 
-#: src/mainwindow.c:822
+#: src/mainwindow.c:824
 msgid "/_Configuration"
 msgstr "/設定(_C)"
 
-#: src/mainwindow.c:823
+#: src/mainwindow.c:825
 msgid "/_Configuration/_Common preferences..."
 msgstr "/設定(_C)/全般の設定(_C)..."
 
-#: src/mainwindow.c:825
+#: src/mainwindow.c:827
 msgid "/_Configuration/_Filter setting..."
 msgstr "/設定(_C)/振り分けの設定(_F)..."
 
-#: src/mainwindow.c:827
+#: src/mainwindow.c:829
 msgid "/_Configuration/_Template..."
 msgstr "/設定(_C)/テンプレート(_T)..."
 
-#: src/mainwindow.c:829
+#: src/mainwindow.c:831
 msgid "/_Configuration/_Actions..."
 msgstr "/設定(_C)/アクション(_A)..."
 
-#: src/mainwindow.c:831
+#: src/mainwindow.c:833
 msgid "/_Configuration/---"
 msgstr "/設定(_C)/---"
 
-#: src/mainwindow.c:832
+#: src/mainwindow.c:834
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/設定(_C)/現在のアカウントの設定(_P)..."
 
-#: src/mainwindow.c:834
+#: src/mainwindow.c:836
 msgid "/_Configuration/Create _new account..."
 msgstr "/設定(_C)/新規アカウントの作成(_N)..."
 
-#: src/mainwindow.c:836
+#: src/mainwindow.c:838
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/設定(_C)/アカウントの編集(_E)..."
 
-#: src/mainwindow.c:838
+#: src/mainwindow.c:840
 msgid "/_Configuration/C_hange current account"
 msgstr "/設定(_C)/現在のアカウントを変更(_H)"
 
-#: src/mainwindow.c:842
+#: src/mainwindow.c:844
 msgid "/_Help/_Manual"
 msgstr "/ヘルプ(_H)/マニュアル(_M)"
 
-#: src/mainwindow.c:843
+#: src/mainwindow.c:845
 msgid "/_Help/_Manual/_English"
 msgstr "/ヘルプ(_H)/マニュアル(_M)/英語(_E)"
 
-#: src/mainwindow.c:844
+#: src/mainwindow.c:846
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/ヘルプ(_H)/マニュアル(_M)/日本語(_J)"
 
-#: src/mainwindow.c:845
+#: src/mainwindow.c:847
 msgid "/_Help/_FAQ"
 msgstr "/ヘルプ(_H)/_FAQ"
 
-#: src/mainwindow.c:846
+#: src/mainwindow.c:848
 msgid "/_Help/_FAQ/_English"
 msgstr "/ヘルプ(_H)/_FAQ/英語(_E)"
 
-#: src/mainwindow.c:847
+#: src/mainwindow.c:849
 msgid "/_Help/_FAQ/_German"
 msgstr "/ヘルプ(_H)/_FAQ/ドイツ語(_G)"
 
-#: src/mainwindow.c:848
+#: src/mainwindow.c:850
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/ヘルプ(_H)/_FAQ/スペイン語(_S)"
 
-#: src/mainwindow.c:849
+#: src/mainwindow.c:851
 msgid "/_Help/_FAQ/_French"
 msgstr "/ヘルプ(_H)/_FAQ/フランス語(_F)"
 
-#: src/mainwindow.c:850
+#: src/mainwindow.c:852
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/ヘルプ(_H)/_FAQ/イタリア語(_I)"
 
-#: src/mainwindow.c:851
+#: src/mainwindow.c:853
 msgid "/_Help/_Command line options"
 msgstr "/ヘルプ(_H)/コマンドラインオプション(_C)"
 
-#: src/mainwindow.c:852
+#: src/mainwindow.c:854
 msgid "/_Help/---"
 msgstr "/ヘルプ(_H)/---"
 
-#: src/mainwindow.c:895
+#: src/mainwindow.c:897
 msgid "Creating main window...\n"
 msgstr "メインウィンドウを作成中...\n"
 
-#: src/mainwindow.c:1071
+#: src/mainwindow.c:1073
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "MainWindow: 色の割り当て %d に失敗しました\n"
 
-#: src/mainwindow.c:1175 src/summaryview.c:2387 src/summaryview.c:2472
+#: src/mainwindow.c:1181 src/summaryview.c:2387 src/summaryview.c:2472
 #: src/summaryview.c:4009 src/summaryview.c:4138 src/summaryview.c:4507
 msgid "done.\n"
 msgstr "完了。\n"
 
-#: src/mainwindow.c:1293 src/mainwindow.c:1334 src/mainwindow.c:1359
+#: src/mainwindow.c:1299 src/mainwindow.c:1340 src/mainwindow.c:1365
 msgid "Untitled"
 msgstr "名称未設定"
 
-#: src/mainwindow.c:1360
+#: src/mainwindow.c:1366
 msgid "none"
 msgstr "なし"
 
-#: src/mainwindow.c:1413
+#: src/mainwindow.c:1419
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "ウィンドウの分離タイプを %d から %d に変更しています\n"
 
-#: src/mainwindow.c:1663
+#: src/mainwindow.c:1669
 msgid "Offline"
 msgstr "オフライン"
 
-#: src/mainwindow.c:1664
+#: src/mainwindow.c:1670
 msgid "You are offline. Go online?"
 msgstr "現在オフラインです。オンラインにしますか?"
 
-#: src/mainwindow.c:1681
+#: src/mainwindow.c:1687
 msgid "Empty all trash"
 msgstr "すべてのごみ箱を空にする"
 
-#: src/mainwindow.c:1682
+#: src/mainwindow.c:1688
 msgid "Delete all messages in trash folders?"
 msgstr "ごみ箱の中のメッセージをすべて削除しますか?"
 
-#: src/mainwindow.c:1712
+#: src/mainwindow.c:1718
 msgid "Add mailbox"
 msgstr "メールボックスを追加"
 
-#: src/mainwindow.c:1713
+#: src/mainwindow.c:1719
 msgid ""
 "Specify the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3579,16 +3583,16 @@ msgstr ""
 "メールボックスの場所を入力してください。\n"
 "既存のメールボックスを指定するとその内容を自動的にスキャンします。"
 
-#: src/mainwindow.c:1719 src/setup.c:49
+#: src/mainwindow.c:1725 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "メールボックス `%s' はすでに存在します。"
 
-#: src/mainwindow.c:1724 src/setup.c:56
+#: src/mainwindow.c:1730 src/setup.c:56
 msgid "Mailbox"
 msgstr "メール箱"
 
-#: src/mainwindow.c:1730 src/setup.c:62
+#: src/mainwindow.c:1736 src/setup.c:62
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3597,127 +3601,127 @@ msgstr ""
 "メールボックスの作成に失敗しました。\n"
 "いくつかのファイルがすでに存在するか、あるいは書き込む権限がありません。"
 
-#: src/mainwindow.c:2198
+#: src/mainwindow.c:2206
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - フォルダビュー"
 
-#: src/mainwindow.c:2217
+#: src/mainwindow.c:2225
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - メッセージビュー"
 
-#: src/mainwindow.c:2369 src/summaryview.c:418
+#: src/mainwindow.c:2377 src/summaryview.c:418
 msgid "/_Reply"
 msgstr "/返信(_R)"
 
-#: src/mainwindow.c:2370
+#: src/mainwindow.c:2378
 msgid "/Reply to _all"
 msgstr "/全員に返信(_A)"
 
-#: src/mainwindow.c:2371
+#: src/mainwindow.c:2379
 msgid "/Reply to _sender"
 msgstr "/差出人に返信(_S)"
 
-#: src/mainwindow.c:2372
+#: src/mainwindow.c:2380
 msgid "/Reply to mailing _list"
 msgstr "/メーリングリストに返信(_L)"
 
-#: src/mainwindow.c:2377 src/summaryview.c:425
+#: src/mainwindow.c:2385 src/summaryview.c:425
 msgid "/_Forward"
 msgstr "/転送(_F)"
 
-#: src/mainwindow.c:2378 src/summaryview.c:426
+#: src/mainwindow.c:2386 src/summaryview.c:426
 msgid "/For_ward as attachment"
 msgstr "/添付として転送(_W)"
 
-#: src/mainwindow.c:2379 src/summaryview.c:427
+#: src/mainwindow.c:2387 src/summaryview.c:427
 msgid "/Redirec_t"
 msgstr "/手を加えずに転送(_T)"
 
-#: src/mainwindow.c:2384
+#: src/mainwindow.c:2392
 msgid "Incorporate new mail"
 msgstr "新着メールの取込"
 
-#: src/mainwindow.c:2386
+#: src/mainwindow.c:2394
 msgid "Incorporate new mail of all accounts"
 msgstr "全アカウントの新着メールの取込"
 
-#: src/mainwindow.c:2388
+#: src/mainwindow.c:2396
 msgid "Send queued message(s)"
 msgstr "送信待機中のメッセージを送信する"
 
-#: src/mainwindow.c:2390
+#: src/mainwindow.c:2398
 msgid "Compose new message"
 msgstr "新規メッセージを作成"
 
-#: src/mainwindow.c:2392
+#: src/mainwindow.c:2400
 msgid "Reply to the message"
 msgstr "メッセージに返信する"
 
-#: src/mainwindow.c:2394
+#: src/mainwindow.c:2402
 msgid "Reply to all"
 msgstr "全員に返信"
 
-#: src/mainwindow.c:2396
+#: src/mainwindow.c:2404
 msgid "Forward the message"
 msgstr "メッセージを転送する"
 
-#: src/mainwindow.c:2398
+#: src/mainwindow.c:2406
 msgid "Delete the message"
 msgstr "メッセージを削除する"
 
-#: src/mainwindow.c:2400
+#: src/mainwindow.c:2408
 msgid "Set as junk mail"
 msgstr "迷惑メールに指定"
 
-#: src/mainwindow.c:2402
+#: src/mainwindow.c:2410
 msgid "Execute marked process"
 msgstr "マークされた処理を実行"
 
-#: src/mainwindow.c:2404
+#: src/mainwindow.c:2412
 msgid "Next unread message"
 msgstr "次の未読メッセージ"
 
-#: src/mainwindow.c:2406
+#: src/mainwindow.c:2414
 msgid "Previous unread message"
 msgstr "前の未読メッセージ"
 
-#: src/mainwindow.c:2410
+#: src/mainwindow.c:2418
 msgid "Print message"
 msgstr "メッセージを印刷"
 
-#: src/mainwindow.c:2412
+#: src/mainwindow.c:2420
 msgid "Common preferences"
 msgstr "全般の設定"
 
-#: src/mainwindow.c:2414 src/prefs_account_dialog.c:511
+#: src/mainwindow.c:2422 src/prefs_account_dialog.c:511
 msgid "Account preferences"
 msgstr "アカウントの設定"
 
-#: src/mainwindow.c:2779
+#: src/mainwindow.c:2788
 msgid "You are offline. Click the icon to go online."
 msgstr "現在オフラインです。アイコンをクリックするとオンラインになります。"
 
-#: src/mainwindow.c:2790
+#: src/mainwindow.c:2799
 msgid "You are online. Click the icon to go offline."
 msgstr "現在オンラインです。アイコンをクリックするとオフラインになります。"
 
-#: src/mainwindow.c:3062
+#: src/mainwindow.c:3071
 msgid "Exit"
 msgstr "終了"
 
-#: src/mainwindow.c:3062
+#: src/mainwindow.c:3071
 msgid "Exit this program?"
 msgstr "このプログラムを終了しますか?"
 
-#: src/mainwindow.c:3666
+#: src/mainwindow.c:3675
 msgid "Command line options"
 msgstr "コマンドラインオプション"
 
-#: src/mainwindow.c:3679
+#: src/mainwindow.c:3688
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "使用法: sylpheed [オプション]..."
 
-#: src/mainwindow.c:3687
+#: src/mainwindow.c:3696
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -3745,7 +3749,7 @@ msgstr ""
 "--help\n"
 "--version"
 
-#: src/mainwindow.c:3703
+#: src/mainwindow.c:3712
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
diff --git a/po/ko.po b/po/ko.po
index 17eb7af9..ba3672f0 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed  0.8.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-01-31 16:49+0900\n"
+"POT-Creation-Date: 2007-01-31 17:29+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"
@@ -900,7 +900,7 @@ msgstr "/주소(_A)/편집(_E)"
 msgid "/_Address/_Delete"
 msgstr "/주소(_A)/삭제(_D)"
 
-#: src/addressbook.c:359 src/compose.c:673 src/mainwindow.c:787
+#: src/addressbook.c:359 src/compose.c:673 src/mainwindow.c:789
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/도구(_T)"
@@ -909,12 +909,12 @@ msgstr "/도구(_T)"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/도구(_T)/LDIF 파일 가져오기(_L)"
 
-#: src/addressbook.c:361 src/compose.c:694 src/mainwindow.c:841
+#: src/addressbook.c:361 src/compose.c:694 src/mainwindow.c:843
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/도움말(_H)"
 
-#: src/addressbook.c:362 src/compose.c:695 src/mainwindow.c:853
+#: src/addressbook.c:362 src/compose.c:695 src/mainwindow.c:855
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/도움말(_H)/sylpheed 정보(_A)"
@@ -956,7 +956,7 @@ msgstr "/삭제(_D)"
 msgid "E-Mail address"
 msgstr "이메일 주소"
 
-#: src/addressbook.c:496 src/compose.c:4873 src/mainwindow.c:2408
+#: src/addressbook.c:496 src/compose.c:4873 src/mainwindow.c:2416
 #: src/prefs_common_dialog.c:2274
 msgid "Address book"
 msgstr "주소록"
@@ -1170,7 +1170,7 @@ msgstr "공용 주소록"
 msgid "Personal address"
 msgstr "개인 주소록"
 
-#: src/alertpanel.c:142 src/compose.c:5717 src/main.c:638
+#: src/alertpanel.c:142 src/compose.c:5720 src/main.c:638
 msgid "Notice"
 msgstr "알림"
 
@@ -1344,9 +1344,9 @@ msgid "/_View/_Reply to"
 msgstr "/보기(_V)/Reply to(_R)"
 
 #: src/compose.c:578 src/compose.c:580 src/compose.c:582 src/compose.c:584
-#: src/compose.c:587 src/mainwindow.c:577 src/mainwindow.c:580
-#: src/mainwindow.c:607 src/mainwindow.c:631 src/mainwindow.c:734
-#: src/mainwindow.c:738 src/messageview.c:258
+#: src/compose.c:587 src/mainwindow.c:579 src/mainwindow.c:582
+#: src/mainwindow.c:609 src/mainwindow.c:633 src/mainwindow.c:736
+#: src/mainwindow.c:740 src/messageview.c:258
 msgid "/_View/---"
 msgstr "/보기(_V)/---"
 
@@ -1367,7 +1367,7 @@ msgstr "/보기(_V)/첨부(_A)"
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/보기(_V)/가기(_G)/다른 폴더로(_f)..."
 
-#: src/compose.c:593 src/mainwindow.c:638 src/messageview.c:173
+#: src/compose.c:593 src/mainwindow.c:640 src/messageview.c:173
 #, fuzzy
 msgid "/_View/Character _encoding"
 msgstr "/보기(_V)/정렬(_S)/내림차순"
@@ -1379,138 +1379,138 @@ msgstr ""
 #: src/compose.c:596 src/compose.c:602 src/compose.c:608 src/compose.c:612
 #: src/compose.c:620 src/compose.c:624 src/compose.c:630 src/compose.c:636
 #: src/compose.c:640 src/compose.c:650 src/compose.c:654 src/compose.c:662
-#: src/compose.c:666 src/mainwindow.c:634 src/mainwindow.c:641
+#: src/compose.c:666 src/mainwindow.c:636 src/mainwindow.c:643
 #: src/messageview.c:169
 #, fuzzy
 msgid "/_View/Character _encoding/---"
 msgstr "/보기(_V)/정렬(_S)/내림차순"
 
-#: src/compose.c:598 src/mainwindow.c:642 src/messageview.c:177
+#: src/compose.c:598 src/mainwindow.c:644 src/messageview.c:177
 #, fuzzy
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/보기(_V)/문자셋(_C)/7bit 아스키 (US-ASC_II)"
 
-#: src/compose.c:600 src/mainwindow.c:644 src/messageview.c:180
+#: src/compose.c:600 src/mainwindow.c:646 src/messageview.c:180
 #, fuzzy
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/보기(_V)/문자셋(_C)/유니코드(_UTF-8)"
 
-#: src/compose.c:604 src/mainwindow.c:648 src/messageview.c:183
+#: src/compose.c:604 src/mainwindow.c:650 src/messageview.c:183
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/보기(_V)/문자셋(_C)/서부 유럽(ISO-8859-_1)"
 
-#: src/compose.c:606 src/mainwindow.c:650 src/messageview.c:185
+#: src/compose.c:606 src/mainwindow.c:652 src/messageview.c:185
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/보기(_V)/문자셋(_C)/서부 유럽(ISO-8859-15)"
 
-#: src/compose.c:610 src/mainwindow.c:656 src/messageview.c:190
+#: src/compose.c:610 src/mainwindow.c:658 src/messageview.c:190
 #, fuzzy
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/보기(_V)/문자셋(_C)/중앙 유럽(ISO-8859-_2)"
 
-#: src/compose.c:614 src/mainwindow.c:660 src/messageview.c:193
+#: src/compose.c:614 src/mainwindow.c:662 src/messageview.c:193
 #, fuzzy
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/보기(_V)/문자셋(_C)/_Baltic (ISO-8859-13)"
 
-#: src/compose.c:616 src/mainwindow.c:662 src/messageview.c:195
+#: src/compose.c:616 src/mainwindow.c:664 src/messageview.c:195
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/보기(_V)/문자셋(_C)/Baltic (ISO-8859-_4)"
 
-#: src/compose.c:618 src/mainwindow.c:664 src/messageview.c:197
+#: src/compose.c:618 src/mainwindow.c:666 src/messageview.c:197
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/보기(_V)/문자셋(_C)/Cyrillic (Windows-1251)"
 
-#: src/compose.c:622 src/mainwindow.c:668 src/messageview.c:200
+#: src/compose.c:622 src/mainwindow.c:670 src/messageview.c:200
 #, fuzzy
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/보기(_V)/문자셋(_C)/그리스(ISO-8859-_7)"
 
-#: src/compose.c:626 src/mainwindow.c:672 src/messageview.c:203
+#: src/compose.c:626 src/mainwindow.c:674 src/messageview.c:203
 #, fuzzy
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/보기(_V)/문자셋(_C)/Baltic (ISO-8859-_4)"
 
-#: src/compose.c:628 src/mainwindow.c:674 src/messageview.c:205
+#: src/compose.c:628 src/mainwindow.c:676 src/messageview.c:205
 #, fuzzy
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/보기(_V)/문자셋(_C)/Cyrillic (Windows-1251)"
 
-#: src/compose.c:632 src/mainwindow.c:678 src/messageview.c:208
+#: src/compose.c:632 src/mainwindow.c:680 src/messageview.c:208
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/보기(_V)/문자셋(_C)/그리스(ISO-8859-_7)"
 
-#: src/compose.c:634 src/mainwindow.c:680 src/messageview.c:210
+#: src/compose.c:634 src/mainwindow.c:682 src/messageview.c:210
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/보기(_V)/문자셋(_C)/Cyrillic (Windows-1251)"
 
-#: src/compose.c:638 src/mainwindow.c:684 src/messageview.c:213
+#: src/compose.c:638 src/mainwindow.c:686 src/messageview.c:213
 #, fuzzy
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/보기(_V)/문자셋(_C)/터기 (ISO-8859-_9)"
 
-#: src/compose.c:642 src/mainwindow.c:688 src/messageview.c:216
+#: src/compose.c:642 src/mainwindow.c:690 src/messageview.c:216
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/보기(_V)/문자셋(_C)/Cyrillic (ISo-8859-_5)"
 
-#: src/compose.c:644 src/mainwindow.c:690 src/messageview.c:218
+#: src/compose.c:644 src/mainwindow.c:692 src/messageview.c:218
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/보기(_V)/문자셋(_C)/Cyrillic (KOI8-_R)"
 
-#: src/compose.c:646 src/mainwindow.c:692 src/messageview.c:220
+#: src/compose.c:646 src/mainwindow.c:694 src/messageview.c:220
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/보기(_V)/문자셋(_C)/Cyrillic (KOI8-_R)"
 
-#: src/compose.c:648 src/mainwindow.c:694 src/messageview.c:222
+#: src/compose.c:648 src/mainwindow.c:696 src/messageview.c:222
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/보기(_V)/문자셋(_C)/Cyrillic (Windows-1251)"
 
-#: src/compose.c:652 src/mainwindow.c:698 src/messageview.c:225
+#: src/compose.c:652 src/mainwindow.c:700 src/messageview.c:225
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/보기(_V)/문자셋(_C)/일본 (ISO-2022-_JP)"
 
-#: src/compose.c:656 src/mainwindow.c:708 src/messageview.c:234
+#: src/compose.c:656 src/mainwindow.c:710 src/messageview.c:234
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/보기(_V)/문자셋(_C)/Simplified Chinese (_GB2312)"
 
-#: src/compose.c:658 src/mainwindow.c:710 src/messageview.c:236
+#: src/compose.c:658 src/mainwindow.c:712 src/messageview.c:236
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/보기(_V)/문자셋(_C)/Simplified Chinese (_GB2312)"
 
-#: src/compose.c:660 src/mainwindow.c:712 src/messageview.c:238
+#: src/compose.c:660 src/mainwindow.c:714 src/messageview.c:238
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/보기(_V)/문자셋(_C)/Traditional Chinese (_Big5)"
 
-#: src/compose.c:664 src/mainwindow.c:720 src/messageview.c:245
+#: src/compose.c:664 src/mainwindow.c:722 src/messageview.c:245
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/보기(_V)/문자셋(_C)/한국 (EUC-KR)"
 
-#: src/compose.c:668 src/mainwindow.c:726 src/messageview.c:250
+#: src/compose.c:668 src/mainwindow.c:728 src/messageview.c:250
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/보기(_V)/문자셋(_C)/Thai (TIS-620)"
 
-#: src/compose.c:670 src/mainwindow.c:728 src/messageview.c:252
+#: src/compose.c:670 src/mainwindow.c:730 src/messageview.c:252
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/보기(_V)/문자셋(_C)/Thai (Windows-874)"
 
-#: src/compose.c:674 src/mainwindow.c:788 src/messageview.c:283
+#: src/compose.c:674 src/mainwindow.c:790 src/messageview.c:283
 msgid "/_Tools/_Address book"
 msgstr "/도구(_T)/주소록(_A)"
 
@@ -1518,13 +1518,13 @@ msgstr "/도구(_T)/주소록(_A)"
 msgid "/_Tools/_Template"
 msgstr "/도구(_T)/템플릿(_T)"
 
-#: src/compose.c:677 src/mainwindow.c:812 src/messageview.c:299
+#: src/compose.c:677 src/mainwindow.c:814 src/messageview.c:299
 msgid "/_Tools/Actio_ns"
 msgstr "/도구(_T)/동작(_n)"
 
-#: src/compose.c:679 src/compose.c:683 src/compose.c:689 src/mainwindow.c:791
-#: src/mainwindow.c:805 src/mainwindow.c:810 src/mainwindow.c:813
-#: src/mainwindow.c:817 src/mainwindow.c:819 src/messageview.c:286
+#: src/compose.c:679 src/compose.c:683 src/compose.c:689 src/mainwindow.c:793
+#: src/mainwindow.c:807 src/mainwindow.c:812 src/mainwindow.c:815
+#: src/mainwindow.c:819 src/mainwindow.c:821 src/messageview.c:286
 #: src/messageview.c:298
 msgid "/_Tools/---"
 msgstr "/도구(_T)/---"
@@ -1729,7 +1729,7 @@ msgstr "/도구(_T)/동작(_n)"
 msgid "PGP Encrypt"
 msgstr "/메시지(_M)/암호화(_E)"
 
-#: src/compose.c:4442 src/compose.c:5543
+#: src/compose.c:4442 src/compose.c:5546
 msgid "MIME type"
 msgstr "마임 타입"
 
@@ -1772,37 +1772,37 @@ msgstr "외부 편집기로 편집"
 msgid "Wrap all long lines"
 msgstr "긴 줄에대해 자동 줄바꿈을 합니다"
 
-#: src/compose.c:5439
+#: src/compose.c:5442
 msgid "Invalid MIME type."
 msgstr "올바르지않은 마임 타입."
 
-#: src/compose.c:5457
+#: src/compose.c:5460
 msgid "File doesn't exist or is empty."
 msgstr "파일이 없거나 비여있습니다."
 
-#: src/compose.c:5525
+#: src/compose.c:5528
 #, fuzzy
 msgid "Properties"
 msgstr "특성"
 
-#: src/compose.c:5545 src/prefs_common_dialog.c:1504
+#: src/compose.c:5548 src/prefs_common_dialog.c:1504
 msgid "Encoding"
 msgstr "인코딩"
 
-#: src/compose.c:5568 src/prefs_folder_item.c:202
+#: src/compose.c:5571 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "경로"
 
-#: src/compose.c:5569
+#: src/compose.c:5572
 msgid "File name"
 msgstr "파일 이름"
 
-#: src/compose.c:5659
+#: src/compose.c:5662
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "외부 편집기 명령어가 올바르지않습니다: `%s'\n"
 
-#: src/compose.c:5714
+#: src/compose.c:5717
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1812,52 +1812,52 @@ msgstr ""
 "이 프로세스를 강제로 종료시킬까요?\n"
 "프로세스 그룹 아이디: %d"
 
-#: src/compose.c:6040 src/mainwindow.c:2752
+#: src/compose.c:6043 src/mainwindow.c:2761
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:6156 src/compose.c:6161 src/compose.c:6167
+#: src/compose.c:6159 src/compose.c:6164 src/compose.c:6170
 msgid "Can't queue the message."
 msgstr "메시지를 임시 보관함에 넣을수가 없습니다."
 
-#: src/compose.c:6258
+#: src/compose.c:6261
 #, fuzzy
 msgid "Select files"
 msgstr "파일 선택"
 
-#: src/compose.c:6281
+#: src/compose.c:6284
 msgid "Select file"
 msgstr "파일 선택"
 
-#: src/compose.c:6316
+#: src/compose.c:6319
 #, fuzzy
 msgid "Save message"
 msgstr "메시지 보내기"
 
-#: src/compose.c:6317
+#: src/compose.c:6320
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "이 메시지는 수정되었습니다. 변경사항을 버릴까요?"
 
-#: src/compose.c:6319
+#: src/compose.c:6322
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:6361
+#: src/compose.c:6364
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "`%s' 템플릿을 적용할까요?"
 
-#: src/compose.c:6363
+#: src/compose.c:6366
 msgid "Apply template"
 msgstr "템플릿을 적용합니다."
 
-#: src/compose.c:6364
+#: src/compose.c:6367
 #, fuzzy
 msgid "_Replace"
 msgstr "대체"
 
-#: src/compose.c:6364
+#: src/compose.c:6367
 #, fuzzy
 msgid "_Insert"
 msgstr "삽입"
@@ -2319,12 +2319,12 @@ msgstr "폴더 정보를 설정합니다...\n"
 msgid "Setting folder info..."
 msgstr "폴더 정보를 설정합니다..."
 
-#: src/folderview.c:868 src/mainwindow.c:3748 src/setup.c:80
+#: src/folderview.c:868 src/mainwindow.c:3757 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "%s%c%s를 스캔합니다..."
 
-#: src/folderview.c:872 src/mainwindow.c:3753 src/setup.c:85
+#: src/folderview.c:872 src/mainwindow.c:3762 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "%s 폴더를 스캔합니다..."
@@ -3082,564 +3082,569 @@ msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/보기(_V)/보이거나 감추기(_d)/툴바(_T)/아이콘과 텍스트(_a)"
 
 #: src/mainwindow.c:566
-msgid "/_View/Show or hi_de/_Toolbar/_Icon"
+#, fuzzy
+msgid "/_View/Show or hi_de/_Toolbar/Text at the _right of icon"
 msgstr "/보기(_V)/보이거나 감추기(_d)/툴바(_T)/아이콘(_I)"
 
 #: src/mainwindow.c:568
+msgid "/_View/Show or hi_de/_Toolbar/_Icon"
+msgstr "/보기(_V)/보이거나 감추기(_d)/툴바(_T)/아이콘(_I)"
+
+#: src/mainwindow.c:570
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/보기(_V)/보이거나 감추기(_d)/툴바(_T)/텍스트(_T)"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:572
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/보기(_V)/보이거나 감추기(_d)/툴바(_T)/없음(_N)"
 
-#: src/mainwindow.c:572
+#: src/mainwindow.c:574
 #, fuzzy
 msgid "/_View/Show or hi_de/_Search bar"
 msgstr "/보기(_V)/보이거나 감추기(_d)/상태바(_b)"
 
-#: src/mainwindow.c:574
+#: src/mainwindow.c:576
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/보기(_V)/보이거나 감추기(_d)/상태바(_b)"
 
-#: src/mainwindow.c:576
+#: src/mainwindow.c:578
 #, fuzzy
 msgid "/_View/_Customize toolbar..."
 msgstr "/보기(_V)/가기(_G)/다른 폴더로(_f)..."
 
-#: src/mainwindow.c:578
+#: src/mainwindow.c:580
 msgid "/_View/Separate f_older tree"
 msgstr "/보기(_V)/별도의 폴더 트리 창(_o)"
 
-#: src/mainwindow.c:579
+#: src/mainwindow.c:581
 #, fuzzy
 msgid "/_View/Separate _message view"
 msgstr "/보기(_V)/별도의 메시지 창(_e)"
 
-#: src/mainwindow.c:581
+#: src/mainwindow.c:583
 msgid "/_View/_Sort"
 msgstr "/보기(_V)/정렬(_S)"
 
-#: src/mainwindow.c:582
+#: src/mainwindow.c:584
 msgid "/_View/_Sort/by _number"
 msgstr "/보기(_V)/정렬(_S)/번호(_n)"
 
-#: src/mainwindow.c:583
+#: src/mainwindow.c:585
 msgid "/_View/_Sort/by s_ize"
 msgstr "/보기(_V)/정렬(_S)/크기(_i)"
 
-#: src/mainwindow.c:584
+#: src/mainwindow.c:586
 msgid "/_View/_Sort/by _date"
 msgstr "/보기(_V)/정렬(_S)/날짜(_d)"
 
-#: src/mainwindow.c:585
+#: src/mainwindow.c:587
 #, fuzzy
 msgid "/_View/_Sort/by t_hread date"
 msgstr "/보기(_V)/정렬(_S)/날짜(_d)"
 
-#: src/mainwindow.c:586
+#: src/mainwindow.c:588
 msgid "/_View/_Sort/by _from"
 msgstr "/보기(_V)/정렬(_S)/보낸 사람(_f)"
 
-#: src/mainwindow.c:587
+#: src/mainwindow.c:589
 #, fuzzy
 msgid "/_View/_Sort/by _recipient"
 msgstr "/보기(_V)/정렬(_S)/크기(_i)"
 
-#: src/mainwindow.c:588
+#: src/mainwindow.c:590
 msgid "/_View/_Sort/by _subject"
 msgstr "/보기(_V)/정렬(_S)/제목(_s)"
 
-#: src/mainwindow.c:589
+#: src/mainwindow.c:591
 msgid "/_View/_Sort/by _color label"
 msgstr "/보기(_V)/정렬(_S)/색 라벨(_c)"
 
-#: src/mainwindow.c:591
+#: src/mainwindow.c:593
 msgid "/_View/_Sort/by _mark"
 msgstr "/보기(_V)/정렬(_S)/표시(_m)"
 
-#: src/mainwindow.c:592
+#: src/mainwindow.c:594
 msgid "/_View/_Sort/by _unread"
 msgstr "/보기(_V)/정렬(_S)/않읽음(_u)"
 
-#: src/mainwindow.c:593
+#: src/mainwindow.c:595
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/보기(_V)/정렬(_S)/첨부(_t)"
 
-#: src/mainwindow.c:595
+#: src/mainwindow.c:597
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/보기(_V)/정렬(_S)/않함(_o)"
 
-#: src/mainwindow.c:596 src/mainwindow.c:599
+#: src/mainwindow.c:598 src/mainwindow.c:601
 msgid "/_View/_Sort/---"
 msgstr "/보기(_V)/정렬(_S)/---"
 
-#: src/mainwindow.c:597
+#: src/mainwindow.c:599
 msgid "/_View/_Sort/Ascending"
 msgstr "/보기(_V)/정렬(_S)/오름차순"
 
-#: src/mainwindow.c:598
+#: src/mainwindow.c:600
 msgid "/_View/_Sort/Descending"
 msgstr "/보기(_V)/정렬(_S)/내림차순"
 
-#: src/mainwindow.c:600
+#: src/mainwindow.c:602
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/명령(_S)/정렬(_S)/제목(_A)"
 
-#: src/mainwindow.c:602
+#: src/mainwindow.c:604
 msgid "/_View/Th_read view"
 msgstr "/보기(_V)/쓰레드 보기(_r)"
 
-#: src/mainwindow.c:603
+#: src/mainwindow.c:605
 msgid "/_View/E_xpand all threads"
 msgstr "/보기(_V)/모든 쓰레드 펴기(_x)"
 
-#: src/mainwindow.c:604
+#: src/mainwindow.c:606
 msgid "/_View/Co_llapse all threads"
 msgstr "/보기(_V)/모든 쓰레드 접기(_l)"
 
-#: src/mainwindow.c:605
+#: src/mainwindow.c:607
 msgid "/_View/Set display _item..."
 msgstr "/보기(_V)/표시 항목 설정(_i)..."
 
-#: src/mainwindow.c:608
+#: src/mainwindow.c:610
 msgid "/_View/_Go to"
 msgstr "/보기(_V)/가기(_G)"
 
-#: src/mainwindow.c:609
+#: src/mainwindow.c:611
 msgid "/_View/_Go to/_Prev message"
 msgstr "/명령(_S)/가기(_G)/이전 메시지(_P)"
 
-#: src/mainwindow.c:610
+#: src/mainwindow.c:612
 msgid "/_View/_Go to/_Next message"
 msgstr "/보기(_V)/가기(_G)/다음 메시지(_N)"
 
-#: src/mainwindow.c:611 src/mainwindow.c:616 src/mainwindow.c:619
-#: src/mainwindow.c:624 src/mainwindow.c:629
+#: src/mainwindow.c:613 src/mainwindow.c:618 src/mainwindow.c:621
+#: src/mainwindow.c:626 src/mainwindow.c:631
 msgid "/_View/_Go to/---"
 msgstr "/보기(_V)/가기(_G)/---"
 
-#: src/mainwindow.c:612
+#: src/mainwindow.c:614
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/보기(_V)/가기(_G)/안읽은 다음 메시지(_e)"
 
-#: src/mainwindow.c:614
+#: src/mainwindow.c:616
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/보기(_V)/가기(_G)/안읽은 다음 메시지(_e)"
 
-#: src/mainwindow.c:617
+#: src/mainwindow.c:619
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/보기(_V)/가기(_G)/이전 새 메시지(_w)"
 
-#: src/mainwindow.c:618
+#: src/mainwindow.c:620
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/보기(_V)/가기(_G)/다음 새 메시지(_x)"
 
-#: src/mainwindow.c:620
+#: src/mainwindow.c:622
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/보기(_V)/가기(_G)/표시된 이전 메시지(_m)"
 
-#: src/mainwindow.c:622
+#: src/mainwindow.c:624
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/보기(_V)/가기(_G)/표시된 다음 메시지(_a)"
 
-#: src/mainwindow.c:625
+#: src/mainwindow.c:627
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/보기(_V)/가기(_G)/꼬리표있는 이전 메시지(_l)"
 
-#: src/mainwindow.c:627
+#: src/mainwindow.c:629
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/보기(_V)/가기(_G)/꼬리표있는 다음 메시지(_b)"
 
-#: src/mainwindow.c:630
+#: src/mainwindow.c:632
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/보기(_V)/가기(_G)/다른 폴더로(_f)..."
 
-#: src/mainwindow.c:639 src/messageview.c:174
+#: src/mainwindow.c:641 src/messageview.c:174
 #, fuzzy
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/보기(_V)/문자셋(_C)/자동(_A)"
 
-#: src/mainwindow.c:652 src/messageview.c:187
+#: src/mainwindow.c:654 src/messageview.c:187
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr "/보기(_V)/문자셋(_C)/서부 유럽(ISO-8859-15)"
 
-#: src/mainwindow.c:700 src/messageview.c:227
+#: src/mainwindow.c:702 src/messageview.c:227
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/보기(_V)/문자셋(_C)/일본 (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:702 src/messageview.c:229
+#: src/mainwindow.c:704 src/messageview.c:229
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/보기(_V)/문자셋(_C)/일본 (_EUC-JP)"
 
-#: src/mainwindow.c:704 src/messageview.c:231
+#: src/mainwindow.c:706 src/messageview.c:231
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/보기(_V)/문자셋(_C)/일본 (_Shift__JIS)"
 
-#: src/mainwindow.c:714 src/messageview.c:240
+#: src/mainwindow.c:716 src/messageview.c:240
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/보기(_V)/문자셋(_C)/Traditional Chinese (EUC-_TW)"
 
-#: src/mainwindow.c:716 src/messageview.c:242
+#: src/mainwindow.c:718 src/messageview.c:242
 #, fuzzy
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/보기(_V)/문자셋(_C)/Chinese (ISO-2022-_CN)"
 
-#: src/mainwindow.c:722 src/messageview.c:247
+#: src/mainwindow.c:724 src/messageview.c:247
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/보기(_V)/문자셋(_C)/한국 (ISO-2022-KR)"
 
-#: src/mainwindow.c:735 src/summaryview.c:464
+#: src/mainwindow.c:737 src/summaryview.c:464
 msgid "/_View/Open in new _window"
 msgstr "/보기(_V)/새 창으로 열기(_w)"
 
-#: src/mainwindow.c:736 src/messageview.c:259 src/summaryview.c:466
+#: src/mainwindow.c:738 src/messageview.c:259 src/summaryview.c:466
 msgid "/_View/Mess_age source"
 msgstr "/보기(_V)/메시지 소스(_a)"
 
-#: src/mainwindow.c:737 src/messageview.c:260 src/summaryview.c:467
+#: src/mainwindow.c:739 src/messageview.c:260 src/summaryview.c:467
 #, fuzzy
 msgid "/_View/All _headers"
 msgstr "/보기(_V)/모든 헤더(_h)"
 
-#: src/mainwindow.c:739
+#: src/mainwindow.c:741
 msgid "/_View/_Update summary"
 msgstr "/보기(_V)/요약 갱신(_U)"
 
-#: src/mainwindow.c:741 src/messageview.c:263
+#: src/mainwindow.c:743 src/messageview.c:263
 msgid "/_Message"
 msgstr "/메시지(_M)"
 
-#: src/mainwindow.c:742
+#: src/mainwindow.c:744
 #, fuzzy
 msgid "/_Message/Recei_ve"
 msgstr "/메시지(_M)/다시 편집(_e)"
 
-#: src/mainwindow.c:743
+#: src/mainwindow.c:745
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/메시지(_M)/모든 계정에서 받기(_a)"
 
-#: src/mainwindow.c:745
+#: src/mainwindow.c:747
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/메시지(_M)/모든 계정에서 받기(_a)"
 
-#: src/mainwindow.c:747
+#: src/mainwindow.c:749
 #, fuzzy
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/메시지(_M)/받기 취소(_g)"
 
-#: src/mainwindow.c:749
+#: src/mainwindow.c:751
 #, fuzzy
 msgid "/_Message/Recei_ve/---"
 msgstr "/메시지(_M)/다시 편집(_e)"
 
-#: src/mainwindow.c:750
+#: src/mainwindow.c:752
 msgid "/_Message/_Send queued messages"
 msgstr "/메시지(_M)/임시 보관된 메시지 발송(_S)"
 
-#: src/mainwindow.c:751 src/mainwindow.c:753 src/mainwindow.c:760
-#: src/mainwindow.c:765 src/mainwindow.c:768 src/mainwindow.c:779
-#: src/mainwindow.c:781 src/mainwindow.c:784 src/messageview.c:266
+#: src/mainwindow.c:753 src/mainwindow.c:755 src/mainwindow.c:762
+#: src/mainwindow.c:767 src/mainwindow.c:770 src/mainwindow.c:781
+#: src/mainwindow.c:783 src/mainwindow.c:786 src/messageview.c:266
 #: src/messageview.c:274 src/messageview.c:279
 msgid "/_Message/---"
 msgstr "/메시지(_M)/---"
 
-#: src/mainwindow.c:752 src/messageview.c:264
+#: src/mainwindow.c:754 src/messageview.c:264
 msgid "/_Message/Compose _new message"
 msgstr "/메시지(_M)/새로 만들기(_n)"
 
-#: src/mainwindow.c:754 src/messageview.c:267
+#: src/mainwindow.c:756 src/messageview.c:267
 msgid "/_Message/_Reply"
 msgstr "/메시지(_M)/회신(_R)"
 
-#: src/mainwindow.c:755
+#: src/mainwindow.c:757
 msgid "/_Message/Repl_y to"
 msgstr "/메시지(_M)/회신(_y)"
 
-#: src/mainwindow.c:756 src/messageview.c:268
+#: src/mainwindow.c:758 src/messageview.c:268
 msgid "/_Message/Repl_y to/_all"
 msgstr "/메시지(_M)/회신(_y)/전체(_a)"
 
-#: src/mainwindow.c:757 src/messageview.c:270
+#: src/mainwindow.c:759 src/messageview.c:270
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/메시지(_M)/회신(_y)/보낸이(_s)"
 
-#: src/mainwindow.c:758 src/messageview.c:272
+#: src/mainwindow.c:760 src/messageview.c:272
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/메시지(_M)/회신(_y)/메일링리스트(_l)"
 
-#: src/mainwindow.c:761 src/messageview.c:275
+#: src/mainwindow.c:763 src/messageview.c:275
 msgid "/_Message/_Forward"
 msgstr "/메시지(_M)/전달(_F)"
 
-#: src/mainwindow.c:762 src/messageview.c:276
+#: src/mainwindow.c:764 src/messageview.c:276
 msgid "/_Message/For_ward as attachment"
 msgstr "/메시지(_M)/첨부파일로 전달(_w)"
 
-#: src/mainwindow.c:764 src/messageview.c:278
+#: src/mainwindow.c:766 src/messageview.c:278
 msgid "/_Message/Redirec_t"
 msgstr "/메시지(_M)/Redirec_t"
 
-#: src/mainwindow.c:766
+#: src/mainwindow.c:768
 msgid "/_Message/M_ove..."
 msgstr "/메시지(_M)/이동(_o)..."
 
-#: src/mainwindow.c:767
+#: src/mainwindow.c:769
 msgid "/_Message/_Copy..."
 msgstr "/메시지(_M)/복사(_C)..."
 
-#: src/mainwindow.c:769
+#: src/mainwindow.c:771
 msgid "/_Message/_Mark"
 msgstr "/메시지(_M)/표시(_M)"
 
-#: src/mainwindow.c:770
+#: src/mainwindow.c:772
 msgid "/_Message/_Mark/_Mark"
 msgstr "/메시지(_M)/표시(_M)/표시(_M)"
 
-#: src/mainwindow.c:771
+#: src/mainwindow.c:773
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/메시지(_M)/표시(_M)/표시 지움(_U)"
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:774
 msgid "/_Message/_Mark/---"
 msgstr "/메시지(_M)/표시(_M)/---"
 
-#: src/mainwindow.c:773
+#: src/mainwindow.c:775
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/메시지(_M)/표시(_M)/읽지않은 것으로 표시(_e)"
 
-#: src/mainwindow.c:774
+#: src/mainwindow.c:776
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/메시지(_M)/표시(_M)/읽은 것으로 표시(_d)"
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:778
 #, fuzzy
 msgid "/_Message/_Mark/Mark _thread as read"
 msgstr "/메시지(_M)/표시(_M)/읽은 것으로 표시(_d)"
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:780
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/메시지(_M)/표시(_M)/모두 읽은 것으로 표시(_r)"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:782
 msgid "/_Message/_Delete"
 msgstr "/메시지(_M)/삭제(_D)"
 
-#: src/mainwindow.c:782
+#: src/mainwindow.c:784
 #, fuzzy
 msgid "/_Message/Set as _junk mail"
 msgstr "/메시지(_M)/새 메일 받기(_i)"
 
-#: src/mainwindow.c:783
+#: src/mainwindow.c:785
 #, fuzzy
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/메시지(_M)/새 메일 받기(_i)"
 
-#: src/mainwindow.c:785 src/messageview.c:280
+#: src/mainwindow.c:787 src/messageview.c:280
 msgid "/_Message/Re-_edit"
 msgstr "/메시지(_M)/다시 편집(_e)"
 
-#: src/mainwindow.c:789
+#: src/mainwindow.c:791
 #, fuzzy
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/도구(_T)/주소록에 보낸이 추가(_k)"
 
-#: src/mainwindow.c:792
+#: src/mainwindow.c:794
 #, fuzzy
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/도구(_T)/메시지 필터(_F)"
 
-#: src/mainwindow.c:794
+#: src/mainwindow.c:796
 #, fuzzy
 msgid "/_Tools/Filter _selected messages"
 msgstr "/도구(_T)/메시지 필터(_F)"
 
-#: src/mainwindow.c:796 src/messageview.c:287
+#: src/mainwindow.c:798 src/messageview.c:287
 msgid "/_Tools/_Create filter rule"
 msgstr "/도구(_T)/필터 규칙 생성(_C)"
 
-#: src/mainwindow.c:797 src/messageview.c:289
+#: src/mainwindow.c:799 src/messageview.c:289
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/도구(_T)/필터 규칙 생성(_C)/자동(_A)"
 
-#: src/mainwindow.c:799 src/messageview.c:291
+#: src/mainwindow.c:801 src/messageview.c:291
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/도구(_T)/필터 규칙 생성(_C)/보낸이로(_F)"
 
-#: src/mainwindow.c:801 src/messageview.c:293
+#: src/mainwindow.c:803 src/messageview.c:293
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/도구(_T)/필터 규칙 생성(_C)/받는이로(_T)"
 
-#: src/mainwindow.c:803 src/messageview.c:295
+#: src/mainwindow.c:805 src/messageview.c:295
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/도구(_T)/필터 규칙 생성(_C)/제목으로(_S)"
 
-#: src/mainwindow.c:806
+#: src/mainwindow.c:808
 #, fuzzy
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/도구(_T)/메시지 필터(_F)"
 
-#: src/mainwindow.c:808
+#: src/mainwindow.c:810
 #, fuzzy
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/도구(_T)/메시지 필터(_F)"
 
-#: src/mainwindow.c:815
+#: src/mainwindow.c:817
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/도구(_T)/중복된 메시지 지우기(_p)"
 
-#: src/mainwindow.c:818
+#: src/mainwindow.c:820
 #, fuzzy
 msgid "/_Tools/E_xecute marked process"
 msgstr "표시된 프로세스들을 실행합니다"
 
-#: src/mainwindow.c:820
+#: src/mainwindow.c:822
 msgid "/_Tools/_Log window"
 msgstr "/도구(_T)/로그 창(_L)"
 
-#: src/mainwindow.c:822
+#: src/mainwindow.c:824
 msgid "/_Configuration"
 msgstr "/설정(_C)"
 
-#: src/mainwindow.c:823
+#: src/mainwindow.c:825
 msgid "/_Configuration/_Common preferences..."
 msgstr "/설정(_C)/기본적인 설정(_C)..."
 
-#: src/mainwindow.c:825
+#: src/mainwindow.c:827
 msgid "/_Configuration/_Filter setting..."
 msgstr "/설정(_C)/필터 설정(_F)..."
 
-#: src/mainwindow.c:827
+#: src/mainwindow.c:829
 msgid "/_Configuration/_Template..."
 msgstr "/설정(_C)/템플릿(_T)..."
 
-#: src/mainwindow.c:829
+#: src/mainwindow.c:831
 msgid "/_Configuration/_Actions..."
 msgstr "/설정(_C)/동작(_A)..."
 
-#: src/mainwindow.c:831
+#: src/mainwindow.c:833
 msgid "/_Configuration/---"
 msgstr "/설정(_C)/---"
 
-#: src/mainwindow.c:832
+#: src/mainwindow.c:834
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/설정(_C)/계정에 따른 설정(_P)..."
 
-#: src/mainwindow.c:834
+#: src/mainwindow.c:836
 msgid "/_Configuration/Create _new account..."
 msgstr "/설정(_C)/새 계정 만들기(_n)..."
 
-#: src/mainwindow.c:836
+#: src/mainwindow.c:838
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/설정(_C)/계정 편집(_E)..."
 
-#: src/mainwindow.c:838
+#: src/mainwindow.c:840
 msgid "/_Configuration/C_hange current account"
 msgstr "/설정(_C)/현재 계정을 변경(_h)"
 
-#: src/mainwindow.c:842
+#: src/mainwindow.c:844
 msgid "/_Help/_Manual"
 msgstr "/도움말(_H)/설명서(_M)"
 
-#: src/mainwindow.c:843
+#: src/mainwindow.c:845
 msgid "/_Help/_Manual/_English"
 msgstr "/도움말(_H)/설명서(_M)/영어(_E)"
 
-#: src/mainwindow.c:844
+#: src/mainwindow.c:846
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/도움말(_H)/설명서(_M)/일본어(_J)"
 
-#: src/mainwindow.c:845
+#: src/mainwindow.c:847
 msgid "/_Help/_FAQ"
 msgstr "/도움말(_H)/FAQ(_F)"
 
-#: src/mainwindow.c:846
+#: src/mainwindow.c:848
 msgid "/_Help/_FAQ/_English"
 msgstr "/도움말(_H)/FAQ(_F)/영어(_E)"
 
-#: src/mainwindow.c:847
+#: src/mainwindow.c:849
 msgid "/_Help/_FAQ/_German"
 msgstr "/도움말(_H)/FAQ(_F)/독일어(_G)"
 
-#: src/mainwindow.c:848
+#: src/mainwindow.c:850
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/도움말(_H)/FAQ(_F)/스페인어(_S)"
 
-#: src/mainwindow.c:849
+#: src/mainwindow.c:851
 msgid "/_Help/_FAQ/_French"
 msgstr "/도움말(_H)/FAQ(_F)/프랑스어(_F)"
 
-#: src/mainwindow.c:850
+#: src/mainwindow.c:852
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/도움말(_H)/FAQ(_F)/이태리어(_I)"
 
-#: src/mainwindow.c:851
+#: src/mainwindow.c:853
 #, fuzzy
 msgid "/_Help/_Command line options"
 msgstr "명령이 지정되지않음"
 
-#: src/mainwindow.c:852
+#: src/mainwindow.c:854
 msgid "/_Help/---"
 msgstr "/도움말(_H)/---"
 
-#: src/mainwindow.c:895
+#: src/mainwindow.c:897
 msgid "Creating main window...\n"
 msgstr "새 창을 만듭니다...\n"
 
-#: src/mainwindow.c:1071
+#: src/mainwindow.c:1073
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "메인 창: 색 할당 %d 실패\n"
 
-#: src/mainwindow.c:1175 src/summaryview.c:2387 src/summaryview.c:2472
+#: src/mainwindow.c:1181 src/summaryview.c:2387 src/summaryview.c:2472
 #: src/summaryview.c:4009 src/summaryview.c:4138 src/summaryview.c:4507
 msgid "done.\n"
 msgstr "마침.\n"
 
-#: src/mainwindow.c:1293 src/mainwindow.c:1334 src/mainwindow.c:1359
+#: src/mainwindow.c:1299 src/mainwindow.c:1340 src/mainwindow.c:1365
 msgid "Untitled"
 msgstr "제목 없슴"
 
-#: src/mainwindow.c:1360
+#: src/mainwindow.c:1366
 msgid "none"
 msgstr "없음"
 
-#: src/mainwindow.c:1413
+#: src/mainwindow.c:1419
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "창 분리 형식을 %d에서 %d로 바꿉니다\n"
 
-#: src/mainwindow.c:1663
+#: src/mainwindow.c:1669
 msgid "Offline"
 msgstr ""
 
-#: src/mainwindow.c:1664
+#: src/mainwindow.c:1670
 msgid "You are offline. Go online?"
 msgstr ""
 
-#: src/mainwindow.c:1681
+#: src/mainwindow.c:1687
 #, fuzzy
 msgid "Empty all trash"
 msgstr "지운 편지함 비우기"
 
-#: src/mainwindow.c:1682
+#: src/mainwindow.c:1688
 #, fuzzy
 msgid "Delete all messages in trash folders?"
 msgstr "지운 편지함에있는 모든 메시지를 비울까요?"
 
-#: src/mainwindow.c:1712
+#: src/mainwindow.c:1718
 msgid "Add mailbox"
 msgstr "메일박스 추가"
 
-#: src/mainwindow.c:1713
+#: src/mainwindow.c:1719
 #, fuzzy
 msgid ""
 "Specify the location of mailbox.\n"
@@ -3650,16 +3655,16 @@ msgstr ""
 "기존의 메일 박스가 지정되면 자동으로\n"
 "스캔될것입니다."
 
-#: src/mainwindow.c:1719 src/setup.c:49
+#: src/mainwindow.c:1725 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "메일 박스 `%s'가 이미 존재합니다."
 
-#: src/mainwindow.c:1724 src/setup.c:56
+#: src/mainwindow.c:1730 src/setup.c:56
 msgid "Mailbox"
 msgstr "메일박스"
 
-#: src/mainwindow.c:1730 src/setup.c:62
+#: src/mainwindow.c:1736 src/setup.c:62
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3668,135 +3673,135 @@ msgstr ""
 "메일박스 생성이 실패했습니다.\n"
 "아마 어떤 파일이 이미 존재하거나 그 곳에 쓰기 권한이 없습니다."
 
-#: src/mainwindow.c:2198
+#: src/mainwindow.c:2206
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - 폴더 보기"
 
-#: src/mainwindow.c:2217
+#: src/mainwindow.c:2225
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - 메시지 보기"
 
-#: src/mainwindow.c:2369 src/summaryview.c:418
+#: src/mainwindow.c:2377 src/summaryview.c:418
 msgid "/_Reply"
 msgstr "/회신(_R)"
 
-#: src/mainwindow.c:2370
+#: src/mainwindow.c:2378
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "전부에게 회신을 보냅니다"
 
-#: src/mainwindow.c:2371
+#: src/mainwindow.c:2379
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/회신(_y)/보낸이(_s)"
 
-#: src/mainwindow.c:2372
+#: src/mainwindow.c:2380
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/회신(_y)/메일링리스트(_l)"
 
-#: src/mainwindow.c:2377 src/summaryview.c:425
+#: src/mainwindow.c:2385 src/summaryview.c:425
 msgid "/_Forward"
 msgstr "/전달(_F)"
 
-#: src/mainwindow.c:2378 src/summaryview.c:426
+#: src/mainwindow.c:2386 src/summaryview.c:426
 msgid "/For_ward as attachment"
 msgstr "/첨부로 전달(_w)"
 
-#: src/mainwindow.c:2379 src/summaryview.c:427
+#: src/mainwindow.c:2387 src/summaryview.c:427
 msgid "/Redirec_t"
 msgstr "/Redirec_t"
 
-#: src/mainwindow.c:2384
+#: src/mainwindow.c:2392
 msgid "Incorporate new mail"
 msgstr "새 메일을 가져옵니다"
 
-#: src/mainwindow.c:2386
+#: src/mainwindow.c:2394
 msgid "Incorporate new mail of all accounts"
 msgstr "모든 계정에서 새 메일을 가져옵니다"
 
-#: src/mainwindow.c:2388
+#: src/mainwindow.c:2396
 msgid "Send queued message(s)"
 msgstr "임시 보관된 메시지를 보냅니다"
 
-#: src/mainwindow.c:2390
+#: src/mainwindow.c:2398
 msgid "Compose new message"
 msgstr "새 메시지를 작성합니다"
 
-#: src/mainwindow.c:2392
+#: src/mainwindow.c:2400
 msgid "Reply to the message"
 msgstr "메시지에 회신을 보냅니다"
 
-#: src/mainwindow.c:2394
+#: src/mainwindow.c:2402
 msgid "Reply to all"
 msgstr "전부에게 회신을 보냅니다"
 
-#: src/mainwindow.c:2396
+#: src/mainwindow.c:2404
 msgid "Forward the message"
 msgstr "메시지를 다른 사람에게 전달합니다"
 
-#: src/mainwindow.c:2398
+#: src/mainwindow.c:2406
 msgid "Delete the message"
 msgstr "메시지를 지웁니다"
 
-#: src/mainwindow.c:2400
+#: src/mainwindow.c:2408
 #, fuzzy
 msgid "Set as junk mail"
 msgstr "기본 계정으로 설정"
 
-#: src/mainwindow.c:2402
+#: src/mainwindow.c:2410
 msgid "Execute marked process"
 msgstr "표시된 프로세스들을 실행합니다"
 
-#: src/mainwindow.c:2404
+#: src/mainwindow.c:2412
 msgid "Next unread message"
 msgstr "다음 안 읽은 메시지를 보여줍니다"
 
-#: src/mainwindow.c:2406
+#: src/mainwindow.c:2414
 #, fuzzy
 msgid "Previous unread message"
 msgstr "다음 안 읽은 메시지를 보여줍니다"
 
-#: src/mainwindow.c:2410
+#: src/mainwindow.c:2418
 #, fuzzy
 msgid "Print message"
 msgstr "메시지 보내기"
 
-#: src/mainwindow.c:2412
+#: src/mainwindow.c:2420
 msgid "Common preferences"
 msgstr "기본적인 환경 설정"
 
-#: src/mainwindow.c:2414 src/prefs_account_dialog.c:511
+#: src/mainwindow.c:2422 src/prefs_account_dialog.c:511
 msgid "Account preferences"
 msgstr "계정 기본 설정"
 
-#: src/mainwindow.c:2779
+#: src/mainwindow.c:2788
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 
-#: src/mainwindow.c:2790
+#: src/mainwindow.c:2799
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 
-#: src/mainwindow.c:3062
+#: src/mainwindow.c:3071
 msgid "Exit"
 msgstr "끝내기"
 
-#: src/mainwindow.c:3062
+#: src/mainwindow.c:3071
 msgid "Exit this program?"
 msgstr "이 프로그램을 끝내시겠습니까?"
 
-#: src/mainwindow.c:3666
+#: src/mainwindow.c:3675
 #, fuzzy
 msgid "Command line options"
 msgstr "명령이 지정되지않음"
 
-#: src/mainwindow.c:3679
+#: src/mainwindow.c:3688
 #, fuzzy
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "사용법: %s [옵션]...\n"
 
-#: src/mainwindow.c:3687
+#: src/mainwindow.c:3696
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -3812,7 +3817,7 @@ msgid ""
 "--version"
 msgstr ""
 
-#: src/mainwindow.c:3703
+#: src/mainwindow.c:3712
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
diff --git a/po/lt.po b/po/lt.po
index 06242b0b..c2a2fa3e 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-01-31 16:49+0900\n"
+"POT-Creation-Date: 2007-01-31 17:29+0900\n"
 "PO-Revision-Date: 2005-06-09 13:51+0300\n"
 "Last-Translator: Vitalijus Valantiejus <vitalijus@users.sf.net>\n"
 "Language-Team: Lithuanian <komp_lt@konferencijos.lt>\n"
@@ -906,7 +906,7 @@ msgstr "/_Adresas/_Redaguoti"
 msgid "/_Address/_Delete"
 msgstr "/_Adresas/Išt_rinti"
 
-#: src/addressbook.c:359 src/compose.c:673 src/mainwindow.c:787
+#: src/addressbook.c:359 src/compose.c:673 src/mainwindow.c:789
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/Į_rankiai"
@@ -915,12 +915,12 @@ msgstr "/Į_rankiai"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/Į_rankiai/Importuoti _LDIF failą"
 
-#: src/addressbook.c:361 src/compose.c:694 src/mainwindow.c:841
+#: src/addressbook.c:361 src/compose.c:694 src/mainwindow.c:843
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Pagalba"
 
-#: src/addressbook.c:362 src/compose.c:695 src/mainwindow.c:853
+#: src/addressbook.c:362 src/compose.c:695 src/mainwindow.c:855
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Pagalba/_Apie"
@@ -962,7 +962,7 @@ msgstr "/_Ištrinti"
 msgid "E-Mail address"
 msgstr "El. pašto adresas"
 
-#: src/addressbook.c:496 src/compose.c:4873 src/mainwindow.c:2408
+#: src/addressbook.c:496 src/compose.c:4873 src/mainwindow.c:2416
 #: src/prefs_common_dialog.c:2274
 msgid "Address book"
 msgstr "Adresų knyga"
@@ -1177,7 +1177,7 @@ msgstr "Bendras adresas"
 msgid "Personal address"
 msgstr "Asmeninis adresas"
 
-#: src/alertpanel.c:142 src/compose.c:5717 src/main.c:638
+#: src/alertpanel.c:142 src/compose.c:5720 src/main.c:638
 msgid "Notice"
 msgstr "Pranešimas"
 
@@ -1344,9 +1344,9 @@ msgid "/_View/_Reply to"
 msgstr "/Ro_dymas/Kam _atsakyti"
 
 #: src/compose.c:578 src/compose.c:580 src/compose.c:582 src/compose.c:584
-#: src/compose.c:587 src/mainwindow.c:577 src/mainwindow.c:580
-#: src/mainwindow.c:607 src/mainwindow.c:631 src/mainwindow.c:734
-#: src/mainwindow.c:738 src/messageview.c:258
+#: src/compose.c:587 src/mainwindow.c:579 src/mainwindow.c:582
+#: src/mainwindow.c:609 src/mainwindow.c:633 src/mainwindow.c:736
+#: src/mainwindow.c:740 src/messageview.c:258
 msgid "/_View/---"
 msgstr "/Ro_dymas/---"
 
@@ -1367,7 +1367,7 @@ msgstr "/Ro_dymas/Prise_gti failai"
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/Ro_dymas/_Eiti į/Kitas ka_talogas"
 
-#: src/compose.c:593 src/mainwindow.c:638 src/messageview.c:173
+#: src/compose.c:593 src/mainwindow.c:640 src/messageview.c:173
 msgid "/_View/Character _encoding"
 msgstr "/Ro_dymas/Simbolių ko_duotė"
 
@@ -1378,113 +1378,113 @@ msgstr "/Ro_dymas/Simbolių ko_duotė/_Automatiškai"
 #: src/compose.c:596 src/compose.c:602 src/compose.c:608 src/compose.c:612
 #: src/compose.c:620 src/compose.c:624 src/compose.c:630 src/compose.c:636
 #: src/compose.c:640 src/compose.c:650 src/compose.c:654 src/compose.c:662
-#: src/compose.c:666 src/mainwindow.c:634 src/mainwindow.c:641
+#: src/compose.c:666 src/mainwindow.c:636 src/mainwindow.c:643
 #: src/messageview.c:169
 msgid "/_View/Character _encoding/---"
 msgstr "/Ro_dymas/Simbolių ko_duotė/---"
 
-#: src/compose.c:598 src/mainwindow.c:642 src/messageview.c:177
+#: src/compose.c:598 src/mainwindow.c:644 src/messageview.c:177
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/7bit ascii (US-ASC_II)"
 
-#: src/compose.c:600 src/mainwindow.c:644 src/messageview.c:180
+#: src/compose.c:600 src/mainwindow.c:646 src/messageview.c:180
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/Unikodas (_UTF-8)"
 
-#: src/compose.c:604 src/mainwindow.c:648 src/messageview.c:183
+#: src/compose.c:604 src/mainwindow.c:650 src/messageview.c:183
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/Vakarų Europos (ISO-8859-_1)"
 
-#: src/compose.c:606 src/mainwindow.c:650 src/messageview.c:185
+#: src/compose.c:606 src/mainwindow.c:652 src/messageview.c:185
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/Vakarų Europos (ISO-8859-15)"
 
-#: src/compose.c:610 src/mainwindow.c:656 src/messageview.c:190
+#: src/compose.c:610 src/mainwindow.c:658 src/messageview.c:190
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/Centrinės Europos (ISO-8859-_2)"
 
-#: src/compose.c:614 src/mainwindow.c:660 src/messageview.c:193
+#: src/compose.c:614 src/mainwindow.c:662 src/messageview.c:193
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/_Baltų (ISO-8859-13)"
 
-#: src/compose.c:616 src/mainwindow.c:662 src/messageview.c:195
+#: src/compose.c:616 src/mainwindow.c:664 src/messageview.c:195
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/Baltų (ISO-8859-_4)"
 
-#: src/compose.c:618 src/mainwindow.c:664 src/messageview.c:197
+#: src/compose.c:618 src/mainwindow.c:666 src/messageview.c:197
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/Arabų (Windows-1256)"
 
-#: src/compose.c:622 src/mainwindow.c:668 src/messageview.c:200
+#: src/compose.c:622 src/mainwindow.c:670 src/messageview.c:200
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/Graikų (ISO-8859-_7)"
 
-#: src/compose.c:626 src/mainwindow.c:672 src/messageview.c:203
+#: src/compose.c:626 src/mainwindow.c:674 src/messageview.c:203
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/Arabų (ISO-8859-_6)"
 
-#: src/compose.c:628 src/mainwindow.c:674 src/messageview.c:205
+#: src/compose.c:628 src/mainwindow.c:676 src/messageview.c:205
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/Arabų (Windows-1256)"
 
-#: src/compose.c:632 src/mainwindow.c:678 src/messageview.c:208
+#: src/compose.c:632 src/mainwindow.c:680 src/messageview.c:208
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/Hebrajų (ISO-8859-_8)"
 
-#: src/compose.c:634 src/mainwindow.c:680 src/messageview.c:210
+#: src/compose.c:634 src/mainwindow.c:682 src/messageview.c:210
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/Hebrajų (Windows-1255)"
 
-#: src/compose.c:638 src/mainwindow.c:684 src/messageview.c:213
+#: src/compose.c:638 src/mainwindow.c:686 src/messageview.c:213
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/Turkų (ISO-8859-_9)"
 
-#: src/compose.c:642 src/mainwindow.c:688 src/messageview.c:216
+#: src/compose.c:642 src/mainwindow.c:690 src/messageview.c:216
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/Kirilica (ISO-8859-_5)"
 
-#: src/compose.c:644 src/mainwindow.c:690 src/messageview.c:218
+#: src/compose.c:644 src/mainwindow.c:692 src/messageview.c:218
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/Kirilica (KOI8-_R)"
 
-#: src/compose.c:646 src/mainwindow.c:692 src/messageview.c:220
+#: src/compose.c:646 src/mainwindow.c:694 src/messageview.c:220
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/Kirilica (KOI8-U)"
 
-#: src/compose.c:648 src/mainwindow.c:694 src/messageview.c:222
+#: src/compose.c:648 src/mainwindow.c:696 src/messageview.c:222
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/Kirilica (Windows-1251)"
 
-#: src/compose.c:652 src/mainwindow.c:698 src/messageview.c:225
+#: src/compose.c:652 src/mainwindow.c:700 src/messageview.c:225
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/Japonų (ISO-2022-_JP)"
 
-#: src/compose.c:656 src/mainwindow.c:708 src/messageview.c:234
+#: src/compose.c:656 src/mainwindow.c:710 src/messageview.c:234
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/Supaprastinta Kinų (_GB2312)"
 
-#: src/compose.c:658 src/mainwindow.c:710 src/messageview.c:236
+#: src/compose.c:658 src/mainwindow.c:712 src/messageview.c:236
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/Supaprastinta Kinų (GBK)"
 
-#: src/compose.c:660 src/mainwindow.c:712 src/messageview.c:238
+#: src/compose.c:660 src/mainwindow.c:714 src/messageview.c:238
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/Tradicinė Kinų (_Big5)"
 
-#: src/compose.c:664 src/mainwindow.c:720 src/messageview.c:245
+#: src/compose.c:664 src/mainwindow.c:722 src/messageview.c:245
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/Korėjiečių (EUC-_KR)"
 
-#: src/compose.c:668 src/mainwindow.c:726 src/messageview.c:250
+#: src/compose.c:668 src/mainwindow.c:728 src/messageview.c:250
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/Tailandiečių (TIS-620)"
 
-#: src/compose.c:670 src/mainwindow.c:728 src/messageview.c:252
+#: src/compose.c:670 src/mainwindow.c:730 src/messageview.c:252
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/Tailandiečių (Windows-874)"
 
-#: src/compose.c:674 src/mainwindow.c:788 src/messageview.c:283
+#: src/compose.c:674 src/mainwindow.c:790 src/messageview.c:283
 msgid "/_Tools/_Address book"
 msgstr "/Į_rankiai/_Adresų knyga"
 
@@ -1492,13 +1492,13 @@ msgstr "/Į_rankiai/_Adresų knyga"
 msgid "/_Tools/_Template"
 msgstr "/Į_rankiai/_Šablonas"
 
-#: src/compose.c:677 src/mainwindow.c:812 src/messageview.c:299
+#: src/compose.c:677 src/mainwindow.c:814 src/messageview.c:299
 msgid "/_Tools/Actio_ns"
 msgstr "/Į_rankiai/_Veiksmai"
 
-#: src/compose.c:679 src/compose.c:683 src/compose.c:689 src/mainwindow.c:791
-#: src/mainwindow.c:805 src/mainwindow.c:810 src/mainwindow.c:813
-#: src/mainwindow.c:817 src/mainwindow.c:819 src/messageview.c:286
+#: src/compose.c:679 src/compose.c:683 src/compose.c:689 src/mainwindow.c:793
+#: src/mainwindow.c:807 src/mainwindow.c:812 src/mainwindow.c:815
+#: src/mainwindow.c:819 src/mainwindow.c:821 src/messageview.c:286
 #: src/messageview.c:298
 msgid "/_Tools/---"
 msgstr "/Į_rankiai/---"
@@ -1699,7 +1699,7 @@ msgstr "PGP parašas"
 msgid "PGP Encrypt"
 msgstr "PGP šifravimas"
 
-#: src/compose.c:4442 src/compose.c:5543
+#: src/compose.c:4442 src/compose.c:5546
 msgid "MIME type"
 msgstr "MIME tipas"
 
@@ -1741,36 +1741,36 @@ msgstr "Naudoti išorinį redaktorių"
 msgid "Wrap all long lines"
 msgstr "Laužyti ilgas eilutes"
 
-#: src/compose.c:5439
+#: src/compose.c:5442
 msgid "Invalid MIME type."
 msgstr "Neteisingas MIME tipas."
 
-#: src/compose.c:5457
+#: src/compose.c:5460
 msgid "File doesn't exist or is empty."
 msgstr "Failas neegzistuoja arba yra tuščias."
 
-#: src/compose.c:5525
+#: src/compose.c:5528
 msgid "Properties"
 msgstr "Savybės"
 
-#: src/compose.c:5545 src/prefs_common_dialog.c:1504
+#: src/compose.c:5548 src/prefs_common_dialog.c:1504
 msgid "Encoding"
 msgstr "Koduotė"
 
-#: src/compose.c:5568 src/prefs_folder_item.c:202
+#: src/compose.c:5571 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Kelias"
 
-#: src/compose.c:5569
+#: src/compose.c:5572
 msgid "File name"
 msgstr "Failo vardas"
 
-#: src/compose.c:5659
+#: src/compose.c:5662
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Neteisinga išorinio redaktoriaus komanda: „%s“\n"
 
-#: src/compose.c:5714
+#: src/compose.c:5717
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1779,48 +1779,48 @@ msgstr ""
 "Išorinis redaktorius vis dar veikia.\n"
 "Nutraukti procesą? (pid: %d)\n"
 
-#: src/compose.c:6040 src/mainwindow.c:2752
+#: src/compose.c:6043 src/mainwindow.c:2761
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:6156 src/compose.c:6161 src/compose.c:6167
+#: src/compose.c:6159 src/compose.c:6164 src/compose.c:6170
 msgid "Can't queue the message."
 msgstr "Negaliu įdėti laiško į eilę."
 
-#: src/compose.c:6258
+#: src/compose.c:6261
 msgid "Select files"
 msgstr "Žymėti failus"
 
-#: src/compose.c:6281
+#: src/compose.c:6284
 msgid "Select file"
 msgstr "Žymėti failą"
 
-#: src/compose.c:6316
+#: src/compose.c:6319
 msgid "Save message"
 msgstr "Išsaugoti laišką"
 
-#: src/compose.c:6317
+#: src/compose.c:6320
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Laiškas buvo redaguotas. Saugoti „Juodraščiuose“?"
 
-#: src/compose.c:6319
+#: src/compose.c:6322
 msgid "Close _without saving"
 msgstr "Uždaryti _neišsaugant"
 
-#: src/compose.c:6361
+#: src/compose.c:6364
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Ar norite naudoti šabloną „%s“?"
 
-#: src/compose.c:6363
+#: src/compose.c:6366
 msgid "Apply template"
 msgstr "Naudoti šabloną"
 
-#: src/compose.c:6364
+#: src/compose.c:6367
 msgid "_Replace"
 msgstr "_Pakeisti"
 
-#: src/compose.c:6364
+#: src/compose.c:6367
 msgid "_Insert"
 msgstr "Įterpt_i"
 
@@ -2275,12 +2275,12 @@ msgstr "Nustatoma katalogo informacija...\n"
 msgid "Setting folder info..."
 msgstr "Nustatoma katalogo informacija..."
 
-#: src/folderview.c:868 src/mainwindow.c:3748 src/setup.c:80
+#: src/folderview.c:868 src/mainwindow.c:3757 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Skanuojamas katalogas “%s%c%s“..."
 
-#: src/folderview.c:872 src/mainwindow.c:3753 src/setup.c:85
+#: src/folderview.c:872 src/mainwindow.c:3762 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Skanuojamas katalogas „%s“..."
@@ -3041,536 +3041,541 @@ msgstr ""
 "/Ro_dymas/Ro_dyti arba paslėpti/Į_rankių juosta/Piktogr_amos ir tekstas"
 
 #: src/mainwindow.c:566
-msgid "/_View/Show or hi_de/_Toolbar/_Icon"
+#, fuzzy
+msgid "/_View/Show or hi_de/_Toolbar/Text at the _right of icon"
 msgstr "/Ro_dymas/Ro_dyti arba paslėpti/Į_rankių juosta/P_iktogramos"
 
 #: src/mainwindow.c:568
+msgid "/_View/Show or hi_de/_Toolbar/_Icon"
+msgstr "/Ro_dymas/Ro_dyti arba paslėpti/Į_rankių juosta/P_iktogramos"
+
+#: src/mainwindow.c:570
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/Ro_dymas/Ro_dyti arba paslėpti/Į_rankių juosta/_Tekstas"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:572
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/Ro_dymas/Ro_dyti arba paslėpti/Į_rankių juosta/_Nieko"
 
-#: src/mainwindow.c:572
+#: src/mainwindow.c:574
 msgid "/_View/Show or hi_de/_Search bar"
 msgstr "/Ro_dymas/Ro_dyti arba paslėpti/_Paieškos juosta"
 
-#: src/mainwindow.c:574
+#: src/mainwindow.c:576
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/Ro_dymas/Ro_dyti arba paslėpti/_Būsenos juosta"
 
-#: src/mainwindow.c:576
+#: src/mainwindow.c:578
 #, fuzzy
 msgid "/_View/_Customize toolbar..."
 msgstr "/Ro_dymas/_Eiti į/Kitas ka_talogas"
 
-#: src/mainwindow.c:578
+#: src/mainwindow.c:580
 msgid "/_View/Separate f_older tree"
 msgstr "/Ro_dymas/Atskirti _katalogų medį"
 
-#: src/mainwindow.c:579
+#: src/mainwindow.c:581
 msgid "/_View/Separate _message view"
 msgstr "/Ro_dymas/Atskirti žin_utės peržiūrą"
 
-#: src/mainwindow.c:581
+#: src/mainwindow.c:583
 msgid "/_View/_Sort"
 msgstr "/Ro_dymas/_Rikiuoti"
 
-#: src/mainwindow.c:582
+#: src/mainwindow.c:584
 msgid "/_View/_Sort/by _number"
 msgstr "/Ro_dymas/_Rikiuoti/pagal _numerį"
 
-#: src/mainwindow.c:583
+#: src/mainwindow.c:585
 msgid "/_View/_Sort/by s_ize"
 msgstr "/Ro_dymas/_Rikiuoti/pagal _dydį"
 
-#: src/mainwindow.c:584
+#: src/mainwindow.c:586
 msgid "/_View/_Sort/by _date"
 msgstr "/Ro_dymas/_Rikiuoti/pagal d_atą"
 
-#: src/mainwindow.c:585
+#: src/mainwindow.c:587
 msgid "/_View/_Sort/by t_hread date"
 msgstr "/Ro_dymas/_Rikiuoti/pagal gi_jos datą"
 
-#: src/mainwindow.c:586
+#: src/mainwindow.c:588
 msgid "/_View/_Sort/by _from"
 msgstr "/Ro_dymas/_Rikiuoti/pagal _siuntėją"
 
-#: src/mainwindow.c:587
+#: src/mainwindow.c:589
 msgid "/_View/_Sort/by _recipient"
 msgstr "/Ro_dymas/_Rikiuoti/pagal _gavėją"
 
-#: src/mainwindow.c:588
+#: src/mainwindow.c:590
 msgid "/_View/_Sort/by _subject"
 msgstr "/Ro_dymas/_Rikiuoti/pagal _temą"
 
-#: src/mainwindow.c:589
+#: src/mainwindow.c:591
 msgid "/_View/_Sort/by _color label"
 msgstr "/Ro_dymas/_Rikiuoti/pagal _spalvos etiketę"
 
-#: src/mainwindow.c:591
+#: src/mainwindow.c:593
 msgid "/_View/_Sort/by _mark"
 msgstr "/Ro_dymas/_Rikiuoti/pagal ž_ymę"
 
-#: src/mainwindow.c:592
+#: src/mainwindow.c:594
 msgid "/_View/_Sort/by _unread"
 msgstr "/Ro_dymas/_Rikiuoti/pagal ne_skaitytus"
 
-#: src/mainwindow.c:593
+#: src/mainwindow.c:595
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/Ro_dymas/_Rikiuoti/pagal _priedą"
 
-#: src/mainwindow.c:595
+#: src/mainwindow.c:597
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/Ro_dymas/_Rikiuoti/Ne_rikiuoti"
 
-#: src/mainwindow.c:596 src/mainwindow.c:599
+#: src/mainwindow.c:598 src/mainwindow.c:601
 msgid "/_View/_Sort/---"
 msgstr "/Ro_dymas/_Rikiuoti/---"
 
-#: src/mainwindow.c:597
+#: src/mainwindow.c:599
 msgid "/_View/_Sort/Ascending"
 msgstr "/Ro_dymas/_Rikiuoti/_Didėjimo tvarka"
 
-#: src/mainwindow.c:598
+#: src/mainwindow.c:600
 msgid "/_View/_Sort/Descending"
 msgstr "/Ro_dymas/_Rikiuoti/_Mažėjimo tvarka"
 
-#: src/mainwindow.c:600
+#: src/mainwindow.c:602
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/Ro_dymas/_Rikiuoti/P_agal temą"
 
-#: src/mainwindow.c:602
+#: src/mainwindow.c:604
 msgid "/_View/Th_read view"
 msgstr "/Ro_dymas/_Gijų peržiūra"
 
-#: src/mainwindow.c:603
+#: src/mainwindow.c:605
 msgid "/_View/E_xpand all threads"
 msgstr "/Ro_dymas/Iš_skleisti visas gijas"
 
-#: src/mainwindow.c:604
+#: src/mainwindow.c:606
 msgid "/_View/Co_llapse all threads"
 msgstr "/Ro_dymas/Su_traukti visas gijas"
 
-#: src/mainwindow.c:605
+#: src/mainwindow.c:607
 msgid "/_View/Set display _item..."
 msgstr "/Ro_dymas/Nustatyt_i rodomus laukus"
 
-#: src/mainwindow.c:608
+#: src/mainwindow.c:610
 msgid "/_View/_Go to"
 msgstr "/Ro_dymas/_Eiti į"
 
-#: src/mainwindow.c:609
+#: src/mainwindow.c:611
 msgid "/_View/_Go to/_Prev message"
 msgstr "/Ro_dymas/_Eiti į/_Ankstesnis laiškas"
 
-#: src/mainwindow.c:610
+#: src/mainwindow.c:612
 msgid "/_View/_Go to/_Next message"
 msgstr "/Ro_dymas/_Eiti į/_Kitas laiškas"
 
-#: src/mainwindow.c:611 src/mainwindow.c:616 src/mainwindow.c:619
-#: src/mainwindow.c:624 src/mainwindow.c:629
+#: src/mainwindow.c:613 src/mainwindow.c:618 src/mainwindow.c:621
+#: src/mainwindow.c:626 src/mainwindow.c:631
 msgid "/_View/_Go to/---"
 msgstr "/Ro_dymas/_Eiti į/---"
 
-#: src/mainwindow.c:612
+#: src/mainwindow.c:614
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/Ro_dymas/_Eiti į/Ankstesnis neskaitytas laiškas"
 
-#: src/mainwindow.c:614
+#: src/mainwindow.c:616
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/Ro_dymas/_Eiti į/Kitas neskaitytas laiškas"
 
-#: src/mainwindow.c:617
+#: src/mainwindow.c:619
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/Ro_dymas/_Eiti į/Ankstesnis naujas laiškas"
 
-#: src/mainwindow.c:618
+#: src/mainwindow.c:620
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/Ro_dymas/_Eiti į/Kitas naujas laiškas"
 
-#: src/mainwindow.c:620
+#: src/mainwindow.c:622
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/Ro_dymas/_Eiti į/Ankstesnis pažymėtas laiškas"
 
-#: src/mainwindow.c:622
+#: src/mainwindow.c:624
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/Ro_dymas/_Eiti į/Kitas pažymėtas laiškas"
 
-#: src/mainwindow.c:625
+#: src/mainwindow.c:627
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/Ro_dymas/_Eiti į/Ankstesnis laiškas su etikete"
 
-#: src/mainwindow.c:627
+#: src/mainwindow.c:629
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/Ro_dymas/_Eiti į/Kitas laiškas su etikete"
 
-#: src/mainwindow.c:630
+#: src/mainwindow.c:632
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/Ro_dymas/_Eiti į/Kitas ka_talogas"
 
-#: src/mainwindow.c:639 src/messageview.c:174
+#: src/mainwindow.c:641 src/messageview.c:174
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/Ro_dymas/Simbolių ko_duotė/_Automatiškai"
 
-#: src/mainwindow.c:652 src/messageview.c:187
+#: src/mainwindow.c:654 src/messageview.c:187
 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/Vakarų Europos (Windows-1252)"
 
-#: src/mainwindow.c:700 src/messageview.c:227
+#: src/mainwindow.c:702 src/messageview.c:227
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/Japonų (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:702 src/messageview.c:229
+#: src/mainwindow.c:704 src/messageview.c:229
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/Japonų (_EUC-JP)"
 
-#: src/mainwindow.c:704 src/messageview.c:231
+#: src/mainwindow.c:706 src/messageview.c:231
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/Japonų (_Shift__JIS)"
 
-#: src/mainwindow.c:714 src/messageview.c:240
+#: src/mainwindow.c:716 src/messageview.c:240
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/Tradicinė Kinų (EUC-_TW)"
 
-#: src/mainwindow.c:716 src/messageview.c:242
+#: src/mainwindow.c:718 src/messageview.c:242
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/Kinų (ISO-2022-_CN)"
 
-#: src/mainwindow.c:722 src/messageview.c:247
+#: src/mainwindow.c:724 src/messageview.c:247
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/Korėjiečių (ISO-2022-KR)"
 
-#: src/mainwindow.c:735 src/summaryview.c:464
+#: src/mainwindow.c:737 src/summaryview.c:464
 msgid "/_View/Open in new _window"
 msgstr "/Ro_dymas/Atverti naujame _lange"
 
-#: src/mainwindow.c:736 src/messageview.c:259 src/summaryview.c:466
+#: src/mainwindow.c:738 src/messageview.c:259 src/summaryview.c:466
 msgid "/_View/Mess_age source"
 msgstr "/Ro_dymas/Laiško pr_adinis tekstas"
 
-#: src/mainwindow.c:737 src/messageview.c:260 src/summaryview.c:467
+#: src/mainwindow.c:739 src/messageview.c:260 src/summaryview.c:467
 #, fuzzy
 msgid "/_View/All _headers"
 msgstr "/Ro_dymas/_Visos antraštės"
 
-#: src/mainwindow.c:739
+#: src/mainwindow.c:741
 msgid "/_View/_Update summary"
 msgstr "/Ro_dymas/Atna_ujinti santrauką"
 
-#: src/mainwindow.c:741 src/messageview.c:263
+#: src/mainwindow.c:743 src/messageview.c:263
 msgid "/_Message"
 msgstr "/_Laiškas"
 
-#: src/mainwindow.c:742
+#: src/mainwindow.c:744
 msgid "/_Message/Recei_ve"
 msgstr "/_Laiškas/_Gauti"
 
-#: src/mainwindow.c:743
+#: src/mainwindow.c:745
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/_Laiškas/_Gauti/Gauti iš _esamos sąskaitos"
 
-#: src/mainwindow.c:745
+#: src/mainwindow.c:747
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/_Laiškas/_Gauti/Gauti iš _visų sąskaitų"
 
-#: src/mainwindow.c:747
+#: src/mainwindow.c:749
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/_Laiškas/_Gauti/_Nutraukti gavimą"
 
-#: src/mainwindow.c:749
+#: src/mainwindow.c:751
 msgid "/_Message/Recei_ve/---"
 msgstr "/_Laiškas/_Gauti/---"
 
-#: src/mainwindow.c:750
+#: src/mainwindow.c:752
 msgid "/_Message/_Send queued messages"
 msgstr "/_Laiškas/_Siųsti laiškus eilėje"
 
-#: src/mainwindow.c:751 src/mainwindow.c:753 src/mainwindow.c:760
-#: src/mainwindow.c:765 src/mainwindow.c:768 src/mainwindow.c:779
-#: src/mainwindow.c:781 src/mainwindow.c:784 src/messageview.c:266
+#: src/mainwindow.c:753 src/mainwindow.c:755 src/mainwindow.c:762
+#: src/mainwindow.c:767 src/mainwindow.c:770 src/mainwindow.c:781
+#: src/mainwindow.c:783 src/mainwindow.c:786 src/messageview.c:266
 #: src/messageview.c:274 src/messageview.c:279
 msgid "/_Message/---"
 msgstr "/_Laiškas/---"
 
-#: src/mainwindow.c:752 src/messageview.c:264
+#: src/mainwindow.c:754 src/messageview.c:264
 msgid "/_Message/Compose _new message"
 msgstr "/_Laiškas/Rašyti _naują"
 
-#: src/mainwindow.c:754 src/messageview.c:267
+#: src/mainwindow.c:756 src/messageview.c:267
 msgid "/_Message/_Reply"
 msgstr "/_Laiškas/_Atsakyti"
 
-#: src/mainwindow.c:755
+#: src/mainwindow.c:757
 msgid "/_Message/Repl_y to"
 msgstr "/_Laiškas/Atsak_yti kam"
 
-#: src/mainwindow.c:756 src/messageview.c:268
+#: src/mainwindow.c:758 src/messageview.c:268
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Laiškas/Atsak_yti kam/_visiems"
 
-#: src/mainwindow.c:757 src/messageview.c:270
+#: src/mainwindow.c:759 src/messageview.c:270
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Laiškas/Atsak_yti kam/_siuntėjui"
 
-#: src/mainwindow.c:758 src/messageview.c:272
+#: src/mainwindow.c:760 src/messageview.c:272
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Laiškas/Atsak_yti kam/pašto _konferencijai"
 
-#: src/mainwindow.c:761 src/messageview.c:275
+#: src/mainwindow.c:763 src/messageview.c:275
 msgid "/_Message/_Forward"
 msgstr "/_Laiškas/_Persiųsti"
 
-#: src/mainwindow.c:762 src/messageview.c:276
+#: src/mainwindow.c:764 src/messageview.c:276
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Laiškas/Persiųsti kaip p_riedą"
 
-#: src/mainwindow.c:764 src/messageview.c:278
+#: src/mainwindow.c:766 src/messageview.c:278
 msgid "/_Message/Redirec_t"
 msgstr "/_Laiškas/Nukreip_ti"
 
-#: src/mainwindow.c:766
+#: src/mainwindow.c:768
 msgid "/_Message/M_ove..."
 msgstr "/_Laiškas/Per_kelti..."
 
-#: src/mainwindow.c:767
+#: src/mainwindow.c:769
 msgid "/_Message/_Copy..."
 msgstr "/_Laiškas/K_opijuoti..."
 
-#: src/mainwindow.c:769
+#: src/mainwindow.c:771
 msgid "/_Message/_Mark"
 msgstr "/_Laiškas/Žy_ma"
 
-#: src/mainwindow.c:770
+#: src/mainwindow.c:772
 msgid "/_Message/_Mark/_Mark"
 msgstr "/_Laiškas/Žy_ma/Pažy_mėti"
 
-#: src/mainwindow.c:771
+#: src/mainwindow.c:773
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/_Laiškas/Žy_ma/_Nežymėti"
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:774
 msgid "/_Message/_Mark/---"
 msgstr "/_Laiškas/Žy_ma/---"
 
-#: src/mainwindow.c:773
+#: src/mainwindow.c:775
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/_Laiškas/Žy_ma/Ne_skaitytas"
 
-#: src/mainwindow.c:774
+#: src/mainwindow.c:776
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/_Laiškas/Žy_ma/Skai_tytas"
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:778
 msgid "/_Message/_Mark/Mark _thread as read"
 msgstr "/_Laiškas/Žy_ma/Skai_tyta gija"
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:780
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/_Laiškas/Žy_ma/Skaityti _visi"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:782
 msgid "/_Message/_Delete"
 msgstr "/_Laiškas/_Trinti"
 
-#: src/mainwindow.c:782
+#: src/mainwindow.c:784
 msgid "/_Message/Set as _junk mail"
 msgstr "/_Laiškas/Pažymėti kaip nereikalingą"
 
-#: src/mainwindow.c:783
+#: src/mainwindow.c:785
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/_Laiškas/Pažymėti kaip reikalingą"
 
-#: src/mainwindow.c:785 src/messageview.c:280
+#: src/mainwindow.c:787 src/messageview.c:280
 msgid "/_Message/Re-_edit"
 msgstr "/_Message/P_ertaisyti"
 
-#: src/mainwindow.c:789
+#: src/mainwindow.c:791
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/Į_rankiai/Įrašyti siuntėją į adresų _knygą"
 
-#: src/mainwindow.c:792
+#: src/mainwindow.c:794
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/Į_rankiai/_Filtruoti laiškus kataloge"
 
-#: src/mainwindow.c:794
+#: src/mainwindow.c:796
 msgid "/_Tools/Filter _selected messages"
 msgstr "/Į_rankiai/Filtruoti pa_sirinktus laiškus"
 
-#: src/mainwindow.c:796 src/messageview.c:287
+#: src/mainwindow.c:798 src/messageview.c:287
 msgid "/_Tools/_Create filter rule"
 msgstr "/Į_rankiai/Sukurti filtravimo _taisyklę"
 
-#: src/mainwindow.c:797 src/messageview.c:289
+#: src/mainwindow.c:799 src/messageview.c:289
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/Į_rankiai/Sukurti filtravimo _taisyklę/_Automatiškai"
 
-#: src/mainwindow.c:799 src/messageview.c:291
+#: src/mainwindow.c:801 src/messageview.c:291
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/Į_rankiai/Sukurti filtravimo _taisyklę/pagal _Siuntėją"
 
-#: src/mainwindow.c:801 src/messageview.c:293
+#: src/mainwindow.c:803 src/messageview.c:293
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/Į_rankiai/Sukurti filtravimo _taisyklę/pagal _Gavėją"
 
-#: src/mainwindow.c:803 src/messageview.c:295
+#: src/mainwindow.c:805 src/messageview.c:295
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/Į_rankiai/Sukurti filtravimo _taisyklę/pagal _Temą"
 
-#: src/mainwindow.c:806
+#: src/mainwindow.c:808
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/Į_rankiai/_Filtruoti nereikalingą paštą kataloge"
 
-#: src/mainwindow.c:808
+#: src/mainwindow.c:810
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/Į_rankiai/Filtruoti nereikalingus tarp pa_sirinktų laiškų"
 
-#: src/mainwindow.c:815
+#: src/mainwindow.c:817
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/Į_rankiai/Ištrinti _vienodus laiškus"
 
-#: src/mainwindow.c:818
+#: src/mainwindow.c:820
 #, fuzzy
 msgid "/_Tools/E_xecute marked process"
 msgstr "Vykdyti pažymėtus procesus"
 
-#: src/mainwindow.c:820
+#: src/mainwindow.c:822
 msgid "/_Tools/_Log window"
 msgstr "/Į_rankiai/„_Log“ langas"
 
-#: src/mainwindow.c:822
+#: src/mainwindow.c:824
 msgid "/_Configuration"
 msgstr "/_Nustatymai"
 
-#: src/mainwindow.c:823
+#: src/mainwindow.c:825
 msgid "/_Configuration/_Common preferences..."
 msgstr "/_Nustatymai/Bendri _nustatymai..."
 
-#: src/mainwindow.c:825
+#: src/mainwindow.c:827
 msgid "/_Configuration/_Filter setting..."
 msgstr "/_Nustatymai/_Filtro nustatymai..."
 
-#: src/mainwindow.c:827
+#: src/mainwindow.c:829
 msgid "/_Configuration/_Template..."
 msgstr "/_Nustatymai/Ša_blonai..."
 
-#: src/mainwindow.c:829
+#: src/mainwindow.c:831
 msgid "/_Configuration/_Actions..."
 msgstr "/_Nustatymai/Veiksm_ai..."
 
-#: src/mainwindow.c:831
+#: src/mainwindow.c:833
 msgid "/_Configuration/---"
 msgstr "/_Nustatymai/---"
 
-#: src/mainwindow.c:832
+#: src/mainwindow.c:834
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Nustatymai/_Esamos sąskaitos nustatymai"
 
-#: src/mainwindow.c:834
+#: src/mainwindow.c:836
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Nustatymai/Sukurti _naują sąskaitą..."
 
-#: src/mainwindow.c:836
+#: src/mainwindow.c:838
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Nustatymai/R_edaguoti sąskaitas..."
 
-#: src/mainwindow.c:838
+#: src/mainwindow.c:840
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Nustatymai/Keisti esamą sąskaitą"
 
-#: src/mainwindow.c:842
+#: src/mainwindow.c:844
 msgid "/_Help/_Manual"
 msgstr "/_Pagalba/_Instrukcija"
 
-#: src/mainwindow.c:843
+#: src/mainwindow.c:845
 msgid "/_Help/_Manual/_English"
 msgstr "/_Pagalba/_Instrukcija/_English"
 
-#: src/mainwindow.c:844
+#: src/mainwindow.c:846
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/_Pagalba/_Instrukcija/_Japanese"
 
-#: src/mainwindow.c:845
+#: src/mainwindow.c:847
 msgid "/_Help/_FAQ"
 msgstr "/_Pagalba/_DUK"
 
-#: src/mainwindow.c:846
+#: src/mainwindow.c:848
 msgid "/_Help/_FAQ/_English"
 msgstr "/_Pagalba/_DUK/_English"
 
-#: src/mainwindow.c:847
+#: src/mainwindow.c:849
 msgid "/_Help/_FAQ/_German"
 msgstr "/_Pagalba/_DUK/_German"
 
-#: src/mainwindow.c:848
+#: src/mainwindow.c:850
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/_Pagalba/_DUK/_Spanish"
 
-#: src/mainwindow.c:849
+#: src/mainwindow.c:851
 msgid "/_Help/_FAQ/_French"
 msgstr "/_Pagalba/_DUK/_French"
 
-#: src/mainwindow.c:850
+#: src/mainwindow.c:852
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/_Pagalba/_DUK/_Italian"
 
-#: src/mainwindow.c:851
+#: src/mainwindow.c:853
 msgid "/_Help/_Command line options"
 msgstr "/_Pagalba/_Komandinės eilutės parametrai"
 
-#: src/mainwindow.c:852
+#: src/mainwindow.c:854
 msgid "/_Help/---"
 msgstr "/_Pagalba/---"
 
-#: src/mainwindow.c:895
+#: src/mainwindow.c:897
 msgid "Creating main window...\n"
 msgstr "Kuriamas pagrindinis langas..\n"
 
-#: src/mainwindow.c:1071
+#: src/mainwindow.c:1073
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "MainWindow: nepavyko spalvos priskyrimas %d\n"
 
-#: src/mainwindow.c:1175 src/summaryview.c:2387 src/summaryview.c:2472
+#: src/mainwindow.c:1181 src/summaryview.c:2387 src/summaryview.c:2472
 #: src/summaryview.c:4009 src/summaryview.c:4138 src/summaryview.c:4507
 msgid "done.\n"
 msgstr "atlikta.\n"
 
-#: src/mainwindow.c:1293 src/mainwindow.c:1334 src/mainwindow.c:1359
+#: src/mainwindow.c:1299 src/mainwindow.c:1340 src/mainwindow.c:1365
 msgid "Untitled"
 msgstr "Bevardis"
 
-#: src/mainwindow.c:1360
+#: src/mainwindow.c:1366
 msgid "none"
 msgstr "nieko"
 
-#: src/mainwindow.c:1413
+#: src/mainwindow.c:1419
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "Keičiamas lango dalijimo tipas iš %d į %d\n"
 
-#: src/mainwindow.c:1663
+#: src/mainwindow.c:1669
 msgid "Offline"
 msgstr "Atsijungęs"
 
-#: src/mainwindow.c:1664
+#: src/mainwindow.c:1670
 msgid "You are offline. Go online?"
 msgstr "Jūs esate atsijungęs. Prisijungti?"
 
-#: src/mainwindow.c:1681
+#: src/mainwindow.c:1687
 msgid "Empty all trash"
 msgstr "Išvalyti visas šiukšlines"
 
-#: src/mainwindow.c:1682
+#: src/mainwindow.c:1688
 msgid "Delete all messages in trash folders?"
 msgstr "Ištrinti visus laiškus šiukšlinėje?"
 
-#: src/mainwindow.c:1712
+#: src/mainwindow.c:1718
 msgid "Add mailbox"
 msgstr "Pridėti dėžutę"
 
-#: src/mainwindow.c:1713
+#: src/mainwindow.c:1719
 msgid ""
 "Specify the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3580,16 +3585,16 @@ msgstr ""
 "Jeigu ji egzistuoja, ji bus\n"
 "nuskaityta automatiškai."
 
-#: src/mainwindow.c:1719 src/setup.c:49
+#: src/mainwindow.c:1725 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Dėžutė „%s“ egzistuoja."
 
-#: src/mainwindow.c:1724 src/setup.c:56
+#: src/mainwindow.c:1730 src/setup.c:56
 msgid "Mailbox"
 msgstr "Dėžutė"
 
-#: src/mainwindow.c:1730 src/setup.c:62
+#: src/mainwindow.c:1736 src/setup.c:62
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3598,129 +3603,129 @@ msgstr ""
 "Nepavyko sukurti dėžutės.\n"
 "Galbūt kai kurie failai jau egzistuoja arba jūs neturite leidimo rašyti ten."
 
-#: src/mainwindow.c:2198
+#: src/mainwindow.c:2206
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Katalogų peržiūra"
 
-#: src/mainwindow.c:2217
+#: src/mainwindow.c:2225
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Laiško peržiūra"
 
-#: src/mainwindow.c:2369 src/summaryview.c:418
+#: src/mainwindow.c:2377 src/summaryview.c:418
 msgid "/_Reply"
 msgstr "/_Atsakyti"
 
-#: src/mainwindow.c:2370
+#: src/mainwindow.c:2378
 msgid "/Reply to _all"
 msgstr "/Atsakyti _visiems"
 
-#: src/mainwindow.c:2371
+#: src/mainwindow.c:2379
 msgid "/Reply to _sender"
 msgstr "/Atsakyti _siuntėjui"
 
-#: src/mainwindow.c:2372
+#: src/mainwindow.c:2380
 msgid "/Reply to mailing _list"
 msgstr "/Atsakyti _konferencijai"
 
-#: src/mainwindow.c:2377 src/summaryview.c:425
+#: src/mainwindow.c:2385 src/summaryview.c:425
 msgid "/_Forward"
 msgstr "/_Persiųsti"
 
-#: src/mainwindow.c:2378 src/summaryview.c:426
+#: src/mainwindow.c:2386 src/summaryview.c:426
 msgid "/For_ward as attachment"
 msgstr "/Pe_rsiųsti kaip priedą"
 
-#: src/mainwindow.c:2379 src/summaryview.c:427
+#: src/mainwindow.c:2387 src/summaryview.c:427
 msgid "/Redirec_t"
 msgstr "/Nukreip_ti"
 
-#: src/mainwindow.c:2384
+#: src/mainwindow.c:2392
 msgid "Incorporate new mail"
 msgstr "Prijungti naują paštą"
 
-#: src/mainwindow.c:2386
+#: src/mainwindow.c:2394
 msgid "Incorporate new mail of all accounts"
 msgstr "Prijungti naują visų sąskaitų paštą"
 
-#: src/mainwindow.c:2388
+#: src/mainwindow.c:2396
 msgid "Send queued message(s)"
 msgstr "Siųsti laiškus eilėje"
 
-#: src/mainwindow.c:2390
+#: src/mainwindow.c:2398
 msgid "Compose new message"
 msgstr "Rašyti naują laišką"
 
-#: src/mainwindow.c:2392
+#: src/mainwindow.c:2400
 msgid "Reply to the message"
 msgstr "Atsakyti į laišką"
 
-#: src/mainwindow.c:2394
+#: src/mainwindow.c:2402
 msgid "Reply to all"
 msgstr "Atsakyti į visus"
 
-#: src/mainwindow.c:2396
+#: src/mainwindow.c:2404
 msgid "Forward the message"
 msgstr "Persiųsti laišką"
 
-#: src/mainwindow.c:2398
+#: src/mainwindow.c:2406
 msgid "Delete the message"
 msgstr "Ištrinti laišką"
 
-#: src/mainwindow.c:2400
+#: src/mainwindow.c:2408
 msgid "Set as junk mail"
 msgstr "Pažymėti kaip nereikalingą"
 
-#: src/mainwindow.c:2402
+#: src/mainwindow.c:2410
 msgid "Execute marked process"
 msgstr "Vykdyti pažymėtus procesus"
 
-#: src/mainwindow.c:2404
+#: src/mainwindow.c:2412
 msgid "Next unread message"
 msgstr "Kitas neskaitytas laiškas"
 
-#: src/mainwindow.c:2406
+#: src/mainwindow.c:2414
 #, fuzzy
 msgid "Previous unread message"
 msgstr "Kitas neskaitytas laiškas"
 
-#: src/mainwindow.c:2410
+#: src/mainwindow.c:2418
 #, fuzzy
 msgid "Print message"
 msgstr "Siųsti laišką"
 
-#: src/mainwindow.c:2412
+#: src/mainwindow.c:2420
 msgid "Common preferences"
 msgstr "Bendri nustatymai"
 
-#: src/mainwindow.c:2414 src/prefs_account_dialog.c:511
+#: src/mainwindow.c:2422 src/prefs_account_dialog.c:511
 msgid "Account preferences"
 msgstr "Sąskaitos nustatymai"
 
-#: src/mainwindow.c:2779
+#: src/mainwindow.c:2788
 msgid "You are offline. Click the icon to go online."
 msgstr "Jūs esate atsijungęs. Spustelkite piktogramą jei norite prisijungti."
 
-#: src/mainwindow.c:2790
+#: src/mainwindow.c:2799
 msgid "You are online. Click the icon to go offline."
 msgstr "Jūs esate prisijungęs. Spustelkite piktogramą jei norite atsijungti."
 
-#: src/mainwindow.c:3062
+#: src/mainwindow.c:3071
 msgid "Exit"
 msgstr "Išeiti"
 
-#: src/mainwindow.c:3062
+#: src/mainwindow.c:3071
 msgid "Exit this program?"
 msgstr "Užverti programą?"
 
-#: src/mainwindow.c:3666
+#: src/mainwindow.c:3675
 msgid "Command line options"
 msgstr "Komandinės eilutės parametrai"
 
-#: src/mainwindow.c:3679
+#: src/mainwindow.c:3688
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Naudojimas: sylpheed [PARAMETRAI]..."
 
-#: src/mainwindow.c:3687
+#: src/mainwindow.c:3696
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -3748,7 +3753,7 @@ msgstr ""
 "--help\n"
 "--version"
 
-#: src/mainwindow.c:3703
+#: src/mainwindow.c:3712
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
diff --git a/po/nl.po b/po/nl.po
index 251a9632..e4e22ee1 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed 0.8\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-01-31 16:49+0900\n"
+"POT-Creation-Date: 2007-01-31 17:29+0900\n"
 "PO-Revision-Date: 2006-04-30 01:11+0100\n"
 "Last-Translator: Vincent van Adrighem <adrighem@gnome.org>\n"
 "Language-Team: Dutch <vertaling@nl.linux.rg>\n"
@@ -914,7 +914,7 @@ msgstr "/_Adres/_Bewerken"
 msgid "/_Address/_Delete"
 msgstr "/_Adres/_Verwijderen"
 
-#: src/addressbook.c:359 src/compose.c:673 src/mainwindow.c:787
+#: src/addressbook.c:359 src/compose.c:673 src/mainwindow.c:789
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Gereedschap"
@@ -923,12 +923,12 @@ msgstr "/_Gereedschap"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Gereedschap/_LDIF bestand importeren"
 
-#: src/addressbook.c:361 src/compose.c:694 src/mainwindow.c:841
+#: src/addressbook.c:361 src/compose.c:694 src/mainwindow.c:843
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Hulp"
 
-#: src/addressbook.c:362 src/compose.c:695 src/mainwindow.c:853
+#: src/addressbook.c:362 src/compose.c:695 src/mainwindow.c:855
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Hulp/_Info"
@@ -970,7 +970,7 @@ msgstr "/Ver_wijderen"
 msgid "E-Mail address"
 msgstr "E-mail adres"
 
-#: src/addressbook.c:496 src/compose.c:4873 src/mainwindow.c:2408
+#: src/addressbook.c:496 src/compose.c:4873 src/mainwindow.c:2416
 #: src/prefs_common_dialog.c:2274
 msgid "Address book"
 msgstr "Adresboek"
@@ -1188,7 +1188,7 @@ msgstr "Algemene adressen"
 msgid "Personal address"
 msgstr "Persoonlijke adressen"
 
-#: src/alertpanel.c:142 src/compose.c:5717 src/main.c:638
+#: src/alertpanel.c:142 src/compose.c:5720 src/main.c:638
 msgid "Notice"
 msgstr "Bericht"
 
@@ -1355,9 +1355,9 @@ msgid "/_View/_Reply to"
 msgstr "/Beel_d/Ant_woord naar"
 
 #: src/compose.c:578 src/compose.c:580 src/compose.c:582 src/compose.c:584
-#: src/compose.c:587 src/mainwindow.c:577 src/mainwindow.c:580
-#: src/mainwindow.c:607 src/mainwindow.c:631 src/mainwindow.c:734
-#: src/mainwindow.c:738 src/messageview.c:258
+#: src/compose.c:587 src/mainwindow.c:579 src/mainwindow.c:582
+#: src/mainwindow.c:609 src/mainwindow.c:633 src/mainwindow.c:736
+#: src/mainwindow.c:740 src/messageview.c:258
 msgid "/_View/---"
 msgstr "/Beel_d/---"
 
@@ -1378,7 +1378,7 @@ msgstr "/Beel_d/_Bijlage"
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/Beel_d/_Ga naar/Andere _map..."
 
-#: src/compose.c:593 src/mainwindow.c:638 src/messageview.c:173
+#: src/compose.c:593 src/mainwindow.c:640 src/messageview.c:173
 msgid "/_View/Character _encoding"
 msgstr "/Beel_d/_Tekstcodering"
 
@@ -1389,113 +1389,113 @@ msgstr "/Beel_d/_Tekstcodering/_Automatisch"
 #: src/compose.c:596 src/compose.c:602 src/compose.c:608 src/compose.c:612
 #: src/compose.c:620 src/compose.c:624 src/compose.c:630 src/compose.c:636
 #: src/compose.c:640 src/compose.c:650 src/compose.c:654 src/compose.c:662
-#: src/compose.c:666 src/mainwindow.c:634 src/mainwindow.c:641
+#: src/compose.c:666 src/mainwindow.c:636 src/mainwindow.c:643
 #: src/messageview.c:169
 msgid "/_View/Character _encoding/---"
 msgstr "/Beel_d/_Tekstcodering/---"
 
-#: src/compose.c:598 src/mainwindow.c:642 src/messageview.c:177
+#: src/compose.c:598 src/mainwindow.c:644 src/messageview.c:177
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/Beel_d/_Tekstcodering/7bit ascii (US-ASC_II)"
 
-#: src/compose.c:600 src/mainwindow.c:644 src/messageview.c:180
+#: src/compose.c:600 src/mainwindow.c:646 src/messageview.c:180
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/Beel_d/_Tekstcodering/Unicode (_UTF-8)"
 
-#: src/compose.c:604 src/mainwindow.c:648 src/messageview.c:183
+#: src/compose.c:604 src/mainwindow.c:650 src/messageview.c:183
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/Beel_d/_Tekstcodering/Westeuropees (ISO-8859-_1)"
 
-#: src/compose.c:606 src/mainwindow.c:650 src/messageview.c:185
+#: src/compose.c:606 src/mainwindow.c:652 src/messageview.c:185
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/Beel_d/_Tekstcodering/Westeuropees (ISO-8859-15)"
 
-#: src/compose.c:610 src/mainwindow.c:656 src/messageview.c:190
+#: src/compose.c:610 src/mainwindow.c:658 src/messageview.c:190
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/Beel_d/_Tekstcodering/Centraaleuropees (ISO-8859-2)"
 
-#: src/compose.c:614 src/mainwindow.c:660 src/messageview.c:193
+#: src/compose.c:614 src/mainwindow.c:662 src/messageview.c:193
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/Beel_d/_Tekstcodering/Baltisch (ISO-8859-13)"
 
-#: src/compose.c:616 src/mainwindow.c:662 src/messageview.c:195
+#: src/compose.c:616 src/mainwindow.c:664 src/messageview.c:195
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/Beel_d/_Tekstcodering/Baltisch (ISO-8859-_4)"
 
-#: src/compose.c:618 src/mainwindow.c:664 src/messageview.c:197
+#: src/compose.c:618 src/mainwindow.c:666 src/messageview.c:197
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/Beel_d/_Tekstcodering/Arabisch (Windows-1256)"
 
-#: src/compose.c:622 src/mainwindow.c:668 src/messageview.c:200
+#: src/compose.c:622 src/mainwindow.c:670 src/messageview.c:200
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/Beel_d/_Tekstcodering/Grieks (ISO-8859-_7)"
 
-#: src/compose.c:626 src/mainwindow.c:672 src/messageview.c:203
+#: src/compose.c:626 src/mainwindow.c:674 src/messageview.c:203
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/Beel_d/_Tekstcodering/Arabisch (ISO-8859-_6)"
 
-#: src/compose.c:628 src/mainwindow.c:674 src/messageview.c:205
+#: src/compose.c:628 src/mainwindow.c:676 src/messageview.c:205
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/Beel_d/_Tekstcodering/Arabisch (Windows-1256)"
 
-#: src/compose.c:632 src/mainwindow.c:678 src/messageview.c:208
+#: src/compose.c:632 src/mainwindow.c:680 src/messageview.c:208
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/Beel_d/_Tekstcodering/Hebreeuws (ISO-8859-_8)"
 
-#: src/compose.c:634 src/mainwindow.c:680 src/messageview.c:210
+#: src/compose.c:634 src/mainwindow.c:682 src/messageview.c:210
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/Beel_d/_Tekstcodering/Hebreeuws (Windows-1255)"
 
-#: src/compose.c:638 src/mainwindow.c:684 src/messageview.c:213
+#: src/compose.c:638 src/mainwindow.c:686 src/messageview.c:213
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/Beel_d/_Tekstcodering/Turks (ISO-8859-_9)"
 
-#: src/compose.c:642 src/mainwindow.c:688 src/messageview.c:216
+#: src/compose.c:642 src/mainwindow.c:690 src/messageview.c:216
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/Beel_d/_Tekstcodering/Cyrillisch (ISO-8859-_5)"
 
-#: src/compose.c:644 src/mainwindow.c:690 src/messageview.c:218
+#: src/compose.c:644 src/mainwindow.c:692 src/messageview.c:218
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/Beel_d/_Tekstcodering/Cyrillisch (KOI8-_R)"
 
-#: src/compose.c:646 src/mainwindow.c:692 src/messageview.c:220
+#: src/compose.c:646 src/mainwindow.c:694 src/messageview.c:220
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/Beel_d/_Tekstcodering/Cyrillisch (KOI8-_U)"
 
-#: src/compose.c:648 src/mainwindow.c:694 src/messageview.c:222
+#: src/compose.c:648 src/mainwindow.c:696 src/messageview.c:222
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/Beel_d/_Tekstcodering/Cyrillisch (Windows-1251)"
 
-#: src/compose.c:652 src/mainwindow.c:698 src/messageview.c:225
+#: src/compose.c:652 src/mainwindow.c:700 src/messageview.c:225
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/Beel_d/_Tekstcodering/Japans (ISO-2022-_JP)"
 
-#: src/compose.c:656 src/mainwindow.c:708 src/messageview.c:234
+#: src/compose.c:656 src/mainwindow.c:710 src/messageview.c:234
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/Beel_d/_Tekstcodering/Vereenvoudigd Chinees (_GB2312)"
 
-#: src/compose.c:658 src/mainwindow.c:710 src/messageview.c:236
+#: src/compose.c:658 src/mainwindow.c:712 src/messageview.c:236
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/Beel_d/_Tekstcodering/Vereenvoudigd Chinees (GBK)"
 
-#: src/compose.c:660 src/mainwindow.c:712 src/messageview.c:238
+#: src/compose.c:660 src/mainwindow.c:714 src/messageview.c:238
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/Beel_d/_Tekstcodering/Traditioneel Chinees (_Big5)"
 
-#: src/compose.c:664 src/mainwindow.c:720 src/messageview.c:245
+#: src/compose.c:664 src/mainwindow.c:722 src/messageview.c:245
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/Beel_d/_Tekstcodering/Koreaans (EUC-_KR)"
 
-#: src/compose.c:668 src/mainwindow.c:726 src/messageview.c:250
+#: src/compose.c:668 src/mainwindow.c:728 src/messageview.c:250
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/Beel_d/_Tekstcodering/Thais (TIS-620)"
 
-#: src/compose.c:670 src/mainwindow.c:728 src/messageview.c:252
+#: src/compose.c:670 src/mainwindow.c:730 src/messageview.c:252
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/Beel_d/_Tekstcodering/Thais (Windows-874)"
 
-#: src/compose.c:674 src/mainwindow.c:788 src/messageview.c:283
+#: src/compose.c:674 src/mainwindow.c:790 src/messageview.c:283
 msgid "/_Tools/_Address book"
 msgstr "/_Gereedschap/_Adresboek"
 
@@ -1503,13 +1503,13 @@ msgstr "/_Gereedschap/_Adresboek"
 msgid "/_Tools/_Template"
 msgstr "/_Gereedschap/_Sjabloon"
 
-#: src/compose.c:677 src/mainwindow.c:812 src/messageview.c:299
+#: src/compose.c:677 src/mainwindow.c:814 src/messageview.c:299
 msgid "/_Tools/Actio_ns"
 msgstr "/_Gereedschap/A_cties"
 
-#: src/compose.c:679 src/compose.c:683 src/compose.c:689 src/mainwindow.c:791
-#: src/mainwindow.c:805 src/mainwindow.c:810 src/mainwindow.c:813
-#: src/mainwindow.c:817 src/mainwindow.c:819 src/messageview.c:286
+#: src/compose.c:679 src/compose.c:683 src/compose.c:689 src/mainwindow.c:793
+#: src/mainwindow.c:807 src/mainwindow.c:812 src/mainwindow.c:815
+#: src/mainwindow.c:819 src/mainwindow.c:821 src/messageview.c:286
 #: src/messageview.c:298
 msgid "/_Tools/---"
 msgstr "/_Gereedschap/---"
@@ -1710,7 +1710,7 @@ msgstr "Ondertekenen met PGP"
 msgid "PGP Encrypt"
 msgstr "Coderen met PGP"
 
-#: src/compose.c:4442 src/compose.c:5543
+#: src/compose.c:4442 src/compose.c:5546
 msgid "MIME type"
 msgstr "MIME-type"
 
@@ -1752,36 +1752,36 @@ msgstr "Bewerken met ander (extern) programma"
 msgid "Wrap all long lines"
 msgstr "Lange regels op meerdere regels zetten"
 
-#: src/compose.c:5439
+#: src/compose.c:5442
 msgid "Invalid MIME type."
 msgstr "Ongeldig MIME type."
 
-#: src/compose.c:5457
+#: src/compose.c:5460
 msgid "File doesn't exist or is empty."
 msgstr "Bestand bestaat niet of is leeg."
 
-#: src/compose.c:5525
+#: src/compose.c:5528
 msgid "Properties"
 msgstr "Eigenschappen"
 
-#: src/compose.c:5545 src/prefs_common_dialog.c:1504
+#: src/compose.c:5548 src/prefs_common_dialog.c:1504
 msgid "Encoding"
 msgstr "Codering"
 
-#: src/compose.c:5568 src/prefs_folder_item.c:202
+#: src/compose.c:5571 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Pad"
 
-#: src/compose.c:5569
+#: src/compose.c:5572
 msgid "File name"
 msgstr "Bestandsnaam"
 
-#: src/compose.c:5659
+#: src/compose.c:5662
 #, 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:5714
+#: src/compose.c:5717
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1790,48 +1790,48 @@ msgstr ""
 "Het andere programma is nog steeds actief.\n"
 "Zal ik het programma afbreken (pid: %d?\n"
 
-#: src/compose.c:6040 src/mainwindow.c:2752
+#: src/compose.c:6043 src/mainwindow.c:2761
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:6156 src/compose.c:6161 src/compose.c:6167
+#: src/compose.c:6159 src/compose.c:6164 src/compose.c:6170
 msgid "Can't queue the message."
 msgstr "Kan bericht niet in de wachtrij plaatsen."
 
-#: src/compose.c:6258
+#: src/compose.c:6261
 msgid "Select files"
 msgstr "Selecteer bestanden"
 
-#: src/compose.c:6281
+#: src/compose.c:6284
 msgid "Select file"
 msgstr "Selecteer bestand"
 
-#: src/compose.c:6316
+#: src/compose.c:6319
 msgid "Save message"
 msgstr "Bericht opslaan"
 
-#: src/compose.c:6317
+#: src/compose.c:6320
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Dit bericht is aangepast. Opslaan als Klad?"
 
-#: src/compose.c:6319
+#: src/compose.c:6322
 msgid "Close _without saving"
 msgstr "Sluiten _zonder opslaan"
 
-#: src/compose.c:6361
+#: src/compose.c:6364
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Wilt u het sjabloon '%s' toepassen?"
 
-#: src/compose.c:6363
+#: src/compose.c:6366
 msgid "Apply template"
 msgstr "Sjabloon toepassen"
 
-#: src/compose.c:6364
+#: src/compose.c:6367
 msgid "_Replace"
 msgstr "_Vervangen"
 
-#: src/compose.c:6364
+#: src/compose.c:6367
 msgid "_Insert"
 msgstr "_Invoegen"
 
@@ -2289,12 +2289,12 @@ msgstr "Mapinfo wordt ingesteld...\n"
 msgid "Setting folder info..."
 msgstr "Mapinfo wordt ingesteld..."
 
-#: src/folderview.c:868 src/mainwindow.c:3748 src/setup.c:80
+#: src/folderview.c:868 src/mainwindow.c:3757 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Bezig met inlezen van map %s%c%s ..."
 
-#: src/folderview.c:872 src/mainwindow.c:3753 src/setup.c:85
+#: src/folderview.c:872 src/mainwindow.c:3762 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Bezig met inlezen van map %s ..."
@@ -3060,536 +3060,541 @@ msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/Beel_d/_Hoofdvenster/_Werkbalk/Afbeelding _en tekst"
 
 #: src/mainwindow.c:566
-msgid "/_View/Show or hi_de/_Toolbar/_Icon"
+#, fuzzy
+msgid "/_View/Show or hi_de/_Toolbar/Text at the _right of icon"
 msgstr "/Beel_d/_Hoofdvenster/_Werkbalk/_Afbeelding"
 
 #: src/mainwindow.c:568
+msgid "/_View/Show or hi_de/_Toolbar/_Icon"
+msgstr "/Beel_d/_Hoofdvenster/_Werkbalk/_Afbeelding"
+
+#: src/mainwindow.c:570
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/Beel_d/_Hoofdvenster/_Werkbalk/_Tekst"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:572
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/Beel_d/_Hoofdvenster/_Werkbalk/_Niet weergeven"
 
-#: src/mainwindow.c:572
+#: src/mainwindow.c:574
 msgid "/_View/Show or hi_de/_Search bar"
 msgstr "/Beel_d/_Hoofdvenster/_Zoekbalk"
 
-#: src/mainwindow.c:574
+#: src/mainwindow.c:576
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/Beel_d/_Hoofdvenster/Status_balk"
 
-#: src/mainwindow.c:576
+#: src/mainwindow.c:578
 #, fuzzy
 msgid "/_View/_Customize toolbar..."
 msgstr "/Beel_d/_Ga naar/Andere _map..."
 
-#: src/mainwindow.c:578
+#: src/mainwindow.c:580
 msgid "/_View/Separate f_older tree"
 msgstr "/Beel_d/Acc_ountlijst los"
 
-#: src/mainwindow.c:579
+#: src/mainwindow.c:581
 msgid "/_View/Separate _message view"
 msgstr "/Beel_d/_Bericht los"
 
-#: src/mainwindow.c:581
+#: src/mainwindow.c:583
 msgid "/_View/_Sort"
 msgstr "/Beel_d/_Sorteren"
 
-#: src/mainwindow.c:582
+#: src/mainwindow.c:584
 msgid "/_View/_Sort/by _number"
 msgstr "/Beel_d/_Sorteren/Op _nummer"
 
-#: src/mainwindow.c:583
+#: src/mainwindow.c:585
 msgid "/_View/_Sort/by s_ize"
 msgstr "/Beel_d/_Sorteren/Op _grootte"
 
-#: src/mainwindow.c:584
+#: src/mainwindow.c:586
 msgid "/_View/_Sort/by _date"
 msgstr "/Beel_d/_Sorteren/Op _datum"
 
-#: src/mainwindow.c:585
+#: src/mainwindow.c:587
 msgid "/_View/_Sort/by t_hread date"
 msgstr "/Beel_d/_Sorteren/Op datum (dis_cussie)"
 
-#: src/mainwindow.c:586
+#: src/mainwindow.c:588
 msgid "/_View/_Sort/by _from"
 msgstr "/Beel_d/_Sorteren/Op _afzender"
 
-#: src/mainwindow.c:587
+#: src/mainwindow.c:589
 msgid "/_View/_Sort/by _recipient"
 msgstr "/Beel_d/_Sorteren/Op _ontvanger"
 
-#: src/mainwindow.c:588
+#: src/mainwindow.c:590
 msgid "/_View/_Sort/by _subject"
 msgstr "/Beel_d/_Sorteren/Op _onderwerp"
 
-#: src/mainwindow.c:589
+#: src/mainwindow.c:591
 msgid "/_View/_Sort/by _color label"
 msgstr "/Beel_d/_Sorteren/Op _kleurlabel"
 
-#: src/mainwindow.c:591
+#: src/mainwindow.c:593
 msgid "/_View/_Sort/by _mark"
 msgstr "/Beel_d/_Sorteren/Op _markering"
 
-#: src/mainwindow.c:592
+#: src/mainwindow.c:594
 msgid "/_View/_Sort/by _unread"
 msgstr "/Beel_d/_Sorteren/Op on_gelezen"
 
-#: src/mainwindow.c:593
+#: src/mainwindow.c:595
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/Beel_d/_Sorteren/Op _bijvoeging"
 
-#: src/mainwindow.c:595
+#: src/mainwindow.c:597
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/Beel_d/_Sorteren/_Ongesorteerd"
 
-#: src/mainwindow.c:596 src/mainwindow.c:599
+#: src/mainwindow.c:598 src/mainwindow.c:601
 msgid "/_View/_Sort/---"
 msgstr "/Beel_d/_Sorteren/---"
 
-#: src/mainwindow.c:597
+#: src/mainwindow.c:599
 msgid "/_View/_Sort/Ascending"
 msgstr "/Beel_d/_Sorteren/Oplopend"
 
-#: src/mainwindow.c:598
+#: src/mainwindow.c:600
 msgid "/_View/_Sort/Descending"
 msgstr "/Beel_d/_Sorteren/Aflopend"
 
-#: src/mainwindow.c:600
+#: src/mainwindow.c:602
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/Beel_d/_Sorteren/Aantrekken op onderwerp"
 
-#: src/mainwindow.c:602
+#: src/mainwindow.c:604
 msgid "/_View/Th_read view"
 msgstr "/Beel_d/Ge_nest"
 
-#: src/mainwindow.c:603
+#: src/mainwindow.c:605
 msgid "/_View/E_xpand all threads"
 msgstr "/Beel_d/Discussies _uitklappen"
 
-#: src/mainwindow.c:604
+#: src/mainwindow.c:606
 msgid "/_View/Co_llapse all threads"
 msgstr "/Beel_d/Discussies _inklappen"
 
-#: src/mainwindow.c:605
+#: src/mainwindow.c:607
 msgid "/_View/Set display _item..."
 msgstr "/Beel_d/_Kolommen berichtenlijst..."
 
-#: src/mainwindow.c:608
+#: src/mainwindow.c:610
 msgid "/_View/_Go to"
 msgstr "/Beel_d/_Ga naar"
 
-#: src/mainwindow.c:609
+#: src/mainwindow.c:611
 msgid "/_View/_Go to/_Prev message"
 msgstr "/Beel_d/_Ga naar/_Vorige bericht"
 
-#: src/mainwindow.c:610
+#: src/mainwindow.c:612
 msgid "/_View/_Go to/_Next message"
 msgstr "/Beel_d/_Ga naar/Vo_lgende bericht"
 
-#: src/mainwindow.c:611 src/mainwindow.c:616 src/mainwindow.c:619
-#: src/mainwindow.c:624 src/mainwindow.c:629
+#: src/mainwindow.c:613 src/mainwindow.c:618 src/mainwindow.c:621
+#: src/mainwindow.c:626 src/mainwindow.c:631
 msgid "/_View/_Go to/---"
 msgstr "/Beel_d/_Ga naar/---"
 
-#: src/mainwindow.c:612
+#: src/mainwindow.c:614
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/Beel_d/_Ga naar/Vo_rige ongelezen bericht"
 
-#: src/mainwindow.c:614
+#: src/mainwindow.c:616
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/Beel_d/_Ga naar/Volgende on_gelezen bericht"
 
-#: src/mainwindow.c:617
+#: src/mainwindow.c:619
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/Beel_d/_Ga naar/_Vorige nieuwe bericht"
 
-#: src/mainwindow.c:618
+#: src/mainwindow.c:620
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/Beel_d/_Ga naar/Vo_lgende nieuwe bericht"
 
-#: src/mainwindow.c:620
+#: src/mainwindow.c:622
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/Beel_d/_Ga naar/Vorige ge_markeerd bericht"
 
-#: src/mainwindow.c:622
+#: src/mainwindow.c:624
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/Beel_d/_Ga naar/Volgende gem_arkeerd bericht"
 
-#: src/mainwindow.c:625
+#: src/mainwindow.c:627
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/Beel_d/_Ga naar/Vorige gela_beld bericht"
 
-#: src/mainwindow.c:627
+#: src/mainwindow.c:629
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/Beel_d/_Ga naar/Volgende gelab_eld bericht"
 
-#: src/mainwindow.c:630
+#: src/mainwindow.c:632
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/Beel_d/_Ga naar/Andere _map..."
 
-#: src/mainwindow.c:639 src/messageview.c:174
+#: src/mainwindow.c:641 src/messageview.c:174
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/Beel_d/_Tekstcodering/Automatisch"
 
-#: src/mainwindow.c:652 src/messageview.c:187
+#: src/mainwindow.c:654 src/messageview.c:187
 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr "/Beel_d/_Tekstcodering/Westeuropees (Windows-1252)"
 
-#: src/mainwindow.c:700 src/messageview.c:227
+#: src/mainwindow.c:702 src/messageview.c:227
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/Beel_d/_Tekstcodering/Japans (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:702 src/messageview.c:229
+#: src/mainwindow.c:704 src/messageview.c:229
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/Beel_d/_Tekstcodering/Japans (_EUC-JP)"
 
-#: src/mainwindow.c:704 src/messageview.c:231
+#: src/mainwindow.c:706 src/messageview.c:231
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/Beel_d/_Tekstcodering/Japans (_Shift__JIS)"
 
-#: src/mainwindow.c:714 src/messageview.c:240
+#: src/mainwindow.c:716 src/messageview.c:240
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/Beel_d/_Tekstcodering/Traditioneel Chinees (EUC-_TW)"
 
-#: src/mainwindow.c:716 src/messageview.c:242
+#: src/mainwindow.c:718 src/messageview.c:242
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/Beel_d/_Tekstcodering/Chinees (ISO-2022-_CN)"
 
-#: src/mainwindow.c:722 src/messageview.c:247
+#: src/mainwindow.c:724 src/messageview.c:247
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/Beel_d/_Tekstcodering/Koreaans (ISO-2022-KR)"
 
-#: src/mainwindow.c:735 src/summaryview.c:464
+#: src/mainwindow.c:737 src/summaryview.c:464
 msgid "/_View/Open in new _window"
 msgstr "/Beel_d/In _nieuw venster openen"
 
-#: src/mainwindow.c:736 src/messageview.c:259 src/summaryview.c:466
+#: src/mainwindow.c:738 src/messageview.c:259 src/summaryview.c:466
 msgid "/_View/Mess_age source"
 msgstr "/Beel_d/_Broncode weergeven"
 
-#: src/mainwindow.c:737 src/messageview.c:260 src/summaryview.c:467
+#: src/mainwindow.c:739 src/messageview.c:260 src/summaryview.c:467
 #, fuzzy
 msgid "/_View/All _headers"
 msgstr "/Beel_d/Vo_lledige header"
 
-#: src/mainwindow.c:739
+#: src/mainwindow.c:741
 msgid "/_View/_Update summary"
 msgstr "/Beel_d/_Verversen"
 
-#: src/mainwindow.c:741 src/messageview.c:263
+#: src/mainwindow.c:743 src/messageview.c:263
 msgid "/_Message"
 msgstr "/Be_richt"
 
-#: src/mainwindow.c:742
+#: src/mainwindow.c:744
 msgid "/_Message/Recei_ve"
 msgstr "/Be_richt/_Ophalen"
 
-#: src/mainwindow.c:743
+#: src/mainwindow.c:745
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/Be_richt/_Ophalen/E-mail van _huidig account ophalen"
 
-#: src/mainwindow.c:745
+#: src/mainwindow.c:747
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/Be_richt/_Ophalen/Alle e-mail ophalen"
 
-#: src/mainwindow.c:747
+#: src/mainwindow.c:749
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/Be_richt/_Ophalen/Ophalen afbreken"
 
-#: src/mainwindow.c:749
+#: src/mainwindow.c:751
 msgid "/_Message/Recei_ve/---"
 msgstr "/Be_richt/_Ophalen/---"
 
-#: src/mainwindow.c:750
+#: src/mainwindow.c:752
 msgid "/_Message/_Send queued messages"
 msgstr "/Be_richt/Berichten uit wachtrij verzenden"
 
-#: src/mainwindow.c:751 src/mainwindow.c:753 src/mainwindow.c:760
-#: src/mainwindow.c:765 src/mainwindow.c:768 src/mainwindow.c:779
-#: src/mainwindow.c:781 src/mainwindow.c:784 src/messageview.c:266
+#: src/mainwindow.c:753 src/mainwindow.c:755 src/mainwindow.c:762
+#: src/mainwindow.c:767 src/mainwindow.c:770 src/mainwindow.c:781
+#: src/mainwindow.c:783 src/mainwindow.c:786 src/messageview.c:266
 #: src/messageview.c:274 src/messageview.c:279
 msgid "/_Message/---"
 msgstr "/Be_richt/---"
 
-#: src/mainwindow.c:752 src/messageview.c:264
+#: src/mainwindow.c:754 src/messageview.c:264
 msgid "/_Message/Compose _new message"
 msgstr "/Be_richt/_Nieuw bericht opstellen"
 
-#: src/mainwindow.c:754 src/messageview.c:267
+#: src/mainwindow.c:756 src/messageview.c:267
 msgid "/_Message/_Reply"
 msgstr "/Be_richt/_Beantwoorden"
 
-#: src/mainwindow.c:755
+#: src/mainwindow.c:757
 msgid "/_Message/Repl_y to"
 msgstr "/Be_richt/Antwoord _sturen aan"
 
-#: src/mainwindow.c:756 src/messageview.c:268
+#: src/mainwindow.c:758 src/messageview.c:268
 msgid "/_Message/Repl_y to/_all"
 msgstr "/Be_richt/Antwoord _sturen aan/_iedereen"
 
-#: src/mainwindow.c:757 src/messageview.c:270
+#: src/mainwindow.c:759 src/messageview.c:270
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/Be_richt/Antwoord _sturen aan/_afzender"
 
-#: src/mainwindow.c:758 src/messageview.c:272
+#: src/mainwindow.c:760 src/messageview.c:272
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/Be_richt/Antwoord _sturen aan/_discussielijst"
 
-#: src/mainwindow.c:761 src/messageview.c:275
+#: src/mainwindow.c:763 src/messageview.c:275
 msgid "/_Message/_Forward"
 msgstr "/Be_richt/_Doorsturen"
 
-#: src/mainwindow.c:762 src/messageview.c:276
+#: src/mainwindow.c:764 src/messageview.c:276
 msgid "/_Message/For_ward as attachment"
 msgstr "/Be_richt/Doorsturen _als bijlage"
 
-#: src/mainwindow.c:764 src/messageview.c:278
+#: src/mainwindow.c:766 src/messageview.c:278
 msgid "/_Message/Redirec_t"
 msgstr "/Be_richt/Om_leiden"
 
-#: src/mainwindow.c:766
+#: src/mainwindow.c:768
 msgid "/_Message/M_ove..."
 msgstr "/Be_richt/_Verplaatsen..."
 
-#: src/mainwindow.c:767
+#: src/mainwindow.c:769
 msgid "/_Message/_Copy..."
 msgstr "/Be_richt/_Kopiëren..."
 
-#: src/mainwindow.c:769
+#: src/mainwindow.c:771
 msgid "/_Message/_Mark"
 msgstr "/Be_richt/_Markeren"
 
-#: src/mainwindow.c:770
+#: src/mainwindow.c:772
 msgid "/_Message/_Mark/_Mark"
 msgstr "/Be_richt/_Markeren/_Markeren"
 
-#: src/mainwindow.c:771
+#: src/mainwindow.c:773
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/Be_richt/_Markeren/_Demarkeren"
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:774
 msgid "/_Message/_Mark/---"
 msgstr "/Be_richt/_Markeren/---"
 
-#: src/mainwindow.c:773
+#: src/mainwindow.c:775
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/Be_richt/_Markeren/Als _ongelezen"
 
-#: src/mainwindow.c:774
+#: src/mainwindow.c:776
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/Be_richt/_Markeren/Als _gelezen"
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:778
 msgid "/_Message/_Mark/Mark _thread as read"
 msgstr "/Be_richt/_Markeren/Als _gelezen (discussie)"
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:780
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/Be_richt/_Markeren/_Alles gelezen"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:782
 msgid "/_Message/_Delete"
 msgstr "/Be_richt/Ver_wijderen"
 
-#: src/mainwindow.c:782
+#: src/mainwindow.c:784
 msgid "/_Message/Set as _junk mail"
 msgstr "/Be_richt/Als _troep markeren"
 
-#: src/mainwindow.c:783
+#: src/mainwindow.c:785
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/Be_richt/Als _geen troep markeren"
 
-#: src/mainwindow.c:785 src/messageview.c:280
+#: src/mainwindow.c:787 src/messageview.c:280
 msgid "/_Message/Re-_edit"
 msgstr "/Be_richt/Bewerken"
 
-#: src/mainwindow.c:789
+#: src/mainwindow.c:791
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/_Gereedschap/Af_zender toevoegen aan adresboek..."
 
-#: src/mainwindow.c:792
+#: src/mainwindow.c:794
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/_Gereedschap/Alle berichten _filteren"
 
-#: src/mainwindow.c:794
+#: src/mainwindow.c:796
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Gereedschap/_Geselecteerde berichten filteren"
 
-#: src/mainwindow.c:796 src/messageview.c:287
+#: src/mainwindow.c:798 src/messageview.c:287
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Gereedschap/Filterregel _aanmaken"
 
-#: src/mainwindow.c:797 src/messageview.c:289
+#: src/mainwindow.c:799 src/messageview.c:289
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Gereedschap/_Creëer Filterregel/_Automatisch"
 
-#: src/mainwindow.c:799 src/messageview.c:291
+#: src/mainwindow.c:801 src/messageview.c:291
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Gereedschap/_Creëer filterregel/voor A_fzender"
 
-#: src/mainwindow.c:801 src/messageview.c:293
+#: src/mainwindow.c:803 src/messageview.c:293
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Gereedschap/_Creëer filterregel/voor _Geadresseerde"
 
-#: src/mainwindow.c:803 src/messageview.c:295
+#: src/mainwindow.c:805 src/messageview.c:295
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Gereedschap/_Creëer filterregel/voor _Onderwerp"
 
-#: src/mainwindow.c:806
+#: src/mainwindow.c:808
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/_Gereedschap/_Troep filteren"
 
-#: src/mainwindow.c:808
+#: src/mainwindow.c:810
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/_Gereedschap/Troep filteren uit ge_selecteerde berichten"
 
-#: src/mainwindow.c:815
+#: src/mainwindow.c:817
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/_Gereedschap/Du_bbele berichten verwijderen"
 
-#: src/mainwindow.c:818
+#: src/mainwindow.c:820
 #, fuzzy
 msgid "/_Tools/E_xecute marked process"
 msgstr "Voer de gemarkeerde acties uit"
 
-#: src/mainwindow.c:820
+#: src/mainwindow.c:822
 msgid "/_Tools/_Log window"
 msgstr "/_Gereedschap/_Logboek"
 
-#: src/mainwindow.c:822
+#: src/mainwindow.c:824
 msgid "/_Configuration"
 msgstr "/_Instellingen"
 
-#: src/mainwindow.c:823
+#: src/mainwindow.c:825
 msgid "/_Configuration/_Common preferences..."
 msgstr "/_Instellingen/Algemene voorkeuren..."
 
-#: src/mainwindow.c:825
+#: src/mainwindow.c:827
 msgid "/_Configuration/_Filter setting..."
 msgstr "/_Instellingen/_Filterbeheer..."
 
-#: src/mainwindow.c:827
+#: src/mainwindow.c:829
 msgid "/_Configuration/_Template..."
 msgstr "/_Instellingen/_Sjabloonbeheer..."
 
-#: src/mainwindow.c:829
+#: src/mainwindow.c:831
 msgid "/_Configuration/_Actions..."
 msgstr "/_Instellingen/A_cties..."
 
-#: src/mainwindow.c:831
+#: src/mainwindow.c:833
 msgid "/_Configuration/---"
 msgstr "/_Instellingen/---"
 
-#: src/mainwindow.c:832
+#: src/mainwindow.c:834
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Instellingen/Accountvoorkeuren..."
 
-#: src/mainwindow.c:834
+#: src/mainwindow.c:836
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Instellingen/Nieuw account aanmaken..."
 
-#: src/mainwindow.c:836
+#: src/mainwindow.c:838
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Instellingen/Accountbeheer..."
 
-#: src/mainwindow.c:838
+#: src/mainwindow.c:840
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Instellingen/Huidig account veranderen"
 
-#: src/mainwindow.c:842
+#: src/mainwindow.c:844
 msgid "/_Help/_Manual"
 msgstr "/_Hulp/_Handboek"
 
-#: src/mainwindow.c:843
+#: src/mainwindow.c:845
 msgid "/_Help/_Manual/_English"
 msgstr "/_Hulp/_Handboek/_Engels"
 
-#: src/mainwindow.c:844
+#: src/mainwindow.c:846
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/_Hulp/_Handboek/_Japans"
 
-#: src/mainwindow.c:845
+#: src/mainwindow.c:847
 msgid "/_Help/_FAQ"
 msgstr "/_Hulp/_FAQ"
 
-#: src/mainwindow.c:846
+#: src/mainwindow.c:848
 msgid "/_Help/_FAQ/_English"
 msgstr "/_Hulp/_FAQ/_Engels"
 
-#: src/mainwindow.c:847
+#: src/mainwindow.c:849
 msgid "/_Help/_FAQ/_German"
 msgstr "/_Hulp/_FAQ/_Duits"
 
-#: src/mainwindow.c:848
+#: src/mainwindow.c:850
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/_Hulp/_FAQ/_Spaans"
 
-#: src/mainwindow.c:849
+#: src/mainwindow.c:851
 msgid "/_Help/_FAQ/_French"
 msgstr "/_Hulp/_FAQ/_Frans"
 
-#: src/mainwindow.c:850
+#: src/mainwindow.c:852
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/_Hulp/_FAQ/_Italiaans"
 
-#: src/mainwindow.c:851
+#: src/mainwindow.c:853
 msgid "/_Help/_Command line options"
 msgstr "/_Hulp/Opties voor de opdrachtregel"
 
-#: src/mainwindow.c:852
+#: src/mainwindow.c:854
 msgid "/_Help/---"
 msgstr "/_Hulp/---"
 
-#: src/mainwindow.c:895
+#: src/mainwindow.c:897
 msgid "Creating main window...\n"
 msgstr "Hoofdvenster wordt aangemaakt...\n"
 
-#: src/mainwindow.c:1071
+#: src/mainwindow.c:1073
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "HoofdVenster: kleur %d kon niet gealloceerd worden\n"
 
-#: src/mainwindow.c:1175 src/summaryview.c:2387 src/summaryview.c:2472
+#: src/mainwindow.c:1181 src/summaryview.c:2387 src/summaryview.c:2472
 #: src/summaryview.c:4009 src/summaryview.c:4138 src/summaryview.c:4507
 msgid "done.\n"
 msgstr "klaar.\n"
 
-#: src/mainwindow.c:1293 src/mainwindow.c:1334 src/mainwindow.c:1359
+#: src/mainwindow.c:1299 src/mainwindow.c:1340 src/mainwindow.c:1365
 msgid "Untitled"
 msgstr "Geen titel"
 
-#: src/mainwindow.c:1360
+#: src/mainwindow.c:1366
 msgid "none"
 msgstr "niets"
 
-#: src/mainwindow.c:1413
+#: src/mainwindow.c:1419
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "Vensterscheidingstype wordt gewijzigd van %d naar %d\n"
 
-#: src/mainwindow.c:1663
+#: src/mainwindow.c:1669
 msgid "Offline"
 msgstr "Off-line"
 
-#: src/mainwindow.c:1664
+#: src/mainwindow.c:1670
 msgid "You are offline. Go online?"
 msgstr "U bent off-line aan het werken. Wilt u on-line gaan?"
 
-#: src/mainwindow.c:1681
+#: src/mainwindow.c:1687
 msgid "Empty all trash"
 msgstr "Prullenbakken legen"
 
-#: src/mainwindow.c:1682
+#: src/mainwindow.c:1688
 msgid "Delete all messages in trash folders?"
 msgstr "Alle berichten uit de prullenbakken weggooien?"
 
-#: src/mainwindow.c:1712
+#: src/mainwindow.c:1718
 msgid "Add mailbox"
 msgstr "Mailbox toevoegen"
 
-#: src/mainwindow.c:1713
+#: src/mainwindow.c:1719
 msgid ""
 "Specify the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3599,16 +3604,16 @@ msgstr ""
 "Als een bestaande postbus wordt ingevuld,\n"
 "dan wordt hij automatisch ingelezen."
 
-#: src/mainwindow.c:1719 src/setup.c:49
+#: src/mainwindow.c:1725 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "De mailbox '%s' bestaat al."
 
-#: src/mainwindow.c:1724 src/setup.c:56
+#: src/mainwindow.c:1730 src/setup.c:56
 msgid "Mailbox"
 msgstr "Mailbox"
 
-#: src/mainwindow.c:1730 src/setup.c:62
+#: src/mainwindow.c:1736 src/setup.c:62
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3618,133 +3623,133 @@ msgstr ""
 "Misschien bestaan er al wat bestanden, of heb je geen toestemming om er te "
 "schrijven."
 
-#: src/mainwindow.c:2198
+#: src/mainwindow.c:2206
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Mappenoverzicht"
 
-#: src/mainwindow.c:2217
+#: src/mainwindow.c:2225
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Berichtenoverzicht"
 
-#: src/mainwindow.c:2369 src/summaryview.c:418
+#: src/mainwindow.c:2377 src/summaryview.c:418
 msgid "/_Reply"
 msgstr "/_Antwoord"
 
-#: src/mainwindow.c:2370
+#: src/mainwindow.c:2378
 msgid "/Reply to _all"
 msgstr "/_Iedereen beantwoorden"
 
-#: src/mainwindow.c:2371
+#: src/mainwindow.c:2379
 msgid "/Reply to _sender"
 msgstr "/_Afzender beantwoorden"
 
-#: src/mainwindow.c:2372
+#: src/mainwindow.c:2380
 msgid "/Reply to mailing _list"
 msgstr "/_Discussielijst beantwoorden"
 
-#: src/mainwindow.c:2377 src/summaryview.c:425
+#: src/mainwindow.c:2385 src/summaryview.c:425
 msgid "/_Forward"
 msgstr "/D_oorsturen"
 
-#: src/mainwindow.c:2378 src/summaryview.c:426
+#: src/mainwindow.c:2386 src/summaryview.c:426
 msgid "/For_ward as attachment"
 msgstr "/Doorsturen als _bijvoeging"
 
-#: src/mainwindow.c:2379 src/summaryview.c:427
+#: src/mainwindow.c:2387 src/summaryview.c:427
 msgid "/Redirec_t"
 msgstr "/_Omleiden"
 
-#: src/mainwindow.c:2384
+#: src/mainwindow.c:2392
 msgid "Incorporate new mail"
 msgstr "E-mail ophalen en in de lijst zetten."
 
-#: src/mainwindow.c:2386
+#: src/mainwindow.c:2394
 msgid "Incorporate new mail of all accounts"
 msgstr "E-mail van alle accounts ophalen en in de lijsten zetten"
 
-#: src/mainwindow.c:2388
+#: src/mainwindow.c:2396
 msgid "Send queued message(s)"
 msgstr "Verzend berichten uit de wachtrij"
 
-#: src/mainwindow.c:2390
+#: src/mainwindow.c:2398
 msgid "Compose new message"
 msgstr "Nieuw bericht opstellen"
 
-#: src/mainwindow.c:2392
+#: src/mainwindow.c:2400
 msgid "Reply to the message"
 msgstr "Stuur een bericht terug naar de afzender"
 
-#: src/mainwindow.c:2394
+#: src/mainwindow.c:2402
 msgid "Reply to all"
 msgstr "Bericht naar iedereen terugsturen."
 
-#: src/mainwindow.c:2396
+#: src/mainwindow.c:2404
 msgid "Forward the message"
 msgstr "Stuur dit bericht door"
 
-#: src/mainwindow.c:2398
+#: src/mainwindow.c:2406
 msgid "Delete the message"
 msgstr "Verwijder dit bericht"
 
-#: src/mainwindow.c:2400
+#: src/mainwindow.c:2408
 msgid "Set as junk mail"
 msgstr "Dit is troep"
 
-#: src/mainwindow.c:2402
+#: src/mainwindow.c:2410
 msgid "Execute marked process"
 msgstr "Voer de gemarkeerde acties uit"
 
-#: src/mainwindow.c:2404
+#: src/mainwindow.c:2412
 msgid "Next unread message"
 msgstr "Volgende ongelezen"
 
-#: src/mainwindow.c:2406
+#: src/mainwindow.c:2414
 #, fuzzy
 msgid "Previous unread message"
 msgstr "Volgende ongelezen"
 
-#: src/mainwindow.c:2410
+#: src/mainwindow.c:2418
 #, fuzzy
 msgid "Print message"
 msgstr "Verzend bericht"
 
-#: src/mainwindow.c:2412
+#: src/mainwindow.c:2420
 msgid "Common preferences"
 msgstr "Algemene voorkeuren"
 
-#: src/mainwindow.c:2414 src/prefs_account_dialog.c:511
+#: src/mainwindow.c:2422 src/prefs_account_dialog.c:511
 msgid "Account preferences"
 msgstr "Accountvoorkeuren"
 
-#: src/mainwindow.c:2779
+#: src/mainwindow.c:2788
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 "U bent off-line aan het werken. Klik op het pictogram om on-line te gaan "
 "werken."
 
-#: src/mainwindow.c:2790
+#: src/mainwindow.c:2799
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 "U bent on-line aan het werken. Klik op het pictogram om off-line te gaan "
 "werken."
 
-#: src/mainwindow.c:3062
+#: src/mainwindow.c:3071
 msgid "Exit"
 msgstr "Afsluiten"
 
-#: src/mainwindow.c:3062
+#: src/mainwindow.c:3071
 msgid "Exit this program?"
 msgstr "Sylpheed afsluiten?"
 
-#: src/mainwindow.c:3666
+#: src/mainwindow.c:3675
 msgid "Command line options"
 msgstr "Opties voor de opdrachtregel"
 
-#: src/mainwindow.c:3679
+#: src/mainwindow.c:3688
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Gebruik: Sylpheed [OPTIES]..."
 
-#: src/mainwindow.c:3687
+#: src/mainwindow.c:3696
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -3772,7 +3777,7 @@ msgstr ""
 "--help\n"
 "--version"
 
-#: src/mainwindow.c:3703
+#: src/mainwindow.c:3712
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
diff --git a/po/pl.po b/po/pl.po
index 5fa976e5..6358ed71 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed 1.9.8 \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-01-31 16:49+0900\n"
+"POT-Creation-Date: 2007-01-31 17:29+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"
@@ -905,7 +905,7 @@ msgstr "/_Adres/_Edycja"
 msgid "/_Address/_Delete"
 msgstr "/_Adres/_Usuń"
 
-#: src/addressbook.c:359 src/compose.c:673 src/mainwindow.c:787
+#: src/addressbook.c:359 src/compose.c:673 src/mainwindow.c:789
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Narzędzia"
@@ -914,12 +914,12 @@ msgstr "/_Narzędzia"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Plik/Importuj plik _LDIF"
 
-#: src/addressbook.c:361 src/compose.c:694 src/mainwindow.c:841
+#: src/addressbook.c:361 src/compose.c:694 src/mainwindow.c:843
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/Pomo_c"
 
-#: src/addressbook.c:362 src/compose.c:695 src/mainwindow.c:853
+#: src/addressbook.c:362 src/compose.c:695 src/mainwindow.c:855
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/Pomo_c/_O programie"
@@ -961,7 +961,7 @@ msgstr "/_Usuń"
 msgid "E-Mail address"
 msgstr "Adres e-mail"
 
-#: src/addressbook.c:496 src/compose.c:4873 src/mainwindow.c:2408
+#: src/addressbook.c:496 src/compose.c:4873 src/mainwindow.c:2416
 #: src/prefs_common_dialog.c:2274
 msgid "Address book"
 msgstr "Książka adresowa"
@@ -1183,7 +1183,7 @@ msgstr "Wspólny adres:"
 msgid "Personal address"
 msgstr "Osobisty adres:"
 
-#: src/alertpanel.c:142 src/compose.c:5717 src/main.c:638
+#: src/alertpanel.c:142 src/compose.c:5720 src/main.c:638
 msgid "Notice"
 msgstr "Notatka"
 
@@ -1351,9 +1351,9 @@ msgid "/_View/_Reply to"
 msgstr "/_Widok/_Odpowiedz do"
 
 #: src/compose.c:578 src/compose.c:580 src/compose.c:582 src/compose.c:584
-#: src/compose.c:587 src/mainwindow.c:577 src/mainwindow.c:580
-#: src/mainwindow.c:607 src/mainwindow.c:631 src/mainwindow.c:734
-#: src/mainwindow.c:738 src/messageview.c:258
+#: src/compose.c:587 src/mainwindow.c:579 src/mainwindow.c:582
+#: src/mainwindow.c:609 src/mainwindow.c:633 src/mainwindow.c:736
+#: src/mainwindow.c:740 src/messageview.c:258
 msgid "/_View/---"
 msgstr "/_Widok/---"
 
@@ -1374,7 +1374,7 @@ msgstr "/_Widok/Załączniki"
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/_Widok/Idź do inne_go katalogu..."
 
-#: src/compose.c:593 src/mainwindow.c:638 src/messageview.c:173
+#: src/compose.c:593 src/mainwindow.c:640 src/messageview.c:173
 msgid "/_View/Character _encoding"
 msgstr "/_Widok/Kodowani_e znaków"
 
@@ -1385,115 +1385,115 @@ msgstr "/_Widok/Kodowani_e znaków/Automatyczne"
 #: src/compose.c:596 src/compose.c:602 src/compose.c:608 src/compose.c:612
 #: src/compose.c:620 src/compose.c:624 src/compose.c:630 src/compose.c:636
 #: src/compose.c:640 src/compose.c:650 src/compose.c:654 src/compose.c:662
-#: src/compose.c:666 src/mainwindow.c:634 src/mainwindow.c:641
+#: src/compose.c:666 src/mainwindow.c:636 src/mainwindow.c:643
 #: src/messageview.c:169
 msgid "/_View/Character _encoding/---"
 msgstr "/_Widok/Kodowani_e znaków/---"
 
-#: src/compose.c:598 src/mainwindow.c:642 src/messageview.c:177
+#: src/compose.c:598 src/mainwindow.c:644 src/messageview.c:177
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Widok/Kodowani_e znaków/7-bitowe ascii (US-ASC_II)"
 
-#: src/compose.c:600 src/mainwindow.c:644 src/messageview.c:180
+#: src/compose.c:600 src/mainwindow.c:646 src/messageview.c:180
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Widok/Kodowani_e znaków/Unikod (_UTF-8)"
 
-#: src/compose.c:604 src/mainwindow.c:648 src/messageview.c:183
+#: src/compose.c:604 src/mainwindow.c:650 src/messageview.c:183
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Widok/Kodowani_e znaków/Europa Zachodnia (ISO-8859-_1)"
 
-#: src/compose.c:606 src/mainwindow.c:650 src/messageview.c:185
+#: src/compose.c:606 src/mainwindow.c:652 src/messageview.c:185
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Widok/Kodowani_e znaków/Europa Zachodnia (ISO-8859-15)"
 
-#: src/compose.c:610 src/mainwindow.c:656 src/messageview.c:190
+#: src/compose.c:610 src/mainwindow.c:658 src/messageview.c:190
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Widok/Kodowani_e znaków/Europa Środkowa (ISO-8859-_2)"
 
-#: src/compose.c:614 src/mainwindow.c:660 src/messageview.c:193
+#: src/compose.c:614 src/mainwindow.c:662 src/messageview.c:193
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Widok/Kodowani_e znaków/_Bałtyckie (ISO-8859-13)"
 
-#: src/compose.c:616 src/mainwindow.c:662 src/messageview.c:195
+#: src/compose.c:616 src/mainwindow.c:664 src/messageview.c:195
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Widok/Kodowani_e znaków/Bałtyckie (ISO-8859-_4)"
 
-#: src/compose.c:618 src/mainwindow.c:664 src/messageview.c:197
+#: src/compose.c:618 src/mainwindow.c:666 src/messageview.c:197
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/_Widok/Kodowani_e znaków/Cyrylica (Windows-1251)"
 
-#: src/compose.c:622 src/mainwindow.c:668 src/messageview.c:200
+#: src/compose.c:622 src/mainwindow.c:670 src/messageview.c:200
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Widok/Kodowani_e znaków/Greckie (ISO-8859-_7)"
 
-#: src/compose.c:626 src/mainwindow.c:672 src/messageview.c:203
+#: src/compose.c:626 src/mainwindow.c:674 src/messageview.c:203
 #, fuzzy
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/_Widok/Kodowani_e znaków/Bałtyckie (ISO-8859-_4)"
 
-#: src/compose.c:628 src/mainwindow.c:674 src/messageview.c:205
+#: src/compose.c:628 src/mainwindow.c:676 src/messageview.c:205
 #, fuzzy
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/_Widok/Kodowani_e znaków/Cyrylica (Windows-1251)"
 
-#: src/compose.c:632 src/mainwindow.c:678 src/messageview.c:208
+#: src/compose.c:632 src/mainwindow.c:680 src/messageview.c:208
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Widok/Kodowani_e znaków/Hebrajskie (ISO-8859-_8)"
 
-#: src/compose.c:634 src/mainwindow.c:680 src/messageview.c:210
+#: src/compose.c:634 src/mainwindow.c:682 src/messageview.c:210
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Widok/Kodowani_e znaków/Hebrajskie (Windows-1251)"
 
-#: src/compose.c:638 src/mainwindow.c:684 src/messageview.c:213
+#: src/compose.c:638 src/mainwindow.c:686 src/messageview.c:213
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Widok/Kodowani_e znaków/Tureckie (ISO-8859-_9)"
 
-#: src/compose.c:642 src/mainwindow.c:688 src/messageview.c:216
+#: src/compose.c:642 src/mainwindow.c:690 src/messageview.c:216
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Widok/Kodowani_e znaków/Cyrylica (ISO-8859-_5)"
 
-#: src/compose.c:644 src/mainwindow.c:690 src/messageview.c:218
+#: src/compose.c:644 src/mainwindow.c:692 src/messageview.c:218
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Widok/Kodowani_e znaków/Cyrylica (KOI8-_R)"
 
-#: src/compose.c:646 src/mainwindow.c:692 src/messageview.c:220
+#: src/compose.c:646 src/mainwindow.c:694 src/messageview.c:220
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Widok/Kodowani_e znaków/Cyrylica (KOI8-U)"
 
-#: src/compose.c:648 src/mainwindow.c:694 src/messageview.c:222
+#: src/compose.c:648 src/mainwindow.c:696 src/messageview.c:222
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Widok/Kodowani_e znaków/Cyrylica (Windows-1251)"
 
-#: src/compose.c:652 src/mainwindow.c:698 src/messageview.c:225
+#: src/compose.c:652 src/mainwindow.c:700 src/messageview.c:225
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Widok/Kodowani_e znaków/Japońskie (ISO-2022-_JP)"
 
-#: src/compose.c:656 src/mainwindow.c:708 src/messageview.c:234
+#: src/compose.c:656 src/mainwindow.c:710 src/messageview.c:234
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Widok/Kodowani_e znaków/Uproszczone Chińskie (_GB2312)"
 
-#: src/compose.c:658 src/mainwindow.c:710 src/messageview.c:236
+#: src/compose.c:658 src/mainwindow.c:712 src/messageview.c:236
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Widok/Kodowani_e znaków/Uproszczone Chińskie (GBK)"
 
-#: src/compose.c:660 src/mainwindow.c:712 src/messageview.c:238
+#: src/compose.c:660 src/mainwindow.c:714 src/messageview.c:238
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Widok/Kodowani_e znaków/Tradycyjne Chińskie (_Big5)"
 
-#: src/compose.c:664 src/mainwindow.c:720 src/messageview.c:245
+#: src/compose.c:664 src/mainwindow.c:722 src/messageview.c:245
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Widok/Kodowani_e znaków/Koreańskie (EUC-_KR)"
 
-#: src/compose.c:668 src/mainwindow.c:726 src/messageview.c:250
+#: src/compose.c:668 src/mainwindow.c:728 src/messageview.c:250
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Widok/Kodowani_e znaków/Tajskie (TIS-620)"
 
-#: src/compose.c:670 src/mainwindow.c:728 src/messageview.c:252
+#: src/compose.c:670 src/mainwindow.c:730 src/messageview.c:252
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Widok/Kodowani_e znaków/Tajskie (Windows-874)"
 
-#: src/compose.c:674 src/mainwindow.c:788 src/messageview.c:283
+#: src/compose.c:674 src/mainwindow.c:790 src/messageview.c:283
 msgid "/_Tools/_Address book"
 msgstr "/_Narzędzia/_Książka adresowa"
 
@@ -1501,13 +1501,13 @@ msgstr "/_Narzędzia/_Książka adresowa"
 msgid "/_Tools/_Template"
 msgstr "/_Narzędzia/_Szablon"
 
-#: src/compose.c:677 src/mainwindow.c:812 src/messageview.c:299
+#: src/compose.c:677 src/mainwindow.c:814 src/messageview.c:299
 msgid "/_Tools/Actio_ns"
 msgstr "/_Narzędzia/Polecen_ia"
 
-#: src/compose.c:679 src/compose.c:683 src/compose.c:689 src/mainwindow.c:791
-#: src/mainwindow.c:805 src/mainwindow.c:810 src/mainwindow.c:813
-#: src/mainwindow.c:817 src/mainwindow.c:819 src/messageview.c:286
+#: src/compose.c:679 src/compose.c:683 src/compose.c:689 src/mainwindow.c:793
+#: src/mainwindow.c:807 src/mainwindow.c:812 src/mainwindow.c:815
+#: src/mainwindow.c:819 src/mainwindow.c:821 src/messageview.c:286
 #: src/messageview.c:298
 msgid "/_Tools/---"
 msgstr "/_Narzędzia/---"
@@ -1708,7 +1708,7 @@ msgstr "Podpis PGP"
 msgid "PGP Encrypt"
 msgstr "Szyfrowanie PGP"
 
-#: src/compose.c:4442 src/compose.c:5543
+#: src/compose.c:4442 src/compose.c:5546
 msgid "MIME type"
 msgstr "typ MIME"
 
@@ -1751,36 +1751,36 @@ msgstr "Edytuj w zewnętrznym edytorze"
 msgid "Wrap all long lines"
 msgstr "Zawijaj wszystkie długie linie"
 
-#: src/compose.c:5439
+#: src/compose.c:5442
 msgid "Invalid MIME type."
 msgstr "Niepoprawny typ MIME."
 
-#: src/compose.c:5457
+#: src/compose.c:5460
 msgid "File doesn't exist or is empty."
 msgstr "Brak pliku lub pusty plik."
 
-#: src/compose.c:5525
+#: src/compose.c:5528
 msgid "Properties"
 msgstr "Właściwości"
 
-#: src/compose.c:5545 src/prefs_common_dialog.c:1504
+#: src/compose.c:5548 src/prefs_common_dialog.c:1504
 msgid "Encoding"
 msgstr "Kodowanie"
 
-#: src/compose.c:5568 src/prefs_folder_item.c:202
+#: src/compose.c:5571 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Ścieżka"
 
-#: src/compose.c:5569
+#: src/compose.c:5572
 msgid "File name"
 msgstr "Nazwa pliku"
 
-#: src/compose.c:5659
+#: src/compose.c:5662
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Niepoprawna linia wywołania zewnętrznego edytora: \"%s\"\n"
 
-#: src/compose.c:5714
+#: src/compose.c:5717
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1790,51 +1790,51 @@ msgstr ""
 "Czy wymusić zakończenie procesu?\n"
 "identyfikator grupy procesów: %d"
 
-#: src/compose.c:6040 src/mainwindow.c:2752
+#: src/compose.c:6043 src/mainwindow.c:2761
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:6156 src/compose.c:6161 src/compose.c:6167
+#: src/compose.c:6159 src/compose.c:6164 src/compose.c:6170
 msgid "Can't queue the message."
 msgstr "Nie można wstawić wiadomości do kolejki."
 
-#: src/compose.c:6258
+#: src/compose.c:6261
 msgid "Select files"
 msgstr "Wybierz pliki"
 
-#: src/compose.c:6281
+#: src/compose.c:6284
 msgid "Select file"
 msgstr "Wybierz plik"
 
-#: src/compose.c:6316
+#: src/compose.c:6319
 #, fuzzy
 msgid "Save message"
 msgstr "Wyślij wiadomość"
 
-#: src/compose.c:6317
+#: src/compose.c:6320
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Wiadomość została zmieniona, czy porzucić ją?"
 
-#: src/compose.c:6319
+#: src/compose.c:6322
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:6361
+#: src/compose.c:6364
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Czy chcesz zastosować szablon \"%s\"?"
 
-#: src/compose.c:6363
+#: src/compose.c:6366
 msgid "Apply template"
 msgstr "Zastosuj szablon"
 
-#: src/compose.c:6364
+#: src/compose.c:6367
 #, fuzzy
 msgid "_Replace"
 msgstr "Zamień"
 
-#: src/compose.c:6364
+#: src/compose.c:6367
 #, fuzzy
 msgid "_Insert"
 msgstr "Wstaw"
@@ -2294,12 +2294,12 @@ msgstr "Ustawianie informacji o katalogu...\n"
 msgid "Setting folder info..."
 msgstr "Ustawianie informacji o katalogu..."
 
-#: src/folderview.c:868 src/mainwindow.c:3748 src/setup.c:80
+#: src/folderview.c:868 src/mainwindow.c:3757 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Przeszukiwanie katalogu %s%c%s ..."
 
-#: src/folderview.c:872 src/mainwindow.c:3753 src/setup.c:85
+#: src/folderview.c:872 src/mainwindow.c:3762 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Przeszukiwanie katalogu %s ..."
@@ -3051,546 +3051,551 @@ msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/_Widok/Wyświetl lub _ukryj/_Pasek narzędzi/I_kony i tekst"
 
 #: src/mainwindow.c:566
-msgid "/_View/Show or hi_de/_Toolbar/_Icon"
+#, fuzzy
+msgid "/_View/Show or hi_de/_Toolbar/Text at the _right of icon"
 msgstr "/_Widok/Wyświetl lub _ukryj/_Pasek narzędzi/_Ikony"
 
 #: src/mainwindow.c:568
+msgid "/_View/Show or hi_de/_Toolbar/_Icon"
+msgstr "/_Widok/Wyświetl lub _ukryj/_Pasek narzędzi/_Ikony"
+
+#: src/mainwindow.c:570
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/_Widok/Wyświetl lub _ukryj/_Pasek narzędzi/_Tekst"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:572
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/_Widok/Wyświetl lub _ukryj/_Pasek narzędzi/Żade_n"
 
-#: src/mainwindow.c:572
+#: src/mainwindow.c:574
 #, fuzzy
 msgid "/_View/Show or hi_de/_Search bar"
 msgstr "/_Widok/Wyświetl lub _ukryj/Pa_sek stanu"
 
-#: src/mainwindow.c:574
+#: src/mainwindow.c:576
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/_Widok/Wyświetl lub _ukryj/Pa_sek stanu"
 
-#: src/mainwindow.c:576
+#: src/mainwindow.c:578
 #, fuzzy
 msgid "/_View/_Customize toolbar..."
 msgstr "/_Widok/Idź do inne_go katalogu..."
 
-#: src/mainwindow.c:578
+#: src/mainwindow.c:580
 msgid "/_View/Separate f_older tree"
 msgstr "/_Widok/_Oddzielne drzewo katalogów"
 
-#: src/mainwindow.c:579
+#: src/mainwindow.c:581
 msgid "/_View/Separate _message view"
 msgstr "/_Widok/Oddzielny widok wiado_mości"
 
-#: src/mainwindow.c:581
+#: src/mainwindow.c:583
 msgid "/_View/_Sort"
 msgstr "/_Widok/_Sortuj"
 
-#: src/mainwindow.c:582
+#: src/mainwindow.c:584
 msgid "/_View/_Sort/by _number"
 msgstr "/_Widok/_Sortuj/wg _numeru"
 
-#: src/mainwindow.c:583
+#: src/mainwindow.c:585
 msgid "/_View/_Sort/by s_ize"
 msgstr "/_Widok/_Sortuj/wg w_ielkości"
 
-#: src/mainwindow.c:584
+#: src/mainwindow.c:586
 msgid "/_View/_Sort/by _date"
 msgstr "/_Widok/_Sortuj/wg _daty"
 
-#: src/mainwindow.c:585
+#: src/mainwindow.c:587
 #, fuzzy
 msgid "/_View/_Sort/by t_hread date"
 msgstr "/_Widok/_Sortuj/wg _daty"
 
-#: src/mainwindow.c:586
+#: src/mainwindow.c:588
 msgid "/_View/_Sort/by _from"
 msgstr "/_Widok/_Sortuj/wg pola _od"
 
-#: src/mainwindow.c:587
+#: src/mainwindow.c:589
 msgid "/_View/_Sort/by _recipient"
 msgstr "/_Widok/_Sortuj/wg odbio_rcy"
 
-#: src/mainwindow.c:588
+#: src/mainwindow.c:590
 msgid "/_View/_Sort/by _subject"
 msgstr "/_Widok/_Sortuj/wg _tematu"
 
-#: src/mainwindow.c:589
+#: src/mainwindow.c:591
 msgid "/_View/_Sort/by _color label"
 msgstr "/_Widok/_Sortuj/wg _kolorów etykiet"
 
-#: src/mainwindow.c:591
+#: src/mainwindow.c:593
 msgid "/_View/_Sort/by _mark"
 msgstr "/_Widok/_Sortuj/wg _zaznaczeń"
 
-#: src/mainwindow.c:592
+#: src/mainwindow.c:594
 msgid "/_View/_Sort/by _unread"
 msgstr "/_Widok/_Sortuj/wg _nieprzeczytanych"
 
-#: src/mainwindow.c:593
+#: src/mainwindow.c:595
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/_Widok/_Sortuj/wg z_ałączników"
 
-#: src/mainwindow.c:595
+#: src/mainwindow.c:597
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/_Widok/_Sortuj/Nie s_ortuj"
 
-#: src/mainwindow.c:596 src/mainwindow.c:599
+#: src/mainwindow.c:598 src/mainwindow.c:601
 msgid "/_View/_Sort/---"
 msgstr "/_Widok/_Sortuj/---"
 
-#: src/mainwindow.c:597
+#: src/mainwindow.c:599
 msgid "/_View/_Sort/Ascending"
 msgstr "/_Widok/_Sortuj/Rosnąco"
 
-#: src/mainwindow.c:598
+#: src/mainwindow.c:600
 msgid "/_View/_Sort/Descending"
 msgstr "/_Widok/_Sortuj/Malejąco"
 
-#: src/mainwindow.c:600
+#: src/mainwindow.c:602
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/_Widok/_Sortuj/_Grupuj wg tematu"
 
-#: src/mainwindow.c:602
+#: src/mainwindow.c:604
 msgid "/_View/Th_read view"
 msgstr "/_Widok/Widok wą_tków"
 
-#: src/mainwindow.c:603
+#: src/mainwindow.c:605
 msgid "/_View/E_xpand all threads"
 msgstr "/_Widok/_Rozwiń wszystkie wątki"
 
-#: src/mainwindow.c:604
+#: src/mainwindow.c:606
 msgid "/_View/Co_llapse all threads"
 msgstr "/_Widok/_Zwiń wszystkie wątki"
 
-#: src/mainwindow.c:605
+#: src/mainwindow.c:607
 msgid "/_View/Set display _item..."
 msgstr "/_Widok/Ustaw wyświetlane _elementy..."
 
-#: src/mainwindow.c:608
+#: src/mainwindow.c:610
 msgid "/_View/_Go to"
 msgstr "/_Widok/_Idź do"
 
-#: src/mainwindow.c:609
+#: src/mainwindow.c:611
 msgid "/_View/_Go to/_Prev message"
 msgstr "/_Widok/_Idź do/_Poprzednia wiadomość"
 
-#: src/mainwindow.c:610
+#: src/mainwindow.c:612
 msgid "/_View/_Go to/_Next message"
 msgstr "/_Widok/_Idź do/_Następna wiadomość"
 
-#: src/mainwindow.c:611 src/mainwindow.c:616 src/mainwindow.c:619
-#: src/mainwindow.c:624 src/mainwindow.c:629
+#: src/mainwindow.c:613 src/mainwindow.c:618 src/mainwindow.c:621
+#: src/mainwindow.c:626 src/mainwindow.c:631
 msgid "/_View/_Go to/---"
 msgstr "/_Widok/_Idź do/---"
 
-#: src/mainwindow.c:612
+#: src/mainwindow.c:614
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/_Widok/_Idź do/Poprzednia niep_rzeczytana wiadomość"
 
-#: src/mainwindow.c:614
+#: src/mainwindow.c:616
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/_Widok/_Idź do/Następna ni_eprzeczytana wiadomość"
 
-#: src/mainwindow.c:617
+#: src/mainwindow.c:619
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/_Widok/_Idź do/_Poprzednia wiadomość"
 
-#: src/mainwindow.c:618
+#: src/mainwindow.c:620
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/_Widok/_Idź do/_Następna nowa wiadomość"
 
-#: src/mainwindow.c:620
+#: src/mainwindow.c:622
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/_Widok/_Idź do/Poprzednia zaznaczona wiado_mość"
 
-#: src/mainwindow.c:622
+#: src/mainwindow.c:624
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/_Widok/_Idź do/Następna z_aznaczona wiadomość"
 
-#: src/mainwindow.c:625
+#: src/mainwindow.c:627
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/_Widok/_Idź do/_Poprzednia etykietowana wiadomość"
 
-#: src/mainwindow.c:627
+#: src/mainwindow.c:629
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/_Widok/_Idź do/_Następna etykietowana wiadomość"
 
-#: src/mainwindow.c:630
+#: src/mainwindow.c:632
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Widok/Idź do inne_go katalogu..."
 
-#: src/mainwindow.c:639 src/messageview.c:174
+#: src/mainwindow.c:641 src/messageview.c:174
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Widok/Kodowani_e znaków/_Automatyczne"
 
-#: src/mainwindow.c:652 src/messageview.c:187
+#: src/mainwindow.c:654 src/messageview.c:187
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr "/_Widok/Kodowani_e znaków/Europa Zachodnia (ISO-8859-15)"
 
-#: src/mainwindow.c:700 src/messageview.c:227
+#: src/mainwindow.c:702 src/messageview.c:227
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Widok/Kodowani_e znaków/Japońskie (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:702 src/messageview.c:229
+#: src/mainwindow.c:704 src/messageview.c:229
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Widok/Kodowani_e znaków/Japońskie (_EUC-JP)"
 
-#: src/mainwindow.c:704 src/messageview.c:231
+#: src/mainwindow.c:706 src/messageview.c:231
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Widok/Kodowani_e znaków/Japońskie (_Shift__JIS)"
 
-#: src/mainwindow.c:714 src/messageview.c:240
+#: src/mainwindow.c:716 src/messageview.c:240
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Widok/Kodowani_e znaków/Tradycyjne Chińskie (EUC-_TW)"
 
-#: src/mainwindow.c:716 src/messageview.c:242
+#: src/mainwindow.c:718 src/messageview.c:242
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Widok/Kodowani_e znaków/Chińskie (ISO-2022-_CN)"
 
-#: src/mainwindow.c:722 src/messageview.c:247
+#: src/mainwindow.c:724 src/messageview.c:247
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Widok/Kodowani_e znaków/Koreańskie (ISO-2022-KR)"
 
-#: src/mainwindow.c:735 src/summaryview.c:464
+#: src/mainwindow.c:737 src/summaryview.c:464
 msgid "/_View/Open in new _window"
 msgstr "/W_Widok/Ot_wórz w nowym oknie"
 
-#: src/mainwindow.c:736 src/messageview.c:259 src/summaryview.c:466
+#: src/mainwindow.c:738 src/messageview.c:259 src/summaryview.c:466
 msgid "/_View/Mess_age source"
 msgstr "/_Widok/P_okaż źródło"
 
-#: src/mainwindow.c:737 src/messageview.c:260 src/summaryview.c:467
+#: src/mainwindow.c:739 src/messageview.c:260 src/summaryview.c:467
 #, fuzzy
 msgid "/_View/All _headers"
 msgstr "/_Widok/Wszystkie na_główki"
 
-#: src/mainwindow.c:739
+#: src/mainwindow.c:741
 msgid "/_View/_Update summary"
 msgstr "/_Widok/_Odśwież podsumowanie"
 
-#: src/mainwindow.c:741 src/messageview.c:263
+#: src/mainwindow.c:743 src/messageview.c:263
 msgid "/_Message"
 msgstr "/_Wiadomość"
 
-#: src/mainwindow.c:742
+#: src/mainwindow.c:744
 msgid "/_Message/Recei_ve"
 msgstr "/Wiado_mość/Odbier_z"
 
-#: src/mainwindow.c:743
+#: src/mainwindow.c:745
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/Wiado_mość/Odbier_z/Pobierz z bieżą_cego konta"
 
-#: src/mainwindow.c:745
+#: src/mainwindow.c:747
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/Wiado_mość/Odbier_z/Pobierz ze _wszystkich kont"
 
-#: src/mainwindow.c:747
+#: src/mainwindow.c:749
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/_Wiadomość/Odbier_z/Anuluj pob_ieranie"
 
-#: src/mainwindow.c:749
+#: src/mainwindow.c:751
 msgid "/_Message/Recei_ve/---"
 msgstr "/Wiado_mość/Odbier_z/---"
 
-#: src/mainwindow.c:750
+#: src/mainwindow.c:752
 msgid "/_Message/_Send queued messages"
 msgstr "/Wiado_mość/Wyślij wia_domości z kolejki"
 
-#: src/mainwindow.c:751 src/mainwindow.c:753 src/mainwindow.c:760
-#: src/mainwindow.c:765 src/mainwindow.c:768 src/mainwindow.c:779
-#: src/mainwindow.c:781 src/mainwindow.c:784 src/messageview.c:266
+#: src/mainwindow.c:753 src/mainwindow.c:755 src/mainwindow.c:762
+#: src/mainwindow.c:767 src/mainwindow.c:770 src/mainwindow.c:781
+#: src/mainwindow.c:783 src/mainwindow.c:786 src/messageview.c:266
 #: src/messageview.c:274 src/messageview.c:279
 msgid "/_Message/---"
 msgstr "/_Wiadomość/---"
 
-#: src/mainwindow.c:752 src/messageview.c:264
+#: src/mainwindow.c:754 src/messageview.c:264
 msgid "/_Message/Compose _new message"
 msgstr "/Wiado_mość/Twórz _nową wiadomość"
 
-#: src/mainwindow.c:754 src/messageview.c:267
+#: src/mainwindow.c:756 src/messageview.c:267
 msgid "/_Message/_Reply"
 msgstr "/Wiado_mość/_Odpowiedz"
 
-#: src/mainwindow.c:755
+#: src/mainwindow.c:757
 msgid "/_Message/Repl_y to"
 msgstr "/Wiado_mość/Odpowied_z"
 
-#: src/mainwindow.c:756 src/messageview.c:268
+#: src/mainwindow.c:758 src/messageview.c:268
 msgid "/_Message/Repl_y to/_all"
 msgstr "/Wiado_mość/Odpowied_z/w_szystkim"
 
-#: src/mainwindow.c:757 src/messageview.c:270
+#: src/mainwindow.c:759 src/messageview.c:270
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/Wiado_mość/Odpowied_z/nadawc_y"
 
-#: src/mainwindow.c:758 src/messageview.c:272
+#: src/mainwindow.c:760 src/messageview.c:272
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/Wiado_mość/Odpowiedz/_liście dyskusyjnej"
 
-#: src/mainwindow.c:761 src/messageview.c:275
+#: src/mainwindow.c:763 src/messageview.c:275
 msgid "/_Message/_Forward"
 msgstr "/Wiado_mość/Przekaż da_lej"
 
-#: src/mainwindow.c:762 src/messageview.c:276
+#: src/mainwindow.c:764 src/messageview.c:276
 msgid "/_Message/For_ward as attachment"
 msgstr "/Wiado_mość/Przekaż j_ako załącznik"
 
-#: src/mainwindow.c:764 src/messageview.c:278
+#: src/mainwindow.c:766 src/messageview.c:278
 msgid "/_Message/Redirec_t"
 msgstr "/Wiado_mość/Prze_kieruj"
 
-#: src/mainwindow.c:766
+#: src/mainwindow.c:768
 msgid "/_Message/M_ove..."
 msgstr "/Wiado_mość/_Przesuń..."
 
-#: src/mainwindow.c:767
+#: src/mainwindow.c:769
 msgid "/_Message/_Copy..."
 msgstr "/Wiado_mość/_Kopiuj"
 
-#: src/mainwindow.c:769
+#: src/mainwindow.c:771
 msgid "/_Message/_Mark"
 msgstr "/Wiado_mość/_Zaznacz"
 
-#: src/mainwindow.c:770
+#: src/mainwindow.c:772
 msgid "/_Message/_Mark/_Mark"
 msgstr "/Wiado_mość/_Zaznacz/_Zaznacz"
 
-#: src/mainwindow.c:771
+#: src/mainwindow.c:773
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/Wiado_mość/_Zaznacz/_Odznacz"
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:774
 msgid "/_Message/_Mark/---"
 msgstr "/Wiado_mość/_Zaznacz/---"
 
-#: src/mainwindow.c:773
+#: src/mainwindow.c:775
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/Wiado_mość/_Zaznacz/Zaznacz jako ni_eprzeczytane"
 
-#: src/mainwindow.c:774
+#: src/mainwindow.c:776
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/Wiado_mość/_Zaznacz/Zaznacz jako przecz_ytane"
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:778
 #, fuzzy
 msgid "/_Message/_Mark/Mark _thread as read"
 msgstr "/Wiado_mość/_Zaznacz/Zaznacz jako przecz_ytane"
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:780
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/Wiado_mość/_Zaznacz/Zaznacz wszystkie jako przecz_ytane"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:782
 msgid "/_Message/_Delete"
 msgstr "/Wiado_mość/_Usuń"
 
-#: src/mainwindow.c:782
+#: src/mainwindow.c:784
 #, fuzzy
 msgid "/_Message/Set as _junk mail"
 msgstr "/Wiado_mość/_Zaznacz/_Odznacz"
 
-#: src/mainwindow.c:783
+#: src/mainwindow.c:785
 msgid "/_Message/Set as not j_unk mail"
 msgstr ""
 
-#: src/mainwindow.c:785 src/messageview.c:280
+#: src/mainwindow.c:787 src/messageview.c:280
 msgid "/_Message/Re-_edit"
 msgstr "/Wiado_mość/Prz_eedytuj"
 
-#: src/mainwindow.c:789
+#: src/mainwindow.c:791
 #, fuzzy
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/_Narzędzia/Dodaj nadawcę do _książki adresowej"
 
-#: src/mainwindow.c:792
+#: src/mainwindow.c:794
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/_Narzędzia/_Filtruj wiadomości w katalogu"
 
-#: src/mainwindow.c:794
+#: src/mainwindow.c:796
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Narzędzia/Filtruj zaznaczonne wiadomości"
 
-#: src/mainwindow.c:796 src/messageview.c:287
+#: src/mainwindow.c:798 src/messageview.c:287
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Narzędzia/_Utwórz regułę filtrowania"
 
-#: src/mainwindow.c:797 src/messageview.c:289
+#: src/mainwindow.c:799 src/messageview.c:289
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Narzędzia/_Utwórz regułę filtrowania/_Automatycznie"
 
-#: src/mainwindow.c:799 src/messageview.c:291
+#: src/mainwindow.c:801 src/messageview.c:291
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Narzędzia/_Utwórz regułę filtrowania/_Od"
 
-#: src/mainwindow.c:801 src/messageview.c:293
+#: src/mainwindow.c:803 src/messageview.c:293
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Narzędzia/_Utwórz regułę filtrowania/_Do"
 
-#: src/mainwindow.c:803 src/messageview.c:295
+#: src/mainwindow.c:805 src/messageview.c:295
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Narzędzia/_Utwórz regułę filtrowania/_Temat"
 
-#: src/mainwindow.c:806
+#: src/mainwindow.c:808
 #, fuzzy
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/_Narzędzia/_Filtruj wiadomości w katalogu"
 
-#: src/mainwindow.c:808
+#: src/mainwindow.c:810
 #, fuzzy
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/_Narzędzia/Filtruj zaznaczonne wiadomości"
 
-#: src/mainwindow.c:815
+#: src/mainwindow.c:817
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/Wiado_mość/Usuń z_duplikowane wiadomości"
 
-#: src/mainwindow.c:818
+#: src/mainwindow.c:820
 #, fuzzy
 msgid "/_Tools/E_xecute marked process"
 msgstr "Wykonaj zaznaczony proces"
 
-#: src/mainwindow.c:820
+#: src/mainwindow.c:822
 msgid "/_Tools/_Log window"
 msgstr "/_Narzędzia/Okno _logów"
 
-#: src/mainwindow.c:822
+#: src/mainwindow.c:824
 msgid "/_Configuration"
 msgstr "/Konfigura_cja"
 
-#: src/mainwindow.c:823
+#: src/mainwindow.c:825
 msgid "/_Configuration/_Common preferences..."
 msgstr "/Konfigura_cja/Preferen_cje..."
 
-#: src/mainwindow.c:825
+#: src/mainwindow.c:827
 msgid "/_Configuration/_Filter setting..."
 msgstr "/Konfigura_cja/Ustawienia _filtrowania"
 
-#: src/mainwindow.c:827
+#: src/mainwindow.c:829
 msgid "/_Configuration/_Template..."
 msgstr "/Konfigura_cja/_Szablon..."
 
-#: src/mainwindow.c:829
+#: src/mainwindow.c:831
 msgid "/_Configuration/_Actions..."
 msgstr "/Konfigura_cja/Poleceni_a..."
 
-#: src/mainwindow.c:831
+#: src/mainwindow.c:833
 msgid "/_Configuration/---"
 msgstr "/Konfigura_cja/---"
 
-#: src/mainwindow.c:832
+#: src/mainwindow.c:834
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/Konfigura_cja/_Preferencje bieżącego konta..."
 
-#: src/mainwindow.c:834
+#: src/mainwindow.c:836
 msgid "/_Configuration/Create _new account..."
 msgstr "/Konfigura_cja/Utwórz _nowe konto..."
 
-#: src/mainwindow.c:836
+#: src/mainwindow.c:838
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/Konfigura_cja/_Edytuj konta..."
 
-#: src/mainwindow.c:838
+#: src/mainwindow.c:840
 msgid "/_Configuration/C_hange current account"
 msgstr "/Konfigura_cja/Zmień bieżą_ce konto"
 
-#: src/mainwindow.c:842
+#: src/mainwindow.c:844
 msgid "/_Help/_Manual"
 msgstr "/_Pomoc/_Podręcznik"
 
-#: src/mainwindow.c:843
+#: src/mainwindow.c:845
 msgid "/_Help/_Manual/_English"
 msgstr "/_Pomoc/_Podręcznik/Angi_elski"
 
-#: src/mainwindow.c:844
+#: src/mainwindow.c:846
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/_Pomoc/_Podręcznik/_Japoński"
 
-#: src/mainwindow.c:845
+#: src/mainwindow.c:847
 msgid "/_Help/_FAQ"
 msgstr "/Pomo_c/_FAQ"
 
-#: src/mainwindow.c:846
+#: src/mainwindow.c:848
 msgid "/_Help/_FAQ/_English"
 msgstr "/_Pomoc/_FAQ/Angi_elskie"
 
-#: src/mainwindow.c:847
+#: src/mainwindow.c:849
 msgid "/_Help/_FAQ/_German"
 msgstr "/_Pomoc/_FAQ/_Niemieckie"
 
-#: src/mainwindow.c:848
+#: src/mainwindow.c:850
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/_Pomoc/_FAQ/Hi_szpańskie"
 
-#: src/mainwindow.c:849
+#: src/mainwindow.c:851
 msgid "/_Help/_FAQ/_French"
 msgstr "/_Pomoc/_FAQ/_Francuskie"
 
-#: src/mainwindow.c:850
+#: src/mainwindow.c:852
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/_Pomoc/_FAQ/_Włoskie"
 
-#: src/mainwindow.c:851
+#: src/mainwindow.c:853
 #, fuzzy
 msgid "/_Help/_Command line options"
 msgstr "Nie ustawiono polecenia."
 
-#: src/mainwindow.c:852
+#: src/mainwindow.c:854
 msgid "/_Help/---"
 msgstr "/_Pomoc/---"
 
-#: src/mainwindow.c:895
+#: src/mainwindow.c:897
 msgid "Creating main window...\n"
 msgstr "Tworzenie głównego okna...\n"
 
-#: src/mainwindow.c:1071
+#: src/mainwindow.c:1073
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Okno główne: błąd alokacji kolorów %d\n"
 
-#: src/mainwindow.c:1175 src/summaryview.c:2387 src/summaryview.c:2472
+#: src/mainwindow.c:1181 src/summaryview.c:2387 src/summaryview.c:2472
 #: src/summaryview.c:4009 src/summaryview.c:4138 src/summaryview.c:4507
 msgid "done.\n"
 msgstr "gotowe.\n"
 
-#: src/mainwindow.c:1293 src/mainwindow.c:1334 src/mainwindow.c:1359
+#: src/mainwindow.c:1299 src/mainwindow.c:1340 src/mainwindow.c:1365
 msgid "Untitled"
 msgstr "Bez tytułu"
 
-#: src/mainwindow.c:1360
+#: src/mainwindow.c:1366
 msgid "none"
 msgstr "żaden"
 
-#: src/mainwindow.c:1413
+#: src/mainwindow.c:1419
 #, 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:1663
+#: src/mainwindow.c:1669
 msgid "Offline"
 msgstr "Offline"
 
-#: src/mainwindow.c:1664
+#: src/mainwindow.c:1670
 msgid "You are offline. Go online?"
 msgstr "Jesteś offline. Przejść do trybu online?"
 
-#: src/mainwindow.c:1681
+#: src/mainwindow.c:1687
 msgid "Empty all trash"
 msgstr "Opróżnij śmietnik"
 
-#: src/mainwindow.c:1682
+#: src/mainwindow.c:1688
 #, fuzzy
 msgid "Delete all messages in trash folders?"
 msgstr "Czy usunąć wszystkie wiadomości ze śmietnika?"
 
-#: src/mainwindow.c:1712
+#: src/mainwindow.c:1718
 msgid "Add mailbox"
 msgstr "Dodaj skrzynkę"
 
-#: src/mainwindow.c:1713
+#: src/mainwindow.c:1719
 #, fuzzy
 msgid ""
 "Specify the location of mailbox.\n"
@@ -3601,16 +3606,16 @@ msgstr ""
 "Jeśli zostanie podana istniejąca skrzynka, będzie ona\n"
 "automatycznie skanowana."
 
-#: src/mainwindow.c:1719 src/setup.c:49
+#: src/mainwindow.c:1725 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Skrzynka \"%s\" już istnieje."
 
-#: src/mainwindow.c:1724 src/setup.c:56
+#: src/mainwindow.c:1730 src/setup.c:56
 msgid "Mailbox"
 msgstr "Skrzynka"
 
-#: src/mainwindow.c:1730 src/setup.c:62
+#: src/mainwindow.c:1736 src/setup.c:62
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3620,132 +3625,132 @@ msgstr ""
 "Być może pliki już istnieją lub brak jest wystarczających uprawnień do "
 "zapisu w tym miejscu."
 
-#: src/mainwindow.c:2198
+#: src/mainwindow.c:2206
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Widok Katalogów"
 
-#: src/mainwindow.c:2217
+#: src/mainwindow.c:2225
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Widok Wiadomości"
 
-#: src/mainwindow.c:2369 src/summaryview.c:418
+#: src/mainwindow.c:2377 src/summaryview.c:418
 msgid "/_Reply"
 msgstr "/_Odpowiedz"
 
-#: src/mainwindow.c:2370
+#: src/mainwindow.c:2378
 msgid "/Reply to _all"
 msgstr "/Odpowiedz wszystkim"
 
-#: src/mainwindow.c:2371
+#: src/mainwindow.c:2379
 msgid "/Reply to _sender"
 msgstr "/Odpowiedz nadawcy"
 
-#: src/mainwindow.c:2372
+#: src/mainwindow.c:2380
 msgid "/Reply to mailing _list"
 msgstr "/Odpowiedz _liście dyskusyjnej"
 
-#: src/mainwindow.c:2377 src/summaryview.c:425
+#: src/mainwindow.c:2385 src/summaryview.c:425
 msgid "/_Forward"
 msgstr "/Prze_każ"
 
-#: src/mainwindow.c:2378 src/summaryview.c:426
+#: src/mainwindow.c:2386 src/summaryview.c:426
 msgid "/For_ward as attachment"
 msgstr "/Przekaż jako załącznik"
 
-#: src/mainwindow.c:2379 src/summaryview.c:427
+#: src/mainwindow.c:2387 src/summaryview.c:427
 msgid "/Redirec_t"
 msgstr "/Prze_kieruj"
 
-#: src/mainwindow.c:2384
+#: src/mainwindow.c:2392
 msgid "Incorporate new mail"
 msgstr "Odbierz nową pocztę"
 
-#: src/mainwindow.c:2386
+#: src/mainwindow.c:2394
 msgid "Incorporate new mail of all accounts"
 msgstr "Odbierz nową pocztę z wszystkich kont"
 
-#: src/mainwindow.c:2388
+#: src/mainwindow.c:2396
 msgid "Send queued message(s)"
 msgstr "Wyślij wiadomości z kolejki"
 
-#: src/mainwindow.c:2390
+#: src/mainwindow.c:2398
 msgid "Compose new message"
 msgstr "Utwórz nową wiadomość"
 
-#: src/mainwindow.c:2392
+#: src/mainwindow.c:2400
 msgid "Reply to the message"
 msgstr "Odpowiedz na wiadomość"
 
-#: src/mainwindow.c:2394
+#: src/mainwindow.c:2402
 msgid "Reply to all"
 msgstr "Odpowiedz na wszystkie"
 
-#: src/mainwindow.c:2396
+#: src/mainwindow.c:2404
 msgid "Forward the message"
 msgstr "Przekaż wiadomość dalej"
 
-#: src/mainwindow.c:2398
+#: src/mainwindow.c:2406
 msgid "Delete the message"
 msgstr "Usuń wiadomość"
 
-#: src/mainwindow.c:2400
+#: src/mainwindow.c:2408
 #, fuzzy
 msgid "Set as junk mail"
 msgstr "Ustaw jako domyślne"
 
-#: src/mainwindow.c:2402
+#: src/mainwindow.c:2410
 msgid "Execute marked process"
 msgstr "Wykonaj zaznaczony proces"
 
-#: src/mainwindow.c:2404
+#: src/mainwindow.c:2412
 msgid "Next unread message"
 msgstr "Następna nieprzeczytana wiadomość"
 
-#: src/mainwindow.c:2406
+#: src/mainwindow.c:2414
 #, fuzzy
 msgid "Previous unread message"
 msgstr "Następna nieprzeczytana wiadomość"
 
-#: src/mainwindow.c:2410
+#: src/mainwindow.c:2418
 #, fuzzy
 msgid "Print message"
 msgstr "Wyślij wiadomość"
 
-#: src/mainwindow.c:2412
+#: src/mainwindow.c:2420
 msgid "Common preferences"
 msgstr "Wspólne preferencje "
 
-#: src/mainwindow.c:2414 src/prefs_account_dialog.c:511
+#: src/mainwindow.c:2422 src/prefs_account_dialog.c:511
 msgid "Account preferences"
 msgstr "Preferencje konta"
 
-#: src/mainwindow.c:2779
+#: src/mainwindow.c:2788
 msgid "You are offline. Click the icon to go online."
 msgstr "Jesteś offline. Kliknij ikonę by przejść do trybu online."
 
-#: src/mainwindow.c:2790
+#: src/mainwindow.c:2799
 msgid "You are online. Click the icon to go offline."
 msgstr "Jesteś online. Kliknij ikonę, by przejść do trybu offline."
 
-#: src/mainwindow.c:3062
+#: src/mainwindow.c:3071
 msgid "Exit"
 msgstr "Koniec programu"
 
-#: src/mainwindow.c:3062
+#: src/mainwindow.c:3071
 msgid "Exit this program?"
 msgstr "Czy zakończyć program?"
 
-#: src/mainwindow.c:3666
+#: src/mainwindow.c:3675
 #, fuzzy
 msgid "Command line options"
 msgstr "Nie ustawiono polecenia."
 
-#: src/mainwindow.c:3679
+#: src/mainwindow.c:3688
 #, fuzzy
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Użycie: %s [OPCJE]...\n"
 
-#: src/mainwindow.c:3687
+#: src/mainwindow.c:3696
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -3761,7 +3766,7 @@ msgid ""
 "--version"
 msgstr ""
 
-#: src/mainwindow.c:3703
+#: src/mainwindow.c:3712
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index b0c68db0..faa9d578 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-01-31 16:49+0900\n"
+"POT-Creation-Date: 2007-01-31 17:29+0900\n"
 "PO-Revision-Date: 2007-01-29 10:50-0300\n"
 "Last-Translator: Ricardo Nabinger Sanchez <rnsanchez@gmail.com>\n"
 "Language-Team: Ricardo Nabinger Sanchez <rnsanchez@gmail.com>\n"
@@ -913,7 +913,7 @@ msgstr "/_Endereço/_Editar"
 msgid "/_Address/_Delete"
 msgstr "/_Endereço/_Apagar"
 
-#: src/addressbook.c:359 src/compose.c:673 src/mainwindow.c:787
+#: src/addressbook.c:359 src/compose.c:673 src/mainwindow.c:789
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Ferramentas"
@@ -922,12 +922,12 @@ msgstr "/_Ferramentas"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Ferramentas/Importar arquivo _LDIF"
 
-#: src/addressbook.c:361 src/compose.c:694 src/mainwindow.c:841
+#: src/addressbook.c:361 src/compose.c:694 src/mainwindow.c:843
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/A_juda"
 
-#: src/addressbook.c:362 src/compose.c:695 src/mainwindow.c:853
+#: src/addressbook.c:362 src/compose.c:695 src/mainwindow.c:855
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/A_juda/_Sobre"
@@ -969,7 +969,7 @@ msgstr "/_Apagar"
 msgid "E-Mail address"
 msgstr "Endereço de e-mail"
 
-#: src/addressbook.c:496 src/compose.c:4873 src/mainwindow.c:2408
+#: src/addressbook.c:496 src/compose.c:4873 src/mainwindow.c:2416
 #: src/prefs_common_dialog.c:2274
 msgid "Address book"
 msgstr "Catálogo de endereços"
@@ -1188,7 +1188,7 @@ msgstr "Endereços comuns"
 msgid "Personal address"
 msgstr "Endereços pessoais"
 
-#: src/alertpanel.c:142 src/compose.c:5717 src/main.c:638
+#: src/alertpanel.c:142 src/compose.c:5720 src/main.c:638
 msgid "Notice"
 msgstr "Notificação"
 
@@ -1355,9 +1355,9 @@ msgid "/_View/_Reply to"
 msgstr "/E_xibir/_Responder para"
 
 #: src/compose.c:578 src/compose.c:580 src/compose.c:582 src/compose.c:584
-#: src/compose.c:587 src/mainwindow.c:577 src/mainwindow.c:580
-#: src/mainwindow.c:607 src/mainwindow.c:631 src/mainwindow.c:734
-#: src/mainwindow.c:738 src/messageview.c:258
+#: src/compose.c:587 src/mainwindow.c:579 src/mainwindow.c:582
+#: src/mainwindow.c:609 src/mainwindow.c:633 src/mainwindow.c:736
+#: src/mainwindow.c:740 src/messageview.c:258
 msgid "/_View/---"
 msgstr "/E_xibir/---"
 
@@ -1377,7 +1377,7 @@ msgstr "/E_xibir/_Anexo"
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/E_xibir/Cu_stomizar barra de ferramentas..."
 
-#: src/compose.c:593 src/mainwindow.c:638 src/messageview.c:173
+#: src/compose.c:593 src/mainwindow.c:640 src/messageview.c:173
 msgid "/_View/Character _encoding"
 msgstr "/E_xibir/_Codificação de caracteres"
 
@@ -1388,112 +1388,112 @@ msgstr "/E_xibir/Codificação de caracteres/_Automático"
 #: src/compose.c:596 src/compose.c:602 src/compose.c:608 src/compose.c:612
 #: src/compose.c:620 src/compose.c:624 src/compose.c:630 src/compose.c:636
 #: src/compose.c:640 src/compose.c:650 src/compose.c:654 src/compose.c:662
-#: src/compose.c:666 src/mainwindow.c:634 src/mainwindow.c:641
+#: src/compose.c:666 src/mainwindow.c:636 src/mainwindow.c:643
 #: src/messageview.c:169
 msgid "/_View/Character _encoding/---"
 msgstr "/E_xibir/_Codificação de caracteres/---"
 
-#: src/compose.c:598 src/mainwindow.c:642 src/messageview.c:177
+#: src/compose.c:598 src/mainwindow.c:644 src/messageview.c:177
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/E_xibir/_Codificação de caracteres/ASCII de 7 bits (US-ASC_II)"
 
-#: src/compose.c:600 src/mainwindow.c:644 src/messageview.c:180
+#: src/compose.c:600 src/mainwindow.c:646 src/messageview.c:180
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/E_xibir/_/Codificação de caracteresUnicode (_UTF-8)"
 
-#: src/compose.c:604 src/mainwindow.c:648 src/messageview.c:183
+#: src/compose.c:604 src/mainwindow.c:650 src/messageview.c:183
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/E_xibir/_Codificação de caracteres/Europa Ocidental (ISO-8859-_1)"
 
-#: src/compose.c:606 src/mainwindow.c:650 src/messageview.c:185
+#: src/compose.c:606 src/mainwindow.c:652 src/messageview.c:185
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/E_xibir/_Codificação de caracteres/Europa Ocidental (ISO-8859-15)"
 
-#: src/compose.c:610 src/mainwindow.c:656 src/messageview.c:190
+#: src/compose.c:610 src/mainwindow.c:658 src/messageview.c:190
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/E_xibir/_/Codificação de caracteres/Europa Central (ISO-8859-_2)"
 
-#: src/compose.c:614 src/mainwindow.c:660 src/messageview.c:193
+#: src/compose.c:614 src/mainwindow.c:662 src/messageview.c:193
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/E_xibir/_Codificação de caracteres/_Báltico (ISO-8859-13)"
 
-#: src/compose.c:616 src/mainwindow.c:662 src/messageview.c:195
+#: src/compose.c:616 src/mainwindow.c:664 src/messageview.c:195
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/E_xibir/_Codificação de caracteres/Báltico (ISO-8859-_4)"
 
-#: src/compose.c:618 src/mainwindow.c:664 src/messageview.c:197
+#: src/compose.c:618 src/mainwindow.c:666 src/messageview.c:197
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/E_xibir/_Codificação de caracteres/Báltico (Windows-1257)"
 
-#: src/compose.c:622 src/mainwindow.c:668 src/messageview.c:200
+#: src/compose.c:622 src/mainwindow.c:670 src/messageview.c:200
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/E_xibir/_Codificação de caracteres/Grego (ISO-8859-_7)"
 
-#: src/compose.c:626 src/mainwindow.c:672 src/messageview.c:203
+#: src/compose.c:626 src/mainwindow.c:674 src/messageview.c:203
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/E_xibir/_Codificação de caracteres/Arábico (ISO-8859-_6)"
 
-#: src/compose.c:628 src/mainwindow.c:674 src/messageview.c:205
+#: src/compose.c:628 src/mainwindow.c:676 src/messageview.c:205
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/E_xibir/_Codificação de caracteres/Arábico (Windows-1256)"
 
-#: src/compose.c:632 src/mainwindow.c:678 src/messageview.c:208
+#: src/compose.c:632 src/mainwindow.c:680 src/messageview.c:208
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/E_xibir/_Codificação de caracteres/Hebreu (ISO-8859-_8)"
 
-#: src/compose.c:634 src/mainwindow.c:680 src/messageview.c:210
+#: src/compose.c:634 src/mainwindow.c:682 src/messageview.c:210
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/E_xibir/_Codificação de caracteres/Hebreu (Windows-1255)"
 
-#: src/compose.c:638 src/mainwindow.c:684 src/messageview.c:213
+#: src/compose.c:638 src/mainwindow.c:686 src/messageview.c:213
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/E_xibir/_Codificação de caracteres/Turco (ISO-8859-_9)"
 
-#: src/compose.c:642 src/mainwindow.c:688 src/messageview.c:216
+#: src/compose.c:642 src/mainwindow.c:690 src/messageview.c:216
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/E_xibir/_Codificação de caracteres/Cirílico (ISO-8859-_5)"
 
-#: src/compose.c:644 src/mainwindow.c:690 src/messageview.c:218
+#: src/compose.c:644 src/mainwindow.c:692 src/messageview.c:218
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/E_xibir/_Codificação de caracteres/Cirílico (KOI8-_R)"
 
-#: src/compose.c:646 src/mainwindow.c:692 src/messageview.c:220
+#: src/compose.c:646 src/mainwindow.c:694 src/messageview.c:220
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/E_xibir/_Codificação de caracteres/Cirílico (KOI8-U)"
 
-#: src/compose.c:648 src/mainwindow.c:694 src/messageview.c:222
+#: src/compose.c:648 src/mainwindow.c:696 src/messageview.c:222
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/E_xibir/_Codificação de caracteres/Cirílico (Windows-1251)"
 
-#: src/compose.c:652 src/mainwindow.c:698 src/messageview.c:225
+#: src/compose.c:652 src/mainwindow.c:700 src/messageview.c:225
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/E_xibir/_Codificação de caracteres/Japonês (ISO-2022-_JP)"
 
-#: src/compose.c:656 src/mainwindow.c:708 src/messageview.c:234
+#: src/compose.c:656 src/mainwindow.c:710 src/messageview.c:234
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/E_xibir/_Codificação de caracteres/Chinês simplificado (_GB2312)"
 
-#: src/compose.c:658 src/mainwindow.c:710 src/messageview.c:236
+#: src/compose.c:658 src/mainwindow.c:712 src/messageview.c:236
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/E_xibir/_Codificação de caracteres/Chinês simplificado (GBK)"
 
-#: src/compose.c:660 src/mainwindow.c:712 src/messageview.c:238
+#: src/compose.c:660 src/mainwindow.c:714 src/messageview.c:238
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/E_xibir/_Codificação de caracteres/Chinês tradicional (_Big5)"
 
-#: src/compose.c:664 src/mainwindow.c:720 src/messageview.c:245
+#: src/compose.c:664 src/mainwindow.c:722 src/messageview.c:245
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/E_xibir/_Codificação de caracteres/Coreano (EUC-_KR)"
 
-#: src/compose.c:668 src/mainwindow.c:726 src/messageview.c:250
+#: src/compose.c:668 src/mainwindow.c:728 src/messageview.c:250
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/E_xibir/_Codificação de caracteres/Thai (TIS-620)"
 
-#: src/compose.c:670 src/mainwindow.c:728 src/messageview.c:252
+#: src/compose.c:670 src/mainwindow.c:730 src/messageview.c:252
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/E_xibir/_Codificação de caracteres/Thai (Windows-874)"
 
-#: src/compose.c:674 src/mainwindow.c:788 src/messageview.c:283
+#: src/compose.c:674 src/mainwindow.c:790 src/messageview.c:283
 msgid "/_Tools/_Address book"
 msgstr "/_Ferramentas/_Catálogo de endereços"
 
@@ -1501,13 +1501,13 @@ msgstr "/_Ferramentas/_Catálogo de endereços"
 msgid "/_Tools/_Template"
 msgstr "/_Ferramenta/_Modelo"
 
-#: src/compose.c:677 src/mainwindow.c:812 src/messageview.c:299
+#: src/compose.c:677 src/mainwindow.c:814 src/messageview.c:299
 msgid "/_Tools/Actio_ns"
 msgstr "/_Ferramentas/_Ações"
 
-#: src/compose.c:679 src/compose.c:683 src/compose.c:689 src/mainwindow.c:791
-#: src/mainwindow.c:805 src/mainwindow.c:810 src/mainwindow.c:813
-#: src/mainwindow.c:817 src/mainwindow.c:819 src/messageview.c:286
+#: src/compose.c:679 src/compose.c:683 src/compose.c:689 src/mainwindow.c:793
+#: src/mainwindow.c:807 src/mainwindow.c:812 src/mainwindow.c:815
+#: src/mainwindow.c:819 src/mainwindow.c:821 src/messageview.c:286
 #: src/messageview.c:298
 msgid "/_Tools/---"
 msgstr "/_Ferramentas/---"
@@ -1714,7 +1714,7 @@ msgstr "Assinar (PGP)"
 msgid "PGP Encrypt"
 msgstr "Encriptar (PGP)"
 
-#: src/compose.c:4442 src/compose.c:5543
+#: src/compose.c:4442 src/compose.c:5546
 msgid "MIME type"
 msgstr "Tipo MIME"
 
@@ -1756,36 +1756,36 @@ msgstr "Editar com um editor externo"
 msgid "Wrap all long lines"
 msgstr "Quebrar todas as linhas compridas"
 
-#: src/compose.c:5439
+#: src/compose.c:5442
 msgid "Invalid MIME type."
 msgstr "Tipo MIME inválido."
 
-#: src/compose.c:5457
+#: src/compose.c:5460
 msgid "File doesn't exist or is empty."
 msgstr "O arquivo não existe ou está vazio."
 
-#: src/compose.c:5525
+#: src/compose.c:5528
 msgid "Properties"
 msgstr "Propriedades"
 
-#: src/compose.c:5545 src/prefs_common_dialog.c:1504
+#: src/compose.c:5548 src/prefs_common_dialog.c:1504
 msgid "Encoding"
 msgstr "Codificação"
 
-#: src/compose.c:5568 src/prefs_folder_item.c:202
+#: src/compose.c:5571 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Caminho"
 
-#: src/compose.c:5569
+#: src/compose.c:5572
 msgid "File name"
 msgstr "Nome do arquivo"
 
-#: src/compose.c:5659
+#: src/compose.c:5662
 #, 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:5714
+#: src/compose.c:5717
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1794,48 +1794,48 @@ msgstr ""
 "O editor externo está ativo.\n"
 "Forçar a finalização do processo (pid: %d)?\n"
 
-#: src/compose.c:6040 src/mainwindow.c:2752
+#: src/compose.c:6043 src/mainwindow.c:2761
 msgid "_Customize toolbar..."
 msgstr "_Customizar barra de ferramentas..."
 
-#: src/compose.c:6156 src/compose.c:6161 src/compose.c:6167
+#: src/compose.c:6159 src/compose.c:6164 src/compose.c:6170
 msgid "Can't queue the message."
 msgstr "Não foi possível enfileirar a mensagem."
 
-#: src/compose.c:6258
+#: src/compose.c:6261
 msgid "Select files"
 msgstr "Selecionar arquivos"
 
-#: src/compose.c:6281
+#: src/compose.c:6284
 msgid "Select file"
 msgstr "Selecionar arquivo"
 
-#: src/compose.c:6316
+#: src/compose.c:6319
 msgid "Save message"
 msgstr "Salvar mensagem"
 
-#: src/compose.c:6317
+#: src/compose.c:6320
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Esta mensagem foi modificada. Salvá-la na pasta de rascunhos?"
 
-#: src/compose.c:6319
+#: src/compose.c:6322
 msgid "Close _without saving"
 msgstr "_Fechar sem salvar"
 
-#: src/compose.c:6361
+#: src/compose.c:6364
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Quer aplicar o modelo `%s'?"
 
-#: src/compose.c:6363
+#: src/compose.c:6366
 msgid "Apply template"
 msgstr "Aplicar Modelo"
 
-#: src/compose.c:6364
+#: src/compose.c:6367
 msgid "_Replace"
 msgstr "_Substituir"
 
-#: src/compose.c:6364
+#: src/compose.c:6367
 msgid "_Insert"
 msgstr "_Inserir"
 
@@ -2293,12 +2293,12 @@ msgstr "Configurando informações da pasta...\n"
 msgid "Setting folder info..."
 msgstr "Configurando informações da pasta..."
 
-#: src/folderview.c:868 src/mainwindow.c:3748 src/setup.c:80
+#: src/folderview.c:868 src/mainwindow.c:3757 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Revisando pasta %s%c%s ..."
 
-#: src/folderview.c:872 src/mainwindow.c:3753 src/setup.c:85
+#: src/folderview.c:872 src/mainwindow.c:3762 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Revisando pasta %s ..."
@@ -3059,534 +3059,539 @@ msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/E_xibir/_Mostrar ou esconder/_Barra de Ferramentas/Ícones _e texto"
 
 #: src/mainwindow.c:566
-msgid "/_View/Show or hi_de/_Toolbar/_Icon"
+#, fuzzy
+msgid "/_View/Show or hi_de/_Toolbar/Text at the _right of icon"
 msgstr "/E_xibir/_Mostrar ou esconder/_Barra de Ferramentas/Í_cones"
 
 #: src/mainwindow.c:568
+msgid "/_View/Show or hi_de/_Toolbar/_Icon"
+msgstr "/E_xibir/_Mostrar ou esconder/_Barra de Ferramentas/Í_cones"
+
+#: src/mainwindow.c:570
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/E_xibir/_Mostrar ou esconder/_Barra de Ferramentas/_Texto"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:572
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/E_xibir/_Mostrar ou esconder/_Barra de Ferramentas/_Nenhum"
 
-#: src/mainwindow.c:572
+#: src/mainwindow.c:574
 msgid "/_View/Show or hi_de/_Search bar"
 msgstr "/E_xibir/_Mostrar ou esconder/Barra de _busca"
 
-#: src/mainwindow.c:574
+#: src/mainwindow.c:576
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/E_xibir/_Mostrar ou esconder/Barra de _estado"
 
-#: src/mainwindow.c:576
+#: src/mainwindow.c:578
 msgid "/_View/_Customize toolbar..."
 msgstr "/E_xibir/_Customizar barra de ferramentas..."
 
-#: src/mainwindow.c:578
+#: src/mainwindow.c:580
 msgid "/_View/Separate f_older tree"
 msgstr "/E_xibir/Á_rvore de pastas separadas"
 
-#: src/mainwindow.c:579
+#: src/mainwindow.c:581
 msgid "/_View/Separate _message view"
 msgstr "/E_xibir/Visualização separada da _mensagem"
 
-#: src/mainwindow.c:581
+#: src/mainwindow.c:583
 msgid "/_View/_Sort"
 msgstr "/E_xibir/_Ordenação"
 
-#: src/mainwindow.c:582
+#: src/mainwindow.c:584
 msgid "/_View/_Sort/by _number"
 msgstr "/E_xibir/_Ordenar/por _número"
 
-#: src/mainwindow.c:583
+#: src/mainwindow.c:585
 msgid "/_View/_Sort/by s_ize"
 msgstr "/E_xibir/_Ordenar/por _tamanho"
 
-#: src/mainwindow.c:584
+#: src/mainwindow.c:586
 msgid "/_View/_Sort/by _date"
 msgstr "/E_xibir/_Ordenar/por _data"
 
-#: src/mainwindow.c:585
+#: src/mainwindow.c:587
 msgid "/_View/_Sort/by t_hread date"
 msgstr "/E_xibir/_Ordenar/por _data da discussão"
 
-#: src/mainwindow.c:586
+#: src/mainwindow.c:588
 msgid "/_View/_Sort/by _from"
 msgstr "/E_xibir/_Ordenar/por _remetente"
 
-#: src/mainwindow.c:587
+#: src/mainwindow.c:589
 msgid "/_View/_Sort/by _recipient"
 msgstr "/E_xibir/_Ordenar/por _destinatário"
 
-#: src/mainwindow.c:588
+#: src/mainwindow.c:590
 msgid "/_View/_Sort/by _subject"
 msgstr "/E_xibir/_Ordenar/por as_sunto"
 
-#: src/mainwindow.c:589
+#: src/mainwindow.c:591
 msgid "/_View/_Sort/by _color label"
 msgstr "/E_xibir/_Ordenar/por _etiqueta de cor"
 
-#: src/mainwindow.c:591
+#: src/mainwindow.c:593
 msgid "/_View/_Sort/by _mark"
 msgstr "/E_xibir/_Ordenar/por _marca"
 
-#: src/mainwindow.c:592
+#: src/mainwindow.c:594
 msgid "/_View/_Sort/by _unread"
 msgstr "/E_xibir/_Ordenar/por _não lidas"
 
-#: src/mainwindow.c:593
+#: src/mainwindow.c:595
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/E_xibir/_Ordenar/por _anexos"
 
-#: src/mainwindow.c:595
+#: src/mainwindow.c:597
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/E_xibir/_Ordenar/_Não ordenar"
 
-#: src/mainwindow.c:596 src/mainwindow.c:599
+#: src/mainwindow.c:598 src/mainwindow.c:601
 msgid "/_View/_Sort/---"
 msgstr "/E_xibir/_Ordenar/---"
 
-#: src/mainwindow.c:597
+#: src/mainwindow.c:599
 msgid "/_View/_Sort/Ascending"
 msgstr "/E_xibir/_Ordenar/Crescente"
 
-#: src/mainwindow.c:598
+#: src/mainwindow.c:600
 msgid "/_View/_Sort/Descending"
 msgstr "/E_xibir/_Ordenar/Decrescente"
 
-#: src/mainwindow.c:600
+#: src/mainwindow.c:602
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/E_xibir/_Ordenar/Atrair _por assunto"
 
-#: src/mainwindow.c:602
+#: src/mainwindow.c:604
 msgid "/_View/Th_read view"
 msgstr "/E_xibir/Visão de th_read"
 
-#: src/mainwindow.c:603
+#: src/mainwindow.c:605
 msgid "/_View/E_xpand all threads"
 msgstr "/E_xibir/E_xpandir todas as threads"
 
-#: src/mainwindow.c:604
+#: src/mainwindow.c:606
 msgid "/_View/Co_llapse all threads"
 msgstr "/E_xibir/_Fechar todas as threads"
 
-#: src/mainwindow.c:605
+#: src/mainwindow.c:607
 msgid "/_View/Set display _item..."
 msgstr "/E_xibir/Elementos _visíveis..."
 
-#: src/mainwindow.c:608
+#: src/mainwindow.c:610
 msgid "/_View/_Go to"
 msgstr "/E_xibir/Ir _Para"
 
-#: src/mainwindow.c:609
+#: src/mainwindow.c:611
 msgid "/_View/_Go to/_Prev message"
 msgstr "/E_xibir/Ir _Para/Mensagem a_nterior"
 
-#: src/mainwindow.c:610
+#: src/mainwindow.c:612
 msgid "/_View/_Go to/_Next message"
 msgstr "/E_xibir/Ir _Para/_Próxima mensagem"
 
-#: src/mainwindow.c:611 src/mainwindow.c:616 src/mainwindow.c:619
-#: src/mainwindow.c:624 src/mainwindow.c:629
+#: src/mainwindow.c:613 src/mainwindow.c:618 src/mainwindow.c:621
+#: src/mainwindow.c:626 src/mainwindow.c:631
 msgid "/_View/_Go to/---"
 msgstr "/E_xibir/Ir _Para/---"
 
-#: src/mainwindow.c:612
+#: src/mainwindow.c:614
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/E_xibir/Ir _Para/Anterior não _lida"
 
-#: src/mainwindow.c:614
+#: src/mainwindow.c:616
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/E_xibir/Ir _Para/Próxima não l_ida"
 
-#: src/mainwindow.c:617
+#: src/mainwindow.c:619
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/E_xibir/Ir _Para/Mensagem n_ova anterior"
 
-#: src/mainwindow.c:618
+#: src/mainwindow.c:620
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/E_xibir/Ir _Para/Próxima mensagem _nova"
 
-#: src/mainwindow.c:620
+#: src/mainwindow.c:622
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/E_xibir/Ir _Para/Mensagem marcada a_nterior"
 
-#: src/mainwindow.c:622
+#: src/mainwindow.c:624
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/E_xibir/Ir _Para/Próxima mensagem ma_rcada"
 
-#: src/mainwindow.c:625
+#: src/mainwindow.c:627
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/E_xibir/Ir _Para/Mensagem eti_quetada anterior"
 
-#: src/mainwindow.c:627
+#: src/mainwindow.c:629
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/E_xibir/Ir _Para/Próxima mensagem etique_tada"
 
-#: src/mainwindow.c:630
+#: src/mainwindow.c:632
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/E_xibir/Ir _Para/Outra _pasta..."
 
-#: src/mainwindow.c:639 src/messageview.c:174
+#: src/mainwindow.c:641 src/messageview.c:174
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/E_xibir/_Codificação de caracteres/_Detectar automaticamente"
 
-#: src/mainwindow.c:652 src/messageview.c:187
+#: src/mainwindow.c:654 src/messageview.c:187
 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr "/E_xibir/_Codificação de caracteres/Europeu Ocidental (Windows-1252)"
 
-#: src/mainwindow.c:700 src/messageview.c:227
+#: src/mainwindow.c:702 src/messageview.c:227
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/E_xibir/_Codificação de caracteres/Japonês (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:702 src/messageview.c:229
+#: src/mainwindow.c:704 src/messageview.c:229
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/E_xibir/_Codificação de caracteres/Japonês (_EUC-JP)"
 
-#: src/mainwindow.c:704 src/messageview.c:231
+#: src/mainwindow.c:706 src/messageview.c:231
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/E_xibir/_Codificação de caracteres/Japonês (_Shift__JIS)"
 
-#: src/mainwindow.c:714 src/messageview.c:240
+#: src/mainwindow.c:716 src/messageview.c:240
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/E_xibir/_Codificação de caracteres/Chinês tradicional (EUC-_TW)"
 
-#: src/mainwindow.c:716 src/messageview.c:242
+#: src/mainwindow.c:718 src/messageview.c:242
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/E_xibir/_Codificação de caracteres/Chinês (ISO-2022-_CN)"
 
-#: src/mainwindow.c:722 src/messageview.c:247
+#: src/mainwindow.c:724 src/messageview.c:247
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/E_xibir/_Codificação de caracteres/Coreano (ISO-2022-KR)"
 
-#: src/mainwindow.c:735 src/summaryview.c:464
+#: src/mainwindow.c:737 src/summaryview.c:464
 msgid "/_View/Open in new _window"
 msgstr "/E_xibir/Abrir em uma n_ova janela"
 
-#: src/mainwindow.c:736 src/messageview.c:259 src/summaryview.c:466
+#: src/mainwindow.c:738 src/messageview.c:259 src/summaryview.c:466
 msgid "/_View/Mess_age source"
 msgstr "/E_xibir/Ver _fonte"
 
-#: src/mainwindow.c:737 src/messageview.c:260 src/summaryview.c:467
+#: src/mainwindow.c:739 src/messageview.c:260 src/summaryview.c:467
 msgid "/_View/All _headers"
 msgstr "/E_xibir/_Todos os cabeçalhos"
 
-#: src/mainwindow.c:739
+#: src/mainwindow.c:741
 msgid "/_View/_Update summary"
 msgstr "/E_xibir/A_tualizar sumário"
 
-#: src/mainwindow.c:741 src/messageview.c:263
+#: src/mainwindow.c:743 src/messageview.c:263
 msgid "/_Message"
 msgstr "/_Mensagem"
 
-#: src/mainwindow.c:742
+#: src/mainwindow.c:744
 msgid "/_Message/Recei_ve"
 msgstr "/_Mensagem/_Receber"
 
-#: src/mainwindow.c:743
+#: src/mainwindow.c:745
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/_Mensagem/_Receber/Receber da conta _atual"
 
-#: src/mainwindow.c:745
+#: src/mainwindow.c:747
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/_Mensagem/_Receber/Receber de _todas as contas"
 
-#: src/mainwindow.c:747
+#: src/mainwindow.c:749
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/_Mensagem/_Receber/_Cancelar recebimento"
 
-#: src/mainwindow.c:749
+#: src/mainwindow.c:751
 msgid "/_Message/Recei_ve/---"
 msgstr "/_Mensagem/_Receber/---"
 
-#: src/mainwindow.c:750
+#: src/mainwindow.c:752
 msgid "/_Message/_Send queued messages"
 msgstr "/_Mensagem/Enviar mensagens da _fila"
 
-#: src/mainwindow.c:751 src/mainwindow.c:753 src/mainwindow.c:760
-#: src/mainwindow.c:765 src/mainwindow.c:768 src/mainwindow.c:779
-#: src/mainwindow.c:781 src/mainwindow.c:784 src/messageview.c:266
+#: src/mainwindow.c:753 src/mainwindow.c:755 src/mainwindow.c:762
+#: src/mainwindow.c:767 src/mainwindow.c:770 src/mainwindow.c:781
+#: src/mainwindow.c:783 src/mainwindow.c:786 src/messageview.c:266
 #: src/messageview.c:274 src/messageview.c:279
 msgid "/_Message/---"
 msgstr "/_Mensagem/---"
 
-#: src/mainwindow.c:752 src/messageview.c:264
+#: src/mainwindow.c:754 src/messageview.c:264
 msgid "/_Message/Compose _new message"
 msgstr "/_Mensagem/Compor _nova mensagem"
 
-#: src/mainwindow.c:754 src/messageview.c:267
+#: src/mainwindow.c:756 src/messageview.c:267
 msgid "/_Message/_Reply"
 msgstr "/_Mensagem/_Responder"
 
-#: src/mainwindow.c:755
+#: src/mainwindow.c:757
 msgid "/_Message/Repl_y to"
 msgstr "/_Mensagem/_Responder para"
 
-#: src/mainwindow.c:756 src/messageview.c:268
+#: src/mainwindow.c:758 src/messageview.c:268
 msgid "/_Message/Repl_y to/_all"
 msgstr "/Mensagem/Responder para/_todos"
 
-#: src/mainwindow.c:757 src/messageview.c:270
+#: src/mainwindow.c:759 src/messageview.c:270
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Mensagem/Responder para/_quem enviou"
 
-#: src/mainwindow.c:758 src/messageview.c:272
+#: src/mainwindow.c:760 src/messageview.c:272
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/Mensagem/Responder para/_lista"
 
-#: src/mainwindow.c:761 src/messageview.c:275
+#: src/mainwindow.c:763 src/messageview.c:275
 msgid "/_Message/_Forward"
 msgstr "/_Mensagem/Encam_inhar"
 
-#: src/mainwindow.c:762 src/messageview.c:276
+#: src/mainwindow.c:764 src/messageview.c:276
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Mensagem/Encaminhar como ane_xo"
 
-#: src/mainwindow.c:764 src/messageview.c:278
+#: src/mainwindow.c:766 src/messageview.c:278
 msgid "/_Message/Redirec_t"
 msgstr "/_Mensagem/Redire_cionar"
 
-#: src/mainwindow.c:766
+#: src/mainwindow.c:768
 msgid "/_Message/M_ove..."
 msgstr "/_Mensagem/Mo_ver..."
 
-#: src/mainwindow.c:767
+#: src/mainwindow.c:769
 msgid "/_Message/_Copy..."
 msgstr "/_Mensagem/_Copiar..."
 
-#: src/mainwindow.c:769
+#: src/mainwindow.c:771
 msgid "/_Message/_Mark"
 msgstr "/_Mensagem/_Marcar"
 
-#: src/mainwindow.c:770
+#: src/mainwindow.c:772
 msgid "/_Message/_Mark/_Mark"
 msgstr "/_Mensagem/_Marcar/_Marcar"
 
-#: src/mainwindow.c:771
+#: src/mainwindow.c:773
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/_Mensagem/_Marcar/_Desmarcar"
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:774
 msgid "/_Message/_Mark/---"
 msgstr "/_Mensagem/_Marcar/---"
 
-#: src/mainwindow.c:773
+#: src/mainwindow.c:775
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/_Mensagem/_Marcar/Marcar como _não lida"
 
-#: src/mainwindow.c:774
+#: src/mainwindow.c:776
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/_Mensagem/_Marcar/Marcar como l_ida"
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:778
 msgid "/_Message/_Mark/Mark _thread as read"
 msgstr "/_Mensagem/_Marcar/Marcar _tópico como lido"
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:780
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/_Mensagem/_Marcar/Marcar todas como _lidas"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:782
 msgid "/_Message/_Delete"
 msgstr "/_Mensagem/_Apagar"
 
-#: src/mainwindow.c:782
+#: src/mainwindow.c:784
 msgid "/_Message/Set as _junk mail"
 msgstr "/_Mensagem/Classificar como _spam"
 
-#: src/mainwindow.c:783
+#: src/mainwindow.c:785
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/_Mensagem/Classificar como _não-spam"
 
-#: src/mainwindow.c:785 src/messageview.c:280
+#: src/mainwindow.c:787 src/messageview.c:280
 msgid "/_Message/Re-_edit"
 msgstr "/_Mensagem/Ed_itar novamente"
 
-#: src/mainwindow.c:789
+#: src/mainwindow.c:791
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/_Ferramentas/Adicionar remetente ao catálogo de _endereços"
 
-#: src/mainwindow.c:792
+#: src/mainwindow.c:794
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/_Ferramentas/Filtrar _todas as mensagens na pasta"
 
-#: src/mainwindow.c:794
+#: src/mainwindow.c:796
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Ferramentas/_Filtrar mensagens selecionadas"
 
-#: src/mainwindow.c:796 src/messageview.c:287
+#: src/mainwindow.c:798 src/messageview.c:287
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Ferramentas/_Criar regra de filtro"
 
-#: src/mainwindow.c:797 src/messageview.c:289
+#: src/mainwindow.c:799 src/messageview.c:289
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Ferramentas/_Criar regra de filtro/_Automaticamente"
 
-#: src/mainwindow.c:799 src/messageview.c:291
+#: src/mainwindow.c:801 src/messageview.c:291
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Ferramentas/_Criar regra de filtro/pelo _remtente"
 
-#: src/mainwindow.c:801 src/messageview.c:293
+#: src/mainwindow.c:803 src/messageview.c:293
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Ferramentas/_Criar regra de filtro/pelo _destinatário"
 
-#: src/mainwindow.c:803 src/messageview.c:295
+#: src/mainwindow.c:805 src/messageview.c:295
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Ferramentas/_Criar regra de filtro/pelo A_ssunto"
 
-#: src/mainwindow.c:806
+#: src/mainwindow.c:808
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/_Ferramentas/Filtrar spam na _pasta"
 
-#: src/mainwindow.c:808
+#: src/mainwindow.c:810
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/_Ferramentas/Filtrar _spam nas mensagens selecionadas"
 
-#: src/mainwindow.c:815
+#: src/mainwindow.c:817
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/_Ferramentas/_Apagar mensagens duplicadas"
 
-#: src/mainwindow.c:818
+#: src/mainwindow.c:820
 #, fuzzy
 msgid "/_Tools/E_xecute marked process"
 msgstr "Executar os processos marcados"
 
-#: src/mainwindow.c:820
+#: src/mainwindow.c:822
 msgid "/_Tools/_Log window"
 msgstr "/_Ferramentas/_Janela de log"
 
-#: src/mainwindow.c:822
+#: src/mainwindow.c:824
 msgid "/_Configuration"
 msgstr "/_Configuração"
 
-#: src/mainwindow.c:823
+#: src/mainwindow.c:825
 msgid "/_Configuration/_Common preferences..."
 msgstr "/_Configuração/_Preferências comuns..."
 
-#: src/mainwindow.c:825
+#: src/mainwindow.c:827
 msgid "/_Configuration/_Filter setting..."
 msgstr "/_Configuração/Configuração de _filtros..."
 
-#: src/mainwindow.c:827
+#: src/mainwindow.c:829
 msgid "/_Configuration/_Template..."
 msgstr "/_Configuração/_Modelo..."
 
-#: src/mainwindow.c:829
+#: src/mainwindow.c:831
 msgid "/_Configuration/_Actions..."
 msgstr "/_Configuração/_Ações..."
 
-#: src/mainwindow.c:831
+#: src/mainwindow.c:833
 msgid "/_Configuration/---"
 msgstr "/_Configuração/---"
 
-#: src/mainwindow.c:832
+#: src/mainwindow.c:834
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Configuração/Preferências da conta _atual..."
 
-#: src/mainwindow.c:834
+#: src/mainwindow.c:836
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Configuração/Criar uma _nova conta..."
 
-#: src/mainwindow.c:836
+#: src/mainwindow.c:838
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Configuração/_Editar contas..."
 
-#: src/mainwindow.c:838
+#: src/mainwindow.c:840
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Configuração/_Mudar conta atual"
 
-#: src/mainwindow.c:842
+#: src/mainwindow.c:844
 msgid "/_Help/_Manual"
 msgstr "/A_juda/_Manual"
 
-#: src/mainwindow.c:843
+#: src/mainwindow.c:845
 msgid "/_Help/_Manual/_English"
 msgstr "/A_juda/_Manual/_Inglês"
 
-#: src/mainwindow.c:844
+#: src/mainwindow.c:846
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/A_juda/_Manual/_Japonês"
 
-#: src/mainwindow.c:845
+#: src/mainwindow.c:847
 msgid "/_Help/_FAQ"
 msgstr "/A_juda/_FAQ"
 
-#: src/mainwindow.c:846
+#: src/mainwindow.c:848
 msgid "/_Help/_FAQ/_English"
 msgstr "/A_juda/_FAQ/_Inglês"
 
-#: src/mainwindow.c:847
+#: src/mainwindow.c:849
 msgid "/_Help/_FAQ/_German"
 msgstr "/A_juda/_FAQ/_Alemão"
 
-#: src/mainwindow.c:848
+#: src/mainwindow.c:850
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/A_juda/_FAQ/_Espanhol"
 
-#: src/mainwindow.c:849
+#: src/mainwindow.c:851
 msgid "/_Help/_FAQ/_French"
 msgstr "/A_juda/_FAQ/_Francês"
 
-#: src/mainwindow.c:850
+#: src/mainwindow.c:852
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/A_juda/_FAQ/_Italiano"
 
-#: src/mainwindow.c:851
+#: src/mainwindow.c:853
 msgid "/_Help/_Command line options"
 msgstr "/A_juda/Opções de linha de comando"
 
-#: src/mainwindow.c:852
+#: src/mainwindow.c:854
 msgid "/_Help/---"
 msgstr "/A_juda/---"
 
-#: src/mainwindow.c:895
+#: src/mainwindow.c:897
 msgid "Creating main window...\n"
 msgstr "Criando janela principal...\n"
 
-#: src/mainwindow.c:1071
+#: src/mainwindow.c:1073
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "MainWindow: falhou ao alocar cores %d\n"
 
-#: src/mainwindow.c:1175 src/summaryview.c:2387 src/summaryview.c:2472
+#: src/mainwindow.c:1181 src/summaryview.c:2387 src/summaryview.c:2472
 #: src/summaryview.c:4009 src/summaryview.c:4138 src/summaryview.c:4507
 msgid "done.\n"
 msgstr "Pronto.\n"
 
-#: src/mainwindow.c:1293 src/mainwindow.c:1334 src/mainwindow.c:1359
+#: src/mainwindow.c:1299 src/mainwindow.c:1340 src/mainwindow.c:1365
 msgid "Untitled"
 msgstr "Sem título"
 
-#: src/mainwindow.c:1360
+#: src/mainwindow.c:1366
 msgid "none"
 msgstr "nenhuma"
 
-#: src/mainwindow.c:1413
+#: src/mainwindow.c:1419
 #, 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:1663
+#: src/mainwindow.c:1669
 msgid "Offline"
 msgstr "Desconectado"
 
-#: src/mainwindow.c:1664
+#: src/mainwindow.c:1670
 msgid "You are offline. Go online?"
 msgstr "Você está desconectado. Conectar?"
 
-#: src/mainwindow.c:1681
+#: src/mainwindow.c:1687
 msgid "Empty all trash"
 msgstr "Esvaziar lixeira"
 
-#: src/mainwindow.c:1682
+#: src/mainwindow.c:1688
 msgid "Delete all messages in trash folders?"
 msgstr "Apagar todas as mensagens nas lixeiras?"
 
-#: src/mainwindow.c:1712
+#: src/mainwindow.c:1718
 msgid "Add mailbox"
 msgstr "Adicionar caixa de correio"
 
-#: src/mainwindow.c:1713
+#: src/mainwindow.c:1719
 msgid ""
 "Specify the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3596,16 +3601,16 @@ msgstr ""
 "Se uma caixa de correio existente for especificada, ela será\n"
 "analisada automaticamente."
 
-#: src/mainwindow.c:1719 src/setup.c:49
+#: src/mainwindow.c:1725 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "A caixa de correio `%s' já existe."
 
-#: src/mainwindow.c:1724 src/setup.c:56
+#: src/mainwindow.c:1730 src/setup.c:56
 msgid "Mailbox"
 msgstr "Correio"
 
-#: src/mainwindow.c:1730 src/setup.c:62
+#: src/mainwindow.c:1736 src/setup.c:62
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3615,129 +3620,129 @@ msgstr ""
 "Talvez alguns arquivos já existam, ou você não tem permissão para escrever "
 "lá."
 
-#: src/mainwindow.c:2198
+#: src/mainwindow.c:2206
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Visão de Pastas"
 
-#: src/mainwindow.c:2217
+#: src/mainwindow.c:2225
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Visão de Mensagens"
 
-#: src/mainwindow.c:2369 src/summaryview.c:418
+#: src/mainwindow.c:2377 src/summaryview.c:418
 msgid "/_Reply"
 msgstr "/_Responder"
 
-#: src/mainwindow.c:2370
+#: src/mainwindow.c:2378
 msgid "/Reply to _all"
 msgstr "/Responder para _todos"
 
-#: src/mainwindow.c:2371
+#: src/mainwindow.c:2379
 msgid "/Reply to _sender"
 msgstr "/Responder para o _remetente"
 
-#: src/mainwindow.c:2372
+#: src/mainwindow.c:2380
 msgid "/Reply to mailing _list"
 msgstr "/Responder para a /_lista"
 
-#: src/mainwindow.c:2377 src/summaryview.c:425
+#: src/mainwindow.c:2385 src/summaryview.c:425
 msgid "/_Forward"
 msgstr "/En_caminhar"
 
-#: src/mainwindow.c:2378 src/summaryview.c:426
+#: src/mainwindow.c:2386 src/summaryview.c:426
 msgid "/For_ward as attachment"
 msgstr "/Encaminhar como ane_xo"
 
-#: src/mainwindow.c:2379 src/summaryview.c:427
+#: src/mainwindow.c:2387 src/summaryview.c:427
 msgid "/Redirec_t"
 msgstr "/Re_direcionar"
 
-#: src/mainwindow.c:2384
+#: src/mainwindow.c:2392
 msgid "Incorporate new mail"
 msgstr "Incorporar mensagens novas"
 
-#: src/mainwindow.c:2386
+#: src/mainwindow.c:2394
 msgid "Incorporate new mail of all accounts"
 msgstr "Incorporar novas mensagens de todas as contas"
 
-#: src/mainwindow.c:2388
+#: src/mainwindow.c:2396
 msgid "Send queued message(s)"
 msgstr "Enviar Mensagem(s) da fila"
 
-#: src/mainwindow.c:2390
+#: src/mainwindow.c:2398
 msgid "Compose new message"
 msgstr "Escrever nova mensagem"
 
-#: src/mainwindow.c:2392
+#: src/mainwindow.c:2400
 msgid "Reply to the message"
 msgstr "Responder à Mensagem"
 
-#: src/mainwindow.c:2394
+#: src/mainwindow.c:2402
 msgid "Reply to all"
 msgstr "Responder para todos"
 
-#: src/mainwindow.c:2396
+#: src/mainwindow.c:2404
 msgid "Forward the message"
 msgstr "Encaminhar a mensagem"
 
-#: src/mainwindow.c:2398
+#: src/mainwindow.c:2406
 msgid "Delete the message"
 msgstr "Apagar a mensagem"
 
-#: src/mainwindow.c:2400
+#: src/mainwindow.c:2408
 msgid "Set as junk mail"
 msgstr "Marcar como spam"
 
-#: src/mainwindow.c:2402
+#: src/mainwindow.c:2410
 msgid "Execute marked process"
 msgstr "Executar os processos marcados"
 
-#: src/mainwindow.c:2404
+#: src/mainwindow.c:2412
 msgid "Next unread message"
 msgstr "Próxima mensagem não lida"
 
-#: src/mainwindow.c:2406
+#: src/mainwindow.c:2414
 #, fuzzy
 msgid "Previous unread message"
 msgstr "Próxima mensagem não lida"
 
-#: src/mainwindow.c:2410
+#: src/mainwindow.c:2418
 #, fuzzy
 msgid "Print message"
 msgstr "Enviar mensagem"
 
-#: src/mainwindow.c:2412
+#: src/mainwindow.c:2420
 msgid "Common preferences"
 msgstr "Preferências comuns"
 
-#: src/mainwindow.c:2414 src/prefs_account_dialog.c:511
+#: src/mainwindow.c:2422 src/prefs_account_dialog.c:511
 msgid "Account preferences"
 msgstr "Preferências da Conta"
 
-#: src/mainwindow.c:2779
+#: src/mainwindow.c:2788
 msgid "You are offline. Click the icon to go online."
 msgstr "Você está desconectado. Clique no ícone para conectar."
 
-#: src/mainwindow.c:2790
+#: src/mainwindow.c:2799
 msgid "You are online. Click the icon to go offline."
 msgstr "Você está conectado. Clique no ícone para desconectar."
 
-#: src/mainwindow.c:3062
+#: src/mainwindow.c:3071
 msgid "Exit"
 msgstr "Sair"
 
-#: src/mainwindow.c:3062
+#: src/mainwindow.c:3071
 msgid "Exit this program?"
 msgstr "Sair do programa?"
 
-#: src/mainwindow.c:3666
+#: src/mainwindow.c:3675
 msgid "Command line options"
 msgstr "Opções de linha de comando"
 
-#: src/mainwindow.c:3679
+#: src/mainwindow.c:3688
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Uso: sylpheed [OPÇÃO]..."
 
-#: src/mainwindow.c:3687
+#: src/mainwindow.c:3696
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -3765,7 +3770,7 @@ msgstr ""
 "--help\n"
 "--version"
 
-#: src/mainwindow.c:3703
+#: src/mainwindow.c:3712
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
diff --git a/po/ro.po b/po/ro.po
index 75896e1d..be1e30e4 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed 2.2.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-01-31 16:49+0900\n"
+"POT-Creation-Date: 2007-01-31 17:29+0900\n"
 "PO-Revision-Date: 2006-12-19 19:09+0200\n"
 "Last-Translator: Cristian Secară <cristi@secarica.ro>\n"
 "Language-Team: \n"
@@ -926,7 +926,7 @@ msgstr "/A_dresă/_Editează"
 msgid "/_Address/_Delete"
 msgstr "/A_dresă/Ș_terge"
 
-#: src/addressbook.c:359 src/compose.c:673 src/mainwindow.c:787
+#: src/addressbook.c:359 src/compose.c:673 src/mainwindow.c:789
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Unelte"
@@ -935,12 +935,12 @@ msgstr "/_Unelte"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Unelte/Importă fișier _LDIF"
 
-#: src/addressbook.c:361 src/compose.c:694 src/mainwindow.c:841
+#: src/addressbook.c:361 src/compose.c:694 src/mainwindow.c:843
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Ajutor"
 
-#: src/addressbook.c:362 src/compose.c:695 src/mainwindow.c:853
+#: src/addressbook.c:362 src/compose.c:695 src/mainwindow.c:855
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Ajutor/_Despre"
@@ -984,7 +984,7 @@ msgstr "/Șter_ge"
 msgid "E-Mail address"
 msgstr "Adresă e-mail"
 
-#: src/addressbook.c:496 src/compose.c:4873 src/mainwindow.c:2408
+#: src/addressbook.c:496 src/compose.c:4873 src/mainwindow.c:2416
 #: src/prefs_common_dialog.c:2274
 msgid "Address book"
 msgstr "Agendă"
@@ -1203,7 +1203,7 @@ msgstr "Adrese comune:"
 msgid "Personal address"
 msgstr "Adrese personale:"
 
-#: src/alertpanel.c:142 src/compose.c:5717 src/main.c:638
+#: src/alertpanel.c:142 src/compose.c:5720 src/main.c:638
 msgid "Notice"
 msgstr "Notificare"
 
@@ -1371,9 +1371,9 @@ msgid "/_View/_Reply to"
 msgstr "/_Vizualizare/_Răspuns către"
 
 #: src/compose.c:578 src/compose.c:580 src/compose.c:582 src/compose.c:584
-#: src/compose.c:587 src/mainwindow.c:577 src/mainwindow.c:580
-#: src/mainwindow.c:607 src/mainwindow.c:631 src/mainwindow.c:734
-#: src/mainwindow.c:738 src/messageview.c:258
+#: src/compose.c:587 src/mainwindow.c:579 src/mainwindow.c:582
+#: src/mainwindow.c:609 src/mainwindow.c:633 src/mainwindow.c:736
+#: src/mainwindow.c:740 src/messageview.c:258
 msgid "/_View/---"
 msgstr "/_Vizualizare/---"
 
@@ -1395,7 +1395,7 @@ msgstr "/_Vizualizare/_Atașament"
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/_Vizualizare/Du-_te la/alt _director..."
 
-#: src/compose.c:593 src/mainwindow.c:638 src/messageview.c:173
+#: src/compose.c:593 src/mainwindow.c:640 src/messageview.c:173
 msgid "/_View/Character _encoding"
 msgstr "/_Vizualizare/Codare caract_ere"
 
@@ -1406,112 +1406,112 @@ msgstr "/_Vizualizare/Codare caract_ere/_Automat"
 #: src/compose.c:596 src/compose.c:602 src/compose.c:608 src/compose.c:612
 #: src/compose.c:620 src/compose.c:624 src/compose.c:630 src/compose.c:636
 #: src/compose.c:640 src/compose.c:650 src/compose.c:654 src/compose.c:662
-#: src/compose.c:666 src/mainwindow.c:634 src/mainwindow.c:641
+#: src/compose.c:666 src/mainwindow.c:636 src/mainwindow.c:643
 #: src/messageview.c:169
 msgid "/_View/Character _encoding/---"
 msgstr "/_Vizualizare/Codare caract_ere/---"
 
-#: src/compose.c:598 src/mainwindow.c:642 src/messageview.c:177
+#: src/compose.c:598 src/mainwindow.c:644 src/messageview.c:177
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Vizualizare/Codare caract_ere/7bit ascii (US-ASC_II)"
 
-#: src/compose.c:600 src/mainwindow.c:644 src/messageview.c:180
+#: src/compose.c:600 src/mainwindow.c:646 src/messageview.c:180
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Vizualizare/Codare caract_ere/Unicode (_UTF-8)"
 
-#: src/compose.c:604 src/mainwindow.c:648 src/messageview.c:183
+#: src/compose.c:604 src/mainwindow.c:650 src/messageview.c:183
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Vizualizare/Codare caract_ere/Western European (ISO-8859-_1)"
 
-#: src/compose.c:606 src/mainwindow.c:650 src/messageview.c:185
+#: src/compose.c:606 src/mainwindow.c:652 src/messageview.c:185
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Vizualizare/Codare caract_ere/Western European (ISO-8859-15)"
 
-#: src/compose.c:610 src/mainwindow.c:656 src/messageview.c:190
+#: src/compose.c:610 src/mainwindow.c:658 src/messageview.c:190
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Vizualizare/Codare caract_ere/Central European (ISO-8859-_2)"
 
-#: src/compose.c:614 src/mainwindow.c:660 src/messageview.c:193
+#: src/compose.c:614 src/mainwindow.c:662 src/messageview.c:193
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Vizualizare/Codare caract_ere/_Baltic (ISO-8859-13)"
 
-#: src/compose.c:616 src/mainwindow.c:662 src/messageview.c:195
+#: src/compose.c:616 src/mainwindow.c:664 src/messageview.c:195
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Vizualizare/Codare caract_ere/Baltic (ISO-8859-_4)"
 
-#: src/compose.c:618 src/mainwindow.c:664 src/messageview.c:197
+#: src/compose.c:618 src/mainwindow.c:666 src/messageview.c:197
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/_Vizualizare/Codare caract_ere/Baltic (Windows-1257)"
 
-#: src/compose.c:622 src/mainwindow.c:668 src/messageview.c:200
+#: src/compose.c:622 src/mainwindow.c:670 src/messageview.c:200
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Vizualizare/Codare caract_ere/Greek (ISO-8859-_7)"
 
-#: src/compose.c:626 src/mainwindow.c:672 src/messageview.c:203
+#: src/compose.c:626 src/mainwindow.c:674 src/messageview.c:203
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/_Vizualizare/Codare caract_ere/Arabic (ISO-8859-_6)"
 
-#: src/compose.c:628 src/mainwindow.c:674 src/messageview.c:205
+#: src/compose.c:628 src/mainwindow.c:676 src/messageview.c:205
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/_Vizualizare/Codare caract_ere/Arabic (Windows-1256)"
 
-#: src/compose.c:632 src/mainwindow.c:678 src/messageview.c:208
+#: src/compose.c:632 src/mainwindow.c:680 src/messageview.c:208
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Vizualizare/Codare caract_ere/Hebrew (ISO-8859-_8)"
 
-#: src/compose.c:634 src/mainwindow.c:680 src/messageview.c:210
+#: src/compose.c:634 src/mainwindow.c:682 src/messageview.c:210
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Vizualizare/Codare caract_ere/Hebrew (Windows-1255)"
 
-#: src/compose.c:638 src/mainwindow.c:684 src/messageview.c:213
+#: src/compose.c:638 src/mainwindow.c:686 src/messageview.c:213
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Vizualizare/Codare caract_ere/Turkish (ISO-8859-_9)"
 
-#: src/compose.c:642 src/mainwindow.c:688 src/messageview.c:216
+#: src/compose.c:642 src/mainwindow.c:690 src/messageview.c:216
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Vizualizare/Codare caract_ere/Cyrillic (ISO-8859-_5)"
 
-#: src/compose.c:644 src/mainwindow.c:690 src/messageview.c:218
+#: src/compose.c:644 src/mainwindow.c:692 src/messageview.c:218
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Vizualizare/Codare caract_ere/Cyrillic (KOI8-_R)"
 
-#: src/compose.c:646 src/mainwindow.c:692 src/messageview.c:220
+#: src/compose.c:646 src/mainwindow.c:694 src/messageview.c:220
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Vizualizare/Codare caract_ere/Cyrillic (KOI8-U)"
 
-#: src/compose.c:648 src/mainwindow.c:694 src/messageview.c:222
+#: src/compose.c:648 src/mainwindow.c:696 src/messageview.c:222
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Vizualizare/Codare caract_ere/Cyrillic (Windows-1251)"
 
-#: src/compose.c:652 src/mainwindow.c:698 src/messageview.c:225
+#: src/compose.c:652 src/mainwindow.c:700 src/messageview.c:225
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Vizualizare/Codare caract_ere/Japanese (ISO-2022-_JP)"
 
-#: src/compose.c:656 src/mainwindow.c:708 src/messageview.c:234
+#: src/compose.c:656 src/mainwindow.c:710 src/messageview.c:234
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Vizualizare/Codare caract_ere/Simplified Chinese (_GB2312)"
 
-#: src/compose.c:658 src/mainwindow.c:710 src/messageview.c:236
+#: src/compose.c:658 src/mainwindow.c:712 src/messageview.c:236
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Vizualizare/Codare caract_ere/Simplified Chinses (GBK)"
 
-#: src/compose.c:660 src/mainwindow.c:712 src/messageview.c:238
+#: src/compose.c:660 src/mainwindow.c:714 src/messageview.c:238
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Vizualizare/Codare caract_ere/Traditional Chinese (_Big5)"
 
-#: src/compose.c:664 src/mainwindow.c:720 src/messageview.c:245
+#: src/compose.c:664 src/mainwindow.c:722 src/messageview.c:245
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Vizualizare/Codare caract_ere/Korean (EUC-_KR)"
 
-#: src/compose.c:668 src/mainwindow.c:726 src/messageview.c:250
+#: src/compose.c:668 src/mainwindow.c:728 src/messageview.c:250
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Vizualizare/Codare caract_ere/Thai (TIS-620)"
 
-#: src/compose.c:670 src/mainwindow.c:728 src/messageview.c:252
+#: src/compose.c:670 src/mainwindow.c:730 src/messageview.c:252
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Vizualizare/Codare caract_ere/Thai (Windows-874)"
 
-#: src/compose.c:674 src/mainwindow.c:788 src/messageview.c:283
+#: src/compose.c:674 src/mainwindow.c:790 src/messageview.c:283
 msgid "/_Tools/_Address book"
 msgstr "/_Unelte/_Agendă"
 
@@ -1519,13 +1519,13 @@ msgstr "/_Unelte/_Agendă"
 msgid "/_Tools/_Template"
 msgstr "/_Unelte/_Șablon"
 
-#: src/compose.c:677 src/mainwindow.c:812 src/messageview.c:299
+#: src/compose.c:677 src/mainwindow.c:814 src/messageview.c:299
 msgid "/_Tools/Actio_ns"
 msgstr "/_Unelte/Acțiu_ni"
 
-#: src/compose.c:679 src/compose.c:683 src/compose.c:689 src/mainwindow.c:791
-#: src/mainwindow.c:805 src/mainwindow.c:810 src/mainwindow.c:813
-#: src/mainwindow.c:817 src/mainwindow.c:819 src/messageview.c:286
+#: src/compose.c:679 src/compose.c:683 src/compose.c:689 src/mainwindow.c:793
+#: src/mainwindow.c:807 src/mainwindow.c:812 src/mainwindow.c:815
+#: src/mainwindow.c:819 src/mainwindow.c:821 src/messageview.c:286
 #: src/messageview.c:298
 msgid "/_Tools/---"
 msgstr "/_Unelte/---"
@@ -1734,7 +1734,7 @@ msgstr "Semnătură PGP"
 msgid "PGP Encrypt"
 msgstr "Criptare PGP"
 
-#: src/compose.c:4442 src/compose.c:5543
+#: src/compose.c:4442 src/compose.c:5546
 msgid "MIME type"
 msgstr "Tip MIME"
 
@@ -1776,36 +1776,36 @@ msgstr "Editare cu editor extern"
 msgid "Wrap all long lines"
 msgstr "Desparte toate liniile lungi"
 
-#: src/compose.c:5439
+#: src/compose.c:5442
 msgid "Invalid MIME type."
 msgstr "Tip MIME invalid."
 
-#: src/compose.c:5457
+#: src/compose.c:5460
 msgid "File doesn't exist or is empty."
 msgstr "Fișierul nu există sau este gol."
 
-#: src/compose.c:5525
+#: src/compose.c:5528
 msgid "Properties"
 msgstr "Proprietăți"
 
-#: src/compose.c:5545 src/prefs_common_dialog.c:1504
+#: src/compose.c:5548 src/prefs_common_dialog.c:1504
 msgid "Encoding"
 msgstr "Codare"
 
-#: src/compose.c:5568 src/prefs_folder_item.c:202
+#: src/compose.c:5571 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Cale"
 
-#: src/compose.c:5569
+#: src/compose.c:5572
 msgid "File name"
 msgstr "Nume fișier"
 
-#: src/compose.c:5659
+#: src/compose.c:5662
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Linia de comandă este invalidă: '%s'\n"
 
-#: src/compose.c:5714
+#: src/compose.c:5717
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1814,48 +1814,48 @@ msgstr ""
 "Editorul extern este încă în funcțiune.\n"
 "Forțați terminarea procesului (pid: %d) ?\n"
 
-#: src/compose.c:6040 src/mainwindow.c:2752
+#: src/compose.c:6043 src/mainwindow.c:2761
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:6156 src/compose.c:6161 src/compose.c:6167
+#: src/compose.c:6159 src/compose.c:6164 src/compose.c:6170
 msgid "Can't queue the message."
 msgstr "Nu se poate pune mesajul în coada de așteptare."
 
-#: src/compose.c:6258
+#: src/compose.c:6261
 msgid "Select files"
 msgstr "Selectează fișiere"
 
-#: src/compose.c:6281
+#: src/compose.c:6284
 msgid "Select file"
 msgstr "Selectează fișier"
 
-#: src/compose.c:6316
+#: src/compose.c:6319
 msgid "Save message"
 msgstr "Salvează mesaj"
 
-#: src/compose.c:6317
+#: src/compose.c:6320
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Acest mesaj a fost modificat. Îl salvați în folderul ciorne ?"
 
-#: src/compose.c:6319
+#: src/compose.c:6322
 msgid "Close _without saving"
 msgstr "Închide _fără salvare"
 
-#: src/compose.c:6361
+#: src/compose.c:6364
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Doriți să aplicați șablonul '%s' ?"
 
-#: src/compose.c:6363
+#: src/compose.c:6366
 msgid "Apply template"
 msgstr "Aplică șablon"
 
-#: src/compose.c:6364
+#: src/compose.c:6367
 msgid "_Replace"
 msgstr "Înl_ocuiește"
 
-#: src/compose.c:6364
+#: src/compose.c:6367
 msgid "_Insert"
 msgstr "_Inserează"
 
@@ -2315,12 +2315,12 @@ msgstr "Setare informații folder...\n"
 msgid "Setting folder info..."
 msgstr "Setare informații folder..."
 
-#: src/folderview.c:868 src/mainwindow.c:3748 src/setup.c:80
+#: src/folderview.c:868 src/mainwindow.c:3757 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Scanare folder %s%c%s ..."
 
-#: src/folderview.c:872 src/mainwindow.c:3753 src/setup.c:85
+#: src/folderview.c:872 src/mainwindow.c:3762 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Scanare folder %s ..."
@@ -3097,541 +3097,546 @@ msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/_Vizualizare/Arată sau ascun_de/Bară de unel_te/Iconuri și te_xt"
 
 #: src/mainwindow.c:566
-msgid "/_View/Show or hi_de/_Toolbar/_Icon"
+#, fuzzy
+msgid "/_View/Show or hi_de/_Toolbar/Text at the _right of icon"
 msgstr "/_Vizualizare/Arată sau ascun_de/Bară de unel_te/_Iconuri"
 
 #: src/mainwindow.c:568
+msgid "/_View/Show or hi_de/_Toolbar/_Icon"
+msgstr "/_Vizualizare/Arată sau ascun_de/Bară de unel_te/_Iconuri"
+
+#: src/mainwindow.c:570
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/_Vizualizare/Arată sau ascun_de/Bară de unel_te/_Text"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:572
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/_Vizualizare/Arată sau ascun_de/Bară de unel_te/_Nimic"
 
-#: src/mainwindow.c:572
+#: src/mainwindow.c:574
 msgid "/_View/Show or hi_de/_Search bar"
 msgstr "/_Vizualizare/Arată sau ascun_de/Bară de _căutare"
 
-#: src/mainwindow.c:574
+#: src/mainwindow.c:576
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/_Vizualizare/Arată sau ascun_de/Bară de _stare"
 
-#: src/mainwindow.c:576
+#: src/mainwindow.c:578
 #, fuzzy
 msgid "/_View/_Customize toolbar..."
 msgstr "/_Vizualizare/Du-_te la/alt _director..."
 
-#: src/mainwindow.c:578
+#: src/mainwindow.c:580
 msgid "/_View/Separate f_older tree"
 msgstr "/_Vizualizare/Separă fereastra arb_orelui folderelor"
 
-#: src/mainwindow.c:579
+#: src/mainwindow.c:581
 msgid "/_View/Separate _message view"
 msgstr "/_Vizualizare/Separă fereastra de previzualizare a _mesajelor"
 
-#: src/mainwindow.c:581
+#: src/mainwindow.c:583
 msgid "/_View/_Sort"
 msgstr "/_Vizualizare/_Sortează"
 
-#: src/mainwindow.c:582
+#: src/mainwindow.c:584
 msgid "/_View/_Sort/by _number"
 msgstr "/_Vizualizare/_Sortează/după _număr"
 
-#: src/mainwindow.c:583
+#: src/mainwindow.c:585
 msgid "/_View/_Sort/by s_ize"
 msgstr "/_Vizualizare/_Sortează/după d_imensiune"
 
-#: src/mainwindow.c:584
+#: src/mainwindow.c:586
 msgid "/_View/_Sort/by _date"
 msgstr "/_Vizualizare/_Sortează/după _dată"
 
-#: src/mainwindow.c:585
+#: src/mainwindow.c:587
 msgid "/_View/_Sort/by t_hread date"
 msgstr "/_Vizualizare/_Sortează/după dată _fir de discuție"
 
-#: src/mainwindow.c:586
+#: src/mainwindow.c:588
 msgid "/_View/_Sort/by _from"
 msgstr "/_Vizualizare/_Sortează/după e_xpeditor"
 
-#: src/mainwindow.c:587
+#: src/mainwindow.c:589
 msgid "/_View/_Sort/by _recipient"
 msgstr "/_Vizualizare/_Sortează/după destinata_r"
 
-#: src/mainwindow.c:588
+#: src/mainwindow.c:590
 msgid "/_View/_Sort/by _subject"
 msgstr "/_Vizualizare/_Sortează/după _subiect"
 
-#: src/mainwindow.c:589
+#: src/mainwindow.c:591
 msgid "/_View/_Sort/by _color label"
 msgstr "/_Vizualizare/_Sortează/după etichetă _culoare"
 
-#: src/mainwindow.c:591
+#: src/mainwindow.c:593
 msgid "/_View/_Sort/by _mark"
 msgstr "/_Vizualizare/_Sortează/după _marcaj"
 
-#: src/mainwindow.c:592
+#: src/mainwindow.c:594
 msgid "/_View/_Sort/by _unread"
 msgstr "/_Vizualizare/_Sortează/d_upă necitit"
 
-#: src/mainwindow.c:593
+#: src/mainwindow.c:595
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/_Vizualizare/_Sortează/după a_tașament"
 
-#: src/mainwindow.c:595
+#: src/mainwindow.c:597
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/_Vizualizare/_Sortează/Nes_ortat"
 
-#: src/mainwindow.c:596 src/mainwindow.c:599
+#: src/mainwindow.c:598 src/mainwindow.c:601
 msgid "/_View/_Sort/---"
 msgstr "/_Vizualizare/_Sortează/---"
 
-#: src/mainwindow.c:597
+#: src/mainwindow.c:599
 msgid "/_View/_Sort/Ascending"
 msgstr "/_Vizualizare/_Sortează/Ascendent"
 
-#: src/mainwindow.c:598
+#: src/mainwindow.c:600
 msgid "/_View/_Sort/Descending"
 msgstr "/_Vizualizare/_Sortează/Descendent"
 
-#: src/mainwindow.c:600
+#: src/mainwindow.c:602
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/_Vizualizare/_Sortează/_Atrage după subiect"
 
-#: src/mainwindow.c:602
+#: src/mainwindow.c:604
 msgid "/_View/Th_read view"
 msgstr "/_Vizualizare/Vizualizează ca fi_r de discuții"
 
-#: src/mainwindow.c:603
+#: src/mainwindow.c:605
 msgid "/_View/E_xpand all threads"
 msgstr "/_Vizualizare/Des_fășoară firul discuțiilor"
 
-#: src/mainwindow.c:604
+#: src/mainwindow.c:606
 msgid "/_View/Co_llapse all threads"
 msgstr "/_Vizualizare/P_liază firul discuțiilor"
 
-#: src/mainwindow.c:605
+#: src/mainwindow.c:607
 msgid "/_View/Set display _item..."
 msgstr "/_Vizualizare/Stabilește elementele vizibile în af_ișare sumară..."
 
-#: src/mainwindow.c:608
+#: src/mainwindow.c:610
 msgid "/_View/_Go to"
 msgstr "/_Vizualizare/Du-_te la"
 
-#: src/mainwindow.c:609
+#: src/mainwindow.c:611
 msgid "/_View/_Go to/_Prev message"
 msgstr "/_Vizualizare/Du-_te la/mesajul _precedent"
 
-#: src/mainwindow.c:610
+#: src/mainwindow.c:612
 msgid "/_View/_Go to/_Next message"
 msgstr "/_Vizualizare/Du-_te la/mesajul _următor"
 
-#: src/mainwindow.c:611 src/mainwindow.c:616 src/mainwindow.c:619
-#: src/mainwindow.c:624 src/mainwindow.c:629
+#: src/mainwindow.c:613 src/mainwindow.c:618 src/mainwindow.c:621
+#: src/mainwindow.c:626 src/mainwindow.c:631
 msgid "/_View/_Go to/---"
 msgstr "/_Vizualizare/---"
 
-#: src/mainwindow.c:612
+#: src/mainwindow.c:614
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/_Vizualizare/Du-_te la/mesajul necitit p_recedent"
 
-#: src/mainwindow.c:614
+#: src/mainwindow.c:616
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/_Vizualizare/Du-_te la/mesajul necitit urmă_tor"
 
-#: src/mainwindow.c:617
+#: src/mainwindow.c:619
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/_Vizualizare/Du-_te la/mesajul nou pre_cedent"
 
-#: src/mainwindow.c:618
+#: src/mainwindow.c:620
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/_Vizualizare/Du-_te la/mesajul nou următ_or"
 
-#: src/mainwindow.c:620
+#: src/mainwindow.c:622
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/_Vizualizare/Du-_te la/mesajul _marcat precedent"
 
-#: src/mainwindow.c:622
+#: src/mainwindow.c:624
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/_Vizualizare/Du-_te la/mesajul m_arcat următor"
 
-#: src/mainwindow.c:625
+#: src/mainwindow.c:627
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/_Vizualizare/Du-_te la/mesajul _etichetat precedent"
 
-#: src/mainwindow.c:627
+#: src/mainwindow.c:629
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/_Vizualizare/Du-_te la/mesajul et_ichetat următor"
 
-#: src/mainwindow.c:630
+#: src/mainwindow.c:632
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Vizualizare/Du-_te la/alt _director..."
 
-#: src/mainwindow.c:639 src/messageview.c:174
+#: src/mainwindow.c:641 src/messageview.c:174
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Vizualizare/Codare caract_ere/Detectare _automată"
 
-#: src/mainwindow.c:652 src/messageview.c:187
+#: src/mainwindow.c:654 src/messageview.c:187
 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr "/_Vizualizare/Codare caract_ere/Western European (Windows-1252)"
 
-#: src/mainwindow.c:700 src/messageview.c:227
+#: src/mainwindow.c:702 src/messageview.c:227
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Vizualizare/Codare caract_ere/Japanese (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:702 src/messageview.c:229
+#: src/mainwindow.c:704 src/messageview.c:229
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Vizualizare/Codare caract_ere/Japanese (EUC-JP)"
 
-#: src/mainwindow.c:704 src/messageview.c:231
+#: src/mainwindow.c:706 src/messageview.c:231
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Vizualizare/Codare caract_ere/Japanese (Shift__JIS)"
 
-#: src/mainwindow.c:714 src/messageview.c:240
+#: src/mainwindow.c:716 src/messageview.c:240
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Vizualizare/Codare caract_ere/Traditional Chinese (EUC-_TW)"
 
-#: src/mainwindow.c:716 src/messageview.c:242
+#: src/mainwindow.c:718 src/messageview.c:242
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Vizualizare/Codare caract_ere/Chinese (ISO-2022-CN)"
 
-#: src/mainwindow.c:722 src/messageview.c:247
+#: src/mainwindow.c:724 src/messageview.c:247
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Vizualizare/Codare caract_ere/Korean (ISO-2022-KR)"
 
-#: src/mainwindow.c:735 src/summaryview.c:464
+#: src/mainwindow.c:737 src/summaryview.c:464
 msgid "/_View/Open in new _window"
 msgstr "/_Vizualizare/Des_chide în fereastră nouă"
 
-#: src/mainwindow.c:736 src/messageview.c:259 src/summaryview.c:466
+#: src/mainwindow.c:738 src/messageview.c:259 src/summaryview.c:466
 msgid "/_View/Mess_age source"
 msgstr "/_Vizualizare/Sursă mes_aj"
 
-#: src/mainwindow.c:737 src/messageview.c:260 src/summaryview.c:467
+#: src/mainwindow.c:739 src/messageview.c:260 src/summaryview.c:467
 msgid "/_View/All _headers"
 msgstr "/_Vizualizare/Toate _header-ele"
 
-#: src/mainwindow.c:739
+#: src/mainwindow.c:741
 msgid "/_View/_Update summary"
 msgstr "/_Vizualizare/Act_ualizează sumarul mesajelor"
 
-#: src/mainwindow.c:741 src/messageview.c:263
+#: src/mainwindow.c:743 src/messageview.c:263
 msgid "/_Message"
 msgstr "/_Mesaj"
 
-#: src/mainwindow.c:742
+#: src/mainwindow.c:744
 msgid "/_Message/Recei_ve"
 msgstr "/_Mesaj/_Primire"
 
-#: src/mainwindow.c:743
+#: src/mainwindow.c:745
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/_Mesaj/_Primire/Verifică pentru contul _curent"
 
-#: src/mainwindow.c:745
+#: src/mainwindow.c:747
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/_Mesaj/_Primire/Verifică pentru _toate conturile"
 
-#: src/mainwindow.c:747
+#: src/mainwindow.c:749
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/_Mesaj/_Primire/A_nulează primirea"
 
-#: src/mainwindow.c:749
+#: src/mainwindow.c:751
 msgid "/_Message/Recei_ve/---"
 msgstr "/_Mesaj/_Primire/---"
 
-#: src/mainwindow.c:750
+#: src/mainwindow.c:752
 msgid "/_Message/_Send queued messages"
 msgstr "/_Mesaj/Trimite mesajele de la coa_dă"
 
-#: src/mainwindow.c:751 src/mainwindow.c:753 src/mainwindow.c:760
-#: src/mainwindow.c:765 src/mainwindow.c:768 src/mainwindow.c:779
-#: src/mainwindow.c:781 src/mainwindow.c:784 src/messageview.c:266
+#: src/mainwindow.c:753 src/mainwindow.c:755 src/mainwindow.c:762
+#: src/mainwindow.c:767 src/mainwindow.c:770 src/mainwindow.c:781
+#: src/mainwindow.c:783 src/mainwindow.c:786 src/messageview.c:266
 #: src/messageview.c:274 src/messageview.c:279
 msgid "/_Message/---"
 msgstr "/_Mesaj/---"
 
-#: src/mainwindow.c:752 src/messageview.c:264
+#: src/mainwindow.c:754 src/messageview.c:264
 msgid "/_Message/Compose _new message"
 msgstr "/_Mesaj/Compune mesaj _nou"
 
-#: src/mainwindow.c:754 src/messageview.c:267
+#: src/mainwindow.c:756 src/messageview.c:267
 msgid "/_Message/_Reply"
 msgstr "/_Mesaj/_Răspunde"
 
-#: src/mainwindow.c:755
+#: src/mainwindow.c:757
 msgid "/_Message/Repl_y to"
 msgstr "/_Mesaj/Răspunde _la"
 
-#: src/mainwindow.c:756 src/messageview.c:268
+#: src/mainwindow.c:758 src/messageview.c:268
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Mesaj/Răspunde _la/_toți"
 
-#: src/mainwindow.c:757 src/messageview.c:270
+#: src/mainwindow.c:759 src/messageview.c:270
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Mesaj/Răspunde _la/_expeditor"
 
-#: src/mainwindow.c:758 src/messageview.c:272
+#: src/mainwindow.c:760 src/messageview.c:272
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Mesaj/Răspunde _la/_lista de discuții"
 
-#: src/mainwindow.c:761 src/messageview.c:275
+#: src/mainwindow.c:763 src/messageview.c:275
 msgid "/_Message/_Forward"
 msgstr "/_Mesaj/Trimite mai _departe"
 
-#: src/mainwindow.c:762 src/messageview.c:276
+#: src/mainwindow.c:764 src/messageview.c:276
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Mesaj/Trimite mai departe ca _atașament"
 
-#: src/mainwindow.c:764 src/messageview.c:278
+#: src/mainwindow.c:766 src/messageview.c:278
 msgid "/_Message/Redirec_t"
 msgstr "/_Mesaj/Redirecționea_ză"
 
-#: src/mainwindow.c:766
+#: src/mainwindow.c:768
 msgid "/_Message/M_ove..."
 msgstr "/_Mesaj/Mu_tă..."
 
-#: src/mainwindow.c:767
+#: src/mainwindow.c:769
 msgid "/_Message/_Copy..."
 msgstr "/_Mesaj/_Copiază..."
 
-#: src/mainwindow.c:769
+#: src/mainwindow.c:771
 msgid "/_Message/_Mark"
 msgstr "/_Mesaj/_Marcare"
 
-#: src/mainwindow.c:770
+#: src/mainwindow.c:772
 msgid "/_Message/_Mark/_Mark"
 msgstr "/_Mesaj/_Marcare/_Marchează"
 
-#: src/mainwindow.c:771
+#: src/mainwindow.c:773
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/_Mesaj/_Marcare/_Demarchează"
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:774
 msgid "/_Message/_Mark/---"
 msgstr "/_Mesaj/_Marcare/---"
 
-#: src/mainwindow.c:773
+#: src/mainwindow.c:775
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/_Mesaj/_Marcare/Marchează ca _necitit"
 
-#: src/mainwindow.c:774
+#: src/mainwindow.c:776
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/_Mesaj/_Marcare/Marchează ca _citit"
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:778
 msgid "/_Message/_Mark/Mark _thread as read"
 msgstr "/_Mesaj/_Marcare/Marchează _firul de discuție ca citit"
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:780
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/_Mesaj/_Marcare/Marchează _totul ca citit"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:782
 msgid "/_Message/_Delete"
 msgstr "/_Mesaj/Șter_ge"
 
-#: src/mainwindow.c:782
+#: src/mainwindow.c:784
 msgid "/_Message/Set as _junk mail"
 msgstr "/_Mesaj/Marchează ca _spam"
 
-#: src/mainwindow.c:783
+#: src/mainwindow.c:785
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/_Mesaj/Marchează ca _util"
 
-#: src/mainwindow.c:785 src/messageview.c:280
+#: src/mainwindow.c:787 src/messageview.c:280
 msgid "/_Message/Re-_edit"
 msgstr "/_Mesaj/Re_editează"
 
-#: src/mainwindow.c:789
+#: src/mainwindow.c:791
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/_Unelte/A_daugă expeditorul în agendă..."
 
-#: src/mainwindow.c:792
+#: src/mainwindow.c:794
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/_Unelte/_Filtrează toate mesajele în folder"
 
-#: src/mainwindow.c:794
+#: src/mainwindow.c:796
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Unelte/Filtrează mesajele _selectate"
 
-#: src/mainwindow.c:796 src/messageview.c:287
+#: src/mainwindow.c:798 src/messageview.c:287
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Unelte/_Crează regulă de filtrare"
 
-#: src/mainwindow.c:797 src/messageview.c:289
+#: src/mainwindow.c:799 src/messageview.c:289
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Unelte/_Crează regulă de filtrare/_Automat"
 
-#: src/mainwindow.c:799 src/messageview.c:291
+#: src/mainwindow.c:801 src/messageview.c:291
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Unelte/_Crează regulă de filtrare/pe baza câmpului _De la"
 
-#: src/mainwindow.c:801 src/messageview.c:293
+#: src/mainwindow.c:803 src/messageview.c:293
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Unelte/_Crează regulă de filtrare/pe baza câmpului _Către"
 
-#: src/mainwindow.c:803 src/messageview.c:295
+#: src/mainwindow.c:805 src/messageview.c:295
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Unelte/_Crează regulă de filtrare/pe baza câmpului _Subiect"
 
-#: src/mainwindow.c:806
+#: src/mainwindow.c:808
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/_Unelte/Filtrează mesajele spam î_n folder"
 
-#: src/mainwindow.c:808
+#: src/mainwindow.c:810
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/_Unelte/Filtrează _mesajele spam în mesajele selectate"
 
-#: src/mainwindow.c:815
+#: src/mainwindow.c:817
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/_Unelte/Șterge mesaje du_plicate"
 
-#: src/mainwindow.c:818
+#: src/mainwindow.c:820
 #, fuzzy
 msgid "/_Tools/E_xecute marked process"
 msgstr "Execută procesele marcate"
 
 # temporar (log)
-#: src/mainwindow.c:820
+#: src/mainwindow.c:822
 msgid "/_Tools/_Log window"
 msgstr "/_Unelte/Fereastră _log"
 
-#: src/mainwindow.c:822
+#: src/mainwindow.c:824
 msgid "/_Configuration"
 msgstr "/_Configurație"
 
-#: src/mainwindow.c:823
+#: src/mainwindow.c:825
 msgid "/_Configuration/_Common preferences..."
 msgstr "/_Configurație/Preferințe _comune..."
 
 # hm ? mai scurt pare mai bine și este suficient de intuitiv și-așa datorită trei puncte
-#: src/mainwindow.c:825
+#: src/mainwindow.c:827
 msgid "/_Configuration/_Filter setting..."
 msgstr "/_Configurație/_Filtre..."
 
-#: src/mainwindow.c:827
+#: src/mainwindow.c:829
 msgid "/_Configuration/_Template..."
 msgstr "/_Configurație/Șa_blon..."
 
-#: src/mainwindow.c:829
+#: src/mainwindow.c:831
 msgid "/_Configuration/_Actions..."
 msgstr "/_Configurație/_Acțiuni..."
 
-#: src/mainwindow.c:831
+#: src/mainwindow.c:833
 msgid "/_Configuration/---"
 msgstr "/_Configurație/---"
 
-#: src/mainwindow.c:832
+#: src/mainwindow.c:834
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Configurație/_Preferințe pentru contul curent..."
 
-#: src/mainwindow.c:834
+#: src/mainwindow.c:836
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Configurație/Crează cont _nou..."
 
-#: src/mainwindow.c:836
+#: src/mainwindow.c:838
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Configurație/_Editează conturile..."
 
 # hm ? eu zic că e mai bine decît schimbă contul curent
-#: src/mainwindow.c:838
+#: src/mainwindow.c:840
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Configurație/_Selectează contul curent"
 
-#: src/mainwindow.c:842
+#: src/mainwindow.c:844
 msgid "/_Help/_Manual"
 msgstr "/_Ajutor/_Manual"
 
-#: src/mainwindow.c:843
+#: src/mainwindow.c:845
 msgid "/_Help/_Manual/_English"
 msgstr "/_Ajutor/_Manual/_Engleză"
 
-#: src/mainwindow.c:844
+#: src/mainwindow.c:846
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/_Ajutor/_Manual/_Japoneză"
 
-#: src/mainwindow.c:845
+#: src/mainwindow.c:847
 msgid "/_Help/_FAQ"
 msgstr "/_Ajutor/_FAQ"
 
-#: src/mainwindow.c:846
+#: src/mainwindow.c:848
 msgid "/_Help/_FAQ/_English"
 msgstr "/_Ajutor/_FAQ/_Engleză"
 
-#: src/mainwindow.c:847
+#: src/mainwindow.c:849
 msgid "/_Help/_FAQ/_German"
 msgstr "/_Ajutor/_FAQ/_Germană"
 
-#: src/mainwindow.c:848
+#: src/mainwindow.c:850
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/_Ajutor/_FAQ/_Spaniolă"
 
-#: src/mainwindow.c:849
+#: src/mainwindow.c:851
 msgid "/_Help/_FAQ/_French"
 msgstr "/_Ajutor/_FAQ/_Franceză"
 
-#: src/mainwindow.c:850
+#: src/mainwindow.c:852
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/_Ajutor/_FAQ/_Italiană"
 
-#: src/mainwindow.c:851
+#: src/mainwindow.c:853
 msgid "/_Help/_Command line options"
 msgstr "/_Ajutor/Opțiuni linie de _comandă"
 
-#: src/mainwindow.c:852
+#: src/mainwindow.c:854
 msgid "/_Help/---"
 msgstr "/_Ajutor/---"
 
-#: src/mainwindow.c:895
+#: src/mainwindow.c:897
 msgid "Creating main window...\n"
 msgstr "Creare fereastră principală...\n"
 
-#: src/mainwindow.c:1071
+#: src/mainwindow.c:1073
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Fereastra principală: alocarea culorii %d a eșuat\n"
 
-#: src/mainwindow.c:1175 src/summaryview.c:2387 src/summaryview.c:2472
+#: src/mainwindow.c:1181 src/summaryview.c:2387 src/summaryview.c:2472
 #: src/summaryview.c:4009 src/summaryview.c:4138 src/summaryview.c:4507
 msgid "done.\n"
 msgstr "gata.\n"
 
-#: src/mainwindow.c:1293 src/mainwindow.c:1334 src/mainwindow.c:1359
+#: src/mainwindow.c:1299 src/mainwindow.c:1340 src/mainwindow.c:1365
 msgid "Untitled"
 msgstr "Neintitulat"
 
-#: src/mainwindow.c:1360
+#: src/mainwindow.c:1366
 msgid "none"
 msgstr "nimic"
 
-#: src/mainwindow.c:1413
+#: src/mainwindow.c:1419
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "Schimbare tip separator fereastră din %d în %d\n"
 
-#: src/mainwindow.c:1663
+#: src/mainwindow.c:1669
 msgid "Offline"
 msgstr "Deconectat"
 
 # hm ?
-#: src/mainwindow.c:1664
+#: src/mainwindow.c:1670
 msgid "You are offline. Go online?"
 msgstr "Sunteți în modul deconectat. Treceți în modul conectat ?"
 
 # hm ? nu merge golește gunoiul cu fraza următoare, sau trebuie reformulată fraza următoare
-#: src/mainwindow.c:1681
+#: src/mainwindow.c:1687
 msgid "Empty all trash"
 msgstr "Golire gunoi"
 
-#: src/mainwindow.c:1682
+#: src/mainwindow.c:1688
 msgid "Delete all messages in trash folders?"
 msgstr "Ștergeți toate mesajele din containerele de gunoi ?"
 
-#: src/mainwindow.c:1712
+#: src/mainwindow.c:1718
 msgid "Add mailbox"
 msgstr "Adaugă căsuță poștală"
 
 # hm ? sau specificați ? este o explicație sau o comandă ?
-#: src/mainwindow.c:1713
+#: src/mainwindow.c:1719
 msgid ""
 "Specify the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3641,16 +3646,16 @@ msgstr ""
 "Dacă este specificată căsuța poștală existentă,\n"
 "aceasta va fi scanată automat."
 
-#: src/mainwindow.c:1719 src/setup.c:49
+#: src/mainwindow.c:1725 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Cutia poștală '%s' există deja."
 
-#: src/mainwindow.c:1724 src/setup.c:56
+#: src/mainwindow.c:1730 src/setup.c:56
 msgid "Mailbox"
 msgstr "Căsuță poștală"
 
-#: src/mainwindow.c:1730 src/setup.c:62
+#: src/mainwindow.c:1736 src/setup.c:62
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3660,132 +3665,132 @@ msgstr ""
 "Poate că anumite fișiere există deja, sau acolo nu aveți permisiuni de "
 "scriere."
 
-#: src/mainwindow.c:2198
+#: src/mainwindow.c:2206
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Vizualizare folder"
 
-#: src/mainwindow.c:2217
+#: src/mainwindow.c:2225
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Vizualizare mesaj"
 
-#: src/mainwindow.c:2369 src/summaryview.c:418
+#: src/mainwindow.c:2377 src/summaryview.c:418
 msgid "/_Reply"
 msgstr "/_Răspunde"
 
-#: src/mainwindow.c:2370
+#: src/mainwindow.c:2378
 msgid "/Reply to _all"
 msgstr "/Răspunde _tuturor"
 
-#: src/mainwindow.c:2371
+#: src/mainwindow.c:2379
 msgid "/Reply to _sender"
 msgstr "/Răspunde _expeditorului"
 
-#: src/mainwindow.c:2372
+#: src/mainwindow.c:2380
 msgid "/Reply to mailing _list"
 msgstr "/Răspunde _listei de discuții"
 
-#: src/mainwindow.c:2377 src/summaryview.c:425
+#: src/mainwindow.c:2385 src/summaryview.c:425
 msgid "/_Forward"
 msgstr "/Trimite mai _departe"
 
-#: src/mainwindow.c:2378 src/summaryview.c:426
+#: src/mainwindow.c:2386 src/summaryview.c:426
 msgid "/For_ward as attachment"
 msgstr "/Trimite mai departe ca _atașament"
 
-#: src/mainwindow.c:2379 src/summaryview.c:427
+#: src/mainwindow.c:2387 src/summaryview.c:427
 msgid "/Redirec_t"
 msgstr "/Redirecționea_ză"
 
 # ???
-#: src/mainwindow.c:2384
+#: src/mainwindow.c:2392
 msgid "Incorporate new mail"
 msgstr "Verifică și eventual încorporează mesaje noi pentru contul curent"
 
-#: src/mainwindow.c:2386
+#: src/mainwindow.c:2394
 msgid "Incorporate new mail of all accounts"
 msgstr "Verifică și eventual încorporează mesaje noi pentru toate conturile"
 
-#: src/mainwindow.c:2388
+#: src/mainwindow.c:2396
 msgid "Send queued message(s)"
 msgstr "Trimite eventualele mesaje din coada de așteptare"
 
-#: src/mainwindow.c:2390
+#: src/mainwindow.c:2398
 msgid "Compose new message"
 msgstr "Compune mesaj nou"
 
-#: src/mainwindow.c:2392
+#: src/mainwindow.c:2400
 msgid "Reply to the message"
 msgstr "Răspunde la mesaj"
 
-#: src/mainwindow.c:2394
+#: src/mainwindow.c:2402
 msgid "Reply to all"
 msgstr "Răspunde tuturor"
 
-#: src/mainwindow.c:2396
+#: src/mainwindow.c:2404
 msgid "Forward the message"
 msgstr "Trimite mesajul mai departe"
 
-#: src/mainwindow.c:2398
+#: src/mainwindow.c:2406
 msgid "Delete the message"
 msgstr "Șterge mesajul"
 
-#: src/mainwindow.c:2400
+#: src/mainwindow.c:2408
 msgid "Set as junk mail"
 msgstr "Marchează ca spam"
 
-#: src/mainwindow.c:2402
+#: src/mainwindow.c:2410
 msgid "Execute marked process"
 msgstr "Execută procesele marcate"
 
-#: src/mainwindow.c:2404
+#: src/mainwindow.c:2412
 msgid "Next unread message"
 msgstr "Următorul mesaj necitit"
 
-#: src/mainwindow.c:2406
+#: src/mainwindow.c:2414
 #, fuzzy
 msgid "Previous unread message"
 msgstr "Următorul mesaj necitit"
 
-#: src/mainwindow.c:2410
+#: src/mainwindow.c:2418
 #, fuzzy
 msgid "Print message"
 msgstr "Trimite acum"
 
-#: src/mainwindow.c:2412
+#: src/mainwindow.c:2420
 msgid "Common preferences"
 msgstr "Preferințe comune"
 
-#: src/mainwindow.c:2414 src/prefs_account_dialog.c:511
+#: src/mainwindow.c:2422 src/prefs_account_dialog.c:511
 msgid "Account preferences"
 msgstr "Preferințe cont"
 
-#: src/mainwindow.c:2779
+#: src/mainwindow.c:2788
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 "Sunteți în modul deconectat. Clic pe icon pentru a trece în modul conectat."
 
-#: src/mainwindow.c:2790
+#: src/mainwindow.c:2799
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 "Sunteți în modul conectat. Clic pe icon pentru a trece în modul deconectat."
 
-#: src/mainwindow.c:3062
+#: src/mainwindow.c:3071
 msgid "Exit"
 msgstr "Ieșire"
 
-#: src/mainwindow.c:3062
+#: src/mainwindow.c:3071
 msgid "Exit this program?"
 msgstr "Ieșiți din acest program ?"
 
-#: src/mainwindow.c:3666
+#: src/mainwindow.c:3675
 msgid "Command line options"
 msgstr "Opțiuni line de comandă"
 
-#: src/mainwindow.c:3679
+#: src/mainwindow.c:3688
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Utilizare: sylpheed [OPȚIUNE]..."
 
-#: src/mainwindow.c:3687
+#: src/mainwindow.c:3696
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -3813,7 +3818,7 @@ msgstr ""
 "--help\n"
 "--version"
 
-#: src/mainwindow.c:3703
+#: src/mainwindow.c:3712
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
diff --git a/po/ru.po b/po/ru.po
index 8b5cc038..ece576de 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed 2.2.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-01-31 16:49+0900\n"
+"POT-Creation-Date: 2007-01-31 17:29+0900\n"
 "PO-Revision-Date: 2006-06-09 14:30+0400\n"
 "Last-Translator: Sergey Vlasov <vsu@altlinux.ru>\n"
 "Language-Team: Russian <ru@li.org>\n"
@@ -911,7 +911,7 @@ msgstr "/Адрес/Правка"
 msgid "/_Address/_Delete"
 msgstr "/Адрес/Удалить"
 
-#: src/addressbook.c:359 src/compose.c:673 src/mainwindow.c:787
+#: src/addressbook.c:359 src/compose.c:673 src/mainwindow.c:789
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/Инструменты"
@@ -920,12 +920,12 @@ msgstr "/Инструменты"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/Инструменты/Импорт файла LDIF"
 
-#: src/addressbook.c:361 src/compose.c:694 src/mainwindow.c:841
+#: src/addressbook.c:361 src/compose.c:694 src/mainwindow.c:843
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/Справка"
 
-#: src/addressbook.c:362 src/compose.c:695 src/mainwindow.c:853
+#: src/addressbook.c:362 src/compose.c:695 src/mainwindow.c:855
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/Справка/О программе"
@@ -967,7 +967,7 @@ msgstr "/Удалить"
 msgid "E-Mail address"
 msgstr "Адрес E-Mail"
 
-#: src/addressbook.c:496 src/compose.c:4873 src/mainwindow.c:2408
+#: src/addressbook.c:496 src/compose.c:4873 src/mainwindow.c:2416
 #: src/prefs_common_dialog.c:2274
 msgid "Address book"
 msgstr "Адресная книга"
@@ -1185,7 +1185,7 @@ msgstr "Общие адреса"
 msgid "Personal address"
 msgstr "Личные адреса"
 
-#: src/alertpanel.c:142 src/compose.c:5717 src/main.c:638
+#: src/alertpanel.c:142 src/compose.c:5720 src/main.c:638
 msgid "Notice"
 msgstr "Уведомление"
 
@@ -1352,9 +1352,9 @@ msgid "/_View/_Reply to"
 msgstr "/Вид/Адрес для ответа"
 
 #: src/compose.c:578 src/compose.c:580 src/compose.c:582 src/compose.c:584
-#: src/compose.c:587 src/mainwindow.c:577 src/mainwindow.c:580
-#: src/mainwindow.c:607 src/mainwindow.c:631 src/mainwindow.c:734
-#: src/mainwindow.c:738 src/messageview.c:258
+#: src/compose.c:587 src/mainwindow.c:579 src/mainwindow.c:582
+#: src/mainwindow.c:609 src/mainwindow.c:633 src/mainwindow.c:736
+#: src/mainwindow.c:740 src/messageview.c:258
 msgid "/_View/---"
 msgstr "/Вид/---"
 
@@ -1375,7 +1375,7 @@ msgstr "/Вид/Вложения"
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/Вид/Перейти/К другой папке..."
 
-#: src/compose.c:593 src/mainwindow.c:638 src/messageview.c:173
+#: src/compose.c:593 src/mainwindow.c:640 src/messageview.c:173
 msgid "/_View/Character _encoding"
 msgstr "/Вид/Кодировка"
 
@@ -1386,113 +1386,113 @@ msgstr "/Вид/Кодировка/Автоопределение"
 #: src/compose.c:596 src/compose.c:602 src/compose.c:608 src/compose.c:612
 #: src/compose.c:620 src/compose.c:624 src/compose.c:630 src/compose.c:636
 #: src/compose.c:640 src/compose.c:650 src/compose.c:654 src/compose.c:662
-#: src/compose.c:666 src/mainwindow.c:634 src/mainwindow.c:641
+#: src/compose.c:666 src/mainwindow.c:636 src/mainwindow.c:643
 #: src/messageview.c:169
 msgid "/_View/Character _encoding/---"
 msgstr "/Вид/Кодировка/---"
 
-#: src/compose.c:598 src/mainwindow.c:642 src/messageview.c:177
+#: src/compose.c:598 src/mainwindow.c:644 src/messageview.c:177
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/Вид/Кодировка/7-битный ascii (US-ASC_II)"
 
-#: src/compose.c:600 src/mainwindow.c:644 src/messageview.c:180
+#: src/compose.c:600 src/mainwindow.c:646 src/messageview.c:180
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/Вид/Кодировка/Unicode (_UTF-8)"
 
-#: src/compose.c:604 src/mainwindow.c:648 src/messageview.c:183
+#: src/compose.c:604 src/mainwindow.c:650 src/messageview.c:183
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/Вид/Кодировка/Западноевропейская (ISO-8859-_1)"
 
-#: src/compose.c:606 src/mainwindow.c:650 src/messageview.c:185
+#: src/compose.c:606 src/mainwindow.c:652 src/messageview.c:185
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/Вид/Кодировка/Западноевропейская (ISO-8859-15)"
 
-#: src/compose.c:610 src/mainwindow.c:656 src/messageview.c:190
+#: src/compose.c:610 src/mainwindow.c:658 src/messageview.c:190
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/Вид/Кодировка/Центральноевропейская (ISO-8859-_2)"
 
-#: src/compose.c:614 src/mainwindow.c:660 src/messageview.c:193
+#: src/compose.c:614 src/mainwindow.c:662 src/messageview.c:193
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/Вид/Кодировка/Прибалтийская (ISO-8859-13)"
 
-#: src/compose.c:616 src/mainwindow.c:662 src/messageview.c:195
+#: src/compose.c:616 src/mainwindow.c:664 src/messageview.c:195
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/Вид/Кодировка/Прибалтийская (ISO-8859-_4)"
 
-#: src/compose.c:618 src/mainwindow.c:664 src/messageview.c:197
+#: src/compose.c:618 src/mainwindow.c:666 src/messageview.c:197
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/Вид/Кодировка/Арабская (Windows-1256)"
 
-#: src/compose.c:622 src/mainwindow.c:668 src/messageview.c:200
+#: src/compose.c:622 src/mainwindow.c:670 src/messageview.c:200
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/Вид/Кодировка/Греческая (ISO-8859-_7)"
 
-#: src/compose.c:626 src/mainwindow.c:672 src/messageview.c:203
+#: src/compose.c:626 src/mainwindow.c:674 src/messageview.c:203
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/Вид/Кодировка/Арабская (ISO-8859-_6)"
 
-#: src/compose.c:628 src/mainwindow.c:674 src/messageview.c:205
+#: src/compose.c:628 src/mainwindow.c:676 src/messageview.c:205
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/Вид/Кодировка/Арабская (Windows-1256)"
 
-#: src/compose.c:632 src/mainwindow.c:678 src/messageview.c:208
+#: src/compose.c:632 src/mainwindow.c:680 src/messageview.c:208
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/Вид/Кодировка/Иврит (ISO-8859-_8)"
 
-#: src/compose.c:634 src/mainwindow.c:680 src/messageview.c:210
+#: src/compose.c:634 src/mainwindow.c:682 src/messageview.c:210
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/Вид/Кодировка/Иврит (Windows-1255)"
 
-#: src/compose.c:638 src/mainwindow.c:684 src/messageview.c:213
+#: src/compose.c:638 src/mainwindow.c:686 src/messageview.c:213
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/Вид/Кодировка/Турецкая (ISO-8859-_9)"
 
-#: src/compose.c:642 src/mainwindow.c:688 src/messageview.c:216
+#: src/compose.c:642 src/mainwindow.c:690 src/messageview.c:216
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/Вид/Кодировка/Кириллица (ISO-8859-_5)"
 
-#: src/compose.c:644 src/mainwindow.c:690 src/messageview.c:218
+#: src/compose.c:644 src/mainwindow.c:692 src/messageview.c:218
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/Вид/Кодировка/Кириллица (KOI8-_R)"
 
-#: src/compose.c:646 src/mainwindow.c:692 src/messageview.c:220
+#: src/compose.c:646 src/mainwindow.c:694 src/messageview.c:220
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/Вид/Кодировка/Кириллица\\/Украина (KOI8-_U)"
 
-#: src/compose.c:648 src/mainwindow.c:694 src/messageview.c:222
+#: src/compose.c:648 src/mainwindow.c:696 src/messageview.c:222
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/Вид/Кодировка/Кириллица (_Windows-1251)"
 
-#: src/compose.c:652 src/mainwindow.c:698 src/messageview.c:225
+#: src/compose.c:652 src/mainwindow.c:700 src/messageview.c:225
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/Вид/Кодировка/Японская (ISO-2022-_JP)"
 
-#: src/compose.c:656 src/mainwindow.c:708 src/messageview.c:234
+#: src/compose.c:656 src/mainwindow.c:710 src/messageview.c:234
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/Вид/Кодировка/Китайская упрощённая (_GB2312)"
 
-#: src/compose.c:658 src/mainwindow.c:710 src/messageview.c:236
+#: src/compose.c:658 src/mainwindow.c:712 src/messageview.c:236
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/Вид/Кодировка/Китайская упрощённая (GBK)"
 
-#: src/compose.c:660 src/mainwindow.c:712 src/messageview.c:238
+#: src/compose.c:660 src/mainwindow.c:714 src/messageview.c:238
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/Вид/Кодировка/Китайская традиционная (_Big5)"
 
-#: src/compose.c:664 src/mainwindow.c:720 src/messageview.c:245
+#: src/compose.c:664 src/mainwindow.c:722 src/messageview.c:245
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/Вид/Кодировка/Корейская (EUC-_KR)"
 
-#: src/compose.c:668 src/mainwindow.c:726 src/messageview.c:250
+#: src/compose.c:668 src/mainwindow.c:728 src/messageview.c:250
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/Вид/Кодировка/Тайская (TIS-620)"
 
-#: src/compose.c:670 src/mainwindow.c:728 src/messageview.c:252
+#: src/compose.c:670 src/mainwindow.c:730 src/messageview.c:252
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/Вид/Кодировка/Тайская (Windows-874)"
 
-#: src/compose.c:674 src/mainwindow.c:788 src/messageview.c:283
+#: src/compose.c:674 src/mainwindow.c:790 src/messageview.c:283
 msgid "/_Tools/_Address book"
 msgstr "/Инструменты/Адресная книга"
 
@@ -1500,13 +1500,13 @@ msgstr "/Инструменты/Адресная книга"
 msgid "/_Tools/_Template"
 msgstr "/Инструменты/Шаблон"
 
-#: src/compose.c:677 src/mainwindow.c:812 src/messageview.c:299
+#: src/compose.c:677 src/mainwindow.c:814 src/messageview.c:299
 msgid "/_Tools/Actio_ns"
 msgstr "/Инструменты/Действия"
 
-#: src/compose.c:679 src/compose.c:683 src/compose.c:689 src/mainwindow.c:791
-#: src/mainwindow.c:805 src/mainwindow.c:810 src/mainwindow.c:813
-#: src/mainwindow.c:817 src/mainwindow.c:819 src/messageview.c:286
+#: src/compose.c:679 src/compose.c:683 src/compose.c:689 src/mainwindow.c:793
+#: src/mainwindow.c:807 src/mainwindow.c:812 src/mainwindow.c:815
+#: src/mainwindow.c:819 src/mainwindow.c:821 src/messageview.c:286
 #: src/messageview.c:298
 msgid "/_Tools/---"
 msgstr "/Инструменты/---"
@@ -1707,7 +1707,7 @@ msgstr "Подписать PGP"
 msgid "PGP Encrypt"
 msgstr "Шифровать PGP"
 
-#: src/compose.c:4442 src/compose.c:5543
+#: src/compose.c:4442 src/compose.c:5546
 msgid "MIME type"
 msgstr "Тип MIME"
 
@@ -1749,36 +1749,36 @@ msgstr "Править внешним редактором"
 msgid "Wrap all long lines"
 msgstr "Отформатировать всё сообщение"
 
-#: src/compose.c:5439
+#: src/compose.c:5442
 msgid "Invalid MIME type."
 msgstr "Неверный тип MIME."
 
-#: src/compose.c:5457
+#: src/compose.c:5460
 msgid "File doesn't exist or is empty."
 msgstr "Файл не существует или пуст."
 
-#: src/compose.c:5525
+#: src/compose.c:5528
 msgid "Properties"
 msgstr "Свойства"
 
-#: src/compose.c:5545 src/prefs_common_dialog.c:1504
+#: src/compose.c:5548 src/prefs_common_dialog.c:1504
 msgid "Encoding"
 msgstr "Кодировка"
 
-#: src/compose.c:5568 src/prefs_folder_item.c:202
+#: src/compose.c:5571 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Путь"
 
-#: src/compose.c:5569
+#: src/compose.c:5572
 msgid "File name"
 msgstr "Имя файла"
 
-#: src/compose.c:5659
+#: src/compose.c:5662
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Неверная команда вызова внешнего редактора: \"%s\"\n"
 
-#: src/compose.c:5714
+#: src/compose.c:5717
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1788,48 +1788,48 @@ msgstr ""
 "Завершить процесс принудительно?\n"
 "Идентификатор группы процессов: %d\n"
 
-#: src/compose.c:6040 src/mainwindow.c:2752
+#: src/compose.c:6043 src/mainwindow.c:2761
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:6156 src/compose.c:6161 src/compose.c:6167
+#: src/compose.c:6159 src/compose.c:6164 src/compose.c:6170
 msgid "Can't queue the message."
 msgstr "Ошибка постановки в очередь."
 
-#: src/compose.c:6258
+#: src/compose.c:6261
 msgid "Select files"
 msgstr "Выбор файлов"
 
-#: src/compose.c:6281
+#: src/compose.c:6284
 msgid "Select file"
 msgstr "Выбор файла"
 
-#: src/compose.c:6316
+#: src/compose.c:6319
 msgid "Save message"
 msgstr "Сохранить сообщение"
 
-#: src/compose.c:6317
+#: src/compose.c:6320
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Это сообщение изменено. Сохранить его в папке черновиков?"
 
-#: src/compose.c:6319
+#: src/compose.c:6322
 msgid "Close _without saving"
 msgstr "Закрыть без сохранения"
 
-#: src/compose.c:6361
+#: src/compose.c:6364
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Применить шаблон \"%s\"?"
 
-#: src/compose.c:6363
+#: src/compose.c:6366
 msgid "Apply template"
 msgstr "Применить шаблон"
 
-#: src/compose.c:6364
+#: src/compose.c:6367
 msgid "_Replace"
 msgstr "Заменить"
 
-#: src/compose.c:6364
+#: src/compose.c:6367
 msgid "_Insert"
 msgstr "Вставить"
 
@@ -2286,12 +2286,12 @@ msgstr "Установка информации о папке...\n"
 msgid "Setting folder info..."
 msgstr "Установка информации о папке..."
 
-#: src/folderview.c:868 src/mainwindow.c:3748 src/setup.c:80
+#: src/folderview.c:868 src/mainwindow.c:3757 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Просмотр папки %s%c%s ..."
 
-#: src/folderview.c:872 src/mainwindow.c:3753 src/setup.c:85
+#: src/folderview.c:872 src/mainwindow.c:3762 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Просмотр папки %s ..."
@@ -3052,536 +3052,541 @@ msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/Вид/Показать или скрыть/Панель инструментов/Значки и текст"
 
 #: src/mainwindow.c:566
-msgid "/_View/Show or hi_de/_Toolbar/_Icon"
+#, fuzzy
+msgid "/_View/Show or hi_de/_Toolbar/Text at the _right of icon"
 msgstr "/Вид/Показать или скрыть/Панель инструментов/Значки"
 
 #: src/mainwindow.c:568
+msgid "/_View/Show or hi_de/_Toolbar/_Icon"
+msgstr "/Вид/Показать или скрыть/Панель инструментов/Значки"
+
+#: src/mainwindow.c:570
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/Вид/Показать или скрыть/Панель инструментов/Текст"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:572
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/Вид/Показать или скрыть/Панель инструментов/Не показывать"
 
-#: src/mainwindow.c:572
+#: src/mainwindow.c:574
 msgid "/_View/Show or hi_de/_Search bar"
 msgstr "/Вид/Показать или скрыть/Строка поиска"
 
-#: src/mainwindow.c:574
+#: src/mainwindow.c:576
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/Вид/Показать или скрыть/Строка состояния"
 
-#: src/mainwindow.c:576
+#: src/mainwindow.c:578
 #, fuzzy
 msgid "/_View/_Customize toolbar..."
 msgstr "/Вид/Перейти/К другой папке..."
 
-#: src/mainwindow.c:578
+#: src/mainwindow.c:580
 msgid "/_View/Separate f_older tree"
 msgstr "/Вид/Отдельное дерево папок"
 
-#: src/mainwindow.c:579
+#: src/mainwindow.c:581
 msgid "/_View/Separate _message view"
 msgstr "/Вид/Отдельное окно сообщения"
 
-#: src/mainwindow.c:581
+#: src/mainwindow.c:583
 msgid "/_View/_Sort"
 msgstr "/Вид/Сортировка"
 
-#: src/mainwindow.c:582
+#: src/mainwindow.c:584
 msgid "/_View/_Sort/by _number"
 msgstr "/Вид/Сортировка/По номеру"
 
-#: src/mainwindow.c:583
+#: src/mainwindow.c:585
 msgid "/_View/_Sort/by s_ize"
 msgstr "/Вид/Сортировка/По размеру"
 
-#: src/mainwindow.c:584
+#: src/mainwindow.c:586
 msgid "/_View/_Sort/by _date"
 msgstr "/Вид/Сортировка/По дате"
 
-#: src/mainwindow.c:585
+#: src/mainwindow.c:587
 msgid "/_View/_Sort/by t_hread date"
 msgstr "/Вид/Сортировка/По дате обсуждения"
 
-#: src/mainwindow.c:586
+#: src/mainwindow.c:588
 msgid "/_View/_Sort/by _from"
 msgstr "/Вид/Сортировка/По отправителю"
 
-#: src/mainwindow.c:587
+#: src/mainwindow.c:589
 msgid "/_View/_Sort/by _recipient"
 msgstr "/Вид/Сортировка/По получателю"
 
-#: src/mainwindow.c:588
+#: src/mainwindow.c:590
 msgid "/_View/_Sort/by _subject"
 msgstr "/Вид/Сортировка/По теме"
 
-#: src/mainwindow.c:589
+#: src/mainwindow.c:591
 msgid "/_View/_Sort/by _color label"
 msgstr "/Вид/Сортировка/По выделению цветом"
 
-#: src/mainwindow.c:591
+#: src/mainwindow.c:593
 msgid "/_View/_Sort/by _mark"
 msgstr "/Вид/Сортировка/По отметке"
 
-#: src/mainwindow.c:592
+#: src/mainwindow.c:594
 msgid "/_View/_Sort/by _unread"
 msgstr "/Вид/Сортировка/По непрочитанным"
 
-#: src/mainwindow.c:593
+#: src/mainwindow.c:595
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/Вид/Сортировка/По вложениям"
 
-#: src/mainwindow.c:595
+#: src/mainwindow.c:597
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/Вид/Сортировка/Без сортировки"
 
-#: src/mainwindow.c:596 src/mainwindow.c:599
+#: src/mainwindow.c:598 src/mainwindow.c:601
 msgid "/_View/_Sort/---"
 msgstr "/Вид/Сортировка/---"
 
-#: src/mainwindow.c:597
+#: src/mainwindow.c:599
 msgid "/_View/_Sort/Ascending"
 msgstr "/Вид/Сортировка/По возрастанию"
 
-#: src/mainwindow.c:598
+#: src/mainwindow.c:600
 msgid "/_View/_Sort/Descending"
 msgstr "/Вид/Сортировка/По убыванию"
 
-#: src/mainwindow.c:600
+#: src/mainwindow.c:602
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/Вид/Сортировка/Группировка по теме"
 
-#: src/mainwindow.c:602
+#: src/mainwindow.c:604
 msgid "/_View/Th_read view"
 msgstr "/Вид/Группировка по дискуссиям"
 
-#: src/mainwindow.c:603
+#: src/mainwindow.c:605
 msgid "/_View/E_xpand all threads"
 msgstr "/Вид/Развернуть все обсуждения"
 
-#: src/mainwindow.c:604
+#: src/mainwindow.c:606
 msgid "/_View/Co_llapse all threads"
 msgstr "/Вид/Свернуть все обсуждения"
 
-#: src/mainwindow.c:605
+#: src/mainwindow.c:607
 msgid "/_View/Set display _item..."
 msgstr "/Вид/Установить видимые поля..."
 
-#: src/mainwindow.c:608
+#: src/mainwindow.c:610
 msgid "/_View/_Go to"
 msgstr "/Вид/Перейти"
 
-#: src/mainwindow.c:609
+#: src/mainwindow.c:611
 msgid "/_View/_Go to/_Prev message"
 msgstr "/Вид/Перейти/Предыдущее сообщение"
 
-#: src/mainwindow.c:610
+#: src/mainwindow.c:612
 msgid "/_View/_Go to/_Next message"
 msgstr "/Вид/Перейти/Следующее сообщение"
 
-#: src/mainwindow.c:611 src/mainwindow.c:616 src/mainwindow.c:619
-#: src/mainwindow.c:624 src/mainwindow.c:629
+#: src/mainwindow.c:613 src/mainwindow.c:618 src/mainwindow.c:621
+#: src/mainwindow.c:626 src/mainwindow.c:631
 msgid "/_View/_Go to/---"
 msgstr "/Вид/Перейти/---"
 
-#: src/mainwindow.c:612
+#: src/mainwindow.c:614
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/Вид/Перейти/Предыдущее непрочитанное сообщение"
 
-#: src/mainwindow.c:614
+#: src/mainwindow.c:616
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/Вид/Перейти/Следующее непрочитанное сообщение"
 
-#: src/mainwindow.c:617
+#: src/mainwindow.c:619
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/Вид/Перейти/Предыдущее новое сообщение"
 
-#: src/mainwindow.c:618
+#: src/mainwindow.c:620
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/Вид/Перейти/Следующее новое сообщение"
 
-#: src/mainwindow.c:620
+#: src/mainwindow.c:622
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/Вид/Перейти/Предыдущее отмеченное сообщение"
 
-#: src/mainwindow.c:622
+#: src/mainwindow.c:624
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/Вид/Перейти/Следующее отмеченное сообщение"
 
-#: src/mainwindow.c:625
+#: src/mainwindow.c:627
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/Вид/Перейти/Предыдущее выделенное цветом сообщение"
 
-#: src/mainwindow.c:627
+#: src/mainwindow.c:629
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/Вид/Перейти/Следующее выделенное цветом сообщение"
 
-#: src/mainwindow.c:630
+#: src/mainwindow.c:632
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/Вид/Перейти/К другой папке..."
 
-#: src/mainwindow.c:639 src/messageview.c:174
+#: src/mainwindow.c:641 src/messageview.c:174
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/Вид/Кодировка/Автоопределение"
 
-#: src/mainwindow.c:652 src/messageview.c:187
+#: src/mainwindow.c:654 src/messageview.c:187
 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr "/Вид/Кодировка/Западноевропейская (Windows-1252)"
 
-#: src/mainwindow.c:700 src/messageview.c:227
+#: src/mainwindow.c:702 src/messageview.c:227
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/Вид/Кодировка/Японская (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:702 src/messageview.c:229
+#: src/mainwindow.c:704 src/messageview.c:229
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/Вид/Кодировка/Японская (_EUC-JP)"
 
-#: src/mainwindow.c:704 src/messageview.c:231
+#: src/mainwindow.c:706 src/messageview.c:231
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/Вид/Кодировка/Японская (_Shift__JIS)"
 
-#: src/mainwindow.c:714 src/messageview.c:240
+#: src/mainwindow.c:716 src/messageview.c:240
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/Вид/Кодировка/Китайская традиционная (EUC-_TW)"
 
-#: src/mainwindow.c:716 src/messageview.c:242
+#: src/mainwindow.c:718 src/messageview.c:242
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/Вид/Кодировка/Китайская (ISO-2022-_CN)"
 
-#: src/mainwindow.c:722 src/messageview.c:247
+#: src/mainwindow.c:724 src/messageview.c:247
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/Вид/Кодировка/Корейская (ISO-2022-KR)"
 
-#: src/mainwindow.c:735 src/summaryview.c:464
+#: src/mainwindow.c:737 src/summaryview.c:464
 msgid "/_View/Open in new _window"
 msgstr "/Вид/Открыть в новом окне"
 
-#: src/mainwindow.c:736 src/messageview.c:259 src/summaryview.c:466
+#: src/mainwindow.c:738 src/messageview.c:259 src/summaryview.c:466
 msgid "/_View/Mess_age source"
 msgstr "/Вид/Показать исходный текст"
 
-#: src/mainwindow.c:737 src/messageview.c:260 src/summaryview.c:467
+#: src/mainwindow.c:739 src/messageview.c:260 src/summaryview.c:467
 #, fuzzy
 msgid "/_View/All _headers"
 msgstr "/Вид/Все заголовки"
 
-#: src/mainwindow.c:739
+#: src/mainwindow.c:741
 msgid "/_View/_Update summary"
 msgstr "/Вид/Обновить список сообщений"
 
-#: src/mainwindow.c:741 src/messageview.c:263
+#: src/mainwindow.c:743 src/messageview.c:263
 msgid "/_Message"
 msgstr "/Сообщение"
 
-#: src/mainwindow.c:742
+#: src/mainwindow.c:744
 msgid "/_Message/Recei_ve"
 msgstr "/Сообщение/Получить"
 
-#: src/mainwindow.c:743
+#: src/mainwindow.c:745
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/Сообщение/Получить/Получить с текущей учётной записи"
 
-#: src/mainwindow.c:745
+#: src/mainwindow.c:747
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/Сообщение/Получить/Получить со всех учётных записей"
 
-#: src/mainwindow.c:747
+#: src/mainwindow.c:749
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/Сообщение/Получить/Прервать получение сообщений"
 
-#: src/mainwindow.c:749
+#: src/mainwindow.c:751
 msgid "/_Message/Recei_ve/---"
 msgstr "/Сообщение/Получить/---"
 
-#: src/mainwindow.c:750
+#: src/mainwindow.c:752
 msgid "/_Message/_Send queued messages"
 msgstr "/Сообщение/Отправить сообщения из очереди"
 
-#: src/mainwindow.c:751 src/mainwindow.c:753 src/mainwindow.c:760
-#: src/mainwindow.c:765 src/mainwindow.c:768 src/mainwindow.c:779
-#: src/mainwindow.c:781 src/mainwindow.c:784 src/messageview.c:266
+#: src/mainwindow.c:753 src/mainwindow.c:755 src/mainwindow.c:762
+#: src/mainwindow.c:767 src/mainwindow.c:770 src/mainwindow.c:781
+#: src/mainwindow.c:783 src/mainwindow.c:786 src/messageview.c:266
 #: src/messageview.c:274 src/messageview.c:279
 msgid "/_Message/---"
 msgstr "/Сообщение/---"
 
-#: src/mainwindow.c:752 src/messageview.c:264
+#: src/mainwindow.c:754 src/messageview.c:264
 msgid "/_Message/Compose _new message"
 msgstr "/Сообщение/Написать новое сообщение"
 
-#: src/mainwindow.c:754 src/messageview.c:267
+#: src/mainwindow.c:756 src/messageview.c:267
 msgid "/_Message/_Reply"
 msgstr "/Сообщение/Ответить"
 
-#: src/mainwindow.c:755
+#: src/mainwindow.c:757
 msgid "/_Message/Repl_y to"
 msgstr "/Сообщение/Ответить..."
 
-#: src/mainwindow.c:756 src/messageview.c:268
+#: src/mainwindow.c:758 src/messageview.c:268
 msgid "/_Message/Repl_y to/_all"
 msgstr "/Сообщение/Ответить.../Всем"
 
-#: src/mainwindow.c:757 src/messageview.c:270
+#: src/mainwindow.c:759 src/messageview.c:270
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/Сообщение/Ответить.../Отправителю"
 
-#: src/mainwindow.c:758 src/messageview.c:272
+#: src/mainwindow.c:760 src/messageview.c:272
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/Сообщение/Ответить.../В список рассылки"
 
-#: src/mainwindow.c:761 src/messageview.c:275
+#: src/mainwindow.c:763 src/messageview.c:275
 msgid "/_Message/_Forward"
 msgstr "/Сообщение/Переслать"
 
-#: src/mainwindow.c:762 src/messageview.c:276
+#: src/mainwindow.c:764 src/messageview.c:276
 msgid "/_Message/For_ward as attachment"
 msgstr "/Сообщение/Переслать как вложение"
 
-#: src/mainwindow.c:764 src/messageview.c:278
+#: src/mainwindow.c:766 src/messageview.c:278
 msgid "/_Message/Redirec_t"
 msgstr "/Сообщение/Перенаправить без изменений"
 
-#: src/mainwindow.c:766
+#: src/mainwindow.c:768
 msgid "/_Message/M_ove..."
 msgstr "/Сообщение/Переместить..."
 
-#: src/mainwindow.c:767
+#: src/mainwindow.c:769
 msgid "/_Message/_Copy..."
 msgstr "/Сообщение/Копировать..."
 
-#: src/mainwindow.c:769
+#: src/mainwindow.c:771
 msgid "/_Message/_Mark"
 msgstr "/Сообщение/Отметить"
 
-#: src/mainwindow.c:770
+#: src/mainwindow.c:772
 msgid "/_Message/_Mark/_Mark"
 msgstr "/Сообщение/Отметить/Отметить"
 
-#: src/mainwindow.c:771
+#: src/mainwindow.c:773
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/Сообщение/Отметить/Снять отметку"
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:774
 msgid "/_Message/_Mark/---"
 msgstr "/Сообщение/Отметить/---"
 
-#: src/mainwindow.c:773
+#: src/mainwindow.c:775
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/Сообщение/Отметить/Пометить как непрочитанное"
 
-#: src/mainwindow.c:774
+#: src/mainwindow.c:776
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/Сообщение/Отметить/Пометить как прочитанное"
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:778
 msgid "/_Message/_Mark/Mark _thread as read"
 msgstr "/Сообщение/Отметить/Пометить обсуждение как прочитанное"
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:780
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/Сообщение/Отметить/Пометить все сообщения как прочитанные"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:782
 msgid "/_Message/_Delete"
 msgstr "/Сообщение/Удалить"
 
-#: src/mainwindow.c:782
+#: src/mainwindow.c:784
 msgid "/_Message/Set as _junk mail"
 msgstr "/Сообщение/Пометить как спам"
 
-#: src/mainwindow.c:783
+#: src/mainwindow.c:785
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/Сообщение/Пометить как не спам"
 
-#: src/mainwindow.c:785 src/messageview.c:280
+#: src/mainwindow.c:787 src/messageview.c:280
 msgid "/_Message/Re-_edit"
 msgstr "/Сообщение/Изменить"
 
-#: src/mainwindow.c:789
+#: src/mainwindow.c:791
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/Инструменты/Добавить отправителя в адресную книгу"
 
-#: src/mainwindow.c:792
+#: src/mainwindow.c:794
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/Инструменты/Отфильтровать все сообщения в папке"
 
-#: src/mainwindow.c:794
+#: src/mainwindow.c:796
 msgid "/_Tools/Filter _selected messages"
 msgstr "/Инструменты/Отфильтровать выбранные сообщения"
 
-#: src/mainwindow.c:796 src/messageview.c:287
+#: src/mainwindow.c:798 src/messageview.c:287
 msgid "/_Tools/_Create filter rule"
 msgstr "/Инструменты/Создать правило фильтрации"
 
-#: src/mainwindow.c:797 src/messageview.c:289
+#: src/mainwindow.c:799 src/messageview.c:289
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/Инструменты/Создать правило фильтрации/Автоматически"
 
-#: src/mainwindow.c:799 src/messageview.c:291
+#: src/mainwindow.c:801 src/messageview.c:291
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/Инструменты/Создать правило фильтрации/По отправителю"
 
-#: src/mainwindow.c:801 src/messageview.c:293
+#: src/mainwindow.c:803 src/messageview.c:293
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/Инструменты/Создать правило фильтрации/По получателю"
 
-#: src/mainwindow.c:803 src/messageview.c:295
+#: src/mainwindow.c:805 src/messageview.c:295
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/Инструменты/Создать правило фильтрации/По теме"
 
-#: src/mainwindow.c:806
+#: src/mainwindow.c:808
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/Инструменты/Отфильтровать спам в папке"
 
-#: src/mainwindow.c:808
+#: src/mainwindow.c:810
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/Инструменты/Отфильтровать спам в выбранных сообщениях"
 
-#: src/mainwindow.c:815
+#: src/mainwindow.c:817
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/Инструменты/Удалить повторяющиеся сообщения"
 
-#: src/mainwindow.c:818
+#: src/mainwindow.c:820
 #, fuzzy
 msgid "/_Tools/E_xecute marked process"
 msgstr "Выполнить отмеченный процесс"
 
-#: src/mainwindow.c:820
+#: src/mainwindow.c:822
 msgid "/_Tools/_Log window"
 msgstr "/Инструменты/Окно журнала"
 
-#: src/mainwindow.c:822
+#: src/mainwindow.c:824
 msgid "/_Configuration"
 msgstr "/Настройка"
 
-#: src/mainwindow.c:823
+#: src/mainwindow.c:825
 msgid "/_Configuration/_Common preferences..."
 msgstr "/Настройка/Общие настройки..."
 
-#: src/mainwindow.c:825
+#: src/mainwindow.c:827
 msgid "/_Configuration/_Filter setting..."
 msgstr "/Настройка/Настройка фильтров..."
 
-#: src/mainwindow.c:827
+#: src/mainwindow.c:829
 msgid "/_Configuration/_Template..."
 msgstr "/Настройка/Шаблоны..."
 
-#: src/mainwindow.c:829
+#: src/mainwindow.c:831
 msgid "/_Configuration/_Actions..."
 msgstr "/Настройка/Действия..."
 
-#: src/mainwindow.c:831
+#: src/mainwindow.c:833
 msgid "/_Configuration/---"
 msgstr "/Настройка/---"
 
-#: src/mainwindow.c:832
+#: src/mainwindow.c:834
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/Настройка/Настройка текущей учётной записи... "
 
-#: src/mainwindow.c:834
+#: src/mainwindow.c:836
 msgid "/_Configuration/Create _new account..."
 msgstr "/Настройка/Создать новую учётную запись..."
 
-#: src/mainwindow.c:836
+#: src/mainwindow.c:838
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/Настройка/Редактирование учётных записей..."
 
-#: src/mainwindow.c:838
+#: src/mainwindow.c:840
 msgid "/_Configuration/C_hange current account"
 msgstr "/Настройка/Переключить текущую учётную запись"
 
-#: src/mainwindow.c:842
+#: src/mainwindow.c:844
 msgid "/_Help/_Manual"
 msgstr "/Справка/Руководство"
 
-#: src/mainwindow.c:843
+#: src/mainwindow.c:845
 msgid "/_Help/_Manual/_English"
 msgstr "/Справка/Руководство/Английское"
 
-#: src/mainwindow.c:844
+#: src/mainwindow.c:846
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/Справка/Руководство/Японское"
 
-#: src/mainwindow.c:845
+#: src/mainwindow.c:847
 msgid "/_Help/_FAQ"
 msgstr "/Справка/FAQ"
 
-#: src/mainwindow.c:846
+#: src/mainwindow.c:848
 msgid "/_Help/_FAQ/_English"
 msgstr "/Справка/FAQ/Английский"
 
-#: src/mainwindow.c:847
+#: src/mainwindow.c:849
 msgid "/_Help/_FAQ/_German"
 msgstr "/Справка/FAQ/Немецкий"
 
-#: src/mainwindow.c:848
+#: src/mainwindow.c:850
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/Справка/FAQ/Испанский"
 
-#: src/mainwindow.c:849
+#: src/mainwindow.c:851
 msgid "/_Help/_FAQ/_French"
 msgstr "/Справка/FAQ/Французский"
 
-#: src/mainwindow.c:850
+#: src/mainwindow.c:852
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/Справка/FAQ/Итальянский"
 
-#: src/mainwindow.c:851
+#: src/mainwindow.c:853
 msgid "/_Help/_Command line options"
 msgstr "/Справка/Параметры командной строки"
 
-#: src/mainwindow.c:852
+#: src/mainwindow.c:854
 msgid "/_Help/---"
 msgstr "/Справка/---"
 
-#: src/mainwindow.c:895
+#: src/mainwindow.c:897
 msgid "Creating main window...\n"
 msgstr "Создание главного окна...\n"
 
-#: src/mainwindow.c:1071
+#: src/mainwindow.c:1073
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Главное окно: проблема с цветом %d\n"
 
-#: src/mainwindow.c:1175 src/summaryview.c:2387 src/summaryview.c:2472
+#: src/mainwindow.c:1181 src/summaryview.c:2387 src/summaryview.c:2472
 #: src/summaryview.c:4009 src/summaryview.c:4138 src/summaryview.c:4507
 msgid "done.\n"
 msgstr "выполнено.\n"
 
-#: src/mainwindow.c:1293 src/mainwindow.c:1334 src/mainwindow.c:1359
+#: src/mainwindow.c:1299 src/mainwindow.c:1340 src/mainwindow.c:1365
 msgid "Untitled"
 msgstr "Без названия"
 
-#: src/mainwindow.c:1360
+#: src/mainwindow.c:1366
 msgid "none"
 msgstr "нет"
 
-#: src/mainwindow.c:1413
+#: src/mainwindow.c:1419
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "Изменение типа разделения окна с %d на %d\n"
 
-#: src/mainwindow.c:1663
+#: src/mainwindow.c:1669
 msgid "Offline"
 msgstr "Автономная работа"
 
-#: src/mainwindow.c:1664
+#: src/mainwindow.c:1670
 msgid "You are offline. Go online?"
 msgstr "Вы работаете в автономном режиме. Подключиться к сети?"
 
-#: src/mainwindow.c:1681
+#: src/mainwindow.c:1687
 msgid "Empty all trash"
 msgstr "Очистить все корзины"
 
-#: src/mainwindow.c:1682
+#: src/mainwindow.c:1688
 msgid "Delete all messages in trash folders?"
 msgstr "Удалить все сообщения из корзины?"
 
-#: src/mainwindow.c:1712
+#: src/mainwindow.c:1718
 msgid "Add mailbox"
 msgstr "Добавить почтовый ящик"
 
-#: src/mainwindow.c:1713
+#: src/mainwindow.c:1719
 msgid ""
 "Specify the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3591,16 +3596,16 @@ msgstr ""
 "Если будет указан существующий ящик, то он\n"
 "будет автоматически прочитан."
 
-#: src/mainwindow.c:1719 src/setup.c:49
+#: src/mainwindow.c:1725 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Почтовый ящик \"%s\" уже существует."
 
-#: src/mainwindow.c:1724 src/setup.c:56
+#: src/mainwindow.c:1730 src/setup.c:56
 msgid "Mailbox"
 msgstr "Почтовый ящик"
 
-#: src/mainwindow.c:1730 src/setup.c:62
+#: src/mainwindow.c:1736 src/setup.c:62
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3610,130 +3615,130 @@ msgstr ""
 "Возможно, некоторые файлы уже существуют, или вы не имеете прав на запись в "
 "каталог."
 
-#: src/mainwindow.c:2198
+#: src/mainwindow.c:2206
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Папки"
 
-#: src/mainwindow.c:2217
+#: src/mainwindow.c:2225
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Сообщение"
 
-#: src/mainwindow.c:2369 src/summaryview.c:418
+#: src/mainwindow.c:2377 src/summaryview.c:418
 msgid "/_Reply"
 msgstr "/Ответить"
 
-#: src/mainwindow.c:2370
+#: src/mainwindow.c:2378
 msgid "/Reply to _all"
 msgstr "/Ответить всем"
 
-#: src/mainwindow.c:2371
+#: src/mainwindow.c:2379
 msgid "/Reply to _sender"
 msgstr "/Ответить отправителю"
 
-#: src/mainwindow.c:2372
+#: src/mainwindow.c:2380
 msgid "/Reply to mailing _list"
 msgstr "/Ответить в список рассылки"
 
-#: src/mainwindow.c:2377 src/summaryview.c:425
+#: src/mainwindow.c:2385 src/summaryview.c:425
 msgid "/_Forward"
 msgstr "/Переслать"
 
-#: src/mainwindow.c:2378 src/summaryview.c:426
+#: src/mainwindow.c:2386 src/summaryview.c:426
 msgid "/For_ward as attachment"
 msgstr "/Переслать как вложение"
 
-#: src/mainwindow.c:2379 src/summaryview.c:427
+#: src/mainwindow.c:2387 src/summaryview.c:427
 msgid "/Redirec_t"
 msgstr "/Перенаправить без изменений"
 
-#: src/mainwindow.c:2384
+#: src/mainwindow.c:2392
 msgid "Incorporate new mail"
 msgstr "Получить новые сообщения"
 
-#: src/mainwindow.c:2386
+#: src/mainwindow.c:2394
 msgid "Incorporate new mail of all accounts"
 msgstr "Получить сообщения со всех учётных записей"
 
-#: src/mainwindow.c:2388
+#: src/mainwindow.c:2396
 msgid "Send queued message(s)"
 msgstr "Отправить сообщения из очереди"
 
-#: src/mainwindow.c:2390
+#: src/mainwindow.c:2398
 msgid "Compose new message"
 msgstr "Написать новое сообщение"
 
-#: src/mainwindow.c:2392
+#: src/mainwindow.c:2400
 msgid "Reply to the message"
 msgstr "Ответить на сообщение"
 
-#: src/mainwindow.c:2394
+#: src/mainwindow.c:2402
 msgid "Reply to all"
 msgstr "Ответить всем"
 
-#: src/mainwindow.c:2396
+#: src/mainwindow.c:2404
 msgid "Forward the message"
 msgstr "Переслать сообщение"
 
-#: src/mainwindow.c:2398
+#: src/mainwindow.c:2406
 msgid "Delete the message"
 msgstr "Удалить сообщение"
 
-#: src/mainwindow.c:2400
+#: src/mainwindow.c:2408
 msgid "Set as junk mail"
 msgstr "Пометить как спам"
 
-#: src/mainwindow.c:2402
+#: src/mainwindow.c:2410
 msgid "Execute marked process"
 msgstr "Выполнить отмеченный процесс"
 
-#: src/mainwindow.c:2404
+#: src/mainwindow.c:2412
 msgid "Next unread message"
 msgstr "Следующее непрочитанное сообщение"
 
-#: src/mainwindow.c:2406
+#: src/mainwindow.c:2414
 #, fuzzy
 msgid "Previous unread message"
 msgstr "Следующее непрочитанное сообщение"
 
-#: src/mainwindow.c:2410
+#: src/mainwindow.c:2418
 #, fuzzy
 msgid "Print message"
 msgstr "Отправить сообщение"
 
-#: src/mainwindow.c:2412
+#: src/mainwindow.c:2420
 msgid "Common preferences"
 msgstr "Общие настройки"
 
-#: src/mainwindow.c:2414 src/prefs_account_dialog.c:511
+#: src/mainwindow.c:2422 src/prefs_account_dialog.c:511
 msgid "Account preferences"
 msgstr "Настройки учётной записи"
 
-#: src/mainwindow.c:2779
+#: src/mainwindow.c:2788
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 "Вы работаете в автономном режиме. Щёлкните по значку, чтобы подключиться."
 
-#: src/mainwindow.c:2790
+#: src/mainwindow.c:2799
 msgid "You are online. Click the icon to go offline."
 msgstr "Вы подключены. Щёлкните по значку, чтобы работать автономно."
 
-#: src/mainwindow.c:3062
+#: src/mainwindow.c:3071
 msgid "Exit"
 msgstr "Выход"
 
-#: src/mainwindow.c:3062
+#: src/mainwindow.c:3071
 msgid "Exit this program?"
 msgstr "Выйти из программы?"
 
-#: src/mainwindow.c:3666
+#: src/mainwindow.c:3675
 msgid "Command line options"
 msgstr "Параметры командной строки"
 
-#: src/mainwindow.c:3679
+#: src/mainwindow.c:3688
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Использование: sylpheed [ПАРАМЕТР]..."
 
-#: src/mainwindow.c:3687
+#: src/mainwindow.c:3696
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -3761,7 +3766,7 @@ msgstr ""
 "--help\n"
 "--version"
 
-#: src/mainwindow.c:3703
+#: src/mainwindow.c:3712
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
diff --git a/po/sk.po b/po/sk.po
index f09bede3..0f1baaf0 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-01-31 16:49+0900\n"
+"POT-Creation-Date: 2007-01-31 17:29+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"
@@ -907,7 +907,7 @@ msgstr "/_Adresa/_Upraviť"
 msgid "/_Address/_Delete"
 msgstr "/_Adresa/Z_mazať"
 
-#: src/addressbook.c:359 src/compose.c:673 src/mainwindow.c:787
+#: src/addressbook.c:359 src/compose.c:673 src/mainwindow.c:789
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Nástroje"
@@ -916,12 +916,12 @@ msgstr "/_Nástroje"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Nástroje/Importovať súbor _LDIF"
 
-#: src/addressbook.c:361 src/compose.c:694 src/mainwindow.c:841
+#: src/addressbook.c:361 src/compose.c:694 src/mainwindow.c:843
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/Nápo_veda"
 
-#: src/addressbook.c:362 src/compose.c:695 src/mainwindow.c:853
+#: src/addressbook.c:362 src/compose.c:695 src/mainwindow.c:855
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/Nápo_veda/_O programe"
@@ -963,7 +963,7 @@ msgstr "/Z_mazať"
 msgid "E-Mail address"
 msgstr "E-mailová adresa"
 
-#: src/addressbook.c:496 src/compose.c:4873 src/mainwindow.c:2408
+#: src/addressbook.c:496 src/compose.c:4873 src/mainwindow.c:2416
 #: src/prefs_common_dialog.c:2274
 msgid "Address book"
 msgstr "Otvoriť adresár"
@@ -1184,7 +1184,7 @@ msgstr "Spoločná adresa"
 msgid "Personal address"
 msgstr "Súkromná adresa"
 
-#: src/alertpanel.c:142 src/compose.c:5717 src/main.c:638
+#: src/alertpanel.c:142 src/compose.c:5720 src/main.c:638
 msgid "Notice"
 msgstr "Upozornenie"
 
@@ -1357,9 +1357,9 @@ msgid "/_View/_Reply to"
 msgstr "/_Zobraziť/_Odpoveď komu"
 
 #: src/compose.c:578 src/compose.c:580 src/compose.c:582 src/compose.c:584
-#: src/compose.c:587 src/mainwindow.c:577 src/mainwindow.c:580
-#: src/mainwindow.c:607 src/mainwindow.c:631 src/mainwindow.c:734
-#: src/mainwindow.c:738 src/messageview.c:258
+#: src/compose.c:587 src/mainwindow.c:579 src/mainwindow.c:582
+#: src/mainwindow.c:609 src/mainwindow.c:633 src/mainwindow.c:736
+#: src/mainwindow.c:740 src/messageview.c:258
 msgid "/_View/---"
 msgstr "/_Zobraziť/---"
 
@@ -1380,7 +1380,7 @@ msgstr "/_Zobraziť/Prí_lohy"
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/_Zobraziť/Pre_jsť na/Iný priečino_k..."
 
-#: src/compose.c:593 src/mainwindow.c:638 src/messageview.c:173
+#: src/compose.c:593 src/mainwindow.c:640 src/messageview.c:173
 #, fuzzy
 msgid "/_View/Character _encoding"
 msgstr "/_Zobraziť/_Triediť/Zostupne"
@@ -1392,138 +1392,138 @@ msgstr ""
 #: src/compose.c:596 src/compose.c:602 src/compose.c:608 src/compose.c:612
 #: src/compose.c:620 src/compose.c:624 src/compose.c:630 src/compose.c:636
 #: src/compose.c:640 src/compose.c:650 src/compose.c:654 src/compose.c:662
-#: src/compose.c:666 src/mainwindow.c:634 src/mainwindow.c:641
+#: src/compose.c:666 src/mainwindow.c:636 src/mainwindow.c:643
 #: src/messageview.c:169
 #, fuzzy
 msgid "/_View/Character _encoding/---"
 msgstr "/_Zobraziť/_Triediť/Zostupne"
 
-#: src/compose.c:598 src/mainwindow.c:642 src/messageview.c:177
+#: src/compose.c:598 src/mainwindow.c:644 src/messageview.c:177
 #, fuzzy
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Zobraziť/_Kódovanie/7bit ascii (US-ASC_II)"
 
-#: src/compose.c:600 src/mainwindow.c:644 src/messageview.c:180
+#: src/compose.c:600 src/mainwindow.c:646 src/messageview.c:180
 #, fuzzy
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Zobraziť/_Kódovanie/Unicode (_UTF-8)"
 
-#: src/compose.c:604 src/mainwindow.c:648 src/messageview.c:183
+#: src/compose.c:604 src/mainwindow.c:650 src/messageview.c:183
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Zobraziť/_Kódovanie/Západná Európa (ISO-8859-_1)"
 
-#: src/compose.c:606 src/mainwindow.c:650 src/messageview.c:185
+#: src/compose.c:606 src/mainwindow.c:652 src/messageview.c:185
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Zobraziť/_Kódovanie/Západná Európa (ISO-8859-15)"
 
-#: src/compose.c:610 src/mainwindow.c:656 src/messageview.c:190
+#: src/compose.c:610 src/mainwindow.c:658 src/messageview.c:190
 #, fuzzy
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Zobraziť/_Kódovanie/Stredná Európa (ISO-8859-_2)"
 
-#: src/compose.c:614 src/mainwindow.c:660 src/messageview.c:193
+#: src/compose.c:614 src/mainwindow.c:662 src/messageview.c:193
 #, fuzzy
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Zobraziť/_Kódovanie/_Pobaltie (ISO-8859-13)"
 
-#: src/compose.c:616 src/mainwindow.c:662 src/messageview.c:195
+#: src/compose.c:616 src/mainwindow.c:664 src/messageview.c:195
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Zobraziť/_Kódovanie/Pobaltie (ISO-8859-_4)"
 
-#: src/compose.c:618 src/mainwindow.c:664 src/messageview.c:197
+#: src/compose.c:618 src/mainwindow.c:666 src/messageview.c:197
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/_Zobraziť/_Kódovanie/Cyrilika (Windows-1251)"
 
-#: src/compose.c:622 src/mainwindow.c:668 src/messageview.c:200
+#: src/compose.c:622 src/mainwindow.c:670 src/messageview.c:200
 #, fuzzy
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Zobraziť/_Kódovanie/Grécko (ISO-8859-_7)"
 
-#: src/compose.c:626 src/mainwindow.c:672 src/messageview.c:203
+#: src/compose.c:626 src/mainwindow.c:674 src/messageview.c:203
 #, fuzzy
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/_Zobraziť/_Kódovanie/Pobaltie (ISO-8859-_4)"
 
-#: src/compose.c:628 src/mainwindow.c:674 src/messageview.c:205
+#: src/compose.c:628 src/mainwindow.c:676 src/messageview.c:205
 #, fuzzy
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/_Zobraziť/_Kódovanie/Cyrilika (Windows-1251)"
 
-#: src/compose.c:632 src/mainwindow.c:678 src/messageview.c:208
+#: src/compose.c:632 src/mainwindow.c:680 src/messageview.c:208
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Zobraziť/_Kódovanie/Grécko (ISO-8859-_7)"
 
-#: src/compose.c:634 src/mainwindow.c:680 src/messageview.c:210
+#: src/compose.c:634 src/mainwindow.c:682 src/messageview.c:210
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Zobraziť/_Kódovanie/Cyrilika (Windows-1251)"
 
-#: src/compose.c:638 src/mainwindow.c:684 src/messageview.c:213
+#: src/compose.c:638 src/mainwindow.c:686 src/messageview.c:213
 #, fuzzy
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Zobraziť/_Kódovanie/Turecko (ISO-8859-_9)"
 
-#: src/compose.c:642 src/mainwindow.c:688 src/messageview.c:216
+#: src/compose.c:642 src/mainwindow.c:690 src/messageview.c:216
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Zobraziť/_Kódovanie/Cyrilika (ISO-8859-_5)"
 
-#: src/compose.c:644 src/mainwindow.c:690 src/messageview.c:218
+#: src/compose.c:644 src/mainwindow.c:692 src/messageview.c:218
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Zobraziť/_Kódovanie/Cyrilika (KOI8-_R)"
 
-#: src/compose.c:646 src/mainwindow.c:692 src/messageview.c:220
+#: src/compose.c:646 src/mainwindow.c:694 src/messageview.c:220
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Zobraziť/_Kódovanie/Cyrilika (KOI8-_R)"
 
-#: src/compose.c:648 src/mainwindow.c:694 src/messageview.c:222
+#: src/compose.c:648 src/mainwindow.c:696 src/messageview.c:222
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Zobraziť/_Kódovanie/Cyrilika (Windows-1251)"
 
-#: src/compose.c:652 src/mainwindow.c:698 src/messageview.c:225
+#: src/compose.c:652 src/mainwindow.c:700 src/messageview.c:225
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Zobraziť/_Kódovanie/Japonsko (ISO-2022-_JP)"
 
-#: src/compose.c:656 src/mainwindow.c:708 src/messageview.c:234
+#: src/compose.c:656 src/mainwindow.c:710 src/messageview.c:234
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Zobraziť/_Kódovanie/Zjednodušená čínština (_GB2312)"
 
-#: src/compose.c:658 src/mainwindow.c:710 src/messageview.c:236
+#: src/compose.c:658 src/mainwindow.c:712 src/messageview.c:236
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Zobraziť/_Kódovanie/Zjednodušená čínština (_GB2312)"
 
-#: src/compose.c:660 src/mainwindow.c:712 src/messageview.c:238
+#: src/compose.c:660 src/mainwindow.c:714 src/messageview.c:238
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Zobraziť/_Kódovanie/Tradičná čínština (_Big5)"
 
-#: src/compose.c:664 src/mainwindow.c:720 src/messageview.c:245
+#: src/compose.c:664 src/mainwindow.c:722 src/messageview.c:245
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Zobraziť/_Kódovanie/Kórea (EUC-_KR)"
 
-#: src/compose.c:668 src/mainwindow.c:726 src/messageview.c:250
+#: src/compose.c:668 src/mainwindow.c:728 src/messageview.c:250
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Zobraziť/_Kódovanie/Thajsko (TIS-620)"
 
-#: src/compose.c:670 src/mainwindow.c:728 src/messageview.c:252
+#: src/compose.c:670 src/mainwindow.c:730 src/messageview.c:252
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Zobraziť/_Kódovanie/Thajsko (Windows-874)"
 
-#: src/compose.c:674 src/mainwindow.c:788 src/messageview.c:283
+#: src/compose.c:674 src/mainwindow.c:790 src/messageview.c:283
 msgid "/_Tools/_Address book"
 msgstr "/_Nástroje/_Adresár"
 
@@ -1531,13 +1531,13 @@ msgstr "/_Nástroje/_Adresár"
 msgid "/_Tools/_Template"
 msgstr "/_Nástroje/Ša_blóna"
 
-#: src/compose.c:677 src/mainwindow.c:812 src/messageview.c:299
+#: src/compose.c:677 src/mainwindow.c:814 src/messageview.c:299
 msgid "/_Tools/Actio_ns"
 msgstr "/_Nástroje/A_kcie"
 
-#: src/compose.c:679 src/compose.c:683 src/compose.c:689 src/mainwindow.c:791
-#: src/mainwindow.c:805 src/mainwindow.c:810 src/mainwindow.c:813
-#: src/mainwindow.c:817 src/mainwindow.c:819 src/messageview.c:286
+#: src/compose.c:679 src/compose.c:683 src/compose.c:689 src/mainwindow.c:793
+#: src/mainwindow.c:807 src/mainwindow.c:812 src/mainwindow.c:815
+#: src/mainwindow.c:819 src/mainwindow.c:821 src/messageview.c:286
 #: src/messageview.c:298
 msgid "/_Tools/---"
 msgstr "/_Nástroje/---"
@@ -1743,7 +1743,7 @@ msgstr "/_Nástroje/A_kcie"
 msgid "PGP Encrypt"
 msgstr "/Sp_ráva/_Zašifrovať"
 
-#: src/compose.c:4442 src/compose.c:5543
+#: src/compose.c:4442 src/compose.c:5546
 msgid "MIME type"
 msgstr "MIME typ"
 
@@ -1786,36 +1786,36 @@ msgstr "Upraviť pomocou externého editoru"
 msgid "Wrap all long lines"
 msgstr "Zalomiť všetky dlhé riadky"
 
-#: src/compose.c:5439
+#: src/compose.c:5442
 msgid "Invalid MIME type."
 msgstr "Neplatný MIME typ."
 
-#: src/compose.c:5457
+#: src/compose.c:5460
 msgid "File doesn't exist or is empty."
 msgstr "Súbor neexistuje alebo je prázdny."
 
-#: src/compose.c:5525
+#: src/compose.c:5528
 msgid "Properties"
 msgstr "Vlastnosti"
 
-#: src/compose.c:5545 src/prefs_common_dialog.c:1504
+#: src/compose.c:5548 src/prefs_common_dialog.c:1504
 msgid "Encoding"
 msgstr "Kódová stránka"
 
-#: src/compose.c:5568 src/prefs_folder_item.c:202
+#: src/compose.c:5571 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Cesta"
 
-#: src/compose.c:5569
+#: src/compose.c:5572
 msgid "File name"
 msgstr "Názov súboru"
 
-#: src/compose.c:5659
+#: src/compose.c:5662
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Neplatný príkaz pre externý editor: `%s'\n"
 
-#: src/compose.c:5714
+#: src/compose.c:5717
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1825,52 +1825,52 @@ msgstr ""
 "Ukončiť ho násilne?\n"
 "skupinový ID procesu: %d"
 
-#: src/compose.c:6040 src/mainwindow.c:2752
+#: src/compose.c:6043 src/mainwindow.c:2761
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:6156 src/compose.c:6161 src/compose.c:6167
+#: src/compose.c:6159 src/compose.c:6164 src/compose.c:6170
 msgid "Can't queue the message."
 msgstr "Správa sa nedá zaradiť do fronty."
 
-#: src/compose.c:6258
+#: src/compose.c:6261
 #, fuzzy
 msgid "Select files"
 msgstr "Vybrať súbor"
 
-#: src/compose.c:6281
+#: src/compose.c:6284
 msgid "Select file"
 msgstr "Vybrať súbor"
 
-#: src/compose.c:6316
+#: src/compose.c:6319
 #, fuzzy
 msgid "Save message"
 msgstr "Odoslať správu"
 
-#: src/compose.c:6317
+#: src/compose.c:6320
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Obsah správy sa zmenil. Chcete zahodiť zmeny?"
 
-#: src/compose.c:6319
+#: src/compose.c:6322
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:6361
+#: src/compose.c:6364
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Chcete použiť šablónu `%s' ?"
 
-#: src/compose.c:6363
+#: src/compose.c:6366
 msgid "Apply template"
 msgstr "Použiť šablónu"
 
-#: src/compose.c:6364
+#: src/compose.c:6367
 #, fuzzy
 msgid "_Replace"
 msgstr "Nahradiť"
 
-#: src/compose.c:6364
+#: src/compose.c:6367
 #, fuzzy
 msgid "_Insert"
 msgstr "Vložiť"
@@ -2334,12 +2334,12 @@ msgstr "Nastavujem informácie o priečinku...\n"
 msgid "Setting folder info..."
 msgstr "Nastavujem informácie o priečinku..."
 
-#: src/folderview.c:868 src/mainwindow.c:3748 src/setup.c:80
+#: src/folderview.c:868 src/mainwindow.c:3757 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Prehľadávam priečinok %s%c%s ..."
 
-#: src/folderview.c:872 src/mainwindow.c:3753 src/setup.c:85
+#: src/folderview.c:872 src/mainwindow.c:3762 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Prehľadávam priečinok %s ..."
@@ -3106,557 +3106,562 @@ msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/_Zobraziť/_Ukázať alebo skryť/_Panel nástrojov/Ikony _a text"
 
 #: src/mainwindow.c:566
-msgid "/_View/Show or hi_de/_Toolbar/_Icon"
+#, fuzzy
+msgid "/_View/Show or hi_de/_Toolbar/Text at the _right of icon"
 msgstr "/_Zobraziť/_Ukázať alebo skryť/_Panel nástrojov/_Ikony"
 
 #: src/mainwindow.c:568
+msgid "/_View/Show or hi_de/_Toolbar/_Icon"
+msgstr "/_Zobraziť/_Ukázať alebo skryť/_Panel nástrojov/_Ikony"
+
+#: src/mainwindow.c:570
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/_Zobraziť/_Ukázať alebo skryť/_Panel nástrojov/_Text"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:572
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/_Zobraziť/_Ukázať alebo skryť/_Panel nástrojov/Žiad_ne"
 
-#: src/mainwindow.c:572
+#: src/mainwindow.c:574
 #, fuzzy
 msgid "/_View/Show or hi_de/_Search bar"
 msgstr "/_Zobraziť/_Ukázať alebo skryť/Stavový _riadok"
 
-#: src/mainwindow.c:574
+#: src/mainwindow.c:576
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/_Zobraziť/_Ukázať alebo skryť/Stavový _riadok"
 
-#: src/mainwindow.c:576
+#: src/mainwindow.c:578
 #, fuzzy
 msgid "/_View/_Customize toolbar..."
 msgstr "/_Zobraziť/Pre_jsť na/Iný priečino_k..."
 
-#: src/mainwindow.c:578
+#: src/mainwindow.c:580
 msgid "/_View/Separate f_older tree"
 msgstr "/_Zobraziť/Samostatný str_om priečinkov"
 
-#: src/mainwindow.c:579
+#: src/mainwindow.c:581
 #, fuzzy
 msgid "/_View/Separate _message view"
 msgstr "/_Zobraziť/Samostatné zobraz_enie správy"
 
-#: src/mainwindow.c:581
+#: src/mainwindow.c:583
 msgid "/_View/_Sort"
 msgstr "/_Zobraziť/_Triediť"
 
-#: src/mainwindow.c:582
+#: src/mainwindow.c:584
 msgid "/_View/_Sort/by _number"
 msgstr "/_Zobraziť/_Triediť/podľa čí_sla"
 
-#: src/mainwindow.c:583
+#: src/mainwindow.c:585
 msgid "/_View/_Sort/by s_ize"
 msgstr "/_Zobraziť/_Triediť/podľa _veľkosti"
 
-#: src/mainwindow.c:584
+#: src/mainwindow.c:586
 msgid "/_View/_Sort/by _date"
 msgstr "/_Zobraziť/_Triediť/podľa _dátumu"
 
-#: src/mainwindow.c:585
+#: src/mainwindow.c:587
 #, fuzzy
 msgid "/_View/_Sort/by t_hread date"
 msgstr "/_Zobraziť/_Triediť/podľa _dátumu"
 
-#: src/mainwindow.c:586
+#: src/mainwindow.c:588
 msgid "/_View/_Sort/by _from"
 msgstr "/_Zobraziť/_Triediť/podľa _odosielateľa"
 
-#: src/mainwindow.c:587
+#: src/mainwindow.c:589
 msgid "/_View/_Sort/by _recipient"
 msgstr "/_Zobraziť/_Triediť/podľa _príjemcu"
 
-#: src/mainwindow.c:588
+#: src/mainwindow.c:590
 msgid "/_View/_Sort/by _subject"
 msgstr "/_Zobraziť/_Triediť/podľa p_redmetu"
 
-#: src/mainwindow.c:589
+#: src/mainwindow.c:591
 msgid "/_View/_Sort/by _color label"
 msgstr "/_Zobraziť/_Triediť/podľa _farebného označenia"
 
-#: src/mainwindow.c:591
+#: src/mainwindow.c:593
 msgid "/_View/_Sort/by _mark"
 msgstr "/_Zobraziť/_Triediť/podľa _značky"
 
-#: src/mainwindow.c:592
+#: src/mainwindow.c:594
 msgid "/_View/_Sort/by _unread"
 msgstr "/_Zobraziť/_Triediť/podľa pr_ečítania"
 
-#: src/mainwindow.c:593
+#: src/mainwindow.c:595
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/_Zobraziť/_Triediť/podľa prí_loh"
 
-#: src/mainwindow.c:595
+#: src/mainwindow.c:597
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/_Zobraziť/_Triediť/_Netriediť"
 
-#: src/mainwindow.c:596 src/mainwindow.c:599
+#: src/mainwindow.c:598 src/mainwindow.c:601
 msgid "/_View/_Sort/---"
 msgstr "/_Zobraziť/_Triediť/---"
 
-#: src/mainwindow.c:597
+#: src/mainwindow.c:599
 msgid "/_View/_Sort/Ascending"
 msgstr "/_Zobraziť/_Triediť/Vzostupne"
 
-#: src/mainwindow.c:598
+#: src/mainwindow.c:600
 msgid "/_View/_Sort/Descending"
 msgstr "/_Zobraziť/_Triediť/Zostupne"
 
-#: src/mainwindow.c:600
+#: src/mainwindow.c:602
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/_Zobraziť/_Triediť/Zos_kupiť podľa predmetu"
 
-#: src/mainwindow.c:602
+#: src/mainwindow.c:604
 msgid "/_View/Th_read view"
 msgstr "/_Zobraziť/Zobraziť _vlákna"
 
-#: src/mainwindow.c:603
+#: src/mainwindow.c:605
 msgid "/_View/E_xpand all threads"
 msgstr "/_Zobraziť/_Rozbaliť všetky vlákna"
 
-#: src/mainwindow.c:604
+#: src/mainwindow.c:606
 msgid "/_View/Co_llapse all threads"
 msgstr "/_Zobraziť/Zba_liť všetky vlákna"
 
-#: src/mainwindow.c:605
+#: src/mainwindow.c:607
 msgid "/_View/Set display _item..."
 msgstr "/_Zobraziť/Nastav_iť zobrazované položky"
 
-#: src/mainwindow.c:608
+#: src/mainwindow.c:610
 msgid "/_View/_Go to"
 msgstr "/_Zobraziť/Pre_jsť na"
 
-#: src/mainwindow.c:609
+#: src/mainwindow.c:611
 msgid "/_View/_Go to/_Prev message"
 msgstr "/_Zobraziť/Pre_jsť na/_Predošlú správu"
 
-#: src/mainwindow.c:610
+#: src/mainwindow.c:612
 msgid "/_View/_Go to/_Next message"
 msgstr "/_Zobraziť/Pre_jsť na/Ď_alšiu správu"
 
-#: src/mainwindow.c:611 src/mainwindow.c:616 src/mainwindow.c:619
-#: src/mainwindow.c:624 src/mainwindow.c:629
+#: src/mainwindow.c:613 src/mainwindow.c:618 src/mainwindow.c:621
+#: src/mainwindow.c:626 src/mainwindow.c:631
 msgid "/_View/_Go to/---"
 msgstr "/_Zobraziť/Pre_jsť na/---"
 
-#: src/mainwindow.c:612
+#: src/mainwindow.c:614
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/_Zobraziť/Pre_jsť na/P_redošlú neprečítanú správu"
 
-#: src/mainwindow.c:614
+#: src/mainwindow.c:616
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/_Zobraziť/Pre_jsť na/Ďalšiu n_eprečítanú správu"
 
-#: src/mainwindow.c:617
+#: src/mainwindow.c:619
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/_Zobraziť/Pre_jsť na/Predošlú no_vú správu"
 
-#: src/mainwindow.c:618
+#: src/mainwindow.c:620
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/_Zobraziť/Pre_jsť na/Ďalši_u novú správu"
 
-#: src/mainwindow.c:620
+#: src/mainwindow.c:622
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/_Zobraziť/Pre_jsť na/Predošlú _označenú správu"
 
-#: src/mainwindow.c:622
+#: src/mainwindow.c:624
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/_Zobraziť/Pre_jsť na/Ďalšiu o_značenú správu"
 
-#: src/mainwindow.c:625
+#: src/mainwindow.c:627
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/_Zobraziť/Pre_jsť na/Predošlú správu s návestí_m"
 
-#: src/mainwindow.c:627
+#: src/mainwindow.c:629
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/_Zobraziť/Pre_jsť na/Ďa_lšiu správu s návestím"
 
-#: src/mainwindow.c:630
+#: src/mainwindow.c:632
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Zobraziť/Pre_jsť na/Iný priečino_k..."
 
-#: src/mainwindow.c:639 src/messageview.c:174
+#: src/mainwindow.c:641 src/messageview.c:174
 #, fuzzy
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Zobraziť/_Kódovanie/_Automatické"
 
-#: src/mainwindow.c:652 src/messageview.c:187
+#: src/mainwindow.c:654 src/messageview.c:187
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr "/_Zobraziť/_Kódovanie/Západná Európa (ISO-8859-15)"
 
-#: src/mainwindow.c:700 src/messageview.c:227
+#: src/mainwindow.c:702 src/messageview.c:227
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Zobraziť/_Kódovanie/Japonsko (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:702 src/messageview.c:229
+#: src/mainwindow.c:704 src/messageview.c:229
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Zobraziť/_Kódovanie/Japonsko (_EUC-JP)"
 
-#: src/mainwindow.c:704 src/messageview.c:231
+#: src/mainwindow.c:706 src/messageview.c:231
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Zobraziť/_Kódovanie/Japonsko (_Shift__JIS)"
 
-#: src/mainwindow.c:714 src/messageview.c:240
+#: src/mainwindow.c:716 src/messageview.c:240
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Zobraziť/_Kódovanie/Tradičná čínština (EUC-_TW)"
 
-#: src/mainwindow.c:716 src/messageview.c:242
+#: src/mainwindow.c:718 src/messageview.c:242
 #, fuzzy
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Zobraziť/_Kódovanie/Čínština (ISO-2022-_CN)"
 
-#: src/mainwindow.c:722 src/messageview.c:247
+#: src/mainwindow.c:724 src/messageview.c:247
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Zobraziť/_Kódovanie/Kórea (ISO-2022-KR)"
 
-#: src/mainwindow.c:735 src/summaryview.c:464
+#: src/mainwindow.c:737 src/summaryview.c:464
 msgid "/_View/Open in new _window"
 msgstr "/_Zobraziť/Otvoriť v _novom okne"
 
-#: src/mainwindow.c:736 src/messageview.c:259 src/summaryview.c:466
+#: src/mainwindow.c:738 src/messageview.c:259 src/summaryview.c:466
 msgid "/_View/Mess_age source"
 msgstr "/_Zobraziť/Zdrojový kód správ_y"
 
-#: src/mainwindow.c:737 src/messageview.c:260 src/summaryview.c:467
+#: src/mainwindow.c:739 src/messageview.c:260 src/summaryview.c:467
 #, fuzzy
 msgid "/_View/All _headers"
 msgstr "/_Zobraziť/Všetky _hlavičky"
 
-#: src/mainwindow.c:739
+#: src/mainwindow.c:741
 msgid "/_View/_Update summary"
 msgstr "/_Zobraziť/_Aktualizovať zoznam"
 
-#: src/mainwindow.c:741 src/messageview.c:263
+#: src/mainwindow.c:743 src/messageview.c:263
 msgid "/_Message"
 msgstr "/Sp_ráva"
 
-#: src/mainwindow.c:742
+#: src/mainwindow.c:744
 msgid "/_Message/Recei_ve"
 msgstr "/Sp_ráva/_Prijať"
 
-#: src/mainwindow.c:743
+#: src/mainwindow.c:745
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/Sp_ráva/_Prijať/Z _aktuálneho konta"
 
-#: src/mainwindow.c:745
+#: src/mainwindow.c:747
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/Sp_ráva/_Prijať/Zo _všetkých kônt"
 
-#: src/mainwindow.c:747
+#: src/mainwindow.c:749
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/Sp_ráva/_Prijať/_Ukončiť prijímanie"
 
-#: src/mainwindow.c:749
+#: src/mainwindow.c:751
 msgid "/_Message/Recei_ve/---"
 msgstr "/Sp_ráva/_Prijať/---"
 
-#: src/mainwindow.c:750
+#: src/mainwindow.c:752
 msgid "/_Message/_Send queued messages"
 msgstr "/Sp_ráva/_Odoslať správy vo fronte"
 
-#: src/mainwindow.c:751 src/mainwindow.c:753 src/mainwindow.c:760
-#: src/mainwindow.c:765 src/mainwindow.c:768 src/mainwindow.c:779
-#: src/mainwindow.c:781 src/mainwindow.c:784 src/messageview.c:266
+#: src/mainwindow.c:753 src/mainwindow.c:755 src/mainwindow.c:762
+#: src/mainwindow.c:767 src/mainwindow.c:770 src/mainwindow.c:781
+#: src/mainwindow.c:783 src/mainwindow.c:786 src/messageview.c:266
 #: src/messageview.c:274 src/messageview.c:279
 msgid "/_Message/---"
 msgstr "/Sp_ráva/---"
 
-#: src/mainwindow.c:752 src/messageview.c:264
+#: src/mainwindow.c:754 src/messageview.c:264
 msgid "/_Message/Compose _new message"
 msgstr "/Sp_ráva/_Napísať novú správu"
 
-#: src/mainwindow.c:754 src/messageview.c:267
+#: src/mainwindow.c:756 src/messageview.c:267
 msgid "/_Message/_Reply"
 msgstr "/Sp_ráva/O_dpovedať"
 
-#: src/mainwindow.c:755
+#: src/mainwindow.c:757
 msgid "/_Message/Repl_y to"
 msgstr "/Sp_ráva/Odpo_vedať komu"
 
-#: src/mainwindow.c:756 src/messageview.c:268
+#: src/mainwindow.c:758 src/messageview.c:268
 msgid "/_Message/Repl_y to/_all"
 msgstr "/Sp_ráva/Odpoved_ať komu/_všetkým"
 
-#: src/mainwindow.c:757 src/messageview.c:270
+#: src/mainwindow.c:759 src/messageview.c:270
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/Sp_ráva/Od_povedať komu/_odosielateľovi"
 
-#: src/mainwindow.c:758 src/messageview.c:272
+#: src/mainwindow.c:760 src/messageview.c:272
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/Sp_ráva/Od_povedať komu/do _diskusnej skupiny"
 
-#: src/mainwindow.c:761 src/messageview.c:275
+#: src/mainwindow.c:763 src/messageview.c:275
 msgid "/_Message/_Forward"
 msgstr "/Sp_ráva/_Poslať ďalej"
 
-#: src/mainwindow.c:762 src/messageview.c:276
+#: src/mainwindow.c:764 src/messageview.c:276
 msgid "/_Message/For_ward as attachment"
 msgstr "/Sp_ráva/Poslať ako p_rílohu"
 
-#: src/mainwindow.c:764 src/messageview.c:278
+#: src/mainwindow.c:766 src/messageview.c:278
 msgid "/_Message/Redirec_t"
 msgstr "/Sp_ráva/Pre_smerovať"
 
-#: src/mainwindow.c:766
+#: src/mainwindow.c:768
 msgid "/_Message/M_ove..."
 msgstr "/Sp_ráva/Pres_unúť"
 
-#: src/mainwindow.c:767
+#: src/mainwindow.c:769
 msgid "/_Message/_Copy..."
 msgstr "/Sp_ráva/_Kopírovať"
 
-#: src/mainwindow.c:769
+#: src/mainwindow.c:771
 msgid "/_Message/_Mark"
 msgstr "/Sp_ráva/O_značiť"
 
-#: src/mainwindow.c:770
+#: src/mainwindow.c:772
 msgid "/_Message/_Mark/_Mark"
 msgstr "/Sp_ráva/O_značiť/O_značiť"
 
-#: src/mainwindow.c:771
+#: src/mainwindow.c:773
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/Sp_ráva/O_značiť/O_dznačiť"
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:774
 msgid "/_Message/_Mark/---"
 msgstr "/Sp_ráva/O_značiť/---"
 
-#: src/mainwindow.c:773
+#: src/mainwindow.c:775
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/Sp_ráva/O_značiť/Označiť ako _neprečítané"
 
-#: src/mainwindow.c:774
+#: src/mainwindow.c:776
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/Sp_ráva/O_značiť/Označiť ako _prečítané"
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:778
 #, fuzzy
 msgid "/_Message/_Mark/Mark _thread as read"
 msgstr "/Sp_ráva/O_značiť/Označiť ako _prečítané"
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:780
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/Sp_ráva/O_značiť/Označiť _všetky ako prečítané"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:782
 msgid "/_Message/_Delete"
 msgstr "/Sp_ráva/Z_mazať"
 
-#: src/mainwindow.c:782
+#: src/mainwindow.c:784
 #, fuzzy
 msgid "/_Message/Set as _junk mail"
 msgstr "/Sp_ráva/_Odoslať"
 
-#: src/mainwindow.c:783
+#: src/mainwindow.c:785
 msgid "/_Message/Set as not j_unk mail"
 msgstr ""
 
-#: src/mainwindow.c:785 src/messageview.c:280
+#: src/mainwindow.c:787 src/messageview.c:280
 msgid "/_Message/Re-_edit"
 msgstr "/Sp_ráva/Znovu _editovať"
 
-#: src/mainwindow.c:789
+#: src/mainwindow.c:791
 #, fuzzy
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/_Nástroje/Pridať _odosielateľa do adresára"
 
-#: src/mainwindow.c:792
+#: src/mainwindow.c:794
 #, fuzzy
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/_Nástroje/_Filtrovať správy"
 
-#: src/mainwindow.c:794
+#: src/mainwindow.c:796
 #, fuzzy
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Nástroje/_Filtrovať správy"
 
-#: src/mainwindow.c:796 src/messageview.c:287
+#: src/mainwindow.c:798 src/messageview.c:287
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Nástroje/Vytvoriť pravidlo fi_ltra"
 
-#: src/mainwindow.c:797 src/messageview.c:289
+#: src/mainwindow.c:799 src/messageview.c:289
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Nástroje/Vytvoriť pravidlo fi_ltra/_Automaticky"
 
-#: src/mainwindow.c:799 src/messageview.c:291
+#: src/mainwindow.c:801 src/messageview.c:291
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Nástroje/Vytvoriť pravidlo fi_ltra/podľa _odosielateľa"
 
-#: src/mainwindow.c:801 src/messageview.c:293
+#: src/mainwindow.c:803 src/messageview.c:293
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Nástroje/Vytvoriť pravidlo fi_ltra/podľa _príjemcu"
 
-#: src/mainwindow.c:803 src/messageview.c:295
+#: src/mainwindow.c:805 src/messageview.c:295
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Nástroje/Vytvoriť pravidlo fi_ltra/podľa p_redmetu"
 
-#: src/mainwindow.c:806
+#: src/mainwindow.c:808
 #, fuzzy
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/_Nástroje/_Filtrovať správy"
 
-#: src/mainwindow.c:808
+#: src/mainwindow.c:810
 #, fuzzy
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/_Nástroje/_Filtrovať správy"
 
-#: src/mainwindow.c:815
+#: src/mainwindow.c:817
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/_Nástroje/Zmazať du_plikátne správy"
 
-#: src/mainwindow.c:818
+#: src/mainwindow.c:820
 #, fuzzy
 msgid "/_Tools/E_xecute marked process"
 msgstr "Vykonať označený proces"
 
-#: src/mainwindow.c:820
+#: src/mainwindow.c:822
 msgid "/_Tools/_Log window"
 msgstr "/_Nástroje/Okno _záznamu"
 
-#: src/mainwindow.c:822
+#: src/mainwindow.c:824
 msgid "/_Configuration"
 msgstr "/Nastav_enia"
 
-#: src/mainwindow.c:823
+#: src/mainwindow.c:825
 msgid "/_Configuration/_Common preferences..."
 msgstr "/Nastav_enia/_Všeobecné nastavenia..."
 
-#: src/mainwindow.c:825
+#: src/mainwindow.c:827
 msgid "/_Configuration/_Filter setting..."
 msgstr "/Nastav_enia/Nastavenie _filtru..."
 
-#: src/mainwindow.c:827
+#: src/mainwindow.c:829
 msgid "/_Configuration/_Template..."
 msgstr "/Nastav_enia/Š_ablóna..."
 
-#: src/mainwindow.c:829
+#: src/mainwindow.c:831
 msgid "/_Configuration/_Actions..."
 msgstr "/Nastav_enia/_Akcie..."
 
-#: src/mainwindow.c:831
+#: src/mainwindow.c:833
 msgid "/_Configuration/---"
 msgstr "/Nastav_enia/---"
 
-#: src/mainwindow.c:832
+#: src/mainwindow.c:834
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/Nastav_enia/Nastavenia aktívneho _konta..."
 
-#: src/mainwindow.c:834
+#: src/mainwindow.c:836
 msgid "/_Configuration/Create _new account..."
 msgstr "/Nastav_enia/Vytvoriť _nové konto..."
 
-#: src/mainwindow.c:836
+#: src/mainwindow.c:838
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/Nastav_enia/_Upraviť kontá..."
 
-#: src/mainwindow.c:838
+#: src/mainwindow.c:840
 msgid "/_Configuration/C_hange current account"
 msgstr "/Nastav_enia/_Zmeniť aktívne konto"
 
-#: src/mainwindow.c:842
+#: src/mainwindow.c:844
 msgid "/_Help/_Manual"
 msgstr "/Nápo_veda/_Manuál"
 
-#: src/mainwindow.c:843
+#: src/mainwindow.c:845
 msgid "/_Help/_Manual/_English"
 msgstr "/Nápo_veda/_Manuál/_Anglicky"
 
-#: src/mainwindow.c:844
+#: src/mainwindow.c:846
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/Nápo_veda/_Manuál/_Japonsky"
 
-#: src/mainwindow.c:845
+#: src/mainwindow.c:847
 msgid "/_Help/_FAQ"
 msgstr "/Nápo_veda/_FAQ"
 
-#: src/mainwindow.c:846
+#: src/mainwindow.c:848
 msgid "/_Help/_FAQ/_English"
 msgstr "/Nápo_veda/_FAQ/_Anglicky"
 
-#: src/mainwindow.c:847
+#: src/mainwindow.c:849
 msgid "/_Help/_FAQ/_German"
 msgstr "/Nápo_veda/_FAQ/_Japonsky"
 
-#: src/mainwindow.c:848
+#: src/mainwindow.c:850
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/Nápo_veda/_FAQ/Š_panielsky"
 
-#: src/mainwindow.c:849
+#: src/mainwindow.c:851
 msgid "/_Help/_FAQ/_French"
 msgstr "/Nápo_veda/_FAQ/_Francúzky"
 
-#: src/mainwindow.c:850
+#: src/mainwindow.c:852
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/Nápo_veda/_FAQ/_Taliansky"
 
-#: src/mainwindow.c:851
+#: src/mainwindow.c:853
 #, fuzzy
 msgid "/_Help/_Command line options"
 msgstr "Nebol zadaný príkazový riadok."
 
-#: src/mainwindow.c:852
+#: src/mainwindow.c:854
 msgid "/_Help/---"
 msgstr "/Nápo_veda/---"
 
-#: src/mainwindow.c:895
+#: src/mainwindow.c:897
 msgid "Creating main window...\n"
 msgstr "Vytváram hlavné okno...\n"
 
-#: src/mainwindow.c:1071
+#: src/mainwindow.c:1073
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Hlavné Okno: alokácia farieb %d bola neúspešná\n"
 
-#: src/mainwindow.c:1175 src/summaryview.c:2387 src/summaryview.c:2472
+#: src/mainwindow.c:1181 src/summaryview.c:2387 src/summaryview.c:2472
 #: src/summaryview.c:4009 src/summaryview.c:4138 src/summaryview.c:4507
 msgid "done.\n"
 msgstr "hotovo.\n"
 
-#: src/mainwindow.c:1293 src/mainwindow.c:1334 src/mainwindow.c:1359
+#: src/mainwindow.c:1299 src/mainwindow.c:1340 src/mainwindow.c:1365
 msgid "Untitled"
 msgstr "Bez názvu"
 
-#: src/mainwindow.c:1360
+#: src/mainwindow.c:1366
 msgid "none"
 msgstr "žiadny"
 
-#: src/mainwindow.c:1413
+#: src/mainwindow.c:1419
 #, 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:1663
+#: src/mainwindow.c:1669
 msgid "Offline"
 msgstr "Odpojené"
 
-#: src/mainwindow.c:1664
+#: src/mainwindow.c:1670
 msgid "You are offline. Go online?"
 msgstr "Ste odpojený. Pripojiť sa?"
 
-#: src/mainwindow.c:1681
+#: src/mainwindow.c:1687
 #, fuzzy
 msgid "Empty all trash"
 msgstr "Vyprázdniť kôš"
 
-#: src/mainwindow.c:1682
+#: src/mainwindow.c:1688
 #, fuzzy
 msgid "Delete all messages in trash folders?"
 msgstr "Zmazať všetky správy v koši?"
 
-#: src/mainwindow.c:1712
+#: src/mainwindow.c:1718
 msgid "Add mailbox"
 msgstr "Pridať mailbox"
 
-#: src/mainwindow.c:1713
+#: src/mainwindow.c:1719
 #, fuzzy
 msgid ""
 "Specify the location of mailbox.\n"
@@ -3667,16 +3672,16 @@ msgstr ""
 "Ak zadáte existujúci mailbox, bude\n"
 "automaticky prehľadaný."
 
-#: src/mainwindow.c:1719 src/setup.c:49
+#: src/mainwindow.c:1725 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Mailbox '%s' už existuje."
 
-#: src/mainwindow.c:1724 src/setup.c:56
+#: src/mainwindow.c:1730 src/setup.c:56
 msgid "Mailbox"
 msgstr "Mailbox"
 
-#: src/mainwindow.c:1730 src/setup.c:62
+#: src/mainwindow.c:1736 src/setup.c:62
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3686,135 +3691,135 @@ msgstr ""
 "Pravdepodobne už niektoré súbory existujú, alebo tam nemáte práva na "
 "zapisovanie."
 
-#: src/mainwindow.c:2198
+#: src/mainwindow.c:2206
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Zobrazenie priečinku"
 
-#: src/mainwindow.c:2217
+#: src/mainwindow.c:2225
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Zobrazenie správy"
 
-#: src/mainwindow.c:2369 src/summaryview.c:418
+#: src/mainwindow.c:2377 src/summaryview.c:418
 msgid "/_Reply"
 msgstr "/_Odpovedať"
 
-#: src/mainwindow.c:2370
+#: src/mainwindow.c:2378
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "Odpovedať odosielateľovi i všetkým príjemcom"
 
-#: src/mainwindow.c:2371
+#: src/mainwindow.c:2379
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/O_dpovedať komu/_odosielateľovi"
 
-#: src/mainwindow.c:2372
+#: src/mainwindow.c:2380
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/O_dpovedať komu/do _diskusnej skupiny"
 
-#: src/mainwindow.c:2377 src/summaryview.c:425
+#: src/mainwindow.c:2385 src/summaryview.c:425
 msgid "/_Forward"
 msgstr "/_Poslať ďalej"
 
-#: src/mainwindow.c:2378 src/summaryview.c:426
+#: src/mainwindow.c:2386 src/summaryview.c:426
 msgid "/For_ward as attachment"
 msgstr "/Poslať ďalej ako p_rílohu"
 
-#: src/mainwindow.c:2379 src/summaryview.c:427
+#: src/mainwindow.c:2387 src/summaryview.c:427
 msgid "/Redirec_t"
 msgstr "/Pr_esmerovať"
 
-#: src/mainwindow.c:2384
+#: src/mainwindow.c:2392
 msgid "Incorporate new mail"
 msgstr "Prijať novú poštu"
 
-#: src/mainwindow.c:2386
+#: src/mainwindow.c:2394
 msgid "Incorporate new mail of all accounts"
 msgstr "Prijať novú poštu pre všetky kontá"
 
-#: src/mainwindow.c:2388
+#: src/mainwindow.c:2396
 msgid "Send queued message(s)"
 msgstr "Odoslať správy vo fronte"
 
-#: src/mainwindow.c:2390
+#: src/mainwindow.c:2398
 msgid "Compose new message"
 msgstr "Napísať novú správu"
 
-#: src/mainwindow.c:2392
+#: src/mainwindow.c:2400
 msgid "Reply to the message"
 msgstr "Odpovedať na správu"
 
-#: src/mainwindow.c:2394
+#: src/mainwindow.c:2402
 msgid "Reply to all"
 msgstr "Odpovedať odosielateľovi i všetkým príjemcom"
 
-#: src/mainwindow.c:2396
+#: src/mainwindow.c:2404
 msgid "Forward the message"
 msgstr "Poslať správu ďalej"
 
-#: src/mainwindow.c:2398
+#: src/mainwindow.c:2406
 msgid "Delete the message"
 msgstr "Zmazať správu"
 
-#: src/mainwindow.c:2400
+#: src/mainwindow.c:2408
 #, fuzzy
 msgid "Set as junk mail"
 msgstr "Nastaviť ako východzie"
 
-#: src/mainwindow.c:2402
+#: src/mainwindow.c:2410
 msgid "Execute marked process"
 msgstr "Vykonať označený proces"
 
-#: src/mainwindow.c:2404
+#: src/mainwindow.c:2412
 msgid "Next unread message"
 msgstr "Ďalšia neprečítaná správa"
 
-#: src/mainwindow.c:2406
+#: src/mainwindow.c:2414
 #, fuzzy
 msgid "Previous unread message"
 msgstr "Ďalšia neprečítaná správa"
 
-#: src/mainwindow.c:2410
+#: src/mainwindow.c:2418
 #, fuzzy
 msgid "Print message"
 msgstr "Odoslať správu"
 
-#: src/mainwindow.c:2412
+#: src/mainwindow.c:2420
 msgid "Common preferences"
 msgstr "Všeobecné nastavenia"
 
-#: src/mainwindow.c:2414 src/prefs_account_dialog.c:511
+#: src/mainwindow.c:2422 src/prefs_account_dialog.c:511
 msgid "Account preferences"
 msgstr "Nastavenie konta"
 
-#: src/mainwindow.c:2779
+#: src/mainwindow.c:2788
 msgid "You are offline. Click the icon to go online."
 msgstr "Ste odpojený. Kliknite na ikonu, ak sa chcete pripojiť."
 
-#: src/mainwindow.c:2790
+#: src/mainwindow.c:2799
 msgid "You are online. Click the icon to go offline."
 msgstr "Ste pripojený. Kliknite na ikonu, ak sa chcete odpojiť."
 
-#: src/mainwindow.c:3062
+#: src/mainwindow.c:3071
 msgid "Exit"
 msgstr "Ukončiť"
 
-#: src/mainwindow.c:3062
+#: src/mainwindow.c:3071
 msgid "Exit this program?"
 msgstr "Ukončiť program"
 
-#: src/mainwindow.c:3666
+#: src/mainwindow.c:3675
 #, fuzzy
 msgid "Command line options"
 msgstr "Nebol zadaný príkazový riadok."
 
-#: src/mainwindow.c:3679
+#: src/mainwindow.c:3688
 #, fuzzy
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Použitie: %s [VOĽBY]...\n"
 
-#: src/mainwindow.c:3687
+#: src/mainwindow.c:3696
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -3830,7 +3835,7 @@ msgid ""
 "--version"
 msgstr ""
 
-#: src/mainwindow.c:3703
+#: src/mainwindow.c:3712
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
diff --git a/po/sl.po b/po/sl.po
index 6a70e63e..198850d5 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-01-31 16:49+0900\n"
+"POT-Creation-Date: 2007-01-31 17:29+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"
@@ -913,7 +913,7 @@ msgstr "/_Naslov/_Urejanje"
 msgid "/_Address/_Delete"
 msgstr "/_Naslov/_Brisanje"
 
-#: src/addressbook.c:359 src/compose.c:673 src/mainwindow.c:787
+#: src/addressbook.c:359 src/compose.c:673 src/mainwindow.c:789
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Orodja"
@@ -922,12 +922,12 @@ msgstr "/_Orodja"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Orodja/Uvoz datoteke _LDIF"
 
-#: src/addressbook.c:361 src/compose.c:694 src/mainwindow.c:841
+#: src/addressbook.c:361 src/compose.c:694 src/mainwindow.c:843
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Pomoč"
 
-#: src/addressbook.c:362 src/compose.c:695 src/mainwindow.c:853
+#: src/addressbook.c:362 src/compose.c:695 src/mainwindow.c:855
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Pomoč/_O programu"
@@ -969,7 +969,7 @@ msgstr "/_Brisanje"
 msgid "E-Mail address"
 msgstr "Elektronski naslov"
 
-#: src/addressbook.c:496 src/compose.c:4873 src/mainwindow.c:2408
+#: src/addressbook.c:496 src/compose.c:4873 src/mainwindow.c:2416
 #: src/prefs_common_dialog.c:2274
 msgid "Address book"
 msgstr "Imenik naslovov"
@@ -1189,7 +1189,7 @@ msgstr "Skupni naslov"
 msgid "Personal address"
 msgstr "Osebni naslov"
 
-#: src/alertpanel.c:142 src/compose.c:5717 src/main.c:638
+#: src/alertpanel.c:142 src/compose.c:5720 src/main.c:638
 msgid "Notice"
 msgstr "Opomba"
 
@@ -1363,9 +1363,9 @@ msgid "/_View/_Reply to"
 msgstr "/_Ogled/_Odgovor za"
 
 #: src/compose.c:578 src/compose.c:580 src/compose.c:582 src/compose.c:584
-#: src/compose.c:587 src/mainwindow.c:577 src/mainwindow.c:580
-#: src/mainwindow.c:607 src/mainwindow.c:631 src/mainwindow.c:734
-#: src/mainwindow.c:738 src/messageview.c:258
+#: src/compose.c:587 src/mainwindow.c:579 src/mainwindow.c:582
+#: src/mainwindow.c:609 src/mainwindow.c:633 src/mainwindow.c:736
+#: src/mainwindow.c:740 src/messageview.c:258
 msgid "/_View/---"
 msgstr "/_Pogled/---"
 
@@ -1386,7 +1386,7 @@ msgstr "/_Pogled/_Priloga"
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/_Pogled/_Pojdi na/_Druga mapa"
 
-#: src/compose.c:593 src/mainwindow.c:638 src/messageview.c:173
+#: src/compose.c:593 src/mainwindow.c:640 src/messageview.c:173
 #, fuzzy
 msgid "/_View/Character _encoding"
 msgstr "/_Pogled/_Razvrščanje/Pa_dajoče"
@@ -1398,138 +1398,138 @@ msgstr ""
 #: src/compose.c:596 src/compose.c:602 src/compose.c:608 src/compose.c:612
 #: src/compose.c:620 src/compose.c:624 src/compose.c:630 src/compose.c:636
 #: src/compose.c:640 src/compose.c:650 src/compose.c:654 src/compose.c:662
-#: src/compose.c:666 src/mainwindow.c:634 src/mainwindow.c:641
+#: src/compose.c:666 src/mainwindow.c:636 src/mainwindow.c:643
 #: src/messageview.c:169
 #, fuzzy
 msgid "/_View/Character _encoding/---"
 msgstr "/_Pogled/_Razvrščanje/Pa_dajoče"
 
-#: src/compose.c:598 src/mainwindow.c:642 src/messageview.c:177
+#: src/compose.c:598 src/mainwindow.c:644 src/messageview.c:177
 #, fuzzy
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Pogled/Nabor zna_kov/7 bitni ASCII (US-ASC_II)"
 
-#: src/compose.c:600 src/mainwindow.c:644 src/messageview.c:180
+#: src/compose.c:600 src/mainwindow.c:646 src/messageview.c:180
 #, fuzzy
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/Videz/Nabor zna_kov/Unicode (_UTF-8)"
 
-#: src/compose.c:604 src/mainwindow.c:648 src/messageview.c:183
+#: src/compose.c:604 src/mainwindow.c:650 src/messageview.c:183
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "_Pogled/Nabor zna_kov/Zahodnoevropski (ISO-8859-_1)"
 
-#: src/compose.c:606 src/mainwindow.c:650 src/messageview.c:185
+#: src/compose.c:606 src/mainwindow.c:652 src/messageview.c:185
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "_Pogled/Nabor zna_kov/Zahodnoevropski (ISO-8859-15)"
 
-#: src/compose.c:610 src/mainwindow.c:656 src/messageview.c:190
+#: src/compose.c:610 src/mainwindow.c:658 src/messageview.c:190
 #, fuzzy
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Pogled/Nabor zna_kov/Srednjeevropski (ISO-8859-_2)"
 
-#: src/compose.c:614 src/mainwindow.c:660 src/messageview.c:193
+#: src/compose.c:614 src/mainwindow.c:662 src/messageview.c:193
 #, fuzzy
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Pogled/Nabor zna_kov/_Baltski (ISO-8859-13)"
 
-#: src/compose.c:616 src/mainwindow.c:662 src/messageview.c:195
+#: src/compose.c:616 src/mainwindow.c:664 src/messageview.c:195
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Pogled/Nabor zna_kov/Baltski (ISO-8859-_4)"
 
-#: src/compose.c:618 src/mainwindow.c:664 src/messageview.c:197
+#: src/compose.c:618 src/mainwindow.c:666 src/messageview.c:197
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/_Pogled/Nabor zna_kov/Cirilica (Windows-1251)"
 
-#: src/compose.c:622 src/mainwindow.c:668 src/messageview.c:200
+#: src/compose.c:622 src/mainwindow.c:670 src/messageview.c:200
 #, fuzzy
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Pogled/Nabor zna_kov/Grški (ISO-8859-_7)"
 
-#: src/compose.c:626 src/mainwindow.c:672 src/messageview.c:203
+#: src/compose.c:626 src/mainwindow.c:674 src/messageview.c:203
 #, fuzzy
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/_Pogled/Nabor zna_kov/Baltski (ISO-8859-_4)"
 
-#: src/compose.c:628 src/mainwindow.c:674 src/messageview.c:205
+#: src/compose.c:628 src/mainwindow.c:676 src/messageview.c:205
 #, fuzzy
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/_Pogled/Nabor zna_kov/Cirilica (Windows-1251)"
 
-#: src/compose.c:632 src/mainwindow.c:678 src/messageview.c:208
+#: src/compose.c:632 src/mainwindow.c:680 src/messageview.c:208
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Pogled/Nabor zna_kov/Grški (ISO-8859-_7)"
 
-#: src/compose.c:634 src/mainwindow.c:680 src/messageview.c:210
+#: src/compose.c:634 src/mainwindow.c:682 src/messageview.c:210
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Pogled/Nabor zna_kov/Cirilica (Windows-1251)"
 
-#: src/compose.c:638 src/mainwindow.c:684 src/messageview.c:213
+#: src/compose.c:638 src/mainwindow.c:686 src/messageview.c:213
 #, fuzzy
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Pogled/Nabor zna_kov/Turški (ISO-8859-_9)"
 
-#: src/compose.c:642 src/mainwindow.c:688 src/messageview.c:216
+#: src/compose.c:642 src/mainwindow.c:690 src/messageview.c:216
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Pogled/Nabor zna_kov/Cirilica (ISO-8859-_5)"
 
-#: src/compose.c:644 src/mainwindow.c:690 src/messageview.c:218
+#: src/compose.c:644 src/mainwindow.c:692 src/messageview.c:218
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Pogled/Nabor zna_kov/Cirilica (KOI8-_R)"
 
-#: src/compose.c:646 src/mainwindow.c:692 src/messageview.c:220
+#: src/compose.c:646 src/mainwindow.c:694 src/messageview.c:220
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Pogled/Nabor zna_kov/Cirilica (KOI8-_R)"
 
-#: src/compose.c:648 src/mainwindow.c:694 src/messageview.c:222
+#: src/compose.c:648 src/mainwindow.c:696 src/messageview.c:222
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Pogled/Nabor zna_kov/Cirilica (Windows-1251)"
 
-#: src/compose.c:652 src/mainwindow.c:698 src/messageview.c:225
+#: src/compose.c:652 src/mainwindow.c:700 src/messageview.c:225
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Pogled/Nabor zna_kov/Japonski (ISO-2022-_JP)"
 
-#: src/compose.c:656 src/mainwindow.c:708 src/messageview.c:234
+#: src/compose.c:656 src/mainwindow.c:710 src/messageview.c:234
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Pogled/Nabor zna_kov/Poenostavljena kitajščina (_GB2312)"
 
-#: src/compose.c:658 src/mainwindow.c:710 src/messageview.c:236
+#: src/compose.c:658 src/mainwindow.c:712 src/messageview.c:236
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Pogled/Nabor zna_kov/Poenostavljena kitajščina (_GB2312)"
 
-#: src/compose.c:660 src/mainwindow.c:712 src/messageview.c:238
+#: src/compose.c:660 src/mainwindow.c:714 src/messageview.c:238
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Pogled/Nabor zna_kov/Tradicionalna kitajščina (_Big5)"
 
-#: src/compose.c:664 src/mainwindow.c:720 src/messageview.c:245
+#: src/compose.c:664 src/mainwindow.c:722 src/messageview.c:245
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Pogled/Nabor zna_kov/Korejski (EUC-_KR)"
 
-#: src/compose.c:668 src/mainwindow.c:726 src/messageview.c:250
+#: src/compose.c:668 src/mainwindow.c:728 src/messageview.c:250
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Pogled/Nabor zna_kov/Tajski (TIS-620)"
 
-#: src/compose.c:670 src/mainwindow.c:728 src/messageview.c:252
+#: src/compose.c:670 src/mainwindow.c:730 src/messageview.c:252
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Pogled/Nabor zna_kov/Tajski (Windows-874)"
 
-#: src/compose.c:674 src/mainwindow.c:788 src/messageview.c:283
+#: src/compose.c:674 src/mainwindow.c:790 src/messageview.c:283
 msgid "/_Tools/_Address book"
 msgstr "/_Orodja/_Adresar"
 
@@ -1537,13 +1537,13 @@ msgstr "/_Orodja/_Adresar"
 msgid "/_Tools/_Template"
 msgstr "/_Orodja/_Predloga"
 
-#: src/compose.c:677 src/mainwindow.c:812 src/messageview.c:299
+#: src/compose.c:677 src/mainwindow.c:814 src/messageview.c:299
 msgid "/_Tools/Actio_ns"
 msgstr "/_Orodja/Deja_nja"
 
-#: src/compose.c:679 src/compose.c:683 src/compose.c:689 src/mainwindow.c:791
-#: src/mainwindow.c:805 src/mainwindow.c:810 src/mainwindow.c:813
-#: src/mainwindow.c:817 src/mainwindow.c:819 src/messageview.c:286
+#: src/compose.c:679 src/compose.c:683 src/compose.c:689 src/mainwindow.c:793
+#: src/mainwindow.c:807 src/mainwindow.c:812 src/mainwindow.c:815
+#: src/mainwindow.c:819 src/mainwindow.c:821 src/messageview.c:286
 #: src/messageview.c:298
 msgid "/_Tools/---"
 msgstr "/_Orodja/---"
@@ -1748,7 +1748,7 @@ msgstr "/_Orodja/Deja_nja"
 msgid "PGP Encrypt"
 msgstr "/_Sporočilo/_Enkripcija"
 
-#: src/compose.c:4442 src/compose.c:5543
+#: src/compose.c:4442 src/compose.c:5546
 msgid "MIME type"
 msgstr "Tip MIME"
 
@@ -1791,37 +1791,37 @@ msgstr "Urejanje z zunanjim urejevalnikom"
 msgid "Wrap all long lines"
 msgstr "Prelomi vse dolge vrstice"
 
-#: src/compose.c:5439
+#: src/compose.c:5442
 msgid "Invalid MIME type."
 msgstr "Napačen tip MIME"
 
-#: src/compose.c:5457
+#: src/compose.c:5460
 msgid "File doesn't exist or is empty."
 msgstr "Datoteka ne obstaja ali pa je prazna."
 
-#: src/compose.c:5525
+#: src/compose.c:5528
 #, fuzzy
 msgid "Properties"
 msgstr "Lastnost"
 
-#: src/compose.c:5545 src/prefs_common_dialog.c:1504
+#: src/compose.c:5548 src/prefs_common_dialog.c:1504
 msgid "Encoding"
 msgstr "Nabor znakov"
 
-#: src/compose.c:5568 src/prefs_folder_item.c:202
+#: src/compose.c:5571 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Pot"
 
-#: src/compose.c:5569
+#: src/compose.c:5572
 msgid "File name"
 msgstr "Ime datoteke"
 
-#: src/compose.c:5659
+#: src/compose.c:5662
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Ukazna vrstica za zunanji urejevalnik je neveljavna: '%s'\n"
 
-#: src/compose.c:5714
+#: src/compose.c:5717
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1831,52 +1831,52 @@ msgstr ""
 "Ali naj ga prisilim k prekinitvi?\n"
 "Št. skupine procesov: %d"
 
-#: src/compose.c:6040 src/mainwindow.c:2752
+#: src/compose.c:6043 src/mainwindow.c:2761
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:6156 src/compose.c:6161 src/compose.c:6167
+#: src/compose.c:6159 src/compose.c:6164 src/compose.c:6170
 msgid "Can't queue the message."
 msgstr "Ne morem preložiti pošiljanja sporočila."
 
-#: src/compose.c:6258
+#: src/compose.c:6261
 #, fuzzy
 msgid "Select files"
 msgstr "Izberi datoteko"
 
-#: src/compose.c:6281
+#: src/compose.c:6284
 msgid "Select file"
 msgstr "Izberi datoteko"
 
-#: src/compose.c:6316
+#: src/compose.c:6319
 #, fuzzy
 msgid "Save message"
 msgstr "Pošlji sporočilo"
 
-#: src/compose.c:6317
+#: src/compose.c:6320
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "To sporočilo je bilo spremenjeno. Naj ga zavržem?"
 
-#: src/compose.c:6319
+#: src/compose.c:6322
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:6361
+#: src/compose.c:6364
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Ali želite uporabiti predlogo `%s' ?"
 
-#: src/compose.c:6363
+#: src/compose.c:6366
 msgid "Apply template"
 msgstr "Uporabi predlogo"
 
-#: src/compose.c:6364
+#: src/compose.c:6367
 #, fuzzy
 msgid "_Replace"
 msgstr "Zamenjaj"
 
-#: src/compose.c:6364
+#: src/compose.c:6367
 #, fuzzy
 msgid "_Insert"
 msgstr "Vstavi"
@@ -2338,12 +2338,12 @@ msgstr "Nastavljam informacije o mapi...\n"
 msgid "Setting folder info..."
 msgstr "Nastavljam informacije o mapi..."
 
-#: src/folderview.c:868 src/mainwindow.c:3748 src/setup.c:80
+#: src/folderview.c:868 src/mainwindow.c:3757 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Preiskujem mapo %s%c%s ..."
 
-#: src/folderview.c:872 src/mainwindow.c:3753 src/setup.c:85
+#: src/folderview.c:872 src/mainwindow.c:3762 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Preiskujem mapo %s ..."
@@ -3105,563 +3105,568 @@ msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/_Pogled/Pri_kaži ali skrij/O_rodjarna/Ikone in besedi_lo"
 
 #: src/mainwindow.c:566
-msgid "/_View/Show or hi_de/_Toolbar/_Icon"
+#, fuzzy
+msgid "/_View/Show or hi_de/_Toolbar/Text at the _right of icon"
 msgstr "/_Pogled/Pri_kaži ali skrij/O_rodjarna/_Ikone"
 
 #: src/mainwindow.c:568
+msgid "/_View/Show or hi_de/_Toolbar/_Icon"
+msgstr "/_Pogled/Pri_kaži ali skrij/O_rodjarna/_Ikone"
+
+#: src/mainwindow.c:570
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/_Pogled/Pri_kaži ali skrij/O_rodjarna/_Besedilo"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:572
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/_Pogled/Pri_kaži ali skrij/_Orodjarna/_Nič"
 
-#: src/mainwindow.c:572
+#: src/mainwindow.c:574
 #, fuzzy
 msgid "/_View/Show or hi_de/_Search bar"
 msgstr "/_Pogled/Pri_kaži ali skrij/_Statusna vrstica"
 
-#: src/mainwindow.c:574
+#: src/mainwindow.c:576
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/_Pogled/Pri_kaži ali skrij/_Statusna vrstica"
 
-#: src/mainwindow.c:576
+#: src/mainwindow.c:578
 #, fuzzy
 msgid "/_View/_Customize toolbar..."
 msgstr "/_Pogled/_Pojdi na/_Druga mapa"
 
-#: src/mainwindow.c:578
+#: src/mainwindow.c:580
 msgid "/_View/Separate f_older tree"
 msgstr "_Pogled/Posebno drev_o map"
 
-#: src/mainwindow.c:579
+#: src/mainwindow.c:581
 #, fuzzy
 msgid "/_View/Separate _message view"
 msgstr "/_Pogled/Poseben ogled _sporočila"
 
-#: src/mainwindow.c:581
+#: src/mainwindow.c:583
 msgid "/_View/_Sort"
 msgstr "/_Pogled/_Razvrščanje"
 
-#: src/mainwindow.c:582
+#: src/mainwindow.c:584
 msgid "/_View/_Sort/by _number"
 msgstr "/_Pogled/_Razvrščanje/po š_tevilu"
 
-#: src/mainwindow.c:583
+#: src/mainwindow.c:585
 msgid "/_View/_Sort/by s_ize"
 msgstr "/_Pogled/_Razvrščanje/po _velikosti"
 
-#: src/mainwindow.c:584
+#: src/mainwindow.c:586
 msgid "/_View/_Sort/by _date"
 msgstr "/_Pogled/_Razvrščanje/po _datumu"
 
-#: src/mainwindow.c:585
+#: src/mainwindow.c:587
 #, fuzzy
 msgid "/_View/_Sort/by t_hread date"
 msgstr "/_Pogled/_Razvrščanje/po _datumu"
 
-#: src/mainwindow.c:586
+#: src/mainwindow.c:588
 msgid "/_View/_Sort/by _from"
 msgstr "/_Pogled/_Razvrščanje/po _pošiljatelju"
 
-#: src/mainwindow.c:587
+#: src/mainwindow.c:589
 msgid "/_View/_Sort/by _recipient"
 msgstr "/_Pogled/_Razvrščanje/po naslovnik_u"
 
-#: src/mainwindow.c:588
+#: src/mainwindow.c:590
 msgid "/_View/_Sort/by _subject"
 msgstr "/_Pogled/_Razvrščanje/po _zadevi"
 
-#: src/mainwindow.c:589
+#: src/mainwindow.c:591
 msgid "/_View/_Sort/by _color label"
 msgstr "/_Pogled/_Razvrščanje/po _barvi oznak"
 
-#: src/mainwindow.c:591
+#: src/mainwindow.c:593
 msgid "/_View/_Sort/by _mark"
 msgstr "/_Pogled/_Razvrščanje/po _oznaki"
 
-#: src/mainwindow.c:592
+#: src/mainwindow.c:594
 msgid "/_View/_Sort/by _unread"
 msgstr "/_Pogled/_Razvrščanje/po _neprebranih"
 
-#: src/mainwindow.c:593
+#: src/mainwindow.c:595
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/_Pogled/_Razvrščanje/po pri_logi"
 
-#: src/mainwindow.c:595
+#: src/mainwindow.c:597
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/_Pogled/_Razvrščanje/Ne raz_vrsti"
 
-#: src/mainwindow.c:596 src/mainwindow.c:599
+#: src/mainwindow.c:598 src/mainwindow.c:601
 msgid "/_View/_Sort/---"
 msgstr "/_Pogled/_Razvrščanje/---"
 
-#: src/mainwindow.c:597
+#: src/mainwindow.c:599
 msgid "/_View/_Sort/Ascending"
 msgstr "/_Pogled/_Razvrščanje/N_araščajoče"
 
-#: src/mainwindow.c:598
+#: src/mainwindow.c:600
 msgid "/_View/_Sort/Descending"
 msgstr "/_Pogled/_Razvrščanje/Pa_dajoče"
 
-#: src/mainwindow.c:600
+#: src/mainwindow.c:602
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/_Pogled/_Razvrščanje/Pri_vlači po zadevi"
 
-#: src/mainwindow.c:602
+#: src/mainwindow.c:604
 msgid "/_View/Th_read view"
 msgstr "/_Pogled/Ogled _niti"
 
-#: src/mainwindow.c:603
+#: src/mainwindow.c:605
 msgid "/_View/E_xpand all threads"
 msgstr "/_Pogled/Razširi _vse niti"
 
-#: src/mainwindow.c:604
+#: src/mainwindow.c:606
 msgid "/_View/Co_llapse all threads"
 msgstr "/_Pogled/Skrči vse _niti"
 
-#: src/mainwindow.c:605
+#: src/mainwindow.c:607
 msgid "/_View/Set display _item..."
 msgstr "/_Pogled/Nastavi kos za _prikaz..."
 
-#: src/mainwindow.c:608
+#: src/mainwindow.c:610
 msgid "/_View/_Go to"
 msgstr "/_Pogled/_Pojdi na"
 
-#: src/mainwindow.c:609
+#: src/mainwindow.c:611
 msgid "/_View/_Go to/_Prev message"
 msgstr "/_Pogled/_Pojdi na/_Prejšnje sporočilo"
 
-#: src/mainwindow.c:610
+#: src/mainwindow.c:612
 msgid "/_View/_Go to/_Next message"
 msgstr "/_Pogled/_Pojdi na/_Naslednje sporočilo"
 
-#: src/mainwindow.c:611 src/mainwindow.c:616 src/mainwindow.c:619
-#: src/mainwindow.c:624 src/mainwindow.c:629
+#: src/mainwindow.c:613 src/mainwindow.c:618 src/mainwindow.c:621
+#: src/mainwindow.c:626 src/mainwindow.c:631
 msgid "/_View/_Go to/---"
 msgstr "/_Pogled/_Pojdi na/---"
 
-#: src/mainwindow.c:612
+#: src/mainwindow.c:614
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/_Pogled/_Pojdi na/Pre_jšnje neprebrano sporočilo"
 
-#: src/mainwindow.c:614
+#: src/mainwindow.c:616
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/_Pogled/_Pojdi na/Nas_lednje neprebrano sporočilo"
 
-#: src/mainwindow.c:617
+#: src/mainwindow.c:619
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/_Pogled/_Pojdi na/Prejšnje no_vo sporočilo"
 
-#: src/mainwindow.c:618
+#: src/mainwindow.c:620
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/_Pogled/_Pojdi na/Nasled_nje novo sporočilo"
 
-#: src/mainwindow.c:620
+#: src/mainwindow.c:622
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/_Pogled/_Pojdi na/Prejšnje _označeno sporočilo"
 
-#: src/mainwindow.c:622
+#: src/mainwindow.c:624
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/_Pogled/_Pojdi na/Naslednje o_značeno sporočilo"
 
-#: src/mainwindow.c:625
+#: src/mainwindow.c:627
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/_Pogled/_Pojdi na/Prejšnje sporočilo z ozna_ko"
 
-#: src/mainwindow.c:627
+#: src/mainwindow.c:629
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/_Pogled/_Pojdi na/Naslednje sporočilo z oznako"
 
-#: src/mainwindow.c:630
+#: src/mainwindow.c:632
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Pogled/_Pojdi na/_Druga mapa"
 
-#: src/mainwindow.c:639 src/messageview.c:174
+#: src/mainwindow.c:641 src/messageview.c:174
 #, fuzzy
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Pogled/Nabor zna_kov/_Samodejno"
 
-#: src/mainwindow.c:652 src/messageview.c:187
+#: src/mainwindow.c:654 src/messageview.c:187
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr "_Pogled/Nabor zna_kov/Zahodnoevropski (ISO-8859-15)"
 
-#: src/mainwindow.c:700 src/messageview.c:227
+#: src/mainwindow.c:702 src/messageview.c:227
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Pogled/Nabor zna_kov/Japonski (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:702 src/messageview.c:229
+#: src/mainwindow.c:704 src/messageview.c:229
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Pogled/Nabor zna_kov/Japonski (_EUC-JP)"
 
-#: src/mainwindow.c:704 src/messageview.c:231
+#: src/mainwindow.c:706 src/messageview.c:231
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Pogled/Nabor zna_kov/Japonski (_Shift__JIS)"
 
-#: src/mainwindow.c:714 src/messageview.c:240
+#: src/mainwindow.c:716 src/messageview.c:240
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Pogled/Nabor zna_kov/Tradicionalna kitajščina (EUC-_TW)"
 
-#: src/mainwindow.c:716 src/messageview.c:242
+#: src/mainwindow.c:718 src/messageview.c:242
 #, fuzzy
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Pogled/Nabor zna_kov/Kitajski (ISO-2022-_CN)"
 
-#: src/mainwindow.c:722 src/messageview.c:247
+#: src/mainwindow.c:724 src/messageview.c:247
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Pogled/Kodni nabor/Korejski (ISO-2022-KR)"
 
-#: src/mainwindow.c:735 src/summaryview.c:464
+#: src/mainwindow.c:737 src/summaryview.c:464
 msgid "/_View/Open in new _window"
 msgstr "/_Poglej/Odpri v _novem oknu"
 
-#: src/mainwindow.c:736 src/messageview.c:259 src/summaryview.c:466
+#: src/mainwindow.c:738 src/messageview.c:259 src/summaryview.c:466
 msgid "/_View/Mess_age source"
 msgstr "/_Pogled/I_zvirnik sporočila"
 
-#: src/mainwindow.c:737 src/messageview.c:260 src/summaryview.c:467
+#: src/mainwindow.c:739 src/messageview.c:260 src/summaryview.c:467
 #, fuzzy
 msgid "/_View/All _headers"
 msgstr "/_Pogled/Vsa _zaglavja"
 
-#: src/mainwindow.c:739
+#: src/mainwindow.c:741
 msgid "/_View/_Update summary"
 msgstr "/_Pogled/_Posodobi povzetek"
 
-#: src/mainwindow.c:741 src/messageview.c:263
+#: src/mainwindow.c:743 src/messageview.c:263
 msgid "/_Message"
 msgstr "/_Sporočilo"
 
-#: src/mainwindow.c:742
+#: src/mainwindow.c:744
 #, fuzzy
 msgid "/_Message/Recei_ve"
 msgstr "/_Sporočilo/Znova ur_edi"
 
-#: src/mainwindow.c:743
+#: src/mainwindow.c:745
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "_Sporočilo/Poberi z vseh _računov"
 
-#: src/mainwindow.c:745
+#: src/mainwindow.c:747
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "_Sporočilo/Poberi z vseh _računov"
 
-#: src/mainwindow.c:747
+#: src/mainwindow.c:749
 #, fuzzy
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/_Sporočilo/Odpoved sprejeman_ja"
 
-#: src/mainwindow.c:749
+#: src/mainwindow.c:751
 #, fuzzy
 msgid "/_Message/Recei_ve/---"
 msgstr "/_Sporočilo/Znova ur_edi"
 
-#: src/mainwindow.c:750
+#: src/mainwindow.c:752
 msgid "/_Message/_Send queued messages"
 msgstr "/_Sporočilo/Pošlji čakajoča sporoč_ila"
 
-#: src/mainwindow.c:751 src/mainwindow.c:753 src/mainwindow.c:760
-#: src/mainwindow.c:765 src/mainwindow.c:768 src/mainwindow.c:779
-#: src/mainwindow.c:781 src/mainwindow.c:784 src/messageview.c:266
+#: src/mainwindow.c:753 src/mainwindow.c:755 src/mainwindow.c:762
+#: src/mainwindow.c:767 src/mainwindow.c:770 src/mainwindow.c:781
+#: src/mainwindow.c:783 src/mainwindow.c:786 src/messageview.c:266
 #: src/messageview.c:274 src/messageview.c:279
 msgid "/_Message/---"
 msgstr "/_Sporočilo/---"
 
-#: src/mainwindow.c:752 src/messageview.c:264
+#: src/mainwindow.c:754 src/messageview.c:264
 msgid "/_Message/Compose _new message"
 msgstr "/_Sporočilo/_Novo sporočilo"
 
-#: src/mainwindow.c:754 src/messageview.c:267
+#: src/mainwindow.c:756 src/messageview.c:267
 msgid "/_Message/_Reply"
 msgstr "/_Sporočilo/_Odgovori"
 
-#: src/mainwindow.c:755
+#: src/mainwindow.c:757
 msgid "/_Message/Repl_y to"
 msgstr "/_Sporočilo/Odgovor _na"
 
-#: src/mainwindow.c:756 src/messageview.c:268
+#: src/mainwindow.c:758 src/messageview.c:268
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Sporočilo/Odgovor _na/_vsem"
 
-#: src/mainwindow.c:757 src/messageview.c:270
+#: src/mainwindow.c:759 src/messageview.c:270
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Sporočilo/Odgovori _na/_pošiljatelju"
 
-#: src/mainwindow.c:758 src/messageview.c:272
+#: src/mainwindow.c:760 src/messageview.c:272
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Sporočilo/Odgovor _na/_dopisni seznam"
 
-#: src/mainwindow.c:761 src/messageview.c:275
+#: src/mainwindow.c:763 src/messageview.c:275
 msgid "/_Message/_Forward"
 msgstr "/Sporočilo/_Posreduj"
 
-#: src/mainwindow.c:762 src/messageview.c:276
+#: src/mainwindow.c:764 src/messageview.c:276
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Sporočilo/Posreduj kot prilo_go"
 
-#: src/mainwindow.c:764 src/messageview.c:278
+#: src/mainwindow.c:766 src/messageview.c:278
 msgid "/_Message/Redirec_t"
 msgstr "/_Sporočilo/Pre_usmeri"
 
-#: src/mainwindow.c:766
+#: src/mainwindow.c:768
 msgid "/_Message/M_ove..."
 msgstr "/_Sporočilo/Pres_tavi..."
 
-#: src/mainwindow.c:767
+#: src/mainwindow.c:769
 msgid "/_Message/_Copy..."
 msgstr "/_Sporočilo/_Kopiraj..."
 
-#: src/mainwindow.c:769
+#: src/mainwindow.c:771
 msgid "/_Message/_Mark"
 msgstr "/_Sporočilo/O_znači"
 
-#: src/mainwindow.c:770
+#: src/mainwindow.c:772
 msgid "/_Message/_Mark/_Mark"
 msgstr "/_Sporočilo/O_znači/_Označi"
 
-#: src/mainwindow.c:771
+#: src/mainwindow.c:773
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/_Sporočilo/O_znači/O_dznači"
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:774
 msgid "/_Message/_Mark/---"
 msgstr "/_Sporočilo/O_znači/---"
 
-#: src/mainwindow.c:773
+#: src/mainwindow.c:775
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/_Sporočilo/O_znači/Označi kot _neprebrano"
 
-#: src/mainwindow.c:774
+#: src/mainwindow.c:776
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/_Sporočilo/O_znači/Označi kot _prebrano"
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:778
 #, fuzzy
 msgid "/_Message/_Mark/Mark _thread as read"
 msgstr "/_Sporočilo/O_znači/Označi kot _prebrano"
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:780
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/_Sporočilo/O_znači/Označi _vsa kot prebrana"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:782
 msgid "/_Message/_Delete"
 msgstr "/_Sporočilo/Z_briši"
 
-#: src/mainwindow.c:782
+#: src/mainwindow.c:784
 #, fuzzy
 msgid "/_Message/Set as _junk mail"
 msgstr "/_Sporočilo/_Poberi novo pošto"
 
-#: src/mainwindow.c:783
+#: src/mainwindow.c:785
 #, fuzzy
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/_Sporočilo/_Poberi novo pošto"
 
-#: src/mainwindow.c:785 src/messageview.c:280
+#: src/mainwindow.c:787 src/messageview.c:280
 msgid "/_Message/Re-_edit"
 msgstr "/_Sporočilo/Znova ur_edi"
 
-#: src/mainwindow.c:789
+#: src/mainwindow.c:791
 #, fuzzy
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/_Orodja/Doda_j pošiljatelja v adresar"
 
-#: src/mainwindow.c:792
+#: src/mainwindow.c:794
 #, fuzzy
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/_Orodja/_Filtriraj sporočila"
 
-#: src/mainwindow.c:794
+#: src/mainwindow.c:796
 #, fuzzy
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Orodja/_Filtriraj sporočila"
 
-#: src/mainwindow.c:796 src/messageview.c:287
+#: src/mainwindow.c:798 src/messageview.c:287
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Orodja/_Ustvari pravilo za filtriranje"
 
-#: src/mainwindow.c:797 src/messageview.c:289
+#: src/mainwindow.c:799 src/messageview.c:289
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Orodja/_Ustvari pravilo za filtriranje/S_amodejno"
 
-#: src/mainwindow.c:799 src/messageview.c:291
+#: src/mainwindow.c:801 src/messageview.c:291
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Orodja/_Ustvari pravilo za filtriranje/po p_ošiljatelju"
 
-#: src/mainwindow.c:801 src/messageview.c:293
+#: src/mainwindow.c:803 src/messageview.c:293
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Orodja/_Ustvari pravilo za filtriranje/po _naslovniku"
 
-#: src/mainwindow.c:803 src/messageview.c:295
+#: src/mainwindow.c:805 src/messageview.c:295
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Orodja/_Ustvari pravilo za filtriranje/po _zadevi"
 
-#: src/mainwindow.c:806
+#: src/mainwindow.c:808
 #, fuzzy
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/_Orodja/_Filtriraj sporočila"
 
-#: src/mainwindow.c:808
+#: src/mainwindow.c:810
 #, fuzzy
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/_Orodja/_Filtriraj sporočila"
 
-#: src/mainwindow.c:815
+#: src/mainwindow.c:817
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/_Orodja/_Briši podvojena sporočila"
 
-#: src/mainwindow.c:818
+#: src/mainwindow.c:820
 #, fuzzy
 msgid "/_Tools/E_xecute marked process"
 msgstr "Izvedi označen proces"
 
-#: src/mainwindow.c:820
+#: src/mainwindow.c:822
 msgid "/_Tools/_Log window"
 msgstr "/_Orodja/_Dnevniško okno"
 
-#: src/mainwindow.c:822
+#: src/mainwindow.c:824
 msgid "/_Configuration"
 msgstr "/_Prikrojitev"
 
-#: src/mainwindow.c:823
+#: src/mainwindow.c:825
 msgid "/_Configuration/_Common preferences..."
 msgstr "/_Prikrojitev/_Splošne nastavitve..."
 
-#: src/mainwindow.c:825
+#: src/mainwindow.c:827
 msgid "/_Configuration/_Filter setting..."
 msgstr "/_Prikrojitev/_Nastavitve _filtra..."
 
-#: src/mainwindow.c:827
+#: src/mainwindow.c:829
 msgid "/_Configuration/_Template..."
 msgstr "/_Prikrojitev/_Predloga..."
 
-#: src/mainwindow.c:829
+#: src/mainwindow.c:831
 msgid "/_Configuration/_Actions..."
 msgstr "/_Prikrojitev/_Dejanja..."
 
-#: src/mainwindow.c:831
+#: src/mainwindow.c:833
 msgid "/_Configuration/---"
 msgstr "/_Prikrojitev/---"
 
-#: src/mainwindow.c:832
+#: src/mainwindow.c:834
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Prikrojitev/_Nastavitve za trenutni _račun..."
 
-#: src/mainwindow.c:834
+#: src/mainwindow.c:836
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Prikrojitev/Naredi _nov račun..."
 
-#: src/mainwindow.c:836
+#: src/mainwindow.c:838
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Prikrojitev/_Uredi račune..."
 
-#: src/mainwindow.c:838
+#: src/mainwindow.c:840
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Prikrojitev/Spremeni _trenutni račun"
 
-#: src/mainwindow.c:842
+#: src/mainwindow.c:844
 msgid "/_Help/_Manual"
 msgstr "/_Pomoč/_Priročnik"
 
-#: src/mainwindow.c:843
+#: src/mainwindow.c:845
 msgid "/_Help/_Manual/_English"
 msgstr "/_Pomoč/_Priročnik/_Angleščina"
 
-#: src/mainwindow.c:844
+#: src/mainwindow.c:846
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/_Pomoč/_Priročnik/_Japonščina"
 
-#: src/mainwindow.c:845
+#: src/mainwindow.c:847
 msgid "/_Help/_FAQ"
 msgstr "/_Pomoč/Pogosto _zastavljena vprašanja"
 
-#: src/mainwindow.c:846
+#: src/mainwindow.c:848
 msgid "/_Help/_FAQ/_English"
 msgstr "/_Pomoč/Pogosto _zastavljena vprašanja/_Angleščina"
 
-#: src/mainwindow.c:847
+#: src/mainwindow.c:849
 msgid "/_Help/_FAQ/_German"
 msgstr "/_Pomoč/Pogosto _zastavljena vprašanja/_Nemščina"
 
-#: src/mainwindow.c:848
+#: src/mainwindow.c:850
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/_Pomoč/Pogosto _zastavljena vprašanja/Š_panščina"
 
-#: src/mainwindow.c:849
+#: src/mainwindow.c:851
 msgid "/_Help/_FAQ/_French"
 msgstr "/_Pomoč/Pogosto _zastavljena vprašanja/_Francoščina"
 
-#: src/mainwindow.c:850
+#: src/mainwindow.c:852
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/_Pomoč/Pogosto _zastavljena vprašanja/_Italijanščina"
 
-#: src/mainwindow.c:851
+#: src/mainwindow.c:853
 #, fuzzy
 msgid "/_Help/_Command line options"
 msgstr "Ukazna vrstica ni nastavljena."
 
-#: src/mainwindow.c:852
+#: src/mainwindow.c:854
 msgid "/_Help/---"
 msgstr "/_Pomoč/---"
 
-#: src/mainwindow.c:895
+#: src/mainwindow.c:897
 msgid "Creating main window...\n"
 msgstr "Ustvarjam glavno okno...\n"
 
-#: src/mainwindow.c:1071
+#: src/mainwindow.c:1073
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "GlavnoOkno: alokacija barve %d ni uspela\n"
 
-#: src/mainwindow.c:1175 src/summaryview.c:2387 src/summaryview.c:2472
+#: src/mainwindow.c:1181 src/summaryview.c:2387 src/summaryview.c:2472
 #: src/summaryview.c:4009 src/summaryview.c:4138 src/summaryview.c:4507
 msgid "done.\n"
 msgstr "opravljeno.\n"
 
-#: src/mainwindow.c:1293 src/mainwindow.c:1334 src/mainwindow.c:1359
+#: src/mainwindow.c:1299 src/mainwindow.c:1340 src/mainwindow.c:1365
 msgid "Untitled"
 msgstr "Brez naslova"
 
-#: src/mainwindow.c:1360
+#: src/mainwindow.c:1366
 msgid "none"
 msgstr "nič"
 
-#: src/mainwindow.c:1413
+#: src/mainwindow.c:1419
 #, 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:1663
+#: src/mainwindow.c:1669
 msgid "Offline"
 msgstr ""
 
-#: src/mainwindow.c:1664
+#: src/mainwindow.c:1670
 msgid "You are offline. Go online?"
 msgstr ""
 
-#: src/mainwindow.c:1681
+#: src/mainwindow.c:1687
 #, fuzzy
 msgid "Empty all trash"
 msgstr "Izprazni smetnjak"
 
-#: src/mainwindow.c:1682
+#: src/mainwindow.c:1688
 #, fuzzy
 msgid "Delete all messages in trash folders?"
 msgstr "Izbrišem vsa sporočila v smetnjaku?"
 
-#: src/mainwindow.c:1712
+#: src/mainwindow.c:1718
 msgid "Add mailbox"
 msgstr "Dodaj poštni predal"
 
-#: src/mainwindow.c:1713
+#: src/mainwindow.c:1719
 #, fuzzy
 msgid ""
 "Specify the location of mailbox.\n"
@@ -3672,16 +3677,16 @@ msgstr ""
 "Če je določen obstoječi poštni predal,\n"
 "bo pregledan samodejno."
 
-#: src/mainwindow.c:1719 src/setup.c:49
+#: src/mainwindow.c:1725 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Poštni predal `%s' že obstaja."
 
-#: src/mainwindow.c:1724 src/setup.c:56
+#: src/mainwindow.c:1730 src/setup.c:56
 msgid "Mailbox"
 msgstr "Poštni predal"
 
-#: src/mainwindow.c:1730 src/setup.c:62
+#: src/mainwindow.c:1736 src/setup.c:62
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3690,135 +3695,135 @@ msgstr ""
 "Izdelava poštnega predala ni uspela.\n"
 "Morda obstajajo nekatere datoteke ali pa tam nimate dovoljenja za pisanje."
 
-#: src/mainwindow.c:2198
+#: src/mainwindow.c:2206
 msgid "Sylpheed - Folder View"
 msgstr "Syčpheed - ogled mape"
 
-#: src/mainwindow.c:2217
+#: src/mainwindow.c:2225
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - ogled sporočila"
 
-#: src/mainwindow.c:2369 src/summaryview.c:418
+#: src/mainwindow.c:2377 src/summaryview.c:418
 msgid "/_Reply"
 msgstr "/O_dgovori"
 
-#: src/mainwindow.c:2370
+#: src/mainwindow.c:2378
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "Odgovori vsem"
 
-#: src/mainwindow.c:2371
+#: src/mainwindow.c:2379
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/Odgovor _za/_pošiljatelja"
 
-#: src/mainwindow.c:2372
+#: src/mainwindow.c:2380
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/Odgovor _za/_dopisni seznam"
 
-#: src/mainwindow.c:2377 src/summaryview.c:425
+#: src/mainwindow.c:2385 src/summaryview.c:425
 msgid "/_Forward"
 msgstr "/P_osreduj"
 
-#: src/mainwindow.c:2378 src/summaryview.c:426
+#: src/mainwindow.c:2386 src/summaryview.c:426
 msgid "/For_ward as attachment"
 msgstr "/Posreduj kot prilo_go"
 
-#: src/mainwindow.c:2379 src/summaryview.c:427
+#: src/mainwindow.c:2387 src/summaryview.c:427
 msgid "/Redirec_t"
 msgstr "/Pre_usmeri"
 
-#: src/mainwindow.c:2384
+#: src/mainwindow.c:2392
 msgid "Incorporate new mail"
 msgstr "Pripoji novo pošto"
 
-#: src/mainwindow.c:2386
+#: src/mainwindow.c:2394
 msgid "Incorporate new mail of all accounts"
 msgstr "Pripoji novo pošto z vseh računov"
 
-#: src/mainwindow.c:2388
+#: src/mainwindow.c:2396
 msgid "Send queued message(s)"
 msgstr "Pošlji čakajoča sporočila"
 
-#: src/mainwindow.c:2390
+#: src/mainwindow.c:2398
 msgid "Compose new message"
 msgstr "Sestavi novo sporočilo"
 
-#: src/mainwindow.c:2392
+#: src/mainwindow.c:2400
 msgid "Reply to the message"
 msgstr "Odgovori na sporočilo"
 
-#: src/mainwindow.c:2394
+#: src/mainwindow.c:2402
 msgid "Reply to all"
 msgstr "Odgovori vsem"
 
-#: src/mainwindow.c:2396
+#: src/mainwindow.c:2404
 msgid "Forward the message"
 msgstr "Posreduj sporočilo"
 
-#: src/mainwindow.c:2398
+#: src/mainwindow.c:2406
 msgid "Delete the message"
 msgstr "Izbriši sporočilo"
 
-#: src/mainwindow.c:2400
+#: src/mainwindow.c:2408
 #, fuzzy
 msgid "Set as junk mail"
 msgstr "Nastavi kot privzeto"
 
-#: src/mainwindow.c:2402
+#: src/mainwindow.c:2410
 msgid "Execute marked process"
 msgstr "Izvedi označen proces"
 
-#: src/mainwindow.c:2404
+#: src/mainwindow.c:2412
 msgid "Next unread message"
 msgstr "Naslednje neprebrano sporočilo"
 
-#: src/mainwindow.c:2406
+#: src/mainwindow.c:2414
 #, fuzzy
 msgid "Previous unread message"
 msgstr "Naslednje neprebrano sporočilo"
 
-#: src/mainwindow.c:2410
+#: src/mainwindow.c:2418
 #, fuzzy
 msgid "Print message"
 msgstr "Pošlji sporočilo"
 
-#: src/mainwindow.c:2412
+#: src/mainwindow.c:2420
 msgid "Common preferences"
 msgstr "Splošne preference"
 
-#: src/mainwindow.c:2414 src/prefs_account_dialog.c:511
+#: src/mainwindow.c:2422 src/prefs_account_dialog.c:511
 msgid "Account preferences"
 msgstr "Nastavitve računa"
 
-#: src/mainwindow.c:2779
+#: src/mainwindow.c:2788
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 
-#: src/mainwindow.c:2790
+#: src/mainwindow.c:2799
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 
-#: src/mainwindow.c:3062
+#: src/mainwindow.c:3071
 msgid "Exit"
 msgstr "Končaj"
 
-#: src/mainwindow.c:3062
+#: src/mainwindow.c:3071
 msgid "Exit this program?"
 msgstr "Ali naj končam ta program?"
 
-#: src/mainwindow.c:3666
+#: src/mainwindow.c:3675
 #, fuzzy
 msgid "Command line options"
 msgstr "Ukazna vrstica ni nastavljena."
 
-#: src/mainwindow.c:3679
+#: src/mainwindow.c:3688
 #, fuzzy
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Uporaba: %s [MOŽNOST]...\n"
 
-#: src/mainwindow.c:3687
+#: src/mainwindow.c:3696
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -3834,7 +3839,7 @@ msgid ""
 "--version"
 msgstr ""
 
-#: src/mainwindow.c:3703
+#: src/mainwindow.c:3712
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
diff --git a/po/sr.po b/po/sr.po
index 1b1fcf29..1ff04a36 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-01-31 16:49+0900\n"
+"POT-Creation-Date: 2007-01-31 17:29+0900\n"
 "PO-Revision-Date: 2002-11-29 21:08+0100\n"
 "Last-Translator: garret <garret@garrets.tk>\n"
 "Language-Team: Serbian\n"
@@ -913,7 +913,7 @@ msgstr "/_Adresa/_Izmeni"
 msgid "/_Address/_Delete"
 msgstr "/_Adresa/O_briši"
 
-#: src/addressbook.c:359 src/compose.c:673 src/mainwindow.c:787
+#: src/addressbook.c:359 src/compose.c:673 src/mainwindow.c:789
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Alati"
@@ -922,12 +922,12 @@ msgstr "/_Alati"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Datoteka/Unesi _LDIF datoteku"
 
-#: src/addressbook.c:361 src/compose.c:694 src/mainwindow.c:841
+#: src/addressbook.c:361 src/compose.c:694 src/mainwindow.c:843
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Pomoć"
 
-#: src/addressbook.c:362 src/compose.c:695 src/mainwindow.c:853
+#: src/addressbook.c:362 src/compose.c:695 src/mainwindow.c:855
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Pomoć/_O"
@@ -969,7 +969,7 @@ msgstr "/_Obriši"
 msgid "E-Mail address"
 msgstr "Adresa e-pošte"
 
-#: src/addressbook.c:496 src/compose.c:4873 src/mainwindow.c:2408
+#: src/addressbook.c:496 src/compose.c:4873 src/mainwindow.c:2416
 #: src/prefs_common_dialog.c:2274
 msgid "Address book"
 msgstr "Adresar"
@@ -1183,7 +1183,7 @@ msgstr "Uobičajene adrese"
 msgid "Personal address"
 msgstr "Lične adrese"
 
-#: src/alertpanel.c:142 src/compose.c:5717 src/main.c:638
+#: src/alertpanel.c:142 src/compose.c:5720 src/main.c:638
 msgid "Notice"
 msgstr "Obaveštenje"
 
@@ -1357,9 +1357,9 @@ msgid "/_View/_Reply to"
 msgstr "/_Pregled/_Odgovori"
 
 #: src/compose.c:578 src/compose.c:580 src/compose.c:582 src/compose.c:584
-#: src/compose.c:587 src/mainwindow.c:577 src/mainwindow.c:580
-#: src/mainwindow.c:607 src/mainwindow.c:631 src/mainwindow.c:734
-#: src/mainwindow.c:738 src/messageview.c:258
+#: src/compose.c:587 src/mainwindow.c:579 src/mainwindow.c:582
+#: src/mainwindow.c:609 src/mainwindow.c:633 src/mainwindow.c:736
+#: src/mainwindow.c:740 src/messageview.c:258
 msgid "/_View/---"
 msgstr "/_Pregled/---"
 
@@ -1380,7 +1380,7 @@ msgstr "/_Pregled/_Spajalica"
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/_Pregled/_Idi do/Dru_gog direktorijuma..."
 
-#: src/compose.c:593 src/mainwindow.c:638 src/messageview.c:173
+#: src/compose.c:593 src/mainwindow.c:640 src/messageview.c:173
 #, fuzzy
 msgid "/_View/Character _encoding"
 msgstr "/_Pregled/_Složi/Opadajuće"
@@ -1392,138 +1392,138 @@ msgstr ""
 #: src/compose.c:596 src/compose.c:602 src/compose.c:608 src/compose.c:612
 #: src/compose.c:620 src/compose.c:624 src/compose.c:630 src/compose.c:636
 #: src/compose.c:640 src/compose.c:650 src/compose.c:654 src/compose.c:662
-#: src/compose.c:666 src/mainwindow.c:634 src/mainwindow.c:641
+#: src/compose.c:666 src/mainwindow.c:636 src/mainwindow.c:643
 #: src/messageview.c:169
 #, fuzzy
 msgid "/_View/Character _encoding/---"
 msgstr "/_Pregled/_Složi/Opadajuće"
 
-#: src/compose.c:598 src/mainwindow.c:642 src/messageview.c:177
+#: src/compose.c:598 src/mainwindow.c:644 src/messageview.c:177
 #, fuzzy
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Pregled/_Znakovni standard/7bit ascii (US-ASC_II)"
 
-#: src/compose.c:600 src/mainwindow.c:644 src/messageview.c:180
+#: src/compose.c:600 src/mainwindow.c:646 src/messageview.c:180
 #, fuzzy
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Pregled/_Znakovni standard/Unicode (_UTF-8)"
 
-#: src/compose.c:604 src/mainwindow.c:648 src/messageview.c:183
+#: src/compose.c:604 src/mainwindow.c:650 src/messageview.c:183
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Pregled/_Znakovni standard/Zapadna Evropa (ISO-8859-_1)"
 
-#: src/compose.c:606 src/mainwindow.c:650 src/messageview.c:185
+#: src/compose.c:606 src/mainwindow.c:652 src/messageview.c:185
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Pregled/_Znakovni standard/Zapadna Evropa (ISO-8859-15)"
 
-#: src/compose.c:610 src/mainwindow.c:656 src/messageview.c:190
+#: src/compose.c:610 src/mainwindow.c:658 src/messageview.c:190
 #, fuzzy
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Pregled/_Znakovni standard/Srednja Evropa (ISO-8859-_2)"
 
-#: src/compose.c:614 src/mainwindow.c:660 src/messageview.c:193
+#: src/compose.c:614 src/mainwindow.c:662 src/messageview.c:193
 #, fuzzy
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Pregled/_Znakovni standard/_Baltik (ISO-8859-13)"
 
-#: src/compose.c:616 src/mainwindow.c:662 src/messageview.c:195
+#: src/compose.c:616 src/mainwindow.c:664 src/messageview.c:195
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Pregled/_Znakovni standard/Baltik (ISO-8859-_4)"
 
-#: src/compose.c:618 src/mainwindow.c:664 src/messageview.c:197
+#: src/compose.c:618 src/mainwindow.c:666 src/messageview.c:197
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/_Pregled/_Znakovni standard/Ćirilica (Windows-1251)"
 
-#: src/compose.c:622 src/mainwindow.c:668 src/messageview.c:200
+#: src/compose.c:622 src/mainwindow.c:670 src/messageview.c:200
 #, fuzzy
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Pregled/_Znakovni standard/Grčka (ISO-8859-_7)"
 
-#: src/compose.c:626 src/mainwindow.c:672 src/messageview.c:203
+#: src/compose.c:626 src/mainwindow.c:674 src/messageview.c:203
 #, fuzzy
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/_Pregled/_Znakovni standard/Baltik (ISO-8859-_4)"
 
-#: src/compose.c:628 src/mainwindow.c:674 src/messageview.c:205
+#: src/compose.c:628 src/mainwindow.c:676 src/messageview.c:205
 #, fuzzy
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/_Pregled/_Znakovni standard/Ćirilica (Windows-1251)"
 
-#: src/compose.c:632 src/mainwindow.c:678 src/messageview.c:208
+#: src/compose.c:632 src/mainwindow.c:680 src/messageview.c:208
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Pregled/_Znakovni standard/Grčka (ISO-8859-_7)"
 
-#: src/compose.c:634 src/mainwindow.c:680 src/messageview.c:210
+#: src/compose.c:634 src/mainwindow.c:682 src/messageview.c:210
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Pregled/_Znakovni standard/Ćirilica (Windows-1251)"
 
-#: src/compose.c:638 src/mainwindow.c:684 src/messageview.c:213
+#: src/compose.c:638 src/mainwindow.c:686 src/messageview.c:213
 #, fuzzy
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Pregled/_Znakovni standard/Turska (ISO-8859-_9)"
 
-#: src/compose.c:642 src/mainwindow.c:688 src/messageview.c:216
+#: src/compose.c:642 src/mainwindow.c:690 src/messageview.c:216
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Pregled/_Znakovni standard/Ćirilica (ISO-8859-_5)"
 
-#: src/compose.c:644 src/mainwindow.c:690 src/messageview.c:218
+#: src/compose.c:644 src/mainwindow.c:692 src/messageview.c:218
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Pregled/_Znakovni standard/Ćirilica (KOI8-_R)"
 
-#: src/compose.c:646 src/mainwindow.c:692 src/messageview.c:220
+#: src/compose.c:646 src/mainwindow.c:694 src/messageview.c:220
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Pregled/_Znakovni standard/Ćirilica (KOI8-_R)"
 
-#: src/compose.c:648 src/mainwindow.c:694 src/messageview.c:222
+#: src/compose.c:648 src/mainwindow.c:696 src/messageview.c:222
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Pregled/_Znakovni standard/Ćirilica (Windows-1251)"
 
-#: src/compose.c:652 src/mainwindow.c:698 src/messageview.c:225
+#: src/compose.c:652 src/mainwindow.c:700 src/messageview.c:225
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Pregled/_Znakovni standard/Japan (ISO-2022-_JP)"
 
-#: src/compose.c:656 src/mainwindow.c:708 src/messageview.c:234
+#: src/compose.c:656 src/mainwindow.c:710 src/messageview.c:234
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Pregled/_Znakovni standard/Pojednostavljeni Kineski (_GB2312)"
 
-#: src/compose.c:658 src/mainwindow.c:710 src/messageview.c:236
+#: src/compose.c:658 src/mainwindow.c:712 src/messageview.c:236
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Pregled/_Znakovni standard/Pojednostavljeni Kineski (_GB2312)"
 
-#: src/compose.c:660 src/mainwindow.c:712 src/messageview.c:238
+#: src/compose.c:660 src/mainwindow.c:714 src/messageview.c:238
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Pregled/_Znakovni standard/Tradicionalni Kineski (_Big5)"
 
-#: src/compose.c:664 src/mainwindow.c:720 src/messageview.c:245
+#: src/compose.c:664 src/mainwindow.c:722 src/messageview.c:245
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Pregled/_Znakovni standard/Koreja (EUC-_KR)"
 
-#: src/compose.c:668 src/mainwindow.c:726 src/messageview.c:250
+#: src/compose.c:668 src/mainwindow.c:728 src/messageview.c:250
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Pregled/_Znakovni standard/Thai (TIS-620)"
 
-#: src/compose.c:670 src/mainwindow.c:728 src/messageview.c:252
+#: src/compose.c:670 src/mainwindow.c:730 src/messageview.c:252
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Pregled/_Znakovni standard/Thai (Windows-874)"
 
-#: src/compose.c:674 src/mainwindow.c:788 src/messageview.c:283
+#: src/compose.c:674 src/mainwindow.c:790 src/messageview.c:283
 msgid "/_Tools/_Address book"
 msgstr "/_Alat/_Adresar"
 
@@ -1531,13 +1531,13 @@ msgstr "/_Alat/_Adresar"
 msgid "/_Tools/_Template"
 msgstr "/_Alat/_Šablon"
 
-#: src/compose.c:677 src/mainwindow.c:812 src/messageview.c:299
+#: src/compose.c:677 src/mainwindow.c:814 src/messageview.c:299
 msgid "/_Tools/Actio_ns"
 msgstr "/_Alat/Akci_je"
 
-#: src/compose.c:679 src/compose.c:683 src/compose.c:689 src/mainwindow.c:791
-#: src/mainwindow.c:805 src/mainwindow.c:810 src/mainwindow.c:813
-#: src/mainwindow.c:817 src/mainwindow.c:819 src/messageview.c:286
+#: src/compose.c:679 src/compose.c:683 src/compose.c:689 src/mainwindow.c:793
+#: src/mainwindow.c:807 src/mainwindow.c:812 src/mainwindow.c:815
+#: src/mainwindow.c:819 src/mainwindow.c:821 src/messageview.c:286
 #: src/messageview.c:298
 msgid "/_Tools/---"
 msgstr "/_Alati/---"
@@ -1743,7 +1743,7 @@ msgstr "/_Alat/Akci_je"
 msgid "PGP Encrypt"
 msgstr "/_Poruka/_Enkriptuj"
 
-#: src/compose.c:4442 src/compose.c:5543
+#: src/compose.c:4442 src/compose.c:5546
 msgid "MIME type"
 msgstr "MIME tip"
 
@@ -1786,37 +1786,37 @@ msgstr "Izmeni sa nezavisnim ediorom"
 msgid "Wrap all long lines"
 msgstr "Sažmi sve duge linije"
 
-#: src/compose.c:5439
+#: src/compose.c:5442
 msgid "Invalid MIME type."
 msgstr "Pogrešan MIME tip"
 
-#: src/compose.c:5457
+#: src/compose.c:5460
 msgid "File doesn't exist or is empty."
 msgstr "Datoteka ne postoji ili je prazna."
 
-#: src/compose.c:5525
+#: src/compose.c:5528
 #, fuzzy
 msgid "Properties"
 msgstr "Svojstva"
 
-#: src/compose.c:5545 src/prefs_common_dialog.c:1504
+#: src/compose.c:5548 src/prefs_common_dialog.c:1504
 msgid "Encoding"
 msgstr "Kodiranje"
 
-#: src/compose.c:5568 src/prefs_folder_item.c:202
+#: src/compose.c:5571 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Putanja"
 
-#: src/compose.c:5569
+#: src/compose.c:5572
 msgid "File name"
 msgstr "Ime datoteke"
 
-#: src/compose.c:5659
+#: src/compose.c:5662
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Naredba za nezavisni editor je pogrešna: `%s'\n"
 
-#: src/compose.c:5714
+#: src/compose.c:5717
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1826,52 +1826,52 @@ msgstr ""
 "Nasilno prekinuti proces?\n"
 "grupa procesa: %d"
 
-#: src/compose.c:6040 src/mainwindow.c:2752
+#: src/compose.c:6043 src/mainwindow.c:2761
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:6156 src/compose.c:6161 src/compose.c:6167
+#: src/compose.c:6159 src/compose.c:6164 src/compose.c:6170
 msgid "Can't queue the message."
 msgstr "Ne mogu odložiti poruku."
 
-#: src/compose.c:6258
+#: src/compose.c:6261
 #, fuzzy
 msgid "Select files"
 msgstr "Odaberite datoteku"
 
-#: src/compose.c:6281
+#: src/compose.c:6284
 msgid "Select file"
 msgstr "Odaberite datoteku"
 
-#: src/compose.c:6316
+#: src/compose.c:6319
 #, fuzzy
 msgid "Save message"
 msgstr "Pošalji poruku"
 
-#: src/compose.c:6317
+#: src/compose.c:6320
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Ova poruka je promenjena, odbaciti?"
 
-#: src/compose.c:6319
+#: src/compose.c:6322
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:6361
+#: src/compose.c:6364
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Želite li primeniti šablon `%s'?"
 
-#: src/compose.c:6363
+#: src/compose.c:6366
 msgid "Apply template"
 msgstr "Primeni šablon"
 
-#: src/compose.c:6364
+#: src/compose.c:6367
 #, fuzzy
 msgid "_Replace"
 msgstr "Zameni"
 
-#: src/compose.c:6364
+#: src/compose.c:6367
 #, fuzzy
 msgid "_Insert"
 msgstr "Unesi"
@@ -2333,12 +2333,12 @@ msgstr "Postavljam info direktorijuma...\n"
 msgid "Setting folder info..."
 msgstr "Postavljam info direktorijuma..."
 
-#: src/folderview.c:868 src/mainwindow.c:3748 src/setup.c:80
+#: src/folderview.c:868 src/mainwindow.c:3757 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Pretražujem direktorijume %s%c%s ..."
 
-#: src/folderview.c:872 src/mainwindow.c:3753 src/setup.c:85
+#: src/folderview.c:872 src/mainwindow.c:3762 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Pretražujem direktorijum %s ..."
@@ -3100,564 +3100,569 @@ msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/_Pregled/Prikaži ili s_kloni/_Traka alata/Ikon_e i text"
 
 #: src/mainwindow.c:566
-msgid "/_View/Show or hi_de/_Toolbar/_Icon"
+#, fuzzy
+msgid "/_View/Show or hi_de/_Toolbar/Text at the _right of icon"
 msgstr "/_Pregled/Prikaži ili s_kloni/_Traka alata/_Ikone"
 
 #: src/mainwindow.c:568
+msgid "/_View/Show or hi_de/_Toolbar/_Icon"
+msgstr "/_Pregled/Prikaži ili s_kloni/_Traka alata/_Ikone"
+
+#: src/mainwindow.c:570
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/_Pregled/Prikaži ili s_kloni/_Traka alata/_Tekst"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:572
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/_Pregled/Prikaži ili s_kloni/_Traka alata/_Ništa"
 
-#: src/mainwindow.c:572
+#: src/mainwindow.c:574
 #, fuzzy
 msgid "/_View/Show or hi_de/_Search bar"
 msgstr "/_Pregled/Prikaži ili s_kloni/Stat_us traka"
 
-#: src/mainwindow.c:574
+#: src/mainwindow.c:576
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/_Pregled/Prikaži ili s_kloni/Stat_us traka"
 
-#: src/mainwindow.c:576
+#: src/mainwindow.c:578
 #, fuzzy
 msgid "/_View/_Customize toolbar..."
 msgstr "/_Pregled/_Idi do/Dru_gog direktorijuma..."
 
-#: src/mainwindow.c:578
+#: src/mainwindow.c:580
 msgid "/_View/Separate f_older tree"
 msgstr "/_Pregled/Odvoji sta_blo direktorijuma"
 
-#: src/mainwindow.c:579
+#: src/mainwindow.c:581
 #, fuzzy
 msgid "/_View/Separate _message view"
 msgstr "/_Pregled/Odvoji pre_gled poruka"
 
-#: src/mainwindow.c:581
+#: src/mainwindow.c:583
 msgid "/_View/_Sort"
 msgstr "/_Pregled/_Složi"
 
-#: src/mainwindow.c:582
+#: src/mainwindow.c:584
 msgid "/_View/_Sort/by _number"
 msgstr "/_Pregled/_Složi/po _broju"
 
-#: src/mainwindow.c:583
+#: src/mainwindow.c:585
 msgid "/_View/_Sort/by s_ize"
 msgstr "/_Pregled/_Složi/po _veličini"
 
-#: src/mainwindow.c:584
+#: src/mainwindow.c:586
 msgid "/_View/_Sort/by _date"
 msgstr "/_Pregled/_Složi/po _datumu"
 
-#: src/mainwindow.c:585
+#: src/mainwindow.c:587
 #, fuzzy
 msgid "/_View/_Sort/by t_hread date"
 msgstr "/_Pregled/_Složi/po _datumu"
 
-#: src/mainwindow.c:586
+#: src/mainwindow.c:588
 msgid "/_View/_Sort/by _from"
 msgstr "/_Pregled/_Složi/po _pošiljaocu"
 
-#: src/mainwindow.c:587
+#: src/mainwindow.c:589
 #, fuzzy
 msgid "/_View/_Sort/by _recipient"
 msgstr "/_Pregled/_Složi/po _veličini"
 
-#: src/mainwindow.c:588
+#: src/mainwindow.c:590
 msgid "/_View/_Sort/by _subject"
 msgstr "/_Pregled/_Složi/po _temi"
 
-#: src/mainwindow.c:589
+#: src/mainwindow.c:591
 msgid "/_View/_Sort/by _color label"
 msgstr "/_Pregled/_Složi/po oznaci bo_je"
 
-#: src/mainwindow.c:591
+#: src/mainwindow.c:593
 msgid "/_View/_Sort/by _mark"
 msgstr "/_Pregled/_Složi/po _oznaci"
 
-#: src/mainwindow.c:592
+#: src/mainwindow.c:594
 msgid "/_View/_Sort/by _unread"
 msgstr "/_Pregled/_Složi/po _nepročitanom"
 
-#: src/mainwindow.c:593
+#: src/mainwindow.c:595
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/_Pregled/_Složi/po dodat_ku"
 
-#: src/mainwindow.c:595
+#: src/mainwindow.c:597
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/_Pregled/_Složi/Nemoj složiti"
 
-#: src/mainwindow.c:596 src/mainwindow.c:599
+#: src/mainwindow.c:598 src/mainwindow.c:601
 msgid "/_View/_Sort/---"
 msgstr "/_Pregled/_Složi/---"
 
-#: src/mainwindow.c:597
+#: src/mainwindow.c:599
 msgid "/_View/_Sort/Ascending"
 msgstr "/_Pregled/_Složi/Rastuće"
 
-#: src/mainwindow.c:598
+#: src/mainwindow.c:600
 msgid "/_View/_Sort/Descending"
 msgstr "/_Pregled/_Složi/Opadajuće"
 
-#: src/mainwindow.c:600
+#: src/mainwindow.c:602
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/_Pregled/_Složi/Privuci po te_mi"
 
-#: src/mainwindow.c:602
+#: src/mainwindow.c:604
 msgid "/_View/Th_read view"
 msgstr "/_Pregled/Th_read izgled"
 
-#: src/mainwindow.c:603
+#: src/mainwindow.c:605
 msgid "/_View/E_xpand all threads"
 msgstr "/_Pregled/Proširi kompletan t_hread"
 
-#: src/mainwindow.c:604
+#: src/mainwindow.c:606
 msgid "/_View/Co_llapse all threads"
 msgstr "/_Pregled/Skupi komp_letan thread"
 
-#: src/mainwindow.c:605
+#: src/mainwindow.c:607
 msgid "/_View/Set display _item..."
 msgstr "/_Pregled/Postavi po_jedinosti prikaza..."
 
-#: src/mainwindow.c:608
+#: src/mainwindow.c:610
 msgid "/_View/_Go to"
 msgstr "/_Pregled/_Idi do"
 
-#: src/mainwindow.c:609
+#: src/mainwindow.c:611
 msgid "/_View/_Go to/_Prev message"
 msgstr "/_Pregled/_Idi do/_Prethodne poruke"
 
-#: src/mainwindow.c:610
+#: src/mainwindow.c:612
 msgid "/_View/_Go to/_Next message"
 msgstr "/_Pregled/_Idi do/_Sledeće poruke"
 
-#: src/mainwindow.c:611 src/mainwindow.c:616 src/mainwindow.c:619
-#: src/mainwindow.c:624 src/mainwindow.c:629
+#: src/mainwindow.c:613 src/mainwindow.c:618 src/mainwindow.c:621
+#: src/mainwindow.c:626 src/mainwindow.c:631
 msgid "/_View/_Go to/---"
 msgstr "/_Pregled/_Idi do/---"
 
-#: src/mainwindow.c:612
+#: src/mainwindow.c:614
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/_Pregled/_Idi do/Prethodne _nepročitane poruke"
 
-#: src/mainwindow.c:614
+#: src/mainwindow.c:616
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/_Pregled/_Idi do/S_ledeće nepročitane poruke"
 
-#: src/mainwindow.c:617
+#: src/mainwindow.c:619
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/_Pregled/_Idi do/Prethodne n_ove poruke"
 
-#: src/mainwindow.c:618
+#: src/mainwindow.c:620
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/_Pregled/_Idi do/Sledeće no_ve poruke"
 
-#: src/mainwindow.c:620
+#: src/mainwindow.c:622
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/_Pregled/_Idi do/Prethodne oz_načene poruke"
 
-#: src/mainwindow.c:622
+#: src/mainwindow.c:624
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/_Pregled/_Idi do/Sledeće o_značene poruke"
 
-#: src/mainwindow.c:625
+#: src/mainwindow.c:627
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/_Pregled/_Idi do/Prethodne etiketirane poruke"
 
-#: src/mainwindow.c:627
+#: src/mainwindow.c:629
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/_Pregled/_Idi do/Sledeće etiketirane poruke"
 
-#: src/mainwindow.c:630
+#: src/mainwindow.c:632
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Pregled/_Idi do/Dru_gog direktorijuma..."
 
-#: src/mainwindow.c:639 src/messageview.c:174
+#: src/mainwindow.c:641 src/messageview.c:174
 #, fuzzy
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Pregled/_Znakovni standard/_Auto detekcija"
 
-#: src/mainwindow.c:652 src/messageview.c:187
+#: src/mainwindow.c:654 src/messageview.c:187
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr "/_Pregled/_Znakovni standard/Zapadna Evropa (ISO-8859-15)"
 
-#: src/mainwindow.c:700 src/messageview.c:227
+#: src/mainwindow.c:702 src/messageview.c:227
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Pregled/_Znakovni standard/Japan (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:702 src/messageview.c:229
+#: src/mainwindow.c:704 src/messageview.c:229
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Pregled/_Znakovni standard/Japan (_EUC-JP)"
 
-#: src/mainwindow.c:704 src/messageview.c:231
+#: src/mainwindow.c:706 src/messageview.c:231
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Pregled/_Znakovni standard/Japan (_Shift__JIS)"
 
-#: src/mainwindow.c:714 src/messageview.c:240
+#: src/mainwindow.c:716 src/messageview.c:240
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Pregled/_Znakovni standard/Tradicionalni Kineski (EUC-_TW)"
 
-#: src/mainwindow.c:716 src/messageview.c:242
+#: src/mainwindow.c:718 src/messageview.c:242
 #, fuzzy
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Pregled/_Znakovni standard/Kina (ISO-2022-_CN)"
 
-#: src/mainwindow.c:722 src/messageview.c:247
+#: src/mainwindow.c:724 src/messageview.c:247
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Pregled/_Znakovni standard/Koreja (ISO-2022-KR)"
 
-#: src/mainwindow.c:735 src/summaryview.c:464
+#: src/mainwindow.c:737 src/summaryview.c:464
 msgid "/_View/Open in new _window"
 msgstr "/_Pregled/Otvori u novom _prozoru"
 
-#: src/mainwindow.c:736 src/messageview.c:259 src/summaryview.c:466
+#: src/mainwindow.c:738 src/messageview.c:259 src/summaryview.c:466
 msgid "/_View/Mess_age source"
 msgstr "/_Pregled/Iz_vor poruke"
 
-#: src/mainwindow.c:737 src/messageview.c:260 src/summaryview.c:467
+#: src/mainwindow.c:739 src/messageview.c:260 src/summaryview.c:467
 #, fuzzy
 msgid "/_View/All _headers"
 msgstr "/_Pregled/Prikaži s_vo zaglavlje"
 
-#: src/mainwindow.c:739
+#: src/mainwindow.c:741
 msgid "/_View/_Update summary"
 msgstr "/_Pregled/_Osveži rezime"
 
-#: src/mainwindow.c:741 src/messageview.c:263
+#: src/mainwindow.c:743 src/messageview.c:263
 msgid "/_Message"
 msgstr "/_Poruka"
 
-#: src/mainwindow.c:742
+#: src/mainwindow.c:744
 #, fuzzy
 msgid "/_Message/Recei_ve"
 msgstr "/_Poruka/I_zmeni/"
 
-#: src/mainwindow.c:743
+#: src/mainwindow.c:745
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/_Poruka/Prove_ri sa svih naloga"
 
-#: src/mainwindow.c:745
+#: src/mainwindow.c:747
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/_Poruka/Prove_ri sa svih naloga"
 
-#: src/mainwindow.c:747
+#: src/mainwindow.c:749
 #, fuzzy
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/_Poruka/Prekini pri_manje"
 
-#: src/mainwindow.c:749
+#: src/mainwindow.c:751
 #, fuzzy
 msgid "/_Message/Recei_ve/---"
 msgstr "/_Poruka/I_zmeni/"
 
-#: src/mainwindow.c:750
+#: src/mainwindow.c:752
 msgid "/_Message/_Send queued messages"
 msgstr "/_Poruka/Pošalji _odložene poruke"
 
-#: src/mainwindow.c:751 src/mainwindow.c:753 src/mainwindow.c:760
-#: src/mainwindow.c:765 src/mainwindow.c:768 src/mainwindow.c:779
-#: src/mainwindow.c:781 src/mainwindow.c:784 src/messageview.c:266
+#: src/mainwindow.c:753 src/mainwindow.c:755 src/mainwindow.c:762
+#: src/mainwindow.c:767 src/mainwindow.c:770 src/mainwindow.c:781
+#: src/mainwindow.c:783 src/mainwindow.c:786 src/messageview.c:266
 #: src/messageview.c:274 src/messageview.c:279
 msgid "/_Message/---"
 msgstr "/_Poruka/---"
 
-#: src/mainwindow.c:752 src/messageview.c:264
+#: src/mainwindow.c:754 src/messageview.c:264
 msgid "/_Message/Compose _new message"
 msgstr "/_Poruka/Sastavi _novu poruku"
 
-#: src/mainwindow.c:754 src/messageview.c:267
+#: src/mainwindow.c:756 src/messageview.c:267
 msgid "/_Message/_Reply"
 msgstr "/_Poruka/O_dgovor"
 
-#: src/mainwindow.c:755
+#: src/mainwindow.c:757
 msgid "/_Message/Repl_y to"
 msgstr "/_Poruka/O_dgovori"
 
-#: src/mainwindow.c:756 src/messageview.c:268
+#: src/mainwindow.c:758 src/messageview.c:268
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Poruka/Odgovori/svim_a"
 
-#: src/mainwindow.c:757 src/messageview.c:270
+#: src/mainwindow.c:759 src/messageview.c:270
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Poruka/Odgovori/pošil_jaocu"
 
-#: src/mainwindow.c:758 src/messageview.c:272
+#: src/mainwindow.c:760 src/messageview.c:272
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Poruka/Odgovori/li_sti"
 
-#: src/mainwindow.c:761 src/messageview.c:275
+#: src/mainwindow.c:763 src/messageview.c:275
 msgid "/_Message/_Forward"
 msgstr "/_Poruka/_Prosledi"
 
-#: src/mainwindow.c:762 src/messageview.c:276
+#: src/mainwindow.c:764 src/messageview.c:276
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Poruka/P_rosledi kao spajalicu"
 
-#: src/mainwindow.c:764 src/messageview.c:278
+#: src/mainwindow.c:766 src/messageview.c:278
 msgid "/_Message/Redirec_t"
 msgstr "/_Poruka/Preus_meri"
 
-#: src/mainwindow.c:766
+#: src/mainwindow.c:768
 msgid "/_Message/M_ove..."
 msgstr "/_Poruka/Premeštanje..."
 
-#: src/mainwindow.c:767
+#: src/mainwindow.c:769
 msgid "/_Message/_Copy..."
 msgstr "/_Poruka/_Kopiranje..."
 
-#: src/mainwindow.c:769
+#: src/mainwindow.c:771
 msgid "/_Message/_Mark"
 msgstr "/_Poruka/Označi"
 
-#: src/mainwindow.c:770
+#: src/mainwindow.c:772
 msgid "/_Message/_Mark/_Mark"
 msgstr "/_Poruka/O_znači/_Označi"
 
-#: src/mainwindow.c:771
+#: src/mainwindow.c:773
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/_Poruka/O_znači/_Ukloni oznaku"
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:774
 msgid "/_Message/_Mark/---"
 msgstr "/_Poruka/O_znači/---"
 
-#: src/mainwindow.c:773
+#: src/mainwindow.c:775
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/_Poruka/O_znači/Označi kao _nepročitano"
 
-#: src/mainwindow.c:774
+#: src/mainwindow.c:776
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/_Poruka/O_znači/Označi kao _pročitano"
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:778
 #, fuzzy
 msgid "/_Message/_Mark/Mark _thread as read"
 msgstr "/_Poruka/O_znači/Označi kao _pročitano"
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:780
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/_Poruka/O_znači/Označi sve _pročitano"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:782
 msgid "/_Message/_Delete"
 msgstr "/_Poruka/Brisanje..."
 
-#: src/mainwindow.c:782
+#: src/mainwindow.c:784
 #, fuzzy
 msgid "/_Message/Set as _junk mail"
 msgstr "/_Poruka/Prover_i novu poštu"
 
-#: src/mainwindow.c:783
+#: src/mainwindow.c:785
 #, fuzzy
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/_Poruka/Prover_i novu poštu"
 
-#: src/mainwindow.c:785 src/messageview.c:280
+#: src/mainwindow.c:787 src/messageview.c:280
 msgid "/_Message/Re-_edit"
 msgstr "/_Poruka/I_zmeni/"
 
-#: src/mainwindow.c:789
+#: src/mainwindow.c:791
 #, fuzzy
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/_Alati/Dodaj pošiljaoca u adresar"
 
-#: src/mainwindow.c:792
+#: src/mainwindow.c:794
 #, fuzzy
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/_Alati/_Filtriraj poruke"
 
-#: src/mainwindow.c:794
+#: src/mainwindow.c:796
 #, fuzzy
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Alati/_Filtriraj poruke"
 
-#: src/mainwindow.c:796 src/messageview.c:287
+#: src/mainwindow.c:798 src/messageview.c:287
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Alati/_Napravi pravilo za filtriranje"
 
-#: src/mainwindow.c:797 src/messageview.c:289
+#: src/mainwindow.c:799 src/messageview.c:289
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Alati/_Napravi pravilo za filtriranje/_Automatski"
 
-#: src/mainwindow.c:799 src/messageview.c:291
+#: src/mainwindow.c:801 src/messageview.c:291
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Alati/_Napravi pravilo za filtriranje/Po _Od"
 
-#: src/mainwindow.c:801 src/messageview.c:293
+#: src/mainwindow.c:803 src/messageview.c:293
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Alati/_Napravi pravilo za filtriranje/Po _Za"
 
-#: src/mainwindow.c:803 src/messageview.c:295
+#: src/mainwindow.c:805 src/messageview.c:295
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Alati/_Napravi pravilo za filtriranje/Po _temi"
 
-#: src/mainwindow.c:806
+#: src/mainwindow.c:808
 #, fuzzy
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/_Alati/_Filtriraj poruke"
 
-#: src/mainwindow.c:808
+#: src/mainwindow.c:810
 #, fuzzy
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/_Alati/_Filtriraj poruke"
 
-#: src/mainwindow.c:815
+#: src/mainwindow.c:817
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/_Alati/_Obriši duple poruke"
 
-#: src/mainwindow.c:818
+#: src/mainwindow.c:820
 #, fuzzy
 msgid "/_Tools/E_xecute marked process"
 msgstr "Izvrši označene procese"
 
-#: src/mainwindow.c:820
+#: src/mainwindow.c:822
 msgid "/_Tools/_Log window"
 msgstr "/_Alati/Proyor za logove"
 
-#: src/mainwindow.c:822
+#: src/mainwindow.c:824
 msgid "/_Configuration"
 msgstr "/_Konfiguracija"
 
-#: src/mainwindow.c:823
+#: src/mainwindow.c:825
 msgid "/_Configuration/_Common preferences..."
 msgstr "/_Konfiguracija/U_običajene postavke..."
 
-#: src/mainwindow.c:825
+#: src/mainwindow.c:827
 msgid "/_Configuration/_Filter setting..."
 msgstr "/_Konfiguracija/Postavke _filtera..."
 
-#: src/mainwindow.c:827
+#: src/mainwindow.c:829
 msgid "/_Configuration/_Template..."
 msgstr "/_Konfiguracija/_Šablon..."
 
-#: src/mainwindow.c:829
+#: src/mainwindow.c:831
 msgid "/_Configuration/_Actions..."
 msgstr "/_Konfiguracija/_Akcije..."
 
-#: src/mainwindow.c:831
+#: src/mainwindow.c:833
 msgid "/_Configuration/---"
 msgstr "/_Konfiguracija/---"
 
-#: src/mainwindow.c:832
+#: src/mainwindow.c:834
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Konfiguracija/_Postavke za trenutni nalog..."
 
-#: src/mainwindow.c:834
+#: src/mainwindow.c:836
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Konfiguracija/Napravi _nov nalog..."
 
-#: src/mainwindow.c:836
+#: src/mainwindow.c:838
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Konfiguracija/_Izmeni naloge..."
 
-#: src/mainwindow.c:838
+#: src/mainwindow.c:840
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Konfiguracija/Promeni _trenutni nalog"
 
-#: src/mainwindow.c:842
+#: src/mainwindow.c:844
 msgid "/_Help/_Manual"
 msgstr "/_Pomoć/_Priručnik"
 
-#: src/mainwindow.c:843
+#: src/mainwindow.c:845
 msgid "/_Help/_Manual/_English"
 msgstr "/_Pomoć/_Priručnik/_Engleski"
 
-#: src/mainwindow.c:844
+#: src/mainwindow.c:846
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/_Pomoć/_Priručnik/_Japanski"
 
-#: src/mainwindow.c:845
+#: src/mainwindow.c:847
 msgid "/_Help/_FAQ"
 msgstr "/_Pomoć/_FAQ"
 
-#: src/mainwindow.c:846
+#: src/mainwindow.c:848
 msgid "/_Help/_FAQ/_English"
 msgstr "/_Pomoć/_FAQ/_Engleski"
 
-#: src/mainwindow.c:847
+#: src/mainwindow.c:849
 msgid "/_Help/_FAQ/_German"
 msgstr "/_Pomoć/_FAQ/_Nemački"
 
-#: src/mainwindow.c:848
+#: src/mainwindow.c:850
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/_Pomoć/_FAQ/_Španski"
 
-#: src/mainwindow.c:849
+#: src/mainwindow.c:851
 msgid "/_Help/_FAQ/_French"
 msgstr "/_Pomoć/_FAQ/_Francuski"
 
-#: src/mainwindow.c:850
+#: src/mainwindow.c:852
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/_Pomoć/_FAQ/_Italijanski"
 
-#: src/mainwindow.c:851
+#: src/mainwindow.c:853
 #, fuzzy
 msgid "/_Help/_Command line options"
 msgstr "Linija za neredbe nije podešena."
 
-#: src/mainwindow.c:852
+#: src/mainwindow.c:854
 msgid "/_Help/---"
 msgstr "/_Pomoć/---"
 
-#: src/mainwindow.c:895
+#: src/mainwindow.c:897
 msgid "Creating main window...\n"
 msgstr "Kreiranje glavnih prozora...\n"
 
-#: src/mainwindow.c:1071
+#: src/mainwindow.c:1073
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Glavni Prozor: prikaz boje %d nije uspeo\n"
 
-#: src/mainwindow.c:1175 src/summaryview.c:2387 src/summaryview.c:2472
+#: src/mainwindow.c:1181 src/summaryview.c:2387 src/summaryview.c:2472
 #: src/summaryview.c:4009 src/summaryview.c:4138 src/summaryview.c:4507
 msgid "done.\n"
 msgstr "gotovo.\n"
 
-#: src/mainwindow.c:1293 src/mainwindow.c:1334 src/mainwindow.c:1359
+#: src/mainwindow.c:1299 src/mainwindow.c:1340 src/mainwindow.c:1365
 msgid "Untitled"
 msgstr "Neimenovano"
 
-#: src/mainwindow.c:1360
+#: src/mainwindow.c:1366
 msgid "none"
 msgstr "ništa"
 
-#: src/mainwindow.c:1413
+#: src/mainwindow.c:1419
 #, 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:1663
+#: src/mainwindow.c:1669
 msgid "Offline"
 msgstr ""
 
-#: src/mainwindow.c:1664
+#: src/mainwindow.c:1670
 msgid "You are offline. Go online?"
 msgstr ""
 
-#: src/mainwindow.c:1681
+#: src/mainwindow.c:1687
 #, fuzzy
 msgid "Empty all trash"
 msgstr "Isprazni smeće"
 
-#: src/mainwindow.c:1682
+#: src/mainwindow.c:1688
 #, fuzzy
 msgid "Delete all messages in trash folders?"
 msgstr "Isprazniti sve poruke iz smeća?"
 
-#: src/mainwindow.c:1712
+#: src/mainwindow.c:1718
 msgid "Add mailbox"
 msgstr "Dodaj sanduče"
 
-#: src/mainwindow.c:1713
+#: src/mainwindow.c:1719
 #, fuzzy
 msgid ""
 "Specify the location of mailbox.\n"
@@ -3668,16 +3673,16 @@ msgstr ""
 "Ako je unešen postojeće sanduče, automatski\n"
 "će biti pretražen."
 
-#: src/mainwindow.c:1719 src/setup.c:49
+#: src/mainwindow.c:1725 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Sanduče`%s' već postoji."
 
-#: src/mainwindow.c:1724 src/setup.c:56
+#: src/mainwindow.c:1730 src/setup.c:56
 msgid "Mailbox"
 msgstr "Sanduče"
 
-#: src/mainwindow.c:1730 src/setup.c:62
+#: src/mainwindow.c:1736 src/setup.c:62
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3686,135 +3691,135 @@ msgstr ""
 "Kreiranje sandučeta nije uspelo.\n"
 "Možda neke datoteke već postoje ili nemate pravo pisanja u direktoriju."
 
-#: src/mainwindow.c:2198
+#: src/mainwindow.c:2206
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Direktorijumi"
 
-#: src/mainwindow.c:2217
+#: src/mainwindow.c:2225
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Poruke"
 
-#: src/mainwindow.c:2369 src/summaryview.c:418
+#: src/mainwindow.c:2377 src/summaryview.c:418
 msgid "/_Reply"
 msgstr "/Od_govor"
 
-#: src/mainwindow.c:2370
+#: src/mainwindow.c:2378
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "Odgovori svima"
 
-#: src/mainwindow.c:2371
+#: src/mainwindow.c:2379
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/O_dgovori/_pošiljaocu"
 
-#: src/mainwindow.c:2372
+#: src/mainwindow.c:2380
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/O_dgovori/na mailing _listu"
 
-#: src/mainwindow.c:2377 src/summaryview.c:425
+#: src/mainwindow.c:2385 src/summaryview.c:425
 msgid "/_Forward"
 msgstr "/P_rosledi"
 
-#: src/mainwindow.c:2378 src/summaryview.c:426
+#: src/mainwindow.c:2386 src/summaryview.c:426
 msgid "/For_ward as attachment"
 msgstr "/Pro_sledi kao dodatak"
 
-#: src/mainwindow.c:2379 src/summaryview.c:427
+#: src/mainwindow.c:2387 src/summaryview.c:427
 msgid "/Redirec_t"
 msgstr "/Pre_usmeri"
 
-#: src/mainwindow.c:2384
+#: src/mainwindow.c:2392
 msgid "Incorporate new mail"
 msgstr "Prima novu poštu"
 
-#: src/mainwindow.c:2386
+#: src/mainwindow.c:2394
 msgid "Incorporate new mail of all accounts"
 msgstr "Prima novu poštu sa svih naloga"
 
-#: src/mainwindow.c:2388
+#: src/mainwindow.c:2396
 msgid "Send queued message(s)"
 msgstr "Šalje odložene poruku/e"
 
-#: src/mainwindow.c:2390
+#: src/mainwindow.c:2398
 msgid "Compose new message"
 msgstr "Napiši novu poruku"
 
-#: src/mainwindow.c:2392
+#: src/mainwindow.c:2400
 msgid "Reply to the message"
 msgstr "Odgovari na poruku"
 
-#: src/mainwindow.c:2394
+#: src/mainwindow.c:2402
 msgid "Reply to all"
 msgstr "Odgovori svima"
 
-#: src/mainwindow.c:2396
+#: src/mainwindow.c:2404
 msgid "Forward the message"
 msgstr "Prosleđuje poruku"
 
-#: src/mainwindow.c:2398
+#: src/mainwindow.c:2406
 msgid "Delete the message"
 msgstr "Obriši poruku"
 
-#: src/mainwindow.c:2400
+#: src/mainwindow.c:2408
 #, fuzzy
 msgid "Set as junk mail"
 msgstr "Postavi kao uobičajeni"
 
-#: src/mainwindow.c:2402
+#: src/mainwindow.c:2410
 msgid "Execute marked process"
 msgstr "Izvrši označene procese"
 
-#: src/mainwindow.c:2404
+#: src/mainwindow.c:2412
 msgid "Next unread message"
 msgstr "Sledeća nepročitana poruka"
 
-#: src/mainwindow.c:2406
+#: src/mainwindow.c:2414
 #, fuzzy
 msgid "Previous unread message"
 msgstr "Sledeća nepročitana poruka"
 
-#: src/mainwindow.c:2410
+#: src/mainwindow.c:2418
 #, fuzzy
 msgid "Print message"
 msgstr "Pošalji poruku"
 
-#: src/mainwindow.c:2412
+#: src/mainwindow.c:2420
 msgid "Common preferences"
 msgstr "Uobičajena svojstva"
 
-#: src/mainwindow.c:2414 src/prefs_account_dialog.c:511
+#: src/mainwindow.c:2422 src/prefs_account_dialog.c:511
 msgid "Account preferences"
 msgstr "Podešavanje naloga"
 
-#: src/mainwindow.c:2779
+#: src/mainwindow.c:2788
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 
-#: src/mainwindow.c:2790
+#: src/mainwindow.c:2799
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 
-#: src/mainwindow.c:3062
+#: src/mainwindow.c:3071
 msgid "Exit"
 msgstr "Izlaz"
 
-#: src/mainwindow.c:3062
+#: src/mainwindow.c:3071
 msgid "Exit this program?"
 msgstr "Izlaz iz ovog programa?"
 
-#: src/mainwindow.c:3666
+#: src/mainwindow.c:3675
 #, fuzzy
 msgid "Command line options"
 msgstr "Linija za neredbe nije podešena."
 
-#: src/mainwindow.c:3679
+#: src/mainwindow.c:3688
 #, fuzzy
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Upotreba: %s [OPCIJA]...\n"
 
-#: src/mainwindow.c:3687
+#: src/mainwindow.c:3696
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -3830,7 +3835,7 @@ msgid ""
 "--version"
 msgstr ""
 
-#: src/mainwindow.c:3703
+#: src/mainwindow.c:3712
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
diff --git a/po/sv.po b/po/sv.po
index 9cdabe0a..4c21c290 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-01-31 16:49+0900\n"
+"POT-Creation-Date: 2007-01-31 17:29+0900\n"
 "PO-Revision-Date: 2004-12-05 14:40+0100\n"
 "Last-Translator: Roger Lindmark <roger.lindmark@bredband.net>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -910,7 +910,7 @@ msgstr "/A_dress/_Redigera"
 msgid "/_Address/_Delete"
 msgstr "/_A_dress/_Ta bort"
 
-#: src/addressbook.c:359 src/compose.c:673 src/mainwindow.c:787
+#: src/addressbook.c:359 src/compose.c:673 src/mainwindow.c:789
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/V_erktyg"
@@ -919,12 +919,12 @@ msgstr "/V_erktyg"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/V_erktyg/Importera _LDIF-fil"
 
-#: src/addressbook.c:361 src/compose.c:694 src/mainwindow.c:841
+#: src/addressbook.c:361 src/compose.c:694 src/mainwindow.c:843
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Hjälp"
 
-#: src/addressbook.c:362 src/compose.c:695 src/mainwindow.c:853
+#: src/addressbook.c:362 src/compose.c:695 src/mainwindow.c:855
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Hjälp/_Om"
@@ -966,7 +966,7 @@ msgstr "/_Ta bort"
 msgid "E-Mail address"
 msgstr "E-postadress"
 
-#: src/addressbook.c:496 src/compose.c:4873 src/mainwindow.c:2408
+#: src/addressbook.c:496 src/compose.c:4873 src/mainwindow.c:2416
 #: src/prefs_common_dialog.c:2274
 msgid "Address book"
 msgstr "Adressbok"
@@ -1180,7 +1180,7 @@ msgstr "Vanlig adress"
 msgid "Personal address"
 msgstr "Privat adress"
 
-#: src/alertpanel.c:142 src/compose.c:5717 src/main.c:638
+#: src/alertpanel.c:142 src/compose.c:5720 src/main.c:638
 msgid "Notice"
 msgstr "Notera"
 
@@ -1348,9 +1348,9 @@ msgid "/_View/_Reply to"
 msgstr "/_Visa/_Svara till"
 
 #: src/compose.c:578 src/compose.c:580 src/compose.c:582 src/compose.c:584
-#: src/compose.c:587 src/mainwindow.c:577 src/mainwindow.c:580
-#: src/mainwindow.c:607 src/mainwindow.c:631 src/mainwindow.c:734
-#: src/mainwindow.c:738 src/messageview.c:258
+#: src/compose.c:587 src/mainwindow.c:579 src/mainwindow.c:582
+#: src/mainwindow.c:609 src/mainwindow.c:633 src/mainwindow.c:736
+#: src/mainwindow.c:740 src/messageview.c:258
 msgid "/_View/---"
 msgstr "/_Visa/---"
 
@@ -1371,7 +1371,7 @@ msgstr "/_Visa/_Bilagor"
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/_Visa/_Gå till/_En annan mapp..."
 
-#: src/compose.c:593 src/mainwindow.c:638 src/messageview.c:173
+#: src/compose.c:593 src/mainwindow.c:640 src/messageview.c:173
 msgid "/_View/Character _encoding"
 msgstr "/_Visa/_Teckenkodning"
 
@@ -1382,115 +1382,115 @@ msgstr "/_Visa/_Teckenkodning/_Automatisk"
 #: src/compose.c:596 src/compose.c:602 src/compose.c:608 src/compose.c:612
 #: src/compose.c:620 src/compose.c:624 src/compose.c:630 src/compose.c:636
 #: src/compose.c:640 src/compose.c:650 src/compose.c:654 src/compose.c:662
-#: src/compose.c:666 src/mainwindow.c:634 src/mainwindow.c:641
+#: src/compose.c:666 src/mainwindow.c:636 src/mainwindow.c:643
 #: src/messageview.c:169
 msgid "/_View/Character _encoding/---"
 msgstr "/_Visa/_Teckenkodning/---"
 
-#: src/compose.c:598 src/mainwindow.c:642 src/messageview.c:177
+#: src/compose.c:598 src/mainwindow.c:644 src/messageview.c:177
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Visa/_Teckenkodning/7 bitars ascii (US-ASC_II)"
 
-#: src/compose.c:600 src/mainwindow.c:644 src/messageview.c:180
+#: src/compose.c:600 src/mainwindow.c:646 src/messageview.c:180
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Visa/_Teckenkodning/Unicode (_UTF-8)"
 
-#: src/compose.c:604 src/mainwindow.c:648 src/messageview.c:183
+#: src/compose.c:604 src/mainwindow.c:650 src/messageview.c:183
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Visa/_Teckenkodning/Västeuropeisk (ISO-8859-_1)"
 
-#: src/compose.c:606 src/mainwindow.c:650 src/messageview.c:185
+#: src/compose.c:606 src/mainwindow.c:652 src/messageview.c:185
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Visa/_Teckenkodning/_Västeuropeisk (ISO-8859-15)"
 
-#: src/compose.c:610 src/mainwindow.c:656 src/messageview.c:190
+#: src/compose.c:610 src/mainwindow.c:658 src/messageview.c:190
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Visa/_Teckenkodning/Centraleuropeisk (ISO-8859-_2)"
 
-#: src/compose.c:614 src/mainwindow.c:660 src/messageview.c:193
+#: src/compose.c:614 src/mainwindow.c:662 src/messageview.c:193
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Visa/_Teckenkodning/_Baltisk (ISO-8859-13)"
 
-#: src/compose.c:616 src/mainwindow.c:662 src/messageview.c:195
+#: src/compose.c:616 src/mainwindow.c:664 src/messageview.c:195
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Visa/_Teckenkodning/Baltisk (ISO-8859-_4)"
 
-#: src/compose.c:618 src/mainwindow.c:664 src/messageview.c:197
+#: src/compose.c:618 src/mainwindow.c:666 src/messageview.c:197
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/_Visa/_Teckenkodning/Kyrillisk (Windows-1251)"
 
-#: src/compose.c:622 src/mainwindow.c:668 src/messageview.c:200
+#: src/compose.c:622 src/mainwindow.c:670 src/messageview.c:200
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Visa/_Teckenkodning/Grekisk (ISO-8859-_7)"
 
-#: src/compose.c:626 src/mainwindow.c:672 src/messageview.c:203
+#: src/compose.c:626 src/mainwindow.c:674 src/messageview.c:203
 #, fuzzy
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/_Visa/_Teckenkodning/Baltisk (ISO-8859-_4)"
 
-#: src/compose.c:628 src/mainwindow.c:674 src/messageview.c:205
+#: src/compose.c:628 src/mainwindow.c:676 src/messageview.c:205
 #, fuzzy
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/_Visa/_Teckenkodning/Kyrillisk (Windows-1251)"
 
-#: src/compose.c:632 src/mainwindow.c:678 src/messageview.c:208
+#: src/compose.c:632 src/mainwindow.c:680 src/messageview.c:208
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Visa/_Teckenkodning/Hebreisk (ISO-8859-_8)"
 
-#: src/compose.c:634 src/mainwindow.c:680 src/messageview.c:210
+#: src/compose.c:634 src/mainwindow.c:682 src/messageview.c:210
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Visa/_Teckenkodning/Hebreisk (Windows-1255)"
 
-#: src/compose.c:638 src/mainwindow.c:684 src/messageview.c:213
+#: src/compose.c:638 src/mainwindow.c:686 src/messageview.c:213
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Visa/_Teckenkodning/Turkisk (ISO-8859-_9)"
 
-#: src/compose.c:642 src/mainwindow.c:688 src/messageview.c:216
+#: src/compose.c:642 src/mainwindow.c:690 src/messageview.c:216
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Visa/_Teckenkodning/Kyrillisk (ISO-8859-_5)"
 
-#: src/compose.c:644 src/mainwindow.c:690 src/messageview.c:218
+#: src/compose.c:644 src/mainwindow.c:692 src/messageview.c:218
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Visa/_Teckenkodning/Kyrillisk (KOI8-_R)"
 
-#: src/compose.c:646 src/mainwindow.c:692 src/messageview.c:220
+#: src/compose.c:646 src/mainwindow.c:694 src/messageview.c:220
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Visa/_Teckenkodning/Kyrillisk (KOI8-_U)"
 
-#: src/compose.c:648 src/mainwindow.c:694 src/messageview.c:222
+#: src/compose.c:648 src/mainwindow.c:696 src/messageview.c:222
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Visa/_Teckenkodning/Kyrillisk (Windows-1251)"
 
-#: src/compose.c:652 src/mainwindow.c:698 src/messageview.c:225
+#: src/compose.c:652 src/mainwindow.c:700 src/messageview.c:225
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Visa/_Teckenkodning/Japansk (ISO-2022-_JP)"
 
-#: src/compose.c:656 src/mainwindow.c:708 src/messageview.c:234
+#: src/compose.c:656 src/mainwindow.c:710 src/messageview.c:234
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Visa/_Teckenkodning/Förenklad kinesisk (_GB2312)"
 
-#: src/compose.c:658 src/mainwindow.c:710 src/messageview.c:236
+#: src/compose.c:658 src/mainwindow.c:712 src/messageview.c:236
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Visa/_Teckenkodning/Förenklad kinesisk (_GBK)"
 
-#: src/compose.c:660 src/mainwindow.c:712 src/messageview.c:238
+#: src/compose.c:660 src/mainwindow.c:714 src/messageview.c:238
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Visa/_Teckenkodning/Traditionell kinesisk (_Big5)"
 
-#: src/compose.c:664 src/mainwindow.c:720 src/messageview.c:245
+#: src/compose.c:664 src/mainwindow.c:722 src/messageview.c:245
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Visa/_Teckenkodning/Koreansk (EUC-_KR)"
 
-#: src/compose.c:668 src/mainwindow.c:726 src/messageview.c:250
+#: src/compose.c:668 src/mainwindow.c:728 src/messageview.c:250
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Visa/_Teckenkodning/Thai (TIS-620)"
 
-#: src/compose.c:670 src/mainwindow.c:728 src/messageview.c:252
+#: src/compose.c:670 src/mainwindow.c:730 src/messageview.c:252
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Visa/_Teckenkodning/Thai (Windows-874)"
 
-#: src/compose.c:674 src/mainwindow.c:788 src/messageview.c:283
+#: src/compose.c:674 src/mainwindow.c:790 src/messageview.c:283
 msgid "/_Tools/_Address book"
 msgstr "/V_erktyg/_Adressbok"
 
@@ -1498,13 +1498,13 @@ msgstr "/V_erktyg/_Adressbok"
 msgid "/_Tools/_Template"
 msgstr "/V_erktyg/_Mall"
 
-#: src/compose.c:677 src/mainwindow.c:812 src/messageview.c:299
+#: src/compose.c:677 src/mainwindow.c:814 src/messageview.c:299
 msgid "/_Tools/Actio_ns"
 msgstr "/V_erktyg/_Åtgärder"
 
-#: src/compose.c:679 src/compose.c:683 src/compose.c:689 src/mainwindow.c:791
-#: src/mainwindow.c:805 src/mainwindow.c:810 src/mainwindow.c:813
-#: src/mainwindow.c:817 src/mainwindow.c:819 src/messageview.c:286
+#: src/compose.c:679 src/compose.c:683 src/compose.c:689 src/mainwindow.c:793
+#: src/mainwindow.c:807 src/mainwindow.c:812 src/mainwindow.c:815
+#: src/mainwindow.c:819 src/mainwindow.c:821 src/messageview.c:286
 #: src/messageview.c:298
 msgid "/_Tools/---"
 msgstr "/V_erktyg/---"
@@ -1708,7 +1708,7 @@ msgstr "PGP Tecken"
 msgid "PGP Encrypt"
 msgstr "PGP Kryptera"
 
-#: src/compose.c:4442 src/compose.c:5543
+#: src/compose.c:4442 src/compose.c:5546
 msgid "MIME type"
 msgstr "MIME-typ"
 
@@ -1751,36 +1751,36 @@ msgstr "Redigera med extern redigerare"
 msgid "Wrap all long lines"
 msgstr "Radbryt långa rader"
 
-#: src/compose.c:5439
+#: src/compose.c:5442
 msgid "Invalid MIME type."
 msgstr "Ogiltig MIME-typ"
 
-#: src/compose.c:5457
+#: src/compose.c:5460
 msgid "File doesn't exist or is empty."
 msgstr "Filen finns inte eller är tom."
 
-#: src/compose.c:5525
+#: src/compose.c:5528
 msgid "Properties"
 msgstr "Egenskaper"
 
-#: src/compose.c:5545 src/prefs_common_dialog.c:1504
+#: src/compose.c:5548 src/prefs_common_dialog.c:1504
 msgid "Encoding"
 msgstr "Kodning"
 
-#: src/compose.c:5568 src/prefs_folder_item.c:202
+#: src/compose.c:5571 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Sökväg"
 
-#: src/compose.c:5569
+#: src/compose.c:5572
 msgid "File name"
 msgstr "Filnamn"
 
-#: src/compose.c:5659
+#: src/compose.c:5662
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Ogiltig kommandorad för extern redigerare: \"%s\"\n"
 
-#: src/compose.c:5714
+#: src/compose.c:5717
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1790,48 +1790,48 @@ msgstr ""
 "Framtvinga avslutning av processen?\n"
 "processgrupps-id: %d"
 
-#: src/compose.c:6040 src/mainwindow.c:2752
+#: src/compose.c:6043 src/mainwindow.c:2761
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:6156 src/compose.c:6161 src/compose.c:6167
+#: src/compose.c:6159 src/compose.c:6164 src/compose.c:6170
 msgid "Can't queue the message."
 msgstr "Kan inte lägga meddelandet i kö."
 
-#: src/compose.c:6258
+#: src/compose.c:6261
 msgid "Select files"
 msgstr "Välj filer"
 
-#: src/compose.c:6281
+#: src/compose.c:6284
 msgid "Select file"
 msgstr "Välj fil"
 
-#: src/compose.c:6316
+#: src/compose.c:6319
 msgid "Save message"
 msgstr "Spara meddelande"
 
-#: src/compose.c:6317
+#: src/compose.c:6320
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Detta meddelande har ändrats. Spara det till utkastmappen?"
 
-#: src/compose.c:6319
+#: src/compose.c:6322
 msgid "Close _without saving"
 msgstr "Stäng _utan att spara"
 
-#: src/compose.c:6361
+#: src/compose.c:6364
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Vill du använda mallen \"%s\" ?"
 
-#: src/compose.c:6363
+#: src/compose.c:6366
 msgid "Apply template"
 msgstr "Använd mall"
 
-#: src/compose.c:6364
+#: src/compose.c:6367
 msgid "_Replace"
 msgstr "_Ersätt"
 
-#: src/compose.c:6364
+#: src/compose.c:6367
 msgid "_Insert"
 msgstr "_Infoga"
 
@@ -2288,12 +2288,12 @@ msgstr "Ställer in mappinfo...\n"
 msgid "Setting folder info..."
 msgstr "Ställer in mappinfo..."
 
-#: src/folderview.c:868 src/mainwindow.c:3748 src/setup.c:80
+#: src/folderview.c:868 src/mainwindow.c:3757 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Söker igenom mapp %s%c%s..."
 
-#: src/folderview.c:872 src/mainwindow.c:3753 src/setup.c:85
+#: src/folderview.c:872 src/mainwindow.c:3762 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Söker igenom mapp %s ..."
@@ -3058,540 +3058,545 @@ msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/_Visa/_Visa eller dölj/_Verktygsrad/Ikoner _och text"
 
 #: src/mainwindow.c:566
-msgid "/_View/Show or hi_de/_Toolbar/_Icon"
+#, fuzzy
+msgid "/_View/Show or hi_de/_Toolbar/Text at the _right of icon"
 msgstr "/_Visa/_Visa eller dölj/_Verktygsrad/_Ikoner"
 
 #: src/mainwindow.c:568
+msgid "/_View/Show or hi_de/_Toolbar/_Icon"
+msgstr "/_Visa/_Visa eller dölj/_Verktygsrad/_Ikoner"
+
+#: src/mainwindow.c:570
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/_Visa/_Visa eller dölj/_Verktygsrad/_Text"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:572
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/_Visa/_Visa eller dölj/_Verktygsrad/I_ngetdera"
 
-#: src/mainwindow.c:572
+#: src/mainwindow.c:574
 #, fuzzy
 msgid "/_View/Show or hi_de/_Search bar"
 msgstr "/_Visa/_Visa eller dölj/_Statusrad"
 
-#: src/mainwindow.c:574
+#: src/mainwindow.c:576
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/_Visa/_Visa eller dölj/_Statusrad"
 
-#: src/mainwindow.c:576
+#: src/mainwindow.c:578
 #, fuzzy
 msgid "/_View/_Customize toolbar..."
 msgstr "/_Visa/_Gå till/_En annan mapp..."
 
-#: src/mainwindow.c:578
+#: src/mainwindow.c:580
 msgid "/_View/Separate f_older tree"
 msgstr "/_Visa/Separat ma_ppträd"
 
-#: src/mainwindow.c:579
+#: src/mainwindow.c:581
 msgid "/_View/Separate _message view"
 msgstr "/_Visa/Separat m_eddelandevy"
 
-#: src/mainwindow.c:581
+#: src/mainwindow.c:583
 msgid "/_View/_Sort"
 msgstr "/_Visa/_Sortera"
 
-#: src/mainwindow.c:582
+#: src/mainwindow.c:584
 msgid "/_View/_Sort/by _number"
 msgstr "/_Visa/_Sortera/efter _nummer"
 
-#: src/mainwindow.c:583
+#: src/mainwindow.c:585
 msgid "/_View/_Sort/by s_ize"
 msgstr "/_Visa/_Sortera/efter stor_lek"
 
-#: src/mainwindow.c:584
+#: src/mainwindow.c:586
 msgid "/_View/_Sort/by _date"
 msgstr "/_Visa/_Sortera/efter _datum"
 
-#: src/mainwindow.c:585
+#: src/mainwindow.c:587
 msgid "/_View/_Sort/by t_hread date"
 msgstr "/_Visa/_Sortera/efter _tråddatum"
 
-#: src/mainwindow.c:586
+#: src/mainwindow.c:588
 msgid "/_View/_Sort/by _from"
 msgstr "/_Visa/_Sortera/efter _från"
 
-#: src/mainwindow.c:587
+#: src/mainwindow.c:589
 msgid "/_View/_Sort/by _recipient"
 msgstr "/_Visa/_Sortera/efter _mottagare"
 
-#: src/mainwindow.c:588
+#: src/mainwindow.c:590
 msgid "/_View/_Sort/by _subject"
 msgstr "/_Visa/_Sortera/efter _ämne"
 
-#: src/mainwindow.c:589
+#: src/mainwindow.c:591
 msgid "/_View/_Sort/by _color label"
 msgstr "/_Visa/_Sortera/efter fä_rgmarkering"
 
-#: src/mainwindow.c:591
+#: src/mainwindow.c:593
 msgid "/_View/_Sort/by _mark"
 msgstr "/_Visa/_Sortera/efter mar_kering"
 
-#: src/mainwindow.c:592
+#: src/mainwindow.c:594
 msgid "/_View/_Sort/by _unread"
 msgstr "/_Visa/_Sortera/efter _oläst"
 
-#: src/mainwindow.c:593
+#: src/mainwindow.c:595
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/_Visa/_Sortera/efter _bilaga"
 
-#: src/mainwindow.c:595
+#: src/mainwindow.c:597
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/_Visa/_Sortera/_inte alls"
 
-#: src/mainwindow.c:596 src/mainwindow.c:599
+#: src/mainwindow.c:598 src/mainwindow.c:601
 msgid "/_View/_Sort/---"
 msgstr "/_Visa/_Sortera/---"
 
-#: src/mainwindow.c:597
+#: src/mainwindow.c:599
 msgid "/_View/_Sort/Ascending"
 msgstr "/_Visa/_Sortera/Uppstigande"
 
-#: src/mainwindow.c:598
+#: src/mainwindow.c:600
 msgid "/_View/_Sort/Descending"
 msgstr "/_Visa/_Sortera/Nedstigande"
 
-#: src/mainwindow.c:600
+#: src/mainwindow.c:602
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/_Visa/_Sortera/_Attrahera efter ärende"
 
-#: src/mainwindow.c:602
+#: src/mainwindow.c:604
 msgid "/_View/Th_read view"
 msgstr "/_Visa/_Trådvy"
 
-#: src/mainwindow.c:603
+#: src/mainwindow.c:605
 msgid "/_View/E_xpand all threads"
 msgstr "/_Visa/E_xpandera alla trådar"
 
-#: src/mainwindow.c:604
+#: src/mainwindow.c:606
 msgid "/_View/Co_llapse all threads"
 msgstr "/_Visa/Ko_llapsa alla trådar"
 
-#: src/mainwindow.c:605
+#: src/mainwindow.c:607
 msgid "/_View/Set display _item..."
 msgstr "/_Visa/_Poster i summeringsvyn..."
 
-#: src/mainwindow.c:608
+#: src/mainwindow.c:610
 msgid "/_View/_Go to"
 msgstr "/_Visa/_Gå till"
 
-#: src/mainwindow.c:609
+#: src/mainwindow.c:611
 msgid "/_View/_Go to/_Prev message"
 msgstr "/_Visa/_Gå till/_Föreg. meddelande"
 
-#: src/mainwindow.c:610
+#: src/mainwindow.c:612
 msgid "/_View/_Go to/_Next message"
 msgstr "/_Visa/_Gå till/_Nästa meddelande"
 
-#: src/mainwindow.c:611 src/mainwindow.c:616 src/mainwindow.c:619
-#: src/mainwindow.c:624 src/mainwindow.c:629
+#: src/mainwindow.c:613 src/mainwindow.c:618 src/mainwindow.c:621
+#: src/mainwindow.c:626 src/mainwindow.c:631
 msgid "/_View/_Go to/---"
 msgstr "/_Visa/_Gå till/---"
 
-#: src/mainwindow.c:612
+#: src/mainwindow.c:614
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/_Visa/_Gå till/F_öreg. olästa meddelande"
 
-#: src/mainwindow.c:614
+#: src/mainwindow.c:616
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/_Visa/_Gå till/N_ästa olästa meddelande"
 
-#: src/mainwindow.c:617
+#: src/mainwindow.c:619
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/_Visa/_Gå till/Föreg. n_ya meddelande"
 
-#: src/mainwindow.c:618
+#: src/mainwindow.c:620
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/_Visa/_Gå till/Näs_ta nya meddelande"
 
-#: src/mainwindow.c:620
+#: src/mainwindow.c:622
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/_Visa/_Gå till/Föreg. _markerade meddelande"
 
-#: src/mainwindow.c:622
+#: src/mainwindow.c:624
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/_Visa/_Gå till/Nästa m_arkerade meddelande"
 
-#: src/mainwindow.c:625
+#: src/mainwindow.c:627
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/_Visa/_Gå till/Föreg. _färgade meddelande"
 
-#: src/mainwindow.c:627
+#: src/mainwindow.c:629
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/_Visa/_Gå till/Nästa fä_rgade meddelande"
 
-#: src/mainwindow.c:630
+#: src/mainwindow.c:632
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Visa/_Gå till/_En annan mapp..."
 
-#: src/mainwindow.c:639 src/messageview.c:174
+#: src/mainwindow.c:641 src/messageview.c:174
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Visa/_Teckenkodning/_Automatisk igenkänning"
 
-#: src/mainwindow.c:652 src/messageview.c:187
+#: src/mainwindow.c:654 src/messageview.c:187
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr "/_Visa/_Teckenkodning/_Västeuropeisk (ISO-8859-15)"
 
-#: src/mainwindow.c:700 src/messageview.c:227
+#: src/mainwindow.c:702 src/messageview.c:227
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Visa/_Teckenkodning/Japansk (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:702 src/messageview.c:229
+#: src/mainwindow.c:704 src/messageview.c:229
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Visa/_Teckenkodning/Japansk (_EUC-JP)"
 
-#: src/mainwindow.c:704 src/messageview.c:231
+#: src/mainwindow.c:706 src/messageview.c:231
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Visa/_Teckenkodning/Japansk (_Shift__JIS)"
 
-#: src/mainwindow.c:714 src/messageview.c:240
+#: src/mainwindow.c:716 src/messageview.c:240
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Visa/_Teckenkodning/Traditionell kinesisk (EUC-_TW)"
 
-#: src/mainwindow.c:716 src/messageview.c:242
+#: src/mainwindow.c:718 src/messageview.c:242
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Visa/_Teckenkodning/Kinesisk (ISO-2022-_CN)"
 
-#: src/mainwindow.c:722 src/messageview.c:247
+#: src/mainwindow.c:724 src/messageview.c:247
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Visa/_Teckenkodning/Koreansk (ISO-2022-KR)"
 
-#: src/mainwindow.c:735 src/summaryview.c:464
+#: src/mainwindow.c:737 src/summaryview.c:464
 msgid "/_View/Open in new _window"
 msgstr "/_Visa/_Öppna i nytt fönster"
 
-#: src/mainwindow.c:736 src/messageview.c:259 src/summaryview.c:466
+#: src/mainwindow.c:738 src/messageview.c:259 src/summaryview.c:466
 msgid "/_View/Mess_age source"
 msgstr "/_Visa/_Meddelandekällkod"
 
-#: src/mainwindow.c:737 src/messageview.c:260 src/summaryview.c:467
+#: src/mainwindow.c:739 src/messageview.c:260 src/summaryview.c:467
 #, fuzzy
 msgid "/_View/All _headers"
 msgstr "/_Visa/_Hela brevhuvudet"
 
-#: src/mainwindow.c:739
+#: src/mainwindow.c:741
 msgid "/_View/_Update summary"
 msgstr "/_Visa/_Uppdatera summering"
 
-#: src/mainwindow.c:741 src/messageview.c:263
+#: src/mainwindow.c:743 src/messageview.c:263
 msgid "/_Message"
 msgstr "/_Meddelande"
 
-#: src/mainwindow.c:742
+#: src/mainwindow.c:744
 msgid "/_Message/Recei_ve"
 msgstr "/_Meddelande/Mott_ag"
 
-#: src/mainwindow.c:743
+#: src/mainwindow.c:745
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/_Meddelande/Mottag/Hämta från _detta konto"
 
-#: src/mainwindow.c:745
+#: src/mainwindow.c:747
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/_Meddelande/Mottag/Hämta från alla _konton"
 
-#: src/mainwindow.c:747
+#: src/mainwindow.c:749
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/_Meddelande/Mottag/Avbryt hämtnin_g"
 
-#: src/mainwindow.c:749
+#: src/mainwindow.c:751
 msgid "/_Message/Recei_ve/---"
 msgstr "/_Meddelande/Mottag/---"
 
-#: src/mainwindow.c:750
+#: src/mainwindow.c:752
 msgid "/_Message/_Send queued messages"
 msgstr "/_Meddelande/Skicka _köade meddelanden"
 
-#: src/mainwindow.c:751 src/mainwindow.c:753 src/mainwindow.c:760
-#: src/mainwindow.c:765 src/mainwindow.c:768 src/mainwindow.c:779
-#: src/mainwindow.c:781 src/mainwindow.c:784 src/messageview.c:266
+#: src/mainwindow.c:753 src/mainwindow.c:755 src/mainwindow.c:762
+#: src/mainwindow.c:767 src/mainwindow.c:770 src/mainwindow.c:781
+#: src/mainwindow.c:783 src/mainwindow.c:786 src/messageview.c:266
 #: src/messageview.c:274 src/messageview.c:279
 msgid "/_Message/---"
 msgstr "/_Meddelande/---"
 
-#: src/mainwindow.c:752 src/messageview.c:264
+#: src/mainwindow.c:754 src/messageview.c:264
 msgid "/_Message/Compose _new message"
 msgstr "/_Meddelande/Skriv _nytt meddelande"
 
-#: src/mainwindow.c:754 src/messageview.c:267
+#: src/mainwindow.c:756 src/messageview.c:267
 msgid "/_Message/_Reply"
 msgstr "/_Meddelande/Sva_ra"
 
-#: src/mainwindow.c:755
+#: src/mainwindow.c:757
 msgid "/_Message/Repl_y to"
 msgstr "/_Meddelande/_Svara till"
 
-#: src/mainwindow.c:756 src/messageview.c:268
+#: src/mainwindow.c:758 src/messageview.c:268
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Meddelande/_Svara till/a_lla"
 
-#: src/mainwindow.c:757 src/messageview.c:270
+#: src/mainwindow.c:759 src/messageview.c:270
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Meddelande/_Svara till/_avsändaren"
 
-#: src/mainwindow.c:758 src/messageview.c:272
+#: src/mainwindow.c:760 src/messageview.c:272
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Meddelande/_Svara till/_e-postlista"
 
-#: src/mainwindow.c:761 src/messageview.c:275
+#: src/mainwindow.c:763 src/messageview.c:275
 msgid "/_Message/_Forward"
 msgstr "/_Meddelande/Vi_darebefordra"
 
-#: src/mainwindow.c:762 src/messageview.c:276
+#: src/mainwindow.c:764 src/messageview.c:276
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Meddelande/Vidarebefordra som bil_aga"
 
-#: src/mainwindow.c:764 src/messageview.c:278
+#: src/mainwindow.c:766 src/messageview.c:278
 msgid "/_Message/Redirec_t"
 msgstr "/_Meddelande/_Omdirigera"
 
-#: src/mainwindow.c:766
+#: src/mainwindow.c:768
 msgid "/_Message/M_ove..."
 msgstr "/_Meddelande/Fl_ytta..."
 
-#: src/mainwindow.c:767
+#: src/mainwindow.c:769
 msgid "/_Message/_Copy..."
 msgstr "/_Meddelande/_Kopiera"
 
-#: src/mainwindow.c:769
+#: src/mainwindow.c:771
 msgid "/_Message/_Mark"
 msgstr "/_Meddelande/_Markera"
 
-#: src/mainwindow.c:770
+#: src/mainwindow.c:772
 msgid "/_Message/_Mark/_Mark"
 msgstr "/_Meddelande/_Markera/_Markera"
 
-#: src/mainwindow.c:771
+#: src/mainwindow.c:773
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/_Meddelande/_Markera/_Avmarkera"
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:774
 msgid "/_Message/_Mark/---"
 msgstr "/_Meddelande/_Markera/---"
 
-#: src/mainwindow.c:773
+#: src/mainwindow.c:775
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/_Meddelande/_Markera/Markera som _oläst"
 
-#: src/mainwindow.c:774
+#: src/mainwindow.c:776
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/_Meddelande/_Markera/Markera som _läst"
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:778
 #, fuzzy
 msgid "/_Message/_Mark/Mark _thread as read"
 msgstr "/_Meddelande/_Markera/Markera som _läst"
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:780
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/_Meddelande/_Markera/Markera alla som l_ästa"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:782
 msgid "/_Message/_Delete"
 msgstr "/_Meddelande/_Ta bort"
 
-#: src/mainwindow.c:782
+#: src/mainwindow.c:784
 msgid "/_Message/Set as _junk mail"
 msgstr "/_Meddelande/Sätt som _skräppost"
 
-#: src/mainwindow.c:783
+#: src/mainwindow.c:785
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/_Meddelande/Sätt som inte skr_äppost"
 
-#: src/mainwindow.c:785 src/messageview.c:280
+#: src/mainwindow.c:787 src/messageview.c:280
 msgid "/_Message/Re-_edit"
 msgstr "/_Meddelande/Redigera _om"
 
-#: src/mainwindow.c:789
+#: src/mainwindow.c:791
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/V_erktyg/Lägg till avsändaren i adressbo_k..."
 
-#: src/mainwindow.c:792
+#: src/mainwindow.c:794
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/V_erktyg/_Filtrera alla meddelanden i mappen"
 
-#: src/mainwindow.c:794
+#: src/mainwindow.c:796
 msgid "/_Tools/Filter _selected messages"
 msgstr "/V_erktyg/Filtrera _valda meddelanden"
 
-#: src/mainwindow.c:796 src/messageview.c:287
+#: src/mainwindow.c:798 src/messageview.c:287
 msgid "/_Tools/_Create filter rule"
 msgstr "/V_erktyg/_Skapa filterregel"
 
-#: src/mainwindow.c:797 src/messageview.c:289
+#: src/mainwindow.c:799 src/messageview.c:289
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/V_erktyg/_Skapa filterregel/_Automatiskt"
 
-#: src/mainwindow.c:799 src/messageview.c:291
+#: src/mainwindow.c:801 src/messageview.c:291
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/V_erktyg/_Skapa filterregel/genom _Från"
 
-#: src/mainwindow.c:801 src/messageview.c:293
+#: src/mainwindow.c:803 src/messageview.c:293
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/V_erktyg/_Skapa filterregel/genom _Till"
 
-#: src/mainwindow.c:803 src/messageview.c:295
+#: src/mainwindow.c:805 src/messageview.c:295
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/V_erktyg/_Skapa filterregel/genom _Ämne"
 
-#: src/mainwindow.c:806
+#: src/mainwindow.c:808
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/V_erktyg/Filtrera _skräppost i mappen"
 
-#: src/mainwindow.c:808
+#: src/mainwindow.c:810
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/V_erktyg/Filtrera skräp_post i valda meddelanden"
 
-#: src/mainwindow.c:815
+#: src/mainwindow.c:817
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/V_erktyg/Ta bort meddelande_dubbletter"
 
-#: src/mainwindow.c:818
+#: src/mainwindow.c:820
 #, fuzzy
 msgid "/_Tools/E_xecute marked process"
 msgstr "Kör markerad process"
 
-#: src/mainwindow.c:820
+#: src/mainwindow.c:822
 msgid "/_Tools/_Log window"
 msgstr "/V_erktyg/_Loggfönster"
 
-#: src/mainwindow.c:822
+#: src/mainwindow.c:824
 msgid "/_Configuration"
 msgstr "/_Konfiguration"
 
-#: src/mainwindow.c:823
+#: src/mainwindow.c:825
 msgid "/_Configuration/_Common preferences..."
 msgstr "/_Konfiguration/_Allmänna inställningar..."
 
-#: src/mainwindow.c:825
+#: src/mainwindow.c:827
 msgid "/_Configuration/_Filter setting..."
 msgstr "/_Konfiguration/_Filterinställningar..."
 
-#: src/mainwindow.c:827
+#: src/mainwindow.c:829
 msgid "/_Configuration/_Template..."
 msgstr "/_Konfiguration/_Mall..."
 
-#: src/mainwindow.c:829
+#: src/mainwindow.c:831
 msgid "/_Configuration/_Actions..."
 msgstr "/_Konfiguration/_Åtgärder..."
 
-#: src/mainwindow.c:831
+#: src/mainwindow.c:833
 msgid "/_Configuration/---"
 msgstr "/_Konfiguration/---"
 
-#: src/mainwindow.c:832
+#: src/mainwindow.c:834
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Konfiguration/_Inställningar för aktuellt konto..."
 
-#: src/mainwindow.c:834
+#: src/mainwindow.c:836
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Konfiguration/Skapa _nytt konto..."
 
-#: src/mainwindow.c:836
+#: src/mainwindow.c:838
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Konfiguration/_Redigera konton..."
 
-#: src/mainwindow.c:838
+#: src/mainwindow.c:840
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Konfiguration/_Ändra aktuellt konto"
 
-#: src/mainwindow.c:842
+#: src/mainwindow.c:844
 msgid "/_Help/_Manual"
 msgstr "/_Hjälp/_Handbok"
 
-#: src/mainwindow.c:843
+#: src/mainwindow.c:845
 msgid "/_Help/_Manual/_English"
 msgstr "/_Hjälp/_Handbok/_Engelsk"
 
-#: src/mainwindow.c:844
+#: src/mainwindow.c:846
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/_Hjälp/_Handbok/_Japansk"
 
-#: src/mainwindow.c:845
+#: src/mainwindow.c:847
 msgid "/_Help/_FAQ"
 msgstr "/_Hjälp/_FAQ"
 
-#: src/mainwindow.c:846
+#: src/mainwindow.c:848
 msgid "/_Help/_FAQ/_English"
 msgstr "/_Hjälp/_FAQ/_Engelsk"
 
-#: src/mainwindow.c:847
+#: src/mainwindow.c:849
 msgid "/_Help/_FAQ/_German"
 msgstr "/_Hjälp/_FAQ/_Tysk"
 
-#: src/mainwindow.c:848
+#: src/mainwindow.c:850
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/_Hjälp/_FAQ/_Spansk"
 
-#: src/mainwindow.c:849
+#: src/mainwindow.c:851
 msgid "/_Help/_FAQ/_French"
 msgstr "/_Hjälp/_FAQ/_Fransk"
 
-#: src/mainwindow.c:850
+#: src/mainwindow.c:852
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/_Hjälp/_FAQ/_Italiensk"
 
-#: src/mainwindow.c:851
+#: src/mainwindow.c:853
 #, fuzzy
 msgid "/_Help/_Command line options"
 msgstr "Kommandorad saknas."
 
-#: src/mainwindow.c:852
+#: src/mainwindow.c:854
 msgid "/_Help/---"
 msgstr "/_Hjälp/---"
 
-#: src/mainwindow.c:895
+#: src/mainwindow.c:897
 msgid "Creating main window...\n"
 msgstr "Skapar huvudfönster...\n"
 
-#: src/mainwindow.c:1071
+#: src/mainwindow.c:1073
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Huvudfönster: färgtilldelning %d misslyckades\n"
 
-#: src/mainwindow.c:1175 src/summaryview.c:2387 src/summaryview.c:2472
+#: src/mainwindow.c:1181 src/summaryview.c:2387 src/summaryview.c:2472
 #: src/summaryview.c:4009 src/summaryview.c:4138 src/summaryview.c:4507
 msgid "done.\n"
 msgstr "färdigt.\n"
 
-#: src/mainwindow.c:1293 src/mainwindow.c:1334 src/mainwindow.c:1359
+#: src/mainwindow.c:1299 src/mainwindow.c:1340 src/mainwindow.c:1365
 msgid "Untitled"
 msgstr "Namnlös"
 
-#: src/mainwindow.c:1360
+#: src/mainwindow.c:1366
 msgid "none"
 msgstr "inget"
 
-#: src/mainwindow.c:1413
+#: src/mainwindow.c:1419
 #, 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:1663
+#: src/mainwindow.c:1669
 msgid "Offline"
 msgstr "Frånkopplad"
 
-#: src/mainwindow.c:1664
+#: src/mainwindow.c:1670
 msgid "You are offline. Go online?"
 msgstr "Du är frånkopplad. Vill du ansluta?"
 
-#: src/mainwindow.c:1681
+#: src/mainwindow.c:1687
 msgid "Empty all trash"
 msgstr "Töm alla papperskorgar"
 
-#: src/mainwindow.c:1682
+#: src/mainwindow.c:1688
 msgid "Delete all messages in trash folders?"
 msgstr "Ta bort alla meddelanden i papperskorgen?"
 
-#: src/mainwindow.c:1712
+#: src/mainwindow.c:1718
 msgid "Add mailbox"
 msgstr "Lägg till brevlåda"
 
-#: src/mainwindow.c:1713
+#: src/mainwindow.c:1719
 msgid ""
 "Specify the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3601,16 +3606,16 @@ msgstr ""
 "Om den existerande brevlådan specificeras, kommer den\n"
 "att sökas igenom automatiskt."
 
-#: src/mainwindow.c:1719 src/setup.c:49
+#: src/mainwindow.c:1725 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Brevlådan \"%s\" finns redan."
 
-#: src/mainwindow.c:1724 src/setup.c:56
+#: src/mainwindow.c:1730 src/setup.c:56
 msgid "Mailbox"
 msgstr "Brevlåda"
 
-#: src/mainwindow.c:1730 src/setup.c:62
+#: src/mainwindow.c:1736 src/setup.c:62
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3619,131 +3624,131 @@ msgstr ""
 "Brevlådan kunde inte skapas.\n"
 "Några filer finns redan eller så saknar du skrivrättigheter där."
 
-#: src/mainwindow.c:2198
+#: src/mainwindow.c:2206
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Mappvy"
 
-#: src/mainwindow.c:2217
+#: src/mainwindow.c:2225
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Meddelandevy"
 
-#: src/mainwindow.c:2369 src/summaryview.c:418
+#: src/mainwindow.c:2377 src/summaryview.c:418
 msgid "/_Reply"
 msgstr "/Sva_ra"
 
-#: src/mainwindow.c:2370
+#: src/mainwindow.c:2378
 msgid "/Reply to _all"
 msgstr "/Svara till _alla"
 
-#: src/mainwindow.c:2371
+#: src/mainwindow.c:2379
 msgid "/Reply to _sender"
 msgstr "/Svara till av_sändaren"
 
-#: src/mainwindow.c:2372
+#: src/mainwindow.c:2380
 msgid "/Reply to mailing _list"
 msgstr "/Svara till e-post_lista"
 
-#: src/mainwindow.c:2377 src/summaryview.c:425
+#: src/mainwindow.c:2385 src/summaryview.c:425
 msgid "/_Forward"
 msgstr "/Vi_darebefordra"
 
-#: src/mainwindow.c:2378 src/summaryview.c:426
+#: src/mainwindow.c:2386 src/summaryview.c:426
 msgid "/For_ward as attachment"
 msgstr "/Vidarebefordra som _bilaga"
 
-#: src/mainwindow.c:2379 src/summaryview.c:427
+#: src/mainwindow.c:2387 src/summaryview.c:427
 msgid "/Redirec_t"
 msgstr "/_Omdirigera"
 
-#: src/mainwindow.c:2384
+#: src/mainwindow.c:2392
 msgid "Incorporate new mail"
 msgstr "Hämta ny post"
 
-#: src/mainwindow.c:2386
+#: src/mainwindow.c:2394
 msgid "Incorporate new mail of all accounts"
 msgstr "Hämta ny post från alla konton"
 
-#: src/mainwindow.c:2388
+#: src/mainwindow.c:2396
 msgid "Send queued message(s)"
 msgstr "Skicka köade meddelanden"
 
-#: src/mainwindow.c:2390
+#: src/mainwindow.c:2398
 msgid "Compose new message"
 msgstr "Skriv nytt meddelande"
 
-#: src/mainwindow.c:2392
+#: src/mainwindow.c:2400
 msgid "Reply to the message"
 msgstr "Svara på meddelandet"
 
-#: src/mainwindow.c:2394
+#: src/mainwindow.c:2402
 msgid "Reply to all"
 msgstr "Svara till alla"
 
-#: src/mainwindow.c:2396
+#: src/mainwindow.c:2404
 msgid "Forward the message"
 msgstr "Vidarebefordra meddelandet"
 
-#: src/mainwindow.c:2398
+#: src/mainwindow.c:2406
 msgid "Delete the message"
 msgstr "Ta bort meddelandet"
 
-#: src/mainwindow.c:2400
+#: src/mainwindow.c:2408
 msgid "Set as junk mail"
 msgstr "Sätt som skräppost"
 
-#: src/mainwindow.c:2402
+#: src/mainwindow.c:2410
 msgid "Execute marked process"
 msgstr "Kör markerad process"
 
-#: src/mainwindow.c:2404
+#: src/mainwindow.c:2412
 msgid "Next unread message"
 msgstr "Nästa olästa meddelande"
 
-#: src/mainwindow.c:2406
+#: src/mainwindow.c:2414
 #, fuzzy
 msgid "Previous unread message"
 msgstr "Nästa olästa meddelande"
 
-#: src/mainwindow.c:2410
+#: src/mainwindow.c:2418
 #, fuzzy
 msgid "Print message"
 msgstr "Skicka meddelande"
 
-#: src/mainwindow.c:2412
+#: src/mainwindow.c:2420
 msgid "Common preferences"
 msgstr "Allmänna inställningar"
 
-#: src/mainwindow.c:2414 src/prefs_account_dialog.c:511
+#: src/mainwindow.c:2422 src/prefs_account_dialog.c:511
 msgid "Account preferences"
 msgstr "Kontoinställningar"
 
-#: src/mainwindow.c:2779
+#: src/mainwindow.c:2788
 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:2790
+#: src/mainwindow.c:2799
 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:3062
+#: src/mainwindow.c:3071
 msgid "Exit"
 msgstr "Avsluta"
 
-#: src/mainwindow.c:3062
+#: src/mainwindow.c:3071
 msgid "Exit this program?"
 msgstr "Avsluta detta program?"
 
-#: src/mainwindow.c:3666
+#: src/mainwindow.c:3675
 #, fuzzy
 msgid "Command line options"
 msgstr "Kommandorad saknas."
 
-#: src/mainwindow.c:3679
+#: src/mainwindow.c:3688
 #, fuzzy
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Användning: %s [FLAGGOR]...\n"
 
-#: src/mainwindow.c:3687
+#: src/mainwindow.c:3696
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -3759,7 +3764,7 @@ msgid ""
 "--version"
 msgstr ""
 
-#: src/mainwindow.c:3703
+#: src/mainwindow.c:3712
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
diff --git a/po/tr.po b/po/tr.po
index e1ab829d..65ed0ec2 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-01-31 16:49+0900\n"
+"POT-Creation-Date: 2007-01-31 17:29+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"
@@ -910,7 +910,7 @@ msgstr "/_Adres/Dü_zenle"
 msgid "/_Address/_Delete"
 msgstr "/_Adres/_Sil"
 
-#: src/addressbook.c:359 src/compose.c:673 src/mainwindow.c:787
+#: src/addressbook.c:359 src/compose.c:673 src/mainwindow.c:789
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/A_raçlar"
@@ -919,12 +919,12 @@ msgstr "/A_raçlar"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/A_raçlar/_LDIF dosyasını ekle"
 
-#: src/addressbook.c:361 src/compose.c:694 src/mainwindow.c:841
+#: src/addressbook.c:361 src/compose.c:694 src/mainwindow.c:843
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Yardım"
 
-#: src/addressbook.c:362 src/compose.c:695 src/mainwindow.c:853
+#: src/addressbook.c:362 src/compose.c:695 src/mainwindow.c:855
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Yardım/_Hakkında"
@@ -966,7 +966,7 @@ msgstr "/_Sil"
 msgid "E-Mail address"
 msgstr "İleti adresi"
 
-#: src/addressbook.c:496 src/compose.c:4873 src/mainwindow.c:2408
+#: src/addressbook.c:496 src/compose.c:4873 src/mainwindow.c:2416
 #: src/prefs_common_dialog.c:2274
 msgid "Address book"
 msgstr "Adres defteri"
@@ -1185,7 +1185,7 @@ msgstr "Ortak adres"
 msgid "Personal address"
 msgstr "Kişisel adres"
 
-#: src/alertpanel.c:142 src/compose.c:5717 src/main.c:638
+#: src/alertpanel.c:142 src/compose.c:5720 src/main.c:638
 msgid "Notice"
 msgstr "Not"
 
@@ -1353,9 +1353,9 @@ msgid "/_View/_Reply to"
 msgstr "/_Görünüm/_Yanıtla/"
 
 #: src/compose.c:578 src/compose.c:580 src/compose.c:582 src/compose.c:584
-#: src/compose.c:587 src/mainwindow.c:577 src/mainwindow.c:580
-#: src/mainwindow.c:607 src/mainwindow.c:631 src/mainwindow.c:734
-#: src/mainwindow.c:738 src/messageview.c:258
+#: src/compose.c:587 src/mainwindow.c:579 src/mainwindow.c:582
+#: src/mainwindow.c:609 src/mainwindow.c:633 src/mainwindow.c:736
+#: src/mainwindow.c:740 src/messageview.c:258
 msgid "/_View/---"
 msgstr "/_Görünüm/---"
 
@@ -1376,7 +1376,7 @@ msgstr "/_Görünüm/_Ek"
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/_Görünüm/_Git/_Başka dizine git..."
 
-#: src/compose.c:593 src/mainwindow.c:638 src/messageview.c:173
+#: src/compose.c:593 src/mainwindow.c:640 src/messageview.c:173
 #, fuzzy
 msgid "/_View/Character _encoding"
 msgstr "/_Görünüm/_Sırala/Azalan sırala"
@@ -1388,138 +1388,138 @@ msgstr ""
 #: src/compose.c:596 src/compose.c:602 src/compose.c:608 src/compose.c:612
 #: src/compose.c:620 src/compose.c:624 src/compose.c:630 src/compose.c:636
 #: src/compose.c:640 src/compose.c:650 src/compose.c:654 src/compose.c:662
-#: src/compose.c:666 src/mainwindow.c:634 src/mainwindow.c:641
+#: src/compose.c:666 src/mainwindow.c:636 src/mainwindow.c:643
 #: src/messageview.c:169
 #, fuzzy
 msgid "/_View/Character _encoding/---"
 msgstr "/_Görünüm/_Sırala/Azalan sırala"
 
-#: src/compose.c:598 src/mainwindow.c:642 src/messageview.c:177
+#: src/compose.c:598 src/mainwindow.c:644 src/messageview.c:177
 #, fuzzy
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Görünüm/_Kodlama/7 bit ascii (US-ASC_II)"
 
-#: src/compose.c:600 src/mainwindow.c:644 src/messageview.c:180
+#: src/compose.c:600 src/mainwindow.c:646 src/messageview.c:180
 #, fuzzy
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Görünüm/_Kodlama/Unicode (_UTF-8)"
 
-#: src/compose.c:604 src/mainwindow.c:648 src/messageview.c:183
+#: src/compose.c:604 src/mainwindow.c:650 src/messageview.c:183
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Görünüm/_Kodlama/Batı Avrupa (ISO-8859-_1)"
 
-#: src/compose.c:606 src/mainwindow.c:650 src/messageview.c:185
+#: src/compose.c:606 src/mainwindow.c:652 src/messageview.c:185
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Görünüm/_Kodlama/Batı Avrupa (ISO-8859-_15)"
 
-#: src/compose.c:610 src/mainwindow.c:656 src/messageview.c:190
+#: src/compose.c:610 src/mainwindow.c:658 src/messageview.c:190
 #, fuzzy
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Görünüm/_Kodlama/Orta Avrupa (ISO-8859-_2)"
 
-#: src/compose.c:614 src/mainwindow.c:660 src/messageview.c:193
+#: src/compose.c:614 src/mainwindow.c:662 src/messageview.c:193
 #, fuzzy
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Görünüm/_Kodlama/_Baltık (ISO-8859-13)"
 
-#: src/compose.c:616 src/mainwindow.c:662 src/messageview.c:195
+#: src/compose.c:616 src/mainwindow.c:664 src/messageview.c:195
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Görünüm/_Kodlama/Baltık (ISO-8859-_4)"
 
-#: src/compose.c:618 src/mainwindow.c:664 src/messageview.c:197
+#: src/compose.c:618 src/mainwindow.c:666 src/messageview.c:197
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/_Görünüm/_Kodlama/Kiril (Windows-1251)"
 
-#: src/compose.c:622 src/mainwindow.c:668 src/messageview.c:200
+#: src/compose.c:622 src/mainwindow.c:670 src/messageview.c:200
 #, fuzzy
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Görünüm/_Kodlama/Yunanca (ISO-8859-_7)"
 
-#: src/compose.c:626 src/mainwindow.c:672 src/messageview.c:203
+#: src/compose.c:626 src/mainwindow.c:674 src/messageview.c:203
 #, fuzzy
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/_Görünüm/_Kodlama/Baltık (ISO-8859-_4)"
 
-#: src/compose.c:628 src/mainwindow.c:674 src/messageview.c:205
+#: src/compose.c:628 src/mainwindow.c:676 src/messageview.c:205
 #, fuzzy
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/_Görünüm/_Kodlama/Kiril (Windows-1251)"
 
-#: src/compose.c:632 src/mainwindow.c:678 src/messageview.c:208
+#: src/compose.c:632 src/mainwindow.c:680 src/messageview.c:208
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Görünüm/_Kodlama/Yunanca (ISO-8859-_7)"
 
-#: src/compose.c:634 src/mainwindow.c:680 src/messageview.c:210
+#: src/compose.c:634 src/mainwindow.c:682 src/messageview.c:210
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Görünüm/_Kodlama/Kiril (Windows-1251)"
 
-#: src/compose.c:638 src/mainwindow.c:684 src/messageview.c:213
+#: src/compose.c:638 src/mainwindow.c:686 src/messageview.c:213
 #, fuzzy
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Görünüm/_Kodlama/Türkçe (ISO-8859-_9)"
 
-#: src/compose.c:642 src/mainwindow.c:688 src/messageview.c:216
+#: src/compose.c:642 src/mainwindow.c:690 src/messageview.c:216
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Görünüm/_Kodlama/Kiril (ISO-8859-_5)"
 
-#: src/compose.c:644 src/mainwindow.c:690 src/messageview.c:218
+#: src/compose.c:644 src/mainwindow.c:692 src/messageview.c:218
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Görünüm/_Kodlama/Kiril (ISO-8859-_5)"
 
-#: src/compose.c:646 src/mainwindow.c:692 src/messageview.c:220
+#: src/compose.c:646 src/mainwindow.c:694 src/messageview.c:220
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Görünüm/_Kodlama/Kiril (KOI8-U)"
 
-#: src/compose.c:648 src/mainwindow.c:694 src/messageview.c:222
+#: src/compose.c:648 src/mainwindow.c:696 src/messageview.c:222
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Görünüm/_Kodlama/Kiril (Windows-1251)"
 
-#: src/compose.c:652 src/mainwindow.c:698 src/messageview.c:225
+#: src/compose.c:652 src/mainwindow.c:700 src/messageview.c:225
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Görünüm/_Kodlama/Japonca (ISO-2022-_JP)"
 
-#: src/compose.c:656 src/mainwindow.c:708 src/messageview.c:234
+#: src/compose.c:656 src/mainwindow.c:710 src/messageview.c:234
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Görünüm/_Kodlama/Basit Çince (_GB2312)"
 
-#: src/compose.c:658 src/mainwindow.c:710 src/messageview.c:236
+#: src/compose.c:658 src/mainwindow.c:712 src/messageview.c:236
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Görünüm/_Kodlama/Basit Çince (_GB2312)"
 
-#: src/compose.c:660 src/mainwindow.c:712 src/messageview.c:238
+#: src/compose.c:660 src/mainwindow.c:714 src/messageview.c:238
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Görünüm/_Kodlama/Geleneksel Çince (_Big5)"
 
-#: src/compose.c:664 src/mainwindow.c:720 src/messageview.c:245
+#: src/compose.c:664 src/mainwindow.c:722 src/messageview.c:245
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Görünüm/_Kodlama/Korece (EUC-_KR)"
 
-#: src/compose.c:668 src/mainwindow.c:726 src/messageview.c:250
+#: src/compose.c:668 src/mainwindow.c:728 src/messageview.c:250
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Görünüm/_Kodlama/Tayca (TIS-620)"
 
-#: src/compose.c:670 src/mainwindow.c:728 src/messageview.c:252
+#: src/compose.c:670 src/mainwindow.c:730 src/messageview.c:252
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Görünüm/_Kodlama/Tayca (Windows-874)"
 
-#: src/compose.c:674 src/mainwindow.c:788 src/messageview.c:283
+#: src/compose.c:674 src/mainwindow.c:790 src/messageview.c:283
 msgid "/_Tools/_Address book"
 msgstr "/A_raçlar/_Adres defteri"
 
@@ -1527,13 +1527,13 @@ msgstr "/A_raçlar/_Adres defteri"
 msgid "/_Tools/_Template"
 msgstr "/A_raçlar/Ş_ablon"
 
-#: src/compose.c:677 src/mainwindow.c:812 src/messageview.c:299
+#: src/compose.c:677 src/mainwindow.c:814 src/messageview.c:299
 msgid "/_Tools/Actio_ns"
 msgstr "/A_raçlar/E_ylemler"
 
-#: src/compose.c:679 src/compose.c:683 src/compose.c:689 src/mainwindow.c:791
-#: src/mainwindow.c:805 src/mainwindow.c:810 src/mainwindow.c:813
-#: src/mainwindow.c:817 src/mainwindow.c:819 src/messageview.c:286
+#: src/compose.c:679 src/compose.c:683 src/compose.c:689 src/mainwindow.c:793
+#: src/mainwindow.c:807 src/mainwindow.c:812 src/mainwindow.c:815
+#: src/mainwindow.c:819 src/mainwindow.c:821 src/messageview.c:286
 #: src/messageview.c:298
 msgid "/_Tools/---"
 msgstr "/A_raçlar/---"
@@ -1736,7 +1736,7 @@ msgstr "/A_raçlar/PGP İ_mza"
 msgid "PGP Encrypt"
 msgstr "/A_raçlar/PGP ile Ş_ifrele"
 
-#: src/compose.c:4442 src/compose.c:5543
+#: src/compose.c:4442 src/compose.c:5546
 msgid "MIME type"
 msgstr "MIME türü"
 
@@ -1779,36 +1779,36 @@ msgstr "Harici bir düzenleyici kullan"
 msgid "Wrap all long lines"
 msgstr "Tüm uzun satırları kaydır"
 
-#: src/compose.c:5439
+#: src/compose.c:5442
 msgid "Invalid MIME type."
 msgstr "Geçersiz MIME türü."
 
-#: src/compose.c:5457
+#: src/compose.c:5460
 msgid "File doesn't exist or is empty."
 msgstr "Dosya yok, ya da boş."
 
-#: src/compose.c:5525
+#: src/compose.c:5528
 msgid "Properties"
 msgstr "Özellikler"
 
-#: src/compose.c:5545 src/prefs_common_dialog.c:1504
+#: src/compose.c:5548 src/prefs_common_dialog.c:1504
 msgid "Encoding"
 msgstr "Kodlama"
 
-#: src/compose.c:5568 src/prefs_folder_item.c:202
+#: src/compose.c:5571 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Yol"
 
-#: src/compose.c:5569
+#: src/compose.c:5572
 msgid "File name"
 msgstr "Dosya adı"
 
-#: src/compose.c:5659
+#: src/compose.c:5662
 #, 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:5714
+#: src/compose.c:5717
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1818,52 +1818,52 @@ msgstr ""
 "Bu süreci sonlandırayım mı?\n"
 "Programın grup numarası (GID): %d"
 
-#: src/compose.c:6040 src/mainwindow.c:2752
+#: src/compose.c:6043 src/mainwindow.c:2761
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:6156 src/compose.c:6161 src/compose.c:6167
+#: src/compose.c:6159 src/compose.c:6164 src/compose.c:6170
 msgid "Can't queue the message."
 msgstr "İleti kuyruğa gönderilemedi."
 
-#: src/compose.c:6258
+#: src/compose.c:6261
 #, fuzzy
 msgid "Select files"
 msgstr "Dosya seç"
 
-#: src/compose.c:6281
+#: src/compose.c:6284
 msgid "Select file"
 msgstr "Dosya seç"
 
-#: src/compose.c:6316
+#: src/compose.c:6319
 #, fuzzy
 msgid "Save message"
 msgstr "İletiyi gönder"
 
-#: src/compose.c:6317
+#: src/compose.c:6320
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Bu ileti değiştirildi. Silinsin mi?"
 
-#: src/compose.c:6319
+#: src/compose.c:6322
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:6361
+#: src/compose.c:6364
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "%s şablonunu uygulamak istiyor musunuz?"
 
-#: src/compose.c:6363
+#: src/compose.c:6366
 msgid "Apply template"
 msgstr "Şablonu uygula"
 
-#: src/compose.c:6364
+#: src/compose.c:6367
 #, fuzzy
 msgid "_Replace"
 msgstr "Değiştir"
 
-#: src/compose.c:6364
+#: src/compose.c:6367
 #, fuzzy
 msgid "_Insert"
 msgstr "İçer"
@@ -2324,12 +2324,12 @@ msgstr "Dizin bilgisi ayarlanıyor...\n"
 msgid "Setting folder info..."
 msgstr "Dizin bilgisi ayarlanıyor..."
 
-#: src/folderview.c:868 src/mainwindow.c:3748 src/setup.c:80
+#: src/folderview.c:868 src/mainwindow.c:3757 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "%s%c%s dizini taranıyor..."
 
-#: src/folderview.c:872 src/mainwindow.c:3753 src/setup.c:85
+#: src/folderview.c:872 src/mainwindow.c:3762 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "%s dizini taranıyor..."
@@ -3085,554 +3085,559 @@ msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/_Görünüm/Göster veya _gizle/_Araç çubuğu/Simge _ve metin"
 
 #: src/mainwindow.c:566
-msgid "/_View/Show or hi_de/_Toolbar/_Icon"
+#, fuzzy
+msgid "/_View/Show or hi_de/_Toolbar/Text at the _right of icon"
 msgstr "/_Görünüm/Göster veya _gizle/_Araç çubuğu/_Simge"
 
 #: src/mainwindow.c:568
+msgid "/_View/Show or hi_de/_Toolbar/_Icon"
+msgstr "/_Görünüm/Göster veya _gizle/_Araç çubuğu/_Simge"
+
+#: src/mainwindow.c:570
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/_Görünüm/Göster veya _gizle/_Araç çubuğu/_Metin"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:572
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/_Görünüm/Göster veya _gizle/_Araç çubuğu/_Hiçbiri"
 
-#: src/mainwindow.c:572
+#: src/mainwindow.c:574
 #, fuzzy
 msgid "/_View/Show or hi_de/_Search bar"
 msgstr "/_Görünüm/Göster veya _gizle/_Durum çubuğu"
 
-#: src/mainwindow.c:574
+#: src/mainwindow.c:576
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/_Görünüm/Göster veya _gizle/_Durum çubuğu"
 
-#: src/mainwindow.c:576
+#: src/mainwindow.c:578
 #, fuzzy
 msgid "/_View/_Customize toolbar..."
 msgstr "/_Görünüm/_Git/_Başka dizine git..."
 
-#: src/mainwindow.c:578
+#: src/mainwindow.c:580
 msgid "/_View/Separate f_older tree"
 msgstr "/_Görünüm/D_izin ağacını ayır"
 
-#: src/mainwindow.c:579
+#: src/mainwindow.c:581
 #, fuzzy
 msgid "/_View/Separate _message view"
 msgstr "/_Görünüm/Ayrı _ileti görünümü"
 
-#: src/mainwindow.c:581
+#: src/mainwindow.c:583
 msgid "/_View/_Sort"
 msgstr "/_Görünüm/Sıra_la"
 
-#: src/mainwindow.c:582
+#: src/mainwindow.c:584
 msgid "/_View/_Sort/by _number"
 msgstr "/_Görünüm/Sıra_la/_Numaraya göre"
 
-#: src/mainwindow.c:583
+#: src/mainwindow.c:585
 msgid "/_View/_Sort/by s_ize"
 msgstr "/_Görünüm/Sıra_la/_Boyuta göre"
 
-#: src/mainwindow.c:584
+#: src/mainwindow.c:586
 msgid "/_View/_Sort/by _date"
 msgstr "/_Görünüm/Sıra_la/_Tarihe göre"
 
-#: src/mainwindow.c:585
+#: src/mainwindow.c:587
 #, fuzzy
 msgid "/_View/_Sort/by t_hread date"
 msgstr "/_Görünüm/Sıra_la/_Tarihe göre"
 
-#: src/mainwindow.c:586
+#: src/mainwindow.c:588
 msgid "/_View/_Sort/by _from"
 msgstr "/_Görünüm/Sıra_la/_Gönderene göre"
 
-#: src/mainwindow.c:587
+#: src/mainwindow.c:589
 msgid "/_View/_Sort/by _recipient"
 msgstr "/_Görünüm/Sıra_la/_Alıcıya göre"
 
-#: src/mainwindow.c:588
+#: src/mainwindow.c:590
 msgid "/_View/_Sort/by _subject"
 msgstr "/_Görünüm/Sıra_la/_Konuya göre"
 
-#: src/mainwindow.c:589
+#: src/mainwindow.c:591
 msgid "/_View/_Sort/by _color label"
 msgstr "/_Görünüm/Sıra_la/_Renge göre"
 
-#: src/mainwindow.c:591
+#: src/mainwindow.c:593
 msgid "/_View/_Sort/by _mark"
 msgstr "/_Görünüm/Sıra_la/İş_arete göre"
 
-#: src/mainwindow.c:592
+#: src/mainwindow.c:594
 msgid "/_View/_Sort/by _unread"
 msgstr "/_Görünüm/Sıra_la/_Okunmamışa göre"
 
-#: src/mainwindow.c:593
+#: src/mainwindow.c:595
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/_Görünüm/Sıra_la/E_klentiye göre"
 
-#: src/mainwindow.c:595
+#: src/mainwindow.c:597
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/_Görünüm/Sıra_la/_Sıralama yapma"
 
-#: src/mainwindow.c:596 src/mainwindow.c:599
+#: src/mainwindow.c:598 src/mainwindow.c:601
 msgid "/_View/_Sort/---"
 msgstr "/_Görünüm/Sıra_la/---"
 
-#: src/mainwindow.c:597
+#: src/mainwindow.c:599
 msgid "/_View/_Sort/Ascending"
 msgstr "/_Görünüm/Sıra_la/Artan sırala"
 
-#: src/mainwindow.c:598
+#: src/mainwindow.c:600
 msgid "/_View/_Sort/Descending"
 msgstr "/_Görünüm/Sıra_la/Azalan sırala"
 
-#: src/mainwindow.c:600
+#: src/mainwindow.c:602
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/_Görünüm/Sıra_la/Konuya _göre izle"
 
-#: src/mainwindow.c:602
+#: src/mainwindow.c:604
 msgid "/_View/Th_read view"
 msgstr "/_Görünüm/_Konum görünümü"
 
-#: src/mainwindow.c:603
+#: src/mainwindow.c:605
 msgid "/_View/E_xpand all threads"
 msgstr "/_Görünüm/Tüm _başlıkları genişlet"
 
-#: src/mainwindow.c:604
+#: src/mainwindow.c:606
 msgid "/_View/Co_llapse all threads"
 msgstr "/_Görünüm/Tüm _başlıkları küçült"
 
-#: src/mainwindow.c:605
+#: src/mainwindow.c:607
 msgid "/_View/Set display _item..."
 msgstr "/_Görünüm/_Görüntü öğesini seç..."
 
-#: src/mainwindow.c:608
+#: src/mainwindow.c:610
 msgid "/_View/_Go to"
 msgstr "/_Görünüm/_Git"
 
-#: src/mainwindow.c:609
+#: src/mainwindow.c:611
 msgid "/_View/_Go to/_Prev message"
 msgstr "/_Görünüm/_Git/Önceki _ileti"
 
-#: src/mainwindow.c:610
+#: src/mainwindow.c:612
 msgid "/_View/_Go to/_Next message"
 msgstr "/_Görünüm/_Git/Sonraki _ileti"
 
-#: src/mainwindow.c:611 src/mainwindow.c:616 src/mainwindow.c:619
-#: src/mainwindow.c:624 src/mainwindow.c:629
+#: src/mainwindow.c:613 src/mainwindow.c:618 src/mainwindow.c:621
+#: src/mainwindow.c:626 src/mainwindow.c:631
 msgid "/_View/_Go to/---"
 msgstr "/_Görünüm/_Git/---"
 
-#: src/mainwindow.c:612
+#: src/mainwindow.c:614
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/_Görünüm/_Git/Ö_nceki okunmamış ileti"
 
-#: src/mainwindow.c:614
+#: src/mainwindow.c:616
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/_Görünüm/_Git/_Sonraki okunmamış ileti"
 
-#: src/mainwindow.c:617
+#: src/mainwindow.c:619
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/_Görünüm/_Git/Ö_nceki yeni ileti"
 
-#: src/mainwindow.c:618
+#: src/mainwindow.c:620
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/_Görünüm/_Git/Sonraki _yeni ileti"
 
-#: src/mainwindow.c:620
+#: src/mainwindow.c:622
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/_Görünüm/_Git/Önceki _işaretli ileti"
 
-#: src/mainwindow.c:622
+#: src/mainwindow.c:624
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/_Görünüm/_Git/S_onraki işaretli ileti"
 
-#: src/mainwindow.c:625
+#: src/mainwindow.c:627
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/_Görünüm/_Git/Ö_nceki _etiketli ileti"
 
-#: src/mainwindow.c:627
+#: src/mainwindow.c:629
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/_Görünüm/_Git/Son_raki etiketli ileti"
 
-#: src/mainwindow.c:630
+#: src/mainwindow.c:632
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Görünüm/_Git/_Başka dizine git..."
 
-#: src/mainwindow.c:639 src/messageview.c:174
+#: src/mainwindow.c:641 src/messageview.c:174
 #, fuzzy
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Görünüm/_Kodlama/_Otomatik tanı"
 
-#: src/mainwindow.c:652 src/messageview.c:187
+#: src/mainwindow.c:654 src/messageview.c:187
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr "/_Görünüm/_Kodlama/Batı Avrupa (ISO-8859-_15)"
 
-#: src/mainwindow.c:700 src/messageview.c:227
+#: src/mainwindow.c:702 src/messageview.c:227
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Görünüm/_Kodlama/Japonca (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:702 src/messageview.c:229
+#: src/mainwindow.c:704 src/messageview.c:229
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Görünüm/_Kodlama/Japonca (_EUC-JP)"
 
-#: src/mainwindow.c:704 src/messageview.c:231
+#: src/mainwindow.c:706 src/messageview.c:231
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Görünüm/_Kodlama/Japonca (_Shift__JIS)"
 
-#: src/mainwindow.c:714 src/messageview.c:240
+#: src/mainwindow.c:716 src/messageview.c:240
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Görünüm/_Kodlama/Geleneksel Çince (EUC-_TW)"
 
-#: src/mainwindow.c:716 src/messageview.c:242
+#: src/mainwindow.c:718 src/messageview.c:242
 #, fuzzy
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Görünüm/_Kodlama/Çince (ISO-2022-_CN)"
 
-#: src/mainwindow.c:722 src/messageview.c:247
+#: src/mainwindow.c:724 src/messageview.c:247
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Görünüm/_Kodlama/Korece (ISO-2022-KR)"
 
-#: src/mainwindow.c:735 src/summaryview.c:464
+#: src/mainwindow.c:737 src/summaryview.c:464
 msgid "/_View/Open in new _window"
 msgstr "/_Görünüm/Yeni _pencerede aç"
 
-#: src/mainwindow.c:736 src/messageview.c:259 src/summaryview.c:466
+#: src/mainwindow.c:738 src/messageview.c:259 src/summaryview.c:466
 msgid "/_View/Mess_age source"
 msgstr "/_Görünüm/İ_leti kaynağı"
 
-#: src/mainwindow.c:737 src/messageview.c:260 src/summaryview.c:467
+#: src/mainwindow.c:739 src/messageview.c:260 src/summaryview.c:467
 #, fuzzy
 msgid "/_View/All _headers"
 msgstr "/_Görünüm/Tüm _başlıklar"
 
-#: src/mainwindow.c:739
+#: src/mainwindow.c:741
 msgid "/_View/_Update summary"
 msgstr "/_Görünüm/_Görünümü güncelle"
 
-#: src/mainwindow.c:741 src/messageview.c:263
+#: src/mainwindow.c:743 src/messageview.c:263
 msgid "/_Message"
 msgstr "/İ_leti"
 
-#: src/mainwindow.c:742
+#: src/mainwindow.c:744
 msgid "/_Message/Recei_ve"
 msgstr "/İ_leti/_Al"
 
-#: src/mainwindow.c:743
+#: src/mainwindow.c:745
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/İ_leti/_Al/Ge_çerli hesaptan al"
 
-#: src/mainwindow.c:745
+#: src/mainwindow.c:747
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/İ_leti/_Al/T_üm hesaplardan al"
 
-#: src/mainwindow.c:747
+#: src/mainwindow.c:749
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/İ_leti/_Al/İ_ptal Et"
 
-#: src/mainwindow.c:749
+#: src/mainwindow.c:751
 msgid "/_Message/Recei_ve/---"
 msgstr "/İ_leti/_Al/---"
 
-#: src/mainwindow.c:750
+#: src/mainwindow.c:752
 msgid "/_Message/_Send queued messages"
 msgstr "/İ_leti/_Kuyruktaki iletileri gönder"
 
-#: src/mainwindow.c:751 src/mainwindow.c:753 src/mainwindow.c:760
-#: src/mainwindow.c:765 src/mainwindow.c:768 src/mainwindow.c:779
-#: src/mainwindow.c:781 src/mainwindow.c:784 src/messageview.c:266
+#: src/mainwindow.c:753 src/mainwindow.c:755 src/mainwindow.c:762
+#: src/mainwindow.c:767 src/mainwindow.c:770 src/mainwindow.c:781
+#: src/mainwindow.c:783 src/mainwindow.c:786 src/messageview.c:266
 #: src/messageview.c:274 src/messageview.c:279
 msgid "/_Message/---"
 msgstr "/İ_leti/---"
 
-#: src/mainwindow.c:752 src/messageview.c:264
+#: src/mainwindow.c:754 src/messageview.c:264
 msgid "/_Message/Compose _new message"
 msgstr "/İ_leti/Yeni _ileti gönder"
 
-#: src/mainwindow.c:754 src/messageview.c:267
+#: src/mainwindow.c:756 src/messageview.c:267
 msgid "/_Message/_Reply"
 msgstr "/İ_leti/Yanıtl_a"
 
-#: src/mainwindow.c:755
+#: src/mainwindow.c:757
 msgid "/_Message/Repl_y to"
 msgstr "/İ_leti/B_aşkasına yanıtla"
 
-#: src/mainwindow.c:756 src/messageview.c:268
+#: src/mainwindow.c:758 src/messageview.c:268
 msgid "/_Message/Repl_y to/_all"
 msgstr "/İ_leti/B_aşkasına yanıtla/_herkese"
 
-#: src/mainwindow.c:757 src/messageview.c:270
+#: src/mainwindow.c:759 src/messageview.c:270
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/İ_leti/B_aşkasına yanıtla/_gönderene"
 
-#: src/mainwindow.c:758 src/messageview.c:272
+#: src/mainwindow.c:760 src/messageview.c:272
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/İ_leti/B_aşkasına yanıtla/eposta l_istesine"
 
-#: src/mainwindow.c:761 src/messageview.c:275
+#: src/mainwindow.c:763 src/messageview.c:275
 msgid "/_Message/_Forward"
 msgstr "/İ_leti/Yö_nlendir"
 
-#: src/mainwindow.c:762 src/messageview.c:276
+#: src/mainwindow.c:764 src/messageview.c:276
 msgid "/_Message/For_ward as attachment"
 msgstr "/İ_leti/E_k olarak yönlendir"
 
-#: src/mainwindow.c:764 src/messageview.c:278
+#: src/mainwindow.c:766 src/messageview.c:278
 msgid "/_Message/Redirec_t"
 msgstr "/İ_leti/Yö_nlendir"
 
-#: src/mainwindow.c:766
+#: src/mainwindow.c:768
 msgid "/_Message/M_ove..."
 msgstr "/İ_leti/Taşı..."
 
-#: src/mainwindow.c:767
+#: src/mainwindow.c:769
 msgid "/_Message/_Copy..."
 msgstr "/İ_leti/_Kopyala..."
 
-#: src/mainwindow.c:769
+#: src/mainwindow.c:771
 msgid "/_Message/_Mark"
 msgstr "/İ_leti/İş_aretle"
 
-#: src/mainwindow.c:770
+#: src/mainwindow.c:772
 msgid "/_Message/_Mark/_Mark"
 msgstr "/İ_leti/İş_aretle/İş_aretle"
 
-#: src/mainwindow.c:771
+#: src/mainwindow.c:773
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/İ_leti/İş_aretle/İşareti _kaldır"
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:774
 msgid "/_Message/_Mark/---"
 msgstr "/İ_leti/İş_aretle/---"
 
-#: src/mainwindow.c:773
+#: src/mainwindow.c:775
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/İ_leti/İş_aretle/O_kunmamış olarak işaretle"
 
-#: src/mainwindow.c:774
+#: src/mainwindow.c:776
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/İ_leti/İş_aretle/Ok_unmuş olarak işaretle"
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:778
 #, fuzzy
 msgid "/_Message/_Mark/Mark _thread as read"
 msgstr "/İ_leti/İş_aretle/Ok_unmuş olarak işaretle"
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:780
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/İ_leti/İş_aretle/Hepsini _okunmuş olarak işaretle"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:782
 msgid "/_Message/_Delete"
 msgstr "/İ_leti/_Sil"
 
-#: src/mainwindow.c:782
+#: src/mainwindow.c:784
 #, fuzzy
 msgid "/_Message/Set as _junk mail"
 msgstr "/İ_leti/İş_aretle/İşareti _kaldır"
 
-#: src/mainwindow.c:783
+#: src/mainwindow.c:785
 msgid "/_Message/Set as not j_unk mail"
 msgstr ""
 
-#: src/mainwindow.c:785 src/messageview.c:280
+#: src/mainwindow.c:787 src/messageview.c:280
 msgid "/_Message/Re-_edit"
 msgstr "/İ_leti/Ye_niden düzenle"
 
-#: src/mainwindow.c:789
+#: src/mainwindow.c:791
 #, fuzzy
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/A_raçlar/Göndereni adres defterine ekle"
 
-#: src/mainwindow.c:792
+#: src/mainwindow.c:794
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/A_raçlar/_Dizin içindeki tüm iletileri filtrele"
 
-#: src/mainwindow.c:794
+#: src/mainwindow.c:796
 msgid "/_Tools/Filter _selected messages"
 msgstr "/A_raçlar/S_eçilen tüm mesajları filtrele"
 
-#: src/mainwindow.c:796 src/messageview.c:287
+#: src/mainwindow.c:798 src/messageview.c:287
 msgid "/_Tools/_Create filter rule"
 msgstr "/A_raçlar/Filtre _kuralı oluştur"
 
-#: src/mainwindow.c:797 src/messageview.c:289
+#: src/mainwindow.c:799 src/messageview.c:289
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/A_raçlar/Filtre _kuralı oluştur/_Otomatik oluştur"
 
-#: src/mainwindow.c:799 src/messageview.c:291
+#: src/mainwindow.c:801 src/messageview.c:291
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/A_raçlar/Filtre _kuralı oluştur/_Gönderene göre oluştur"
 
-#: src/mainwindow.c:801 src/messageview.c:293
+#: src/mainwindow.c:803 src/messageview.c:293
 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:803 src/messageview.c:295
+#: src/mainwindow.c:805 src/messageview.c:295
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/A_raçlar/Filtre _kuralı oluştur/_Konuya göre oluştur"
 
-#: src/mainwindow.c:806
+#: src/mainwindow.c:808
 #, fuzzy
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/A_raçlar/_Dizin içindeki tüm iletileri filtrele"
 
-#: src/mainwindow.c:808
+#: src/mainwindow.c:810
 #, fuzzy
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/A_raçlar/S_eçilen tüm mesajları filtrele"
 
-#: src/mainwindow.c:815
+#: src/mainwindow.c:817
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/A_raçlar/Ç_ift iletileri sil"
 
-#: src/mainwindow.c:818
+#: src/mainwindow.c:820
 #, fuzzy
 msgid "/_Tools/E_xecute marked process"
 msgstr "İşaretli süreçleri çalıştır"
 
-#: src/mainwindow.c:820
+#: src/mainwindow.c:822
 msgid "/_Tools/_Log window"
 msgstr "/A_raçlar/_Kayıt penceresi"
 
-#: src/mainwindow.c:822
+#: src/mainwindow.c:824
 msgid "/_Configuration"
 msgstr "/_Yapılandırma"
 
-#: src/mainwindow.c:823
+#: src/mainwindow.c:825
 msgid "/_Configuration/_Common preferences..."
 msgstr "/_Yapılandırma/_Genel tercihler..."
 
-#: src/mainwindow.c:825
+#: src/mainwindow.c:827
 msgid "/_Configuration/_Filter setting..."
 msgstr "/_Yapılandırma/F_iltre ayarları..."
 
-#: src/mainwindow.c:827
+#: src/mainwindow.c:829
 msgid "/_Configuration/_Template..."
 msgstr "/_Yapılandırma/Ş_ablon..."
 
-#: src/mainwindow.c:829
+#: src/mainwindow.c:831
 msgid "/_Configuration/_Actions..."
 msgstr "/_Yapılandırma/_Eylemler..."
 
-#: src/mainwindow.c:831
+#: src/mainwindow.c:833
 msgid "/_Configuration/---"
 msgstr "/_Yapılandırma/---"
 
-#: src/mainwindow.c:832
+#: src/mainwindow.c:834
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Yapılandırma/_Güncel hesap tercihleri..."
 
-#: src/mainwindow.c:834
+#: src/mainwindow.c:836
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Yapılandırma/Y_eni hesap oluştur..."
 
-#: src/mainwindow.c:836
+#: src/mainwindow.c:838
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Yapılandırma/Hesapları _düzenle..."
 
-#: src/mainwindow.c:838
+#: src/mainwindow.c:840
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Yapılandırma/_Güncel hesabı değiştir"
 
-#: src/mainwindow.c:842
+#: src/mainwindow.c:844
 msgid "/_Help/_Manual"
 msgstr "/Yardı_m/_Kılavuz"
 
-#: src/mainwindow.c:843
+#: src/mainwindow.c:845
 msgid "/_Help/_Manual/_English"
 msgstr "/Yardı_m/_Kılavuz/İ_ngilizce"
 
-#: src/mainwindow.c:844
+#: src/mainwindow.c:846
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/Yardı_m/_Kılavuz/_Japonca"
 
-#: src/mainwindow.c:845
+#: src/mainwindow.c:847
 msgid "/_Help/_FAQ"
 msgstr "/Yardı_m/_SSS"
 
-#: src/mainwindow.c:846
+#: src/mainwindow.c:848
 msgid "/_Help/_FAQ/_English"
 msgstr "/Yardı_m/_SSS/İ_ngilizce"
 
-#: src/mainwindow.c:847
+#: src/mainwindow.c:849
 msgid "/_Help/_FAQ/_German"
 msgstr "/Yardı_m/_SSS/_Almanca"
 
-#: src/mainwindow.c:848
+#: src/mainwindow.c:850
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/Yardı_m/_SSS/İ_spanyolca"
 
-#: src/mainwindow.c:849
+#: src/mainwindow.c:851
 msgid "/_Help/_FAQ/_French"
 msgstr "/Yardı_m/_SSS/_Fransızca"
 
-#: src/mainwindow.c:850
+#: src/mainwindow.c:852
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/Yardı_m/_SSS/İ_talyanca"
 
-#: src/mainwindow.c:851
+#: src/mainwindow.c:853
 #, fuzzy
 msgid "/_Help/_Command line options"
 msgstr "Komut satırı belirtilmedi."
 
-#: src/mainwindow.c:852
+#: src/mainwindow.c:854
 msgid "/_Help/---"
 msgstr "/Yardı_m/---"
 
-#: src/mainwindow.c:895
+#: src/mainwindow.c:897
 msgid "Creating main window...\n"
 msgstr "Yeni pencere oluşturuluyor...\n"
 
-#: src/mainwindow.c:1071
+#: src/mainwindow.c:1073
 #, 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:1175 src/summaryview.c:2387 src/summaryview.c:2472
+#: src/mainwindow.c:1181 src/summaryview.c:2387 src/summaryview.c:2472
 #: src/summaryview.c:4009 src/summaryview.c:4138 src/summaryview.c:4507
 msgid "done.\n"
 msgstr "bitti.\n"
 
-#: src/mainwindow.c:1293 src/mainwindow.c:1334 src/mainwindow.c:1359
+#: src/mainwindow.c:1299 src/mainwindow.c:1340 src/mainwindow.c:1365
 msgid "Untitled"
 msgstr "Başlıksız"
 
-#: src/mainwindow.c:1360
+#: src/mainwindow.c:1366
 msgid "none"
 msgstr "hiçbiri"
 
-#: src/mainwindow.c:1413
+#: src/mainwindow.c:1419
 #, 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:1663
+#: src/mainwindow.c:1669
 msgid "Offline"
 msgstr "Çevrimdışı"
 
-#: src/mainwindow.c:1664
+#: src/mainwindow.c:1670
 msgid "You are offline. Go online?"
 msgstr "Çevrimdışısınız. Çevrimiçi olunsun mu?"
 
-#: src/mainwindow.c:1681
+#: src/mainwindow.c:1687
 msgid "Empty all trash"
 msgstr "Tüm çöpü boşalt"
 
-#: src/mainwindow.c:1682
+#: src/mainwindow.c:1688
 #, fuzzy
 msgid "Delete all messages in trash folders?"
 msgstr "Çöpteki tüm iletiler silinsin mi?"
 
-#: src/mainwindow.c:1712
+#: src/mainwindow.c:1718
 msgid "Add mailbox"
 msgstr "Posta kutusu ekle"
 
-#: src/mainwindow.c:1713
+#: src/mainwindow.c:1719
 #, fuzzy
 msgid ""
 "Specify the location of mailbox.\n"
@@ -3643,16 +3648,16 @@ msgstr ""
 "Eğer varolan potsa kutusu verilirse, otomatik\n"
 "olarak taranacaktır."
 
-#: src/mainwindow.c:1719 src/setup.c:49
+#: src/mainwindow.c:1725 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "`%s' posta kutusu zaten var."
 
-#: src/mainwindow.c:1724 src/setup.c:56
+#: src/mainwindow.c:1730 src/setup.c:56
 msgid "Mailbox"
 msgstr "Posta kutusu"
 
-#: src/mainwindow.c:1730 src/setup.c:62
+#: src/mainwindow.c:1736 src/setup.c:62
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3661,132 +3666,132 @@ msgstr ""
 "Posta kutusu oluşturulurken hata oluştu.\n"
 "Bazı dosyalar bulunuyor olabilir veya yeterli izine sahip olmayabilirsiniz."
 
-#: src/mainwindow.c:2198
+#: src/mainwindow.c:2206
 msgid "Sylpheed - Folder View"
 msgstr "Sylheed - Dizin Görünümü"
 
-#: src/mainwindow.c:2217
+#: src/mainwindow.c:2225
 msgid "Sylpheed - Message View"
 msgstr "Sylpeed - İleti Görünümü"
 
-#: src/mainwindow.c:2369 src/summaryview.c:418
+#: src/mainwindow.c:2377 src/summaryview.c:418
 msgid "/_Reply"
 msgstr "/_Yanıtla"
 
-#: src/mainwindow.c:2370
+#: src/mainwindow.c:2378
 msgid "/Reply to _all"
 msgstr "/Her_kese yanıtla"
 
-#: src/mainwindow.c:2371
+#: src/mainwindow.c:2379
 msgid "/Reply to _sender"
 msgstr "/_Gönderene yanıtla"
 
-#: src/mainwindow.c:2372
+#: src/mainwindow.c:2380
 msgid "/Reply to mailing _list"
 msgstr "/_E-posta listesine yanıtla"
 
-#: src/mainwindow.c:2377 src/summaryview.c:425
+#: src/mainwindow.c:2385 src/summaryview.c:425
 msgid "/_Forward"
 msgstr "/_Yönlendir"
 
-#: src/mainwindow.c:2378 src/summaryview.c:426
+#: src/mainwindow.c:2386 src/summaryview.c:426
 msgid "/For_ward as attachment"
 msgstr "/_Ek olarak yönlendir"
 
-#: src/mainwindow.c:2379 src/summaryview.c:427
+#: src/mainwindow.c:2387 src/summaryview.c:427
 msgid "/Redirec_t"
 msgstr "/Ye_niden yönlendir"
 
-#: src/mainwindow.c:2384
+#: src/mainwindow.c:2392
 msgid "Incorporate new mail"
 msgstr "Yeni postaları dağıt"
 
-#: src/mainwindow.c:2386
+#: src/mainwindow.c:2394
 msgid "Incorporate new mail of all accounts"
 msgstr "Tüm hesaplardaki postaları dağıt"
 
-#: src/mainwindow.c:2388
+#: src/mainwindow.c:2396
 msgid "Send queued message(s)"
 msgstr "Kuyruktaki iletileri gönder"
 
-#: src/mainwindow.c:2390
+#: src/mainwindow.c:2398
 msgid "Compose new message"
 msgstr "Yeni ileti düzenle"
 
-#: src/mainwindow.c:2392
+#: src/mainwindow.c:2400
 msgid "Reply to the message"
 msgstr "İletiyi yanıtla"
 
-#: src/mainwindow.c:2394
+#: src/mainwindow.c:2402
 msgid "Reply to all"
 msgstr "Herkese yanıtla"
 
-#: src/mainwindow.c:2396
+#: src/mainwindow.c:2404
 msgid "Forward the message"
 msgstr "İletiyi yönlendir"
 
-#: src/mainwindow.c:2398
+#: src/mainwindow.c:2406
 msgid "Delete the message"
 msgstr "İletiyi sil"
 
-#: src/mainwindow.c:2400
+#: src/mainwindow.c:2408
 #, fuzzy
 msgid "Set as junk mail"
 msgstr "Öntanımlı kullan"
 
-#: src/mainwindow.c:2402
+#: src/mainwindow.c:2410
 msgid "Execute marked process"
 msgstr "İşaretli süreçleri çalıştır"
 
-#: src/mainwindow.c:2404
+#: src/mainwindow.c:2412
 msgid "Next unread message"
 msgstr "Sonraki okunmamış ileti"
 
-#: src/mainwindow.c:2406
+#: src/mainwindow.c:2414
 #, fuzzy
 msgid "Previous unread message"
 msgstr "Sonraki okunmamış ileti"
 
-#: src/mainwindow.c:2410
+#: src/mainwindow.c:2418
 #, fuzzy
 msgid "Print message"
 msgstr "İletiyi gönder"
 
-#: src/mainwindow.c:2412
+#: src/mainwindow.c:2420
 msgid "Common preferences"
 msgstr "Ortak tercihler"
 
-#: src/mainwindow.c:2414 src/prefs_account_dialog.c:511
+#: src/mainwindow.c:2422 src/prefs_account_dialog.c:511
 msgid "Account preferences"
 msgstr "Hesap tercihleri"
 
-#: src/mainwindow.c:2779
+#: src/mainwindow.c:2788
 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:2790
+#: src/mainwindow.c:2799
 msgid "You are online. Click the icon to go offline."
 msgstr "Çevrimiçisiniz. Çevrimdışı olmak için simgeye tıklayın."
 
-#: src/mainwindow.c:3062
+#: src/mainwindow.c:3071
 msgid "Exit"
 msgstr "Çık"
 
-#: src/mainwindow.c:3062
+#: src/mainwindow.c:3071
 msgid "Exit this program?"
 msgstr "Programdan çıkılsın mı?"
 
-#: src/mainwindow.c:3666
+#: src/mainwindow.c:3675
 #, fuzzy
 msgid "Command line options"
 msgstr "Komut satırı belirtilmedi."
 
-#: src/mainwindow.c:3679
+#: src/mainwindow.c:3688
 #, fuzzy
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Kullanım: %s [SEÇENEKLER] ...\n"
 
-#: src/mainwindow.c:3687
+#: src/mainwindow.c:3696
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -3802,7 +3807,7 @@ msgid ""
 "--version"
 msgstr ""
 
-#: src/mainwindow.c:3703
+#: src/mainwindow.c:3712
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
diff --git a/po/uk.po b/po/uk.po
index 93bfd8b0..b8338f21 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed 2.3.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-01-31 16:49+0900\n"
+"POT-Creation-Date: 2007-01-31 17:29+0900\n"
 "PO-Revision-Date: 2007-01-05 13:58+0300\n"
 "Last-Translator: O.R. Nykyforchyn <nick@pu.if.ua>\n"
 "Language-Team: Ukrainian\n"
@@ -913,7 +913,7 @@ msgstr "/Адреса/Редагувати"
 msgid "/_Address/_Delete"
 msgstr "/Адреса/Видалити"
 
-#: src/addressbook.c:359 src/compose.c:673 src/mainwindow.c:787
+#: src/addressbook.c:359 src/compose.c:673 src/mainwindow.c:789
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/Інструменти"
@@ -922,12 +922,12 @@ msgstr "/Інструменти"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/Інструменти/Імпортувати файл LDIF"
 
-#: src/addressbook.c:361 src/compose.c:694 src/mainwindow.c:841
+#: src/addressbook.c:361 src/compose.c:694 src/mainwindow.c:843
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/Допомога"
 
-#: src/addressbook.c:362 src/compose.c:695 src/mainwindow.c:853
+#: src/addressbook.c:362 src/compose.c:695 src/mainwindow.c:855
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/Допомога/Про програму"
@@ -969,7 +969,7 @@ msgstr "/Видалити"
 msgid "E-Mail address"
 msgstr "Адреса e-mail"
 
-#: src/addressbook.c:496 src/compose.c:4873 src/mainwindow.c:2408
+#: src/addressbook.c:496 src/compose.c:4873 src/mainwindow.c:2416
 #: src/prefs_common_dialog.c:2274
 msgid "Address book"
 msgstr "Адресна книга"
@@ -1181,7 +1181,7 @@ msgstr "Адреса організації"
 msgid "Personal address"
 msgstr "Особиста адреса"
 
-#: src/alertpanel.c:142 src/compose.c:5717 src/main.c:638
+#: src/alertpanel.c:142 src/compose.c:5720 src/main.c:638
 msgid "Notice"
 msgstr "Примітка"
 
@@ -1348,9 +1348,9 @@ msgid "/_View/_Reply to"
 msgstr "/Вигляд/Зворотня адреса"
 
 #: src/compose.c:578 src/compose.c:580 src/compose.c:582 src/compose.c:584
-#: src/compose.c:587 src/mainwindow.c:577 src/mainwindow.c:580
-#: src/mainwindow.c:607 src/mainwindow.c:631 src/mainwindow.c:734
-#: src/mainwindow.c:738 src/messageview.c:258
+#: src/compose.c:587 src/mainwindow.c:579 src/mainwindow.c:582
+#: src/mainwindow.c:609 src/mainwindow.c:633 src/mainwindow.c:736
+#: src/mainwindow.c:740 src/messageview.c:258
 msgid "/_View/---"
 msgstr "/Вигляд/---"
 
@@ -1371,7 +1371,7 @@ msgstr "/Вигляд/Вкладення"
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/Вигляд/Перейти до/Іншої папки"
 
-#: src/compose.c:593 src/mainwindow.c:638 src/messageview.c:173
+#: src/compose.c:593 src/mainwindow.c:640 src/messageview.c:173
 msgid "/_View/Character _encoding"
 msgstr "/Вигляд/Кодова таблиця"
 
@@ -1382,112 +1382,112 @@ msgstr "/Вигляд/Кодова таблиця/_Aвтоматична"
 #: src/compose.c:596 src/compose.c:602 src/compose.c:608 src/compose.c:612
 #: src/compose.c:620 src/compose.c:624 src/compose.c:630 src/compose.c:636
 #: src/compose.c:640 src/compose.c:650 src/compose.c:654 src/compose.c:662
-#: src/compose.c:666 src/mainwindow.c:634 src/mainwindow.c:641
+#: src/compose.c:666 src/mainwindow.c:636 src/mainwindow.c:643
 #: src/messageview.c:169
 msgid "/_View/Character _encoding/---"
 msgstr "/Вигляд/Кодова таблиця/---"
 
-#: src/compose.c:598 src/mainwindow.c:642 src/messageview.c:177
+#: src/compose.c:598 src/mainwindow.c:644 src/messageview.c:177
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/Вигляд/Кодова таблиця/7bit ascii (US-ASC_II)"
 
-#: src/compose.c:600 src/mainwindow.c:644 src/messageview.c:180
+#: src/compose.c:600 src/mainwindow.c:646 src/messageview.c:180
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/Вигляд/Кодова таблиця/Unicode (UT_F-8)"
 
-#: src/compose.c:604 src/mainwindow.c:648 src/messageview.c:183
+#: src/compose.c:604 src/mainwindow.c:650 src/messageview.c:183
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/Вигляд/Кодова таблиця/Західноєвропейська (ISO-8859-_1)"
 
-#: src/compose.c:606 src/mainwindow.c:650 src/messageview.c:185
+#: src/compose.c:606 src/mainwindow.c:652 src/messageview.c:185
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/Вигляд/Кодова таблиця/Західноєвропейська (ISO-8859-15)"
 
-#: src/compose.c:610 src/mainwindow.c:656 src/messageview.c:190
+#: src/compose.c:610 src/mainwindow.c:658 src/messageview.c:190
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/Вигляд/Кодова таблиця/Західноєвропейська (ISO-8859-_2)"
 
-#: src/compose.c:614 src/mainwindow.c:660 src/messageview.c:193
+#: src/compose.c:614 src/mainwindow.c:662 src/messageview.c:193
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/Вигляд/Кодова таблиця/Балтійська (ISO-8859-1_3)"
 
-#: src/compose.c:616 src/mainwindow.c:662 src/messageview.c:195
+#: src/compose.c:616 src/mainwindow.c:664 src/messageview.c:195
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/Вигляд/Кодова таблиця/Балтійська (ISO-8859-_4)"
 
-#: src/compose.c:618 src/mainwindow.c:664 src/messageview.c:197
+#: src/compose.c:618 src/mainwindow.c:666 src/messageview.c:197
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/Вигляд/Кодова таблиця/Балтійська (Windows-1257)"
 
-#: src/compose.c:622 src/mainwindow.c:668 src/messageview.c:200
+#: src/compose.c:622 src/mainwindow.c:670 src/messageview.c:200
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/Вигляд/Кодова таблиця/Грецька (ISO-8859-_7)"
 
-#: src/compose.c:626 src/mainwindow.c:672 src/messageview.c:203
+#: src/compose.c:626 src/mainwindow.c:674 src/messageview.c:203
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/Вигляд/Кодова таблиця/Арабська (ISO-8859-_6)"
 
-#: src/compose.c:628 src/mainwindow.c:674 src/messageview.c:205
+#: src/compose.c:628 src/mainwindow.c:676 src/messageview.c:205
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/Вигляд/Кодова таблиця/Арабська (Windows-1256)"
 
-#: src/compose.c:632 src/mainwindow.c:678 src/messageview.c:208
+#: src/compose.c:632 src/mainwindow.c:680 src/messageview.c:208
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/Вигляд/Кодова таблиця/Єврейська (ISO-8859-_8)"
 
-#: src/compose.c:634 src/mainwindow.c:680 src/messageview.c:210
+#: src/compose.c:634 src/mainwindow.c:682 src/messageview.c:210
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/Вигляд/Кодова таблиця/Єврейська (_Windows-1255)"
 
-#: src/compose.c:638 src/mainwindow.c:684 src/messageview.c:213
+#: src/compose.c:638 src/mainwindow.c:686 src/messageview.c:213
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/Вигляд/Кодова таблиця/Турецька (ISO-8859-_9)"
 
-#: src/compose.c:642 src/mainwindow.c:688 src/messageview.c:216
+#: src/compose.c:642 src/mainwindow.c:690 src/messageview.c:216
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/Вигляд/Кодова таблиця/Кирилиця (ISO-8859-_5)"
 
-#: src/compose.c:644 src/mainwindow.c:690 src/messageview.c:218
+#: src/compose.c:644 src/mainwindow.c:692 src/messageview.c:218
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/Вигляд/Кодова таблиця/Кирилиця (KOI8-_R)"
 
-#: src/compose.c:646 src/mainwindow.c:692 src/messageview.c:220
+#: src/compose.c:646 src/mainwindow.c:694 src/messageview.c:220
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/Вигляд/Кодова таблиця/Кирилиця (KOI8-_U)"
 
-#: src/compose.c:648 src/mainwindow.c:694 src/messageview.c:222
+#: src/compose.c:648 src/mainwindow.c:696 src/messageview.c:222
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/Вигляд/Кодова таблиця/Кирилиця (_Windows-1251)"
 
-#: src/compose.c:652 src/mainwindow.c:698 src/messageview.c:225
+#: src/compose.c:652 src/mainwindow.c:700 src/messageview.c:225
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/Вигляд/Кодова таблиця/Японська (ISO-2022-_JP)"
 
-#: src/compose.c:656 src/mainwindow.c:708 src/messageview.c:234
+#: src/compose.c:656 src/mainwindow.c:710 src/messageview.c:234
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/Вигляд/Кодова таблиця/Спрощена китайська (_GB2312)"
 
-#: src/compose.c:658 src/mainwindow.c:710 src/messageview.c:236
+#: src/compose.c:658 src/mainwindow.c:712 src/messageview.c:236
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/Вигляд/Кодова таблиця/Спрощена китайська (_GBK)"
 
-#: src/compose.c:660 src/mainwindow.c:712 src/messageview.c:238
+#: src/compose.c:660 src/mainwindow.c:714 src/messageview.c:238
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/Вигляд/Кодова таблиця/Традиційна китайська (_Big5)"
 
-#: src/compose.c:664 src/mainwindow.c:720 src/messageview.c:245
+#: src/compose.c:664 src/mainwindow.c:722 src/messageview.c:245
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/Вигляд/Кодова таблиця/Корейська (EUC-_KR)"
 
-#: src/compose.c:668 src/mainwindow.c:726 src/messageview.c:250
+#: src/compose.c:668 src/mainwindow.c:728 src/messageview.c:250
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/Вигляд/Кодова таблиця/Тайська (TIS-620)"
 
-#: src/compose.c:670 src/mainwindow.c:728 src/messageview.c:252
+#: src/compose.c:670 src/mainwindow.c:730 src/messageview.c:252
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/Вигляд/Кодова таблиця/Тайська (Windows-874)"
 
-#: src/compose.c:674 src/mainwindow.c:788 src/messageview.c:283
+#: src/compose.c:674 src/mainwindow.c:790 src/messageview.c:283
 msgid "/_Tools/_Address book"
 msgstr "/Інструменти/Адресна книга"
 
@@ -1495,13 +1495,13 @@ msgstr "/Інструменти/Адресна книга"
 msgid "/_Tools/_Template"
 msgstr "/Інструменти/Шаблон"
 
-#: src/compose.c:677 src/mainwindow.c:812 src/messageview.c:299
+#: src/compose.c:677 src/mainwindow.c:814 src/messageview.c:299
 msgid "/_Tools/Actio_ns"
 msgstr "/Інструменти/Дії"
 
-#: src/compose.c:679 src/compose.c:683 src/compose.c:689 src/mainwindow.c:791
-#: src/mainwindow.c:805 src/mainwindow.c:810 src/mainwindow.c:813
-#: src/mainwindow.c:817 src/mainwindow.c:819 src/messageview.c:286
+#: src/compose.c:679 src/compose.c:683 src/compose.c:689 src/mainwindow.c:793
+#: src/mainwindow.c:807 src/mainwindow.c:812 src/mainwindow.c:815
+#: src/mainwindow.c:819 src/mainwindow.c:821 src/messageview.c:286
 #: src/messageview.c:298
 msgid "/_Tools/---"
 msgstr "/Інструменти/---"
@@ -1707,7 +1707,7 @@ msgstr "Підпис PGP"
 msgid "PGP Encrypt"
 msgstr "Шифрування PGP"
 
-#: src/compose.c:4442 src/compose.c:5543
+#: src/compose.c:4442 src/compose.c:5546
 msgid "MIME type"
 msgstr "тип MIME"
 
@@ -1749,36 +1749,36 @@ msgstr "Редагувати зовнішнім редактором"
 msgid "Wrap all long lines"
 msgstr "Згорнути всі довгі рядки"
 
-#: src/compose.c:5439
+#: src/compose.c:5442
 msgid "Invalid MIME type."
 msgstr "Неправильний тип MIME."
 
-#: src/compose.c:5457
+#: src/compose.c:5460
 msgid "File doesn't exist or is empty."
 msgstr "Файл не існує або порожній."
 
-#: src/compose.c:5525
+#: src/compose.c:5528
 msgid "Properties"
 msgstr "Властивості"
 
-#: src/compose.c:5545 src/prefs_common_dialog.c:1504
+#: src/compose.c:5548 src/prefs_common_dialog.c:1504
 msgid "Encoding"
 msgstr "Кодування"
 
-#: src/compose.c:5568 src/prefs_folder_item.c:202
+#: src/compose.c:5571 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Шлях"
 
-#: src/compose.c:5569
+#: src/compose.c:5572
 msgid "File name"
 msgstr "Ім'я файлу"
 
-#: src/compose.c:5659
+#: src/compose.c:5662
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Командний рядок зовнішнього редактора неправильний: `%s'\n"
 
-#: src/compose.c:5714
+#: src/compose.c:5717
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1787,48 +1787,48 @@ msgstr ""
 "Зовнішній редактор досі працює.\n"
 "Примусово обірвати процес (pid: %d)?\n"
 
-#: src/compose.c:6040 src/mainwindow.c:2752
+#: src/compose.c:6043 src/mainwindow.c:2761
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:6156 src/compose.c:6161 src/compose.c:6167
+#: src/compose.c:6159 src/compose.c:6164 src/compose.c:6170
 msgid "Can't queue the message."
 msgstr "Не вдалось поставити лист в чергу."
 
-#: src/compose.c:6258
+#: src/compose.c:6261
 msgid "Select files"
 msgstr "Обрати файли"
 
-#: src/compose.c:6281
+#: src/compose.c:6284
 msgid "Select file"
 msgstr "Обрати файл"
 
-#: src/compose.c:6316
+#: src/compose.c:6319
 msgid "Save message"
 msgstr "Зберегти лист"
 
-#: src/compose.c:6317
+#: src/compose.c:6320
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Цей лист було змінено. Зберегти в папці чернеток?"
 
-#: src/compose.c:6319
+#: src/compose.c:6322
 msgid "Close _without saving"
 msgstr "Закрити без збереження"
 
-#: src/compose.c:6361
+#: src/compose.c:6364
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Чи бажаєте Ви застосувати шаблон `%s' ?"
 
-#: src/compose.c:6363
+#: src/compose.c:6366
 msgid "Apply template"
 msgstr "Застосувати шаблон"
 
-#: src/compose.c:6364
+#: src/compose.c:6367
 msgid "_Replace"
 msgstr "Замінити"
 
-#: src/compose.c:6364
+#: src/compose.c:6367
 msgid "_Insert"
 msgstr "Вставити"
 
@@ -2283,12 +2283,12 @@ msgstr "Встановлюємо інформацію папки...\n"
 msgid "Setting folder info..."
 msgstr "Встановлюємо інформацію папки..."
 
-#: src/folderview.c:868 src/mainwindow.c:3748 src/setup.c:80
+#: src/folderview.c:868 src/mainwindow.c:3757 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Перечитуємо папку %s%c%s ..."
 
-#: src/folderview.c:872 src/mainwindow.c:3753 src/setup.c:85
+#: src/folderview.c:872 src/mainwindow.c:3762 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Перечитуємо папку %s ..."
@@ -3046,535 +3046,540 @@ msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/Вигляд/Показати чи приховати/Панель інструментів/Іконка і текст"
 
 #: src/mainwindow.c:566
-msgid "/_View/Show or hi_de/_Toolbar/_Icon"
+#, fuzzy
+msgid "/_View/Show or hi_de/_Toolbar/Text at the _right of icon"
 msgstr "/Вигляд/Показати чи приховати/Панель інструментів/Іконка"
 
 #: src/mainwindow.c:568
+msgid "/_View/Show or hi_de/_Toolbar/_Icon"
+msgstr "/Вигляд/Показати чи приховати/Панель інструментів/Іконка"
+
+#: src/mainwindow.c:570
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/Вигляд/Показати чи приховати/Панель інструментів/Текст"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:572
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/Вигляд/Показати чи приховати/Панель інструментів/Немає"
 
-#: src/mainwindow.c:572
+#: src/mainwindow.c:574
 msgid "/_View/Show or hi_de/_Search bar"
 msgstr "/Вигляд/Показати чи приховати/Панель пошуку"
 
-#: src/mainwindow.c:574
+#: src/mainwindow.c:576
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/Вигляд/Показати чи приховати/Панель стану"
 
-#: src/mainwindow.c:576
+#: src/mainwindow.c:578
 #, fuzzy
 msgid "/_View/_Customize toolbar..."
 msgstr "/Вигляд/Перейти до/Іншої папки"
 
-#: src/mainwindow.c:578
+#: src/mainwindow.c:580
 msgid "/_View/Separate f_older tree"
 msgstr "/Вигляд/Окреме дерево папок"
 
-#: src/mainwindow.c:579
+#: src/mainwindow.c:581
 msgid "/_View/Separate _message view"
 msgstr "/Вигляд/Окрема область перегляду змісту"
 
-#: src/mainwindow.c:581
+#: src/mainwindow.c:583
 msgid "/_View/_Sort"
 msgstr "/Вигляд/Сортувати"
 
-#: src/mainwindow.c:582
+#: src/mainwindow.c:584
 msgid "/_View/_Sort/by _number"
 msgstr "/Вигляд/Сортувати/За номером"
 
-#: src/mainwindow.c:583
+#: src/mainwindow.c:585
 msgid "/_View/_Sort/by s_ize"
 msgstr "/Вигляд/Сортувати/За розміром"
 
-#: src/mainwindow.c:584
+#: src/mainwindow.c:586
 msgid "/_View/_Sort/by _date"
 msgstr "/Вигляд/Сортувати/За датою"
 
-#: src/mainwindow.c:585
+#: src/mainwindow.c:587
 msgid "/_View/_Sort/by t_hread date"
 msgstr "/Вигляд/Сортувати/За датою нитки обговорення"
 
-#: src/mainwindow.c:586
+#: src/mainwindow.c:588
 msgid "/_View/_Sort/by _from"
 msgstr "/Вигляд/Сортувати/За відправником"
 
-#: src/mainwindow.c:587
+#: src/mainwindow.c:589
 msgid "/_View/_Sort/by _recipient"
 msgstr "/Вигляд/Сортувати/За одержувачем"
 
-#: src/mainwindow.c:588
+#: src/mainwindow.c:590
 msgid "/_View/_Sort/by _subject"
 msgstr "/Вигляд/Сортувати/За темою"
 
-#: src/mainwindow.c:589
+#: src/mainwindow.c:591
 msgid "/_View/_Sort/by _color label"
 msgstr "/Вигляд/Сортувати/За виділенням кольором"
 
-#: src/mainwindow.c:591
+#: src/mainwindow.c:593
 msgid "/_View/_Sort/by _mark"
 msgstr "/Вигляд/Сортувати/За позначкою"
 
-#: src/mainwindow.c:592
+#: src/mainwindow.c:594
 msgid "/_View/_Sort/by _unread"
 msgstr "/Вигляд/Сортувати/Окремо непрочитані"
 
-#: src/mainwindow.c:593
+#: src/mainwindow.c:595
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/Вигляд/Сортувати/За вкладенням"
 
-#: src/mainwindow.c:595
+#: src/mainwindow.c:597
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/Вигляд/Сортувати/Непотрібно"
 
-#: src/mainwindow.c:596 src/mainwindow.c:599
+#: src/mainwindow.c:598 src/mainwindow.c:601
 msgid "/_View/_Sort/---"
 msgstr "/Вигляд/Сортувати/---"
 
-#: src/mainwindow.c:597
+#: src/mainwindow.c:599
 msgid "/_View/_Sort/Ascending"
 msgstr "/Вигляд/Сортувати/За зростанням"
 
-#: src/mainwindow.c:598
+#: src/mainwindow.c:600
 msgid "/_View/_Sort/Descending"
 msgstr "/Вигляд/Сортувати/За спаданням"
 
-#: src/mainwindow.c:600
+#: src/mainwindow.c:602
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/Вигляд/Сортувати/Групувати за темою"
 
-#: src/mainwindow.c:602
+#: src/mainwindow.c:604
 msgid "/_View/Th_read view"
 msgstr "/Вигляд/Перегляд обговорення"
 
-#: src/mainwindow.c:603
+#: src/mainwindow.c:605
 msgid "/_View/E_xpand all threads"
 msgstr "/Вигляд/Розгортати всі обговорення"
 
-#: src/mainwindow.c:604
+#: src/mainwindow.c:606
 msgid "/_View/Co_llapse all threads"
 msgstr "/Вигляд/Згорнути всі обговорення"
 
-#: src/mainwindow.c:605
+#: src/mainwindow.c:607
 msgid "/_View/Set display _item..."
 msgstr "/Вигляд/Встановити поля для показу..."
 
-#: src/mainwindow.c:608
+#: src/mainwindow.c:610
 msgid "/_View/_Go to"
 msgstr "/Вигляд/Перейти до"
 
-#: src/mainwindow.c:609
+#: src/mainwindow.c:611
 msgid "/_View/_Go to/_Prev message"
 msgstr "/Вигляд/Перейти до/Наступного листа"
 
-#: src/mainwindow.c:610
+#: src/mainwindow.c:612
 msgid "/_View/_Go to/_Next message"
 msgstr "/Вигляд/Перейти до/Попереднього листа"
 
-#: src/mainwindow.c:611 src/mainwindow.c:616 src/mainwindow.c:619
-#: src/mainwindow.c:624 src/mainwindow.c:629
+#: src/mainwindow.c:613 src/mainwindow.c:618 src/mainwindow.c:621
+#: src/mainwindow.c:626 src/mainwindow.c:631
 msgid "/_View/_Go to/---"
 msgstr "/Вигляд/Перейти до/---"
 
-#: src/mainwindow.c:612
+#: src/mainwindow.c:614
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/Вигляд/Перейти до/Попереднього непрочитаного листа"
 
-#: src/mainwindow.c:614
+#: src/mainwindow.c:616
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/Вигляд/Перейти до/Наступного непрочитаного листа"
 
-#: src/mainwindow.c:617
+#: src/mainwindow.c:619
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/Вигляд/Перейти до/Попереднього нового листа"
 
-#: src/mainwindow.c:618
+#: src/mainwindow.c:620
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/Вигляд/Перейти до/Наступного нового листа"
 
-#: src/mainwindow.c:620
+#: src/mainwindow.c:622
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/Вигляд/Перейти до/Попереднього позначеного листа"
 
-#: src/mainwindow.c:622
+#: src/mainwindow.c:624
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/Вигляд/Перейти до/Наступного позначеного листа"
 
-#: src/mainwindow.c:625
+#: src/mainwindow.c:627
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/Вигляд/Перейти до/Попереднього листа, виділеного кольором"
 
-#: src/mainwindow.c:627
+#: src/mainwindow.c:629
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/Вигляд/Перейти до/Наступного листа, виділеного кольором"
 
-#: src/mainwindow.c:630
+#: src/mainwindow.c:632
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/Вигляд/Перейти до/Іншої папки"
 
-#: src/mainwindow.c:639 src/messageview.c:174
+#: src/mainwindow.c:641 src/messageview.c:174
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/Вигляд/Кодова таблиця/_Aвтовизначення"
 
-#: src/mainwindow.c:652 src/messageview.c:187
+#: src/mainwindow.c:654 src/messageview.c:187
 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr "/Вигляд/Кодова таблиця/Західноєвропейська (Windows-1252)"
 
-#: src/mainwindow.c:700 src/messageview.c:227
+#: src/mainwindow.c:702 src/messageview.c:227
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/Вигляд/Кодова таблиця/Японська (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:702 src/messageview.c:229
+#: src/mainwindow.c:704 src/messageview.c:229
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/Вигляд/Кодова таблиця/Японська (_EUC-JP)"
 
-#: src/mainwindow.c:704 src/messageview.c:231
+#: src/mainwindow.c:706 src/messageview.c:231
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/Вигляд/Кодова таблиця/Японська (_Shift__JIS)"
 
-#: src/mainwindow.c:714 src/messageview.c:240
+#: src/mainwindow.c:716 src/messageview.c:240
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/Вигляд/Кодова таблиця/Традиційна китайська (EUC-_TW)"
 
-#: src/mainwindow.c:716 src/messageview.c:242
+#: src/mainwindow.c:718 src/messageview.c:242
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/Вигляд/Кодова таблиця/Китайська (ISO-2022-_CN)"
 
-#: src/mainwindow.c:722 src/messageview.c:247
+#: src/mainwindow.c:724 src/messageview.c:247
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/Вигляд/Кодова таблиця/Корейська (ISO-2022-KR)"
 
-#: src/mainwindow.c:735 src/summaryview.c:464
+#: src/mainwindow.c:737 src/summaryview.c:464
 msgid "/_View/Open in new _window"
 msgstr "/Вигляд/Відкрити в новому вікні"
 
-#: src/mainwindow.c:736 src/messageview.c:259 src/summaryview.c:466
+#: src/mainwindow.c:738 src/messageview.c:259 src/summaryview.c:466
 msgid "/_View/Mess_age source"
 msgstr "/Вигляд/Вихідний текст листа"
 
-#: src/mainwindow.c:737 src/messageview.c:260 src/summaryview.c:467
+#: src/mainwindow.c:739 src/messageview.c:260 src/summaryview.c:467
 msgid "/_View/All _headers"
 msgstr "/Вигляд/Весь заголовок"
 
-#: src/mainwindow.c:739
+#: src/mainwindow.c:741
 msgid "/_View/_Update summary"
 msgstr "/Вигляд/Оновити список"
 
-#: src/mainwindow.c:741 src/messageview.c:263
+#: src/mainwindow.c:743 src/messageview.c:263
 msgid "/_Message"
 msgstr "/Лист"
 
-#: src/mainwindow.c:742
+#: src/mainwindow.c:744
 msgid "/_Message/Recei_ve"
 msgstr "/Лист/Отримати"
 
-#: src/mainwindow.c:743
+#: src/mainwindow.c:745
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/Лист/Отримати/Для поточного запису"
 
-#: src/mainwindow.c:745
+#: src/mainwindow.c:747
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/Лист/Отримати/Для всіх записів"
 
-#: src/mainwindow.c:747
+#: src/mainwindow.c:749
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/Лист/Отримати/Скасувати отримання"
 
-#: src/mainwindow.c:749
+#: src/mainwindow.c:751
 msgid "/_Message/Recei_ve/---"
 msgstr "/Лист/Отримати/---"
 
-#: src/mainwindow.c:750
+#: src/mainwindow.c:752
 msgid "/_Message/_Send queued messages"
 msgstr "/Лист/Відіслати відкладені листи"
 
-#: src/mainwindow.c:751 src/mainwindow.c:753 src/mainwindow.c:760
-#: src/mainwindow.c:765 src/mainwindow.c:768 src/mainwindow.c:779
-#: src/mainwindow.c:781 src/mainwindow.c:784 src/messageview.c:266
+#: src/mainwindow.c:753 src/mainwindow.c:755 src/mainwindow.c:762
+#: src/mainwindow.c:767 src/mainwindow.c:770 src/mainwindow.c:781
+#: src/mainwindow.c:783 src/mainwindow.c:786 src/messageview.c:266
 #: src/messageview.c:274 src/messageview.c:279
 msgid "/_Message/---"
 msgstr "/Лист/---"
 
-#: src/mainwindow.c:752 src/messageview.c:264
+#: src/mainwindow.c:754 src/messageview.c:264
 msgid "/_Message/Compose _new message"
 msgstr "/Лист/Написати новий лист"
 
-#: src/mainwindow.c:754 src/messageview.c:267
+#: src/mainwindow.c:756 src/messageview.c:267
 msgid "/_Message/_Reply"
 msgstr "/Лист/Відповісти"
 
-#: src/mainwindow.c:755
+#: src/mainwindow.c:757
 msgid "/_Message/Repl_y to"
 msgstr "/Лист/Відповісти"
 
-#: src/mainwindow.c:756 src/messageview.c:268
+#: src/mainwindow.c:758 src/messageview.c:268
 msgid "/_Message/Repl_y to/_all"
 msgstr "/Лист/Відповісти/всім"
 
-#: src/mainwindow.c:757 src/messageview.c:270
+#: src/mainwindow.c:759 src/messageview.c:270
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/Лист/Відповісти/відправнику"
 
-#: src/mainwindow.c:758 src/messageview.c:272
+#: src/mainwindow.c:760 src/messageview.c:272
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/Лист/Відповісти/конференції"
 
-#: src/mainwindow.c:761 src/messageview.c:275
+#: src/mainwindow.c:763 src/messageview.c:275
 msgid "/_Message/_Forward"
 msgstr "/Лист/Переслати"
 
-#: src/mainwindow.c:762 src/messageview.c:276
+#: src/mainwindow.c:764 src/messageview.c:276
 msgid "/_Message/For_ward as attachment"
 msgstr "/Лист/Переслати як вкладення"
 
-#: src/mainwindow.c:764 src/messageview.c:278
+#: src/mainwindow.c:766 src/messageview.c:278
 msgid "/_Message/Redirec_t"
 msgstr "/Лист/Переспрямувати"
 
-#: src/mainwindow.c:766
+#: src/mainwindow.c:768
 msgid "/_Message/M_ove..."
 msgstr "/Лист/Перемістити"
 
-#: src/mainwindow.c:767
+#: src/mainwindow.c:769
 msgid "/_Message/_Copy..."
 msgstr "/Лист/Копіювати"
 
-#: src/mainwindow.c:769
+#: src/mainwindow.c:771
 msgid "/_Message/_Mark"
 msgstr "/Лист/Позначка"
 
-#: src/mainwindow.c:770
+#: src/mainwindow.c:772
 msgid "/_Message/_Mark/_Mark"
 msgstr "/Лист/Позначка/Зробити"
 
-#: src/mainwindow.c:771
+#: src/mainwindow.c:773
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/Лист/Позначка/Зняти"
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:774
 msgid "/_Message/_Mark/---"
 msgstr "/Лист/Позначка/---"
 
-#: src/mainwindow.c:773
+#: src/mainwindow.c:775
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/Лист/Позначка/Позначити як непрочитаний"
 
-#: src/mainwindow.c:774
+#: src/mainwindow.c:776
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/Лист/Позначка/Позначити як прочитаний"
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:778
 msgid "/_Message/_Mark/Mark _thread as read"
 msgstr "/Лист/Позначка/Позначити нитку як прочитану"
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:780
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/Лист/Позначка/Позначити всі як прочитані"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:782
 msgid "/_Message/_Delete"
 msgstr "/Лист/Видалити"
 
-#: src/mainwindow.c:782
+#: src/mainwindow.c:784
 msgid "/_Message/Set as _junk mail"
 msgstr "/Лист/Вважати мотлохом"
 
-#: src/mainwindow.c:783
+#: src/mainwindow.c:785
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/Лист/Не вважати мотлохом"
 
-#: src/mainwindow.c:785 src/messageview.c:280
+#: src/mainwindow.c:787 src/messageview.c:280
 msgid "/_Message/Re-_edit"
 msgstr "/Лист/Змінити"
 
-#: src/mainwindow.c:789
+#: src/mainwindow.c:791
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/Інструменти/Додати відправника до адресної книги"
 
-#: src/mainwindow.c:792
+#: src/mainwindow.c:794
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/Інструменти/Фільтрувати всі листи в папці"
 
-#: src/mainwindow.c:794
+#: src/mainwindow.c:796
 msgid "/_Tools/Filter _selected messages"
 msgstr "/Інструменти/Фільтрувати виділені листи"
 
-#: src/mainwindow.c:796 src/messageview.c:287
+#: src/mainwindow.c:798 src/messageview.c:287
 msgid "/_Tools/_Create filter rule"
 msgstr "/Інструменти/Створити правило фільтрування"
 
-#: src/mainwindow.c:797 src/messageview.c:289
+#: src/mainwindow.c:799 src/messageview.c:289
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/Інструменти/Створити правило фільтрування/Автоматично"
 
-#: src/mainwindow.c:799 src/messageview.c:291
+#: src/mainwindow.c:801 src/messageview.c:291
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/Інструменти/Створити правило фільтрування/За полем `Від'"
 
-#: src/mainwindow.c:801 src/messageview.c:293
+#: src/mainwindow.c:803 src/messageview.c:293
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/Інструменти/Створити правило фільтрування/За полем `Кому'"
 
-#: src/mainwindow.c:803 src/messageview.c:295
+#: src/mainwindow.c:805 src/messageview.c:295
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/Інструменти/Створити правило фільтрування/За полем `Тема'"
 
-#: src/mainwindow.c:806
+#: src/mainwindow.c:808
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/Інструменти/Фільтрувати мотлох в папці"
 
-#: src/mainwindow.c:808
+#: src/mainwindow.c:810
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/Інструменти/Фільтрувати мотлох у виділених листах"
 
-#: src/mainwindow.c:815
+#: src/mainwindow.c:817
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/Інструменти/Видалити повторювані листи"
 
-#: src/mainwindow.c:818
+#: src/mainwindow.c:820
 #, fuzzy
 msgid "/_Tools/E_xecute marked process"
 msgstr "Виконати позначений процес"
 
-#: src/mainwindow.c:820
+#: src/mainwindow.c:822
 msgid "/_Tools/_Log window"
 msgstr "/Інструменти/Вікно журналу"
 
-#: src/mainwindow.c:822
+#: src/mainwindow.c:824
 msgid "/_Configuration"
 msgstr "/Конфігурація"
 
-#: src/mainwindow.c:823
+#: src/mainwindow.c:825
 msgid "/_Configuration/_Common preferences..."
 msgstr "/Конфігурація/Спільні налаштування..."
 
-#: src/mainwindow.c:825
+#: src/mainwindow.c:827
 msgid "/_Configuration/_Filter setting..."
 msgstr "/Конфігурація/Налаштування фільтра..."
 
-#: src/mainwindow.c:827
+#: src/mainwindow.c:829
 msgid "/_Configuration/_Template..."
 msgstr "/Конфігурація/Шаблон..."
 
-#: src/mainwindow.c:829
+#: src/mainwindow.c:831
 msgid "/_Configuration/_Actions..."
 msgstr "/Конфігурація/Дії..."
 
-#: src/mainwindow.c:831
+#: src/mainwindow.c:833
 msgid "/_Configuration/---"
 msgstr "/Конфігурація/---"
 
-#: src/mainwindow.c:832
+#: src/mainwindow.c:834
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/Конфігурація/Налаштування поточного запису..."
 
-#: src/mainwindow.c:834
+#: src/mainwindow.c:836
 msgid "/_Configuration/Create _new account..."
 msgstr "/Конфігурація/Створити новий обліковий запис..."
 
-#: src/mainwindow.c:836
+#: src/mainwindow.c:838
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/Конфігурація/Редагувати облікові записи..."
 
-#: src/mainwindow.c:838
+#: src/mainwindow.c:840
 msgid "/_Configuration/C_hange current account"
 msgstr "/Конфігурація/Змінити поточний запис"
 
-#: src/mainwindow.c:842
+#: src/mainwindow.c:844
 msgid "/_Help/_Manual"
 msgstr "/Довідка/Посібник"
 
-#: src/mainwindow.c:843
+#: src/mainwindow.c:845
 msgid "/_Help/_Manual/_English"
 msgstr "/Довідка/Посібник/Англійський"
 
-#: src/mainwindow.c:844
+#: src/mainwindow.c:846
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/Довідка/Посібник/Японський"
 
-#: src/mainwindow.c:845
+#: src/mainwindow.c:847
 msgid "/_Help/_FAQ"
 msgstr "/Довідка/FAQ"
 
-#: src/mainwindow.c:846
+#: src/mainwindow.c:848
 msgid "/_Help/_FAQ/_English"
 msgstr "/Довідка/FAQ/Англійський"
 
-#: src/mainwindow.c:847
+#: src/mainwindow.c:849
 msgid "/_Help/_FAQ/_German"
 msgstr "/Довідка/FAQ/Німецький"
 
-#: src/mainwindow.c:848
+#: src/mainwindow.c:850
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/Довідка/FAQ/Іспанський"
 
-#: src/mainwindow.c:849
+#: src/mainwindow.c:851
 msgid "/_Help/_FAQ/_French"
 msgstr "/Довідка/FAQ/Французький"
 
-#: src/mainwindow.c:850
+#: src/mainwindow.c:852
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/Довідка/FAQ/Італійський"
 
-#: src/mainwindow.c:851
+#: src/mainwindow.c:853
 msgid "/_Help/_Command line options"
 msgstr "/Довідка/Опції командного рядка"
 
-#: src/mainwindow.c:852
+#: src/mainwindow.c:854
 msgid "/_Help/---"
 msgstr "/Довідка/---"
 
-#: src/mainwindow.c:895
+#: src/mainwindow.c:897
 msgid "Creating main window...\n"
 msgstr "Створюємо головне вікно...\n"
 
-#: src/mainwindow.c:1071
+#: src/mainwindow.c:1073
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Головне Вікно: невдача розміщення кольору %d\n"
 
-#: src/mainwindow.c:1175 src/summaryview.c:2387 src/summaryview.c:2472
+#: src/mainwindow.c:1181 src/summaryview.c:2387 src/summaryview.c:2472
 #: src/summaryview.c:4009 src/summaryview.c:4138 src/summaryview.c:4507
 msgid "done.\n"
 msgstr "виконано.\n"
 
-#: src/mainwindow.c:1293 src/mainwindow.c:1334 src/mainwindow.c:1359
+#: src/mainwindow.c:1299 src/mainwindow.c:1340 src/mainwindow.c:1365
 msgid "Untitled"
 msgstr "БезНазви"
 
-#: src/mainwindow.c:1360
+#: src/mainwindow.c:1366
 msgid "none"
 msgstr "немає"
 
-#: src/mainwindow.c:1413
+#: src/mainwindow.c:1419
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "Зміна типу розділення вікна з %d на %d\n"
 
-#: src/mainwindow.c:1663
+#: src/mainwindow.c:1669
 msgid "Offline"
 msgstr "Без з'єднання"
 
-#: src/mainwindow.c:1664
+#: src/mainwindow.c:1670
 msgid "You are offline. Go online?"
 msgstr "З'єднання немає. Під'єднатись?"
 
-#: src/mainwindow.c:1681
+#: src/mainwindow.c:1687
 msgid "Empty all trash"
 msgstr "Спорожнити весь кошик"
 
-#: src/mainwindow.c:1682
+#: src/mainwindow.c:1688
 msgid "Delete all messages in trash folders?"
 msgstr "Видалити всі листи з усіх папок кошика?"
 
-#: src/mainwindow.c:1712
+#: src/mainwindow.c:1718
 msgid "Add mailbox"
 msgstr "Додати скриньку"
 
-#: src/mainwindow.c:1713
+#: src/mainwindow.c:1719
 msgid ""
 "Specify the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3584,16 +3589,16 @@ msgstr ""
 "Якщо вона вже існує, її буде перечитано\n"
 "автоматично."
 
-#: src/mainwindow.c:1719 src/setup.c:49
+#: src/mainwindow.c:1725 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Скринька `%s' вже існує."
 
-#: src/mainwindow.c:1724 src/setup.c:56
+#: src/mainwindow.c:1730 src/setup.c:56
 msgid "Mailbox"
 msgstr "Скринька"
 
-#: src/mainwindow.c:1730 src/setup.c:62
+#: src/mainwindow.c:1736 src/setup.c:62
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3603,129 +3608,129 @@ msgstr ""
 "Можливо, деякі файли вже існують, або Ви не маєте\n"
 "права запису тут."
 
-#: src/mainwindow.c:2198
+#: src/mainwindow.c:2206
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Папки"
 
-#: src/mainwindow.c:2217
+#: src/mainwindow.c:2225
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Листи"
 
-#: src/mainwindow.c:2369 src/summaryview.c:418
+#: src/mainwindow.c:2377 src/summaryview.c:418
 msgid "/_Reply"
 msgstr "/Відповісти"
 
-#: src/mainwindow.c:2370
+#: src/mainwindow.c:2378
 msgid "/Reply to _all"
 msgstr "/Відповісти всім"
 
-#: src/mainwindow.c:2371
+#: src/mainwindow.c:2379
 msgid "/Reply to _sender"
 msgstr "/Відповісти відправникові"
 
-#: src/mainwindow.c:2372
+#: src/mainwindow.c:2380
 msgid "/Reply to mailing _list"
 msgstr "/Відповісти конференції"
 
-#: src/mainwindow.c:2377 src/summaryview.c:425
+#: src/mainwindow.c:2385 src/summaryview.c:425
 msgid "/_Forward"
 msgstr "/Переслати далі"
 
-#: src/mainwindow.c:2378 src/summaryview.c:426
+#: src/mainwindow.c:2386 src/summaryview.c:426
 msgid "/For_ward as attachment"
 msgstr "/Переслати далі як вкладення"
 
-#: src/mainwindow.c:2379 src/summaryview.c:427
+#: src/mainwindow.c:2387 src/summaryview.c:427
 msgid "/Redirec_t"
 msgstr "/Переспрямувати"
 
-#: src/mainwindow.c:2384
+#: src/mainwindow.c:2392
 msgid "Incorporate new mail"
 msgstr "Отримати нові листи"
 
-#: src/mainwindow.c:2386
+#: src/mainwindow.c:2394
 msgid "Incorporate new mail of all accounts"
 msgstr "Отримати нові листи для всіх записів"
 
-#: src/mainwindow.c:2388
+#: src/mainwindow.c:2396
 msgid "Send queued message(s)"
 msgstr "Відіслати лист(и) з черги"
 
-#: src/mainwindow.c:2390
+#: src/mainwindow.c:2398
 msgid "Compose new message"
 msgstr "Новий лист"
 
-#: src/mainwindow.c:2392
+#: src/mainwindow.c:2400
 msgid "Reply to the message"
 msgstr "Відповісти на лист"
 
-#: src/mainwindow.c:2394
+#: src/mainwindow.c:2402
 msgid "Reply to all"
 msgstr "Відповісти всім"
 
-#: src/mainwindow.c:2396
+#: src/mainwindow.c:2404
 msgid "Forward the message"
 msgstr "Переслати лист"
 
-#: src/mainwindow.c:2398
+#: src/mainwindow.c:2406
 msgid "Delete the message"
 msgstr "Видалити лист"
 
-#: src/mainwindow.c:2400
+#: src/mainwindow.c:2408
 msgid "Set as junk mail"
 msgstr "Вважати мотлохом"
 
-#: src/mainwindow.c:2402
+#: src/mainwindow.c:2410
 msgid "Execute marked process"
 msgstr "Виконати позначений процес"
 
-#: src/mainwindow.c:2404
+#: src/mainwindow.c:2412
 msgid "Next unread message"
 msgstr "Наступний непрочитаний лист"
 
-#: src/mainwindow.c:2406
+#: src/mainwindow.c:2414
 #, fuzzy
 msgid "Previous unread message"
 msgstr "Наступний непрочитаний лист"
 
-#: src/mainwindow.c:2410
+#: src/mainwindow.c:2418
 #, fuzzy
 msgid "Print message"
 msgstr "Послати лист"
 
-#: src/mainwindow.c:2412
+#: src/mainwindow.c:2420
 msgid "Common preferences"
 msgstr "Спільні налаштування"
 
-#: src/mainwindow.c:2414 src/prefs_account_dialog.c:511
+#: src/mainwindow.c:2422 src/prefs_account_dialog.c:511
 msgid "Account preferences"
 msgstr "Налаштування запису"
 
-#: src/mainwindow.c:2779
+#: src/mainwindow.c:2788
 msgid "You are offline. Click the icon to go online."
 msgstr "З'єднання немає. Клацніть на іконці, щоб під'єднатись."
 
-#: src/mainwindow.c:2790
+#: src/mainwindow.c:2799
 msgid "You are online. Click the icon to go offline."
 msgstr "Ви під'єднані. Клацніть на іконці, щоб від'єднатись."
 
-#: src/mainwindow.c:3062
+#: src/mainwindow.c:3071
 msgid "Exit"
 msgstr "Вихід"
 
-#: src/mainwindow.c:3062
+#: src/mainwindow.c:3071
 msgid "Exit this program?"
 msgstr "Вийти з цієї програми?"
 
-#: src/mainwindow.c:3666
+#: src/mainwindow.c:3675
 msgid "Command line options"
 msgstr "Опції командного рядка"
 
-#: src/mainwindow.c:3679
+#: src/mainwindow.c:3688
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Вживання: sylpheed [ОПЦІЇ]..."
 
-#: src/mainwindow.c:3687
+#: src/mainwindow.c:3696
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -3753,7 +3758,7 @@ msgstr ""
 "--help\n"
 "--version"
 
-#: src/mainwindow.c:3703
+#: src/mainwindow.c:3712
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
diff --git a/po/vi.po b/po/vi.po
index 5dfcd5be..add5b294 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-01-31 16:49+0900\n"
+"POT-Creation-Date: 2007-01-31 17:29+0900\n"
 "PO-Revision-Date: 2006-04-16 22:05+0700\n"
 "Last-Translator: Pham Thanh Long <ptlong@gmail.com>\n"
 "Language-Team: Vietnamese <gnome-vi-list@gnome.org>\n"
@@ -891,7 +891,7 @@ msgstr "/Đị_a chỉ/_Soạn"
 msgid "/_Address/_Delete"
 msgstr "/Đị_a chỉ/_Xoá"
 
-#: src/addressbook.c:359 src/compose.c:673 src/mainwindow.c:787
+#: src/addressbook.c:359 src/compose.c:673 src/mainwindow.c:789
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Công cụ"
@@ -900,12 +900,12 @@ msgstr "/_Công cụ"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Công cụ/_Nhập tập tin LDIF"
 
-#: src/addressbook.c:361 src/compose.c:694 src/mainwindow.c:841
+#: src/addressbook.c:361 src/compose.c:694 src/mainwindow.c:843
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Hỗ trợ"
 
-#: src/addressbook.c:362 src/compose.c:695 src/mainwindow.c:853
+#: src/addressbook.c:362 src/compose.c:695 src/mainwindow.c:855
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Hỗ trợ/_Giới thiệu"
@@ -947,7 +947,7 @@ msgstr "/_Xoá"
 msgid "E-Mail address"
 msgstr "Địa chỉ email"
 
-#: src/addressbook.c:496 src/compose.c:4873 src/mainwindow.c:2408
+#: src/addressbook.c:496 src/compose.c:4873 src/mainwindow.c:2416
 #: src/prefs_common_dialog.c:2274
 msgid "Address book"
 msgstr "Sổ địa chỉ"
@@ -1163,7 +1163,7 @@ msgstr "Địa chỉ chung"
 msgid "Personal address"
 msgstr "Địa chỉ cá nhân"
 
-#: src/alertpanel.c:142 src/compose.c:5717 src/main.c:638
+#: src/alertpanel.c:142 src/compose.c:5720 src/main.c:638
 msgid "Notice"
 msgstr "Chú ý"
 
@@ -1330,9 +1330,9 @@ msgid "/_View/_Reply to"
 msgstr "/_Xem/_Hồi âm cho"
 
 #: src/compose.c:578 src/compose.c:580 src/compose.c:582 src/compose.c:584
-#: src/compose.c:587 src/mainwindow.c:577 src/mainwindow.c:580
-#: src/mainwindow.c:607 src/mainwindow.c:631 src/mainwindow.c:734
-#: src/mainwindow.c:738 src/messageview.c:258
+#: src/compose.c:587 src/mainwindow.c:579 src/mainwindow.c:582
+#: src/mainwindow.c:609 src/mainwindow.c:633 src/mainwindow.c:736
+#: src/mainwindow.c:740 src/messageview.c:258
 msgid "/_View/---"
 msgstr "/_Xem/---"
 
@@ -1353,7 +1353,7 @@ msgstr "/_Xem/Đí_nh kèm"
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/_Xem/Đi _tới/Thư mụ_c khác..."
 
-#: src/compose.c:593 src/mainwindow.c:638 src/messageview.c:173
+#: src/compose.c:593 src/mainwindow.c:640 src/messageview.c:173
 msgid "/_View/Character _encoding"
 msgstr "/_Xem/Mã _kí tự"
 
@@ -1364,113 +1364,113 @@ msgstr "/_Xem/Mã _kí tự/_Tự động"
 #: src/compose.c:596 src/compose.c:602 src/compose.c:608 src/compose.c:612
 #: src/compose.c:620 src/compose.c:624 src/compose.c:630 src/compose.c:636
 #: src/compose.c:640 src/compose.c:650 src/compose.c:654 src/compose.c:662
-#: src/compose.c:666 src/mainwindow.c:634 src/mainwindow.c:641
+#: src/compose.c:666 src/mainwindow.c:636 src/mainwindow.c:643
 #: src/messageview.c:169
 msgid "/_View/Character _encoding/---"
 msgstr "/_Xem/Mã _kí tự/---"
 
-#: src/compose.c:598 src/mainwindow.c:642 src/messageview.c:177
+#: src/compose.c:598 src/mainwindow.c:644 src/messageview.c:177
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Xem/Mã _kí tự/7bit ascii (US-ASC_II)"
 
-#: src/compose.c:600 src/mainwindow.c:644 src/messageview.c:180
+#: src/compose.c:600 src/mainwindow.c:646 src/messageview.c:180
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Xem/Mã _kí tự/Unicode (_UTF-8)"
 
-#: src/compose.c:604 src/mainwindow.c:648 src/messageview.c:183
+#: src/compose.c:604 src/mainwindow.c:650 src/messageview.c:183
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Xem/Mã _kí tự/Tây Âu (ISO-8859-_1)"
 
-#: src/compose.c:606 src/mainwindow.c:650 src/messageview.c:185
+#: src/compose.c:606 src/mainwindow.c:652 src/messageview.c:185
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Xem/Mã _kí tự/Tây Âu (ISO-8859-15)"
 
-#: src/compose.c:610 src/mainwindow.c:656 src/messageview.c:190
+#: src/compose.c:610 src/mainwindow.c:658 src/messageview.c:190
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Xem/Mã _kí tự/Trung Âu (ISO-8859-_2)"
 
-#: src/compose.c:614 src/mainwindow.c:660 src/messageview.c:193
+#: src/compose.c:614 src/mainwindow.c:662 src/messageview.c:193
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Xem/Mã _kí tự/_Baltic (ISO-8859-13)"
 
-#: src/compose.c:616 src/mainwindow.c:662 src/messageview.c:195
+#: src/compose.c:616 src/mainwindow.c:664 src/messageview.c:195
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Xem/Mã _kí tự/Baltic (ISO-8859-_4)"
 
-#: src/compose.c:618 src/mainwindow.c:664 src/messageview.c:197
+#: src/compose.c:618 src/mainwindow.c:666 src/messageview.c:197
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/_Xem/Mã _kí tự/A-rập (Windows-1256)"
 
-#: src/compose.c:622 src/mainwindow.c:668 src/messageview.c:200
+#: src/compose.c:622 src/mainwindow.c:670 src/messageview.c:200
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Xem/Mã _kí tự/Hi Lạp (ISO-8859-_7)"
 
-#: src/compose.c:626 src/mainwindow.c:672 src/messageview.c:203
+#: src/compose.c:626 src/mainwindow.c:674 src/messageview.c:203
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/_Xem/Mã _kí tự/A-rập (ISO-8859-_6)"
 
-#: src/compose.c:628 src/mainwindow.c:674 src/messageview.c:205
+#: src/compose.c:628 src/mainwindow.c:676 src/messageview.c:205
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/_Xem/Mã _kí tự/A-rập (Windows-1256)"
 
-#: src/compose.c:632 src/mainwindow.c:678 src/messageview.c:208
+#: src/compose.c:632 src/mainwindow.c:680 src/messageview.c:208
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Xem/Mã _kí tự/Do Thái (ISO-8859-_8)"
 
-#: src/compose.c:634 src/mainwindow.c:680 src/messageview.c:210
+#: src/compose.c:634 src/mainwindow.c:682 src/messageview.c:210
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Xem/Mã _kí tự/Do Thái (Windows-1255)"
 
-#: src/compose.c:638 src/mainwindow.c:684 src/messageview.c:213
+#: src/compose.c:638 src/mainwindow.c:686 src/messageview.c:213
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Xem/Mã _kí tự/Thổ Nhĩ Kì (ISO-8859-_9)"
 
-#: src/compose.c:642 src/mainwindow.c:688 src/messageview.c:216
+#: src/compose.c:642 src/mainwindow.c:690 src/messageview.c:216
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Xem/Mã _kí tự/Cyrillic (ISO-8859-_5)"
 
-#: src/compose.c:644 src/mainwindow.c:690 src/messageview.c:218
+#: src/compose.c:644 src/mainwindow.c:692 src/messageview.c:218
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Xem/Mã _kí tự/Cyrillic (KOI8-_R)"
 
-#: src/compose.c:646 src/mainwindow.c:692 src/messageview.c:220
+#: src/compose.c:646 src/mainwindow.c:694 src/messageview.c:220
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Xem/Mã _kí tự/Cyrillic (KOI8-U)"
 
-#: src/compose.c:648 src/mainwindow.c:694 src/messageview.c:222
+#: src/compose.c:648 src/mainwindow.c:696 src/messageview.c:222
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Xem/Mã _kí tự/Cyrillic (Windows-1251)"
 
-#: src/compose.c:652 src/mainwindow.c:698 src/messageview.c:225
+#: src/compose.c:652 src/mainwindow.c:700 src/messageview.c:225
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Xem/Mã _kí tự/Nhật Bản (ISO-2022-_JP)"
 
-#: src/compose.c:656 src/mainwindow.c:708 src/messageview.c:234
+#: src/compose.c:656 src/mainwindow.c:710 src/messageview.c:234
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Xem/Mã _kí tự/Hán giản thể (_GB2312)"
 
-#: src/compose.c:658 src/mainwindow.c:710 src/messageview.c:236
+#: src/compose.c:658 src/mainwindow.c:712 src/messageview.c:236
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Xem/Mã _kí tự/Hán phồn thể (GBK)"
 
-#: src/compose.c:660 src/mainwindow.c:712 src/messageview.c:238
+#: src/compose.c:660 src/mainwindow.c:714 src/messageview.c:238
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Xem/Mã _kí tự/Hán phồn thể (_Big5)"
 
-#: src/compose.c:664 src/mainwindow.c:720 src/messageview.c:245
+#: src/compose.c:664 src/mainwindow.c:722 src/messageview.c:245
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Xem/Mã _kí tự/Triều Tiên (EUC-_KR)"
 
-#: src/compose.c:668 src/mainwindow.c:726 src/messageview.c:250
+#: src/compose.c:668 src/mainwindow.c:728 src/messageview.c:250
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Xem/Mã _kí tự/Thái (TIS-620)"
 
-#: src/compose.c:670 src/mainwindow.c:728 src/messageview.c:252
+#: src/compose.c:670 src/mainwindow.c:730 src/messageview.c:252
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Xem/Mã _kí tự/Thái (Windows-874)"
 
-#: src/compose.c:674 src/mainwindow.c:788 src/messageview.c:283
+#: src/compose.c:674 src/mainwindow.c:790 src/messageview.c:283
 msgid "/_Tools/_Address book"
 msgstr "/_Công cụ/_Sổ địa chỉ"
 
@@ -1478,13 +1478,13 @@ msgstr "/_Công cụ/_Sổ địa chỉ"
 msgid "/_Tools/_Template"
 msgstr "/_Công cụ/_Mẫu"
 
-#: src/compose.c:677 src/mainwindow.c:812 src/messageview.c:299
+#: src/compose.c:677 src/mainwindow.c:814 src/messageview.c:299
 msgid "/_Tools/Actio_ns"
 msgstr "/_Công cụ/_Hành động"
 
-#: src/compose.c:679 src/compose.c:683 src/compose.c:689 src/mainwindow.c:791
-#: src/mainwindow.c:805 src/mainwindow.c:810 src/mainwindow.c:813
-#: src/mainwindow.c:817 src/mainwindow.c:819 src/messageview.c:286
+#: src/compose.c:679 src/compose.c:683 src/compose.c:689 src/mainwindow.c:793
+#: src/mainwindow.c:807 src/mainwindow.c:812 src/mainwindow.c:815
+#: src/mainwindow.c:819 src/mainwindow.c:821 src/messageview.c:286
 #: src/messageview.c:298
 msgid "/_Tools/---"
 msgstr "/_Công cụ/---"
@@ -1685,7 +1685,7 @@ msgstr "Chữ kí PGP"
 msgid "PGP Encrypt"
 msgstr "Mã hoá PGP"
 
-#: src/compose.c:4442 src/compose.c:5543
+#: src/compose.c:4442 src/compose.c:5546
 msgid "MIME type"
 msgstr "Kiểu MIME"
 
@@ -1727,36 +1727,36 @@ msgstr "Soạn với trình soạn thảo ngoài"
 msgid "Wrap all long lines"
 msgstr "Khuôn mọi dòng dài"
 
-#: src/compose.c:5439
+#: src/compose.c:5442
 msgid "Invalid MIME type."
 msgstr "Kiểu MIME không hợp lệ"
 
-#: src/compose.c:5457
+#: src/compose.c:5460
 msgid "File doesn't exist or is empty."
 msgstr "Tập tin không tồn tại hoặc rỗng."
 
-#: src/compose.c:5525
+#: src/compose.c:5528
 msgid "Properties"
 msgstr "Thuộc tính"
 
-#: src/compose.c:5545 src/prefs_common_dialog.c:1504
+#: src/compose.c:5548 src/prefs_common_dialog.c:1504
 msgid "Encoding"
 msgstr "Mã hoá"
 
-#: src/compose.c:5568 src/prefs_folder_item.c:202
+#: src/compose.c:5571 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Đường dẫn"
 
-#: src/compose.c:5569
+#: src/compose.c:5572
 msgid "File name"
 msgstr "Tên tập tin"
 
-#: src/compose.c:5659
+#: src/compose.c:5662
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Dòng lệnh cho trình soạn thảo ngoài không hợp lệ: `%s'\n"
 
-#: src/compose.c:5714
+#: src/compose.c:5717
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1765,48 +1765,48 @@ msgstr ""
 "Trình soạn thảo ngoài vẫn đang hoạt động.\n"
 "Bắt buộc dừng tiến trình (pid: %d)?\n"
 
-#: src/compose.c:6040 src/mainwindow.c:2752
+#: src/compose.c:6043 src/mainwindow.c:2761
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:6156 src/compose.c:6161 src/compose.c:6167
+#: src/compose.c:6159 src/compose.c:6164 src/compose.c:6170
 msgid "Can't queue the message."
 msgstr "Không thể xếp hàng thông điệp"
 
-#: src/compose.c:6258
+#: src/compose.c:6261
 msgid "Select files"
 msgstr "Chọn tập tin"
 
-#: src/compose.c:6281
+#: src/compose.c:6284
 msgid "Select file"
 msgstr "Chọn tập tin"
 
-#: src/compose.c:6316
+#: src/compose.c:6319
 msgid "Save message"
 msgstr "Lưu thư"
 
-#: src/compose.c:6317
+#: src/compose.c:6320
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Nội dung đã được thay đổi. Lưu vào thư mục nháp?"
 
-#: src/compose.c:6319
+#: src/compose.c:6322
 msgid "Close _without saving"
 msgstr "_Không lưu"
 
-#: src/compose.c:6361
+#: src/compose.c:6364
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Bạn có muốn dùng mẫu `%s' ?"
 
-#: src/compose.c:6363
+#: src/compose.c:6366
 msgid "Apply template"
 msgstr "Dùng mẫu"
 
-#: src/compose.c:6364
+#: src/compose.c:6367
 msgid "_Replace"
 msgstr "_Thay thế"
 
-#: src/compose.c:6364
+#: src/compose.c:6367
 msgid "_Insert"
 msgstr "_Chèn"
 
@@ -2262,12 +2262,12 @@ msgstr "Thiết lập thông tin thư mục...\n"
 msgid "Setting folder info..."
 msgstr "Thiết lập thông tin thư mục..."
 
-#: src/folderview.c:868 src/mainwindow.c:3748 src/setup.c:80
+#: src/folderview.c:868 src/mainwindow.c:3757 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Đang quét thư mục %s%c%s ..."
 
-#: src/folderview.c:872 src/mainwindow.c:3753 src/setup.c:85
+#: src/folderview.c:872 src/mainwindow.c:3762 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Đang quét thư mục %s ..."
@@ -3027,536 +3027,541 @@ msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/_Xem/_Hiện hoặc ẩn/_Thanh công cụ/Biểu tượng _và nhãn"
 
 #: src/mainwindow.c:566
-msgid "/_View/Show or hi_de/_Toolbar/_Icon"
+#, fuzzy
+msgid "/_View/Show or hi_de/_Toolbar/Text at the _right of icon"
 msgstr "/_Xem/_Hiện hoặc ẩn/_Thanh công cụ/_Biểu tượng"
 
 #: src/mainwindow.c:568
+msgid "/_View/Show or hi_de/_Toolbar/_Icon"
+msgstr "/_Xem/_Hiện hoặc ẩn/_Thanh công cụ/_Biểu tượng"
+
+#: src/mainwindow.c:570
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/_Xem/_Hiện hoặc ẩn/_Thanh công cụ/_Nhãn"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:572
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/_Xem/_Hiện hoặc ẩn/_Thanh công cụ/_Không"
 
-#: src/mainwindow.c:572
+#: src/mainwindow.c:574
 msgid "/_View/Show or hi_de/_Search bar"
 msgstr "/_Xem/_Hiện hoặc ẩn/T_hanh tìm kiếm"
 
-#: src/mainwindow.c:574
+#: src/mainwindow.c:576
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/_Xem/_Hiện hoặc ẩn/T_hanh trạng thái"
 
-#: src/mainwindow.c:576
+#: src/mainwindow.c:578
 #, fuzzy
 msgid "/_View/_Customize toolbar..."
 msgstr "/_Xem/Đi _tới/Thư mụ_c khác..."
 
-#: src/mainwindow.c:578
+#: src/mainwindow.c:580
 msgid "/_View/Separate f_older tree"
 msgstr "/_Xem/_Cây thư mục riêng rẽ"
 
-#: src/mainwindow.c:579
+#: src/mainwindow.c:581
 msgid "/_View/Separate _message view"
 msgstr "/_Xem/_Khung xem thư riêng rẽ"
 
-#: src/mainwindow.c:581
+#: src/mainwindow.c:583
 msgid "/_View/_Sort"
 msgstr "/_Xem/_Sắp xếp"
 
-#: src/mainwindow.c:582
+#: src/mainwindow.c:584
 msgid "/_View/_Sort/by _number"
 msgstr "/_Xem/_Sắp xếp/theo _số"
 
-#: src/mainwindow.c:583
+#: src/mainwindow.c:585
 msgid "/_View/_Sort/by s_ize"
 msgstr "/_Xem/_Sắp xếp/theo _kích thước"
 
-#: src/mainwindow.c:584
+#: src/mainwindow.c:586
 msgid "/_View/_Sort/by _date"
 msgstr "/_Xem/_Sắp xếp/th_eo thời gian"
 
-#: src/mainwindow.c:585
+#: src/mainwindow.c:587
 msgid "/_View/_Sort/by t_hread date"
 msgstr "/_Xem/_Sắp xếp/th_eo thời gian của luồng"
 
-#: src/mainwindow.c:586
+#: src/mainwindow.c:588
 msgid "/_View/_Sort/by _from"
 msgstr "/_Xem/_Sắp xếp/theo người _gửi"
 
-#: src/mainwindow.c:587
+#: src/mainwindow.c:589
 msgid "/_View/_Sort/by _recipient"
 msgstr "/_Xem/_Sắp xếp/theo người _nhận"
 
-#: src/mainwindow.c:588
+#: src/mainwindow.c:590
 msgid "/_View/_Sort/by _subject"
 msgstr "/_Xem/_Sắp xếp/theo tiê_u đề"
 
-#: src/mainwindow.c:589
+#: src/mainwindow.c:591
 msgid "/_View/_Sort/by _color label"
 msgstr "/_Xem/_Sắp xếp/theo nhãn _màu"
 
-#: src/mainwindow.c:591
+#: src/mainwindow.c:593
 msgid "/_View/_Sort/by _mark"
 msgstr "/_Xem/_Sắp xếp/theo đánh _dấu"
 
-#: src/mainwindow.c:592
+#: src/mainwindow.c:594
 msgid "/_View/_Sort/by _unread"
 msgstr "/_Xem/_Sắp xếp/theo _chưa đọc"
 
-#: src/mainwindow.c:593
+#: src/mainwindow.c:595
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/_Xem/_Sắp xếp/theo đín_h kèm"
 
-#: src/mainwindow.c:595
+#: src/mainwindow.c:597
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/_Xem/_Sắp xếp/Không sắp _xếp"
 
-#: src/mainwindow.c:596 src/mainwindow.c:599
+#: src/mainwindow.c:598 src/mainwindow.c:601
 msgid "/_View/_Sort/---"
 msgstr "/_Xem/_Sắp xếp/---"
 
-#: src/mainwindow.c:597
+#: src/mainwindow.c:599
 msgid "/_View/_Sort/Ascending"
 msgstr "/_Xem/_Sắp xếp/_Tăng dần"
 
-#: src/mainwindow.c:598
+#: src/mainwindow.c:600
 msgid "/_View/_Sort/Descending"
 msgstr "/_Xem/_Sắp xếp/_Giảm dần"
 
-#: src/mainwindow.c:600
+#: src/mainwindow.c:602
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/_Xem/_Sắp xếp/Tập t_rung theo tiêu đề"
 
-#: src/mainwindow.c:602
+#: src/mainwindow.c:604
 msgid "/_View/Th_read view"
 msgstr "/_Xem/_Xem theo luồng"
 
-#: src/mainwindow.c:603
+#: src/mainwindow.c:605
 msgid "/_View/E_xpand all threads"
 msgstr "/_Xem/Mở mọi l_uồng"
 
-#: src/mainwindow.c:604
+#: src/mainwindow.c:606
 msgid "/_View/Co_llapse all threads"
 msgstr "/_Xem/Đón_g mọi luồng"
 
-#: src/mainwindow.c:605
+#: src/mainwindow.c:607
 msgid "/_View/Set display _item..."
 msgstr "/_Xem/Chọ_n mục hiển thị..."
 
-#: src/mainwindow.c:608
+#: src/mainwindow.c:610
 msgid "/_View/_Go to"
 msgstr "/_Xem/Đi _tới"
 
-#: src/mainwindow.c:609
+#: src/mainwindow.c:611
 msgid "/_View/_Go to/_Prev message"
 msgstr "/_Xem/Đi _tới/Thư _trước"
 
-#: src/mainwindow.c:610
+#: src/mainwindow.c:612
 msgid "/_View/_Go to/_Next message"
 msgstr "/_Xem/Đi _tới/Thư tiế_p theo"
 
-#: src/mainwindow.c:611 src/mainwindow.c:616 src/mainwindow.c:619
-#: src/mainwindow.c:624 src/mainwindow.c:629
+#: src/mainwindow.c:613 src/mainwindow.c:618 src/mainwindow.c:621
+#: src/mainwindow.c:626 src/mainwindow.c:631
 msgid "/_View/_Go to/---"
 msgstr "/_Xem/Đi _tới/---"
 
-#: src/mainwindow.c:612
+#: src/mainwindow.c:614
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/_Xem/Đi _tới/Thư trước (_chưa đọc)"
 
-#: src/mainwindow.c:614
+#: src/mainwindow.c:616
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/_Xem/Đi _tới/Thư tiếp theo (chư_a đọc)"
 
-#: src/mainwindow.c:617
+#: src/mainwindow.c:619
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/_Xem/Đi _tới/Thư trước (_mới)"
 
-#: src/mainwindow.c:618
+#: src/mainwindow.c:620
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/_Xem/Đi _tới/T_hư tiếp theo (mới)"
 
-#: src/mainwindow.c:620
+#: src/mainwindow.c:622
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/_Xem/Đi _tới/Thư trước (đánh _dấu)"
 
-#: src/mainwindow.c:622
+#: src/mainwindow.c:624
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/_Xem/Đi _tới/Thư tiếp the_o (đánh dấu)"
 
-#: src/mainwindow.c:625
+#: src/mainwindow.c:627
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/_Xem/Đi _tới/Thư trước (đã _gán nhãn)"
 
-#: src/mainwindow.c:627
+#: src/mainwindow.c:629
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/_Xem/Đi _tới/Thư tiếp th_eo (đã gán nhãn)"
 
-#: src/mainwindow.c:630
+#: src/mainwindow.c:632
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Xem/Đi _tới/Thư mụ_c khác..."
 
-#: src/mainwindow.c:639 src/messageview.c:174
+#: src/mainwindow.c:641 src/messageview.c:174
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Xem/Mã _kí tự/_Tự động xác định"
 
-#: src/mainwindow.c:652 src/messageview.c:187
+#: src/mainwindow.c:654 src/messageview.c:187
 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr "/_Xem/Mã _kí tự/Đông Âu (Windows-1252)"
 
-#: src/mainwindow.c:700 src/messageview.c:227
+#: src/mainwindow.c:702 src/messageview.c:227
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Xem/Mã _kí tự/Nhật Bản (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:702 src/messageview.c:229
+#: src/mainwindow.c:704 src/messageview.c:229
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Xem/Mã _kí tự/Nhật Bản (_EUC-JP)"
 
-#: src/mainwindow.c:704 src/messageview.c:231
+#: src/mainwindow.c:706 src/messageview.c:231
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Xem/Mã _kí tự/Nhật Bản (_Shift__JIS)"
 
-#: src/mainwindow.c:714 src/messageview.c:240
+#: src/mainwindow.c:716 src/messageview.c:240
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Xem/Mã _kí tự/Hán phồn thể (EUC-_TW)"
 
-#: src/mainwindow.c:716 src/messageview.c:242
+#: src/mainwindow.c:718 src/messageview.c:242
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Xem/Mã _kí tự/Hán (ISO-2022-_CN)"
 
-#: src/mainwindow.c:722 src/messageview.c:247
+#: src/mainwindow.c:724 src/messageview.c:247
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Xem/Mã _kí tự/Triều Tiên (ISO-2022-KR)"
 
-#: src/mainwindow.c:735 src/summaryview.c:464
+#: src/mainwindow.c:737 src/summaryview.c:464
 msgid "/_View/Open in new _window"
 msgstr "/_Xem/_Mở trong cửa sổ mới"
 
-#: src/mainwindow.c:736 src/messageview.c:259 src/summaryview.c:466
+#: src/mainwindow.c:738 src/messageview.c:259 src/summaryview.c:466
 msgid "/_View/Mess_age source"
 msgstr "/_Xem/_Nguồn thư"
 
-#: src/mainwindow.c:737 src/messageview.c:260 src/summaryview.c:467
+#: src/mainwindow.c:739 src/messageview.c:260 src/summaryview.c:467
 #, fuzzy
 msgid "/_View/All _headers"
 msgstr "/_Xem/Mọi _header"
 
-#: src/mainwindow.c:739
+#: src/mainwindow.c:741
 msgid "/_View/_Update summary"
 msgstr "/_Xem/_Cập nhật tóm tắt"
 
-#: src/mainwindow.c:741 src/messageview.c:263
+#: src/mainwindow.c:743 src/messageview.c:263
 msgid "/_Message"
 msgstr "/_Thư"
 
-#: src/mainwindow.c:742
+#: src/mainwindow.c:744
 msgid "/_Message/Recei_ve"
 msgstr "/_Thư/_Nhận"
 
-#: src/mainwindow.c:743
+#: src/mainwindow.c:745
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/_Thư/_Nhận/_Từ tài khoản mặc định"
 
-#: src/mainwindow.c:745
+#: src/mainwindow.c:747
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/_Thư/_Nhận/Từ _mọi tài khoản"
 
-#: src/mainwindow.c:747
+#: src/mainwindow.c:749
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/_Thư/_Nhận/_Huỷ bỏ việc lấy thư"
 
-#: src/mainwindow.c:749
+#: src/mainwindow.c:751
 msgid "/_Message/Recei_ve/---"
 msgstr "/_Thư/_Nhận/---"
 
-#: src/mainwindow.c:750
+#: src/mainwindow.c:752
 msgid "/_Message/_Send queued messages"
 msgstr "/_Thư/_Nhận/_Gửi thư đang xếp hàng"
 
-#: src/mainwindow.c:751 src/mainwindow.c:753 src/mainwindow.c:760
-#: src/mainwindow.c:765 src/mainwindow.c:768 src/mainwindow.c:779
-#: src/mainwindow.c:781 src/mainwindow.c:784 src/messageview.c:266
+#: src/mainwindow.c:753 src/mainwindow.c:755 src/mainwindow.c:762
+#: src/mainwindow.c:767 src/mainwindow.c:770 src/mainwindow.c:781
+#: src/mainwindow.c:783 src/mainwindow.c:786 src/messageview.c:266
 #: src/messageview.c:274 src/messageview.c:279
 msgid "/_Message/---"
 msgstr "/_Thư/---"
 
-#: src/mainwindow.c:752 src/messageview.c:264
+#: src/mainwindow.c:754 src/messageview.c:264
 msgid "/_Message/Compose _new message"
 msgstr "/_Thư/_Viết thư mới"
 
-#: src/mainwindow.c:754 src/messageview.c:267
+#: src/mainwindow.c:756 src/messageview.c:267
 msgid "/_Message/_Reply"
 msgstr "/_Thư/_Hồi âm"
 
-#: src/mainwindow.c:755
+#: src/mainwindow.c:757
 msgid "/_Message/Repl_y to"
 msgstr "/_Thư/Hồi â_m tới"
 
-#: src/mainwindow.c:756 src/messageview.c:268
+#: src/mainwindow.c:758 src/messageview.c:268
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Thư/Hồi â_m tới/_tất cả"
 
-#: src/mainwindow.c:757 src/messageview.c:270
+#: src/mainwindow.c:759 src/messageview.c:270
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Thư/Hồi â_m tới/_người gửi"
 
-#: src/mainwindow.c:758 src/messageview.c:272
+#: src/mainwindow.c:760 src/messageview.c:272
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Thư/Hồi â_m tới/_hộp thư chung"
 
-#: src/mainwindow.c:761 src/messageview.c:275
+#: src/mainwindow.c:763 src/messageview.c:275
 msgid "/_Message/_Forward"
 msgstr "/_Thư/_Chuyển tiếp"
 
-#: src/mainwindow.c:762 src/messageview.c:276
+#: src/mainwindow.c:764 src/messageview.c:276
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Thư/Ch_uyển tiếp ở dạng đính kèm"
 
-#: src/mainwindow.c:764 src/messageview.c:278
+#: src/mainwindow.c:766 src/messageview.c:278
 msgid "/_Message/Redirec_t"
 msgstr "/_Thư/Chu_yển hướng"
 
-#: src/mainwindow.c:766
+#: src/mainwindow.c:768
 msgid "/_Message/M_ove..."
 msgstr "/_Thư/_Di chuyển..."
 
-#: src/mainwindow.c:767
+#: src/mainwindow.c:769
 msgid "/_Message/_Copy..."
 msgstr "/_Thư/_Sao chép"
 
-#: src/mainwindow.c:769
+#: src/mainwindow.c:771
 msgid "/_Message/_Mark"
 msgstr "/_Thư/Đánh _dấu"
 
-#: src/mainwindow.c:770
+#: src/mainwindow.c:772
 msgid "/_Message/_Mark/_Mark"
 msgstr "/_Thư/Đánh _dấu/Đánh _dấu"
 
-#: src/mainwindow.c:771
+#: src/mainwindow.c:773
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/_Thư/Đánh _dấu/_Bỏ đánh dấu"
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:774
 msgid "/_Message/_Mark/---"
 msgstr "/_Thư/Đánh _dấu/---"
 
-#: src/mainwindow.c:773
+#: src/mainwindow.c:775
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/_Thư/Đánh _dấu/C_hưa đọc"
 
-#: src/mainwindow.c:774
+#: src/mainwindow.c:776
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/_Thư/Đánh _dấu/Đã đọ_c"
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:778
 msgid "/_Message/_Mark/Mark _thread as read"
 msgstr "/_Thư/Đánh _dấu/Luồng đã được đọ_c"
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:780
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/_Thư/Đánh _dấu/Đã đọc _tất cả"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:782
 msgid "/_Message/_Delete"
 msgstr "/_Thư/_Xoá"
 
-#: src/mainwindow.c:782
+#: src/mainwindow.c:784
 msgid "/_Message/Set as _junk mail"
 msgstr "/_Thư/Đánh dấu là thư _rác"
 
-#: src/mainwindow.c:783
+#: src/mainwindow.c:785
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/_Thư/Đánh dấu _không là thư rác"
 
-#: src/mainwindow.c:785 src/messageview.c:280
+#: src/mainwindow.c:787 src/messageview.c:280
 msgid "/_Message/Re-_edit"
 msgstr "/_Thư/S_oạn lại"
 
-#: src/mainwindow.c:789
+#: src/mainwindow.c:791
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/_Công cụ/_Thêm người gửi vào sổ địa chỉ..."
 
-#: src/mainwindow.c:792
+#: src/mainwindow.c:794
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/_Công cụ/_Lọc mọi thư trong thư mục"
 
-#: src/mainwindow.c:794
+#: src/mainwindow.c:796
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Công cụ/Lọ_c các thư đã chọn"
 
-#: src/mainwindow.c:796 src/messageview.c:287
+#: src/mainwindow.c:798 src/messageview.c:287
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Công cụ/Tạo _quy tắc lọc"
 
-#: src/mainwindow.c:797 src/messageview.c:289
+#: src/mainwindow.c:799 src/messageview.c:289
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Công cụ/Tạo _quy tắc lọc/_Tự động"
 
-#: src/mainwindow.c:799 src/messageview.c:291
+#: src/mainwindow.c:801 src/messageview.c:291
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Công cụ/Tạo _quy tắc lọc/theo _Người gửi"
 
-#: src/mainwindow.c:801 src/messageview.c:293
+#: src/mainwindow.c:803 src/messageview.c:293
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Công cụ/Tạo _quy tắc lọc/theo N_gười nhận"
 
-#: src/mainwindow.c:803 src/messageview.c:295
+#: src/mainwindow.c:805 src/messageview.c:295
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Công cụ/Tạo _quy tắc lọc/theo Tiê_u đề"
 
-#: src/mainwindow.c:806
+#: src/mainwindow.c:808
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/_Công cụ/Lọc _thư rác trong thư mục"
 
-#: src/mainwindow.c:808
+#: src/mainwindow.c:810
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/_Công cụ/Lọc thư _rác trong các thư đã chọn"
 
-#: src/mainwindow.c:815
+#: src/mainwindow.c:817
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/_Công cụ/_Xoá thư trùng"
 
-#: src/mainwindow.c:818
+#: src/mainwindow.c:820
 #, fuzzy
 msgid "/_Tools/E_xecute marked process"
 msgstr "Chạy tiến trình đã đánh dấu"
 
-#: src/mainwindow.c:820
+#: src/mainwindow.c:822
 msgid "/_Tools/_Log window"
 msgstr "/_Công cụ/Cửa sổ theo _dõi"
 
-#: src/mainwindow.c:822
+#: src/mainwindow.c:824
 msgid "/_Configuration"
 msgstr "/Cấ_u hình"
 
-#: src/mainwindow.c:823
+#: src/mainwindow.c:825
 msgid "/_Configuration/_Common preferences..."
 msgstr "/Cấ_u hình/_Cấu hình chung..."
 
-#: src/mainwindow.c:825
+#: src/mainwindow.c:827
 msgid "/_Configuration/_Filter setting..."
 msgstr "/Cấ_u hình/_Thiết lập bộ lọc..."
 
-#: src/mainwindow.c:827
+#: src/mainwindow.c:829
 msgid "/_Configuration/_Template..."
 msgstr "/Cấ_u hình/_Mẫu..."
 
-#: src/mainwindow.c:829
+#: src/mainwindow.c:831
 msgid "/_Configuration/_Actions..."
 msgstr "/Cấ_u hình/_Hành động..."
 
-#: src/mainwindow.c:831
+#: src/mainwindow.c:833
 msgid "/_Configuration/---"
 msgstr "/Cấ_u hình/---"
 
-#: src/mainwindow.c:832
+#: src/mainwindow.c:834
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/Cấ_u hình/Cấ_u hình cho tài khoản mặc định..."
 
-#: src/mainwindow.c:834
+#: src/mainwindow.c:836
 msgid "/_Configuration/Create _new account..."
 msgstr "/Cấ_u hình/Tạ_o tài khoản mới..."
 
-#: src/mainwindow.c:836
+#: src/mainwindow.c:838
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/Cấ_u hình/_Sửa tài khoản..."
 
-#: src/mainwindow.c:838
+#: src/mainwindow.c:840
 msgid "/_Configuration/C_hange current account"
 msgstr "/Cấ_u hình/Đổi tài _khoản mặc định"
 
-#: src/mainwindow.c:842
+#: src/mainwindow.c:844
 msgid "/_Help/_Manual"
 msgstr "/_Hỗ trợ/_Sổ tay hướng dẫn"
 
-#: src/mainwindow.c:843
+#: src/mainwindow.c:845
 msgid "/_Help/_Manual/_English"
 msgstr "/_Hỗ trợ/_Sổ tay hướng dẫn/Tiếng _Anh"
 
-#: src/mainwindow.c:844
+#: src/mainwindow.c:846
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/_Hỗ trợ/_Sổ tay hướng dẫn/Tiếng _Nhật"
 
-#: src/mainwindow.c:845
+#: src/mainwindow.c:847
 msgid "/_Help/_FAQ"
 msgstr "/_Hỗ trợ/_Câu hỏi thường gặp"
 
-#: src/mainwindow.c:846
+#: src/mainwindow.c:848
 msgid "/_Help/_FAQ/_English"
 msgstr "/_Hỗ trợ/_Câu hỏi thường gặp/Tiếng _Anh"
 
-#: src/mainwindow.c:847
+#: src/mainwindow.c:849
 msgid "/_Help/_FAQ/_German"
 msgstr "/_Hỗ trợ/_Câu hỏi thường gặp/Tiếng Đứ_c"
 
-#: src/mainwindow.c:848
+#: src/mainwindow.c:850
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/_Hỗ trợ/_Câu hỏi thường gặp/Tiếng _Tây Ban Nha"
 
-#: src/mainwindow.c:849
+#: src/mainwindow.c:851
 msgid "/_Help/_FAQ/_French"
 msgstr "/_Hỗ trợ/_Câu hỏi thường gặp/Tiếng _Pháp"
 
-#: src/mainwindow.c:850
+#: src/mainwindow.c:852
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/_Hỗ trợ/_Câu hỏi thường gặp/_Tiếng Italia"
 
-#: src/mainwindow.c:851
+#: src/mainwindow.c:853
 msgid "/_Help/_Command line options"
 msgstr "/_Hỗ trợ/Tuỳ chọn _dòng lệnh"
 
-#: src/mainwindow.c:852
+#: src/mainwindow.c:854
 msgid "/_Help/---"
 msgstr "/_Hỗ trợ/---"
 
-#: src/mainwindow.c:895
+#: src/mainwindow.c:897
 msgid "Creating main window...\n"
 msgstr "Đang tạo cửa sổ chính...\n"
 
-#: src/mainwindow.c:1071
+#: src/mainwindow.c:1073
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Cửa sổ chính: việc cấp màu %d thất bại\n"
 
-#: src/mainwindow.c:1175 src/summaryview.c:2387 src/summaryview.c:2472
+#: src/mainwindow.c:1181 src/summaryview.c:2387 src/summaryview.c:2472
 #: src/summaryview.c:4009 src/summaryview.c:4138 src/summaryview.c:4507
 msgid "done.\n"
 msgstr "xong.\n"
 
-#: src/mainwindow.c:1293 src/mainwindow.c:1334 src/mainwindow.c:1359
+#: src/mainwindow.c:1299 src/mainwindow.c:1340 src/mainwindow.c:1365
 msgid "Untitled"
 msgstr "Chưa đặt tên"
 
-#: src/mainwindow.c:1360
+#: src/mainwindow.c:1366
 msgid "none"
 msgstr "không"
 
-#: src/mainwindow.c:1413
+#: src/mainwindow.c:1419
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "Đổi kiểu vạch phân cách cửa sổ từ %d sang %d\n"
 
-#: src/mainwindow.c:1663
+#: src/mainwindow.c:1669
 msgid "Offline"
 msgstr "Ngoại tuyến"
 
-#: src/mainwindow.c:1664
+#: src/mainwindow.c:1670
 msgid "You are offline. Go online?"
 msgstr "Bạn đang ngoại tuyến. Chuyển sang trực tuyến?"
 
-#: src/mainwindow.c:1681
+#: src/mainwindow.c:1687
 msgid "Empty all trash"
 msgstr "Đổ mọi thùng rác"
 
-#: src/mainwindow.c:1682
+#: src/mainwindow.c:1688
 msgid "Delete all messages in trash folders?"
 msgstr "Xoá mọi thư trong thùng rác?"
 
-#: src/mainwindow.c:1712
+#: src/mainwindow.c:1718
 msgid "Add mailbox"
 msgstr "Thêm hộp thư"
 
-#: src/mainwindow.c:1713
+#: src/mainwindow.c:1719
 msgid ""
 "Specify the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3566,16 +3571,16 @@ msgstr ""
 "Nếu hộp thư có trước được chỉ định, nó sẽ được\n"
 "tự động quét."
 
-#: src/mainwindow.c:1719 src/setup.c:49
+#: src/mainwindow.c:1725 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Hộp thư `%s' đã có trước."
 
-#: src/mainwindow.c:1724 src/setup.c:56
+#: src/mainwindow.c:1730 src/setup.c:56
 msgid "Mailbox"
 msgstr "Hộp thư"
 
-#: src/mainwindow.c:1730 src/setup.c:62
+#: src/mainwindow.c:1736 src/setup.c:62
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3584,129 +3589,129 @@ msgstr ""
 "Việc tạo hộp thư đã thất bại.\n"
 "Có thể một số tập tin đã có trước, hoặc bạn không có quyền ghi lên đó."
 
-#: src/mainwindow.c:2198
+#: src/mainwindow.c:2206
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Khung thư mục"
 
-#: src/mainwindow.c:2217
+#: src/mainwindow.c:2225
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Khung đọc thư"
 
-#: src/mainwindow.c:2369 src/summaryview.c:418
+#: src/mainwindow.c:2377 src/summaryview.c:418
 msgid "/_Reply"
 msgstr "/_Hồi âm"
 
-#: src/mainwindow.c:2370
+#: src/mainwindow.c:2378
 msgid "/Reply to _all"
 msgstr "/Hồi âm _tất cả"
 
-#: src/mainwindow.c:2371
+#: src/mainwindow.c:2379
 msgid "/Reply to _sender"
 msgstr "/Hồi âm cho người _gửi"
 
-#: src/mainwindow.c:2372
+#: src/mainwindow.c:2380
 msgid "/Reply to mailing _list"
 msgstr "/Hồi âm cho _hộp thư chung"
 
-#: src/mainwindow.c:2377 src/summaryview.c:425
+#: src/mainwindow.c:2385 src/summaryview.c:425
 msgid "/_Forward"
 msgstr "/_Chuyển tiếp"
 
-#: src/mainwindow.c:2378 src/summaryview.c:426
+#: src/mainwindow.c:2386 src/summaryview.c:426
 msgid "/For_ward as attachment"
 msgstr "/Ch_uyển tiếp ở dạng đính kèm"
 
-#: src/mainwindow.c:2379 src/summaryview.c:427
+#: src/mainwindow.c:2387 src/summaryview.c:427
 msgid "/Redirec_t"
 msgstr "/Chu_yển hướng"
 
-#: src/mainwindow.c:2384
+#: src/mainwindow.c:2392
 msgid "Incorporate new mail"
 msgstr "Sáp nhập thư mới"
 
-#: src/mainwindow.c:2386
+#: src/mainwindow.c:2394
 msgid "Incorporate new mail of all accounts"
 msgstr "Sáp nhật thư mới của mọi tài khoản"
 
-#: src/mainwindow.c:2388
+#: src/mainwindow.c:2396
 msgid "Send queued message(s)"
 msgstr "Gửi thư đang đợi"
 
-#: src/mainwindow.c:2390
+#: src/mainwindow.c:2398
 msgid "Compose new message"
 msgstr "Viết thư mới"
 
-#: src/mainwindow.c:2392
+#: src/mainwindow.c:2400
 msgid "Reply to the message"
 msgstr "Hồi âm cho thư"
 
-#: src/mainwindow.c:2394
+#: src/mainwindow.c:2402
 msgid "Reply to all"
 msgstr "Hồi âm cho tất cả"
 
-#: src/mainwindow.c:2396
+#: src/mainwindow.c:2404
 msgid "Forward the message"
 msgstr "Chuyển tiếp thư"
 
-#: src/mainwindow.c:2398
+#: src/mainwindow.c:2406
 msgid "Delete the message"
 msgstr "Xoá thư"
 
-#: src/mainwindow.c:2400
+#: src/mainwindow.c:2408
 msgid "Set as junk mail"
 msgstr "Coi là thư rác"
 
-#: src/mainwindow.c:2402
+#: src/mainwindow.c:2410
 msgid "Execute marked process"
 msgstr "Chạy tiến trình đã đánh dấu"
 
-#: src/mainwindow.c:2404
+#: src/mainwindow.c:2412
 msgid "Next unread message"
 msgstr "Thư chưa đọc tiếp theo"
 
-#: src/mainwindow.c:2406
+#: src/mainwindow.c:2414
 #, fuzzy
 msgid "Previous unread message"
 msgstr "Thư chưa đọc tiếp theo"
 
-#: src/mainwindow.c:2410
+#: src/mainwindow.c:2418
 #, fuzzy
 msgid "Print message"
 msgstr "Gửi thư"
 
-#: src/mainwindow.c:2412
+#: src/mainwindow.c:2420
 msgid "Common preferences"
 msgstr "Cấu hình chung"
 
-#: src/mainwindow.c:2414 src/prefs_account_dialog.c:511
+#: src/mainwindow.c:2422 src/prefs_account_dialog.c:511
 msgid "Account preferences"
 msgstr "Cấu hình tài khoản"
 
-#: src/mainwindow.c:2779
+#: src/mainwindow.c:2788
 msgid "You are offline. Click the icon to go online."
 msgstr "Bạn đang ngoại tuyến. Nhấn vào biểu tượng để chuyển sang trực tuyến."
 
-#: src/mainwindow.c:2790
+#: src/mainwindow.c:2799
 msgid "You are online. Click the icon to go offline."
 msgstr "Bạn đang trực tuyến. Nhấn vào biểu tượng để chuyển sang ngoại tuyến."
 
-#: src/mainwindow.c:3062
+#: src/mainwindow.c:3071
 msgid "Exit"
 msgstr "Thoát"
 
-#: src/mainwindow.c:3062
+#: src/mainwindow.c:3071
 msgid "Exit this program?"
 msgstr "Thoát chương trình này?"
 
-#: src/mainwindow.c:3666
+#: src/mainwindow.c:3675
 msgid "Command line options"
 msgstr "Tuỳ chọn dòng lệnh"
 
-#: src/mainwindow.c:3679
+#: src/mainwindow.c:3688
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Cách dùng: sylpheed [TUỲ CHỌN]..."
 
-#: src/mainwindow.c:3687
+#: src/mainwindow.c:3696
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -3734,7 +3739,7 @@ msgstr ""
 "--help\n"
 "--version"
 
-#: src/mainwindow.c:3703
+#: src/mainwindow.c:3712
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index f0c38ea3..e06d1492 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-01-31 16:49+0900\n"
+"POT-Creation-Date: 2007-01-31 17:29+0900\n"
 "PO-Revision-Date: 2005-03-17 09:22+0800\n"
 "Last-Translator: Wang Jian <lark@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
@@ -904,7 +904,7 @@ msgstr "/地址(_A)/编辑(_E)"
 msgid "/_Address/_Delete"
 msgstr "/地址(_A)/删除(_D)"
 
-#: src/addressbook.c:359 src/compose.c:673 src/mainwindow.c:787
+#: src/addressbook.c:359 src/compose.c:673 src/mainwindow.c:789
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/工具(_T)"
@@ -913,12 +913,12 @@ msgstr "/工具(_T)"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/工具(_T)/导入LDIF文件(_L)"
 
-#: src/addressbook.c:361 src/compose.c:694 src/mainwindow.c:841
+#: src/addressbook.c:361 src/compose.c:694 src/mainwindow.c:843
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/帮助(_H)"
 
-#: src/addressbook.c:362 src/compose.c:695 src/mainwindow.c:853
+#: src/addressbook.c:362 src/compose.c:695 src/mainwindow.c:855
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/帮助(_H)/关于(_A)"
@@ -960,7 +960,7 @@ msgstr "/删除(_D)"
 msgid "E-Mail address"
 msgstr "电子邮件地址"
 
-#: src/addressbook.c:496 src/compose.c:4873 src/mainwindow.c:2408
+#: src/addressbook.c:496 src/compose.c:4873 src/mainwindow.c:2416
 #: src/prefs_common_dialog.c:2274
 msgid "Address book"
 msgstr "地址簿"
@@ -1171,7 +1171,7 @@ msgstr "公用地址"
 msgid "Personal address"
 msgstr "个人地址"
 
-#: src/alertpanel.c:142 src/compose.c:5717 src/main.c:638
+#: src/alertpanel.c:142 src/compose.c:5720 src/main.c:638
 msgid "Notice"
 msgstr "注意"
 
@@ -1339,9 +1339,9 @@ msgid "/_View/_Reply to"
 msgstr "/查看(_V)/回复至(_R)"
 
 #: src/compose.c:578 src/compose.c:580 src/compose.c:582 src/compose.c:584
-#: src/compose.c:587 src/mainwindow.c:577 src/mainwindow.c:580
-#: src/mainwindow.c:607 src/mainwindow.c:631 src/mainwindow.c:734
-#: src/mainwindow.c:738 src/messageview.c:258
+#: src/compose.c:587 src/mainwindow.c:579 src/mainwindow.c:582
+#: src/mainwindow.c:609 src/mainwindow.c:633 src/mainwindow.c:736
+#: src/mainwindow.c:740 src/messageview.c:258
 msgid "/_View/---"
 msgstr "/查看(_V)/---"
 
@@ -1362,7 +1362,7 @@ msgstr "/查看(_V)/附件(_A)"
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/查看(_V)/转到(_G)/其它文件夹(_F)..."
 
-#: src/compose.c:593 src/mainwindow.c:638 src/messageview.c:173
+#: src/compose.c:593 src/mainwindow.c:640 src/messageview.c:173
 msgid "/_View/Character _encoding"
 msgstr "/查看(_V)/字符编码(_E)"
 
@@ -1373,118 +1373,118 @@ msgstr "/查看(_V)/字符编码(_E)/自动(_A)"
 #: src/compose.c:596 src/compose.c:602 src/compose.c:608 src/compose.c:612
 #: src/compose.c:620 src/compose.c:624 src/compose.c:630 src/compose.c:636
 #: src/compose.c:640 src/compose.c:650 src/compose.c:654 src/compose.c:662
-#: src/compose.c:666 src/mainwindow.c:634 src/mainwindow.c:641
+#: src/compose.c:666 src/mainwindow.c:636 src/mainwindow.c:643
 #: src/messageview.c:169
 msgid "/_View/Character _encoding/---"
 msgstr "/查看(_V)/字符编码(_E)/---"
 
-#: src/compose.c:598 src/mainwindow.c:642 src/messageview.c:177
+#: src/compose.c:598 src/mainwindow.c:644 src/messageview.c:177
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/查看(_V)/字符编码(_E)/7位 ASCII (US-ASC_II)"
 
-#: src/compose.c:600 src/mainwindow.c:644 src/messageview.c:180
+#: src/compose.c:600 src/mainwindow.c:646 src/messageview.c:180
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/查看(_V)/字符编码(_E)/Unicode (_UTF-8)"
 
-#: src/compose.c:604 src/mainwindow.c:648 src/messageview.c:183
+#: src/compose.c:604 src/mainwindow.c:650 src/messageview.c:183
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/查看(_V)/字符编码(_E)/西欧 (ISO-8859-_1)"
 
-#: src/compose.c:606 src/mainwindow.c:650 src/messageview.c:185
+#: src/compose.c:606 src/mainwindow.c:652 src/messageview.c:185
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/查看(_V)/字符编码(_E)/西欧 (ISO-8859-15)"
 
-#: src/compose.c:610 src/mainwindow.c:656 src/messageview.c:190
+#: src/compose.c:610 src/mainwindow.c:658 src/messageview.c:190
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/查看(_V)/字符编码(_E)/中欧 (ISO-8859-_2)"
 
-#: src/compose.c:614 src/mainwindow.c:660 src/messageview.c:193
+#: src/compose.c:614 src/mainwindow.c:662 src/messageview.c:193
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/查看(_V)/字符编码(_E)/波罗的语 (ISO-8859-13)"
 
-#: src/compose.c:616 src/mainwindow.c:662 src/messageview.c:195
+#: src/compose.c:616 src/mainwindow.c:664 src/messageview.c:195
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/查看(_V)/字符编码(_E)/波罗的语 (ISO-8859-_4)"
 
-#: src/compose.c:618 src/mainwindow.c:664 src/messageview.c:197
+#: src/compose.c:618 src/mainwindow.c:666 src/messageview.c:197
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/查看(_V)/字符编码(_E)/斯拉夫语 (Windows-1251)"
 
-#: src/compose.c:622 src/mainwindow.c:668 src/messageview.c:200
+#: src/compose.c:622 src/mainwindow.c:670 src/messageview.c:200
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/查看(_V)/字符编码(_E)/希腊语 (ISO-8859-_7)"
 
-#: src/compose.c:626 src/mainwindow.c:672 src/messageview.c:203
+#: src/compose.c:626 src/mainwindow.c:674 src/messageview.c:203
 #, fuzzy
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/查看(_V)/字符编码(_E)/波罗的语 (ISO-8859-_4)"
 
-#: src/compose.c:628 src/mainwindow.c:674 src/messageview.c:205
+#: src/compose.c:628 src/mainwindow.c:676 src/messageview.c:205
 #, fuzzy
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/查看(_V)/字符编码(_E)/斯拉夫语 (Windows-1251)"
 
-#: src/compose.c:632 src/mainwindow.c:678 src/messageview.c:208
+#: src/compose.c:632 src/mainwindow.c:680 src/messageview.c:208
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/查看(_V)/字符编码(_E)/希腊语 (ISO-8859-_7)"
 
-#: src/compose.c:634 src/mainwindow.c:680 src/messageview.c:210
+#: src/compose.c:634 src/mainwindow.c:682 src/messageview.c:210
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/查看(_V)/字符编码(_E)/斯拉夫语 (Windows-1251)"
 
-#: src/compose.c:638 src/mainwindow.c:684 src/messageview.c:213
+#: src/compose.c:638 src/mainwindow.c:686 src/messageview.c:213
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/查看(_V)/字符编码(_E)/土耳其语 (ISO-8859-_9)"
 
-#: src/compose.c:642 src/mainwindow.c:688 src/messageview.c:216
+#: src/compose.c:642 src/mainwindow.c:690 src/messageview.c:216
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/查看(_V)/字符编码(_E)/斯拉夫语 (ISO-8859-_5)"
 
-#: src/compose.c:644 src/mainwindow.c:690 src/messageview.c:218
+#: src/compose.c:644 src/mainwindow.c:692 src/messageview.c:218
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/查看(_V)/字符编码(_E)/斯拉夫语 (KOI8-_R)"
 
-#: src/compose.c:646 src/mainwindow.c:692 src/messageview.c:220
+#: src/compose.c:646 src/mainwindow.c:694 src/messageview.c:220
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/查看(_V)/字符编码(_E)/斯拉夫语 (KOI8-U)"
 
-#: src/compose.c:648 src/mainwindow.c:694 src/messageview.c:222
+#: src/compose.c:648 src/mainwindow.c:696 src/messageview.c:222
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/查看(_V)/字符编码(_E)/斯拉夫语 (Windows-1251)"
 
-#: src/compose.c:652 src/mainwindow.c:698 src/messageview.c:225
+#: src/compose.c:652 src/mainwindow.c:700 src/messageview.c:225
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/查看(_V)/字符编码(_E)/日语 (ISO-2022-_JP)"
 
-#: src/compose.c:656 src/mainwindow.c:708 src/messageview.c:234
+#: src/compose.c:656 src/mainwindow.c:710 src/messageview.c:234
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/查看(_V)/字符编码(_E)/简体中文 (_GB2312)"
 
-#: src/compose.c:658 src/mainwindow.c:710 src/messageview.c:236
+#: src/compose.c:658 src/mainwindow.c:712 src/messageview.c:236
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/查看(_V)/字符编码(_E)/简体中文 (_GB2312)"
 
-#: src/compose.c:660 src/mainwindow.c:712 src/messageview.c:238
+#: src/compose.c:660 src/mainwindow.c:714 src/messageview.c:238
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/查看(_V)/字符编码(_E)/繁体中文 (_Big5)"
 
-#: src/compose.c:664 src/mainwindow.c:720 src/messageview.c:245
+#: src/compose.c:664 src/mainwindow.c:722 src/messageview.c:245
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/查看(_V)/字符编码(_E)/朝鲜语 (EUC-_KR)"
 
-#: src/compose.c:668 src/mainwindow.c:726 src/messageview.c:250
+#: src/compose.c:668 src/mainwindow.c:728 src/messageview.c:250
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/查看(_V)/字符编码(_E)/泰国语 (TIS-620)"
 
-#: src/compose.c:670 src/mainwindow.c:728 src/messageview.c:252
+#: src/compose.c:670 src/mainwindow.c:730 src/messageview.c:252
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/查看(_V)/字符编码(_E)/泰国语 (Windows-874)"
 
-#: src/compose.c:674 src/mainwindow.c:788 src/messageview.c:283
+#: src/compose.c:674 src/mainwindow.c:790 src/messageview.c:283
 msgid "/_Tools/_Address book"
 msgstr "/工具(_T)/地址簿(_A)"
 
@@ -1492,13 +1492,13 @@ msgstr "/工具(_T)/地址簿(_A)"
 msgid "/_Tools/_Template"
 msgstr "/工具(_T)/模板(_T)"
 
-#: src/compose.c:677 src/mainwindow.c:812 src/messageview.c:299
+#: src/compose.c:677 src/mainwindow.c:814 src/messageview.c:299
 msgid "/_Tools/Actio_ns"
 msgstr "/工具(_T)/动作(_N)"
 
-#: src/compose.c:679 src/compose.c:683 src/compose.c:689 src/mainwindow.c:791
-#: src/mainwindow.c:805 src/mainwindow.c:810 src/mainwindow.c:813
-#: src/mainwindow.c:817 src/mainwindow.c:819 src/messageview.c:286
+#: src/compose.c:679 src/compose.c:683 src/compose.c:689 src/mainwindow.c:793
+#: src/mainwindow.c:807 src/mainwindow.c:812 src/mainwindow.c:815
+#: src/mainwindow.c:819 src/mainwindow.c:821 src/messageview.c:286
 #: src/messageview.c:298
 msgid "/_Tools/---"
 msgstr "/工具(_T)/---"
@@ -1700,7 +1700,7 @@ msgstr "/工具(_T)/PGP 签名(_G)"
 msgid "PGP Encrypt"
 msgstr "/工具(_T)/PGP 加密(_E)"
 
-#: src/compose.c:4442 src/compose.c:5543
+#: src/compose.c:4442 src/compose.c:5546
 msgid "MIME type"
 msgstr "MIME 类型"
 
@@ -1743,36 +1743,36 @@ msgstr "使用外部编辑器编辑"
 msgid "Wrap all long lines"
 msgstr "长行换行"
 
-#: src/compose.c:5439
+#: src/compose.c:5442
 msgid "Invalid MIME type."
 msgstr "无效的MIME类型。"
 
-#: src/compose.c:5457
+#: src/compose.c:5460
 msgid "File doesn't exist or is empty."
 msgstr "文件不存在或为空。"
 
-#: src/compose.c:5525
+#: src/compose.c:5528
 msgid "Properties"
 msgstr "属性"
 
-#: src/compose.c:5545 src/prefs_common_dialog.c:1504
+#: src/compose.c:5548 src/prefs_common_dialog.c:1504
 msgid "Encoding"
 msgstr "编码方式"
 
-#: src/compose.c:5568 src/prefs_folder_item.c:202
+#: src/compose.c:5571 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "路径"
 
-#: src/compose.c:5569
+#: src/compose.c:5572
 msgid "File name"
 msgstr "文件名"
 
-#: src/compose.c:5659
+#: src/compose.c:5662
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "外部编辑器命令行无效：“%s”\n"
 
-#: src/compose.c:5714
+#: src/compose.c:5717
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1782,51 +1782,51 @@ msgstr ""
 "强制结束程序？\n"
 "程序组标识号：%d"
 
-#: src/compose.c:6040 src/mainwindow.c:2752
+#: src/compose.c:6043 src/mainwindow.c:2761
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:6156 src/compose.c:6161 src/compose.c:6167
+#: src/compose.c:6159 src/compose.c:6164 src/compose.c:6170
 msgid "Can't queue the message."
 msgstr "无法将该邮件排队。"
 
-#: src/compose.c:6258
+#: src/compose.c:6261
 msgid "Select files"
 msgstr "选择文件"
 
-#: src/compose.c:6281
+#: src/compose.c:6284
 msgid "Select file"
 msgstr "选择文件"
 
-#: src/compose.c:6316
+#: src/compose.c:6319
 #, fuzzy
 msgid "Save message"
 msgstr "立即发送邮件"
 
-#: src/compose.c:6317
+#: src/compose.c:6320
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "该邮件已修改。丢弃它？"
 
-#: src/compose.c:6319
+#: src/compose.c:6322
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:6361
+#: src/compose.c:6364
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "您要使用模板“%s”吗？"
 
-#: src/compose.c:6363
+#: src/compose.c:6366
 msgid "Apply template"
 msgstr "使用模板"
 
-#: src/compose.c:6364
+#: src/compose.c:6367
 #, fuzzy
 msgid "_Replace"
 msgstr "替换"
 
-#: src/compose.c:6364
+#: src/compose.c:6367
 #, fuzzy
 msgid "_Insert"
 msgstr "插入"
@@ -2286,12 +2286,12 @@ msgstr "正在设置文件夹信息...\n"
 msgid "Setting folder info..."
 msgstr "正在设置文件夹信息..."
 
-#: src/folderview.c:868 src/mainwindow.c:3748 src/setup.c:80
+#: src/folderview.c:868 src/mainwindow.c:3757 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "正在扫描文件夹 %s%c%s ..."
 
-#: src/folderview.c:872 src/mainwindow.c:3753 src/setup.c:85
+#: src/folderview.c:872 src/mainwindow.c:3762 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "正在扫描文件夹 %s ..."
@@ -3046,547 +3046,552 @@ msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/查看(_V)/显示或隐藏(_D)/工具栏(_T)/图标和文字(_A)"
 
 #: src/mainwindow.c:566
-msgid "/_View/Show or hi_de/_Toolbar/_Icon"
+#, fuzzy
+msgid "/_View/Show or hi_de/_Toolbar/Text at the _right of icon"
 msgstr "/查看(_V)/显示或隐藏(_D)/工具栏(_T)/图标(_I)"
 
 #: src/mainwindow.c:568
+msgid "/_View/Show or hi_de/_Toolbar/_Icon"
+msgstr "/查看(_V)/显示或隐藏(_D)/工具栏(_T)/图标(_I)"
+
+#: src/mainwindow.c:570
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/查看(_V)/显示或隐藏(_D)/工具栏(_T)/文字(_T)"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:572
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/查看(_V)/显示或隐藏(_D)/工具栏(_T)/无(_N)"
 
-#: src/mainwindow.c:572
+#: src/mainwindow.c:574
 #, fuzzy
 msgid "/_View/Show or hi_de/_Search bar"
 msgstr "/查看(_V)/显示或隐藏(_D)/状态栏(_B)"
 
-#: src/mainwindow.c:574
+#: src/mainwindow.c:576
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/查看(_V)/显示或隐藏(_D)/状态栏(_B)"
 
-#: src/mainwindow.c:576
+#: src/mainwindow.c:578
 #, fuzzy
 msgid "/_View/_Customize toolbar..."
 msgstr "/查看(_V)/转到(_G)/其它文件夹(_F)..."
 
-#: src/mainwindow.c:578
+#: src/mainwindow.c:580
 msgid "/_View/Separate f_older tree"
 msgstr "/查看(_V)/分离文件夹树窗口(_O)"
 
-#: src/mainwindow.c:579
+#: src/mainwindow.c:581
 msgid "/_View/Separate _message view"
 msgstr "/查看(_V)/分离邮件视图窗口(_M)"
 
-#: src/mainwindow.c:581
+#: src/mainwindow.c:583
 msgid "/_View/_Sort"
 msgstr "/查看/排序(_S)"
 
-#: src/mainwindow.c:582
+#: src/mainwindow.c:584
 msgid "/_View/_Sort/by _number"
 msgstr "/查看(_V)/排序(_S)/按序号(_N)"
 
-#: src/mainwindow.c:583
+#: src/mainwindow.c:585
 msgid "/_View/_Sort/by s_ize"
 msgstr "/查看(_V)/排序(_S)/按大小(_I)"
 
-#: src/mainwindow.c:584
+#: src/mainwindow.c:586
 msgid "/_View/_Sort/by _date"
 msgstr "/查看(_V)/排序(_S)/按日期(_D)"
 
-#: src/mainwindow.c:585
+#: src/mainwindow.c:587
 #, fuzzy
 msgid "/_View/_Sort/by t_hread date"
 msgstr "/查看(_V)/排序(_S)/按日期(_D)"
 
-#: src/mainwindow.c:586
+#: src/mainwindow.c:588
 msgid "/_View/_Sort/by _from"
 msgstr "/查看(_V)/排序(_S)/按发件人(_F)"
 
-#: src/mainwindow.c:587
+#: src/mainwindow.c:589
 msgid "/_View/_Sort/by _recipient"
 msgstr "/查看(_V)/排序(_S)/按收件人(_R)"
 
-#: src/mainwindow.c:588
+#: src/mainwindow.c:590
 msgid "/_View/_Sort/by _subject"
 msgstr "/查看(_V)/排序(_S)/按主题(_S)"
 
-#: src/mainwindow.c:589
+#: src/mainwindow.c:591
 msgid "/_View/_Sort/by _color label"
 msgstr "/查看(_V)/排序(_S)/按颜色标注(_C)"
 
-#: src/mainwindow.c:591
+#: src/mainwindow.c:593
 msgid "/_View/_Sort/by _mark"
 msgstr "/查看(_V)/排序(_S)/按标记(_M)"
 
-#: src/mainwindow.c:592
+#: src/mainwindow.c:594
 msgid "/_View/_Sort/by _unread"
 msgstr "/查看(_V)/排序(_S)/按未读(_U)"
 
-#: src/mainwindow.c:593
+#: src/mainwindow.c:595
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/查看(_V)/排序(_S)/按附件(_T)"
 
-#: src/mainwindow.c:595
+#: src/mainwindow.c:597
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/查看(_V)/排序(_S)/不排序(_O)"
 
-#: src/mainwindow.c:596 src/mainwindow.c:599
+#: src/mainwindow.c:598 src/mainwindow.c:601
 msgid "/_View/_Sort/---"
 msgstr "/查看(_V)/排序(_S)/---"
 
-#: src/mainwindow.c:597
+#: src/mainwindow.c:599
 msgid "/_View/_Sort/Ascending"
 msgstr "/查看(_V)/排序(_S)/升序"
 
-#: src/mainwindow.c:598
+#: src/mainwindow.c:600
 msgid "/_View/_Sort/Descending"
 msgstr "/查看(_V)/排序(_S)/降序"
 
-#: src/mainwindow.c:600
+#: src/mainwindow.c:602
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/查看(_V)/排序(_S)/按主题集中(_A)"
 
-#: src/mainwindow.c:602
+#: src/mainwindow.c:604
 msgid "/_View/Th_read view"
 msgstr "/查看(_V)/按线索查看(_R)"
 
-#: src/mainwindow.c:603
+#: src/mainwindow.c:605
 msgid "/_View/E_xpand all threads"
 msgstr "/查看(_V)/展开所有线索(_X)"
 
-#: src/mainwindow.c:604
+#: src/mainwindow.c:606
 msgid "/_View/Co_llapse all threads"
 msgstr "/查看(_V)/收缩所有线索(_L)"
 
-#: src/mainwindow.c:605
+#: src/mainwindow.c:607
 msgid "/_View/Set display _item..."
 msgstr "/查看(_V)/设置显示项(_I)..."
 
-#: src/mainwindow.c:608
+#: src/mainwindow.c:610
 msgid "/_View/_Go to"
 msgstr "/查看(_V)/转到(_G)"
 
-#: src/mainwindow.c:609
+#: src/mainwindow.c:611
 msgid "/_View/_Go to/_Prev message"
 msgstr "/查看(_V)/转到(_G)/上一个邮件(_P)"
 
-#: src/mainwindow.c:610
+#: src/mainwindow.c:612
 msgid "/_View/_Go to/_Next message"
 msgstr "/查看(_V)/转到(_G)/下一个邮件(_N)"
 
-#: src/mainwindow.c:611 src/mainwindow.c:616 src/mainwindow.c:619
-#: src/mainwindow.c:624 src/mainwindow.c:629
+#: src/mainwindow.c:613 src/mainwindow.c:618 src/mainwindow.c:621
+#: src/mainwindow.c:626 src/mainwindow.c:631
 msgid "/_View/_Go to/---"
 msgstr "/查看(_V)/转到(_G)/---"
 
-#: src/mainwindow.c:612
+#: src/mainwindow.c:614
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/查看(_V)/转到(_G)/上一个未读邮件(_R)"
 
-#: src/mainwindow.c:614
+#: src/mainwindow.c:616
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/查看(_V)/转到(_G)/下一个未读邮件(_E)"
 
-#: src/mainwindow.c:617
+#: src/mainwindow.c:619
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/查看(_V)/转到(_G)/上一个新邮件(_W)"
 
-#: src/mainwindow.c:618
+#: src/mainwindow.c:620
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/查看(_V)/转到(_G)/下一个新邮件(_X)"
 
-#: src/mainwindow.c:620
+#: src/mainwindow.c:622
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/查看(_V)/转到(_G)/上一个标记的邮件(_M)"
 
-#: src/mainwindow.c:622
+#: src/mainwindow.c:624
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/查看(_V)/转到(_G)/下一个标记的邮件(_A)"
 
-#: src/mainwindow.c:625
+#: src/mainwindow.c:627
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/查看(_V)/转到(_G)/上一个用颜色标注的邮件(_L)"
 
-#: src/mainwindow.c:627
+#: src/mainwindow.c:629
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/查看(_V)/转到(_G)/下一个用颜色标注的邮件(_B)"
 
-#: src/mainwindow.c:630
+#: src/mainwindow.c:632
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/查看(_V)/转到(_G)/其它文件夹(_F)..."
 
-#: src/mainwindow.c:639 src/messageview.c:174
+#: src/mainwindow.c:641 src/messageview.c:174
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/查看(_V)/字符编码(_E)/自动检测(_A)"
 
-#: src/mainwindow.c:652 src/messageview.c:187
+#: src/mainwindow.c:654 src/messageview.c:187
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr "/查看(_V)/字符编码(_E)/西欧 (ISO-8859-15)"
 
-#: src/mainwindow.c:700 src/messageview.c:227
+#: src/mainwindow.c:702 src/messageview.c:227
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/查看(_V)/字符编码(_E)/日语 (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:702 src/messageview.c:229
+#: src/mainwindow.c:704 src/messageview.c:229
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/查看(_V)/字符编码(_E)/日语 (_EUC-JP)"
 
-#: src/mainwindow.c:704 src/messageview.c:231
+#: src/mainwindow.c:706 src/messageview.c:231
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/查看(_V)/字符编码(_E)/日语 (_Shift__JIS)"
 
-#: src/mainwindow.c:714 src/messageview.c:240
+#: src/mainwindow.c:716 src/messageview.c:240
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/查看(_V)/字符编码(_E)/繁体中文 (EUC-_TW)"
 
-#: src/mainwindow.c:716 src/messageview.c:242
+#: src/mainwindow.c:718 src/messageview.c:242
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/查看(_V)/字符编码(_E)/中文 (ISO-2022-_CN)"
 
-#: src/mainwindow.c:722 src/messageview.c:247
+#: src/mainwindow.c:724 src/messageview.c:247
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/查看(_V)/字符编码(_E)/朝鲜语 (ISO-2022-KR)"
 
-#: src/mainwindow.c:735 src/summaryview.c:464
+#: src/mainwindow.c:737 src/summaryview.c:464
 msgid "/_View/Open in new _window"
 msgstr "/查看(_V)/在新窗口中打开(_W)"
 
-#: src/mainwindow.c:736 src/messageview.c:259 src/summaryview.c:466
+#: src/mainwindow.c:738 src/messageview.c:259 src/summaryview.c:466
 msgid "/_View/Mess_age source"
 msgstr "/查看(_V)/邮件源文件(_A)"
 
-#: src/mainwindow.c:737 src/messageview.c:260 src/summaryview.c:467
+#: src/mainwindow.c:739 src/messageview.c:260 src/summaryview.c:467
 #, fuzzy
 msgid "/_View/All _headers"
 msgstr "/查看(_V)/所有标题(_H)"
 
-#: src/mainwindow.c:739
+#: src/mainwindow.c:741
 msgid "/_View/_Update summary"
 msgstr "/查看(_V)/更新摘要(_U)"
 
-#: src/mainwindow.c:741 src/messageview.c:263
+#: src/mainwindow.c:743 src/messageview.c:263
 msgid "/_Message"
 msgstr "/邮件(_M)"
 
-#: src/mainwindow.c:742
+#: src/mainwindow.c:744
 msgid "/_Message/Recei_ve"
 msgstr "/邮件(_M)/接收(_V)"
 
-#: src/mainwindow.c:743
+#: src/mainwindow.c:745
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/邮件(_M)/接收(_V)/当前帐号(_C)"
 
-#: src/mainwindow.c:745
+#: src/mainwindow.c:747
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/邮件(_M)/接收(_V)/所有帐号(_A)"
 
-#: src/mainwindow.c:747
+#: src/mainwindow.c:749
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/邮件(_M)/接收(_V)/取消(_G)"
 
-#: src/mainwindow.c:749
+#: src/mainwindow.c:751
 msgid "/_Message/Recei_ve/---"
 msgstr "/邮件(_M)/接收(_V)/---"
 
-#: src/mainwindow.c:750
+#: src/mainwindow.c:752
 msgid "/_Message/_Send queued messages"
 msgstr "/邮件(_M)/发送队列中的邮件(_S)"
 
-#: src/mainwindow.c:751 src/mainwindow.c:753 src/mainwindow.c:760
-#: src/mainwindow.c:765 src/mainwindow.c:768 src/mainwindow.c:779
-#: src/mainwindow.c:781 src/mainwindow.c:784 src/messageview.c:266
+#: src/mainwindow.c:753 src/mainwindow.c:755 src/mainwindow.c:762
+#: src/mainwindow.c:767 src/mainwindow.c:770 src/mainwindow.c:781
+#: src/mainwindow.c:783 src/mainwindow.c:786 src/messageview.c:266
 #: src/messageview.c:274 src/messageview.c:279
 msgid "/_Message/---"
 msgstr "/邮件(_M)/---"
 
-#: src/mainwindow.c:752 src/messageview.c:264
+#: src/mainwindow.c:754 src/messageview.c:264
 msgid "/_Message/Compose _new message"
 msgstr "/邮件(_M)/撰写新邮件(_N)"
 
-#: src/mainwindow.c:754 src/messageview.c:267
+#: src/mainwindow.c:756 src/messageview.c:267
 msgid "/_Message/_Reply"
 msgstr "/邮件(_M)/回复(_R)"
 
-#: src/mainwindow.c:755
+#: src/mainwindow.c:757
 msgid "/_Message/Repl_y to"
 msgstr "/邮件(_M)/回复到(_Y)"
 
-#: src/mainwindow.c:756 src/messageview.c:268
+#: src/mainwindow.c:758 src/messageview.c:268
 msgid "/_Message/Repl_y to/_all"
 msgstr "/邮件(_M)/回复到(_Y)/所有人(_AL)"
 
-#: src/mainwindow.c:757 src/messageview.c:270
+#: src/mainwindow.c:759 src/messageview.c:270
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/邮件(_M)/回复到(_Y)/发件人(_S)"
 
-#: src/mainwindow.c:758 src/messageview.c:272
+#: src/mainwindow.c:760 src/messageview.c:272
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/邮件(_M)/回复到(_Y)/邮件列表(_L)"
 
-#: src/mainwindow.c:761 src/messageview.c:275
+#: src/mainwindow.c:763 src/messageview.c:275
 msgid "/_Message/_Forward"
 msgstr "/邮件(_M)/转发(_F)"
 
-#: src/mainwindow.c:762 src/messageview.c:276
+#: src/mainwindow.c:764 src/messageview.c:276
 msgid "/_Message/For_ward as attachment"
 msgstr "/邮件(_M)/作为附件转发(_W)"
 
-#: src/mainwindow.c:764 src/messageview.c:278
+#: src/mainwindow.c:766 src/messageview.c:278
 msgid "/_Message/Redirec_t"
 msgstr "/邮件(_M)/重定向(_T)"
 
-#: src/mainwindow.c:766
+#: src/mainwindow.c:768
 msgid "/_Message/M_ove..."
 msgstr "/邮件(_M)/移动(_O)..."
 
-#: src/mainwindow.c:767
+#: src/mainwindow.c:769
 msgid "/_Message/_Copy..."
 msgstr "/邮件(_M)/复制(_C)..."
 
-#: src/mainwindow.c:769
+#: src/mainwindow.c:771
 msgid "/_Message/_Mark"
 msgstr "/邮件(_M)/标记(_M)"
 
-#: src/mainwindow.c:770
+#: src/mainwindow.c:772
 msgid "/_Message/_Mark/_Mark"
 msgstr "/邮件(_M)/标记(_M)/标记(_M)"
 
-#: src/mainwindow.c:771
+#: src/mainwindow.c:773
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/邮件(_M)/标记(_M)/取消标记(_U)"
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:774
 msgid "/_Message/_Mark/---"
 msgstr "/邮件(_M)/标记(_M)/---"
 
-#: src/mainwindow.c:773
+#: src/mainwindow.c:775
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/邮件(_M)/标记(_M)/标记为未读(_E)"
 
-#: src/mainwindow.c:774
+#: src/mainwindow.c:776
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/邮件(_M)/标记(_M)/标记为已读(_D)"
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:778
 #, fuzzy
 msgid "/_Message/_Mark/Mark _thread as read"
 msgstr "/邮件(_M)/标记(_M)/标记为已读(_D)"
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:780
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/邮件(_M)/标记(_M)/全部标记为已读(_R)"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:782
 msgid "/_Message/_Delete"
 msgstr "/邮件(_M)/删除(_D)"
 
-#: src/mainwindow.c:782
+#: src/mainwindow.c:784
 #, fuzzy
 msgid "/_Message/Set as _junk mail"
 msgstr "/邮件(_M)/接收新邮件(_i)"
 
-#: src/mainwindow.c:783
+#: src/mainwindow.c:785
 #, fuzzy
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/邮件(_M)/接收新邮件(_i)"
 
-#: src/mainwindow.c:785 src/messageview.c:280
+#: src/mainwindow.c:787 src/messageview.c:280
 msgid "/_Message/Re-_edit"
 msgstr "/邮件(_M)/重新编辑(_E)"
 
-#: src/mainwindow.c:789
+#: src/mainwindow.c:791
 #, fuzzy
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/工具(_T)/将发件人添加到地址簿中(_K)"
 
-#: src/mainwindow.c:792
+#: src/mainwindow.c:794
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/工具(_T)/过滤文件夹中所有的邮件(_F)"
 
-#: src/mainwindow.c:794
+#: src/mainwindow.c:796
 msgid "/_Tools/Filter _selected messages"
 msgstr "/工具(_T)/过滤选中的邮件(_S)"
 
-#: src/mainwindow.c:796 src/messageview.c:287
+#: src/mainwindow.c:798 src/messageview.c:287
 msgid "/_Tools/_Create filter rule"
 msgstr "/工具(_T)/创建过滤规则(_C)"
 
-#: src/mainwindow.c:797 src/messageview.c:289
+#: src/mainwindow.c:799 src/messageview.c:289
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/工具(_T)/创建过滤规则(_C)/自动(_A)"
 
-#: src/mainwindow.c:799 src/messageview.c:291
+#: src/mainwindow.c:801 src/messageview.c:291
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/工具(_T)/创建过滤规则(_C)/按发件人(_F)"
 
-#: src/mainwindow.c:801 src/messageview.c:293
+#: src/mainwindow.c:803 src/messageview.c:293
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/工具(_T)/创建过滤规则(_C)/按收件人(_T)"
 
-#: src/mainwindow.c:803 src/messageview.c:295
+#: src/mainwindow.c:805 src/messageview.c:295
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/工具(_T)/创建过滤规则(_C)/按主题(_S)"
 
-#: src/mainwindow.c:806
+#: src/mainwindow.c:808
 #, fuzzy
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/工具(_T)/过滤文件夹中所有的邮件(_F)"
 
-#: src/mainwindow.c:808
+#: src/mainwindow.c:810
 #, fuzzy
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/工具(_T)/过滤选中的邮件(_S)"
 
-#: src/mainwindow.c:815
+#: src/mainwindow.c:817
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/工具(_T)/删除重复的邮件(_P)"
 
-#: src/mainwindow.c:818
+#: src/mainwindow.c:820
 #, fuzzy
 msgid "/_Tools/E_xecute marked process"
 msgstr "执行标记的处理"
 
-#: src/mainwindow.c:820
+#: src/mainwindow.c:822
 msgid "/_Tools/_Log window"
 msgstr "/工具(_T)/记录窗口(_L)"
 
-#: src/mainwindow.c:822
+#: src/mainwindow.c:824
 msgid "/_Configuration"
 msgstr "/配置(_C)"
 
-#: src/mainwindow.c:823
+#: src/mainwindow.c:825
 msgid "/_Configuration/_Common preferences..."
 msgstr "/配置(_C)/通用首选项(_C)..."
 
-#: src/mainwindow.c:825
+#: src/mainwindow.c:827
 msgid "/_Configuration/_Filter setting..."
 msgstr "/配置(_C)/过滤设置(_F)..."
 
-#: src/mainwindow.c:827
+#: src/mainwindow.c:829
 msgid "/_Configuration/_Template..."
 msgstr "/配置(_C)/模板(_T)..."
 
-#: src/mainwindow.c:829
+#: src/mainwindow.c:831
 msgid "/_Configuration/_Actions..."
 msgstr "/配置(_C)/动作(_A)..."
 
-#: src/mainwindow.c:831
+#: src/mainwindow.c:833
 msgid "/_Configuration/---"
 msgstr "/配置(_C)/---"
 
-#: src/mainwindow.c:832
+#: src/mainwindow.c:834
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/配置(_C)/当前帐号首选项(_P)..."
 
-#: src/mainwindow.c:834
+#: src/mainwindow.c:836
 msgid "/_Configuration/Create _new account..."
 msgstr "/配置(_C)/创建新帐号(_N)..."
 
-#: src/mainwindow.c:836
+#: src/mainwindow.c:838
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/配置(_C)/编辑帐号(_E)..."
 
-#: src/mainwindow.c:838
+#: src/mainwindow.c:840
 msgid "/_Configuration/C_hange current account"
 msgstr "/配置(_C)/改变当前帐号(_H)"
 
-#: src/mainwindow.c:842
+#: src/mainwindow.c:844
 msgid "/_Help/_Manual"
 msgstr "/帮助(_H)/手册(_M)"
 
-#: src/mainwindow.c:843
+#: src/mainwindow.c:845
 msgid "/_Help/_Manual/_English"
 msgstr "/帮助(_H)/手册(_M)/英语(_E)"
 
-#: src/mainwindow.c:844
+#: src/mainwindow.c:846
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/帮助(_H)/手册(_M)/日语(_J)"
 
-#: src/mainwindow.c:845
+#: src/mainwindow.c:847
 msgid "/_Help/_FAQ"
 msgstr "/帮助(_H)/常见问题(_F)"
 
-#: src/mainwindow.c:846
+#: src/mainwindow.c:848
 msgid "/_Help/_FAQ/_English"
 msgstr "/帮助(_H)/常见问题(_F)/英语(_E)"
 
-#: src/mainwindow.c:847
+#: src/mainwindow.c:849
 msgid "/_Help/_FAQ/_German"
 msgstr "/帮助(_H)/常见问题(_F)/德语(_G)"
 
-#: src/mainwindow.c:848
+#: src/mainwindow.c:850
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/帮助(_H)/常见问题(_F)/西班牙语(_S)"
 
-#: src/mainwindow.c:849
+#: src/mainwindow.c:851
 msgid "/_Help/_FAQ/_French"
 msgstr "/帮助(_H)/常见问题(_F)/法语(_F)"
 
-#: src/mainwindow.c:850
+#: src/mainwindow.c:852
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/帮助(_H)/常见问题(_F)/意大利语(_I)"
 
-#: src/mainwindow.c:851
+#: src/mainwindow.c:853
 #, fuzzy
 msgid "/_Help/_Command line options"
 msgstr "没有设置命令行。"
 
-#: src/mainwindow.c:852
+#: src/mainwindow.c:854
 msgid "/_Help/---"
 msgstr "/帮助(_H)/---"
 
-#: src/mainwindow.c:895
+#: src/mainwindow.c:897
 msgid "Creating main window...\n"
 msgstr "正在创建主窗口...\n"
 
-#: src/mainwindow.c:1071
+#: src/mainwindow.c:1073
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "主窗口：分配颜色 %d 失败\n"
 
-#: src/mainwindow.c:1175 src/summaryview.c:2387 src/summaryview.c:2472
+#: src/mainwindow.c:1181 src/summaryview.c:2387 src/summaryview.c:2472
 #: src/summaryview.c:4009 src/summaryview.c:4138 src/summaryview.c:4507
 msgid "done.\n"
 msgstr "完成。\n"
 
-#: src/mainwindow.c:1293 src/mainwindow.c:1334 src/mainwindow.c:1359
+#: src/mainwindow.c:1299 src/mainwindow.c:1340 src/mainwindow.c:1365
 msgid "Untitled"
 msgstr "无标题"
 
-#: src/mainwindow.c:1360
+#: src/mainwindow.c:1366
 msgid "none"
 msgstr "无"
 
-#: src/mainwindow.c:1413
+#: src/mainwindow.c:1419
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "正在把窗口分隔方式从 %d 改到 %d\n"
 
-#: src/mainwindow.c:1663
+#: src/mainwindow.c:1669
 msgid "Offline"
 msgstr "离线"
 
-#: src/mainwindow.c:1664
+#: src/mainwindow.c:1670
 msgid "You are offline. Go online?"
 msgstr "您处于离线状态。切换到在线状态吗？"
 
-#: src/mainwindow.c:1681
+#: src/mainwindow.c:1687
 msgid "Empty all trash"
 msgstr "清空所有废件箱"
 
-#: src/mainwindow.c:1682
+#: src/mainwindow.c:1688
 #, fuzzy
 msgid "Delete all messages in trash folders?"
 msgstr "清空废件箱里的所有信件？"
 
-#: src/mainwindow.c:1712
+#: src/mainwindow.c:1718
 msgid "Add mailbox"
 msgstr "添加邮箱"
 
-#: src/mainwindow.c:1713
+#: src/mainwindow.c:1719
 #, fuzzy
 msgid ""
 "Specify the location of mailbox.\n"
@@ -3596,16 +3601,16 @@ msgstr ""
 "输入邮箱位置。\n"
 "如果指定了已存在的邮箱，它将被自动扫描。"
 
-#: src/mainwindow.c:1719 src/setup.c:49
+#: src/mainwindow.c:1725 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "邮箱“%s”已经存在。"
 
-#: src/mainwindow.c:1724 src/setup.c:56
+#: src/mainwindow.c:1730 src/setup.c:56
 msgid "Mailbox"
 msgstr "邮箱"
 
-#: src/mainwindow.c:1730 src/setup.c:62
+#: src/mainwindow.c:1736 src/setup.c:62
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3614,132 +3619,132 @@ msgstr ""
 "创建邮件箱失败。\n"
 "也许某些文件已经存在，或者您没有写权限。"
 
-#: src/mainwindow.c:2198
+#: src/mainwindow.c:2206
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed－文件夹视图"
 
-#: src/mainwindow.c:2217
+#: src/mainwindow.c:2225
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed－邮件视图"
 
-#: src/mainwindow.c:2369 src/summaryview.c:418
+#: src/mainwindow.c:2377 src/summaryview.c:418
 msgid "/_Reply"
 msgstr "/回复(_R)"
 
-#: src/mainwindow.c:2370
+#: src/mainwindow.c:2378
 msgid "/Reply to _all"
 msgstr "/回复到所有人(_A)"
 
-#: src/mainwindow.c:2371
+#: src/mainwindow.c:2379
 msgid "/Reply to _sender"
 msgstr "/回复到发件人(_S)"
 
-#: src/mainwindow.c:2372
+#: src/mainwindow.c:2380
 msgid "/Reply to mailing _list"
 msgstr "/回复到邮件列表(_L)"
 
-#: src/mainwindow.c:2377 src/summaryview.c:425
+#: src/mainwindow.c:2385 src/summaryview.c:425
 msgid "/_Forward"
 msgstr "/转发(_F)"
 
-#: src/mainwindow.c:2378 src/summaryview.c:426
+#: src/mainwindow.c:2386 src/summaryview.c:426
 msgid "/For_ward as attachment"
 msgstr "/作为附件转发(_W)"
 
-#: src/mainwindow.c:2379 src/summaryview.c:427
+#: src/mainwindow.c:2387 src/summaryview.c:427
 msgid "/Redirec_t"
 msgstr "/重定向(_T)"
 
-#: src/mainwindow.c:2384
+#: src/mainwindow.c:2392
 msgid "Incorporate new mail"
 msgstr "合并新邮件"
 
-#: src/mainwindow.c:2386
+#: src/mainwindow.c:2394
 msgid "Incorporate new mail of all accounts"
 msgstr "合并所有帐号的新邮件"
 
-#: src/mainwindow.c:2388
+#: src/mainwindow.c:2396
 msgid "Send queued message(s)"
 msgstr "发送队列中的邮件"
 
-#: src/mainwindow.c:2390
+#: src/mainwindow.c:2398
 msgid "Compose new message"
 msgstr "撰写新邮件"
 
-#: src/mainwindow.c:2392
+#: src/mainwindow.c:2400
 msgid "Reply to the message"
 msgstr "回复该邮件"
 
-#: src/mainwindow.c:2394
+#: src/mainwindow.c:2402
 msgid "Reply to all"
 msgstr "回复给所有人"
 
-#: src/mainwindow.c:2396
+#: src/mainwindow.c:2404
 msgid "Forward the message"
 msgstr "转发该邮件"
 
-#: src/mainwindow.c:2398
+#: src/mainwindow.c:2406
 msgid "Delete the message"
 msgstr "删除该邮件"
 
-#: src/mainwindow.c:2400
+#: src/mainwindow.c:2408
 #, fuzzy
 msgid "Set as junk mail"
 msgstr "设置为默认帐号"
 
-#: src/mainwindow.c:2402
+#: src/mainwindow.c:2410
 msgid "Execute marked process"
 msgstr "执行标记的处理"
 
-#: src/mainwindow.c:2404
+#: src/mainwindow.c:2412
 msgid "Next unread message"
 msgstr "下一个未读的邮件"
 
-#: src/mainwindow.c:2406
+#: src/mainwindow.c:2414
 #, fuzzy
 msgid "Previous unread message"
 msgstr "下一个未读的邮件"
 
-#: src/mainwindow.c:2410
+#: src/mainwindow.c:2418
 #, fuzzy
 msgid "Print message"
 msgstr "立即发送邮件"
 
-#: src/mainwindow.c:2412
+#: src/mainwindow.c:2420
 msgid "Common preferences"
 msgstr "通用首选项"
 
-#: src/mainwindow.c:2414 src/prefs_account_dialog.c:511
+#: src/mainwindow.c:2422 src/prefs_account_dialog.c:511
 msgid "Account preferences"
 msgstr "帐号首选项"
 
-#: src/mainwindow.c:2779
+#: src/mainwindow.c:2788
 msgid "You are offline. Click the icon to go online."
 msgstr "您处于离线状态。单击图标切换到在线状态。"
 
-#: src/mainwindow.c:2790
+#: src/mainwindow.c:2799
 msgid "You are online. Click the icon to go offline."
 msgstr "您处于在线状态。单击图标切换到离线状态。"
 
-#: src/mainwindow.c:3062
+#: src/mainwindow.c:3071
 msgid "Exit"
 msgstr "退出"
 
-#: src/mainwindow.c:3062
+#: src/mainwindow.c:3071
 msgid "Exit this program?"
 msgstr "要退出本程序吗？"
 
-#: src/mainwindow.c:3666
+#: src/mainwindow.c:3675
 #, fuzzy
 msgid "Command line options"
 msgstr "没有设置命令行。"
 
-#: src/mainwindow.c:3679
+#: src/mainwindow.c:3688
 #, fuzzy
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "用法：%s [OPTION]...\n"
 
-#: src/mainwindow.c:3687
+#: src/mainwindow.c:3696
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -3755,7 +3760,7 @@ msgid ""
 "--version"
 msgstr ""
 
-#: src/mainwindow.c:3703
+#: src/mainwindow.c:3712
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 83166c44..5fa7923c 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed 2.1.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-01-31 16:49+0900\n"
+"POT-Creation-Date: 2007-01-31 17:29+0900\n"
 "PO-Revision-Date: 2005-10-25 16:23+0800\n"
 "Last-Translator: Wei-Lun Chao <chaoweilun@pcmail.com.tw>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
@@ -907,7 +907,7 @@ msgstr "/地址(_A)/編輯(_E)"
 msgid "/_Address/_Delete"
 msgstr "/地址(_A)/刪除(_D)"
 
-#: src/addressbook.c:359 src/compose.c:673 src/mainwindow.c:787
+#: src/addressbook.c:359 src/compose.c:673 src/mainwindow.c:789
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/工具(_T)"
@@ -916,12 +916,12 @@ msgstr "/工具(_T)"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/工具(_T)/匯入 LDIF 檔(_L)"
 
-#: src/addressbook.c:361 src/compose.c:694 src/mainwindow.c:841
+#: src/addressbook.c:361 src/compose.c:694 src/mainwindow.c:843
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/說明(_H)"
 
-#: src/addressbook.c:362 src/compose.c:695 src/mainwindow.c:853
+#: src/addressbook.c:362 src/compose.c:695 src/mainwindow.c:855
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/說明(_H)/關於(_A)"
@@ -963,7 +963,7 @@ msgstr "/刪除(_D)"
 msgid "E-Mail address"
 msgstr "E-Mail 地址"
 
-#: src/addressbook.c:496 src/compose.c:4873 src/mainwindow.c:2408
+#: src/addressbook.c:496 src/compose.c:4873 src/mainwindow.c:2416
 #: src/prefs_common_dialog.c:2274
 msgid "Address book"
 msgstr "通訊錄"
@@ -1176,7 +1176,7 @@ msgstr "共用通訊紀錄"
 msgid "Personal address"
 msgstr "私人通訊紀錄"
 
-#: src/alertpanel.c:142 src/compose.c:5717 src/main.c:638
+#: src/alertpanel.c:142 src/compose.c:5720 src/main.c:638
 msgid "Notice"
 msgstr "注意"
 
@@ -1344,9 +1344,9 @@ msgid "/_View/_Reply to"
 msgstr "/顯示(_V)/回覆(_R)"
 
 #: src/compose.c:578 src/compose.c:580 src/compose.c:582 src/compose.c:584
-#: src/compose.c:587 src/mainwindow.c:577 src/mainwindow.c:580
-#: src/mainwindow.c:607 src/mainwindow.c:631 src/mainwindow.c:734
-#: src/mainwindow.c:738 src/messageview.c:258
+#: src/compose.c:587 src/mainwindow.c:579 src/mainwindow.c:582
+#: src/mainwindow.c:609 src/mainwindow.c:633 src/mainwindow.c:736
+#: src/mainwindow.c:740 src/messageview.c:258
 msgid "/_View/---"
 msgstr "/顯示(_V)/---"
 
@@ -1367,7 +1367,7 @@ msgstr "/顯示(_V)/附加(_A)"
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/顯示(_V)/前往(_G)/到其他資料夾(_F)"
 
-#: src/compose.c:593 src/mainwindow.c:638 src/messageview.c:173
+#: src/compose.c:593 src/mainwindow.c:640 src/messageview.c:173
 msgid "/_View/Character _encoding"
 msgstr "/檢視(_V)/字元編碼(_E)"
 
@@ -1378,115 +1378,115 @@ msgstr "/檢視(_V)/字元編碼(_E)/自動(_A)"
 #: src/compose.c:596 src/compose.c:602 src/compose.c:608 src/compose.c:612
 #: src/compose.c:620 src/compose.c:624 src/compose.c:630 src/compose.c:636
 #: src/compose.c:640 src/compose.c:650 src/compose.c:654 src/compose.c:662
-#: src/compose.c:666 src/mainwindow.c:634 src/mainwindow.c:641
+#: src/compose.c:666 src/mainwindow.c:636 src/mainwindow.c:643
 #: src/messageview.c:169
 msgid "/_View/Character _encoding/---"
 msgstr "/檢視(_V)/字元編碼(_E)/---"
 
-#: src/compose.c:598 src/mainwindow.c:642 src/messageview.c:177
+#: src/compose.c:598 src/mainwindow.c:644 src/messageview.c:177
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/顯示(_V)/字元編碼(_E)/7位元 ASCII (US-ASC_II)"
 
-#: src/compose.c:600 src/mainwindow.c:644 src/messageview.c:180
+#: src/compose.c:600 src/mainwindow.c:646 src/messageview.c:180
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/顯示(_V)/字元編碼(_E)/Unicode (_UTF-8)"
 
-#: src/compose.c:604 src/mainwindow.c:648 src/messageview.c:183
+#: src/compose.c:604 src/mainwindow.c:650 src/messageview.c:183
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/顯示(_V)/字元編碼(_E)/西歐語系 (ISO-8859-_1)"
 
-#: src/compose.c:606 src/mainwindow.c:650 src/messageview.c:185
+#: src/compose.c:606 src/mainwindow.c:652 src/messageview.c:185
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/顯示(_V)/字元編碼(_E)/西歐語系 (ISO-8859-15)"
 
-#: src/compose.c:610 src/mainwindow.c:656 src/messageview.c:190
+#: src/compose.c:610 src/mainwindow.c:658 src/messageview.c:190
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/顯示(_V)/字元編碼(_E)/中歐語系 (ISO-8859-_2)"
 
-#: src/compose.c:614 src/mainwindow.c:660 src/messageview.c:193
+#: src/compose.c:614 src/mainwindow.c:662 src/messageview.c:193
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/顯示(_V)/字元編碼(_E)/波羅的海語系 (ISO-8859-13)(_B)"
 
-#: src/compose.c:616 src/mainwindow.c:662 src/messageview.c:195
+#: src/compose.c:616 src/mainwindow.c:664 src/messageview.c:195
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/顯示(_V)/字元編碼(_E)/波羅的海語系 (ISO-8859-_4)"
 
-#: src/compose.c:618 src/mainwindow.c:664 src/messageview.c:197
+#: src/compose.c:618 src/mainwindow.c:666 src/messageview.c:197
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/顯示(_V)/字元編碼(_E)/斯拉夫語 (Windows-1251)"
 
-#: src/compose.c:622 src/mainwindow.c:668 src/messageview.c:200
+#: src/compose.c:622 src/mainwindow.c:670 src/messageview.c:200
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/顯示(_V)/字元編碼(_E)/希臘語 (ISO-8859-_7)"
 
-#: src/compose.c:626 src/mainwindow.c:672 src/messageview.c:203
+#: src/compose.c:626 src/mainwindow.c:674 src/messageview.c:203
 #, fuzzy
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/顯示(_V)/字元編碼(_E)/波羅的海語系 (ISO-8859-_4)"
 
-#: src/compose.c:628 src/mainwindow.c:674 src/messageview.c:205
+#: src/compose.c:628 src/mainwindow.c:676 src/messageview.c:205
 #, fuzzy
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/顯示(_V)/字元編碼(_E)/斯拉夫語 (Windows-1251)"
 
-#: src/compose.c:632 src/mainwindow.c:678 src/messageview.c:208
+#: src/compose.c:632 src/mainwindow.c:680 src/messageview.c:208
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/顯示(_V)/字元編碼(_E)/希臘語 (ISO-8859-_8)"
 
-#: src/compose.c:634 src/mainwindow.c:680 src/messageview.c:210
+#: src/compose.c:634 src/mainwindow.c:682 src/messageview.c:210
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/顯示(_V)/字元編碼(_E)/斯拉夫語 (Windows-1255)"
 
-#: src/compose.c:638 src/mainwindow.c:684 src/messageview.c:213
+#: src/compose.c:638 src/mainwindow.c:686 src/messageview.c:213
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/顯示(_V)/字元編碼(_E)/土耳其語 (ISO-8859-_9)"
 
-#: src/compose.c:642 src/mainwindow.c:688 src/messageview.c:216
+#: src/compose.c:642 src/mainwindow.c:690 src/messageview.c:216
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/顯示(_V)/字元編碼(_E)/斯拉夫語 (ISO-8859-_5)"
 
-#: src/compose.c:644 src/mainwindow.c:690 src/messageview.c:218
+#: src/compose.c:644 src/mainwindow.c:692 src/messageview.c:218
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/顯示(_V)/字元編碼(_E)/斯拉夫語 (KOI8-_R)"
 
-#: src/compose.c:646 src/mainwindow.c:692 src/messageview.c:220
+#: src/compose.c:646 src/mainwindow.c:694 src/messageview.c:220
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/顯示(_V)/字元編碼(_E)/斯拉夫語 (KOI8-U)"
 
-#: src/compose.c:648 src/mainwindow.c:694 src/messageview.c:222
+#: src/compose.c:648 src/mainwindow.c:696 src/messageview.c:222
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/顯示(_V)/字元編碼(_E)/斯拉夫語 (Windows-1251)"
 
-#: src/compose.c:652 src/mainwindow.c:698 src/messageview.c:225
+#: src/compose.c:652 src/mainwindow.c:700 src/messageview.c:225
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/顯示(_V)/字元編碼(_E)/日文 (ISO-2022-_JP)"
 
-#: src/compose.c:656 src/mainwindow.c:708 src/messageview.c:234
+#: src/compose.c:656 src/mainwindow.c:710 src/messageview.c:234
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/顯示(_V)/字元編碼(_E)/簡體中文 (_GB2312)"
 
-#: src/compose.c:658 src/mainwindow.c:710 src/messageview.c:236
+#: src/compose.c:658 src/mainwindow.c:712 src/messageview.c:236
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/顯示(_V)/字元編碼(_E)/簡體中文 (_GBK)"
 
-#: src/compose.c:660 src/mainwindow.c:712 src/messageview.c:238
+#: src/compose.c:660 src/mainwindow.c:714 src/messageview.c:238
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/顯示(_V)/字元編碼(_E)/繁體中文 (_Big5)"
 
-#: src/compose.c:664 src/mainwindow.c:720 src/messageview.c:245
+#: src/compose.c:664 src/mainwindow.c:722 src/messageview.c:245
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/顯示(_V)/字元編碼(_E)/韓文 (EUC-_KR)"
 
-#: src/compose.c:668 src/mainwindow.c:726 src/messageview.c:250
+#: src/compose.c:668 src/mainwindow.c:728 src/messageview.c:250
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/顯示(_V)/字元編碼(_E)/泰文 (TIS-620)"
 
-#: src/compose.c:670 src/mainwindow.c:728 src/messageview.c:252
+#: src/compose.c:670 src/mainwindow.c:730 src/messageview.c:252
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/顯示(_V)/字元編碼(_E)/泰文 (Windows-874)"
 
-#: src/compose.c:674 src/mainwindow.c:788 src/messageview.c:283
+#: src/compose.c:674 src/mainwindow.c:790 src/messageview.c:283
 msgid "/_Tools/_Address book"
 msgstr "/工具(_T)/通訊錄(_A)"
 
@@ -1494,13 +1494,13 @@ msgstr "/工具(_T)/通訊錄(_A)"
 msgid "/_Tools/_Template"
 msgstr "/工具(_T)/套用郵件樣板(_T)"
 
-#: src/compose.c:677 src/mainwindow.c:812 src/messageview.c:299
+#: src/compose.c:677 src/mainwindow.c:814 src/messageview.c:299
 msgid "/_Tools/Actio_ns"
 msgstr "/工具(_T)/執行外部指令(_N)"
 
-#: src/compose.c:679 src/compose.c:683 src/compose.c:689 src/mainwindow.c:791
-#: src/mainwindow.c:805 src/mainwindow.c:810 src/mainwindow.c:813
-#: src/mainwindow.c:817 src/mainwindow.c:819 src/messageview.c:286
+#: src/compose.c:679 src/compose.c:683 src/compose.c:689 src/mainwindow.c:793
+#: src/mainwindow.c:807 src/mainwindow.c:812 src/mainwindow.c:815
+#: src/mainwindow.c:819 src/mainwindow.c:821 src/messageview.c:286
 #: src/messageview.c:298
 msgid "/_Tools/---"
 msgstr "/工具(_T)"
@@ -1702,7 +1702,7 @@ msgstr "PGP 簽章"
 msgid "PGP Encrypt"
 msgstr "PGP 加密"
 
-#: src/compose.c:4442 src/compose.c:5543
+#: src/compose.c:4442 src/compose.c:5546
 msgid "MIME type"
 msgstr "MIME 型態"
 
@@ -1745,36 +1745,36 @@ msgstr "使用其他的編輯器"
 msgid "Wrap all long lines"
 msgstr "折換所有過長的文字列"
 
-#: src/compose.c:5439
+#: src/compose.c:5442
 msgid "Invalid MIME type."
 msgstr "不合法的 MIME 型態。"
 
-#: src/compose.c:5457
+#: src/compose.c:5460
 msgid "File doesn't exist or is empty."
 msgstr "檔案不存在或者是空的。"
 
-#: src/compose.c:5525
+#: src/compose.c:5528
 msgid "Properties"
 msgstr "內容"
 
-#: src/compose.c:5545 src/prefs_common_dialog.c:1504
+#: src/compose.c:5548 src/prefs_common_dialog.c:1504
 msgid "Encoding"
 msgstr "編碼"
 
-#: src/compose.c:5568 src/prefs_folder_item.c:202
+#: src/compose.c:5571 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "路徑"
 
-#: src/compose.c:5569
+#: src/compose.c:5572
 msgid "File name"
 msgstr "檔名"
 
-#: src/compose.c:5659
+#: src/compose.c:5662
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "外部編輯器的命令是錯誤的：「%s」\n"
 
-#: src/compose.c:5714
+#: src/compose.c:5717
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1784,48 +1784,48 @@ msgstr ""
 "要強迫結束該行程嗎？\n"
 "行程的群組代碼是：%d"
 
-#: src/compose.c:6040 src/mainwindow.c:2752
+#: src/compose.c:6043 src/mainwindow.c:2761
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:6156 src/compose.c:6161 src/compose.c:6167
+#: src/compose.c:6159 src/compose.c:6164 src/compose.c:6170
 msgid "Can't queue the message."
 msgstr "無法放進暫存資料夾。"
 
-#: src/compose.c:6258
+#: src/compose.c:6261
 msgid "Select files"
 msgstr "選擇檔案"
 
-#: src/compose.c:6281
+#: src/compose.c:6284
 msgid "Select file"
 msgstr "選擇檔案"
 
-#: src/compose.c:6316
+#: src/compose.c:6319
 msgid "Save message"
 msgstr "儲存郵件"
 
-#: src/compose.c:6317
+#: src/compose.c:6320
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "郵件已被修改過。將它儲存到草稿資料夾嗎？"
 
-#: src/compose.c:6319
+#: src/compose.c:6322
 msgid "Close _without saving"
 msgstr "關閉但不儲存(_W)"
 
-#: src/compose.c:6361
+#: src/compose.c:6364
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "您確定要套用「%s」這個郵件樣板嗎？"
 
-#: src/compose.c:6363
+#: src/compose.c:6366
 msgid "Apply template"
 msgstr "套用郵件樣板"
 
-#: src/compose.c:6364
+#: src/compose.c:6367
 msgid "_Replace"
 msgstr "置換(_R)"
 
-#: src/compose.c:6364
+#: src/compose.c:6367
 msgid "_Insert"
 msgstr "插入(_I)"
 
@@ -2282,12 +2282,12 @@ msgstr "設定資料夾...\n"
 msgid "Setting folder info..."
 msgstr "設定資料夾..."
 
-#: src/folderview.c:868 src/mainwindow.c:3748 src/setup.c:80
+#: src/folderview.c:868 src/mainwindow.c:3757 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "掃描資料夾 %s%c%s ..."
 
-#: src/folderview.c:872 src/mainwindow.c:3753 src/setup.c:85
+#: src/folderview.c:872 src/mainwindow.c:3762 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "掃描資料夾 %s ..."
@@ -3041,540 +3041,545 @@ msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/顯示(_V)/顯示或隱藏(_D)/工具列(_T)/圖樣與文字(_A)"
 
 #: src/mainwindow.c:566
-msgid "/_View/Show or hi_de/_Toolbar/_Icon"
+#, fuzzy
+msgid "/_View/Show or hi_de/_Toolbar/Text at the _right of icon"
 msgstr "/顯示(_V)/顯示或隱藏(_D)/工具列(_T)/圖樣(_I)"
 
 #: src/mainwindow.c:568
+msgid "/_View/Show or hi_de/_Toolbar/_Icon"
+msgstr "/顯示(_V)/顯示或隱藏(_D)/工具列(_T)/圖樣(_I)"
+
+#: src/mainwindow.c:570
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/顯示(_V)/顯示或隱藏(_D)/工具列(_T)/文字(_T)"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:572
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/顯示(_V)/顯示或隱藏(_D)/工具列(_T)/不顯示(_N)"
 
-#: src/mainwindow.c:572
+#: src/mainwindow.c:574
 #, fuzzy
 msgid "/_View/Show or hi_de/_Search bar"
 msgstr "/顯示(_V)/顯示或隱藏(_D)/狀態列(_B)"
 
-#: src/mainwindow.c:574
+#: src/mainwindow.c:576
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/顯示(_V)/顯示或隱藏(_D)/狀態列(_B)"
 
-#: src/mainwindow.c:576
+#: src/mainwindow.c:578
 #, fuzzy
 msgid "/_View/_Customize toolbar..."
 msgstr "/顯示(_V)/前往(_G)/到其他資料夾(_F)"
 
-#: src/mainwindow.c:578
+#: src/mainwindow.c:580
 msgid "/_View/Separate f_older tree"
 msgstr "/顯示(_V)/將資料夾列表分離(_O)"
 
-#: src/mainwindow.c:579
+#: src/mainwindow.c:581
 msgid "/_View/Separate _message view"
 msgstr "/顯示(_V)/將郵件預覽分離(_M)"
 
-#: src/mainwindow.c:581
+#: src/mainwindow.c:583
 msgid "/_View/_Sort"
 msgstr "/顯示(_V)/排序(_S)"
 
-#: src/mainwindow.c:582
+#: src/mainwindow.c:584
 msgid "/_View/_Sort/by _number"
 msgstr "/顯示(_V)/排序(_S)/用編號排序(_N)"
 
-#: src/mainwindow.c:583
+#: src/mainwindow.c:585
 msgid "/_View/_Sort/by s_ize"
 msgstr "/顯示(_V)/排序(_S)/用大小排序(_I)"
 
-#: src/mainwindow.c:584
+#: src/mainwindow.c:586
 msgid "/_View/_Sort/by _date"
 msgstr "/顯示(_V)/排序(_S)/用日期排序(_D)"
 
-#: src/mainwindow.c:585
+#: src/mainwindow.c:587
 msgid "/_View/_Sort/by t_hread date"
 msgstr "/顯示(_V)/排序(_S)/用串列日期排序(_H)"
 
-#: src/mainwindow.c:586
+#: src/mainwindow.c:588
 msgid "/_View/_Sort/by _from"
 msgstr "/顯示(_V)/排序(_S)/用來源排序(_F)"
 
-#: src/mainwindow.c:587
+#: src/mainwindow.c:589
 msgid "/_View/_Sort/by _recipient"
 msgstr "/顯示(_V)/排序(_S)/用收件人排序(_R)"
 
-#: src/mainwindow.c:588
+#: src/mainwindow.c:590
 msgid "/_View/_Sort/by _subject"
 msgstr "/顯示(_V)/排序(_S)/用主旨排序(_S)"
 
-#: src/mainwindow.c:589
+#: src/mainwindow.c:591
 msgid "/_View/_Sort/by _color label"
 msgstr "/顯示(_V)/排序(_S)/用標記顏色排序(_C)"
 
-#: src/mainwindow.c:591
+#: src/mainwindow.c:593
 msgid "/_View/_Sort/by _mark"
 msgstr "/顯示(_V)/排序(_S)/用標記排序(_M)"
 
-#: src/mainwindow.c:592
+#: src/mainwindow.c:594
 msgid "/_View/_Sort/by _unread"
 msgstr "/顯示(_V)/排序(_S)/依已讀或未讀排序(_U)"
 
-#: src/mainwindow.c:593
+#: src/mainwindow.c:595
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/顯示(_V)/排序(_S)/用附加檔排序(_T)"
 
-#: src/mainwindow.c:595
+#: src/mainwindow.c:597
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/顯示(_V)/排序(_S)/不排序(_O)"
 
-#: src/mainwindow.c:596 src/mainwindow.c:599
+#: src/mainwindow.c:598 src/mainwindow.c:601
 msgid "/_View/_Sort/---"
 msgstr "/顯示(_V)/排序(_S)/---"
 
-#: src/mainwindow.c:597
+#: src/mainwindow.c:599
 msgid "/_View/_Sort/Ascending"
 msgstr "/顯示(_V)/排序(_S)/遞增排序"
 
-#: src/mainwindow.c:598
+#: src/mainwindow.c:600
 msgid "/_View/_Sort/Descending"
 msgstr "/顯示(_V)/排序(_S)/遞減排序"
 
-#: src/mainwindow.c:600
+#: src/mainwindow.c:602
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/顯示(_V)/排序(_S)/用郵件串列排序(_A)"
 
-#: src/mainwindow.c:602
+#: src/mainwindow.c:604
 msgid "/_View/Th_read view"
 msgstr "/顯示(_V)/將郵件串列顯示(_R)"
 
-#: src/mainwindow.c:603
+#: src/mainwindow.c:605
 msgid "/_View/E_xpand all threads"
 msgstr "/顯示(_V)/展開所有郵件串列(_X)"
 
-#: src/mainwindow.c:604
+#: src/mainwindow.c:606
 msgid "/_View/Co_llapse all threads"
 msgstr "/顯示(_V)/解除所有郵件串列(_L)"
 
-#: src/mainwindow.c:605
+#: src/mainwindow.c:607
 msgid "/_View/Set display _item..."
 msgstr "/顯示(_V)/設定顯示的項目(_I)..."
 
-#: src/mainwindow.c:608
+#: src/mainwindow.c:610
 msgid "/_View/_Go to"
 msgstr "/顯示(_V)/前往(_G)"
 
-#: src/mainwindow.c:609
+#: src/mainwindow.c:611
 msgid "/_View/_Go to/_Prev message"
 msgstr "/顯示(_V)/前往(_G)/前一封郵件(_P)"
 
-#: src/mainwindow.c:610
+#: src/mainwindow.c:612
 msgid "/_View/_Go to/_Next message"
 msgstr "/顯示(_V)/前往(_G)/下一封郵件(_N)"
 
-#: src/mainwindow.c:611 src/mainwindow.c:616 src/mainwindow.c:619
-#: src/mainwindow.c:624 src/mainwindow.c:629
+#: src/mainwindow.c:613 src/mainwindow.c:618 src/mainwindow.c:621
+#: src/mainwindow.c:626 src/mainwindow.c:631
 msgid "/_View/_Go to/---"
 msgstr "/顯示(_V)/前往(_G)/---"
 
-#: src/mainwindow.c:612
+#: src/mainwindow.c:614
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/顯示(_V)/前往(_G)/前一封未讀郵件(_R)"
 
-#: src/mainwindow.c:614
+#: src/mainwindow.c:616
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/顯示(_V)/前往(_G)/下一封未讀郵件(_E)"
 
-#: src/mainwindow.c:617
+#: src/mainwindow.c:619
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/顯示(_V)/前往(_G)/前一封新郵件(_W)"
 
-#: src/mainwindow.c:618
+#: src/mainwindow.c:620
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/顯示(_V)/前往(_G)/下一封新郵件(_X)"
 
-#: src/mainwindow.c:620
+#: src/mainwindow.c:622
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/顯示(_V)/前往(_G)/前一封已標記郵件(_M)"
 
-#: src/mainwindow.c:622
+#: src/mainwindow.c:624
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/顯示(_V)/前往(_G)/下一封已標記郵件(_A)"
 
-#: src/mainwindow.c:625
+#: src/mainwindow.c:627
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/顯示(_V)/前往(_G)/前一封已標記顏色之郵件(_L)"
 
-#: src/mainwindow.c:627
+#: src/mainwindow.c:629
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/顯示(_V)/前往(_G)/下一封已標記顏色之郵件(_B)"
 
-#: src/mainwindow.c:630
+#: src/mainwindow.c:632
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/顯示(_V)/前往(_G)/到其他資料夾(_F)"
 
-#: src/mainwindow.c:639 src/messageview.c:174
+#: src/mainwindow.c:641 src/messageview.c:174
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/顯示(_V)/字元編碼(_E)/自動偵測(_A)"
 
-#: src/mainwindow.c:652 src/messageview.c:187
+#: src/mainwindow.c:654 src/messageview.c:187
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr "/顯示(_V)/字元編碼(_E)/西歐語系 (ISO-8859-15)"
 
-#: src/mainwindow.c:700 src/messageview.c:227
+#: src/mainwindow.c:702 src/messageview.c:227
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/顯示(_V)/字元編碼(_E)/日文 (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:702 src/messageview.c:229
+#: src/mainwindow.c:704 src/messageview.c:229
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/顯示(_V)/字元編碼(_E)/日文 (_EUC-JP)"
 
-#: src/mainwindow.c:704 src/messageview.c:231
+#: src/mainwindow.c:706 src/messageview.c:231
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/顯示(_V)/字元編碼(_E)/日文 (_Shift__JIS)"
 
-#: src/mainwindow.c:714 src/messageview.c:240
+#: src/mainwindow.c:716 src/messageview.c:240
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/顯示(_V)/字元編碼(_E)/繁體中文 (EUC-_TW)"
 
-#: src/mainwindow.c:716 src/messageview.c:242
+#: src/mainwindow.c:718 src/messageview.c:242
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/顯示(_V)/字元編碼(_E)/中文 (ISO-2022-_CN)"
 
-#: src/mainwindow.c:722 src/messageview.c:247
+#: src/mainwindow.c:724 src/messageview.c:247
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/顯示(_V)/字元編碼(_E)/韓文 (ISO-2022-KR)"
 
-#: src/mainwindow.c:735 src/summaryview.c:464
+#: src/mainwindow.c:737 src/summaryview.c:464
 msgid "/_View/Open in new _window"
 msgstr "/顯示(_V)/在新視窗開啟(_W)"
 
-#: src/mainwindow.c:736 src/messageview.c:259 src/summaryview.c:466
+#: src/mainwindow.c:738 src/messageview.c:259 src/summaryview.c:466
 msgid "/_View/Mess_age source"
 msgstr "/顯示(_V)/觀看郵件原始碼(_A)"
 
-#: src/mainwindow.c:737 src/messageview.c:260 src/summaryview.c:467
+#: src/mainwindow.c:739 src/messageview.c:260 src/summaryview.c:467
 #, fuzzy
 msgid "/_View/All _headers"
 msgstr "/顯示(_V)/顯示所有的標頭(_H)"
 
-#: src/mainwindow.c:739
+#: src/mainwindow.c:741
 msgid "/_View/_Update summary"
 msgstr "/顯示(_V)/更新郵件列表(_U)"
 
-#: src/mainwindow.c:741 src/messageview.c:263
+#: src/mainwindow.c:743 src/messageview.c:263
 msgid "/_Message"
 msgstr "/郵件(_M)"
 
-#: src/mainwindow.c:742
+#: src/mainwindow.c:744
 msgid "/_Message/Recei_ve"
 msgstr "/郵件(_M)/接收(_V)"
 
-#: src/mainwindow.c:743
+#: src/mainwindow.c:745
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/郵件(_M)/接收(_V)/從目前帳號中接收新郵件(_C)"
 
-#: src/mainwindow.c:745
+#: src/mainwindow.c:747
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/郵件(_M)/接收(_V)/從所有帳號中接收新郵件(_A)"
 
-#: src/mainwindow.c:747
+#: src/mainwindow.c:749
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/郵件(_M)/接收(_V)/取消接收(_G)"
 
-#: src/mainwindow.c:749
+#: src/mainwindow.c:751
 msgid "/_Message/Recei_ve/---"
 msgstr "/郵件(_M)/接收(_V)/---"
 
-#: src/mainwindow.c:750
+#: src/mainwindow.c:752
 msgid "/_Message/_Send queued messages"
 msgstr "/郵件(_M)/將暫存資料夾中的郵件送出(_S)"
 
-#: src/mainwindow.c:751 src/mainwindow.c:753 src/mainwindow.c:760
-#: src/mainwindow.c:765 src/mainwindow.c:768 src/mainwindow.c:779
-#: src/mainwindow.c:781 src/mainwindow.c:784 src/messageview.c:266
+#: src/mainwindow.c:753 src/mainwindow.c:755 src/mainwindow.c:762
+#: src/mainwindow.c:767 src/mainwindow.c:770 src/mainwindow.c:781
+#: src/mainwindow.c:783 src/mainwindow.c:786 src/messageview.c:266
 #: src/messageview.c:274 src/messageview.c:279
 msgid "/_Message/---"
 msgstr "/郵件(_M)/---"
 
-#: src/mainwindow.c:752 src/messageview.c:264
+#: src/mainwindow.c:754 src/messageview.c:264
 msgid "/_Message/Compose _new message"
 msgstr "/郵件(_M)/撰寫郵件(_N)"
 
-#: src/mainwindow.c:754 src/messageview.c:267
+#: src/mainwindow.c:756 src/messageview.c:267
 msgid "/_Message/_Reply"
 msgstr "/郵件(_M)/直接回覆(_R)"
 
-#: src/mainwindow.c:755
+#: src/mainwindow.c:757
 msgid "/_Message/Repl_y to"
 msgstr "/郵件(_M)/回覆給(_Y)"
 
-#: src/mainwindow.c:756 src/messageview.c:268
+#: src/mainwindow.c:758 src/messageview.c:268
 msgid "/_Message/Repl_y to/_all"
 msgstr "/郵件(_M)/回覆給(_Y)/所有收件人(_A)"
 
-#: src/mainwindow.c:757 src/messageview.c:270
+#: src/mainwindow.c:759 src/messageview.c:270
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/郵件(_M)/回覆給(_Y)/原作者(_S)"
 
-#: src/mainwindow.c:758 src/messageview.c:272
+#: src/mainwindow.c:760 src/messageview.c:272
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/郵件(_M)/回覆給(_Y)/郵遞論壇(_L)"
 
-#: src/mainwindow.c:761 src/messageview.c:275
+#: src/mainwindow.c:763 src/messageview.c:275
 msgid "/_Message/_Forward"
 msgstr "/郵件(_M)/轉寄(_F)"
 
-#: src/mainwindow.c:762 src/messageview.c:276
+#: src/mainwindow.c:764 src/messageview.c:276
 msgid "/_Message/For_ward as attachment"
 msgstr "/郵件(_M)/將郵件當成附加檔轉寄(_W)"
 
-#: src/mainwindow.c:764 src/messageview.c:278
+#: src/mainwindow.c:766 src/messageview.c:278
 msgid "/_Message/Redirec_t"
 msgstr "/郵件(_M)/郵件導向(_T)"
 
-#: src/mainwindow.c:766
+#: src/mainwindow.c:768
 msgid "/_Message/M_ove..."
 msgstr "/郵件(_M)/移動(_O)..."
 
-#: src/mainwindow.c:767
+#: src/mainwindow.c:769
 msgid "/_Message/_Copy..."
 msgstr "/郵件(_M)/複製(_C)..."
 
-#: src/mainwindow.c:769
+#: src/mainwindow.c:771
 msgid "/_Message/_Mark"
 msgstr "/郵件(_M)/標記(_M)"
 
-#: src/mainwindow.c:770
+#: src/mainwindow.c:772
 msgid "/_Message/_Mark/_Mark"
 msgstr "/郵件(_M)/標記(_M)/標記(_M)"
 
-#: src/mainwindow.c:771
+#: src/mainwindow.c:773
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/郵件(_M)/標記(_M)/去除標記(_U)"
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:774
 msgid "/_Message/_Mark/---"
 msgstr "/郵件(_M)/標記(_M)/---"
 
-#: src/mainwindow.c:773
+#: src/mainwindow.c:775
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/郵件(_M)/標記(_M)/標記成未讀(_E)"
 
-#: src/mainwindow.c:774
+#: src/mainwindow.c:776
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/郵件(_M)/標記(_M)/標記成已讀(_D)"
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:778
 #, fuzzy
 msgid "/_Message/_Mark/Mark _thread as read"
 msgstr "/郵件(_M)/標記(_M)/標記成已讀(_D)"
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:780
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/郵件(_M)/標記(_M)/標記所有郵件成已讀(_D)"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:782
 msgid "/_Message/_Delete"
 msgstr "/郵件(_M)/刪除(_D)"
 
-#: src/mainwindow.c:782
+#: src/mainwindow.c:784
 msgid "/_Message/Set as _junk mail"
 msgstr "/郵件(_M)/歸類為垃圾郵件(_J)"
 
-#: src/mainwindow.c:783
+#: src/mainwindow.c:785
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/郵件(_M)/歸類為非垃圾郵件(_U)"
 
-#: src/mainwindow.c:785 src/messageview.c:280
+#: src/mainwindow.c:787 src/messageview.c:280
 msgid "/_Message/Re-_edit"
 msgstr "/郵件(_M)/重新編輯(_E)"
 
-#: src/mainwindow.c:789
+#: src/mainwindow.c:791
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/工具(_T)/將寄信人加入通訊錄(_K)..."
 
-#: src/mainwindow.c:792
+#: src/mainwindow.c:794
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/工具(_T)/過濾資料夾中所有郵件(_F)"
 
-#: src/mainwindow.c:794
+#: src/mainwindow.c:796
 msgid "/_Tools/Filter _selected messages"
 msgstr "/工具(_T)/過濾選擇的郵件(_F)"
 
-#: src/mainwindow.c:796 src/messageview.c:287
+#: src/mainwindow.c:798 src/messageview.c:287
 msgid "/_Tools/_Create filter rule"
 msgstr "/工具(_T)/產生郵件過濾規則(_C)"
 
-#: src/mainwindow.c:797 src/messageview.c:289
+#: src/mainwindow.c:799 src/messageview.c:289
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/工具(_T)/產生郵件過濾規則(_C)/自動產生"
 
-#: src/mainwindow.c:799 src/messageview.c:291
+#: src/mainwindow.c:801 src/messageview.c:291
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/工具(_T)/產生郵件過濾規則(_C)/依來源(_F)"
 
-#: src/mainwindow.c:801 src/messageview.c:293
+#: src/mainwindow.c:803 src/messageview.c:293
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/工具(_T)/產生郵件過濾規則(_C)/依收信人(_T)"
 
-#: src/mainwindow.c:803 src/messageview.c:295
+#: src/mainwindow.c:805 src/messageview.c:295
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/工具(_T)/產生郵件過濾規則(_C)/依主旨(_S)"
 
-#: src/mainwindow.c:806
+#: src/mainwindow.c:808
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/工具(_T)/過濾資料夾中所有垃圾郵件(_J)"
 
-#: src/mainwindow.c:808
+#: src/mainwindow.c:810
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/工具(_T)/過濾選擇的郵件中所有垃圾郵件(_M)"
 
-#: src/mainwindow.c:815
+#: src/mainwindow.c:817
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/工具(_T)/刪除重覆的郵件(_P)"
 
-#: src/mainwindow.c:818
+#: src/mainwindow.c:820
 #, fuzzy
 msgid "/_Tools/E_xecute marked process"
 msgstr "執行標記的行程"
 
-#: src/mainwindow.c:820
+#: src/mainwindow.c:822
 msgid "/_Tools/_Log window"
 msgstr "/工具(_T)/紀錄視窗(_L)"
 
-#: src/mainwindow.c:822
+#: src/mainwindow.c:824
 msgid "/_Configuration"
 msgstr "/設定(_C)"
 
-#: src/mainwindow.c:823
+#: src/mainwindow.c:825
 msgid "/_Configuration/_Common preferences..."
 msgstr "/設定(_C)/一般設定(_C)..."
 
-#: src/mainwindow.c:825
+#: src/mainwindow.c:827
 msgid "/_Configuration/_Filter setting..."
 msgstr "/設定(_C)/郵件過濾設定(_F)..."
 
-#: src/mainwindow.c:827
+#: src/mainwindow.c:829
 msgid "/_Configuration/_Template..."
 msgstr "/設定(_C)/郵件樣板設定(_T)..."
 
-#: src/mainwindow.c:829
+#: src/mainwindow.c:831
 msgid "/_Configuration/_Actions..."
 msgstr "/設定(_C)/外部指令設定(_A)..."
 
-#: src/mainwindow.c:831
+#: src/mainwindow.c:833
 msgid "/_Configuration/---"
 msgstr "/設定(_C)/---"
 
-#: src/mainwindow.c:832
+#: src/mainwindow.c:834
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/設定(_C)/目前帳號設定(_P)..."
 
-#: src/mainwindow.c:834
+#: src/mainwindow.c:836
 msgid "/_Configuration/Create _new account..."
 msgstr "/設定(_C)/新增帳號(_N)..."
 
-#: src/mainwindow.c:836
+#: src/mainwindow.c:838
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/設定(_C)/編輯帳號(_E)..."
 
-#: src/mainwindow.c:838
+#: src/mainwindow.c:840
 msgid "/_Configuration/C_hange current account"
 msgstr "/設定(_C)/改變現有帳號(_H)"
 
-#: src/mainwindow.c:842
+#: src/mainwindow.c:844
 msgid "/_Help/_Manual"
 msgstr "/說明(_H)/說明文件(_M)"
 
-#: src/mainwindow.c:843
+#: src/mainwindow.c:845
 msgid "/_Help/_Manual/_English"
 msgstr "/說明(_H)/說明文件(_M)/英文(_E)"
 
-#: src/mainwindow.c:844
+#: src/mainwindow.c:846
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/說明(_H)/說明文件(_M)/日文(_J)"
 
-#: src/mainwindow.c:845
+#: src/mainwindow.c:847
 msgid "/_Help/_FAQ"
 msgstr "/說明(_H)/常問問題解答(_F)"
 
-#: src/mainwindow.c:846
+#: src/mainwindow.c:848
 msgid "/_Help/_FAQ/_English"
 msgstr "/說明(_H)/常問問題解答(_F)/英文(_E)"
 
-#: src/mainwindow.c:847
+#: src/mainwindow.c:849
 msgid "/_Help/_FAQ/_German"
 msgstr "/說明(_H)/常問問題解答(_F)/德文(_G)"
 
-#: src/mainwindow.c:848
+#: src/mainwindow.c:850
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/說明(_H)/常問問題解答(_F)/西班牙文(_S)"
 
-#: src/mainwindow.c:849
+#: src/mainwindow.c:851
 msgid "/_Help/_FAQ/_French"
 msgstr "/說明(_H)/常問問題解答(_F)/法文(_F)"
 
-#: src/mainwindow.c:850
+#: src/mainwindow.c:852
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/說明(_H)/常問問題解答(_F)/義大利文(_I)"
 
-#: src/mainwindow.c:851
+#: src/mainwindow.c:853
 #, fuzzy
 msgid "/_Help/_Command line options"
 msgstr "未設定執行指令"
 
-#: src/mainwindow.c:852
+#: src/mainwindow.c:854
 msgid "/_Help/---"
 msgstr "/說明(_H)/---"
 
-#: src/mainwindow.c:895
+#: src/mainwindow.c:897
 msgid "Creating main window...\n"
 msgstr "建立主視窗...\n"
 
-#: src/mainwindow.c:1071
+#: src/mainwindow.c:1073
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "主視窗：顏色 %d 配置失敗。\n"
 
-#: src/mainwindow.c:1175 src/summaryview.c:2387 src/summaryview.c:2472
+#: src/mainwindow.c:1181 src/summaryview.c:2387 src/summaryview.c:2472
 #: src/summaryview.c:4009 src/summaryview.c:4138 src/summaryview.c:4507
 msgid "done.\n"
 msgstr "完成。\n"
 
-#: src/mainwindow.c:1293 src/mainwindow.c:1334 src/mainwindow.c:1359
+#: src/mainwindow.c:1299 src/mainwindow.c:1340 src/mainwindow.c:1365
 msgid "Untitled"
 msgstr "無標題"
 
-#: src/mainwindow.c:1360
+#: src/mainwindow.c:1366
 msgid "none"
 msgstr "無"
 
-#: src/mainwindow.c:1413
+#: src/mainwindow.c:1419
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "正在變更視窗分割類型由 %d 到 %d\n"
 
-#: src/mainwindow.c:1663
+#: src/mainwindow.c:1669
 msgid "Offline"
 msgstr "離線"
 
-#: src/mainwindow.c:1664
+#: src/mainwindow.c:1670
 msgid "You are offline. Go online?"
 msgstr "您目前正離線中。要連線嗎？"
 
-#: src/mainwindow.c:1681
+#: src/mainwindow.c:1687
 msgid "Empty all trash"
 msgstr "清空刪除的郵件"
 
-#: src/mainwindow.c:1682
+#: src/mainwindow.c:1688
 msgid "Delete all messages in trash folders?"
 msgstr "您確定要清除所有被刪除的郵件？"
 
-#: src/mainwindow.c:1712
+#: src/mainwindow.c:1718
 msgid "Add mailbox"
 msgstr "新增信箱"
 
-#: src/mainwindow.c:1713
+#: src/mainwindow.c:1719
 msgid ""
 "Specify the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3584,16 +3589,16 @@ msgstr ""
 "並請注意不要輸入已存在的信箱名稱，\n"
 "系統會自動判別是否它已存在。"
 
-#: src/mainwindow.c:1719 src/setup.c:49
+#: src/mainwindow.c:1725 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "信箱「%s」已存在。"
 
-#: src/mainwindow.c:1724 src/setup.c:56
+#: src/mainwindow.c:1730 src/setup.c:56
 msgid "Mailbox"
 msgstr "信箱"
 
-#: src/mainwindow.c:1730 src/setup.c:62
+#: src/mainwindow.c:1736 src/setup.c:62
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3602,131 +3607,131 @@ msgstr ""
 "無法產生信箱目錄。\n"
 "可能是因為同樣名稱的檔案已經存在，或者是你沒有權限可以開新目錄。"
 
-#: src/mainwindow.c:2198
+#: src/mainwindow.c:2206
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - 資料夾檢視"
 
-#: src/mainwindow.c:2217
+#: src/mainwindow.c:2225
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - 郵件列表"
 
-#: src/mainwindow.c:2369 src/summaryview.c:418
+#: src/mainwindow.c:2377 src/summaryview.c:418
 msgid "/_Reply"
 msgstr "/直接回覆(_R)"
 
-#: src/mainwindow.c:2370
+#: src/mainwindow.c:2378
 msgid "/Reply to _all"
 msgstr "/全部回覆(_A)"
 
-#: src/mainwindow.c:2371
+#: src/mainwindow.c:2379
 msgid "/Reply to _sender"
 msgstr "/回覆給原作者(_S)"
 
-#: src/mainwindow.c:2372
+#: src/mainwindow.c:2380
 msgid "/Reply to mailing _list"
 msgstr "/回覆到郵遞論壇(_L)"
 
-#: src/mainwindow.c:2377 src/summaryview.c:425
+#: src/mainwindow.c:2385 src/summaryview.c:425
 msgid "/_Forward"
 msgstr "/轉寄(_F)"
 
-#: src/mainwindow.c:2378 src/summaryview.c:426
+#: src/mainwindow.c:2386 src/summaryview.c:426
 msgid "/For_ward as attachment"
 msgstr "/將郵件當成附加檔轉寄(_W)"
 
-#: src/mainwindow.c:2379 src/summaryview.c:427
+#: src/mainwindow.c:2387 src/summaryview.c:427
 msgid "/Redirec_t"
 msgstr "/郵件導向(_T)"
 
-#: src/mainwindow.c:2384
+#: src/mainwindow.c:2392
 msgid "Incorporate new mail"
 msgstr "檢查目前帳號的新郵件"
 
-#: src/mainwindow.c:2386
+#: src/mainwindow.c:2394
 msgid "Incorporate new mail of all accounts"
 msgstr "檢查所有帳號的新郵件"
 
-#: src/mainwindow.c:2388
+#: src/mainwindow.c:2396
 msgid "Send queued message(s)"
 msgstr "將暫存資料夾中的郵件送出"
 
-#: src/mainwindow.c:2390
+#: src/mainwindow.c:2398
 msgid "Compose new message"
 msgstr "編輯新郵件"
 
-#: src/mainwindow.c:2392
+#: src/mainwindow.c:2400
 msgid "Reply to the message"
 msgstr "回覆郵件"
 
-#: src/mainwindow.c:2394
+#: src/mainwindow.c:2402
 msgid "Reply to all"
 msgstr "全部回覆"
 
-#: src/mainwindow.c:2396
+#: src/mainwindow.c:2404
 msgid "Forward the message"
 msgstr "轉寄郵件"
 
-#: src/mainwindow.c:2398
+#: src/mainwindow.c:2406
 msgid "Delete the message"
 msgstr "刪除郵件"
 
-#: src/mainwindow.c:2400
+#: src/mainwindow.c:2408
 msgid "Set as junk mail"
 msgstr "歸類為垃圾郵件"
 
-#: src/mainwindow.c:2402
+#: src/mainwindow.c:2410
 msgid "Execute marked process"
 msgstr "執行標記的行程"
 
-#: src/mainwindow.c:2404
+#: src/mainwindow.c:2412
 msgid "Next unread message"
 msgstr "下一封未讀郵件"
 
-#: src/mainwindow.c:2406
+#: src/mainwindow.c:2414
 #, fuzzy
 msgid "Previous unread message"
 msgstr "下一封未讀郵件"
 
-#: src/mainwindow.c:2410
+#: src/mainwindow.c:2418
 #, fuzzy
 msgid "Print message"
 msgstr "送出郵件"
 
-#: src/mainwindow.c:2412
+#: src/mainwindow.c:2420
 msgid "Common preferences"
 msgstr "一般設定"
 
-#: src/mainwindow.c:2414 src/prefs_account_dialog.c:511
+#: src/mainwindow.c:2422 src/prefs_account_dialog.c:511
 msgid "Account preferences"
 msgstr "帳號設定"
 
-#: src/mainwindow.c:2779
+#: src/mainwindow.c:2788
 msgid "You are offline. Click the icon to go online."
 msgstr "您目前正離線中。按下按鈕恢復連線。"
 
-#: src/mainwindow.c:2790
+#: src/mainwindow.c:2799
 msgid "You are online. Click the icon to go offline."
 msgstr "您目前正連線中。按下按鈕離線工作。"
 
-#: src/mainwindow.c:3062
+#: src/mainwindow.c:3071
 msgid "Exit"
 msgstr "離開"
 
-#: src/mainwindow.c:3062
+#: src/mainwindow.c:3071
 msgid "Exit this program?"
 msgstr "您確定要離開嗎？"
 
-#: src/mainwindow.c:3666
+#: src/mainwindow.c:3675
 #, fuzzy
 msgid "Command line options"
 msgstr "未設定執行指令"
 
-#: src/mainwindow.c:3679
+#: src/mainwindow.c:3688
 #, fuzzy
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "用法：%s [選項]...\n"
 
-#: src/mainwindow.c:3687
+#: src/mainwindow.c:3696
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -3742,7 +3747,7 @@ msgid ""
 "--version"
 msgstr ""
 
-#: src/mainwindow.c:3703
+#: src/mainwindow.c:3712
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
author	hiro <hiro@ee746299-78ed-0310-b773-934348b2243d>	2007-01-31 08:36:46 +0000
committer	hiro <hiro@ee746299-78ed-0310-b773-934348b2243d>	2007-01-31 08:36:46 +0000
commit	f21da65fd163dc94e5440fbf21ba97c7825df39e (patch)
tree	91936b30ae750b153e925d13647a6696a3b0cf02 /po
parent	f319e36f2e97904017924de7a5281d2cae4b2900 (diff)