made 2.1.1 release.

git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@498 ee746299-78ed-0310-b773-934348b2243d
author: hiro <hiro@ee746299-78ed-0310-b773-934348b2243d> 2005-08-23 06:53:36 +0000
committer: hiro <hiro@ee746299-78ed-0310-b773-934348b2243d> 2005-08-23 06:53:36 +0000
commit: 0868b16f30f3590b4b0026517c487ced7105d5a7 (patch)
tree: d592ce64e7653e05f80da5a950d6b982c6e1ac54 /po
parent: 867b9d4c7c1422ddf8ebb2f58c87deaedea1563f (diff)
28 files changed, 11368 insertions, 11368 deletions
diff --git a/po/bg.po b/po/bg.po
index 01e388fd..f0b47f44 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed 0.9.8\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-08-09 18:08+0900\n"
+"POT-Creation-Date: 2005-08-22 17:22+0900\n"
 "PO-Revision-Date: 2004-01-09 02:06+0200\n"
 "Last-Translator: Pavel Pyuter <pavel@unix-bg.org>\n"
 "Language-Team: Bulgarian <bg@li.org>\n"
@@ -97,7 +97,7 @@ msgstr ""
 "в колонка `G' за разрешаване на изтегляне на съобщенията от `Get All'."
 
 #: src/account.c:691 src/addressadd.c:192 src/addressbook.c:490
-#: src/compose.c:4081 src/editaddress.c:200 src/editaddress.c:942
+#: src/compose.c:4079 src/editaddress.c:200 src/editaddress.c:942
 #: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:265
 #: src/editjpilot.c:271 src/editldap.c:307 src/editvcard.c:184
 #: src/mimeview.c:201 src/prefs_filter.c:258 src/prefs_folder_item.c:170
@@ -235,7 +235,7 @@ msgstr "Потребителски аргумент на действието"
 msgid "Add Address to Book"
 msgstr "Добавяне на Адреса към Книгата"
 
-#: src/addressadd.c:202 src/compose.c:4528 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4521 src/editaddress.c:201
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "Адрес"
@@ -249,7 +249,7 @@ msgstr "Забележки"
 msgid "Select Address Book Folder"
 msgstr "Изберете папка от адресната книга"
 
-#: src/addressbook.c:336 src/compose.c:495 src/mainwindow.c:470
+#: src/addressbook.c:336 src/compose.c:493 src/mainwindow.c:461
 #: src/messageview.c:137
 msgid "/_File"
 msgstr "/_Файл"
@@ -270,10 +270,10 @@ msgstr "/_Файл/Нов _JPilot"
 msgid "/_File/New _Server"
 msgstr "/_Файл/Нов _Сървър"
 
-#: src/addressbook.c:345 src/addressbook.c:348 src/compose.c:500
-#: src/compose.c:505 src/compose.c:509 src/mainwindow.c:488
-#: src/mainwindow.c:491 src/mainwindow.c:493 src/mainwindow.c:496
-#: src/mainwindow.c:498 src/messageview.c:140
+#: src/addressbook.c:345 src/addressbook.c:348 src/compose.c:498
+#: src/compose.c:503 src/compose.c:507 src/mainwindow.c:479
+#: src/mainwindow.c:482 src/mainwindow.c:484 src/mainwindow.c:487
+#: src/mainwindow.c:489 src/messageview.c:140
 msgid "/_File/---"
 msgstr "/_Файл/---"
 
@@ -289,7 +289,7 @@ msgstr "/_Файл/_Изтриване"
 msgid "/_File/_Save"
 msgstr "/_файл/_Запазване"
 
-#: src/addressbook.c:350 src/compose.c:510 src/messageview.c:141
+#: src/addressbook.c:350 src/compose.c:508 src/messageview.c:141
 msgid "/_File/_Close"
 msgstr "/_Файл/_Затваряне"
 
@@ -321,7 +321,7 @@ msgstr "/_Адрес/_Редактиране"
 msgid "/_Address/_Delete"
 msgstr "/_Адрес/_Изтриване"
 
-#: src/addressbook.c:358 src/compose.c:619 src/mainwindow.c:725
+#: src/addressbook.c:358 src/compose.c:617 src/mainwindow.c:716
 #: src/messageview.c:256
 msgid "/_Tools"
 msgstr "/_Инструменти"
@@ -330,12 +330,12 @@ msgstr "/_Инструменти"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Инструменти/Внасяне на _LDIF файл"
 
-#: src/addressbook.c:360 src/compose.c:632 src/mainwindow.c:775
+#: src/addressbook.c:360 src/compose.c:630 src/mainwindow.c:766
 #: src/messageview.c:274
 msgid "/_Help"
 msgstr "/_Помощ"
 
-#: src/addressbook.c:361 src/compose.c:633 src/mainwindow.c:786
+#: src/addressbook.c:361 src/compose.c:631 src/mainwindow.c:777
 #: src/messageview.c:275
 msgid "/_Help/_About"
 msgstr "/_Помощ/_Относно"
@@ -352,7 +352,7 @@ msgstr "/Нова _Група"
 msgid "/New _Folder"
 msgstr "/Нова _Папка"
 
-#: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:489
+#: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:487
 #: src/folderview.c:235 src/folderview.c:237 src/folderview.c:241
 #: src/folderview.c:252 src/folderview.c:254 src/folderview.c:256
 #: src/folderview.c:260 src/folderview.c:270 src/folderview.c:272
@@ -362,8 +362,8 @@ msgstr "/Нова _Папка"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:512
-#: src/mainwindow.c:502 src/messageview.c:143
+#: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:510
+#: src/mainwindow.c:493 src/messageview.c:143
 msgid "/_Edit"
 msgstr "/_Редактиране"
 
@@ -375,7 +375,7 @@ msgstr "/_Изтриване"
 msgid "E-Mail address"
 msgstr "E-Mail адрес"
 
-#: src/addressbook.c:495 src/compose.c:4529 src/prefs_common.c:2402
+#: src/addressbook.c:495 src/compose.c:4522 src/prefs_common.c:2402
 msgid "Address book"
 msgstr "Адресна книга"
 
@@ -384,8 +384,8 @@ msgid "Name:"
 msgstr "Име:"
 
 #. Buttons
-#: src/addressbook.c:627 src/addressbook.c:1673 src/editaddress.c:884
-#: src/editaddress.c:1017 src/mainwindow.c:2292 src/prefs_actions.c:266
+#: src/addressbook.c:627 src/addressbook.c:1674 src/editaddress.c:884
+#: src/editaddress.c:1017 src/mainwindow.c:2274 src/prefs_actions.c:266
 #: src/prefs_display_header.c:278 src/prefs_display_header.c:333
 #: src/prefs_template.c:231
 msgid "Delete"
@@ -424,7 +424,7 @@ msgstr "Изтриване на адрес(ите)"
 msgid "Really delete the address(es)?"
 msgstr "Желаете ли изтриване на адрес(ите)?"
 
-#: src/addressbook.c:1664
+#: src/addressbook.c:1665
 #, fuzzy, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -434,38 +434,38 @@ msgstr ""
 "Ако изтривате само папката, адресите ще бъдат преместени в родителската "
 "папка."
 
-#: src/addressbook.c:1667 src/folderview.c:2139
+#: src/addressbook.c:1668 src/folderview.c:2139
 msgid "Delete folder"
 msgstr "Изтриване на папка"
 
-#: src/addressbook.c:1667
+#: src/addressbook.c:1668
 #, fuzzy
 msgid "_Folder only"
 msgstr "Само папка"
 
-#: src/addressbook.c:1667
+#: src/addressbook.c:1668
 #, fuzzy
 msgid "Folder and _addresses"
 msgstr "Папка и Адреси"
 
-#: src/addressbook.c:1672
+#: src/addressbook.c:1673
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Желаете ли изтриване на `%s' ?"
 
-#: src/addressbook.c:2352 src/addressbook.c:2485
+#: src/addressbook.c:2353 src/addressbook.c:2486
 msgid "New user, could not save index file."
 msgstr "Нов потребител, не можа да ce запази индексния файл."
 
-#: src/addressbook.c:2356 src/addressbook.c:2489
+#: src/addressbook.c:2357 src/addressbook.c:2490
 msgid "New user, could not save address book files."
 msgstr "Нов потребител, не можа да се запази файла на адресната книга"
 
-#: src/addressbook.c:2366 src/addressbook.c:2499
+#: src/addressbook.c:2367 src/addressbook.c:2500
 msgid "Old address book converted successfully."
 msgstr "Старата адресна книга конвертирана успешно"
 
-#: src/addressbook.c:2371
+#: src/addressbook.c:2372
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -473,7 +473,7 @@ msgstr ""
 "Старата адресна книга конвертирана,\n"
 "не може да се запази новия индексен файл"
 
-#: src/addressbook.c:2384
+#: src/addressbook.c:2385
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -481,7 +481,7 @@ msgstr ""
 "Неуспя конвертирането на адресната книга,\n"
 "създадени са нови празни файлове на адресната книга."
 
-#: src/addressbook.c:2390
+#: src/addressbook.c:2391
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -489,7 +489,7 @@ msgstr ""
 "Неуспя конвертирането на адресната книга\n"
 "и създаване на нови файлове на адресната книга."
 
-#: src/addressbook.c:2395
+#: src/addressbook.c:2396
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -497,90 +497,90 @@ msgstr ""
 "Неуспя конвертирането на адресната книга\n"
 "и създаване на нови файлове на адресната книга."
 
-#: src/addressbook.c:2402
+#: src/addressbook.c:2403
 msgid "Addressbook conversion error"
 msgstr "Грешка при конвертиране на адресната книга"
 
-#: src/addressbook.c:2406
+#: src/addressbook.c:2407
 msgid "Addressbook conversion"
 msgstr "Конвертиране на адресната книга"
 
-#: src/addressbook.c:2441
+#: src/addressbook.c:2442
 msgid "Addressbook Error"
 msgstr "Грешка на адресната книга"
 
-#: src/addressbook.c:2442 src/addressbook.c:2542
+#: src/addressbook.c:2443 src/addressbook.c:2543
 msgid "Could not read address index"
 msgstr "Не може да се прочете адресния индекс"
 
-#: src/addressbook.c:2504
+#: src/addressbook.c:2505
 msgid "Old address book converted, could not save new address index file"
 msgstr ""
 "Старата адресна книга конвертирана, не може да се запази новия индексен файл"
 
-#: src/addressbook.c:2518
+#: src/addressbook.c:2519
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr ""
 "Неуспя конвертирането на адресната книга, създадени са нови празни файлове "
 "на адресната книга."
 
-#: src/addressbook.c:2524
+#: src/addressbook.c:2525
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr ""
 "Неуспя конвертирането на адресната книга, неуспя създаване на нови файлове "
 "на адресната книга."
 
-#: src/addressbook.c:2530
+#: src/addressbook.c:2531
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr ""
 "Неуспя конвертирането на адресната книга и създаване на нови файлове на "
 "адресната книга."
 
-#: src/addressbook.c:2548
+#: src/addressbook.c:2549
 msgid "Addressbook Conversion Error"
 msgstr "Грешка при конвертиране на адресната книга"
 
-#: src/addressbook.c:2554
+#: src/addressbook.c:2555
 msgid "Addressbook Conversion"
 msgstr "Конвертиране на адресната книга"
 
-#: src/addressbook.c:3055 src/prefs_common.c:963
+#: src/addressbook.c:3056 src/prefs_common.c:963
 msgid "Interface"
 msgstr "Интерфейс"
 
-#: src/addressbook.c:3071 src/importldif.c:514
+#: src/addressbook.c:3072 src/importldif.c:514
 msgid "Address Book"
 msgstr "Адресна книга"
 
-#: src/addressbook.c:3087
+#: src/addressbook.c:3088
 msgid "Person"
 msgstr "Лице"
 
-#: src/addressbook.c:3103
+#: src/addressbook.c:3104
 msgid "EMail Address"
 msgstr "EMail Адрес"
 
-#: src/addressbook.c:3119
+#: src/addressbook.c:3120
 msgid "Group"
 msgstr "Група"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3135 src/folderview.c:346 src/prefs_account.c:1866
+#: src/addressbook.c:3136 src/folderview.c:346 src/prefs_account.c:1866
 msgid "Folder"
 msgstr "Папка"
 
-#: src/addressbook.c:3151
+#: src/addressbook.c:3152
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3167 src/addressbook.c:3183
+#: src/addressbook.c:3168 src/addressbook.c:3184
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3199
+#: src/addressbook.c:3200
 msgid "LDAP Server"
 msgstr "LDAP сървър"
 
@@ -592,7 +592,7 @@ msgstr "Публичен адрес"
 msgid "Personal address"
 msgstr "Личен адрес"
 
-#: src/alertpanel.c:138 src/compose.c:5214 src/main.c:515
+#: src/alertpanel.c:138 src/compose.c:5208 src/main.c:515
 msgid "Notice"
 msgstr "Забележка"
 
@@ -647,381 +647,381 @@ msgstr "Кафяв"
 msgid "None"
 msgstr "Никой"
 
-#: src/compose.c:487
+#: src/compose.c:485
 msgid "/_Add..."
 msgstr "/_Добавяне"
 
-#: src/compose.c:488
+#: src/compose.c:486
 msgid "/_Remove"
 msgstr "/_Премахване"
 
-#: src/compose.c:490 src/folderview.c:243 src/folderview.c:262
+#: src/compose.c:488 src/folderview.c:243 src/folderview.c:262
 #: src/folderview.c:277
 msgid "/_Properties..."
 msgstr "/_Аксесоари..."
 
-#: src/compose.c:496
+#: src/compose.c:494
 #, fuzzy
 msgid "/_File/_Send"
 msgstr "/_файл/_Запазване"
 
-#: src/compose.c:498
+#: src/compose.c:496
 #, fuzzy
 msgid "/_File/Send _later"
 msgstr "/_Съобщение/Изпращане _по-късно"
 
-#: src/compose.c:501
+#: src/compose.c:499
 #, fuzzy
 msgid "/_File/Save to _draft folder"
 msgstr "/_Съобщение/_Запазване в папката с чернови"
 
-#: src/compose.c:503
+#: src/compose.c:501
 #, fuzzy
 msgid "/_File/Save and _keep editing"
 msgstr "/_Съобщение/Запазване и _продължаване на редакция"
 
-#: src/compose.c:506
+#: src/compose.c:504
 msgid "/_File/_Attach file"
 msgstr "/_Файл/_Прикрепване на файл"
 
-#: src/compose.c:507
+#: src/compose.c:505
 msgid "/_File/_Insert file"
 msgstr "/_Файл/_Внасяне на файл"
 
-#: src/compose.c:508
+#: src/compose.c:506
 msgid "/_File/Insert si_gnature"
 msgstr "/_Файл/Внасяне на _сигнатура"
 
-#: src/compose.c:513
+#: src/compose.c:511
 msgid "/_Edit/_Undo"
 msgstr "/_Редактиране/_Отмяна"
 
-#: src/compose.c:514
+#: src/compose.c:512
 msgid "/_Edit/_Redo"
 msgstr "/_Редактиране/_Повтаряне"
 
-#: src/compose.c:515 src/compose.c:522 src/mainwindow.c:506
+#: src/compose.c:513 src/compose.c:520 src/mainwindow.c:497
 #: src/messageview.c:146
 msgid "/_Edit/---"
 msgstr "/_Редактиране/---"
 
-#: src/compose.c:516
+#: src/compose.c:514
 msgid "/_Edit/Cu_t"
 msgstr "/_Редактиране/_Отрязване"
 
-#: src/compose.c:517 src/mainwindow.c:503 src/messageview.c:144
+#: src/compose.c:515 src/mainwindow.c:494 src/messageview.c:144
 msgid "/_Edit/_Copy"
 msgstr "/_Редактиране/_Копиране"
 
-#: src/compose.c:518
+#: src/compose.c:516
 msgid "/_Edit/_Paste"
 msgstr "/_Редактиране/_Вмъкване"
 
-#: src/compose.c:519
+#: src/compose.c:517
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Редактиране/Вмъкване като _цитат"
 
-#: src/compose.c:521 src/mainwindow.c:504 src/messageview.c:145
+#: src/compose.c:519 src/mainwindow.c:495 src/messageview.c:145
 msgid "/_Edit/Select _all"
 msgstr "/_Редактиране/_Избиране на всички"
 
-#: src/compose.c:523
+#: src/compose.c:521
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/_Редактиране/_Пренасяне на текущия абзац"
 
-#: src/compose.c:525
+#: src/compose.c:523
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/_Редактиране/П_ренасяне на всички дълги редове"
 
-#: src/compose.c:527
+#: src/compose.c:525
 #, fuzzy
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Редактиране/_Копиране"
 
-#: src/compose.c:528 src/mainwindow.c:511 src/messageview.c:150
+#: src/compose.c:526 src/mainwindow.c:502 src/messageview.c:150
 #: src/summaryview.c:400
 msgid "/_View"
 msgstr "/_Изглед"
 
-#: src/compose.c:529
+#: src/compose.c:527
 msgid "/_View/_To"
 msgstr "/_Изглед/_До"
 
-#: src/compose.c:530
+#: src/compose.c:528
 msgid "/_View/_Cc"
 msgstr "/_Изглед/_Сс"
 
-#: src/compose.c:531
+#: src/compose.c:529
 msgid "/_View/_Bcc"
 msgstr "/_Изглед/_Всс"
 
-#: src/compose.c:532
+#: src/compose.c:530
 msgid "/_View/_Reply to"
 msgstr "/_Изглед/_Отговор до"
 
-#: src/compose.c:533 src/compose.c:535 src/compose.c:537 src/compose.c:539
-#: src/mainwindow.c:529 src/mainwindow.c:532 src/mainwindow.c:558
-#: src/mainwindow.c:582 src/mainwindow.c:675 src/mainwindow.c:679
+#: src/compose.c:531 src/compose.c:533 src/compose.c:535 src/compose.c:537
+#: src/mainwindow.c:520 src/mainwindow.c:523 src/mainwindow.c:549
+#: src/mainwindow.c:573 src/mainwindow.c:666 src/mainwindow.c:670
 #: src/messageview.c:233
 msgid "/_View/---"
 msgstr "/_Изглед/---"
 
-#: src/compose.c:534
+#: src/compose.c:532
 msgid "/_View/_Followup to"
 msgstr "/_Изглед/_Допълнителен до"
 
-#: src/compose.c:536
+#: src/compose.c:534
 msgid "/_View/R_uler"
 msgstr "/_Изглед/_Линия"
 
-#: src/compose.c:538
+#: src/compose.c:536
 msgid "/_View/_Attachment"
 msgstr "/_Изглед/_Притурка"
 
-#: src/compose.c:545 src/mainwindow.c:589 src/messageview.c:157
+#: src/compose.c:543 src/mainwindow.c:580 src/messageview.c:157
 #, fuzzy
 msgid "/_View/Character _encoding"
 msgstr "/_Изглед/_Сортиране/Низходящо"
 
-#: src/compose.c:546
+#: src/compose.c:544
 msgid "/_View/Character _encoding/_Automatic"
 msgstr ""
 
-#: src/compose.c:548 src/compose.c:554 src/compose.c:560 src/compose.c:564
-#: src/compose.c:570 src/compose.c:574 src/compose.c:580 src/compose.c:584
-#: src/compose.c:594 src/compose.c:598 src/compose.c:608 src/compose.c:612
-#: src/mainwindow.c:585 src/mainwindow.c:592 src/messageview.c:153
+#: src/compose.c:546 src/compose.c:552 src/compose.c:558 src/compose.c:562
+#: src/compose.c:568 src/compose.c:572 src/compose.c:578 src/compose.c:582
+#: src/compose.c:592 src/compose.c:596 src/compose.c:606 src/compose.c:610
+#: src/mainwindow.c:576 src/mainwindow.c:583 src/messageview.c:153
 #, fuzzy
 msgid "/_View/Character _encoding/---"
 msgstr "/_Изглед/_Сортиране/Низходящо"
 
-#: src/compose.c:550 src/mainwindow.c:593 src/messageview.c:161
+#: src/compose.c:548 src/mainwindow.c:584 src/messageview.c:161
 #, fuzzy
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Изглед/_Кодиране/7bit ascii (US-ASC_II)"
 
-#: src/compose.c:552 src/mainwindow.c:595 src/messageview.c:164
+#: src/compose.c:550 src/mainwindow.c:586 src/messageview.c:164
 #, fuzzy
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Изглед/_Кодиране/Unicode (_UTF-8)"
 
-#: src/compose.c:556 src/mainwindow.c:599 src/messageview.c:167
+#: src/compose.c:554 src/mainwindow.c:590 src/messageview.c:167
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Изглед/_Кодиране/Western European (ISO-8859-_1)"
 
-#: src/compose.c:558 src/mainwindow.c:601 src/messageview.c:169
+#: src/compose.c:556 src/mainwindow.c:592 src/messageview.c:169
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Изглед/_Кодиране/Western European (ISO-8859-15)"
 
-#: src/compose.c:562 src/mainwindow.c:605 src/messageview.c:172
+#: src/compose.c:560 src/mainwindow.c:596 src/messageview.c:172
 #, fuzzy
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Изглед/_Кодиране/Central European (ISO-8859-_2)"
 
-#: src/compose.c:566 src/mainwindow.c:609 src/messageview.c:175
+#: src/compose.c:564 src/mainwindow.c:600 src/messageview.c:175
 #, fuzzy
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Изглед/_Кодиране/_Baltic (ISO-8859-13)"
 
-#: src/compose.c:568 src/mainwindow.c:611 src/messageview.c:177
+#: src/compose.c:566 src/mainwindow.c:602 src/messageview.c:177
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Изглед/_Кодиране/Baltic (ISO-8859-_4)"
 
-#: src/compose.c:572 src/mainwindow.c:615 src/messageview.c:180
+#: src/compose.c:570 src/mainwindow.c:606 src/messageview.c:180
 #, fuzzy
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Изглед/_Кодиране/Greek (ISO-8859-_7)"
 
-#: src/compose.c:576 src/mainwindow.c:619 src/messageview.c:183
+#: src/compose.c:574 src/mainwindow.c:610 src/messageview.c:183
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Изглед/_Кодиране/Greek (ISO-8859-_7)"
 
-#: src/compose.c:578 src/mainwindow.c:621 src/messageview.c:185
+#: src/compose.c:576 src/mainwindow.c:612 src/messageview.c:185
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Изглед/_Кодиране/Cyrillic (Windows-1251)"
 
-#: src/compose.c:582 src/mainwindow.c:625 src/messageview.c:188
+#: src/compose.c:580 src/mainwindow.c:616 src/messageview.c:188
 #, fuzzy
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Изглед/_Кодиране/Turkish (ISO-8859-_9)"
 
-#: src/compose.c:586 src/mainwindow.c:629 src/messageview.c:191
+#: src/compose.c:584 src/mainwindow.c:620 src/messageview.c:191
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Изглед/_Кодиране/Cyrillic (ISO-8859-_5)"
 
-#: src/compose.c:588 src/mainwindow.c:631 src/messageview.c:193
+#: src/compose.c:586 src/mainwindow.c:622 src/messageview.c:193
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Изглед/_Кодиране/Cyrillic (KOI8-_R)"
 
-#: src/compose.c:590 src/mainwindow.c:633 src/messageview.c:195
+#: src/compose.c:588 src/mainwindow.c:624 src/messageview.c:195
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Изглед/_Кодиране/Cyrillic (KOI8-_R)"
 
-#: src/compose.c:592 src/mainwindow.c:635 src/messageview.c:197
+#: src/compose.c:590 src/mainwindow.c:626 src/messageview.c:197
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Изглед/_Кодиране/Cyrillic (Windows-1251)"
 
-#: src/compose.c:596 src/mainwindow.c:639 src/messageview.c:200
+#: src/compose.c:594 src/mainwindow.c:630 src/messageview.c:200
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Изглед/_Кодиране/Japanese (ISO-2022-_JP)"
 
-#: src/compose.c:600 src/mainwindow.c:649 src/messageview.c:209
+#: src/compose.c:598 src/mainwindow.c:640 src/messageview.c:209
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Изглед/_Кодиране/Simplified Chinese (_GB2312)"
 
-#: src/compose.c:602 src/mainwindow.c:651 src/messageview.c:211
+#: src/compose.c:600 src/mainwindow.c:642 src/messageview.c:211
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Изглед/_Кодиране/Simplified Chinese (_GB2312)"
 
-#: src/compose.c:604 src/mainwindow.c:653 src/messageview.c:213
+#: src/compose.c:602 src/mainwindow.c:644 src/messageview.c:213
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Изглед/_Кодиране/Traditional Chinese (_Big5)"
 
-#: src/compose.c:606 src/mainwindow.c:655 src/messageview.c:215
+#: src/compose.c:604 src/mainwindow.c:646 src/messageview.c:215
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Изглед/_Кодиране/Traditional Chinese (EUC-_TW)"
 
-#: src/compose.c:610 src/mainwindow.c:661 src/messageview.c:220
+#: src/compose.c:608 src/mainwindow.c:652 src/messageview.c:220
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Изглед/_Кодиране/Korean (EUC-_KR)"
 
-#: src/compose.c:614 src/mainwindow.c:667 src/messageview.c:225
+#: src/compose.c:612 src/mainwindow.c:658 src/messageview.c:225
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Изглед/_Кодиране/Thai (TIS-620)"
 
-#: src/compose.c:616 src/mainwindow.c:669 src/messageview.c:227
+#: src/compose.c:614 src/mainwindow.c:660 src/messageview.c:227
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Изглед/_Кодиране/Thai (Windows-874)"
 
-#: src/compose.c:620 src/mainwindow.c:726 src/messageview.c:257
+#: src/compose.c:618 src/mainwindow.c:717 src/messageview.c:257
 msgid "/_Tools/_Address book"
 msgstr "/_Инструменти/_Адресна книга"
 
-#: src/compose.c:621
+#: src/compose.c:619
 msgid "/_Tools/_Template"
 msgstr "/_Инструменти/_Шаблон"
 
-#: src/compose.c:622 src/mainwindow.c:749 src/messageview.c:272
+#: src/compose.c:620 src/mainwindow.c:740 src/messageview.c:272
 msgid "/_Tools/Actio_ns"
 msgstr "/_Инструменти/_Действия"
 
-#: src/compose.c:623 src/compose.c:627 src/mainwindow.c:729
-#: src/mainwindow.c:743 src/mainwindow.c:748 src/mainwindow.c:750
-#: src/mainwindow.c:753 src/mainwindow.c:755 src/messageview.c:260
+#: src/compose.c:621 src/compose.c:625 src/mainwindow.c:720
+#: src/mainwindow.c:734 src/mainwindow.c:739 src/mainwindow.c:741
+#: src/mainwindow.c:744 src/mainwindow.c:746 src/messageview.c:260
 #: src/messageview.c:271
 msgid "/_Tools/---"
 msgstr "/_Инструменти/---"
 
-#: src/compose.c:624
+#: src/compose.c:622
 #, fuzzy
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/_Редактиране/Редактиране с _външен редактор"
 
-#: src/compose.c:628
+#: src/compose.c:626
 #, fuzzy
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Инструменти/_Действия"
 
-#: src/compose.c:629
+#: src/compose.c:627
 #, fuzzy
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/_Съобщение/_Криптиране"
 
-#: src/compose.c:855
+#: src/compose.c:853
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: файлът не съществува\n"
 
-#: src/compose.c:954 src/compose.c:1024 src/procmsg.c:1353
+#: src/compose.c:952 src/compose.c:1022 src/procmsg.c:1353
 msgid "Can't get text part\n"
 msgstr "Не може да се намери текстовата част\n"
 
-#: src/compose.c:1420
+#: src/compose.c:1418
 msgid "Quote mark format error."
 msgstr "Грешка в формата на цитат."
 
-#: src/compose.c:1432
+#: src/compose.c:1430
 msgid "Message reply/forward format error."
 msgstr "Грешка в reply/forward формата на съобщението."
 
-#: src/compose.c:1801
+#: src/compose.c:1799
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Файлът %s не съществува\n"
 
-#: src/compose.c:1805
+#: src/compose.c:1803
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Не може да се намери големината на %s\n"
 
-#: src/compose.c:1809
+#: src/compose.c:1807
 #, c-format
 msgid "File %s is empty."
 msgstr "Файлът %s е празен."
 
-#: src/compose.c:1813
+#: src/compose.c:1811
 #, c-format
 msgid "Can't read %s."
 msgstr "Не може да се прочете %s."
 
-#: src/compose.c:1848
+#: src/compose.c:1846
 #, c-format
 msgid "Message: %s"
 msgstr "Съобщение: %s"
 
-#: src/compose.c:1920 src/mimeview.c:560
+#: src/compose.c:1918 src/mimeview.c:560
 msgid "Can't get the part of multipart message."
 msgstr "Не може да се намери част от multipart съобщение."
 
-#: src/compose.c:2362
+#: src/compose.c:2360
 msgid " [Edited]"
 msgstr " [Редактирано]"
 
-#: src/compose.c:2364
+#: src/compose.c:2362
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Съставяне на съобщение%s"
 
-#: src/compose.c:2367
+#: src/compose.c:2365
 #, c-format
 msgid "Compose message%s"
 msgstr "Съставяне на съобщение%s"
 
-#: src/compose.c:2478
+#: src/compose.c:2476
 msgid "Recipient is not specified."
 msgstr "Не е указан получател"
 
-#: src/compose.c:2486
+#: src/compose.c:2484
 #, fuzzy
 msgid "Empty subject"
 msgstr "Тема"
 
-#: src/compose.c:2487
+#: src/compose.c:2485
 msgid "Subject is empty. Send it anyway?"
 msgstr "Празна тема. Изпращане така?"
 
-#: src/compose.c:2538
+#: src/compose.c:2536
 msgid "can't get recipient list."
 msgstr "не може да се получи списък с получатели."
 
-#: src/compose.c:2558
+#: src/compose.c:2556
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1029,26 +1029,26 @@ msgstr ""
 "Не е указан акаунт за изпращане на пощата.\n"
 "Моля изберете пощенску акаунт преди изпращане."
 
-#: src/compose.c:2572 src/send_message.c:297
+#: src/compose.c:2570 src/send_message.c:297
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Възникна грешка при пращане на съобщението до %s."
 
-#: src/compose.c:2595
+#: src/compose.c:2593
 msgid "Can't save the message to outbox."
 msgstr "Не може да се запази съобщението в изходящата кутия."
 
-#: src/compose.c:2645
+#: src/compose.c:2643
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "Не можа да се намери бутон асоцииран с избрания `%s'."
 
-#: src/compose.c:2709 src/compose.c:2965 src/compose.c:3028 src/compose.c:3148
-#: src/utils.c:2365
+#: src/compose.c:2707 src/compose.c:2963 src/compose.c:3026 src/compose.c:3146
+#: src/utils.c:2379
 msgid "can't change file mode\n"
 msgstr "не може да се смени вида на файла\n"
 
-#: src/compose.c:2741
+#: src/compose.c:2739
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1059,12 +1059,12 @@ msgstr ""
 "%s към %s.\n"
 "Изпращане така?"
 
-#: src/compose.c:2747
+#: src/compose.c:2745
 #, fuzzy
 msgid "Code conversion error"
 msgstr "Грешка при конвертиране на адресната книга"
 
-#: src/compose.c:2816
+#: src/compose.c:2814
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1073,155 +1073,155 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:2820
+#: src/compose.c:2818
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3108
+#: src/compose.c:3106
 msgid "can't remove the old message\n"
 msgstr "не може да се изтрие старото съобщение\n"
 
-#: src/compose.c:3126
+#: src/compose.c:3124
 msgid "queueing message...\n"
 msgstr "нареждане на съобщението на опашката...\n"
 
-#: src/compose.c:3208
+#: src/compose.c:3206
 msgid "can't find queue folder\n"
 msgstr "не може да се намери папката за опашка\n"
 
-#: src/compose.c:3215
+#: src/compose.c:3213
 msgid "can't queue the message\n"
 msgstr "не може да се нареди съобщението на опашката\n"
 
-#: src/compose.c:3792
+#: src/compose.c:3790
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "генерирано Message-ID: %s\n"
 
-#: src/compose.c:3901
+#: src/compose.c:3899
 msgid "Creating compose window...\n"
 msgstr "Създаване на прозорец за съставяне...\n"
 
-#: src/compose.c:3949 src/headerview.c:54 src/summary_search.c:214
+#: src/compose.c:3947 src/headerview.c:54 src/summary_search.c:214
 msgid "From:"
 msgstr "От:"
 
-#: src/compose.c:4021
+#: src/compose.c:4019
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/_Инструменти/_Действия"
 
-#: src/compose.c:4024
+#: src/compose.c:4022
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/_Съобщение/_Криптиране"
 
-#: src/compose.c:4062 src/compose.c:5001
+#: src/compose.c:4060 src/compose.c:4995
 msgid "MIME type"
 msgstr "MIME тип"
 
 #. S_COL_DATE
-#: src/compose.c:4071 src/mimeview.c:192 src/prefs_filter_edit.c:585
+#: src/compose.c:4069 src/mimeview.c:192 src/prefs_filter_edit.c:585
 #: src/prefs_summary_column.c:75 src/select-keys.c:317 src/summaryview.c:4217
 msgid "Size"
 msgstr "Размер"
 
-#: src/compose.c:4449 src/mainwindow.c:2224 src/prefs_account.c:719
+#: src/compose.c:4442 src/mainwindow.c:2207 src/prefs_account.c:719
 #: src/prefs_common.c:947
 msgid "Send"
 msgstr "Изпращане"
 
-#: src/compose.c:4450
+#: src/compose.c:4443
 msgid "Send message"
 msgstr "Изпращане на съобщение"
 
-#: src/compose.c:4458
+#: src/compose.c:4451
 msgid "Send later"
 msgstr "Изпращане по-късно"
 
-#: src/compose.c:4459
+#: src/compose.c:4452
 msgid "Put into queue folder and send later"
 msgstr "Поставяне в папката за опашка и изпращане по-късно"
 
-#: src/compose.c:4467
+#: src/compose.c:4460
 msgid "Draft"
 msgstr "Чернови"
 
-#: src/compose.c:4468
+#: src/compose.c:4461
 msgid "Save to draft folder"
 msgstr "Запазване в папката с чернови"
 
-#: src/compose.c:4478
+#: src/compose.c:4471
 msgid "Insert"
 msgstr "Вмъкване"
 
-#: src/compose.c:4479
+#: src/compose.c:4472
 msgid "Insert file"
 msgstr "Вмъкване на файл"
 
-#: src/compose.c:4487
+#: src/compose.c:4480
 msgid "Attach"
 msgstr "Прикрепване"
 
-#: src/compose.c:4488
+#: src/compose.c:4481
 msgid "Attach file"
 msgstr "Прикрепване на файл"
 
 #. signature
-#: src/compose.c:4498 src/prefs_account.c:1391 src/prefs_common.c:1356
+#: src/compose.c:4491 src/prefs_account.c:1391 src/prefs_common.c:1356
 msgid "Signature"
 msgstr "Сигнатура"
 
-#: src/compose.c:4499
+#: src/compose.c:4492
 msgid "Insert signature"
 msgstr "Вмъкване на сигнатура"
 
-#: src/compose.c:4508 src/prefs_common.c:1378 src/prefs_common.c:2382
+#: src/compose.c:4501 src/prefs_common.c:1378 src/prefs_common.c:2382
 msgid "Editor"
 msgstr "Редактор"
 
-#: src/compose.c:4509
+#: src/compose.c:4502
 msgid "Edit with external editor"
 msgstr "Редакция с външен редактор"
 
-#: src/compose.c:4517
+#: src/compose.c:4510
 msgid "Linewrap"
 msgstr "Свиванен на редовете"
 
-#: src/compose.c:4518
+#: src/compose.c:4511
 msgid "Wrap all long lines"
 msgstr "Свиване на всички дълги редове"
 
-#: src/compose.c:4897
+#: src/compose.c:4891
 msgid "Invalid MIME type."
 msgstr "Невалиден MIME тип"
 
-#: src/compose.c:4915
+#: src/compose.c:4909
 msgid "File doesn't exist or is empty."
 msgstr "Файлът не съществува или е празен"
 
-#: src/compose.c:4983
+#: src/compose.c:4977
 msgid "Properties"
 msgstr "Аксесоари"
 
-#: src/compose.c:5003
+#: src/compose.c:4997
 msgid "Encoding"
 msgstr "Кодиране"
 
-#: src/compose.c:5026 src/prefs_folder_item.c:183
+#: src/compose.c:5020 src/prefs_folder_item.c:183
 msgid "Path"
 msgstr "Път"
 
-#: src/compose.c:5027
+#: src/compose.c:5021
 msgid "File name"
 msgstr "Име на файл"
 
-#: src/compose.c:5185
+#: src/compose.c:5179
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Командния ред за външен редактор е невалиден: `%s'\n"
 
-#: src/compose.c:5211
+#: src/compose.c:5205
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1232,75 +1232,75 @@ msgstr ""
 "Желаете ли принудително прекратяване на процеса?\n"
 "process group id: %d"
 
-#: src/compose.c:5228
+#: src/compose.c:5222
 #, c-format
 msgid "Terminated process group id: %d"
 msgstr "Прекратен process group id: %d"
 
-#: src/compose.c:5229
+#: src/compose.c:5223
 #, c-format
 msgid "Temporary file: %s"
 msgstr "Временен файл: %s"
 
-#: src/compose.c:5253
+#: src/compose.c:5247
 msgid "Compose: input from monitoring process\n"
 msgstr "Съставяне: вход от наблюдаващ процес\n"
 
 #. failed
-#: src/compose.c:5284
+#: src/compose.c:5278
 msgid "Couldn't exec external editor\n"
 msgstr "Не може да се стартира външен редактор\n"
 
-#: src/compose.c:5288
+#: src/compose.c:5282
 msgid "Couldn't write to file\n"
 msgstr "Не може да се запише във файл\n"
 
-#: src/compose.c:5290
+#: src/compose.c:5284
 msgid "Pipe read failed\n"
 msgstr "Четене на pipe провалено\n"
 
-#: src/compose.c:5596 src/compose.c:5604 src/compose.c:5610
+#: src/compose.c:5590 src/compose.c:5598 src/compose.c:5604
 msgid "Can't queue the message."
 msgstr "Не може да се нареди съобщението на опашката."
 
-#: src/compose.c:5701
+#: src/compose.c:5695
 #, fuzzy
 msgid "Select files"
 msgstr "Избор на файл"
 
-#: src/compose.c:5723
+#: src/compose.c:5717
 msgid "Select file"
 msgstr "Избор на файл"
 
-#: src/compose.c:5760
+#: src/compose.c:5754
 #, fuzzy
 msgid "Save message"
 msgstr "Изпращане на съобщение"
 
-#: src/compose.c:5761
+#: src/compose.c:5755
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Съобщението беше променено. Изоставяне?"
 
-#: src/compose.c:5763
+#: src/compose.c:5757
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:5805
+#: src/compose.c:5799
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Желаете ли да приложите шаблонът `%s' ?"
 
-#: src/compose.c:5807
+#: src/compose.c:5801
 msgid "Apply template"
 msgstr "Прилагане на шаблон"
 
-#: src/compose.c:5808
+#: src/compose.c:5802
 #, fuzzy
 msgid "_Replace"
 msgstr "Заменяне"
 
-#: src/compose.c:5808
+#: src/compose.c:5802
 #, fuzzy
 msgid "_Insert"
 msgstr "Вмъкване"
@@ -1747,12 +1747,12 @@ msgstr "Установяване информация за папка...\n"
 msgid "Setting folder info..."
 msgstr "Установяване информация за папка..."
 
-#: src/folderview.c:805 src/mainwindow.c:3301 src/setup.c:81
+#: src/folderview.c:805 src/mainwindow.c:3272 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Сканиране на папка %s%c%s ..."
 
-#: src/folderview.c:809 src/mainwindow.c:3306 src/setup.c:86
+#: src/folderview.c:809 src/mainwindow.c:3277 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Сканиране на папка %s ..."
@@ -2073,44 +2073,44 @@ msgstr "IMAP4 удостоверяване провалено.\n"
 msgid "IMAP4 login failed.\n"
 msgstr "IMAP4 влизане провалено.\n"
 
-#: src/imap.c:3522
+#: src/imap.c:3528
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "не може да се прибави %s към %s\n"
 
-#: src/imap.c:3529
+#: src/imap.c:3535
 msgid "(sending file...)"
 msgstr "(изпращане на файл...)"
 
-#: src/imap.c:3557
+#: src/imap.c:3563
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "съобщението не може да се прибави към %s\n"
 
-#: src/imap.c:3589
+#: src/imap.c:3595
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "не може да се копира %s в %s\n"
 
-#: src/imap.c:3613
+#: src/imap.c:3619
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "грешка при imap команда: STORE %s %s\n"
 
-#: src/imap.c:3627
+#: src/imap.c:3633
 msgid "error while imap command: EXPUNGE\n"
 msgstr "грешка при imap команда: EXPUNGE\n"
 
-#: src/imap.c:3640
+#: src/imap.c:3646
 msgid "error while imap command: CLOSE\n"
 msgstr "грешка при imap команда: CLOSE\n"
 
-#: src/imap.c:3873
+#: src/imap.c:3879
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv не може да преобразува UTF-7 до %s\n"
 
-#: src/imap.c:3903
+#: src/imap.c:3909
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv не може да преобразува %s до UTF-7\n"
@@ -2212,7 +2212,7 @@ msgstr "Внасяне на LDIF файл в Адресната книга"
 msgid "Prev"
 msgstr "Предишен"
 
-#: src/importldif.c:768 src/mainwindow.c:2321
+#: src/importldif.c:768 src/mainwindow.c:2303
 msgid "Next"
 msgstr "Следващ"
 
@@ -2559,645 +2559,645 @@ msgid ""
 "Do you want to migrate it?"
 msgstr ""
 
-#: src/mainwindow.c:471
+#: src/mainwindow.c:462
 msgid "/_File/_Folder"
 msgstr "/_Файл/_Папка"
 
-#: src/mainwindow.c:472
+#: src/mainwindow.c:463
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/_Файл/_Папка/Създаване на _нова папка"
 
-#: src/mainwindow.c:474
+#: src/mainwindow.c:465
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/_Файл/_Папка/П_реименуване на папка..."
 
-#: src/mainwindow.c:475
+#: src/mainwindow.c:466
 #, fuzzy
 msgid "/_File/_Folder/_Move folder..."
 msgstr "/_Файл/_Папка/П_реименуване на папка..."
 
-#: src/mainwindow.c:476
+#: src/mainwindow.c:467
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/_Файл/_Папка/_Изтриване на папка"
 
-#: src/mainwindow.c:477
+#: src/mainwindow.c:468
 #, fuzzy
 msgid "/_File/_Mailbox"
 msgstr "/_Файл/_Добаване на пощенска кутия..."
 
-#: src/mainwindow.c:478
+#: src/mainwindow.c:469
 #, fuzzy
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/_Файл/_Добаване на пощенска кутия..."
 
-#: src/mainwindow.c:479
+#: src/mainwindow.c:470
 #, fuzzy
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/П_ремахване на пощенска кутия"
 
-#: src/mainwindow.c:480 src/mainwindow.c:485
+#: src/mainwindow.c:471 src/mainwindow.c:476
 #, fuzzy
 msgid "/_File/_Mailbox/---"
 msgstr "/_Файл/_Папка/---"
 
-#: src/mainwindow.c:481
+#: src/mainwindow.c:472
 #, fuzzy
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "/_Проверка за нови съобщения"
 
-#: src/mainwindow.c:483
+#: src/mainwindow.c:474
 #, fuzzy
 msgid "/_File/_Mailbox/Check for new messages in _all mailboxes"
 msgstr "/_Файл/_Папка/_Проверка за нови съобщения във всички папки"
 
-#: src/mainwindow.c:486
+#: src/mainwindow.c:477
 #, fuzzy
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "/_Възобновяване дървото на папката"
 
-#: src/mainwindow.c:489
+#: src/mainwindow.c:480
 msgid "/_File/_Import mbox file..."
 msgstr "/_Файл/_Внасяне на mbox файл..."
 
-#: src/mainwindow.c:490
+#: src/mainwindow.c:481
 msgid "/_File/_Export to mbox file..."
 msgstr "/_Файл/_Изнасяне на mbox файл..."
 
-#: src/mainwindow.c:492
+#: src/mainwindow.c:483
 #, fuzzy
 msgid "/_File/Empty all _trash"
 msgstr "/_Файл/Изпразване на _кошчето"
 
-#: src/mainwindow.c:494 src/messageview.c:138
+#: src/mainwindow.c:485 src/messageview.c:138
 msgid "/_File/_Save as..."
 msgstr "/_Файл/З_апазване в..."
 
-#: src/mainwindow.c:495 src/messageview.c:139
+#: src/mainwindow.c:486 src/messageview.c:139
 msgid "/_File/_Print..."
 msgstr "/_Файл/Пе_чат..."
 
-#: src/mainwindow.c:497
+#: src/mainwindow.c:488
 msgid "/_File/_Work offline"
 msgstr "/_Файл/_Работа без мрежа"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:500
+#: src/mainwindow.c:491
 msgid "/_File/E_xit"
 msgstr "/_Файл/Из_ход"
 
-#: src/mainwindow.c:505
+#: src/mainwindow.c:496
 msgid "/_Edit/Select _thread"
 msgstr "/_Редактиране/Избор по _тема"
 
-#: src/mainwindow.c:507 src/messageview.c:147
+#: src/mainwindow.c:498 src/messageview.c:147
 msgid "/_Edit/_Find in current message..."
 msgstr "/_Редактиране/_Търсене в текущото съобщение..."
 
-#: src/mainwindow.c:509
+#: src/mainwindow.c:500
 msgid "/_Edit/_Search messages..."
 msgstr "/_Редактиране/Търсене в _съобщенията..."
 
-#: src/mainwindow.c:512
+#: src/mainwindow.c:503
 msgid "/_View/Show or hi_de"
 msgstr "/_Изглед/Показване или _скриване"
 
-#: src/mainwindow.c:513
+#: src/mainwindow.c:504
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/_Изглед/Показване или _скриване/_Дърво на папките"
 
-#: src/mainwindow.c:515
+#: src/mainwindow.c:506
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/_Изглед/Показване или _скриване/_Изглед на съобщенията"
 
-#: src/mainwindow.c:517
+#: src/mainwindow.c:508
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/_Изглед/Показване или _скриване/_Лента"
 
-#: src/mainwindow.c:519
+#: src/mainwindow.c:510
 msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/_Изглед/Показване или _скриване/_Лента/Икони и _текст"
 
-#: src/mainwindow.c:521
+#: src/mainwindow.c:512
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/_Изглед/Показване или _скриване/_Лента/_Икони"
 
-#: src/mainwindow.c:523
+#: src/mainwindow.c:514
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/_Изглед/Показване или _скриване/_Лента/Т_екст"
 
-#: src/mainwindow.c:525
+#: src/mainwindow.c:516
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/_Изглед/Показване или _скриване/_Лента/_Без показване"
 
-#: src/mainwindow.c:527
+#: src/mainwindow.c:518
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/_Изглед/Показване или _скриване/Лента на _състоянието"
 
-#: src/mainwindow.c:530
+#: src/mainwindow.c:521
 msgid "/_View/Separate f_older tree"
 msgstr "/_Изглед/_Отделно дърво на папките"
 
-#: src/mainwindow.c:531
+#: src/mainwindow.c:522
 #, fuzzy
 msgid "/_View/Separate _message view"
 msgstr "/_Изглед/Отделен изглед на съобщенията"
 
-#: src/mainwindow.c:533
+#: src/mainwindow.c:524
 msgid "/_View/_Sort"
 msgstr "/_Изглед/_Сортиране"
 
-#: src/mainwindow.c:534
+#: src/mainwindow.c:525
 msgid "/_View/_Sort/by _number"
 msgstr "/_Изглед/_Сортиране/по _номер"
 
-#: src/mainwindow.c:535
+#: src/mainwindow.c:526
 msgid "/_View/_Sort/by s_ize"
 msgstr "/_Изглед/_Сортиране/по _размер"
 
-#: src/mainwindow.c:536
+#: src/mainwindow.c:527
 msgid "/_View/_Sort/by _date"
 msgstr "/_Изглед/_Сортиране/по _дата"
 
-#: src/mainwindow.c:537
+#: src/mainwindow.c:528
 msgid "/_View/_Sort/by _from"
 msgstr "/_Изглед/_Сортиране/по _подател"
 
-#: src/mainwindow.c:538
+#: src/mainwindow.c:529
 msgid "/_View/_Sort/by _recipient"
 msgstr "/_Изглед/_Сортиране/по п_олучател"
 
-#: src/mainwindow.c:539
+#: src/mainwindow.c:530
 msgid "/_View/_Sort/by _subject"
 msgstr "/_Изглед/_Сортиране/по _тема"
 
-#: src/mainwindow.c:540
+#: src/mainwindow.c:531
 msgid "/_View/_Sort/by _color label"
 msgstr "/_Изглед/_Сортиране/по _цвят"
 
-#: src/mainwindow.c:542
+#: src/mainwindow.c:533
 msgid "/_View/_Sort/by _mark"
 msgstr "/_Изглед/_Сортиране/по _отбелязване"
 
-#: src/mainwindow.c:543
+#: src/mainwindow.c:534
 msgid "/_View/_Sort/by _unread"
 msgstr "/_Изглед/_Сортиране/по _непрочетени"
 
-#: src/mainwindow.c:544
+#: src/mainwindow.c:535
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/_Изглед/_Сортиране/по _притурка"
 
-#: src/mainwindow.c:546
+#: src/mainwindow.c:537
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/_Изглед/_Сортиране/_Без сортиране"
 
-#: src/mainwindow.c:547 src/mainwindow.c:550
+#: src/mainwindow.c:538 src/mainwindow.c:541
 msgid "/_View/_Sort/---"
 msgstr "/_Изглед/_Сортиране/---"
 
-#: src/mainwindow.c:548
+#: src/mainwindow.c:539
 msgid "/_View/_Sort/Ascending"
 msgstr "/_Изглед/_Сортиране/Възходящо"
 
-#: src/mainwindow.c:549
+#: src/mainwindow.c:540
 msgid "/_View/_Sort/Descending"
 msgstr "/_Изглед/_Сортиране/Низходящо"
 
-#: src/mainwindow.c:551
+#: src/mainwindow.c:542
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/_Изглед/_Сортиране/_Привличане по тема"
 
-#: src/mainwindow.c:553
+#: src/mainwindow.c:544
 msgid "/_View/Th_read view"
 msgstr "/_Изглед/_Нишков изглед"
 
-#: src/mainwindow.c:554
+#: src/mainwindow.c:545
 msgid "/_View/E_xpand all threads"
 msgstr "/_Изглед/_Развиване на всички нишки"
 
-#: src/mainwindow.c:555
+#: src/mainwindow.c:546
 msgid "/_View/Co_llapse all threads"
 msgstr "/_Изглед/_Свиване на всички нишки"
 
-#: src/mainwindow.c:556
+#: src/mainwindow.c:547
 msgid "/_View/Set display _item..."
 msgstr "/_Изглед/Атрибути на извадката"
 
-#: src/mainwindow.c:559
+#: src/mainwindow.c:550
 msgid "/_View/_Go to"
 msgstr "/_Изглед/П_реход до"
 
-#: src/mainwindow.c:560
+#: src/mainwindow.c:551
 msgid "/_View/_Go to/_Prev message"
 msgstr "/_Изглед/П_реход до/_Предишно съобщение"
 
-#: src/mainwindow.c:561
+#: src/mainwindow.c:552
 msgid "/_View/_Go to/_Next message"
 msgstr "/_Изглед/П_реход до/_Следващо съобщение"
 
-#: src/mainwindow.c:562 src/mainwindow.c:567 src/mainwindow.c:570
-#: src/mainwindow.c:575 src/mainwindow.c:580
+#: src/mainwindow.c:553 src/mainwindow.c:558 src/mainwindow.c:561
+#: src/mainwindow.c:566 src/mainwindow.c:571
 msgid "/_View/_Go to/---"
 msgstr "/_Изглед/П_реход до/---"
 
-#: src/mainwindow.c:563
+#: src/mainwindow.c:554
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/_Изглед/П_реход до/П_редишно непрочетено съобщение"
 
-#: src/mainwindow.c:565
+#: src/mainwindow.c:556
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/_Изглед/П_реход до/С_ледващо непрочетено съобщение"
 
-#: src/mainwindow.c:568
+#: src/mainwindow.c:559
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/_Изглед/П_реход до/Предишно _ново съобщение"
 
-#: src/mainwindow.c:569
+#: src/mainwindow.c:560
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/_Изглед/П_реход до/Следващо н_ово съобщение"
 
-#: src/mainwindow.c:571
+#: src/mainwindow.c:562
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/_Изглед/П_реход до/Предишно _маркирано съобщение"
 
-#: src/mainwindow.c:573
+#: src/mainwindow.c:564
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/_Изглед/П_реход до/Следващо м_аркирано съобщение"
 
-#: src/mainwindow.c:576
+#: src/mainwindow.c:567
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/_Изглед/П_реход до/Предишно _оцветено съобщение"
 
-#: src/mainwindow.c:578
+#: src/mainwindow.c:569
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/_Изглед/П_реход до/Следващо о_цветено съобщение"
 
-#: src/mainwindow.c:581
+#: src/mainwindow.c:572
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Изглед/П_реход до/_Друга папка"
 
-#: src/mainwindow.c:590 src/messageview.c:158
+#: src/mainwindow.c:581 src/messageview.c:158
 #, fuzzy
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Изглед/_Кодиране/_Автоматично разпознаване"
 
-#: src/mainwindow.c:641 src/messageview.c:202
+#: src/mainwindow.c:632 src/messageview.c:202
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Изглед/_Кодиране/Japanese (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:643 src/messageview.c:204
+#: src/mainwindow.c:634 src/messageview.c:204
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Изглед/_Кодиране/Japanese (_EUC-JP)"
 
-#: src/mainwindow.c:645 src/messageview.c:206
+#: src/mainwindow.c:636 src/messageview.c:206
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Изглед/_Кодиране/Japanese (_Shift__JIS)"
 
-#: src/mainwindow.c:657 src/messageview.c:217
+#: src/mainwindow.c:648 src/messageview.c:217
 #, fuzzy
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Изглед/_Кодиране/Chinese (ISO-2022-_CN)"
 
-#: src/mainwindow.c:663 src/messageview.c:222
+#: src/mainwindow.c:654 src/messageview.c:222
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Изглед/_Кодиране/Korean (ISO-2022-KR)"
 
-#: src/mainwindow.c:676 src/summaryview.c:401
+#: src/mainwindow.c:667 src/summaryview.c:401
 msgid "/_View/Open in new _window"
 msgstr "/_Изглед/Отваряне в _нов прозорец"
 
-#: src/mainwindow.c:677 src/messageview.c:234
+#: src/mainwindow.c:668 src/messageview.c:234
 msgid "/_View/Mess_age source"
 msgstr "/_Изглед/_Изходен код"
 
-#: src/mainwindow.c:678 src/messageview.c:235
+#: src/mainwindow.c:669 src/messageview.c:235
 msgid "/_View/Show all _header"
 msgstr "/_Изглед/_Показване на заглавните части(headers)"
 
-#: src/mainwindow.c:680
+#: src/mainwindow.c:671
 msgid "/_View/_Update summary"
 msgstr "/_Изглед/_Обновяване на извадката"
 
-#: src/mainwindow.c:682 src/messageview.c:237
+#: src/mainwindow.c:673 src/messageview.c:237
 msgid "/_Message"
 msgstr "/_Съобщение"
 
-#: src/mainwindow.c:683
+#: src/mainwindow.c:674
 #, fuzzy
 msgid "/_Message/Recei_ve"
 msgstr "/_Съобщение/_Редактиране"
 
-#: src/mainwindow.c:684
+#: src/mainwindow.c:675
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/_Съобщение/Получаване от _всички акаунти"
 
-#: src/mainwindow.c:686
+#: src/mainwindow.c:677
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/_Съобщение/Получаване от _всички акаунти"
 
-#: src/mainwindow.c:688
+#: src/mainwindow.c:679
 #, fuzzy
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/_Съобщение/_Отказ на получаване"
 
-#: src/mainwindow.c:690
+#: src/mainwindow.c:681
 #, fuzzy
 msgid "/_Message/Recei_ve/---"
 msgstr "/_Съобщение/---"
 
-#: src/mainwindow.c:691
+#: src/mainwindow.c:682
 msgid "/_Message/_Send queued messages"
 msgstr "/_Съобщение/_Изпращане на съобщенията в опашката"
 
-#: src/mainwindow.c:692 src/mainwindow.c:694 src/mainwindow.c:701
-#: src/mainwindow.c:706 src/mainwindow.c:710 src/mainwindow.c:719
-#: src/mainwindow.c:722 src/messageview.c:240 src/messageview.c:248
+#: src/mainwindow.c:683 src/mainwindow.c:685 src/mainwindow.c:692
+#: src/mainwindow.c:697 src/mainwindow.c:701 src/mainwindow.c:710
+#: src/mainwindow.c:713 src/messageview.c:240 src/messageview.c:248
 #: src/messageview.c:253
 msgid "/_Message/---"
 msgstr "/_Съобщение/---"
 
-#: src/mainwindow.c:693 src/messageview.c:238
+#: src/mainwindow.c:684 src/messageview.c:238
 msgid "/_Message/Compose _new message"
 msgstr "/_Съобщение/_Съставяне на ново съобщение"
 
-#: src/mainwindow.c:695 src/messageview.c:241
+#: src/mainwindow.c:686 src/messageview.c:241
 msgid "/_Message/_Reply"
 msgstr "/_Съобщение/_Отговор"
 
-#: src/mainwindow.c:696
+#: src/mainwindow.c:687
 msgid "/_Message/Repl_y to"
 msgstr "/_Съобщение/Отговор _до"
 
-#: src/mainwindow.c:697 src/messageview.c:242
+#: src/mainwindow.c:688 src/messageview.c:242
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Съобщение/Отговор _до/_всички"
 
-#: src/mainwindow.c:698 src/messageview.c:244
+#: src/mainwindow.c:689 src/messageview.c:244
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Съобщение/Отговор _до/_подател"
 
-#: src/mainwindow.c:699 src/messageview.c:246
+#: src/mainwindow.c:690 src/messageview.c:246
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Съобщение/Отговор _до/_пощенски списък"
 
-#: src/mainwindow.c:702 src/messageview.c:249
+#: src/mainwindow.c:693 src/messageview.c:249
 msgid "/_Message/_Forward"
 msgstr "/_Съобщение/П_репращане"
 
-#: src/mainwindow.c:703 src/messageview.c:250
+#: src/mainwindow.c:694 src/messageview.c:250
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Съобщение/Пр_епращане като притурка"
 
-#: src/mainwindow.c:705 src/messageview.c:252
+#: src/mainwindow.c:696 src/messageview.c:252
 msgid "/_Message/Redirec_t"
 msgstr "/_Съобщение/_Пренасочване"
 
-#: src/mainwindow.c:707
+#: src/mainwindow.c:698
 msgid "/_Message/M_ove..."
 msgstr "/_Съобщение/_Преместване"
 
-#: src/mainwindow.c:708
+#: src/mainwindow.c:699
 msgid "/_Message/_Copy..."
 msgstr "/_Съобщение/_Копиране"
 
-#: src/mainwindow.c:709
+#: src/mainwindow.c:700
 msgid "/_Message/_Delete"
 msgstr "/_Съобщение/_Изтриване"
 
-#: src/mainwindow.c:711
+#: src/mainwindow.c:702
 msgid "/_Message/_Mark"
 msgstr "/_Съобщение/_Маркиране"
 
-#: src/mainwindow.c:712
+#: src/mainwindow.c:703
 msgid "/_Message/_Mark/_Mark"
 msgstr "/_Съобщение/_Маркиране/_Маркиране"
 
-#: src/mainwindow.c:713
+#: src/mainwindow.c:704
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/_Съобщение/_Маркиране/_Размаркиране"
 
-#: src/mainwindow.c:714
+#: src/mainwindow.c:705
 msgid "/_Message/_Mark/---"
 msgstr "/_Съобщение/_Маркиране/---"
 
-#: src/mainwindow.c:715
+#: src/mainwindow.c:706
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/_Съобщение/_Маркиране/като _непрочетено"
 
-#: src/mainwindow.c:716
+#: src/mainwindow.c:707
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/_Съобщение/_Маркиране/като _прочетено"
 
-#: src/mainwindow.c:718
+#: src/mainwindow.c:709
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/_Съобщение/_Маркиране/_всички като прочетени"
 
-#: src/mainwindow.c:720
+#: src/mainwindow.c:711
 #, fuzzy
 msgid "/_Message/Set as _junk mail"
 msgstr "/_Съобщение/_Получаване на нова поща"
 
-#: src/mainwindow.c:721
+#: src/mainwindow.c:712
 #, fuzzy
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/_Съобщение/_Получаване на нова поща"
 
-#: src/mainwindow.c:723 src/messageview.c:254
+#: src/mainwindow.c:714 src/messageview.c:254
 msgid "/_Message/Re-_edit"
 msgstr "/_Съобщение/_Редактиране"
 
-#: src/mainwindow.c:727
+#: src/mainwindow.c:718
 #, fuzzy
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/_Инструменти/_Добавяне на подател в адресната книга"
 
-#: src/mainwindow.c:730
+#: src/mainwindow.c:721
 #, fuzzy
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/_Инструменти/_Филтриране на съобщенията"
 
-#: src/mainwindow.c:732
+#: src/mainwindow.c:723
 #, fuzzy
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Инструменти/_Филтриране на съобщенията"
 
-#: src/mainwindow.c:734 src/messageview.c:261
+#: src/mainwindow.c:725 src/messageview.c:261
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Инструменти/_Създаване на правило за филтриране"
 
-#: src/mainwindow.c:735 src/messageview.c:263
+#: src/mainwindow.c:726 src/messageview.c:263
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Инструменти/_Създаване на правило за филтриране/_Автоматично"
 
-#: src/mainwindow.c:737 src/messageview.c:265
+#: src/mainwindow.c:728 src/messageview.c:265
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Инструменти/_Създаване на правило за филтриране/по _Подател"
 
-#: src/mainwindow.c:739 src/messageview.c:267
+#: src/mainwindow.c:730 src/messageview.c:267
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Инструменти/_Създаване на правило за филтриране/по П_олучател"
 
-#: src/mainwindow.c:741 src/messageview.c:269
+#: src/mainwindow.c:732 src/messageview.c:269
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Инструменти/_Създаване на правило за филтриране/по _Тема"
 
-#: src/mainwindow.c:744
+#: src/mainwindow.c:735
 #, fuzzy
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/_Инструменти/_Филтриране на съобщенията"
 
-#: src/mainwindow.c:746
+#: src/mainwindow.c:737
 #, fuzzy
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/_Инструменти/_Филтриране на съобщенията"
 
-#: src/mainwindow.c:751
+#: src/mainwindow.c:742
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/_Инструменти/И_зтриване на повтарящи се съобщения"
 
-#: src/mainwindow.c:754
+#: src/mainwindow.c:745
 msgid "/_Tools/E_xecute"
 msgstr "/_Инструменти/_Изпълнение"
 
-#: src/mainwindow.c:756
+#: src/mainwindow.c:747
 msgid "/_Tools/_Log window"
 msgstr "/_Инструменти/_Журнален прозорец"
 
-#: src/mainwindow.c:758
+#: src/mainwindow.c:749
 msgid "/_Configuration"
 msgstr "/_Конфигуриране"
 
-#: src/mainwindow.c:759
+#: src/mainwindow.c:750
 msgid "/_Configuration/_Common preferences..."
 msgstr "/_Конфигуриране/_Общи предпочитания"
 
-#: src/mainwindow.c:761
+#: src/mainwindow.c:752
 msgid "/_Configuration/_Filter setting..."
 msgstr "/_Конфигуриране/_Установяване на филтър"
 
-#: src/mainwindow.c:763
+#: src/mainwindow.c:754
 msgid "/_Configuration/_Template..."
 msgstr "/_Конфигуриране/_Шаблон"
 
-#: src/mainwindow.c:764
+#: src/mainwindow.c:755
 msgid "/_Configuration/_Actions..."
 msgstr "/_Конфигуриране/_Действия"
 
-#: src/mainwindow.c:765
+#: src/mainwindow.c:756
 msgid "/_Configuration/---"
 msgstr "/_Конфигуриране/---"
 
-#: src/mainwindow.c:766
+#: src/mainwindow.c:757
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Конфигуриране/_Предпочитания за текущия акаунт"
 
-#: src/mainwindow.c:768
+#: src/mainwindow.c:759
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Конфигуриране/_Създаване на нов акаунт"
 
-#: src/mainwindow.c:770
+#: src/mainwindow.c:761
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Конфигуриране/_Редактиране на акаунтите"
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:763
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Конфигуриране/С_мяна на текущия акаунт"
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:767
 msgid "/_Help/_Manual"
 msgstr "/_Помощ/_Наръчник"
 
-#: src/mainwindow.c:777
+#: src/mainwindow.c:768
 msgid "/_Help/_Manual/_English"
 msgstr "/_Помощ/_Наръчник/_Английски"
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:769
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/_Помощ/_Наръчник/_Японски"
 
-#: src/mainwindow.c:779
+#: src/mainwindow.c:770
 msgid "/_Help/_FAQ"
 msgstr "/_Помощ/_Чести въпроси"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:771
 msgid "/_Help/_FAQ/_English"
 msgstr "/_Помощ/_Чести въпроси/_Английски"
 
-#: src/mainwindow.c:781
+#: src/mainwindow.c:772
 msgid "/_Help/_FAQ/_German"
 msgstr "/_Помощ/_Чести въпроси/_Немски"
 
-#: src/mainwindow.c:782
+#: src/mainwindow.c:773
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/_Помощ/_Чести въпроси/_Испански"
 
-#: src/mainwindow.c:783
+#: src/mainwindow.c:774
 msgid "/_Help/_FAQ/_French"
 msgstr "/_Помощ/_Чести въпроси/_Френски"
 
-#: src/mainwindow.c:784
+#: src/mainwindow.c:775
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/_Помощ/_Чести въпроси/_Италиански"
 
-#: src/mainwindow.c:785
+#: src/mainwindow.c:776
 msgid "/_Help/---"
 msgstr "/_Помощ/---"
 
-#: src/mainwindow.c:825
+#: src/mainwindow.c:816
 msgid "Creating main window...\n"
 msgstr "Създаване на главен прозорец...\n"
 
-#: src/mainwindow.c:987
+#: src/mainwindow.c:973
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr ""
 
-#: src/mainwindow.c:1071 src/summaryview.c:2020 src/summaryview.c:2105
+#: src/mainwindow.c:1057 src/summaryview.c:2020 src/summaryview.c:2105
 #: src/summaryview.c:3342 src/summaryview.c:3415 src/summaryview.c:3728
 msgid "done.\n"
 msgstr "готово.\n"
 
-#: src/mainwindow.c:1196 src/mainwindow.c:1237 src/mainwindow.c:1265
+#: src/mainwindow.c:1182 src/mainwindow.c:1223 src/mainwindow.c:1251
 msgid "Untitled"
 msgstr "Неозаглавен"
 
-#: src/mainwindow.c:1266
+#: src/mainwindow.c:1252
 msgid "none"
 msgstr "липсва"
 
-#: src/mainwindow.c:1316
+#: src/mainwindow.c:1302
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "Промяна на разделението на прозореца от %d до %d\n"
 
-#: src/mainwindow.c:1536
+#: src/mainwindow.c:1522
 msgid "Offline"
 msgstr "Без достъп до мрежа"
 
-#: src/mainwindow.c:1537
+#: src/mainwindow.c:1523
 msgid "You are offline. Go online?"
 msgstr "Работите без достъп до мрежа. Желаете ли да включите мрежата?"
 
-#: src/mainwindow.c:1551
+#: src/mainwindow.c:1537
 #, fuzzy
 msgid "Empty all trash"
 msgstr "Изчистване на кошчето"
 
-#: src/mainwindow.c:1552
+#: src/mainwindow.c:1538
 #, fuzzy
 msgid "Empty messages in all trash?"
 msgstr "Желаете ли изчистване на кошчето?"
 
-#: src/mainwindow.c:1580
+#: src/mainwindow.c:1566
 msgid "Add mailbox"
 msgstr "Добавяне на пощенска кутия"
 
-#: src/mainwindow.c:1581
+#: src/mainwindow.c:1567
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3207,16 +3207,16 @@ msgstr ""
 "Ако е указана съществуваща кутия, тя ще бъде\n"
 "сканирана автоматично."
 
-#: src/mainwindow.c:1587
+#: src/mainwindow.c:1573
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Вече съществува пощенска кутия `%s'."
 
-#: src/mainwindow.c:1592 src/setup.c:57
+#: src/mainwindow.c:1578 src/setup.c:57
 msgid "Mailbox"
 msgstr "Пощенска кутия"
 
-#: src/mainwindow.c:1598 src/setup.c:63
+#: src/mainwindow.c:1584 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3225,153 +3225,153 @@ msgstr ""
 "Създаването на пощенска кутия се провали.\n"
 "Вече съществуват някакви файлове, или нямате права за запис."
 
-#: src/mainwindow.c:1989
+#: src/mainwindow.c:1975
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Изглед на папките"
 
-#: src/mainwindow.c:2009 src/messageview.c:368
+#: src/mainwindow.c:1995 src/messageview.c:368
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Изглед на съобщенията"
 
-#: src/mainwindow.c:2156 src/summaryview.c:370
+#: src/mainwindow.c:2142 src/summaryview.c:370
 msgid "/_Reply"
 msgstr "/_Отговор"
 
-#: src/mainwindow.c:2157
+#: src/mainwindow.c:2143
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "Отговаряне на всички"
 
-#: src/mainwindow.c:2158
+#: src/mainwindow.c:2144
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/Отговор _до/_подател"
 
-#: src/mainwindow.c:2159
+#: src/mainwindow.c:2145
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/Отговор _до/пощенски _списък"
 
-#: src/mainwindow.c:2164 src/summaryview.c:377
+#: src/mainwindow.c:2150 src/summaryview.c:377
 msgid "/_Forward"
 msgstr "/_Препращане"
 
-#: src/mainwindow.c:2165 src/summaryview.c:378
+#: src/mainwindow.c:2151 src/summaryview.c:378
 msgid "/For_ward as attachment"
 msgstr "/Пр_епращане като притурка"
 
-#: src/mainwindow.c:2166 src/summaryview.c:379
+#: src/mainwindow.c:2152 src/summaryview.c:379
 msgid "/Redirec_t"
 msgstr "/П_ренасочване"
 
-#: src/mainwindow.c:2205
+#: src/mainwindow.c:2188
 msgid "Get"
 msgstr "Получаване"
 
-#: src/mainwindow.c:2206
+#: src/mainwindow.c:2189
 msgid "Incorporate new mail"
 msgstr "Приемане на нова поща"
 
-#: src/mainwindow.c:2213
+#: src/mainwindow.c:2196
 msgid "Get all"
 msgstr "Получаване от всички"
 
-#: src/mainwindow.c:2214
+#: src/mainwindow.c:2197
 msgid "Incorporate new mail of all accounts"
 msgstr "Приемане на нова поща от всички акаунти"
 
-#: src/mainwindow.c:2225
+#: src/mainwindow.c:2208
 msgid "Send queued message(s)"
 msgstr "Изпращане на съобщенията в опашката"
 
-#: src/mainwindow.c:2235 src/prefs_account.c:721 src/prefs_common.c:949
+#: src/mainwindow.c:2218 src/prefs_account.c:721 src/prefs_common.c:949
 #: src/prefs_folder_item.c:137
 msgid "Compose"
 msgstr "Съставяне"
 
-#: src/mainwindow.c:2236
+#: src/mainwindow.c:2219
 msgid "Compose new message"
 msgstr "Съставяне на ново съобщение"
 
-#: src/mainwindow.c:2244 src/prefs_common.c:1448
+#: src/mainwindow.c:2227 src/prefs_common.c:1448
 msgid "Reply"
 msgstr "Отговаряне"
 
-#: src/mainwindow.c:2245 src/mainwindow.c:2258
+#: src/mainwindow.c:2228 src/mainwindow.c:2241
 msgid "Reply to the message"
 msgstr "Отговаряне на съобщение"
 
-#: src/mainwindow.c:2263
+#: src/mainwindow.c:2245
 msgid "Reply all"
 msgstr "На всички"
 
-#: src/mainwindow.c:2264
+#: src/mainwindow.c:2246
 msgid "Reply to all"
 msgstr "Отговаряне на всички"
 
-#: src/mainwindow.c:2272 src/prefs_filter_edit.c:741
+#: src/mainwindow.c:2254 src/prefs_filter_edit.c:741
 msgid "Forward"
 msgstr "Препращане"
 
-#: src/mainwindow.c:2273 src/mainwindow.c:2286
+#: src/mainwindow.c:2255 src/mainwindow.c:2268
 msgid "Forward the message"
 msgstr "Препращане на съобщението"
 
-#: src/mainwindow.c:2293
+#: src/mainwindow.c:2275
 msgid "Delete the message"
 msgstr "Изтриване на съобщението"
 
-#: src/mainwindow.c:2301 src/prefs_common.c:1988
+#: src/mainwindow.c:2283 src/prefs_common.c:1988
 msgid "Junk"
 msgstr ""
 
-#: src/mainwindow.c:2302
+#: src/mainwindow.c:2284
 #, fuzzy
 msgid "Set as junk mail"
 msgstr "Установяване като подразбиращ се"
 
-#: src/mainwindow.c:2311
+#: src/mainwindow.c:2293
 msgid "Execute"
 msgstr "Изпълняване"
 
-#: src/mainwindow.c:2312
+#: src/mainwindow.c:2294
 msgid "Execute marked process"
 msgstr "Изпълняване на маркирания процес"
 
-#: src/mainwindow.c:2322
+#: src/mainwindow.c:2304
 msgid "Next unread message"
 msgstr "Следващо непрочетено съобщение"
 
-#: src/mainwindow.c:2334
+#: src/mainwindow.c:2316
 msgid "Prefs"
 msgstr "Предпочитания"
 
-#: src/mainwindow.c:2335
+#: src/mainwindow.c:2317
 msgid "Common preferences"
 msgstr "Общи предпочитания"
 
-#: src/mainwindow.c:2343 src/prefs_folder_item.c:261
+#: src/mainwindow.c:2325 src/prefs_folder_item.c:261
 #: src/prefs_folder_item.c:272 src/progressdialog.c:128
 msgid "Account"
 msgstr "Акаунт"
 
-#: src/mainwindow.c:2344
+#: src/mainwindow.c:2326
 msgid "Account setting"
 msgstr "Конфигуриране на акаунт"
 
-#: src/mainwindow.c:2527
+#: src/mainwindow.c:2498
 msgid "You are offline. Click the icon to go online."
 msgstr "Работите без достъп до мрежа. Щракнете иконата за да включите мрежата."
 
-#: src/mainwindow.c:2538
+#: src/mainwindow.c:2509
 msgid "You are online. Click the icon to go offline."
 msgstr "Работите с достъп до мрежа. Щракнете иконата за да изключите мрежата."
 
-#: src/mainwindow.c:2731
+#: src/mainwindow.c:2702
 msgid "Exit"
 msgstr "Изход"
 
-#: src/mainwindow.c:2731
+#: src/mainwindow.c:2702
 msgid "Exit this program?"
 msgstr "Желаете ли изход от програмата?"
 
@@ -5613,11 +5613,11 @@ msgstr "Създаване на диалог на прогреса...\n"
 msgid "Status"
 msgstr "Статус"
 
-#: src/recv.c:113
+#: src/recv.c:112
 msgid "error occurred while retrieving data.\n"
 msgstr "възникна грешка при получаване на данни.\n"
 
-#: src/recv.c:155 src/recv.c:197 src/recv.c:213
+#: src/recv.c:154 src/recv.c:196 src/recv.c:211
 msgid "Can't write to file.\n"
 msgstr "Не може да се запише във файл.\n"
 
@@ -6352,7 +6352,7 @@ msgstr "%.2fMB"
 msgid "%.2fGB"
 msgstr "%.2fGB"
 
-#: src/utils.c:2372 src/utils.c:2496
+#: src/utils.c:2386 src/utils.c:2510
 #, c-format
 msgid "writing to %s failed.\n"
 msgstr "записът в %s се провали.\n"
diff --git a/po/cs.po b/po/cs.po
index 875e48cd..d4653835 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-08-09 18:08+0900\n"
+"POT-Creation-Date: 2005-08-22 17:22+0900\n"
 "PO-Revision-Date: 2003-05-30 13:31GMT+0100\n"
 "Last-Translator: Radek Vybíral <Radek.Vybiral@vsb.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -96,7 +96,7 @@ msgstr ""
 "kontrolován při volbě 'Stáhnout vše, zaškrtněte políčko ve sloupci 'G'."
 
 #: src/account.c:691 src/addressadd.c:192 src/addressbook.c:490
-#: src/compose.c:4081 src/editaddress.c:200 src/editaddress.c:942
+#: src/compose.c:4079 src/editaddress.c:200 src/editaddress.c:942
 #: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:265
 #: src/editjpilot.c:271 src/editldap.c:307 src/editvcard.c:184
 #: src/mimeview.c:201 src/prefs_filter.c:258 src/prefs_folder_item.c:170
@@ -234,7 +234,7 @@ msgstr "Argument uživatele pro akci"
 msgid "Add Address to Book"
 msgstr "Přidat adresu do databáze"
 
-#: src/addressadd.c:202 src/compose.c:4528 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4521 src/editaddress.c:201
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "Adresa"
@@ -248,7 +248,7 @@ msgstr "Poznámky"
 msgid "Select Address Book Folder"
 msgstr "Vybrat složku pro databázi adres"
 
-#: src/addressbook.c:336 src/compose.c:495 src/mainwindow.c:470
+#: src/addressbook.c:336 src/compose.c:493 src/mainwindow.c:461
 #: src/messageview.c:137
 msgid "/_File"
 msgstr "/_Soubor"
@@ -269,10 +269,10 @@ msgstr "/_Soubor/Nový _JPilot"
 msgid "/_File/New _Server"
 msgstr "/_Soubor/Nový _server"
 
-#: src/addressbook.c:345 src/addressbook.c:348 src/compose.c:500
-#: src/compose.c:505 src/compose.c:509 src/mainwindow.c:488
-#: src/mainwindow.c:491 src/mainwindow.c:493 src/mainwindow.c:496
-#: src/mainwindow.c:498 src/messageview.c:140
+#: src/addressbook.c:345 src/addressbook.c:348 src/compose.c:498
+#: src/compose.c:503 src/compose.c:507 src/mainwindow.c:479
+#: src/mainwindow.c:482 src/mainwindow.c:484 src/mainwindow.c:487
+#: src/mainwindow.c:489 src/messageview.c:140
 msgid "/_File/---"
 msgstr "/_Soubor/---"
 
@@ -288,7 +288,7 @@ msgstr "/_Soubor/_Smazat"
 msgid "/_File/_Save"
 msgstr "/_Soubor/_Uložit"
 
-#: src/addressbook.c:350 src/compose.c:510 src/messageview.c:141
+#: src/addressbook.c:350 src/compose.c:508 src/messageview.c:141
 msgid "/_File/_Close"
 msgstr "/_Soubor/_Zavřít"
 
@@ -320,7 +320,7 @@ msgstr "/_Adresa/U_pravit"
 msgid "/_Address/_Delete"
 msgstr "/_Adresa/S_mazat"
 
-#: src/addressbook.c:358 src/compose.c:619 src/mainwindow.c:725
+#: src/addressbook.c:358 src/compose.c:617 src/mainwindow.c:716
 #: src/messageview.c:256
 msgid "/_Tools"
 msgstr "/_Nástroje"
@@ -329,12 +329,12 @@ msgstr "/_Nástroje"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Nástroje/Importovat _LDIF soubor"
 
-#: src/addressbook.c:360 src/compose.c:632 src/mainwindow.c:775
+#: src/addressbook.c:360 src/compose.c:630 src/mainwindow.c:766
 #: src/messageview.c:274
 msgid "/_Help"
 msgstr "/Nápo_věda"
 
-#: src/addressbook.c:361 src/compose.c:633 src/mainwindow.c:786
+#: src/addressbook.c:361 src/compose.c:631 src/mainwindow.c:777
 #: src/messageview.c:275
 msgid "/_Help/_About"
 msgstr "/Nápo_věda/_O aplikaci"
@@ -351,7 +351,7 @@ msgstr "/Nová _skupina"
 msgid "/New _Folder"
 msgstr "/Nová s_ložka"
 
-#: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:489
+#: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:487
 #: src/folderview.c:235 src/folderview.c:237 src/folderview.c:241
 #: src/folderview.c:252 src/folderview.c:254 src/folderview.c:256
 #: src/folderview.c:260 src/folderview.c:270 src/folderview.c:272
@@ -361,8 +361,8 @@ msgstr "/Nová s_ložka"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:512
-#: src/mainwindow.c:502 src/messageview.c:143
+#: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:510
+#: src/mainwindow.c:493 src/messageview.c:143
 msgid "/_Edit"
 msgstr "/Úp_ravy"
 
@@ -374,7 +374,7 @@ msgstr "/_Smazat"
 msgid "E-Mail address"
 msgstr "E-mail adresa"
 
-#: src/addressbook.c:495 src/compose.c:4529 src/prefs_common.c:2402
+#: src/addressbook.c:495 src/compose.c:4522 src/prefs_common.c:2402
 msgid "Address book"
 msgstr "Databáze adres"
 
@@ -383,8 +383,8 @@ msgid "Name:"
 msgstr "Jméno:"
 
 #. Buttons
-#: src/addressbook.c:627 src/addressbook.c:1673 src/editaddress.c:884
-#: src/editaddress.c:1017 src/mainwindow.c:2292 src/prefs_actions.c:266
+#: src/addressbook.c:627 src/addressbook.c:1674 src/editaddress.c:884
+#: src/editaddress.c:1017 src/mainwindow.c:2274 src/prefs_actions.c:266
 #: src/prefs_display_header.c:278 src/prefs_display_header.c:333
 #: src/prefs_template.c:231
 msgid "Delete"
@@ -423,7 +423,7 @@ msgstr "Smazat adresu(y)"
 msgid "Really delete the address(es)?"
 msgstr "Opravdu chcete smazat tuto adresu(y)?"
 
-#: src/addressbook.c:1664
+#: src/addressbook.c:1665
 #, fuzzy, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -432,38 +432,38 @@ msgstr ""
 "Chcete smazat složku '%s' A TAKÉ všechny adresy v ní? \n"
 "Pokud smažete pouze složku, adresy budou přesunuty do nadřazené složky."
 
-#: src/addressbook.c:1667 src/folderview.c:2139
+#: src/addressbook.c:1668 src/folderview.c:2139
 msgid "Delete folder"
 msgstr "Smazat složku "
 
-#: src/addressbook.c:1667
+#: src/addressbook.c:1668
 #, fuzzy
 msgid "_Folder only"
 msgstr "Pouze složku"
 
-#: src/addressbook.c:1667
+#: src/addressbook.c:1668
 #, fuzzy
 msgid "Folder and _addresses"
 msgstr "Složku a adresy"
 
-#: src/addressbook.c:1672
+#: src/addressbook.c:1673
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Opravdu smazat '%s' ?"
 
-#: src/addressbook.c:2352 src/addressbook.c:2485
+#: src/addressbook.c:2353 src/addressbook.c:2486
 msgid "New user, could not save index file."
 msgstr "Nový uživatel, nelze uložit index soubor."
 
-#: src/addressbook.c:2356 src/addressbook.c:2489
+#: src/addressbook.c:2357 src/addressbook.c:2490
 msgid "New user, could not save address book files."
 msgstr "Nový uživatel, nelze uložit soubory s databází adres."
 
-#: src/addressbook.c:2366 src/addressbook.c:2499
+#: src/addressbook.c:2367 src/addressbook.c:2500
 msgid "Old address book converted successfully."
 msgstr "Konverze staré databáze adres proběhla úspěšně."
 
-#: src/addressbook.c:2371
+#: src/addressbook.c:2372
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -471,7 +471,7 @@ msgstr ""
 "Stará databáze adres převedena,\n"
 "nelze uložit nový soubor s indexem"
 
-#: src/addressbook.c:2384
+#: src/addressbook.c:2385
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -479,7 +479,7 @@ msgstr ""
 "Nelze provést konverzi databáze adres,\n"
 "ale byl vytvořen nový soubor pro databázi adres."
 
-#: src/addressbook.c:2390
+#: src/addressbook.c:2391
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -487,7 +487,7 @@ msgstr ""
 "Nelze provést konverzi databáze adres,\n"
 "nelze ani vytvořit nové soubory databáze adres."
 
-#: src/addressbook.c:2395
+#: src/addressbook.c:2396
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -495,89 +495,89 @@ msgstr ""
 "Nelze provést konverzi databáze adres\n"
 "a nelze ani vytvořit nové soubory databáze adres."
 
-#: src/addressbook.c:2402
+#: src/addressbook.c:2403
 msgid "Addressbook conversion error"
 msgstr "Chyba při konverzi databáze adres"
 
-#: src/addressbook.c:2406
+#: src/addressbook.c:2407
 msgid "Addressbook conversion"
 msgstr "Konverze databáze adres"
 
-#: src/addressbook.c:2441
+#: src/addressbook.c:2442
 msgid "Addressbook Error"
 msgstr "Chyba v databázi adres"
 
-#: src/addressbook.c:2442 src/addressbook.c:2542
+#: src/addressbook.c:2443 src/addressbook.c:2543
 msgid "Could not read address index"
 msgstr "Nelze načíst index adres"
 
-#: src/addressbook.c:2504
+#: src/addressbook.c:2505
 msgid "Old address book converted, could not save new address index file"
 msgstr "Stará databáze adres převedena, nelze uložit nový soubor s indexem"
 
-#: src/addressbook.c:2518
+#: src/addressbook.c:2519
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr ""
 "Nelze provést konverzi databázi adres, byl vytvořen nový soubor pro databázi "
 "adres."
 
-#: src/addressbook.c:2524
+#: src/addressbook.c:2525
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr ""
 "Nelze provést konverzi databáze adres, nelze ani vytvořit nové soubory "
 "databáze."
 
-#: src/addressbook.c:2530
+#: src/addressbook.c:2531
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr ""
 "Nelze provést konverzi databáze adres a nelze ani vytvořit nové soubory pro "
 "databázi."
 
-#: src/addressbook.c:2548
+#: src/addressbook.c:2549
 msgid "Addressbook Conversion Error"
 msgstr "Chyba při konverzi databáze adres"
 
-#: src/addressbook.c:2554
+#: src/addressbook.c:2555
 msgid "Addressbook Conversion"
 msgstr "Konverze databáze adres"
 
-#: src/addressbook.c:3055 src/prefs_common.c:963
+#: src/addressbook.c:3056 src/prefs_common.c:963
 msgid "Interface"
 msgstr "Rozhraní"
 
-#: src/addressbook.c:3071 src/importldif.c:514
+#: src/addressbook.c:3072 src/importldif.c:514
 msgid "Address Book"
 msgstr "Databáze adres"
 
-#: src/addressbook.c:3087
+#: src/addressbook.c:3088
 msgid "Person"
 msgstr "Osoba"
 
-#: src/addressbook.c:3103
+#: src/addressbook.c:3104
 msgid "EMail Address"
 msgstr "Email adresa"
 
-#: src/addressbook.c:3119
+#: src/addressbook.c:3120
 msgid "Group"
 msgstr "Skupina"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3135 src/folderview.c:346 src/prefs_account.c:1866
+#: src/addressbook.c:3136 src/folderview.c:346 src/prefs_account.c:1866
 msgid "Folder"
 msgstr "Složka"
 
-#: src/addressbook.c:3151
+#: src/addressbook.c:3152
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3167 src/addressbook.c:3183
+#: src/addressbook.c:3168 src/addressbook.c:3184
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3199
+#: src/addressbook.c:3200
 msgid "LDAP Server"
 msgstr "LDAP server"
 
@@ -589,7 +589,7 @@ msgstr "Společná adresa"
 msgid "Personal address"
 msgstr "Osobní adresa"
 
-#: src/alertpanel.c:138 src/compose.c:5214 src/main.c:515
+#: src/alertpanel.c:138 src/compose.c:5208 src/main.c:515
 msgid "Notice"
 msgstr "Poznámka"
 
@@ -644,381 +644,381 @@ msgstr "Hnědá"
 msgid "None"
 msgstr "Žádná"
 
-#: src/compose.c:487
+#: src/compose.c:485
 msgid "/_Add..."
 msgstr "/_Přidat..."
 
-#: src/compose.c:488
+#: src/compose.c:486
 msgid "/_Remove"
 msgstr "/_Odstranit"
 
-#: src/compose.c:490 src/folderview.c:243 src/folderview.c:262
+#: src/compose.c:488 src/folderview.c:243 src/folderview.c:262
 #: src/folderview.c:277
 msgid "/_Properties..."
 msgstr "/_Vlastnosti..."
 
-#: src/compose.c:496
+#: src/compose.c:494
 #, fuzzy
 msgid "/_File/_Send"
 msgstr "/_Soubor/_Uložit"
 
-#: src/compose.c:498
+#: src/compose.c:496
 #, fuzzy
 msgid "/_File/Send _later"
 msgstr "/_Zpráva/Poslat p_ozději"
 
-#: src/compose.c:501
+#: src/compose.c:499
 #, fuzzy
 msgid "/_File/Save to _draft folder"
 msgstr "/_Zpráva/Uložit jako _koncept"
 
-#: src/compose.c:503
+#: src/compose.c:501
 #, fuzzy
 msgid "/_File/Save and _keep editing"
 msgstr "/_Zpráva/Uložit a pok_račovat v editaci"
 
-#: src/compose.c:506
+#: src/compose.c:504
 msgid "/_File/_Attach file"
 msgstr "/_Soubor/_Připojit soubor"
 
-#: src/compose.c:507
+#: src/compose.c:505
 msgid "/_File/_Insert file"
 msgstr "/_Soubor/_Vložit soubor"
 
-#: src/compose.c:508
+#: src/compose.c:506
 msgid "/_File/Insert si_gnature"
 msgstr "/_Soubor/Vložit p_odpis"
 
-#: src/compose.c:513
+#: src/compose.c:511
 msgid "/_Edit/_Undo"
 msgstr "/Úp_ravy/_Zpět"
 
-#: src/compose.c:514
+#: src/compose.c:512
 msgid "/_Edit/_Redo"
 msgstr "/Úp_ravy/Z_nova"
 
-#: src/compose.c:515 src/compose.c:522 src/mainwindow.c:506
+#: src/compose.c:513 src/compose.c:520 src/mainwindow.c:497
 #: src/messageview.c:146
 msgid "/_Edit/---"
 msgstr "/Úp_ravy/---"
 
-#: src/compose.c:516
+#: src/compose.c:514
 msgid "/_Edit/Cu_t"
 msgstr "/Úp_ravy/_Vyjmout"
 
-#: src/compose.c:517 src/mainwindow.c:503 src/messageview.c:144
+#: src/compose.c:515 src/mainwindow.c:494 src/messageview.c:144
 msgid "/_Edit/_Copy"
 msgstr "/Úp_ravy/_Kopírovat"
 
-#: src/compose.c:518
+#: src/compose.c:516
 msgid "/_Edit/_Paste"
 msgstr "/Úp_ravy/V_ložit"
 
-#: src/compose.c:519
+#: src/compose.c:517
 msgid "/_Edit/Paste as _quotation"
 msgstr "/Úp_ravy/Vložit jako _citaci"
 
-#: src/compose.c:521 src/mainwindow.c:504 src/messageview.c:145
+#: src/compose.c:519 src/mainwindow.c:495 src/messageview.c:145
 msgid "/_Edit/Select _all"
 msgstr "/Úp_ravy/Vybr_at vše"
 
-#: src/compose.c:523
+#: src/compose.c:521
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/Úp_ravy/_Zarovnat aktuální odstavec"
 
-#: src/compose.c:525
+#: src/compose.c:523
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/Úp_ravy/Zarovnat _všechny dlouhá řádky"
 
-#: src/compose.c:527
+#: src/compose.c:525
 #, fuzzy
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/Úp_ravy/_Kopírovat"
 
-#: src/compose.c:528 src/mainwindow.c:511 src/messageview.c:150
+#: src/compose.c:526 src/mainwindow.c:502 src/messageview.c:150
 #: src/summaryview.c:400
 msgid "/_View"
 msgstr "/Z_obrazit"
 
-#: src/compose.c:529
+#: src/compose.c:527
 msgid "/_View/_To"
 msgstr "/Z_obrazit/_Komu"
 
-#: src/compose.c:530
+#: src/compose.c:528
 msgid "/_View/_Cc"
 msgstr "/Z_obrazit/K_opie"
 
-#: src/compose.c:531
+#: src/compose.c:529
 msgid "/_View/_Bcc"
 msgstr "/Z_obrazit/_Slepá kopie"
 
-#: src/compose.c:532
+#: src/compose.c:530
 msgid "/_View/_Reply to"
 msgstr "/Z_obrazit/_Odpověď komu "
 
-#: src/compose.c:533 src/compose.c:535 src/compose.c:537 src/compose.c:539
-#: src/mainwindow.c:529 src/mainwindow.c:532 src/mainwindow.c:558
-#: src/mainwindow.c:582 src/mainwindow.c:675 src/mainwindow.c:679
+#: src/compose.c:531 src/compose.c:533 src/compose.c:535 src/compose.c:537
+#: src/mainwindow.c:520 src/mainwindow.c:523 src/mainwindow.c:549
+#: src/mainwindow.c:573 src/mainwindow.c:666 src/mainwindow.c:670
 #: src/messageview.c:233
 msgid "/_View/---"
 msgstr "/Z_obrazit/---"
 
-#: src/compose.c:534
+#: src/compose.c:532
 msgid "/_View/_Followup to"
 msgstr "/Z_obrazit/_Předat"
 
-#: src/compose.c:536
+#: src/compose.c:534
 msgid "/_View/R_uler"
 msgstr "/Z_obrazit/Praví_tko"
 
-#: src/compose.c:538
+#: src/compose.c:536
 msgid "/_View/_Attachment"
 msgstr "/Z_obrazit/Přílo_ha"
 
-#: src/compose.c:545 src/mainwindow.c:589 src/messageview.c:157
+#: src/compose.c:543 src/mainwindow.c:580 src/messageview.c:157
 #, fuzzy
 msgid "/_View/Character _encoding"
 msgstr "/Z_obrazit/Setříd_it/Sestupně"
 
-#: src/compose.c:546
+#: src/compose.c:544
 msgid "/_View/Character _encoding/_Automatic"
 msgstr ""
 
-#: src/compose.c:548 src/compose.c:554 src/compose.c:560 src/compose.c:564
-#: src/compose.c:570 src/compose.c:574 src/compose.c:580 src/compose.c:584
-#: src/compose.c:594 src/compose.c:598 src/compose.c:608 src/compose.c:612
-#: src/mainwindow.c:585 src/mainwindow.c:592 src/messageview.c:153
+#: src/compose.c:546 src/compose.c:552 src/compose.c:558 src/compose.c:562
+#: src/compose.c:568 src/compose.c:572 src/compose.c:578 src/compose.c:582
+#: src/compose.c:592 src/compose.c:596 src/compose.c:606 src/compose.c:610
+#: src/mainwindow.c:576 src/mainwindow.c:583 src/messageview.c:153
 #, fuzzy
 msgid "/_View/Character _encoding/---"
 msgstr "/Z_obrazit/Setříd_it/Sestupně"
 
-#: src/compose.c:550 src/mainwindow.c:593 src/messageview.c:161
+#: src/compose.c:548 src/mainwindow.c:584 src/messageview.c:161
 #, fuzzy
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/Z_obrazit/_Znaková sada/7bitová ascii (US-ASC_II)"
 
-#: src/compose.c:552 src/mainwindow.c:595 src/messageview.c:164
+#: src/compose.c:550 src/mainwindow.c:586 src/messageview.c:164
 #, fuzzy
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/Z_obrazit/_Znaková sada/Unicode (_UTF-8)"
 
-#: src/compose.c:556 src/mainwindow.c:599 src/messageview.c:167
+#: src/compose.c:554 src/mainwindow.c:590 src/messageview.c:167
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/Z_obrazit/_Znaková sada/Západní Evropa (ISO-8859-_1)"
 
-#: src/compose.c:558 src/mainwindow.c:601 src/messageview.c:169
+#: src/compose.c:556 src/mainwindow.c:592 src/messageview.c:169
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/Z_obrazit/_Znaková sada/Západní Evropa (ISO-8859-15)"
 
-#: src/compose.c:562 src/mainwindow.c:605 src/messageview.c:172
+#: src/compose.c:560 src/mainwindow.c:596 src/messageview.c:172
 #, fuzzy
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/Z_obrazit/_Znaková sada/Střední Evropa (ISO-8859-_2)"
 
-#: src/compose.c:566 src/mainwindow.c:609 src/messageview.c:175
+#: src/compose.c:564 src/mainwindow.c:600 src/messageview.c:175
 #, fuzzy
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/Z_obrazit/_Znaková sada/_Baltská (ISO-8859-13)"
 
-#: src/compose.c:568 src/mainwindow.c:611 src/messageview.c:177
+#: src/compose.c:566 src/mainwindow.c:602 src/messageview.c:177
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/Z_obrazit/_Znaková sada/Baltská (ISO-8859-_4)"
 
-#: src/compose.c:572 src/mainwindow.c:615 src/messageview.c:180
+#: src/compose.c:570 src/mainwindow.c:606 src/messageview.c:180
 #, fuzzy
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/Z_obrazit/_Znaková sada/Řecká (ISO-8859-_7)"
 
-#: src/compose.c:576 src/mainwindow.c:619 src/messageview.c:183
+#: src/compose.c:574 src/mainwindow.c:610 src/messageview.c:183
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/Z_obrazit/_Znaková sada/Řecká (ISO-8859-_7)"
 
-#: src/compose.c:578 src/mainwindow.c:621 src/messageview.c:185
+#: src/compose.c:576 src/mainwindow.c:612 src/messageview.c:185
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/Z_obrazit/_Znaková sada/Azbuka (Windows-1251)"
 
-#: src/compose.c:582 src/mainwindow.c:625 src/messageview.c:188
+#: src/compose.c:580 src/mainwindow.c:616 src/messageview.c:188
 #, fuzzy
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/Z_obrazit/_Znaková sada/Turecká (ISO-8859-_9)"
 
-#: src/compose.c:586 src/mainwindow.c:629 src/messageview.c:191
+#: src/compose.c:584 src/mainwindow.c:620 src/messageview.c:191
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/Z_obrazit/_Znaková sada/Azbuka (ISO-8859-_5)"
 
-#: src/compose.c:588 src/mainwindow.c:631 src/messageview.c:193
+#: src/compose.c:586 src/mainwindow.c:622 src/messageview.c:193
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/Z_obrazit/_Znaková sada/Azbuka (KOI8-_R)"
 
-#: src/compose.c:590 src/mainwindow.c:633 src/messageview.c:195
+#: src/compose.c:588 src/mainwindow.c:624 src/messageview.c:195
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/Z_obrazit/_Znaková sada/Azbuka (KOI8-_R)"
 
-#: src/compose.c:592 src/mainwindow.c:635 src/messageview.c:197
+#: src/compose.c:590 src/mainwindow.c:626 src/messageview.c:197
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/Z_obrazit/_Znaková sada/Azbuka (Windows-1251)"
 
-#: src/compose.c:596 src/mainwindow.c:639 src/messageview.c:200
+#: src/compose.c:594 src/mainwindow.c:630 src/messageview.c:200
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/Z_obrazit/_Znaková sada/Japonská (ISO-2022-_JP)"
 
-#: src/compose.c:600 src/mainwindow.c:649 src/messageview.c:209
+#: src/compose.c:598 src/mainwindow.c:640 src/messageview.c:209
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/Z_obrazit/_Znaková sada/Zjednodušená čínská (_GB2312)"
 
-#: src/compose.c:602 src/mainwindow.c:651 src/messageview.c:211
+#: src/compose.c:600 src/mainwindow.c:642 src/messageview.c:211
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/Z_obrazit/_Znaková sada/Zjednodušená čínská (_GB2312)"
 
-#: src/compose.c:604 src/mainwindow.c:653 src/messageview.c:213
+#: src/compose.c:602 src/mainwindow.c:644 src/messageview.c:213
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/Z_obrazit/_Znaková sada/Tradiční čínská (_Big5)"
 
-#: src/compose.c:606 src/mainwindow.c:655 src/messageview.c:215
+#: src/compose.c:604 src/mainwindow.c:646 src/messageview.c:215
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/Z_obrazit/_Znaková sada/Tradiční čínská (EUC-_TW)"
 
-#: src/compose.c:610 src/mainwindow.c:661 src/messageview.c:220
+#: src/compose.c:608 src/mainwindow.c:652 src/messageview.c:220
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/Z_obrazit/_Znaková sada/Korejská (EUC-_KR)"
 
-#: src/compose.c:614 src/mainwindow.c:667 src/messageview.c:225
+#: src/compose.c:612 src/mainwindow.c:658 src/messageview.c:225
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/Z_obrazit/_Znaková sada/Thajská (TIS-620)"
 
-#: src/compose.c:616 src/mainwindow.c:669 src/messageview.c:227
+#: src/compose.c:614 src/mainwindow.c:660 src/messageview.c:227
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/Z_obrazit/_Znaková sada/Thajská (Windows-874)"
 
-#: src/compose.c:620 src/mainwindow.c:726 src/messageview.c:257
+#: src/compose.c:618 src/mainwindow.c:717 src/messageview.c:257
 msgid "/_Tools/_Address book"
 msgstr "/_Nástroje/_Databáze adres"
 
-#: src/compose.c:621
+#: src/compose.c:619
 msgid "/_Tools/_Template"
 msgstr "/_Nástroje/Ša_blona"
 
-#: src/compose.c:622 src/mainwindow.c:749 src/messageview.c:272
+#: src/compose.c:620 src/mainwindow.c:740 src/messageview.c:272
 msgid "/_Tools/Actio_ns"
 msgstr "/_Nástroje/_Akce"
 
-#: src/compose.c:623 src/compose.c:627 src/mainwindow.c:729
-#: src/mainwindow.c:743 src/mainwindow.c:748 src/mainwindow.c:750
-#: src/mainwindow.c:753 src/mainwindow.c:755 src/messageview.c:260
+#: src/compose.c:621 src/compose.c:625 src/mainwindow.c:720
+#: src/mainwindow.c:734 src/mainwindow.c:739 src/mainwindow.c:741
+#: src/mainwindow.c:744 src/mainwindow.c:746 src/messageview.c:260
 #: src/messageview.c:271
 msgid "/_Tools/---"
 msgstr "/_Nástroje/---"
 
-#: src/compose.c:624
+#: src/compose.c:622
 #, fuzzy
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/Úp_ravy/Upravit pomocí e_xterního editoru"
 
-#: src/compose.c:628
+#: src/compose.c:626
 #, fuzzy
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Nástroje/_Akce"
 
-#: src/compose.c:629
+#: src/compose.c:627
 #, fuzzy
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/_Zpráva/Zaši_frovat"
 
-#: src/compose.c:855
+#: src/compose.c:853
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: soubor neexistuje\n"
 
-#: src/compose.c:954 src/compose.c:1024 src/procmsg.c:1353
+#: src/compose.c:952 src/compose.c:1022 src/procmsg.c:1353
 msgid "Can't get text part\n"
 msgstr "Nelze získat část textu\n"
 
-#: src/compose.c:1420
+#: src/compose.c:1418
 msgid "Quote mark format error."
 msgstr "Chyba v uvozovkách."
 
-#: src/compose.c:1432
+#: src/compose.c:1430
 msgid "Message reply/forward format error."
 msgstr "Chyba formátu odpovědi/přeposlání."
 
-#: src/compose.c:1801
+#: src/compose.c:1799
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Soubor %s neexistuje\n"
 
-#: src/compose.c:1805
+#: src/compose.c:1803
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Nemohu zjistit délku souboru %s\n"
 
-#: src/compose.c:1809
+#: src/compose.c:1807
 #, c-format
 msgid "File %s is empty."
 msgstr "Soubor %s je prázdný."
 
-#: src/compose.c:1813
+#: src/compose.c:1811
 #, c-format
 msgid "Can't read %s."
 msgstr "Nemohu načíst %s."
 
-#: src/compose.c:1848
+#: src/compose.c:1846
 #, c-format
 msgid "Message: %s"
 msgstr "Zpráva: %s"
 
-#: src/compose.c:1920 src/mimeview.c:560
+#: src/compose.c:1918 src/mimeview.c:560
 msgid "Can't get the part of multipart message."
 msgstr "Nemohu získat část z mnohačásťové zprávy."
 
-#: src/compose.c:2362
+#: src/compose.c:2360
 msgid " [Edited]"
 msgstr " [Upraveno]"
 
-#: src/compose.c:2364
+#: src/compose.c:2362
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Psaní zprávy%s"
 
-#: src/compose.c:2367
+#: src/compose.c:2365
 #, c-format
 msgid "Compose message%s"
 msgstr "Psaní zprávy%s"
 
-#: src/compose.c:2478
+#: src/compose.c:2476
 msgid "Recipient is not specified."
 msgstr "Není uveden příjemce."
 
-#: src/compose.c:2486
+#: src/compose.c:2484
 #, fuzzy
 msgid "Empty subject"
 msgstr "Předmět"
 
-#: src/compose.c:2487
+#: src/compose.c:2485
 msgid "Subject is empty. Send it anyway?"
 msgstr "Předmět je prázdný. Přesto mám zprávu odeslat?"
 
-#: src/compose.c:2538
+#: src/compose.c:2536
 msgid "can't get recipient list."
 msgstr "Nelze načíst seznam příjemců."
 
-#: src/compose.c:2558
+#: src/compose.c:2556
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1026,26 +1026,26 @@ msgstr ""
 "Není zadán účet pro odesílání mailů.\n"
 "Před odesláním vyberte prosím nějaký účet."
 
-#: src/compose.c:2572 src/send_message.c:297
+#: src/compose.c:2570 src/send_message.c:297
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Vyskytla se chyba při posílání zprávy na %s ."
 
-#: src/compose.c:2595
+#: src/compose.c:2593
 msgid "Can't save the message to outbox."
 msgstr "Zprávu nelze uložit do odeslané pošty."
 
-#: src/compose.c:2645
+#: src/compose.c:2643
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "Nemohu najít žádný klíč asociovaný s aktuálně vybraným id klíče '%s'."
 
-#: src/compose.c:2709 src/compose.c:2965 src/compose.c:3028 src/compose.c:3148
-#: src/utils.c:2365
+#: src/compose.c:2707 src/compose.c:2963 src/compose.c:3026 src/compose.c:3146
+#: src/utils.c:2379
 msgid "can't change file mode\n"
 msgstr "nelze změnit mód souboru\n"
 
-#: src/compose.c:2741
+#: src/compose.c:2739
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1056,12 +1056,12 @@ msgstr ""
 "%s na %s.\n"
 "Přesto poslat?"
 
-#: src/compose.c:2747
+#: src/compose.c:2745
 #, fuzzy
 msgid "Code conversion error"
 msgstr "Chyba při konverzi databáze adres"
 
-#: src/compose.c:2816
+#: src/compose.c:2814
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1070,155 +1070,155 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:2820
+#: src/compose.c:2818
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3108
+#: src/compose.c:3106
 msgid "can't remove the old message\n"
 msgstr "nelze smazat staré zprávy\n"
 
-#: src/compose.c:3126
+#: src/compose.c:3124
 msgid "queueing message...\n"
 msgstr "zařazuji zprávu...\n"
 
-#: src/compose.c:3208
+#: src/compose.c:3206
 msgid "can't find queue folder\n"
 msgstr "nelze najít složku s frontou zpráv\n"
 
-#: src/compose.c:3215
+#: src/compose.c:3213
 msgid "can't queue the message\n"
 msgstr "Zprávu nelze zařadit\n"
 
-#: src/compose.c:3792
+#: src/compose.c:3790
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "vytvářím číslo zprávy: %s\n"
 
-#: src/compose.c:3901
+#: src/compose.c:3899
 msgid "Creating compose window...\n"
 msgstr "Vytvářím okno pro psaní...\n"
 
-#: src/compose.c:3949 src/headerview.c:54 src/summary_search.c:214
+#: src/compose.c:3947 src/headerview.c:54 src/summary_search.c:214
 msgid "From:"
 msgstr "Od:"
 
-#: src/compose.c:4021
+#: src/compose.c:4019
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/_Nástroje/_Akce"
 
-#: src/compose.c:4024
+#: src/compose.c:4022
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/_Zpráva/Zaši_frovat"
 
-#: src/compose.c:4062 src/compose.c:5001
+#: src/compose.c:4060 src/compose.c:4995
 msgid "MIME type"
 msgstr "MIME typ"
 
 #. S_COL_DATE
-#: src/compose.c:4071 src/mimeview.c:192 src/prefs_filter_edit.c:585
+#: src/compose.c:4069 src/mimeview.c:192 src/prefs_filter_edit.c:585
 #: src/prefs_summary_column.c:75 src/select-keys.c:317 src/summaryview.c:4217
 msgid "Size"
 msgstr "Délka"
 
-#: src/compose.c:4449 src/mainwindow.c:2224 src/prefs_account.c:719
+#: src/compose.c:4442 src/mainwindow.c:2207 src/prefs_account.c:719
 #: src/prefs_common.c:947
 msgid "Send"
 msgstr "Odeslat"
 
-#: src/compose.c:4450
+#: src/compose.c:4443
 msgid "Send message"
 msgstr "Odešle zprávu"
 
-#: src/compose.c:4458
+#: src/compose.c:4451
 msgid "Send later"
 msgstr "Poslat později"
 
-#: src/compose.c:4459
+#: src/compose.c:4452
 msgid "Put into queue folder and send later"
 msgstr "Zařadí do výstupní fronty a odešle později"
 
-#: src/compose.c:4467
+#: src/compose.c:4460
 msgid "Draft"
 msgstr "Koncept"
 
-#: src/compose.c:4468
+#: src/compose.c:4461
 msgid "Save to draft folder"
 msgstr "Uloží koncept do složky"
 
-#: src/compose.c:4478
+#: src/compose.c:4471
 msgid "Insert"
 msgstr "Vložit"
 
-#: src/compose.c:4479
+#: src/compose.c:4472
 msgid "Insert file"
 msgstr "Vloží soubor"
 
-#: src/compose.c:4487
+#: src/compose.c:4480
 msgid "Attach"
 msgstr "Příloha"
 
-#: src/compose.c:4488
+#: src/compose.c:4481
 msgid "Attach file"
 msgstr "Připojí soubor"
 
 #. signature
-#: src/compose.c:4498 src/prefs_account.c:1391 src/prefs_common.c:1356
+#: src/compose.c:4491 src/prefs_account.c:1391 src/prefs_common.c:1356
 msgid "Signature"
 msgstr "Podpis"
 
-#: src/compose.c:4499
+#: src/compose.c:4492
 msgid "Insert signature"
 msgstr "Vloží podpis"
 
-#: src/compose.c:4508 src/prefs_common.c:1378 src/prefs_common.c:2382
+#: src/compose.c:4501 src/prefs_common.c:1378 src/prefs_common.c:2382
 msgid "Editor"
 msgstr "Editor"
 
-#: src/compose.c:4509
+#: src/compose.c:4502
 msgid "Edit with external editor"
 msgstr "Úprava externím editorem"
 
-#: src/compose.c:4517
+#: src/compose.c:4510
 msgid "Linewrap"
 msgstr "Zarovnání"
 
-#: src/compose.c:4518
+#: src/compose.c:4511
 msgid "Wrap all long lines"
 msgstr "Zarovnání dlouhých řádků"
 
-#: src/compose.c:4897
+#: src/compose.c:4891
 msgid "Invalid MIME type."
 msgstr "Neplatný MIME typ."
 
-#: src/compose.c:4915
+#: src/compose.c:4909
 msgid "File doesn't exist or is empty."
 msgstr "Soubor neexistuje nebo je prázdný."
 
-#: src/compose.c:4983
+#: src/compose.c:4977
 msgid "Properties"
 msgstr "Vlastnosti"
 
-#: src/compose.c:5003
+#: src/compose.c:4997
 msgid "Encoding"
 msgstr "Kódování"
 
-#: src/compose.c:5026 src/prefs_folder_item.c:183
+#: src/compose.c:5020 src/prefs_folder_item.c:183
 msgid "Path"
 msgstr "Cesta k souboru"
 
-#: src/compose.c:5027
+#: src/compose.c:5021
 msgid "File name"
 msgstr "Název souboru"
 
-#: src/compose.c:5185
+#: src/compose.c:5179
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Špatný příkaz v externím editoru: '%s'\n"
 
-#: src/compose.c:5211
+#: src/compose.c:5205
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1229,75 +1229,75 @@ msgstr ""
 "Mám přerušit proces?\n"
 "číslo procesu: %d"
 
-#: src/compose.c:5228
+#: src/compose.c:5222
 #, c-format
 msgid "Terminated process group id: %d"
 msgstr "Přerušen proces číslo: %d"
 
-#: src/compose.c:5229
+#: src/compose.c:5223
 #, c-format
 msgid "Temporary file: %s"
 msgstr "Dočasný soubor: %s"
 
-#: src/compose.c:5253
+#: src/compose.c:5247
 msgid "Compose: input from monitoring process\n"
 msgstr "Psaní: vstup z externího procesu\n"
 
 #. failed
-#: src/compose.c:5284
+#: src/compose.c:5278
 msgid "Couldn't exec external editor\n"
 msgstr "Nelze spustit externí editor\n"
 
-#: src/compose.c:5288
+#: src/compose.c:5282
 msgid "Couldn't write to file\n"
 msgstr "Nelze zapisovat do souboru\n"
 
-#: src/compose.c:5290
+#: src/compose.c:5284
 msgid "Pipe read failed\n"
 msgstr "Nelze číst\n"
 
-#: src/compose.c:5596 src/compose.c:5604 src/compose.c:5610
+#: src/compose.c:5590 src/compose.c:5598 src/compose.c:5604
 msgid "Can't queue the message."
 msgstr "Zprávu nelze zařadit."
 
-#: src/compose.c:5701
+#: src/compose.c:5695
 #, fuzzy
 msgid "Select files"
 msgstr "Vybrat soubor"
 
-#: src/compose.c:5723
+#: src/compose.c:5717
 msgid "Select file"
 msgstr "Vybrat soubor"
 
-#: src/compose.c:5760
+#: src/compose.c:5754
 #, fuzzy
 msgid "Save message"
 msgstr "Odešle zprávu"
 
-#: src/compose.c:5761
+#: src/compose.c:5755
 #, 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:5763
+#: src/compose.c:5757
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:5805
+#: src/compose.c:5799
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Opravdu chcete použít šablonu '%s' ?"
 
-#: src/compose.c:5807
+#: src/compose.c:5801
 msgid "Apply template"
 msgstr "Přidat šablonu"
 
-#: src/compose.c:5808
+#: src/compose.c:5802
 #, fuzzy
 msgid "_Replace"
 msgstr "Nahradit"
 
-#: src/compose.c:5808
+#: src/compose.c:5802
 #, fuzzy
 msgid "_Insert"
 msgstr "Vložit"
@@ -1745,12 +1745,12 @@ msgstr "Nastavuji informace o složce...\n"
 msgid "Setting folder info..."
 msgstr "Nastavuji informace o složce..."
 
-#: src/folderview.c:805 src/mainwindow.c:3301 src/setup.c:81
+#: src/folderview.c:805 src/mainwindow.c:3272 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Prohledávám složku %s%c%s ..."
 
-#: src/folderview.c:809 src/mainwindow.c:3306 src/setup.c:86
+#: src/folderview.c:809 src/mainwindow.c:3277 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Prohledávám složku %s ..."
@@ -2075,45 +2075,45 @@ msgstr "Autentikace selhala."
 msgid "IMAP4 login failed.\n"
 msgstr "Neúspěšné přihlášení k IMAP4.\n"
 
-#: src/imap.c:3522
+#: src/imap.c:3528
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "Nemohu přidat %s do %s\n"
 
-#: src/imap.c:3529
+#: src/imap.c:3535
 msgid "(sending file...)"
 msgstr "(posílám soubor...)"
 
-#: src/imap.c:3557
+#: src/imap.c:3563
 #, fuzzy, c-format
 msgid "can't append message to %s\n"
 msgstr "nelze přidat zprávu %s\n"
 
-#: src/imap.c:3589
+#: src/imap.c:3595
 #, fuzzy, c-format
 msgid "can't copy %s to %s\n"
 msgstr "nelze kopírovat %d na %s\n"
 
-#: src/imap.c:3613
+#: src/imap.c:3619
 #, fuzzy, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "chyba příkazu služby imap: STORE %d %d %s\n"
 
-#: src/imap.c:3627
+#: src/imap.c:3633
 msgid "error while imap command: EXPUNGE\n"
 msgstr "chyba příkazu služby imap: EXPUNGE\n"
 
-#: src/imap.c:3640
+#: src/imap.c:3646
 #, fuzzy
 msgid "error while imap command: CLOSE\n"
 msgstr "chyba příkazu služby imap: EXPUNGE\n"
 
-#: src/imap.c:3873
+#: src/imap.c:3879
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv nemůže konvertovat UTF-7 na %s\n"
 
-#: src/imap.c:3903
+#: src/imap.c:3909
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv nemůže konvertovat %s na UTF-7\n"
@@ -2215,7 +2215,7 @@ msgstr "Importovat LDIF soubor do databáze adres"
 msgid "Prev"
 msgstr "Předchozí"
 
-#: src/importldif.c:768 src/mainwindow.c:2321
+#: src/importldif.c:768 src/mainwindow.c:2303
 msgid "Next"
 msgstr "Další"
 
@@ -2561,646 +2561,646 @@ msgid ""
 "Do you want to migrate it?"
 msgstr ""
 
-#: src/mainwindow.c:471
+#: src/mainwindow.c:462
 msgid "/_File/_Folder"
 msgstr "/_Soubor/_Složka"
 
-#: src/mainwindow.c:472
+#: src/mainwindow.c:463
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/_Soubor/_Složka/_Vytvořit novou složku..."
 
-#: src/mainwindow.c:474
+#: src/mainwindow.c:465
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/_Soubor/_Složka/_Přejmenovat složku..."
 
-#: src/mainwindow.c:475
+#: src/mainwindow.c:466
 #, fuzzy
 msgid "/_File/_Folder/_Move folder..."
 msgstr "/_Soubor/_Složka/_Přejmenovat složku..."
 
-#: src/mainwindow.c:476
+#: src/mainwindow.c:467
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/_Soubor/_Složka/_Smazat složku"
 
-#: src/mainwindow.c:477
+#: src/mainwindow.c:468
 #, fuzzy
 msgid "/_File/_Mailbox"
 msgstr "/_Soubor/Při_dat poštovní schránku...."
 
-#: src/mainwindow.c:478
+#: src/mainwindow.c:469
 #, fuzzy
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/_Soubor/Při_dat poštovní schránku...."
 
-#: src/mainwindow.c:479
+#: src/mainwindow.c:470
 #, fuzzy
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/Odebrat _poštovní schránku"
 
-#: src/mainwindow.c:480 src/mainwindow.c:485
+#: src/mainwindow.c:471 src/mainwindow.c:476
 #, fuzzy
 msgid "/_File/_Mailbox/---"
 msgstr "/_Soubor/_Složka/---"
 
-#: src/mainwindow.c:481
+#: src/mainwindow.c:472
 #, fuzzy
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "/_Zkontrolovat nové zprávy"
 
-#: src/mainwindow.c:483
+#: src/mainwindow.c:474
 #, fuzzy
 msgid "/_File/_Mailbox/Check for new messages in _all mailboxes"
 msgstr "/_Soubor/_Složka/_Zkontrolovat nové zprávy ve všech složkách"
 
-#: src/mainwindow.c:486
+#: src/mainwindow.c:477
 #, fuzzy
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "/O_bnovit strom složek"
 
-#: src/mainwindow.c:489
+#: src/mainwindow.c:480
 msgid "/_File/_Import mbox file..."
 msgstr "/_Soubor/_Importovat soubor mbox..."
 
-#: src/mainwindow.c:490
+#: src/mainwindow.c:481
 msgid "/_File/_Export to mbox file..."
 msgstr "/_Soubor/E_xportovat do mbox souboru..."
 
-#: src/mainwindow.c:492
+#: src/mainwindow.c:483
 #, fuzzy
 msgid "/_File/Empty all _trash"
 msgstr "/_Soubor/_Vyprázdnit koš"
 
-#: src/mainwindow.c:494 src/messageview.c:138
+#: src/mainwindow.c:485 src/messageview.c:138
 msgid "/_File/_Save as..."
 msgstr "/_Soubor/Uložit j_ako..."
 
-#: src/mainwindow.c:495 src/messageview.c:139
+#: src/mainwindow.c:486 src/messageview.c:139
 msgid "/_File/_Print..."
 msgstr "/_Soubor/_Tisk..."
 
-#: src/mainwindow.c:497
+#: src/mainwindow.c:488
 #, fuzzy
 msgid "/_File/_Work offline"
 msgstr "/_Soubor/_Vložit soubor"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:500
+#: src/mainwindow.c:491
 msgid "/_File/E_xit"
 msgstr "/_Soubor/_Konec"
 
-#: src/mainwindow.c:505
+#: src/mainwindow.c:496
 msgid "/_Edit/Select _thread"
 msgstr "/Úp_ravy/Vybrat _vlákno"
 
-#: src/mainwindow.c:507 src/messageview.c:147
+#: src/mainwindow.c:498 src/messageview.c:147
 msgid "/_Edit/_Find in current message..."
 msgstr "/Ú_pravy/_Najít v aktuální zprávě..."
 
-#: src/mainwindow.c:509
+#: src/mainwindow.c:500
 msgid "/_Edit/_Search messages..."
 msgstr "/Ú_pravy/Na_jít zprávy..."
 
-#: src/mainwindow.c:512
+#: src/mainwindow.c:503
 msgid "/_View/Show or hi_de"
 msgstr "/Z_obrazit/Zobrazit nebo s_krýt"
 
-#: src/mainwindow.c:513
+#: src/mainwindow.c:504
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/Z_obrazit/Zobrazit nebo s_krýt/_Strom složek "
 
-#: src/mainwindow.c:515
+#: src/mainwindow.c:506
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/Z_obrazit/Zobrazit nebo s_krýt/Ná_hled na zprávu"
 
-#: src/mainwindow.c:517
+#: src/mainwindow.c:508
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/Z_obrazit/Zobrazit nebo s_krýt/_Nástrojová lišta"
 
-#: src/mainwindow.c:519
+#: src/mainwindow.c:510
 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:521
+#: src/mainwindow.c:512
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/Z_obrazit/Zobrazit nebo s_krýt/_Nástrojová lišta/_Ikony"
 
-#: src/mainwindow.c:523
+#: src/mainwindow.c:514
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/Z_obrazit/Zobrazit nebo s_krýt/_Nástrojová lišta/_Text"
 
-#: src/mainwindow.c:525
+#: src/mainwindow.c:516
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/Z_obrazit/Zobrazit nebo s_krýt/_Nástrojová lišta/_Nic"
 
-#: src/mainwindow.c:527
+#: src/mainwindow.c:518
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/Z_obrazit/Zobrazit nebo s_krýt/Stavová _lišta"
 
-#: src/mainwindow.c:530
+#: src/mainwindow.c:521
 msgid "/_View/Separate f_older tree"
 msgstr "/Z_obrazit/Samostatný s_trom složek "
 
-#: src/mainwindow.c:531
+#: src/mainwindow.c:522
 #, fuzzy
 msgid "/_View/Separate _message view"
 msgstr "/Z_obrazit/Samostatné pro_hlédnutí zprávy"
 
-#: src/mainwindow.c:533
+#: src/mainwindow.c:524
 msgid "/_View/_Sort"
 msgstr "/Z_obrazit/Setříd_it"
 
-#: src/mainwindow.c:534
+#: src/mainwindow.c:525
 msgid "/_View/_Sort/by _number"
 msgstr "/Z_obrazit/Setříd_it/podle čí_sla"
 
-#: src/mainwindow.c:535
+#: src/mainwindow.c:526
 msgid "/_View/_Sort/by s_ize"
 msgstr "/Z_obrazit/Setříd_it/podle _velikosti"
 
-#: src/mainwindow.c:536
+#: src/mainwindow.c:527
 msgid "/_View/_Sort/by _date"
 msgstr "/Z_obrazit/Setříd_it/podle _data"
 
-#: src/mainwindow.c:537
+#: src/mainwindow.c:528
 msgid "/_View/_Sort/by _from"
 msgstr "/Z_obrazit/Setříd_it/podle _od koho"
 
-#: src/mainwindow.c:538
+#: src/mainwindow.c:529
 msgid "/_View/_Sort/by _recipient"
 msgstr "/Z_obrazit/Setříd_it/podle odesí_latele"
 
-#: src/mainwindow.c:539
+#: src/mainwindow.c:530
 msgid "/_View/_Sort/by _subject"
 msgstr "/Z_obrazit/Setříd_it/podle př_edmětu"
 
-#: src/mainwindow.c:540
+#: src/mainwindow.c:531
 msgid "/_View/_Sort/by _color label"
 msgstr "/Z_obrazit/Setříd_it/podle _barevné značky"
 
-#: src/mainwindow.c:542
+#: src/mainwindow.c:533
 msgid "/_View/_Sort/by _mark"
 msgstr "/Z_obrazit/Setříd_it/podle o_značení"
 
-#: src/mainwindow.c:543
+#: src/mainwindow.c:534
 msgid "/_View/_Sort/by _unread"
 msgstr "/Z_obrazit/Setříd_it/podle ne_přečtených"
 
-#: src/mainwindow.c:544
+#: src/mainwindow.c:535
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/Z_obrazit/Setříd_it/podle připo_jených souborů"
 
-#: src/mainwindow.c:546
+#: src/mainwindow.c:537
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/Z_obrazit/Setříd_it/_Netřídit"
 
-#: src/mainwindow.c:547 src/mainwindow.c:550
+#: src/mainwindow.c:538 src/mainwindow.c:541
 msgid "/_View/_Sort/---"
 msgstr "/Z_obrazit/Setříd_it/---"
 
-#: src/mainwindow.c:548
+#: src/mainwindow.c:539
 msgid "/_View/_Sort/Ascending"
 msgstr "/Z_obrazit/Setříd_it/Vzestupně"
 
-#: src/mainwindow.c:549
+#: src/mainwindow.c:540
 msgid "/_View/_Sort/Descending"
 msgstr "/Z_obrazit/Setříd_it/Sestupně"
 
-#: src/mainwindow.c:551
+#: src/mainwindow.c:542
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/Z_obrazit/Setříd_it/_Získat z předmětu"
 
-#: src/mainwindow.c:553
+#: src/mainwindow.c:544
 msgid "/_View/Th_read view"
 msgstr "/Z_obrazit/Zobrazit _vlákna"
 
-#: src/mainwindow.c:554
+#: src/mainwindow.c:545
 msgid "/_View/E_xpand all threads"
 msgstr "/Z_obrazit/Rozbalit vše_chna vlákna"
 
-#: src/mainwindow.c:555
+#: src/mainwindow.c:546
 msgid "/_View/Co_llapse all threads"
 msgstr "/Z_obrazit/_Sbalit všechna vlákna"
 
-#: src/mainwindow.c:556
+#: src/mainwindow.c:547
 msgid "/_View/Set display _item..."
 msgstr "/Z_obrazit/Nastavit zobrazené po_ložky..."
 
-#: src/mainwindow.c:559
+#: src/mainwindow.c:550
 msgid "/_View/_Go to"
 msgstr "/Z_obrazit/_Přejít"
 
-#: src/mainwindow.c:560
+#: src/mainwindow.c:551
 msgid "/_View/_Go to/_Prev message"
 msgstr "/Z_obrazit/_Přejít/Př_edchozí zpráva"
 
-#: src/mainwindow.c:561
+#: src/mainwindow.c:552
 msgid "/_View/_Go to/_Next message"
 msgstr "/Z_obrazit/_Přejít/_Další zpráva"
 
-#: src/mainwindow.c:562 src/mainwindow.c:567 src/mainwindow.c:570
-#: src/mainwindow.c:575 src/mainwindow.c:580
+#: src/mainwindow.c:553 src/mainwindow.c:558 src/mainwindow.c:561
+#: src/mainwindow.c:566 src/mainwindow.c:571
 msgid "/_View/_Go to/---"
 msgstr "/Z_obrazit/_Přejít/---"
 
-#: src/mainwindow.c:563
+#: src/mainwindow.c:554
 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:565
+#: src/mainwindow.c:556
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/Z_obrazit/_Přejít/Další nepřeč_tená zpráva"
 
-#: src/mainwindow.c:568
+#: src/mainwindow.c:559
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/Z_obrazit/_Přejít/_Předchozí nová zpráva"
 
-#: src/mainwindow.c:569
+#: src/mainwindow.c:560
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/Z_obrazit/_Přejít/Další n_ová zpráva"
 
-#: src/mainwindow.c:571
+#: src/mainwindow.c:562
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/Z_obrazit/_Přejít/Před_chozí označená zpráva"
 
-#: src/mainwindow.c:573
+#: src/mainwindow.c:564
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/Z_obrazit/_Přejít/Další oz_načená zpráva"
 
-#: src/mainwindow.c:576
+#: src/mainwindow.c:567
 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:578
+#: src/mainwindow.c:569
 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:581
+#: src/mainwindow.c:572
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/Z_obrazit/_Přejít/Do _jiné složky"
 
-#: src/mainwindow.c:590 src/messageview.c:158
+#: src/mainwindow.c:581 src/messageview.c:158
 #, fuzzy
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/Z_obrazit/_Znaková sada/_Autodetekce "
 
-#: src/mainwindow.c:641 src/messageview.c:202
+#: src/mainwindow.c:632 src/messageview.c:202
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/Z_obrazit/_Znaková sada/Japonská (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:643 src/messageview.c:204
+#: src/mainwindow.c:634 src/messageview.c:204
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/Z_obrazit/_Znaková sada/Japonská (_EUC-JP)"
 
-#: src/mainwindow.c:645 src/messageview.c:206
+#: src/mainwindow.c:636 src/messageview.c:206
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/Z_obrazit/_Znaková sada/Japonská (_Shift__JIS)"
 
-#: src/mainwindow.c:657 src/messageview.c:217
+#: src/mainwindow.c:648 src/messageview.c:217
 #, fuzzy
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/Z_obrazit/_Znaková sada/Čínská (ISO-2022-_CN)"
 
-#: src/mainwindow.c:663 src/messageview.c:222
+#: src/mainwindow.c:654 src/messageview.c:222
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/Z_obrazit/_Znaková sada/Korejská (ISO-2022-KR)"
 
-#: src/mainwindow.c:676 src/summaryview.c:401
+#: src/mainwindow.c:667 src/summaryview.c:401
 msgid "/_View/Open in new _window"
 msgstr "/Z_obrazit/Otevřít v _novém okně"
 
-#: src/mainwindow.c:677 src/messageview.c:234
+#: src/mainwindow.c:668 src/messageview.c:234
 msgid "/_View/Mess_age source"
 msgstr "/Z_obrazit/Zd_roj zprávy"
 
-#: src/mainwindow.c:678 src/messageview.c:235
+#: src/mainwindow.c:669 src/messageview.c:235
 msgid "/_View/Show all _header"
 msgstr "/Z_obrazit/Zobrazit všechna zá_hlaví"
 
-#: src/mainwindow.c:680
+#: src/mainwindow.c:671
 msgid "/_View/_Update summary"
 msgstr "/Z_obrazit/_Aktualizace souhrnu"
 
-#: src/mainwindow.c:682 src/messageview.c:237
+#: src/mainwindow.c:673 src/messageview.c:237
 msgid "/_Message"
 msgstr "/_Zpráva"
 
-#: src/mainwindow.c:683
+#: src/mainwindow.c:674
 #, fuzzy
 msgid "/_Message/Recei_ve"
 msgstr "/_Zpráva/Znov_u editovat"
 
-#: src/mainwindow.c:684
+#: src/mainwindow.c:675
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/_Zpráva/Přijmout _ze všech účtů"
 
-#: src/mainwindow.c:686
+#: src/mainwindow.c:677
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/_Zpráva/Přijmout _ze všech účtů"
 
-#: src/mainwindow.c:688
+#: src/mainwindow.c:679
 #, fuzzy
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/_Zpráva/Přerušit pří_jem zpráv"
 
-#: src/mainwindow.c:690
+#: src/mainwindow.c:681
 #, fuzzy
 msgid "/_Message/Recei_ve/---"
 msgstr "/_Zpráva/Znov_u editovat"
 
-#: src/mainwindow.c:691
+#: src/mainwindow.c:682
 msgid "/_Message/_Send queued messages"
 msgstr "/_Zpráva/Odeslat pozd_ržené zprávy"
 
-#: src/mainwindow.c:692 src/mainwindow.c:694 src/mainwindow.c:701
-#: src/mainwindow.c:706 src/mainwindow.c:710 src/mainwindow.c:719
-#: src/mainwindow.c:722 src/messageview.c:240 src/messageview.c:248
+#: src/mainwindow.c:683 src/mainwindow.c:685 src/mainwindow.c:692
+#: src/mainwindow.c:697 src/mainwindow.c:701 src/mainwindow.c:710
+#: src/mainwindow.c:713 src/messageview.c:240 src/messageview.c:248
 #: src/messageview.c:253
 msgid "/_Message/---"
 msgstr "/_Zpráva/---"
 
-#: src/mainwindow.c:693 src/messageview.c:238
+#: src/mainwindow.c:684 src/messageview.c:238
 msgid "/_Message/Compose _new message"
 msgstr "/_Zpráva/_Nová zpráva"
 
-#: src/mainwindow.c:695 src/messageview.c:241
+#: src/mainwindow.c:686 src/messageview.c:241
 msgid "/_Message/_Reply"
 msgstr "/_Zpráva/_Odpovědět"
 
-#: src/mainwindow.c:696
+#: src/mainwindow.c:687
 msgid "/_Message/Repl_y to"
 msgstr "/_Zpráva/Odpo_vědět komu"
 
-#: src/mainwindow.c:697 src/messageview.c:242
+#: src/mainwindow.c:688 src/messageview.c:242
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Zpráva/Odpo_vědět komu/_všem"
 
-#: src/mainwindow.c:698 src/messageview.c:244
+#: src/mainwindow.c:689 src/messageview.c:244
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Zpráva/Odpo_vědět komu/_odesílateli"
 
-#: src/mainwindow.c:699 src/messageview.c:246
+#: src/mainwindow.c:690 src/messageview.c:246
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Zpráva/Odpo_vědět komu/do _diskusního listu"
 
-#: src/mainwindow.c:702 src/messageview.c:249
+#: src/mainwindow.c:693 src/messageview.c:249
 msgid "/_Message/_Forward"
 msgstr "/_Zpráva/Předat dá_l"
 
-#: src/mainwindow.c:703 src/messageview.c:250
+#: src/mainwindow.c:694 src/messageview.c:250
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Zpráva/Přeposlat _jako přílohu"
 
-#: src/mainwindow.c:705 src/messageview.c:252
+#: src/mainwindow.c:696 src/messageview.c:252
 msgid "/_Message/Redirec_t"
 msgstr "/_Zpráva/Přesměrov_at"
 
-#: src/mainwindow.c:707
+#: src/mainwindow.c:698
 msgid "/_Message/M_ove..."
 msgstr "/_Zpráva/Pře_sunout..."
 
-#: src/mainwindow.c:708
+#: src/mainwindow.c:699
 msgid "/_Message/_Copy..."
 msgstr "/_Zpráva/_Kopírovat..."
 
-#: src/mainwindow.c:709
+#: src/mainwindow.c:700
 msgid "/_Message/_Delete"
 msgstr "/_Zpráva/S_mazat"
 
-#: src/mainwindow.c:711
+#: src/mainwindow.c:702
 msgid "/_Message/_Mark"
 msgstr "/_Zpráva/Označ_it"
 
-#: src/mainwindow.c:712
+#: src/mainwindow.c:703
 msgid "/_Message/_Mark/_Mark"
 msgstr "/_Zpráva/Označ_it/_Označit"
 
-#: src/mainwindow.c:713
+#: src/mainwindow.c:704
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/_Zpráva/Označ_it/_Zrušit označení"
 
-#: src/mainwindow.c:714
+#: src/mainwindow.c:705
 msgid "/_Message/_Mark/---"
 msgstr "/_Zpráva/Označ_it/---"
 
-#: src/mainwindow.c:715
+#: src/mainwindow.c:706
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/_Zpráva/Označ_it/Označit jako _nepřečtené"
 
-#: src/mainwindow.c:716
+#: src/mainwindow.c:707
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/_Zpráva/Označ_it/Označit jako _přečtenou"
 
-#: src/mainwindow.c:718
+#: src/mainwindow.c:709
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/_Zpráva/Označ_it/Označit _všechny jako přečtené"
 
-#: src/mainwindow.c:720
+#: src/mainwindow.c:711
 #, fuzzy
 msgid "/_Message/Set as _junk mail"
 msgstr "/_Zpráva/_Příjem nové pošty"
 
-#: src/mainwindow.c:721
+#: src/mainwindow.c:712
 #, fuzzy
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/_Zpráva/_Příjem nové pošty"
 
-#: src/mainwindow.c:723 src/messageview.c:254
+#: src/mainwindow.c:714 src/messageview.c:254
 msgid "/_Message/Re-_edit"
 msgstr "/_Zpráva/Znov_u editovat"
 
-#: src/mainwindow.c:727
+#: src/mainwindow.c:718
 #, fuzzy
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/_Nástroje/Přidat odesílatele do a_dresáře"
 
-#: src/mainwindow.c:730
+#: src/mainwindow.c:721
 #, fuzzy
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/_Nástroje/_Filtr zpráv "
 
-#: src/mainwindow.c:732
+#: src/mainwindow.c:723
 #, fuzzy
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Nástroje/_Filtr zpráv "
 
-#: src/mainwindow.c:734 src/messageview.c:261
+#: src/mainwindow.c:725 src/messageview.c:261
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Nástroje/_Vytvoření filtru"
 
-#: src/mainwindow.c:735 src/messageview.c:263
+#: src/mainwindow.c:726 src/messageview.c:263
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Nástroje/_Vytvoření filtru/_Automaticky"
 
-#: src/mainwindow.c:737 src/messageview.c:265
+#: src/mainwindow.c:728 src/messageview.c:265
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Nástroje/_Vytvoření filtru/podle _Od"
 
-#: src/mainwindow.c:739 src/messageview.c:267
+#: src/mainwindow.c:730 src/messageview.c:267
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Nástroje/_Vytvoření filtru/podle _Komu"
 
-#: src/mainwindow.c:741 src/messageview.c:269
+#: src/mainwindow.c:732 src/messageview.c:269
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Nástroje/_Vytvoření filtru/podle _Předmětu"
 
-#: src/mainwindow.c:744
+#: src/mainwindow.c:735
 #, fuzzy
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/_Nástroje/_Filtr zpráv "
 
-#: src/mainwindow.c:746
+#: src/mainwindow.c:737
 #, fuzzy
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/_Nástroje/_Filtr zpráv "
 
-#: src/mainwindow.c:751
+#: src/mainwindow.c:742
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/_Nástroje/_Smazat duplikované zprávy"
 
-#: src/mainwindow.c:754
+#: src/mainwindow.c:745
 msgid "/_Tools/E_xecute"
 msgstr "/_Nástroje/S_pustit"
 
-#: src/mainwindow.c:756
+#: src/mainwindow.c:747
 msgid "/_Tools/_Log window"
 msgstr "/_Nástroje/Okno _záznamů "
 
-#: src/mainwindow.c:758
+#: src/mainwindow.c:749
 msgid "/_Configuration"
 msgstr "/Nastav_ení"
 
-#: src/mainwindow.c:759
+#: src/mainwindow.c:750
 msgid "/_Configuration/_Common preferences..."
 msgstr "/Nastav_ení/_Společná nastavení..."
 
-#: src/mainwindow.c:761
+#: src/mainwindow.c:752
 msgid "/_Configuration/_Filter setting..."
 msgstr "/Nastav_ení/Nastavení _filtrů..."
 
-#: src/mainwindow.c:763
+#: src/mainwindow.c:754
 msgid "/_Configuration/_Template..."
 msgstr "/Nastav_ení/Ša_blona..."
 
-#: src/mainwindow.c:764
+#: src/mainwindow.c:755
 msgid "/_Configuration/_Actions..."
 msgstr "/Nastav_ení/_Akce..."
 
-#: src/mainwindow.c:765
+#: src/mainwindow.c:756
 msgid "/_Configuration/---"
 msgstr "/Nastav_ení/---"
 
-#: src/mainwindow.c:766
+#: src/mainwindow.c:757
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/Nastav_ení/Nas_tavení aktuálního účtu..."
 
-#: src/mainwindow.c:768
+#: src/mainwindow.c:759
 msgid "/_Configuration/Create _new account..."
 msgstr "/Nastav_ení/Založit _nový účet..."
 
-#: src/mainwindow.c:770
+#: src/mainwindow.c:761
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/Nastav_ení/Ú_pravy účtů..."
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:763
 msgid "/_Configuration/C_hange current account"
 msgstr "/Nastav_ení/_Změna aktuálního účtu"
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:767
 msgid "/_Help/_Manual"
 msgstr "/Nápo_věda/_Manuál"
 
-#: src/mainwindow.c:777
+#: src/mainwindow.c:768
 msgid "/_Help/_Manual/_English"
 msgstr "/Nápo_věda/_Manuál/_Anglicky"
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:769
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/Nápo_věda/_Manuál/_Japonsky"
 
-#: src/mainwindow.c:779
+#: src/mainwindow.c:770
 msgid "/_Help/_FAQ"
 msgstr "/Nápo_věda/_FAQ"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:771
 msgid "/_Help/_FAQ/_English"
 msgstr "/Nápo_věda/_FAQ/_Anglicky"
 
-#: src/mainwindow.c:781
+#: src/mainwindow.c:772
 msgid "/_Help/_FAQ/_German"
 msgstr "/Nápo_věda/_FAQ/_Německy"
 
-#: src/mainwindow.c:782
+#: src/mainwindow.c:773
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/Nápo_věda/_FAQ/Š_panělsky"
 
-#: src/mainwindow.c:783
+#: src/mainwindow.c:774
 msgid "/_Help/_FAQ/_French"
 msgstr "/Nápo_věda/_FAQ/_Francouzsky"
 
-#: src/mainwindow.c:784
+#: src/mainwindow.c:775
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/Nápo_věda/_FAQ/_Italsky"
 
-#: src/mainwindow.c:785
+#: src/mainwindow.c:776
 msgid "/_Help/---"
 msgstr "/Nápo_věda/---"
 
-#: src/mainwindow.c:825
+#: src/mainwindow.c:816
 msgid "Creating main window...\n"
 msgstr "Vytvářím hlavní okno...\n"
 
-#: src/mainwindow.c:987
+#: src/mainwindow.c:973
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Hlavní okno: barevné rozvržení %d bylo neúspěšné\n"
 
-#: src/mainwindow.c:1071 src/summaryview.c:2020 src/summaryview.c:2105
+#: src/mainwindow.c:1057 src/summaryview.c:2020 src/summaryview.c:2105
 #: src/summaryview.c:3342 src/summaryview.c:3415 src/summaryview.c:3728
 msgid "done.\n"
 msgstr "hotovo.\n"
 
-#: src/mainwindow.c:1196 src/mainwindow.c:1237 src/mainwindow.c:1265
+#: src/mainwindow.c:1182 src/mainwindow.c:1223 src/mainwindow.c:1251
 msgid "Untitled"
 msgstr "Neoznačený"
 
-#: src/mainwindow.c:1266
+#: src/mainwindow.c:1252
 msgid "none"
 msgstr "žádný"
 
-#: src/mainwindow.c:1316
+#: src/mainwindow.c:1302
 #, 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:1536
+#: src/mainwindow.c:1522
 msgid "Offline"
 msgstr ""
 
-#: src/mainwindow.c:1537
+#: src/mainwindow.c:1523
 msgid "You are offline. Go online?"
 msgstr ""
 
-#: src/mainwindow.c:1551
+#: src/mainwindow.c:1537
 #, fuzzy
 msgid "Empty all trash"
 msgstr "Vyprázdnit koš"
 
-#: src/mainwindow.c:1552
+#: src/mainwindow.c:1538
 #, fuzzy
 msgid "Empty messages in all trash?"
 msgstr "Vyprázdnit všechny zprávy v koši?"
 
-#: src/mainwindow.c:1580
+#: src/mainwindow.c:1566
 msgid "Add mailbox"
 msgstr "Přidat poštovní schránku"
 
-#: src/mainwindow.c:1581
+#: src/mainwindow.c:1567
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3210,16 +3210,16 @@ msgstr ""
 "Pokud je zadán existující, bude automaticky\n"
 "prohledán."
 
-#: src/mainwindow.c:1587
+#: src/mainwindow.c:1573
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Poštovní schránka '%s' již existuje."
 
-#: src/mainwindow.c:1592 src/setup.c:57
+#: src/mainwindow.c:1578 src/setup.c:57
 msgid "Mailbox"
 msgstr "Poštovní schránka"
 
-#: src/mainwindow.c:1598 src/setup.c:63
+#: src/mainwindow.c:1584 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3229,153 +3229,153 @@ 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:1989
+#: src/mainwindow.c:1975
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Zobrazení složky"
 
-#: src/mainwindow.c:2009 src/messageview.c:368
+#: src/mainwindow.c:1995 src/messageview.c:368
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Zobrazení zprávy"
 
-#: src/mainwindow.c:2156 src/summaryview.c:370
+#: src/mainwindow.c:2142 src/summaryview.c:370
 msgid "/_Reply"
 msgstr "/_Odpovědět"
 
-#: src/mainwindow.c:2157
+#: src/mainwindow.c:2143
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "Odpovídá všem"
 
-#: src/mainwindow.c:2158
+#: src/mainwindow.c:2144
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/Odpovědět _komu/_odesílateli"
 
-#: src/mainwindow.c:2159
+#: src/mainwindow.c:2145
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/Odpovědět _komu/do _diskusního listu"
 
-#: src/mainwindow.c:2164 src/summaryview.c:377
+#: src/mainwindow.c:2150 src/summaryview.c:377
 msgid "/_Forward"
 msgstr "/Př_edat dál"
 
-#: src/mainwindow.c:2165 src/summaryview.c:378
+#: src/mainwindow.c:2151 src/summaryview.c:378
 msgid "/For_ward as attachment"
 msgstr "/Přeposlat _jako přílohu"
 
-#: src/mainwindow.c:2166 src/summaryview.c:379
+#: src/mainwindow.c:2152 src/summaryview.c:379
 msgid "/Redirec_t"
 msgstr "/Přes_měrovat"
 
-#: src/mainwindow.c:2205
+#: src/mainwindow.c:2188
 msgid "Get"
 msgstr "Stáhnout"
 
-#: src/mainwindow.c:2206
+#: src/mainwindow.c:2189
 msgid "Incorporate new mail"
 msgstr "Začlenit novou poštu"
 
-#: src/mainwindow.c:2213
+#: src/mainwindow.c:2196
 msgid "Get all"
 msgstr "Stáhnout vše"
 
-#: src/mainwindow.c:2214
+#: src/mainwindow.c:2197
 msgid "Incorporate new mail of all accounts"
 msgstr "Začlení novou poštu ze všech účtů"
 
-#: src/mainwindow.c:2225
+#: src/mainwindow.c:2208
 msgid "Send queued message(s)"
 msgstr "Odešle pozdrženou zprávu(y)"
 
-#: src/mainwindow.c:2235 src/prefs_account.c:721 src/prefs_common.c:949
+#: src/mainwindow.c:2218 src/prefs_account.c:721 src/prefs_common.c:949
 #: src/prefs_folder_item.c:137
 msgid "Compose"
 msgstr "Napsat"
 
-#: src/mainwindow.c:2236
+#: src/mainwindow.c:2219
 msgid "Compose new message"
 msgstr "Vytváří novou zprávu"
 
-#: src/mainwindow.c:2244 src/prefs_common.c:1448
+#: src/mainwindow.c:2227 src/prefs_common.c:1448
 msgid "Reply"
 msgstr "Odpovědět"
 
-#: src/mainwindow.c:2245 src/mainwindow.c:2258
+#: src/mainwindow.c:2228 src/mainwindow.c:2241
 msgid "Reply to the message"
 msgstr "Odpovídá na zprávu"
 
-#: src/mainwindow.c:2263
+#: src/mainwindow.c:2245
 msgid "Reply all"
 msgstr "Odpov. všem"
 
-#: src/mainwindow.c:2264
+#: src/mainwindow.c:2246
 msgid "Reply to all"
 msgstr "Odpovídá všem"
 
-#: src/mainwindow.c:2272 src/prefs_filter_edit.c:741
+#: src/mainwindow.c:2254 src/prefs_filter_edit.c:741
 msgid "Forward"
 msgstr "Poslat dál"
 
-#: src/mainwindow.c:2273 src/mainwindow.c:2286
+#: src/mainwindow.c:2255 src/mainwindow.c:2268
 msgid "Forward the message"
 msgstr "Předává zprávu dál"
 
-#: src/mainwindow.c:2293
+#: src/mainwindow.c:2275
 msgid "Delete the message"
 msgstr "Smazat zprávu"
 
-#: src/mainwindow.c:2301 src/prefs_common.c:1988
+#: src/mainwindow.c:2283 src/prefs_common.c:1988
 msgid "Junk"
 msgstr ""
 
-#: src/mainwindow.c:2302
+#: src/mainwindow.c:2284
 #, fuzzy
 msgid "Set as junk mail"
 msgstr "Nastavit jako výchozí"
 
-#: src/mainwindow.c:2311
+#: src/mainwindow.c:2293
 msgid "Execute"
 msgstr "Provést"
 
-#: src/mainwindow.c:2312
+#: src/mainwindow.c:2294
 msgid "Execute marked process"
 msgstr "Provést označený proces "
 
-#: src/mainwindow.c:2322
+#: src/mainwindow.c:2304
 msgid "Next unread message"
 msgstr "Další nepřečtenou zprávu"
 
-#: src/mainwindow.c:2334
+#: src/mainwindow.c:2316
 msgid "Prefs"
 msgstr "Nastavení"
 
-#: src/mainwindow.c:2335
+#: src/mainwindow.c:2317
 msgid "Common preferences"
 msgstr "Společná nastavení"
 
-#: src/mainwindow.c:2343 src/prefs_folder_item.c:261
+#: src/mainwindow.c:2325 src/prefs_folder_item.c:261
 #: src/prefs_folder_item.c:272 src/progressdialog.c:128
 msgid "Account"
 msgstr "Účet"
 
-#: src/mainwindow.c:2344
+#: src/mainwindow.c:2326
 msgid "Account setting"
 msgstr "Nastavení účtu"
 
-#: src/mainwindow.c:2527
+#: src/mainwindow.c:2498
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 
-#: src/mainwindow.c:2538
+#: src/mainwindow.c:2509
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 
-#: src/mainwindow.c:2731
+#: src/mainwindow.c:2702
 msgid "Exit"
 msgstr "Ukončení programu"
 
-#: src/mainwindow.c:2731
+#: src/mainwindow.c:2702
 msgid "Exit this program?"
 msgstr "Chcete ukončit tento program?"
 
@@ -5616,11 +5616,11 @@ msgstr "Vytvářím dialog procesu...\n"
 msgid "Status"
 msgstr "Stav"
 
-#: src/recv.c:113
+#: src/recv.c:112
 msgid "error occurred while retrieving data.\n"
 msgstr "Během obnovy dat se vyskytla chyba.\n"
 
-#: src/recv.c:155 src/recv.c:197 src/recv.c:213
+#: src/recv.c:154 src/recv.c:196 src/recv.c:211
 msgid "Can't write to file.\n"
 msgstr "Nemohu zapisovat do souboru.\n"
 
@@ -6359,7 +6359,7 @@ msgstr "%.2fMB"
 msgid "%.2fGB"
 msgstr "%.2fGB"
 
-#: src/utils.c:2372 src/utils.c:2496
+#: src/utils.c:2386 src/utils.c:2510
 #, c-format
 msgid "writing to %s failed.\n"
 msgstr "Neúspěšný zápis do %s.\n"
diff --git a/po/da.po b/po/da.po
index de325131..d636e099 100644
--- a/po/da.po
+++ b/po/da.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed    \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-08-09 18:08+0900\n"
+"POT-Creation-Date: 2005-08-22 17:22+0900\n"
 "PO-Revision-Date: 2003-07-29 09:05+0200\n"
 "Last-Translator: Andreas Hinz <news3@acci.dk>\n"
 "Language-Team: \n"
@@ -95,7 +95,7 @@ msgstr ""
 "`G'-kolonnen, for at aktivere hentning via `hent alle'."
 
 #: src/account.c:691 src/addressadd.c:192 src/addressbook.c:490
-#: src/compose.c:4081 src/editaddress.c:200 src/editaddress.c:942
+#: src/compose.c:4079 src/editaddress.c:200 src/editaddress.c:942
 #: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:265
 #: src/editjpilot.c:271 src/editldap.c:307 src/editvcard.c:184
 #: src/mimeview.c:201 src/prefs_filter.c:258 src/prefs_folder_item.c:170
@@ -233,7 +233,7 @@ msgstr "Handlingens bruger parameter"
 msgid "Add Address to Book"
 msgstr "Tilføj adresse i adressebog"
 
-#: src/addressadd.c:202 src/compose.c:4528 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4521 src/editaddress.c:201
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "Adresse"
@@ -247,7 +247,7 @@ msgstr "Kommentar"
 msgid "Select Address Book Folder"
 msgstr "Vælg adressebog mappe"
 
-#: src/addressbook.c:336 src/compose.c:495 src/mainwindow.c:470
+#: src/addressbook.c:336 src/compose.c:493 src/mainwindow.c:461
 #: src/messageview.c:137
 msgid "/_File"
 msgstr "/_Filer"
@@ -268,10 +268,10 @@ msgstr "/_Filer/Ny _JPilot"
 msgid "/_File/New _Server"
 msgstr "/_Filer/Ny _server"
 
-#: src/addressbook.c:345 src/addressbook.c:348 src/compose.c:500
-#: src/compose.c:505 src/compose.c:509 src/mainwindow.c:488
-#: src/mainwindow.c:491 src/mainwindow.c:493 src/mainwindow.c:496
-#: src/mainwindow.c:498 src/messageview.c:140
+#: src/addressbook.c:345 src/addressbook.c:348 src/compose.c:498
+#: src/compose.c:503 src/compose.c:507 src/mainwindow.c:479
+#: src/mainwindow.c:482 src/mainwindow.c:484 src/mainwindow.c:487
+#: src/mainwindow.c:489 src/messageview.c:140
 msgid "/_File/---"
 msgstr "/_Filer/---"
 
@@ -287,7 +287,7 @@ msgstr "/_Filer/_Slet"
 msgid "/_File/_Save"
 msgstr "/_Filer/_Gem"
 
-#: src/addressbook.c:350 src/compose.c:510 src/messageview.c:141
+#: src/addressbook.c:350 src/compose.c:508 src/messageview.c:141
 msgid "/_File/_Close"
 msgstr "/_Filer/_Luk"
 
@@ -319,7 +319,7 @@ msgstr "/_Adresse/_Redigér"
 msgid "/_Address/_Delete"
 msgstr "/_Adresse/_Slet"
 
-#: src/addressbook.c:358 src/compose.c:619 src/mainwindow.c:725
+#: src/addressbook.c:358 src/compose.c:617 src/mainwindow.c:716
 #: src/messageview.c:256
 msgid "/_Tools"
 msgstr "/_Funktioner"
@@ -328,12 +328,12 @@ msgstr "/_Funktioner"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Funktioner/Importer _LDIF-Fil"
 
-#: src/addressbook.c:360 src/compose.c:632 src/mainwindow.c:775
+#: src/addressbook.c:360 src/compose.c:630 src/mainwindow.c:766
 #: src/messageview.c:274
 msgid "/_Help"
 msgstr "/_Hjælp"
 
-#: src/addressbook.c:361 src/compose.c:633 src/mainwindow.c:786
+#: src/addressbook.c:361 src/compose.c:631 src/mainwindow.c:777
 #: src/messageview.c:275
 msgid "/_Help/_About"
 msgstr "/_Hjælp/_Om"
@@ -350,7 +350,7 @@ msgstr "/Ny _gruppe"
 msgid "/New _Folder"
 msgstr "/Ny _mappe"
 
-#: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:489
+#: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:487
 #: src/folderview.c:235 src/folderview.c:237 src/folderview.c:241
 #: src/folderview.c:252 src/folderview.c:254 src/folderview.c:256
 #: src/folderview.c:260 src/folderview.c:270 src/folderview.c:272
@@ -360,8 +360,8 @@ msgstr "/Ny _mappe"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:512
-#: src/mainwindow.c:502 src/messageview.c:143
+#: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:510
+#: src/mainwindow.c:493 src/messageview.c:143
 msgid "/_Edit"
 msgstr "/_Redigér"
 
@@ -373,7 +373,7 @@ msgstr "/_Slet"
 msgid "E-Mail address"
 msgstr "E-post adresse"
 
-#: src/addressbook.c:495 src/compose.c:4529 src/prefs_common.c:2402
+#: src/addressbook.c:495 src/compose.c:4522 src/prefs_common.c:2402
 msgid "Address book"
 msgstr "Adressebog"
 
@@ -382,8 +382,8 @@ msgid "Name:"
 msgstr "Navn:"
 
 #. Buttons
-#: src/addressbook.c:627 src/addressbook.c:1673 src/editaddress.c:884
-#: src/editaddress.c:1017 src/mainwindow.c:2292 src/prefs_actions.c:266
+#: src/addressbook.c:627 src/addressbook.c:1674 src/editaddress.c:884
+#: src/editaddress.c:1017 src/mainwindow.c:2274 src/prefs_actions.c:266
 #: src/prefs_display_header.c:278 src/prefs_display_header.c:333
 #: src/prefs_template.c:231
 msgid "Delete"
@@ -422,7 +422,7 @@ msgstr "Slet adresse(r)"
 msgid "Really delete the address(es)?"
 msgstr "Virklig slette adresse(r)?"
 
-#: src/addressbook.c:1664
+#: src/addressbook.c:1665
 #, fuzzy, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -431,38 +431,38 @@ msgstr ""
 "Vil du virkeligt slette mappen OG alla adresser i `%s' ? \n"
 "Hvis kun mappen slettes, vil adresserne blive flyttet til hoved mappen."
 
-#: src/addressbook.c:1667 src/folderview.c:2139
+#: src/addressbook.c:1668 src/folderview.c:2139
 msgid "Delete folder"
 msgstr "Slet mappe"
 
-#: src/addressbook.c:1667
+#: src/addressbook.c:1668
 #, fuzzy
 msgid "_Folder only"
 msgstr "Ny mappe"
 
-#: src/addressbook.c:1667
+#: src/addressbook.c:1668
 #, fuzzy
 msgid "Folder and _addresses"
 msgstr "Mappe og adresser"
 
-#: src/addressbook.c:1672
+#: src/addressbook.c:1673
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Virklig slette `%s' ?"
 
-#: src/addressbook.c:2352 src/addressbook.c:2485
+#: src/addressbook.c:2353 src/addressbook.c:2486
 msgid "New user, could not save index file."
 msgstr "Ny bruger, kunne ikke gemme index fil."
 
-#: src/addressbook.c:2356 src/addressbook.c:2489
+#: src/addressbook.c:2357 src/addressbook.c:2490
 msgid "New user, could not save address book files."
 msgstr "Ny bruger, kunne ikke gemme adressebogs fil."
 
-#: src/addressbook.c:2366 src/addressbook.c:2499
+#: src/addressbook.c:2367 src/addressbook.c:2500
 msgid "Old address book converted successfully."
 msgstr "Gammel adressebog konverteret."
 
-#: src/addressbook.c:2371
+#: src/addressbook.c:2372
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -470,7 +470,7 @@ msgstr ""
 "Gammel adressebog konverteret,\n"
 "men kunne ikke gemme index filen"
 
-#: src/addressbook.c:2384
+#: src/addressbook.c:2385
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -478,7 +478,7 @@ msgstr ""
 "Kunne ikke konvertere adressebog,\n"
 "men nye og tomme filer blev oprettet."
 
-#: src/addressbook.c:2390
+#: src/addressbook.c:2391
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -486,7 +486,7 @@ msgstr ""
 "Kunne ikke konvertere adressebog,\n"
 "kunne ikke oprette nye filer."
 
-#: src/addressbook.c:2395
+#: src/addressbook.c:2396
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -494,85 +494,85 @@ msgstr ""
 "Kunne ikke konvertere adressebog,\n"
 "kunne ikke oprette nye filer."
 
-#: src/addressbook.c:2402
+#: src/addressbook.c:2403
 msgid "Addressbook conversion error"
 msgstr "Adressebog konverterings fejl"
 
-#: src/addressbook.c:2406
+#: src/addressbook.c:2407
 msgid "Addressbook conversion"
 msgstr "Adressebog konvertering"
 
-#: src/addressbook.c:2441
+#: src/addressbook.c:2442
 msgid "Addressbook Error"
 msgstr "Adressebog fejl"
 
-#: src/addressbook.c:2442 src/addressbook.c:2542
+#: src/addressbook.c:2443 src/addressbook.c:2543
 msgid "Could not read address index"
 msgstr "Kunne ikke læse adressebog"
 
-#: src/addressbook.c:2504
+#: src/addressbook.c:2505
 msgid "Old address book converted, could not save new address index file"
 msgstr "Gammel adressebog konverteret men kunne ikke gemme ny index fil "
 
-#: src/addressbook.c:2518
+#: src/addressbook.c:2519
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr "Kunne ikke konvertere adressebog, men har oprettet nye tomme filer "
 
-#: src/addressbook.c:2524
+#: src/addressbook.c:2525
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr ""
 "Kunne ikke konvertere adressebog, og heller ikke oprette nye tomme filer "
 
-#: src/addressbook.c:2530
+#: src/addressbook.c:2531
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr ""
 "Kunne ikke konvertere adressebog, og heller ikke oprette nye tomme filer "
 
-#: src/addressbook.c:2548
+#: src/addressbook.c:2549
 msgid "Addressbook Conversion Error"
 msgstr "Adressebog konverterings fejl"
 
-#: src/addressbook.c:2554
+#: src/addressbook.c:2555
 msgid "Addressbook Conversion"
 msgstr "Adressebog konvertering"
 
-#: src/addressbook.c:3055 src/prefs_common.c:963
+#: src/addressbook.c:3056 src/prefs_common.c:963
 msgid "Interface"
 msgstr "Brugerflade"
 
-#: src/addressbook.c:3071 src/importldif.c:514
+#: src/addressbook.c:3072 src/importldif.c:514
 msgid "Address Book"
 msgstr "Adressebog"
 
-#: src/addressbook.c:3087
+#: src/addressbook.c:3088
 msgid "Person"
 msgstr "Person"
 
-#: src/addressbook.c:3103
+#: src/addressbook.c:3104
 msgid "EMail Address"
 msgstr "E-post adresse"
 
-#: src/addressbook.c:3119
+#: src/addressbook.c:3120
 msgid "Group"
 msgstr "Gruppe"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3135 src/folderview.c:346 src/prefs_account.c:1866
+#: src/addressbook.c:3136 src/folderview.c:346 src/prefs_account.c:1866
 msgid "Folder"
 msgstr "Mappe"
 
-#: src/addressbook.c:3151
+#: src/addressbook.c:3152
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3167 src/addressbook.c:3183
+#: src/addressbook.c:3168 src/addressbook.c:3184
 msgid "JPilot"
 msgstr "J-Pilot"
 
-#: src/addressbook.c:3199
+#: src/addressbook.c:3200
 msgid "LDAP Server"
 msgstr "LDAP server"
 
@@ -584,7 +584,7 @@ msgstr "Normale adresser"
 msgid "Personal address"
 msgstr "Personlige adresser"
 
-#: src/alertpanel.c:138 src/compose.c:5214 src/main.c:515
+#: src/alertpanel.c:138 src/compose.c:5208 src/main.c:515
 msgid "Notice"
 msgstr "Note"
 
@@ -639,381 +639,381 @@ msgstr "Brun"
 msgid "None"
 msgstr "Ingen"
 
-#: src/compose.c:487
+#: src/compose.c:485
 msgid "/_Add..."
 msgstr "/_Tilføj..."
 
-#: src/compose.c:488
+#: src/compose.c:486
 msgid "/_Remove"
 msgstr "/_Fjern"
 
-#: src/compose.c:490 src/folderview.c:243 src/folderview.c:262
+#: src/compose.c:488 src/folderview.c:243 src/folderview.c:262
 #: src/folderview.c:277
 msgid "/_Properties..."
 msgstr "/_Egenskaber..."
 
-#: src/compose.c:496
+#: src/compose.c:494
 #, fuzzy
 msgid "/_File/_Send"
 msgstr "/_Filer/_Gem"
 
-#: src/compose.c:498
+#: src/compose.c:496
 #, fuzzy
 msgid "/_File/Send _later"
 msgstr "/_Meddelelse/_Send senere"
 
-#: src/compose.c:501
+#: src/compose.c:499
 #, fuzzy
 msgid "/_File/Save to _draft folder"
 msgstr "/_Meddelelse/Gem i _kladde mappe"
 
-#: src/compose.c:503
+#: src/compose.c:501
 #, fuzzy
 msgid "/_File/Save and _keep editing"
 msgstr "/_Meddelelse/_Send senere"
 
-#: src/compose.c:506
+#: src/compose.c:504
 msgid "/_File/_Attach file"
 msgstr "/_Filer/_Vedhæft fil"
 
-#: src/compose.c:507
+#: src/compose.c:505
 msgid "/_File/_Insert file"
 msgstr "/_Filer/_Indsæt fil"
 
-#: src/compose.c:508
+#: src/compose.c:506
 msgid "/_File/Insert si_gnature"
 msgstr "/_Filer/Tilføj _underskrift"
 
-#: src/compose.c:513
+#: src/compose.c:511
 msgid "/_Edit/_Undo"
 msgstr "/_Redigér/_Fortryd"
 
-#: src/compose.c:514
+#: src/compose.c:512
 msgid "/_Edit/_Redo"
 msgstr "/_Redigér/_Gentag"
 
-#: src/compose.c:515 src/compose.c:522 src/mainwindow.c:506
+#: src/compose.c:513 src/compose.c:520 src/mainwindow.c:497
 #: src/messageview.c:146
 msgid "/_Edit/---"
 msgstr "/_Redigér/---"
 
-#: src/compose.c:516
+#: src/compose.c:514
 msgid "/_Edit/Cu_t"
 msgstr "/_Redigér/_Klip"
 
-#: src/compose.c:517 src/mainwindow.c:503 src/messageview.c:144
+#: src/compose.c:515 src/mainwindow.c:494 src/messageview.c:144
 msgid "/_Edit/_Copy"
 msgstr "/_Redigér/K_opiere"
 
-#: src/compose.c:518
+#: src/compose.c:516
 msgid "/_Edit/_Paste"
 msgstr "/_Redigér/_Sæt ind"
 
-#: src/compose.c:519
+#: src/compose.c:517
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Redigér/_Sæt ind som citat"
 
-#: src/compose.c:521 src/mainwindow.c:504 src/messageview.c:145
+#: src/compose.c:519 src/mainwindow.c:495 src/messageview.c:145
 msgid "/_Edit/Select _all"
 msgstr "/_Redigér/Markér _alle"
 
-#: src/compose.c:523
+#: src/compose.c:521
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/_Redigér/Formater a_ktuelt afsnit"
 
-#: src/compose.c:525
+#: src/compose.c:523
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/_Redigér/Formater _alle lange linier"
 
-#: src/compose.c:527
+#: src/compose.c:525
 #, fuzzy
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Redigér/K_opiere"
 
-#: src/compose.c:528 src/mainwindow.c:511 src/messageview.c:150
+#: src/compose.c:526 src/mainwindow.c:502 src/messageview.c:150
 #: src/summaryview.c:400
 msgid "/_View"
 msgstr "/_Vis"
 
-#: src/compose.c:529
+#: src/compose.c:527
 msgid "/_View/_To"
 msgstr "/_Vis/_Til"
 
-#: src/compose.c:530
+#: src/compose.c:528
 msgid "/_View/_Cc"
 msgstr "/_Vis/_Cc"
 
-#: src/compose.c:531
+#: src/compose.c:529
 msgid "/_View/_Bcc"
 msgstr "/_Vis/_Bcc"
 
-#: src/compose.c:532
+#: src/compose.c:530
 msgid "/_View/_Reply to"
 msgstr "/_Vis/_Svar til"
 
-#: src/compose.c:533 src/compose.c:535 src/compose.c:537 src/compose.c:539
-#: src/mainwindow.c:529 src/mainwindow.c:532 src/mainwindow.c:558
-#: src/mainwindow.c:582 src/mainwindow.c:675 src/mainwindow.c:679
+#: src/compose.c:531 src/compose.c:533 src/compose.c:535 src/compose.c:537
+#: src/mainwindow.c:520 src/mainwindow.c:523 src/mainwindow.c:549
+#: src/mainwindow.c:573 src/mainwindow.c:666 src/mainwindow.c:670
 #: src/messageview.c:233
 msgid "/_View/---"
 msgstr "/_Vis/---"
 
-#: src/compose.c:534
+#: src/compose.c:532
 msgid "/_View/_Followup to"
 msgstr "/_Vis/_Followup to"
 
-#: src/compose.c:536
+#: src/compose.c:534
 msgid "/_View/R_uler"
 msgstr "/_Vis/_Linieal"
 
-#: src/compose.c:538
+#: src/compose.c:536
 msgid "/_View/_Attachment"
 msgstr "/_Vis/_Vedhæft"
 
-#: src/compose.c:545 src/mainwindow.c:589 src/messageview.c:157
+#: src/compose.c:543 src/mainwindow.c:580 src/messageview.c:157
 #, fuzzy
 msgid "/_View/Character _encoding"
 msgstr "/_Vis/_Sortere/Faldende"
 
-#: src/compose.c:546
+#: src/compose.c:544
 msgid "/_View/Character _encoding/_Automatic"
 msgstr ""
 
-#: src/compose.c:548 src/compose.c:554 src/compose.c:560 src/compose.c:564
-#: src/compose.c:570 src/compose.c:574 src/compose.c:580 src/compose.c:584
-#: src/compose.c:594 src/compose.c:598 src/compose.c:608 src/compose.c:612
-#: src/mainwindow.c:585 src/mainwindow.c:592 src/messageview.c:153
+#: src/compose.c:546 src/compose.c:552 src/compose.c:558 src/compose.c:562
+#: src/compose.c:568 src/compose.c:572 src/compose.c:578 src/compose.c:582
+#: src/compose.c:592 src/compose.c:596 src/compose.c:606 src/compose.c:610
+#: src/mainwindow.c:576 src/mainwindow.c:583 src/messageview.c:153
 #, fuzzy
 msgid "/_View/Character _encoding/---"
 msgstr "/_Vis/_Sortere/Faldende"
 
-#: src/compose.c:550 src/mainwindow.c:593 src/messageview.c:161
+#: src/compose.c:548 src/mainwindow.c:584 src/messageview.c:161
 #, fuzzy
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Vis/_Tegnsæt/7bit ascii (US-ASC_II)"
 
-#: src/compose.c:552 src/mainwindow.c:595 src/messageview.c:164
+#: src/compose.c:550 src/mainwindow.c:586 src/messageview.c:164
 #, fuzzy
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Vis/_Tegnsæt/Unicode (_UTF-8)"
 
-#: src/compose.c:556 src/mainwindow.c:599 src/messageview.c:167
+#: src/compose.c:554 src/mainwindow.c:590 src/messageview.c:167
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Vis/_Tegnsæt/Western European (ISO-8859-_1)"
 
-#: src/compose.c:558 src/mainwindow.c:601 src/messageview.c:169
+#: src/compose.c:556 src/mainwindow.c:592 src/messageview.c:169
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Vis/_Tegnsæt/Western European (ISO-8859-_15)"
 
-#: src/compose.c:562 src/mainwindow.c:605 src/messageview.c:172
+#: src/compose.c:560 src/mainwindow.c:596 src/messageview.c:172
 #, fuzzy
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Vis/_Tegnsæt/Central European (ISO-8859-_2)"
 
-#: src/compose.c:566 src/mainwindow.c:609 src/messageview.c:175
+#: src/compose.c:564 src/mainwindow.c:600 src/messageview.c:175
 #, fuzzy
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Vis/_Tegnsæt/_Baltic (ISO-8859-13)"
 
-#: src/compose.c:568 src/mainwindow.c:611 src/messageview.c:177
+#: src/compose.c:566 src/mainwindow.c:602 src/messageview.c:177
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Vis/_Tegnsæt/Baltic (ISO-8859-_4)"
 
-#: src/compose.c:572 src/mainwindow.c:615 src/messageview.c:180
+#: src/compose.c:570 src/mainwindow.c:606 src/messageview.c:180
 #, fuzzy
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Vis/_Tegnsæt/Greek (ISO-8859-_7)"
 
-#: src/compose.c:576 src/mainwindow.c:619 src/messageview.c:183
+#: src/compose.c:574 src/mainwindow.c:610 src/messageview.c:183
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Vis/_Tegnsæt/Greek (ISO-8859-_7)"
 
-#: src/compose.c:578 src/mainwindow.c:621 src/messageview.c:185
+#: src/compose.c:576 src/mainwindow.c:612 src/messageview.c:185
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Vis/_Tegnsæt/Cyrillic (Windows-1251)"
 
-#: src/compose.c:582 src/mainwindow.c:625 src/messageview.c:188
+#: src/compose.c:580 src/mainwindow.c:616 src/messageview.c:188
 #, fuzzy
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Vis/_Tegnsæt/Turkish (ISO-8859-_9)"
 
-#: src/compose.c:586 src/mainwindow.c:629 src/messageview.c:191
+#: src/compose.c:584 src/mainwindow.c:620 src/messageview.c:191
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Vis/_Tegnsæt/Cyrillic (ISO-8859-_5)"
 
-#: src/compose.c:588 src/mainwindow.c:631 src/messageview.c:193
+#: src/compose.c:586 src/mainwindow.c:622 src/messageview.c:193
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Vis/_Tegnsæt/Cyrillic (KOI8-_R)"
 
-#: src/compose.c:590 src/mainwindow.c:633 src/messageview.c:195
+#: src/compose.c:588 src/mainwindow.c:624 src/messageview.c:195
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Vis/_Tegnsæt/Cyrillic (KOI8-_R)"
 
-#: src/compose.c:592 src/mainwindow.c:635 src/messageview.c:197
+#: src/compose.c:590 src/mainwindow.c:626 src/messageview.c:197
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Vis/_Tegnsæt/Cyrillic (Windows-1251)"
 
-#: src/compose.c:596 src/mainwindow.c:639 src/messageview.c:200
+#: src/compose.c:594 src/mainwindow.c:630 src/messageview.c:200
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Vis/_Tegnsæt/Japanese (ISO-2022-_JP)"
 
-#: src/compose.c:600 src/mainwindow.c:649 src/messageview.c:209
+#: src/compose.c:598 src/mainwindow.c:640 src/messageview.c:209
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Vis/_Tegnsæt/Simplified Chinese (_GB2312)"
 
-#: src/compose.c:602 src/mainwindow.c:651 src/messageview.c:211
+#: src/compose.c:600 src/mainwindow.c:642 src/messageview.c:211
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Vis/_Tegnsæt/Simplified Chinese (_GB2312)"
 
-#: src/compose.c:604 src/mainwindow.c:653 src/messageview.c:213
+#: src/compose.c:602 src/mainwindow.c:644 src/messageview.c:213
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Vis/_Tegnsæt/Traditional Chinese (_Big5)"
 
-#: src/compose.c:606 src/mainwindow.c:655 src/messageview.c:215
+#: src/compose.c:604 src/mainwindow.c:646 src/messageview.c:215
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Vis/_Tegnsæt/Traditional Chinese (EUC-_TW)"
 
-#: src/compose.c:610 src/mainwindow.c:661 src/messageview.c:220
+#: src/compose.c:608 src/mainwindow.c:652 src/messageview.c:220
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Vis/_Tegnsæt/Korean (EUC-_KR)"
 
-#: src/compose.c:614 src/mainwindow.c:667 src/messageview.c:225
+#: src/compose.c:612 src/mainwindow.c:658 src/messageview.c:225
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Vis/_Tegnsæt/Thai (TIS-620)"
 
-#: src/compose.c:616 src/mainwindow.c:669 src/messageview.c:227
+#: src/compose.c:614 src/mainwindow.c:660 src/messageview.c:227
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Vis/_Tegnsæt/Thai (Windows-874)"
 
-#: src/compose.c:620 src/mainwindow.c:726 src/messageview.c:257
+#: src/compose.c:618 src/mainwindow.c:717 src/messageview.c:257
 msgid "/_Tools/_Address book"
 msgstr "/_Funktioner/_Adressebog"
 
-#: src/compose.c:621
+#: src/compose.c:619
 msgid "/_Tools/_Template"
 msgstr "/_Funktioner/_Skabelon"
 
-#: src/compose.c:622 src/mainwindow.c:749 src/messageview.c:272
+#: src/compose.c:620 src/mainwindow.c:740 src/messageview.c:272
 msgid "/_Tools/Actio_ns"
 msgstr "/_Funktioner/_Handlinger"
 
-#: src/compose.c:623 src/compose.c:627 src/mainwindow.c:729
-#: src/mainwindow.c:743 src/mainwindow.c:748 src/mainwindow.c:750
-#: src/mainwindow.c:753 src/mainwindow.c:755 src/messageview.c:260
+#: src/compose.c:621 src/compose.c:625 src/mainwindow.c:720
+#: src/mainwindow.c:734 src/mainwindow.c:739 src/mainwindow.c:741
+#: src/mainwindow.c:744 src/mainwindow.c:746 src/messageview.c:260
 #: src/messageview.c:271
 msgid "/_Tools/---"
 msgstr "/_Funktioner/---"
 
-#: src/compose.c:624
+#: src/compose.c:622
 #, fuzzy
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/_Redigér/Redigér med e_kstern editor"
 
-#: src/compose.c:628
+#: src/compose.c:626
 #, fuzzy
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Funktioner/_Handlinger"
 
-#: src/compose.c:629
+#: src/compose.c:627
 #, fuzzy
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/_Meddelelse/_Kryptere"
 
-#: src/compose.c:855
+#: src/compose.c:853
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: fil findes ikke\n"
 
-#: src/compose.c:954 src/compose.c:1024 src/procmsg.c:1353
+#: src/compose.c:952 src/compose.c:1022 src/procmsg.c:1353
 msgid "Can't get text part\n"
 msgstr "Kan ikke læse tekst afsnit\n"
 
-#: src/compose.c:1420
+#: src/compose.c:1418
 msgid "Quote mark format error."
 msgstr "Citat markérings format fejl."
 
-#: src/compose.c:1432
+#: src/compose.c:1430
 msgid "Message reply/forward format error."
 msgstr "Meddelelses svar / videresend fejl."
 
-#: src/compose.c:1801
+#: src/compose.c:1799
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Filen %s findes ikke\n"
 
-#: src/compose.c:1805
+#: src/compose.c:1803
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Kan ikke læse størrelse på %s\n"
 
-#: src/compose.c:1809
+#: src/compose.c:1807
 #, c-format
 msgid "File %s is empty."
 msgstr "Filen %s er tom."
 
-#: src/compose.c:1813
+#: src/compose.c:1811
 #, c-format
 msgid "Can't read %s."
 msgstr "kan ikke læse %s"
 
-#: src/compose.c:1848
+#: src/compose.c:1846
 #, c-format
 msgid "Message: %s"
 msgstr "Meddelelse: %s"
 
-#: src/compose.c:1920 src/mimeview.c:560
+#: src/compose.c:1918 src/mimeview.c:560
 msgid "Can't get the part of multipart message."
 msgstr "Kan ikke hente del af multipart meddelese."
 
-#: src/compose.c:2362
+#: src/compose.c:2360
 msgid " [Edited]"
 msgstr " [Redigéret]"
 
-#: src/compose.c:2364
+#: src/compose.c:2362
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Ny meddelelse%s"
 
-#: src/compose.c:2367
+#: src/compose.c:2365
 #, c-format
 msgid "Compose message%s"
 msgstr "Ny meddelelse%s"
 
-#: src/compose.c:2478
+#: src/compose.c:2476
 msgid "Recipient is not specified."
 msgstr "Mangler modtager"
 
-#: src/compose.c:2486
+#: src/compose.c:2484
 #, fuzzy
 msgid "Empty subject"
 msgstr "Emne"
 
-#: src/compose.c:2487
+#: src/compose.c:2485
 msgid "Subject is empty. Send it anyway?"
 msgstr "Emne er tom. Send alligevel?"
 
-#: src/compose.c:2538
+#: src/compose.c:2536
 msgid "can't get recipient list."
 msgstr "Kan ikke åbne modtager liste."
 
-#: src/compose.c:2558
+#: src/compose.c:2556
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1021,26 +1021,26 @@ msgstr ""
 "Konto til afsendelse af e-post er ikke valgt.\n"
 "Vælg konto før afsendelse er mulig."
 
-#: src/compose.c:2572 src/send_message.c:297
+#: src/compose.c:2570 src/send_message.c:297
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Fejl ved afsendelse af meddelelse til %s ."
 
-#: src/compose.c:2595
+#: src/compose.c:2593
 msgid "Can't save the message to outbox."
 msgstr "Kan ikke gemme meddelelse i Sendt"
 
-#: src/compose.c:2645
+#: src/compose.c:2643
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "Kunne ikke funde nøgle til den valgte nøgle id `%s'."
 
-#: src/compose.c:2709 src/compose.c:2965 src/compose.c:3028 src/compose.c:3148
-#: src/utils.c:2365
+#: src/compose.c:2707 src/compose.c:2963 src/compose.c:3026 src/compose.c:3146
+#: src/utils.c:2379
 msgid "can't change file mode\n"
 msgstr "kan ikke ændre fil mode\n"
 
-#: src/compose.c:2741
+#: src/compose.c:2739
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1051,12 +1051,12 @@ msgstr ""
 "%s til %s.\n"
 "Send den alligevel?"
 
-#: src/compose.c:2747
+#: src/compose.c:2745
 #, fuzzy
 msgid "Code conversion error"
 msgstr "Adressebog konverterings fejl"
 
-#: src/compose.c:2816
+#: src/compose.c:2814
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1065,155 +1065,155 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:2820
+#: src/compose.c:2818
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3108
+#: src/compose.c:3106
 msgid "can't remove the old message\n"
 msgstr "kan ikke slette gammel meddelelse\n"
 
-#: src/compose.c:3126
+#: src/compose.c:3124
 msgid "queueing message...\n"
 msgstr "meddelelse i kø...\n"
 
-#: src/compose.c:3208
+#: src/compose.c:3206
 msgid "can't find queue folder\n"
 msgstr "kan ikke vælge mappe %s\n"
 
-#: src/compose.c:3215
+#: src/compose.c:3213
 msgid "can't queue the message\n"
 msgstr "meddelelse kan ikke lægges i kø\n"
 
-#: src/compose.c:3792
+#: src/compose.c:3790
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "genereret meddelelses ID: %s\n"
 
-#: src/compose.c:3901
+#: src/compose.c:3899
 msgid "Creating compose window...\n"
 msgstr "Opretter instastnings vindue...\n"
 
-#: src/compose.c:3949 src/headerview.c:54 src/summary_search.c:214
+#: src/compose.c:3947 src/headerview.c:54 src/summary_search.c:214
 msgid "From:"
 msgstr "Fra:"
 
-#: src/compose.c:4021
+#: src/compose.c:4019
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/_Funktioner/_Handlinger"
 
-#: src/compose.c:4024
+#: src/compose.c:4022
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/_Meddelelse/_Kryptere"
 
-#: src/compose.c:4062 src/compose.c:5001
+#: src/compose.c:4060 src/compose.c:4995
 msgid "MIME type"
 msgstr "MIME type"
 
 #. S_COL_DATE
-#: src/compose.c:4071 src/mimeview.c:192 src/prefs_filter_edit.c:585
+#: src/compose.c:4069 src/mimeview.c:192 src/prefs_filter_edit.c:585
 #: src/prefs_summary_column.c:75 src/select-keys.c:317 src/summaryview.c:4217
 msgid "Size"
 msgstr "Størrelse"
 
-#: src/compose.c:4449 src/mainwindow.c:2224 src/prefs_account.c:719
+#: src/compose.c:4442 src/mainwindow.c:2207 src/prefs_account.c:719
 #: src/prefs_common.c:947
 msgid "Send"
 msgstr "Send"
 
-#: src/compose.c:4450
+#: src/compose.c:4443
 msgid "Send message"
 msgstr "Sende meddelelse"
 
-#: src/compose.c:4458
+#: src/compose.c:4451
 msgid "Send later"
 msgstr "Send senere"
 
-#: src/compose.c:4459
+#: src/compose.c:4452
 msgid "Put into queue folder and send later"
 msgstr "Læg i kø og send senere"
 
-#: src/compose.c:4467
+#: src/compose.c:4460
 msgid "Draft"
 msgstr "Kladde"
 
-#: src/compose.c:4468
+#: src/compose.c:4461
 msgid "Save to draft folder"
 msgstr "Gem i Kladde"
 
-#: src/compose.c:4478
+#: src/compose.c:4471
 msgid "Insert"
 msgstr "Indæst"
 
-#: src/compose.c:4479
+#: src/compose.c:4472
 msgid "Insert file"
 msgstr "Insæt fil"
 
-#: src/compose.c:4487
+#: src/compose.c:4480
 msgid "Attach"
 msgstr "Vedhæft"
 
-#: src/compose.c:4488
+#: src/compose.c:4481
 msgid "Attach file"
 msgstr "Vedhæft fil"
 
 #. signature
-#: src/compose.c:4498 src/prefs_account.c:1391 src/prefs_common.c:1356
+#: src/compose.c:4491 src/prefs_account.c:1391 src/prefs_common.c:1356
 msgid "Signature"
 msgstr "Underskrift"
 
-#: src/compose.c:4499
+#: src/compose.c:4492
 msgid "Insert signature"
 msgstr "Indsæt underskrift"
 
-#: src/compose.c:4508 src/prefs_common.c:1378 src/prefs_common.c:2382
+#: src/compose.c:4501 src/prefs_common.c:1378 src/prefs_common.c:2382
 msgid "Editor"
 msgstr "Editor"
 
-#: src/compose.c:4509
+#: src/compose.c:4502
 msgid "Edit with external editor"
 msgstr "Redigér med ekstern Editor"
 
-#: src/compose.c:4517
+#: src/compose.c:4510
 msgid "Linewrap"
 msgstr "Linie deling"
 
-#: src/compose.c:4518
+#: src/compose.c:4511
 msgid "Wrap all long lines"
 msgstr "/_Redigér/Formater _alle lange linier"
 
-#: src/compose.c:4897
+#: src/compose.c:4891
 msgid "Invalid MIME type."
 msgstr "Ugyldig MIME type"
 
-#: src/compose.c:4915
+#: src/compose.c:4909
 msgid "File doesn't exist or is empty."
 msgstr "Fil eksisterer ikke eller er tom."
 
-#: src/compose.c:4983
+#: src/compose.c:4977
 msgid "Properties"
 msgstr "Egenskaber"
 
-#: src/compose.c:5003
+#: src/compose.c:4997
 msgid "Encoding"
 msgstr "Tegnsæt kodning"
 
-#: src/compose.c:5026 src/prefs_folder_item.c:183
+#: src/compose.c:5020 src/prefs_folder_item.c:183
 msgid "Path"
 msgstr "Sti"
 
-#: src/compose.c:5027
+#: src/compose.c:5021
 msgid "File name"
 msgstr "Fil navn"
 
-#: src/compose.c:5185
+#: src/compose.c:5179
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Sti til ekstern editor er ugyldig: `%s'\n"
 
-#: src/compose.c:5211
+#: src/compose.c:5205
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1224,75 +1224,75 @@ msgstr ""
 "Afbryde?\n"
 "ID: %d"
 
-#: src/compose.c:5228
+#: src/compose.c:5222
 #, c-format
 msgid "Terminated process group id: %d"
 msgstr "Afbrudt proces gruppe ID: %d"
 
-#: src/compose.c:5229
+#: src/compose.c:5223
 #, c-format
 msgid "Temporary file: %s"
 msgstr "Midlertidig fil: %s"
 
-#: src/compose.c:5253
+#: src/compose.c:5247
 msgid "Compose: input from monitoring process\n"
 msgstr "Instast: fra monitor process\n"
 
 #. failed
-#: src/compose.c:5284
+#: src/compose.c:5278
 msgid "Couldn't exec external editor\n"
 msgstr "Kunne ikke starte ekstern editor\n"
 
-#: src/compose.c:5288
+#: src/compose.c:5282
 msgid "Couldn't write to file\n"
 msgstr "Kunne ikke gemme fil\n"
 
-#: src/compose.c:5290
+#: src/compose.c:5284
 msgid "Pipe read failed\n"
 msgstr "Fejl i læsning fra Pipe\n"
 
-#: src/compose.c:5596 src/compose.c:5604 src/compose.c:5610
+#: src/compose.c:5590 src/compose.c:5598 src/compose.c:5604
 msgid "Can't queue the message."
 msgstr "Meddelelse kan ikke lægges i kø."
 
-#: src/compose.c:5701
+#: src/compose.c:5695
 #, fuzzy
 msgid "Select files"
 msgstr "Vælg fil"
 
-#: src/compose.c:5723
+#: src/compose.c:5717
 msgid "Select file"
 msgstr "Vælg fil"
 
-#: src/compose.c:5760
+#: src/compose.c:5754
 #, fuzzy
 msgid "Save message"
 msgstr "Sende meddelelse"
 
-#: src/compose.c:5761
+#: src/compose.c:5755
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Denne meddelelse er ændret. Slet?"
 
-#: src/compose.c:5763
+#: src/compose.c:5757
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:5805
+#: src/compose.c:5799
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Vil du benytte skabelon `%s' ?"
 
-#: src/compose.c:5807
+#: src/compose.c:5801
 msgid "Apply template"
 msgstr "Benyt skabelon"
 
-#: src/compose.c:5808
+#: src/compose.c:5802
 #, fuzzy
 msgid "_Replace"
 msgstr "Erstat"
 
-#: src/compose.c:5808
+#: src/compose.c:5802
 #, fuzzy
 msgid "_Insert"
 msgstr "Indæst"
@@ -1739,12 +1739,12 @@ msgstr "Indtast mappe information...\n"
 msgid "Setting folder info..."
 msgstr "Indtast mappe information..."
 
-#: src/folderview.c:805 src/mainwindow.c:3301 src/setup.c:81
+#: src/folderview.c:805 src/mainwindow.c:3272 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Gennemsøger mappe %s%c%s ..."
 
-#: src/folderview.c:809 src/mainwindow.c:3306 src/setup.c:86
+#: src/folderview.c:809 src/mainwindow.c:3277 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Gennemsøger mappe %s ..."
@@ -2068,44 +2068,44 @@ msgstr "IMAP4 godkendelse fejlede.\n"
 msgid "IMAP4 login failed.\n"
 msgstr "IMAP4-Login fejlet.\n"
 
-#: src/imap.c:3522
+#: src/imap.c:3528
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "kan ikke tilføje %s til %s\n"
 
-#: src/imap.c:3529
+#: src/imap.c:3535
 msgid "(sending file...)"
 msgstr "(sender fil...)"
 
-#: src/imap.c:3557
+#: src/imap.c:3563
 #, fuzzy, c-format
 msgid "can't append message to %s\n"
 msgstr "kan ikke tilføje meddelelse %s\n"
 
-#: src/imap.c:3589
+#: src/imap.c:3595
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "kan ikke kopiere %s til %s\n"
 
-#: src/imap.c:3613
+#: src/imap.c:3619
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "fejl ved IMAP kommando: STORE %s %s\n"
 
-#: src/imap.c:3627
+#: src/imap.c:3633
 msgid "error while imap command: EXPUNGE\n"
 msgstr "fejl ved IMAP kommand: EXPUNGE\n"
 
-#: src/imap.c:3640
+#: src/imap.c:3646
 msgid "error while imap command: CLOSE\n"
 msgstr "fejl ved IMAP kommand: CLOSE\n"
 
-#: src/imap.c:3873
+#: src/imap.c:3879
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv kan ikke konvertere UTF-7 til %s\n"
 
-#: src/imap.c:3903
+#: src/imap.c:3909
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv can ikke konvertere %s til UTF-7\n"
@@ -2207,7 +2207,7 @@ msgstr "Importer LDIF fil til adressebog"
 msgid "Prev"
 msgstr "Forrige"
 
-#: src/importldif.c:768 src/mainwindow.c:2321
+#: src/importldif.c:768 src/mainwindow.c:2303
 msgid "Next"
 msgstr "Næste"
 
@@ -2557,646 +2557,646 @@ msgid ""
 "Do you want to migrate it?"
 msgstr ""
 
-#: src/mainwindow.c:471
+#: src/mainwindow.c:462
 msgid "/_File/_Folder"
 msgstr "/_Filer/_Mappe"
 
-#: src/mainwindow.c:472
+#: src/mainwindow.c:463
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/_Filer/_Mappe/Opret _ny mappe..."
 
-#: src/mainwindow.c:474
+#: src/mainwindow.c:465
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/_Filer/_Mappe/_Omdøb mappe..."
 
-#: src/mainwindow.c:475
+#: src/mainwindow.c:466
 #, fuzzy
 msgid "/_File/_Folder/_Move folder..."
 msgstr "/_Filer/_Mappe/_Omdøb mappe..."
 
-#: src/mainwindow.c:476
+#: src/mainwindow.c:467
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/_Filer/_Mappe/_Slet mappe"
 
-#: src/mainwindow.c:477
+#: src/mainwindow.c:468
 #, fuzzy
 msgid "/_File/_Mailbox"
 msgstr "/_Filer/_Tilføj mailbox..."
 
-#: src/mainwindow.c:478
+#: src/mainwindow.c:469
 #, fuzzy
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/_Filer/_Tilføj mailbox..."
 
-#: src/mainwindow.c:479
+#: src/mainwindow.c:470
 #, fuzzy
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/Slet _mappe"
 
-#: src/mainwindow.c:480 src/mainwindow.c:485
+#: src/mainwindow.c:471 src/mainwindow.c:476
 #, fuzzy
 msgid "/_File/_Mailbox/---"
 msgstr "/_Filer/_Mappe/---"
 
-#: src/mainwindow.c:481
+#: src/mainwindow.c:472
 #, fuzzy
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "_Hent nye meddelelser"
 
-#: src/mainwindow.c:483
+#: src/mainwindow.c:474
 #, fuzzy
 msgid "/_File/_Mailbox/Check for new messages in _all mailboxes"
 msgstr "/_Filer/_Mappe/_Hent nye meddelelser i alle mapper"
 
-#: src/mainwindow.c:486
+#: src/mainwindow.c:477
 #, fuzzy
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "/G_endan mappe træ"
 
-#: src/mainwindow.c:489
+#: src/mainwindow.c:480
 msgid "/_File/_Import mbox file..."
 msgstr "/_Filer/_Importere mbox fil..."
 
-#: src/mainwindow.c:490
+#: src/mainwindow.c:481
 msgid "/_File/_Export to mbox file..."
 msgstr "/_Filer/_Eksportere mbox fil..."
 
-#: src/mainwindow.c:492
+#: src/mainwindow.c:483
 #, fuzzy
 msgid "/_File/Empty all _trash"
 msgstr "/_Filer/_Tøm slettet post"
 
-#: src/mainwindow.c:494 src/messageview.c:138
+#: src/mainwindow.c:485 src/messageview.c:138
 msgid "/_File/_Save as..."
 msgstr "/_Filer/_Gem som..."
 
-#: src/mainwindow.c:495 src/messageview.c:139
+#: src/mainwindow.c:486 src/messageview.c:139
 msgid "/_File/_Print..."
 msgstr "/_Filer/_Udskriv..."
 
-#: src/mainwindow.c:497
+#: src/mainwindow.c:488
 #, fuzzy
 msgid "/_File/_Work offline"
 msgstr "/_Filer/_Indsæt fil"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:500
+#: src/mainwindow.c:491
 msgid "/_File/E_xit"
 msgstr "/_Filer/_Afslut"
 
-#: src/mainwindow.c:505
+#: src/mainwindow.c:496
 msgid "/_Edit/Select _thread"
 msgstr "/_Redigér/Markér _tråd"
 
-#: src/mainwindow.c:507 src/messageview.c:147
+#: src/mainwindow.c:498 src/messageview.c:147
 msgid "/_Edit/_Find in current message..."
 msgstr "/_Redigér/_Søg i aktuel meddelelse"
 
-#: src/mainwindow.c:509
+#: src/mainwindow.c:500
 msgid "/_Edit/_Search messages..."
 msgstr "/_Søg meddelelser..."
 
-#: src/mainwindow.c:512
+#: src/mainwindow.c:503
 msgid "/_View/Show or hi_de"
 msgstr "/_Vis/_Vis eller skjul"
 
-#: src/mainwindow.c:513
+#: src/mainwindow.c:504
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/_Vis/_Vis eller skjul/_Mappe træ"
 
-#: src/mainwindow.c:515
+#: src/mainwindow.c:506
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/_Vis/_Vis eller skjul/_Besked"
 
-#: src/mainwindow.c:517
+#: src/mainwindow.c:508
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/_Vis/_Vis eller skjul/_Værktøjslinie"
 
-#: src/mainwindow.c:519
+#: src/mainwindow.c:510
 msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/_Vis/_Vis eller skjul/_Værktøjslinie/Ikon _og tekst"
 
-#: src/mainwindow.c:521
+#: src/mainwindow.c:512
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/_Vis/_Vis eller skjul/_Værktøjslinie/_Ikon"
 
-#: src/mainwindow.c:523
+#: src/mainwindow.c:514
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/_Vis/_Vis eller skjul/_Værktøjslinie/_Tekst"
 
-#: src/mainwindow.c:525
+#: src/mainwindow.c:516
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/_Vis/_Vis eller skjul/_Værktøjslinie/_Ingen"
 
-#: src/mainwindow.c:527
+#: src/mainwindow.c:518
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/_Vis/_Vis eller skjul/_Status linie"
 
-#: src/mainwindow.c:530
+#: src/mainwindow.c:521
 msgid "/_View/Separate f_older tree"
 msgstr "/_Vis/_Seperat mappe træ"
 
-#: src/mainwindow.c:531
+#: src/mainwindow.c:522
 #, fuzzy
 msgid "/_View/Separate _message view"
 msgstr "/_Vis/Seperat m_eddelelses vindue"
 
-#: src/mainwindow.c:533
+#: src/mainwindow.c:524
 msgid "/_View/_Sort"
 msgstr "/_Vis/_Sortere"
 
-#: src/mainwindow.c:534
+#: src/mainwindow.c:525
 msgid "/_View/_Sort/by _number"
 msgstr "/_Vis/_Sortere/_Nummer orden"
 
-#: src/mainwindow.c:535
+#: src/mainwindow.c:526
 msgid "/_View/_Sort/by s_ize"
 msgstr "/_Vis/_Sortere/_Størrelses orden"
 
-#: src/mainwindow.c:536
+#: src/mainwindow.c:527
 msgid "/_View/_Sort/by _date"
 msgstr "/_Vis/_Sortere/_Dato orden"
 
-#: src/mainwindow.c:537
+#: src/mainwindow.c:528
 msgid "/_View/_Sort/by _from"
 msgstr "/_Vis/_Sortere/_Fra orden"
 
-#: src/mainwindow.c:538
+#: src/mainwindow.c:529
 msgid "/_View/_Sort/by _recipient"
 msgstr "/_Vis/_Sortere/Efter _modtager"
 
-#: src/mainwindow.c:539
+#: src/mainwindow.c:530
 msgid "/_View/_Sort/by _subject"
 msgstr "/_Vis/_Sortere/_Emne orden"
 
-#: src/mainwindow.c:540
+#: src/mainwindow.c:531
 msgid "/_View/_Sort/by _color label"
 msgstr "/_Vis/_Sortere/_Farvet label orden"
 
-#: src/mainwindow.c:542
+#: src/mainwindow.c:533
 msgid "/_View/_Sort/by _mark"
 msgstr "/_Vis/_Sortere/_Markéret orden"
 
-#: src/mainwindow.c:543
+#: src/mainwindow.c:534
 msgid "/_View/_Sort/by _unread"
 msgstr "/_Vis/_Sortere/_Ulæst orden"
 
-#: src/mainwindow.c:544
+#: src/mainwindow.c:535
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/_Vis/_Sortere/_Vedhæft orden"
 
-#: src/mainwindow.c:546
+#: src/mainwindow.c:537
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/_Vis/_Sortere/Sorter _ikke"
 
-#: src/mainwindow.c:547 src/mainwindow.c:550
+#: src/mainwindow.c:538 src/mainwindow.c:541
 msgid "/_View/_Sort/---"
 msgstr "/_Vis/_Sortere/---"
 
-#: src/mainwindow.c:548
+#: src/mainwindow.c:539
 msgid "/_View/_Sort/Ascending"
 msgstr "/_Vis/_Sortere/Stigende"
 
-#: src/mainwindow.c:549
+#: src/mainwindow.c:540
 msgid "/_View/_Sort/Descending"
 msgstr "/_Vis/_Sortere/Faldende"
 
-#: src/mainwindow.c:551
+#: src/mainwindow.c:542
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/_Vis/_Sortere/_Emne orden"
 
-#: src/mainwindow.c:553
+#: src/mainwindow.c:544
 msgid "/_View/Th_read view"
 msgstr "/_Vis/_Trådet"
 
-#: src/mainwindow.c:554
+#: src/mainwindow.c:545
 msgid "/_View/E_xpand all threads"
 msgstr "_Vis/Åbn tråde"
 
-#: src/mainwindow.c:555
+#: src/mainwindow.c:546
 msgid "/_View/Co_llapse all threads"
 msgstr "/_Vis/_Saml alle tråde"
 
-#: src/mainwindow.c:556
+#: src/mainwindow.c:547
 msgid "/_View/Set display _item..."
 msgstr "/_Vis/_Sæt visning ..."
 
-#: src/mainwindow.c:559
+#: src/mainwindow.c:550
 msgid "/_View/_Go to"
 msgstr "/_Vis/_Gå til"
 
-#: src/mainwindow.c:560
+#: src/mainwindow.c:551
 msgid "/_View/_Go to/_Prev message"
 msgstr "/_Vis/_Gå til/_Forrige meddelelse"
 
-#: src/mainwindow.c:561
+#: src/mainwindow.c:552
 msgid "/_View/_Go to/_Next message"
 msgstr "/_Vis/_Gå til/_Næste meddelelse"
 
-#: src/mainwindow.c:562 src/mainwindow.c:567 src/mainwindow.c:570
-#: src/mainwindow.c:575 src/mainwindow.c:580
+#: src/mainwindow.c:553 src/mainwindow.c:558 src/mainwindow.c:561
+#: src/mainwindow.c:566 src/mainwindow.c:571
 msgid "/_View/_Go to/---"
 msgstr "/_Vis/_Gå til/---"
 
-#: src/mainwindow.c:563
+#: src/mainwindow.c:554
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/Vis/_Gå til/Forrige ulæste meddelelse"
 
-#: src/mainwindow.c:565
+#: src/mainwindow.c:556
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/_Vis/_Gå til/Næste ulæste meddelelse"
 
-#: src/mainwindow.c:568
+#: src/mainwindow.c:559
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/_Vis/_Gå til/_Forrige nye meddelelse"
 
-#: src/mainwindow.c:569
+#: src/mainwindow.c:560
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/_Vis/_Gå til/_Næste nye meddelelse"
 
-#: src/mainwindow.c:571
+#: src/mainwindow.c:562
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/_Vis/_Gå til/Forrige _markéret meddelelse"
 
-#: src/mainwindow.c:573
+#: src/mainwindow.c:564
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/_Vis/_Gå til/Næste  _markéret meddelelse"
 
-#: src/mainwindow.c:576
+#: src/mainwindow.c:567
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/_Vis/_Gå til/Forrige _label meddelelse"
 
-#: src/mainwindow.c:578
+#: src/mainwindow.c:569
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/_Vis/_Gå til/Næste _label meddelelse"
 
-#: src/mainwindow.c:581
+#: src/mainwindow.c:572
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Vis/_Gå til/Anden _mappe..."
 
-#: src/mainwindow.c:590 src/messageview.c:158
+#: src/mainwindow.c:581 src/messageview.c:158
 #, fuzzy
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Vis/_Tegnsæt/_Automatisk"
 
-#: src/mainwindow.c:641 src/messageview.c:202
+#: src/mainwindow.c:632 src/messageview.c:202
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Vis/_TegnsætJapanese (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:643 src/messageview.c:204
+#: src/mainwindow.c:634 src/messageview.c:204
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Vis/_Tegnsæt/Japanese (_EUC-JP)"
 
-#: src/mainwindow.c:645 src/messageview.c:206
+#: src/mainwindow.c:636 src/messageview.c:206
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Vis//_Tegnsæt/Japanese (_Shift_JIS)"
 
-#: src/mainwindow.c:657 src/messageview.c:217
+#: src/mainwindow.c:648 src/messageview.c:217
 #, fuzzy
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Vis/_Tegnsæt/Chinese (ISO-2022-_CN)"
 
-#: src/mainwindow.c:663 src/messageview.c:222
+#: src/mainwindow.c:654 src/messageview.c:222
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Vis/_Tegnsæt/Korean (ISO-2022-KR)"
 
-#: src/mainwindow.c:676 src/summaryview.c:401
+#: src/mainwindow.c:667 src/summaryview.c:401
 msgid "/_View/Open in new _window"
 msgstr "/_Vis/Åbn i nyt vindue"
 
-#: src/mainwindow.c:677 src/messageview.c:234
+#: src/mainwindow.c:668 src/messageview.c:234
 msgid "/_View/Mess_age source"
 msgstr "/_Vis/_Kilde"
 
-#: src/mainwindow.c:678 src/messageview.c:235
+#: src/mainwindow.c:669 src/messageview.c:235
 msgid "/_View/Show all _header"
 msgstr "/_Vis/_Alle hoved linier"
 
-#: src/mainwindow.c:680
+#: src/mainwindow.c:671
 msgid "/_View/_Update summary"
 msgstr "/_Vis/_Opdatér oversigt"
 
-#: src/mainwindow.c:682 src/messageview.c:237
+#: src/mainwindow.c:673 src/messageview.c:237
 msgid "/_Message"
 msgstr "/_Meddelelse"
 
-#: src/mainwindow.c:683
+#: src/mainwindow.c:674
 #, fuzzy
 msgid "/_Message/Recei_ve"
 msgstr "/_Meddelelse/Redigér _igen"
 
-#: src/mainwindow.c:684
+#: src/mainwindow.c:675
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/_Meddelelse/Hent fra _alle konti"
 
-#: src/mainwindow.c:686
+#: src/mainwindow.c:677
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/_Meddelelse/Hent fra _alle konti"
 
-#: src/mainwindow.c:688
+#: src/mainwindow.c:679
 #, fuzzy
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/_Meddelelse/_Afbryd afsendelse"
 
-#: src/mainwindow.c:690
+#: src/mainwindow.c:681
 #, fuzzy
 msgid "/_Message/Recei_ve/---"
 msgstr "/_Meddelelse/Redigér _igen"
 
-#: src/mainwindow.c:691
+#: src/mainwindow.c:682
 msgid "/_Message/_Send queued messages"
 msgstr "/_Meddelelse/Send meddelelser i _kø"
 
-#: src/mainwindow.c:692 src/mainwindow.c:694 src/mainwindow.c:701
-#: src/mainwindow.c:706 src/mainwindow.c:710 src/mainwindow.c:719
-#: src/mainwindow.c:722 src/messageview.c:240 src/messageview.c:248
+#: src/mainwindow.c:683 src/mainwindow.c:685 src/mainwindow.c:692
+#: src/mainwindow.c:697 src/mainwindow.c:701 src/mainwindow.c:710
+#: src/mainwindow.c:713 src/messageview.c:240 src/messageview.c:248
 #: src/messageview.c:253
 msgid "/_Message/---"
 msgstr "/_Meddelelse/---"
 
-#: src/mainwindow.c:693 src/messageview.c:238
+#: src/mainwindow.c:684 src/messageview.c:238
 msgid "/_Message/Compose _new message"
 msgstr "/_Meddelelse/Opret _ny meddelelse"
 
-#: src/mainwindow.c:695 src/messageview.c:241
+#: src/mainwindow.c:686 src/messageview.c:241
 msgid "/_Message/_Reply"
 msgstr "/_Meddelelse/_Besvar"
 
-#: src/mainwindow.c:696
+#: src/mainwindow.c:687
 msgid "/_Message/Repl_y to"
 msgstr "/_Meddelelse/_Svar til"
 
-#: src/mainwindow.c:697 src/messageview.c:242
+#: src/mainwindow.c:688 src/messageview.c:242
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Meddelelse/_Svar til/A_lle"
 
-#: src/mainwindow.c:698 src/messageview.c:244
+#: src/mainwindow.c:689 src/messageview.c:244
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Meddelelse/_Svar til/Af_sender"
 
-#: src/mainwindow.c:699 src/messageview.c:246
+#: src/mainwindow.c:690 src/messageview.c:246
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Meddelelse/_Svar til/_Alle"
 
-#: src/mainwindow.c:702 src/messageview.c:249
+#: src/mainwindow.c:693 src/messageview.c:249
 msgid "/_Message/_Forward"
 msgstr "/_Meddelelse/_Videresend"
 
-#: src/mainwindow.c:703 src/messageview.c:250
+#: src/mainwindow.c:694 src/messageview.c:250
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Meddelelse/Videresend som _vedhæftet"
 
-#: src/mainwindow.c:705 src/messageview.c:252
+#: src/mainwindow.c:696 src/messageview.c:252
 msgid "/_Message/Redirec_t"
 msgstr "/_Meddelelse/_Omdirigér"
 
-#: src/mainwindow.c:707
+#: src/mainwindow.c:698
 msgid "/_Message/M_ove..."
 msgstr "/_Meddelelse/_Flyt..."
 
-#: src/mainwindow.c:708
+#: src/mainwindow.c:699
 msgid "/_Message/_Copy..."
 msgstr "/_Meddelelse/_Kopiere..."
 
-#: src/mainwindow.c:709
+#: src/mainwindow.c:700
 msgid "/_Message/_Delete"
 msgstr "/_Meddelelse/_Slet"
 
-#: src/mainwindow.c:711
+#: src/mainwindow.c:702
 msgid "/_Message/_Mark"
 msgstr "/_Meddelelse/_Markér"
 
-#: src/mainwindow.c:712
+#: src/mainwindow.c:703
 msgid "/_Message/_Mark/_Mark"
 msgstr "/_Meddelelse/_Markér/_Markér"
 
-#: src/mainwindow.c:713
+#: src/mainwindow.c:704
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/_Meddelelse/_Markér/_Slet markéring"
 
-#: src/mainwindow.c:714
+#: src/mainwindow.c:705
 msgid "/_Message/_Mark/---"
 msgstr "/_Meddelelse/_Markér/---"
 
-#: src/mainwindow.c:715
+#: src/mainwindow.c:706
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/_Meddelelse/_Markér/Som ulæst"
 
-#: src/mainwindow.c:716
+#: src/mainwindow.c:707
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/_Meddelelse/_Markér/Som læst"
 
-#: src/mainwindow.c:718
+#: src/mainwindow.c:709
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/_Meddelelse/_Markér/Alle som læst"
 
-#: src/mainwindow.c:720
+#: src/mainwindow.c:711
 #, fuzzy
 msgid "/_Message/Set as _junk mail"
 msgstr "/_Meddelelse/Hent _ny post"
 
-#: src/mainwindow.c:721
+#: src/mainwindow.c:712
 #, fuzzy
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/_Meddelelse/Hent _ny post"
 
-#: src/mainwindow.c:723 src/messageview.c:254
+#: src/mainwindow.c:714 src/messageview.c:254
 msgid "/_Message/Re-_edit"
 msgstr "/_Meddelelse/Redigér _igen"
 
-#: src/mainwindow.c:727
+#: src/mainwindow.c:718
 #, fuzzy
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/_Funktioner/Tilføj afsender til adressebog"
 
-#: src/mainwindow.c:730
+#: src/mainwindow.c:721
 #, fuzzy
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/_Funktioner/_Filtrere meddelelse"
 
-#: src/mainwindow.c:732
+#: src/mainwindow.c:723
 #, fuzzy
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Funktioner/_Filtrere meddelelse"
 
-#: src/mainwindow.c:734 src/messageview.c:261
+#: src/mainwindow.c:725 src/messageview.c:261
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Funktioner/_Opret filter"
 
-#: src/mainwindow.c:735 src/messageview.c:263
+#: src/mainwindow.c:726 src/messageview.c:263
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Funktioner/_Opret filter/_Automatisk"
 
-#: src/mainwindow.c:737 src/messageview.c:265
+#: src/mainwindow.c:728 src/messageview.c:265
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Funktioner/_Opret filter/Efter _Fra"
 
-#: src/mainwindow.c:739 src/messageview.c:267
+#: src/mainwindow.c:730 src/messageview.c:267
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Funktioner/_Opret filter/Efter _Til"
 
-#: src/mainwindow.c:741 src/messageview.c:269
+#: src/mainwindow.c:732 src/messageview.c:269
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Funktioner/_Opret filter/Efter _Emne"
 
-#: src/mainwindow.c:744
+#: src/mainwindow.c:735
 #, fuzzy
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/_Funktioner/_Filtrere meddelelse"
 
-#: src/mainwindow.c:746
+#: src/mainwindow.c:737
 #, fuzzy
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/_Funktioner/_Filtrere meddelelse"
 
-#: src/mainwindow.c:751
+#: src/mainwindow.c:742
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/_Meddelelse/Slet alle du_blikerede meddelelser"
 
-#: src/mainwindow.c:754
+#: src/mainwindow.c:745
 msgid "/_Tools/E_xecute"
 msgstr "/_Funktioner/_Udfør"
 
-#: src/mainwindow.c:756
+#: src/mainwindow.c:747
 msgid "/_Tools/_Log window"
 msgstr "/Funktioner/_Logbog vindue"
 
-#: src/mainwindow.c:758
+#: src/mainwindow.c:749
 msgid "/_Configuration"
 msgstr "/_Opsæt"
 
-#: src/mainwindow.c:759
+#: src/mainwindow.c:750
 msgid "/_Configuration/_Common preferences..."
 msgstr "/_Opsæt/Generelt _opsæt..."
 
-#: src/mainwindow.c:761
+#: src/mainwindow.c:752
 msgid "/_Configuration/_Filter setting..."
 msgstr "/_Opsæt/_Filter opsæt..."
 
-#: src/mainwindow.c:763
+#: src/mainwindow.c:754
 msgid "/_Configuration/_Template..."
 msgstr "/_Opsæt/_Skabelon..."
 
-#: src/mainwindow.c:764
+#: src/mainwindow.c:755
 msgid "/_Configuration/_Actions..."
 msgstr "/_Opsæt/_Handlinger..."
 
-#: src/mainwindow.c:765
+#: src/mainwindow.c:756
 msgid "/_Configuration/---"
 msgstr "/_Opsæt/---"
 
-#: src/mainwindow.c:766
+#: src/mainwindow.c:757
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Opsæt/_Den aktuelle konto..."
 
-#: src/mainwindow.c:768
+#: src/mainwindow.c:759
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Opsæt/_Opret ny konto..."
 
-#: src/mainwindow.c:770
+#: src/mainwindow.c:761
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Opsæt/_Redigér konti..."
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:763
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Opsæt/_Skift aktuel konto..."
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:767
 msgid "/_Help/_Manual"
 msgstr "/_Hjælp/_Vejledning"
 
-#: src/mainwindow.c:777
+#: src/mainwindow.c:768
 msgid "/_Help/_Manual/_English"
 msgstr "/_Hilfe/_Vejledning/_Engelsk"
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:769
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/_Hilfe/_Vejledning/_Japansk"
 
-#: src/mainwindow.c:779
+#: src/mainwindow.c:770
 msgid "/_Help/_FAQ"
 msgstr "/_Hjælp/_OSS"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:771
 msgid "/_Help/_FAQ/_English"
 msgstr "/_Hjælp/_OSS/_Engelsk"
 
-#: src/mainwindow.c:781
+#: src/mainwindow.c:772
 msgid "/_Help/_FAQ/_German"
 msgstr "/_Hjælp/_OSS/_Tysk"
 
-#: src/mainwindow.c:782
+#: src/mainwindow.c:773
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/_Hjælp/_OSS/_Spansk"
 
-#: src/mainwindow.c:783
+#: src/mainwindow.c:774
 msgid "/_Help/_FAQ/_French"
 msgstr "/_Hjælp/_OSS/_Fransk"
 
-#: src/mainwindow.c:784
+#: src/mainwindow.c:775
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/_Hjælp/_OSS/_Italiensk"
 
-#: src/mainwindow.c:785
+#: src/mainwindow.c:776
 msgid "/_Help/---"
 msgstr "/_Hjælp/---"
 
-#: src/mainwindow.c:825
+#: src/mainwindow.c:816
 msgid "Creating main window...\n"
 msgstr "Opretter hoved vindue...\n"
 
-#: src/mainwindow.c:987
+#: src/mainwindow.c:973
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "HovedVindue: fejl i farve %d\n"
 
-#: src/mainwindow.c:1071 src/summaryview.c:2020 src/summaryview.c:2105
+#: src/mainwindow.c:1057 src/summaryview.c:2020 src/summaryview.c:2105
 #: src/summaryview.c:3342 src/summaryview.c:3415 src/summaryview.c:3728
 msgid "done.\n"
 msgstr "Afsluttet.\n"
 
-#: src/mainwindow.c:1196 src/mainwindow.c:1237 src/mainwindow.c:1265
+#: src/mainwindow.c:1182 src/mainwindow.c:1223 src/mainwindow.c:1251
 msgid "Untitled"
 msgstr "Uden titel"
 
-#: src/mainwindow.c:1266
+#: src/mainwindow.c:1252
 msgid "none"
 msgstr "ingen"
 
-#: src/mainwindow.c:1316
+#: src/mainwindow.c:1302
 #, 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:1536
+#: src/mainwindow.c:1522
 msgid "Offline"
 msgstr ""
 
-#: src/mainwindow.c:1537
+#: src/mainwindow.c:1523
 msgid "You are offline. Go online?"
 msgstr ""
 
-#: src/mainwindow.c:1551
+#: src/mainwindow.c:1537
 #, fuzzy
 msgid "Empty all trash"
 msgstr "Tøm Slettet"
 
-#: src/mainwindow.c:1552
+#: src/mainwindow.c:1538
 #, fuzzy
 msgid "Empty messages in all trash?"
 msgstr "Slet alle meddelelser i Slettet?"
 
-#: src/mainwindow.c:1580
+#: src/mainwindow.c:1566
 msgid "Add mailbox"
 msgstr "Ny mailbox"
 
-#: src/mainwindow.c:1581
+#: src/mainwindow.c:1567
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3206,16 +3206,16 @@ msgstr ""
 "Hvis den eksisterende mailbox angives, vil den blive\n"
 "gennemsøgt automatisk."
 
-#: src/mainwindow.c:1587
+#: src/mainwindow.c:1573
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Mailbox `%s' eksisterer allerede."
 
-#: src/mainwindow.c:1592 src/setup.c:57
+#: src/mainwindow.c:1578 src/setup.c:57
 msgid "Mailbox"
 msgstr "Mailbox"
 
-#: src/mainwindow.c:1598 src/setup.c:63
+#: src/mainwindow.c:1584 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3224,153 +3224,153 @@ msgstr ""
 "Fejl i oprettelse af mailbox.\n"
 "Måske findes filerne allerede eller du har ikke skrive rettighedder."
 
-#: src/mainwindow.c:1989
+#: src/mainwindow.c:1975
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Mappe visning"
 
-#: src/mainwindow.c:2009 src/messageview.c:368
+#: src/mainwindow.c:1995 src/messageview.c:368
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Meddelelses visning"
 
-#: src/mainwindow.c:2156 src/summaryview.c:370
+#: src/mainwindow.c:2142 src/summaryview.c:370
 msgid "/_Reply"
 msgstr "/_Svar"
 
-#: src/mainwindow.c:2157
+#: src/mainwindow.c:2143
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "Svar til alle"
 
-#: src/mainwindow.c:2158
+#: src/mainwindow.c:2144
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/_Svar til/_Afsender"
 
-#: src/mainwindow.c:2159
+#: src/mainwindow.c:2145
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/_Svar til/_Mail liste"
 
-#: src/mainwindow.c:2164 src/summaryview.c:377
+#: src/mainwindow.c:2150 src/summaryview.c:377
 msgid "/_Forward"
 msgstr "/_Videresend"
 
-#: src/mainwindow.c:2165 src/summaryview.c:378
+#: src/mainwindow.c:2151 src/summaryview.c:378
 msgid "/For_ward as attachment"
 msgstr "/Videresend som _vedhæftet"
 
-#: src/mainwindow.c:2166 src/summaryview.c:379
+#: src/mainwindow.c:2152 src/summaryview.c:379
 msgid "/Redirec_t"
 msgstr "/_Omdirigér"
 
-#: src/mainwindow.c:2205
+#: src/mainwindow.c:2188
 msgid "Get"
 msgstr "Hent"
 
-#: src/mainwindow.c:2206
+#: src/mainwindow.c:2189
 msgid "Incorporate new mail"
 msgstr "Hent ny post"
 
-#: src/mainwindow.c:2213
+#: src/mainwindow.c:2196
 msgid "Get all"
 msgstr "Hent alt"
 
-#: src/mainwindow.c:2214
+#: src/mainwindow.c:2197
 msgid "Incorporate new mail of all accounts"
 msgstr "Hent ny post fra alle konti"
 
-#: src/mainwindow.c:2225
+#: src/mainwindow.c:2208
 msgid "Send queued message(s)"
 msgstr "Sender meddelelse(r) i kø"
 
-#: src/mainwindow.c:2235 src/prefs_account.c:721 src/prefs_common.c:949
+#: src/mainwindow.c:2218 src/prefs_account.c:721 src/prefs_common.c:949
 #: src/prefs_folder_item.c:137
 msgid "Compose"
 msgstr "Opret"
 
-#: src/mainwindow.c:2236
+#: src/mainwindow.c:2219
 msgid "Compose new message"
 msgstr "Opret ny meddelelse"
 
-#: src/mainwindow.c:2244 src/prefs_common.c:1448
+#: src/mainwindow.c:2227 src/prefs_common.c:1448
 msgid "Reply"
 msgstr "Besvar"
 
-#: src/mainwindow.c:2245 src/mainwindow.c:2258
+#: src/mainwindow.c:2228 src/mainwindow.c:2241
 msgid "Reply to the message"
 msgstr "Besvar meddelelse"
 
-#: src/mainwindow.c:2263
+#: src/mainwindow.c:2245
 msgid "Reply all"
 msgstr "Besvar alle"
 
-#: src/mainwindow.c:2264
+#: src/mainwindow.c:2246
 msgid "Reply to all"
 msgstr "Svar til alle"
 
-#: src/mainwindow.c:2272 src/prefs_filter_edit.c:741
+#: src/mainwindow.c:2254 src/prefs_filter_edit.c:741
 msgid "Forward"
 msgstr "Videresend"
 
-#: src/mainwindow.c:2273 src/mainwindow.c:2286
+#: src/mainwindow.c:2255 src/mainwindow.c:2268
 msgid "Forward the message"
 msgstr "Videresend meddelelse"
 
-#: src/mainwindow.c:2293
+#: src/mainwindow.c:2275
 msgid "Delete the message"
 msgstr "Slet meddelelse"
 
-#: src/mainwindow.c:2301 src/prefs_common.c:1988
+#: src/mainwindow.c:2283 src/prefs_common.c:1988
 msgid "Junk"
 msgstr ""
 
-#: src/mainwindow.c:2302
+#: src/mainwindow.c:2284
 #, fuzzy
 msgid "Set as junk mail"
 msgstr "Standard konto"
 
-#: src/mainwindow.c:2311
+#: src/mainwindow.c:2293
 msgid "Execute"
 msgstr "Udfør"
 
-#: src/mainwindow.c:2312
+#: src/mainwindow.c:2294
 msgid "Execute marked process"
 msgstr "Udfør markéret process"
 
-#: src/mainwindow.c:2322
+#: src/mainwindow.c:2304
 msgid "Next unread message"
 msgstr "Næste ulæste"
 
-#: src/mainwindow.c:2334
+#: src/mainwindow.c:2316
 msgid "Prefs"
 msgstr "Opsæt"
 
-#: src/mainwindow.c:2335
+#: src/mainwindow.c:2317
 msgid "Common preferences"
 msgstr "Generelt opsæt"
 
-#: src/mainwindow.c:2343 src/prefs_folder_item.c:261
+#: src/mainwindow.c:2325 src/prefs_folder_item.c:261
 #: src/prefs_folder_item.c:272 src/progressdialog.c:128
 msgid "Account"
 msgstr "Konto"
 
-#: src/mainwindow.c:2344
+#: src/mainwindow.c:2326
 msgid "Account setting"
 msgstr "Konto indstillinger"
 
-#: src/mainwindow.c:2527
+#: src/mainwindow.c:2498
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 
-#: src/mainwindow.c:2538
+#: src/mainwindow.c:2509
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 
-#: src/mainwindow.c:2731
+#: src/mainwindow.c:2702
 msgid "Exit"
 msgstr "Afslut"
 
-#: src/mainwindow.c:2731
+#: src/mainwindow.c:2702
 msgid "Exit this program?"
 msgstr "Afslut program?"
 
@@ -5611,11 +5611,11 @@ msgstr "Opretter dialog...\n"
 msgid "Status"
 msgstr "Status"
 
-#: src/recv.c:113
+#: src/recv.c:112
 msgid "error occurred while retrieving data.\n"
 msgstr "fejl ved modtagelse af data.\n"
 
-#: src/recv.c:155 src/recv.c:197 src/recv.c:213
+#: src/recv.c:154 src/recv.c:196 src/recv.c:211
 msgid "Can't write to file.\n"
 msgstr "Kan ikke skrive til fil.\n"
 
@@ -6358,7 +6358,7 @@ msgstr "%.2fMB"
 msgid "%.2fGB"
 msgstr "%.2fGB"
 
-#: src/utils.c:2372 src/utils.c:2496
+#: src/utils.c:2386 src/utils.c:2510
 #, c-format
 msgid "writing to %s failed.\n"
 msgstr "fejl ved skrivning til %s.\n"
diff --git a/po/de.po b/po/de.po
index 33e16a85..74ac7103 100644
--- a/po/de.po
+++ b/po/de.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-08-09 18:08+0900\n"
+"POT-Creation-Date: 2005-08-22 17:22+0900\n"
 "PO-Revision-Date: 2005-07-22 18:18+0100\n"
 "Last-Translator: Joo Martin <debian@joomart.de>\n"
 "Language-Team: German <gnome-de@gnome.org>\n"
@@ -100,7 +100,7 @@ msgstr ""
 "in der 'G'-Spalte, um den Nachrichten-Empfang bei 'Hole alle' einzuschalten."
 
 #: src/account.c:691 src/addressadd.c:192 src/addressbook.c:490
-#: src/compose.c:4081 src/editaddress.c:200 src/editaddress.c:942
+#: src/compose.c:4079 src/editaddress.c:200 src/editaddress.c:942
 #: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:265
 #: src/editjpilot.c:271 src/editldap.c:307 src/editvcard.c:184
 #: src/mimeview.c:201 src/prefs_filter.c:258 src/prefs_folder_item.c:170
@@ -236,7 +236,7 @@ msgstr "Aktionen Benutzer-Parameter"
 msgid "Add Address to Book"
 msgstr "Adresse in Adressbuch einfügen"
 
-#: src/addressadd.c:202 src/compose.c:4528 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4521 src/editaddress.c:201
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "Adresse"
@@ -250,7 +250,7 @@ msgstr "Kommentar"
 msgid "Select Address Book Folder"
 msgstr "Wähle Adressbuchablage"
 
-#: src/addressbook.c:336 src/compose.c:495 src/mainwindow.c:470
+#: src/addressbook.c:336 src/compose.c:493 src/mainwindow.c:461
 #: src/messageview.c:137
 msgid "/_File"
 msgstr "/_Datei"
@@ -271,10 +271,10 @@ msgstr "/_Datei/Neues _JPilot"
 msgid "/_File/New _Server"
 msgstr "/_Datei/Neuer _Server"
 
-#: src/addressbook.c:345 src/addressbook.c:348 src/compose.c:500
-#: src/compose.c:505 src/compose.c:509 src/mainwindow.c:488
-#: src/mainwindow.c:491 src/mainwindow.c:493 src/mainwindow.c:496
-#: src/mainwindow.c:498 src/messageview.c:140
+#: src/addressbook.c:345 src/addressbook.c:348 src/compose.c:498
+#: src/compose.c:503 src/compose.c:507 src/mainwindow.c:479
+#: src/mainwindow.c:482 src/mainwindow.c:484 src/mainwindow.c:487
+#: src/mainwindow.c:489 src/messageview.c:140
 msgid "/_File/---"
 msgstr "/_Datei/---"
 
@@ -290,7 +290,7 @@ msgstr "/_Datei/_Löschen"
 msgid "/_File/_Save"
 msgstr "/_Datei/_Speichern"
 
-#: src/addressbook.c:350 src/compose.c:510 src/messageview.c:141
+#: src/addressbook.c:350 src/compose.c:508 src/messageview.c:141
 msgid "/_File/_Close"
 msgstr "/_Datei/S_chließen"
 
@@ -322,7 +322,7 @@ msgstr "/_Adresse/_Bearbeiten"
 msgid "/_Address/_Delete"
 msgstr "/_Adresse/_Löschen"
 
-#: src/addressbook.c:358 src/compose.c:619 src/mainwindow.c:725
+#: src/addressbook.c:358 src/compose.c:617 src/mainwindow.c:716
 #: src/messageview.c:256
 msgid "/_Tools"
 msgstr "/_Werkzeug"
@@ -331,12 +331,12 @@ msgstr "/_Werkzeug"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Werkzeug/Importiere _LDIF-Datei"
 
-#: src/addressbook.c:360 src/compose.c:632 src/mainwindow.c:775
+#: src/addressbook.c:360 src/compose.c:630 src/mainwindow.c:766
 #: src/messageview.c:274
 msgid "/_Help"
 msgstr "/_Hilfe"
 
-#: src/addressbook.c:361 src/compose.c:633 src/mainwindow.c:786
+#: src/addressbook.c:361 src/compose.c:631 src/mainwindow.c:777
 #: src/messageview.c:275
 msgid "/_Help/_About"
 msgstr "/_Hilfe/_Über"
@@ -353,7 +353,7 @@ msgstr "/Neue _Gruppe"
 msgid "/New _Folder"
 msgstr "/Neue Ab_lage"
 
-#: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:489
+#: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:487
 #: src/folderview.c:235 src/folderview.c:237 src/folderview.c:241
 #: src/folderview.c:252 src/folderview.c:254 src/folderview.c:256
 #: src/folderview.c:260 src/folderview.c:270 src/folderview.c:272
@@ -363,8 +363,8 @@ msgstr "/Neue Ab_lage"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:512
-#: src/mainwindow.c:502 src/messageview.c:143
+#: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:510
+#: src/mainwindow.c:493 src/messageview.c:143
 msgid "/_Edit"
 msgstr "/_Bearbeiten"
 
@@ -376,7 +376,7 @@ msgstr "/_Löschen"
 msgid "E-Mail address"
 msgstr "E-Mail Adresse"
 
-#: src/addressbook.c:495 src/compose.c:4529 src/prefs_common.c:2402
+#: src/addressbook.c:495 src/compose.c:4522 src/prefs_common.c:2402
 msgid "Address book"
 msgstr "Adressbuch"
 
@@ -385,8 +385,8 @@ msgid "Name:"
 msgstr "Name:"
 
 #. Buttons
-#: src/addressbook.c:627 src/addressbook.c:1673 src/editaddress.c:884
-#: src/editaddress.c:1017 src/mainwindow.c:2292 src/prefs_actions.c:266
+#: src/addressbook.c:627 src/addressbook.c:1674 src/editaddress.c:884
+#: src/editaddress.c:1017 src/mainwindow.c:2274 src/prefs_actions.c:266
 #: src/prefs_display_header.c:278 src/prefs_display_header.c:333
 #: src/prefs_template.c:231
 msgid "Delete"
@@ -425,7 +425,7 @@ msgstr "Adresse(n) löschen"
 msgid "Really delete the address(es)?"
 msgstr "Adresse(n) wirklich löschen?"
 
-#: src/addressbook.c:1664
+#: src/addressbook.c:1665
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -435,36 +435,36 @@ msgstr ""
 "Wenn Sie nur die Ablage löschen, werden die Adressen in das übergeordnete "
 "Verzeichnis verschoben."
 
-#: src/addressbook.c:1667 src/folderview.c:2139
+#: src/addressbook.c:1668 src/folderview.c:2139
 msgid "Delete folder"
 msgstr "Ablage löschen"
 
-#: src/addressbook.c:1667
+#: src/addressbook.c:1668
 msgid "_Folder only"
 msgstr "Nur Abla_ge"
 
-#: src/addressbook.c:1667
+#: src/addressbook.c:1668
 msgid "Folder and _addresses"
 msgstr "Ablage und _Adressen"
 
-#: src/addressbook.c:1672
+#: src/addressbook.c:1673
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Wirklich '%s' löschen ?"
 
-#: src/addressbook.c:2352 src/addressbook.c:2485
+#: src/addressbook.c:2353 src/addressbook.c:2486
 msgid "New user, could not save index file."
 msgstr "Neuer Benutzer, kann Index-Datei nicht speichern."
 
-#: src/addressbook.c:2356 src/addressbook.c:2489
+#: src/addressbook.c:2357 src/addressbook.c:2490
 msgid "New user, could not save address book files."
 msgstr "Neuer Benutzer, kann Adressbuch-Dateien nicht speichern."
 
-#: src/addressbook.c:2366 src/addressbook.c:2499
+#: src/addressbook.c:2367 src/addressbook.c:2500
 msgid "Old address book converted successfully."
 msgstr "Altes Adressbuch erfolgreich konvertiert."
 
-#: src/addressbook.c:2371
+#: src/addressbook.c:2372
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -472,7 +472,7 @@ msgstr ""
 "Altes Adressbuch konvertiert,\n"
 "kann neue Adress-Index-Datei nicht speichern"
 
-#: src/addressbook.c:2384
+#: src/addressbook.c:2385
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -480,7 +480,7 @@ msgstr ""
 "Konnte Adressbuch nicht konvertieren,\n"
 "aber erstellte neue leere Adressbuch-Dateien."
 
-#: src/addressbook.c:2390
+#: src/addressbook.c:2391
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -488,7 +488,7 @@ msgstr ""
 "Konnte Adressbuch nicht konvertieren,\n"
 "konnte neue Adressbuch-Dateien nicht erstellen."
 
-#: src/addressbook.c:2395
+#: src/addressbook.c:2396
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -496,91 +496,91 @@ msgstr ""
 "Konnte Adressbuch nicht konvertieren\n"
 "und konnte neue Adressbuch-Dateien erstellen."
 
-#: src/addressbook.c:2402
+#: src/addressbook.c:2403
 msgid "Addressbook conversion error"
 msgstr "Adressbuch-Konvertierungs-Fehler"
 
-#: src/addressbook.c:2406
+#: src/addressbook.c:2407
 msgid "Addressbook conversion"
 msgstr "Adressbuch-Konvertierung"
 
-#: src/addressbook.c:2441
+#: src/addressbook.c:2442
 msgid "Addressbook Error"
 msgstr "Adressbuch-Fehler"
 
-#: src/addressbook.c:2442 src/addressbook.c:2542
+#: src/addressbook.c:2443 src/addressbook.c:2543
 msgid "Could not read address index"
 msgstr "Konnte Adress-Index nicht lesen"
 
-#: src/addressbook.c:2504
+#: src/addressbook.c:2505
 msgid "Old address book converted, could not save new address index file"
 msgstr ""
 "Altes Adressbuch konvertiert, neue Adress-Index-Datei konnte nicht "
 "gespeichert werden"
 
-#: src/addressbook.c:2518
+#: src/addressbook.c:2519
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr ""
 "Konnte Adressbuch nicht konvertieren, erstellte aber neue leere Adressbuch "
 "Dateien."
 
-#: src/addressbook.c:2524
+#: src/addressbook.c:2525
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr ""
 "Konnte Adressbuch nicht konvertieren, konnte neue Adressbuch Dateien nicht "
 "erstellen."
 
-#: src/addressbook.c:2530
+#: src/addressbook.c:2531
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr ""
 "Konnte Adressbuch nicht konvertieren und konnte neue Adressbuch Dateien "
 "nicht erstellen."
 
-#: src/addressbook.c:2548
+#: src/addressbook.c:2549
 msgid "Addressbook Conversion Error"
 msgstr "Adressbuch-Konvertierungs-Fehler"
 
-#: src/addressbook.c:2554
+#: src/addressbook.c:2555
 msgid "Addressbook Conversion"
 msgstr "Adressbuch-Konvertierung"
 
-#: src/addressbook.c:3055 src/prefs_common.c:963
+#: src/addressbook.c:3056 src/prefs_common.c:963
 msgid "Interface"
 msgstr "Benutzerschnittstelle"
 
-#: src/addressbook.c:3071 src/importldif.c:514
+#: src/addressbook.c:3072 src/importldif.c:514
 msgid "Address Book"
 msgstr "Adressbuch"
 
-#: src/addressbook.c:3087
+#: src/addressbook.c:3088
 msgid "Person"
 msgstr "Person"
 
-#: src/addressbook.c:3103
+#: src/addressbook.c:3104
 msgid "EMail Address"
 msgstr "E-Mail Adresse"
 
-#: src/addressbook.c:3119
+#: src/addressbook.c:3120
 msgid "Group"
 msgstr "Gruppe"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3135 src/folderview.c:346 src/prefs_account.c:1866
+#: src/addressbook.c:3136 src/folderview.c:346 src/prefs_account.c:1866
 msgid "Folder"
 msgstr "Ablage"
 
-#: src/addressbook.c:3151
+#: src/addressbook.c:3152
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3167 src/addressbook.c:3183
+#: src/addressbook.c:3168 src/addressbook.c:3184
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3199
+#: src/addressbook.c:3200
 msgid "LDAP Server"
 msgstr "LDAP-Server"
 
@@ -592,7 +592,7 @@ msgstr "Allgemeine Adressen"
 msgid "Personal address"
 msgstr "Persönliche Adressen"
 
-#: src/alertpanel.c:138 src/compose.c:5214 src/main.c:515
+#: src/alertpanel.c:138 src/compose.c:5208 src/main.c:515
 msgid "Notice"
 msgstr "Notiz"
 
@@ -647,347 +647,347 @@ msgstr "Braun"
 msgid "None"
 msgstr "Keine"
 
-#: src/compose.c:487
+#: src/compose.c:485
 msgid "/_Add..."
 msgstr "/_Hinzufügen..."
 
-#: src/compose.c:488
+#: src/compose.c:486
 msgid "/_Remove"
 msgstr "/_Entfernen"
 
-#: src/compose.c:490 src/folderview.c:243 src/folderview.c:262
+#: src/compose.c:488 src/folderview.c:243 src/folderview.c:262
 #: src/folderview.c:277
 msgid "/_Properties..."
 msgstr "/_Eigenschaften..."
 
-#: src/compose.c:496
+#: src/compose.c:494
 msgid "/_File/_Send"
 msgstr "/_Datei/_Senden"
 
-#: src/compose.c:498
+#: src/compose.c:496
 msgid "/_File/Send _later"
 msgstr "/_Datei/S_päter senden"
 
-#: src/compose.c:501
+#: src/compose.c:499
 msgid "/_File/Save to _draft folder"
 msgstr "/_Datei/In Ent_wurfablage speichern"
 
-#: src/compose.c:503
+#: src/compose.c:501
 msgid "/_File/Save and _keep editing"
 msgstr "/_Datei/Speichern und Bearbeitung _fortsetzen"
 
-#: src/compose.c:506
+#: src/compose.c:504
 msgid "/_File/_Attach file"
 msgstr "/_Datei/Datei _anhängen"
 
-#: src/compose.c:507
+#: src/compose.c:505
 msgid "/_File/_Insert file"
 msgstr "/_Datei/Datei _einfügen"
 
-#: src/compose.c:508
+#: src/compose.c:506
 msgid "/_File/Insert si_gnature"
 msgstr "/_Datei/_Unterschrift einfügen"
 
-#: src/compose.c:513
+#: src/compose.c:511
 msgid "/_Edit/_Undo"
 msgstr "/_Bearbeiten/_Zurück"
 
-#: src/compose.c:514
+#: src/compose.c:512
 msgid "/_Edit/_Redo"
 msgstr "/_Bearbeiten/_Wiederholen"
 
-#: src/compose.c:515 src/compose.c:522 src/mainwindow.c:506
+#: src/compose.c:513 src/compose.c:520 src/mainwindow.c:497
 #: src/messageview.c:146
 msgid "/_Edit/---"
 msgstr "/_Bearbeiten/---"
 
-#: src/compose.c:516
+#: src/compose.c:514
 msgid "/_Edit/Cu_t"
 msgstr "/_Bearbeiten/_Ausschneiden"
 
-#: src/compose.c:517 src/mainwindow.c:503 src/messageview.c:144
+#: src/compose.c:515 src/mainwindow.c:494 src/messageview.c:144
 msgid "/_Edit/_Copy"
 msgstr "/_Bearbeiten/_Kopieren"
 
-#: src/compose.c:518
+#: src/compose.c:516
 msgid "/_Edit/_Paste"
 msgstr "/_Bearbeiten/_Einfügen"
 
-#: src/compose.c:519
+#: src/compose.c:517
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Bearbeiten/Als Zitat _einfügen"
 
-#: src/compose.c:521 src/mainwindow.c:504 src/messageview.c:145
+#: src/compose.c:519 src/mainwindow.c:495 src/messageview.c:145
 msgid "/_Edit/Select _all"
 msgstr "/_Bearbeiten/Alle au_swählen"
 
-#: src/compose.c:523
+#: src/compose.c:521
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/_Bearbeiten/Aktuellen Absatz um_brechen"
 
-#: src/compose.c:525
+#: src/compose.c:523
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/_Bearbeiten/Alle langen Zeilen _umbrechen"
 
-#: src/compose.c:527
+#: src/compose.c:525
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Bearbeiten/Aut_omatisches umbrechen"
 
-#: src/compose.c:528 src/mainwindow.c:511 src/messageview.c:150
+#: src/compose.c:526 src/mainwindow.c:502 src/messageview.c:150
 #: src/summaryview.c:400
 msgid "/_View"
 msgstr "/_Ansicht"
 
-#: src/compose.c:529
+#: src/compose.c:527
 msgid "/_View/_To"
 msgstr "/_Ansicht/_An"
 
-#: src/compose.c:530
+#: src/compose.c:528
 msgid "/_View/_Cc"
 msgstr "/_Ansicht/_Cc"
 
-#: src/compose.c:531
+#: src/compose.c:529
 msgid "/_View/_Bcc"
 msgstr "/_Ansicht/_Bcc"
 
-#: src/compose.c:532
+#: src/compose.c:530
 msgid "/_View/_Reply to"
 msgstr "/_Ansicht/A_ntwort an"
 
-#: src/compose.c:533 src/compose.c:535 src/compose.c:537 src/compose.c:539
-#: src/mainwindow.c:529 src/mainwindow.c:532 src/mainwindow.c:558
-#: src/mainwindow.c:582 src/mainwindow.c:675 src/mainwindow.c:679
+#: src/compose.c:531 src/compose.c:533 src/compose.c:535 src/compose.c:537
+#: src/mainwindow.c:520 src/mainwindow.c:523 src/mainwindow.c:549
+#: src/mainwindow.c:573 src/mainwindow.c:666 src/mainwindow.c:670
 #: src/messageview.c:233
 msgid "/_View/---"
 msgstr "/_Ansicht/---"
 
-#: src/compose.c:534
+#: src/compose.c:532
 msgid "/_View/_Followup to"
 msgstr "/_Ansicht/_Wiedervorlage an"
 
-#: src/compose.c:536
+#: src/compose.c:534
 msgid "/_View/R_uler"
 msgstr "/_Ansicht/_Lineal"
 
-#: src/compose.c:538
+#: src/compose.c:536
 msgid "/_View/_Attachment"
 msgstr "/_Ansicht/An_hang"
 
-#: src/compose.c:545 src/mainwindow.c:589 src/messageview.c:157
+#: src/compose.c:543 src/mainwindow.c:580 src/messageview.c:157
 msgid "/_View/Character _encoding"
 msgstr "/_Ansicht/_Zeichensatz"
 
-#: src/compose.c:546
+#: src/compose.c:544
 msgid "/_View/Character _encoding/_Automatic"
 msgstr "/_Ansicht/_Zeichensatz/_Automatisch"
 
-#: src/compose.c:548 src/compose.c:554 src/compose.c:560 src/compose.c:564
-#: src/compose.c:570 src/compose.c:574 src/compose.c:580 src/compose.c:584
-#: src/compose.c:594 src/compose.c:598 src/compose.c:608 src/compose.c:612
-#: src/mainwindow.c:585 src/mainwindow.c:592 src/messageview.c:153
+#: src/compose.c:546 src/compose.c:552 src/compose.c:558 src/compose.c:562
+#: src/compose.c:568 src/compose.c:572 src/compose.c:578 src/compose.c:582
+#: src/compose.c:592 src/compose.c:596 src/compose.c:606 src/compose.c:610
+#: src/mainwindow.c:576 src/mainwindow.c:583 src/messageview.c:153
 msgid "/_View/Character _encoding/---"
 msgstr "/_Ansicht/_Zeichensatz/---"
 
-#: src/compose.c:550 src/mainwindow.c:593 src/messageview.c:161
+#: src/compose.c:548 src/mainwindow.c:584 src/messageview.c:161
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Ansicht/_Zeichensatz/7bit ascii (US-ASC_II)"
 
-#: src/compose.c:552 src/mainwindow.c:595 src/messageview.c:164
+#: src/compose.c:550 src/mainwindow.c:586 src/messageview.c:164
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Ansicht/_Zeichensatz/Unicode (_UTF-8)"
 
-#: src/compose.c:556 src/mainwindow.c:599 src/messageview.c:167
+#: src/compose.c:554 src/mainwindow.c:590 src/messageview.c:167
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Ansicht/_Zeichensatz/West Europa (ISO-8859-_1)"
 
-#: src/compose.c:558 src/mainwindow.c:601 src/messageview.c:169
+#: src/compose.c:556 src/mainwindow.c:592 src/messageview.c:169
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Ansicht/_Zeichensatz/West Europa (ISO-8859-15)"
 
-#: src/compose.c:562 src/mainwindow.c:605 src/messageview.c:172
+#: src/compose.c:560 src/mainwindow.c:596 src/messageview.c:172
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Ansicht/_Zeichensatz/Zentral Europa (ISO-8859-_2)"
 
-#: src/compose.c:566 src/mainwindow.c:609 src/messageview.c:175
+#: src/compose.c:564 src/mainwindow.c:600 src/messageview.c:175
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Ansicht/_Zeichensatz/_Baltisch (ISO-8859-13)"
 
-#: src/compose.c:568 src/mainwindow.c:611 src/messageview.c:177
+#: src/compose.c:566 src/mainwindow.c:602 src/messageview.c:177
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Ansicht/_Zeichensatz/Baltisch (ISO-8859-_4)"
 
-#: src/compose.c:572 src/mainwindow.c:615 src/messageview.c:180
+#: src/compose.c:570 src/mainwindow.c:606 src/messageview.c:180
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Ansicht/_Zeichensatz/Griechisch (ISO-8859-_7)"
 
-#: src/compose.c:576 src/mainwindow.c:619 src/messageview.c:183
+#: src/compose.c:574 src/mainwindow.c:610 src/messageview.c:183
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Ansicht/_Zeichensatz/Griechisch (ISO-8859-_7)"
 
-#: src/compose.c:578 src/mainwindow.c:621 src/messageview.c:185
+#: src/compose.c:576 src/mainwindow.c:612 src/messageview.c:185
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Ansicht/_Zeichensatz/Hebräisch (Windows-1255)"
 
-#: src/compose.c:582 src/mainwindow.c:625 src/messageview.c:188
+#: src/compose.c:580 src/mainwindow.c:616 src/messageview.c:188
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Ansicht/_Zeichensatz/Türkisch (ISO-8859-_9)"
 
-#: src/compose.c:586 src/mainwindow.c:629 src/messageview.c:191
+#: src/compose.c:584 src/mainwindow.c:620 src/messageview.c:191
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Ansicht/_Zeichensatz/Kyrillisch (ISO-8859-_5)"
 
-#: src/compose.c:588 src/mainwindow.c:631 src/messageview.c:193
+#: src/compose.c:586 src/mainwindow.c:622 src/messageview.c:193
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Ansicht/_Zeichensatz/Kyrillisch (KOI8-_R)"
 
-#: src/compose.c:590 src/mainwindow.c:633 src/messageview.c:195
+#: src/compose.c:588 src/mainwindow.c:624 src/messageview.c:195
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Ansicht/_Zeichensatz/Kyrillisch (KOI8-_U)"
 
-#: src/compose.c:592 src/mainwindow.c:635 src/messageview.c:197
+#: src/compose.c:590 src/mainwindow.c:626 src/messageview.c:197
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Ansicht/_Zeichensatz/Kyrillisch (Windows-1251)"
 
-#: src/compose.c:596 src/mainwindow.c:639 src/messageview.c:200
+#: src/compose.c:594 src/mainwindow.c:630 src/messageview.c:200
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Ansicht/_Zeichensatz/Japanisch (ISO-2022-_JP)"
 
-#: src/compose.c:600 src/mainwindow.c:649 src/messageview.c:209
+#: src/compose.c:598 src/mainwindow.c:640 src/messageview.c:209
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Ansicht/_Zeichensatz/Einfaches Chinesisch (_GB2312)"
 
-#: src/compose.c:602 src/mainwindow.c:651 src/messageview.c:211
+#: src/compose.c:600 src/mainwindow.c:642 src/messageview.c:211
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Ansicht/_Zeichensatz/Einfaches Chinesisch (_GB2312)"
 
-#: src/compose.c:604 src/mainwindow.c:653 src/messageview.c:213
+#: src/compose.c:602 src/mainwindow.c:644 src/messageview.c:213
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Ansicht/_Zeichensatz/Traditionelles Chinesisch (_Big5)"
 
-#: src/compose.c:606 src/mainwindow.c:655 src/messageview.c:215
+#: src/compose.c:604 src/mainwindow.c:646 src/messageview.c:215
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Ansicht/_Zeichensatz/Traditionelles Chinesisch (EUC-_TW)"
 
-#: src/compose.c:610 src/mainwindow.c:661 src/messageview.c:220
+#: src/compose.c:608 src/mainwindow.c:652 src/messageview.c:220
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Ansicht/_Zeichensatz/Koreanisch (EUC-_KR)"
 
-#: src/compose.c:614 src/mainwindow.c:667 src/messageview.c:225
+#: src/compose.c:612 src/mainwindow.c:658 src/messageview.c:225
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Ansicht/_Zeichensatz/Thai (TIS-620)"
 
-#: src/compose.c:616 src/mainwindow.c:669 src/messageview.c:227
+#: src/compose.c:614 src/mainwindow.c:660 src/messageview.c:227
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Ansicht/_Zeichensatz/Thai (Windows-874)"
 
-#: src/compose.c:620 src/mainwindow.c:726 src/messageview.c:257
+#: src/compose.c:618 src/mainwindow.c:717 src/messageview.c:257
 msgid "/_Tools/_Address book"
 msgstr "/_Werkzeug/_Adressbuch"
 
-#: src/compose.c:621
+#: src/compose.c:619
 msgid "/_Tools/_Template"
 msgstr "/_Werkzeug/_Schablone"
 
-#: src/compose.c:622 src/mainwindow.c:749 src/messageview.c:272
+#: src/compose.c:620 src/mainwindow.c:740 src/messageview.c:272
 msgid "/_Tools/Actio_ns"
 msgstr "/_Werkzeug/Aktio_nen"
 
-#: src/compose.c:623 src/compose.c:627 src/mainwindow.c:729
-#: src/mainwindow.c:743 src/mainwindow.c:748 src/mainwindow.c:750
-#: src/mainwindow.c:753 src/mainwindow.c:755 src/messageview.c:260
+#: src/compose.c:621 src/compose.c:625 src/mainwindow.c:720
+#: src/mainwindow.c:734 src/mainwindow.c:739 src/mainwindow.c:741
+#: src/mainwindow.c:744 src/mainwindow.c:746 src/messageview.c:260
 #: src/messageview.c:271
 msgid "/_Tools/---"
 msgstr "/_Werkzeug/---"
 
-#: src/compose.c:624
+#: src/compose.c:622
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/_Werkzeug/Mit e_xternem Editor bearbeiten"
 
-#: src/compose.c:628
+#: src/compose.c:626
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Werkzeug/PGP _Unterschreiben"
 
-#: src/compose.c:629
+#: src/compose.c:627
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/_Werkzeug/PGP _Verschlüsseln"
 
-#: src/compose.c:855
+#: src/compose.c:853
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: Datei existiert nicht\n"
 
-#: src/compose.c:954 src/compose.c:1024 src/procmsg.c:1353
+#: src/compose.c:952 src/compose.c:1022 src/procmsg.c:1353
 msgid "Can't get text part\n"
 msgstr "Kann Textabschnitt nicht lesen\n"
 
-#: src/compose.c:1420
+#: src/compose.c:1418
 msgid "Quote mark format error."
 msgstr "Zitatzeichen Formatfehler."
 
-#: src/compose.c:1432
+#: src/compose.c:1430
 msgid "Message reply/forward format error."
 msgstr "Formatfehler in Nachrichtenantwort oder -Weiterleitung."
 
-#: src/compose.c:1801
+#: src/compose.c:1799
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Datei %s existiert nicht\n"
 
-#: src/compose.c:1805
+#: src/compose.c:1803
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Kann Dateigröße von %s nicht ermitteln\n"
 
-#: src/compose.c:1809
+#: src/compose.c:1807
 #, c-format
 msgid "File %s is empty."
 msgstr "Datei %s ist leer."
 
-#: src/compose.c:1813
+#: src/compose.c:1811
 #, c-format
 msgid "Can't read %s."
 msgstr "Kann %s nicht lesen."
 
-#: src/compose.c:1848
+#: src/compose.c:1846
 #, c-format
 msgid "Message: %s"
 msgstr "Nachricht: %s"
 
-#: src/compose.c:1920 src/mimeview.c:560
+#: src/compose.c:1918 src/mimeview.c:560
 msgid "Can't get the part of multipart message."
 msgstr "Kann einen Teil einer mehrteiligen Nachricht nicht bekommen."
 
-#: src/compose.c:2362
+#: src/compose.c:2360
 msgid " [Edited]"
 msgstr " [in Bearbeitung]"
 
-#: src/compose.c:2364
+#: src/compose.c:2362
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Verfasse Nachricht%s"
 
-#: src/compose.c:2367
+#: src/compose.c:2365
 #, c-format
 msgid "Compose message%s"
 msgstr "Verfasse Nachricht%s"
 
-#: src/compose.c:2478
+#: src/compose.c:2476
 msgid "Recipient is not specified."
 msgstr "Empfänger nicht angegeben"
 
-#: src/compose.c:2486
+#: src/compose.c:2484
 msgid "Empty subject"
 msgstr "Leerer Betreff"
 
-#: src/compose.c:2487
+#: src/compose.c:2485
 msgid "Subject is empty. Send it anyway?"
 msgstr "Betreff ist leer. Trotzdem verschicken?"
 
-#: src/compose.c:2538
+#: src/compose.c:2536
 msgid "can't get recipient list."
 msgstr "Kann die Empfängerliste nicht holen."
 
-#: src/compose.c:2558
+#: src/compose.c:2556
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -995,26 +995,26 @@ msgstr ""
 "Account zum Versenden von E-Mails, wurde nicht angegeben.\n"
 "Bitte wählen sie einen E-Mail-Account vor dem Senden."
 
-#: src/compose.c:2572 src/send_message.c:297
+#: src/compose.c:2570 src/send_message.c:297
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Fehler beim Senden der Nachricht an %s ."
 
-#: src/compose.c:2595
+#: src/compose.c:2593
 msgid "Can't save the message to outbox."
 msgstr "Kann die Nachricht nicht in der Gesendet-Ablage speichern."
 
-#: src/compose.c:2645
+#: src/compose.c:2643
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "Kein Schlüssel für die aktuelle gewählte Schlüssel-ID vorhanden '%s'."
 
-#: src/compose.c:2709 src/compose.c:2965 src/compose.c:3028 src/compose.c:3148
-#: src/utils.c:2365
+#: src/compose.c:2707 src/compose.c:2963 src/compose.c:3026 src/compose.c:3146
+#: src/utils.c:2379
 msgid "can't change file mode\n"
 msgstr "kann Dateimodus nicht ändern\n"
 
-#: src/compose.c:2741
+#: src/compose.c:2739
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1025,11 +1025,11 @@ msgstr ""
 "\n"
 "Dennoch mit %s senden?"
 
-#: src/compose.c:2747
+#: src/compose.c:2745
 msgid "Code conversion error"
 msgstr "Zeichensatz-Konvertierungs-Fehler"
 
-#: src/compose.c:2816
+#: src/compose.c:2814
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1042,153 +1042,153 @@ msgstr ""
 "\n"
 "Dennoch senden?"
 
-#: src/compose.c:2820
+#: src/compose.c:2818
 msgid "Line length limit"
 msgstr "maximale Zeilenlänge"
 
-#: src/compose.c:3108
+#: src/compose.c:3106
 msgid "can't remove the old message\n"
 msgstr "Kann die alte Nachricht nicht entfernen\n"
 
-#: src/compose.c:3126
+#: src/compose.c:3124
 msgid "queueing message...\n"
 msgstr "Nachricht einreihen...\n"
 
-#: src/compose.c:3208
+#: src/compose.c:3206
 msgid "can't find queue folder\n"
 msgstr "kann Queue-Ablage nicht finden\n"
 
-#: src/compose.c:3215
+#: src/compose.c:3213
 msgid "can't queue the message\n"
 msgstr "Nachricht kann nicht eingereiht werden\n"
 
-#: src/compose.c:3792
+#: src/compose.c:3790
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "erzeugte Nachrichten-ID: %s\n"
 
-#: src/compose.c:3901
+#: src/compose.c:3899
 msgid "Creating compose window...\n"
 msgstr "Erstelle Verfassenfenster...\n"
 
-#: src/compose.c:3949 src/headerview.c:54 src/summary_search.c:214
+#: src/compose.c:3947 src/headerview.c:54 src/summary_search.c:214
 msgid "From:"
 msgstr "Von:"
 
-#: src/compose.c:4021
+#: src/compose.c:4019
 msgid "PGP Sign"
 msgstr "PGP Unterschreiben"
 
-#: src/compose.c:4024
+#: src/compose.c:4022
 msgid "PGP Encrypt"
 msgstr "PGP Verschlüsseln"
 
-#: src/compose.c:4062 src/compose.c:5001
+#: src/compose.c:4060 src/compose.c:4995
 msgid "MIME type"
 msgstr "MIME-Typ"
 
 #. S_COL_DATE
-#: src/compose.c:4071 src/mimeview.c:192 src/prefs_filter_edit.c:585
+#: src/compose.c:4069 src/mimeview.c:192 src/prefs_filter_edit.c:585
 #: src/prefs_summary_column.c:75 src/select-keys.c:317 src/summaryview.c:4217
 msgid "Size"
 msgstr "Größe"
 
-#: src/compose.c:4449 src/mainwindow.c:2224 src/prefs_account.c:719
+#: src/compose.c:4442 src/mainwindow.c:2207 src/prefs_account.c:719
 #: src/prefs_common.c:947
 msgid "Send"
 msgstr "Senden"
 
-#: src/compose.c:4450
+#: src/compose.c:4443
 msgid "Send message"
 msgstr "Sende Nachricht"
 
-#: src/compose.c:4458
+#: src/compose.c:4451
 msgid "Send later"
 msgstr "Später senden"
 
-#: src/compose.c:4459
+#: src/compose.c:4452
 msgid "Put into queue folder and send later"
 msgstr "In Queue-Ablage und später senden"
 
-#: src/compose.c:4467
+#: src/compose.c:4460
 msgid "Draft"
 msgstr "Entwurf"
 
-#: src/compose.c:4468
+#: src/compose.c:4461
 msgid "Save to draft folder"
 msgstr "Speichern in Entwurfablage"
 
-#: src/compose.c:4478
+#: src/compose.c:4471
 msgid "Insert"
 msgstr "Einfügen"
 
-#: src/compose.c:4479
+#: src/compose.c:4472
 msgid "Insert file"
 msgstr "Datei einfügen"
 
-#: src/compose.c:4487
+#: src/compose.c:4480
 msgid "Attach"
 msgstr "Anhängen"
 
-#: src/compose.c:4488
+#: src/compose.c:4481
 msgid "Attach file"
 msgstr "Datei anhängen"
 
 #. signature
-#: src/compose.c:4498 src/prefs_account.c:1391 src/prefs_common.c:1356
+#: src/compose.c:4491 src/prefs_account.c:1391 src/prefs_common.c:1356
 msgid "Signature"
 msgstr "Unterschrift"
 
-#: src/compose.c:4499
+#: src/compose.c:4492
 msgid "Insert signature"
 msgstr "Unterschrift einfügen"
 
-#: src/compose.c:4508 src/prefs_common.c:1378 src/prefs_common.c:2382
+#: src/compose.c:4501 src/prefs_common.c:1378 src/prefs_common.c:2382
 msgid "Editor"
 msgstr "Editor"
 
-#: src/compose.c:4509
+#: src/compose.c:4502
 msgid "Edit with external editor"
 msgstr "Bearbeiten mit externem Editor"
 
-#: src/compose.c:4517
+#: src/compose.c:4510
 msgid "Linewrap"
 msgstr "Zeilenumbruch"
 
-#: src/compose.c:4518
+#: src/compose.c:4511
 msgid "Wrap all long lines"
 msgstr "Alle langen Zeilen umbrechen"
 
-#: src/compose.c:4897
+#: src/compose.c:4891
 msgid "Invalid MIME type."
 msgstr "Ungültiger MIME Typ"
 
-#: src/compose.c:4915
+#: src/compose.c:4909
 msgid "File doesn't exist or is empty."
 msgstr "Datei existiert nicht oder ist leer."
 
-#: src/compose.c:4983
+#: src/compose.c:4977
 msgid "Properties"
 msgstr "Eigenschaften"
 
-#: src/compose.c:5003
+#: src/compose.c:4997
 msgid "Encoding"
 msgstr "Zeichensatzkodierung"
 
-#: src/compose.c:5026 src/prefs_folder_item.c:183
+#: src/compose.c:5020 src/prefs_folder_item.c:183
 msgid "Path"
 msgstr "Pfad"
 
-#: src/compose.c:5027
+#: src/compose.c:5021
 msgid "File name"
 msgstr "Dateiname"
 
-#: src/compose.c:5185
+#: src/compose.c:5179
 #, 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:5211
+#: src/compose.c:5205
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1199,71 +1199,71 @@ msgstr ""
 "Prozess terminieren?\n"
 "Prozessgruppen ID: %d"
 
-#: src/compose.c:5228
+#: src/compose.c:5222
 #, c-format
 msgid "Terminated process group id: %d"
 msgstr "Gruppen ID: %d des terminierten Prozesses"
 
-#: src/compose.c:5229
+#: src/compose.c:5223
 #, c-format
 msgid "Temporary file: %s"
 msgstr "Temporäre Datei: %s"
 
-#: src/compose.c:5253
+#: src/compose.c:5247
 msgid "Compose: input from monitoring process\n"
 msgstr "Verfassen: Eingabe vom Überwachungsprozess\n"
 
 #. failed
-#: src/compose.c:5284
+#: src/compose.c:5278
 msgid "Couldn't exec external editor\n"
 msgstr "Kann externen Editor nicht ausführen\n"
 
-#: src/compose.c:5288
+#: src/compose.c:5282
 msgid "Couldn't write to file\n"
 msgstr "Kann nicht in Datei schreiben\n"
 
-#: src/compose.c:5290
+#: src/compose.c:5284
 msgid "Pipe read failed\n"
 msgstr "Lesen von Pipe fehlgeschlagen\n"
 
-#: src/compose.c:5596 src/compose.c:5604 src/compose.c:5610
+#: src/compose.c:5590 src/compose.c:5598 src/compose.c:5604
 msgid "Can't queue the message."
 msgstr "Nachricht kann nicht eingereiht werden."
 
-#: src/compose.c:5701
+#: src/compose.c:5695
 msgid "Select files"
 msgstr "Wähle Datei(en)"
 
-#: src/compose.c:5723
+#: src/compose.c:5717
 msgid "Select file"
 msgstr "Wähle Datei"
 
-#: src/compose.c:5760
+#: src/compose.c:5754
 msgid "Save message"
 msgstr "Speichern der Nachricht"
 
-#: src/compose.c:5761
+#: src/compose.c:5755
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Diese Nachricht wurde geändert. Speichern als Entwurf?"
 
-#: src/compose.c:5763
+#: src/compose.c:5757
 msgid "Close _without saving"
 msgstr "Schließen _ohne Speichern"
 
-#: src/compose.c:5805
+#: src/compose.c:5799
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Wollen Sie die Schablone '%s' übernehmen ?"
 
-#: src/compose.c:5807
+#: src/compose.c:5801
 msgid "Apply template"
 msgstr "Schablone übernehmen"
 
-#: src/compose.c:5808
+#: src/compose.c:5802
 msgid "_Replace"
 msgstr "E_rsetzen"
 
-#: src/compose.c:5808
+#: src/compose.c:5802
 msgid "_Insert"
 msgstr "_Einfügen"
 
@@ -1706,12 +1706,12 @@ msgstr "Setze Ablageinformation...\n"
 msgid "Setting folder info..."
 msgstr "Setze Ablageinformation..."
 
-#: src/folderview.c:805 src/mainwindow.c:3301 src/setup.c:81
+#: src/folderview.c:805 src/mainwindow.c:3272 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Durchsuche Ablage %s%c%s ..."
 
-#: src/folderview.c:809 src/mainwindow.c:3306 src/setup.c:86
+#: src/folderview.c:809 src/mainwindow.c:3277 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Durchsuche Ablage %s ..."
@@ -2033,44 +2033,44 @@ msgstr "IMAP4-Beglaubigung fehlgeschlagen.\n"
 msgid "IMAP4 login failed.\n"
 msgstr "IMAP4-Login fehlgeschlagen.\n"
 
-#: src/imap.c:3522
+#: src/imap.c:3528
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "kann %s nicht an %s anhängen\n"
 
-#: src/imap.c:3529
+#: src/imap.c:3535
 msgid "(sending file...)"
 msgstr "(Datei versenden...)"
 
-#: src/imap.c:3557
+#: src/imap.c:3563
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "kann Nachricht nicht anhängen an %s\n"
 
-#: src/imap.c:3589
+#: src/imap.c:3595
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "kann %s nicht nach %s kopieren\n"
 
-#: src/imap.c:3613
+#: src/imap.c:3619
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "Fehler beim IMAP-Befehl: STORE %s %s\n"
 
-#: src/imap.c:3627
+#: src/imap.c:3633
 msgid "error while imap command: EXPUNGE\n"
 msgstr "Fehler beim IMAP-Befehl: EXPUNGE\n"
 
-#: src/imap.c:3640
+#: src/imap.c:3646
 msgid "error while imap command: CLOSE\n"
 msgstr "Fehler beim IMAP-Befehl: CLOSE\n"
 
-#: src/imap.c:3873
+#: src/imap.c:3879
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv kann UTF-7 nicht nach %s konvertieren\n"
 
-#: src/imap.c:3903
+#: src/imap.c:3909
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv kann %s nicht nach UTF-7  konvertieren\n"
@@ -2173,7 +2173,7 @@ msgstr "Importiere LDIF-Datei in Adressbuch"
 msgid "Prev"
 msgstr "Vorherige"
 
-#: src/importldif.c:768 src/mainwindow.c:2321
+#: src/importldif.c:768 src/mainwindow.c:2303
 msgid "Next"
 msgstr "Nächste"
 
@@ -2526,615 +2526,615 @@ msgstr ""
 "Ein frühere Konfiguration wurde gefunden.\n"
 "Soll sie migriert werden?"
 
-#: src/mainwindow.c:471
+#: src/mainwindow.c:462
 msgid "/_File/_Folder"
 msgstr "/_Datei/Ab_lage"
 
-#: src/mainwindow.c:472
+#: src/mainwindow.c:463
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/_Datei/Ab_lage/_Neue Ablage erstellen..."
 
-#: src/mainwindow.c:474
+#: src/mainwindow.c:465
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/_Datei/Ab_lage/Ablage _umbenennen..."
 
-#: src/mainwindow.c:475
+#: src/mainwindow.c:466
 msgid "/_File/_Folder/_Move folder..."
 msgstr "/_Datei/Ab_lage/Ablage _verschieben..."
 
-#: src/mainwindow.c:476
+#: src/mainwindow.c:467
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/_Datei/Ab_lage/Ablage _löschen"
 
-#: src/mainwindow.c:477
+#: src/mainwindow.c:468
 msgid "/_File/_Mailbox"
 msgstr "/_Datei/_Mailbox"
 
-#: src/mainwindow.c:478
+#: src/mainwindow.c:469
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/_Datei/_Mailbox/Mailbox _hinzufügen..."
 
-#: src/mainwindow.c:479
+#: src/mainwindow.c:470
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/_Datei/_Mailbox/Mailbox _entfernen"
 
-#: src/mainwindow.c:480 src/mainwindow.c:485
+#: src/mainwindow.c:471 src/mainwindow.c:476
 msgid "/_File/_Mailbox/---"
 msgstr "/_Datei/_Mailbox/---"
 
-#: src/mainwindow.c:481
+#: src/mainwindow.c:472
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "/_Datei/_Mailbox/Auf neue Nachrichten _prüfen"
 
-#: src/mainwindow.c:483
+#: src/mainwindow.c:474
 msgid "/_File/_Mailbox/Check for new messages in _all mailboxes"
 msgstr "/_Datei/_Mailbox/_Alle Ablagen auf neue Nachrichten prüfen"
 
-#: src/mainwindow.c:486
+#: src/mainwindow.c:477
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "//_Datei/_Mailbox/Ablagebaum _erneuern"
 
-#: src/mainwindow.c:489
+#: src/mainwindow.c:480
 msgid "/_File/_Import mbox file..."
 msgstr "/_Datei/_Importiere Mbox-Datei..."
 
-#: src/mainwindow.c:490
+#: src/mainwindow.c:481
 msgid "/_File/_Export to mbox file..."
 msgstr "/_Datei/_Exportiere in Mbox-Datei..."
 
-#: src/mainwindow.c:492
+#: src/mainwindow.c:483
 msgid "/_File/Empty all _trash"
 msgstr "/_Datei/Alle _Papierkörbe leeren"
 
-#: src/mainwindow.c:494 src/messageview.c:138
+#: src/mainwindow.c:485 src/messageview.c:138
 msgid "/_File/_Save as..."
 msgstr "/_Datei/Speichern _als..."
 
-#: src/mainwindow.c:495 src/messageview.c:139
+#: src/mainwindow.c:486 src/messageview.c:139
 msgid "/_File/_Print..."
 msgstr "/_Datei/_Drucken..."
 
-#: src/mainwindow.c:497
+#: src/mainwindow.c:488
 msgid "/_File/_Work offline"
 msgstr "/_Datei/_Ohne Verbindung arbeiten"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:500
+#: src/mainwindow.c:491
 msgid "/_File/E_xit"
 msgstr "/_Datei/_Beenden"
 
-#: src/mainwindow.c:505
+#: src/mainwindow.c:496
 msgid "/_Edit/Select _thread"
 msgstr "/_Bearbeiten/_Thread auswählen"
 
-#: src/mainwindow.c:507 src/messageview.c:147
+#: src/mainwindow.c:498 src/messageview.c:147
 msgid "/_Edit/_Find in current message..."
 msgstr "/_Bearbeiten/_Aktuelle Nachricht durchsuchen..."
 
-#: src/mainwindow.c:509
+#: src/mainwindow.c:500
 msgid "/_Edit/_Search messages..."
 msgstr "/_Bearbeiten/_Suche Nachrichten..."
 
-#: src/mainwindow.c:512
+#: src/mainwindow.c:503
 msgid "/_View/Show or hi_de"
 msgstr "/_Ansicht/Zeigen oder Verstecken"
 
-#: src/mainwindow.c:513
+#: src/mainwindow.c:504
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/_Ansicht//Zeigen oder Verstecken/Ablagebaum"
 
-#: src/mainwindow.c:515
+#: src/mainwindow.c:506
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/_Ansicht/Zeigen oder Verstecken/_Nachrichtenansicht"
 
-#: src/mainwindow.c:517
+#: src/mainwindow.c:508
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/_Ansicht/Zeigen oder Verstecken/_Werkzeugleiste"
 
-#: src/mainwindow.c:519
+#: src/mainwindow.c:510
 msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/_Ansicht/Zeigen oder Verstecken/_Werkzeugleiste/Bilder _und Text"
 
-#: src/mainwindow.c:521
+#: src/mainwindow.c:512
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/_Ansicht/Zeigen oder Verstecken/_Werkzeugleiste/_Bilder"
 
-#: src/mainwindow.c:523
+#: src/mainwindow.c:514
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/_Ansicht/Zeigen oder Verstecken/_Werkzeugleiste/_Text"
 
-#: src/mainwindow.c:525
+#: src/mainwindow.c:516
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/_Ansicht/Zeigen oder Verstecken/_Werkzeugleiste/_Nichts"
 
-#: src/mainwindow.c:527
+#: src/mainwindow.c:518
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/_Ansicht/Zeigen oder Verstecken/_Statuszeile"
 
-#: src/mainwindow.c:530
+#: src/mainwindow.c:521
 msgid "/_View/Separate f_older tree"
 msgstr "/_Ansicht/Einzelner _Ablagebaum"
 
-#: src/mainwindow.c:531
+#: src/mainwindow.c:522
 msgid "/_View/Separate _message view"
 msgstr "/_Ansicht/Einzelne _Nachrichtenansicht"
 
-#: src/mainwindow.c:533
+#: src/mainwindow.c:524
 msgid "/_View/_Sort"
 msgstr "/_Ansicht/_Sortieren"
 
-#: src/mainwindow.c:534
+#: src/mainwindow.c:525
 msgid "/_View/_Sort/by _number"
 msgstr "/_Ansicht/_Sortieren/nach _Nummer"
 
-#: src/mainwindow.c:535
+#: src/mainwindow.c:526
 msgid "/_View/_Sort/by s_ize"
 msgstr "/_Ansicht/_Sortieren/nach _Größe"
 
-#: src/mainwindow.c:536
+#: src/mainwindow.c:527
 msgid "/_View/_Sort/by _date"
 msgstr "/_Ansicht/_Sortieren/nach _Datum"
 
-#: src/mainwindow.c:537
+#: src/mainwindow.c:528
 msgid "/_View/_Sort/by _from"
 msgstr "/_Ansicht/_Sortieren/nach _Absender"
 
-#: src/mainwindow.c:538
+#: src/mainwindow.c:529
 msgid "/_View/_Sort/by _recipient"
 msgstr "/_Ansicht/_Sortieren/nach _Sender"
 
-#: src/mainwindow.c:539
+#: src/mainwindow.c:530
 msgid "/_View/_Sort/by _subject"
 msgstr "/_Ansicht/_Sortieren/nach _Betreff"
 
-#: src/mainwindow.c:540
+#: src/mainwindow.c:531
 msgid "/_View/_Sort/by _color label"
 msgstr "/_Ansicht/_Sortieren/nach _Farbetikett"
 
-#: src/mainwindow.c:542
+#: src/mainwindow.c:533
 msgid "/_View/_Sort/by _mark"
 msgstr "/_Ansicht/_Sortieren/nach _Markierung"
 
-#: src/mainwindow.c:543
+#: src/mainwindow.c:534
 msgid "/_View/_Sort/by _unread"
 msgstr "/_Ansicht/_Sortieren/nach _Ungelesen"
 
-#: src/mainwindow.c:544
+#: src/mainwindow.c:535
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/_Ansicht/_Sortieren/nach An_hang"
 
-#: src/mainwindow.c:546
+#: src/mainwindow.c:537
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/_Ansicht/_Sortieren/Nicht S_ortieren"
 
-#: src/mainwindow.c:547 src/mainwindow.c:550
+#: src/mainwindow.c:538 src/mainwindow.c:541
 msgid "/_View/_Sort/---"
 msgstr "/_Ansicht/_Sortieren/---"
 
-#: src/mainwindow.c:548
+#: src/mainwindow.c:539
 msgid "/_View/_Sort/Ascending"
 msgstr "/_Ansicht/_Sortieren/Aufsteigend"
 
-#: src/mainwindow.c:549
+#: src/mainwindow.c:540
 msgid "/_View/_Sort/Descending"
 msgstr "/_Ansicht/_Sortieren/Absteigend"
 
-#: src/mainwindow.c:551
+#: src/mainwindow.c:542
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/_Ansicht/_Sortieren/Threads nach Betreff _aufbauen"
 
-#: src/mainwindow.c:553
+#: src/mainwindow.c:544
 msgid "/_View/Th_read view"
 msgstr "/_Ansicht/_Threads einschalten"
 
-#: src/mainwindow.c:554
+#: src/mainwindow.c:545
 msgid "/_View/E_xpand all threads"
 msgstr "/_Ansicht/Alle Threads entfalten"
 
-#: src/mainwindow.c:555
+#: src/mainwindow.c:546
 msgid "/_View/Co_llapse all threads"
 msgstr "/_Ansicht/Alle Threads zusammenfalten"
 
-#: src/mainwindow.c:556
+#: src/mainwindow.c:547
 msgid "/_View/Set display _item..."
 msgstr "/_Ansicht/Anzuzeigende _Informationen setzen..."
 
-#: src/mainwindow.c:559
+#: src/mainwindow.c:550
 msgid "/_View/_Go to"
 msgstr "/_Ansicht/Gehe _zu"
 
-#: src/mainwindow.c:560
+#: src/mainwindow.c:551
 msgid "/_View/_Go to/_Prev message"
 msgstr "/_Ansicht/Gehe _zu/_Vorheriger Nachricht"
 
-#: src/mainwindow.c:561
+#: src/mainwindow.c:552
 msgid "/_View/_Go to/_Next message"
 msgstr "/_Ansicht/Gehe _zu/_Nächster Nachricht"
 
-#: src/mainwindow.c:562 src/mainwindow.c:567 src/mainwindow.c:570
-#: src/mainwindow.c:575 src/mainwindow.c:580
+#: src/mainwindow.c:553 src/mainwindow.c:558 src/mainwindow.c:561
+#: src/mainwindow.c:566 src/mainwindow.c:571
 msgid "/_View/_Go to/---"
 msgstr "/_Ansicht/_Gehe _zu/---"
 
-#: src/mainwindow.c:563
+#: src/mainwindow.c:554
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/_Ansicht/Gehe _zu/V_orheriger ungelesener Nachricht"
 
-#: src/mainwindow.c:565
+#: src/mainwindow.c:556
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/_Ansicht/Gehe _zu/N_ächster ungelesener Nachricht"
 
-#: src/mainwindow.c:568
+#: src/mainwindow.c:559
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/_Ansicht/Gehe _zu/Vorheriger ne_uer Nachricht"
 
-#: src/mainwindow.c:569
+#: src/mainwindow.c:560
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/_Ansicht/Gehe _zu/Nächster _neuer Nachricht"
 
-#: src/mainwindow.c:571
+#: src/mainwindow.c:562
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/_Ansicht/Gehe _zu/Vorheriger _markierter Nachricht"
 
-#: src/mainwindow.c:573
+#: src/mainwindow.c:564
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/_Ansicht/Gehe _zu/Nächster m_arkierter Nachricht"
 
-#: src/mainwindow.c:576
+#: src/mainwindow.c:567
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/_Ansicht/Gehe _zu/Vorheriger _etikettierter Nachricht"
 
-#: src/mainwindow.c:578
+#: src/mainwindow.c:569
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/_Ansicht/Gehe _zu/Nächster e_tikettierter Nachricht"
 
-#: src/mainwindow.c:581
+#: src/mainwindow.c:572
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Ansicht/_Gehe zu/Anderer Ab_lage..."
 
-#: src/mainwindow.c:590 src/messageview.c:158
+#: src/mainwindow.c:581 src/messageview.c:158
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Ansicht/_Zeichensatz/_Automatische Erkennung"
 
-#: src/mainwindow.c:641 src/messageview.c:202
+#: src/mainwindow.c:632 src/messageview.c:202
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Ansicht/_Zeichensatz/Japanisch (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:643 src/messageview.c:204
+#: src/mainwindow.c:634 src/messageview.c:204
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Ansicht/_Zeichensatz/Japanisch (_EUC-JP)"
 
-#: src/mainwindow.c:645 src/messageview.c:206
+#: src/mainwindow.c:636 src/messageview.c:206
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Ansicht/_Zeichensatz/Japanisch (_Shift_JIS)"
 
-#: src/mainwindow.c:657 src/messageview.c:217
+#: src/mainwindow.c:648 src/messageview.c:217
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Ansicht/_Zeichensatz/Chinesisch (ISO-2022-_CN)"
 
-#: src/mainwindow.c:663 src/messageview.c:222
+#: src/mainwindow.c:654 src/messageview.c:222
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Ansicht/_Zeichensatz/Koreanisch (ISO-2022-KR)"
 
-#: src/mainwindow.c:676 src/summaryview.c:401
+#: src/mainwindow.c:667 src/summaryview.c:401
 msgid "/_View/Open in new _window"
 msgstr "/_Ansicht/Öffnen in _neuem Fenster"
 
-#: src/mainwindow.c:677 src/messageview.c:234
+#: src/mainwindow.c:668 src/messageview.c:234
 msgid "/_View/Mess_age source"
 msgstr "/_Ansicht/Nachrichten_quelle"
 
-#: src/mainwindow.c:678 src/messageview.c:235
+#: src/mainwindow.c:669 src/messageview.c:235
 msgid "/_View/Show all _header"
 msgstr "/_Ansicht/Zeige alle _Kopfzeilen"
 
-#: src/mainwindow.c:680
+#: src/mainwindow.c:671
 msgid "/_View/_Update summary"
 msgstr "/_Ansicht/Akt_ualisiere Ablageninhalt"
 
-#: src/mainwindow.c:682 src/messageview.c:237
+#: src/mainwindow.c:673 src/messageview.c:237
 msgid "/_Message"
 msgstr "/_Nachricht"
 
-#: src/mainwindow.c:683
+#: src/mainwindow.c:674
 msgid "/_Message/Recei_ve"
 msgstr "/_Nachricht/Empfang"
 
-#: src/mainwindow.c:684
+#: src/mainwindow.c:675
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/_Nachricht/Empfang/Empfange vom aktuellen Account"
 
-#: src/mainwindow.c:686
+#: src/mainwindow.c:677
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/_Nachricht/Empfang/Empfange von _allen Accounts"
 
-#: src/mainwindow.c:688
+#: src/mainwindow.c:679
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/_Nachricht/Empfang/Empfan_g abbrechen"
 
-#: src/mainwindow.c:690
+#: src/mainwindow.c:681
 msgid "/_Message/Recei_ve/---"
 msgstr "/_Nachricht/Empfang/---"
 
-#: src/mainwindow.c:691
+#: src/mainwindow.c:682
 msgid "/_Message/_Send queued messages"
 msgstr "/_Nachricht/Sende _wartende Nachrichten"
 
-#: src/mainwindow.c:692 src/mainwindow.c:694 src/mainwindow.c:701
-#: src/mainwindow.c:706 src/mainwindow.c:710 src/mainwindow.c:719
-#: src/mainwindow.c:722 src/messageview.c:240 src/messageview.c:248
+#: src/mainwindow.c:683 src/mainwindow.c:685 src/mainwindow.c:692
+#: src/mainwindow.c:697 src/mainwindow.c:701 src/mainwindow.c:710
+#: src/mainwindow.c:713 src/messageview.c:240 src/messageview.c:248
 #: src/messageview.c:253
 msgid "/_Message/---"
 msgstr "/_Nachricht/---"
 
-#: src/mainwindow.c:693 src/messageview.c:238
+#: src/mainwindow.c:684 src/messageview.c:238
 msgid "/_Message/Compose _new message"
 msgstr "/_Nachricht/Verfasse n_eue Nachricht"
 
-#: src/mainwindow.c:695 src/messageview.c:241
+#: src/mainwindow.c:686 src/messageview.c:241
 msgid "/_Message/_Reply"
 msgstr "/_Nachricht/An_twort"
 
-#: src/mainwindow.c:696
+#: src/mainwindow.c:687
 msgid "/_Message/Repl_y to"
 msgstr "/_Nachricht/Ant_wort an"
 
-#: src/mainwindow.c:697 src/messageview.c:242
+#: src/mainwindow.c:688 src/messageview.c:242
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Nachricht/Ant_wort an/_Alle"
 
-#: src/mainwindow.c:698 src/messageview.c:244
+#: src/mainwindow.c:689 src/messageview.c:244
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Nachricht/Ant_wort an/Ab_sender"
 
-#: src/mainwindow.c:699 src/messageview.c:246
+#: src/mainwindow.c:690 src/messageview.c:246
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Nachricht/Ant_wort an/Mailing-_Liste"
 
-#: src/mainwindow.c:702 src/messageview.c:249
+#: src/mainwindow.c:693 src/messageview.c:249
 msgid "/_Message/_Forward"
 msgstr "/_Nachricht/We_iterleiten"
 
-#: src/mainwindow.c:703 src/messageview.c:250
+#: src/mainwindow.c:694 src/messageview.c:250
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Nachricht/Weiterleiten als An_hang"
 
-#: src/mainwindow.c:705 src/messageview.c:252
+#: src/mainwindow.c:696 src/messageview.c:252
 msgid "/_Message/Redirec_t"
 msgstr "/_Nachricht/_Umadressieren"
 
-#: src/mainwindow.c:707
+#: src/mainwindow.c:698
 msgid "/_Message/M_ove..."
 msgstr "/_Nachricht/_Verschieben..."
 
-#: src/mainwindow.c:708
+#: src/mainwindow.c:699
 msgid "/_Message/_Copy..."
 msgstr "/_Nachricht/_Kopieren..."
 
-#: src/mainwindow.c:709
+#: src/mainwindow.c:700
 msgid "/_Message/_Delete"
 msgstr "/_Nachricht/_Löschen"
 
-#: src/mainwindow.c:711
+#: src/mainwindow.c:702
 msgid "/_Message/_Mark"
 msgstr "/_Nachricht/_Markieren"
 
-#: src/mainwindow.c:712
+#: src/mainwindow.c:703
 msgid "/_Message/_Mark/_Mark"
 msgstr "/_Nachricht/_Markieren/_Markieren"
 
-#: src/mainwindow.c:713
+#: src/mainwindow.c:704
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/_Nachricht/_Markieren/Markierung _entfernen"
 
-#: src/mainwindow.c:714
+#: src/mainwindow.c:705
 msgid "/_Message/_Mark/---"
 msgstr "/_Nachricht/_Markieren/---"
 
-#: src/mainwindow.c:715
+#: src/mainwindow.c:706
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/_Nachricht/_Markieren/Als _ungelesen"
 
-#: src/mainwindow.c:716
+#: src/mainwindow.c:707
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/_Nachricht/_Markieren/Als _gelesen"
 
-#: src/mainwindow.c:718
+#: src/mainwindow.c:709
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/_Nachricht/_Markieren/Alle _als gelesen"
 
-#: src/mainwindow.c:720
+#: src/mainwindow.c:711
 msgid "/_Message/Set as _junk mail"
 msgstr "/_Nachricht/Markiere als Spam-Mail"
 
-#: src/mainwindow.c:721
+#: src/mainwindow.c:712
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/_Nachricht/Markiere als Nicht-Spam Mail"
 
-#: src/mainwindow.c:723 src/messageview.c:254
+#: src/mainwindow.c:714 src/messageview.c:254
 msgid "/_Message/Re-_edit"
 msgstr "/_Nachricht/Wieder_bearbeiten"
 
-#: src/mainwindow.c:727
+#: src/mainwindow.c:718
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/_Werkzeug/Absender in Adress_buch einfügen"
 
-#: src/mainwindow.c:730
+#: src/mainwindow.c:721
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/_Werkzeug/Alle Nachrichten einer Ablage _filtern"
 
-#: src/mainwindow.c:732
+#: src/mainwindow.c:723
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Werkzeug/Aus_gewählte Nachrichten filtern"
 
-#: src/mainwindow.c:734 src/messageview.c:261
+#: src/mainwindow.c:725 src/messageview.c:261
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Werkzeug/Filter _erstellen"
 
-#: src/mainwindow.c:735 src/messageview.c:263
+#: src/mainwindow.c:726 src/messageview.c:263
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Werkzeug/Filter _erstellen/_Automatisch"
 
-#: src/mainwindow.c:737 src/messageview.c:265
+#: src/mainwindow.c:728 src/messageview.c:265
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Werkzeug/Filter _erstellen/nach _Von"
 
-#: src/mainwindow.c:739 src/messageview.c:267
+#: src/mainwindow.c:730 src/messageview.c:267
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Werkzeug/Filter _erstellen/nach A_n"
 
-#: src/mainwindow.c:741 src/messageview.c:269
+#: src/mainwindow.c:732 src/messageview.c:269
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Werkzeug/Filter _erstellen/nach _Betreff"
 
-#: src/mainwindow.c:744
+#: src/mainwindow.c:735
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/_Werkzeug/Nachrichten einer Ablage nach Spams _filtern"
 
-#: src/mainwindow.c:746
+#: src/mainwindow.c:737
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/_Werkzeug/Aus_gewählte Nachrichten nach Spams filtern"
 
-#: src/mainwindow.c:751
+#: src/mainwindow.c:742
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/_Werkzeug/_Lösche mehrfach vorhandene Nachrichten"
 
-#: src/mainwindow.c:754
+#: src/mainwindow.c:745
 msgid "/_Tools/E_xecute"
 msgstr "/_Werkzeug/A_usführen"
 
-#: src/mainwindow.c:756
+#: src/mainwindow.c:747
 msgid "/_Tools/_Log window"
 msgstr "/_Werkzeug/L_ogbuch-Fenster"
 
-#: src/mainwindow.c:758
+#: src/mainwindow.c:749
 msgid "/_Configuration"
 msgstr "/_Einstellungen"
 
-#: src/mainwindow.c:759
+#: src/mainwindow.c:750
 msgid "/_Configuration/_Common preferences..."
 msgstr "/_Einstellungen/Allgemeine _Einstellungen..."
 
-#: src/mainwindow.c:761
+#: src/mainwindow.c:752
 msgid "/_Configuration/_Filter setting..."
 msgstr "/_Einstellungen/_Filtereinstellungen..."
 
-#: src/mainwindow.c:763
+#: src/mainwindow.c:754
 msgid "/_Configuration/_Template..."
 msgstr "/_Einstellungen/_Schablone..."
 
-#: src/mainwindow.c:764
+#: src/mainwindow.c:755
 msgid "/_Configuration/_Actions..."
 msgstr "/_Einstellungen/Aktionen..."
 
-#: src/mainwindow.c:765
+#: src/mainwindow.c:756
 msgid "/_Configuration/---"
 msgstr "/_Einstellungen/---"
 
-#: src/mainwindow.c:766
+#: src/mainwindow.c:757
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Einstellungen/_Einstellungen für den aktuellen Account..."
 
-#: src/mainwindow.c:768
+#: src/mainwindow.c:759
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Einstellungen/_Neuen Account erstellen..."
 
-#: src/mainwindow.c:770
+#: src/mainwindow.c:761
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Einstellungen/Accounts _bearbeiten..."
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:763
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Einstellungen/Aktuellen Account _wechseln..."
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:767
 msgid "/_Help/_Manual"
 msgstr "/_Hilfe/_Anleitung"
 
-#: src/mainwindow.c:777
+#: src/mainwindow.c:768
 msgid "/_Help/_Manual/_English"
 msgstr "/_Hilfe/Anleitung/_English"
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:769
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/_Hilfe/Anleitung/_Japanese"
 
-#: src/mainwindow.c:779
+#: src/mainwindow.c:770
 msgid "/_Help/_FAQ"
 msgstr "/_Hilfe/_FAQ"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:771
 msgid "/_Help/_FAQ/_English"
 msgstr "/_Hilfe/_FAQ/_English"
 
-#: src/mainwindow.c:781
+#: src/mainwindow.c:772
 msgid "/_Help/_FAQ/_German"
 msgstr "/_Hilfe/_FAQ/_German"
 
-#: src/mainwindow.c:782
+#: src/mainwindow.c:773
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/_Hilfe/_FAQ/_Spanish"
 
-#: src/mainwindow.c:783
+#: src/mainwindow.c:774
 msgid "/_Help/_FAQ/_French"
 msgstr "/_Hilfe/_FAQ/_French"
 
-#: src/mainwindow.c:784
+#: src/mainwindow.c:775
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/_Hilfe/_FAQ/_Italian"
 
-#: src/mainwindow.c:785
+#: src/mainwindow.c:776
 msgid "/_Help/---"
 msgstr "/_Hilfe/---"
 
-#: src/mainwindow.c:825
+#: src/mainwindow.c:816
 msgid "Creating main window...\n"
 msgstr "Erstelle Hauptfenster...\n"
 
-#: src/mainwindow.c:987
+#: src/mainwindow.c:973
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Haupt-Fenster: Bereitstellung von Farbe %d fehlgeschlagen\n"
 
-#: src/mainwindow.c:1071 src/summaryview.c:2020 src/summaryview.c:2105
+#: src/mainwindow.c:1057 src/summaryview.c:2020 src/summaryview.c:2105
 #: src/summaryview.c:3342 src/summaryview.c:3415 src/summaryview.c:3728
 msgid "done.\n"
 msgstr "Fertig.\n"
 
-#: src/mainwindow.c:1196 src/mainwindow.c:1237 src/mainwindow.c:1265
+#: src/mainwindow.c:1182 src/mainwindow.c:1223 src/mainwindow.c:1251
 msgid "Untitled"
 msgstr "Unbenannt"
 
-#: src/mainwindow.c:1266
+#: src/mainwindow.c:1252
 msgid "none"
 msgstr "nicht"
 
-#: src/mainwindow.c:1316
+#: src/mainwindow.c:1302
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "Wechsle Fenstertrennungstyp von %d zu %d\n"
 
-#: src/mainwindow.c:1536
+#: src/mainwindow.c:1522
 msgid "Offline"
 msgstr "Verbindungslos"
 
-#: src/mainwindow.c:1537
+#: src/mainwindow.c:1523
 msgid "You are offline. Go online?"
 msgstr "Sie sind nicht verbunden. Verbinden?"
 
-#: src/mainwindow.c:1551
+#: src/mainwindow.c:1537
 msgid "Empty all trash"
 msgstr "Leere alle Papierkörbe"
 
-#: src/mainwindow.c:1552
+#: src/mainwindow.c:1538
 msgid "Empty messages in all trash?"
 msgstr "Lösche alle Nachrichten in allen Papierkörben?"
 
-#: src/mainwindow.c:1580
+#: src/mainwindow.c:1566
 msgid "Add mailbox"
 msgstr "Neue Mailbox"
 
-#: src/mainwindow.c:1581
+#: src/mainwindow.c:1567
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3144,16 +3144,16 @@ msgstr ""
 "Wenn die existierende Mailbox angegeben wird, wird\n"
 "sie automatisch durchsucht."
 
-#: src/mainwindow.c:1587
+#: src/mainwindow.c:1573
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Die Mailbox `%s' existiert bereits."
 
-#: src/mainwindow.c:1592 src/setup.c:57
+#: src/mainwindow.c:1578 src/setup.c:57
 msgid "Mailbox"
 msgstr "Mailbox"
 
-#: src/mainwindow.c:1598 src/setup.c:63
+#: src/mainwindow.c:1584 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3162,149 +3162,149 @@ msgstr ""
 "Erstellen der Mailbox fehlgeschlagen.\n"
 "Vielleicht existieren einige Dateien, oder Sie haben keine Schreibrechte"
 
-#: src/mainwindow.c:1989
+#: src/mainwindow.c:1975
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Ablagenansicht"
 
-#: src/mainwindow.c:2009 src/messageview.c:368
+#: src/mainwindow.c:1995 src/messageview.c:368
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Nachrichtenansicht"
 
-#: src/mainwindow.c:2156 src/summaryview.c:370
+#: src/mainwindow.c:2142 src/summaryview.c:370
 msgid "/_Reply"
 msgstr "/An_twort"
 
-#: src/mainwindow.c:2157
+#: src/mainwindow.c:2143
 msgid "/Reply to _all"
 msgstr "/Antwort an alle"
 
-#: src/mainwindow.c:2158
+#: src/mainwindow.c:2144
 msgid "/Reply to _sender"
 msgstr "/Ant_wort an Ab_sender"
 
-#: src/mainwindow.c:2159
+#: src/mainwindow.c:2145
 msgid "/Reply to mailing _list"
 msgstr "/Antwort an Mailing-_Liste"
 
-#: src/mainwindow.c:2164 src/summaryview.c:377
+#: src/mainwindow.c:2150 src/summaryview.c:377
 msgid "/_Forward"
 msgstr "/_Weiterleiten"
 
-#: src/mainwindow.c:2165 src/summaryview.c:378
+#: src/mainwindow.c:2151 src/summaryview.c:378
 msgid "/For_ward as attachment"
 msgstr "/Weiterleiten als An_hang"
 
-#: src/mainwindow.c:2166 src/summaryview.c:379
+#: src/mainwindow.c:2152 src/summaryview.c:379
 msgid "/Redirec_t"
 msgstr "/_Umadressieren"
 
-#: src/mainwindow.c:2205
+#: src/mainwindow.c:2188
 msgid "Get"
 msgstr "Holen"
 
-#: src/mainwindow.c:2206
+#: src/mainwindow.c:2189
 msgid "Incorporate new mail"
 msgstr "Neue E-Mail aufnehmen"
 
-#: src/mainwindow.c:2213
+#: src/mainwindow.c:2196
 msgid "Get all"
 msgstr "Hole alle"
 
-#: src/mainwindow.c:2214
+#: src/mainwindow.c:2197
 msgid "Incorporate new mail of all accounts"
 msgstr "Neue E-Mail aller Accounts aufnehmen"
 
-#: src/mainwindow.c:2225
+#: src/mainwindow.c:2208
 msgid "Send queued message(s)"
 msgstr "Senden wartender Nachrichten"
 
-#: src/mainwindow.c:2235 src/prefs_account.c:721 src/prefs_common.c:949
+#: src/mainwindow.c:2218 src/prefs_account.c:721 src/prefs_common.c:949
 #: src/prefs_folder_item.c:137
 msgid "Compose"
 msgstr "Verfassen"
 
-#: src/mainwindow.c:2236
+#: src/mainwindow.c:2219
 msgid "Compose new message"
 msgstr "Neue Nachricht verfassen"
 
-#: src/mainwindow.c:2244 src/prefs_common.c:1448
+#: src/mainwindow.c:2227 src/prefs_common.c:1448
 msgid "Reply"
 msgstr "Antwort"
 
-#: src/mainwindow.c:2245 src/mainwindow.c:2258
+#: src/mainwindow.c:2228 src/mainwindow.c:2241
 msgid "Reply to the message"
 msgstr "Nachricht beantworten"
 
-#: src/mainwindow.c:2263
+#: src/mainwindow.c:2245
 msgid "Reply all"
 msgstr "Alle beantworten"
 
-#: src/mainwindow.c:2264
+#: src/mainwindow.c:2246
 msgid "Reply to all"
 msgstr "Antwort an alle"
 
-#: src/mainwindow.c:2272 src/prefs_filter_edit.c:741
+#: src/mainwindow.c:2254 src/prefs_filter_edit.c:741
 msgid "Forward"
 msgstr "Weiterleiten"
 
-#: src/mainwindow.c:2273 src/mainwindow.c:2286
+#: src/mainwindow.c:2255 src/mainwindow.c:2268
 msgid "Forward the message"
 msgstr "Nachricht weiterleiten"
 
-#: src/mainwindow.c:2293
+#: src/mainwindow.c:2275
 msgid "Delete the message"
 msgstr "Nachricht löschen"
 
-#: src/mainwindow.c:2301 src/prefs_common.c:1988
+#: src/mainwindow.c:2283 src/prefs_common.c:1988
 msgid "Junk"
 msgstr "Spam"
 
-#: src/mainwindow.c:2302
+#: src/mainwindow.c:2284
 msgid "Set as junk mail"
 msgstr "Markiere als Spam Mail"
 
-#: src/mainwindow.c:2311
+#: src/mainwindow.c:2293
 msgid "Execute"
 msgstr "Ausführen"
 
-#: src/mainwindow.c:2312
+#: src/mainwindow.c:2294
 msgid "Execute marked process"
 msgstr "Markierten Prozess ausführen"
 
-#: src/mainwindow.c:2322
+#: src/mainwindow.c:2304
 msgid "Next unread message"
 msgstr "Nächste ungelesene Nachricht"
 
-#: src/mainwindow.c:2334
+#: src/mainwindow.c:2316
 msgid "Prefs"
 msgstr "Einstellungen"
 
-#: src/mainwindow.c:2335
+#: src/mainwindow.c:2317
 msgid "Common preferences"
 msgstr "Allgemeine Einstellungen"
 
-#: src/mainwindow.c:2343 src/prefs_folder_item.c:261
+#: src/mainwindow.c:2325 src/prefs_folder_item.c:261
 #: src/prefs_folder_item.c:272 src/progressdialog.c:128
 msgid "Account"
 msgstr "Account"
 
-#: src/mainwindow.c:2344
+#: src/mainwindow.c:2326
 msgid "Account setting"
 msgstr "Accounteinstellungen"
 
-#: src/mainwindow.c:2527
+#: src/mainwindow.c:2498
 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:2538
+#: src/mainwindow.c:2509
 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:2731
+#: src/mainwindow.c:2702
 msgid "Exit"
 msgstr "Beenden"
 
-#: src/mainwindow.c:2731
+#: src/mainwindow.c:2702
 msgid "Exit this program?"
 msgstr "Beenden des Programms?"
 
@@ -5513,11 +5513,11 @@ msgstr "Erstelle Fortschrittsdialog...\n"
 msgid "Status"
 msgstr "Status"
 
-#: src/recv.c:113
+#: src/recv.c:112
 msgid "error occurred while retrieving data.\n"
 msgstr "Fehler beim Empfang von Daten.\n"
 
-#: src/recv.c:155 src/recv.c:197 src/recv.c:213
+#: src/recv.c:154 src/recv.c:196 src/recv.c:211
 msgid "Can't write to file.\n"
 msgstr "Kann nicht in Datei schreiben.\n"
 
@@ -6260,7 +6260,7 @@ msgstr "%.2fMB"
 msgid "%.2fGB"
 msgstr "%.2fGB"
 
-#: src/utils.c:2372 src/utils.c:2496
+#: src/utils.c:2386 src/utils.c:2510
 #, c-format
 msgid "writing to %s failed.\n"
 msgstr "Schreiben in %s fehlgeschlagen.\n"
diff --git a/po/el.po b/po/el.po
index 6d85a3d9..6d43a7b2 100644
--- a/po/el.po
+++ b/po/el.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-08-09 18:08+0900\n"
+"POT-Creation-Date: 2005-08-22 17:22+0900\n"
 "PO-Revision-Date: 2001-10-08\n"
 "Last-Translator: Michalis Kabrianis <Michalis@bigfoot.com>\n"
 "Language-Team: Greek <nls@tux.hellug.gr>\n"
@@ -98,7 +98,7 @@ msgid ""
 msgstr ""
 
 #: src/account.c:691 src/addressadd.c:192 src/addressbook.c:490
-#: src/compose.c:4081 src/editaddress.c:200 src/editaddress.c:942
+#: src/compose.c:4079 src/editaddress.c:200 src/editaddress.c:942
 #: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:265
 #: src/editjpilot.c:271 src/editldap.c:307 src/editvcard.c:184
 #: src/mimeview.c:201 src/prefs_filter.c:258 src/prefs_folder_item.c:170
@@ -231,7 +231,7 @@ msgstr ""
 msgid "Add Address to Book"
 msgstr "Προσθήκη διεύθυνσης στο βιβλίο"
 
-#: src/addressadd.c:202 src/compose.c:4528 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4521 src/editaddress.c:201
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "Διεύθυνση"
@@ -245,7 +245,7 @@ msgstr "Σχόλια"
 msgid "Select Address Book Folder"
 msgstr "Επιλογή καταλόγου βιβλίου διευθύνσεων"
 
-#: src/addressbook.c:336 src/compose.c:495 src/mainwindow.c:470
+#: src/addressbook.c:336 src/compose.c:493 src/mainwindow.c:461
 #: src/messageview.c:137
 msgid "/_File"
 msgstr "/Αρχείο"
@@ -268,10 +268,10 @@ msgstr "/Αρχείο/Νέο _J-Pilot"
 msgid "/_File/New _Server"
 msgstr "/Αρχείο/Νέος εξυπηρετητής"
 
-#: src/addressbook.c:345 src/addressbook.c:348 src/compose.c:500
-#: src/compose.c:505 src/compose.c:509 src/mainwindow.c:488
-#: src/mainwindow.c:491 src/mainwindow.c:493 src/mainwindow.c:496
-#: src/mainwindow.c:498 src/messageview.c:140
+#: src/addressbook.c:345 src/addressbook.c:348 src/compose.c:498
+#: src/compose.c:503 src/compose.c:507 src/mainwindow.c:479
+#: src/mainwindow.c:482 src/mainwindow.c:484 src/mainwindow.c:487
+#: src/mainwindow.c:489 src/messageview.c:140
 msgid "/_File/---"
 msgstr "/Αρχείο/---"
 
@@ -287,7 +287,7 @@ msgstr "/Αρχείο/Διαγραφή"
 msgid "/_File/_Save"
 msgstr "/Αρχείο/Αποθήκευση"
 
-#: src/addressbook.c:350 src/compose.c:510 src/messageview.c:141
+#: src/addressbook.c:350 src/compose.c:508 src/messageview.c:141
 msgid "/_File/_Close"
 msgstr "/Αρχείο/Κλείσιμο"
 
@@ -319,7 +319,7 @@ msgstr "/Διεύθυνση/Επεξεργασία"
 msgid "/_Address/_Delete"
 msgstr "/Διεύθυνση/Διαγραφή"
 
-#: src/addressbook.c:358 src/compose.c:619 src/mainwindow.c:725
+#: src/addressbook.c:358 src/compose.c:617 src/mainwindow.c:716
 #: src/messageview.c:256
 #, fuzzy
 msgid "/_Tools"
@@ -330,12 +330,12 @@ msgstr "/Εργαλεία"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/Αρχείο/Εισαγωγή αρχείου mbox..."
 
-#: src/addressbook.c:360 src/compose.c:632 src/mainwindow.c:775
+#: src/addressbook.c:360 src/compose.c:630 src/mainwindow.c:766
 #: src/messageview.c:274
 msgid "/_Help"
 msgstr "/Βοήθεια"
 
-#: src/addressbook.c:361 src/compose.c:633 src/mainwindow.c:786
+#: src/addressbook.c:361 src/compose.c:631 src/mainwindow.c:777
 #: src/messageview.c:275
 msgid "/_Help/_About"
 msgstr "/Βοήθεια/Σχετικά"
@@ -352,7 +352,7 @@ msgstr "/Νέα ομάδα"
 msgid "/New _Folder"
 msgstr "/Νέος κατάλογος"
 
-#: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:489
+#: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:487
 #: src/folderview.c:235 src/folderview.c:237 src/folderview.c:241
 #: src/folderview.c:252 src/folderview.c:254 src/folderview.c:256
 #: src/folderview.c:260 src/folderview.c:270 src/folderview.c:272
@@ -362,8 +362,8 @@ msgstr "/Νέος κατάλογος"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:512
-#: src/mainwindow.c:502 src/messageview.c:143
+#: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:510
+#: src/mainwindow.c:493 src/messageview.c:143
 msgid "/_Edit"
 msgstr "/Επεξεργασία"
 
@@ -375,7 +375,7 @@ msgstr "/Διαγραφή"
 msgid "E-Mail address"
 msgstr "Διεύθυνση e-mail"
 
-#: src/addressbook.c:495 src/compose.c:4529 src/prefs_common.c:2402
+#: src/addressbook.c:495 src/compose.c:4522 src/prefs_common.c:2402
 msgid "Address book"
 msgstr "Κατάλογος διευθύνσεων"
 
@@ -384,8 +384,8 @@ msgid "Name:"
 msgstr "Όνομα:"
 
 #. Buttons
-#: src/addressbook.c:627 src/addressbook.c:1673 src/editaddress.c:884
-#: src/editaddress.c:1017 src/mainwindow.c:2292 src/prefs_actions.c:266
+#: src/addressbook.c:627 src/addressbook.c:1674 src/editaddress.c:884
+#: src/editaddress.c:1017 src/mainwindow.c:2274 src/prefs_actions.c:266
 #: src/prefs_display_header.c:278 src/prefs_display_header.c:333
 #: src/prefs_template.c:231
 msgid "Delete"
@@ -424,7 +424,7 @@ msgstr "Διαγραφή διεύθυνσης (διευθύνσεων)"
 msgid "Really delete the address(es)?"
 msgstr "Σίγουρα να διαγράψω την (τις) διεύθυνση (διευθύνσεις);"
 
-#: src/addressbook.c:1664
+#: src/addressbook.c:1665
 #, fuzzy, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -434,38 +434,38 @@ msgstr ""
 "Αν διαγράφετε τον κατάλογο μόνο, οι διευθύνσεις θα μετακινηθούν στον από "
 "πάνω κατάλογο"
 
-#: src/addressbook.c:1667 src/folderview.c:2139
+#: src/addressbook.c:1668 src/folderview.c:2139
 msgid "Delete folder"
 msgstr "Διαγραφή καταλόγου"
 
-#: src/addressbook.c:1667
+#: src/addressbook.c:1668
 #, fuzzy
 msgid "_Folder only"
 msgstr "Κατάλογος μόνο"
 
-#: src/addressbook.c:1667
+#: src/addressbook.c:1668
 #, fuzzy
 msgid "Folder and _addresses"
 msgstr "Κατάλογος και διευθύνσεις"
 
-#: src/addressbook.c:1672
+#: src/addressbook.c:1673
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Σίγουρα να διαγραφεί το `%s' ;"
 
-#: src/addressbook.c:2352 src/addressbook.c:2485
+#: src/addressbook.c:2353 src/addressbook.c:2486
 msgid "New user, could not save index file."
 msgstr "Νέος χρήστης, δεν μπόρεσα να σώσω το αρχείο δείκτη."
 
-#: src/addressbook.c:2356 src/addressbook.c:2489
+#: src/addressbook.c:2357 src/addressbook.c:2490
 msgid "New user, could not save address book files."
 msgstr "Νέος χρήστης, δεν μπόρεσα να σώσω τα αρχεία του βιβλίου διευθύνσεων."
 
-#: src/addressbook.c:2366 src/addressbook.c:2499
+#: src/addressbook.c:2367 src/addressbook.c:2500
 msgid "Old address book converted successfully."
 msgstr "Το παλιό βιβλίο διευθύνσεων μετατράπηκε επιτυχώς."
 
-#: src/addressbook.c:2371
+#: src/addressbook.c:2372
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -473,7 +473,7 @@ msgstr ""
 "Το παλιό βιβλίο διευθύνσεων μετατράπηκε,\n"
 "δεν μπόρεσα να σώσω το νέο αρχείο δείκτη διευθύνσεων"
 
-#: src/addressbook.c:2384
+#: src/addressbook.c:2385
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -481,7 +481,7 @@ msgstr ""
 "Δεν μπόρεσα να μετατρέψω το βιβλίο διευθύνσεων,\n"
 "αλλά δημιούργησα νέα άδεια αρχεία βιβλίου διευθύνσεων."
 
-#: src/addressbook.c:2390
+#: src/addressbook.c:2391
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -489,7 +489,7 @@ msgstr ""
 "Δεν μπόρεσα να μετατρέψω το βιβλίο διευθύνσεων,\n"
 "δεν μπόρεσα να δημιουργήσω νέα αρχεία βιβλίου διευθύνσεων."
 
-#: src/addressbook.c:2395
+#: src/addressbook.c:2396
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -497,85 +497,85 @@ msgstr ""
 "Δεν μπόρεσα να μετατρέψω το βιβλίο διευθύνσεων,\n"
 "και δεν μπόρεσα να δημιουργήσω νέα αρχεία βιβλίου διευθύνσεων."
 
-#: src/addressbook.c:2402
+#: src/addressbook.c:2403
 msgid "Addressbook conversion error"
 msgstr "Σφάλμα μετατροπής βιβλίου διευθύνσεων"
 
-#: src/addressbook.c:2406
+#: src/addressbook.c:2407
 msgid "Addressbook conversion"
 msgstr "Μετατροπή βιβλίου διευθύνσεων"
 
-#: src/addressbook.c:2441
+#: src/addressbook.c:2442
 msgid "Addressbook Error"
 msgstr "Σφάλμα βιβλίου διευθύνσεων"
 
-#: src/addressbook.c:2442 src/addressbook.c:2542
+#: src/addressbook.c:2443 src/addressbook.c:2543
 msgid "Could not read address index"
 msgstr "Δεν μπόρεσα να διαβάσω το δείκτη της διεύθυνσης"
 
-#: src/addressbook.c:2504
+#: src/addressbook.c:2505
 msgid "Old address book converted, could not save new address index file"
 msgstr ""
 
-#: src/addressbook.c:2518
+#: src/addressbook.c:2519
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr ""
 
-#: src/addressbook.c:2524
+#: src/addressbook.c:2525
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr ""
 
-#: src/addressbook.c:2530
+#: src/addressbook.c:2531
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr ""
 
-#: src/addressbook.c:2548
+#: src/addressbook.c:2549
 msgid "Addressbook Conversion Error"
 msgstr "Σφάλμα μετατροπής βιβλίου διευθύνσεων"
 
-#: src/addressbook.c:2554
+#: src/addressbook.c:2555
 msgid "Addressbook Conversion"
 msgstr "Μετατροπή βιβλίου διευθύνσεων"
 
-#: src/addressbook.c:3055 src/prefs_common.c:963
+#: src/addressbook.c:3056 src/prefs_common.c:963
 msgid "Interface"
 msgstr "Διεπαφή"
 
-#: src/addressbook.c:3071 src/importldif.c:514
+#: src/addressbook.c:3072 src/importldif.c:514
 msgid "Address Book"
 msgstr "Βιβλίο διευθύνσεων"
 
-#: src/addressbook.c:3087
+#: src/addressbook.c:3088
 msgid "Person"
 msgstr "Άτομο"
 
-#: src/addressbook.c:3103
+#: src/addressbook.c:3104
 msgid "EMail Address"
 msgstr "Διεύθυνση e-mail"
 
-#: src/addressbook.c:3119
+#: src/addressbook.c:3120
 msgid "Group"
 msgstr "ΝέαΟμάδα"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3135 src/folderview.c:346 src/prefs_account.c:1866
+#: src/addressbook.c:3136 src/folderview.c:346 src/prefs_account.c:1866
 msgid "Folder"
 msgstr "Κατάλογος"
 
-#: src/addressbook.c:3151
+#: src/addressbook.c:3152
 #, fuzzy
 msgid "vCard"
 msgstr "V-Card"
 
-#: src/addressbook.c:3167 src/addressbook.c:3183
+#: src/addressbook.c:3168 src/addressbook.c:3184
 #, fuzzy
 msgid "JPilot"
 msgstr "J-Pilot"
 
-#: src/addressbook.c:3199
+#: src/addressbook.c:3200
 msgid "LDAP Server"
 msgstr "Εξυπηρέτης LDAP"
 
@@ -587,7 +587,7 @@ msgstr "Κοινές διευθύνσεις"
 msgid "Personal address"
 msgstr "Προσωπικές διευθύνσεις"
 
-#: src/alertpanel.c:138 src/compose.c:5214 src/main.c:515
+#: src/alertpanel.c:138 src/compose.c:5208 src/main.c:515
 msgid "Notice"
 msgstr "Σημείωση"
 
@@ -642,394 +642,394 @@ msgstr "Καφέ"
 msgid "None"
 msgstr "Τέλος"
 
-#: src/compose.c:487
+#: src/compose.c:485
 msgid "/_Add..."
 msgstr "/Προσθήκη..."
 
-#: src/compose.c:488
+#: src/compose.c:486
 msgid "/_Remove"
 msgstr "/Διαγραφή"
 
-#: src/compose.c:490 src/folderview.c:243 src/folderview.c:262
+#: src/compose.c:488 src/folderview.c:243 src/folderview.c:262
 #: src/folderview.c:277
 #, fuzzy
 msgid "/_Properties..."
 msgstr "/Ιδιότητες..."
 
-#: src/compose.c:496
+#: src/compose.c:494
 #, fuzzy
 msgid "/_File/_Send"
 msgstr "/Αρχείο/Αποθήκευση"
 
-#: src/compose.c:498
+#: src/compose.c:496
 #, fuzzy
 msgid "/_File/Send _later"
 msgstr "/Μήνυμα/Αποστολή αργότερα"
 
-#: src/compose.c:501
+#: src/compose.c:499
 #, fuzzy
 msgid "/_File/Save to _draft folder"
 msgstr "/Μήνυμα/Αποθήκευση στον κατάλογο προχείρων"
 
-#: src/compose.c:503
+#: src/compose.c:501
 #, fuzzy
 msgid "/_File/Save and _keep editing"
 msgstr "/Μήνυμα/Αποστολή αργότερα"
 
-#: src/compose.c:506
+#: src/compose.c:504
 msgid "/_File/_Attach file"
 msgstr "/Αρχείο/Προσάρτηση αρχείου"
 
-#: src/compose.c:507
+#: src/compose.c:505
 msgid "/_File/_Insert file"
 msgstr "/Αρχείο/Εισαγωγή αρχείου"
 
-#: src/compose.c:508
+#: src/compose.c:506
 msgid "/_File/Insert si_gnature"
 msgstr "/Αρχείο/Εισαγωγή υπογραφής"
 
-#: src/compose.c:513
+#: src/compose.c:511
 msgid "/_Edit/_Undo"
 msgstr "/Επεξεργασία/Αναίρεση"
 
-#: src/compose.c:514
+#: src/compose.c:512
 msgid "/_Edit/_Redo"
 msgstr "/Επεξεργασία/Επανάληψη"
 
-#: src/compose.c:515 src/compose.c:522 src/mainwindow.c:506
+#: src/compose.c:513 src/compose.c:520 src/mainwindow.c:497
 #: src/messageview.c:146
 msgid "/_Edit/---"
 msgstr "/Επεξεργασία/---"
 
-#: src/compose.c:516
+#: src/compose.c:514
 msgid "/_Edit/Cu_t"
 msgstr "/Επεξεργασία/Κοπή"
 
-#: src/compose.c:517 src/mainwindow.c:503 src/messageview.c:144
+#: src/compose.c:515 src/mainwindow.c:494 src/messageview.c:144
 msgid "/_Edit/_Copy"
 msgstr "/Επεξεργασία/Αντιγραφή"
 
-#: src/compose.c:518
+#: src/compose.c:516
 msgid "/_Edit/_Paste"
 msgstr "/Επεξεργασία/Επικόλληση"
 
-#: src/compose.c:519
+#: src/compose.c:517
 #, fuzzy
 msgid "/_Edit/Paste as _quotation"
 msgstr "/Επεξεργασία/Επικόλληση"
 
-#: src/compose.c:521 src/mainwindow.c:504 src/messageview.c:145
+#: src/compose.c:519 src/mainwindow.c:495 src/messageview.c:145
 msgid "/_Edit/Select _all"
 msgstr "/Επεξεργασία/Επιλογή όλων"
 
-#: src/compose.c:523
+#: src/compose.c:521
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/Επεξεργασία/Αναδίπλωση τρέχουσας παραγράφου"
 
-#: src/compose.c:525
+#: src/compose.c:523
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/Επεξεργασία/Αναδίπλωση μακριών γραμμών"
 
-#: src/compose.c:527
+#: src/compose.c:525
 #, fuzzy
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/Επεξεργασία/Αντιγραφή"
 
-#: src/compose.c:528 src/mainwindow.c:511 src/messageview.c:150
+#: src/compose.c:526 src/mainwindow.c:502 src/messageview.c:150
 #: src/summaryview.c:400
 msgid "/_View"
 msgstr "/Απεικόνιση"
 
-#: src/compose.c:529
+#: src/compose.c:527
 #, fuzzy
 msgid "/_View/_To"
 msgstr "/Απεικόνιση/Εμφάνιση του πηγαίου"
 
-#: src/compose.c:530
+#: src/compose.c:528
 #, fuzzy
 msgid "/_View/_Cc"
 msgstr "/Απεικόνιση"
 
-#: src/compose.c:531
+#: src/compose.c:529
 #, fuzzy
 msgid "/_View/_Bcc"
 msgstr "/Απεικόνιση/Εμφάνιση του πηγαίου"
 
-#: src/compose.c:532
+#: src/compose.c:530
 #, fuzzy
 msgid "/_View/_Reply to"
 msgstr "/Απεικόνιση/Κωδικοσύνολο"
 
-#: src/compose.c:533 src/compose.c:535 src/compose.c:537 src/compose.c:539
-#: src/mainwindow.c:529 src/mainwindow.c:532 src/mainwindow.c:558
-#: src/mainwindow.c:582 src/mainwindow.c:675 src/mainwindow.c:679
+#: src/compose.c:531 src/compose.c:533 src/compose.c:535 src/compose.c:537
+#: src/mainwindow.c:520 src/mainwindow.c:523 src/mainwindow.c:549
+#: src/mainwindow.c:573 src/mainwindow.c:666 src/mainwindow.c:670
 #: src/messageview.c:233
 msgid "/_View/---"
 msgstr "/Απεικόνιση/---"
 
-#: src/compose.c:534
+#: src/compose.c:532
 #, fuzzy
 msgid "/_View/_Followup to"
 msgstr "/Μήνυμα/Συνέχεια σε"
 
-#: src/compose.c:536
+#: src/compose.c:534
 #, fuzzy
 msgid "/_View/R_uler"
 msgstr "/Απεικόνιση/Εμφάνιση του πηγαίου"
 
-#: src/compose.c:538
+#: src/compose.c:536
 #, fuzzy
 msgid "/_View/_Attachment"
 msgstr "Προσάρτηση"
 
-#: src/compose.c:545 src/mainwindow.c:589 src/messageview.c:157
+#: src/compose.c:543 src/mainwindow.c:580 src/messageview.c:157
 #, fuzzy
 msgid "/_View/Character _encoding"
 msgstr "/Απεικόνιση/Εμφάνιση του πηγαίου"
 
-#: src/compose.c:546
+#: src/compose.c:544
 msgid "/_View/Character _encoding/_Automatic"
 msgstr ""
 
-#: src/compose.c:548 src/compose.c:554 src/compose.c:560 src/compose.c:564
-#: src/compose.c:570 src/compose.c:574 src/compose.c:580 src/compose.c:584
-#: src/compose.c:594 src/compose.c:598 src/compose.c:608 src/compose.c:612
-#: src/mainwindow.c:585 src/mainwindow.c:592 src/messageview.c:153
+#: src/compose.c:546 src/compose.c:552 src/compose.c:558 src/compose.c:562
+#: src/compose.c:568 src/compose.c:572 src/compose.c:578 src/compose.c:582
+#: src/compose.c:592 src/compose.c:596 src/compose.c:606 src/compose.c:610
+#: src/mainwindow.c:576 src/mainwindow.c:583 src/messageview.c:153
 #, fuzzy
 msgid "/_View/Character _encoding/---"
 msgstr "/Απεικόνιση/Εμφάνιση του πηγαίου"
 
-#: src/compose.c:550 src/mainwindow.c:593 src/messageview.c:161
+#: src/compose.c:548 src/mainwindow.c:584 src/messageview.c:161
 #, fuzzy
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/7bit ascii (US-ASC_II)"
 
-#: src/compose.c:552 src/mainwindow.c:595 src/messageview.c:164
+#: src/compose.c:550 src/mainwindow.c:586 src/messageview.c:164
 #, fuzzy
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/Unicode (_UTF-8)"
 
-#: src/compose.c:556 src/mainwindow.c:599 src/messageview.c:167
+#: src/compose.c:554 src/mainwindow.c:590 src/messageview.c:167
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/Δυτικής Ευρώπης (ISO-8859-_1)"
 
-#: src/compose.c:558 src/mainwindow.c:601 src/messageview.c:169
+#: src/compose.c:556 src/mainwindow.c:592 src/messageview.c:169
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/Δυτικής Ευρώπης (ISO-8859-_1)"
 
-#: src/compose.c:562 src/mainwindow.c:605 src/messageview.c:172
+#: src/compose.c:560 src/mainwindow.c:596 src/messageview.c:172
 #, fuzzy
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/Κεντρικής Ευρώπης (ISO-8859-_2)"
 
-#: src/compose.c:566 src/mainwindow.c:609 src/messageview.c:175
+#: src/compose.c:564 src/mainwindow.c:600 src/messageview.c:175
 #, fuzzy
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/Βαλτικής (ISO-8859-13)"
 
-#: src/compose.c:568 src/mainwindow.c:611 src/messageview.c:177
+#: src/compose.c:566 src/mainwindow.c:602 src/messageview.c:177
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/Βαλτικής (ISO-8859-_4)"
 
-#: src/compose.c:572 src/mainwindow.c:615 src/messageview.c:180
+#: src/compose.c:570 src/mainwindow.c:606 src/messageview.c:180
 #, fuzzy
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/Ελληνικό (ISO-8859-_7)"
 
-#: src/compose.c:576 src/mainwindow.c:619 src/messageview.c:183
+#: src/compose.c:574 src/mainwindow.c:610 src/messageview.c:183
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/Ελληνικό (ISO-8859-_7)"
 
-#: src/compose.c:578 src/mainwindow.c:621 src/messageview.c:185
+#: src/compose.c:576 src/mainwindow.c:612 src/messageview.c:185
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/Κυριλλικό (Windows-1251)"
 
-#: src/compose.c:582 src/mainwindow.c:625 src/messageview.c:188
+#: src/compose.c:580 src/mainwindow.c:616 src/messageview.c:188
 #, fuzzy
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/Τουρκικό (ISO-8859-_9)"
 
-#: src/compose.c:586 src/mainwindow.c:629 src/messageview.c:191
+#: src/compose.c:584 src/mainwindow.c:620 src/messageview.c:191
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/Κυριλλικό (ISO-8859-_5)"
 
-#: src/compose.c:588 src/mainwindow.c:631 src/messageview.c:193
+#: src/compose.c:586 src/mainwindow.c:622 src/messageview.c:193
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/Κυριλλικό (KOI8-_R)"
 
-#: src/compose.c:590 src/mainwindow.c:633 src/messageview.c:195
+#: src/compose.c:588 src/mainwindow.c:624 src/messageview.c:195
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/Κυριλλικό (KOI8-_R)"
 
-#: src/compose.c:592 src/mainwindow.c:635 src/messageview.c:197
+#: src/compose.c:590 src/mainwindow.c:626 src/messageview.c:197
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/Κυριλλικό (Windows-1251)"
 
-#: src/compose.c:596 src/mainwindow.c:639 src/messageview.c:200
+#: src/compose.c:594 src/mainwindow.c:630 src/messageview.c:200
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/Ιαπωνέζικο (ISO-2022-_JP)"
 
-#: src/compose.c:600 src/mainwindow.c:649 src/messageview.c:209
+#: src/compose.c:598 src/mainwindow.c:640 src/messageview.c:209
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/Απλοποιημένο Κινεζικό (_GB2312)"
 
-#: src/compose.c:602 src/mainwindow.c:651 src/messageview.c:211
+#: src/compose.c:600 src/mainwindow.c:642 src/messageview.c:211
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/Απλοποιημένο Κινεζικό (_GB2312)"
 
-#: src/compose.c:604 src/mainwindow.c:653 src/messageview.c:213
+#: src/compose.c:602 src/mainwindow.c:644 src/messageview.c:213
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/Παραδοσιακό Κινεζικό (_Big5)"
 
-#: src/compose.c:606 src/mainwindow.c:655 src/messageview.c:215
+#: src/compose.c:604 src/mainwindow.c:646 src/messageview.c:215
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/Παραδοσιακό Κινεζικό (EUC-_TW)"
 
-#: src/compose.c:610 src/mainwindow.c:661 src/messageview.c:220
+#: src/compose.c:608 src/mainwindow.c:652 src/messageview.c:220
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/Κορεάτικο (EUC-_KR)"
 
-#: src/compose.c:614 src/mainwindow.c:667 src/messageview.c:225
+#: src/compose.c:612 src/mainwindow.c:658 src/messageview.c:225
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/Κινεζικό (ISO-2022-_CN)"
 
-#: src/compose.c:616 src/mainwindow.c:669 src/messageview.c:227
+#: src/compose.c:614 src/mainwindow.c:660 src/messageview.c:227
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/Κυριλλικό (Windows-1251)"
 
-#: src/compose.c:620 src/mainwindow.c:726 src/messageview.c:257
+#: src/compose.c:618 src/mainwindow.c:717 src/messageview.c:257
 #, fuzzy
 msgid "/_Tools/_Address book"
 msgstr "/Εργαλεία/Κατάλογος διευθύνσεων"
 
-#: src/compose.c:621
+#: src/compose.c:619
 #, fuzzy
 msgid "/_Tools/_Template"
 msgstr "/Αρχείο/Διαγραφή"
 
-#: src/compose.c:622 src/mainwindow.c:749 src/messageview.c:272
+#: src/compose.c:620 src/mainwindow.c:740 src/messageview.c:272
 #, fuzzy
 msgid "/_Tools/Actio_ns"
 msgstr "/Εκτέλεση"
 
-#: src/compose.c:623 src/compose.c:627 src/mainwindow.c:729
-#: src/mainwindow.c:743 src/mainwindow.c:748 src/mainwindow.c:750
-#: src/mainwindow.c:753 src/mainwindow.c:755 src/messageview.c:260
+#: src/compose.c:621 src/compose.c:625 src/mainwindow.c:720
+#: src/mainwindow.c:734 src/mainwindow.c:739 src/mainwindow.c:741
+#: src/mainwindow.c:744 src/mainwindow.c:746 src/messageview.c:260
 #: src/messageview.c:271
 #, fuzzy
 msgid "/_Tools/---"
 msgstr "/Εργαλεία"
 
-#: src/compose.c:624
+#: src/compose.c:622
 #, fuzzy
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/Επεξεργασία/Επεξεργασία με εξωτερικό πρόγραμμα"
 
-#: src/compose.c:628
+#: src/compose.c:626
 #, fuzzy
 msgid "/_Tools/PGP Si_gn"
 msgstr "/Εκτέλεση"
 
-#: src/compose.c:629
+#: src/compose.c:627
 #, fuzzy
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/Μήνυμα/Κρυπτογράφηση"
 
-#: src/compose.c:855
+#: src/compose.c:853
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: το αρχείο δεν υπάρχει\n"
 
-#: src/compose.c:954 src/compose.c:1024 src/procmsg.c:1353
+#: src/compose.c:952 src/compose.c:1022 src/procmsg.c:1353
 msgid "Can't get text part\n"
 msgstr "Δεν μπορώ να λάβω το τμήμα κειμένου\n"
 
-#: src/compose.c:1420
+#: src/compose.c:1418
 msgid "Quote mark format error."
 msgstr ""
 
-#: src/compose.c:1432
+#: src/compose.c:1430
 msgid "Message reply/forward format error."
 msgstr ""
 
-#: src/compose.c:1801
+#: src/compose.c:1799
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Το αρχείο %s δεν υπάρχει\n"
 
-#: src/compose.c:1805
+#: src/compose.c:1803
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Δεν μπορώ να βρω το μέγεθος του αρχείου %s\n"
 
-#: src/compose.c:1809
+#: src/compose.c:1807
 #, fuzzy, c-format
 msgid "File %s is empty."
 msgstr "Το αρχείο %s είναι άδειο\n"
 
-#: src/compose.c:1813
+#: src/compose.c:1811
 #, fuzzy, c-format
 msgid "Can't read %s."
 msgstr "δεν μπορώ να δημιουργήσω %s\n"
 
-#: src/compose.c:1848
+#: src/compose.c:1846
 #, c-format
 msgid "Message: %s"
 msgstr "Μήνυμα: %s"
 
-#: src/compose.c:1920 src/mimeview.c:560
+#: src/compose.c:1918 src/mimeview.c:560
 msgid "Can't get the part of multipart message."
 msgstr "Δεν μπορώ να λάβω το τμήμα του πολυτμηματικού μηνύματος"
 
-#: src/compose.c:2362
+#: src/compose.c:2360
 msgid " [Edited]"
 msgstr " [Τροποποιημένο]"
 
-#: src/compose.c:2364
+#: src/compose.c:2362
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Σύνθεση μηνύματος%s"
 
-#: src/compose.c:2367
+#: src/compose.c:2365
 #, c-format
 msgid "Compose message%s"
 msgstr "Σύνθεση μηνύματος%s"
 
-#: src/compose.c:2478
+#: src/compose.c:2476
 msgid "Recipient is not specified."
 msgstr "Ο παραλήπτης δεν έχει οριστεί."
 
-#: src/compose.c:2486
+#: src/compose.c:2484
 #, fuzzy
 msgid "Empty subject"
 msgstr "Θέμα"
 
-#: src/compose.c:2487
+#: src/compose.c:2485
 msgid "Subject is empty. Send it anyway?"
 msgstr ""
 
-#: src/compose.c:2538
+#: src/compose.c:2536
 msgid "can't get recipient list."
 msgstr "δεν μπορώ να πάρω την λίστα παραληπτών"
 
-#: src/compose.c:2558
+#: src/compose.c:2556
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1037,26 +1037,26 @@ msgstr ""
 "Ο λογαριασμός για αποστολή μηνύματος δεν έχει οριστεί.\n"
 "Παρακαλώ επιλέξτε ένα λογαριασμό πριν στείλετε."
 
-#: src/compose.c:2572 src/send_message.c:297
+#: src/compose.c:2570 src/send_message.c:297
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Συνέβη σφάλμα κατά την αποστολή του μηνύματος σε %s ."
 
-#: src/compose.c:2595
+#: src/compose.c:2593
 msgid "Can't save the message to outbox."
 msgstr "Δεν μπορώ να αποθηκεύσω το μήνυμα στα εξερχόμενα."
 
-#: src/compose.c:2645
+#: src/compose.c:2643
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr ""
 
-#: src/compose.c:2709 src/compose.c:2965 src/compose.c:3028 src/compose.c:3148
-#: src/utils.c:2365
+#: src/compose.c:2707 src/compose.c:2963 src/compose.c:3026 src/compose.c:3146
+#: src/utils.c:2379
 msgid "can't change file mode\n"
 msgstr "δεν μπορώ να αλλάξω το mode του αρχείου\n"
 
-#: src/compose.c:2741
+#: src/compose.c:2739
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1064,12 +1064,12 @@ msgid ""
 "Send it as %s anyway?"
 msgstr "Δεν μπορώ να αλλάξω το κωδικοσύνολο του μηνύματος."
 
-#: src/compose.c:2747
+#: src/compose.c:2745
 #, fuzzy
 msgid "Code conversion error"
 msgstr "Σφάλμα μετατροπής βιβλίου διευθύνσεων"
 
-#: src/compose.c:2816
+#: src/compose.c:2814
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1078,162 +1078,162 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:2820
+#: src/compose.c:2818
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3108
+#: src/compose.c:3106
 msgid "can't remove the old message\n"
 msgstr "δεν μπορώ να αφαιρέσω το παλιό μήνυμα\n"
 
-#: src/compose.c:3126
+#: src/compose.c:3124
 msgid "queueing message...\n"
 msgstr "βάζω το μήνυμα στην ουρά...\n"
 
-#: src/compose.c:3208
+#: src/compose.c:3206
 #, fuzzy
 msgid "can't find queue folder\n"
 msgstr "δεν μπορώ να επιλέξω τον κατάλογο: %s\n"
 
-#: src/compose.c:3215
+#: src/compose.c:3213
 msgid "can't queue the message\n"
 msgstr "δεν μπορώ να βάλω το μήνυμα στην ουρά\n"
 
-#: src/compose.c:3792
+#: src/compose.c:3790
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "generated Message-ID: %s\n"
 
-#: src/compose.c:3901
+#: src/compose.c:3899
 msgid "Creating compose window...\n"
 msgstr "Δημιουργώ το παράθυρο σύνθεσης...\n"
 
-#: src/compose.c:3949 src/headerview.c:54 src/summary_search.c:214
+#: src/compose.c:3947 src/headerview.c:54 src/summary_search.c:214
 msgid "From:"
 msgstr "Από:"
 
-#: src/compose.c:4021
+#: src/compose.c:4019
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/Εκτέλεση"
 
-#: src/compose.c:4024
+#: src/compose.c:4022
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/Μήνυμα/Κρυπτογράφηση"
 
-#: src/compose.c:4062 src/compose.c:5001
+#: src/compose.c:4060 src/compose.c:4995
 msgid "MIME type"
 msgstr "τύπος MIME"
 
 #. S_COL_DATE
-#: src/compose.c:4071 src/mimeview.c:192 src/prefs_filter_edit.c:585
+#: src/compose.c:4069 src/mimeview.c:192 src/prefs_filter_edit.c:585
 #: src/prefs_summary_column.c:75 src/select-keys.c:317 src/summaryview.c:4217
 msgid "Size"
 msgstr "Μέγεθος"
 
-#: src/compose.c:4449 src/mainwindow.c:2224 src/prefs_account.c:719
+#: src/compose.c:4442 src/mainwindow.c:2207 src/prefs_account.c:719
 #: src/prefs_common.c:947
 msgid "Send"
 msgstr "Αποστολή"
 
-#: src/compose.c:4450
+#: src/compose.c:4443
 msgid "Send message"
 msgstr "Αποστολή μηνύματος"
 
-#: src/compose.c:4458
+#: src/compose.c:4451
 msgid "Send later"
 msgstr ""
 "Αποστολή\n"
 "αργότερα"
 
-#: src/compose.c:4459
+#: src/compose.c:4452
 msgid "Put into queue folder and send later"
 msgstr "Τοποθέτηση στον κατάλογο ουράς και αποστολή αργότερα"
 
-#: src/compose.c:4467
+#: src/compose.c:4460
 msgid "Draft"
 msgstr "Πρόχειρα"
 
-#: src/compose.c:4468
+#: src/compose.c:4461
 msgid "Save to draft folder"
 msgstr "Αποθήκευση στον κατάλογο προχείρων"
 
-#: src/compose.c:4478
+#: src/compose.c:4471
 msgid "Insert"
 msgstr "Εισαγωγή"
 
-#: src/compose.c:4479
+#: src/compose.c:4472
 msgid "Insert file"
 msgstr "Εισαγωγή αρχείου"
 
-#: src/compose.c:4487
+#: src/compose.c:4480
 msgid "Attach"
 msgstr "Προσάρτηση"
 
-#: src/compose.c:4488
+#: src/compose.c:4481
 msgid "Attach file"
 msgstr "Προσάρτηση αρχείου"
 
 #. signature
-#: src/compose.c:4498 src/prefs_account.c:1391 src/prefs_common.c:1356
+#: src/compose.c:4491 src/prefs_account.c:1391 src/prefs_common.c:1356
 msgid "Signature"
 msgstr "Yπογραφή"
 
-#: src/compose.c:4499
+#: src/compose.c:4492
 msgid "Insert signature"
 msgstr "Εισαγωγή υπογραφής"
 
-#: src/compose.c:4508 src/prefs_common.c:1378 src/prefs_common.c:2382
+#: src/compose.c:4501 src/prefs_common.c:1378 src/prefs_common.c:2382
 msgid "Editor"
 msgstr "Συνθέτης"
 
-#: src/compose.c:4509
+#: src/compose.c:4502
 msgid "Edit with external editor"
 msgstr "Επεξεργασία με εξωτερικό πρόγραμμα"
 
-#: src/compose.c:4517
+#: src/compose.c:4510
 msgid "Linewrap"
 msgstr ""
 "Τύλιξη\n"
 "γραμμής"
 
-#: src/compose.c:4518
+#: src/compose.c:4511
 #, fuzzy
 msgid "Wrap all long lines"
 msgstr "Αναδίπλωση γραμμών"
 
-#: src/compose.c:4897
+#: src/compose.c:4891
 msgid "Invalid MIME type."
 msgstr "Μη έγκυρος τύπος MIME"
 
-#: src/compose.c:4915
+#: src/compose.c:4909
 msgid "File doesn't exist or is empty."
 msgstr "Το αρχείο δεν υπάρχει, ή είναι άδειο."
 
-#: src/compose.c:4983
+#: src/compose.c:4977
 #, fuzzy
 msgid "Properties"
 msgstr "Ιδιότητες"
 
-#: src/compose.c:5003
+#: src/compose.c:4997
 msgid "Encoding"
 msgstr "Κωδικοποίηση"
 
-#: src/compose.c:5026 src/prefs_folder_item.c:183
+#: src/compose.c:5020 src/prefs_folder_item.c:183
 msgid "Path"
 msgstr "Διάδρομος"
 
-#: src/compose.c:5027
+#: src/compose.c:5021
 msgid "File name"
 msgstr "Όνομα αρχείου"
 
-#: src/compose.c:5185
+#: src/compose.c:5179
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Η εντολή για το εξωτερικό πρόγραμμα δεν είναι έγκυρη: `%s'\n"
 
-#: src/compose.c:5211
+#: src/compose.c:5205
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1244,76 +1244,76 @@ msgstr ""
 "Να επιβάλλω τερματισμό της διεργασίας;\n"
 "process group id:  %d"
 
-#: src/compose.c:5228
+#: src/compose.c:5222
 #, c-format
 msgid "Terminated process group id: %d"
 msgstr "Τερματίστηκε process group id: %d"
 
-#: src/compose.c:5229
+#: src/compose.c:5223
 #, c-format
 msgid "Temporary file: %s"
 msgstr "Προσωρινό αρχείο: %s"
 
-#: src/compose.c:5253
+#: src/compose.c:5247
 msgid "Compose: input from monitoring process\n"
 msgstr "Σύνθεση: εισαγωγή από παρακολουθούμενη διεργασία\n"
 
 #. failed
-#: src/compose.c:5284
+#: src/compose.c:5278
 msgid "Couldn't exec external editor\n"
 msgstr "Δεν μπόρεσα να καλέσω το εξωτερικό πρόγραμμα επεξεργασίας\n"
 
-#: src/compose.c:5288
+#: src/compose.c:5282
 msgid "Couldn't write to file\n"
 msgstr "Δεν μπόρεσα να γράψω στο αρχείο\n"
 
-#: src/compose.c:5290
+#: src/compose.c:5284
 msgid "Pipe read failed\n"
 msgstr "Αποτυχία ανάγνωσης από το pipe\n"
 
-#: src/compose.c:5596 src/compose.c:5604 src/compose.c:5610
+#: src/compose.c:5590 src/compose.c:5598 src/compose.c:5604
 msgid "Can't queue the message."
 msgstr "Δεν μπορώ να βάλω στην ουρά το μήνυμα."
 
-#: src/compose.c:5701
+#: src/compose.c:5695
 #, fuzzy
 msgid "Select files"
 msgstr "Επιλογή αρχείου"
 
-#: src/compose.c:5723
+#: src/compose.c:5717
 msgid "Select file"
 msgstr "Επιλογή αρχείου"
 
-#: src/compose.c:5760
+#: src/compose.c:5754
 #, fuzzy
 msgid "Save message"
 msgstr "Αποστολή μηνύματος"
 
-#: src/compose.c:5761
+#: src/compose.c:5755
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Αυτό το μήνυμα έχει τροποποιηθεί, να απορριφθεί;"
 
-#: src/compose.c:5763
+#: src/compose.c:5757
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:5805
+#: src/compose.c:5799
 #, fuzzy, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Θέλετε πράγματι να διαγραφεί αυτή η κεφαλίδα;"
 
-#: src/compose.c:5807
+#: src/compose.c:5801
 #, fuzzy
 msgid "Apply template"
 msgstr "Διαγραφή μηνύματος"
 
-#: src/compose.c:5808
+#: src/compose.c:5802
 #, fuzzy
 msgid "_Replace"
 msgstr "Απάντηση"
 
-#: src/compose.c:5808
+#: src/compose.c:5802
 #, fuzzy
 msgid "_Insert"
 msgstr "Εισαγωγή"
@@ -1774,12 +1774,12 @@ msgstr "Θέτω τις πληροφορίες καταλόγων...\n"
 msgid "Setting folder info..."
 msgstr "Θέτω τις πληροφορίες καταλόγων..."
 
-#: src/folderview.c:805 src/mainwindow.c:3301 src/setup.c:81
+#: src/folderview.c:805 src/mainwindow.c:3272 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Σάρωση καταλόγων %s%c%s ..."
 
-#: src/folderview.c:809 src/mainwindow.c:3306 src/setup.c:86
+#: src/folderview.c:809 src/mainwindow.c:3277 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Σάρωση καταλόγου %s ..."
@@ -2114,46 +2114,46 @@ msgstr "Πιστοποίηση"
 msgid "IMAP4 login failed.\n"
 msgstr "Η είσοδος στο IMAP4 απέτυχε.\n"
 
-#: src/imap.c:3522
+#: src/imap.c:3528
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "δεν μπορώ να προσθέσω το %s στο %s\n"
 
-#: src/imap.c:3529
+#: src/imap.c:3535
 #, fuzzy
 msgid "(sending file...)"
 msgstr "Στέλνω DATA..."
 
-#: src/imap.c:3557
+#: src/imap.c:3563
 #, fuzzy, c-format
 msgid "can't append message to %s\n"
 msgstr "δεν μπορώ να προσθέσω το μήνυμα %s\n"
 
-#: src/imap.c:3589
+#: src/imap.c:3595
 #, fuzzy, c-format
 msgid "can't copy %s to %s\n"
 msgstr "δεν μπορώ να αντιγράψω το %d στο %s\n"
 
-#: src/imap.c:3613
+#: src/imap.c:3619
 #, fuzzy, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "σφάλμα κατά την εντολή imap: STORE %d:%d %s\n"
 
-#: src/imap.c:3627
+#: src/imap.c:3633
 msgid "error while imap command: EXPUNGE\n"
 msgstr "σφάλμα κατά την εντολή imap: EXPUNGE\n"
 
-#: src/imap.c:3640
+#: src/imap.c:3646
 #, fuzzy
 msgid "error while imap command: CLOSE\n"
 msgstr "σφάλμα κατά την εντολή imap: EXPUNGE\n"
 
-#: src/imap.c:3873
+#: src/imap.c:3879
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr ""
 
-#: src/imap.c:3903
+#: src/imap.c:3909
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr ""
@@ -2266,7 +2266,7 @@ msgstr ""
 msgid "Prev"
 msgstr "Επιλογές"
 
-#: src/importldif.c:768 src/mainwindow.c:2321
+#: src/importldif.c:768 src/mainwindow.c:2303
 msgid "Next"
 msgstr "Επόμενο"
 
@@ -2612,717 +2612,717 @@ msgid ""
 "Do you want to migrate it?"
 msgstr ""
 
-#: src/mainwindow.c:471
+#: src/mainwindow.c:462
 msgid "/_File/_Folder"
 msgstr "/Αρχείο/Κατάλογος"
 
-#: src/mainwindow.c:472
+#: src/mainwindow.c:463
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/Αρχείο/Κατάλογος/Δημιουργία νέου καταλόγου..."
 
-#: src/mainwindow.c:474
+#: src/mainwindow.c:465
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/Αρχείο/Κατάλογος/Μετονομασία καταλόγου..."
 
-#: src/mainwindow.c:475
+#: src/mainwindow.c:466
 #, fuzzy
 msgid "/_File/_Folder/_Move folder..."
 msgstr "/Αρχείο/Κατάλογος/Μετονομασία καταλόγου..."
 
-#: src/mainwindow.c:476
+#: src/mainwindow.c:467
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/Αρχείο/Κατάλογος/Διαγραφή καταλόγου"
 
-#: src/mainwindow.c:477
+#: src/mainwindow.c:468
 #, fuzzy
 msgid "/_File/_Mailbox"
 msgstr "/Αρχείο/Προσθήκη mailbox..."
 
-#: src/mainwindow.c:478
+#: src/mainwindow.c:469
 #, fuzzy
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/Αρχείο/Προσθήκη mailbox..."
 
-#: src/mainwindow.c:479
+#: src/mainwindow.c:470
 #, fuzzy
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/Διαγραφή mailbox"
 
-#: src/mainwindow.c:480 src/mainwindow.c:485
+#: src/mainwindow.c:471 src/mainwindow.c:476
 #, fuzzy
 msgid "/_File/_Mailbox/---"
 msgstr "/Αρχείο/Κατάλογος"
 
-#: src/mainwindow.c:481
+#: src/mainwindow.c:472
 #, fuzzy
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "Σύνθεση νέου μηνύματος"
 
-#: src/mainwindow.c:483
+#: src/mainwindow.c:474
 #, fuzzy
 msgid "/_File/_Mailbox/Check for new messages in _all mailboxes"
 msgstr "Σύνθεση νέου μηνύματος"
 
-#: src/mainwindow.c:486
+#: src/mainwindow.c:477
 #, fuzzy
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "/Ενημέρωση δομής καταλόγων"
 
-#: src/mainwindow.c:489
+#: src/mainwindow.c:480
 msgid "/_File/_Import mbox file..."
 msgstr "/Αρχείο/Εισαγωγή αρχείου mbox..."
 
-#: src/mainwindow.c:490
+#: src/mainwindow.c:481
 msgid "/_File/_Export to mbox file..."
 msgstr "/Αρχείο/Εξαγωγή σε αρχείο mbox..."
 
-#: src/mainwindow.c:492
+#: src/mainwindow.c:483
 #, fuzzy
 msgid "/_File/Empty all _trash"
 msgstr "/Αρχείο/Άδειασμα διαγραμμένων"
 
-#: src/mainwindow.c:494 src/messageview.c:138
+#: src/mainwindow.c:485 src/messageview.c:138
 msgid "/_File/_Save as..."
 msgstr "/Αρχείο/Αποθήκευση ως..."
 
-#: src/mainwindow.c:495 src/messageview.c:139
+#: src/mainwindow.c:486 src/messageview.c:139
 msgid "/_File/_Print..."
 msgstr "/Αρχείο/Εκτύπωση..."
 
-#: src/mainwindow.c:497
+#: src/mainwindow.c:488
 #, fuzzy
 msgid "/_File/_Work offline"
 msgstr "/Αρχείο/Εισαγωγή αρχείου"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:500
+#: src/mainwindow.c:491
 msgid "/_File/E_xit"
 msgstr "/Αρχείο/Έξοδος"
 
-#: src/mainwindow.c:505
+#: src/mainwindow.c:496
 #, fuzzy
 msgid "/_Edit/Select _thread"
 msgstr "/Επεξεργασία/Επιλογή όλων"
 
-#: src/mainwindow.c:507 src/messageview.c:147
+#: src/mainwindow.c:498 src/messageview.c:147
 #, fuzzy
 msgid "/_Edit/_Find in current message..."
 msgstr "/Επεξεργασία/Αναδίπλωση τρέχουσας παραγράφου"
 
-#: src/mainwindow.c:509
+#: src/mainwindow.c:500
 #, fuzzy
 msgid "/_Edit/_Search messages..."
 msgstr "\tΑναζήτηση στα απροσπέλαστα μηνύματα... "
 
-#: src/mainwindow.c:512
+#: src/mainwindow.c:503
 #, fuzzy
 msgid "/_View/Show or hi_de"
 msgstr "/Απεικόνιση/Εμφάνιση της πλήρους κεφαλίδας"
 
-#: src/mainwindow.c:513
+#: src/mainwindow.c:504
 #, fuzzy
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/Απεικόνιση/Δομή καταλόγων"
 
-#: src/mainwindow.c:515
+#: src/mainwindow.c:506
 #, fuzzy
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/Απεικόνιση/Απεικόνιση μηνυνάτων"
 
-#: src/mainwindow.c:517
+#: src/mainwindow.c:508
 #, fuzzy
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/Απεικόνιση/Ράβδος εργαλείων"
 
-#: src/mainwindow.c:519
+#: src/mainwindow.c:510
 #, fuzzy
 msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/Απεικόνιση/Ράβδος εργαλείων/Εικόνες και κείμενο"
 
-#: src/mainwindow.c:521
+#: src/mainwindow.c:512
 #, fuzzy
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/Απεικόνιση/Ράβδος εργαλείων/Εικόνες"
 
-#: src/mainwindow.c:523
+#: src/mainwindow.c:514
 #, fuzzy
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/Απεικόνιση/Ράβδος εργαλείων/Κείμενο"
 
-#: src/mainwindow.c:525
+#: src/mainwindow.c:516
 #, fuzzy
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/Απεικόνιση/Ράβδος εργαλείων/Καμία"
 
-#: src/mainwindow.c:527
+#: src/mainwindow.c:518
 #, fuzzy
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/Απεικόνιση/Ράβδος κατάστασης"
 
-#: src/mainwindow.c:530
+#: src/mainwindow.c:521
 msgid "/_View/Separate f_older tree"
 msgstr "/Απεικόνιση/Ξεχωριστό παράθυρο δομής καταλόγων"
 
-#: src/mainwindow.c:531
+#: src/mainwindow.c:522
 #, fuzzy
 msgid "/_View/Separate _message view"
 msgstr "/Απεικόνιση/Ξεχωριστή απεικόνιση μηνυμάτων"
 
-#: src/mainwindow.c:533
+#: src/mainwindow.c:524
 #, fuzzy
 msgid "/_View/_Sort"
 msgstr "/Απεικόνιση/Εμφάνιση του πηγαίου"
 
-#: src/mainwindow.c:534
+#: src/mainwindow.c:525
 #, fuzzy
 msgid "/_View/_Sort/by _number"
 msgstr "/Περίληψη/Ταξινόμηση/Ταξινόμηση κατά αριθμό"
 
-#: src/mainwindow.c:535
+#: src/mainwindow.c:526
 #, fuzzy
 msgid "/_View/_Sort/by s_ize"
 msgstr "/Περίληψη/Ταξινόμηση/Ταξινόμηση κατά μέγεθος"
 
-#: src/mainwindow.c:536
+#: src/mainwindow.c:527
 #, fuzzy
 msgid "/_View/_Sort/by _date"
 msgstr "/Περίληψη/Ταξινόμηση/Ταξινόμηση κατά ημερομηνία"
 
-#: src/mainwindow.c:537
+#: src/mainwindow.c:528
 #, fuzzy
 msgid "/_View/_Sort/by _from"
 msgstr "/Περίληψη/Ταξινόμηση/Ταξινόμηση κατά αποστολέα"
 
-#: src/mainwindow.c:538
+#: src/mainwindow.c:529
 #, fuzzy
 msgid "/_View/_Sort/by _recipient"
 msgstr "/Περίληψη/Ταξινόμηση/Ταξινόμηση κατά μέγεθος"
 
-#: src/mainwindow.c:539
+#: src/mainwindow.c:530
 #, fuzzy
 msgid "/_View/_Sort/by _subject"
 msgstr "/Περίληψη/Ταξινόμηση/Ταξινόμηση κατά θέμα"
 
-#: src/mainwindow.c:540
+#: src/mainwindow.c:531
 #, fuzzy
 msgid "/_View/_Sort/by _color label"
 msgstr "/Περίληψη/Ταξινόμηση/Ταξινόμηση κατά χρώμα ετικέτας"
 
-#: src/mainwindow.c:542
+#: src/mainwindow.c:533
 #, fuzzy
 msgid "/_View/_Sort/by _mark"
 msgstr "/Περίληψη/Ταξινόμηση/Ταξινόμηση κατά σήμανση"
 
-#: src/mainwindow.c:543
+#: src/mainwindow.c:534
 #, fuzzy
 msgid "/_View/_Sort/by _unread"
 msgstr "/Περίληψη/Ταξινόμηση/Ταξινόμηση κατά αδιάβαστα"
 
-#: src/mainwindow.c:544
+#: src/mainwindow.c:535
 #, fuzzy
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/Περίληψη/Ταξινόμηση/Ταξινόμηση κατά προσάρτηση"
 
-#: src/mainwindow.c:546
+#: src/mainwindow.c:537
 #, fuzzy
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/Περίληψη/Ταξινόμηση/Ταξινόμηση κατά αδιάβαστα"
 
-#: src/mainwindow.c:547 src/mainwindow.c:550
+#: src/mainwindow.c:538 src/mainwindow.c:541
 #, fuzzy
 msgid "/_View/_Sort/---"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/---"
 
-#: src/mainwindow.c:548
+#: src/mainwindow.c:539
 #, fuzzy
 msgid "/_View/_Sort/Ascending"
 msgstr "/Απεικόνιση/Εμφάνιση του πηγαίου"
 
-#: src/mainwindow.c:549
+#: src/mainwindow.c:540
 #, fuzzy
 msgid "/_View/_Sort/Descending"
 msgstr "/Απεικόνιση/Εμφάνιση του πηγαίου"
 
-#: src/mainwindow.c:551
+#: src/mainwindow.c:542
 #, fuzzy
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/Περίληψη/Ταξινόμηση/_Attract by subject"
 
-#: src/mainwindow.c:553
+#: src/mainwindow.c:544
 #, fuzzy
 msgid "/_View/Th_read view"
 msgstr "/Απεικόνιση/Απεικόνιση μηνυνάτων"
 
-#: src/mainwindow.c:554
+#: src/mainwindow.c:545
 #, fuzzy
 msgid "/_View/E_xpand all threads"
 msgstr "/Απεικόνιση/Εμφάνιση της πλήρους κεφαλίδας"
 
-#: src/mainwindow.c:555
+#: src/mainwindow.c:546
 #, fuzzy
 msgid "/_View/Co_llapse all threads"
 msgstr "/Απεικόνιση/Εμφάνιση της πλήρους κεφαλίδας"
 
-#: src/mainwindow.c:556
+#: src/mainwindow.c:547
 #, fuzzy
 msgid "/_View/Set display _item..."
 msgstr "/Περίληψη/Ορισμός εμφανιζόμενων στοιχείων..."
 
-#: src/mainwindow.c:559
+#: src/mainwindow.c:550
 #, fuzzy
 msgid "/_View/_Go to"
 msgstr "/Απεικόνιση/Κωδικοσύνολο"
 
-#: src/mainwindow.c:560
+#: src/mainwindow.c:551
 #, fuzzy
 msgid "/_View/_Go to/_Prev message"
 msgstr "/Περίληψη/Πήγαινε στο/Προηγούμενο μήνυμα"
 
-#: src/mainwindow.c:561
+#: src/mainwindow.c:552
 #, fuzzy
 msgid "/_View/_Go to/_Next message"
 msgstr "/Περίληψη/Πήγαινε στο/Επόμενο μήνυμα"
 
-#: src/mainwindow.c:562 src/mainwindow.c:567 src/mainwindow.c:570
-#: src/mainwindow.c:575 src/mainwindow.c:580
+#: src/mainwindow.c:553 src/mainwindow.c:558 src/mainwindow.c:561
+#: src/mainwindow.c:566 src/mainwindow.c:571
 #, fuzzy
 msgid "/_View/_Go to/---"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/---"
 
-#: src/mainwindow.c:563
+#: src/mainwindow.c:554
 #, fuzzy
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/Περίληψη/Πήγαινε στο/Προηγούμενο αδιάβαστο μήνυμα"
 
-#: src/mainwindow.c:565
+#: src/mainwindow.c:556
 #, fuzzy
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/Περίληψη/Πήγαινε στο/Επόμενο αδιάβαστο μήνυμα"
 
-#: src/mainwindow.c:568
+#: src/mainwindow.c:559
 #, fuzzy
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/Περίληψη/Πήγαινε στο/Προηγούμενο μήνυμα"
 
-#: src/mainwindow.c:569
+#: src/mainwindow.c:560
 #, fuzzy
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/Περίληψη/Πήγαινε στο/Επόμενο μήνυμα"
 
-#: src/mainwindow.c:571
+#: src/mainwindow.c:562
 #, fuzzy
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/Περίληψη/Πήγαινε στο/Προηγούμενο σημειωμένο μήνυμα"
 
-#: src/mainwindow.c:573
+#: src/mainwindow.c:564
 #, fuzzy
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/Περίληψη/Πήγαινε στο/Επόμενο σημειωμένο μήνυμα"
 
-#: src/mainwindow.c:576
+#: src/mainwindow.c:567
 #, fuzzy
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/Περίληψη/Πήγαινε στο/Προηγούμενο μήνυμα με ετικέτα"
 
-#: src/mainwindow.c:578
+#: src/mainwindow.c:569
 #, fuzzy
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/Περίληψη/Πήγαινε στο/Επόμενο μήνυμα με ετικέτα"
 
-#: src/mainwindow.c:581
+#: src/mainwindow.c:572
 #, fuzzy
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/Περίληψη/Μετακίνηση σε άλλο κατάλογο..."
 
-#: src/mainwindow.c:590 src/messageview.c:158
+#: src/mainwindow.c:581 src/messageview.c:158
 #, fuzzy
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/Αυτόματη αναγνώριση"
 
-#: src/mainwindow.c:641 src/messageview.c:202
+#: src/mainwindow.c:632 src/messageview.c:202
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/Ιαπωνέζικο (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:643 src/messageview.c:204
+#: src/mainwindow.c:634 src/messageview.c:204
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/Ιαπωνέζικο (_EUC-JP)"
 
-#: src/mainwindow.c:645 src/messageview.c:206
+#: src/mainwindow.c:636 src/messageview.c:206
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/Ιαπωνέζικο (_Shift__JIS)"
 
-#: src/mainwindow.c:657 src/messageview.c:217
+#: src/mainwindow.c:648 src/messageview.c:217
 #, fuzzy
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/Κινεζικό (ISO-2022-_CN)"
 
-#: src/mainwindow.c:663 src/messageview.c:222
+#: src/mainwindow.c:654 src/messageview.c:222
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/Κορεάτικο (ISO-2022-KR)"
 
-#: src/mainwindow.c:676 src/summaryview.c:401
+#: src/mainwindow.c:667 src/summaryview.c:401
 #, fuzzy
 msgid "/_View/Open in new _window"
 msgstr "/Άνοιγμα σε νέο παράθυρο"
 
-#: src/mainwindow.c:677 src/messageview.c:234
+#: src/mainwindow.c:668 src/messageview.c:234
 #, fuzzy
 msgid "/_View/Mess_age source"
 msgstr "/Απεικόνιση/Εμφάνιση του πηγαίου"
 
-#: src/mainwindow.c:678 src/messageview.c:235
+#: src/mainwindow.c:669 src/messageview.c:235
 msgid "/_View/Show all _header"
 msgstr "/Απεικόνιση/Εμφάνιση της πλήρους κεφαλίδας"
 
-#: src/mainwindow.c:680
+#: src/mainwindow.c:671
 #, fuzzy
 msgid "/_View/_Update summary"
 msgstr "/Απεικόνιση/Κωδικοσύνολο"
 
-#: src/mainwindow.c:682 src/messageview.c:237
+#: src/mainwindow.c:673 src/messageview.c:237
 msgid "/_Message"
 msgstr "/Μήνυμα"
 
-#: src/mainwindow.c:683
+#: src/mainwindow.c:674
 #, fuzzy
 msgid "/_Message/Recei_ve"
 msgstr "/Μήνυμα/Επαν-επεξεργασία"
 
-#: src/mainwindow.c:684
+#: src/mainwindow.c:675
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/Μήνυμα/Λήψη από όλους τους λογαριασμούς"
 
-#: src/mainwindow.c:686
+#: src/mainwindow.c:677
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/Μήνυμα/Λήψη από όλους τους λογαριασμούς"
 
-#: src/mainwindow.c:688
+#: src/mainwindow.c:679
 #, fuzzy
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/Μήνυμα/Αποστολή αργότερα"
 
-#: src/mainwindow.c:690
+#: src/mainwindow.c:681
 #, fuzzy
 msgid "/_Message/Recei_ve/---"
 msgstr "/Μήνυμα/Επαν-επεξεργασία"
 
-#: src/mainwindow.c:691
+#: src/mainwindow.c:682
 #, fuzzy
 msgid "/_Message/_Send queued messages"
 msgstr "/Μήνυμα/Αποστολή μηνυμάτων από την ουρά"
 
-#: src/mainwindow.c:692 src/mainwindow.c:694 src/mainwindow.c:701
-#: src/mainwindow.c:706 src/mainwindow.c:710 src/mainwindow.c:719
-#: src/mainwindow.c:722 src/messageview.c:240 src/messageview.c:248
+#: src/mainwindow.c:683 src/mainwindow.c:685 src/mainwindow.c:692
+#: src/mainwindow.c:697 src/mainwindow.c:701 src/mainwindow.c:710
+#: src/mainwindow.c:713 src/messageview.c:240 src/messageview.c:248
 #: src/messageview.c:253
 msgid "/_Message/---"
 msgstr "/Μήνυμα/---"
 
-#: src/mainwindow.c:693 src/messageview.c:238
+#: src/mainwindow.c:684 src/messageview.c:238
 msgid "/_Message/Compose _new message"
 msgstr "/Μήνυμα/Σύνθεση νέου μηνύματος"
 
-#: src/mainwindow.c:695 src/messageview.c:241
+#: src/mainwindow.c:686 src/messageview.c:241
 msgid "/_Message/_Reply"
 msgstr "/Μήνυμα/Απάντηση"
 
-#: src/mainwindow.c:696
+#: src/mainwindow.c:687
 #, fuzzy
 msgid "/_Message/Repl_y to"
 msgstr "/Μήνυμα/Απάντηση σε"
 
-#: src/mainwindow.c:697 src/messageview.c:242
+#: src/mainwindow.c:688 src/messageview.c:242
 #, fuzzy
 msgid "/_Message/Repl_y to/_all"
 msgstr "/Μήνυμα/Απάντηση σε όλους"
 
-#: src/mainwindow.c:698 src/messageview.c:244
+#: src/mainwindow.c:689 src/messageview.c:244
 #, fuzzy
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/Μήνυμα/Απάντηση στον αποστολέα"
 
-#: src/mainwindow.c:699 src/messageview.c:246
+#: src/mainwindow.c:690 src/messageview.c:246
 #, fuzzy
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/Μήνυμα/Απάντηση σε όλους"
 
-#: src/mainwindow.c:702 src/messageview.c:249
+#: src/mainwindow.c:693 src/messageview.c:249
 msgid "/_Message/_Forward"
 msgstr "/Μήνυμα/Προώθηση"
 
-#: src/mainwindow.c:703 src/messageview.c:250
+#: src/mainwindow.c:694 src/messageview.c:250
 #, fuzzy
 msgid "/_Message/For_ward as attachment"
 msgstr "/Μήνυμα/Προώθηση σαν προσάρτηση"
 
-#: src/mainwindow.c:705 src/messageview.c:252
+#: src/mainwindow.c:696 src/messageview.c:252
 #, fuzzy
 msgid "/_Message/Redirec_t"
 msgstr "/Μήνυμα/Επαν-επεξεργασία"
 
-#: src/mainwindow.c:707
+#: src/mainwindow.c:698
 msgid "/_Message/M_ove..."
 msgstr "/Μήνυμα/Μετακίνηση..."
 
-#: src/mainwindow.c:708
+#: src/mainwindow.c:699
 msgid "/_Message/_Copy..."
 msgstr "/Μήνυμα/Αντιγραφή..."
 
-#: src/mainwindow.c:709
+#: src/mainwindow.c:700
 msgid "/_Message/_Delete"
 msgstr "/Μήνυμα/Διαγραφή"
 
-#: src/mainwindow.c:711
+#: src/mainwindow.c:702
 msgid "/_Message/_Mark"
 msgstr "/Μήνυμα/Σήμανση"
 
-#: src/mainwindow.c:712
+#: src/mainwindow.c:703
 msgid "/_Message/_Mark/_Mark"
 msgstr "/Mήνυμα/Σήμανση/Σήμανση"
 
-#: src/mainwindow.c:713
+#: src/mainwindow.c:704
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/Mήνυμα/Σήμανση/Αναίρεση σήμανσης"
 
-#: src/mainwindow.c:714
+#: src/mainwindow.c:705
 msgid "/_Message/_Mark/---"
 msgstr "/Mήνυμα/Σήμανση/---"
 
-#: src/mainwindow.c:715
+#: src/mainwindow.c:706
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/Mήνυμα/Σήμανση/Σήμανση ως αδιάβαστο"
 
-#: src/mainwindow.c:716
+#: src/mainwindow.c:707
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/Mήνυμα/Σήμανση/Σήμανση ως διαβασμένο"
 
-#: src/mainwindow.c:718
+#: src/mainwindow.c:709
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/Mήνυμα/Σήμανση/Σήμανση όλων ως διαβασμένα"
 
-#: src/mainwindow.c:720
+#: src/mainwindow.c:711
 #, fuzzy
 msgid "/_Message/Set as _junk mail"
 msgstr "/Μήνυμα/Λήψη νέων μηνυμάτων"
 
-#: src/mainwindow.c:721
+#: src/mainwindow.c:712
 #, fuzzy
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/Μήνυμα/Λήψη νέων μηνυμάτων"
 
-#: src/mainwindow.c:723 src/messageview.c:254
+#: src/mainwindow.c:714 src/messageview.c:254
 msgid "/_Message/Re-_edit"
 msgstr "/Μήνυμα/Επαν-επεξεργασία"
 
-#: src/mainwindow.c:727
+#: src/mainwindow.c:718
 #, fuzzy
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/Προσθήκη αποστολέα στον κατάλογο διευθύνσεων"
 
-#: src/mainwindow.c:730
+#: src/mainwindow.c:721
 #, fuzzy
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/Περίληψη/Φιλτράρισμα μηνυμάτων"
 
-#: src/mainwindow.c:732
+#: src/mainwindow.c:723
 #, fuzzy
 msgid "/_Tools/Filter _selected messages"
 msgstr "/Περίληψη/Φιλτράρισμα μηνυμάτων"
 
-#: src/mainwindow.c:734 src/messageview.c:261
+#: src/mainwindow.c:725 src/messageview.c:261
 #, fuzzy
 msgid "/_Tools/_Create filter rule"
 msgstr "/Περίληψη/Φιλτράρισμα μηνυμάτων"
 
-#: src/mainwindow.c:735 src/messageview.c:263
+#: src/mainwindow.c:726 src/messageview.c:263
 #, fuzzy
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/Περίληψη/Φιλτράρισμα μηνυμάτων"
 
-#: src/mainwindow.c:737 src/messageview.c:265
+#: src/mainwindow.c:728 src/messageview.c:265
 #, fuzzy
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/Περίληψη/Φιλτράρισμα μηνυμάτων"
 
-#: src/mainwindow.c:739 src/messageview.c:267
+#: src/mainwindow.c:730 src/messageview.c:267
 #, fuzzy
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/Περίληψη/Φιλτράρισμα μηνυμάτων"
 
-#: src/mainwindow.c:741 src/messageview.c:269
+#: src/mainwindow.c:732 src/messageview.c:269
 #, fuzzy
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/Περίληψη/Φιλτράρισμα μηνυμάτων"
 
-#: src/mainwindow.c:744
+#: src/mainwindow.c:735
 #, fuzzy
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/Περίληψη/Φιλτράρισμα μηνυμάτων"
 
-#: src/mainwindow.c:746
+#: src/mainwindow.c:737
 #, fuzzy
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/Περίληψη/Φιλτράρισμα μηνυμάτων"
 
-#: src/mainwindow.c:751
+#: src/mainwindow.c:742
 #, fuzzy
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/Περίληψη/Διαγραφή διπλών μηνυμάτων"
 
-#: src/mainwindow.c:754
+#: src/mainwindow.c:745
 #, fuzzy
 msgid "/_Tools/E_xecute"
 msgstr "/Εκτέλεση"
 
-#: src/mainwindow.c:756
+#: src/mainwindow.c:747
 #, fuzzy
 msgid "/_Tools/_Log window"
 msgstr "/Εργαλεία/Παράθυρο καταγραφής"
 
-#: src/mainwindow.c:758
+#: src/mainwindow.c:749
 msgid "/_Configuration"
 msgstr "/Ρυθμίσεις"
 
-#: src/mainwindow.c:759
+#: src/mainwindow.c:750
 msgid "/_Configuration/_Common preferences..."
 msgstr "/Ρυθμίσεις/Κοινές επιλογές..."
 
-#: src/mainwindow.c:761
+#: src/mainwindow.c:752
 msgid "/_Configuration/_Filter setting..."
 msgstr "/Ρυθμίσεις/Επιλογές φίλτρων..."
 
-#: src/mainwindow.c:763
+#: src/mainwindow.c:754
 #, fuzzy
 msgid "/_Configuration/_Template..."
 msgstr "/Ρυθμίσεις/Επιλογές φίλτρων..."
 
-#: src/mainwindow.c:764
+#: src/mainwindow.c:755
 #, fuzzy
 msgid "/_Configuration/_Actions..."
 msgstr "/Ρυθμίσεις/Επεξεργασία λογαριασμών..."
 
-#: src/mainwindow.c:765
+#: src/mainwindow.c:756
 msgid "/_Configuration/---"
 msgstr "/Ρυθμίσεις/---"
 
-#: src/mainwindow.c:766
+#: src/mainwindow.c:757
 #, fuzzy
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/Ρυθμίσεις/Επιλογές ανά λογαριασμό..."
 
-#: src/mainwindow.c:768
+#: src/mainwindow.c:759
 msgid "/_Configuration/Create _new account..."
 msgstr "/Ρυθμίσεις/Δημιουργία νέου λογαριασμού..."
 
-#: src/mainwindow.c:770
+#: src/mainwindow.c:761
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/Ρυθμίσεις/Επεξεργασία λογαριασμών..."
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:763
 msgid "/_Configuration/C_hange current account"
 msgstr "/Ρυθμίσεις/Αλλαγή τρέχοντος λογαριασμού"
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:767
 msgid "/_Help/_Manual"
 msgstr "/Βοήθεια/_Manual"
 
-#: src/mainwindow.c:777
+#: src/mainwindow.c:768
 msgid "/_Help/_Manual/_English"
 msgstr "/Βοήθεια/_Manual/Αγγλικό"
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:769
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/Βοήθεια/_Manual/Ιαπωνέζικο"
 
-#: src/mainwindow.c:779
+#: src/mainwindow.c:770
 #, fuzzy
 msgid "/_Help/_FAQ"
 msgstr "/Βοήθεια/Σχετικά"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:771
 #, fuzzy
 msgid "/_Help/_FAQ/_English"
 msgstr "/Βοήθεια/_Manual/Αγγλικό"
 
-#: src/mainwindow.c:781
+#: src/mainwindow.c:772
 #, fuzzy
 msgid "/_Help/_FAQ/_German"
 msgstr "/Βοήθεια/_Manual/Αγγλικό"
 
-#: src/mainwindow.c:782
+#: src/mainwindow.c:773
 #, fuzzy
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/Βοήθεια/_Manual/Αγγλικό"
 
-#: src/mainwindow.c:783
+#: src/mainwindow.c:774
 msgid "/_Help/_FAQ/_French"
 msgstr ""
 
-#: src/mainwindow.c:784
+#: src/mainwindow.c:775
 #, fuzzy
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/Βοήθεια/_Manual/Αγγλικό"
 
-#: src/mainwindow.c:785
+#: src/mainwindow.c:776
 msgid "/_Help/---"
 msgstr "/Βοήθεια/---"
 
-#: src/mainwindow.c:825
+#: src/mainwindow.c:816
 msgid "Creating main window...\n"
 msgstr "Δημιουργώ το κυρίως παράθυρο...\n"
 
-#: src/mainwindow.c:987
+#: src/mainwindow.c:973
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "MainWindow: η κατανομή χρωμάτων %d απέτυχε\n"
 
-#: src/mainwindow.c:1071 src/summaryview.c:2020 src/summaryview.c:2105
+#: src/mainwindow.c:1057 src/summaryview.c:2020 src/summaryview.c:2105
 #: src/summaryview.c:3342 src/summaryview.c:3415 src/summaryview.c:3728
 msgid "done.\n"
 msgstr "έγινε.\n"
 
-#: src/mainwindow.c:1196 src/mainwindow.c:1237 src/mainwindow.c:1265
+#: src/mainwindow.c:1182 src/mainwindow.c:1223 src/mainwindow.c:1251
 msgid "Untitled"
 msgstr "Χωρίς τίτλο"
 
-#: src/mainwindow.c:1266
+#: src/mainwindow.c:1252
 msgid "none"
 msgstr "κανένα"
 
-#: src/mainwindow.c:1316
+#: src/mainwindow.c:1302
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr ""
 
-#: src/mainwindow.c:1536
+#: src/mainwindow.c:1522
 msgid "Offline"
 msgstr ""
 
-#: src/mainwindow.c:1537
+#: src/mainwindow.c:1523
 msgid "You are offline. Go online?"
 msgstr ""
 
-#: src/mainwindow.c:1551
+#: src/mainwindow.c:1537
 #, fuzzy
 msgid "Empty all trash"
 msgstr "Άδειασμα διαγραμμένων"
 
-#: src/mainwindow.c:1552
+#: src/mainwindow.c:1538
 #, fuzzy
 msgid "Empty messages in all trash?"
 msgstr "Να αδειάσω όλα τα διαγραμμένα μηνύματα"
 
-#: src/mainwindow.c:1580
+#: src/mainwindow.c:1566
 msgid "Add mailbox"
 msgstr "Προσθήκη mailbox"
 
-#: src/mainwindow.c:1581
+#: src/mainwindow.c:1567
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3332,16 +3332,16 @@ msgstr ""
 "Αν οριστεί το υπάρχον mailbox, θα\n"
 "σαρωθεί αυτόματα."
 
-#: src/mainwindow.c:1587
+#: src/mainwindow.c:1573
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Το mailbox `%s' υπάρχει ήδη"
 
-#: src/mainwindow.c:1592 src/setup.c:57
+#: src/mainwindow.c:1578 src/setup.c:57
 msgid "Mailbox"
 msgstr "Mailbox"
 
-#: src/mainwindow.c:1598 src/setup.c:63
+#: src/mainwindow.c:1584 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3350,160 +3350,160 @@ msgstr ""
 "Η δημιουργία του mailbox απέτυχε.\n"
 "Ίσως κάποια αρχεία να υπάρχουν ήδη, ή δεν έχετε δικαίωμα να γράψετε εκεί. "
 
-#: src/mainwindow.c:1989
+#: src/mainwindow.c:1975
 msgid "Sylpheed - Folder View"
 msgstr ""
 
-#: src/mainwindow.c:2009 src/messageview.c:368
+#: src/mainwindow.c:1995 src/messageview.c:368
 msgid "Sylpheed - Message View"
 msgstr ""
 
-#: src/mainwindow.c:2156 src/summaryview.c:370
+#: src/mainwindow.c:2142 src/summaryview.c:370
 msgid "/_Reply"
 msgstr "/Απάντηση"
 
-#: src/mainwindow.c:2157
+#: src/mainwindow.c:2143
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "Απάντηση σε όλους"
 
-#: src/mainwindow.c:2158
+#: src/mainwindow.c:2144
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/Απάντηση στον αποστολέα"
 
-#: src/mainwindow.c:2159
+#: src/mainwindow.c:2145
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/Απάντηση σε όλους"
 
-#: src/mainwindow.c:2164 src/summaryview.c:377
+#: src/mainwindow.c:2150 src/summaryview.c:377
 msgid "/_Forward"
 msgstr "/Προώθηση"
 
-#: src/mainwindow.c:2165 src/summaryview.c:378
+#: src/mainwindow.c:2151 src/summaryview.c:378
 #, fuzzy
 msgid "/For_ward as attachment"
 msgstr "/Προώθηση ως προσάρτηση"
 
-#: src/mainwindow.c:2166 src/summaryview.c:379
+#: src/mainwindow.c:2152 src/summaryview.c:379
 #, fuzzy
 msgid "/Redirec_t"
 msgstr "/Επαν-επεξεργασία"
 
-#: src/mainwindow.c:2205
+#: src/mainwindow.c:2188
 msgid "Get"
 msgstr "Λήψη"
 
-#: src/mainwindow.c:2206
+#: src/mainwindow.c:2189
 msgid "Incorporate new mail"
 msgstr "Λήψη νέου mail"
 
-#: src/mainwindow.c:2213
+#: src/mainwindow.c:2196
 msgid "Get all"
 msgstr ""
 "Λήψη\n"
 "όλων"
 
-#: src/mainwindow.c:2214
+#: src/mainwindow.c:2197
 msgid "Incorporate new mail of all accounts"
 msgstr "Λήψη νέου mail από όλους τους λογαριασμούς"
 
-#: src/mainwindow.c:2225
+#: src/mainwindow.c:2208
 msgid "Send queued message(s)"
 msgstr "Αποστολή όλων των μηνυμάτων από την ουρά"
 
-#: src/mainwindow.c:2235 src/prefs_account.c:721 src/prefs_common.c:949
+#: src/mainwindow.c:2218 src/prefs_account.c:721 src/prefs_common.c:949
 #: src/prefs_folder_item.c:137
 msgid "Compose"
 msgstr "Σύνθεση"
 
-#: src/mainwindow.c:2236
+#: src/mainwindow.c:2219
 msgid "Compose new message"
 msgstr "Σύνθεση νέου μηνύματος"
 
-#: src/mainwindow.c:2244 src/prefs_common.c:1448
+#: src/mainwindow.c:2227 src/prefs_common.c:1448
 msgid "Reply"
 msgstr "Απάντηση"
 
-#: src/mainwindow.c:2245 src/mainwindow.c:2258
+#: src/mainwindow.c:2228 src/mainwindow.c:2241
 msgid "Reply to the message"
 msgstr "Απάντηση στο μήνυμα"
 
-#: src/mainwindow.c:2263
+#: src/mainwindow.c:2245
 msgid "Reply all"
 msgstr ""
 "Απάντηση\n"
 "όλων"
 
-#: src/mainwindow.c:2264
+#: src/mainwindow.c:2246
 msgid "Reply to all"
 msgstr "Απάντηση σε όλους"
 
-#: src/mainwindow.c:2272 src/prefs_filter_edit.c:741
+#: src/mainwindow.c:2254 src/prefs_filter_edit.c:741
 msgid "Forward"
 msgstr "Προώθηση"
 
-#: src/mainwindow.c:2273 src/mainwindow.c:2286
+#: src/mainwindow.c:2255 src/mainwindow.c:2268
 msgid "Forward the message"
 msgstr "Προώθηση μηνύματος"
 
-#: src/mainwindow.c:2293
+#: src/mainwindow.c:2275
 msgid "Delete the message"
 msgstr "Διαγραφή μηνύματος"
 
-#: src/mainwindow.c:2301 src/prefs_common.c:1988
+#: src/mainwindow.c:2283 src/prefs_common.c:1988
 msgid "Junk"
 msgstr ""
 
-#: src/mainwindow.c:2302
+#: src/mainwindow.c:2284
 #, fuzzy
 msgid "Set as junk mail"
 msgstr " Θέσε ως σύνηθη λογαριασμό "
 
-#: src/mainwindow.c:2311
+#: src/mainwindow.c:2293
 msgid "Execute"
 msgstr "Εκτέλεση"
 
-#: src/mainwindow.c:2312
+#: src/mainwindow.c:2294
 msgid "Execute marked process"
 msgstr "Εκτέλεση σημειωμένης εργασίας"
 
-#: src/mainwindow.c:2322
+#: src/mainwindow.c:2304
 msgid "Next unread message"
 msgstr "Επόμενο αδιάβαστο μήνυμα"
 
-#: src/mainwindow.c:2334
+#: src/mainwindow.c:2316
 msgid "Prefs"
 msgstr "Επιλογές"
 
-#: src/mainwindow.c:2335
+#: src/mainwindow.c:2317
 #, fuzzy
 msgid "Common preferences"
 msgstr "Κοινές Επιλογές"
 
-#: src/mainwindow.c:2343 src/prefs_folder_item.c:261
+#: src/mainwindow.c:2325 src/prefs_folder_item.c:261
 #: src/prefs_folder_item.c:272 src/progressdialog.c:128
 msgid "Account"
 msgstr "Λογ/σμός"
 
-#: src/mainwindow.c:2344
+#: src/mainwindow.c:2326
 msgid "Account setting"
 msgstr "Ρυθμίσεις λογαριασμού"
 
-#: src/mainwindow.c:2527
+#: src/mainwindow.c:2498
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 
-#: src/mainwindow.c:2538
+#: src/mainwindow.c:2509
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 
-#: src/mainwindow.c:2731
+#: src/mainwindow.c:2702
 msgid "Exit"
 msgstr "Έξοδος"
 
-#: src/mainwindow.c:2731
+#: src/mainwindow.c:2702
 msgid "Exit this program?"
 msgstr "Έξοδος από αυτό το πρόγραμμα;"
 
@@ -5763,11 +5763,11 @@ msgstr "Δημιουργώ διάλογο προόδου...\n"
 msgid "Status"
 msgstr "Κατάσταση"
 
-#: src/recv.c:113
+#: src/recv.c:112
 msgid "error occurred while retrieving data.\n"
 msgstr "προέκυψε σφάλμα κατά την λήψη δεδομένων.\n"
 
-#: src/recv.c:155 src/recv.c:197 src/recv.c:213
+#: src/recv.c:154 src/recv.c:196 src/recv.c:211
 msgid "Can't write to file.\n"
 msgstr "Δεν μπορώ να γράψω σε αρχείο.\n"
 
@@ -6523,7 +6523,7 @@ msgstr ""
 msgid "%.2fGB"
 msgstr ""
 
-#: src/utils.c:2372 src/utils.c:2496
+#: src/utils.c:2386 src/utils.c:2510
 #, c-format
 msgid "writing to %s failed.\n"
 msgstr "απέτυχε το γράψιμο στο %s.\n"
diff --git a/po/es.po b/po/es.po
index 80e0fa8c..e932cc69 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-08-09 18:08+0900\n"
+"POT-Creation-Date: 2005-08-22 17:22+0900\n"
 "PO-Revision-Date: 2005-07-08 21:08+0100\n"
 "Last-Translator: Ricardo Mones <mones@aic.uniovi.es>\n"
 "Language-Team: Ricardo Mones <mones@aic.uniovi.es>\n"
@@ -97,7 +97,7 @@ msgstr ""
 "en la columna `G' para habilitar la descarga mediante `Traer todo'."
 
 #: src/account.c:691 src/addressadd.c:192 src/addressbook.c:490
-#: src/compose.c:4081 src/editaddress.c:200 src/editaddress.c:942
+#: src/compose.c:4079 src/editaddress.c:200 src/editaddress.c:942
 #: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:265
 #: src/editjpilot.c:271 src/editldap.c:307 src/editvcard.c:184
 #: src/mimeview.c:201 src/prefs_filter.c:258 src/prefs_folder_item.c:170
@@ -233,7 +233,7 @@ msgstr "Parámetro de usuario de la acción"
 msgid "Add Address to Book"
 msgstr "Añadir dirección a la agenda"
 
-#: src/addressadd.c:202 src/compose.c:4528 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4521 src/editaddress.c:201
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "Dirección"
@@ -247,7 +247,7 @@ msgstr "Notas"
 msgid "Select Address Book Folder"
 msgstr "Seleccionar carpeta de la agenda"
 
-#: src/addressbook.c:336 src/compose.c:495 src/mainwindow.c:470
+#: src/addressbook.c:336 src/compose.c:493 src/mainwindow.c:461
 #: src/messageview.c:137
 msgid "/_File"
 msgstr "/_Fichero"
@@ -268,10 +268,10 @@ msgstr "/_Fichero/Nuevo _JPilot"
 msgid "/_File/New _Server"
 msgstr "/_Fichero/Nuevo _servidor"
 
-#: src/addressbook.c:345 src/addressbook.c:348 src/compose.c:500
-#: src/compose.c:505 src/compose.c:509 src/mainwindow.c:488
-#: src/mainwindow.c:491 src/mainwindow.c:493 src/mainwindow.c:496
-#: src/mainwindow.c:498 src/messageview.c:140
+#: src/addressbook.c:345 src/addressbook.c:348 src/compose.c:498
+#: src/compose.c:503 src/compose.c:507 src/mainwindow.c:479
+#: src/mainwindow.c:482 src/mainwindow.c:484 src/mainwindow.c:487
+#: src/mainwindow.c:489 src/messageview.c:140
 msgid "/_File/---"
 msgstr "/_Fichero/---"
 
@@ -287,7 +287,7 @@ msgstr "/_Fichero/_Borrar"
 msgid "/_File/_Save"
 msgstr "/_Fichero/_Guardar"
 
-#: src/addressbook.c:350 src/compose.c:510 src/messageview.c:141
+#: src/addressbook.c:350 src/compose.c:508 src/messageview.c:141
 msgid "/_File/_Close"
 msgstr "/_Fichero/_Cerrar"
 
@@ -319,7 +319,7 @@ msgstr "/_Dirección/_Editar"
 msgid "/_Address/_Delete"
 msgstr "/_Dirección/_Borrar"
 
-#: src/addressbook.c:358 src/compose.c:619 src/mainwindow.c:725
+#: src/addressbook.c:358 src/compose.c:617 src/mainwindow.c:716
 #: src/messageview.c:256
 msgid "/_Tools"
 msgstr "/_Herramientas"
@@ -328,12 +328,12 @@ msgstr "/_Herramientas"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Herramientas/Importar fichero _LDIF"
 
-#: src/addressbook.c:360 src/compose.c:632 src/mainwindow.c:775
+#: src/addressbook.c:360 src/compose.c:630 src/mainwindow.c:766
 #: src/messageview.c:274
 msgid "/_Help"
 msgstr "/_Ayuda"
 
-#: src/addressbook.c:361 src/compose.c:633 src/mainwindow.c:786
+#: src/addressbook.c:361 src/compose.c:631 src/mainwindow.c:777
 #: src/messageview.c:275
 msgid "/_Help/_About"
 msgstr "/_Ayuda/_Acerca de"
@@ -350,7 +350,7 @@ msgstr "/Nuevo _grupo"
 msgid "/New _Folder"
 msgstr "/Nueva _carpeta"
 
-#: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:489
+#: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:487
 #: src/folderview.c:235 src/folderview.c:237 src/folderview.c:241
 #: src/folderview.c:252 src/folderview.c:254 src/folderview.c:256
 #: src/folderview.c:260 src/folderview.c:270 src/folderview.c:272
@@ -360,8 +360,8 @@ msgstr "/Nueva _carpeta"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:512
-#: src/mainwindow.c:502 src/messageview.c:143
+#: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:510
+#: src/mainwindow.c:493 src/messageview.c:143
 msgid "/_Edit"
 msgstr "/_Editar"
 
@@ -373,7 +373,7 @@ msgstr "/_Borrar"
 msgid "E-Mail address"
 msgstr "Dirección e-mail"
 
-#: src/addressbook.c:495 src/compose.c:4529 src/prefs_common.c:2402
+#: src/addressbook.c:495 src/compose.c:4522 src/prefs_common.c:2402
 msgid "Address book"
 msgstr "Agenda de direcciones"
 
@@ -382,8 +382,8 @@ msgid "Name:"
 msgstr "Nombre:"
 
 #. Buttons
-#: src/addressbook.c:627 src/addressbook.c:1673 src/editaddress.c:884
-#: src/editaddress.c:1017 src/mainwindow.c:2292 src/prefs_actions.c:266
+#: src/addressbook.c:627 src/addressbook.c:1674 src/editaddress.c:884
+#: src/editaddress.c:1017 src/mainwindow.c:2274 src/prefs_actions.c:266
 #: src/prefs_display_header.c:278 src/prefs_display_header.c:333
 #: src/prefs_template.c:231
 msgid "Delete"
@@ -422,7 +422,7 @@ msgstr "Borrar dirección(es)"
 msgid "Really delete the address(es)?"
 msgstr "¿Borrar realmente la(s) dirección(es)?"
 
-#: src/addressbook.c:1664
+#: src/addressbook.c:1665
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -431,36 +431,36 @@ msgstr ""
 "¿Quiere borrar la carpeta Y todas las direcciones en «%s»? \n"
 "Si sólo borra la carpeta las direcciones se moverán a la carpeta padre."
 
-#: src/addressbook.c:1667 src/folderview.c:2139
+#: src/addressbook.c:1668 src/folderview.c:2139
 msgid "Delete folder"
 msgstr "Borrar carpeta"
 
-#: src/addressbook.c:1667
+#: src/addressbook.c:1668
 msgid "_Folder only"
 msgstr "Sólo la _carpeta"
 
-#: src/addressbook.c:1667
+#: src/addressbook.c:1668
 msgid "Folder and _addresses"
 msgstr "La carpeta y las _direcciones"
 
-#: src/addressbook.c:1672
+#: src/addressbook.c:1673
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "¿Borrar realmente «%s»?"
 
-#: src/addressbook.c:2352 src/addressbook.c:2485
+#: src/addressbook.c:2353 src/addressbook.c:2486
 msgid "New user, could not save index file."
 msgstr "Nuevo usuario, no se pudo guardar el fichero índice."
 
-#: src/addressbook.c:2356 src/addressbook.c:2489
+#: src/addressbook.c:2357 src/addressbook.c:2490
 msgid "New user, could not save address book files."
 msgstr "Nuevo usuario, no se pudo guardar los ficheros de direcciones"
 
-#: src/addressbook.c:2366 src/addressbook.c:2499
+#: src/addressbook.c:2367 src/addressbook.c:2500
 msgid "Old address book converted successfully."
 msgstr "Antigua agenda de direcciones convertida con éxito"
 
-#: src/addressbook.c:2371
+#: src/addressbook.c:2372
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -468,7 +468,7 @@ msgstr ""
 "Antigua agenda de direcciones convertida,\n"
 "no se pudo guardar el nuevo fichero índice"
 
-#: src/addressbook.c:2384
+#: src/addressbook.c:2385
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -476,7 +476,7 @@ msgstr ""
 "No se pudo convertir la antigua agenda,\n"
 "pero se crearon nuevos ficheros vacíos."
 
-#: src/addressbook.c:2390
+#: src/addressbook.c:2391
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -484,7 +484,7 @@ msgstr ""
 "No se pudo convertir la antigua agenda,\n"
 "no se pudieron crear los ficheros para la nueva."
 
-#: src/addressbook.c:2395
+#: src/addressbook.c:2396
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -492,91 +492,91 @@ msgstr ""
 "No se pudo convertir la antigua agenda\n"
 "y no se pudieron crear ficheros para una nueva."
 
-#: src/addressbook.c:2402
+#: src/addressbook.c:2403
 msgid "Addressbook conversion error"
 msgstr "Error en la conversión de la agenda"
 
-#: src/addressbook.c:2406
+#: src/addressbook.c:2407
 msgid "Addressbook conversion"
 msgstr "Conversión de la agenda"
 
-#: src/addressbook.c:2441
+#: src/addressbook.c:2442
 msgid "Addressbook Error"
 msgstr "Error en la agenda"
 
-#: src/addressbook.c:2442 src/addressbook.c:2542
+#: src/addressbook.c:2443 src/addressbook.c:2543
 msgid "Could not read address index"
 msgstr "No se pudo leer el índice de direcciones"
 
-#: src/addressbook.c:2504
+#: src/addressbook.c:2505
 msgid "Old address book converted, could not save new address index file"
 msgstr ""
 "Antigua agenda de direcciones convertida, no se pudo guardar el nuevo "
 "fichero índice"
 
-#: src/addressbook.c:2518
+#: src/addressbook.c:2519
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr ""
 "No se pudo convertir la antigua agenda, pero se crearon nuevos ficheros "
 "vacíos."
 
-#: src/addressbook.c:2524
+#: src/addressbook.c:2525
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr ""
 "No se pudo convertir la antigua agenda, no se pudieron crear los ficheros "
 "para la nueva."
 
-#: src/addressbook.c:2530
+#: src/addressbook.c:2531
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr ""
 "No se pudo convertir la antigua agenda y no se pudieron crear ficheros para "
 "una nueva."
 
-#: src/addressbook.c:2548
+#: src/addressbook.c:2549
 msgid "Addressbook Conversion Error"
 msgstr "Error en la conversión de la agenda"
 
-#: src/addressbook.c:2554
+#: src/addressbook.c:2555
 msgid "Addressbook Conversion"
 msgstr "Conversión de la agenda"
 
-#: src/addressbook.c:3055 src/prefs_common.c:963
+#: src/addressbook.c:3056 src/prefs_common.c:963
 msgid "Interface"
 msgstr "Interfaz"
 
-#: src/addressbook.c:3071 src/importldif.c:514
+#: src/addressbook.c:3072 src/importldif.c:514
 msgid "Address Book"
 msgstr "Agenda de direcciones"
 
-#: src/addressbook.c:3087
+#: src/addressbook.c:3088
 msgid "Person"
 msgstr "Persona"
 
-#: src/addressbook.c:3103
+#: src/addressbook.c:3104
 msgid "EMail Address"
 msgstr "Dirección e-mail"
 
-#: src/addressbook.c:3119
+#: src/addressbook.c:3120
 msgid "Group"
 msgstr "Grupo"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3135 src/folderview.c:346 src/prefs_account.c:1866
+#: src/addressbook.c:3136 src/folderview.c:346 src/prefs_account.c:1866
 msgid "Folder"
 msgstr "Carpeta"
 
-#: src/addressbook.c:3151
+#: src/addressbook.c:3152
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3167 src/addressbook.c:3183
+#: src/addressbook.c:3168 src/addressbook.c:3184
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3199
+#: src/addressbook.c:3200
 msgid "LDAP Server"
 msgstr "Servidor LDAP"
 
@@ -588,7 +588,7 @@ msgstr "Dirección común"
 msgid "Personal address"
 msgstr "Dirección personal"
 
-#: src/alertpanel.c:138 src/compose.c:5214 src/main.c:515
+#: src/alertpanel.c:138 src/compose.c:5208 src/main.c:515
 msgid "Notice"
 msgstr "Notificación"
 
@@ -643,347 +643,347 @@ msgstr "Marrón"
 msgid "None"
 msgstr "Ninguno"
 
-#: src/compose.c:487
+#: src/compose.c:485
 msgid "/_Add..."
 msgstr "/_Añadir"
 
-#: src/compose.c:488
+#: src/compose.c:486
 msgid "/_Remove"
 msgstr "/_Quitar"
 
-#: src/compose.c:490 src/folderview.c:243 src/folderview.c:262
+#: src/compose.c:488 src/folderview.c:243 src/folderview.c:262
 #: src/folderview.c:277
 msgid "/_Properties..."
 msgstr "/_Propiedades..."
 
-#: src/compose.c:496
+#: src/compose.c:494
 msgid "/_File/_Send"
 msgstr "/_Fichero/_Enviar"
 
-#: src/compose.c:498
+#: src/compose.c:496
 msgid "/_File/Send _later"
 msgstr "/_Mensaje/Enviar _más tarde"
 
-#: src/compose.c:501
+#: src/compose.c:499
 msgid "/_File/Save to _draft folder"
 msgstr "/_Mensaje/_Guardar en borradores"
 
-#: src/compose.c:503
+#: src/compose.c:501
 msgid "/_File/Save and _keep editing"
 msgstr "/_Mensaje/Guardar y _seguir editando"
 
-#: src/compose.c:506
+#: src/compose.c:504
 msgid "/_File/_Attach file"
 msgstr "/_Fichero/_Adjuntar fichero"
 
-#: src/compose.c:507
+#: src/compose.c:505
 msgid "/_File/_Insert file"
 msgstr "/_Fichero/_Insertar fichero"
 
-#: src/compose.c:508
+#: src/compose.c:506
 msgid "/_File/Insert si_gnature"
 msgstr "/_Fichero/Insertar _firma"
 
-#: src/compose.c:513
+#: src/compose.c:511
 msgid "/_Edit/_Undo"
 msgstr "/_Editar/_Deshacer"
 
-#: src/compose.c:514
+#: src/compose.c:512
 msgid "/_Edit/_Redo"
 msgstr "/_Editar/_Rehacer"
 
-#: src/compose.c:515 src/compose.c:522 src/mainwindow.c:506
+#: src/compose.c:513 src/compose.c:520 src/mainwindow.c:497
 #: src/messageview.c:146
 msgid "/_Edit/---"
 msgstr "/_Editar/---"
 
-#: src/compose.c:516
+#: src/compose.c:514
 msgid "/_Edit/Cu_t"
 msgstr "/_Editar/Cor_tar"
 
-#: src/compose.c:517 src/mainwindow.c:503 src/messageview.c:144
+#: src/compose.c:515 src/mainwindow.c:494 src/messageview.c:144
 msgid "/_Edit/_Copy"
 msgstr "/_Editar/_Copiar"
 
-#: src/compose.c:518
+#: src/compose.c:516
 msgid "/_Edit/_Paste"
 msgstr "/_Editar/_Pegar"
 
-#: src/compose.c:519
+#: src/compose.c:517
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Editar/Pegar como c_itación"
 
-#: src/compose.c:521 src/mainwindow.c:504 src/messageview.c:145
+#: src/compose.c:519 src/mainwindow.c:495 src/messageview.c:145
 msgid "/_Edit/Select _all"
 msgstr "/_Editar/_Seleccionar todo"
 
-#: src/compose.c:523
+#: src/compose.c:521
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/_Editar/_Recortar párrafo actual"
 
-#: src/compose.c:525
+#: src/compose.c:523
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/_Editar/_Cortar todas las líneas largas"
 
-#: src/compose.c:527
+#: src/compose.c:525
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Editar/Aut_o-recorte"
 
-#: src/compose.c:528 src/mainwindow.c:511 src/messageview.c:150
+#: src/compose.c:526 src/mainwindow.c:502 src/messageview.c:150
 #: src/summaryview.c:400
 msgid "/_View"
 msgstr "/_Ver"
 
-#: src/compose.c:529
+#: src/compose.c:527
 msgid "/_View/_To"
 msgstr "/_Ver/_Para"
 
-#: src/compose.c:530
+#: src/compose.c:528
 msgid "/_View/_Cc"
 msgstr "/_Ver/_Copia (Cc)"
 
-#: src/compose.c:531
+#: src/compose.c:529
 msgid "/_View/_Bcc"
 msgstr "/_Ver/C_opia oculta (Bcc)"
 
-#: src/compose.c:532
+#: src/compose.c:530
 msgid "/_View/_Reply to"
 msgstr "/_Ver/_Responder a"
 
-#: src/compose.c:533 src/compose.c:535 src/compose.c:537 src/compose.c:539
-#: src/mainwindow.c:529 src/mainwindow.c:532 src/mainwindow.c:558
-#: src/mainwindow.c:582 src/mainwindow.c:675 src/mainwindow.c:679
+#: src/compose.c:531 src/compose.c:533 src/compose.c:535 src/compose.c:537
+#: src/mainwindow.c:520 src/mainwindow.c:523 src/mainwindow.c:549
+#: src/mainwindow.c:573 src/mainwindow.c:666 src/mainwindow.c:670
 #: src/messageview.c:233
 msgid "/_View/---"
 msgstr "/_Ver/---"
 
-#: src/compose.c:534
+#: src/compose.c:532
 msgid "/_View/_Followup to"
 msgstr "/_Ver/_Añadir a"
 
-#: src/compose.c:536
+#: src/compose.c:534
 msgid "/_View/R_uler"
 msgstr "/_Ver/_Regleta"
 
-#: src/compose.c:538
+#: src/compose.c:536
 msgid "/_View/_Attachment"
 msgstr "/_Ver/_Adjuntos"
 
-#: src/compose.c:545 src/mainwindow.c:589 src/messageview.c:157
+#: src/compose.c:543 src/mainwindow.c:580 src/messageview.c:157
 msgid "/_View/Character _encoding"
 msgstr "/_Ver/Codificación de caract_eres"
 
-#: src/compose.c:546
+#: src/compose.c:544
 msgid "/_View/Character _encoding/_Automatic"
 msgstr "/_Ver/Codificación de caract_eres/_Automática"
 
-#: src/compose.c:548 src/compose.c:554 src/compose.c:560 src/compose.c:564
-#: src/compose.c:570 src/compose.c:574 src/compose.c:580 src/compose.c:584
-#: src/compose.c:594 src/compose.c:598 src/compose.c:608 src/compose.c:612
-#: src/mainwindow.c:585 src/mainwindow.c:592 src/messageview.c:153
+#: src/compose.c:546 src/compose.c:552 src/compose.c:558 src/compose.c:562
+#: src/compose.c:568 src/compose.c:572 src/compose.c:578 src/compose.c:582
+#: src/compose.c:592 src/compose.c:596 src/compose.c:606 src/compose.c:610
+#: src/mainwindow.c:576 src/mainwindow.c:583 src/messageview.c:153
 msgid "/_View/Character _encoding/---"
 msgstr "/_Ver/Codificación de caract_eres/---"
 
-#: src/compose.c:550 src/mainwindow.c:593 src/messageview.c:161
+#: src/compose.c:548 src/mainwindow.c:584 src/messageview.c:161
 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:552 src/mainwindow.c:595 src/messageview.c:164
+#: src/compose.c:550 src/mainwindow.c:586 src/messageview.c:164
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Ver/Codificación de caract_eres/Unicode (_UTF-8)"
 
-#: src/compose.c:556 src/mainwindow.c:599 src/messageview.c:167
+#: src/compose.c:554 src/mainwindow.c:590 src/messageview.c:167
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Ver/Codificación de caract_eres/Europeo occidental (ISO-8859-_1)"
 
-#: src/compose.c:558 src/mainwindow.c:601 src/messageview.c:169
+#: src/compose.c:556 src/mainwindow.c:592 src/messageview.c:169
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Ver/Codificación de caract_eres/Europeo occidental (ISO-8859-_15)"
 
-#: src/compose.c:562 src/mainwindow.c:605 src/messageview.c:172
+#: src/compose.c:560 src/mainwindow.c:596 src/messageview.c:172
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Ver/Codificación de caract_eres/Centroeuropeo (ISO-8859-_2)"
 
-#: src/compose.c:566 src/mainwindow.c:609 src/messageview.c:175
+#: src/compose.c:564 src/mainwindow.c:600 src/messageview.c:175
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Ver/Codificación de caract_eres/Báltico (ISO-8859-13)"
 
-#: src/compose.c:568 src/mainwindow.c:611 src/messageview.c:177
+#: src/compose.c:566 src/mainwindow.c:602 src/messageview.c:177
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Ver/Codificación de caract_eres/Báltico (ISO-8859-_4)"
 
-#: src/compose.c:572 src/mainwindow.c:615 src/messageview.c:180
+#: src/compose.c:570 src/mainwindow.c:606 src/messageview.c:180
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Ver/Codificación de caract_eres/Griego (ISO-8859-_7)"
 
-#: src/compose.c:576 src/mainwindow.c:619 src/messageview.c:183
+#: src/compose.c:574 src/mainwindow.c:610 src/messageview.c:183
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Ver/Codificación de caract_eres/Hebreo (ISO-8859-_8)"
 
-#: src/compose.c:578 src/mainwindow.c:621 src/messageview.c:185
+#: src/compose.c:576 src/mainwindow.c:612 src/messageview.c:185
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Ver/Codificación de caract_eres/Hebreo (Windows-1255)"
 
-#: src/compose.c:582 src/mainwindow.c:625 src/messageview.c:188
+#: src/compose.c:580 src/mainwindow.c:616 src/messageview.c:188
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Ver/Codificación de caract_eres/Turco (ISO-8859-_9)"
 
-#: src/compose.c:586 src/mainwindow.c:629 src/messageview.c:191
+#: src/compose.c:584 src/mainwindow.c:620 src/messageview.c:191
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Ver/Codificación de caract_eres/Cirílico (ISO-8859-_5)"
 
-#: src/compose.c:588 src/mainwindow.c:631 src/messageview.c:193
+#: src/compose.c:586 src/mainwindow.c:622 src/messageview.c:193
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Ver/Codificación de caract_eres/Cirílico (KOI8-_R)"
 
-#: src/compose.c:590 src/mainwindow.c:633 src/messageview.c:195
+#: src/compose.c:588 src/mainwindow.c:624 src/messageview.c:195
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Ver/Codificación de caract_eres/Cirílico (KOI8-U)"
 
-#: src/compose.c:592 src/mainwindow.c:635 src/messageview.c:197
+#: src/compose.c:590 src/mainwindow.c:626 src/messageview.c:197
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Ver/Codificación de caract_eres/Cirílico (Windows-1251)"
 
-#: src/compose.c:596 src/mainwindow.c:639 src/messageview.c:200
+#: src/compose.c:594 src/mainwindow.c:630 src/messageview.c:200
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Ver/Codificación de caract_eres/Japonés (ISO-2022-_JP)"
 
-#: src/compose.c:600 src/mainwindow.c:649 src/messageview.c:209
+#: src/compose.c:598 src/mainwindow.c:640 src/messageview.c:209
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Ver/Codificación de caract_eres/Chino simplificado (_GB2312)"
 
-#: src/compose.c:602 src/mainwindow.c:651 src/messageview.c:211
+#: src/compose.c:600 src/mainwindow.c:642 src/messageview.c:211
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Ver/Codificación de caract_eres/Chino simplificado (_GB2312)"
 
-#: src/compose.c:604 src/mainwindow.c:653 src/messageview.c:213
+#: src/compose.c:602 src/mainwindow.c:644 src/messageview.c:213
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Ver/Codificación de caract_eres/Chino tradicional (_Big5)"
 
-#: src/compose.c:606 src/mainwindow.c:655 src/messageview.c:215
+#: src/compose.c:604 src/mainwindow.c:646 src/messageview.c:215
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Ver/Codificación de caract_eres/Chino tradicional (EUC-_TW)"
 
-#: src/compose.c:610 src/mainwindow.c:661 src/messageview.c:220
+#: src/compose.c:608 src/mainwindow.c:652 src/messageview.c:220
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Ver/Codificación de caract_eres/Coreano (EUC-_KR)"
 
-#: src/compose.c:614 src/mainwindow.c:667 src/messageview.c:225
+#: src/compose.c:612 src/mainwindow.c:658 src/messageview.c:225
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Ver/Codificación de caract_eres/Tailandés (TIS-620)"
 
-#: src/compose.c:616 src/mainwindow.c:669 src/messageview.c:227
+#: src/compose.c:614 src/mainwindow.c:660 src/messageview.c:227
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Ver/Codificación de caract_eres/Tailandés (Windows-874)"
 
-#: src/compose.c:620 src/mainwindow.c:726 src/messageview.c:257
+#: src/compose.c:618 src/mainwindow.c:717 src/messageview.c:257
 msgid "/_Tools/_Address book"
 msgstr "/_Herramientas/_Agenda de direcciones"
 
-#: src/compose.c:621
+#: src/compose.c:619
 msgid "/_Tools/_Template"
 msgstr "/_Herramientas/Plan_tillas"
 
-#: src/compose.c:622 src/mainwindow.c:749 src/messageview.c:272
+#: src/compose.c:620 src/mainwindow.c:740 src/messageview.c:272
 msgid "/_Tools/Actio_ns"
 msgstr "/_Herramientas/Accio_nes"
 
-#: src/compose.c:623 src/compose.c:627 src/mainwindow.c:729
-#: src/mainwindow.c:743 src/mainwindow.c:748 src/mainwindow.c:750
-#: src/mainwindow.c:753 src/mainwindow.c:755 src/messageview.c:260
+#: src/compose.c:621 src/compose.c:625 src/mainwindow.c:720
+#: src/mainwindow.c:734 src/mainwindow.c:739 src/mainwindow.c:741
+#: src/mainwindow.c:744 src/mainwindow.c:746 src/messageview.c:260
 #: src/messageview.c:271
 msgid "/_Tools/---"
 msgstr "/_Herramientas/---"
 
-#: src/compose.c:624
+#: src/compose.c:622
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/_Editar/Editar con el editor e_xterno"
 
-#: src/compose.c:628
+#: src/compose.c:626
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Herramientas/Fir_mar con PGP"
 
-#: src/compose.c:629
+#: src/compose.c:627
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/_Mensaje/_Encriptar con PGP"
 
-#: src/compose.c:855
+#: src/compose.c:853
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: el fichero no existe\n"
 
-#: src/compose.c:954 src/compose.c:1024 src/procmsg.c:1353
+#: src/compose.c:952 src/compose.c:1022 src/procmsg.c:1353
 msgid "Can't get text part\n"
 msgstr "No se puede obtener la parte de texto\n"
 
-#: src/compose.c:1420
+#: src/compose.c:1418
 msgid "Quote mark format error."
 msgstr "Error en el formato de la marca de cita."
 
-#: src/compose.c:1432
+#: src/compose.c:1430
 msgid "Message reply/forward format error."
 msgstr "Error en el formato de responder/redirijir."
 
-#: src/compose.c:1801
+#: src/compose.c:1799
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "El fichero %s no existe\n"
 
-#: src/compose.c:1805
+#: src/compose.c:1803
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "No se puede obtener el tamaño de %s\n"
 
-#: src/compose.c:1809
+#: src/compose.c:1807
 #, c-format
 msgid "File %s is empty."
 msgstr "El fichero %s esta vacío."
 
-#: src/compose.c:1813
+#: src/compose.c:1811
 #, c-format
 msgid "Can't read %s."
 msgstr "No se puede leer %s."
 
-#: src/compose.c:1848
+#: src/compose.c:1846
 #, c-format
 msgid "Message: %s"
 msgstr "Mensaje: %s"
 
-#: src/compose.c:1920 src/mimeview.c:560
+#: src/compose.c:1918 src/mimeview.c:560
 msgid "Can't get the part of multipart message."
 msgstr "No se puede obtener la parte del mensaje multipartes."
 
-#: src/compose.c:2362
+#: src/compose.c:2360
 msgid " [Edited]"
 msgstr " [Editado]"
 
-#: src/compose.c:2364
+#: src/compose.c:2362
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Componer mensaje%s"
 
-#: src/compose.c:2367
+#: src/compose.c:2365
 #, c-format
 msgid "Compose message%s"
 msgstr "Componer mensaje%s"
 
-#: src/compose.c:2478
+#: src/compose.c:2476
 msgid "Recipient is not specified."
 msgstr "No se especificó el destinatario."
 
-#: src/compose.c:2486
+#: src/compose.c:2484
 msgid "Empty subject"
 msgstr "Asunto vacío"
 
-#: src/compose.c:2487
+#: src/compose.c:2485
 msgid "Subject is empty. Send it anyway?"
 msgstr "El asunto esta vacío. ¿Enviar de todas formas?"
 
-#: src/compose.c:2538
+#: src/compose.c:2536
 msgid "can't get recipient list."
 msgstr "no se puede obtener la lista de destinatarios."
 
-#: src/compose.c:2558
+#: src/compose.c:2556
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -991,28 +991,28 @@ msgstr ""
 "No especificó ninguna cuenta para enviar.\n"
 "Seleccione alguna cuenta antes de enviar."
 
-#: src/compose.c:2572 src/send_message.c:297
+#: src/compose.c:2570 src/send_message.c:297
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Hubo un error enviando el mensaje a %s ."
 
-#: src/compose.c:2595
+#: src/compose.c:2593
 msgid "Can't save the message to outbox."
 msgstr "No se puede guardar el mensaje en Salida."
 
-#: src/compose.c:2645
+#: src/compose.c:2643
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr ""
 "No se encontró ninguna clave asociada al ID-clave seleccionado actualmente «%"
 "s»."
 
-#: src/compose.c:2709 src/compose.c:2965 src/compose.c:3028 src/compose.c:3148
-#: src/utils.c:2365
+#: src/compose.c:2707 src/compose.c:2963 src/compose.c:3026 src/compose.c:3146
+#: src/utils.c:2379
 msgid "can't change file mode\n"
 msgstr "no se pueden cambiar los permisos de archivo\n"
 
-#: src/compose.c:2741
+#: src/compose.c:2739
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1023,11 +1023,11 @@ msgstr ""
 "\n"
 "¿Enviarlo como %s de todas formas?"
 
-#: src/compose.c:2747
+#: src/compose.c:2745
 msgid "Code conversion error"
 msgstr "Error en la conversión de códigos"
 
-#: src/compose.c:2816
+#: src/compose.c:2814
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1040,153 +1040,153 @@ msgstr ""
 "\n"
 "¿Enviarlo de todas formas?"
 
-#: src/compose.c:2820
+#: src/compose.c:2818
 msgid "Line length limit"
 msgstr "Límite de longitud de línea"
 
-#: src/compose.c:3108
+#: src/compose.c:3106
 msgid "can't remove the old message\n"
 msgstr "no se puede eliminar el mensaje antiguo\n"
 
-#: src/compose.c:3126
+#: src/compose.c:3124
 msgid "queueing message...\n"
 msgstr "poniendo en la cola...\n"
 
-#: src/compose.c:3208
+#: src/compose.c:3206
 msgid "can't find queue folder\n"
 msgstr "no puedo encontrar la carpeta de cola\n"
 
-#: src/compose.c:3215
+#: src/compose.c:3213
 msgid "can't queue the message\n"
 msgstr "El mensaje no se puede poner en la cola\n"
 
-#: src/compose.c:3792
+#: src/compose.c:3790
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "Message-ID generado: %s\n"
 
-#: src/compose.c:3901
+#: src/compose.c:3899
 msgid "Creating compose window...\n"
 msgstr "Creando ventana de composición...\n"
 
-#: src/compose.c:3949 src/headerview.c:54 src/summary_search.c:214
+#: src/compose.c:3947 src/headerview.c:54 src/summary_search.c:214
 msgid "From:"
 msgstr "Desde:"
 
-#: src/compose.c:4021
+#: src/compose.c:4019
 msgid "PGP Sign"
 msgstr "Firmar con PGP"
 
-#: src/compose.c:4024
+#: src/compose.c:4022
 msgid "PGP Encrypt"
 msgstr "Cifrar con PGP"
 
-#: src/compose.c:4062 src/compose.c:5001
+#: src/compose.c:4060 src/compose.c:4995
 msgid "MIME type"
 msgstr "Tipo MIME"
 
 #. S_COL_DATE
-#: src/compose.c:4071 src/mimeview.c:192 src/prefs_filter_edit.c:585
+#: src/compose.c:4069 src/mimeview.c:192 src/prefs_filter_edit.c:585
 #: src/prefs_summary_column.c:75 src/select-keys.c:317 src/summaryview.c:4217
 msgid "Size"
 msgstr "Tamaño"
 
-#: src/compose.c:4449 src/mainwindow.c:2224 src/prefs_account.c:719
+#: src/compose.c:4442 src/mainwindow.c:2207 src/prefs_account.c:719
 #: src/prefs_common.c:947
 msgid "Send"
 msgstr "Enviar"
 
-#: src/compose.c:4450
+#: src/compose.c:4443
 msgid "Send message"
 msgstr "Enviar mensaje"
 
-#: src/compose.c:4458
+#: src/compose.c:4451
 msgid "Send later"
 msgstr "Enviar después"
 
-#: src/compose.c:4459
+#: src/compose.c:4452
 msgid "Put into queue folder and send later"
 msgstr "Poner en la cola y enviar después"
 
-#: src/compose.c:4467
+#: src/compose.c:4460
 msgid "Draft"
 msgstr "Borrador"
 
-#: src/compose.c:4468
+#: src/compose.c:4461
 msgid "Save to draft folder"
 msgstr "Guardar como borrador"
 
-#: src/compose.c:4478
+#: src/compose.c:4471
 msgid "Insert"
 msgstr "Insertar"
 
-#: src/compose.c:4479
+#: src/compose.c:4472
 msgid "Insert file"
 msgstr "Insertar fichero"
 
-#: src/compose.c:4487
+#: src/compose.c:4480
 msgid "Attach"
 msgstr "Adjuntar"
 
-#: src/compose.c:4488
+#: src/compose.c:4481
 msgid "Attach file"
 msgstr "Adjuntar fichero"
 
 #. signature
-#: src/compose.c:4498 src/prefs_account.c:1391 src/prefs_common.c:1356
+#: src/compose.c:4491 src/prefs_account.c:1391 src/prefs_common.c:1356
 msgid "Signature"
 msgstr "Firma"
 
-#: src/compose.c:4499
+#: src/compose.c:4492
 msgid "Insert signature"
 msgstr "Insertar firma"
 
-#: src/compose.c:4508 src/prefs_common.c:1378 src/prefs_common.c:2382
+#: src/compose.c:4501 src/prefs_common.c:1378 src/prefs_common.c:2382
 msgid "Editor"
 msgstr "Editor"
 
-#: src/compose.c:4509
+#: src/compose.c:4502
 msgid "Edit with external editor"
 msgstr "Editar con un editor externo"
 
-#: src/compose.c:4517
+#: src/compose.c:4510
 msgid "Linewrap"
 msgstr "Recortar"
 
-#: src/compose.c:4518
+#: src/compose.c:4511
 msgid "Wrap all long lines"
 msgstr "Cortar todas las líneas largas"
 
-#: src/compose.c:4897
+#: src/compose.c:4891
 msgid "Invalid MIME type."
 msgstr "Tipo MIME inválido."
 
-#: src/compose.c:4915
+#: src/compose.c:4909
 msgid "File doesn't exist or is empty."
 msgstr "El fichero no existe o está vacío."
 
-#: src/compose.c:4983
+#: src/compose.c:4977
 msgid "Properties"
 msgstr "Propiedades"
 
-#: src/compose.c:5003
+#: src/compose.c:4997
 msgid "Encoding"
 msgstr "Codificación"
 
-#: src/compose.c:5026 src/prefs_folder_item.c:183
+#: src/compose.c:5020 src/prefs_folder_item.c:183
 msgid "Path"
 msgstr "Ruta"
 
-#: src/compose.c:5027
+#: src/compose.c:5021
 msgid "File name"
 msgstr "Nombre de fichero"
 
-#: src/compose.c:5185
+#: src/compose.c:5179
 #, 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:5211
+#: src/compose.c:5205
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1197,71 +1197,71 @@ msgstr ""
 "¿Desea terminar el proceso?\n"
 "Id. de grupo de proceso: %d"
 
-#: src/compose.c:5228
+#: src/compose.c:5222
 #, c-format
 msgid "Terminated process group id: %d"
 msgstr "Terminado grupo de proceso id.: %d"
 
-#: src/compose.c:5229
+#: src/compose.c:5223
 #, c-format
 msgid "Temporary file: %s"
 msgstr "Fichero temporal: %s"
 
-#: src/compose.c:5253
+#: src/compose.c:5247
 msgid "Compose: input from monitoring process\n"
 msgstr "Componer: entrada desde proceso monitor\n"
 
 #. failed
-#: src/compose.c:5284
+#: src/compose.c:5278
 msgid "Couldn't exec external editor\n"
 msgstr "No se pudo ejecutar el editor externo\n"
 
-#: src/compose.c:5288
+#: src/compose.c:5282
 msgid "Couldn't write to file\n"
 msgstr "No se pudo escribir en el fichero\n"
 
-#: src/compose.c:5290
+#: src/compose.c:5284
 msgid "Pipe read failed\n"
 msgstr "Fallo leyendo tubería\n"
 
-#: src/compose.c:5596 src/compose.c:5604 src/compose.c:5610
+#: src/compose.c:5590 src/compose.c:5598 src/compose.c:5604
 msgid "Can't queue the message."
 msgstr "El mensaje no se puede poner en la cola."
 
-#: src/compose.c:5701
+#: src/compose.c:5695
 msgid "Select files"
 msgstr "Seleccionar ficheros"
 
-#: src/compose.c:5723
+#: src/compose.c:5717
 msgid "Select file"
 msgstr "Seleccionar fichero"
 
-#: src/compose.c:5760
+#: src/compose.c:5754
 msgid "Save message"
 msgstr "Guardar mensaje"
 
-#: src/compose.c:5761
+#: src/compose.c:5755
 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:5763
+#: src/compose.c:5757
 msgid "Close _without saving"
 msgstr "Cerrar _sin guardar"
 
-#: src/compose.c:5805
+#: src/compose.c:5799
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "¿Quiere aplicar la plantilla «%s»?"
 
-#: src/compose.c:5807
+#: src/compose.c:5801
 msgid "Apply template"
 msgstr "Aplicar plantilla"
 
-#: src/compose.c:5808
+#: src/compose.c:5802
 msgid "_Replace"
 msgstr "_Reemplazar"
 
-#: src/compose.c:5808
+#: src/compose.c:5802
 msgid "_Insert"
 msgstr "_Insertar"
 
@@ -1705,12 +1705,12 @@ msgstr "Estableciendo información de carpeta...\n"
 msgid "Setting folder info..."
 msgstr "Estableciendo información de carpeta..."
 
-#: src/folderview.c:805 src/mainwindow.c:3301 src/setup.c:81
+#: src/folderview.c:805 src/mainwindow.c:3272 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Revisando carpeta %s%c%s ..."
 
-#: src/folderview.c:809 src/mainwindow.c:3306 src/setup.c:86
+#: src/folderview.c:809 src/mainwindow.c:3277 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Revisando carpeta %s ..."
@@ -2032,44 +2032,44 @@ msgstr "La autentificación IMAP falló.\n"
 msgid "IMAP4 login failed.\n"
 msgstr "Autentificación IMAP4 fallida.\n"
 
-#: src/imap.c:3522
+#: src/imap.c:3528
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "no puedo añadir %s a %s\n"
 
-#: src/imap.c:3529
+#: src/imap.c:3535
 msgid "(sending file...)"
 msgstr "(enviando fichero...)"
 
-#: src/imap.c:3557
+#: src/imap.c:3563
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "no se puede añadir el mensaje a %s\n"
 
-#: src/imap.c:3589
+#: src/imap.c:3595
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "no puedo copiar %s a %s\n"
 
-#: src/imap.c:3613
+#: src/imap.c:3619
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "error en el mandato imap: STORE %s %s\n"
 
-#: src/imap.c:3627
+#: src/imap.c:3633
 msgid "error while imap command: EXPUNGE\n"
 msgstr "error en el mandato imap: EXPUNGE\n"
 
-#: src/imap.c:3640
+#: src/imap.c:3646
 msgid "error while imap command: CLOSE\n"
 msgstr "error en el mandato imap: CLOSE\n"
 
-#: src/imap.c:3873
+#: src/imap.c:3879
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv no puede convertir UTF-7 a %s\n"
 
-#: src/imap.c:3903
+#: src/imap.c:3909
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv no puede convertir %s a UTF-7\n"
@@ -2171,7 +2171,7 @@ msgstr "Importar fichero LDIF a la agenda"
 msgid "Prev"
 msgstr "Anterior"
 
-#: src/importldif.c:768 src/mainwindow.c:2321
+#: src/importldif.c:768 src/mainwindow.c:2303
 msgid "Next"
 msgstr "Siguiente"
 
@@ -2524,615 +2524,615 @@ msgstr ""
 "Se encontró una versión anterior de la confguración.\n"
 "¿Desea migrarla?"
 
-#: src/mainwindow.c:471
+#: src/mainwindow.c:462
 msgid "/_File/_Folder"
 msgstr "/_Fichero/_Carpeta"
 
-#: src/mainwindow.c:472
+#: src/mainwindow.c:463
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/_Fichero/_Carpeta_/Crear _nueva carpeta..."
 
-#: src/mainwindow.c:474
+#: src/mainwindow.c:465
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/_Fichero/_Carpeta_/_Renombrar carpeta..."
 
-#: src/mainwindow.c:475
+#: src/mainwindow.c:466
 msgid "/_File/_Folder/_Move folder..."
 msgstr "/_Fichero/_Carpeta_/_Mover carpeta..."
 
-#: src/mainwindow.c:476
+#: src/mainwindow.c:467
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/_Fichero/_Carpeta_/_Borrar carpeta"
 
-#: src/mainwindow.c:477
+#: src/mainwindow.c:468
 msgid "/_File/_Mailbox"
 msgstr "/_Fichero/_Buzón"
 
-#: src/mainwindow.c:478
+#: src/mainwindow.c:469
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/_Fichero/_Buzón/_Añadir buzón..."
 
-#: src/mainwindow.c:479
+#: src/mainwindow.c:470
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/_Fichero/_Buzón/_Eliminar buzón"
 
-#: src/mainwindow.c:480 src/mainwindow.c:485
+#: src/mainwindow.c:471 src/mainwindow.c:476
 msgid "/_File/_Mailbox/---"
 msgstr "/_Fichero/_Buzón/---"
 
-#: src/mainwindow.c:481
+#: src/mainwindow.c:472
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "/_Fichero/_Buzón/_Comprobar si hay mensajes nuevos"
 
-#: src/mainwindow.c:483
+#: src/mainwindow.c:474
 msgid "/_File/_Mailbox/Check for new messages in _all mailboxes"
 msgstr "/_Fichero/_Buzón/_Comprobar mensajes nuevos en todas las carpetas"
 
-#: src/mainwindow.c:486
+#: src/mainwindow.c:477
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "/_Fichero/_Buzón/R_econstruir árbol de carpetas"
 
-#: src/mainwindow.c:489
+#: src/mainwindow.c:480
 msgid "/_File/_Import mbox file..."
 msgstr "/_Fichero/I_mportar fichero mbox..."
 
-#: src/mainwindow.c:490
+#: src/mainwindow.c:481
 msgid "/_File/_Export to mbox file..."
 msgstr "/_Fichero/_Exportar a un fichero mbox..."
 
-#: src/mainwindow.c:492
+#: src/mainwindow.c:483
 msgid "/_File/Empty all _trash"
 msgstr "/_Fichero/_Vaciar todas las papeleras"
 
-#: src/mainwindow.c:494 src/messageview.c:138
+#: src/mainwindow.c:485 src/messageview.c:138
 msgid "/_File/_Save as..."
 msgstr "/_Fichero/_Guardar como..."
 
-#: src/mainwindow.c:495 src/messageview.c:139
+#: src/mainwindow.c:486 src/messageview.c:139
 msgid "/_File/_Print..."
 msgstr "/_Fichero/_Imprimir..."
 
-#: src/mainwindow.c:497
+#: src/mainwindow.c:488
 msgid "/_File/_Work offline"
 msgstr "/_Fichero/_Trabajar sin conexión"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:500
+#: src/mainwindow.c:491
 msgid "/_File/E_xit"
 msgstr "/_Fichero/Sali_r"
 
-#: src/mainwindow.c:505
+#: src/mainwindow.c:496
 msgid "/_Edit/Select _thread"
 msgstr "/_Editar/Seleccionar _hilo"
 
-#: src/mainwindow.c:507 src/messageview.c:147
+#: src/mainwindow.c:498 src/messageview.c:147
 msgid "/_Edit/_Find in current message..."
 msgstr "/_Edición/_Buscar en el mensaje actual..."
 
-#: src/mainwindow.c:509
+#: src/mainwindow.c:500
 msgid "/_Edit/_Search messages..."
 msgstr "/_Edición/_Buscar en los mensajes..."
 
-#: src/mainwindow.c:512
+#: src/mainwindow.c:503
 msgid "/_View/Show or hi_de"
 msgstr "/_Ver/Mostrar u o_cultar"
 
-#: src/mainwindow.c:513
+#: src/mainwindow.c:504
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/_Ver/Mostrar u o_cultar/_Árbol de carpetas"
 
-#: src/mainwindow.c:515
+#: src/mainwindow.c:506
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/_Ver/Mostrar u o_cultar/Vista de _mensajes"
 
-#: src/mainwindow.c:517
+#: src/mainwindow.c:508
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/_Ver/Mostrar u o_cultar/_Herramientas"
 
-#: src/mainwindow.c:519
+#: src/mainwindow.c:510
 msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/_Ver/Mostrar u o_cultar/_Herramientas/Iconos _y texto"
 
-#: src/mainwindow.c:521
+#: src/mainwindow.c:512
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/_Ver/Mostrar u o_cultar/_Herramientas/_Iconos"
 
-#: src/mainwindow.c:523
+#: src/mainwindow.c:514
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/_Ver/Mostrar u o_cultar/_Herramientas/_Texto"
 
-#: src/mainwindow.c:525
+#: src/mainwindow.c:516
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/_Ver/Mostrar u o_cultar/_Herramientas/_Ocultar"
 
-#: src/mainwindow.c:527
+#: src/mainwindow.c:518
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/_Ver/Mostrar u o_cultar/_Barra de estado"
 
-#: src/mainwindow.c:530
+#: src/mainwindow.c:521
 msgid "/_View/Separate f_older tree"
 msgstr "/_Ver/Separar árb_ol de carpetas"
 
-#: src/mainwindow.c:531
+#: src/mainwindow.c:522
 msgid "/_View/Separate _message view"
 msgstr "/_Ver/Separar vista de m_ensajes"
 
-#: src/mainwindow.c:533
+#: src/mainwindow.c:524
 msgid "/_View/_Sort"
 msgstr "/_Ver/_Ordenar"
 
-#: src/mainwindow.c:534
+#: src/mainwindow.c:525
 msgid "/_View/_Sort/by _number"
 msgstr "/_Ver/_Ordenar/Por _número"
 
-#: src/mainwindow.c:535
+#: src/mainwindow.c:526
 msgid "/_View/_Sort/by s_ize"
 msgstr "/_Ver/_Ordenar/Por _tamaño"
 
-#: src/mainwindow.c:536
+#: src/mainwindow.c:527
 msgid "/_View/_Sort/by _date"
 msgstr "/_Ver/_Ordenar/Por _fecha"
 
-#: src/mainwindow.c:537
+#: src/mainwindow.c:528
 msgid "/_View/_Sort/by _from"
 msgstr "/_Ver/_Ordenar/Por _remitente"
 
-#: src/mainwindow.c:538
+#: src/mainwindow.c:529
 msgid "/_View/_Sort/by _recipient"
 msgstr "/_Ver/_Ordenar/Por _destinatario"
 
-#: src/mainwindow.c:539
+#: src/mainwindow.c:530
 msgid "/_View/_Sort/by _subject"
 msgstr "/_Ver/_Ordenar/Por a_sunto"
 
-#: src/mainwindow.c:540
+#: src/mainwindow.c:531
 msgid "/_View/_Sort/by _color label"
 msgstr "/_Ver/_Ordenar/Por _color de la etiqueta"
 
-#: src/mainwindow.c:542
+#: src/mainwindow.c:533
 msgid "/_View/_Sort/by _mark"
 msgstr "/_Ver/_Ordenar/Por _marca"
 
-#: src/mainwindow.c:543
+#: src/mainwindow.c:534
 msgid "/_View/_Sort/by _unread"
 msgstr "/_Ver/_Ordenar/Por _no leído"
 
-#: src/mainwindow.c:544
+#: src/mainwindow.c:535
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/_Ver/_Ordenar/Por adj_unto"
 
-#: src/mainwindow.c:546
+#: src/mainwindow.c:537
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/_Ver/_Ordenar/N_o ordenar"
 
-#: src/mainwindow.c:547 src/mainwindow.c:550
+#: src/mainwindow.c:538 src/mainwindow.c:541
 msgid "/_View/_Sort/---"
 msgstr "/_Ver/_Ordenar/---"
 
-#: src/mainwindow.c:548
+#: src/mainwindow.c:539
 msgid "/_View/_Sort/Ascending"
 msgstr "/_Ver/_Ordenar/Ascendente"
 
-#: src/mainwindow.c:549
+#: src/mainwindow.c:540
 msgid "/_View/_Sort/Descending"
 msgstr "/_Ver/_Ordenar/Descendente"
 
-#: src/mainwindow.c:551
+#: src/mainwindow.c:542
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/_Ver/_Ordenar/Atraer _por asunto"
 
-#: src/mainwindow.c:553
+#: src/mainwindow.c:544
 msgid "/_View/Th_read view"
 msgstr "/_Ver/_Vista jerárquica"
 
-#: src/mainwindow.c:554
+#: src/mainwindow.c:545
 msgid "/_View/E_xpand all threads"
 msgstr "/_Ver/E_xpandir todos los hilos"
 
-#: src/mainwindow.c:555
+#: src/mainwindow.c:546
 msgid "/_View/Co_llapse all threads"
 msgstr "/_Ver/Co_lapsar todos los hilos"
 
-#: src/mainwindow.c:556
+#: src/mainwindow.c:547
 msgid "/_View/Set display _item..."
 msgstr "/_Ver/Elementos visibles..."
 
-#: src/mainwindow.c:559
+#: src/mainwindow.c:550
 msgid "/_View/_Go to"
 msgstr "/_Ver/_Ir a"
 
-#: src/mainwindow.c:560
+#: src/mainwindow.c:551
 msgid "/_View/_Go to/_Prev message"
 msgstr "/_Ver/_Ir a/Mensaje a_nterior"
 
-#: src/mainwindow.c:561
+#: src/mainwindow.c:552
 msgid "/_View/_Go to/_Next message"
 msgstr "/_Ver/_Ir a/Mensaje s_iguiente"
 
-#: src/mainwindow.c:562 src/mainwindow.c:567 src/mainwindow.c:570
-#: src/mainwindow.c:575 src/mainwindow.c:580
+#: src/mainwindow.c:553 src/mainwindow.c:558 src/mainwindow.c:561
+#: src/mainwindow.c:566 src/mainwindow.c:571
 msgid "/_View/_Go to/---"
 msgstr "/_Ver/_Ir a/---"
 
-#: src/mainwindow.c:563
+#: src/mainwindow.c:554
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/_Ver/_Ir a/_Anterior sin leer"
 
-#: src/mainwindow.c:565
+#: src/mainwindow.c:556
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/_Ver/_Ir a/_Siguiente sin leer"
 
-#: src/mainwindow.c:568
+#: src/mainwindow.c:559
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/_Ver/_Ir a/Mensaje nue_vo anterior"
 
-#: src/mainwindow.c:569
+#: src/mainwindow.c:560
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/_Ver/_Ir a/Mensaje n_uevo s_iguiente"
 
-#: src/mainwindow.c:571
+#: src/mainwindow.c:562
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/_Ver/_Ir a/Mensaje marcado a_nterior"
 
-#: src/mainwindow.c:573
+#: src/mainwindow.c:564
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/_Ver/_Ir a/Siguiente mensaje marcado"
 
-#: src/mainwindow.c:576
+#: src/mainwindow.c:567
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/_Ver/_Ir a/Mensaje etiquetado anterior"
 
-#: src/mainwindow.c:578
+#: src/mainwindow.c:569
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/_Ver/_Ir a/Siguiente mensaje etiquetado"
 
-#: src/mainwindow.c:581
+#: src/mainwindow.c:572
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Ver/_Ir a/_Ir a otra carpeta..."
 
-#: src/mainwindow.c:590 src/messageview.c:158
+#: src/mainwindow.c:581 src/messageview.c:158
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Ver/Codificación de caract_eres/_Autodetectar"
 
-#: src/mainwindow.c:641 src/messageview.c:202
+#: src/mainwindow.c:632 src/messageview.c:202
 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:643 src/messageview.c:204
+#: src/mainwindow.c:634 src/messageview.c:204
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Ver/Codificación de caract_eres/Japonés (_EUC-JP)"
 
-#: src/mainwindow.c:645 src/messageview.c:206
+#: src/mainwindow.c:636 src/messageview.c:206
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Ver/Codificación de caract_eres/Japonés (_Shift__JIS)"
 
-#: src/mainwindow.c:657 src/messageview.c:217
+#: src/mainwindow.c:648 src/messageview.c:217
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Ver/Codificación de caract_eres/Chino (ISO-2022-_CN)"
 
-#: src/mainwindow.c:663 src/messageview.c:222
+#: src/mainwindow.c:654 src/messageview.c:222
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Ver/Codificación de caract_eres/Coreano (ISO-2022-KR)"
 
-#: src/mainwindow.c:676 src/summaryview.c:401
+#: src/mainwindow.c:667 src/summaryview.c:401
 msgid "/_View/Open in new _window"
 msgstr "/_Ver/Abrir en una ventana _nueva"
 
-#: src/mainwindow.c:677 src/messageview.c:234
+#: src/mainwindow.c:668 src/messageview.c:234
 msgid "/_View/Mess_age source"
 msgstr "/_Ver/Fuente del mens_aje"
 
-#: src/mainwindow.c:678 src/messageview.c:235
+#: src/mainwindow.c:669 src/messageview.c:235
 msgid "/_View/Show all _header"
 msgstr "/_Ver/Mostrar todas las cabeceras"
 
-#: src/mainwindow.c:680
+#: src/mainwindow.c:671
 msgid "/_View/_Update summary"
 msgstr "/_Ver/Actualizar res_umen"
 
-#: src/mainwindow.c:682 src/messageview.c:237
+#: src/mainwindow.c:673 src/messageview.c:237
 msgid "/_Message"
 msgstr "/_Mensaje"
 
-#: src/mainwindow.c:683
+#: src/mainwindow.c:674
 msgid "/_Message/Recei_ve"
 msgstr "/_Mensaje/Reci_bir"
 
-#: src/mainwindow.c:684
+#: src/mainwindow.c:675
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/_Mensaje/Reci_bir/De la cuenta a_ctual"
 
-#: src/mainwindow.c:686
+#: src/mainwindow.c:677
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/_Mensaje/Reci_bir/De tod_as las cuentas"
 
-#: src/mainwindow.c:688
+#: src/mainwindow.c:679
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/_Mensaje/Reci_bir/Ca_ncelar recepción"
 
-#: src/mainwindow.c:690
+#: src/mainwindow.c:681
 msgid "/_Message/Recei_ve/---"
 msgstr "/_Mensaje/Reci_bir/---"
 
-#: src/mainwindow.c:691
+#: src/mainwindow.c:682
 msgid "/_Message/_Send queued messages"
 msgstr "/_Mensaje/Enviar mensa_jes en cola"
 
-#: src/mainwindow.c:692 src/mainwindow.c:694 src/mainwindow.c:701
-#: src/mainwindow.c:706 src/mainwindow.c:710 src/mainwindow.c:719
-#: src/mainwindow.c:722 src/messageview.c:240 src/messageview.c:248
+#: src/mainwindow.c:683 src/mainwindow.c:685 src/mainwindow.c:692
+#: src/mainwindow.c:697 src/mainwindow.c:701 src/mainwindow.c:710
+#: src/mainwindow.c:713 src/messageview.c:240 src/messageview.c:248
 #: src/messageview.c:253
 msgid "/_Message/---"
 msgstr "/_Mensaje/---"
 
-#: src/mainwindow.c:693 src/messageview.c:238
+#: src/mainwindow.c:684 src/messageview.c:238
 msgid "/_Message/Compose _new message"
 msgstr "/_Mensaje/Componer _nuevo mensaje"
 
-#: src/mainwindow.c:695 src/messageview.c:241
+#: src/mainwindow.c:686 src/messageview.c:241
 msgid "/_Message/_Reply"
 msgstr "/_Mensaje/_Responder"
 
-#: src/mainwindow.c:696
+#: src/mainwindow.c:687
 msgid "/_Message/Repl_y to"
 msgstr "/_Mensaje/Respon_der a"
 
-#: src/mainwindow.c:697 src/messageview.c:242
+#: src/mainwindow.c:688 src/messageview.c:242
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Mensaje/Respon_der a/A _todos"
 
-#: src/mainwindow.c:698 src/messageview.c:244
+#: src/mainwindow.c:689 src/messageview.c:244
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Mensaje/Respon_der a/Al _remitente"
 
-#: src/mainwindow.c:699 src/messageview.c:246
+#: src/mainwindow.c:690 src/messageview.c:246
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Mensaje/Respon_der a/A la _lista de correo"
 
-#: src/mainwindow.c:702 src/messageview.c:249
+#: src/mainwindow.c:693 src/messageview.c:249
 msgid "/_Message/_Forward"
 msgstr "/_Mensaje/_Reenviar"
 
-#: src/mainwindow.c:703 src/messageview.c:250
+#: src/mainwindow.c:694 src/messageview.c:250
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Mensaje/Reen_viar como adjunto"
 
-#: src/mainwindow.c:705 src/messageview.c:252
+#: src/mainwindow.c:696 src/messageview.c:252
 msgid "/_Message/Redirec_t"
 msgstr "/_Mensaje/Red_irigir"
 
-#: src/mainwindow.c:707
+#: src/mainwindow.c:698
 msgid "/_Message/M_ove..."
 msgstr "/_Mensaje/M_over..."
 
-#: src/mainwindow.c:708
+#: src/mainwindow.c:699
 msgid "/_Message/_Copy..."
 msgstr "/_Mensaje/_Copiar..."
 
-#: src/mainwindow.c:709
+#: src/mainwindow.c:700
 msgid "/_Message/_Delete"
 msgstr "/_Mensaje/_Borrar"
 
-#: src/mainwindow.c:711
+#: src/mainwindow.c:702
 msgid "/_Message/_Mark"
 msgstr "/_Mensaje/_Marcar"
 
-#: src/mainwindow.c:712
+#: src/mainwindow.c:703
 msgid "/_Message/_Mark/_Mark"
 msgstr "/_Mensaje/_Marcar/_Marcar"
 
-#: src/mainwindow.c:713
+#: src/mainwindow.c:704
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/_Mensaje/_Marcar/_Desmarcar"
 
-#: src/mainwindow.c:714
+#: src/mainwindow.c:705
 msgid "/_Message/_Mark/---"
 msgstr "/_Mensaje/_Marcar/---"
 
-#: src/mainwindow.c:715
+#: src/mainwindow.c:706
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/_Mensaje/_Marcar/Marcar como no leído"
 
-#: src/mainwindow.c:716
+#: src/mainwindow.c:707
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/_Mensaje/_Marcar/Marcar como leído"
 
-#: src/mainwindow.c:718
+#: src/mainwindow.c:709
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/_Mensaje/_Marcar/Marcar todo como leído"
 
-#: src/mainwindow.c:720
+#: src/mainwindow.c:711
 msgid "/_Message/Set as _junk mail"
 msgstr "/_Mensaje/Es un correo _basura"
 
-#: src/mainwindow.c:721
+#: src/mainwindow.c:712
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/_Mensaje/No es un correo _basura"
 
-#: src/mainwindow.c:723 src/messageview.c:254
+#: src/mainwindow.c:714 src/messageview.c:254
 msgid "/_Message/Re-_edit"
 msgstr "/_Mensaje/Re_editar"
 
-#: src/mainwindow.c:727
+#: src/mainwindow.c:718
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/_Herramientas/Añadir remitente a la age_nda..."
 
-#: src/mainwindow.c:730
+#: src/mainwindow.c:721
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/_Herramientas/_Filtrar todos los mensajes de la carpeta"
 
-#: src/mainwindow.c:732
+#: src/mainwindow.c:723
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Herramientas/_Filtrar los mensajes seleccionados"
 
-#: src/mainwindow.c:734 src/messageview.c:261
+#: src/mainwindow.c:725 src/messageview.c:261
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Herramientas/_Crear regla de filtrado"
 
-#: src/mainwindow.c:735 src/messageview.c:263
+#: src/mainwindow.c:726 src/messageview.c:263
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Herramientas/_Crear regla de filtrado/_Automáticamente"
 
-#: src/mainwindow.c:737 src/messageview.c:265
+#: src/mainwindow.c:728 src/messageview.c:265
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Herramientas/_Crear regla de filtrado/Basada en _Desde"
 
-#: src/mainwindow.c:739 src/messageview.c:267
+#: src/mainwindow.c:730 src/messageview.c:267
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Herramientas/_Crear regla de filtrado/Basada en _Para"
 
-#: src/mainwindow.c:741 src/messageview.c:269
+#: src/mainwindow.c:732 src/messageview.c:269
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Herramientas/_Crear regla de filtrado/Basada en el _Asunto"
 
-#: src/mainwindow.c:744
+#: src/mainwindow.c:735
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/_Herramientas/_Filtrar mensajes basura en la carpeta"
 
-#: src/mainwindow.c:746
+#: src/mainwindow.c:737
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/_Herramientas/_Filtrar mensajes basura en los seleccionados"
 
-#: src/mainwindow.c:751
+#: src/mainwindow.c:742
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/_Herramientas/Borrar los mensajes re_petidos"
 
-#: src/mainwindow.c:754
+#: src/mainwindow.c:745
 msgid "/_Tools/E_xecute"
 msgstr "/_Herramientas/E_jecutar"
 
-#: src/mainwindow.c:756
+#: src/mainwindow.c:747
 msgid "/_Tools/_Log window"
 msgstr "/_Herramientas/_Ventana de traza"
 
-#: src/mainwindow.c:758
+#: src/mainwindow.c:749
 msgid "/_Configuration"
 msgstr "/_Configuración"
 
-#: src/mainwindow.c:759
+#: src/mainwindow.c:750
 msgid "/_Configuration/_Common preferences..."
 msgstr "/_Configuración/Preferencias _comunes..."
 
-#: src/mainwindow.c:761
+#: src/mainwindow.c:752
 msgid "/_Configuration/_Filter setting..."
 msgstr "/_Configuración/Preferencias de _filtrado..."
 
-#: src/mainwindow.c:763
+#: src/mainwindow.c:754
 msgid "/_Configuration/_Template..."
 msgstr "/_Configuración/_Plantillas ..."
 
-#: src/mainwindow.c:764
+#: src/mainwindow.c:755
 msgid "/_Configuration/_Actions..."
 msgstr "/_Configuración/_Acciones..."
 
-#: src/mainwindow.c:765
+#: src/mainwindow.c:756
 msgid "/_Configuration/---"
 msgstr "/_Configuración/---"
 
-#: src/mainwindow.c:766
+#: src/mainwindow.c:757
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Configuración/_Preferencias de la cuenta actual..."
 
-#: src/mainwindow.c:768
+#: src/mainwindow.c:759
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Configuración/Crear _nueva cuenta..."
 
-#: src/mainwindow.c:770
+#: src/mainwindow.c:761
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Configuración/_Editar cuentas..."
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:763
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Configuración/_Cambiar cuenta actual"
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:767
 msgid "/_Help/_Manual"
 msgstr "/_Ayuda/_Manual"
 
-#: src/mainwindow.c:777
+#: src/mainwindow.c:768
 msgid "/_Help/_Manual/_English"
 msgstr "/_Ayuda/_Manual/_Inglés"
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:769
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/_Ayuda/_Manual/_Japonés"
 
-#: src/mainwindow.c:779
+#: src/mainwindow.c:770
 msgid "/_Help/_FAQ"
 msgstr "/_Ayuda/_FAQ"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:771
 msgid "/_Help/_FAQ/_English"
 msgstr "/_Ayuda/_FAQ/_Inglés"
 
-#: src/mainwindow.c:781
+#: src/mainwindow.c:772
 msgid "/_Help/_FAQ/_German"
 msgstr "/_Ayuda/_FAQ/_Alemán"
 
-#: src/mainwindow.c:782
+#: src/mainwindow.c:773
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/_Ayuda/_FAQ/_Español"
 
-#: src/mainwindow.c:783
+#: src/mainwindow.c:774
 msgid "/_Help/_FAQ/_French"
 msgstr "/_Ayuda/_FAQ/_Francés"
 
-#: src/mainwindow.c:784
+#: src/mainwindow.c:775
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/_Ayuda/_FAQ/_Italiano"
 
-#: src/mainwindow.c:785
+#: src/mainwindow.c:776
 msgid "/_Help/---"
 msgstr "/_Ayuda/---"
 
-#: src/mainwindow.c:825
+#: src/mainwindow.c:816
 msgid "Creating main window...\n"
 msgstr "Creando ventana principal...\n"
 
-#: src/mainwindow.c:987
+#: src/mainwindow.c:973
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "MainWindow: fallo solicitando color %d\n"
 
-#: src/mainwindow.c:1071 src/summaryview.c:2020 src/summaryview.c:2105
+#: src/mainwindow.c:1057 src/summaryview.c:2020 src/summaryview.c:2105
 #: src/summaryview.c:3342 src/summaryview.c:3415 src/summaryview.c:3728
 msgid "done.\n"
 msgstr "hecho.\n"
 
-#: src/mainwindow.c:1196 src/mainwindow.c:1237 src/mainwindow.c:1265
+#: src/mainwindow.c:1182 src/mainwindow.c:1223 src/mainwindow.c:1251
 msgid "Untitled"
 msgstr "Sin título"
 
-#: src/mainwindow.c:1266
+#: src/mainwindow.c:1252
 msgid "none"
 msgstr "ninguna"
 
-#: src/mainwindow.c:1316
+#: src/mainwindow.c:1302
 #, 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:1536
+#: src/mainwindow.c:1522
 msgid "Offline"
 msgstr "Desconectado"
 
-#: src/mainwindow.c:1537
+#: src/mainwindow.c:1523
 msgid "You are offline. Go online?"
 msgstr "Esta desconectado. ¿Conectar?"
 
-#: src/mainwindow.c:1551
+#: src/mainwindow.c:1537
 msgid "Empty all trash"
 msgstr "Vaciar todas las papeleras"
 
-#: src/mainwindow.c:1552
+#: src/mainwindow.c:1538
 msgid "Empty messages in all trash?"
 msgstr "¿Vaciar los mensajes de todas las papeleras?"
 
-#: src/mainwindow.c:1580
+#: src/mainwindow.c:1566
 msgid "Add mailbox"
 msgstr "Añadir buzón"
 
-#: src/mainwindow.c:1581
+#: src/mainwindow.c:1567
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3142,16 +3142,16 @@ msgstr ""
 "Si el buzón especificado ya existe será\n"
 "escaneado automáticamente."
 
-#: src/mainwindow.c:1587
+#: src/mainwindow.c:1573
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "El buzón «%s» ya existe."
 
-#: src/mainwindow.c:1592 src/setup.c:57
+#: src/mainwindow.c:1578 src/setup.c:57
 msgid "Mailbox"
 msgstr "Correo"
 
-#: src/mainwindow.c:1598 src/setup.c:63
+#: src/mainwindow.c:1584 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3161,149 +3161,149 @@ msgstr ""
 "Quizás ya existan los ficheros o no tenga permisos suficientes para "
 "escribir  en el directorio."
 
-#: src/mainwindow.c:1989
+#: src/mainwindow.c:1975
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Árbol de carpetas"
 
-#: src/mainwindow.c:2009 src/messageview.c:368
+#: src/mainwindow.c:1995 src/messageview.c:368
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Vista de mensaje"
 
-#: src/mainwindow.c:2156 src/summaryview.c:370
+#: src/mainwindow.c:2142 src/summaryview.c:370
 msgid "/_Reply"
 msgstr "/_Responder"
 
-#: src/mainwindow.c:2157
+#: src/mainwindow.c:2143
 msgid "/Reply to _all"
 msgstr "/Responder a _todos"
 
-#: src/mainwindow.c:2158
+#: src/mainwindow.c:2144
 msgid "/Reply to _sender"
 msgstr "/Responder al _remitente"
 
-#: src/mainwindow.c:2159
+#: src/mainwindow.c:2145
 msgid "/Reply to mailing _list"
 msgstr "/Responder a la _lista de correo"
 
-#: src/mainwindow.c:2164 src/summaryview.c:377
+#: src/mainwindow.c:2150 src/summaryview.c:377
 msgid "/_Forward"
 msgstr "/_Reenviar"
 
-#: src/mainwindow.c:2165 src/summaryview.c:378
+#: src/mainwindow.c:2151 src/summaryview.c:378
 msgid "/For_ward as attachment"
 msgstr "/Reen_viar como adjunto"
 
-#: src/mainwindow.c:2166 src/summaryview.c:379
+#: src/mainwindow.c:2152 src/summaryview.c:379
 msgid "/Redirec_t"
 msgstr "/Red_irigir"
 
-#: src/mainwindow.c:2205
+#: src/mainwindow.c:2188
 msgid "Get"
 msgstr "Traer"
 
-#: src/mainwindow.c:2206
+#: src/mainwindow.c:2189
 msgid "Incorporate new mail"
 msgstr "Incorporar correo nuevo"
 
-#: src/mainwindow.c:2213
+#: src/mainwindow.c:2196
 msgid "Get all"
 msgstr "Traer todo"
 
-#: src/mainwindow.c:2214
+#: src/mainwindow.c:2197
 msgid "Incorporate new mail of all accounts"
 msgstr "Incorporar correo nuevo de todas las cuentas"
 
-#: src/mainwindow.c:2225
+#: src/mainwindow.c:2208
 msgid "Send queued message(s)"
 msgstr "Enviar mensaje(s) en la cola"
 
-#: src/mainwindow.c:2235 src/prefs_account.c:721 src/prefs_common.c:949
+#: src/mainwindow.c:2218 src/prefs_account.c:721 src/prefs_common.c:949
 #: src/prefs_folder_item.c:137
 msgid "Compose"
 msgstr "Componer"
 
-#: src/mainwindow.c:2236
+#: src/mainwindow.c:2219
 msgid "Compose new message"
 msgstr "Componer mensaje nuevo"
 
-#: src/mainwindow.c:2244 src/prefs_common.c:1448
+#: src/mainwindow.c:2227 src/prefs_common.c:1448
 msgid "Reply"
 msgstr "Responder"
 
-#: src/mainwindow.c:2245 src/mainwindow.c:2258
+#: src/mainwindow.c:2228 src/mainwindow.c:2241
 msgid "Reply to the message"
 msgstr "Responder al mensaje"
 
-#: src/mainwindow.c:2263
+#: src/mainwindow.c:2245
 msgid "Reply all"
 msgstr "A todos"
 
-#: src/mainwindow.c:2264
+#: src/mainwindow.c:2246
 msgid "Reply to all"
 msgstr "Responder a todos"
 
-#: src/mainwindow.c:2272 src/prefs_filter_edit.c:741
+#: src/mainwindow.c:2254 src/prefs_filter_edit.c:741
 msgid "Forward"
 msgstr "Reenviar"
 
-#: src/mainwindow.c:2273 src/mainwindow.c:2286
+#: src/mainwindow.c:2255 src/mainwindow.c:2268
 msgid "Forward the message"
 msgstr "Reenviar el mensaje"
 
-#: src/mainwindow.c:2293
+#: src/mainwindow.c:2275
 msgid "Delete the message"
 msgstr "Borrar el mensaje"
 
-#: src/mainwindow.c:2301 src/prefs_common.c:1988
+#: src/mainwindow.c:2283 src/prefs_common.c:1988
 msgid "Junk"
 msgstr "Basura"
 
-#: src/mainwindow.c:2302
+#: src/mainwindow.c:2284
 msgid "Set as junk mail"
 msgstr "Es correo basura"
 
-#: src/mainwindow.c:2311
+#: src/mainwindow.c:2293
 msgid "Execute"
 msgstr "Ejecutar"
 
-#: src/mainwindow.c:2312
+#: src/mainwindow.c:2294
 msgid "Execute marked process"
 msgstr "Ejecutar el proceso marcado"
 
-#: src/mainwindow.c:2322
+#: src/mainwindow.c:2304
 msgid "Next unread message"
 msgstr "Siguiente no leído"
 
-#: src/mainwindow.c:2334
+#: src/mainwindow.c:2316
 msgid "Prefs"
 msgstr "Preferencias"
 
-#: src/mainwindow.c:2335
+#: src/mainwindow.c:2317
 msgid "Common preferences"
 msgstr "Preferencias comunes"
 
-#: src/mainwindow.c:2343 src/prefs_folder_item.c:261
+#: src/mainwindow.c:2325 src/prefs_folder_item.c:261
 #: src/prefs_folder_item.c:272 src/progressdialog.c:128
 msgid "Account"
 msgstr "Cuenta"
 
-#: src/mainwindow.c:2344
+#: src/mainwindow.c:2326
 msgid "Account setting"
 msgstr "Preferencias de la cuenta"
 
-#: src/mainwindow.c:2527
+#: src/mainwindow.c:2498
 msgid "You are offline. Click the icon to go online."
 msgstr "Esta desconectado. Haga click en el icono para conectar."
 
-#: src/mainwindow.c:2538
+#: src/mainwindow.c:2509
 msgid "You are online. Click the icon to go offline."
 msgstr "Esta conectado. Haga click en el icono para desconectar."
 
-#: src/mainwindow.c:2731
+#: src/mainwindow.c:2702
 msgid "Exit"
 msgstr "Salir"
 
-#: src/mainwindow.c:2731
+#: src/mainwindow.c:2702
 msgid "Exit this program?"
 msgstr "¿Salir del programa?"
 
@@ -5497,11 +5497,11 @@ msgstr "Creando diálogo de progreso...\n"
 msgid "Status"
 msgstr "Estado"
 
-#: src/recv.c:113
+#: src/recv.c:112
 msgid "error occurred while retrieving data.\n"
 msgstr "hubo un error mientras se obtenian datos.\n"
 
-#: src/recv.c:155 src/recv.c:197 src/recv.c:213
+#: src/recv.c:154 src/recv.c:196 src/recv.c:211
 msgid "Can't write to file.\n"
 msgstr "No se puede escribir al fichero.\n"
 
@@ -6233,7 +6233,7 @@ msgstr "%.2fMB"
 msgid "%.2fGB"
 msgstr "%.2fGB"
 
-#: src/utils.c:2372 src/utils.c:2496
+#: src/utils.c:2386 src/utils.c:2510
 #, c-format
 msgid "writing to %s failed.\n"
 msgstr "fallo escribiendo en %s.\n"
diff --git a/po/et.po b/po/et.po
index 7d408faa..0653f2fa 100644
--- a/po/et.po
+++ b/po/et.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-08-09 18:08+0900\n"
+"POT-Creation-Date: 2005-08-22 17:22+0900\n"
 "PO-Revision-Date: 2002-10-02 09:08+0300\n"
 "Last-Translator: Peeter Vois <Peeter.Vois@mail.ee>\n"
 "Language-Team: Estonian <et@li.org>\n"
@@ -95,7 +95,7 @@ msgstr ""
 "'G' tulbas lubamaks kirjade võtmist kasutades 'Võta kõik'."
 
 #: src/account.c:691 src/addressadd.c:192 src/addressbook.c:490
-#: src/compose.c:4081 src/editaddress.c:200 src/editaddress.c:942
+#: src/compose.c:4079 src/editaddress.c:200 src/editaddress.c:942
 #: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:265
 #: src/editjpilot.c:271 src/editldap.c:307 src/editvcard.c:184
 #: src/mimeview.c:201 src/prefs_filter.c:258 src/prefs_folder_item.c:170
@@ -231,7 +231,7 @@ msgstr ""
 msgid "Add Address to Book"
 msgstr "Lisa aadress raamatusse"
 
-#: src/addressadd.c:202 src/compose.c:4528 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4521 src/editaddress.c:201
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "Aadress"
@@ -245,7 +245,7 @@ msgstr "Märkused"
 msgid "Select Address Book Folder"
 msgstr "Vali aadressiraamatu kaust"
 
-#: src/addressbook.c:336 src/compose.c:495 src/mainwindow.c:470
+#: src/addressbook.c:336 src/compose.c:493 src/mainwindow.c:461
 #: src/messageview.c:137
 msgid "/_File"
 msgstr "/_Fail"
@@ -266,10 +266,10 @@ msgstr "/_Fail/Uus _JPiloot"
 msgid "/_File/New _Server"
 msgstr "/_Fail/Uus _Server"
 
-#: src/addressbook.c:345 src/addressbook.c:348 src/compose.c:500
-#: src/compose.c:505 src/compose.c:509 src/mainwindow.c:488
-#: src/mainwindow.c:491 src/mainwindow.c:493 src/mainwindow.c:496
-#: src/mainwindow.c:498 src/messageview.c:140
+#: src/addressbook.c:345 src/addressbook.c:348 src/compose.c:498
+#: src/compose.c:503 src/compose.c:507 src/mainwindow.c:479
+#: src/mainwindow.c:482 src/mainwindow.c:484 src/mainwindow.c:487
+#: src/mainwindow.c:489 src/messageview.c:140
 msgid "/_File/---"
 msgstr "/_Fail/---"
 
@@ -285,7 +285,7 @@ msgstr "/_Fail/Kustuta"
 msgid "/_File/_Save"
 msgstr "/_Fail/_Salvesta"
 
-#: src/addressbook.c:350 src/compose.c:510 src/messageview.c:141
+#: src/addressbook.c:350 src/compose.c:508 src/messageview.c:141
 msgid "/_File/_Close"
 msgstr "/_Fail/Sul_ge"
 
@@ -317,7 +317,7 @@ msgstr "/_Aadress/R_edigeeri"
 msgid "/_Address/_Delete"
 msgstr "/_Aadress/Kustuta"
 
-#: src/addressbook.c:358 src/compose.c:619 src/mainwindow.c:725
+#: src/addressbook.c:358 src/compose.c:617 src/mainwindow.c:716
 #: src/messageview.c:256
 msgid "/_Tools"
 msgstr "/_Tööriist"
@@ -326,12 +326,12 @@ msgstr "/_Tööriist"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Tööriist/Impordi _LDIF fail"
 
-#: src/addressbook.c:360 src/compose.c:632 src/mainwindow.c:775
+#: src/addressbook.c:360 src/compose.c:630 src/mainwindow.c:766
 #: src/messageview.c:274
 msgid "/_Help"
 msgstr "/_Abi"
 
-#: src/addressbook.c:361 src/compose.c:633 src/mainwindow.c:786
+#: src/addressbook.c:361 src/compose.c:631 src/mainwindow.c:777
 #: src/messageview.c:275
 msgid "/_Help/_About"
 msgstr "/_Abi/Sellest"
@@ -348,7 +348,7 @@ msgstr "/Uus _Grupp"
 msgid "/New _Folder"
 msgstr "/Uus Kaust"
 
-#: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:489
+#: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:487
 #: src/folderview.c:235 src/folderview.c:237 src/folderview.c:241
 #: src/folderview.c:252 src/folderview.c:254 src/folderview.c:256
 #: src/folderview.c:260 src/folderview.c:270 src/folderview.c:272
@@ -358,8 +358,8 @@ msgstr "/Uus Kaust"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:512
-#: src/mainwindow.c:502 src/messageview.c:143
+#: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:510
+#: src/mainwindow.c:493 src/messageview.c:143
 msgid "/_Edit"
 msgstr "/R_edaktor"
 
@@ -371,7 +371,7 @@ msgstr "/Kustuta"
 msgid "E-Mail address"
 msgstr "E-Posti aadress"
 
-#: src/addressbook.c:495 src/compose.c:4529 src/prefs_common.c:2402
+#: src/addressbook.c:495 src/compose.c:4522 src/prefs_common.c:2402
 msgid "Address book"
 msgstr "Aadressiraamat"
 
@@ -380,8 +380,8 @@ msgid "Name:"
 msgstr "Nimi:"
 
 #. Buttons
-#: src/addressbook.c:627 src/addressbook.c:1673 src/editaddress.c:884
-#: src/editaddress.c:1017 src/mainwindow.c:2292 src/prefs_actions.c:266
+#: src/addressbook.c:627 src/addressbook.c:1674 src/editaddress.c:884
+#: src/editaddress.c:1017 src/mainwindow.c:2274 src/prefs_actions.c:266
 #: src/prefs_display_header.c:278 src/prefs_display_header.c:333
 #: src/prefs_template.c:231
 msgid "Delete"
@@ -420,7 +420,7 @@ msgstr "Kustuta aadress(id)"
 msgid "Really delete the address(es)?"
 msgstr "Kas te tõesti soovite aadresse kustutada?"
 
-#: src/addressbook.c:1664
+#: src/addressbook.c:1665
 #, fuzzy, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -429,38 +429,38 @@ msgstr ""
 "Kas te soovite kustutada kataloogi `%s' JA kõik aadressid ?\n"
 "Kui kustutate ainult kataloogi, siis aadressid kantakse pealmisse kausta."
 
-#: src/addressbook.c:1667 src/folderview.c:2139
+#: src/addressbook.c:1668 src/folderview.c:2139
 msgid "Delete folder"
 msgstr "Kustuta kaust"
 
-#: src/addressbook.c:1667
+#: src/addressbook.c:1668
 #, fuzzy
 msgid "_Folder only"
 msgstr "Ainult kataloog"
 
-#: src/addressbook.c:1667
+#: src/addressbook.c:1668
 #, fuzzy
 msgid "Folder and _addresses"
 msgstr "Kaust ja aadressid"
 
-#: src/addressbook.c:1672
+#: src/addressbook.c:1673
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Kas tõesti kustutada `%s' ?"
 
-#: src/addressbook.c:2352 src/addressbook.c:2485
+#: src/addressbook.c:2353 src/addressbook.c:2486
 msgid "New user, could not save index file."
 msgstr "Uus kasutaja, ei saanud salvestada indeksifaili."
 
-#: src/addressbook.c:2356 src/addressbook.c:2489
+#: src/addressbook.c:2357 src/addressbook.c:2490
 msgid "New user, could not save address book files."
 msgstr "Uus kasutaja, ei saanud salvestada aadressiraamatu faile."
 
-#: src/addressbook.c:2366 src/addressbook.c:2499
+#: src/addressbook.c:2367 src/addressbook.c:2500
 msgid "Old address book converted successfully."
 msgstr "Vana aadressiraamat uuendati edukalt."
 
-#: src/addressbook.c:2371
+#: src/addressbook.c:2372
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -468,7 +468,7 @@ msgstr ""
 "Vana aadressiraamat uuendati.\n"
 "ei saanud salvestada uut aadresside indeksifaili"
 
-#: src/addressbook.c:2384
+#: src/addressbook.c:2385
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -476,7 +476,7 @@ msgstr ""
 "Ei saanud uuendada aadressiraamatut,\n"
 "kuid loodi uued ja tühjad aadressiraamatu failid."
 
-#: src/addressbook.c:2390
+#: src/addressbook.c:2391
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -484,7 +484,7 @@ msgstr ""
 "Ei suutnud uuendada aadressiraamatut,\n"
 "ei suutnud luua uusi aadressiraamatu faile."
 
-#: src/addressbook.c:2395
+#: src/addressbook.c:2396
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -492,90 +492,90 @@ msgstr ""
 "Ei suutnud uuendada aadressiraamatut,\n"
 "ja ei suutnud luua uut aadressiraamatu faile."
 
-#: src/addressbook.c:2402
+#: src/addressbook.c:2403
 msgid "Addressbook conversion error"
 msgstr "Aadressiraamatu uuendamise viga"
 
-#: src/addressbook.c:2406
+#: src/addressbook.c:2407
 msgid "Addressbook conversion"
 msgstr "Aadressiraamat viiakse uude formaati"
 
-#: src/addressbook.c:2441
+#: src/addressbook.c:2442
 msgid "Addressbook Error"
 msgstr "Aadressiraamatu viga"
 
-#: src/addressbook.c:2442 src/addressbook.c:2542
+#: src/addressbook.c:2443 src/addressbook.c:2543
 msgid "Could not read address index"
 msgstr "Ei suutnud lugeda aadresside indeksit"
 
-#: src/addressbook.c:2504
+#: src/addressbook.c:2505
 msgid "Old address book converted, could not save new address index file"
 msgstr ""
 "Uuendati vana aadressiraamat, kuid ei suudetud salvestada uut indeksifaili"
 
-#: src/addressbook.c:2518
+#: src/addressbook.c:2519
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr ""
 "Ei suutnud uuendada aadressiraamatut, kuid loodi tühjad ja uued "
 "aadressiraamatu failid."
 
-#: src/addressbook.c:2524
+#: src/addressbook.c:2525
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr ""
 "Ei suutnud uuendada aadressiraamatut, ei suutnud luua uusi aadressiraamatu "
 "faile."
 
-#: src/addressbook.c:2530
+#: src/addressbook.c:2531
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr ""
 "Ei suutnud uuendada aadressiraamatut ja ei suutnud luua uusi aadressiraamatu "
 "faile."
 
-#: src/addressbook.c:2548
+#: src/addressbook.c:2549
 msgid "Addressbook Conversion Error"
 msgstr "Aadressiraamatu uuendamise viga"
 
-#: src/addressbook.c:2554
+#: src/addressbook.c:2555
 msgid "Addressbook Conversion"
 msgstr "Aadressiraamatu uuendamine"
 
-#: src/addressbook.c:3055 src/prefs_common.c:963
+#: src/addressbook.c:3056 src/prefs_common.c:963
 msgid "Interface"
 msgstr "Kasutajaliides"
 
-#: src/addressbook.c:3071 src/importldif.c:514
+#: src/addressbook.c:3072 src/importldif.c:514
 msgid "Address Book"
 msgstr "Aadressiraamat"
 
-#: src/addressbook.c:3087
+#: src/addressbook.c:3088
 msgid "Person"
 msgstr "Persoon"
 
-#: src/addressbook.c:3103
+#: src/addressbook.c:3104
 msgid "EMail Address"
 msgstr "EPosti Aadress"
 
-#: src/addressbook.c:3119
+#: src/addressbook.c:3120
 msgid "Group"
 msgstr "Grupp"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3135 src/folderview.c:346 src/prefs_account.c:1866
+#: src/addressbook.c:3136 src/folderview.c:346 src/prefs_account.c:1866
 msgid "Folder"
 msgstr "Kaust"
 
-#: src/addressbook.c:3151
+#: src/addressbook.c:3152
 msgid "vCard"
 msgstr "V-Kaart"
 
-#: src/addressbook.c:3167 src/addressbook.c:3183
+#: src/addressbook.c:3168 src/addressbook.c:3184
 msgid "JPilot"
 msgstr "JPiloot"
 
-#: src/addressbook.c:3199
+#: src/addressbook.c:3200
 msgid "LDAP Server"
 msgstr "LDAP Server"
 
@@ -587,7 +587,7 @@ msgstr "Üldine aadress"
 msgid "Personal address"
 msgstr "Isiklik aadress"
 
-#: src/alertpanel.c:138 src/compose.c:5214 src/main.c:515
+#: src/alertpanel.c:138 src/compose.c:5208 src/main.c:515
 msgid "Notice"
 msgstr "Märkus"
 
@@ -642,382 +642,382 @@ msgstr "Pruun"
 msgid "None"
 msgstr "Mittemiski"
 
-#: src/compose.c:487
+#: src/compose.c:485
 msgid "/_Add..."
 msgstr "/Lis_a..."
 
-#: src/compose.c:488
+#: src/compose.c:486
 msgid "/_Remove"
 msgstr "/Eemalda"
 
-#: src/compose.c:490 src/folderview.c:243 src/folderview.c:262
+#: src/compose.c:488 src/folderview.c:243 src/folderview.c:262
 #: src/folderview.c:277
 #, fuzzy
 msgid "/_Properties..."
 msgstr "/Omadus..."
 
-#: src/compose.c:496
+#: src/compose.c:494
 #, fuzzy
 msgid "/_File/_Send"
 msgstr "/_Fail/_Salvesta"
 
-#: src/compose.c:498
+#: src/compose.c:496
 #, fuzzy
 msgid "/_File/Send _later"
 msgstr "/_Kiri/Saada _hiljem"
 
-#: src/compose.c:501
+#: src/compose.c:499
 #, fuzzy
 msgid "/_File/Save to _draft folder"
 msgstr "/_Kiri/Salvesta _mustandi kausta"
 
-#: src/compose.c:503
+#: src/compose.c:501
 #, fuzzy
 msgid "/_File/Save and _keep editing"
 msgstr "/_Kiri/Salvesta ja jätka kirjutamist"
 
-#: src/compose.c:506
+#: src/compose.c:504
 msgid "/_File/_Attach file"
 msgstr "/_Fail/M_anusta fail"
 
-#: src/compose.c:507
+#: src/compose.c:505
 msgid "/_File/_Insert file"
 msgstr "/_Fail/L_isa fail"
 
-#: src/compose.c:508
+#: src/compose.c:506
 msgid "/_File/Insert si_gnature"
 msgstr "/_Fail/Lisa allkiri"
 
-#: src/compose.c:513
+#: src/compose.c:511
 msgid "/_Edit/_Undo"
 msgstr "/R_edigeeri/_Tühista"
 
-#: src/compose.c:514
+#: src/compose.c:512
 msgid "/_Edit/_Redo"
 msgstr "R_edigeeri/_Ennista"
 
-#: src/compose.c:515 src/compose.c:522 src/mainwindow.c:506
+#: src/compose.c:513 src/compose.c:520 src/mainwindow.c:497
 #: src/messageview.c:146
 msgid "/_Edit/---"
 msgstr "/R-edaktor/---"
 
-#: src/compose.c:516
+#: src/compose.c:514
 msgid "/_Edit/Cu_t"
 msgstr "/R_edaktor/_Lõika"
 
-#: src/compose.c:517 src/mainwindow.c:503 src/messageview.c:144
+#: src/compose.c:515 src/mainwindow.c:494 src/messageview.c:144
 msgid "/_Edit/_Copy"
 msgstr "/R_edaktor/_Kopeeri"
 
-#: src/compose.c:518
+#: src/compose.c:516
 msgid "/_Edit/_Paste"
 msgstr "/R_edaktor/_Aseta"
 
-#: src/compose.c:519
+#: src/compose.c:517
 msgid "/_Edit/Paste as _quotation"
 msgstr "/R_edaktor/Aseta kui tsitaat"
 
-#: src/compose.c:521 src/mainwindow.c:504 src/messageview.c:145
+#: src/compose.c:519 src/mainwindow.c:495 src/messageview.c:145
 msgid "/_Edit/Select _all"
 msgstr "/R_edaktor/_Märgi kõik"
 
-#: src/compose.c:523
+#: src/compose.c:521
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/R_edaktor/_Äärista aktiivne lõik"
 
-#: src/compose.c:525
+#: src/compose.c:523
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/R_edaktor/Ää_rista kõik pikad read"
 
-#: src/compose.c:527
+#: src/compose.c:525
 #, fuzzy
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/R_edaktor/_Kopeeri"
 
-#: src/compose.c:528 src/mainwindow.c:511 src/messageview.c:150
+#: src/compose.c:526 src/mainwindow.c:502 src/messageview.c:150
 #: src/summaryview.c:400
 msgid "/_View"
 msgstr "/_Vaade"
 
-#: src/compose.c:529
+#: src/compose.c:527
 msgid "/_View/_To"
 msgstr "/_Vaadde/_Kellele"
 
-#: src/compose.c:530
+#: src/compose.c:528
 msgid "/_View/_Cc"
 msgstr "/_Vaade/Koopia"
 
-#: src/compose.c:531
+#: src/compose.c:529
 msgid "/_View/_Bcc"
 msgstr "/_Vaade/*_BCC"
 
-#: src/compose.c:532
+#: src/compose.c:530
 msgid "/_View/_Reply to"
 msgstr "/_Vaade/_Vasta"
 
-#: src/compose.c:533 src/compose.c:535 src/compose.c:537 src/compose.c:539
-#: src/mainwindow.c:529 src/mainwindow.c:532 src/mainwindow.c:558
-#: src/mainwindow.c:582 src/mainwindow.c:675 src/mainwindow.c:679
+#: src/compose.c:531 src/compose.c:533 src/compose.c:535 src/compose.c:537
+#: src/mainwindow.c:520 src/mainwindow.c:523 src/mainwindow.c:549
+#: src/mainwindow.c:573 src/mainwindow.c:666 src/mainwindow.c:670
 #: src/messageview.c:233
 msgid "/_View/---"
 msgstr "/_vaade/---"
 
-#: src/compose.c:534
+#: src/compose.c:532
 msgid "/_View/_Followup to"
 msgstr "/_Vaade/*Järgneja"
 
-#: src/compose.c:536
+#: src/compose.c:534
 msgid "/_View/R_uler"
 msgstr "/_Vaade/Joonla_ud"
 
-#: src/compose.c:538
+#: src/compose.c:536
 msgid "/_View/_Attachment"
 msgstr "/_Vaade/_Manus"
 
-#: src/compose.c:545 src/mainwindow.c:589 src/messageview.c:157
+#: src/compose.c:543 src/mainwindow.c:580 src/messageview.c:157
 #, fuzzy
 msgid "/_View/Character _encoding"
 msgstr "/Vaade/_Sorteeri/Kahanevas järjekorras"
 
-#: src/compose.c:546
+#: src/compose.c:544
 msgid "/_View/Character _encoding/_Automatic"
 msgstr ""
 
-#: src/compose.c:548 src/compose.c:554 src/compose.c:560 src/compose.c:564
-#: src/compose.c:570 src/compose.c:574 src/compose.c:580 src/compose.c:584
-#: src/compose.c:594 src/compose.c:598 src/compose.c:608 src/compose.c:612
-#: src/mainwindow.c:585 src/mainwindow.c:592 src/messageview.c:153
+#: src/compose.c:546 src/compose.c:552 src/compose.c:558 src/compose.c:562
+#: src/compose.c:568 src/compose.c:572 src/compose.c:578 src/compose.c:582
+#: src/compose.c:592 src/compose.c:596 src/compose.c:606 src/compose.c:610
+#: src/mainwindow.c:576 src/mainwindow.c:583 src/messageview.c:153
 #, fuzzy
 msgid "/_View/Character _encoding/---"
 msgstr "/Vaade/_Sorteeri/Kahanevas järjekorras"
 
-#: src/compose.c:550 src/mainwindow.c:593 src/messageview.c:161
+#: src/compose.c:548 src/mainwindow.c:584 src/messageview.c:161
 #, fuzzy
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Vaade/_Kooditabel/7bitine ascii (US-ASCII)"
 
-#: src/compose.c:552 src/mainwindow.c:595 src/messageview.c:164
+#: src/compose.c:550 src/mainwindow.c:586 src/messageview.c:164
 #, fuzzy
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Vaade/_Kooditabel/Unicode (_UTF-8)"
 
-#: src/compose.c:556 src/mainwindow.c:599 src/messageview.c:167
+#: src/compose.c:554 src/mainwindow.c:590 src/messageview.c:167
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Vaade/_Kooditabel/Lääne-Euroopa (ISO-8859-_1)"
 
-#: src/compose.c:558 src/mainwindow.c:601 src/messageview.c:169
+#: src/compose.c:556 src/mainwindow.c:592 src/messageview.c:169
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Vaade/_Kooditabel/Lääne-Euroopa (ISO-8859-_15)"
 
-#: src/compose.c:562 src/mainwindow.c:605 src/messageview.c:172
+#: src/compose.c:560 src/mainwindow.c:596 src/messageview.c:172
 #, fuzzy
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Vaade/_Kooditabel/Kesk-Euroopa (ISO-8859-_2)"
 
-#: src/compose.c:566 src/mainwindow.c:609 src/messageview.c:175
+#: src/compose.c:564 src/mainwindow.c:600 src/messageview.c:175
 #, fuzzy
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Vaade/_Kooditabel/_Balti (ISO-8859-13)"
 
-#: src/compose.c:568 src/mainwindow.c:611 src/messageview.c:177
+#: src/compose.c:566 src/mainwindow.c:602 src/messageview.c:177
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Vaade/_Kooditabel/Balti (ISO-8859-_4)"
 
-#: src/compose.c:572 src/mainwindow.c:615 src/messageview.c:180
+#: src/compose.c:570 src/mainwindow.c:606 src/messageview.c:180
 #, fuzzy
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Vaade/_Kooditabel/Greeka (ISO-8859-_7)"
 
-#: src/compose.c:576 src/mainwindow.c:619 src/messageview.c:183
+#: src/compose.c:574 src/mainwindow.c:610 src/messageview.c:183
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Vaade/_Kooditabel/Greeka (ISO-8859-_7)"
 
-#: src/compose.c:578 src/mainwindow.c:621 src/messageview.c:185
+#: src/compose.c:576 src/mainwindow.c:612 src/messageview.c:185
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Vaade/_Kooditabel/Kirillits (Windows-1251)"
 
-#: src/compose.c:582 src/mainwindow.c:625 src/messageview.c:188
+#: src/compose.c:580 src/mainwindow.c:616 src/messageview.c:188
 #, fuzzy
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Vaade/_Kooditabel/Türgi (ISO-8859-_9)"
 
-#: src/compose.c:586 src/mainwindow.c:629 src/messageview.c:191
+#: src/compose.c:584 src/mainwindow.c:620 src/messageview.c:191
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Vaade/_Kooditabel/Kirillits (ISO-8859-_5)"
 
-#: src/compose.c:588 src/mainwindow.c:631 src/messageview.c:193
+#: src/compose.c:586 src/mainwindow.c:622 src/messageview.c:193
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Vaade/_Kooditabel/Kirillits (KOI8-_R)"
 
-#: src/compose.c:590 src/mainwindow.c:633 src/messageview.c:195
+#: src/compose.c:588 src/mainwindow.c:624 src/messageview.c:195
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Vaade/_Kooditabel/Kirillits (KOI8-_R)"
 
-#: src/compose.c:592 src/mainwindow.c:635 src/messageview.c:197
+#: src/compose.c:590 src/mainwindow.c:626 src/messageview.c:197
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Vaade/_Kooditabel/Kirillits (Windows-1251)"
 
-#: src/compose.c:596 src/mainwindow.c:639 src/messageview.c:200
+#: src/compose.c:594 src/mainwindow.c:630 src/messageview.c:200
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Vaade/_Kooditabel/Jaapan (ISO-2022-_JP)"
 
-#: src/compose.c:600 src/mainwindow.c:649 src/messageview.c:209
+#: src/compose.c:598 src/mainwindow.c:640 src/messageview.c:209
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Vaade/_Kooditabel/Lihtsustatud Hiina (_GB2312)"
 
-#: src/compose.c:602 src/mainwindow.c:651 src/messageview.c:211
+#: src/compose.c:600 src/mainwindow.c:642 src/messageview.c:211
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Vaade/_Kooditabel/Lihtsustatud Hiina (_GB2312)"
 
-#: src/compose.c:604 src/mainwindow.c:653 src/messageview.c:213
+#: src/compose.c:602 src/mainwindow.c:644 src/messageview.c:213
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Vaade/_Kooditabel/Traditsionaalne Hiine (_Big5)"
 
-#: src/compose.c:606 src/mainwindow.c:655 src/messageview.c:215
+#: src/compose.c:604 src/mainwindow.c:646 src/messageview.c:215
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Vaade/_Kooditabel/Traditsionaalne Hiina (EUC-_TW)"
 
-#: src/compose.c:610 src/mainwindow.c:661 src/messageview.c:220
+#: src/compose.c:608 src/mainwindow.c:652 src/messageview.c:220
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Vaade/_Kooditabel/Korea (EUC-_KR)"
 
-#: src/compose.c:614 src/mainwindow.c:667 src/messageview.c:225
+#: src/compose.c:612 src/mainwindow.c:658 src/messageview.c:225
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Vaade/_Kooditabel/Tai (TIS-620)"
 
-#: src/compose.c:616 src/mainwindow.c:669 src/messageview.c:227
+#: src/compose.c:614 src/mainwindow.c:660 src/messageview.c:227
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Vaade/_Kooditabel/Tai (Windows-874)"
 
-#: src/compose.c:620 src/mainwindow.c:726 src/messageview.c:257
+#: src/compose.c:618 src/mainwindow.c:717 src/messageview.c:257
 msgid "/_Tools/_Address book"
 msgstr "/_Tööriist/_Aadressiraamat"
 
-#: src/compose.c:621
+#: src/compose.c:619
 msgid "/_Tools/_Template"
 msgstr "/_Tööriist/_Mall"
 
-#: src/compose.c:622 src/mainwindow.c:749 src/messageview.c:272
+#: src/compose.c:620 src/mainwindow.c:740 src/messageview.c:272
 msgid "/_Tools/Actio_ns"
 msgstr "/_Tööriist/Tegevused"
 
-#: src/compose.c:623 src/compose.c:627 src/mainwindow.c:729
-#: src/mainwindow.c:743 src/mainwindow.c:748 src/mainwindow.c:750
-#: src/mainwindow.c:753 src/mainwindow.c:755 src/messageview.c:260
+#: src/compose.c:621 src/compose.c:625 src/mainwindow.c:720
+#: src/mainwindow.c:734 src/mainwindow.c:739 src/mainwindow.c:741
+#: src/mainwindow.c:744 src/mainwindow.c:746 src/messageview.c:260
 #: src/messageview.c:271
 msgid "/_Tools/---"
 msgstr "/_Tööriist/---"
 
-#: src/compose.c:624
+#: src/compose.c:622
 #, fuzzy
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/R_edaktor/Redi_geeri välise redaktoriga"
 
-#: src/compose.c:628
+#: src/compose.c:626
 #, fuzzy
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Tööriist/Tegevused"
 
-#: src/compose.c:629
+#: src/compose.c:627
 #, fuzzy
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/_Kiri/Krüpteeri"
 
-#: src/compose.c:855
+#: src/compose.c:853
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "faili %s ei leidu\n"
 
-#: src/compose.c:954 src/compose.c:1024 src/procmsg.c:1353
+#: src/compose.c:952 src/compose.c:1022 src/procmsg.c:1353
 msgid "Can't get text part\n"
 msgstr "Ei saa tekstiosa kätte\n"
 
-#: src/compose.c:1420
+#: src/compose.c:1418
 msgid "Quote mark format error."
 msgstr "*Tsitaadimärgi formaadi viga."
 
-#: src/compose.c:1432
+#: src/compose.c:1430
 msgid "Message reply/forward format error."
 msgstr "Kirja vasta/edasta formaadi viga."
 
-#: src/compose.c:1801
+#: src/compose.c:1799
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Faili %s ei leidu\n"
 
-#: src/compose.c:1805
+#: src/compose.c:1803
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Ei saanud failile %s suurust\n"
 
-#: src/compose.c:1809
+#: src/compose.c:1807
 #, c-format
 msgid "File %s is empty."
 msgstr "Fail %s on tühi."
 
-#: src/compose.c:1813
+#: src/compose.c:1811
 #, c-format
 msgid "Can't read %s."
 msgstr "ei suuda lugeda %s-i"
 
-#: src/compose.c:1848
+#: src/compose.c:1846
 #, c-format
 msgid "Message: %s"
 msgstr "Kiri: %s"
 
-#: src/compose.c:1920 src/mimeview.c:560
+#: src/compose.c:1918 src/mimeview.c:560
 msgid "Can't get the part of multipart message."
 msgstr "Ei saa mitmeosalise kirja osa kätte."
 
-#: src/compose.c:2362
+#: src/compose.c:2360
 msgid " [Edited]"
 msgstr " [Redigeeritud]"
 
-#: src/compose.c:2364
+#: src/compose.c:2362
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Kirjuta kiri%s"
 
-#: src/compose.c:2367
+#: src/compose.c:2365
 #, c-format
 msgid "Compose message%s"
 msgstr "Kirjuta kiri%s"
 
-#: src/compose.c:2478
+#: src/compose.c:2476
 msgid "Recipient is not specified."
 msgstr "Saaja pole määratud."
 
-#: src/compose.c:2486
+#: src/compose.c:2484
 #, fuzzy
 msgid "Empty subject"
 msgstr "Pealkiri"
 
-#: src/compose.c:2487
+#: src/compose.c:2485
 msgid "Subject is empty. Send it anyway?"
 msgstr "Päälkiri on tühi. Kas saadame igal juhul?"
 
-#: src/compose.c:2538
+#: src/compose.c:2536
 msgid "can't get recipient list."
 msgstr "ei leia saajate nimistut."
 
-#: src/compose.c:2558
+#: src/compose.c:2556
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1025,27 +1025,27 @@ msgstr ""
 "Kirja saatmiseks pole määratud kasutajtunnust.\n"
 "Palun vali kirja konto enne saatmist."
 
-#: src/compose.c:2572 src/send_message.c:297
+#: src/compose.c:2570 src/send_message.c:297
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Tekkis viga kirja saatmisel %s-le."
 
-#: src/compose.c:2595
+#: src/compose.c:2593
 msgid "Can't save the message to outbox."
 msgstr "Kirja ei õnnestunud asetada väljunute kausta."
 
-#: src/compose.c:2645
+#: src/compose.c:2643
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr ""
 "Ei suutnud leida ühtki võtit, mis oleks seotud valitud võtmega (id'%s')."
 
-#: src/compose.c:2709 src/compose.c:2965 src/compose.c:3028 src/compose.c:3148
-#: src/utils.c:2365
+#: src/compose.c:2707 src/compose.c:2963 src/compose.c:3026 src/compose.c:3146
+#: src/utils.c:2379
 msgid "can't change file mode\n"
 msgstr "Ei suuda muuta faili omadusi\n"
 
-#: src/compose.c:2741
+#: src/compose.c:2739
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1055,12 +1055,12 @@ msgstr ""
 "Ei suuda transleerida kirja tekstikoodi.\n"
 "Kas igatahes saata ?"
 
-#: src/compose.c:2747
+#: src/compose.c:2745
 #, fuzzy
 msgid "Code conversion error"
 msgstr "Aadressiraamatu uuendamise viga"
 
-#: src/compose.c:2816
+#: src/compose.c:2814
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1069,156 +1069,156 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:2820
+#: src/compose.c:2818
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3108
+#: src/compose.c:3106
 msgid "can't remove the old message\n"
 msgstr "Ei suuda eemaldada vana kirja\n"
 
-#: src/compose.c:3126
+#: src/compose.c:3124
 msgid "queueing message...\n"
 msgstr "Asetan kirja järjekorda...\n"
 
-#: src/compose.c:3208
+#: src/compose.c:3206
 msgid "can't find queue folder\n"
 msgstr "järjekorra kausta ei leidunud\n"
 
-#: src/compose.c:3215
+#: src/compose.c:3213
 msgid "can't queue the message\n"
 msgstr "Ei suutnud kirja järjekorda asetada\n"
 
-#: src/compose.c:3792
+#: src/compose.c:3790
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "Loodud Kirja-ID: %s\n"
 
-#: src/compose.c:3901
+#: src/compose.c:3899
 msgid "Creating compose window...\n"
 msgstr "Loon kirjutamise akent...\n"
 
-#: src/compose.c:3949 src/headerview.c:54 src/summary_search.c:214
+#: src/compose.c:3947 src/headerview.c:54 src/summary_search.c:214
 msgid "From:"
 msgstr "Kellelt:"
 
-#: src/compose.c:4021
+#: src/compose.c:4019
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/_Tööriist/Tegevused"
 
-#: src/compose.c:4024
+#: src/compose.c:4022
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/_Kiri/Krüpteeri"
 
-#: src/compose.c:4062 src/compose.c:5001
+#: src/compose.c:4060 src/compose.c:4995
 msgid "MIME type"
 msgstr "MIME tüüp"
 
 #. S_COL_DATE
-#: src/compose.c:4071 src/mimeview.c:192 src/prefs_filter_edit.c:585
+#: src/compose.c:4069 src/mimeview.c:192 src/prefs_filter_edit.c:585
 #: src/prefs_summary_column.c:75 src/select-keys.c:317 src/summaryview.c:4217
 msgid "Size"
 msgstr "Suurus"
 
-#: src/compose.c:4449 src/mainwindow.c:2224 src/prefs_account.c:719
+#: src/compose.c:4442 src/mainwindow.c:2207 src/prefs_account.c:719
 #: src/prefs_common.c:947
 msgid "Send"
 msgstr "Saada"
 
-#: src/compose.c:4450
+#: src/compose.c:4443
 msgid "Send message"
 msgstr "Saada kiri"
 
-#: src/compose.c:4458
+#: src/compose.c:4451
 msgid "Send later"
 msgstr "Hiljem"
 
-#: src/compose.c:4459
+#: src/compose.c:4452
 msgid "Put into queue folder and send later"
 msgstr "Pane järjekorda ja saada hiljem"
 
-#: src/compose.c:4467
+#: src/compose.c:4460
 msgid "Draft"
 msgstr "Mustand"
 
-#: src/compose.c:4468
+#: src/compose.c:4461
 msgid "Save to draft folder"
 msgstr "Salvesta mustandite kausta"
 
-#: src/compose.c:4478
+#: src/compose.c:4471
 msgid "Insert"
 msgstr "Lisa"
 
-#: src/compose.c:4479
+#: src/compose.c:4472
 msgid "Insert file"
 msgstr "Lisa fail"
 
-#: src/compose.c:4487
+#: src/compose.c:4480
 msgid "Attach"
 msgstr "Manusta"
 
-#: src/compose.c:4488
+#: src/compose.c:4481
 msgid "Attach file"
 msgstr "Manusta fail"
 
 #. signature
-#: src/compose.c:4498 src/prefs_account.c:1391 src/prefs_common.c:1356
+#: src/compose.c:4491 src/prefs_account.c:1391 src/prefs_common.c:1356
 msgid "Signature"
 msgstr "Allkiri"
 
-#: src/compose.c:4499
+#: src/compose.c:4492
 msgid "Insert signature"
 msgstr "Lisa allkiri"
 
-#: src/compose.c:4508 src/prefs_common.c:1378 src/prefs_common.c:2382
+#: src/compose.c:4501 src/prefs_common.c:1378 src/prefs_common.c:2382
 msgid "Editor"
 msgstr "Redaktor"
 
-#: src/compose.c:4509
+#: src/compose.c:4502
 msgid "Edit with external editor"
 msgstr "Redigeeri välise redaktoriga"
 
-#: src/compose.c:4517
+#: src/compose.c:4510
 msgid "Linewrap"
 msgstr "Reaäär"
 
-#: src/compose.c:4518
+#: src/compose.c:4511
 msgid "Wrap all long lines"
 msgstr "Murra kõik pikad read"
 
-#: src/compose.c:4897
+#: src/compose.c:4891
 msgid "Invalid MIME type."
 msgstr "Vale MIME tüüp."
 
-#: src/compose.c:4915
+#: src/compose.c:4909
 msgid "File doesn't exist or is empty."
 msgstr "Faili ei eksisteeri või on see tühi."
 
-#: src/compose.c:4983
+#: src/compose.c:4977
 #, fuzzy
 msgid "Properties"
 msgstr "Omadus"
 
-#: src/compose.c:5003
+#: src/compose.c:4997
 msgid "Encoding"
 msgstr "Kodeerimine"
 
-#: src/compose.c:5026 src/prefs_folder_item.c:183
+#: src/compose.c:5020 src/prefs_folder_item.c:183
 msgid "Path"
 msgstr "Tee"
 
-#: src/compose.c:5027
+#: src/compose.c:5021
 msgid "File name"
 msgstr "Failinimi"
 
-#: src/compose.c:5185
+#: src/compose.c:5179
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Välise redaktori käsurida on vale: `%s'\n"
 
-#: src/compose.c:5211
+#: src/compose.c:5205
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1229,75 +1229,75 @@ msgstr ""
 "Kas hävitame protsessi?\n"
 "protsessi grupi id: %d"
 
-#: src/compose.c:5228
+#: src/compose.c:5222
 #, c-format
 msgid "Terminated process group id: %d"
 msgstr "Hävitatud protsessi grupi id: %d"
 
-#: src/compose.c:5229
+#: src/compose.c:5223
 #, c-format
 msgid "Temporary file: %s"
 msgstr "Ajutine fail: %s"
 
-#: src/compose.c:5253
+#: src/compose.c:5247
 msgid "Compose: input from monitoring process\n"
 msgstr "Kirjutaja: sisend monitoorprotsessilt\n"
 
 #. failed
-#: src/compose.c:5284
+#: src/compose.c:5278
 msgid "Couldn't exec external editor\n"
 msgstr "Ei suutnud välist redaktorit käivitada\n"
 
-#: src/compose.c:5288
+#: src/compose.c:5282
 msgid "Couldn't write to file\n"
 msgstr "Ei suutnud faili salvestada\n"
 
-#: src/compose.c:5290
+#: src/compose.c:5284
 msgid "Pipe read failed\n"
 msgstr "Torust lugemine ebaõnnestus\n"
 
-#: src/compose.c:5596 src/compose.c:5604 src/compose.c:5610
+#: src/compose.c:5590 src/compose.c:5598 src/compose.c:5604
 msgid "Can't queue the message."
 msgstr "Kirja ei õnnestunud järjekorda asetada."
 
-#: src/compose.c:5701
+#: src/compose.c:5695
 #, fuzzy
 msgid "Select files"
 msgstr "Määra fail"
 
-#: src/compose.c:5723
+#: src/compose.c:5717
 msgid "Select file"
 msgstr "Määra fail"
 
-#: src/compose.c:5760
+#: src/compose.c:5754
 #, fuzzy
 msgid "Save message"
 msgstr "Saada kiri"
 
-#: src/compose.c:5761
+#: src/compose.c:5755
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Seda kirja on muudetud. kas kaotame selle?"
 
-#: src/compose.c:5763
+#: src/compose.c:5757
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:5805
+#: src/compose.c:5799
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Kas te tahate seda malli lisada '%s'-e ?"
 
-#: src/compose.c:5807
+#: src/compose.c:5801
 msgid "Apply template"
 msgstr "Lisa mall"
 
-#: src/compose.c:5808
+#: src/compose.c:5802
 #, fuzzy
 msgid "_Replace"
 msgstr "Asenda"
 
-#: src/compose.c:5808
+#: src/compose.c:5802
 #, fuzzy
 msgid "_Insert"
 msgstr "Lisa"
@@ -1745,12 +1745,12 @@ msgstr "Sean kausta info...\n"
 msgid "Setting folder info..."
 msgstr "Sean kausta info..."
 
-#: src/folderview.c:805 src/mainwindow.c:3301 src/setup.c:81
+#: src/folderview.c:805 src/mainwindow.c:3272 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Tuhnin kaustas %s%c%s ..."
 
-#: src/folderview.c:809 src/mainwindow.c:3306 src/setup.c:86
+#: src/folderview.c:809 src/mainwindow.c:3277 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Tuhnin kaustas %s ..."
@@ -2078,45 +2078,45 @@ msgstr "Autoriseerimise meetod"
 msgid "IMAP4 login failed.\n"
 msgstr "IMAP4 sissekirjutus ebaõnnestus.\n"
 
-#: src/imap.c:3522
+#: src/imap.c:3528
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "ei suuda %s-d lisada %s-i\n"
 
-#: src/imap.c:3529
+#: src/imap.c:3535
 msgid "(sending file...)"
 msgstr "(saadan faili...)"
 
-#: src/imap.c:3557
+#: src/imap.c:3563
 #, fuzzy, c-format
 msgid "can't append message to %s\n"
 msgstr "ei suuda lisada kirja %s\n"
 
-#: src/imap.c:3589
+#: src/imap.c:3595
 #, fuzzy, c-format
 msgid "can't copy %s to %s\n"
 msgstr "ei suuda %d-d kopeerida %s-i\n"
 
-#: src/imap.c:3613
+#: src/imap.c:3619
 #, fuzzy, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "imapi käsu täitmisel tekkis viga: STORE %d:%d %s\n"
 
-#: src/imap.c:3627
+#: src/imap.c:3633
 msgid "error while imap command: EXPUNGE\n"
 msgstr "imapi käsu täitmisel tekkis viga: EXPUNGE\n"
 
-#: src/imap.c:3640
+#: src/imap.c:3646
 #, fuzzy
 msgid "error while imap command: CLOSE\n"
 msgstr "imapi käsu täitmisel tekkis viga: EXPUNGE\n"
 
-#: src/imap.c:3873
+#: src/imap.c:3879
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv ei suuda konversteerida UTF-7-t %s-ks\n"
 
-#: src/imap.c:3903
+#: src/imap.c:3909
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv ei suuda konverteerida %s-i UTF-7-ks\n"
@@ -2218,7 +2218,7 @@ msgstr "Impordi LDIF fail aadressiraamatusse"
 msgid "Prev"
 msgstr "Eelm"
 
-#: src/importldif.c:768 src/mainwindow.c:2321
+#: src/importldif.c:768 src/mainwindow.c:2303
 msgid "Next"
 msgstr "Järgmine"
 
@@ -2560,647 +2560,647 @@ msgid ""
 "Do you want to migrate it?"
 msgstr ""
 
-#: src/mainwindow.c:471
+#: src/mainwindow.c:462
 msgid "/_File/_Folder"
 msgstr "/_Fail/_Kaust"
 
-#: src/mainwindow.c:472
+#: src/mainwindow.c:463
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/_Fail/_Kaust/_Loo uus kaust..."
 
-#: src/mainwindow.c:474
+#: src/mainwindow.c:465
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/_Fail/_Kaust/_Nimeta kaust ümber"
 
-#: src/mainwindow.c:475
+#: src/mainwindow.c:466
 #, fuzzy
 msgid "/_File/_Folder/_Move folder..."
 msgstr "/_Fail/_Kaust/_Nimeta kaust ümber"
 
-#: src/mainwindow.c:476
+#: src/mainwindow.c:467
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/_Fail/_Kaust/_Kustuta kaust"
 
-#: src/mainwindow.c:477
+#: src/mainwindow.c:468
 #, fuzzy
 msgid "/_File/_Mailbox"
 msgstr "/_Fail/_Lisa kirjakast..."
 
-#: src/mainwindow.c:478
+#: src/mainwindow.c:469
 #, fuzzy
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/_Fail/_Lisa kirjakast..."
 
-#: src/mainwindow.c:479
+#: src/mainwindow.c:470
 #, fuzzy
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/Ee_malda kirjakst"
 
-#: src/mainwindow.c:480 src/mainwindow.c:485
+#: src/mainwindow.c:471 src/mainwindow.c:476
 #, fuzzy
 msgid "/_File/_Mailbox/---"
 msgstr "/_Fail/_Kaust"
 
-#: src/mainwindow.c:481
+#: src/mainwindow.c:472
 #, fuzzy
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "/_Vaata uusi kirju"
 
-#: src/mainwindow.c:483
+#: src/mainwindow.c:474
 #, fuzzy
 msgid "/_File/_Mailbox/Check for new messages in _all mailboxes"
 msgstr "/_Fail/_Vaata uusi kirju kõigis kaustades"
 
-#: src/mainwindow.c:486
+#: src/mainwindow.c:477
 #, fuzzy
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "/_Uuenda kausta puu"
 
-#: src/mainwindow.c:489
+#: src/mainwindow.c:480
 msgid "/_File/_Import mbox file..."
 msgstr "/_Fail/_Impordi kirjakasti fail..."
 
-#: src/mainwindow.c:490
+#: src/mainwindow.c:481
 msgid "/_File/_Export to mbox file..."
 msgstr "/_Fail/_Ekspordi kirjakasti faili..."
 
-#: src/mainwindow.c:492
+#: src/mainwindow.c:483
 #, fuzzy
 msgid "/_File/Empty all _trash"
 msgstr "/_Fail/_Tühjenda prügikast"
 
-#: src/mainwindow.c:494 src/messageview.c:138
+#: src/mainwindow.c:485 src/messageview.c:138
 msgid "/_File/_Save as..."
 msgstr "/_Fail/_Salvesta kui..."
 
-#: src/mainwindow.c:495 src/messageview.c:139
+#: src/mainwindow.c:486 src/messageview.c:139
 msgid "/_File/_Print..."
 msgstr "/_Fail/_Trüki..."
 
-#: src/mainwindow.c:497
+#: src/mainwindow.c:488
 #, fuzzy
 msgid "/_File/_Work offline"
 msgstr "/_Fail/L_isa fail"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:500
+#: src/mainwindow.c:491
 msgid "/_File/E_xit"
 msgstr "/_Fail/_Välju"
 
-#: src/mainwindow.c:505
+#: src/mainwindow.c:496
 msgid "/_Edit/Select _thread"
 msgstr "/R_edaktor/Märgi _teema"
 
-#: src/mainwindow.c:507 src/messageview.c:147
+#: src/mainwindow.c:498 src/messageview.c:147
 msgid "/_Edit/_Find in current message..."
 msgstr "/_Redaktor/_Leia käesolevast kirjast..."
 
-#: src/mainwindow.c:509
+#: src/mainwindow.c:500
 msgid "/_Edit/_Search messages..."
 msgstr "/_Redaktor/_Otsi kirju..."
 
-#: src/mainwindow.c:512
+#: src/mainwindow.c:503
 msgid "/_View/Show or hi_de"
 msgstr "/_Vaade/Näita või varja"
 
-#: src/mainwindow.c:513
+#: src/mainwindow.c:504
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/_Vaade/Näita või varja/Kausta_puud"
 
-#: src/mainwindow.c:515
+#: src/mainwindow.c:506
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/_Vaade/Näita või varja/Kirja_vaadet"
 
-#: src/mainwindow.c:517
+#: src/mainwindow.c:508
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/_Vaadde/Näita või varja/_Nupuribal"
 
-#: src/mainwindow.c:519
+#: src/mainwindow.c:510
 msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/_Vaade/Näita või varja/_Nupuribal/Pilti _ja teksti"
 
-#: src/mainwindow.c:521
+#: src/mainwindow.c:512
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/_Vaade/Näita või varja/_Nupuribal/_Pilti"
 
-#: src/mainwindow.c:523
+#: src/mainwindow.c:514
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/_Vaade/Näita või varja/_Nupuribal/_Teksti"
 
-#: src/mainwindow.c:525
+#: src/mainwindow.c:516
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/_Vaade/Näita või varja/_Nupuribal/_Mitte midagi"
 
-#: src/mainwindow.c:527
+#: src/mainwindow.c:518
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/_Vaade/Näita või varja/Staatusri_ba"
 
-#: src/mainwindow.c:530
+#: src/mainwindow.c:521
 msgid "/_View/Separate f_older tree"
 msgstr "/_Vaade/Eraldi kausta puu"
 
-#: src/mainwindow.c:531
+#: src/mainwindow.c:522
 #, fuzzy
 msgid "/_View/Separate _message view"
 msgstr "/_Vaade/Eraldi kirja vaade"
 
-#: src/mainwindow.c:533
+#: src/mainwindow.c:524
 msgid "/_View/_Sort"
 msgstr "/_Vaade/_Sorteeri"
 
-#: src/mainwindow.c:534
+#: src/mainwindow.c:525
 msgid "/_View/_Sort/by _number"
 msgstr "/_Vaade/_Sorteeri/_numbri järgi"
 
-#: src/mainwindow.c:535
+#: src/mainwindow.c:526
 msgid "/_View/_Sort/by s_ize"
 msgstr "/_Vaade/_Sorteeri/_suuruse järgi"
 
-#: src/mainwindow.c:536
+#: src/mainwindow.c:527
 msgid "/_View/_Sort/by _date"
 msgstr "/_Vaade/_Sorteeri/_kuupäeva järgi"
 
-#: src/mainwindow.c:537
+#: src/mainwindow.c:528
 msgid "/_View/_Sort/by _from"
 msgstr "/_Vaade/_Sorteeri/_vormi järgi"
 
-#: src/mainwindow.c:538
+#: src/mainwindow.c:529
 #, fuzzy
 msgid "/_View/_Sort/by _recipient"
 msgstr "/_Vaade/_Sorteeri/_suuruse järgi"
 
-#: src/mainwindow.c:539
+#: src/mainwindow.c:530
 msgid "/_View/_Sort/by _subject"
 msgstr "/_Vaade/_Sorteeri/_pealkirja järgi"
 
-#: src/mainwindow.c:540
+#: src/mainwindow.c:531
 msgid "/_View/_Sort/by _color label"
 msgstr "/_Vaade/_Sorteeri/v_ärvi järgi"
 
-#: src/mainwindow.c:542
+#: src/mainwindow.c:533
 msgid "/_View/_Sort/by _mark"
 msgstr "/_Vaade/_Sorteeri/_märgi järgi"
 
-#: src/mainwindow.c:543
+#: src/mainwindow.c:534
 msgid "/_View/_Sort/by _unread"
 msgstr "/_Vaade/_Sorteeri/m_itteloetute järgi"
 
-#: src/mainwindow.c:544
+#: src/mainwindow.c:535
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/_Vaade/_Sorteeri/kirja_lisade järgi"
 
-#: src/mainwindow.c:546
+#: src/mainwindow.c:537
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/_Vaade/_Sorteeri/Ära sorteeri"
 
-#: src/mainwindow.c:547 src/mainwindow.c:550
+#: src/mainwindow.c:538 src/mainwindow.c:541
 msgid "/_View/_Sort/---"
 msgstr "/_Vaade/_Sorteeri/---"
 
-#: src/mainwindow.c:548
+#: src/mainwindow.c:539
 msgid "/_View/_Sort/Ascending"
 msgstr "/Vaade/_Sorteeri/Kasvavas järjekorras"
 
-#: src/mainwindow.c:549
+#: src/mainwindow.c:540
 msgid "/_View/_Sort/Descending"
 msgstr "/Vaade/_Sorteeri/Kahanevas järjekorras"
 
-#: src/mainwindow.c:551
+#: src/mainwindow.c:542
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/_Vaade/_Sorteeri/*'_Attract' subjekti järgi"
 
-#: src/mainwindow.c:553
+#: src/mainwindow.c:544
 msgid "/_View/Th_read view"
 msgstr "/_Vaade/Teema_vaade"
 
-#: src/mainwindow.c:554
+#: src/mainwindow.c:545
 msgid "/_View/E_xpand all threads"
 msgstr "/_Vaade/Paisuta kõik teemad"
 
-#: src/mainwindow.c:555
+#: src/mainwindow.c:546
 msgid "/_View/Co_llapse all threads"
 msgstr "/_Vaade/Sulge kõik teemad"
 
-#: src/mainwindow.c:556
+#: src/mainwindow.c:547
 msgid "/_View/Set display _item..."
 msgstr "/_Vaade/Mää_ra näidatavad parameetrid"
 
-#: src/mainwindow.c:559
+#: src/mainwindow.c:550
 msgid "/_View/_Go to"
 msgstr "/_Vaade/_Ava"
 
-#: src/mainwindow.c:560
+#: src/mainwindow.c:551
 msgid "/_View/_Go to/_Prev message"
 msgstr "/_Vaade/_Ava/Eelmine kiri"
 
-#: src/mainwindow.c:561
+#: src/mainwindow.c:552
 msgid "/_View/_Go to/_Next message"
 msgstr "/_Vaade/_Ava/Järgmine kiri"
 
-#: src/mainwindow.c:562 src/mainwindow.c:567 src/mainwindow.c:570
-#: src/mainwindow.c:575 src/mainwindow.c:580
+#: src/mainwindow.c:553 src/mainwindow.c:558 src/mainwindow.c:561
+#: src/mainwindow.c:566 src/mainwindow.c:571
 msgid "/_View/_Go to/---"
 msgstr "/_Vaade/_Ava/---"
 
-#: src/mainwindow.c:563
+#: src/mainwindow.c:554
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/_Vaade/_Ava/_Eelmine mitteloetud kiri"
 
-#: src/mainwindow.c:565
+#: src/mainwindow.c:556
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/_Vaade/_Ava/_Järgmine mitteloetud kiri"
 
-#: src/mainwindow.c:568
+#: src/mainwindow.c:559
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/_Vaade/Mine/Eelmisele uuele kirjale"
 
-#: src/mainwindow.c:569
+#: src/mainwindow.c:560
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/_Vaade/Mine/Järgmisele uuele kirjale"
 
-#: src/mainwindow.c:571
+#: src/mainwindow.c:562
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/_Vaade/_Ava/Eelmine _märgitud kiri"
 
-#: src/mainwindow.c:573
+#: src/mainwindow.c:564
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/_Vaade/_Ava/Järgmine m_ärgitud kiri"
 
-#: src/mainwindow.c:576
+#: src/mainwindow.c:567
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/_Vaade/_Ava/Eelmine _sildiga kiri"
 
-#: src/mainwindow.c:578
+#: src/mainwindow.c:569
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/_Vaade/_Ava/Jägmine s_ildiga kiri"
 
-#: src/mainwindow.c:581
+#: src/mainwindow.c:572
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Vaade/_Ava/Teine kaust..."
 
-#: src/mainwindow.c:590 src/messageview.c:158
+#: src/mainwindow.c:581 src/messageview.c:158
 #, fuzzy
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Vaade/_Kooditabel/Määra _Automaatselt"
 
-#: src/mainwindow.c:641 src/messageview.c:202
+#: src/mainwindow.c:632 src/messageview.c:202
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Vaade/_Kooditabel/Jaapan (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:643 src/messageview.c:204
+#: src/mainwindow.c:634 src/messageview.c:204
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Vaade/_Kooditabel/Jaapan (_EUC-JP)"
 
-#: src/mainwindow.c:645 src/messageview.c:206
+#: src/mainwindow.c:636 src/messageview.c:206
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Vaade/_Kooditabel/Jaapan (_Shift__JIS)"
 
-#: src/mainwindow.c:657 src/messageview.c:217
+#: src/mainwindow.c:648 src/messageview.c:217
 #, fuzzy
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Vaade/_Kooditabel/Hiina (ISO-2022-_CN)"
 
-#: src/mainwindow.c:663 src/messageview.c:222
+#: src/mainwindow.c:654 src/messageview.c:222
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Vaade/_Kooditabel/Korea (ISO-2022-KR)"
 
-#: src/mainwindow.c:676 src/summaryview.c:401
+#: src/mainwindow.c:667 src/summaryview.c:401
 msgid "/_View/Open in new _window"
 msgstr "/Vaade/Ava uues aknas"
 
-#: src/mainwindow.c:677 src/messageview.c:234
+#: src/mainwindow.c:668 src/messageview.c:234
 msgid "/_View/Mess_age source"
 msgstr "/_Vaade/Näita kirja lähtekoodi"
 
-#: src/mainwindow.c:678 src/messageview.c:235
+#: src/mainwindow.c:669 src/messageview.c:235
 msgid "/_View/Show all _header"
 msgstr "/_Vaade/Näita ko_gu päist"
 
-#: src/mainwindow.c:680
+#: src/mainwindow.c:671
 msgid "/_View/_Update summary"
 msgstr "/_Vaade/_Uuenda koond"
 
-#: src/mainwindow.c:682 src/messageview.c:237
+#: src/mainwindow.c:673 src/messageview.c:237
 msgid "/_Message"
 msgstr "/_Kiri"
 
-#: src/mainwindow.c:683
+#: src/mainwindow.c:674
 #, fuzzy
 msgid "/_Message/Recei_ve"
 msgstr "/_Kiri/Kirjuta _ümber"
 
-#: src/mainwindow.c:684
+#: src/mainwindow.c:675
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/_Kiri/Võta _kõigilt kontodelt"
 
-#: src/mainwindow.c:686
+#: src/mainwindow.c:677
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/_Kiri/Võta _kõigilt kontodelt"
 
-#: src/mainwindow.c:688
+#: src/mainwindow.c:679
 #, fuzzy
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/_Kiri/Katkesta kirjade võtmine"
 
-#: src/mainwindow.c:690
+#: src/mainwindow.c:681
 #, fuzzy
 msgid "/_Message/Recei_ve/---"
 msgstr "/_Kiri/Kirjuta _ümber"
 
-#: src/mainwindow.c:691
+#: src/mainwindow.c:682
 msgid "/_Message/_Send queued messages"
 msgstr "/_Kiri/_Saada järjekorras olevad kirjad"
 
-#: src/mainwindow.c:692 src/mainwindow.c:694 src/mainwindow.c:701
-#: src/mainwindow.c:706 src/mainwindow.c:710 src/mainwindow.c:719
-#: src/mainwindow.c:722 src/messageview.c:240 src/messageview.c:248
+#: src/mainwindow.c:683 src/mainwindow.c:685 src/mainwindow.c:692
+#: src/mainwindow.c:697 src/mainwindow.c:701 src/mainwindow.c:710
+#: src/mainwindow.c:713 src/messageview.c:240 src/messageview.c:248
 #: src/messageview.c:253
 msgid "/_Message/---"
 msgstr "/_Kiri/---"
 
-#: src/mainwindow.c:693 src/messageview.c:238
+#: src/mainwindow.c:684 src/messageview.c:238
 msgid "/_Message/Compose _new message"
 msgstr "/_Kiri/Uus k_iri"
 
-#: src/mainwindow.c:695 src/messageview.c:241
+#: src/mainwindow.c:686 src/messageview.c:241
 msgid "/_Message/_Reply"
 msgstr "/_Kiri/_Vasta"
 
-#: src/mainwindow.c:696
+#: src/mainwindow.c:687
 msgid "/_Message/Repl_y to"
 msgstr "/_Kiri/_Vasta"
 
-#: src/mainwindow.c:697 src/messageview.c:242
+#: src/mainwindow.c:688 src/messageview.c:242
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Kiri/Vasta/k_õigile"
 
-#: src/mainwindow.c:698 src/messageview.c:244
+#: src/mainwindow.c:689 src/messageview.c:244
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Kiri/Vas_ta/_saatjale"
 
-#: src/mainwindow.c:699 src/messageview.c:246
+#: src/mainwindow.c:690 src/messageview.c:246
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Kiri/Vasta/kirja _listi"
 
-#: src/mainwindow.c:702 src/messageview.c:249
+#: src/mainwindow.c:693 src/messageview.c:249
 msgid "/_Message/_Forward"
 msgstr "/_Kiri/Saada _edasi"
 
-#: src/mainwindow.c:703 src/messageview.c:250
+#: src/mainwindow.c:694 src/messageview.c:250
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Kiri/Saada edasi _manusena"
 
-#: src/mainwindow.c:705 src/messageview.c:252
+#: src/mainwindow.c:696 src/messageview.c:252
 msgid "/_Message/Redirec_t"
 msgstr "/_Kiri/Suuna _ümber"
 
-#: src/mainwindow.c:707
+#: src/mainwindow.c:698
 msgid "/_Message/M_ove..."
 msgstr "/_Kiri/_Nihuta..."
 
-#: src/mainwindow.c:708
+#: src/mainwindow.c:699
 msgid "/_Message/_Copy..."
 msgstr "/_Kiri/K_opeeri..."
 
-#: src/mainwindow.c:709
+#: src/mainwindow.c:700
 msgid "/_Message/_Delete"
 msgstr "/_Kiri/Kustuta"
 
-#: src/mainwindow.c:711
+#: src/mainwindow.c:702
 msgid "/_Message/_Mark"
 msgstr "/_Kiri/M_ärk"
 
-#: src/mainwindow.c:712
+#: src/mainwindow.c:703
 msgid "/_Message/_Mark/_Mark"
 msgstr "/_Kiri/M_ärk/M_ärgi"
 
-#: src/mainwindow.c:713
+#: src/mainwindow.c:704
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/_Kiri/M_ärk/_Eemaldan märgi"
 
-#: src/mainwindow.c:714
+#: src/mainwindow.c:705
 msgid "/_Message/_Mark/---"
 msgstr "/_Kiri/M_ärk/---"
 
-#: src/mainwindow.c:715
+#: src/mainwindow.c:706
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/_Kiri/M_ärk/Märgin _mitteloetuks"
 
-#: src/mainwindow.c:716
+#: src/mainwindow.c:707
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/_Kiri/M_ärk/Märgin _loetuks"
 
-#: src/mainwindow.c:718
+#: src/mainwindow.c:709
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/_Kiri/M_ärk/Märgin _kõik loetuks"
 
-#: src/mainwindow.c:720
+#: src/mainwindow.c:711
 #, fuzzy
 msgid "/_Message/Set as _junk mail"
 msgstr "/_Kiri/Võta _uued kirjad"
 
-#: src/mainwindow.c:721
+#: src/mainwindow.c:712
 #, fuzzy
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/_Kiri/Võta _uued kirjad"
 
-#: src/mainwindow.c:723 src/messageview.c:254
+#: src/mainwindow.c:714 src/messageview.c:254
 msgid "/_Message/Re-_edit"
 msgstr "/_Kiri/Kirjuta _ümber"
 
-#: src/mainwindow.c:727
+#: src/mainwindow.c:718
 #, fuzzy
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/_Tööriist/Lisa saatja aadressi raamatusse"
 
-#: src/mainwindow.c:730
+#: src/mainwindow.c:721
 #, fuzzy
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/_Tööriist/_Filtreeri kirjad"
 
-#: src/mainwindow.c:732
+#: src/mainwindow.c:723
 #, fuzzy
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Tööriist/_Filtreeri kirjad"
 
-#: src/mainwindow.c:734 src/messageview.c:261
+#: src/mainwindow.c:725 src/messageview.c:261
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Tööriist/Loo filtri reeglistik"
 
-#: src/mainwindow.c:735 src/messageview.c:263
+#: src/mainwindow.c:726 src/messageview.c:263
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Tööriist/Loo filtri reeglistik/Automaatselt"
 
-#: src/mainwindow.c:737 src/messageview.c:265
+#: src/mainwindow.c:728 src/messageview.c:265
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Tööriist/Loo filtri reeglistik/ kasutades Kellelt"
 
-#: src/mainwindow.c:739 src/messageview.c:267
+#: src/mainwindow.c:730 src/messageview.c:267
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Tööriist/Loo filtri reeglistik/kasutades Kellele"
 
-#: src/mainwindow.c:741 src/messageview.c:269
+#: src/mainwindow.c:732 src/messageview.c:269
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Tööriist/Loo filtri reeglistik/ kasutades päälkirja"
 
-#: src/mainwindow.c:744
+#: src/mainwindow.c:735
 #, fuzzy
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/_Tööriist/_Filtreeri kirjad"
 
-#: src/mainwindow.c:746
+#: src/mainwindow.c:737
 #, fuzzy
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/_Tööriist/_Filtreeri kirjad"
 
-#: src/mainwindow.c:751
+#: src/mainwindow.c:742
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/_Tööriist/_Kustuta topelt kirjad"
 
-#: src/mainwindow.c:754
+#: src/mainwindow.c:745
 msgid "/_Tools/E_xecute"
 msgstr "/_Tööriist/Käivita"
 
-#: src/mainwindow.c:756
+#: src/mainwindow.c:747
 msgid "/_Tools/_Log window"
 msgstr "/_Tööriist/_Teadete aken"
 
-#: src/mainwindow.c:758
+#: src/mainwindow.c:749
 msgid "/_Configuration"
 msgstr "/_Häälestus"
 
-#: src/mainwindow.c:759
+#: src/mainwindow.c:750
 msgid "/_Configuration/_Common preferences..."
 msgstr "/_Häälestus/_Üldised omadused..."
 
-#: src/mainwindow.c:761
+#: src/mainwindow.c:752
 msgid "/_Configuration/_Filter setting..."
 msgstr "/_Häälestus/_Filtri seaded..."
 
-#: src/mainwindow.c:763
+#: src/mainwindow.c:754
 msgid "/_Configuration/_Template..."
 msgstr "/_Häälestus/_Mall..."
 
-#: src/mainwindow.c:764
+#: src/mainwindow.c:755
 msgid "/_Configuration/_Actions..."
 msgstr "/_Häälestus/Tegevused..."
 
-#: src/mainwindow.c:765
+#: src/mainwindow.c:756
 msgid "/_Configuration/---"
 msgstr "/_Häälestus/---"
 
-#: src/mainwindow.c:766
+#: src/mainwindow.c:757
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Häälestus/_Hetkel kasutatava konto omadused..."
 
-#: src/mainwindow.c:768
+#: src/mainwindow.c:759
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Häälestus/_Loo uus konto..."
 
-#: src/mainwindow.c:770
+#: src/mainwindow.c:761
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Häälestus/_Redigeeri kontosid..."
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:763
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Häälestus/_Muuda kasutatavat kontot"
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:767
 msgid "/_Help/_Manual"
 msgstr "/_Abi/_Juhend"
 
-#: src/mainwindow.c:777
+#: src/mainwindow.c:768
 msgid "/_Help/_Manual/_English"
 msgstr "/_Abi/_Juhend/_Inglise"
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:769
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/_Abi/_Juhend/_Jaapani"
 
-#: src/mainwindow.c:779
+#: src/mainwindow.c:770
 msgid "/_Help/_FAQ"
 msgstr "/_Abi/_KKK"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:771
 msgid "/_Help/_FAQ/_English"
 msgstr "/_Abi/_KKK/_Inglise"
 
-#: src/mainwindow.c:781
+#: src/mainwindow.c:772
 msgid "/_Help/_FAQ/_German"
 msgstr "/_Abi/_KKK/_Saksa"
 
-#: src/mainwindow.c:782
+#: src/mainwindow.c:773
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/_Abi/_KKK/_Hispaania"
 
-#: src/mainwindow.c:783
+#: src/mainwindow.c:774
 msgid "/_Help/_FAQ/_French"
 msgstr "/_Abi/_KKK/_Prantsuse"
 
-#: src/mainwindow.c:784
+#: src/mainwindow.c:775
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/_Abi/_KKK/_Itaalia"
 
-#: src/mainwindow.c:785
+#: src/mainwindow.c:776
 msgid "/_Help/---"
 msgstr "/_Abi/---"
 
-#: src/mainwindow.c:825
+#: src/mainwindow.c:816
 msgid "Creating main window...\n"
 msgstr "Loon peamise akna...\n"
 
-#: src/mainwindow.c:987
+#: src/mainwindow.c:973
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "PeaAken: värvi haldamine %d ebaõnnestus\n"
 
-#: src/mainwindow.c:1071 src/summaryview.c:2020 src/summaryview.c:2105
+#: src/mainwindow.c:1057 src/summaryview.c:2020 src/summaryview.c:2105
 #: src/summaryview.c:3342 src/summaryview.c:3415 src/summaryview.c:3728
 msgid "done.\n"
 msgstr "tehtud.\n"
 
-#: src/mainwindow.c:1196 src/mainwindow.c:1237 src/mainwindow.c:1265
+#: src/mainwindow.c:1182 src/mainwindow.c:1223 src/mainwindow.c:1251
 msgid "Untitled"
 msgstr "Tiitlita"
 
-#: src/mainwindow.c:1266
+#: src/mainwindow.c:1252
 msgid "none"
 msgstr "mittemiski"
 
-#: src/mainwindow.c:1316
+#: src/mainwindow.c:1302
 #, 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:1536
+#: src/mainwindow.c:1522
 msgid "Offline"
 msgstr ""
 
-#: src/mainwindow.c:1537
+#: src/mainwindow.c:1523
 msgid "You are offline. Go online?"
 msgstr ""
 
-#: src/mainwindow.c:1551
+#: src/mainwindow.c:1537
 #, fuzzy
 msgid "Empty all trash"
 msgstr "Tühjenda prügikast"
 
-#: src/mainwindow.c:1552
+#: src/mainwindow.c:1538
 #, fuzzy
 msgid "Empty messages in all trash?"
 msgstr "Kas eemaldada kõik kirjad prügikastist?"
 
-#: src/mainwindow.c:1580
+#: src/mainwindow.c:1566
 msgid "Add mailbox"
 msgstr "Lisa kirjakast"
 
-#: src/mainwindow.c:1581
+#: src/mainwindow.c:1567
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3209,16 +3209,16 @@ msgstr ""
 "Sisesta kirjakasti asukoht.\n"
 "Kui määrate juba olemasoleva kirjakasti, siis seeskaneeritakse automaatselt."
 
-#: src/mainwindow.c:1587
+#: src/mainwindow.c:1573
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Kirjakast %s on juba olemas."
 
-#: src/mainwindow.c:1592 src/setup.c:57
+#: src/mainwindow.c:1578 src/setup.c:57
 msgid "Mailbox"
 msgstr "Kirjakast"
 
-#: src/mainwindow.c:1598 src/setup.c:63
+#: src/mainwindow.c:1584 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3227,153 +3227,153 @@ msgstr ""
 "Kirjakasti loomine ebaõnnestus.\n"
 "Võibolla mõned failid on olemas, või teil pole õigusi sinna kirjutamiseks."
 
-#: src/mainwindow.c:1989
+#: src/mainwindow.c:1975
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - kausta vaade"
 
-#: src/mainwindow.c:2009 src/messageview.c:368
+#: src/mainwindow.c:1995 src/messageview.c:368
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - kirja vaade"
 
-#: src/mainwindow.c:2156 src/summaryview.c:370
+#: src/mainwindow.c:2142 src/summaryview.c:370
 msgid "/_Reply"
 msgstr "/Vastan"
 
-#: src/mainwindow.c:2157
+#: src/mainwindow.c:2143
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "Vasta ja saada koopia kõigile, kes said selle kirja"
 
-#: src/mainwindow.c:2158
+#: src/mainwindow.c:2144
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/Vasta/_saatjale"
 
-#: src/mainwindow.c:2159
+#: src/mainwindow.c:2145
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/Vasta/kirja_listi"
 
-#: src/mainwindow.c:2164 src/summaryview.c:377
+#: src/mainwindow.c:2150 src/summaryview.c:377
 msgid "/_Forward"
 msgstr "/Saadan edasi"
 
-#: src/mainwindow.c:2165 src/summaryview.c:378
+#: src/mainwindow.c:2151 src/summaryview.c:378
 msgid "/For_ward as attachment"
 msgstr "/Saada edasi manusena"
 
-#: src/mainwindow.c:2166 src/summaryview.c:379
+#: src/mainwindow.c:2152 src/summaryview.c:379
 msgid "/Redirec_t"
 msgstr "/Suuna ümber"
 
-#: src/mainwindow.c:2205
+#: src/mainwindow.c:2188
 msgid "Get"
 msgstr "Võta"
 
-#: src/mainwindow.c:2206
+#: src/mainwindow.c:2189
 msgid "Incorporate new mail"
 msgstr "Võta uued kirjad"
 
-#: src/mainwindow.c:2213
+#: src/mainwindow.c:2196
 msgid "Get all"
 msgstr "Võta kõik"
 
-#: src/mainwindow.c:2214
+#: src/mainwindow.c:2197
 msgid "Incorporate new mail of all accounts"
 msgstr "Võta kõigilt kontodelt uued kirjad"
 
-#: src/mainwindow.c:2225
+#: src/mainwindow.c:2208
 msgid "Send queued message(s)"
 msgstr "Saada kirjad järjekorrast"
 
-#: src/mainwindow.c:2235 src/prefs_account.c:721 src/prefs_common.c:949
+#: src/mainwindow.c:2218 src/prefs_account.c:721 src/prefs_common.c:949
 #: src/prefs_folder_item.c:137
 msgid "Compose"
 msgstr "Kirjuta"
 
-#: src/mainwindow.c:2236
+#: src/mainwindow.c:2219
 msgid "Compose new message"
 msgstr "Kirjuta uus kiri"
 
-#: src/mainwindow.c:2244 src/prefs_common.c:1448
+#: src/mainwindow.c:2227 src/prefs_common.c:1448
 msgid "Reply"
 msgstr "Vasta"
 
-#: src/mainwindow.c:2245 src/mainwindow.c:2258
+#: src/mainwindow.c:2228 src/mainwindow.c:2241
 msgid "Reply to the message"
 msgstr "Vasta kirjale"
 
-#: src/mainwindow.c:2263
+#: src/mainwindow.c:2245
 msgid "Reply all"
 msgstr "Vasta ja"
 
-#: src/mainwindow.c:2264
+#: src/mainwindow.c:2246
 msgid "Reply to all"
 msgstr "Vasta ja saada koopia kõigile, kes said selle kirja"
 
-#: src/mainwindow.c:2272 src/prefs_filter_edit.c:741
+#: src/mainwindow.c:2254 src/prefs_filter_edit.c:741
 msgid "Forward"
 msgstr "Edasta"
 
-#: src/mainwindow.c:2273 src/mainwindow.c:2286
+#: src/mainwindow.c:2255 src/mainwindow.c:2268
 msgid "Forward the message"
 msgstr "Saada kiri edasi"
 
-#: src/mainwindow.c:2293
+#: src/mainwindow.c:2275
 msgid "Delete the message"
 msgstr "Kustuta kiri"
 
-#: src/mainwindow.c:2301 src/prefs_common.c:1988
+#: src/mainwindow.c:2283 src/prefs_common.c:1988
 msgid "Junk"
 msgstr ""
 
-#: src/mainwindow.c:2302
+#: src/mainwindow.c:2284
 #, fuzzy
 msgid "Set as junk mail"
 msgstr " Määra vaikimisi kontoks "
 
-#: src/mainwindow.c:2311
+#: src/mainwindow.c:2293
 msgid "Execute"
 msgstr "Käivita"
 
-#: src/mainwindow.c:2312
+#: src/mainwindow.c:2294
 msgid "Execute marked process"
 msgstr "Käivita märgitud protsess"
 
-#: src/mainwindow.c:2322
+#: src/mainwindow.c:2304
 msgid "Next unread message"
 msgstr "Järgmine kiri mida pole loetud"
 
-#: src/mainwindow.c:2334
+#: src/mainwindow.c:2316
 msgid "Prefs"
 msgstr "Seaded"
 
-#: src/mainwindow.c:2335
+#: src/mainwindow.c:2317
 msgid "Common preferences"
 msgstr "Üldised omaduse"
 
-#: src/mainwindow.c:2343 src/prefs_folder_item.c:261
+#: src/mainwindow.c:2325 src/prefs_folder_item.c:261
 #: src/prefs_folder_item.c:272 src/progressdialog.c:128
 msgid "Account"
 msgstr "Konto"
 
-#: src/mainwindow.c:2344
+#: src/mainwindow.c:2326
 msgid "Account setting"
 msgstr "Konto seaded"
 
-#: src/mainwindow.c:2527
+#: src/mainwindow.c:2498
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 
-#: src/mainwindow.c:2538
+#: src/mainwindow.c:2509
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 
-#: src/mainwindow.c:2731
+#: src/mainwindow.c:2702
 msgid "Exit"
 msgstr "Välju"
 
-#: src/mainwindow.c:2731
+#: src/mainwindow.c:2702
 msgid "Exit this program?"
 msgstr "Lõpetame programmi töö."
 
@@ -5616,11 +5616,11 @@ msgstr "Loon progressi dialoogi...\n"
 msgid "Status"
 msgstr "Staatus"
 
-#: src/recv.c:113
+#: src/recv.c:112
 msgid "error occurred while retrieving data.\n"
 msgstr "tekkis viga andmete võtmisel.\n"
 
-#: src/recv.c:155 src/recv.c:197 src/recv.c:213
+#: src/recv.c:154 src/recv.c:196 src/recv.c:211
 msgid "Can't write to file.\n"
 msgstr "Ei saa kirjutada faili.\n"
 
@@ -6361,7 +6361,7 @@ msgstr ""
 msgid "%.2fGB"
 msgstr ""
 
-#: src/utils.c:2372 src/utils.c:2496
+#: src/utils.c:2386 src/utils.c:2510
 #, c-format
 msgid "writing to %s failed.\n"
 msgstr "%s-i kirjutamine ebaõnnestus.\n"
diff --git a/po/fr.po b/po/fr.po
index 98fa53d7..96f54911 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-08-09 18:08+0900\n"
+"POT-Creation-Date: 2005-08-22 17:22+0900\n"
 "PO-Revision-Date: 2005-08-08 23:57+0100\n"
 "Last-Translator: Nicolas Boos <nicolas.boos@wanadoo.fr>\n"
 "Language-Team: French <traduc@traduc.org>\n"
@@ -105,7 +105,7 @@ msgstr ""
 "correspondant lorsque « Tout relever » est activé"
 
 #: src/account.c:691 src/addressadd.c:192 src/addressbook.c:490
-#: src/compose.c:4081 src/editaddress.c:200 src/editaddress.c:942
+#: src/compose.c:4079 src/editaddress.c:200 src/editaddress.c:942
 #: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:265
 #: src/editjpilot.c:271 src/editldap.c:307 src/editvcard.c:184
 #: src/mimeview.c:201 src/prefs_filter.c:258 src/prefs_folder_item.c:170
@@ -241,7 +241,7 @@ msgstr "Argument de l'action"
 msgid "Add Address to Book"
 msgstr "Ajouter l'adresse au carnet"
 
-#: src/addressadd.c:202 src/compose.c:4528 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4521 src/editaddress.c:201
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "Adresse"
@@ -255,7 +255,7 @@ msgstr "Remarques"
 msgid "Select Address Book Folder"
 msgstr "Choisissez un dossier"
 
-#: src/addressbook.c:336 src/compose.c:495 src/mainwindow.c:470
+#: src/addressbook.c:336 src/compose.c:493 src/mainwindow.c:461
 #: src/messageview.c:137
 msgid "/_File"
 msgstr "/_Fichier"
@@ -276,10 +276,10 @@ msgstr "/_Fichier/Nouveau carnet _JPilot"
 msgid "/_File/New _Server"
 msgstr "/_Fichier/Nouveau _serveur LDAP"
 
-#: src/addressbook.c:345 src/addressbook.c:348 src/compose.c:500
-#: src/compose.c:505 src/compose.c:509 src/mainwindow.c:488
-#: src/mainwindow.c:491 src/mainwindow.c:493 src/mainwindow.c:496
-#: src/mainwindow.c:498 src/messageview.c:140
+#: src/addressbook.c:345 src/addressbook.c:348 src/compose.c:498
+#: src/compose.c:503 src/compose.c:507 src/mainwindow.c:479
+#: src/mainwindow.c:482 src/mainwindow.c:484 src/mainwindow.c:487
+#: src/mainwindow.c:489 src/messageview.c:140
 msgid "/_File/---"
 msgstr "/_Fichier/---"
 
@@ -295,7 +295,7 @@ msgstr "/_Fichier/_Supprimer"
 msgid "/_File/_Save"
 msgstr "/_Fichier/En_registrer"
 
-#: src/addressbook.c:350 src/compose.c:510 src/messageview.c:141
+#: src/addressbook.c:350 src/compose.c:508 src/messageview.c:141
 msgid "/_File/_Close"
 msgstr "/_Fichier/_Fermer"
 
@@ -327,7 +327,7 @@ msgstr "/_Adresse/Édit_er"
 msgid "/_Address/_Delete"
 msgstr "/_Adresse/_Supprimer"
 
-#: src/addressbook.c:358 src/compose.c:619 src/mainwindow.c:725
+#: src/addressbook.c:358 src/compose.c:617 src/mainwindow.c:716
 #: src/messageview.c:256
 msgid "/_Tools"
 msgstr "/_Outils"
@@ -336,12 +336,12 @@ msgstr "/_Outils"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Outils/Importer un fichier _LDIF"
 
-#: src/addressbook.c:360 src/compose.c:632 src/mainwindow.c:775
+#: src/addressbook.c:360 src/compose.c:630 src/mainwindow.c:766
 #: src/messageview.c:274
 msgid "/_Help"
 msgstr "/A_ide"
 
-#: src/addressbook.c:361 src/compose.c:633 src/mainwindow.c:786
+#: src/addressbook.c:361 src/compose.c:631 src/mainwindow.c:777
 #: src/messageview.c:275
 msgid "/_Help/_About"
 msgstr "/A_ide/À _propos"
@@ -358,7 +358,7 @@ msgstr "/Nouveau _groupe"
 msgid "/New _Folder"
 msgstr "/Nouveau _dossier"
 
-#: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:489
+#: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:487
 #: src/folderview.c:235 src/folderview.c:237 src/folderview.c:241
 #: src/folderview.c:252 src/folderview.c:254 src/folderview.c:256
 #: src/folderview.c:260 src/folderview.c:270 src/folderview.c:272
@@ -368,8 +368,8 @@ msgstr "/Nouveau _dossier"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:512
-#: src/mainwindow.c:502 src/messageview.c:143
+#: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:510
+#: src/mainwindow.c:493 src/messageview.c:143
 msgid "/_Edit"
 msgstr "/É_dition"
 
@@ -381,7 +381,7 @@ msgstr "/_Supprimer"
 msgid "E-Mail address"
 msgstr "Adresse électronique"
 
-#: src/addressbook.c:495 src/compose.c:4529 src/prefs_common.c:2402
+#: src/addressbook.c:495 src/compose.c:4522 src/prefs_common.c:2402
 msgid "Address book"
 msgstr "Carnet d'adresses"
 
@@ -390,8 +390,8 @@ msgid "Name:"
 msgstr "Nom :"
 
 #. Buttons
-#: src/addressbook.c:627 src/addressbook.c:1673 src/editaddress.c:884
-#: src/editaddress.c:1017 src/mainwindow.c:2292 src/prefs_actions.c:266
+#: src/addressbook.c:627 src/addressbook.c:1674 src/editaddress.c:884
+#: src/editaddress.c:1017 src/mainwindow.c:2274 src/prefs_actions.c:266
 #: src/prefs_display_header.c:278 src/prefs_display_header.c:333
 #: src/prefs_template.c:231
 msgid "Delete"
@@ -430,7 +430,7 @@ msgstr "Suppression d'adresse(s)"
 msgid "Really delete the address(es)?"
 msgstr "Voulez-vous supprimer la(les) adresse(s) sélectionnée(s) ?"
 
-#: src/addressbook.c:1664
+#: src/addressbook.c:1665
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -440,37 +440,37 @@ msgstr ""
 "Si vous supprimez uniquement le dossier, les adresses seront déplacées dans "
 "le dossier parent."
 
-#: src/addressbook.c:1667 src/folderview.c:2139
+#: src/addressbook.c:1668 src/folderview.c:2139
 msgid "Delete folder"
 msgstr "Suppression de dossier"
 
-#: src/addressbook.c:1667
+#: src/addressbook.c:1668
 msgid "_Folder only"
 msgstr "_Dossier uniquement"
 
-#: src/addressbook.c:1667
+#: src/addressbook.c:1668
 msgid "Folder and _addresses"
 msgstr "Dossier et _adresses"
 
-#: src/addressbook.c:1672
+#: src/addressbook.c:1673
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Voulez-vous vraiment supprimer « %s » ?"
 
-#: src/addressbook.c:2352 src/addressbook.c:2485
+#: src/addressbook.c:2353 src/addressbook.c:2486
 msgid "New user, could not save index file."
 msgstr "Nouvel utilisateur. Impossible d'enregistrer le fichier index."
 
-#: src/addressbook.c:2356 src/addressbook.c:2489
+#: src/addressbook.c:2357 src/addressbook.c:2490
 msgid "New user, could not save address book files."
 msgstr ""
 "Nouvel utilisateur, impossible d'enregistrer le fichier carnet d'adresses."
 
-#: src/addressbook.c:2366 src/addressbook.c:2499
+#: src/addressbook.c:2367 src/addressbook.c:2500
 msgid "Old address book converted successfully."
 msgstr "Ancien carnet d'adresses converti avec succès."
 
-#: src/addressbook.c:2371
+#: src/addressbook.c:2372
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -478,7 +478,7 @@ msgstr ""
 "Ancien carnet d'adresses converti,\n"
 "mais impossible d'enregistrer le nouveau fichier index."
 
-#: src/addressbook.c:2384
+#: src/addressbook.c:2385
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -486,7 +486,7 @@ msgstr ""
 "Échec lors de la conversion de l'ancien carnet d'adresses.\n"
 "Création d'un nouveau carnet d'adresses vide."
 
-#: src/addressbook.c:2390
+#: src/addressbook.c:2391
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -494,7 +494,7 @@ msgstr ""
 "Échec lors de la conversion du carnet d'adresses.\n"
 "Impossible de créer un nouveau carnet d'adresses vide."
 
-#: src/addressbook.c:2395
+#: src/addressbook.c:2396
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -502,91 +502,91 @@ msgstr ""
 "Échec lors de la conversion du carnet d'adresses\n"
 "et lors de la création d'un nouveau carnet d'adresses."
 
-#: src/addressbook.c:2402
+#: src/addressbook.c:2403
 msgid "Addressbook conversion error"
 msgstr "Erreur de conversion du carnet d'adresses"
 
-#: src/addressbook.c:2406
+#: src/addressbook.c:2407
 msgid "Addressbook conversion"
 msgstr "Conversion de carnets d'adresses"
 
-#: src/addressbook.c:2441
+#: src/addressbook.c:2442
 msgid "Addressbook Error"
 msgstr "Erreur dans le carnet d'adresses"
 
-#: src/addressbook.c:2442 src/addressbook.c:2542
+#: src/addressbook.c:2443 src/addressbook.c:2543
 msgid "Could not read address index"
 msgstr "Échec lors de la lecture de l'index des adresses"
 
-#: src/addressbook.c:2504
+#: src/addressbook.c:2505
 msgid "Old address book converted, could not save new address index file"
 msgstr ""
 "Ancien carnet d'adresses converti, mais échec lors de l'écriture du fichier "
 "index"
 
-#: src/addressbook.c:2518
+#: src/addressbook.c:2519
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr ""
 "Échec lors de la conversion du carnet d'adresses. Création d'un nouveau "
 "carnet d'adresses vide."
 
-#: src/addressbook.c:2524
+#: src/addressbook.c:2525
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr ""
 "Échec lors de la conversion du carnet d'adresses et lors de la création d'un "
 "nouveau carnet d'adresses vide."
 
-#: src/addressbook.c:2530
+#: src/addressbook.c:2531
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr ""
 "Échec lors de la conversion du carnet d'adresses et lors de la création d'un "
 "nouveau carnet d'adresses vide."
 
-#: src/addressbook.c:2548
+#: src/addressbook.c:2549
 msgid "Addressbook Conversion Error"
 msgstr "Erreur de conversion du carnet d'adresses"
 
-#: src/addressbook.c:2554
+#: src/addressbook.c:2555
 msgid "Addressbook Conversion"
 msgstr "Conversion de carnets d'adresses"
 
-#: src/addressbook.c:3055 src/prefs_common.c:963
+#: src/addressbook.c:3056 src/prefs_common.c:963
 msgid "Interface"
 msgstr "Interface"
 
-#: src/addressbook.c:3071 src/importldif.c:514
+#: src/addressbook.c:3072 src/importldif.c:514
 msgid "Address Book"
 msgstr "Carnet d'adresses"
 
-#: src/addressbook.c:3087
+#: src/addressbook.c:3088
 msgid "Person"
 msgstr "Personne"
 
-#: src/addressbook.c:3103
+#: src/addressbook.c:3104
 msgid "EMail Address"
 msgstr "Adresse électronique"
 
-#: src/addressbook.c:3119
+#: src/addressbook.c:3120
 msgid "Group"
 msgstr "Groupe"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3135 src/folderview.c:346 src/prefs_account.c:1866
+#: src/addressbook.c:3136 src/folderview.c:346 src/prefs_account.c:1866
 msgid "Folder"
 msgstr "Dossier"
 
-#: src/addressbook.c:3151
+#: src/addressbook.c:3152
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3167 src/addressbook.c:3183
+#: src/addressbook.c:3168 src/addressbook.c:3184
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3199
+#: src/addressbook.c:3200
 msgid "LDAP Server"
 msgstr "Serveur LDAP"
 
@@ -598,7 +598,7 @@ msgstr "Adresse courante :"
 msgid "Personal address"
 msgstr "Adresse personnelle :"
 
-#: src/alertpanel.c:138 src/compose.c:5214 src/main.c:515
+#: src/alertpanel.c:138 src/compose.c:5208 src/main.c:515
 msgid "Notice"
 msgstr "Information"
 
@@ -653,349 +653,349 @@ msgstr "Brun"
 msgid "None"
 msgstr "Aucun"
 
-#: src/compose.c:487
+#: src/compose.c:485
 msgid "/_Add..."
 msgstr "/_Ajouter..."
 
-#: src/compose.c:488
+#: src/compose.c:486
 msgid "/_Remove"
 msgstr "/_Enlever"
 
-#: src/compose.c:490 src/folderview.c:243 src/folderview.c:262
+#: src/compose.c:488 src/folderview.c:243 src/folderview.c:262
 #: src/folderview.c:277
 msgid "/_Properties..."
 msgstr "/_Propriétés..."
 
-#: src/compose.c:496
+#: src/compose.c:494
 msgid "/_File/_Send"
 msgstr "/_Fichier/_Envoyer"
 
-#: src/compose.c:498
+#: src/compose.c:496
 msgid "/_File/Send _later"
 msgstr "/_Fichier/Envoyer _plus tard"
 
-#: src/compose.c:501
+#: src/compose.c:499
 msgid "/_File/Save to _draft folder"
 msgstr "/_Fichier/Enregistrer parmi les _brouillons"
 
-#: src/compose.c:503
+#: src/compose.c:501
 msgid "/_File/Save and _keep editing"
 msgstr "/_Fichier/Enregistrer et _poursuivre la composition"
 
-#: src/compose.c:506
+#: src/compose.c:504
 msgid "/_File/_Attach file"
 msgstr "/_Fichier/_Joindre un fichier"
 
-#: src/compose.c:507
+#: src/compose.c:505
 msgid "/_File/_Insert file"
 msgstr "/_Fichier/_Insérer un fichier"
 
-#: src/compose.c:508
+#: src/compose.c:506
 msgid "/_File/Insert si_gnature"
 msgstr "/_Fichier/Insérer la si_gnature"
 
-#: src/compose.c:513
+#: src/compose.c:511
 msgid "/_Edit/_Undo"
 msgstr "/É_dition/_Annuler"
 
-#: src/compose.c:514
+#: src/compose.c:512
 msgid "/_Edit/_Redo"
 msgstr "/É_dition/_Refaire"
 
-#: src/compose.c:515 src/compose.c:522 src/mainwindow.c:506
+#: src/compose.c:513 src/compose.c:520 src/mainwindow.c:497
 #: src/messageview.c:146
 msgid "/_Edit/---"
 msgstr "/É_dition/---"
 
-#: src/compose.c:516
+#: src/compose.c:514
 msgid "/_Edit/Cu_t"
 msgstr "/É_dition/Co_uper"
 
-#: src/compose.c:517 src/mainwindow.c:503 src/messageview.c:144
+#: src/compose.c:515 src/mainwindow.c:494 src/messageview.c:144
 msgid "/_Edit/_Copy"
 msgstr "/É_dition/_Copier"
 
-#: src/compose.c:518
+#: src/compose.c:516
 msgid "/_Edit/_Paste"
 msgstr "/É_dition/Co_ller"
 
-#: src/compose.c:519
+#: src/compose.c:517
 msgid "/_Edit/Paste as _quotation"
 msgstr "/É_dition/Coller comme ci_tation"
 
-#: src/compose.c:521 src/mainwindow.c:504 src/messageview.c:145
+#: src/compose.c:519 src/mainwindow.c:495 src/messageview.c:145
 msgid "/_Edit/Select _all"
 msgstr "/É_dition/Tout sélectio_nner"
 
-#: src/compose.c:523
+#: src/compose.c:521
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/É_dition/Justifier le _paragraphe actuel"
 
-#: src/compose.c:525
+#: src/compose.c:523
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/É_dition/Justifier tout le _message"
 
-#: src/compose.c:527
+#: src/compose.c:525
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/É_dition/Justification aut_omatique"
 
-#: src/compose.c:528 src/mainwindow.c:511 src/messageview.c:150
+#: src/compose.c:526 src/mainwindow.c:502 src/messageview.c:150
 #: src/summaryview.c:400
 msgid "/_View"
 msgstr "/_Affichage"
 
-#: src/compose.c:529
+#: src/compose.c:527
 msgid "/_View/_To"
 msgstr "/_Affichage/À"
 
-#: src/compose.c:530
+#: src/compose.c:528
 msgid "/_View/_Cc"
 msgstr "/_Affichage/_Copie"
 
-#: src/compose.c:531
+#: src/compose.c:529
 msgid "/_View/_Bcc"
 msgstr "/_Affichage/Copie _discrète"
 
-#: src/compose.c:532
+#: src/compose.c:530
 msgid "/_View/_Reply to"
 msgstr "/_Affichage/_Répondre à"
 
-#: src/compose.c:533 src/compose.c:535 src/compose.c:537 src/compose.c:539
-#: src/mainwindow.c:529 src/mainwindow.c:532 src/mainwindow.c:558
-#: src/mainwindow.c:582 src/mainwindow.c:675 src/mainwindow.c:679
+#: src/compose.c:531 src/compose.c:533 src/compose.c:535 src/compose.c:537
+#: src/mainwindow.c:520 src/mainwindow.c:523 src/mainwindow.c:549
+#: src/mainwindow.c:573 src/mainwindow.c:666 src/mainwindow.c:670
 #: src/messageview.c:233
 msgid "/_View/---"
 msgstr "/_Affichage/---"
 
-#: src/compose.c:534
+#: src/compose.c:532
 msgid "/_View/_Followup to"
 msgstr "/_Affichage/_Faire suivre à"
 
-#: src/compose.c:536
+#: src/compose.c:534
 msgid "/_View/R_uler"
 msgstr "/_Affichage/_Afficher une règle"
 
-#: src/compose.c:538
+#: src/compose.c:536
 msgid "/_View/_Attachment"
 msgstr "/_Affichage/_Pièce(s) jointe(s)"
 
-#: src/compose.c:545 src/mainwindow.c:589 src/messageview.c:157
+#: src/compose.c:543 src/mainwindow.c:580 src/messageview.c:157
 msgid "/_View/Character _encoding"
 msgstr "/_Affichage/_Jeu de caractères"
 
-#: src/compose.c:546
+#: src/compose.c:544
 msgid "/_View/Character _encoding/_Automatic"
 msgstr "/_Affichage/_Jeu de caractères/_Automatique"
 
-#: src/compose.c:548 src/compose.c:554 src/compose.c:560 src/compose.c:564
-#: src/compose.c:570 src/compose.c:574 src/compose.c:580 src/compose.c:584
-#: src/compose.c:594 src/compose.c:598 src/compose.c:608 src/compose.c:612
-#: src/mainwindow.c:585 src/mainwindow.c:592 src/messageview.c:153
+#: src/compose.c:546 src/compose.c:552 src/compose.c:558 src/compose.c:562
+#: src/compose.c:568 src/compose.c:572 src/compose.c:578 src/compose.c:582
+#: src/compose.c:592 src/compose.c:596 src/compose.c:606 src/compose.c:610
+#: src/mainwindow.c:576 src/mainwindow.c:583 src/messageview.c:153
 msgid "/_View/Character _encoding/---"
 msgstr "/_Affichage/_Jeu de caractères/---"
 
-#: src/compose.c:550 src/mainwindow.c:593 src/messageview.c:161
+#: src/compose.c:548 src/mainwindow.c:584 src/messageview.c:161
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Affichage/_Jeu de caractères/ASCII 7 bits (US-ASC_II)"
 
-#: src/compose.c:552 src/mainwindow.c:595 src/messageview.c:164
+#: src/compose.c:550 src/mainwindow.c:586 src/messageview.c:164
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Affichage/_Jeu de caractères/Unicode (_UTF-8)"
 
-#: src/compose.c:556 src/mainwindow.c:599 src/messageview.c:167
+#: src/compose.c:554 src/mainwindow.c:590 src/messageview.c:167
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Affichage/_Jeu de caractères/Europe occidentale (ISO-8859-_1)"
 
-#: src/compose.c:558 src/mainwindow.c:601 src/messageview.c:169
+#: src/compose.c:556 src/mainwindow.c:592 src/messageview.c:169
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Affichage/_Jeu de caractères/Europe occidentale (ISO-8859-15)"
 
-#: src/compose.c:562 src/mainwindow.c:605 src/messageview.c:172
+#: src/compose.c:560 src/mainwindow.c:596 src/messageview.c:172
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Affichage/_Jeu de caractères/Europe centrale (ISO-8859-_2)"
 
-#: src/compose.c:566 src/mainwindow.c:609 src/messageview.c:175
+#: src/compose.c:564 src/mainwindow.c:600 src/messageview.c:175
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Affichage/_Jeu de caractères/_Baltique (ISO-8859-13)"
 
-#: src/compose.c:568 src/mainwindow.c:611 src/messageview.c:177
+#: src/compose.c:566 src/mainwindow.c:602 src/messageview.c:177
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Affichage/_Jeu de caractères/Europe du Nord (ISO-8859-_4)"
 
-#: src/compose.c:572 src/mainwindow.c:615 src/messageview.c:180
+#: src/compose.c:570 src/mainwindow.c:606 src/messageview.c:180
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Affichage/_Jeu de caractères/Grec (ISO-8859-_7)"
 
-#: src/compose.c:576 src/mainwindow.c:619 src/messageview.c:183
+#: src/compose.c:574 src/mainwindow.c:610 src/messageview.c:183
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Affichage/_Jeu de caractères/Hébreu (ISO-8859-_8)"
 
-#: src/compose.c:578 src/mainwindow.c:621 src/messageview.c:185
+#: src/compose.c:576 src/mainwindow.c:612 src/messageview.c:185
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Affichage/_Jeu de caractères/Hébreu (Windows-1255)"
 
-#: src/compose.c:582 src/mainwindow.c:625 src/messageview.c:188
+#: src/compose.c:580 src/mainwindow.c:616 src/messageview.c:188
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Affichage/_Jeu de caractères/Turc (ISO-8859-_9)"
 
-#: src/compose.c:586 src/mainwindow.c:629 src/messageview.c:191
+#: src/compose.c:584 src/mainwindow.c:620 src/messageview.c:191
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Affichage/_Jeu de caractères/Cyrillique (ISO-8859-_5)"
 
-#: src/compose.c:588 src/mainwindow.c:631 src/messageview.c:193
+#: src/compose.c:586 src/mainwindow.c:622 src/messageview.c:193
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Affichage/_Jeu de caractères/Cyrillique (KOI8-_R)"
 
-#: src/compose.c:590 src/mainwindow.c:633 src/messageview.c:195
+#: src/compose.c:588 src/mainwindow.c:624 src/messageview.c:195
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Affichage/_Jeu de caractères/Cyrillique (KOI8-U)"
 
-#: src/compose.c:592 src/mainwindow.c:635 src/messageview.c:197
+#: src/compose.c:590 src/mainwindow.c:626 src/messageview.c:197
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Affichage/_Jeu de caractères/Cyrillique (Windows-1251)"
 
-#: src/compose.c:596 src/mainwindow.c:639 src/messageview.c:200
+#: src/compose.c:594 src/mainwindow.c:630 src/messageview.c:200
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Affichage/_Jeu de caractères/Japonais (ISO-2022-_JP)"
 
-#: src/compose.c:600 src/mainwindow.c:649 src/messageview.c:209
+#: src/compose.c:598 src/mainwindow.c:640 src/messageview.c:209
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Affichage/_Jeu de caractères/Chinois simplifié (_GB2312)"
 
-#: src/compose.c:602 src/mainwindow.c:651 src/messageview.c:211
+#: src/compose.c:600 src/mainwindow.c:642 src/messageview.c:211
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Affichage/_Jeu de caractères/Chinois simplifié (GBK)"
 
-#: src/compose.c:604 src/mainwindow.c:653 src/messageview.c:213
+#: src/compose.c:602 src/mainwindow.c:644 src/messageview.c:213
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Affichage/_Jeu de caractères/Chinois traditionnel (_Big5)"
 
-#: src/compose.c:606 src/mainwindow.c:655 src/messageview.c:215
+#: src/compose.c:604 src/mainwindow.c:646 src/messageview.c:215
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Affichage/_Jeu de caractères/Chinois traditionnel (EUC-_TW)"
 
-#: src/compose.c:610 src/mainwindow.c:661 src/messageview.c:220
+#: src/compose.c:608 src/mainwindow.c:652 src/messageview.c:220
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Affichage/_Jeu de caractères/Coréen (EUC-_KR)"
 
-#: src/compose.c:614 src/mainwindow.c:667 src/messageview.c:225
+#: src/compose.c:612 src/mainwindow.c:658 src/messageview.c:225
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Affichage/_Jeu de caractères/Thaï (TIS-620)"
 
-#: src/compose.c:616 src/mainwindow.c:669 src/messageview.c:227
+#: src/compose.c:614 src/mainwindow.c:660 src/messageview.c:227
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Affichage/_Jeu de caractères/Thaï (Windows-874)"
 
-#: src/compose.c:620 src/mainwindow.c:726 src/messageview.c:257
+#: src/compose.c:618 src/mainwindow.c:717 src/messageview.c:257
 msgid "/_Tools/_Address book"
 msgstr "/_Outils/_Carnet d'adresses"
 
-#: src/compose.c:621
+#: src/compose.c:619
 msgid "/_Tools/_Template"
 msgstr "/_Outils/_Modèle"
 
-#: src/compose.c:622 src/mainwindow.c:749 src/messageview.c:272
+#: src/compose.c:620 src/mainwindow.c:740 src/messageview.c:272
 msgid "/_Tools/Actio_ns"
 msgstr "/_Outils/_Actions"
 
-#: src/compose.c:623 src/compose.c:627 src/mainwindow.c:729
-#: src/mainwindow.c:743 src/mainwindow.c:748 src/mainwindow.c:750
-#: src/mainwindow.c:753 src/mainwindow.c:755 src/messageview.c:260
+#: src/compose.c:621 src/compose.c:625 src/mainwindow.c:720
+#: src/mainwindow.c:734 src/mainwindow.c:739 src/mainwindow.c:741
+#: src/mainwindow.c:744 src/mainwindow.c:746 src/messageview.c:260
 #: src/messageview.c:271
 msgid "/_Tools/---"
 msgstr "/_Outils/---"
 
-#: src/compose.c:624
+#: src/compose.c:622
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/_Outils/Modifier avec un éditeur e_xterne"
 
-#: src/compose.c:628
+#: src/compose.c:626
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Outils/_Signer"
 
-#: src/compose.c:629
+#: src/compose.c:627
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/_Outils/_Chiffrer"
 
-#: src/compose.c:855
+#: src/compose.c:853
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s : le fichier n'existe pas\n"
 
-#: src/compose.c:954 src/compose.c:1024 src/procmsg.c:1353
+#: src/compose.c:952 src/compose.c:1022 src/procmsg.c:1353
 msgid "Can't get text part\n"
 msgstr "Impossible d'obtenir la partie texte\n"
 
-#: src/compose.c:1420
+#: src/compose.c:1418
 msgid "Quote mark format error."
 msgstr "Erreur du format de citation."
 
-#: src/compose.c:1432
+#: src/compose.c:1430
 msgid "Message reply/forward format error."
 msgstr ""
 "Erreur du format de citation d'un message lors d'une réponse ou d'un "
 "transfert."
 
-#: src/compose.c:1801
+#: src/compose.c:1799
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Le fichier %s n'existe pas\n"
 
-#: src/compose.c:1805
+#: src/compose.c:1803
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Impossible d'obtenir la taille de %s\n"
 
-#: src/compose.c:1809
+#: src/compose.c:1807
 #, c-format
 msgid "File %s is empty."
 msgstr "Le fichier %s est vide."
 
-#: src/compose.c:1813
+#: src/compose.c:1811
 #, c-format
 msgid "Can't read %s."
 msgstr "Impossible de lire %s."
 
-#: src/compose.c:1848
+#: src/compose.c:1846
 #, c-format
 msgid "Message: %s"
 msgstr "Message : %s"
 
-#: src/compose.c:1920 src/mimeview.c:560
+#: src/compose.c:1918 src/mimeview.c:560
 msgid "Can't get the part of multipart message."
 msgstr "Impossible de lire une partie d'un message multipart."
 
-#: src/compose.c:2362
+#: src/compose.c:2360
 msgid " [Edited]"
 msgstr " [modifié]"
 
-#: src/compose.c:2364
+#: src/compose.c:2362
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Composition d'un message%s"
 
-#: src/compose.c:2367
+#: src/compose.c:2365
 #, c-format
 msgid "Compose message%s"
 msgstr "Composition d'un message%s"
 
-#: src/compose.c:2478
+#: src/compose.c:2476
 msgid "Recipient is not specified."
 msgstr "Destinataire non spécifié."
 
-#: src/compose.c:2486
+#: src/compose.c:2484
 msgid "Empty subject"
 msgstr "Sujet absent"
 
-#: src/compose.c:2487
+#: src/compose.c:2485
 msgid "Subject is empty. Send it anyway?"
 msgstr "Le sujet est vide. Envoyer malgré cela ?"
 
-#: src/compose.c:2538
+#: src/compose.c:2536
 msgid "can't get recipient list."
 msgstr "liste de destinataires vide."
 
-#: src/compose.c:2558
+#: src/compose.c:2556
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1003,26 +1003,26 @@ msgstr ""
 "Aucun compte n'a été spécifié pour l'envoi.\n"
 "Veuillez sélectionner un compte avant d'envoyer du courrier."
 
-#: src/compose.c:2572 src/send_message.c:297
+#: src/compose.c:2570 src/send_message.c:297
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Une erreur est survenue lors de l'envoi du message à %s ."
 
-#: src/compose.c:2595
+#: src/compose.c:2593
 msgid "Can't save the message to outbox."
 msgstr "Impossible d'enregistrer de message dans la boîte de messages envoyés"
 
-#: src/compose.c:2645
+#: src/compose.c:2643
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "Impossible de trouver une touche associée au code (de touche) « %s »."
 
-#: src/compose.c:2709 src/compose.c:2965 src/compose.c:3028 src/compose.c:3148
-#: src/utils.c:2365
+#: src/compose.c:2707 src/compose.c:2963 src/compose.c:3026 src/compose.c:3146
+#: src/utils.c:2379
 msgid "can't change file mode\n"
 msgstr "impossible de modifier les droits d'accès du fichier\n"
 
-#: src/compose.c:2741
+#: src/compose.c:2739
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1033,11 +1033,11 @@ msgstr ""
 "\n"
 "Voulez-vous néanmoins l'envoyer avec %s ?"
 
-#: src/compose.c:2747
+#: src/compose.c:2745
 msgid "Code conversion error"
 msgstr "Erreur de conversion de code"
 
-#: src/compose.c:2816
+#: src/compose.c:2814
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1050,153 +1050,153 @@ msgstr ""
 "\n"
 "Voulez-vous néanmoins l'envoyer ?"
 
-#: src/compose.c:2820
+#: src/compose.c:2818
 msgid "Line length limit"
 msgstr "Longueur de ligne maximale"
 
-#: src/compose.c:3108
+#: src/compose.c:3106
 msgid "can't remove the old message\n"
 msgstr "Impossible d'enlever l'ancien message\n"
 
-#: src/compose.c:3126
+#: src/compose.c:3124
 msgid "queueing message...\n"
 msgstr "Mise en file d'attente des messages...\n"
 
-#: src/compose.c:3208
+#: src/compose.c:3206
 msgid "can't find queue folder\n"
 msgstr "Impossible de trouver le dossier de file d'attente\n"
 
-#: src/compose.c:3215
+#: src/compose.c:3213
 msgid "can't queue the message\n"
 msgstr "Impossible de mettre ce message dans la file d'attente\n"
 
-#: src/compose.c:3792
+#: src/compose.c:3790
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "Message-ID créé : %s\n"
 
-#: src/compose.c:3901
+#: src/compose.c:3899
 msgid "Creating compose window...\n"
 msgstr "Création de la fenêtre de composition...\n"
 
-#: src/compose.c:3949 src/headerview.c:54 src/summary_search.c:214
+#: src/compose.c:3947 src/headerview.c:54 src/summary_search.c:214
 msgid "From:"
 msgstr "De :"
 
-#: src/compose.c:4021
+#: src/compose.c:4019
 msgid "PGP Sign"
 msgstr "Signature PGP"
 
-#: src/compose.c:4024
+#: src/compose.c:4022
 msgid "PGP Encrypt"
 msgstr "Chiffrement PGP"
 
-#: src/compose.c:4062 src/compose.c:5001
+#: src/compose.c:4060 src/compose.c:4995
 msgid "MIME type"
 msgstr "Type MIME"
 
 #. S_COL_DATE
-#: src/compose.c:4071 src/mimeview.c:192 src/prefs_filter_edit.c:585
+#: src/compose.c:4069 src/mimeview.c:192 src/prefs_filter_edit.c:585
 #: src/prefs_summary_column.c:75 src/select-keys.c:317 src/summaryview.c:4217
 msgid "Size"
 msgstr "Taille"
 
-#: src/compose.c:4449 src/mainwindow.c:2224 src/prefs_account.c:719
+#: src/compose.c:4442 src/mainwindow.c:2207 src/prefs_account.c:719
 #: src/prefs_common.c:947
 msgid "Send"
 msgstr "Envoyer"
 
-#: src/compose.c:4450
+#: src/compose.c:4443
 msgid "Send message"
 msgstr "Envoyer le message"
 
-#: src/compose.c:4458
+#: src/compose.c:4451
 msgid "Send later"
 msgstr "Envoi différé"
 
-#: src/compose.c:4459
+#: src/compose.c:4452
 msgid "Put into queue folder and send later"
 msgstr "Mettre en file d'attente et envoyer plus tard"
 
-#: src/compose.c:4467
+#: src/compose.c:4460
 msgid "Draft"
 msgstr "Brouillon"
 
-#: src/compose.c:4468
+#: src/compose.c:4461
 msgid "Save to draft folder"
 msgstr "Enregistrer dans le dossier brouillon"
 
-#: src/compose.c:4478
+#: src/compose.c:4471
 msgid "Insert"
 msgstr "Insertion"
 
-#: src/compose.c:4479
+#: src/compose.c:4472
 msgid "Insert file"
 msgstr "Insérer un fichier"
 
-#: src/compose.c:4487
+#: src/compose.c:4480
 msgid "Attach"
 msgstr "Joindre"
 
-#: src/compose.c:4488
+#: src/compose.c:4481
 msgid "Attach file"
 msgstr "Joindre un fichier"
 
 #. signature
-#: src/compose.c:4498 src/prefs_account.c:1391 src/prefs_common.c:1356
+#: src/compose.c:4491 src/prefs_account.c:1391 src/prefs_common.c:1356
 msgid "Signature"
 msgstr "Signature"
 
-#: src/compose.c:4499
+#: src/compose.c:4492
 msgid "Insert signature"
 msgstr "Insérer la signature"
 
-#: src/compose.c:4508 src/prefs_common.c:1378 src/prefs_common.c:2382
+#: src/compose.c:4501 src/prefs_common.c:1378 src/prefs_common.c:2382
 msgid "Editor"
 msgstr "Éditeur de texte"
 
-#: src/compose.c:4509
+#: src/compose.c:4502
 msgid "Edit with external editor"
 msgstr "Éditer avec un éditeur externe"
 
-#: src/compose.c:4517
+#: src/compose.c:4510
 msgid "Linewrap"
 msgstr "Justifier"
 
-#: src/compose.c:4518
+#: src/compose.c:4511
 msgid "Wrap all long lines"
 msgstr "Justifier tout le message"
 
-#: src/compose.c:4897
+#: src/compose.c:4891
 msgid "Invalid MIME type."
 msgstr "Type MIME invalide."
 
-#: src/compose.c:4915
+#: src/compose.c:4909
 msgid "File doesn't exist or is empty."
 msgstr "Le fichier n'existe pas ou est vide."
 
-#: src/compose.c:4983
+#: src/compose.c:4977
 msgid "Properties"
 msgstr "Propriétés"
 
-#: src/compose.c:5003
+#: src/compose.c:4997
 msgid "Encoding"
 msgstr "Encodage"
 
-#: src/compose.c:5026 src/prefs_folder_item.c:183
+#: src/compose.c:5020 src/prefs_folder_item.c:183
 msgid "Path"
 msgstr "Chemin d'accès"
 
-#: src/compose.c:5027
+#: src/compose.c:5021
 msgid "File name"
 msgstr "Nom du fichier"
 
-#: src/compose.c:5185
+#: src/compose.c:5179
 #, 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:5211
+#: src/compose.c:5205
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1207,73 +1207,73 @@ msgstr ""
 "Forcer sa fermeture ?\n"
 "id de traitement de groupe: %d"
 
-#: src/compose.c:5228
+#: src/compose.c:5222
 #, c-format
 msgid "Terminated process group id: %d"
 msgstr "Id de traitement de groupe terminé : %d"
 
-#: src/compose.c:5229
+#: src/compose.c:5223
 #, c-format
 msgid "Temporary file: %s"
 msgstr "Fichier temporaire : %s"
 
-#: src/compose.c:5253
+#: src/compose.c:5247
 msgid "Compose: input from monitoring process\n"
 msgstr "Compose : entrée à partir d'une surveillance de traitement\n"
 
 #. failed
-#: src/compose.c:5284
+#: src/compose.c:5278
 msgid "Couldn't exec external editor\n"
 msgstr "Impossible de lancer l'éditeur externe\n"
 
-#: src/compose.c:5288
+#: src/compose.c:5282
 msgid "Couldn't write to file\n"
 msgstr "Impossible d'écrire dans le fichier\n"
 
-#: src/compose.c:5290
+#: src/compose.c:5284
 msgid "Pipe read failed\n"
 msgstr "Échec de lecture de pipe\n"
 
-#: src/compose.c:5596 src/compose.c:5604 src/compose.c:5610
+#: src/compose.c:5590 src/compose.c:5598 src/compose.c:5604
 msgid "Can't queue the message."
 msgstr "Impossible de mettre ce message dans la file d'attente."
 
-#: src/compose.c:5701
+#: src/compose.c:5695
 msgid "Select files"
 msgstr "Sélection de fichier"
 
-#: src/compose.c:5723
+#: src/compose.c:5717
 msgid "Select file"
 msgstr "Choisissez un fichier"
 
-#: src/compose.c:5760
+#: src/compose.c:5754
 msgid "Save message"
 msgstr "Enregistrer le message"
 
-#: src/compose.c:5761
+#: src/compose.c:5755
 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:5763
+#: src/compose.c:5757
 msgid "Close _without saving"
 msgstr "Fermer _sans enregistrer"
 
-#: src/compose.c:5805
+#: src/compose.c:5799
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Voulez-vous appliquer le modèle « %s » ?"
 
-#: src/compose.c:5807
+#: src/compose.c:5801
 msgid "Apply template"
 msgstr "Appliquer un modèle"
 
-#: src/compose.c:5808
+#: src/compose.c:5802
 msgid "_Replace"
 msgstr "_Remplacer"
 
-#: src/compose.c:5808
+#: src/compose.c:5802
 msgid "_Insert"
 msgstr "_Insérer"
 
@@ -1718,12 +1718,12 @@ msgstr "Enregistrement des données des dossiers...\n"
 msgid "Setting folder info..."
 msgstr "Initialisation des données des dossiers..."
 
-#: src/folderview.c:805 src/mainwindow.c:3301 src/setup.c:81
+#: src/folderview.c:805 src/mainwindow.c:3272 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Analyse du dossier %s%c%s ..."
 
-#: src/folderview.c:809 src/mainwindow.c:3306 src/setup.c:86
+#: src/folderview.c:809 src/mainwindow.c:3277 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Analyse du dossier %s ..."
@@ -2044,44 +2044,44 @@ msgstr "L'authentification IMAP4 a échoué.\n"
 msgid "IMAP4 login failed.\n"
 msgstr "Échec au login IMAP4.\n"
 
-#: src/imap.c:3522
+#: src/imap.c:3528
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "Impossible de d'ajouter %s à %s\n"
 
-#: src/imap.c:3529
+#: src/imap.c:3535
 msgid "(sending file...)"
 msgstr "(envoi du fichier...)"
 
-#: src/imap.c:3557
+#: src/imap.c:3563
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "impossible d'ajouter le message à %s\n"
 
-#: src/imap.c:3589
+#: src/imap.c:3595
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "impossible de copier %s vers %s\n"
 
-#: src/imap.c:3613
+#: src/imap.c:3619
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "erreur avec la commande IMAP : STORE %s %s\n"
 
-#: src/imap.c:3627
+#: src/imap.c:3633
 msgid "error while imap command: EXPUNGE\n"
 msgstr "erreur lors de la commande IMAP : EXPUNGE\n"
 
-#: src/imap.c:3640
+#: src/imap.c:3646
 msgid "error while imap command: CLOSE\n"
 msgstr "erreur avec la commande IMAP : CLOSE\n"
 
-#: src/imap.c:3873
+#: src/imap.c:3879
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv ne peut convertir de UTF-7 vers %s\n"
 
-#: src/imap.c:3903
+#: src/imap.c:3909
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv ne peut convertir de %s vers UTF-7\n"
@@ -2185,7 +2185,7 @@ msgstr "Importation d'un fichier LDIF dans un carnet d'adresses"
 msgid "Prev"
 msgstr "Précédent"
 
-#: src/importldif.c:768 src/mainwindow.c:2321
+#: src/importldif.c:768 src/mainwindow.c:2303
 msgid "Next"
 msgstr "Suivant"
 
@@ -2544,618 +2544,618 @@ msgstr ""
 "Une ancienne version de configuration a été trouvée.\n"
 "Voulez-vous migrer vers la nouvelle ?"
 
-#: src/mainwindow.c:471
+#: src/mainwindow.c:462
 msgid "/_File/_Folder"
 msgstr "/_Fichier/_Dossier"
 
-#: src/mainwindow.c:472
+#: src/mainwindow.c:463
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/_Fichier/_Dossier/Créer un _nouveau dossier..."
 
-#: src/mainwindow.c:474
+#: src/mainwindow.c:465
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/_Fichier/_Dossier/_Renommer le dossier..."
 
-#: src/mainwindow.c:475
+#: src/mainwindow.c:466
 msgid "/_File/_Folder/_Move folder..."
 msgstr "/_Fichier/_Dossier/_Déplacer le dossier..."
 
-#: src/mainwindow.c:476
+#: src/mainwindow.c:467
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/_Fichier/_Dossier/_Supprimer le dossier"
 
-#: src/mainwindow.c:477
+#: src/mainwindow.c:468
 msgid "/_File/_Mailbox"
 msgstr "/_Fichier/_Boîte aux lettres"
 
-#: src/mainwindow.c:478
+#: src/mainwindow.c:469
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/_Fichier/_Boîte aux lettres/Ajouter une _boîte aux lettres..."
 
-#: src/mainwindow.c:479
+#: src/mainwindow.c:470
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/_Fichier/_Boîte aux lettres/_Supprimer la boîte aux lettres"
 
-#: src/mainwindow.c:480 src/mainwindow.c:485
+#: src/mainwindow.c:471 src/mainwindow.c:476
 msgid "/_File/_Mailbox/---"
 msgstr "/_Fichier/_Boîte aux lettres/---"
 
-#: src/mainwindow.c:481
+#: src/mainwindow.c:472
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "/_Fichier/_Boîte aux lettres/Re_chercher les nouveaux messages"
 
-#: src/mainwindow.c:483
+#: src/mainwindow.c:474
 msgid "/_File/_Mailbox/Check for new messages in _all mailboxes"
 msgstr ""
 "/_Fichier/_Boîte aux lettres/Rechercher les nouveaux messages dans _toutes "
 "les boîtes"
 
-#: src/mainwindow.c:486
+#: src/mainwindow.c:477
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "/_Fichier/_Boîte aux lettres/Reconstruire l'_arborescence"
 
-#: src/mainwindow.c:489
+#: src/mainwindow.c:480
 msgid "/_File/_Import mbox file..."
 msgstr "/_Fichier/_Importer un fichier mbox..."
 
-#: src/mainwindow.c:490
+#: src/mainwindow.c:481
 msgid "/_File/_Export to mbox file..."
 msgstr "/_Fichier/_Exporter vers un fichier mbox..."
 
-#: src/mainwindow.c:492
+#: src/mainwindow.c:483
 msgid "/_File/Empty all _trash"
 msgstr "/_Fichier/_Vider les corbeilles"
 
-#: src/mainwindow.c:494 src/messageview.c:138
+#: src/mainwindow.c:485 src/messageview.c:138
 msgid "/_File/_Save as..."
 msgstr "/_Fichier/Enregistrer _sous..."
 
-#: src/mainwindow.c:495 src/messageview.c:139
+#: src/mainwindow.c:486 src/messageview.c:139
 msgid "/_File/_Print..."
 msgstr "/_Fichier/Im_primer..."
 
-#: src/mainwindow.c:497
+#: src/mainwindow.c:488
 msgid "/_File/_Work offline"
 msgstr "/_Fichier/_Travailler déconnecté"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:500
+#: src/mainwindow.c:491
 msgid "/_File/E_xit"
 msgstr "/_Fichier/_Quitter"
 
-#: src/mainwindow.c:505
+#: src/mainwindow.c:496
 msgid "/_Edit/Select _thread"
 msgstr "/É_dition/Sélectionner l'en_filade"
 
-#: src/mainwindow.c:507 src/messageview.c:147
+#: src/mainwindow.c:498 src/messageview.c:147
 msgid "/_Edit/_Find in current message..."
 msgstr "/É_dition/Rechercher dans le _message..."
 
-#: src/mainwindow.c:509
+#: src/mainwindow.c:500
 msgid "/_Edit/_Search messages..."
 msgstr "/É_dition/Rechercher dans le _dossier..."
 
-#: src/mainwindow.c:512
+#: src/mainwindow.c:503
 msgid "/_View/Show or hi_de"
 msgstr "/_Affichage/Affic_her ou masquer"
 
-#: src/mainwindow.c:513
+#: src/mainwindow.c:504
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/_Affichage/Affic_her ou masquer/Fenêtre des _dossiers"
 
-#: src/mainwindow.c:515
+#: src/mainwindow.c:506
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/_Affichage/Affic_her ou masquer/Fenêtre de _message"
 
-#: src/mainwindow.c:517
+#: src/mainwindow.c:508
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/_Affichage/Affic_her ou masquer/Barre d'_outils"
 
-#: src/mainwindow.c:519
+#: src/mainwindow.c:510
 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:521
+#: src/mainwindow.c:512
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/_Affichage/Affic_her ou masquer/Barre d'_outils/_Icônes seulement"
 
-#: src/mainwindow.c:523
+#: src/mainwindow.c:514
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/_Affichage/Affic_her ou masquer/Barre d'_outils/_Textes seulement"
 
-#: src/mainwindow.c:525
+#: src/mainwindow.c:516
 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:527
+#: src/mainwindow.c:518
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/_Affichage/Affic_her ou masquer/_Barre d'état"
 
-#: src/mainwindow.c:530
+#: src/mainwindow.c:521
 msgid "/_View/Separate f_older tree"
 msgstr "/_Affichage/Séparer la fenêtre des _dossiers"
 
-#: src/mainwindow.c:531
+#: src/mainwindow.c:522
 msgid "/_View/Separate _message view"
 msgstr "/_Affichage/Séparer la fenêtre des _messages"
 
-#: src/mainwindow.c:533
+#: src/mainwindow.c:524
 msgid "/_View/_Sort"
 msgstr "/_Affichage/_Trier"
 
-#: src/mainwindow.c:534
+#: src/mainwindow.c:525
 msgid "/_View/_Sort/by _number"
 msgstr "/_Affichage/_Trier/Trier par _numéro"
 
-#: src/mainwindow.c:535
+#: src/mainwindow.c:526
 msgid "/_View/_Sort/by s_ize"
 msgstr "/_Affichage/_Trier/Trier par _taille"
 
-#: src/mainwindow.c:536
+#: src/mainwindow.c:527
 msgid "/_View/_Sort/by _date"
 msgstr "/_Affichage/_Trier/Trier par _date"
 
-#: src/mainwindow.c:537
+#: src/mainwindow.c:528
 msgid "/_View/_Sort/by _from"
 msgstr "/_Affichage/_Trier/Trier par e_xpéditeur"
 
-#: src/mainwindow.c:538
+#: src/mainwindow.c:529
 msgid "/_View/_Sort/by _recipient"
 msgstr "/_Affichage/_Trier/Trier par d_estinataire"
 
-#: src/mainwindow.c:539
+#: src/mainwindow.c:530
 msgid "/_View/_Sort/by _subject"
 msgstr "/_Affichage/_Trier/Trier par _sujet"
 
-#: src/mainwindow.c:540
+#: src/mainwindow.c:531
 msgid "/_View/_Sort/by _color label"
 msgstr "/_Affichage/_Trier/Trier par _couleur"
 
-#: src/mainwindow.c:542
+#: src/mainwindow.c:533
 msgid "/_View/_Sort/by _mark"
 msgstr "/_Affichage/_Trier/Trier par _marque"
 
-#: src/mainwindow.c:543
+#: src/mainwindow.c:534
 msgid "/_View/_Sort/by _unread"
 msgstr "/_Affichage/_Trier/Trier par non _lu"
 
-#: src/mainwindow.c:544
+#: src/mainwindow.c:535
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/_Affichage/_Trier/Trier par pièce _jointe"
 
-#: src/mainwindow.c:546
+#: src/mainwindow.c:537
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/_Affichage/_Trier/Ne _pas trier"
 
-#: src/mainwindow.c:547 src/mainwindow.c:550
+#: src/mainwindow.c:538 src/mainwindow.c:541
 msgid "/_View/_Sort/---"
 msgstr "/_Affichage/_Trier/---"
 
-#: src/mainwindow.c:548
+#: src/mainwindow.c:539
 msgid "/_View/_Sort/Ascending"
 msgstr "/_Affichage/_Trier/_Ordre croissant"
 
-#: src/mainwindow.c:549
+#: src/mainwindow.c:540
 msgid "/_View/_Sort/Descending"
 msgstr "/_Affichage/_Trier/O_rdre décroissant"
 
-#: src/mainwindow.c:551
+#: src/mainwindow.c:542
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/_Affichage/_Trier/_Attirer par sujet"
 
-#: src/mainwindow.c:553
+#: src/mainwindow.c:544
 msgid "/_View/Th_read view"
 msgstr "/_Affichage/Affichage par _fil de conversation"
 
-#: src/mainwindow.c:554
+#: src/mainwindow.c:545
 msgid "/_View/E_xpand all threads"
 msgstr "/_Affichage/Dé_ployer les fils de conversation"
 
-#: src/mainwindow.c:555
+#: src/mainwindow.c:546
 msgid "/_View/Co_llapse all threads"
 msgstr "/_Affichage/_Compacter les fils de conversation"
 
-#: src/mainwindow.c:556
+#: src/mainwindow.c:547
 msgid "/_View/Set display _item..."
 msgstr "/_Affichage/Sélect_ion des éléments affichés..."
 
-#: src/mainwindow.c:559
+#: src/mainwindow.c:550
 msgid "/_View/_Go to"
 msgstr "/_Affichage/_Aller à"
 
-#: src/mainwindow.c:560
+#: src/mainwindow.c:551
 msgid "/_View/_Go to/_Prev message"
 msgstr "/_Affichage/_Aller à/Message _précédent"
 
-#: src/mainwindow.c:561
+#: src/mainwindow.c:552
 msgid "/_View/_Go to/_Next message"
 msgstr "/_Affichage/_Aller à/Message suiva_nt"
 
-#: src/mainwindow.c:562 src/mainwindow.c:567 src/mainwindow.c:570
-#: src/mainwindow.c:575 src/mainwindow.c:580
+#: src/mainwindow.c:553 src/mainwindow.c:558 src/mainwindow.c:561
+#: src/mainwindow.c:566 src/mainwindow.c:571
 msgid "/_View/_Go to/---"
 msgstr "/_Affichage/_Aller à/---"
 
-#: src/mainwindow.c:563
+#: src/mainwindow.c:554
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/_Affichage/_Aller à/Non l_u précédent"
 
-#: src/mainwindow.c:565
+#: src/mainwindow.c:556
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/_Affichage/_Aller à/Non _lu suivant"
 
-#: src/mainwindow.c:568
+#: src/mainwindow.c:559
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/_Affichage/_Aller à/Message nouveau précédent"
 
-#: src/mainwindow.c:569
+#: src/mainwindow.c:560
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/_Affichage/_Aller à/Message nouveau suivant"
 
-#: src/mainwindow.c:571
+#: src/mainwindow.c:562
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/_Affichage/_Aller à/M_arqué précédent"
 
-#: src/mainwindow.c:573
+#: src/mainwindow.c:564
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/_Affichage/_Aller à/_Marqué suivant"
 
-#: src/mainwindow.c:576
+#: src/mainwindow.c:567
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/_Affichage/_Aller à/C_oloré précédent"
 
-#: src/mainwindow.c:578
+#: src/mainwindow.c:569
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/_Affichage/_Aller à/_Coloré suivant"
 
-#: src/mainwindow.c:581
+#: src/mainwindow.c:572
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Affichage/_Aller à/Autre _dossier..."
 
-#: src/mainwindow.c:590 src/messageview.c:158
+#: src/mainwindow.c:581 src/messageview.c:158
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Affichage/_Jeu de caractères/Détection _automatique"
 
-#: src/mainwindow.c:641 src/messageview.c:202
+#: src/mainwindow.c:632 src/messageview.c:202
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Affichage/_Jeu de caractères/Japonais (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:643 src/messageview.c:204
+#: src/mainwindow.c:634 src/messageview.c:204
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Affichage/_Jeu de caractères/Japonais (_EUC-JP)"
 
-#: src/mainwindow.c:645 src/messageview.c:206
+#: src/mainwindow.c:636 src/messageview.c:206
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Affichage/_Jeu de caractères/Japonais (_Shift__JIS)"
 
-#: src/mainwindow.c:657 src/messageview.c:217
+#: src/mainwindow.c:648 src/messageview.c:217
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Affichage/_Jeu de caractères/Chinois (ISO-2022-_CN)"
 
-#: src/mainwindow.c:663 src/messageview.c:222
+#: src/mainwindow.c:654 src/messageview.c:222
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Affichage/_Jeu de caractères/Coréen (ISO-2022-KR)"
 
-#: src/mainwindow.c:676 src/summaryview.c:401
+#: src/mainwindow.c:667 src/summaryview.c:401
 msgid "/_View/Open in new _window"
 msgstr "/_Affichage/_Ouvrir dans une nouvelle fenêtre"
 
-#: src/mainwindow.c:677 src/messageview.c:234
+#: src/mainwindow.c:668 src/messageview.c:234
 msgid "/_View/Mess_age source"
 msgstr "/_Affichage/_Voir le message complet"
 
-#: src/mainwindow.c:678 src/messageview.c:235
+#: src/mainwindow.c:669 src/messageview.c:235
 msgid "/_View/Show all _header"
 msgstr "/_Affichage/Afficher tous les e_n-têtes"
 
-#: src/mainwindow.c:680
+#: src/mainwindow.c:671
 msgid "/_View/_Update summary"
 msgstr "/_Affichage/Mettre à jo_ur le résumé des messages"
 
-#: src/mainwindow.c:682 src/messageview.c:237
+#: src/mainwindow.c:673 src/messageview.c:237
 msgid "/_Message"
 msgstr "/_Message"
 
-#: src/mainwindow.c:683
+#: src/mainwindow.c:674
 msgid "/_Message/Recei_ve"
 msgstr "/_Message/Réce_ptionner"
 
-#: src/mainwindow.c:684
+#: src/mainwindow.c:675
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/_Message/Réce_ptionner/le courrier du _compte courant"
 
-#: src/mainwindow.c:686
+#: src/mainwindow.c:677
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/_Message/Réce_ptionner/le courrier de _tous les comptes"
 
-#: src/mainwindow.c:688
+#: src/mainwindow.c:679
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/_Message/Réce_ptionner/_Annuler la réception"
 
-#: src/mainwindow.c:690
+#: src/mainwindow.c:681
 msgid "/_Message/Recei_ve/---"
 msgstr "/_Message/Réce_ptionner/---"
 
-#: src/mainwindow.c:691
+#: src/mainwindow.c:682
 msgid "/_Message/_Send queued messages"
 msgstr "/_Message/En_voyer les messages en file d'attente"
 
-#: src/mainwindow.c:692 src/mainwindow.c:694 src/mainwindow.c:701
-#: src/mainwindow.c:706 src/mainwindow.c:710 src/mainwindow.c:719
-#: src/mainwindow.c:722 src/messageview.c:240 src/messageview.c:248
+#: src/mainwindow.c:683 src/mainwindow.c:685 src/mainwindow.c:692
+#: src/mainwindow.c:697 src/mainwindow.c:701 src/mainwindow.c:710
+#: src/mainwindow.c:713 src/messageview.c:240 src/messageview.c:248
 #: src/messageview.c:253
 msgid "/_Message/---"
 msgstr "/_Message/---"
 
-#: src/mainwindow.c:693 src/messageview.c:238
+#: src/mainwindow.c:684 src/messageview.c:238
 msgid "/_Message/Compose _new message"
 msgstr "/_Message/Composer un _nouveau message"
 
-#: src/mainwindow.c:695 src/messageview.c:241
+#: src/mainwindow.c:686 src/messageview.c:241
 msgid "/_Message/_Reply"
 msgstr "/_Message/_Répondre"
 
-#: src/mainwindow.c:696
+#: src/mainwindow.c:687
 msgid "/_Message/Repl_y to"
 msgstr "/_Message/Rép_ondre à"
 
-#: src/mainwindow.c:697 src/messageview.c:242
+#: src/mainwindow.c:688 src/messageview.c:242
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Message/Rép_ondre à/_tous"
 
-#: src/mainwindow.c:698 src/messageview.c:244
+#: src/mainwindow.c:689 src/messageview.c:244
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Message/Rép_ondre à/l'_expéditeur"
 
-#: src/mainwindow.c:699 src/messageview.c:246
+#: src/mainwindow.c:690 src/messageview.c:246
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Message/Rép_ondre à/la _liste"
 
-#: src/mainwindow.c:702 src/messageview.c:249
+#: src/mainwindow.c:693 src/messageview.c:249
 msgid "/_Message/_Forward"
 msgstr "/_Message/_Transférer"
 
-#: src/mainwindow.c:703 src/messageview.c:250
+#: src/mainwindow.c:694 src/messageview.c:250
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Message/Transférer en tant que pièce _jointe"
 
-#: src/mainwindow.c:705 src/messageview.c:252
+#: src/mainwindow.c:696 src/messageview.c:252
 msgid "/_Message/Redirec_t"
 msgstr "/_Message/Rediri_ger"
 
-#: src/mainwindow.c:707
+#: src/mainwindow.c:698
 msgid "/_Message/M_ove..."
 msgstr "/_Message/_Déplacer..."
 
-#: src/mainwindow.c:708
+#: src/mainwindow.c:699
 msgid "/_Message/_Copy..."
 msgstr "/_Message/_Copier..."
 
-#: src/mainwindow.c:709
+#: src/mainwindow.c:700
 msgid "/_Message/_Delete"
 msgstr "/_Message/_Supprimer"
 
-#: src/mainwindow.c:711
+#: src/mainwindow.c:702
 msgid "/_Message/_Mark"
 msgstr "/_Message/_Marquer"
 
-#: src/mainwindow.c:712
+#: src/mainwindow.c:703
 msgid "/_Message/_Mark/_Mark"
 msgstr "/_Message/_Marquer/_Marquer"
 
-#: src/mainwindow.c:713
+#: src/mainwindow.c:704
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/_Message/_Marquer/_Démarquer"
 
-#: src/mainwindow.c:714
+#: src/mainwindow.c:705
 msgid "/_Message/_Mark/---"
 msgstr "/_Message/_Marquer/---"
 
-#: src/mainwindow.c:715
+#: src/mainwindow.c:706
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/_Message/_Marque/Marquer comme _non lu"
 
-#: src/mainwindow.c:716
+#: src/mainwindow.c:707
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/_Message/_Marque/Marquer comme _lu"
 
-#: src/mainwindow.c:718
+#: src/mainwindow.c:709
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/_Message/_Marque/Marquer _tous comme lu"
 
-#: src/mainwindow.c:720
+#: src/mainwindow.c:711
 msgid "/_Message/Set as _junk mail"
 msgstr "/_Message/_Marquer comme _indésirable"
 
-#: src/mainwindow.c:721
+#: src/mainwindow.c:712
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/_Message/Marquer comme in_téressant"
 
-#: src/mainwindow.c:723 src/messageview.c:254
+#: src/mainwindow.c:714 src/messageview.c:254
 msgid "/_Message/Re-_edit"
 msgstr "/_Message/Réédit_er"
 
-#: src/mainwindow.c:727
+#: src/mainwindow.c:718
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/_Outils/Aj_outer l'expéditeur dans le carnet d'adresses..."
 
-#: src/mainwindow.c:730
+#: src/mainwindow.c:721
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/_Outils/_Filtrer les messages du dossier"
 
-#: src/mainwindow.c:732
+#: src/mainwindow.c:723
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Outils/Filtrer les messages _sélectionnés"
 
-#: src/mainwindow.c:734 src/messageview.c:261
+#: src/mainwindow.c:725 src/messageview.c:261
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Outils/Créer une règle de f_iltrage"
 
-#: src/mainwindow.c:735 src/messageview.c:263
+#: src/mainwindow.c:726 src/messageview.c:263
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Outils/Créer une règle de f_iltrage/automatiq_uement"
 
-#: src/mainwindow.c:737 src/messageview.c:265
+#: src/mainwindow.c:728 src/messageview.c:265
 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:739 src/messageview.c:267
+#: src/mainwindow.c:730 src/messageview.c:267
 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:741 src/messageview.c:269
+#: src/mainwindow.c:732 src/messageview.c:269
 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:744
+#: src/mainwindow.c:735
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/_Outils/Filtrer les _indésirables du dossier"
 
-#: src/mainwindow.c:746
+#: src/mainwindow.c:737
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/_Outils/Filtrer les indésirables dans les _messages sélectionnés"
 
-#: src/mainwindow.c:751
+#: src/mainwindow.c:742
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/_Message/Supprimer les messages en dou_ble"
 
-#: src/mainwindow.c:754
+#: src/mainwindow.c:745
 msgid "/_Tools/E_xecute"
 msgstr "/_Outils/E_xécuter"
 
-#: src/mainwindow.c:756
+#: src/mainwindow.c:747
 msgid "/_Tools/_Log window"
 msgstr "/Ou_tils/_Journal de connexion"
 
-#: src/mainwindow.c:758
+#: src/mainwindow.c:749
 msgid "/_Configuration"
 msgstr "/_Configuration"
 
-#: src/mainwindow.c:759
+#: src/mainwindow.c:750
 msgid "/_Configuration/_Common preferences..."
 msgstr "/_Configuration/Préférences _générales..."
 
-#: src/mainwindow.c:761
+#: src/mainwindow.c:752
 msgid "/_Configuration/_Filter setting..."
 msgstr "/_Configuration/_Filtres..."
 
-#: src/mainwindow.c:763
+#: src/mainwindow.c:754
 msgid "/_Configuration/_Template..."
 msgstr "/_Configuration/_Modèles..."
 
-#: src/mainwindow.c:764
+#: src/mainwindow.c:755
 msgid "/_Configuration/_Actions..."
 msgstr "/_Configuration/_Actions..."
 
-#: src/mainwindow.c:765
+#: src/mainwindow.c:756
 msgid "/_Configuration/---"
 msgstr "/_Configuration/---"
 
-#: src/mainwindow.c:766
+#: src/mainwindow.c:757
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Configuration/_Configuration du compte courant..."
 
-#: src/mainwindow.c:768
+#: src/mainwindow.c:759
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Configuration/Création d'un _nouveau compte..."
 
-#: src/mainwindow.c:770
+#: src/mainwindow.c:761
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Configuration/Édition des compt_es..."
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:763
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Configuration/Choi_sir un autre compte"
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:767
 msgid "/_Help/_Manual"
 msgstr "/A_ide/_Manuel"
 
-#: src/mainwindow.c:777
+#: src/mainwindow.c:768
 msgid "/_Help/_Manual/_English"
 msgstr "/A_ide/_Manuel/_Anglais"
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:769
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/A_ide/_Manuel/_Japonais"
 
-#: src/mainwindow.c:779
+#: src/mainwindow.c:770
 msgid "/_Help/_FAQ"
 msgstr "/A_ide/_Foire Aux Questions (FAQ)"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:771
 msgid "/_Help/_FAQ/_English"
 msgstr "/A_ide/_Foire Aux Questions (FAQ)/_Anglais"
 
-#: src/mainwindow.c:781
+#: src/mainwindow.c:772
 msgid "/_Help/_FAQ/_German"
 msgstr "/A_ide/_Foire Aux Questions (FAQ)/A_llemand"
 
-#: src/mainwindow.c:782
+#: src/mainwindow.c:773
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/A_ide/_Foire Aux Questions (FAQ)/_Espagnol"
 
-#: src/mainwindow.c:783
+#: src/mainwindow.c:774
 msgid "/_Help/_FAQ/_French"
 msgstr "/A_ide/_Foire Aux Questions (FAQ)/_Français"
 
-#: src/mainwindow.c:784
+#: src/mainwindow.c:775
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/A_ide/_Foire Aux Questions (FAQ)/_Italien"
 
-#: src/mainwindow.c:785
+#: src/mainwindow.c:776
 msgid "/_Help/---"
 msgstr "/A_ide/---"
 
-#: src/mainwindow.c:825
+#: src/mainwindow.c:816
 msgid "Creating main window...\n"
 msgstr "Création de la fenêtre principale...\n"
 
-#: src/mainwindow.c:987
+#: src/mainwindow.c:973
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Fenêtre principale : allocation de la couleur %d échouée\n"
 
-#: src/mainwindow.c:1071 src/summaryview.c:2020 src/summaryview.c:2105
+#: src/mainwindow.c:1057 src/summaryview.c:2020 src/summaryview.c:2105
 #: src/summaryview.c:3342 src/summaryview.c:3415 src/summaryview.c:3728
 msgid "done.\n"
 msgstr "terminé.\n"
 
-#: src/mainwindow.c:1196 src/mainwindow.c:1237 src/mainwindow.c:1265
+#: src/mainwindow.c:1182 src/mainwindow.c:1223 src/mainwindow.c:1251
 msgid "Untitled"
 msgstr "Sans titre"
 
-#: src/mainwindow.c:1266
+#: src/mainwindow.c:1252
 msgid "none"
 msgstr "aucun"
 
-#: src/mainwindow.c:1316
+#: src/mainwindow.c:1302
 #, 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:1536
+#: src/mainwindow.c:1522
 msgid "Offline"
 msgstr "Déconnecté"
 
-#: src/mainwindow.c:1537
+#: src/mainwindow.c:1523
 msgid "You are offline. Go online?"
 msgstr "Vous êtes déconnecté. Voulez-vous vous connecter ?"
 
-#: src/mainwindow.c:1551
+#: src/mainwindow.c:1537
 msgid "Empty all trash"
 msgstr "Vider toutes les corbeilles"
 
-#: src/mainwindow.c:1552
+#: src/mainwindow.c:1538
 msgid "Empty messages in all trash?"
 msgstr "Supprimer tous les messages dans les corbeilles ?"
 
-#: src/mainwindow.c:1580
+#: src/mainwindow.c:1566
 msgid "Add mailbox"
 msgstr "Nouvelle boîte aux lettres"
 
-#: src/mainwindow.c:1581
+#: src/mainwindow.c:1567
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3164,16 +3164,16 @@ msgstr ""
 "Saisissez le nom de la nouvelle boîte aux lettres. Si elle\n"
 "existe déjà, elle sera automatiquement analysée."
 
-#: src/mainwindow.c:1587
+#: src/mainwindow.c:1573
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "La boîte aux lettres « %s » existe déjà."
 
-#: src/mainwindow.c:1592 src/setup.c:57
+#: src/mainwindow.c:1578 src/setup.c:57
 msgid "Mailbox"
 msgstr "Boîte aux lettres"
 
-#: src/mainwindow.c:1598 src/setup.c:63
+#: src/mainwindow.c:1584 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3183,149 +3183,149 @@ msgstr ""
 "Il se peut que les fichiers existent déjà, ou que vous n'ayez pas les droits "
 "en écriture."
 
-#: src/mainwindow.c:1989
+#: src/mainwindow.c:1975
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Dossiers"
 
-#: src/mainwindow.c:2009 src/messageview.c:368
+#: src/mainwindow.c:1995 src/messageview.c:368
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Message"
 
-#: src/mainwindow.c:2156 src/summaryview.c:370
+#: src/mainwindow.c:2142 src/summaryview.c:370
 msgid "/_Reply"
 msgstr "/_Répondre"
 
-#: src/mainwindow.c:2157
+#: src/mainwindow.c:2143
 msgid "/Reply to _all"
 msgstr "/Répondre à _tous"
 
-#: src/mainwindow.c:2158
+#: src/mainwindow.c:2144
 msgid "/Reply to _sender"
 msgstr "/Répondre à l'_expéditeur"
 
-#: src/mainwindow.c:2159
+#: src/mainwindow.c:2145
 msgid "/Reply to mailing _list"
 msgstr "/Répondre à la _liste"
 
-#: src/mainwindow.c:2164 src/summaryview.c:377
+#: src/mainwindow.c:2150 src/summaryview.c:377
 msgid "/_Forward"
 msgstr "/_Transférer"
 
-#: src/mainwindow.c:2165 src/summaryview.c:378
+#: src/mainwindow.c:2151 src/summaryview.c:378
 msgid "/For_ward as attachment"
 msgstr "/Transférer en pièce _jointe"
 
-#: src/mainwindow.c:2166 src/summaryview.c:379
+#: src/mainwindow.c:2152 src/summaryview.c:379
 msgid "/Redirec_t"
 msgstr "/Rediri_ger"
 
-#: src/mainwindow.c:2205
+#: src/mainwindow.c:2188
 msgid "Get"
 msgstr "Relever"
 
-#: src/mainwindow.c:2206
+#: src/mainwindow.c:2189
 msgid "Incorporate new mail"
 msgstr "Relever le courrier du compte courant"
 
-#: src/mainwindow.c:2213
+#: src/mainwindow.c:2196
 msgid "Get all"
 msgstr "Tout relever"
 
-#: src/mainwindow.c:2214
+#: src/mainwindow.c:2197
 msgid "Incorporate new mail of all accounts"
 msgstr "Relever le courrier de tous les comptes"
 
-#: src/mainwindow.c:2225
+#: src/mainwindow.c:2208
 msgid "Send queued message(s)"
 msgstr "Envoyer les messages en attente"
 
-#: src/mainwindow.c:2235 src/prefs_account.c:721 src/prefs_common.c:949
+#: src/mainwindow.c:2218 src/prefs_account.c:721 src/prefs_common.c:949
 #: src/prefs_folder_item.c:137
 msgid "Compose"
 msgstr "Composer"
 
-#: src/mainwindow.c:2236
+#: src/mainwindow.c:2219
 msgid "Compose new message"
 msgstr "Composer un nouveau message"
 
-#: src/mainwindow.c:2244 src/prefs_common.c:1448
+#: src/mainwindow.c:2227 src/prefs_common.c:1448
 msgid "Reply"
 msgstr "Répondre"
 
-#: src/mainwindow.c:2245 src/mainwindow.c:2258
+#: src/mainwindow.c:2228 src/mainwindow.c:2241
 msgid "Reply to the message"
 msgstr "Répondre au message"
 
-#: src/mainwindow.c:2263
+#: src/mainwindow.c:2245
 msgid "Reply all"
 msgstr "À tous"
 
-#: src/mainwindow.c:2264
+#: src/mainwindow.c:2246
 msgid "Reply to all"
 msgstr "Répondre à tous"
 
-#: src/mainwindow.c:2272 src/prefs_filter_edit.c:741
+#: src/mainwindow.c:2254 src/prefs_filter_edit.c:741
 msgid "Forward"
 msgstr "Transférer"
 
-#: src/mainwindow.c:2273 src/mainwindow.c:2286
+#: src/mainwindow.c:2255 src/mainwindow.c:2268
 msgid "Forward the message"
 msgstr "Transférer le message"
 
-#: src/mainwindow.c:2293
+#: src/mainwindow.c:2275
 msgid "Delete the message"
 msgstr "Supprimer le message"
 
-#: src/mainwindow.c:2301 src/prefs_common.c:1988
+#: src/mainwindow.c:2283 src/prefs_common.c:1988
 msgid "Junk"
 msgstr "Indésirable"
 
-#: src/mainwindow.c:2302
+#: src/mainwindow.c:2284
 msgid "Set as junk mail"
 msgstr "Marquer comme indésirable"
 
-#: src/mainwindow.c:2311
+#: src/mainwindow.c:2293
 msgid "Execute"
 msgstr "Exécuter"
 
-#: src/mainwindow.c:2312
+#: src/mainwindow.c:2294
 msgid "Execute marked process"
 msgstr "Exécuter les commandes marquées"
 
-#: src/mainwindow.c:2322
+#: src/mainwindow.c:2304
 msgid "Next unread message"
 msgstr "Message non lu suivant"
 
-#: src/mainwindow.c:2334
+#: src/mainwindow.c:2316
 msgid "Prefs"
 msgstr "Préférences"
 
-#: src/mainwindow.c:2335
+#: src/mainwindow.c:2317
 msgid "Common preferences"
 msgstr "Préférences générales"
 
-#: src/mainwindow.c:2343 src/prefs_folder_item.c:261
+#: src/mainwindow.c:2325 src/prefs_folder_item.c:261
 #: src/prefs_folder_item.c:272 src/progressdialog.c:128
 msgid "Account"
 msgstr "Compte"
 
-#: src/mainwindow.c:2344
+#: src/mainwindow.c:2326
 msgid "Account setting"
 msgstr "Configuration du compte courant"
 
-#: src/mainwindow.c:2527
+#: src/mainwindow.c:2498
 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:2538
+#: src/mainwindow.c:2509
 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:2731
+#: src/mainwindow.c:2702
 msgid "Exit"
 msgstr "Quitter"
 
-#: src/mainwindow.c:2731
+#: src/mainwindow.c:2702
 msgid "Exit this program?"
 msgstr "Quitter Sylpheed ?"
 
@@ -5532,11 +5532,11 @@ msgstr "Création du dialogue d'avancement...\n"
 msgid "Status"
 msgstr "État"
 
-#: src/recv.c:113
+#: src/recv.c:112
 msgid "error occurred while retrieving data.\n"
 msgstr "Une erreur est survenue pendant la récupération des données.\n"
 
-#: src/recv.c:155 src/recv.c:197 src/recv.c:213
+#: src/recv.c:154 src/recv.c:196 src/recv.c:211
 msgid "Can't write to file.\n"
 msgstr "Impossible d'écrire dans le fichier.\n"
 
@@ -6272,7 +6272,7 @@ msgstr "%.2f Mo"
 msgid "%.2fGB"
 msgstr "%.2f Go"
 
-#: src/utils.c:2372 src/utils.c:2496
+#: src/utils.c:2386 src/utils.c:2510
 #, c-format
 msgid "writing to %s failed.\n"
 msgstr "L'écriture dans %s a échoué.\n"
diff --git a/po/gl.po b/po/gl.po
index a458d2bb..388e38af 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-08-09 18:08+0900\n"
+"POT-Creation-Date: 2005-08-22 17:22+0900\n"
 "PO-Revision-Date: 2003-01-17 10:05+0100\n"
 "Last-Translator: Jorge Rivas\n"
 "Language-Team: Jorge Rivas\n"
@@ -97,7 +97,7 @@ msgstr ""
 "na columna `G' para activar a descarga mediante `Traer todo'."
 
 #: src/account.c:691 src/addressadd.c:192 src/addressbook.c:490
-#: src/compose.c:4081 src/editaddress.c:200 src/editaddress.c:942
+#: src/compose.c:4079 src/editaddress.c:200 src/editaddress.c:942
 #: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:265
 #: src/editjpilot.c:271 src/editldap.c:307 src/editvcard.c:184
 #: src/mimeview.c:201 src/prefs_filter.c:258 src/prefs_folder_item.c:170
@@ -233,7 +233,7 @@ msgstr ""
 msgid "Add Address to Book"
 msgstr "Engadir enderezo á axenda"
 
-#: src/addressadd.c:202 src/compose.c:4528 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4521 src/editaddress.c:201
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "Enderezo"
@@ -247,7 +247,7 @@ msgstr "Notas"
 msgid "Select Address Book Folder"
 msgstr "Seleccionar carpeta da axenda"
 
-#: src/addressbook.c:336 src/compose.c:495 src/mainwindow.c:470
+#: src/addressbook.c:336 src/compose.c:493 src/mainwindow.c:461
 #: src/messageview.c:137
 msgid "/_File"
 msgstr "/_Ficheiro"
@@ -268,10 +268,10 @@ msgstr "/_Ficheiro/Novo _JPilot"
 msgid "/_File/New _Server"
 msgstr "/_Ficheiro/Novo _servidor"
 
-#: src/addressbook.c:345 src/addressbook.c:348 src/compose.c:500
-#: src/compose.c:505 src/compose.c:509 src/mainwindow.c:488
-#: src/mainwindow.c:491 src/mainwindow.c:493 src/mainwindow.c:496
-#: src/mainwindow.c:498 src/messageview.c:140
+#: src/addressbook.c:345 src/addressbook.c:348 src/compose.c:498
+#: src/compose.c:503 src/compose.c:507 src/mainwindow.c:479
+#: src/mainwindow.c:482 src/mainwindow.c:484 src/mainwindow.c:487
+#: src/mainwindow.c:489 src/messageview.c:140
 msgid "/_File/---"
 msgstr "/_Ficheiro/---"
 
@@ -287,7 +287,7 @@ msgstr "/_Ficheiro/_Borrar"
 msgid "/_File/_Save"
 msgstr "/_Ficheiro/_Gardar"
 
-#: src/addressbook.c:350 src/compose.c:510 src/messageview.c:141
+#: src/addressbook.c:350 src/compose.c:508 src/messageview.c:141
 msgid "/_File/_Close"
 msgstr "/_Ficheiro/_Pechar"
 
@@ -319,7 +319,7 @@ msgstr "/_Enderezo/_Editar"
 msgid "/_Address/_Delete"
 msgstr "/_Enderezo/_Borrar"
 
-#: src/addressbook.c:358 src/compose.c:619 src/mainwindow.c:725
+#: src/addressbook.c:358 src/compose.c:617 src/mainwindow.c:716
 #: src/messageview.c:256
 msgid "/_Tools"
 msgstr "/_Ferramentas"
@@ -328,12 +328,12 @@ msgstr "/_Ferramentas"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Ferramentas/Importar ficheiro _LDIF"
 
-#: src/addressbook.c:360 src/compose.c:632 src/mainwindow.c:775
+#: src/addressbook.c:360 src/compose.c:630 src/mainwindow.c:766
 #: src/messageview.c:274
 msgid "/_Help"
 msgstr "/_Axuda"
 
-#: src/addressbook.c:361 src/compose.c:633 src/mainwindow.c:786
+#: src/addressbook.c:361 src/compose.c:631 src/mainwindow.c:777
 #: src/messageview.c:275
 msgid "/_Help/_About"
 msgstr "/_Ayuda/_Acerca de"
@@ -350,7 +350,7 @@ msgstr "/Novo _grupo"
 msgid "/New _Folder"
 msgstr "/Nova _carpeta"
 
-#: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:489
+#: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:487
 #: src/folderview.c:235 src/folderview.c:237 src/folderview.c:241
 #: src/folderview.c:252 src/folderview.c:254 src/folderview.c:256
 #: src/folderview.c:260 src/folderview.c:270 src/folderview.c:272
@@ -360,8 +360,8 @@ msgstr "/Nova _carpeta"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:512
-#: src/mainwindow.c:502 src/messageview.c:143
+#: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:510
+#: src/mainwindow.c:493 src/messageview.c:143
 msgid "/_Edit"
 msgstr "/_Editar"
 
@@ -373,7 +373,7 @@ msgstr "/_Borrar"
 msgid "E-Mail address"
 msgstr "Enderezo e-mail"
 
-#: src/addressbook.c:495 src/compose.c:4529 src/prefs_common.c:2402
+#: src/addressbook.c:495 src/compose.c:4522 src/prefs_common.c:2402
 msgid "Address book"
 msgstr "Axenda de enderezos"
 
@@ -382,8 +382,8 @@ msgid "Name:"
 msgstr "Nome:"
 
 #. Buttons
-#: src/addressbook.c:627 src/addressbook.c:1673 src/editaddress.c:884
-#: src/editaddress.c:1017 src/mainwindow.c:2292 src/prefs_actions.c:266
+#: src/addressbook.c:627 src/addressbook.c:1674 src/editaddress.c:884
+#: src/editaddress.c:1017 src/mainwindow.c:2274 src/prefs_actions.c:266
 #: src/prefs_display_header.c:278 src/prefs_display_header.c:333
 #: src/prefs_template.c:231
 msgid "Delete"
@@ -422,7 +422,7 @@ msgstr "Borrar enderezo(s)"
 msgid "Really delete the address(es)?"
 msgstr "¿Borrar realmente o(s) enderezo(s)?"
 
-#: src/addressbook.c:1664
+#: src/addressbook.c:1665
 #, fuzzy, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -431,38 +431,38 @@ msgstr ""
 "¿Quere borrar a carpeta E todos os enderezos en `%s'? \n"
 "Si so borra a carpeta os enderezos se moverán á carpeta pai."
 
-#: src/addressbook.c:1667 src/folderview.c:2139
+#: src/addressbook.c:1668 src/folderview.c:2139
 msgid "Delete folder"
 msgstr "Borrar carpeta"
 
-#: src/addressbook.c:1667
+#: src/addressbook.c:1668
 #, fuzzy
 msgid "_Folder only"
 msgstr "Carpeta só"
 
-#: src/addressbook.c:1667
+#: src/addressbook.c:1668
 #, fuzzy
 msgid "Folder and _addresses"
 msgstr "Carpeta e enderezos"
 
-#: src/addressbook.c:1672
+#: src/addressbook.c:1673
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "¿Borrar realmente `%s' ?"
 
-#: src/addressbook.c:2352 src/addressbook.c:2485
+#: src/addressbook.c:2353 src/addressbook.c:2486
 msgid "New user, could not save index file."
 msgstr "Novo usuario, non se puido gardar o ficheiro índice."
 
-#: src/addressbook.c:2356 src/addressbook.c:2489
+#: src/addressbook.c:2357 src/addressbook.c:2490
 msgid "New user, could not save address book files."
 msgstr "Novo usuario, non se puido gardar os ficheiros de enderezos"
 
-#: src/addressbook.c:2366 src/addressbook.c:2499
+#: src/addressbook.c:2367 src/addressbook.c:2500
 msgid "Old address book converted successfully."
 msgstr "Antiga axenda de enderezos convertida con éxito"
 
-#: src/addressbook.c:2371
+#: src/addressbook.c:2372
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -470,7 +470,7 @@ msgstr ""
 "Antiga axenda de enderezos convertida,\n"
 "non se puido gardar o novo ficheiro índice"
 
-#: src/addressbook.c:2384
+#: src/addressbook.c:2385
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -478,7 +478,7 @@ msgstr ""
 "Non se puido convertir a antiga axenda,\n"
 "pero crearonse novos ficheiros valeiros."
 
-#: src/addressbook.c:2390
+#: src/addressbook.c:2391
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -486,7 +486,7 @@ msgstr ""
 "Non se puido convertir a antiga axenda,\n"
 "Non se puideron crear os ficheiros para a nova."
 
-#: src/addressbook.c:2395
+#: src/addressbook.c:2396
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -494,91 +494,91 @@ msgstr ""
 "Non se puido convertir a antiga axenda\n"
 "e non se puideron crear ficheiros para unha nova."
 
-#: src/addressbook.c:2402
+#: src/addressbook.c:2403
 msgid "Addressbook conversion error"
 msgstr "Error na conversión da axenda"
 
-#: src/addressbook.c:2406
+#: src/addressbook.c:2407
 msgid "Addressbook conversion"
 msgstr "Conversión da  axenda"
 
-#: src/addressbook.c:2441
+#: src/addressbook.c:2442
 msgid "Addressbook Error"
 msgstr "Error na axenda"
 
-#: src/addressbook.c:2442 src/addressbook.c:2542
+#: src/addressbook.c:2443 src/addressbook.c:2543
 msgid "Could not read address index"
 msgstr "Non se puido ler o índice de enderezos"
 
-#: src/addressbook.c:2504
+#: src/addressbook.c:2505
 msgid "Old address book converted, could not save new address index file"
 msgstr ""
 "Antiga axenda de enderezos convertida, non se puido gardar o novo ficheiro "
 "índice"
 
-#: src/addressbook.c:2518
+#: src/addressbook.c:2519
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr ""
 "Non se puido convertir a antiga axenda, pero se crearon novos ficheiros "
 "valeiros."
 
-#: src/addressbook.c:2524
+#: src/addressbook.c:2525
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr ""
 "Non se puido convertir a antiga axenda, non se puideron crear os ficheiros "
 "para a nova."
 
-#: src/addressbook.c:2530
+#: src/addressbook.c:2531
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr ""
 "Non se puido convertir a antiga axenda e non se puideron crear ficheiros "
 "para unha nova."
 
-#: src/addressbook.c:2548
+#: src/addressbook.c:2549
 msgid "Addressbook Conversion Error"
 msgstr "Erro na conversión da axenda"
 
-#: src/addressbook.c:2554
+#: src/addressbook.c:2555
 msgid "Addressbook Conversion"
 msgstr "Conversión da axenda"
 
-#: src/addressbook.c:3055 src/prefs_common.c:963
+#: src/addressbook.c:3056 src/prefs_common.c:963
 msgid "Interface"
 msgstr "Interfaz"
 
-#: src/addressbook.c:3071 src/importldif.c:514
+#: src/addressbook.c:3072 src/importldif.c:514
 msgid "Address Book"
 msgstr "Axenda de enderezos"
 
-#: src/addressbook.c:3087
+#: src/addressbook.c:3088
 msgid "Person"
 msgstr "Persoa"
 
-#: src/addressbook.c:3103
+#: src/addressbook.c:3104
 msgid "EMail Address"
 msgstr "Enderezo e-mail"
 
-#: src/addressbook.c:3119
+#: src/addressbook.c:3120
 msgid "Group"
 msgstr "Grupo"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3135 src/folderview.c:346 src/prefs_account.c:1866
+#: src/addressbook.c:3136 src/folderview.c:346 src/prefs_account.c:1866
 msgid "Folder"
 msgstr "Carpeta"
 
-#: src/addressbook.c:3151
+#: src/addressbook.c:3152
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3167 src/addressbook.c:3183
+#: src/addressbook.c:3168 src/addressbook.c:3184
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3199
+#: src/addressbook.c:3200
 msgid "LDAP Server"
 msgstr "Servidor LDAP"
 
@@ -590,7 +590,7 @@ msgstr "Enderezo común"
 msgid "Personal address"
 msgstr "Enderezo persoal"
 
-#: src/alertpanel.c:138 src/compose.c:5214 src/main.c:515
+#: src/alertpanel.c:138 src/compose.c:5208 src/main.c:515
 msgid "Notice"
 msgstr "Notificación"
 
@@ -645,382 +645,382 @@ msgstr "Marrón"
 msgid "None"
 msgstr "Ningún"
 
-#: src/compose.c:487
+#: src/compose.c:485
 msgid "/_Add..."
 msgstr "/_Engadir"
 
-#: src/compose.c:488
+#: src/compose.c:486
 msgid "/_Remove"
 msgstr "/_Quitar"
 
-#: src/compose.c:490 src/folderview.c:243 src/folderview.c:262
+#: src/compose.c:488 src/folderview.c:243 src/folderview.c:262
 #: src/folderview.c:277
 msgid "/_Properties..."
 msgstr "/_Propiedades..."
 
-#: src/compose.c:496
+#: src/compose.c:494
 #, fuzzy
 msgid "/_File/_Send"
 msgstr "/_Ficheiro/_Gardar"
 
-#: src/compose.c:498
+#: src/compose.c:496
 #, fuzzy
 msgid "/_File/Send _later"
 msgstr "/_Mensaxe/Enviar _logo"
 
-#: src/compose.c:501
+#: src/compose.c:499
 #, fuzzy
 msgid "/_File/Save to _draft folder"
 msgstr "/_Mensaxe/_Gardar como borrador"
 
-#: src/compose.c:503
+#: src/compose.c:501
 #, fuzzy
 msgid "/_File/Save and _keep editing"
 msgstr "/_Mensaxe/Gardar e _seguir editando"
 
-#: src/compose.c:506
+#: src/compose.c:504
 msgid "/_File/_Attach file"
 msgstr "/_Ficheiro/_Adxuntar ficheiro"
 
-#: src/compose.c:507
+#: src/compose.c:505
 msgid "/_File/_Insert file"
 msgstr "/_Ficheiro/_Inserir ficheiro"
 
-#: src/compose.c:508
+#: src/compose.c:506
 msgid "/_File/Insert si_gnature"
 msgstr "/_Ficheiro/Inserir _sinatura"
 
-#: src/compose.c:513
+#: src/compose.c:511
 msgid "/_Edit/_Undo"
 msgstr "/_Editar/_Desfacer"
 
-#: src/compose.c:514
+#: src/compose.c:512
 msgid "/_Edit/_Redo"
 msgstr "/_Editar/_Refacer"
 
-#: src/compose.c:515 src/compose.c:522 src/mainwindow.c:506
+#: src/compose.c:513 src/compose.c:520 src/mainwindow.c:497
 #: src/messageview.c:146
 msgid "/_Edit/---"
 msgstr "/_Editar/---"
 
-#: src/compose.c:516
+#: src/compose.c:514
 msgid "/_Edit/Cu_t"
 msgstr "/_Editar/Cor_tar"
 
-#: src/compose.c:517 src/mainwindow.c:503 src/messageview.c:144
+#: src/compose.c:515 src/mainwindow.c:494 src/messageview.c:144
 msgid "/_Edit/_Copy"
 msgstr "/_Editar/_Copiar"
 
-#: src/compose.c:518
+#: src/compose.c:516
 msgid "/_Edit/_Paste"
 msgstr "/_Editar/_Pegar"
 
-#: src/compose.c:519
+#: src/compose.c:517
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Editar/Pegar como c_itación"
 
-#: src/compose.c:521 src/mainwindow.c:504 src/messageview.c:145
+#: src/compose.c:519 src/mainwindow.c:495 src/messageview.c:145
 msgid "/_Edit/Select _all"
 msgstr "/_Editar/_Seleccionar todo"
 
-#: src/compose.c:523
+#: src/compose.c:521
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/_Editar/_Recortar párrafo actual"
 
-#: src/compose.c:525
+#: src/compose.c:523
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/_Editar/_Cortar todas as líneas longas"
 
-#: src/compose.c:527
+#: src/compose.c:525
 #, fuzzy
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Editar/_Copiar"
 
-#: src/compose.c:528 src/mainwindow.c:511 src/messageview.c:150
+#: src/compose.c:526 src/mainwindow.c:502 src/messageview.c:150
 #: src/summaryview.c:400
 msgid "/_View"
 msgstr "/_Ver"
 
-#: src/compose.c:529
+#: src/compose.c:527
 msgid "/_View/_To"
 msgstr "/_Ver/_Para"
 
-#: src/compose.c:530
+#: src/compose.c:528
 msgid "/_View/_Cc"
 msgstr "/_Ver/_Copia"
 
-#: src/compose.c:531
+#: src/compose.c:529
 msgid "/_View/_Bcc"
 msgstr "/_Ver/C_opia oculta"
 
-#: src/compose.c:532
+#: src/compose.c:530
 msgid "/_View/_Reply to"
 msgstr "/_Ver/_Respostar a"
 
-#: src/compose.c:533 src/compose.c:535 src/compose.c:537 src/compose.c:539
-#: src/mainwindow.c:529 src/mainwindow.c:532 src/mainwindow.c:558
-#: src/mainwindow.c:582 src/mainwindow.c:675 src/mainwindow.c:679
+#: src/compose.c:531 src/compose.c:533 src/compose.c:535 src/compose.c:537
+#: src/mainwindow.c:520 src/mainwindow.c:523 src/mainwindow.c:549
+#: src/mainwindow.c:573 src/mainwindow.c:666 src/mainwindow.c:670
 #: src/messageview.c:233
 msgid "/_View/---"
 msgstr "/_Ver/---"
 
-#: src/compose.c:534
+#: src/compose.c:532
 msgid "/_View/_Followup to"
 msgstr "/_Ver/_Engadir a"
 
-#: src/compose.c:536
+#: src/compose.c:534
 msgid "/_View/R_uler"
 msgstr "/_Ver/_Regra"
 
-#: src/compose.c:538
+#: src/compose.c:536
 msgid "/_View/_Attachment"
 msgstr "/_Ver/_Adxuntos"
 
-#: src/compose.c:545 src/mainwindow.c:589 src/messageview.c:157
+#: src/compose.c:543 src/mainwindow.c:580 src/messageview.c:157
 #, fuzzy
 msgid "/_View/Character _encoding"
 msgstr "/_Ver/_Ordear/Descendente"
 
-#: src/compose.c:546
+#: src/compose.c:544
 msgid "/_View/Character _encoding/_Automatic"
 msgstr ""
 
-#: src/compose.c:548 src/compose.c:554 src/compose.c:560 src/compose.c:564
-#: src/compose.c:570 src/compose.c:574 src/compose.c:580 src/compose.c:584
-#: src/compose.c:594 src/compose.c:598 src/compose.c:608 src/compose.c:612
-#: src/mainwindow.c:585 src/mainwindow.c:592 src/messageview.c:153
+#: src/compose.c:546 src/compose.c:552 src/compose.c:558 src/compose.c:562
+#: src/compose.c:568 src/compose.c:572 src/compose.c:578 src/compose.c:582
+#: src/compose.c:592 src/compose.c:596 src/compose.c:606 src/compose.c:610
+#: src/mainwindow.c:576 src/mainwindow.c:583 src/messageview.c:153
 #, fuzzy
 msgid "/_View/Character _encoding/---"
 msgstr "/_Ver/_Ordear/Descendente"
 
-#: src/compose.c:550 src/mainwindow.c:593 src/messageview.c:161
+#: src/compose.c:548 src/mainwindow.c:584 src/messageview.c:161
 #, fuzzy
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Ver/_Codificación/ASCII de 7 bits (US-ASC_II)"
 
-#: src/compose.c:552 src/mainwindow.c:595 src/messageview.c:164
+#: src/compose.c:550 src/mainwindow.c:586 src/messageview.c:164
 #, fuzzy
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Ver/_Codificación/Unicode (_UTF-8)"
 
-#: src/compose.c:556 src/mainwindow.c:599 src/messageview.c:167
+#: src/compose.c:554 src/mainwindow.c:590 src/messageview.c:167
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Ver/_Codificación/Europeo Occidental (ISO-8859-_1)"
 
-#: src/compose.c:558 src/mainwindow.c:601 src/messageview.c:169
+#: src/compose.c:556 src/mainwindow.c:592 src/messageview.c:169
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Ver/_Codificación/Europeo Occidental (ISO-8859-_15)"
 
-#: src/compose.c:562 src/mainwindow.c:605 src/messageview.c:172
+#: src/compose.c:560 src/mainwindow.c:596 src/messageview.c:172
 #, fuzzy
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Ver/_Codificación/Centroeuropeo (ISO-8859-_2)"
 
-#: src/compose.c:566 src/mainwindow.c:609 src/messageview.c:175
+#: src/compose.c:564 src/mainwindow.c:600 src/messageview.c:175
 #, fuzzy
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Ver/_Codificación/Báltico (ISO-8859-13)"
 
-#: src/compose.c:568 src/mainwindow.c:611 src/messageview.c:177
+#: src/compose.c:566 src/mainwindow.c:602 src/messageview.c:177
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Ver/_Codificación/Báltico (ISO-8859-_4)"
 
-#: src/compose.c:572 src/mainwindow.c:615 src/messageview.c:180
+#: src/compose.c:570 src/mainwindow.c:606 src/messageview.c:180
 #, fuzzy
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Ver/_Codificación/Grego (ISO-8859-_7)"
 
-#: src/compose.c:576 src/mainwindow.c:619 src/messageview.c:183
+#: src/compose.c:574 src/mainwindow.c:610 src/messageview.c:183
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Ver/_Codificación/Grego (ISO-8859-_7)"
 
-#: src/compose.c:578 src/mainwindow.c:621 src/messageview.c:185
+#: src/compose.c:576 src/mainwindow.c:612 src/messageview.c:185
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Ver/_Codificación/Cirílico (Windows-1251)"
 
-#: src/compose.c:582 src/mainwindow.c:625 src/messageview.c:188
+#: src/compose.c:580 src/mainwindow.c:616 src/messageview.c:188
 #, fuzzy
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Ver/_Codificación/Turco (ISO-8859-_9)"
 
-#: src/compose.c:586 src/mainwindow.c:629 src/messageview.c:191
+#: src/compose.c:584 src/mainwindow.c:620 src/messageview.c:191
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Ver/_Codificación/Cirílico (ISO-8859-_5)"
 
-#: src/compose.c:588 src/mainwindow.c:631 src/messageview.c:193
+#: src/compose.c:586 src/mainwindow.c:622 src/messageview.c:193
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Ver/_Codificación/Cirílico (KOI8-_R)"
 
-#: src/compose.c:590 src/mainwindow.c:633 src/messageview.c:195
+#: src/compose.c:588 src/mainwindow.c:624 src/messageview.c:195
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Ver/_Codificación/Cirílico (KOI8-_R)"
 
-#: src/compose.c:592 src/mainwindow.c:635 src/messageview.c:197
+#: src/compose.c:590 src/mainwindow.c:626 src/messageview.c:197
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Ver/_Codificación/Cirílico (Windows-1251)"
 
-#: src/compose.c:596 src/mainwindow.c:639 src/messageview.c:200
+#: src/compose.c:594 src/mainwindow.c:630 src/messageview.c:200
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Ver/_Codificación/Xaponés (ISO-2022-_JP)"
 
-#: src/compose.c:600 src/mainwindow.c:649 src/messageview.c:209
+#: src/compose.c:598 src/mainwindow.c:640 src/messageview.c:209
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Ver/_Codificación/Chines simplificado (_GB2312)"
 
-#: src/compose.c:602 src/mainwindow.c:651 src/messageview.c:211
+#: src/compose.c:600 src/mainwindow.c:642 src/messageview.c:211
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Ver/_Codificación/Chines simplificado (_GB2312)"
 
-#: src/compose.c:604 src/mainwindow.c:653 src/messageview.c:213
+#: src/compose.c:602 src/mainwindow.c:644 src/messageview.c:213
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Ver/_Codificación/Chines tradicional (_Big5)"
 
-#: src/compose.c:606 src/mainwindow.c:655 src/messageview.c:215
+#: src/compose.c:604 src/mainwindow.c:646 src/messageview.c:215
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Ver/_Codificación/Chines tradicional (EUC-_TW)"
 
-#: src/compose.c:610 src/mainwindow.c:661 src/messageview.c:220
+#: src/compose.c:608 src/mainwindow.c:652 src/messageview.c:220
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Ver/_Codificación/Coreano (EUC-_KR)"
 
-#: src/compose.c:614 src/mainwindow.c:667 src/messageview.c:225
+#: src/compose.c:612 src/mainwindow.c:658 src/messageview.c:225
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Ver/_Codificación/Tailandés (TIS-620)"
 
-#: src/compose.c:616 src/mainwindow.c:669 src/messageview.c:227
+#: src/compose.c:614 src/mainwindow.c:660 src/messageview.c:227
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Ver/_Codificación/Tailandés (Windows-874)"
 
-#: src/compose.c:620 src/mainwindow.c:726 src/messageview.c:257
+#: src/compose.c:618 src/mainwindow.c:717 src/messageview.c:257
 msgid "/_Tools/_Address book"
 msgstr "/_Ferramentas/_Axenda de enderezos"
 
-#: src/compose.c:621
+#: src/compose.c:619
 msgid "/_Tools/_Template"
 msgstr "/_Ferramentas/Plan_tillas"
 
-#: src/compose.c:622 src/mainwindow.c:749 src/messageview.c:272
+#: src/compose.c:620 src/mainwindow.c:740 src/messageview.c:272
 msgid "/_Tools/Actio_ns"
 msgstr "/_Ferramentas/Acció_ns"
 
-#: src/compose.c:623 src/compose.c:627 src/mainwindow.c:729
-#: src/mainwindow.c:743 src/mainwindow.c:748 src/mainwindow.c:750
-#: src/mainwindow.c:753 src/mainwindow.c:755 src/messageview.c:260
+#: src/compose.c:621 src/compose.c:625 src/mainwindow.c:720
+#: src/mainwindow.c:734 src/mainwindow.c:739 src/mainwindow.c:741
+#: src/mainwindow.c:744 src/mainwindow.c:746 src/messageview.c:260
 #: src/messageview.c:271
 msgid "/_Tools/---"
 msgstr "/_Ferramentas/---"
 
-#: src/compose.c:624
+#: src/compose.c:622
 #, fuzzy
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/_Editar/Editar con editor e_xterno"
 
-#: src/compose.c:628
+#: src/compose.c:626
 #, fuzzy
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Ferramentas/Acció_ns"
 
-#: src/compose.c:629
+#: src/compose.c:627
 #, fuzzy
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/_Mensaxe/_Encriptar"
 
-#: src/compose.c:855
+#: src/compose.c:853
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: o ficheiro non existe\n"
 
-#: src/compose.c:954 src/compose.c:1024 src/procmsg.c:1353
+#: src/compose.c:952 src/compose.c:1022 src/procmsg.c:1353
 msgid "Can't get text part\n"
 msgstr "Non se pode obter o texto\n"
 
-#: src/compose.c:1420
+#: src/compose.c:1418
 #, fuzzy
 msgid "Quote mark format error."
 msgstr "Marca de cita para erro."
 
-#: src/compose.c:1432
+#: src/compose.c:1430
 msgid "Message reply/forward format error."
 msgstr "Erro no formato da mensaxe para respostar/redirixir "
 
-#: src/compose.c:1801
+#: src/compose.c:1799
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "o ficheiro %s non existe\n"
 
-#: src/compose.c:1805
+#: src/compose.c:1803
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Non se pode obter o tamaño de %s\n"
 
-#: src/compose.c:1809
+#: src/compose.c:1807
 #, c-format
 msgid "File %s is empty."
 msgstr "o Ficheiro %s esta valeiro."
 
-#: src/compose.c:1813
+#: src/compose.c:1811
 #, c-format
 msgid "Can't read %s."
 msgstr "Non poido ler %s."
 
-#: src/compose.c:1848
+#: src/compose.c:1846
 #, c-format
 msgid "Message: %s"
 msgstr "Mensaxe: %s"
 
-#: src/compose.c:1920 src/mimeview.c:560
+#: src/compose.c:1918 src/mimeview.c:560
 msgid "Can't get the part of multipart message."
 msgstr "Non se pode obter a parte do mensaxe multipartes."
 
-#: src/compose.c:2362
+#: src/compose.c:2360
 msgid " [Edited]"
 msgstr " [Editado]"
 
-#: src/compose.c:2364
+#: src/compose.c:2362
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Compoñer mensaxe%s"
 
-#: src/compose.c:2367
+#: src/compose.c:2365
 #, c-format
 msgid "Compose message%s"
 msgstr "Compoñer mensaxe%s"
 
-#: src/compose.c:2478
+#: src/compose.c:2476
 msgid "Recipient is not specified."
 msgstr "Non se especificou o destinatario."
 
-#: src/compose.c:2486
+#: src/compose.c:2484
 #, fuzzy
 msgid "Empty subject"
 msgstr "Asunto"
 
-#: src/compose.c:2487
+#: src/compose.c:2485
 msgid "Subject is empty. Send it anyway?"
 msgstr "o asunto esta valeiro. ¿Enviar de todas formas?"
 
-#: src/compose.c:2538
+#: src/compose.c:2536
 msgid "can't get recipient list."
 msgstr "non se pode obter a lista de destinatarios."
 
-#: src/compose.c:2558
+#: src/compose.c:2556
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1028,26 +1028,26 @@ msgstr ""
 "Non especificó ningunha conta para enviar.\n"
 "Seleccione algunha conta antes de enviar."
 
-#: src/compose.c:2572 src/send_message.c:297
+#: src/compose.c:2570 src/send_message.c:297
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Ocurriu un erro enviando o mensaxe a %s ."
 
-#: src/compose.c:2595
+#: src/compose.c:2593
 msgid "Can't save the message to outbox."
 msgstr "Non se pode gardar a mensaxe en Saida."
 
-#: src/compose.c:2645
+#: src/compose.c:2643
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "Non puiden atopar ningunha clave asociada con a Id-clave actual `%s'."
 
-#: src/compose.c:2709 src/compose.c:2965 src/compose.c:3028 src/compose.c:3148
-#: src/utils.c:2365
+#: src/compose.c:2707 src/compose.c:2963 src/compose.c:3026 src/compose.c:3146
+#: src/utils.c:2379
 msgid "can't change file mode\n"
 msgstr "non se pode cambiar os permisos de ficheiro\n"
 
-#: src/compose.c:2741
+#: src/compose.c:2739
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1058,12 +1058,12 @@ msgstr ""
 "%s a %s.\n"
 "¿Envia-lo de todo xeito?"
 
-#: src/compose.c:2747
+#: src/compose.c:2745
 #, fuzzy
 msgid "Code conversion error"
 msgstr "Error na conversión da axenda"
 
-#: src/compose.c:2816
+#: src/compose.c:2814
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1072,155 +1072,155 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:2820
+#: src/compose.c:2818
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3108
+#: src/compose.c:3106
 msgid "can't remove the old message\n"
 msgstr "non se pode eliminar a mensaxe antiga\n"
 
-#: src/compose.c:3126
+#: src/compose.c:3124
 msgid "queueing message...\n"
 msgstr "poñendo na cola...\n"
 
-#: src/compose.c:3208
+#: src/compose.c:3206
 msgid "can't find queue folder\n"
 msgstr "non podo atopar a carpeta de cola\n"
 
-#: src/compose.c:3215
+#: src/compose.c:3213
 msgid "can't queue the message\n"
 msgstr "a mensaxe non se pode poñer na cola\n"
 
-#: src/compose.c:3792
+#: src/compose.c:3790
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "Message-ID generado: %s\n"
 
-#: src/compose.c:3901
+#: src/compose.c:3899
 msgid "Creating compose window...\n"
 msgstr "Creando fiestra de composicion...\n"
 
-#: src/compose.c:3949 src/headerview.c:54 src/summary_search.c:214
+#: src/compose.c:3947 src/headerview.c:54 src/summary_search.c:214
 msgid "From:"
 msgstr "Dende:"
 
-#: src/compose.c:4021
+#: src/compose.c:4019
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/_Ferramentas/Acció_ns"
 
-#: src/compose.c:4024
+#: src/compose.c:4022
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/_Mensaxe/_Encriptar"
 
-#: src/compose.c:4062 src/compose.c:5001
+#: src/compose.c:4060 src/compose.c:4995
 msgid "MIME type"
 msgstr "Tipo MIME"
 
 #. S_COL_DATE
-#: src/compose.c:4071 src/mimeview.c:192 src/prefs_filter_edit.c:585
+#: src/compose.c:4069 src/mimeview.c:192 src/prefs_filter_edit.c:585
 #: src/prefs_summary_column.c:75 src/select-keys.c:317 src/summaryview.c:4217
 msgid "Size"
 msgstr "Tamaño"
 
-#: src/compose.c:4449 src/mainwindow.c:2224 src/prefs_account.c:719
+#: src/compose.c:4442 src/mainwindow.c:2207 src/prefs_account.c:719
 #: src/prefs_common.c:947
 msgid "Send"
 msgstr "Enviar"
 
-#: src/compose.c:4450
+#: src/compose.c:4443
 msgid "Send message"
 msgstr "Enviar Mensaxe"
 
-#: src/compose.c:4458
+#: src/compose.c:4451
 msgid "Send later"
 msgstr "Enviar mais tarde"
 
-#: src/compose.c:4459
+#: src/compose.c:4452
 msgid "Put into queue folder and send later"
 msgstr "Poñer na cola e enviar mais tarde"
 
-#: src/compose.c:4467
+#: src/compose.c:4460
 msgid "Draft"
 msgstr "Borrador"
 
-#: src/compose.c:4468
+#: src/compose.c:4461
 msgid "Save to draft folder"
 msgstr "Gardar como borrador"
 
-#: src/compose.c:4478
+#: src/compose.c:4471
 msgid "Insert"
 msgstr "Inserir"
 
-#: src/compose.c:4479
+#: src/compose.c:4472
 msgid "Insert file"
 msgstr "Inserir ficheiro"
 
-#: src/compose.c:4487
+#: src/compose.c:4480
 msgid "Attach"
 msgstr "Adxuntar"
 
-#: src/compose.c:4488
+#: src/compose.c:4481
 msgid "Attach file"
 msgstr "Adxuntar ficheiro"
 
 #. signature
-#: src/compose.c:4498 src/prefs_account.c:1391 src/prefs_common.c:1356
+#: src/compose.c:4491 src/prefs_account.c:1391 src/prefs_common.c:1356
 msgid "Signature"
 msgstr "Sinatura"
 
-#: src/compose.c:4499
+#: src/compose.c:4492
 msgid "Insert signature"
 msgstr "Inserir sinatura"
 
-#: src/compose.c:4508 src/prefs_common.c:1378 src/prefs_common.c:2382
+#: src/compose.c:4501 src/prefs_common.c:1378 src/prefs_common.c:2382
 msgid "Editor"
 msgstr "Editor"
 
-#: src/compose.c:4509
+#: src/compose.c:4502
 msgid "Edit with external editor"
 msgstr "Editar con un editor externo"
 
-#: src/compose.c:4517
+#: src/compose.c:4510
 msgid "Linewrap"
 msgstr "Recortar"
 
-#: src/compose.c:4518
+#: src/compose.c:4511
 msgid "Wrap all long lines"
 msgstr "Cortar todas as líneas longas"
 
-#: src/compose.c:4897
+#: src/compose.c:4891
 msgid "Invalid MIME type."
 msgstr "Tipo MIME inválido."
 
-#: src/compose.c:4915
+#: src/compose.c:4909
 msgid "File doesn't exist or is empty."
 msgstr "O ficheiro non existe ou está valeiro."
 
-#: src/compose.c:4983
+#: src/compose.c:4977
 msgid "Properties"
 msgstr "Propiedades"
 
-#: src/compose.c:5003
+#: src/compose.c:4997
 msgid "Encoding"
 msgstr "Codificación"
 
-#: src/compose.c:5026 src/prefs_folder_item.c:183
+#: src/compose.c:5020 src/prefs_folder_item.c:183
 msgid "Path"
 msgstr "Ruta"
 
-#: src/compose.c:5027
+#: src/compose.c:5021
 msgid "File name"
 msgstr "Nome de ficheiro"
 
-#: src/compose.c:5185
+#: src/compose.c:5179
 #, 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:5211
+#: src/compose.c:5205
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1231,75 +1231,75 @@ msgstr ""
 "¿Desea terminar o proceso?\n"
 "Id. de proceso: %d"
 
-#: src/compose.c:5228
+#: src/compose.c:5222
 #, c-format
 msgid "Terminated process group id: %d"
 msgstr "Terminado proceso id.: %d"
 
-#: src/compose.c:5229
+#: src/compose.c:5223
 #, c-format
 msgid "Temporary file: %s"
 msgstr "Ficheiro temporal: %s"
 
-#: src/compose.c:5253
+#: src/compose.c:5247
 msgid "Compose: input from monitoring process\n"
 msgstr "Compoñer: entrada dende proceso monitor\n"
 
 #. failed
-#: src/compose.c:5284
+#: src/compose.c:5278
 msgid "Couldn't exec external editor\n"
 msgstr "Non se puido executar o editor externo\n"
 
-#: src/compose.c:5288
+#: src/compose.c:5282
 msgid "Couldn't write to file\n"
 msgstr "Non se puido escribir no ficheiro\n"
 
-#: src/compose.c:5290
+#: src/compose.c:5284
 msgid "Pipe read failed\n"
 msgstr "Fallo lendo tubería\n"
 
-#: src/compose.c:5596 src/compose.c:5604 src/compose.c:5610
+#: src/compose.c:5590 src/compose.c:5598 src/compose.c:5604
 msgid "Can't queue the message."
 msgstr "O mensaxe non se pode poñer na cola."
 
-#: src/compose.c:5701
+#: src/compose.c:5695
 #, fuzzy
 msgid "Select files"
 msgstr "Seleccionar ficheiro"
 
-#: src/compose.c:5723
+#: src/compose.c:5717
 msgid "Select file"
 msgstr "Seleccionar ficheiro"
 
-#: src/compose.c:5760
+#: src/compose.c:5754
 #, fuzzy
 msgid "Save message"
 msgstr "Enviar Mensaxe"
 
-#: src/compose.c:5761
+#: src/compose.c:5755
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Esta mensaxe foi modificado. ¿Desea descartala?"
 
-#: src/compose.c:5763
+#: src/compose.c:5757
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:5805
+#: src/compose.c:5799
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "¿Quere aplicar a plantilla `%s' ?"
 
-#: src/compose.c:5807
+#: src/compose.c:5801
 msgid "Apply template"
 msgstr "Aplicar plantilla"
 
-#: src/compose.c:5808
+#: src/compose.c:5802
 #, fuzzy
 msgid "_Replace"
 msgstr "Substituír"
 
-#: src/compose.c:5808
+#: src/compose.c:5802
 #, fuzzy
 msgid "_Insert"
 msgstr "Inserir"
@@ -1747,12 +1747,12 @@ msgstr "Establecendo información de carpeta...\n"
 msgid "Setting folder info..."
 msgstr "Establecendo información de carpeta..."
 
-#: src/folderview.c:805 src/mainwindow.c:3301 src/setup.c:81
+#: src/folderview.c:805 src/mainwindow.c:3272 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Revisando carpeta %s%c%s ..."
 
-#: src/folderview.c:809 src/mainwindow.c:3306 src/setup.c:86
+#: src/folderview.c:809 src/mainwindow.c:3277 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Revisando carpeta %s ..."
@@ -2077,45 +2077,45 @@ msgstr "Fallo de autenticación"
 msgid "IMAP4 login failed.\n"
 msgstr "Autentificación IMAP4 fallida.\n"
 
-#: src/imap.c:3522
+#: src/imap.c:3528
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "non podo engadir %s a %s\n"
 
-#: src/imap.c:3529
+#: src/imap.c:3535
 msgid "(sending file...)"
 msgstr "(enviando ficheiro...)"
 
-#: src/imap.c:3557
+#: src/imap.c:3563
 #, fuzzy, c-format
 msgid "can't append message to %s\n"
 msgstr "non se pode engadir o mensaxe %s\n"
 
-#: src/imap.c:3589
+#: src/imap.c:3595
 #, fuzzy, c-format
 msgid "can't copy %s to %s\n"
 msgstr "non podo copiar %d a %s\n"
 
-#: src/imap.c:3613
+#: src/imap.c:3619
 #, fuzzy, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "erro no comando imap: STORE %d:%d %s\n"
 
-#: src/imap.c:3627
+#: src/imap.c:3633
 msgid "error while imap command: EXPUNGE\n"
 msgstr "erro no comando imap: EXPUNGE\n"
 
-#: src/imap.c:3640
+#: src/imap.c:3646
 #, fuzzy
 msgid "error while imap command: CLOSE\n"
 msgstr "erro no comando imap: EXPUNGE\n"
 
-#: src/imap.c:3873
+#: src/imap.c:3879
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv non pode convertir UTF-7 a %s\n"
 
-#: src/imap.c:3903
+#: src/imap.c:3909
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv non pode convertir %s a UTF-7\n"
@@ -2217,7 +2217,7 @@ msgstr "Importar ficheiro LDIF na axenda"
 msgid "Prev"
 msgstr "Anterior"
 
-#: src/importldif.c:768 src/mainwindow.c:2321
+#: src/importldif.c:768 src/mainwindow.c:2303
 msgid "Next"
 msgstr "Seguinte"
 
@@ -2563,646 +2563,646 @@ msgid ""
 "Do you want to migrate it?"
 msgstr ""
 
-#: src/mainwindow.c:471
+#: src/mainwindow.c:462
 msgid "/_File/_Folder"
 msgstr "/_Ficheiro/_Carpeta"
 
-#: src/mainwindow.c:472
+#: src/mainwindow.c:463
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/_Ficheiro/_Carpeta_/Crear _nova carpeta..."
 
-#: src/mainwindow.c:474
+#: src/mainwindow.c:465
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/_Ficheiro/_Carpeta_/_Renomear carpeta..."
 
-#: src/mainwindow.c:475
+#: src/mainwindow.c:466
 #, fuzzy
 msgid "/_File/_Folder/_Move folder..."
 msgstr "/_Ficheiro/_Carpeta_/_Renomear carpeta..."
 
-#: src/mainwindow.c:476
+#: src/mainwindow.c:467
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/_Ficheiro/_Carpeta_/_Borrar carpeta"
 
-#: src/mainwindow.c:477
+#: src/mainwindow.c:468
 #, fuzzy
 msgid "/_File/_Mailbox"
 msgstr "/_Ficheiro/_Engadir caixa de correo"
 
-#: src/mainwindow.c:478
+#: src/mainwindow.c:469
 #, fuzzy
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/_Ficheiro/_Engadir caixa de correo"
 
-#: src/mainwindow.c:479
+#: src/mainwindow.c:470
 #, fuzzy
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/Eliminar _mailbox"
 
-#: src/mainwindow.c:480 src/mainwindow.c:485
+#: src/mainwindow.c:471 src/mainwindow.c:476
 #, fuzzy
 msgid "/_File/_Mailbox/---"
 msgstr "/_Ficheiro/_Carpeta"
 
-#: src/mainwindow.c:481
+#: src/mainwindow.c:472
 #, fuzzy
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "/_Comprobar si hai mensaxes novas"
 
-#: src/mainwindow.c:483
+#: src/mainwindow.c:474
 #, fuzzy
 msgid "/_File/_Mailbox/Check for new messages in _all mailboxes"
 msgstr "/_Ficheiro/_Comprobar mensaxes novas en todas as carpetas"
 
-#: src/mainwindow.c:486
+#: src/mainwindow.c:477
 #, fuzzy
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "/R_econstruir árbre de carpetas"
 
-#: src/mainwindow.c:489
+#: src/mainwindow.c:480
 msgid "/_File/_Import mbox file..."
 msgstr "/_Ficheiro/I_mportar ficheiro mbox..."
 
-#: src/mainwindow.c:490
+#: src/mainwindow.c:481
 msgid "/_File/_Export to mbox file..."
 msgstr "/_Ficheiro/_Exportar a ficheiro mbox..."
 
-#: src/mainwindow.c:492
+#: src/mainwindow.c:483
 #, fuzzy
 msgid "/_File/Empty all _trash"
 msgstr "/_Ficheiro/_Baleirar Papeleira"
 
-#: src/mainwindow.c:494 src/messageview.c:138
+#: src/mainwindow.c:485 src/messageview.c:138
 msgid "/_File/_Save as..."
 msgstr "/_Ficheiro/_Gardar como..."
 
-#: src/mainwindow.c:495 src/messageview.c:139
+#: src/mainwindow.c:486 src/messageview.c:139
 msgid "/_File/_Print..."
 msgstr "/_Ficheiro/_Imprimir"
 
-#: src/mainwindow.c:497
+#: src/mainwindow.c:488
 #, fuzzy
 msgid "/_File/_Work offline"
 msgstr "/_Ficheiro/_Inserir ficheiro"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:500
+#: src/mainwindow.c:491
 msgid "/_File/E_xit"
 msgstr "/_Ficheiro/Sai_r"
 
-#: src/mainwindow.c:505
+#: src/mainwindow.c:496
 msgid "/_Edit/Select _thread"
 msgstr "/_Editar/Seleccionar _fio"
 
-#: src/mainwindow.c:507 src/messageview.c:147
+#: src/mainwindow.c:498 src/messageview.c:147
 msgid "/_Edit/_Find in current message..."
 msgstr "/_Edición/_Buscar na mensaxe actual..."
 
-#: src/mainwindow.c:509
+#: src/mainwindow.c:500
 msgid "/_Edit/_Search messages..."
 msgstr "/_Edición/_Buscar en carpeta..."
 
-#: src/mainwindow.c:512
+#: src/mainwindow.c:503
 msgid "/_View/Show or hi_de"
 msgstr "/_Ver/Mostrar ou o_cultar"
 
-#: src/mainwindow.c:513
+#: src/mainwindow.c:504
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/_Ver/Mostrar ou o_cultar/_Arbre de carpetas"
 
-#: src/mainwindow.c:515
+#: src/mainwindow.c:506
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/_Ver/Mostrar ou o_cultar/_Mensaxes"
 
-#: src/mainwindow.c:517
+#: src/mainwindow.c:508
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/_Ver/Mostrar ou o_cultar/_Ferramentas"
 
-#: src/mainwindow.c:519
+#: src/mainwindow.c:510
 msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/_Ver/Mostrar ou o_cultar/_Ferramentas/Iconos _e texto"
 
-#: src/mainwindow.c:521
+#: src/mainwindow.c:512
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/_Ver/Mostrar ou o_cultar/_Ferramentas/_Iconos"
 
-#: src/mainwindow.c:523
+#: src/mainwindow.c:514
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/_Ver/Mostrar ou o_cultar/_Ferramentas/_Texto"
 
-#: src/mainwindow.c:525
+#: src/mainwindow.c:516
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/_Ver/Mostrar ou o_cultar/_Ferramentas/_Ocultar"
 
-#: src/mainwindow.c:527
+#: src/mainwindow.c:518
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/_Ver/Mostrar ou o_cultar/_Barra de estado"
 
-#: src/mainwindow.c:530
+#: src/mainwindow.c:521
 msgid "/_View/Separate f_older tree"
 msgstr "/_Ver/Separar arb_re de carpetas"
 
-#: src/mainwindow.c:531
+#: src/mainwindow.c:522
 #, fuzzy
 msgid "/_View/Separate _message view"
 msgstr "/_Ver/Separar vista de m_ensaxes"
 
-#: src/mainwindow.c:533
+#: src/mainwindow.c:524
 msgid "/_View/_Sort"
 msgstr "/_Ver/_Ordear"
 
-#: src/mainwindow.c:534
+#: src/mainwindow.c:525
 msgid "/_View/_Sort/by _number"
 msgstr "/_Ver/_Ordear/Por _número"
 
-#: src/mainwindow.c:535
+#: src/mainwindow.c:526
 msgid "/_View/_Sort/by s_ize"
 msgstr "/_Ver/_Ordear/Por tamañ_o"
 
-#: src/mainwindow.c:536
+#: src/mainwindow.c:527
 msgid "/_View/_Sort/by _date"
 msgstr "/_Ver/_Ordear/Por _data"
 
-#: src/mainwindow.c:537
+#: src/mainwindow.c:528
 msgid "/_View/_Sort/by _from"
 msgstr "/_Ver/_Ordear/Por _remitente"
 
-#: src/mainwindow.c:538
+#: src/mainwindow.c:529
 msgid "/_View/_Sort/by _recipient"
 msgstr "/_Ver/_Ordear/Por _destinatario"
 
-#: src/mainwindow.c:539
+#: src/mainwindow.c:530
 msgid "/_View/_Sort/by _subject"
 msgstr "/_Ver/_Ordear/Por as_unto"
 
-#: src/mainwindow.c:540
+#: src/mainwindow.c:531
 msgid "/_View/_Sort/by _color label"
 msgstr "/_Ver/_Ordear/Por _cor da etiqueta"
 
-#: src/mainwindow.c:542
+#: src/mainwindow.c:533
 msgid "/_View/_Sort/by _mark"
 msgstr "/_Ver/_Ordear/Por _marca"
 
-#: src/mainwindow.c:543
+#: src/mainwindow.c:534
 msgid "/_View/_Sort/by _unread"
 msgstr "/_Ver/_Ordear/Por _non leído"
 
-#: src/mainwindow.c:544
+#: src/mainwindow.c:535
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/_Ver/_Ordear/Por adxun_to"
 
-#: src/mainwindow.c:546
+#: src/mainwindow.c:537
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/_Ver/_Ordear/N_on ordear"
 
-#: src/mainwindow.c:547 src/mainwindow.c:550
+#: src/mainwindow.c:538 src/mainwindow.c:541
 msgid "/_View/_Sort/---"
 msgstr "/_Ver/_Ordear/---"
 
-#: src/mainwindow.c:548
+#: src/mainwindow.c:539
 msgid "/_View/_Sort/Ascending"
 msgstr "/_Ver/_Ordear/Ascendente"
 
-#: src/mainwindow.c:549
+#: src/mainwindow.c:540
 msgid "/_View/_Sort/Descending"
 msgstr "/_Ver/_Ordear/Descendente"
 
-#: src/mainwindow.c:551
+#: src/mainwindow.c:542
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/_Ver/_Ordear/Atraer _por asunto"
 
-#: src/mainwindow.c:553
+#: src/mainwindow.c:544
 msgid "/_View/Th_read view"
 msgstr "/_Ver/_Vista xerárquica"
 
-#: src/mainwindow.c:554
+#: src/mainwindow.c:545
 msgid "/_View/E_xpand all threads"
 msgstr "/_Ver/E_xpandir todos os fios"
 
-#: src/mainwindow.c:555
+#: src/mainwindow.c:546
 msgid "/_View/Co_llapse all threads"
 msgstr "/_Ver/Co_lapsar todos os fios"
 
-#: src/mainwindow.c:556
+#: src/mainwindow.c:547
 msgid "/_View/Set display _item..."
 msgstr "/_Ver/Elementos visibles..."
 
-#: src/mainwindow.c:559
+#: src/mainwindow.c:550
 msgid "/_View/_Go to"
 msgstr "/_Ver/_Ir a"
 
-#: src/mainwindow.c:560
+#: src/mainwindow.c:551
 msgid "/_View/_Go to/_Prev message"
 msgstr "/_Ver/_Ir a/Mensaxe a_nterior"
 
-#: src/mainwindow.c:561
+#: src/mainwindow.c:552
 msgid "/_View/_Go to/_Next message"
 msgstr "/_Ver/_Ir a/Mensaxe s_eguinte"
 
-#: src/mainwindow.c:562 src/mainwindow.c:567 src/mainwindow.c:570
-#: src/mainwindow.c:575 src/mainwindow.c:580
+#: src/mainwindow.c:553 src/mainwindow.c:558 src/mainwindow.c:561
+#: src/mainwindow.c:566 src/mainwindow.c:571
 msgid "/_View/_Go to/---"
 msgstr "/_Ver/_Ir a/---"
 
-#: src/mainwindow.c:563
+#: src/mainwindow.c:554
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/_Ver/_Ir a/_Anterior sin ler"
 
-#: src/mainwindow.c:565
+#: src/mainwindow.c:556
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/_Ver/_Ir a/_Seguinte sin ler"
 
-#: src/mainwindow.c:568
+#: src/mainwindow.c:559
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/_Ver/_Ir a/Mensaxe no_va anterior"
 
-#: src/mainwindow.c:569
+#: src/mainwindow.c:560
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/_Ver/_Ir a/Mensaxe nova s_eguinte"
 
-#: src/mainwindow.c:571
+#: src/mainwindow.c:562
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/_Ver/_Ir a/Mensaxe marcada a_nterior"
 
-#: src/mainwindow.c:573
+#: src/mainwindow.c:564
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/_Ver/_Ir a/Seguinte mensaxe _marcada"
 
-#: src/mainwindow.c:576
+#: src/mainwindow.c:567
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/_Ver/_Ir a/Mensaxe etiqueta_da anterior"
 
-#: src/mainwindow.c:578
+#: src/mainwindow.c:569
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/_Ver/_Ir a/Seguinte Mensaxe e_tiquetada"
 
-#: src/mainwindow.c:581
+#: src/mainwindow.c:572
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Ver/_Ir a/_Ir a outra carpeta"
 
-#: src/mainwindow.c:590 src/messageview.c:158
+#: src/mainwindow.c:581 src/messageview.c:158
 #, fuzzy
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Ver/_Codificación/_Autodetectar"
 
-#: src/mainwindow.c:641 src/messageview.c:202
+#: src/mainwindow.c:632 src/messageview.c:202
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Ver/_Codificación/Xaponés (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:643 src/messageview.c:204
+#: src/mainwindow.c:634 src/messageview.c:204
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Ver/_Codificación/Xaponés (_EUC-JP)"
 
-#: src/mainwindow.c:645 src/messageview.c:206
+#: src/mainwindow.c:636 src/messageview.c:206
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Ver/_Codificación/Xaponés (_Shift__JIS)"
 
-#: src/mainwindow.c:657 src/messageview.c:217
+#: src/mainwindow.c:648 src/messageview.c:217
 #, fuzzy
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Ver/_Codificación/Chines (ISO-2022-_CN)"
 
-#: src/mainwindow.c:663 src/messageview.c:222
+#: src/mainwindow.c:654 src/messageview.c:222
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Ver/_Codificación/Coreano (ISO-2022-KR)"
 
-#: src/mainwindow.c:676 src/summaryview.c:401
+#: src/mainwindow.c:667 src/summaryview.c:401
 msgid "/_View/Open in new _window"
 msgstr "/_Ver/Abrir en fiestra _nova"
 
-#: src/mainwindow.c:677 src/messageview.c:234
+#: src/mainwindow.c:668 src/messageview.c:234
 msgid "/_View/Mess_age source"
 msgstr "/_Ver/Fonte da mens_axe"
 
-#: src/mainwindow.c:678 src/messageview.c:235
+#: src/mainwindow.c:669 src/messageview.c:235
 msgid "/_View/Show all _header"
 msgstr "/_Ver/Mostrar todas as cabeceiras"
 
-#: src/mainwindow.c:680
+#: src/mainwindow.c:671
 msgid "/_View/_Update summary"
 msgstr "/_Ver/Actualizar res_umen"
 
-#: src/mainwindow.c:682 src/messageview.c:237
+#: src/mainwindow.c:673 src/messageview.c:237
 msgid "/_Message"
 msgstr "/_Mensaxe"
 
-#: src/mainwindow.c:683
+#: src/mainwindow.c:674
 #, fuzzy
 msgid "/_Message/Recei_ve"
 msgstr "/_Mensaxe/Re_editar"
 
-#: src/mainwindow.c:684
+#: src/mainwindow.c:675
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/_Mensaxe/Recibir de tod_as as contas"
 
-#: src/mainwindow.c:686
+#: src/mainwindow.c:677
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/_Mensaxe/Recibir de tod_as as contas"
 
-#: src/mainwindow.c:688
+#: src/mainwindow.c:679
 #, fuzzy
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/_Mensaxe/_Cancelar recepción"
 
-#: src/mainwindow.c:690
+#: src/mainwindow.c:681
 #, fuzzy
 msgid "/_Message/Recei_ve/---"
 msgstr "/_Mensaxe/Re_editar"
 
-#: src/mainwindow.c:691
+#: src/mainwindow.c:682
 msgid "/_Message/_Send queued messages"
 msgstr "/_Mensaxe/Enviar mensa_xes da cola"
 
-#: src/mainwindow.c:692 src/mainwindow.c:694 src/mainwindow.c:701
-#: src/mainwindow.c:706 src/mainwindow.c:710 src/mainwindow.c:719
-#: src/mainwindow.c:722 src/messageview.c:240 src/messageview.c:248
+#: src/mainwindow.c:683 src/mainwindow.c:685 src/mainwindow.c:692
+#: src/mainwindow.c:697 src/mainwindow.c:701 src/mainwindow.c:710
+#: src/mainwindow.c:713 src/messageview.c:240 src/messageview.c:248
 #: src/messageview.c:253
 msgid "/_Message/---"
 msgstr "/_Mensaxe/---"
 
-#: src/mainwindow.c:693 src/messageview.c:238
+#: src/mainwindow.c:684 src/messageview.c:238
 msgid "/_Message/Compose _new message"
 msgstr "/_Mensaxe/Compoñer _nova mensaxe"
 
-#: src/mainwindow.c:695 src/messageview.c:241
+#: src/mainwindow.c:686 src/messageview.c:241
 msgid "/_Message/_Reply"
 msgstr "/_Mensaxe/_Respostar"
 
-#: src/mainwindow.c:696
+#: src/mainwindow.c:687
 msgid "/_Message/Repl_y to"
 msgstr "/_Mensaxe/Respos_tar a"
 
-#: src/mainwindow.c:697 src/messageview.c:242
+#: src/mainwindow.c:688 src/messageview.c:242
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Mensaxe/Respos_tar a/A _todos"
 
-#: src/mainwindow.c:698 src/messageview.c:244
+#: src/mainwindow.c:689 src/messageview.c:244
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Mensaxe/Respos_tar a/Ó _remitente"
 
-#: src/mainwindow.c:699 src/messageview.c:246
+#: src/mainwindow.c:690 src/messageview.c:246
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Mensaxe/Respos_tar a/Á _lista de correo"
 
-#: src/mainwindow.c:702 src/messageview.c:249
+#: src/mainwindow.c:693 src/messageview.c:249
 msgid "/_Message/_Forward"
 msgstr "/_Mensaxe/_Reenviar"
 
-#: src/mainwindow.c:703 src/messageview.c:250
+#: src/mainwindow.c:694 src/messageview.c:250
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Mensaxe/Reen_viar como adxunto"
 
-#: src/mainwindow.c:705 src/messageview.c:252
+#: src/mainwindow.c:696 src/messageview.c:252
 msgid "/_Message/Redirec_t"
 msgstr "/_Mensaxe/Red_irixir"
 
-#: src/mainwindow.c:707
+#: src/mainwindow.c:698
 msgid "/_Message/M_ove..."
 msgstr "/_Mensaxe/M_over..."
 
-#: src/mainwindow.c:708
+#: src/mainwindow.c:699
 msgid "/_Message/_Copy..."
 msgstr "/_Mensaxe/_Copiar..."
 
-#: src/mainwindow.c:709
+#: src/mainwindow.c:700
 msgid "/_Message/_Delete"
 msgstr "/_Mensaxe/_Borrar"
 
-#: src/mainwindow.c:711
+#: src/mainwindow.c:702
 msgid "/_Message/_Mark"
 msgstr "/_Mensaxe/_Marcar"
 
-#: src/mainwindow.c:712
+#: src/mainwindow.c:703
 msgid "/_Message/_Mark/_Mark"
 msgstr "/_Mensaxe/_Marcar/_Marcar"
 
-#: src/mainwindow.c:713
+#: src/mainwindow.c:704
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/_Mensaxe/_Marcar/_Desmarcar"
 
-#: src/mainwindow.c:714
+#: src/mainwindow.c:705
 msgid "/_Message/_Mark/---"
 msgstr "/_Mensaxe/_Marcar/---"
 
-#: src/mainwindow.c:715
+#: src/mainwindow.c:706
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/_Mensaxe/_Marcar/Marcar como non leído"
 
-#: src/mainwindow.c:716
+#: src/mainwindow.c:707
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/_Mensaxe/_Marcar/Marcar como leído"
 
-#: src/mainwindow.c:718
+#: src/mainwindow.c:709
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/_Mensaxe/_Marcar/Marcar todo como leído"
 
-#: src/mainwindow.c:720
+#: src/mainwindow.c:711
 #, fuzzy
 msgid "/_Message/Set as _junk mail"
 msgstr "/_Mensaxe/Rec_ibir correo novo"
 
-#: src/mainwindow.c:721
+#: src/mainwindow.c:712
 #, fuzzy
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/_Mensaxe/Rec_ibir correo novo"
 
-#: src/mainwindow.c:723 src/messageview.c:254
+#: src/mainwindow.c:714 src/messageview.c:254
 msgid "/_Message/Re-_edit"
 msgstr "/_Mensaxe/Re_editar"
 
-#: src/mainwindow.c:727
+#: src/mainwindow.c:718
 #, fuzzy
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/_Ferramentas/Engadir _remitente á axenda"
 
-#: src/mainwindow.c:730
+#: src/mainwindow.c:721
 #, fuzzy
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/_Ferramentas/_Filtrar Mensaxes"
 
-#: src/mainwindow.c:732
+#: src/mainwindow.c:723
 #, fuzzy
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Ferramentas/_Filtrar Mensaxes"
 
-#: src/mainwindow.c:734 src/messageview.c:261
+#: src/mainwindow.c:725 src/messageview.c:261
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Ferramentas/_Crear Regra de filtrado"
 
-#: src/mainwindow.c:735 src/messageview.c:263
+#: src/mainwindow.c:726 src/messageview.c:263
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Ferramentas/_Crear Regra de filtrado/_Automáticamente"
 
-#: src/mainwindow.c:737 src/messageview.c:265
+#: src/mainwindow.c:728 src/messageview.c:265
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Ferramentas/_Crear Regra de filtrado/Baseada en _Dende"
 
-#: src/mainwindow.c:739 src/messageview.c:267
+#: src/mainwindow.c:730 src/messageview.c:267
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Ferramentas/_Crear Regra de filtrado/Baseada en _Para"
 
-#: src/mainwindow.c:741 src/messageview.c:269
+#: src/mainwindow.c:732 src/messageview.c:269
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Ferramentas/_Crear Regra de filtrado/Baseada no _Asunto"
 
-#: src/mainwindow.c:744
+#: src/mainwindow.c:735
 #, fuzzy
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/_Ferramentas/_Filtrar Mensaxes"
 
-#: src/mainwindow.c:746
+#: src/mainwindow.c:737
 #, fuzzy
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/_Ferramentas/_Filtrar Mensaxes"
 
-#: src/mainwindow.c:751
+#: src/mainwindow.c:742
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/_Ferramentas/Borrar as mensaxes re_petidas"
 
-#: src/mainwindow.c:754
+#: src/mainwindow.c:745
 msgid "/_Tools/E_xecute"
 msgstr "/_Ferramentas/E_xecutar"
 
-#: src/mainwindow.c:756
+#: src/mainwindow.c:747
 msgid "/_Tools/_Log window"
 msgstr "/_Ferramentas/_Fiestra de traza"
 
-#: src/mainwindow.c:758
+#: src/mainwindow.c:749
 msgid "/_Configuration"
 msgstr "/_Configuración"
 
-#: src/mainwindow.c:759
+#: src/mainwindow.c:750
 msgid "/_Configuration/_Common preferences..."
 msgstr "/_Configuración/Preferencias _comuns..."
 
-#: src/mainwindow.c:761
+#: src/mainwindow.c:752
 msgid "/_Configuration/_Filter setting..."
 msgstr "/_Configuración/Preferencias de _filtrado..."
 
-#: src/mainwindow.c:763
+#: src/mainwindow.c:754
 msgid "/_Configuration/_Template..."
 msgstr "/_Configuración/_Plantillas ..."
 
-#: src/mainwindow.c:764
+#: src/mainwindow.c:755
 msgid "/_Configuration/_Actions..."
 msgstr "/_Configuración/_Accions..."
 
-#: src/mainwindow.c:765
+#: src/mainwindow.c:756
 msgid "/_Configuration/---"
 msgstr "/_Configuración/---"
 
-#: src/mainwindow.c:766
+#: src/mainwindow.c:757
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Configuración/_Preferencias da conta actual..."
 
-#: src/mainwindow.c:768
+#: src/mainwindow.c:759
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Configuración/Crear _nova conta..."
 
-#: src/mainwindow.c:770
+#: src/mainwindow.c:761
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Configuración/_Editar contas..."
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:763
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Configuración/_Cambiar conta actual"
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:767
 msgid "/_Help/_Manual"
 msgstr "/_Axuda/_Manual"
 
-#: src/mainwindow.c:777
+#: src/mainwindow.c:768
 msgid "/_Help/_Manual/_English"
 msgstr "/_Axuda/_Manual/_Inglés"
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:769
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/_Axuda/_Manual/_Xaponés"
 
-#: src/mainwindow.c:779
+#: src/mainwindow.c:770
 msgid "/_Help/_FAQ"
 msgstr "/_Axuda/_FAQ"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:771
 msgid "/_Help/_FAQ/_English"
 msgstr "/_Axuda/_FAQ/_Inglés"
 
-#: src/mainwindow.c:781
+#: src/mainwindow.c:772
 msgid "/_Help/_FAQ/_German"
 msgstr "/_Axyuda/_FAQ/_Alemán"
 
-#: src/mainwindow.c:782
+#: src/mainwindow.c:773
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/_Axuda/_FAQ/_Español"
 
-#: src/mainwindow.c:783
+#: src/mainwindow.c:774
 msgid "/_Help/_FAQ/_French"
 msgstr "/_Axuda/_FAQ/_Francés"
 
-#: src/mainwindow.c:784
+#: src/mainwindow.c:775
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/_Axuda/_FAQ/_Italiano"
 
-#: src/mainwindow.c:785
+#: src/mainwindow.c:776
 msgid "/_Help/---"
 msgstr "/_Axuda/---"
 
-#: src/mainwindow.c:825
+#: src/mainwindow.c:816
 msgid "Creating main window...\n"
 msgstr "Creando Fiestra principal...\n"
 
-#: src/mainwindow.c:987
+#: src/mainwindow.c:973
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "MainWindow: fallo solicitando cor %d\n"
 
-#: src/mainwindow.c:1071 src/summaryview.c:2020 src/summaryview.c:2105
+#: src/mainwindow.c:1057 src/summaryview.c:2020 src/summaryview.c:2105
 #: src/summaryview.c:3342 src/summaryview.c:3415 src/summaryview.c:3728
 msgid "done.\n"
 msgstr "feito.\n"
 
-#: src/mainwindow.c:1196 src/mainwindow.c:1237 src/mainwindow.c:1265
+#: src/mainwindow.c:1182 src/mainwindow.c:1223 src/mainwindow.c:1251
 msgid "Untitled"
 msgstr "Sen título"
 
-#: src/mainwindow.c:1266
+#: src/mainwindow.c:1252
 msgid "none"
 msgstr "ningunha"
 
-#: src/mainwindow.c:1316
+#: src/mainwindow.c:1302
 #, 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:1536
+#: src/mainwindow.c:1522
 msgid "Offline"
 msgstr ""
 
-#: src/mainwindow.c:1537
+#: src/mainwindow.c:1523
 msgid "You are offline. Go online?"
 msgstr ""
 
-#: src/mainwindow.c:1551
+#: src/mainwindow.c:1537
 #, fuzzy
 msgid "Empty all trash"
 msgstr "Baleirar papeleira"
 
-#: src/mainwindow.c:1552
+#: src/mainwindow.c:1538
 #, fuzzy
 msgid "Empty messages in all trash?"
 msgstr "¿Baleirar todas as mensaxes da papeleira?"
 
-#: src/mainwindow.c:1580
+#: src/mainwindow.c:1566
 msgid "Add mailbox"
 msgstr "Engadir caixa de correo"
 
-#: src/mainwindow.c:1581
+#: src/mainwindow.c:1567
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3212,16 +3212,16 @@ msgstr ""
 "Si xa existe será\n"
 "examinado automáticamente."
 
-#: src/mainwindow.c:1587
+#: src/mainwindow.c:1573
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "a caixa de correo `%s' xa existe."
 
-#: src/mainwindow.c:1592 src/setup.c:57
+#: src/mainwindow.c:1578 src/setup.c:57
 msgid "Mailbox"
 msgstr "Correo"
 
-#: src/mainwindow.c:1598 src/setup.c:63
+#: src/mainwindow.c:1584 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3231,153 +3231,153 @@ msgstr ""
 "Quizáis xa existan os ficheiros ou non teña permisos suficientes para "
 "escribir no directorio."
 
-#: src/mainwindow.c:1989
+#: src/mainwindow.c:1975
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Arbre de carpetas"
 
-#: src/mainwindow.c:2009 src/messageview.c:368
+#: src/mainwindow.c:1995 src/messageview.c:368
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Vista de mensaxe"
 
-#: src/mainwindow.c:2156 src/summaryview.c:370
+#: src/mainwindow.c:2142 src/summaryview.c:370
 msgid "/_Reply"
 msgstr "/_Respostar"
 
-#: src/mainwindow.c:2157
+#: src/mainwindow.c:2143
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "Respostar a todos"
 
-#: src/mainwindow.c:2158
+#: src/mainwindow.c:2144
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/Respon_der a/Ó _remitente"
 
-#: src/mainwindow.c:2159
+#: src/mainwindow.c:2145
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/Respon_der a/Á _lista de correo"
 
-#: src/mainwindow.c:2164 src/summaryview.c:377
+#: src/mainwindow.c:2150 src/summaryview.c:377
 msgid "/_Forward"
 msgstr "/_Reenviar"
 
-#: src/mainwindow.c:2165 src/summaryview.c:378
+#: src/mainwindow.c:2151 src/summaryview.c:378
 msgid "/For_ward as attachment"
 msgstr "/Reen_viar como adxunto"
 
-#: src/mainwindow.c:2166 src/summaryview.c:379
+#: src/mainwindow.c:2152 src/summaryview.c:379
 msgid "/Redirec_t"
 msgstr "/Red_irixir"
 
-#: src/mainwindow.c:2205
+#: src/mainwindow.c:2188
 msgid "Get"
 msgstr "Traer"
 
-#: src/mainwindow.c:2206
+#: src/mainwindow.c:2189
 msgid "Incorporate new mail"
 msgstr "Incorporar correo novo"
 
-#: src/mainwindow.c:2213
+#: src/mainwindow.c:2196
 msgid "Get all"
 msgstr "Traer todo"
 
-#: src/mainwindow.c:2214
+#: src/mainwindow.c:2197
 msgid "Incorporate new mail of all accounts"
 msgstr "Incorporar correo novo de todas as contas"
 
-#: src/mainwindow.c:2225
+#: src/mainwindow.c:2208
 msgid "Send queued message(s)"
 msgstr "Enviar mensaxe(s) na cola"
 
-#: src/mainwindow.c:2235 src/prefs_account.c:721 src/prefs_common.c:949
+#: src/mainwindow.c:2218 src/prefs_account.c:721 src/prefs_common.c:949
 #: src/prefs_folder_item.c:137
 msgid "Compose"
 msgstr "Compoñer"
 
-#: src/mainwindow.c:2236
+#: src/mainwindow.c:2219
 msgid "Compose new message"
 msgstr "Compoñer mensaxe novo"
 
-#: src/mainwindow.c:2244 src/prefs_common.c:1448
+#: src/mainwindow.c:2227 src/prefs_common.c:1448
 msgid "Reply"
 msgstr "Respostar"
 
-#: src/mainwindow.c:2245 src/mainwindow.c:2258
+#: src/mainwindow.c:2228 src/mainwindow.c:2241
 msgid "Reply to the message"
 msgstr "Respostar ó mensaxe"
 
-#: src/mainwindow.c:2263
+#: src/mainwindow.c:2245
 msgid "Reply all"
 msgstr "A todos"
 
-#: src/mainwindow.c:2264
+#: src/mainwindow.c:2246
 msgid "Reply to all"
 msgstr "Respostar a todos"
 
-#: src/mainwindow.c:2272 src/prefs_filter_edit.c:741
+#: src/mainwindow.c:2254 src/prefs_filter_edit.c:741
 msgid "Forward"
 msgstr "Reenviar"
 
-#: src/mainwindow.c:2273 src/mainwindow.c:2286
+#: src/mainwindow.c:2255 src/mainwindow.c:2268
 msgid "Forward the message"
 msgstr "Reenviar o mensaxe"
 
-#: src/mainwindow.c:2293
+#: src/mainwindow.c:2275
 msgid "Delete the message"
 msgstr "Borrar o mensaxe"
 
-#: src/mainwindow.c:2301 src/prefs_common.c:1988
+#: src/mainwindow.c:2283 src/prefs_common.c:1988
 msgid "Junk"
 msgstr ""
 
-#: src/mainwindow.c:2302
+#: src/mainwindow.c:2284
 #, fuzzy
 msgid "Set as junk mail"
 msgstr "conta por defecto"
 
-#: src/mainwindow.c:2311
+#: src/mainwindow.c:2293
 msgid "Execute"
 msgstr "Executar"
 
-#: src/mainwindow.c:2312
+#: src/mainwindow.c:2294
 msgid "Execute marked process"
 msgstr "Executar o proceso marcado"
 
-#: src/mainwindow.c:2322
+#: src/mainwindow.c:2304
 msgid "Next unread message"
 msgstr "Seguinte non leído"
 
-#: src/mainwindow.c:2334
+#: src/mainwindow.c:2316
 msgid "Prefs"
 msgstr "Preferencias"
 
-#: src/mainwindow.c:2335
+#: src/mainwindow.c:2317
 msgid "Common preferences"
 msgstr "Preferencias comuns"
 
-#: src/mainwindow.c:2343 src/prefs_folder_item.c:261
+#: src/mainwindow.c:2325 src/prefs_folder_item.c:261
 #: src/prefs_folder_item.c:272 src/progressdialog.c:128
 msgid "Account"
 msgstr "conta"
 
-#: src/mainwindow.c:2344
+#: src/mainwindow.c:2326
 msgid "Account setting"
 msgstr "Preferencias da conta"
 
-#: src/mainwindow.c:2527
+#: src/mainwindow.c:2498
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 
-#: src/mainwindow.c:2538
+#: src/mainwindow.c:2509
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 
-#: src/mainwindow.c:2731
+#: src/mainwindow.c:2702
 msgid "Exit"
 msgstr "Sair"
 
-#: src/mainwindow.c:2731
+#: src/mainwindow.c:2702
 msgid "Exit this program?"
 msgstr "¿Sair do programa?"
 
@@ -5615,11 +5615,11 @@ msgstr "Creando diálogo de progreso...\n"
 msgid "Status"
 msgstr "Estado"
 
-#: src/recv.c:113
+#: src/recv.c:112
 msgid "error occurred while retrieving data.\n"
 msgstr "ocurriu un erro mentras se obtían datos.\n"
 
-#: src/recv.c:155 src/recv.c:197 src/recv.c:213
+#: src/recv.c:154 src/recv.c:196 src/recv.c:211
 msgid "Can't write to file.\n"
 msgstr "Non se pode escribir ó ficheiro.\n"
 
@@ -6358,7 +6358,7 @@ msgstr ""
 msgid "%.2fGB"
 msgstr ""
 
-#: src/utils.c:2372 src/utils.c:2496
+#: src/utils.c:2386 src/utils.c:2510
 #, c-format
 msgid "writing to %s failed.\n"
 msgstr "fallo escribindo en %s.\n"
diff --git a/po/hr.po b/po/hr.po
index daf8bfdc..bd35b4ce 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-08-09 18:08+0900\n"
+"POT-Creation-Date: 2005-08-22 17:22+0900\n"
 "PO-Revision-Date: 2001-09-17 13:22+0100\n"
 "Last-Translator: Ante Karamatić <ante@cdnet.com.hr>\n"
 "Language-Team: Croatian <lokalizacija@linux.hr>\n"
@@ -96,7 +96,7 @@ msgstr ""
 "S one račune s kojih želite skinuti poštu sa `Primi sve'."
 
 #: src/account.c:691 src/addressadd.c:192 src/addressbook.c:490
-#: src/compose.c:4081 src/editaddress.c:200 src/editaddress.c:942
+#: src/compose.c:4079 src/editaddress.c:200 src/editaddress.c:942
 #: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:265
 #: src/editjpilot.c:271 src/editldap.c:307 src/editvcard.c:184
 #: src/mimeview.c:201 src/prefs_filter.c:258 src/prefs_folder_item.c:170
@@ -229,7 +229,7 @@ msgstr ""
 msgid "Add Address to Book"
 msgstr "Dodaj adresu u adresar"
 
-#: src/addressadd.c:202 src/compose.c:4528 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4521 src/editaddress.c:201
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "Adresa"
@@ -243,7 +243,7 @@ msgstr "Bilješke"
 msgid "Select Address Book Folder"
 msgstr "Odaberite spis adresara"
 
-#: src/addressbook.c:336 src/compose.c:495 src/mainwindow.c:470
+#: src/addressbook.c:336 src/compose.c:493 src/mainwindow.c:461
 #: src/messageview.c:137
 msgid "/_File"
 msgstr "/_Datoteka"
@@ -265,10 +265,10 @@ msgstr "/_Datoteka/Novi _J-Pilot"
 msgid "/_File/New _Server"
 msgstr "/_Datoteka/Novi _poslužitelj"
 
-#: src/addressbook.c:345 src/addressbook.c:348 src/compose.c:500
-#: src/compose.c:505 src/compose.c:509 src/mainwindow.c:488
-#: src/mainwindow.c:491 src/mainwindow.c:493 src/mainwindow.c:496
-#: src/mainwindow.c:498 src/messageview.c:140
+#: src/addressbook.c:345 src/addressbook.c:348 src/compose.c:498
+#: src/compose.c:503 src/compose.c:507 src/mainwindow.c:479
+#: src/mainwindow.c:482 src/mainwindow.c:484 src/mainwindow.c:487
+#: src/mainwindow.c:489 src/messageview.c:140
 msgid "/_File/---"
 msgstr "/_Datoteka/---"
 
@@ -284,7 +284,7 @@ msgstr "/_Datoteka/_Obriši"
 msgid "/_File/_Save"
 msgstr "/_Datoteka/_Spremi"
 
-#: src/addressbook.c:350 src/compose.c:510 src/messageview.c:141
+#: src/addressbook.c:350 src/compose.c:508 src/messageview.c:141
 msgid "/_File/_Close"
 msgstr "/_Datoteka/_Zatvori"
 
@@ -316,7 +316,7 @@ msgstr "/_Adresa/_Uredi"
 msgid "/_Address/_Delete"
 msgstr "/_Adresa/O_briši"
 
-#: src/addressbook.c:358 src/compose.c:619 src/mainwindow.c:725
+#: src/addressbook.c:358 src/compose.c:617 src/mainwindow.c:716
 #: src/messageview.c:256
 msgid "/_Tools"
 msgstr "/_Alati"
@@ -325,12 +325,12 @@ msgstr "/_Alati"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Datoteka/Unesi _LDIF datoteku"
 
-#: src/addressbook.c:360 src/compose.c:632 src/mainwindow.c:775
+#: src/addressbook.c:360 src/compose.c:630 src/mainwindow.c:766
 #: src/messageview.c:274
 msgid "/_Help"
 msgstr "/_Pomoć"
 
-#: src/addressbook.c:361 src/compose.c:633 src/mainwindow.c:786
+#: src/addressbook.c:361 src/compose.c:631 src/mainwindow.c:777
 #: src/messageview.c:275
 msgid "/_Help/_About"
 msgstr "/_Pomoć/_O"
@@ -347,7 +347,7 @@ msgstr "/Nova _grupa"
 msgid "/New _Folder"
 msgstr "/Novi _spis"
 
-#: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:489
+#: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:487
 #: src/folderview.c:235 src/folderview.c:237 src/folderview.c:241
 #: src/folderview.c:252 src/folderview.c:254 src/folderview.c:256
 #: src/folderview.c:260 src/folderview.c:270 src/folderview.c:272
@@ -357,8 +357,8 @@ msgstr "/Novi _spis"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:512
-#: src/mainwindow.c:502 src/messageview.c:143
+#: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:510
+#: src/mainwindow.c:493 src/messageview.c:143
 msgid "/_Edit"
 msgstr "/_Uredi"
 
@@ -370,7 +370,7 @@ msgstr "/_Obriši"
 msgid "E-Mail address"
 msgstr "E-mail adresa"
 
-#: src/addressbook.c:495 src/compose.c:4529 src/prefs_common.c:2402
+#: src/addressbook.c:495 src/compose.c:4522 src/prefs_common.c:2402
 msgid "Address book"
 msgstr "Adresar"
 
@@ -379,8 +379,8 @@ msgid "Name:"
 msgstr "Ime:"
 
 #. Buttons
-#: src/addressbook.c:627 src/addressbook.c:1673 src/editaddress.c:884
-#: src/editaddress.c:1017 src/mainwindow.c:2292 src/prefs_actions.c:266
+#: src/addressbook.c:627 src/addressbook.c:1674 src/editaddress.c:884
+#: src/editaddress.c:1017 src/mainwindow.c:2274 src/prefs_actions.c:266
 #: src/prefs_display_header.c:278 src/prefs_display_header.c:333
 #: src/prefs_template.c:231
 msgid "Delete"
@@ -419,7 +419,7 @@ msgstr "Obriši adresu/e"
 msgid "Really delete the address(es)?"
 msgstr "Uistinu obrisati adresu/e?"
 
-#: src/addressbook.c:1664
+#: src/addressbook.c:1665
 #, fuzzy, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -428,38 +428,38 @@ msgstr ""
 "Želite li obrisati spis I sve adrese u `%s' ? \n"
 "Ukoliko brišete samo spis, adrese će biti premještene u prethodni spis."
 
-#: src/addressbook.c:1667 src/folderview.c:2139
+#: src/addressbook.c:1668 src/folderview.c:2139
 msgid "Delete folder"
 msgstr "Obriši spis"
 
-#: src/addressbook.c:1667
+#: src/addressbook.c:1668
 #, fuzzy
 msgid "_Folder only"
 msgstr "Samo spis"
 
-#: src/addressbook.c:1667
+#: src/addressbook.c:1668
 #, fuzzy
 msgid "Folder and _addresses"
 msgstr "Spis i adrese"
 
-#: src/addressbook.c:1672
+#: src/addressbook.c:1673
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Uistinu obrisati `%s' ?"
 
-#: src/addressbook.c:2352 src/addressbook.c:2485
+#: src/addressbook.c:2353 src/addressbook.c:2486
 msgid "New user, could not save index file."
 msgstr "Novi korisnik, ne mogu spretmiti index datoteku."
 
-#: src/addressbook.c:2356 src/addressbook.c:2489
+#: src/addressbook.c:2357 src/addressbook.c:2490
 msgid "New user, could not save address book files."
 msgstr "Novi korisnik, ne mogu spremiti datoteke adresara."
 
-#: src/addressbook.c:2366 src/addressbook.c:2499
+#: src/addressbook.c:2367 src/addressbook.c:2500
 msgid "Old address book converted successfully."
 msgstr "Stari adresar uspješno unešen."
 
-#: src/addressbook.c:2371
+#: src/addressbook.c:2372
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -467,7 +467,7 @@ msgstr ""
 "Stari adresar ne može biti unešen,\n"
 "ne mogu spremiti novu index datoteku adresara."
 
-#: src/addressbook.c:2384
+#: src/addressbook.c:2385
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -475,7 +475,7 @@ msgstr ""
 "Ne mogu unjeti adesar,\n"
 "ali sam kreirao nove prazne datoteke adresara."
 
-#: src/addressbook.c:2390
+#: src/addressbook.c:2391
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -483,7 +483,7 @@ msgstr ""
 "Ne mogu unjeti adresar,\n"
 "ne mogu kreirati nove datoteke adresara."
 
-#: src/addressbook.c:2395
+#: src/addressbook.c:2396
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -491,84 +491,84 @@ msgstr ""
 "Ne mogu unjeti adresar,\n"
 "i ne mogu stvoriti nove datoteke adresara."
 
-#: src/addressbook.c:2402
+#: src/addressbook.c:2403
 msgid "Addressbook conversion error"
 msgstr "Greška pri unosu adresara"
 
-#: src/addressbook.c:2406
+#: src/addressbook.c:2407
 msgid "Addressbook conversion"
 msgstr "Unos adresara"
 
-#: src/addressbook.c:2441
+#: src/addressbook.c:2442
 msgid "Addressbook Error"
 msgstr "Greška adresara"
 
-#: src/addressbook.c:2442 src/addressbook.c:2542
+#: src/addressbook.c:2443 src/addressbook.c:2543
 msgid "Could not read address index"
 msgstr "Ne mogu čitati index adresara"
 
-#: src/addressbook.c:2504
+#: src/addressbook.c:2505
 msgid "Old address book converted, could not save new address index file"
 msgstr "Stari adresar unešen, ne mogu spremiti index datoteke novih adresa"
 
-#: src/addressbook.c:2518
+#: src/addressbook.c:2519
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr "Ne mogu unjeti adresar, kreiram prazne datoteke novog adresara."
 
-#: src/addressbook.c:2524
+#: src/addressbook.c:2525
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr "Ne mogu unjeti adresar, ne mogu kreirati nove datoteke adresara."
 
-#: src/addressbook.c:2530
+#: src/addressbook.c:2531
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr "Ne mogu unjeti adresar i ne mogu kreirati nove datoteke adresara."
 
-#: src/addressbook.c:2548
+#: src/addressbook.c:2549
 msgid "Addressbook Conversion Error"
 msgstr "Greška pri unosu adresara"
 
-#: src/addressbook.c:2554
+#: src/addressbook.c:2555
 msgid "Addressbook Conversion"
 msgstr "Unos adresara"
 
-#: src/addressbook.c:3055 src/prefs_common.c:963
+#: src/addressbook.c:3056 src/prefs_common.c:963
 msgid "Interface"
 msgstr "Sučelje"
 
-#: src/addressbook.c:3071 src/importldif.c:514
+#: src/addressbook.c:3072 src/importldif.c:514
 msgid "Address Book"
 msgstr "Adresar"
 
-#: src/addressbook.c:3087
+#: src/addressbook.c:3088
 msgid "Person"
 msgstr "Osoba"
 
-#: src/addressbook.c:3103
+#: src/addressbook.c:3104
 msgid "EMail Address"
 msgstr "E-mail adresa"
 
-#: src/addressbook.c:3119
+#: src/addressbook.c:3120
 msgid "Group"
 msgstr "Grupa"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3135 src/folderview.c:346 src/prefs_account.c:1866
+#: src/addressbook.c:3136 src/folderview.c:346 src/prefs_account.c:1866
 msgid "Folder"
 msgstr "Spis"
 
-#: src/addressbook.c:3151
+#: src/addressbook.c:3152
 msgid "vCard"
 msgstr "V-kartica"
 
-#: src/addressbook.c:3167 src/addressbook.c:3183
+#: src/addressbook.c:3168 src/addressbook.c:3184
 #, fuzzy
 msgid "JPilot"
 msgstr "J-Pilot"
 
-#: src/addressbook.c:3199
+#: src/addressbook.c:3200
 msgid "LDAP Server"
 msgstr "LDAP Poslužitelj"
 
@@ -580,7 +580,7 @@ msgstr "Uobičajene adrese"
 msgid "Personal address"
 msgstr "Osobne adrese"
 
-#: src/alertpanel.c:138 src/compose.c:5214 src/main.c:515
+#: src/alertpanel.c:138 src/compose.c:5208 src/main.c:515
 msgid "Notice"
 msgstr "Obavijest"
 
@@ -635,394 +635,394 @@ msgstr "Smeđa"
 msgid "None"
 msgstr "Ništa"
 
-#: src/compose.c:487
+#: src/compose.c:485
 msgid "/_Add..."
 msgstr "/_Dodaj..."
 
-#: src/compose.c:488
+#: src/compose.c:486
 msgid "/_Remove"
 msgstr "/_Ukloni"
 
-#: src/compose.c:490 src/folderview.c:243 src/folderview.c:262
+#: src/compose.c:488 src/folderview.c:243 src/folderview.c:262
 #: src/folderview.c:277
 #, fuzzy
 msgid "/_Properties..."
 msgstr "/_Postavke..."
 
-#: src/compose.c:496
+#: src/compose.c:494
 #, fuzzy
 msgid "/_File/_Send"
 msgstr "/_Datoteka/_Spremi"
 
-#: src/compose.c:498
+#: src/compose.c:496
 #, fuzzy
 msgid "/_File/Send _later"
 msgstr "/_Poruka/Pošalji _kasnije"
 
-#: src/compose.c:501
+#: src/compose.c:499
 #, fuzzy
 msgid "/_File/Save to _draft folder"
 msgstr "/_Poruka/Snimi u spis _nedovršeno"
 
-#: src/compose.c:503
+#: src/compose.c:501
 #, fuzzy
 msgid "/_File/Save and _keep editing"
 msgstr "/_Poruka/Pošalji _kasnije"
 
-#: src/compose.c:506
+#: src/compose.c:504
 msgid "/_File/_Attach file"
 msgstr "/_Datoeka/_Priloži datoteku"
 
-#: src/compose.c:507
+#: src/compose.c:505
 msgid "/_File/_Insert file"
 msgstr "/_Datoteka/_Unesi datoteku"
 
-#: src/compose.c:508
+#: src/compose.c:506
 msgid "/_File/Insert si_gnature"
 msgstr "/_Datoteka/Unesi _potpis"
 
-#: src/compose.c:513
+#: src/compose.c:511
 msgid "/_Edit/_Undo"
 msgstr "/_Uredi/_Undo"
 
-#: src/compose.c:514
+#: src/compose.c:512
 msgid "/_Edit/_Redo"
 msgstr "/_Uredi/_Redo"
 
-#: src/compose.c:515 src/compose.c:522 src/mainwindow.c:506
+#: src/compose.c:513 src/compose.c:520 src/mainwindow.c:497
 #: src/messageview.c:146
 msgid "/_Edit/---"
 msgstr "/_Uredi/---"
 
-#: src/compose.c:516
+#: src/compose.c:514
 msgid "/_Edit/Cu_t"
 msgstr "/_Uredi/R_eži"
 
-#: src/compose.c:517 src/mainwindow.c:503 src/messageview.c:144
+#: src/compose.c:515 src/mainwindow.c:494 src/messageview.c:144
 msgid "/_Edit/_Copy"
 msgstr "/_Uredi/_Kopiraj"
 
-#: src/compose.c:518
+#: src/compose.c:516
 msgid "/_Edit/_Paste"
 msgstr "/_Uredi/U_baci"
 
-#: src/compose.c:519
+#: src/compose.c:517
 #, fuzzy
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Uredi/U_baci"
 
-#: src/compose.c:521 src/mainwindow.c:504 src/messageview.c:145
+#: src/compose.c:519 src/mainwindow.c:495 src/messageview.c:145
 msgid "/_Edit/Select _all"
 msgstr "/_Uredi/Odaberi _sve"
 
-#: src/compose.c:523
+#: src/compose.c:521
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/_Uredi/Sažmi _poglavlje"
 
-#: src/compose.c:525
+#: src/compose.c:523
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/_Uredi/Sažmi sve duge _linije"
 
-#: src/compose.c:527
+#: src/compose.c:525
 #, fuzzy
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Uredi/_Kopiraj"
 
-#: src/compose.c:528 src/mainwindow.c:511 src/messageview.c:150
+#: src/compose.c:526 src/mainwindow.c:502 src/messageview.c:150
 #: src/summaryview.c:400
 msgid "/_View"
 msgstr "/_Pregled"
 
-#: src/compose.c:529
+#: src/compose.c:527
 #, fuzzy
 msgid "/_View/_To"
 msgstr "/_Pregled/Pr_egledaj izvor"
 
-#: src/compose.c:530
+#: src/compose.c:528
 #, fuzzy
 msgid "/_View/_Cc"
 msgstr "/_Pregled"
 
-#: src/compose.c:531
+#: src/compose.c:529
 #, fuzzy
 msgid "/_View/_Bcc"
 msgstr "/_Pregled/Pr_egledaj izvor"
 
-#: src/compose.c:532
+#: src/compose.c:530
 #, fuzzy
 msgid "/_View/_Reply to"
 msgstr "/_Pregled/_Znakovni standard"
 
-#: src/compose.c:533 src/compose.c:535 src/compose.c:537 src/compose.c:539
-#: src/mainwindow.c:529 src/mainwindow.c:532 src/mainwindow.c:558
-#: src/mainwindow.c:582 src/mainwindow.c:675 src/mainwindow.c:679
+#: src/compose.c:531 src/compose.c:533 src/compose.c:535 src/compose.c:537
+#: src/mainwindow.c:520 src/mainwindow.c:523 src/mainwindow.c:549
+#: src/mainwindow.c:573 src/mainwindow.c:666 src/mainwindow.c:670
 #: src/messageview.c:233
 msgid "/_View/---"
 msgstr "/_Pregled/---"
 
-#: src/compose.c:534
+#: src/compose.c:532
 #, fuzzy
 msgid "/_View/_Followup to"
 msgstr "/_Poruka/P_roslijedi"
 
-#: src/compose.c:536
+#: src/compose.c:534
 #, fuzzy
 msgid "/_View/R_uler"
 msgstr "/_Pregled/Pr_egledaj izvor"
 
-#: src/compose.c:538
+#: src/compose.c:536
 #, fuzzy
 msgid "/_View/_Attachment"
 msgstr "Prilog"
 
-#: src/compose.c:545 src/mainwindow.c:589 src/messageview.c:157
+#: src/compose.c:543 src/mainwindow.c:580 src/messageview.c:157
 #, fuzzy
 msgid "/_View/Character _encoding"
 msgstr "/_Pregled/Pr_egledaj izvor"
 
-#: src/compose.c:546
+#: src/compose.c:544
 msgid "/_View/Character _encoding/_Automatic"
 msgstr ""
 
-#: src/compose.c:548 src/compose.c:554 src/compose.c:560 src/compose.c:564
-#: src/compose.c:570 src/compose.c:574 src/compose.c:580 src/compose.c:584
-#: src/compose.c:594 src/compose.c:598 src/compose.c:608 src/compose.c:612
-#: src/mainwindow.c:585 src/mainwindow.c:592 src/messageview.c:153
+#: src/compose.c:546 src/compose.c:552 src/compose.c:558 src/compose.c:562
+#: src/compose.c:568 src/compose.c:572 src/compose.c:578 src/compose.c:582
+#: src/compose.c:592 src/compose.c:596 src/compose.c:606 src/compose.c:610
+#: src/mainwindow.c:576 src/mainwindow.c:583 src/messageview.c:153
 #, fuzzy
 msgid "/_View/Character _encoding/---"
 msgstr "/_Pregled/Pr_egledaj izvor"
 
-#: src/compose.c:550 src/mainwindow.c:593 src/messageview.c:161
+#: src/compose.c:548 src/mainwindow.c:584 src/messageview.c:161
 #, fuzzy
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Pregled/_Znakovni standard/7bit ascii (US-ASC_II)"
 
-#: src/compose.c:552 src/mainwindow.c:595 src/messageview.c:164
+#: src/compose.c:550 src/mainwindow.c:586 src/messageview.c:164
 #, fuzzy
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Pregled/_Znakovni standard/Unicode (_UTF-8)"
 
-#: src/compose.c:556 src/mainwindow.c:599 src/messageview.c:167
+#: src/compose.c:554 src/mainwindow.c:590 src/messageview.c:167
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Pregled/_Znakovni standard/Zapadna Europa (ISO-8859-_1)"
 
-#: src/compose.c:558 src/mainwindow.c:601 src/messageview.c:169
+#: src/compose.c:556 src/mainwindow.c:592 src/messageview.c:169
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Pregled/_Znakovni standard/Zapadna Europa (ISO-8859-_1)"
 
-#: src/compose.c:562 src/mainwindow.c:605 src/messageview.c:172
+#: src/compose.c:560 src/mainwindow.c:596 src/messageview.c:172
 #, fuzzy
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Pregled/_Znakovni standard/Srednja Europa (ISO-8859-_2)"
 
-#: src/compose.c:566 src/mainwindow.c:609 src/messageview.c:175
+#: src/compose.c:564 src/mainwindow.c:600 src/messageview.c:175
 #, fuzzy
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Pregled/_Znakovni standard/_Baltik (ISO-8859-13)"
 
-#: src/compose.c:568 src/mainwindow.c:611 src/messageview.c:177
+#: src/compose.c:566 src/mainwindow.c:602 src/messageview.c:177
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Pregled/_Znakovni standard/Baltik (ISO-8859-_4)"
 
-#: src/compose.c:572 src/mainwindow.c:615 src/messageview.c:180
+#: src/compose.c:570 src/mainwindow.c:606 src/messageview.c:180
 #, fuzzy
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Pregled/_Znakovni standard/Grčka (ISO-8859-_7)"
 
-#: src/compose.c:576 src/mainwindow.c:619 src/messageview.c:183
+#: src/compose.c:574 src/mainwindow.c:610 src/messageview.c:183
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Pregled/_Znakovni standard/Grčka (ISO-8859-_7)"
 
-#: src/compose.c:578 src/mainwindow.c:621 src/messageview.c:185
+#: src/compose.c:576 src/mainwindow.c:612 src/messageview.c:185
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Pregled/_Znakovni standard/Čirilica (Windows-1251)"
 
-#: src/compose.c:582 src/mainwindow.c:625 src/messageview.c:188
+#: src/compose.c:580 src/mainwindow.c:616 src/messageview.c:188
 #, fuzzy
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Pregled/_Znakovni standard/Turska (ISO-8859-_9)"
 
-#: src/compose.c:586 src/mainwindow.c:629 src/messageview.c:191
+#: src/compose.c:584 src/mainwindow.c:620 src/messageview.c:191
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Pregled/_Znakovni standard/Čirilica (ISO-8859-_5)"
 
-#: src/compose.c:588 src/mainwindow.c:631 src/messageview.c:193
+#: src/compose.c:586 src/mainwindow.c:622 src/messageview.c:193
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Pregled/_Znakovni standard/Čirilica (KOI8-_R)"
 
-#: src/compose.c:590 src/mainwindow.c:633 src/messageview.c:195
+#: src/compose.c:588 src/mainwindow.c:624 src/messageview.c:195
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Pregled/_Znakovni standard/Čirilica (KOI8-_R)"
 
-#: src/compose.c:592 src/mainwindow.c:635 src/messageview.c:197
+#: src/compose.c:590 src/mainwindow.c:626 src/messageview.c:197
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Pregled/_Znakovni standard/Čirilica (Windows-1251)"
 
-#: src/compose.c:596 src/mainwindow.c:639 src/messageview.c:200
+#: src/compose.c:594 src/mainwindow.c:630 src/messageview.c:200
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Pregled/_Znakovni standard/Japan (ISO-2022-_JP)"
 
-#: src/compose.c:600 src/mainwindow.c:649 src/messageview.c:209
+#: src/compose.c:598 src/mainwindow.c:640 src/messageview.c:209
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Pregled/_Znakovni standard/Pojednostavljeni Kineski (_GB2312)"
 
-#: src/compose.c:602 src/mainwindow.c:651 src/messageview.c:211
+#: src/compose.c:600 src/mainwindow.c:642 src/messageview.c:211
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Pregled/_Znakovni standard/Pojednostavljeni Kineski (_GB2312)"
 
-#: src/compose.c:604 src/mainwindow.c:653 src/messageview.c:213
+#: src/compose.c:602 src/mainwindow.c:644 src/messageview.c:213
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Pregled/_Znakovni standard/Tradicionalni Kineski (_Big5)"
 
-#: src/compose.c:606 src/mainwindow.c:655 src/messageview.c:215
+#: src/compose.c:604 src/mainwindow.c:646 src/messageview.c:215
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Pregled/_Znakovni standard/Tradicionalni Kineski (EUC-_TW)"
 
-#: src/compose.c:610 src/mainwindow.c:661 src/messageview.c:220
+#: src/compose.c:608 src/mainwindow.c:652 src/messageview.c:220
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Pregled/_Znakovni standard/Koreja (EUC-_KR)"
 
-#: src/compose.c:614 src/mainwindow.c:667 src/messageview.c:225
+#: src/compose.c:612 src/mainwindow.c:658 src/messageview.c:225
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Pregled/_Znakovni standard/Thai (TIS-620)"
 
-#: src/compose.c:616 src/mainwindow.c:669 src/messageview.c:227
+#: src/compose.c:614 src/mainwindow.c:660 src/messageview.c:227
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Pregled/_Znakovni standard/Thai (Windows-874)"
 
-#: src/compose.c:620 src/mainwindow.c:726 src/messageview.c:257
+#: src/compose.c:618 src/mainwindow.c:717 src/messageview.c:257
 #, fuzzy
 msgid "/_Tools/_Address book"
 msgstr "/_Alat/_Adresar"
 
-#: src/compose.c:621
+#: src/compose.c:619
 #, fuzzy
 msgid "/_Tools/_Template"
 msgstr "/_Alat/_Obrazac"
 
-#: src/compose.c:622 src/mainwindow.c:749 src/messageview.c:272
+#: src/compose.c:620 src/mainwindow.c:740 src/messageview.c:272
 #, fuzzy
 msgid "/_Tools/Actio_ns"
 msgstr "/_Izvrši"
 
-#: src/compose.c:623 src/compose.c:627 src/mainwindow.c:729
-#: src/mainwindow.c:743 src/mainwindow.c:748 src/mainwindow.c:750
-#: src/mainwindow.c:753 src/mainwindow.c:755 src/messageview.c:260
+#: src/compose.c:621 src/compose.c:625 src/mainwindow.c:720
+#: src/mainwindow.c:734 src/mainwindow.c:739 src/mainwindow.c:741
+#: src/mainwindow.c:744 src/mainwindow.c:746 src/messageview.c:260
 #: src/messageview.c:271
 #, fuzzy
 msgid "/_Tools/---"
 msgstr "/_Alat"
 
-#: src/compose.c:624
+#: src/compose.c:622
 #, fuzzy
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/_Uredi/Uredi s _vanjskim uređivačem"
 
-#: src/compose.c:628
+#: src/compose.c:626
 #, fuzzy
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Izvrši"
 
-#: src/compose.c:629
+#: src/compose.c:627
 #, fuzzy
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/_Poruka/_Kriptiraj"
 
-#: src/compose.c:855
+#: src/compose.c:853
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: datoteka ne postoji\n"
 
-#: src/compose.c:954 src/compose.c:1024 src/procmsg.c:1353
+#: src/compose.c:952 src/compose.c:1022 src/procmsg.c:1353
 msgid "Can't get text part\n"
 msgstr "Ne mogu dobiti dio tekst\n"
 
-#: src/compose.c:1420
+#: src/compose.c:1418
 msgid "Quote mark format error."
 msgstr "Greška formata citata."
 
-#: src/compose.c:1432
+#: src/compose.c:1430
 msgid "Message reply/forward format error."
 msgstr "Greška poruke odgovori/proslijedi."
 
-#: src/compose.c:1801
+#: src/compose.c:1799
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Datoteka %s ne postoji\n"
 
-#: src/compose.c:1805
+#: src/compose.c:1803
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Ne mogu dobiti veličinu datoteke %s\n"
 
-#: src/compose.c:1809
+#: src/compose.c:1807
 #, fuzzy, c-format
 msgid "File %s is empty."
 msgstr "Datoteka %s je prazna\n"
 
-#: src/compose.c:1813
+#: src/compose.c:1811
 #, fuzzy, c-format
 msgid "Can't read %s."
 msgstr "ne mogu kreirati %s\n"
 
-#: src/compose.c:1848
+#: src/compose.c:1846
 #, c-format
 msgid "Message: %s"
 msgstr "Poruka: %s"
 
-#: src/compose.c:1920 src/mimeview.c:560
+#: src/compose.c:1918 src/mimeview.c:560
 msgid "Can't get the part of multipart message."
 msgstr "Ne mogu dobiti dio višedjelne poruke."
 
-#: src/compose.c:2362
+#: src/compose.c:2360
 msgid " [Edited]"
 msgstr " [Uređeno]"
 
-#: src/compose.c:2364
+#: src/compose.c:2362
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Pisanje poruke%s"
 
-#: src/compose.c:2367
+#: src/compose.c:2365
 #, c-format
 msgid "Compose message%s"
 msgstr "Pisanje poruke%s"
 
-#: src/compose.c:2478
+#: src/compose.c:2476
 msgid "Recipient is not specified."
 msgstr "Nije upisan primatelj."
 
-#: src/compose.c:2486
+#: src/compose.c:2484
 #, fuzzy
 msgid "Empty subject"
 msgstr "Tema"
 
-#: src/compose.c:2487
+#: src/compose.c:2485
 msgid "Subject is empty. Send it anyway?"
 msgstr ""
 
-#: src/compose.c:2538
+#: src/compose.c:2536
 msgid "can't get recipient list."
 msgstr "ne mogu dobiti listu primatelja."
 
-#: src/compose.c:2558
+#: src/compose.c:2556
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1030,26 +1030,26 @@ msgstr ""
 "Račun za slanje pošte nije definiran.\n"
 "Molim, odaberite račun prije slanja."
 
-#: src/compose.c:2572 src/send_message.c:297
+#: src/compose.c:2570 src/send_message.c:297
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Došlo je do greške prilikom slanja poruke %s -u."
 
-#: src/compose.c:2595
+#: src/compose.c:2593
 msgid "Can't save the message to outbox."
 msgstr "Ne mogu snimiti poruku u spis poslano."
 
-#: src/compose.c:2645
+#: src/compose.c:2643
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr ""
 
-#: src/compose.c:2709 src/compose.c:2965 src/compose.c:3028 src/compose.c:3148
-#: src/utils.c:2365
+#: src/compose.c:2707 src/compose.c:2963 src/compose.c:3026 src/compose.c:3146
+#: src/utils.c:2379
 msgid "can't change file mode\n"
 msgstr "ne mogu promjeniti atribut datoteke\n"
 
-#: src/compose.c:2741
+#: src/compose.c:2739
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1057,12 +1057,12 @@ msgid ""
 "Send it as %s anyway?"
 msgstr "Ne mogu promjeniti charset poruke."
 
-#: src/compose.c:2747
+#: src/compose.c:2745
 #, fuzzy
 msgid "Code conversion error"
 msgstr "Greška pri unosu adresara"
 
-#: src/compose.c:2816
+#: src/compose.c:2814
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1071,158 +1071,158 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:2820
+#: src/compose.c:2818
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3108
+#: src/compose.c:3106
 msgid "can't remove the old message\n"
 msgstr "ne mogu ukloniti staru poruku\n"
 
-#: src/compose.c:3126
+#: src/compose.c:3124
 msgid "queueing message...\n"
 msgstr "odlažem poruku...\n"
 
-#: src/compose.c:3208
+#: src/compose.c:3206
 #, fuzzy
 msgid "can't find queue folder\n"
 msgstr "ne mogu odabrati spis: %s\n"
 
-#: src/compose.c:3215
+#: src/compose.c:3213
 msgid "can't queue the message\n"
 msgstr "ne mogu odložiti poruku\n"
 
-#: src/compose.c:3792
+#: src/compose.c:3790
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "generiran ID-poruke: %s\n"
 
-#: src/compose.c:3901
+#: src/compose.c:3899
 msgid "Creating compose window...\n"
 msgstr "Stvaram prozor za pisanje...\n"
 
-#: src/compose.c:3949 src/headerview.c:54 src/summary_search.c:214
+#: src/compose.c:3947 src/headerview.c:54 src/summary_search.c:214
 msgid "From:"
 msgstr "Od:"
 
-#: src/compose.c:4021
+#: src/compose.c:4019
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/_Izvrši"
 
-#: src/compose.c:4024
+#: src/compose.c:4022
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/_Poruka/_Kriptiraj"
 
-#: src/compose.c:4062 src/compose.c:5001
+#: src/compose.c:4060 src/compose.c:4995
 msgid "MIME type"
 msgstr "MIME tip"
 
 #. S_COL_DATE
-#: src/compose.c:4071 src/mimeview.c:192 src/prefs_filter_edit.c:585
+#: src/compose.c:4069 src/mimeview.c:192 src/prefs_filter_edit.c:585
 #: src/prefs_summary_column.c:75 src/select-keys.c:317 src/summaryview.c:4217
 msgid "Size"
 msgstr "Veličina"
 
-#: src/compose.c:4449 src/mainwindow.c:2224 src/prefs_account.c:719
+#: src/compose.c:4442 src/mainwindow.c:2207 src/prefs_account.c:719
 #: src/prefs_common.c:947
 msgid "Send"
 msgstr "Pošalji"
 
-#: src/compose.c:4450
+#: src/compose.c:4443
 msgid "Send message"
 msgstr "Pošalji poruku"
 
-#: src/compose.c:4458
+#: src/compose.c:4451
 msgid "Send later"
 msgstr "Pošalji kasnije"
 
-#: src/compose.c:4459
+#: src/compose.c:4452
 msgid "Put into queue folder and send later"
 msgstr "Odloži u spis odloženo i pošalji kasnije"
 
-#: src/compose.c:4467
+#: src/compose.c:4460
 msgid "Draft"
 msgstr "Nedovršeno"
 
-#: src/compose.c:4468
+#: src/compose.c:4461
 msgid "Save to draft folder"
 msgstr "Spremi u spis nedovršeno"
 
-#: src/compose.c:4478
+#: src/compose.c:4471
 msgid "Insert"
 msgstr "Unesi"
 
-#: src/compose.c:4479
+#: src/compose.c:4472
 msgid "Insert file"
 msgstr "Unesi datoteku"
 
-#: src/compose.c:4487
+#: src/compose.c:4480
 msgid "Attach"
 msgstr "Priloži"
 
-#: src/compose.c:4488
+#: src/compose.c:4481
 msgid "Attach file"
 msgstr "Priloži datoteku"
 
 #. signature
-#: src/compose.c:4498 src/prefs_account.c:1391 src/prefs_common.c:1356
+#: src/compose.c:4491 src/prefs_account.c:1391 src/prefs_common.c:1356
 msgid "Signature"
 msgstr "Potpis"
 
-#: src/compose.c:4499
+#: src/compose.c:4492
 msgid "Insert signature"
 msgstr "Unesi potpis"
 
-#: src/compose.c:4508 src/prefs_common.c:1378 src/prefs_common.c:2382
+#: src/compose.c:4501 src/prefs_common.c:1378 src/prefs_common.c:2382
 msgid "Editor"
 msgstr "Uređivač"
 
-#: src/compose.c:4509
+#: src/compose.c:4502
 msgid "Edit with external editor"
 msgstr "Uredi s vanjskim uređivačem"
 
-#: src/compose.c:4517
+#: src/compose.c:4510
 msgid "Linewrap"
 msgstr "Sažimanje"
 
-#: src/compose.c:4518
+#: src/compose.c:4511
 #, fuzzy
 msgid "Wrap all long lines"
 msgstr "/_Uredi/Sažmi sve duge _linije"
 
-#: src/compose.c:4897
+#: src/compose.c:4891
 msgid "Invalid MIME type."
 msgstr "Pogrešan MIME tip"
 
-#: src/compose.c:4915
+#: src/compose.c:4909
 msgid "File doesn't exist or is empty."
 msgstr "Datoteka ne postoji ili je prazna."
 
-#: src/compose.c:4983
+#: src/compose.c:4977
 #, fuzzy
 msgid "Properties"
 msgstr "Postavke"
 
-#: src/compose.c:5003
+#: src/compose.c:4997
 msgid "Encoding"
 msgstr "Kodiranje"
 
-#: src/compose.c:5026 src/prefs_folder_item.c:183
+#: src/compose.c:5020 src/prefs_folder_item.c:183
 msgid "Path"
 msgstr "Staza"
 
-#: src/compose.c:5027
+#: src/compose.c:5021
 msgid "File name"
 msgstr "Ime datoteke"
 
-#: src/compose.c:5185
+#: src/compose.c:5179
 #, 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:5211
+#: src/compose.c:5205
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1233,76 +1233,76 @@ msgstr ""
 "Ugasiti proces?\n"
 "grupa procesa: %d"
 
-#: src/compose.c:5228
+#: src/compose.c:5222
 #, c-format
 msgid "Terminated process group id: %d"
 msgstr "Ugašena grupa procesa: %d"
 
-#: src/compose.c:5229
+#: src/compose.c:5223
 #, c-format
 msgid "Temporary file: %s"
 msgstr "Privremena datoteka: %s"
 
-#: src/compose.c:5253
+#: src/compose.c:5247
 msgid "Compose: input from monitoring process\n"
 msgstr "Napiši: unos iz procesa motrenja\n"
 
 #. failed
-#: src/compose.c:5284
+#: src/compose.c:5278
 msgid "Couldn't exec external editor\n"
 msgstr "Ne mogu pokrenuti vanjski uređivač\n"
 
-#: src/compose.c:5288
+#: src/compose.c:5282
 msgid "Couldn't write to file\n"
 msgstr "Ne mogu pisati u datoteku\n"
 
-#: src/compose.c:5290
+#: src/compose.c:5284
 msgid "Pipe read failed\n"
 msgstr "Čitanje pipe-a nije uspjelo\n"
 
-#: src/compose.c:5596 src/compose.c:5604 src/compose.c:5610
+#: src/compose.c:5590 src/compose.c:5598 src/compose.c:5604
 msgid "Can't queue the message."
 msgstr "Ne mogu odložiti poruku."
 
-#: src/compose.c:5701
+#: src/compose.c:5695
 #, fuzzy
 msgid "Select files"
 msgstr "Odaberite datoteku"
 
-#: src/compose.c:5723
+#: src/compose.c:5717
 msgid "Select file"
 msgstr "Odaberite datoteku"
 
-#: src/compose.c:5760
+#: src/compose.c:5754
 #, fuzzy
 msgid "Save message"
 msgstr "Pošalji poruku"
 
-#: src/compose.c:5761
+#: src/compose.c:5755
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Ova poruka je promijenjena, odbaciti?"
 
-#: src/compose.c:5763
+#: src/compose.c:5757
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:5805
+#: src/compose.c:5799
 #, fuzzy, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Uistinu obrisati ovaj obrazac?"
 
-#: src/compose.c:5807
+#: src/compose.c:5801
 #, fuzzy
 msgid "Apply template"
 msgstr "Briši obrazac"
 
-#: src/compose.c:5808
+#: src/compose.c:5802
 #, fuzzy
 msgid "_Replace"
 msgstr "Obrazac"
 
-#: src/compose.c:5808
+#: src/compose.c:5802
 #, fuzzy
 msgid "_Insert"
 msgstr "Unesi"
@@ -1753,12 +1753,12 @@ msgstr "Postavljam info spisa...\n"
 msgid "Setting folder info..."
 msgstr "Postavljam info spisa..."
 
-#: src/folderview.c:805 src/mainwindow.c:3301 src/setup.c:81
+#: src/folderview.c:805 src/mainwindow.c:3272 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Pretražujem spise %s%c%s ..."
 
-#: src/folderview.c:809 src/mainwindow.c:3306 src/setup.c:86
+#: src/folderview.c:809 src/mainwindow.c:3277 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Pretražujem spis %s ..."
@@ -2088,46 +2088,46 @@ msgstr "Autorizacija"
 msgid "IMAP4 login failed.\n"
 msgstr "IMAP4 login propao.\n"
 
-#: src/imap.c:3522
+#: src/imap.c:3528
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "ne mogu pričvrstiti %s na %s\n"
 
-#: src/imap.c:3529
+#: src/imap.c:3535
 #, fuzzy
 msgid "(sending file...)"
 msgstr "Šaljem DATA..."
 
-#: src/imap.c:3557
+#: src/imap.c:3563
 #, fuzzy, c-format
 msgid "can't append message to %s\n"
 msgstr "ne mogu obilježiti poruku %s\n"
 
-#: src/imap.c:3589
+#: src/imap.c:3595
 #, fuzzy, c-format
 msgid "can't copy %s to %s\n"
 msgstr "ne mogu kopirati %d u %s\n"
 
-#: src/imap.c:3613
+#: src/imap.c:3619
 #, fuzzy, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "greška prilikom imap naredbe: STORE %d:%d %s\n"
 
-#: src/imap.c:3627
+#: src/imap.c:3633
 msgid "error while imap command: EXPUNGE\n"
 msgstr "greška prilikom imap naredbe: EXPUNGE\n"
 
-#: src/imap.c:3640
+#: src/imap.c:3646
 #, fuzzy
 msgid "error while imap command: CLOSE\n"
 msgstr "greška prilikom imap naredbe: EXPUNGE\n"
 
-#: src/imap.c:3873
+#: src/imap.c:3879
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr ""
 
-#: src/imap.c:3903
+#: src/imap.c:3909
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr ""
@@ -2239,7 +2239,7 @@ msgstr "Unesi LDIF datoteku u Adresar"
 msgid "Prev"
 msgstr "Postav"
 
-#: src/importldif.c:768 src/mainwindow.c:2321
+#: src/importldif.c:768 src/mainwindow.c:2303
 msgid "Next"
 msgstr "Slijedeća"
 
@@ -2587,714 +2587,714 @@ msgid ""
 "Do you want to migrate it?"
 msgstr ""
 
-#: src/mainwindow.c:471
+#: src/mainwindow.c:462
 msgid "/_File/_Folder"
 msgstr "/_Datoteka/_Spis"
 
-#: src/mainwindow.c:472
+#: src/mainwindow.c:463
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/_Datoteka/_Spis/Kreiraj _novi spis..."
 
-#: src/mainwindow.c:474
+#: src/mainwindow.c:465
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/_Datoteka/_Spis/_Preimenuj spis..."
 
-#: src/mainwindow.c:475
+#: src/mainwindow.c:466
 #, fuzzy
 msgid "/_File/_Folder/_Move folder..."
 msgstr "/_Datoteka/_Spis/_Preimenuj spis..."
 
-#: src/mainwindow.c:476
+#: src/mainwindow.c:467
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/_Datoteka/_Spis/_Obriši spis"
 
-#: src/mainwindow.c:477
+#: src/mainwindow.c:468
 #, fuzzy
 msgid "/_File/_Mailbox"
 msgstr "/_Datoteka/Dodaj _sandučić..."
 
-#: src/mainwindow.c:478
+#: src/mainwindow.c:469
 #, fuzzy
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/_Datoteka/Dodaj _sandučić..."
 
-#: src/mainwindow.c:479
+#: src/mainwindow.c:470
 #, fuzzy
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/_Ukloni sandučić"
 
-#: src/mainwindow.c:480 src/mainwindow.c:485
+#: src/mainwindow.c:471 src/mainwindow.c:476
 #, fuzzy
 msgid "/_File/_Mailbox/---"
 msgstr "/_Datoteka/_Spis"
 
-#: src/mainwindow.c:481
+#: src/mainwindow.c:472
 #, fuzzy
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "Kreiranje nove pošte"
 
-#: src/mainwindow.c:483
+#: src/mainwindow.c:474
 #, fuzzy
 msgid "/_File/_Mailbox/Check for new messages in _all mailboxes"
 msgstr "Kreiranje nove pošte"
 
-#: src/mainwindow.c:486
+#: src/mainwindow.c:477
 #, fuzzy
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "/O_svježi stablo spisa"
 
-#: src/mainwindow.c:489
+#: src/mainwindow.c:480
 msgid "/_File/_Import mbox file..."
 msgstr "/_Datoteka/_Unesi mbox datoteku"
 
-#: src/mainwindow.c:490
+#: src/mainwindow.c:481
 msgid "/_File/_Export to mbox file..."
 msgstr "/_Datoteka/_Izvezi u mbox datoteku..."
 
-#: src/mainwindow.c:492
+#: src/mainwindow.c:483
 #, fuzzy
 msgid "/_File/Empty all _trash"
 msgstr "/_Datotkea/Isprazni s_meće"
 
-#: src/mainwindow.c:494 src/messageview.c:138
+#: src/mainwindow.c:485 src/messageview.c:138
 msgid "/_File/_Save as..."
 msgstr "/_Datoteka/Spremi _kao..."
 
-#: src/mainwindow.c:495 src/messageview.c:139
+#: src/mainwindow.c:486 src/messageview.c:139
 msgid "/_File/_Print..."
 msgstr "/_Datoteka/Is_piši..."
 
-#: src/mainwindow.c:497
+#: src/mainwindow.c:488
 #, fuzzy
 msgid "/_File/_Work offline"
 msgstr "/_Datoteka/_Unesi datoteku"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:500
+#: src/mainwindow.c:491
 msgid "/_File/E_xit"
 msgstr "/_Datoteka/I_zlaz"
 
-#: src/mainwindow.c:505
+#: src/mainwindow.c:496
 #, fuzzy
 msgid "/_Edit/Select _thread"
 msgstr "/_Uredi/Odaberi _sve"
 
-#: src/mainwindow.c:507 src/messageview.c:147
+#: src/mainwindow.c:498 src/messageview.c:147
 #, fuzzy
 msgid "/_Edit/_Find in current message..."
 msgstr "/_Uredi/P_ronađi u poruci"
 
-#: src/mainwindow.c:509
+#: src/mainwindow.c:500
 #, fuzzy
 msgid "/_Edit/_Search messages..."
 msgstr "/_Traži poruka..."
 
-#: src/mainwindow.c:512
+#: src/mainwindow.c:503
 #, fuzzy
 msgid "/_View/Show or hi_de"
 msgstr "/_Pregled/Prikaži s_vo zaglavlje"
 
-#: src/mainwindow.c:513
+#: src/mainwindow.c:504
 #, fuzzy
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/_Pregled/_Stablo spisa"
 
-#: src/mainwindow.c:515
+#: src/mainwindow.c:506
 #, fuzzy
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/_Pregled/_Pregled poruka"
 
-#: src/mainwindow.c:517
+#: src/mainwindow.c:508
 #, fuzzy
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/_Pregled/_Traka alata"
 
-#: src/mainwindow.c:519
+#: src/mainwindow.c:510
 #, fuzzy
 msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/_Pregled/_Traka alata/Slike i tekst"
 
-#: src/mainwindow.c:521
+#: src/mainwindow.c:512
 #, fuzzy
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/_Pregled/_Traka alata/_Slike"
 
-#: src/mainwindow.c:523
+#: src/mainwindow.c:514
 #, fuzzy
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/_Pregled/_Traka alata/_Tekst"
 
-#: src/mainwindow.c:525
+#: src/mainwindow.c:516
 #, fuzzy
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/_Pregled/_Traka alata/_Ništa"
 
-#: src/mainwindow.c:527
+#: src/mainwindow.c:518
 #, fuzzy
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/_Pregled/Stat_us traka"
 
-#: src/mainwindow.c:530
+#: src/mainwindow.c:521
 msgid "/_View/Separate f_older tree"
 msgstr "/_Pregled/Odvoji sta_blo spisa"
 
-#: src/mainwindow.c:531
+#: src/mainwindow.c:522
 #, fuzzy
 msgid "/_View/Separate _message view"
 msgstr "/_Pregled/Odvoji pre_gled poruka"
 
-#: src/mainwindow.c:533
+#: src/mainwindow.c:524
 #, fuzzy
 msgid "/_View/_Sort"
 msgstr "/_Pregled/Pr_egledaj izvor"
 
-#: src/mainwindow.c:534
+#: src/mainwindow.c:525
 #, fuzzy
 msgid "/_View/_Sort/by _number"
 msgstr "/_Održavanje/Pos_loži/Posloži po _broju"
 
-#: src/mainwindow.c:535
+#: src/mainwindow.c:526
 #, fuzzy
 msgid "/_View/_Sort/by s_ize"
 msgstr "/_Održavanje/Pos_loži/Posloži po _veličini"
 
-#: src/mainwindow.c:536
+#: src/mainwindow.c:527
 #, fuzzy
 msgid "/_View/_Sort/by _date"
 msgstr "/_Održavanje/Pos_loži/Posloži po _datumu"
 
-#: src/mainwindow.c:537
+#: src/mainwindow.c:528
 #, fuzzy
 msgid "/_View/_Sort/by _from"
 msgstr "/_Održavanje/Pos_loži/Posloži po _pošiljatelju"
 
-#: src/mainwindow.c:538
+#: src/mainwindow.c:529
 #, fuzzy
 msgid "/_View/_Sort/by _recipient"
 msgstr "/_Održavanje/Pos_loži/Posloži po _veličini"
 
-#: src/mainwindow.c:539
+#: src/mainwindow.c:530
 #, fuzzy
 msgid "/_View/_Sort/by _subject"
 msgstr "/_Održavanje/Pos_loži/Posloži po _temi"
 
-#: src/mainwindow.c:540
+#: src/mainwindow.c:531
 #, fuzzy
 msgid "/_View/_Sort/by _color label"
 msgstr "/_Održavanje/Pos_loži/Posloži oznaci _boje"
 
-#: src/mainwindow.c:542
+#: src/mainwindow.c:533
 #, fuzzy
 msgid "/_View/_Sort/by _mark"
 msgstr "/_Održavanje/Pos_loži/Posloži po _oznaci"
 
-#: src/mainwindow.c:543
+#: src/mainwindow.c:534
 #, fuzzy
 msgid "/_View/_Sort/by _unread"
 msgstr "/_Održavanje/Pos_loži/Posloži po _nepročitanom"
 
-#: src/mainwindow.c:544
+#: src/mainwindow.c:535
 #, fuzzy
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/_Održavanje/Pos_loži/Posloži po _prilogu"
 
-#: src/mainwindow.c:546
+#: src/mainwindow.c:537
 #, fuzzy
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/_Održavanje/Pos_loži/Posloži po _nepročitanom"
 
-#: src/mainwindow.c:547 src/mainwindow.c:550
+#: src/mainwindow.c:538 src/mainwindow.c:541
 #, fuzzy
 msgid "/_View/_Sort/---"
 msgstr "/_Pregled/_Znakovni standard/---"
 
-#: src/mainwindow.c:548
+#: src/mainwindow.c:539
 #, fuzzy
 msgid "/_View/_Sort/Ascending"
 msgstr "/_Pregled/Pr_egledaj izvor"
 
-#: src/mainwindow.c:549
+#: src/mainwindow.c:540
 #, fuzzy
 msgid "/_View/_Sort/Descending"
 msgstr "/_Pregled/Pr_egledaj izvor"
 
-#: src/mainwindow.c:551
+#: src/mainwindow.c:542
 #, fuzzy
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/_Održavanje/Pos_loži/P_rivuci po temi"
 
-#: src/mainwindow.c:553
+#: src/mainwindow.c:544
 #, fuzzy
 msgid "/_View/Th_read view"
 msgstr "/_Pregled/_Pregled poruka"
 
-#: src/mainwindow.c:554
+#: src/mainwindow.c:545
 #, fuzzy
 msgid "/_View/E_xpand all threads"
 msgstr "Raširi stablo"
 
-#: src/mainwindow.c:555
+#: src/mainwindow.c:546
 #, fuzzy
 msgid "/_View/Co_llapse all threads"
 msgstr "/_Pregled/Prikaži s_vo zaglavlje"
 
-#: src/mainwindow.c:556
+#: src/mainwindow.c:547
 #, fuzzy
 msgid "/_View/Set display _item..."
 msgstr "/Održavanje/Postavi po_jedinosti prikaza"
 
-#: src/mainwindow.c:559
+#: src/mainwindow.c:550
 #, fuzzy
 msgid "/_View/_Go to"
 msgstr "/_Pregled/_Znakovni standard"
 
-#: src/mainwindow.c:560
+#: src/mainwindow.c:551
 #, fuzzy
 msgid "/_View/_Go to/_Prev message"
 msgstr "/_Održavanje/Idi pre_ma/_Prethodna poruka"
 
-#: src/mainwindow.c:561
+#: src/mainwindow.c:552
 #, fuzzy
 msgid "/_View/_Go to/_Next message"
 msgstr "/_Održavanje/Idi pre_ma/Slij_edeća poruka"
 
-#: src/mainwindow.c:562 src/mainwindow.c:567 src/mainwindow.c:570
-#: src/mainwindow.c:575 src/mainwindow.c:580
+#: src/mainwindow.c:553 src/mainwindow.c:558 src/mainwindow.c:561
+#: src/mainwindow.c:566 src/mainwindow.c:571
 #, fuzzy
 msgid "/_View/_Go to/---"
 msgstr "/_Pregled/_Znakovni standard/---"
 
-#: src/mainwindow.c:563
+#: src/mainwindow.c:554
 #, fuzzy
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/_Održavanje/Idi pre_ma/Prethodna _nepročitana poruka"
 
-#: src/mainwindow.c:565
+#: src/mainwindow.c:556
 #, fuzzy
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/_Održavanje/Idi pre_ma/_Slijedeća nepročitana poruka"
 
-#: src/mainwindow.c:568
+#: src/mainwindow.c:559
 #, fuzzy
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/_Održavanje/Idi pre_ma/_Prethodna poruka"
 
-#: src/mainwindow.c:569
+#: src/mainwindow.c:560
 #, fuzzy
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/_Održavanje/Idi pre_ma/Slij_edeća poruka"
 
-#: src/mainwindow.c:571
+#: src/mainwindow.c:562
 #, fuzzy
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/_Održavanje/P_rethodna označena poruka"
 
-#: src/mainwindow.c:573
+#: src/mainwindow.c:564
 #, fuzzy
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/_Održavanje/Idi pre_ma/Slijedeća _označena poruka"
 
-#: src/mainwindow.c:576
+#: src/mainwindow.c:567
 #, fuzzy
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/_Održavanje/Idi pre_ma/Pre_thodna label poruka"
 
-#: src/mainwindow.c:578
+#: src/mainwindow.c:569
 #, fuzzy
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/_Održavanje/Idi pre_ma/Slijedeća _label poruka"
 
-#: src/mainwindow.c:581
+#: src/mainwindow.c:572
 #, fuzzy
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Održavanje/_Idi u drugi spis..."
 
-#: src/mainwindow.c:590 src/messageview.c:158
+#: src/mainwindow.c:581 src/messageview.c:158
 #, fuzzy
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Pregled/_Znakovni standard/_Auto detekcija"
 
-#: src/mainwindow.c:641 src/messageview.c:202
+#: src/mainwindow.c:632 src/messageview.c:202
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Pregled/_Znakovni standard/Japan (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:643 src/messageview.c:204
+#: src/mainwindow.c:634 src/messageview.c:204
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Pregled/_Znakovni standard/Japan (_EUC-JP)"
 
-#: src/mainwindow.c:645 src/messageview.c:206
+#: src/mainwindow.c:636 src/messageview.c:206
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Pregled/_Znakovni standard/Japan (_Shift__JIS)"
 
-#: src/mainwindow.c:657 src/messageview.c:217
+#: src/mainwindow.c:648 src/messageview.c:217
 #, fuzzy
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Pregled/_Znakovni standard/Kina (ISO-2022-_CN)"
 
-#: src/mainwindow.c:663 src/messageview.c:222
+#: src/mainwindow.c:654 src/messageview.c:222
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Pregled/_Znakovni standard/Koreja (ISO-2022-KR)"
 
-#: src/mainwindow.c:676 src/summaryview.c:401
+#: src/mainwindow.c:667 src/summaryview.c:401
 msgid "/_View/Open in new _window"
 msgstr "/_Pregled/Otvori u novom _prozoru"
 
-#: src/mainwindow.c:677 src/messageview.c:234
+#: src/mainwindow.c:668 src/messageview.c:234
 #, fuzzy
 msgid "/_View/Mess_age source"
 msgstr "/_Pregled/Pr_egledaj izvor"
 
-#: src/mainwindow.c:678 src/messageview.c:235
+#: src/mainwindow.c:669 src/messageview.c:235
 msgid "/_View/Show all _header"
 msgstr "/_Pregled/Prikaži s_vo zaglavlje"
 
-#: src/mainwindow.c:680
+#: src/mainwindow.c:671
 #, fuzzy
 msgid "/_View/_Update summary"
 msgstr "/_Pregled/_Znakovni standard"
 
-#: src/mainwindow.c:682 src/messageview.c:237
+#: src/mainwindow.c:673 src/messageview.c:237
 msgid "/_Message"
 msgstr "/_Poruka"
 
-#: src/mainwindow.c:683
+#: src/mainwindow.c:674
 #, fuzzy
 msgid "/_Message/Recei_ve"
 msgstr "/_Pošta/Pre_Uredi"
 
-#: src/mainwindow.c:684
+#: src/mainwindow.c:675
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/_Pošta/Primi poštu sa _svih računa"
 
-#: src/mainwindow.c:686
+#: src/mainwindow.c:677
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/_Pošta/Primi poštu sa _svih računa"
 
-#: src/mainwindow.c:688
+#: src/mainwindow.c:679
 #, fuzzy
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/_Poruka/Pošalji _kasnije"
 
-#: src/mainwindow.c:690
+#: src/mainwindow.c:681
 #, fuzzy
 msgid "/_Message/Recei_ve/---"
 msgstr "/_Pošta/Pre_Uredi"
 
-#: src/mainwindow.c:691
+#: src/mainwindow.c:682
 #, fuzzy
 msgid "/_Message/_Send queued messages"
 msgstr "/_Pošta/Pošalji _odložene poruke"
 
-#: src/mainwindow.c:692 src/mainwindow.c:694 src/mainwindow.c:701
-#: src/mainwindow.c:706 src/mainwindow.c:710 src/mainwindow.c:719
-#: src/mainwindow.c:722 src/messageview.c:240 src/messageview.c:248
+#: src/mainwindow.c:683 src/mainwindow.c:685 src/mainwindow.c:692
+#: src/mainwindow.c:697 src/mainwindow.c:701 src/mainwindow.c:710
+#: src/mainwindow.c:713 src/messageview.c:240 src/messageview.c:248
 #: src/messageview.c:253
 msgid "/_Message/---"
 msgstr "/_Poruka/---"
 
-#: src/mainwindow.c:693 src/messageview.c:238
+#: src/mainwindow.c:684 src/messageview.c:238
 msgid "/_Message/Compose _new message"
 msgstr "/_Pošta/Kreiraj _novu poruku"
 
-#: src/mainwindow.c:695 src/messageview.c:241
+#: src/mainwindow.c:686 src/messageview.c:241
 msgid "/_Message/_Reply"
 msgstr "/_Pošta/O_dgovori"
 
-#: src/mainwindow.c:696
+#: src/mainwindow.c:687
 #, fuzzy
 msgid "/_Message/Repl_y to"
 msgstr "/_Poruka/O_dgovori"
 
-#: src/mainwindow.c:697 src/messageview.c:242
+#: src/mainwindow.c:688 src/messageview.c:242
 #, fuzzy
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Pošta/Odgovori svi_ma"
 
-#: src/mainwindow.c:698 src/messageview.c:244
+#: src/mainwindow.c:689 src/messageview.c:244
 #, fuzzy
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Pošta/Od_govori pošiljatelju"
 
-#: src/mainwindow.c:699 src/messageview.c:246
+#: src/mainwindow.c:690 src/messageview.c:246
 #, fuzzy
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Pošta/Odgovori svi_ma"
 
-#: src/mainwindow.c:702 src/messageview.c:249
+#: src/mainwindow.c:693 src/messageview.c:249
 msgid "/_Message/_Forward"
 msgstr "/_Pošta/P_roslijedi"
 
-#: src/mainwindow.c:703 src/messageview.c:250
+#: src/mainwindow.c:694 src/messageview.c:250
 #, fuzzy
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Pošta/Proslijedi _kao prilog"
 
-#: src/mainwindow.c:705 src/messageview.c:252
+#: src/mainwindow.c:696 src/messageview.c:252
 #, fuzzy
 msgid "/_Message/Redirec_t"
 msgstr "/_Pošta/Pre_Uredi"
 
-#: src/mainwindow.c:707
+#: src/mainwindow.c:698
 msgid "/_Message/M_ove..."
 msgstr "/_Pošta/Prem_jesti..."
 
-#: src/mainwindow.c:708
+#: src/mainwindow.c:699
 msgid "/_Message/_Copy..."
 msgstr "/_Pošta/Kopir_aj"
 
-#: src/mainwindow.c:709
+#: src/mainwindow.c:700
 msgid "/_Message/_Delete"
 msgstr "/_Pošta/O_briši"
 
-#: src/mainwindow.c:711
+#: src/mainwindow.c:702
 msgid "/_Message/_Mark"
 msgstr "/_Pošta/O_znači"
 
-#: src/mainwindow.c:712
+#: src/mainwindow.c:703
 msgid "/_Message/_Mark/_Mark"
 msgstr "/_Pošta/O_znači/_Označi"
 
-#: src/mainwindow.c:713
+#: src/mainwindow.c:704
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/_Pošta/O_znači/_Ukloni oznaku"
 
-#: src/mainwindow.c:714
+#: src/mainwindow.c:705
 msgid "/_Message/_Mark/---"
 msgstr "/_Pošta/O_znači/---"
 
-#: src/mainwindow.c:715
+#: src/mainwindow.c:706
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/_Pošta/O_znači/Označi kao _nepročitano"
 
-#: src/mainwindow.c:716
+#: src/mainwindow.c:707
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/_Pošta/O_znači/Označi kao _pročitano"
 
-#: src/mainwindow.c:718
+#: src/mainwindow.c:709
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/_Pošta/O_znači/Označi sve _pročitano"
 
-#: src/mainwindow.c:720
+#: src/mainwindow.c:711
 #, fuzzy
 msgid "/_Message/Set as _junk mail"
 msgstr "/_Pošta/Primi novu _poštu"
 
-#: src/mainwindow.c:721
+#: src/mainwindow.c:712
 #, fuzzy
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/_Pošta/Primi novu _poštu"
 
-#: src/mainwindow.c:723 src/messageview.c:254
+#: src/mainwindow.c:714 src/messageview.c:254
 msgid "/_Message/Re-_edit"
 msgstr "/_Pošta/Pre_Uredi"
 
-#: src/mainwindow.c:727
+#: src/mainwindow.c:718
 #, fuzzy
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/Dod_aj pošiljatelja u adresar"
 
-#: src/mainwindow.c:730
+#: src/mainwindow.c:721
 #, fuzzy
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/_Održavanje/_Filtriraj poštu"
 
-#: src/mainwindow.c:732
+#: src/mainwindow.c:723
 #, fuzzy
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Održavanje/_Filtriraj poštu"
 
-#: src/mainwindow.c:734 src/messageview.c:261
+#: src/mainwindow.c:725 src/messageview.c:261
 #, fuzzy
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Održavanje/_Filtriraj poštu"
 
-#: src/mainwindow.c:735 src/messageview.c:263
+#: src/mainwindow.c:726 src/messageview.c:263
 #, fuzzy
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Održavanje/_Filtriraj poštu"
 
-#: src/mainwindow.c:737 src/messageview.c:265
+#: src/mainwindow.c:728 src/messageview.c:265
 #, fuzzy
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Održavanje/_Filtriraj poštu"
 
-#: src/mainwindow.c:739 src/messageview.c:267
+#: src/mainwindow.c:730 src/messageview.c:267
 #, fuzzy
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Održavanje/_Filtriraj poštu"
 
-#: src/mainwindow.c:741 src/messageview.c:269
+#: src/mainwindow.c:732 src/messageview.c:269
 #, fuzzy
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Održavanje/_Filtriraj poštu"
 
-#: src/mainwindow.c:744
+#: src/mainwindow.c:735
 #, fuzzy
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/_Održavanje/_Filtriraj poštu"
 
-#: src/mainwindow.c:746
+#: src/mainwindow.c:737
 #, fuzzy
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/_Održavanje/_Filtriraj poštu"
 
-#: src/mainwindow.c:751
+#: src/mainwindow.c:742
 #, fuzzy
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/_Održavanje/_Obriši duplicirane poruke"
 
-#: src/mainwindow.c:754
+#: src/mainwindow.c:745
 #, fuzzy
 msgid "/_Tools/E_xecute"
 msgstr "/_Izvrši"
 
-#: src/mainwindow.c:756
+#: src/mainwindow.c:747
 #, fuzzy
 msgid "/_Tools/_Log window"
 msgstr "/_Alat/Zapisni prozor"
 
-#: src/mainwindow.c:758
+#: src/mainwindow.c:749
 msgid "/_Configuration"
 msgstr "/_Konfiguracija"
 
-#: src/mainwindow.c:759
+#: src/mainwindow.c:750
 msgid "/_Configuration/_Common preferences..."
 msgstr "/_Konfiguracija/U_običajene postavke..."
 
-#: src/mainwindow.c:761
+#: src/mainwindow.c:752
 msgid "/_Configuration/_Filter setting..."
 msgstr "/_Konfiguracija/Postavke _filtera..."
 
-#: src/mainwindow.c:763
+#: src/mainwindow.c:754
 msgid "/_Configuration/_Template..."
 msgstr "/_Konfiguracija/_Obrazac..."
 
-#: src/mainwindow.c:764
+#: src/mainwindow.c:755
 #, fuzzy
 msgid "/_Configuration/_Actions..."
 msgstr "/_Konfiguracija/_Uredi račune..."
 
-#: src/mainwindow.c:765
+#: src/mainwindow.c:756
 msgid "/_Configuration/---"
 msgstr "/_Konfiguracija/---"
 
-#: src/mainwindow.c:766
+#: src/mainwindow.c:757
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Konfiguracija/_Postavke za trenutni račun..."
 
-#: src/mainwindow.c:768
+#: src/mainwindow.c:759
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Konfiguracija/Kreiraj _novi račun..."
 
-#: src/mainwindow.c:770
+#: src/mainwindow.c:761
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Konfiguracija/_Uredi račune..."
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:763
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Konfiguracija/Promjeni _trenutni račun"
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:767
 msgid "/_Help/_Manual"
 msgstr "/_Pomoć/_Priručnik"
 
-#: src/mainwindow.c:777
+#: src/mainwindow.c:768
 msgid "/_Help/_Manual/_English"
 msgstr "/_Pomoć/_Priručnik/_Engleski"
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:769
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/_Pomoć/_Priručnik/_Japanski"
 
-#: src/mainwindow.c:779
+#: src/mainwindow.c:770
 #, fuzzy
 msgid "/_Help/_FAQ"
 msgstr "/_Pomoć/_O"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:771
 #, fuzzy
 msgid "/_Help/_FAQ/_English"
 msgstr "/_Pomoć/_Priručnik/_Engleski"
 
-#: src/mainwindow.c:781
+#: src/mainwindow.c:772
 #, fuzzy
 msgid "/_Help/_FAQ/_German"
 msgstr "/_Pomoć/_Priručnik/_Engleski"
 
-#: src/mainwindow.c:782
+#: src/mainwindow.c:773
 #, fuzzy
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/_Pomoć/_Priručnik/_Engleski"
 
-#: src/mainwindow.c:783
+#: src/mainwindow.c:774
 msgid "/_Help/_FAQ/_French"
 msgstr ""
 
-#: src/mainwindow.c:784
+#: src/mainwindow.c:775
 #, fuzzy
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/_Pomoć/_Priručnik/_Engleski"
 
-#: src/mainwindow.c:785
+#: src/mainwindow.c:776
 msgid "/_Help/---"
 msgstr "/_Pomoć/---"
 
-#: src/mainwindow.c:825
+#: src/mainwindow.c:816
 msgid "Creating main window...\n"
 msgstr "Kreiram glavne prozore...\n"
 
-#: src/mainwindow.c:987
+#: src/mainwindow.c:973
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "MainWindow: prikaz boje %d nije uspio\n"
 
-#: src/mainwindow.c:1071 src/summaryview.c:2020 src/summaryview.c:2105
+#: src/mainwindow.c:1057 src/summaryview.c:2020 src/summaryview.c:2105
 #: src/summaryview.c:3342 src/summaryview.c:3415 src/summaryview.c:3728
 msgid "done.\n"
 msgstr "gotovo.\n"
 
-#: src/mainwindow.c:1196 src/mainwindow.c:1237 src/mainwindow.c:1265
+#: src/mainwindow.c:1182 src/mainwindow.c:1223 src/mainwindow.c:1251
 msgid "Untitled"
 msgstr "Neimenovano"
 
-#: src/mainwindow.c:1266
+#: src/mainwindow.c:1252
 msgid "none"
 msgstr "ništa"
 
-#: src/mainwindow.c:1316
+#: src/mainwindow.c:1302
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr ""
 
-#: src/mainwindow.c:1536
+#: src/mainwindow.c:1522
 msgid "Offline"
 msgstr ""
 
-#: src/mainwindow.c:1537
+#: src/mainwindow.c:1523
 msgid "You are offline. Go online?"
 msgstr ""
 
-#: src/mainwindow.c:1551
+#: src/mainwindow.c:1537
 #, fuzzy
 msgid "Empty all trash"
 msgstr "Isprazni smeće"
 
-#: src/mainwindow.c:1552
+#: src/mainwindow.c:1538
 #, fuzzy
 msgid "Empty messages in all trash?"
 msgstr "Isprazniti sve poruke u smeću?"
 
-#: src/mainwindow.c:1580
+#: src/mainwindow.c:1566
 msgid "Add mailbox"
 msgstr "Dodaj sandučić"
 
-#: src/mainwindow.c:1581
+#: src/mainwindow.c:1567
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3304,16 +3304,16 @@ msgstr ""
 "Ako je unešen postojeći sandučić, biti će\n"
 "automatski pretražen."
 
-#: src/mainwindow.c:1587
+#: src/mainwindow.c:1573
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Sandučić `%s' već postoji."
 
-#: src/mainwindow.c:1592 src/setup.c:57
+#: src/mainwindow.c:1578 src/setup.c:57
 msgid "Mailbox"
 msgstr "Sandučić"
 
-#: src/mainwindow.c:1598 src/setup.c:63
+#: src/mainwindow.c:1584 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3322,156 +3322,156 @@ msgstr ""
 "Kreiranje sandučića propalo.\n"
 "Možda neke datoteke već postoje ili nemate pravo pisanja u direktoriju."
 
-#: src/mainwindow.c:1989
+#: src/mainwindow.c:1975
 msgid "Sylpheed - Folder View"
 msgstr ""
 
-#: src/mainwindow.c:2009 src/messageview.c:368
+#: src/mainwindow.c:1995 src/messageview.c:368
 msgid "Sylpheed - Message View"
 msgstr ""
 
-#: src/mainwindow.c:2156 src/summaryview.c:370
+#: src/mainwindow.c:2142 src/summaryview.c:370
 msgid "/_Reply"
 msgstr "/Od_govori"
 
-#: src/mainwindow.c:2157
+#: src/mainwindow.c:2143
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "Odgovara svima"
 
-#: src/mainwindow.c:2158
+#: src/mainwindow.c:2144
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/Odgovor_i pošiljatelju"
 
-#: src/mainwindow.c:2159
+#: src/mainwindow.c:2145
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/Odgovori svi_ma"
 
-#: src/mainwindow.c:2164 src/summaryview.c:377
+#: src/mainwindow.c:2150 src/summaryview.c:377
 msgid "/_Forward"
 msgstr "/Prosli_jedi"
 
-#: src/mainwindow.c:2165 src/summaryview.c:378
+#: src/mainwindow.c:2151 src/summaryview.c:378
 #, fuzzy
 msgid "/For_ward as attachment"
 msgstr "/Proslijedi kao prilo_g"
 
-#: src/mainwindow.c:2166 src/summaryview.c:379
+#: src/mainwindow.c:2152 src/summaryview.c:379
 #, fuzzy
 msgid "/Redirec_t"
 msgstr "/Pre-_uredi"
 
-#: src/mainwindow.c:2205
+#: src/mainwindow.c:2188
 msgid "Get"
 msgstr "Primi"
 
-#: src/mainwindow.c:2206
+#: src/mainwindow.c:2189
 msgid "Incorporate new mail"
 msgstr "Prima novu poštu"
 
-#: src/mainwindow.c:2213
+#: src/mainwindow.c:2196
 msgid "Get all"
 msgstr "Primi sve"
 
-#: src/mainwindow.c:2214
+#: src/mainwindow.c:2197
 msgid "Incorporate new mail of all accounts"
 msgstr "Prima novu poštu sa svih računa"
 
-#: src/mainwindow.c:2225
+#: src/mainwindow.c:2208
 msgid "Send queued message(s)"
 msgstr "Šalje odložene poruke"
 
-#: src/mainwindow.c:2235 src/prefs_account.c:721 src/prefs_common.c:949
+#: src/mainwindow.c:2218 src/prefs_account.c:721 src/prefs_common.c:949
 #: src/prefs_folder_item.c:137
 msgid "Compose"
 msgstr "Kreiraj"
 
-#: src/mainwindow.c:2236
+#: src/mainwindow.c:2219
 msgid "Compose new message"
 msgstr "Kreiranje nove pošte"
 
-#: src/mainwindow.c:2244 src/prefs_common.c:1448
+#: src/mainwindow.c:2227 src/prefs_common.c:1448
 msgid "Reply"
 msgstr "Odgovori"
 
-#: src/mainwindow.c:2245 src/mainwindow.c:2258
+#: src/mainwindow.c:2228 src/mainwindow.c:2241
 msgid "Reply to the message"
 msgstr "Odgovara na poruku"
 
-#: src/mainwindow.c:2263
+#: src/mainwindow.c:2245
 msgid "Reply all"
 msgstr "Odgovori s."
 
-#: src/mainwindow.c:2264
+#: src/mainwindow.c:2246
 msgid "Reply to all"
 msgstr "Odgovara svima"
 
-#: src/mainwindow.c:2272 src/prefs_filter_edit.c:741
+#: src/mainwindow.c:2254 src/prefs_filter_edit.c:741
 msgid "Forward"
 msgstr "Proslijedi"
 
-#: src/mainwindow.c:2273 src/mainwindow.c:2286
+#: src/mainwindow.c:2255 src/mainwindow.c:2268
 msgid "Forward the message"
 msgstr "Prosljeđuje poruku"
 
-#: src/mainwindow.c:2293
+#: src/mainwindow.c:2275
 msgid "Delete the message"
 msgstr "Briše poruke"
 
-#: src/mainwindow.c:2301 src/prefs_common.c:1988
+#: src/mainwindow.c:2283 src/prefs_common.c:1988
 msgid "Junk"
 msgstr ""
 
-#: src/mainwindow.c:2302
+#: src/mainwindow.c:2284
 #, fuzzy
 msgid "Set as junk mail"
 msgstr "Postavi kao uobičajeni"
 
-#: src/mainwindow.c:2311
+#: src/mainwindow.c:2293
 msgid "Execute"
 msgstr "Izvrši"
 
-#: src/mainwindow.c:2312
+#: src/mainwindow.c:2294
 msgid "Execute marked process"
 msgstr "Izvršava označene procese"
 
-#: src/mainwindow.c:2322
+#: src/mainwindow.c:2304
 msgid "Next unread message"
 msgstr "Slijedeća nepročitana poruka"
 
-#: src/mainwindow.c:2334
+#: src/mainwindow.c:2316
 msgid "Prefs"
 msgstr "Postav"
 
-#: src/mainwindow.c:2335
+#: src/mainwindow.c:2317
 #, fuzzy
 msgid "Common preferences"
 msgstr "Uobičajene postavke"
 
-#: src/mainwindow.c:2343 src/prefs_folder_item.c:261
+#: src/mainwindow.c:2325 src/prefs_folder_item.c:261
 #: src/prefs_folder_item.c:272 src/progressdialog.c:128
 msgid "Account"
 msgstr "Račun"
 
-#: src/mainwindow.c:2344
+#: src/mainwindow.c:2326
 msgid "Account setting"
 msgstr "Postavke računa"
 
-#: src/mainwindow.c:2527
+#: src/mainwindow.c:2498
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 
-#: src/mainwindow.c:2538
+#: src/mainwindow.c:2509
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 
-#: src/mainwindow.c:2731
+#: src/mainwindow.c:2702
 msgid "Exit"
 msgstr "Izlaz"
 
-#: src/mainwindow.c:2731
+#: src/mainwindow.c:2702
 msgid "Exit this program?"
 msgstr "Izlaz iz ovog programa?"
 
@@ -5707,11 +5707,11 @@ msgstr "Kreiram dijalog napretka...\n"
 msgid "Status"
 msgstr "Status"
 
-#: src/recv.c:113
+#: src/recv.c:112
 msgid "error occurred while retrieving data.\n"
 msgstr "došlo je do greške prilikom prihvaćanja podataka.\n"
 
-#: src/recv.c:155 src/recv.c:197 src/recv.c:213
+#: src/recv.c:154 src/recv.c:196 src/recv.c:211
 msgid "Can't write to file.\n"
 msgstr "Ne mogu pisati u datoteku.\n"
 
@@ -6463,7 +6463,7 @@ msgstr ""
 msgid "%.2fGB"
 msgstr ""
 
-#: src/utils.c:2372 src/utils.c:2496
+#: src/utils.c:2386 src/utils.c:2510
 #, c-format
 msgid "writing to %s failed.\n"
 msgstr "pisanje u %s nije uspjelo.\n"
diff --git a/po/hu.po b/po/hu.po
index 9ad9e473..1c1e3c8c 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed-2.0.0beta4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-08-09 18:08+0900\n"
+"POT-Creation-Date: 2005-08-22 17:22+0900\n"
 "PO-Revision-Date: 2005-07-04 17:05+0200\n"
 "Last-Translator: Németh Tamás <ntomasz@vipmail.hu>\n"
 "Language-Team: <NONE>\n"
@@ -100,7 +100,7 @@ msgstr ""
 "funkció bekapcsolásához válassza ki a 'G' oszlopban a jelölődobozt!"
 
 #: src/account.c:691 src/addressadd.c:192 src/addressbook.c:490
-#: src/compose.c:4081 src/editaddress.c:200 src/editaddress.c:942
+#: src/compose.c:4079 src/editaddress.c:200 src/editaddress.c:942
 #: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:265
 #: src/editjpilot.c:271 src/editldap.c:307 src/editvcard.c:184
 #: src/mimeview.c:201 src/prefs_filter.c:258 src/prefs_folder_item.c:170
@@ -237,7 +237,7 @@ msgstr "A művelet felhasználói paramétere"
 msgid "Add Address to Book"
 msgstr "Cím hozzáadása a címjegyzékhez"
 
-#: src/addressadd.c:202 src/compose.c:4528 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4521 src/editaddress.c:201
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "Cím"
@@ -251,7 +251,7 @@ msgstr "Megjegyzések"
 msgid "Select Address Book Folder"
 msgstr "Címjegyzék mappa választás"
 
-#: src/addressbook.c:336 src/compose.c:495 src/mainwindow.c:470
+#: src/addressbook.c:336 src/compose.c:493 src/mainwindow.c:461
 #: src/messageview.c:137
 msgid "/_File"
 msgstr "/_Fájl"
@@ -272,10 +272,10 @@ msgstr "/_Fájl/Új _JPilot"
 msgid "/_File/New _Server"
 msgstr "/_Fájl/Új _Szerver"
 
-#: src/addressbook.c:345 src/addressbook.c:348 src/compose.c:500
-#: src/compose.c:505 src/compose.c:509 src/mainwindow.c:488
-#: src/mainwindow.c:491 src/mainwindow.c:493 src/mainwindow.c:496
-#: src/mainwindow.c:498 src/messageview.c:140
+#: src/addressbook.c:345 src/addressbook.c:348 src/compose.c:498
+#: src/compose.c:503 src/compose.c:507 src/mainwindow.c:479
+#: src/mainwindow.c:482 src/mainwindow.c:484 src/mainwindow.c:487
+#: src/mainwindow.c:489 src/messageview.c:140
 msgid "/_File/---"
 msgstr "/_Fájl/---"
 
@@ -291,7 +291,7 @@ msgstr "/_Fájl/_Törlés"
 msgid "/_File/_Save"
 msgstr "/_Fájl/_Mentés"
 
-#: src/addressbook.c:350 src/compose.c:510 src/messageview.c:141
+#: src/addressbook.c:350 src/compose.c:508 src/messageview.c:141
 msgid "/_File/_Close"
 msgstr "/_Fájl/_Bezárás"
 
@@ -323,7 +323,7 @@ msgstr "/_Cím/_Szerkesztés"
 msgid "/_Address/_Delete"
 msgstr "/_Cím/_Törlés"
 
-#: src/addressbook.c:358 src/compose.c:619 src/mainwindow.c:725
+#: src/addressbook.c:358 src/compose.c:617 src/mainwindow.c:716
 #: src/messageview.c:256
 msgid "/_Tools"
 msgstr "/_Eszközök"
@@ -332,12 +332,12 @@ msgstr "/_Eszközök"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Eszközök/_LDIF fájl importálása"
 
-#: src/addressbook.c:360 src/compose.c:632 src/mainwindow.c:775
+#: src/addressbook.c:360 src/compose.c:630 src/mainwindow.c:766
 #: src/messageview.c:274
 msgid "/_Help"
 msgstr "/_Súgó"
 
-#: src/addressbook.c:361 src/compose.c:633 src/mainwindow.c:786
+#: src/addressbook.c:361 src/compose.c:631 src/mainwindow.c:777
 #: src/messageview.c:275
 msgid "/_Help/_About"
 msgstr "/_Súgó/_Névjegy"
@@ -354,7 +354,7 @@ msgstr "/Új cso_port"
 msgid "/New _Folder"
 msgstr "/Ú_j Mappa"
 
-#: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:489
+#: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:487
 #: src/folderview.c:235 src/folderview.c:237 src/folderview.c:241
 #: src/folderview.c:252 src/folderview.c:254 src/folderview.c:256
 #: src/folderview.c:260 src/folderview.c:270 src/folderview.c:272
@@ -364,8 +364,8 @@ msgstr "/Ú_j Mappa"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:512
-#: src/mainwindow.c:502 src/messageview.c:143
+#: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:510
+#: src/mainwindow.c:493 src/messageview.c:143
 msgid "/_Edit"
 msgstr "/_Szerkesztés"
 
@@ -377,7 +377,7 @@ msgstr "/_Törlés"
 msgid "E-Mail address"
 msgstr "E-Mail cím"
 
-#: src/addressbook.c:495 src/compose.c:4529 src/prefs_common.c:2402
+#: src/addressbook.c:495 src/compose.c:4522 src/prefs_common.c:2402
 msgid "Address book"
 msgstr "Címjegyzék"
 
@@ -386,8 +386,8 @@ msgid "Name:"
 msgstr "Név:"
 
 #. Buttons
-#: src/addressbook.c:627 src/addressbook.c:1673 src/editaddress.c:884
-#: src/editaddress.c:1017 src/mainwindow.c:2292 src/prefs_actions.c:266
+#: src/addressbook.c:627 src/addressbook.c:1674 src/editaddress.c:884
+#: src/editaddress.c:1017 src/mainwindow.c:2274 src/prefs_actions.c:266
 #: src/prefs_display_header.c:278 src/prefs_display_header.c:333
 #: src/prefs_template.c:231
 msgid "Delete"
@@ -426,7 +426,7 @@ msgstr "Cím(ek) törlése"
 msgid "Really delete the address(es)?"
 msgstr "Tényleg töröljem a cím(ek)et?"
 
-#: src/addressbook.c:1664
+#: src/addressbook.c:1665
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -435,36 +435,36 @@ msgstr ""
 "Tényleg törölni szeretné a(z) `%s' mappát ÉS az összes címet benne?\n"
 "Ha csak a mappát törli, a címek átkerülnek a szülő mappába."
 
-#: src/addressbook.c:1667 src/folderview.c:2139
+#: src/addressbook.c:1668 src/folderview.c:2139
 msgid "Delete folder"
 msgstr "Mappa törlése"
 
-#: src/addressbook.c:1667
+#: src/addressbook.c:1668
 msgid "_Folder only"
 msgstr "Cs_ak mappa"
 
-#: src/addressbook.c:1667
+#: src/addressbook.c:1668
 msgid "Folder and _addresses"
 msgstr "Mappa és _címek"
 
-#: src/addressbook.c:1672
+#: src/addressbook.c:1673
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Tényleg törli `%s' elemet?"
 
-#: src/addressbook.c:2352 src/addressbook.c:2485
+#: src/addressbook.c:2353 src/addressbook.c:2486
 msgid "New user, could not save index file."
 msgstr "Az új felhasználó nem tudja menteni az index fájlt."
 
-#: src/addressbook.c:2356 src/addressbook.c:2489
+#: src/addressbook.c:2357 src/addressbook.c:2490
 msgid "New user, could not save address book files."
 msgstr "Az új felhasználó nem tudja menteni a címjegyzék fájlt."
 
-#: src/addressbook.c:2366 src/addressbook.c:2499
+#: src/addressbook.c:2367 src/addressbook.c:2500
 msgid "Old address book converted successfully."
 msgstr "A régi címjegyzék konvertálása sikerült."
 
-#: src/addressbook.c:2371
+#: src/addressbook.c:2372
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -472,7 +472,7 @@ msgstr ""
 "A régi címjegyzék konvertálva,\n"
 "nem sikerült menteni az új cím index fájlt."
 
-#: src/addressbook.c:2384
+#: src/addressbook.c:2385
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -480,7 +480,7 @@ msgstr ""
 "Nem sikerült a címjegyzék konvertálása,\n"
 "de létrehoztam egy üres új címjegyzéket."
 
-#: src/addressbook.c:2390
+#: src/addressbook.c:2391
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -488,7 +488,7 @@ msgstr ""
 "Nem sikerült a címjegyzék konvertálása,\n"
 "és nem sikerült az új címjegyzék létrehozása sem."
 
-#: src/addressbook.c:2395
+#: src/addressbook.c:2396
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -496,87 +496,87 @@ msgstr ""
 "Nem sikerült a címjegyzék konvertálása,\n"
 "és nem sikerült az új címjegyzék létrehozása sem."
 
-#: src/addressbook.c:2402
+#: src/addressbook.c:2403
 msgid "Addressbook conversion error"
 msgstr "Címjegyzék konvertálási hiba"
 
-#: src/addressbook.c:2406
+#: src/addressbook.c:2407
 msgid "Addressbook conversion"
 msgstr "Címjegyzék konvertálása"
 
-#: src/addressbook.c:2441
+#: src/addressbook.c:2442
 msgid "Addressbook Error"
 msgstr "Címjegyzék hiba"
 
-#: src/addressbook.c:2442 src/addressbook.c:2542
+#: src/addressbook.c:2443 src/addressbook.c:2543
 msgid "Could not read address index"
 msgstr "Cím index olvasása nem sikerült"
 
-#: src/addressbook.c:2504
+#: src/addressbook.c:2505
 msgid "Old address book converted, could not save new address index file"
 msgstr ""
 "A régi címjegyzék konvertálva, nem sikerült menteni az új cím index fájlt."
 
-#: src/addressbook.c:2518
+#: src/addressbook.c:2519
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr ""
 "Nem konvertálható a címjegyzék, de létrehoztam egy új üres címjegyzéket."
 
-#: src/addressbook.c:2524
+#: src/addressbook.c:2525
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr ""
 "Nem konvertálható a címjegyzék, és nem hozható létre új címjegyzék sem."
 
-#: src/addressbook.c:2530
+#: src/addressbook.c:2531
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr ""
 "Nem konvertálható a címjegyzék, és nem hozható létre új címjegyzék sem."
 
-#: src/addressbook.c:2548
+#: src/addressbook.c:2549
 msgid "Addressbook Conversion Error"
 msgstr "Címjegyzék konverziós hiba"
 
-#: src/addressbook.c:2554
+#: src/addressbook.c:2555
 msgid "Addressbook Conversion"
 msgstr "Címjegyzék konverzió"
 
-#: src/addressbook.c:3055 src/prefs_common.c:963
+#: src/addressbook.c:3056 src/prefs_common.c:963
 msgid "Interface"
 msgstr "Illesztő"
 
-#: src/addressbook.c:3071 src/importldif.c:514
+#: src/addressbook.c:3072 src/importldif.c:514
 msgid "Address Book"
 msgstr "Címjegyzék"
 
-#: src/addressbook.c:3087
+#: src/addressbook.c:3088
 msgid "Person"
 msgstr "Személy"
 
-#: src/addressbook.c:3103
+#: src/addressbook.c:3104
 msgid "EMail Address"
 msgstr "E-mail cím"
 
-#: src/addressbook.c:3119
+#: src/addressbook.c:3120
 msgid "Group"
 msgstr "Csoport"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3135 src/folderview.c:346 src/prefs_account.c:1866
+#: src/addressbook.c:3136 src/folderview.c:346 src/prefs_account.c:1866
 msgid "Folder"
 msgstr "Mappa"
 
-#: src/addressbook.c:3151
+#: src/addressbook.c:3152
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3167 src/addressbook.c:3183
+#: src/addressbook.c:3168 src/addressbook.c:3184
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3199
+#: src/addressbook.c:3200
 msgid "LDAP Server"
 msgstr "LDAP Szerver"
 
@@ -588,7 +588,7 @@ msgstr "Általános cím"
 msgid "Personal address"
 msgstr "Személyes cím"
 
-#: src/alertpanel.c:138 src/compose.c:5214 src/main.c:515
+#: src/alertpanel.c:138 src/compose.c:5208 src/main.c:515
 msgid "Notice"
 msgstr "Megjegyzés"
 
@@ -643,347 +643,347 @@ msgstr "Barna"
 msgid "None"
 msgstr "Semmi"
 
-#: src/compose.c:487
+#: src/compose.c:485
 msgid "/_Add..."
 msgstr "/_Hozzáadás..."
 
-#: src/compose.c:488
+#: src/compose.c:486
 msgid "/_Remove"
 msgstr "/_Eltávolítás"
 
-#: src/compose.c:490 src/folderview.c:243 src/folderview.c:262
+#: src/compose.c:488 src/folderview.c:243 src/folderview.c:262
 #: src/folderview.c:277
 msgid "/_Properties..."
 msgstr "/_Tulajdonságok..."
 
-#: src/compose.c:496
+#: src/compose.c:494
 msgid "/_File/_Send"
 msgstr "/_Fájl/_Küldés"
 
-#: src/compose.c:498
+#: src/compose.c:496
 msgid "/_File/Send _later"
 msgstr "/_Fájl/Kü_ldés később"
 
-#: src/compose.c:501
+#: src/compose.c:499
 msgid "/_File/Save to _draft folder"
 msgstr "/_Fájl/Mentés a Vázlatok mappába"
 
-#: src/compose.c:503
+#: src/compose.c:501
 msgid "/_File/Save and _keep editing"
 msgstr "/_Fájl/Mentés és _szerkesztésben marad"
 
-#: src/compose.c:506
+#: src/compose.c:504
 msgid "/_File/_Attach file"
 msgstr "/_Fájl/Fájl _csatolása"
 
-#: src/compose.c:507
+#: src/compose.c:505
 msgid "/_File/_Insert file"
 msgstr "/_Fájl/Fájl _beszúrása"
 
-#: src/compose.c:508
+#: src/compose.c:506
 msgid "/_File/Insert si_gnature"
 msgstr "/_Fájl/_Aláírás beszúrása"
 
-#: src/compose.c:513
+#: src/compose.c:511
 msgid "/_Edit/_Undo"
 msgstr "/_Szerkesztés/_Visszavonás"
 
-#: src/compose.c:514
+#: src/compose.c:512
 msgid "/_Edit/_Redo"
 msgstr "/_Szerkesztés/_Ismétlés"
 
-#: src/compose.c:515 src/compose.c:522 src/mainwindow.c:506
+#: src/compose.c:513 src/compose.c:520 src/mainwindow.c:497
 #: src/messageview.c:146
 msgid "/_Edit/---"
 msgstr "/_Szerkesztés/---"
 
-#: src/compose.c:516
+#: src/compose.c:514
 msgid "/_Edit/Cu_t"
 msgstr "/_Szerkesztés/_Kivágás"
 
-#: src/compose.c:517 src/mainwindow.c:503 src/messageview.c:144
+#: src/compose.c:515 src/mainwindow.c:494 src/messageview.c:144
 msgid "/_Edit/_Copy"
 msgstr "/_Szerkesztés/_Másolás"
 
-#: src/compose.c:518
+#: src/compose.c:516
 msgid "/_Edit/_Paste"
 msgstr "/_Szerkesztés/_Beillesztés"
 
-#: src/compose.c:519
+#: src/compose.c:517
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Szerkesztés/_Beillesztés idézetként"
 
-#: src/compose.c:521 src/mainwindow.c:504 src/messageview.c:145
+#: src/compose.c:519 src/mainwindow.c:495 src/messageview.c:145
 msgid "/_Edit/Select _all"
 msgstr "/_Szerkesztés/Mindet kijelöli"
 
-#: src/compose.c:523
+#: src/compose.c:521
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/_Szerkesztés/Aktuális bekez_dés törése"
 
-#: src/compose.c:525
+#: src/compose.c:523
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/__Szerkesztés/Minden hosszú _sor törése"
 
-#: src/compose.c:527
+#: src/compose.c:525
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Szerkesztés/A_utomata tördelés"
 
-#: src/compose.c:528 src/mainwindow.c:511 src/messageview.c:150
+#: src/compose.c:526 src/mainwindow.c:502 src/messageview.c:150
 #: src/summaryview.c:400
 msgid "/_View"
 msgstr "/_Nézet"
 
-#: src/compose.c:529
+#: src/compose.c:527
 msgid "/_View/_To"
 msgstr "/_Nézet/_Címzett"
 
-#: src/compose.c:530
+#: src/compose.c:528
 msgid "/_View/_Cc"
 msgstr "/_Nézet/_Másolat"
 
-#: src/compose.c:531
+#: src/compose.c:529
 msgid "/_View/_Bcc"
 msgstr "/_Nézet/_Titkos másolat"
 
-#: src/compose.c:532
+#: src/compose.c:530
 msgid "/_View/_Reply to"
 msgstr "/_Nézet/_Válasz"
 
-#: src/compose.c:533 src/compose.c:535 src/compose.c:537 src/compose.c:539
-#: src/mainwindow.c:529 src/mainwindow.c:532 src/mainwindow.c:558
-#: src/mainwindow.c:582 src/mainwindow.c:675 src/mainwindow.c:679
+#: src/compose.c:531 src/compose.c:533 src/compose.c:535 src/compose.c:537
+#: src/mainwindow.c:520 src/mainwindow.c:523 src/mainwindow.c:549
+#: src/mainwindow.c:573 src/mainwindow.c:666 src/mainwindow.c:670
 #: src/messageview.c:233
 msgid "/_View/---"
 msgstr "/_Nézet/---"
 
-#: src/compose.c:534
+#: src/compose.c:532
 msgid "/_View/_Followup to"
 msgstr "/_Nézet/_Nyomkövetés"
 
-#: src/compose.c:536
+#: src/compose.c:534
 msgid "/_View/R_uler"
 msgstr "/_Nézet/V_onalzó"
 
-#: src/compose.c:538
+#: src/compose.c:536
 msgid "/_View/_Attachment"
 msgstr "/_Nézet/_Csatolás"
 
-#: src/compose.c:545 src/mainwindow.c:589 src/messageview.c:157
+#: src/compose.c:543 src/mainwindow.c:580 src/messageview.c:157
 msgid "/_View/Character _encoding"
 msgstr "/_Nézet/_Karakterkódolás"
 
-#: src/compose.c:546
+#: src/compose.c:544
 msgid "/_View/Character _encoding/_Automatic"
 msgstr "/_Nézet/_Karakterkódolás/_Automatikus"
 
-#: src/compose.c:548 src/compose.c:554 src/compose.c:560 src/compose.c:564
-#: src/compose.c:570 src/compose.c:574 src/compose.c:580 src/compose.c:584
-#: src/compose.c:594 src/compose.c:598 src/compose.c:608 src/compose.c:612
-#: src/mainwindow.c:585 src/mainwindow.c:592 src/messageview.c:153
+#: src/compose.c:546 src/compose.c:552 src/compose.c:558 src/compose.c:562
+#: src/compose.c:568 src/compose.c:572 src/compose.c:578 src/compose.c:582
+#: src/compose.c:592 src/compose.c:596 src/compose.c:606 src/compose.c:610
+#: src/mainwindow.c:576 src/mainwindow.c:583 src/messageview.c:153
 msgid "/_View/Character _encoding/---"
 msgstr "/_Nézet/_Karakterkódolás/---"
 
-#: src/compose.c:550 src/mainwindow.c:593 src/messageview.c:161
+#: src/compose.c:548 src/mainwindow.c:584 src/messageview.c:161
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Nézet/_Karakterkódolás/7 bites ascii (US-ASC_II)"
 
-#: src/compose.c:552 src/mainwindow.c:595 src/messageview.c:164
+#: src/compose.c:550 src/mainwindow.c:586 src/messageview.c:164
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Nézet/_Karakterkódolás/Unicode (_UTF-8)"
 
-#: src/compose.c:556 src/mainwindow.c:599 src/messageview.c:167
+#: src/compose.c:554 src/mainwindow.c:590 src/messageview.c:167
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Nézet/_Karakterkódolás/Nyugat-Európai (ISO-8859-_1)"
 
-#: src/compose.c:558 src/mainwindow.c:601 src/messageview.c:169
+#: src/compose.c:556 src/mainwindow.c:592 src/messageview.c:169
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Nézet/_Karakterkódolás/Nyugat-Európai (ISO-8859-15)"
 
-#: src/compose.c:562 src/mainwindow.c:605 src/messageview.c:172
+#: src/compose.c:560 src/mainwindow.c:596 src/messageview.c:172
 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:566 src/mainwindow.c:609 src/messageview.c:175
+#: src/compose.c:564 src/mainwindow.c:600 src/messageview.c:175
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Nézet/_Karakterkódolás/_Baltikumi (ISO-8859-13)"
 
-#: src/compose.c:568 src/mainwindow.c:611 src/messageview.c:177
+#: src/compose.c:566 src/mainwindow.c:602 src/messageview.c:177
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Nézet/_Karakterkódolás/Baltikumi (ISO-8859-_4)"
 
-#: src/compose.c:572 src/mainwindow.c:615 src/messageview.c:180
+#: src/compose.c:570 src/mainwindow.c:606 src/messageview.c:180
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Nézet/_Karakterkódolás/Görög (ISO-8859-_7)"
 
-#: src/compose.c:576 src/mainwindow.c:619 src/messageview.c:183
+#: src/compose.c:574 src/mainwindow.c:610 src/messageview.c:183
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Nézet/_Karakterkódolás/Héber (ISO-8859-_8)"
 
-#: src/compose.c:578 src/mainwindow.c:621 src/messageview.c:185
+#: src/compose.c:576 src/mainwindow.c:612 src/messageview.c:185
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Nézet/_Karakterkódolás/Héber (Windows-1255)"
 
-#: src/compose.c:582 src/mainwindow.c:625 src/messageview.c:188
+#: src/compose.c:580 src/mainwindow.c:616 src/messageview.c:188
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Nézet/_Karakterkódolás/Török (ISO-8859-_9)"
 
-#: src/compose.c:586 src/mainwindow.c:629 src/messageview.c:191
+#: src/compose.c:584 src/mainwindow.c:620 src/messageview.c:191
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Nézet/_Karakterkódolás/Cirill (ISO-8859-_5)"
 
-#: src/compose.c:588 src/mainwindow.c:631 src/messageview.c:193
+#: src/compose.c:586 src/mainwindow.c:622 src/messageview.c:193
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Nézet/_Karakterkódolás/Cirill (KOI8-_R)"
 
-#: src/compose.c:590 src/mainwindow.c:633 src/messageview.c:195
+#: src/compose.c:588 src/mainwindow.c:624 src/messageview.c:195
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Nézet/_Karakterkódolás/Cirill (KOI8-_U)"
 
-#: src/compose.c:592 src/mainwindow.c:635 src/messageview.c:197
+#: src/compose.c:590 src/mainwindow.c:626 src/messageview.c:197
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Nézet/_Karakterkódolás/Cirill (Windows-1251)"
 
-#: src/compose.c:596 src/mainwindow.c:639 src/messageview.c:200
+#: src/compose.c:594 src/mainwindow.c:630 src/messageview.c:200
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Nézet/_Karakterkódolás/Japán (ISO-2022-_JP)"
 
-#: src/compose.c:600 src/mainwindow.c:649 src/messageview.c:209
+#: src/compose.c:598 src/mainwindow.c:640 src/messageview.c:209
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Nézet/_Karakterkódolás/Egyszerűsített Kínai (_GB2312)"
 
-#: src/compose.c:602 src/mainwindow.c:651 src/messageview.c:211
+#: src/compose.c:600 src/mainwindow.c:642 src/messageview.c:211
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Nézet/_Karakterkódolás/Egyszerűsített Kínai (GBK)"
 
-#: src/compose.c:604 src/mainwindow.c:653 src/messageview.c:213
+#: src/compose.c:602 src/mainwindow.c:644 src/messageview.c:213
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Nézet/_Karakterkódolás/Tradicionális Kínai (_Big5)"
 
-#: src/compose.c:606 src/mainwindow.c:655 src/messageview.c:215
+#: src/compose.c:604 src/mainwindow.c:646 src/messageview.c:215
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Nézet/_Karakterkódolás/Tradicionális Kínai (EUC-_TW)"
 
-#: src/compose.c:610 src/mainwindow.c:661 src/messageview.c:220
+#: src/compose.c:608 src/mainwindow.c:652 src/messageview.c:220
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Nézet/_Karakterkódolás/Koreai (EUC-_KR)"
 
-#: src/compose.c:614 src/mainwindow.c:667 src/messageview.c:225
+#: src/compose.c:612 src/mainwindow.c:658 src/messageview.c:225
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Nézet/_Karakterkódolás/Thai (TIS-620)"
 
-#: src/compose.c:616 src/mainwindow.c:669 src/messageview.c:227
+#: src/compose.c:614 src/mainwindow.c:660 src/messageview.c:227
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Nézet/_Karakterkódolás/Thai (Windows-874)"
 
-#: src/compose.c:620 src/mainwindow.c:726 src/messageview.c:257
+#: src/compose.c:618 src/mainwindow.c:717 src/messageview.c:257
 msgid "/_Tools/_Address book"
 msgstr "/_Eszközök/_Címjegyzék"
 
-#: src/compose.c:621
+#: src/compose.c:619
 msgid "/_Tools/_Template"
 msgstr "/_Eszközök/_Sablon"
 
-#: src/compose.c:622 src/mainwindow.c:749 src/messageview.c:272
+#: src/compose.c:620 src/mainwindow.c:740 src/messageview.c:272
 msgid "/_Tools/Actio_ns"
 msgstr "/_Eszközök/_Akciók"
 
-#: src/compose.c:623 src/compose.c:627 src/mainwindow.c:729
-#: src/mainwindow.c:743 src/mainwindow.c:748 src/mainwindow.c:750
-#: src/mainwindow.c:753 src/mainwindow.c:755 src/messageview.c:260
+#: src/compose.c:621 src/compose.c:625 src/mainwindow.c:720
+#: src/mainwindow.c:734 src/mainwindow.c:739 src/mainwindow.c:741
+#: src/mainwindow.c:744 src/mainwindow.c:746 src/messageview.c:260
 #: src/messageview.c:271
 msgid "/_Tools/---"
 msgstr "/_Eszközök/---"
 
-#: src/compose.c:624
+#: src/compose.c:622
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/_Szerkesztés/Szerkesztés _külső programmal"
 
-#: src/compose.c:628
+#: src/compose.c:626
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Eszközök/PGP _Aláírás"
 
-#: src/compose.c:629
+#: src/compose.c:627
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/_Eszközök/PGP _Titkosítás"
 
-#: src/compose.c:855
+#: src/compose.c:853
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: fájl nem létezik\n"
 
-#: src/compose.c:954 src/compose.c:1024 src/procmsg.c:1353
+#: src/compose.c:952 src/compose.c:1022 src/procmsg.c:1353
 msgid "Can't get text part\n"
 msgstr "Nem tudtam olvasni a szövegrészt\n"
 
-#: src/compose.c:1420
+#: src/compose.c:1418
 msgid "Quote mark format error."
 msgstr "Idézet jelölés formátum hiba."
 
-#: src/compose.c:1432
+#: src/compose.c:1430
 msgid "Message reply/forward format error."
 msgstr "Üzenet válasz/továbbítás formátum hiba."
 
-#: src/compose.c:1801
+#: src/compose.c:1799
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "%s fájl nem létezik\n"
 
-#: src/compose.c:1805
+#: src/compose.c:1803
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "%s mérete nem meghatározható\n"
 
-#: src/compose.c:1809
+#: src/compose.c:1807
 #, c-format
 msgid "File %s is empty."
 msgstr "A(z) %s fájl üres."
 
-#: src/compose.c:1813
+#: src/compose.c:1811
 #, c-format
 msgid "Can't read %s."
 msgstr "%s nem olvasható."
 
-#: src/compose.c:1848
+#: src/compose.c:1846
 #, c-format
 msgid "Message: %s"
 msgstr "Üzenet: %s"
 
-#: src/compose.c:1920 src/mimeview.c:560
+#: src/compose.c:1918 src/mimeview.c:560
 msgid "Can't get the part of multipart message."
 msgstr "Egy több részes üzenet egy darabja nem hozzáférhető."
 
-#: src/compose.c:2362
+#: src/compose.c:2360
 msgid " [Edited]"
 msgstr " [Szerkesztett]"
 
-#: src/compose.c:2364
+#: src/compose.c:2362
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Üzenet írása%s"
 
-#: src/compose.c:2367
+#: src/compose.c:2365
 #, c-format
 msgid "Compose message%s"
 msgstr "Üzenet írása%s"
 
-#: src/compose.c:2478
+#: src/compose.c:2476
 msgid "Recipient is not specified."
 msgstr "Nincs címzett megadva."
 
-#: src/compose.c:2486
+#: src/compose.c:2484
 msgid "Empty subject"
 msgstr "Nincs tárgy"
 
-#: src/compose.c:2487
+#: src/compose.c:2485
 msgid "Subject is empty. Send it anyway?"
 msgstr "A levél tárgya üres. Ennek ellenére elküldi?"
 
-#: src/compose.c:2538
+#: src/compose.c:2536
 msgid "can't get recipient list."
 msgstr "címzett lista nem hozzáférhető."
 
-#: src/compose.c:2558
+#: src/compose.c:2556
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -991,27 +991,27 @@ msgstr ""
 "Nincs megadva hozzáférés a levél küldéshez.\n"
 "Válasszon ki egy hozzáférést küldés előtt!"
 
-#: src/compose.c:2572 src/send_message.c:297
+#: src/compose.c:2570 src/send_message.c:297
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Hiba lépett fel a %s-nak/nek küldendő üzenet küldése közben."
 
-#: src/compose.c:2595
+#: src/compose.c:2593
 msgid "Can't save the message to outbox."
 msgstr "Az üzenet nem menthető a kimenő mappába."
 
-#: src/compose.c:2645
+#: src/compose.c:2643
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr ""
 "Nem találtam hozzárendelt kulcsot a kiválasztott kulcs azonosítóhoz `%s'."
 
-#: src/compose.c:2709 src/compose.c:2965 src/compose.c:3028 src/compose.c:3148
-#: src/utils.c:2365
+#: src/compose.c:2707 src/compose.c:2963 src/compose.c:3026 src/compose.c:3146
+#: src/utils.c:2379
 msgid "can't change file mode\n"
 msgstr "fájl módja nem változtatható\n"
 
-#: src/compose.c:2741
+#: src/compose.c:2739
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1022,11 +1022,11 @@ msgstr ""
 "\n"
 "Ennek ellenére elküldi mint %s?"
 
-#: src/compose.c:2747
+#: src/compose.c:2745
 msgid "Code conversion error"
 msgstr "Kód konvertálási hiba"
 
-#: src/compose.c:2816
+#: src/compose.c:2814
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1039,153 +1039,153 @@ msgstr ""
 "\n"
 "Ennek ellenére elküldi?"
 
-#: src/compose.c:2820
+#: src/compose.c:2818
 msgid "Line length limit"
 msgstr "Sorhossz határ"
 
-#: src/compose.c:3108
+#: src/compose.c:3106
 msgid "can't remove the old message\n"
 msgstr "a régi üzenetet nem lehet eltávolítani\n"
 
-#: src/compose.c:3126
+#: src/compose.c:3124
 msgid "queueing message...\n"
 msgstr "üzenet a Várakozó sorba...\n"
 
-#: src/compose.c:3208
+#: src/compose.c:3206
 msgid "can't find queue folder\n"
 msgstr "nem található a Várakozó sor mappája\n"
 
-#: src/compose.c:3215
+#: src/compose.c:3213
 msgid "can't queue the message\n"
 msgstr "Az üzenetet nem sikerült a Várakozó sorba rakni\n"
 
-#: src/compose.c:3792
+#: src/compose.c:3790
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "generált Üzenet-azonosító: %s\n"
 
-#: src/compose.c:3901
+#: src/compose.c:3899
 msgid "Creating compose window...\n"
 msgstr "Szerkesztőablak létrehozása...\n"
 
-#: src/compose.c:3949 src/headerview.c:54 src/summary_search.c:214
+#: src/compose.c:3947 src/headerview.c:54 src/summary_search.c:214
 msgid "From:"
 msgstr "Feladó:"
 
-#: src/compose.c:4021
+#: src/compose.c:4019
 msgid "PGP Sign"
 msgstr "PGP Aláírás"
 
-#: src/compose.c:4024
+#: src/compose.c:4022
 msgid "PGP Encrypt"
 msgstr "PGP Titkosítás"
 
-#: src/compose.c:4062 src/compose.c:5001
+#: src/compose.c:4060 src/compose.c:4995
 msgid "MIME type"
 msgstr "MIME típus"
 
 #. S_COL_DATE
-#: src/compose.c:4071 src/mimeview.c:192 src/prefs_filter_edit.c:585
+#: src/compose.c:4069 src/mimeview.c:192 src/prefs_filter_edit.c:585
 #: src/prefs_summary_column.c:75 src/select-keys.c:317 src/summaryview.c:4217
 msgid "Size"
 msgstr "Méret"
 
-#: src/compose.c:4449 src/mainwindow.c:2224 src/prefs_account.c:719
+#: src/compose.c:4442 src/mainwindow.c:2207 src/prefs_account.c:719
 #: src/prefs_common.c:947
 msgid "Send"
 msgstr "Küldés"
 
-#: src/compose.c:4450
+#: src/compose.c:4443
 msgid "Send message"
 msgstr "Üzenet küldése"
 
-#: src/compose.c:4458
+#: src/compose.c:4451
 msgid "Send later"
 msgstr "Küldés később"
 
-#: src/compose.c:4459
+#: src/compose.c:4452
 msgid "Put into queue folder and send later"
 msgstr "Üzenet a Várakozó sorba, küldés később"
 
-#: src/compose.c:4467
+#: src/compose.c:4460
 msgid "Draft"
 msgstr "Vázlat"
 
-#: src/compose.c:4468
+#: src/compose.c:4461
 msgid "Save to draft folder"
 msgstr "Mentés a vázlat mappába"
 
-#: src/compose.c:4478
+#: src/compose.c:4471
 msgid "Insert"
 msgstr "Beszúrás"
 
-#: src/compose.c:4479
+#: src/compose.c:4472
 msgid "Insert file"
 msgstr "Fájl beszúrása"
 
-#: src/compose.c:4487
+#: src/compose.c:4480
 msgid "Attach"
 msgstr "Csatolás"
 
-#: src/compose.c:4488
+#: src/compose.c:4481
 msgid "Attach file"
 msgstr "Fájl csatolása"
 
 #. signature
-#: src/compose.c:4498 src/prefs_account.c:1391 src/prefs_common.c:1356
+#: src/compose.c:4491 src/prefs_account.c:1391 src/prefs_common.c:1356
 msgid "Signature"
 msgstr "Aláírás"
 
-#: src/compose.c:4499
+#: src/compose.c:4492
 msgid "Insert signature"
 msgstr "Aláírás beillesztése"
 
-#: src/compose.c:4508 src/prefs_common.c:1378 src/prefs_common.c:2382
+#: src/compose.c:4501 src/prefs_common.c:1378 src/prefs_common.c:2382
 msgid "Editor"
 msgstr "Szerkesztő"
 
-#: src/compose.c:4509
+#: src/compose.c:4502
 msgid "Edit with external editor"
 msgstr "Szerkesztés külső programmal"
 
-#: src/compose.c:4517
+#: src/compose.c:4510
 msgid "Linewrap"
 msgstr "Sortörés"
 
-#: src/compose.c:4518
+#: src/compose.c:4511
 msgid "Wrap all long lines"
 msgstr "Az összes hosszú sor törése"
 
-#: src/compose.c:4897
+#: src/compose.c:4891
 msgid "Invalid MIME type."
 msgstr "Érvénytelen MIME típus."
 
-#: src/compose.c:4915
+#: src/compose.c:4909
 msgid "File doesn't exist or is empty."
 msgstr "A fájl nem létezik vagy üres."
 
-#: src/compose.c:4983
+#: src/compose.c:4977
 msgid "Properties"
 msgstr "Tulajdonságok"
 
-#: src/compose.c:5003
+#: src/compose.c:4997
 msgid "Encoding"
 msgstr "Kódolás"
 
-#: src/compose.c:5026 src/prefs_folder_item.c:183
+#: src/compose.c:5020 src/prefs_folder_item.c:183
 msgid "Path"
 msgstr "Elérési út"
 
-#: src/compose.c:5027
+#: src/compose.c:5021
 msgid "File name"
 msgstr "Fájlnév"
 
-#: src/compose.c:5185
+#: src/compose.c:5179
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Külső szerkesztő parancssora érvénytelen: `%s'\n"
 
-#: src/compose.c:5211
+#: src/compose.c:5205
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1196,71 +1196,71 @@ msgstr ""
 "Processz kilövése?\n"
 "processz csoport azonosító: %d"
 
-#: src/compose.c:5228
+#: src/compose.c:5222
 #, c-format
 msgid "Terminated process group id: %d"
 msgstr "A leállított processz csoport azonosítója: %d"
 
-#: src/compose.c:5229
+#: src/compose.c:5223
 #, c-format
 msgid "Temporary file: %s"
 msgstr "Ideiglenes fájl: %s"
 
-#: src/compose.c:5253
+#: src/compose.c:5247
 msgid "Compose: input from monitoring process\n"
 msgstr "Szerkesztés: bemenet a monitorozó processzből\n"
 
 #. failed
-#: src/compose.c:5284
+#: src/compose.c:5278
 msgid "Couldn't exec external editor\n"
 msgstr "Külső szerkesztő nem indítható\n"
 
-#: src/compose.c:5288
+#: src/compose.c:5282
 msgid "Couldn't write to file\n"
 msgstr "Nem lehet a fájlba írni\n"
 
-#: src/compose.c:5290
+#: src/compose.c:5284
 msgid "Pipe read failed\n"
 msgstr "Hiba történt a csővezeték olvasása közben\n"
 
-#: src/compose.c:5596 src/compose.c:5604 src/compose.c:5610
+#: src/compose.c:5590 src/compose.c:5598 src/compose.c:5604
 msgid "Can't queue the message."
 msgstr "Az üzenetet nem sikerült a Várakozó sorba rakni"
 
-#: src/compose.c:5701
+#: src/compose.c:5695
 msgid "Select files"
 msgstr "Fájlok választása"
 
-#: src/compose.c:5723
+#: src/compose.c:5717
 msgid "Select file"
 msgstr "Fájl választás"
 
-#: src/compose.c:5760
+#: src/compose.c:5754
 msgid "Save message"
 msgstr "Üzenet mentése"
 
-#: src/compose.c:5761
+#: src/compose.c:5755
 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:5763
+#: src/compose.c:5757
 msgid "Close _without saving"
 msgstr "Bezárás mentés _nélkül"
 
-#: src/compose.c:5805
+#: src/compose.c:5799
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Tényleg alkalmazni szeretné a(z) `%s' sablont?"
 
-#: src/compose.c:5807
+#: src/compose.c:5801
 msgid "Apply template"
 msgstr "Sablon alkalmazása"
 
-#: src/compose.c:5808
+#: src/compose.c:5802
 msgid "_Replace"
 msgstr "_Helyettesít"
 
-#: src/compose.c:5808
+#: src/compose.c:5802
 msgid "_Insert"
 msgstr "_Beszúrás"
 
@@ -1703,12 +1703,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:805 src/mainwindow.c:3301 src/setup.c:81
+#: src/folderview.c:805 src/mainwindow.c:3272 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "%s%c%s mappa átvizsgálása..."
 
-#: src/folderview.c:809 src/mainwindow.c:3306 src/setup.c:86
+#: src/folderview.c:809 src/mainwindow.c:3277 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "%s mappa átvizsgálása..."
@@ -2030,44 +2030,44 @@ msgstr "Az IMAP4 azonosítás nem sikerült.\n"
 msgid "IMAP4 login failed.\n"
 msgstr "IMAP4 bejelentkezés sikertelen.\n"
 
-#: src/imap.c:3522
+#: src/imap.c:3528
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "%s hozzáfűzése %s-he(oö)z nem sikerült\n"
 
-#: src/imap.c:3529
+#: src/imap.c:3535
 msgid "(sending file...)"
 msgstr "(fájl küldése...)"
 
-#: src/imap.c:3557
+#: src/imap.c:3563
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "üzenet hozzáfűzése %s-he(oö)z nem sikerült\n"
 
-#: src/imap.c:3589
+#: src/imap.c:3595
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "%s nem másolható %s-be/ba\n"
 
-#: src/imap.c:3613
+#: src/imap.c:3619
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "hiba az IMAP parancs közben: STORE %s %s\n"
 
-#: src/imap.c:3627
+#: src/imap.c:3633
 msgid "error while imap command: EXPUNGE\n"
 msgstr "hiba az IMAP parancs közben: EXPUNGE\n"
 
-#: src/imap.c:3640
+#: src/imap.c:3646
 msgid "error while imap command: CLOSE\n"
 msgstr "hiba az IMAP parancs közben: CLOSE\n"
 
-#: src/imap.c:3873
+#: src/imap.c:3879
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "az iconv nem tud UTF-7-ből %s-be/ba konvertálni\n"
 
-#: src/imap.c:3903
+#: src/imap.c:3909
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "az iconv nem tud %s-t UTF-7-re konvertálni\n"
@@ -2169,7 +2169,7 @@ msgstr "LDIF fájl importálása a címjegyzékbe"
 msgid "Prev"
 msgstr "Előző"
 
-#: src/importldif.c:768 src/mainwindow.c:2321
+#: src/importldif.c:768 src/mainwindow.c:2303
 msgid "Next"
 msgstr "Következő"
 
@@ -2522,615 +2522,615 @@ msgstr ""
 "Az előző verzió konfigurációja megtalálva.\n"
 "Szeretné migrálni azokat?"
 
-#: src/mainwindow.c:471
+#: src/mainwindow.c:462
 msgid "/_File/_Folder"
 msgstr "/_Fájl/_Mappa"
 
-#: src/mainwindow.c:472
+#: src/mainwindow.c:463
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/_Fájl/_Mappa/Ú_j mappa létrehozása..."
 
-#: src/mainwindow.c:474
+#: src/mainwindow.c:465
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/_Fájl/_Mappa/Mappa Át_nevezése..."
 
-#: src/mainwindow.c:475
+#: src/mainwindow.c:466
 msgid "/_File/_Folder/_Move folder..."
 msgstr "/_Fájl/_Mappa/Mappa át_helyezése..."
 
-#: src/mainwindow.c:476
+#: src/mainwindow.c:467
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/_Fájl/_Mappa/Mappa _Törlése"
 
-#: src/mainwindow.c:477
+#: src/mainwindow.c:468
 msgid "/_File/_Mailbox"
 msgstr "/_Fájl/_Postaláda"
 
-#: src/mainwindow.c:478
+#: src/mainwindow.c:469
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/_Fájl/_Postaláda/Postaláda _hozzáadása..."
 
-#: src/mainwindow.c:479
+#: src/mainwindow.c:470
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/_Fájl/_Postaláda/Postaláda _eltávolítása"
 
-#: src/mainwindow.c:480 src/mainwindow.c:485
+#: src/mainwindow.c:471 src/mainwindow.c:476
 msgid "/_File/_Mailbox/---"
 msgstr "/_Fájl/_Postaláda/---"
 
-#: src/mainwindow.c:481
+#: src/mainwindow.c:472
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "/_Fájl/_Postaláda/Ú_j üzenetek ellenőrzése"
 
-#: src/mainwindow.c:483
+#: src/mainwindow.c:474
 msgid "/_File/_Mailbox/Check for new messages in _all mailboxes"
 msgstr "/_Fájl/_Postaláda/Ú_j üzenetek ellenőrzése az összes postaládában"
 
-#: src/mainwindow.c:486
+#: src/mainwindow.c:477
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "/_Fájl/_Postaláda/_Mappafa újraépítése"
 
-#: src/mainwindow.c:489
+#: src/mainwindow.c:480
 msgid "/_File/_Import mbox file..."
 msgstr "/_Fájl/Mbox fájl _importálása..."
 
-#: src/mainwindow.c:490
+#: src/mainwindow.c:481
 msgid "/_File/_Export to mbox file..."
 msgstr "/_Fájl/Mbox fájl _exportálása..."
 
-#: src/mainwindow.c:492
+#: src/mainwindow.c:483
 msgid "/_File/Empty all _trash"
 msgstr "/_Fájl/_Kuka ürítése"
 
-#: src/mainwindow.c:494 src/messageview.c:138
+#: src/mainwindow.c:485 src/messageview.c:138
 msgid "/_File/_Save as..."
 msgstr "/_Fájl/_Mentés másként..."
 
-#: src/mainwindow.c:495 src/messageview.c:139
+#: src/mainwindow.c:486 src/messageview.c:139
 msgid "/_File/_Print..."
 msgstr "/_Fájl/_Nyomtatás..."
 
-#: src/mainwindow.c:497
+#: src/mainwindow.c:488
 msgid "/_File/_Work offline"
 msgstr "/_Fájl/Ka_pcsolat nélküli munka"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:500
+#: src/mainwindow.c:491
 msgid "/_File/E_xit"
 msgstr "/_Fájl/Ki_lépés"
 
-#: src/mainwindow.c:505
+#: src/mainwindow.c:496
 msgid "/_Edit/Select _thread"
 msgstr "/_Szerkesztés/Üzenet_folyam kiválasztása"
 
-#: src/mainwindow.c:507 src/messageview.c:147
+#: src/mainwindow.c:498 src/messageview.c:147
 msgid "/_Edit/_Find in current message..."
 msgstr "/_Szerkesztés/_Keresés az aktuális üzenetben..."
 
-#: src/mainwindow.c:509
+#: src/mainwindow.c:500
 msgid "/_Edit/_Search messages..."
 msgstr "/_Szerkesztés/Ü_zenetek keresése..."
 
-#: src/mainwindow.c:512
+#: src/mainwindow.c:503
 msgid "/_View/Show or hi_de"
 msgstr "/_Nézet/_Megjelenít vagy elrejt"
 
-#: src/mainwindow.c:513
+#: src/mainwindow.c:504
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/_Nézet/_Megjelenít vagy elrejt/Mappa_fa"
 
-#: src/mainwindow.c:515
+#: src/mainwindow.c:506
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/_Nézet/_Megjelenít vagy elrejt/_Üzenet nézet"
 
-#: src/mainwindow.c:517
+#: src/mainwindow.c:508
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/_Nézet/_Megjelenít vagy elrejt/_Eszközsáv"
 
-#: src/mainwindow.c:519
+#: src/mainwindow.c:510
 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:521
+#: src/mainwindow.c:512
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/_Nézet/_Megjelenít vagy elrejt/_Eszközsáv/_Ikon"
 
-#: src/mainwindow.c:523
+#: src/mainwindow.c:514
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/_Nézet/_Megjelenít vagy elrejt/_Eszközsáv/_Szöveg"
 
-#: src/mainwindow.c:525
+#: src/mainwindow.c:516
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/_Nézet/_Megjelenít vagy elrejt/_Eszközsáv/Se_mmi"
 
-#: src/mainwindow.c:527
+#: src/mainwindow.c:518
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/_Nézet/_Megjelenít vagy elrejt/Á_llapotsor"
 
-#: src/mainwindow.c:530
+#: src/mainwindow.c:521
 msgid "/_View/Separate f_older tree"
 msgstr "/_Nézet/_Külön mappafa"
 
-#: src/mainwindow.c:531
+#: src/mainwindow.c:522
 msgid "/_View/Separate _message view"
 msgstr "/_Nézet/Külön üz_enetnézet"
 
-#: src/mainwindow.c:533
+#: src/mainwindow.c:524
 msgid "/_View/_Sort"
 msgstr "/_Nézet/_Rendezés"
 
-#: src/mainwindow.c:534
+#: src/mainwindow.c:525
 msgid "/_View/_Sort/by _number"
 msgstr "/_Nézet/_Rendezés/_Szám szerint"
 
-#: src/mainwindow.c:535
+#: src/mainwindow.c:526
 msgid "/_View/_Sort/by s_ize"
 msgstr "/_Nézet/_Rendezés/_Méret szerint"
 
-#: src/mainwindow.c:536
+#: src/mainwindow.c:527
 msgid "/_View/_Sort/by _date"
 msgstr "/_Nézet/_Rendezés/_Dátum szerint"
 
-#: src/mainwindow.c:537
+#: src/mainwindow.c:528
 msgid "/_View/_Sort/by _from"
 msgstr "/_Nézet/_Rendezés/_Feladó szerint"
 
-#: src/mainwindow.c:538
+#: src/mainwindow.c:529
 msgid "/_View/_Sort/by _recipient"
 msgstr "/_Nézet/_Rendezés/_Címzett szerint"
 
-#: src/mainwindow.c:539
+#: src/mainwindow.c:530
 msgid "/_View/_Sort/by _subject"
 msgstr "/_Nézet/_Rendezés/_Tárgy szerint"
 
-#: src/mainwindow.c:540
+#: src/mainwindow.c:531
 msgid "/_View/_Sort/by _color label"
 msgstr "/_Nézet/_Rendezés/S_zínes címke szerint"
 
-#: src/mainwindow.c:542
+#: src/mainwindow.c:533
 msgid "/_View/_Sort/by _mark"
 msgstr "/_Nézet/_Rendezés/_Jelölés szerint"
 
-#: src/mainwindow.c:543
+#: src/mainwindow.c:534
 msgid "/_View/_Sort/by _unread"
 msgstr "/_Nézet/_Rendezés/_Olvasatlan szerint"
 
-#: src/mainwindow.c:544
+#: src/mainwindow.c:535
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/_Nézet/_Rendezés/Cs_atolás szerint"
 
-#: src/mainwindow.c:546
+#: src/mainwindow.c:537
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/_Nézet/_Rendezés/Nem _rendez"
 
-#: src/mainwindow.c:547 src/mainwindow.c:550
+#: src/mainwindow.c:538 src/mainwindow.c:541
 msgid "/_View/_Sort/---"
 msgstr "/_Nézet/_Rendez/---"
 
-#: src/mainwindow.c:548
+#: src/mainwindow.c:539
 msgid "/_View/_Sort/Ascending"
 msgstr "/_Nézet/_Rendezés/_Növekvő"
 
-#: src/mainwindow.c:549
+#: src/mainwindow.c:540
 msgid "/_View/_Sort/Descending"
 msgstr "/_Nézet/_Rendezés/_Csökkenő"
 
-#: src/mainwindow.c:551
+#: src/mainwindow.c:542
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/_Nézet/_Rendezés/_Tárgyhoz vonz"
 
-#: src/mainwindow.c:553
+#: src/mainwindow.c:544
 msgid "/_View/Th_read view"
 msgstr "/_Nézet/Ü_zenetfolyam nézet"
 
-#: src/mainwindow.c:554
+#: src/mainwindow.c:545
 msgid "/_View/E_xpand all threads"
 msgstr "/_Nézet/_Minden üzenetfolyam kifejtése"
 
-#: src/mainwindow.c:555
+#: src/mainwindow.c:546
 msgid "/_View/Co_llapse all threads"
 msgstr "/_Nézet/_Minden üzenetfolyam bezárása"
 
-#: src/mainwindow.c:556
+#: src/mainwindow.c:547
 msgid "/_View/Set display _item..."
 msgstr "/_Nézet/K_ijelzett cikk beállítás..."
 
-#: src/mainwindow.c:559
+#: src/mainwindow.c:550
 msgid "/_View/_Go to"
 msgstr "/_Nézet/_Ugrás"
 
-#: src/mainwindow.c:560
+#: src/mainwindow.c:551
 msgid "/_View/_Go to/_Prev message"
 msgstr "/_Nézet/_Ugrás/_Előző üzenethez"
 
-#: src/mainwindow.c:561
+#: src/mainwindow.c:552
 msgid "/_View/_Go to/_Next message"
 msgstr "/_Nézet/_Ugrás/_Következő üzenethez"
 
-#: src/mainwindow.c:562 src/mainwindow.c:567 src/mainwindow.c:570
-#: src/mainwindow.c:575 src/mainwindow.c:580
+#: src/mainwindow.c:553 src/mainwindow.c:558 src/mainwindow.c:561
+#: src/mainwindow.c:566 src/mainwindow.c:571
 msgid "/_View/_Go to/---"
 msgstr "/_Nézet/_Ugrás/---"
 
-#: src/mainwindow.c:563
+#: src/mainwindow.c:554
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/_Nézet/_Ugrás/_Előző olvasatlan üzenethez"
 
-#: src/mainwindow.c:565
+#: src/mainwindow.c:556
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/_Nézet/_Ugrás/_Következő olvasatlan üzenethez"
 
-#: src/mainwindow.c:568
+#: src/mainwindow.c:559
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/_Nézet/_Ugrás/_Előző új üzenethez"
 
-#: src/mainwindow.c:569
+#: src/mainwindow.c:560
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/_Nézet/_Ugrás/_Következő új üzenethez"
 
-#: src/mainwindow.c:571
+#: src/mainwindow.c:562
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/_Nézet/_Ugrás/_Előző megjelölt üzenethez"
 
-#: src/mainwindow.c:573
+#: src/mainwindow.c:564
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/_Nézet/_Ugrás/_Következő megjelölt üzenethez"
 
-#: src/mainwindow.c:576
+#: src/mainwindow.c:567
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/_Nézet/_Ugrás/_Előző címkézett üzenethez"
 
-#: src/mainwindow.c:578
+#: src/mainwindow.c:569
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/_Nézet/_Ugrás/_Következő címkézett üzenethez"
 
-#: src/mainwindow.c:581
+#: src/mainwindow.c:572
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Nézet/_Ugrás/_Másik _mappához"
 
-#: src/mainwindow.c:590 src/messageview.c:158
+#: src/mainwindow.c:581 src/messageview.c:158
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Nézet/_Karakterkódolás/_Automatikus felismerés"
 
-#: src/mainwindow.c:641 src/messageview.c:202
+#: src/mainwindow.c:632 src/messageview.c:202
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Nézet/_Karakterkódolás/Japán (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:643 src/messageview.c:204
+#: src/mainwindow.c:634 src/messageview.c:204
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Nézet/_Karakterkódolás/Japán (_EUC-JP)"
 
-#: src/mainwindow.c:645 src/messageview.c:206
+#: src/mainwindow.c:636 src/messageview.c:206
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Nézet/_Karakterkódolás/Japán (_Shift__JIS)"
 
-#: src/mainwindow.c:657 src/messageview.c:217
+#: src/mainwindow.c:648 src/messageview.c:217
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Nézet/_Karakterkódolás/Kínai (ISO-2022-_CN)"
 
-#: src/mainwindow.c:663 src/messageview.c:222
+#: src/mainwindow.c:654 src/messageview.c:222
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Nézet/_Karakterkódolás/Koreai (ISO-2022-KR)"
 
-#: src/mainwindow.c:676 src/summaryview.c:401
+#: src/mainwindow.c:667 src/summaryview.c:401
 msgid "/_View/Open in new _window"
 msgstr "/_Nézet/Me_gnyitás új ablakban"
 
-#: src/mainwindow.c:677 src/messageview.c:234
+#: src/mainwindow.c:668 src/messageview.c:234
 msgid "/_View/Mess_age source"
 msgstr "/_Nézet/Ü_zenet forrása"
 
-#: src/mainwindow.c:678 src/messageview.c:235
+#: src/mainwindow.c:669 src/messageview.c:235
 msgid "/_View/Show all _header"
 msgstr "/_Nézet/_Minden fejléc megjelenítése"
 
-#: src/mainwindow.c:680
+#: src/mainwindow.c:671
 msgid "/_View/_Update summary"
 msgstr "/_Nézet/Ö_sszegzés frissítése"
 
-#: src/mainwindow.c:682 src/messageview.c:237
+#: src/mainwindow.c:673 src/messageview.c:237
 msgid "/_Message"
 msgstr "/_Üzenet"
 
-#: src/mainwindow.c:683
+#: src/mainwindow.c:674
 msgid "/_Message/Recei_ve"
 msgstr "/_Üzenet/Fog_adás"
 
-#: src/mainwindow.c:684
+#: src/mainwindow.c:675
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/_Üzenet/Fog_adás/_Jelenlegi hozzáférésről"
 
-#: src/mainwindow.c:686
+#: src/mainwindow.c:677
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/_Üzenet/Fog_adás/_Minden hozzáférésről"
 
-#: src/mainwindow.c:688
+#: src/mainwindow.c:679
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/_Üzenet/Fo_gadás/Fogadás me_gszakítása"
 
-#: src/mainwindow.c:690
+#: src/mainwindow.c:681
 msgid "/_Message/Recei_ve/---"
 msgstr "/_Üzenet/Fog_adás/---"
 
-#: src/mainwindow.c:691
+#: src/mainwindow.c:682
 msgid "/_Message/_Send queued messages"
 msgstr "/_Üzenet/Ü_zenetek küldése a Várakozó sorból"
 
-#: src/mainwindow.c:692 src/mainwindow.c:694 src/mainwindow.c:701
-#: src/mainwindow.c:706 src/mainwindow.c:710 src/mainwindow.c:719
-#: src/mainwindow.c:722 src/messageview.c:240 src/messageview.c:248
+#: src/mainwindow.c:683 src/mainwindow.c:685 src/mainwindow.c:692
+#: src/mainwindow.c:697 src/mainwindow.c:701 src/mainwindow.c:710
+#: src/mainwindow.c:713 src/messageview.c:240 src/messageview.c:248
 #: src/messageview.c:253
 msgid "/_Message/---"
 msgstr "/_Üzenet/---"
 
-#: src/mainwindow.c:693 src/messageview.c:238
+#: src/mainwindow.c:684 src/messageview.c:238
 msgid "/_Message/Compose _new message"
 msgstr "/_Üzenet/_Új üzenet szerkesztése"
 
-#: src/mainwindow.c:695 src/messageview.c:241
+#: src/mainwindow.c:686 src/messageview.c:241
 msgid "/_Message/_Reply"
 msgstr "/_Üzenet/Vá_lasz"
 
-#: src/mainwindow.c:696
+#: src/mainwindow.c:687
 msgid "/_Message/Repl_y to"
 msgstr "/_Üzenet/_Válasz másnak"
 
-#: src/mainwindow.c:697 src/messageview.c:242
+#: src/mainwindow.c:688 src/messageview.c:242
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Üzenet/Válasz _másnak/_Mindenkinek"
 
-#: src/mainwindow.c:698 src/messageview.c:244
+#: src/mainwindow.c:689 src/messageview.c:244
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Üzenet/Válasz _másnak/A _küldőnek"
 
-#: src/mainwindow.c:699 src/messageview.c:246
+#: src/mainwindow.c:690 src/messageview.c:246
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Üzenet/Válasz _másnak/_Levelező listának"
 
-#: src/mainwindow.c:702 src/messageview.c:249
+#: src/mainwindow.c:693 src/messageview.c:249
 msgid "/_Message/_Forward"
 msgstr "/_Üzenet/_Továbbítás"
 
-#: src/mainwindow.c:703 src/messageview.c:250
+#: src/mainwindow.c:694 src/messageview.c:250
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Üzenet/Továbbítás _csatolásként"
 
-#: src/mainwindow.c:705 src/messageview.c:252
+#: src/mainwindow.c:696 src/messageview.c:252
 msgid "/_Message/Redirec_t"
 msgstr "/_Üzenet/Á_tirányít"
 
-#: src/mainwindow.c:707
+#: src/mainwindow.c:698
 msgid "/_Message/M_ove..."
 msgstr "/_Üzenet/M_ozgatás..."
 
-#: src/mainwindow.c:708
+#: src/mainwindow.c:699
 msgid "/_Message/_Copy..."
 msgstr "/_Üzenet/_Másolás..."
 
-#: src/mainwindow.c:709
+#: src/mainwindow.c:700
 msgid "/_Message/_Delete"
 msgstr "/_Üzenet/_Törlés"
 
-#: src/mainwindow.c:711
+#: src/mainwindow.c:702
 msgid "/_Message/_Mark"
 msgstr "/_Üzenet/_Megjelöl"
 
-#: src/mainwindow.c:712
+#: src/mainwindow.c:703
 msgid "/_Message/_Mark/_Mark"
 msgstr "/_Üzenet/_Megjelöl/_Megjelöl"
 
-#: src/mainwindow.c:713
+#: src/mainwindow.c:704
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/_Üzenet/_Megjelöl/Megjelölés visszavonása"
 
-#: src/mainwindow.c:714
+#: src/mainwindow.c:705
 msgid "/_Message/_Mark/---"
 msgstr "/_Üzenet/_Megjelöl/---"
 
-#: src/mainwindow.c:715
+#: src/mainwindow.c:706
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/_Üzenet/_Megjelöl/Mint olvasatla_n"
 
-#: src/mainwindow.c:716
+#: src/mainwindow.c:707
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/_Üzenet/_Megjelöl/Mint olvaso_tt"
 
-#: src/mainwindow.c:718
+#: src/mainwindow.c:709
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/_Üzenet/_Megjelöl/_Minden olvasottat"
 
-#: src/mainwindow.c:720
+#: src/mainwindow.c:711
 msgid "/_Message/Set as _junk mail"
 msgstr "/_Üzenet/_Levélszemétként beállítás"
 
-#: src/mainwindow.c:721
+#: src/mainwindow.c:712
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/_Üzenet/_Nem levélszemétként beállítás"
 
-#: src/mainwindow.c:723 src/messageview.c:254
+#: src/mainwindow.c:714 src/messageview.c:254
 msgid "/_Message/Re-_edit"
 msgstr "/_Üzenet/_Szerkesztés újra"
 
-#: src/mainwindow.c:727
+#: src/mainwindow.c:718
 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:730
+#: src/mainwindow.c:721
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/_Eszközök/Összes üzenet szűrése a mappában"
 
-#: src/mainwindow.c:732
+#: src/mainwindow.c:723
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Eszközök/Kivá_lasztott üzenetek szűrése"
 
-#: src/mainwindow.c:734 src/messageview.c:261
+#: src/mainwindow.c:725 src/messageview.c:261
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Eszközök/_Szűrési szabályok"
 
-#: src/mainwindow.c:735 src/messageview.c:263
+#: src/mainwindow.c:726 src/messageview.c:263
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Eszközök/_Szűrési szabályok/_Automatikusan"
 
-#: src/mainwindow.c:737 src/messageview.c:265
+#: src/mainwindow.c:728 src/messageview.c:265
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Eszközök/_Szűrési szabályok/_Feladó alapján"
 
-#: src/mainwindow.c:739 src/messageview.c:267
+#: src/mainwindow.c:730 src/messageview.c:267
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Eszközök/_Szűrési szabályok/_Címzett alapján"
 
-#: src/mainwindow.c:741 src/messageview.c:269
+#: src/mainwindow.c:732 src/messageview.c:269
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Eszközök/_Szűrési szabályok/_Tárgy alapján"
 
-#: src/mainwindow.c:744
+#: src/mainwindow.c:735
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/_Eszközök/Levélszemét szűrése a mappában"
 
-#: src/mainwindow.c:746
+#: src/mainwindow.c:737
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/_Eszközök/Kivá_lasztott üzenetek levélszemét szűrése"
 
-#: src/mainwindow.c:751
+#: src/mainwindow.c:742
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/_Eszközök/_Duplikált levelek törlése"
 
-#: src/mainwindow.c:754
+#: src/mainwindow.c:745
 msgid "/_Tools/E_xecute"
 msgstr "/_Eszközök/_Futtatás"
 
-#: src/mainwindow.c:756
+#: src/mainwindow.c:747
 msgid "/_Tools/_Log window"
 msgstr "/_Eszközök/_Napló ablak"
 
-#: src/mainwindow.c:758
+#: src/mainwindow.c:749
 msgid "/_Configuration"
 msgstr "/_Beállítások"
 
-#: src/mainwindow.c:759
+#: src/mainwindow.c:750
 msgid "/_Configuration/_Common preferences..."
 msgstr "/_Beállítások/Közös _Beállítások..."
 
-#: src/mainwindow.c:761
+#: src/mainwindow.c:752
 msgid "/_Configuration/_Filter setting..."
 msgstr "/_Beállítások/_Szűrő beállítások..."
 
-#: src/mainwindow.c:763
+#: src/mainwindow.c:754
 msgid "/_Configuration/_Template..."
 msgstr "/_Beállítások/_Sablon..."
 
-#: src/mainwindow.c:764
+#: src/mainwindow.c:755
 msgid "/_Configuration/_Actions..."
 msgstr "/_Beállítások/_Akciók..."
 
-#: src/mainwindow.c:765
+#: src/mainwindow.c:756
 msgid "/_Configuration/---"
 msgstr "/_Beállítások/---"
 
-#: src/mainwindow.c:766
+#: src/mainwindow.c:757
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Beállítások/Aktuális _hozzáférés beállításai..."
 
-#: src/mainwindow.c:768
+#: src/mainwindow.c:759
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Beállítások/_Új hozzáférés létrehozása..."
 
-#: src/mainwindow.c:770
+#: src/mainwindow.c:761
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Beállítások/Hozzáférés _szerkesztése..."
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:763
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Beállítások/_Aktuális hozzáférés váltása..."
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:767
 msgid "/_Help/_Manual"
 msgstr "/Sú_gó/_Kézikönyv"
 
-#: src/mainwindow.c:777
+#: src/mainwindow.c:768
 msgid "/_Help/_Manual/_English"
 msgstr "/Sú_gó/Kézikönyv/_Angol"
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:769
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/Sú_gó/Kézikönyv/_Japán"
 
-#: src/mainwindow.c:779
+#: src/mainwindow.c:770
 msgid "/_Help/_FAQ"
 msgstr "/Sú_gó/_GYIK"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:771
 msgid "/_Help/_FAQ/_English"
 msgstr "/Sú_gó/_GYIK/_Angol"
 
-#: src/mainwindow.c:781
+#: src/mainwindow.c:772
 msgid "/_Help/_FAQ/_German"
 msgstr "/Sú_gó/_GYIK/_Német"
 
-#: src/mainwindow.c:782
+#: src/mainwindow.c:773
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/Sú_gó/_GYIK/_Spanyol"
 
-#: src/mainwindow.c:783
+#: src/mainwindow.c:774
 msgid "/_Help/_FAQ/_French"
 msgstr "/Sú_gó/_GYIK/_Francia"
 
-#: src/mainwindow.c:784
+#: src/mainwindow.c:775
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/Sú_gó/_GYIK/_Olasz"
 
-#: src/mainwindow.c:785
+#: src/mainwindow.c:776
 msgid "/_Help/---"
 msgstr "/Sú_gó/---"
 
-#: src/mainwindow.c:825
+#: src/mainwindow.c:816
 msgid "Creating main window...\n"
 msgstr "Főablak létrehozása...\n"
 
-#: src/mainwindow.c:987
+#: src/mainwindow.c:973
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Főablak: %d szín foglalása nem sikerült\n"
 
-#: src/mainwindow.c:1071 src/summaryview.c:2020 src/summaryview.c:2105
+#: src/mainwindow.c:1057 src/summaryview.c:2020 src/summaryview.c:2105
 #: src/summaryview.c:3342 src/summaryview.c:3415 src/summaryview.c:3728
 msgid "done.\n"
 msgstr "kész.\n"
 
-#: src/mainwindow.c:1196 src/mainwindow.c:1237 src/mainwindow.c:1265
+#: src/mainwindow.c:1182 src/mainwindow.c:1223 src/mainwindow.c:1251
 msgid "Untitled"
 msgstr "Névtelen"
 
-#: src/mainwindow.c:1266
+#: src/mainwindow.c:1252
 msgid "none"
 msgstr "semmi"
 
-#: src/mainwindow.c:1316
+#: src/mainwindow.c:1302
 #, 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:1536
+#: src/mainwindow.c:1522
 msgid "Offline"
 msgstr "Kapcsolat nélkül"
 
-#: src/mainwindow.c:1537
+#: src/mainwindow.c:1523
 msgid "You are offline. Go online?"
 msgstr "Ön kapcsolat nélküli módban van. Kapcsolódik?"
 
-#: src/mainwindow.c:1551
+#: src/mainwindow.c:1537
 msgid "Empty all trash"
 msgstr "Kuka ürítése"
 
-#: src/mainwindow.c:1552
+#: src/mainwindow.c:1538
 msgid "Empty messages in all trash?"
 msgstr "Minden üzenet törlése a kukából?"
 
-#: src/mainwindow.c:1580
+#: src/mainwindow.c:1566
 msgid "Add mailbox"
 msgstr "Postaláda hozzáadása"
 
-#: src/mainwindow.c:1581
+#: src/mainwindow.c:1567
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3140,16 +3140,16 @@ msgstr ""
 "Ha már létezik a postaláda, akkor\n"
 "automatikusan átvizsgálom."
 
-#: src/mainwindow.c:1587
+#: src/mainwindow.c:1573
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "A `%s' postaláda már létezik."
 
-#: src/mainwindow.c:1592 src/setup.c:57
+#: src/mainwindow.c:1578 src/setup.c:57
 msgid "Mailbox"
 msgstr "Postaláda"
 
-#: src/mainwindow.c:1598 src/setup.c:63
+#: src/mainwindow.c:1584 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3158,150 +3158,150 @@ 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:1989
+#: src/mainwindow.c:1975
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Mappa nézet"
 
-#: src/mainwindow.c:2009 src/messageview.c:368
+#: src/mainwindow.c:1995 src/messageview.c:368
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Üzenet nézet"
 
-#: src/mainwindow.c:2156 src/summaryview.c:370
+#: src/mainwindow.c:2142 src/summaryview.c:370
 msgid "/_Reply"
 msgstr "/_Válasz"
 
-#: src/mainwindow.c:2157
+#: src/mainwindow.c:2143
 msgid "/Reply to _all"
 msgstr "Válasz _mindenkinek"
 
-#: src/mainwindow.c:2158
+#: src/mainwindow.c:2144
 msgid "/Reply to _sender"
 msgstr "/Válasz a _küldőnek"
 
-#: src/mainwindow.c:2159
+#: src/mainwindow.c:2145
 msgid "/Reply to mailing _list"
 msgstr "/Válasz a _levelezőlistának"
 
-#: src/mainwindow.c:2164 src/summaryview.c:377
+#: src/mainwindow.c:2150 src/summaryview.c:377
 msgid "/_Forward"
 msgstr "/_Továbbítás"
 
-#: src/mainwindow.c:2165 src/summaryview.c:378
+#: src/mainwindow.c:2151 src/summaryview.c:378
 msgid "/For_ward as attachment"
 msgstr "/Csatoláské_nt továbbít"
 
-#: src/mainwindow.c:2166 src/summaryview.c:379
+#: src/mainwindow.c:2152 src/summaryview.c:379
 msgid "/Redirec_t"
 msgstr "/Átirányí_t"
 
-#: src/mainwindow.c:2205
+#: src/mainwindow.c:2188
 msgid "Get"
 msgstr "Fogadás"
 
-#: src/mainwindow.c:2206
+#: src/mainwindow.c:2189
 msgid "Incorporate new mail"
 msgstr "Új levelek fogadása"
 
-#: src/mainwindow.c:2213
+#: src/mainwindow.c:2196
 msgid "Get all"
 msgstr "Fogadás mindről"
 
-#: src/mainwindow.c:2214
+#: src/mainwindow.c:2197
 msgid "Incorporate new mail of all accounts"
 msgstr "Új levelek fogadása minden hozzáférésen"
 
-#: src/mainwindow.c:2225
+#: src/mainwindow.c:2208
 msgid "Send queued message(s)"
 msgstr "Várakozó sorból üzenet(ek) küldése"
 
-#: src/mainwindow.c:2235 src/prefs_account.c:721 src/prefs_common.c:949
+#: src/mainwindow.c:2218 src/prefs_account.c:721 src/prefs_common.c:949
 #: src/prefs_folder_item.c:137
 msgid "Compose"
 msgstr "Szerkesztés"
 
-#: src/mainwindow.c:2236
+#: src/mainwindow.c:2219
 msgid "Compose new message"
 msgstr "Új üzenet szerkesztése"
 
-#: src/mainwindow.c:2244 src/prefs_common.c:1448
+#: src/mainwindow.c:2227 src/prefs_common.c:1448
 msgid "Reply"
 msgstr "Válasz"
 
-#: src/mainwindow.c:2245 src/mainwindow.c:2258
+#: src/mainwindow.c:2228 src/mainwindow.c:2241
 msgid "Reply to the message"
 msgstr "Válasz az üzenetre"
 
-#: src/mainwindow.c:2263
+#: src/mainwindow.c:2245
 msgid "Reply all"
 msgstr "Válasz mindre"
 
-#: src/mainwindow.c:2264
+#: src/mainwindow.c:2246
 msgid "Reply to all"
 msgstr "Válasz mindenkinek"
 
-#: src/mainwindow.c:2272 src/prefs_filter_edit.c:741
+#: src/mainwindow.c:2254 src/prefs_filter_edit.c:741
 msgid "Forward"
 msgstr "Továbbít"
 
-#: src/mainwindow.c:2273 src/mainwindow.c:2286
+#: src/mainwindow.c:2255 src/mainwindow.c:2268
 msgid "Forward the message"
 msgstr "Üzenet továbbítása"
 
-#: src/mainwindow.c:2293
+#: src/mainwindow.c:2275
 msgid "Delete the message"
 msgstr "Üzenet törlése"
 
-#: src/mainwindow.c:2301 src/prefs_common.c:1988
+#: src/mainwindow.c:2283 src/prefs_common.c:1988
 msgid "Junk"
 msgstr "Levélszemét"
 
-#: src/mainwindow.c:2302
+#: src/mainwindow.c:2284
 msgid "Set as junk mail"
 msgstr "Levélszemétként beállítás"
 
-#: src/mainwindow.c:2311
+#: src/mainwindow.c:2293
 msgid "Execute"
 msgstr "Futtatás"
 
-#: src/mainwindow.c:2312
+#: src/mainwindow.c:2294
 msgid "Execute marked process"
 msgstr "Megjelölt processz futtatása"
 
-#: src/mainwindow.c:2322
+#: src/mainwindow.c:2304
 msgid "Next unread message"
 msgstr "Következő olvasatlan üzenet"
 
-#: src/mainwindow.c:2334
+#: src/mainwindow.c:2316
 msgid "Prefs"
 msgstr "Beállítások"
 
-#: src/mainwindow.c:2335
+#: src/mainwindow.c:2317
 msgid "Common preferences"
 msgstr "Közös beállítások"
 
-#: src/mainwindow.c:2343 src/prefs_folder_item.c:261
+#: src/mainwindow.c:2325 src/prefs_folder_item.c:261
 #: src/prefs_folder_item.c:272 src/progressdialog.c:128
 msgid "Account"
 msgstr "Hozzáférés"
 
-#: src/mainwindow.c:2344
+#: src/mainwindow.c:2326
 msgid "Account setting"
 msgstr "Hozzáférés beállítások"
 
-#: src/mainwindow.c:2527
+#: src/mainwindow.c:2498
 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:2538
+#: src/mainwindow.c:2509
 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:2731
+#: src/mainwindow.c:2702
 msgid "Exit"
 msgstr "Kilépés"
 
-#: src/mainwindow.c:2731
+#: src/mainwindow.c:2702
 msgid "Exit this program?"
 msgstr "Kilépés a programból?"
 
@@ -5500,11 +5500,11 @@ msgstr "Készültségi ablak létrehozása...\n"
 msgid "Status"
 msgstr "Állapot"
 
-#: src/recv.c:113
+#: src/recv.c:112
 msgid "error occurred while retrieving data.\n"
 msgstr "hiba az adatok fogadása közben.\n"
 
-#: src/recv.c:155 src/recv.c:197 src/recv.c:213
+#: src/recv.c:154 src/recv.c:196 src/recv.c:211
 msgid "Can't write to file.\n"
 msgstr "Nem lehet a fájlba írni.\n"
 
@@ -6235,7 +6235,7 @@ msgstr "%.2fMB"
 msgid "%.2fGB"
 msgstr "%.2fGB"
 
-#: src/utils.c:2372 src/utils.c:2496
+#: src/utils.c:2386 src/utils.c:2510
 #, c-format
 msgid "writing to %s failed.\n"
 msgstr "%s fájlba nem sikerült írni.\n"
diff --git a/po/it.po b/po/it.po
index 2b5abd98..5b32b7c2 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed 2.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-08-09 18:08+0900\n"
+"POT-Creation-Date: 2005-08-22 17:22+0900\n"
 "PO-Revision-Date: 2005-07-30 09:56+0200\n"
 "Last-Translator: danilo bodei <dbodei@lombardiacom.it>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -100,7 +100,7 @@ msgstr ""
 "tutti»."
 
 #: src/account.c:691 src/addressadd.c:192 src/addressbook.c:490
-#: src/compose.c:4081 src/editaddress.c:200 src/editaddress.c:942
+#: src/compose.c:4079 src/editaddress.c:200 src/editaddress.c:942
 #: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:265
 #: src/editjpilot.c:271 src/editldap.c:307 src/editvcard.c:184
 #: src/mimeview.c:201 src/prefs_filter.c:258 src/prefs_folder_item.c:170
@@ -236,7 +236,7 @@ msgstr "Argomento dell'azione utente"
 msgid "Add Address to Book"
 msgstr "Aggiunta dell'indirizzo alla rubrica"
 
-#: src/addressadd.c:202 src/compose.c:4528 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4521 src/editaddress.c:201
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "Indirizzo"
@@ -250,7 +250,7 @@ msgstr "Note"
 msgid "Select Address Book Folder"
 msgstr "Selezione della cartella della rubrica"
 
-#: src/addressbook.c:336 src/compose.c:495 src/mainwindow.c:470
+#: src/addressbook.c:336 src/compose.c:493 src/mainwindow.c:461
 #: src/messageview.c:137
 msgid "/_File"
 msgstr "/_File"
@@ -271,10 +271,10 @@ msgstr "/_File/Nuovo _JPilot"
 msgid "/_File/New _Server"
 msgstr "/_File/_Nuovo server"
 
-#: src/addressbook.c:345 src/addressbook.c:348 src/compose.c:500
-#: src/compose.c:505 src/compose.c:509 src/mainwindow.c:488
-#: src/mainwindow.c:491 src/mainwindow.c:493 src/mainwindow.c:496
-#: src/mainwindow.c:498 src/messageview.c:140
+#: src/addressbook.c:345 src/addressbook.c:348 src/compose.c:498
+#: src/compose.c:503 src/compose.c:507 src/mainwindow.c:479
+#: src/mainwindow.c:482 src/mainwindow.c:484 src/mainwindow.c:487
+#: src/mainwindow.c:489 src/messageview.c:140
 msgid "/_File/---"
 msgstr "/_File/---"
 
@@ -290,7 +290,7 @@ msgstr "/_File/_Elimina"
 msgid "/_File/_Save"
 msgstr "/_File/_Salva"
 
-#: src/addressbook.c:350 src/compose.c:510 src/messageview.c:141
+#: src/addressbook.c:350 src/compose.c:508 src/messageview.c:141
 msgid "/_File/_Close"
 msgstr "/_File/_Chiudi"
 
@@ -322,7 +322,7 @@ msgstr "/_Indirizzo/_Modifica"
 msgid "/_Address/_Delete"
 msgstr "/_indirizzo/_Elimina"
 
-#: src/addressbook.c:358 src/compose.c:619 src/mainwindow.c:725
+#: src/addressbook.c:358 src/compose.c:617 src/mainwindow.c:716
 #: src/messageview.c:256
 msgid "/_Tools"
 msgstr "/S_trumenti"
@@ -331,12 +331,12 @@ msgstr "/S_trumenti"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/S_trumenti/Importa file _LDIF"
 
-#: src/addressbook.c:360 src/compose.c:632 src/mainwindow.c:775
+#: src/addressbook.c:360 src/compose.c:630 src/mainwindow.c:766
 #: src/messageview.c:274
 msgid "/_Help"
 msgstr "/A_iuto"
 
-#: src/addressbook.c:361 src/compose.c:633 src/mainwindow.c:786
+#: src/addressbook.c:361 src/compose.c:631 src/mainwindow.c:777
 #: src/messageview.c:275
 msgid "/_Help/_About"
 msgstr "/A_iuto/I_nformazioni"
@@ -353,7 +353,7 @@ msgstr "/Nuovo _gruppo"
 msgid "/New _Folder"
 msgstr "/Nuova _cartella"
 
-#: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:489
+#: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:487
 #: src/folderview.c:235 src/folderview.c:237 src/folderview.c:241
 #: src/folderview.c:252 src/folderview.c:254 src/folderview.c:256
 #: src/folderview.c:260 src/folderview.c:270 src/folderview.c:272
@@ -363,8 +363,8 @@ msgstr "/Nuova _cartella"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:512
-#: src/mainwindow.c:502 src/messageview.c:143
+#: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:510
+#: src/mainwindow.c:493 src/messageview.c:143
 msgid "/_Edit"
 msgstr "/_Modifica"
 
@@ -376,7 +376,7 @@ msgstr "/Eli_mina"
 msgid "E-Mail address"
 msgstr "Indirizzo e-mail"
 
-#: src/addressbook.c:495 src/compose.c:4529 src/prefs_common.c:2402
+#: src/addressbook.c:495 src/compose.c:4522 src/prefs_common.c:2402
 msgid "Address book"
 msgstr "Rubrica"
 
@@ -385,8 +385,8 @@ msgid "Name:"
 msgstr "Nome:"
 
 #. Buttons
-#: src/addressbook.c:627 src/addressbook.c:1673 src/editaddress.c:884
-#: src/editaddress.c:1017 src/mainwindow.c:2292 src/prefs_actions.c:266
+#: src/addressbook.c:627 src/addressbook.c:1674 src/editaddress.c:884
+#: src/editaddress.c:1017 src/mainwindow.c:2274 src/prefs_actions.c:266
 #: src/prefs_display_header.c:278 src/prefs_display_header.c:333
 #: src/prefs_template.c:231
 msgid "Delete"
@@ -425,7 +425,7 @@ msgstr "Elimina l'indirizzo(i)"
 msgid "Really delete the address(es)?"
 msgstr "Eliminare l'indirizzo(i)?"
 
-#: src/addressbook.c:1664
+#: src/addressbook.c:1665
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -435,36 +435,36 @@ msgstr ""
 "Eliminando solo la cartella, gli indirizzi saranno spostati nella cartella "
 "di origine."
 
-#: src/addressbook.c:1667 src/folderview.c:2139
+#: src/addressbook.c:1668 src/folderview.c:2139
 msgid "Delete folder"
 msgstr "Elimina la cartella"
 
-#: src/addressbook.c:1667
+#: src/addressbook.c:1668
 msgid "_Folder only"
 msgstr "_Solo la cartella"
 
-#: src/addressbook.c:1667
+#: src/addressbook.c:1668
 msgid "Folder and _addresses"
 msgstr "Cartella e _indirizzi"
 
-#: src/addressbook.c:1672
+#: src/addressbook.c:1673
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Eliminare «%s» ?"
 
-#: src/addressbook.c:2352 src/addressbook.c:2485
+#: src/addressbook.c:2353 src/addressbook.c:2486
 msgid "New user, could not save index file."
 msgstr "Nuovo utente, impossibile salvare il file indice."
 
-#: src/addressbook.c:2356 src/addressbook.c:2489
+#: src/addressbook.c:2357 src/addressbook.c:2490
 msgid "New user, could not save address book files."
 msgstr "Nuovo utente, impossibile salvare i file della rubrica."
 
-#: src/addressbook.c:2366 src/addressbook.c:2499
+#: src/addressbook.c:2367 src/addressbook.c:2500
 msgid "Old address book converted successfully."
 msgstr "La vecchia rubrica è stata convertita con successo."
 
-#: src/addressbook.c:2371
+#: src/addressbook.c:2372
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -472,7 +472,7 @@ msgstr ""
 "Vecchia rubrica convertita,\n"
 "impossibile salvare il nuovo file indice dell'indirizzo"
 
-#: src/addressbook.c:2384
+#: src/addressbook.c:2385
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -480,7 +480,7 @@ msgstr ""
 "Impossibile convertire la rubrica,\n"
 "ma ho creato nuovi file vuoti della rubrica."
 
-#: src/addressbook.c:2390
+#: src/addressbook.c:2391
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -488,7 +488,7 @@ msgstr ""
 "Impossibile convertire la rubrica,\n"
 "impossibile creare i nuovi file della rubrica."
 
-#: src/addressbook.c:2395
+#: src/addressbook.c:2396
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -496,91 +496,91 @@ msgstr ""
 "Impossibile convertire la rubrica,\n"
 "e impossibile creare i nuovi file della rubrica."
 
-#: src/addressbook.c:2402
+#: src/addressbook.c:2403
 msgid "Addressbook conversion error"
 msgstr "Errore di conversione della rubrica"
 
-#: src/addressbook.c:2406
+#: src/addressbook.c:2407
 msgid "Addressbook conversion"
 msgstr "Conversione della rubrica"
 
-#: src/addressbook.c:2441
+#: src/addressbook.c:2442
 msgid "Addressbook Error"
 msgstr "Errore nella rubrica"
 
-#: src/addressbook.c:2442 src/addressbook.c:2542
+#: src/addressbook.c:2443 src/addressbook.c:2543
 msgid "Could not read address index"
 msgstr "Impossibile leggere l'indice dell'indirizzo"
 
-#: src/addressbook.c:2504
+#: src/addressbook.c:2505
 msgid "Old address book converted, could not save new address index file"
 msgstr ""
 "Vecchia rubrica convertita, impossibile salvare il nuovo file indice "
 "dell'indirizzo"
 
-#: src/addressbook.c:2518
+#: src/addressbook.c:2519
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr ""
 "Impossibile convertire la rubrica, ma ho creato nuovi file vuoti della "
 "rubrica."
 
-#: src/addressbook.c:2524
+#: src/addressbook.c:2525
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr ""
 "Impossibile convertire la rubrica, impossibile creare i nuovi file della "
 "rubrica."
 
-#: src/addressbook.c:2530
+#: src/addressbook.c:2531
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr ""
 "Impossibile convertire la rubrica e impossibile creare i nuovi file della "
 "rubrica."
 
-#: src/addressbook.c:2548
+#: src/addressbook.c:2549
 msgid "Addressbook Conversion Error"
 msgstr "Errore di conversione della rubrica"
 
-#: src/addressbook.c:2554
+#: src/addressbook.c:2555
 msgid "Addressbook Conversion"
 msgstr "Conversione della rubrica"
 
-#: src/addressbook.c:3055 src/prefs_common.c:963
+#: src/addressbook.c:3056 src/prefs_common.c:963
 msgid "Interface"
 msgstr "Interfaccia"
 
-#: src/addressbook.c:3071 src/importldif.c:514
+#: src/addressbook.c:3072 src/importldif.c:514
 msgid "Address Book"
 msgstr "Rubrica"
 
-#: src/addressbook.c:3087
+#: src/addressbook.c:3088
 msgid "Person"
 msgstr "Persona"
 
-#: src/addressbook.c:3103
+#: src/addressbook.c:3104
 msgid "EMail Address"
 msgstr "Indirizzo email"
 
-#: src/addressbook.c:3119
+#: src/addressbook.c:3120
 msgid "Group"
 msgstr "Gruppo"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3135 src/folderview.c:346 src/prefs_account.c:1866
+#: src/addressbook.c:3136 src/folderview.c:346 src/prefs_account.c:1866
 msgid "Folder"
 msgstr "Cartella"
 
-#: src/addressbook.c:3151
+#: src/addressbook.c:3152
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3167 src/addressbook.c:3183
+#: src/addressbook.c:3168 src/addressbook.c:3184
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3199
+#: src/addressbook.c:3200
 msgid "LDAP Server"
 msgstr "Server LDAP"
 
@@ -592,7 +592,7 @@ msgstr "Indirizzo comune"
 msgid "Personal address"
 msgstr "Indirizzo personale"
 
-#: src/alertpanel.c:138 src/compose.c:5214 src/main.c:515
+#: src/alertpanel.c:138 src/compose.c:5208 src/main.c:515
 msgid "Notice"
 msgstr "Avviso"
 
@@ -647,347 +647,347 @@ msgstr "Marrone"
 msgid "None"
 msgstr "Niente"
 
-#: src/compose.c:487
+#: src/compose.c:485
 msgid "/_Add..."
 msgstr "/_Aggiungi..."
 
-#: src/compose.c:488
+#: src/compose.c:486
 msgid "/_Remove"
 msgstr "/_Rimuovi"
 
-#: src/compose.c:490 src/folderview.c:243 src/folderview.c:262
+#: src/compose.c:488 src/folderview.c:243 src/folderview.c:262
 #: src/folderview.c:277
 msgid "/_Properties..."
 msgstr "/_Proprietà..."
 
-#: src/compose.c:496
+#: src/compose.c:494
 msgid "/_File/_Send"
 msgstr "/_File/In_via"
 
-#: src/compose.c:498
+#: src/compose.c:496
 msgid "/_File/Send _later"
 msgstr "/_File/Invia _più tardi"
 
-#: src/compose.c:501
+#: src/compose.c:499
 msgid "/_File/Save to _draft folder"
 msgstr "/_File/_Salva nella cartella «Bozze»"
 
-#: src/compose.c:503
+#: src/compose.c:501
 msgid "/_File/Save and _keep editing"
 msgstr "/_File/Sa_lva e mantieni l'editazione"
 
-#: src/compose.c:506
+#: src/compose.c:504
 msgid "/_File/_Attach file"
 msgstr "/_File/_Allega file"
 
-#: src/compose.c:507
+#: src/compose.c:505
 msgid "/_File/_Insert file"
 msgstr "/_File/_Inserisci file"
 
-#: src/compose.c:508
+#: src/compose.c:506
 msgid "/_File/Insert si_gnature"
 msgstr "/_File/Inserisci fi_rma"
 
-#: src/compose.c:513
+#: src/compose.c:511
 msgid "/_Edit/_Undo"
 msgstr "/_Modifica/_Annulla"
 
-#: src/compose.c:514
+#: src/compose.c:512
 msgid "/_Edit/_Redo"
 msgstr "/_Modifica/_Ripeti"
 
-#: src/compose.c:515 src/compose.c:522 src/mainwindow.c:506
+#: src/compose.c:513 src/compose.c:520 src/mainwindow.c:497
 #: src/messageview.c:146
 msgid "/_Edit/---"
 msgstr "/_Modifica/---"
 
-#: src/compose.c:516
+#: src/compose.c:514
 msgid "/_Edit/Cu_t"
 msgstr "/_Modifica/_Taglia"
 
-#: src/compose.c:517 src/mainwindow.c:503 src/messageview.c:144
+#: src/compose.c:515 src/mainwindow.c:494 src/messageview.c:144
 msgid "/_Edit/_Copy"
 msgstr "/_Modifica/_Copia"
 
-#: src/compose.c:518
+#: src/compose.c:516
 msgid "/_Edit/_Paste"
 msgstr "/_Modifica/_Incolla"
 
-#: src/compose.c:519
+#: src/compose.c:517
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Modifica/Incolla co_me citazione"
 
-#: src/compose.c:521 src/mainwindow.c:504 src/messageview.c:145
+#: src/compose.c:519 src/mainwindow.c:495 src/messageview.c:145
 msgid "/_Edit/Select _all"
 msgstr "/_Modifica/_Seleziona tutto"
 
-#: src/compose.c:523
+#: src/compose.c:521
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/_Modifica/A capo _paragrafo attuale"
 
-#: src/compose.c:525
+#: src/compose.c:523
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/_Modifica/A capo tutte le righe _lunghe"
 
-#: src/compose.c:527
+#: src/compose.c:525
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Modifica/A cap_o automatico"
 
-#: src/compose.c:528 src/mainwindow.c:511 src/messageview.c:150
+#: src/compose.c:526 src/mainwindow.c:502 src/messageview.c:150
 #: src/summaryview.c:400
 msgid "/_View"
 msgstr "/_Visualizza"
 
-#: src/compose.c:529
+#: src/compose.c:527
 msgid "/_View/_To"
 msgstr "/_Visualizza/_A"
 
-#: src/compose.c:530
+#: src/compose.c:528
 msgid "/_View/_Cc"
 msgstr "/_Visualizza/_Cc"
 
-#: src/compose.c:531
+#: src/compose.c:529
 msgid "/_View/_Bcc"
 msgstr "/_Visualizza/_Bcc"
 
-#: src/compose.c:532
+#: src/compose.c:530
 msgid "/_View/_Reply to"
 msgstr "/_Visualizza/_Rispondi a"
 
-#: src/compose.c:533 src/compose.c:535 src/compose.c:537 src/compose.c:539
-#: src/mainwindow.c:529 src/mainwindow.c:532 src/mainwindow.c:558
-#: src/mainwindow.c:582 src/mainwindow.c:675 src/mainwindow.c:679
+#: src/compose.c:531 src/compose.c:533 src/compose.c:535 src/compose.c:537
+#: src/mainwindow.c:520 src/mainwindow.c:523 src/mainwindow.c:549
+#: src/mainwindow.c:573 src/mainwindow.c:666 src/mainwindow.c:670
 #: src/messageview.c:233
 msgid "/_View/---"
 msgstr "/_Visualizza/---"
 
-#: src/compose.c:534
+#: src/compose.c:532
 msgid "/_View/_Followup to"
 msgstr "/_Visualizza/_Seguito di"
 
-#: src/compose.c:536
+#: src/compose.c:534
 msgid "/_View/R_uler"
 msgstr "/_Visualizza/R_ighello"
 
-#: src/compose.c:538
+#: src/compose.c:536
 msgid "/_View/_Attachment"
 msgstr "/_Visualizza/Alle_gato"
 
-#: src/compose.c:545 src/mainwindow.c:589 src/messageview.c:157
+#: src/compose.c:543 src/mainwindow.c:580 src/messageview.c:157
 msgid "/_View/Character _encoding"
 msgstr "/_Visualizza/Co_difica caratteri"
 
-#: src/compose.c:546
+#: src/compose.c:544
 msgid "/_View/Character _encoding/_Automatic"
 msgstr "/_Visualizza/Co_difica caratteri/_Automatica"
 
-#: src/compose.c:548 src/compose.c:554 src/compose.c:560 src/compose.c:564
-#: src/compose.c:570 src/compose.c:574 src/compose.c:580 src/compose.c:584
-#: src/compose.c:594 src/compose.c:598 src/compose.c:608 src/compose.c:612
-#: src/mainwindow.c:585 src/mainwindow.c:592 src/messageview.c:153
+#: src/compose.c:546 src/compose.c:552 src/compose.c:558 src/compose.c:562
+#: src/compose.c:568 src/compose.c:572 src/compose.c:578 src/compose.c:582
+#: src/compose.c:592 src/compose.c:596 src/compose.c:606 src/compose.c:610
+#: src/mainwindow.c:576 src/mainwindow.c:583 src/messageview.c:153
 msgid "/_View/Character _encoding/---"
 msgstr "/_Visualizza/Co_difica·caratteri/---"
 
-#: src/compose.c:550 src/mainwindow.c:593 src/messageview.c:161
+#: src/compose.c:548 src/mainwindow.c:584 src/messageview.c:161
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Visualizza/Co_difica·caratteri/ASCII a 7 bit (US-ASC_II)"
 
-#: src/compose.c:552 src/mainwindow.c:595 src/messageview.c:164
+#: src/compose.c:550 src/mainwindow.c:586 src/messageview.c:164
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Visualizza/Co_difica caratteri/Unicode (_UTF-8)"
 
-#: src/compose.c:556 src/mainwindow.c:599 src/messageview.c:167
+#: src/compose.c:554 src/mainwindow.c:590 src/messageview.c:167
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Visualizza/Co_difica caratteri/Europa Occidentale (ISO-8859-_1)"
 
-#: src/compose.c:558 src/mainwindow.c:601 src/messageview.c:169
+#: src/compose.c:556 src/mainwindow.c:592 src/messageview.c:169
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Visualizza/Co_difica caratteri/Europa Occidentale (IS_O-8859-15)"
 
-#: src/compose.c:562 src/mainwindow.c:605 src/messageview.c:172
+#: src/compose.c:560 src/mainwindow.c:596 src/messageview.c:172
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Visualizza/Co_difica caratteri/Europa Centrale (ISO-8859-_2)"
 
-#: src/compose.c:566 src/mainwindow.c:609 src/messageview.c:175
+#: src/compose.c:564 src/mainwindow.c:600 src/messageview.c:175
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Visualizza/Co_difica caratteri/Baltico (I_SO-8859-13)"
 
-#: src/compose.c:568 src/mainwindow.c:611 src/messageview.c:177
+#: src/compose.c:566 src/mainwindow.c:602 src/messageview.c:177
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Visualizza/Co_difica caratteri/Baltico (ISO-8859-_4)"
 
-#: src/compose.c:572 src/mainwindow.c:615 src/messageview.c:180
+#: src/compose.c:570 src/mainwindow.c:606 src/messageview.c:180
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Visualizza/Co_difica caratteri/Greco (ISO-8859-_7)"
 
-#: src/compose.c:576 src/mainwindow.c:619 src/messageview.c:183
+#: src/compose.c:574 src/mainwindow.c:610 src/messageview.c:183
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Visualizza/Co_difica caratteri/Ebreo (ISO-8859-_8)"
 
-#: src/compose.c:578 src/mainwindow.c:621 src/messageview.c:185
+#: src/compose.c:576 src/mainwindow.c:612 src/messageview.c:185
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Visualizza/Co_difica caratteri/Ebreo (Windows-1255)"
 
-#: src/compose.c:582 src/mainwindow.c:625 src/messageview.c:188
+#: src/compose.c:580 src/mainwindow.c:616 src/messageview.c:188
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Visualizza/Co_difica caratteri/Turco (ISO-8859-_9)"
 
-#: src/compose.c:586 src/mainwindow.c:629 src/messageview.c:191
+#: src/compose.c:584 src/mainwindow.c:620 src/messageview.c:191
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Visualizza/Co_difica caratteri/Cirillico (ISO-8859-_5)"
 
-#: src/compose.c:588 src/mainwindow.c:631 src/messageview.c:193
+#: src/compose.c:586 src/mainwindow.c:622 src/messageview.c:193
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Visualizza/Co_difica caratteri/Cirillico (KOI8-_R)"
 
-#: src/compose.c:590 src/mainwindow.c:633 src/messageview.c:195
+#: src/compose.c:588 src/mainwindow.c:624 src/messageview.c:195
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Visualizza/Co_difica caratteri/Ciri_llico (KOI8-U)"
 
-#: src/compose.c:592 src/mainwindow.c:635 src/messageview.c:197
+#: src/compose.c:590 src/mainwindow.c:626 src/messageview.c:197
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Visualizza/Co_difica caratteri/Cirillico (_Windows-1251)"
 
-#: src/compose.c:596 src/mainwindow.c:639 src/messageview.c:200
+#: src/compose.c:594 src/mainwindow.c:630 src/messageview.c:200
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Visualizza/Co_difica caratteri/Giapponese (ISO-2022-_JP)"
 
-#: src/compose.c:600 src/mainwindow.c:649 src/messageview.c:209
+#: src/compose.c:598 src/mainwindow.c:640 src/messageview.c:209
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Visualizza/Co_difica caratteri/Cinese semplificato (_GB2312)"
 
-#: src/compose.c:602 src/mainwindow.c:651 src/messageview.c:211
+#: src/compose.c:600 src/mainwindow.c:642 src/messageview.c:211
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Visualizza/Co_difica caratteri/Cinese semplificato (GBK)"
 
-#: src/compose.c:604 src/mainwindow.c:653 src/messageview.c:213
+#: src/compose.c:602 src/mainwindow.c:644 src/messageview.c:213
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Visualizza/Co_difica caratteri/Cinese tradizionale (_Big5)"
 
-#: src/compose.c:606 src/mainwindow.c:655 src/messageview.c:215
+#: src/compose.c:604 src/mainwindow.c:646 src/messageview.c:215
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Visualizza/Co_difica caratteri/Cinese tradizionale (EUC-_TW)"
 
-#: src/compose.c:610 src/mainwindow.c:661 src/messageview.c:220
+#: src/compose.c:608 src/mainwindow.c:652 src/messageview.c:220
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Visualizza/Co_difica caratteri/Coreano (EUC-_KR)"
 
-#: src/compose.c:614 src/mainwindow.c:667 src/messageview.c:225
+#: src/compose.c:612 src/mainwindow.c:658 src/messageview.c:225
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Visualizza/Co_difica caratteri/Tailandese (TIS-_620)"
 
-#: src/compose.c:616 src/mainwindow.c:669 src/messageview.c:227
+#: src/compose.c:614 src/mainwindow.c:660 src/messageview.c:227
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Visualizza/Co_difica caratteri/Tailan_dese (Windows-874)"
 
-#: src/compose.c:620 src/mainwindow.c:726 src/messageview.c:257
+#: src/compose.c:618 src/mainwindow.c:717 src/messageview.c:257
 msgid "/_Tools/_Address book"
 msgstr "/S_trumenti/_Rubrica"
 
-#: src/compose.c:621
+#: src/compose.c:619
 msgid "/_Tools/_Template"
 msgstr "/S_trumenti/_Modello"
 
-#: src/compose.c:622 src/mainwindow.c:749 src/messageview.c:272
+#: src/compose.c:620 src/mainwindow.c:740 src/messageview.c:272
 msgid "/_Tools/Actio_ns"
 msgstr "/S_trumenti/A_zioni"
 
-#: src/compose.c:623 src/compose.c:627 src/mainwindow.c:729
-#: src/mainwindow.c:743 src/mainwindow.c:748 src/mainwindow.c:750
-#: src/mainwindow.c:753 src/mainwindow.c:755 src/messageview.c:260
+#: src/compose.c:621 src/compose.c:625 src/mainwindow.c:720
+#: src/mainwindow.c:734 src/mainwindow.c:739 src/mainwindow.c:741
+#: src/mainwindow.c:744 src/mainwindow.c:746 src/messageview.c:260
 #: src/messageview.c:271
 msgid "/_Tools/---"
 msgstr "/S_trumenti/---"
 
-#: src/compose.c:624
+#: src/compose.c:622
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/_Strumenti/Modifica con l'_editor esterno"
 
-#: src/compose.c:628
+#: src/compose.c:626
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Strumenti/Firma P_GP"
 
-#: src/compose.c:629
+#: src/compose.c:627
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/_Strumenti/_Cifratura PGP"
 
-#: src/compose.c:855
+#: src/compose.c:853
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: il file non esiste\n"
 
-#: src/compose.c:954 src/compose.c:1024 src/procmsg.c:1353
+#: src/compose.c:952 src/compose.c:1022 src/procmsg.c:1353
 msgid "Can't get text part\n"
 msgstr "Impossibile ricevere parte del testo\n"
 
-#: src/compose.c:1420
+#: src/compose.c:1418
 msgid "Quote mark format error."
 msgstr "Errore del formato del segno di citazione."
 
-#: src/compose.c:1432
+#: src/compose.c:1430
 msgid "Message reply/forward format error."
 msgstr "Errore del formato nel messaggio di risposta/inoltro."
 
-#: src/compose.c:1801
+#: src/compose.c:1799
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Il file %s non esiste\n"
 
-#: src/compose.c:1805
+#: src/compose.c:1803
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Impossibile ottenere la dimensione di %s\n"
 
-#: src/compose.c:1809
+#: src/compose.c:1807
 #, c-format
 msgid "File %s is empty."
 msgstr "Il file %s è vuoto."
 
-#: src/compose.c:1813
+#: src/compose.c:1811
 #, c-format
 msgid "Can't read %s."
 msgstr "Impossibile leggere %s."
 
-#: src/compose.c:1848
+#: src/compose.c:1846
 #, c-format
 msgid "Message: %s"
 msgstr "Messaggio: %s"
 
-#: src/compose.c:1920 src/mimeview.c:560
+#: src/compose.c:1918 src/mimeview.c:560
 msgid "Can't get the part of multipart message."
 msgstr "Impossibile ricevere parte del messaggio composto."
 
-#: src/compose.c:2362
+#: src/compose.c:2360
 msgid " [Edited]"
 msgstr " [Modificato]"
 
-#: src/compose.c:2364
+#: src/compose.c:2362
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Composizione messaggio %s"
 
-#: src/compose.c:2367
+#: src/compose.c:2365
 #, c-format
 msgid "Compose message%s"
 msgstr "Composizione messaggio %s"
 
-#: src/compose.c:2478
+#: src/compose.c:2476
 msgid "Recipient is not specified."
 msgstr "Il destinatario non è specificato."
 
-#: src/compose.c:2486
+#: src/compose.c:2484
 msgid "Empty subject"
 msgstr "Oggetto vuoto"
 
-#: src/compose.c:2487
+#: src/compose.c:2485
 msgid "Subject is empty. Send it anyway?"
 msgstr "L'oggetto è vuoto. Inviarlo comunque?"
 
-#: src/compose.c:2538
+#: src/compose.c:2536
 msgid "can't get recipient list."
 msgstr "impossibile ottenere la lista dei destinatari."
 
-#: src/compose.c:2558
+#: src/compose.c:2556
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -995,28 +995,28 @@ msgstr ""
 "Non è specificato l'account per l'invio della posta.\n"
 "Scegliere un account di posta prima dell'invio."
 
-#: src/compose.c:2572 src/send_message.c:297
+#: src/compose.c:2570 src/send_message.c:297
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Si è verificato un errore durante l'invio del messaggio a %s ."
 
-#: src/compose.c:2595
+#: src/compose.c:2593
 msgid "Can't save the message to outbox."
 msgstr "Impossibile salvare il messaggio nella cartella «Inviata»."
 
-#: src/compose.c:2645
+#: src/compose.c:2643
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr ""
 "Impossibile trovare qualsiasi chiave associata con l'id chiave «%s» "
 "attualmente selezionato."
 
-#: src/compose.c:2709 src/compose.c:2965 src/compose.c:3028 src/compose.c:3148
-#: src/utils.c:2365
+#: src/compose.c:2707 src/compose.c:2963 src/compose.c:3026 src/compose.c:3146
+#: src/utils.c:2379
 msgid "can't change file mode\n"
 msgstr "impossibile cambiare i permessi del file\n"
 
-#: src/compose.c:2741
+#: src/compose.c:2739
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1028,11 +1028,11 @@ msgstr ""
 "\n"
 "Spedirlo come %s comunque?"
 
-#: src/compose.c:2747
+#: src/compose.c:2745
 msgid "Code conversion error"
 msgstr "Errore di conversione del codice"
 
-#: src/compose.c:2816
+#: src/compose.c:2814
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1046,153 +1046,153 @@ msgstr ""
 "\n"
 "Spedirlo comunque?"
 
-#: src/compose.c:2820
+#: src/compose.c:2818
 msgid "Line length limit"
 msgstr "Limite lunghezza linea"
 
-#: src/compose.c:3108
+#: src/compose.c:3106
 msgid "can't remove the old message\n"
 msgstr "impossibile rimuovere il vecchio messaggio\n"
 
-#: src/compose.c:3126
+#: src/compose.c:3124
 msgid "queueing message...\n"
 msgstr "accodamento messaggio...\n"
 
-#: src/compose.c:3208
+#: src/compose.c:3206
 msgid "can't find queue folder\n"
 msgstr "impossibile trovare la cartella «Coda»\n"
 
-#: src/compose.c:3215
+#: src/compose.c:3213
 msgid "can't queue the message\n"
 msgstr "impossibile accodare il messaggio\n"
 
-#: src/compose.c:3792
+#: src/compose.c:3790
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "generato l'ID-messaggio: %s\n"
 
-#: src/compose.c:3901
+#: src/compose.c:3899
 msgid "Creating compose window...\n"
 msgstr "Creazione della finestra di composizione...\n"
 
-#: src/compose.c:3949 src/headerview.c:54 src/summary_search.c:214
+#: src/compose.c:3947 src/headerview.c:54 src/summary_search.c:214
 msgid "From:"
 msgstr "Da:"
 
-#: src/compose.c:4021
+#: src/compose.c:4019
 msgid "PGP Sign"
 msgstr "Firma PGP"
 
-#: src/compose.c:4024
+#: src/compose.c:4022
 msgid "PGP Encrypt"
 msgstr "Cifratura PGP"
 
-#: src/compose.c:4062 src/compose.c:5001
+#: src/compose.c:4060 src/compose.c:4995
 msgid "MIME type"
 msgstr "Tipo MIME"
 
 #. S_COL_DATE
-#: src/compose.c:4071 src/mimeview.c:192 src/prefs_filter_edit.c:585
+#: src/compose.c:4069 src/mimeview.c:192 src/prefs_filter_edit.c:585
 #: src/prefs_summary_column.c:75 src/select-keys.c:317 src/summaryview.c:4217
 msgid "Size"
 msgstr "Dimensione"
 
-#: src/compose.c:4449 src/mainwindow.c:2224 src/prefs_account.c:719
+#: src/compose.c:4442 src/mainwindow.c:2207 src/prefs_account.c:719
 #: src/prefs_common.c:947
 msgid "Send"
 msgstr "Invia"
 
-#: src/compose.c:4450
+#: src/compose.c:4443
 msgid "Send message"
 msgstr "Invia il messaggio"
 
-#: src/compose.c:4458
+#: src/compose.c:4451
 msgid "Send later"
 msgstr "Invia più tardi"
 
-#: src/compose.c:4459
+#: src/compose.c:4452
 msgid "Put into queue folder and send later"
 msgstr "Mette nella cartella «Coda» e invia più tardi"
 
-#: src/compose.c:4467
+#: src/compose.c:4460
 msgid "Draft"
 msgstr "Bozze"
 
-#: src/compose.c:4468
+#: src/compose.c:4461
 msgid "Save to draft folder"
 msgstr "Salva nella cartella «Bozze»"
 
-#: src/compose.c:4478
+#: src/compose.c:4471
 msgid "Insert"
 msgstr "Inserisci"
 
-#: src/compose.c:4479
+#: src/compose.c:4472
 msgid "Insert file"
 msgstr "Inserisce il file"
 
-#: src/compose.c:4487
+#: src/compose.c:4480
 msgid "Attach"
 msgstr "Allega"
 
-#: src/compose.c:4488
+#: src/compose.c:4481
 msgid "Attach file"
 msgstr "Allega il file"
 
 #. signature
-#: src/compose.c:4498 src/prefs_account.c:1391 src/prefs_common.c:1356
+#: src/compose.c:4491 src/prefs_account.c:1391 src/prefs_common.c:1356
 msgid "Signature"
 msgstr "Firma"
 
-#: src/compose.c:4499
+#: src/compose.c:4492
 msgid "Insert signature"
 msgstr "Inserisce la firma"
 
-#: src/compose.c:4508 src/prefs_common.c:1378 src/prefs_common.c:2382
+#: src/compose.c:4501 src/prefs_common.c:1378 src/prefs_common.c:2382
 msgid "Editor"
 msgstr "Editor"
 
-#: src/compose.c:4509
+#: src/compose.c:4502
 msgid "Edit with external editor"
 msgstr "Modifica con l'editor esterno"
 
-#: src/compose.c:4517
+#: src/compose.c:4510
 msgid "Linewrap"
 msgstr "A capo riga"
 
-#: src/compose.c:4518
+#: src/compose.c:4511
 msgid "Wrap all long lines"
 msgstr "Manda a capo tutte le righe lunghe"
 
-#: src/compose.c:4897
+#: src/compose.c:4891
 msgid "Invalid MIME type."
 msgstr "Tipo MIME non valido."
 
-#: src/compose.c:4915
+#: src/compose.c:4909
 msgid "File doesn't exist or is empty."
 msgstr "Il file non esiste o è vuoto."
 
-#: src/compose.c:4983
+#: src/compose.c:4977
 msgid "Properties"
 msgstr "Proprietà"
 
-#: src/compose.c:5003
+#: src/compose.c:4997
 msgid "Encoding"
 msgstr "Codifica"
 
-#: src/compose.c:5026 src/prefs_folder_item.c:183
+#: src/compose.c:5020 src/prefs_folder_item.c:183
 msgid "Path"
 msgstr "Percorso"
 
-#: src/compose.c:5027
+#: src/compose.c:5021
 msgid "File name"
 msgstr "Nome del file"
 
-#: src/compose.c:5185
+#: src/compose.c:5179
 #, 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:5211
+#: src/compose.c:5205
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1203,71 +1203,71 @@ msgstr ""
 "Forzare la conclusione del processo?\n"
 "group id del processo: %d"
 
-#: src/compose.c:5228
+#: src/compose.c:5222
 #, c-format
 msgid "Terminated process group id: %d"
 msgstr "Group id del processo terminato: %d"
 
-#: src/compose.c:5229
+#: src/compose.c:5223
 #, c-format
 msgid "Temporary file: %s"
 msgstr "File temporaneo: %s"
 
-#: src/compose.c:5253
+#: src/compose.c:5247
 msgid "Compose: input from monitoring process\n"
 msgstr "Composizione: input da un processo di controllo\n"
 
 #. failed
-#: src/compose.c:5284
+#: src/compose.c:5278
 msgid "Couldn't exec external editor\n"
 msgstr "Impossibile eseguire l'editor esterno\n"
 
-#: src/compose.c:5288
+#: src/compose.c:5282
 msgid "Couldn't write to file\n"
 msgstr "Impossibile scrivere sul file\n"
 
-#: src/compose.c:5290
+#: src/compose.c:5284
 msgid "Pipe read failed\n"
 msgstr "Lettura dalla pipe fallita\n"
 
-#: src/compose.c:5596 src/compose.c:5604 src/compose.c:5610
+#: src/compose.c:5590 src/compose.c:5598 src/compose.c:5604
 msgid "Can't queue the message."
 msgstr "Impossibile accodare il messaggio."
 
-#: src/compose.c:5701
+#: src/compose.c:5695
 msgid "Select files"
 msgstr "Seleziona i file"
 
-#: src/compose.c:5723
+#: src/compose.c:5717
 msgid "Select file"
 msgstr "Selezione del file"
 
-#: src/compose.c:5760
+#: src/compose.c:5754
 msgid "Save message"
 msgstr "Salva il messaggio"
 
-#: src/compose.c:5761
+#: src/compose.c:5755
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Questo messaggio è stato modificato. Salvarlo nella cartella bozze?"
 
-#: src/compose.c:5763
+#: src/compose.c:5757
 msgid "Close _without saving"
 msgstr "Chiudi sen_za salvare"
 
-#: src/compose.c:5805
+#: src/compose.c:5799
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Applicare il modello «%s» ?"
 
-#: src/compose.c:5807
+#: src/compose.c:5801
 msgid "Apply template"
 msgstr "Applica il modello"
 
-#: src/compose.c:5808
+#: src/compose.c:5802
 msgid "_Replace"
 msgstr "_Sostituisci"
 
-#: src/compose.c:5808
+#: src/compose.c:5802
 msgid "_Insert"
 msgstr "_Inserisci"
 
@@ -1712,12 +1712,12 @@ msgstr "Impostazione delle informazioni della cartella...\n"
 msgid "Setting folder info..."
 msgstr "Impostazione delle informazioni della cartella..."
 
-#: src/folderview.c:805 src/mainwindow.c:3301 src/setup.c:81
+#: src/folderview.c:805 src/mainwindow.c:3272 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Analisi della cartella %s%c%s..."
 
-#: src/folderview.c:809 src/mainwindow.c:3306 src/setup.c:86
+#: src/folderview.c:809 src/mainwindow.c:3277 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Analisi della cartella %s..."
@@ -2040,44 +2040,44 @@ msgstr "Autenticazione IMAP4 fallita.\n"
 msgid "IMAP4 login failed.\n"
 msgstr "Login IMAP4 fallito.\n"
 
-#: src/imap.c:3522
+#: src/imap.c:3528
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "impossibile aggiungere %s a %s\n"
 
-#: src/imap.c:3529
+#: src/imap.c:3535
 msgid "(sending file...)"
 msgstr "(spedizione del file...)"
 
-#: src/imap.c:3557
+#: src/imap.c:3563
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "impossibile aggiungere a %s\n"
 
-#: src/imap.c:3589
+#: src/imap.c:3595
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "impossibile copiare %s in %s\n"
 
-#: src/imap.c:3613
+#: src/imap.c:3619
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "errore durante il comando imap: STORE %s %s\n"
 
-#: src/imap.c:3627
+#: src/imap.c:3633
 msgid "error while imap command: EXPUNGE\n"
 msgstr "errore durante il comando imap: EXPUNGE\n"
 
-#: src/imap.c:3640
+#: src/imap.c:3646
 msgid "error while imap command: CLOSE\n"
 msgstr "errore durante il comando imap: CLOSE\n"
 
-#: src/imap.c:3873
+#: src/imap.c:3879
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv non può convertire UTF-7 in %s\n"
 
-#: src/imap.c:3903
+#: src/imap.c:3909
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv non può convertire %s in UTF-7\n"
@@ -2179,7 +2179,7 @@ msgstr "Importazione del file LDIF nella rubrica"
 msgid "Prev"
 msgstr "Precedente"
 
-#: src/importldif.c:768 src/mainwindow.c:2321
+#: src/importldif.c:768 src/mainwindow.c:2303
 msgid "Next"
 msgstr "Successivo"
 
@@ -2532,615 +2532,615 @@ msgstr ""
 "È stata trovata una versione precedente della configurazione.\n"
 "Trasferirla?"
 
-#: src/mainwindow.c:471
+#: src/mainwindow.c:462
 msgid "/_File/_Folder"
 msgstr "/_File/Ca_rtella"
 
-#: src/mainwindow.c:472
+#: src/mainwindow.c:463
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/_File/Ca_rtella/Crea _nuova cartella..."
 
-#: src/mainwindow.c:474
+#: src/mainwindow.c:465
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/_File/Ca_rtella/_Rinomina cartella..."
 
-#: src/mainwindow.c:475
+#: src/mainwindow.c:466
 msgid "/_File/_Folder/_Move folder..."
 msgstr "/_File/Ca_rtella/_Sposta cartella..."
 
-#: src/mainwindow.c:476
+#: src/mainwindow.c:467
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/_File/Ca_rtella/Eli_mina cartella"
 
-#: src/mainwindow.c:477
+#: src/mainwindow.c:468
 msgid "/_File/_Mailbox"
 msgstr "/_File/_Casella postale"
 
-#: src/mainwindow.c:478
+#: src/mainwindow.c:469
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/_File/_Casella postale/_Aggiungi casella postale..."
 
-#: src/mainwindow.c:479
+#: src/mainwindow.c:470
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/_File/_Casella postale/Rimuovi ca_sella postale"
 
-#: src/mainwindow.c:480 src/mainwindow.c:485
+#: src/mainwindow.c:471 src/mainwindow.c:476
 msgid "/_File/_Mailbox/---"
 msgstr "/_File/_Casella postale/---"
 
-#: src/mainwindow.c:481
+#: src/mainwindow.c:472
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "/_File/_Casella postale/_Controllo nuovi messaggi"
 
-#: src/mainwindow.c:483
+#: src/mainwindow.c:474
 msgid "/_File/_Mailbox/Check for new messages in _all mailboxes"
 msgstr "/_File/_Casella postale/Controllo nuovi _messaggi in tutte le cartelle"
 
-#: src/mainwindow.c:486
+#: src/mainwindow.c:477
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "/_File/_Casella postale/R_icostruisci l'albero cartella"
 
-#: src/mainwindow.c:489
+#: src/mainwindow.c:480
 msgid "/_File/_Import mbox file..."
 msgstr "/_File/_Importa file mbox..."
 
-#: src/mainwindow.c:490
+#: src/mainwindow.c:481
 msgid "/_File/_Export to mbox file..."
 msgstr "/_File/Esp_orta file mbox..."
 
-#: src/mainwindow.c:492
+#: src/mainwindow.c:483
 msgid "/_File/Empty all _trash"
 msgstr "/_File/S_vuota cestino"
 
-#: src/mainwindow.c:494 src/messageview.c:138
+#: src/mainwindow.c:485 src/messageview.c:138
 msgid "/_File/_Save as..."
 msgstr "/_File/Sa_lva come..."
 
-#: src/mainwindow.c:495 src/messageview.c:139
+#: src/mainwindow.c:486 src/messageview.c:139
 msgid "/_File/_Print..."
 msgstr "/_File/Stam_pa..."
 
-#: src/mainwindow.c:497
+#: src/mainwindow.c:488
 msgid "/_File/_Work offline"
 msgstr "/_File/Lavora offli_ne"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:500
+#: src/mainwindow.c:491
 msgid "/_File/E_xit"
 msgstr "/_File/_Esci"
 
-#: src/mainwindow.c:505
+#: src/mainwindow.c:496
 msgid "/_Edit/Select _thread"
 msgstr "/_Modifica/Seleziona t_hread"
 
-#: src/mainwindow.c:507 src/messageview.c:147
+#: src/mainwindow.c:498 src/messageview.c:147
 msgid "/_Edit/_Find in current message..."
 msgstr "/_Modifica/_Trova nel messaggio attuale..."
 
-#: src/mainwindow.c:509
+#: src/mainwindow.c:500
 msgid "/_Edit/_Search messages..."
 msgstr "/_Modifica/Ricerca _messaggi..."
 
-#: src/mainwindow.c:512
+#: src/mainwindow.c:503
 msgid "/_View/Show or hi_de"
 msgstr "/_Visualizza/Mostra o _nascondi"
 
-#: src/mainwindow.c:513
+#: src/mainwindow.c:504
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/_Visualizza/Mostra o _nascondi/A_lbero cartella"
 
-#: src/mainwindow.c:515
+#: src/mainwindow.c:506
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/_Visualizza/Mostra o _nascondi/Vista _messaggio"
 
-#: src/mainwindow.c:517
+#: src/mainwindow.c:508
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/_Visualizza/Mostra o _nascondi/Barra degli _strumenti"
 
-#: src/mainwindow.c:519
+#: src/mainwindow.c:510
 msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/_Visualizza/Mostra o _nascondi/Barra degli _strumenti/Icone _e testo"
 
-#: src/mainwindow.c:521
+#: src/mainwindow.c:512
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/_Visualizza/Mostra o _nascondi/Barra degli _strumenti/I_cone"
 
-#: src/mainwindow.c:523
+#: src/mainwindow.c:514
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/_Visualizza/Mostra o _nascondi/Barra degli _strumenti/_Testo"
 
-#: src/mainwindow.c:525
+#: src/mainwindow.c:516
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/_Visualizza/Mostra o _nascondi/Barra degli _strumenti/_Niente"
 
-#: src/mainwindow.c:527
+#: src/mainwindow.c:518
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/_Visualizza/Mostra o _nascondi/Barra di s_tato"
 
-#: src/mainwindow.c:530
+#: src/mainwindow.c:521
 msgid "/_View/Separate f_older tree"
 msgstr "/_Visualizza/Albero _cartella separato"
 
-#: src/mainwindow.c:531
+#: src/mainwindow.c:522
 msgid "/_View/Separate _message view"
 msgstr "/_Visualizza/Vista m_essaggio separata"
 
-#: src/mainwindow.c:533
+#: src/mainwindow.c:524
 msgid "/_View/_Sort"
 msgstr "/_Visualizza/_Ordina"
 
-#: src/mainwindow.c:534
+#: src/mainwindow.c:525
 msgid "/_View/_Sort/by _number"
 msgstr "/_Visualizza/_Ordina/per n_umero"
 
-#: src/mainwindow.c:535
+#: src/mainwindow.c:526
 msgid "/_View/_Sort/by s_ize"
 msgstr "/_Visualizza/_Ordina/per dim_ensione"
 
-#: src/mainwindow.c:536
+#: src/mainwindow.c:527
 msgid "/_View/_Sort/by _date"
 msgstr "/_Visualizza/_Ordina/per _data"
 
-#: src/mainwindow.c:537
+#: src/mainwindow.c:528
 msgid "/_View/_Sort/by _from"
 msgstr "/_Visualizza/_Ordina/per _mittente"
 
-#: src/mainwindow.c:538
+#: src/mainwindow.c:529
 msgid "/_View/_Sort/by _recipient"
 msgstr "/_Visualizza/_Ordina/per dest_inatario"
 
-#: src/mainwindow.c:539
+#: src/mainwindow.c:530
 msgid "/_View/_Sort/by _subject"
 msgstr "/_Visualizza/_Ordina/per _oggetto"
 
-#: src/mainwindow.c:540
+#: src/mainwindow.c:531
 msgid "/_View/_Sort/by _color label"
 msgstr "/_Visualizza/_Ordina/per colore etic_hetta"
 
-#: src/mainwindow.c:542
+#: src/mainwindow.c:533
 msgid "/_View/_Sort/by _mark"
 msgstr "/_Visualizza/_Ordina/per _segno"
 
-#: src/mainwindow.c:543
+#: src/mainwindow.c:534
 msgid "/_View/_Sort/by _unread"
 msgstr "/_Visualizza/_Ordina/per non le_tti"
 
-#: src/mainwindow.c:544
+#: src/mainwindow.c:535
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/_Visualizza/_Ordina/per a_llegato"
 
-#: src/mainwindow.c:546
+#: src/mainwindow.c:537
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/_Visualizza/_Ordina/No_n ordinare"
 
-#: src/mainwindow.c:547 src/mainwindow.c:550
+#: src/mainwindow.c:538 src/mainwindow.c:541
 msgid "/_View/_Sort/---"
 msgstr "/_Visualizza/_Ordina/---"
 
-#: src/mainwindow.c:548
+#: src/mainwindow.c:539
 msgid "/_View/_Sort/Ascending"
 msgstr "/_Visualizza/_Ordina/_Ascendente"
 
-#: src/mainwindow.c:549
+#: src/mainwindow.c:540
 msgid "/_View/_Sort/Descending"
 msgstr "/_Visualizza/_Ordina/Dis_cendente"
 
-#: src/mainwindow.c:551
+#: src/mainwindow.c:542
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/_Visualizza/_Ordina/_Raggruppa per oggetto"
 
-#: src/mainwindow.c:553
+#: src/mainwindow.c:544
 msgid "/_View/Th_read view"
 msgstr "/_Visualizza/Vista _thread"
 
-#: src/mainwindow.c:554
+#: src/mainwindow.c:545
 msgid "/_View/E_xpand all threads"
 msgstr "/_Visualizza/E_spandi tutti i thread"
 
-#: src/mainwindow.c:555
+#: src/mainwindow.c:546
 msgid "/_View/Co_llapse all threads"
 msgstr "/_Visualizza/Nascondi tutti i t_hread"
 
-#: src/mainwindow.c:556
+#: src/mainwindow.c:547
 msgid "/_View/Set display _item..."
 msgstr "/_Visualizza/I_mposta voci da visualizzare..."
 
-#: src/mainwindow.c:559
+#: src/mainwindow.c:550
 msgid "/_View/_Go to"
 msgstr "/_Visualizza/V_ai a"
 
-#: src/mainwindow.c:560
+#: src/mainwindow.c:551
 msgid "/_View/_Go to/_Prev message"
 msgstr "/_Visualizza/V_ai a/Messaggio preced_ente"
 
-#: src/mainwindow.c:561
+#: src/mainwindow.c:552
 msgid "/_View/_Go to/_Next message"
 msgstr "/_Visualizza/V_ai a/Messaggio successi_vo"
 
-#: src/mainwindow.c:562 src/mainwindow.c:567 src/mainwindow.c:570
-#: src/mainwindow.c:575 src/mainwindow.c:580
+#: src/mainwindow.c:553 src/mainwindow.c:558 src/mainwindow.c:561
+#: src/mainwindow.c:566 src/mainwindow.c:571
 msgid "/_View/_Go to/---"
 msgstr "/_Visualizza/V_ai a/---"
 
-#: src/mainwindow.c:563
+#: src/mainwindow.c:554
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/_Visualizza/V_ai a/Messaggio non letto p_recedente"
 
-#: src/mainwindow.c:565
+#: src/mainwindow.c:556
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/_Visualizza/V_ai a/Messaggio non _letto successivo"
 
-#: src/mainwindow.c:568
+#: src/mainwindow.c:559
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/_Visualizza/V_ai a/Messaggio nuovo pre_cedente"
 
-#: src/mainwindow.c:569
+#: src/mainwindow.c:560
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/_Visualizza/V_ai a/Messaggio nu_ovo successivo"
 
-#: src/mainwindow.c:571
+#: src/mainwindow.c:562
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/_Visualizza/V_ai a/Messaggio _segnato precedente"
 
-#: src/mainwindow.c:573
+#: src/mainwindow.c:564
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/_Visualizza/V_ai a/Messaggio se_gnato successivo"
 
-#: src/mainwindow.c:576
+#: src/mainwindow.c:567
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/_Visualizza/V_ai a/Messaggio etic_hettato precedente"
 
-#: src/mainwindow.c:578
+#: src/mainwindow.c:569
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/_Visualizza/V_ai a/Messaggio e_tichettato successivo"
 
-#: src/mainwindow.c:581
+#: src/mainwindow.c:572
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Visualizza/V_ai a/Cartella di_fferente..."
 
-#: src/mainwindow.c:590 src/messageview.c:158
+#: src/mainwindow.c:581 src/messageview.c:158
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Visualizza/Co_difica caratteri/_Autorilevamento"
 
-#: src/mainwindow.c:641 src/messageview.c:202
+#: src/mainwindow.c:632 src/messageview.c:202
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Visualizza/Co_difica caratteri/Gia_pponese (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:643 src/messageview.c:204
+#: src/mainwindow.c:634 src/messageview.c:204
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Visualizza/Co_difica caratteri/Giapponese (_EUC-JP)"
 
-#: src/mainwindow.c:645 src/messageview.c:206
+#: src/mainwindow.c:636 src/messageview.c:206
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Visualizza/Co_difica caratteri/Giapponese (S_hift__JIS)"
 
-#: src/mainwindow.c:657 src/messageview.c:217
+#: src/mainwindow.c:648 src/messageview.c:217
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Visualizza/Co_difica caratteri/Cinese (ISO-2022-_CN)"
 
-#: src/mainwindow.c:663 src/messageview.c:222
+#: src/mainwindow.c:654 src/messageview.c:222
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Visualizza/Co_difica caratteri/Corea_no (ISO-2022-KR)"
 
-#: src/mainwindow.c:676 src/summaryview.c:401
+#: src/mainwindow.c:667 src/summaryview.c:401
 msgid "/_View/Open in new _window"
 msgstr "/_Visualizza/Apri nuova _finestra"
 
-#: src/mainwindow.c:677 src/messageview.c:234
+#: src/mainwindow.c:668 src/messageview.c:234
 msgid "/_View/Mess_age source"
 msgstr "/_Visualizza/Sorgente messagg_io"
 
-#: src/mainwindow.c:678 src/messageview.c:235
+#: src/mainwindow.c:669 src/messageview.c:235
 msgid "/_View/Show all _header"
 msgstr "/_Visualizza/Mostra intesta_zioni"
 
-#: src/mainwindow.c:680
+#: src/mainwindow.c:671
 msgid "/_View/_Update summary"
 msgstr "/_Visualizza/A_ggiorna sommario"
 
-#: src/mainwindow.c:682 src/messageview.c:237
+#: src/mainwindow.c:673 src/messageview.c:237
 msgid "/_Message"
 msgstr "/M_essaggio"
 
-#: src/mainwindow.c:683
+#: src/mainwindow.c:674
 msgid "/_Message/Recei_ve"
 msgstr "/M_essaggio/Rice_vi"
 
-#: src/mainwindow.c:684
+#: src/mainwindow.c:675
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/M_essaggio/Rice_vi/Ricevi dall'a_ccount attuale"
 
-#: src/mainwindow.c:686
+#: src/mainwindow.c:677
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/M_essaggio/Rice_vi/Ricevi da _tutti gli account"
 
-#: src/mainwindow.c:688
+#: src/mainwindow.c:679
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/M_essaggio/Rice_vi/Cancella in rice_zione"
 
-#: src/mainwindow.c:690
+#: src/mainwindow.c:681
 msgid "/_Message/Recei_ve/---"
 msgstr "/M_essaggio/Rice_vi/---"
 
-#: src/mainwindow.c:691
+#: src/mainwindow.c:682
 msgid "/_Message/_Send queued messages"
 msgstr "/M_essaggio/Invia messa_ggi accodati"
 
-#: src/mainwindow.c:692 src/mainwindow.c:694 src/mainwindow.c:701
-#: src/mainwindow.c:706 src/mainwindow.c:710 src/mainwindow.c:719
-#: src/mainwindow.c:722 src/messageview.c:240 src/messageview.c:248
+#: src/mainwindow.c:683 src/mainwindow.c:685 src/mainwindow.c:692
+#: src/mainwindow.c:697 src/mainwindow.c:701 src/mainwindow.c:710
+#: src/mainwindow.c:713 src/messageview.c:240 src/messageview.c:248
 #: src/messageview.c:253
 msgid "/_Message/---"
 msgstr "/M_essaggio/---"
 
-#: src/mainwindow.c:693 src/messageview.c:238
+#: src/mainwindow.c:684 src/messageview.c:238
 msgid "/_Message/Compose _new message"
 msgstr "/M_essaggio/Componi _nuovo messaggio"
 
-#: src/mainwindow.c:695 src/messageview.c:241
+#: src/mainwindow.c:686 src/messageview.c:241
 msgid "/_Message/_Reply"
 msgstr "/M_essaggio/_Rispondi"
 
-#: src/mainwindow.c:696
+#: src/mainwindow.c:687
 msgid "/_Message/Repl_y to"
 msgstr "/M_essaggio/Rispondi _a"
 
-#: src/mainwindow.c:697 src/messageview.c:242
+#: src/mainwindow.c:688 src/messageview.c:242
 msgid "/_Message/Repl_y to/_all"
 msgstr "/M_essaggio/Rispondi _a/_tutti"
 
-#: src/mainwindow.c:698 src/messageview.c:244
+#: src/mainwindow.c:689 src/messageview.c:244
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/M_essaggio/Rispondi _a/_mittente"
 
-#: src/mainwindow.c:699 src/messageview.c:246
+#: src/mainwindow.c:690 src/messageview.c:246
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/M_essaggio/Rispondi _a/mailing _list"
 
-#: src/mainwindow.c:702 src/messageview.c:249
+#: src/mainwindow.c:693 src/messageview.c:249
 msgid "/_Message/_Forward"
 msgstr "/M_essaggio/_Inoltra"
 
-#: src/mainwindow.c:703 src/messageview.c:250
+#: src/mainwindow.c:694 src/messageview.c:250
 msgid "/_Message/For_ward as attachment"
 msgstr "/M_essaggio/Inoltra come a_llegato"
 
-#: src/mainwindow.c:705 src/messageview.c:252
+#: src/mainwindow.c:696 src/messageview.c:252
 msgid "/_Message/Redirec_t"
 msgstr "/M_essaggio/Rispe_disci"
 
-#: src/mainwindow.c:707
+#: src/mainwindow.c:698
 msgid "/_Message/M_ove..."
 msgstr "/M_essaggio/Sp_osta..."
 
-#: src/mainwindow.c:708
+#: src/mainwindow.c:699
 msgid "/_Message/_Copy..."
 msgstr "M_essaggio/_Copia..."
 
-#: src/mainwindow.c:709
+#: src/mainwindow.c:700
 msgid "/_Message/_Delete"
 msgstr "/M_essaggio/Eli_mina"
 
-#: src/mainwindow.c:711
+#: src/mainwindow.c:702
 msgid "/_Message/_Mark"
 msgstr "/M_essaggio/_Segna"
 
-#: src/mainwindow.c:712
+#: src/mainwindow.c:703
 msgid "/_Message/_Mark/_Mark"
 msgstr "/M_essaggio/_Segna/Segn_a"
 
-#: src/mainwindow.c:713
+#: src/mainwindow.c:704
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/M_essaggio/_Segna/To_gli segno"
 
-#: src/mainwindow.c:714
+#: src/mainwindow.c:705
 msgid "/_Message/_Mark/---"
 msgstr "/M_essaggio/_Segna/---"
 
-#: src/mainwindow.c:715
+#: src/mainwindow.c:706
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/M_essaggio/_Segna/Segna co_me non letto"
 
-#: src/mainwindow.c:716
+#: src/mainwindow.c:707
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/M_essaggio/_Segna/Segna come _letto"
 
-#: src/mainwindow.c:718
+#: src/mainwindow.c:709
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/M_essaggio/_Segna/Segna come tutti l_etti"
 
-#: src/mainwindow.c:720
+#: src/mainwindow.c:711
 msgid "/_Message/Set as _junk mail"
 msgstr "/M_essaggio/Imposta come mail spa_zzatura"
 
-#: src/mainwindow.c:721
+#: src/mainwindow.c:712
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/_Messaggio/Im_posta come mail normale"
 
-#: src/mainwindow.c:723 src/messageview.c:254
+#: src/mainwindow.c:714 src/messageview.c:254
 msgid "/_Message/Re-_edit"
 msgstr "/M_essaggio/Rimodi_fica"
 
-#: src/mainwindow.c:727
+#: src/mainwindow.c:718
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/S_trumenti/Aggiungi mittente alla ru_brica..."
 
-#: src/mainwindow.c:730
+#: src/mainwindow.c:721
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/S_trumenti/_Filtra tutti i messaggi nella cartella"
 
-#: src/mainwindow.c:732
+#: src/mainwindow.c:723
 msgid "/_Tools/Filter _selected messages"
 msgstr "/S_trumenti/Filtra i messaggi _selezionati"
 
-#: src/mainwindow.c:734 src/messageview.c:261
+#: src/mainwindow.c:725 src/messageview.c:261
 msgid "/_Tools/_Create filter rule"
 msgstr "/S_trumenti/_Crea regola per il filtro"
 
-#: src/mainwindow.c:735 src/messageview.c:263
+#: src/mainwindow.c:726 src/messageview.c:263
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/S_trumenti/_Crea regola per il filtro/A_utomaticamente"
 
-#: src/mainwindow.c:737 src/messageview.c:265
+#: src/mainwindow.c:728 src/messageview.c:265
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/S_trumenti/_Crea regola per il filtro/con _Da"
 
-#: src/mainwindow.c:739 src/messageview.c:267
+#: src/mainwindow.c:730 src/messageview.c:267
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/S_trumenti/_Crea regola per il filtro/con _A"
 
-#: src/mainwindow.c:741 src/messageview.c:269
+#: src/mainwindow.c:732 src/messageview.c:269
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/S_trumenti/_Crea regola per il filtro/con l'_Oggetto"
 
-#: src/mainwindow.c:744
+#: src/mainwindow.c:735
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/S_trumenti/Filtra le mail s_pazzatura nella cartella"
 
-#: src/mainwindow.c:746
+#: src/mainwindow.c:737
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/S_trumenti/Filtra le _mail spazzatura nei messaggi selezionati"
 
-#: src/mainwindow.c:751
+#: src/mainwindow.c:742
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/S_trumenti/Elimina messaggi _duplicati"
 
-#: src/mainwindow.c:754
+#: src/mainwindow.c:745
 msgid "/_Tools/E_xecute"
 msgstr "/S_trumenti/Ese_gui"
 
-#: src/mainwindow.c:756
+#: src/mainwindow.c:747
 msgid "/_Tools/_Log window"
 msgstr "/S_trumenti/Finestra di _log"
 
-#: src/mainwindow.c:758
+#: src/mainwindow.c:749
 msgid "/_Configuration"
 msgstr "/_Configurazione"
 
-#: src/mainwindow.c:759
+#: src/mainwindow.c:750
 msgid "/_Configuration/_Common preferences..."
 msgstr "/_Configurazione/Preferenze _comuni..."
 
-#: src/mainwindow.c:761
+#: src/mainwindow.c:752
 msgid "/_Configuration/_Filter setting..."
 msgstr "/_Configurazione/Configurazione _filtri..."
 
-#: src/mainwindow.c:763
+#: src/mainwindow.c:754
 msgid "/_Configuration/_Template..."
 msgstr "/_Configurazione/Mo_dello..."
 
-#: src/mainwindow.c:764
+#: src/mainwindow.c:755
 msgid "/_Configuration/_Actions..."
 msgstr "/_Configurazione/_Azioni..."
 
-#: src/mainwindow.c:765
+#: src/mainwindow.c:756
 msgid "/_Configuration/---"
 msgstr "/_Configurazione/---"
 
-#: src/mainwindow.c:766
+#: src/mainwindow.c:757
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Configurazione/_Preferenze per l'account attuale..."
 
-#: src/mainwindow.c:768
+#: src/mainwindow.c:759
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Configurazione/Crea _nuovo account..."
 
-#: src/mainwindow.c:770
+#: src/mainwindow.c:761
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Configurazione/_Modifica account..."
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:763
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Configurazione/Cam_bia account attuale"
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:767
 msgid "/_Help/_Manual"
 msgstr "/A_iuto/_Manuale"
 
-#: src/mainwindow.c:777
+#: src/mainwindow.c:768
 msgid "/_Help/_Manual/_English"
 msgstr "/A_iuto/_Manuale/Ingl_ese"
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:769
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/A_iuto/_Manuale/_Giapponese"
 
-#: src/mainwindow.c:779
+#: src/mainwindow.c:770
 msgid "/_Help/_FAQ"
 msgstr "/A_iuto/_FAQ"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:771
 msgid "/_Help/_FAQ/_English"
 msgstr "/A_iuto/_FAQ/Ingl_ese"
 
-#: src/mainwindow.c:781
+#: src/mainwindow.c:772
 msgid "/_Help/_FAQ/_German"
 msgstr "/A_iuto/_FAQ/_Tedesco"
 
-#: src/mainwindow.c:782
+#: src/mainwindow.c:773
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/A_iuto/_FAQ/_Spagnolo"
 
-#: src/mainwindow.c:783
+#: src/mainwindow.c:774
 msgid "/_Help/_FAQ/_French"
 msgstr "/A_iuto/_FAQ/_Francese"
 
-#: src/mainwindow.c:784
+#: src/mainwindow.c:775
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/A_iuto/_FAQ/_Italiano"
 
-#: src/mainwindow.c:785
+#: src/mainwindow.c:776
 msgid "/_Help/---"
 msgstr "/A_iuto/---"
 
-#: src/mainwindow.c:825
+#: src/mainwindow.c:816
 msgid "Creating main window...\n"
 msgstr "Creazione della finestra principale...\n"
 
-#: src/mainwindow.c:987
+#: src/mainwindow.c:973
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "FinestraPrincipale: l'allocazione del colore %d è fallita.\n"
 
-#: src/mainwindow.c:1071 src/summaryview.c:2020 src/summaryview.c:2105
+#: src/mainwindow.c:1057 src/summaryview.c:2020 src/summaryview.c:2105
 #: src/summaryview.c:3342 src/summaryview.c:3415 src/summaryview.c:3728
 msgid "done.\n"
 msgstr "fatto.\n"
 
-#: src/mainwindow.c:1196 src/mainwindow.c:1237 src/mainwindow.c:1265
+#: src/mainwindow.c:1182 src/mainwindow.c:1223 src/mainwindow.c:1251
 msgid "Untitled"
 msgstr "Senza titolo"
 
-#: src/mainwindow.c:1266
+#: src/mainwindow.c:1252
 msgid "none"
 msgstr "niente"
 
-#: src/mainwindow.c:1316
+#: src/mainwindow.c:1302
 #, 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:1536
+#: src/mainwindow.c:1522
 msgid "Offline"
 msgstr "Offline"
 
-#: src/mainwindow.c:1537
+#: src/mainwindow.c:1523
 msgid "You are offline. Go online?"
 msgstr "Siete offline. Andare online?"
 
-#: src/mainwindow.c:1551
+#: src/mainwindow.c:1537
 msgid "Empty all trash"
 msgstr "Svuota cestino"
 
-#: src/mainwindow.c:1552
+#: src/mainwindow.c:1538
 msgid "Empty messages in all trash?"
 msgstr "Svuotare tutti i messaggi nel cestino?"
 
-#: src/mainwindow.c:1580
+#: src/mainwindow.c:1566
 msgid "Add mailbox"
 msgstr "Aggiunta di una casella postale"
 
-#: src/mainwindow.c:1581
+#: src/mainwindow.c:1567
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3150,16 +3150,16 @@ msgstr ""
 "Se è specificata una casella postale esistente, sarà\n"
 "esaminata automaticamente."
 
-#: src/mainwindow.c:1587
+#: src/mainwindow.c:1573
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "La casella postale «%s» esiste già."
 
-#: src/mainwindow.c:1592 src/setup.c:57
+#: src/mainwindow.c:1578 src/setup.c:57
 msgid "Mailbox"
 msgstr "Casella postale"
 
-#: src/mainwindow.c:1598 src/setup.c:63
+#: src/mainwindow.c:1584 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3169,149 +3169,149 @@ msgstr ""
 "Può darsi che esistano già alcuni file, oppure non si ha il permesso di "
 "scrittura."
 
-#: src/mainwindow.c:1989
+#: src/mainwindow.c:1975
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Vista cartella"
 
-#: src/mainwindow.c:2009 src/messageview.c:368
+#: src/mainwindow.c:1995 src/messageview.c:368
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Vista messaggio"
 
-#: src/mainwindow.c:2156 src/summaryview.c:370
+#: src/mainwindow.c:2142 src/summaryview.c:370
 msgid "/_Reply"
 msgstr "/_Rispondi"
 
-#: src/mainwindow.c:2157
+#: src/mainwindow.c:2143
 msgid "/Reply to _all"
 msgstr "/Rispondi a _tutti"
 
-#: src/mainwindow.c:2158
+#: src/mainwindow.c:2144
 msgid "/Reply to _sender"
 msgstr "/Rispondi _al mittente"
 
-#: src/mainwindow.c:2159
+#: src/mainwindow.c:2145
 msgid "/Reply to mailing _list"
 msgstr "/Rispondi alla mailing _list"
 
-#: src/mainwindow.c:2164 src/summaryview.c:377
+#: src/mainwindow.c:2150 src/summaryview.c:377
 msgid "/_Forward"
 msgstr "/_Inoltra"
 
-#: src/mainwindow.c:2165 src/summaryview.c:378
+#: src/mainwindow.c:2151 src/summaryview.c:378
 msgid "/For_ward as attachment"
 msgstr "/Inoltra com_e allegato"
 
-#: src/mainwindow.c:2166 src/summaryview.c:379
+#: src/mainwindow.c:2152 src/summaryview.c:379
 msgid "/Redirec_t"
 msgstr "/Rispe_disci"
 
-#: src/mainwindow.c:2205
+#: src/mainwindow.c:2188
 msgid "Get"
 msgstr "Ricevi"
 
-#: src/mainwindow.c:2206
+#: src/mainwindow.c:2189
 msgid "Incorporate new mail"
 msgstr "Include la nuova posta"
 
-#: src/mainwindow.c:2213
+#: src/mainwindow.c:2196
 msgid "Get all"
 msgstr "Ricevi tutti"
 
-#: src/mainwindow.c:2214
+#: src/mainwindow.c:2197
 msgid "Incorporate new mail of all accounts"
 msgstr "Include la nuova posta di tutti gli account"
 
-#: src/mainwindow.c:2225
+#: src/mainwindow.c:2208
 msgid "Send queued message(s)"
 msgstr "Invia i messaggi accodati"
 
-#: src/mainwindow.c:2235 src/prefs_account.c:721 src/prefs_common.c:949
+#: src/mainwindow.c:2218 src/prefs_account.c:721 src/prefs_common.c:949
 #: src/prefs_folder_item.c:137
 msgid "Compose"
 msgstr "Componi"
 
-#: src/mainwindow.c:2236
+#: src/mainwindow.c:2219
 msgid "Compose new message"
 msgstr "Compone un nuovo messaggio"
 
-#: src/mainwindow.c:2244 src/prefs_common.c:1448
+#: src/mainwindow.c:2227 src/prefs_common.c:1448
 msgid "Reply"
 msgstr "Rispondi"
 
-#: src/mainwindow.c:2245 src/mainwindow.c:2258
+#: src/mainwindow.c:2228 src/mainwindow.c:2241
 msgid "Reply to the message"
 msgstr "Risponde al messaggio"
 
-#: src/mainwindow.c:2263
+#: src/mainwindow.c:2245
 msgid "Reply all"
 msgstr "Rispondi tutti"
 
-#: src/mainwindow.c:2264
+#: src/mainwindow.c:2246
 msgid "Reply to all"
 msgstr "Risponde a tutti"
 
-#: src/mainwindow.c:2272 src/prefs_filter_edit.c:741
+#: src/mainwindow.c:2254 src/prefs_filter_edit.c:741
 msgid "Forward"
 msgstr "Inoltra"
 
-#: src/mainwindow.c:2273 src/mainwindow.c:2286
+#: src/mainwindow.c:2255 src/mainwindow.c:2268
 msgid "Forward the message"
 msgstr "Inoltra il messaggio"
 
-#: src/mainwindow.c:2293
+#: src/mainwindow.c:2275
 msgid "Delete the message"
 msgstr "Elimina il messaggio"
 
-#: src/mainwindow.c:2301 src/prefs_common.c:1988
+#: src/mainwindow.c:2283 src/prefs_common.c:1988
 msgid "Junk"
 msgstr "Spazzatura"
 
-#: src/mainwindow.c:2302
+#: src/mainwindow.c:2284
 msgid "Set as junk mail"
 msgstr "Imposta come mail spazzatura"
 
-#: src/mainwindow.c:2311
+#: src/mainwindow.c:2293
 msgid "Execute"
 msgstr "Esegui"
 
-#: src/mainwindow.c:2312
+#: src/mainwindow.c:2294
 msgid "Execute marked process"
 msgstr "Esegue le operazioni segnate"
 
-#: src/mainwindow.c:2322
+#: src/mainwindow.c:2304
 msgid "Next unread message"
 msgstr "Successivo messaggio non letto"
 
-#: src/mainwindow.c:2334
+#: src/mainwindow.c:2316
 msgid "Prefs"
 msgstr "Preferenze"
 
-#: src/mainwindow.c:2335
+#: src/mainwindow.c:2317
 msgid "Common preferences"
 msgstr "Preferenze comuni"
 
-#: src/mainwindow.c:2343 src/prefs_folder_item.c:261
+#: src/mainwindow.c:2325 src/prefs_folder_item.c:261
 #: src/prefs_folder_item.c:272 src/progressdialog.c:128
 msgid "Account"
 msgstr "Account"
 
-#: src/mainwindow.c:2344
+#: src/mainwindow.c:2326
 msgid "Account setting"
 msgstr "Impostazione dell'account"
 
-#: src/mainwindow.c:2527
+#: src/mainwindow.c:2498
 msgid "You are offline. Click the icon to go online."
 msgstr "Siete offline. Fare click sull'icona per andare online."
 
-#: src/mainwindow.c:2538
+#: src/mainwindow.c:2509
 msgid "You are online. Click the icon to go offline."
 msgstr "Siete online. Fare click sull'icona per andare offline."
 
-#: src/mainwindow.c:2731
+#: src/mainwindow.c:2702
 msgid "Exit"
 msgstr "Esci"
 
-#: src/mainwindow.c:2731
+#: src/mainwindow.c:2702
 msgid "Exit this program?"
 msgstr "Uscire da questo programma?"
 
@@ -5513,11 +5513,11 @@ msgstr "Creazione della finestra di avanzamento...\n"
 msgid "Status"
 msgstr "Stato"
 
-#: src/recv.c:113
+#: src/recv.c:112
 msgid "error occurred while retrieving data.\n"
 msgstr "si è verificato un errore durante il recupero dei dati.\n"
 
-#: src/recv.c:155 src/recv.c:197 src/recv.c:213
+#: src/recv.c:154 src/recv.c:196 src/recv.c:211
 msgid "Can't write to file.\n"
 msgstr "Impossibile scrivere sul file.\n"
 
@@ -6252,7 +6252,7 @@ msgstr "%.2fMB"
 msgid "%.2fGB"
 msgstr "%.2fGB"
 
-#: src/utils.c:2372 src/utils.c:2496
+#: src/utils.c:2386 src/utils.c:2510
 #, c-format
 msgid "writing to %s failed.\n"
 msgstr "la scrittura su %s è fallita.\n"
diff --git a/po/ja.po b/po/ja.po
index d4ada353..9ec558ff 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-08-09 18:08+0900\n"
+"POT-Creation-Date: 2005-08-22 17:22+0900\n"
 "PO-Revision-Date: 1999-10-12\n"
 "Last-Translator: Hiroyuki Yamamoto <hiro-y@kcn.ne.jp>\n"
 "Language-Team: Japanese <ja@li.org>\n"
@@ -97,7 +97,7 @@ msgstr ""
 "の取得を有効にするには、「G」カラムのボックスをチェックしてください。"
 
 #: src/account.c:691 src/addressadd.c:192 src/addressbook.c:490
-#: src/compose.c:4081 src/editaddress.c:200 src/editaddress.c:942
+#: src/compose.c:4079 src/editaddress.c:200 src/editaddress.c:942
 #: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:265
 #: src/editjpilot.c:271 src/editldap.c:307 src/editvcard.c:184
 #: src/mimeview.c:201 src/prefs_filter.c:258 src/prefs_folder_item.c:170
@@ -233,7 +233,7 @@ msgstr "アクションのユーザ引数"
 msgid "Add Address to Book"
 msgstr "アドレスをアドレス帳に追加"
 
-#: src/addressadd.c:202 src/compose.c:4528 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4521 src/editaddress.c:201
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "アドレス"
@@ -247,7 +247,7 @@ msgstr "備考"
 msgid "Select Address Book Folder"
 msgstr "アドレス帳フォルダを選択"
 
-#: src/addressbook.c:336 src/compose.c:495 src/mainwindow.c:470
+#: src/addressbook.c:336 src/compose.c:493 src/mainwindow.c:461
 #: src/messageview.c:137
 msgid "/_File"
 msgstr "/ファイル(_F)"
@@ -268,10 +268,10 @@ msgstr "/ファイル(_F)/新規_JPilot"
 msgid "/_File/New _Server"
 msgstr "/ファイル(_F)/新規サーバ(_S)"
 
-#: src/addressbook.c:345 src/addressbook.c:348 src/compose.c:500
-#: src/compose.c:505 src/compose.c:509 src/mainwindow.c:488
-#: src/mainwindow.c:491 src/mainwindow.c:493 src/mainwindow.c:496
-#: src/mainwindow.c:498 src/messageview.c:140
+#: src/addressbook.c:345 src/addressbook.c:348 src/compose.c:498
+#: src/compose.c:503 src/compose.c:507 src/mainwindow.c:479
+#: src/mainwindow.c:482 src/mainwindow.c:484 src/mainwindow.c:487
+#: src/mainwindow.c:489 src/messageview.c:140
 msgid "/_File/---"
 msgstr "/ファイル(_F)/---"
 
@@ -287,7 +287,7 @@ msgstr "/ファイル(_F)/削除(_D)"
 msgid "/_File/_Save"
 msgstr "/ファイル(_F)/保存(_S)"
 
-#: src/addressbook.c:350 src/compose.c:510 src/messageview.c:141
+#: src/addressbook.c:350 src/compose.c:508 src/messageview.c:141
 msgid "/_File/_Close"
 msgstr "/ファイル(_F)/閉じる(_C)"
 
@@ -319,7 +319,7 @@ msgstr "/アドレス(_A)/編集(_E)"
 msgid "/_Address/_Delete"
 msgstr "/アドレス(_A)/削除(_D)"
 
-#: src/addressbook.c:358 src/compose.c:619 src/mainwindow.c:725
+#: src/addressbook.c:358 src/compose.c:617 src/mainwindow.c:716
 #: src/messageview.c:256
 msgid "/_Tools"
 msgstr "/ツール(_T)"
@@ -328,12 +328,12 @@ msgstr "/ツール(_T)"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/ツール(_T)/_LDIFファイルをインポート"
 
-#: src/addressbook.c:360 src/compose.c:632 src/mainwindow.c:775
+#: src/addressbook.c:360 src/compose.c:630 src/mainwindow.c:766
 #: src/messageview.c:274
 msgid "/_Help"
 msgstr "/ヘルプ(_H)"
 
-#: src/addressbook.c:361 src/compose.c:633 src/mainwindow.c:786
+#: src/addressbook.c:361 src/compose.c:631 src/mainwindow.c:777
 #: src/messageview.c:275
 msgid "/_Help/_About"
 msgstr "/ヘルプ(_H)/このプログラムについて(_A)"
@@ -350,7 +350,7 @@ msgstr "/新規グループ(_G)"
 msgid "/New _Folder"
 msgstr "/新規フォルダ(_F)"
 
-#: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:489
+#: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:487
 #: src/folderview.c:235 src/folderview.c:237 src/folderview.c:241
 #: src/folderview.c:252 src/folderview.c:254 src/folderview.c:256
 #: src/folderview.c:260 src/folderview.c:270 src/folderview.c:272
@@ -360,8 +360,8 @@ msgstr "/新規フォルダ(_F)"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:512
-#: src/mainwindow.c:502 src/messageview.c:143
+#: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:510
+#: src/mainwindow.c:493 src/messageview.c:143
 msgid "/_Edit"
 msgstr "/編集(_E)"
 
@@ -373,7 +373,7 @@ msgstr "/削除(_D)"
 msgid "E-Mail address"
 msgstr "電子メール アドレス"
 
-#: src/addressbook.c:495 src/compose.c:4529 src/prefs_common.c:2402
+#: src/addressbook.c:495 src/compose.c:4522 src/prefs_common.c:2402
 msgid "Address book"
 msgstr "アドレス帳"
 
@@ -382,8 +382,8 @@ msgid "Name:"
 msgstr "名前:"
 
 #. Buttons
-#: src/addressbook.c:627 src/addressbook.c:1673 src/editaddress.c:884
-#: src/editaddress.c:1017 src/mainwindow.c:2292 src/prefs_actions.c:266
+#: src/addressbook.c:627 src/addressbook.c:1674 src/editaddress.c:884
+#: src/editaddress.c:1017 src/mainwindow.c:2274 src/prefs_actions.c:266
 #: src/prefs_display_header.c:278 src/prefs_display_header.c:333
 #: src/prefs_template.c:231
 msgid "Delete"
@@ -422,7 +422,7 @@ msgstr "アドレスの削除"
 msgid "Really delete the address(es)?"
 msgstr "本当にこのアドレスを削除しますか?"
 
-#: src/addressbook.c:1664
+#: src/addressbook.c:1665
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -431,36 +431,36 @@ msgstr ""
 "`%s' 内のすべてのフォルダとアドレスを削除してもいいですか?\n"
 "フォルダのみを削除する場合、アドレスは親フォルダに移動します。"
 
-#: src/addressbook.c:1667 src/folderview.c:2139
+#: src/addressbook.c:1668 src/folderview.c:2139
 msgid "Delete folder"
 msgstr "フォルダの削除"
 
-#: src/addressbook.c:1667
+#: src/addressbook.c:1668
 msgid "_Folder only"
 msgstr "フォルダのみ(_F)"
 
-#: src/addressbook.c:1667
+#: src/addressbook.c:1668
 msgid "Folder and _addresses"
 msgstr "フォルダとアドレス(_A)"
 
-#: src/addressbook.c:1672
+#: src/addressbook.c:1673
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "本当に `%s' を削除しますか?"
 
-#: src/addressbook.c:2352 src/addressbook.c:2485
+#: src/addressbook.c:2353 src/addressbook.c:2486
 msgid "New user, could not save index file."
 msgstr "新規ユーザ、インデックスファイルを保存できません。"
 
-#: src/addressbook.c:2356 src/addressbook.c:2489
+#: src/addressbook.c:2357 src/addressbook.c:2490
 msgid "New user, could not save address book files."
 msgstr "新規ユーザ、アドレス帳ファイルを保存できません。"
 
-#: src/addressbook.c:2366 src/addressbook.c:2499
+#: src/addressbook.c:2367 src/addressbook.c:2500
 msgid "Old address book converted successfully."
 msgstr "旧形式のアドレス帳は正しく変換されました。"
 
-#: src/addressbook.c:2371
+#: src/addressbook.c:2372
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -468,7 +468,7 @@ msgstr ""
 "旧形式のアドレス帳は変換されました。\n"
 "新規アドレスインデックスファイルに保存できません"
 
-#: src/addressbook.c:2384
+#: src/addressbook.c:2385
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -476,7 +476,7 @@ msgstr ""
 "アドレス帳を変換できません。\n"
 "しかし空の新規アドレス帳ファイルが作成されました。"
 
-#: src/addressbook.c:2390
+#: src/addressbook.c:2391
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -484,7 +484,7 @@ msgstr ""
 "アドレス帳を変換できません。\n"
 "新規アドレス帳ファイルを作成できません。"
 
-#: src/addressbook.c:2395
+#: src/addressbook.c:2396
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -492,89 +492,89 @@ msgstr ""
 "アドレス帳を変換できません。\n"
 "新規アドレス帳ファイルを作成できません。"
 
-#: src/addressbook.c:2402
+#: src/addressbook.c:2403
 msgid "Addressbook conversion error"
 msgstr "アドレス帳の変換エラー"
 
-#: src/addressbook.c:2406
+#: src/addressbook.c:2407
 msgid "Addressbook conversion"
 msgstr "アドレス帳の変換"
 
-#: src/addressbook.c:2441
+#: src/addressbook.c:2442
 msgid "Addressbook Error"
 msgstr "アドレス帳のエラー"
 
-#: src/addressbook.c:2442 src/addressbook.c:2542
+#: src/addressbook.c:2443 src/addressbook.c:2543
 msgid "Could not read address index"
 msgstr "アドレスインデックスを読み込めません"
 
-#: src/addressbook.c:2504
+#: src/addressbook.c:2505
 msgid "Old address book converted, could not save new address index file"
 msgstr ""
 "旧形式のアドレス帳は変換されましたが、新規アドレスインデックスファイルを保存"
 "できません"
 
-#: src/addressbook.c:2518
+#: src/addressbook.c:2519
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr ""
 "アドレス帳を変換できませんでしたが、空の新規アドレス帳ファイルが作成されまし"
 "た。"
 
-#: src/addressbook.c:2524
+#: src/addressbook.c:2525
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr ""
 "アドレス帳を変換できません。新規アドレス帳ファイルを作成できませんでした。"
 
-#: src/addressbook.c:2530
+#: src/addressbook.c:2531
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr ""
 "アドレス帳を変換できません。新規アドレス帳ファイルを作成できませんでした。"
 
-#: src/addressbook.c:2548
+#: src/addressbook.c:2549
 msgid "Addressbook Conversion Error"
 msgstr "アドレス帳変換エラー"
 
-#: src/addressbook.c:2554
+#: src/addressbook.c:2555
 msgid "Addressbook Conversion"
 msgstr "アドレス帳変換"
 
-#: src/addressbook.c:3055 src/prefs_common.c:963
+#: src/addressbook.c:3056 src/prefs_common.c:963
 msgid "Interface"
 msgstr "インタフェース"
 
-#: src/addressbook.c:3071 src/importldif.c:514
+#: src/addressbook.c:3072 src/importldif.c:514
 msgid "Address Book"
 msgstr "アドレス帳"
 
-#: src/addressbook.c:3087
+#: src/addressbook.c:3088
 msgid "Person"
 msgstr "人物"
 
-#: src/addressbook.c:3103
+#: src/addressbook.c:3104
 msgid "EMail Address"
 msgstr "電子メール アドレス"
 
-#: src/addressbook.c:3119
+#: src/addressbook.c:3120
 msgid "Group"
 msgstr "グループ"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3135 src/folderview.c:346 src/prefs_account.c:1866
+#: src/addressbook.c:3136 src/folderview.c:346 src/prefs_account.c:1866
 msgid "Folder"
 msgstr "フォルダ"
 
-#: src/addressbook.c:3151
+#: src/addressbook.c:3152
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3167 src/addressbook.c:3183
+#: src/addressbook.c:3168 src/addressbook.c:3184
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3199
+#: src/addressbook.c:3200
 msgid "LDAP Server"
 msgstr "LDAPサーバ"
 
@@ -586,7 +586,7 @@ msgstr "共有アドレス"
 msgid "Personal address"
 msgstr "個人用アドレス"
 
-#: src/alertpanel.c:138 src/compose.c:5214 src/main.c:515
+#: src/alertpanel.c:138 src/compose.c:5208 src/main.c:515
 msgid "Notice"
 msgstr "注意"
 
@@ -641,347 +641,347 @@ msgstr "茶"
 msgid "None"
 msgstr "なし"
 
-#: src/compose.c:487
+#: src/compose.c:485
 msgid "/_Add..."
 msgstr "/追加(_A)..."
 
-#: src/compose.c:488
+#: src/compose.c:486
 msgid "/_Remove"
 msgstr "/削除(_R)"
 
-#: src/compose.c:490 src/folderview.c:243 src/folderview.c:262
+#: src/compose.c:488 src/folderview.c:243 src/folderview.c:262
 #: src/folderview.c:277
 msgid "/_Properties..."
 msgstr "/プロパティ(_P)..."
 
-#: src/compose.c:496
+#: src/compose.c:494
 msgid "/_File/_Send"
 msgstr "/ファイル(_F)/送信(_S)"
 
-#: src/compose.c:498
+#: src/compose.c:496
 msgid "/_File/Send _later"
 msgstr "/ファイル(_F)/後で送信(_L)"
 
-#: src/compose.c:501
+#: src/compose.c:499
 msgid "/_File/Save to _draft folder"
 msgstr "/ファイル(_F)/草稿フォルダに保存(_D)"
 
-#: src/compose.c:503
+#: src/compose.c:501
 msgid "/_File/Save and _keep editing"
 msgstr "/ファイル(_F)/保存して編集を続ける(_K)"
 
-#: src/compose.c:506
+#: src/compose.c:504
 msgid "/_File/_Attach file"
 msgstr "/ファイル(_F)/ファイルを添付(_A)"
 
-#: src/compose.c:507
+#: src/compose.c:505
 msgid "/_File/_Insert file"
 msgstr "/ファイル(_F)/ファイルを挿入(_I)"
 
-#: src/compose.c:508
+#: src/compose.c:506
 msgid "/_File/Insert si_gnature"
 msgstr "/ファイル(_F)/署名を挿入(_G)"
 
-#: src/compose.c:513
+#: src/compose.c:511
 msgid "/_Edit/_Undo"
 msgstr "/編集(_E)/元に戻す(_U)"
 
-#: src/compose.c:514
+#: src/compose.c:512
 msgid "/_Edit/_Redo"
 msgstr "/編集(_E)/やり直し(_R)"
 
-#: src/compose.c:515 src/compose.c:522 src/mainwindow.c:506
+#: src/compose.c:513 src/compose.c:520 src/mainwindow.c:497
 #: src/messageview.c:146
 msgid "/_Edit/---"
 msgstr "/編集(_E)/---"
 
-#: src/compose.c:516
+#: src/compose.c:514
 msgid "/_Edit/Cu_t"
 msgstr "/編集(_E)/カット(_T)"
 
-#: src/compose.c:517 src/mainwindow.c:503 src/messageview.c:144
+#: src/compose.c:515 src/mainwindow.c:494 src/messageview.c:144
 msgid "/_Edit/_Copy"
 msgstr "/編集(_E)/コピー(_C)"
 
-#: src/compose.c:518
+#: src/compose.c:516
 msgid "/_Edit/_Paste"
 msgstr "/編集(_E)/ペースト(_P)"
 
-#: src/compose.c:519
+#: src/compose.c:517
 msgid "/_Edit/Paste as _quotation"
 msgstr "/編集(_E)/引用としてペースト(_Q)"
 
-#: src/compose.c:521 src/mainwindow.c:504 src/messageview.c:145
+#: src/compose.c:519 src/mainwindow.c:495 src/messageview.c:145
 msgid "/_Edit/Select _all"
 msgstr "/編集(_E)/すべて選択(_A)"
 
-#: src/compose.c:523
+#: src/compose.c:521
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/編集(_E)/現在の段落を整形する(_W)"
 
-#: src/compose.c:525
+#: src/compose.c:523
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/編集(_E)/すべての長い行を折り返す(_L)"
 
-#: src/compose.c:527
+#: src/compose.c:525
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/編集(_E)/自動整形(_O)"
 
-#: src/compose.c:528 src/mainwindow.c:511 src/messageview.c:150
+#: src/compose.c:526 src/mainwindow.c:502 src/messageview.c:150
 #: src/summaryview.c:400
 msgid "/_View"
 msgstr "/表示(_V)"
 
-#: src/compose.c:529
+#: src/compose.c:527
 msgid "/_View/_To"
 msgstr "/表示(_V)/宛先(_T)"
 
-#: src/compose.c:530
+#: src/compose.c:528
 msgid "/_View/_Cc"
 msgstr "/表示(_V)/_Cc"
 
-#: src/compose.c:531
+#: src/compose.c:529
 msgid "/_View/_Bcc"
 msgstr "/表示(_V)/_Bcc"
 
-#: src/compose.c:532
+#: src/compose.c:530
 msgid "/_View/_Reply to"
 msgstr "/表示(_V)/返信先を指定(_R)"
 
-#: src/compose.c:533 src/compose.c:535 src/compose.c:537 src/compose.c:539
-#: src/mainwindow.c:529 src/mainwindow.c:532 src/mainwindow.c:558
-#: src/mainwindow.c:582 src/mainwindow.c:675 src/mainwindow.c:679
+#: src/compose.c:531 src/compose.c:533 src/compose.c:535 src/compose.c:537
+#: src/mainwindow.c:520 src/mainwindow.c:523 src/mainwindow.c:549
+#: src/mainwindow.c:573 src/mainwindow.c:666 src/mainwindow.c:670
 #: src/messageview.c:233
 msgid "/_View/---"
 msgstr "/表示(_V)/---"
 
-#: src/compose.c:534
+#: src/compose.c:532
 msgid "/_View/_Followup to"
 msgstr "/表示(_V)/フォロー先を指定(_F)"
 
-#: src/compose.c:536
+#: src/compose.c:534
 msgid "/_View/R_uler"
 msgstr "/表示(_V)/ルーラ(_U)"
 
-#: src/compose.c:538
+#: src/compose.c:536
 msgid "/_View/_Attachment"
 msgstr "/表示(_V)/添付(_A)"
 
-#: src/compose.c:545 src/mainwindow.c:589 src/messageview.c:157
+#: src/compose.c:543 src/mainwindow.c:580 src/messageview.c:157
 msgid "/_View/Character _encoding"
 msgstr "/表示(_V)/文字エンコーディング(_E)"
 
-#: src/compose.c:546
+#: src/compose.c:544
 msgid "/_View/Character _encoding/_Automatic"
 msgstr "/表示(_V)/文字エンコーディング(_E)/自動(_A)"
 
-#: src/compose.c:548 src/compose.c:554 src/compose.c:560 src/compose.c:564
-#: src/compose.c:570 src/compose.c:574 src/compose.c:580 src/compose.c:584
-#: src/compose.c:594 src/compose.c:598 src/compose.c:608 src/compose.c:612
-#: src/mainwindow.c:585 src/mainwindow.c:592 src/messageview.c:153
+#: src/compose.c:546 src/compose.c:552 src/compose.c:558 src/compose.c:562
+#: src/compose.c:568 src/compose.c:572 src/compose.c:578 src/compose.c:582
+#: src/compose.c:592 src/compose.c:596 src/compose.c:606 src/compose.c:610
+#: src/mainwindow.c:576 src/mainwindow.c:583 src/messageview.c:153
 msgid "/_View/Character _encoding/---"
 msgstr "/表示(_V)/文字エンコーディング(_E)/---"
 
-#: src/compose.c:550 src/mainwindow.c:593 src/messageview.c:161
+#: src/compose.c:548 src/mainwindow.c:584 src/messageview.c:161
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/7bit ascii (US-ASC_II)"
 
-#: src/compose.c:552 src/mainwindow.c:595 src/messageview.c:164
+#: src/compose.c:550 src/mainwindow.c:586 src/messageview.c:164
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/Unicode (_UTF-8)"
 
-#: src/compose.c:556 src/mainwindow.c:599 src/messageview.c:167
+#: src/compose.c:554 src/mainwindow.c:590 src/messageview.c:167
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/欧米 (ISO-8859-_1)"
 
-#: src/compose.c:558 src/mainwindow.c:601 src/messageview.c:169
+#: src/compose.c:556 src/mainwindow.c:592 src/messageview.c:169
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/欧米 (ISO-8859-15)"
 
-#: src/compose.c:562 src/mainwindow.c:605 src/messageview.c:172
+#: src/compose.c:560 src/mainwindow.c:596 src/messageview.c:172
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/中欧 (ISO-8859-_2)"
 
-#: src/compose.c:566 src/mainwindow.c:609 src/messageview.c:175
+#: src/compose.c:564 src/mainwindow.c:600 src/messageview.c:175
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/バルト諸国 (ISO-8859-13)"
 
-#: src/compose.c:568 src/mainwindow.c:611 src/messageview.c:177
+#: src/compose.c:566 src/mainwindow.c:602 src/messageview.c:177
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/バルト諸国 (ISO-8859-_4)"
 
-#: src/compose.c:572 src/mainwindow.c:615 src/messageview.c:180
+#: src/compose.c:570 src/mainwindow.c:606 src/messageview.c:180
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/ギリシャ語 (ISO-8859-_7)"
 
-#: src/compose.c:576 src/mainwindow.c:619 src/messageview.c:183
+#: src/compose.c:574 src/mainwindow.c:610 src/messageview.c:183
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/ヘブライ語 (ISO-8859-_8)"
 
-#: src/compose.c:578 src/mainwindow.c:621 src/messageview.c:185
+#: src/compose.c:576 src/mainwindow.c:612 src/messageview.c:185
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/ヘブライ語 (Windows-1255)"
 
-#: src/compose.c:582 src/mainwindow.c:625 src/messageview.c:188
+#: src/compose.c:580 src/mainwindow.c:616 src/messageview.c:188
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/トルコ語 (ISO-8859-_9)"
 
-#: src/compose.c:586 src/mainwindow.c:629 src/messageview.c:191
+#: src/compose.c:584 src/mainwindow.c:620 src/messageview.c:191
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/キリル文字 (ISO-8859-_5)"
 
-#: src/compose.c:588 src/mainwindow.c:631 src/messageview.c:193
+#: src/compose.c:586 src/mainwindow.c:622 src/messageview.c:193
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/キリル文字 (KOI8-_R)"
 
-#: src/compose.c:590 src/mainwindow.c:633 src/messageview.c:195
+#: src/compose.c:588 src/mainwindow.c:624 src/messageview.c:195
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/キリル文字 (KOI8-U)"
 
-#: src/compose.c:592 src/mainwindow.c:635 src/messageview.c:197
+#: src/compose.c:590 src/mainwindow.c:626 src/messageview.c:197
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/キリル文字 (Windows-1251)"
 
-#: src/compose.c:596 src/mainwindow.c:639 src/messageview.c:200
+#: src/compose.c:594 src/mainwindow.c:630 src/messageview.c:200
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/日本語 (ISO-2022-_JP)"
 
-#: src/compose.c:600 src/mainwindow.c:649 src/messageview.c:209
+#: src/compose.c:598 src/mainwindow.c:640 src/messageview.c:209
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/簡体字中国語 (_GB2312)"
 
-#: src/compose.c:602 src/mainwindow.c:651 src/messageview.c:211
+#: src/compose.c:600 src/mainwindow.c:642 src/messageview.c:211
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/簡体字中国語 (GBK)"
 
-#: src/compose.c:604 src/mainwindow.c:653 src/messageview.c:213
+#: src/compose.c:602 src/mainwindow.c:644 src/messageview.c:213
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/繁体字中国語 (_Big5)"
 
-#: src/compose.c:606 src/mainwindow.c:655 src/messageview.c:215
+#: src/compose.c:604 src/mainwindow.c:646 src/messageview.c:215
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/繁体字中国語 (EUC-_TW)"
 
-#: src/compose.c:610 src/mainwindow.c:661 src/messageview.c:220
+#: src/compose.c:608 src/mainwindow.c:652 src/messageview.c:220
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/韓国語 (EUC-_KR)"
 
-#: src/compose.c:614 src/mainwindow.c:667 src/messageview.c:225
+#: src/compose.c:612 src/mainwindow.c:658 src/messageview.c:225
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/タイ語 (TIS-620)"
 
-#: src/compose.c:616 src/mainwindow.c:669 src/messageview.c:227
+#: src/compose.c:614 src/mainwindow.c:660 src/messageview.c:227
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/タイ語 (Windows-874)"
 
-#: src/compose.c:620 src/mainwindow.c:726 src/messageview.c:257
+#: src/compose.c:618 src/mainwindow.c:717 src/messageview.c:257
 msgid "/_Tools/_Address book"
 msgstr "/ツール(_T)/アドレス帳(_A)"
 
-#: src/compose.c:621
+#: src/compose.c:619
 msgid "/_Tools/_Template"
 msgstr "/ツール(_T)/テンプレート(_T)"
 
-#: src/compose.c:622 src/mainwindow.c:749 src/messageview.c:272
+#: src/compose.c:620 src/mainwindow.c:740 src/messageview.c:272
 msgid "/_Tools/Actio_ns"
 msgstr "/ツール(_T)/アクション(_N)"
 
-#: src/compose.c:623 src/compose.c:627 src/mainwindow.c:729
-#: src/mainwindow.c:743 src/mainwindow.c:748 src/mainwindow.c:750
-#: src/mainwindow.c:753 src/mainwindow.c:755 src/messageview.c:260
+#: src/compose.c:621 src/compose.c:625 src/mainwindow.c:720
+#: src/mainwindow.c:734 src/mainwindow.c:739 src/mainwindow.c:741
+#: src/mainwindow.c:744 src/mainwindow.c:746 src/messageview.c:260
 #: src/messageview.c:271
 msgid "/_Tools/---"
 msgstr "/ツール(_T)/---"
 
-#: src/compose.c:624
+#: src/compose.c:622
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/ツール(_T)/外部エディタで編集(_X)"
 
-#: src/compose.c:628
+#: src/compose.c:626
 msgid "/_Tools/PGP Si_gn"
 msgstr "/ツール(_T)/PGP署名(_G)"
 
-#: src/compose.c:629
+#: src/compose.c:627
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/ツール(_T)/PGP暗号化(_E)"
 
-#: src/compose.c:855
+#: src/compose.c:853
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: ファイルが存在しません\n"
 
-#: src/compose.c:954 src/compose.c:1024 src/procmsg.c:1353
+#: src/compose.c:952 src/compose.c:1022 src/procmsg.c:1353
 msgid "Can't get text part\n"
 msgstr "テキストパートを取得できません\n"
 
-#: src/compose.c:1420
+#: src/compose.c:1418
 msgid "Quote mark format error."
 msgstr "引用符の書式が不正です。"
 
-#: src/compose.c:1432
+#: src/compose.c:1430
 msgid "Message reply/forward format error."
 msgstr "メッセージの返信/転送の書式が不正です。"
 
-#: src/compose.c:1801
+#: src/compose.c:1799
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "ファイル %s は存在しません\n"
 
-#: src/compose.c:1805
+#: src/compose.c:1803
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "ファイル %s のサイズを取得できません\n"
 
-#: src/compose.c:1809
+#: src/compose.c:1807
 #, c-format
 msgid "File %s is empty."
 msgstr "ファイル %s は空です。"
 
-#: src/compose.c:1813
+#: src/compose.c:1811
 #, c-format
 msgid "Can't read %s."
 msgstr "%s を読み込めません。"
 
-#: src/compose.c:1848
+#: src/compose.c:1846
 #, c-format
 msgid "Message: %s"
 msgstr "メッセージ: %s"
 
-#: src/compose.c:1920 src/mimeview.c:560
+#: src/compose.c:1918 src/mimeview.c:560
 msgid "Can't get the part of multipart message."
 msgstr "マルチパートメッセージのパートを取得できません。"
 
-#: src/compose.c:2362
+#: src/compose.c:2360
 msgid " [Edited]"
 msgstr " [更新]"
 
-#: src/compose.c:2364
+#: src/compose.c:2362
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - メッセージの作成%s"
 
-#: src/compose.c:2367
+#: src/compose.c:2365
 #, c-format
 msgid "Compose message%s"
 msgstr "メッセージの作成%s"
 
-#: src/compose.c:2478
+#: src/compose.c:2476
 msgid "Recipient is not specified."
 msgstr "宛先が指定されていません。"
 
-#: src/compose.c:2486
+#: src/compose.c:2484
 msgid "Empty subject"
 msgstr "空の件名"
 
-#: src/compose.c:2487
+#: src/compose.c:2485
 msgid "Subject is empty. Send it anyway?"
 msgstr "件名が空です。とにかく送信しますか?"
 
-#: src/compose.c:2538
+#: src/compose.c:2536
 msgid "can't get recipient list."
 msgstr "送信先のリストを取得できません。"
 
-#: src/compose.c:2558
+#: src/compose.c:2556
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -989,26 +989,26 @@ msgstr ""
 "メールを送信するためのアカウントが指定されていません。\n"
 "送信する前にメールアカウントを選択してください。"
 
-#: src/compose.c:2572 src/send_message.c:297
+#: src/compose.c:2570 src/send_message.c:297
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "メッセージを %s にポストする途中にエラーが発生しました。"
 
-#: src/compose.c:2595
+#: src/compose.c:2593
 msgid "Can't save the message to outbox."
 msgstr "メッセージを送信控に保存できません。"
 
-#: src/compose.c:2645
+#: src/compose.c:2643
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "現在選択されている鍵ID `%s' に対応する鍵が見つかりませんでした。"
 
-#: src/compose.c:2709 src/compose.c:2965 src/compose.c:3028 src/compose.c:3148
-#: src/utils.c:2365
+#: src/compose.c:2707 src/compose.c:2963 src/compose.c:3026 src/compose.c:3146
+#: src/utils.c:2379
 msgid "can't change file mode\n"
 msgstr "ファイルモードを変更できません\n"
 
-#: src/compose.c:2741
+#: src/compose.c:2739
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1019,11 +1019,11 @@ msgstr ""
 "\n"
 "%s のままとにかく送信しますか?"
 
-#: src/compose.c:2747
+#: src/compose.c:2745
 msgid "Code conversion error"
 msgstr "文字コード変換エラー"
 
-#: src/compose.c:2816
+#: src/compose.c:2814
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1036,153 +1036,153 @@ msgstr ""
 "\n"
 "とにかく送信しますか?"
 
-#: src/compose.c:2820
+#: src/compose.c:2818
 msgid "Line length limit"
 msgstr "行の長さの制限"
 
-#: src/compose.c:3108
+#: src/compose.c:3106
 msgid "can't remove the old message\n"
 msgstr "古いメッセージを削除できません\n"
 
-#: src/compose.c:3126
+#: src/compose.c:3124
 msgid "queueing message...\n"
 msgstr "メッセージを送信待ちに入れています...\n"
 
-#: src/compose.c:3208
+#: src/compose.c:3206
 msgid "can't find queue folder\n"
 msgstr "送信待ちフォルダが見つかりません\n"
 
-#: src/compose.c:3215
+#: src/compose.c:3213
 msgid "can't queue the message\n"
 msgstr "メッセージを送信待機できません\n"
 
-#: src/compose.c:3792
+#: src/compose.c:3790
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "生成されたメッセージID: %s\n"
 
-#: src/compose.c:3901
+#: src/compose.c:3899
 msgid "Creating compose window...\n"
 msgstr "メッセージ作成ウィンドウを作成中...\n"
 
-#: src/compose.c:3949 src/headerview.c:54 src/summary_search.c:214
+#: src/compose.c:3947 src/headerview.c:54 src/summary_search.c:214
 msgid "From:"
 msgstr "差出人:"
 
-#: src/compose.c:4021
+#: src/compose.c:4019
 msgid "PGP Sign"
 msgstr "PGP署名"
 
-#: src/compose.c:4024
+#: src/compose.c:4022
 msgid "PGP Encrypt"
 msgstr "PGP暗号化"
 
-#: src/compose.c:4062 src/compose.c:5001
+#: src/compose.c:4060 src/compose.c:4995
 msgid "MIME type"
 msgstr "MIME タイプ"
 
 #. S_COL_DATE
-#: src/compose.c:4071 src/mimeview.c:192 src/prefs_filter_edit.c:585
+#: src/compose.c:4069 src/mimeview.c:192 src/prefs_filter_edit.c:585
 #: src/prefs_summary_column.c:75 src/select-keys.c:317 src/summaryview.c:4217
 msgid "Size"
 msgstr "サイズ"
 
-#: src/compose.c:4449 src/mainwindow.c:2224 src/prefs_account.c:719
+#: src/compose.c:4442 src/mainwindow.c:2207 src/prefs_account.c:719
 #: src/prefs_common.c:947
 msgid "Send"
 msgstr "送信"
 
-#: src/compose.c:4450
+#: src/compose.c:4443
 msgid "Send message"
 msgstr "メッセージを送信"
 
-#: src/compose.c:4458
+#: src/compose.c:4451
 msgid "Send later"
 msgstr "後で送信"
 
-#: src/compose.c:4459
+#: src/compose.c:4452
 msgid "Put into queue folder and send later"
 msgstr "送信待ちフォルダに入れて後で送信"
 
-#: src/compose.c:4467
+#: src/compose.c:4460
 msgid "Draft"
 msgstr "草稿"
 
-#: src/compose.c:4468
+#: src/compose.c:4461
 msgid "Save to draft folder"
 msgstr "草稿フォルダに保存"
 
-#: src/compose.c:4478
+#: src/compose.c:4471
 msgid "Insert"
 msgstr "挿入"
 
-#: src/compose.c:4479
+#: src/compose.c:4472
 msgid "Insert file"
 msgstr "ファイルを挿入"
 
-#: src/compose.c:4487
+#: src/compose.c:4480
 msgid "Attach"
 msgstr "添付"
 
-#: src/compose.c:4488
+#: src/compose.c:4481
 msgid "Attach file"
 msgstr "ファイルを添付"
 
 #. signature
-#: src/compose.c:4498 src/prefs_account.c:1391 src/prefs_common.c:1356
+#: src/compose.c:4491 src/prefs_account.c:1391 src/prefs_common.c:1356
 msgid "Signature"
 msgstr "署名"
 
-#: src/compose.c:4499
+#: src/compose.c:4492
 msgid "Insert signature"
 msgstr "署名を挿入"
 
-#: src/compose.c:4508 src/prefs_common.c:1378 src/prefs_common.c:2382
+#: src/compose.c:4501 src/prefs_common.c:1378 src/prefs_common.c:2382
 msgid "Editor"
 msgstr "エディタ"
 
-#: src/compose.c:4509
+#: src/compose.c:4502
 msgid "Edit with external editor"
 msgstr "外部エディタで編集"
 
-#: src/compose.c:4517
+#: src/compose.c:4510
 msgid "Linewrap"
 msgstr "整形"
 
-#: src/compose.c:4518
+#: src/compose.c:4511
 msgid "Wrap all long lines"
 msgstr "すべての長い行を折り返す"
 
-#: src/compose.c:4897
+#: src/compose.c:4891
 msgid "Invalid MIME type."
 msgstr "無効な MIME タイプです。"
 
-#: src/compose.c:4915
+#: src/compose.c:4909
 msgid "File doesn't exist or is empty."
 msgstr "ファイルが存在しないかまたは空です。"
 
-#: src/compose.c:4983
+#: src/compose.c:4977
 msgid "Properties"
 msgstr "プロパティ"
 
-#: src/compose.c:5003
+#: src/compose.c:4997
 msgid "Encoding"
 msgstr "エンコーディング"
 
-#: src/compose.c:5026 src/prefs_folder_item.c:183
+#: src/compose.c:5020 src/prefs_folder_item.c:183
 msgid "Path"
 msgstr "パス"
 
-#: src/compose.c:5027
+#: src/compose.c:5021
 msgid "File name"
 msgstr "ファイル名"
 
-#: src/compose.c:5185
+#: src/compose.c:5179
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "外部エディタのコマンドラインが無効です: `%s'\n"
 
-#: src/compose.c:5211
+#: src/compose.c:5205
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1193,71 +1193,71 @@ msgstr ""
 "プロセスを強制終了しますか?\n"
 "プロセスグループID: %d"
 
-#: src/compose.c:5228
+#: src/compose.c:5222
 #, c-format
 msgid "Terminated process group id: %d"
 msgstr "終了したプロセスグループID: %d"
 
-#: src/compose.c:5229
+#: src/compose.c:5223
 #, c-format
 msgid "Temporary file: %s"
 msgstr "一時ファイル: %s"
 
-#: src/compose.c:5253
+#: src/compose.c:5247
 msgid "Compose: input from monitoring process\n"
 msgstr "Compose: 監視プロセスからの入力\n"
 
 #. failed
-#: src/compose.c:5284
+#: src/compose.c:5278
 msgid "Couldn't exec external editor\n"
 msgstr "外部エディタを実行できません\n"
 
-#: src/compose.c:5288
+#: src/compose.c:5282
 msgid "Couldn't write to file\n"
 msgstr "ファイルに書き込めません\n"
 
-#: src/compose.c:5290
+#: src/compose.c:5284
 msgid "Pipe read failed\n"
 msgstr "パイプの読み込みに失敗\n"
 
-#: src/compose.c:5596 src/compose.c:5604 src/compose.c:5610
+#: src/compose.c:5590 src/compose.c:5598 src/compose.c:5604
 msgid "Can't queue the message."
 msgstr "メッセージを送信待機できません。"
 
-#: src/compose.c:5701
+#: src/compose.c:5695
 msgid "Select files"
 msgstr "ファイルの選択"
 
-#: src/compose.c:5723
+#: src/compose.c:5717
 msgid "Select file"
 msgstr "ファイルの選択"
 
-#: src/compose.c:5760
+#: src/compose.c:5754
 msgid "Save message"
 msgstr "メッセージの保存"
 
-#: src/compose.c:5761
+#: src/compose.c:5755
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "このメッセージは変更されています。草稿に保存しますか?"
 
-#: src/compose.c:5763
+#: src/compose.c:5757
 msgid "Close _without saving"
 msgstr "保存せずに閉じる(_W)"
 
-#: src/compose.c:5805
+#: src/compose.c:5799
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "テンプレート `%s' を適用しますか?"
 
-#: src/compose.c:5807
+#: src/compose.c:5801
 msgid "Apply template"
 msgstr "テンプレートの適用"
 
-#: src/compose.c:5808
+#: src/compose.c:5802
 msgid "_Replace"
 msgstr "置換(_R)"
 
-#: src/compose.c:5808
+#: src/compose.c:5802
 msgid "_Insert"
 msgstr "挿入(_I)"
 
@@ -1700,12 +1700,12 @@ msgstr "フォルダ情報を設定中...\n"
 msgid "Setting folder info..."
 msgstr "フォルダ情報を設定中..."
 
-#: src/folderview.c:805 src/mainwindow.c:3301 src/setup.c:81
+#: src/folderview.c:805 src/mainwindow.c:3272 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "フォルダをスキャン中 (%s%c%s) ..."
 
-#: src/folderview.c:809 src/mainwindow.c:3306 src/setup.c:86
+#: src/folderview.c:809 src/mainwindow.c:3277 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "フォルダをスキャン中 (%s)..."
@@ -2027,44 +2027,44 @@ msgstr "IMAP4 の認証に失敗しました。\n"
 msgid "IMAP4 login failed.\n"
 msgstr "IMAP4のログインに失敗しました。\n"
 
-#: src/imap.c:3522
+#: src/imap.c:3528
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "%s を %s に追加できません\n"
 
-#: src/imap.c:3529
+#: src/imap.c:3535
 msgid "(sending file...)"
 msgstr "(ファイルを送信中...)"
 
-#: src/imap.c:3557
+#: src/imap.c:3563
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "メッセージを %s に追加できません\n"
 
-#: src/imap.c:3589
+#: src/imap.c:3595
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "%s を %s にコピーできません\n"
 
-#: src/imap.c:3613
+#: src/imap.c:3619
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "imap コマンド中のエラー: STORE %s %s\n"
 
-#: src/imap.c:3627
+#: src/imap.c:3633
 msgid "error while imap command: EXPUNGE\n"
 msgstr "imap コマンド中のエラー: EXPUNGE\n"
 
-#: src/imap.c:3640
+#: src/imap.c:3646
 msgid "error while imap command: CLOSE\n"
 msgstr "imap コマンド中のエラー: CLOSE\n"
 
-#: src/imap.c:3873
+#: src/imap.c:3879
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv が UTF-7 を %s に変換できません\n"
 
-#: src/imap.c:3903
+#: src/imap.c:3909
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv が %s を UTF-7 に変換できません\n"
@@ -2166,7 +2166,7 @@ msgstr "LDIFファイルをアドレス帳へインポート"
 msgid "Prev"
 msgstr "前へ"
 
-#: src/importldif.c:768 src/mainwindow.c:2321
+#: src/importldif.c:768 src/mainwindow.c:2303
 msgid "Next"
 msgstr "次へ"
 
@@ -2518,617 +2518,617 @@ msgstr ""
 "以前のバージョンの設定が見つかりました。\n"
 "移行しますか?"
 
-#: src/mainwindow.c:471
+#: src/mainwindow.c:462
 msgid "/_File/_Folder"
 msgstr "/ファイル(_F)/フォルダ(_F)"
 
-#: src/mainwindow.c:472
+#: src/mainwindow.c:463
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/ファイル(_F)/フォルダ(_F)/新規フォルダを作成(_N)..."
 
-#: src/mainwindow.c:474
+#: src/mainwindow.c:465
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/ファイル(_F)/フォルダ(_F)/フォルダ名を変更(_R)..."
 
-#: src/mainwindow.c:475
+#: src/mainwindow.c:466
 msgid "/_File/_Folder/_Move folder..."
 msgstr "/ファイル(_F)/フォルダ(_F)/フォルダを移動(_M)..."
 
-#: src/mainwindow.c:476
+#: src/mainwindow.c:467
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/ファイル(_F)/フォルダ(_F)/フォルダを削除(_D)"
 
-#: src/mainwindow.c:477
+#: src/mainwindow.c:468
 msgid "/_File/_Mailbox"
 msgstr "/ファイル(_F)/メールボックス(_M)"
 
-#: src/mainwindow.c:478
+#: src/mainwindow.c:469
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/ファイル(_F)/メールボックス(_M)/メールボックスを追加(_M)..."
 
-#: src/mainwindow.c:479
+#: src/mainwindow.c:470
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/ファイル(_F)/メールボックス(_M)/メールボックスを削除(_R)"
 
-#: src/mainwindow.c:480 src/mainwindow.c:485
+#: src/mainwindow.c:471 src/mainwindow.c:476
 msgid "/_File/_Mailbox/---"
 msgstr "/ファイル(_F)/メールボックス(_M)/---"
 
-#: src/mainwindow.c:481
+#: src/mainwindow.c:472
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "/ファイル(_F)/メールボックス(_M)/新着メッセージをチェック(_C)"
 
-#: src/mainwindow.c:483
+#: src/mainwindow.c:474
 msgid "/_File/_Mailbox/Check for new messages in _all mailboxes"
 msgstr ""
 "/ファイル(_F)/メールボックス(_M)/すべてのメールボックスの新着メッセージを"
 "チェック(_A)"
 
-#: src/mainwindow.c:486
+#: src/mainwindow.c:477
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "//ファイル(_F)/メールボックス(_M)/フォルダツリーを再構築(_E)"
 
-#: src/mainwindow.c:489
+#: src/mainwindow.c:480
 msgid "/_File/_Import mbox file..."
 msgstr "/ファイル(_F)/mboxファイルをインポート(_I)..."
 
-#: src/mainwindow.c:490
+#: src/mainwindow.c:481
 msgid "/_File/_Export to mbox file..."
 msgstr "/ファイル(_F)/mboxファイルにエクスポート(_E)..."
 
-#: src/mainwindow.c:492
+#: src/mainwindow.c:483
 msgid "/_File/Empty all _trash"
 msgstr "/ファイル(_F)/すべてのごみ箱を空にする(_T)"
 
-#: src/mainwindow.c:494 src/messageview.c:138
+#: src/mainwindow.c:485 src/messageview.c:138
 msgid "/_File/_Save as..."
 msgstr "/ファイル(_F)/名前を付けて保存(_S)..."
 
-#: src/mainwindow.c:495 src/messageview.c:139
+#: src/mainwindow.c:486 src/messageview.c:139
 msgid "/_File/_Print..."
 msgstr "/ファイル(_F)/印刷(_P)..."
 
-#: src/mainwindow.c:497
+#: src/mainwindow.c:488
 msgid "/_File/_Work offline"
 msgstr "/ファイル(_F)/オフラインにする(_W)"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:500
+#: src/mainwindow.c:491
 msgid "/_File/E_xit"
 msgstr "/ファイル(_F)/終了(_X)"
 
-#: src/mainwindow.c:505
+#: src/mainwindow.c:496
 msgid "/_Edit/Select _thread"
 msgstr "/編集(_E)/スレッドを選択(_T)"
 
-#: src/mainwindow.c:507 src/messageview.c:147
+#: src/mainwindow.c:498 src/messageview.c:147
 msgid "/_Edit/_Find in current message..."
 msgstr "/編集(_E)/現在のメッセージ内を検索(_F)..."
 
-#: src/mainwindow.c:509
+#: src/mainwindow.c:500
 msgid "/_Edit/_Search messages..."
 msgstr "/編集(_E)/メッセージを検索(_S)..."
 
-#: src/mainwindow.c:512
+#: src/mainwindow.c:503
 msgid "/_View/Show or hi_de"
 msgstr "/表示(_V)/表示・非表示(_D)"
 
-#: src/mainwindow.c:513
+#: src/mainwindow.c:504
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/表示(_V)/表示・非表示(_D)/フォルダツリー(_F)"
 
-#: src/mainwindow.c:515
+#: src/mainwindow.c:506
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/表示(_V)/表示・非表示(_D)/メッセージビュー(_M)"
 
-#: src/mainwindow.c:517
+#: src/mainwindow.c:508
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/表示(_V)/表示・非表示(_D)/ツールバー(_T)"
 
-#: src/mainwindow.c:519
+#: src/mainwindow.c:510
 msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/表示(_V)/表示・非表示(_D)/ツールバー(_T)/アイコンと文字(_A)"
 
-#: src/mainwindow.c:521
+#: src/mainwindow.c:512
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/表示(_V)/表示・非表示(_D)/ツールバー(_T)/アイコン(_I)"
 
-#: src/mainwindow.c:523
+#: src/mainwindow.c:514
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/表示(_V)/表示・非表示(_D)/ツールバー(_T)/文字(_T)"
 
-#: src/mainwindow.c:525
+#: src/mainwindow.c:516
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/表示(_V)/表示・非表示(_D)/ツールバー(_T)/非表示(_N)"
 
-#: src/mainwindow.c:527
+#: src/mainwindow.c:518
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/表示(_V)/表示・非表示(_D)/ステータスバー(_B)"
 
-#: src/mainwindow.c:530
+#: src/mainwindow.c:521
 msgid "/_View/Separate f_older tree"
 msgstr "/表示(_V)/フォルダツリーを分離(_O)"
 
-#: src/mainwindow.c:531
+#: src/mainwindow.c:522
 msgid "/_View/Separate _message view"
 msgstr "/表示(_V)/メッセージビューを分離(_M)"
 
-#: src/mainwindow.c:533
+#: src/mainwindow.c:524
 msgid "/_View/_Sort"
 msgstr "/表示(_V)/ソート(_S)"
 
-#: src/mainwindow.c:534
+#: src/mainwindow.c:525
 msgid "/_View/_Sort/by _number"
 msgstr "/表示(_V)/ソート(_S)/番号順(_N)"
 
-#: src/mainwindow.c:535
+#: src/mainwindow.c:526
 msgid "/_View/_Sort/by s_ize"
 msgstr "/表示(_V)/ソート(_S)/サイズ順(_I)"
 
-#: src/mainwindow.c:536
+#: src/mainwindow.c:527
 msgid "/_View/_Sort/by _date"
 msgstr "/表示(_V)/ソート(_S)/日付順(_D)"
 
-#: src/mainwindow.c:537
+#: src/mainwindow.c:528
 msgid "/_View/_Sort/by _from"
 msgstr "/表示(_V)/ソート(_S)/差出人順(_F)"
 
-#: src/mainwindow.c:538
+#: src/mainwindow.c:529
 msgid "/_View/_Sort/by _recipient"
 msgstr "/表示(_V)/ソート(_S)/宛先順(_R)"
 
-#: src/mainwindow.c:539
+#: src/mainwindow.c:530
 msgid "/_View/_Sort/by _subject"
 msgstr "/表示(_V)/ソート(_S)/件名順(_S)"
 
-#: src/mainwindow.c:540
+#: src/mainwindow.c:531
 msgid "/_View/_Sort/by _color label"
 msgstr "/表示(_V)/ソート(_S)/カラーラベル順(_C)"
 
-#: src/mainwindow.c:542
+#: src/mainwindow.c:533
 msgid "/_View/_Sort/by _mark"
 msgstr "/表示(_V)/ソート(_S)/マーク(_M)"
 
-#: src/mainwindow.c:543
+#: src/mainwindow.c:534
 msgid "/_View/_Sort/by _unread"
 msgstr "/表示(_V)/ソート(_S)/未読(_U)"
 
-#: src/mainwindow.c:544
+#: src/mainwindow.c:535
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/表示(_V)/ソート(_S)/添付(_T)"
 
-#: src/mainwindow.c:546
+#: src/mainwindow.c:537
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/表示(_V)/ソート(_S)/ソートしない(_O)"
 
-#: src/mainwindow.c:547 src/mainwindow.c:550
+#: src/mainwindow.c:538 src/mainwindow.c:541
 msgid "/_View/_Sort/---"
 msgstr "/表示(_V)/ソート(_S)/---"
 
-#: src/mainwindow.c:548
+#: src/mainwindow.c:539
 msgid "/_View/_Sort/Ascending"
 msgstr "/表示(_V)/ソート(_S)/昇順"
 
-#: src/mainwindow.c:549
+#: src/mainwindow.c:540
 msgid "/_View/_Sort/Descending"
 msgstr "/表示(_V)/ソート(_S)/降順"
 
-#: src/mainwindow.c:551
+#: src/mainwindow.c:542
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/表示(_V)/ソート(_S)/件名でまとめる(_A)"
 
-#: src/mainwindow.c:553
+#: src/mainwindow.c:544
 msgid "/_View/Th_read view"
 msgstr "/表示(_V)/スレッド表示(_R)"
 
-#: src/mainwindow.c:554
+#: src/mainwindow.c:545
 msgid "/_View/E_xpand all threads"
 msgstr "/表示(_V)/すべてのスレッドを展開(_X)"
 
-#: src/mainwindow.c:555
+#: src/mainwindow.c:546
 msgid "/_View/Co_llapse all threads"
 msgstr "/表示(_V)/すべてのスレッドを閉じる(_L)"
 
-#: src/mainwindow.c:556
+#: src/mainwindow.c:547
 msgid "/_View/Set display _item..."
 msgstr "/表示(_V)/表示項目の設定(_I)..."
 
-#: src/mainwindow.c:559
+#: src/mainwindow.c:550
 msgid "/_View/_Go to"
 msgstr "/表示(_V)/移動(_G)"
 
-#: src/mainwindow.c:560
+#: src/mainwindow.c:551
 msgid "/_View/_Go to/_Prev message"
 msgstr "/表示(_V)/移動(_G)/前のメッセージ(_P)"
 
-#: src/mainwindow.c:561
+#: src/mainwindow.c:552
 msgid "/_View/_Go to/_Next message"
 msgstr "/表示(_V)/移動(_G)/次のメッセージ(_N)"
 
-#: src/mainwindow.c:562 src/mainwindow.c:567 src/mainwindow.c:570
-#: src/mainwindow.c:575 src/mainwindow.c:580
+#: src/mainwindow.c:553 src/mainwindow.c:558 src/mainwindow.c:561
+#: src/mainwindow.c:566 src/mainwindow.c:571
 msgid "/_View/_Go to/---"
 msgstr "/表示(_V)/移動(_G)/---"
 
-#: src/mainwindow.c:563
+#: src/mainwindow.c:554
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/表示(_V)/移動(_G)/前の未読メッセージ(_R)"
 
-#: src/mainwindow.c:565
+#: src/mainwindow.c:556
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/表示(_V)/移動(_G)/次の未読メッセージ(_E)"
 
-#: src/mainwindow.c:568
+#: src/mainwindow.c:559
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/表示(_V)/移動(_G)/前の新着メッセージ(_W)"
 
-#: src/mainwindow.c:569
+#: src/mainwindow.c:560
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/表示(_V)/移動(_G)/次の新着メッセージ(_X)"
 
-#: src/mainwindow.c:571
+#: src/mainwindow.c:562
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/表示(_V)/移動(_G)/前のマーク付きメッセージ(_M)"
 
-#: src/mainwindow.c:573
+#: src/mainwindow.c:564
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/表示(_V)/移動(_G)/次のマーク付きメッセージ(_A)"
 
-#: src/mainwindow.c:576
+#: src/mainwindow.c:567
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/表示(_V)/移動(_G)/前のラベル付きメッセージ(_L)"
 
-#: src/mainwindow.c:578
+#: src/mainwindow.c:569
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/表示(_V)/移動(_G)/次のラベル付きメッセージ(_B)"
 
-#: src/mainwindow.c:581
+#: src/mainwindow.c:572
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/表示(_V)/移動(_G)/別のフォルダ(_F)..."
 
-#: src/mainwindow.c:590 src/messageview.c:158
+#: src/mainwindow.c:581 src/messageview.c:158
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/表示(_V)/文字エンコーディング(_E)/自動検出(_A)"
 
-#: src/mainwindow.c:641 src/messageview.c:202
+#: src/mainwindow.c:632 src/messageview.c:202
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/日本語 (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:643 src/messageview.c:204
+#: src/mainwindow.c:634 src/messageview.c:204
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/日本語 (_EUC-JP)"
 
-#: src/mainwindow.c:645 src/messageview.c:206
+#: src/mainwindow.c:636 src/messageview.c:206
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/日本語 (_Shift__JIS)"
 
-#: src/mainwindow.c:657 src/messageview.c:217
+#: src/mainwindow.c:648 src/messageview.c:217
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/中国語 (ISO-2022-_CN)"
 
-#: src/mainwindow.c:663 src/messageview.c:222
+#: src/mainwindow.c:654 src/messageview.c:222
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/韓国語 (ISO-2022-KR)"
 
-#: src/mainwindow.c:676 src/summaryview.c:401
+#: src/mainwindow.c:667 src/summaryview.c:401
 msgid "/_View/Open in new _window"
 msgstr "/表示(_V)/新しいウィンドウで開く(_W)"
 
-#: src/mainwindow.c:677 src/messageview.c:234
+#: src/mainwindow.c:668 src/messageview.c:234
 msgid "/_View/Mess_age source"
 msgstr "/表示(_V)/メッセージのソース(_A)"
 
-#: src/mainwindow.c:678 src/messageview.c:235
+#: src/mainwindow.c:669 src/messageview.c:235
 msgid "/_View/Show all _header"
 msgstr "/表示(_V)/すべてのヘッダを表示(_H)"
 
-#: src/mainwindow.c:680
+#: src/mainwindow.c:671
 msgid "/_View/_Update summary"
 msgstr "/表示(_V)/サマリを更新(_U)"
 
-#: src/mainwindow.c:682 src/messageview.c:237
+#: src/mainwindow.c:673 src/messageview.c:237
 msgid "/_Message"
 msgstr "/メッセージ(_M)"
 
-#: src/mainwindow.c:683
+#: src/mainwindow.c:674
 msgid "/_Message/Recei_ve"
 msgstr "/メッセージ(_M)/受信(_V)"
 
-#: src/mainwindow.c:684
+#: src/mainwindow.c:675
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/メッセージ(_M)/受信(_V)/現在のアカウントから受信(_C)"
 
-#: src/mainwindow.c:686
+#: src/mainwindow.c:677
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/メッセージ(_M)/受信(_V)/全アカウントから受信(_A)"
 
-#: src/mainwindow.c:688
+#: src/mainwindow.c:679
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/メッセージ(_M)/受信(_V)/受信を中止(_G)"
 
-#: src/mainwindow.c:690
+#: src/mainwindow.c:681
 msgid "/_Message/Recei_ve/---"
 msgstr "/メッセージ(_M)/受信(_V)/---"
 
-#: src/mainwindow.c:691
+#: src/mainwindow.c:682
 msgid "/_Message/_Send queued messages"
 msgstr "/メッセージ(_M)/送信待機中のメッセージを送信(_S)"
 
-#: src/mainwindow.c:692 src/mainwindow.c:694 src/mainwindow.c:701
-#: src/mainwindow.c:706 src/mainwindow.c:710 src/mainwindow.c:719
-#: src/mainwindow.c:722 src/messageview.c:240 src/messageview.c:248
+#: src/mainwindow.c:683 src/mainwindow.c:685 src/mainwindow.c:692
+#: src/mainwindow.c:697 src/mainwindow.c:701 src/mainwindow.c:710
+#: src/mainwindow.c:713 src/messageview.c:240 src/messageview.c:248
 #: src/messageview.c:253
 msgid "/_Message/---"
 msgstr "/メッセージ(_M)/---"
 
-#: src/mainwindow.c:693 src/messageview.c:238
+#: src/mainwindow.c:684 src/messageview.c:238
 msgid "/_Message/Compose _new message"
 msgstr "/メッセージ(_M)/新規メッセージを作成(_N)"
 
-#: src/mainwindow.c:695 src/messageview.c:241
+#: src/mainwindow.c:686 src/messageview.c:241
 msgid "/_Message/_Reply"
 msgstr "/メッセージ(_M)/返信(_R)"
 
-#: src/mainwindow.c:696
+#: src/mainwindow.c:687
 msgid "/_Message/Repl_y to"
 msgstr "/メッセージ(_M)/返信の宛先(_Y)"
 
-#: src/mainwindow.c:697 src/messageview.c:242
+#: src/mainwindow.c:688 src/messageview.c:242
 msgid "/_Message/Repl_y to/_all"
 msgstr "/メッセージ(_M)/返信の宛先(_Y)/全員に返信(_A)"
 
-#: src/mainwindow.c:698 src/messageview.c:244
+#: src/mainwindow.c:689 src/messageview.c:244
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/メッセージ(_M)/返信の宛先(_Y)/差出人に返信(_S)"
 
-#: src/mainwindow.c:699 src/messageview.c:246
+#: src/mainwindow.c:690 src/messageview.c:246
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/メッセージ(_M)/返信の宛先(_Y)/メーリングリストに返信(_L)"
 
-#: src/mainwindow.c:702 src/messageview.c:249
+#: src/mainwindow.c:693 src/messageview.c:249
 msgid "/_Message/_Forward"
 msgstr "/メッセージ(_M)/転送(_F)"
 
-#: src/mainwindow.c:703 src/messageview.c:250
+#: src/mainwindow.c:694 src/messageview.c:250
 msgid "/_Message/For_ward as attachment"
 msgstr "/メッセージ(_M)/添付として転送(_W)"
 
-#: src/mainwindow.c:705 src/messageview.c:252
+#: src/mainwindow.c:696 src/messageview.c:252
 msgid "/_Message/Redirec_t"
 msgstr "/メッセージ(_M)/手を加えずに転送(_T)"
 
-#: src/mainwindow.c:707
+#: src/mainwindow.c:698
 msgid "/_Message/M_ove..."
 msgstr "/メッセージ(_M)/移動(_O)..."
 
-#: src/mainwindow.c:708
+#: src/mainwindow.c:699
 msgid "/_Message/_Copy..."
 msgstr "/メッセージ(_M)/コピー(_C)..."
 
-#: src/mainwindow.c:709
+#: src/mainwindow.c:700
 msgid "/_Message/_Delete"
 msgstr "/メッセージ(_M)/削除(_D)"
 
-#: src/mainwindow.c:711
+#: src/mainwindow.c:702
 msgid "/_Message/_Mark"
 msgstr "/メッセージ(_M)/マーク(_M)"
 
-#: src/mainwindow.c:712
+#: src/mainwindow.c:703
 msgid "/_Message/_Mark/_Mark"
 msgstr "/メッセージ(_M)/マーク(_M)/マーク(_M)"
 
-#: src/mainwindow.c:713
+#: src/mainwindow.c:704
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/メッセージ(_M)/マーク(_M)/マーク解除(_U)"
 
-#: src/mainwindow.c:714
+#: src/mainwindow.c:705
 msgid "/_Message/_Mark/---"
 msgstr "/メッセージ(_M)/マーク(_M)/---"
 
-#: src/mainwindow.c:715
+#: src/mainwindow.c:706
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/メッセージ(_M)/マーク(_M)/未読としてマーク(_E)"
 
-#: src/mainwindow.c:716
+#: src/mainwindow.c:707
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/メッセージ(_M)/マーク(_M)/読んだことにする(_D)"
 
-#: src/mainwindow.c:718
+#: src/mainwindow.c:709
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/メッセージ(_M)/マーク(_M)/すべて読んだことにする(_R)"
 
-#: src/mainwindow.c:720
+#: src/mainwindow.c:711
 msgid "/_Message/Set as _junk mail"
 msgstr "/メッセージ(_M)/迷惑メールに指定(_J)"
 
-#: src/mainwindow.c:721
+#: src/mainwindow.c:712
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/メッセージ(_M)/迷惑メールではない(_U)"
 
-#: src/mainwindow.c:723 src/messageview.c:254
+#: src/mainwindow.c:714 src/messageview.c:254
 msgid "/_Message/Re-_edit"
 msgstr "/メッセージ(_M)/再編集(_E)"
 
-#: src/mainwindow.c:727
+#: src/mainwindow.c:718
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/ツール(_T)/差出人をアドレス帳に追加(_K)..."
 
-#: src/mainwindow.c:730
+#: src/mainwindow.c:721
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/ツール(_T)/フォルダ中のすべてのメッセージを振り分け(_F)"
 
-#: src/mainwindow.c:732
+#: src/mainwindow.c:723
 msgid "/_Tools/Filter _selected messages"
 msgstr "/ツール(_T)/選択中のメッセージを振り分け(_S)"
 
-#: src/mainwindow.c:734 src/messageview.c:261
+#: src/mainwindow.c:725 src/messageview.c:261
 msgid "/_Tools/_Create filter rule"
 msgstr "/ツール(_T)/振り分けルールを作成(_C)"
 
-#: src/mainwindow.c:735 src/messageview.c:263
+#: src/mainwindow.c:726 src/messageview.c:263
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/ツール(_T)/振り分けルールを作成(_C)/自動(_A)"
 
-#: src/mainwindow.c:737 src/messageview.c:265
+#: src/mainwindow.c:728 src/messageview.c:265
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/ツール(_T)/振り分けルールを作成(_C)/_Fromから"
 
-#: src/mainwindow.c:739 src/messageview.c:267
+#: src/mainwindow.c:730 src/messageview.c:267
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/ツール(_T)/振り分けルールを作成(_C)/_Toから"
 
-#: src/mainwindow.c:741 src/messageview.c:269
+#: src/mainwindow.c:732 src/messageview.c:269
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/ツール(_T)/振り分けルールを作成(_C)/_Subjectから"
 
-#: src/mainwindow.c:744
+#: src/mainwindow.c:735
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/ツール(_T)/フォルダ中の迷惑メールを振り分け(_J)"
 
-#: src/mainwindow.c:746
+#: src/mainwindow.c:737
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/ツール(_T)/選択メッセージ中の迷惑メールを振り分け(_M)"
 
-#: src/mainwindow.c:751
+#: src/mainwindow.c:742
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/メッセージ(_M)/重複メッセージを削除(_P)"
 
-#: src/mainwindow.c:754
+#: src/mainwindow.c:745
 msgid "/_Tools/E_xecute"
 msgstr "/ツール(_T)/実行(_X)"
 
-#: src/mainwindow.c:756
+#: src/mainwindow.c:747
 msgid "/_Tools/_Log window"
 msgstr "/ツール(_T)/ログウィンドウ(_L)"
 
-#: src/mainwindow.c:758
+#: src/mainwindow.c:749
 msgid "/_Configuration"
 msgstr "/設定(_C)"
 
-#: src/mainwindow.c:759
+#: src/mainwindow.c:750
 msgid "/_Configuration/_Common preferences..."
 msgstr "/設定(_C)/全般の設定(_C)..."
 
-#: src/mainwindow.c:761
+#: src/mainwindow.c:752
 msgid "/_Configuration/_Filter setting..."
 msgstr "/設定(_C)/振り分けの設定(_F)..."
 
-#: src/mainwindow.c:763
+#: src/mainwindow.c:754
 msgid "/_Configuration/_Template..."
 msgstr "/設定(_C)/テンプレート(_T)..."
 
-#: src/mainwindow.c:764
+#: src/mainwindow.c:755
 msgid "/_Configuration/_Actions..."
 msgstr "/設定(_C)/アクション(_A)..."
 
-#: src/mainwindow.c:765
+#: src/mainwindow.c:756
 msgid "/_Configuration/---"
 msgstr "/設定(_C)/---"
 
-#: src/mainwindow.c:766
+#: src/mainwindow.c:757
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/設定(_C)/現在のアカウントの設定(_P)..."
 
-#: src/mainwindow.c:768
+#: src/mainwindow.c:759
 msgid "/_Configuration/Create _new account..."
 msgstr "/設定(_C)/新規アカウントの作成(_N)..."
 
-#: src/mainwindow.c:770
+#: src/mainwindow.c:761
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/設定(_C)/アカウントの編集(_E)..."
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:763
 msgid "/_Configuration/C_hange current account"
 msgstr "/設定(_C)/現在のアカウントを変更(_H)"
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:767
 msgid "/_Help/_Manual"
 msgstr "/ヘルプ(_H)/マニュアル(_M)"
 
-#: src/mainwindow.c:777
+#: src/mainwindow.c:768
 msgid "/_Help/_Manual/_English"
 msgstr "/ヘルプ(_H)/マニュアル(_M)/英語(_E)"
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:769
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/ヘルプ(_H)/マニュアル(_M)/日本語(_J)"
 
-#: src/mainwindow.c:779
+#: src/mainwindow.c:770
 msgid "/_Help/_FAQ"
 msgstr "/ヘルプ(_H)/_FAQ"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:771
 msgid "/_Help/_FAQ/_English"
 msgstr "/ヘルプ(_H)/_FAQ/英語(_E)"
 
-#: src/mainwindow.c:781
+#: src/mainwindow.c:772
 msgid "/_Help/_FAQ/_German"
 msgstr "/ヘルプ(_H)/_FAQ/ドイツ語(_G)"
 
-#: src/mainwindow.c:782
+#: src/mainwindow.c:773
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/ヘルプ(_H)/_FAQ/スペイン語(_S)"
 
-#: src/mainwindow.c:783
+#: src/mainwindow.c:774
 msgid "/_Help/_FAQ/_French"
 msgstr "/ヘルプ(_H)/_FAQ/フランス語(_F)"
 
-#: src/mainwindow.c:784
+#: src/mainwindow.c:775
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/ヘルプ(_H)/_FAQ/イタリア語(_I)"
 
-#: src/mainwindow.c:785
+#: src/mainwindow.c:776
 msgid "/_Help/---"
 msgstr "/ヘルプ(_H)/---"
 
-#: src/mainwindow.c:825
+#: src/mainwindow.c:816
 msgid "Creating main window...\n"
 msgstr "メインウィンドウを作成中...\n"
 
-#: src/mainwindow.c:987
+#: src/mainwindow.c:973
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "MainWindow: 色の割り当て %d に失敗しました\n"
 
-#: src/mainwindow.c:1071 src/summaryview.c:2020 src/summaryview.c:2105
+#: src/mainwindow.c:1057 src/summaryview.c:2020 src/summaryview.c:2105
 #: src/summaryview.c:3342 src/summaryview.c:3415 src/summaryview.c:3728
 msgid "done.\n"
 msgstr "完了。\n"
 
-#: src/mainwindow.c:1196 src/mainwindow.c:1237 src/mainwindow.c:1265
+#: src/mainwindow.c:1182 src/mainwindow.c:1223 src/mainwindow.c:1251
 msgid "Untitled"
 msgstr "名称未設定"
 
-#: src/mainwindow.c:1266
+#: src/mainwindow.c:1252
 msgid "none"
 msgstr "なし"
 
-#: src/mainwindow.c:1316
+#: src/mainwindow.c:1302
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "ウィンドウの分離タイプを %d から %d に変更しています\n"
 
-#: src/mainwindow.c:1536
+#: src/mainwindow.c:1522
 msgid "Offline"
 msgstr "オフライン"
 
-#: src/mainwindow.c:1537
+#: src/mainwindow.c:1523
 msgid "You are offline. Go online?"
 msgstr "現在オフラインです。オンラインにしますか?"
 
-#: src/mainwindow.c:1551
+#: src/mainwindow.c:1537
 msgid "Empty all trash"
 msgstr "すべてのごみ箱を空にする"
 
-#: src/mainwindow.c:1552
+#: src/mainwindow.c:1538
 msgid "Empty messages in all trash?"
 msgstr "すべてのごみ箱の中のメッセージを削除しますか?"
 
-#: src/mainwindow.c:1580
+#: src/mainwindow.c:1566
 msgid "Add mailbox"
 msgstr "メールボックスを追加"
 
-#: src/mainwindow.c:1581
+#: src/mainwindow.c:1567
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3137,16 +3137,16 @@ msgstr ""
 "メールボックスの位置を入力してください。\n"
 "既存のメールボックスを指定すると自動的にスキャンします。"
 
-#: src/mainwindow.c:1587
+#: src/mainwindow.c:1573
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "メールボックス `%s' はすでに存在します。"
 
-#: src/mainwindow.c:1592 src/setup.c:57
+#: src/mainwindow.c:1578 src/setup.c:57
 msgid "Mailbox"
 msgstr "メール箱"
 
-#: src/mainwindow.c:1598 src/setup.c:63
+#: src/mainwindow.c:1584 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3155,149 +3155,149 @@ msgstr ""
 "メールボックスの作成に失敗しました。\n"
 "いくつかのファイルがすでに存在するか、あるいは書き込む権限がありません。"
 
-#: src/mainwindow.c:1989
+#: src/mainwindow.c:1975
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - フォルダビュー"
 
-#: src/mainwindow.c:2009 src/messageview.c:368
+#: src/mainwindow.c:1995 src/messageview.c:368
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - メッセージビュー"
 
-#: src/mainwindow.c:2156 src/summaryview.c:370
+#: src/mainwindow.c:2142 src/summaryview.c:370
 msgid "/_Reply"
 msgstr "/返信(_R)"
 
-#: src/mainwindow.c:2157
+#: src/mainwindow.c:2143
 msgid "/Reply to _all"
 msgstr "/全員に返信(_A)"
 
-#: src/mainwindow.c:2158
+#: src/mainwindow.c:2144
 msgid "/Reply to _sender"
 msgstr "/差出人に返信(_S)"
 
-#: src/mainwindow.c:2159
+#: src/mainwindow.c:2145
 msgid "/Reply to mailing _list"
 msgstr "/メーリングリストに返信(_L)"
 
-#: src/mainwindow.c:2164 src/summaryview.c:377
+#: src/mainwindow.c:2150 src/summaryview.c:377
 msgid "/_Forward"
 msgstr "/転送(_F)"
 
-#: src/mainwindow.c:2165 src/summaryview.c:378
+#: src/mainwindow.c:2151 src/summaryview.c:378
 msgid "/For_ward as attachment"
 msgstr "/添付として転送(_W)"
 
-#: src/mainwindow.c:2166 src/summaryview.c:379
+#: src/mainwindow.c:2152 src/summaryview.c:379
 msgid "/Redirec_t"
 msgstr "/手を加えずに転送(_T)"
 
-#: src/mainwindow.c:2205
+#: src/mainwindow.c:2188
 msgid "Get"
 msgstr "受信"
 
-#: src/mainwindow.c:2206
+#: src/mainwindow.c:2189
 msgid "Incorporate new mail"
 msgstr "新着メールの取込"
 
-#: src/mainwindow.c:2213
+#: src/mainwindow.c:2196
 msgid "Get all"
 msgstr "全受信"
 
-#: src/mainwindow.c:2214
+#: src/mainwindow.c:2197
 msgid "Incorporate new mail of all accounts"
 msgstr "全アカウントの新着メールの取込"
 
-#: src/mainwindow.c:2225
+#: src/mainwindow.c:2208
 msgid "Send queued message(s)"
 msgstr "送信待機中のメッセージを送信する"
 
-#: src/mainwindow.c:2235 src/prefs_account.c:721 src/prefs_common.c:949
+#: src/mainwindow.c:2218 src/prefs_account.c:721 src/prefs_common.c:949
 #: src/prefs_folder_item.c:137
 msgid "Compose"
 msgstr "作成"
 
-#: src/mainwindow.c:2236
+#: src/mainwindow.c:2219
 msgid "Compose new message"
 msgstr "新規メッセージを作成"
 
-#: src/mainwindow.c:2244 src/prefs_common.c:1448
+#: src/mainwindow.c:2227 src/prefs_common.c:1448
 msgid "Reply"
 msgstr "返信"
 
-#: src/mainwindow.c:2245 src/mainwindow.c:2258
+#: src/mainwindow.c:2228 src/mainwindow.c:2241
 msgid "Reply to the message"
 msgstr "メッセージに返信する"
 
-#: src/mainwindow.c:2263
+#: src/mainwindow.c:2245
 msgid "Reply all"
 msgstr "全員に返信"
 
-#: src/mainwindow.c:2264
+#: src/mainwindow.c:2246
 msgid "Reply to all"
 msgstr "全員に返信"
 
-#: src/mainwindow.c:2272 src/prefs_filter_edit.c:741
+#: src/mainwindow.c:2254 src/prefs_filter_edit.c:741
 msgid "Forward"
 msgstr "転送"
 
-#: src/mainwindow.c:2273 src/mainwindow.c:2286
+#: src/mainwindow.c:2255 src/mainwindow.c:2268
 msgid "Forward the message"
 msgstr "メッセージを転送する"
 
-#: src/mainwindow.c:2293
+#: src/mainwindow.c:2275
 msgid "Delete the message"
 msgstr "メッセージを削除する"
 
-#: src/mainwindow.c:2301 src/prefs_common.c:1988
+#: src/mainwindow.c:2283 src/prefs_common.c:1988
 msgid "Junk"
 msgstr "迷惑メール"
 
-#: src/mainwindow.c:2302
+#: src/mainwindow.c:2284
 msgid "Set as junk mail"
 msgstr "迷惑メールに指定"
 
-#: src/mainwindow.c:2311
+#: src/mainwindow.c:2293
 msgid "Execute"
 msgstr "実行"
 
-#: src/mainwindow.c:2312
+#: src/mainwindow.c:2294
 msgid "Execute marked process"
 msgstr "マークされた処理を実行"
 
-#: src/mainwindow.c:2322
+#: src/mainwindow.c:2304
 msgid "Next unread message"
 msgstr "次の未読メッセージ"
 
-#: src/mainwindow.c:2334
+#: src/mainwindow.c:2316
 msgid "Prefs"
 msgstr "設定"
 
-#: src/mainwindow.c:2335
+#: src/mainwindow.c:2317
 msgid "Common preferences"
 msgstr "全般の設定"
 
-#: src/mainwindow.c:2343 src/prefs_folder_item.c:261
+#: src/mainwindow.c:2325 src/prefs_folder_item.c:261
 #: src/prefs_folder_item.c:272 src/progressdialog.c:128
 msgid "Account"
 msgstr "アカウント"
 
-#: src/mainwindow.c:2344
+#: src/mainwindow.c:2326
 msgid "Account setting"
 msgstr "アカウントの設定"
 
-#: src/mainwindow.c:2527
+#: src/mainwindow.c:2498
 msgid "You are offline. Click the icon to go online."
 msgstr "現在オフラインです。アイコンをクリックするとオンラインになります。"
 
-#: src/mainwindow.c:2538
+#: src/mainwindow.c:2509
 msgid "You are online. Click the icon to go offline."
 msgstr "現在オンラインです。アイコンをクリックするとオフラインになります。"
 
-#: src/mainwindow.c:2731
+#: src/mainwindow.c:2702
 msgid "Exit"
 msgstr "終了"
 
-#: src/mainwindow.c:2731
+#: src/mainwindow.c:2702
 msgid "Exit this program?"
 msgstr "このプログラムを終了しますか?"
 
@@ -5488,11 +5488,11 @@ msgstr "進行状況ダイアログを作成中...\n"
 msgid "Status"
 msgstr "状態"
 
-#: src/recv.c:113
+#: src/recv.c:112
 msgid "error occurred while retrieving data.\n"
 msgstr "データの取得中にエラーが発生しました。\n"
 
-#: src/recv.c:155 src/recv.c:197 src/recv.c:213
+#: src/recv.c:154 src/recv.c:196 src/recv.c:211
 msgid "Can't write to file.\n"
 msgstr "ファイルに書き込めません。\n"
 
@@ -6225,7 +6225,7 @@ msgstr "%.2fMB"
 msgid "%.2fGB"
 msgstr "%.2fGB"
 
-#: src/utils.c:2372 src/utils.c:2496
+#: src/utils.c:2386 src/utils.c:2510
 #, c-format
 msgid "writing to %s failed.\n"
 msgstr "%s への書き込みに失敗しました。\n"
diff --git a/po/ko.po b/po/ko.po
index 73d7b56b..d0441f71 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed  0.8.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-08-09 18:08+0900\n"
+"POT-Creation-Date: 2005-08-22 17:22+0900\n"
 "PO-Revision-Date: 2002-12-02 11:09+0900\n"
 "Last-Translator: Nam SungHyun <namsh@kldp.org>\n"
 "Language-Team: Korean <gnome-kr-translation@lists.sourceforge.net>\n"
@@ -84,7 +84,7 @@ msgstr ""
 "받으려면 `G' 컬럼 상자를 선택하세요."
 
 #: src/account.c:691 src/addressadd.c:192 src/addressbook.c:490
-#: src/compose.c:4081 src/editaddress.c:200 src/editaddress.c:942
+#: src/compose.c:4079 src/editaddress.c:200 src/editaddress.c:942
 #: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:265
 #: src/editjpilot.c:271 src/editldap.c:307 src/editvcard.c:184
 #: src/mimeview.c:201 src/prefs_filter.c:258 src/prefs_folder_item.c:170
@@ -220,7 +220,7 @@ msgstr ""
 msgid "Add Address to Book"
 msgstr "주소록에 추가"
 
-#: src/addressadd.c:202 src/compose.c:4528 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4521 src/editaddress.c:201
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "주소"
@@ -234,7 +234,7 @@ msgstr "메모"
 msgid "Select Address Book Folder"
 msgstr "주소록 폴더 선택"
 
-#: src/addressbook.c:336 src/compose.c:495 src/mainwindow.c:470
+#: src/addressbook.c:336 src/compose.c:493 src/mainwindow.c:461
 #: src/messageview.c:137
 msgid "/_File"
 msgstr "/파일(_F)"
@@ -255,10 +255,10 @@ msgstr "/파일(_F)/새 JPilot(_J)"
 msgid "/_File/New _Server"
 msgstr "/파일(_F)/새 서버(_S)"
 
-#: src/addressbook.c:345 src/addressbook.c:348 src/compose.c:500
-#: src/compose.c:505 src/compose.c:509 src/mainwindow.c:488
-#: src/mainwindow.c:491 src/mainwindow.c:493 src/mainwindow.c:496
-#: src/mainwindow.c:498 src/messageview.c:140
+#: src/addressbook.c:345 src/addressbook.c:348 src/compose.c:498
+#: src/compose.c:503 src/compose.c:507 src/mainwindow.c:479
+#: src/mainwindow.c:482 src/mainwindow.c:484 src/mainwindow.c:487
+#: src/mainwindow.c:489 src/messageview.c:140
 msgid "/_File/---"
 msgstr "/파일(_F)/---"
 
@@ -274,7 +274,7 @@ msgstr "/파일(_F)/삭제(_D)"
 msgid "/_File/_Save"
 msgstr "/파일(_F)/저장(_S)"
 
-#: src/addressbook.c:350 src/compose.c:510 src/messageview.c:141
+#: src/addressbook.c:350 src/compose.c:508 src/messageview.c:141
 msgid "/_File/_Close"
 msgstr "/파일(_F)/닫기(_C)"
 
@@ -306,7 +306,7 @@ msgstr "/주소(_A)/편집(_E)"
 msgid "/_Address/_Delete"
 msgstr "/주소(_A)/삭제(_D)"
 
-#: src/addressbook.c:358 src/compose.c:619 src/mainwindow.c:725
+#: src/addressbook.c:358 src/compose.c:617 src/mainwindow.c:716
 #: src/messageview.c:256
 msgid "/_Tools"
 msgstr "/도구(_T)"
@@ -315,12 +315,12 @@ msgstr "/도구(_T)"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/도구(_T)/LDIF 파일 가져오기(_L)"
 
-#: src/addressbook.c:360 src/compose.c:632 src/mainwindow.c:775
+#: src/addressbook.c:360 src/compose.c:630 src/mainwindow.c:766
 #: src/messageview.c:274
 msgid "/_Help"
 msgstr "/도움말(_H)"
 
-#: src/addressbook.c:361 src/compose.c:633 src/mainwindow.c:786
+#: src/addressbook.c:361 src/compose.c:631 src/mainwindow.c:777
 #: src/messageview.c:275
 msgid "/_Help/_About"
 msgstr "/도움말(_H)/sylpheed 정보(_A)"
@@ -337,7 +337,7 @@ msgstr "/새 그룹(_G)"
 msgid "/New _Folder"
 msgstr "/새 폴더(_F)"
 
-#: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:489
+#: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:487
 #: src/folderview.c:235 src/folderview.c:237 src/folderview.c:241
 #: src/folderview.c:252 src/folderview.c:254 src/folderview.c:256
 #: src/folderview.c:260 src/folderview.c:270 src/folderview.c:272
@@ -347,8 +347,8 @@ msgstr "/새 폴더(_F)"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:512
-#: src/mainwindow.c:502 src/messageview.c:143
+#: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:510
+#: src/mainwindow.c:493 src/messageview.c:143
 msgid "/_Edit"
 msgstr "/편집(_E)"
 
@@ -360,7 +360,7 @@ msgstr "/삭제(_D)"
 msgid "E-Mail address"
 msgstr "이메일 주소"
 
-#: src/addressbook.c:495 src/compose.c:4529 src/prefs_common.c:2402
+#: src/addressbook.c:495 src/compose.c:4522 src/prefs_common.c:2402
 msgid "Address book"
 msgstr "주소록"
 
@@ -369,8 +369,8 @@ msgid "Name:"
 msgstr "이름:"
 
 #. Buttons
-#: src/addressbook.c:627 src/addressbook.c:1673 src/editaddress.c:884
-#: src/editaddress.c:1017 src/mainwindow.c:2292 src/prefs_actions.c:266
+#: src/addressbook.c:627 src/addressbook.c:1674 src/editaddress.c:884
+#: src/editaddress.c:1017 src/mainwindow.c:2274 src/prefs_actions.c:266
 #: src/prefs_display_header.c:278 src/prefs_display_header.c:333
 #: src/prefs_template.c:231
 msgid "Delete"
@@ -409,7 +409,7 @@ msgstr "주소를 삭제"
 msgid "Really delete the address(es)?"
 msgstr "정말로 주소를 삭제하시겠습니까?"
 
-#: src/addressbook.c:1664
+#: src/addressbook.c:1665
 #, fuzzy, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -418,38 +418,38 @@ msgstr ""
 "`%s'의 모든 주소와 폴더를 삭제할까요 ? \n"
 "폴더만 지울 경우 주소는 그 상위 폴더로 옮겨집니다."
 
-#: src/addressbook.c:1667 src/folderview.c:2139
+#: src/addressbook.c:1668 src/folderview.c:2139
 msgid "Delete folder"
 msgstr "폴더 삭제"
 
-#: src/addressbook.c:1667
+#: src/addressbook.c:1668
 #, fuzzy
 msgid "_Folder only"
 msgstr "폴더만"
 
-#: src/addressbook.c:1667
+#: src/addressbook.c:1668
 #, fuzzy
 msgid "Folder and _addresses"
 msgstr "폴더와 주소"
 
-#: src/addressbook.c:1672
+#: src/addressbook.c:1673
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "정말로 `%s'를 지우시겠습니까?"
 
-#: src/addressbook.c:2352 src/addressbook.c:2485
+#: src/addressbook.c:2353 src/addressbook.c:2486
 msgid "New user, could not save index file."
 msgstr "새 사용자, 색인 파일을 저장할 수 없습니다."
 
-#: src/addressbook.c:2356 src/addressbook.c:2489
+#: src/addressbook.c:2357 src/addressbook.c:2490
 msgid "New user, could not save address book files."
 msgstr "새 사용자, 주소록 파일을 저장할 수 없습니다."
 
-#: src/addressbook.c:2366 src/addressbook.c:2499
+#: src/addressbook.c:2367 src/addressbook.c:2500
 msgid "Old address book converted successfully."
 msgstr "예전 주소록을 성공적으로 변환하였습니다."
 
-#: src/addressbook.c:2371
+#: src/addressbook.c:2372
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -457,7 +457,7 @@ msgstr ""
 "예전 주소록이 변환되었습니다,\n"
 "새 주소록의 색인 파일을 저장할 수 없습니다"
 
-#: src/addressbook.c:2384
+#: src/addressbook.c:2385
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -465,7 +465,7 @@ msgstr ""
 "주소록을 변환할 수 없습니다,\n"
 "대신에 빈 새 주소록 파일을 생성하였습니다."
 
-#: src/addressbook.c:2390
+#: src/addressbook.c:2391
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -473,7 +473,7 @@ msgstr ""
 "주소록을 변환하지 못했습니다,\n"
 "새 주소록 파일을 생성하지 못했습니다."
 
-#: src/addressbook.c:2395
+#: src/addressbook.c:2396
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -481,84 +481,84 @@ msgstr ""
 "주소록을 변환하지 못했고\n"
 "새 주소록 파일도 생성하지 못했습니다."
 
-#: src/addressbook.c:2402
+#: src/addressbook.c:2403
 msgid "Addressbook conversion error"
 msgstr "주소록 변환 에러"
 
-#: src/addressbook.c:2406
+#: src/addressbook.c:2407
 msgid "Addressbook conversion"
 msgstr "주소록 변환"
 
-#: src/addressbook.c:2441
+#: src/addressbook.c:2442
 msgid "Addressbook Error"
 msgstr "주소록 에러"
 
-#: src/addressbook.c:2442 src/addressbook.c:2542
+#: src/addressbook.c:2443 src/addressbook.c:2543
 msgid "Could not read address index"
 msgstr "주소 색인을 읽을 수 없습니다"
 
-#: src/addressbook.c:2504
+#: src/addressbook.c:2505
 msgid "Old address book converted, could not save new address index file"
 msgstr "예전 주소록이 변환되었습니다, 새 주소록 색인 파일을 저장할 수 없습니다"
 
-#: src/addressbook.c:2518
+#: src/addressbook.c:2519
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr ""
 "주소록을 변환할 수 없습니다, 대신에 빈 새 주소록 파일을 생성하였습니다."
 
-#: src/addressbook.c:2524
+#: src/addressbook.c:2525
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr "주소록을 변환하지 못했습니다, 새 주소록 파일을 생성하지 못했습니다."
 
-#: src/addressbook.c:2530
+#: src/addressbook.c:2531
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr "주소록을 변환하지 못했고 새 주소록 파일도 생성하지 못했습니다."
 
-#: src/addressbook.c:2548
+#: src/addressbook.c:2549
 msgid "Addressbook Conversion Error"
 msgstr "주소록 변환 에러"
 
-#: src/addressbook.c:2554
+#: src/addressbook.c:2555
 msgid "Addressbook Conversion"
 msgstr "주소록 변환"
 
-#: src/addressbook.c:3055 src/prefs_common.c:963
+#: src/addressbook.c:3056 src/prefs_common.c:963
 msgid "Interface"
 msgstr "인터페이스"
 
-#: src/addressbook.c:3071 src/importldif.c:514
+#: src/addressbook.c:3072 src/importldif.c:514
 msgid "Address Book"
 msgstr "주소록"
 
-#: src/addressbook.c:3087
+#: src/addressbook.c:3088
 msgid "Person"
 msgstr "사람"
 
-#: src/addressbook.c:3103
+#: src/addressbook.c:3104
 msgid "EMail Address"
 msgstr "이메일 주소"
 
-#: src/addressbook.c:3119
+#: src/addressbook.c:3120
 msgid "Group"
 msgstr "그룹"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3135 src/folderview.c:346 src/prefs_account.c:1866
+#: src/addressbook.c:3136 src/folderview.c:346 src/prefs_account.c:1866
 msgid "Folder"
 msgstr "폴더"
 
-#: src/addressbook.c:3151
+#: src/addressbook.c:3152
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3167 src/addressbook.c:3183
+#: src/addressbook.c:3168 src/addressbook.c:3184
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3199
+#: src/addressbook.c:3200
 msgid "LDAP Server"
 msgstr "LDAP 서버"
 
@@ -570,7 +570,7 @@ msgstr "공용 주소록"
 msgid "Personal address"
 msgstr "개인 주소록"
 
-#: src/alertpanel.c:138 src/compose.c:5214 src/main.c:515
+#: src/alertpanel.c:138 src/compose.c:5208 src/main.c:515
 msgid "Notice"
 msgstr "알림"
 
@@ -625,382 +625,382 @@ msgstr "갈색"
 msgid "None"
 msgstr "없음"
 
-#: src/compose.c:487
+#: src/compose.c:485
 msgid "/_Add..."
 msgstr "/추가(_A)..."
 
-#: src/compose.c:488
+#: src/compose.c:486
 msgid "/_Remove"
 msgstr "/삭제(_R)"
 
-#: src/compose.c:490 src/folderview.c:243 src/folderview.c:262
+#: src/compose.c:488 src/folderview.c:243 src/folderview.c:262
 #: src/folderview.c:277
 #, fuzzy
 msgid "/_Properties..."
 msgstr "/특성(_P)..."
 
-#: src/compose.c:496
+#: src/compose.c:494
 #, fuzzy
 msgid "/_File/_Send"
 msgstr "/파일(_F)/저장(_S)"
 
-#: src/compose.c:498
+#: src/compose.c:496
 #, fuzzy
 msgid "/_File/Send _later"
 msgstr "/메시지(_M)/나중에 보내기(_l)"
 
-#: src/compose.c:501
+#: src/compose.c:499
 #, fuzzy
 msgid "/_File/Save to _draft folder"
 msgstr "/메시지(_M)/임시 보관함으로 보내기(_d)"
 
-#: src/compose.c:503
+#: src/compose.c:501
 #, fuzzy
 msgid "/_File/Save and _keep editing"
 msgstr "/메시지(_M)/저장하고 편집 보존(_k)"
 
-#: src/compose.c:506
+#: src/compose.c:504
 msgid "/_File/_Attach file"
 msgstr "/파일(_F)/첨부 파일(_A)"
 
-#: src/compose.c:507
+#: src/compose.c:505
 msgid "/_File/_Insert file"
 msgstr "/파일(_F)/파일 삽입(_I)"
 
-#: src/compose.c:508
+#: src/compose.c:506
 msgid "/_File/Insert si_gnature"
 msgstr "/파일(_F)/서명 삽입(_g)"
 
-#: src/compose.c:513
+#: src/compose.c:511
 msgid "/_Edit/_Undo"
 msgstr "/편집(_E)/실행취소(_U)"
 
-#: src/compose.c:514
+#: src/compose.c:512
 msgid "/_Edit/_Redo"
 msgstr "/편집(_E)/다시 실행(_R)"
 
-#: src/compose.c:515 src/compose.c:522 src/mainwindow.c:506
+#: src/compose.c:513 src/compose.c:520 src/mainwindow.c:497
 #: src/messageview.c:146
 msgid "/_Edit/---"
 msgstr "/편집(_E)/---"
 
-#: src/compose.c:516
+#: src/compose.c:514
 msgid "/_Edit/Cu_t"
 msgstr "/편집(_E)/잘라내기(_t)"
 
-#: src/compose.c:517 src/mainwindow.c:503 src/messageview.c:144
+#: src/compose.c:515 src/mainwindow.c:494 src/messageview.c:144
 msgid "/_Edit/_Copy"
 msgstr "/편집(_E)/복사(_C)"
 
-#: src/compose.c:518
+#: src/compose.c:516
 msgid "/_Edit/_Paste"
 msgstr "/편집(_E)/붙여넣기(_P)"
 
-#: src/compose.c:519
+#: src/compose.c:517
 msgid "/_Edit/Paste as _quotation"
 msgstr "/편집(_E)/quotation으로 붙여넣기(_q)"
 
-#: src/compose.c:521 src/mainwindow.c:504 src/messageview.c:145
+#: src/compose.c:519 src/mainwindow.c:495 src/messageview.c:145
 msgid "/_Edit/Select _all"
 msgstr "/편집(_E)/모두 선택(_a)"
 
-#: src/compose.c:523
+#: src/compose.c:521
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/편집(_E)/현재 단락 자동 줄바꿈(_W)"
 
-#: src/compose.c:525
+#: src/compose.c:523
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/편집(_E)/모든 긴 라인 자동 줄바꿈(_l)"
 
-#: src/compose.c:527
+#: src/compose.c:525
 #, fuzzy
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/편집(_E)/복사(_C)"
 
-#: src/compose.c:528 src/mainwindow.c:511 src/messageview.c:150
+#: src/compose.c:526 src/mainwindow.c:502 src/messageview.c:150
 #: src/summaryview.c:400
 msgid "/_View"
 msgstr "/보기(_V)"
 
-#: src/compose.c:529
+#: src/compose.c:527
 msgid "/_View/_To"
 msgstr "/보기(_V)/To(_T)"
 
-#: src/compose.c:530
+#: src/compose.c:528
 msgid "/_View/_Cc"
 msgstr "/보기(_V)/Cc(_C)"
 
-#: src/compose.c:531
+#: src/compose.c:529
 msgid "/_View/_Bcc"
 msgstr "/보기(_V)/Bcc(_B)"
 
-#: src/compose.c:532
+#: src/compose.c:530
 msgid "/_View/_Reply to"
 msgstr "/보기(_V)/Reply to(_R)"
 
-#: src/compose.c:533 src/compose.c:535 src/compose.c:537 src/compose.c:539
-#: src/mainwindow.c:529 src/mainwindow.c:532 src/mainwindow.c:558
-#: src/mainwindow.c:582 src/mainwindow.c:675 src/mainwindow.c:679
+#: src/compose.c:531 src/compose.c:533 src/compose.c:535 src/compose.c:537
+#: src/mainwindow.c:520 src/mainwindow.c:523 src/mainwindow.c:549
+#: src/mainwindow.c:573 src/mainwindow.c:666 src/mainwindow.c:670
 #: src/messageview.c:233
 msgid "/_View/---"
 msgstr "/보기(_V)/---"
 
-#: src/compose.c:534
+#: src/compose.c:532
 msgid "/_View/_Followup to"
 msgstr "/보기(_V)/따라올리기(_F)"
 
-#: src/compose.c:536
+#: src/compose.c:534
 msgid "/_View/R_uler"
 msgstr "/보기(_V)/Ruler(_u)"
 
-#: src/compose.c:538
+#: src/compose.c:536
 msgid "/_View/_Attachment"
 msgstr "/보기(_V)/첨부(_A)"
 
-#: src/compose.c:545 src/mainwindow.c:589 src/messageview.c:157
+#: src/compose.c:543 src/mainwindow.c:580 src/messageview.c:157
 #, fuzzy
 msgid "/_View/Character _encoding"
 msgstr "/보기(_V)/정렬(_S)/내림차순"
 
-#: src/compose.c:546
+#: src/compose.c:544
 msgid "/_View/Character _encoding/_Automatic"
 msgstr ""
 
-#: src/compose.c:548 src/compose.c:554 src/compose.c:560 src/compose.c:564
-#: src/compose.c:570 src/compose.c:574 src/compose.c:580 src/compose.c:584
-#: src/compose.c:594 src/compose.c:598 src/compose.c:608 src/compose.c:612
-#: src/mainwindow.c:585 src/mainwindow.c:592 src/messageview.c:153
+#: src/compose.c:546 src/compose.c:552 src/compose.c:558 src/compose.c:562
+#: src/compose.c:568 src/compose.c:572 src/compose.c:578 src/compose.c:582
+#: src/compose.c:592 src/compose.c:596 src/compose.c:606 src/compose.c:610
+#: src/mainwindow.c:576 src/mainwindow.c:583 src/messageview.c:153
 #, fuzzy
 msgid "/_View/Character _encoding/---"
 msgstr "/보기(_V)/정렬(_S)/내림차순"
 
-#: src/compose.c:550 src/mainwindow.c:593 src/messageview.c:161
+#: src/compose.c:548 src/mainwindow.c:584 src/messageview.c:161
 #, fuzzy
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/보기(_V)/문자셋(_C)/7bit 아스키 (US-ASC_II)"
 
-#: src/compose.c:552 src/mainwindow.c:595 src/messageview.c:164
+#: src/compose.c:550 src/mainwindow.c:586 src/messageview.c:164
 #, fuzzy
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/보기(_V)/문자셋(_C)/유니코드(_UTF-8)"
 
-#: src/compose.c:556 src/mainwindow.c:599 src/messageview.c:167
+#: src/compose.c:554 src/mainwindow.c:590 src/messageview.c:167
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/보기(_V)/문자셋(_C)/서부 유럽(ISO-8859-_1)"
 
-#: src/compose.c:558 src/mainwindow.c:601 src/messageview.c:169
+#: src/compose.c:556 src/mainwindow.c:592 src/messageview.c:169
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/보기(_V)/문자셋(_C)/서부 유럽(ISO-8859-15)"
 
-#: src/compose.c:562 src/mainwindow.c:605 src/messageview.c:172
+#: src/compose.c:560 src/mainwindow.c:596 src/messageview.c:172
 #, fuzzy
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/보기(_V)/문자셋(_C)/중앙 유럽(ISO-8859-_2)"
 
-#: src/compose.c:566 src/mainwindow.c:609 src/messageview.c:175
+#: src/compose.c:564 src/mainwindow.c:600 src/messageview.c:175
 #, fuzzy
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/보기(_V)/문자셋(_C)/_Baltic (ISO-8859-13)"
 
-#: src/compose.c:568 src/mainwindow.c:611 src/messageview.c:177
+#: src/compose.c:566 src/mainwindow.c:602 src/messageview.c:177
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/보기(_V)/문자셋(_C)/Baltic (ISO-8859-_4)"
 
-#: src/compose.c:572 src/mainwindow.c:615 src/messageview.c:180
+#: src/compose.c:570 src/mainwindow.c:606 src/messageview.c:180
 #, fuzzy
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/보기(_V)/문자셋(_C)/그리스(ISO-8859-_7)"
 
-#: src/compose.c:576 src/mainwindow.c:619 src/messageview.c:183
+#: src/compose.c:574 src/mainwindow.c:610 src/messageview.c:183
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/보기(_V)/문자셋(_C)/그리스(ISO-8859-_7)"
 
-#: src/compose.c:578 src/mainwindow.c:621 src/messageview.c:185
+#: src/compose.c:576 src/mainwindow.c:612 src/messageview.c:185
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/보기(_V)/문자셋(_C)/Cyrillic (Windows-1251)"
 
-#: src/compose.c:582 src/mainwindow.c:625 src/messageview.c:188
+#: src/compose.c:580 src/mainwindow.c:616 src/messageview.c:188
 #, fuzzy
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/보기(_V)/문자셋(_C)/터기 (ISO-8859-_9)"
 
-#: src/compose.c:586 src/mainwindow.c:629 src/messageview.c:191
+#: src/compose.c:584 src/mainwindow.c:620 src/messageview.c:191
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/보기(_V)/문자셋(_C)/Cyrillic (ISo-8859-_5)"
 
-#: src/compose.c:588 src/mainwindow.c:631 src/messageview.c:193
+#: src/compose.c:586 src/mainwindow.c:622 src/messageview.c:193
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/보기(_V)/문자셋(_C)/Cyrillic (KOI8-_R)"
 
-#: src/compose.c:590 src/mainwindow.c:633 src/messageview.c:195
+#: src/compose.c:588 src/mainwindow.c:624 src/messageview.c:195
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/보기(_V)/문자셋(_C)/Cyrillic (KOI8-_R)"
 
-#: src/compose.c:592 src/mainwindow.c:635 src/messageview.c:197
+#: src/compose.c:590 src/mainwindow.c:626 src/messageview.c:197
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/보기(_V)/문자셋(_C)/Cyrillic (Windows-1251)"
 
-#: src/compose.c:596 src/mainwindow.c:639 src/messageview.c:200
+#: src/compose.c:594 src/mainwindow.c:630 src/messageview.c:200
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/보기(_V)/문자셋(_C)/일본 (ISO-2022-_JP)"
 
-#: src/compose.c:600 src/mainwindow.c:649 src/messageview.c:209
+#: src/compose.c:598 src/mainwindow.c:640 src/messageview.c:209
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/보기(_V)/문자셋(_C)/Simplified Chinese (_GB2312)"
 
-#: src/compose.c:602 src/mainwindow.c:651 src/messageview.c:211
+#: src/compose.c:600 src/mainwindow.c:642 src/messageview.c:211
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/보기(_V)/문자셋(_C)/Simplified Chinese (_GB2312)"
 
-#: src/compose.c:604 src/mainwindow.c:653 src/messageview.c:213
+#: src/compose.c:602 src/mainwindow.c:644 src/messageview.c:213
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/보기(_V)/문자셋(_C)/Traditional Chinese (_Big5)"
 
-#: src/compose.c:606 src/mainwindow.c:655 src/messageview.c:215
+#: src/compose.c:604 src/mainwindow.c:646 src/messageview.c:215
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/보기(_V)/문자셋(_C)/Traditional Chinese (EUC-_TW)"
 
-#: src/compose.c:610 src/mainwindow.c:661 src/messageview.c:220
+#: src/compose.c:608 src/mainwindow.c:652 src/messageview.c:220
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/보기(_V)/문자셋(_C)/한국 (EUC-KR)"
 
-#: src/compose.c:614 src/mainwindow.c:667 src/messageview.c:225
+#: src/compose.c:612 src/mainwindow.c:658 src/messageview.c:225
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/보기(_V)/문자셋(_C)/Thai (TIS-620)"
 
-#: src/compose.c:616 src/mainwindow.c:669 src/messageview.c:227
+#: src/compose.c:614 src/mainwindow.c:660 src/messageview.c:227
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/보기(_V)/문자셋(_C)/Thai (Windows-874)"
 
-#: src/compose.c:620 src/mainwindow.c:726 src/messageview.c:257
+#: src/compose.c:618 src/mainwindow.c:717 src/messageview.c:257
 msgid "/_Tools/_Address book"
 msgstr "/도구(_T)/주소록(_A)"
 
-#: src/compose.c:621
+#: src/compose.c:619
 msgid "/_Tools/_Template"
 msgstr "/도구(_T)/템플릿(_T)"
 
-#: src/compose.c:622 src/mainwindow.c:749 src/messageview.c:272
+#: src/compose.c:620 src/mainwindow.c:740 src/messageview.c:272
 msgid "/_Tools/Actio_ns"
 msgstr "/도구(_T)/동작(_n)"
 
-#: src/compose.c:623 src/compose.c:627 src/mainwindow.c:729
-#: src/mainwindow.c:743 src/mainwindow.c:748 src/mainwindow.c:750
-#: src/mainwindow.c:753 src/mainwindow.c:755 src/messageview.c:260
+#: src/compose.c:621 src/compose.c:625 src/mainwindow.c:720
+#: src/mainwindow.c:734 src/mainwindow.c:739 src/mainwindow.c:741
+#: src/mainwindow.c:744 src/mainwindow.c:746 src/messageview.c:260
 #: src/messageview.c:271
 msgid "/_Tools/---"
 msgstr "/도구(_T)/---"
 
-#: src/compose.c:624
+#: src/compose.c:622
 #, fuzzy
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/편집(_E)/외부 편집기로 편집(_x)"
 
-#: src/compose.c:628
+#: src/compose.c:626
 #, fuzzy
 msgid "/_Tools/PGP Si_gn"
 msgstr "/도구(_T)/동작(_n)"
 
-#: src/compose.c:629
+#: src/compose.c:627
 #, fuzzy
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/메시지(_M)/암호화(_E)"
 
-#: src/compose.c:855
+#: src/compose.c:853
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: 파일이 없습니다\n"
 
-#: src/compose.c:954 src/compose.c:1024 src/procmsg.c:1353
+#: src/compose.c:952 src/compose.c:1022 src/procmsg.c:1353
 msgid "Can't get text part\n"
 msgstr "텍스트 부분을 얻을 수가 없습니다\n"
 
-#: src/compose.c:1420
+#: src/compose.c:1418
 msgid "Quote mark format error."
 msgstr "인용 부호 형식 에러."
 
-#: src/compose.c:1432
+#: src/compose.c:1430
 msgid "Message reply/forward format error."
 msgstr "메시지 회신/전달 형식 에러."
 
-#: src/compose.c:1801
+#: src/compose.c:1799
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "%s파일이 없습니다\n"
 
-#: src/compose.c:1805
+#: src/compose.c:1803
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "%s의 파일 크기를 알수가 없습니다\n"
 
-#: src/compose.c:1809
+#: src/compose.c:1807
 #, c-format
 msgid "File %s is empty."
 msgstr "%s 파일이 빈 파일입니다."
 
-#: src/compose.c:1813
+#: src/compose.c:1811
 #, c-format
 msgid "Can't read %s."
 msgstr "%s를 읽을 수가 없습니다."
 
-#: src/compose.c:1848
+#: src/compose.c:1846
 #, c-format
 msgid "Message: %s"
 msgstr "메시지: %s"
 
-#: src/compose.c:1920 src/mimeview.c:560
+#: src/compose.c:1918 src/mimeview.c:560
 msgid "Can't get the part of multipart message."
 msgstr "multipart 메시지의 부분을 얻을 수가 없습니다."
 
-#: src/compose.c:2362
+#: src/compose.c:2360
 msgid " [Edited]"
 msgstr " [수정됨]"
 
-#: src/compose.c:2364
+#: src/compose.c:2362
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - 메시지 편집%s "
 
-#: src/compose.c:2367
+#: src/compose.c:2365
 #, c-format
 msgid "Compose message%s"
 msgstr "메시지%s 편집"
 
-#: src/compose.c:2478
+#: src/compose.c:2476
 msgid "Recipient is not specified."
 msgstr "받는 사람이 지정되지않았습니다"
 
-#: src/compose.c:2486
+#: src/compose.c:2484
 #, fuzzy
 msgid "Empty subject"
 msgstr "제목"
 
-#: src/compose.c:2487
+#: src/compose.c:2485
 msgid "Subject is empty. Send it anyway?"
 msgstr "제목이 비었습니다. 그래도 보낼까요?"
 
-#: src/compose.c:2538
+#: src/compose.c:2536
 msgid "can't get recipient list."
 msgstr "받는 사람 목록을 얻을 수가 없습니다"
 
-#: src/compose.c:2558
+#: src/compose.c:2556
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1008,26 +1008,26 @@ msgstr ""
 "메일을 보내기위한 계정이 지정되어있지않습니다.\n"
 "보내기 전에 메일 계정을 선택하세요."
 
-#: src/compose.c:2572 src/send_message.c:297
+#: src/compose.c:2570 src/send_message.c:297
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "%s로 메시지를 보내는 중 에러가 발생했습니다."
 
-#: src/compose.c:2595
+#: src/compose.c:2593
 msgid "Can't save the message to outbox."
 msgstr "메시지를 보낸 편지함에 저장할 수가 없습니다"
 
-#: src/compose.c:2645
+#: src/compose.c:2643
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "현재 선택된 키 ID `%s'에 연결된 어떤 키도 찾을 수 없습니다."
 
-#: src/compose.c:2709 src/compose.c:2965 src/compose.c:3028 src/compose.c:3148
-#: src/utils.c:2365
+#: src/compose.c:2707 src/compose.c:2963 src/compose.c:3026 src/compose.c:3146
+#: src/utils.c:2379
 msgid "can't change file mode\n"
 msgstr "파일 모드를 바꿀수가 없습니다\n"
 
-#: src/compose.c:2741
+#: src/compose.c:2739
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1037,12 +1037,12 @@ msgstr ""
 "메시지의 문자셋을 변경할 수가 없습니다.\n"
 "그래도 보낼까요?"
 
-#: src/compose.c:2747
+#: src/compose.c:2745
 #, fuzzy
 msgid "Code conversion error"
 msgstr "주소록 변환 에러"
 
-#: src/compose.c:2816
+#: src/compose.c:2814
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1051,156 +1051,156 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:2820
+#: src/compose.c:2818
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3108
+#: src/compose.c:3106
 msgid "can't remove the old message\n"
 msgstr "오래된 메시지를 제거할 수가 없습니다\n"
 
-#: src/compose.c:3126
+#: src/compose.c:3124
 msgid "queueing message...\n"
 msgstr "메시지를 임시 보관합니다...\n"
 
-#: src/compose.c:3208
+#: src/compose.c:3206
 msgid "can't find queue folder\n"
 msgstr "큐 폴더를 찾을 수가 없습니다\n"
 
-#: src/compose.c:3215
+#: src/compose.c:3213
 msgid "can't queue the message\n"
 msgstr "메시지를 임시 보관할 수가 없습니다\n"
 
-#: src/compose.c:3792
+#: src/compose.c:3790
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "생성된 Message-ID: %s\n"
 
-#: src/compose.c:3901
+#: src/compose.c:3899
 msgid "Creating compose window...\n"
 msgstr "편집창을 생성합니다...\n"
 
-#: src/compose.c:3949 src/headerview.c:54 src/summary_search.c:214
+#: src/compose.c:3947 src/headerview.c:54 src/summary_search.c:214
 msgid "From:"
 msgstr "보낸 사람:"
 
-#: src/compose.c:4021
+#: src/compose.c:4019
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/도구(_T)/동작(_n)"
 
-#: src/compose.c:4024
+#: src/compose.c:4022
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/메시지(_M)/암호화(_E)"
 
-#: src/compose.c:4062 src/compose.c:5001
+#: src/compose.c:4060 src/compose.c:4995
 msgid "MIME type"
 msgstr "마임 타입"
 
 #. S_COL_DATE
-#: src/compose.c:4071 src/mimeview.c:192 src/prefs_filter_edit.c:585
+#: src/compose.c:4069 src/mimeview.c:192 src/prefs_filter_edit.c:585
 #: src/prefs_summary_column.c:75 src/select-keys.c:317 src/summaryview.c:4217
 msgid "Size"
 msgstr "크기"
 
-#: src/compose.c:4449 src/mainwindow.c:2224 src/prefs_account.c:719
+#: src/compose.c:4442 src/mainwindow.c:2207 src/prefs_account.c:719
 #: src/prefs_common.c:947
 msgid "Send"
 msgstr "메일 발송"
 
-#: src/compose.c:4450
+#: src/compose.c:4443
 msgid "Send message"
 msgstr "메시지 보내기"
 
-#: src/compose.c:4458
+#: src/compose.c:4451
 msgid "Send later"
 msgstr "나중에 보내기"
 
-#: src/compose.c:4459
+#: src/compose.c:4452
 msgid "Put into queue folder and send later"
 msgstr "보낼 편지함에 넣어서 나중에 보내기"
 
-#: src/compose.c:4467
+#: src/compose.c:4460
 msgid "Draft"
 msgstr "임시 보관함"
 
-#: src/compose.c:4468
+#: src/compose.c:4461
 msgid "Save to draft folder"
 msgstr "임시 보관함에 넣기"
 
-#: src/compose.c:4478
+#: src/compose.c:4471
 msgid "Insert"
 msgstr "삽입"
 
-#: src/compose.c:4479
+#: src/compose.c:4472
 msgid "Insert file"
 msgstr "파일을 삽입합니다"
 
-#: src/compose.c:4487
+#: src/compose.c:4480
 msgid "Attach"
 msgstr "첨부"
 
-#: src/compose.c:4488
+#: src/compose.c:4481
 msgid "Attach file"
 msgstr "파일 첨부"
 
 #. signature
-#: src/compose.c:4498 src/prefs_account.c:1391 src/prefs_common.c:1356
+#: src/compose.c:4491 src/prefs_account.c:1391 src/prefs_common.c:1356
 msgid "Signature"
 msgstr "서명"
 
-#: src/compose.c:4499
+#: src/compose.c:4492
 msgid "Insert signature"
 msgstr "서명 파일을 끼워넣습니다"
 
-#: src/compose.c:4508 src/prefs_common.c:1378 src/prefs_common.c:2382
+#: src/compose.c:4501 src/prefs_common.c:1378 src/prefs_common.c:2382
 msgid "Editor"
 msgstr "편집기"
 
-#: src/compose.c:4509
+#: src/compose.c:4502
 msgid "Edit with external editor"
 msgstr "외부 편집기로 편집"
 
-#: src/compose.c:4517
+#: src/compose.c:4510
 msgid "Linewrap"
 msgstr "줄바꿈"
 
-#: src/compose.c:4518
+#: src/compose.c:4511
 msgid "Wrap all long lines"
 msgstr "긴 줄에대해 자동 줄바꿈을 합니다"
 
-#: src/compose.c:4897
+#: src/compose.c:4891
 msgid "Invalid MIME type."
 msgstr "올바르지않은 마임 타입."
 
-#: src/compose.c:4915
+#: src/compose.c:4909
 msgid "File doesn't exist or is empty."
 msgstr "파일이 없거나 비여있습니다."
 
-#: src/compose.c:4983
+#: src/compose.c:4977
 #, fuzzy
 msgid "Properties"
 msgstr "특성"
 
-#: src/compose.c:5003
+#: src/compose.c:4997
 msgid "Encoding"
 msgstr "인코딩"
 
-#: src/compose.c:5026 src/prefs_folder_item.c:183
+#: src/compose.c:5020 src/prefs_folder_item.c:183
 msgid "Path"
 msgstr "경로"
 
-#: src/compose.c:5027
+#: src/compose.c:5021
 msgid "File name"
 msgstr "파일 이름"
 
-#: src/compose.c:5185
+#: src/compose.c:5179
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "외부 편집기 명령어가 올바르지않습니다: `%s'\n"
 
-#: src/compose.c:5211
+#: src/compose.c:5205
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1211,75 +1211,75 @@ msgstr ""
 "이 프로세스를 강제로 종료시킬까요?\n"
 "프로세스 그룹 아이디: %d"
 
-#: src/compose.c:5228
+#: src/compose.c:5222
 #, c-format
 msgid "Terminated process group id: %d"
 msgstr "프로세스 그룹 id: %d를 종료시킴"
 
-#: src/compose.c:5229
+#: src/compose.c:5223
 #, c-format
 msgid "Temporary file: %s"
 msgstr "임시 파일: %s"
 
-#: src/compose.c:5253
+#: src/compose.c:5247
 msgid "Compose: input from monitoring process\n"
 msgstr "편집: 모니터링하는 프로세스로부터 입력이 있었습니다\n"
 
 #. failed
-#: src/compose.c:5284
+#: src/compose.c:5278
 msgid "Couldn't exec external editor\n"
 msgstr "외부 편집기를 실행할 수가 없습니다\n"
 
-#: src/compose.c:5288
+#: src/compose.c:5282
 msgid "Couldn't write to file\n"
 msgstr "파일로 쓸 수가 없습니다\n"
 
-#: src/compose.c:5290
+#: src/compose.c:5284
 msgid "Pipe read failed\n"
 msgstr "파이프 읽기 실패\n"
 
-#: src/compose.c:5596 src/compose.c:5604 src/compose.c:5610
+#: src/compose.c:5590 src/compose.c:5598 src/compose.c:5604
 msgid "Can't queue the message."
 msgstr "메시지를 임시 보관함에 넣을수가 없습니다."
 
-#: src/compose.c:5701
+#: src/compose.c:5695
 #, fuzzy
 msgid "Select files"
 msgstr "파일 선택"
 
-#: src/compose.c:5723
+#: src/compose.c:5717
 msgid "Select file"
 msgstr "파일 선택"
 
-#: src/compose.c:5760
+#: src/compose.c:5754
 #, fuzzy
 msgid "Save message"
 msgstr "메시지 보내기"
 
-#: src/compose.c:5761
+#: src/compose.c:5755
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "이 메시지는 수정되었습니다. 변경사항을 버릴까요?"
 
-#: src/compose.c:5763
+#: src/compose.c:5757
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:5805
+#: src/compose.c:5799
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "`%s' 템플릿을 적용할까요?"
 
-#: src/compose.c:5807
+#: src/compose.c:5801
 msgid "Apply template"
 msgstr "템플릿을 적용합니다."
 
-#: src/compose.c:5808
+#: src/compose.c:5802
 #, fuzzy
 msgid "_Replace"
 msgstr "대체"
 
-#: src/compose.c:5808
+#: src/compose.c:5802
 #, fuzzy
 msgid "_Insert"
 msgstr "삽입"
@@ -1726,12 +1726,12 @@ msgstr "폴더 정보를 설정합니다...\n"
 msgid "Setting folder info..."
 msgstr "폴더 정보를 설정합니다..."
 
-#: src/folderview.c:805 src/mainwindow.c:3301 src/setup.c:81
+#: src/folderview.c:805 src/mainwindow.c:3272 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "%s%c%s를 스캔합니다..."
 
-#: src/folderview.c:809 src/mainwindow.c:3306 src/setup.c:86
+#: src/folderview.c:809 src/mainwindow.c:3277 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "%s 폴더를 스캔합니다..."
@@ -2057,45 +2057,45 @@ msgstr "인증 방법"
 msgid "IMAP4 login failed.\n"
 msgstr "IMAP4 로그인을 실패했습니다.\n"
 
-#: src/imap.c:3522
+#: src/imap.c:3528
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "%s를 %s에 붙일 수 없습니다\n"
 
-#: src/imap.c:3529
+#: src/imap.c:3535
 msgid "(sending file...)"
 msgstr "(파일을 보냅니다...)"
 
-#: src/imap.c:3557
+#: src/imap.c:3563
 #, fuzzy, c-format
 msgid "can't append message to %s\n"
 msgstr "%s 메시지를 추가할 수가 없습니다\n"
 
-#: src/imap.c:3589
+#: src/imap.c:3595
 #, fuzzy, c-format
 msgid "can't copy %s to %s\n"
 msgstr "%d를 %s로 복사할 수가 없습니다\n"
 
-#: src/imap.c:3613
+#: src/imap.c:3619
 #, fuzzy, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "imap 명령어 실행중 에러: STORE %d:%d %s\n"
 
-#: src/imap.c:3627
+#: src/imap.c:3633
 msgid "error while imap command: EXPUNGE\n"
 msgstr "imap 명령어 실행중 에러: EXPUNGE\n"
 
-#: src/imap.c:3640
+#: src/imap.c:3646
 #, fuzzy
 msgid "error while imap command: CLOSE\n"
 msgstr "imap 명령어 실행중 에러: EXPUNGE\n"
 
-#: src/imap.c:3873
+#: src/imap.c:3879
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv가 UTF-7를 %s로 변환할 수 없습니다\n"
 
-#: src/imap.c:3903
+#: src/imap.c:3909
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv가 %s를 UTF-7로 변환할 수 없습니다\n"
@@ -2197,7 +2197,7 @@ msgstr "LDIF 파일을 주소록으로 가져오기"
 msgid "Prev"
 msgstr "이전"
 
-#: src/importldif.c:768 src/mainwindow.c:2321
+#: src/importldif.c:768 src/mainwindow.c:2303
 msgid "Next"
 msgstr "다음"
 
@@ -2536,647 +2536,647 @@ msgid ""
 "Do you want to migrate it?"
 msgstr ""
 
-#: src/mainwindow.c:471
+#: src/mainwindow.c:462
 msgid "/_File/_Folder"
 msgstr "/파일(_F)/폴더(_F)"
 
-#: src/mainwindow.c:472
+#: src/mainwindow.c:463
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/파일(_F)/폴더(_F)/새 폴더(_n)"
 
-#: src/mainwindow.c:474
+#: src/mainwindow.c:465
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/파일(_F)/폴더(_F)/폴더 이름 변경(_R)..."
 
-#: src/mainwindow.c:475
+#: src/mainwindow.c:466
 #, fuzzy
 msgid "/_File/_Folder/_Move folder..."
 msgstr "/파일(_F)/폴더(_F)/폴더 이름 변경(_R)..."
 
-#: src/mainwindow.c:476
+#: src/mainwindow.c:467
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/파일(_F)/폴더(_F)/폴더 삭제(_D)"
 
-#: src/mainwindow.c:477
+#: src/mainwindow.c:468
 #, fuzzy
 msgid "/_File/_Mailbox"
 msgstr "/파일(_F)/메일 박스 추가(_A)..."
 
-#: src/mainwindow.c:478
+#: src/mainwindow.c:469
 #, fuzzy
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/파일(_F)/메일 박스 추가(_A)..."
 
-#: src/mainwindow.c:479
+#: src/mainwindow.c:470
 #, fuzzy
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/메일박스를 지우기(_m)"
 
-#: src/mainwindow.c:480 src/mainwindow.c:485
+#: src/mainwindow.c:471 src/mainwindow.c:476
 #, fuzzy
 msgid "/_File/_Mailbox/---"
 msgstr "/파일(_F)/폴더(_F)"
 
-#: src/mainwindow.c:481
+#: src/mainwindow.c:472
 #, fuzzy
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "/새 메시지 확인(_C)"
 
-#: src/mainwindow.c:483
+#: src/mainwindow.c:474
 #, fuzzy
 msgid "/_File/_Mailbox/Check for new messages in _all mailboxes"
 msgstr "/파일(_F)/모든 폴더의 새 메시지 확인(_C)"
 
-#: src/mainwindow.c:486
+#: src/mainwindow.c:477
 #, fuzzy
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "/폴더 트리 갱신(_e)"
 
-#: src/mainwindow.c:489
+#: src/mainwindow.c:480
 msgid "/_File/_Import mbox file..."
 msgstr "/파일(_F)/mbox 파일 가져오기(_I)..."
 
-#: src/mainwindow.c:490
+#: src/mainwindow.c:481
 msgid "/_File/_Export to mbox file..."
 msgstr "/파일(_F)/mbox 파일로 저장(_E)..."
 
-#: src/mainwindow.c:492
+#: src/mainwindow.c:483
 #, fuzzy
 msgid "/_File/Empty all _trash"
 msgstr "/파일(_F)/지운 편지함 비우기(_t)"
 
-#: src/mainwindow.c:494 src/messageview.c:138
+#: src/mainwindow.c:485 src/messageview.c:138
 msgid "/_File/_Save as..."
 msgstr "/파일(_F)/새 이름으로(_S)..."
 
-#: src/mainwindow.c:495 src/messageview.c:139
+#: src/mainwindow.c:486 src/messageview.c:139
 msgid "/_File/_Print..."
 msgstr "/파일(_F)/인쇄(_P)..."
 
-#: src/mainwindow.c:497
+#: src/mainwindow.c:488
 #, fuzzy
 msgid "/_File/_Work offline"
 msgstr "/파일(_F)/파일 삽입(_I)"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:500
+#: src/mainwindow.c:491
 msgid "/_File/E_xit"
 msgstr "/파일(_F)/끝내기(_x)"
 
-#: src/mainwindow.c:505
+#: src/mainwindow.c:496
 msgid "/_Edit/Select _thread"
 msgstr "/편집(_E)/쓰레드 선택(_t)"
 
-#: src/mainwindow.c:507 src/messageview.c:147
+#: src/mainwindow.c:498 src/messageview.c:147
 msgid "/_Edit/_Find in current message..."
 msgstr "/편집(_E)/현재 메시지 찾기(_F)..."
 
-#: src/mainwindow.c:509
+#: src/mainwindow.c:500
 msgid "/_Edit/_Search messages..."
 msgstr "/편집(_E)/메시지 찾기(_S)..."
 
-#: src/mainwindow.c:512
+#: src/mainwindow.c:503
 msgid "/_View/Show or hi_de"
 msgstr "/보기(_V)/보이거나 감추기(_d)"
 
-#: src/mainwindow.c:513
+#: src/mainwindow.c:504
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/보기(_V)/보이거나 감추기(d)/폴더 트리(_F)"
 
-#: src/mainwindow.c:515
+#: src/mainwindow.c:506
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/보기(_V)/보이거나 감추기(_d)/메시지 보기(_M)"
 
-#: src/mainwindow.c:517
+#: src/mainwindow.c:508
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/보기(_V)/보이거나 감추기(_d)/툴바(_T)"
 
-#: src/mainwindow.c:519
+#: src/mainwindow.c:510
 msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/보기(_V)/보이거나 감추기(_d)/툴바(_T)/아이콘과 텍스트(_a)"
 
-#: src/mainwindow.c:521
+#: src/mainwindow.c:512
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/보기(_V)/보이거나 감추기(_d)/툴바(_T)/아이콘(_I)"
 
-#: src/mainwindow.c:523
+#: src/mainwindow.c:514
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/보기(_V)/보이거나 감추기(_d)/툴바(_T)/텍스트(_T)"
 
-#: src/mainwindow.c:525
+#: src/mainwindow.c:516
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/보기(_V)/보이거나 감추기(_d)/툴바(_T)/없음(_N)"
 
-#: src/mainwindow.c:527
+#: src/mainwindow.c:518
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/보기(_V)/보이거나 감추기(_d)/상태바(_b)"
 
-#: src/mainwindow.c:530
+#: src/mainwindow.c:521
 msgid "/_View/Separate f_older tree"
 msgstr "/보기(_V)/별도의 폴더 트리 창(_o)"
 
-#: src/mainwindow.c:531
+#: src/mainwindow.c:522
 #, fuzzy
 msgid "/_View/Separate _message view"
 msgstr "/보기(_V)/별도의 메시지 창(_e)"
 
-#: src/mainwindow.c:533
+#: src/mainwindow.c:524
 msgid "/_View/_Sort"
 msgstr "/보기(_V)/정렬(_S)"
 
-#: src/mainwindow.c:534
+#: src/mainwindow.c:525
 msgid "/_View/_Sort/by _number"
 msgstr "/보기(_V)/정렬(_S)/번호(_n)"
 
-#: src/mainwindow.c:535
+#: src/mainwindow.c:526
 msgid "/_View/_Sort/by s_ize"
 msgstr "/보기(_V)/정렬(_S)/크기(_i)"
 
-#: src/mainwindow.c:536
+#: src/mainwindow.c:527
 msgid "/_View/_Sort/by _date"
 msgstr "/보기(_V)/정렬(_S)/날짜(_d)"
 
-#: src/mainwindow.c:537
+#: src/mainwindow.c:528
 msgid "/_View/_Sort/by _from"
 msgstr "/보기(_V)/정렬(_S)/보낸 사람(_f)"
 
-#: src/mainwindow.c:538
+#: src/mainwindow.c:529
 #, fuzzy
 msgid "/_View/_Sort/by _recipient"
 msgstr "/보기(_V)/정렬(_S)/크기(_i)"
 
-#: src/mainwindow.c:539
+#: src/mainwindow.c:530
 msgid "/_View/_Sort/by _subject"
 msgstr "/보기(_V)/정렬(_S)/제목(_s)"
 
-#: src/mainwindow.c:540
+#: src/mainwindow.c:531
 msgid "/_View/_Sort/by _color label"
 msgstr "/보기(_V)/정렬(_S)/색 라벨(_c)"
 
-#: src/mainwindow.c:542
+#: src/mainwindow.c:533
 msgid "/_View/_Sort/by _mark"
 msgstr "/보기(_V)/정렬(_S)/표시(_m)"
 
-#: src/mainwindow.c:543
+#: src/mainwindow.c:534
 msgid "/_View/_Sort/by _unread"
 msgstr "/보기(_V)/정렬(_S)/않읽음(_u)"
 
-#: src/mainwindow.c:544
+#: src/mainwindow.c:535
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/보기(_V)/정렬(_S)/첨부(_t)"
 
-#: src/mainwindow.c:546
+#: src/mainwindow.c:537
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/보기(_V)/정렬(_S)/않함(_o)"
 
-#: src/mainwindow.c:547 src/mainwindow.c:550
+#: src/mainwindow.c:538 src/mainwindow.c:541
 msgid "/_View/_Sort/---"
 msgstr "/보기(_V)/정렬(_S)/---"
 
-#: src/mainwindow.c:548
+#: src/mainwindow.c:539
 msgid "/_View/_Sort/Ascending"
 msgstr "/보기(_V)/정렬(_S)/오름차순"
 
-#: src/mainwindow.c:549
+#: src/mainwindow.c:540
 msgid "/_View/_Sort/Descending"
 msgstr "/보기(_V)/정렬(_S)/내림차순"
 
-#: src/mainwindow.c:551
+#: src/mainwindow.c:542
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/명령(_S)/정렬(_S)/제목(_A)"
 
-#: src/mainwindow.c:553
+#: src/mainwindow.c:544
 msgid "/_View/Th_read view"
 msgstr "/보기(_V)/쓰레드 보기(_r)"
 
-#: src/mainwindow.c:554
+#: src/mainwindow.c:545
 msgid "/_View/E_xpand all threads"
 msgstr "/보기(_V)/모든 쓰레드 펴기(_x)"
 
-#: src/mainwindow.c:555
+#: src/mainwindow.c:546
 msgid "/_View/Co_llapse all threads"
 msgstr "/보기(_V)/모든 쓰레드 접기(_l)"
 
-#: src/mainwindow.c:556
+#: src/mainwindow.c:547
 msgid "/_View/Set display _item..."
 msgstr "/보기(_V)/표시 항목 설정(_i)..."
 
-#: src/mainwindow.c:559
+#: src/mainwindow.c:550
 msgid "/_View/_Go to"
 msgstr "/보기(_V)/가기(_G)"
 
-#: src/mainwindow.c:560
+#: src/mainwindow.c:551
 msgid "/_View/_Go to/_Prev message"
 msgstr "/명령(_S)/가기(_G)/이전 메시지(_P)"
 
-#: src/mainwindow.c:561
+#: src/mainwindow.c:552
 msgid "/_View/_Go to/_Next message"
 msgstr "/보기(_V)/가기(_G)/다음 메시지(_N)"
 
-#: src/mainwindow.c:562 src/mainwindow.c:567 src/mainwindow.c:570
-#: src/mainwindow.c:575 src/mainwindow.c:580
+#: src/mainwindow.c:553 src/mainwindow.c:558 src/mainwindow.c:561
+#: src/mainwindow.c:566 src/mainwindow.c:571
 msgid "/_View/_Go to/---"
 msgstr "/보기(_V)/가기(_G)/---"
 
-#: src/mainwindow.c:563
+#: src/mainwindow.c:554
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/보기(_V)/가기(_G)/안읽은 다음 메시지(_e)"
 
-#: src/mainwindow.c:565
+#: src/mainwindow.c:556
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/보기(_V)/가기(_G)/안읽은 다음 메시지(_e)"
 
-#: src/mainwindow.c:568
+#: src/mainwindow.c:559
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/보기(_V)/가기(_G)/이전 새 메시지(_w)"
 
-#: src/mainwindow.c:569
+#: src/mainwindow.c:560
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/보기(_V)/가기(_G)/다음 새 메시지(_x)"
 
-#: src/mainwindow.c:571
+#: src/mainwindow.c:562
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/보기(_V)/가기(_G)/표시된 이전 메시지(_m)"
 
-#: src/mainwindow.c:573
+#: src/mainwindow.c:564
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/보기(_V)/가기(_G)/표시된 다음 메시지(_a)"
 
-#: src/mainwindow.c:576
+#: src/mainwindow.c:567
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/보기(_V)/가기(_G)/꼬리표있는 이전 메시지(_l)"
 
-#: src/mainwindow.c:578
+#: src/mainwindow.c:569
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/보기(_V)/가기(_G)/꼬리표있는 다음 메시지(_b)"
 
-#: src/mainwindow.c:581
+#: src/mainwindow.c:572
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/보기(_V)/가기(_G)/다른 폴더로(_f)..."
 
-#: src/mainwindow.c:590 src/messageview.c:158
+#: src/mainwindow.c:581 src/messageview.c:158
 #, fuzzy
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/보기(_V)/문자셋(_C)/자동(_A)"
 
-#: src/mainwindow.c:641 src/messageview.c:202
+#: src/mainwindow.c:632 src/messageview.c:202
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/보기(_V)/문자셋(_C)/일본 (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:643 src/messageview.c:204
+#: src/mainwindow.c:634 src/messageview.c:204
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/보기(_V)/문자셋(_C)/일본 (_EUC-JP)"
 
-#: src/mainwindow.c:645 src/messageview.c:206
+#: src/mainwindow.c:636 src/messageview.c:206
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/보기(_V)/문자셋(_C)/일본 (_Shift__JIS)"
 
-#: src/mainwindow.c:657 src/messageview.c:217
+#: src/mainwindow.c:648 src/messageview.c:217
 #, fuzzy
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/보기(_V)/문자셋(_C)/Chinese (ISO-2022-_CN)"
 
-#: src/mainwindow.c:663 src/messageview.c:222
+#: src/mainwindow.c:654 src/messageview.c:222
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/보기(_V)/문자셋(_C)/한국 (ISO-2022-KR)"
 
-#: src/mainwindow.c:676 src/summaryview.c:401
+#: src/mainwindow.c:667 src/summaryview.c:401
 msgid "/_View/Open in new _window"
 msgstr "/보기(_V)/새 창으로 열기(_w)"
 
-#: src/mainwindow.c:677 src/messageview.c:234
+#: src/mainwindow.c:668 src/messageview.c:234
 msgid "/_View/Mess_age source"
 msgstr "/보기(_V)/메시지 소스(_a)"
 
-#: src/mainwindow.c:678 src/messageview.c:235
+#: src/mainwindow.c:669 src/messageview.c:235
 msgid "/_View/Show all _header"
 msgstr "/보기(_V)/모든 헤더보기(_h)"
 
-#: src/mainwindow.c:680
+#: src/mainwindow.c:671
 msgid "/_View/_Update summary"
 msgstr "/보기(_V)/요약 갱신(_U)"
 
-#: src/mainwindow.c:682 src/messageview.c:237
+#: src/mainwindow.c:673 src/messageview.c:237
 msgid "/_Message"
 msgstr "/메시지(_M)"
 
-#: src/mainwindow.c:683
+#: src/mainwindow.c:674
 #, fuzzy
 msgid "/_Message/Recei_ve"
 msgstr "/메시지(_M)/다시 편집(_e)"
 
-#: src/mainwindow.c:684
+#: src/mainwindow.c:675
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/메시지(_M)/모든 계정에서 받기(_a)"
 
-#: src/mainwindow.c:686
+#: src/mainwindow.c:677
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/메시지(_M)/모든 계정에서 받기(_a)"
 
-#: src/mainwindow.c:688
+#: src/mainwindow.c:679
 #, fuzzy
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/메시지(_M)/받기 취소(_g)"
 
-#: src/mainwindow.c:690
+#: src/mainwindow.c:681
 #, fuzzy
 msgid "/_Message/Recei_ve/---"
 msgstr "/메시지(_M)/다시 편집(_e)"
 
-#: src/mainwindow.c:691
+#: src/mainwindow.c:682
 msgid "/_Message/_Send queued messages"
 msgstr "/메시지(_M)/임시 보관된 메시지 발송(_S)"
 
-#: src/mainwindow.c:692 src/mainwindow.c:694 src/mainwindow.c:701
-#: src/mainwindow.c:706 src/mainwindow.c:710 src/mainwindow.c:719
-#: src/mainwindow.c:722 src/messageview.c:240 src/messageview.c:248
+#: src/mainwindow.c:683 src/mainwindow.c:685 src/mainwindow.c:692
+#: src/mainwindow.c:697 src/mainwindow.c:701 src/mainwindow.c:710
+#: src/mainwindow.c:713 src/messageview.c:240 src/messageview.c:248
 #: src/messageview.c:253
 msgid "/_Message/---"
 msgstr "/메시지(_M)/---"
 
-#: src/mainwindow.c:693 src/messageview.c:238
+#: src/mainwindow.c:684 src/messageview.c:238
 msgid "/_Message/Compose _new message"
 msgstr "/메시지(_M)/새로 만들기(_n)"
 
-#: src/mainwindow.c:695 src/messageview.c:241
+#: src/mainwindow.c:686 src/messageview.c:241
 msgid "/_Message/_Reply"
 msgstr "/메시지(_M)/회신(_R)"
 
-#: src/mainwindow.c:696
+#: src/mainwindow.c:687
 msgid "/_Message/Repl_y to"
 msgstr "/메시지(_M)/회신(_y)"
 
-#: src/mainwindow.c:697 src/messageview.c:242
+#: src/mainwindow.c:688 src/messageview.c:242
 msgid "/_Message/Repl_y to/_all"
 msgstr "/메시지(_M)/회신(_y)/전체(_a)"
 
-#: src/mainwindow.c:698 src/messageview.c:244
+#: src/mainwindow.c:689 src/messageview.c:244
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/메시지(_M)/회신(_y)/보낸이(_s)"
 
-#: src/mainwindow.c:699 src/messageview.c:246
+#: src/mainwindow.c:690 src/messageview.c:246
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/메시지(_M)/회신(_y)/메일링리스트(_l)"
 
-#: src/mainwindow.c:702 src/messageview.c:249
+#: src/mainwindow.c:693 src/messageview.c:249
 msgid "/_Message/_Forward"
 msgstr "/메시지(_M)/전달(_F)"
 
-#: src/mainwindow.c:703 src/messageview.c:250
+#: src/mainwindow.c:694 src/messageview.c:250
 msgid "/_Message/For_ward as attachment"
 msgstr "/메시지(_M)/첨부파일로 전달(_w)"
 
-#: src/mainwindow.c:705 src/messageview.c:252
+#: src/mainwindow.c:696 src/messageview.c:252
 msgid "/_Message/Redirec_t"
 msgstr "/메시지(_M)/Redirec_t"
 
-#: src/mainwindow.c:707
+#: src/mainwindow.c:698
 msgid "/_Message/M_ove..."
 msgstr "/메시지(_M)/이동(_o)..."
 
-#: src/mainwindow.c:708
+#: src/mainwindow.c:699
 msgid "/_Message/_Copy..."
 msgstr "/메시지(_M)/복사(_C)..."
 
-#: src/mainwindow.c:709
+#: src/mainwindow.c:700
 msgid "/_Message/_Delete"
 msgstr "/메시지(_M)/삭제(_D)"
 
-#: src/mainwindow.c:711
+#: src/mainwindow.c:702
 msgid "/_Message/_Mark"
 msgstr "/메시지(_M)/표시(_M)"
 
-#: src/mainwindow.c:712
+#: src/mainwindow.c:703
 msgid "/_Message/_Mark/_Mark"
 msgstr "/메시지(_M)/표시(_M)/표시(_M)"
 
-#: src/mainwindow.c:713
+#: src/mainwindow.c:704
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/메시지(_M)/표시(_M)/표시 지움(_U)"
 
-#: src/mainwindow.c:714
+#: src/mainwindow.c:705
 msgid "/_Message/_Mark/---"
 msgstr "/메시지(_M)/표시(_M)/---"
 
-#: src/mainwindow.c:715
+#: src/mainwindow.c:706
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/메시지(_M)/표시(_M)/읽지않은 것으로 표시(_e)"
 
-#: src/mainwindow.c:716
+#: src/mainwindow.c:707
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/메시지(_M)/표시(_M)/읽은 것으로 표시(_d)"
 
-#: src/mainwindow.c:718
+#: src/mainwindow.c:709
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/메시지(_M)/표시(_M)/모두 읽은 것으로 표시(_r)"
 
-#: src/mainwindow.c:720
+#: src/mainwindow.c:711
 #, fuzzy
 msgid "/_Message/Set as _junk mail"
 msgstr "/메시지(_M)/새 메일 받기(_i)"
 
-#: src/mainwindow.c:721
+#: src/mainwindow.c:712
 #, fuzzy
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/메시지(_M)/새 메일 받기(_i)"
 
-#: src/mainwindow.c:723 src/messageview.c:254
+#: src/mainwindow.c:714 src/messageview.c:254
 msgid "/_Message/Re-_edit"
 msgstr "/메시지(_M)/다시 편집(_e)"
 
-#: src/mainwindow.c:727
+#: src/mainwindow.c:718
 #, fuzzy
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/도구(_T)/주소록에 보낸이 추가(_k)"
 
-#: src/mainwindow.c:730
+#: src/mainwindow.c:721
 #, fuzzy
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/도구(_T)/메시지 필터(_F)"
 
-#: src/mainwindow.c:732
+#: src/mainwindow.c:723
 #, fuzzy
 msgid "/_Tools/Filter _selected messages"
 msgstr "/도구(_T)/메시지 필터(_F)"
 
-#: src/mainwindow.c:734 src/messageview.c:261
+#: src/mainwindow.c:725 src/messageview.c:261
 msgid "/_Tools/_Create filter rule"
 msgstr "/도구(_T)/필터 규칙 생성(_C)"
 
-#: src/mainwindow.c:735 src/messageview.c:263
+#: src/mainwindow.c:726 src/messageview.c:263
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/도구(_T)/필터 규칙 생성(_C)/자동(_A)"
 
-#: src/mainwindow.c:737 src/messageview.c:265
+#: src/mainwindow.c:728 src/messageview.c:265
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/도구(_T)/필터 규칙 생성(_C)/보낸이로(_F)"
 
-#: src/mainwindow.c:739 src/messageview.c:267
+#: src/mainwindow.c:730 src/messageview.c:267
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/도구(_T)/필터 규칙 생성(_C)/받는이로(_T)"
 
-#: src/mainwindow.c:741 src/messageview.c:269
+#: src/mainwindow.c:732 src/messageview.c:269
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/도구(_T)/필터 규칙 생성(_C)/제목으로(_S)"
 
-#: src/mainwindow.c:744
+#: src/mainwindow.c:735
 #, fuzzy
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/도구(_T)/메시지 필터(_F)"
 
-#: src/mainwindow.c:746
+#: src/mainwindow.c:737
 #, fuzzy
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/도구(_T)/메시지 필터(_F)"
 
-#: src/mainwindow.c:751
+#: src/mainwindow.c:742
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/도구(_T)/중복된 메시지 지우기(_p)"
 
-#: src/mainwindow.c:754
+#: src/mainwindow.c:745
 msgid "/_Tools/E_xecute"
 msgstr "/도구(_T)/실행(_x)"
 
-#: src/mainwindow.c:756
+#: src/mainwindow.c:747
 msgid "/_Tools/_Log window"
 msgstr "/도구(_T)/로그 창(_L)"
 
-#: src/mainwindow.c:758
+#: src/mainwindow.c:749
 msgid "/_Configuration"
 msgstr "/설정(_C)"
 
-#: src/mainwindow.c:759
+#: src/mainwindow.c:750
 msgid "/_Configuration/_Common preferences..."
 msgstr "/설정(_C)/기본적인 설정(_C)..."
 
-#: src/mainwindow.c:761
+#: src/mainwindow.c:752
 msgid "/_Configuration/_Filter setting..."
 msgstr "/설정(_C)/필터 설정(_F)..."
 
-#: src/mainwindow.c:763
+#: src/mainwindow.c:754
 msgid "/_Configuration/_Template..."
 msgstr "/설정(_C)/템플릿(_T)..."
 
-#: src/mainwindow.c:764
+#: src/mainwindow.c:755
 msgid "/_Configuration/_Actions..."
 msgstr "/설정(_C)/동작(_A)..."
 
-#: src/mainwindow.c:765
+#: src/mainwindow.c:756
 msgid "/_Configuration/---"
 msgstr "/설정(_C)/---"
 
-#: src/mainwindow.c:766
+#: src/mainwindow.c:757
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/설정(_C)/계정에 따른 설정(_P)..."
 
-#: src/mainwindow.c:768
+#: src/mainwindow.c:759
 msgid "/_Configuration/Create _new account..."
 msgstr "/설정(_C)/새 계정 만들기(_n)..."
 
-#: src/mainwindow.c:770
+#: src/mainwindow.c:761
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/설정(_C)/계정 편집(_E)..."
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:763
 msgid "/_Configuration/C_hange current account"
 msgstr "/설정(_C)/현재 계정을 변경(_h)"
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:767
 msgid "/_Help/_Manual"
 msgstr "/도움말(_H)/설명서(_M)"
 
-#: src/mainwindow.c:777
+#: src/mainwindow.c:768
 msgid "/_Help/_Manual/_English"
 msgstr "/도움말(_H)/설명서(_M)/영어(_E)"
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:769
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/도움말(_H)/설명서(_M)/일본어(_J)"
 
-#: src/mainwindow.c:779
+#: src/mainwindow.c:770
 msgid "/_Help/_FAQ"
 msgstr "/도움말(_H)/FAQ(_F)"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:771
 msgid "/_Help/_FAQ/_English"
 msgstr "/도움말(_H)/FAQ(_F)/영어(_E)"
 
-#: src/mainwindow.c:781
+#: src/mainwindow.c:772
 msgid "/_Help/_FAQ/_German"
 msgstr "/도움말(_H)/FAQ(_F)/독일어(_G)"
 
-#: src/mainwindow.c:782
+#: src/mainwindow.c:773
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/도움말(_H)/FAQ(_F)/스페인어(_S)"
 
-#: src/mainwindow.c:783
+#: src/mainwindow.c:774
 msgid "/_Help/_FAQ/_French"
 msgstr "/도움말(_H)/FAQ(_F)/프랑스어(_F)"
 
-#: src/mainwindow.c:784
+#: src/mainwindow.c:775
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/도움말(_H)/FAQ(_F)/이태리어(_I)"
 
-#: src/mainwindow.c:785
+#: src/mainwindow.c:776
 msgid "/_Help/---"
 msgstr "/도움말(_H)/---"
 
-#: src/mainwindow.c:825
+#: src/mainwindow.c:816
 msgid "Creating main window...\n"
 msgstr "새 창을 만듭니다...\n"
 
-#: src/mainwindow.c:987
+#: src/mainwindow.c:973
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "메인 창: 색 할당 %d 실패\n"
 
-#: src/mainwindow.c:1071 src/summaryview.c:2020 src/summaryview.c:2105
+#: src/mainwindow.c:1057 src/summaryview.c:2020 src/summaryview.c:2105
 #: src/summaryview.c:3342 src/summaryview.c:3415 src/summaryview.c:3728
 msgid "done.\n"
 msgstr "마침.\n"
 
-#: src/mainwindow.c:1196 src/mainwindow.c:1237 src/mainwindow.c:1265
+#: src/mainwindow.c:1182 src/mainwindow.c:1223 src/mainwindow.c:1251
 msgid "Untitled"
 msgstr "제목 없슴"
 
-#: src/mainwindow.c:1266
+#: src/mainwindow.c:1252
 msgid "none"
 msgstr "없음"
 
-#: src/mainwindow.c:1316
+#: src/mainwindow.c:1302
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "창 분리 형식을 %d에서 %d로 바꿉니다\n"
 
-#: src/mainwindow.c:1536
+#: src/mainwindow.c:1522
 msgid "Offline"
 msgstr ""
 
-#: src/mainwindow.c:1537
+#: src/mainwindow.c:1523
 msgid "You are offline. Go online?"
 msgstr ""
 
-#: src/mainwindow.c:1551
+#: src/mainwindow.c:1537
 #, fuzzy
 msgid "Empty all trash"
 msgstr "지운 편지함 비우기"
 
-#: src/mainwindow.c:1552
+#: src/mainwindow.c:1538
 #, fuzzy
 msgid "Empty messages in all trash?"
 msgstr "지운 편지함에있는 모든 메시지를 비울까요?"
 
-#: src/mainwindow.c:1580
+#: src/mainwindow.c:1566
 msgid "Add mailbox"
 msgstr "메일박스 추가"
 
-#: src/mainwindow.c:1581
+#: src/mainwindow.c:1567
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3186,16 +3186,16 @@ msgstr ""
 "기존의 메일 박스가 지정되면 자동으로\n"
 "스캔될것입니다."
 
-#: src/mainwindow.c:1587
+#: src/mainwindow.c:1573
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "메일 박스 `%s'가 이미 존재합니다."
 
-#: src/mainwindow.c:1592 src/setup.c:57
+#: src/mainwindow.c:1578 src/setup.c:57
 msgid "Mailbox"
 msgstr "메일박스"
 
-#: src/mainwindow.c:1598 src/setup.c:63
+#: src/mainwindow.c:1584 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3204,153 +3204,153 @@ msgstr ""
 "메일박스 생성이 실패했습니다.\n"
 "아마 어떤 파일이 이미 존재하거나 그 곳에 쓰기 권한이 없습니다."
 
-#: src/mainwindow.c:1989
+#: src/mainwindow.c:1975
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - 폴더 보기"
 
-#: src/mainwindow.c:2009 src/messageview.c:368
+#: src/mainwindow.c:1995 src/messageview.c:368
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - 메시지 보기"
 
-#: src/mainwindow.c:2156 src/summaryview.c:370
+#: src/mainwindow.c:2142 src/summaryview.c:370
 msgid "/_Reply"
 msgstr "/회신(_R)"
 
-#: src/mainwindow.c:2157
+#: src/mainwindow.c:2143
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "전부에게 회신을 보냅니다"
 
-#: src/mainwindow.c:2158
+#: src/mainwindow.c:2144
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/회신(_y)/보낸이(_s)"
 
-#: src/mainwindow.c:2159
+#: src/mainwindow.c:2145
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/회신(_y)/메일링리스트(_l)"
 
-#: src/mainwindow.c:2164 src/summaryview.c:377
+#: src/mainwindow.c:2150 src/summaryview.c:377
 msgid "/_Forward"
 msgstr "/전달(_F)"
 
-#: src/mainwindow.c:2165 src/summaryview.c:378
+#: src/mainwindow.c:2151 src/summaryview.c:378
 msgid "/For_ward as attachment"
 msgstr "/첨부로 전달(_w)"
 
-#: src/mainwindow.c:2166 src/summaryview.c:379
+#: src/mainwindow.c:2152 src/summaryview.c:379
 msgid "/Redirec_t"
 msgstr "/Redirec_t"
 
-#: src/mainwindow.c:2205
+#: src/mainwindow.c:2188
 msgid "Get"
 msgstr "받기"
 
-#: src/mainwindow.c:2206
+#: src/mainwindow.c:2189
 msgid "Incorporate new mail"
 msgstr "새 메일을 가져옵니다"
 
-#: src/mainwindow.c:2213
+#: src/mainwindow.c:2196
 msgid "Get all"
 msgstr "전부 받기"
 
-#: src/mainwindow.c:2214
+#: src/mainwindow.c:2197
 msgid "Incorporate new mail of all accounts"
 msgstr "모든 계정에서 새 메일을 가져옵니다"
 
-#: src/mainwindow.c:2225
+#: src/mainwindow.c:2208
 msgid "Send queued message(s)"
 msgstr "임시 보관된 메시지를 보냅니다"
 
-#: src/mainwindow.c:2235 src/prefs_account.c:721 src/prefs_common.c:949
+#: src/mainwindow.c:2218 src/prefs_account.c:721 src/prefs_common.c:949
 #: src/prefs_folder_item.c:137
 msgid "Compose"
 msgstr "작성"
 
-#: src/mainwindow.c:2236
+#: src/mainwindow.c:2219
 msgid "Compose new message"
 msgstr "새 메시지를 작성합니다"
 
-#: src/mainwindow.c:2244 src/prefs_common.c:1448
+#: src/mainwindow.c:2227 src/prefs_common.c:1448
 msgid "Reply"
 msgstr "회신"
 
-#: src/mainwindow.c:2245 src/mainwindow.c:2258
+#: src/mainwindow.c:2228 src/mainwindow.c:2241
 msgid "Reply to the message"
 msgstr "메시지에 회신을 보냅니다"
 
-#: src/mainwindow.c:2263
+#: src/mainwindow.c:2245
 msgid "Reply all"
 msgstr "전체 회신"
 
-#: src/mainwindow.c:2264
+#: src/mainwindow.c:2246
 msgid "Reply to all"
 msgstr "전부에게 회신을 보냅니다"
 
-#: src/mainwindow.c:2272 src/prefs_filter_edit.c:741
+#: src/mainwindow.c:2254 src/prefs_filter_edit.c:741
 msgid "Forward"
 msgstr "전달"
 
-#: src/mainwindow.c:2273 src/mainwindow.c:2286
+#: src/mainwindow.c:2255 src/mainwindow.c:2268
 msgid "Forward the message"
 msgstr "메시지를 다른 사람에게 전달합니다"
 
-#: src/mainwindow.c:2293
+#: src/mainwindow.c:2275
 msgid "Delete the message"
 msgstr "메시지를 지웁니다"
 
-#: src/mainwindow.c:2301 src/prefs_common.c:1988
+#: src/mainwindow.c:2283 src/prefs_common.c:1988
 msgid "Junk"
 msgstr ""
 
-#: src/mainwindow.c:2302
+#: src/mainwindow.c:2284
 #, fuzzy
 msgid "Set as junk mail"
 msgstr "기본 계정으로 설정"
 
-#: src/mainwindow.c:2311
+#: src/mainwindow.c:2293
 msgid "Execute"
 msgstr "실행"
 
-#: src/mainwindow.c:2312
+#: src/mainwindow.c:2294
 msgid "Execute marked process"
 msgstr "표시된 프로세스들을 실행합니다"
 
-#: src/mainwindow.c:2322
+#: src/mainwindow.c:2304
 msgid "Next unread message"
 msgstr "다음 안 읽은 메시지를 보여줍니다"
 
-#: src/mainwindow.c:2334
+#: src/mainwindow.c:2316
 msgid "Prefs"
 msgstr "설정"
 
-#: src/mainwindow.c:2335
+#: src/mainwindow.c:2317
 msgid "Common preferences"
 msgstr "기본적인 환경 설정"
 
-#: src/mainwindow.c:2343 src/prefs_folder_item.c:261
+#: src/mainwindow.c:2325 src/prefs_folder_item.c:261
 #: src/prefs_folder_item.c:272 src/progressdialog.c:128
 msgid "Account"
 msgstr "계정"
 
-#: src/mainwindow.c:2344
+#: src/mainwindow.c:2326
 msgid "Account setting"
 msgstr "계정을 설정합니다"
 
-#: src/mainwindow.c:2527
+#: src/mainwindow.c:2498
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 
-#: src/mainwindow.c:2538
+#: src/mainwindow.c:2509
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 
-#: src/mainwindow.c:2731
+#: src/mainwindow.c:2702
 msgid "Exit"
 msgstr "끝내기"
 
-#: src/mainwindow.c:2731
+#: src/mainwindow.c:2702
 msgid "Exit this program?"
 msgstr "이 프로그램을 끝내시겠습니까?"
 
@@ -5554,11 +5554,11 @@ msgstr "진행 다이얼로그를 생성합니다...\n"
 msgid "Status"
 msgstr "상태"
 
-#: src/recv.c:113
+#: src/recv.c:112
 msgid "error occurred while retrieving data.\n"
 msgstr "데이타를 가져오는 중 에러가 발생했습니다.\n"
 
-#: src/recv.c:155 src/recv.c:197 src/recv.c:213
+#: src/recv.c:154 src/recv.c:196 src/recv.c:211
 msgid "Can't write to file.\n"
 msgstr "파일에 쓸 수가 없습니다.\n"
 
@@ -6295,7 +6295,7 @@ msgstr ""
 msgid "%.2fGB"
 msgstr ""
 
-#: src/utils.c:2372 src/utils.c:2496
+#: src/utils.c:2386 src/utils.c:2510
 #, c-format
 msgid "writing to %s failed.\n"
 msgstr "%s로 쓰기가 실패했습니다.\n"
diff --git a/po/lt.po b/po/lt.po
index 4b36d877..ce5bb556 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: 2005-08-09 18:08+0900\n"
+"POT-Creation-Date: 2005-08-22 17:22+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"
@@ -96,7 +96,7 @@ msgstr ""
 "skulpelyje „G“ jei norite gauti žinutes pasirinkę „Gauti visus“."
 
 #: src/account.c:691 src/addressadd.c:192 src/addressbook.c:490
-#: src/compose.c:4081 src/editaddress.c:200 src/editaddress.c:942
+#: src/compose.c:4079 src/editaddress.c:200 src/editaddress.c:942
 #: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:265
 #: src/editjpilot.c:271 src/editldap.c:307 src/editvcard.c:184
 #: src/mimeview.c:201 src/prefs_filter.c:258 src/prefs_folder_item.c:170
@@ -232,7 +232,7 @@ msgstr "Vartotojo veiksmo argumentas"
 msgid "Add Address to Book"
 msgstr "Įdėti adresą į knygą"
 
-#: src/addressadd.c:202 src/compose.c:4528 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4521 src/editaddress.c:201
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "Adresas"
@@ -246,7 +246,7 @@ msgstr "Pastabos"
 msgid "Select Address Book Folder"
 msgstr "Pažymėkite adresų knygos katalogą"
 
-#: src/addressbook.c:336 src/compose.c:495 src/mainwindow.c:470
+#: src/addressbook.c:336 src/compose.c:493 src/mainwindow.c:461
 #: src/messageview.c:137
 msgid "/_File"
 msgstr "/_Byla"
@@ -267,10 +267,10 @@ msgstr "/_Byla/Naujas _JPilot"
 msgid "/_File/New _Server"
 msgstr "/_Byla/Naujas _serveris"
 
-#: src/addressbook.c:345 src/addressbook.c:348 src/compose.c:500
-#: src/compose.c:505 src/compose.c:509 src/mainwindow.c:488
-#: src/mainwindow.c:491 src/mainwindow.c:493 src/mainwindow.c:496
-#: src/mainwindow.c:498 src/messageview.c:140
+#: src/addressbook.c:345 src/addressbook.c:348 src/compose.c:498
+#: src/compose.c:503 src/compose.c:507 src/mainwindow.c:479
+#: src/mainwindow.c:482 src/mainwindow.c:484 src/mainwindow.c:487
+#: src/mainwindow.c:489 src/messageview.c:140
 msgid "/_File/---"
 msgstr "/_Byla/---"
 
@@ -286,7 +286,7 @@ msgstr "/_Byla/Išt_rinti"
 msgid "/_File/_Save"
 msgstr "/_Byla/Iš_saugoti"
 
-#: src/addressbook.c:350 src/compose.c:510 src/messageview.c:141
+#: src/addressbook.c:350 src/compose.c:508 src/messageview.c:141
 msgid "/_File/_Close"
 msgstr "/_Byla/_Užverti"
 
@@ -318,7 +318,7 @@ msgstr "/_Adresas/_Redaguoti"
 msgid "/_Address/_Delete"
 msgstr "/_Adresas/Išt_rinti"
 
-#: src/addressbook.c:358 src/compose.c:619 src/mainwindow.c:725
+#: src/addressbook.c:358 src/compose.c:617 src/mainwindow.c:716
 #: src/messageview.c:256
 msgid "/_Tools"
 msgstr "/Į_rankiai"
@@ -327,12 +327,12 @@ msgstr "/Į_rankiai"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/Į_rankiai/Importuoti _LDIF bylą"
 
-#: src/addressbook.c:360 src/compose.c:632 src/mainwindow.c:775
+#: src/addressbook.c:360 src/compose.c:630 src/mainwindow.c:766
 #: src/messageview.c:274
 msgid "/_Help"
 msgstr "/_Pagalba"
 
-#: src/addressbook.c:361 src/compose.c:633 src/mainwindow.c:786
+#: src/addressbook.c:361 src/compose.c:631 src/mainwindow.c:777
 #: src/messageview.c:275
 msgid "/_Help/_About"
 msgstr "/_Pagalba/_Apie"
@@ -349,7 +349,7 @@ msgstr "/Nauja _grupė"
 msgid "/New _Folder"
 msgstr "/Naujas _katalogas"
 
-#: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:489
+#: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:487
 #: src/folderview.c:235 src/folderview.c:237 src/folderview.c:241
 #: src/folderview.c:252 src/folderview.c:254 src/folderview.c:256
 #: src/folderview.c:260 src/folderview.c:270 src/folderview.c:272
@@ -359,8 +359,8 @@ msgstr "/Naujas _katalogas"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:512
-#: src/mainwindow.c:502 src/messageview.c:143
+#: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:510
+#: src/mainwindow.c:493 src/messageview.c:143
 msgid "/_Edit"
 msgstr "/_Taisyti"
 
@@ -372,7 +372,7 @@ msgstr "/_Ištrinti"
 msgid "E-Mail address"
 msgstr "El. pašto adresas"
 
-#: src/addressbook.c:495 src/compose.c:4529 src/prefs_common.c:2402
+#: src/addressbook.c:495 src/compose.c:4522 src/prefs_common.c:2402
 msgid "Address book"
 msgstr "Adresų knyga"
 
@@ -381,8 +381,8 @@ msgid "Name:"
 msgstr "Vardas:"
 
 #. Buttons
-#: src/addressbook.c:627 src/addressbook.c:1673 src/editaddress.c:884
-#: src/editaddress.c:1017 src/mainwindow.c:2292 src/prefs_actions.c:266
+#: src/addressbook.c:627 src/addressbook.c:1674 src/editaddress.c:884
+#: src/editaddress.c:1017 src/mainwindow.c:2274 src/prefs_actions.c:266
 #: src/prefs_display_header.c:278 src/prefs_display_header.c:333
 #: src/prefs_template.c:231
 msgid "Delete"
@@ -421,7 +421,7 @@ msgstr "Pašalinti adresą(-us)"
 msgid "Really delete the address(es)?"
 msgstr "Ar tikrai pašalinti adresą(-us)?"
 
-#: src/addressbook.c:1664
+#: src/addressbook.c:1665
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -430,36 +430,36 @@ msgstr ""
 "Ar tikrai norite pašalinti katalogą „%s“ ir visus adresus jame? \n"
 "Jei pašalinsite tik katalogą, adresai bus perkelti į aukštesnįjį katalogą."
 
-#: src/addressbook.c:1667 src/folderview.c:2139
+#: src/addressbook.c:1668 src/folderview.c:2139
 msgid "Delete folder"
 msgstr "Ištrinti katalogą"
 
-#: src/addressbook.c:1667
+#: src/addressbook.c:1668
 msgid "_Folder only"
 msgstr "Tik _katalogą"
 
-#: src/addressbook.c:1667
+#: src/addressbook.c:1668
 msgid "Folder and _addresses"
 msgstr "Katalogą ir _adresus jame"
 
-#: src/addressbook.c:1672
+#: src/addressbook.c:1673
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Tikrai pašalinti „%s“?"
 
-#: src/addressbook.c:2352 src/addressbook.c:2485
+#: src/addressbook.c:2353 src/addressbook.c:2486
 msgid "New user, could not save index file."
 msgstr "Naujas vartotojas, negaliu išsaugoti „index“ bylos."
 
-#: src/addressbook.c:2356 src/addressbook.c:2489
+#: src/addressbook.c:2357 src/addressbook.c:2490
 msgid "New user, could not save address book files."
 msgstr "Naujas vartotojas, negaliu išsaugoti adresų knygos bylų."
 
-#: src/addressbook.c:2366 src/addressbook.c:2499
+#: src/addressbook.c:2367 src/addressbook.c:2500
 msgid "Old address book converted successfully."
 msgstr "Adresų knyga sėkmingai konvertuota"
 
-#: src/addressbook.c:2371
+#: src/addressbook.c:2372
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -467,7 +467,7 @@ msgstr ""
 "Sena adresų knyga konvertuota,\n"
 "negaliu išsaugoti naujo adresų indekso bylos"
 
-#: src/addressbook.c:2384
+#: src/addressbook.c:2385
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -475,7 +475,7 @@ msgstr ""
 "Negaliu konvertuoti adresų knygos,\n"
 "bet sukūriau tuščias naujos knygos bylas."
 
-#: src/addressbook.c:2390
+#: src/addressbook.c:2391
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -483,7 +483,7 @@ msgstr ""
 "Negaliu konvertuoti adresų knygos,\n"
 "negaliu sukurti naujos knygos bylų."
 
-#: src/addressbook.c:2395
+#: src/addressbook.c:2396
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -491,86 +491,86 @@ msgstr ""
 "Negaliu konvertuoti adresų knygos,\n"
 "ir negaliu sukurti naujos knygos bylų."
 
-#: src/addressbook.c:2402
+#: src/addressbook.c:2403
 msgid "Addressbook conversion error"
 msgstr "Adresų knygos konvertavimo klaida"
 
-#: src/addressbook.c:2406
+#: src/addressbook.c:2407
 msgid "Addressbook conversion"
 msgstr "Adresų knygos konvertavimas"
 
-#: src/addressbook.c:2441
+#: src/addressbook.c:2442
 msgid "Addressbook Error"
 msgstr "Adresų knygos klaida"
 
-#: src/addressbook.c:2442 src/addressbook.c:2542
+#: src/addressbook.c:2443 src/addressbook.c:2543
 msgid "Could not read address index"
 msgstr "Negaliu perskaityti adresų indekso"
 
-#: src/addressbook.c:2504
+#: src/addressbook.c:2505
 msgid "Old address book converted, could not save new address index file"
 msgstr "Sena knyga konvertuota, negaliu išsaugoti naujos adresų indekso bylos"
 
-#: src/addressbook.c:2518
+#: src/addressbook.c:2519
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr ""
 "Negaliu konvertuoti adresų knygos, bet sukūriau naujas tuščias adresų knygos "
 "bylas."
 
-#: src/addressbook.c:2524
+#: src/addressbook.c:2525
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr ""
 "Negaliu konvertuoti adresų knygos, negaliu sukurti naujų adresų knygos bylų."
 
-#: src/addressbook.c:2530
+#: src/addressbook.c:2531
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr "Negaliu konvertuoti adresų knygos ir sukurti naujų adresų knygos bylų."
 
-#: src/addressbook.c:2548
+#: src/addressbook.c:2549
 msgid "Addressbook Conversion Error"
 msgstr "Adresų knygos konvertavimo klaida"
 
-#: src/addressbook.c:2554
+#: src/addressbook.c:2555
 msgid "Addressbook Conversion"
 msgstr "Adresų knygos konvertavimas"
 
-#: src/addressbook.c:3055 src/prefs_common.c:963
+#: src/addressbook.c:3056 src/prefs_common.c:963
 msgid "Interface"
 msgstr "Sąsaja"
 
-#: src/addressbook.c:3071 src/importldif.c:514
+#: src/addressbook.c:3072 src/importldif.c:514
 msgid "Address Book"
 msgstr "Adresų knyga"
 
-#: src/addressbook.c:3087
+#: src/addressbook.c:3088
 msgid "Person"
 msgstr "Asmuo"
 
-#: src/addressbook.c:3103
+#: src/addressbook.c:3104
 msgid "EMail Address"
 msgstr "El. pašto adresas"
 
-#: src/addressbook.c:3119
+#: src/addressbook.c:3120
 msgid "Group"
 msgstr "Grupė"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3135 src/folderview.c:346 src/prefs_account.c:1866
+#: src/addressbook.c:3136 src/folderview.c:346 src/prefs_account.c:1866
 msgid "Folder"
 msgstr "Katalogas"
 
-#: src/addressbook.c:3151
+#: src/addressbook.c:3152
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3167 src/addressbook.c:3183
+#: src/addressbook.c:3168 src/addressbook.c:3184
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3199
+#: src/addressbook.c:3200
 msgid "LDAP Server"
 msgstr "LDAP serveris"
 
@@ -582,7 +582,7 @@ msgstr "Bendras adresas"
 msgid "Personal address"
 msgstr "Asmeninis adresas"
 
-#: src/alertpanel.c:138 src/compose.c:5214 src/main.c:515
+#: src/alertpanel.c:138 src/compose.c:5208 src/main.c:515
 msgid "Notice"
 msgstr "Pranešimas"
 
@@ -637,347 +637,347 @@ msgstr "Ruda"
 msgid "None"
 msgstr "Nieko"
 
-#: src/compose.c:487
+#: src/compose.c:485
 msgid "/_Add..."
 msgstr "/Pri_dėti..."
 
-#: src/compose.c:488
+#: src/compose.c:486
 msgid "/_Remove"
 msgstr "/_Pašalinti"
 
-#: src/compose.c:490 src/folderview.c:243 src/folderview.c:262
+#: src/compose.c:488 src/folderview.c:243 src/folderview.c:262
 #: src/folderview.c:277
 msgid "/_Properties..."
 msgstr "/_Savybės..."
 
-#: src/compose.c:496
+#: src/compose.c:494
 msgid "/_File/_Send"
 msgstr "/_Byla/_Siųsti"
 
-#: src/compose.c:498
+#: src/compose.c:496
 msgid "/_File/Send _later"
 msgstr "/_Byla/Siųsti _vėliau"
 
-#: src/compose.c:501
+#: src/compose.c:499
 msgid "/_File/Save to _draft folder"
 msgstr "/_Byla/Išsaugoti _juodraštį"
 
-#: src/compose.c:503
+#: src/compose.c:501
 msgid "/_File/Save and _keep editing"
 msgstr "/_Byla/Išsaugoti ir _toliau redaguoti"
 
-#: src/compose.c:506
+#: src/compose.c:504
 msgid "/_File/_Attach file"
 msgstr "/_Byla/Prise_gti bylą"
 
-#: src/compose.c:507
+#: src/compose.c:505
 msgid "/_File/_Insert file"
 msgstr "/_Byla/Įt_erpti bylą"
 
-#: src/compose.c:508
+#: src/compose.c:506
 msgid "/_File/Insert si_gnature"
 msgstr "/_Byla/Įterpti pa_rašą"
 
-#: src/compose.c:513
+#: src/compose.c:511
 msgid "/_Edit/_Undo"
 msgstr "/_Taisyti/_Atšaukti"
 
-#: src/compose.c:514
+#: src/compose.c:512
 msgid "/_Edit/_Redo"
 msgstr "/_Taisyti/Pa_kartoti"
 
-#: src/compose.c:515 src/compose.c:522 src/mainwindow.c:506
+#: src/compose.c:513 src/compose.c:520 src/mainwindow.c:497
 #: src/messageview.c:146
 msgid "/_Edit/---"
 msgstr "/_Taisyti/---"
 
-#: src/compose.c:516
+#: src/compose.c:514
 msgid "/_Edit/Cu_t"
 msgstr "/_Taisyti/Iškirp_ti"
 
-#: src/compose.c:517 src/mainwindow.c:503 src/messageview.c:144
+#: src/compose.c:515 src/mainwindow.c:494 src/messageview.c:144
 msgid "/_Edit/_Copy"
 msgstr "/_Taisyti/Kopi_juoti"
 
-#: src/compose.c:518
+#: src/compose.c:516
 msgid "/_Edit/_Paste"
 msgstr "/_Taisyti/Į_dėti"
 
-#: src/compose.c:519
+#: src/compose.c:517
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Taisyti/Įdėti kaip _citatą"
 
-#: src/compose.c:521 src/mainwindow.c:504 src/messageview.c:145
+#: src/compose.c:519 src/mainwindow.c:495 src/messageview.c:145
 msgid "/_Edit/Select _all"
 msgstr "/_Taisyti/Žymėti _viską"
 
-#: src/compose.c:523
+#: src/compose.c:521
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/_Taisyti/_Laužyti pastraipą"
 
-#: src/compose.c:525
+#: src/compose.c:523
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/_Taisyti/Laužyti _visas ilgas eilutes"
 
-#: src/compose.c:527
+#: src/compose.c:525
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Taisyti/_Automatiškai laužyti"
 
-#: src/compose.c:528 src/mainwindow.c:511 src/messageview.c:150
+#: src/compose.c:526 src/mainwindow.c:502 src/messageview.c:150
 #: src/summaryview.c:400
 msgid "/_View"
 msgstr "/_Rodyti"
 
-#: src/compose.c:529
+#: src/compose.c:527
 msgid "/_View/_To"
 msgstr "/_Rodyti/_Kam"
 
-#: src/compose.c:530
+#: src/compose.c:528
 msgid "/_View/_Cc"
 msgstr "/_Rodyti/Ko_pija"
 
-#: src/compose.c:531
+#: src/compose.c:529
 msgid "/_View/_Bcc"
 msgstr "/_Rodyti/_Slapta kopija"
 
-#: src/compose.c:532
+#: src/compose.c:530
 msgid "/_View/_Reply to"
 msgstr "/_Rodyti/Kam _atsakyti"
 
-#: src/compose.c:533 src/compose.c:535 src/compose.c:537 src/compose.c:539
-#: src/mainwindow.c:529 src/mainwindow.c:532 src/mainwindow.c:558
-#: src/mainwindow.c:582 src/mainwindow.c:675 src/mainwindow.c:679
+#: src/compose.c:531 src/compose.c:533 src/compose.c:535 src/compose.c:537
+#: src/mainwindow.c:520 src/mainwindow.c:523 src/mainwindow.c:549
+#: src/mainwindow.c:573 src/mainwindow.c:666 src/mainwindow.c:670
 #: src/messageview.c:233
 msgid "/_View/---"
 msgstr "/_Rodyti/---"
 
-#: src/compose.c:534
+#: src/compose.c:532
 msgid "/_View/_Followup to"
 msgstr "/_Rodyti/_Gija"
 
-#: src/compose.c:536
+#: src/compose.c:534
 msgid "/_View/R_uler"
 msgstr "/_Rodyti/_Liniuotė"
 
-#: src/compose.c:538
+#: src/compose.c:536
 msgid "/_View/_Attachment"
 msgstr "/_Rodyti/Prise_gtos bylos"
 
-#: src/compose.c:545 src/mainwindow.c:589 src/messageview.c:157
+#: src/compose.c:543 src/mainwindow.c:580 src/messageview.c:157
 msgid "/_View/Character _encoding"
 msgstr "/_Rodyti/Simbolių ko_duotė"
 
-#: src/compose.c:546
+#: src/compose.c:544
 msgid "/_View/Character _encoding/_Automatic"
 msgstr "/_Rodyti/Simbolių ko_duotė/_Automatiškai"
 
-#: src/compose.c:548 src/compose.c:554 src/compose.c:560 src/compose.c:564
-#: src/compose.c:570 src/compose.c:574 src/compose.c:580 src/compose.c:584
-#: src/compose.c:594 src/compose.c:598 src/compose.c:608 src/compose.c:612
-#: src/mainwindow.c:585 src/mainwindow.c:592 src/messageview.c:153
+#: src/compose.c:546 src/compose.c:552 src/compose.c:558 src/compose.c:562
+#: src/compose.c:568 src/compose.c:572 src/compose.c:578 src/compose.c:582
+#: src/compose.c:592 src/compose.c:596 src/compose.c:606 src/compose.c:610
+#: src/mainwindow.c:576 src/mainwindow.c:583 src/messageview.c:153
 msgid "/_View/Character _encoding/---"
 msgstr "/_Rodyti/Simbolių ko_duotė/---"
 
-#: src/compose.c:550 src/mainwindow.c:593 src/messageview.c:161
+#: src/compose.c:548 src/mainwindow.c:584 src/messageview.c:161
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Rodyti/Simbolių ko_duotė/7bit ascii (US-ASC_II)"
 
-#: src/compose.c:552 src/mainwindow.c:595 src/messageview.c:164
+#: src/compose.c:550 src/mainwindow.c:586 src/messageview.c:164
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Rodyti/Simbolių ko_duotė/Unikodas (_UTF-8)"
 
-#: src/compose.c:556 src/mainwindow.c:599 src/messageview.c:167
+#: src/compose.c:554 src/mainwindow.c:590 src/messageview.c:167
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Rodyti/Simbolių ko_duotė/Vakarų Europos (ISO-8859-_1)"
 
-#: src/compose.c:558 src/mainwindow.c:601 src/messageview.c:169
+#: src/compose.c:556 src/mainwindow.c:592 src/messageview.c:169
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Rodyti/Simbolių ko_duotė/Vakarų Europos (ISO-8859-15)"
 
-#: src/compose.c:562 src/mainwindow.c:605 src/messageview.c:172
+#: src/compose.c:560 src/mainwindow.c:596 src/messageview.c:172
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Rodyti/Simbolių ko_duotė/Centrinės Europos (ISO-8859-_2)"
 
-#: src/compose.c:566 src/mainwindow.c:609 src/messageview.c:175
+#: src/compose.c:564 src/mainwindow.c:600 src/messageview.c:175
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Rodyti/Simbolių ko_duotė/_Baltų (ISO-8859-13)"
 
-#: src/compose.c:568 src/mainwindow.c:611 src/messageview.c:177
+#: src/compose.c:566 src/mainwindow.c:602 src/messageview.c:177
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Rodyti/Simbolių ko_duotė/Baltų (ISO-8859-_4)"
 
-#: src/compose.c:572 src/mainwindow.c:615 src/messageview.c:180
+#: src/compose.c:570 src/mainwindow.c:606 src/messageview.c:180
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Rodyti/Simbolių ko_duotė/Graikų (ISO-8859-_7)"
 
-#: src/compose.c:576 src/mainwindow.c:619 src/messageview.c:183
+#: src/compose.c:574 src/mainwindow.c:610 src/messageview.c:183
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Rodyti/Simbolių ko_duotė/Hebrajų (ISO-8859-_8)"
 
-#: src/compose.c:578 src/mainwindow.c:621 src/messageview.c:185
+#: src/compose.c:576 src/mainwindow.c:612 src/messageview.c:185
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Rodyti/Simbolių ko_duotė/Hebrajų (Windows-1255)"
 
-#: src/compose.c:582 src/mainwindow.c:625 src/messageview.c:188
+#: src/compose.c:580 src/mainwindow.c:616 src/messageview.c:188
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Rodyti/Simbolių ko_duotė/Turkų (ISO-8859-_9)"
 
-#: src/compose.c:586 src/mainwindow.c:629 src/messageview.c:191
+#: src/compose.c:584 src/mainwindow.c:620 src/messageview.c:191
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Rodyti/Simbolių ko_duotė/Kirilica (ISO-8859-_5)"
 
-#: src/compose.c:588 src/mainwindow.c:631 src/messageview.c:193
+#: src/compose.c:586 src/mainwindow.c:622 src/messageview.c:193
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Rodyti/Simbolių ko_duotė/Kirilica (KOI8-_R)"
 
-#: src/compose.c:590 src/mainwindow.c:633 src/messageview.c:195
+#: src/compose.c:588 src/mainwindow.c:624 src/messageview.c:195
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Rodyti/Simbolių ko_duotė/Kirilica (KOI8-U)"
 
-#: src/compose.c:592 src/mainwindow.c:635 src/messageview.c:197
+#: src/compose.c:590 src/mainwindow.c:626 src/messageview.c:197
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Rodyti/Simbolių ko_duotė/Kirilica (Windows-1251)"
 
-#: src/compose.c:596 src/mainwindow.c:639 src/messageview.c:200
+#: src/compose.c:594 src/mainwindow.c:630 src/messageview.c:200
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Rodyti/Simbolių ko_duotė/Japonų (ISO-2022-_JP)"
 
-#: src/compose.c:600 src/mainwindow.c:649 src/messageview.c:209
+#: src/compose.c:598 src/mainwindow.c:640 src/messageview.c:209
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Rodyti/Simbolių ko_duotė/Supaprastinta Kinų (_GB2312)"
 
-#: src/compose.c:602 src/mainwindow.c:651 src/messageview.c:211
+#: src/compose.c:600 src/mainwindow.c:642 src/messageview.c:211
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Rodyti/Simbolių ko_duotė/Supaprastinta Kinų (GBK)"
 
-#: src/compose.c:604 src/mainwindow.c:653 src/messageview.c:213
+#: src/compose.c:602 src/mainwindow.c:644 src/messageview.c:213
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Rodyti/Simbolių ko_duotė/Tradicinė Kinų (_Big5)"
 
-#: src/compose.c:606 src/mainwindow.c:655 src/messageview.c:215
+#: src/compose.c:604 src/mainwindow.c:646 src/messageview.c:215
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Rodyti/Simbolių ko_duotė/Tradicinė Kinų (EUC-_TW)"
 
-#: src/compose.c:610 src/mainwindow.c:661 src/messageview.c:220
+#: src/compose.c:608 src/mainwindow.c:652 src/messageview.c:220
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Rodyti/Simbolių ko_duotė/Korėjiečių (EUC-_KR)"
 
-#: src/compose.c:614 src/mainwindow.c:667 src/messageview.c:225
+#: src/compose.c:612 src/mainwindow.c:658 src/messageview.c:225
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Rodyti/Simbolių ko_duotė/Tailandiečių (TIS-620)"
 
-#: src/compose.c:616 src/mainwindow.c:669 src/messageview.c:227
+#: src/compose.c:614 src/mainwindow.c:660 src/messageview.c:227
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Rodyti/Simbolių ko_duotė/Tailandiečių (Windows-874)"
 
-#: src/compose.c:620 src/mainwindow.c:726 src/messageview.c:257
+#: src/compose.c:618 src/mainwindow.c:717 src/messageview.c:257
 msgid "/_Tools/_Address book"
 msgstr "/Į_rankiai/_Adresų knyga"
 
-#: src/compose.c:621
+#: src/compose.c:619
 msgid "/_Tools/_Template"
 msgstr "/Į_rankiai/_Šablonas"
 
-#: src/compose.c:622 src/mainwindow.c:749 src/messageview.c:272
+#: src/compose.c:620 src/mainwindow.c:740 src/messageview.c:272
 msgid "/_Tools/Actio_ns"
 msgstr "/Į_rankiai/_Veiksmai"
 
-#: src/compose.c:623 src/compose.c:627 src/mainwindow.c:729
-#: src/mainwindow.c:743 src/mainwindow.c:748 src/mainwindow.c:750
-#: src/mainwindow.c:753 src/mainwindow.c:755 src/messageview.c:260
+#: src/compose.c:621 src/compose.c:625 src/mainwindow.c:720
+#: src/mainwindow.c:734 src/mainwindow.c:739 src/mainwindow.c:741
+#: src/mainwindow.c:744 src/mainwindow.c:746 src/messageview.c:260
 #: src/messageview.c:271
 msgid "/_Tools/---"
 msgstr "/Į_rankiai/---"
 
-#: src/compose.c:624
+#: src/compose.c:622
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/Į_rankiai/Naudoti išorinį redaktorių"
 
-#: src/compose.c:628
+#: src/compose.c:626
 msgid "/_Tools/PGP Si_gn"
 msgstr "/Į_rankiai/PGP _parašas"
 
-#: src/compose.c:629
+#: src/compose.c:627
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/Į_rankiai/PGP ši_fravimas"
 
-#: src/compose.c:855
+#: src/compose.c:853
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: byla neegzistuoja\n"
 
-#: src/compose.c:954 src/compose.c:1024 src/procmsg.c:1353
+#: src/compose.c:952 src/compose.c:1022 src/procmsg.c:1353
 msgid "Can't get text part\n"
 msgstr "Negaliu gauti dalies teksto\n"
 
-#: src/compose.c:1420
+#: src/compose.c:1418
 msgid "Quote mark format error."
 msgstr "Formato klaida."
 
-#: src/compose.c:1432
+#: src/compose.c:1430
 msgid "Message reply/forward format error."
 msgstr "Atsakymo/persiuntimo formato klaida."
 
-#: src/compose.c:1801
+#: src/compose.c:1799
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Byla %s neegzistuoja\n"
 
-#: src/compose.c:1805
+#: src/compose.c:1803
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Negaliu gauti bylos „%s“ dydžio\n"
 
-#: src/compose.c:1809
+#: src/compose.c:1807
 #, c-format
 msgid "File %s is empty."
 msgstr "Byla %s yra tuščia"
 
-#: src/compose.c:1813
+#: src/compose.c:1811
 #, c-format
 msgid "Can't read %s."
 msgstr "Negaliu perskaityti %s."
 
-#: src/compose.c:1848
+#: src/compose.c:1846
 #, c-format
 msgid "Message: %s"
 msgstr "Žinutė: %s"
 
-#: src/compose.c:1920 src/mimeview.c:560
+#: src/compose.c:1918 src/mimeview.c:560
 msgid "Can't get the part of multipart message."
 msgstr "Negaliu gauti sudėtinės žinutės dalies"
 
-#: src/compose.c:2362
+#: src/compose.c:2360
 msgid " [Edited]"
 msgstr " [Redaguota]"
 
-#: src/compose.c:2364
+#: src/compose.c:2362
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Rašyti laišką%s"
 
-#: src/compose.c:2367
+#: src/compose.c:2365
 #, c-format
 msgid "Compose message%s"
 msgstr "Rašyti laišką%s"
 
-#: src/compose.c:2478
+#: src/compose.c:2476
 msgid "Recipient is not specified."
 msgstr "Nenurodytas gavėjas."
 
-#: src/compose.c:2486
+#: src/compose.c:2484
 msgid "Empty subject"
 msgstr "Nėra temos"
 
-#: src/compose.c:2487
+#: src/compose.c:2485
 msgid "Subject is empty. Send it anyway?"
 msgstr "Nenurodyta laiško tema (subject). Siųsti?"
 
-#: src/compose.c:2538
+#: src/compose.c:2536
 msgid "can't get recipient list."
 msgstr "Negaliu gauti gavėjų sąrašo."
 
-#: src/compose.c:2558
+#: src/compose.c:2556
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -985,26 +985,26 @@ msgstr ""
 "Nenurodyta sąskaita pašto siuntimui.\n"
 "Prieš siųsdami pažymėkitę norimą sąskaitą."
 
-#: src/compose.c:2572 src/send_message.c:297
+#: src/compose.c:2570 src/send_message.c:297
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Klaida siunčiant žinutę %s ."
 
-#: src/compose.c:2595
+#: src/compose.c:2593
 msgid "Can't save the message to outbox."
 msgstr "Negaliu išsaugoti žinutės „outbox“."
 
-#: src/compose.c:2645
+#: src/compose.c:2643
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "Nerandu rakto susieto su pasirinktu rakto ID „%s“."
 
-#: src/compose.c:2709 src/compose.c:2965 src/compose.c:3028 src/compose.c:3148
-#: src/utils.c:2365
+#: src/compose.c:2707 src/compose.c:2963 src/compose.c:3026 src/compose.c:3146
+#: src/utils.c:2379
 msgid "can't change file mode\n"
 msgstr "negaliu pakeisti bylos rėžimo\n"
 
-#: src/compose.c:2741
+#: src/compose.c:2739
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1015,11 +1015,11 @@ msgstr ""
 "\n"
 "Ar siųsti kaip %s?"
 
-#: src/compose.c:2747
+#: src/compose.c:2745
 msgid "Code conversion error"
 msgstr "Kodo konvertavimo klaida"
 
-#: src/compose.c:2816
+#: src/compose.c:2814
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1032,153 +1032,153 @@ msgstr ""
 "\n"
 "Ar tikrai norite ją išsiųsti?"
 
-#: src/compose.c:2820
+#: src/compose.c:2818
 msgid "Line length limit"
 msgstr "Eilutės ilgio limitas"
 
-#: src/compose.c:3108
+#: src/compose.c:3106
 msgid "can't remove the old message\n"
 msgstr "Negaliu pašalinti senos žinutės\n"
 
-#: src/compose.c:3126
+#: src/compose.c:3124
 msgid "queueing message...\n"
 msgstr "Žinutė dedama į eilę\n"
 
-#: src/compose.c:3208
+#: src/compose.c:3206
 msgid "can't find queue folder\n"
 msgstr "Negaliu rasti eilės (queue) katalogo\n"
 
-#: src/compose.c:3215
+#: src/compose.c:3213
 msgid "can't queue the message\n"
 msgstr "Negaliu įdėti žinutės į eilę\n"
 
-#: src/compose.c:3792
+#: src/compose.c:3790
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "sugeneruotas Message-ID: %s\n"
 
-#: src/compose.c:3901
+#: src/compose.c:3899
 msgid "Creating compose window...\n"
 msgstr "Sukuriamas laiško kūrimo langas...\n"
 
-#: src/compose.c:3949 src/headerview.c:54 src/summary_search.c:214
+#: src/compose.c:3947 src/headerview.c:54 src/summary_search.c:214
 msgid "From:"
 msgstr "Nuo:"
 
-#: src/compose.c:4021
+#: src/compose.c:4019
 msgid "PGP Sign"
 msgstr "PGP parašas"
 
-#: src/compose.c:4024
+#: src/compose.c:4022
 msgid "PGP Encrypt"
 msgstr "PGP šifravimas"
 
-#: src/compose.c:4062 src/compose.c:5001
+#: src/compose.c:4060 src/compose.c:4995
 msgid "MIME type"
 msgstr "MIME tipas"
 
 #. S_COL_DATE
-#: src/compose.c:4071 src/mimeview.c:192 src/prefs_filter_edit.c:585
+#: src/compose.c:4069 src/mimeview.c:192 src/prefs_filter_edit.c:585
 #: src/prefs_summary_column.c:75 src/select-keys.c:317 src/summaryview.c:4217
 msgid "Size"
 msgstr "Dydis"
 
-#: src/compose.c:4449 src/mainwindow.c:2224 src/prefs_account.c:719
+#: src/compose.c:4442 src/mainwindow.c:2207 src/prefs_account.c:719
 #: src/prefs_common.c:947
 msgid "Send"
 msgstr "Siųsti"
 
-#: src/compose.c:4450
+#: src/compose.c:4443
 msgid "Send message"
 msgstr "Siųsti žinutę"
 
-#: src/compose.c:4458
+#: src/compose.c:4451
 msgid "Send later"
 msgstr "Siųsti vėliau"
 
-#: src/compose.c:4459
+#: src/compose.c:4452
 msgid "Put into queue folder and send later"
 msgstr "Įdėti į eilę ir siųsti vėliau"
 
-#: src/compose.c:4467
+#: src/compose.c:4460
 msgid "Draft"
 msgstr "Juodraštis"
 
-#: src/compose.c:4468
+#: src/compose.c:4461
 msgid "Save to draft folder"
 msgstr "Išsaugoti į juodraščių katalogą"
 
-#: src/compose.c:4478
+#: src/compose.c:4471
 msgid "Insert"
 msgstr "Įterpti"
 
-#: src/compose.c:4479
+#: src/compose.c:4472
 msgid "Insert file"
 msgstr "Įterpti bylą"
 
-#: src/compose.c:4487
+#: src/compose.c:4480
 msgid "Attach"
 msgstr "Prisegti"
 
-#: src/compose.c:4488
+#: src/compose.c:4481
 msgid "Attach file"
 msgstr "Prisegti bylą"
 
 #. signature
-#: src/compose.c:4498 src/prefs_account.c:1391 src/prefs_common.c:1356
+#: src/compose.c:4491 src/prefs_account.c:1391 src/prefs_common.c:1356
 msgid "Signature"
 msgstr "Parašas"
 
-#: src/compose.c:4499
+#: src/compose.c:4492
 msgid "Insert signature"
 msgstr "Įterpti parašą"
 
-#: src/compose.c:4508 src/prefs_common.c:1378 src/prefs_common.c:2382
+#: src/compose.c:4501 src/prefs_common.c:1378 src/prefs_common.c:2382
 msgid "Editor"
 msgstr "Redaktorius"
 
-#: src/compose.c:4509
+#: src/compose.c:4502
 msgid "Edit with external editor"
 msgstr "Naudoti išorinį redaktorių"
 
-#: src/compose.c:4517
+#: src/compose.c:4510
 msgid "Linewrap"
 msgstr "Eilučių laužymas"
 
-#: src/compose.c:4518
+#: src/compose.c:4511
 msgid "Wrap all long lines"
 msgstr "Laužyti ilgas eilutes"
 
-#: src/compose.c:4897
+#: src/compose.c:4891
 msgid "Invalid MIME type."
 msgstr "Neteisingas MIME tipas"
 
-#: src/compose.c:4915
+#: src/compose.c:4909
 msgid "File doesn't exist or is empty."
 msgstr "Byla neegzistuoja arba yra tuščia."
 
-#: src/compose.c:4983
+#: src/compose.c:4977
 msgid "Properties"
 msgstr "Savybės"
 
-#: src/compose.c:5003
+#: src/compose.c:4997
 msgid "Encoding"
 msgstr "Koduotė"
 
-#: src/compose.c:5026 src/prefs_folder_item.c:183
+#: src/compose.c:5020 src/prefs_folder_item.c:183
 msgid "Path"
 msgstr "Kelias"
 
-#: src/compose.c:5027
+#: src/compose.c:5021
 msgid "File name"
 msgstr "Bylos vardas"
 
-#: src/compose.c:5185
+#: src/compose.c:5179
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Neteisinga išorinio redaktoriaus komanda: „%s“\n"
 
-#: src/compose.c:5211
+#: src/compose.c:5205
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1189,71 +1189,71 @@ msgstr ""
 "Nutraukti procesą?\n"
 "proceso grupės id: %d"
 
-#: src/compose.c:5228
+#: src/compose.c:5222
 #, c-format
 msgid "Terminated process group id: %d"
 msgstr "Nutraukto proceso grupės id: %d"
 
-#: src/compose.c:5229
+#: src/compose.c:5223
 #, c-format
 msgid "Temporary file: %s"
 msgstr "Laikina byla: %s"
 
-#: src/compose.c:5253
+#: src/compose.c:5247
 msgid "Compose: input from monitoring process\n"
 msgstr "Rašymas: įvestis iš prižiūrimo proceso\n"
 
 #. failed
-#: src/compose.c:5284
+#: src/compose.c:5278
 msgid "Couldn't exec external editor\n"
 msgstr "Negaliu paleisti išorinio redaktoriaus\n"
 
-#: src/compose.c:5288
+#: src/compose.c:5282
 msgid "Couldn't write to file\n"
 msgstr "Negaliu rašyti į bylą\n"
 
-#: src/compose.c:5290
+#: src/compose.c:5284
 msgid "Pipe read failed\n"
 msgstr "„Pipe“ skaitymas nepavyko\n"
 
-#: src/compose.c:5596 src/compose.c:5604 src/compose.c:5610
+#: src/compose.c:5590 src/compose.c:5598 src/compose.c:5604
 msgid "Can't queue the message."
 msgstr "Negaliu įdėti žinutės į eilę."
 
-#: src/compose.c:5701
+#: src/compose.c:5695
 msgid "Select files"
 msgstr "Žymėti bylas"
 
-#: src/compose.c:5723
+#: src/compose.c:5717
 msgid "Select file"
 msgstr "Žymėti bylą"
 
-#: src/compose.c:5760
+#: src/compose.c:5754
 msgid "Save message"
 msgstr "Išsaugoti žinutę"
 
-#: src/compose.c:5761
+#: src/compose.c:5755
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Žinutė buvo redaguota. Saugoti „Juodraščiuose“?"
 
-#: src/compose.c:5763
+#: src/compose.c:5757
 msgid "Close _without saving"
 msgstr "Uždaryti _neišsaugant"
 
-#: src/compose.c:5805
+#: src/compose.c:5799
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Ar norite naudoti šabloną „%s“?"
 
-#: src/compose.c:5807
+#: src/compose.c:5801
 msgid "Apply template"
 msgstr "Naudoti šabloną"
 
-#: src/compose.c:5808
+#: src/compose.c:5802
 msgid "_Replace"
 msgstr "_Pakeisti"
 
-#: src/compose.c:5808
+#: src/compose.c:5802
 msgid "_Insert"
 msgstr "Įterpt_i"
 
@@ -1696,12 +1696,12 @@ msgstr "Nustatoma katalogo informacija...\n"
 msgid "Setting folder info..."
 msgstr "Nustatoma katalogo informacija..."
 
-#: src/folderview.c:805 src/mainwindow.c:3301 src/setup.c:81
+#: src/folderview.c:805 src/mainwindow.c:3272 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Skanuojamas katalogas “%s%c%s“..."
 
-#: src/folderview.c:809 src/mainwindow.c:3306 src/setup.c:86
+#: src/folderview.c:809 src/mainwindow.c:3277 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Skanuojamas katalogas „%s“..."
@@ -2023,44 +2023,44 @@ msgstr "IMAP4 autentiškumo tikrinimas nepavyko.\n"
 msgid "IMAP4 login failed.\n"
 msgstr "nepavyko prisijungti prie IMAP4\n"
 
-#: src/imap.c:3522
+#: src/imap.c:3528
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "negaliu prirašyti %s į %s\n"
 
-#: src/imap.c:3529
+#: src/imap.c:3535
 msgid "(sending file...)"
 msgstr "(siunčiama byla...)"
 
-#: src/imap.c:3557
+#: src/imap.c:3563
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "negaliu prirašyti žinutės į %s\n"
 
-#: src/imap.c:3589
+#: src/imap.c:3595
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "negaliu nukopijuoti %s į %s\n"
 
-#: src/imap.c:3613
+#: src/imap.c:3619
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "klaida vykdant imap komandą: STORE %s %s\n"
 
-#: src/imap.c:3627
+#: src/imap.c:3633
 msgid "error while imap command: EXPUNGE\n"
 msgstr "klaida vykdant imap komandą: EXPUNGE\n"
 
-#: src/imap.c:3640
+#: src/imap.c:3646
 msgid "error while imap command: CLOSE\n"
 msgstr "klaida vykdant imap komandą: CLOSE\n"
 
-#: src/imap.c:3873
+#: src/imap.c:3879
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv negali konvertuoti UTF-7 į %s\n"
 
-#: src/imap.c:3903
+#: src/imap.c:3909
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv negali konvertuoti %s į UTF-7\n"
@@ -2162,7 +2162,7 @@ msgstr "Importuioti LDIF bylą į adresų knygą"
 msgid "Prev"
 msgstr "Atgal"
 
-#: src/importldif.c:768 src/mainwindow.c:2321
+#: src/importldif.c:768 src/mainwindow.c:2303
 msgid "Next"
 msgstr "Kitas"
 
@@ -2515,615 +2515,615 @@ msgstr ""
 "Rasta senos versijos konfigūracija.\n"
 "Ar norite ją atnaujinti?"
 
-#: src/mainwindow.c:471
+#: src/mainwindow.c:462
 msgid "/_File/_Folder"
 msgstr "/_Byla/_Katalogas"
 
-#: src/mainwindow.c:472
+#: src/mainwindow.c:463
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/_Byla/_Katalogas/Sukurti _naują..."
 
-#: src/mainwindow.c:474
+#: src/mainwindow.c:465
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/_Byla/_Katalogas/Pe_rvadinti..."
 
-#: src/mainwindow.c:475
+#: src/mainwindow.c:466
 msgid "/_File/_Folder/_Move folder..."
 msgstr "/_Byla/_Katalogas/Per_kelti..."
 
-#: src/mainwindow.c:476
+#: src/mainwindow.c:467
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/_Byla/_Katalogas/_Ištrinti"
 
-#: src/mainwindow.c:477
+#: src/mainwindow.c:468
 msgid "/_File/_Mailbox"
 msgstr "/_Byla/_Dėžutė"
 
-#: src/mainwindow.c:478
+#: src/mainwindow.c:469
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/_Byla/_Dėžutė/Pridėti _naują"
 
-#: src/mainwindow.c:479
+#: src/mainwindow.c:470
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/_Byla/_Dėžutė/_Pašalinti"
 
-#: src/mainwindow.c:480 src/mainwindow.c:485
+#: src/mainwindow.c:471 src/mainwindow.c:476
 msgid "/_File/_Mailbox/---"
 msgstr "/_Byla/_Dėžutė/---"
 
-#: src/mainwindow.c:481
+#: src/mainwindow.c:472
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "/_Byla/_Dėžutė/Patikrinti naujas ž_inutes"
 
-#: src/mainwindow.c:483
+#: src/mainwindow.c:474
 msgid "/_File/_Mailbox/Check for new messages in _all mailboxes"
 msgstr "/_Byla/_Dėžutė/Patikrinti naujas žinu_tes visose dėžutėse"
 
-#: src/mainwindow.c:486
+#: src/mainwindow.c:477
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "/_Byla/_Dėžutė/P_erkurti katalogų medį"
 
-#: src/mainwindow.c:489
+#: src/mainwindow.c:480
 msgid "/_File/_Import mbox file..."
 msgstr "/_Byla/_Importuoti „mbox“ bylą..."
 
-#: src/mainwindow.c:490
+#: src/mainwindow.c:481
 msgid "/_File/_Export to mbox file..."
 msgstr "/_Byla/_Eksportuoti į „mbox“ bylą..."
 
-#: src/mainwindow.c:492
+#: src/mainwindow.c:483
 msgid "/_File/Empty all _trash"
 msgstr "/_Byla/Išvaly_ti šiukšlinę"
 
-#: src/mainwindow.c:494 src/messageview.c:138
+#: src/mainwindow.c:485 src/messageview.c:138
 msgid "/_File/_Save as..."
 msgstr "/_Byla/Išsaugoti _kaip..."
 
-#: src/mainwindow.c:495 src/messageview.c:139
+#: src/mainwindow.c:486 src/messageview.c:139
 msgid "/_File/_Print..."
 msgstr "/_Byla/_Spausdinti..."
 
-#: src/mainwindow.c:497
+#: src/mainwindow.c:488
 msgid "/_File/_Work offline"
 msgstr "/_Byla/_Dirbti atsijungus"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:500
+#: src/mainwindow.c:491
 msgid "/_File/E_xit"
 msgstr "/_Byla/Iš_eiti"
 
-#: src/mainwindow.c:505
+#: src/mainwindow.c:496
 msgid "/_Edit/Select _thread"
 msgstr "/_Taisyti/Pažymė_ti giją"
 
-#: src/mainwindow.c:507 src/messageview.c:147
+#: src/mainwindow.c:498 src/messageview.c:147
 msgid "/_Edit/_Find in current message..."
 msgstr "/_Taisyti/_Rasti žinutėje"
 
-#: src/mainwindow.c:509
+#: src/mainwindow.c:500
 msgid "/_Edit/_Search messages..."
 msgstr "/_Taisyti/_Ieškoti žinučių..."
 
-#: src/mainwindow.c:512
+#: src/mainwindow.c:503
 msgid "/_View/Show or hi_de"
 msgstr "/_Rodyti/Ro_dyti arba paslėpti"
 
-#: src/mainwindow.c:513
+#: src/mainwindow.c:504
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/_Rodyti/Ro_dyti arba paslėpti/_Katalogų medis"
 
-#: src/mainwindow.c:515
+#: src/mainwindow.c:506
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/_Rodyti/Ro_dyti arba paslėpti/_Žinutės peržiūra"
 
-#: src/mainwindow.c:517
+#: src/mainwindow.c:508
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/_Rodyti/Ro_dyti arba paslėpti/Į_rankių juosta"
 
-#: src/mainwindow.c:519
+#: src/mainwindow.c:510
 msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/_Rodyti/Ro_dyti arba paslėpti/Į_rankių juosta/Piktogr_amos ir tekstas"
 
-#: src/mainwindow.c:521
+#: src/mainwindow.c:512
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/_Rodyti/Ro_dyti arba paslėpti/Į_rankių juosta/P_iktogramos"
 
-#: src/mainwindow.c:523
+#: src/mainwindow.c:514
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/_Rodyti/Ro_dyti arba paslėpti/Į_rankių juosta/_Tekstas"
 
-#: src/mainwindow.c:525
+#: src/mainwindow.c:516
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/_Rodyti/Ro_dyti arba paslėpti/Į_rankių juosta/_Nieko"
 
-#: src/mainwindow.c:527
+#: src/mainwindow.c:518
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/_Rodyti/Ro_dyti arba paslėpti/_Būsenos juosta"
 
-#: src/mainwindow.c:530
+#: src/mainwindow.c:521
 msgid "/_View/Separate f_older tree"
 msgstr "/_Rodyti/Atskirti _katalogų medį"
 
-#: src/mainwindow.c:531
+#: src/mainwindow.c:522
 msgid "/_View/Separate _message view"
 msgstr "/_Rodyti/Atskirti žin_utės peržiūrą"
 
-#: src/mainwindow.c:533
+#: src/mainwindow.c:524
 msgid "/_View/_Sort"
 msgstr "/_Rodyti/_Rikiuoti"
 
-#: src/mainwindow.c:534
+#: src/mainwindow.c:525
 msgid "/_View/_Sort/by _number"
 msgstr "/_Rodyti/_Rikiuoti/pagal _numerį"
 
-#: src/mainwindow.c:535
+#: src/mainwindow.c:526
 msgid "/_View/_Sort/by s_ize"
 msgstr "/_Rodyti/_Rikiuoti/pagal _dydį"
 
-#: src/mainwindow.c:536
+#: src/mainwindow.c:527
 msgid "/_View/_Sort/by _date"
 msgstr "/_Rodyti/_Rikiuoti/pagal d_atą"
 
-#: src/mainwindow.c:537
+#: src/mainwindow.c:528
 msgid "/_View/_Sort/by _from"
 msgstr "/_Rodyti/_Rikiuoti/pagal _siuntėją"
 
-#: src/mainwindow.c:538
+#: src/mainwindow.c:529
 msgid "/_View/_Sort/by _recipient"
 msgstr "/_Rodyti/_Rikiuoti/pagal _gavėją"
 
-#: src/mainwindow.c:539
+#: src/mainwindow.c:530
 msgid "/_View/_Sort/by _subject"
 msgstr "/_Rodyti/_Rikiuoti/pagal _temą"
 
-#: src/mainwindow.c:540
+#: src/mainwindow.c:531
 msgid "/_View/_Sort/by _color label"
 msgstr "/_Rodyti/_Rikiuoti/pagal _spalvos etiketę"
 
-#: src/mainwindow.c:542
+#: src/mainwindow.c:533
 msgid "/_View/_Sort/by _mark"
 msgstr "/_Rodyti/_Rikiuoti/pagal ž_ymę"
 
-#: src/mainwindow.c:543
+#: src/mainwindow.c:534
 msgid "/_View/_Sort/by _unread"
 msgstr "/_Rodyti/_Rikiuoti/pagal ne_skaitytus"
 
-#: src/mainwindow.c:544
+#: src/mainwindow.c:535
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/_Rodyti/_Rikiuoti/pagal _priedą"
 
-#: src/mainwindow.c:546
+#: src/mainwindow.c:537
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/_Rodyti/_Rikiuoti/Ne_rikiuoti"
 
-#: src/mainwindow.c:547 src/mainwindow.c:550
+#: src/mainwindow.c:538 src/mainwindow.c:541
 msgid "/_View/_Sort/---"
 msgstr "/_Rodyti/_Rikiuoti/---"
 
-#: src/mainwindow.c:548
+#: src/mainwindow.c:539
 msgid "/_View/_Sort/Ascending"
 msgstr "/_Rodyti/_Rikiuoti/_Didėjimo tvarka"
 
-#: src/mainwindow.c:549
+#: src/mainwindow.c:540
 msgid "/_View/_Sort/Descending"
 msgstr "/_Rodyti/_Rikiuoti/_Mažėjimo tvarka"
 
-#: src/mainwindow.c:551
+#: src/mainwindow.c:542
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/_Rodyti/_Rikiuoti/P_agal temą"
 
-#: src/mainwindow.c:553
+#: src/mainwindow.c:544
 msgid "/_View/Th_read view"
 msgstr "/_Rodyti/_Gijų peržiūra"
 
-#: src/mainwindow.c:554
+#: src/mainwindow.c:545
 msgid "/_View/E_xpand all threads"
 msgstr "/_Rodyti/Iš_skleisti visas gijas"
 
-#: src/mainwindow.c:555
+#: src/mainwindow.c:546
 msgid "/_View/Co_llapse all threads"
 msgstr "/_Rodyti/Su_traukti visas gijas"
 
-#: src/mainwindow.c:556
+#: src/mainwindow.c:547
 msgid "/_View/Set display _item..."
 msgstr "/_Rodyti/Nustatyt_i rodomus laukus"
 
-#: src/mainwindow.c:559
+#: src/mainwindow.c:550
 msgid "/_View/_Go to"
 msgstr "/_Rodyti/_Eiti į"
 
-#: src/mainwindow.c:560
+#: src/mainwindow.c:551
 msgid "/_View/_Go to/_Prev message"
 msgstr "/_Rodyti/_Eiti į/_Ankstesnė žinutė"
 
-#: src/mainwindow.c:561
+#: src/mainwindow.c:552
 msgid "/_View/_Go to/_Next message"
 msgstr "/_Rodyti/_Eiti į/_Kita žinutė"
 
-#: src/mainwindow.c:562 src/mainwindow.c:567 src/mainwindow.c:570
-#: src/mainwindow.c:575 src/mainwindow.c:580
+#: src/mainwindow.c:553 src/mainwindow.c:558 src/mainwindow.c:561
+#: src/mainwindow.c:566 src/mainwindow.c:571
 msgid "/_View/_Go to/---"
 msgstr "/_Rodyti/_Eiti į/---"
 
-#: src/mainwindow.c:563
+#: src/mainwindow.c:554
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/_Rodyti/_Eiti į/Ankstesnė neskaityta žinutė"
 
-#: src/mainwindow.c:565
+#: src/mainwindow.c:556
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/_Rodyti/_Eiti į/Kita neskaityta žinutė"
 
-#: src/mainwindow.c:568
+#: src/mainwindow.c:559
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/_Rodyti/_Eiti į/Ankstesnė nauja žinutė"
 
-#: src/mainwindow.c:569
+#: src/mainwindow.c:560
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/_Rodyti/_Eiti į/Kita nauja žinutė"
 
-#: src/mainwindow.c:571
+#: src/mainwindow.c:562
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/_Rodyti/_Eiti į/Ankstesnė pažymėta žinutė"
 
-#: src/mainwindow.c:573
+#: src/mainwindow.c:564
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/_Rodyti/_Eiti į/Kita pažymėta žinutė"
 
-#: src/mainwindow.c:576
+#: src/mainwindow.c:567
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/_Rodyti/_Eiti į/Ankstesnė žinutė su etikete"
 
-#: src/mainwindow.c:578
+#: src/mainwindow.c:569
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/_Rodyti/_Eiti į/Kita žinutė su etikete"
 
-#: src/mainwindow.c:581
+#: src/mainwindow.c:572
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Rodyti/_Eiti į/Kitas ka_talogas"
 
-#: src/mainwindow.c:590 src/messageview.c:158
+#: src/mainwindow.c:581 src/messageview.c:158
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Rodyti/Simbolių ko_duotė/_Automatiškai"
 
-#: src/mainwindow.c:641 src/messageview.c:202
+#: src/mainwindow.c:632 src/messageview.c:202
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Rodyti/Simbolių ko_duotė/Japonų (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:643 src/messageview.c:204
+#: src/mainwindow.c:634 src/messageview.c:204
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Rodyti/Simbolių ko_duotė/Japonų (_EUC-JP)"
 
-#: src/mainwindow.c:645 src/messageview.c:206
+#: src/mainwindow.c:636 src/messageview.c:206
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Rodyti/Simbolių ko_duotė/Japonų (_Shift__JIS)"
 
-#: src/mainwindow.c:657 src/messageview.c:217
+#: src/mainwindow.c:648 src/messageview.c:217
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Rodyti/Simbolių ko_duotė/Kinų (ISO-2022-_CN)"
 
-#: src/mainwindow.c:663 src/messageview.c:222
+#: src/mainwindow.c:654 src/messageview.c:222
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Rodyti/Simbolių ko_duotė/Korėjiečių (ISO-2022-KR)"
 
-#: src/mainwindow.c:676 src/summaryview.c:401
+#: src/mainwindow.c:667 src/summaryview.c:401
 msgid "/_View/Open in new _window"
 msgstr "/_Rodyti/Atverti naujame _lange"
 
-#: src/mainwindow.c:677 src/messageview.c:234
+#: src/mainwindow.c:668 src/messageview.c:234
 msgid "/_View/Mess_age source"
 msgstr "/_Rodyti/Žinutės pr_adinis tekstas"
 
-#: src/mainwindow.c:678 src/messageview.c:235
+#: src/mainwindow.c:669 src/messageview.c:235
 msgid "/_View/Show all _header"
 msgstr "/_Rodyti/Rodyti _visas antraštes"
 
-#: src/mainwindow.c:680
+#: src/mainwindow.c:671
 msgid "/_View/_Update summary"
 msgstr "/_Rodyti/Atna_ujinti santrauką"
 
-#: src/mainwindow.c:682 src/messageview.c:237
+#: src/mainwindow.c:673 src/messageview.c:237
 msgid "/_Message"
 msgstr "/Ži_nutė"
 
-#: src/mainwindow.c:683
+#: src/mainwindow.c:674
 msgid "/_Message/Recei_ve"
 msgstr "/Ži_nutė/_Gauti"
 
-#: src/mainwindow.c:684
+#: src/mainwindow.c:675
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/Ži_nutė/_Gauti/Gauti iš _esamos sąskaitos"
 
-#: src/mainwindow.c:686
+#: src/mainwindow.c:677
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/Ži_nutė/_Gauti/Gauti iš _visų sąskaitų"
 
-#: src/mainwindow.c:688
+#: src/mainwindow.c:679
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/Ži_nutė/_Gauti/_Nutraukti gavimą"
 
-#: src/mainwindow.c:690
+#: src/mainwindow.c:681
 msgid "/_Message/Recei_ve/---"
 msgstr "/Ži_nutė/_Gauti/---"
 
-#: src/mainwindow.c:691
+#: src/mainwindow.c:682
 msgid "/_Message/_Send queued messages"
 msgstr "/Ži_nutė/_Siųsti žinutes eilėje"
 
-#: src/mainwindow.c:692 src/mainwindow.c:694 src/mainwindow.c:701
-#: src/mainwindow.c:706 src/mainwindow.c:710 src/mainwindow.c:719
-#: src/mainwindow.c:722 src/messageview.c:240 src/messageview.c:248
+#: src/mainwindow.c:683 src/mainwindow.c:685 src/mainwindow.c:692
+#: src/mainwindow.c:697 src/mainwindow.c:701 src/mainwindow.c:710
+#: src/mainwindow.c:713 src/messageview.c:240 src/messageview.c:248
 #: src/messageview.c:253
 msgid "/_Message/---"
 msgstr "/Ži_nutė/---"
 
-#: src/mainwindow.c:693 src/messageview.c:238
+#: src/mainwindow.c:684 src/messageview.c:238
 msgid "/_Message/Compose _new message"
 msgstr "/Ži_nutė/Rašyti _naują"
 
-#: src/mainwindow.c:695 src/messageview.c:241
+#: src/mainwindow.c:686 src/messageview.c:241
 msgid "/_Message/_Reply"
 msgstr "/Ži_nutė/_Atsakyti"
 
-#: src/mainwindow.c:696
+#: src/mainwindow.c:687
 msgid "/_Message/Repl_y to"
 msgstr "/Ži_nutė/Atsak_yti kam"
 
-#: src/mainwindow.c:697 src/messageview.c:242
+#: src/mainwindow.c:688 src/messageview.c:242
 msgid "/_Message/Repl_y to/_all"
 msgstr "/Ži_nutė/Atsak_yti kam/_visiems"
 
-#: src/mainwindow.c:698 src/messageview.c:244
+#: src/mainwindow.c:689 src/messageview.c:244
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/Ži_nutė/Atsak_yti kam/_siuntėjui"
 
-#: src/mainwindow.c:699 src/messageview.c:246
+#: src/mainwindow.c:690 src/messageview.c:246
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/Ži_nutė/Atsak_yti kam/pašto _konferencijai"
 
-#: src/mainwindow.c:702 src/messageview.c:249
+#: src/mainwindow.c:693 src/messageview.c:249
 msgid "/_Message/_Forward"
 msgstr "/Ži_nutė/_Persiųsti"
 
-#: src/mainwindow.c:703 src/messageview.c:250
+#: src/mainwindow.c:694 src/messageview.c:250
 msgid "/_Message/For_ward as attachment"
 msgstr "/Ži_nutė/Persiųsti kaip p_riedą"
 
-#: src/mainwindow.c:705 src/messageview.c:252
+#: src/mainwindow.c:696 src/messageview.c:252
 msgid "/_Message/Redirec_t"
 msgstr "/Ži_nutė/Nukreip_ti"
 
-#: src/mainwindow.c:707
+#: src/mainwindow.c:698
 msgid "/_Message/M_ove..."
 msgstr "/Ži_nutė/Per_kelti..."
 
-#: src/mainwindow.c:708
+#: src/mainwindow.c:699
 msgid "/_Message/_Copy..."
 msgstr "/Ži_nutė/K_opijuoti..."
 
-#: src/mainwindow.c:709
+#: src/mainwindow.c:700
 msgid "/_Message/_Delete"
 msgstr "/Ži_nutė/_Trinti"
 
-#: src/mainwindow.c:711
+#: src/mainwindow.c:702
 msgid "/_Message/_Mark"
 msgstr "/Ži_nutė/Žy_ma"
 
-#: src/mainwindow.c:712
+#: src/mainwindow.c:703
 msgid "/_Message/_Mark/_Mark"
 msgstr "/Ži_nutė/Žy_ma/Pažy_mėti"
 
-#: src/mainwindow.c:713
+#: src/mainwindow.c:704
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/Ži_nutė/Žy_ma/_Nežymėti"
 
-#: src/mainwindow.c:714
+#: src/mainwindow.c:705
 msgid "/_Message/_Mark/---"
 msgstr "/Ži_nutė/Žy_ma/---"
 
-#: src/mainwindow.c:715
+#: src/mainwindow.c:706
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/Ži_nutė/Žy_ma/Ne_skaityta"
 
-#: src/mainwindow.c:716
+#: src/mainwindow.c:707
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/Ži_nutė/Žy_ma/Skai_tyta"
 
-#: src/mainwindow.c:718
+#: src/mainwindow.c:709
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/Ži_nutė/Žy_ma/_Visos kaip skaitytos"
 
-#: src/mainwindow.c:720
+#: src/mainwindow.c:711
 msgid "/_Message/Set as _junk mail"
 msgstr "/Ži_nutė/Pažymėti kaip nereikalingą"
 
-#: src/mainwindow.c:721
+#: src/mainwindow.c:712
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/Ži_nutė/Pažymėti kaip reikalingą"
 
-#: src/mainwindow.c:723 src/messageview.c:254
+#: src/mainwindow.c:714 src/messageview.c:254
 msgid "/_Message/Re-_edit"
 msgstr "/_Message/P_ertaisyti"
 
-#: src/mainwindow.c:727
+#: src/mainwindow.c:718
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/Į_rankiai/Įrašyti siuntėją į adresų _knygą"
 
-#: src/mainwindow.c:730
+#: src/mainwindow.c:721
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/Į_rankiai/_Filtruoti žinutes kataloge"
 
-#: src/mainwindow.c:732
+#: src/mainwindow.c:723
 msgid "/_Tools/Filter _selected messages"
 msgstr "/Į_rankiai/Filtruoti pa_sirinktas žinutes"
 
-#: src/mainwindow.c:734 src/messageview.c:261
+#: src/mainwindow.c:725 src/messageview.c:261
 msgid "/_Tools/_Create filter rule"
 msgstr "/Į_rankiai/Sukurti filtravimo _taisyklę"
 
-#: src/mainwindow.c:735 src/messageview.c:263
+#: src/mainwindow.c:726 src/messageview.c:263
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/Į_rankiai/Sukurti filtravimo _taisyklę/_Automatiškai"
 
-#: src/mainwindow.c:737 src/messageview.c:265
+#: src/mainwindow.c:728 src/messageview.c:265
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/Į_rankiai/Sukurti filtravimo _taisyklę/pagal _Siuntėją"
 
-#: src/mainwindow.c:739 src/messageview.c:267
+#: src/mainwindow.c:730 src/messageview.c:267
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/Į_rankiai/Sukurti filtravimo _taisyklę/pagal _Gavėją"
 
-#: src/mainwindow.c:741 src/messageview.c:269
+#: src/mainwindow.c:732 src/messageview.c:269
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/Į_rankiai/Sukurti filtravimo _taisyklę/pagal _Temą"
 
-#: src/mainwindow.c:744
+#: src/mainwindow.c:735
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/Į_rankiai/_Filtruoti nereikalingas žinutes kataloge"
 
-#: src/mainwindow.c:746
+#: src/mainwindow.c:737
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/Į_rankiai/Filtruoti nereikalingas tarp pa_sirinktų žinučių"
 
-#: src/mainwindow.c:751
+#: src/mainwindow.c:742
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/Į_rankiai/Ištrinti _vienodas žinutes"
 
-#: src/mainwindow.c:754
+#: src/mainwindow.c:745
 msgid "/_Tools/E_xecute"
 msgstr "/Į_rankiai/Vykdyti"
 
-#: src/mainwindow.c:756
+#: src/mainwindow.c:747
 msgid "/_Tools/_Log window"
 msgstr "/Į_rankiai/„_Log“ langas"
 
-#: src/mainwindow.c:758
+#: src/mainwindow.c:749
 msgid "/_Configuration"
 msgstr "/_Nustatymai"
 
-#: src/mainwindow.c:759
+#: src/mainwindow.c:750
 msgid "/_Configuration/_Common preferences..."
 msgstr "/_Nustatymai/Bendri _nustatymai..."
 
-#: src/mainwindow.c:761
+#: src/mainwindow.c:752
 msgid "/_Configuration/_Filter setting..."
 msgstr "/_Nustatymai/_Filtro nustatymai..."
 
-#: src/mainwindow.c:763
+#: src/mainwindow.c:754
 msgid "/_Configuration/_Template..."
 msgstr "/_Nustatymai/Ša_blonai..."
 
-#: src/mainwindow.c:764
+#: src/mainwindow.c:755
 msgid "/_Configuration/_Actions..."
 msgstr "/_Nustatymai/Veiksm_ai..."
 
-#: src/mainwindow.c:765
+#: src/mainwindow.c:756
 msgid "/_Configuration/---"
 msgstr "/_Nustatymai/---"
 
-#: src/mainwindow.c:766
+#: src/mainwindow.c:757
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Nustatymai/_Esamos sąskaitos nustatymai"
 
-#: src/mainwindow.c:768
+#: src/mainwindow.c:759
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Nustatymai/Sukurti _naują sąskaitą..."
 
-#: src/mainwindow.c:770
+#: src/mainwindow.c:761
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Nustatymai/R_edaguoti sąskaitas..."
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:763
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Nustatymai/Keisti esamą sąskaitą"
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:767
 msgid "/_Help/_Manual"
 msgstr "/_Pagalba/_Instrukcija"
 
-#: src/mainwindow.c:777
+#: src/mainwindow.c:768
 msgid "/_Help/_Manual/_English"
 msgstr "/_Pagalba/_Instrukcija/_English"
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:769
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/_Pagalba/_Instrukcija/_Japanese"
 
-#: src/mainwindow.c:779
+#: src/mainwindow.c:770
 msgid "/_Help/_FAQ"
 msgstr "/_Pagalba/_DUK"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:771
 msgid "/_Help/_FAQ/_English"
 msgstr "/_Pagalba/_DUK/_English"
 
-#: src/mainwindow.c:781
+#: src/mainwindow.c:772
 msgid "/_Help/_FAQ/_German"
 msgstr "/_Pagalba/_DUK/_German"
 
-#: src/mainwindow.c:782
+#: src/mainwindow.c:773
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/_Pagalba/_DUK/_Spanish"
 
-#: src/mainwindow.c:783
+#: src/mainwindow.c:774
 msgid "/_Help/_FAQ/_French"
 msgstr "/_Pagalba/_DUK/_French"
 
-#: src/mainwindow.c:784
+#: src/mainwindow.c:775
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/_Pagalba/_DUK/_Italian"
 
-#: src/mainwindow.c:785
+#: src/mainwindow.c:776
 msgid "/_Help/---"
 msgstr "/_Pagalba/---"
 
-#: src/mainwindow.c:825
+#: src/mainwindow.c:816
 msgid "Creating main window...\n"
 msgstr "Kuriamas pagrindinis langas..\n"
 
-#: src/mainwindow.c:987
+#: src/mainwindow.c:973
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "MainWindow: nepavyko spalvos priskyrimas %d\n"
 
-#: src/mainwindow.c:1071 src/summaryview.c:2020 src/summaryview.c:2105
+#: src/mainwindow.c:1057 src/summaryview.c:2020 src/summaryview.c:2105
 #: src/summaryview.c:3342 src/summaryview.c:3415 src/summaryview.c:3728
 msgid "done.\n"
 msgstr "atlikta.\n"
 
-#: src/mainwindow.c:1196 src/mainwindow.c:1237 src/mainwindow.c:1265
+#: src/mainwindow.c:1182 src/mainwindow.c:1223 src/mainwindow.c:1251
 msgid "Untitled"
 msgstr "Bevardis"
 
-#: src/mainwindow.c:1266
+#: src/mainwindow.c:1252
 msgid "none"
 msgstr "nieko"
 
-#: src/mainwindow.c:1316
+#: src/mainwindow.c:1302
 #, 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:1536
+#: src/mainwindow.c:1522
 msgid "Offline"
 msgstr "Atsijungęs"
 
-#: src/mainwindow.c:1537
+#: src/mainwindow.c:1523
 msgid "You are offline. Go online?"
 msgstr "Jūs esate atsijungęs. Prisijungti?"
 
-#: src/mainwindow.c:1551
+#: src/mainwindow.c:1537
 msgid "Empty all trash"
 msgstr "Išvalyti visas šiukšlines"
 
-#: src/mainwindow.c:1552
+#: src/mainwindow.c:1538
 msgid "Empty messages in all trash?"
 msgstr "Ištrinti žinutes iš visų šiukšlinių?"
 
-#: src/mainwindow.c:1580
+#: src/mainwindow.c:1566
 msgid "Add mailbox"
 msgstr "Pridėti dėžutę"
 
-#: src/mainwindow.c:1581
+#: src/mainwindow.c:1567
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3133,16 +3133,16 @@ msgstr ""
 "Jeigu ji egzistuoja, ji bus\n"
 "nuskanuota automatiškai."
 
-#: src/mainwindow.c:1587
+#: src/mainwindow.c:1573
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Dėžutė „%s“ egzistuoja."
 
-#: src/mainwindow.c:1592 src/setup.c:57
+#: src/mainwindow.c:1578 src/setup.c:57
 msgid "Mailbox"
 msgstr "Dėžutė"
 
-#: src/mainwindow.c:1598 src/setup.c:63
+#: src/mainwindow.c:1584 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3151,149 +3151,149 @@ msgstr ""
 "Nepavyko sukurti dėžutės.\n"
 "Galbūt kai kurios bylos jau egzistuoja arba jūs neturite leidimo rašyti ten."
 
-#: src/mainwindow.c:1989
+#: src/mainwindow.c:1975
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Katalogų peržiūra"
 
-#: src/mainwindow.c:2009 src/messageview.c:368
+#: src/mainwindow.c:1995 src/messageview.c:368
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Žinutės peržiūra"
 
-#: src/mainwindow.c:2156 src/summaryview.c:370
+#: src/mainwindow.c:2142 src/summaryview.c:370
 msgid "/_Reply"
 msgstr "/_Atsakyti"
 
-#: src/mainwindow.c:2157
+#: src/mainwindow.c:2143
 msgid "/Reply to _all"
 msgstr "/Atsakyti _visiems"
 
-#: src/mainwindow.c:2158
+#: src/mainwindow.c:2144
 msgid "/Reply to _sender"
 msgstr "/Atsakyti _siuntėjui"
 
-#: src/mainwindow.c:2159
+#: src/mainwindow.c:2145
 msgid "/Reply to mailing _list"
 msgstr "/Atsakyti _konferencijai"
 
-#: src/mainwindow.c:2164 src/summaryview.c:377
+#: src/mainwindow.c:2150 src/summaryview.c:377
 msgid "/_Forward"
 msgstr "/_Persiųsti"
 
-#: src/mainwindow.c:2165 src/summaryview.c:378
+#: src/mainwindow.c:2151 src/summaryview.c:378
 msgid "/For_ward as attachment"
 msgstr "/Pe_rsiųsti kaip priedą"
 
-#: src/mainwindow.c:2166 src/summaryview.c:379
+#: src/mainwindow.c:2152 src/summaryview.c:379
 msgid "/Redirec_t"
 msgstr "/Nukreip_ti"
 
-#: src/mainwindow.c:2205
+#: src/mainwindow.c:2188
 msgid "Get"
 msgstr "Gauti"
 
-#: src/mainwindow.c:2206
+#: src/mainwindow.c:2189
 msgid "Incorporate new mail"
 msgstr "Prijungti naują paštą"
 
-#: src/mainwindow.c:2213
+#: src/mainwindow.c:2196
 msgid "Get all"
 msgstr "Gauti visus"
 
-#: src/mainwindow.c:2214
+#: src/mainwindow.c:2197
 msgid "Incorporate new mail of all accounts"
 msgstr "Prijungti naują visų sąskaitų paštą"
 
-#: src/mainwindow.c:2225
+#: src/mainwindow.c:2208
 msgid "Send queued message(s)"
 msgstr "Siųsti laiškus eilėje"
 
-#: src/mainwindow.c:2235 src/prefs_account.c:721 src/prefs_common.c:949
+#: src/mainwindow.c:2218 src/prefs_account.c:721 src/prefs_common.c:949
 #: src/prefs_folder_item.c:137
 msgid "Compose"
 msgstr "Rašyti"
 
-#: src/mainwindow.c:2236
+#: src/mainwindow.c:2219
 msgid "Compose new message"
 msgstr "Rašyti naują laišką"
 
-#: src/mainwindow.c:2244 src/prefs_common.c:1448
+#: src/mainwindow.c:2227 src/prefs_common.c:1448
 msgid "Reply"
 msgstr "Atsakyti"
 
-#: src/mainwindow.c:2245 src/mainwindow.c:2258
+#: src/mainwindow.c:2228 src/mainwindow.c:2241
 msgid "Reply to the message"
 msgstr "Atsakyti į laišką"
 
-#: src/mainwindow.c:2263
+#: src/mainwindow.c:2245
 msgid "Reply all"
 msgstr "Atsakyti visus"
 
-#: src/mainwindow.c:2264
+#: src/mainwindow.c:2246
 msgid "Reply to all"
 msgstr "Atsakyti į visus"
 
-#: src/mainwindow.c:2272 src/prefs_filter_edit.c:741
+#: src/mainwindow.c:2254 src/prefs_filter_edit.c:741
 msgid "Forward"
 msgstr "Persiųsti"
 
-#: src/mainwindow.c:2273 src/mainwindow.c:2286
+#: src/mainwindow.c:2255 src/mainwindow.c:2268
 msgid "Forward the message"
 msgstr "Persiųsti laišką"
 
-#: src/mainwindow.c:2293
+#: src/mainwindow.c:2275
 msgid "Delete the message"
 msgstr "Ištrinti laišką"
 
-#: src/mainwindow.c:2301 src/prefs_common.c:1988
+#: src/mainwindow.c:2283 src/prefs_common.c:1988
 msgid "Junk"
 msgstr "Nereikalingas"
 
-#: src/mainwindow.c:2302
+#: src/mainwindow.c:2284
 msgid "Set as junk mail"
 msgstr "Pažymėti kaip nereikalingą"
 
-#: src/mainwindow.c:2311
+#: src/mainwindow.c:2293
 msgid "Execute"
 msgstr "Vykdyti"
 
-#: src/mainwindow.c:2312
+#: src/mainwindow.c:2294
 msgid "Execute marked process"
 msgstr "Vykdyti pažymėtus procesus"
 
-#: src/mainwindow.c:2322
+#: src/mainwindow.c:2304
 msgid "Next unread message"
 msgstr "Kitas neskaitytas laiškas"
 
-#: src/mainwindow.c:2334
+#: src/mainwindow.c:2316
 msgid "Prefs"
 msgstr "Nustatymai"
 
-#: src/mainwindow.c:2335
+#: src/mainwindow.c:2317
 msgid "Common preferences"
 msgstr "Bendri nustatymai"
 
-#: src/mainwindow.c:2343 src/prefs_folder_item.c:261
+#: src/mainwindow.c:2325 src/prefs_folder_item.c:261
 #: src/prefs_folder_item.c:272 src/progressdialog.c:128
 msgid "Account"
 msgstr "Sąskaita"
 
-#: src/mainwindow.c:2344
+#: src/mainwindow.c:2326
 msgid "Account setting"
 msgstr "Sąskaitos nustatymai"
 
-#: src/mainwindow.c:2527
+#: src/mainwindow.c:2498
 msgid "You are offline. Click the icon to go online."
 msgstr "Jūs esate atsijungęs. Spustelkite piktogramą jei norite prisijungti."
 
-#: src/mainwindow.c:2538
+#: src/mainwindow.c:2509
 msgid "You are online. Click the icon to go offline."
 msgstr "Jūs esate prisijungęs. Spustelkite piktogramą jei norite atsijungti."
 
-#: src/mainwindow.c:2731
+#: src/mainwindow.c:2702
 msgid "Exit"
 msgstr "Išeiti"
 
-#: src/mainwindow.c:2731
+#: src/mainwindow.c:2702
 msgid "Exit this program?"
 msgstr "Užverti programą?"
 
@@ -5486,11 +5486,11 @@ msgstr "Sukuriamas progreso dialogas...\n"
 msgid "Status"
 msgstr "Būsena"
 
-#: src/recv.c:113
+#: src/recv.c:112
 msgid "error occurred while retrieving data.\n"
 msgstr "kalaida gaunant duomenis.\n"
 
-#: src/recv.c:155 src/recv.c:197 src/recv.c:213
+#: src/recv.c:154 src/recv.c:196 src/recv.c:211
 msgid "Can't write to file.\n"
 msgstr "Negaliu rašyti į bylą.\n"
 
@@ -6223,7 +6223,7 @@ msgstr "%.2fMB"
 msgid "%.2fGB"
 msgstr "%.2fGB"
 
-#: src/utils.c:2372 src/utils.c:2496
+#: src/utils.c:2386 src/utils.c:2510
 #, c-format
 msgid "writing to %s failed.\n"
 msgstr "nepavyko įrašyti į „%s“.\n"
diff --git a/po/nl.po b/po/nl.po
index 96841dc2..be0a543c 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed 0.8\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-08-09 18:08+0900\n"
+"POT-Creation-Date: 2005-08-22 17:22+0900\n"
 "PO-Revision-Date: 2003-02-18 13:03--100\n"
 "Last-Translator: Vincent van Adrighem <V.vanAdrighem@dirck.mine.nu>\n"
 "Language-Team: Dutch <vertaling@nl.linux.rg>\n"
@@ -99,7 +99,7 @@ msgstr ""
 "u op de knop 'Alles ophalen' klikt."
 
 #: src/account.c:691 src/addressadd.c:192 src/addressbook.c:490
-#: src/compose.c:4081 src/editaddress.c:200 src/editaddress.c:942
+#: src/compose.c:4079 src/editaddress.c:200 src/editaddress.c:942
 #: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:265
 #: src/editjpilot.c:271 src/editldap.c:307 src/editvcard.c:184
 #: src/mimeview.c:201 src/prefs_filter.c:258 src/prefs_folder_item.c:170
@@ -235,7 +235,7 @@ msgstr ""
 msgid "Add Address to Book"
 msgstr "Adres toevoegen aan adresboek"
 
-#: src/addressadd.c:202 src/compose.c:4528 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4521 src/editaddress.c:201
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "Adres"
@@ -249,7 +249,7 @@ msgstr "Opmerkingen"
 msgid "Select Address Book Folder"
 msgstr "Selecteer adresboekmap"
 
-#: src/addressbook.c:336 src/compose.c:495 src/mainwindow.c:470
+#: src/addressbook.c:336 src/compose.c:493 src/mainwindow.c:461
 #: src/messageview.c:137
 msgid "/_File"
 msgstr "/_Bestand"
@@ -270,10 +270,10 @@ msgstr "/_Bestand/Nieuwe _JPilot"
 msgid "/_File/New _Server"
 msgstr "/_Bestand/Nieuwe _Server"
 
-#: src/addressbook.c:345 src/addressbook.c:348 src/compose.c:500
-#: src/compose.c:505 src/compose.c:509 src/mainwindow.c:488
-#: src/mainwindow.c:491 src/mainwindow.c:493 src/mainwindow.c:496
-#: src/mainwindow.c:498 src/messageview.c:140
+#: src/addressbook.c:345 src/addressbook.c:348 src/compose.c:498
+#: src/compose.c:503 src/compose.c:507 src/mainwindow.c:479
+#: src/mainwindow.c:482 src/mainwindow.c:484 src/mainwindow.c:487
+#: src/mainwindow.c:489 src/messageview.c:140
 msgid "/_File/---"
 msgstr "/_Bestand/---"
 
@@ -289,7 +289,7 @@ msgstr "/_Bestand/_Verwijderen"
 msgid "/_File/_Save"
 msgstr "/_Bestand/_Opslaan"
 
-#: src/addressbook.c:350 src/compose.c:510 src/messageview.c:141
+#: src/addressbook.c:350 src/compose.c:508 src/messageview.c:141
 msgid "/_File/_Close"
 msgstr "/_Bestand/_Sluiten"
 
@@ -321,7 +321,7 @@ msgstr "/_Adres/_Bewerken"
 msgid "/_Address/_Delete"
 msgstr "/_Adres/_Verwijderen"
 
-#: src/addressbook.c:358 src/compose.c:619 src/mainwindow.c:725
+#: src/addressbook.c:358 src/compose.c:617 src/mainwindow.c:716
 #: src/messageview.c:256
 msgid "/_Tools"
 msgstr "/_Gereedschap"
@@ -330,12 +330,12 @@ msgstr "/_Gereedschap"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Gereedschap/_LDIF bestand importeren"
 
-#: src/addressbook.c:360 src/compose.c:632 src/mainwindow.c:775
+#: src/addressbook.c:360 src/compose.c:630 src/mainwindow.c:766
 #: src/messageview.c:274
 msgid "/_Help"
 msgstr "/_Hulp"
 
-#: src/addressbook.c:361 src/compose.c:633 src/mainwindow.c:786
+#: src/addressbook.c:361 src/compose.c:631 src/mainwindow.c:777
 #: src/messageview.c:275
 msgid "/_Help/_About"
 msgstr "/_Hulp/_Info"
@@ -352,7 +352,7 @@ msgstr "/Nieuwe _groep"
 msgid "/New _Folder"
 msgstr "/Nieuwe _map"
 
-#: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:489
+#: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:487
 #: src/folderview.c:235 src/folderview.c:237 src/folderview.c:241
 #: src/folderview.c:252 src/folderview.c:254 src/folderview.c:256
 #: src/folderview.c:260 src/folderview.c:270 src/folderview.c:272
@@ -362,8 +362,8 @@ msgstr "/Nieuwe _map"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:512
-#: src/mainwindow.c:502 src/messageview.c:143
+#: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:510
+#: src/mainwindow.c:493 src/messageview.c:143
 msgid "/_Edit"
 msgstr "/Be_werken"
 
@@ -375,7 +375,7 @@ msgstr "/Ver_wijderen"
 msgid "E-Mail address"
 msgstr "E-mail adres"
 
-#: src/addressbook.c:495 src/compose.c:4529 src/prefs_common.c:2402
+#: src/addressbook.c:495 src/compose.c:4522 src/prefs_common.c:2402
 msgid "Address book"
 msgstr "Adresboek"
 
@@ -384,8 +384,8 @@ msgid "Name:"
 msgstr "Naam:"
 
 #. Buttons
-#: src/addressbook.c:627 src/addressbook.c:1673 src/editaddress.c:884
-#: src/editaddress.c:1017 src/mainwindow.c:2292 src/prefs_actions.c:266
+#: src/addressbook.c:627 src/addressbook.c:1674 src/editaddress.c:884
+#: src/editaddress.c:1017 src/mainwindow.c:2274 src/prefs_actions.c:266
 #: src/prefs_display_header.c:278 src/prefs_display_header.c:333
 #: src/prefs_template.c:231
 msgid "Delete"
@@ -424,7 +424,7 @@ msgstr "Adres(sen) verwijderen"
 msgid "Really delete the address(es)?"
 msgstr "Wilt u de adressen werkelijk verwijderen?"
 
-#: src/addressbook.c:1664
+#: src/addressbook.c:1665
 #, fuzzy, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -434,38 +434,38 @@ msgstr ""
 "Als u alleen de map verwijdert, dan zullen de adressen naar de \n"
 "hoger gelegen map verplaatst worden."
 
-#: src/addressbook.c:1667 src/folderview.c:2139
+#: src/addressbook.c:1668 src/folderview.c:2139
 msgid "Delete folder"
 msgstr "Verwijder map"
 
-#: src/addressbook.c:1667
+#: src/addressbook.c:1668
 #, fuzzy
 msgid "_Folder only"
 msgstr "Alleen map"
 
-#: src/addressbook.c:1667
+#: src/addressbook.c:1668
 #, fuzzy
 msgid "Folder and _addresses"
 msgstr "Map en adressen"
 
-#: src/addressbook.c:1672
+#: src/addressbook.c:1673
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Wilt u '%s' werkelijk verwijderen?"
 
-#: src/addressbook.c:2352 src/addressbook.c:2485
+#: src/addressbook.c:2353 src/addressbook.c:2486
 msgid "New user, could not save index file."
 msgstr "Nieuwe gebruiker: Kon indexbestand niet opslaan."
 
-#: src/addressbook.c:2356 src/addressbook.c:2489
+#: src/addressbook.c:2357 src/addressbook.c:2490
 msgid "New user, could not save address book files."
 msgstr "Nieuwe gebruiker: Kon adresboekbestanden niet opslaan."
 
-#: src/addressbook.c:2366 src/addressbook.c:2499
+#: src/addressbook.c:2367 src/addressbook.c:2500
 msgid "Old address book converted successfully."
 msgstr "Oude adresboekgegevens succesvol omgezet."
 
-#: src/addressbook.c:2371
+#: src/addressbook.c:2372
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -473,7 +473,7 @@ msgstr ""
 "Oude adresboekgegevens omgezet.\n"
 "Kon het nieuwe adresboek indexbestand niet opslaan."
 
-#: src/addressbook.c:2384
+#: src/addressbook.c:2385
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -481,7 +481,7 @@ msgstr ""
 "Kon adresboekgegevens niet omzetten.\n"
 "Nieuw leeg adresboek is gemaakt."
 
-#: src/addressbook.c:2390
+#: src/addressbook.c:2391
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -489,7 +489,7 @@ msgstr ""
 "Kon adresboekgegevens niet omzetten.\n"
 "Kon geen nieuwe adresboek bestanden aanmaken."
 
-#: src/addressbook.c:2395
+#: src/addressbook.c:2396
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -497,89 +497,89 @@ msgstr ""
 "Kon adresboekgegevens niet omzetten.\n"
 "Kon ook geen nieuwe adresboekbestanden aanmaken."
 
-#: src/addressbook.c:2402
+#: src/addressbook.c:2403
 msgid "Addressbook conversion error"
 msgstr "Adresboek omzetprobleem"
 
-#: src/addressbook.c:2406
+#: src/addressbook.c:2407
 msgid "Addressbook conversion"
 msgstr "Adresboek omzetting"
 
-#: src/addressbook.c:2441
+#: src/addressbook.c:2442
 msgid "Addressbook Error"
 msgstr "Adresboekprobleem"
 
-#: src/addressbook.c:2442 src/addressbook.c:2542
+#: src/addressbook.c:2443 src/addressbook.c:2543
 msgid "Could not read address index"
 msgstr "Kon adresboek index niet lezen"
 
-#: src/addressbook.c:2504
+#: src/addressbook.c:2505
 msgid "Old address book converted, could not save new address index file"
 msgstr ""
 "Oude adresboekgegevens omgezet. Kon het nieuwe adresboek indexbestand niet "
 "opslaan."
 
-#: src/addressbook.c:2518
+#: src/addressbook.c:2519
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr "Kon adresboekgegevens niet omzetten. Nieuw leeg adresboek is gemaakt."
 
-#: src/addressbook.c:2524
+#: src/addressbook.c:2525
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr ""
 "Kon adresboekgegevens niet omzetten. Kon geen nieuwe adresboek bestanden "
 "aanmaken."
 
-#: src/addressbook.c:2530
+#: src/addressbook.c:2531
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr ""
 "Kon adresboekgegevens niet omzetten. Kon ook geen nieuwe adresboek bestanden "
 "aanmaken."
 
-#: src/addressbook.c:2548
+#: src/addressbook.c:2549
 msgid "Addressbook Conversion Error"
 msgstr "Adresboek omzetprobleem"
 
-#: src/addressbook.c:2554
+#: src/addressbook.c:2555
 msgid "Addressbook Conversion"
 msgstr "Adresboek Omzetting"
 
-#: src/addressbook.c:3055 src/prefs_common.c:963
+#: src/addressbook.c:3056 src/prefs_common.c:963
 msgid "Interface"
 msgstr "Interface"
 
-#: src/addressbook.c:3071 src/importldif.c:514
+#: src/addressbook.c:3072 src/importldif.c:514
 msgid "Address Book"
 msgstr "Adresboek"
 
-#: src/addressbook.c:3087
+#: src/addressbook.c:3088
 msgid "Person"
 msgstr "Persoon"
 
-#: src/addressbook.c:3103
+#: src/addressbook.c:3104
 msgid "EMail Address"
 msgstr "E-mail adres"
 
-#: src/addressbook.c:3119
+#: src/addressbook.c:3120
 msgid "Group"
 msgstr "Groep"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3135 src/folderview.c:346 src/prefs_account.c:1866
+#: src/addressbook.c:3136 src/folderview.c:346 src/prefs_account.c:1866
 msgid "Folder"
 msgstr "Accounts"
 
-#: src/addressbook.c:3151
+#: src/addressbook.c:3152
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3167 src/addressbook.c:3183
+#: src/addressbook.c:3168 src/addressbook.c:3184
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3199
+#: src/addressbook.c:3200
 msgid "LDAP Server"
 msgstr "LDAP Server"
 
@@ -591,7 +591,7 @@ msgstr "Algemene adressen"
 msgid "Personal address"
 msgstr "Persoonlijke adressen"
 
-#: src/alertpanel.c:138 src/compose.c:5214 src/main.c:515
+#: src/alertpanel.c:138 src/compose.c:5208 src/main.c:515
 msgid "Notice"
 msgstr "Bericht"
 
@@ -646,381 +646,381 @@ msgstr "Bruin"
 msgid "None"
 msgstr "Geen"
 
-#: src/compose.c:487
+#: src/compose.c:485
 msgid "/_Add..."
 msgstr "/_Toevoegen..."
 
-#: src/compose.c:488
+#: src/compose.c:486
 msgid "/_Remove"
 msgstr "/_Verwijderen"
 
-#: src/compose.c:490 src/folderview.c:243 src/folderview.c:262
+#: src/compose.c:488 src/folderview.c:243 src/folderview.c:262
 #: src/folderview.c:277
 msgid "/_Properties..."
 msgstr "/_Eigenschappen..."
 
-#: src/compose.c:496
+#: src/compose.c:494
 #, fuzzy
 msgid "/_File/_Send"
 msgstr "/_Bestand/_Opslaan"
 
-#: src/compose.c:498
+#: src/compose.c:496
 #, fuzzy
 msgid "/_File/Send _later"
 msgstr "/Be_richt/_Later verzenden"
 
-#: src/compose.c:501
+#: src/compose.c:499
 #, fuzzy
 msgid "/_File/Save to _draft folder"
 msgstr "/Be_richt/Klad opslaan"
 
-#: src/compose.c:503
+#: src/compose.c:501
 #, fuzzy
 msgid "/_File/Save and _keep editing"
 msgstr "/Be_richt/Opslaan en blijven bewer_ken"
 
-#: src/compose.c:506
+#: src/compose.c:504
 msgid "/_File/_Attach file"
 msgstr "/_Bestand/_Bijlage toevoegen"
 
-#: src/compose.c:507
+#: src/compose.c:505
 msgid "/_File/_Insert file"
 msgstr "/_Bestand/Bijlage _invoegen"
 
-#: src/compose.c:508
+#: src/compose.c:506
 msgid "/_File/Insert si_gnature"
 msgstr "/_Bestand/_Handtekening Invoegen"
 
-#: src/compose.c:513
+#: src/compose.c:511
 msgid "/_Edit/_Undo"
 msgstr "/B_ewerken/_Ongedaan maken"
 
-#: src/compose.c:514
+#: src/compose.c:512
 msgid "/_Edit/_Redo"
 msgstr "/B_ewerken/O_pnieuw toepassen"
 
-#: src/compose.c:515 src/compose.c:522 src/mainwindow.c:506
+#: src/compose.c:513 src/compose.c:520 src/mainwindow.c:497
 #: src/messageview.c:146
 msgid "/_Edit/---"
 msgstr "/B_ewerken/---"
 
-#: src/compose.c:516
+#: src/compose.c:514
 msgid "/_Edit/Cu_t"
 msgstr "/B_ewerken/Knippen"
 
-#: src/compose.c:517 src/mainwindow.c:503 src/messageview.c:144
+#: src/compose.c:515 src/mainwindow.c:494 src/messageview.c:144
 msgid "/_Edit/_Copy"
 msgstr "/B_ewerken/_Kopiëren"
 
-#: src/compose.c:518
+#: src/compose.c:516
 msgid "/_Edit/_Paste"
 msgstr "/B_ewerken/_Plakken"
 
-#: src/compose.c:519
+#: src/compose.c:517
 msgid "/_Edit/Paste as _quotation"
 msgstr "/B_ewerken/Plakken als _citaat"
 
-#: src/compose.c:521 src/mainwindow.c:504 src/messageview.c:145
+#: src/compose.c:519 src/mainwindow.c:495 src/messageview.c:145
 msgid "/_Edit/Select _all"
 msgstr "/B_ewerken/_Alles selecteren"
 
-#: src/compose.c:523
+#: src/compose.c:521
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/Be_werken/Regelterugloop in deze paragraaf"
 
-#: src/compose.c:525
+#: src/compose.c:523
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/B_ewerken/Regelterugloop in hele bericht"
 
-#: src/compose.c:527
+#: src/compose.c:525
 #, fuzzy
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/B_ewerken/_Kopiëren"
 
-#: src/compose.c:528 src/mainwindow.c:511 src/messageview.c:150
+#: src/compose.c:526 src/mainwindow.c:502 src/messageview.c:150
 #: src/summaryview.c:400
 msgid "/_View"
 msgstr "/B_eeld"
 
-#: src/compose.c:529
+#: src/compose.c:527
 msgid "/_View/_To"
 msgstr "/B_eeld/_Aan"
 
-#: src/compose.c:530
+#: src/compose.c:528
 msgid "/_View/_Cc"
 msgstr "/B_eeld/_Cc"
 
-#: src/compose.c:531
+#: src/compose.c:529
 msgid "/_View/_Bcc"
 msgstr "/B_eeld/_Bcc"
 
-#: src/compose.c:532
+#: src/compose.c:530
 msgid "/_View/_Reply to"
 msgstr "/B_eeld/Ant_woord naar"
 
-#: src/compose.c:533 src/compose.c:535 src/compose.c:537 src/compose.c:539
-#: src/mainwindow.c:529 src/mainwindow.c:532 src/mainwindow.c:558
-#: src/mainwindow.c:582 src/mainwindow.c:675 src/mainwindow.c:679
+#: src/compose.c:531 src/compose.c:533 src/compose.c:535 src/compose.c:537
+#: src/mainwindow.c:520 src/mainwindow.c:523 src/mainwindow.c:549
+#: src/mainwindow.c:573 src/mainwindow.c:666 src/mainwindow.c:670
 #: src/messageview.c:233
 msgid "/_View/---"
 msgstr "/B_eeld/---"
 
-#: src/compose.c:534
+#: src/compose.c:532
 msgid "/_View/_Followup to"
 msgstr "/Be_richt/_Vervolg op"
 
-#: src/compose.c:536
+#: src/compose.c:534
 msgid "/_View/R_uler"
 msgstr "/B_eeld/_Lineaal"
 
-#: src/compose.c:538
+#: src/compose.c:536
 msgid "/_View/_Attachment"
 msgstr "/B_eeld/_Bijvoeging"
 
-#: src/compose.c:545 src/mainwindow.c:589 src/messageview.c:157
+#: src/compose.c:543 src/mainwindow.c:580 src/messageview.c:157
 #, fuzzy
 msgid "/_View/Character _encoding"
 msgstr "/B_eeld/_Sorteren/Aflopend"
 
-#: src/compose.c:546
+#: src/compose.c:544
 msgid "/_View/Character _encoding/_Automatic"
 msgstr ""
 
-#: src/compose.c:548 src/compose.c:554 src/compose.c:560 src/compose.c:564
-#: src/compose.c:570 src/compose.c:574 src/compose.c:580 src/compose.c:584
-#: src/compose.c:594 src/compose.c:598 src/compose.c:608 src/compose.c:612
-#: src/mainwindow.c:585 src/mainwindow.c:592 src/messageview.c:153
+#: src/compose.c:546 src/compose.c:552 src/compose.c:558 src/compose.c:562
+#: src/compose.c:568 src/compose.c:572 src/compose.c:578 src/compose.c:582
+#: src/compose.c:592 src/compose.c:596 src/compose.c:606 src/compose.c:610
+#: src/mainwindow.c:576 src/mainwindow.c:583 src/messageview.c:153
 #, fuzzy
 msgid "/_View/Character _encoding/---"
 msgstr "/B_eeld/_Sorteren/Aflopend"
 
-#: src/compose.c:550 src/mainwindow.c:593 src/messageview.c:161
+#: src/compose.c:548 src/mainwindow.c:584 src/messageview.c:161
 #, fuzzy
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/B_eeld/Codering/7bit ascii (US-ASC_II)"
 
-#: src/compose.c:552 src/mainwindow.c:595 src/messageview.c:164
+#: src/compose.c:550 src/mainwindow.c:586 src/messageview.c:164
 #, fuzzy
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/B_eeld/Codering/Unicode (_UTF-8)"
 
-#: src/compose.c:556 src/mainwindow.c:599 src/messageview.c:167
+#: src/compose.c:554 src/mainwindow.c:590 src/messageview.c:167
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/B_eeld/Codering/Westeuropees (ISO-8859-_1)"
 
-#: src/compose.c:558 src/mainwindow.c:601 src/messageview.c:169
+#: src/compose.c:556 src/mainwindow.c:592 src/messageview.c:169
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/B_eeld/_Codering/Westeuropees (ISO-8859-_1)"
 
-#: src/compose.c:562 src/mainwindow.c:605 src/messageview.c:172
+#: src/compose.c:560 src/mainwindow.c:596 src/messageview.c:172
 #, fuzzy
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/B_eeld/_Codering/Centraaleuropees (ISO-8859-_2)"
 
-#: src/compose.c:566 src/mainwindow.c:609 src/messageview.c:175
+#: src/compose.c:564 src/mainwindow.c:600 src/messageview.c:175
 #, fuzzy
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/B_eeld/_Codering/Baltisch (ISO-8859-13)"
 
-#: src/compose.c:568 src/mainwindow.c:611 src/messageview.c:177
+#: src/compose.c:566 src/mainwindow.c:602 src/messageview.c:177
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/B_eeld/_Codering/Baltisch (ISO-8859-_4)"
 
-#: src/compose.c:572 src/mainwindow.c:615 src/messageview.c:180
+#: src/compose.c:570 src/mainwindow.c:606 src/messageview.c:180
 #, fuzzy
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/B_eeld/_Codering/Grieks (ISO-8859-_7)"
 
-#: src/compose.c:576 src/mainwindow.c:619 src/messageview.c:183
+#: src/compose.c:574 src/mainwindow.c:610 src/messageview.c:183
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/B_eeld/_Codering/Grieks (ISO-8859-_7)"
 
-#: src/compose.c:578 src/mainwindow.c:621 src/messageview.c:185
+#: src/compose.c:576 src/mainwindow.c:612 src/messageview.c:185
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/B_eeld/_Codering/Cyrillisch (Windows-1251)"
 
-#: src/compose.c:582 src/mainwindow.c:625 src/messageview.c:188
+#: src/compose.c:580 src/mainwindow.c:616 src/messageview.c:188
 #, fuzzy
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/B_eeld/_Codering/Turks (ISO-8859-_9)"
 
-#: src/compose.c:586 src/mainwindow.c:629 src/messageview.c:191
+#: src/compose.c:584 src/mainwindow.c:620 src/messageview.c:191
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/B_eeld/_Codering/Cyrillisch (ISO-8859-_5)"
 
-#: src/compose.c:588 src/mainwindow.c:631 src/messageview.c:193
+#: src/compose.c:586 src/mainwindow.c:622 src/messageview.c:193
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/B_eeld/_Codering/Cyrillisch (KOI8-_R)"
 
-#: src/compose.c:590 src/mainwindow.c:633 src/messageview.c:195
+#: src/compose.c:588 src/mainwindow.c:624 src/messageview.c:195
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/B_eeld/_Codering/Cyrillisch (KOI8-_R)"
 
-#: src/compose.c:592 src/mainwindow.c:635 src/messageview.c:197
+#: src/compose.c:590 src/mainwindow.c:626 src/messageview.c:197
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/B_eeld/_Codering/Cyrillisch (Windows-1251)"
 
-#: src/compose.c:596 src/mainwindow.c:639 src/messageview.c:200
+#: src/compose.c:594 src/mainwindow.c:630 src/messageview.c:200
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/B_eeld/_Codering/Japans (ISO-2022-_JP)"
 
-#: src/compose.c:600 src/mainwindow.c:649 src/messageview.c:209
+#: src/compose.c:598 src/mainwindow.c:640 src/messageview.c:209
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/B_eeld/_Codering/Simpel Chinees (_GB2312)"
 
-#: src/compose.c:602 src/mainwindow.c:651 src/messageview.c:211
+#: src/compose.c:600 src/mainwindow.c:642 src/messageview.c:211
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/B_eeld/_Codering/Simpel Chinees (_GB2312)"
 
-#: src/compose.c:604 src/mainwindow.c:653 src/messageview.c:213
+#: src/compose.c:602 src/mainwindow.c:644 src/messageview.c:213
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/B_eeld/_Codering/Traditioneel Chinees (_Big5)"
 
-#: src/compose.c:606 src/mainwindow.c:655 src/messageview.c:215
+#: src/compose.c:604 src/mainwindow.c:646 src/messageview.c:215
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/B_eeld/_Codering/Traditioneel Chinees (EUC-_TW)"
 
-#: src/compose.c:610 src/mainwindow.c:661 src/messageview.c:220
+#: src/compose.c:608 src/mainwindow.c:652 src/messageview.c:220
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/B_eeld/_Codering/Koreaans (EUC-_KR)"
 
-#: src/compose.c:614 src/mainwindow.c:667 src/messageview.c:225
+#: src/compose.c:612 src/mainwindow.c:658 src/messageview.c:225
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/B_eeld/_Codering/Thais (TIS-620)"
 
-#: src/compose.c:616 src/mainwindow.c:669 src/messageview.c:227
+#: src/compose.c:614 src/mainwindow.c:660 src/messageview.c:227
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/B_eeld/_Codering/Thais (Windows-874)"
 
-#: src/compose.c:620 src/mainwindow.c:726 src/messageview.c:257
+#: src/compose.c:618 src/mainwindow.c:717 src/messageview.c:257
 msgid "/_Tools/_Address book"
 msgstr "/_Gereedschap/_Adresboek"
 
-#: src/compose.c:621
+#: src/compose.c:619
 msgid "/_Tools/_Template"
 msgstr "/_Gereedschap/_Sjabloon"
 
-#: src/compose.c:622 src/mainwindow.c:749 src/messageview.c:272
+#: src/compose.c:620 src/mainwindow.c:740 src/messageview.c:272
 msgid "/_Tools/Actio_ns"
 msgstr "/_Gereedschap/A_cties"
 
-#: src/compose.c:623 src/compose.c:627 src/mainwindow.c:729
-#: src/mainwindow.c:743 src/mainwindow.c:748 src/mainwindow.c:750
-#: src/mainwindow.c:753 src/mainwindow.c:755 src/messageview.c:260
+#: src/compose.c:621 src/compose.c:625 src/mainwindow.c:720
+#: src/mainwindow.c:734 src/mainwindow.c:739 src/mainwindow.c:741
+#: src/mainwindow.c:744 src/mainwindow.c:746 src/messageview.c:260
 #: src/messageview.c:271
 msgid "/_Tools/---"
 msgstr "/_Gereedschap/---"
 
-#: src/compose.c:624
+#: src/compose.c:622
 #, fuzzy
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/B_ewerken/Be_werken met externe editor"
 
-#: src/compose.c:628
+#: src/compose.c:626
 #, fuzzy
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Gereedschap/A_cties"
 
-#: src/compose.c:629
+#: src/compose.c:627
 #, fuzzy
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/Be_richt/Codeer"
 
-#: src/compose.c:855
+#: src/compose.c:853
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: bestand bestaat niet\n"
 
-#: src/compose.c:954 src/compose.c:1024 src/procmsg.c:1353
+#: src/compose.c:952 src/compose.c:1022 src/procmsg.c:1353
 msgid "Can't get text part\n"
 msgstr "Kan tekstgedeelte niet ophalen\n"
 
-#: src/compose.c:1420
+#: src/compose.c:1418
 msgid "Quote mark format error."
 msgstr "Citeerteken opmaakfout."
 
-#: src/compose.c:1432
+#: src/compose.c:1430
 msgid "Message reply/forward format error."
 msgstr "Bericht beantwoorden/doorsturen opmaakfout."
 
-#: src/compose.c:1801
+#: src/compose.c:1799
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Bestand %s bestaat niet\n"
 
-#: src/compose.c:1805
+#: src/compose.c:1803
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Kan de bestandsgrootte niet bepalen van %s\n"
 
-#: src/compose.c:1809
+#: src/compose.c:1807
 #, c-format
 msgid "File %s is empty."
 msgstr "Bestand %s is leeg"
 
-#: src/compose.c:1813
+#: src/compose.c:1811
 #, c-format
 msgid "Can't read %s."
 msgstr "Kan %s niet inlezen."
 
-#: src/compose.c:1848
+#: src/compose.c:1846
 #, c-format
 msgid "Message: %s"
 msgstr "Bericht: %s"
 
-#: src/compose.c:1920 src/mimeview.c:560
+#: src/compose.c:1918 src/mimeview.c:560
 msgid "Can't get the part of multipart message."
 msgstr "Ik kan het deel van een meerdelig bericht niet ophalen."
 
-#: src/compose.c:2362
+#: src/compose.c:2360
 msgid " [Edited]"
 msgstr " [Aangepast]"
 
-#: src/compose.c:2364
+#: src/compose.c:2362
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - bericht opstellen%s"
 
-#: src/compose.c:2367
+#: src/compose.c:2365
 #, c-format
 msgid "Compose message%s"
 msgstr "Bericht opstellen%s"
 
-#: src/compose.c:2478
+#: src/compose.c:2476
 msgid "Recipient is not specified."
 msgstr "Ontvanger is niet gespecificeerd."
 
-#: src/compose.c:2486
+#: src/compose.c:2484
 #, fuzzy
 msgid "Empty subject"
 msgstr "Onderwerp"
 
-#: src/compose.c:2487
+#: src/compose.c:2485
 msgid "Subject is empty. Send it anyway?"
 msgstr "U heeft geen onderwerp ingevuld. Toch versturen?"
 
-#: src/compose.c:2538
+#: src/compose.c:2536
 msgid "can't get recipient list."
 msgstr "Kan geen ontvangerlijst opvragen."
 
-#: src/compose.c:2558
+#: src/compose.c:2556
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1028,26 +1028,26 @@ msgstr ""
 "Account voor het verzenden van email is niet gespecificeerd.\n"
 "Selecteer een account voordat u verzend."
 
-#: src/compose.c:2572 src/send_message.c:297
+#: src/compose.c:2570 src/send_message.c:297
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Er is een fout opgetreden bij het versturen van het bericht naar %s."
 
-#: src/compose.c:2595
+#: src/compose.c:2593
 msgid "Can't save the message to outbox."
 msgstr "Het bericht kan niet opgeslagen worden in de outbox."
 
-#: src/compose.c:2645
+#: src/compose.c:2643
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "Kon gee bijpassende sleutel vinden voor geselecteerde sleutel-id `%s'."
 
-#: src/compose.c:2709 src/compose.c:2965 src/compose.c:3028 src/compose.c:3148
-#: src/utils.c:2365
+#: src/compose.c:2707 src/compose.c:2963 src/compose.c:3026 src/compose.c:3146
+#: src/utils.c:2379
 msgid "can't change file mode\n"
 msgstr "kan de bestandmodus niet veranderen\n"
 
-#: src/compose.c:2741
+#: src/compose.c:2739
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1058,12 +1058,12 @@ msgstr ""
 "%s naar %s.\n"
 "Toch versturen?"
 
-#: src/compose.c:2747
+#: src/compose.c:2745
 #, fuzzy
 msgid "Code conversion error"
 msgstr "Adresboek omzetprobleem"
 
-#: src/compose.c:2816
+#: src/compose.c:2814
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1072,155 +1072,155 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:2820
+#: src/compose.c:2818
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3108
+#: src/compose.c:3106
 msgid "can't remove the old message\n"
 msgstr "kan het oude bericht niet verwijderen\n"
 
-#: src/compose.c:3126
+#: src/compose.c:3124
 msgid "queueing message...\n"
 msgstr "bericht wordt in de wachtrij geplaatst...\n"
 
-#: src/compose.c:3208
+#: src/compose.c:3206
 msgid "can't find queue folder\n"
 msgstr "kan de Wachtrij-map niet vinden\n"
 
-#: src/compose.c:3215
+#: src/compose.c:3213
 msgid "can't queue the message\n"
 msgstr "kan het bericht niet in de wachtrij plaatsen\n"
 
-#: src/compose.c:3792
+#: src/compose.c:3790
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "gegenereerd bericht-ID: %s\n"
 
-#: src/compose.c:3901
+#: src/compose.c:3899
 msgid "Creating compose window...\n"
 msgstr "Venster \"Bericht opstellen\" wordt aangemaakt...\n"
 
-#: src/compose.c:3949 src/headerview.c:54 src/summary_search.c:214
+#: src/compose.c:3947 src/headerview.c:54 src/summary_search.c:214
 msgid "From:"
 msgstr "Afzender:"
 
-#: src/compose.c:4021
+#: src/compose.c:4019
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/_Gereedschap/A_cties"
 
-#: src/compose.c:4024
+#: src/compose.c:4022
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/Be_richt/Codeer"
 
-#: src/compose.c:4062 src/compose.c:5001
+#: src/compose.c:4060 src/compose.c:4995
 msgid "MIME type"
 msgstr "MIME type"
 
 #. S_COL_DATE
-#: src/compose.c:4071 src/mimeview.c:192 src/prefs_filter_edit.c:585
+#: src/compose.c:4069 src/mimeview.c:192 src/prefs_filter_edit.c:585
 #: src/prefs_summary_column.c:75 src/select-keys.c:317 src/summaryview.c:4217
 msgid "Size"
 msgstr "Grootte"
 
-#: src/compose.c:4449 src/mainwindow.c:2224 src/prefs_account.c:719
+#: src/compose.c:4442 src/mainwindow.c:2207 src/prefs_account.c:719
 #: src/prefs_common.c:947
 msgid "Send"
 msgstr "Verzenden"
 
-#: src/compose.c:4450
+#: src/compose.c:4443
 msgid "Send message"
 msgstr "Verzend bericht"
 
-#: src/compose.c:4458
+#: src/compose.c:4451
 msgid "Send later"
 msgstr "Wachtrij"
 
-#: src/compose.c:4459
+#: src/compose.c:4452
 msgid "Put into queue folder and send later"
 msgstr "In de wachtrij plaatsen en later verzenden"
 
-#: src/compose.c:4467
+#: src/compose.c:4460
 msgid "Draft"
 msgstr "Klad"
 
-#: src/compose.c:4468
+#: src/compose.c:4461
 msgid "Save to draft folder"
 msgstr "Opslaan als klad"
 
-#: src/compose.c:4478
+#: src/compose.c:4471
 msgid "Insert"
 msgstr "Invoegen"
 
-#: src/compose.c:4479
+#: src/compose.c:4472
 msgid "Insert file"
 msgstr "Bestand invoegen"
 
-#: src/compose.c:4487
+#: src/compose.c:4480
 msgid "Attach"
 msgstr "Bijvoegen"
 
-#: src/compose.c:4488
+#: src/compose.c:4481
 msgid "Attach file"
 msgstr "Bestand bijvoegen"
 
 #. signature
-#: src/compose.c:4498 src/prefs_account.c:1391 src/prefs_common.c:1356
+#: src/compose.c:4491 src/prefs_account.c:1391 src/prefs_common.c:1356
 msgid "Signature"
 msgstr "Tekenen"
 
-#: src/compose.c:4499
+#: src/compose.c:4492
 msgid "Insert signature"
 msgstr "Handtekening (signature) invoegen"
 
-#: src/compose.c:4508 src/prefs_common.c:1378 src/prefs_common.c:2382
+#: src/compose.c:4501 src/prefs_common.c:1378 src/prefs_common.c:2382
 msgid "Editor"
 msgstr "Editor"
 
-#: src/compose.c:4509
+#: src/compose.c:4502
 msgid "Edit with external editor"
 msgstr "Bewerken met ander (extern) programma"
 
-#: src/compose.c:4517
+#: src/compose.c:4510
 msgid "Linewrap"
 msgstr "Terugloop"
 
-#: src/compose.c:4518
+#: src/compose.c:4511
 msgid "Wrap all long lines"
 msgstr "Lange regels op meerdere regels zetten"
 
-#: src/compose.c:4897
+#: src/compose.c:4891
 msgid "Invalid MIME type."
 msgstr "Ongeldig MIME type."
 
-#: src/compose.c:4915
+#: src/compose.c:4909
 msgid "File doesn't exist or is empty."
 msgstr "Bestand bestaat niet of is leeg."
 
-#: src/compose.c:4983
+#: src/compose.c:4977
 msgid "Properties"
 msgstr "Eigenschappen"
 
-#: src/compose.c:5003
+#: src/compose.c:4997
 msgid "Encoding"
 msgstr "Codering"
 
-#: src/compose.c:5026 src/prefs_folder_item.c:183
+#: src/compose.c:5020 src/prefs_folder_item.c:183
 msgid "Path"
 msgstr "Pad"
 
-#: src/compose.c:5027
+#: src/compose.c:5021
 msgid "File name"
 msgstr "Bestandsnaam"
 
-#: src/compose.c:5185
+#: src/compose.c:5179
 #, 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:5211
+#: src/compose.c:5205
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1231,75 +1231,75 @@ msgstr ""
 "Zal ik het programma afbreken?\n"
 "procesgroep id: %d"
 
-#: src/compose.c:5228
+#: src/compose.c:5222
 #, c-format
 msgid "Terminated process group id: %d"
 msgstr "Programma (id: %d) afgebroken."
 
-#: src/compose.c:5229
+#: src/compose.c:5223
 #, c-format
 msgid "Temporary file: %s"
 msgstr "Tijdelijk bestand: %s"
 
-#: src/compose.c:5253
+#: src/compose.c:5247
 msgid "Compose: input from monitoring process\n"
 msgstr "Opstellen: invoer van \"monitoring process\"\n"
 
 #. failed
-#: src/compose.c:5284
+#: src/compose.c:5278
 msgid "Couldn't exec external editor\n"
 msgstr "Kon het externe programma voor bewerken van e-mail niet aanroepen\n"
 
-#: src/compose.c:5288
+#: src/compose.c:5282
 msgid "Couldn't write to file\n"
 msgstr "Kon niet naar bestand schrijven\n"
 
-#: src/compose.c:5290
+#: src/compose.c:5284
 msgid "Pipe read failed\n"
 msgstr "Inlezen van pijp mislukt\n"
 
-#: src/compose.c:5596 src/compose.c:5604 src/compose.c:5610
+#: src/compose.c:5590 src/compose.c:5598 src/compose.c:5604
 msgid "Can't queue the message."
 msgstr "Kan bericht niet in de wachtrij plaatsen."
 
-#: src/compose.c:5701
+#: src/compose.c:5695
 #, fuzzy
 msgid "Select files"
 msgstr "Selecteer bestand"
 
-#: src/compose.c:5723
+#: src/compose.c:5717
 msgid "Select file"
 msgstr "Selecteer bestand"
 
-#: src/compose.c:5760
+#: src/compose.c:5754
 #, fuzzy
 msgid "Save message"
 msgstr "Verzend bericht"
 
-#: src/compose.c:5761
+#: src/compose.c:5755
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Dit bericht is aangepast. weggooien?"
 
-#: src/compose.c:5763
+#: src/compose.c:5757
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:5805
+#: src/compose.c:5799
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Wilt u het sjabloon '%s' toepassen?"
 
-#: src/compose.c:5807
+#: src/compose.c:5801
 msgid "Apply template"
 msgstr "Sjabloon toepassen"
 
-#: src/compose.c:5808
+#: src/compose.c:5802
 #, fuzzy
 msgid "_Replace"
 msgstr "Vervangen"
 
-#: src/compose.c:5808
+#: src/compose.c:5802
 #, fuzzy
 msgid "_Insert"
 msgstr "Invoegen"
@@ -1748,12 +1748,12 @@ msgstr "Mapinfo wordt ingesteld...\n"
 msgid "Setting folder info..."
 msgstr "Mapinfo wordt ingesteld..."
 
-#: src/folderview.c:805 src/mainwindow.c:3301 src/setup.c:81
+#: src/folderview.c:805 src/mainwindow.c:3272 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Bezig met inlezen van map %s%c%s ..."
 
-#: src/folderview.c:809 src/mainwindow.c:3306 src/setup.c:86
+#: src/folderview.c:809 src/mainwindow.c:3277 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Bezig met inlezen van map %s ..."
@@ -2082,45 +2082,45 @@ msgstr "Identificatiemethode"
 msgid "IMAP4 login failed.\n"
 msgstr "IMAP4 login mislukt.\n"
 
-#: src/imap.c:3522
+#: src/imap.c:3528
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "kan %s niet toevoegen aan %s\n"
 
-#: src/imap.c:3529
+#: src/imap.c:3535
 msgid "(sending file...)"
 msgstr "(bestand wordt verzonden...)"
 
-#: src/imap.c:3557
+#: src/imap.c:3563
 #, fuzzy, c-format
 msgid "can't append message to %s\n"
 msgstr "kan bericht %s niet toevoegen\n"
 
-#: src/imap.c:3589
+#: src/imap.c:3595
 #, fuzzy, c-format
 msgid "can't copy %s to %s\n"
 msgstr "kan %d niet naar %s kopiëren\n"
 
-#: src/imap.c:3613
+#: src/imap.c:3619
 #, fuzzy, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "Fout tijdens IMAP opdracht: STORE %d:%d %s\n"
 
-#: src/imap.c:3627
+#: src/imap.c:3633
 msgid "error while imap command: EXPUNGE\n"
 msgstr "Fout tijdens IMAP opdracht: EXPUNGE\n"
 
-#: src/imap.c:3640
+#: src/imap.c:3646
 #, fuzzy
 msgid "error while imap command: CLOSE\n"
 msgstr "Fout tijdens IMAP opdracht: EXPUNGE\n"
 
-#: src/imap.c:3873
+#: src/imap.c:3879
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv kan UTF-7 niet naar %s omzetten\n"
 
-#: src/imap.c:3903
+#: src/imap.c:3909
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv kan %s niet naar UTF-7 omzetten\n"
@@ -2223,7 +2223,7 @@ msgstr "Importeer LDIF bestand in het adresboek"
 msgid "Prev"
 msgstr "Vorig"
 
-#: src/importldif.c:768 src/mainwindow.c:2321
+#: src/importldif.c:768 src/mainwindow.c:2303
 msgid "Next"
 msgstr "Volgende"
 
@@ -2565,646 +2565,646 @@ msgid ""
 "Do you want to migrate it?"
 msgstr ""
 
-#: src/mainwindow.c:471
+#: src/mainwindow.c:462
 msgid "/_File/_Folder"
 msgstr "/_Bestand/_Map"
 
-#: src/mainwindow.c:472
+#: src/mainwindow.c:463
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/_Bestand/_Map/Nieuwe map aanmaken..."
 
-#: src/mainwindow.c:474
+#: src/mainwindow.c:465
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/_Bestand/_Map/Map _hernoemen..."
 
-#: src/mainwindow.c:475
+#: src/mainwindow.c:466
 #, fuzzy
 msgid "/_File/_Folder/_Move folder..."
 msgstr "/_Bestand/_Map/Map _hernoemen..."
 
-#: src/mainwindow.c:476
+#: src/mainwindow.c:467
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/_Bestand/_Map/Map ver_wijderen"
 
-#: src/mainwindow.c:477
+#: src/mainwindow.c:468
 #, fuzzy
 msgid "/_File/_Mailbox"
 msgstr "/_Bestand/Mailbox toevoegen..."
 
-#: src/mainwindow.c:478
+#: src/mainwindow.c:469
 #, fuzzy
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/_Bestand/Mailbox toevoegen..."
 
-#: src/mainwindow.c:479
+#: src/mainwindow.c:470
 #, fuzzy
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/_Mailbox verwijderen"
 
-#: src/mainwindow.c:480 src/mainwindow.c:485
+#: src/mainwindow.c:471 src/mainwindow.c:476
 #, fuzzy
 msgid "/_File/_Mailbox/---"
 msgstr "/_Bestand/_Map"
 
-#: src/mainwindow.c:481
+#: src/mainwindow.c:472
 #, fuzzy
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "/Nieuwe e-mail _ophalen"
 
-#: src/mainwindow.c:483
+#: src/mainwindow.c:474
 #, fuzzy
 msgid "/_File/_Mailbox/Check for new messages in _all mailboxes"
 msgstr "/_Bestand/Nieuwe e-mail _ophalen"
 
-#: src/mainwindow.c:486
+#: src/mainwindow.c:477
 #, fuzzy
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "/Accountlijst _verversen"
 
-#: src/mainwindow.c:489
+#: src/mainwindow.c:480
 msgid "/_File/_Import mbox file..."
 msgstr "/_Bestand/Mbox bestand importeren..."
 
-#: src/mainwindow.c:490
+#: src/mainwindow.c:481
 msgid "/_File/_Export to mbox file..."
 msgstr "/_Bestand/Mbox bestand _exporteren..."
 
-#: src/mainwindow.c:492
+#: src/mainwindow.c:483
 #, fuzzy
 msgid "/_File/Empty all _trash"
 msgstr "/_Bestand/Prullenbak _leegmaken"
 
-#: src/mainwindow.c:494 src/messageview.c:138
+#: src/mainwindow.c:485 src/messageview.c:138
 msgid "/_File/_Save as..."
 msgstr "/_Bestand/Opslaan _als..."
 
-#: src/mainwindow.c:495 src/messageview.c:139
+#: src/mainwindow.c:486 src/messageview.c:139
 msgid "/_File/_Print..."
 msgstr "/_Bestand/Af_drukken..."
 
-#: src/mainwindow.c:497
+#: src/mainwindow.c:488
 #, fuzzy
 msgid "/_File/_Work offline"
 msgstr "/_Bestand/Bijlage _invoegen"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:500
+#: src/mainwindow.c:491
 msgid "/_File/E_xit"
 msgstr "/_Bestand/A_fsluiten"
 
-#: src/mainwindow.c:505
+#: src/mainwindow.c:496
 msgid "/_Edit/Select _thread"
 msgstr "/B_ewerken/_Discussie selecteren"
 
-#: src/mainwindow.c:507 src/messageview.c:147
+#: src/mainwindow.c:498 src/messageview.c:147
 msgid "/_Edit/_Find in current message..."
 msgstr "/Be_werken/_Huidig bericht doorzoeken..."
 
-#: src/mainwindow.c:509
+#: src/mainwindow.c:500
 msgid "/_Edit/_Search messages..."
 msgstr "/Be_werken/Berichten door_zoeken..."
 
-#: src/mainwindow.c:512
+#: src/mainwindow.c:503
 msgid "/_View/Show or hi_de"
 msgstr "/B_eeld/_Tonen of Verbergen"
 
-#: src/mainwindow.c:513
+#: src/mainwindow.c:504
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/B_eeld/_Tonen of Verbergen/_Accountlijst"
 
-#: src/mainwindow.c:515
+#: src/mainwindow.c:506
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/B_eeld/_Tonen of Verbergen/_Bericht"
 
-#: src/mainwindow.c:517
+#: src/mainwindow.c:508
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/B_eeld/_Tonen of Verbergen/_Werkbalk"
 
-#: src/mainwindow.c:519
+#: src/mainwindow.c:510
 msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/B_eeld/_Tonen of Verbergen/_Werkbalk/Afbeelding _en tekst"
 
-#: src/mainwindow.c:521
+#: src/mainwindow.c:512
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/B_eeld/_Tonen of Verbergen/_Werkbalk/_Afbeelding"
 
-#: src/mainwindow.c:523
+#: src/mainwindow.c:514
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/B_eeld/_Tonen of Verbergen/_Werkbalk/_Tekst"
 
-#: src/mainwindow.c:525
+#: src/mainwindow.c:516
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/B_eeld/_Tonen of Verbergen/_Werkbalk/_Niet weergeven"
 
-#: src/mainwindow.c:527
+#: src/mainwindow.c:518
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/B_eeld/_Tonen of Verbergen/Status_balk"
 
-#: src/mainwindow.c:530
+#: src/mainwindow.c:521
 msgid "/_View/Separate f_older tree"
 msgstr "/B_eeld/Acc_ountlijst los"
 
-#: src/mainwindow.c:531
+#: src/mainwindow.c:522
 #, fuzzy
 msgid "/_View/Separate _message view"
 msgstr "/B_eeld/_Bericht los"
 
-#: src/mainwindow.c:533
+#: src/mainwindow.c:524
 msgid "/_View/_Sort"
 msgstr "/B_eeld/_Sorteren"
 
-#: src/mainwindow.c:534
+#: src/mainwindow.c:525
 msgid "/_View/_Sort/by _number"
 msgstr "/B_eeld/_Sorteren/Op _nummer"
 
-#: src/mainwindow.c:535
+#: src/mainwindow.c:526
 msgid "/_View/_Sort/by s_ize"
 msgstr "/B_eeld/_Sorteren/Op _grootte"
 
-#: src/mainwindow.c:536
+#: src/mainwindow.c:527
 msgid "/_View/_Sort/by _date"
 msgstr "/B_eeld/_Sorteren/Op _datum"
 
-#: src/mainwindow.c:537
+#: src/mainwindow.c:528
 msgid "/_View/_Sort/by _from"
 msgstr "/B_eeld/_Sorteren/Op _afzender"
 
-#: src/mainwindow.c:538
+#: src/mainwindow.c:529
 msgid "/_View/_Sort/by _recipient"
 msgstr "/B_eeld/_Sorteren/Op _ontvanger"
 
-#: src/mainwindow.c:539
+#: src/mainwindow.c:530
 msgid "/_View/_Sort/by _subject"
 msgstr "/B_eeld/_Sorteren/Op _onderwerp"
 
-#: src/mainwindow.c:540
+#: src/mainwindow.c:531
 msgid "/_View/_Sort/by _color label"
 msgstr "/B_eeld/_Sorteren/Op _kleurlabel"
 
-#: src/mainwindow.c:542
+#: src/mainwindow.c:533
 msgid "/_View/_Sort/by _mark"
 msgstr "/B_eeld/_Sorteren/Op _markering"
 
-#: src/mainwindow.c:543
+#: src/mainwindow.c:534
 msgid "/_View/_Sort/by _unread"
 msgstr "/B_eeld/_Sorteren/Op on_gelezen"
 
-#: src/mainwindow.c:544
+#: src/mainwindow.c:535
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/B_eeld/_Sorteren/Op _bijvoeging"
 
-#: src/mainwindow.c:546
+#: src/mainwindow.c:537
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/B_eeld/_Sorteren/_Ongesorteerd"
 
-#: src/mainwindow.c:547 src/mainwindow.c:550
+#: src/mainwindow.c:538 src/mainwindow.c:541
 msgid "/_View/_Sort/---"
 msgstr "/B_eeld/_Sorteren/---"
 
-#: src/mainwindow.c:548
+#: src/mainwindow.c:539
 msgid "/_View/_Sort/Ascending"
 msgstr "/B_eeld/_Sorteren/Oplopend"
 
-#: src/mainwindow.c:549
+#: src/mainwindow.c:540
 msgid "/_View/_Sort/Descending"
 msgstr "/B_eeld/_Sorteren/Aflopend"
 
-#: src/mainwindow.c:551
+#: src/mainwindow.c:542
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/B_eeld/_Sorteren/Aantrekken op onderwerp"
 
-#: src/mainwindow.c:553
+#: src/mainwindow.c:544
 msgid "/_View/Th_read view"
 msgstr "/B_eeld/Ge_nest"
 
-#: src/mainwindow.c:554
+#: src/mainwindow.c:545
 msgid "/_View/E_xpand all threads"
 msgstr "/B_eeld/Discussies _uitklappen"
 
-#: src/mainwindow.c:555
+#: src/mainwindow.c:546
 msgid "/_View/Co_llapse all threads"
 msgstr "/B_eeld/Discussies _inklappen"
 
-#: src/mainwindow.c:556
+#: src/mainwindow.c:547
 msgid "/_View/Set display _item..."
 msgstr "/B_eeld/Beeld_item instellen..."
 
-#: src/mainwindow.c:559
+#: src/mainwindow.c:550
 msgid "/_View/_Go to"
 msgstr "/B_eeld/_Ga naar"
 
-#: src/mainwindow.c:560
+#: src/mainwindow.c:551
 msgid "/_View/_Go to/_Prev message"
 msgstr "/B_eeld/_Ga naar/_Vorige bericht"
 
-#: src/mainwindow.c:561
+#: src/mainwindow.c:552
 msgid "/_View/_Go to/_Next message"
 msgstr "/B_eeld/_Ga naar/Vo_lgende bericht"
 
-#: src/mainwindow.c:562 src/mainwindow.c:567 src/mainwindow.c:570
-#: src/mainwindow.c:575 src/mainwindow.c:580
+#: src/mainwindow.c:553 src/mainwindow.c:558 src/mainwindow.c:561
+#: src/mainwindow.c:566 src/mainwindow.c:571
 msgid "/_View/_Go to/---"
 msgstr "/B_eeld/_Ga naar/---"
 
-#: src/mainwindow.c:563
+#: src/mainwindow.c:554
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/B_eeld/_Ga naar/Vo_rige ongelezen bericht"
 
-#: src/mainwindow.c:565
+#: src/mainwindow.c:556
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/B_eeld/_Ga naar/Volgende on_gelezen bericht"
 
-#: src/mainwindow.c:568
+#: src/mainwindow.c:559
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/B_eeld/_Ga naar/_Vorige nieuwe bericht"
 
-#: src/mainwindow.c:569
+#: src/mainwindow.c:560
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/B_eeld/_Ga naar/Vo_lgende nieuwe bericht"
 
-#: src/mainwindow.c:571
+#: src/mainwindow.c:562
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/B_eeld/_Ga naar/Vorige ge_markeerd bericht"
 
-#: src/mainwindow.c:573
+#: src/mainwindow.c:564
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/B_eeld/_Ga naar/Volgende gem_arkeerd bericht"
 
-#: src/mainwindow.c:576
+#: src/mainwindow.c:567
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/B_eeld/_Ga naar/Vorige gela_beld bericht"
 
-#: src/mainwindow.c:578
+#: src/mainwindow.c:569
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/B_eeld/_Ga naar/Volgende gelab_eld bericht"
 
-#: src/mainwindow.c:581
+#: src/mainwindow.c:572
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/B_eeld/_Ga naar/Andere _map..."
 
-#: src/mainwindow.c:590 src/messageview.c:158
+#: src/mainwindow.c:581 src/messageview.c:158
 #, fuzzy
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/B_eeld/Codering/Automatisch"
 
-#: src/mainwindow.c:641 src/messageview.c:202
+#: src/mainwindow.c:632 src/messageview.c:202
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/B_eeld/_Codering/Japans (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:643 src/messageview.c:204
+#: src/mainwindow.c:634 src/messageview.c:204
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/B_eeld/_Codering/Japans (_EUC-JP)"
 
-#: src/mainwindow.c:645 src/messageview.c:206
+#: src/mainwindow.c:636 src/messageview.c:206
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/B_eeld/_Codering/Japans (_Shift__JIS)"
 
-#: src/mainwindow.c:657 src/messageview.c:217
+#: src/mainwindow.c:648 src/messageview.c:217
 #, fuzzy
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/B_eeld/_Codering/Chinees (ISO-2022-_CN)"
 
-#: src/mainwindow.c:663 src/messageview.c:222
+#: src/mainwindow.c:654 src/messageview.c:222
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/B_eeld/_Codering/Koreaans (ISO-2022-KR)"
 
-#: src/mainwindow.c:676 src/summaryview.c:401
+#: src/mainwindow.c:667 src/summaryview.c:401
 msgid "/_View/Open in new _window"
 msgstr "/B_eeld/Open in _nieuw venster"
 
-#: src/mainwindow.c:677 src/messageview.c:234
+#: src/mainwindow.c:668 src/messageview.c:234
 msgid "/_View/Mess_age source"
 msgstr "/B_eeld/Bekijk _broncode"
 
-#: src/mainwindow.c:678 src/messageview.c:235
+#: src/mainwindow.c:669 src/messageview.c:235
 msgid "/_View/Show all _header"
 msgstr "/B_eeld/Vo_lledige header"
 
-#: src/mainwindow.c:680
+#: src/mainwindow.c:671
 msgid "/_View/_Update summary"
 msgstr "/B_eeld/_Verversen"
 
-#: src/mainwindow.c:682 src/messageview.c:237
+#: src/mainwindow.c:673 src/messageview.c:237
 msgid "/_Message"
 msgstr "/Be_richt"
 
-#: src/mainwindow.c:683
+#: src/mainwindow.c:674
 #, fuzzy
 msgid "/_Message/Recei_ve"
 msgstr "/Be_richt/Bewerken"
 
-#: src/mainwindow.c:684
+#: src/mainwindow.c:675
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/Be_richt/_Alle e-mail ophalen"
 
-#: src/mainwindow.c:686
+#: src/mainwindow.c:677
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/Be_richt/_Alle e-mail ophalen"
 
-#: src/mainwindow.c:688
+#: src/mainwindow.c:679
 #, fuzzy
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/Be_richt/Ontvangen af_breken"
 
-#: src/mainwindow.c:690
+#: src/mainwindow.c:681
 #, fuzzy
 msgid "/_Message/Recei_ve/---"
 msgstr "/Be_richt/Bewerken"
 
-#: src/mainwindow.c:691
+#: src/mainwindow.c:682
 msgid "/_Message/_Send queued messages"
 msgstr "/Be_richt/Berichten uit wachtrij verzenden"
 
-#: src/mainwindow.c:692 src/mainwindow.c:694 src/mainwindow.c:701
-#: src/mainwindow.c:706 src/mainwindow.c:710 src/mainwindow.c:719
-#: src/mainwindow.c:722 src/messageview.c:240 src/messageview.c:248
+#: src/mainwindow.c:683 src/mainwindow.c:685 src/mainwindow.c:692
+#: src/mainwindow.c:697 src/mainwindow.c:701 src/mainwindow.c:710
+#: src/mainwindow.c:713 src/messageview.c:240 src/messageview.c:248
 #: src/messageview.c:253
 msgid "/_Message/---"
 msgstr "/Be_richt/---"
 
-#: src/mainwindow.c:693 src/messageview.c:238
+#: src/mainwindow.c:684 src/messageview.c:238
 msgid "/_Message/Compose _new message"
 msgstr "/Be_richt/_Nieuw bericht opstellen"
 
-#: src/mainwindow.c:695 src/messageview.c:241
+#: src/mainwindow.c:686 src/messageview.c:241
 msgid "/_Message/_Reply"
 msgstr "/Be_richt/_Beantwoorden"
 
-#: src/mainwindow.c:696
+#: src/mainwindow.c:687
 msgid "/_Message/Repl_y to"
 msgstr "/Be_richt/Antwoord _sturen aan"
 
-#: src/mainwindow.c:697 src/messageview.c:242
+#: src/mainwindow.c:688 src/messageview.c:242
 msgid "/_Message/Repl_y to/_all"
 msgstr "/Be_richt/Antwoord _sturen aan/_iedereen"
 
-#: src/mainwindow.c:698 src/messageview.c:244
+#: src/mainwindow.c:689 src/messageview.c:244
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/Be_richt/Antwoord _sturen aan/_afzender"
 
-#: src/mainwindow.c:699 src/messageview.c:246
+#: src/mainwindow.c:690 src/messageview.c:246
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/Be_richt/Antwoord _sturen aan/_mailinglijst"
 
-#: src/mainwindow.c:702 src/messageview.c:249
+#: src/mainwindow.c:693 src/messageview.c:249
 msgid "/_Message/_Forward"
 msgstr "/Be_richt/_Doorsturen"
 
-#: src/mainwindow.c:703 src/messageview.c:250
+#: src/mainwindow.c:694 src/messageview.c:250
 msgid "/_Message/For_ward as attachment"
 msgstr "/Be_richt/Doorsturen als bij_voeging"
 
-#: src/mainwindow.c:705 src/messageview.c:252
+#: src/mainwindow.c:696 src/messageview.c:252
 msgid "/_Message/Redirec_t"
 msgstr "/Be_richt/Om_leiden"
 
-#: src/mainwindow.c:707
+#: src/mainwindow.c:698
 msgid "/_Message/M_ove..."
 msgstr "/Be_richt/_Verplaatsen..."
 
-#: src/mainwindow.c:708
+#: src/mainwindow.c:699
 msgid "/_Message/_Copy..."
 msgstr "/Be_richt/_Kopiëren..."
 
-#: src/mainwindow.c:709
+#: src/mainwindow.c:700
 msgid "/_Message/_Delete"
 msgstr "/Be_richt/Ver_wijderen"
 
-#: src/mainwindow.c:711
+#: src/mainwindow.c:702
 msgid "/_Message/_Mark"
 msgstr "/Be_richt/_Markeren"
 
-#: src/mainwindow.c:712
+#: src/mainwindow.c:703
 msgid "/_Message/_Mark/_Mark"
 msgstr "/Be_richt/_Markeren/_Markeren"
 
-#: src/mainwindow.c:713
+#: src/mainwindow.c:704
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/Be_richt/_Markeren/_Demarkeren"
 
-#: src/mainwindow.c:714
+#: src/mainwindow.c:705
 msgid "/_Message/_Mark/---"
 msgstr "/Be_richt/_Markeren/---"
 
-#: src/mainwindow.c:715
+#: src/mainwindow.c:706
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/Be_richt/_Markeren/Als _ongelezen"
 
-#: src/mainwindow.c:716
+#: src/mainwindow.c:707
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/Be_richt/_Markeren/Als _gelezen"
 
-#: src/mainwindow.c:718
+#: src/mainwindow.c:709
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/Be_richt/_Markeren/_Alles gelezen"
 
-#: src/mainwindow.c:720
+#: src/mainwindow.c:711
 #, fuzzy
 msgid "/_Message/Set as _junk mail"
 msgstr "/Be_richt/E-mail _ophalen"
 
-#: src/mainwindow.c:721
+#: src/mainwindow.c:712
 #, fuzzy
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/Be_richt/E-mail _ophalen"
 
-#: src/mainwindow.c:723 src/messageview.c:254
+#: src/mainwindow.c:714 src/messageview.c:254
 msgid "/_Message/Re-_edit"
 msgstr "/Be_richt/Bewerken"
 
-#: src/mainwindow.c:727
+#: src/mainwindow.c:718
 #, fuzzy
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/_Gereedschap/Af_zender toevoegen aan adresboek"
 
-#: src/mainwindow.c:730
+#: src/mainwindow.c:721
 #, fuzzy
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/_Gereedschap/Berichten _filteren"
 
-#: src/mainwindow.c:732
+#: src/mainwindow.c:723
 #, fuzzy
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Gereedschap/Berichten _filteren"
 
-#: src/mainwindow.c:734 src/messageview.c:261
+#: src/mainwindow.c:725 src/messageview.c:261
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Gereedschap/Filterregel _aanmaken"
 
-#: src/mainwindow.c:735 src/messageview.c:263
+#: src/mainwindow.c:726 src/messageview.c:263
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Gereedschap/_Creëer Filterregel/_Automatisch"
 
-#: src/mainwindow.c:737 src/messageview.c:265
+#: src/mainwindow.c:728 src/messageview.c:265
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Gereedschap/_Creëer filterregel/voor A_fzender"
 
-#: src/mainwindow.c:739 src/messageview.c:267
+#: src/mainwindow.c:730 src/messageview.c:267
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Gereedschap/_Creëer filterregel/voor _Geadresseerde"
 
-#: src/mainwindow.c:741 src/messageview.c:269
+#: src/mainwindow.c:732 src/messageview.c:269
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Gereedschap/_Creëer filterregel/voor _Onderwerp"
 
-#: src/mainwindow.c:744
+#: src/mainwindow.c:735
 #, fuzzy
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/_Gereedschap/Berichten _filteren"
 
-#: src/mainwindow.c:746
+#: src/mainwindow.c:737
 #, fuzzy
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/_Gereedschap/Berichten _filteren"
 
-#: src/mainwindow.c:751
+#: src/mainwindow.c:742
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/_Gereedschap/Du_bbele berichten verwijderen"
 
-#: src/mainwindow.c:754
+#: src/mainwindow.c:745
 msgid "/_Tools/E_xecute"
 msgstr "/_Gereedschap/_Uitvoeren"
 
-#: src/mainwindow.c:756
+#: src/mainwindow.c:747
 msgid "/_Tools/_Log window"
 msgstr "/_Gereedschap/_Logboek"
 
-#: src/mainwindow.c:758
+#: src/mainwindow.c:749
 msgid "/_Configuration"
 msgstr "/_Instellingen"
 
-#: src/mainwindow.c:759
+#: src/mainwindow.c:750
 msgid "/_Configuration/_Common preferences..."
 msgstr "/_Instellingen/Algemene voorkeuren..."
 
-#: src/mainwindow.c:761
+#: src/mainwindow.c:752
 msgid "/_Configuration/_Filter setting..."
 msgstr "/_Instellingen/_Filterbeheer..."
 
-#: src/mainwindow.c:763
+#: src/mainwindow.c:754
 msgid "/_Configuration/_Template..."
 msgstr "/_Instellingen/_Sjabloonbeheer..."
 
-#: src/mainwindow.c:764
+#: src/mainwindow.c:755
 msgid "/_Configuration/_Actions..."
 msgstr "/_Instellingen/A_cties..."
 
-#: src/mainwindow.c:765
+#: src/mainwindow.c:756
 msgid "/_Configuration/---"
 msgstr "/_Instellingen/---"
 
-#: src/mainwindow.c:766
+#: src/mainwindow.c:757
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Instellingen/Accountvoorkeuren..."
 
-#: src/mainwindow.c:768
+#: src/mainwindow.c:759
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Instellingen/Nieuw account aanmaken..."
 
-#: src/mainwindow.c:770
+#: src/mainwindow.c:761
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Instellingen/Accountbeheer..."
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:763
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Instellingen/Huidig account veranderen"
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:767
 msgid "/_Help/_Manual"
 msgstr "/_Hulp/_Handboek"
 
-#: src/mainwindow.c:777
+#: src/mainwindow.c:768
 msgid "/_Help/_Manual/_English"
 msgstr "/_Hulp/_Handboek/_Engels"
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:769
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/_Hulp/_Handboek/_Japans"
 
-#: src/mainwindow.c:779
+#: src/mainwindow.c:770
 msgid "/_Help/_FAQ"
 msgstr "/_Hulp/_FAQ"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:771
 msgid "/_Help/_FAQ/_English"
 msgstr "/_Hulp/_FAQ/_Engels"
 
-#: src/mainwindow.c:781
+#: src/mainwindow.c:772
 msgid "/_Help/_FAQ/_German"
 msgstr "/_Hulp/_FAQ/_Duits"
 
-#: src/mainwindow.c:782
+#: src/mainwindow.c:773
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/_Hulp/_FAQ/_Spaans"
 
-#: src/mainwindow.c:783
+#: src/mainwindow.c:774
 msgid "/_Help/_FAQ/_French"
 msgstr "/_Hulp/_FAQ/_Frans"
 
-#: src/mainwindow.c:784
+#: src/mainwindow.c:775
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/_Hulp/_FAQ/_Italiaans"
 
-#: src/mainwindow.c:785
+#: src/mainwindow.c:776
 msgid "/_Help/---"
 msgstr "/_Hulp/---"
 
-#: src/mainwindow.c:825
+#: src/mainwindow.c:816
 msgid "Creating main window...\n"
 msgstr "Hoofdvenster wordt aangemaakt...\n"
 
-#: src/mainwindow.c:987
+#: src/mainwindow.c:973
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "HoofdVenster: kleur %d kon niet gealloceerd worden\n"
 
-#: src/mainwindow.c:1071 src/summaryview.c:2020 src/summaryview.c:2105
+#: src/mainwindow.c:1057 src/summaryview.c:2020 src/summaryview.c:2105
 #: src/summaryview.c:3342 src/summaryview.c:3415 src/summaryview.c:3728
 msgid "done.\n"
 msgstr "klaar.\n"
 
-#: src/mainwindow.c:1196 src/mainwindow.c:1237 src/mainwindow.c:1265
+#: src/mainwindow.c:1182 src/mainwindow.c:1223 src/mainwindow.c:1251
 msgid "Untitled"
 msgstr "Geen titel"
 
-#: src/mainwindow.c:1266
+#: src/mainwindow.c:1252
 msgid "none"
 msgstr "niets"
 
-#: src/mainwindow.c:1316
+#: src/mainwindow.c:1302
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "Vensterscheidingstype wordt gewijzigd van %d naar %d\n"
 
-#: src/mainwindow.c:1536
+#: src/mainwindow.c:1522
 msgid "Offline"
 msgstr ""
 
-#: src/mainwindow.c:1537
+#: src/mainwindow.c:1523
 msgid "You are offline. Go online?"
 msgstr ""
 
-#: src/mainwindow.c:1551
+#: src/mainwindow.c:1537
 #, fuzzy
 msgid "Empty all trash"
 msgstr "Prullenbak leegmaken"
 
-#: src/mainwindow.c:1552
+#: src/mainwindow.c:1538
 #, fuzzy
 msgid "Empty messages in all trash?"
 msgstr "Alle berichten uit de prullenbak weggooien?"
 
-#: src/mainwindow.c:1580
+#: src/mainwindow.c:1566
 msgid "Add mailbox"
 msgstr "Mailbox toevoegen"
 
-#: src/mainwindow.c:1581
+#: src/mainwindow.c:1567
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3214,16 +3214,16 @@ msgstr ""
 "Als een bestaande mailbox wordt ingevuld,\n"
 "dan wordt hij automatisch gescand."
 
-#: src/mainwindow.c:1587
+#: src/mainwindow.c:1573
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "De mailbox '%s' bestaat al."
 
-#: src/mainwindow.c:1592 src/setup.c:57
+#: src/mainwindow.c:1578 src/setup.c:57
 msgid "Mailbox"
 msgstr "Mailbox"
 
-#: src/mainwindow.c:1598 src/setup.c:63
+#: src/mainwindow.c:1584 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3233,153 +3233,153 @@ msgstr ""
 "Misschien bestaan er al wat bestanden, of heb je geen toestemming om er te "
 "schrijven."
 
-#: src/mainwindow.c:1989
+#: src/mainwindow.c:1975
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Mappenoverzicht"
 
-#: src/mainwindow.c:2009 src/messageview.c:368
+#: src/mainwindow.c:1995 src/messageview.c:368
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Berichtenoverzicht"
 
-#: src/mainwindow.c:2156 src/summaryview.c:370
+#: src/mainwindow.c:2142 src/summaryview.c:370
 msgid "/_Reply"
 msgstr "/_Antwoord"
 
-#: src/mainwindow.c:2157
+#: src/mainwindow.c:2143
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "Bericht naar iedereen terugsturen."
 
-#: src/mainwindow.c:2158
+#: src/mainwindow.c:2144
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/Ant_woord sturen aan/_afzender"
 
-#: src/mainwindow.c:2159
+#: src/mainwindow.c:2145
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/Ant_woord sturen aan/_mailinglijst"
 
-#: src/mainwindow.c:2164 src/summaryview.c:377
+#: src/mainwindow.c:2150 src/summaryview.c:377
 msgid "/_Forward"
 msgstr "/D_oorsturen"
 
-#: src/mainwindow.c:2165 src/summaryview.c:378
+#: src/mainwindow.c:2151 src/summaryview.c:378
 msgid "/For_ward as attachment"
 msgstr "/Doorsturen als _bijvoeging"
 
-#: src/mainwindow.c:2166 src/summaryview.c:379
+#: src/mainwindow.c:2152 src/summaryview.c:379
 msgid "/Redirec_t"
 msgstr "/_Omleiden"
 
-#: src/mainwindow.c:2205
+#: src/mainwindow.c:2188
 msgid "Get"
 msgstr "Ophalen"
 
-#: src/mainwindow.c:2206
+#: src/mainwindow.c:2189
 msgid "Incorporate new mail"
 msgstr "E-mail ophalen en in de lijst zetten."
 
-#: src/mainwindow.c:2213
+#: src/mainwindow.c:2196
 msgid "Get all"
 msgstr "Alles oph."
 
-#: src/mainwindow.c:2214
+#: src/mainwindow.c:2197
 msgid "Incorporate new mail of all accounts"
 msgstr "E-mail van alle accounts ophalen en in de lijsten zetten"
 
-#: src/mainwindow.c:2225
+#: src/mainwindow.c:2208
 msgid "Send queued message(s)"
 msgstr "Verzend berichten uit de wachtrij"
 
-#: src/mainwindow.c:2235 src/prefs_account.c:721 src/prefs_common.c:949
+#: src/mainwindow.c:2218 src/prefs_account.c:721 src/prefs_common.c:949
 #: src/prefs_folder_item.c:137
 msgid "Compose"
 msgstr "Opstellen"
 
-#: src/mainwindow.c:2236
+#: src/mainwindow.c:2219
 msgid "Compose new message"
 msgstr "Nieuw bericht opstellen"
 
-#: src/mainwindow.c:2244 src/prefs_common.c:1448
+#: src/mainwindow.c:2227 src/prefs_common.c:1448
 msgid "Reply"
 msgstr "Antwoord"
 
-#: src/mainwindow.c:2245 src/mainwindow.c:2258
+#: src/mainwindow.c:2228 src/mainwindow.c:2241
 msgid "Reply to the message"
 msgstr "Stuur een bericht terug naar de afzender"
 
-#: src/mainwindow.c:2263
+#: src/mainwindow.c:2245
 msgid "Reply all"
 msgstr "Iedereen"
 
-#: src/mainwindow.c:2264
+#: src/mainwindow.c:2246
 msgid "Reply to all"
 msgstr "Bericht naar iedereen terugsturen."
 
-#: src/mainwindow.c:2272 src/prefs_filter_edit.c:741
+#: src/mainwindow.c:2254 src/prefs_filter_edit.c:741
 msgid "Forward"
 msgstr "Doorsturen"
 
-#: src/mainwindow.c:2273 src/mainwindow.c:2286
+#: src/mainwindow.c:2255 src/mainwindow.c:2268
 msgid "Forward the message"
 msgstr "Stuur dit bericht door"
 
-#: src/mainwindow.c:2293
+#: src/mainwindow.c:2275
 msgid "Delete the message"
 msgstr "Verwijder dit bericht"
 
-#: src/mainwindow.c:2301 src/prefs_common.c:1988
+#: src/mainwindow.c:2283 src/prefs_common.c:1988
 msgid "Junk"
 msgstr ""
 
-#: src/mainwindow.c:2302
+#: src/mainwindow.c:2284
 #, fuzzy
 msgid "Set as junk mail"
 msgstr "Instellen als standaard"
 
-#: src/mainwindow.c:2311
+#: src/mainwindow.c:2293
 msgid "Execute"
 msgstr "Uitvoeren"
 
-#: src/mainwindow.c:2312
+#: src/mainwindow.c:2294
 msgid "Execute marked process"
 msgstr "Voer de gemarkeerde acties uit"
 
-#: src/mainwindow.c:2322
+#: src/mainwindow.c:2304
 msgid "Next unread message"
 msgstr "Volgende ongelezen"
 
-#: src/mainwindow.c:2334
+#: src/mainwindow.c:2316
 msgid "Prefs"
 msgstr "Voork."
 
-#: src/mainwindow.c:2335
+#: src/mainwindow.c:2317
 msgid "Common preferences"
 msgstr "Algemene voorkeuren"
 
-#: src/mainwindow.c:2343 src/prefs_folder_item.c:261
+#: src/mainwindow.c:2325 src/prefs_folder_item.c:261
 #: src/prefs_folder_item.c:272 src/progressdialog.c:128
 msgid "Account"
 msgstr "Account"
 
-#: src/mainwindow.c:2344
+#: src/mainwindow.c:2326
 msgid "Account setting"
 msgstr "Accountinstellingen"
 
-#: src/mainwindow.c:2527
+#: src/mainwindow.c:2498
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 
-#: src/mainwindow.c:2538
+#: src/mainwindow.c:2509
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 
-#: src/mainwindow.c:2731
+#: src/mainwindow.c:2702
 msgid "Exit"
 msgstr "Afsluiten"
 
-#: src/mainwindow.c:2731
+#: src/mainwindow.c:2702
 msgid "Exit this program?"
 msgstr "Sylpheed afsluiten?"
 
@@ -5631,11 +5631,11 @@ msgstr "Voortgangsdialoogvenster wordt gemaakt...\n"
 msgid "Status"
 msgstr "Status"
 
-#: src/recv.c:113
+#: src/recv.c:112
 msgid "error occurred while retrieving data.\n"
 msgstr "er is een fout opgetreden bij het ontvangen van de gegevens.\n"
 
-#: src/recv.c:155 src/recv.c:197 src/recv.c:213
+#: src/recv.c:154 src/recv.c:196 src/recv.c:211
 msgid "Can't write to file.\n"
 msgstr "Het bestand is niet beschrijfbaar.\n"
 
@@ -6373,7 +6373,7 @@ msgstr "%.2fMB"
 msgid "%.2fGB"
 msgstr "%.2fGB"
 
-#: src/utils.c:2372 src/utils.c:2496
+#: src/utils.c:2386 src/utils.c:2510
 #, c-format
 msgid "writing to %s failed.\n"
 msgstr "schrijven naar %s is mislukt.\n"
diff --git a/po/pl.po b/po/pl.po
index 3d4a9e82..5448e75e 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: 2005-08-09 18:08+0900\n"
+"POT-Creation-Date: 2005-08-22 17:22+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"
@@ -95,7 +95,7 @@ msgstr ""
 "w kolumnie \"G\" konta, które mają być sprawdzone przez 'Odbierz wsz.'"
 
 #: src/account.c:691 src/addressadd.c:192 src/addressbook.c:490
-#: src/compose.c:4081 src/editaddress.c:200 src/editaddress.c:942
+#: src/compose.c:4079 src/editaddress.c:200 src/editaddress.c:942
 #: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:265
 #: src/editjpilot.c:271 src/editldap.c:307 src/editvcard.c:184
 #: src/mimeview.c:201 src/prefs_filter.c:258 src/prefs_folder_item.c:170
@@ -232,7 +232,7 @@ msgstr "Argumenty użytkownika dla akcji"
 msgid "Add Address to Book"
 msgstr "Dodaj do książki adresowej"
 
-#: src/addressadd.c:202 src/compose.c:4528 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4521 src/editaddress.c:201
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "Adres"
@@ -246,7 +246,7 @@ msgstr "Uwagi"
 msgid "Select Address Book Folder"
 msgstr "Wybierz katalog książki adresowej"
 
-#: src/addressbook.c:336 src/compose.c:495 src/mainwindow.c:470
+#: src/addressbook.c:336 src/compose.c:493 src/mainwindow.c:461
 #: src/messageview.c:137
 msgid "/_File"
 msgstr "/_Plik"
@@ -267,10 +267,10 @@ msgstr "/_Plik/Nowy _J-Pilot"
 msgid "/_File/New _Server"
 msgstr "/_Plik/Nowy _Serwer"
 
-#: src/addressbook.c:345 src/addressbook.c:348 src/compose.c:500
-#: src/compose.c:505 src/compose.c:509 src/mainwindow.c:488
-#: src/mainwindow.c:491 src/mainwindow.c:493 src/mainwindow.c:496
-#: src/mainwindow.c:498 src/messageview.c:140
+#: src/addressbook.c:345 src/addressbook.c:348 src/compose.c:498
+#: src/compose.c:503 src/compose.c:507 src/mainwindow.c:479
+#: src/mainwindow.c:482 src/mainwindow.c:484 src/mainwindow.c:487
+#: src/mainwindow.c:489 src/messageview.c:140
 msgid "/_File/---"
 msgstr "/_Plik/---"
 
@@ -286,7 +286,7 @@ msgstr "/_Plik/_Usuń"
 msgid "/_File/_Save"
 msgstr "/_Plik/Zapi_sz"
 
-#: src/addressbook.c:350 src/compose.c:510 src/messageview.c:141
+#: src/addressbook.c:350 src/compose.c:508 src/messageview.c:141
 msgid "/_File/_Close"
 msgstr "/_Plik/_Zamknij"
 
@@ -318,7 +318,7 @@ msgstr "/_Adres/_Edycja"
 msgid "/_Address/_Delete"
 msgstr "/_Adres/_Usuń"
 
-#: src/addressbook.c:358 src/compose.c:619 src/mainwindow.c:725
+#: src/addressbook.c:358 src/compose.c:617 src/mainwindow.c:716
 #: src/messageview.c:256
 msgid "/_Tools"
 msgstr "/_Narzędzia"
@@ -327,12 +327,12 @@ msgstr "/_Narzędzia"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Plik/Importuj plik _LDIF"
 
-#: src/addressbook.c:360 src/compose.c:632 src/mainwindow.c:775
+#: src/addressbook.c:360 src/compose.c:630 src/mainwindow.c:766
 #: src/messageview.c:274
 msgid "/_Help"
 msgstr "/Pomo_c"
 
-#: src/addressbook.c:361 src/compose.c:633 src/mainwindow.c:786
+#: src/addressbook.c:361 src/compose.c:631 src/mainwindow.c:777
 #: src/messageview.c:275
 msgid "/_Help/_About"
 msgstr "/Pomo_c/_O programie"
@@ -349,7 +349,7 @@ msgstr "/Nowa _grupa"
 msgid "/New _Folder"
 msgstr "/Nowy _katalog"
 
-#: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:489
+#: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:487
 #: src/folderview.c:235 src/folderview.c:237 src/folderview.c:241
 #: src/folderview.c:252 src/folderview.c:254 src/folderview.c:256
 #: src/folderview.c:260 src/folderview.c:270 src/folderview.c:272
@@ -359,8 +359,8 @@ msgstr "/Nowy _katalog"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:512
-#: src/mainwindow.c:502 src/messageview.c:143
+#: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:510
+#: src/mainwindow.c:493 src/messageview.c:143
 msgid "/_Edit"
 msgstr "/_Edycja"
 
@@ -372,7 +372,7 @@ msgstr "/_Usuń"
 msgid "E-Mail address"
 msgstr "Adres e-mail"
 
-#: src/addressbook.c:495 src/compose.c:4529 src/prefs_common.c:2402
+#: src/addressbook.c:495 src/compose.c:4522 src/prefs_common.c:2402
 msgid "Address book"
 msgstr "Książka adresowa"
 
@@ -381,8 +381,8 @@ msgid "Name:"
 msgstr "Nazwa:"
 
 #. Buttons
-#: src/addressbook.c:627 src/addressbook.c:1673 src/editaddress.c:884
-#: src/editaddress.c:1017 src/mainwindow.c:2292 src/prefs_actions.c:266
+#: src/addressbook.c:627 src/addressbook.c:1674 src/editaddress.c:884
+#: src/editaddress.c:1017 src/mainwindow.c:2274 src/prefs_actions.c:266
 #: src/prefs_display_header.c:278 src/prefs_display_header.c:333
 #: src/prefs_template.c:231
 msgid "Delete"
@@ -421,7 +421,7 @@ msgstr "Usuń adres(y)"
 msgid "Really delete the address(es)?"
 msgstr "Czy naprawdę chcesz usunąć ten adres(y)?"
 
-#: src/addressbook.c:1664
+#: src/addressbook.c:1665
 #, fuzzy, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -431,38 +431,38 @@ msgstr ""
 "Jeśli usuniesz tylko katalog, adresy zostaną przeniesione do nadrzędnego "
 "katalogu."
 
-#: src/addressbook.c:1667 src/folderview.c:2139
+#: src/addressbook.c:1668 src/folderview.c:2139
 msgid "Delete folder"
 msgstr "Usuń katalog"
 
-#: src/addressbook.c:1667
+#: src/addressbook.c:1668
 #, fuzzy
 msgid "_Folder only"
 msgstr "Tylko katalog"
 
-#: src/addressbook.c:1667
+#: src/addressbook.c:1668
 #, fuzzy
 msgid "Folder and _addresses"
 msgstr "Katalog i adresy"
 
-#: src/addressbook.c:1672
+#: src/addressbook.c:1673
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Czy naprawdę usunąć \"%s\" ?"
 
-#: src/addressbook.c:2352 src/addressbook.c:2485
+#: src/addressbook.c:2353 src/addressbook.c:2486
 msgid "New user, could not save index file."
 msgstr "Nowy użytkownik, nie można było zapisać pliku indeksu."
 
-#: src/addressbook.c:2356 src/addressbook.c:2489
+#: src/addressbook.c:2357 src/addressbook.c:2490
 msgid "New user, could not save address book files."
 msgstr "Nowy użytkownik, nie można było zapisać plików książki adresowej."
 
-#: src/addressbook.c:2366 src/addressbook.c:2499
+#: src/addressbook.c:2367 src/addressbook.c:2500
 msgid "Old address book converted successfully."
 msgstr "Konwersja starej książki adresowej została zakończona pomyślnie."
 
-#: src/addressbook.c:2371
+#: src/addressbook.c:2372
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -470,7 +470,7 @@ msgstr ""
 "Stara książka adresowa została skonwertowana,\n"
 "nie można było zapisać nowego pliku indeksu adresów."
 
-#: src/addressbook.c:2384
+#: src/addressbook.c:2385
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -478,7 +478,7 @@ msgstr ""
 "Nie można było skonwertować książki adresowej,\n"
 "utworzono puste pliki nowej książki adresowej."
 
-#: src/addressbook.c:2390
+#: src/addressbook.c:2391
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -486,7 +486,7 @@ msgstr ""
 "Nie można było skonwertować książki adresowej,\n"
 "nie można było utworzyć nowych plików książki adresowej."
 
-#: src/addressbook.c:2395
+#: src/addressbook.c:2396
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -494,91 +494,91 @@ msgstr ""
 "Nie można było skonwertować książki adresowej\n"
 "oraz utworzyć nowych plików książki adresowej."
 
-#: src/addressbook.c:2402
+#: src/addressbook.c:2403
 msgid "Addressbook conversion error"
 msgstr "Błąd konwersji książki adresowej"
 
-#: src/addressbook.c:2406
+#: src/addressbook.c:2407
 msgid "Addressbook conversion"
 msgstr "Konwersja książki adresowej"
 
-#: src/addressbook.c:2441
+#: src/addressbook.c:2442
 msgid "Addressbook Error"
 msgstr "Błąd książki adresowej"
 
-#: src/addressbook.c:2442 src/addressbook.c:2542
+#: src/addressbook.c:2443 src/addressbook.c:2543
 msgid "Could not read address index"
 msgstr "Nie można odczytać książki adresowej"
 
-#: src/addressbook.c:2504
+#: src/addressbook.c:2505
 msgid "Old address book converted, could not save new address index file"
 msgstr ""
 "Stara książka adresowa została skonwertowana, nie można było zapisać nowego "
 "pliku indeksów adresowych."
 
-#: src/addressbook.c:2518
+#: src/addressbook.c:2519
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr ""
 "Nie można było skonwertować książki adresowej lecz utworzono puste pliki "
 "nowej książki adresowej."
 
-#: src/addressbook.c:2524
+#: src/addressbook.c:2525
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr ""
 "Nie można było skonwertować książki adresowej oraz utworzyć nowych plików "
 "książki adresowej."
 
-#: src/addressbook.c:2530
+#: src/addressbook.c:2531
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr ""
 "Nie można było skonwertować książki adresowej i utworzyć nowych plików "
 "książki adresowej"
 
-#: src/addressbook.c:2548
+#: src/addressbook.c:2549
 msgid "Addressbook Conversion Error"
 msgstr "Błąd konwersji książki adresowej"
 
-#: src/addressbook.c:2554
+#: src/addressbook.c:2555
 msgid "Addressbook Conversion"
 msgstr "Konwersja książki adresowej"
 
-#: src/addressbook.c:3055 src/prefs_common.c:963
+#: src/addressbook.c:3056 src/prefs_common.c:963
 msgid "Interface"
 msgstr "Interfejs"
 
-#: src/addressbook.c:3071 src/importldif.c:514
+#: src/addressbook.c:3072 src/importldif.c:514
 msgid "Address Book"
 msgstr "Książka adresowa"
 
-#: src/addressbook.c:3087
+#: src/addressbook.c:3088
 msgid "Person"
 msgstr "Osoba"
 
-#: src/addressbook.c:3103
+#: src/addressbook.c:3104
 msgid "EMail Address"
 msgstr "Adres e-mail"
 
-#: src/addressbook.c:3119
+#: src/addressbook.c:3120
 msgid "Group"
 msgstr "Grupa"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3135 src/folderview.c:346 src/prefs_account.c:1866
+#: src/addressbook.c:3136 src/folderview.c:346 src/prefs_account.c:1866
 msgid "Folder"
 msgstr "Katalog"
 
-#: src/addressbook.c:3151
+#: src/addressbook.c:3152
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3167 src/addressbook.c:3183
+#: src/addressbook.c:3168 src/addressbook.c:3184
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3199
+#: src/addressbook.c:3200
 msgid "LDAP Server"
 msgstr "Serwer LDAP"
 
@@ -590,7 +590,7 @@ msgstr "Wspólny adres:"
 msgid "Personal address"
 msgstr "Osobisty adres:"
 
-#: src/alertpanel.c:138 src/compose.c:5214 src/main.c:515
+#: src/alertpanel.c:138 src/compose.c:5208 src/main.c:515
 msgid "Notice"
 msgstr "Notatka"
 
@@ -645,348 +645,348 @@ msgstr "Brązowy"
 msgid "None"
 msgstr "Brak"
 
-#: src/compose.c:487
+#: src/compose.c:485
 msgid "/_Add..."
 msgstr "/Dod_aj..."
 
-#: src/compose.c:488
+#: src/compose.c:486
 msgid "/_Remove"
 msgstr "/_Usuń"
 
-#: src/compose.c:490 src/folderview.c:243 src/folderview.c:262
+#: src/compose.c:488 src/folderview.c:243 src/folderview.c:262
 #: src/folderview.c:277
 msgid "/_Properties..."
 msgstr "/_Właściwości..."
 
-#: src/compose.c:496
+#: src/compose.c:494
 msgid "/_File/_Send"
 msgstr "/_Plik/Wyślij"
 
-#: src/compose.c:498
+#: src/compose.c:496
 msgid "/_File/Send _later"
 msgstr "/_Plik/Wyś_lij później"
 
-#: src/compose.c:501
+#: src/compose.c:499
 msgid "/_File/Save to _draft folder"
 msgstr "/_Plik/Zapisz w katalogu _szablonów"
 
-#: src/compose.c:503
+#: src/compose.c:501
 msgid "/_File/Save and _keep editing"
 msgstr "/_Plik/Zapisz i kontynuuj _edycję"
 
-#: src/compose.c:506
+#: src/compose.c:504
 msgid "/_File/_Attach file"
 msgstr "/_Plik/_Dołącz plik"
 
-#: src/compose.c:507
+#: src/compose.c:505
 msgid "/_File/_Insert file"
 msgstr "/_Plik/Wstaw pl_ik"
 
-#: src/compose.c:508
+#: src/compose.c:506
 msgid "/_File/Insert si_gnature"
 msgstr "/_Plik/Wstaw p_odpis"
 
-#: src/compose.c:513
+#: src/compose.c:511
 msgid "/_Edit/_Undo"
 msgstr "/_Edycja/_Cofnij"
 
-#: src/compose.c:514
+#: src/compose.c:512
 msgid "/_Edit/_Redo"
 msgstr "/_Edycja/Po_nów"
 
-#: src/compose.c:515 src/compose.c:522 src/mainwindow.c:506
+#: src/compose.c:513 src/compose.c:520 src/mainwindow.c:497
 #: src/messageview.c:146
 msgid "/_Edit/---"
 msgstr "/_Edycja/---"
 
-#: src/compose.c:516
+#: src/compose.c:514
 msgid "/_Edit/Cu_t"
 msgstr "/_Edycja/Wy_tnij"
 
-#: src/compose.c:517 src/mainwindow.c:503 src/messageview.c:144
+#: src/compose.c:515 src/mainwindow.c:494 src/messageview.c:144
 msgid "/_Edit/_Copy"
 msgstr "/_Edycja/_Kopiuj"
 
-#: src/compose.c:518
+#: src/compose.c:516
 msgid "/_Edit/_Paste"
 msgstr "/_Edycja/_Wstaw"
 
-#: src/compose.c:519
+#: src/compose.c:517
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Edycja/Wstaw jako c_ytat"
 
-#: src/compose.c:521 src/mainwindow.c:504 src/messageview.c:145
+#: src/compose.c:519 src/mainwindow.c:495 src/messageview.c:145
 msgid "/_Edit/Select _all"
 msgstr "/_Edycja/W_ybierz wszystko"
 
-#: src/compose.c:523
+#: src/compose.c:521
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/_Edit/Za_wiń bieżący akapit"
 
-#: src/compose.c:525
+#: src/compose.c:523
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/_Edycja/Zawijaj wszystkie długie _linie"
 
-#: src/compose.c:527
+#: src/compose.c:525
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Edycja/Aut_o-zawijanie"
 
-#: src/compose.c:528 src/mainwindow.c:511 src/messageview.c:150
+#: src/compose.c:526 src/mainwindow.c:502 src/messageview.c:150
 #: src/summaryview.c:400
 msgid "/_View"
 msgstr "/_Widok"
 
-#: src/compose.c:529
+#: src/compose.c:527
 msgid "/_View/_To"
 msgstr "/_Widok/_Do"
 
-#: src/compose.c:530
+#: src/compose.c:528
 msgid "/_View/_Cc"
 msgstr "/_Widok/_Kopia"
 
-#: src/compose.c:531
+#: src/compose.c:529
 msgid "/_View/_Bcc"
 msgstr "/_Widok/_Ukryta kopia"
 
-#: src/compose.c:532
+#: src/compose.c:530
 msgid "/_View/_Reply to"
 msgstr "/_Widok/_Odpowiedz do"
 
-#: src/compose.c:533 src/compose.c:535 src/compose.c:537 src/compose.c:539
-#: src/mainwindow.c:529 src/mainwindow.c:532 src/mainwindow.c:558
-#: src/mainwindow.c:582 src/mainwindow.c:675 src/mainwindow.c:679
+#: src/compose.c:531 src/compose.c:533 src/compose.c:535 src/compose.c:537
+#: src/mainwindow.c:520 src/mainwindow.c:523 src/mainwindow.c:549
+#: src/mainwindow.c:573 src/mainwindow.c:666 src/mainwindow.c:670
 #: src/messageview.c:233
 msgid "/_View/---"
 msgstr "/_Widok/---"
 
-#: src/compose.c:534
+#: src/compose.c:532
 msgid "/_View/_Followup to"
 msgstr "/_Widok/_Przekaż do"
 
-#: src/compose.c:536
+#: src/compose.c:534
 msgid "/_View/R_uler"
 msgstr "/_Widok/_Linijka"
 
-#: src/compose.c:538
+#: src/compose.c:536
 msgid "/_View/_Attachment"
 msgstr "/_Widok/Załączniki"
 
-#: src/compose.c:545 src/mainwindow.c:589 src/messageview.c:157
+#: src/compose.c:543 src/mainwindow.c:580 src/messageview.c:157
 msgid "/_View/Character _encoding"
 msgstr "/_Widok/Kodowani_e znaków"
 
-#: src/compose.c:546
+#: src/compose.c:544
 msgid "/_View/Character _encoding/_Automatic"
 msgstr "/_Widok/Kodowani_e znaków/Automatyczne"
 
-#: src/compose.c:548 src/compose.c:554 src/compose.c:560 src/compose.c:564
-#: src/compose.c:570 src/compose.c:574 src/compose.c:580 src/compose.c:584
-#: src/compose.c:594 src/compose.c:598 src/compose.c:608 src/compose.c:612
-#: src/mainwindow.c:585 src/mainwindow.c:592 src/messageview.c:153
+#: src/compose.c:546 src/compose.c:552 src/compose.c:558 src/compose.c:562
+#: src/compose.c:568 src/compose.c:572 src/compose.c:578 src/compose.c:582
+#: src/compose.c:592 src/compose.c:596 src/compose.c:606 src/compose.c:610
+#: src/mainwindow.c:576 src/mainwindow.c:583 src/messageview.c:153
 msgid "/_View/Character _encoding/---"
 msgstr "/_Widok/Kodowani_e znaków/---"
 
-#: src/compose.c:550 src/mainwindow.c:593 src/messageview.c:161
+#: src/compose.c:548 src/mainwindow.c:584 src/messageview.c:161
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Widok/Kodowani_e znaków/7-bitowe ascii (US-ASC_II)"
 
-#: src/compose.c:552 src/mainwindow.c:595 src/messageview.c:164
+#: src/compose.c:550 src/mainwindow.c:586 src/messageview.c:164
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Widok/Kodowani_e znaków/Unikod (_UTF-8)"
 
-#: src/compose.c:556 src/mainwindow.c:599 src/messageview.c:167
+#: src/compose.c:554 src/mainwindow.c:590 src/messageview.c:167
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Widok/Kodowani_e znaków/Europa Zachodnia (ISO-8859-_1)"
 
-#: src/compose.c:558 src/mainwindow.c:601 src/messageview.c:169
+#: src/compose.c:556 src/mainwindow.c:592 src/messageview.c:169
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Widok/Kodowani_e znaków/Europa Zachodnia (ISO-8859-15)"
 
-#: src/compose.c:562 src/mainwindow.c:605 src/messageview.c:172
+#: src/compose.c:560 src/mainwindow.c:596 src/messageview.c:172
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Widok/Kodowani_e znaków/Europa Środkowa (ISO-8859-_2)"
 
-#: src/compose.c:566 src/mainwindow.c:609 src/messageview.c:175
+#: src/compose.c:564 src/mainwindow.c:600 src/messageview.c:175
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Widok/Kodowani_e znaków/_Bałtyckie (ISO-8859-13)"
 
-#: src/compose.c:568 src/mainwindow.c:611 src/messageview.c:177
+#: src/compose.c:566 src/mainwindow.c:602 src/messageview.c:177
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Widok/Kodowani_e znaków/Bałtyckie (ISO-8859-_4)"
 
-#: src/compose.c:572 src/mainwindow.c:615 src/messageview.c:180
+#: src/compose.c:570 src/mainwindow.c:606 src/messageview.c:180
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Widok/Kodowani_e znaków/Greckie (ISO-8859-_7)"
 
-#: src/compose.c:576 src/mainwindow.c:619 src/messageview.c:183
+#: src/compose.c:574 src/mainwindow.c:610 src/messageview.c:183
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Widok/Kodowani_e znaków/Hebrajskie (ISO-8859-_8)"
 
-#: src/compose.c:578 src/mainwindow.c:621 src/messageview.c:185
+#: src/compose.c:576 src/mainwindow.c:612 src/messageview.c:185
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Widok/Kodowani_e znaków/Hebrajskie (Windows-1251)"
 
-#: src/compose.c:582 src/mainwindow.c:625 src/messageview.c:188
+#: src/compose.c:580 src/mainwindow.c:616 src/messageview.c:188
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Widok/Kodowani_e znaków/Tureckie (ISO-8859-_9)"
 
-#: src/compose.c:586 src/mainwindow.c:629 src/messageview.c:191
+#: src/compose.c:584 src/mainwindow.c:620 src/messageview.c:191
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Widok/Kodowani_e znaków/Cyrylica (ISO-8859-_5)"
 
-#: src/compose.c:588 src/mainwindow.c:631 src/messageview.c:193
+#: src/compose.c:586 src/mainwindow.c:622 src/messageview.c:193
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Widok/Kodowani_e znaków/Cyrylica (KOI8-_R)"
 
-#: src/compose.c:590 src/mainwindow.c:633 src/messageview.c:195
+#: src/compose.c:588 src/mainwindow.c:624 src/messageview.c:195
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Widok/Kodowani_e znaków/Cyrylica (KOI8-U)"
 
-#: src/compose.c:592 src/mainwindow.c:635 src/messageview.c:197
+#: src/compose.c:590 src/mainwindow.c:626 src/messageview.c:197
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Widok/Kodowani_e znaków/Cyrylica (Windows-1251)"
 
-#: src/compose.c:596 src/mainwindow.c:639 src/messageview.c:200
+#: src/compose.c:594 src/mainwindow.c:630 src/messageview.c:200
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Widok/Kodowani_e znaków/Japońskie (ISO-2022-_JP)"
 
-#: src/compose.c:600 src/mainwindow.c:649 src/messageview.c:209
+#: src/compose.c:598 src/mainwindow.c:640 src/messageview.c:209
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Widok/Kodowani_e znaków/Uproszczone Chińskie (_GB2312)"
 
-#: src/compose.c:602 src/mainwindow.c:651 src/messageview.c:211
+#: src/compose.c:600 src/mainwindow.c:642 src/messageview.c:211
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Widok/Kodowani_e znaków/Uproszczone Chińskie (GBK)"
 
-#: src/compose.c:604 src/mainwindow.c:653 src/messageview.c:213
+#: src/compose.c:602 src/mainwindow.c:644 src/messageview.c:213
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Widok/Kodowani_e znaków/Tradycyjne Chińskie (_Big5)"
 
-#: src/compose.c:606 src/mainwindow.c:655 src/messageview.c:215
+#: src/compose.c:604 src/mainwindow.c:646 src/messageview.c:215
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Widok/Kodowani_e znaków/Tradycyjne Chińskie (EUC-_TW)"
 
-#: src/compose.c:610 src/mainwindow.c:661 src/messageview.c:220
+#: src/compose.c:608 src/mainwindow.c:652 src/messageview.c:220
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Widok/Kodowani_e znaków/Koreańskie (EUC-_KR)"
 
-#: src/compose.c:614 src/mainwindow.c:667 src/messageview.c:225
+#: src/compose.c:612 src/mainwindow.c:658 src/messageview.c:225
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Widok/Kodowani_e znaków/Tajskie (TIS-620)"
 
-#: src/compose.c:616 src/mainwindow.c:669 src/messageview.c:227
+#: src/compose.c:614 src/mainwindow.c:660 src/messageview.c:227
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Widok/Kodowani_e znaków/Tajskie (Windows-874)"
 
-#: src/compose.c:620 src/mainwindow.c:726 src/messageview.c:257
+#: src/compose.c:618 src/mainwindow.c:717 src/messageview.c:257
 msgid "/_Tools/_Address book"
 msgstr "/_Narzędzia/_Książka adresowa"
 
-#: src/compose.c:621
+#: src/compose.c:619
 msgid "/_Tools/_Template"
 msgstr "/_Narzędzia/_Szablon"
 
-#: src/compose.c:622 src/mainwindow.c:749 src/messageview.c:272
+#: src/compose.c:620 src/mainwindow.c:740 src/messageview.c:272
 msgid "/_Tools/Actio_ns"
 msgstr "/_Narzędzia/Polecen_ia"
 
-#: src/compose.c:623 src/compose.c:627 src/mainwindow.c:729
-#: src/mainwindow.c:743 src/mainwindow.c:748 src/mainwindow.c:750
-#: src/mainwindow.c:753 src/mainwindow.c:755 src/messageview.c:260
+#: src/compose.c:621 src/compose.c:625 src/mainwindow.c:720
+#: src/mainwindow.c:734 src/mainwindow.c:739 src/mainwindow.c:741
+#: src/mainwindow.c:744 src/mainwindow.c:746 src/messageview.c:260
 #: src/messageview.c:271
 msgid "/_Tools/---"
 msgstr "/_Narzędzia/---"
 
-#: src/compose.c:624
+#: src/compose.c:622
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/_Narzędzia/Edytuj za pomocą z_ewnętrznego edytora"
 
-#: src/compose.c:628
+#: src/compose.c:626
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Narzędzia/Podpis _PGP"
 
-#: src/compose.c:629
+#: src/compose.c:627
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/_Narzędzia/Szyfrowani_e GPG"
 
-#: src/compose.c:855
+#: src/compose.c:853
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: brak pliku\n"
 
-#: src/compose.c:954 src/compose.c:1024 src/procmsg.c:1353
+#: src/compose.c:952 src/compose.c:1022 src/procmsg.c:1353
 msgid "Can't get text part\n"
 msgstr "Nie mogę pobrać części tekstu\n"
 
-#: src/compose.c:1420
+#: src/compose.c:1418
 msgid "Quote mark format error."
 msgstr "Błąd formatu znacznika cytatu."
 
-#: src/compose.c:1432
+#: src/compose.c:1430
 msgid "Message reply/forward format error."
 msgstr "Błąd formatu odpowiedz/przekaż wiadomość."
 
-#: src/compose.c:1801
+#: src/compose.c:1799
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Plik %s nie istnieje\n"
 
-#: src/compose.c:1805
+#: src/compose.c:1803
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Nie można odczytać wielkości pliku %s\n"
 
-#: src/compose.c:1809
+#: src/compose.c:1807
 #, c-format
 msgid "File %s is empty."
 msgstr "Plik %s jest pusty."
 
-#: src/compose.c:1813
+#: src/compose.c:1811
 #, c-format
 msgid "Can't read %s."
 msgstr "Nie można odczytać %s."
 
-#: src/compose.c:1848
+#: src/compose.c:1846
 #, c-format
 msgid "Message: %s"
 msgstr "Wiadomość: %s"
 
-#: src/compose.c:1920 src/mimeview.c:560
+#: src/compose.c:1918 src/mimeview.c:560
 msgid "Can't get the part of multipart message."
 msgstr "Nie można pobrać części wiadomości wieloczęściowej."
 
-#: src/compose.c:2362
+#: src/compose.c:2360
 msgid " [Edited]"
 msgstr " [Edytowany]"
 
-#: src/compose.c:2364
+#: src/compose.c:2362
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Utwórz wiadomość%s"
 
-#: src/compose.c:2367
+#: src/compose.c:2365
 #, c-format
 msgid "Compose message%s"
 msgstr "Utwórz wiadomość%s"
 
-#: src/compose.c:2478
+#: src/compose.c:2476
 msgid "Recipient is not specified."
 msgstr "Nie podano odbiorcy."
 
-#: src/compose.c:2486
+#: src/compose.c:2484
 #, fuzzy
 msgid "Empty subject"
 msgstr "Temat"
 
-#: src/compose.c:2487
+#: src/compose.c:2485
 msgid "Subject is empty. Send it anyway?"
 msgstr "Wiadomość nie posiada tematu. Czy wysłać ją mimo tego ?"
 
-#: src/compose.c:2538
+#: src/compose.c:2536
 msgid "can't get recipient list."
 msgstr "nie można pobrać listy odbiorców."
 
-#: src/compose.c:2558
+#: src/compose.c:2556
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -994,27 +994,27 @@ msgstr ""
 "Nie podano konta pocztowego do wysyłania wiadomości.\n"
 "Należy wybrać konto przed wysłaniem."
 
-#: src/compose.c:2572 src/send_message.c:297
+#: src/compose.c:2570 src/send_message.c:297
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Błąd podczas wysyłania wiadomości do %s."
 
-#: src/compose.c:2595
+#: src/compose.c:2593
 msgid "Can't save the message to outbox."
 msgstr "Nie można zapisać wiadomości do outbox."
 
-#: src/compose.c:2645
+#: src/compose.c:2643
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr ""
 "Nie można znaleźć klucza związanego z wybranym identyfikatorem klucza \"%s\"."
 
-#: src/compose.c:2709 src/compose.c:2965 src/compose.c:3028 src/compose.c:3148
-#: src/utils.c:2365
+#: src/compose.c:2707 src/compose.c:2963 src/compose.c:3026 src/compose.c:3146
+#: src/utils.c:2379
 msgid "can't change file mode\n"
 msgstr "nie można zmienić trybu pliku\n"
 
-#: src/compose.c:2741
+#: src/compose.c:2739
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1024,12 +1024,12 @@ msgstr ""
 "Nie można przekonwertować treści wiadomości z %s na %s.\n"
 "Wysłać wiadomość mimo to %s ?"
 
-#: src/compose.c:2747
+#: src/compose.c:2745
 #, fuzzy
 msgid "Code conversion error"
 msgstr "Błąd konwersji książki adresowej"
 
-#: src/compose.c:2816
+#: src/compose.c:2814
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1038,153 +1038,153 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:2820
+#: src/compose.c:2818
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3108
+#: src/compose.c:3106
 msgid "can't remove the old message\n"
 msgstr "Nie można usunąć starej wiadomości\n"
 
-#: src/compose.c:3126
+#: src/compose.c:3124
 msgid "queueing message...\n"
 msgstr "kolejkowanie wiadomości...\n"
 
-#: src/compose.c:3208
+#: src/compose.c:3206
 msgid "can't find queue folder\n"
 msgstr "nie można znaleźć katalogu kolejki\n"
 
-#: src/compose.c:3215
+#: src/compose.c:3213
 msgid "can't queue the message\n"
 msgstr "nie można zapisać wiadomości do kolejki\n"
 
-#: src/compose.c:3792
+#: src/compose.c:3790
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "wygenerowany Message-ID: %s\n"
 
-#: src/compose.c:3901
+#: src/compose.c:3899
 msgid "Creating compose window...\n"
 msgstr "Tworzenie okna edycji...\n"
 
-#: src/compose.c:3949 src/headerview.c:54 src/summary_search.c:214
+#: src/compose.c:3947 src/headerview.c:54 src/summary_search.c:214
 msgid "From:"
 msgstr "Od:"
 
-#: src/compose.c:4021
+#: src/compose.c:4019
 msgid "PGP Sign"
 msgstr "Podpis PGP"
 
-#: src/compose.c:4024
+#: src/compose.c:4022
 msgid "PGP Encrypt"
 msgstr "Szyfrowanie PGP"
 
-#: src/compose.c:4062 src/compose.c:5001
+#: src/compose.c:4060 src/compose.c:4995
 msgid "MIME type"
 msgstr "typ MIME"
 
 #. S_COL_DATE
-#: src/compose.c:4071 src/mimeview.c:192 src/prefs_filter_edit.c:585
+#: src/compose.c:4069 src/mimeview.c:192 src/prefs_filter_edit.c:585
 #: src/prefs_summary_column.c:75 src/select-keys.c:317 src/summaryview.c:4217
 msgid "Size"
 msgstr "Rozmiar"
 
-#: src/compose.c:4449 src/mainwindow.c:2224 src/prefs_account.c:719
+#: src/compose.c:4442 src/mainwindow.c:2207 src/prefs_account.c:719
 #: src/prefs_common.c:947
 msgid "Send"
 msgstr "Wyślij"
 
-#: src/compose.c:4450
+#: src/compose.c:4443
 msgid "Send message"
 msgstr "Wyślij wiadomość"
 
-#: src/compose.c:4458
+#: src/compose.c:4451
 msgid "Send later"
 msgstr "Wyślij później"
 
-#: src/compose.c:4459
+#: src/compose.c:4452
 msgid "Put into queue folder and send later"
 msgstr "Umieść w katalogu kolejki i wyślij później"
 
-#: src/compose.c:4467
+#: src/compose.c:4460
 msgid "Draft"
 msgstr "Draft"
 
-#: src/compose.c:4468
+#: src/compose.c:4461
 msgid "Save to draft folder"
 msgstr "Zapisz w katalogu szablonów"
 
-#: src/compose.c:4478
+#: src/compose.c:4471
 msgid "Insert"
 msgstr "Wstaw"
 
-#: src/compose.c:4479
+#: src/compose.c:4472
 msgid "Insert file"
 msgstr "Wstaw plik"
 
-#: src/compose.c:4487
+#: src/compose.c:4480
 msgid "Attach"
 msgstr "Dołącz"
 
-#: src/compose.c:4488
+#: src/compose.c:4481
 msgid "Attach file"
 msgstr "Dołącz plik"
 
 #. signature
-#: src/compose.c:4498 src/prefs_account.c:1391 src/prefs_common.c:1356
+#: src/compose.c:4491 src/prefs_account.c:1391 src/prefs_common.c:1356
 msgid "Signature"
 msgstr "Podpis"
 
-#: src/compose.c:4499
+#: src/compose.c:4492
 msgid "Insert signature"
 msgstr "Wstaw podpis"
 
-#: src/compose.c:4508 src/prefs_common.c:1378 src/prefs_common.c:2382
+#: src/compose.c:4501 src/prefs_common.c:1378 src/prefs_common.c:2382
 msgid "Editor"
 msgstr "Edytor"
 
-#: src/compose.c:4509
+#: src/compose.c:4502
 msgid "Edit with external editor"
 msgstr "Edytuj w zewnętrznym edytorze"
 
-#: src/compose.c:4517
+#: src/compose.c:4510
 msgid "Linewrap"
 msgstr "Zawijanie linii"
 
-#: src/compose.c:4518
+#: src/compose.c:4511
 msgid "Wrap all long lines"
 msgstr "Zawijaj wszystkie długie linie"
 
-#: src/compose.c:4897
+#: src/compose.c:4891
 msgid "Invalid MIME type."
 msgstr "Niepoprawny typ MIME."
 
-#: src/compose.c:4915
+#: src/compose.c:4909
 msgid "File doesn't exist or is empty."
 msgstr "Brak pliku lub pusty plik."
 
-#: src/compose.c:4983
+#: src/compose.c:4977
 msgid "Properties"
 msgstr "Właściwości"
 
-#: src/compose.c:5003
+#: src/compose.c:4997
 msgid "Encoding"
 msgstr "Kodowanie"
 
-#: src/compose.c:5026 src/prefs_folder_item.c:183
+#: src/compose.c:5020 src/prefs_folder_item.c:183
 msgid "Path"
 msgstr "Ścieżka"
 
-#: src/compose.c:5027
+#: src/compose.c:5021
 msgid "File name"
 msgstr "Nazwa pliku"
 
-#: src/compose.c:5185
+#: src/compose.c:5179
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Niepoprawna linia wywołania zewnętrznego edytora: \"%s\"\n"
 
-#: src/compose.c:5211
+#: src/compose.c:5205
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1195,74 +1195,74 @@ msgstr ""
 "Czy wymusić zakończenie procesu?\n"
 "identyfikator grupy procesów: %d"
 
-#: src/compose.c:5228
+#: src/compose.c:5222
 #, c-format
 msgid "Terminated process group id: %d"
 msgstr "Identyfikator zakończonej grupy procesów: %d"
 
-#: src/compose.c:5229
+#: src/compose.c:5223
 #, c-format
 msgid "Temporary file: %s"
 msgstr "Plik tymczasowy: %s"
 
-#: src/compose.c:5253
+#: src/compose.c:5247
 msgid "Compose: input from monitoring process\n"
 msgstr "Edycja: wejście z procesu monitorującego\n"
 
 #. failed
-#: src/compose.c:5284
+#: src/compose.c:5278
 msgid "Couldn't exec external editor\n"
 msgstr "Nie można uruchomić zewnętrznego edytora\n"
 
-#: src/compose.c:5288
+#: src/compose.c:5282
 msgid "Couldn't write to file\n"
 msgstr "Nie można zapisać do pliku\n"
 
-#: src/compose.c:5290
+#: src/compose.c:5284
 msgid "Pipe read failed\n"
 msgstr "Błędny odczyt z potoku\n"
 
-#: src/compose.c:5596 src/compose.c:5604 src/compose.c:5610
+#: src/compose.c:5590 src/compose.c:5598 src/compose.c:5604
 msgid "Can't queue the message."
 msgstr "Nie można wstawić wiadomości do kolejki."
 
-#: src/compose.c:5701
+#: src/compose.c:5695
 msgid "Select files"
 msgstr "Wybierz pliki"
 
-#: src/compose.c:5723
+#: src/compose.c:5717
 msgid "Select file"
 msgstr "Wybierz plik"
 
-#: src/compose.c:5760
+#: src/compose.c:5754
 #, fuzzy
 msgid "Save message"
 msgstr "Wyślij wiadomość"
 
-#: src/compose.c:5761
+#: src/compose.c:5755
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Wiadomość została zmieniona, czy porzucić ją?"
 
-#: src/compose.c:5763
+#: src/compose.c:5757
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:5805
+#: src/compose.c:5799
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Czy chcesz zastosować szablon \"%s\"?"
 
-#: src/compose.c:5807
+#: src/compose.c:5801
 msgid "Apply template"
 msgstr "Zastosuj szablon"
 
-#: src/compose.c:5808
+#: src/compose.c:5802
 #, fuzzy
 msgid "_Replace"
 msgstr "Zamień"
 
-#: src/compose.c:5808
+#: src/compose.c:5802
 #, fuzzy
 msgid "_Insert"
 msgstr "Wstaw"
@@ -1707,12 +1707,12 @@ msgstr "Ustawianie informacji o katalogu...\n"
 msgid "Setting folder info..."
 msgstr "Ustawianie informacji o katalogu..."
 
-#: src/folderview.c:805 src/mainwindow.c:3301 src/setup.c:81
+#: src/folderview.c:805 src/mainwindow.c:3272 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Przeszukiwanie katalogu %s%c%s ..."
 
-#: src/folderview.c:809 src/mainwindow.c:3306 src/setup.c:86
+#: src/folderview.c:809 src/mainwindow.c:3277 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Przeszukiwanie katalogu %s ..."
@@ -2034,44 +2034,44 @@ msgstr "Błąd uwierzytelniania IMAP4.\n"
 msgid "IMAP4 login failed.\n"
 msgstr "Nie można zalogować się do serwera IMAP4.\n"
 
-#: src/imap.c:3522
+#: src/imap.c:3528
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "nie można dołączyć %s do %s\n"
 
-#: src/imap.c:3529
+#: src/imap.c:3535
 msgid "(sending file...)"
 msgstr "(wysyłanie pliku...)"
 
-#: src/imap.c:3557
+#: src/imap.c:3563
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "nie można dołączyć wiadomości do %s\n"
 
-#: src/imap.c:3589
+#: src/imap.c:3595
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "nie można skopiować %s do %s\n"
 
-#: src/imap.c:3613
+#: src/imap.c:3619
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "wystąpił błąd przy wykonywaniu polecenia IMAP: STORE %s %s\n"
 
-#: src/imap.c:3627
+#: src/imap.c:3633
 msgid "error while imap command: EXPUNGE\n"
 msgstr "wystąpił błąd przy wykonywaniu polecenia IMAP: EXPUNGE\n"
 
-#: src/imap.c:3640
+#: src/imap.c:3646
 msgid "error while imap command: CLOSE\n"
 msgstr "wystąpił błąd przy wykonywaniu polecenia IMAP: CLOSE\n"
 
-#: src/imap.c:3873
+#: src/imap.c:3879
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "nie można skonwertować UTF-7 do %s za pomocą programu iconv\n"
 
-#: src/imap.c:3903
+#: src/imap.c:3909
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "nie można skonwertować %s do UTF-7 za pomocą programu iconv\n"
@@ -2173,7 +2173,7 @@ msgstr "Importuj plik LDIF do książki adresowej"
 msgid "Prev"
 msgstr "Poprzednia"
 
-#: src/importldif.c:768 src/mainwindow.c:2321
+#: src/importldif.c:768 src/mainwindow.c:2303
 msgid "Next"
 msgstr "Następna"
 
@@ -2516,620 +2516,620 @@ msgid ""
 "Do you want to migrate it?"
 msgstr ""
 
-#: src/mainwindow.c:471
+#: src/mainwindow.c:462
 msgid "/_File/_Folder"
 msgstr "/_Plik/_Katalog"
 
-#: src/mainwindow.c:472
+#: src/mainwindow.c:463
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/_Plik/_Katalog/Utwórz _nowy katalog..."
 
-#: src/mainwindow.c:474
+#: src/mainwindow.c:465
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/_Plik/_Katalog/_Zmień nazwę katalo_gu..."
 
-#: src/mainwindow.c:475
+#: src/mainwindow.c:466
 #, fuzzy
 msgid "/_File/_Folder/_Move folder..."
 msgstr "/_Plik/_Katalog/_Zmień nazwę katalo_gu..."
 
-#: src/mainwindow.c:476
+#: src/mainwindow.c:467
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/_Plik/_Katalog/_Usuń kata_log"
 
-#: src/mainwindow.c:477
+#: src/mainwindow.c:468
 msgid "/_File/_Mailbox"
 msgstr "/_Plik/S_krzynka"
 
-#: src/mainwindow.c:478
+#: src/mainwindow.c:469
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/_Plik/S_krzynka/Dod_aj skrzynkę..."
 
-#: src/mainwindow.c:479
+#: src/mainwindow.c:470
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/Usuń _skrzynkę"
 
-#: src/mainwindow.c:480 src/mainwindow.c:485
+#: src/mainwindow.c:471 src/mainwindow.c:476
 msgid "/_File/_Mailbox/---"
 msgstr "/_Plik/S_krzynka/---"
 
-#: src/mainwindow.c:481
+#: src/mainwindow.c:472
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "/_Plik/S_krzynka/Sprawdź nowe wiadomoś_ci"
 
-#: src/mainwindow.c:483
+#: src/mainwindow.c:474
 msgid "/_File/_Mailbox/Check for new messages in _all mailboxes"
 msgstr "/_Plik/S_krzynka/Sprawdź wiadomoś_ci we wszystkich skrzynkach"
 
-#: src/mainwindow.c:486
+#: src/mainwindow.c:477
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "/_Plik/S_krzynka/Odbuduj drz_ewo katalogów"
 
-#: src/mainwindow.c:489
+#: src/mainwindow.c:480
 msgid "/_File/_Import mbox file..."
 msgstr "/_Plik/_Importuj plik mbox..."
 
-#: src/mainwindow.c:490
+#: src/mainwindow.c:481
 msgid "/_File/_Export to mbox file..."
 msgstr "/_Plik/_Eksportuj do pliku mbox..."
 
-#: src/mainwindow.c:492
+#: src/mainwindow.c:483
 msgid "/_File/Empty all _trash"
 msgstr "/_Plik/Opróżnij śmie_tnik"
 
-#: src/mainwindow.c:494 src/messageview.c:138
+#: src/mainwindow.c:485 src/messageview.c:138
 msgid "/_File/_Save as..."
 msgstr "/_Plik/Zapi_sz jako..."
 
-#: src/mainwindow.c:495 src/messageview.c:139
+#: src/mainwindow.c:486 src/messageview.c:139
 msgid "/_File/_Print..."
 msgstr "/_Plik/_Drukuj..."
 
-#: src/mainwindow.c:497
+#: src/mainwindow.c:488
 msgid "/_File/_Work offline"
 msgstr "/_Plik/Praca _offline"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:500
+#: src/mainwindow.c:491
 msgid "/_File/E_xit"
 msgstr "/_Plik/_Koniec"
 
-#: src/mainwindow.c:505
+#: src/mainwindow.c:496
 msgid "/_Edit/Select _thread"
 msgstr "/_Edycja/Wybierz wą_tek"
 
-#: src/mainwindow.c:507 src/messageview.c:147
+#: src/mainwindow.c:498 src/messageview.c:147
 msgid "/_Edit/_Find in current message..."
 msgstr "/_Edycja/Zna_jdź w bieżącej wiadomości..."
 
-#: src/mainwindow.c:509
+#: src/mainwindow.c:500
 msgid "/_Edit/_Search messages..."
 msgstr "/_Edycja/Wy_szukaj wiadomości..."
 
-#: src/mainwindow.c:512
+#: src/mainwindow.c:503
 msgid "/_View/Show or hi_de"
 msgstr "/_Widok/Wyświetl lub _ukryj"
 
-#: src/mainwindow.c:513
+#: src/mainwindow.c:504
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/_Widok/Wyświetl lub _ukryj/_Drzewo katalogów"
 
-#: src/mainwindow.c:515
+#: src/mainwindow.c:506
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/_Widok/Wyświetl lub _ukryj/Widok wiado_mości"
 
-#: src/mainwindow.c:517
+#: src/mainwindow.c:508
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/_Widok/Wyświetl lub _ukryj/_Pasek narzędzi"
 
-#: src/mainwindow.c:519
+#: src/mainwindow.c:510
 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:521
+#: src/mainwindow.c:512
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/_Widok/Wyświetl lub _ukryj/_Pasek narzędzi/_Ikony"
 
-#: src/mainwindow.c:523
+#: src/mainwindow.c:514
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/_Widok/Wyświetl lub _ukryj/_Pasek narzędzi/_Tekst"
 
-#: src/mainwindow.c:525
+#: src/mainwindow.c:516
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/_Widok/Wyświetl lub _ukryj/_Pasek narzędzi/Żade_n"
 
-#: src/mainwindow.c:527
+#: src/mainwindow.c:518
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/_Widok/Wyświetl lub _ukryj/Pa_sek stanu"
 
-#: src/mainwindow.c:530
+#: src/mainwindow.c:521
 msgid "/_View/Separate f_older tree"
 msgstr "/_Widok/_Oddzielne drzewo katalogów"
 
-#: src/mainwindow.c:531
+#: src/mainwindow.c:522
 msgid "/_View/Separate _message view"
 msgstr "/_Widok/Oddzielny widok wiado_mości"
 
-#: src/mainwindow.c:533
+#: src/mainwindow.c:524
 msgid "/_View/_Sort"
 msgstr "/_Widok/_Sortuj"
 
-#: src/mainwindow.c:534
+#: src/mainwindow.c:525
 msgid "/_View/_Sort/by _number"
 msgstr "/_Widok/_Sortuj/wg _numeru"
 
-#: src/mainwindow.c:535
+#: src/mainwindow.c:526
 msgid "/_View/_Sort/by s_ize"
 msgstr "/_Widok/_Sortuj/wg w_ielkości"
 
-#: src/mainwindow.c:536
+#: src/mainwindow.c:527
 msgid "/_View/_Sort/by _date"
 msgstr "/_Widok/_Sortuj/wg _daty"
 
-#: src/mainwindow.c:537
+#: src/mainwindow.c:528
 msgid "/_View/_Sort/by _from"
 msgstr "/_Widok/_Sortuj/wg pola _od"
 
-#: src/mainwindow.c:538
+#: src/mainwindow.c:529
 msgid "/_View/_Sort/by _recipient"
 msgstr "/_Widok/_Sortuj/wg odbio_rcy"
 
-#: src/mainwindow.c:539
+#: src/mainwindow.c:530
 msgid "/_View/_Sort/by _subject"
 msgstr "/_Widok/_Sortuj/wg _tematu"
 
-#: src/mainwindow.c:540
+#: src/mainwindow.c:531
 msgid "/_View/_Sort/by _color label"
 msgstr "/_Widok/_Sortuj/wg _kolorów etykiet"
 
-#: src/mainwindow.c:542
+#: src/mainwindow.c:533
 msgid "/_View/_Sort/by _mark"
 msgstr "/_Widok/_Sortuj/wg _zaznaczeń"
 
-#: src/mainwindow.c:543
+#: src/mainwindow.c:534
 msgid "/_View/_Sort/by _unread"
 msgstr "/_Widok/_Sortuj/wg _nieprzeczytanych"
 
-#: src/mainwindow.c:544
+#: src/mainwindow.c:535
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/_Widok/_Sortuj/wg z_ałączników"
 
-#: src/mainwindow.c:546
+#: src/mainwindow.c:537
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/_Widok/_Sortuj/Nie s_ortuj"
 
-#: src/mainwindow.c:547 src/mainwindow.c:550
+#: src/mainwindow.c:538 src/mainwindow.c:541
 msgid "/_View/_Sort/---"
 msgstr "/_Widok/_Sortuj/---"
 
-#: src/mainwindow.c:548
+#: src/mainwindow.c:539
 msgid "/_View/_Sort/Ascending"
 msgstr "/_Widok/_Sortuj/Rosnąco"
 
-#: src/mainwindow.c:549
+#: src/mainwindow.c:540
 msgid "/_View/_Sort/Descending"
 msgstr "/_Widok/_Sortuj/Malejąco"
 
-#: src/mainwindow.c:551
+#: src/mainwindow.c:542
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/_Widok/_Sortuj/_Grupuj wg tematu"
 
-#: src/mainwindow.c:553
+#: src/mainwindow.c:544
 msgid "/_View/Th_read view"
 msgstr "/_Widok/Widok wą_tków"
 
-#: src/mainwindow.c:554
+#: src/mainwindow.c:545
 msgid "/_View/E_xpand all threads"
 msgstr "/_Widok/_Rozwiń wszystkie wątki"
 
-#: src/mainwindow.c:555
+#: src/mainwindow.c:546
 msgid "/_View/Co_llapse all threads"
 msgstr "/_Widok/_Zwiń wszystkie wątki"
 
-#: src/mainwindow.c:556
+#: src/mainwindow.c:547
 msgid "/_View/Set display _item..."
 msgstr "/_Widok/Ustaw wyświetlane _elementy..."
 
-#: src/mainwindow.c:559
+#: src/mainwindow.c:550
 msgid "/_View/_Go to"
 msgstr "/_Widok/_Idź do"
 
-#: src/mainwindow.c:560
+#: src/mainwindow.c:551
 msgid "/_View/_Go to/_Prev message"
 msgstr "/_Widok/_Idź do/_Poprzednia wiadomość"
 
-#: src/mainwindow.c:561
+#: src/mainwindow.c:552
 msgid "/_View/_Go to/_Next message"
 msgstr "/_Widok/_Idź do/_Następna wiadomość"
 
-#: src/mainwindow.c:562 src/mainwindow.c:567 src/mainwindow.c:570
-#: src/mainwindow.c:575 src/mainwindow.c:580
+#: src/mainwindow.c:553 src/mainwindow.c:558 src/mainwindow.c:561
+#: src/mainwindow.c:566 src/mainwindow.c:571
 msgid "/_View/_Go to/---"
 msgstr "/_Widok/_Idź do/---"
 
-#: src/mainwindow.c:563
+#: src/mainwindow.c:554
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/_Widok/_Idź do/Poprzednia niep_rzeczytana wiadomość"
 
-#: src/mainwindow.c:565
+#: src/mainwindow.c:556
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/_Widok/_Idź do/Następna ni_eprzeczytana wiadomość"
 
-#: src/mainwindow.c:568
+#: src/mainwindow.c:559
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/_Widok/_Idź do/_Poprzednia wiadomość"
 
-#: src/mainwindow.c:569
+#: src/mainwindow.c:560
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/_Widok/_Idź do/_Następna nowa wiadomość"
 
-#: src/mainwindow.c:571
+#: src/mainwindow.c:562
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/_Widok/_Idź do/Poprzednia zaznaczona wiado_mość"
 
-#: src/mainwindow.c:573
+#: src/mainwindow.c:564
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/_Widok/_Idź do/Następna z_aznaczona wiadomość"
 
-#: src/mainwindow.c:576
+#: src/mainwindow.c:567
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/_Widok/_Idź do/_Poprzednia etykietowana wiadomość"
 
-#: src/mainwindow.c:578
+#: src/mainwindow.c:569
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/_Widok/_Idź do/_Następna etykietowana wiadomość"
 
-#: src/mainwindow.c:581
+#: src/mainwindow.c:572
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Widok/Idź do inne_go katalogu..."
 
-#: src/mainwindow.c:590 src/messageview.c:158
+#: src/mainwindow.c:581 src/messageview.c:158
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Widok/Kodowani_e znaków/_Automatyczne"
 
-#: src/mainwindow.c:641 src/messageview.c:202
+#: src/mainwindow.c:632 src/messageview.c:202
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Widok/Kodowani_e znaków/Japońskie (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:643 src/messageview.c:204
+#: src/mainwindow.c:634 src/messageview.c:204
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Widok/Kodowani_e znaków/Japońskie (_EUC-JP)"
 
-#: src/mainwindow.c:645 src/messageview.c:206
+#: src/mainwindow.c:636 src/messageview.c:206
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Widok/Kodowani_e znaków/Japońskie (_Shift__JIS)"
 
-#: src/mainwindow.c:657 src/messageview.c:217
+#: src/mainwindow.c:648 src/messageview.c:217
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Widok/Kodowani_e znaków/Chińskie (ISO-2022-_CN)"
 
-#: src/mainwindow.c:663 src/messageview.c:222
+#: src/mainwindow.c:654 src/messageview.c:222
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Widok/Kodowani_e znaków/Koreańskie (ISO-2022-KR)"
 
-#: src/mainwindow.c:676 src/summaryview.c:401
+#: src/mainwindow.c:667 src/summaryview.c:401
 msgid "/_View/Open in new _window"
 msgstr "/W_Widok/Ot_wórz w nowym oknie"
 
-#: src/mainwindow.c:677 src/messageview.c:234
+#: src/mainwindow.c:668 src/messageview.c:234
 msgid "/_View/Mess_age source"
 msgstr "/_Widok/P_okaż źródło"
 
-#: src/mainwindow.c:678 src/messageview.c:235
+#: src/mainwindow.c:669 src/messageview.c:235
 msgid "/_View/Show all _header"
 msgstr "/_Widok/Pokaż wszystkie na_główki"
 
-#: src/mainwindow.c:680
+#: src/mainwindow.c:671
 msgid "/_View/_Update summary"
 msgstr "/_Widok/_Odśwież podsumowanie"
 
-#: src/mainwindow.c:682 src/messageview.c:237
+#: src/mainwindow.c:673 src/messageview.c:237
 msgid "/_Message"
 msgstr "/_Wiadomość"
 
-#: src/mainwindow.c:683
+#: src/mainwindow.c:674
 msgid "/_Message/Recei_ve"
 msgstr "/Wiado_mość/Odbier_z"
 
-#: src/mainwindow.c:684
+#: src/mainwindow.c:675
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/Wiado_mość/Odbier_z/Pobierz z bieżą_cego konta"
 
-#: src/mainwindow.c:686
+#: src/mainwindow.c:677
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/Wiado_mość/Odbier_z/Pobierz ze _wszystkich kont"
 
-#: src/mainwindow.c:688
+#: src/mainwindow.c:679
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/_Wiadomość/Odbier_z/Anuluj pob_ieranie"
 
-#: src/mainwindow.c:690
+#: src/mainwindow.c:681
 msgid "/_Message/Recei_ve/---"
 msgstr "/Wiado_mość/Odbier_z/---"
 
-#: src/mainwindow.c:691
+#: src/mainwindow.c:682
 msgid "/_Message/_Send queued messages"
 msgstr "/Wiado_mość/Wyślij wia_domości z kolejki"
 
-#: src/mainwindow.c:692 src/mainwindow.c:694 src/mainwindow.c:701
-#: src/mainwindow.c:706 src/mainwindow.c:710 src/mainwindow.c:719
-#: src/mainwindow.c:722 src/messageview.c:240 src/messageview.c:248
+#: src/mainwindow.c:683 src/mainwindow.c:685 src/mainwindow.c:692
+#: src/mainwindow.c:697 src/mainwindow.c:701 src/mainwindow.c:710
+#: src/mainwindow.c:713 src/messageview.c:240 src/messageview.c:248
 #: src/messageview.c:253
 msgid "/_Message/---"
 msgstr "/_Wiadomość/---"
 
-#: src/mainwindow.c:693 src/messageview.c:238
+#: src/mainwindow.c:684 src/messageview.c:238
 msgid "/_Message/Compose _new message"
 msgstr "/Wiado_mość/Twórz _nową wiadomość"
 
-#: src/mainwindow.c:695 src/messageview.c:241
+#: src/mainwindow.c:686 src/messageview.c:241
 msgid "/_Message/_Reply"
 msgstr "/Wiado_mość/_Odpowiedz"
 
-#: src/mainwindow.c:696
+#: src/mainwindow.c:687
 msgid "/_Message/Repl_y to"
 msgstr "/Wiado_mość/Odpowied_z"
 
-#: src/mainwindow.c:697 src/messageview.c:242
+#: src/mainwindow.c:688 src/messageview.c:242
 msgid "/_Message/Repl_y to/_all"
 msgstr "/Wiado_mość/Odpowied_z/w_szystkim"
 
-#: src/mainwindow.c:698 src/messageview.c:244
+#: src/mainwindow.c:689 src/messageview.c:244
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/Wiado_mość/Odpowied_z/nadawc_y"
 
-#: src/mainwindow.c:699 src/messageview.c:246
+#: src/mainwindow.c:690 src/messageview.c:246
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/Wiado_mość/Odpowiedz/_liście dyskusyjnej"
 
-#: src/mainwindow.c:702 src/messageview.c:249
+#: src/mainwindow.c:693 src/messageview.c:249
 msgid "/_Message/_Forward"
 msgstr "/Wiado_mość/Przekaż da_lej"
 
-#: src/mainwindow.c:703 src/messageview.c:250
+#: src/mainwindow.c:694 src/messageview.c:250
 msgid "/_Message/For_ward as attachment"
 msgstr "/Wiado_mość/Przekaż j_ako załącznik"
 
-#: src/mainwindow.c:705 src/messageview.c:252
+#: src/mainwindow.c:696 src/messageview.c:252
 msgid "/_Message/Redirec_t"
 msgstr "/Wiado_mość/Prze_kieruj"
 
-#: src/mainwindow.c:707
+#: src/mainwindow.c:698
 msgid "/_Message/M_ove..."
 msgstr "/Wiado_mość/_Przesuń..."
 
-#: src/mainwindow.c:708
+#: src/mainwindow.c:699
 msgid "/_Message/_Copy..."
 msgstr "/Wiado_mość/_Kopiuj"
 
-#: src/mainwindow.c:709
+#: src/mainwindow.c:700
 msgid "/_Message/_Delete"
 msgstr "/Wiado_mość/_Usuń"
 
-#: src/mainwindow.c:711
+#: src/mainwindow.c:702
 msgid "/_Message/_Mark"
 msgstr "/Wiado_mość/_Zaznacz"
 
-#: src/mainwindow.c:712
+#: src/mainwindow.c:703
 msgid "/_Message/_Mark/_Mark"
 msgstr "/Wiado_mość/_Zaznacz/_Zaznacz"
 
-#: src/mainwindow.c:713
+#: src/mainwindow.c:704
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/Wiado_mość/_Zaznacz/_Odznacz"
 
-#: src/mainwindow.c:714
+#: src/mainwindow.c:705
 msgid "/_Message/_Mark/---"
 msgstr "/Wiado_mość/_Zaznacz/---"
 
-#: src/mainwindow.c:715
+#: src/mainwindow.c:706
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/Wiado_mość/_Zaznacz/Zaznacz jako ni_eprzeczytane"
 
-#: src/mainwindow.c:716
+#: src/mainwindow.c:707
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/Wiado_mość/_Zaznacz/Zaznacz jako przecz_ytane"
 
-#: src/mainwindow.c:718
+#: src/mainwindow.c:709
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/Wiado_mość/_Zaznacz/Zaznacz wszystkie jako przecz_ytane"
 
-#: src/mainwindow.c:720
+#: src/mainwindow.c:711
 #, fuzzy
 msgid "/_Message/Set as _junk mail"
 msgstr "/Wiado_mość/_Zaznacz/_Odznacz"
 
-#: src/mainwindow.c:721
+#: src/mainwindow.c:712
 msgid "/_Message/Set as not j_unk mail"
 msgstr ""
 
-#: src/mainwindow.c:723 src/messageview.c:254
+#: src/mainwindow.c:714 src/messageview.c:254
 msgid "/_Message/Re-_edit"
 msgstr "/Wiado_mość/Prz_eedytuj"
 
-#: src/mainwindow.c:727
+#: src/mainwindow.c:718
 #, fuzzy
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/_Narzędzia/Dodaj nadawcę do _książki adresowej"
 
-#: src/mainwindow.c:730
+#: src/mainwindow.c:721
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/_Narzędzia/_Filtruj wiadomości w katalogu"
 
-#: src/mainwindow.c:732
+#: src/mainwindow.c:723
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Narzędzia/Filtruj zaznaczonne wiadomości"
 
-#: src/mainwindow.c:734 src/messageview.c:261
+#: src/mainwindow.c:725 src/messageview.c:261
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Narzędzia/_Utwórz regułę filtrowania"
 
-#: src/mainwindow.c:735 src/messageview.c:263
+#: src/mainwindow.c:726 src/messageview.c:263
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Narzędzia/_Utwórz regułę filtrowania/_Automatycznie"
 
-#: src/mainwindow.c:737 src/messageview.c:265
+#: src/mainwindow.c:728 src/messageview.c:265
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Narzędzia/_Utwórz regułę filtrowania/_Od"
 
-#: src/mainwindow.c:739 src/messageview.c:267
+#: src/mainwindow.c:730 src/messageview.c:267
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Narzędzia/_Utwórz regułę filtrowania/_Do"
 
-#: src/mainwindow.c:741 src/messageview.c:269
+#: src/mainwindow.c:732 src/messageview.c:269
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Narzędzia/_Utwórz regułę filtrowania/_Temat"
 
-#: src/mainwindow.c:744
+#: src/mainwindow.c:735
 #, fuzzy
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/_Narzędzia/_Filtruj wiadomości w katalogu"
 
-#: src/mainwindow.c:746
+#: src/mainwindow.c:737
 #, fuzzy
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/_Narzędzia/Filtruj zaznaczonne wiadomości"
 
-#: src/mainwindow.c:751
+#: src/mainwindow.c:742
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/Wiado_mość/Usuń z_duplikowane wiadomości"
 
-#: src/mainwindow.c:754
+#: src/mainwindow.c:745
 msgid "/_Tools/E_xecute"
 msgstr "/_Narzędzia/_Wykonaj"
 
-#: src/mainwindow.c:756
+#: src/mainwindow.c:747
 msgid "/_Tools/_Log window"
 msgstr "/_Narzędzia/Okno _logów"
 
-#: src/mainwindow.c:758
+#: src/mainwindow.c:749
 msgid "/_Configuration"
 msgstr "/Konfigura_cja"
 
-#: src/mainwindow.c:759
+#: src/mainwindow.c:750
 msgid "/_Configuration/_Common preferences..."
 msgstr "/Konfigura_cja/Preferen_cje..."
 
-#: src/mainwindow.c:761
+#: src/mainwindow.c:752
 msgid "/_Configuration/_Filter setting..."
 msgstr "/Konfigura_cja/Ustawienia _filtrowania"
 
-#: src/mainwindow.c:763
+#: src/mainwindow.c:754
 msgid "/_Configuration/_Template..."
 msgstr "/Konfigura_cja/_Szablon..."
 
-#: src/mainwindow.c:764
+#: src/mainwindow.c:755
 msgid "/_Configuration/_Actions..."
 msgstr "/Konfigura_cja/Poleceni_a..."
 
-#: src/mainwindow.c:765
+#: src/mainwindow.c:756
 msgid "/_Configuration/---"
 msgstr "/Konfigura_cja/---"
 
-#: src/mainwindow.c:766
+#: src/mainwindow.c:757
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/Konfigura_cja/_Preferencje bieżącego konta..."
 
-#: src/mainwindow.c:768
+#: src/mainwindow.c:759
 msgid "/_Configuration/Create _new account..."
 msgstr "/Konfigura_cja/Utwórz _nowe konto..."
 
-#: src/mainwindow.c:770
+#: src/mainwindow.c:761
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/Konfigura_cja/_Edytuj konta..."
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:763
 msgid "/_Configuration/C_hange current account"
 msgstr "/Konfigura_cja/Zmień bieżą_ce konto"
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:767
 msgid "/_Help/_Manual"
 msgstr "/_Pomoc/_Podręcznik"
 
-#: src/mainwindow.c:777
+#: src/mainwindow.c:768
 msgid "/_Help/_Manual/_English"
 msgstr "/_Pomoc/_Podręcznik/Angi_elski"
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:769
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/_Pomoc/_Podręcznik/_Japoński"
 
-#: src/mainwindow.c:779
+#: src/mainwindow.c:770
 msgid "/_Help/_FAQ"
 msgstr "/Pomo_c/_FAQ"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:771
 msgid "/_Help/_FAQ/_English"
 msgstr "/_Pomoc/_FAQ/Angi_elskie"
 
-#: src/mainwindow.c:781
+#: src/mainwindow.c:772
 msgid "/_Help/_FAQ/_German"
 msgstr "/_Pomoc/_FAQ/_Niemieckie"
 
-#: src/mainwindow.c:782
+#: src/mainwindow.c:773
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/_Pomoc/_FAQ/Hi_szpańskie"
 
-#: src/mainwindow.c:783
+#: src/mainwindow.c:774
 msgid "/_Help/_FAQ/_French"
 msgstr "/_Pomoc/_FAQ/_Francuskie"
 
-#: src/mainwindow.c:784
+#: src/mainwindow.c:775
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/_Pomoc/_FAQ/_Włoskie"
 
-#: src/mainwindow.c:785
+#: src/mainwindow.c:776
 msgid "/_Help/---"
 msgstr "/_Pomoc/---"
 
-#: src/mainwindow.c:825
+#: src/mainwindow.c:816
 msgid "Creating main window...\n"
 msgstr "Tworzenie głównego okna...\n"
 
-#: src/mainwindow.c:987
+#: src/mainwindow.c:973
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Okno główne: błąd alokacji kolorów %d\n"
 
-#: src/mainwindow.c:1071 src/summaryview.c:2020 src/summaryview.c:2105
+#: src/mainwindow.c:1057 src/summaryview.c:2020 src/summaryview.c:2105
 #: src/summaryview.c:3342 src/summaryview.c:3415 src/summaryview.c:3728
 msgid "done.\n"
 msgstr "gotowe.\n"
 
-#: src/mainwindow.c:1196 src/mainwindow.c:1237 src/mainwindow.c:1265
+#: src/mainwindow.c:1182 src/mainwindow.c:1223 src/mainwindow.c:1251
 msgid "Untitled"
 msgstr "Bez tytułu"
 
-#: src/mainwindow.c:1266
+#: src/mainwindow.c:1252
 msgid "none"
 msgstr "żaden"
 
-#: src/mainwindow.c:1316
+#: src/mainwindow.c:1302
 #, 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:1536
+#: src/mainwindow.c:1522
 msgid "Offline"
 msgstr "Offline"
 
-#: src/mainwindow.c:1537
+#: src/mainwindow.c:1523
 msgid "You are offline. Go online?"
 msgstr "Jesteś offline. Przejść do trybu online?"
 
-#: src/mainwindow.c:1551
+#: src/mainwindow.c:1537
 msgid "Empty all trash"
 msgstr "Opróżnij śmietnik"
 
-#: src/mainwindow.c:1552
+#: src/mainwindow.c:1538
 msgid "Empty messages in all trash?"
 msgstr "Usunąć wszystkie wiadomości ze śmietnika?"
 
-#: src/mainwindow.c:1580
+#: src/mainwindow.c:1566
 msgid "Add mailbox"
 msgstr "Dodaj skrzynkę"
 
-#: src/mainwindow.c:1581
+#: src/mainwindow.c:1567
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3139,16 +3139,16 @@ msgstr ""
 "Jeśli zostanie podana istniejąca skrzynka, będzie ona\n"
 "automatycznie skanowana."
 
-#: src/mainwindow.c:1587
+#: src/mainwindow.c:1573
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Skrzynka \"%s\" już istnieje."
 
-#: src/mainwindow.c:1592 src/setup.c:57
+#: src/mainwindow.c:1578 src/setup.c:57
 msgid "Mailbox"
 msgstr "Skrzynka"
 
-#: src/mainwindow.c:1598 src/setup.c:63
+#: src/mainwindow.c:1584 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3158,150 +3158,150 @@ msgstr ""
 "Być może pliki już istnieją lub brak jest wystarczających uprawnień do "
 "zapisu w tym miejscu."
 
-#: src/mainwindow.c:1989
+#: src/mainwindow.c:1975
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Widok Katalogów"
 
-#: src/mainwindow.c:2009 src/messageview.c:368
+#: src/mainwindow.c:1995 src/messageview.c:368
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Widok Wiadomości"
 
-#: src/mainwindow.c:2156 src/summaryview.c:370
+#: src/mainwindow.c:2142 src/summaryview.c:370
 msgid "/_Reply"
 msgstr "/_Odpowiedz"
 
-#: src/mainwindow.c:2157
+#: src/mainwindow.c:2143
 msgid "/Reply to _all"
 msgstr "/Odpowiedz wszystkim"
 
-#: src/mainwindow.c:2158
+#: src/mainwindow.c:2144
 msgid "/Reply to _sender"
 msgstr "/Odpowiedz nadawcy"
 
-#: src/mainwindow.c:2159
+#: src/mainwindow.c:2145
 msgid "/Reply to mailing _list"
 msgstr "/Odpowiedz _liście dyskusyjnej"
 
-#: src/mainwindow.c:2164 src/summaryview.c:377
+#: src/mainwindow.c:2150 src/summaryview.c:377
 msgid "/_Forward"
 msgstr "/Prze_każ"
 
-#: src/mainwindow.c:2165 src/summaryview.c:378
+#: src/mainwindow.c:2151 src/summaryview.c:378
 msgid "/For_ward as attachment"
 msgstr "/Przekaż jako załącznik"
 
-#: src/mainwindow.c:2166 src/summaryview.c:379
+#: src/mainwindow.c:2152 src/summaryview.c:379
 msgid "/Redirec_t"
 msgstr "/Prze_kieruj"
 
-#: src/mainwindow.c:2205
+#: src/mainwindow.c:2188
 msgid "Get"
 msgstr "Odbierz"
 
-#: src/mainwindow.c:2206
+#: src/mainwindow.c:2189
 msgid "Incorporate new mail"
 msgstr "Odbierz nową pocztę"
 
-#: src/mainwindow.c:2213
+#: src/mainwindow.c:2196
 msgid "Get all"
 msgstr "Odbierz wsz."
 
-#: src/mainwindow.c:2214
+#: src/mainwindow.c:2197
 msgid "Incorporate new mail of all accounts"
 msgstr "Odbierz nową pocztę z wszystkich kont"
 
-#: src/mainwindow.c:2225
+#: src/mainwindow.c:2208
 msgid "Send queued message(s)"
 msgstr "Wyślij wiadomości z kolejki"
 
-#: src/mainwindow.c:2235 src/prefs_account.c:721 src/prefs_common.c:949
+#: src/mainwindow.c:2218 src/prefs_account.c:721 src/prefs_common.c:949
 #: src/prefs_folder_item.c:137
 msgid "Compose"
 msgstr "Utwórz"
 
-#: src/mainwindow.c:2236
+#: src/mainwindow.c:2219
 msgid "Compose new message"
 msgstr "Utwórz nową wiadomość"
 
-#: src/mainwindow.c:2244 src/prefs_common.c:1448
+#: src/mainwindow.c:2227 src/prefs_common.c:1448
 msgid "Reply"
 msgstr "Odpowiedz"
 
-#: src/mainwindow.c:2245 src/mainwindow.c:2258
+#: src/mainwindow.c:2228 src/mainwindow.c:2241
 msgid "Reply to the message"
 msgstr "Odpowiedz na wiadomość"
 
-#: src/mainwindow.c:2263
+#: src/mainwindow.c:2245
 msgid "Reply all"
 msgstr "Odp. na wsz."
 
-#: src/mainwindow.c:2264
+#: src/mainwindow.c:2246
 msgid "Reply to all"
 msgstr "Odpowiedz na wszystkie"
 
-#: src/mainwindow.c:2272 src/prefs_filter_edit.c:741
+#: src/mainwindow.c:2254 src/prefs_filter_edit.c:741
 msgid "Forward"
 msgstr "Przekaż"
 
-#: src/mainwindow.c:2273 src/mainwindow.c:2286
+#: src/mainwindow.c:2255 src/mainwindow.c:2268
 msgid "Forward the message"
 msgstr "Przekaż wiadomość dalej"
 
-#: src/mainwindow.c:2293
+#: src/mainwindow.c:2275
 msgid "Delete the message"
 msgstr "Usuń wiadomość"
 
-#: src/mainwindow.c:2301 src/prefs_common.c:1988
+#: src/mainwindow.c:2283 src/prefs_common.c:1988
 msgid "Junk"
 msgstr ""
 
-#: src/mainwindow.c:2302
+#: src/mainwindow.c:2284
 #, fuzzy
 msgid "Set as junk mail"
 msgstr "Ustaw jako domyślne"
 
-#: src/mainwindow.c:2311
+#: src/mainwindow.c:2293
 msgid "Execute"
 msgstr "Wykonaj"
 
-#: src/mainwindow.c:2312
+#: src/mainwindow.c:2294
 msgid "Execute marked process"
 msgstr "Wykonaj zaznaczony proces"
 
-#: src/mainwindow.c:2322
+#: src/mainwindow.c:2304
 msgid "Next unread message"
 msgstr "Następna nieprzeczytana wiadomość"
 
-#: src/mainwindow.c:2334
+#: src/mainwindow.c:2316
 msgid "Prefs"
 msgstr "Preferencje"
 
-#: src/mainwindow.c:2335
+#: src/mainwindow.c:2317
 msgid "Common preferences"
 msgstr "Wspólne preferencje "
 
-#: src/mainwindow.c:2343 src/prefs_folder_item.c:261
+#: src/mainwindow.c:2325 src/prefs_folder_item.c:261
 #: src/prefs_folder_item.c:272 src/progressdialog.c:128
 msgid "Account"
 msgstr "Konto"
 
-#: src/mainwindow.c:2344
+#: src/mainwindow.c:2326
 msgid "Account setting"
 msgstr "Ustawienia konta"
 
-#: src/mainwindow.c:2527
+#: src/mainwindow.c:2498
 msgid "You are offline. Click the icon to go online."
 msgstr "Jesteś offline. Kliknij ikonę by przejść do trybu online."
 
-#: src/mainwindow.c:2538
+#: src/mainwindow.c:2509
 msgid "You are online. Click the icon to go offline."
 msgstr "Jesteś online. Kliknij ikonę, by przejść do trybu offline."
 
-#: src/mainwindow.c:2731
+#: src/mainwindow.c:2702
 msgid "Exit"
 msgstr "Koniec programu"
 
-#: src/mainwindow.c:2731
+#: src/mainwindow.c:2702
 msgid "Exit this program?"
 msgstr "Czy zakończyć program?"
 
@@ -5499,11 +5499,11 @@ msgstr "Tworzenie dialogu postępu...\n"
 msgid "Status"
 msgstr "Stan"
 
-#: src/recv.c:113
+#: src/recv.c:112
 msgid "error occurred while retrieving data.\n"
 msgstr "błąd podczas odbierania danych.\n"
 
-#: src/recv.c:155 src/recv.c:197 src/recv.c:213
+#: src/recv.c:154 src/recv.c:196 src/recv.c:211
 msgid "Can't write to file.\n"
 msgstr "Nie można zapisać do pliku.\n"
 
@@ -6251,7 +6251,7 @@ msgstr "%.2fMB"
 msgid "%.2fGB"
 msgstr "%.2fGB"
 
-#: src/utils.c:2372 src/utils.c:2496
+#: src/utils.c:2386 src/utils.c:2510
 #, c-format
 msgid "writing to %s failed.\n"
 msgstr "błąd zapisu do %s.\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 5382ebe4..9cd59180 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-08-09 18:08+0900\n"
+"POT-Creation-Date: 2005-08-22 17:22+0900\n"
 "PO-Revision-Date: 2005-07-22 15:42-0300\n"
 "Last-Translator: Ricardo Nabinger Sanchez <rnsanchez@gmail.com>\n"
 "Language-Team: André Casteliano <digitalcoder@users.sourceforge.net> Isaías "
@@ -98,7 +98,7 @@ msgstr ""
 "na coluna `G' para habilitar essa caixa no `Baixar tudo'."
 
 #: src/account.c:691 src/addressadd.c:192 src/addressbook.c:490
-#: src/compose.c:4081 src/editaddress.c:200 src/editaddress.c:942
+#: src/compose.c:4079 src/editaddress.c:200 src/editaddress.c:942
 #: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:265
 #: src/editjpilot.c:271 src/editldap.c:307 src/editvcard.c:184
 #: src/mimeview.c:201 src/prefs_filter.c:258 src/prefs_folder_item.c:170
@@ -234,7 +234,7 @@ msgstr "Argumento do usuário para a ação"
 msgid "Add Address to Book"
 msgstr "Adicionar ao Catálogo de Endereços"
 
-#: src/addressadd.c:202 src/compose.c:4528 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4521 src/editaddress.c:201
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "Endereço"
@@ -248,7 +248,7 @@ msgstr "Notas"
 msgid "Select Address Book Folder"
 msgstr "Selecione Pasta do Catálogo de Endereços"
 
-#: src/addressbook.c:336 src/compose.c:495 src/mainwindow.c:470
+#: src/addressbook.c:336 src/compose.c:493 src/mainwindow.c:461
 #: src/messageview.c:137
 msgid "/_File"
 msgstr "/_Arquivo"
@@ -269,10 +269,10 @@ msgstr "/_Arquivo/Novo _JPilot"
 msgid "/_File/New _Server"
 msgstr "/_Arquivo/Novo _Servidor"
 
-#: src/addressbook.c:345 src/addressbook.c:348 src/compose.c:500
-#: src/compose.c:505 src/compose.c:509 src/mainwindow.c:488
-#: src/mainwindow.c:491 src/mainwindow.c:493 src/mainwindow.c:496
-#: src/mainwindow.c:498 src/messageview.c:140
+#: src/addressbook.c:345 src/addressbook.c:348 src/compose.c:498
+#: src/compose.c:503 src/compose.c:507 src/mainwindow.c:479
+#: src/mainwindow.c:482 src/mainwindow.c:484 src/mainwindow.c:487
+#: src/mainwindow.c:489 src/messageview.c:140
 msgid "/_File/---"
 msgstr "/_Arquivo/---"
 
@@ -288,7 +288,7 @@ msgstr "/_Arquivo/_Apagar"
 msgid "/_File/_Save"
 msgstr "/_Arquivo/_Salvar"
 
-#: src/addressbook.c:350 src/compose.c:510 src/messageview.c:141
+#: src/addressbook.c:350 src/compose.c:508 src/messageview.c:141
 msgid "/_File/_Close"
 msgstr "/_Arquivo/_Fechar"
 
@@ -320,7 +320,7 @@ msgstr "/_Endereço/_Editar"
 msgid "/_Address/_Delete"
 msgstr "/_Endereço/_Apagar"
 
-#: src/addressbook.c:358 src/compose.c:619 src/mainwindow.c:725
+#: src/addressbook.c:358 src/compose.c:617 src/mainwindow.c:716
 #: src/messageview.c:256
 msgid "/_Tools"
 msgstr "/_Ferramentas"
@@ -329,12 +329,12 @@ msgstr "/_Ferramentas"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Ferramentas/Importar arquivo _LDIF"
 
-#: src/addressbook.c:360 src/compose.c:632 src/mainwindow.c:775
+#: src/addressbook.c:360 src/compose.c:630 src/mainwindow.c:766
 #: src/messageview.c:274
 msgid "/_Help"
 msgstr "/_Ajuda"
 
-#: src/addressbook.c:361 src/compose.c:633 src/mainwindow.c:786
+#: src/addressbook.c:361 src/compose.c:631 src/mainwindow.c:777
 #: src/messageview.c:275
 msgid "/_Help/_About"
 msgstr "/_Ajuda/_Sobre"
@@ -351,7 +351,7 @@ msgstr "/Novo _Grupo"
 msgid "/New _Folder"
 msgstr "/Nova _Pasta"
 
-#: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:489
+#: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:487
 #: src/folderview.c:235 src/folderview.c:237 src/folderview.c:241
 #: src/folderview.c:252 src/folderview.c:254 src/folderview.c:256
 #: src/folderview.c:260 src/folderview.c:270 src/folderview.c:272
@@ -361,8 +361,8 @@ msgstr "/Nova _Pasta"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:512
-#: src/mainwindow.c:502 src/messageview.c:143
+#: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:510
+#: src/mainwindow.c:493 src/messageview.c:143
 msgid "/_Edit"
 msgstr "/_Editar"
 
@@ -374,7 +374,7 @@ msgstr "/_Apagar"
 msgid "E-Mail address"
 msgstr "Endereço de e-mail"
 
-#: src/addressbook.c:495 src/compose.c:4529 src/prefs_common.c:2402
+#: src/addressbook.c:495 src/compose.c:4522 src/prefs_common.c:2402
 msgid "Address book"
 msgstr "Catálogo de endereços"
 
@@ -383,8 +383,8 @@ msgid "Name:"
 msgstr "Nome:"
 
 #. Buttons
-#: src/addressbook.c:627 src/addressbook.c:1673 src/editaddress.c:884
-#: src/editaddress.c:1017 src/mainwindow.c:2292 src/prefs_actions.c:266
+#: src/addressbook.c:627 src/addressbook.c:1674 src/editaddress.c:884
+#: src/editaddress.c:1017 src/mainwindow.c:2274 src/prefs_actions.c:266
 #: src/prefs_display_header.c:278 src/prefs_display_header.c:333
 #: src/prefs_template.c:231
 msgid "Delete"
@@ -423,7 +423,7 @@ msgstr "Apagar endereço(s)"
 msgid "Really delete the address(es)?"
 msgstr "Apagar realmente o(s) endereço(s)?"
 
-#: src/addressbook.c:1664
+#: src/addressbook.c:1665
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -432,36 +432,36 @@ msgstr ""
 "Você quer apagar a pasta E todos os endereços em `%s' ?\n"
 "Caso apague somente a pasta, os endereços serão movidos para a pasta pai."
 
-#: src/addressbook.c:1667 src/folderview.c:2139
+#: src/addressbook.c:1668 src/folderview.c:2139
 msgid "Delete folder"
 msgstr "Apagar pasta"
 
-#: src/addressbook.c:1667
+#: src/addressbook.c:1668
 msgid "_Folder only"
 msgstr "_Pasta apenas"
 
-#: src/addressbook.c:1667
+#: src/addressbook.c:1668
 msgid "Folder and _addresses"
 msgstr "Pasta e _endereços"
 
-#: src/addressbook.c:1672
+#: src/addressbook.c:1673
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Apagar realmente `%s' ?"
 
-#: src/addressbook.c:2352 src/addressbook.c:2485
+#: src/addressbook.c:2353 src/addressbook.c:2486
 msgid "New user, could not save index file."
 msgstr "Novo usuário, não foi possível salvar arquivo de índice."
 
-#: src/addressbook.c:2356 src/addressbook.c:2489
+#: src/addressbook.c:2357 src/addressbook.c:2490
 msgid "New user, could not save address book files."
 msgstr "Novo usuário, não foi possível salvar arquivos de livro de endereços."
 
-#: src/addressbook.c:2366 src/addressbook.c:2499
+#: src/addressbook.c:2367 src/addressbook.c:2500
 msgid "Old address book converted successfully."
 msgstr "Catálogo de endereços antigo convertido com sucesso."
 
-#: src/addressbook.c:2371
+#: src/addressbook.c:2372
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -469,7 +469,7 @@ msgstr ""
 "Catálogo de endereços antigo convertido,\n"
 "não foi possível salvar o arquivo de índice de endereços "
 
-#: src/addressbook.c:2384
+#: src/addressbook.c:2385
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -477,7 +477,7 @@ msgstr ""
 "Não foi possível converter o catálogo de endereços,\n"
 "mas arquivos vazios para o catálogo de endereços foram criados."
 
-#: src/addressbook.c:2390
+#: src/addressbook.c:2391
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -485,7 +485,7 @@ msgstr ""
 "Não foi possível converter o catálogo de endereços,\n"
 "não foi possível criar arquivos novos para o catálogo de endereços."
 
-#: src/addressbook.c:2395
+#: src/addressbook.c:2396
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -493,91 +493,91 @@ msgstr ""
 "Não foi possível converter o catálogo de endereços\n"
 "nem criar arquivos novos para o catálogo de endereços."
 
-#: src/addressbook.c:2402
+#: src/addressbook.c:2403
 msgid "Addressbook conversion error"
 msgstr "Erro convertendo catálogo de endereços"
 
-#: src/addressbook.c:2406
+#: src/addressbook.c:2407
 msgid "Addressbook conversion"
 msgstr "Conversão do catálogo de endereços"
 
-#: src/addressbook.c:2441
+#: src/addressbook.c:2442
 msgid "Addressbook Error"
 msgstr "Erro no Catálogo de Endereços"
 
-#: src/addressbook.c:2442 src/addressbook.c:2542
+#: src/addressbook.c:2443 src/addressbook.c:2543
 msgid "Could not read address index"
 msgstr "Não foi possível ler o índice do endereço"
 
-#: src/addressbook.c:2504
+#: src/addressbook.c:2505
 msgid "Old address book converted, could not save new address index file"
 msgstr ""
 "Catálogo de endereços antigo convertido, não foi possível salvar o arquivo "
 "de indíce do novo endereço"
 
-#: src/addressbook.c:2518
+#: src/addressbook.c:2519
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr ""
 "Não foi possível converter o catálogo de endereços, mas arquivos vazios para "
 "o catálogo de endereços foram criados."
 
-#: src/addressbook.c:2524
+#: src/addressbook.c:2525
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr ""
 "Não foi possível converter o catálogo de endereços, não foi possível criar "
 "arquivos novos para o catálogo de endereços."
 
-#: src/addressbook.c:2530
+#: src/addressbook.c:2531
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr ""
 "Não foi possível converter o catálogo de endereços e não foi possível criar "
 "arquivos novos para o catálogo de endereços."
 
-#: src/addressbook.c:2548
+#: src/addressbook.c:2549
 msgid "Addressbook Conversion Error"
 msgstr "Erro na conversão do catálogo de endereços"
 
-#: src/addressbook.c:2554
+#: src/addressbook.c:2555
 msgid "Addressbook Conversion"
 msgstr "Conversão do Catálogo de Endereços"
 
-#: src/addressbook.c:3055 src/prefs_common.c:963
+#: src/addressbook.c:3056 src/prefs_common.c:963
 msgid "Interface"
 msgstr "Interface"
 
-#: src/addressbook.c:3071 src/importldif.c:514
+#: src/addressbook.c:3072 src/importldif.c:514
 msgid "Address Book"
 msgstr "Catálogo de Endereços"
 
-#: src/addressbook.c:3087
+#: src/addressbook.c:3088
 msgid "Person"
 msgstr "Pessoa"
 
-#: src/addressbook.c:3103
+#: src/addressbook.c:3104
 msgid "EMail Address"
 msgstr "Endereço de e-mail"
 
-#: src/addressbook.c:3119
+#: src/addressbook.c:3120
 msgid "Group"
 msgstr "Grupo"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3135 src/folderview.c:346 src/prefs_account.c:1866
+#: src/addressbook.c:3136 src/folderview.c:346 src/prefs_account.c:1866
 msgid "Folder"
 msgstr "Pasta"
 
-#: src/addressbook.c:3151
+#: src/addressbook.c:3152
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3167 src/addressbook.c:3183
+#: src/addressbook.c:3168 src/addressbook.c:3184
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3199
+#: src/addressbook.c:3200
 msgid "LDAP Server"
 msgstr "Servidor LDAP"
 
@@ -589,7 +589,7 @@ msgstr "Endereços comuns"
 msgid "Personal address"
 msgstr "Endereços pessoais"
 
-#: src/alertpanel.c:138 src/compose.c:5214 src/main.c:515
+#: src/alertpanel.c:138 src/compose.c:5208 src/main.c:515
 msgid "Notice"
 msgstr "Notificação"
 
@@ -644,347 +644,347 @@ msgstr "Marrom"
 msgid "None"
 msgstr "Nenhuma"
 
-#: src/compose.c:487
+#: src/compose.c:485
 msgid "/_Add..."
 msgstr "/_Adicionar"
 
-#: src/compose.c:488
+#: src/compose.c:486
 msgid "/_Remove"
 msgstr "/_Remover"
 
-#: src/compose.c:490 src/folderview.c:243 src/folderview.c:262
+#: src/compose.c:488 src/folderview.c:243 src/folderview.c:262
 #: src/folderview.c:277
 msgid "/_Properties..."
 msgstr "/_Propriedades..."
 
-#: src/compose.c:496
+#: src/compose.c:494
 msgid "/_File/_Send"
 msgstr "/_Arquivo/_Enviar"
 
-#: src/compose.c:498
+#: src/compose.c:496
 msgid "/_File/Send _later"
 msgstr "/_Arquivo/Enviar _depois"
 
-#: src/compose.c:501
+#: src/compose.c:499
 msgid "/_File/Save to _draft folder"
 msgstr "/_Arquivo/Salvar na pasta de _rascunhos"
 
-#: src/compose.c:503
+#: src/compose.c:501
 msgid "/_File/Save and _keep editing"
 msgstr "/_Arquivo/Salvar e _continuar editando"
 
-#: src/compose.c:506
+#: src/compose.c:504
 msgid "/_File/_Attach file"
 msgstr "/_Arquivo/_Anexar arquivo"
 
-#: src/compose.c:507
+#: src/compose.c:505
 msgid "/_File/_Insert file"
 msgstr "/_Arquivo/_Inserir arquivo"
 
-#: src/compose.c:508
+#: src/compose.c:506
 msgid "/_File/Insert si_gnature"
 msgstr "/_Arquivo/Inserir as_sinatura"
 
-#: src/compose.c:513
+#: src/compose.c:511
 msgid "/_Edit/_Undo"
 msgstr "/_Editar/_Desfazer"
 
-#: src/compose.c:514
+#: src/compose.c:512
 msgid "/_Edit/_Redo"
 msgstr "/_Editar/_Refazer"
 
-#: src/compose.c:515 src/compose.c:522 src/mainwindow.c:506
+#: src/compose.c:513 src/compose.c:520 src/mainwindow.c:497
 #: src/messageview.c:146
 msgid "/_Edit/---"
 msgstr "/_Editar/---"
 
-#: src/compose.c:516
+#: src/compose.c:514
 msgid "/_Edit/Cu_t"
 msgstr "/_Editar/_Cortar"
 
-#: src/compose.c:517 src/mainwindow.c:503 src/messageview.c:144
+#: src/compose.c:515 src/mainwindow.c:494 src/messageview.c:144
 msgid "/_Edit/_Copy"
 msgstr "/_Editar/C_opiar"
 
-#: src/compose.c:518
+#: src/compose.c:516
 msgid "/_Edit/_Paste"
 msgstr "/_Editar/Co_lar"
 
-#: src/compose.c:519
+#: src/compose.c:517
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Editar/Colar como ci_tação"
 
-#: src/compose.c:521 src/mainwindow.c:504 src/messageview.c:145
+#: src/compose.c:519 src/mainwindow.c:495 src/messageview.c:145
 msgid "/_Edit/Select _all"
 msgstr "/_Editar/_Selecionar tudo"
 
-#: src/compose.c:523
+#: src/compose.c:521
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/_Editar/_Quebrar parágrafo atual"
 
-#: src/compose.c:525
+#: src/compose.c:523
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/_Editar/Quebrar todas as _linhas compridas"
 
-#: src/compose.c:527
+#: src/compose.c:525
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Editar/_Quebra automática de linha"
 
-#: src/compose.c:528 src/mainwindow.c:511 src/messageview.c:150
+#: src/compose.c:526 src/mainwindow.c:502 src/messageview.c:150
 #: src/summaryview.c:400
 msgid "/_View"
 msgstr "/E_xibir"
 
-#: src/compose.c:529
+#: src/compose.c:527
 msgid "/_View/_To"
 msgstr "/E_xibir/_Para"
 
-#: src/compose.c:530
+#: src/compose.c:528
 msgid "/_View/_Cc"
 msgstr "/E_xibir/_Cc"
 
-#: src/compose.c:531
+#: src/compose.c:529
 msgid "/_View/_Bcc"
 msgstr "/E_xibir/_Cco"
 
-#: src/compose.c:532
+#: src/compose.c:530
 msgid "/_View/_Reply to"
 msgstr "/E_xibir/_Responder para"
 
-#: src/compose.c:533 src/compose.c:535 src/compose.c:537 src/compose.c:539
-#: src/mainwindow.c:529 src/mainwindow.c:532 src/mainwindow.c:558
-#: src/mainwindow.c:582 src/mainwindow.c:675 src/mainwindow.c:679
+#: src/compose.c:531 src/compose.c:533 src/compose.c:535 src/compose.c:537
+#: src/mainwindow.c:520 src/mainwindow.c:523 src/mainwindow.c:549
+#: src/mainwindow.c:573 src/mainwindow.c:666 src/mainwindow.c:670
 #: src/messageview.c:233
 msgid "/_View/---"
 msgstr "/E_xibir/---"
 
-#: src/compose.c:534
+#: src/compose.c:532
 msgid "/_View/_Followup to"
 msgstr "/E_xibir/_Seguir respondendo"
 
-#: src/compose.c:536
+#: src/compose.c:534
 msgid "/_View/R_uler"
 msgstr "/E_xibir/_Régua"
 
-#: src/compose.c:538
+#: src/compose.c:536
 msgid "/_View/_Attachment"
 msgstr "/E_xibir/_Anexo"
 
-#: src/compose.c:545 src/mainwindow.c:589 src/messageview.c:157
+#: src/compose.c:543 src/mainwindow.c:580 src/messageview.c:157
 msgid "/_View/Character _encoding"
 msgstr "/E_xibir/_Codificação de caracteres"
 
-#: src/compose.c:546
+#: src/compose.c:544
 msgid "/_View/Character _encoding/_Automatic"
 msgstr "/E_xibir/Codificação de caracteres/_Automático"
 
-#: src/compose.c:548 src/compose.c:554 src/compose.c:560 src/compose.c:564
-#: src/compose.c:570 src/compose.c:574 src/compose.c:580 src/compose.c:584
-#: src/compose.c:594 src/compose.c:598 src/compose.c:608 src/compose.c:612
-#: src/mainwindow.c:585 src/mainwindow.c:592 src/messageview.c:153
+#: src/compose.c:546 src/compose.c:552 src/compose.c:558 src/compose.c:562
+#: src/compose.c:568 src/compose.c:572 src/compose.c:578 src/compose.c:582
+#: src/compose.c:592 src/compose.c:596 src/compose.c:606 src/compose.c:610
+#: src/mainwindow.c:576 src/mainwindow.c:583 src/messageview.c:153
 msgid "/_View/Character _encoding/---"
 msgstr "/E_xibir/_Codificação de caracteres/---"
 
-#: src/compose.c:550 src/mainwindow.c:593 src/messageview.c:161
+#: src/compose.c:548 src/mainwindow.c:584 src/messageview.c:161
 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:552 src/mainwindow.c:595 src/messageview.c:164
+#: src/compose.c:550 src/mainwindow.c:586 src/messageview.c:164
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/E_xibir/_/Codificação de caracteresUnicode (_UTF-8)"
 
-#: src/compose.c:556 src/mainwindow.c:599 src/messageview.c:167
+#: src/compose.c:554 src/mainwindow.c:590 src/messageview.c:167
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/E_xibir/_Codificação de caracteres/Europa Ocidental (ISO-8859-_1)"
 
-#: src/compose.c:558 src/mainwindow.c:601 src/messageview.c:169
+#: src/compose.c:556 src/mainwindow.c:592 src/messageview.c:169
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/E_xibir/_Codificação de caracteres/Europa Ocidental (ISO-8859-15)"
 
-#: src/compose.c:562 src/mainwindow.c:605 src/messageview.c:172
+#: src/compose.c:560 src/mainwindow.c:596 src/messageview.c:172
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/E_xibir/_/Codificação de caracteres/Europa Central (ISO-8859-_2)"
 
-#: src/compose.c:566 src/mainwindow.c:609 src/messageview.c:175
+#: src/compose.c:564 src/mainwindow.c:600 src/messageview.c:175
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/E_xibir/_Codificação de caracteres/_Báltico (ISO-8859-13)"
 
-#: src/compose.c:568 src/mainwindow.c:611 src/messageview.c:177
+#: src/compose.c:566 src/mainwindow.c:602 src/messageview.c:177
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/E_xibir/_Codificação de caracteres/Báltico (ISO-8859-_4)"
 
-#: src/compose.c:572 src/mainwindow.c:615 src/messageview.c:180
+#: src/compose.c:570 src/mainwindow.c:606 src/messageview.c:180
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/E_xibir/_Codificação de caracteres/Grego (ISO-8859-_7)"
 
-#: src/compose.c:576 src/mainwindow.c:619 src/messageview.c:183
+#: src/compose.c:574 src/mainwindow.c:610 src/messageview.c:183
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/E_xibir/_Codificação de caracteres/Hebreu (ISO-8859-_8)"
 
-#: src/compose.c:578 src/mainwindow.c:621 src/messageview.c:185
+#: src/compose.c:576 src/mainwindow.c:612 src/messageview.c:185
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/E_xibir/_Codificação de caracteres/Hebreu (Windows-1255)"
 
-#: src/compose.c:582 src/mainwindow.c:625 src/messageview.c:188
+#: src/compose.c:580 src/mainwindow.c:616 src/messageview.c:188
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/E_xibir/_Codificação de caracteres/Turco (ISO-8859-_9)"
 
-#: src/compose.c:586 src/mainwindow.c:629 src/messageview.c:191
+#: src/compose.c:584 src/mainwindow.c:620 src/messageview.c:191
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/E_xibir/_Codificação de caracteres/Cirílico (ISO-8859-_5)"
 
-#: src/compose.c:588 src/mainwindow.c:631 src/messageview.c:193
+#: src/compose.c:586 src/mainwindow.c:622 src/messageview.c:193
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/E_xibir/_Codificação de caracteres/Cirílico (KOI8-_R)"
 
-#: src/compose.c:590 src/mainwindow.c:633 src/messageview.c:195
+#: src/compose.c:588 src/mainwindow.c:624 src/messageview.c:195
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/E_xibir/_Codificação de caracteres/Cirílico (KOI8-U)"
 
-#: src/compose.c:592 src/mainwindow.c:635 src/messageview.c:197
+#: src/compose.c:590 src/mainwindow.c:626 src/messageview.c:197
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/E_xibir/_Codificação de caracteres/Cirílico (Windows-1251)"
 
-#: src/compose.c:596 src/mainwindow.c:639 src/messageview.c:200
+#: src/compose.c:594 src/mainwindow.c:630 src/messageview.c:200
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/E_xibir/_Codificação de caracteres/Japonês (ISO-2022-_JP)"
 
-#: src/compose.c:600 src/mainwindow.c:649 src/messageview.c:209
+#: src/compose.c:598 src/mainwindow.c:640 src/messageview.c:209
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/E_xibir/_Codificação de caracteres/Chinês simplificado (_GB2312)"
 
-#: src/compose.c:602 src/mainwindow.c:651 src/messageview.c:211
+#: src/compose.c:600 src/mainwindow.c:642 src/messageview.c:211
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/E_xibir/_Codificação de caracteres/Chinês simplificado (GBK)"
 
-#: src/compose.c:604 src/mainwindow.c:653 src/messageview.c:213
+#: src/compose.c:602 src/mainwindow.c:644 src/messageview.c:213
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/E_xibir/_Codificação de caracteres/Chinês tradicional (_Big5)"
 
-#: src/compose.c:606 src/mainwindow.c:655 src/messageview.c:215
+#: src/compose.c:604 src/mainwindow.c:646 src/messageview.c:215
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/E_xibir/_Codificação de caracteres/Chinês tradicional (EUC-_TW)"
 
-#: src/compose.c:610 src/mainwindow.c:661 src/messageview.c:220
+#: src/compose.c:608 src/mainwindow.c:652 src/messageview.c:220
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/E_xibir/_Codificação de caracteres/Coreano (EUC-_KR)"
 
-#: src/compose.c:614 src/mainwindow.c:667 src/messageview.c:225
+#: src/compose.c:612 src/mainwindow.c:658 src/messageview.c:225
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/E_xibir/_Codificação de caracteres/Thai (TIS-620)"
 
-#: src/compose.c:616 src/mainwindow.c:669 src/messageview.c:227
+#: src/compose.c:614 src/mainwindow.c:660 src/messageview.c:227
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/E_xibir/_Codificação de caracteres/Thai (Windows-874)"
 
-#: src/compose.c:620 src/mainwindow.c:726 src/messageview.c:257
+#: src/compose.c:618 src/mainwindow.c:717 src/messageview.c:257
 msgid "/_Tools/_Address book"
 msgstr "/_Ferramentas/_Catálogo de endereços"
 
-#: src/compose.c:621
+#: src/compose.c:619
 msgid "/_Tools/_Template"
 msgstr "/_Ferramenta/_Modelo"
 
-#: src/compose.c:622 src/mainwindow.c:749 src/messageview.c:272
+#: src/compose.c:620 src/mainwindow.c:740 src/messageview.c:272
 msgid "/_Tools/Actio_ns"
 msgstr "/_Ferramentas/_Ações"
 
-#: src/compose.c:623 src/compose.c:627 src/mainwindow.c:729
-#: src/mainwindow.c:743 src/mainwindow.c:748 src/mainwindow.c:750
-#: src/mainwindow.c:753 src/mainwindow.c:755 src/messageview.c:260
+#: src/compose.c:621 src/compose.c:625 src/mainwindow.c:720
+#: src/mainwindow.c:734 src/mainwindow.c:739 src/mainwindow.c:741
+#: src/mainwindow.c:744 src/mainwindow.c:746 src/messageview.c:260
 #: src/messageview.c:271
 msgid "/_Tools/---"
 msgstr "/_Ferramentas/---"
 
-#: src/compose.c:624
+#: src/compose.c:622
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/_Ferramentas/Editar com editor e_xterno"
 
-#: src/compose.c:628
+#: src/compose.c:626
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Ferramentas/_Assinar (PGP)"
 
-#: src/compose.c:629
+#: src/compose.c:627
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/_Ferramentas/_Encriptar (PGP)"
 
-#: src/compose.c:855
+#: src/compose.c:853
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: o arquivo não existe\n"
 
-#: src/compose.c:954 src/compose.c:1024 src/procmsg.c:1353
+#: src/compose.c:952 src/compose.c:1022 src/procmsg.c:1353
 msgid "Can't get text part\n"
 msgstr "Não foi possível obter o texto\n"
 
-#: src/compose.c:1420
+#: src/compose.c:1418
 msgid "Quote mark format error."
 msgstr "Erro no formato de marca de citação."
 
-#: src/compose.c:1432
+#: src/compose.c:1430
 msgid "Message reply/forward format error."
 msgstr "Erro no formato de mensagem de resposta/encaminhada."
 
-#: src/compose.c:1801
+#: src/compose.c:1799
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "O arquivo %s não existe\n"
 
-#: src/compose.c:1805
+#: src/compose.c:1803
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Não foi possível especificar o tamanho de %s\n"
 
-#: src/compose.c:1809
+#: src/compose.c:1807
 #, c-format
 msgid "File %s is empty."
 msgstr "O arquivo %s está vazio."
 
-#: src/compose.c:1813
+#: src/compose.c:1811
 #, c-format
 msgid "Can't read %s."
 msgstr "Não foi possível ler %s."
 
-#: src/compose.c:1848
+#: src/compose.c:1846
 #, c-format
 msgid "Message: %s"
 msgstr "Mensagem: %s"
 
-#: src/compose.c:1920 src/mimeview.c:560
+#: src/compose.c:1918 src/mimeview.c:560
 msgid "Can't get the part of multipart message."
 msgstr "Não foi possível obter alguma(s) parte(s) dessa mensagem."
 
-#: src/compose.c:2362
+#: src/compose.c:2360
 msgid " [Edited]"
 msgstr " [Editado]"
 
-#: src/compose.c:2364
+#: src/compose.c:2362
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Compondo mensagem%s"
 
-#: src/compose.c:2367
+#: src/compose.c:2365
 #, c-format
 msgid "Compose message%s"
 msgstr "Compondo mensagem%s"
 
-#: src/compose.c:2478
+#: src/compose.c:2476
 msgid "Recipient is not specified."
 msgstr "Destinatário não especificado."
 
-#: src/compose.c:2486
+#: src/compose.c:2484
 msgid "Empty subject"
 msgstr "Sem assunto"
 
-#: src/compose.c:2487
+#: src/compose.c:2485
 msgid "Subject is empty. Send it anyway?"
 msgstr "Assunto em branco. Enviar assim mesmo?"
 
-#: src/compose.c:2538
+#: src/compose.c:2536
 msgid "can't get recipient list."
 msgstr "não pude obter a lista de destinatários."
 
-#: src/compose.c:2558
+#: src/compose.c:2556
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -992,26 +992,26 @@ msgstr ""
 "Conta para envio de mensagem não foi especificada.\n"
 "Por favor selecione uma conta de e-mail antes de enviar."
 
-#: src/compose.c:2572 src/send_message.c:297
+#: src/compose.c:2570 src/send_message.c:297
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Erro ao postar a mensagem para %s ."
 
-#: src/compose.c:2595
+#: src/compose.c:2593
 msgid "Can't save the message to outbox."
 msgstr "Não foi possível armazenar a mensagem na caixa de saída."
 
-#: src/compose.c:2645
+#: src/compose.c:2643
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "Não foi possível obter nenhuma chave associada ao ID selecionado '%s'."
 
-#: src/compose.c:2709 src/compose.c:2965 src/compose.c:3028 src/compose.c:3148
-#: src/utils.c:2365
+#: src/compose.c:2707 src/compose.c:2963 src/compose.c:3026 src/compose.c:3146
+#: src/utils.c:2379
 msgid "can't change file mode\n"
 msgstr "não foi possível modificar as permissões do arquivo\n"
 
-#: src/compose.c:2741
+#: src/compose.c:2739
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1023,11 +1023,11 @@ msgstr ""
 "\n"
 "Enviar como %s mesmo assim?"
 
-#: src/compose.c:2747
+#: src/compose.c:2745
 msgid "Code conversion error"
 msgstr "Erro convertendo codificação"
 
-#: src/compose.c:2816
+#: src/compose.c:2814
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1040,153 +1040,153 @@ msgstr ""
 "\n"
 "Enviar mesmo assim?"
 
-#: src/compose.c:2820
+#: src/compose.c:2818
 msgid "Line length limit"
 msgstr "Limite de comprimento da linha"
 
-#: src/compose.c:3108
+#: src/compose.c:3106
 msgid "can't remove the old message\n"
 msgstr "não posso remover a mensagem antiga\n"
 
-#: src/compose.c:3126
+#: src/compose.c:3124
 msgid "queueing message...\n"
 msgstr "enfileirando mensagem...\n"
 
-#: src/compose.c:3208
+#: src/compose.c:3206
 msgid "can't find queue folder\n"
 msgstr "não foi possível encontrar a pasta da fila\n"
 
-#: src/compose.c:3215
+#: src/compose.c:3213
 msgid "can't queue the message\n"
 msgstr "não foi possível enfileirar a mensagem\n"
 
-#: src/compose.c:3792
+#: src/compose.c:3790
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "Message-ID gerado: %s\n"
 
-#: src/compose.c:3901
+#: src/compose.c:3899
 msgid "Creating compose window...\n"
 msgstr "Criando janela de composição...\n"
 
-#: src/compose.c:3949 src/headerview.c:54 src/summary_search.c:214
+#: src/compose.c:3947 src/headerview.c:54 src/summary_search.c:214
 msgid "From:"
 msgstr "De:"
 
-#: src/compose.c:4021
+#: src/compose.c:4019
 msgid "PGP Sign"
 msgstr "Assinar (PGP)"
 
-#: src/compose.c:4024
+#: src/compose.c:4022
 msgid "PGP Encrypt"
 msgstr "Encriptar (PGP)"
 
-#: src/compose.c:4062 src/compose.c:5001
+#: src/compose.c:4060 src/compose.c:4995
 msgid "MIME type"
 msgstr "Tipo MIME"
 
 #. S_COL_DATE
-#: src/compose.c:4071 src/mimeview.c:192 src/prefs_filter_edit.c:585
+#: src/compose.c:4069 src/mimeview.c:192 src/prefs_filter_edit.c:585
 #: src/prefs_summary_column.c:75 src/select-keys.c:317 src/summaryview.c:4217
 msgid "Size"
 msgstr "Tamanho"
 
-#: src/compose.c:4449 src/mainwindow.c:2224 src/prefs_account.c:719
+#: src/compose.c:4442 src/mainwindow.c:2207 src/prefs_account.c:719
 #: src/prefs_common.c:947
 msgid "Send"
 msgstr "Enviar"
 
-#: src/compose.c:4450
+#: src/compose.c:4443
 msgid "Send message"
 msgstr "Enviar mensagem"
 
-#: src/compose.c:4458
+#: src/compose.c:4451
 msgid "Send later"
 msgstr "Enviar depois"
 
-#: src/compose.c:4459
+#: src/compose.c:4452
 msgid "Put into queue folder and send later"
 msgstr "Pôr na 'fila de saída' e enviar depois"
 
-#: src/compose.c:4467
+#: src/compose.c:4460
 msgid "Draft"
 msgstr "Rascunho"
 
-#: src/compose.c:4468
+#: src/compose.c:4461
 msgid "Save to draft folder"
 msgstr "Salvar na pasta Rascunho"
 
-#: src/compose.c:4478
+#: src/compose.c:4471
 msgid "Insert"
 msgstr "Inserir"
 
-#: src/compose.c:4479
+#: src/compose.c:4472
 msgid "Insert file"
 msgstr "Inserir arquivo"
 
-#: src/compose.c:4487
+#: src/compose.c:4480
 msgid "Attach"
 msgstr "Anexar"
 
-#: src/compose.c:4488
+#: src/compose.c:4481
 msgid "Attach file"
 msgstr "Anexar arquivo"
 
 #. signature
-#: src/compose.c:4498 src/prefs_account.c:1391 src/prefs_common.c:1356
+#: src/compose.c:4491 src/prefs_account.c:1391 src/prefs_common.c:1356
 msgid "Signature"
 msgstr "Assinatura"
 
-#: src/compose.c:4499
+#: src/compose.c:4492
 msgid "Insert signature"
 msgstr "Inserir assinatura"
 
-#: src/compose.c:4508 src/prefs_common.c:1378 src/prefs_common.c:2382
+#: src/compose.c:4501 src/prefs_common.c:1378 src/prefs_common.c:2382
 msgid "Editor"
 msgstr "Editor"
 
-#: src/compose.c:4509
+#: src/compose.c:4502
 msgid "Edit with external editor"
 msgstr "Editar com um editor externo"
 
-#: src/compose.c:4517
+#: src/compose.c:4510
 msgid "Linewrap"
 msgstr "Quebra de linha"
 
-#: src/compose.c:4518
+#: src/compose.c:4511
 msgid "Wrap all long lines"
 msgstr "Quebrar todas as linhas compridas"
 
-#: src/compose.c:4897
+#: src/compose.c:4891
 msgid "Invalid MIME type."
 msgstr "Tipo MIME inválido."
 
-#: src/compose.c:4915
+#: src/compose.c:4909
 msgid "File doesn't exist or is empty."
 msgstr "O arquivo não existe ou está vazio."
 
-#: src/compose.c:4983
+#: src/compose.c:4977
 msgid "Properties"
 msgstr "Propriedades"
 
-#: src/compose.c:5003
+#: src/compose.c:4997
 msgid "Encoding"
 msgstr "Codificação"
 
-#: src/compose.c:5026 src/prefs_folder_item.c:183
+#: src/compose.c:5020 src/prefs_folder_item.c:183
 msgid "Path"
 msgstr "Caminho"
 
-#: src/compose.c:5027
+#: src/compose.c:5021
 msgid "File name"
 msgstr "Nome do arquivo"
 
-#: src/compose.c:5185
+#: src/compose.c:5179
 #, 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:5211
+#: src/compose.c:5205
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1197,71 +1197,71 @@ msgstr ""
 "Deseja matar o processo?\n"
 "Id. do grupo do processo : %d"
 
-#: src/compose.c:5228
+#: src/compose.c:5222
 #, c-format
 msgid "Terminated process group id: %d"
 msgstr "Terminado grupo de processo id.: %d"
 
-#: src/compose.c:5229
+#: src/compose.c:5223
 #, c-format
 msgid "Temporary file: %s"
 msgstr "Arquivo temporário: %s"
 
-#: src/compose.c:5253
+#: src/compose.c:5247
 msgid "Compose: input from monitoring process\n"
 msgstr "Compositor: entrada para monitorar processo\n"
 
 #. failed
-#: src/compose.c:5284
+#: src/compose.c:5278
 msgid "Couldn't exec external editor\n"
 msgstr "Não foi possível executar o editor externo\n"
 
-#: src/compose.c:5288
+#: src/compose.c:5282
 msgid "Couldn't write to file\n"
 msgstr "Não foi possível gravar o arquivo\n"
 
-#: src/compose.c:5290
+#: src/compose.c:5284
 msgid "Pipe read failed\n"
 msgstr "Erro ao ler do pipe\n"
 
-#: src/compose.c:5596 src/compose.c:5604 src/compose.c:5610
+#: src/compose.c:5590 src/compose.c:5598 src/compose.c:5604
 msgid "Can't queue the message."
 msgstr "Não foi possível enfileirar a mensagem."
 
-#: src/compose.c:5701
+#: src/compose.c:5695
 msgid "Select files"
 msgstr "Selecionar arquivos"
 
-#: src/compose.c:5723
+#: src/compose.c:5717
 msgid "Select file"
 msgstr "Selecionar arquivo"
 
-#: src/compose.c:5760
+#: src/compose.c:5754
 msgid "Save message"
 msgstr "Salvar mensagem"
 
-#: src/compose.c:5761
+#: src/compose.c:5755
 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:5763
+#: src/compose.c:5757
 msgid "Close _without saving"
 msgstr "_Fechar sem salvar"
 
-#: src/compose.c:5805
+#: src/compose.c:5799
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Quer aplicar o modelo `%s'?"
 
-#: src/compose.c:5807
+#: src/compose.c:5801
 msgid "Apply template"
 msgstr "Aplicar Modelo"
 
-#: src/compose.c:5808
+#: src/compose.c:5802
 msgid "_Replace"
 msgstr "_Substituir"
 
-#: src/compose.c:5808
+#: src/compose.c:5802
 msgid "_Insert"
 msgstr "_Inserir"
 
@@ -1707,12 +1707,12 @@ msgstr "Configurando informações da pasta...\n"
 msgid "Setting folder info..."
 msgstr "Configurando informações da pasta..."
 
-#: src/folderview.c:805 src/mainwindow.c:3301 src/setup.c:81
+#: src/folderview.c:805 src/mainwindow.c:3272 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Revisando pasta %s%c%s ..."
 
-#: src/folderview.c:809 src/mainwindow.c:3306 src/setup.c:86
+#: src/folderview.c:809 src/mainwindow.c:3277 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Revisando pasta %s ..."
@@ -2034,44 +2034,44 @@ msgstr "Falha na autenticação IMAP4.\n"
 msgid "IMAP4 login failed.\n"
 msgstr "Falha ao logar no servidor IMAP4.\n"
 
-#: src/imap.c:3522
+#: src/imap.c:3528
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "não foi possível copiar a mensagem %s para %s\n"
 
-#: src/imap.c:3529
+#: src/imap.c:3535
 msgid "(sending file...)"
 msgstr "(enviando arquivo...)"
 
-#: src/imap.c:3557
+#: src/imap.c:3563
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "não foi possível anexar a mensagem em %s\n"
 
-#: src/imap.c:3589
+#: src/imap.c:3595
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "não posso copiar %s para %s\n"
 
-#: src/imap.c:3613
+#: src/imap.c:3619
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "erro no comando imap: STORE %s %s\n"
 
-#: src/imap.c:3627
+#: src/imap.c:3633
 msgid "error while imap command: EXPUNGE\n"
 msgstr "erro no comando imap: EXPUNGE\n"
 
-#: src/imap.c:3640
+#: src/imap.c:3646
 msgid "error while imap command: CLOSE\n"
 msgstr "erro no comando imap: CLOSE\n"
 
-#: src/imap.c:3873
+#: src/imap.c:3879
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "o iconv não pode converter UTF-7 para %s\n"
 
-#: src/imap.c:3903
+#: src/imap.c:3909
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "o iconv não pode converter %s para UTF-7\n"
@@ -2174,7 +2174,7 @@ msgstr "Importar arquivo LDIF para o Livro de Endereços"
 msgid "Prev"
 msgstr "Anterior"
 
-#: src/importldif.c:768 src/mainwindow.c:2321
+#: src/importldif.c:768 src/mainwindow.c:2303
 msgid "Next"
 msgstr "Próxima"
 
@@ -2527,615 +2527,615 @@ msgstr ""
 "As configurações antigas foram encontradas.\n"
 "Deseja migrar para o novo formato?"
 
-#: src/mainwindow.c:471
+#: src/mainwindow.c:462
 msgid "/_File/_Folder"
 msgstr "/_Arquivo/_Pasta"
 
-#: src/mainwindow.c:472
+#: src/mainwindow.c:463
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "_Arquivo/_Pasta/Criar _nova pasta ..."
 
-#: src/mainwindow.c:474
+#: src/mainwindow.c:465
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/_Arquivo/_Pasta/_Renomear pasta..."
 
-#: src/mainwindow.c:475
+#: src/mainwindow.c:466
 msgid "/_File/_Folder/_Move folder..."
 msgstr "/_Arquivo/_Pasta/_Mover pasta..."
 
-#: src/mainwindow.c:476
+#: src/mainwindow.c:467
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/_Arquivo/_Pasta/A_pagar pasta"
 
-#: src/mainwindow.c:477
+#: src/mainwindow.c:468
 msgid "/_File/_Mailbox"
 msgstr "/_Arquivo/_Caixa de correio"
 
-#: src/mainwindow.c:478
+#: src/mainwindow.c:469
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/_Arquivo/_Caixa de correio/_Adicionar caixa de correio..."
 
-#: src/mainwindow.c:479
+#: src/mainwindow.c:470
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/_Arquivo/_Caixa de correio/Remover _caixa de correio"
 
-#: src/mainwindow.c:480 src/mainwindow.c:485
+#: src/mainwindow.c:471 src/mainwindow.c:476
 msgid "/_File/_Mailbox/---"
 msgstr "/_Arquivo/_Caixa de correio/---"
 
-#: src/mainwindow.c:481
+#: src/mainwindow.c:472
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "/_Arquivo/_Caixa de correio/_Procurar por mensagens novas"
 
-#: src/mainwindow.c:483
+#: src/mainwindow.c:474
 msgid "/_File/_Mailbox/Check for new messages in _all mailboxes"
 msgstr "/_Arquivo/_Procurar por mensagens novas em _todas as caixas de correio"
 
-#: src/mainwindow.c:486
+#: src/mainwindow.c:477
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "/_Arquivo/_Caixa de correio/_Reconstruir árvore de pastas"
 
-#: src/mainwindow.c:489
+#: src/mainwindow.c:480
 msgid "/_File/_Import mbox file..."
 msgstr "/_Arquivo/I_mportar arquivo mbox..."
 
-#: src/mainwindow.c:490
+#: src/mainwindow.c:481
 msgid "/_File/_Export to mbox file..."
 msgstr "/_Arquivo/_Exportar para arquivo mbox..."
 
-#: src/mainwindow.c:492
+#: src/mainwindow.c:483
 msgid "/_File/Empty all _trash"
 msgstr "/_Arquivo/Esvaziar _lixeira"
 
-#: src/mainwindow.c:494 src/messageview.c:138
+#: src/mainwindow.c:485 src/messageview.c:138
 msgid "/_File/_Save as..."
 msgstr "/_Arquivo/_Salvar como..."
 
-#: src/mainwindow.c:495 src/messageview.c:139
+#: src/mainwindow.c:486 src/messageview.c:139
 msgid "/_File/_Print..."
 msgstr "/_Arquivo/Im_primir"
 
-#: src/mainwindow.c:497
+#: src/mainwindow.c:488
 msgid "/_File/_Work offline"
 msgstr "/_Arquivo/_Trabalhar desconectado"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:500
+#: src/mainwindow.c:491
 msgid "/_File/E_xit"
 msgstr "/_Arquivo/Sai_r"
 
-#: src/mainwindow.c:505
+#: src/mainwindow.c:496
 msgid "/_Edit/Select _thread"
 msgstr "/_Editar/_Selecionar t_hread"
 
-#: src/mainwindow.c:507 src/messageview.c:147
+#: src/mainwindow.c:498 src/messageview.c:147
 msgid "/_Edit/_Find in current message..."
 msgstr "/_Editar/_Encontrar na mensagem atual..."
 
-#: src/mainwindow.c:509
+#: src/mainwindow.c:500
 msgid "/_Edit/_Search messages..."
 msgstr "/_Editar/_Procurar mensagens..."
 
-#: src/mainwindow.c:512
+#: src/mainwindow.c:503
 msgid "/_View/Show or hi_de"
 msgstr "/E_xibir/_Mostrar ou esconder"
 
-#: src/mainwindow.c:513
+#: src/mainwindow.c:504
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/E_xibir/_Mostrar ou esconder/_Árvore de pastas"
 
-#: src/mainwindow.c:515
+#: src/mainwindow.c:506
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/E_xibir/_Mostrar ou esconder/Ver _Mensagens"
 
-#: src/mainwindow.c:517
+#: src/mainwindow.c:508
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/E_xibir/_Mostrar ou esconder/_Barra de Ferramentas"
 
-#: src/mainwindow.c:519
+#: src/mainwindow.c:510
 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:521
+#: src/mainwindow.c:512
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/E_xibir/_Mostrar ou esconder/_Barra de Ferramentas/Í_cones"
 
-#: src/mainwindow.c:523
+#: src/mainwindow.c:514
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/E_xibir/_Mostrar ou esconder/_Barra de Ferramentas/_Texto"
 
-#: src/mainwindow.c:525
+#: src/mainwindow.c:516
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/E_xibir/_Mostrar ou esconder/_Barra de Ferramentas/_Nenhum"
 
-#: src/mainwindow.c:527
+#: src/mainwindow.c:518
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/E_xibir/_Mostrar ou esconder/Barra de _estado"
 
-#: src/mainwindow.c:530
+#: src/mainwindow.c:521
 msgid "/_View/Separate f_older tree"
 msgstr "/E_xibir/Á_rvore de pastas separadas"
 
-#: src/mainwindow.c:531
+#: src/mainwindow.c:522
 msgid "/_View/Separate _message view"
 msgstr "/E_xibir/Visualização separada da _mensagem"
 
-#: src/mainwindow.c:533
+#: src/mainwindow.c:524
 msgid "/_View/_Sort"
 msgstr "/E_xibir/_Ordenação"
 
-#: src/mainwindow.c:534
+#: src/mainwindow.c:525
 msgid "/_View/_Sort/by _number"
 msgstr "/E_xibir/_Ordenar/por _número"
 
-#: src/mainwindow.c:535
+#: src/mainwindow.c:526
 msgid "/_View/_Sort/by s_ize"
 msgstr "/E_xibir/_Ordenar/por _tamanho"
 
-#: src/mainwindow.c:536
+#: src/mainwindow.c:527
 msgid "/_View/_Sort/by _date"
 msgstr "/E_xibir/_Ordenar/por _data"
 
-#: src/mainwindow.c:537
+#: src/mainwindow.c:528
 msgid "/_View/_Sort/by _from"
 msgstr "/E_xibir/_Ordenar/por _remetente"
 
-#: src/mainwindow.c:538
+#: src/mainwindow.c:529
 msgid "/_View/_Sort/by _recipient"
 msgstr "/E_xibir/_Ordenar/por _destinatário"
 
-#: src/mainwindow.c:539
+#: src/mainwindow.c:530
 msgid "/_View/_Sort/by _subject"
 msgstr "/E_xibir/_Ordenar/por as_sunto"
 
-#: src/mainwindow.c:540
+#: src/mainwindow.c:531
 msgid "/_View/_Sort/by _color label"
 msgstr "/E_xibir/_Ordenar/por _etiqueta de cor"
 
-#: src/mainwindow.c:542
+#: src/mainwindow.c:533
 msgid "/_View/_Sort/by _mark"
 msgstr "/E_xibir/_Ordenar/por _marca"
 
-#: src/mainwindow.c:543
+#: src/mainwindow.c:534
 msgid "/_View/_Sort/by _unread"
 msgstr "/E_xibir/_Ordenar/por _não lidas"
 
-#: src/mainwindow.c:544
+#: src/mainwindow.c:535
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/E_xibir/_Ordenar/por _anexos"
 
-#: src/mainwindow.c:546
+#: src/mainwindow.c:537
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/E_xibir/_Ordenar/_Não ordenar"
 
-#: src/mainwindow.c:547 src/mainwindow.c:550
+#: src/mainwindow.c:538 src/mainwindow.c:541
 msgid "/_View/_Sort/---"
 msgstr "/E_xibir/_Ordenar/---"
 
-#: src/mainwindow.c:548
+#: src/mainwindow.c:539
 msgid "/_View/_Sort/Ascending"
 msgstr "/E_xibir/_Ordenar/Crescente"
 
-#: src/mainwindow.c:549
+#: src/mainwindow.c:540
 msgid "/_View/_Sort/Descending"
 msgstr "/E_xibir/_Ordenar/Decrescente"
 
-#: src/mainwindow.c:551
+#: src/mainwindow.c:542
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/E_xibir/_Ordenar/Atrair _por assunto"
 
-#: src/mainwindow.c:553
+#: src/mainwindow.c:544
 msgid "/_View/Th_read view"
 msgstr "/E_xibir/Visão de th_read"
 
-#: src/mainwindow.c:554
+#: src/mainwindow.c:545
 msgid "/_View/E_xpand all threads"
 msgstr "/E_xibir/E_xpandir todas as threads"
 
-#: src/mainwindow.c:555
+#: src/mainwindow.c:546
 msgid "/_View/Co_llapse all threads"
 msgstr "/E_xibir/_Fechar todas as threads"
 
-#: src/mainwindow.c:556
+#: src/mainwindow.c:547
 msgid "/_View/Set display _item..."
 msgstr "/E_xibir/Elementos _visíveis..."
 
-#: src/mainwindow.c:559
+#: src/mainwindow.c:550
 msgid "/_View/_Go to"
 msgstr "/E_xibir/Ir _Para"
 
-#: src/mainwindow.c:560
+#: src/mainwindow.c:551
 msgid "/_View/_Go to/_Prev message"
 msgstr "/E_xibir/Ir _Para/Mensagem a_nterior"
 
-#: src/mainwindow.c:561
+#: src/mainwindow.c:552
 msgid "/_View/_Go to/_Next message"
 msgstr "/E_xibir/Ir _Para/_Próxima mensagem"
 
-#: src/mainwindow.c:562 src/mainwindow.c:567 src/mainwindow.c:570
-#: src/mainwindow.c:575 src/mainwindow.c:580
+#: src/mainwindow.c:553 src/mainwindow.c:558 src/mainwindow.c:561
+#: src/mainwindow.c:566 src/mainwindow.c:571
 msgid "/_View/_Go to/---"
 msgstr "/E_xibir/Ir _Para/---"
 
-#: src/mainwindow.c:563
+#: src/mainwindow.c:554
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/E_xibir/Ir _Para/Anterior não _lida"
 
-#: src/mainwindow.c:565
+#: src/mainwindow.c:556
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/E_xibir/Ir _Para/Próxima não l_ida"
 
-#: src/mainwindow.c:568
+#: src/mainwindow.c:559
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/E_xibir/Ir _Para/Mensagem n_ova anterior"
 
-#: src/mainwindow.c:569
+#: src/mainwindow.c:560
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/E_xibir/Ir _Para/Próxima mensagem _nova"
 
-#: src/mainwindow.c:571
+#: src/mainwindow.c:562
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/E_xibir/Ir _Para/Mensagem marcada a_nterior"
 
-#: src/mainwindow.c:573
+#: src/mainwindow.c:564
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/E_xibir/Ir _Para/Próxima mensagem ma_rcada"
 
-#: src/mainwindow.c:576
+#: src/mainwindow.c:567
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/E_xibir/Ir _Para/Mensagem eti_quetada anterior"
 
-#: src/mainwindow.c:578
+#: src/mainwindow.c:569
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/E_xibir/Ir _Para/Próxima mensagem etique_tada"
 
-#: src/mainwindow.c:581
+#: src/mainwindow.c:572
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/E_xibir/Ir _Para/Outra _pasta..."
 
-#: src/mainwindow.c:590 src/messageview.c:158
+#: src/mainwindow.c:581 src/messageview.c:158
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/E_xibir/_Codificação de caracteres/_Detectar automaticamente"
 
-#: src/mainwindow.c:641 src/messageview.c:202
+#: src/mainwindow.c:632 src/messageview.c:202
 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:643 src/messageview.c:204
+#: src/mainwindow.c:634 src/messageview.c:204
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/E_xibir/_Codificação de caracteres/Japonês (_EUC-JP)"
 
-#: src/mainwindow.c:645 src/messageview.c:206
+#: src/mainwindow.c:636 src/messageview.c:206
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/E_xibir/_Codificação de caracteres/Japonês (_Shift__JIS)"
 
-#: src/mainwindow.c:657 src/messageview.c:217
+#: src/mainwindow.c:648 src/messageview.c:217
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/E_xibir/_Codificação de caracteres/Chinês (ISO-2022-_CN)"
 
-#: src/mainwindow.c:663 src/messageview.c:222
+#: src/mainwindow.c:654 src/messageview.c:222
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/E_xibir/_Codificação de caracteres/Coreano (ISO-2022-KR)"
 
-#: src/mainwindow.c:676 src/summaryview.c:401
+#: src/mainwindow.c:667 src/summaryview.c:401
 msgid "/_View/Open in new _window"
 msgstr "/E_xibir/Abrir em uma n_ova janela"
 
-#: src/mainwindow.c:677 src/messageview.c:234
+#: src/mainwindow.c:668 src/messageview.c:234
 msgid "/_View/Mess_age source"
 msgstr "/E_xibir/Ver _fonte"
 
-#: src/mainwindow.c:678 src/messageview.c:235
+#: src/mainwindow.c:669 src/messageview.c:235
 msgid "/_View/Show all _header"
 msgstr "/E_xibir/_Mostrar todos os cabeçalhos"
 
-#: src/mainwindow.c:680
+#: src/mainwindow.c:671
 msgid "/_View/_Update summary"
 msgstr "/E_xibir/A_tualizar sumário"
 
-#: src/mainwindow.c:682 src/messageview.c:237
+#: src/mainwindow.c:673 src/messageview.c:237
 msgid "/_Message"
 msgstr "/_Mensagem"
 
-#: src/mainwindow.c:683
+#: src/mainwindow.c:674
 msgid "/_Message/Recei_ve"
 msgstr "/_Mensagem/_Receber"
 
-#: src/mainwindow.c:684
+#: src/mainwindow.c:675
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/_Mensagem/_Receber/Receber da conta _atual"
 
-#: src/mainwindow.c:686
+#: src/mainwindow.c:677
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/_Mensagem/_Receber/Receber de _todas as contas"
 
-#: src/mainwindow.c:688
+#: src/mainwindow.c:679
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/_Mensagem/_Receber/_Cancelar recebimento"
 
-#: src/mainwindow.c:690
+#: src/mainwindow.c:681
 msgid "/_Message/Recei_ve/---"
 msgstr "/_Mensagem/_Receber/---"
 
-#: src/mainwindow.c:691
+#: src/mainwindow.c:682
 msgid "/_Message/_Send queued messages"
 msgstr "/_Mensagem/Enviar mensagens da _fila"
 
-#: src/mainwindow.c:692 src/mainwindow.c:694 src/mainwindow.c:701
-#: src/mainwindow.c:706 src/mainwindow.c:710 src/mainwindow.c:719
-#: src/mainwindow.c:722 src/messageview.c:240 src/messageview.c:248
+#: src/mainwindow.c:683 src/mainwindow.c:685 src/mainwindow.c:692
+#: src/mainwindow.c:697 src/mainwindow.c:701 src/mainwindow.c:710
+#: src/mainwindow.c:713 src/messageview.c:240 src/messageview.c:248
 #: src/messageview.c:253
 msgid "/_Message/---"
 msgstr "/_Mensagem/---"
 
-#: src/mainwindow.c:693 src/messageview.c:238
+#: src/mainwindow.c:684 src/messageview.c:238
 msgid "/_Message/Compose _new message"
 msgstr "/_Mensagem/Compor _nova mensagem"
 
-#: src/mainwindow.c:695 src/messageview.c:241
+#: src/mainwindow.c:686 src/messageview.c:241
 msgid "/_Message/_Reply"
 msgstr "/_Mensagem/_Responder"
 
-#: src/mainwindow.c:696
+#: src/mainwindow.c:687
 msgid "/_Message/Repl_y to"
 msgstr "/_Mensagem/_Responder para"
 
-#: src/mainwindow.c:697 src/messageview.c:242
+#: src/mainwindow.c:688 src/messageview.c:242
 msgid "/_Message/Repl_y to/_all"
 msgstr "/Mensagem/Responder para/_todos"
 
-#: src/mainwindow.c:698 src/messageview.c:244
+#: src/mainwindow.c:689 src/messageview.c:244
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Mensagem/Responder para/_quem enviou"
 
-#: src/mainwindow.c:699 src/messageview.c:246
+#: src/mainwindow.c:690 src/messageview.c:246
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/Mensagem/Responder para/_lista"
 
-#: src/mainwindow.c:702 src/messageview.c:249
+#: src/mainwindow.c:693 src/messageview.c:249
 msgid "/_Message/_Forward"
 msgstr "/_Mensagem/Encam_inhar"
 
-#: src/mainwindow.c:703 src/messageview.c:250
+#: src/mainwindow.c:694 src/messageview.c:250
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Mensagem/Encaminhar como ane_xo"
 
-#: src/mainwindow.c:705 src/messageview.c:252
+#: src/mainwindow.c:696 src/messageview.c:252
 msgid "/_Message/Redirec_t"
 msgstr "/_Mensagem/Redire_cionar"
 
-#: src/mainwindow.c:707
+#: src/mainwindow.c:698
 msgid "/_Message/M_ove..."
 msgstr "/_Mensagem/Mo_ver..."
 
-#: src/mainwindow.c:708
+#: src/mainwindow.c:699
 msgid "/_Message/_Copy..."
 msgstr "/_Mensagem/_Copiar..."
 
-#: src/mainwindow.c:709
+#: src/mainwindow.c:700
 msgid "/_Message/_Delete"
 msgstr "/_Mensagem/_Apagar"
 
-#: src/mainwindow.c:711
+#: src/mainwindow.c:702
 msgid "/_Message/_Mark"
 msgstr "/_Mensagem/_Marcar"
 
-#: src/mainwindow.c:712
+#: src/mainwindow.c:703
 msgid "/_Message/_Mark/_Mark"
 msgstr "/_Mensagem/_Marcar/_Marcar"
 
-#: src/mainwindow.c:713
+#: src/mainwindow.c:704
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/_Mensagem/_Marcar/_Desmarcar"
 
-#: src/mainwindow.c:714
+#: src/mainwindow.c:705
 msgid "/_Message/_Mark/---"
 msgstr "/_Mensagem/_Marcar/---"
 
-#: src/mainwindow.c:715
+#: src/mainwindow.c:706
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/_Mensagem/_Marcar/Marcar como _não lida"
 
-#: src/mainwindow.c:716
+#: src/mainwindow.c:707
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/_Mensagem/_Marcar/Marcar como l_ida"
 
-#: src/mainwindow.c:718
+#: src/mainwindow.c:709
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/_Mensagem/_Marcar/Marcar todas como _lidas"
 
-#: src/mainwindow.c:720
+#: src/mainwindow.c:711
 msgid "/_Message/Set as _junk mail"
 msgstr "/_Mensagem/Classificar como _spam"
 
-#: src/mainwindow.c:721
+#: src/mainwindow.c:712
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/_Mensagem/Classificar como _não-spam"
 
-#: src/mainwindow.c:723 src/messageview.c:254
+#: src/mainwindow.c:714 src/messageview.c:254
 msgid "/_Message/Re-_edit"
 msgstr "/_Mensagem/Ed_itar novamente"
 
-#: src/mainwindow.c:727
+#: src/mainwindow.c:718
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/_Ferramentas/Adicionar remetente ao catálogo de _endereços"
 
-#: src/mainwindow.c:730
+#: src/mainwindow.c:721
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/_Ferramentas/Filtrar _todas as mensagens na pasta"
 
-#: src/mainwindow.c:732
+#: src/mainwindow.c:723
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Ferramentas/_Filtrar mensagens selecionadas"
 
-#: src/mainwindow.c:734 src/messageview.c:261
+#: src/mainwindow.c:725 src/messageview.c:261
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Ferramentas/_Criar regra de filtro"
 
-#: src/mainwindow.c:735 src/messageview.c:263
+#: src/mainwindow.c:726 src/messageview.c:263
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Ferramentas/_Criar regra de filtro/_Automaticamente"
 
-#: src/mainwindow.c:737 src/messageview.c:265
+#: src/mainwindow.c:728 src/messageview.c:265
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Ferramentas/_Criar regra de filtro/pelo _remtente"
 
-#: src/mainwindow.c:739 src/messageview.c:267
+#: src/mainwindow.c:730 src/messageview.c:267
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Ferramentas/_Criar regra de filtro/pelo _destinatário"
 
-#: src/mainwindow.c:741 src/messageview.c:269
+#: src/mainwindow.c:732 src/messageview.c:269
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Ferramentas/_Criar regra de filtro/pelo A_ssunto"
 
-#: src/mainwindow.c:744
+#: src/mainwindow.c:735
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/_Ferramentas/Filtrar spam na _pasta"
 
-#: src/mainwindow.c:746
+#: src/mainwindow.c:737
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/_Ferramentas/Filtrar _spam nas mensagens selecionadas"
 
-#: src/mainwindow.c:751
+#: src/mainwindow.c:742
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/_Ferramentas/_Apagar mensagens duplicadas"
 
-#: src/mainwindow.c:754
+#: src/mainwindow.c:745
 msgid "/_Tools/E_xecute"
 msgstr "/_Ferramentas/E_xecutar"
 
-#: src/mainwindow.c:756
+#: src/mainwindow.c:747
 msgid "/_Tools/_Log window"
 msgstr "/_Ferramentas/_Janela de log"
 
-#: src/mainwindow.c:758
+#: src/mainwindow.c:749
 msgid "/_Configuration"
 msgstr "/_Configuração"
 
-#: src/mainwindow.c:759
+#: src/mainwindow.c:750
 msgid "/_Configuration/_Common preferences..."
 msgstr "/_Configuração/_Preferências comuns..."
 
-#: src/mainwindow.c:761
+#: src/mainwindow.c:752
 msgid "/_Configuration/_Filter setting..."
 msgstr "/_Configuração/Configuração de _filtros..."
 
-#: src/mainwindow.c:763
+#: src/mainwindow.c:754
 msgid "/_Configuration/_Template..."
 msgstr "/_Configuração/_Modelo..."
 
-#: src/mainwindow.c:764
+#: src/mainwindow.c:755
 msgid "/_Configuration/_Actions..."
 msgstr "/_Configuração/_Ações..."
 
-#: src/mainwindow.c:765
+#: src/mainwindow.c:756
 msgid "/_Configuration/---"
 msgstr "/_Configuração/---"
 
-#: src/mainwindow.c:766
+#: src/mainwindow.c:757
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Configuração/Preferências da conta _atual..."
 
-#: src/mainwindow.c:768
+#: src/mainwindow.c:759
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Configuração/Criar uma _nova conta..."
 
-#: src/mainwindow.c:770
+#: src/mainwindow.c:761
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Configuração/_Editar contas..."
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:763
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Configuração/_Mudar conta atual"
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:767
 msgid "/_Help/_Manual"
 msgstr "/_Ajuda/_Manual"
 
-#: src/mainwindow.c:777
+#: src/mainwindow.c:768
 msgid "/_Help/_Manual/_English"
 msgstr "/_Ajuda/_Manual/_Inglês"
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:769
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/_Ajuda/_Manual/_Japonês"
 
-#: src/mainwindow.c:779
+#: src/mainwindow.c:770
 msgid "/_Help/_FAQ"
 msgstr "/_Ajuda/_FAQ"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:771
 msgid "/_Help/_FAQ/_English"
 msgstr "/_Ajuda/_FAQ/_Inglês"
 
-#: src/mainwindow.c:781
+#: src/mainwindow.c:772
 msgid "/_Help/_FAQ/_German"
 msgstr "/_Ajuda/_FAQ/_Alemão"
 
-#: src/mainwindow.c:782
+#: src/mainwindow.c:773
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/_Ajuda/_FAQ/_Espanhol"
 
-#: src/mainwindow.c:783
+#: src/mainwindow.c:774
 msgid "/_Help/_FAQ/_French"
 msgstr "/_Ajuda/_FAQ/_Francês"
 
-#: src/mainwindow.c:784
+#: src/mainwindow.c:775
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/_Ajuda/_FAQ/_Italiano"
 
-#: src/mainwindow.c:785
+#: src/mainwindow.c:776
 msgid "/_Help/---"
 msgstr "/_Ajuda/---"
 
-#: src/mainwindow.c:825
+#: src/mainwindow.c:816
 msgid "Creating main window...\n"
 msgstr "Criando janela principal...\n"
 
-#: src/mainwindow.c:987
+#: src/mainwindow.c:973
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "MainWindow: falhou ao alocar cores %d\n"
 
-#: src/mainwindow.c:1071 src/summaryview.c:2020 src/summaryview.c:2105
+#: src/mainwindow.c:1057 src/summaryview.c:2020 src/summaryview.c:2105
 #: src/summaryview.c:3342 src/summaryview.c:3415 src/summaryview.c:3728
 msgid "done.\n"
 msgstr "Pronto.\n"
 
-#: src/mainwindow.c:1196 src/mainwindow.c:1237 src/mainwindow.c:1265
+#: src/mainwindow.c:1182 src/mainwindow.c:1223 src/mainwindow.c:1251
 msgid "Untitled"
 msgstr "Sem título"
 
-#: src/mainwindow.c:1266
+#: src/mainwindow.c:1252
 msgid "none"
 msgstr "nenhuma"
 
-#: src/mainwindow.c:1316
+#: src/mainwindow.c:1302
 #, 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:1536
+#: src/mainwindow.c:1522
 msgid "Offline"
 msgstr "Desconectado"
 
-#: src/mainwindow.c:1537
+#: src/mainwindow.c:1523
 msgid "You are offline. Go online?"
 msgstr "Você está desconectado. Conectar?"
 
-#: src/mainwindow.c:1551
+#: src/mainwindow.c:1537
 msgid "Empty all trash"
 msgstr "Esvaziar lixeira"
 
-#: src/mainwindow.c:1552
+#: src/mainwindow.c:1538
 msgid "Empty messages in all trash?"
 msgstr "Limpar todas as mensagens da lixeira?"
 
-#: src/mainwindow.c:1580
+#: src/mainwindow.c:1566
 msgid "Add mailbox"
 msgstr "Adicionar caixa de correio"
 
-#: src/mainwindow.c:1581
+#: src/mainwindow.c:1567
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3145,16 +3145,16 @@ msgstr ""
 "Se uma caixa de correio existente é especificada, ela será\n"
 "mapeada automaticamente."
 
-#: src/mainwindow.c:1587
+#: src/mainwindow.c:1573
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "A caixa de correio `%s' já existe."
 
-#: src/mainwindow.c:1592 src/setup.c:57
+#: src/mainwindow.c:1578 src/setup.c:57
 msgid "Mailbox"
 msgstr "Correio"
 
-#: src/mainwindow.c:1598 src/setup.c:63
+#: src/mainwindow.c:1584 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3164,149 +3164,149 @@ msgstr ""
 "Talvez alguns arquivos já existam, ou você não tem permissão para escrever "
 "lá."
 
-#: src/mainwindow.c:1989
+#: src/mainwindow.c:1975
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Visão de Pastas"
 
-#: src/mainwindow.c:2009 src/messageview.c:368
+#: src/mainwindow.c:1995 src/messageview.c:368
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Visão de Mensagens"
 
-#: src/mainwindow.c:2156 src/summaryview.c:370
+#: src/mainwindow.c:2142 src/summaryview.c:370
 msgid "/_Reply"
 msgstr "/_Responder"
 
-#: src/mainwindow.c:2157
+#: src/mainwindow.c:2143
 msgid "/Reply to _all"
 msgstr "/Responder para _todos"
 
-#: src/mainwindow.c:2158
+#: src/mainwindow.c:2144
 msgid "/Reply to _sender"
 msgstr "/Responder para o _remetente"
 
-#: src/mainwindow.c:2159
+#: src/mainwindow.c:2145
 msgid "/Reply to mailing _list"
 msgstr "/Responder para a /_lista"
 
-#: src/mainwindow.c:2164 src/summaryview.c:377
+#: src/mainwindow.c:2150 src/summaryview.c:377
 msgid "/_Forward"
 msgstr "/En_caminhar"
 
-#: src/mainwindow.c:2165 src/summaryview.c:378
+#: src/mainwindow.c:2151 src/summaryview.c:378
 msgid "/For_ward as attachment"
 msgstr "/Encaminhar como ane_xo"
 
-#: src/mainwindow.c:2166 src/summaryview.c:379
+#: src/mainwindow.c:2152 src/summaryview.c:379
 msgid "/Redirec_t"
 msgstr "/Re_direcionar"
 
-#: src/mainwindow.c:2205
+#: src/mainwindow.c:2188
 msgid "Get"
 msgstr "Baixar"
 
-#: src/mainwindow.c:2206
+#: src/mainwindow.c:2189
 msgid "Incorporate new mail"
 msgstr "Incorporar mensagens novas"
 
-#: src/mainwindow.c:2213
+#: src/mainwindow.c:2196
 msgid "Get all"
 msgstr "Baixar tudo"
 
-#: src/mainwindow.c:2214
+#: src/mainwindow.c:2197
 msgid "Incorporate new mail of all accounts"
 msgstr "Incorporar novas mensagens de todas as contas"
 
-#: src/mainwindow.c:2225
+#: src/mainwindow.c:2208
 msgid "Send queued message(s)"
 msgstr "Enviar Mensagem(s) da fila"
 
-#: src/mainwindow.c:2235 src/prefs_account.c:721 src/prefs_common.c:949
+#: src/mainwindow.c:2218 src/prefs_account.c:721 src/prefs_common.c:949
 #: src/prefs_folder_item.c:137
 msgid "Compose"
 msgstr "Escrever"
 
-#: src/mainwindow.c:2236
+#: src/mainwindow.c:2219
 msgid "Compose new message"
 msgstr "Escrever nova mensagem"
 
-#: src/mainwindow.c:2244 src/prefs_common.c:1448
+#: src/mainwindow.c:2227 src/prefs_common.c:1448
 msgid "Reply"
 msgstr "Responder"
 
-#: src/mainwindow.c:2245 src/mainwindow.c:2258
+#: src/mainwindow.c:2228 src/mainwindow.c:2241
 msgid "Reply to the message"
 msgstr "Responder à Mensagem"
 
-#: src/mainwindow.c:2263
+#: src/mainwindow.c:2245
 msgid "Reply all"
 msgstr "Responder todas"
 
-#: src/mainwindow.c:2264
+#: src/mainwindow.c:2246
 msgid "Reply to all"
 msgstr "Responder para todos"
 
-#: src/mainwindow.c:2272 src/prefs_filter_edit.c:741
+#: src/mainwindow.c:2254 src/prefs_filter_edit.c:741
 msgid "Forward"
 msgstr "Encaminhar"
 
-#: src/mainwindow.c:2273 src/mainwindow.c:2286
+#: src/mainwindow.c:2255 src/mainwindow.c:2268
 msgid "Forward the message"
 msgstr "Encaminhar a mensagem"
 
-#: src/mainwindow.c:2293
+#: src/mainwindow.c:2275
 msgid "Delete the message"
 msgstr "Apagar a mensagem"
 
-#: src/mainwindow.c:2301 src/prefs_common.c:1988
+#: src/mainwindow.c:2283 src/prefs_common.c:1988
 msgid "Junk"
 msgstr "Spam"
 
-#: src/mainwindow.c:2302
+#: src/mainwindow.c:2284
 msgid "Set as junk mail"
 msgstr "Marcar como spam"
 
-#: src/mainwindow.c:2311
+#: src/mainwindow.c:2293
 msgid "Execute"
 msgstr "Executar"
 
-#: src/mainwindow.c:2312
+#: src/mainwindow.c:2294
 msgid "Execute marked process"
 msgstr "Executar os processos marcados"
 
-#: src/mainwindow.c:2322
+#: src/mainwindow.c:2304
 msgid "Next unread message"
 msgstr "Próxima mensagem não lida"
 
-#: src/mainwindow.c:2334
+#: src/mainwindow.c:2316
 msgid "Prefs"
 msgstr "Preferências"
 
-#: src/mainwindow.c:2335
+#: src/mainwindow.c:2317
 msgid "Common preferences"
 msgstr "Preferências comuns"
 
-#: src/mainwindow.c:2343 src/prefs_folder_item.c:261
+#: src/mainwindow.c:2325 src/prefs_folder_item.c:261
 #: src/prefs_folder_item.c:272 src/progressdialog.c:128
 msgid "Account"
 msgstr "Conta"
 
-#: src/mainwindow.c:2344
+#: src/mainwindow.c:2326
 msgid "Account setting"
 msgstr "Preferências da conta"
 
-#: src/mainwindow.c:2527
+#: src/mainwindow.c:2498
 msgid "You are offline. Click the icon to go online."
 msgstr "Você está desconectado. Clique no ícone para conectar."
 
-#: src/mainwindow.c:2538
+#: src/mainwindow.c:2509
 msgid "You are online. Click the icon to go offline."
 msgstr "Você está conectado. Clique no ícone para desconectar."
 
-#: src/mainwindow.c:2731
+#: src/mainwindow.c:2702
 msgid "Exit"
 msgstr "Sair"
 
-#: src/mainwindow.c:2731
+#: src/mainwindow.c:2702
 msgid "Exit this program?"
 msgstr "Sair do programa?"
 
@@ -5506,11 +5506,11 @@ msgstr "Criando diálogo de progresso...\n"
 msgid "Status"
 msgstr "Status"
 
-#: src/recv.c:113
+#: src/recv.c:112
 msgid "error occurred while retrieving data.\n"
 msgstr "ocorreu um erro enquanto os dados eram obtidos.\n"
 
-#: src/recv.c:155 src/recv.c:197 src/recv.c:213
+#: src/recv.c:154 src/recv.c:196 src/recv.c:211
 msgid "Can't write to file.\n"
 msgstr "Não foi possível gravar no arquivo.\n"
 
@@ -6243,7 +6243,7 @@ msgstr "%.2fMB"
 msgid "%.2fGB"
 msgstr "%.2fGB"
 
-#: src/utils.c:2372 src/utils.c:2496
+#: src/utils.c:2386 src/utils.c:2510
 #, c-format
 msgid "writing to %s failed.\n"
 msgstr "erro ao gravar em %s.\n"
diff --git a/po/ro.po b/po/ro.po
index d0dd9d63..a4011472 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-08-09 18:08+0900\n"
+"POT-Creation-Date: 2005-08-22 17:22+0900\n"
 "PO-Revision-Date: 2000-08-28\n"
 "Last-Translator: Little Dragon <littledragon@altern.org>\n"
 "Language-Team: Little Dragon <littledragon@altern.org>\n"
@@ -101,7 +101,7 @@ msgstr ""
 "mesajelor de comanda `Ia tot'."
 
 #: src/account.c:691 src/addressadd.c:192 src/addressbook.c:490
-#: src/compose.c:4081 src/editaddress.c:200 src/editaddress.c:942
+#: src/compose.c:4079 src/editaddress.c:200 src/editaddress.c:942
 #: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:265
 #: src/editjpilot.c:271 src/editldap.c:307 src/editvcard.c:184
 #: src/mimeview.c:201 src/prefs_filter.c:258 src/prefs_folder_item.c:170
@@ -234,7 +234,7 @@ msgstr ""
 msgid "Add Address to Book"
 msgstr "Adăugare în agendă"
 
-#: src/addressadd.c:202 src/compose.c:4528 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4521 src/editaddress.c:201
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "Adresă"
@@ -248,7 +248,7 @@ msgstr "Observaţii"
 msgid "Select Address Book Folder"
 msgstr "Selectaţi un director"
 
-#: src/addressbook.c:336 src/compose.c:495 src/mainwindow.c:470
+#: src/addressbook.c:336 src/compose.c:493 src/mainwindow.c:461
 #: src/messageview.c:137
 msgid "/_File"
 msgstr "/_Fişier"
@@ -269,10 +269,10 @@ msgstr "/_Fişier/_JPilot nou"
 msgid "/_File/New _Server"
 msgstr "/_Fişier/Server _LDAP nou"
 
-#: src/addressbook.c:345 src/addressbook.c:348 src/compose.c:500
-#: src/compose.c:505 src/compose.c:509 src/mainwindow.c:488
-#: src/mainwindow.c:491 src/mainwindow.c:493 src/mainwindow.c:496
-#: src/mainwindow.c:498 src/messageview.c:140
+#: src/addressbook.c:345 src/addressbook.c:348 src/compose.c:498
+#: src/compose.c:503 src/compose.c:507 src/mainwindow.c:479
+#: src/mainwindow.c:482 src/mainwindow.c:484 src/mainwindow.c:487
+#: src/mainwindow.c:489 src/messageview.c:140
 msgid "/_File/---"
 msgstr "/_Fişier/---"
 
@@ -289,7 +289,7 @@ msgstr "/_Fişier/Ş_tergere"
 msgid "/_File/_Save"
 msgstr "/_Fişier/_Salvare ca..."
 
-#: src/addressbook.c:350 src/compose.c:510 src/messageview.c:141
+#: src/addressbook.c:350 src/compose.c:508 src/messageview.c:141
 msgid "/_File/_Close"
 msgstr "/_Fişier/Î_nchidere"
 
@@ -321,7 +321,7 @@ msgstr "/_Adresă/_Editare"
 msgid "/_Address/_Delete"
 msgstr "/_Adresă/Ş_tergere"
 
-#: src/addressbook.c:358 src/compose.c:619 src/mainwindow.c:725
+#: src/addressbook.c:358 src/compose.c:617 src/mainwindow.c:716
 #: src/messageview.c:256
 #, fuzzy
 msgid "/_Tools"
@@ -331,12 +331,12 @@ msgstr "/_Utilitare"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Utilitare/Importare fişier _LDIF"
 
-#: src/addressbook.c:360 src/compose.c:632 src/mainwindow.c:775
+#: src/addressbook.c:360 src/compose.c:630 src/mainwindow.c:766
 #: src/messageview.c:274
 msgid "/_Help"
 msgstr "/A_jutor"
 
-#: src/addressbook.c:361 src/compose.c:633 src/mainwindow.c:786
+#: src/addressbook.c:361 src/compose.c:631 src/mainwindow.c:777
 #: src/messageview.c:275
 msgid "/_Help/_About"
 msgstr "/A_jutor/_Despre"
@@ -356,7 +356,7 @@ msgstr "/_Grup nou"
 msgid "/New _Folder"
 msgstr "/_Director nou"
 
-#: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:489
+#: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:487
 #: src/folderview.c:235 src/folderview.c:237 src/folderview.c:241
 #: src/folderview.c:252 src/folderview.c:254 src/folderview.c:256
 #: src/folderview.c:260 src/folderview.c:270 src/folderview.c:272
@@ -366,8 +366,8 @@ msgstr "/_Director nou"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:512
-#: src/mainwindow.c:502 src/messageview.c:143
+#: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:510
+#: src/mainwindow.c:493 src/messageview.c:143
 msgid "/_Edit"
 msgstr "/_Editare"
 
@@ -379,7 +379,7 @@ msgstr "/Ş_tergere"
 msgid "E-Mail address"
 msgstr "Adresă E-Mail"
 
-#: src/addressbook.c:495 src/compose.c:4529 src/prefs_common.c:2402
+#: src/addressbook.c:495 src/compose.c:4522 src/prefs_common.c:2402
 msgid "Address book"
 msgstr "Agendă"
 
@@ -388,8 +388,8 @@ msgid "Name:"
 msgstr " Nume:"
 
 #. Buttons
-#: src/addressbook.c:627 src/addressbook.c:1673 src/editaddress.c:884
-#: src/editaddress.c:1017 src/mainwindow.c:2292 src/prefs_actions.c:266
+#: src/addressbook.c:627 src/addressbook.c:1674 src/editaddress.c:884
+#: src/editaddress.c:1017 src/mainwindow.c:2274 src/prefs_actions.c:266
 #: src/prefs_display_header.c:278 src/prefs_display_header.c:333
 #: src/prefs_template.c:231
 msgid "Delete"
@@ -428,7 +428,7 @@ msgstr "Ştergere adrese"
 msgid "Really delete the address(es)?"
 msgstr "Sunteţi sigur că doriţi sa ştergeţi adresa (adresele) ?"
 
-#: src/addressbook.c:1664
+#: src/addressbook.c:1665
 #, fuzzy, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -438,38 +438,38 @@ msgstr ""
 "adreselor conţinute de el ? Dacă ştergeţi doar directorul, adresele\n"
 "vor fi mutate in directorul părinte."
 
-#: src/addressbook.c:1667 src/folderview.c:2139
+#: src/addressbook.c:1668 src/folderview.c:2139
 msgid "Delete folder"
 msgstr "Ştergere director"
 
-#: src/addressbook.c:1667
+#: src/addressbook.c:1668
 #, fuzzy
 msgid "_Folder only"
 msgstr "Doar directorul"
 
-#: src/addressbook.c:1667
+#: src/addressbook.c:1668
 #, fuzzy
 msgid "Folder and _addresses"
 msgstr "Directorul şi adresele"
 
-#: src/addressbook.c:1672
+#: src/addressbook.c:1673
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Sunteţi sigur că doriţi să ştergeţi `%s' ?"
 
-#: src/addressbook.c:2352 src/addressbook.c:2485
+#: src/addressbook.c:2353 src/addressbook.c:2486
 msgid "New user, could not save index file."
 msgstr "Utilizator nou. Fişierul index nu a putut fi salvat."
 
-#: src/addressbook.c:2356 src/addressbook.c:2489
+#: src/addressbook.c:2357 src/addressbook.c:2490
 msgid "New user, could not save address book files."
 msgstr "Utilizator nou. Fişierele agendei nu au putut fi salvate."
 
-#: src/addressbook.c:2366 src/addressbook.c:2499
+#: src/addressbook.c:2367 src/addressbook.c:2500
 msgid "Old address book converted successfully."
 msgstr "Agenda veche a fost convertită cu succes."
 
-#: src/addressbook.c:2371
+#: src/addressbook.c:2372
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -477,7 +477,7 @@ msgstr ""
 "Agenda veche a fost convertită cu succes, dar\n"
 "fişierul index al noii agende nu a putut fi salvat."
 
-#: src/addressbook.c:2384
+#: src/addressbook.c:2385
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -485,7 +485,7 @@ msgstr ""
 "Agenda nu a putut fi convertită, dar\n"
 "a fost creată o agendă nouă goală."
 
-#: src/addressbook.c:2390
+#: src/addressbook.c:2391
 #, fuzzy
 msgid ""
 "Could not convert address book,\n"
@@ -494,7 +494,7 @@ msgstr ""
 "Agenda nu a putut fi convertită iar încercarea de creare a unei agende noia "
 "eşuat."
 
-#: src/addressbook.c:2395
+#: src/addressbook.c:2396
 #, fuzzy
 msgid ""
 "Could not convert address book\n"
@@ -503,89 +503,89 @@ msgstr ""
 "Agenda nu a putut fi convertită iar încercarea de creare a unei agende noia "
 "eşuat."
 
-#: src/addressbook.c:2402
+#: src/addressbook.c:2403
 msgid "Addressbook conversion error"
 msgstr "Eroare de convertire a agendei"
 
-#: src/addressbook.c:2406
+#: src/addressbook.c:2407
 msgid "Addressbook conversion"
 msgstr "Convertire agendă"
 
-#: src/addressbook.c:2441
+#: src/addressbook.c:2442
 msgid "Addressbook Error"
 msgstr "Eroare agendă"
 
-#: src/addressbook.c:2442 src/addressbook.c:2542
+#: src/addressbook.c:2443 src/addressbook.c:2543
 msgid "Could not read address index"
 msgstr "Fişierul index al agendei nu a putut fi citit"
 
-#: src/addressbook.c:2504
+#: src/addressbook.c:2505
 msgid "Old address book converted, could not save new address index file"
 msgstr ""
 "Agenda veche a fost convertită, dar salvarea noului fişier indexa eşuat"
 
-#: src/addressbook.c:2518
+#: src/addressbook.c:2519
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr ""
 "Agenda nu a putut fi convertită, dar a fost creată o noua agendă goală."
 
-#: src/addressbook.c:2524
+#: src/addressbook.c:2525
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr ""
 "Agenda nu a putut fi convertită iar încercarea de creare a unei agende noia "
 "eşuat."
 
-#: src/addressbook.c:2530
+#: src/addressbook.c:2531
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr ""
 "Agenda nu a putut fi convertită iar încercarea de creare a unei agende noia "
 "eşuat."
 
-#: src/addressbook.c:2548
+#: src/addressbook.c:2549
 msgid "Addressbook Conversion Error"
 msgstr "Eroare de convertire a agendei"
 
-#: src/addressbook.c:2554
+#: src/addressbook.c:2555
 msgid "Addressbook Conversion"
 msgstr "Convertire agendă"
 
-#: src/addressbook.c:3055 src/prefs_common.c:963
+#: src/addressbook.c:3056 src/prefs_common.c:963
 msgid "Interface"
 msgstr "Interfaţă"
 
-#: src/addressbook.c:3071 src/importldif.c:514
+#: src/addressbook.c:3072 src/importldif.c:514
 msgid "Address Book"
 msgstr "Agendă"
 
-#: src/addressbook.c:3087
+#: src/addressbook.c:3088
 msgid "Person"
 msgstr "Persoană"
 
-#: src/addressbook.c:3103
+#: src/addressbook.c:3104
 msgid "EMail Address"
 msgstr "Adresă E-Mail"
 
-#: src/addressbook.c:3119
+#: src/addressbook.c:3120
 msgid "Group"
 msgstr "Groupă"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3135 src/folderview.c:346 src/prefs_account.c:1866
+#: src/addressbook.c:3136 src/folderview.c:346 src/prefs_account.c:1866
 msgid "Folder"
 msgstr "Director"
 
-#: src/addressbook.c:3151
+#: src/addressbook.c:3152
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3167 src/addressbook.c:3183
+#: src/addressbook.c:3168 src/addressbook.c:3184
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3199
+#: src/addressbook.c:3200
 msgid "LDAP Server"
 msgstr "Server LDAP"
 
@@ -597,7 +597,7 @@ msgstr "Adresse comună:"
 msgid "Personal address"
 msgstr "Adresse personală:"
 
-#: src/alertpanel.c:138 src/compose.c:5214 src/main.c:515
+#: src/alertpanel.c:138 src/compose.c:5208 src/main.c:515
 msgid "Notice"
 msgstr "Informaţie"
 
@@ -652,389 +652,389 @@ msgstr "Maro"
 msgid "None"
 msgstr "Niciunul"
 
-#: src/compose.c:487
+#: src/compose.c:485
 msgid "/_Add..."
 msgstr "/_Adăugare..."
 
-#: src/compose.c:488
+#: src/compose.c:486
 msgid "/_Remove"
 msgstr "/Ş_tergere"
 
-#: src/compose.c:490 src/folderview.c:243 src/folderview.c:262
+#: src/compose.c:488 src/folderview.c:243 src/folderview.c:262
 #: src/folderview.c:277
 #, fuzzy
 msgid "/_Properties..."
 msgstr "/_Proprietăţi..."
 
-#: src/compose.c:496
+#: src/compose.c:494
 #, fuzzy
 msgid "/_File/_Send"
 msgstr "/_Fişier/_Salvare ca..."
 
-#: src/compose.c:498
+#: src/compose.c:496
 #, fuzzy
 msgid "/_File/Send _later"
 msgstr "/_Mesaj/Tr_imitere mai târziu"
 
-#: src/compose.c:501
+#: src/compose.c:499
 #, fuzzy
 msgid "/_File/Save to _draft folder"
 msgstr "/_Mesaj/Sal_vare"
 
-#: src/compose.c:503
+#: src/compose.c:501
 #, fuzzy
 msgid "/_File/Save and _keep editing"
 msgstr "/_Message/Salvare şi _continuare"
 
-#: src/compose.c:506
+#: src/compose.c:504
 msgid "/_File/_Attach file"
 msgstr "/_Fişier/_Ataşare fişier"
 
-#: src/compose.c:507
+#: src/compose.c:505
 msgid "/_File/_Insert file"
 msgstr "/_Fişier/_Inserare fişier"
 
-#: src/compose.c:508
+#: src/compose.c:506
 msgid "/_File/Insert si_gnature"
 msgstr "/_Fişier/Inserare sem_nătură"
 
-#: src/compose.c:513
+#: src/compose.c:511
 msgid "/_Edit/_Undo"
 msgstr "/_Editare/An_ulare"
 
-#: src/compose.c:514
+#: src/compose.c:512
 msgid "/_Edit/_Redo"
 msgstr "/_Editare/_Repetare"
 
-#: src/compose.c:515 src/compose.c:522 src/mainwindow.c:506
+#: src/compose.c:513 src/compose.c:520 src/mainwindow.c:497
 #: src/messageview.c:146
 msgid "/_Edit/---"
 msgstr "/_Editare/---"
 
-#: src/compose.c:516
+#: src/compose.c:514
 msgid "/_Edit/Cu_t"
 msgstr "/_Editare/_Tăiere"
 
-#: src/compose.c:517 src/mainwindow.c:503 src/messageview.c:144
+#: src/compose.c:515 src/mainwindow.c:494 src/messageview.c:144
 msgid "/_Edit/_Copy"
 msgstr "/_Editare/_Copiere"
 
-#: src/compose.c:518
+#: src/compose.c:516
 msgid "/_Edit/_Paste"
 msgstr "/_Editare/Li_pire"
 
-#: src/compose.c:519
+#: src/compose.c:517
 #, fuzzy
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Editare/Li_pire"
 
-#: src/compose.c:521 src/mainwindow.c:504 src/messageview.c:145
+#: src/compose.c:519 src/mainwindow.c:495 src/messageview.c:145
 msgid "/_Edit/Select _all"
 msgstr "/_Editare/Select_are tot"
 
-#: src/compose.c:523
+#: src/compose.c:521
 msgid "/_Edit/_Wrap current paragraph"
 msgstr ""
 
-#: src/compose.c:525
+#: src/compose.c:523
 #, fuzzy
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/_Editare/Tăie_re linii lungi"
 
-#: src/compose.c:527
+#: src/compose.c:525
 #, fuzzy
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Editare/_Copiere"
 
-#: src/compose.c:528 src/mainwindow.c:511 src/messageview.c:150
+#: src/compose.c:526 src/mainwindow.c:502 src/messageview.c:150
 #: src/summaryview.c:400
 msgid "/_View"
 msgstr "/_Vedere"
 
-#: src/compose.c:529
+#: src/compose.c:527
 msgid "/_View/_To"
 msgstr "/_Vedere/_La"
 
-#: src/compose.c:530
+#: src/compose.c:528
 msgid "/_View/_Cc"
 msgstr "/_Vedere/_Cc"
 
-#: src/compose.c:531
+#: src/compose.c:529
 msgid "/_View/_Bcc"
 msgstr "/_Vedere/_Bcc"
 
-#: src/compose.c:532
+#: src/compose.c:530
 msgid "/_View/_Reply to"
 msgstr "/_Vedere/_Răspuns"
 
-#: src/compose.c:533 src/compose.c:535 src/compose.c:537 src/compose.c:539
-#: src/mainwindow.c:529 src/mainwindow.c:532 src/mainwindow.c:558
-#: src/mainwindow.c:582 src/mainwindow.c:675 src/mainwindow.c:679
+#: src/compose.c:531 src/compose.c:533 src/compose.c:535 src/compose.c:537
+#: src/mainwindow.c:520 src/mainwindow.c:523 src/mainwindow.c:549
+#: src/mainwindow.c:573 src/mainwindow.c:666 src/mainwindow.c:670
 #: src/messageview.c:233
 msgid "/_View/---"
 msgstr "/_Vedere/---"
 
-#: src/compose.c:534
+#: src/compose.c:532
 msgid "/_View/_Followup to"
 msgstr "/_Vedere/_Urmare"
 
-#: src/compose.c:536
+#: src/compose.c:534
 msgid "/_View/R_uler"
 msgstr "/_Vedere/Ri_glă"
 
-#: src/compose.c:538
+#: src/compose.c:536
 msgid "/_View/_Attachment"
 msgstr "/_Vedere/_Ataşamente"
 
-#: src/compose.c:545 src/mainwindow.c:589 src/messageview.c:157
+#: src/compose.c:543 src/mainwindow.c:580 src/messageview.c:157
 #, fuzzy
 msgid "/_View/Character _encoding"
 msgstr "/_Vedere/_La"
 
-#: src/compose.c:546
+#: src/compose.c:544
 msgid "/_View/Character _encoding/_Automatic"
 msgstr ""
 
-#: src/compose.c:548 src/compose.c:554 src/compose.c:560 src/compose.c:564
-#: src/compose.c:570 src/compose.c:574 src/compose.c:580 src/compose.c:584
-#: src/compose.c:594 src/compose.c:598 src/compose.c:608 src/compose.c:612
-#: src/mainwindow.c:585 src/mainwindow.c:592 src/messageview.c:153
+#: src/compose.c:546 src/compose.c:552 src/compose.c:558 src/compose.c:562
+#: src/compose.c:568 src/compose.c:572 src/compose.c:578 src/compose.c:582
+#: src/compose.c:592 src/compose.c:596 src/compose.c:606 src/compose.c:610
+#: src/mainwindow.c:576 src/mainwindow.c:583 src/messageview.c:153
 #, fuzzy
 msgid "/_View/Character _encoding/---"
 msgstr "/_Vedere/_La"
 
-#: src/compose.c:550 src/mainwindow.c:593 src/messageview.c:161
+#: src/compose.c:548 src/mainwindow.c:584 src/messageview.c:161
 #, fuzzy
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Mesaj/Set de _caractere/7bit ASCII (US-ASC_II)"
 
-#: src/compose.c:552 src/mainwindow.c:595 src/messageview.c:164
+#: src/compose.c:550 src/mainwindow.c:586 src/messageview.c:164
 #, fuzzy
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Mesaj/Set de _caractere/Unicode (_UTF-8)"
 
-#: src/compose.c:556 src/mainwindow.c:599 src/messageview.c:167
+#: src/compose.c:554 src/mainwindow.c:590 src/messageview.c:167
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Mesaj/Set de _caractere/Vest European (ISO-8859-_1)"
 
-#: src/compose.c:558 src/mainwindow.c:601 src/messageview.c:169
+#: src/compose.c:556 src/mainwindow.c:592 src/messageview.c:169
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Mesaj/Set de _caractere/Vest European (ISO-8859-_1)"
 
-#: src/compose.c:562 src/mainwindow.c:605 src/messageview.c:172
+#: src/compose.c:560 src/mainwindow.c:596 src/messageview.c:172
 #, fuzzy
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Mesaj/Set de _caractere/Central European (ISO-8859-_2)"
 
-#: src/compose.c:566 src/mainwindow.c:609 src/messageview.c:175
+#: src/compose.c:564 src/mainwindow.c:600 src/messageview.c:175
 #, fuzzy
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Mesaj/Set de _caractere/_Baltic (ISO-8859-13)"
 
-#: src/compose.c:568 src/mainwindow.c:611 src/messageview.c:177
+#: src/compose.c:566 src/mainwindow.c:602 src/messageview.c:177
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Mesaj/Set de _caractere/Baltic (ISO-8859-_4)"
 
-#: src/compose.c:572 src/mainwindow.c:615 src/messageview.c:180
+#: src/compose.c:570 src/mainwindow.c:606 src/messageview.c:180
 #, fuzzy
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Mesaj/Set de _caractere/Grec (ISO-8859-_7)"
 
-#: src/compose.c:576 src/mainwindow.c:619 src/messageview.c:183
+#: src/compose.c:574 src/mainwindow.c:610 src/messageview.c:183
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Mesaj/Set de _caractere/Grec (ISO-8859-_7)"
 
-#: src/compose.c:578 src/mainwindow.c:621 src/messageview.c:185
+#: src/compose.c:576 src/mainwindow.c:612 src/messageview.c:185
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Mesaj/Set de _caractere/Chirilic (Windows-1251)"
 
-#: src/compose.c:582 src/mainwindow.c:625 src/messageview.c:188
+#: src/compose.c:580 src/mainwindow.c:616 src/messageview.c:188
 #, fuzzy
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Mesaj/Set de _caractere/Turcesc (ISO-8859-_9)"
 
-#: src/compose.c:586 src/mainwindow.c:629 src/messageview.c:191
+#: src/compose.c:584 src/mainwindow.c:620 src/messageview.c:191
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Mesaj/Set de _caractere/Chirilic (ISO-8859-_5)"
 
-#: src/compose.c:588 src/mainwindow.c:631 src/messageview.c:193
+#: src/compose.c:586 src/mainwindow.c:622 src/messageview.c:193
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Mesaj/Set de _caractere/Chirilic (KOI8-_R)"
 
-#: src/compose.c:590 src/mainwindow.c:633 src/messageview.c:195
+#: src/compose.c:588 src/mainwindow.c:624 src/messageview.c:195
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Mesaj/Set de _caractere/Chirilic (KOI8-_R)"
 
-#: src/compose.c:592 src/mainwindow.c:635 src/messageview.c:197
+#: src/compose.c:590 src/mainwindow.c:626 src/messageview.c:197
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Mesaj/Set de _caractere/Chirilic (Windows-1251)"
 
-#: src/compose.c:596 src/mainwindow.c:639 src/messageview.c:200
+#: src/compose.c:594 src/mainwindow.c:630 src/messageview.c:200
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Mesaj/Set de _caractere/Japonez (ISO-2022-_JP)"
 
-#: src/compose.c:600 src/mainwindow.c:649 src/messageview.c:209
+#: src/compose.c:598 src/mainwindow.c:640 src/messageview.c:209
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Mesaj/Set de _caractere/Chinezesc Simplificat (_GB2312)"
 
-#: src/compose.c:602 src/mainwindow.c:651 src/messageview.c:211
+#: src/compose.c:600 src/mainwindow.c:642 src/messageview.c:211
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Mesaj/Set de _caractere/Chinezesc Simplificat (_GB2312)"
 
-#: src/compose.c:604 src/mainwindow.c:653 src/messageview.c:213
+#: src/compose.c:602 src/mainwindow.c:644 src/messageview.c:213
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Mesaj/Set de _caractere/Chinezesc Tradiţional (_Big5)"
 
-#: src/compose.c:606 src/mainwindow.c:655 src/messageview.c:215
+#: src/compose.c:604 src/mainwindow.c:646 src/messageview.c:215
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Mesaj/Set de _caractere/Chinezesc Tradiţional (EUC-_TW)"
 
-#: src/compose.c:610 src/mainwindow.c:661 src/messageview.c:220
+#: src/compose.c:608 src/mainwindow.c:652 src/messageview.c:220
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Mesaj/Set de _caractere/Corean (EUC-_KR)"
 
-#: src/compose.c:614 src/mainwindow.c:667 src/messageview.c:225
+#: src/compose.c:612 src/mainwindow.c:658 src/messageview.c:225
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Mesaj/Set de _caractere/Chinezesc (ISO-2022-_CN)"
 
-#: src/compose.c:616 src/mainwindow.c:669 src/messageview.c:227
+#: src/compose.c:614 src/mainwindow.c:660 src/messageview.c:227
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Mesaj/Set de _caractere/Chirilic (Windows-1251)"
 
-#: src/compose.c:620 src/mainwindow.c:726 src/messageview.c:257
+#: src/compose.c:618 src/mainwindow.c:717 src/messageview.c:257
 #, fuzzy
 msgid "/_Tools/_Address book"
 msgstr "/_Utilitare/_Agendă"
 
-#: src/compose.c:621
+#: src/compose.c:619
 #, fuzzy
 msgid "/_Tools/_Template"
 msgstr "/_Utilitare/_Modele"
 
-#: src/compose.c:622 src/mainwindow.c:749 src/messageview.c:272
+#: src/compose.c:620 src/mainwindow.c:740 src/messageview.c:272
 #, fuzzy
 msgid "/_Tools/Actio_ns"
 msgstr "/E_xecutare"
 
-#: src/compose.c:623 src/compose.c:627 src/mainwindow.c:729
-#: src/mainwindow.c:743 src/mainwindow.c:748 src/mainwindow.c:750
-#: src/mainwindow.c:753 src/mainwindow.c:755 src/messageview.c:260
+#: src/compose.c:621 src/compose.c:625 src/mainwindow.c:720
+#: src/mainwindow.c:734 src/mainwindow.c:739 src/mainwindow.c:741
+#: src/mainwindow.c:744 src/mainwindow.c:746 src/messageview.c:260
 #: src/messageview.c:271
 #, fuzzy
 msgid "/_Tools/---"
 msgstr "/_Utilitare/---"
 
-#: src/compose.c:624
+#: src/compose.c:622
 #, fuzzy
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/_Editare/Editare cu un editor e_xtern"
 
-#: src/compose.c:628
+#: src/compose.c:626
 #, fuzzy
 msgid "/_Tools/PGP Si_gn"
 msgstr "/E_xecutare"
 
-#: src/compose.c:629
+#: src/compose.c:627
 #, fuzzy
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/_Message/Cr_iptare"
 
-#: src/compose.c:855
+#: src/compose.c:853
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: fişierul nu există\n"
 
-#: src/compose.c:954 src/compose.c:1024 src/procmsg.c:1353
+#: src/compose.c:952 src/compose.c:1022 src/procmsg.c:1353
 #, fuzzy
 msgid "Can't get text part\n"
 msgstr "xover imposibil\n"
 
-#: src/compose.c:1420
+#: src/compose.c:1418
 msgid "Quote mark format error."
 msgstr "Eroare de formatare a citaţiei."
 
-#: src/compose.c:1432
+#: src/compose.c:1430
 msgid "Message reply/forward format error."
 msgstr "Eroare de formatare a răspunsului/mesajului înaintat."
 
-#: src/compose.c:1801
+#: src/compose.c:1799
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Fişierul %s nu există\n"
 
-#: src/compose.c:1805
+#: src/compose.c:1803
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Obţinerea dimensiunii fişierului %s este imposibilă\n"
 
-#: src/compose.c:1809
+#: src/compose.c:1807
 #, fuzzy, c-format
 msgid "File %s is empty."
 msgstr "Fişierul %s este gol\n"
 
-#: src/compose.c:1813
+#: src/compose.c:1811
 #, fuzzy, c-format
 msgid "Can't read %s."
 msgstr "nu poate fi creat %s\n"
 
-#: src/compose.c:1848
+#: src/compose.c:1846
 #, c-format
 msgid "Message: %s"
 msgstr "Mesaj: %s"
 
-#: src/compose.c:1920 src/mimeview.c:560
+#: src/compose.c:1918 src/mimeview.c:560
 msgid "Can't get the part of multipart message."
 msgstr "Citirea unei parţi din mesajul multipart este imposibilă."
 
-#: src/compose.c:2362
+#: src/compose.c:2360
 msgid " [Edited]"
 msgstr " [Editat] "
 
-#: src/compose.c:2364
+#: src/compose.c:2362
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Compunere mesaj%s"
 
-#: src/compose.c:2367
+#: src/compose.c:2365
 #, c-format
 msgid "Compose message%s"
 msgstr "Compunere mesaj%s"
 
-#: src/compose.c:2478
+#: src/compose.c:2476
 msgid "Recipient is not specified."
 msgstr "Destinatarul nu a fost specificat."
 
-#: src/compose.c:2486
+#: src/compose.c:2484
 #, fuzzy
 msgid "Empty subject"
 msgstr "Subiect"
 
-#: src/compose.c:2487
+#: src/compose.c:2485
 msgid "Subject is empty. Send it anyway?"
 msgstr ""
 
-#: src/compose.c:2538
+#: src/compose.c:2536
 msgid "can't get recipient list."
 msgstr "nu pot obţine lista destinatarilor."
 
-#: src/compose.c:2558
+#: src/compose.c:2556
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1042,26 +1042,26 @@ msgstr ""
 "Nu a fost specificat contul de pe care se doreşte trimiterea de mail.\n"
 "Vă rugăm să selectaţi un cont înainte de a trimite."
 
-#: src/compose.c:2572 src/send_message.c:297
+#: src/compose.c:2570 src/send_message.c:297
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "A avut loc o eroare la încercarea de a posta mesajul pe %s ."
 
-#: src/compose.c:2595
+#: src/compose.c:2593
 msgid "Can't save the message to outbox."
 msgstr "Salvarea mesajului în outbox este imposibilă."
 
-#: src/compose.c:2645
+#: src/compose.c:2643
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr ""
 
-#: src/compose.c:2709 src/compose.c:2965 src/compose.c:3028 src/compose.c:3148
-#: src/utils.c:2365
+#: src/compose.c:2707 src/compose.c:2963 src/compose.c:3026 src/compose.c:3146
+#: src/utils.c:2379
 msgid "can't change file mode\n"
 msgstr "schimbarea permisiunilor fişierului este imposibilă\n"
 
-#: src/compose.c:2741
+#: src/compose.c:2739
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1069,12 +1069,12 @@ msgid ""
 "Send it as %s anyway?"
 msgstr "Convertirea codificării mesajului este imposibilă."
 
-#: src/compose.c:2747
+#: src/compose.c:2745
 #, fuzzy
 msgid "Code conversion error"
 msgstr "Eroare de convertire a agendei"
 
-#: src/compose.c:2816
+#: src/compose.c:2814
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1083,157 +1083,157 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:2820
+#: src/compose.c:2818
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3108
+#: src/compose.c:3106
 msgid "can't remove the old message\n"
 msgstr "ştergerea mesajului vechi a eşuat\n"
 
-#: src/compose.c:3126
+#: src/compose.c:3124
 msgid "queueing message...\n"
 msgstr "punere mesaj în lista de aşteptare...\n"
 
-#: src/compose.c:3208
+#: src/compose.c:3206
 #, fuzzy
 msgid "can't find queue folder\n"
 msgstr "directorul nu a putut fi selectat: %s\n"
 
-#: src/compose.c:3215
+#: src/compose.c:3213
 msgid "can't queue the message\n"
 msgstr "punerea mesajului în lista de aşteptare este imposibilă\n"
 
-#: src/compose.c:3792
+#: src/compose.c:3790
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "Message-ID creat: %s\n"
 
-#: src/compose.c:3901
+#: src/compose.c:3899
 msgid "Creating compose window...\n"
 msgstr "Creare fereastra de compunere...\n"
 
-#: src/compose.c:3949 src/headerview.c:54 src/summary_search.c:214
+#: src/compose.c:3947 src/headerview.c:54 src/summary_search.c:214
 msgid "From:"
 msgstr "De la:"
 
-#: src/compose.c:4021
+#: src/compose.c:4019
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/E_xecutare"
 
-#: src/compose.c:4024
+#: src/compose.c:4022
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/_Message/Cr_iptare"
 
-#: src/compose.c:4062 src/compose.c:5001
+#: src/compose.c:4060 src/compose.c:4995
 msgid "MIME type"
 msgstr "Tip MIME"
 
 #. S_COL_DATE
-#: src/compose.c:4071 src/mimeview.c:192 src/prefs_filter_edit.c:585
+#: src/compose.c:4069 src/mimeview.c:192 src/prefs_filter_edit.c:585
 #: src/prefs_summary_column.c:75 src/select-keys.c:317 src/summaryview.c:4217
 msgid "Size"
 msgstr "Dimensiune"
 
-#: src/compose.c:4449 src/mainwindow.c:2224 src/prefs_account.c:719
+#: src/compose.c:4442 src/mainwindow.c:2207 src/prefs_account.c:719
 #: src/prefs_common.c:947
 msgid "Send"
 msgstr "Trimitere"
 
-#: src/compose.c:4450
+#: src/compose.c:4443
 msgid "Send message"
 msgstr "Trimitere mesaj"
 
-#: src/compose.c:4458
+#: src/compose.c:4451
 msgid "Send later"
 msgstr "Mai târziu"
 
-#: src/compose.c:4459
+#: src/compose.c:4452
 msgid "Put into queue folder and send later"
 msgstr "Punere în lista de aşteptare şi trimitere mai târziu"
 
-#: src/compose.c:4467
+#: src/compose.c:4460
 msgid "Draft"
 msgstr "Salvare"
 
-#: src/compose.c:4468
+#: src/compose.c:4461
 msgid "Save to draft folder"
 msgstr "Salvare"
 
-#: src/compose.c:4478
+#: src/compose.c:4471
 msgid "Insert"
 msgstr "Inserare"
 
-#: src/compose.c:4479
+#: src/compose.c:4472
 msgid "Insert file"
 msgstr "Isertion fişier"
 
-#: src/compose.c:4487
+#: src/compose.c:4480
 msgid "Attach"
 msgstr "Ataşament"
 
-#: src/compose.c:4488
+#: src/compose.c:4481
 msgid "Attach file"
 msgstr "Ataşare fişier"
 
 #. signature
-#: src/compose.c:4498 src/prefs_account.c:1391 src/prefs_common.c:1356
+#: src/compose.c:4491 src/prefs_account.c:1391 src/prefs_common.c:1356
 msgid "Signature"
 msgstr "Semnătură"
 
-#: src/compose.c:4499
+#: src/compose.c:4492
 msgid "Insert signature"
 msgstr "Inserare semnătură"
 
-#: src/compose.c:4508 src/prefs_common.c:1378 src/prefs_common.c:2382
+#: src/compose.c:4501 src/prefs_common.c:1378 src/prefs_common.c:2382
 msgid "Editor"
 msgstr "Editor"
 
-#: src/compose.c:4509
+#: src/compose.c:4502
 msgid "Edit with external editor"
 msgstr "Editare cu editor extern"
 
-#: src/compose.c:4517
+#: src/compose.c:4510
 msgid "Linewrap"
 msgstr "Tăiere linii"
 
-#: src/compose.c:4518
+#: src/compose.c:4511
 msgid "Wrap all long lines"
 msgstr "Tăiere toate liniile lungi"
 
-#: src/compose.c:4897
+#: src/compose.c:4891
 msgid "Invalid MIME type."
 msgstr "Tip MIME invalid."
 
-#: src/compose.c:4915
+#: src/compose.c:4909
 msgid "File doesn't exist or is empty."
 msgstr "Fişierul nu există sau este gol."
 
-#: src/compose.c:4983
+#: src/compose.c:4977
 #, fuzzy
 msgid "Properties"
 msgstr "Proprietate"
 
-#: src/compose.c:5003
+#: src/compose.c:4997
 msgid "Encoding"
 msgstr "Codare"
 
-#: src/compose.c:5026 src/prefs_folder_item.c:183
+#: src/compose.c:5020 src/prefs_folder_item.c:183
 msgid "Path"
 msgstr "Cale"
 
-#: src/compose.c:5027
+#: src/compose.c:5021
 msgid "File name"
 msgstr "Numele fişierului"
 
-#: src/compose.c:5185
+#: src/compose.c:5179
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Linia de comandă este invalidă: '%s'\n"
 
-#: src/compose.c:5211
+#: src/compose.c:5205
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1244,76 +1244,76 @@ msgstr ""
 "Doriţi terminarea forţată a procesului ?\n"
 "process group id: %d"
 
-#: src/compose.c:5228
+#: src/compose.c:5222
 #, c-format
 msgid "Terminated process group id: %d"
 msgstr "Procesul a fost terminat: %d"
 
-#: src/compose.c:5229
+#: src/compose.c:5223
 #, c-format
 msgid "Temporary file: %s"
 msgstr "Fişier temporar: %s"
 
-#: src/compose.c:5253
+#: src/compose.c:5247
 msgid "Compose: input from monitoring process\n"
 msgstr "Compunere: introducere din proces monitorizat\n"
 
 #. failed
-#: src/compose.c:5284
+#: src/compose.c:5278
 msgid "Couldn't exec external editor\n"
 msgstr "Editorul extern nu poate fi executat\n"
 
-#: src/compose.c:5288
+#: src/compose.c:5282
 msgid "Couldn't write to file\n"
 msgstr "Scrierea în fişier este imposibilă\n"
 
-#: src/compose.c:5290
+#: src/compose.c:5284
 msgid "Pipe read failed\n"
 msgstr "Citirea din pipe a eşuat\n"
 
-#: src/compose.c:5596 src/compose.c:5604 src/compose.c:5610
+#: src/compose.c:5590 src/compose.c:5598 src/compose.c:5604
 msgid "Can't queue the message."
 msgstr "Este imposibilă punerea mesajului în lista de aşteptare."
 
-#: src/compose.c:5701
+#: src/compose.c:5695
 #, fuzzy
 msgid "Select files"
 msgstr "Selectare fişier"
 
-#: src/compose.c:5723
+#: src/compose.c:5717
 msgid "Select file"
 msgstr "Selectare fişier"
 
-#: src/compose.c:5760
+#: src/compose.c:5754
 #, fuzzy
 msgid "Save message"
 msgstr "Trimitere mesaj"
 
-#: src/compose.c:5761
+#: src/compose.c:5755
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Acest mesaj a fost modificat. Doriţi sa anulaţi schimbările ?"
 
-#: src/compose.c:5763
+#: src/compose.c:5757
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:5805
+#: src/compose.c:5799
 #, fuzzy, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Sunteţi sigur că doriţi să ştergeţi această regulă ?"
 
-#: src/compose.c:5807
+#: src/compose.c:5801
 #, fuzzy
 msgid "Apply template"
 msgstr "Ştergere mesaj"
 
-#: src/compose.c:5808
+#: src/compose.c:5802
 #, fuzzy
 msgid "_Replace"
 msgstr "/_Utilitare/_Modele"
 
-#: src/compose.c:5808
+#: src/compose.c:5802
 #, fuzzy
 msgid "_Insert"
 msgstr "Inserare"
@@ -1770,12 +1770,12 @@ msgstr "Setare informaţii despre director...\n"
 msgid "Setting folder info..."
 msgstr "Setare informaţii despre director..."
 
-#: src/folderview.c:805 src/mainwindow.c:3301 src/setup.c:81
+#: src/folderview.c:805 src/mainwindow.c:3272 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Scanare director %s%c%s ..."
 
-#: src/folderview.c:809 src/mainwindow.c:3306 src/setup.c:86
+#: src/folderview.c:809 src/mainwindow.c:3277 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Scanare director %s ..."
@@ -2106,46 +2106,46 @@ msgstr "Autentificare..."
 msgid "IMAP4 login failed.\n"
 msgstr "Logare IMAP4 eşuată.\n"
 
-#: src/imap.c:3522
+#: src/imap.c:3528
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "nu a putut fi adăugat %s la %s\n"
 
-#: src/imap.c:3529
+#: src/imap.c:3535
 #, fuzzy
 msgid "(sending file...)"
 msgstr "Citire director %s ..."
 
-#: src/imap.c:3557
+#: src/imap.c:3563
 #, fuzzy, c-format
 msgid "can't append message to %s\n"
 msgstr "mesajul %s nu a putut fi adăugat\n"
 
-#: src/imap.c:3589
+#: src/imap.c:3595
 #, fuzzy, c-format
 msgid "can't copy %s to %s\n"
 msgstr "nu a putut fi copiat %d la %s\n"
 
-#: src/imap.c:3613
+#: src/imap.c:3619
 #, fuzzy, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "eroare comandă IMAP: STORE %d:%d %s\n"
 
-#: src/imap.c:3627
+#: src/imap.c:3633
 msgid "error while imap command: EXPUNGE\n"
 msgstr "eroare comandă IMAP: EXPUNGE\n"
 
-#: src/imap.c:3640
+#: src/imap.c:3646
 #, fuzzy
 msgid "error while imap command: CLOSE\n"
 msgstr "eroare comandă IMAP: EXPUNGE\n"
 
-#: src/imap.c:3873
+#: src/imap.c:3879
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr ""
 
-#: src/imap.c:3903
+#: src/imap.c:3909
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr ""
@@ -2247,7 +2247,7 @@ msgstr "Importare fişier LDIF în agendă"
 msgid "Prev"
 msgstr "Înapio"
 
-#: src/importldif.c:768 src/mainwindow.c:2321
+#: src/importldif.c:768 src/mainwindow.c:2303
 msgid "Next"
 msgstr "Înainte"
 
@@ -2596,728 +2596,728 @@ msgid ""
 "Do you want to migrate it?"
 msgstr ""
 
-#: src/mainwindow.c:471
+#: src/mainwindow.c:462
 #, fuzzy
 msgid "/_File/_Folder"
 msgstr "/_Fişier/Î_nchidere"
 
-#: src/mainwindow.c:472
+#: src/mainwindow.c:463
 #, fuzzy
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/Creare director _nou"
 
-#: src/mainwindow.c:474
+#: src/mainwindow.c:465
 #, fuzzy
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/_Redenumire director"
 
-#: src/mainwindow.c:475
+#: src/mainwindow.c:466
 #, fuzzy
 msgid "/_File/_Folder/_Move folder..."
 msgstr "/_Redenumire director"
 
-#: src/mainwindow.c:476
+#: src/mainwindow.c:467
 #, fuzzy
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/Ştergere _director"
 
 # xxx#
-#: src/mainwindow.c:477
+#: src/mainwindow.c:468
 #, fuzzy
 msgid "/_File/_Mailbox"
 msgstr "/_Fişier/_Adăugare cutie poştală..."
 
 # xxx#
-#: src/mainwindow.c:478
+#: src/mainwindow.c:469
 #, fuzzy
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/_Fişier/_Adăugare cutie poştală..."
 
-#: src/mainwindow.c:479
+#: src/mainwindow.c:470
 #, fuzzy
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/Ştergere _cutie poştală"
 
-#: src/mainwindow.c:480 src/mainwindow.c:485
+#: src/mainwindow.c:471 src/mainwindow.c:476
 #, fuzzy
 msgid "/_File/_Mailbox/---"
 msgstr "/_Fişier/Î_nchidere"
 
-#: src/mainwindow.c:481
+#: src/mainwindow.c:472
 #, fuzzy
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "/Verificare _mesaje noi"
 
-#: src/mainwindow.c:483
+#: src/mainwindow.c:474
 #, fuzzy
 msgid "/_File/_Mailbox/Check for new messages in _all mailboxes"
 msgstr "/Verificare _mesaje noi"
 
-#: src/mainwindow.c:486
+#: src/mainwindow.c:477
 #, fuzzy
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "/R_escanare directoare"
 
-#: src/mainwindow.c:489
+#: src/mainwindow.c:480
 #, fuzzy
 msgid "/_File/_Import mbox file..."
 msgstr "/_Fişier/_Importare fişier mbox"
 
-#: src/mainwindow.c:490
+#: src/mainwindow.c:481
 #, fuzzy
 msgid "/_File/_Export to mbox file..."
 msgstr "/_Fişier/_Importare fişier mbox"
 
-#: src/mainwindow.c:492
+#: src/mainwindow.c:483
 #, fuzzy
 msgid "/_File/Empty all _trash"
 msgstr "/_Fişier/_Curăţare gunoi"
 
-#: src/mainwindow.c:494 src/messageview.c:138
+#: src/mainwindow.c:485 src/messageview.c:138
 msgid "/_File/_Save as..."
 msgstr "/_Fişier/_Salvare ca..."
 
-#: src/mainwindow.c:495 src/messageview.c:139
+#: src/mainwindow.c:486 src/messageview.c:139
 msgid "/_File/_Print..."
 msgstr "/_Fişier/Im_primare..."
 
-#: src/mainwindow.c:497
+#: src/mainwindow.c:488
 #, fuzzy
 msgid "/_File/_Work offline"
 msgstr "/_Fişier/_Inserare fişier"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:500
+#: src/mainwindow.c:491
 msgid "/_File/E_xit"
 msgstr "/_Fişier/Ieşi_re"
 
-#: src/mainwindow.c:505
+#: src/mainwindow.c:496
 #, fuzzy
 msgid "/_Edit/Select _thread"
 msgstr "/_Editare/Select_are tot"
 
-#: src/mainwindow.c:507 src/messageview.c:147
+#: src/mainwindow.c:498 src/messageview.c:147
 msgid "/_Edit/_Find in current message..."
 msgstr ""
 
-#: src/mainwindow.c:509
+#: src/mainwindow.c:500
 #, fuzzy
 msgid "/_Edit/_Search messages..."
 msgstr "/_Editare/_Căutare"
 
-#: src/mainwindow.c:512
+#: src/mainwindow.c:503
 #, fuzzy
 msgid "/_View/Show or hi_de"
 msgstr "/_Afişare antet"
 
-#: src/mainwindow.c:513
+#: src/mainwindow.c:504
 #, fuzzy
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/_Vedere/Ar_bore"
 
-#: src/mainwindow.c:515
+#: src/mainwindow.c:506
 #, fuzzy
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/_Vedere/Vedere _mesaj"
 
-#: src/mainwindow.c:517
+#: src/mainwindow.c:508
 #, fuzzy
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/_Vedere/Bară de _utilitare"
 
-#: src/mainwindow.c:519
+#: src/mainwindow.c:510
 #, fuzzy
 msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/_Vedere/Bară de _utilitare/Icoane şi te_xt"
 
-#: src/mainwindow.c:521
+#: src/mainwindow.c:512
 #, fuzzy
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/_Vedere/Bară de _utilitare/_Icoane"
 
-#: src/mainwindow.c:523
+#: src/mainwindow.c:514
 #, fuzzy
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/_Vedere/Bară de _utilitare/_Text"
 
-#: src/mainwindow.c:525
+#: src/mainwindow.c:516
 #, fuzzy
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/_Vedere/Bară de _utilitare/_Icoane"
 
-#: src/mainwindow.c:527
+#: src/mainwindow.c:518
 #, fuzzy
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/_Vedere/Bară de _stare"
 
-#: src/mainwindow.c:530
+#: src/mainwindow.c:521
 msgid "/_View/Separate f_older tree"
 msgstr "/_Vedere/Separare arbore de direct_oare"
 
-#: src/mainwindow.c:531
+#: src/mainwindow.c:522
 #, fuzzy
 msgid "/_View/Separate _message view"
 msgstr "/_Vedere/Separare arbore de m_esaje"
 
-#: src/mainwindow.c:533
+#: src/mainwindow.c:524
 #, fuzzy
 msgid "/_View/_Sort"
 msgstr "/_Vedere/_La"
 
-#: src/mainwindow.c:534
+#: src/mainwindow.c:525
 #, fuzzy
 msgid "/_View/_Sort/by _number"
 msgstr "/Re_zumat/_Sortare/Sortare după _număr"
 
-#: src/mainwindow.c:535
+#: src/mainwindow.c:526
 #, fuzzy
 msgid "/_View/_Sort/by s_ize"
 msgstr "/Re_zumat/_Sortare/Sortare după d_imensiune"
 
-#: src/mainwindow.c:536
+#: src/mainwindow.c:527
 #, fuzzy
 msgid "/_View/_Sort/by _date"
 msgstr "/Re_zumat/_Sortare/Sortare după _dată"
 
-#: src/mainwindow.c:537
+#: src/mainwindow.c:528
 #, fuzzy
 msgid "/_View/_Sort/by _from"
 msgstr "/Re_zumat/_Sortare/Sortare după e_xpeditor"
 
-#: src/mainwindow.c:538
+#: src/mainwindow.c:529
 #, fuzzy
 msgid "/_View/_Sort/by _recipient"
 msgstr "/Re_zumat/_Sortare/Sortare după d_imensiune"
 
-#: src/mainwindow.c:539
+#: src/mainwindow.c:530
 #, fuzzy
 msgid "/_View/_Sort/by _subject"
 msgstr "/Re_zumat/_Sortare/Sortare după subiect"
 
-#: src/mainwindow.c:540
+#: src/mainwindow.c:531
 #, fuzzy
 msgid "/_View/_Sort/by _color label"
 msgstr "/Re_zumat/_Sortare/Sortare după _dată"
 
-#: src/mainwindow.c:542
+#: src/mainwindow.c:533
 #, fuzzy
 msgid "/_View/_Sort/by _mark"
 msgstr "/Re_zumat/_Sortare/Sortare după _număr"
 
-#: src/mainwindow.c:543
+#: src/mainwindow.c:534
 #, fuzzy
 msgid "/_View/_Sort/by _unread"
 msgstr "/Re_zumat/_Sortare/Sortare după _număr"
 
-#: src/mainwindow.c:544
+#: src/mainwindow.c:535
 #, fuzzy
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/_Vedere/_Ataşamente"
 
-#: src/mainwindow.c:546
+#: src/mainwindow.c:537
 #, fuzzy
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/Re_zumat/_Sortare/Sortare după _număr"
 
-#: src/mainwindow.c:547 src/mainwindow.c:550
+#: src/mainwindow.c:538 src/mainwindow.c:541
 #, fuzzy
 msgid "/_View/_Sort/---"
 msgstr "/_Vedere/---"
 
-#: src/mainwindow.c:548
+#: src/mainwindow.c:539
 #, fuzzy
 msgid "/_View/_Sort/Ascending"
 msgstr "/_Vedere/_La"
 
-#: src/mainwindow.c:549
+#: src/mainwindow.c:540
 #, fuzzy
 msgid "/_View/_Sort/Descending"
 msgstr "/_Vedere/_La"
 
-#: src/mainwindow.c:551
+#: src/mainwindow.c:542
 #, fuzzy
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/Re_zumat/_Sortare/_Atracţie după subiect"
 
-#: src/mainwindow.c:553
+#: src/mainwindow.c:544
 #, fuzzy
 msgid "/_View/Th_read view"
 msgstr "/_Vedere/Vedere _mesaj"
 
-#: src/mainwindow.c:554
+#: src/mainwindow.c:545
 #, fuzzy
 msgid "/_View/E_xpand all threads"
 msgstr "/_Afişare antet"
 
-#: src/mainwindow.c:555
+#: src/mainwindow.c:546
 #, fuzzy
 msgid "/_View/Co_llapse all threads"
 msgstr "/_Afişare antet"
 
-#: src/mainwindow.c:556
+#: src/mainwindow.c:547
 #, fuzzy
 msgid "/_View/Set display _item..."
 msgstr "/Re_zumat/Selectare elemente afişate..."
 
-#: src/mainwindow.c:559
+#: src/mainwindow.c:550
 #, fuzzy
 msgid "/_View/_Go to"
 msgstr "/_Vedere/_La"
 
-#: src/mainwindow.c:560
+#: src/mainwindow.c:551
 #, fuzzy
 msgid "/_View/_Go to/_Prev message"
 msgstr "/Re_zumat/Mesajul _precedent"
 
-#: src/mainwindow.c:561
+#: src/mainwindow.c:552
 #, fuzzy
 msgid "/_View/_Go to/_Next message"
 msgstr "/Re_zumat/Mesajul _următor"
 
-#: src/mainwindow.c:562 src/mainwindow.c:567 src/mainwindow.c:570
-#: src/mainwindow.c:575 src/mainwindow.c:580
+#: src/mainwindow.c:553 src/mainwindow.c:558 src/mainwindow.c:561
+#: src/mainwindow.c:566 src/mainwindow.c:571
 #, fuzzy
 msgid "/_View/_Go to/---"
 msgstr "/_Vedere/---"
 
-#: src/mainwindow.c:563
+#: src/mainwindow.c:554
 #, fuzzy
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "Următorul mesaj necitit"
 
-#: src/mainwindow.c:565
+#: src/mainwindow.c:556
 #, fuzzy
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/Re_zumat/Următorul mesaj n_ecitit"
 
-#: src/mainwindow.c:568
+#: src/mainwindow.c:559
 #, fuzzy
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/Re_zumat/Mesajul _precedent"
 
-#: src/mainwindow.c:569
+#: src/mainwindow.c:560
 #, fuzzy
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/Re_zumat/Mesajul _următor"
 
-#: src/mainwindow.c:571
+#: src/mainwindow.c:562
 #, fuzzy
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/_Vedere/Separare arbore de m_esaje"
 
-#: src/mainwindow.c:573
+#: src/mainwindow.c:564
 #, fuzzy
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "Următorul mesaj necitit"
 
-#: src/mainwindow.c:576
+#: src/mainwindow.c:567
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr ""
 
-#: src/mainwindow.c:578
+#: src/mainwindow.c:569
 msgid "/_View/_Go to/Next la_beled message"
 msgstr ""
 
-#: src/mainwindow.c:581
+#: src/mainwindow.c:572
 #, fuzzy
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/Re_zumat/Alt di_rector"
 
-#: src/mainwindow.c:590 src/messageview.c:158
+#: src/mainwindow.c:581 src/messageview.c:158
 #, fuzzy
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Mesaj/Set de _caractere/Detectare _automată"
 
-#: src/mainwindow.c:641 src/messageview.c:202
+#: src/mainwindow.c:632 src/messageview.c:202
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Message/Set de _caractere/Japonez (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:643 src/messageview.c:204
+#: src/mainwindow.c:634 src/messageview.c:204
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Message/Set de _caractere/Japonez (_EUC-JP)"
 
-#: src/mainwindow.c:645 src/messageview.c:206
+#: src/mainwindow.c:636 src/messageview.c:206
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Message/Set de _caractere/Japonez (_Shift__JIS)"
 
-#: src/mainwindow.c:657 src/messageview.c:217
+#: src/mainwindow.c:648 src/messageview.c:217
 #, fuzzy
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Mesaj/Set de _caractere/Chinezesc (ISO-2022-_CN)"
 
-#: src/mainwindow.c:663 src/messageview.c:222
+#: src/mainwindow.c:654 src/messageview.c:222
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Mesaj/Set de _caractere/Corean (ISO-2022-KR)"
 
-#: src/mainwindow.c:676 src/summaryview.c:401
+#: src/mainwindow.c:667 src/summaryview.c:401
 #, fuzzy
 msgid "/_View/Open in new _window"
 msgstr "/Deschidere în _fereastră nouă"
 
-#: src/mainwindow.c:677 src/messageview.c:234
+#: src/mainwindow.c:668 src/messageview.c:234
 #, fuzzy
 msgid "/_View/Mess_age source"
 msgstr "/_Vedere/Ar_bore"
 
-#: src/mainwindow.c:678 src/messageview.c:235
+#: src/mainwindow.c:669 src/messageview.c:235
 #, fuzzy
 msgid "/_View/Show all _header"
 msgstr "/_Afişare antet"
 
-#: src/mainwindow.c:680
+#: src/mainwindow.c:671
 #, fuzzy
 msgid "/_View/_Update summary"
 msgstr "/_Vedere/Ar_bore"
 
-#: src/mainwindow.c:682 src/messageview.c:237
+#: src/mainwindow.c:673 src/messageview.c:237
 msgid "/_Message"
 msgstr "/_Mesaj"
 
-#: src/mainwindow.c:683
+#: src/mainwindow.c:674
 #, fuzzy
 msgid "/_Message/Recei_ve"
 msgstr "/_Mesaj/Re_editare"
 
-#: src/mainwindow.c:684
+#: src/mainwindow.c:675
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/_Mesaj/Recepţion_are poştă pentru toate conturile"
 
-#: src/mainwindow.c:686
+#: src/mainwindow.c:677
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/_Mesaj/Recepţion_are poştă pentru toate conturile"
 
-#: src/mainwindow.c:688
+#: src/mainwindow.c:679
 #, fuzzy
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/_Message/Salvare şi _continuare"
 
-#: src/mainwindow.c:690
+#: src/mainwindow.c:681
 #, fuzzy
 msgid "/_Message/Recei_ve/---"
 msgstr "/_Mesaj/Re_editare"
 
-#: src/mainwindow.c:691
+#: src/mainwindow.c:682
 #, fuzzy
 msgid "/_Message/_Send queued messages"
 msgstr "/_Mesaj/Trimite mesa_jele din lista de aşteptare"
 
-#: src/mainwindow.c:692 src/mainwindow.c:694 src/mainwindow.c:701
-#: src/mainwindow.c:706 src/mainwindow.c:710 src/mainwindow.c:719
-#: src/mainwindow.c:722 src/messageview.c:240 src/messageview.c:248
+#: src/mainwindow.c:683 src/mainwindow.c:685 src/mainwindow.c:692
+#: src/mainwindow.c:697 src/mainwindow.c:701 src/mainwindow.c:710
+#: src/mainwindow.c:713 src/messageview.c:240 src/messageview.c:248
 #: src/messageview.c:253
 msgid "/_Message/---"
 msgstr "/_Mesaj/---"
 
-#: src/mainwindow.c:693 src/messageview.c:238
+#: src/mainwindow.c:684 src/messageview.c:238
 msgid "/_Message/Compose _new message"
 msgstr "/_Mesaj/Compunere mesaj _nou"
 
-#: src/mainwindow.c:695 src/messageview.c:241
+#: src/mainwindow.c:686 src/messageview.c:241
 msgid "/_Message/_Reply"
 msgstr "/_Mesaj/_Răspunde"
 
-#: src/mainwindow.c:696
+#: src/mainwindow.c:687
 #, fuzzy
 msgid "/_Message/Repl_y to"
 msgstr "/_Mesaj/Răspunde _la toţi"
 
-#: src/mainwindow.c:697 src/messageview.c:242
+#: src/mainwindow.c:688 src/messageview.c:242
 #, fuzzy
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Mesaj/Răspunde _la toţi"
 
-#: src/mainwindow.c:698 src/messageview.c:244
+#: src/mainwindow.c:689 src/messageview.c:244
 #, fuzzy
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Mesaj/_Răspuns"
 
-#: src/mainwindow.c:699 src/messageview.c:246
+#: src/mainwindow.c:690 src/messageview.c:246
 #, fuzzy
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Mesaj/Răspunde _la toţi"
 
-#: src/mainwindow.c:702 src/messageview.c:249
+#: src/mainwindow.c:693 src/messageview.c:249
 msgid "/_Message/_Forward"
 msgstr "/_Mesaj/Î_naintare"
 
-#: src/mainwindow.c:703 src/messageview.c:250
+#: src/mainwindow.c:694 src/messageview.c:250
 #, fuzzy
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Mesaj/Înaintare ca a_taşament"
 
-#: src/mainwindow.c:705 src/messageview.c:252
+#: src/mainwindow.c:696 src/messageview.c:252
 #, fuzzy
 msgid "/_Message/Redirec_t"
 msgstr "/_Mesaj/Re_editare"
 
-#: src/mainwindow.c:707
+#: src/mainwindow.c:698
 msgid "/_Message/M_ove..."
 msgstr "/_Mesaj/M_utare..."
 
-#: src/mainwindow.c:708
+#: src/mainwindow.c:699
 #, fuzzy
 msgid "/_Message/_Copy..."
 msgstr "/_Mesaj/M_utare..."
 
-#: src/mainwindow.c:709
+#: src/mainwindow.c:700
 msgid "/_Message/_Delete"
 msgstr "/_Mesaj/Şter_gere"
 
-#: src/mainwindow.c:711
+#: src/mainwindow.c:702
 msgid "/_Message/_Mark"
 msgstr "/_Mesaj/_Marcare"
 
-#: src/mainwindow.c:712
+#: src/mainwindow.c:703
 msgid "/_Message/_Mark/_Mark"
 msgstr "/_Mesaj/_Marcare/_Marcare"
 
-#: src/mainwindow.c:713
+#: src/mainwindow.c:704
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/_Mesaj/_Marcare/_Demarcare"
 
-#: src/mainwindow.c:714
+#: src/mainwindow.c:705
 msgid "/_Message/_Mark/---"
 msgstr "/_Mesaj/_Marcare/---"
 
-#: src/mainwindow.c:715
+#: src/mainwindow.c:706
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/_Mesaj/_Marcare/Marcare mesaj n_ecitit"
 
-#: src/mainwindow.c:716
+#: src/mainwindow.c:707
 #, fuzzy
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/_Mesaj/_Marcare/Marcare mesaj n_ecitit"
 
-#: src/mainwindow.c:718
+#: src/mainwindow.c:709
 #, fuzzy
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/_Mesaj/_Marcare/Marcare mesaj n_ecitit"
 
-#: src/mainwindow.c:720
+#: src/mainwindow.c:711
 #, fuzzy
 msgid "/_Message/Set as _junk mail"
 msgstr "/_Mesaj/Recepţ_ionare poştă"
 
-#: src/mainwindow.c:721
+#: src/mainwindow.c:712
 #, fuzzy
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/_Mesaj/Recepţ_ionare poştă"
 
-#: src/mainwindow.c:723 src/messageview.c:254
+#: src/mainwindow.c:714 src/messageview.c:254
 #, fuzzy
 msgid "/_Message/Re-_edit"
 msgstr "/_Mesaj/Re_editare"
 
-#: src/mainwindow.c:727
+#: src/mainwindow.c:718
 #, fuzzy
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/_Utilitare/_Agendă"
 
-#: src/mainwindow.c:730
+#: src/mainwindow.c:721
 #, fuzzy
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/Re_zumat/_Filtrare mesaje"
 
-#: src/mainwindow.c:732
+#: src/mainwindow.c:723
 #, fuzzy
 msgid "/_Tools/Filter _selected messages"
 msgstr "/Re_zumat/_Filtrare mesaje"
 
-#: src/mainwindow.c:734 src/messageview.c:261
+#: src/mainwindow.c:725 src/messageview.c:261
 #, fuzzy
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Fişier/Act_ualizare directoare"
 
-#: src/mainwindow.c:735 src/messageview.c:263
+#: src/mainwindow.c:726 src/messageview.c:263
 #, fuzzy
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Fişier/Act_ualizare directoare"
 
-#: src/mainwindow.c:737 src/messageview.c:265
+#: src/mainwindow.c:728 src/messageview.c:265
 #, fuzzy
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Fişier/Act_ualizare directoare"
 
-#: src/mainwindow.c:739 src/messageview.c:267
+#: src/mainwindow.c:730 src/messageview.c:267
 #, fuzzy
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Fişier/Act_ualizare directoare"
 
-#: src/mainwindow.c:741 src/messageview.c:269
+#: src/mainwindow.c:732 src/messageview.c:269
 #, fuzzy
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Fişier/Act_ualizare directoare"
 
-#: src/mainwindow.c:744
+#: src/mainwindow.c:735
 #, fuzzy
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/Re_zumat/_Filtrare mesaje"
 
-#: src/mainwindow.c:746
+#: src/mainwindow.c:737
 #, fuzzy
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/Re_zumat/_Filtrare mesaje"
 
-#: src/mainwindow.c:751
+#: src/mainwindow.c:742
 #, fuzzy
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/Re_zumat/Ştergere mesaje _duplicate"
 
-#: src/mainwindow.c:754
+#: src/mainwindow.c:745
 #, fuzzy
 msgid "/_Tools/E_xecute"
 msgstr "/E_xecutare"
 
-#: src/mainwindow.c:756
+#: src/mainwindow.c:747
 #, fuzzy
 msgid "/_Tools/_Log window"
 msgstr "/_Utilitare/Fereastră _jurnal"
 
-#: src/mainwindow.c:758
+#: src/mainwindow.c:749
 msgid "/_Configuration"
 msgstr "/_Configuraţie"
 
-#: src/mainwindow.c:759
+#: src/mainwindow.c:750
 msgid "/_Configuration/_Common preferences..."
 msgstr "/_Configuraţie/Preferinţe _comune..."
 
-#: src/mainwindow.c:761
+#: src/mainwindow.c:752
 #, fuzzy
 msgid "/_Configuration/_Filter setting..."
 msgstr "/_Configuraţie/_Editare conturi..."
 
-#: src/mainwindow.c:763
+#: src/mainwindow.c:754
 #, fuzzy
 msgid "/_Configuration/_Template..."
 msgstr "/_Configuraţie/_Editare conturi..."
 
-#: src/mainwindow.c:764
+#: src/mainwindow.c:755
 #, fuzzy
 msgid "/_Configuration/_Actions..."
 msgstr "/_Configuraţie/_Editare conturi..."
 
-#: src/mainwindow.c:765
+#: src/mainwindow.c:756
 msgid "/_Configuration/---"
 msgstr "/_Configuraţie/---"
 
-#: src/mainwindow.c:766
+#: src/mainwindow.c:757
 #, fuzzy
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Configuraţie/_Preferinţe per cont..."
 
-#: src/mainwindow.c:768
+#: src/mainwindow.c:759
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Configuraţie/Creare cont _nou..."
 
-#: src/mainwindow.c:770
+#: src/mainwindow.c:761
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Configuraţie/_Editare conturi..."
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:763
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Configuraţie/_Selectare cont curent"
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:767
 msgid "/_Help/_Manual"
 msgstr "/_Ajutor/_Manual"
 
-#: src/mainwindow.c:777
+#: src/mainwindow.c:768
 msgid "/_Help/_Manual/_English"
 msgstr "/_Ajutor/_Manual/_Engleză"
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:769
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/_Ajutor/_Manual/_Japoneză"
 
-#: src/mainwindow.c:779
+#: src/mainwindow.c:770
 #, fuzzy
 msgid "/_Help/_FAQ"
 msgstr "/A_jutor/_Despre"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:771
 #, fuzzy
 msgid "/_Help/_FAQ/_English"
 msgstr "/_Ajutor/_Manual/_Engleză"
 
-#: src/mainwindow.c:781
+#: src/mainwindow.c:772
 #, fuzzy
 msgid "/_Help/_FAQ/_German"
 msgstr "/_Ajutor/_Manual/_Engleză"
 
-#: src/mainwindow.c:782
+#: src/mainwindow.c:773
 #, fuzzy
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/_Ajutor/_Manual/_Engleză"
 
-#: src/mainwindow.c:783
+#: src/mainwindow.c:774
 msgid "/_Help/_FAQ/_French"
 msgstr ""
 
-#: src/mainwindow.c:784
+#: src/mainwindow.c:775
 #, fuzzy
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/_Ajutor/_Manual/_Engleză"
 
-#: src/mainwindow.c:785
+#: src/mainwindow.c:776
 msgid "/_Help/---"
 msgstr "/_Ajutor/---"
 
-#: src/mainwindow.c:825
+#: src/mainwindow.c:816
 msgid "Creating main window...\n"
 msgstr "Creare fereastră principală...\n"
 
-#: src/mainwindow.c:987
+#: src/mainwindow.c:973
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Fereastra principală: alocarea culorii %d a eşuat\n"
 
-#: src/mainwindow.c:1071 src/summaryview.c:2020 src/summaryview.c:2105
+#: src/mainwindow.c:1057 src/summaryview.c:2020 src/summaryview.c:2105
 #: src/summaryview.c:3342 src/summaryview.c:3415 src/summaryview.c:3728
 msgid "done.\n"
 msgstr "gata.\n"
 
-#: src/mainwindow.c:1196 src/mainwindow.c:1237 src/mainwindow.c:1265
+#: src/mainwindow.c:1182 src/mainwindow.c:1223 src/mainwindow.c:1251
 msgid "Untitled"
 msgstr "Neintitulat"
 
-#: src/mainwindow.c:1266
+#: src/mainwindow.c:1252
 msgid "none"
 msgstr "nimic"
 
-#: src/mainwindow.c:1316
+#: src/mainwindow.c:1302
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr ""
 
-#: src/mainwindow.c:1536
+#: src/mainwindow.c:1522
 msgid "Offline"
 msgstr ""
 
-#: src/mainwindow.c:1537
+#: src/mainwindow.c:1523
 msgid "You are offline. Go online?"
 msgstr ""
 
-#: src/mainwindow.c:1551
+#: src/mainwindow.c:1537
 #, fuzzy
 msgid "Empty all trash"
 msgstr "/_Fişier/_Curăţare gunoi"
 
-#: src/mainwindow.c:1552
+#: src/mainwindow.c:1538
 #, fuzzy
 msgid "Empty messages in all trash?"
 msgstr "Doriţi ştergerea tuturor mesajelor din gunoi ?"
 
-#: src/mainwindow.c:1580
+#: src/mainwindow.c:1566
 msgid "Add mailbox"
 msgstr "Adăugare cutie poştală"
 
-#: src/mainwindow.c:1581
+#: src/mainwindow.c:1567
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3327,16 +3327,16 @@ msgstr ""
 "Dacă este specificată o cutie poştală existentă, aceasta\n"
 "va fi scanată automat."
 
-#: src/mainwindow.c:1587
+#: src/mainwindow.c:1573
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Cutia poştală '%s' există deja."
 
-#: src/mainwindow.c:1592 src/setup.c:57
+#: src/mainwindow.c:1578 src/setup.c:57
 msgid "Mailbox"
 msgstr "Cutie poştală"
 
-#: src/mainwindow.c:1598 src/setup.c:63
+#: src/mainwindow.c:1584 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3346,155 +3346,155 @@ msgstr ""
 "Probabil că anumite fişiere există deja, sau nu aveţi permisiuni de "
 "scriereadecvate."
 
-#: src/mainwindow.c:1989
+#: src/mainwindow.c:1975
 msgid "Sylpheed - Folder View"
 msgstr ""
 
-#: src/mainwindow.c:2009 src/messageview.c:368
+#: src/mainwindow.c:1995 src/messageview.c:368
 msgid "Sylpheed - Message View"
 msgstr ""
 
-#: src/mainwindow.c:2156 src/summaryview.c:370
+#: src/mainwindow.c:2142 src/summaryview.c:370
 msgid "/_Reply"
 msgstr "/_Răspunde"
 
-#: src/mainwindow.c:2157
+#: src/mainwindow.c:2143
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "Răspunde la toţi"
 
-#: src/mainwindow.c:2158
+#: src/mainwindow.c:2144
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/Răspunde _la toţi"
 
-#: src/mainwindow.c:2159
+#: src/mainwindow.c:2145
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/Răspunde _la toţi"
 
-#: src/mainwindow.c:2164 src/summaryview.c:377
+#: src/mainwindow.c:2150 src/summaryview.c:377
 msgid "/_Forward"
 msgstr "/Î_naintare"
 
-#: src/mainwindow.c:2165 src/summaryview.c:378
+#: src/mainwindow.c:2151 src/summaryview.c:378
 #, fuzzy
 msgid "/For_ward as attachment"
 msgstr "/Înaintare ca a_taşament"
 
-#: src/mainwindow.c:2166 src/summaryview.c:379
+#: src/mainwindow.c:2152 src/summaryview.c:379
 #, fuzzy
 msgid "/Redirec_t"
 msgstr "/Re_editare"
 
-#: src/mainwindow.c:2205
+#: src/mainwindow.c:2188
 msgid "Get"
 msgstr "Ia"
 
-#: src/mainwindow.c:2206
+#: src/mainwindow.c:2189
 msgid "Incorporate new mail"
 msgstr "Recepţionare mesaje noi pentru contul curent"
 
-#: src/mainwindow.c:2213
+#: src/mainwindow.c:2196
 msgid "Get all"
 msgstr "Ia tot"
 
-#: src/mainwindow.c:2214
+#: src/mainwindow.c:2197
 msgid "Incorporate new mail of all accounts"
 msgstr "Recepţionare mesaje noi pentru toate conturile"
 
-#: src/mainwindow.c:2225
+#: src/mainwindow.c:2208
 msgid "Send queued message(s)"
 msgstr "Trimiterea mesajului(lor) din lista de aşteptare"
 
-#: src/mainwindow.c:2235 src/prefs_account.c:721 src/prefs_common.c:949
+#: src/mainwindow.c:2218 src/prefs_account.c:721 src/prefs_common.c:949
 #: src/prefs_folder_item.c:137
 msgid "Compose"
 msgstr "Creare"
 
-#: src/mainwindow.c:2236
+#: src/mainwindow.c:2219
 msgid "Compose new message"
 msgstr "Creare mesaj nou"
 
-#: src/mainwindow.c:2244 src/prefs_common.c:1448
+#: src/mainwindow.c:2227 src/prefs_common.c:1448
 msgid "Reply"
 msgstr "Răspuns"
 
-#: src/mainwindow.c:2245 src/mainwindow.c:2258
+#: src/mainwindow.c:2228 src/mainwindow.c:2241
 msgid "Reply to the message"
 msgstr "Răspunde la mesaj"
 
-#: src/mainwindow.c:2263
+#: src/mainwindow.c:2245
 msgid "Reply all"
 msgstr "Răspuns toţi"
 
-#: src/mainwindow.c:2264
+#: src/mainwindow.c:2246
 msgid "Reply to all"
 msgstr "Răspunde la toţi"
 
-#: src/mainwindow.c:2272 src/prefs_filter_edit.c:741
+#: src/mainwindow.c:2254 src/prefs_filter_edit.c:741
 msgid "Forward"
 msgstr "Înaintare"
 
-#: src/mainwindow.c:2273 src/mainwindow.c:2286
+#: src/mainwindow.c:2255 src/mainwindow.c:2268
 msgid "Forward the message"
 msgstr "Înaintare mesaj"
 
-#: src/mainwindow.c:2293
+#: src/mainwindow.c:2275
 msgid "Delete the message"
 msgstr "Ştergere mesaj"
 
-#: src/mainwindow.c:2301 src/prefs_common.c:1988
+#: src/mainwindow.c:2283 src/prefs_common.c:1988
 msgid "Junk"
 msgstr ""
 
-#: src/mainwindow.c:2302
+#: src/mainwindow.c:2284
 msgid "Set as junk mail"
 msgstr ""
 
-#: src/mainwindow.c:2311
+#: src/mainwindow.c:2293
 msgid "Execute"
 msgstr "Executare"
 
-#: src/mainwindow.c:2312
+#: src/mainwindow.c:2294
 msgid "Execute marked process"
 msgstr "Execută toate procesele marcate"
 
-#: src/mainwindow.c:2322
+#: src/mainwindow.c:2304
 msgid "Next unread message"
 msgstr "Următorul mesaj necitit"
 
-#: src/mainwindow.c:2334
+#: src/mainwindow.c:2316
 msgid "Prefs"
 msgstr "Preferinţe"
 
-#: src/mainwindow.c:2335
+#: src/mainwindow.c:2317
 #, fuzzy
 msgid "Common preferences"
 msgstr "Preferinţe comune"
 
-#: src/mainwindow.c:2343 src/prefs_folder_item.c:261
+#: src/mainwindow.c:2325 src/prefs_folder_item.c:261
 #: src/prefs_folder_item.c:272 src/progressdialog.c:128
 msgid "Account"
 msgstr "Cont"
 
-#: src/mainwindow.c:2344
+#: src/mainwindow.c:2326
 msgid "Account setting"
 msgstr "Setări cont curent"
 
-#: src/mainwindow.c:2527
+#: src/mainwindow.c:2498
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 
-#: src/mainwindow.c:2538
+#: src/mainwindow.c:2509
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 
-#: src/mainwindow.c:2731
+#: src/mainwindow.c:2702
 msgid "Exit"
 msgstr "Ieşire"
 
-#: src/mainwindow.c:2731
+#: src/mainwindow.c:2702
 msgid "Exit this program?"
 msgstr "Doriţi să părăsiţi acest program ?"
 
@@ -5781,11 +5781,11 @@ msgstr "Creare dialog de progres...\n"
 msgid "Status"
 msgstr ""
 
-#: src/recv.c:113
+#: src/recv.c:112
 msgid "error occurred while retrieving data.\n"
 msgstr "a apărut o eroare la recepţionarea datelor.\n"
 
-#: src/recv.c:155 src/recv.c:197 src/recv.c:213
+#: src/recv.c:154 src/recv.c:196 src/recv.c:211
 msgid "Can't write to file.\n"
 msgstr "Scrierea în fişier este imposibilă.\n"
 
@@ -6580,7 +6580,7 @@ msgstr ""
 msgid "%.2fGB"
 msgstr ""
 
-#: src/utils.c:2372 src/utils.c:2496
+#: src/utils.c:2386 src/utils.c:2510
 #, c-format
 msgid "writing to %s failed.\n"
 msgstr "scrierea în %s a eşuat.\n"
diff --git a/po/ru.po b/po/ru.po
index 83fcb062..4343f918 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed 1.0.0beta4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-08-09 18:08+0900\n"
+"POT-Creation-Date: 2005-08-22 17:22+0900\n"
 "PO-Revision-Date: 2004-12-05 17:16+0300\n"
 "Last-Translator: Sergey Vlasov <vsu@altlinux.ru>\n"
 "Language-Team: Russian <ru@li.org>\n"
@@ -99,7 +99,7 @@ msgstr ""
 "по команде 'Получить все'."
 
 #: src/account.c:691 src/addressadd.c:192 src/addressbook.c:490
-#: src/compose.c:4081 src/editaddress.c:200 src/editaddress.c:942
+#: src/compose.c:4079 src/editaddress.c:200 src/editaddress.c:942
 #: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:265
 #: src/editjpilot.c:271 src/editldap.c:307 src/editvcard.c:184
 #: src/mimeview.c:201 src/prefs_filter.c:258 src/prefs_folder_item.c:170
@@ -237,7 +237,7 @@ msgstr "Пользовательский параметр действия"
 msgid "Add Address to Book"
 msgstr "Добавление адреса в книгу"
 
-#: src/addressadd.c:202 src/compose.c:4528 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4521 src/editaddress.c:201
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "Адрес"
@@ -251,7 +251,7 @@ msgstr "Примечание"
 msgid "Select Address Book Folder"
 msgstr "Выберите папку в адресной книге"
 
-#: src/addressbook.c:336 src/compose.c:495 src/mainwindow.c:470
+#: src/addressbook.c:336 src/compose.c:493 src/mainwindow.c:461
 #: src/messageview.c:137
 msgid "/_File"
 msgstr "/Файл"
@@ -272,10 +272,10 @@ msgstr "/Файл/Новый файл JPilot"
 msgid "/_File/New _Server"
 msgstr "/Файл/Новый сервер"
 
-#: src/addressbook.c:345 src/addressbook.c:348 src/compose.c:500
-#: src/compose.c:505 src/compose.c:509 src/mainwindow.c:488
-#: src/mainwindow.c:491 src/mainwindow.c:493 src/mainwindow.c:496
-#: src/mainwindow.c:498 src/messageview.c:140
+#: src/addressbook.c:345 src/addressbook.c:348 src/compose.c:498
+#: src/compose.c:503 src/compose.c:507 src/mainwindow.c:479
+#: src/mainwindow.c:482 src/mainwindow.c:484 src/mainwindow.c:487
+#: src/mainwindow.c:489 src/messageview.c:140
 msgid "/_File/---"
 msgstr "/Файл/---"
 
@@ -291,7 +291,7 @@ msgstr "/Файл/Удалить"
 msgid "/_File/_Save"
 msgstr "/Файл/Сохранить"
 
-#: src/addressbook.c:350 src/compose.c:510 src/messageview.c:141
+#: src/addressbook.c:350 src/compose.c:508 src/messageview.c:141
 msgid "/_File/_Close"
 msgstr "/Файл/Закрыть"
 
@@ -323,7 +323,7 @@ msgstr "/Адрес/Правка"
 msgid "/_Address/_Delete"
 msgstr "/Адрес/Удалить"
 
-#: src/addressbook.c:358 src/compose.c:619 src/mainwindow.c:725
+#: src/addressbook.c:358 src/compose.c:617 src/mainwindow.c:716
 #: src/messageview.c:256
 msgid "/_Tools"
 msgstr "/Инструменты"
@@ -332,12 +332,12 @@ msgstr "/Инструменты"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/Инструменты/Импорт файла LDIF"
 
-#: src/addressbook.c:360 src/compose.c:632 src/mainwindow.c:775
+#: src/addressbook.c:360 src/compose.c:630 src/mainwindow.c:766
 #: src/messageview.c:274
 msgid "/_Help"
 msgstr "/Справка"
 
-#: src/addressbook.c:361 src/compose.c:633 src/mainwindow.c:786
+#: src/addressbook.c:361 src/compose.c:631 src/mainwindow.c:777
 #: src/messageview.c:275
 msgid "/_Help/_About"
 msgstr "/Справка/О программе"
@@ -354,7 +354,7 @@ msgstr "/Новая группа"
 msgid "/New _Folder"
 msgstr "/Новая папка"
 
-#: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:489
+#: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:487
 #: src/folderview.c:235 src/folderview.c:237 src/folderview.c:241
 #: src/folderview.c:252 src/folderview.c:254 src/folderview.c:256
 #: src/folderview.c:260 src/folderview.c:270 src/folderview.c:272
@@ -364,8 +364,8 @@ msgstr "/Новая папка"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:512
-#: src/mainwindow.c:502 src/messageview.c:143
+#: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:510
+#: src/mainwindow.c:493 src/messageview.c:143
 msgid "/_Edit"
 msgstr "/Правка"
 
@@ -377,7 +377,7 @@ msgstr "/Удалить"
 msgid "E-Mail address"
 msgstr "Адрес E-Mail"
 
-#: src/addressbook.c:495 src/compose.c:4529 src/prefs_common.c:2402
+#: src/addressbook.c:495 src/compose.c:4522 src/prefs_common.c:2402
 msgid "Address book"
 msgstr "Адресная книга"
 
@@ -386,8 +386,8 @@ msgid "Name:"
 msgstr "Имя:"
 
 #. Buttons
-#: src/addressbook.c:627 src/addressbook.c:1673 src/editaddress.c:884
-#: src/editaddress.c:1017 src/mainwindow.c:2292 src/prefs_actions.c:266
+#: src/addressbook.c:627 src/addressbook.c:1674 src/editaddress.c:884
+#: src/editaddress.c:1017 src/mainwindow.c:2274 src/prefs_actions.c:266
 #: src/prefs_display_header.c:278 src/prefs_display_header.c:333
 #: src/prefs_template.c:231
 msgid "Delete"
@@ -426,7 +426,7 @@ msgstr "Удалить адрес(а)"
 msgid "Really delete the address(es)?"
 msgstr "Действительно удалить адрес(а)?"
 
-#: src/addressbook.c:1664
+#: src/addressbook.c:1665
 #, fuzzy, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -435,38 +435,38 @@ msgstr ""
 "Вы хотите удалить папку \"%s\" и все адреса в ней?\n"
 "Если удалить только папку, адреса будут перемещены в родительскую папку."
 
-#: src/addressbook.c:1667 src/folderview.c:2139
+#: src/addressbook.c:1668 src/folderview.c:2139
 msgid "Delete folder"
 msgstr "Удалить папку"
 
-#: src/addressbook.c:1667
+#: src/addressbook.c:1668
 #, fuzzy
 msgid "_Folder only"
 msgstr "Только папку"
 
-#: src/addressbook.c:1667
+#: src/addressbook.c:1668
 #, fuzzy
 msgid "Folder and _addresses"
 msgstr "Папку и адреса"
 
-#: src/addressbook.c:1672
+#: src/addressbook.c:1673
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Действительно удалить '%s' ?"
 
-#: src/addressbook.c:2352 src/addressbook.c:2485
+#: src/addressbook.c:2353 src/addressbook.c:2486
 msgid "New user, could not save index file."
 msgstr "Новый пользователь; не удалось сохранить индексный файл."
 
-#: src/addressbook.c:2356 src/addressbook.c:2489
+#: src/addressbook.c:2357 src/addressbook.c:2490
 msgid "New user, could not save address book files."
 msgstr "Новый пользователь; не удалось сохранить файлы адресной книги."
 
-#: src/addressbook.c:2366 src/addressbook.c:2499
+#: src/addressbook.c:2367 src/addressbook.c:2500
 msgid "Old address book converted successfully."
 msgstr "Старая адресная книга успешно преобразована."
 
-#: src/addressbook.c:2371
+#: src/addressbook.c:2372
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -474,7 +474,7 @@ msgstr ""
 "Старая адресная книга преобразована,\n"
 "не удалось сохранить новый индексный файл."
 
-#: src/addressbook.c:2384
+#: src/addressbook.c:2385
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -482,7 +482,7 @@ msgstr ""
 "Не удалось преобразовать адресную книгу,\n"
 "создана пустая адресная книга."
 
-#: src/addressbook.c:2390
+#: src/addressbook.c:2391
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -490,7 +490,7 @@ msgstr ""
 "Не удалось преобразовать адресную книгу,\n"
 "ошибка при создании файлов адресной книги."
 
-#: src/addressbook.c:2395
+#: src/addressbook.c:2396
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -498,90 +498,90 @@ msgstr ""
 "Не удалось преобразовать адресную книгу,\n"
 "кроме того, произошла ошибка при создании файлов новой адресной книги."
 
-#: src/addressbook.c:2402
+#: src/addressbook.c:2403
 msgid "Addressbook conversion error"
 msgstr "Ошибка преобразования адресной книги"
 
-#: src/addressbook.c:2406
+#: src/addressbook.c:2407
 msgid "Addressbook conversion"
 msgstr "Преобразование адресной книги"
 
-#: src/addressbook.c:2441
+#: src/addressbook.c:2442
 msgid "Addressbook Error"
 msgstr "Ошибка при работе с адресной книгой"
 
-#: src/addressbook.c:2442 src/addressbook.c:2542
+#: src/addressbook.c:2443 src/addressbook.c:2543
 msgid "Could not read address index"
 msgstr "Не удалось прочитать индекс адресов"
 
-#: src/addressbook.c:2504
+#: src/addressbook.c:2505
 msgid "Old address book converted, could not save new address index file"
 msgstr ""
 "Старая адресная книга преобразована, не удалось сохранить новый индексный "
 "файл"
 
-#: src/addressbook.c:2518
+#: src/addressbook.c:2519
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr ""
 "Не удалось преобразовать адресную книгу, создана пустая адресная книга."
 
-#: src/addressbook.c:2524
+#: src/addressbook.c:2525
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr ""
 "Не удалось преобразовать адресную книгу, ошибка при создании новых файлов "
 "адресной книги"
 
-#: src/addressbook.c:2530
+#: src/addressbook.c:2531
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr ""
 "Не удалось преобразовать адресную книгу, кроме того, произошла ошибка при "
 "создании новых файлов адресной книги."
 
-#: src/addressbook.c:2548
+#: src/addressbook.c:2549
 msgid "Addressbook Conversion Error"
 msgstr "Ошибка преобразования адресной книги"
 
-#: src/addressbook.c:2554
+#: src/addressbook.c:2555
 msgid "Addressbook Conversion"
 msgstr "Преобразование адресной книги"
 
-#: src/addressbook.c:3055 src/prefs_common.c:963
+#: src/addressbook.c:3056 src/prefs_common.c:963
 msgid "Interface"
 msgstr "Интерфейс"
 
-#: src/addressbook.c:3071 src/importldif.c:514
+#: src/addressbook.c:3072 src/importldif.c:514
 msgid "Address Book"
 msgstr "Адресная книга"
 
-#: src/addressbook.c:3087
+#: src/addressbook.c:3088
 msgid "Person"
 msgstr "Контакт"
 
-#: src/addressbook.c:3103
+#: src/addressbook.c:3104
 msgid "EMail Address"
 msgstr "Адрес E-Mail"
 
-#: src/addressbook.c:3119
+#: src/addressbook.c:3120
 msgid "Group"
 msgstr "Группа"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3135 src/folderview.c:346 src/prefs_account.c:1866
+#: src/addressbook.c:3136 src/folderview.c:346 src/prefs_account.c:1866
 msgid "Folder"
 msgstr "Папка"
 
-#: src/addressbook.c:3151
+#: src/addressbook.c:3152
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3167 src/addressbook.c:3183
+#: src/addressbook.c:3168 src/addressbook.c:3184
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3199
+#: src/addressbook.c:3200
 msgid "LDAP Server"
 msgstr "Сервер LDAP"
 
@@ -593,7 +593,7 @@ msgstr "Адреса организаций"
 msgid "Personal address"
 msgstr "Личные адреса"
 
-#: src/alertpanel.c:138 src/compose.c:5214 src/main.c:515
+#: src/alertpanel.c:138 src/compose.c:5208 src/main.c:515
 msgid "Notice"
 msgstr "Уведомление"
 
@@ -648,373 +648,373 @@ msgstr "Коричневый"
 msgid "None"
 msgstr "Нет"
 
-#: src/compose.c:487
+#: src/compose.c:485
 msgid "/_Add..."
 msgstr "/Добавить..."
 
-#: src/compose.c:488
+#: src/compose.c:486
 msgid "/_Remove"
 msgstr "/Удалить"
 
-#: src/compose.c:490 src/folderview.c:243 src/folderview.c:262
+#: src/compose.c:488 src/folderview.c:243 src/folderview.c:262
 #: src/folderview.c:277
 msgid "/_Properties..."
 msgstr "/Свойства..."
 
-#: src/compose.c:496
+#: src/compose.c:494
 msgid "/_File/_Send"
 msgstr "/Файл/Отправить"
 
-#: src/compose.c:498
+#: src/compose.c:496
 msgid "/_File/Send _later"
 msgstr "/Файл/Отправить позже"
 
-#: src/compose.c:501
+#: src/compose.c:499
 msgid "/_File/Save to _draft folder"
 msgstr "/Файл/Сохранить в папке черновиков"
 
-#: src/compose.c:503
+#: src/compose.c:501
 msgid "/_File/Save and _keep editing"
 msgstr "/Файл/Сохранить и продолжить правку"
 
-#: src/compose.c:506
+#: src/compose.c:504
 msgid "/_File/_Attach file"
 msgstr "/Файл/Вложить файл"
 
-#: src/compose.c:507
+#: src/compose.c:505
 msgid "/_File/_Insert file"
 msgstr "/Файл/Вставить текст из файла"
 
-#: src/compose.c:508
+#: src/compose.c:506
 msgid "/_File/Insert si_gnature"
 msgstr "/Файл/Добавить подпись"
 
-#: src/compose.c:513
+#: src/compose.c:511
 msgid "/_Edit/_Undo"
 msgstr "/Правка/Откат"
 
-#: src/compose.c:514
+#: src/compose.c:512
 msgid "/_Edit/_Redo"
 msgstr "/Правка/Откат отката"
 
-#: src/compose.c:515 src/compose.c:522 src/mainwindow.c:506
+#: src/compose.c:513 src/compose.c:520 src/mainwindow.c:497
 #: src/messageview.c:146
 msgid "/_Edit/---"
 msgstr "/Правка/---"
 
-#: src/compose.c:516
+#: src/compose.c:514
 msgid "/_Edit/Cu_t"
 msgstr "/Правка/Вырезать"
 
-#: src/compose.c:517 src/mainwindow.c:503 src/messageview.c:144
+#: src/compose.c:515 src/mainwindow.c:494 src/messageview.c:144
 msgid "/_Edit/_Copy"
 msgstr "/Правка/Копировать"
 
-#: src/compose.c:518
+#: src/compose.c:516
 msgid "/_Edit/_Paste"
 msgstr "/Правка/Вставить"
 
-#: src/compose.c:519
+#: src/compose.c:517
 msgid "/_Edit/Paste as _quotation"
 msgstr "/Правка/Вставить как цитату"
 
-#: src/compose.c:521 src/mainwindow.c:504 src/messageview.c:145
+#: src/compose.c:519 src/mainwindow.c:495 src/messageview.c:145
 msgid "/_Edit/Select _all"
 msgstr "/Правка/Выделить все"
 
-#: src/compose.c:523
+#: src/compose.c:521
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/Правка/Отформатировать абзац"
 
-#: src/compose.c:525
+#: src/compose.c:523
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/Правка/Отформатировать все сообщение"
 
-#: src/compose.c:527
+#: src/compose.c:525
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/Правка/Перенос по словам при вводе"
 
-#: src/compose.c:528 src/mainwindow.c:511 src/messageview.c:150
+#: src/compose.c:526 src/mainwindow.c:502 src/messageview.c:150
 #: src/summaryview.c:400
 msgid "/_View"
 msgstr "/Вид"
 
-#: src/compose.c:529
+#: src/compose.c:527
 msgid "/_View/_To"
 msgstr "/Вид/Кому"
 
-#: src/compose.c:530
+#: src/compose.c:528
 msgid "/_View/_Cc"
 msgstr "/Вид/Копия"
 
-#: src/compose.c:531
+#: src/compose.c:529
 msgid "/_View/_Bcc"
 msgstr "/Вид/Скрытая копия"
 
-#: src/compose.c:532
+#: src/compose.c:530
 msgid "/_View/_Reply to"
 msgstr "/Вид/Адрес для ответа"
 
-#: src/compose.c:533 src/compose.c:535 src/compose.c:537 src/compose.c:539
-#: src/mainwindow.c:529 src/mainwindow.c:532 src/mainwindow.c:558
-#: src/mainwindow.c:582 src/mainwindow.c:675 src/mainwindow.c:679
+#: src/compose.c:531 src/compose.c:533 src/compose.c:535 src/compose.c:537
+#: src/mainwindow.c:520 src/mainwindow.c:523 src/mainwindow.c:549
+#: src/mainwindow.c:573 src/mainwindow.c:666 src/mainwindow.c:670
 #: src/messageview.c:233
 msgid "/_View/---"
 msgstr "/Вид/---"
 
-#: src/compose.c:534
+#: src/compose.c:532
 msgid "/_View/_Followup to"
 msgstr "/Вид/Группы новостей для ответа"
 
-#: src/compose.c:536
+#: src/compose.c:534
 msgid "/_View/R_uler"
 msgstr "/Вид/Линейка"
 
-#: src/compose.c:538
+#: src/compose.c:536
 msgid "/_View/_Attachment"
 msgstr "/Вид/Вложения"
 
-#: src/compose.c:545 src/mainwindow.c:589 src/messageview.c:157
+#: src/compose.c:543 src/mainwindow.c:580 src/messageview.c:157
 #, fuzzy
 msgid "/_View/Character _encoding"
 msgstr "/Вид/Сортировка/По убыванию"
 
-#: src/compose.c:546
+#: src/compose.c:544
 msgid "/_View/Character _encoding/_Automatic"
 msgstr ""
 
-#: src/compose.c:548 src/compose.c:554 src/compose.c:560 src/compose.c:564
-#: src/compose.c:570 src/compose.c:574 src/compose.c:580 src/compose.c:584
-#: src/compose.c:594 src/compose.c:598 src/compose.c:608 src/compose.c:612
-#: src/mainwindow.c:585 src/mainwindow.c:592 src/messageview.c:153
+#: src/compose.c:546 src/compose.c:552 src/compose.c:558 src/compose.c:562
+#: src/compose.c:568 src/compose.c:572 src/compose.c:578 src/compose.c:582
+#: src/compose.c:592 src/compose.c:596 src/compose.c:606 src/compose.c:610
+#: src/mainwindow.c:576 src/mainwindow.c:583 src/messageview.c:153
 #, fuzzy
 msgid "/_View/Character _encoding/---"
 msgstr "/Вид/Сортировка/По убыванию"
 
-#: src/compose.c:550 src/mainwindow.c:593 src/messageview.c:161
+#: src/compose.c:548 src/mainwindow.c:584 src/messageview.c:161
 #, fuzzy
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/Вид/Кодировка/7-битный ascii (US-ASC_II)"
 
-#: src/compose.c:552 src/mainwindow.c:595 src/messageview.c:164
+#: src/compose.c:550 src/mainwindow.c:586 src/messageview.c:164
 #, fuzzy
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/Вид/Кодировка/Unicode (_UTF-8)"
 
-#: src/compose.c:556 src/mainwindow.c:599 src/messageview.c:167
+#: src/compose.c:554 src/mainwindow.c:590 src/messageview.c:167
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/Вид/Кодировка/Западноевропейская (ISO-8859-_1)"
 
-#: src/compose.c:558 src/mainwindow.c:601 src/messageview.c:169
+#: src/compose.c:556 src/mainwindow.c:592 src/messageview.c:169
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/Вид/Кодировка/Западноевропейская (ISO-8859-15)"
 
-#: src/compose.c:562 src/mainwindow.c:605 src/messageview.c:172
+#: src/compose.c:560 src/mainwindow.c:596 src/messageview.c:172
 #, fuzzy
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/Вид/Кодировка/Центральноевропейская (ISO-8859-_2)"
 
-#: src/compose.c:566 src/mainwindow.c:609 src/messageview.c:175
+#: src/compose.c:564 src/mainwindow.c:600 src/messageview.c:175
 #, fuzzy
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/Вид/Кодировка/Балтийская (ISO-8859-13)"
 
-#: src/compose.c:568 src/mainwindow.c:611 src/messageview.c:177
+#: src/compose.c:566 src/mainwindow.c:602 src/messageview.c:177
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/Вид/Кодировка/Балтийская (ISO-8859-_4)"
 
-#: src/compose.c:572 src/mainwindow.c:615 src/messageview.c:180
+#: src/compose.c:570 src/mainwindow.c:606 src/messageview.c:180
 #, fuzzy
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/Вид/Кодировка/Греческая (ISO-8859-_7)"
 
-#: src/compose.c:576 src/mainwindow.c:619 src/messageview.c:183
+#: src/compose.c:574 src/mainwindow.c:610 src/messageview.c:183
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/Вид/Кодировка/Греческая (ISO-8859-_7)"
 
-#: src/compose.c:578 src/mainwindow.c:621 src/messageview.c:185
+#: src/compose.c:576 src/mainwindow.c:612 src/messageview.c:185
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/Вид/Кодировка/Кириллическая _Win (Windows-1251)"
 
-#: src/compose.c:582 src/mainwindow.c:625 src/messageview.c:188
+#: src/compose.c:580 src/mainwindow.c:616 src/messageview.c:188
 #, fuzzy
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/Вид/Кодировка/Турецкая (ISO-8859-_9)"
 
-#: src/compose.c:586 src/mainwindow.c:629 src/messageview.c:191
+#: src/compose.c:584 src/mainwindow.c:620 src/messageview.c:191
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/Вид/Кодировка/Кириллическая (ISO-8859-_5)"
 
-#: src/compose.c:588 src/mainwindow.c:631 src/messageview.c:193
+#: src/compose.c:586 src/mainwindow.c:622 src/messageview.c:193
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/Вид/Кодировка/Русская (KOI8-_R)"
 
-#: src/compose.c:590 src/mainwindow.c:633 src/messageview.c:195
+#: src/compose.c:588 src/mainwindow.c:624 src/messageview.c:195
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/Вид/Кодировка/Украинская (KOI8-_U)"
 
-#: src/compose.c:592 src/mainwindow.c:635 src/messageview.c:197
+#: src/compose.c:590 src/mainwindow.c:626 src/messageview.c:197
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/Вид/Кодировка/Кириллическая _Win (Windows-1251)"
 
-#: src/compose.c:596 src/mainwindow.c:639 src/messageview.c:200
+#: src/compose.c:594 src/mainwindow.c:630 src/messageview.c:200
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/Вид/Кодировка/Японская (ISO-2022-_JP)"
 
-#: src/compose.c:600 src/mainwindow.c:649 src/messageview.c:209
+#: src/compose.c:598 src/mainwindow.c:640 src/messageview.c:209
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/Вид/Кодировка/Упрощенная китайская (_GB2312)"
 
-#: src/compose.c:602 src/mainwindow.c:651 src/messageview.c:211
+#: src/compose.c:600 src/mainwindow.c:642 src/messageview.c:211
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/Вид/Кодировка/Упрощенная китайская (_GB2312)"
 
-#: src/compose.c:604 src/mainwindow.c:653 src/messageview.c:213
+#: src/compose.c:602 src/mainwindow.c:644 src/messageview.c:213
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/Вид/Кодировка/Традиционная китайская (_Big5)"
 
-#: src/compose.c:606 src/mainwindow.c:655 src/messageview.c:215
+#: src/compose.c:604 src/mainwindow.c:646 src/messageview.c:215
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/Вид/Кодировка/Традиционная китайская (EUC-_TW)"
 
-#: src/compose.c:610 src/mainwindow.c:661 src/messageview.c:220
+#: src/compose.c:608 src/mainwindow.c:652 src/messageview.c:220
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/Вид/Кодировка/Корейская (EUC-_KR)"
 
-#: src/compose.c:614 src/mainwindow.c:667 src/messageview.c:225
+#: src/compose.c:612 src/mainwindow.c:658 src/messageview.c:225
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/Вид/Кодировка/Тайская (TIS-620)"
 
-#: src/compose.c:616 src/mainwindow.c:669 src/messageview.c:227
+#: src/compose.c:614 src/mainwindow.c:660 src/messageview.c:227
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/Вид/Кодировка/Тайская (Windows-874)"
 
-#: src/compose.c:620 src/mainwindow.c:726 src/messageview.c:257
+#: src/compose.c:618 src/mainwindow.c:717 src/messageview.c:257
 msgid "/_Tools/_Address book"
 msgstr "/Инструменты/Адресная книга"
 
-#: src/compose.c:621
+#: src/compose.c:619
 msgid "/_Tools/_Template"
 msgstr "/Инструменты/Шаблон"
 
-#: src/compose.c:622 src/mainwindow.c:749 src/messageview.c:272
+#: src/compose.c:620 src/mainwindow.c:740 src/messageview.c:272
 msgid "/_Tools/Actio_ns"
 msgstr "/Инструменты/Действия"
 
-#: src/compose.c:623 src/compose.c:627 src/mainwindow.c:729
-#: src/mainwindow.c:743 src/mainwindow.c:748 src/mainwindow.c:750
-#: src/mainwindow.c:753 src/mainwindow.c:755 src/messageview.c:260
+#: src/compose.c:621 src/compose.c:625 src/mainwindow.c:720
+#: src/mainwindow.c:734 src/mainwindow.c:739 src/mainwindow.c:741
+#: src/mainwindow.c:744 src/mainwindow.c:746 src/messageview.c:260
 #: src/messageview.c:271
 msgid "/_Tools/---"
 msgstr "/Инструменты/---"
 
-#: src/compose.c:624
+#: src/compose.c:622
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/Инструменты/Вызвать внешний редактор"
 
-#: src/compose.c:628
+#: src/compose.c:626
 msgid "/_Tools/PGP Si_gn"
 msgstr "/Инструменты/Подписать сообщение (PGP)"
 
-#: src/compose.c:629
+#: src/compose.c:627
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/Инструменты/Шифровать сообщение (PGP)"
 
-#: src/compose.c:855
+#: src/compose.c:853
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: файл не существует\n"
 
-#: src/compose.c:954 src/compose.c:1024 src/procmsg.c:1353
+#: src/compose.c:952 src/compose.c:1022 src/procmsg.c:1353
 msgid "Can't get text part\n"
 msgstr "Ошибка получения части текста\n"
 
-#: src/compose.c:1420
+#: src/compose.c:1418
 msgid "Quote mark format error."
 msgstr "Неверный формат метки цитирования."
 
-#: src/compose.c:1432
+#: src/compose.c:1430
 msgid "Message reply/forward format error."
 msgstr "Неверный формат шаблона ответа или пересылки."
 
-#: src/compose.c:1801
+#: src/compose.c:1799
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Файл %s не найден\n"
 
-#: src/compose.c:1805
+#: src/compose.c:1803
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Ошибка определения размера файла %s\n"
 
-#: src/compose.c:1809
+#: src/compose.c:1807
 #, c-format
 msgid "File %s is empty."
 msgstr "Файл %s пустой."
 
-#: src/compose.c:1813
+#: src/compose.c:1811
 #, c-format
 msgid "Can't read %s."
 msgstr "Невозможно прочитать %s."
 
-#: src/compose.c:1848
+#: src/compose.c:1846
 #, c-format
 msgid "Message: %s"
 msgstr "Сообщение: %s"
 
-#: src/compose.c:1920 src/mimeview.c:560
+#: src/compose.c:1918 src/mimeview.c:560
 msgid "Can't get the part of multipart message."
 msgstr "Ошибка при получении одного из компонентов сообщения."
 
-#: src/compose.c:2362
+#: src/compose.c:2360
 msgid " [Edited]"
 msgstr " [Изменено]"
 
-#: src/compose.c:2364
+#: src/compose.c:2362
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Подготовка сообщения%s"
 
-#: src/compose.c:2367
+#: src/compose.c:2365
 #, c-format
 msgid "Compose message%s"
 msgstr "Подготовка сообщения%s"
 
-#: src/compose.c:2478
+#: src/compose.c:2476
 msgid "Recipient is not specified."
 msgstr "Получатель сообщения не указан."
 
-#: src/compose.c:2486
+#: src/compose.c:2484
 #, fuzzy
 msgid "Empty subject"
 msgstr "Тема"
 
-#: src/compose.c:2487
+#: src/compose.c:2485
 msgid "Subject is empty. Send it anyway?"
 msgstr "Тема сообщения не указана. Отправить без темы?"
 
-#: src/compose.c:2538
+#: src/compose.c:2536
 msgid "can't get recipient list."
 msgstr "ошибка определения списка получателей."
 
-#: src/compose.c:2558
+#: src/compose.c:2556
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1022,26 +1022,26 @@ msgstr ""
 "Учетная запись для отправки почты не определена.\n"
 "Пожалуйста, выберите ее перед отправкой."
 
-#: src/compose.c:2572 src/send_message.c:297
+#: src/compose.c:2570 src/send_message.c:297
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Произошла ошибка при отправке сообщения на %s ."
 
-#: src/compose.c:2595
+#: src/compose.c:2593
 msgid "Can't save the message to outbox."
 msgstr "Ошибка сохранения сообщения в папке отправленных."
 
-#: src/compose.c:2645
+#: src/compose.c:2643
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "Не найден ключ, соответствующий выбранному идентификатору '%s'."
 
-#: src/compose.c:2709 src/compose.c:2965 src/compose.c:3028 src/compose.c:3148
-#: src/utils.c:2365
+#: src/compose.c:2707 src/compose.c:2963 src/compose.c:3026 src/compose.c:3146
+#: src/utils.c:2379
 msgid "can't change file mode\n"
 msgstr "не удалось изменить свойства файла\n"
 
-#: src/compose.c:2741
+#: src/compose.c:2739
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1052,12 +1052,12 @@ msgstr ""
 "из %s в %s.\n"
 "Все равно послать его?"
 
-#: src/compose.c:2747
+#: src/compose.c:2745
 #, fuzzy
 msgid "Code conversion error"
 msgstr "Ошибка преобразования адресной книги"
 
-#: src/compose.c:2816
+#: src/compose.c:2814
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1066,155 +1066,155 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:2820
+#: src/compose.c:2818
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3108
+#: src/compose.c:3106
 msgid "can't remove the old message\n"
 msgstr "ошибка удаления старого сообщения\n"
 
-#: src/compose.c:3126
+#: src/compose.c:3124
 msgid "queueing message...\n"
 msgstr "постановка сообщения в очередь...\n"
 
-#: src/compose.c:3208
+#: src/compose.c:3206
 msgid "can't find queue folder\n"
 msgstr "невозможно найти папку очереди\n"
 
-#: src/compose.c:3215
+#: src/compose.c:3213
 msgid "can't queue the message\n"
 msgstr "ошибка размещения в очереди\n"
 
-#: src/compose.c:3792
+#: src/compose.c:3790
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "создан Message-ID: %s\n"
 
-#: src/compose.c:3901
+#: src/compose.c:3899
 msgid "Creating compose window...\n"
 msgstr "Создание окна подготовки сообщения...\n"
 
-#: src/compose.c:3949 src/headerview.c:54 src/summary_search.c:214
+#: src/compose.c:3947 src/headerview.c:54 src/summary_search.c:214
 msgid "From:"
 msgstr "От:"
 
-#: src/compose.c:4021
+#: src/compose.c:4019
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/Инструменты/Подписать сообщение (PGP)"
 
-#: src/compose.c:4024
+#: src/compose.c:4022
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/Инструменты/Шифровать сообщение (PGP)"
 
-#: src/compose.c:4062 src/compose.c:5001
+#: src/compose.c:4060 src/compose.c:4995
 msgid "MIME type"
 msgstr "Тип MIME"
 
 #. S_COL_DATE
-#: src/compose.c:4071 src/mimeview.c:192 src/prefs_filter_edit.c:585
+#: src/compose.c:4069 src/mimeview.c:192 src/prefs_filter_edit.c:585
 #: src/prefs_summary_column.c:75 src/select-keys.c:317 src/summaryview.c:4217
 msgid "Size"
 msgstr "Размер"
 
-#: src/compose.c:4449 src/mainwindow.c:2224 src/prefs_account.c:719
+#: src/compose.c:4442 src/mainwindow.c:2207 src/prefs_account.c:719
 #: src/prefs_common.c:947
 msgid "Send"
 msgstr "Отправить"
 
-#: src/compose.c:4450
+#: src/compose.c:4443
 msgid "Send message"
 msgstr "Отправить сообщение"
 
-#: src/compose.c:4458
+#: src/compose.c:4451
 msgid "Send later"
 msgstr "Отправить позже"
 
-#: src/compose.c:4459
+#: src/compose.c:4452
 msgid "Put into queue folder and send later"
 msgstr "Поместить в очередь и отправить позже"
 
-#: src/compose.c:4467
+#: src/compose.c:4460
 msgid "Draft"
 msgstr "Черновики"
 
-#: src/compose.c:4468
+#: src/compose.c:4461
 msgid "Save to draft folder"
 msgstr "Сохранить в папке черновиков"
 
-#: src/compose.c:4478
+#: src/compose.c:4471
 msgid "Insert"
 msgstr "Вставить"
 
-#: src/compose.c:4479
+#: src/compose.c:4472
 msgid "Insert file"
 msgstr "Вставить файл"
 
-#: src/compose.c:4487
+#: src/compose.c:4480
 msgid "Attach"
 msgstr "Вложение"
 
-#: src/compose.c:4488
+#: src/compose.c:4481
 msgid "Attach file"
 msgstr "Вложить файл"
 
 #. signature
-#: src/compose.c:4498 src/prefs_account.c:1391 src/prefs_common.c:1356
+#: src/compose.c:4491 src/prefs_account.c:1391 src/prefs_common.c:1356
 msgid "Signature"
 msgstr "Подпись"
 
-#: src/compose.c:4499
+#: src/compose.c:4492
 msgid "Insert signature"
 msgstr "Добавить подпись"
 
-#: src/compose.c:4508 src/prefs_common.c:1378 src/prefs_common.c:2382
+#: src/compose.c:4501 src/prefs_common.c:1378 src/prefs_common.c:2382
 msgid "Editor"
 msgstr "Редактор"
 
-#: src/compose.c:4509
+#: src/compose.c:4502
 msgid "Edit with external editor"
 msgstr "Править внешним редактором"
 
-#: src/compose.c:4517
+#: src/compose.c:4510
 msgid "Linewrap"
 msgstr "Перенос строк"
 
-#: src/compose.c:4518
+#: src/compose.c:4511
 msgid "Wrap all long lines"
 msgstr "Отформатировать все сообщение"
 
-#: src/compose.c:4897
+#: src/compose.c:4891
 msgid "Invalid MIME type."
 msgstr "Неверный тип MIME."
 
-#: src/compose.c:4915
+#: src/compose.c:4909
 msgid "File doesn't exist or is empty."
 msgstr "Файл не существует или пуст."
 
-#: src/compose.c:4983
+#: src/compose.c:4977
 msgid "Properties"
 msgstr "Свойства"
 
-#: src/compose.c:5003
+#: src/compose.c:4997
 msgid "Encoding"
 msgstr "Кодировка"
 
-#: src/compose.c:5026 src/prefs_folder_item.c:183
+#: src/compose.c:5020 src/prefs_folder_item.c:183
 msgid "Path"
 msgstr "Путь"
 
-#: src/compose.c:5027
+#: src/compose.c:5021
 msgid "File name"
 msgstr "Имя файла"
 
-#: src/compose.c:5185
+#: src/compose.c:5179
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Неверная команда вызова внешнего редактора: '%s'\n"
 
-#: src/compose.c:5211
+#: src/compose.c:5205
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1225,75 +1225,75 @@ msgstr ""
 "Завершить процесс принудительно?\n"
 "Идентификатор группы процессов: %d"
 
-#: src/compose.c:5228
+#: src/compose.c:5222
 #, c-format
 msgid "Terminated process group id: %d"
 msgstr "Завершен процесс группы: %d"
 
-#: src/compose.c:5229
+#: src/compose.c:5223
 #, c-format
 msgid "Temporary file: %s"
 msgstr "Временный файл: %s"
 
-#: src/compose.c:5253
+#: src/compose.c:5247
 msgid "Compose: input from monitoring process\n"
 msgstr "Подготовка сообщения: ввод из процесса слежения\n"
 
 #. failed
-#: src/compose.c:5284
+#: src/compose.c:5278
 msgid "Couldn't exec external editor\n"
 msgstr "Не удалось запустить внешний редактор\n"
 
-#: src/compose.c:5288
+#: src/compose.c:5282
 msgid "Couldn't write to file\n"
 msgstr "Ошибка записи в файл\n"
 
-#: src/compose.c:5290
+#: src/compose.c:5284
 msgid "Pipe read failed\n"
 msgstr "Ошибка чтения из канала\n"
 
-#: src/compose.c:5596 src/compose.c:5604 src/compose.c:5610
+#: src/compose.c:5590 src/compose.c:5598 src/compose.c:5604
 msgid "Can't queue the message."
 msgstr "Ошибка постановки в очередь."
 
-#: src/compose.c:5701
+#: src/compose.c:5695
 #, fuzzy
 msgid "Select files"
 msgstr "Выбор файла"
 
-#: src/compose.c:5723
+#: src/compose.c:5717
 msgid "Select file"
 msgstr "Выбор файла"
 
-#: src/compose.c:5760
+#: src/compose.c:5754
 #, fuzzy
 msgid "Save message"
 msgstr "Отправить сообщение"
 
-#: src/compose.c:5761
+#: src/compose.c:5755
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Это сообщение изменено. Отказаться от него?"
 
-#: src/compose.c:5763
+#: src/compose.c:5757
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:5805
+#: src/compose.c:5799
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Применить шаблон '%s'?"
 
-#: src/compose.c:5807
+#: src/compose.c:5801
 msgid "Apply template"
 msgstr "Применить шаблон"
 
-#: src/compose.c:5808
+#: src/compose.c:5802
 #, fuzzy
 msgid "_Replace"
 msgstr "Заменить"
 
-#: src/compose.c:5808
+#: src/compose.c:5802
 #, fuzzy
 msgid "_Insert"
 msgstr "Вставить"
@@ -1739,12 +1739,12 @@ msgstr "Установка информации о папке...\n"
 msgid "Setting folder info..."
 msgstr "Установка информации о папке..."
 
-#: src/folderview.c:805 src/mainwindow.c:3301 src/setup.c:81
+#: src/folderview.c:805 src/mainwindow.c:3272 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Просмотр папки %s%c%s ..."
 
-#: src/folderview.c:809 src/mainwindow.c:3306 src/setup.c:86
+#: src/folderview.c:809 src/mainwindow.c:3277 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Просмотр папки %s ..."
@@ -2065,44 +2065,44 @@ msgstr "Ошибка аутентификации IMAP4.\n"
 msgid "IMAP4 login failed.\n"
 msgstr "Ошибка авторизации IMAP4.\n"
 
-#: src/imap.c:3522
+#: src/imap.c:3528
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "не удалось добавить %s к %s\n"
 
-#: src/imap.c:3529
+#: src/imap.c:3535
 msgid "(sending file...)"
 msgstr "(передача файла...)"
 
-#: src/imap.c:3557
+#: src/imap.c:3563
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "не удалось добавить сообщение к %s\n"
 
-#: src/imap.c:3589
+#: src/imap.c:3595
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "не удалось скопировать %s в %s\n"
 
-#: src/imap.c:3613
+#: src/imap.c:3619
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "ошибка при выполнении команды IMAP: STORE %s %s\n"
 
-#: src/imap.c:3627
+#: src/imap.c:3633
 msgid "error while imap command: EXPUNGE\n"
 msgstr "ошибка при выполнении команды IMAP: EXPUNGE\n"
 
-#: src/imap.c:3640
+#: src/imap.c:3646
 msgid "error while imap command: CLOSE\n"
 msgstr "ошибка при выполнении команды IMAP: CLOSE\n"
 
-#: src/imap.c:3873
+#: src/imap.c:3879
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "ошибка преобразования iconv из UTF-7 в %s\n"
 
-#: src/imap.c:3903
+#: src/imap.c:3909
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "ошибка преобразования iconv из %s в UTF-7\n"
@@ -2204,7 +2204,7 @@ msgstr "Импорт файла LDIF в адресную книгу"
 msgid "Prev"
 msgstr "Назад"
 
-#: src/importldif.c:768 src/mainwindow.c:2321
+#: src/importldif.c:768 src/mainwindow.c:2303
 msgid "Next"
 msgstr "Далее"
 
@@ -2548,627 +2548,627 @@ msgid ""
 "Do you want to migrate it?"
 msgstr ""
 
-#: src/mainwindow.c:471
+#: src/mainwindow.c:462
 msgid "/_File/_Folder"
 msgstr "/Файл/Папка"
 
-#: src/mainwindow.c:472
+#: src/mainwindow.c:463
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/Файл/Папка/Создать новую папку..."
 
-#: src/mainwindow.c:474
+#: src/mainwindow.c:465
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/Файл/Папка/Переименовать папку..."
 
-#: src/mainwindow.c:475
+#: src/mainwindow.c:466
 #, fuzzy
 msgid "/_File/_Folder/_Move folder..."
 msgstr "/Файл/Папка/Переименовать папку..."
 
-#: src/mainwindow.c:476
+#: src/mainwindow.c:467
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/Файл/Папка/Удалить папку"
 
-#: src/mainwindow.c:477
+#: src/mainwindow.c:468
 msgid "/_File/_Mailbox"
 msgstr "/Файл/Почтовый ящик"
 
-#: src/mainwindow.c:478
+#: src/mainwindow.c:469
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/Файл/Почтовый ящик/Добавить почтовый ящик..."
 
-#: src/mainwindow.c:479
+#: src/mainwindow.c:470
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/Файл/Почтовый ящик/Удалить почтовый ящик"
 
-#: src/mainwindow.c:480 src/mainwindow.c:485
+#: src/mainwindow.c:471 src/mainwindow.c:476
 msgid "/_File/_Mailbox/---"
 msgstr "/Файл/Почтовый ящик/---"
 
-#: src/mainwindow.c:481
+#: src/mainwindow.c:472
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "/Файл/Почтовый ящик/Проверить новые сообщения"
 
-#: src/mainwindow.c:483
+#: src/mainwindow.c:474
 msgid "/_File/_Mailbox/Check for new messages in _all mailboxes"
 msgstr "/Файл/Почтовый ящик/Проверить новые сообщения во всех папках"
 
-#: src/mainwindow.c:486
+#: src/mainwindow.c:477
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "/Файл/Почтовый ящик/Перестроить дерево папок"
 
-#: src/mainwindow.c:489
+#: src/mainwindow.c:480
 msgid "/_File/_Import mbox file..."
 msgstr "/Файл/Импорт mbox-файла..."
 
-#: src/mainwindow.c:490
+#: src/mainwindow.c:481
 msgid "/_File/_Export to mbox file..."
 msgstr "/Файл/Экспорт в mbox-файл..."
 
-#: src/mainwindow.c:492
+#: src/mainwindow.c:483
 msgid "/_File/Empty all _trash"
 msgstr "/Файл/Очистить все корзины"
 
-#: src/mainwindow.c:494 src/messageview.c:138
+#: src/mainwindow.c:485 src/messageview.c:138
 msgid "/_File/_Save as..."
 msgstr "/Файл/Сохранить как..."
 
-#: src/mainwindow.c:495 src/messageview.c:139
+#: src/mainwindow.c:486 src/messageview.c:139
 msgid "/_File/_Print..."
 msgstr "/Файл/Печать..."
 
-#: src/mainwindow.c:497
+#: src/mainwindow.c:488
 msgid "/_File/_Work offline"
 msgstr "/Файл/Работать автономно"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:500
+#: src/mainwindow.c:491
 msgid "/_File/E_xit"
 msgstr "/Файл/Выход"
 
-#: src/mainwindow.c:505
+#: src/mainwindow.c:496
 msgid "/_Edit/Select _thread"
 msgstr "/Правка/Выделить обсуждение"
 
-#: src/mainwindow.c:507 src/messageview.c:147
+#: src/mainwindow.c:498 src/messageview.c:147
 msgid "/_Edit/_Find in current message..."
 msgstr "/Правка/Поиск в текущем сообщении..."
 
-#: src/mainwindow.c:509
+#: src/mainwindow.c:500
 msgid "/_Edit/_Search messages..."
 msgstr "/Правка/Поиск сообщений..."
 
-#: src/mainwindow.c:512
+#: src/mainwindow.c:503
 msgid "/_View/Show or hi_de"
 msgstr "/Вид/Показать или скрыть"
 
-#: src/mainwindow.c:513
+#: src/mainwindow.c:504
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/Вид/Показать или скрыть/Дерево папок"
 
-#: src/mainwindow.c:515
+#: src/mainwindow.c:506
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/Вид/Показать или скрыть/Область просмотра"
 
-#: src/mainwindow.c:517
+#: src/mainwindow.c:508
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/Вид/Показать или скрыть/Панель инструментов"
 
-#: src/mainwindow.c:519
+#: src/mainwindow.c:510
 msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/Вид/Показать или скрыть/Панель инструментов/Пиктограммы и текст"
 
-#: src/mainwindow.c:521
+#: src/mainwindow.c:512
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/Вид/Показать или скрыть/Панель инструментов/Пиктограммы"
 
-#: src/mainwindow.c:523
+#: src/mainwindow.c:514
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/Вид/Показать или скрыть/Панель инструментов/Текст"
 
-#: src/mainwindow.c:525
+#: src/mainwindow.c:516
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/Вид/Показать или скрыть/Панель инструментов/Не показывать"
 
-#: src/mainwindow.c:527
+#: src/mainwindow.c:518
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/Вид/Показать или скрыть/Строка состояния"
 
-#: src/mainwindow.c:530
+#: src/mainwindow.c:521
 msgid "/_View/Separate f_older tree"
 msgstr "/Вид/Отдельное дерево папок"
 
-#: src/mainwindow.c:531
+#: src/mainwindow.c:522
 #, fuzzy
 msgid "/_View/Separate _message view"
 msgstr "/Вид/Отдельная область просмотра"
 
-#: src/mainwindow.c:533
+#: src/mainwindow.c:524
 msgid "/_View/_Sort"
 msgstr "/Вид/Сортировка"
 
-#: src/mainwindow.c:534
+#: src/mainwindow.c:525
 msgid "/_View/_Sort/by _number"
 msgstr "/Вид/Сортировка/По номеру"
 
-#: src/mainwindow.c:535
+#: src/mainwindow.c:526
 msgid "/_View/_Sort/by s_ize"
 msgstr "/Вид/Сортировка/По размеру"
 
-#: src/mainwindow.c:536
+#: src/mainwindow.c:527
 msgid "/_View/_Sort/by _date"
 msgstr "/Вид/Сортировка/По дате"
 
-#: src/mainwindow.c:537
+#: src/mainwindow.c:528
 msgid "/_View/_Sort/by _from"
 msgstr "/Вид/Сортировка/По отправителю"
 
-#: src/mainwindow.c:538
+#: src/mainwindow.c:529
 msgid "/_View/_Sort/by _recipient"
 msgstr "/Вид/Сортировка/По получателю"
 
-#: src/mainwindow.c:539
+#: src/mainwindow.c:530
 msgid "/_View/_Sort/by _subject"
 msgstr "/Вид/Сортировка/По теме"
 
-#: src/mainwindow.c:540
+#: src/mainwindow.c:531
 msgid "/_View/_Sort/by _color label"
 msgstr "/Вид/Сортировка/По выделению цветом"
 
-#: src/mainwindow.c:542
+#: src/mainwindow.c:533
 msgid "/_View/_Sort/by _mark"
 msgstr "/Вид/Сортировка/По отметке"
 
-#: src/mainwindow.c:543
+#: src/mainwindow.c:534
 msgid "/_View/_Sort/by _unread"
 msgstr "/Вид/Сортировка/По непрочитанным"
 
-#: src/mainwindow.c:544
+#: src/mainwindow.c:535
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/Вид/Сортировка/По вложениям"
 
-#: src/mainwindow.c:546
+#: src/mainwindow.c:537
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/Вид/Сортировка/Без сортировки"
 
-#: src/mainwindow.c:547 src/mainwindow.c:550
+#: src/mainwindow.c:538 src/mainwindow.c:541
 msgid "/_View/_Sort/---"
 msgstr "/Вид/Сортировка/---"
 
-#: src/mainwindow.c:548
+#: src/mainwindow.c:539
 msgid "/_View/_Sort/Ascending"
 msgstr "/Вид/Сортировка/По возрастанию"
 
-#: src/mainwindow.c:549
+#: src/mainwindow.c:540
 msgid "/_View/_Sort/Descending"
 msgstr "/Вид/Сортировка/По убыванию"
 
-#: src/mainwindow.c:551
+#: src/mainwindow.c:542
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/Вид/Сортировка/Группировка по теме"
 
-#: src/mainwindow.c:553
+#: src/mainwindow.c:544
 msgid "/_View/Th_read view"
 msgstr "/Вид/Группировка по дискуссиям"
 
-#: src/mainwindow.c:554
+#: src/mainwindow.c:545
 msgid "/_View/E_xpand all threads"
 msgstr "/Вид/Развернуть все обсуждения"
 
-#: src/mainwindow.c:555
+#: src/mainwindow.c:546
 msgid "/_View/Co_llapse all threads"
 msgstr "/Вид/Свернуть все обсуждения"
 
-#: src/mainwindow.c:556
+#: src/mainwindow.c:547
 msgid "/_View/Set display _item..."
 msgstr "/Вид/Установить видимые поля..."
 
-#: src/mainwindow.c:559
+#: src/mainwindow.c:550
 msgid "/_View/_Go to"
 msgstr "/Вид/Перейти"
 
-#: src/mainwindow.c:560
+#: src/mainwindow.c:551
 msgid "/_View/_Go to/_Prev message"
 msgstr "/Вид/Перейти/Предыдущее сообщение"
 
-#: src/mainwindow.c:561
+#: src/mainwindow.c:552
 msgid "/_View/_Go to/_Next message"
 msgstr "/Вид/Перейти/Следующее сообщение"
 
-#: src/mainwindow.c:562 src/mainwindow.c:567 src/mainwindow.c:570
-#: src/mainwindow.c:575 src/mainwindow.c:580
+#: src/mainwindow.c:553 src/mainwindow.c:558 src/mainwindow.c:561
+#: src/mainwindow.c:566 src/mainwindow.c:571
 msgid "/_View/_Go to/---"
 msgstr "/Вид/Перейти/---"
 
-#: src/mainwindow.c:563
+#: src/mainwindow.c:554
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/Вид/Перейти/Предыдущее непрочитанное сообщение"
 
-#: src/mainwindow.c:565
+#: src/mainwindow.c:556
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/Вид/Перейти/Следующее непрочитанное сообщение"
 
-#: src/mainwindow.c:568
+#: src/mainwindow.c:559
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/Вид/Перейти/Предыдущее новое сообщение"
 
-#: src/mainwindow.c:569
+#: src/mainwindow.c:560
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/Вид/Перейти/Следующее новое сообщение"
 
-#: src/mainwindow.c:571
+#: src/mainwindow.c:562
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/Вид/Перейти/Предыдущее отмеченное сообщение"
 
-#: src/mainwindow.c:573
+#: src/mainwindow.c:564
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/Вид/Перейти/Следующее отмеченное сообщение"
 
-#: src/mainwindow.c:576
+#: src/mainwindow.c:567
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/Вид/Перейти/Предыдущее выделенное цветом сообщение"
 
-#: src/mainwindow.c:578
+#: src/mainwindow.c:569
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/Вид/Перейти/Следующее выделенное цветом сообщение"
 
-#: src/mainwindow.c:581
+#: src/mainwindow.c:572
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/Вид/Перейти/К другой папке..."
 
-#: src/mainwindow.c:590 src/messageview.c:158
+#: src/mainwindow.c:581 src/messageview.c:158
 #, fuzzy
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/Вид/Кодировка/Автоопределение"
 
-#: src/mainwindow.c:641 src/messageview.c:202
+#: src/mainwindow.c:632 src/messageview.c:202
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/Вид/Кодировка/Японская (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:643 src/messageview.c:204
+#: src/mainwindow.c:634 src/messageview.c:204
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/Вид/Кодировка/Японская (_EUC-JP)"
 
-#: src/mainwindow.c:645 src/messageview.c:206
+#: src/mainwindow.c:636 src/messageview.c:206
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/Вид/Кодировка/Японская (_Shift__JIS)"
 
-#: src/mainwindow.c:657 src/messageview.c:217
+#: src/mainwindow.c:648 src/messageview.c:217
 #, fuzzy
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/Вид/Кодировка/Китайская (ISO-2022-_CN)"
 
-#: src/mainwindow.c:663 src/messageview.c:222
+#: src/mainwindow.c:654 src/messageview.c:222
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/Вид/Кодировка/Корейская (ISO-2022-KR)"
 
-#: src/mainwindow.c:676 src/summaryview.c:401
+#: src/mainwindow.c:667 src/summaryview.c:401
 msgid "/_View/Open in new _window"
 msgstr "/Вид/Открыть в новом окне"
 
-#: src/mainwindow.c:677 src/messageview.c:234
+#: src/mainwindow.c:668 src/messageview.c:234
 msgid "/_View/Mess_age source"
 msgstr "/Вид/Показать исходный текст"
 
-#: src/mainwindow.c:678 src/messageview.c:235
+#: src/mainwindow.c:669 src/messageview.c:235
 msgid "/_View/Show all _header"
 msgstr "/Вид/Показать все заголовки"
 
-#: src/mainwindow.c:680
+#: src/mainwindow.c:671
 msgid "/_View/_Update summary"
 msgstr "/Вид/Обновить список сообщений"
 
-#: src/mainwindow.c:682 src/messageview.c:237
+#: src/mainwindow.c:673 src/messageview.c:237
 msgid "/_Message"
 msgstr "/Сообщение"
 
-#: src/mainwindow.c:683
+#: src/mainwindow.c:674
 msgid "/_Message/Recei_ve"
 msgstr "/Сообщение/Получить"
 
-#: src/mainwindow.c:684
+#: src/mainwindow.c:675
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/Сообщение/Получить/Получить с текущей учетной записи"
 
-#: src/mainwindow.c:686
+#: src/mainwindow.c:677
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/Сообщение/Получить/Получить со всех учетных записей"
 
-#: src/mainwindow.c:688
+#: src/mainwindow.c:679
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/Сообщение/Получить/Прервать получение сообщений"
 
-#: src/mainwindow.c:690
+#: src/mainwindow.c:681
 msgid "/_Message/Recei_ve/---"
 msgstr "/Сообщение/Получить/---"
 
-#: src/mainwindow.c:691
+#: src/mainwindow.c:682
 msgid "/_Message/_Send queued messages"
 msgstr "/Сообщение/Отправить сообщения из очереди"
 
-#: src/mainwindow.c:692 src/mainwindow.c:694 src/mainwindow.c:701
-#: src/mainwindow.c:706 src/mainwindow.c:710 src/mainwindow.c:719
-#: src/mainwindow.c:722 src/messageview.c:240 src/messageview.c:248
+#: src/mainwindow.c:683 src/mainwindow.c:685 src/mainwindow.c:692
+#: src/mainwindow.c:697 src/mainwindow.c:701 src/mainwindow.c:710
+#: src/mainwindow.c:713 src/messageview.c:240 src/messageview.c:248
 #: src/messageview.c:253
 msgid "/_Message/---"
 msgstr "/Сообщение/---"
 
-#: src/mainwindow.c:693 src/messageview.c:238
+#: src/mainwindow.c:684 src/messageview.c:238
 msgid "/_Message/Compose _new message"
 msgstr "/Сообщение/Написать новое сообщение"
 
-#: src/mainwindow.c:695 src/messageview.c:241
+#: src/mainwindow.c:686 src/messageview.c:241
 msgid "/_Message/_Reply"
 msgstr "/Сообщение/Ответить"
 
-#: src/mainwindow.c:696
+#: src/mainwindow.c:687
 msgid "/_Message/Repl_y to"
 msgstr "/Сообщение/Ответить..."
 
-#: src/mainwindow.c:697 src/messageview.c:242
+#: src/mainwindow.c:688 src/messageview.c:242
 msgid "/_Message/Repl_y to/_all"
 msgstr "/Сообщение/Ответить.../Всем"
 
-#: src/mainwindow.c:698 src/messageview.c:244
+#: src/mainwindow.c:689 src/messageview.c:244
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/Сообщение/Ответить.../Отправителю"
 
-#: src/mainwindow.c:699 src/messageview.c:246
+#: src/mainwindow.c:690 src/messageview.c:246
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/Сообщение/Ответить.../В список рассылки"
 
-#: src/mainwindow.c:702 src/messageview.c:249
+#: src/mainwindow.c:693 src/messageview.c:249
 msgid "/_Message/_Forward"
 msgstr "/Сообщение/Переслать"
 
-#: src/mainwindow.c:703 src/messageview.c:250
+#: src/mainwindow.c:694 src/messageview.c:250
 msgid "/_Message/For_ward as attachment"
 msgstr "/Сообщение/Переслать как вложение"
 
-#: src/mainwindow.c:705 src/messageview.c:252
+#: src/mainwindow.c:696 src/messageview.c:252
 msgid "/_Message/Redirec_t"
 msgstr "/Сообщение/Перенаправить без изменений"
 
-#: src/mainwindow.c:707
+#: src/mainwindow.c:698
 msgid "/_Message/M_ove..."
 msgstr "/Сообщение/Переместить..."
 
-#: src/mainwindow.c:708
+#: src/mainwindow.c:699
 msgid "/_Message/_Copy..."
 msgstr "/Сообщение/Копировать..."
 
-#: src/mainwindow.c:709
+#: src/mainwindow.c:700
 msgid "/_Message/_Delete"
 msgstr "/Сообщение/Удалить"
 
-#: src/mainwindow.c:711
+#: src/mainwindow.c:702
 msgid "/_Message/_Mark"
 msgstr "/Сообщение/Отметить"
 
-#: src/mainwindow.c:712
+#: src/mainwindow.c:703
 msgid "/_Message/_Mark/_Mark"
 msgstr "/Сообщение/Отметить/Отметить"
 
-#: src/mainwindow.c:713
+#: src/mainwindow.c:704
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/Сообщение/Отметить/Снять отметку"
 
-#: src/mainwindow.c:714
+#: src/mainwindow.c:705
 msgid "/_Message/_Mark/---"
 msgstr "/Сообщение/Отметить/---"
 
-#: src/mainwindow.c:715
+#: src/mainwindow.c:706
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/Сообщение/Отметить/Пометить как непрочитанное"
 
-#: src/mainwindow.c:716
+#: src/mainwindow.c:707
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/Сообщение/Отметить/Пометить как прочитанное"
 
-#: src/mainwindow.c:718
+#: src/mainwindow.c:709
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/Сообщение/Отметить/Пометить все сообщения как прочитанные"
 
-#: src/mainwindow.c:720
+#: src/mainwindow.c:711
 #, fuzzy
 msgid "/_Message/Set as _junk mail"
 msgstr "/Сообщение/Отметить/Снять отметку"
 
-#: src/mainwindow.c:721
+#: src/mainwindow.c:712
 msgid "/_Message/Set as not j_unk mail"
 msgstr ""
 
-#: src/mainwindow.c:723 src/messageview.c:254
+#: src/mainwindow.c:714 src/messageview.c:254
 msgid "/_Message/Re-_edit"
 msgstr "/Сообщение/Изменить"
 
-#: src/mainwindow.c:727
+#: src/mainwindow.c:718
 #, fuzzy
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/Инструменты/Добавить отправителя в адресную книгу"
 
-#: src/mainwindow.c:730
+#: src/mainwindow.c:721
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/Инструменты/Отфильтровать все сообщения в папке"
 
-#: src/mainwindow.c:732
+#: src/mainwindow.c:723
 msgid "/_Tools/Filter _selected messages"
 msgstr "/Инструменты/Отфильтровать выбранные сообщения"
 
-#: src/mainwindow.c:734 src/messageview.c:261
+#: src/mainwindow.c:725 src/messageview.c:261
 msgid "/_Tools/_Create filter rule"
 msgstr "/Инструменты/Создать правило фильтрации"
 
-#: src/mainwindow.c:735 src/messageview.c:263
+#: src/mainwindow.c:726 src/messageview.c:263
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/Инструменты/Создать правило фильтрации/Автоматически"
 
-#: src/mainwindow.c:737 src/messageview.c:265
+#: src/mainwindow.c:728 src/messageview.c:265
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/Инструменты/Создать правило фильтрации/По отправителю"
 
-#: src/mainwindow.c:739 src/messageview.c:267
+#: src/mainwindow.c:730 src/messageview.c:267
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/Инструменты/Создать правило фильтрации/По получателю"
 
-#: src/mainwindow.c:741 src/messageview.c:269
+#: src/mainwindow.c:732 src/messageview.c:269
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/Инструменты/Создать правило фильтрации/По теме"
 
-#: src/mainwindow.c:744
+#: src/mainwindow.c:735
 #, fuzzy
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/Инструменты/Отфильтровать все сообщения в папке"
 
-#: src/mainwindow.c:746
+#: src/mainwindow.c:737
 #, fuzzy
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/Инструменты/Отфильтровать выбранные сообщения"
 
-#: src/mainwindow.c:751
+#: src/mainwindow.c:742
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/Инструменты/Удалить повторяющиеся сообщения"
 
-#: src/mainwindow.c:754
+#: src/mainwindow.c:745
 msgid "/_Tools/E_xecute"
 msgstr "/Инструменты/Выполнить"
 
-#: src/mainwindow.c:756
+#: src/mainwindow.c:747
 msgid "/_Tools/_Log window"
 msgstr "/Инструменты/Окно журнала"
 
-#: src/mainwindow.c:758
+#: src/mainwindow.c:749
 msgid "/_Configuration"
 msgstr "/Настройка"
 
-#: src/mainwindow.c:759
+#: src/mainwindow.c:750
 msgid "/_Configuration/_Common preferences..."
 msgstr "/Настройка/Общие настройки..."
 
-#: src/mainwindow.c:761
+#: src/mainwindow.c:752
 msgid "/_Configuration/_Filter setting..."
 msgstr "/Настройка/Настройка фильтров..."
 
-#: src/mainwindow.c:763
+#: src/mainwindow.c:754
 msgid "/_Configuration/_Template..."
 msgstr "/Настройка/Шаблоны..."
 
-#: src/mainwindow.c:764
+#: src/mainwindow.c:755
 msgid "/_Configuration/_Actions..."
 msgstr "/Настройка/Действия..."
 
-#: src/mainwindow.c:765
+#: src/mainwindow.c:756
 msgid "/_Configuration/---"
 msgstr "/Настройка/---"
 
-#: src/mainwindow.c:766
+#: src/mainwindow.c:757
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/Настройка/Настройка текущей учетной записи... "
 
-#: src/mainwindow.c:768
+#: src/mainwindow.c:759
 msgid "/_Configuration/Create _new account..."
 msgstr "/Настройка/Создать новую учетную запись..."
 
-#: src/mainwindow.c:770
+#: src/mainwindow.c:761
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/Настройка/Редактирование учетных записей..."
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:763
 msgid "/_Configuration/C_hange current account"
 msgstr "/Настройка/Переключить текущую учетную запись"
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:767
 msgid "/_Help/_Manual"
 msgstr "/Справка/Руководство"
 
-#: src/mainwindow.c:777
+#: src/mainwindow.c:768
 msgid "/_Help/_Manual/_English"
 msgstr "/Справка/Руководство/Английское"
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:769
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/Справка/Руководство/Японское"
 
-#: src/mainwindow.c:779
+#: src/mainwindow.c:770
 msgid "/_Help/_FAQ"
 msgstr "/Справка/FAQ"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:771
 msgid "/_Help/_FAQ/_English"
 msgstr "/Справка/FAQ/Английский"
 
-#: src/mainwindow.c:781
+#: src/mainwindow.c:772
 msgid "/_Help/_FAQ/_German"
 msgstr "/Справка/FAQ/Немецкий"
 
-#: src/mainwindow.c:782
+#: src/mainwindow.c:773
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/Справка/FAQ/Испанский"
 
-#: src/mainwindow.c:783
+#: src/mainwindow.c:774
 msgid "/_Help/_FAQ/_French"
 msgstr "/Справка/FAQ/Французский"
 
-#: src/mainwindow.c:784
+#: src/mainwindow.c:775
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/Справка/FAQ/Итальянский"
 
-#: src/mainwindow.c:785
+#: src/mainwindow.c:776
 msgid "/_Help/---"
 msgstr "/Справка/---"
 
-#: src/mainwindow.c:825
+#: src/mainwindow.c:816
 msgid "Creating main window...\n"
 msgstr "Создание главного окна...\n"
 
-#: src/mainwindow.c:987
+#: src/mainwindow.c:973
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Главное окно: проблема с цветом %d\n"
 
-#: src/mainwindow.c:1071 src/summaryview.c:2020 src/summaryview.c:2105
+#: src/mainwindow.c:1057 src/summaryview.c:2020 src/summaryview.c:2105
 #: src/summaryview.c:3342 src/summaryview.c:3415 src/summaryview.c:3728
 msgid "done.\n"
 msgstr "выполнено.\n"
 
-#: src/mainwindow.c:1196 src/mainwindow.c:1237 src/mainwindow.c:1265
+#: src/mainwindow.c:1182 src/mainwindow.c:1223 src/mainwindow.c:1251
 msgid "Untitled"
 msgstr "Без названия"
 
-#: src/mainwindow.c:1266
+#: src/mainwindow.c:1252
 msgid "none"
 msgstr "нет"
 
-#: src/mainwindow.c:1316
+#: src/mainwindow.c:1302
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "Изменение типа разделения окна с %d на %d\n"
 
-#: src/mainwindow.c:1536
+#: src/mainwindow.c:1522
 msgid "Offline"
 msgstr "Автономная работа"
 
-#: src/mainwindow.c:1537
+#: src/mainwindow.c:1523
 msgid "You are offline. Go online?"
 msgstr "Вы работаете в автономном режиме. Подключиться к сети?"
 
-#: src/mainwindow.c:1551
+#: src/mainwindow.c:1537
 msgid "Empty all trash"
 msgstr "Очистить все корзины"
 
-#: src/mainwindow.c:1552
+#: src/mainwindow.c:1538
 msgid "Empty messages in all trash?"
 msgstr "Удалить все сообщения из всех корзин?"
 
-#: src/mainwindow.c:1580
+#: src/mainwindow.c:1566
 msgid "Add mailbox"
 msgstr "Добавить почтовый ящик"
 
-#: src/mainwindow.c:1581
+#: src/mainwindow.c:1567
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3178,16 +3178,16 @@ msgstr ""
 "Если будет указан существующий ящик, то он\n"
 "будет автоматически прочитан."
 
-#: src/mainwindow.c:1587
+#: src/mainwindow.c:1573
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Почтовый ящик '%s' уже существует."
 
-#: src/mainwindow.c:1592 src/setup.c:57
+#: src/mainwindow.c:1578 src/setup.c:57
 msgid "Mailbox"
 msgstr "Почтовый ящик"
 
-#: src/mainwindow.c:1598 src/setup.c:63
+#: src/mainwindow.c:1584 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3197,151 +3197,151 @@ msgstr ""
 "Может быть, некоторые файлы уже существуют, или вы не имеете прав на запись "
 "в каталоге."
 
-#: src/mainwindow.c:1989
+#: src/mainwindow.c:1975
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Папки"
 
-#: src/mainwindow.c:2009 src/messageview.c:368
+#: src/mainwindow.c:1995 src/messageview.c:368
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Сообщение"
 
-#: src/mainwindow.c:2156 src/summaryview.c:370
+#: src/mainwindow.c:2142 src/summaryview.c:370
 msgid "/_Reply"
 msgstr "/Ответить"
 
-#: src/mainwindow.c:2157
+#: src/mainwindow.c:2143
 msgid "/Reply to _all"
 msgstr "/Ответить всем"
 
-#: src/mainwindow.c:2158
+#: src/mainwindow.c:2144
 msgid "/Reply to _sender"
 msgstr "/Ответить отправителю"
 
-#: src/mainwindow.c:2159
+#: src/mainwindow.c:2145
 msgid "/Reply to mailing _list"
 msgstr "/Ответить в список рассылки"
 
-#: src/mainwindow.c:2164 src/summaryview.c:377
+#: src/mainwindow.c:2150 src/summaryview.c:377
 msgid "/_Forward"
 msgstr "/Переслать"
 
-#: src/mainwindow.c:2165 src/summaryview.c:378
+#: src/mainwindow.c:2151 src/summaryview.c:378
 msgid "/For_ward as attachment"
 msgstr "/Переслать как вложение"
 
-#: src/mainwindow.c:2166 src/summaryview.c:379
+#: src/mainwindow.c:2152 src/summaryview.c:379
 msgid "/Redirec_t"
 msgstr "/Перенаправить без изменений"
 
-#: src/mainwindow.c:2205
+#: src/mainwindow.c:2188
 msgid "Get"
 msgstr "Принять"
 
-#: src/mainwindow.c:2206
+#: src/mainwindow.c:2189
 msgid "Incorporate new mail"
 msgstr "Получить новые сообщения"
 
-#: src/mainwindow.c:2213
+#: src/mainwindow.c:2196
 msgid "Get all"
 msgstr "Принять все"
 
-#: src/mainwindow.c:2214
+#: src/mainwindow.c:2197
 msgid "Incorporate new mail of all accounts"
 msgstr "Получить сообщения со всех учетных записей"
 
-#: src/mainwindow.c:2225
+#: src/mainwindow.c:2208
 msgid "Send queued message(s)"
 msgstr "Послать сообщения из очереди"
 
-#: src/mainwindow.c:2235 src/prefs_account.c:721 src/prefs_common.c:949
+#: src/mainwindow.c:2218 src/prefs_account.c:721 src/prefs_common.c:949
 #: src/prefs_folder_item.c:137
 msgid "Compose"
 msgstr "Написать"
 
-#: src/mainwindow.c:2236
+#: src/mainwindow.c:2219
 msgid "Compose new message"
 msgstr "Написать новое сообщение"
 
-#: src/mainwindow.c:2244 src/prefs_common.c:1448
+#: src/mainwindow.c:2227 src/prefs_common.c:1448
 msgid "Reply"
 msgstr "Ответить"
 
-#: src/mainwindow.c:2245 src/mainwindow.c:2258
+#: src/mainwindow.c:2228 src/mainwindow.c:2241
 msgid "Reply to the message"
 msgstr "Ответить на сообщение"
 
-#: src/mainwindow.c:2263
+#: src/mainwindow.c:2245
 msgid "Reply all"
 msgstr "Ответить всем"
 
-#: src/mainwindow.c:2264
+#: src/mainwindow.c:2246
 msgid "Reply to all"
 msgstr "Ответить всем"
 
-#: src/mainwindow.c:2272 src/prefs_filter_edit.c:741
+#: src/mainwindow.c:2254 src/prefs_filter_edit.c:741
 msgid "Forward"
 msgstr "Переслать"
 
-#: src/mainwindow.c:2273 src/mainwindow.c:2286
+#: src/mainwindow.c:2255 src/mainwindow.c:2268
 msgid "Forward the message"
 msgstr "Переслать сообщение"
 
-#: src/mainwindow.c:2293
+#: src/mainwindow.c:2275
 msgid "Delete the message"
 msgstr "Удалить сообщение"
 
-#: src/mainwindow.c:2301 src/prefs_common.c:1988
+#: src/mainwindow.c:2283 src/prefs_common.c:1988
 msgid "Junk"
 msgstr ""
 
-#: src/mainwindow.c:2302
+#: src/mainwindow.c:2284
 #, fuzzy
 msgid "Set as junk mail"
 msgstr "По умолчанию"
 
-#: src/mainwindow.c:2311
+#: src/mainwindow.c:2293
 msgid "Execute"
 msgstr "Выполнить"
 
-#: src/mainwindow.c:2312
+#: src/mainwindow.c:2294
 msgid "Execute marked process"
 msgstr "Выполнить отмеченный процесс"
 
-#: src/mainwindow.c:2322
+#: src/mainwindow.c:2304
 msgid "Next unread message"
 msgstr "Следующее непрочитанное сообщение"
 
-#: src/mainwindow.c:2334
+#: src/mainwindow.c:2316
 msgid "Prefs"
 msgstr "Свойства"
 
-#: src/mainwindow.c:2335
+#: src/mainwindow.c:2317
 msgid "Common preferences"
 msgstr "Общие настройки"
 
-#: src/mainwindow.c:2343 src/prefs_folder_item.c:261
+#: src/mainwindow.c:2325 src/prefs_folder_item.c:261
 #: src/prefs_folder_item.c:272 src/progressdialog.c:128
 msgid "Account"
 msgstr "Учетная запись"
 
-#: src/mainwindow.c:2344
+#: src/mainwindow.c:2326
 msgid "Account setting"
 msgstr "Настройка учетной записи"
 
-#: src/mainwindow.c:2527
+#: src/mainwindow.c:2498
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 "Вы работаете в автономном режиме. Щелкните по значку, чтобы подключиться."
 
-#: src/mainwindow.c:2538
+#: src/mainwindow.c:2509
 msgid "You are online. Click the icon to go offline."
 msgstr "Вы подключены. Щелкните по значку, чтобы работать автономно."
 
-#: src/mainwindow.c:2731
+#: src/mainwindow.c:2702
 msgid "Exit"
 msgstr "Выход"
 
-#: src/mainwindow.c:2731
+#: src/mainwindow.c:2702
 msgid "Exit this program?"
 msgstr "Выйти из программы?"
 
@@ -5559,11 +5559,11 @@ msgstr "Создание диалогового окна прогресса...\n
 msgid "Status"
 msgstr "Состояние"
 
-#: src/recv.c:113
+#: src/recv.c:112
 msgid "error occurred while retrieving data.\n"
 msgstr "произошла ошибка при получении данных.\n"
 
-#: src/recv.c:155 src/recv.c:197 src/recv.c:213
+#: src/recv.c:154 src/recv.c:196 src/recv.c:211
 msgid "Can't write to file.\n"
 msgstr "Ошибка записи в файл.\n"
 
@@ -6300,7 +6300,7 @@ msgstr "%.2f Мб"
 msgid "%.2fGB"
 msgstr "%.2f Гб"
 
-#: src/utils.c:2372 src/utils.c:2496
+#: src/utils.c:2386 src/utils.c:2510
 #, c-format
 msgid "writing to %s failed.\n"
 msgstr "запись в %s не удалась.\n"
diff --git a/po/sk.po b/po/sk.po
index 9d52c5da..fe093d8d 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-08-09 18:08+0900\n"
+"POT-Creation-Date: 2005-08-22 17:22+0900\n"
 "PO-Revision-Date: 2004-01-22 17:46+0100\n"
 "Last-Translator: Andrej Kacian <andrej@kacian.sk>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
@@ -97,7 +97,7 @@ msgstr ""
 "pri voľbe 'Prijať všetko', zatrhnite políčko v stĺpci označenom 'G'."
 
 #: src/account.c:691 src/addressadd.c:192 src/addressbook.c:490
-#: src/compose.c:4081 src/editaddress.c:200 src/editaddress.c:942
+#: src/compose.c:4079 src/editaddress.c:200 src/editaddress.c:942
 #: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:265
 #: src/editjpilot.c:271 src/editldap.c:307 src/editvcard.c:184
 #: src/mimeview.c:201 src/prefs_filter.c:258 src/prefs_folder_item.c:170
@@ -235,7 +235,7 @@ msgstr "Používateľský parameter pre akciu"
 msgid "Add Address to Book"
 msgstr "Pridať adresu do adresára"
 
-#: src/addressadd.c:202 src/compose.c:4528 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4521 src/editaddress.c:201
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "Adresár"
@@ -249,7 +249,7 @@ msgstr "Poznámky"
 msgid "Select Address Book Folder"
 msgstr "Vyberte priečinok adresára"
 
-#: src/addressbook.c:336 src/compose.c:495 src/mainwindow.c:470
+#: src/addressbook.c:336 src/compose.c:493 src/mainwindow.c:461
 #: src/messageview.c:137
 msgid "/_File"
 msgstr "/_Súbor"
@@ -270,10 +270,10 @@ msgstr "/_Súbor/Nový _JPilot"
 msgid "/_File/New _Server"
 msgstr "/_Súbor/Nový _Server"
 
-#: src/addressbook.c:345 src/addressbook.c:348 src/compose.c:500
-#: src/compose.c:505 src/compose.c:509 src/mainwindow.c:488
-#: src/mainwindow.c:491 src/mainwindow.c:493 src/mainwindow.c:496
-#: src/mainwindow.c:498 src/messageview.c:140
+#: src/addressbook.c:345 src/addressbook.c:348 src/compose.c:498
+#: src/compose.c:503 src/compose.c:507 src/mainwindow.c:479
+#: src/mainwindow.c:482 src/mainwindow.c:484 src/mainwindow.c:487
+#: src/mainwindow.c:489 src/messageview.c:140
 msgid "/_File/---"
 msgstr "/_Súbor/---"
 
@@ -289,7 +289,7 @@ msgstr "/_Súbor/Z_mazať"
 msgid "/_File/_Save"
 msgstr "/_Súbor/U_ložiť"
 
-#: src/addressbook.c:350 src/compose.c:510 src/messageview.c:141
+#: src/addressbook.c:350 src/compose.c:508 src/messageview.c:141
 msgid "/_File/_Close"
 msgstr "/_Súbor/_Zavrieť"
 
@@ -321,7 +321,7 @@ msgstr "/_Adresa/_Upraviť"
 msgid "/_Address/_Delete"
 msgstr "/_Adresa/Z_mazať"
 
-#: src/addressbook.c:358 src/compose.c:619 src/mainwindow.c:725
+#: src/addressbook.c:358 src/compose.c:617 src/mainwindow.c:716
 #: src/messageview.c:256
 msgid "/_Tools"
 msgstr "/_Nástroje"
@@ -330,12 +330,12 @@ msgstr "/_Nástroje"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Nástroje/Importovať súbor _LDIF"
 
-#: src/addressbook.c:360 src/compose.c:632 src/mainwindow.c:775
+#: src/addressbook.c:360 src/compose.c:630 src/mainwindow.c:766
 #: src/messageview.c:274
 msgid "/_Help"
 msgstr "/Nápo_veda"
 
-#: src/addressbook.c:361 src/compose.c:633 src/mainwindow.c:786
+#: src/addressbook.c:361 src/compose.c:631 src/mainwindow.c:777
 #: src/messageview.c:275
 msgid "/_Help/_About"
 msgstr "/Nápo_veda/_O programe"
@@ -352,7 +352,7 @@ msgstr "/Nová _Skupina"
 msgid "/New _Folder"
 msgstr "/Nový _Priečinok"
 
-#: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:489
+#: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:487
 #: src/folderview.c:235 src/folderview.c:237 src/folderview.c:241
 #: src/folderview.c:252 src/folderview.c:254 src/folderview.c:256
 #: src/folderview.c:260 src/folderview.c:270 src/folderview.c:272
@@ -362,8 +362,8 @@ msgstr "/Nový _Priečinok"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:512
-#: src/mainwindow.c:502 src/messageview.c:143
+#: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:510
+#: src/mainwindow.c:493 src/messageview.c:143
 msgid "/_Edit"
 msgstr "/_Upraviť"
 
@@ -375,7 +375,7 @@ msgstr "/Z_mazať"
 msgid "E-Mail address"
 msgstr "E-mailová adresa"
 
-#: src/addressbook.c:495 src/compose.c:4529 src/prefs_common.c:2402
+#: src/addressbook.c:495 src/compose.c:4522 src/prefs_common.c:2402
 msgid "Address book"
 msgstr "Otvoriť adresár"
 
@@ -384,8 +384,8 @@ msgid "Name:"
 msgstr "Meno:"
 
 #. Buttons
-#: src/addressbook.c:627 src/addressbook.c:1673 src/editaddress.c:884
-#: src/editaddress.c:1017 src/mainwindow.c:2292 src/prefs_actions.c:266
+#: src/addressbook.c:627 src/addressbook.c:1674 src/editaddress.c:884
+#: src/editaddress.c:1017 src/mainwindow.c:2274 src/prefs_actions.c:266
 #: src/prefs_display_header.c:278 src/prefs_display_header.c:333
 #: src/prefs_template.c:231
 msgid "Delete"
@@ -424,7 +424,7 @@ msgstr "Zmazať adresu(y)"
 msgid "Really delete the address(es)?"
 msgstr "Naozaj zmazať adresu(y)?"
 
-#: src/addressbook.c:1664
+#: src/addressbook.c:1665
 #, fuzzy, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -433,38 +433,38 @@ msgstr ""
 "Naozaj chcete zmazať priečinok A SÚČASNE všetky adresy v %s ?\n"
 "Ak zmažete len priečinok, adresy z neho sa presunú do nadradeného priečinku."
 
-#: src/addressbook.c:1667 src/folderview.c:2139
+#: src/addressbook.c:1668 src/folderview.c:2139
 msgid "Delete folder"
 msgstr "Odstrániť priečinok"
 
-#: src/addressbook.c:1667
+#: src/addressbook.c:1668
 #, fuzzy
 msgid "_Folder only"
 msgstr "Len priečinok"
 
-#: src/addressbook.c:1667
+#: src/addressbook.c:1668
 #, fuzzy
 msgid "Folder and _addresses"
 msgstr "Priečinok aj adresy"
 
-#: src/addressbook.c:1672
+#: src/addressbook.c:1673
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Naozaj zmazať '%s' ?"
 
-#: src/addressbook.c:2352 src/addressbook.c:2485
+#: src/addressbook.c:2353 src/addressbook.c:2486
 msgid "New user, could not save index file."
 msgstr "Nový uživateľ; nepodarilo sa uložiť indexový súbor."
 
-#: src/addressbook.c:2356 src/addressbook.c:2489
+#: src/addressbook.c:2357 src/addressbook.c:2490
 msgid "New user, could not save address book files."
 msgstr "Nový uživateľ; nedajú sa uložiť súbory adresára."
 
-#: src/addressbook.c:2366 src/addressbook.c:2499
+#: src/addressbook.c:2367 src/addressbook.c:2500
 msgid "Old address book converted successfully."
 msgstr "Konverzia starého adresára prebehla úspešne."
 
-#: src/addressbook.c:2371
+#: src/addressbook.c:2372
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -472,7 +472,7 @@ msgstr ""
 "Konverzia starého adresára prebehla,\n"
 "nedá sa uložiť indexový súbor nového adresára"
 
-#: src/addressbook.c:2384
+#: src/addressbook.c:2385
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -480,7 +480,7 @@ msgstr ""
 "Nedá sa konvertovať starý adresár,\n"
 "ale boli vytvorené prázdne súbory nového adresára."
 
-#: src/addressbook.c:2390
+#: src/addressbook.c:2391
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -488,7 +488,7 @@ msgstr ""
 "Nedá sa konvertovať starý adresár,\n"
 "nedajú sa ani vytvoriť súbory nového adresára."
 
-#: src/addressbook.c:2395
+#: src/addressbook.c:2396
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -496,91 +496,91 @@ msgstr ""
 "Nedá sa konvertovať starý adresár\n"
 "a nedajú sa ani vytvoriť súbory nového adresára."
 
-#: src/addressbook.c:2402
+#: src/addressbook.c:2403
 msgid "Addressbook conversion error"
 msgstr "Chyba pri konverzii adresára"
 
-#: src/addressbook.c:2406
+#: src/addressbook.c:2407
 msgid "Addressbook conversion"
 msgstr "Konverzia adresára"
 
-#: src/addressbook.c:2441
+#: src/addressbook.c:2442
 msgid "Addressbook Error"
 msgstr "Chyba v adresári"
 
-#: src/addressbook.c:2442 src/addressbook.c:2542
+#: src/addressbook.c:2443 src/addressbook.c:2543
 msgid "Could not read address index"
 msgstr "Nedá sa načítať zoznam adries"
 
-#: src/addressbook.c:2504
+#: src/addressbook.c:2505
 msgid "Old address book converted, could not save new address index file"
 msgstr ""
 "Konverzia starého adresára prebehla, nedá sa uložiť indexový súbor nového "
 "adresára"
 
-#: src/addressbook.c:2518
+#: src/addressbook.c:2519
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr ""
 "Nedá sa konvertovať starý adresár, ale boli vytvorené prázdne súbory nového "
 "adresára."
 
-#: src/addressbook.c:2524
+#: src/addressbook.c:2525
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr ""
 "Nedá sa konvertovať starý adresár, nedajú sa ani vytvoriť súbory nového "
 "adresára."
 
-#: src/addressbook.c:2530
+#: src/addressbook.c:2531
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr ""
 "Nedá sa konvertovať starý adresár a nedajú sa ani vytvoriť súbory nového "
 "adresára."
 
-#: src/addressbook.c:2548
+#: src/addressbook.c:2549
 msgid "Addressbook Conversion Error"
 msgstr "Chyba pri konverzii adresára"
 
-#: src/addressbook.c:2554
+#: src/addressbook.c:2555
 msgid "Addressbook Conversion"
 msgstr "Konverzia adresára"
 
-#: src/addressbook.c:3055 src/prefs_common.c:963
+#: src/addressbook.c:3056 src/prefs_common.c:963
 msgid "Interface"
 msgstr "Ovládanie"
 
-#: src/addressbook.c:3071 src/importldif.c:514
+#: src/addressbook.c:3072 src/importldif.c:514
 msgid "Address Book"
 msgstr "Adresár"
 
-#: src/addressbook.c:3087
+#: src/addressbook.c:3088
 msgid "Person"
 msgstr "Osoba"
 
-#: src/addressbook.c:3103
+#: src/addressbook.c:3104
 msgid "EMail Address"
 msgstr "E-mailová adresa"
 
-#: src/addressbook.c:3119
+#: src/addressbook.c:3120
 msgid "Group"
 msgstr "Skupina"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3135 src/folderview.c:346 src/prefs_account.c:1866
+#: src/addressbook.c:3136 src/folderview.c:346 src/prefs_account.c:1866
 msgid "Folder"
 msgstr "Priečinok"
 
-#: src/addressbook.c:3151
+#: src/addressbook.c:3152
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3167 src/addressbook.c:3183
+#: src/addressbook.c:3168 src/addressbook.c:3184
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3199
+#: src/addressbook.c:3200
 msgid "LDAP Server"
 msgstr "LDAP server"
 
@@ -592,7 +592,7 @@ msgstr "Spoločná adresa"
 msgid "Personal address"
 msgstr "Súkromná adresa"
 
-#: src/alertpanel.c:138 src/compose.c:5214 src/main.c:515
+#: src/alertpanel.c:138 src/compose.c:5208 src/main.c:515
 msgid "Notice"
 msgstr "Upozornenie"
 
@@ -647,381 +647,381 @@ msgstr "Hnedá"
 msgid "None"
 msgstr "Žiadna"
 
-#: src/compose.c:487
+#: src/compose.c:485
 msgid "/_Add..."
 msgstr "/_Pridať..."
 
-#: src/compose.c:488
+#: src/compose.c:486
 msgid "/_Remove"
 msgstr "/_Odstrániť"
 
-#: src/compose.c:490 src/folderview.c:243 src/folderview.c:262
+#: src/compose.c:488 src/folderview.c:243 src/folderview.c:262
 #: src/folderview.c:277
 msgid "/_Properties..."
 msgstr "/_Vlastnosti..."
 
-#: src/compose.c:496
+#: src/compose.c:494
 #, fuzzy
 msgid "/_File/_Send"
 msgstr "/_Súbor/U_ložiť"
 
-#: src/compose.c:498
+#: src/compose.c:496
 #, fuzzy
 msgid "/_File/Send _later"
 msgstr "/Sp_ráva/Odoslať _neskôr"
 
-#: src/compose.c:501
+#: src/compose.c:499
 #, fuzzy
 msgid "/_File/Save to _draft folder"
 msgstr "/Sp_ráva/_Uložiť medzi koncepty"
 
-#: src/compose.c:503
+#: src/compose.c:501
 #, fuzzy
 msgid "/_File/Save and _keep editing"
 msgstr "/Sp_ráva/Uložiť a _pokračovať v editácii"
 
-#: src/compose.c:506
+#: src/compose.c:504
 msgid "/_File/_Attach file"
 msgstr "/_Súbor/_Pripojiť súbor"
 
-#: src/compose.c:507
+#: src/compose.c:505
 msgid "/_File/_Insert file"
 msgstr "/_Súbor/_Vložiť súbor"
 
-#: src/compose.c:508
+#: src/compose.c:506
 msgid "/_File/Insert si_gnature"
 msgstr "/_Súbor/V_ložiť podpis"
 
-#: src/compose.c:513
+#: src/compose.c:511
 msgid "/_Edit/_Undo"
 msgstr "/Úp_ravy"
 
-#: src/compose.c:514
+#: src/compose.c:512
 msgid "/_Edit/_Redo"
 msgstr "/Úp_ravy/Z_novu urobiť"
 
-#: src/compose.c:515 src/compose.c:522 src/mainwindow.c:506
+#: src/compose.c:513 src/compose.c:520 src/mainwindow.c:497
 #: src/messageview.c:146
 msgid "/_Edit/---"
 msgstr "/Úp_ravy/---"
 
-#: src/compose.c:516
+#: src/compose.c:514
 msgid "/_Edit/Cu_t"
 msgstr "/Úp_ravy/_Vystrihnúť"
 
-#: src/compose.c:517 src/mainwindow.c:503 src/messageview.c:144
+#: src/compose.c:515 src/mainwindow.c:494 src/messageview.c:144
 msgid "/_Edit/_Copy"
 msgstr "/Úp_ravy/_Kopírovať"
 
-#: src/compose.c:518
+#: src/compose.c:516
 msgid "/_Edit/_Paste"
 msgstr "/Úp_ravy/_Prilepiť"
 
-#: src/compose.c:519
+#: src/compose.c:517
 msgid "/_Edit/Paste as _quotation"
 msgstr "/Úp_ravy/Prilepiť ako _citáciu"
 
-#: src/compose.c:521 src/mainwindow.c:504 src/messageview.c:145
+#: src/compose.c:519 src/mainwindow.c:495 src/messageview.c:145
 msgid "/_Edit/Select _all"
 msgstr "/Úp_ravy/Vy_brať všetko"
 
-#: src/compose.c:523
+#: src/compose.c:521
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/Úp_ravy/_Zalomiť aktuálny odstavec"
 
-#: src/compose.c:525
+#: src/compose.c:523
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/Úp_ravy/Zalomiť všetky _dlhé riadky"
 
-#: src/compose.c:527
+#: src/compose.c:525
 #, fuzzy
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/Úp_ravy/_Kopírovať"
 
-#: src/compose.c:528 src/mainwindow.c:511 src/messageview.c:150
+#: src/compose.c:526 src/mainwindow.c:502 src/messageview.c:150
 #: src/summaryview.c:400
 msgid "/_View"
 msgstr "/_Zobraziť"
 
-#: src/compose.c:529
+#: src/compose.c:527
 msgid "/_View/_To"
 msgstr "/_Zobraziť/_Komu"
 
-#: src/compose.c:530
+#: src/compose.c:528
 msgid "/_View/_Cc"
 msgstr "/_Zobraziť/Kó_pia"
 
-#: src/compose.c:531
+#: src/compose.c:529
 msgid "/_View/_Bcc"
 msgstr "/_Zobraziť/_Slepá kópia"
 
-#: src/compose.c:532
+#: src/compose.c:530
 msgid "/_View/_Reply to"
 msgstr "/_Zobraziť/_Odpoveď komu"
 
-#: src/compose.c:533 src/compose.c:535 src/compose.c:537 src/compose.c:539
-#: src/mainwindow.c:529 src/mainwindow.c:532 src/mainwindow.c:558
-#: src/mainwindow.c:582 src/mainwindow.c:675 src/mainwindow.c:679
+#: src/compose.c:531 src/compose.c:533 src/compose.c:535 src/compose.c:537
+#: src/mainwindow.c:520 src/mainwindow.c:523 src/mainwindow.c:549
+#: src/mainwindow.c:573 src/mainwindow.c:666 src/mainwindow.c:670
 #: src/messageview.c:233
 msgid "/_View/---"
 msgstr "/_Zobraziť/---"
 
-#: src/compose.c:534
+#: src/compose.c:532
 msgid "/_View/_Followup to"
 msgstr "/_Zobraziť/O_dovzdať komu"
 
-#: src/compose.c:536
+#: src/compose.c:534
 msgid "/_View/R_uler"
 msgstr "/_Zobraziť/P_ravítko"
 
-#: src/compose.c:538
+#: src/compose.c:536
 msgid "/_View/_Attachment"
 msgstr "/_Zobraziť/Prí_lohy"
 
-#: src/compose.c:545 src/mainwindow.c:589 src/messageview.c:157
+#: src/compose.c:543 src/mainwindow.c:580 src/messageview.c:157
 #, fuzzy
 msgid "/_View/Character _encoding"
 msgstr "/_Zobraziť/_Triediť/Zostupne"
 
-#: src/compose.c:546
+#: src/compose.c:544
 msgid "/_View/Character _encoding/_Automatic"
 msgstr ""
 
-#: src/compose.c:548 src/compose.c:554 src/compose.c:560 src/compose.c:564
-#: src/compose.c:570 src/compose.c:574 src/compose.c:580 src/compose.c:584
-#: src/compose.c:594 src/compose.c:598 src/compose.c:608 src/compose.c:612
-#: src/mainwindow.c:585 src/mainwindow.c:592 src/messageview.c:153
+#: src/compose.c:546 src/compose.c:552 src/compose.c:558 src/compose.c:562
+#: src/compose.c:568 src/compose.c:572 src/compose.c:578 src/compose.c:582
+#: src/compose.c:592 src/compose.c:596 src/compose.c:606 src/compose.c:610
+#: src/mainwindow.c:576 src/mainwindow.c:583 src/messageview.c:153
 #, fuzzy
 msgid "/_View/Character _encoding/---"
 msgstr "/_Zobraziť/_Triediť/Zostupne"
 
-#: src/compose.c:550 src/mainwindow.c:593 src/messageview.c:161
+#: src/compose.c:548 src/mainwindow.c:584 src/messageview.c:161
 #, fuzzy
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Zobraziť/_Kódovanie/7bit ascii (US-ASC_II)"
 
-#: src/compose.c:552 src/mainwindow.c:595 src/messageview.c:164
+#: src/compose.c:550 src/mainwindow.c:586 src/messageview.c:164
 #, fuzzy
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Zobraziť/_Kódovanie/Unicode (_UTF-8)"
 
-#: src/compose.c:556 src/mainwindow.c:599 src/messageview.c:167
+#: src/compose.c:554 src/mainwindow.c:590 src/messageview.c:167
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Zobraziť/_Kódovanie/Západná Európa (ISO-8859-_1)"
 
-#: src/compose.c:558 src/mainwindow.c:601 src/messageview.c:169
+#: src/compose.c:556 src/mainwindow.c:592 src/messageview.c:169
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Zobraziť/_Kódovanie/Západná Európa (ISO-8859-15)"
 
-#: src/compose.c:562 src/mainwindow.c:605 src/messageview.c:172
+#: src/compose.c:560 src/mainwindow.c:596 src/messageview.c:172
 #, fuzzy
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Zobraziť/_Kódovanie/Stredná Európa (ISO-8859-_2)"
 
-#: src/compose.c:566 src/mainwindow.c:609 src/messageview.c:175
+#: src/compose.c:564 src/mainwindow.c:600 src/messageview.c:175
 #, fuzzy
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Zobraziť/_Kódovanie/_Pobaltie (ISO-8859-13)"
 
-#: src/compose.c:568 src/mainwindow.c:611 src/messageview.c:177
+#: src/compose.c:566 src/mainwindow.c:602 src/messageview.c:177
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Zobraziť/_Kódovanie/Pobaltie (ISO-8859-_4)"
 
-#: src/compose.c:572 src/mainwindow.c:615 src/messageview.c:180
+#: src/compose.c:570 src/mainwindow.c:606 src/messageview.c:180
 #, fuzzy
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Zobraziť/_Kódovanie/Grécko (ISO-8859-_7)"
 
-#: src/compose.c:576 src/mainwindow.c:619 src/messageview.c:183
+#: src/compose.c:574 src/mainwindow.c:610 src/messageview.c:183
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Zobraziť/_Kódovanie/Grécko (ISO-8859-_7)"
 
-#: src/compose.c:578 src/mainwindow.c:621 src/messageview.c:185
+#: src/compose.c:576 src/mainwindow.c:612 src/messageview.c:185
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Zobraziť/_Kódovanie/Cyrilika (Windows-1251)"
 
-#: src/compose.c:582 src/mainwindow.c:625 src/messageview.c:188
+#: src/compose.c:580 src/mainwindow.c:616 src/messageview.c:188
 #, fuzzy
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Zobraziť/_Kódovanie/Turecko (ISO-8859-_9)"
 
-#: src/compose.c:586 src/mainwindow.c:629 src/messageview.c:191
+#: src/compose.c:584 src/mainwindow.c:620 src/messageview.c:191
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Zobraziť/_Kódovanie/Cyrilika (ISO-8859-_5)"
 
-#: src/compose.c:588 src/mainwindow.c:631 src/messageview.c:193
+#: src/compose.c:586 src/mainwindow.c:622 src/messageview.c:193
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Zobraziť/_Kódovanie/Cyrilika (KOI8-_R)"
 
-#: src/compose.c:590 src/mainwindow.c:633 src/messageview.c:195
+#: src/compose.c:588 src/mainwindow.c:624 src/messageview.c:195
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Zobraziť/_Kódovanie/Cyrilika (KOI8-_R)"
 
-#: src/compose.c:592 src/mainwindow.c:635 src/messageview.c:197
+#: src/compose.c:590 src/mainwindow.c:626 src/messageview.c:197
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Zobraziť/_Kódovanie/Cyrilika (Windows-1251)"
 
-#: src/compose.c:596 src/mainwindow.c:639 src/messageview.c:200
+#: src/compose.c:594 src/mainwindow.c:630 src/messageview.c:200
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Zobraziť/_Kódovanie/Japonsko (ISO-2022-_JP)"
 
-#: src/compose.c:600 src/mainwindow.c:649 src/messageview.c:209
+#: src/compose.c:598 src/mainwindow.c:640 src/messageview.c:209
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Zobraziť/_Kódovanie/Zjednodušená čínština (_GB2312)"
 
-#: src/compose.c:602 src/mainwindow.c:651 src/messageview.c:211
+#: src/compose.c:600 src/mainwindow.c:642 src/messageview.c:211
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Zobraziť/_Kódovanie/Zjednodušená čínština (_GB2312)"
 
-#: src/compose.c:604 src/mainwindow.c:653 src/messageview.c:213
+#: src/compose.c:602 src/mainwindow.c:644 src/messageview.c:213
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Zobraziť/_Kódovanie/Tradičná čínština (_Big5)"
 
-#: src/compose.c:606 src/mainwindow.c:655 src/messageview.c:215
+#: src/compose.c:604 src/mainwindow.c:646 src/messageview.c:215
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Zobraziť/_Kódovanie/Tradičná čínština (EUC-_TW)"
 
-#: src/compose.c:610 src/mainwindow.c:661 src/messageview.c:220
+#: src/compose.c:608 src/mainwindow.c:652 src/messageview.c:220
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Zobraziť/_Kódovanie/Kórea (EUC-_KR)"
 
-#: src/compose.c:614 src/mainwindow.c:667 src/messageview.c:225
+#: src/compose.c:612 src/mainwindow.c:658 src/messageview.c:225
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Zobraziť/_Kódovanie/Thajsko (TIS-620)"
 
-#: src/compose.c:616 src/mainwindow.c:669 src/messageview.c:227
+#: src/compose.c:614 src/mainwindow.c:660 src/messageview.c:227
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Zobraziť/_Kódovanie/Thajsko (Windows-874)"
 
-#: src/compose.c:620 src/mainwindow.c:726 src/messageview.c:257
+#: src/compose.c:618 src/mainwindow.c:717 src/messageview.c:257
 msgid "/_Tools/_Address book"
 msgstr "/_Nástroje/_Adresár"
 
-#: src/compose.c:621
+#: src/compose.c:619
 msgid "/_Tools/_Template"
 msgstr "/_Nástroje/Ša_blóna"
 
-#: src/compose.c:622 src/mainwindow.c:749 src/messageview.c:272
+#: src/compose.c:620 src/mainwindow.c:740 src/messageview.c:272
 msgid "/_Tools/Actio_ns"
 msgstr "/_Nástroje/A_kcie"
 
-#: src/compose.c:623 src/compose.c:627 src/mainwindow.c:729
-#: src/mainwindow.c:743 src/mainwindow.c:748 src/mainwindow.c:750
-#: src/mainwindow.c:753 src/mainwindow.c:755 src/messageview.c:260
+#: src/compose.c:621 src/compose.c:625 src/mainwindow.c:720
+#: src/mainwindow.c:734 src/mainwindow.c:739 src/mainwindow.c:741
+#: src/mainwindow.c:744 src/mainwindow.c:746 src/messageview.c:260
 #: src/messageview.c:271
 msgid "/_Tools/---"
 msgstr "/_Nástroje/---"
 
-#: src/compose.c:624
+#: src/compose.c:622
 #, fuzzy
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/Úp_ravy/Upraviť e_xterným editorom"
 
-#: src/compose.c:628
+#: src/compose.c:626
 #, fuzzy
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Nástroje/A_kcie"
 
-#: src/compose.c:629
+#: src/compose.c:627
 #, fuzzy
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/Sp_ráva/_Zašifrovať"
 
-#: src/compose.c:855
+#: src/compose.c:853
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: súbor neexistuje\n"
 
-#: src/compose.c:954 src/compose.c:1024 src/procmsg.c:1353
+#: src/compose.c:952 src/compose.c:1022 src/procmsg.c:1353
 msgid "Can't get text part\n"
 msgstr "Nedá sa získať časť textu\n"
 
-#: src/compose.c:1420
+#: src/compose.c:1418
 msgid "Quote mark format error."
 msgstr "Chyba v úvodzovkách."
 
-#: src/compose.c:1432
+#: src/compose.c:1430
 msgid "Message reply/forward format error."
 msgstr "Chyba formátu odpovede/preposielania."
 
-#: src/compose.c:1801
+#: src/compose.c:1799
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Súbor %s neexistuje\n"
 
-#: src/compose.c:1805
+#: src/compose.c:1803
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Nedá sa zistiť dĺžka súboru %s\n"
 
-#: src/compose.c:1809
+#: src/compose.c:1807
 #, c-format
 msgid "File %s is empty."
 msgstr "Súbor %s je prázdny."
 
-#: src/compose.c:1813
+#: src/compose.c:1811
 #, c-format
 msgid "Can't read %s."
 msgstr "Nedá sa čítať %s."
 
-#: src/compose.c:1848
+#: src/compose.c:1846
 #, c-format
 msgid "Message: %s"
 msgstr "Správa: %s"
 
-#: src/compose.c:1920 src/mimeview.c:560
+#: src/compose.c:1918 src/mimeview.c:560
 msgid "Can't get the part of multipart message."
 msgstr "Nedá sa získať časť viacdielnej správy."
 
-#: src/compose.c:2362
+#: src/compose.c:2360
 msgid " [Edited]"
 msgstr "[Upravené]"
 
-#: src/compose.c:2364
+#: src/compose.c:2362
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Písanie správy%s"
 
-#: src/compose.c:2367
+#: src/compose.c:2365
 #, c-format
 msgid "Compose message%s"
 msgstr "Písanie správy%s"
 
-#: src/compose.c:2478
+#: src/compose.c:2476
 msgid "Recipient is not specified."
 msgstr "Nie je určený príjemca."
 
-#: src/compose.c:2486
+#: src/compose.c:2484
 #, fuzzy
 msgid "Empty subject"
 msgstr "Predmet"
 
-#: src/compose.c:2487
+#: src/compose.c:2485
 msgid "Subject is empty. Send it anyway?"
 msgstr "Predmet je prázdny. Odoslať napriek tomu?"
 
-#: src/compose.c:2538
+#: src/compose.c:2536
 msgid "can't get recipient list."
 msgstr "nedá sa získať zoznam príjemcov."
 
-#: src/compose.c:2558
+#: src/compose.c:2556
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1029,26 +1029,26 @@ msgstr ""
 "Nie je určené konto pre odosielanie správ.\n"
 "Pred odosielaním prosím zvoľte poštové konto."
 
-#: src/compose.c:2572 src/send_message.c:297
+#: src/compose.c:2570 src/send_message.c:297
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Pri odosielaní správy na %s nastala chyba."
 
-#: src/compose.c:2595
+#: src/compose.c:2593
 msgid "Can't save the message to outbox."
 msgstr "Správa sa nedá uložiť medzi odoslané správy."
 
-#: src/compose.c:2645
+#: src/compose.c:2643
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "Nemôžem nájsť žiadny kľúč asociovaný so zvoleným ID kľúča `%s'."
 
-#: src/compose.c:2709 src/compose.c:2965 src/compose.c:3028 src/compose.c:3148
-#: src/utils.c:2365
+#: src/compose.c:2707 src/compose.c:2963 src/compose.c:3026 src/compose.c:3146
+#: src/utils.c:2379
 msgid "can't change file mode\n"
 msgstr "nedá sa zmeniť mód súboru\n"
 
-#: src/compose.c:2741
+#: src/compose.c:2739
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1059,12 +1059,12 @@ msgstr ""
 "%s na %s.\n"
 "Odoslať správu aj napriek tomu?"
 
-#: src/compose.c:2747
+#: src/compose.c:2745
 #, fuzzy
 msgid "Code conversion error"
 msgstr "Chyba pri konverzii adresára"
 
-#: src/compose.c:2816
+#: src/compose.c:2814
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1073,155 +1073,155 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:2820
+#: src/compose.c:2818
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3108
+#: src/compose.c:3106
 msgid "can't remove the old message\n"
 msgstr "nedá sa odstrániť stará správa\n"
 
-#: src/compose.c:3126
+#: src/compose.c:3124
 msgid "queueing message...\n"
 msgstr "zaraďujem správu do fronty...\n"
 
-#: src/compose.c:3208
+#: src/compose.c:3206
 msgid "can't find queue folder\n"
 msgstr "nemôžem nájsť priečinok Na odoslanie\n"
 
-#: src/compose.c:3215
+#: src/compose.c:3213
 msgid "can't queue the message\n"
 msgstr "nemôžem zaradiť správu do fronty\n"
 
-#: src/compose.c:3792
+#: src/compose.c:3790
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "vygenerovaný Message-ID: %s\n"
 
-#: src/compose.c:3901
+#: src/compose.c:3899
 msgid "Creating compose window...\n"
 msgstr "Vytváram okno pre písanie správy...\n"
 
-#: src/compose.c:3949 src/headerview.c:54 src/summary_search.c:214
+#: src/compose.c:3947 src/headerview.c:54 src/summary_search.c:214
 msgid "From:"
 msgstr "Od:"
 
-#: src/compose.c:4021
+#: src/compose.c:4019
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/_Nástroje/A_kcie"
 
-#: src/compose.c:4024
+#: src/compose.c:4022
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/Sp_ráva/_Zašifrovať"
 
-#: src/compose.c:4062 src/compose.c:5001
+#: src/compose.c:4060 src/compose.c:4995
 msgid "MIME type"
 msgstr "MIME typ"
 
 #. S_COL_DATE
-#: src/compose.c:4071 src/mimeview.c:192 src/prefs_filter_edit.c:585
+#: src/compose.c:4069 src/mimeview.c:192 src/prefs_filter_edit.c:585
 #: src/prefs_summary_column.c:75 src/select-keys.c:317 src/summaryview.c:4217
 msgid "Size"
 msgstr "Veľkosť"
 
-#: src/compose.c:4449 src/mainwindow.c:2224 src/prefs_account.c:719
+#: src/compose.c:4442 src/mainwindow.c:2207 src/prefs_account.c:719
 #: src/prefs_common.c:947
 msgid "Send"
 msgstr "Odoslať"
 
-#: src/compose.c:4450
+#: src/compose.c:4443
 msgid "Send message"
 msgstr "Odoslať správu"
 
-#: src/compose.c:4458
+#: src/compose.c:4451
 msgid "Send later"
 msgstr "Odoslať neskôr"
 
-#: src/compose.c:4459
+#: src/compose.c:4452
 msgid "Put into queue folder and send later"
 msgstr "Zaradiť správu do priečinka Na odoslanie a odoslať neskôr"
 
-#: src/compose.c:4467
+#: src/compose.c:4460
 msgid "Draft"
 msgstr "Koncept"
 
-#: src/compose.c:4468
+#: src/compose.c:4461
 msgid "Save to draft folder"
 msgstr "Uložiť medzi koncepty"
 
-#: src/compose.c:4478
+#: src/compose.c:4471
 msgid "Insert"
 msgstr "Vložiť"
 
-#: src/compose.c:4479
+#: src/compose.c:4472
 msgid "Insert file"
 msgstr "Vložiť obsah súboru"
 
-#: src/compose.c:4487
+#: src/compose.c:4480
 msgid "Attach"
 msgstr "Pripojiť"
 
-#: src/compose.c:4488
+#: src/compose.c:4481
 msgid "Attach file"
 msgstr "Pripojiť súbor"
 
 #. signature
-#: src/compose.c:4498 src/prefs_account.c:1391 src/prefs_common.c:1356
+#: src/compose.c:4491 src/prefs_account.c:1391 src/prefs_common.c:1356
 msgid "Signature"
 msgstr "Podpis"
 
-#: src/compose.c:4499
+#: src/compose.c:4492
 msgid "Insert signature"
 msgstr "Vložiť podpis"
 
-#: src/compose.c:4508 src/prefs_common.c:1378 src/prefs_common.c:2382
+#: src/compose.c:4501 src/prefs_common.c:1378 src/prefs_common.c:2382
 msgid "Editor"
 msgstr "Editor"
 
-#: src/compose.c:4509
+#: src/compose.c:4502
 msgid "Edit with external editor"
 msgstr "Upraviť pomocou externého editoru"
 
-#: src/compose.c:4517
+#: src/compose.c:4510
 msgid "Linewrap"
 msgstr "Riadkovanie"
 
-#: src/compose.c:4518
+#: src/compose.c:4511
 msgid "Wrap all long lines"
 msgstr "Zalomiť všetky dlhé riadky"
 
-#: src/compose.c:4897
+#: src/compose.c:4891
 msgid "Invalid MIME type."
 msgstr "Neplatný MIME typ."
 
-#: src/compose.c:4915
+#: src/compose.c:4909
 msgid "File doesn't exist or is empty."
 msgstr "Súbor neexistuje alebo je prázdny."
 
-#: src/compose.c:4983
+#: src/compose.c:4977
 msgid "Properties"
 msgstr "Vlastnosti"
 
-#: src/compose.c:5003
+#: src/compose.c:4997
 msgid "Encoding"
 msgstr "Kódová stránka"
 
-#: src/compose.c:5026 src/prefs_folder_item.c:183
+#: src/compose.c:5020 src/prefs_folder_item.c:183
 msgid "Path"
 msgstr "Cesta"
 
-#: src/compose.c:5027
+#: src/compose.c:5021
 msgid "File name"
 msgstr "Názov súboru"
 
-#: src/compose.c:5185
+#: src/compose.c:5179
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Neplatný príkaz pre externý editor: `%s'\n"
 
-#: src/compose.c:5211
+#: src/compose.c:5205
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1232,75 +1232,75 @@ msgstr ""
 "Ukončiť ho násilne?\n"
 "skupinový ID procesu: %d"
 
-#: src/compose.c:5228
+#: src/compose.c:5222
 #, c-format
 msgid "Terminated process group id: %d"
 msgstr "Ukončená skupina procesov s ID: %d"
 
-#: src/compose.c:5229
+#: src/compose.c:5223
 #, c-format
 msgid "Temporary file: %s"
 msgstr "Dočasný súbor: %s"
 
-#: src/compose.c:5253
+#: src/compose.c:5247
 msgid "Compose: input from monitoring process\n"
 msgstr "Písanie: vstup z externého procesu\n"
 
 #. failed
-#: src/compose.c:5284
+#: src/compose.c:5278
 msgid "Couldn't exec external editor\n"
 msgstr "Nedá sa spustiť externý editor\n"
 
-#: src/compose.c:5288
+#: src/compose.c:5282
 msgid "Couldn't write to file\n"
 msgstr "Nedá sa zapisovať do súboru\n"
 
-#: src/compose.c:5290
+#: src/compose.c:5284
 msgid "Pipe read failed\n"
 msgstr "Nedá sa čítať z potrubia\n"
 
-#: src/compose.c:5596 src/compose.c:5604 src/compose.c:5610
+#: src/compose.c:5590 src/compose.c:5598 src/compose.c:5604
 msgid "Can't queue the message."
 msgstr "Správa sa nedá zaradiť do fronty."
 
-#: src/compose.c:5701
+#: src/compose.c:5695
 #, fuzzy
 msgid "Select files"
 msgstr "Vybrať súbor"
 
-#: src/compose.c:5723
+#: src/compose.c:5717
 msgid "Select file"
 msgstr "Vybrať súbor"
 
-#: src/compose.c:5760
+#: src/compose.c:5754
 #, fuzzy
 msgid "Save message"
 msgstr "Odoslať správu"
 
-#: src/compose.c:5761
+#: src/compose.c:5755
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Obsah správy sa zmenil. Chcete zahodiť zmeny?"
 
-#: src/compose.c:5763
+#: src/compose.c:5757
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:5805
+#: src/compose.c:5799
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Chcete použiť šablónu `%s' ?"
 
-#: src/compose.c:5807
+#: src/compose.c:5801
 msgid "Apply template"
 msgstr "Použiť šablónu"
 
-#: src/compose.c:5808
+#: src/compose.c:5802
 #, fuzzy
 msgid "_Replace"
 msgstr "Nahradiť"
 
-#: src/compose.c:5808
+#: src/compose.c:5802
 #, fuzzy
 msgid "_Insert"
 msgstr "Vložiť"
@@ -1749,12 +1749,12 @@ msgstr "Nastavujem informácie o priečinku...\n"
 msgid "Setting folder info..."
 msgstr "Nastavujem informácie o priečinku..."
 
-#: src/folderview.c:805 src/mainwindow.c:3301 src/setup.c:81
+#: src/folderview.c:805 src/mainwindow.c:3272 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Prehľadávam priečinok %s%c%s ..."
 
-#: src/folderview.c:809 src/mainwindow.c:3306 src/setup.c:86
+#: src/folderview.c:809 src/mainwindow.c:3277 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Prehľadávam priečinok %s ..."
@@ -2075,44 +2075,44 @@ msgstr "IMAP4 autentizácia bola neúspešná.\n"
 msgid "IMAP4 login failed.\n"
 msgstr "neúspešné prihlásenie k IMAP4.\n"
 
-#: src/imap.c:3522
+#: src/imap.c:3528
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "nedá sa napojiť %s k %s\n"
 
-#: src/imap.c:3529
+#: src/imap.c:3535
 msgid "(sending file...)"
 msgstr "(posielam súbor...)"
 
-#: src/imap.c:3557
+#: src/imap.c:3563
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "nedá sa napojiť správa k %s\n"
 
-#: src/imap.c:3589
+#: src/imap.c:3595
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "nedá sa kopírovať %s do %s\n"
 
-#: src/imap.c:3613
+#: src/imap.c:3619
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "chyba pri IMAP príkaze: STORE %s %s\n"
 
-#: src/imap.c:3627
+#: src/imap.c:3633
 msgid "error while imap command: EXPUNGE\n"
 msgstr "chyba pri IMAP príkaze: EXPUNGE\n"
 
-#: src/imap.c:3640
+#: src/imap.c:3646
 msgid "error while imap command: CLOSE\n"
 msgstr "chyba pri IMAP príkaze: CLOSE\n"
 
-#: src/imap.c:3873
+#: src/imap.c:3879
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv nemôže skonvertovať UTF-7 na %s\n"
 
-#: src/imap.c:3903
+#: src/imap.c:3909
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv nemôže skonvertovať %s na UTF-7\n"
@@ -2214,7 +2214,7 @@ msgstr "Importovať súbor LDIF do adresára"
 msgid "Prev"
 msgstr "Predchádzajúci"
 
-#: src/importldif.c:768 src/mainwindow.c:2321
+#: src/importldif.c:768 src/mainwindow.c:2303
 msgid "Next"
 msgstr "Nasledujúca"
 
@@ -2561,639 +2561,639 @@ msgid ""
 "Do you want to migrate it?"
 msgstr ""
 
-#: src/mainwindow.c:471
+#: src/mainwindow.c:462
 msgid "/_File/_Folder"
 msgstr "/_Súbor/P_riečinok"
 
-#: src/mainwindow.c:472
+#: src/mainwindow.c:463
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/_Súbor/P_riečinok/Vytvoriť _nový priečinok..."
 
-#: src/mainwindow.c:474
+#: src/mainwindow.c:465
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/_Súbor/P_riečinok/P_remenovať priečinok..."
 
-#: src/mainwindow.c:475
+#: src/mainwindow.c:466
 #, fuzzy
 msgid "/_File/_Folder/_Move folder..."
 msgstr "/_Súbor/P_riečinok/P_remenovať priečinok..."
 
-#: src/mainwindow.c:476
+#: src/mainwindow.c:467
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/_Súbor/P_riečinok/O_dstrániť priečinok"
 
-#: src/mainwindow.c:477
+#: src/mainwindow.c:468
 #, fuzzy
 msgid "/_File/_Mailbox"
 msgstr "/_Súbor/_Pridať schránku..."
 
-#: src/mainwindow.c:478
+#: src/mainwindow.c:469
 #, fuzzy
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/_Súbor/_Pridať schránku..."
 
-#: src/mainwindow.c:479
+#: src/mainwindow.c:470
 #, fuzzy
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/_Odstrániť schránku"
 
-#: src/mainwindow.c:480 src/mainwindow.c:485
+#: src/mainwindow.c:471 src/mainwindow.c:476
 #, fuzzy
 msgid "/_File/_Mailbox/---"
 msgstr "/_Súbor/P_riečinok/---"
 
-#: src/mainwindow.c:481
+#: src/mainwindow.c:472
 #, fuzzy
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "/P_rijať nové správy"
 
-#: src/mainwindow.c:483
+#: src/mainwindow.c:474
 #, fuzzy
 msgid "/_File/_Mailbox/Check for new messages in _all mailboxes"
 msgstr "/_Súbor/P_riečinok/Pri_jať nové správy vo všetkých priečinkoch"
 
-#: src/mainwindow.c:486
+#: src/mainwindow.c:477
 #, fuzzy
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "/O_bnoviť štruktúru priečinkov"
 
-#: src/mainwindow.c:489
+#: src/mainwindow.c:480
 msgid "/_File/_Import mbox file..."
 msgstr "/_Súbor/_Importovať súbor mbox..."
 
-#: src/mainwindow.c:490
+#: src/mainwindow.c:481
 msgid "/_File/_Export to mbox file..."
 msgstr "/_Súbor/_Exportovať do súboru mbox..."
 
-#: src/mainwindow.c:492
+#: src/mainwindow.c:483
 #, fuzzy
 msgid "/_File/Empty all _trash"
 msgstr "/_Súbor/Vyčistiť odpadkový _kôš"
 
-#: src/mainwindow.c:494 src/messageview.c:138
+#: src/mainwindow.c:485 src/messageview.c:138
 msgid "/_File/_Save as..."
 msgstr "/_Súbor/_Uložiť ako..."
 
-#: src/mainwindow.c:495 src/messageview.c:139
+#: src/mainwindow.c:486 src/messageview.c:139
 msgid "/_File/_Print..."
 msgstr "/_Súbor/_Tlačiť..."
 
-#: src/mainwindow.c:497
+#: src/mainwindow.c:488
 msgid "/_File/_Work offline"
 msgstr "/_Súbor/P_racovať odpojený"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:500
+#: src/mainwindow.c:491
 msgid "/_File/E_xit"
 msgstr "/_Súbor/Uk_ončiť"
 
-#: src/mainwindow.c:505
+#: src/mainwindow.c:496
 msgid "/_Edit/Select _thread"
 msgstr "/Ú_pravy/Zvoliť _vlákno"
 
-#: src/mainwindow.c:507 src/messageview.c:147
+#: src/mainwindow.c:498 src/messageview.c:147
 msgid "/_Edit/_Find in current message..."
 msgstr "/Ú_pravy/Vy_hľadať v aktuálnej správe..."
 
-#: src/mainwindow.c:509
+#: src/mainwindow.c:500
 msgid "/_Edit/_Search messages..."
 msgstr "/Ú_pravy/_Vyhľadať v správach..."
 
-#: src/mainwindow.c:512
+#: src/mainwindow.c:503
 msgid "/_View/Show or hi_de"
 msgstr "/_Zobraziť/_Ukázať alebo skryť"
 
-#: src/mainwindow.c:513
+#: src/mainwindow.c:504
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/_Zobraziť/_Ukázať alebo skryť/_Strom priečinkov"
 
-#: src/mainwindow.c:515
+#: src/mainwindow.c:506
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/_Zobraziť/_Ukázať alebo skryť/_Zobrazenie správy"
 
-#: src/mainwindow.c:517
+#: src/mainwindow.c:508
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/_Zobraziť/_Ukázať alebo skryť/_Panel nástrojov"
 
-#: src/mainwindow.c:519
+#: src/mainwindow.c:510
 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:521
+#: src/mainwindow.c:512
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/_Zobraziť/_Ukázať alebo skryť/_Panel nástrojov/_Ikony"
 
-#: src/mainwindow.c:523
+#: src/mainwindow.c:514
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/_Zobraziť/_Ukázať alebo skryť/_Panel nástrojov/_Text"
 
-#: src/mainwindow.c:525
+#: src/mainwindow.c:516
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/_Zobraziť/_Ukázať alebo skryť/_Panel nástrojov/Žiad_ne"
 
-#: src/mainwindow.c:527
+#: src/mainwindow.c:518
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/_Zobraziť/_Ukázať alebo skryť/Stavový _riadok"
 
-#: src/mainwindow.c:530
+#: src/mainwindow.c:521
 msgid "/_View/Separate f_older tree"
 msgstr "/_Zobraziť/Samostatný str_om priečinkov"
 
-#: src/mainwindow.c:531
+#: src/mainwindow.c:522
 #, fuzzy
 msgid "/_View/Separate _message view"
 msgstr "/_Zobraziť/Samostatné zobraz_enie správy"
 
-#: src/mainwindow.c:533
+#: src/mainwindow.c:524
 msgid "/_View/_Sort"
 msgstr "/_Zobraziť/_Triediť"
 
-#: src/mainwindow.c:534
+#: src/mainwindow.c:525
 msgid "/_View/_Sort/by _number"
 msgstr "/_Zobraziť/_Triediť/podľa čí_sla"
 
-#: src/mainwindow.c:535
+#: src/mainwindow.c:526
 msgid "/_View/_Sort/by s_ize"
 msgstr "/_Zobraziť/_Triediť/podľa _veľkosti"
 
-#: src/mainwindow.c:536
+#: src/mainwindow.c:527
 msgid "/_View/_Sort/by _date"
 msgstr "/_Zobraziť/_Triediť/podľa _dátumu"
 
-#: src/mainwindow.c:537
+#: src/mainwindow.c:528
 msgid "/_View/_Sort/by _from"
 msgstr "/_Zobraziť/_Triediť/podľa _odosielateľa"
 
-#: src/mainwindow.c:538
+#: src/mainwindow.c:529
 msgid "/_View/_Sort/by _recipient"
 msgstr "/_Zobraziť/_Triediť/podľa _príjemcu"
 
-#: src/mainwindow.c:539
+#: src/mainwindow.c:530
 msgid "/_View/_Sort/by _subject"
 msgstr "/_Zobraziť/_Triediť/podľa p_redmetu"
 
-#: src/mainwindow.c:540
+#: src/mainwindow.c:531
 msgid "/_View/_Sort/by _color label"
 msgstr "/_Zobraziť/_Triediť/podľa _farebného označenia"
 
-#: src/mainwindow.c:542
+#: src/mainwindow.c:533
 msgid "/_View/_Sort/by _mark"
 msgstr "/_Zobraziť/_Triediť/podľa _značky"
 
-#: src/mainwindow.c:543
+#: src/mainwindow.c:534
 msgid "/_View/_Sort/by _unread"
 msgstr "/_Zobraziť/_Triediť/podľa pr_ečítania"
 
-#: src/mainwindow.c:544
+#: src/mainwindow.c:535
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/_Zobraziť/_Triediť/podľa prí_loh"
 
-#: src/mainwindow.c:546
+#: src/mainwindow.c:537
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/_Zobraziť/_Triediť/_Netriediť"
 
-#: src/mainwindow.c:547 src/mainwindow.c:550
+#: src/mainwindow.c:538 src/mainwindow.c:541
 msgid "/_View/_Sort/---"
 msgstr "/_Zobraziť/_Triediť/---"
 
-#: src/mainwindow.c:548
+#: src/mainwindow.c:539
 msgid "/_View/_Sort/Ascending"
 msgstr "/_Zobraziť/_Triediť/Vzostupne"
 
-#: src/mainwindow.c:549
+#: src/mainwindow.c:540
 msgid "/_View/_Sort/Descending"
 msgstr "/_Zobraziť/_Triediť/Zostupne"
 
-#: src/mainwindow.c:551
+#: src/mainwindow.c:542
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/_Zobraziť/_Triediť/Zos_kupiť podľa predmetu"
 
-#: src/mainwindow.c:553
+#: src/mainwindow.c:544
 msgid "/_View/Th_read view"
 msgstr "/_Zobraziť/Zobraziť _vlákna"
 
-#: src/mainwindow.c:554
+#: src/mainwindow.c:545
 msgid "/_View/E_xpand all threads"
 msgstr "/_Zobraziť/_Rozbaliť všetky vlákna"
 
-#: src/mainwindow.c:555
+#: src/mainwindow.c:546
 msgid "/_View/Co_llapse all threads"
 msgstr "/_Zobraziť/Zba_liť všetky vlákna"
 
-#: src/mainwindow.c:556
+#: src/mainwindow.c:547
 msgid "/_View/Set display _item..."
 msgstr "/_Zobraziť/Nastav_iť zobrazované položky"
 
-#: src/mainwindow.c:559
+#: src/mainwindow.c:550
 msgid "/_View/_Go to"
 msgstr "/_Zobraziť/Pre_jsť na"
 
-#: src/mainwindow.c:560
+#: src/mainwindow.c:551
 msgid "/_View/_Go to/_Prev message"
 msgstr "/_Zobraziť/Pre_jsť na/_Predošlú správu"
 
-#: src/mainwindow.c:561
+#: src/mainwindow.c:552
 msgid "/_View/_Go to/_Next message"
 msgstr "/_Zobraziť/Pre_jsť na/Ď_alšiu správu"
 
-#: src/mainwindow.c:562 src/mainwindow.c:567 src/mainwindow.c:570
-#: src/mainwindow.c:575 src/mainwindow.c:580
+#: src/mainwindow.c:553 src/mainwindow.c:558 src/mainwindow.c:561
+#: src/mainwindow.c:566 src/mainwindow.c:571
 msgid "/_View/_Go to/---"
 msgstr "/_Zobraziť/Pre_jsť na/---"
 
-#: src/mainwindow.c:563
+#: src/mainwindow.c:554
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/_Zobraziť/Pre_jsť na/P_redošlú neprečítanú správu"
 
-#: src/mainwindow.c:565
+#: src/mainwindow.c:556
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/_Zobraziť/Pre_jsť na/Ďalšiu n_eprečítanú správu"
 
-#: src/mainwindow.c:568
+#: src/mainwindow.c:559
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/_Zobraziť/Pre_jsť na/Predošlú no_vú správu"
 
-#: src/mainwindow.c:569
+#: src/mainwindow.c:560
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/_Zobraziť/Pre_jsť na/Ďalši_u novú správu"
 
-#: src/mainwindow.c:571
+#: src/mainwindow.c:562
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/_Zobraziť/Pre_jsť na/Predošlú _označenú správu"
 
-#: src/mainwindow.c:573
+#: src/mainwindow.c:564
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/_Zobraziť/Pre_jsť na/Ďalšiu o_značenú správu"
 
-#: src/mainwindow.c:576
+#: src/mainwindow.c:567
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/_Zobraziť/Pre_jsť na/Predošlú správu s návestí_m"
 
-#: src/mainwindow.c:578
+#: src/mainwindow.c:569
 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:581
+#: src/mainwindow.c:572
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Zobraziť/Pre_jsť na/Iný priečino_k..."
 
-#: src/mainwindow.c:590 src/messageview.c:158
+#: src/mainwindow.c:581 src/messageview.c:158
 #, fuzzy
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Zobraziť/_Kódovanie/_Automatické"
 
-#: src/mainwindow.c:641 src/messageview.c:202
+#: src/mainwindow.c:632 src/messageview.c:202
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Zobraziť/_Kódovanie/Japonsko (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:643 src/messageview.c:204
+#: src/mainwindow.c:634 src/messageview.c:204
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Zobraziť/_Kódovanie/Japonsko (_EUC-JP)"
 
-#: src/mainwindow.c:645 src/messageview.c:206
+#: src/mainwindow.c:636 src/messageview.c:206
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Zobraziť/_Kódovanie/Japonsko (_Shift__JIS)"
 
-#: src/mainwindow.c:657 src/messageview.c:217
+#: src/mainwindow.c:648 src/messageview.c:217
 #, fuzzy
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Zobraziť/_Kódovanie/Čínština (ISO-2022-_CN)"
 
-#: src/mainwindow.c:663 src/messageview.c:222
+#: src/mainwindow.c:654 src/messageview.c:222
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Zobraziť/_Kódovanie/Kórea (ISO-2022-KR)"
 
-#: src/mainwindow.c:676 src/summaryview.c:401
+#: src/mainwindow.c:667 src/summaryview.c:401
 msgid "/_View/Open in new _window"
 msgstr "/_Zobraziť/Otvoriť v _novom okne"
 
-#: src/mainwindow.c:677 src/messageview.c:234
+#: src/mainwindow.c:668 src/messageview.c:234
 msgid "/_View/Mess_age source"
 msgstr "/_Zobraziť/Zdrojový kód správ_y"
 
-#: src/mainwindow.c:678 src/messageview.c:235
+#: src/mainwindow.c:669 src/messageview.c:235
 msgid "/_View/Show all _header"
 msgstr "/_Zobraziť/Zobraziť všetky _hlavičky"
 
-#: src/mainwindow.c:680
+#: src/mainwindow.c:671
 msgid "/_View/_Update summary"
 msgstr "/_Zobraziť/_Aktualizovať zoznam"
 
-#: src/mainwindow.c:682 src/messageview.c:237
+#: src/mainwindow.c:673 src/messageview.c:237
 msgid "/_Message"
 msgstr "/Sp_ráva"
 
-#: src/mainwindow.c:683
+#: src/mainwindow.c:674
 msgid "/_Message/Recei_ve"
 msgstr "/Sp_ráva/_Prijať"
 
-#: src/mainwindow.c:684
+#: src/mainwindow.c:675
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/Sp_ráva/_Prijať/Z _aktuálneho konta"
 
-#: src/mainwindow.c:686
+#: src/mainwindow.c:677
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/Sp_ráva/_Prijať/Zo _všetkých kônt"
 
-#: src/mainwindow.c:688
+#: src/mainwindow.c:679
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/Sp_ráva/_Prijať/_Ukončiť prijímanie"
 
-#: src/mainwindow.c:690
+#: src/mainwindow.c:681
 msgid "/_Message/Recei_ve/---"
 msgstr "/Sp_ráva/_Prijať/---"
 
-#: src/mainwindow.c:691
+#: src/mainwindow.c:682
 msgid "/_Message/_Send queued messages"
 msgstr "/Sp_ráva/_Odoslať správy vo fronte"
 
-#: src/mainwindow.c:692 src/mainwindow.c:694 src/mainwindow.c:701
-#: src/mainwindow.c:706 src/mainwindow.c:710 src/mainwindow.c:719
-#: src/mainwindow.c:722 src/messageview.c:240 src/messageview.c:248
+#: src/mainwindow.c:683 src/mainwindow.c:685 src/mainwindow.c:692
+#: src/mainwindow.c:697 src/mainwindow.c:701 src/mainwindow.c:710
+#: src/mainwindow.c:713 src/messageview.c:240 src/messageview.c:248
 #: src/messageview.c:253
 msgid "/_Message/---"
 msgstr "/Sp_ráva/---"
 
-#: src/mainwindow.c:693 src/messageview.c:238
+#: src/mainwindow.c:684 src/messageview.c:238
 msgid "/_Message/Compose _new message"
 msgstr "/Sp_ráva/_Napísať novú správu"
 
-#: src/mainwindow.c:695 src/messageview.c:241
+#: src/mainwindow.c:686 src/messageview.c:241
 msgid "/_Message/_Reply"
 msgstr "/Sp_ráva/O_dpovedať"
 
-#: src/mainwindow.c:696
+#: src/mainwindow.c:687
 msgid "/_Message/Repl_y to"
 msgstr "/Sp_ráva/Odpo_vedať komu"
 
-#: src/mainwindow.c:697 src/messageview.c:242
+#: src/mainwindow.c:688 src/messageview.c:242
 msgid "/_Message/Repl_y to/_all"
 msgstr "/Sp_ráva/Odpoved_ať komu/_všetkým"
 
-#: src/mainwindow.c:698 src/messageview.c:244
+#: src/mainwindow.c:689 src/messageview.c:244
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/Sp_ráva/Od_povedať komu/_odosielateľovi"
 
-#: src/mainwindow.c:699 src/messageview.c:246
+#: src/mainwindow.c:690 src/messageview.c:246
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/Sp_ráva/Od_povedať komu/do _diskusnej skupiny"
 
-#: src/mainwindow.c:702 src/messageview.c:249
+#: src/mainwindow.c:693 src/messageview.c:249
 msgid "/_Message/_Forward"
 msgstr "/Sp_ráva/_Poslať ďalej"
 
-#: src/mainwindow.c:703 src/messageview.c:250
+#: src/mainwindow.c:694 src/messageview.c:250
 msgid "/_Message/For_ward as attachment"
 msgstr "/Sp_ráva/Poslať ako p_rílohu"
 
-#: src/mainwindow.c:705 src/messageview.c:252
+#: src/mainwindow.c:696 src/messageview.c:252
 msgid "/_Message/Redirec_t"
 msgstr "/Sp_ráva/Pre_smerovať"
 
-#: src/mainwindow.c:707
+#: src/mainwindow.c:698
 msgid "/_Message/M_ove..."
 msgstr "/Sp_ráva/Pres_unúť"
 
-#: src/mainwindow.c:708
+#: src/mainwindow.c:699
 msgid "/_Message/_Copy..."
 msgstr "/Sp_ráva/_Kopírovať"
 
-#: src/mainwindow.c:709
+#: src/mainwindow.c:700
 msgid "/_Message/_Delete"
 msgstr "/Sp_ráva/Z_mazať"
 
-#: src/mainwindow.c:711
+#: src/mainwindow.c:702
 msgid "/_Message/_Mark"
 msgstr "/Sp_ráva/O_značiť"
 
-#: src/mainwindow.c:712
+#: src/mainwindow.c:703
 msgid "/_Message/_Mark/_Mark"
 msgstr "/Sp_ráva/O_značiť/O_značiť"
 
-#: src/mainwindow.c:713
+#: src/mainwindow.c:704
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/Sp_ráva/O_značiť/O_dznačiť"
 
-#: src/mainwindow.c:714
+#: src/mainwindow.c:705
 msgid "/_Message/_Mark/---"
 msgstr "/Sp_ráva/O_značiť/---"
 
-#: src/mainwindow.c:715
+#: src/mainwindow.c:706
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/Sp_ráva/O_značiť/Označiť ako _neprečítané"
 
-#: src/mainwindow.c:716
+#: src/mainwindow.c:707
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/Sp_ráva/O_značiť/Označiť ako _prečítané"
 
-#: src/mainwindow.c:718
+#: src/mainwindow.c:709
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/Sp_ráva/O_značiť/Označiť _všetky ako prečítané"
 
-#: src/mainwindow.c:720
+#: src/mainwindow.c:711
 #, fuzzy
 msgid "/_Message/Set as _junk mail"
 msgstr "/Sp_ráva/_Odoslať"
 
-#: src/mainwindow.c:721
+#: src/mainwindow.c:712
 msgid "/_Message/Set as not j_unk mail"
 msgstr ""
 
-#: src/mainwindow.c:723 src/messageview.c:254
+#: src/mainwindow.c:714 src/messageview.c:254
 msgid "/_Message/Re-_edit"
 msgstr "/Sp_ráva/Znovu _editovať"
 
-#: src/mainwindow.c:727
+#: src/mainwindow.c:718
 #, fuzzy
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/_Nástroje/Pridať _odosielateľa do adresára"
 
-#: src/mainwindow.c:730
+#: src/mainwindow.c:721
 #, fuzzy
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/_Nástroje/_Filtrovať správy"
 
-#: src/mainwindow.c:732
+#: src/mainwindow.c:723
 #, fuzzy
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Nástroje/_Filtrovať správy"
 
-#: src/mainwindow.c:734 src/messageview.c:261
+#: src/mainwindow.c:725 src/messageview.c:261
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Nástroje/Vytvoriť pravidlo fi_ltra"
 
-#: src/mainwindow.c:735 src/messageview.c:263
+#: src/mainwindow.c:726 src/messageview.c:263
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Nástroje/Vytvoriť pravidlo fi_ltra/_Automaticky"
 
-#: src/mainwindow.c:737 src/messageview.c:265
+#: src/mainwindow.c:728 src/messageview.c:265
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Nástroje/Vytvoriť pravidlo fi_ltra/podľa _odosielateľa"
 
-#: src/mainwindow.c:739 src/messageview.c:267
+#: src/mainwindow.c:730 src/messageview.c:267
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Nástroje/Vytvoriť pravidlo fi_ltra/podľa _príjemcu"
 
-#: src/mainwindow.c:741 src/messageview.c:269
+#: src/mainwindow.c:732 src/messageview.c:269
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Nástroje/Vytvoriť pravidlo fi_ltra/podľa p_redmetu"
 
-#: src/mainwindow.c:744
+#: src/mainwindow.c:735
 #, fuzzy
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/_Nástroje/_Filtrovať správy"
 
-#: src/mainwindow.c:746
+#: src/mainwindow.c:737
 #, fuzzy
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/_Nástroje/_Filtrovať správy"
 
-#: src/mainwindow.c:751
+#: src/mainwindow.c:742
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/_Nástroje/Zmazať du_plikátne správy"
 
-#: src/mainwindow.c:754
+#: src/mainwindow.c:745
 msgid "/_Tools/E_xecute"
 msgstr "/_Nástroje/V_ykonať"
 
-#: src/mainwindow.c:756
+#: src/mainwindow.c:747
 msgid "/_Tools/_Log window"
 msgstr "/_Nástroje/Okno _záznamu"
 
-#: src/mainwindow.c:758
+#: src/mainwindow.c:749
 msgid "/_Configuration"
 msgstr "/Nastav_enia"
 
-#: src/mainwindow.c:759
+#: src/mainwindow.c:750
 msgid "/_Configuration/_Common preferences..."
 msgstr "/Nastav_enia/_Všeobecné nastavenia..."
 
-#: src/mainwindow.c:761
+#: src/mainwindow.c:752
 msgid "/_Configuration/_Filter setting..."
 msgstr "/Nastav_enia/Nastavenie _filtru..."
 
-#: src/mainwindow.c:763
+#: src/mainwindow.c:754
 msgid "/_Configuration/_Template..."
 msgstr "/Nastav_enia/Š_ablóna..."
 
-#: src/mainwindow.c:764
+#: src/mainwindow.c:755
 msgid "/_Configuration/_Actions..."
 msgstr "/Nastav_enia/_Akcie..."
 
-#: src/mainwindow.c:765
+#: src/mainwindow.c:756
 msgid "/_Configuration/---"
 msgstr "/Nastav_enia/---"
 
-#: src/mainwindow.c:766
+#: src/mainwindow.c:757
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/Nastav_enia/Nastavenia aktívneho _konta..."
 
-#: src/mainwindow.c:768
+#: src/mainwindow.c:759
 msgid "/_Configuration/Create _new account..."
 msgstr "/Nastav_enia/Vytvoriť _nové konto..."
 
-#: src/mainwindow.c:770
+#: src/mainwindow.c:761
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/Nastav_enia/_Upraviť kontá..."
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:763
 msgid "/_Configuration/C_hange current account"
 msgstr "/Nastav_enia/_Zmeniť aktívne konto"
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:767
 msgid "/_Help/_Manual"
 msgstr "/Nápo_veda/_Manuál"
 
-#: src/mainwindow.c:777
+#: src/mainwindow.c:768
 msgid "/_Help/_Manual/_English"
 msgstr "/Nápo_veda/_Manuál/_Anglicky"
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:769
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/Nápo_veda/_Manuál/_Japonsky"
 
-#: src/mainwindow.c:779
+#: src/mainwindow.c:770
 msgid "/_Help/_FAQ"
 msgstr "/Nápo_veda/_FAQ"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:771
 msgid "/_Help/_FAQ/_English"
 msgstr "/Nápo_veda/_FAQ/_Anglicky"
 
-#: src/mainwindow.c:781
+#: src/mainwindow.c:772
 msgid "/_Help/_FAQ/_German"
 msgstr "/Nápo_veda/_FAQ/_Japonsky"
 
-#: src/mainwindow.c:782
+#: src/mainwindow.c:773
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/Nápo_veda/_FAQ/Š_panielsky"
 
-#: src/mainwindow.c:783
+#: src/mainwindow.c:774
 msgid "/_Help/_FAQ/_French"
 msgstr "/Nápo_veda/_FAQ/_Francúzky"
 
-#: src/mainwindow.c:784
+#: src/mainwindow.c:775
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/Nápo_veda/_FAQ/_Taliansky"
 
-#: src/mainwindow.c:785
+#: src/mainwindow.c:776
 msgid "/_Help/---"
 msgstr "/Nápo_veda/---"
 
-#: src/mainwindow.c:825
+#: src/mainwindow.c:816
 msgid "Creating main window...\n"
 msgstr "Vytváram hlavné okno...\n"
 
-#: src/mainwindow.c:987
+#: src/mainwindow.c:973
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Hlavné Okno: alokácia farieb %d bola neúspešná\n"
 
-#: src/mainwindow.c:1071 src/summaryview.c:2020 src/summaryview.c:2105
+#: src/mainwindow.c:1057 src/summaryview.c:2020 src/summaryview.c:2105
 #: src/summaryview.c:3342 src/summaryview.c:3415 src/summaryview.c:3728
 msgid "done.\n"
 msgstr "hotovo.\n"
 
-#: src/mainwindow.c:1196 src/mainwindow.c:1237 src/mainwindow.c:1265
+#: src/mainwindow.c:1182 src/mainwindow.c:1223 src/mainwindow.c:1251
 msgid "Untitled"
 msgstr "Bez názvu"
 
-#: src/mainwindow.c:1266
+#: src/mainwindow.c:1252
 msgid "none"
 msgstr "žiadny"
 
-#: src/mainwindow.c:1316
+#: src/mainwindow.c:1302
 #, 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:1536
+#: src/mainwindow.c:1522
 msgid "Offline"
 msgstr "Odpojené"
 
-#: src/mainwindow.c:1537
+#: src/mainwindow.c:1523
 msgid "You are offline. Go online?"
 msgstr "Ste odpojený. Pripojiť sa?"
 
-#: src/mainwindow.c:1551
+#: src/mainwindow.c:1537
 #, fuzzy
 msgid "Empty all trash"
 msgstr "Vyprázdniť kôš"
 
-#: src/mainwindow.c:1552
+#: src/mainwindow.c:1538
 #, fuzzy
 msgid "Empty messages in all trash?"
 msgstr "Zmazať všetky správy v koši?"
 
-#: src/mainwindow.c:1580
+#: src/mainwindow.c:1566
 msgid "Add mailbox"
 msgstr "Pridať mailbox"
 
-#: src/mainwindow.c:1581
+#: src/mainwindow.c:1567
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3203,16 +3203,16 @@ msgstr ""
 "Ak zadáte existujúci mailbox, bude\n"
 "automaticky prehľadaný."
 
-#: src/mainwindow.c:1587
+#: src/mainwindow.c:1573
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Mailbox '%s' už existuje."
 
-#: src/mainwindow.c:1592 src/setup.c:57
+#: src/mainwindow.c:1578 src/setup.c:57
 msgid "Mailbox"
 msgstr "Mailbox"
 
-#: src/mainwindow.c:1598 src/setup.c:63
+#: src/mainwindow.c:1584 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3222,153 +3222,153 @@ msgstr ""
 "Pravdepodobne už niektoré súbory existujú, alebo tam nemáte práva na "
 "zapisovanie."
 
-#: src/mainwindow.c:1989
+#: src/mainwindow.c:1975
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Zobrazenie priečinku"
 
-#: src/mainwindow.c:2009 src/messageview.c:368
+#: src/mainwindow.c:1995 src/messageview.c:368
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Zobrazenie správy"
 
-#: src/mainwindow.c:2156 src/summaryview.c:370
+#: src/mainwindow.c:2142 src/summaryview.c:370
 msgid "/_Reply"
 msgstr "/_Odpovedať"
 
-#: src/mainwindow.c:2157
+#: src/mainwindow.c:2143
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "Odpovedať odosielateľovi i všetkým príjemcom"
 
-#: src/mainwindow.c:2158
+#: src/mainwindow.c:2144
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/O_dpovedať komu/_odosielateľovi"
 
-#: src/mainwindow.c:2159
+#: src/mainwindow.c:2145
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/O_dpovedať komu/do _diskusnej skupiny"
 
-#: src/mainwindow.c:2164 src/summaryview.c:377
+#: src/mainwindow.c:2150 src/summaryview.c:377
 msgid "/_Forward"
 msgstr "/_Poslať ďalej"
 
-#: src/mainwindow.c:2165 src/summaryview.c:378
+#: src/mainwindow.c:2151 src/summaryview.c:378
 msgid "/For_ward as attachment"
 msgstr "/Poslať ďalej ako p_rílohu"
 
-#: src/mainwindow.c:2166 src/summaryview.c:379
+#: src/mainwindow.c:2152 src/summaryview.c:379
 msgid "/Redirec_t"
 msgstr "/Pr_esmerovať"
 
-#: src/mainwindow.c:2205
+#: src/mainwindow.c:2188
 msgid "Get"
 msgstr "Prijať"
 
-#: src/mainwindow.c:2206
+#: src/mainwindow.c:2189
 msgid "Incorporate new mail"
 msgstr "Prijať novú poštu"
 
-#: src/mainwindow.c:2213
+#: src/mainwindow.c:2196
 msgid "Get all"
 msgstr "Prijať všetko"
 
-#: src/mainwindow.c:2214
+#: src/mainwindow.c:2197
 msgid "Incorporate new mail of all accounts"
 msgstr "Prijať novú poštu pre všetky kontá"
 
-#: src/mainwindow.c:2225
+#: src/mainwindow.c:2208
 msgid "Send queued message(s)"
 msgstr "Odoslať správy vo fronte"
 
-#: src/mainwindow.c:2235 src/prefs_account.c:721 src/prefs_common.c:949
+#: src/mainwindow.c:2218 src/prefs_account.c:721 src/prefs_common.c:949
 #: src/prefs_folder_item.c:137
 msgid "Compose"
 msgstr "Nová správa"
 
-#: src/mainwindow.c:2236
+#: src/mainwindow.c:2219
 msgid "Compose new message"
 msgstr "Napísať novú správu"
 
-#: src/mainwindow.c:2244 src/prefs_common.c:1448
+#: src/mainwindow.c:2227 src/prefs_common.c:1448
 msgid "Reply"
 msgstr "Odpovedať"
 
-#: src/mainwindow.c:2245 src/mainwindow.c:2258
+#: src/mainwindow.c:2228 src/mainwindow.c:2241
 msgid "Reply to the message"
 msgstr "Odpovedať na správu"
 
-#: src/mainwindow.c:2263
+#: src/mainwindow.c:2245
 msgid "Reply all"
 msgstr "Odp. všetkým"
 
-#: src/mainwindow.c:2264
+#: src/mainwindow.c:2246
 msgid "Reply to all"
 msgstr "Odpovedať odosielateľovi i všetkým príjemcom"
 
-#: src/mainwindow.c:2272 src/prefs_filter_edit.c:741
+#: src/mainwindow.c:2254 src/prefs_filter_edit.c:741
 msgid "Forward"
 msgstr "Poslať ďalej"
 
-#: src/mainwindow.c:2273 src/mainwindow.c:2286
+#: src/mainwindow.c:2255 src/mainwindow.c:2268
 msgid "Forward the message"
 msgstr "Poslať správu ďalej"
 
-#: src/mainwindow.c:2293
+#: src/mainwindow.c:2275
 msgid "Delete the message"
 msgstr "Zmazať správu"
 
-#: src/mainwindow.c:2301 src/prefs_common.c:1988
+#: src/mainwindow.c:2283 src/prefs_common.c:1988
 msgid "Junk"
 msgstr ""
 
-#: src/mainwindow.c:2302
+#: src/mainwindow.c:2284
 #, fuzzy
 msgid "Set as junk mail"
 msgstr "Nastaviť ako východzie"
 
-#: src/mainwindow.c:2311
+#: src/mainwindow.c:2293
 msgid "Execute"
 msgstr "Vykonať"
 
-#: src/mainwindow.c:2312
+#: src/mainwindow.c:2294
 msgid "Execute marked process"
 msgstr "Vykonať označený proces"
 
-#: src/mainwindow.c:2322
+#: src/mainwindow.c:2304
 msgid "Next unread message"
 msgstr "Ďalšia neprečítaná správa"
 
-#: src/mainwindow.c:2334
+#: src/mainwindow.c:2316
 msgid "Prefs"
 msgstr "Nastavenia"
 
-#: src/mainwindow.c:2335
+#: src/mainwindow.c:2317
 msgid "Common preferences"
 msgstr "Všeobecné nastavenia"
 
-#: src/mainwindow.c:2343 src/prefs_folder_item.c:261
+#: src/mainwindow.c:2325 src/prefs_folder_item.c:261
 #: src/prefs_folder_item.c:272 src/progressdialog.c:128
 msgid "Account"
 msgstr "Konto"
 
-#: src/mainwindow.c:2344
+#: src/mainwindow.c:2326
 msgid "Account setting"
 msgstr "Nastavenie konta"
 
-#: src/mainwindow.c:2527
+#: src/mainwindow.c:2498
 msgid "You are offline. Click the icon to go online."
 msgstr "Ste odpojený. Kliknite na ikonu, ak sa chcete pripojiť."
 
-#: src/mainwindow.c:2538
+#: src/mainwindow.c:2509
 msgid "You are online. Click the icon to go offline."
 msgstr "Ste pripojený. Kliknite na ikonu, ak sa chcete odpojiť."
 
-#: src/mainwindow.c:2731
+#: src/mainwindow.c:2702
 msgid "Exit"
 msgstr "Ukončiť"
 
-#: src/mainwindow.c:2731
+#: src/mainwindow.c:2702
 msgid "Exit this program?"
 msgstr "Ukončiť program"
 
@@ -5610,11 +5610,11 @@ msgstr "Vytváram stavové okno...\n"
 msgid "Status"
 msgstr "Stav"
 
-#: src/recv.c:113
+#: src/recv.c:112
 msgid "error occurred while retrieving data.\n"
 msgstr "pri prijímaní dát sa vyskytla chyba.\n"
 
-#: src/recv.c:155 src/recv.c:197 src/recv.c:213
+#: src/recv.c:154 src/recv.c:196 src/recv.c:211
 msgid "Can't write to file.\n"
 msgstr "Do súboru sa nedá zapisovať.\n"
 
@@ -6351,7 +6351,7 @@ msgstr "%.2fMB"
 msgid "%.2fGB"
 msgstr "%.2fGB"
 
-#: src/utils.c:2372 src/utils.c:2496
+#: src/utils.c:2386 src/utils.c:2510
 #, c-format
 msgid "writing to %s failed.\n"
 msgstr "nepodaril sa zápis do %s.\n"
diff --git a/po/sl.po b/po/sl.po
index 9ce14c39..60cb0ce0 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-08-09 18:08+0900\n"
+"POT-Creation-Date: 2005-08-22 17:22+0900\n"
 "PO-Revision-Date: 2003-01-24 20:39CET\n"
 "Last-Translator: Jernej Kovacic <jkovacic@email.si>\n"
 "Language-Team: Slovenian <translator-team-sl@lists.sourceforge.net>\n"
@@ -97,7 +97,7 @@ msgstr ""
 "v stolpcu `G', da omogočite pobiranje sporočil z ukazom `Poberi vsa'."
 
 #: src/account.c:691 src/addressadd.c:192 src/addressbook.c:490
-#: src/compose.c:4081 src/editaddress.c:200 src/editaddress.c:942
+#: src/compose.c:4079 src/editaddress.c:200 src/editaddress.c:942
 #: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:265
 #: src/editjpilot.c:271 src/editldap.c:307 src/editvcard.c:184
 #: src/mimeview.c:201 src/prefs_filter.c:258 src/prefs_folder_item.c:170
@@ -233,7 +233,7 @@ msgstr ""
 msgid "Add Address to Book"
 msgstr "Dodaj naslov v adresar"
 
-#: src/addressadd.c:202 src/compose.c:4528 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4521 src/editaddress.c:201
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "Naslov"
@@ -247,7 +247,7 @@ msgstr "Opombe"
 msgid "Select Address Book Folder"
 msgstr "Izberite mapo za adresar"
 
-#: src/addressbook.c:336 src/compose.c:495 src/mainwindow.c:470
+#: src/addressbook.c:336 src/compose.c:493 src/mainwindow.c:461
 #: src/messageview.c:137
 msgid "/_File"
 msgstr "/_Datoteka"
@@ -268,10 +268,10 @@ msgstr "/_Datoteka/Nov _JPilot"
 msgid "/_File/New _Server"
 msgstr "/_Datoteka/Nov _strežnik"
 
-#: src/addressbook.c:345 src/addressbook.c:348 src/compose.c:500
-#: src/compose.c:505 src/compose.c:509 src/mainwindow.c:488
-#: src/mainwindow.c:491 src/mainwindow.c:493 src/mainwindow.c:496
-#: src/mainwindow.c:498 src/messageview.c:140
+#: src/addressbook.c:345 src/addressbook.c:348 src/compose.c:498
+#: src/compose.c:503 src/compose.c:507 src/mainwindow.c:479
+#: src/mainwindow.c:482 src/mainwindow.c:484 src/mainwindow.c:487
+#: src/mainwindow.c:489 src/messageview.c:140
 msgid "/_File/---"
 msgstr "/_Datoteka/---"
 
@@ -287,7 +287,7 @@ msgstr "/_Datoteka/_Brisanje"
 msgid "/_File/_Save"
 msgstr "/_Datoteka/_Shranjevanje"
 
-#: src/addressbook.c:350 src/compose.c:510 src/messageview.c:141
+#: src/addressbook.c:350 src/compose.c:508 src/messageview.c:141
 msgid "/_File/_Close"
 msgstr "/_Datoteka/_Zapri"
 
@@ -319,7 +319,7 @@ msgstr "/_Naslov/_Urejanje"
 msgid "/_Address/_Delete"
 msgstr "/_Naslov/_Brisanje"
 
-#: src/addressbook.c:358 src/compose.c:619 src/mainwindow.c:725
+#: src/addressbook.c:358 src/compose.c:617 src/mainwindow.c:716
 #: src/messageview.c:256
 msgid "/_Tools"
 msgstr "/_Orodja"
@@ -328,12 +328,12 @@ msgstr "/_Orodja"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Orodja/Uvoz datoteke _LDIF"
 
-#: src/addressbook.c:360 src/compose.c:632 src/mainwindow.c:775
+#: src/addressbook.c:360 src/compose.c:630 src/mainwindow.c:766
 #: src/messageview.c:274
 msgid "/_Help"
 msgstr "/_Pomoč"
 
-#: src/addressbook.c:361 src/compose.c:633 src/mainwindow.c:786
+#: src/addressbook.c:361 src/compose.c:631 src/mainwindow.c:777
 #: src/messageview.c:275
 msgid "/_Help/_About"
 msgstr "/_Pomoč/_O programu"
@@ -350,7 +350,7 @@ msgstr "/Nova _skupina"
 msgid "/New _Folder"
 msgstr "/Nova _mapa"
 
-#: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:489
+#: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:487
 #: src/folderview.c:235 src/folderview.c:237 src/folderview.c:241
 #: src/folderview.c:252 src/folderview.c:254 src/folderview.c:256
 #: src/folderview.c:260 src/folderview.c:270 src/folderview.c:272
@@ -360,8 +360,8 @@ msgstr "/Nova _mapa"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:512
-#: src/mainwindow.c:502 src/messageview.c:143
+#: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:510
+#: src/mainwindow.c:493 src/messageview.c:143
 msgid "/_Edit"
 msgstr "/_Urejanje"
 
@@ -373,7 +373,7 @@ msgstr "/_Brisanje"
 msgid "E-Mail address"
 msgstr "Elektronski naslov"
 
-#: src/addressbook.c:495 src/compose.c:4529 src/prefs_common.c:2402
+#: src/addressbook.c:495 src/compose.c:4522 src/prefs_common.c:2402
 msgid "Address book"
 msgstr "Imenik naslovov"
 
@@ -382,8 +382,8 @@ msgid "Name:"
 msgstr "Ime:"
 
 #. Buttons
-#: src/addressbook.c:627 src/addressbook.c:1673 src/editaddress.c:884
-#: src/editaddress.c:1017 src/mainwindow.c:2292 src/prefs_actions.c:266
+#: src/addressbook.c:627 src/addressbook.c:1674 src/editaddress.c:884
+#: src/editaddress.c:1017 src/mainwindow.c:2274 src/prefs_actions.c:266
 #: src/prefs_display_header.c:278 src/prefs_display_header.c:333
 #: src/prefs_template.c:231
 msgid "Delete"
@@ -422,7 +422,7 @@ msgstr "Brisanje naslova"
 msgid "Really delete the address(es)?"
 msgstr "Res želite izbrisati naslov(e)?"
 
-#: src/addressbook.c:1664
+#: src/addressbook.c:1665
 #, fuzzy, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -431,38 +431,38 @@ msgstr ""
 "Ali res želite izbrisati mapo IN vse naslove v '%s' ? \n"
 "Če izbrišete samo mapo, se bodo vsi naslovi prestavili v starševsko mapo."
 
-#: src/addressbook.c:1667 src/folderview.c:2139
+#: src/addressbook.c:1668 src/folderview.c:2139
 msgid "Delete folder"
 msgstr "Izbriši mapo"
 
-#: src/addressbook.c:1667
+#: src/addressbook.c:1668
 #, fuzzy
 msgid "_Folder only"
 msgstr "Samo mapa"
 
-#: src/addressbook.c:1667
+#: src/addressbook.c:1668
 #, fuzzy
 msgid "Folder and _addresses"
 msgstr "Mapa in naslovi"
 
-#: src/addressbook.c:1672
+#: src/addressbook.c:1673
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Res želite izbrisati '%s' ?"
 
-#: src/addressbook.c:2352 src/addressbook.c:2485
+#: src/addressbook.c:2353 src/addressbook.c:2486
 msgid "New user, could not save index file."
 msgstr "Nov uporabnik, ne morem shraniti indeksne datoteke."
 
-#: src/addressbook.c:2356 src/addressbook.c:2489
+#: src/addressbook.c:2357 src/addressbook.c:2490
 msgid "New user, could not save address book files."
 msgstr "Nov uporabnik, ne morem shraniti datotek z iminiki naslovov."
 
-#: src/addressbook.c:2366 src/addressbook.c:2499
+#: src/addressbook.c:2367 src/addressbook.c:2500
 msgid "Old address book converted successfully."
 msgstr "Star imenik naslovov je bil uspešno pretvorjen."
 
-#: src/addressbook.c:2371
+#: src/addressbook.c:2372
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -470,7 +470,7 @@ msgstr ""
 "Stari imenik naslovov pretvorjen,\n"
 "ne morem shraniti nove indeksne datoteke naslovov"
 
-#: src/addressbook.c:2384
+#: src/addressbook.c:2385
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -478,7 +478,7 @@ msgstr ""
 "Ne morem pretvoriti imenika naslovov,\n"
 "sem pa naredil prazne nove datoteke imenikov naslovov."
 
-#: src/addressbook.c:2390
+#: src/addressbook.c:2391
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -486,7 +486,7 @@ msgstr ""
 "Ne morem pretvoriti imenika naslovov,\n"
 "ne morem narediti novih datotek z imeniki naslovov."
 
-#: src/addressbook.c:2395
+#: src/addressbook.c:2396
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -494,90 +494,90 @@ msgstr ""
 "Ne morem pretvoriti imenika naslovov\n"
 "in ne morem narediti novih datotek z imeniki naslovov"
 
-#: src/addressbook.c:2402
+#: src/addressbook.c:2403
 msgid "Addressbook conversion error"
 msgstr "Napaka pri pretvorbi imenika naslovov"
 
-#: src/addressbook.c:2406
+#: src/addressbook.c:2407
 msgid "Addressbook conversion"
 msgstr "Pretvarjam imenik naslovov"
 
-#: src/addressbook.c:2441
+#: src/addressbook.c:2442
 msgid "Addressbook Error"
 msgstr "Napaka v imeniku naslovov"
 
-#: src/addressbook.c:2442 src/addressbook.c:2542
+#: src/addressbook.c:2443 src/addressbook.c:2543
 msgid "Could not read address index"
 msgstr "Ne morem prebrati indeksa naslovov"
 
-#: src/addressbook.c:2504
+#: src/addressbook.c:2505
 msgid "Old address book converted, could not save new address index file"
 msgstr ""
 "Star imenik naslovov pretvorjen, ne morem shraniti nove indeksne datoteke "
 "naslovov"
 
-#: src/addressbook.c:2518
+#: src/addressbook.c:2519
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr ""
 "Ne morem pretvoriti imenika naslovov, sem pa naredil prazno datoteko z "
 "imenikom naslovov."
 
-#: src/addressbook.c:2524
+#: src/addressbook.c:2525
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr ""
 "Ne morem pretvoriti imenika naslovov, ne morem narediti novih datotek z "
 "imeniki naslovov."
 
-#: src/addressbook.c:2530
+#: src/addressbook.c:2531
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr ""
 "Ne morem pretvoriti imenika naslovov in ne morem narediti novih datotek."
 
-#: src/addressbook.c:2548
+#: src/addressbook.c:2549
 msgid "Addressbook Conversion Error"
 msgstr "Napaka pri pretvorbi imenika naslovov"
 
-#: src/addressbook.c:2554
+#: src/addressbook.c:2555
 msgid "Addressbook Conversion"
 msgstr "Pretvorba imenika naslovov"
 
-#: src/addressbook.c:3055 src/prefs_common.c:963
+#: src/addressbook.c:3056 src/prefs_common.c:963
 msgid "Interface"
 msgstr "Vmesnik"
 
-#: src/addressbook.c:3071 src/importldif.c:514
+#: src/addressbook.c:3072 src/importldif.c:514
 msgid "Address Book"
 msgstr "Imenik naslovov"
 
-#: src/addressbook.c:3087
+#: src/addressbook.c:3088
 msgid "Person"
 msgstr "Oseba"
 
-#: src/addressbook.c:3103
+#: src/addressbook.c:3104
 msgid "EMail Address"
 msgstr "Elektronski naslov"
 
-#: src/addressbook.c:3119
+#: src/addressbook.c:3120
 msgid "Group"
 msgstr "Skupina"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3135 src/folderview.c:346 src/prefs_account.c:1866
+#: src/addressbook.c:3136 src/folderview.c:346 src/prefs_account.c:1866
 msgid "Folder"
 msgstr "Mapa"
 
-#: src/addressbook.c:3151
+#: src/addressbook.c:3152
 msgid "vCard"
 msgstr "v-kartica"
 
-#: src/addressbook.c:3167 src/addressbook.c:3183
+#: src/addressbook.c:3168 src/addressbook.c:3184
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3199
+#: src/addressbook.c:3200
 msgid "LDAP Server"
 msgstr "Strežnik LDAP"
 
@@ -589,7 +589,7 @@ msgstr "Skupni naslov"
 msgid "Personal address"
 msgstr "Osebni naslov"
 
-#: src/alertpanel.c:138 src/compose.c:5214 src/main.c:515
+#: src/alertpanel.c:138 src/compose.c:5208 src/main.c:515
 msgid "Notice"
 msgstr "Opomba"
 
@@ -644,382 +644,382 @@ msgstr "Rjava"
 msgid "None"
 msgstr "Nič"
 
-#: src/compose.c:487
+#: src/compose.c:485
 msgid "/_Add..."
 msgstr "/_Dodaj"
 
-#: src/compose.c:488
+#: src/compose.c:486
 msgid "/_Remove"
 msgstr "/_Odstrani"
 
-#: src/compose.c:490 src/folderview.c:243 src/folderview.c:262
+#: src/compose.c:488 src/folderview.c:243 src/folderview.c:262
 #: src/folderview.c:277
 #, fuzzy
 msgid "/_Properties..."
 msgstr "/_Lastnost..."
 
-#: src/compose.c:496
+#: src/compose.c:494
 #, fuzzy
 msgid "/_File/_Send"
 msgstr "/_Datoteka/_Shranjevanje"
 
-#: src/compose.c:498
+#: src/compose.c:496
 #, fuzzy
 msgid "/_File/Send _later"
 msgstr "/_Sporočilo/Poš_lji pozneje"
 
-#: src/compose.c:501
+#: src/compose.c:499
 #, fuzzy
 msgid "/_File/Save to _draft folder"
 msgstr "/_Sporočilo/Shrani v mapo _draft"
 
-#: src/compose.c:503
+#: src/compose.c:501
 #, fuzzy
 msgid "/_File/Save and _keep editing"
 msgstr "/_Sporočilo/Poš_lji in nadaljuj z urejanjem"
 
-#: src/compose.c:506
+#: src/compose.c:504
 msgid "/_File/_Attach file"
 msgstr "/_Datoteka/Pripni d_atoteko"
 
-#: src/compose.c:507
+#: src/compose.c:505
 msgid "/_File/_Insert file"
 msgstr "/Datoteka/Vr_ini datoteko"
 
-#: src/compose.c:508
+#: src/compose.c:506
 msgid "/_File/Insert si_gnature"
 msgstr "/Datoteka/Vrini _podpis"
 
-#: src/compose.c:513
+#: src/compose.c:511
 msgid "/_Edit/_Undo"
 msgstr "/_Uredi/_Razveljavi"
 
-#: src/compose.c:514
+#: src/compose.c:512
 msgid "/_Edit/_Redo"
 msgstr "/_Uredi/_Obnovi"
 
-#: src/compose.c:515 src/compose.c:522 src/mainwindow.c:506
+#: src/compose.c:513 src/compose.c:520 src/mainwindow.c:497
 #: src/messageview.c:146
 msgid "/_Edit/---"
 msgstr "/_Uredi/---"
 
-#: src/compose.c:516
+#: src/compose.c:514
 msgid "/_Edit/Cu_t"
 msgstr "/_Uredi/I_zreži"
 
-#: src/compose.c:517 src/mainwindow.c:503 src/messageview.c:144
+#: src/compose.c:515 src/mainwindow.c:494 src/messageview.c:144
 msgid "/_Edit/_Copy"
 msgstr "/Uredi/_Kopiraj"
 
-#: src/compose.c:518
+#: src/compose.c:516
 msgid "/_Edit/_Paste"
 msgstr "/_Uredi/_Prilepi"
 
-#: src/compose.c:519
+#: src/compose.c:517
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Uredi/Prilepi kot _citat"
 
-#: src/compose.c:521 src/mainwindow.c:504 src/messageview.c:145
+#: src/compose.c:519 src/mainwindow.c:495 src/messageview.c:145
 msgid "/_Edit/Select _all"
 msgstr "/_Uredi/Izberi _vse"
 
-#: src/compose.c:523
+#: src/compose.c:521
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/_Uredi/Prelomi trenutni odstavek"
 
-#: src/compose.c:525
+#: src/compose.c:523
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/_Uredi/_Prelomi vse _dolge vrstice"
 
-#: src/compose.c:527
+#: src/compose.c:525
 #, fuzzy
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/Uredi/_Kopiraj"
 
-#: src/compose.c:528 src/mainwindow.c:511 src/messageview.c:150
+#: src/compose.c:526 src/mainwindow.c:502 src/messageview.c:150
 #: src/summaryview.c:400
 msgid "/_View"
 msgstr "/_Pogled"
 
-#: src/compose.c:529
+#: src/compose.c:527
 msgid "/_View/_To"
 msgstr "/_Ogled/_Komu"
 
-#: src/compose.c:530
+#: src/compose.c:528
 msgid "/_View/_Cc"
 msgstr "/_Ogled/K_p"
 
-#: src/compose.c:531
+#: src/compose.c:529
 msgid "/_View/_Bcc"
 msgstr "/_Ogled/_SKp"
 
-#: src/compose.c:532
+#: src/compose.c:530
 msgid "/_View/_Reply to"
 msgstr "/_Ogled/_Odgovor za"
 
-#: src/compose.c:533 src/compose.c:535 src/compose.c:537 src/compose.c:539
-#: src/mainwindow.c:529 src/mainwindow.c:532 src/mainwindow.c:558
-#: src/mainwindow.c:582 src/mainwindow.c:675 src/mainwindow.c:679
+#: src/compose.c:531 src/compose.c:533 src/compose.c:535 src/compose.c:537
+#: src/mainwindow.c:520 src/mainwindow.c:523 src/mainwindow.c:549
+#: src/mainwindow.c:573 src/mainwindow.c:666 src/mainwindow.c:670
 #: src/messageview.c:233
 msgid "/_View/---"
 msgstr "/_Pogled/---"
 
-#: src/compose.c:534
+#: src/compose.c:532
 msgid "/_View/_Followup to"
 msgstr "/_Pogled/_Sledi do"
 
-#: src/compose.c:536
+#: src/compose.c:534
 msgid "/_View/R_uler"
 msgstr "/_Pogled/R_avnilo"
 
-#: src/compose.c:538
+#: src/compose.c:536
 msgid "/_View/_Attachment"
 msgstr "/_Pogled/_Priloga"
 
-#: src/compose.c:545 src/mainwindow.c:589 src/messageview.c:157
+#: src/compose.c:543 src/mainwindow.c:580 src/messageview.c:157
 #, fuzzy
 msgid "/_View/Character _encoding"
 msgstr "/_Pogled/_Razvrščanje/Pa_dajoče"
 
-#: src/compose.c:546
+#: src/compose.c:544
 msgid "/_View/Character _encoding/_Automatic"
 msgstr ""
 
-#: src/compose.c:548 src/compose.c:554 src/compose.c:560 src/compose.c:564
-#: src/compose.c:570 src/compose.c:574 src/compose.c:580 src/compose.c:584
-#: src/compose.c:594 src/compose.c:598 src/compose.c:608 src/compose.c:612
-#: src/mainwindow.c:585 src/mainwindow.c:592 src/messageview.c:153
+#: src/compose.c:546 src/compose.c:552 src/compose.c:558 src/compose.c:562
+#: src/compose.c:568 src/compose.c:572 src/compose.c:578 src/compose.c:582
+#: src/compose.c:592 src/compose.c:596 src/compose.c:606 src/compose.c:610
+#: src/mainwindow.c:576 src/mainwindow.c:583 src/messageview.c:153
 #, fuzzy
 msgid "/_View/Character _encoding/---"
 msgstr "/_Pogled/_Razvrščanje/Pa_dajoče"
 
-#: src/compose.c:550 src/mainwindow.c:593 src/messageview.c:161
+#: src/compose.c:548 src/mainwindow.c:584 src/messageview.c:161
 #, fuzzy
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Pogled/Nabor zna_kov/7 bitni ASCII (US-ASC_II)"
 
-#: src/compose.c:552 src/mainwindow.c:595 src/messageview.c:164
+#: src/compose.c:550 src/mainwindow.c:586 src/messageview.c:164
 #, fuzzy
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/Videz/Nabor zna_kov/Unicode (_UTF-8)"
 
-#: src/compose.c:556 src/mainwindow.c:599 src/messageview.c:167
+#: src/compose.c:554 src/mainwindow.c:590 src/messageview.c:167
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "_Pogled/Nabor zna_kov/Zahodnoevropski (ISO-8859-_1)"
 
-#: src/compose.c:558 src/mainwindow.c:601 src/messageview.c:169
+#: src/compose.c:556 src/mainwindow.c:592 src/messageview.c:169
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "_Pogled/Nabor zna_kov/Zahodnoevropski (ISO-8859-15)"
 
-#: src/compose.c:562 src/mainwindow.c:605 src/messageview.c:172
+#: src/compose.c:560 src/mainwindow.c:596 src/messageview.c:172
 #, fuzzy
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Pogled/Nabor zna_kov/Srednjeevropski (ISO-8859-_2)"
 
-#: src/compose.c:566 src/mainwindow.c:609 src/messageview.c:175
+#: src/compose.c:564 src/mainwindow.c:600 src/messageview.c:175
 #, fuzzy
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Pogled/Nabor zna_kov/_Baltski (ISO-8859-13)"
 
-#: src/compose.c:568 src/mainwindow.c:611 src/messageview.c:177
+#: src/compose.c:566 src/mainwindow.c:602 src/messageview.c:177
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Pogled/Nabor zna_kov/Baltski (ISO-8859-_4)"
 
-#: src/compose.c:572 src/mainwindow.c:615 src/messageview.c:180
+#: src/compose.c:570 src/mainwindow.c:606 src/messageview.c:180
 #, fuzzy
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Pogled/Nabor zna_kov/Grški (ISO-8859-_7)"
 
-#: src/compose.c:576 src/mainwindow.c:619 src/messageview.c:183
+#: src/compose.c:574 src/mainwindow.c:610 src/messageview.c:183
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Pogled/Nabor zna_kov/Grški (ISO-8859-_7)"
 
-#: src/compose.c:578 src/mainwindow.c:621 src/messageview.c:185
+#: src/compose.c:576 src/mainwindow.c:612 src/messageview.c:185
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Pogled/Nabor zna_kov/Cirilica (Windows-1251)"
 
-#: src/compose.c:582 src/mainwindow.c:625 src/messageview.c:188
+#: src/compose.c:580 src/mainwindow.c:616 src/messageview.c:188
 #, fuzzy
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Pogled/Nabor zna_kov/Turški (ISO-8859-_9)"
 
-#: src/compose.c:586 src/mainwindow.c:629 src/messageview.c:191
+#: src/compose.c:584 src/mainwindow.c:620 src/messageview.c:191
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Pogled/Nabor zna_kov/Cirilica (ISO-8859-_5)"
 
-#: src/compose.c:588 src/mainwindow.c:631 src/messageview.c:193
+#: src/compose.c:586 src/mainwindow.c:622 src/messageview.c:193
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Pogled/Nabor zna_kov/Cirilica (KOI8-_R)"
 
-#: src/compose.c:590 src/mainwindow.c:633 src/messageview.c:195
+#: src/compose.c:588 src/mainwindow.c:624 src/messageview.c:195
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Pogled/Nabor zna_kov/Cirilica (KOI8-_R)"
 
-#: src/compose.c:592 src/mainwindow.c:635 src/messageview.c:197
+#: src/compose.c:590 src/mainwindow.c:626 src/messageview.c:197
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Pogled/Nabor zna_kov/Cirilica (Windows-1251)"
 
-#: src/compose.c:596 src/mainwindow.c:639 src/messageview.c:200
+#: src/compose.c:594 src/mainwindow.c:630 src/messageview.c:200
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Pogled/Nabor zna_kov/Japonski (ISO-2022-_JP)"
 
-#: src/compose.c:600 src/mainwindow.c:649 src/messageview.c:209
+#: src/compose.c:598 src/mainwindow.c:640 src/messageview.c:209
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Pogled/Nabor zna_kov/Poenostavljena kitajščina (_GB2312)"
 
-#: src/compose.c:602 src/mainwindow.c:651 src/messageview.c:211
+#: src/compose.c:600 src/mainwindow.c:642 src/messageview.c:211
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Pogled/Nabor zna_kov/Poenostavljena kitajščina (_GB2312)"
 
-#: src/compose.c:604 src/mainwindow.c:653 src/messageview.c:213
+#: src/compose.c:602 src/mainwindow.c:644 src/messageview.c:213
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Pogled/Nabor zna_kov/Tradicionalna kitajščina (_Big5)"
 
-#: src/compose.c:606 src/mainwindow.c:655 src/messageview.c:215
+#: src/compose.c:604 src/mainwindow.c:646 src/messageview.c:215
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Pogled/Nabor zna_kov/Tradicionalna kitajščina (EUC-_TW)"
 
-#: src/compose.c:610 src/mainwindow.c:661 src/messageview.c:220
+#: src/compose.c:608 src/mainwindow.c:652 src/messageview.c:220
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Pogled/Nabor zna_kov/Korejski (EUC-_KR)"
 
-#: src/compose.c:614 src/mainwindow.c:667 src/messageview.c:225
+#: src/compose.c:612 src/mainwindow.c:658 src/messageview.c:225
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Pogled/Nabor zna_kov/Tajski (TIS-620)"
 
-#: src/compose.c:616 src/mainwindow.c:669 src/messageview.c:227
+#: src/compose.c:614 src/mainwindow.c:660 src/messageview.c:227
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Pogled/Nabor zna_kov/Tajski (Windows-874)"
 
-#: src/compose.c:620 src/mainwindow.c:726 src/messageview.c:257
+#: src/compose.c:618 src/mainwindow.c:717 src/messageview.c:257
 msgid "/_Tools/_Address book"
 msgstr "/_Orodja/_Adresar"
 
-#: src/compose.c:621
+#: src/compose.c:619
 msgid "/_Tools/_Template"
 msgstr "/_Orodja/_Predloga"
 
-#: src/compose.c:622 src/mainwindow.c:749 src/messageview.c:272
+#: src/compose.c:620 src/mainwindow.c:740 src/messageview.c:272
 msgid "/_Tools/Actio_ns"
 msgstr "/_Orodja/Deja_nja"
 
-#: src/compose.c:623 src/compose.c:627 src/mainwindow.c:729
-#: src/mainwindow.c:743 src/mainwindow.c:748 src/mainwindow.c:750
-#: src/mainwindow.c:753 src/mainwindow.c:755 src/messageview.c:260
+#: src/compose.c:621 src/compose.c:625 src/mainwindow.c:720
+#: src/mainwindow.c:734 src/mainwindow.c:739 src/mainwindow.c:741
+#: src/mainwindow.c:744 src/mainwindow.c:746 src/messageview.c:260
 #: src/messageview.c:271
 msgid "/_Tools/---"
 msgstr "/_Orodja/---"
 
-#: src/compose.c:624
+#: src/compose.c:622
 #, fuzzy
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/_Uredi/Uredi z _zunanjim urejevalnikom"
 
-#: src/compose.c:628
+#: src/compose.c:626
 #, fuzzy
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Orodja/Deja_nja"
 
-#: src/compose.c:629
+#: src/compose.c:627
 #, fuzzy
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/_Sporočilo/_Enkripcija"
 
-#: src/compose.c:855
+#: src/compose.c:853
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: datoteka ne obstaja\n"
 
-#: src/compose.c:954 src/compose.c:1024 src/procmsg.c:1353
+#: src/compose.c:952 src/compose.c:1022 src/procmsg.c:1353
 msgid "Can't get text part\n"
 msgstr "Ne morem dobiti tekstovnega dela\n"
 
-#: src/compose.c:1420
+#: src/compose.c:1418
 msgid "Quote mark format error."
 msgstr "Napaka pri oblikovanju znaka za citiranje."
 
-#: src/compose.c:1432
+#: src/compose.c:1430
 msgid "Message reply/forward format error."
 msgstr "Napaka pri oblikovanju odgovora/posredovanja sporočila."
 
-#: src/compose.c:1801
+#: src/compose.c:1799
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Datoteka %s ne obstaja\n"
 
-#: src/compose.c:1805
+#: src/compose.c:1803
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Ne morem dobiti velikosti datoteke %s\n"
 
-#: src/compose.c:1809
+#: src/compose.c:1807
 #, c-format
 msgid "File %s is empty."
 msgstr "Datoteka %s je prazna."
 
-#: src/compose.c:1813
+#: src/compose.c:1811
 #, c-format
 msgid "Can't read %s."
 msgstr "Ne morem prebrati %s."
 
-#: src/compose.c:1848
+#: src/compose.c:1846
 #, c-format
 msgid "Message: %s"
 msgstr "Sporočilo: %s"
 
-#: src/compose.c:1920 src/mimeview.c:560
+#: src/compose.c:1918 src/mimeview.c:560
 msgid "Can't get the part of multipart message."
 msgstr "Ne morem dobiti dela večdelnega sporočila."
 
-#: src/compose.c:2362
+#: src/compose.c:2360
 msgid " [Edited]"
 msgstr " [V urejanju]"
 
-#: src/compose.c:2364
+#: src/compose.c:2362
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Sestavi sporočilo%s"
 
-#: src/compose.c:2367
+#: src/compose.c:2365
 #, c-format
 msgid "Compose message%s"
 msgstr "Sestavi sporočilo%s"
 
-#: src/compose.c:2478
+#: src/compose.c:2476
 msgid "Recipient is not specified."
 msgstr "Naslovnik ni določen."
 
-#: src/compose.c:2486
+#: src/compose.c:2484
 #, fuzzy
 msgid "Empty subject"
 msgstr "Zadeva"
 
-#: src/compose.c:2487
+#: src/compose.c:2485
 msgid "Subject is empty. Send it anyway?"
 msgstr "Zadeva sporočila je prazna. Naj kljub temu pošljem?"
 
-#: src/compose.c:2538
+#: src/compose.c:2536
 msgid "can't get recipient list."
 msgstr "ne morem dobiti seznama naslovnikov"
 
-#: src/compose.c:2558
+#: src/compose.c:2556
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1027,26 +1027,26 @@ msgstr ""
 "Račun za pošiljanje pošte ni določen.\n"
 "Prosim, pred pošiljanjem izberite poštni račun."
 
-#: src/compose.c:2572 src/send_message.c:297
+#: src/compose.c:2570 src/send_message.c:297
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Med pošiljanjem sporočila %s je prišlo do napake."
 
-#: src/compose.c:2595
+#: src/compose.c:2593
 msgid "Can't save the message to outbox."
 msgstr "Ne morem shraniti sporočila v imenik Outbox."
 
-#: src/compose.c:2645
+#: src/compose.c:2643
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "Ne najdem tipke, ki bi bila povezana z identifikatorjem tipke `%s'."
 
-#: src/compose.c:2709 src/compose.c:2965 src/compose.c:3028 src/compose.c:3148
-#: src/utils.c:2365
+#: src/compose.c:2707 src/compose.c:2963 src/compose.c:3026 src/compose.c:3146
+#: src/utils.c:2379
 msgid "can't change file mode\n"
 msgstr "Ne morem spremeniti pravic do dostopa do datoteke\n"
 
-#: src/compose.c:2741
+#: src/compose.c:2739
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1056,12 +1056,12 @@ msgstr ""
 "Ne morem pretvoriti nabora znakov sporočila.\n"
 "Naj ga kljub temu pošljem?"
 
-#: src/compose.c:2747
+#: src/compose.c:2745
 #, fuzzy
 msgid "Code conversion error"
 msgstr "Napaka pri pretvorbi imenika naslovov"
 
-#: src/compose.c:2816
+#: src/compose.c:2814
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1070,156 +1070,156 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:2820
+#: src/compose.c:2818
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3108
+#: src/compose.c:3106
 msgid "can't remove the old message\n"
 msgstr "ne morem odstraniti starega sporočila\n"
 
-#: src/compose.c:3126
+#: src/compose.c:3124
 msgid "queueing message...\n"
 msgstr "prestavljam sporočilo v mapo Čakajoče...\n"
 
-#: src/compose.c:3208
+#: src/compose.c:3206
 msgid "can't find queue folder\n"
 msgstr "ne najdem mape s čakajočimi sporočili\n"
 
-#: src/compose.c:3215
+#: src/compose.c:3213
 msgid "can't queue the message\n"
 msgstr "ne morem preložiti sporočila\n"
 
-#: src/compose.c:3792
+#: src/compose.c:3790
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "generiran Message-ID: %s\n"
 
-#: src/compose.c:3901
+#: src/compose.c:3899
 msgid "Creating compose window...\n"
 msgstr "Odpiram okno za sestavljanje sporočila...\n"
 
-#: src/compose.c:3949 src/headerview.c:54 src/summary_search.c:214
+#: src/compose.c:3947 src/headerview.c:54 src/summary_search.c:214
 msgid "From:"
 msgstr "Pošiljatelj:"
 
-#: src/compose.c:4021
+#: src/compose.c:4019
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/_Orodja/Deja_nja"
 
-#: src/compose.c:4024
+#: src/compose.c:4022
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/_Sporočilo/_Enkripcija"
 
-#: src/compose.c:4062 src/compose.c:5001
+#: src/compose.c:4060 src/compose.c:4995
 msgid "MIME type"
 msgstr "Tip MIME"
 
 #. S_COL_DATE
-#: src/compose.c:4071 src/mimeview.c:192 src/prefs_filter_edit.c:585
+#: src/compose.c:4069 src/mimeview.c:192 src/prefs_filter_edit.c:585
 #: src/prefs_summary_column.c:75 src/select-keys.c:317 src/summaryview.c:4217
 msgid "Size"
 msgstr "Velikost"
 
-#: src/compose.c:4449 src/mainwindow.c:2224 src/prefs_account.c:719
+#: src/compose.c:4442 src/mainwindow.c:2207 src/prefs_account.c:719
 #: src/prefs_common.c:947
 msgid "Send"
 msgstr "Pošlji"
 
-#: src/compose.c:4450
+#: src/compose.c:4443
 msgid "Send message"
 msgstr "Pošlji sporočilo"
 
-#: src/compose.c:4458
+#: src/compose.c:4451
 msgid "Send later"
 msgstr "Pošlji kasneje"
 
-#: src/compose.c:4459
+#: src/compose.c:4452
 msgid "Put into queue folder and send later"
 msgstr "Postavi v mapo Čakajoče in pošlji kasneje"
 
-#: src/compose.c:4467
+#: src/compose.c:4460
 msgid "Draft"
 msgstr "Osnutek"
 
-#: src/compose.c:4468
+#: src/compose.c:4461
 msgid "Save to draft folder"
 msgstr "Shrani v imenik Draft"
 
-#: src/compose.c:4478
+#: src/compose.c:4471
 msgid "Insert"
 msgstr "Vstavi"
 
-#: src/compose.c:4479
+#: src/compose.c:4472
 msgid "Insert file"
 msgstr "Vstavi datoteko"
 
-#: src/compose.c:4487
+#: src/compose.c:4480
 msgid "Attach"
 msgstr "Pripni"
 
-#: src/compose.c:4488
+#: src/compose.c:4481
 msgid "Attach file"
 msgstr "Pripni datoteko"
 
 #. signature
-#: src/compose.c:4498 src/prefs_account.c:1391 src/prefs_common.c:1356
+#: src/compose.c:4491 src/prefs_account.c:1391 src/prefs_common.c:1356
 msgid "Signature"
 msgstr "Podpis"
 
-#: src/compose.c:4499
+#: src/compose.c:4492
 msgid "Insert signature"
 msgstr "Vstavi podpis"
 
-#: src/compose.c:4508 src/prefs_common.c:1378 src/prefs_common.c:2382
+#: src/compose.c:4501 src/prefs_common.c:1378 src/prefs_common.c:2382
 msgid "Editor"
 msgstr "Urejevalnik"
 
-#: src/compose.c:4509
+#: src/compose.c:4502
 msgid "Edit with external editor"
 msgstr "Urejanje z zunanjim urejevalnikom"
 
-#: src/compose.c:4517
+#: src/compose.c:4510
 msgid "Linewrap"
 msgstr "Prelom vrstic"
 
-#: src/compose.c:4518
+#: src/compose.c:4511
 msgid "Wrap all long lines"
 msgstr "Prelomi vse dolge vrstice"
 
-#: src/compose.c:4897
+#: src/compose.c:4891
 msgid "Invalid MIME type."
 msgstr "Napačen tip MIME"
 
-#: src/compose.c:4915
+#: src/compose.c:4909
 msgid "File doesn't exist or is empty."
 msgstr "Datoteka ne obstaja ali pa je prazna."
 
-#: src/compose.c:4983
+#: src/compose.c:4977
 #, fuzzy
 msgid "Properties"
 msgstr "Lastnost"
 
-#: src/compose.c:5003
+#: src/compose.c:4997
 msgid "Encoding"
 msgstr "Nabor znakov"
 
-#: src/compose.c:5026 src/prefs_folder_item.c:183
+#: src/compose.c:5020 src/prefs_folder_item.c:183
 msgid "Path"
 msgstr "Pot"
 
-#: src/compose.c:5027
+#: src/compose.c:5021
 msgid "File name"
 msgstr "Ime datoteke"
 
-#: src/compose.c:5185
+#: src/compose.c:5179
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Ukazna vrstica za zunanji urejevalnik je neveljavna: '%s'\n"
 
-#: src/compose.c:5211
+#: src/compose.c:5205
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1230,75 +1230,75 @@ msgstr ""
 "Ali naj ga prisilim k prekinitvi?\n"
 "Št. skupine procesov: %d"
 
-#: src/compose.c:5228
+#: src/compose.c:5222
 #, c-format
 msgid "Terminated process group id: %d"
 msgstr "Št. prekinjene skupine procesov: %d"
 
-#: src/compose.c:5229
+#: src/compose.c:5223
 #, c-format
 msgid "Temporary file: %s"
 msgstr "Začasna datoteka: %s"
 
-#: src/compose.c:5253
+#: src/compose.c:5247
 msgid "Compose: input from monitoring process\n"
 msgstr "Sestavljanje: vhod iz opazovanega procesa\n"
 
 #. failed
-#: src/compose.c:5284
+#: src/compose.c:5278
 msgid "Couldn't exec external editor\n"
 msgstr "Ne morem pognati zunanjega urejevalnika\n"
 
-#: src/compose.c:5288
+#: src/compose.c:5282
 msgid "Couldn't write to file\n"
 msgstr "Ne morem pisati v datoteko\n"
 
-#: src/compose.c:5290
+#: src/compose.c:5284
 msgid "Pipe read failed\n"
 msgstr "Branje preko cevi ni uspelo\n"
 
-#: src/compose.c:5596 src/compose.c:5604 src/compose.c:5610
+#: src/compose.c:5590 src/compose.c:5598 src/compose.c:5604
 msgid "Can't queue the message."
 msgstr "Ne morem preložiti pošiljanja sporočila."
 
-#: src/compose.c:5701
+#: src/compose.c:5695
 #, fuzzy
 msgid "Select files"
 msgstr "Izberi datoteko"
 
-#: src/compose.c:5723
+#: src/compose.c:5717
 msgid "Select file"
 msgstr "Izberi datoteko"
 
-#: src/compose.c:5760
+#: src/compose.c:5754
 #, fuzzy
 msgid "Save message"
 msgstr "Pošlji sporočilo"
 
-#: src/compose.c:5761
+#: src/compose.c:5755
 #, 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:5763
+#: src/compose.c:5757
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:5805
+#: src/compose.c:5799
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Ali želite uporabiti predlogo `%s' ?"
 
-#: src/compose.c:5807
+#: src/compose.c:5801
 msgid "Apply template"
 msgstr "Uporabi predlogo"
 
-#: src/compose.c:5808
+#: src/compose.c:5802
 #, fuzzy
 msgid "_Replace"
 msgstr "Zamenjaj"
 
-#: src/compose.c:5808
+#: src/compose.c:5802
 #, fuzzy
 msgid "_Insert"
 msgstr "Vstavi"
@@ -1745,12 +1745,12 @@ msgstr "Nastavljam informacije o mapi...\n"
 msgid "Setting folder info..."
 msgstr "Nastavljam informacije o mapi..."
 
-#: src/folderview.c:805 src/mainwindow.c:3301 src/setup.c:81
+#: src/folderview.c:805 src/mainwindow.c:3272 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Preiskujem mapo %s%c%s ..."
 
-#: src/folderview.c:809 src/mainwindow.c:3306 src/setup.c:86
+#: src/folderview.c:809 src/mainwindow.c:3277 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Preiskujem mapo %s ..."
@@ -2076,45 +2076,45 @@ msgstr "Overovitvena metoda"
 msgid "IMAP4 login failed.\n"
 msgstr "Prijava na IMAP4 ni uspela.\n"
 
-#: src/imap.c:3522
+#: src/imap.c:3528
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "ne morem pripeti %s na %s\n"
 
-#: src/imap.c:3529
+#: src/imap.c:3535
 msgid "(sending file...)"
 msgstr "(pošiljam datoteko...)"
 
-#: src/imap.c:3557
+#: src/imap.c:3563
 #, fuzzy, c-format
 msgid "can't append message to %s\n"
 msgstr "ne morem dodati sporočila %s\n"
 
-#: src/imap.c:3589
+#: src/imap.c:3595
 #, fuzzy, c-format
 msgid "can't copy %s to %s\n"
 msgstr "ne morem kopirati %d na %s\n"
 
-#: src/imap.c:3613
+#: src/imap.c:3619
 #, fuzzy, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "napaka med IMAPovim ukazom: STORE %d:%d %s\n"
 
-#: src/imap.c:3627
+#: src/imap.c:3633
 msgid "error while imap command: EXPUNGE\n"
 msgstr "napaka med IMAPovim ukazom: EXPUNGE\n"
 
-#: src/imap.c:3640
+#: src/imap.c:3646
 #, fuzzy
 msgid "error while imap command: CLOSE\n"
 msgstr "napaka med IMAPovim ukazom: EXPUNGE\n"
 
-#: src/imap.c:3873
+#: src/imap.c:3879
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv ne more pretvoriti UTF-7 v %s\n"
 
-#: src/imap.c:3903
+#: src/imap.c:3909
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv ne more pretvoriti %s v UTF-7\n"
@@ -2216,7 +2216,7 @@ msgstr "Uvozi datoteko LDIF v imenik naslovov"
 msgid "Prev"
 msgstr "Prejšnji"
 
-#: src/importldif.c:768 src/mainwindow.c:2321
+#: src/importldif.c:768 src/mainwindow.c:2303
 msgid "Next"
 msgstr "Naslednji"
 
@@ -2556,646 +2556,646 @@ msgid ""
 "Do you want to migrate it?"
 msgstr ""
 
-#: src/mainwindow.c:471
+#: src/mainwindow.c:462
 msgid "/_File/_Folder"
 msgstr "/_Datoteka/_Mapa"
 
-#: src/mainwindow.c:472
+#: src/mainwindow.c:463
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/_Datoteka/_Mapa/Naredi _novo mapo..."
 
-#: src/mainwindow.c:474
+#: src/mainwindow.c:465
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/_Datoteka/_Mapa/_Preimenuj mapo..."
 
-#: src/mainwindow.c:475
+#: src/mainwindow.c:466
 #, fuzzy
 msgid "/_File/_Folder/_Move folder..."
 msgstr "/_Datoteka/_Mapa/_Preimenuj mapo..."
 
-#: src/mainwindow.c:476
+#: src/mainwindow.c:467
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/_Datoteka/_Mapa/I_zbriši mapo"
 
-#: src/mainwindow.c:477
+#: src/mainwindow.c:468
 #, fuzzy
 msgid "/_File/_Mailbox"
 msgstr "/_Datoteka/_Dodaj poštni predal..."
 
-#: src/mainwindow.c:478
+#: src/mainwindow.c:469
 #, fuzzy
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/_Datoteka/_Dodaj poštni predal..."
 
-#: src/mainwindow.c:479
+#: src/mainwindow.c:470
 #, fuzzy
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/Odstrani poštni pre_dal"
 
-#: src/mainwindow.c:480 src/mainwindow.c:485
+#: src/mainwindow.c:471 src/mainwindow.c:476
 #, fuzzy
 msgid "/_File/_Mailbox/---"
 msgstr "/_Datoteka/_Mapa"
 
-#: src/mainwindow.c:481
+#: src/mainwindow.c:472
 #, fuzzy
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "/_Preveri nova sporočila"
 
-#: src/mainwindow.c:483
+#: src/mainwindow.c:474
 #, fuzzy
 msgid "/_File/_Mailbox/Check for new messages in _all mailboxes"
 msgstr "/Datoteka/_Preveri nova sporočila v vseh imenikih"
 
-#: src/mainwindow.c:486
+#: src/mainwindow.c:477
 #, fuzzy
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "/Ponovno z_gradi drevo map"
 
-#: src/mainwindow.c:489
+#: src/mainwindow.c:480
 msgid "/_File/_Import mbox file..."
 msgstr "/_Datoteka/_Uvozi datoteko mbox..."
 
-#: src/mainwindow.c:490
+#: src/mainwindow.c:481
 msgid "/_File/_Export to mbox file..."
 msgstr "/_Datoteka/_Izvozi v datoteko mbox..."
 
-#: src/mainwindow.c:492
+#: src/mainwindow.c:483
 #, fuzzy
 msgid "/_File/Empty all _trash"
 msgstr "/_Datoteka/Izprazni sme_tnjak"
 
-#: src/mainwindow.c:494 src/messageview.c:138
+#: src/mainwindow.c:485 src/messageview.c:138
 msgid "/_File/_Save as..."
 msgstr "/_Datoteka/_Shrani kot..."
 
-#: src/mainwindow.c:495 src/messageview.c:139
+#: src/mainwindow.c:486 src/messageview.c:139
 msgid "/_File/_Print..."
 msgstr "/_Datoteka/_Natisni..."
 
-#: src/mainwindow.c:497
+#: src/mainwindow.c:488
 #, fuzzy
 msgid "/_File/_Work offline"
 msgstr "/Datoteka/Vr_ini datoteko"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:500
+#: src/mainwindow.c:491
 msgid "/_File/E_xit"
 msgstr "/_Datoteka/_Končaj"
 
-#: src/mainwindow.c:505
+#: src/mainwindow.c:496
 msgid "/_Edit/Select _thread"
 msgstr "/_Uredi/Izberi _nit"
 
-#: src/mainwindow.c:507 src/messageview.c:147
+#: src/mainwindow.c:498 src/messageview.c:147
 msgid "/_Edit/_Find in current message..."
 msgstr "/_Urejanje/_Iskanje v trenutnem sporočilu..."
 
-#: src/mainwindow.c:509
+#: src/mainwindow.c:500
 msgid "/_Edit/_Search messages..."
 msgstr "/_Urejanje/Iskanje _sporočil"
 
-#: src/mainwindow.c:512
+#: src/mainwindow.c:503
 msgid "/_View/Show or hi_de"
 msgstr "/_Pogled/Pri_kaži ali skrij"
 
-#: src/mainwindow.c:513
+#: src/mainwindow.c:504
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/_Pogled/Pri_kaži ali skrij/_Drevo map"
 
-#: src/mainwindow.c:515
+#: src/mainwindow.c:506
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/_Pogled/Pri_kaži ali skrij/_Ogled sporočila"
 
-#: src/mainwindow.c:517
+#: src/mainwindow.c:508
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/_Pogled/Pri_kaži ali skrij/O_rodjarna"
 
-#: src/mainwindow.c:519
+#: src/mainwindow.c:510
 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:521
+#: src/mainwindow.c:512
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/_Pogled/Pri_kaži ali skrij/O_rodjarna/_Ikone"
 
-#: src/mainwindow.c:523
+#: src/mainwindow.c:514
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/_Pogled/Pri_kaži ali skrij/O_rodjarna/_Besedilo"
 
-#: src/mainwindow.c:525
+#: src/mainwindow.c:516
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/_Pogled/Pri_kaži ali skrij/_Orodjarna/_Nič"
 
-#: src/mainwindow.c:527
+#: src/mainwindow.c:518
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/_Pogled/Pri_kaži ali skrij/_Statusna vrstica"
 
-#: src/mainwindow.c:530
+#: src/mainwindow.c:521
 msgid "/_View/Separate f_older tree"
 msgstr "_Pogled/Posebno drev_o map"
 
-#: src/mainwindow.c:531
+#: src/mainwindow.c:522
 #, fuzzy
 msgid "/_View/Separate _message view"
 msgstr "/_Pogled/Poseben ogled _sporočila"
 
-#: src/mainwindow.c:533
+#: src/mainwindow.c:524
 msgid "/_View/_Sort"
 msgstr "/_Pogled/_Razvrščanje"
 
-#: src/mainwindow.c:534
+#: src/mainwindow.c:525
 msgid "/_View/_Sort/by _number"
 msgstr "/_Pogled/_Razvrščanje/po š_tevilu"
 
-#: src/mainwindow.c:535
+#: src/mainwindow.c:526
 msgid "/_View/_Sort/by s_ize"
 msgstr "/_Pogled/_Razvrščanje/po _velikosti"
 
-#: src/mainwindow.c:536
+#: src/mainwindow.c:527
 msgid "/_View/_Sort/by _date"
 msgstr "/_Pogled/_Razvrščanje/po _datumu"
 
-#: src/mainwindow.c:537
+#: src/mainwindow.c:528
 msgid "/_View/_Sort/by _from"
 msgstr "/_Pogled/_Razvrščanje/po _pošiljatelju"
 
-#: src/mainwindow.c:538
+#: src/mainwindow.c:529
 msgid "/_View/_Sort/by _recipient"
 msgstr "/_Pogled/_Razvrščanje/po naslovnik_u"
 
-#: src/mainwindow.c:539
+#: src/mainwindow.c:530
 msgid "/_View/_Sort/by _subject"
 msgstr "/_Pogled/_Razvrščanje/po _zadevi"
 
-#: src/mainwindow.c:540
+#: src/mainwindow.c:531
 msgid "/_View/_Sort/by _color label"
 msgstr "/_Pogled/_Razvrščanje/po _barvi oznak"
 
-#: src/mainwindow.c:542
+#: src/mainwindow.c:533
 msgid "/_View/_Sort/by _mark"
 msgstr "/_Pogled/_Razvrščanje/po _oznaki"
 
-#: src/mainwindow.c:543
+#: src/mainwindow.c:534
 msgid "/_View/_Sort/by _unread"
 msgstr "/_Pogled/_Razvrščanje/po _neprebranih"
 
-#: src/mainwindow.c:544
+#: src/mainwindow.c:535
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/_Pogled/_Razvrščanje/po pri_logi"
 
-#: src/mainwindow.c:546
+#: src/mainwindow.c:537
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/_Pogled/_Razvrščanje/Ne raz_vrsti"
 
-#: src/mainwindow.c:547 src/mainwindow.c:550
+#: src/mainwindow.c:538 src/mainwindow.c:541
 msgid "/_View/_Sort/---"
 msgstr "/_Pogled/_Razvrščanje/---"
 
-#: src/mainwindow.c:548
+#: src/mainwindow.c:539
 msgid "/_View/_Sort/Ascending"
 msgstr "/_Pogled/_Razvrščanje/N_araščajoče"
 
-#: src/mainwindow.c:549
+#: src/mainwindow.c:540
 msgid "/_View/_Sort/Descending"
 msgstr "/_Pogled/_Razvrščanje/Pa_dajoče"
 
-#: src/mainwindow.c:551
+#: src/mainwindow.c:542
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/_Pogled/_Razvrščanje/Pri_vlači po zadevi"
 
-#: src/mainwindow.c:553
+#: src/mainwindow.c:544
 msgid "/_View/Th_read view"
 msgstr "/_Pogled/Ogled _niti"
 
-#: src/mainwindow.c:554
+#: src/mainwindow.c:545
 msgid "/_View/E_xpand all threads"
 msgstr "/_Pogled/Razširi _vse niti"
 
-#: src/mainwindow.c:555
+#: src/mainwindow.c:546
 msgid "/_View/Co_llapse all threads"
 msgstr "/_Pogled/Skrči vse _niti"
 
-#: src/mainwindow.c:556
+#: src/mainwindow.c:547
 msgid "/_View/Set display _item..."
 msgstr "/_Pogled/Nastavi kos za _prikaz..."
 
-#: src/mainwindow.c:559
+#: src/mainwindow.c:550
 msgid "/_View/_Go to"
 msgstr "/_Pogled/_Pojdi na"
 
-#: src/mainwindow.c:560
+#: src/mainwindow.c:551
 msgid "/_View/_Go to/_Prev message"
 msgstr "/_Pogled/_Pojdi na/_Prejšnje sporočilo"
 
-#: src/mainwindow.c:561
+#: src/mainwindow.c:552
 msgid "/_View/_Go to/_Next message"
 msgstr "/_Pogled/_Pojdi na/_Naslednje sporočilo"
 
-#: src/mainwindow.c:562 src/mainwindow.c:567 src/mainwindow.c:570
-#: src/mainwindow.c:575 src/mainwindow.c:580
+#: src/mainwindow.c:553 src/mainwindow.c:558 src/mainwindow.c:561
+#: src/mainwindow.c:566 src/mainwindow.c:571
 msgid "/_View/_Go to/---"
 msgstr "/_Pogled/_Pojdi na/---"
 
-#: src/mainwindow.c:563
+#: src/mainwindow.c:554
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/_Pogled/_Pojdi na/Pre_jšnje neprebrano sporočilo"
 
-#: src/mainwindow.c:565
+#: src/mainwindow.c:556
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/_Pogled/_Pojdi na/Nas_lednje neprebrano sporočilo"
 
-#: src/mainwindow.c:568
+#: src/mainwindow.c:559
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/_Pogled/_Pojdi na/Prejšnje no_vo sporočilo"
 
-#: src/mainwindow.c:569
+#: src/mainwindow.c:560
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/_Pogled/_Pojdi na/Nasled_nje novo sporočilo"
 
-#: src/mainwindow.c:571
+#: src/mainwindow.c:562
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/_Pogled/_Pojdi na/Prejšnje _označeno sporočilo"
 
-#: src/mainwindow.c:573
+#: src/mainwindow.c:564
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/_Pogled/_Pojdi na/Naslednje o_značeno sporočilo"
 
-#: src/mainwindow.c:576
+#: src/mainwindow.c:567
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/_Pogled/_Pojdi na/Prejšnje sporočilo z ozna_ko"
 
-#: src/mainwindow.c:578
+#: src/mainwindow.c:569
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/_Pogled/_Pojdi na/Naslednje sporočilo z oznako"
 
-#: src/mainwindow.c:581
+#: src/mainwindow.c:572
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Pogled/_Pojdi na/_Druga mapa"
 
-#: src/mainwindow.c:590 src/messageview.c:158
+#: src/mainwindow.c:581 src/messageview.c:158
 #, fuzzy
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Pogled/Nabor zna_kov/_Samodejno"
 
-#: src/mainwindow.c:641 src/messageview.c:202
+#: src/mainwindow.c:632 src/messageview.c:202
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Pogled/Nabor zna_kov/Japonski (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:643 src/messageview.c:204
+#: src/mainwindow.c:634 src/messageview.c:204
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Pogled/Nabor zna_kov/Japonski (_EUC-JP)"
 
-#: src/mainwindow.c:645 src/messageview.c:206
+#: src/mainwindow.c:636 src/messageview.c:206
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Pogled/Nabor zna_kov/Japonski (_Shift__JIS)"
 
-#: src/mainwindow.c:657 src/messageview.c:217
+#: src/mainwindow.c:648 src/messageview.c:217
 #, fuzzy
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Pogled/Nabor zna_kov/Kitajski (ISO-2022-_CN)"
 
-#: src/mainwindow.c:663 src/messageview.c:222
+#: src/mainwindow.c:654 src/messageview.c:222
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Pogled/Kodni nabor/Korejski (ISO-2022-KR)"
 
-#: src/mainwindow.c:676 src/summaryview.c:401
+#: src/mainwindow.c:667 src/summaryview.c:401
 msgid "/_View/Open in new _window"
 msgstr "/_Poglej/Odpri v _novem oknu"
 
-#: src/mainwindow.c:677 src/messageview.c:234
+#: src/mainwindow.c:668 src/messageview.c:234
 msgid "/_View/Mess_age source"
 msgstr "/_Pogled/I_zvirnik sporočila"
 
-#: src/mainwindow.c:678 src/messageview.c:235
+#: src/mainwindow.c:669 src/messageview.c:235
 msgid "/_View/Show all _header"
 msgstr "/_Pogled/Pokaži vsa _zaglavja"
 
-#: src/mainwindow.c:680
+#: src/mainwindow.c:671
 msgid "/_View/_Update summary"
 msgstr "/_Pogled/_Posodobi povzetek"
 
-#: src/mainwindow.c:682 src/messageview.c:237
+#: src/mainwindow.c:673 src/messageview.c:237
 msgid "/_Message"
 msgstr "/_Sporočilo"
 
-#: src/mainwindow.c:683
+#: src/mainwindow.c:674
 #, fuzzy
 msgid "/_Message/Recei_ve"
 msgstr "/_Sporočilo/Znova ur_edi"
 
-#: src/mainwindow.c:684
+#: src/mainwindow.c:675
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "_Sporočilo/Poberi z vseh _računov"
 
-#: src/mainwindow.c:686
+#: src/mainwindow.c:677
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "_Sporočilo/Poberi z vseh _računov"
 
-#: src/mainwindow.c:688
+#: src/mainwindow.c:679
 #, fuzzy
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/_Sporočilo/Odpoved sprejeman_ja"
 
-#: src/mainwindow.c:690
+#: src/mainwindow.c:681
 #, fuzzy
 msgid "/_Message/Recei_ve/---"
 msgstr "/_Sporočilo/Znova ur_edi"
 
-#: src/mainwindow.c:691
+#: src/mainwindow.c:682
 msgid "/_Message/_Send queued messages"
 msgstr "/_Sporočilo/Pošlji čakajoča sporoč_ila"
 
-#: src/mainwindow.c:692 src/mainwindow.c:694 src/mainwindow.c:701
-#: src/mainwindow.c:706 src/mainwindow.c:710 src/mainwindow.c:719
-#: src/mainwindow.c:722 src/messageview.c:240 src/messageview.c:248
+#: src/mainwindow.c:683 src/mainwindow.c:685 src/mainwindow.c:692
+#: src/mainwindow.c:697 src/mainwindow.c:701 src/mainwindow.c:710
+#: src/mainwindow.c:713 src/messageview.c:240 src/messageview.c:248
 #: src/messageview.c:253
 msgid "/_Message/---"
 msgstr "/_Sporočilo/---"
 
-#: src/mainwindow.c:693 src/messageview.c:238
+#: src/mainwindow.c:684 src/messageview.c:238
 msgid "/_Message/Compose _new message"
 msgstr "/_Sporočilo/_Novo sporočilo"
 
-#: src/mainwindow.c:695 src/messageview.c:241
+#: src/mainwindow.c:686 src/messageview.c:241
 msgid "/_Message/_Reply"
 msgstr "/_Sporočilo/_Odgovori"
 
-#: src/mainwindow.c:696
+#: src/mainwindow.c:687
 msgid "/_Message/Repl_y to"
 msgstr "/_Sporočilo/Odgovor _na"
 
-#: src/mainwindow.c:697 src/messageview.c:242
+#: src/mainwindow.c:688 src/messageview.c:242
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Sporočilo/Odgovor _na/_vsem"
 
-#: src/mainwindow.c:698 src/messageview.c:244
+#: src/mainwindow.c:689 src/messageview.c:244
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Sporočilo/Odgovori _na/_pošiljatelju"
 
-#: src/mainwindow.c:699 src/messageview.c:246
+#: src/mainwindow.c:690 src/messageview.c:246
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Sporočilo/Odgovor _na/_dopisni seznam"
 
-#: src/mainwindow.c:702 src/messageview.c:249
+#: src/mainwindow.c:693 src/messageview.c:249
 msgid "/_Message/_Forward"
 msgstr "/Sporočilo/_Posreduj"
 
-#: src/mainwindow.c:703 src/messageview.c:250
+#: src/mainwindow.c:694 src/messageview.c:250
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Sporočilo/Posreduj kot prilo_go"
 
-#: src/mainwindow.c:705 src/messageview.c:252
+#: src/mainwindow.c:696 src/messageview.c:252
 msgid "/_Message/Redirec_t"
 msgstr "/_Sporočilo/Pre_usmeri"
 
-#: src/mainwindow.c:707
+#: src/mainwindow.c:698
 msgid "/_Message/M_ove..."
 msgstr "/_Sporočilo/Pres_tavi..."
 
-#: src/mainwindow.c:708
+#: src/mainwindow.c:699
 msgid "/_Message/_Copy..."
 msgstr "/_Sporočilo/_Kopiraj..."
 
-#: src/mainwindow.c:709
+#: src/mainwindow.c:700
 msgid "/_Message/_Delete"
 msgstr "/_Sporočilo/Z_briši"
 
-#: src/mainwindow.c:711
+#: src/mainwindow.c:702
 msgid "/_Message/_Mark"
 msgstr "/_Sporočilo/O_znači"
 
-#: src/mainwindow.c:712
+#: src/mainwindow.c:703
 msgid "/_Message/_Mark/_Mark"
 msgstr "/_Sporočilo/O_znači/_Označi"
 
-#: src/mainwindow.c:713
+#: src/mainwindow.c:704
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/_Sporočilo/O_znači/O_dznači"
 
-#: src/mainwindow.c:714
+#: src/mainwindow.c:705
 msgid "/_Message/_Mark/---"
 msgstr "/_Sporočilo/O_znači/---"
 
-#: src/mainwindow.c:715
+#: src/mainwindow.c:706
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/_Sporočilo/O_znači/Označi kot _neprebrano"
 
-#: src/mainwindow.c:716
+#: src/mainwindow.c:707
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/_Sporočilo/O_znači/Označi kot _prebrano"
 
-#: src/mainwindow.c:718
+#: src/mainwindow.c:709
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/_Sporočilo/O_znači/Označi _vsa kot prebrana"
 
-#: src/mainwindow.c:720
+#: src/mainwindow.c:711
 #, fuzzy
 msgid "/_Message/Set as _junk mail"
 msgstr "/_Sporočilo/_Poberi novo pošto"
 
-#: src/mainwindow.c:721
+#: src/mainwindow.c:712
 #, fuzzy
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/_Sporočilo/_Poberi novo pošto"
 
-#: src/mainwindow.c:723 src/messageview.c:254
+#: src/mainwindow.c:714 src/messageview.c:254
 msgid "/_Message/Re-_edit"
 msgstr "/_Sporočilo/Znova ur_edi"
 
-#: src/mainwindow.c:727
+#: src/mainwindow.c:718
 #, fuzzy
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/_Orodja/Doda_j pošiljatelja v adresar"
 
-#: src/mainwindow.c:730
+#: src/mainwindow.c:721
 #, fuzzy
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/_Orodja/_Filtriraj sporočila"
 
-#: src/mainwindow.c:732
+#: src/mainwindow.c:723
 #, fuzzy
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Orodja/_Filtriraj sporočila"
 
-#: src/mainwindow.c:734 src/messageview.c:261
+#: src/mainwindow.c:725 src/messageview.c:261
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Orodja/_Ustvari pravilo za filtriranje"
 
-#: src/mainwindow.c:735 src/messageview.c:263
+#: src/mainwindow.c:726 src/messageview.c:263
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Orodja/_Ustvari pravilo za filtriranje/S_amodejno"
 
-#: src/mainwindow.c:737 src/messageview.c:265
+#: src/mainwindow.c:728 src/messageview.c:265
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Orodja/_Ustvari pravilo za filtriranje/po p_ošiljatelju"
 
-#: src/mainwindow.c:739 src/messageview.c:267
+#: src/mainwindow.c:730 src/messageview.c:267
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Orodja/_Ustvari pravilo za filtriranje/po _naslovniku"
 
-#: src/mainwindow.c:741 src/messageview.c:269
+#: src/mainwindow.c:732 src/messageview.c:269
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Orodja/_Ustvari pravilo za filtriranje/po _zadevi"
 
-#: src/mainwindow.c:744
+#: src/mainwindow.c:735
 #, fuzzy
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/_Orodja/_Filtriraj sporočila"
 
-#: src/mainwindow.c:746
+#: src/mainwindow.c:737
 #, fuzzy
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/_Orodja/_Filtriraj sporočila"
 
-#: src/mainwindow.c:751
+#: src/mainwindow.c:742
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/_Orodja/_Briši podvojena sporočila"
 
-#: src/mainwindow.c:754
+#: src/mainwindow.c:745
 msgid "/_Tools/E_xecute"
 msgstr "/_Orodja/_Izvrši"
 
-#: src/mainwindow.c:756
+#: src/mainwindow.c:747
 msgid "/_Tools/_Log window"
 msgstr "/_Orodja/_Dnevniško okno"
 
-#: src/mainwindow.c:758
+#: src/mainwindow.c:749
 msgid "/_Configuration"
 msgstr "/_Prikrojitev"
 
-#: src/mainwindow.c:759
+#: src/mainwindow.c:750
 msgid "/_Configuration/_Common preferences..."
 msgstr "/_Prikrojitev/_Splošne nastavitve..."
 
-#: src/mainwindow.c:761
+#: src/mainwindow.c:752
 msgid "/_Configuration/_Filter setting..."
 msgstr "/_Prikrojitev/_Nastavitve _filtra..."
 
-#: src/mainwindow.c:763
+#: src/mainwindow.c:754
 msgid "/_Configuration/_Template..."
 msgstr "/_Prikrojitev/_Predloga..."
 
-#: src/mainwindow.c:764
+#: src/mainwindow.c:755
 msgid "/_Configuration/_Actions..."
 msgstr "/_Prikrojitev/_Dejanja..."
 
-#: src/mainwindow.c:765
+#: src/mainwindow.c:756
 msgid "/_Configuration/---"
 msgstr "/_Prikrojitev/---"
 
-#: src/mainwindow.c:766
+#: src/mainwindow.c:757
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Prikrojitev/_Nastavitve za trenutni _račun..."
 
-#: src/mainwindow.c:768
+#: src/mainwindow.c:759
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Prikrojitev/Naredi _nov račun..."
 
-#: src/mainwindow.c:770
+#: src/mainwindow.c:761
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Prikrojitev/_Uredi račune..."
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:763
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Prikrojitev/Spremeni _trenutni račun"
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:767
 msgid "/_Help/_Manual"
 msgstr "/_Pomoč/_Priročnik"
 
-#: src/mainwindow.c:777
+#: src/mainwindow.c:768
 msgid "/_Help/_Manual/_English"
 msgstr "/_Pomoč/_Priročnik/_Angleščina"
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:769
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/_Pomoč/_Priročnik/_Japonščina"
 
-#: src/mainwindow.c:779
+#: src/mainwindow.c:770
 msgid "/_Help/_FAQ"
 msgstr "/_Pomoč/Pogosto _zastavljena vprašanja"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:771
 msgid "/_Help/_FAQ/_English"
 msgstr "/_Pomoč/Pogosto _zastavljena vprašanja/_Angleščina"
 
-#: src/mainwindow.c:781
+#: src/mainwindow.c:772
 msgid "/_Help/_FAQ/_German"
 msgstr "/_Pomoč/Pogosto _zastavljena vprašanja/_Nemščina"
 
-#: src/mainwindow.c:782
+#: src/mainwindow.c:773
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/_Pomoč/Pogosto _zastavljena vprašanja/Š_panščina"
 
-#: src/mainwindow.c:783
+#: src/mainwindow.c:774
 msgid "/_Help/_FAQ/_French"
 msgstr "/_Pomoč/Pogosto _zastavljena vprašanja/_Francoščina"
 
-#: src/mainwindow.c:784
+#: src/mainwindow.c:775
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/_Pomoč/Pogosto _zastavljena vprašanja/_Italijanščina"
 
-#: src/mainwindow.c:785
+#: src/mainwindow.c:776
 msgid "/_Help/---"
 msgstr "/_Pomoč/---"
 
-#: src/mainwindow.c:825
+#: src/mainwindow.c:816
 msgid "Creating main window...\n"
 msgstr "Ustvarjam glavno okno...\n"
 
-#: src/mainwindow.c:987
+#: src/mainwindow.c:973
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "GlavnoOkno: alokacija barve %d ni uspela\n"
 
-#: src/mainwindow.c:1071 src/summaryview.c:2020 src/summaryview.c:2105
+#: src/mainwindow.c:1057 src/summaryview.c:2020 src/summaryview.c:2105
 #: src/summaryview.c:3342 src/summaryview.c:3415 src/summaryview.c:3728
 msgid "done.\n"
 msgstr "opravljeno.\n"
 
-#: src/mainwindow.c:1196 src/mainwindow.c:1237 src/mainwindow.c:1265
+#: src/mainwindow.c:1182 src/mainwindow.c:1223 src/mainwindow.c:1251
 msgid "Untitled"
 msgstr "Brez naslova"
 
-#: src/mainwindow.c:1266
+#: src/mainwindow.c:1252
 msgid "none"
 msgstr "nič"
 
-#: src/mainwindow.c:1316
+#: src/mainwindow.c:1302
 #, 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:1536
+#: src/mainwindow.c:1522
 msgid "Offline"
 msgstr ""
 
-#: src/mainwindow.c:1537
+#: src/mainwindow.c:1523
 msgid "You are offline. Go online?"
 msgstr ""
 
-#: src/mainwindow.c:1551
+#: src/mainwindow.c:1537
 #, fuzzy
 msgid "Empty all trash"
 msgstr "Izprazni smetnjak"
 
-#: src/mainwindow.c:1552
+#: src/mainwindow.c:1538
 #, fuzzy
 msgid "Empty messages in all trash?"
 msgstr "Izbrišem vsa sporočila v smetnjaku?"
 
-#: src/mainwindow.c:1580
+#: src/mainwindow.c:1566
 msgid "Add mailbox"
 msgstr "Dodaj poštni predal"
 
-#: src/mainwindow.c:1581
+#: src/mainwindow.c:1567
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3205,16 +3205,16 @@ msgstr ""
 "Če je določen obstoječi poštni predal,\n"
 "bo pregledan samodejno."
 
-#: src/mainwindow.c:1587
+#: src/mainwindow.c:1573
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Poštni predal `%s' že obstaja."
 
-#: src/mainwindow.c:1592 src/setup.c:57
+#: src/mainwindow.c:1578 src/setup.c:57
 msgid "Mailbox"
 msgstr "Poštni predal"
 
-#: src/mainwindow.c:1598 src/setup.c:63
+#: src/mainwindow.c:1584 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3223,153 +3223,153 @@ msgstr ""
 "Izdelava poštnega predala ni uspela.\n"
 "Morda obstajajo nekatere datoteke ali pa tam nimate dovoljenja za pisanje."
 
-#: src/mainwindow.c:1989
+#: src/mainwindow.c:1975
 msgid "Sylpheed - Folder View"
 msgstr "Syčpheed - ogled mape"
 
-#: src/mainwindow.c:2009 src/messageview.c:368
+#: src/mainwindow.c:1995 src/messageview.c:368
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - ogled sporočila"
 
-#: src/mainwindow.c:2156 src/summaryview.c:370
+#: src/mainwindow.c:2142 src/summaryview.c:370
 msgid "/_Reply"
 msgstr "/O_dgovori"
 
-#: src/mainwindow.c:2157
+#: src/mainwindow.c:2143
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "Odgovori vsem"
 
-#: src/mainwindow.c:2158
+#: src/mainwindow.c:2144
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/Odgovor _za/_pošiljatelja"
 
-#: src/mainwindow.c:2159
+#: src/mainwindow.c:2145
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/Odgovor _za/_dopisni seznam"
 
-#: src/mainwindow.c:2164 src/summaryview.c:377
+#: src/mainwindow.c:2150 src/summaryview.c:377
 msgid "/_Forward"
 msgstr "/P_osreduj"
 
-#: src/mainwindow.c:2165 src/summaryview.c:378
+#: src/mainwindow.c:2151 src/summaryview.c:378
 msgid "/For_ward as attachment"
 msgstr "/Posreduj kot prilo_go"
 
-#: src/mainwindow.c:2166 src/summaryview.c:379
+#: src/mainwindow.c:2152 src/summaryview.c:379
 msgid "/Redirec_t"
 msgstr "/Pre_usmeri"
 
-#: src/mainwindow.c:2205
+#: src/mainwindow.c:2188
 msgid "Get"
 msgstr "Poberi"
 
-#: src/mainwindow.c:2206
+#: src/mainwindow.c:2189
 msgid "Incorporate new mail"
 msgstr "Pripoji novo pošto"
 
-#: src/mainwindow.c:2213
+#: src/mainwindow.c:2196
 msgid "Get all"
 msgstr "Poberi vsa"
 
-#: src/mainwindow.c:2214
+#: src/mainwindow.c:2197
 msgid "Incorporate new mail of all accounts"
 msgstr "Pripoji novo pošto z vseh računov"
 
-#: src/mainwindow.c:2225
+#: src/mainwindow.c:2208
 msgid "Send queued message(s)"
 msgstr "Pošlji čakajoča sporočila"
 
-#: src/mainwindow.c:2235 src/prefs_account.c:721 src/prefs_common.c:949
+#: src/mainwindow.c:2218 src/prefs_account.c:721 src/prefs_common.c:949
 #: src/prefs_folder_item.c:137
 msgid "Compose"
 msgstr "Sestavi"
 
-#: src/mainwindow.c:2236
+#: src/mainwindow.c:2219
 msgid "Compose new message"
 msgstr "Sestavi novo sporočilo"
 
-#: src/mainwindow.c:2244 src/prefs_common.c:1448
+#: src/mainwindow.c:2227 src/prefs_common.c:1448
 msgid "Reply"
 msgstr "Odgovori"
 
-#: src/mainwindow.c:2245 src/mainwindow.c:2258
+#: src/mainwindow.c:2228 src/mainwindow.c:2241
 msgid "Reply to the message"
 msgstr "Odgovori na sporočilo"
 
-#: src/mainwindow.c:2263
+#: src/mainwindow.c:2245
 msgid "Reply all"
 msgstr "Odgovori vsem"
 
-#: src/mainwindow.c:2264
+#: src/mainwindow.c:2246
 msgid "Reply to all"
 msgstr "Odgovori vsem"
 
-#: src/mainwindow.c:2272 src/prefs_filter_edit.c:741
+#: src/mainwindow.c:2254 src/prefs_filter_edit.c:741
 msgid "Forward"
 msgstr "Posreduj"
 
-#: src/mainwindow.c:2273 src/mainwindow.c:2286
+#: src/mainwindow.c:2255 src/mainwindow.c:2268
 msgid "Forward the message"
 msgstr "Posreduj sporočilo"
 
-#: src/mainwindow.c:2293
+#: src/mainwindow.c:2275
 msgid "Delete the message"
 msgstr "Izbriši sporočilo"
 
-#: src/mainwindow.c:2301 src/prefs_common.c:1988
+#: src/mainwindow.c:2283 src/prefs_common.c:1988
 msgid "Junk"
 msgstr ""
 
-#: src/mainwindow.c:2302
+#: src/mainwindow.c:2284
 #, fuzzy
 msgid "Set as junk mail"
 msgstr "Nastavi kot privzeto"
 
-#: src/mainwindow.c:2311
+#: src/mainwindow.c:2293
 msgid "Execute"
 msgstr "Izvedi"
 
-#: src/mainwindow.c:2312
+#: src/mainwindow.c:2294
 msgid "Execute marked process"
 msgstr "Izvedi označen proces"
 
-#: src/mainwindow.c:2322
+#: src/mainwindow.c:2304
 msgid "Next unread message"
 msgstr "Naslednje neprebrano sporočilo"
 
-#: src/mainwindow.c:2334
+#: src/mainwindow.c:2316
 msgid "Prefs"
 msgstr "Nastavitve"
 
-#: src/mainwindow.c:2335
+#: src/mainwindow.c:2317
 msgid "Common preferences"
 msgstr "Splošne preference"
 
-#: src/mainwindow.c:2343 src/prefs_folder_item.c:261
+#: src/mainwindow.c:2325 src/prefs_folder_item.c:261
 #: src/prefs_folder_item.c:272 src/progressdialog.c:128
 msgid "Account"
 msgstr "Račun"
 
-#: src/mainwindow.c:2344
+#: src/mainwindow.c:2326
 msgid "Account setting"
 msgstr "Nastavitev računa"
 
-#: src/mainwindow.c:2527
+#: src/mainwindow.c:2498
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 
-#: src/mainwindow.c:2538
+#: src/mainwindow.c:2509
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 
-#: src/mainwindow.c:2731
+#: src/mainwindow.c:2702
 msgid "Exit"
 msgstr "Končaj"
 
-#: src/mainwindow.c:2731
+#: src/mainwindow.c:2702
 msgid "Exit this program?"
 msgstr "Ali naj končam ta program?"
 
@@ -5612,11 +5612,11 @@ msgstr "Ustvarjam pogovorno okno napredka...\n"
 msgid "Status"
 msgstr "Status"
 
-#: src/recv.c:113
+#: src/recv.c:112
 msgid "error occurred while retrieving data.\n"
 msgstr "med popravljanjem podatkov je prišlo do napake.\n"
 
-#: src/recv.c:155 src/recv.c:197 src/recv.c:213
+#: src/recv.c:154 src/recv.c:196 src/recv.c:211
 msgid "Can't write to file.\n"
 msgstr "Ne morem pisati v datoteko.\n"
 
@@ -6355,7 +6355,7 @@ msgstr ""
 msgid "%.2fGB"
 msgstr ""
 
-#: src/utils.c:2372 src/utils.c:2496
+#: src/utils.c:2386 src/utils.c:2510
 #, c-format
 msgid "writing to %s failed.\n"
 msgstr "pisanje v %s ni uspelo.\n"
diff --git a/po/sr.po b/po/sr.po
index 1547d824..8390a745 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-08-09 18:08+0900\n"
+"POT-Creation-Date: 2005-08-22 17:22+0900\n"
 "PO-Revision-Date: 2002-11-29 21:08+0100\n"
 "Last-Translator: garret <garret@garrets.tk>\n"
 "Language-Team: Serbian\n"
@@ -97,7 +97,7 @@ msgstr ""
 "`G' one naloge sa kojih želite skinuti e-poštu sa `Primi sve'."
 
 #: src/account.c:691 src/addressadd.c:192 src/addressbook.c:490
-#: src/compose.c:4081 src/editaddress.c:200 src/editaddress.c:942
+#: src/compose.c:4079 src/editaddress.c:200 src/editaddress.c:942
 #: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:265
 #: src/editjpilot.c:271 src/editldap.c:307 src/editvcard.c:184
 #: src/mimeview.c:201 src/prefs_filter.c:258 src/prefs_folder_item.c:170
@@ -233,7 +233,7 @@ msgstr ""
 msgid "Add Address to Book"
 msgstr "Dodaj adresu u adresar"
 
-#: src/addressadd.c:202 src/compose.c:4528 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4521 src/editaddress.c:201
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "Adresa"
@@ -247,7 +247,7 @@ msgstr "Beleške"
 msgid "Select Address Book Folder"
 msgstr "Odaberite direktorijum adresara"
 
-#: src/addressbook.c:336 src/compose.c:495 src/mainwindow.c:470
+#: src/addressbook.c:336 src/compose.c:493 src/mainwindow.c:461
 #: src/messageview.c:137
 msgid "/_File"
 msgstr "/_Datoteka"
@@ -268,10 +268,10 @@ msgstr "/_Datoteka/Novi _JPilot"
 msgid "/_File/New _Server"
 msgstr "/_Datoteka/Novi _server"
 
-#: src/addressbook.c:345 src/addressbook.c:348 src/compose.c:500
-#: src/compose.c:505 src/compose.c:509 src/mainwindow.c:488
-#: src/mainwindow.c:491 src/mainwindow.c:493 src/mainwindow.c:496
-#: src/mainwindow.c:498 src/messageview.c:140
+#: src/addressbook.c:345 src/addressbook.c:348 src/compose.c:498
+#: src/compose.c:503 src/compose.c:507 src/mainwindow.c:479
+#: src/mainwindow.c:482 src/mainwindow.c:484 src/mainwindow.c:487
+#: src/mainwindow.c:489 src/messageview.c:140
 msgid "/_File/---"
 msgstr "/_Datoteka/---"
 
@@ -287,7 +287,7 @@ msgstr "/_Datoteka/_Obriši"
 msgid "/_File/_Save"
 msgstr "/_Datoteka/_Sačuvaj"
 
-#: src/addressbook.c:350 src/compose.c:510 src/messageview.c:141
+#: src/addressbook.c:350 src/compose.c:508 src/messageview.c:141
 msgid "/_File/_Close"
 msgstr "/_Datoteka/_Zatvori"
 
@@ -319,7 +319,7 @@ msgstr "/_Adresa/_Izmeni"
 msgid "/_Address/_Delete"
 msgstr "/_Adresa/O_briši"
 
-#: src/addressbook.c:358 src/compose.c:619 src/mainwindow.c:725
+#: src/addressbook.c:358 src/compose.c:617 src/mainwindow.c:716
 #: src/messageview.c:256
 msgid "/_Tools"
 msgstr "/_Alati"
@@ -328,12 +328,12 @@ msgstr "/_Alati"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Datoteka/Unesi _LDIF datoteku"
 
-#: src/addressbook.c:360 src/compose.c:632 src/mainwindow.c:775
+#: src/addressbook.c:360 src/compose.c:630 src/mainwindow.c:766
 #: src/messageview.c:274
 msgid "/_Help"
 msgstr "/_Pomoć"
 
-#: src/addressbook.c:361 src/compose.c:633 src/mainwindow.c:786
+#: src/addressbook.c:361 src/compose.c:631 src/mainwindow.c:777
 #: src/messageview.c:275
 msgid "/_Help/_About"
 msgstr "/_Pomoć/_O"
@@ -350,7 +350,7 @@ msgstr "/Nova _grupa"
 msgid "/New _Folder"
 msgstr "/Novi _direktorijum"
 
-#: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:489
+#: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:487
 #: src/folderview.c:235 src/folderview.c:237 src/folderview.c:241
 #: src/folderview.c:252 src/folderview.c:254 src/folderview.c:256
 #: src/folderview.c:260 src/folderview.c:270 src/folderview.c:272
@@ -360,8 +360,8 @@ msgstr "/Novi _direktorijum"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:512
-#: src/mainwindow.c:502 src/messageview.c:143
+#: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:510
+#: src/mainwindow.c:493 src/messageview.c:143
 msgid "/_Edit"
 msgstr "/_Izmeni"
 
@@ -373,7 +373,7 @@ msgstr "/_Obriši"
 msgid "E-Mail address"
 msgstr "Adresa e-pošte"
 
-#: src/addressbook.c:495 src/compose.c:4529 src/prefs_common.c:2402
+#: src/addressbook.c:495 src/compose.c:4522 src/prefs_common.c:2402
 msgid "Address book"
 msgstr "Adresar"
 
@@ -382,8 +382,8 @@ msgid "Name:"
 msgstr "Ime:"
 
 #. Buttons
-#: src/addressbook.c:627 src/addressbook.c:1673 src/editaddress.c:884
-#: src/editaddress.c:1017 src/mainwindow.c:2292 src/prefs_actions.c:266
+#: src/addressbook.c:627 src/addressbook.c:1674 src/editaddress.c:884
+#: src/editaddress.c:1017 src/mainwindow.c:2274 src/prefs_actions.c:266
 #: src/prefs_display_header.c:278 src/prefs_display_header.c:333
 #: src/prefs_template.c:231
 msgid "Delete"
@@ -422,7 +422,7 @@ msgstr "Obriši adresu/e"
 msgid "Really delete the address(es)?"
 msgstr "Zaista obrisati adresu/e?"
 
-#: src/addressbook.c:1664
+#: src/addressbook.c:1665
 #, fuzzy, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -432,38 +432,38 @@ msgstr ""
 "Ako brišete samo direktorijum, adrese će biti premeštene u prethodni "
 "direktorijum."
 
-#: src/addressbook.c:1667 src/folderview.c:2139
+#: src/addressbook.c:1668 src/folderview.c:2139
 msgid "Delete folder"
 msgstr "Obriši direktorijum"
 
-#: src/addressbook.c:1667
+#: src/addressbook.c:1668
 #, fuzzy
 msgid "_Folder only"
 msgstr "Samo direktorijum"
 
-#: src/addressbook.c:1667
+#: src/addressbook.c:1668
 #, fuzzy
 msgid "Folder and _addresses"
 msgstr "Direktorijum i adrese"
 
-#: src/addressbook.c:1672
+#: src/addressbook.c:1673
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Zaista obrisati `%s' ?"
 
-#: src/addressbook.c:2352 src/addressbook.c:2485
+#: src/addressbook.c:2353 src/addressbook.c:2486
 msgid "New user, could not save index file."
 msgstr "Novi korisnik, ne mogu sačuvati index datoteku."
 
-#: src/addressbook.c:2356 src/addressbook.c:2489
+#: src/addressbook.c:2357 src/addressbook.c:2490
 msgid "New user, could not save address book files."
 msgstr "Novi korisnik, ne mogu sačuvati datoteke adresara."
 
-#: src/addressbook.c:2366 src/addressbook.c:2499
+#: src/addressbook.c:2367 src/addressbook.c:2500
 msgid "Old address book converted successfully."
 msgstr "Stari adresar uspešno prebačen."
 
-#: src/addressbook.c:2371
+#: src/addressbook.c:2372
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -471,7 +471,7 @@ msgstr ""
 "Stari adresar ne može biti prebačen,\n"
 "ne mogu sačuvati novu index datoteku adresara."
 
-#: src/addressbook.c:2384
+#: src/addressbook.c:2385
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -479,7 +479,7 @@ msgstr ""
 "Ne mogu prebaciti adesar,\n"
 "ali sam kreirao nove prazne datoteke adresara."
 
-#: src/addressbook.c:2390
+#: src/addressbook.c:2391
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -487,7 +487,7 @@ msgstr ""
 "Ne mogu prebaciti adresar,\n"
 "ne mogu napraviti nove datoteke adresara."
 
-#: src/addressbook.c:2395
+#: src/addressbook.c:2396
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -495,83 +495,83 @@ msgstr ""
 "Ne mogu prebaciti adresar,\n"
 "i ne mogu napraviti nove datoteke adresara."
 
-#: src/addressbook.c:2402
+#: src/addressbook.c:2403
 msgid "Addressbook conversion error"
 msgstr "Greška pri prebacivanju adresara"
 
-#: src/addressbook.c:2406
+#: src/addressbook.c:2407
 msgid "Addressbook conversion"
 msgstr "Prebacivanje adresara"
 
-#: src/addressbook.c:2441
+#: src/addressbook.c:2442
 msgid "Addressbook Error"
 msgstr "Greška adresara"
 
-#: src/addressbook.c:2442 src/addressbook.c:2542
+#: src/addressbook.c:2443 src/addressbook.c:2543
 msgid "Could not read address index"
 msgstr "Ne mogu čitati index adresara"
 
-#: src/addressbook.c:2504
+#: src/addressbook.c:2505
 msgid "Old address book converted, could not save new address index file"
 msgstr "Stari adresar unešen, ne mogu napraviti index datoteke novih adresa"
 
-#: src/addressbook.c:2518
+#: src/addressbook.c:2519
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr "Ne mogu uneti adresar, pravim prazne datoteke novog adresara."
 
-#: src/addressbook.c:2524
+#: src/addressbook.c:2525
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr "Ne mogu uneti adresar, ne mogu napraviti nove datoteke adresara."
 
-#: src/addressbook.c:2530
+#: src/addressbook.c:2531
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr "Ne mogu uneti adresar i ne mogu napraviti nove datoteke adresara."
 
-#: src/addressbook.c:2548
+#: src/addressbook.c:2549
 msgid "Addressbook Conversion Error"
 msgstr "Greška pri unosu adresara"
 
-#: src/addressbook.c:2554
+#: src/addressbook.c:2555
 msgid "Addressbook Conversion"
 msgstr "Unos adresara"
 
-#: src/addressbook.c:3055 src/prefs_common.c:963
+#: src/addressbook.c:3056 src/prefs_common.c:963
 msgid "Interface"
 msgstr "Izgled programa"
 
-#: src/addressbook.c:3071 src/importldif.c:514
+#: src/addressbook.c:3072 src/importldif.c:514
 msgid "Address Book"
 msgstr "Adresar"
 
-#: src/addressbook.c:3087
+#: src/addressbook.c:3088
 msgid "Person"
 msgstr "Osoba"
 
-#: src/addressbook.c:3103
+#: src/addressbook.c:3104
 msgid "EMail Address"
 msgstr "Adresa e-pošte"
 
-#: src/addressbook.c:3119
+#: src/addressbook.c:3120
 msgid "Group"
 msgstr "Grupa"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3135 src/folderview.c:346 src/prefs_account.c:1866
+#: src/addressbook.c:3136 src/folderview.c:346 src/prefs_account.c:1866
 msgid "Folder"
 msgstr "Direktorijum"
 
-#: src/addressbook.c:3151
+#: src/addressbook.c:3152
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3167 src/addressbook.c:3183
+#: src/addressbook.c:3168 src/addressbook.c:3184
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3199
+#: src/addressbook.c:3200
 msgid "LDAP Server"
 msgstr "LDAP Server"
 
@@ -583,7 +583,7 @@ msgstr "Uobičajene adrese"
 msgid "Personal address"
 msgstr "Lične adrese"
 
-#: src/alertpanel.c:138 src/compose.c:5214 src/main.c:515
+#: src/alertpanel.c:138 src/compose.c:5208 src/main.c:515
 msgid "Notice"
 msgstr "Obaveštenje"
 
@@ -638,382 +638,382 @@ msgstr "Smeđa"
 msgid "None"
 msgstr "Ništa"
 
-#: src/compose.c:487
+#: src/compose.c:485
 msgid "/_Add..."
 msgstr "/_Dodaj..."
 
-#: src/compose.c:488
+#: src/compose.c:486
 msgid "/_Remove"
 msgstr "/_Skloni"
 
-#: src/compose.c:490 src/folderview.c:243 src/folderview.c:262
+#: src/compose.c:488 src/folderview.c:243 src/folderview.c:262
 #: src/folderview.c:277
 #, fuzzy
 msgid "/_Properties..."
 msgstr "/_Svojstva..."
 
-#: src/compose.c:496
+#: src/compose.c:494
 #, fuzzy
 msgid "/_File/_Send"
 msgstr "/_Datoteka/_Sačuvaj"
 
-#: src/compose.c:498
+#: src/compose.c:496
 #, fuzzy
 msgid "/_File/Send _later"
 msgstr "/_Poruka/Pošalji _kasnije"
 
-#: src/compose.c:501
+#: src/compose.c:499
 #, fuzzy
 msgid "/_File/Save to _draft folder"
 msgstr "/_Poruka/Snimi u direktorijum _nedovršeno"
 
-#: src/compose.c:503
+#: src/compose.c:501
 #, fuzzy
 msgid "/_File/Save and _keep editing"
 msgstr "/_Poruka/Pošalji _kasnije i nastavi da pišeš"
 
-#: src/compose.c:506
+#: src/compose.c:504
 msgid "/_File/_Attach file"
 msgstr "/_Datoeka/_Prikači datoteku"
 
-#: src/compose.c:507
+#: src/compose.c:505
 msgid "/_File/_Insert file"
 msgstr "/_Datoteka/_Unesi datoteku"
 
-#: src/compose.c:508
+#: src/compose.c:506
 msgid "/_File/Insert si_gnature"
 msgstr "/_Datoteka/Unesi _potpis"
 
-#: src/compose.c:513
+#: src/compose.c:511
 msgid "/_Edit/_Undo"
 msgstr "/_Izmeni/_Undo"
 
-#: src/compose.c:514
+#: src/compose.c:512
 msgid "/_Edit/_Redo"
 msgstr "/_Izmeni/_Redo"
 
-#: src/compose.c:515 src/compose.c:522 src/mainwindow.c:506
+#: src/compose.c:513 src/compose.c:520 src/mainwindow.c:497
 #: src/messageview.c:146
 msgid "/_Edit/---"
 msgstr "/_Izmeni/---"
 
-#: src/compose.c:516
+#: src/compose.c:514
 msgid "/_Edit/Cu_t"
 msgstr "/_Izmeni/S_eci"
 
-#: src/compose.c:517 src/mainwindow.c:503 src/messageview.c:144
+#: src/compose.c:515 src/mainwindow.c:494 src/messageview.c:144
 msgid "/_Edit/_Copy"
 msgstr "/_Izmeni/_Kopiraj"
 
-#: src/compose.c:518
+#: src/compose.c:516
 msgid "/_Edit/_Paste"
 msgstr "/_Izmeni/U_baci"
 
-#: src/compose.c:519
+#: src/compose.c:517
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Izmeni/Ubaci kao _citat"
 
-#: src/compose.c:521 src/mainwindow.c:504 src/messageview.c:145
+#: src/compose.c:519 src/mainwindow.c:495 src/messageview.c:145
 msgid "/_Edit/Select _all"
 msgstr "/_Izmeni/Odaberi _sve"
 
-#: src/compose.c:523
+#: src/compose.c:521
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/_Izmeni/Sažmi trenutni _paragraf"
 
-#: src/compose.c:525
+#: src/compose.c:523
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/_Izmeni/Sažmi sve dugačke _linije"
 
-#: src/compose.c:527
+#: src/compose.c:525
 #, fuzzy
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Izmeni/_Kopiraj"
 
-#: src/compose.c:528 src/mainwindow.c:511 src/messageview.c:150
+#: src/compose.c:526 src/mainwindow.c:502 src/messageview.c:150
 #: src/summaryview.c:400
 msgid "/_View"
 msgstr "/_Pregled"
 
-#: src/compose.c:529
+#: src/compose.c:527
 msgid "/_View/_To"
 msgstr "/_Pregled/_Za"
 
-#: src/compose.c:530
+#: src/compose.c:528
 msgid "/_View/_Cc"
 msgstr "/_Pregled/_Cc"
 
-#: src/compose.c:531
+#: src/compose.c:529
 msgid "/_View/_Bcc"
 msgstr "/_Pregled/_Bcc"
 
-#: src/compose.c:532
+#: src/compose.c:530
 msgid "/_View/_Reply to"
 msgstr "/_Pregled/_Odgovori"
 
-#: src/compose.c:533 src/compose.c:535 src/compose.c:537 src/compose.c:539
-#: src/mainwindow.c:529 src/mainwindow.c:532 src/mainwindow.c:558
-#: src/mainwindow.c:582 src/mainwindow.c:675 src/mainwindow.c:679
+#: src/compose.c:531 src/compose.c:533 src/compose.c:535 src/compose.c:537
+#: src/mainwindow.c:520 src/mainwindow.c:523 src/mainwindow.c:549
+#: src/mainwindow.c:573 src/mainwindow.c:666 src/mainwindow.c:670
 #: src/messageview.c:233
 msgid "/_View/---"
 msgstr "/_Pregled/---"
 
-#: src/compose.c:534
+#: src/compose.c:532
 msgid "/_View/_Followup to"
 msgstr "/_Pregled/P_rosledi"
 
-#: src/compose.c:536
+#: src/compose.c:534
 msgid "/_View/R_uler"
 msgstr "/_Pregled/Len_jir"
 
-#: src/compose.c:538
+#: src/compose.c:536
 msgid "/_View/_Attachment"
 msgstr "/_Pregled/_Spajalica"
 
-#: src/compose.c:545 src/mainwindow.c:589 src/messageview.c:157
+#: src/compose.c:543 src/mainwindow.c:580 src/messageview.c:157
 #, fuzzy
 msgid "/_View/Character _encoding"
 msgstr "/_Pregled/_Složi/Opadajuće"
 
-#: src/compose.c:546
+#: src/compose.c:544
 msgid "/_View/Character _encoding/_Automatic"
 msgstr ""
 
-#: src/compose.c:548 src/compose.c:554 src/compose.c:560 src/compose.c:564
-#: src/compose.c:570 src/compose.c:574 src/compose.c:580 src/compose.c:584
-#: src/compose.c:594 src/compose.c:598 src/compose.c:608 src/compose.c:612
-#: src/mainwindow.c:585 src/mainwindow.c:592 src/messageview.c:153
+#: src/compose.c:546 src/compose.c:552 src/compose.c:558 src/compose.c:562
+#: src/compose.c:568 src/compose.c:572 src/compose.c:578 src/compose.c:582
+#: src/compose.c:592 src/compose.c:596 src/compose.c:606 src/compose.c:610
+#: src/mainwindow.c:576 src/mainwindow.c:583 src/messageview.c:153
 #, fuzzy
 msgid "/_View/Character _encoding/---"
 msgstr "/_Pregled/_Složi/Opadajuće"
 
-#: src/compose.c:550 src/mainwindow.c:593 src/messageview.c:161
+#: src/compose.c:548 src/mainwindow.c:584 src/messageview.c:161
 #, fuzzy
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Pregled/_Znakovni standard/7bit ascii (US-ASC_II)"
 
-#: src/compose.c:552 src/mainwindow.c:595 src/messageview.c:164
+#: src/compose.c:550 src/mainwindow.c:586 src/messageview.c:164
 #, fuzzy
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Pregled/_Znakovni standard/Unicode (_UTF-8)"
 
-#: src/compose.c:556 src/mainwindow.c:599 src/messageview.c:167
+#: src/compose.c:554 src/mainwindow.c:590 src/messageview.c:167
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Pregled/_Znakovni standard/Zapadna Evropa (ISO-8859-_1)"
 
-#: src/compose.c:558 src/mainwindow.c:601 src/messageview.c:169
+#: src/compose.c:556 src/mainwindow.c:592 src/messageview.c:169
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Pregled/_Znakovni standard/Zapadna Evropa (ISO-8859-15)"
 
-#: src/compose.c:562 src/mainwindow.c:605 src/messageview.c:172
+#: src/compose.c:560 src/mainwindow.c:596 src/messageview.c:172
 #, fuzzy
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Pregled/_Znakovni standard/Srednja Evropa (ISO-8859-_2)"
 
-#: src/compose.c:566 src/mainwindow.c:609 src/messageview.c:175
+#: src/compose.c:564 src/mainwindow.c:600 src/messageview.c:175
 #, fuzzy
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Pregled/_Znakovni standard/_Baltik (ISO-8859-13)"
 
-#: src/compose.c:568 src/mainwindow.c:611 src/messageview.c:177
+#: src/compose.c:566 src/mainwindow.c:602 src/messageview.c:177
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Pregled/_Znakovni standard/Baltik (ISO-8859-_4)"
 
-#: src/compose.c:572 src/mainwindow.c:615 src/messageview.c:180
+#: src/compose.c:570 src/mainwindow.c:606 src/messageview.c:180
 #, fuzzy
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Pregled/_Znakovni standard/Grčka (ISO-8859-_7)"
 
-#: src/compose.c:576 src/mainwindow.c:619 src/messageview.c:183
+#: src/compose.c:574 src/mainwindow.c:610 src/messageview.c:183
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Pregled/_Znakovni standard/Grčka (ISO-8859-_7)"
 
-#: src/compose.c:578 src/mainwindow.c:621 src/messageview.c:185
+#: src/compose.c:576 src/mainwindow.c:612 src/messageview.c:185
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Pregled/_Znakovni standard/Ćirilica (Windows-1251)"
 
-#: src/compose.c:582 src/mainwindow.c:625 src/messageview.c:188
+#: src/compose.c:580 src/mainwindow.c:616 src/messageview.c:188
 #, fuzzy
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Pregled/_Znakovni standard/Turska (ISO-8859-_9)"
 
-#: src/compose.c:586 src/mainwindow.c:629 src/messageview.c:191
+#: src/compose.c:584 src/mainwindow.c:620 src/messageview.c:191
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Pregled/_Znakovni standard/Ćirilica (ISO-8859-_5)"
 
-#: src/compose.c:588 src/mainwindow.c:631 src/messageview.c:193
+#: src/compose.c:586 src/mainwindow.c:622 src/messageview.c:193
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Pregled/_Znakovni standard/Ćirilica (KOI8-_R)"
 
-#: src/compose.c:590 src/mainwindow.c:633 src/messageview.c:195
+#: src/compose.c:588 src/mainwindow.c:624 src/messageview.c:195
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Pregled/_Znakovni standard/Ćirilica (KOI8-_R)"
 
-#: src/compose.c:592 src/mainwindow.c:635 src/messageview.c:197
+#: src/compose.c:590 src/mainwindow.c:626 src/messageview.c:197
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Pregled/_Znakovni standard/Ćirilica (Windows-1251)"
 
-#: src/compose.c:596 src/mainwindow.c:639 src/messageview.c:200
+#: src/compose.c:594 src/mainwindow.c:630 src/messageview.c:200
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Pregled/_Znakovni standard/Japan (ISO-2022-_JP)"
 
-#: src/compose.c:600 src/mainwindow.c:649 src/messageview.c:209
+#: src/compose.c:598 src/mainwindow.c:640 src/messageview.c:209
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Pregled/_Znakovni standard/Pojednostavljeni Kineski (_GB2312)"
 
-#: src/compose.c:602 src/mainwindow.c:651 src/messageview.c:211
+#: src/compose.c:600 src/mainwindow.c:642 src/messageview.c:211
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Pregled/_Znakovni standard/Pojednostavljeni Kineski (_GB2312)"
 
-#: src/compose.c:604 src/mainwindow.c:653 src/messageview.c:213
+#: src/compose.c:602 src/mainwindow.c:644 src/messageview.c:213
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Pregled/_Znakovni standard/Tradicionalni Kineski (_Big5)"
 
-#: src/compose.c:606 src/mainwindow.c:655 src/messageview.c:215
+#: src/compose.c:604 src/mainwindow.c:646 src/messageview.c:215
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Pregled/_Znakovni standard/Tradicionalni Kineski (EUC-_TW)"
 
-#: src/compose.c:610 src/mainwindow.c:661 src/messageview.c:220
+#: src/compose.c:608 src/mainwindow.c:652 src/messageview.c:220
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Pregled/_Znakovni standard/Koreja (EUC-_KR)"
 
-#: src/compose.c:614 src/mainwindow.c:667 src/messageview.c:225
+#: src/compose.c:612 src/mainwindow.c:658 src/messageview.c:225
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Pregled/_Znakovni standard/Thai (TIS-620)"
 
-#: src/compose.c:616 src/mainwindow.c:669 src/messageview.c:227
+#: src/compose.c:614 src/mainwindow.c:660 src/messageview.c:227
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Pregled/_Znakovni standard/Thai (Windows-874)"
 
-#: src/compose.c:620 src/mainwindow.c:726 src/messageview.c:257
+#: src/compose.c:618 src/mainwindow.c:717 src/messageview.c:257
 msgid "/_Tools/_Address book"
 msgstr "/_Alat/_Adresar"
 
-#: src/compose.c:621
+#: src/compose.c:619
 msgid "/_Tools/_Template"
 msgstr "/_Alat/_Šablon"
 
-#: src/compose.c:622 src/mainwindow.c:749 src/messageview.c:272
+#: src/compose.c:620 src/mainwindow.c:740 src/messageview.c:272
 msgid "/_Tools/Actio_ns"
 msgstr "/_Alat/Akci_je"
 
-#: src/compose.c:623 src/compose.c:627 src/mainwindow.c:729
-#: src/mainwindow.c:743 src/mainwindow.c:748 src/mainwindow.c:750
-#: src/mainwindow.c:753 src/mainwindow.c:755 src/messageview.c:260
+#: src/compose.c:621 src/compose.c:625 src/mainwindow.c:720
+#: src/mainwindow.c:734 src/mainwindow.c:739 src/mainwindow.c:741
+#: src/mainwindow.c:744 src/mainwindow.c:746 src/messageview.c:260
 #: src/messageview.c:271
 msgid "/_Tools/---"
 msgstr "/_Alati/---"
 
-#: src/compose.c:624
+#: src/compose.c:622
 #, fuzzy
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/_Izmeni/Izmeni sa neza_visnim editorom"
 
-#: src/compose.c:628
+#: src/compose.c:626
 #, fuzzy
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Alat/Akci_je"
 
-#: src/compose.c:629
+#: src/compose.c:627
 #, fuzzy
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/_Poruka/_Enkriptuj"
 
-#: src/compose.c:855
+#: src/compose.c:853
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: datoteka ne postoji\n"
 
-#: src/compose.c:954 src/compose.c:1024 src/procmsg.c:1353
+#: src/compose.c:952 src/compose.c:1022 src/procmsg.c:1353
 msgid "Can't get text part\n"
 msgstr "Ne mogu dobiti deo teksta\n"
 
-#: src/compose.c:1420
+#: src/compose.c:1418
 msgid "Quote mark format error."
 msgstr "Greška u formatu citata."
 
-#: src/compose.c:1432
+#: src/compose.c:1430
 msgid "Message reply/forward format error."
 msgstr "Greška u poruci odgovori/prosledi."
 
-#: src/compose.c:1801
+#: src/compose.c:1799
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Datoteka %s ne postoji\n"
 
-#: src/compose.c:1805
+#: src/compose.c:1803
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Ne mogu dobiti veličinu datoteke %s\n"
 
-#: src/compose.c:1809
+#: src/compose.c:1807
 #, c-format
 msgid "File %s is empty."
 msgstr "Datoteka %s je prazna."
 
-#: src/compose.c:1813
+#: src/compose.c:1811
 #, c-format
 msgid "Can't read %s."
 msgstr "Ne mogu pročitati %s."
 
-#: src/compose.c:1848
+#: src/compose.c:1846
 #, c-format
 msgid "Message: %s"
 msgstr "Poruka: %s"
 
-#: src/compose.c:1920 src/mimeview.c:560
+#: src/compose.c:1918 src/mimeview.c:560
 msgid "Can't get the part of multipart message."
 msgstr "Ne mogu dobiti deo poruke iz više delova."
 
-#: src/compose.c:2362
+#: src/compose.c:2360
 msgid " [Edited]"
 msgstr " [Izmenjeno]"
 
-#: src/compose.c:2364
+#: src/compose.c:2362
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Pisanje poruke%s"
 
-#: src/compose.c:2367
+#: src/compose.c:2365
 #, c-format
 msgid "Compose message%s"
 msgstr "Pisanje poruke%s"
 
-#: src/compose.c:2478
+#: src/compose.c:2476
 msgid "Recipient is not specified."
 msgstr "Primalac nije upisan."
 
-#: src/compose.c:2486
+#: src/compose.c:2484
 #, fuzzy
 msgid "Empty subject"
 msgstr "Tema"
 
-#: src/compose.c:2487
+#: src/compose.c:2485
 msgid "Subject is empty. Send it anyway?"
 msgstr "Tema je prazna. Ipak poslati?"
 
-#: src/compose.c:2538
+#: src/compose.c:2536
 msgid "can't get recipient list."
 msgstr "ne mogu dobiti listu prilmalaca."
 
-#: src/compose.c:2558
+#: src/compose.c:2556
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1021,27 +1021,27 @@ msgstr ""
 "Nalog za slanje pošte nije definisan.\n"
 "Odaberite nalog pre slanja."
 
-#: src/compose.c:2572 src/send_message.c:297
+#: src/compose.c:2570 src/send_message.c:297
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Došlo je do greške prilikom slanja poruke %s -u."
 
-#: src/compose.c:2595
+#: src/compose.c:2593
 msgid "Can't save the message to outbox."
 msgstr "Ne mogu sačuvati poruku u direktorijumu poslato."
 
-#: src/compose.c:2645
+#: src/compose.c:2643
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr ""
 "Ne mogu pronaći nijedan ključ kome je trenutno dodeljen id ključa `%s'."
 
-#: src/compose.c:2709 src/compose.c:2965 src/compose.c:3028 src/compose.c:3148
-#: src/utils.c:2365
+#: src/compose.c:2707 src/compose.c:2963 src/compose.c:3026 src/compose.c:3146
+#: src/utils.c:2379
 msgid "can't change file mode\n"
 msgstr "ne mogu promeniti atribut datoteke\n"
 
-#: src/compose.c:2741
+#: src/compose.c:2739
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1051,12 +1051,12 @@ msgstr ""
 "Ne mogu promeniti kodni raspored poruke.\n"
 "Da je ipak pošaljem?"
 
-#: src/compose.c:2747
+#: src/compose.c:2745
 #, fuzzy
 msgid "Code conversion error"
 msgstr "Greška pri prebacivanju adresara"
 
-#: src/compose.c:2816
+#: src/compose.c:2814
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1065,156 +1065,156 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:2820
+#: src/compose.c:2818
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3108
+#: src/compose.c:3106
 msgid "can't remove the old message\n"
 msgstr "ne mogu skloniti staru poruku\n"
 
-#: src/compose.c:3126
+#: src/compose.c:3124
 msgid "queueing message...\n"
 msgstr "odlaganje poruke...\n"
 
-#: src/compose.c:3208
+#: src/compose.c:3206
 msgid "can't find queue folder\n"
 msgstr "ne mogu da pronađem direktorijum odloženo\n"
 
-#: src/compose.c:3215
+#: src/compose.c:3213
 msgid "can't queue the message\n"
 msgstr "ne mogu odložiti poruku\n"
 
-#: src/compose.c:3792
+#: src/compose.c:3790
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "generisan ID-poruke: %s\n"
 
-#: src/compose.c:3901
+#: src/compose.c:3899
 msgid "Creating compose window...\n"
 msgstr "Stvaranje prozora za pisanje...\n"
 
-#: src/compose.c:3949 src/headerview.c:54 src/summary_search.c:214
+#: src/compose.c:3947 src/headerview.c:54 src/summary_search.c:214
 msgid "From:"
 msgstr "Od:"
 
-#: src/compose.c:4021
+#: src/compose.c:4019
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/_Alat/Akci_je"
 
-#: src/compose.c:4024
+#: src/compose.c:4022
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/_Poruka/_Enkriptuj"
 
-#: src/compose.c:4062 src/compose.c:5001
+#: src/compose.c:4060 src/compose.c:4995
 msgid "MIME type"
 msgstr "MIME tip"
 
 #. S_COL_DATE
-#: src/compose.c:4071 src/mimeview.c:192 src/prefs_filter_edit.c:585
+#: src/compose.c:4069 src/mimeview.c:192 src/prefs_filter_edit.c:585
 #: src/prefs_summary_column.c:75 src/select-keys.c:317 src/summaryview.c:4217
 msgid "Size"
 msgstr "Veličina"
 
-#: src/compose.c:4449 src/mainwindow.c:2224 src/prefs_account.c:719
+#: src/compose.c:4442 src/mainwindow.c:2207 src/prefs_account.c:719
 #: src/prefs_common.c:947
 msgid "Send"
 msgstr "Pošalji"
 
-#: src/compose.c:4450
+#: src/compose.c:4443
 msgid "Send message"
 msgstr "Pošalji poruku"
 
-#: src/compose.c:4458
+#: src/compose.c:4451
 msgid "Send later"
 msgstr "Pošalji kasnije"
 
-#: src/compose.c:4459
+#: src/compose.c:4452
 msgid "Put into queue folder and send later"
 msgstr "Odloži u direktotijum odloženo i pošalji kasnije"
 
-#: src/compose.c:4467
+#: src/compose.c:4460
 msgid "Draft"
 msgstr "Nedovršeno"
 
-#: src/compose.c:4468
+#: src/compose.c:4461
 msgid "Save to draft folder"
 msgstr "Sačuvaj u direktorijum nedovršeno"
 
-#: src/compose.c:4478
+#: src/compose.c:4471
 msgid "Insert"
 msgstr "Unesi"
 
-#: src/compose.c:4479
+#: src/compose.c:4472
 msgid "Insert file"
 msgstr "Unesi datoteku"
 
-#: src/compose.c:4487
+#: src/compose.c:4480
 msgid "Attach"
 msgstr "Prikači"
 
-#: src/compose.c:4488
+#: src/compose.c:4481
 msgid "Attach file"
 msgstr "Prikači datoteku"
 
 #. signature
-#: src/compose.c:4498 src/prefs_account.c:1391 src/prefs_common.c:1356
+#: src/compose.c:4491 src/prefs_account.c:1391 src/prefs_common.c:1356
 msgid "Signature"
 msgstr "Potpis"
 
-#: src/compose.c:4499
+#: src/compose.c:4492
 msgid "Insert signature"
 msgstr "Unesi potpis"
 
-#: src/compose.c:4508 src/prefs_common.c:1378 src/prefs_common.c:2382
+#: src/compose.c:4501 src/prefs_common.c:1378 src/prefs_common.c:2382
 msgid "Editor"
 msgstr "Editor"
 
-#: src/compose.c:4509
+#: src/compose.c:4502
 msgid "Edit with external editor"
 msgstr "Izmeni sa nezavisnim ediorom"
 
-#: src/compose.c:4517
+#: src/compose.c:4510
 msgid "Linewrap"
 msgstr "Sažimanje"
 
-#: src/compose.c:4518
+#: src/compose.c:4511
 msgid "Wrap all long lines"
 msgstr "Sažmi sve duge linije"
 
-#: src/compose.c:4897
+#: src/compose.c:4891
 msgid "Invalid MIME type."
 msgstr "Pogrešan MIME tip"
 
-#: src/compose.c:4915
+#: src/compose.c:4909
 msgid "File doesn't exist or is empty."
 msgstr "Datoteka ne postoji ili je prazna."
 
-#: src/compose.c:4983
+#: src/compose.c:4977
 #, fuzzy
 msgid "Properties"
 msgstr "Svojstva"
 
-#: src/compose.c:5003
+#: src/compose.c:4997
 msgid "Encoding"
 msgstr "Kodiranje"
 
-#: src/compose.c:5026 src/prefs_folder_item.c:183
+#: src/compose.c:5020 src/prefs_folder_item.c:183
 msgid "Path"
 msgstr "Putanja"
 
-#: src/compose.c:5027
+#: src/compose.c:5021
 msgid "File name"
 msgstr "Ime datoteke"
 
-#: src/compose.c:5185
+#: src/compose.c:5179
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Naredba za nezavisni editor je pogrešna: `%s'\n"
 
-#: src/compose.c:5211
+#: src/compose.c:5205
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1225,75 +1225,75 @@ msgstr ""
 "Nasilno prekinuti proces?\n"
 "grupa procesa: %d"
 
-#: src/compose.c:5228
+#: src/compose.c:5222
 #, c-format
 msgid "Terminated process group id: %d"
 msgstr "Prekinuta grupa procesa: %d"
 
-#: src/compose.c:5229
+#: src/compose.c:5223
 #, c-format
 msgid "Temporary file: %s"
 msgstr "Privremena datoteka: %s"
 
-#: src/compose.c:5253
+#: src/compose.c:5247
 msgid "Compose: input from monitoring process\n"
 msgstr "Napiši: unos iz procesa praćenja\n"
 
 #. failed
-#: src/compose.c:5284
+#: src/compose.c:5278
 msgid "Couldn't exec external editor\n"
 msgstr "Ne mogu pokrenuti nezavisni editor\n"
 
-#: src/compose.c:5288
+#: src/compose.c:5282
 msgid "Couldn't write to file\n"
 msgstr "Ne mogu snimiti u datoteku\n"
 
-#: src/compose.c:5290
+#: src/compose.c:5284
 msgid "Pipe read failed\n"
 msgstr "Čitanje pipe-a nije uspelo\n"
 
-#: src/compose.c:5596 src/compose.c:5604 src/compose.c:5610
+#: src/compose.c:5590 src/compose.c:5598 src/compose.c:5604
 msgid "Can't queue the message."
 msgstr "Ne mogu odložiti poruku."
 
-#: src/compose.c:5701
+#: src/compose.c:5695
 #, fuzzy
 msgid "Select files"
 msgstr "Odaberite datoteku"
 
-#: src/compose.c:5723
+#: src/compose.c:5717
 msgid "Select file"
 msgstr "Odaberite datoteku"
 
-#: src/compose.c:5760
+#: src/compose.c:5754
 #, fuzzy
 msgid "Save message"
 msgstr "Pošalji poruku"
 
-#: src/compose.c:5761
+#: src/compose.c:5755
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Ova poruka je promenjena, odbaciti?"
 
-#: src/compose.c:5763
+#: src/compose.c:5757
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:5805
+#: src/compose.c:5799
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Želite li primeniti šablon `%s'?"
 
-#: src/compose.c:5807
+#: src/compose.c:5801
 msgid "Apply template"
 msgstr "Primeni šablon"
 
-#: src/compose.c:5808
+#: src/compose.c:5802
 #, fuzzy
 msgid "_Replace"
 msgstr "Zameni"
 
-#: src/compose.c:5808
+#: src/compose.c:5802
 #, fuzzy
 msgid "_Insert"
 msgstr "Unesi"
@@ -1740,12 +1740,12 @@ msgstr "Postavljam info direktorijuma...\n"
 msgid "Setting folder info..."
 msgstr "Postavljam info direktorijuma..."
 
-#: src/folderview.c:805 src/mainwindow.c:3301 src/setup.c:81
+#: src/folderview.c:805 src/mainwindow.c:3272 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Pretražujem direktorijume %s%c%s ..."
 
-#: src/folderview.c:809 src/mainwindow.c:3306 src/setup.c:86
+#: src/folderview.c:809 src/mainwindow.c:3277 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Pretražujem direktorijum %s ..."
@@ -2071,45 +2071,45 @@ msgstr "Način provere identieta"
 msgid "IMAP4 login failed.\n"
 msgstr "IMAP4 login nije uspeo.\n"
 
-#: src/imap.c:3522
+#: src/imap.c:3528
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "ne mogu dodati %s na %s\n"
 
-#: src/imap.c:3529
+#: src/imap.c:3535
 msgid "(sending file...)"
 msgstr "(šaljem datoteku...)"
 
-#: src/imap.c:3557
+#: src/imap.c:3563
 #, fuzzy, c-format
 msgid "can't append message to %s\n"
 msgstr "ne mogu dodati poruku %s\n"
 
-#: src/imap.c:3589
+#: src/imap.c:3595
 #, fuzzy, c-format
 msgid "can't copy %s to %s\n"
 msgstr "ne mogu kopirati %d u %s\n"
 
-#: src/imap.c:3613
+#: src/imap.c:3619
 #, fuzzy, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "grečka prilikom imap naredbe: STORE %d:%d %s\n"
 
-#: src/imap.c:3627
+#: src/imap.c:3633
 msgid "error while imap command: EXPUNGE\n"
 msgstr "greška prilikom imap naredbe: EXPUNGE\n"
 
-#: src/imap.c:3640
+#: src/imap.c:3646
 #, fuzzy
 msgid "error while imap command: CLOSE\n"
 msgstr "greška prilikom imap naredbe: EXPUNGE\n"
 
-#: src/imap.c:3873
+#: src/imap.c:3879
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv ne može prebaciti UTF-7 to %s\n"
 
-#: src/imap.c:3903
+#: src/imap.c:3909
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv ne može prebaciti %s to UTF-7\n"
@@ -2211,7 +2211,7 @@ msgstr "Unesi LDIF datoteku u Adresar"
 msgid "Prev"
 msgstr "Preth."
 
-#: src/importldif.c:768 src/mainwindow.c:2321
+#: src/importldif.c:768 src/mainwindow.c:2303
 msgid "Next"
 msgstr "Sled."
 
@@ -2551,647 +2551,647 @@ msgid ""
 "Do you want to migrate it?"
 msgstr ""
 
-#: src/mainwindow.c:471
+#: src/mainwindow.c:462
 msgid "/_File/_Folder"
 msgstr "/_Datoteka/_Direktorijum"
 
-#: src/mainwindow.c:472
+#: src/mainwindow.c:463
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/_Datoteka/_Direktorijum/Kreiraj _novi direktorijum..."
 
-#: src/mainwindow.c:474
+#: src/mainwindow.c:465
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/_Datoteka/_Direktorijum/_Preimenuj direktorijum..."
 
-#: src/mainwindow.c:475
+#: src/mainwindow.c:466
 #, fuzzy
 msgid "/_File/_Folder/_Move folder..."
 msgstr "/_Datoteka/_Direktorijum/_Preimenuj direktorijum..."
 
-#: src/mainwindow.c:476
+#: src/mainwindow.c:467
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/_Datoteka/_Direktorijum/_Obriši direktorijum"
 
-#: src/mainwindow.c:477
+#: src/mainwindow.c:468
 #, fuzzy
 msgid "/_File/_Mailbox"
 msgstr "/_Datoteka/Dodaj _sanduče..."
 
-#: src/mainwindow.c:478
+#: src/mainwindow.c:469
 #, fuzzy
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/_Datoteka/Dodaj _sanduče..."
 
-#: src/mainwindow.c:479
+#: src/mainwindow.c:470
 #, fuzzy
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/_Ukloni sanduče"
 
-#: src/mainwindow.c:480 src/mainwindow.c:485
+#: src/mainwindow.c:471 src/mainwindow.c:476
 #, fuzzy
 msgid "/_File/_Mailbox/---"
 msgstr "/_Datoteka/_Direktorijum"
 
-#: src/mainwindow.c:481
+#: src/mainwindow.c:472
 #, fuzzy
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "/_Proveri ima li novih poruka"
 
-#: src/mainwindow.c:483
+#: src/mainwindow.c:474
 #, fuzzy
 msgid "/_File/_Mailbox/Check for new messages in _all mailboxes"
 msgstr "/_Datoteka/_Proveri nove poruke u svim direktorijumima"
 
-#: src/mainwindow.c:486
+#: src/mainwindow.c:477
 #, fuzzy
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "/Osv_eži stablo direktorijuma"
 
-#: src/mainwindow.c:489
+#: src/mainwindow.c:480
 msgid "/_File/_Import mbox file..."
 msgstr "/_Datoteka/_Unos mbox datoteku..."
 
-#: src/mainwindow.c:490
+#: src/mainwindow.c:481
 msgid "/_File/_Export to mbox file..."
 msgstr "/_Datoteka/_Izvoz u mbox datoteku..."
 
-#: src/mainwindow.c:492
+#: src/mainwindow.c:483
 #, fuzzy
 msgid "/_File/Empty all _trash"
 msgstr "/_Datotkea/Isprazni s_meće"
 
-#: src/mainwindow.c:494 src/messageview.c:138
+#: src/mainwindow.c:485 src/messageview.c:138
 msgid "/_File/_Save as..."
 msgstr "/_Datoteka/Snimanje _kao..."
 
-#: src/mainwindow.c:495 src/messageview.c:139
+#: src/mainwindow.c:486 src/messageview.c:139
 msgid "/_File/_Print..."
 msgstr "/_Datoteka/Štampanje..."
 
-#: src/mainwindow.c:497
+#: src/mainwindow.c:488
 #, fuzzy
 msgid "/_File/_Work offline"
 msgstr "/_Datoteka/_Unesi datoteku"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:500
+#: src/mainwindow.c:491
 msgid "/_File/E_xit"
 msgstr "/_Datoteka/I_zlaz"
 
-#: src/mainwindow.c:505
+#: src/mainwindow.c:496
 msgid "/_Edit/Select _thread"
 msgstr "/_Izmene/Odaberi _thread"
 
-#: src/mainwindow.c:507 src/messageview.c:147
+#: src/mainwindow.c:498 src/messageview.c:147
 msgid "/_Edit/_Find in current message..."
 msgstr "/_Izmne/P_retraga u trenutnoj poruci..."
 
-#: src/mainwindow.c:509
+#: src/mainwindow.c:500
 msgid "/_Edit/_Search messages..."
 msgstr "/_Izmene/_Traži poruke..."
 
-#: src/mainwindow.c:512
+#: src/mainwindow.c:503
 msgid "/_View/Show or hi_de"
 msgstr "/_Pregled/Prikaži ili s_kloni"
 
-#: src/mainwindow.c:513
+#: src/mainwindow.c:504
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/_Pregled/Prikaži ili s_kloni/_Drvo direktorijuma"
 
-#: src/mainwindow.c:515
+#: src/mainwindow.c:506
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/_Pregled/Prikaži ili s_kloni/_Pregled poruka"
 
-#: src/mainwindow.c:517
+#: src/mainwindow.c:508
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/_Pregled/Prikaži ili s_kloni/_Traka za alat"
 
-#: src/mainwindow.c:519
+#: src/mainwindow.c:510
 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:521
+#: src/mainwindow.c:512
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/_Pregled/Prikaži ili s_kloni/_Traka alata/_Ikone"
 
-#: src/mainwindow.c:523
+#: src/mainwindow.c:514
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/_Pregled/Prikaži ili s_kloni/_Traka alata/_Tekst"
 
-#: src/mainwindow.c:525
+#: src/mainwindow.c:516
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/_Pregled/Prikaži ili s_kloni/_Traka alata/_Ništa"
 
-#: src/mainwindow.c:527
+#: src/mainwindow.c:518
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/_Pregled/Prikaži ili s_kloni/Stat_us traka"
 
-#: src/mainwindow.c:530
+#: src/mainwindow.c:521
 msgid "/_View/Separate f_older tree"
 msgstr "/_Pregled/Odvoji sta_blo direktorijuma"
 
-#: src/mainwindow.c:531
+#: src/mainwindow.c:522
 #, fuzzy
 msgid "/_View/Separate _message view"
 msgstr "/_Pregled/Odvoji pre_gled poruka"
 
-#: src/mainwindow.c:533
+#: src/mainwindow.c:524
 msgid "/_View/_Sort"
 msgstr "/_Pregled/_Složi"
 
-#: src/mainwindow.c:534
+#: src/mainwindow.c:525
 msgid "/_View/_Sort/by _number"
 msgstr "/_Pregled/_Složi/po _broju"
 
-#: src/mainwindow.c:535
+#: src/mainwindow.c:526
 msgid "/_View/_Sort/by s_ize"
 msgstr "/_Pregled/_Složi/po _veličini"
 
-#: src/mainwindow.c:536
+#: src/mainwindow.c:527
 msgid "/_View/_Sort/by _date"
 msgstr "/_Pregled/_Složi/po _datumu"
 
-#: src/mainwindow.c:537
+#: src/mainwindow.c:528
 msgid "/_View/_Sort/by _from"
 msgstr "/_Pregled/_Složi/po _pošiljaocu"
 
-#: src/mainwindow.c:538
+#: src/mainwindow.c:529
 #, fuzzy
 msgid "/_View/_Sort/by _recipient"
 msgstr "/_Pregled/_Složi/po _veličini"
 
-#: src/mainwindow.c:539
+#: src/mainwindow.c:530
 msgid "/_View/_Sort/by _subject"
 msgstr "/_Pregled/_Složi/po _temi"
 
-#: src/mainwindow.c:540
+#: src/mainwindow.c:531
 msgid "/_View/_Sort/by _color label"
 msgstr "/_Pregled/_Složi/po oznaci bo_je"
 
-#: src/mainwindow.c:542
+#: src/mainwindow.c:533
 msgid "/_View/_Sort/by _mark"
 msgstr "/_Pregled/_Složi/po _oznaci"
 
-#: src/mainwindow.c:543
+#: src/mainwindow.c:534
 msgid "/_View/_Sort/by _unread"
 msgstr "/_Pregled/_Složi/po _nepročitanom"
 
-#: src/mainwindow.c:544
+#: src/mainwindow.c:535
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/_Pregled/_Složi/po dodat_ku"
 
-#: src/mainwindow.c:546
+#: src/mainwindow.c:537
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/_Pregled/_Složi/Nemoj složiti"
 
-#: src/mainwindow.c:547 src/mainwindow.c:550
+#: src/mainwindow.c:538 src/mainwindow.c:541
 msgid "/_View/_Sort/---"
 msgstr "/_Pregled/_Složi/---"
 
-#: src/mainwindow.c:548
+#: src/mainwindow.c:539
 msgid "/_View/_Sort/Ascending"
 msgstr "/_Pregled/_Složi/Rastuće"
 
-#: src/mainwindow.c:549
+#: src/mainwindow.c:540
 msgid "/_View/_Sort/Descending"
 msgstr "/_Pregled/_Složi/Opadajuće"
 
-#: src/mainwindow.c:551
+#: src/mainwindow.c:542
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/_Pregled/_Složi/Privuci po te_mi"
 
-#: src/mainwindow.c:553
+#: src/mainwindow.c:544
 msgid "/_View/Th_read view"
 msgstr "/_Pregled/Th_read izgled"
 
-#: src/mainwindow.c:554
+#: src/mainwindow.c:545
 msgid "/_View/E_xpand all threads"
 msgstr "/_Pregled/Proširi kompletan t_hread"
 
-#: src/mainwindow.c:555
+#: src/mainwindow.c:546
 msgid "/_View/Co_llapse all threads"
 msgstr "/_Pregled/Skupi komp_letan thread"
 
-#: src/mainwindow.c:556
+#: src/mainwindow.c:547
 msgid "/_View/Set display _item..."
 msgstr "/_Pregled/Postavi po_jedinosti prikaza..."
 
-#: src/mainwindow.c:559
+#: src/mainwindow.c:550
 msgid "/_View/_Go to"
 msgstr "/_Pregled/_Idi do"
 
-#: src/mainwindow.c:560
+#: src/mainwindow.c:551
 msgid "/_View/_Go to/_Prev message"
 msgstr "/_Pregled/_Idi do/_Prethodne poruke"
 
-#: src/mainwindow.c:561
+#: src/mainwindow.c:552
 msgid "/_View/_Go to/_Next message"
 msgstr "/_Pregled/_Idi do/_Sledeće poruke"
 
-#: src/mainwindow.c:562 src/mainwindow.c:567 src/mainwindow.c:570
-#: src/mainwindow.c:575 src/mainwindow.c:580
+#: src/mainwindow.c:553 src/mainwindow.c:558 src/mainwindow.c:561
+#: src/mainwindow.c:566 src/mainwindow.c:571
 msgid "/_View/_Go to/---"
 msgstr "/_Pregled/_Idi do/---"
 
-#: src/mainwindow.c:563
+#: src/mainwindow.c:554
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/_Pregled/_Idi do/Prethodne _nepročitane poruke"
 
-#: src/mainwindow.c:565
+#: src/mainwindow.c:556
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/_Pregled/_Idi do/S_ledeće nepročitane poruke"
 
-#: src/mainwindow.c:568
+#: src/mainwindow.c:559
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/_Pregled/_Idi do/Prethodne n_ove poruke"
 
-#: src/mainwindow.c:569
+#: src/mainwindow.c:560
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/_Pregled/_Idi do/Sledeće no_ve poruke"
 
-#: src/mainwindow.c:571
+#: src/mainwindow.c:562
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/_Pregled/_Idi do/Prethodne oz_načene poruke"
 
-#: src/mainwindow.c:573
+#: src/mainwindow.c:564
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/_Pregled/_Idi do/Sledeće o_značene poruke"
 
-#: src/mainwindow.c:576
+#: src/mainwindow.c:567
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/_Pregled/_Idi do/Prethodne etiketirane poruke"
 
-#: src/mainwindow.c:578
+#: src/mainwindow.c:569
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/_Pregled/_Idi do/Sledeće etiketirane poruke"
 
-#: src/mainwindow.c:581
+#: src/mainwindow.c:572
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Pregled/_Idi do/Dru_gog direktorijuma..."
 
-#: src/mainwindow.c:590 src/messageview.c:158
+#: src/mainwindow.c:581 src/messageview.c:158
 #, fuzzy
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Pregled/_Znakovni standard/_Auto detekcija"
 
-#: src/mainwindow.c:641 src/messageview.c:202
+#: src/mainwindow.c:632 src/messageview.c:202
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Pregled/_Znakovni standard/Japan (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:643 src/messageview.c:204
+#: src/mainwindow.c:634 src/messageview.c:204
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Pregled/_Znakovni standard/Japan (_EUC-JP)"
 
-#: src/mainwindow.c:645 src/messageview.c:206
+#: src/mainwindow.c:636 src/messageview.c:206
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Pregled/_Znakovni standard/Japan (_Shift__JIS)"
 
-#: src/mainwindow.c:657 src/messageview.c:217
+#: src/mainwindow.c:648 src/messageview.c:217
 #, fuzzy
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Pregled/_Znakovni standard/Kina (ISO-2022-_CN)"
 
-#: src/mainwindow.c:663 src/messageview.c:222
+#: src/mainwindow.c:654 src/messageview.c:222
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Pregled/_Znakovni standard/Koreja (ISO-2022-KR)"
 
-#: src/mainwindow.c:676 src/summaryview.c:401
+#: src/mainwindow.c:667 src/summaryview.c:401
 msgid "/_View/Open in new _window"
 msgstr "/_Pregled/Otvori u novom _prozoru"
 
-#: src/mainwindow.c:677 src/messageview.c:234
+#: src/mainwindow.c:668 src/messageview.c:234
 msgid "/_View/Mess_age source"
 msgstr "/_Pregled/Iz_vor poruke"
 
-#: src/mainwindow.c:678 src/messageview.c:235
+#: src/mainwindow.c:669 src/messageview.c:235
 msgid "/_View/Show all _header"
 msgstr "/_Pregled/Prikaži kompletno _zaglavlje"
 
-#: src/mainwindow.c:680
+#: src/mainwindow.c:671
 msgid "/_View/_Update summary"
 msgstr "/_Pregled/_Osveži rezime"
 
-#: src/mainwindow.c:682 src/messageview.c:237
+#: src/mainwindow.c:673 src/messageview.c:237
 msgid "/_Message"
 msgstr "/_Poruka"
 
-#: src/mainwindow.c:683
+#: src/mainwindow.c:674
 #, fuzzy
 msgid "/_Message/Recei_ve"
 msgstr "/_Poruka/I_zmeni/"
 
-#: src/mainwindow.c:684
+#: src/mainwindow.c:675
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/_Poruka/Prove_ri sa svih naloga"
 
-#: src/mainwindow.c:686
+#: src/mainwindow.c:677
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/_Poruka/Prove_ri sa svih naloga"
 
-#: src/mainwindow.c:688
+#: src/mainwindow.c:679
 #, fuzzy
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/_Poruka/Prekini pri_manje"
 
-#: src/mainwindow.c:690
+#: src/mainwindow.c:681
 #, fuzzy
 msgid "/_Message/Recei_ve/---"
 msgstr "/_Poruka/I_zmeni/"
 
-#: src/mainwindow.c:691
+#: src/mainwindow.c:682
 msgid "/_Message/_Send queued messages"
 msgstr "/_Poruka/Pošalji _odložene poruke"
 
-#: src/mainwindow.c:692 src/mainwindow.c:694 src/mainwindow.c:701
-#: src/mainwindow.c:706 src/mainwindow.c:710 src/mainwindow.c:719
-#: src/mainwindow.c:722 src/messageview.c:240 src/messageview.c:248
+#: src/mainwindow.c:683 src/mainwindow.c:685 src/mainwindow.c:692
+#: src/mainwindow.c:697 src/mainwindow.c:701 src/mainwindow.c:710
+#: src/mainwindow.c:713 src/messageview.c:240 src/messageview.c:248
 #: src/messageview.c:253
 msgid "/_Message/---"
 msgstr "/_Poruka/---"
 
-#: src/mainwindow.c:693 src/messageview.c:238
+#: src/mainwindow.c:684 src/messageview.c:238
 msgid "/_Message/Compose _new message"
 msgstr "/_Poruka/Sastavi _novu poruku"
 
-#: src/mainwindow.c:695 src/messageview.c:241
+#: src/mainwindow.c:686 src/messageview.c:241
 msgid "/_Message/_Reply"
 msgstr "/_Poruka/O_dgovor"
 
-#: src/mainwindow.c:696
+#: src/mainwindow.c:687
 msgid "/_Message/Repl_y to"
 msgstr "/_Poruka/O_dgovori"
 
-#: src/mainwindow.c:697 src/messageview.c:242
+#: src/mainwindow.c:688 src/messageview.c:242
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Poruka/Odgovori/svim_a"
 
-#: src/mainwindow.c:698 src/messageview.c:244
+#: src/mainwindow.c:689 src/messageview.c:244
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Poruka/Odgovori/pošil_jaocu"
 
-#: src/mainwindow.c:699 src/messageview.c:246
+#: src/mainwindow.c:690 src/messageview.c:246
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Poruka/Odgovori/li_sti"
 
-#: src/mainwindow.c:702 src/messageview.c:249
+#: src/mainwindow.c:693 src/messageview.c:249
 msgid "/_Message/_Forward"
 msgstr "/_Poruka/_Prosledi"
 
-#: src/mainwindow.c:703 src/messageview.c:250
+#: src/mainwindow.c:694 src/messageview.c:250
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Poruka/P_rosledi kao spajalicu"
 
-#: src/mainwindow.c:705 src/messageview.c:252
+#: src/mainwindow.c:696 src/messageview.c:252
 msgid "/_Message/Redirec_t"
 msgstr "/_Poruka/Preus_meri"
 
-#: src/mainwindow.c:707
+#: src/mainwindow.c:698
 msgid "/_Message/M_ove..."
 msgstr "/_Poruka/Premeštanje..."
 
-#: src/mainwindow.c:708
+#: src/mainwindow.c:699
 msgid "/_Message/_Copy..."
 msgstr "/_Poruka/_Kopiranje..."
 
-#: src/mainwindow.c:709
+#: src/mainwindow.c:700
 msgid "/_Message/_Delete"
 msgstr "/_Poruka/Brisanje..."
 
-#: src/mainwindow.c:711
+#: src/mainwindow.c:702
 msgid "/_Message/_Mark"
 msgstr "/_Poruka/Označi"
 
-#: src/mainwindow.c:712
+#: src/mainwindow.c:703
 msgid "/_Message/_Mark/_Mark"
 msgstr "/_Poruka/O_znači/_Označi"
 
-#: src/mainwindow.c:713
+#: src/mainwindow.c:704
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/_Poruka/O_znači/_Ukloni oznaku"
 
-#: src/mainwindow.c:714
+#: src/mainwindow.c:705
 msgid "/_Message/_Mark/---"
 msgstr "/_Poruka/O_znači/---"
 
-#: src/mainwindow.c:715
+#: src/mainwindow.c:706
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/_Poruka/O_znači/Označi kao _nepročitano"
 
-#: src/mainwindow.c:716
+#: src/mainwindow.c:707
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/_Poruka/O_znači/Označi kao _pročitano"
 
-#: src/mainwindow.c:718
+#: src/mainwindow.c:709
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/_Poruka/O_znači/Označi sve _pročitano"
 
-#: src/mainwindow.c:720
+#: src/mainwindow.c:711
 #, fuzzy
 msgid "/_Message/Set as _junk mail"
 msgstr "/_Poruka/Prover_i novu poštu"
 
-#: src/mainwindow.c:721
+#: src/mainwindow.c:712
 #, fuzzy
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/_Poruka/Prover_i novu poštu"
 
-#: src/mainwindow.c:723 src/messageview.c:254
+#: src/mainwindow.c:714 src/messageview.c:254
 msgid "/_Message/Re-_edit"
 msgstr "/_Poruka/I_zmeni/"
 
-#: src/mainwindow.c:727
+#: src/mainwindow.c:718
 #, fuzzy
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/_Alati/Dodaj pošiljaoca u adresar"
 
-#: src/mainwindow.c:730
+#: src/mainwindow.c:721
 #, fuzzy
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/_Alati/_Filtriraj poruke"
 
-#: src/mainwindow.c:732
+#: src/mainwindow.c:723
 #, fuzzy
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Alati/_Filtriraj poruke"
 
-#: src/mainwindow.c:734 src/messageview.c:261
+#: src/mainwindow.c:725 src/messageview.c:261
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Alati/_Napravi pravilo za filtriranje"
 
-#: src/mainwindow.c:735 src/messageview.c:263
+#: src/mainwindow.c:726 src/messageview.c:263
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Alati/_Napravi pravilo za filtriranje/_Automatski"
 
-#: src/mainwindow.c:737 src/messageview.c:265
+#: src/mainwindow.c:728 src/messageview.c:265
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Alati/_Napravi pravilo za filtriranje/Po _Od"
 
-#: src/mainwindow.c:739 src/messageview.c:267
+#: src/mainwindow.c:730 src/messageview.c:267
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Alati/_Napravi pravilo za filtriranje/Po _Za"
 
-#: src/mainwindow.c:741 src/messageview.c:269
+#: src/mainwindow.c:732 src/messageview.c:269
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Alati/_Napravi pravilo za filtriranje/Po _temi"
 
-#: src/mainwindow.c:744
+#: src/mainwindow.c:735
 #, fuzzy
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/_Alati/_Filtriraj poruke"
 
-#: src/mainwindow.c:746
+#: src/mainwindow.c:737
 #, fuzzy
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/_Alati/_Filtriraj poruke"
 
-#: src/mainwindow.c:751
+#: src/mainwindow.c:742
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/_Alati/_Obriši duple poruke"
 
-#: src/mainwindow.c:754
+#: src/mainwindow.c:745
 msgid "/_Tools/E_xecute"
 msgstr "/_Alati/_Izvrši"
 
-#: src/mainwindow.c:756
+#: src/mainwindow.c:747
 msgid "/_Tools/_Log window"
 msgstr "/_Alati/Proyor za logove"
 
-#: src/mainwindow.c:758
+#: src/mainwindow.c:749
 msgid "/_Configuration"
 msgstr "/_Konfiguracija"
 
-#: src/mainwindow.c:759
+#: src/mainwindow.c:750
 msgid "/_Configuration/_Common preferences..."
 msgstr "/_Konfiguracija/U_običajene postavke..."
 
-#: src/mainwindow.c:761
+#: src/mainwindow.c:752
 msgid "/_Configuration/_Filter setting..."
 msgstr "/_Konfiguracija/Postavke _filtera..."
 
-#: src/mainwindow.c:763
+#: src/mainwindow.c:754
 msgid "/_Configuration/_Template..."
 msgstr "/_Konfiguracija/_Šablon..."
 
-#: src/mainwindow.c:764
+#: src/mainwindow.c:755
 msgid "/_Configuration/_Actions..."
 msgstr "/_Konfiguracija/_Akcije..."
 
-#: src/mainwindow.c:765
+#: src/mainwindow.c:756
 msgid "/_Configuration/---"
 msgstr "/_Konfiguracija/---"
 
-#: src/mainwindow.c:766
+#: src/mainwindow.c:757
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Konfiguracija/_Postavke za trenutni nalog..."
 
-#: src/mainwindow.c:768
+#: src/mainwindow.c:759
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Konfiguracija/Napravi _nov nalog..."
 
-#: src/mainwindow.c:770
+#: src/mainwindow.c:761
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Konfiguracija/_Izmeni naloge..."
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:763
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Konfiguracija/Promeni _trenutni nalog"
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:767
 msgid "/_Help/_Manual"
 msgstr "/_Pomoć/_Priručnik"
 
-#: src/mainwindow.c:777
+#: src/mainwindow.c:768
 msgid "/_Help/_Manual/_English"
 msgstr "/_Pomoć/_Priručnik/_Engleski"
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:769
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/_Pomoć/_Priručnik/_Japanski"
 
-#: src/mainwindow.c:779
+#: src/mainwindow.c:770
 msgid "/_Help/_FAQ"
 msgstr "/_Pomoć/_FAQ"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:771
 msgid "/_Help/_FAQ/_English"
 msgstr "/_Pomoć/_FAQ/_Engleski"
 
-#: src/mainwindow.c:781
+#: src/mainwindow.c:772
 msgid "/_Help/_FAQ/_German"
 msgstr "/_Pomoć/_FAQ/_Nemački"
 
-#: src/mainwindow.c:782
+#: src/mainwindow.c:773
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/_Pomoć/_FAQ/_Španski"
 
-#: src/mainwindow.c:783
+#: src/mainwindow.c:774
 msgid "/_Help/_FAQ/_French"
 msgstr "/_Pomoć/_FAQ/_Francuski"
 
-#: src/mainwindow.c:784
+#: src/mainwindow.c:775
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/_Pomoć/_FAQ/_Italijanski"
 
-#: src/mainwindow.c:785
+#: src/mainwindow.c:776
 msgid "/_Help/---"
 msgstr "/_Pomoć/---"
 
-#: src/mainwindow.c:825
+#: src/mainwindow.c:816
 msgid "Creating main window...\n"
 msgstr "Kreiranje glavnih prozora...\n"
 
-#: src/mainwindow.c:987
+#: src/mainwindow.c:973
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Glavni Prozor: prikaz boje %d nije uspeo\n"
 
-#: src/mainwindow.c:1071 src/summaryview.c:2020 src/summaryview.c:2105
+#: src/mainwindow.c:1057 src/summaryview.c:2020 src/summaryview.c:2105
 #: src/summaryview.c:3342 src/summaryview.c:3415 src/summaryview.c:3728
 msgid "done.\n"
 msgstr "gotovo.\n"
 
-#: src/mainwindow.c:1196 src/mainwindow.c:1237 src/mainwindow.c:1265
+#: src/mainwindow.c:1182 src/mainwindow.c:1223 src/mainwindow.c:1251
 msgid "Untitled"
 msgstr "Neimenovano"
 
-#: src/mainwindow.c:1266
+#: src/mainwindow.c:1252
 msgid "none"
 msgstr "ništa"
 
-#: src/mainwindow.c:1316
+#: src/mainwindow.c:1302
 #, 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:1536
+#: src/mainwindow.c:1522
 msgid "Offline"
 msgstr ""
 
-#: src/mainwindow.c:1537
+#: src/mainwindow.c:1523
 msgid "You are offline. Go online?"
 msgstr ""
 
-#: src/mainwindow.c:1551
+#: src/mainwindow.c:1537
 #, fuzzy
 msgid "Empty all trash"
 msgstr "Isprazni smeće"
 
-#: src/mainwindow.c:1552
+#: src/mainwindow.c:1538
 #, fuzzy
 msgid "Empty messages in all trash?"
 msgstr "Isprazniti sve poruke iz smeća?"
 
-#: src/mainwindow.c:1580
+#: src/mainwindow.c:1566
 msgid "Add mailbox"
 msgstr "Dodaj sanduče"
 
-#: src/mainwindow.c:1581
+#: src/mainwindow.c:1567
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3201,16 +3201,16 @@ msgstr ""
 "Ako je unešen postojeće sanduče, automatski\n"
 "će biti pretražen."
 
-#: src/mainwindow.c:1587
+#: src/mainwindow.c:1573
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Sanduče`%s' već postoji."
 
-#: src/mainwindow.c:1592 src/setup.c:57
+#: src/mainwindow.c:1578 src/setup.c:57
 msgid "Mailbox"
 msgstr "Sanduče"
 
-#: src/mainwindow.c:1598 src/setup.c:63
+#: src/mainwindow.c:1584 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3219,153 +3219,153 @@ msgstr ""
 "Kreiranje sandučeta nije uspelo.\n"
 "Možda neke datoteke već postoje ili nemate pravo pisanja u direktoriju."
 
-#: src/mainwindow.c:1989
+#: src/mainwindow.c:1975
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Direktorijumi"
 
-#: src/mainwindow.c:2009 src/messageview.c:368
+#: src/mainwindow.c:1995 src/messageview.c:368
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Poruke"
 
-#: src/mainwindow.c:2156 src/summaryview.c:370
+#: src/mainwindow.c:2142 src/summaryview.c:370
 msgid "/_Reply"
 msgstr "/Od_govor"
 
-#: src/mainwindow.c:2157
+#: src/mainwindow.c:2143
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "Odgovori svima"
 
-#: src/mainwindow.c:2158
+#: src/mainwindow.c:2144
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/O_dgovori/_pošiljaocu"
 
-#: src/mainwindow.c:2159
+#: src/mainwindow.c:2145
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/O_dgovori/na mailing _listu"
 
-#: src/mainwindow.c:2164 src/summaryview.c:377
+#: src/mainwindow.c:2150 src/summaryview.c:377
 msgid "/_Forward"
 msgstr "/P_rosledi"
 
-#: src/mainwindow.c:2165 src/summaryview.c:378
+#: src/mainwindow.c:2151 src/summaryview.c:378
 msgid "/For_ward as attachment"
 msgstr "/Pro_sledi kao dodatak"
 
-#: src/mainwindow.c:2166 src/summaryview.c:379
+#: src/mainwindow.c:2152 src/summaryview.c:379
 msgid "/Redirec_t"
 msgstr "/Pre_usmeri"
 
-#: src/mainwindow.c:2205
+#: src/mainwindow.c:2188
 msgid "Get"
 msgstr "Primi"
 
-#: src/mainwindow.c:2206
+#: src/mainwindow.c:2189
 msgid "Incorporate new mail"
 msgstr "Prima novu poštu"
 
-#: src/mainwindow.c:2213
+#: src/mainwindow.c:2196
 msgid "Get all"
 msgstr "Primi sve"
 
-#: src/mainwindow.c:2214
+#: src/mainwindow.c:2197
 msgid "Incorporate new mail of all accounts"
 msgstr "Prima novu poštu sa svih naloga"
 
-#: src/mainwindow.c:2225
+#: src/mainwindow.c:2208
 msgid "Send queued message(s)"
 msgstr "Šalje odložene poruku/e"
 
-#: src/mainwindow.c:2235 src/prefs_account.c:721 src/prefs_common.c:949
+#: src/mainwindow.c:2218 src/prefs_account.c:721 src/prefs_common.c:949
 #: src/prefs_folder_item.c:137
 msgid "Compose"
 msgstr "Napiši"
 
-#: src/mainwindow.c:2236
+#: src/mainwindow.c:2219
 msgid "Compose new message"
 msgstr "Napiši novu poruku"
 
-#: src/mainwindow.c:2244 src/prefs_common.c:1448
+#: src/mainwindow.c:2227 src/prefs_common.c:1448
 msgid "Reply"
 msgstr "Odgovori"
 
-#: src/mainwindow.c:2245 src/mainwindow.c:2258
+#: src/mainwindow.c:2228 src/mainwindow.c:2241
 msgid "Reply to the message"
 msgstr "Odgovari na poruku"
 
-#: src/mainwindow.c:2263
+#: src/mainwindow.c:2245
 msgid "Reply all"
 msgstr "Odgovori na sve"
 
-#: src/mainwindow.c:2264
+#: src/mainwindow.c:2246
 msgid "Reply to all"
 msgstr "Odgovori svima"
 
-#: src/mainwindow.c:2272 src/prefs_filter_edit.c:741
+#: src/mainwindow.c:2254 src/prefs_filter_edit.c:741
 msgid "Forward"
 msgstr "Prosledi"
 
-#: src/mainwindow.c:2273 src/mainwindow.c:2286
+#: src/mainwindow.c:2255 src/mainwindow.c:2268
 msgid "Forward the message"
 msgstr "Prosleđuje poruku"
 
-#: src/mainwindow.c:2293
+#: src/mainwindow.c:2275
 msgid "Delete the message"
 msgstr "Obriši poruku"
 
-#: src/mainwindow.c:2301 src/prefs_common.c:1988
+#: src/mainwindow.c:2283 src/prefs_common.c:1988
 msgid "Junk"
 msgstr ""
 
-#: src/mainwindow.c:2302
+#: src/mainwindow.c:2284
 #, fuzzy
 msgid "Set as junk mail"
 msgstr "Postavi kao uobičajeni"
 
-#: src/mainwindow.c:2311
+#: src/mainwindow.c:2293
 msgid "Execute"
 msgstr "Izvrši"
 
-#: src/mainwindow.c:2312
+#: src/mainwindow.c:2294
 msgid "Execute marked process"
 msgstr "Izvrši označene procese"
 
-#: src/mainwindow.c:2322
+#: src/mainwindow.c:2304
 msgid "Next unread message"
 msgstr "Sledeća nepročitana poruka"
 
-#: src/mainwindow.c:2334
+#: src/mainwindow.c:2316
 msgid "Prefs"
 msgstr "Svojstva"
 
-#: src/mainwindow.c:2335
+#: src/mainwindow.c:2317
 msgid "Common preferences"
 msgstr "Uobičajena svojstva"
 
-#: src/mainwindow.c:2343 src/prefs_folder_item.c:261
+#: src/mainwindow.c:2325 src/prefs_folder_item.c:261
 #: src/prefs_folder_item.c:272 src/progressdialog.c:128
 msgid "Account"
 msgstr "Nalog"
 
-#: src/mainwindow.c:2344
+#: src/mainwindow.c:2326
 msgid "Account setting"
 msgstr "Podešavanja naloga"
 
-#: src/mainwindow.c:2527
+#: src/mainwindow.c:2498
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 
-#: src/mainwindow.c:2538
+#: src/mainwindow.c:2509
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 
-#: src/mainwindow.c:2731
+#: src/mainwindow.c:2702
 msgid "Exit"
 msgstr "Izlaz"
 
-#: src/mainwindow.c:2731
+#: src/mainwindow.c:2702
 msgid "Exit this program?"
 msgstr "Izlaz iz ovog programa?"
 
@@ -5607,11 +5607,11 @@ msgstr "Stvaranje dijaloga napretka...\n"
 msgid "Status"
 msgstr "Status"
 
-#: src/recv.c:113
+#: src/recv.c:112
 msgid "error occurred while retrieving data.\n"
 msgstr "došlo je do greške prilikom dohvatanja podataka.\n"
 
-#: src/recv.c:155 src/recv.c:197 src/recv.c:213
+#: src/recv.c:154 src/recv.c:196 src/recv.c:211
 msgid "Can't write to file.\n"
 msgstr "Ne mogu pisati u datoteku.\n"
 
@@ -6352,7 +6352,7 @@ msgstr ""
 msgid "%.2fGB"
 msgstr ""
 
-#: src/utils.c:2372 src/utils.c:2496
+#: src/utils.c:2386 src/utils.c:2510
 #, c-format
 msgid "writing to %s failed.\n"
 msgstr "pisanje u %s nije uspelo.\n"
diff --git a/po/sv.po b/po/sv.po
index 81ff69a4..35c25ca4 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-08-09 18:08+0900\n"
+"POT-Creation-Date: 2005-08-22 17:22+0900\n"
 "PO-Revision-Date: 2004-12-05 14:40+0100\n"
 "Last-Translator: Mattias Ostergren <spikboll@gmx.net>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -99,7 +99,7 @@ msgstr ""
 "via \"Hämta alla\""
 
 #: src/account.c:691 src/addressadd.c:192 src/addressbook.c:490
-#: src/compose.c:4081 src/editaddress.c:200 src/editaddress.c:942
+#: src/compose.c:4079 src/editaddress.c:200 src/editaddress.c:942
 #: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:265
 #: src/editjpilot.c:271 src/editldap.c:307 src/editvcard.c:184
 #: src/mimeview.c:201 src/prefs_filter.c:258 src/prefs_folder_item.c:170
@@ -237,7 +237,7 @@ msgstr "Åtgärdens användarargument"
 msgid "Add Address to Book"
 msgstr "Lägg till i adressbok"
 
-#: src/addressadd.c:202 src/compose.c:4528 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4521 src/editaddress.c:201
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "Adress"
@@ -251,7 +251,7 @@ msgstr "Kommentarer"
 msgid "Select Address Book Folder"
 msgstr "Välj adressboksmapp"
 
-#: src/addressbook.c:336 src/compose.c:495 src/mainwindow.c:470
+#: src/addressbook.c:336 src/compose.c:493 src/mainwindow.c:461
 #: src/messageview.c:137
 msgid "/_File"
 msgstr "/_Arkiv"
@@ -272,10 +272,10 @@ msgstr "/_Arkiv/Ny _JPilot"
 msgid "/_File/New _Server"
 msgstr "/_Arkiv/Ny _Server"
 
-#: src/addressbook.c:345 src/addressbook.c:348 src/compose.c:500
-#: src/compose.c:505 src/compose.c:509 src/mainwindow.c:488
-#: src/mainwindow.c:491 src/mainwindow.c:493 src/mainwindow.c:496
-#: src/mainwindow.c:498 src/messageview.c:140
+#: src/addressbook.c:345 src/addressbook.c:348 src/compose.c:498
+#: src/compose.c:503 src/compose.c:507 src/mainwindow.c:479
+#: src/mainwindow.c:482 src/mainwindow.c:484 src/mainwindow.c:487
+#: src/mainwindow.c:489 src/messageview.c:140
 msgid "/_File/---"
 msgstr "/_Arkiv/---"
 
@@ -291,7 +291,7 @@ msgstr "/_Arkiv/_Ta bort"
 msgid "/_File/_Save"
 msgstr "/_Arkiv/_Spara"
 
-#: src/addressbook.c:350 src/compose.c:510 src/messageview.c:141
+#: src/addressbook.c:350 src/compose.c:508 src/messageview.c:141
 msgid "/_File/_Close"
 msgstr "/_Arkiv/St_äng"
 
@@ -323,7 +323,7 @@ msgstr "/A_dress/_Redigera"
 msgid "/_Address/_Delete"
 msgstr "/_A_dress/_Ta bort"
 
-#: src/addressbook.c:358 src/compose.c:619 src/mainwindow.c:725
+#: src/addressbook.c:358 src/compose.c:617 src/mainwindow.c:716
 #: src/messageview.c:256
 msgid "/_Tools"
 msgstr "/V_erktyg"
@@ -332,12 +332,12 @@ msgstr "/V_erktyg"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/V_erktyg/Importera _LDIF-fil"
 
-#: src/addressbook.c:360 src/compose.c:632 src/mainwindow.c:775
+#: src/addressbook.c:360 src/compose.c:630 src/mainwindow.c:766
 #: src/messageview.c:274
 msgid "/_Help"
 msgstr "/_Hjälp"
 
-#: src/addressbook.c:361 src/compose.c:633 src/mainwindow.c:786
+#: src/addressbook.c:361 src/compose.c:631 src/mainwindow.c:777
 #: src/messageview.c:275
 msgid "/_Help/_About"
 msgstr "/_Hjälp/_Om"
@@ -354,7 +354,7 @@ msgstr "/Ny _grupp"
 msgid "/New _Folder"
 msgstr "/Ny _mapp"
 
-#: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:489
+#: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:487
 #: src/folderview.c:235 src/folderview.c:237 src/folderview.c:241
 #: src/folderview.c:252 src/folderview.c:254 src/folderview.c:256
 #: src/folderview.c:260 src/folderview.c:270 src/folderview.c:272
@@ -364,8 +364,8 @@ msgstr "/Ny _mapp"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:512
-#: src/mainwindow.c:502 src/messageview.c:143
+#: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:510
+#: src/mainwindow.c:493 src/messageview.c:143
 msgid "/_Edit"
 msgstr "/_Redigera"
 
@@ -377,7 +377,7 @@ msgstr "/_Ta bort"
 msgid "E-Mail address"
 msgstr "E-postadress"
 
-#: src/addressbook.c:495 src/compose.c:4529 src/prefs_common.c:2402
+#: src/addressbook.c:495 src/compose.c:4522 src/prefs_common.c:2402
 msgid "Address book"
 msgstr "Adressbok"
 
@@ -386,8 +386,8 @@ msgid "Name:"
 msgstr "Namn:"
 
 #. Buttons
-#: src/addressbook.c:627 src/addressbook.c:1673 src/editaddress.c:884
-#: src/editaddress.c:1017 src/mainwindow.c:2292 src/prefs_actions.c:266
+#: src/addressbook.c:627 src/addressbook.c:1674 src/editaddress.c:884
+#: src/editaddress.c:1017 src/mainwindow.c:2274 src/prefs_actions.c:266
 #: src/prefs_display_header.c:278 src/prefs_display_header.c:333
 #: src/prefs_template.c:231
 msgid "Delete"
@@ -426,7 +426,7 @@ msgstr "Ta bort adress(er)"
 msgid "Really delete the address(es)?"
 msgstr "Vill du verkligen ta bort adress(erna)?"
 
-#: src/addressbook.c:1664
+#: src/addressbook.c:1665
 #, fuzzy, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -436,38 +436,38 @@ msgstr ""
 "Tar du bara bort mappen, kommer adresserna att flyttas\n"
 "en mapp uppåt i hierarkin."
 
-#: src/addressbook.c:1667 src/folderview.c:2139
+#: src/addressbook.c:1668 src/folderview.c:2139
 msgid "Delete folder"
 msgstr "Ta bort mapp"
 
-#: src/addressbook.c:1667
+#: src/addressbook.c:1668
 #, fuzzy
 msgid "_Folder only"
 msgstr "Endast mapp"
 
-#: src/addressbook.c:1667
+#: src/addressbook.c:1668
 #, fuzzy
 msgid "Folder and _addresses"
 msgstr "Mapp och adresser"
 
-#: src/addressbook.c:1672
+#: src/addressbook.c:1673
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Vill du verkligen ta bort \"%s\" ?"
 
-#: src/addressbook.c:2352 src/addressbook.c:2485
+#: src/addressbook.c:2353 src/addressbook.c:2486
 msgid "New user, could not save index file."
 msgstr "Ny användare, kunde inte spara indexfil."
 
-#: src/addressbook.c:2356 src/addressbook.c:2489
+#: src/addressbook.c:2357 src/addressbook.c:2490
 msgid "New user, could not save address book files."
 msgstr "Ny användare, kunde inte spara adressboksfiler."
 
-#: src/addressbook.c:2366 src/addressbook.c:2499
+#: src/addressbook.c:2367 src/addressbook.c:2500
 msgid "Old address book converted successfully."
 msgstr "Den gamla adressboken är konverterad."
 
-#: src/addressbook.c:2371
+#: src/addressbook.c:2372
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -475,7 +475,7 @@ msgstr ""
 "Gammal adressbok konverterad,\n"
 "kunde inte spara ny adressindexfil"
 
-#: src/addressbook.c:2384
+#: src/addressbook.c:2385
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -483,7 +483,7 @@ msgstr ""
 "Kunde inte konvertera adressbok,\n"
 "men skapade nya tomma adressboksfiler."
 
-#: src/addressbook.c:2390
+#: src/addressbook.c:2391
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -491,7 +491,7 @@ msgstr ""
 "Kunde inte konvertera adressbok,\n"
 "kunde inte skapa nya adressboksfiler."
 
-#: src/addressbook.c:2395
+#: src/addressbook.c:2396
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -499,85 +499,85 @@ msgstr ""
 "Kunde inte konvertera adressbok,\n"
 "och kunde inte skapa nya adressboksfiler."
 
-#: src/addressbook.c:2402
+#: src/addressbook.c:2403
 msgid "Addressbook conversion error"
 msgstr "Fel vid konvertering av adressbok"
 
-#: src/addressbook.c:2406
+#: src/addressbook.c:2407
 msgid "Addressbook conversion"
 msgstr "Adressbokskonvertering"
 
-#: src/addressbook.c:2441
+#: src/addressbook.c:2442
 msgid "Addressbook Error"
 msgstr "Adressboksfel"
 
-#: src/addressbook.c:2442 src/addressbook.c:2542
+#: src/addressbook.c:2443 src/addressbook.c:2543
 msgid "Could not read address index"
 msgstr "Kunde inte läsa adressindex"
 
-#: src/addressbook.c:2504
+#: src/addressbook.c:2505
 msgid "Old address book converted, could not save new address index file"
 msgstr "Gammal adressbok konverterad, kunde inte skapa ny adressindexfil"
 
-#: src/addressbook.c:2518
+#: src/addressbook.c:2519
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr ""
 "Kunde inte konvertera adressbok, men skapade nya tomma adressboksfiler."
 
-#: src/addressbook.c:2524
+#: src/addressbook.c:2525
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr "Kunde inte konvertera adressbok, kunde inte skapa nya adressboksfiler."
 
-#: src/addressbook.c:2530
+#: src/addressbook.c:2531
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr ""
 "Kunde inte konvertera adressbok och kunde inte skapa nya adressboksfiler."
 
-#: src/addressbook.c:2548
+#: src/addressbook.c:2549
 msgid "Addressbook Conversion Error"
 msgstr "Fel vid konvertering av adressbok"
 
-#: src/addressbook.c:2554
+#: src/addressbook.c:2555
 msgid "Addressbook Conversion"
 msgstr "Adressbokskonvertering"
 
-#: src/addressbook.c:3055 src/prefs_common.c:963
+#: src/addressbook.c:3056 src/prefs_common.c:963
 msgid "Interface"
 msgstr "Gränssnitt"
 
-#: src/addressbook.c:3071 src/importldif.c:514
+#: src/addressbook.c:3072 src/importldif.c:514
 msgid "Address Book"
 msgstr "Adressbok"
 
-#: src/addressbook.c:3087
+#: src/addressbook.c:3088
 msgid "Person"
 msgstr "Person"
 
-#: src/addressbook.c:3103
+#: src/addressbook.c:3104
 msgid "EMail Address"
 msgstr "E-postadress"
 
-#: src/addressbook.c:3119
+#: src/addressbook.c:3120
 msgid "Group"
 msgstr "Grupp"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3135 src/folderview.c:346 src/prefs_account.c:1866
+#: src/addressbook.c:3136 src/folderview.c:346 src/prefs_account.c:1866
 msgid "Folder"
 msgstr "Mapp"
 
-#: src/addressbook.c:3151
+#: src/addressbook.c:3152
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3167 src/addressbook.c:3183
+#: src/addressbook.c:3168 src/addressbook.c:3184
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3199
+#: src/addressbook.c:3200
 msgid "LDAP Server"
 msgstr "LDAP-server"
 
@@ -589,7 +589,7 @@ msgstr "Vanlig adress"
 msgid "Personal address"
 msgstr "Privat adress"
 
-#: src/alertpanel.c:138 src/compose.c:5214 src/main.c:515
+#: src/alertpanel.c:138 src/compose.c:5208 src/main.c:515
 msgid "Notice"
 msgstr "Notera"
 
@@ -644,373 +644,373 @@ msgstr "Brun"
 msgid "None"
 msgstr "Ingen"
 
-#: src/compose.c:487
+#: src/compose.c:485
 msgid "/_Add..."
 msgstr "/_Lägg till..."
 
-#: src/compose.c:488
+#: src/compose.c:486
 msgid "/_Remove"
 msgstr "/_Ta bort"
 
-#: src/compose.c:490 src/folderview.c:243 src/folderview.c:262
+#: src/compose.c:488 src/folderview.c:243 src/folderview.c:262
 #: src/folderview.c:277
 msgid "/_Properties..."
 msgstr "/_Egenskaper..."
 
-#: src/compose.c:496
+#: src/compose.c:494
 msgid "/_File/_Send"
 msgstr "/_Arkiv/_Skicka"
 
-#: src/compose.c:498
+#: src/compose.c:496
 msgid "/_File/Send _later"
 msgstr "/_Arkiv/S_kicka senare"
 
-#: src/compose.c:501
+#: src/compose.c:499
 msgid "/_File/Save to _draft folder"
 msgstr "/_Arkiv/Spara i _utkast-mappen"
 
-#: src/compose.c:503
+#: src/compose.c:501
 msgid "/_File/Save and _keep editing"
 msgstr "/_Arkiv/Spara och _fortsätt redigera"
 
-#: src/compose.c:506
+#: src/compose.c:504
 msgid "/_File/_Attach file"
 msgstr "/_Arkiv/_Bifoga fil"
 
-#: src/compose.c:507
+#: src/compose.c:505
 msgid "/_File/_Insert file"
 msgstr "/_Arkiv/_Infoga fil"
 
-#: src/compose.c:508
+#: src/compose.c:506
 msgid "/_File/Insert si_gnature"
 msgstr "/_Arkiv/Infoga si_gnatur"
 
-#: src/compose.c:513
+#: src/compose.c:511
 msgid "/_Edit/_Undo"
 msgstr "/_Redigera/_Ångra"
 
-#: src/compose.c:514
+#: src/compose.c:512
 msgid "/_Edit/_Redo"
 msgstr "/_Redigera/Gör _om"
 
-#: src/compose.c:515 src/compose.c:522 src/mainwindow.c:506
+#: src/compose.c:513 src/compose.c:520 src/mainwindow.c:497
 #: src/messageview.c:146
 msgid "/_Edit/---"
 msgstr "/_Redigera/---"
 
-#: src/compose.c:516
+#: src/compose.c:514
 msgid "/_Edit/Cu_t"
 msgstr "/_Redigera/Klipp _ut"
 
-#: src/compose.c:517 src/mainwindow.c:503 src/messageview.c:144
+#: src/compose.c:515 src/mainwindow.c:494 src/messageview.c:144
 msgid "/_Edit/_Copy"
 msgstr "/_Redigera/_Kopiera"
 
-#: src/compose.c:518
+#: src/compose.c:516
 msgid "/_Edit/_Paste"
 msgstr "/_Redigera/Klistra _in"
 
-#: src/compose.c:519
+#: src/compose.c:517
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Redigera/Klistra in som _citat"
 
-#: src/compose.c:521 src/mainwindow.c:504 src/messageview.c:145
+#: src/compose.c:519 src/mainwindow.c:495 src/messageview.c:145
 msgid "/_Edit/Select _all"
 msgstr "/_Redigera/Markera _allt"
 
-#: src/compose.c:523
+#: src/compose.c:521
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/_Redigera/Bryt rader i _stycke"
 
-#: src/compose.c:525
+#: src/compose.c:523
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/_Redigera/Bryt _långa rader"
 
-#: src/compose.c:527
+#: src/compose.c:525
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Redigera/Automatisk _radbrytning"
 
-#: src/compose.c:528 src/mainwindow.c:511 src/messageview.c:150
+#: src/compose.c:526 src/mainwindow.c:502 src/messageview.c:150
 #: src/summaryview.c:400
 msgid "/_View"
 msgstr "/_Visa"
 
-#: src/compose.c:529
+#: src/compose.c:527
 msgid "/_View/_To"
 msgstr "/_Visa/_Till"
 
-#: src/compose.c:530
+#: src/compose.c:528
 msgid "/_View/_Cc"
 msgstr "/_Visa/_Kopia"
 
-#: src/compose.c:531
+#: src/compose.c:529
 msgid "/_View/_Bcc"
 msgstr "/_Visa/_Dold kopia"
 
-#: src/compose.c:532
+#: src/compose.c:530
 msgid "/_View/_Reply to"
 msgstr "/_Visa/_Svara till"
 
-#: src/compose.c:533 src/compose.c:535 src/compose.c:537 src/compose.c:539
-#: src/mainwindow.c:529 src/mainwindow.c:532 src/mainwindow.c:558
-#: src/mainwindow.c:582 src/mainwindow.c:675 src/mainwindow.c:679
+#: src/compose.c:531 src/compose.c:533 src/compose.c:535 src/compose.c:537
+#: src/mainwindow.c:520 src/mainwindow.c:523 src/mainwindow.c:549
+#: src/mainwindow.c:573 src/mainwindow.c:666 src/mainwindow.c:670
 #: src/messageview.c:233
 msgid "/_View/---"
 msgstr "/_Visa/---"
 
-#: src/compose.c:534
+#: src/compose.c:532
 msgid "/_View/_Followup to"
 msgstr "/_Visa/_Följ upp till"
 
-#: src/compose.c:536
+#: src/compose.c:534
 msgid "/_View/R_uler"
 msgstr "/_Visa/_Linjal"
 
-#: src/compose.c:538
+#: src/compose.c:536
 msgid "/_View/_Attachment"
 msgstr "/_Visa/_Bilagor"
 
-#: src/compose.c:545 src/mainwindow.c:589 src/messageview.c:157
+#: src/compose.c:543 src/mainwindow.c:580 src/messageview.c:157
 #, fuzzy
 msgid "/_View/Character _encoding"
 msgstr "/_Visa/_Sortera/Nedstigande"
 
-#: src/compose.c:546
+#: src/compose.c:544
 msgid "/_View/Character _encoding/_Automatic"
 msgstr ""
 
-#: src/compose.c:548 src/compose.c:554 src/compose.c:560 src/compose.c:564
-#: src/compose.c:570 src/compose.c:574 src/compose.c:580 src/compose.c:584
-#: src/compose.c:594 src/compose.c:598 src/compose.c:608 src/compose.c:612
-#: src/mainwindow.c:585 src/mainwindow.c:592 src/messageview.c:153
+#: src/compose.c:546 src/compose.c:552 src/compose.c:558 src/compose.c:562
+#: src/compose.c:568 src/compose.c:572 src/compose.c:578 src/compose.c:582
+#: src/compose.c:592 src/compose.c:596 src/compose.c:606 src/compose.c:610
+#: src/mainwindow.c:576 src/mainwindow.c:583 src/messageview.c:153
 #, fuzzy
 msgid "/_View/Character _encoding/---"
 msgstr "/_Visa/_Sortera/Nedstigande"
 
-#: src/compose.c:550 src/mainwindow.c:593 src/messageview.c:161
+#: src/compose.c:548 src/mainwindow.c:584 src/messageview.c:161
 #, fuzzy
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Visa/_Kodning/7 bitars ascii (US-ASC_II)"
 
-#: src/compose.c:552 src/mainwindow.c:595 src/messageview.c:164
+#: src/compose.c:550 src/mainwindow.c:586 src/messageview.c:164
 #, fuzzy
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Visa/_Kodning/Unicode (_UTF-8)"
 
-#: src/compose.c:556 src/mainwindow.c:599 src/messageview.c:167
+#: src/compose.c:554 src/mainwindow.c:590 src/messageview.c:167
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Visa/_Kodning/Västeuropeisk (ISO-8859-_1)"
 
-#: src/compose.c:558 src/mainwindow.c:601 src/messageview.c:169
+#: src/compose.c:556 src/mainwindow.c:592 src/messageview.c:169
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Visa/_Kodning/_Västeuropeisk (ISO-8859-15)"
 
-#: src/compose.c:562 src/mainwindow.c:605 src/messageview.c:172
+#: src/compose.c:560 src/mainwindow.c:596 src/messageview.c:172
 #, fuzzy
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Visa/_Kodning/Centraleuropeisk (ISO-8859-_2)"
 
-#: src/compose.c:566 src/mainwindow.c:609 src/messageview.c:175
+#: src/compose.c:564 src/mainwindow.c:600 src/messageview.c:175
 #, fuzzy
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Visa/_Kodning/_Baltisk (ISO-8859-13)"
 
-#: src/compose.c:568 src/mainwindow.c:611 src/messageview.c:177
+#: src/compose.c:566 src/mainwindow.c:602 src/messageview.c:177
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Visa/_Kodning/Baltisk (ISO-8859-_4)"
 
-#: src/compose.c:572 src/mainwindow.c:615 src/messageview.c:180
+#: src/compose.c:570 src/mainwindow.c:606 src/messageview.c:180
 #, fuzzy
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Visa/_Kodning/Grekisk (ISO-8859-_7)"
 
-#: src/compose.c:576 src/mainwindow.c:619 src/messageview.c:183
+#: src/compose.c:574 src/mainwindow.c:610 src/messageview.c:183
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Visa/_Kodning/Grekisk (ISO-8859-_7)"
 
-#: src/compose.c:578 src/mainwindow.c:621 src/messageview.c:185
+#: src/compose.c:576 src/mainwindow.c:612 src/messageview.c:185
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Visa/_Kodning/Kyrillisk (Windows-1251)"
 
-#: src/compose.c:582 src/mainwindow.c:625 src/messageview.c:188
+#: src/compose.c:580 src/mainwindow.c:616 src/messageview.c:188
 #, fuzzy
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Visa/_Kodning/Turkisk (ISO-8859-_9)"
 
-#: src/compose.c:586 src/mainwindow.c:629 src/messageview.c:191
+#: src/compose.c:584 src/mainwindow.c:620 src/messageview.c:191
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Visa/_Kodning/Kyrillisk (ISO-8859-_5)"
 
-#: src/compose.c:588 src/mainwindow.c:631 src/messageview.c:193
+#: src/compose.c:586 src/mainwindow.c:622 src/messageview.c:193
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Visa/_Kodning/Kyrillisk (KOI8-_R)"
 
-#: src/compose.c:590 src/mainwindow.c:633 src/messageview.c:195
+#: src/compose.c:588 src/mainwindow.c:624 src/messageview.c:195
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Visa/_Kodning/Kyrillisk (KOI8-_U)"
 
-#: src/compose.c:592 src/mainwindow.c:635 src/messageview.c:197
+#: src/compose.c:590 src/mainwindow.c:626 src/messageview.c:197
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Visa/_Kodning/Kyrillisk (Windows-1251)"
 
-#: src/compose.c:596 src/mainwindow.c:639 src/messageview.c:200
+#: src/compose.c:594 src/mainwindow.c:630 src/messageview.c:200
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Visa/_Kodning/Japansk (ISO-2022-_JP)"
 
-#: src/compose.c:600 src/mainwindow.c:649 src/messageview.c:209
+#: src/compose.c:598 src/mainwindow.c:640 src/messageview.c:209
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Visa/_Kodning/Förenklad kinesisk (_GB2312)"
 
-#: src/compose.c:602 src/mainwindow.c:651 src/messageview.c:211
+#: src/compose.c:600 src/mainwindow.c:642 src/messageview.c:211
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Visa/_Kodning/Förenklad kinesisk (_GB2312)"
 
-#: src/compose.c:604 src/mainwindow.c:653 src/messageview.c:213
+#: src/compose.c:602 src/mainwindow.c:644 src/messageview.c:213
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Visa/_Kodning/Traditionell kinesisk (_Big5)"
 
-#: src/compose.c:606 src/mainwindow.c:655 src/messageview.c:215
+#: src/compose.c:604 src/mainwindow.c:646 src/messageview.c:215
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Visa/_Kodning/Traditionell kinesisk (EUC-_TW)"
 
-#: src/compose.c:610 src/mainwindow.c:661 src/messageview.c:220
+#: src/compose.c:608 src/mainwindow.c:652 src/messageview.c:220
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Visa/_Kodning/Koreansk (EUC-_KR)"
 
-#: src/compose.c:614 src/mainwindow.c:667 src/messageview.c:225
+#: src/compose.c:612 src/mainwindow.c:658 src/messageview.c:225
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Visa/_Kodning/Thai (TIS-620)"
 
-#: src/compose.c:616 src/mainwindow.c:669 src/messageview.c:227
+#: src/compose.c:614 src/mainwindow.c:660 src/messageview.c:227
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Visa/_Kodning/Thai (Windows-874)"
 
-#: src/compose.c:620 src/mainwindow.c:726 src/messageview.c:257
+#: src/compose.c:618 src/mainwindow.c:717 src/messageview.c:257
 msgid "/_Tools/_Address book"
 msgstr "/V_erktyg/_Adressbok"
 
-#: src/compose.c:621
+#: src/compose.c:619
 msgid "/_Tools/_Template"
 msgstr "/V_erktyg/_Mall"
 
-#: src/compose.c:622 src/mainwindow.c:749 src/messageview.c:272
+#: src/compose.c:620 src/mainwindow.c:740 src/messageview.c:272
 msgid "/_Tools/Actio_ns"
 msgstr "/V_erktyg/_Åtgärder"
 
-#: src/compose.c:623 src/compose.c:627 src/mainwindow.c:729
-#: src/mainwindow.c:743 src/mainwindow.c:748 src/mainwindow.c:750
-#: src/mainwindow.c:753 src/mainwindow.c:755 src/messageview.c:260
+#: src/compose.c:621 src/compose.c:625 src/mainwindow.c:720
+#: src/mainwindow.c:734 src/mainwindow.c:739 src/mainwindow.c:741
+#: src/mainwindow.c:744 src/mainwindow.c:746 src/messageview.c:260
 #: src/messageview.c:271
 msgid "/_Tools/---"
 msgstr "/V_erktyg/---"
 
-#: src/compose.c:624
+#: src/compose.c:622
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/V_erktyg/Redigera med e_xtern redigerare"
 
-#: src/compose.c:628
+#: src/compose.c:626
 msgid "/_Tools/PGP Si_gn"
 msgstr "/V_erktyg/_Signera"
 
-#: src/compose.c:629
+#: src/compose.c:627
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/V_erktyg/_Kryptera"
 
-#: src/compose.c:855
+#: src/compose.c:853
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: filen finns inte\n"
 
-#: src/compose.c:954 src/compose.c:1024 src/procmsg.c:1353
+#: src/compose.c:952 src/compose.c:1022 src/procmsg.c:1353
 msgid "Can't get text part\n"
 msgstr "Kan inte läsa textdel\n"
 
-#: src/compose.c:1420
+#: src/compose.c:1418
 msgid "Quote mark format error."
 msgstr "Citationsteckensformatfel."
 
-#: src/compose.c:1432
+#: src/compose.c:1430
 msgid "Message reply/forward format error."
 msgstr "Formatfel vid meddelandesvar eller -vidarebefordran"
 
-#: src/compose.c:1801
+#: src/compose.c:1799
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Filen %s finns inte\n"
 
-#: src/compose.c:1805
+#: src/compose.c:1803
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Kan inte läsa filstorlek på %s\n"
 
-#: src/compose.c:1809
+#: src/compose.c:1807
 #, c-format
 msgid "File %s is empty."
 msgstr "Filen %s är tom."
 
-#: src/compose.c:1813
+#: src/compose.c:1811
 #, c-format
 msgid "Can't read %s."
 msgstr "kan inte läsa %s"
 
-#: src/compose.c:1848
+#: src/compose.c:1846
 #, c-format
 msgid "Message: %s"
 msgstr "Meddelande: %s"
 
-#: src/compose.c:1920 src/mimeview.c:560
+#: src/compose.c:1918 src/mimeview.c:560
 msgid "Can't get the part of multipart message."
 msgstr "Kan inte läsa delen av multipart-meddelandet."
 
-#: src/compose.c:2362
+#: src/compose.c:2360
 msgid " [Edited]"
 msgstr " [Redigerat]"
 
-#: src/compose.c:2364
+#: src/compose.c:2362
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Skriv meddelande%s"
 
-#: src/compose.c:2367
+#: src/compose.c:2365
 #, c-format
 msgid "Compose message%s"
 msgstr "Skriv meddelande%s"
 
-#: src/compose.c:2478
+#: src/compose.c:2476
 msgid "Recipient is not specified."
 msgstr "Mottagare är inte angiven."
 
-#: src/compose.c:2486
+#: src/compose.c:2484
 #, fuzzy
 msgid "Empty subject"
 msgstr "Ärende"
 
-#: src/compose.c:2487
+#: src/compose.c:2485
 msgid "Subject is empty. Send it anyway?"
 msgstr "Ämnesraden är tom. Skicka ändå?"
 
-#: src/compose.c:2538
+#: src/compose.c:2536
 msgid "can't get recipient list."
 msgstr "kan inte läsa mottagarlista"
 
-#: src/compose.c:2558
+#: src/compose.c:2556
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1018,27 +1018,27 @@ msgstr ""
 "Konto för att skicka post är inte specificerat.\n"
 "Välj ett e-postkonto innan du skickar."
 
-#: src/compose.c:2572 src/send_message.c:297
+#: src/compose.c:2570 src/send_message.c:297
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Fel uppstod när meddelandet skulle skickas till %s."
 
-#: src/compose.c:2595
+#: src/compose.c:2593
 msgid "Can't save the message to outbox."
 msgstr "Kan inte spara meddelande i kö-mappen."
 
-#: src/compose.c:2645
+#: src/compose.c:2643
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr ""
 "Kunde inte hitta någon nyckel associerad med nu aktiva nyckel-ID \"%s\"."
 
-#: src/compose.c:2709 src/compose.c:2965 src/compose.c:3028 src/compose.c:3148
-#: src/utils.c:2365
+#: src/compose.c:2707 src/compose.c:2963 src/compose.c:3026 src/compose.c:3146
+#: src/utils.c:2379
 msgid "can't change file mode\n"
 msgstr "kan inte ändra filrättigheter\n"
 
-#: src/compose.c:2741
+#: src/compose.c:2739
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1049,12 +1049,12 @@ msgstr ""
 "%s till %s.\n"
 "Skicka ändå?"
 
-#: src/compose.c:2747
+#: src/compose.c:2745
 #, fuzzy
 msgid "Code conversion error"
 msgstr "Fel vid konvertering av adressbok"
 
-#: src/compose.c:2816
+#: src/compose.c:2814
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1063,155 +1063,155 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:2820
+#: src/compose.c:2818
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3108
+#: src/compose.c:3106
 msgid "can't remove the old message\n"
 msgstr "kan inte ta bort det gamla meddelandet\n"
 
-#: src/compose.c:3126
+#: src/compose.c:3124
 msgid "queueing message...\n"
 msgstr "lägger meddelandet i kö...\n"
 
-#: src/compose.c:3208
+#: src/compose.c:3206
 msgid "can't find queue folder\n"
 msgstr "kan inte hitta kömapp\n"
 
-#: src/compose.c:3215
+#: src/compose.c:3213
 msgid "can't queue the message\n"
 msgstr "kan inte lägga meddelandet i kö\n"
 
-#: src/compose.c:3792
+#: src/compose.c:3790
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "skapat Meddelande-ID: %s\n"
 
-#: src/compose.c:3901
+#: src/compose.c:3899
 msgid "Creating compose window...\n"
 msgstr "Skapar skrivfönster...\n"
 
-#: src/compose.c:3949 src/headerview.c:54 src/summary_search.c:214
+#: src/compose.c:3947 src/headerview.c:54 src/summary_search.c:214
 msgid "From:"
 msgstr "Från:"
 
-#: src/compose.c:4021
+#: src/compose.c:4019
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/V_erktyg/_Signera"
 
-#: src/compose.c:4024
+#: src/compose.c:4022
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/V_erktyg/_Kryptera"
 
-#: src/compose.c:4062 src/compose.c:5001
+#: src/compose.c:4060 src/compose.c:4995
 msgid "MIME type"
 msgstr "MIME-typ"
 
 #. S_COL_DATE
-#: src/compose.c:4071 src/mimeview.c:192 src/prefs_filter_edit.c:585
+#: src/compose.c:4069 src/mimeview.c:192 src/prefs_filter_edit.c:585
 #: src/prefs_summary_column.c:75 src/select-keys.c:317 src/summaryview.c:4217
 msgid "Size"
 msgstr "Storlek"
 
-#: src/compose.c:4449 src/mainwindow.c:2224 src/prefs_account.c:719
+#: src/compose.c:4442 src/mainwindow.c:2207 src/prefs_account.c:719
 #: src/prefs_common.c:947
 msgid "Send"
 msgstr "Skicka"
 
-#: src/compose.c:4450
+#: src/compose.c:4443
 msgid "Send message"
 msgstr "Skicka meddelande"
 
-#: src/compose.c:4458
+#: src/compose.c:4451
 msgid "Send later"
 msgstr "Skicka senare"
 
-#: src/compose.c:4459
+#: src/compose.c:4452
 msgid "Put into queue folder and send later"
 msgstr "Placera i kömapp och skicka senare"
 
-#: src/compose.c:4467
+#: src/compose.c:4460
 msgid "Draft"
 msgstr "Utkast"
 
-#: src/compose.c:4468
+#: src/compose.c:4461
 msgid "Save to draft folder"
 msgstr "Spara i utkastsmapp"
 
-#: src/compose.c:4478
+#: src/compose.c:4471
 msgid "Insert"
 msgstr "Infoga"
 
-#: src/compose.c:4479
+#: src/compose.c:4472
 msgid "Insert file"
 msgstr "Infoga fil"
 
-#: src/compose.c:4487
+#: src/compose.c:4480
 msgid "Attach"
 msgstr "Bifoga"
 
-#: src/compose.c:4488
+#: src/compose.c:4481
 msgid "Attach file"
 msgstr "Bifoga fil"
 
 #. signature
-#: src/compose.c:4498 src/prefs_account.c:1391 src/prefs_common.c:1356
+#: src/compose.c:4491 src/prefs_account.c:1391 src/prefs_common.c:1356
 msgid "Signature"
 msgstr "Signatur"
 
-#: src/compose.c:4499
+#: src/compose.c:4492
 msgid "Insert signature"
 msgstr "Infoga signatur"
 
-#: src/compose.c:4508 src/prefs_common.c:1378 src/prefs_common.c:2382
+#: src/compose.c:4501 src/prefs_common.c:1378 src/prefs_common.c:2382
 msgid "Editor"
 msgstr "Redigerare"
 
-#: src/compose.c:4509
+#: src/compose.c:4502
 msgid "Edit with external editor"
 msgstr "Redigera med extern redigerare"
 
-#: src/compose.c:4517
+#: src/compose.c:4510
 msgid "Linewrap"
 msgstr "Radbrytning"
 
-#: src/compose.c:4518
+#: src/compose.c:4511
 msgid "Wrap all long lines"
 msgstr "Radbryt långa rader"
 
-#: src/compose.c:4897
+#: src/compose.c:4891
 msgid "Invalid MIME type."
 msgstr "Ogiltig MIME-typ"
 
-#: src/compose.c:4915
+#: src/compose.c:4909
 msgid "File doesn't exist or is empty."
 msgstr "Filen finns inte eller är tom."
 
-#: src/compose.c:4983
+#: src/compose.c:4977
 msgid "Properties"
 msgstr "Egenskaper"
 
-#: src/compose.c:5003
+#: src/compose.c:4997
 msgid "Encoding"
 msgstr "Kodning"
 
-#: src/compose.c:5026 src/prefs_folder_item.c:183
+#: src/compose.c:5020 src/prefs_folder_item.c:183
 msgid "Path"
 msgstr "Sökväg"
 
-#: src/compose.c:5027
+#: src/compose.c:5021
 msgid "File name"
 msgstr "Filnamn"
 
-#: src/compose.c:5185
+#: src/compose.c:5179
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Ogiltig kommandorad för extern redigerare: \"%s\"\n"
 
-#: src/compose.c:5211
+#: src/compose.c:5205
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1222,75 +1222,75 @@ msgstr ""
 "Framtvinga avslutning av processen?\n"
 "processgrupps-id: %d"
 
-#: src/compose.c:5228
+#: src/compose.c:5222
 #, c-format
 msgid "Terminated process group id: %d"
 msgstr "Avslutade processgrupps-id: %d"
 
-#: src/compose.c:5229
+#: src/compose.c:5223
 #, c-format
 msgid "Temporary file: %s"
 msgstr "Temporär fil: %s"
 
-#: src/compose.c:5253
+#: src/compose.c:5247
 msgid "Compose: input from monitoring process\n"
 msgstr "Skriv: indata från bevakad process\n"
 
 #. failed
-#: src/compose.c:5284
+#: src/compose.c:5278
 msgid "Couldn't exec external editor\n"
 msgstr "Kunde inte köra extern redigerare\n"
 
-#: src/compose.c:5288
+#: src/compose.c:5282
 msgid "Couldn't write to file\n"
 msgstr "Kunde inte skriva till fil\n"
 
-#: src/compose.c:5290
+#: src/compose.c:5284
 msgid "Pipe read failed\n"
 msgstr "Kunde inte läsa från rör\n"
 
-#: src/compose.c:5596 src/compose.c:5604 src/compose.c:5610
+#: src/compose.c:5590 src/compose.c:5598 src/compose.c:5604
 msgid "Can't queue the message."
 msgstr "Kan inte lägga meddelandet i kö."
 
-#: src/compose.c:5701
+#: src/compose.c:5695
 #, fuzzy
 msgid "Select files"
 msgstr "Välj fil"
 
-#: src/compose.c:5723
+#: src/compose.c:5717
 msgid "Select file"
 msgstr "Välj fil"
 
-#: src/compose.c:5760
+#: src/compose.c:5754
 #, fuzzy
 msgid "Save message"
 msgstr "Skicka meddelande"
 
-#: src/compose.c:5761
+#: src/compose.c:5755
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Detta meddelande har ändrats. Kasta det?"
 
-#: src/compose.c:5763
+#: src/compose.c:5757
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:5805
+#: src/compose.c:5799
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Vill du använda mallen \"%s\" ?"
 
-#: src/compose.c:5807
+#: src/compose.c:5801
 msgid "Apply template"
 msgstr "Använd mall"
 
-#: src/compose.c:5808
+#: src/compose.c:5802
 #, fuzzy
 msgid "_Replace"
 msgstr "Ersätt"
 
-#: src/compose.c:5808
+#: src/compose.c:5802
 #, fuzzy
 msgid "_Insert"
 msgstr "Infoga"
@@ -1735,12 +1735,12 @@ msgstr "Ställer in mappinfo...\n"
 msgid "Setting folder info..."
 msgstr "Ställer in mappinfo..."
 
-#: src/folderview.c:805 src/mainwindow.c:3301 src/setup.c:81
+#: src/folderview.c:805 src/mainwindow.c:3272 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Söker igenom mapp %s%c%s..."
 
-#: src/folderview.c:809 src/mainwindow.c:3306 src/setup.c:86
+#: src/folderview.c:809 src/mainwindow.c:3277 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Söker igenom mapp %s ..."
@@ -2061,44 +2061,44 @@ msgstr "IMAP4-autentisering misslyckades.\n"
 msgid "IMAP4 login failed.\n"
 msgstr "IMAP4-inloggning misslyckades.\n"
 
-#: src/imap.c:3522
+#: src/imap.c:3528
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "kan inte lägga till %s till %s\n"
 
-#: src/imap.c:3529
+#: src/imap.c:3535
 msgid "(sending file...)"
 msgstr "(skickar fil...)"
 
-#: src/imap.c:3557
+#: src/imap.c:3563
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "kan inte lägga till meddelande till %s\n"
 
-#: src/imap.c:3589
+#: src/imap.c:3595
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "kan inte kopiera %s till %s\n"
 
-#: src/imap.c:3613
+#: src/imap.c:3619
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "fel vid imapkommando: STORE %s %s\n"
 
-#: src/imap.c:3627
+#: src/imap.c:3633
 msgid "error while imap command: EXPUNGE\n"
 msgstr "fel vid imapkommando: EXPUNGE\n"
 
-#: src/imap.c:3640
+#: src/imap.c:3646
 msgid "error while imap command: CLOSE\n"
 msgstr "fel vid imapkommando: CLOSE\n"
 
-#: src/imap.c:3873
+#: src/imap.c:3879
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv kan inte konvertera UTF-7 till %s\n"
 
-#: src/imap.c:3903
+#: src/imap.c:3909
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv kan inte konvertera %s till UTF-7\n"
@@ -2200,7 +2200,7 @@ msgstr "Importera LDIF-fil till adressboken"
 msgid "Prev"
 msgstr "Föregående"
 
-#: src/importldif.c:768 src/mainwindow.c:2321
+#: src/importldif.c:768 src/mainwindow.c:2303
 msgid "Next"
 msgstr "Nästa"
 
@@ -2543,627 +2543,627 @@ msgid ""
 "Do you want to migrate it?"
 msgstr ""
 
-#: src/mainwindow.c:471
+#: src/mainwindow.c:462
 msgid "/_File/_Folder"
 msgstr "/_Arkiv/_Mapp"
 
-#: src/mainwindow.c:472
+#: src/mainwindow.c:463
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/_Arkiv/_Mapp/_Ny mapp..."
 
-#: src/mainwindow.c:474
+#: src/mainwindow.c:465
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/_Arkiv/_Mapp/_Byt namn..."
 
-#: src/mainwindow.c:475
+#: src/mainwindow.c:466
 #, fuzzy
 msgid "/_File/_Folder/_Move folder..."
 msgstr "/_Arkiv/_Mapp/_Byt namn..."
 
-#: src/mainwindow.c:476
+#: src/mainwindow.c:467
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/_Arkiv/_Mapp/_Ta bort"
 
-#: src/mainwindow.c:477
+#: src/mainwindow.c:468
 msgid "/_File/_Mailbox"
 msgstr "/_Arkiv/_Brevlåda..."
 
-#: src/mainwindow.c:478
+#: src/mainwindow.c:469
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/_Arkiv/_Brevlåda/_Lägg till..."
 
-#: src/mainwindow.c:479
+#: src/mainwindow.c:470
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/_Arkiv/_Brevlåda/_Ta bort"
 
-#: src/mainwindow.c:480 src/mainwindow.c:485
+#: src/mainwindow.c:471 src/mainwindow.c:476
 msgid "/_File/_Mailbox/---"
 msgstr "/_Arkiv/_Brevlåda/---"
 
-#: src/mainwindow.c:481
+#: src/mainwindow.c:472
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "/_Arkiv/_Brevlåda/Ta emot nya _meddelanden"
 
-#: src/mainwindow.c:483
+#: src/mainwindow.c:474
 msgid "/_File/_Mailbox/Check for new messages in _all mailboxes"
 msgstr "/_Arkiv/_Brevlåda/Ta emot nya meddelanden i _alla brevlådor"
 
-#: src/mainwindow.c:486
+#: src/mainwindow.c:477
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "/_Arkiv/_Brevlåda/_Uppdatera mappträd"
 
-#: src/mainwindow.c:489
+#: src/mainwindow.c:480
 msgid "/_File/_Import mbox file..."
 msgstr "/_Arkiv/_Importera mbox-fil..."
 
-#: src/mainwindow.c:490
+#: src/mainwindow.c:481
 msgid "/_File/_Export to mbox file..."
 msgstr "/_Arkiv/_Exportera till mbox-fil..."
 
-#: src/mainwindow.c:492
+#: src/mainwindow.c:483
 msgid "/_File/Empty all _trash"
 msgstr "/_Arkiv/Töm alla _papperskorgar"
 
-#: src/mainwindow.c:494 src/messageview.c:138
+#: src/mainwindow.c:485 src/messageview.c:138
 msgid "/_File/_Save as..."
 msgstr "/_Arkiv/_Spara som..."
 
-#: src/mainwindow.c:495 src/messageview.c:139
+#: src/mainwindow.c:486 src/messageview.c:139
 msgid "/_File/_Print..."
 msgstr "/_Arkiv/Skriv _ut..."
 
-#: src/mainwindow.c:497
+#: src/mainwindow.c:488
 msgid "/_File/_Work offline"
 msgstr "/_Arkiv/Arbeta _offline"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:500
+#: src/mainwindow.c:491
 msgid "/_File/E_xit"
 msgstr "/_Arkiv/_Avsluta"
 
-#: src/mainwindow.c:505
+#: src/mainwindow.c:496
 msgid "/_Edit/Select _thread"
 msgstr "/_Redigera/Välj _tråd"
 
-#: src/mainwindow.c:507 src/messageview.c:147
+#: src/mainwindow.c:498 src/messageview.c:147
 msgid "/_Edit/_Find in current message..."
 msgstr "/_Redigera/Sök _i aktuellt meddelande..."
 
-#: src/mainwindow.c:509
+#: src/mainwindow.c:500
 msgid "/_Edit/_Search messages..."
 msgstr "/_Redigera/_Sök meddelanden..."
 
-#: src/mainwindow.c:512
+#: src/mainwindow.c:503
 msgid "/_View/Show or hi_de"
 msgstr "/_Visa/_Visa eller dölj"
 
-#: src/mainwindow.c:513
+#: src/mainwindow.c:504
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/_Visa/_Visa eller dölj/_Mappträd"
 
-#: src/mainwindow.c:515
+#: src/mainwindow.c:506
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/_Visa/_Visa eller dölj/Me_ddelandevy"
 
-#: src/mainwindow.c:517
+#: src/mainwindow.c:508
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/_Visa/_Visa eller dölj/_Verktygsrad"
 
-#: src/mainwindow.c:519
+#: src/mainwindow.c:510
 msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/_Visa/_Visa eller dölj/_Verktygsrad/Ikoner _och text"
 
-#: src/mainwindow.c:521
+#: src/mainwindow.c:512
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/_Visa/_Visa eller dölj/_Verktygsrad/_Ikoner"
 
-#: src/mainwindow.c:523
+#: src/mainwindow.c:514
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/_Visa/_Visa eller dölj/_Verktygsrad/_Text"
 
-#: src/mainwindow.c:525
+#: src/mainwindow.c:516
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/_Visa/_Visa eller dölj/_Verktygsrad/I_ngetdera"
 
-#: src/mainwindow.c:527
+#: src/mainwindow.c:518
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/_Visa/_Visa eller dölj/_Statusrad"
 
-#: src/mainwindow.c:530
+#: src/mainwindow.c:521
 msgid "/_View/Separate f_older tree"
 msgstr "/_Visa/Separat ma_ppträd"
 
-#: src/mainwindow.c:531
+#: src/mainwindow.c:522
 #, fuzzy
 msgid "/_View/Separate _message view"
 msgstr "/_Visa/Separat m_eddelandevy"
 
-#: src/mainwindow.c:533
+#: src/mainwindow.c:524
 msgid "/_View/_Sort"
 msgstr "/_Visa/_Sortera"
 
-#: src/mainwindow.c:534
+#: src/mainwindow.c:525
 msgid "/_View/_Sort/by _number"
 msgstr "/_Visa/_Sortera/efter _nummer"
 
-#: src/mainwindow.c:535
+#: src/mainwindow.c:526
 msgid "/_View/_Sort/by s_ize"
 msgstr "/_Visa/_Sortera/efter stor_lek"
 
-#: src/mainwindow.c:536
+#: src/mainwindow.c:527
 msgid "/_View/_Sort/by _date"
 msgstr "/_Visa/_Sortera/efter _datum"
 
-#: src/mainwindow.c:537
+#: src/mainwindow.c:528
 msgid "/_View/_Sort/by _from"
 msgstr "/_Visa/_Sortera/efter _från"
 
-#: src/mainwindow.c:538
+#: src/mainwindow.c:529
 msgid "/_View/_Sort/by _recipient"
 msgstr "/_Visa/_Sortera/efter _mottagare"
 
-#: src/mainwindow.c:539
+#: src/mainwindow.c:530
 msgid "/_View/_Sort/by _subject"
 msgstr "/_Visa/_Sortera/efter _ämne"
 
-#: src/mainwindow.c:540
+#: src/mainwindow.c:531
 msgid "/_View/_Sort/by _color label"
 msgstr "/_Visa/_Sortera/efter fä_rgmarkering"
 
-#: src/mainwindow.c:542
+#: src/mainwindow.c:533
 msgid "/_View/_Sort/by _mark"
 msgstr "/_Visa/_Sortera/efter mar_kering"
 
-#: src/mainwindow.c:543
+#: src/mainwindow.c:534
 msgid "/_View/_Sort/by _unread"
 msgstr "/_Visa/_Sortera/efter _oläst"
 
-#: src/mainwindow.c:544
+#: src/mainwindow.c:535
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/_Visa/_Sortera/efter _bilaga"
 
-#: src/mainwindow.c:546
+#: src/mainwindow.c:537
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/_Visa/_Sortera/_inte alls"
 
-#: src/mainwindow.c:547 src/mainwindow.c:550
+#: src/mainwindow.c:538 src/mainwindow.c:541
 msgid "/_View/_Sort/---"
 msgstr "/_Visa/_Sortera/---"
 
-#: src/mainwindow.c:548
+#: src/mainwindow.c:539
 msgid "/_View/_Sort/Ascending"
 msgstr "/_Visa/_Sortera/Uppstigande"
 
-#: src/mainwindow.c:549
+#: src/mainwindow.c:540
 msgid "/_View/_Sort/Descending"
 msgstr "/_Visa/_Sortera/Nedstigande"
 
-#: src/mainwindow.c:551
+#: src/mainwindow.c:542
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/_Visa/_Sortera/_Attrahera efter ärende"
 
-#: src/mainwindow.c:553
+#: src/mainwindow.c:544
 msgid "/_View/Th_read view"
 msgstr "/_Visa/_Trådvy"
 
-#: src/mainwindow.c:554
+#: src/mainwindow.c:545
 msgid "/_View/E_xpand all threads"
 msgstr "/_Visa/E_xpandera alla trådar"
 
-#: src/mainwindow.c:555
+#: src/mainwindow.c:546
 msgid "/_View/Co_llapse all threads"
 msgstr "/_Visa/Ko_llapsa alla trådar"
 
-#: src/mainwindow.c:556
+#: src/mainwindow.c:547
 msgid "/_View/Set display _item..."
 msgstr "/_Visa/_Poster i summeringsvyn..."
 
-#: src/mainwindow.c:559
+#: src/mainwindow.c:550
 msgid "/_View/_Go to"
 msgstr "/_Visa/_Gå till"
 
-#: src/mainwindow.c:560
+#: src/mainwindow.c:551
 msgid "/_View/_Go to/_Prev message"
 msgstr "/_Visa/_Gå till/_Föreg. meddelande"
 
-#: src/mainwindow.c:561
+#: src/mainwindow.c:552
 msgid "/_View/_Go to/_Next message"
 msgstr "/_Visa/_Gå till/_Nästa meddelande"
 
-#: src/mainwindow.c:562 src/mainwindow.c:567 src/mainwindow.c:570
-#: src/mainwindow.c:575 src/mainwindow.c:580
+#: src/mainwindow.c:553 src/mainwindow.c:558 src/mainwindow.c:561
+#: src/mainwindow.c:566 src/mainwindow.c:571
 msgid "/_View/_Go to/---"
 msgstr "/_Visa/_Gå till/---"
 
-#: src/mainwindow.c:563
+#: src/mainwindow.c:554
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/_Visa/_Gå till/F_öreg. olästa meddelande"
 
-#: src/mainwindow.c:565
+#: src/mainwindow.c:556
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/_Visa/_Gå till/N_ästa olästa meddelande"
 
-#: src/mainwindow.c:568
+#: src/mainwindow.c:559
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/_Visa/_Gå till/Föreg. n_ya meddelande"
 
-#: src/mainwindow.c:569
+#: src/mainwindow.c:560
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/_Visa/_Gå till/Näs_ta nya meddelande"
 
-#: src/mainwindow.c:571
+#: src/mainwindow.c:562
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/_Visa/_Gå till/Föreg. _markerade meddelande"
 
-#: src/mainwindow.c:573
+#: src/mainwindow.c:564
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/_Visa/_Gå till/Nästa m_arkerade meddelande"
 
-#: src/mainwindow.c:576
+#: src/mainwindow.c:567
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/_Visa/_Gå till/_Föreg. _färgade meddelande"
 
-#: src/mainwindow.c:578
+#: src/mainwindow.c:569
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/_Visa/_Gå till/Nästa fä_rgade meddelande"
 
-#: src/mainwindow.c:581
+#: src/mainwindow.c:572
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Visa/_Gå till/_En annan mapp..."
 
-#: src/mainwindow.c:590 src/messageview.c:158
+#: src/mainwindow.c:581 src/messageview.c:158
 #, fuzzy
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Visa/_Kodning/_Automatisk igenkänning"
 
-#: src/mainwindow.c:641 src/messageview.c:202
+#: src/mainwindow.c:632 src/messageview.c:202
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Visa/_Kodning/Japansk (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:643 src/messageview.c:204
+#: src/mainwindow.c:634 src/messageview.c:204
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Visa/_Kodning/Japansk (_EUC-JP)"
 
-#: src/mainwindow.c:645 src/messageview.c:206
+#: src/mainwindow.c:636 src/messageview.c:206
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Visa/_Kodning/Japansk (_Shift__JIS)"
 
-#: src/mainwindow.c:657 src/messageview.c:217
+#: src/mainwindow.c:648 src/messageview.c:217
 #, fuzzy
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Visa/_Kodning/Kinesisk (ISO-2022-_CN)"
 
-#: src/mainwindow.c:663 src/messageview.c:222
+#: src/mainwindow.c:654 src/messageview.c:222
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Visa/_Kodning/Koreansk (ISO-2022-KR)"
 
-#: src/mainwindow.c:676 src/summaryview.c:401
+#: src/mainwindow.c:667 src/summaryview.c:401
 msgid "/_View/Open in new _window"
 msgstr "/_Visa/_Öppna i nytt fönster"
 
-#: src/mainwindow.c:677 src/messageview.c:234
+#: src/mainwindow.c:668 src/messageview.c:234
 msgid "/_View/Mess_age source"
 msgstr "/_Visa/_Meddelandekällkod"
 
-#: src/mainwindow.c:678 src/messageview.c:235
+#: src/mainwindow.c:669 src/messageview.c:235
 msgid "/_View/Show all _header"
 msgstr "/_Visa/_Hela brevhuvudet"
 
-#: src/mainwindow.c:680
+#: src/mainwindow.c:671
 msgid "/_View/_Update summary"
 msgstr "/_Visa/_Uppdatera summering"
 
-#: src/mainwindow.c:682 src/messageview.c:237
+#: src/mainwindow.c:673 src/messageview.c:237
 msgid "/_Message"
 msgstr "/_Meddelande"
 
-#: src/mainwindow.c:683
+#: src/mainwindow.c:674
 msgid "/_Message/Recei_ve"
 msgstr "/_Meddelande/Mott_ag"
 
-#: src/mainwindow.c:684
+#: src/mainwindow.c:675
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/_Meddelande/Mottag/Hämta från _detta konto"
 
-#: src/mainwindow.c:686
+#: src/mainwindow.c:677
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/_Meddelande/Mottag/Hämta från alla _konton"
 
-#: src/mainwindow.c:688
+#: src/mainwindow.c:679
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/_Meddelande/Mottag/Avbryt hämtnin_g"
 
-#: src/mainwindow.c:690
+#: src/mainwindow.c:681
 msgid "/_Message/Recei_ve/---"
 msgstr "/_Meddelande/Mottag/---"
 
-#: src/mainwindow.c:691
+#: src/mainwindow.c:682
 msgid "/_Message/_Send queued messages"
 msgstr "/_Meddelande/Skicka _köade meddelanden"
 
-#: src/mainwindow.c:692 src/mainwindow.c:694 src/mainwindow.c:701
-#: src/mainwindow.c:706 src/mainwindow.c:710 src/mainwindow.c:719
-#: src/mainwindow.c:722 src/messageview.c:240 src/messageview.c:248
+#: src/mainwindow.c:683 src/mainwindow.c:685 src/mainwindow.c:692
+#: src/mainwindow.c:697 src/mainwindow.c:701 src/mainwindow.c:710
+#: src/mainwindow.c:713 src/messageview.c:240 src/messageview.c:248
 #: src/messageview.c:253
 msgid "/_Message/---"
 msgstr "/_Meddelande/---"
 
-#: src/mainwindow.c:693 src/messageview.c:238
+#: src/mainwindow.c:684 src/messageview.c:238
 msgid "/_Message/Compose _new message"
 msgstr "/_Meddelande/Skriv _nytt meddelande"
 
-#: src/mainwindow.c:695 src/messageview.c:241
+#: src/mainwindow.c:686 src/messageview.c:241
 msgid "/_Message/_Reply"
 msgstr "/_Meddelande/Sva_ra"
 
-#: src/mainwindow.c:696
+#: src/mainwindow.c:687
 msgid "/_Message/Repl_y to"
 msgstr "/_Meddelande/_Svara till"
 
-#: src/mainwindow.c:697 src/messageview.c:242
+#: src/mainwindow.c:688 src/messageview.c:242
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Meddelande/_Svara till/a_lla"
 
-#: src/mainwindow.c:698 src/messageview.c:244
+#: src/mainwindow.c:689 src/messageview.c:244
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Meddelande/_Svara till/_avsändaren"
 
-#: src/mainwindow.c:699 src/messageview.c:246
+#: src/mainwindow.c:690 src/messageview.c:246
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Meddelande/_Svara till/_e-postlista"
 
-#: src/mainwindow.c:702 src/messageview.c:249
+#: src/mainwindow.c:693 src/messageview.c:249
 msgid "/_Message/_Forward"
 msgstr "/_Meddelande/Vi_darebefordra"
 
-#: src/mainwindow.c:703 src/messageview.c:250
+#: src/mainwindow.c:694 src/messageview.c:250
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Meddelande/Vidarebefordra som bil_aga"
 
-#: src/mainwindow.c:705 src/messageview.c:252
+#: src/mainwindow.c:696 src/messageview.c:252
 msgid "/_Message/Redirec_t"
 msgstr "/_Meddelande/_Omdirigera"
 
-#: src/mainwindow.c:707
+#: src/mainwindow.c:698
 msgid "/_Message/M_ove..."
 msgstr "/_Meddelande/Fl_ytta..."
 
-#: src/mainwindow.c:708
+#: src/mainwindow.c:699
 msgid "/_Message/_Copy..."
 msgstr "/_Meddelande/_Kopiera"
 
-#: src/mainwindow.c:709
+#: src/mainwindow.c:700
 msgid "/_Message/_Delete"
 msgstr "/_Meddelande/_Ta bort"
 
-#: src/mainwindow.c:711
+#: src/mainwindow.c:702
 msgid "/_Message/_Mark"
 msgstr "/_Meddelande/_Markera"
 
-#: src/mainwindow.c:712
+#: src/mainwindow.c:703
 msgid "/_Message/_Mark/_Mark"
 msgstr "/_Meddelande/_Markera/_Markera"
 
-#: src/mainwindow.c:713
+#: src/mainwindow.c:704
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/_Meddelande/_Markera/_Avmarkera"
 
-#: src/mainwindow.c:714
+#: src/mainwindow.c:705
 msgid "/_Message/_Mark/---"
 msgstr "/_Meddelande/_Markera/---"
 
-#: src/mainwindow.c:715
+#: src/mainwindow.c:706
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/_Meddelande/_Markera/Markera som _oläst"
 
-#: src/mainwindow.c:716
+#: src/mainwindow.c:707
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/_Meddelande/_Markera/Markera som _läst"
 
-#: src/mainwindow.c:718
+#: src/mainwindow.c:709
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/_Meddelande/_Markera/Markera alla som l_ästa"
 
-#: src/mainwindow.c:720
+#: src/mainwindow.c:711
 #, fuzzy
 msgid "/_Message/Set as _junk mail"
 msgstr "/_Meddelande/_Markera/_Avmarkera"
 
-#: src/mainwindow.c:721
+#: src/mainwindow.c:712
 msgid "/_Message/Set as not j_unk mail"
 msgstr ""
 
-#: src/mainwindow.c:723 src/messageview.c:254
+#: src/mainwindow.c:714 src/messageview.c:254
 msgid "/_Message/Re-_edit"
 msgstr "/_Meddelande/Redigera _om"
 
-#: src/mainwindow.c:727
+#: src/mainwindow.c:718
 #, fuzzy
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/V_erktyg/Lägg till avsändaren i adressbo_ken"
 
-#: src/mainwindow.c:730
+#: src/mainwindow.c:721
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/V_erktyg/_Filtrera alla meddelanden i mappen"
 
-#: src/mainwindow.c:732
+#: src/mainwindow.c:723
 msgid "/_Tools/Filter _selected messages"
 msgstr "/V_erktyg/Filtrera _valda meddelanden"
 
-#: src/mainwindow.c:734 src/messageview.c:261
+#: src/mainwindow.c:725 src/messageview.c:261
 msgid "/_Tools/_Create filter rule"
 msgstr "/V_erktyg/_Skapa filterregel"
 
-#: src/mainwindow.c:735 src/messageview.c:263
+#: src/mainwindow.c:726 src/messageview.c:263
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/V_erktyg/_Skapa filterregel/_Automatiskt"
 
-#: src/mainwindow.c:737 src/messageview.c:265
+#: src/mainwindow.c:728 src/messageview.c:265
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/V_erktyg/_Skapa filterregel/genom _Från"
 
-#: src/mainwindow.c:739 src/messageview.c:267
+#: src/mainwindow.c:730 src/messageview.c:267
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/V_erktyg/_Skapa filterregel/genom _Till"
 
-#: src/mainwindow.c:741 src/messageview.c:269
+#: src/mainwindow.c:732 src/messageview.c:269
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/V_erktyg/_Skapa filterregel/genom _Ämne"
 
-#: src/mainwindow.c:744
+#: src/mainwindow.c:735
 #, fuzzy
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/V_erktyg/_Filtrera alla meddelanden i mappen"
 
-#: src/mainwindow.c:746
+#: src/mainwindow.c:737
 #, fuzzy
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/V_erktyg/Filtrera _valda meddelanden"
 
-#: src/mainwindow.c:751
+#: src/mainwindow.c:742
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/V_erktyg/Ta bort meddelande_dubbletter"
 
-#: src/mainwindow.c:754
+#: src/mainwindow.c:745
 msgid "/_Tools/E_xecute"
 msgstr "/V_erktyg/Utför _köade åtgärder"
 
-#: src/mainwindow.c:756
+#: src/mainwindow.c:747
 msgid "/_Tools/_Log window"
 msgstr "/V_erktyg/_Loggfönster"
 
-#: src/mainwindow.c:758
+#: src/mainwindow.c:749
 msgid "/_Configuration"
 msgstr "/_Konfiguration"
 
-#: src/mainwindow.c:759
+#: src/mainwindow.c:750
 msgid "/_Configuration/_Common preferences..."
 msgstr "/_Konfiguration/_Allmänna inställningar..."
 
-#: src/mainwindow.c:761
+#: src/mainwindow.c:752
 msgid "/_Configuration/_Filter setting..."
 msgstr "/_Konfiguration/_Filterinställningar..."
 
-#: src/mainwindow.c:763
+#: src/mainwindow.c:754
 msgid "/_Configuration/_Template..."
 msgstr "/_Konfiguration/_Mall..."
 
-#: src/mainwindow.c:764
+#: src/mainwindow.c:755
 msgid "/_Configuration/_Actions..."
 msgstr "/_Konfiguration/_Åtgärder..."
 
-#: src/mainwindow.c:765
+#: src/mainwindow.c:756
 msgid "/_Configuration/---"
 msgstr "/_Konfiguration/---"
 
-#: src/mainwindow.c:766
+#: src/mainwindow.c:757
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Konfiguration/_Inställningar för aktuellt konto..."
 
-#: src/mainwindow.c:768
+#: src/mainwindow.c:759
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Konfiguration/Skapa _nytt konto..."
 
-#: src/mainwindow.c:770
+#: src/mainwindow.c:761
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Konfiguration/_Redigera konton..."
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:763
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Konfiguration/_Ändra aktuellt konto"
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:767
 msgid "/_Help/_Manual"
 msgstr "/_Hjälp/_Handbok"
 
-#: src/mainwindow.c:777
+#: src/mainwindow.c:768
 msgid "/_Help/_Manual/_English"
 msgstr "/_Hjälp/_Handbok/_Engelsk"
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:769
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/_Hjälp/_Handbok/_Japansk"
 
-#: src/mainwindow.c:779
+#: src/mainwindow.c:770
 msgid "/_Help/_FAQ"
 msgstr "/_Hjälp/_FAQ"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:771
 msgid "/_Help/_FAQ/_English"
 msgstr "/_Hjälp/_FAQ/_Engelsk"
 
-#: src/mainwindow.c:781
+#: src/mainwindow.c:772
 msgid "/_Help/_FAQ/_German"
 msgstr "/_Hjälp/_FAQ/_Tysk"
 
-#: src/mainwindow.c:782
+#: src/mainwindow.c:773
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/_Hjälp/_FAQ/_Spansk"
 
-#: src/mainwindow.c:783
+#: src/mainwindow.c:774
 msgid "/_Help/_FAQ/_French"
 msgstr "/_Hjälp/_FAQ/_Fransk"
 
-#: src/mainwindow.c:784
+#: src/mainwindow.c:775
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/_Hjälp/_FAQ/_Italiensk"
 
-#: src/mainwindow.c:785
+#: src/mainwindow.c:776
 msgid "/_Help/---"
 msgstr "/_Hjälp/---"
 
-#: src/mainwindow.c:825
+#: src/mainwindow.c:816
 msgid "Creating main window...\n"
 msgstr "Skapar huvudfönster...\n"
 
-#: src/mainwindow.c:987
+#: src/mainwindow.c:973
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Huvudfönster: färgtilldelning %d misslyckades\n"
 
-#: src/mainwindow.c:1071 src/summaryview.c:2020 src/summaryview.c:2105
+#: src/mainwindow.c:1057 src/summaryview.c:2020 src/summaryview.c:2105
 #: src/summaryview.c:3342 src/summaryview.c:3415 src/summaryview.c:3728
 msgid "done.\n"
 msgstr "färdigt.\n"
 
-#: src/mainwindow.c:1196 src/mainwindow.c:1237 src/mainwindow.c:1265
+#: src/mainwindow.c:1182 src/mainwindow.c:1223 src/mainwindow.c:1251
 msgid "Untitled"
 msgstr "Namnlös"
 
-#: src/mainwindow.c:1266
+#: src/mainwindow.c:1252
 msgid "none"
 msgstr "inget"
 
-#: src/mainwindow.c:1316
+#: src/mainwindow.c:1302
 #, 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:1536
+#: src/mainwindow.c:1522
 msgid "Offline"
 msgstr "Frånkopplad"
 
-#: src/mainwindow.c:1537
+#: src/mainwindow.c:1523
 msgid "You are offline. Go online?"
 msgstr "Du är frånkopplad. Vill du ansluta?"
 
-#: src/mainwindow.c:1551
+#: src/mainwindow.c:1537
 msgid "Empty all trash"
 msgstr "Töm alla papperskorgar"
 
-#: src/mainwindow.c:1552
+#: src/mainwindow.c:1538
 msgid "Empty messages in all trash?"
 msgstr "Töm alla meddelanden i alla papperskorgar?"
 
-#: src/mainwindow.c:1580
+#: src/mainwindow.c:1566
 msgid "Add mailbox"
 msgstr "Lägg till brevlåda"
 
-#: src/mainwindow.c:1581
+#: src/mainwindow.c:1567
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3173,16 +3173,16 @@ msgstr ""
 "Om en existerande brevlåda specificeras, kommer den\n"
 "att sökas igenom automatiskt."
 
-#: src/mainwindow.c:1587
+#: src/mainwindow.c:1573
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Brevlådan \"%s\" finns redan."
 
-#: src/mainwindow.c:1592 src/setup.c:57
+#: src/mainwindow.c:1578 src/setup.c:57
 msgid "Mailbox"
 msgstr "Brevlåda"
 
-#: src/mainwindow.c:1598 src/setup.c:63
+#: src/mainwindow.c:1584 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3191,150 +3191,150 @@ msgstr ""
 "Brevlådan kunde inte skapas.\n"
 "Några filer finns redan eller så saknar du skrivrättigheter där."
 
-#: src/mainwindow.c:1989
+#: src/mainwindow.c:1975
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Mappvy"
 
-#: src/mainwindow.c:2009 src/messageview.c:368
+#: src/mainwindow.c:1995 src/messageview.c:368
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Meddelandevy"
 
-#: src/mainwindow.c:2156 src/summaryview.c:370
+#: src/mainwindow.c:2142 src/summaryview.c:370
 msgid "/_Reply"
 msgstr "/Sva_ra"
 
-#: src/mainwindow.c:2157
+#: src/mainwindow.c:2143
 msgid "/Reply to _all"
 msgstr "/Svara till _alla"
 
-#: src/mainwindow.c:2158
+#: src/mainwindow.c:2144
 msgid "/Reply to _sender"
 msgstr "/Svara till av_sändaren"
 
-#: src/mainwindow.c:2159
+#: src/mainwindow.c:2145
 msgid "/Reply to mailing _list"
 msgstr "/Svara till e-post_lista"
 
-#: src/mainwindow.c:2164 src/summaryview.c:377
+#: src/mainwindow.c:2150 src/summaryview.c:377
 msgid "/_Forward"
 msgstr "/Vi_darebefordra"
 
-#: src/mainwindow.c:2165 src/summaryview.c:378
+#: src/mainwindow.c:2151 src/summaryview.c:378
 msgid "/For_ward as attachment"
 msgstr "/Vidarebefordra som _bilaga"
 
-#: src/mainwindow.c:2166 src/summaryview.c:379
+#: src/mainwindow.c:2152 src/summaryview.c:379
 msgid "/Redirec_t"
 msgstr "/_Omdirigera"
 
-#: src/mainwindow.c:2205
+#: src/mainwindow.c:2188
 msgid "Get"
 msgstr "Hämta"
 
-#: src/mainwindow.c:2206
+#: src/mainwindow.c:2189
 msgid "Incorporate new mail"
 msgstr "Hämta ny post"
 
-#: src/mainwindow.c:2213
+#: src/mainwindow.c:2196
 msgid "Get all"
 msgstr "Hämta allt"
 
-#: src/mainwindow.c:2214
+#: src/mainwindow.c:2197
 msgid "Incorporate new mail of all accounts"
 msgstr "Hämta ny post från alla konton"
 
-#: src/mainwindow.c:2225
+#: src/mainwindow.c:2208
 msgid "Send queued message(s)"
 msgstr "Skicka köade meddelanden"
 
-#: src/mainwindow.c:2235 src/prefs_account.c:721 src/prefs_common.c:949
+#: src/mainwindow.c:2218 src/prefs_account.c:721 src/prefs_common.c:949
 #: src/prefs_folder_item.c:137
 msgid "Compose"
 msgstr "Skriv"
 
-#: src/mainwindow.c:2236
+#: src/mainwindow.c:2219
 msgid "Compose new message"
 msgstr "Skriv nytt meddelande"
 
-#: src/mainwindow.c:2244 src/prefs_common.c:1448
+#: src/mainwindow.c:2227 src/prefs_common.c:1448
 msgid "Reply"
 msgstr "Svara"
 
-#: src/mainwindow.c:2245 src/mainwindow.c:2258
+#: src/mainwindow.c:2228 src/mainwindow.c:2241
 msgid "Reply to the message"
 msgstr "Svara på meddelandet"
 
-#: src/mainwindow.c:2263
+#: src/mainwindow.c:2245
 msgid "Reply all"
 msgstr "Svara alla"
 
-#: src/mainwindow.c:2264
+#: src/mainwindow.c:2246
 msgid "Reply to all"
 msgstr "Svara till alla"
 
-#: src/mainwindow.c:2272 src/prefs_filter_edit.c:741
+#: src/mainwindow.c:2254 src/prefs_filter_edit.c:741
 msgid "Forward"
 msgstr "Vidarebefordra"
 
-#: src/mainwindow.c:2273 src/mainwindow.c:2286
+#: src/mainwindow.c:2255 src/mainwindow.c:2268
 msgid "Forward the message"
 msgstr "Vidarebefordra meddelandet"
 
-#: src/mainwindow.c:2293
+#: src/mainwindow.c:2275
 msgid "Delete the message"
 msgstr "Ta bort meddelandet"
 
-#: src/mainwindow.c:2301 src/prefs_common.c:1988
+#: src/mainwindow.c:2283 src/prefs_common.c:1988
 msgid "Junk"
 msgstr ""
 
-#: src/mainwindow.c:2302
+#: src/mainwindow.c:2284
 #, fuzzy
 msgid "Set as junk mail"
 msgstr "Använd som förvalt konto"
 
-#: src/mainwindow.c:2311
+#: src/mainwindow.c:2293
 msgid "Execute"
 msgstr "Utför köade åtgärder"
 
-#: src/mainwindow.c:2312
+#: src/mainwindow.c:2294
 msgid "Execute marked process"
 msgstr "Kör markerad process"
 
-#: src/mainwindow.c:2322
+#: src/mainwindow.c:2304
 msgid "Next unread message"
 msgstr "Nästa olästa meddelande"
 
-#: src/mainwindow.c:2334
+#: src/mainwindow.c:2316
 msgid "Prefs"
 msgstr "Inst."
 
-#: src/mainwindow.c:2335
+#: src/mainwindow.c:2317
 msgid "Common preferences"
 msgstr "Allmänna inställningar"
 
-#: src/mainwindow.c:2343 src/prefs_folder_item.c:261
+#: src/mainwindow.c:2325 src/prefs_folder_item.c:261
 #: src/prefs_folder_item.c:272 src/progressdialog.c:128
 msgid "Account"
 msgstr "Konto"
 
-#: src/mainwindow.c:2344
+#: src/mainwindow.c:2326
 msgid "Account setting"
 msgstr "Kontoinställningar"
 
-#: src/mainwindow.c:2527
+#: src/mainwindow.c:2498
 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:2538
+#: src/mainwindow.c:2509
 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:2731
+#: src/mainwindow.c:2702
 msgid "Exit"
 msgstr "Avsluta"
 
-#: src/mainwindow.c:2731
+#: src/mainwindow.c:2702
 msgid "Exit this program?"
 msgstr "Avsluta detta program?"
 
@@ -5552,11 +5552,11 @@ msgstr "Skapar förloppsdialog...\n"
 msgid "Status"
 msgstr "Status"
 
-#: src/recv.c:113
+#: src/recv.c:112
 msgid "error occurred while retrieving data.\n"
 msgstr "fel uppstod vid inhämtning av data.\n"
 
-#: src/recv.c:155 src/recv.c:197 src/recv.c:213
+#: src/recv.c:154 src/recv.c:196 src/recv.c:211
 msgid "Can't write to file.\n"
 msgstr "Kan inte skriva till fil.\n"
 
@@ -6293,7 +6293,7 @@ msgstr "%.2fMB"
 msgid "%.2fGB"
 msgstr "%.2fGB"
 
-#: src/utils.c:2372 src/utils.c:2496
+#: src/utils.c:2386 src/utils.c:2510
 #, c-format
 msgid "writing to %s failed.\n"
 msgstr "skrivning till %s misslyckades.\n"
diff --git a/po/tr.po b/po/tr.po
index 10c24ae4..4895839b 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-08-09 18:08+0900\n"
+"POT-Creation-Date: 2005-08-22 17:22+0900\n"
 "PO-Revision-Date: 2004-12-03 11:44+0200\n"
 "Last-Translator: Arman Aksoy <armish@linux-sevenler.org>\n"
 "Language-Team:  <gnome-turk@gnome.org>\n"
@@ -100,7 +100,7 @@ msgstr ""
 "etkin duruma getirilebilir."
 
 #: src/account.c:691 src/addressadd.c:192 src/addressbook.c:490
-#: src/compose.c:4081 src/editaddress.c:200 src/editaddress.c:942
+#: src/compose.c:4079 src/editaddress.c:200 src/editaddress.c:942
 #: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:265
 #: src/editjpilot.c:271 src/editldap.c:307 src/editvcard.c:184
 #: src/mimeview.c:201 src/prefs_filter.c:258 src/prefs_folder_item.c:170
@@ -238,7 +238,7 @@ msgstr "Eylemin kullanıcı argümanı"
 msgid "Add Address to Book"
 msgstr "Adres Defterine Ekle"
 
-#: src/addressadd.c:202 src/compose.c:4528 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4521 src/editaddress.c:201
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "Adres"
@@ -252,7 +252,7 @@ msgstr "Notlar"
 msgid "Select Address Book Folder"
 msgstr "Adres Defteri Dizinini Seç"
 
-#: src/addressbook.c:336 src/compose.c:495 src/mainwindow.c:470
+#: src/addressbook.c:336 src/compose.c:493 src/mainwindow.c:461
 #: src/messageview.c:137
 msgid "/_File"
 msgstr "/_Dosya"
@@ -273,10 +273,10 @@ msgstr "/_Dosya/Yeni _JPilot"
 msgid "/_File/New _Server"
 msgstr "/_Dosya/Yeni _Sunucu"
 
-#: src/addressbook.c:345 src/addressbook.c:348 src/compose.c:500
-#: src/compose.c:505 src/compose.c:509 src/mainwindow.c:488
-#: src/mainwindow.c:491 src/mainwindow.c:493 src/mainwindow.c:496
-#: src/mainwindow.c:498 src/messageview.c:140
+#: src/addressbook.c:345 src/addressbook.c:348 src/compose.c:498
+#: src/compose.c:503 src/compose.c:507 src/mainwindow.c:479
+#: src/mainwindow.c:482 src/mainwindow.c:484 src/mainwindow.c:487
+#: src/mainwindow.c:489 src/messageview.c:140
 msgid "/_File/---"
 msgstr "/_Dosya/---"
 
@@ -292,7 +292,7 @@ msgstr "/_Dosya/_Sil"
 msgid "/_File/_Save"
 msgstr "/_Dosya/_Kaydet"
 
-#: src/addressbook.c:350 src/compose.c:510 src/messageview.c:141
+#: src/addressbook.c:350 src/compose.c:508 src/messageview.c:141
 msgid "/_File/_Close"
 msgstr "/_Dosya/K_apat"
 
@@ -324,7 +324,7 @@ msgstr "/_Adres/Dü_zenle"
 msgid "/_Address/_Delete"
 msgstr "/_Adres/_Sil"
 
-#: src/addressbook.c:358 src/compose.c:619 src/mainwindow.c:725
+#: src/addressbook.c:358 src/compose.c:617 src/mainwindow.c:716
 #: src/messageview.c:256
 msgid "/_Tools"
 msgstr "/A_raçlar"
@@ -333,12 +333,12 @@ msgstr "/A_raçlar"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/A_raçlar/_LDIF dosyasını ekle"
 
-#: src/addressbook.c:360 src/compose.c:632 src/mainwindow.c:775
+#: src/addressbook.c:360 src/compose.c:630 src/mainwindow.c:766
 #: src/messageview.c:274
 msgid "/_Help"
 msgstr "/_Yardım"
 
-#: src/addressbook.c:361 src/compose.c:633 src/mainwindow.c:786
+#: src/addressbook.c:361 src/compose.c:631 src/mainwindow.c:777
 #: src/messageview.c:275
 msgid "/_Help/_About"
 msgstr "/_Yardım/_Hakkında"
@@ -355,7 +355,7 @@ msgstr "/Yeni _Grup"
 msgid "/New _Folder"
 msgstr "/Yeni _Dizin"
 
-#: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:489
+#: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:487
 #: src/folderview.c:235 src/folderview.c:237 src/folderview.c:241
 #: src/folderview.c:252 src/folderview.c:254 src/folderview.c:256
 #: src/folderview.c:260 src/folderview.c:270 src/folderview.c:272
@@ -365,8 +365,8 @@ msgstr "/Yeni _Dizin"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:512
-#: src/mainwindow.c:502 src/messageview.c:143
+#: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:510
+#: src/mainwindow.c:493 src/messageview.c:143
 msgid "/_Edit"
 msgstr "/Dü_zenle"
 
@@ -378,7 +378,7 @@ msgstr "/_Sil"
 msgid "E-Mail address"
 msgstr "İleti adresi"
 
-#: src/addressbook.c:495 src/compose.c:4529 src/prefs_common.c:2402
+#: src/addressbook.c:495 src/compose.c:4522 src/prefs_common.c:2402
 msgid "Address book"
 msgstr "Adres defteri"
 
@@ -387,8 +387,8 @@ msgid "Name:"
 msgstr "İsim:"
 
 #. Buttons
-#: src/addressbook.c:627 src/addressbook.c:1673 src/editaddress.c:884
-#: src/editaddress.c:1017 src/mainwindow.c:2292 src/prefs_actions.c:266
+#: src/addressbook.c:627 src/addressbook.c:1674 src/editaddress.c:884
+#: src/editaddress.c:1017 src/mainwindow.c:2274 src/prefs_actions.c:266
 #: src/prefs_display_header.c:278 src/prefs_display_header.c:333
 #: src/prefs_template.c:231
 msgid "Delete"
@@ -427,7 +427,7 @@ msgstr "Adres(ler)i sil"
 msgid "Really delete the address(es)?"
 msgstr "Adres(ler) silinsin mi?"
 
-#: src/addressbook.c:1664
+#: src/addressbook.c:1665
 #, fuzzy, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -437,38 +437,38 @@ msgstr ""
 "misiniz?\n"
 "Eğer sadece dizini silerseniz, içindeki adresler ana dizine taşınacaktır."
 
-#: src/addressbook.c:1667 src/folderview.c:2139
+#: src/addressbook.c:1668 src/folderview.c:2139
 msgid "Delete folder"
 msgstr "Dizini sil"
 
-#: src/addressbook.c:1667
+#: src/addressbook.c:1668
 #, fuzzy
 msgid "_Folder only"
 msgstr "Sadece dizin"
 
-#: src/addressbook.c:1667
+#: src/addressbook.c:1668
 #, fuzzy
 msgid "Folder and _addresses"
 msgstr "Dizin ve Adresler"
 
-#: src/addressbook.c:1672
+#: src/addressbook.c:1673
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "`%s' silinsin mi?"
 
-#: src/addressbook.c:2352 src/addressbook.c:2485
+#: src/addressbook.c:2353 src/addressbook.c:2486
 msgid "New user, could not save index file."
 msgstr "Yeni kullanıcı, indeks dosyası kaydedilemedi."
 
-#: src/addressbook.c:2356 src/addressbook.c:2489
+#: src/addressbook.c:2357 src/addressbook.c:2490
 msgid "New user, could not save address book files."
 msgstr "Yeni kullanıcı, adres defteri dosyaları kaydedilemedi."
 
-#: src/addressbook.c:2366 src/addressbook.c:2499
+#: src/addressbook.c:2367 src/addressbook.c:2500
 msgid "Old address book converted successfully."
 msgstr "Eski adres defteri başarıyla çevrildi."
 
-#: src/addressbook.c:2371
+#: src/addressbook.c:2372
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -476,7 +476,7 @@ msgstr ""
 "Eski adres defteri çevrildi,\n"
 "yeni adres indeks dosyası kaydedilemedi"
 
-#: src/addressbook.c:2384
+#: src/addressbook.c:2385
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -484,7 +484,7 @@ msgstr ""
 "Adres defteri çevrilemedi,\n"
 "ancak boş bir adres defteri dosyası oluşturuldu."
 
-#: src/addressbook.c:2390
+#: src/addressbook.c:2391
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -492,7 +492,7 @@ msgstr ""
 "Adres defteri ve yeni adres defteri \n"
 "dosyası oluşturulamadı."
 
-#: src/addressbook.c:2395
+#: src/addressbook.c:2396
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -500,88 +500,88 @@ msgstr ""
 "Adres defteri ve yeni adres defteri \n"
 "dosyası oluşturulamadı."
 
-#: src/addressbook.c:2402
+#: src/addressbook.c:2403
 msgid "Addressbook conversion error"
 msgstr "Adres defteri çevrim hatası"
 
-#: src/addressbook.c:2406
+#: src/addressbook.c:2407
 msgid "Addressbook conversion"
 msgstr "Adres defteri çevrimi"
 
-#: src/addressbook.c:2441
+#: src/addressbook.c:2442
 msgid "Addressbook Error"
 msgstr "Adres Defteri Hatası"
 
-#: src/addressbook.c:2442 src/addressbook.c:2542
+#: src/addressbook.c:2443 src/addressbook.c:2543
 msgid "Could not read address index"
 msgstr "Adres indeksi okunamadı"
 
-#: src/addressbook.c:2504
+#: src/addressbook.c:2505
 msgid "Old address book converted, could not save new address index file"
 msgstr ""
 "Eski adres defteri çevrildi, ancak yeni adres indeks dosyası kaydedilemedi"
 
-#: src/addressbook.c:2518
+#: src/addressbook.c:2519
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr ""
 "Adres defteri çevrilemedi, ancak yeni ve boş bir adres defteri dosyası "
 "oluşturuldu."
 
-#: src/addressbook.c:2524
+#: src/addressbook.c:2525
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr ""
 "Adres defteri çevrilemedi ve yeni adres defteri dosyası oluşturulamadı."
 
-#: src/addressbook.c:2530
+#: src/addressbook.c:2531
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr ""
 "Adres defteri çevrilemedi ve yeni adres defteri dosyası oluşturulamadı."
 
-#: src/addressbook.c:2548
+#: src/addressbook.c:2549
 msgid "Addressbook Conversion Error"
 msgstr "Adres Defteri Çevrim Hatası"
 
-#: src/addressbook.c:2554
+#: src/addressbook.c:2555
 msgid "Addressbook Conversion"
 msgstr "Adres Defteri Çevrimi"
 
-#: src/addressbook.c:3055 src/prefs_common.c:963
+#: src/addressbook.c:3056 src/prefs_common.c:963
 msgid "Interface"
 msgstr "Arayüz"
 
-#: src/addressbook.c:3071 src/importldif.c:514
+#: src/addressbook.c:3072 src/importldif.c:514
 msgid "Address Book"
 msgstr "Adres Defteri"
 
-#: src/addressbook.c:3087
+#: src/addressbook.c:3088
 msgid "Person"
 msgstr "Kişi"
 
-#: src/addressbook.c:3103
+#: src/addressbook.c:3104
 msgid "EMail Address"
 msgstr "İleti Adresi"
 
-#: src/addressbook.c:3119
+#: src/addressbook.c:3120
 msgid "Group"
 msgstr "Grup"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3135 src/folderview.c:346 src/prefs_account.c:1866
+#: src/addressbook.c:3136 src/folderview.c:346 src/prefs_account.c:1866
 msgid "Folder"
 msgstr "Dizin"
 
-#: src/addressbook.c:3151
+#: src/addressbook.c:3152
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3167 src/addressbook.c:3183
+#: src/addressbook.c:3168 src/addressbook.c:3184
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3199
+#: src/addressbook.c:3200
 msgid "LDAP Server"
 msgstr "LDAP Sunucu"
 
@@ -593,7 +593,7 @@ msgstr "Ortak adres"
 msgid "Personal address"
 msgstr "Kişisel adres"
 
-#: src/alertpanel.c:138 src/compose.c:5214 src/main.c:515
+#: src/alertpanel.c:138 src/compose.c:5208 src/main.c:515
 msgid "Notice"
 msgstr "Not"
 
@@ -648,373 +648,373 @@ msgstr "Kahverengi"
 msgid "None"
 msgstr "Hiçbiri"
 
-#: src/compose.c:487
+#: src/compose.c:485
 msgid "/_Add..."
 msgstr "/_Ekle..."
 
-#: src/compose.c:488
+#: src/compose.c:486
 msgid "/_Remove"
 msgstr "/_Sil"
 
-#: src/compose.c:490 src/folderview.c:243 src/folderview.c:262
+#: src/compose.c:488 src/folderview.c:243 src/folderview.c:262
 #: src/folderview.c:277
 msgid "/_Properties..."
 msgstr "/Ö_zellikler..."
 
-#: src/compose.c:496
+#: src/compose.c:494
 msgid "/_File/_Send"
 msgstr "/_Dosya/_Gönder"
 
-#: src/compose.c:498
+#: src/compose.c:496
 msgid "/_File/Send _later"
 msgstr "/_Dosya/_Sonra gönder"
 
-#: src/compose.c:501
+#: src/compose.c:499
 msgid "/_File/Save to _draft folder"
 msgstr "/_Dosya/T_aslak dizinine kaydet"
 
-#: src/compose.c:503
+#: src/compose.c:501
 msgid "/_File/Save and _keep editing"
 msgstr "/_Dosya/_Kaydet ve düzenlemeye devam et"
 
-#: src/compose.c:506
+#: src/compose.c:504
 msgid "/_File/_Attach file"
 msgstr "/_Dosya/_Dosya ekle"
 
-#: src/compose.c:507
+#: src/compose.c:505
 msgid "/_File/_Insert file"
 msgstr "/_Dosya/Dosya _içer"
 
-#: src/compose.c:508
+#: src/compose.c:506
 msgid "/_File/Insert si_gnature"
 msgstr "/_Dosya/İ_mza ekle"
 
-#: src/compose.c:513
+#: src/compose.c:511
 msgid "/_Edit/_Undo"
 msgstr "/Dü_zenle/_Geri al"
 
-#: src/compose.c:514
+#: src/compose.c:512
 msgid "/_Edit/_Redo"
 msgstr "/Dü_zenle/_Yenile"
 
-#: src/compose.c:515 src/compose.c:522 src/mainwindow.c:506
+#: src/compose.c:513 src/compose.c:520 src/mainwindow.c:497
 #: src/messageview.c:146
 msgid "/_Edit/---"
 msgstr "/Dü_zenle/---"
 
-#: src/compose.c:516
+#: src/compose.c:514
 msgid "/_Edit/Cu_t"
 msgstr "/Dü_zenle/_Kes"
 
-#: src/compose.c:517 src/mainwindow.c:503 src/messageview.c:144
+#: src/compose.c:515 src/mainwindow.c:494 src/messageview.c:144
 msgid "/_Edit/_Copy"
 msgstr "/Dü_zenle/K_opyala"
 
-#: src/compose.c:518
+#: src/compose.c:516
 msgid "/_Edit/_Paste"
 msgstr "/Dü_zenle/_Yapıştır"
 
-#: src/compose.c:519
+#: src/compose.c:517
 msgid "/_Edit/Paste as _quotation"
 msgstr "/Dü_zenle/_Alıntı Yaparak Yapıştır"
 
-#: src/compose.c:521 src/mainwindow.c:504 src/messageview.c:145
+#: src/compose.c:519 src/mainwindow.c:495 src/messageview.c:145
 msgid "/_Edit/Select _all"
 msgstr "/Dü_zenle/_Tümünü seç"
 
-#: src/compose.c:523
+#: src/compose.c:521
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/Dü_zenle/_Şuanki paragrafı kaydır"
 
-#: src/compose.c:525
+#: src/compose.c:523
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/Dü_zenle/Tüm _uzun satırları kaydır"
 
-#: src/compose.c:527
+#: src/compose.c:525
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/Dü_zenle/Otomatik ka_ydır"
 
-#: src/compose.c:528 src/mainwindow.c:511 src/messageview.c:150
+#: src/compose.c:526 src/mainwindow.c:502 src/messageview.c:150
 #: src/summaryview.c:400
 msgid "/_View"
 msgstr "/_Görünüm"
 
-#: src/compose.c:529
+#: src/compose.c:527
 msgid "/_View/_To"
 msgstr "/_Görünüm/_Alıcı"
 
-#: src/compose.c:530
+#: src/compose.c:528
 msgid "/_View/_Cc"
 msgstr "/_Görünüm/_Cc"
 
-#: src/compose.c:531
+#: src/compose.c:529
 msgid "/_View/_Bcc"
 msgstr "/_Görünüm/_Bcc"
 
-#: src/compose.c:532
+#: src/compose.c:530
 msgid "/_View/_Reply to"
 msgstr "/_Görünüm/_Yanıtla/"
 
-#: src/compose.c:533 src/compose.c:535 src/compose.c:537 src/compose.c:539
-#: src/mainwindow.c:529 src/mainwindow.c:532 src/mainwindow.c:558
-#: src/mainwindow.c:582 src/mainwindow.c:675 src/mainwindow.c:679
+#: src/compose.c:531 src/compose.c:533 src/compose.c:535 src/compose.c:537
+#: src/mainwindow.c:520 src/mainwindow.c:523 src/mainwindow.c:549
+#: src/mainwindow.c:573 src/mainwindow.c:666 src/mainwindow.c:670
 #: src/messageview.c:233
 msgid "/_View/---"
 msgstr "/_Görünüm/---"
 
-#: src/compose.c:534
+#: src/compose.c:532
 msgid "/_View/_Followup to"
 msgstr "/_Görünüm/_Kodlama/"
 
-#: src/compose.c:536
+#: src/compose.c:534
 msgid "/_View/R_uler"
 msgstr "/_Görünüm/_Cetvel"
 
-#: src/compose.c:538
+#: src/compose.c:536
 msgid "/_View/_Attachment"
 msgstr "/_Görünüm/_Ek"
 
-#: src/compose.c:545 src/mainwindow.c:589 src/messageview.c:157
+#: src/compose.c:543 src/mainwindow.c:580 src/messageview.c:157
 #, fuzzy
 msgid "/_View/Character _encoding"
 msgstr "/_Görünüm/_Sırala/Azalan sırala"
 
-#: src/compose.c:546
+#: src/compose.c:544
 msgid "/_View/Character _encoding/_Automatic"
 msgstr ""
 
-#: src/compose.c:548 src/compose.c:554 src/compose.c:560 src/compose.c:564
-#: src/compose.c:570 src/compose.c:574 src/compose.c:580 src/compose.c:584
-#: src/compose.c:594 src/compose.c:598 src/compose.c:608 src/compose.c:612
-#: src/mainwindow.c:585 src/mainwindow.c:592 src/messageview.c:153
+#: src/compose.c:546 src/compose.c:552 src/compose.c:558 src/compose.c:562
+#: src/compose.c:568 src/compose.c:572 src/compose.c:578 src/compose.c:582
+#: src/compose.c:592 src/compose.c:596 src/compose.c:606 src/compose.c:610
+#: src/mainwindow.c:576 src/mainwindow.c:583 src/messageview.c:153
 #, fuzzy
 msgid "/_View/Character _encoding/---"
 msgstr "/_Görünüm/_Sırala/Azalan sırala"
 
-#: src/compose.c:550 src/mainwindow.c:593 src/messageview.c:161
+#: src/compose.c:548 src/mainwindow.c:584 src/messageview.c:161
 #, 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:552 src/mainwindow.c:595 src/messageview.c:164
+#: src/compose.c:550 src/mainwindow.c:586 src/messageview.c:164
 #, fuzzy
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Görünüm/_Kodlama/Unicode (_UTF-8)"
 
-#: src/compose.c:556 src/mainwindow.c:599 src/messageview.c:167
+#: src/compose.c:554 src/mainwindow.c:590 src/messageview.c:167
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Görünüm/_Kodlama/Batı Avrupa (ISO-8859-_1)"
 
-#: src/compose.c:558 src/mainwindow.c:601 src/messageview.c:169
+#: src/compose.c:556 src/mainwindow.c:592 src/messageview.c:169
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Görünüm/_Kodlama/Batı Avrupa (ISO-8859-_15)"
 
-#: src/compose.c:562 src/mainwindow.c:605 src/messageview.c:172
+#: src/compose.c:560 src/mainwindow.c:596 src/messageview.c:172
 #, fuzzy
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Görünüm/_Kodlama/Orta Avrupa (ISO-8859-_2)"
 
-#: src/compose.c:566 src/mainwindow.c:609 src/messageview.c:175
+#: src/compose.c:564 src/mainwindow.c:600 src/messageview.c:175
 #, fuzzy
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Görünüm/_Kodlama/_Baltık (ISO-8859-13)"
 
-#: src/compose.c:568 src/mainwindow.c:611 src/messageview.c:177
+#: src/compose.c:566 src/mainwindow.c:602 src/messageview.c:177
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Görünüm/_Kodlama/Baltık (ISO-8859-_4)"
 
-#: src/compose.c:572 src/mainwindow.c:615 src/messageview.c:180
+#: src/compose.c:570 src/mainwindow.c:606 src/messageview.c:180
 #, fuzzy
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Görünüm/_Kodlama/Yunanca (ISO-8859-_7)"
 
-#: src/compose.c:576 src/mainwindow.c:619 src/messageview.c:183
+#: src/compose.c:574 src/mainwindow.c:610 src/messageview.c:183
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Görünüm/_Kodlama/Yunanca (ISO-8859-_7)"
 
-#: src/compose.c:578 src/mainwindow.c:621 src/messageview.c:185
+#: src/compose.c:576 src/mainwindow.c:612 src/messageview.c:185
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Görünüm/_Kodlama/Kiril (Windows-1251)"
 
-#: src/compose.c:582 src/mainwindow.c:625 src/messageview.c:188
+#: src/compose.c:580 src/mainwindow.c:616 src/messageview.c:188
 #, fuzzy
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Görünüm/_Kodlama/Türkçe (ISO-8859-_9)"
 
-#: src/compose.c:586 src/mainwindow.c:629 src/messageview.c:191
+#: src/compose.c:584 src/mainwindow.c:620 src/messageview.c:191
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Görünüm/_Kodlama/Kiril (ISO-8859-_5)"
 
-#: src/compose.c:588 src/mainwindow.c:631 src/messageview.c:193
+#: src/compose.c:586 src/mainwindow.c:622 src/messageview.c:193
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Görünüm/_Kodlama/Kiril (ISO-8859-_5)"
 
-#: src/compose.c:590 src/mainwindow.c:633 src/messageview.c:195
+#: src/compose.c:588 src/mainwindow.c:624 src/messageview.c:195
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Görünüm/_Kodlama/Kiril (KOI8-U)"
 
-#: src/compose.c:592 src/mainwindow.c:635 src/messageview.c:197
+#: src/compose.c:590 src/mainwindow.c:626 src/messageview.c:197
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Görünüm/_Kodlama/Kiril (Windows-1251)"
 
-#: src/compose.c:596 src/mainwindow.c:639 src/messageview.c:200
+#: src/compose.c:594 src/mainwindow.c:630 src/messageview.c:200
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Görünüm/_Kodlama/Japonca (ISO-2022-_JP)"
 
-#: src/compose.c:600 src/mainwindow.c:649 src/messageview.c:209
+#: src/compose.c:598 src/mainwindow.c:640 src/messageview.c:209
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Görünüm/_Kodlama/Basit Çince (_GB2312)"
 
-#: src/compose.c:602 src/mainwindow.c:651 src/messageview.c:211
+#: src/compose.c:600 src/mainwindow.c:642 src/messageview.c:211
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Görünüm/_Kodlama/Basit Çince (_GB2312)"
 
-#: src/compose.c:604 src/mainwindow.c:653 src/messageview.c:213
+#: src/compose.c:602 src/mainwindow.c:644 src/messageview.c:213
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Görünüm/_Kodlama/Geleneksel Çince (_Big5)"
 
-#: src/compose.c:606 src/mainwindow.c:655 src/messageview.c:215
+#: src/compose.c:604 src/mainwindow.c:646 src/messageview.c:215
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Görünüm/_Kodlama/Geleneksel Çince (EUC-_TW)"
 
-#: src/compose.c:610 src/mainwindow.c:661 src/messageview.c:220
+#: src/compose.c:608 src/mainwindow.c:652 src/messageview.c:220
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Görünüm/_Kodlama/Korece (EUC-_KR)"
 
-#: src/compose.c:614 src/mainwindow.c:667 src/messageview.c:225
+#: src/compose.c:612 src/mainwindow.c:658 src/messageview.c:225
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Görünüm/_Kodlama/Tayca (TIS-620)"
 
-#: src/compose.c:616 src/mainwindow.c:669 src/messageview.c:227
+#: src/compose.c:614 src/mainwindow.c:660 src/messageview.c:227
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Görünüm/_Kodlama/Tayca (Windows-874)"
 
-#: src/compose.c:620 src/mainwindow.c:726 src/messageview.c:257
+#: src/compose.c:618 src/mainwindow.c:717 src/messageview.c:257
 msgid "/_Tools/_Address book"
 msgstr "/A_raçlar/_Adres defteri"
 
-#: src/compose.c:621
+#: src/compose.c:619
 msgid "/_Tools/_Template"
 msgstr "/A_raçlar/Ş_ablon"
 
-#: src/compose.c:622 src/mainwindow.c:749 src/messageview.c:272
+#: src/compose.c:620 src/mainwindow.c:740 src/messageview.c:272
 msgid "/_Tools/Actio_ns"
 msgstr "/A_raçlar/E_ylemler"
 
-#: src/compose.c:623 src/compose.c:627 src/mainwindow.c:729
-#: src/mainwindow.c:743 src/mainwindow.c:748 src/mainwindow.c:750
-#: src/mainwindow.c:753 src/mainwindow.c:755 src/messageview.c:260
+#: src/compose.c:621 src/compose.c:625 src/mainwindow.c:720
+#: src/mainwindow.c:734 src/mainwindow.c:739 src/mainwindow.c:741
+#: src/mainwindow.c:744 src/mainwindow.c:746 src/messageview.c:260
 #: src/messageview.c:271
 msgid "/_Tools/---"
 msgstr "/A_raçlar/---"
 
-#: src/compose.c:624
+#: src/compose.c:622
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/A_raçlar/Harici _düzenleyicide aç"
 
-#: src/compose.c:628
+#: src/compose.c:626
 msgid "/_Tools/PGP Si_gn"
 msgstr "/A_raçlar/PGP İ_mza"
 
-#: src/compose.c:629
+#: src/compose.c:627
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/A_raçlar/PGP ile Ş_ifrele"
 
-#: src/compose.c:855
+#: src/compose.c:853
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: dosya bulunamadı\n"
 
-#: src/compose.c:954 src/compose.c:1024 src/procmsg.c:1353
+#: src/compose.c:952 src/compose.c:1022 src/procmsg.c:1353
 msgid "Can't get text part\n"
 msgstr "Metin bölümü alınamadı\n"
 
-#: src/compose.c:1420
+#: src/compose.c:1418
 msgid "Quote mark format error."
 msgstr "Alıntı formatı hatası."
 
-#: src/compose.c:1432
+#: src/compose.c:1430
 msgid "Message reply/forward format error."
 msgstr "Posta cevapla/ilet formatı hatası"
 
-#: src/compose.c:1801
+#: src/compose.c:1799
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "%s dosyası bulunamadı\n"
 
-#: src/compose.c:1805
+#: src/compose.c:1803
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "%s dosyasının boyu bulunamadı\n"
 
-#: src/compose.c:1809
+#: src/compose.c:1807
 #, c-format
 msgid "File %s is empty."
 msgstr "%s dosyası boş."
 
-#: src/compose.c:1813
+#: src/compose.c:1811
 #, c-format
 msgid "Can't read %s."
 msgstr "%s okunamadı."
 
-#: src/compose.c:1848
+#: src/compose.c:1846
 #, c-format
 msgid "Message: %s"
 msgstr "İleti: %s"
 
-#: src/compose.c:1920 src/mimeview.c:560
+#: src/compose.c:1918 src/mimeview.c:560
 msgid "Can't get the part of multipart message."
 msgstr "Çok parçalı mesajın bir kısmı alınamadı"
 
-#: src/compose.c:2362
+#: src/compose.c:2360
 msgid " [Edited]"
 msgstr " [Düzenlendi]"
 
-#: src/compose.c:2364
+#: src/compose.c:2362
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - İleti düzenle (%s)"
 
-#: src/compose.c:2367
+#: src/compose.c:2365
 #, c-format
 msgid "Compose message%s"
 msgstr "İleti düzenle (%s)"
 
-#: src/compose.c:2478
+#: src/compose.c:2476
 msgid "Recipient is not specified."
 msgstr "Alıcı belirtilmedi."
 
-#: src/compose.c:2486
+#: src/compose.c:2484
 #, fuzzy
 msgid "Empty subject"
 msgstr "Konu"
 
-#: src/compose.c:2487
+#: src/compose.c:2485
 msgid "Subject is empty. Send it anyway?"
 msgstr "Konuyu boş bıraktınız. Yine de göndermek istiyor musunuz?"
 
-#: src/compose.c:2538
+#: src/compose.c:2536
 msgid "can't get recipient list."
 msgstr "alıcı listesi alınamadı."
 
-#: src/compose.c:2558
+#: src/compose.c:2556
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1022,26 +1022,26 @@ msgstr ""
 "İletinin gönderileceği hesap belirtilmedi.\n"
 "Lütfen göndermeden önce bir e-posta hesabı girin."
 
-#: src/compose.c:2572 src/send_message.c:297
+#: src/compose.c:2570 src/send_message.c:297
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "İleti, %s adresine gönderilirken bir hata oluştu."
 
-#: src/compose.c:2595
+#: src/compose.c:2593
 msgid "Can't save the message to outbox."
 msgstr "İleti, giden kutusuna kaydedilemiyor."
 
-#: src/compose.c:2645
+#: src/compose.c:2643
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "Seçilen `%s' anahtar kimliğiyle bir eşleştirme yapılamadı."
 
-#: src/compose.c:2709 src/compose.c:2965 src/compose.c:3028 src/compose.c:3148
-#: src/utils.c:2365
+#: src/compose.c:2707 src/compose.c:2963 src/compose.c:3026 src/compose.c:3146
+#: src/utils.c:2379
 msgid "can't change file mode\n"
 msgstr "dosya modu değiştirilemedi\n"
 
-#: src/compose.c:2741
+#: src/compose.c:2739
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1052,12 +1052,12 @@ msgstr ""
 "%s / %s\n"
 "Yine de gönderilsin mi?"
 
-#: src/compose.c:2747
+#: src/compose.c:2745
 #, fuzzy
 msgid "Code conversion error"
 msgstr "Adres defteri çevrim hatası"
 
-#: src/compose.c:2816
+#: src/compose.c:2814
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1066,155 +1066,155 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:2820
+#: src/compose.c:2818
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3108
+#: src/compose.c:3106
 msgid "can't remove the old message\n"
 msgstr "eski ileti silinemedi\n"
 
-#: src/compose.c:3126
+#: src/compose.c:3124
 msgid "queueing message...\n"
 msgstr "ileti kuyruğa gönderiliyor...\n"
 
-#: src/compose.c:3208
+#: src/compose.c:3206
 msgid "can't find queue folder\n"
 msgstr "kuyruk dizini bulunamadı\n"
 
-#: src/compose.c:3215
+#: src/compose.c:3213
 msgid "can't queue the message\n"
 msgstr "ileti kuyruğa gönderilemedi\n"
 
-#: src/compose.c:3792
+#: src/compose.c:3790
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "İleti numarası oluşturuldu: %s\n"
 
-#: src/compose.c:3901
+#: src/compose.c:3899
 msgid "Creating compose window...\n"
 msgstr "Düzenleme penceresi oluşturuluyor...\n"
 
-#: src/compose.c:3949 src/headerview.c:54 src/summary_search.c:214
+#: src/compose.c:3947 src/headerview.c:54 src/summary_search.c:214
 msgid "From:"
 msgstr "Kimden:"
 
-#: src/compose.c:4021
+#: src/compose.c:4019
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/A_raçlar/PGP İ_mza"
 
-#: src/compose.c:4024
+#: src/compose.c:4022
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/A_raçlar/PGP ile Ş_ifrele"
 
-#: src/compose.c:4062 src/compose.c:5001
+#: src/compose.c:4060 src/compose.c:4995
 msgid "MIME type"
 msgstr "MIME türü"
 
 #. S_COL_DATE
-#: src/compose.c:4071 src/mimeview.c:192 src/prefs_filter_edit.c:585
+#: src/compose.c:4069 src/mimeview.c:192 src/prefs_filter_edit.c:585
 #: src/prefs_summary_column.c:75 src/select-keys.c:317 src/summaryview.c:4217
 msgid "Size"
 msgstr "Boyut"
 
-#: src/compose.c:4449 src/mainwindow.c:2224 src/prefs_account.c:719
+#: src/compose.c:4442 src/mainwindow.c:2207 src/prefs_account.c:719
 #: src/prefs_common.c:947
 msgid "Send"
 msgstr "Gönder"
 
-#: src/compose.c:4450
+#: src/compose.c:4443
 msgid "Send message"
 msgstr "İletiyi gönder"
 
-#: src/compose.c:4458
+#: src/compose.c:4451
 msgid "Send later"
 msgstr "Sonra gönder"
 
-#: src/compose.c:4459
+#: src/compose.c:4452
 msgid "Put into queue folder and send later"
 msgstr "İletiyi kuyruğa aktar ve sonra gönder"
 
-#: src/compose.c:4467
+#: src/compose.c:4460
 msgid "Draft"
 msgstr "Taslak"
 
-#: src/compose.c:4468
+#: src/compose.c:4461
 msgid "Save to draft folder"
 msgstr "Taslak dizinine kaydet"
 
-#: src/compose.c:4478
+#: src/compose.c:4471
 msgid "Insert"
 msgstr "İçer"
 
-#: src/compose.c:4479
+#: src/compose.c:4472
 msgid "Insert file"
 msgstr "Dosya içer"
 
-#: src/compose.c:4487
+#: src/compose.c:4480
 msgid "Attach"
 msgstr "Ekle"
 
-#: src/compose.c:4488
+#: src/compose.c:4481
 msgid "Attach file"
 msgstr "Dosya ekle"
 
 #. signature
-#: src/compose.c:4498 src/prefs_account.c:1391 src/prefs_common.c:1356
+#: src/compose.c:4491 src/prefs_account.c:1391 src/prefs_common.c:1356
 msgid "Signature"
 msgstr "İmza"
 
-#: src/compose.c:4499
+#: src/compose.c:4492
 msgid "Insert signature"
 msgstr "İmza ekle"
 
-#: src/compose.c:4508 src/prefs_common.c:1378 src/prefs_common.c:2382
+#: src/compose.c:4501 src/prefs_common.c:1378 src/prefs_common.c:2382
 msgid "Editor"
 msgstr "Düzenleyici"
 
-#: src/compose.c:4509
+#: src/compose.c:4502
 msgid "Edit with external editor"
 msgstr "Harici bir düzenleyici kullan"
 
-#: src/compose.c:4517
+#: src/compose.c:4510
 msgid "Linewrap"
 msgstr "Satır kaydır"
 
-#: src/compose.c:4518
+#: src/compose.c:4511
 msgid "Wrap all long lines"
 msgstr "Tüm uzun satırları kaydır"
 
-#: src/compose.c:4897
+#: src/compose.c:4891
 msgid "Invalid MIME type."
 msgstr "Geçersiz MIME türü."
 
-#: src/compose.c:4915
+#: src/compose.c:4909
 msgid "File doesn't exist or is empty."
 msgstr "Dosya yok, ya da boş."
 
-#: src/compose.c:4983
+#: src/compose.c:4977
 msgid "Properties"
 msgstr "Özellikler"
 
-#: src/compose.c:5003
+#: src/compose.c:4997
 msgid "Encoding"
 msgstr "Kodlama"
 
-#: src/compose.c:5026 src/prefs_folder_item.c:183
+#: src/compose.c:5020 src/prefs_folder_item.c:183
 msgid "Path"
 msgstr "Yol"
 
-#: src/compose.c:5027
+#: src/compose.c:5021
 msgid "File name"
 msgstr "Dosya adı"
 
-#: src/compose.c:5185
+#: src/compose.c:5179
 #, 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:5211
+#: src/compose.c:5205
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1225,75 +1225,75 @@ msgstr ""
 "Bu süreci sonlandırayım mı?\n"
 "Programın grup numarası (GID): %d"
 
-#: src/compose.c:5228
+#: src/compose.c:5222
 #, c-format
 msgid "Terminated process group id: %d"
 msgstr "Grup numarası %d olan süreç sonlandırıldı"
 
-#: src/compose.c:5229
+#: src/compose.c:5223
 #, c-format
 msgid "Temporary file: %s"
 msgstr "Geçici dosya: %s"
 
-#: src/compose.c:5253
+#: src/compose.c:5247
 msgid "Compose: input from monitoring process\n"
 msgstr "Düzenle: süreç görüntüsünü içer\n"
 
 #. failed
-#: src/compose.c:5284
+#: src/compose.c:5278
 msgid "Couldn't exec external editor\n"
 msgstr "Harici düzenleyici çalıştırılamadı\n"
 
-#: src/compose.c:5288
+#: src/compose.c:5282
 msgid "Couldn't write to file\n"
 msgstr "Dosyaya yazılamadı\n"
 
-#: src/compose.c:5290
+#: src/compose.c:5284
 msgid "Pipe read failed\n"
 msgstr "Boru okumada hata\n"
 
-#: src/compose.c:5596 src/compose.c:5604 src/compose.c:5610
+#: src/compose.c:5590 src/compose.c:5598 src/compose.c:5604
 msgid "Can't queue the message."
 msgstr "İleti kuyruğa gönderilemedi."
 
-#: src/compose.c:5701
+#: src/compose.c:5695
 #, fuzzy
 msgid "Select files"
 msgstr "Dosya seç"
 
-#: src/compose.c:5723
+#: src/compose.c:5717
 msgid "Select file"
 msgstr "Dosya seç"
 
-#: src/compose.c:5760
+#: src/compose.c:5754
 #, fuzzy
 msgid "Save message"
 msgstr "İletiyi gönder"
 
-#: src/compose.c:5761
+#: src/compose.c:5755
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Bu ileti değiştirildi. Silinsin mi?"
 
-#: src/compose.c:5763
+#: src/compose.c:5757
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:5805
+#: src/compose.c:5799
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "%s şablonunu uygulamak istiyor musunuz?"
 
-#: src/compose.c:5807
+#: src/compose.c:5801
 msgid "Apply template"
 msgstr "Şablonu uygula"
 
-#: src/compose.c:5808
+#: src/compose.c:5802
 #, fuzzy
 msgid "_Replace"
 msgstr "Değiştir"
 
-#: src/compose.c:5808
+#: src/compose.c:5802
 #, fuzzy
 msgid "_Insert"
 msgstr "İçer"
@@ -1739,12 +1739,12 @@ msgstr "Dizin bilgisi ayarlanıyor...\n"
 msgid "Setting folder info..."
 msgstr "Dizin bilgisi ayarlanıyor..."
 
-#: src/folderview.c:805 src/mainwindow.c:3301 src/setup.c:81
+#: src/folderview.c:805 src/mainwindow.c:3272 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "%s%c%s dizini taranıyor..."
 
-#: src/folderview.c:809 src/mainwindow.c:3306 src/setup.c:86
+#: src/folderview.c:809 src/mainwindow.c:3277 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "%s dizini taranıyor..."
@@ -2065,44 +2065,44 @@ msgstr "IMAP4 yetkilendirmesi başarısız.\n"
 msgid "IMAP4 login failed.\n"
 msgstr "IMAP4 girişinde hata.\n"
 
-#: src/imap.c:3522
+#: src/imap.c:3528
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "%s, %s üzerine eklenemedi\n"
 
-#: src/imap.c:3529
+#: src/imap.c:3535
 msgid "(sending file...)"
 msgstr "(dosya gönderiliyor...)"
 
-#: src/imap.c:3557
+#: src/imap.c:3563
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "ileti %s'ye eklenemiyor\n"
 
-#: src/imap.c:3589
+#: src/imap.c:3595
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "%s, %s konumuna kopyalanamadı\n"
 
-#: src/imap.c:3613
+#: src/imap.c:3619
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "imap komutu sırasında hata oluştu: STORE %s %s\n"
 
-#: src/imap.c:3627
+#: src/imap.c:3633
 msgid "error while imap command: EXPUNGE\n"
 msgstr "EXPUNGE komutu sırasında hata oluştu\n"
 
-#: src/imap.c:3640
+#: src/imap.c:3646
 msgid "error while imap command: CLOSE\n"
 msgstr "imap komutu sırasında hata oluştu: CLOSE\n"
 
-#: src/imap.c:3873
+#: src/imap.c:3879
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv, UTF-7 yi %s'e çeviremedi\n"
 
-#: src/imap.c:3903
+#: src/imap.c:3909
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv %s yi UTF-7'ye çeviremedi\n"
@@ -2204,7 +2204,7 @@ msgstr "LDIF dosyasını Adres Defterine aktar"
 msgid "Prev"
 msgstr "Önceki"
 
-#: src/importldif.c:768 src/mainwindow.c:2321
+#: src/importldif.c:768 src/mainwindow.c:2303
 msgid "Next"
 msgstr "Sonraki"
 
@@ -2547,628 +2547,628 @@ msgid ""
 "Do you want to migrate it?"
 msgstr ""
 
-#: src/mainwindow.c:471
+#: src/mainwindow.c:462
 msgid "/_File/_Folder"
 msgstr "/_Dosya/D_izin"
 
-#: src/mainwindow.c:472
+#: src/mainwindow.c:463
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/_Dosya/Di_zin/Y_eni dizin oluştur..."
 
-#: src/mainwindow.c:474
+#: src/mainwindow.c:465
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/_Dosya/Di_zin/Di_zini yeniden adlandır..."
 
-#: src/mainwindow.c:475
+#: src/mainwindow.c:466
 #, fuzzy
 msgid "/_File/_Folder/_Move folder..."
 msgstr "/_Dosya/Di_zin/Di_zini yeniden adlandır..."
 
-#: src/mainwindow.c:476
+#: src/mainwindow.c:467
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/_Dosya/Di_zin/Dizini _sil"
 
-#: src/mainwindow.c:477
+#: src/mainwindow.c:468
 msgid "/_File/_Mailbox"
 msgstr "/_Dosya/_Posta kutusu"
 
-#: src/mainwindow.c:478
+#: src/mainwindow.c:469
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/_Dosya/_Posta kutusu/Posta kutusu e_kle..."
 
-#: src/mainwindow.c:479
+#: src/mainwindow.c:470
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/_Dosya/_Posta Kutusu/_Posta kutusunu kaldır"
 
-#: src/mainwindow.c:480 src/mainwindow.c:485
+#: src/mainwindow.c:471 src/mainwindow.c:476
 msgid "/_File/_Mailbox/---"
 msgstr "/_Dosya/_Posta Kutusu/---"
 
-#: src/mainwindow.c:481
+#: src/mainwindow.c:472
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "/_Dosya/_Posta Kutusu/Yeni mesajlar için k_ontrol et"
 
-#: src/mainwindow.c:483
+#: src/mainwindow.c:474
 msgid "/_File/_Mailbox/Check for new messages in _all mailboxes"
 msgstr ""
 "/_Dosya/_Posta Kutusu/_Tüm posta kutuları için yeni mesajları kontrol et"
 
-#: src/mainwindow.c:486
+#: src/mainwindow.c:477
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "/_Dosya/_Posta Kutusu/Dizin ağacını _yeniden oluştur"
 
-#: src/mainwindow.c:489
+#: src/mainwindow.c:480
 msgid "/_File/_Import mbox file..."
 msgstr "/_Dosya/Posta k_utusu dosyasını aktar..."
 
-#: src/mainwindow.c:490
+#: src/mainwindow.c:481
 msgid "/_File/_Export to mbox file..."
 msgstr "/_Dosya/_Posta kutusu dosyasına gönder..."
 
-#: src/mainwindow.c:492
+#: src/mainwindow.c:483
 msgid "/_File/Empty all _trash"
 msgstr "/_Dosya/Tüm çö_pü boşalt"
 
-#: src/mainwindow.c:494 src/messageview.c:138
+#: src/mainwindow.c:485 src/messageview.c:138
 msgid "/_File/_Save as..."
 msgstr "/_Dosya/_Farklı kaydet..."
 
-#: src/mainwindow.c:495 src/messageview.c:139
+#: src/mainwindow.c:486 src/messageview.c:139
 msgid "/_File/_Print..."
 msgstr "/_Dosya/_Yazdır..."
 
-#: src/mainwindow.c:497
+#: src/mainwindow.c:488
 msgid "/_File/_Work offline"
 msgstr "/_Dosya/Çevrimdı_şı çalış"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:500
+#: src/mainwindow.c:491
 msgid "/_File/E_xit"
 msgstr "/_Dosya/Çı_k"
 
-#: src/mainwindow.c:505
+#: src/mainwindow.c:496
 msgid "/_Edit/Select _thread"
 msgstr "/Dü_zenle/_Sıralı seç"
 
-#: src/mainwindow.c:507 src/messageview.c:147
+#: src/mainwindow.c:498 src/messageview.c:147
 msgid "/_Edit/_Find in current message..."
 msgstr "/Dü_zenle/Gü_ncel iletide bul..."
 
-#: src/mainwindow.c:509
+#: src/mainwindow.c:500
 msgid "/_Edit/_Search messages..."
 msgstr "/Dü_zenle/_İletilerde ara..."
 
-#: src/mainwindow.c:512
+#: src/mainwindow.c:503
 msgid "/_View/Show or hi_de"
 msgstr "/_Görünüm/Göster veya _gizle"
 
-#: src/mainwindow.c:513
+#: src/mainwindow.c:504
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/_Görünüm/Göster veya _gizle/_Dizin ağacı"
 
-#: src/mainwindow.c:515
+#: src/mainwindow.c:506
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/_Görünüm/Göster veya _gizle/İ_leti görünümü"
 
-#: src/mainwindow.c:517
+#: src/mainwindow.c:508
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/_Görünüm/Göster veya _gizle/_Araç çubuğu"
 
-#: src/mainwindow.c:519
+#: src/mainwindow.c:510
 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:521
+#: src/mainwindow.c:512
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/_Görünüm/Göster veya _gizle/_Araç çubuğu/_Simge"
 
-#: src/mainwindow.c:523
+#: src/mainwindow.c:514
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/_Görünüm/Göster veya _gizle/_Araç çubuğu/_Metin"
 
-#: src/mainwindow.c:525
+#: src/mainwindow.c:516
 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:527
+#: src/mainwindow.c:518
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/_Görünüm/Göster veya _gizle/_Durum çubuğu"
 
-#: src/mainwindow.c:530
+#: src/mainwindow.c:521
 msgid "/_View/Separate f_older tree"
 msgstr "/_Görünüm/D_izin ağacını ayır"
 
-#: src/mainwindow.c:531
+#: src/mainwindow.c:522
 #, fuzzy
 msgid "/_View/Separate _message view"
 msgstr "/_Görünüm/Ayrı _ileti görünümü"
 
-#: src/mainwindow.c:533
+#: src/mainwindow.c:524
 msgid "/_View/_Sort"
 msgstr "/_Görünüm/_Sırala"
 
-#: src/mainwindow.c:534
+#: src/mainwindow.c:525
 msgid "/_View/_Sort/by _number"
 msgstr "/_Görünüm/Sıra_la/_Numaraya göre"
 
-#: src/mainwindow.c:535
+#: src/mainwindow.c:526
 msgid "/_View/_Sort/by s_ize"
 msgstr "/_Görünüm/Sıra_la/_Boyuta göre"
 
-#: src/mainwindow.c:536
+#: src/mainwindow.c:527
 msgid "/_View/_Sort/by _date"
 msgstr "/_Görünüm/Sıra_la/_Tarihe göre"
 
-#: src/mainwindow.c:537
+#: src/mainwindow.c:528
 msgid "/_View/_Sort/by _from"
 msgstr "/_Görünüm/Sıra_la/_Gönderene göre"
 
-#: src/mainwindow.c:538
+#: src/mainwindow.c:529
 msgid "/_View/_Sort/by _recipient"
 msgstr "/_Görünüm/Sıra_la/_Alıcıya göre"
 
-#: src/mainwindow.c:539
+#: src/mainwindow.c:530
 msgid "/_View/_Sort/by _subject"
 msgstr "/_Görünüm/Sıra_la/_Konuya göre"
 
-#: src/mainwindow.c:540
+#: src/mainwindow.c:531
 msgid "/_View/_Sort/by _color label"
 msgstr "/_Görünüm/Sıra_la/_Renge göre"
 
-#: src/mainwindow.c:542
+#: src/mainwindow.c:533
 msgid "/_View/_Sort/by _mark"
 msgstr "/_Görünüm/Sıra_la/İş_arete göre"
 
-#: src/mainwindow.c:543
+#: src/mainwindow.c:534
 msgid "/_View/_Sort/by _unread"
 msgstr "/_Görünüm/Sıra_la/_Okunmamışa göre"
 
-#: src/mainwindow.c:544
+#: src/mainwindow.c:535
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/_Görünüm/Sıra_la/E_klentiye göre"
 
-#: src/mainwindow.c:546
+#: src/mainwindow.c:537
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/_Görünüm/Sıra_la/_Sıralama yapma"
 
-#: src/mainwindow.c:547 src/mainwindow.c:550
+#: src/mainwindow.c:538 src/mainwindow.c:541
 msgid "/_View/_Sort/---"
 msgstr "/_Görünüm/Sıra_la/---"
 
-#: src/mainwindow.c:548
+#: src/mainwindow.c:539
 msgid "/_View/_Sort/Ascending"
 msgstr "/_Görünüm/_Sırala/Artan sırala"
 
-#: src/mainwindow.c:549
+#: src/mainwindow.c:540
 msgid "/_View/_Sort/Descending"
 msgstr "/_Görünüm/_Sırala/Azalan sırala"
 
-#: src/mainwindow.c:551
+#: src/mainwindow.c:542
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/_Görünüm/Sıra_la/Konuya _göre izle"
 
-#: src/mainwindow.c:553
+#: src/mainwindow.c:544
 msgid "/_View/Th_read view"
 msgstr "/_Görünüm/_Konum görünümü"
 
-#: src/mainwindow.c:554
+#: src/mainwindow.c:545
 msgid "/_View/E_xpand all threads"
 msgstr "/_Görünüm/Tüm _başlıkları genişlet"
 
-#: src/mainwindow.c:555
+#: src/mainwindow.c:546
 msgid "/_View/Co_llapse all threads"
 msgstr "/_Görünüm/Tüm _başlıkları küçült"
 
-#: src/mainwindow.c:556
+#: src/mainwindow.c:547
 msgid "/_View/Set display _item..."
 msgstr "/_Görünüm/_Görüntü öğesini seç..."
 
-#: src/mainwindow.c:559
+#: src/mainwindow.c:550
 msgid "/_View/_Go to"
 msgstr "/_Görünüm/_Git/"
 
-#: src/mainwindow.c:560
+#: src/mainwindow.c:551
 msgid "/_View/_Go to/_Prev message"
 msgstr "/_Görünüm/_Git/Önceki _ileti"
 
-#: src/mainwindow.c:561
+#: src/mainwindow.c:552
 msgid "/_View/_Go to/_Next message"
 msgstr "/_Görünüm/_Git/Sonraki _ileti"
 
-#: src/mainwindow.c:562 src/mainwindow.c:567 src/mainwindow.c:570
-#: src/mainwindow.c:575 src/mainwindow.c:580
+#: src/mainwindow.c:553 src/mainwindow.c:558 src/mainwindow.c:561
+#: src/mainwindow.c:566 src/mainwindow.c:571
 msgid "/_View/_Go to/---"
 msgstr "/_Görünüm/_Git/---"
 
-#: src/mainwindow.c:563
+#: src/mainwindow.c:554
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/_Görünüm/_Git/Ö_nceki okunmamış ileti"
 
-#: src/mainwindow.c:565
+#: src/mainwindow.c:556
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/_Görünüm/_Git/_Sonraki okunmamış ileti"
 
-#: src/mainwindow.c:568
+#: src/mainwindow.c:559
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/_Görünüm/_Git/Ö_nceki yeni ileti"
 
-#: src/mainwindow.c:569
+#: src/mainwindow.c:560
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/_Görünüm/_Git/Sonraki _yeni ileti"
 
-#: src/mainwindow.c:571
+#: src/mainwindow.c:562
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/_Görünüm/Gi_t/Önceki _işaretli ileti"
 
-#: src/mainwindow.c:573
+#: src/mainwindow.c:564
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/_Görünüm/Gi_t/S_onraki işaretli ileti"
 
-#: src/mainwindow.c:576
+#: src/mainwindow.c:567
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/_Görünüm/Gi_t/Ö_nceki _etiketli ileti"
 
-#: src/mainwindow.c:578
+#: src/mainwindow.c:569
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/_Görünüm/Gi_t/Son_raki etiketli ileti"
 
-#: src/mainwindow.c:581
+#: src/mainwindow.c:572
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Görünüm/Gi_t/_Başka dizine git..."
 
-#: src/mainwindow.c:590 src/messageview.c:158
+#: src/mainwindow.c:581 src/messageview.c:158
 #, fuzzy
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Görünüm/_Kodlama/_Otomatik tanı"
 
-#: src/mainwindow.c:641 src/messageview.c:202
+#: src/mainwindow.c:632 src/messageview.c:202
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Görünüm/_Kodlama/Japonca (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:643 src/messageview.c:204
+#: src/mainwindow.c:634 src/messageview.c:204
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Görünüm/_Kodlama/Japonca (_EUC-JP)"
 
-#: src/mainwindow.c:645 src/messageview.c:206
+#: src/mainwindow.c:636 src/messageview.c:206
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Görünüm/_Kodlama/Japonca (_Shift__JIS)"
 
-#: src/mainwindow.c:657 src/messageview.c:217
+#: src/mainwindow.c:648 src/messageview.c:217
 #, fuzzy
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Görünüm/_Kodlama/Çince (ISO-2022-_CN)"
 
-#: src/mainwindow.c:663 src/messageview.c:222
+#: src/mainwindow.c:654 src/messageview.c:222
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Görünüm/_Kodlama/Korece (ISO-2022-KR)"
 
-#: src/mainwindow.c:676 src/summaryview.c:401
+#: src/mainwindow.c:667 src/summaryview.c:401
 msgid "/_View/Open in new _window"
 msgstr "/_Görünüm/Yeni _pencerede aç"
 
-#: src/mainwindow.c:677 src/messageview.c:234
+#: src/mainwindow.c:668 src/messageview.c:234
 msgid "/_View/Mess_age source"
 msgstr "/_Görünüm/İ_leti kaynağı"
 
-#: src/mainwindow.c:678 src/messageview.c:235
+#: src/mainwindow.c:669 src/messageview.c:235
 msgid "/_View/Show all _header"
 msgstr "/_Görünüm/Tüm _başlıkları görüntüle"
 
-#: src/mainwindow.c:680
+#: src/mainwindow.c:671
 msgid "/_View/_Update summary"
 msgstr "/_Görünüm/_Görünümü güncelle"
 
-#: src/mainwindow.c:682 src/messageview.c:237
+#: src/mainwindow.c:673 src/messageview.c:237
 msgid "/_Message"
 msgstr "/İ_leti"
 
-#: src/mainwindow.c:683
+#: src/mainwindow.c:674
 msgid "/_Message/Recei_ve"
 msgstr "/İ_leti/_Al"
 
-#: src/mainwindow.c:684
+#: src/mainwindow.c:675
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/İ_leti/_Al/Ge_çerli hesaptan al"
 
-#: src/mainwindow.c:686
+#: src/mainwindow.c:677
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/İ_leti/_Al/T_üm hesaplardan al"
 
-#: src/mainwindow.c:688
+#: src/mainwindow.c:679
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/İ_leti/_Al/İ_ptal Et"
 
-#: src/mainwindow.c:690
+#: src/mainwindow.c:681
 msgid "/_Message/Recei_ve/---"
 msgstr "/İ_leti/_Al/---"
 
-#: src/mainwindow.c:691
+#: src/mainwindow.c:682
 msgid "/_Message/_Send queued messages"
 msgstr "/İ_leti/_Kuyruktaki iletileri gönder"
 
-#: src/mainwindow.c:692 src/mainwindow.c:694 src/mainwindow.c:701
-#: src/mainwindow.c:706 src/mainwindow.c:710 src/mainwindow.c:719
-#: src/mainwindow.c:722 src/messageview.c:240 src/messageview.c:248
+#: src/mainwindow.c:683 src/mainwindow.c:685 src/mainwindow.c:692
+#: src/mainwindow.c:697 src/mainwindow.c:701 src/mainwindow.c:710
+#: src/mainwindow.c:713 src/messageview.c:240 src/messageview.c:248
 #: src/messageview.c:253
 msgid "/_Message/---"
 msgstr "/İ_leti/---"
 
-#: src/mainwindow.c:693 src/messageview.c:238
+#: src/mainwindow.c:684 src/messageview.c:238
 msgid "/_Message/Compose _new message"
 msgstr "/İ_leti/Yeni _ileti gönder"
 
-#: src/mainwindow.c:695 src/messageview.c:241
+#: src/mainwindow.c:686 src/messageview.c:241
 msgid "/_Message/_Reply"
 msgstr "/İ_leti/Yanıtl_a"
 
-#: src/mainwindow.c:696
+#: src/mainwindow.c:687
 msgid "/_Message/Repl_y to"
 msgstr "/İ_leti/B_aşkasına yanıtla"
 
-#: src/mainwindow.c:697 src/messageview.c:242
+#: src/mainwindow.c:688 src/messageview.c:242
 msgid "/_Message/Repl_y to/_all"
 msgstr "/İ_leti/B_aşkasına yanıtla/_herkese"
 
-#: src/mainwindow.c:698 src/messageview.c:244
+#: src/mainwindow.c:689 src/messageview.c:244
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/İ_leti/B_aşkasına yanıtla/_gönderene"
 
-#: src/mainwindow.c:699 src/messageview.c:246
+#: src/mainwindow.c:690 src/messageview.c:246
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/İ_leti/B_aşkasına yanıtla/eposta l_istesine"
 
-#: src/mainwindow.c:702 src/messageview.c:249
+#: src/mainwindow.c:693 src/messageview.c:249
 msgid "/_Message/_Forward"
 msgstr "/İ_leti/Yö_nlendir"
 
-#: src/mainwindow.c:703 src/messageview.c:250
+#: src/mainwindow.c:694 src/messageview.c:250
 msgid "/_Message/For_ward as attachment"
 msgstr "/İ_leti/E_k olarak yönlendir"
 
-#: src/mainwindow.c:705 src/messageview.c:252
+#: src/mainwindow.c:696 src/messageview.c:252
 msgid "/_Message/Redirec_t"
 msgstr "/İ_leti/Yö_nlendir"
 
-#: src/mainwindow.c:707
+#: src/mainwindow.c:698
 msgid "/_Message/M_ove..."
 msgstr "/İ_leti/Taşı..."
 
-#: src/mainwindow.c:708
+#: src/mainwindow.c:699
 msgid "/_Message/_Copy..."
 msgstr "/İ_leti/_Kopyala..."
 
-#: src/mainwindow.c:709
+#: src/mainwindow.c:700
 msgid "/_Message/_Delete"
 msgstr "/İ_leti/_Sil"
 
-#: src/mainwindow.c:711
+#: src/mainwindow.c:702
 msgid "/_Message/_Mark"
 msgstr "/İ_leti/İş_aretle"
 
-#: src/mainwindow.c:712
+#: src/mainwindow.c:703
 msgid "/_Message/_Mark/_Mark"
 msgstr "/İ_leti/İş_aretle/İş_aretle"
 
-#: src/mainwindow.c:713
+#: src/mainwindow.c:704
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/İ_leti/İş_aretle/İşareti _kaldır"
 
-#: src/mainwindow.c:714
+#: src/mainwindow.c:705
 msgid "/_Message/_Mark/---"
 msgstr "/İ_leti/İş_aretle/---"
 
-#: src/mainwindow.c:715
+#: src/mainwindow.c:706
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/İ_leti/İş_aretle/O_kunmamış olarak işaretle"
 
-#: src/mainwindow.c:716
+#: src/mainwindow.c:707
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/İ_leti/İş_aretle/Ok_unmuş olarak işaretle"
 
-#: src/mainwindow.c:718
+#: src/mainwindow.c:709
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/İ_leti/İş_aretle/Hepsini _okunmuş olarak işaretle"
 
-#: src/mainwindow.c:720
+#: src/mainwindow.c:711
 #, fuzzy
 msgid "/_Message/Set as _junk mail"
 msgstr "/İ_leti/İş_aretle/İşareti _kaldır"
 
-#: src/mainwindow.c:721
+#: src/mainwindow.c:712
 msgid "/_Message/Set as not j_unk mail"
 msgstr ""
 
-#: src/mainwindow.c:723 src/messageview.c:254
+#: src/mainwindow.c:714 src/messageview.c:254
 msgid "/_Message/Re-_edit"
 msgstr "/İ_leti/Ye_niden düzenle"
 
-#: src/mainwindow.c:727
+#: src/mainwindow.c:718
 #, fuzzy
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/A_raçlar/Göndereni adres defterine ekle"
 
-#: src/mainwindow.c:730
+#: src/mainwindow.c:721
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/A_raçlar/_Dizin içindeki tüm iletileri filtrele"
 
-#: src/mainwindow.c:732
+#: src/mainwindow.c:723
 msgid "/_Tools/Filter _selected messages"
 msgstr "/A_raçlar/S_eçilen tüm mesajları filtrele"
 
-#: src/mainwindow.c:734 src/messageview.c:261
+#: src/mainwindow.c:725 src/messageview.c:261
 msgid "/_Tools/_Create filter rule"
 msgstr "/A_raçlar/Filtre _kuralı oluştur"
 
-#: src/mainwindow.c:735 src/messageview.c:263
+#: src/mainwindow.c:726 src/messageview.c:263
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/A_raçlar/Filtre _kuralı oluştur/_Otomatik oluştur"
 
-#: src/mainwindow.c:737 src/messageview.c:265
+#: src/mainwindow.c:728 src/messageview.c:265
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/A_raçlar/Filtre _kuralı oluştur/_Gönderene göre oluştur"
 
-#: src/mainwindow.c:739 src/messageview.c:267
+#: src/mainwindow.c:730 src/messageview.c:267
 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:741 src/messageview.c:269
+#: src/mainwindow.c:732 src/messageview.c:269
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/A_raçlar/Filtre _kuralı oluştur/_Konuya göre oluştur"
 
-#: src/mainwindow.c:744
+#: src/mainwindow.c:735
 #, fuzzy
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/A_raçlar/_Dizin içindeki tüm iletileri filtrele"
 
-#: src/mainwindow.c:746
+#: src/mainwindow.c:737
 #, fuzzy
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/A_raçlar/S_eçilen tüm mesajları filtrele"
 
-#: src/mainwindow.c:751
+#: src/mainwindow.c:742
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/A_raçlar/Ç_ift iletileri sil"
 
-#: src/mainwindow.c:754
+#: src/mainwindow.c:745
 msgid "/_Tools/E_xecute"
 msgstr "/A_raçlar/Ç_alıştır"
 
-#: src/mainwindow.c:756
+#: src/mainwindow.c:747
 msgid "/_Tools/_Log window"
 msgstr "/A_raçlar/_Kayıt penceresi"
 
-#: src/mainwindow.c:758
+#: src/mainwindow.c:749
 msgid "/_Configuration"
 msgstr "/_Yapılandırma"
 
-#: src/mainwindow.c:759
+#: src/mainwindow.c:750
 msgid "/_Configuration/_Common preferences..."
 msgstr "/_Yapılandırma/_Genel tercihler..."
 
-#: src/mainwindow.c:761
+#: src/mainwindow.c:752
 msgid "/_Configuration/_Filter setting..."
 msgstr "/_Yapılandırma/F_iltre ayarları..."
 
-#: src/mainwindow.c:763
+#: src/mainwindow.c:754
 msgid "/_Configuration/_Template..."
 msgstr "/_Yapılandırma/Ş_ablon..."
 
-#: src/mainwindow.c:764
+#: src/mainwindow.c:755
 msgid "/_Configuration/_Actions..."
 msgstr "/_Yapılandırma/_Eylemler..."
 
-#: src/mainwindow.c:765
+#: src/mainwindow.c:756
 msgid "/_Configuration/---"
 msgstr "/_Yapılandırma/---"
 
-#: src/mainwindow.c:766
+#: src/mainwindow.c:757
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Yapılandırma/_Güncel hesap tercihleri..."
 
-#: src/mainwindow.c:768
+#: src/mainwindow.c:759
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Yapılandırma/Y_eni hesap oluştur..."
 
-#: src/mainwindow.c:770
+#: src/mainwindow.c:761
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Yapılandırma/Hesapları _düzenle..."
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:763
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Yapılandırma/_Güncel hesabı değiştir"
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:767
 msgid "/_Help/_Manual"
 msgstr "/Yardı_m/_Kılavuz"
 
-#: src/mainwindow.c:777
+#: src/mainwindow.c:768
 msgid "/_Help/_Manual/_English"
 msgstr "/Yardı_m/_Kılavuz/İ_ngilizce"
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:769
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/Yardı_m/_Kılavuz/_Japonca"
 
-#: src/mainwindow.c:779
+#: src/mainwindow.c:770
 msgid "/_Help/_FAQ"
 msgstr "/Yardı_m/_SSS"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:771
 msgid "/_Help/_FAQ/_English"
 msgstr "/Yardı_m/_SSS/İ_ngilizce"
 
-#: src/mainwindow.c:781
+#: src/mainwindow.c:772
 msgid "/_Help/_FAQ/_German"
 msgstr "/Yardı_m/_SSS/_Almanca"
 
-#: src/mainwindow.c:782
+#: src/mainwindow.c:773
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/Yardı_m/_SSS/İ_spanyolca"
 
-#: src/mainwindow.c:783
+#: src/mainwindow.c:774
 msgid "/_Help/_FAQ/_French"
 msgstr "/Yardı_m/_SSS/_Fransızca"
 
-#: src/mainwindow.c:784
+#: src/mainwindow.c:775
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/Yardı_m/_SSS/İ_talyanca"
 
-#: src/mainwindow.c:785
+#: src/mainwindow.c:776
 msgid "/_Help/---"
 msgstr "/Yardı_m/---"
 
-#: src/mainwindow.c:825
+#: src/mainwindow.c:816
 msgid "Creating main window...\n"
 msgstr "Yeni pencere oluşturuluyor...\n"
 
-#: src/mainwindow.c:987
+#: src/mainwindow.c:973
 #, 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:1071 src/summaryview.c:2020 src/summaryview.c:2105
+#: src/mainwindow.c:1057 src/summaryview.c:2020 src/summaryview.c:2105
 #: src/summaryview.c:3342 src/summaryview.c:3415 src/summaryview.c:3728
 msgid "done.\n"
 msgstr "bitti.\n"
 
-#: src/mainwindow.c:1196 src/mainwindow.c:1237 src/mainwindow.c:1265
+#: src/mainwindow.c:1182 src/mainwindow.c:1223 src/mainwindow.c:1251
 msgid "Untitled"
 msgstr "Başlıksız"
 
-#: src/mainwindow.c:1266
+#: src/mainwindow.c:1252
 msgid "none"
 msgstr "hiçbiri"
 
-#: src/mainwindow.c:1316
+#: src/mainwindow.c:1302
 #, 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:1536
+#: src/mainwindow.c:1522
 msgid "Offline"
 msgstr "Çevrimdışı"
 
-#: src/mainwindow.c:1537
+#: src/mainwindow.c:1523
 msgid "You are offline. Go online?"
 msgstr "Çevrimdışısınız. Çevrimiçi olunsun mu?"
 
-#: src/mainwindow.c:1551
+#: src/mainwindow.c:1537
 msgid "Empty all trash"
 msgstr "Tüm çöpü boşalt"
 
-#: src/mainwindow.c:1552
+#: src/mainwindow.c:1538
 msgid "Empty messages in all trash?"
 msgstr "Çöpteki tüm iletiler silinsin mi?"
 
-#: src/mainwindow.c:1580
+#: src/mainwindow.c:1566
 msgid "Add mailbox"
 msgstr "Posta kutusu ekle"
 
-#: src/mainwindow.c:1581
+#: src/mainwindow.c:1567
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3178,16 +3178,16 @@ msgstr ""
 "Eğer varolan potsa kutusu verilirse, otomatik\n"
 "olarak taranacaktır."
 
-#: src/mainwindow.c:1587
+#: src/mainwindow.c:1573
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "`%s' posta kutusu zaten var."
 
-#: src/mainwindow.c:1592 src/setup.c:57
+#: src/mainwindow.c:1578 src/setup.c:57
 msgid "Mailbox"
 msgstr "Posta kutusu"
 
-#: src/mainwindow.c:1598 src/setup.c:63
+#: src/mainwindow.c:1584 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3196,150 +3196,150 @@ msgstr ""
 "Posta kutusu oluşturulurken hata oluştu.\n"
 "Bazı dosyalar bulunuyor olabilir veya yeterli izine sahip olmayabilirsiniz."
 
-#: src/mainwindow.c:1989
+#: src/mainwindow.c:1975
 msgid "Sylpheed - Folder View"
 msgstr "Sylheed - Dizin Görünümü"
 
-#: src/mainwindow.c:2009 src/messageview.c:368
+#: src/mainwindow.c:1995 src/messageview.c:368
 msgid "Sylpheed - Message View"
 msgstr "Sylpeed - İleti Görünümü"
 
-#: src/mainwindow.c:2156 src/summaryview.c:370
+#: src/mainwindow.c:2142 src/summaryview.c:370
 msgid "/_Reply"
 msgstr "/_Yanıtla"
 
-#: src/mainwindow.c:2157
+#: src/mainwindow.c:2143
 msgid "/Reply to _all"
 msgstr "/Her_kese yanıtla"
 
-#: src/mainwindow.c:2158
+#: src/mainwindow.c:2144
 msgid "/Reply to _sender"
 msgstr "/_Gönderene yanıtla"
 
-#: src/mainwindow.c:2159
+#: src/mainwindow.c:2145
 msgid "/Reply to mailing _list"
 msgstr "/_E-posta listesine yanıtla"
 
-#: src/mainwindow.c:2164 src/summaryview.c:377
+#: src/mainwindow.c:2150 src/summaryview.c:377
 msgid "/_Forward"
 msgstr "/_Yönlendir"
 
-#: src/mainwindow.c:2165 src/summaryview.c:378
+#: src/mainwindow.c:2151 src/summaryview.c:378
 msgid "/For_ward as attachment"
 msgstr "/_Ek olarak yönlendir"
 
-#: src/mainwindow.c:2166 src/summaryview.c:379
+#: src/mainwindow.c:2152 src/summaryview.c:379
 msgid "/Redirec_t"
 msgstr "/Ye_niden yönlendir"
 
-#: src/mainwindow.c:2205
+#: src/mainwindow.c:2188
 msgid "Get"
 msgstr "Al"
 
-#: src/mainwindow.c:2206
+#: src/mainwindow.c:2189
 msgid "Incorporate new mail"
 msgstr "Yeni postaları dağıt"
 
-#: src/mainwindow.c:2213
+#: src/mainwindow.c:2196
 msgid "Get all"
 msgstr "Hepsini al"
 
-#: src/mainwindow.c:2214
+#: src/mainwindow.c:2197
 msgid "Incorporate new mail of all accounts"
 msgstr "Tüm hesaplardaki postaları dağıt"
 
-#: src/mainwindow.c:2225
+#: src/mainwindow.c:2208
 msgid "Send queued message(s)"
 msgstr "Kuyruktaki iletileri gönder"
 
-#: src/mainwindow.c:2235 src/prefs_account.c:721 src/prefs_common.c:949
+#: src/mainwindow.c:2218 src/prefs_account.c:721 src/prefs_common.c:949
 #: src/prefs_folder_item.c:137
 msgid "Compose"
 msgstr "Düzenle"
 
-#: src/mainwindow.c:2236
+#: src/mainwindow.c:2219
 msgid "Compose new message"
 msgstr "Yeni ileti düzenle"
 
-#: src/mainwindow.c:2244 src/prefs_common.c:1448
+#: src/mainwindow.c:2227 src/prefs_common.c:1448
 msgid "Reply"
 msgstr "Yanıtla"
 
-#: src/mainwindow.c:2245 src/mainwindow.c:2258
+#: src/mainwindow.c:2228 src/mainwindow.c:2241
 msgid "Reply to the message"
 msgstr "İletiyi yanıtla"
 
-#: src/mainwindow.c:2263
+#: src/mainwindow.c:2245
 msgid "Reply all"
 msgstr "Hepsine ynt."
 
-#: src/mainwindow.c:2264
+#: src/mainwindow.c:2246
 msgid "Reply to all"
 msgstr "Herkese yanıtla"
 
-#: src/mainwindow.c:2272 src/prefs_filter_edit.c:741
+#: src/mainwindow.c:2254 src/prefs_filter_edit.c:741
 msgid "Forward"
 msgstr "Yönlendir"
 
-#: src/mainwindow.c:2273 src/mainwindow.c:2286
+#: src/mainwindow.c:2255 src/mainwindow.c:2268
 msgid "Forward the message"
 msgstr "İletiyi yönlendir"
 
-#: src/mainwindow.c:2293
+#: src/mainwindow.c:2275
 msgid "Delete the message"
 msgstr "İletiyi sil"
 
-#: src/mainwindow.c:2301 src/prefs_common.c:1988
+#: src/mainwindow.c:2283 src/prefs_common.c:1988
 msgid "Junk"
 msgstr ""
 
-#: src/mainwindow.c:2302
+#: src/mainwindow.c:2284
 #, fuzzy
 msgid "Set as junk mail"
 msgstr "Öntanımlı kullan"
 
-#: src/mainwindow.c:2311
+#: src/mainwindow.c:2293
 msgid "Execute"
 msgstr "Çalıştır"
 
-#: src/mainwindow.c:2312
+#: src/mainwindow.c:2294
 msgid "Execute marked process"
 msgstr "İşaretli süreçleri çalıştır"
 
-#: src/mainwindow.c:2322
+#: src/mainwindow.c:2304
 msgid "Next unread message"
 msgstr "Sonraki okunmamış ileti"
 
-#: src/mainwindow.c:2334
+#: src/mainwindow.c:2316
 msgid "Prefs"
 msgstr "Tercihler"
 
-#: src/mainwindow.c:2335
+#: src/mainwindow.c:2317
 msgid "Common preferences"
 msgstr "Ortak tercihler"
 
-#: src/mainwindow.c:2343 src/prefs_folder_item.c:261
+#: src/mainwindow.c:2325 src/prefs_folder_item.c:261
 #: src/prefs_folder_item.c:272 src/progressdialog.c:128
 msgid "Account"
 msgstr "Hesap"
 
-#: src/mainwindow.c:2344
+#: src/mainwindow.c:2326
 msgid "Account setting"
 msgstr "Hesap ayarları"
 
-#: src/mainwindow.c:2527
+#: src/mainwindow.c:2498
 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:2538
+#: src/mainwindow.c:2509
 msgid "You are online. Click the icon to go offline."
 msgstr "Çevrimiçisiniz. Çevrimdışı olmak için simgeye tıklayın."
 
-#: src/mainwindow.c:2731
+#: src/mainwindow.c:2702
 msgid "Exit"
 msgstr "Çık"
 
-#: src/mainwindow.c:2731
+#: src/mainwindow.c:2702
 msgid "Exit this program?"
 msgstr "Programdan çıkılsın mı?"
 
@@ -5556,11 +5556,11 @@ msgstr "İşlem durum penceresi oluşturuluyor...\n"
 msgid "Status"
 msgstr "Durum"
 
-#: src/recv.c:113
+#: src/recv.c:112
 msgid "error occurred while retrieving data.\n"
 msgstr "veri alınırken bir hata oluştu.\n"
 
-#: src/recv.c:155 src/recv.c:197 src/recv.c:213
+#: src/recv.c:154 src/recv.c:196 src/recv.c:211
 msgid "Can't write to file.\n"
 msgstr "Dosyaya yazılamadı.\n"
 
@@ -6296,7 +6296,7 @@ msgstr "%.2fMB"
 msgid "%.2fGB"
 msgstr "%.2fGB"
 
-#: src/utils.c:2372 src/utils.c:2496
+#: src/utils.c:2386 src/utils.c:2510
 #, c-format
 msgid "writing to %s failed.\n"
 msgstr "yazarken hata oluştu: %s\n"
diff --git a/po/uk.po b/po/uk.po
index 07cf9395..527bd491 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed 1.0.0beta1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-08-09 18:08+0900\n"
+"POT-Creation-Date: 2005-08-22 17:22+0900\n"
 "PO-Revision-Date: Sun 31 Oct 2004 23:17:57\n"
 "Last-Translator: O. Nykyforchyn <nick@pu.if,ua>, 2004.\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
@@ -100,7 +100,7 @@ msgstr ""
 "account'и, які поповнюються через `Отримати всі'."
 
 #: src/account.c:691 src/addressadd.c:192 src/addressbook.c:490
-#: src/compose.c:4081 src/editaddress.c:200 src/editaddress.c:942
+#: src/compose.c:4079 src/editaddress.c:200 src/editaddress.c:942
 #: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:265
 #: src/editjpilot.c:271 src/editldap.c:307 src/editvcard.c:184
 #: src/mimeview.c:201 src/prefs_filter.c:258 src/prefs_folder_item.c:170
@@ -238,7 +238,7 @@ msgstr "Аргумент користувача"
 msgid "Add Address to Book"
 msgstr "Додати адресу до книги"
 
-#: src/addressadd.c:202 src/compose.c:4528 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4521 src/editaddress.c:201
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "Адреса"
@@ -252,7 +252,7 @@ msgstr "Нотатки"
 msgid "Select Address Book Folder"
 msgstr "Обрати папку адресної книги"
 
-#: src/addressbook.c:336 src/compose.c:495 src/mainwindow.c:470
+#: src/addressbook.c:336 src/compose.c:493 src/mainwindow.c:461
 #: src/messageview.c:137
 msgid "/_File"
 msgstr "/Файл"
@@ -273,10 +273,10 @@ msgstr "/Файл/Новий JPilot"
 msgid "/_File/New _Server"
 msgstr "/Файл/Новий сервер"
 
-#: src/addressbook.c:345 src/addressbook.c:348 src/compose.c:500
-#: src/compose.c:505 src/compose.c:509 src/mainwindow.c:488
-#: src/mainwindow.c:491 src/mainwindow.c:493 src/mainwindow.c:496
-#: src/mainwindow.c:498 src/messageview.c:140
+#: src/addressbook.c:345 src/addressbook.c:348 src/compose.c:498
+#: src/compose.c:503 src/compose.c:507 src/mainwindow.c:479
+#: src/mainwindow.c:482 src/mainwindow.c:484 src/mainwindow.c:487
+#: src/mainwindow.c:489 src/messageview.c:140
 msgid "/_File/---"
 msgstr "/Файл/---"
 
@@ -292,7 +292,7 @@ msgstr "/Файл/Видалити"
 msgid "/_File/_Save"
 msgstr "/Файл/Зберегти"
 
-#: src/addressbook.c:350 src/compose.c:510 src/messageview.c:141
+#: src/addressbook.c:350 src/compose.c:508 src/messageview.c:141
 msgid "/_File/_Close"
 msgstr "/Файл/Закрити"
 
@@ -324,7 +324,7 @@ msgstr "/Адреса/Редагувати"
 msgid "/_Address/_Delete"
 msgstr "/Адреса/Видалити"
 
-#: src/addressbook.c:358 src/compose.c:619 src/mainwindow.c:725
+#: src/addressbook.c:358 src/compose.c:617 src/mainwindow.c:716
 #: src/messageview.c:256
 msgid "/_Tools"
 msgstr "/Інструменти"
@@ -333,12 +333,12 @@ msgstr "/Інструменти"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/Інструменти/Імпортувати файл LDIF"
 
-#: src/addressbook.c:360 src/compose.c:632 src/mainwindow.c:775
+#: src/addressbook.c:360 src/compose.c:630 src/mainwindow.c:766
 #: src/messageview.c:274
 msgid "/_Help"
 msgstr "/Допомога"
 
-#: src/addressbook.c:361 src/compose.c:633 src/mainwindow.c:786
+#: src/addressbook.c:361 src/compose.c:631 src/mainwindow.c:777
 #: src/messageview.c:275
 msgid "/_Help/_About"
 msgstr "/Допомога/Про програму"
@@ -355,7 +355,7 @@ msgstr "/Нова група"
 msgid "/New _Folder"
 msgstr "/Нова папка"
 
-#: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:489
+#: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:487
 #: src/folderview.c:235 src/folderview.c:237 src/folderview.c:241
 #: src/folderview.c:252 src/folderview.c:254 src/folderview.c:256
 #: src/folderview.c:260 src/folderview.c:270 src/folderview.c:272
@@ -365,8 +365,8 @@ msgstr "/Нова папка"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:512
-#: src/mainwindow.c:502 src/messageview.c:143
+#: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:510
+#: src/mainwindow.c:493 src/messageview.c:143
 msgid "/_Edit"
 msgstr "/Редагувати"
 
@@ -378,7 +378,7 @@ msgstr "/Видалити"
 msgid "E-Mail address"
 msgstr "Адреса e-mail"
 
-#: src/addressbook.c:495 src/compose.c:4529 src/prefs_common.c:2402
+#: src/addressbook.c:495 src/compose.c:4522 src/prefs_common.c:2402
 msgid "Address book"
 msgstr "Адресна книга"
 
@@ -387,8 +387,8 @@ msgid "Name:"
 msgstr "Ім'я:"
 
 #. Buttons
-#: src/addressbook.c:627 src/addressbook.c:1673 src/editaddress.c:884
-#: src/editaddress.c:1017 src/mainwindow.c:2292 src/prefs_actions.c:266
+#: src/addressbook.c:627 src/addressbook.c:1674 src/editaddress.c:884
+#: src/editaddress.c:1017 src/mainwindow.c:2274 src/prefs_actions.c:266
 #: src/prefs_display_header.c:278 src/prefs_display_header.c:333
 #: src/prefs_template.c:231
 msgid "Delete"
@@ -427,7 +427,7 @@ msgstr "Видалити адресу(и)"
 msgid "Really delete the address(es)?"
 msgstr "Дійсно видалити адресу(и)?"
 
-#: src/addressbook.c:1664
+#: src/addressbook.c:1665
 #, fuzzy, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -436,38 +436,38 @@ msgstr ""
 "Чи бажаєте Ви видалити папку ТА всі адреси в `%s' ? \n"
 "Якщо видалити тільки папку, адреси буде перенесено в охоплюючу папку."
 
-#: src/addressbook.c:1667 src/folderview.c:2139
+#: src/addressbook.c:1668 src/folderview.c:2139
 msgid "Delete folder"
 msgstr "Видалити папку"
 
-#: src/addressbook.c:1667
+#: src/addressbook.c:1668
 #, fuzzy
 msgid "_Folder only"
 msgstr "Тільки папку"
 
-#: src/addressbook.c:1667
+#: src/addressbook.c:1668
 #, fuzzy
 msgid "Folder and _addresses"
 msgstr "Папку та адреси"
 
-#: src/addressbook.c:1672
+#: src/addressbook.c:1673
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Дійсно видалити `%s' ?"
 
-#: src/addressbook.c:2352 src/addressbook.c:2485
+#: src/addressbook.c:2353 src/addressbook.c:2486
 msgid "New user, could not save index file."
 msgstr "Новий користувач, не вдалось зберегти покажчик."
 
-#: src/addressbook.c:2356 src/addressbook.c:2489
+#: src/addressbook.c:2357 src/addressbook.c:2490
 msgid "New user, could not save address book files."
 msgstr "Новий користувач, не вдалось зберегти адресну книгу."
 
-#: src/addressbook.c:2366 src/addressbook.c:2499
+#: src/addressbook.c:2367 src/addressbook.c:2500
 msgid "Old address book converted successfully."
 msgstr "Стару адресну книгу успішно конвертовано."
 
-#: src/addressbook.c:2371
+#: src/addressbook.c:2372
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -475,7 +475,7 @@ msgstr ""
 "Стару адресну книгу конвертовано,\n"
 "не вдалось зберегти новий покажчик адрес"
 
-#: src/addressbook.c:2384
+#: src/addressbook.c:2385
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -483,7 +483,7 @@ msgstr ""
 "Не вдалось конвертувати адресну книгу,\n"
 "але створено нову (порожню)."
 
-#: src/addressbook.c:2390
+#: src/addressbook.c:2391
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -491,7 +491,7 @@ msgstr ""
 "Не вдалось ні конвертувати адресну книгу,\n"
 "ні створити нові файли адресної книги."
 
-#: src/addressbook.c:2395
+#: src/addressbook.c:2396
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -499,84 +499,84 @@ msgstr ""
 "Не вдалось ні конвертувати адресну книгу,\n"
 "ні створити нові файли адресної книги."
 
-#: src/addressbook.c:2402
+#: src/addressbook.c:2403
 msgid "Addressbook conversion error"
 msgstr "Помилка при конвертуванні адресної книги"
 
-#: src/addressbook.c:2406
+#: src/addressbook.c:2407
 msgid "Addressbook conversion"
 msgstr "Конвертування адресної книги"
 
-#: src/addressbook.c:2441
+#: src/addressbook.c:2442
 msgid "Addressbook Error"
 msgstr "Помилка в адресній книзі"
 
-#: src/addressbook.c:2442 src/addressbook.c:2542
+#: src/addressbook.c:2443 src/addressbook.c:2543
 msgid "Could not read address index"
 msgstr "Не вдалось прочитати покажчик адрес"
 
-#: src/addressbook.c:2504
+#: src/addressbook.c:2505
 msgid "Old address book converted, could not save new address index file"
 msgstr ""
 "Стару адресну книгу конвертовано, не вдалось зберегти новий покажчик адрес"
 
-#: src/addressbook.c:2518
+#: src/addressbook.c:2519
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr "Не вдалось конвертувати адресну книгу, але створено нову (порожню)."
 
-#: src/addressbook.c:2524
+#: src/addressbook.c:2525
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr "Не вдалось ні конвертувати адресну книгу, ні створити нову."
 
-#: src/addressbook.c:2530
+#: src/addressbook.c:2531
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr "Не вдалось ні конвертувати адресну книгу, ні створити нову."
 
-#: src/addressbook.c:2548
+#: src/addressbook.c:2549
 msgid "Addressbook Conversion Error"
 msgstr "Помилка при конвертуванні адресної книги"
 
-#: src/addressbook.c:2554
+#: src/addressbook.c:2555
 msgid "Addressbook Conversion"
 msgstr "Конвертування адресної книги"
 
-#: src/addressbook.c:3055 src/prefs_common.c:963
+#: src/addressbook.c:3056 src/prefs_common.c:963
 msgid "Interface"
 msgstr "Інтерфейс"
 
-#: src/addressbook.c:3071 src/importldif.c:514
+#: src/addressbook.c:3072 src/importldif.c:514
 msgid "Address Book"
 msgstr "Адресна книга"
 
-#: src/addressbook.c:3087
+#: src/addressbook.c:3088
 msgid "Person"
 msgstr "Особа"
 
-#: src/addressbook.c:3103
+#: src/addressbook.c:3104
 msgid "EMail Address"
 msgstr "Адреса e-mail"
 
-#: src/addressbook.c:3119
+#: src/addressbook.c:3120
 msgid "Group"
 msgstr "Група"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3135 src/folderview.c:346 src/prefs_account.c:1866
+#: src/addressbook.c:3136 src/folderview.c:346 src/prefs_account.c:1866
 msgid "Folder"
 msgstr "Папка"
 
-#: src/addressbook.c:3151
+#: src/addressbook.c:3152
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3167 src/addressbook.c:3183
+#: src/addressbook.c:3168 src/addressbook.c:3184
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3199
+#: src/addressbook.c:3200
 msgid "LDAP Server"
 msgstr "Сервер LDAP"
 
@@ -588,7 +588,7 @@ msgstr "Адреса організації"
 msgid "Personal address"
 msgstr "Особиста адреса"
 
-#: src/alertpanel.c:138 src/compose.c:5214 src/main.c:515
+#: src/alertpanel.c:138 src/compose.c:5208 src/main.c:515
 msgid "Notice"
 msgstr "Примітка"
 
@@ -643,373 +643,373 @@ msgstr "Коричневий"
 msgid "None"
 msgstr "Ніякий"
 
-#: src/compose.c:487
+#: src/compose.c:485
 msgid "/_Add..."
 msgstr "/Додати..."
 
-#: src/compose.c:488
+#: src/compose.c:486
 msgid "/_Remove"
 msgstr "/Видалити"
 
-#: src/compose.c:490 src/folderview.c:243 src/folderview.c:262
+#: src/compose.c:488 src/folderview.c:243 src/folderview.c:262
 #: src/folderview.c:277
 msgid "/_Properties..."
 msgstr "/Властивості..."
 
-#: src/compose.c:496
+#: src/compose.c:494
 msgid "/_File/_Send"
 msgstr "/Файл/Послати"
 
-#: src/compose.c:498
+#: src/compose.c:496
 msgid "/_File/Send _later"
 msgstr "/Файл/Послати пізніше"
 
-#: src/compose.c:501
+#: src/compose.c:499
 msgid "/_File/Save to _draft folder"
 msgstr "/Файл/Зберегти в папці чорновиків"
 
-#: src/compose.c:503
+#: src/compose.c:501
 msgid "/_File/Save and _keep editing"
 msgstr "/Файл/Зберегти і редагувати далі"
 
-#: src/compose.c:506
+#: src/compose.c:504
 msgid "/_File/_Attach file"
 msgstr "/Файл/Приєднати файл"
 
-#: src/compose.c:507
+#: src/compose.c:505
 msgid "/_File/_Insert file"
 msgstr "/Файл/Вставити файл"
 
-#: src/compose.c:508
+#: src/compose.c:506
 msgid "/_File/Insert si_gnature"
 msgstr "/Файл/Вставити підпис"
 
-#: src/compose.c:513
+#: src/compose.c:511
 msgid "/_Edit/_Undo"
 msgstr "/Редагувати/Undo"
 
-#: src/compose.c:514
+#: src/compose.c:512
 msgid "/_Edit/_Redo"
 msgstr "/Редагувати/Redo"
 
-#: src/compose.c:515 src/compose.c:522 src/mainwindow.c:506
+#: src/compose.c:513 src/compose.c:520 src/mainwindow.c:497
 #: src/messageview.c:146
 msgid "/_Edit/---"
 msgstr "/Редагувати/---"
 
-#: src/compose.c:516
+#: src/compose.c:514
 msgid "/_Edit/Cu_t"
 msgstr "/Редагувати/Вирізати"
 
-#: src/compose.c:517 src/mainwindow.c:503 src/messageview.c:144
+#: src/compose.c:515 src/mainwindow.c:494 src/messageview.c:144
 msgid "/_Edit/_Copy"
 msgstr "/Редагувати/Копіювати"
 
-#: src/compose.c:518
+#: src/compose.c:516
 msgid "/_Edit/_Paste"
 msgstr "/Редагувати/Вставити"
 
-#: src/compose.c:519
+#: src/compose.c:517
 msgid "/_Edit/Paste as _quotation"
 msgstr "/Редагувати/Вставити як цитату"
 
-#: src/compose.c:521 src/mainwindow.c:504 src/messageview.c:145
+#: src/compose.c:519 src/mainwindow.c:495 src/messageview.c:145
 msgid "/_Edit/Select _all"
 msgstr "/Редагувати/Виділити все"
 
-#: src/compose.c:523
+#: src/compose.c:521
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/Редагувати/Згорнути поточний абзац"
 
-#: src/compose.c:525
+#: src/compose.c:523
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/Редагувати/Згорнути всі довгі рядки"
 
-#: src/compose.c:527
+#: src/compose.c:525
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/Редагувати/Автозгортання"
 
-#: src/compose.c:528 src/mainwindow.c:511 src/messageview.c:150
+#: src/compose.c:526 src/mainwindow.c:502 src/messageview.c:150
 #: src/summaryview.c:400
 msgid "/_View"
 msgstr "/Вигляд"
 
-#: src/compose.c:529
+#: src/compose.c:527
 msgid "/_View/_To"
 msgstr "/Вигляд/Кому"
 
-#: src/compose.c:530
+#: src/compose.c:528
 msgid "/_View/_Cc"
 msgstr "/Вигляд/Копія"
 
-#: src/compose.c:531
+#: src/compose.c:529
 msgid "/_View/_Bcc"
 msgstr "/Вигляд/Приховано"
 
-#: src/compose.c:532
+#: src/compose.c:530
 msgid "/_View/_Reply to"
 msgstr "/Вигляд/Зворотня адреса"
 
-#: src/compose.c:533 src/compose.c:535 src/compose.c:537 src/compose.c:539
-#: src/mainwindow.c:529 src/mainwindow.c:532 src/mainwindow.c:558
-#: src/mainwindow.c:582 src/mainwindow.c:675 src/mainwindow.c:679
+#: src/compose.c:531 src/compose.c:533 src/compose.c:535 src/compose.c:537
+#: src/mainwindow.c:520 src/mainwindow.c:523 src/mainwindow.c:549
+#: src/mainwindow.c:573 src/mainwindow.c:666 src/mainwindow.c:670
 #: src/messageview.c:233
 msgid "/_View/---"
 msgstr "/Вигляд/---"
 
-#: src/compose.c:534
+#: src/compose.c:532
 msgid "/_View/_Followup to"
 msgstr "/Вигляд/Конференції для відповіді"
 
-#: src/compose.c:536
+#: src/compose.c:534
 msgid "/_View/R_uler"
 msgstr "/Вигляд/Лінійка"
 
-#: src/compose.c:538
+#: src/compose.c:536
 msgid "/_View/_Attachment"
 msgstr "/Вигляд/Вкладення"
 
-#: src/compose.c:545 src/mainwindow.c:589 src/messageview.c:157
+#: src/compose.c:543 src/mainwindow.c:580 src/messageview.c:157
 #, fuzzy
 msgid "/_View/Character _encoding"
 msgstr "/Вигляд/Сортувати/За спаданням"
 
-#: src/compose.c:546
+#: src/compose.c:544
 msgid "/_View/Character _encoding/_Automatic"
 msgstr ""
 
-#: src/compose.c:548 src/compose.c:554 src/compose.c:560 src/compose.c:564
-#: src/compose.c:570 src/compose.c:574 src/compose.c:580 src/compose.c:584
-#: src/compose.c:594 src/compose.c:598 src/compose.c:608 src/compose.c:612
-#: src/mainwindow.c:585 src/mainwindow.c:592 src/messageview.c:153
+#: src/compose.c:546 src/compose.c:552 src/compose.c:558 src/compose.c:562
+#: src/compose.c:568 src/compose.c:572 src/compose.c:578 src/compose.c:582
+#: src/compose.c:592 src/compose.c:596 src/compose.c:606 src/compose.c:610
+#: src/mainwindow.c:576 src/mainwindow.c:583 src/messageview.c:153
 #, fuzzy
 msgid "/_View/Character _encoding/---"
 msgstr "/Вигляд/Сортувати/За спаданням"
 
-#: src/compose.c:550 src/mainwindow.c:593 src/messageview.c:161
+#: src/compose.c:548 src/mainwindow.c:584 src/messageview.c:161
 #, fuzzy
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/Вигляд/Кодова таблиця/7bit ascii (US-ASC_II)"
 
-#: src/compose.c:552 src/mainwindow.c:595 src/messageview.c:164
+#: src/compose.c:550 src/mainwindow.c:586 src/messageview.c:164
 #, fuzzy
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/Вигляд/Кодова таблиця/Unicode (UT_F-8)"
 
-#: src/compose.c:556 src/mainwindow.c:599 src/messageview.c:167
+#: src/compose.c:554 src/mainwindow.c:590 src/messageview.c:167
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/Вигляд/Кодова таблиця/Західноєвропейська (ISO-8859-_1)"
 
-#: src/compose.c:558 src/mainwindow.c:601 src/messageview.c:169
+#: src/compose.c:556 src/mainwindow.c:592 src/messageview.c:169
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/Вигляд/Кодова таблиця/Західноєвропейська (ISO-8859-15)"
 
-#: src/compose.c:562 src/mainwindow.c:605 src/messageview.c:172
+#: src/compose.c:560 src/mainwindow.c:596 src/messageview.c:172
 #, fuzzy
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/Вигляд/Кодова таблиця/Західноєвропейська (ISO-8859-_2)"
 
-#: src/compose.c:566 src/mainwindow.c:609 src/messageview.c:175
+#: src/compose.c:564 src/mainwindow.c:600 src/messageview.c:175
 #, fuzzy
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/Вигляд/Кодова таблиця/Балтійська (ISO-8859-1_3)"
 
-#: src/compose.c:568 src/mainwindow.c:611 src/messageview.c:177
+#: src/compose.c:566 src/mainwindow.c:602 src/messageview.c:177
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/Вигляд/Кодова таблиця/Балтійська (ISO-8859-_4)"
 
-#: src/compose.c:572 src/mainwindow.c:615 src/messageview.c:180
+#: src/compose.c:570 src/mainwindow.c:606 src/messageview.c:180
 #, fuzzy
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/Вигляд/Кодова таблиця/Грецька (ISO-8859-_7)"
 
-#: src/compose.c:576 src/mainwindow.c:619 src/messageview.c:183
+#: src/compose.c:574 src/mainwindow.c:610 src/messageview.c:183
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/Вигляд/Кодова таблиця/Грецька (ISO-8859-_7)"
 
-#: src/compose.c:578 src/mainwindow.c:621 src/messageview.c:185
+#: src/compose.c:576 src/mainwindow.c:612 src/messageview.c:185
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/Вигляд/Кодова таблиця/Кирилиця (_Windows-1251)"
 
-#: src/compose.c:582 src/mainwindow.c:625 src/messageview.c:188
+#: src/compose.c:580 src/mainwindow.c:616 src/messageview.c:188
 #, fuzzy
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/Вигляд/Кодова таблиця/Турецька (ISO-8859-_9)"
 
-#: src/compose.c:586 src/mainwindow.c:629 src/messageview.c:191
+#: src/compose.c:584 src/mainwindow.c:620 src/messageview.c:191
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/Вигляд/Кодова таблиця/Кирилиця (ISO-8859-_5)"
 
-#: src/compose.c:588 src/mainwindow.c:631 src/messageview.c:193
+#: src/compose.c:586 src/mainwindow.c:622 src/messageview.c:193
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/Вигляд/Кодова таблиця/Кирилиця (KOI8-_R)"
 
-#: src/compose.c:590 src/mainwindow.c:633 src/messageview.c:195
+#: src/compose.c:588 src/mainwindow.c:624 src/messageview.c:195
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/Вигляд/Кодова таблиця/Кирилиця (KOI8-_U)"
 
-#: src/compose.c:592 src/mainwindow.c:635 src/messageview.c:197
+#: src/compose.c:590 src/mainwindow.c:626 src/messageview.c:197
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/Вигляд/Кодова таблиця/Кирилиця (_Windows-1251)"
 
-#: src/compose.c:596 src/mainwindow.c:639 src/messageview.c:200
+#: src/compose.c:594 src/mainwindow.c:630 src/messageview.c:200
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/Вигляд/Кодова таблиця/Японська (ISO-2022-_JP)"
 
-#: src/compose.c:600 src/mainwindow.c:649 src/messageview.c:209
+#: src/compose.c:598 src/mainwindow.c:640 src/messageview.c:209
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/Вигляд/Кодова таблиця/Спрощена китайська (_GB2312)"
 
-#: src/compose.c:602 src/mainwindow.c:651 src/messageview.c:211
+#: src/compose.c:600 src/mainwindow.c:642 src/messageview.c:211
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/Вигляд/Кодова таблиця/Спрощена китайська (_GB2312)"
 
-#: src/compose.c:604 src/mainwindow.c:653 src/messageview.c:213
+#: src/compose.c:602 src/mainwindow.c:644 src/messageview.c:213
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/Вигляд/Кодова таблиця/Традиційна китайська (_Big5)"
 
-#: src/compose.c:606 src/mainwindow.c:655 src/messageview.c:215
+#: src/compose.c:604 src/mainwindow.c:646 src/messageview.c:215
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/Вигляд/Кодова таблиця/Традиційна китайська (EUC-_TW)"
 
-#: src/compose.c:610 src/mainwindow.c:661 src/messageview.c:220
+#: src/compose.c:608 src/mainwindow.c:652 src/messageview.c:220
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/Вигляд/Кодова таблиця/Корейська (EUC-_KR)"
 
-#: src/compose.c:614 src/mainwindow.c:667 src/messageview.c:225
+#: src/compose.c:612 src/mainwindow.c:658 src/messageview.c:225
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/Вигляд/Кодова таблиця/Тайська (TIS-620)"
 
-#: src/compose.c:616 src/mainwindow.c:669 src/messageview.c:227
+#: src/compose.c:614 src/mainwindow.c:660 src/messageview.c:227
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/Вигляд/Кодова таблиця/Тайська (Windows-874)"
 
-#: src/compose.c:620 src/mainwindow.c:726 src/messageview.c:257
+#: src/compose.c:618 src/mainwindow.c:717 src/messageview.c:257
 msgid "/_Tools/_Address book"
 msgstr "/Інструменти/Адресна книга"
 
-#: src/compose.c:621
+#: src/compose.c:619
 msgid "/_Tools/_Template"
 msgstr "/Інструменти/Шаблон"
 
-#: src/compose.c:622 src/mainwindow.c:749 src/messageview.c:272
+#: src/compose.c:620 src/mainwindow.c:740 src/messageview.c:272
 msgid "/_Tools/Actio_ns"
 msgstr "/Інструменти/Дії"
 
-#: src/compose.c:623 src/compose.c:627 src/mainwindow.c:729
-#: src/mainwindow.c:743 src/mainwindow.c:748 src/mainwindow.c:750
-#: src/mainwindow.c:753 src/mainwindow.c:755 src/messageview.c:260
+#: src/compose.c:621 src/compose.c:625 src/mainwindow.c:720
+#: src/mainwindow.c:734 src/mainwindow.c:739 src/mainwindow.c:741
+#: src/mainwindow.c:744 src/mainwindow.c:746 src/messageview.c:260
 #: src/messageview.c:271
 msgid "/_Tools/---"
 msgstr "/Інструменти/---"
 
-#: src/compose.c:624
+#: src/compose.c:622
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/Інструменти/Редагувати зовнішнім редактором"
 
-#: src/compose.c:628
+#: src/compose.c:626
 msgid "/_Tools/PGP Si_gn"
 msgstr "/Інструменти/Підпис PGP"
 
-#: src/compose.c:629
+#: src/compose.c:627
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/Інструменти/Шифрування PGP"
 
-#: src/compose.c:855
+#: src/compose.c:853
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: файл не існує\n"
 
-#: src/compose.c:954 src/compose.c:1024 src/procmsg.c:1353
+#: src/compose.c:952 src/compose.c:1022 src/procmsg.c:1353
 msgid "Can't get text part\n"
 msgstr "Не вдалось отримати текстову частину\n"
 
-#: src/compose.c:1420
+#: src/compose.c:1418
 msgid "Quote mark format error."
 msgstr "Помилка у форматі цитування."
 
-#: src/compose.c:1432
+#: src/compose.c:1430
 msgid "Message reply/forward format error."
 msgstr "Помилка у форматі message reply/forward."
 
-#: src/compose.c:1801
+#: src/compose.c:1799
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Файл %s не існує\n"
 
-#: src/compose.c:1805
+#: src/compose.c:1803
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Не вдалось отримати розмір %s\n"
 
-#: src/compose.c:1809
+#: src/compose.c:1807
 #, c-format
 msgid "File %s is empty."
 msgstr "Файл %s порожній."
 
-#: src/compose.c:1813
+#: src/compose.c:1811
 #, c-format
 msgid "Can't read %s."
 msgstr "Не вдалось прочитати %s."
 
-#: src/compose.c:1848
+#: src/compose.c:1846
 #, c-format
 msgid "Message: %s"
 msgstr "Лист: %s"
 
-#: src/compose.c:1920 src/mimeview.c:560
+#: src/compose.c:1918 src/mimeview.c:560
 msgid "Can't get the part of multipart message."
 msgstr "Не вдалось отримати одну з частин листа."
 
-#: src/compose.c:2362
+#: src/compose.c:2360
 msgid " [Edited]"
 msgstr " [Редагований]"
 
-#: src/compose.c:2364
+#: src/compose.c:2362
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Створити лист%s"
 
-#: src/compose.c:2367
+#: src/compose.c:2365
 #, c-format
 msgid "Compose message%s"
 msgstr "Створити лист%s"
 
-#: src/compose.c:2478
+#: src/compose.c:2476
 msgid "Recipient is not specified."
 msgstr "Не вказано отримувача."
 
-#: src/compose.c:2486
+#: src/compose.c:2484
 #, fuzzy
 msgid "Empty subject"
 msgstr "Тема"
 
-#: src/compose.c:2487
+#: src/compose.c:2485
 msgid "Subject is empty. Send it anyway?"
 msgstr "Поле Subject порожнє. Все ж послати?"
 
-#: src/compose.c:2538
+#: src/compose.c:2536
 msgid "can't get recipient list."
 msgstr "не вдалось отримати список отримувачів."
 
-#: src/compose.c:2558
+#: src/compose.c:2556
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1017,26 +1017,26 @@ msgstr ""
 "Обліковий запис для відсилання пошти не вказано.\n"
 "Оберіть, будь-ласка, запис перед відправкою."
 
-#: src/compose.c:2572 src/send_message.c:297
+#: src/compose.c:2570 src/send_message.c:297
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Трапилась помилка при відсиланні листа до %s ."
 
-#: src/compose.c:2595
+#: src/compose.c:2593
 msgid "Can't save the message to outbox."
 msgstr "Не вдалось зберегти лист в outbox."
 
-#: src/compose.c:2645
+#: src/compose.c:2643
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "Не вдалось знайти ключа, відповідного обраному ідентифікатору `%s'."
 
-#: src/compose.c:2709 src/compose.c:2965 src/compose.c:3028 src/compose.c:3148
-#: src/utils.c:2365
+#: src/compose.c:2707 src/compose.c:2963 src/compose.c:3026 src/compose.c:3146
+#: src/utils.c:2379
 msgid "can't change file mode\n"
 msgstr "не вдалось змінити права доступу файла\n"
 
-#: src/compose.c:2741
+#: src/compose.c:2739
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1047,12 +1047,12 @@ msgstr ""
 "%s на %s.\n"
 "Все ж послати?"
 
-#: src/compose.c:2747
+#: src/compose.c:2745
 #, fuzzy
 msgid "Code conversion error"
 msgstr "Помилка при конвертуванні адресної книги"
 
-#: src/compose.c:2816
+#: src/compose.c:2814
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1061,155 +1061,155 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:2820
+#: src/compose.c:2818
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3108
+#: src/compose.c:3106
 msgid "can't remove the old message\n"
 msgstr "не вдалось видалити старий лист\n"
 
-#: src/compose.c:3126
+#: src/compose.c:3124
 msgid "queueing message...\n"
 msgstr "лист в чергу...\n"
 
-#: src/compose.c:3208
+#: src/compose.c:3206
 msgid "can't find queue folder\n"
 msgstr "не вдалось знайти папку черги\n"
 
-#: src/compose.c:3215
+#: src/compose.c:3213
 msgid "can't queue the message\n"
 msgstr "не вдалось поставити лист в чергу\n"
 
-#: src/compose.c:3792
+#: src/compose.c:3790
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "генерований Message-ID: %s\n"
 
-#: src/compose.c:3901
+#: src/compose.c:3899
 msgid "Creating compose window...\n"
 msgstr "Відкриваємо вікно створення листа...\n"
 
-#: src/compose.c:3949 src/headerview.c:54 src/summary_search.c:214
+#: src/compose.c:3947 src/headerview.c:54 src/summary_search.c:214
 msgid "From:"
 msgstr "Від:"
 
-#: src/compose.c:4021
+#: src/compose.c:4019
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/Інструменти/Підпис PGP"
 
-#: src/compose.c:4024
+#: src/compose.c:4022
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/Інструменти/Шифрування PGP"
 
-#: src/compose.c:4062 src/compose.c:5001
+#: src/compose.c:4060 src/compose.c:4995
 msgid "MIME type"
 msgstr "тип MIME"
 
 #. S_COL_DATE
-#: src/compose.c:4071 src/mimeview.c:192 src/prefs_filter_edit.c:585
+#: src/compose.c:4069 src/mimeview.c:192 src/prefs_filter_edit.c:585
 #: src/prefs_summary_column.c:75 src/select-keys.c:317 src/summaryview.c:4217
 msgid "Size"
 msgstr "Розмір"
 
-#: src/compose.c:4449 src/mainwindow.c:2224 src/prefs_account.c:719
+#: src/compose.c:4442 src/mainwindow.c:2207 src/prefs_account.c:719
 #: src/prefs_common.c:947
 msgid "Send"
 msgstr "Послати"
 
-#: src/compose.c:4450
+#: src/compose.c:4443
 msgid "Send message"
 msgstr "Послати лист"
 
-#: src/compose.c:4458
+#: src/compose.c:4451
 msgid "Send later"
 msgstr "Послати пізніше"
 
-#: src/compose.c:4459
+#: src/compose.c:4452
 msgid "Put into queue folder and send later"
 msgstr "Покласти в папку черги і послати пізніше"
 
-#: src/compose.c:4467
+#: src/compose.c:4460
 msgid "Draft"
 msgstr "Чорновик"
 
-#: src/compose.c:4468
+#: src/compose.c:4461
 msgid "Save to draft folder"
 msgstr "Зберегти в папці чорновиків"
 
-#: src/compose.c:4478
+#: src/compose.c:4471
 msgid "Insert"
 msgstr "Вставити"
 
-#: src/compose.c:4479
+#: src/compose.c:4472
 msgid "Insert file"
 msgstr "Вставити файл"
 
-#: src/compose.c:4487
+#: src/compose.c:4480
 msgid "Attach"
 msgstr "Приєднати"
 
-#: src/compose.c:4488
+#: src/compose.c:4481
 msgid "Attach file"
 msgstr "Приєднати файл"
 
 #. signature
-#: src/compose.c:4498 src/prefs_account.c:1391 src/prefs_common.c:1356
+#: src/compose.c:4491 src/prefs_account.c:1391 src/prefs_common.c:1356
 msgid "Signature"
 msgstr "Підпис"
 
-#: src/compose.c:4499
+#: src/compose.c:4492
 msgid "Insert signature"
 msgstr "Вставити підпис"
 
-#: src/compose.c:4508 src/prefs_common.c:1378 src/prefs_common.c:2382
+#: src/compose.c:4501 src/prefs_common.c:1378 src/prefs_common.c:2382
 msgid "Editor"
 msgstr "Редактор"
 
-#: src/compose.c:4509
+#: src/compose.c:4502
 msgid "Edit with external editor"
 msgstr "Редагувати зовнішнім редактором"
 
-#: src/compose.c:4517
+#: src/compose.c:4510
 msgid "Linewrap"
 msgstr "Згортання рядків"
 
-#: src/compose.c:4518
+#: src/compose.c:4511
 msgid "Wrap all long lines"
 msgstr "Згорнути всі довгі рядки"
 
-#: src/compose.c:4897
+#: src/compose.c:4891
 msgid "Invalid MIME type."
 msgstr "Неправильний тип MIME."
 
-#: src/compose.c:4915
+#: src/compose.c:4909
 msgid "File doesn't exist or is empty."
 msgstr "Файл не існує або порожній."
 
-#: src/compose.c:4983
+#: src/compose.c:4977
 msgid "Properties"
 msgstr "Властивості"
 
-#: src/compose.c:5003
+#: src/compose.c:4997
 msgid "Encoding"
 msgstr "Кодування"
 
-#: src/compose.c:5026 src/prefs_folder_item.c:183
+#: src/compose.c:5020 src/prefs_folder_item.c:183
 msgid "Path"
 msgstr "Шлях"
 
-#: src/compose.c:5027
+#: src/compose.c:5021
 msgid "File name"
 msgstr "Ім'я файлу"
 
-#: src/compose.c:5185
+#: src/compose.c:5179
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Командний рядок зовнішнього редактора неправильний: `%s'\n"
 
-#: src/compose.c:5211
+#: src/compose.c:5205
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1220,75 +1220,75 @@ msgstr ""
 "Примусово обірвати процес?\n"
 "group id процесу: %d"
 
-#: src/compose.c:5228
+#: src/compose.c:5222
 #, c-format
 msgid "Terminated process group id: %d"
 msgstr "Обірвано процес з group id: %d"
 
-#: src/compose.c:5229
+#: src/compose.c:5223
 #, c-format
 msgid "Temporary file: %s"
 msgstr "Тимчасовий файл: %s"
 
-#: src/compose.c:5253
+#: src/compose.c:5247
 msgid "Compose: input from monitoring process\n"
 msgstr "Створення: ввід від спостерігаючого процесу\n"
 
 #. failed
-#: src/compose.c:5284
+#: src/compose.c:5278
 msgid "Couldn't exec external editor\n"
 msgstr "Не вдалось запустити зовнішній редактор\n"
 
-#: src/compose.c:5288
+#: src/compose.c:5282
 msgid "Couldn't write to file\n"
 msgstr "Не вдалось записати в файл\n"
 
-#: src/compose.c:5290
+#: src/compose.c:5284
 msgid "Pipe read failed\n"
 msgstr "Не вдалось прочитати з каналу\n"
 
-#: src/compose.c:5596 src/compose.c:5604 src/compose.c:5610
+#: src/compose.c:5590 src/compose.c:5598 src/compose.c:5604
 msgid "Can't queue the message."
 msgstr "Не вдалось поставити лист в чергу."
 
-#: src/compose.c:5701
+#: src/compose.c:5695
 #, fuzzy
 msgid "Select files"
 msgstr "Обрати файл"
 
-#: src/compose.c:5723
+#: src/compose.c:5717
 msgid "Select file"
 msgstr "Обрати файл"
 
-#: src/compose.c:5760
+#: src/compose.c:5754
 #, fuzzy
 msgid "Save message"
 msgstr "Послати лист"
 
-#: src/compose.c:5761
+#: src/compose.c:5755
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Цей лист було змінено. Відмовитись від нього?"
 
-#: src/compose.c:5763
+#: src/compose.c:5757
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:5805
+#: src/compose.c:5799
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Чи бажаєте Ви застосувати шаблон `%s' ?"
 
-#: src/compose.c:5807
+#: src/compose.c:5801
 msgid "Apply template"
 msgstr "Застосувати шаблон"
 
-#: src/compose.c:5808
+#: src/compose.c:5802
 #, fuzzy
 msgid "_Replace"
 msgstr "Замінити"
 
-#: src/compose.c:5808
+#: src/compose.c:5802
 #, fuzzy
 msgid "_Insert"
 msgstr "Вставити"
@@ -1734,12 +1734,12 @@ msgstr "Встановлюємо інформацію папки...\n"
 msgid "Setting folder info..."
 msgstr "Встановлюємо інформацію папки..."
 
-#: src/folderview.c:805 src/mainwindow.c:3301 src/setup.c:81
+#: src/folderview.c:805 src/mainwindow.c:3272 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Перечитуємо папку %s%c%s ..."
 
-#: src/folderview.c:809 src/mainwindow.c:3306 src/setup.c:86
+#: src/folderview.c:809 src/mainwindow.c:3277 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Перечитуємо папку %s ..."
@@ -2060,44 +2060,44 @@ msgstr "Невдача авторизації IMAP4.\n"
 msgid "IMAP4 login failed.\n"
 msgstr "Невдача авторизації IMAP4.\n"
 
-#: src/imap.c:3522
+#: src/imap.c:3528
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "не вдалось додати %s до %s\n"
 
-#: src/imap.c:3529
+#: src/imap.c:3535
 msgid "(sending file...)"
 msgstr "(посилаємо файл...)"
 
-#: src/imap.c:3557
+#: src/imap.c:3563
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "не вдалось приєднати лист до %s\n"
 
-#: src/imap.c:3589
+#: src/imap.c:3595
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "не вдалось скопіювати %s в %s\n"
 
-#: src/imap.c:3613
+#: src/imap.c:3619
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "помилка при виконанні команди imap:  STORE %s %s\n"
 
-#: src/imap.c:3627
+#: src/imap.c:3633
 msgid "error while imap command: EXPUNGE\n"
 msgstr "помилка при виконанні команди imap: EXPUNGE\n"
 
-#: src/imap.c:3640
+#: src/imap.c:3646
 msgid "error while imap command: CLOSE\n"
 msgstr "помилка при виконанні команди imap: CLOSE\n"
 
-#: src/imap.c:3873
+#: src/imap.c:3879
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv не може конвертувати UTF-7 в %s\n"
 
-#: src/imap.c:3903
+#: src/imap.c:3909
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv не може конвертувати %s в UTF-7\n"
@@ -2199,7 +2199,7 @@ msgstr "Імпортувати файл LDIF в адресну книгу"
 msgid "Prev"
 msgstr "Назад"
 
-#: src/importldif.c:768 src/mainwindow.c:2321
+#: src/importldif.c:768 src/mainwindow.c:2303
 msgid "Next"
 msgstr "Далі"
 
@@ -2542,637 +2542,637 @@ msgid ""
 "Do you want to migrate it?"
 msgstr ""
 
-#: src/mainwindow.c:471
+#: src/mainwindow.c:462
 msgid "/_File/_Folder"
 msgstr "/Файл/Папка"
 
-#: src/mainwindow.c:472
+#: src/mainwindow.c:463
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/Файл/Папка/Створити нову..."
 
-#: src/mainwindow.c:474
+#: src/mainwindow.c:465
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/Файл/Папка/Перейменувати..."
 
-#: src/mainwindow.c:475
+#: src/mainwindow.c:466
 #, fuzzy
 msgid "/_File/_Folder/_Move folder..."
 msgstr "/Файл/Папка/Перейменувати..."
 
-#: src/mainwindow.c:476
+#: src/mainwindow.c:467
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/Файл/Папка/Видалити папку"
 
-#: src/mainwindow.c:477
+#: src/mainwindow.c:468
 #, fuzzy
 msgid "/_File/_Mailbox"
 msgstr "/Файл/Додати скриньку..."
 
-#: src/mainwindow.c:478
+#: src/mainwindow.c:469
 #, fuzzy
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/Файл/Додати скриньку..."
 
-#: src/mainwindow.c:479
+#: src/mainwindow.c:470
 #, fuzzy
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/Видалити скриньку"
 
-#: src/mainwindow.c:480 src/mainwindow.c:485
+#: src/mainwindow.c:471 src/mainwindow.c:476
 #, fuzzy
 msgid "/_File/_Mailbox/---"
 msgstr "/Файл/Папка/---"
 
-#: src/mainwindow.c:481
+#: src/mainwindow.c:472
 #, fuzzy
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "/Перевірити за новими листами"
 
-#: src/mainwindow.c:483
+#: src/mainwindow.c:474
 #, fuzzy
 msgid "/_File/_Mailbox/Check for new messages in _all mailboxes"
 msgstr "/Файл/Папка/Перевірити за новими листами у всіх папках"
 
-#: src/mainwindow.c:486
+#: src/mainwindow.c:477
 #, fuzzy
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "/Перебудувати дерево папок"
 
-#: src/mainwindow.c:489
+#: src/mainwindow.c:480
 msgid "/_File/_Import mbox file..."
 msgstr "/Файл/Імпортувати файл mbox"
 
-#: src/mainwindow.c:490
+#: src/mainwindow.c:481
 msgid "/_File/_Export to mbox file..."
 msgstr "/Файл/Експортувати в файл mbox..."
 
-#: src/mainwindow.c:492
+#: src/mainwindow.c:483
 #, fuzzy
 msgid "/_File/Empty all _trash"
 msgstr "/Файл/Спорожнити кошик"
 
-#: src/mainwindow.c:494 src/messageview.c:138
+#: src/mainwindow.c:485 src/messageview.c:138
 msgid "/_File/_Save as..."
 msgstr "/Файл/Зберегти як..."
 
-#: src/mainwindow.c:495 src/messageview.c:139
+#: src/mainwindow.c:486 src/messageview.c:139
 msgid "/_File/_Print..."
 msgstr "/Файл/Друкувати..."
 
-#: src/mainwindow.c:497
+#: src/mainwindow.c:488
 msgid "/_File/_Work offline"
 msgstr "/Файл/Працювати без з'єднання"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:500
+#: src/mainwindow.c:491
 msgid "/_File/E_xit"
 msgstr "/Файл/Вийти"
 
-#: src/mainwindow.c:505
+#: src/mainwindow.c:496
 msgid "/_Edit/Select _thread"
 msgstr "/Редагувати/Виділити обговорення"
 
-#: src/mainwindow.c:507 src/messageview.c:147
+#: src/mainwindow.c:498 src/messageview.c:147
 msgid "/_Edit/_Find in current message..."
 msgstr "/Редагувати/Шукати в поточному листі"
 
-#: src/mainwindow.c:509
+#: src/mainwindow.c:500
 msgid "/_Edit/_Search messages..."
 msgstr "/Редагувати/Пошук листів..."
 
-#: src/mainwindow.c:512
+#: src/mainwindow.c:503
 msgid "/_View/Show or hi_de"
 msgstr "/Вигляд/Показати чи приховати"
 
-#: src/mainwindow.c:513
+#: src/mainwindow.c:504
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/Вигляд/Показати чи приховати/Дерево папок"
 
-#: src/mainwindow.c:515
+#: src/mainwindow.c:506
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/Вигляд/Показати чи приховати/Зміст листа"
 
-#: src/mainwindow.c:517
+#: src/mainwindow.c:508
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/Вигляд/Показати чи приховати/Панель інструментів"
 
-#: src/mainwindow.c:519
+#: src/mainwindow.c:510
 msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/Вигляд/Показати чи приховати/Панель інструментів/Іконка і текст"
 
-#: src/mainwindow.c:521
+#: src/mainwindow.c:512
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/Вигляд/Показати чи приховати/Панель інструментів/Іконка"
 
-#: src/mainwindow.c:523
+#: src/mainwindow.c:514
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/Вигляд/Показати чи приховати/Панель інструментів/Текст"
 
-#: src/mainwindow.c:525
+#: src/mainwindow.c:516
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/Вигляд/Показати чи приховати/Панель інструментів/Немає"
 
-#: src/mainwindow.c:527
+#: src/mainwindow.c:518
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/Вигляд/Показати чи приховати/Панель стану"
 
-#: src/mainwindow.c:530
+#: src/mainwindow.c:521
 msgid "/_View/Separate f_older tree"
 msgstr "/Вигляд/Окреме дерево папок"
 
-#: src/mainwindow.c:531
+#: src/mainwindow.c:522
 #, fuzzy
 msgid "/_View/Separate _message view"
 msgstr "/Вигляд/Окрема область перегляду змісту"
 
-#: src/mainwindow.c:533
+#: src/mainwindow.c:524
 msgid "/_View/_Sort"
 msgstr "/Вигляд/Сортувати"
 
-#: src/mainwindow.c:534
+#: src/mainwindow.c:525
 msgid "/_View/_Sort/by _number"
 msgstr "/Вигляд/Сортувати/За номером"
 
-#: src/mainwindow.c:535
+#: src/mainwindow.c:526
 msgid "/_View/_Sort/by s_ize"
 msgstr "/Вигляд/Сортувати/За розміром"
 
-#: src/mainwindow.c:536
+#: src/mainwindow.c:527
 msgid "/_View/_Sort/by _date"
 msgstr "/Вигляд/Сортувати/За датою"
 
-#: src/mainwindow.c:537
+#: src/mainwindow.c:528
 msgid "/_View/_Sort/by _from"
 msgstr "/Вигляд/Сортувати/За відправником"
 
-#: src/mainwindow.c:538
+#: src/mainwindow.c:529
 msgid "/_View/_Sort/by _recipient"
 msgstr "/Вигляд/Сортувати/За одержувачем"
 
-#: src/mainwindow.c:539
+#: src/mainwindow.c:530
 msgid "/_View/_Sort/by _subject"
 msgstr "/Вигляд/Сортувати/За темою"
 
-#: src/mainwindow.c:540
+#: src/mainwindow.c:531
 msgid "/_View/_Sort/by _color label"
 msgstr "/Вигляд/Сортувати/За виділенням кольором"
 
-#: src/mainwindow.c:542
+#: src/mainwindow.c:533
 msgid "/_View/_Sort/by _mark"
 msgstr "/Вигляд/Сортувати/За позначкою"
 
-#: src/mainwindow.c:543
+#: src/mainwindow.c:534
 msgid "/_View/_Sort/by _unread"
 msgstr "/Вигляд/Сортувати/Окремо непрочитані"
 
-#: src/mainwindow.c:544
+#: src/mainwindow.c:535
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/Вигляд/Сортувати/За вкладенням"
 
-#: src/mainwindow.c:546
+#: src/mainwindow.c:537
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/Вигляд/Сортувати/Непотрібно"
 
-#: src/mainwindow.c:547 src/mainwindow.c:550
+#: src/mainwindow.c:538 src/mainwindow.c:541
 msgid "/_View/_Sort/---"
 msgstr "/Вигляд/Сортувати/---"
 
-#: src/mainwindow.c:548
+#: src/mainwindow.c:539
 msgid "/_View/_Sort/Ascending"
 msgstr "/Вигляд/Сортувати/За зростанням"
 
-#: src/mainwindow.c:549
+#: src/mainwindow.c:540
 msgid "/_View/_Sort/Descending"
 msgstr "/Вигляд/Сортувати/За спаданням"
 
-#: src/mainwindow.c:551
+#: src/mainwindow.c:542
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/Вигляд/Сортувати/Групувати за темою"
 
-#: src/mainwindow.c:553
+#: src/mainwindow.c:544
 msgid "/_View/Th_read view"
 msgstr "/Вигляд/Перегляд обговорення"
 
-#: src/mainwindow.c:554
+#: src/mainwindow.c:545
 msgid "/_View/E_xpand all threads"
 msgstr "/Вигляд/Розгортати всі обговорення"
 
-#: src/mainwindow.c:555
+#: src/mainwindow.c:546
 msgid "/_View/Co_llapse all threads"
 msgstr "/Вигляд/Згорнути всі обговорення"
 
-#: src/mainwindow.c:556
+#: src/mainwindow.c:547
 msgid "/_View/Set display _item..."
 msgstr "/Вигляд/Встановити поля для показу..."
 
-#: src/mainwindow.c:559
+#: src/mainwindow.c:550
 msgid "/_View/_Go to"
 msgstr "/Вигляд/Перейти до"
 
-#: src/mainwindow.c:560
+#: src/mainwindow.c:551
 msgid "/_View/_Go to/_Prev message"
 msgstr "/Вигляд/Перейти до/Наступного листа"
 
-#: src/mainwindow.c:561
+#: src/mainwindow.c:552
 msgid "/_View/_Go to/_Next message"
 msgstr "/Вигляд/Перейти до/Попереднього листа"
 
-#: src/mainwindow.c:562 src/mainwindow.c:567 src/mainwindow.c:570
-#: src/mainwindow.c:575 src/mainwindow.c:580
+#: src/mainwindow.c:553 src/mainwindow.c:558 src/mainwindow.c:561
+#: src/mainwindow.c:566 src/mainwindow.c:571
 msgid "/_View/_Go to/---"
 msgstr "/Вигляд/Перейти до/---"
 
-#: src/mainwindow.c:563
+#: src/mainwindow.c:554
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/Вигляд/Перейти до/Попереднього непрочитаного листа"
 
-#: src/mainwindow.c:565
+#: src/mainwindow.c:556
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/Вигляд/Перейти до/Наступного непрочитаного листа"
 
-#: src/mainwindow.c:568
+#: src/mainwindow.c:559
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/Вигляд/Перейти до/Попереднього нового листа"
 
-#: src/mainwindow.c:569
+#: src/mainwindow.c:560
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/Вигляд/Перейти до/Наступного нового листа"
 
-#: src/mainwindow.c:571
+#: src/mainwindow.c:562
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/Вигляд/Перейти до/Попереднього позначеного листа"
 
-#: src/mainwindow.c:573
+#: src/mainwindow.c:564
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/Вигляд/Перейти до/Наступного позначеного листа"
 
-#: src/mainwindow.c:576
+#: src/mainwindow.c:567
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/Вигляд/Перейти до/Попереднього листа, виділеного кольором"
 
-#: src/mainwindow.c:578
+#: src/mainwindow.c:569
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/Вигляд/Перейти до/Наступного листа, виділеного кольором"
 
-#: src/mainwindow.c:581
+#: src/mainwindow.c:572
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/Вигляд/Перейти до/Іншої папки"
 
-#: src/mainwindow.c:590 src/messageview.c:158
+#: src/mainwindow.c:581 src/messageview.c:158
 #, fuzzy
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/Вигляд/Кодова таблиця/_Aвтоматична"
 
-#: src/mainwindow.c:641 src/messageview.c:202
+#: src/mainwindow.c:632 src/messageview.c:202
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/Вигляд/Кодова таблиця/Японська (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:643 src/messageview.c:204
+#: src/mainwindow.c:634 src/messageview.c:204
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/Вигляд/Кодова таблиця/Японська (_EUC-JP)"
 
-#: src/mainwindow.c:645 src/messageview.c:206
+#: src/mainwindow.c:636 src/messageview.c:206
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/Вигляд/Кодова таблиця/Японська (_Shift__JIS)"
 
-#: src/mainwindow.c:657 src/messageview.c:217
+#: src/mainwindow.c:648 src/messageview.c:217
 #, fuzzy
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/Вигляд/Кодова таблиця/Китайська (ISO-2022-_CN)"
 
-#: src/mainwindow.c:663 src/messageview.c:222
+#: src/mainwindow.c:654 src/messageview.c:222
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/Вигляд/Кодова таблиця/Корейська (ISO-2022-KR)"
 
-#: src/mainwindow.c:676 src/summaryview.c:401
+#: src/mainwindow.c:667 src/summaryview.c:401
 msgid "/_View/Open in new _window"
 msgstr "/Вигляд/Відкрити в новому вікні"
 
-#: src/mainwindow.c:677 src/messageview.c:234
+#: src/mainwindow.c:668 src/messageview.c:234
 msgid "/_View/Mess_age source"
 msgstr "/Вигляд/Вихідний текст листа"
 
-#: src/mainwindow.c:678 src/messageview.c:235
+#: src/mainwindow.c:669 src/messageview.c:235
 msgid "/_View/Show all _header"
 msgstr "/Вигляд/Показати весь заголовок"
 
-#: src/mainwindow.c:680
+#: src/mainwindow.c:671
 msgid "/_View/_Update summary"
 msgstr "/Вигляд/Оновити список"
 
-#: src/mainwindow.c:682 src/messageview.c:237
+#: src/mainwindow.c:673 src/messageview.c:237
 msgid "/_Message"
 msgstr "/Лист"
 
-#: src/mainwindow.c:683
+#: src/mainwindow.c:674
 msgid "/_Message/Recei_ve"
 msgstr "/Лист/Отримати"
 
-#: src/mainwindow.c:684
+#: src/mainwindow.c:675
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/Лист/Отримати/Для поточного запису"
 
-#: src/mainwindow.c:686
+#: src/mainwindow.c:677
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/Лист/Отримати/Для всіх записів"
 
-#: src/mainwindow.c:688
+#: src/mainwindow.c:679
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/Лист/Отримати/Скасувати отримання"
 
-#: src/mainwindow.c:690
+#: src/mainwindow.c:681
 msgid "/_Message/Recei_ve/---"
 msgstr "/Лист/Отримати/---"
 
-#: src/mainwindow.c:691
+#: src/mainwindow.c:682
 msgid "/_Message/_Send queued messages"
 msgstr "/Лист/Відіслати відкладені листи"
 
-#: src/mainwindow.c:692 src/mainwindow.c:694 src/mainwindow.c:701
-#: src/mainwindow.c:706 src/mainwindow.c:710 src/mainwindow.c:719
-#: src/mainwindow.c:722 src/messageview.c:240 src/messageview.c:248
+#: src/mainwindow.c:683 src/mainwindow.c:685 src/mainwindow.c:692
+#: src/mainwindow.c:697 src/mainwindow.c:701 src/mainwindow.c:710
+#: src/mainwindow.c:713 src/messageview.c:240 src/messageview.c:248
 #: src/messageview.c:253
 msgid "/_Message/---"
 msgstr "/Лист/---"
 
-#: src/mainwindow.c:693 src/messageview.c:238
+#: src/mainwindow.c:684 src/messageview.c:238
 msgid "/_Message/Compose _new message"
 msgstr "/Лист/Написати новий лист"
 
-#: src/mainwindow.c:695 src/messageview.c:241
+#: src/mainwindow.c:686 src/messageview.c:241
 msgid "/_Message/_Reply"
 msgstr "/Лист/Відповісти"
 
-#: src/mainwindow.c:696
+#: src/mainwindow.c:687
 msgid "/_Message/Repl_y to"
 msgstr "/Лист/Відповісти"
 
-#: src/mainwindow.c:697 src/messageview.c:242
+#: src/mainwindow.c:688 src/messageview.c:242
 msgid "/_Message/Repl_y to/_all"
 msgstr "/Лист/Відповісти/всім"
 
-#: src/mainwindow.c:698 src/messageview.c:244
+#: src/mainwindow.c:689 src/messageview.c:244
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/Лист/Відповісти/відправнику"
 
-#: src/mainwindow.c:699 src/messageview.c:246
+#: src/mainwindow.c:690 src/messageview.c:246
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/Лист/Відповісти/конференції"
 
-#: src/mainwindow.c:702 src/messageview.c:249
+#: src/mainwindow.c:693 src/messageview.c:249
 msgid "/_Message/_Forward"
 msgstr "/Лист/Переслати"
 
-#: src/mainwindow.c:703 src/messageview.c:250
+#: src/mainwindow.c:694 src/messageview.c:250
 msgid "/_Message/For_ward as attachment"
 msgstr "/Лист/Переслати як вкладення"
 
-#: src/mainwindow.c:705 src/messageview.c:252
+#: src/mainwindow.c:696 src/messageview.c:252
 msgid "/_Message/Redirec_t"
 msgstr "/Лист/Переспрямувати"
 
-#: src/mainwindow.c:707
+#: src/mainwindow.c:698
 msgid "/_Message/M_ove..."
 msgstr "/Лист/Перемістити"
 
-#: src/mainwindow.c:708
+#: src/mainwindow.c:699
 msgid "/_Message/_Copy..."
 msgstr "/Лист/Копіювати"
 
-#: src/mainwindow.c:709
+#: src/mainwindow.c:700
 msgid "/_Message/_Delete"
 msgstr "/Лист/Видалити"
 
-#: src/mainwindow.c:711
+#: src/mainwindow.c:702
 msgid "/_Message/_Mark"
 msgstr "/Лист/Позначка"
 
-#: src/mainwindow.c:712
+#: src/mainwindow.c:703
 msgid "/_Message/_Mark/_Mark"
 msgstr "/Лист/Позначка/Зробити"
 
-#: src/mainwindow.c:713
+#: src/mainwindow.c:704
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/Лист/Позначка/Зняти"
 
-#: src/mainwindow.c:714
+#: src/mainwindow.c:705
 msgid "/_Message/_Mark/---"
 msgstr "/Лист/Позначка/---"
 
-#: src/mainwindow.c:715
+#: src/mainwindow.c:706
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/Лист/Позначка/Позначити як непрочитаний"
 
-#: src/mainwindow.c:716
+#: src/mainwindow.c:707
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/Лист/Позначка/Позначити як прочитаний"
 
-#: src/mainwindow.c:718
+#: src/mainwindow.c:709
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/Лист/Позначка/Позначити всі як прочитані"
 
-#: src/mainwindow.c:720
+#: src/mainwindow.c:711
 #, fuzzy
 msgid "/_Message/Set as _junk mail"
 msgstr "/Лист/Позначка/Зняти"
 
-#: src/mainwindow.c:721
+#: src/mainwindow.c:712
 msgid "/_Message/Set as not j_unk mail"
 msgstr ""
 
-#: src/mainwindow.c:723 src/messageview.c:254
+#: src/mainwindow.c:714 src/messageview.c:254
 msgid "/_Message/Re-_edit"
 msgstr "/Лист/Змінити"
 
-#: src/mainwindow.c:727
+#: src/mainwindow.c:718
 #, fuzzy
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/Інструменти/Додати відправника до адресної книги"
 
-#: src/mainwindow.c:730
+#: src/mainwindow.c:721
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/Інструменти/Фільтрувати всі листи в папці"
 
-#: src/mainwindow.c:732
+#: src/mainwindow.c:723
 msgid "/_Tools/Filter _selected messages"
 msgstr "/Інструменти/Фільтрувати виділені листи"
 
-#: src/mainwindow.c:734 src/messageview.c:261
+#: src/mainwindow.c:725 src/messageview.c:261
 msgid "/_Tools/_Create filter rule"
 msgstr "/Інструменти/Створити правило фільтрування"
 
-#: src/mainwindow.c:735 src/messageview.c:263
+#: src/mainwindow.c:726 src/messageview.c:263
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/Інструменти/Створити правило фільтрування/Автоматично"
 
-#: src/mainwindow.c:737 src/messageview.c:265
+#: src/mainwindow.c:728 src/messageview.c:265
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/Інструменти/Створити правило фільтрування/За полем `Від'"
 
-#: src/mainwindow.c:739 src/messageview.c:267
+#: src/mainwindow.c:730 src/messageview.c:267
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/Інструменти/Створити правило фільтрування/За полем `Кому'"
 
-#: src/mainwindow.c:741 src/messageview.c:269
+#: src/mainwindow.c:732 src/messageview.c:269
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/Інструменти/Створити правило фільтрування/За полем `Тема'"
 
-#: src/mainwindow.c:744
+#: src/mainwindow.c:735
 #, fuzzy
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/Інструменти/Фільтрувати всі листи в папці"
 
-#: src/mainwindow.c:746
+#: src/mainwindow.c:737
 #, fuzzy
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/Інструменти/Фільтрувати виділені листи"
 
-#: src/mainwindow.c:751
+#: src/mainwindow.c:742
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/Інструменти/Видалити повторювані листи"
 
-#: src/mainwindow.c:754
+#: src/mainwindow.c:745
 msgid "/_Tools/E_xecute"
 msgstr "/Інструменти/Виконати"
 
-#: src/mainwindow.c:756
+#: src/mainwindow.c:747
 msgid "/_Tools/_Log window"
 msgstr "/Інструменти/Вікно журналу"
 
-#: src/mainwindow.c:758
+#: src/mainwindow.c:749
 msgid "/_Configuration"
 msgstr "/Конфігурація"
 
-#: src/mainwindow.c:759
+#: src/mainwindow.c:750
 msgid "/_Configuration/_Common preferences..."
 msgstr "/Конфігурація/Спільні налаштування..."
 
-#: src/mainwindow.c:761
+#: src/mainwindow.c:752
 msgid "/_Configuration/_Filter setting..."
 msgstr "/Конфігурація/Налаштування фільтра..."
 
-#: src/mainwindow.c:763
+#: src/mainwindow.c:754
 msgid "/_Configuration/_Template..."
 msgstr "/Конфігурація/Шаблон..."
 
-#: src/mainwindow.c:764
+#: src/mainwindow.c:755
 msgid "/_Configuration/_Actions..."
 msgstr "/Конфігурація/Дії..."
 
-#: src/mainwindow.c:765
+#: src/mainwindow.c:756
 msgid "/_Configuration/---"
 msgstr "/Конфігурація/---"
 
-#: src/mainwindow.c:766
+#: src/mainwindow.c:757
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/Конфігурація/Налаштування поточного запису..."
 
-#: src/mainwindow.c:768
+#: src/mainwindow.c:759
 msgid "/_Configuration/Create _new account..."
 msgstr "/Конфігурація/Створити новий обліковий запис..."
 
-#: src/mainwindow.c:770
+#: src/mainwindow.c:761
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/Конфігурація/Редагувати облікові записи..."
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:763
 msgid "/_Configuration/C_hange current account"
 msgstr "/Конфігурація/Змінити поточний запис"
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:767
 msgid "/_Help/_Manual"
 msgstr "/Довідка/Посібник"
 
-#: src/mainwindow.c:777
+#: src/mainwindow.c:768
 msgid "/_Help/_Manual/_English"
 msgstr "/Довідка/Посібник/Англійський"
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:769
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/Довідка/Посібник/Японський"
 
-#: src/mainwindow.c:779
+#: src/mainwindow.c:770
 msgid "/_Help/_FAQ"
 msgstr "/Довідка/FAQ"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:771
 msgid "/_Help/_FAQ/_English"
 msgstr "/Довідка/FAQ/Англійський"
 
-#: src/mainwindow.c:781
+#: src/mainwindow.c:772
 msgid "/_Help/_FAQ/_German"
 msgstr "/Довідка/FAQ/Німецький"
 
-#: src/mainwindow.c:782
+#: src/mainwindow.c:773
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/Довідка/FAQ/Іспанський"
 
-#: src/mainwindow.c:783
+#: src/mainwindow.c:774
 msgid "/_Help/_FAQ/_French"
 msgstr "/Довідка/FAQ/Французький"
 
-#: src/mainwindow.c:784
+#: src/mainwindow.c:775
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/Довідка/FAQ/Італійський"
 
-#: src/mainwindow.c:785
+#: src/mainwindow.c:776
 msgid "/_Help/---"
 msgstr "/Довідка/---"
 
-#: src/mainwindow.c:825
+#: src/mainwindow.c:816
 msgid "Creating main window...\n"
 msgstr "Створюємо головне вікно...\n"
 
-#: src/mainwindow.c:987
+#: src/mainwindow.c:973
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Головне Вікно: невдача розміщення кольору %d\n"
 
-#: src/mainwindow.c:1071 src/summaryview.c:2020 src/summaryview.c:2105
+#: src/mainwindow.c:1057 src/summaryview.c:2020 src/summaryview.c:2105
 #: src/summaryview.c:3342 src/summaryview.c:3415 src/summaryview.c:3728
 msgid "done.\n"
 msgstr "виконано.\n"
 
-#: src/mainwindow.c:1196 src/mainwindow.c:1237 src/mainwindow.c:1265
+#: src/mainwindow.c:1182 src/mainwindow.c:1223 src/mainwindow.c:1251
 msgid "Untitled"
 msgstr "БезНазви"
 
-#: src/mainwindow.c:1266
+#: src/mainwindow.c:1252
 msgid "none"
 msgstr "немає"
 
-#: src/mainwindow.c:1316
+#: src/mainwindow.c:1302
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "Зміна типу розділення вікна з %d на %d\n"
 
-#: src/mainwindow.c:1536
+#: src/mainwindow.c:1522
 msgid "Offline"
 msgstr "Без з'єднання"
 
-#: src/mainwindow.c:1537
+#: src/mainwindow.c:1523
 msgid "You are offline. Go online?"
 msgstr "З'єднання немає. Під'єднатись?"
 
-#: src/mainwindow.c:1551
+#: src/mainwindow.c:1537
 #, fuzzy
 msgid "Empty all trash"
 msgstr "Спорожнити кошик"
 
-#: src/mainwindow.c:1552
+#: src/mainwindow.c:1538
 #, fuzzy
 msgid "Empty messages in all trash?"
 msgstr "Видалити всі листи з кошика?"
 
-#: src/mainwindow.c:1580
+#: src/mainwindow.c:1566
 msgid "Add mailbox"
 msgstr "Додати скриньку"
 
-#: src/mainwindow.c:1581
+#: src/mainwindow.c:1567
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3182,16 +3182,16 @@ msgstr ""
 "Якщо вона вже існує, її буде перечитано\n"
 "автоматично."
 
-#: src/mainwindow.c:1587
+#: src/mainwindow.c:1573
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Скринька `%s' вже існує."
 
-#: src/mainwindow.c:1592 src/setup.c:57
+#: src/mainwindow.c:1578 src/setup.c:57
 msgid "Mailbox"
 msgstr "Скринька"
 
-#: src/mainwindow.c:1598 src/setup.c:63
+#: src/mainwindow.c:1584 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3201,150 +3201,150 @@ msgstr ""
 "Можливо, деякі файли вже існують, або Ви не маєте\n"
 "права запису тут."
 
-#: src/mainwindow.c:1989
+#: src/mainwindow.c:1975
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Папки"
 
-#: src/mainwindow.c:2009 src/messageview.c:368
+#: src/mainwindow.c:1995 src/messageview.c:368
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Листи"
 
-#: src/mainwindow.c:2156 src/summaryview.c:370
+#: src/mainwindow.c:2142 src/summaryview.c:370
 msgid "/_Reply"
 msgstr "/Відповісти"
 
-#: src/mainwindow.c:2157
+#: src/mainwindow.c:2143
 msgid "/Reply to _all"
 msgstr "/Відповісти всім"
 
-#: src/mainwindow.c:2158
+#: src/mainwindow.c:2144
 msgid "/Reply to _sender"
 msgstr "/Відповісти відправникові"
 
-#: src/mainwindow.c:2159
+#: src/mainwindow.c:2145
 msgid "/Reply to mailing _list"
 msgstr "/Відповісти конференції"
 
-#: src/mainwindow.c:2164 src/summaryview.c:377
+#: src/mainwindow.c:2150 src/summaryview.c:377
 msgid "/_Forward"
 msgstr "/Переслати далі"
 
-#: src/mainwindow.c:2165 src/summaryview.c:378
+#: src/mainwindow.c:2151 src/summaryview.c:378
 msgid "/For_ward as attachment"
 msgstr "/Переслати далі як вкладення"
 
-#: src/mainwindow.c:2166 src/summaryview.c:379
+#: src/mainwindow.c:2152 src/summaryview.c:379
 msgid "/Redirec_t"
 msgstr "/Переспрямувати"
 
-#: src/mainwindow.c:2205
+#: src/mainwindow.c:2188
 msgid "Get"
 msgstr "Отримати"
 
-#: src/mainwindow.c:2206
+#: src/mainwindow.c:2189
 msgid "Incorporate new mail"
 msgstr "Отримати нові листи"
 
-#: src/mainwindow.c:2213
+#: src/mainwindow.c:2196
 msgid "Get all"
 msgstr "Отримати всі"
 
-#: src/mainwindow.c:2214
+#: src/mainwindow.c:2197
 msgid "Incorporate new mail of all accounts"
 msgstr "Отримати нові листи для всіх записів"
 
-#: src/mainwindow.c:2225
+#: src/mainwindow.c:2208
 msgid "Send queued message(s)"
 msgstr "Відіслати лист(и) з черги"
 
-#: src/mainwindow.c:2235 src/prefs_account.c:721 src/prefs_common.c:949
+#: src/mainwindow.c:2218 src/prefs_account.c:721 src/prefs_common.c:949
 #: src/prefs_folder_item.c:137
 msgid "Compose"
 msgstr "Створення листа"
 
-#: src/mainwindow.c:2236
+#: src/mainwindow.c:2219
 msgid "Compose new message"
 msgstr "Новий лист"
 
-#: src/mainwindow.c:2244 src/prefs_common.c:1448
+#: src/mainwindow.c:2227 src/prefs_common.c:1448
 msgid "Reply"
 msgstr "Відповісти"
 
-#: src/mainwindow.c:2245 src/mainwindow.c:2258
+#: src/mainwindow.c:2228 src/mainwindow.c:2241
 msgid "Reply to the message"
 msgstr "Відповісти на лист"
 
-#: src/mainwindow.c:2263
+#: src/mainwindow.c:2245
 msgid "Reply all"
 msgstr "Відповісти всім"
 
-#: src/mainwindow.c:2264
+#: src/mainwindow.c:2246
 msgid "Reply to all"
 msgstr "Відповісти всім"
 
-#: src/mainwindow.c:2272 src/prefs_filter_edit.c:741
+#: src/mainwindow.c:2254 src/prefs_filter_edit.c:741
 msgid "Forward"
 msgstr "Переслати"
 
-#: src/mainwindow.c:2273 src/mainwindow.c:2286
+#: src/mainwindow.c:2255 src/mainwindow.c:2268
 msgid "Forward the message"
 msgstr "Переслати лист"
 
-#: src/mainwindow.c:2293
+#: src/mainwindow.c:2275
 msgid "Delete the message"
 msgstr "Видалити лист"
 
-#: src/mainwindow.c:2301 src/prefs_common.c:1988
+#: src/mainwindow.c:2283 src/prefs_common.c:1988
 msgid "Junk"
 msgstr ""
 
-#: src/mainwindow.c:2302
+#: src/mainwindow.c:2284
 #, fuzzy
 msgid "Set as junk mail"
 msgstr "Встановити як default"
 
-#: src/mainwindow.c:2311
+#: src/mainwindow.c:2293
 msgid "Execute"
 msgstr "Виконати"
 
-#: src/mainwindow.c:2312
+#: src/mainwindow.c:2294
 msgid "Execute marked process"
 msgstr "Виконати позначений процес"
 
-#: src/mainwindow.c:2322
+#: src/mainwindow.c:2304
 msgid "Next unread message"
 msgstr "Наступний непрочитаний лист"
 
-#: src/mainwindow.c:2334
+#: src/mainwindow.c:2316
 msgid "Prefs"
 msgstr "Налаштування"
 
-#: src/mainwindow.c:2335
+#: src/mainwindow.c:2317
 msgid "Common preferences"
 msgstr "Спільні налаштування"
 
-#: src/mainwindow.c:2343 src/prefs_folder_item.c:261
+#: src/mainwindow.c:2325 src/prefs_folder_item.c:261
 #: src/prefs_folder_item.c:272 src/progressdialog.c:128
 msgid "Account"
 msgstr "Обліковий запис"
 
-#: src/mainwindow.c:2344
+#: src/mainwindow.c:2326
 msgid "Account setting"
 msgstr "Налаштування запису"
 
-#: src/mainwindow.c:2527
+#: src/mainwindow.c:2498
 msgid "You are offline. Click the icon to go online."
 msgstr "З'єднання немає. Клацніть на іконці, щоб під'єднатись."
 
-#: src/mainwindow.c:2538
+#: src/mainwindow.c:2509
 msgid "You are online. Click the icon to go offline."
 msgstr "Ви під'єднані. Клацніть на іконці, щоб від'єднатись."
 
-#: src/mainwindow.c:2731
+#: src/mainwindow.c:2702
 msgid "Exit"
 msgstr "Вихід"
 
-#: src/mainwindow.c:2731
+#: src/mainwindow.c:2702
 msgid "Exit this program?"
 msgstr "Вийти з цієї програми?"
 
@@ -5561,11 +5561,11 @@ msgstr "Створюємо діалогове вікно прогресу...\n"
 msgid "Status"
 msgstr "Стан"
 
-#: src/recv.c:113
+#: src/recv.c:112
 msgid "error occurred while retrieving data.\n"
 msgstr "трапилась помилка при отриманні даних.\n"
 
-#: src/recv.c:155 src/recv.c:197 src/recv.c:213
+#: src/recv.c:154 src/recv.c:196 src/recv.c:211
 msgid "Can't write to file.\n"
 msgstr "Не вдалось писати в файл.\n"
 
@@ -6304,7 +6304,7 @@ msgstr "%.2fMB"
 msgid "%.2fGB"
 msgstr "%.2fGB"
 
-#: src/utils.c:2372 src/utils.c:2496
+#: src/utils.c:2386 src/utils.c:2510
 #, c-format
 msgid "writing to %s failed.\n"
 msgstr "Невдача запису в %s.\n"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 0ba46368..86408137 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-08-09 18:08+0900\n"
+"POT-Creation-Date: 2005-08-22 17:22+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"
@@ -95,7 +95,7 @@ msgstr ""
 "时会检查新邮件。"
 
 #: src/account.c:691 src/addressadd.c:192 src/addressbook.c:490
-#: src/compose.c:4081 src/editaddress.c:200 src/editaddress.c:942
+#: src/compose.c:4079 src/editaddress.c:200 src/editaddress.c:942
 #: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:265
 #: src/editjpilot.c:271 src/editldap.c:307 src/editvcard.c:184
 #: src/mimeview.c:201 src/prefs_filter.c:258 src/prefs_folder_item.c:170
@@ -233,7 +233,7 @@ msgstr "动作的用户参数"
 msgid "Add Address to Book"
 msgstr "将地址添加到地址簿"
 
-#: src/addressadd.c:202 src/compose.c:4528 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4521 src/editaddress.c:201
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "地址"
@@ -247,7 +247,7 @@ msgstr "注释"
 msgid "Select Address Book Folder"
 msgstr "选择地址簿文件夹"
 
-#: src/addressbook.c:336 src/compose.c:495 src/mainwindow.c:470
+#: src/addressbook.c:336 src/compose.c:493 src/mainwindow.c:461
 #: src/messageview.c:137
 msgid "/_File"
 msgstr "/文件(_F)"
@@ -268,10 +268,10 @@ msgstr "/文件(_F)/新建 JPilot(_J)"
 msgid "/_File/New _Server"
 msgstr "/文件(_F)/新建服务器(_S)"
 
-#: src/addressbook.c:345 src/addressbook.c:348 src/compose.c:500
-#: src/compose.c:505 src/compose.c:509 src/mainwindow.c:488
-#: src/mainwindow.c:491 src/mainwindow.c:493 src/mainwindow.c:496
-#: src/mainwindow.c:498 src/messageview.c:140
+#: src/addressbook.c:345 src/addressbook.c:348 src/compose.c:498
+#: src/compose.c:503 src/compose.c:507 src/mainwindow.c:479
+#: src/mainwindow.c:482 src/mainwindow.c:484 src/mainwindow.c:487
+#: src/mainwindow.c:489 src/messageview.c:140
 msgid "/_File/---"
 msgstr "/文件(_F)/---"
 
@@ -287,7 +287,7 @@ msgstr "/文件(_F)/删除(_D)"
 msgid "/_File/_Save"
 msgstr "/文件(_F)/保存(_S)"
 
-#: src/addressbook.c:350 src/compose.c:510 src/messageview.c:141
+#: src/addressbook.c:350 src/compose.c:508 src/messageview.c:141
 msgid "/_File/_Close"
 msgstr "/文件(_F)/关闭(_C)"
 
@@ -319,7 +319,7 @@ msgstr "/地址(_A)/编辑(_E)"
 msgid "/_Address/_Delete"
 msgstr "/地址(_A)/删除(_D)"
 
-#: src/addressbook.c:358 src/compose.c:619 src/mainwindow.c:725
+#: src/addressbook.c:358 src/compose.c:617 src/mainwindow.c:716
 #: src/messageview.c:256
 msgid "/_Tools"
 msgstr "/工具(_T)"
@@ -328,12 +328,12 @@ msgstr "/工具(_T)"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/工具(_T)/导入LDIF文件(_L)"
 
-#: src/addressbook.c:360 src/compose.c:632 src/mainwindow.c:775
+#: src/addressbook.c:360 src/compose.c:630 src/mainwindow.c:766
 #: src/messageview.c:274
 msgid "/_Help"
 msgstr "/帮助(_H)"
 
-#: src/addressbook.c:361 src/compose.c:633 src/mainwindow.c:786
+#: src/addressbook.c:361 src/compose.c:631 src/mainwindow.c:777
 #: src/messageview.c:275
 msgid "/_Help/_About"
 msgstr "/帮助(_H)/关于(_A)"
@@ -350,7 +350,7 @@ msgstr "/新建组(_G)"
 msgid "/New _Folder"
 msgstr "/新建文件夹(_F)"
 
-#: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:489
+#: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:487
 #: src/folderview.c:235 src/folderview.c:237 src/folderview.c:241
 #: src/folderview.c:252 src/folderview.c:254 src/folderview.c:256
 #: src/folderview.c:260 src/folderview.c:270 src/folderview.c:272
@@ -360,8 +360,8 @@ msgstr "/新建文件夹(_F)"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:512
-#: src/mainwindow.c:502 src/messageview.c:143
+#: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:510
+#: src/mainwindow.c:493 src/messageview.c:143
 msgid "/_Edit"
 msgstr "/编辑(_E)"
 
@@ -373,7 +373,7 @@ msgstr "/删除(_D)"
 msgid "E-Mail address"
 msgstr "电子邮件地址"
 
-#: src/addressbook.c:495 src/compose.c:4529 src/prefs_common.c:2402
+#: src/addressbook.c:495 src/compose.c:4522 src/prefs_common.c:2402
 msgid "Address book"
 msgstr "地址簿"
 
@@ -382,8 +382,8 @@ msgid "Name:"
 msgstr "姓名："
 
 #. Buttons
-#: src/addressbook.c:627 src/addressbook.c:1673 src/editaddress.c:884
-#: src/editaddress.c:1017 src/mainwindow.c:2292 src/prefs_actions.c:266
+#: src/addressbook.c:627 src/addressbook.c:1674 src/editaddress.c:884
+#: src/editaddress.c:1017 src/mainwindow.c:2274 src/prefs_actions.c:266
 #: src/prefs_display_header.c:278 src/prefs_display_header.c:333
 #: src/prefs_template.c:231
 msgid "Delete"
@@ -422,7 +422,7 @@ msgstr "删除地址"
 msgid "Really delete the address(es)?"
 msgstr "真的要删除地址？"
 
-#: src/addressbook.c:1664
+#: src/addressbook.c:1665
 #, fuzzy, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -431,38 +431,38 @@ msgstr ""
 "您要删除“%s”中的文件夹和所有地址吗？\n"
 "如果仅删除文件夹，地址将被移到上一级文件夹中。"
 
-#: src/addressbook.c:1667 src/folderview.c:2139
+#: src/addressbook.c:1668 src/folderview.c:2139
 msgid "Delete folder"
 msgstr "删除文件夹"
 
-#: src/addressbook.c:1667
+#: src/addressbook.c:1668
 #, fuzzy
 msgid "_Folder only"
 msgstr "仅文件夹"
 
-#: src/addressbook.c:1667
+#: src/addressbook.c:1668
 #, fuzzy
 msgid "Folder and _addresses"
 msgstr "文件夹和地址"
 
-#: src/addressbook.c:1672
+#: src/addressbook.c:1673
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "真的要删除“%s”？"
 
-#: src/addressbook.c:2352 src/addressbook.c:2485
+#: src/addressbook.c:2353 src/addressbook.c:2486
 msgid "New user, could not save index file."
 msgstr "新建用户，无法保存索引文件。"
 
-#: src/addressbook.c:2356 src/addressbook.c:2489
+#: src/addressbook.c:2357 src/addressbook.c:2490
 msgid "New user, could not save address book files."
 msgstr "新建用户，无法保存地址簿文件。"
 
-#: src/addressbook.c:2366 src/addressbook.c:2499
+#: src/addressbook.c:2367 src/addressbook.c:2500
 msgid "Old address book converted successfully."
 msgstr "成功转换旧的地址簿。"
 
-#: src/addressbook.c:2371
+#: src/addressbook.c:2372
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -470,7 +470,7 @@ msgstr ""
 "已经转换旧的地址簿，\n"
 "无法保存新的地址索引文件"
 
-#: src/addressbook.c:2384
+#: src/addressbook.c:2385
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -478,7 +478,7 @@ msgstr ""
 "无法转换地址簿，\n"
 "但创建了空的新地址簿文件。"
 
-#: src/addressbook.c:2390
+#: src/addressbook.c:2391
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -486,89 +486,89 @@ msgstr ""
 "无法转换地址簿，\n"
 "无法创建新的地址簿文件。"
 
-#: src/addressbook.c:2395
+#: src/addressbook.c:2396
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
 msgstr "无法转换地址簿且无法创建新的地址簿文件。"
 
-#: src/addressbook.c:2402
+#: src/addressbook.c:2403
 msgid "Addressbook conversion error"
 msgstr "地址簿转换错误"
 
-#: src/addressbook.c:2406
+#: src/addressbook.c:2407
 msgid "Addressbook conversion"
 msgstr "地址簿转换"
 
-#: src/addressbook.c:2441
+#: src/addressbook.c:2442
 msgid "Addressbook Error"
 msgstr "地址簿错误"
 
-#: src/addressbook.c:2442 src/addressbook.c:2542
+#: src/addressbook.c:2443 src/addressbook.c:2543
 msgid "Could not read address index"
 msgstr "无法读取地址索引"
 
-#: src/addressbook.c:2504
+#: src/addressbook.c:2505
 msgid "Old address book converted, could not save new address index file"
 msgstr "已经转换旧的地址簿，无法保存新的地址索引文件"
 
-#: src/addressbook.c:2518
+#: src/addressbook.c:2519
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr "无法转换地址簿，但创建了空的新地址簿文件。"
 
-#: src/addressbook.c:2524
+#: src/addressbook.c:2525
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr "无法转换地址簿，无法创建新的地址簿文件。"
 
-#: src/addressbook.c:2530
+#: src/addressbook.c:2531
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr "无法转换地址簿且无法创建新的地址簿文件。"
 
-#: src/addressbook.c:2548
+#: src/addressbook.c:2549
 msgid "Addressbook Conversion Error"
 msgstr "地址簿转换错误"
 
-#: src/addressbook.c:2554
+#: src/addressbook.c:2555
 msgid "Addressbook Conversion"
 msgstr "地址簿转换"
 
-#: src/addressbook.c:3055 src/prefs_common.c:963
+#: src/addressbook.c:3056 src/prefs_common.c:963
 msgid "Interface"
 msgstr "界面"
 
-#: src/addressbook.c:3071 src/importldif.c:514
+#: src/addressbook.c:3072 src/importldif.c:514
 msgid "Address Book"
 msgstr "地址簿"
 
-#: src/addressbook.c:3087
+#: src/addressbook.c:3088
 msgid "Person"
 msgstr "个人"
 
-#: src/addressbook.c:3103
+#: src/addressbook.c:3104
 msgid "EMail Address"
 msgstr "电子邮件地址"
 
-#: src/addressbook.c:3119
+#: src/addressbook.c:3120
 msgid "Group"
 msgstr "群组"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3135 src/folderview.c:346 src/prefs_account.c:1866
+#: src/addressbook.c:3136 src/folderview.c:346 src/prefs_account.c:1866
 msgid "Folder"
 msgstr "文件夹"
 
-#: src/addressbook.c:3151
+#: src/addressbook.c:3152
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3167 src/addressbook.c:3183
+#: src/addressbook.c:3168 src/addressbook.c:3184
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3199
+#: src/addressbook.c:3200
 msgid "LDAP Server"
 msgstr "LDAP 服务器"
 
@@ -580,7 +580,7 @@ msgstr "公用地址"
 msgid "Personal address"
 msgstr "个人地址"
 
-#: src/alertpanel.c:138 src/compose.c:5214 src/main.c:515
+#: src/alertpanel.c:138 src/compose.c:5208 src/main.c:515
 msgid "Notice"
 msgstr "注意"
 
@@ -635,351 +635,351 @@ msgstr "棕色"
 msgid "None"
 msgstr "没有"
 
-#: src/compose.c:487
+#: src/compose.c:485
 msgid "/_Add..."
 msgstr "/添加(_A)..."
 
-#: src/compose.c:488
+#: src/compose.c:486
 msgid "/_Remove"
 msgstr "/删除(_R)"
 
-#: src/compose.c:490 src/folderview.c:243 src/folderview.c:262
+#: src/compose.c:488 src/folderview.c:243 src/folderview.c:262
 #: src/folderview.c:277
 msgid "/_Properties..."
 msgstr "/属性(_P)..."
 
-#: src/compose.c:496
+#: src/compose.c:494
 msgid "/_File/_Send"
 msgstr "/文件(_F)/发送(_S)"
 
-#: src/compose.c:498
+#: src/compose.c:496
 msgid "/_File/Send _later"
 msgstr "/文件(_F)/以后发送(_L)"
 
-#: src/compose.c:501
+#: src/compose.c:499
 msgid "/_File/Save to _draft folder"
 msgstr "/文件(_F)/保存到草稿夹(_D)"
 
-#: src/compose.c:503
+#: src/compose.c:501
 msgid "/_File/Save and _keep editing"
 msgstr "/文件(_F)/保存并继续编辑(_K)"
 
-#: src/compose.c:506
+#: src/compose.c:504
 msgid "/_File/_Attach file"
 msgstr "/文件(_F)/添加附件(_A)"
 
-#: src/compose.c:507
+#: src/compose.c:505
 msgid "/_File/_Insert file"
 msgstr "/文件(_F)/插入文件(_I)"
 
-#: src/compose.c:508
+#: src/compose.c:506
 msgid "/_File/Insert si_gnature"
 msgstr "/文件(_F)/插入签名(_G)"
 
-#: src/compose.c:513
+#: src/compose.c:511
 msgid "/_Edit/_Undo"
 msgstr "/编辑(_E)/撤销(_U)"
 
-#: src/compose.c:514
+#: src/compose.c:512
 msgid "/_Edit/_Redo"
 msgstr "/编辑(_E)/重复(_R)"
 
-#: src/compose.c:515 src/compose.c:522 src/mainwindow.c:506
+#: src/compose.c:513 src/compose.c:520 src/mainwindow.c:497
 #: src/messageview.c:146
 msgid "/_Edit/---"
 msgstr "/编辑(_E)/---"
 
-#: src/compose.c:516
+#: src/compose.c:514
 msgid "/_Edit/Cu_t"
 msgstr "/编辑(_E)/剪切(_T)"
 
-#: src/compose.c:517 src/mainwindow.c:503 src/messageview.c:144
+#: src/compose.c:515 src/mainwindow.c:494 src/messageview.c:144
 msgid "/_Edit/_Copy"
 msgstr "/编辑(_E)/复制(_C)"
 
-#: src/compose.c:518
+#: src/compose.c:516
 msgid "/_Edit/_Paste"
 msgstr "/编辑(_E)/粘贴(_P)"
 
-#: src/compose.c:519
+#: src/compose.c:517
 msgid "/_Edit/Paste as _quotation"
 msgstr "/编辑(_E)/作为引文粘贴(_Q)"
 
-#: src/compose.c:521 src/mainwindow.c:504 src/messageview.c:145
+#: src/compose.c:519 src/mainwindow.c:495 src/messageview.c:145
 msgid "/_Edit/Select _all"
 msgstr "/编辑(_E)/全选(_A)"
 
-#: src/compose.c:523
+#: src/compose.c:521
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/编辑(_E)/当前段落折行(_W)"
 
-#: src/compose.c:525
+#: src/compose.c:523
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/编辑(_E)/所有长行折行(_L)"
 
-#: src/compose.c:527
+#: src/compose.c:525
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/编辑(_E)/自动折行(_O)"
 
-#: src/compose.c:528 src/mainwindow.c:511 src/messageview.c:150
+#: src/compose.c:526 src/mainwindow.c:502 src/messageview.c:150
 #: src/summaryview.c:400
 msgid "/_View"
 msgstr "/查看(_V)"
 
-#: src/compose.c:529
+#: src/compose.c:527
 msgid "/_View/_To"
 msgstr "/查看(_V)/收件人(_T)"
 
-#: src/compose.c:530
+#: src/compose.c:528
 msgid "/_View/_Cc"
 msgstr "/查看(_V)/抄送(_C)"
 
-#: src/compose.c:531
+#: src/compose.c:529
 msgid "/_View/_Bcc"
 msgstr "/查看(_V)/密件抄送(_B)"
 
-#: src/compose.c:532
+#: src/compose.c:530
 msgid "/_View/_Reply to"
 msgstr "/查看(_V)/回复至(_R)"
 
-#: src/compose.c:533 src/compose.c:535 src/compose.c:537 src/compose.c:539
-#: src/mainwindow.c:529 src/mainwindow.c:532 src/mainwindow.c:558
-#: src/mainwindow.c:582 src/mainwindow.c:675 src/mainwindow.c:679
+#: src/compose.c:531 src/compose.c:533 src/compose.c:535 src/compose.c:537
+#: src/mainwindow.c:520 src/mainwindow.c:523 src/mainwindow.c:549
+#: src/mainwindow.c:573 src/mainwindow.c:666 src/mainwindow.c:670
 #: src/messageview.c:233
 msgid "/_View/---"
 msgstr "/查看(_V)/---"
 
-#: src/compose.c:534
+#: src/compose.c:532
 msgid "/_View/_Followup to"
 msgstr "/查看(_V)/跟贴(_F)"
 
-#: src/compose.c:536
+#: src/compose.c:534
 msgid "/_View/R_uler"
 msgstr "/查看(_V)/标尺(_U)"
 
-#: src/compose.c:538
+#: src/compose.c:536
 msgid "/_View/_Attachment"
 msgstr "/查看(_V)/附件(_A)"
 
-#: src/compose.c:545 src/mainwindow.c:589 src/messageview.c:157
+#: src/compose.c:543 src/mainwindow.c:580 src/messageview.c:157
 msgid "/_View/Character _encoding"
 msgstr "/查看(_V)/字符编码(_E)"
 
-#: src/compose.c:546
+#: src/compose.c:544
 msgid "/_View/Character _encoding/_Automatic"
 msgstr "/查看(_V)/字符编码(_E)/自动(_A)"
 
-#: src/compose.c:548 src/compose.c:554 src/compose.c:560 src/compose.c:564
-#: src/compose.c:570 src/compose.c:574 src/compose.c:580 src/compose.c:584
-#: src/compose.c:594 src/compose.c:598 src/compose.c:608 src/compose.c:612
-#: src/mainwindow.c:585 src/mainwindow.c:592 src/messageview.c:153
+#: src/compose.c:546 src/compose.c:552 src/compose.c:558 src/compose.c:562
+#: src/compose.c:568 src/compose.c:572 src/compose.c:578 src/compose.c:582
+#: src/compose.c:592 src/compose.c:596 src/compose.c:606 src/compose.c:610
+#: src/mainwindow.c:576 src/mainwindow.c:583 src/messageview.c:153
 msgid "/_View/Character _encoding/---"
 msgstr "/查看(_V)/字符编码(_E)/---"
 
-#: src/compose.c:550 src/mainwindow.c:593 src/messageview.c:161
+#: src/compose.c:548 src/mainwindow.c:584 src/messageview.c:161
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/查看(_V)/字符编码(_E)/7位 ASCII (US-ASC_II)"
 
-#: src/compose.c:552 src/mainwindow.c:595 src/messageview.c:164
+#: src/compose.c:550 src/mainwindow.c:586 src/messageview.c:164
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/查看(_V)/字符编码(_E)/Unicode (_UTF-8)"
 
-#: src/compose.c:556 src/mainwindow.c:599 src/messageview.c:167
+#: src/compose.c:554 src/mainwindow.c:590 src/messageview.c:167
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/查看(_V)/字符编码(_E)/西欧 (ISO-8859-_1)"
 
-#: src/compose.c:558 src/mainwindow.c:601 src/messageview.c:169
+#: src/compose.c:556 src/mainwindow.c:592 src/messageview.c:169
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/查看(_V)/字符编码(_E)/西欧 (ISO-8859-15)"
 
-#: src/compose.c:562 src/mainwindow.c:605 src/messageview.c:172
+#: src/compose.c:560 src/mainwindow.c:596 src/messageview.c:172
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/查看(_V)/字符编码(_E)/中欧 (ISO-8859-_2)"
 
-#: src/compose.c:566 src/mainwindow.c:609 src/messageview.c:175
+#: src/compose.c:564 src/mainwindow.c:600 src/messageview.c:175
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/查看(_V)/字符编码(_E)/波罗的语 (ISO-8859-13)"
 
-#: src/compose.c:568 src/mainwindow.c:611 src/messageview.c:177
+#: src/compose.c:566 src/mainwindow.c:602 src/messageview.c:177
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/查看(_V)/字符编码(_E)/波罗的语 (ISO-8859-_4)"
 
-#: src/compose.c:572 src/mainwindow.c:615 src/messageview.c:180
+#: src/compose.c:570 src/mainwindow.c:606 src/messageview.c:180
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/查看(_V)/字符编码(_E)/希腊语 (ISO-8859-_7)"
 
-#: src/compose.c:576 src/mainwindow.c:619 src/messageview.c:183
+#: src/compose.c:574 src/mainwindow.c:610 src/messageview.c:183
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/查看(_V)/字符编码(_E)/希腊语 (ISO-8859-_7)"
 
-#: src/compose.c:578 src/mainwindow.c:621 src/messageview.c:185
+#: src/compose.c:576 src/mainwindow.c:612 src/messageview.c:185
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/查看(_V)/字符编码(_E)/斯拉夫语 (Windows-1251)"
 
-#: src/compose.c:582 src/mainwindow.c:625 src/messageview.c:188
+#: src/compose.c:580 src/mainwindow.c:616 src/messageview.c:188
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/查看(_V)/字符编码(_E)/土耳其语 (ISO-8859-_9)"
 
-#: src/compose.c:586 src/mainwindow.c:629 src/messageview.c:191
+#: src/compose.c:584 src/mainwindow.c:620 src/messageview.c:191
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/查看(_V)/字符编码(_E)/斯拉夫语 (ISO-8859-_5)"
 
-#: src/compose.c:588 src/mainwindow.c:631 src/messageview.c:193
+#: src/compose.c:586 src/mainwindow.c:622 src/messageview.c:193
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/查看(_V)/字符编码(_E)/斯拉夫语 (KOI8-_R)"
 
-#: src/compose.c:590 src/mainwindow.c:633 src/messageview.c:195
+#: src/compose.c:588 src/mainwindow.c:624 src/messageview.c:195
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/查看(_V)/字符编码(_E)/斯拉夫语 (KOI8-U)"
 
-#: src/compose.c:592 src/mainwindow.c:635 src/messageview.c:197
+#: src/compose.c:590 src/mainwindow.c:626 src/messageview.c:197
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/查看(_V)/字符编码(_E)/斯拉夫语 (Windows-1251)"
 
-#: src/compose.c:596 src/mainwindow.c:639 src/messageview.c:200
+#: src/compose.c:594 src/mainwindow.c:630 src/messageview.c:200
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/查看(_V)/字符编码(_E)/日语 (ISO-2022-_JP)"
 
-#: src/compose.c:600 src/mainwindow.c:649 src/messageview.c:209
+#: src/compose.c:598 src/mainwindow.c:640 src/messageview.c:209
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/查看(_V)/字符编码(_E)/简体中文 (_GB2312)"
 
-#: src/compose.c:602 src/mainwindow.c:651 src/messageview.c:211
+#: src/compose.c:600 src/mainwindow.c:642 src/messageview.c:211
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/查看(_V)/字符编码(_E)/简体中文 (_GB2312)"
 
-#: src/compose.c:604 src/mainwindow.c:653 src/messageview.c:213
+#: src/compose.c:602 src/mainwindow.c:644 src/messageview.c:213
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/查看(_V)/字符编码(_E)/繁体中文 (_Big5)"
 
-#: src/compose.c:606 src/mainwindow.c:655 src/messageview.c:215
+#: src/compose.c:604 src/mainwindow.c:646 src/messageview.c:215
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/查看(_V)/字符编码(_E)/繁体中文 (EUC-_TW)"
 
-#: src/compose.c:610 src/mainwindow.c:661 src/messageview.c:220
+#: src/compose.c:608 src/mainwindow.c:652 src/messageview.c:220
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/查看(_V)/字符编码(_E)/朝鲜语 (EUC-_KR)"
 
-#: src/compose.c:614 src/mainwindow.c:667 src/messageview.c:225
+#: src/compose.c:612 src/mainwindow.c:658 src/messageview.c:225
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/查看(_V)/字符编码(_E)/泰国语 (TIS-620)"
 
-#: src/compose.c:616 src/mainwindow.c:669 src/messageview.c:227
+#: src/compose.c:614 src/mainwindow.c:660 src/messageview.c:227
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/查看(_V)/字符编码(_E)/泰国语 (Windows-874)"
 
-#: src/compose.c:620 src/mainwindow.c:726 src/messageview.c:257
+#: src/compose.c:618 src/mainwindow.c:717 src/messageview.c:257
 msgid "/_Tools/_Address book"
 msgstr "/工具(_T)/地址簿(_A)"
 
-#: src/compose.c:621
+#: src/compose.c:619
 msgid "/_Tools/_Template"
 msgstr "/工具(_T)/模板(_T)"
 
-#: src/compose.c:622 src/mainwindow.c:749 src/messageview.c:272
+#: src/compose.c:620 src/mainwindow.c:740 src/messageview.c:272
 msgid "/_Tools/Actio_ns"
 msgstr "/工具(_T)/动作(_N)"
 
-#: src/compose.c:623 src/compose.c:627 src/mainwindow.c:729
-#: src/mainwindow.c:743 src/mainwindow.c:748 src/mainwindow.c:750
-#: src/mainwindow.c:753 src/mainwindow.c:755 src/messageview.c:260
+#: src/compose.c:621 src/compose.c:625 src/mainwindow.c:720
+#: src/mainwindow.c:734 src/mainwindow.c:739 src/mainwindow.c:741
+#: src/mainwindow.c:744 src/mainwindow.c:746 src/messageview.c:260
 #: src/messageview.c:271
 msgid "/_Tools/---"
 msgstr "/工具(_T)/---"
 
-#: src/compose.c:624
+#: src/compose.c:622
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/工具(_T)/用外部编辑器编辑(_X)"
 
-#: src/compose.c:628
+#: src/compose.c:626
 msgid "/_Tools/PGP Si_gn"
 msgstr "/工具(_T)/PGP 签名(_G)"
 
-#: src/compose.c:629
+#: src/compose.c:627
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/工具(_T)/PGP 加密(_E)"
 
-#: src/compose.c:855
+#: src/compose.c:853
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s：文件不存在\n"
 
-#: src/compose.c:954 src/compose.c:1024 src/procmsg.c:1353
+#: src/compose.c:952 src/compose.c:1022 src/procmsg.c:1353
 msgid "Can't get text part\n"
 msgstr "无法得到文本分块\n"
 
-#: src/compose.c:1420
+#: src/compose.c:1418
 msgid "Quote mark format error."
 msgstr "引文标记格式错误。"
 
-#: src/compose.c:1432
+#: src/compose.c:1430
 msgid "Message reply/forward format error."
 msgstr "邮件回复/转发格式错误。"
 
-#: src/compose.c:1801
+#: src/compose.c:1799
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "文件 %s 不存在\n"
 
-#: src/compose.c:1805
+#: src/compose.c:1803
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "无法获得文件 %s 的大小\n"
 
-#: src/compose.c:1809
+#: src/compose.c:1807
 #, c-format
 msgid "File %s is empty."
 msgstr "文件 %s 是空的。"
 
-#: src/compose.c:1813
+#: src/compose.c:1811
 #, c-format
 msgid "Can't read %s."
 msgstr "无法读取 %s。"
 
-#: src/compose.c:1848
+#: src/compose.c:1846
 #, c-format
 msgid "Message: %s"
 msgstr "邮件：%s"
 
-#: src/compose.c:1920 src/mimeview.c:560
+#: src/compose.c:1918 src/mimeview.c:560
 msgid "Can't get the part of multipart message."
 msgstr "无法获得分块邮件的分块。"
 
-#: src/compose.c:2362
+#: src/compose.c:2360
 msgid " [Edited]"
 msgstr " [已编辑]"
 
-#: src/compose.c:2364
+#: src/compose.c:2362
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - 撰写邮件%s"
 
-#: src/compose.c:2367
+#: src/compose.c:2365
 #, c-format
 msgid "Compose message%s"
 msgstr "撰写邮件%s"
 
-#: src/compose.c:2478
+#: src/compose.c:2476
 msgid "Recipient is not specified."
 msgstr "没有指定收件人。"
 
-#: src/compose.c:2486
+#: src/compose.c:2484
 #, fuzzy
 msgid "Empty subject"
 msgstr "主题"
 
-#: src/compose.c:2487
+#: src/compose.c:2485
 msgid "Subject is empty. Send it anyway?"
 msgstr "主题是空的。还要发送吗？"
 
-#: src/compose.c:2538
+#: src/compose.c:2536
 msgid "can't get recipient list."
 msgstr "无法获得收件人列表。"
 
-#: src/compose.c:2558
+#: src/compose.c:2556
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -987,26 +987,26 @@ msgstr ""
 "没有指定发送邮件要用的帐号。\n"
 "请在发送前选择一个邮件帐号。"
 
-#: src/compose.c:2572 src/send_message.c:297
+#: src/compose.c:2570 src/send_message.c:297
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "发送邮件到 %s 时发生错误。"
 
-#: src/compose.c:2595
+#: src/compose.c:2593
 msgid "Can't save the message to outbox."
 msgstr "无法将该邮件保存到发件箱。"
 
-#: src/compose.c:2645
+#: src/compose.c:2643
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "无法找到和当前选中的密钥标识“%s”相联系的钥匙。"
 
-#: src/compose.c:2709 src/compose.c:2965 src/compose.c:3028 src/compose.c:3148
-#: src/utils.c:2365
+#: src/compose.c:2707 src/compose.c:2963 src/compose.c:3026 src/compose.c:3146
+#: src/utils.c:2379
 msgid "can't change file mode\n"
 msgstr "无法改变文件属性\n"
 
-#: src/compose.c:2741
+#: src/compose.c:2739
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1016,12 +1016,12 @@ msgstr ""
 "无法将邮件的字符编码从 %s 转换到 %s。\n"
 "仍然用 %s 发送吗？"
 
-#: src/compose.c:2747
+#: src/compose.c:2745
 #, fuzzy
 msgid "Code conversion error"
 msgstr "地址簿转换错误"
 
-#: src/compose.c:2816
+#: src/compose.c:2814
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1030,155 +1030,155 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:2820
+#: src/compose.c:2818
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3108
+#: src/compose.c:3106
 msgid "can't remove the old message\n"
 msgstr "无法删除旧邮件\n"
 
-#: src/compose.c:3126
+#: src/compose.c:3124
 msgid "queueing message...\n"
 msgstr "正在排队邮件...\n"
 
-#: src/compose.c:3208
+#: src/compose.c:3206
 msgid "can't find queue folder\n"
 msgstr "无法找到队列文件夹：%s\n"
 
-#: src/compose.c:3215
+#: src/compose.c:3213
 msgid "can't queue the message\n"
 msgstr "无法排队该邮件\n"
 
-#: src/compose.c:3792
+#: src/compose.c:3790
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "生成邮件标识号：%s\n"
 
-#: src/compose.c:3901
+#: src/compose.c:3899
 msgid "Creating compose window...\n"
 msgstr "正在创建撰写窗口...\n"
 
-#: src/compose.c:3949 src/headerview.c:54 src/summary_search.c:214
+#: src/compose.c:3947 src/headerview.c:54 src/summary_search.c:214
 msgid "From:"
 msgstr "发件人："
 
-#: src/compose.c:4021
+#: src/compose.c:4019
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/工具(_T)/PGP 签名(_G)"
 
-#: src/compose.c:4024
+#: src/compose.c:4022
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/工具(_T)/PGP 加密(_E)"
 
-#: src/compose.c:4062 src/compose.c:5001
+#: src/compose.c:4060 src/compose.c:4995
 msgid "MIME type"
 msgstr "MIME 类型"
 
 #. S_COL_DATE
-#: src/compose.c:4071 src/mimeview.c:192 src/prefs_filter_edit.c:585
+#: src/compose.c:4069 src/mimeview.c:192 src/prefs_filter_edit.c:585
 #: src/prefs_summary_column.c:75 src/select-keys.c:317 src/summaryview.c:4217
 msgid "Size"
 msgstr "大小"
 
-#: src/compose.c:4449 src/mainwindow.c:2224 src/prefs_account.c:719
+#: src/compose.c:4442 src/mainwindow.c:2207 src/prefs_account.c:719
 #: src/prefs_common.c:947
 msgid "Send"
 msgstr "发送"
 
-#: src/compose.c:4450
+#: src/compose.c:4443
 msgid "Send message"
 msgstr "立即发送邮件"
 
-#: src/compose.c:4458
+#: src/compose.c:4451
 msgid "Send later"
 msgstr "以后发送"
 
-#: src/compose.c:4459
+#: src/compose.c:4452
 msgid "Put into queue folder and send later"
 msgstr "放入队列文件夹，在以后发送"
 
-#: src/compose.c:4467
+#: src/compose.c:4460
 msgid "Draft"
 msgstr "草稿"
 
-#: src/compose.c:4468
+#: src/compose.c:4461
 msgid "Save to draft folder"
 msgstr "保存到草稿文件夹"
 
-#: src/compose.c:4478
+#: src/compose.c:4471
 msgid "Insert"
 msgstr "插入"
 
-#: src/compose.c:4479
+#: src/compose.c:4472
 msgid "Insert file"
 msgstr "插入文件内容"
 
-#: src/compose.c:4487
+#: src/compose.c:4480
 msgid "Attach"
 msgstr "附件"
 
-#: src/compose.c:4488
+#: src/compose.c:4481
 msgid "Attach file"
 msgstr "加入附件"
 
 #. signature
-#: src/compose.c:4498 src/prefs_account.c:1391 src/prefs_common.c:1356
+#: src/compose.c:4491 src/prefs_account.c:1391 src/prefs_common.c:1356
 msgid "Signature"
 msgstr "签名"
 
-#: src/compose.c:4499
+#: src/compose.c:4492
 msgid "Insert signature"
 msgstr "插入签名"
 
-#: src/compose.c:4508 src/prefs_common.c:1378 src/prefs_common.c:2382
+#: src/compose.c:4501 src/prefs_common.c:1378 src/prefs_common.c:2382
 msgid "Editor"
 msgstr "编辑器"
 
-#: src/compose.c:4509
+#: src/compose.c:4502
 msgid "Edit with external editor"
 msgstr "使用外部编辑器编辑"
 
-#: src/compose.c:4517
+#: src/compose.c:4510
 msgid "Linewrap"
 msgstr "换行"
 
-#: src/compose.c:4518
+#: src/compose.c:4511
 msgid "Wrap all long lines"
 msgstr "长行换行"
 
-#: src/compose.c:4897
+#: src/compose.c:4891
 msgid "Invalid MIME type."
 msgstr "无效的MIME类型。"
 
-#: src/compose.c:4915
+#: src/compose.c:4909
 msgid "File doesn't exist or is empty."
 msgstr "文件不存在或为空。"
 
-#: src/compose.c:4983
+#: src/compose.c:4977
 msgid "Properties"
 msgstr "属性"
 
-#: src/compose.c:5003
+#: src/compose.c:4997
 msgid "Encoding"
 msgstr "编码方式"
 
-#: src/compose.c:5026 src/prefs_folder_item.c:183
+#: src/compose.c:5020 src/prefs_folder_item.c:183
 msgid "Path"
 msgstr "路径"
 
-#: src/compose.c:5027
+#: src/compose.c:5021
 msgid "File name"
 msgstr "文件名"
 
-#: src/compose.c:5185
+#: src/compose.c:5179
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "外部编辑器命令行无效：“%s”\n"
 
-#: src/compose.c:5211
+#: src/compose.c:5205
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1189,74 +1189,74 @@ msgstr ""
 "强制结束程序？\n"
 "程序组标识号：%d"
 
-#: src/compose.c:5228
+#: src/compose.c:5222
 #, c-format
 msgid "Terminated process group id: %d"
 msgstr "已结束程序组标识号：%d"
 
-#: src/compose.c:5229
+#: src/compose.c:5223
 #, c-format
 msgid "Temporary file: %s"
 msgstr "临时文件：%s"
 
-#: src/compose.c:5253
+#: src/compose.c:5247
 msgid "Compose: input from monitoring process\n"
 msgstr "撰写：从监听进程中输入\n"
 
 #. failed
-#: src/compose.c:5284
+#: src/compose.c:5278
 msgid "Couldn't exec external editor\n"
 msgstr "无法执行外部编辑器\n"
 
-#: src/compose.c:5288
+#: src/compose.c:5282
 msgid "Couldn't write to file\n"
 msgstr "无法写入文件\n"
 
-#: src/compose.c:5290
+#: src/compose.c:5284
 msgid "Pipe read failed\n"
 msgstr "管道读取失败\n"
 
-#: src/compose.c:5596 src/compose.c:5604 src/compose.c:5610
+#: src/compose.c:5590 src/compose.c:5598 src/compose.c:5604
 msgid "Can't queue the message."
 msgstr "无法将该邮件排队。"
 
-#: src/compose.c:5701
+#: src/compose.c:5695
 msgid "Select files"
 msgstr "选择文件"
 
-#: src/compose.c:5723
+#: src/compose.c:5717
 msgid "Select file"
 msgstr "选择文件"
 
-#: src/compose.c:5760
+#: src/compose.c:5754
 #, fuzzy
 msgid "Save message"
 msgstr "立即发送邮件"
 
-#: src/compose.c:5761
+#: src/compose.c:5755
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "该邮件已修改。丢弃它？"
 
-#: src/compose.c:5763
+#: src/compose.c:5757
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:5805
+#: src/compose.c:5799
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "您要使用模板“%s”吗？"
 
-#: src/compose.c:5807
+#: src/compose.c:5801
 msgid "Apply template"
 msgstr "使用模板"
 
-#: src/compose.c:5808
+#: src/compose.c:5802
 #, fuzzy
 msgid "_Replace"
 msgstr "替换"
 
-#: src/compose.c:5808
+#: src/compose.c:5802
 #, fuzzy
 msgid "_Insert"
 msgstr "插入"
@@ -1701,12 +1701,12 @@ msgstr "正在设置文件夹信息...\n"
 msgid "Setting folder info..."
 msgstr "正在设置文件夹信息..."
 
-#: src/folderview.c:805 src/mainwindow.c:3301 src/setup.c:81
+#: src/folderview.c:805 src/mainwindow.c:3272 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "正在扫描文件夹 %s%c%s ..."
 
-#: src/folderview.c:809 src/mainwindow.c:3306 src/setup.c:86
+#: src/folderview.c:809 src/mainwindow.c:3277 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "正在扫描文件夹 %s ..."
@@ -2027,44 +2027,44 @@ msgstr "IMAP4 验证失败。\n"
 msgid "IMAP4 login failed.\n"
 msgstr "IMAP4 登录失败。\n"
 
-#: src/imap.c:3522
+#: src/imap.c:3528
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "无法把 %s 添加到 %s\n"
 
-#: src/imap.c:3529
+#: src/imap.c:3535
 msgid "(sending file...)"
 msgstr "(正在发送文件...)"
 
-#: src/imap.c:3557
+#: src/imap.c:3563
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "无法追加邮件到 %s\n"
 
-#: src/imap.c:3589
+#: src/imap.c:3595
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "无法将 %s 复制到 %s\n"
 
-#: src/imap.c:3613
+#: src/imap.c:3619
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "执行IMAP命令时发生错误：STORE %s %s\n"
 
-#: src/imap.c:3627
+#: src/imap.c:3633
 msgid "error while imap command: EXPUNGE\n"
 msgstr "执行IMAP命令时发生错误：EXPUNGE\n"
 
-#: src/imap.c:3640
+#: src/imap.c:3646
 msgid "error while imap command: CLOSE\n"
 msgstr "执行IMAP命令时发生错误：CLOSE\n"
 
-#: src/imap.c:3873
+#: src/imap.c:3879
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv 无法转换 UTF-7 到 %s\n"
 
-#: src/imap.c:3903
+#: src/imap.c:3909
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv 无法转换 %s 到 UTF-7\n"
@@ -2166,7 +2166,7 @@ msgstr "导入 LDIF 文件到地址簿"
 msgid "Prev"
 msgstr "上一个"
 
-#: src/importldif.c:768 src/mainwindow.c:2321
+#: src/importldif.c:768 src/mainwindow.c:2303
 msgid "Next"
 msgstr "下一个"
 
@@ -2509,621 +2509,621 @@ msgstr ""
 "发现以前版本的配置。\n"
 "您要迁移吗？"
 
-#: src/mainwindow.c:471
+#: src/mainwindow.c:462
 msgid "/_File/_Folder"
 msgstr "/文件(_F)/文件夹(_F)"
 
-#: src/mainwindow.c:472
+#: src/mainwindow.c:463
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/文件(_F)/文件夹(_F)/新建文件夹(_N)..."
 
-#: src/mainwindow.c:474
+#: src/mainwindow.c:465
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/文件(_F)/文件夹(_F)/重命名文件夹(_R)..."
 
-#: src/mainwindow.c:475
+#: src/mainwindow.c:466
 #, fuzzy
 msgid "/_File/_Folder/_Move folder..."
 msgstr "/文件(_F)/文件夹(_F)/重命名文件夹(_R)..."
 
-#: src/mainwindow.c:476
+#: src/mainwindow.c:467
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/文件(_F)/文件夹(_F)/删除文件夹(_D)"
 
-#: src/mainwindow.c:477
+#: src/mainwindow.c:468
 msgid "/_File/_Mailbox"
 msgstr "/文件(_F)/邮箱(_M)"
 
-#: src/mainwindow.c:478
+#: src/mainwindow.c:469
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/文件(_F)/邮箱(_M)/添加邮箱(_M)..."
 
-#: src/mainwindow.c:479
+#: src/mainwindow.c:470
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/文件(_F)/邮箱(_M)/删除邮箱(_R)..."
 
-#: src/mainwindow.c:480 src/mainwindow.c:485
+#: src/mainwindow.c:471 src/mainwindow.c:476
 msgid "/_File/_Mailbox/---"
 msgstr "/文件(_F)/邮箱(_M)/---"
 
-#: src/mainwindow.c:481
+#: src/mainwindow.c:472
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "/文件(_F)/邮箱(_M)/检查新邮件(_C)"
 
-#: src/mainwindow.c:483
+#: src/mainwindow.c:474
 msgid "/_File/_Mailbox/Check for new messages in _all mailboxes"
 msgstr "/文件(_F)/邮箱(_M)/检查所有邮箱的新邮件(_A)"
 
-#: src/mainwindow.c:486
+#: src/mainwindow.c:477
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "/文件(_F)/邮箱(_M)/重建文件夹树(_E)"
 
-#: src/mainwindow.c:489
+#: src/mainwindow.c:480
 msgid "/_File/_Import mbox file..."
 msgstr "/文件(_F)/导入mbox文件(_I)..."
 
-#: src/mainwindow.c:490
+#: src/mainwindow.c:481
 msgid "/_File/_Export to mbox file..."
 msgstr "/文件(_F)/导出到mbox文件(_E)..."
 
-#: src/mainwindow.c:492
+#: src/mainwindow.c:483
 msgid "/_File/Empty all _trash"
 msgstr "/文件(_F)/清空废件箱(_T)"
 
-#: src/mainwindow.c:494 src/messageview.c:138
+#: src/mainwindow.c:485 src/messageview.c:138
 msgid "/_File/_Save as..."
 msgstr "/文件(_F)/另存为(_S)..."
 
-#: src/mainwindow.c:495 src/messageview.c:139
+#: src/mainwindow.c:486 src/messageview.c:139
 msgid "/_File/_Print..."
 msgstr "/文件(_F)/打印(_P)..."
 
-#: src/mainwindow.c:497
+#: src/mainwindow.c:488
 msgid "/_File/_Work offline"
 msgstr "/文件(_F)/离线工作(_W)"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:500
+#: src/mainwindow.c:491
 msgid "/_File/E_xit"
 msgstr "/文件(_F)/退出(_X)"
 
-#: src/mainwindow.c:505
+#: src/mainwindow.c:496
 msgid "/_Edit/Select _thread"
 msgstr "/编辑(_E)/选择线索(_T)"
 
-#: src/mainwindow.c:507 src/messageview.c:147
+#: src/mainwindow.c:498 src/messageview.c:147
 msgid "/_Edit/_Find in current message..."
 msgstr "/编辑(_E)/在当前邮件中查找(_F)..."
 
-#: src/mainwindow.c:509
+#: src/mainwindow.c:500
 msgid "/_Edit/_Search messages..."
 msgstr "/编辑(_E)/查找邮件(_S)..."
 
-#: src/mainwindow.c:512
+#: src/mainwindow.c:503
 msgid "/_View/Show or hi_de"
 msgstr "/查看(_V)/显示或隐藏(_D)"
 
-#: src/mainwindow.c:513
+#: src/mainwindow.c:504
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/查看(_V)/显示或隐藏(_D)/文件夹树(_F)"
 
-#: src/mainwindow.c:515
+#: src/mainwindow.c:506
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/查看(_V)/显示或隐藏(_D)/邮件视图(_M)"
 
-#: src/mainwindow.c:517
+#: src/mainwindow.c:508
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/查看(_V)/显示或隐藏(_D)/工具栏(_T)"
 
-#: src/mainwindow.c:519
+#: src/mainwindow.c:510
 msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/查看(_V)/显示或隐藏(_D)/工具栏(_T)/图标和文字(_A)"
 
-#: src/mainwindow.c:521
+#: src/mainwindow.c:512
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/查看(_V)/显示或隐藏(_D)/工具栏(_T)/图标(_I)"
 
-#: src/mainwindow.c:523
+#: src/mainwindow.c:514
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/查看(_V)/显示或隐藏(_D)/工具栏(_T)/文字(_T)"
 
-#: src/mainwindow.c:525
+#: src/mainwindow.c:516
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/查看(_V)/显示或隐藏(_D)/工具栏(_T)/无(_N)"
 
-#: src/mainwindow.c:527
+#: src/mainwindow.c:518
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/查看(_V)/显示或隐藏(_D)/状态栏(_B)"
 
-#: src/mainwindow.c:530
+#: src/mainwindow.c:521
 msgid "/_View/Separate f_older tree"
 msgstr "/查看(_V)/分离文件夹树窗口(_O)"
 
-#: src/mainwindow.c:531
+#: src/mainwindow.c:522
 msgid "/_View/Separate _message view"
 msgstr "/查看(_V)/分离邮件视图窗口(_M)"
 
-#: src/mainwindow.c:533
+#: src/mainwindow.c:524
 msgid "/_View/_Sort"
 msgstr "/查看/排序(_S)"
 
-#: src/mainwindow.c:534
+#: src/mainwindow.c:525
 msgid "/_View/_Sort/by _number"
 msgstr "/查看(_V)/排序(_S)/按序号(_N)"
 
-#: src/mainwindow.c:535
+#: src/mainwindow.c:526
 msgid "/_View/_Sort/by s_ize"
 msgstr "/查看(_V)/排序(_S)/按大小(_I)"
 
-#: src/mainwindow.c:536
+#: src/mainwindow.c:527
 msgid "/_View/_Sort/by _date"
 msgstr "/查看(_V)/排序(_S)/按日期(_D)"
 
-#: src/mainwindow.c:537
+#: src/mainwindow.c:528
 msgid "/_View/_Sort/by _from"
 msgstr "/查看(_V)/排序(_S)/按发件人(_F)"
 
-#: src/mainwindow.c:538
+#: src/mainwindow.c:529
 msgid "/_View/_Sort/by _recipient"
 msgstr "/查看(_V)/排序(_S)/按收件人(_R)"
 
-#: src/mainwindow.c:539
+#: src/mainwindow.c:530
 msgid "/_View/_Sort/by _subject"
 msgstr "/查看(_V)/排序(_S)/按主题(_S)"
 
-#: src/mainwindow.c:540
+#: src/mainwindow.c:531
 msgid "/_View/_Sort/by _color label"
 msgstr "/查看(_V)/排序(_S)/按颜色标注(_C)"
 
-#: src/mainwindow.c:542
+#: src/mainwindow.c:533
 msgid "/_View/_Sort/by _mark"
 msgstr "/查看(_V)/排序(_S)/按标记(_M)"
 
-#: src/mainwindow.c:543
+#: src/mainwindow.c:534
 msgid "/_View/_Sort/by _unread"
 msgstr "/查看(_V)/排序(_S)/按未读(_U)"
 
-#: src/mainwindow.c:544
+#: src/mainwindow.c:535
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/查看(_V)/排序(_S)/按附件(_T)"
 
-#: src/mainwindow.c:546
+#: src/mainwindow.c:537
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/查看(_V)/排序(_S)/不排序(_O)"
 
-#: src/mainwindow.c:547 src/mainwindow.c:550
+#: src/mainwindow.c:538 src/mainwindow.c:541
 msgid "/_View/_Sort/---"
 msgstr "/查看(_V)/排序(_S)/---"
 
-#: src/mainwindow.c:548
+#: src/mainwindow.c:539
 msgid "/_View/_Sort/Ascending"
 msgstr "/查看(_V)/排序(_S)/升序"
 
-#: src/mainwindow.c:549
+#: src/mainwindow.c:540
 msgid "/_View/_Sort/Descending"
 msgstr "/查看(_V)/排序(_S)/降序"
 
-#: src/mainwindow.c:551
+#: src/mainwindow.c:542
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/查看(_V)/排序(_S)/按主题集中(_A)"
 
-#: src/mainwindow.c:553
+#: src/mainwindow.c:544
 msgid "/_View/Th_read view"
 msgstr "/查看(_V)/按线索查看(_R)"
 
-#: src/mainwindow.c:554
+#: src/mainwindow.c:545
 msgid "/_View/E_xpand all threads"
 msgstr "/查看(_V)/展开所有线索(_X)"
 
-#: src/mainwindow.c:555
+#: src/mainwindow.c:546
 msgid "/_View/Co_llapse all threads"
 msgstr "/查看(_V)/收缩所有线索(_L)"
 
-#: src/mainwindow.c:556
+#: src/mainwindow.c:547
 msgid "/_View/Set display _item..."
 msgstr "/查看(_V)/设置显示项(_I)..."
 
-#: src/mainwindow.c:559
+#: src/mainwindow.c:550
 msgid "/_View/_Go to"
 msgstr "/查看(_V)/转到(_G)"
 
-#: src/mainwindow.c:560
+#: src/mainwindow.c:551
 msgid "/_View/_Go to/_Prev message"
 msgstr "/查看(_V)/转到(_G)/上一个邮件(_P)"
 
-#: src/mainwindow.c:561
+#: src/mainwindow.c:552
 msgid "/_View/_Go to/_Next message"
 msgstr "/查看(_V)/转到(_G)/下一个邮件(_N)"
 
-#: src/mainwindow.c:562 src/mainwindow.c:567 src/mainwindow.c:570
-#: src/mainwindow.c:575 src/mainwindow.c:580
+#: src/mainwindow.c:553 src/mainwindow.c:558 src/mainwindow.c:561
+#: src/mainwindow.c:566 src/mainwindow.c:571
 msgid "/_View/_Go to/---"
 msgstr "/查看(_V)/转到(_G)/---"
 
-#: src/mainwindow.c:563
+#: src/mainwindow.c:554
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/查看(_V)/转到(_G)/上一个未读邮件(_R)"
 
-#: src/mainwindow.c:565
+#: src/mainwindow.c:556
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/查看(_V)/转到(_G)/下一个未读邮件(_E)"
 
-#: src/mainwindow.c:568
+#: src/mainwindow.c:559
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/查看(_V)/转到(_G)/上一个新邮件(_W)"
 
-#: src/mainwindow.c:569
+#: src/mainwindow.c:560
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/查看(_V)/转到(_G)/下一个新邮件(_X)"
 
-#: src/mainwindow.c:571
+#: src/mainwindow.c:562
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/查看(_V)/转到(_G)/上一个标记的邮件(_M)"
 
-#: src/mainwindow.c:573
+#: src/mainwindow.c:564
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/查看(_V)/转到(_G)/下一个标记的邮件(_A)"
 
-#: src/mainwindow.c:576
+#: src/mainwindow.c:567
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/查看(_V)/转到(_G)/上一个用颜色标注的邮件(_L)"
 
-#: src/mainwindow.c:578
+#: src/mainwindow.c:569
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/查看(_V)/转到(_G)/下一个用颜色标注的邮件(_B)"
 
-#: src/mainwindow.c:581
+#: src/mainwindow.c:572
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/查看(_V)/转到(_G)/其它文件夹(_F)..."
 
-#: src/mainwindow.c:590 src/messageview.c:158
+#: src/mainwindow.c:581 src/messageview.c:158
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/查看(_V)/字符编码(_E)/自动检测(_A)"
 
-#: src/mainwindow.c:641 src/messageview.c:202
+#: src/mainwindow.c:632 src/messageview.c:202
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/查看(_V)/字符编码(_E)/日语 (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:643 src/messageview.c:204
+#: src/mainwindow.c:634 src/messageview.c:204
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/查看(_V)/字符编码(_E)/日语 (_EUC-JP)"
 
-#: src/mainwindow.c:645 src/messageview.c:206
+#: src/mainwindow.c:636 src/messageview.c:206
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/查看(_V)/字符编码(_E)/日语 (_Shift__JIS)"
 
-#: src/mainwindow.c:657 src/messageview.c:217
+#: src/mainwindow.c:648 src/messageview.c:217
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/查看(_V)/字符编码(_E)/中文 (ISO-2022-_CN)"
 
-#: src/mainwindow.c:663 src/messageview.c:222
+#: src/mainwindow.c:654 src/messageview.c:222
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/查看(_V)/字符编码(_E)/朝鲜语 (ISO-2022-KR)"
 
-#: src/mainwindow.c:676 src/summaryview.c:401
+#: src/mainwindow.c:667 src/summaryview.c:401
 msgid "/_View/Open in new _window"
 msgstr "/查看(_V)/在新窗口中打开(_W)"
 
-#: src/mainwindow.c:677 src/messageview.c:234
+#: src/mainwindow.c:668 src/messageview.c:234
 msgid "/_View/Mess_age source"
 msgstr "/查看(_V)/邮件源文件(_A)"
 
-#: src/mainwindow.c:678 src/messageview.c:235
+#: src/mainwindow.c:669 src/messageview.c:235
 msgid "/_View/Show all _header"
 msgstr "/查看(_V)/显示所有邮件头(_H)"
 
-#: src/mainwindow.c:680
+#: src/mainwindow.c:671
 msgid "/_View/_Update summary"
 msgstr "/查看(_V)/更新摘要(_U)"
 
-#: src/mainwindow.c:682 src/messageview.c:237
+#: src/mainwindow.c:673 src/messageview.c:237
 msgid "/_Message"
 msgstr "/邮件(_M)"
 
-#: src/mainwindow.c:683
+#: src/mainwindow.c:674
 msgid "/_Message/Recei_ve"
 msgstr "/邮件(_M)/接收(_V)"
 
-#: src/mainwindow.c:684
+#: src/mainwindow.c:675
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/邮件(_M)/接收(_V)/当前帐号(_C)"
 
-#: src/mainwindow.c:686
+#: src/mainwindow.c:677
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/邮件(_M)/接收(_V)/所有帐号(_A)"
 
-#: src/mainwindow.c:688
+#: src/mainwindow.c:679
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/邮件(_M)/接收(_V)/取消(_G)"
 
-#: src/mainwindow.c:690
+#: src/mainwindow.c:681
 msgid "/_Message/Recei_ve/---"
 msgstr "/邮件(_M)/接收(_V)/---"
 
-#: src/mainwindow.c:691
+#: src/mainwindow.c:682
 msgid "/_Message/_Send queued messages"
 msgstr "/邮件(_M)/发送队列中的邮件(_S)"
 
-#: src/mainwindow.c:692 src/mainwindow.c:694 src/mainwindow.c:701
-#: src/mainwindow.c:706 src/mainwindow.c:710 src/mainwindow.c:719
-#: src/mainwindow.c:722 src/messageview.c:240 src/messageview.c:248
+#: src/mainwindow.c:683 src/mainwindow.c:685 src/mainwindow.c:692
+#: src/mainwindow.c:697 src/mainwindow.c:701 src/mainwindow.c:710
+#: src/mainwindow.c:713 src/messageview.c:240 src/messageview.c:248
 #: src/messageview.c:253
 msgid "/_Message/---"
 msgstr "/邮件(_M)/---"
 
-#: src/mainwindow.c:693 src/messageview.c:238
+#: src/mainwindow.c:684 src/messageview.c:238
 msgid "/_Message/Compose _new message"
 msgstr "/邮件(_M)/撰写新邮件(_N)"
 
-#: src/mainwindow.c:695 src/messageview.c:241
+#: src/mainwindow.c:686 src/messageview.c:241
 msgid "/_Message/_Reply"
 msgstr "/邮件(_M)/回复(_R)"
 
-#: src/mainwindow.c:696
+#: src/mainwindow.c:687
 msgid "/_Message/Repl_y to"
 msgstr "/邮件(_M)/回复到(_Y)"
 
-#: src/mainwindow.c:697 src/messageview.c:242
+#: src/mainwindow.c:688 src/messageview.c:242
 msgid "/_Message/Repl_y to/_all"
 msgstr "/邮件(_M)/回复到(_Y)/所有人(_AL)"
 
-#: src/mainwindow.c:698 src/messageview.c:244
+#: src/mainwindow.c:689 src/messageview.c:244
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/邮件(_M)/回复到(_Y)/发件人(_S)"
 
-#: src/mainwindow.c:699 src/messageview.c:246
+#: src/mainwindow.c:690 src/messageview.c:246
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/邮件(_M)/回复到(_Y)/邮件列表(_L)"
 
-#: src/mainwindow.c:702 src/messageview.c:249
+#: src/mainwindow.c:693 src/messageview.c:249
 msgid "/_Message/_Forward"
 msgstr "/邮件(_M)/转发(_F)"
 
-#: src/mainwindow.c:703 src/messageview.c:250
+#: src/mainwindow.c:694 src/messageview.c:250
 msgid "/_Message/For_ward as attachment"
 msgstr "/邮件(_M)/作为附件转发(_W)"
 
-#: src/mainwindow.c:705 src/messageview.c:252
+#: src/mainwindow.c:696 src/messageview.c:252
 msgid "/_Message/Redirec_t"
 msgstr "/邮件(_M)/重定向(_T)"
 
-#: src/mainwindow.c:707
+#: src/mainwindow.c:698
 msgid "/_Message/M_ove..."
 msgstr "/邮件(_M)/移动(_O)..."
 
-#: src/mainwindow.c:708
+#: src/mainwindow.c:699
 msgid "/_Message/_Copy..."
 msgstr "/邮件(_M)/复制(_C)..."
 
-#: src/mainwindow.c:709
+#: src/mainwindow.c:700
 msgid "/_Message/_Delete"
 msgstr "/邮件(_M)/删除(_D)"
 
-#: src/mainwindow.c:711
+#: src/mainwindow.c:702
 msgid "/_Message/_Mark"
 msgstr "/邮件(_M)/标记(_M)"
 
-#: src/mainwindow.c:712
+#: src/mainwindow.c:703
 msgid "/_Message/_Mark/_Mark"
 msgstr "/邮件(_M)/标记(_M)/标记(_M)"
 
-#: src/mainwindow.c:713
+#: src/mainwindow.c:704
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/邮件(_M)/标记(_M)/取消标记(_U)"
 
-#: src/mainwindow.c:714
+#: src/mainwindow.c:705
 msgid "/_Message/_Mark/---"
 msgstr "/邮件(_M)/标记(_M)/---"
 
-#: src/mainwindow.c:715
+#: src/mainwindow.c:706
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/邮件(_M)/标记(_M)/标记为未读(_E)"
 
-#: src/mainwindow.c:716
+#: src/mainwindow.c:707
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/邮件(_M)/标记(_M)/标记为已读(_D)"
 
-#: src/mainwindow.c:718
+#: src/mainwindow.c:709
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/邮件(_M)/标记(_M)/全部标记为已读(_R)"
 
-#: src/mainwindow.c:720
+#: src/mainwindow.c:711
 #, fuzzy
 msgid "/_Message/Set as _junk mail"
 msgstr "/邮件(_M)/接收新邮件(_i)"
 
-#: src/mainwindow.c:721
+#: src/mainwindow.c:712
 #, fuzzy
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/邮件(_M)/接收新邮件(_i)"
 
-#: src/mainwindow.c:723 src/messageview.c:254
+#: src/mainwindow.c:714 src/messageview.c:254
 msgid "/_Message/Re-_edit"
 msgstr "/邮件(_M)/重新编辑(_E)"
 
-#: src/mainwindow.c:727
+#: src/mainwindow.c:718
 #, fuzzy
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/工具(_T)/将发件人添加到地址簿中(_K)"
 
-#: src/mainwindow.c:730
+#: src/mainwindow.c:721
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/工具(_T)/过滤文件夹中所有的邮件(_F)"
 
-#: src/mainwindow.c:732
+#: src/mainwindow.c:723
 msgid "/_Tools/Filter _selected messages"
 msgstr "/工具(_T)/过滤选中的邮件(_S)"
 
-#: src/mainwindow.c:734 src/messageview.c:261
+#: src/mainwindow.c:725 src/messageview.c:261
 msgid "/_Tools/_Create filter rule"
 msgstr "/工具(_T)/创建过滤规则(_C)"
 
-#: src/mainwindow.c:735 src/messageview.c:263
+#: src/mainwindow.c:726 src/messageview.c:263
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/工具(_T)/创建过滤规则(_C)/自动(_A)"
 
-#: src/mainwindow.c:737 src/messageview.c:265
+#: src/mainwindow.c:728 src/messageview.c:265
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/工具(_T)/创建过滤规则(_C)/按发件人(_F)"
 
-#: src/mainwindow.c:739 src/messageview.c:267
+#: src/mainwindow.c:730 src/messageview.c:267
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/工具(_T)/创建过滤规则(_C)/按收件人(_T)"
 
-#: src/mainwindow.c:741 src/messageview.c:269
+#: src/mainwindow.c:732 src/messageview.c:269
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/工具(_T)/创建过滤规则(_C)/按主题(_S)"
 
-#: src/mainwindow.c:744
+#: src/mainwindow.c:735
 #, fuzzy
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/工具(_T)/过滤文件夹中所有的邮件(_F)"
 
-#: src/mainwindow.c:746
+#: src/mainwindow.c:737
 #, fuzzy
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/工具(_T)/过滤选中的邮件(_S)"
 
-#: src/mainwindow.c:751
+#: src/mainwindow.c:742
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/工具(_T)/删除重复的邮件(_P)"
 
-#: src/mainwindow.c:754
+#: src/mainwindow.c:745
 msgid "/_Tools/E_xecute"
 msgstr "/工具(_T)/执行(_X)"
 
-#: src/mainwindow.c:756
+#: src/mainwindow.c:747
 msgid "/_Tools/_Log window"
 msgstr "/工具(_T)/记录窗口(_L)"
 
-#: src/mainwindow.c:758
+#: src/mainwindow.c:749
 msgid "/_Configuration"
 msgstr "/配置(_C)"
 
-#: src/mainwindow.c:759
+#: src/mainwindow.c:750
 msgid "/_Configuration/_Common preferences..."
 msgstr "/配置(_C)/通用首选项(_C)..."
 
-#: src/mainwindow.c:761
+#: src/mainwindow.c:752
 msgid "/_Configuration/_Filter setting..."
 msgstr "/配置(_C)/过滤设置(_F)..."
 
-#: src/mainwindow.c:763
+#: src/mainwindow.c:754
 msgid "/_Configuration/_Template..."
 msgstr "/配置(_C)/模板(_T)..."
 
-#: src/mainwindow.c:764
+#: src/mainwindow.c:755
 msgid "/_Configuration/_Actions..."
 msgstr "/配置(_C)/动作(_A)..."
 
-#: src/mainwindow.c:765
+#: src/mainwindow.c:756
 msgid "/_Configuration/---"
 msgstr "/配置(_C)/---"
 
-#: src/mainwindow.c:766
+#: src/mainwindow.c:757
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/配置(_C)/当前帐号首选项(_P)..."
 
-#: src/mainwindow.c:768
+#: src/mainwindow.c:759
 msgid "/_Configuration/Create _new account..."
 msgstr "/配置(_C)/创建新帐号(_N)..."
 
-#: src/mainwindow.c:770
+#: src/mainwindow.c:761
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/配置(_C)/编辑帐号(_E)..."
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:763
 msgid "/_Configuration/C_hange current account"
 msgstr "/配置(_C)/改变当前帐号(_H)"
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:767
 msgid "/_Help/_Manual"
 msgstr "/帮助(_H)/手册(_M)"
 
-#: src/mainwindow.c:777
+#: src/mainwindow.c:768
 msgid "/_Help/_Manual/_English"
 msgstr "/帮助(_H)/手册(_M)/英语(_E)"
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:769
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/帮助(_H)/手册(_M)/日语(_J)"
 
-#: src/mainwindow.c:779
+#: src/mainwindow.c:770
 msgid "/_Help/_FAQ"
 msgstr "/帮助(_H)/常见问题(_F)"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:771
 msgid "/_Help/_FAQ/_English"
 msgstr "/帮助(_H)/常见问题(_F)/英语(_E)"
 
-#: src/mainwindow.c:781
+#: src/mainwindow.c:772
 msgid "/_Help/_FAQ/_German"
 msgstr "/帮助(_H)/常见问题(_F)/德语(_G)"
 
-#: src/mainwindow.c:782
+#: src/mainwindow.c:773
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/帮助(_H)/常见问题(_F)/西班牙语(_S)"
 
-#: src/mainwindow.c:783
+#: src/mainwindow.c:774
 msgid "/_Help/_FAQ/_French"
 msgstr "/帮助(_H)/常见问题(_F)/法语(_F)"
 
-#: src/mainwindow.c:784
+#: src/mainwindow.c:775
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/帮助(_H)/常见问题(_F)/意大利语(_I)"
 
-#: src/mainwindow.c:785
+#: src/mainwindow.c:776
 msgid "/_Help/---"
 msgstr "/帮助(_H)/---"
 
-#: src/mainwindow.c:825
+#: src/mainwindow.c:816
 msgid "Creating main window...\n"
 msgstr "正在创建主窗口...\n"
 
-#: src/mainwindow.c:987
+#: src/mainwindow.c:973
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "主窗口：分配颜色 %d 失败\n"
 
-#: src/mainwindow.c:1071 src/summaryview.c:2020 src/summaryview.c:2105
+#: src/mainwindow.c:1057 src/summaryview.c:2020 src/summaryview.c:2105
 #: src/summaryview.c:3342 src/summaryview.c:3415 src/summaryview.c:3728
 msgid "done.\n"
 msgstr "完成。\n"
 
-#: src/mainwindow.c:1196 src/mainwindow.c:1237 src/mainwindow.c:1265
+#: src/mainwindow.c:1182 src/mainwindow.c:1223 src/mainwindow.c:1251
 msgid "Untitled"
 msgstr "无标题"
 
-#: src/mainwindow.c:1266
+#: src/mainwindow.c:1252
 msgid "none"
 msgstr "无"
 
-#: src/mainwindow.c:1316
+#: src/mainwindow.c:1302
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "正在把窗口分隔方式从 %d 改到 %d\n"
 
-#: src/mainwindow.c:1536
+#: src/mainwindow.c:1522
 msgid "Offline"
 msgstr "离线"
 
-#: src/mainwindow.c:1537
+#: src/mainwindow.c:1523
 msgid "You are offline. Go online?"
 msgstr "您处于离线状态。切换到在线状态吗？"
 
-#: src/mainwindow.c:1551
+#: src/mainwindow.c:1537
 msgid "Empty all trash"
 msgstr "清空所有废件箱"
 
-#: src/mainwindow.c:1552
+#: src/mainwindow.c:1538
 msgid "Empty messages in all trash?"
 msgstr "清空所有废件箱里的信件？"
 
-#: src/mainwindow.c:1580
+#: src/mainwindow.c:1566
 msgid "Add mailbox"
 msgstr "添加邮箱"
 
-#: src/mainwindow.c:1581
+#: src/mainwindow.c:1567
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3132,16 +3132,16 @@ msgstr ""
 "输入邮箱位置。\n"
 "如果指定了已存在的邮箱，它将被自动扫描。"
 
-#: src/mainwindow.c:1587
+#: src/mainwindow.c:1573
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "邮箱“%s”已经存在。"
 
-#: src/mainwindow.c:1592 src/setup.c:57
+#: src/mainwindow.c:1578 src/setup.c:57
 msgid "Mailbox"
 msgstr "邮箱"
 
-#: src/mainwindow.c:1598 src/setup.c:63
+#: src/mainwindow.c:1584 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3150,150 +3150,150 @@ msgstr ""
 "创建邮件箱失败。\n"
 "也许某些文件已经存在，或者您没有写权限。"
 
-#: src/mainwindow.c:1989
+#: src/mainwindow.c:1975
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed－文件夹视图"
 
-#: src/mainwindow.c:2009 src/messageview.c:368
+#: src/mainwindow.c:1995 src/messageview.c:368
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed－邮件视图"
 
-#: src/mainwindow.c:2156 src/summaryview.c:370
+#: src/mainwindow.c:2142 src/summaryview.c:370
 msgid "/_Reply"
 msgstr "/回复(_R)"
 
-#: src/mainwindow.c:2157
+#: src/mainwindow.c:2143
 msgid "/Reply to _all"
 msgstr "/回复到所有人(_A)"
 
-#: src/mainwindow.c:2158
+#: src/mainwindow.c:2144
 msgid "/Reply to _sender"
 msgstr "/回复到发件人(_S)"
 
-#: src/mainwindow.c:2159
+#: src/mainwindow.c:2145
 msgid "/Reply to mailing _list"
 msgstr "/回复到邮件列表(_L)"
 
-#: src/mainwindow.c:2164 src/summaryview.c:377
+#: src/mainwindow.c:2150 src/summaryview.c:377
 msgid "/_Forward"
 msgstr "/转发(_F)"
 
-#: src/mainwindow.c:2165 src/summaryview.c:378
+#: src/mainwindow.c:2151 src/summaryview.c:378
 msgid "/For_ward as attachment"
 msgstr "/作为附件转发(_W)"
 
-#: src/mainwindow.c:2166 src/summaryview.c:379
+#: src/mainwindow.c:2152 src/summaryview.c:379
 msgid "/Redirec_t"
 msgstr "/重定向(_T)"
 
-#: src/mainwindow.c:2205
+#: src/mainwindow.c:2188
 msgid "Get"
 msgstr "接收"
 
-#: src/mainwindow.c:2206
+#: src/mainwindow.c:2189
 msgid "Incorporate new mail"
 msgstr "合并新邮件"
 
-#: src/mainwindow.c:2213
+#: src/mainwindow.c:2196
 msgid "Get all"
 msgstr "全部接收"
 
-#: src/mainwindow.c:2214
+#: src/mainwindow.c:2197
 msgid "Incorporate new mail of all accounts"
 msgstr "合并所有帐号的新邮件"
 
-#: src/mainwindow.c:2225
+#: src/mainwindow.c:2208
 msgid "Send queued message(s)"
 msgstr "发送队列中的邮件"
 
-#: src/mainwindow.c:2235 src/prefs_account.c:721 src/prefs_common.c:949
+#: src/mainwindow.c:2218 src/prefs_account.c:721 src/prefs_common.c:949
 #: src/prefs_folder_item.c:137
 msgid "Compose"
 msgstr "撰写"
 
-#: src/mainwindow.c:2236
+#: src/mainwindow.c:2219
 msgid "Compose new message"
 msgstr "撰写新邮件"
 
-#: src/mainwindow.c:2244 src/prefs_common.c:1448
+#: src/mainwindow.c:2227 src/prefs_common.c:1448
 msgid "Reply"
 msgstr "回复"
 
-#: src/mainwindow.c:2245 src/mainwindow.c:2258
+#: src/mainwindow.c:2228 src/mainwindow.c:2241
 msgid "Reply to the message"
 msgstr "回复该邮件"
 
-#: src/mainwindow.c:2263
+#: src/mainwindow.c:2245
 msgid "Reply all"
 msgstr "全部回复"
 
-#: src/mainwindow.c:2264
+#: src/mainwindow.c:2246
 msgid "Reply to all"
 msgstr "回复给所有人"
 
-#: src/mainwindow.c:2272 src/prefs_filter_edit.c:741
+#: src/mainwindow.c:2254 src/prefs_filter_edit.c:741
 msgid "Forward"
 msgstr "转发"
 
-#: src/mainwindow.c:2273 src/mainwindow.c:2286
+#: src/mainwindow.c:2255 src/mainwindow.c:2268
 msgid "Forward the message"
 msgstr "转发该邮件"
 
-#: src/mainwindow.c:2293
+#: src/mainwindow.c:2275
 msgid "Delete the message"
 msgstr "删除该邮件"
 
-#: src/mainwindow.c:2301 src/prefs_common.c:1988
+#: src/mainwindow.c:2283 src/prefs_common.c:1988
 msgid "Junk"
 msgstr ""
 
-#: src/mainwindow.c:2302
+#: src/mainwindow.c:2284
 #, fuzzy
 msgid "Set as junk mail"
 msgstr "设置为默认帐号"
 
-#: src/mainwindow.c:2311
+#: src/mainwindow.c:2293
 msgid "Execute"
 msgstr "执行"
 
-#: src/mainwindow.c:2312
+#: src/mainwindow.c:2294
 msgid "Execute marked process"
 msgstr "执行标记的处理"
 
-#: src/mainwindow.c:2322
+#: src/mainwindow.c:2304
 msgid "Next unread message"
 msgstr "下一个未读的邮件"
 
-#: src/mainwindow.c:2334
+#: src/mainwindow.c:2316
 msgid "Prefs"
 msgstr "首选项"
 
-#: src/mainwindow.c:2335
+#: src/mainwindow.c:2317
 msgid "Common preferences"
 msgstr "通用首选项"
 
-#: src/mainwindow.c:2343 src/prefs_folder_item.c:261
+#: src/mainwindow.c:2325 src/prefs_folder_item.c:261
 #: src/prefs_folder_item.c:272 src/progressdialog.c:128
 msgid "Account"
 msgstr "帐号"
 
-#: src/mainwindow.c:2344
+#: src/mainwindow.c:2326
 msgid "Account setting"
 msgstr "帐号设置"
 
-#: src/mainwindow.c:2527
+#: src/mainwindow.c:2498
 msgid "You are offline. Click the icon to go online."
 msgstr "您处于离线状态。单击图标切换到在线状态。"
 
-#: src/mainwindow.c:2538
+#: src/mainwindow.c:2509
 msgid "You are online. Click the icon to go offline."
 msgstr "您处于在线状态。单击图标切换到离线状态。"
 
-#: src/mainwindow.c:2731
+#: src/mainwindow.c:2702
 msgid "Exit"
 msgstr "退出"
 
-#: src/mainwindow.c:2731
+#: src/mainwindow.c:2702
 msgid "Exit this program?"
 msgstr "要退出本程序吗？"
 
@@ -5488,11 +5488,11 @@ msgstr "正在创建进度对话框...\n"
 msgid "Status"
 msgstr "状态"
 
-#: src/recv.c:113
+#: src/recv.c:112
 msgid "error occurred while retrieving data.\n"
 msgstr "下载数据时发生错误。\n"
 
-#: src/recv.c:155 src/recv.c:197 src/recv.c:213
+#: src/recv.c:154 src/recv.c:196 src/recv.c:211
 msgid "Can't write to file.\n"
 msgstr "无法写入文件。\n"
 
@@ -6229,7 +6229,7 @@ msgstr "%.2fMB"
 msgid "%.2fGB"
 msgstr "%.2fGB"
 
-#: src/utils.c:2372 src/utils.c:2496
+#: src/utils.c:2386 src/utils.c:2510
 #, c-format
 msgid "writing to %s failed.\n"
 msgstr "写入 %s 时失败。\n"
diff --git a/po/zh_TW.Big5.po b/po/zh_TW.Big5.po
index 8049c8a6..66ee6b00 100644
--- a/po/zh_TW.Big5.po
+++ b/po/zh_TW.Big5.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-08-09 18:08+0900\n"
+"POT-Creation-Date: 2005-08-22 17:22+0900\n"
 "PO-Revision-Date: 2004-12-04 08:24+0800\n"
 "Last-Translator: Frank J. J. Weng <franklin@goodhorse.idv.tw>\n"
 "Language-Team: zh-l10n <zh-l10n@linux.org.tw>\n"
@@ -82,7 +82,7 @@ msgstr ""
 "來決定是否在「全部檢查」時要檢查該帳號的郵件。"
 
 #: src/account.c:691 src/addressadd.c:192 src/addressbook.c:490
-#: src/compose.c:4081 src/editaddress.c:200 src/editaddress.c:942
+#: src/compose.c:4079 src/editaddress.c:200 src/editaddress.c:942
 #: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:265
 #: src/editjpilot.c:271 src/editldap.c:307 src/editvcard.c:184
 #: src/mimeview.c:201 src/prefs_filter.c:258 src/prefs_folder_item.c:170
@@ -220,7 +220,7 @@ msgstr "使用者設定之命令參數"
 msgid "Add Address to Book"
 msgstr "將位址加入位址簿"
 
-#: src/addressadd.c:202 src/compose.c:4528 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4521 src/editaddress.c:201
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "位址"
@@ -234,7 +234,7 @@ msgstr "備註"
 msgid "Select Address Book Folder"
 msgstr "選擇位址簿資料夾"
 
-#: src/addressbook.c:336 src/compose.c:495 src/mainwindow.c:470
+#: src/addressbook.c:336 src/compose.c:493 src/mainwindow.c:461
 #: src/messageview.c:137
 msgid "/_File"
 msgstr "/檔案(_F)"
@@ -255,10 +255,10 @@ msgstr "/檔案(_F)/新增J-Pilot(_J)"
 msgid "/_File/New _Server"
 msgstr "/檔案(_F)/新增伺服器(_S)"
 
-#: src/addressbook.c:345 src/addressbook.c:348 src/compose.c:500
-#: src/compose.c:505 src/compose.c:509 src/mainwindow.c:488
-#: src/mainwindow.c:491 src/mainwindow.c:493 src/mainwindow.c:496
-#: src/mainwindow.c:498 src/messageview.c:140
+#: src/addressbook.c:345 src/addressbook.c:348 src/compose.c:498
+#: src/compose.c:503 src/compose.c:507 src/mainwindow.c:479
+#: src/mainwindow.c:482 src/mainwindow.c:484 src/mainwindow.c:487
+#: src/mainwindow.c:489 src/messageview.c:140
 msgid "/_File/---"
 msgstr "/檔案(_F)/---"
 
@@ -274,7 +274,7 @@ msgstr "/檔案(_F)/刪除(_D)"
 msgid "/_File/_Save"
 msgstr "/檔案(_F)/儲存(_S)"
 
-#: src/addressbook.c:350 src/compose.c:510 src/messageview.c:141
+#: src/addressbook.c:350 src/compose.c:508 src/messageview.c:141
 msgid "/_File/_Close"
 msgstr "/檔案(_F)/關閉(_C)"
 
@@ -306,7 +306,7 @@ msgstr "/位址(_A)/編輯(_E)"
 msgid "/_Address/_Delete"
 msgstr "/位址(_A)/刪除(_D)"
 
-#: src/addressbook.c:358 src/compose.c:619 src/mainwindow.c:725
+#: src/addressbook.c:358 src/compose.c:617 src/mainwindow.c:716
 #: src/messageview.c:256
 msgid "/_Tools"
 msgstr "/工具(_T)"
@@ -315,12 +315,12 @@ msgstr "/工具(_T)"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/工具(_T)/匯入 LDIF 檔(_L)"
 
-#: src/addressbook.c:360 src/compose.c:632 src/mainwindow.c:775
+#: src/addressbook.c:360 src/compose.c:630 src/mainwindow.c:766
 #: src/messageview.c:274
 msgid "/_Help"
 msgstr "/說明(_H)"
 
-#: src/addressbook.c:361 src/compose.c:633 src/mainwindow.c:786
+#: src/addressbook.c:361 src/compose.c:631 src/mainwindow.c:777
 #: src/messageview.c:275
 msgid "/_Help/_About"
 msgstr "/說明(_H)/關於(_A)"
@@ -337,7 +337,7 @@ msgstr "/新增群組(_G)"
 msgid "/New _Folder"
 msgstr "/新增資料夾(_F)"
 
-#: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:489
+#: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:487
 #: src/folderview.c:235 src/folderview.c:237 src/folderview.c:241
 #: src/folderview.c:252 src/folderview.c:254 src/folderview.c:256
 #: src/folderview.c:260 src/folderview.c:270 src/folderview.c:272
@@ -347,8 +347,8 @@ msgstr "/新增資料夾(_F)"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:512
-#: src/mainwindow.c:502 src/messageview.c:143
+#: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:510
+#: src/mainwindow.c:493 src/messageview.c:143
 msgid "/_Edit"
 msgstr "/編輯(_E)"
 
@@ -360,7 +360,7 @@ msgstr "/刪除(_D)"
 msgid "E-Mail address"
 msgstr "E-Mail位址"
 
-#: src/addressbook.c:495 src/compose.c:4529 src/prefs_common.c:2402
+#: src/addressbook.c:495 src/compose.c:4522 src/prefs_common.c:2402
 msgid "Address book"
 msgstr "位址簿"
 
@@ -369,8 +369,8 @@ msgid "Name:"
 msgstr "姓名："
 
 #. Buttons
-#: src/addressbook.c:627 src/addressbook.c:1673 src/editaddress.c:884
-#: src/editaddress.c:1017 src/mainwindow.c:2292 src/prefs_actions.c:266
+#: src/addressbook.c:627 src/addressbook.c:1674 src/editaddress.c:884
+#: src/editaddress.c:1017 src/mainwindow.c:2274 src/prefs_actions.c:266
 #: src/prefs_display_header.c:278 src/prefs_display_header.c:333
 #: src/prefs_template.c:231
 msgid "Delete"
@@ -409,7 +409,7 @@ msgstr "刪除位址紀錄"
 msgid "Really delete the address(es)?"
 msgstr "您確定要刪除這些紀錄嗎？"
 
-#: src/addressbook.c:1664
+#: src/addressbook.c:1665
 #, fuzzy, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -418,40 +418,40 @@ msgstr ""
 "您確定要刪除「%s」資料夾以及裡面所有的位址嗎？\n"
 "如果您選擇只刪除資料夾，裡面的位址紀錄將移到上一層資料夾中。"
 
-#: src/addressbook.c:1667 src/folderview.c:2139
+#: src/addressbook.c:1668 src/folderview.c:2139
 msgid "Delete folder"
 msgstr "刪除資料夾"
 
-#: src/addressbook.c:1667
+#: src/addressbook.c:1668
 #, fuzzy
 msgid "_Folder only"
 msgstr "只刪除資料夾"
 
-#: src/addressbook.c:1667
+#: src/addressbook.c:1668
 #, fuzzy
 msgid "Folder and _addresses"
 msgstr "全部刪除"
 
-#: src/addressbook.c:1672
+#: src/addressbook.c:1673
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "您確定要刪除 `%s' ? "
 
-#: src/addressbook.c:2352 src/addressbook.c:2485
+#: src/addressbook.c:2353 src/addressbook.c:2486
 msgid "New user, could not save index file."
 msgstr "無法儲存索引檔案。"
 
-#: src/addressbook.c:2356 src/addressbook.c:2489
+#: src/addressbook.c:2357 src/addressbook.c:2490
 msgid "New user, could not save address book files."
 msgstr "無法儲存位址簿檔案。"
 
-#: src/addressbook.c:2366 src/addressbook.c:2499
+#: src/addressbook.c:2367 src/addressbook.c:2500
 msgid "Old address book converted successfully."
 msgstr ""
 "轉換舊位址簿格式完成。\n"
 "您可以開始使用新的位址簿。"
 
-#: src/addressbook.c:2371
+#: src/addressbook.c:2372
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -459,7 +459,7 @@ msgstr ""
 "舊位址簿格式已轉換，\n"
 "但無法儲存新的索引檔。"
 
-#: src/addressbook.c:2384
+#: src/addressbook.c:2385
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -467,7 +467,7 @@ msgstr ""
 "無法轉換位址簿格式，\n"
 "但已產生空的新位址簿。"
 
-#: src/addressbook.c:2390
+#: src/addressbook.c:2391
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -475,7 +475,7 @@ msgstr ""
 "無法轉換位址簿格式，\n"
 "亦無法產生新的位址簿。"
 
-#: src/addressbook.c:2395
+#: src/addressbook.c:2396
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -483,83 +483,83 @@ msgstr ""
 "無法轉換位址簿格式，\n"
 "亦無法產生新的位址簿。"
 
-#: src/addressbook.c:2402
+#: src/addressbook.c:2403
 msgid "Addressbook conversion error"
 msgstr "轉換位址簿格式時發生錯誤"
 
-#: src/addressbook.c:2406
+#: src/addressbook.c:2407
 msgid "Addressbook conversion"
 msgstr "位址簿格式轉換"
 
-#: src/addressbook.c:2441
+#: src/addressbook.c:2442
 msgid "Addressbook Error"
 msgstr "位址簿發生錯誤"
 
-#: src/addressbook.c:2442 src/addressbook.c:2542
+#: src/addressbook.c:2443 src/addressbook.c:2543
 msgid "Could not read address index"
 msgstr "無法讀取位址簿索引"
 
-#: src/addressbook.c:2504
+#: src/addressbook.c:2505
 msgid "Old address book converted, could not save new address index file"
 msgstr "舊位址簿格式已轉換，但無法儲存新的索引檔。"
 
-#: src/addressbook.c:2518
+#: src/addressbook.c:2519
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr "無法轉換位址簿格式，但已產生空的新位址簿。"
 
-#: src/addressbook.c:2524
+#: src/addressbook.c:2525
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr "無法轉換位址簿格式，亦無法產生新的位址簿。"
 
-#: src/addressbook.c:2530
+#: src/addressbook.c:2531
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr "無法轉換位址簿格式，亦無法產生新的位址簿。"
 
-#: src/addressbook.c:2548
+#: src/addressbook.c:2549
 msgid "Addressbook Conversion Error"
 msgstr "轉換位址簿格式時發生錯誤"
 
-#: src/addressbook.c:2554
+#: src/addressbook.c:2555
 msgid "Addressbook Conversion"
 msgstr "位址簿格式轉換"
 
-#: src/addressbook.c:3055 src/prefs_common.c:963
+#: src/addressbook.c:3056 src/prefs_common.c:963
 msgid "Interface"
 msgstr "介面"
 
-#: src/addressbook.c:3071 src/importldif.c:514
+#: src/addressbook.c:3072 src/importldif.c:514
 msgid "Address Book"
 msgstr "位址簿"
 
-#: src/addressbook.c:3087
+#: src/addressbook.c:3088
 msgid "Person"
 msgstr "人名"
 
-#: src/addressbook.c:3103
+#: src/addressbook.c:3104
 msgid "EMail Address"
 msgstr "電子郵件信箱"
 
-#: src/addressbook.c:3119
+#: src/addressbook.c:3120
 msgid "Group"
 msgstr "群組"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3135 src/folderview.c:346 src/prefs_account.c:1866
+#: src/addressbook.c:3136 src/folderview.c:346 src/prefs_account.c:1866
 msgid "Folder"
 msgstr "資料夾"
 
-#: src/addressbook.c:3151
+#: src/addressbook.c:3152
 msgid "vCard"
 msgstr ""
 
-#: src/addressbook.c:3167 src/addressbook.c:3183
+#: src/addressbook.c:3168 src/addressbook.c:3184
 msgid "JPilot"
 msgstr ""
 
-#: src/addressbook.c:3199
+#: src/addressbook.c:3200
 msgid "LDAP Server"
 msgstr "LDAP 伺服器"
 
@@ -571,7 +571,7 @@ msgstr "共用位址紀錄"
 msgid "Personal address"
 msgstr "私人位址紀錄"
 
-#: src/alertpanel.c:138 src/compose.c:5214 src/main.c:515
+#: src/alertpanel.c:138 src/compose.c:5208 src/main.c:515
 msgid "Notice"
 msgstr "注意"
 
@@ -626,373 +626,373 @@ msgstr "棕色"
 msgid "None"
 msgstr "無"
 
-#: src/compose.c:487
+#: src/compose.c:485
 msgid "/_Add..."
 msgstr "/新增...(_A)"
 
-#: src/compose.c:488
+#: src/compose.c:486
 msgid "/_Remove"
 msgstr "/刪除(_R)"
 
-#: src/compose.c:490 src/folderview.c:243 src/folderview.c:262
+#: src/compose.c:488 src/folderview.c:243 src/folderview.c:262
 #: src/folderview.c:277
 msgid "/_Properties..."
 msgstr "/內容...(_P)"
 
-#: src/compose.c:496
+#: src/compose.c:494
 msgid "/_File/_Send"
 msgstr "/檔案(_F)/傳送(_S)"
 
-#: src/compose.c:498
+#: src/compose.c:496
 msgid "/_File/Send _later"
 msgstr "/信件(_M)/待會傳送(_l)"
 
-#: src/compose.c:501
+#: src/compose.c:499
 msgid "/_File/Save to _draft folder"
 msgstr "/信件(_M)/儲存至草稿資料夾(_d)"
 
-#: src/compose.c:503
+#: src/compose.c:501
 msgid "/_File/Save and _keep editing"
 msgstr "/信件(_M)/儲存並繼續編輯(_k)"
 
-#: src/compose.c:506
+#: src/compose.c:504
 msgid "/_File/_Attach file"
 msgstr "/檔案(_F)/附加檔案(_A)"
 
-#: src/compose.c:507
+#: src/compose.c:505
 msgid "/_File/_Insert file"
 msgstr "/檔案(_F)/插入檔案(_I)"
 
-#: src/compose.c:508
+#: src/compose.c:506
 msgid "/_File/Insert si_gnature"
 msgstr "/檔案(_F)/插入簽名(_g)"
 
-#: src/compose.c:513
+#: src/compose.c:511
 msgid "/_Edit/_Undo"
 msgstr "/編輯(_E)/復原(_U)"
 
-#: src/compose.c:514
+#: src/compose.c:512
 msgid "/_Edit/_Redo"
 msgstr "/編輯(_E)/重複前一個動作(_R)"
 
-#: src/compose.c:515 src/compose.c:522 src/mainwindow.c:506
+#: src/compose.c:513 src/compose.c:520 src/mainwindow.c:497
 #: src/messageview.c:146
 msgid "/_Edit/---"
 msgstr "/編輯(_E)/---"
 
-#: src/compose.c:516
+#: src/compose.c:514
 msgid "/_Edit/Cu_t"
 msgstr "/編輯(_E)/剪下(_t)"
 
-#: src/compose.c:517 src/mainwindow.c:503 src/messageview.c:144
+#: src/compose.c:515 src/mainwindow.c:494 src/messageview.c:144
 msgid "/_Edit/_Copy"
 msgstr "/編輯(_E)/複製(_C)"
 
-#: src/compose.c:518
+#: src/compose.c:516
 msgid "/_Edit/_Paste"
 msgstr "/編輯(_E)/貼上(_P)"
 
-#: src/compose.c:519
+#: src/compose.c:517
 msgid "/_Edit/Paste as _quotation"
 msgstr "/編輯(_E)/貼進引言(_q)"
 
-#: src/compose.c:521 src/mainwindow.c:504 src/messageview.c:145
+#: src/compose.c:519 src/mainwindow.c:495 src/messageview.c:145
 msgid "/_Edit/Select _all"
 msgstr "/編輯(_E)/全選(_a)"
 
-#: src/compose.c:523
+#: src/compose.c:521
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/編輯(_E)/將目前段落折行(_W)"
 
-#: src/compose.c:525
+#: src/compose.c:523
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/編輯(_E)/將所有過長的行折行(_l)"
 
-#: src/compose.c:527
+#: src/compose.c:525
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/編輯(_E)/自動換行(_o)"
 
-#: src/compose.c:528 src/mainwindow.c:511 src/messageview.c:150
+#: src/compose.c:526 src/mainwindow.c:502 src/messageview.c:150
 #: src/summaryview.c:400
 msgid "/_View"
 msgstr "/顯示(_V)"
 
-#: src/compose.c:529
+#: src/compose.c:527
 msgid "/_View/_To"
 msgstr "/顯示(_V)/收件人(_T)"
 
-#: src/compose.c:530
+#: src/compose.c:528
 msgid "/_View/_Cc"
 msgstr "/顯示(_V)/副本(_C)"
 
-#: src/compose.c:531
+#: src/compose.c:529
 msgid "/_View/_Bcc"
 msgstr "/顯示(_V)/密件副本(_s)"
 
-#: src/compose.c:532
+#: src/compose.c:530
 msgid "/_View/_Reply to"
 msgstr "/顯示(_V)/回覆(_R)"
 
-#: src/compose.c:533 src/compose.c:535 src/compose.c:537 src/compose.c:539
-#: src/mainwindow.c:529 src/mainwindow.c:532 src/mainwindow.c:558
-#: src/mainwindow.c:582 src/mainwindow.c:675 src/mainwindow.c:679
+#: src/compose.c:531 src/compose.c:533 src/compose.c:535 src/compose.c:537
+#: src/mainwindow.c:520 src/mainwindow.c:523 src/mainwindow.c:549
+#: src/mainwindow.c:573 src/mainwindow.c:666 src/mainwindow.c:670
 #: src/messageview.c:233
 msgid "/_View/---"
 msgstr "/顯示(_V)/---"
 
-#: src/compose.c:534
+#: src/compose.c:532
 msgid "/_View/_Followup to"
 msgstr "/顯示(_V)/回應文章(_F)"
 
-#: src/compose.c:536
+#: src/compose.c:534
 msgid "/_View/R_uler"
 msgstr "/顯示(_V)/尺規(_u)"
 
-#: src/compose.c:538
+#: src/compose.c:536
 msgid "/_View/_Attachment"
 msgstr "/顯示(_V)/附加(_A)"
 
-#: src/compose.c:545 src/mainwindow.c:589 src/messageview.c:157
+#: src/compose.c:543 src/mainwindow.c:580 src/messageview.c:157
 #, fuzzy
 msgid "/_View/Character _encoding"
 msgstr "/顯示(_V)/排序(_S)/遞減排序"
 
-#: src/compose.c:546
+#: src/compose.c:544
 msgid "/_View/Character _encoding/_Automatic"
 msgstr ""
 
-#: src/compose.c:548 src/compose.c:554 src/compose.c:560 src/compose.c:564
-#: src/compose.c:570 src/compose.c:574 src/compose.c:580 src/compose.c:584
-#: src/compose.c:594 src/compose.c:598 src/compose.c:608 src/compose.c:612
-#: src/mainwindow.c:585 src/mainwindow.c:592 src/messageview.c:153
+#: src/compose.c:546 src/compose.c:552 src/compose.c:558 src/compose.c:562
+#: src/compose.c:568 src/compose.c:572 src/compose.c:578 src/compose.c:582
+#: src/compose.c:592 src/compose.c:596 src/compose.c:606 src/compose.c:610
+#: src/mainwindow.c:576 src/mainwindow.c:583 src/messageview.c:153
 #, fuzzy
 msgid "/_View/Character _encoding/---"
 msgstr "/顯示(_V)/排序(_S)/遞減排序"
 
-#: src/compose.c:550 src/mainwindow.c:593 src/messageview.c:161
+#: src/compose.c:548 src/mainwindow.c:584 src/messageview.c:161
 #, fuzzy
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/顯示(_V)/字集(_C)/7位元 ASCII 字集(US-ASC_II)"
 
-#: src/compose.c:552 src/mainwindow.c:595 src/messageview.c:164
+#: src/compose.c:550 src/mainwindow.c:586 src/messageview.c:164
 #, fuzzy
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/顯示(_V)/字集(_C)/Unicode (_UTF-8)"
 
-#: src/compose.c:556 src/mainwindow.c:599 src/messageview.c:167
+#: src/compose.c:554 src/mainwindow.c:590 src/messageview.c:167
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/顯示(_V)/字集(_C)/西歐語系 (ISO-8859-_1)"
 
-#: src/compose.c:558 src/mainwindow.c:601 src/messageview.c:169
+#: src/compose.c:556 src/mainwindow.c:592 src/messageview.c:169
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/顯示(_V)/字集(_C)/西歐語系 (ISO-8859-15)"
 
-#: src/compose.c:562 src/mainwindow.c:605 src/messageview.c:172
+#: src/compose.c:560 src/mainwindow.c:596 src/messageview.c:172
 #, fuzzy
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/顯示(_V)/字集(_C)/中歐語系 (ISO-8859-_2)"
 
-#: src/compose.c:566 src/mainwindow.c:609 src/messageview.c:175
+#: src/compose.c:564 src/mainwindow.c:600 src/messageview.c:175
 #, fuzzy
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/顯示(_V)/字集(_C)/_波羅的海語系 (ISO-8859-13)(_B)"
 
-#: src/compose.c:568 src/mainwindow.c:611 src/messageview.c:177
+#: src/compose.c:566 src/mainwindow.c:602 src/messageview.c:177
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/顯示(_V)/字集(_C)/波羅的海語系 (ISO-8859-_4)"
 
-#: src/compose.c:572 src/mainwindow.c:615 src/messageview.c:180
+#: src/compose.c:570 src/mainwindow.c:606 src/messageview.c:180
 #, fuzzy
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/顯示(_V)/字集(_C)/希臘語 (ISO-8859-_7)"
 
-#: src/compose.c:576 src/mainwindow.c:619 src/messageview.c:183
+#: src/compose.c:574 src/mainwindow.c:610 src/messageview.c:183
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/顯示(_V)/字集(_C)/希臘語 (ISO-8859-_7)"
 
-#: src/compose.c:578 src/mainwindow.c:621 src/messageview.c:185
+#: src/compose.c:576 src/mainwindow.c:612 src/messageview.c:185
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/顯示(_V)/字集(_C)/斯拉夫語 (Windows-1251)"
 
-#: src/compose.c:582 src/mainwindow.c:625 src/messageview.c:188
+#: src/compose.c:580 src/mainwindow.c:616 src/messageview.c:188
 #, fuzzy
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/顯示(_V)/字集(_C)/土耳其語 (ISO-8859-_9)"
 
-#: src/compose.c:586 src/mainwindow.c:629 src/messageview.c:191
+#: src/compose.c:584 src/mainwindow.c:620 src/messageview.c:191
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/顯示(_V)/字集(_C)/斯拉夫語 (ISO-8859-_5)"
 
-#: src/compose.c:588 src/mainwindow.c:631 src/messageview.c:193
+#: src/compose.c:586 src/mainwindow.c:622 src/messageview.c:193
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/顯示(_V)/字集(_C)/斯拉夫語 (KOI8-_R)"
 
-#: src/compose.c:590 src/mainwindow.c:633 src/messageview.c:195
+#: src/compose.c:588 src/mainwindow.c:624 src/messageview.c:195
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/顯示(_V)/字集(_C)/斯拉夫語 (KOI8-U)"
 
-#: src/compose.c:592 src/mainwindow.c:635 src/messageview.c:197
+#: src/compose.c:590 src/mainwindow.c:626 src/messageview.c:197
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/顯示(_V)/字集(_C)/斯拉夫語 (Windows-1251)"
 
-#: src/compose.c:596 src/mainwindow.c:639 src/messageview.c:200
+#: src/compose.c:594 src/mainwindow.c:630 src/messageview.c:200
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/顯示(_V)/字集(_C)/日文 (ISO-2022-_JP)"
 
-#: src/compose.c:600 src/mainwindow.c:649 src/messageview.c:209
+#: src/compose.c:598 src/mainwindow.c:640 src/messageview.c:209
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/顯示(_V)/字集(_C)/簡體中文 (_GB2312)"
 
-#: src/compose.c:602 src/mainwindow.c:651 src/messageview.c:211
+#: src/compose.c:600 src/mainwindow.c:642 src/messageview.c:211
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/顯示(_V)/字集(_C)/簡體中文 (_GB2312)"
 
-#: src/compose.c:604 src/mainwindow.c:653 src/messageview.c:213
+#: src/compose.c:602 src/mainwindow.c:644 src/messageview.c:213
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/顯示(_V)/字集(_C)/繁體中文 (_Big5)"
 
-#: src/compose.c:606 src/mainwindow.c:655 src/messageview.c:215
+#: src/compose.c:604 src/mainwindow.c:646 src/messageview.c:215
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/顯示(_V)/字集(_C)/繁體中文 (EUC-_TW)"
 
-#: src/compose.c:610 src/mainwindow.c:661 src/messageview.c:220
+#: src/compose.c:608 src/mainwindow.c:652 src/messageview.c:220
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/顯示(_V)/字集(_C)/韓文 (EUC-_KR)"
 
-#: src/compose.c:614 src/mainwindow.c:667 src/messageview.c:225
+#: src/compose.c:612 src/mainwindow.c:658 src/messageview.c:225
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/顯示(_V)/字集(_C)/泰文 (TIS-620)"
 
-#: src/compose.c:616 src/mainwindow.c:669 src/messageview.c:227
+#: src/compose.c:614 src/mainwindow.c:660 src/messageview.c:227
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/顯示(_V)/字集(_C)/泰文 (Windows-874)"
 
-#: src/compose.c:620 src/mainwindow.c:726 src/messageview.c:257
+#: src/compose.c:618 src/mainwindow.c:717 src/messageview.c:257
 msgid "/_Tools/_Address book"
 msgstr "/工具(_T)/位址簿(_A)"
 
-#: src/compose.c:621
+#: src/compose.c:619
 msgid "/_Tools/_Template"
 msgstr "/工具(_T)/套用信件樣板(_T)"
 
-#: src/compose.c:622 src/mainwindow.c:749 src/messageview.c:272
+#: src/compose.c:620 src/mainwindow.c:740 src/messageview.c:272
 msgid "/_Tools/Actio_ns"
 msgstr "/工具(_T)/執行外部指令(_n)"
 
-#: src/compose.c:623 src/compose.c:627 src/mainwindow.c:729
-#: src/mainwindow.c:743 src/mainwindow.c:748 src/mainwindow.c:750
-#: src/mainwindow.c:753 src/mainwindow.c:755 src/messageview.c:260
+#: src/compose.c:621 src/compose.c:625 src/mainwindow.c:720
+#: src/mainwindow.c:734 src/mainwindow.c:739 src/mainwindow.c:741
+#: src/mainwindow.c:744 src/mainwindow.c:746 src/messageview.c:260
 #: src/messageview.c:271
 msgid "/_Tools/---"
 msgstr "/工具(_T)"
 
-#: src/compose.c:624
+#: src/compose.c:622
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/工具(_T)/使用其他的編輯器(_x)"
 
-#: src/compose.c:628
+#: src/compose.c:626
 msgid "/_Tools/PGP Si_gn"
 msgstr "/工具(_T)/PGP 簽章(_g)"
 
-#: src/compose.c:629
+#: src/compose.c:627
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/工具(_T)/PGP 加密(_E)"
 
-#: src/compose.c:855
+#: src/compose.c:853
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: 檔案不存在\n"
 
-#: src/compose.c:954 src/compose.c:1024 src/procmsg.c:1353
+#: src/compose.c:952 src/compose.c:1022 src/procmsg.c:1353
 msgid "Can't get text part\n"
 msgstr "沒有文字\n"
 
-#: src/compose.c:1420
+#: src/compose.c:1418
 msgid "Quote mark format error."
 msgstr "引言格式錯誤。"
 
-#: src/compose.c:1432
+#: src/compose.c:1430
 msgid "Message reply/forward format error."
 msgstr "回覆/轉寄信件格式錯誤。"
 
-#: src/compose.c:1801
+#: src/compose.c:1799
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "檔案 %s 不存在 \n"
 
-#: src/compose.c:1805
+#: src/compose.c:1803
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "無法取得檔案 %s 的大小 \n"
 
-#: src/compose.c:1809
+#: src/compose.c:1807
 #, c-format
 msgid "File %s is empty."
 msgstr "檔案 %s 是空的。"
 
-#: src/compose.c:1813
+#: src/compose.c:1811
 #, c-format
 msgid "Can't read %s."
 msgstr "無法讀取 %s。"
 
-#: src/compose.c:1848
+#: src/compose.c:1846
 #, c-format
 msgid "Message: %s"
 msgstr "信件：%s"
 
-#: src/compose.c:1920 src/mimeview.c:560
+#: src/compose.c:1918 src/mimeview.c:560
 msgid "Can't get the part of multipart message."
 msgstr "無法取得這個附加檔。"
 
-#: src/compose.c:2362
+#: src/compose.c:2360
 msgid " [Edited]"
 msgstr " [已修改]"
 
-#: src/compose.c:2364
+#: src/compose.c:2362
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - 新郵件%s"
 
-#: src/compose.c:2367
+#: src/compose.c:2365
 #, c-format
 msgid "Compose message%s"
 msgstr "新郵件%s"
 
-#: src/compose.c:2478
+#: src/compose.c:2476
 msgid "Recipient is not specified."
 msgstr "沒有指定收件人。"
 
-#: src/compose.c:2486
+#: src/compose.c:2484
 #, fuzzy
 msgid "Empty subject"
 msgstr "主題"
 
-#: src/compose.c:2487
+#: src/compose.c:2485
 msgid "Subject is empty. Send it anyway?"
 msgstr "沒有標題。確定要送出？"
 
-#: src/compose.c:2538
+#: src/compose.c:2536
 msgid "can't get recipient list."
 msgstr "無法取得收件人或收件新聞群組名單。"
 
-#: src/compose.c:2558
+#: src/compose.c:2556
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1000,26 +1000,26 @@ msgstr ""
 "您選用的帳號並非一個電子郵件帳號，可能是用來在新聞群組上發表文章用的。\n"
 "要發送郵件請選擇電子郵件帳號。"
 
-#: src/compose.c:2572 src/send_message.c:297
+#: src/compose.c:2570 src/send_message.c:297
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "向 %s 發出文章時出現錯誤。"
 
-#: src/compose.c:2595
+#: src/compose.c:2593
 msgid "Can't save the message to outbox."
 msgstr "無法將信件送至寄件夾中。"
 
-#: src/compose.c:2645
+#: src/compose.c:2643
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "無法找到所指定的 key id '%s'"
 
-#: src/compose.c:2709 src/compose.c:2965 src/compose.c:3028 src/compose.c:3148
-#: src/utils.c:2365
+#: src/compose.c:2707 src/compose.c:2963 src/compose.c:3026 src/compose.c:3146
+#: src/utils.c:2379
 msgid "can't change file mode\n"
 msgstr "無法改變檔案型態 \n"
 
-#: src/compose.c:2741
+#: src/compose.c:2739
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1029,12 +1029,12 @@ msgstr ""
 "無法轉換將信件的編碼設定由 %s 轉換為 %s。\n"
 "仍舊要傳送嗎？"
 
-#: src/compose.c:2747
+#: src/compose.c:2745
 #, fuzzy
 msgid "Code conversion error"
 msgstr "轉換位址簿格式時發生錯誤"
 
-#: src/compose.c:2816
+#: src/compose.c:2814
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1043,155 +1043,155 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:2820
+#: src/compose.c:2818
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3108
+#: src/compose.c:3106
 msgid "can't remove the old message\n"
 msgstr "無法刪除原有的舊信件。\n"
 
-#: src/compose.c:3126
+#: src/compose.c:3124
 msgid "queueing message...\n"
 msgstr "送進暫存資料夾中...\n"
 
-#: src/compose.c:3208
+#: src/compose.c:3206
 msgid "can't find queue folder\n"
 msgstr "找不到暫存資料夾。\n"
 
-#: src/compose.c:3215
+#: src/compose.c:3213
 msgid "can't queue the message\n"
 msgstr "無法放進暫存資料夾。\n"
 
-#: src/compose.c:3792
+#: src/compose.c:3790
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "產生信件的編號：%s\n"
 
-#: src/compose.c:3901
+#: src/compose.c:3899
 msgid "Creating compose window...\n"
 msgstr "產生新郵件...\n"
 
-#: src/compose.c:3949 src/headerview.c:54 src/summary_search.c:214
+#: src/compose.c:3947 src/headerview.c:54 src/summary_search.c:214
 msgid "From:"
 msgstr "來自："
 
-#: src/compose.c:4021
+#: src/compose.c:4019
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/工具(_T)/PGP 簽章(_g)"
 
-#: src/compose.c:4024
+#: src/compose.c:4022
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/工具(_T)/PGP 加密(_E)"
 
-#: src/compose.c:4062 src/compose.c:5001
+#: src/compose.c:4060 src/compose.c:4995
 msgid "MIME type"
 msgstr "MIME 型態"
 
 #. S_COL_DATE
-#: src/compose.c:4071 src/mimeview.c:192 src/prefs_filter_edit.c:585
+#: src/compose.c:4069 src/mimeview.c:192 src/prefs_filter_edit.c:585
 #: src/prefs_summary_column.c:75 src/select-keys.c:317 src/summaryview.c:4217
 msgid "Size"
 msgstr "大小"
 
-#: src/compose.c:4449 src/mainwindow.c:2224 src/prefs_account.c:719
+#: src/compose.c:4442 src/mainwindow.c:2207 src/prefs_account.c:719
 #: src/prefs_common.c:947
 msgid "Send"
 msgstr "送出"
 
-#: src/compose.c:4450
+#: src/compose.c:4443
 msgid "Send message"
 msgstr "送出信件"
 
-#: src/compose.c:4458
+#: src/compose.c:4451
 msgid "Send later"
 msgstr "待會再送出"
 
-#: src/compose.c:4459
+#: src/compose.c:4452
 msgid "Put into queue folder and send later"
 msgstr "放到寄件夾中待會再送出"
 
-#: src/compose.c:4467
+#: src/compose.c:4460
 msgid "Draft"
 msgstr "草稿"
 
-#: src/compose.c:4468
+#: src/compose.c:4461
 msgid "Save to draft folder"
 msgstr "儲存至草稿資料夾"
 
-#: src/compose.c:4478
+#: src/compose.c:4471
 msgid "Insert"
 msgstr "插入"
 
-#: src/compose.c:4479
+#: src/compose.c:4472
 msgid "Insert file"
 msgstr "插入檔案"
 
-#: src/compose.c:4487
+#: src/compose.c:4480
 msgid "Attach"
 msgstr "附加"
 
-#: src/compose.c:4488
+#: src/compose.c:4481
 msgid "Attach file"
 msgstr "附加檔案"
 
 #. signature
-#: src/compose.c:4498 src/prefs_account.c:1391 src/prefs_common.c:1356
+#: src/compose.c:4491 src/prefs_account.c:1391 src/prefs_common.c:1356
 msgid "Signature"
 msgstr "簽名"
 
-#: src/compose.c:4499
+#: src/compose.c:4492
 msgid "Insert signature"
 msgstr "插入簽名"
 
-#: src/compose.c:4508 src/prefs_common.c:1378 src/prefs_common.c:2382
+#: src/compose.c:4501 src/prefs_common.c:1378 src/prefs_common.c:2382
 msgid "Editor"
 msgstr "編輯器"
 
-#: src/compose.c:4509
+#: src/compose.c:4502
 msgid "Edit with external editor"
 msgstr "使用其他的編輯器"
 
-#: src/compose.c:4517
+#: src/compose.c:4510
 msgid "Linewrap"
 msgstr "切割"
 
-#: src/compose.c:4518
+#: src/compose.c:4511
 msgid "Wrap all long lines"
 msgstr "切割所有過長的文字行"
 
-#: src/compose.c:4897
+#: src/compose.c:4891
 msgid "Invalid MIME type."
 msgstr "不合法的 MIME 型態"
 
-#: src/compose.c:4915
+#: src/compose.c:4909
 msgid "File doesn't exist or is empty."
 msgstr "檔案不存在, 或檔案是空的"
 
-#: src/compose.c:4983
+#: src/compose.c:4977
 msgid "Properties"
 msgstr "內容"
 
-#: src/compose.c:5003
+#: src/compose.c:4997
 msgid "Encoding"
 msgstr "編碼"
 
-#: src/compose.c:5026 src/prefs_folder_item.c:183
+#: src/compose.c:5020 src/prefs_folder_item.c:183
 msgid "Path"
 msgstr "路徑"
 
-#: src/compose.c:5027
+#: src/compose.c:5021
 msgid "File name"
 msgstr "檔名"
 
-#: src/compose.c:5185
+#: src/compose.c:5179
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "外用編輯器的命令是錯誤的：`%s'\n"
 
-#: src/compose.c:5211
+#: src/compose.c:5205
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1202,75 +1202,75 @@ msgstr ""
 "要強迫結束該行程嗎？\n"
 "行程的群組代碼是：%d"
 
-#: src/compose.c:5228
+#: src/compose.c:5222
 #, c-format
 msgid "Terminated process group id: %d"
 msgstr "結束群組代碼為 %d 的行程"
 
-#: src/compose.c:5229
+#: src/compose.c:5223
 #, c-format
 msgid "Temporary file: %s"
 msgstr "暫存檔案：%s"
 
-#: src/compose.c:5253
+#: src/compose.c:5247
 msgid "Compose: input from monitoring process\n"
 msgstr ""
 
 #. failed
-#: src/compose.c:5284
+#: src/compose.c:5278
 msgid "Couldn't exec external editor\n"
 msgstr "無法執行外部編輯器。\n"
 
-#: src/compose.c:5288
+#: src/compose.c:5282
 msgid "Couldn't write to file\n"
 msgstr "無法寫入檔案。\n"
 
-#: src/compose.c:5290
+#: src/compose.c:5284
 msgid "Pipe read failed\n"
 msgstr "Pipe 讀取失敗。\n"
 
-#: src/compose.c:5596 src/compose.c:5604 src/compose.c:5610
+#: src/compose.c:5590 src/compose.c:5598 src/compose.c:5604
 msgid "Can't queue the message."
 msgstr "無法放進暫存資料夾。"
 
-#: src/compose.c:5701
+#: src/compose.c:5695
 #, fuzzy
 msgid "Select files"
 msgstr "選擇檔案"
 
-#: src/compose.c:5723
+#: src/compose.c:5717
 msgid "Select file"
 msgstr "選擇檔案"
 
-#: src/compose.c:5760
+#: src/compose.c:5754
 #, fuzzy
 msgid "Save message"
 msgstr "送出信件"
 
-#: src/compose.c:5761
+#: src/compose.c:5755
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "信件已被修改過。要放棄它嗎？"
 
-#: src/compose.c:5763
+#: src/compose.c:5757
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:5805
+#: src/compose.c:5799
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "您確定要套用 '%s' 這個信件樣板嗎？"
 
-#: src/compose.c:5807
+#: src/compose.c:5801
 msgid "Apply template"
 msgstr "套用信件樣板"
 
-#: src/compose.c:5808
+#: src/compose.c:5802
 #, fuzzy
 msgid "_Replace"
 msgstr "置換"
 
-#: src/compose.c:5808
+#: src/compose.c:5802
 #, fuzzy
 msgid "_Insert"
 msgstr "插入"
@@ -1715,12 +1715,12 @@ msgstr "設定資料夾...\n"
 msgid "Setting folder info..."
 msgstr "設定資料夾..."
 
-#: src/folderview.c:805 src/mainwindow.c:3301 src/setup.c:81
+#: src/folderview.c:805 src/mainwindow.c:3272 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "掃描資料夾 %s%c%s ..."
 
-#: src/folderview.c:809 src/mainwindow.c:3306 src/setup.c:86
+#: src/folderview.c:809 src/mainwindow.c:3277 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "掃描資料夾 %s ..."
@@ -2041,44 +2041,44 @@ msgstr "IMAP4 認證失敗\n"
 msgid "IMAP4 login failed.\n"
 msgstr "IMAP4 登入失敗。\n"
 
-#: src/imap.c:3522
+#: src/imap.c:3528
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "無法將信件從 %s 搬移到 %s。\n"
 
-#: src/imap.c:3529
+#: src/imap.c:3535
 msgid "(sending file...)"
 msgstr "（送出檔案 ...）"
 
-#: src/imap.c:3557
+#: src/imap.c:3563
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "無法附加訊息到 %s\n"
 
-#: src/imap.c:3589
+#: src/imap.c:3595
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "無法將信件 %s 移到 %s\n"
 
-#: src/imap.c:3613
+#: src/imap.c:3619
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "imap 發生錯誤，命令為： STORE %s %s\n"
 
-#: src/imap.c:3627
+#: src/imap.c:3633
 msgid "error while imap command: EXPUNGE\n"
 msgstr "imap 發生錯誤，命令為： EXPUNGE\n"
 
-#: src/imap.c:3640
+#: src/imap.c:3646
 msgid "error while imap command: CLOSE\n"
 msgstr "imap 發生錯誤，命令為： CLOSE\n"
 
-#: src/imap.c:3873
+#: src/imap.c:3879
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "無法將 UTF-7 轉換為 %s\n"
 
-#: src/imap.c:3903
+#: src/imap.c:3909
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "無法轉換 %s 為 UTF-7\n"
@@ -2180,7 +2180,7 @@ msgstr "將 LDIF 檔匯入位址簿"
 msgid "Prev"
 msgstr "前一封"
 
-#: src/importldif.c:768 src/mainwindow.c:2321
+#: src/importldif.c:768 src/mainwindow.c:2303
 msgid "Next"
 msgstr "下一封"
 
@@ -2518,628 +2518,628 @@ msgid ""
 "Do you want to migrate it?"
 msgstr ""
 
-#: src/mainwindow.c:471
+#: src/mainwindow.c:462
 msgid "/_File/_Folder"
 msgstr "/檔案(_F)/資料夾管理(_F)"
 
-#: src/mainwindow.c:472
+#: src/mainwindow.c:463
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/檔案(_F)/資料夾管理(_F)/新增資料夾(_n)"
 
-#: src/mainwindow.c:474
+#: src/mainwindow.c:465
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/檔案(_F)/資料夾管理(_F)/重新命名資料夾(_R)"
 
-#: src/mainwindow.c:475
+#: src/mainwindow.c:466
 #, fuzzy
 msgid "/_File/_Folder/_Move folder..."
 msgstr "/檔案(_F)/資料夾管理(_F)/重新命名資料夾(_R)"
 
-#: src/mainwindow.c:476
+#: src/mainwindow.c:467
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/檔案(_F)/資料夾管理(_F)/刪除資料夾(_D)"
 
-#: src/mainwindow.c:477
+#: src/mainwindow.c:468
 msgid "/_File/_Mailbox"
 msgstr "/檔案(_F)/信箱(_M)"
 
-#: src/mainwindow.c:478
+#: src/mainwindow.c:469
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/檔案(_F)/信箱(_M)/新增信箱(_m)..."
 
-#: src/mainwindow.c:479
+#: src/mainwindow.c:470
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/檔案(_F)/信箱(_M)/刪除信箱 (_R)"
 
-#: src/mainwindow.c:480 src/mainwindow.c:485
+#: src/mainwindow.c:471 src/mainwindow.c:476
 msgid "/_File/_Mailbox/---"
 msgstr "/檔案(_F)/信箱(_M)/---"
 
-#: src/mainwindow.c:481
+#: src/mainwindow.c:472
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "/檔案(_F)/信箱(_M)/檢查新郵件(_C)"
 
-#: src/mainwindow.c:483
+#: src/mainwindow.c:474
 msgid "/_File/_Mailbox/Check for new messages in _all mailboxes"
 msgstr "/檔案(_F)/信箱(_M)/檢查所有信箱中的新郵件(_a)"
 
-#: src/mainwindow.c:486
+#: src/mainwindow.c:477
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "/檔案(_F)/信箱(_M)/重建資料夾結構(_e)"
 
-#: src/mainwindow.c:489
+#: src/mainwindow.c:480
 msgid "/_File/_Import mbox file..."
 msgstr "/檔案(_F)/匯入郵件(_I)"
 
-#: src/mainwindow.c:490
+#: src/mainwindow.c:481
 msgid "/_File/_Export to mbox file..."
 msgstr "/檔案(_F)/匯出資料夾(_E)"
 
-#: src/mainwindow.c:492
+#: src/mainwindow.c:483
 msgid "/_File/Empty all _trash"
 msgstr "/檔案(_F)/清空刪除的郵件(_t)"
 
-#: src/mainwindow.c:494 src/messageview.c:138
+#: src/mainwindow.c:485 src/messageview.c:138
 msgid "/_File/_Save as..."
 msgstr "/檔案(_F)/另存新檔(_S)..."
 
-#: src/mainwindow.c:495 src/messageview.c:139
+#: src/mainwindow.c:486 src/messageview.c:139
 msgid "/_File/_Print..."
 msgstr "/檔案(_F)/列印...(_P)"
 
-#: src/mainwindow.c:497
+#: src/mainwindow.c:488
 msgid "/_File/_Work offline"
 msgstr "/檔案(_F)/離線工作(_W)"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:500
+#: src/mainwindow.c:491
 msgid "/_File/E_xit"
 msgstr "/檔案(_F)/離開(_X)"
 
-#: src/mainwindow.c:505
+#: src/mainwindow.c:496
 msgid "/_Edit/Select _thread"
 msgstr "/編輯(_E)/選取串列(_t)"
 
-#: src/mainwindow.c:507 src/messageview.c:147
+#: src/mainwindow.c:498 src/messageview.c:147
 msgid "/_Edit/_Find in current message..."
 msgstr "/編輯(_E)/在目前信件中尋找(_F)"
 
-#: src/mainwindow.c:509
+#: src/mainwindow.c:500
 msgid "/_Edit/_Search messages..."
 msgstr "/編輯(_E)/尋找信件(_S)"
 
-#: src/mainwindow.c:512
+#: src/mainwindow.c:503
 msgid "/_View/Show or hi_de"
 msgstr "/顯示(_V)/顯示或隱藏(_d)"
 
-#: src/mainwindow.c:513
+#: src/mainwindow.c:504
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/顯示(_V)/顯示或隱藏(_d)/資料夾列表(_F)"
 
-#: src/mainwindow.c:515
+#: src/mainwindow.c:506
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/顯示(_V)/顯示或隱藏(_d)/信件預覽(_M)"
 
-#: src/mainwindow.c:517
+#: src/mainwindow.c:508
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/顯示(_V)/顯示或隱藏(_d)/工具列(_T)"
 
-#: src/mainwindow.c:519
+#: src/mainwindow.c:510
 msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/顯示(_V)/顯示或隱藏(_d)/工具列(_T)/圖樣與文字(_a)"
 
-#: src/mainwindow.c:521
+#: src/mainwindow.c:512
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/顯示(_V)/顯示或隱藏(_d)/工具列(_T)/圖樣(_I)"
 
-#: src/mainwindow.c:523
+#: src/mainwindow.c:514
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/顯示(_V)/顯示或隱藏(_d)/工具列(_T)/文字(_T)"
 
-#: src/mainwindow.c:525
+#: src/mainwindow.c:516
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/顯示(_V)/顯示或隱藏(_d)/工具列(_T)/不顯示(_N)"
 
-#: src/mainwindow.c:527
+#: src/mainwindow.c:518
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/顯示(_V)/顯示或隱藏(_d)/狀態列(_b)"
 
-#: src/mainwindow.c:530
+#: src/mainwindow.c:521
 msgid "/_View/Separate f_older tree"
 msgstr "/顯示(_V)/將資料夾列表分離(_o)"
 
-#: src/mainwindow.c:531
+#: src/mainwindow.c:522
 #, fuzzy
 msgid "/_View/Separate _message view"
 msgstr "/顯示(_V)/將信件預覽分離(_e)"
 
-#: src/mainwindow.c:533
+#: src/mainwindow.c:524
 msgid "/_View/_Sort"
 msgstr "/顯示(_V)/排序(_S)"
 
-#: src/mainwindow.c:534
+#: src/mainwindow.c:525
 msgid "/_View/_Sort/by _number"
 msgstr "/顯示(_V)/排序(_S)/用編號排序(_n)"
 
-#: src/mainwindow.c:535
+#: src/mainwindow.c:526
 msgid "/_View/_Sort/by s_ize"
 msgstr "/顯示(_V)/排序(_S)/用大小排序(_i)"
 
-#: src/mainwindow.c:536
+#: src/mainwindow.c:527
 msgid "/_View/_Sort/by _date"
 msgstr "/顯示(_V)/排序(_S)/用日期排序(_d)"
 
-#: src/mainwindow.c:537
+#: src/mainwindow.c:528
 msgid "/_View/_Sort/by _from"
 msgstr "/顯示(_V)/排序(_S)/用來源排序(_f)"
 
-#: src/mainwindow.c:538
+#: src/mainwindow.c:529
 msgid "/_View/_Sort/by _recipient"
 msgstr "/顯示(_V)/排序(_S)/用收件人排序(_i)"
 
-#: src/mainwindow.c:539
+#: src/mainwindow.c:530
 msgid "/_View/_Sort/by _subject"
 msgstr "/顯示(_V)/排序(_S)/用標題排序(_s)"
 
-#: src/mainwindow.c:540
+#: src/mainwindow.c:531
 msgid "/_View/_Sort/by _color label"
 msgstr "/顯示(_V)/排序(_S)/用標記顏色排序(_c)"
 
-#: src/mainwindow.c:542
+#: src/mainwindow.c:533
 msgid "/_View/_Sort/by _mark"
 msgstr "/顯示(_V)/排序(_S)/用標記排序(_m)"
 
-#: src/mainwindow.c:543
+#: src/mainwindow.c:534
 msgid "/_View/_Sort/by _unread"
 msgstr "/顯示(_V)/排序(_S)/依已讀或未讀排序(_u)"
 
-#: src/mainwindow.c:544
+#: src/mainwindow.c:535
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/顯示(_V)/排序(_S)/用附加檔排序(_t)"
 
-#: src/mainwindow.c:546
+#: src/mainwindow.c:537
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/顯示(_V)/排序(_S)/不排序(_o)"
 
-#: src/mainwindow.c:547 src/mainwindow.c:550
+#: src/mainwindow.c:538 src/mainwindow.c:541
 msgid "/_View/_Sort/---"
 msgstr "/顯示(_V)/排序(_S)/---"
 
-#: src/mainwindow.c:548
+#: src/mainwindow.c:539
 msgid "/_View/_Sort/Ascending"
 msgstr "/顯示(_V)/排序(_S)/遞增排序"
 
-#: src/mainwindow.c:549
+#: src/mainwindow.c:540
 msgid "/_View/_Sort/Descending"
 msgstr "/顯示(_V)/排序(_S)/遞減排序"
 
-#: src/mainwindow.c:551
+#: src/mainwindow.c:542
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/顯示(_V)/排序(_S)/用信件串列排序(_A)"
 
-#: src/mainwindow.c:553
+#: src/mainwindow.c:544
 msgid "/_View/Th_read view"
 msgstr "/顯示(_V)/將信件串列顯示(_r)"
 
-#: src/mainwindow.c:554
+#: src/mainwindow.c:545
 msgid "/_View/E_xpand all threads"
 msgstr "/顯示(_V)/展開所有信件串列(_x)"
 
-#: src/mainwindow.c:555
+#: src/mainwindow.c:546
 msgid "/_View/Co_llapse all threads"
 msgstr "/顯示(_V)/解除所有信件串列(_l)"
 
-#: src/mainwindow.c:556
+#: src/mainwindow.c:547
 msgid "/_View/Set display _item..."
 msgstr "/顯示(_V)/設定顯示的項目...(_i)"
 
-#: src/mainwindow.c:559
+#: src/mainwindow.c:550
 msgid "/_View/_Go to"
 msgstr "/顯示(_V)/前往(_G)"
 
-#: src/mainwindow.c:560
+#: src/mainwindow.c:551
 msgid "/_View/_Go to/_Prev message"
 msgstr "/顯示(_V)/前往...(_G)/前一封信件(_P)"
 
-#: src/mainwindow.c:561
+#: src/mainwindow.c:552
 msgid "/_View/_Go to/_Next message"
 msgstr "/顯示(_V)/前往...(_G)/下一封信件(_N)"
 
-#: src/mainwindow.c:562 src/mainwindow.c:567 src/mainwindow.c:570
-#: src/mainwindow.c:575 src/mainwindow.c:580
+#: src/mainwindow.c:553 src/mainwindow.c:558 src/mainwindow.c:561
+#: src/mainwindow.c:566 src/mainwindow.c:571
 msgid "/_View/_Go to/---"
 msgstr "/顯示(_V)/前往...(_G)/---"
 
-#: src/mainwindow.c:563
+#: src/mainwindow.c:554
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/顯示(_V)/前往...(_G)/前一封未讀信件(_r)"
 
-#: src/mainwindow.c:565
+#: src/mainwindow.c:556
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/顯示(_V)/前往...(_G)/下一封未讀信件(_e)"
 
-#: src/mainwindow.c:568
+#: src/mainwindow.c:559
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/顯示(_V)/前往...(_G)/前一封新信件(_w)"
 
-#: src/mainwindow.c:569
+#: src/mainwindow.c:560
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/顯示(_V)/前往...(_G)/下一封新信件(_x)"
 
-#: src/mainwindow.c:571
+#: src/mainwindow.c:562
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/顯示(_V)/前往...(_G)/前一封已標記信件(_m)"
 
-#: src/mainwindow.c:573
+#: src/mainwindow.c:564
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/顯示(_V)/前往...(_G)/下一封已標記信件(_a)"
 
-#: src/mainwindow.c:576
+#: src/mainwindow.c:567
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/顯示(_V)/前往...(_G)/前一封已標記顏色之信件(_l)"
 
-#: src/mainwindow.c:578
+#: src/mainwindow.c:569
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/顯示(_V)/前往...(_G)/下一封已標記顏色之信件(_b)"
 
-#: src/mainwindow.c:581
+#: src/mainwindow.c:572
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/顯示(_V)/前往...(_G)/到其他資料夾(_f)"
 
-#: src/mainwindow.c:590 src/messageview.c:158
+#: src/mainwindow.c:581 src/messageview.c:158
 #, fuzzy
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/顯示(_V)/字集(_C)/自動偵測(_A)"
 
-#: src/mainwindow.c:641 src/messageview.c:202
+#: src/mainwindow.c:632 src/messageview.c:202
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/顯示(_V)/字集(_C)/日文 (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:643 src/messageview.c:204
+#: src/mainwindow.c:634 src/messageview.c:204
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/顯示(_V)/字集(_C)/日文 (_EUC-JP)"
 
-#: src/mainwindow.c:645 src/messageview.c:206
+#: src/mainwindow.c:636 src/messageview.c:206
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/顯示(_V)/字集(_C)/日文 (_Shift__JIS)"
 
-#: src/mainwindow.c:657 src/messageview.c:217
+#: src/mainwindow.c:648 src/messageview.c:217
 #, fuzzy
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/顯示(_V)/字集(_C)/中文 (ISO-2022-_CN)"
 
-#: src/mainwindow.c:663 src/messageview.c:222
+#: src/mainwindow.c:654 src/messageview.c:222
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/顯示(_V)/字集(_C)/韓文 (ISO-2022-KR)"
 
-#: src/mainwindow.c:676 src/summaryview.c:401
+#: src/mainwindow.c:667 src/summaryview.c:401
 msgid "/_View/Open in new _window"
 msgstr "/顯示(_V)/在新視窗開啟(_w)"
 
-#: src/mainwindow.c:677 src/messageview.c:234
+#: src/mainwindow.c:668 src/messageview.c:234
 msgid "/_View/Mess_age source"
 msgstr "/顯示(_V)/觀看信件原始碼(_a)"
 
-#: src/mainwindow.c:678 src/messageview.c:235
+#: src/mainwindow.c:669 src/messageview.c:235
 msgid "/_View/Show all _header"
 msgstr "/顯示(_V)/顯示所有的標頭(_h)"
 
-#: src/mainwindow.c:680
+#: src/mainwindow.c:671
 msgid "/_View/_Update summary"
 msgstr "/顯示(_V)/更新信件列表(_U)"
 
-#: src/mainwindow.c:682 src/messageview.c:237
+#: src/mainwindow.c:673 src/messageview.c:237
 msgid "/_Message"
 msgstr "/信件(_M)"
 
-#: src/mainwindow.c:683
+#: src/mainwindow.c:674
 msgid "/_Message/Recei_ve"
 msgstr "/信件(_M)/接收(_v)"
 
-#: src/mainwindow.c:684
+#: src/mainwindow.c:675
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/信件(_M)/接收(_v)/從目前帳號中接收新郵件(_c)"
 
-#: src/mainwindow.c:686
+#: src/mainwindow.c:677
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/信件(_M)/接收(_v)/從所有帳號中接收新郵件(_a)"
 
-#: src/mainwindow.c:688
+#: src/mainwindow.c:679
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/信件(_M)/接收(_v)/取消接收(_g)"
 
-#: src/mainwindow.c:690
+#: src/mainwindow.c:681
 msgid "/_Message/Recei_ve/---"
 msgstr "/信件(_M)/接收(_v)/---"
 
-#: src/mainwindow.c:691
+#: src/mainwindow.c:682
 msgid "/_Message/_Send queued messages"
 msgstr "/信件(_M)/將暫存資料夾中的信件送出(_S)"
 
-#: src/mainwindow.c:692 src/mainwindow.c:694 src/mainwindow.c:701
-#: src/mainwindow.c:706 src/mainwindow.c:710 src/mainwindow.c:719
-#: src/mainwindow.c:722 src/messageview.c:240 src/messageview.c:248
+#: src/mainwindow.c:683 src/mainwindow.c:685 src/mainwindow.c:692
+#: src/mainwindow.c:697 src/mainwindow.c:701 src/mainwindow.c:710
+#: src/mainwindow.c:713 src/messageview.c:240 src/messageview.c:248
 #: src/messageview.c:253
 msgid "/_Message/---"
 msgstr "/信件(_M)/---"
 
-#: src/mainwindow.c:693 src/messageview.c:238
+#: src/mainwindow.c:684 src/messageview.c:238
 msgid "/_Message/Compose _new message"
 msgstr "/信件(_M)/撰寫郵件(_n)"
 
-#: src/mainwindow.c:695 src/messageview.c:241
+#: src/mainwindow.c:686 src/messageview.c:241
 msgid "/_Message/_Reply"
 msgstr "/信件(_M)/直接回覆(_R)"
 
-#: src/mainwindow.c:696
+#: src/mainwindow.c:687
 msgid "/_Message/Repl_y to"
 msgstr "/信件(_M)/回覆給(_y)"
 
-#: src/mainwindow.c:697 src/messageview.c:242
+#: src/mainwindow.c:688 src/messageview.c:242
 msgid "/_Message/Repl_y to/_all"
 msgstr "/信件(_M)/回覆給(_y)/所有收件人(_a)"
 
-#: src/mainwindow.c:698 src/messageview.c:244
+#: src/mainwindow.c:689 src/messageview.c:244
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/信件(_M)/回覆給(_y)/原作者(_s)"
 
-#: src/mainwindow.c:699 src/messageview.c:246
+#: src/mainwindow.c:690 src/messageview.c:246
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/信件(_M)/回覆給(_y)/Mailing List(_l)"
 
-#: src/mainwindow.c:702 src/messageview.c:249
+#: src/mainwindow.c:693 src/messageview.c:249
 msgid "/_Message/_Forward"
 msgstr "/信件(_M)/轉寄(_F)"
 
-#: src/mainwindow.c:703 src/messageview.c:250
+#: src/mainwindow.c:694 src/messageview.c:250
 msgid "/_Message/For_ward as attachment"
 msgstr "/信件(_M)/將信件當成附加檔轉寄(_w)"
 
-#: src/mainwindow.c:705 src/messageview.c:252
+#: src/mainwindow.c:696 src/messageview.c:252
 msgid "/_Message/Redirec_t"
 msgstr "/信件(_M)/信件導向(_t)"
 
-#: src/mainwindow.c:707
+#: src/mainwindow.c:698
 msgid "/_Message/M_ove..."
 msgstr "/信件(_M)/移動...(_o)"
 
-#: src/mainwindow.c:708
+#: src/mainwindow.c:699
 msgid "/_Message/_Copy..."
 msgstr "/信件(_M)/複製...(_C)"
 
-#: src/mainwindow.c:709
+#: src/mainwindow.c:700
 msgid "/_Message/_Delete"
 msgstr "/信件(_M)/刪除(_D)"
 
-#: src/mainwindow.c:711
+#: src/mainwindow.c:702
 msgid "/_Message/_Mark"
 msgstr "/信件(_M)/標記(_M)"
 
-#: src/mainwindow.c:712
+#: src/mainwindow.c:703
 msgid "/_Message/_Mark/_Mark"
 msgstr "/信件(_M)/標記(_M)/標記(_M)"
 
-#: src/mainwindow.c:713
+#: src/mainwindow.c:704
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/信件(_M)/標記(_M)/去除標記(_U)"
 
-#: src/mainwindow.c:714
+#: src/mainwindow.c:705
 msgid "/_Message/_Mark/---"
 msgstr "/信件(_M)/標記(_M)/---"
 
-#: src/mainwindow.c:715
+#: src/mainwindow.c:706
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/信件(_M)/標記(_M)/標記成未讀(_e)"
 
-#: src/mainwindow.c:716
+#: src/mainwindow.c:707
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/信件(_M)/標記(_M)/標記成已讀(_d)"
 
-#: src/mainwindow.c:718
+#: src/mainwindow.c:709
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/信件(_M)/標記(_M)/標記所有信件成已讀(_d)"
 
-#: src/mainwindow.c:720
+#: src/mainwindow.c:711
 #, fuzzy
 msgid "/_Message/Set as _junk mail"
 msgstr "/信件(_M)/接收新郵件(_i)"
 
-#: src/mainwindow.c:721
+#: src/mainwindow.c:712
 #, fuzzy
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/信件(_M)/接收新郵件(_i)"
 
-#: src/mainwindow.c:723 src/messageview.c:254
+#: src/mainwindow.c:714 src/messageview.c:254
 msgid "/_Message/Re-_edit"
 msgstr "/信件(_M)/重新編輯(_e)"
 
-#: src/mainwindow.c:727
+#: src/mainwindow.c:718
 #, fuzzy
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/工具(_T)/將寄信人加入位址簿(_k)"
 
-#: src/mainwindow.c:730
+#: src/mainwindow.c:721
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/工具(_T)/過濾資料夾中所有信件(_F)"
 
-#: src/mainwindow.c:732
+#: src/mainwindow.c:723
 msgid "/_Tools/Filter _selected messages"
 msgstr "/工具(_T)/過濾選擇的信件(_F)"
 
-#: src/mainwindow.c:734 src/messageview.c:261
+#: src/mainwindow.c:725 src/messageview.c:261
 msgid "/_Tools/_Create filter rule"
 msgstr "/工具(_T)/產生信件過濾規則(_C)"
 
-#: src/mainwindow.c:735 src/messageview.c:263
+#: src/mainwindow.c:726 src/messageview.c:263
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/工具(_T)/產生信件過濾規則(_C)/自動產生"
 
-#: src/mainwindow.c:737 src/messageview.c:265
+#: src/mainwindow.c:728 src/messageview.c:265
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/工具(_T)/產生信件過濾規則(_C)/依來源(_F)"
 
-#: src/mainwindow.c:739 src/messageview.c:267
+#: src/mainwindow.c:730 src/messageview.c:267
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/工具(_T)/產生信件過濾規則(_C)/依收信人(_T)"
 
-#: src/mainwindow.c:741 src/messageview.c:269
+#: src/mainwindow.c:732 src/messageview.c:269
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/工具(_T)/產生信件過濾規則(_C)/依標題(_S)"
 
-#: src/mainwindow.c:744
+#: src/mainwindow.c:735
 #, fuzzy
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/工具(_T)/過濾資料夾中所有信件(_F)"
 
-#: src/mainwindow.c:746
+#: src/mainwindow.c:737
 #, fuzzy
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/工具(_T)/過濾選擇的信件(_F)"
 
-#: src/mainwindow.c:751
+#: src/mainwindow.c:742
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/工具(_T)/刪除重覆的信件(_p)"
 
-#: src/mainwindow.c:754
+#: src/mainwindow.c:745
 msgid "/_Tools/E_xecute"
 msgstr "/工具(_T)/執行(_x)"
 
-#: src/mainwindow.c:756
+#: src/mainwindow.c:747
 msgid "/_Tools/_Log window"
 msgstr "/工具(_T)/紀錄視窗(_L)"
 
-#: src/mainwindow.c:758
+#: src/mainwindow.c:749
 msgid "/_Configuration"
 msgstr "/設定(_C)"
 
-#: src/mainwindow.c:759
+#: src/mainwindow.c:750
 msgid "/_Configuration/_Common preferences..."
 msgstr "/設定(_C)/一般設定...(_C)"
 
-#: src/mainwindow.c:761
+#: src/mainwindow.c:752
 msgid "/_Configuration/_Filter setting..."
 msgstr "/設定(_C)/信件過濾設定...(_F)"
 
-#: src/mainwindow.c:763
+#: src/mainwindow.c:754
 msgid "/_Configuration/_Template..."
 msgstr "/設定(_C)/信件樣板設定...(_T)"
 
-#: src/mainwindow.c:764
+#: src/mainwindow.c:755
 msgid "/_Configuration/_Actions..."
 msgstr "/設定(_C)/外部指令設定...(_A)"
 
-#: src/mainwindow.c:765
+#: src/mainwindow.c:756
 msgid "/_Configuration/---"
 msgstr "/設定(_C)/---"
 
-#: src/mainwindow.c:766
+#: src/mainwindow.c:757
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/設定(_C)/目前帳號設定(_P)"
 
-#: src/mainwindow.c:768
+#: src/mainwindow.c:759
 msgid "/_Configuration/Create _new account..."
 msgstr "/設定(_C)/新增帳號...(_n)"
 
-#: src/mainwindow.c:770
+#: src/mainwindow.c:761
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/設定(_C)/編輯帳號...(_E)"
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:763
 msgid "/_Configuration/C_hange current account"
 msgstr "/設定(_C)/改變現有帳號(_h)"
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:767
 msgid "/_Help/_Manual"
 msgstr "/說明(_H)/說明文件(_M)"
 
-#: src/mainwindow.c:777
+#: src/mainwindow.c:768
 msgid "/_Help/_Manual/_English"
 msgstr "/說明(_H)/說明文件(_M)/英文(_E)"
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:769
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/說明(_H)/說明文件(_M)/日文(_J)"
 
-#: src/mainwindow.c:779
+#: src/mainwindow.c:770
 msgid "/_Help/_FAQ"
 msgstr "/說明(_H)/常問問題解答(_F)"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:771
 msgid "/_Help/_FAQ/_English"
 msgstr "/說明(_H)/常問問題解答(_F)/英文(_E)"
 
-#: src/mainwindow.c:781
+#: src/mainwindow.c:772
 msgid "/_Help/_FAQ/_German"
 msgstr "/說明(_H)/常問問題解答(_F)/德文(_F)"
 
-#: src/mainwindow.c:782
+#: src/mainwindow.c:773
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/說明(_H)/常問問題解答(_F)/西班牙文(_S)"
 
-#: src/mainwindow.c:783
+#: src/mainwindow.c:774
 msgid "/_Help/_FAQ/_French"
 msgstr "/說明(_H)/常問問題解答(_F)/法文(_F)"
 
-#: src/mainwindow.c:784
+#: src/mainwindow.c:775
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/說明(_H)/常問問題解答(_F)/義大利文(_E)"
 
-#: src/mainwindow.c:785
+#: src/mainwindow.c:776
 msgid "/_Help/---"
 msgstr "/說明(_H)/---"
 
-#: src/mainwindow.c:825
+#: src/mainwindow.c:816
 msgid "Creating main window...\n"
 msgstr "產生主視窗...\n"
 
-#: src/mainwindow.c:987
+#: src/mainwindow.c:973
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "主視窗：顏色 %d 配置失敗。\n"
 
-#: src/mainwindow.c:1071 src/summaryview.c:2020 src/summaryview.c:2105
+#: src/mainwindow.c:1057 src/summaryview.c:2020 src/summaryview.c:2105
 #: src/summaryview.c:3342 src/summaryview.c:3415 src/summaryview.c:3728
 msgid "done.\n"
 msgstr "完成。\n"
 
-#: src/mainwindow.c:1196 src/mainwindow.c:1237 src/mainwindow.c:1265
+#: src/mainwindow.c:1182 src/mainwindow.c:1223 src/mainwindow.c:1251
 msgid "Untitled"
 msgstr "無標題"
 
-#: src/mainwindow.c:1266
+#: src/mainwindow.c:1252
 msgid "none"
 msgstr "無"
 
-#: src/mainwindow.c:1316
+#: src/mainwindow.c:1302
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "Changing window separation type from %d to %d\n"
 
-#: src/mainwindow.c:1536
+#: src/mainwindow.c:1522
 msgid "Offline"
 msgstr "離線"
 
-#: src/mainwindow.c:1537
+#: src/mainwindow.c:1523
 msgid "You are offline. Go online?"
 msgstr "您目前正離線中。要連線嗎？"
 
-#: src/mainwindow.c:1551
+#: src/mainwindow.c:1537
 msgid "Empty all trash"
 msgstr "清空刪除的郵件"
 
-#: src/mainwindow.c:1552
+#: src/mainwindow.c:1538
 msgid "Empty messages in all trash?"
 msgstr "您確定要清除所有被刪除的郵件？"
 
-#: src/mainwindow.c:1580
+#: src/mainwindow.c:1566
 msgid "Add mailbox"
 msgstr "新增信箱"
 
-#: src/mainwindow.c:1581
+#: src/mainwindow.c:1567
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3149,16 +3149,16 @@ msgstr ""
 "並請注意不要輸入已存在的信箱名稱。\n"
 "系統將會自動判別是否信箱已存在。"
 
-#: src/mainwindow.c:1587
+#: src/mainwindow.c:1573
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "信箱 %s 已存在。"
 
-#: src/mainwindow.c:1592 src/setup.c:57
+#: src/mainwindow.c:1578 src/setup.c:57
 msgid "Mailbox"
 msgstr "信箱"
 
-#: src/mainwindow.c:1598 src/setup.c:63
+#: src/mainwindow.c:1584 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3167,150 +3167,150 @@ msgstr ""
 "無法產生信箱目錄。\n"
 "可能是因為同樣名稱的檔案已經存在，或者是你沒有權限可以開新目錄。"
 
-#: src/mainwindow.c:1989
+#: src/mainwindow.c:1975
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - 資料夾列表"
 
-#: src/mainwindow.c:2009 src/messageview.c:368
+#: src/mainwindow.c:1995 src/messageview.c:368
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - 信件列表"
 
-#: src/mainwindow.c:2156 src/summaryview.c:370
+#: src/mainwindow.c:2142 src/summaryview.c:370
 msgid "/_Reply"
 msgstr "/直接回覆(_R)"
 
-#: src/mainwindow.c:2157
+#: src/mainwindow.c:2143
 msgid "/Reply to _all"
 msgstr "/全部回覆(_a)"
 
-#: src/mainwindow.c:2158
+#: src/mainwindow.c:2144
 msgid "/Reply to _sender"
 msgstr "/回覆給原作者(_s)"
 
-#: src/mainwindow.c:2159
+#: src/mainwindow.c:2145
 msgid "/Reply to mailing _list"
 msgstr "/回覆到 Mailing list(_l)"
 
-#: src/mainwindow.c:2164 src/summaryview.c:377
+#: src/mainwindow.c:2150 src/summaryview.c:377
 msgid "/_Forward"
 msgstr "/轉寄(_F)"
 
-#: src/mainwindow.c:2165 src/summaryview.c:378
+#: src/mainwindow.c:2151 src/summaryview.c:378
 msgid "/For_ward as attachment"
 msgstr "/將信件當成附加檔轉寄(_w)"
 
-#: src/mainwindow.c:2166 src/summaryview.c:379
+#: src/mainwindow.c:2152 src/summaryview.c:379
 msgid "/Redirec_t"
 msgstr "/信件導向(_t)"
 
-#: src/mainwindow.c:2205
+#: src/mainwindow.c:2188
 msgid "Get"
 msgstr "檢查郵件"
 
-#: src/mainwindow.c:2206
+#: src/mainwindow.c:2189
 msgid "Incorporate new mail"
 msgstr "檢查目前帳號的新郵件"
 
-#: src/mainwindow.c:2213
+#: src/mainwindow.c:2196
 msgid "Get all"
 msgstr "全部檢查"
 
-#: src/mainwindow.c:2214
+#: src/mainwindow.c:2197
 msgid "Incorporate new mail of all accounts"
 msgstr "檢查所有帳號的新郵件"
 
-#: src/mainwindow.c:2225
+#: src/mainwindow.c:2208
 msgid "Send queued message(s)"
 msgstr "將暫存資料夾中的信件送出"
 
-#: src/mainwindow.c:2235 src/prefs_account.c:721 src/prefs_common.c:949
+#: src/mainwindow.c:2218 src/prefs_account.c:721 src/prefs_common.c:949
 #: src/prefs_folder_item.c:137
 msgid "Compose"
 msgstr "撰寫郵件"
 
-#: src/mainwindow.c:2236
+#: src/mainwindow.c:2219
 msgid "Compose new message"
 msgstr "編輯新郵件"
 
-#: src/mainwindow.c:2244 src/prefs_common.c:1448
+#: src/mainwindow.c:2227 src/prefs_common.c:1448
 msgid "Reply"
 msgstr "回覆"
 
-#: src/mainwindow.c:2245 src/mainwindow.c:2258
+#: src/mainwindow.c:2228 src/mainwindow.c:2241
 msgid "Reply to the message"
 msgstr "回覆信件"
 
-#: src/mainwindow.c:2263
+#: src/mainwindow.c:2245
 msgid "Reply all"
 msgstr "全部回覆"
 
-#: src/mainwindow.c:2264
+#: src/mainwindow.c:2246
 msgid "Reply to all"
 msgstr "全部回覆"
 
-#: src/mainwindow.c:2272 src/prefs_filter_edit.c:741
+#: src/mainwindow.c:2254 src/prefs_filter_edit.c:741
 msgid "Forward"
 msgstr "轉寄"
 
-#: src/mainwindow.c:2273 src/mainwindow.c:2286
+#: src/mainwindow.c:2255 src/mainwindow.c:2268
 msgid "Forward the message"
 msgstr "轉寄信件"
 
-#: src/mainwindow.c:2293
+#: src/mainwindow.c:2275
 msgid "Delete the message"
 msgstr "刪除信件"
 
-#: src/mainwindow.c:2301 src/prefs_common.c:1988
+#: src/mainwindow.c:2283 src/prefs_common.c:1988
 msgid "Junk"
 msgstr ""
 
-#: src/mainwindow.c:2302
+#: src/mainwindow.c:2284
 #, fuzzy
 msgid "Set as junk mail"
 msgstr "設為預設帳號"
 
-#: src/mainwindow.c:2311
+#: src/mainwindow.c:2293
 msgid "Execute"
 msgstr "執行"
 
-#: src/mainwindow.c:2312
+#: src/mainwindow.c:2294
 msgid "Execute marked process"
 msgstr "執行標記的行程"
 
-#: src/mainwindow.c:2322
+#: src/mainwindow.c:2304
 msgid "Next unread message"
 msgstr "下一封未讀郵件"
 
-#: src/mainwindow.c:2334
+#: src/mainwindow.c:2316
 msgid "Prefs"
 msgstr "設定"
 
-#: src/mainwindow.c:2335
+#: src/mainwindow.c:2317
 msgid "Common preferences"
 msgstr "一般設定"
 
-#: src/mainwindow.c:2343 src/prefs_folder_item.c:261
+#: src/mainwindow.c:2325 src/prefs_folder_item.c:261
 #: src/prefs_folder_item.c:272 src/progressdialog.c:128
 msgid "Account"
 msgstr "帳號"
 
-#: src/mainwindow.c:2344
+#: src/mainwindow.c:2326
 msgid "Account setting"
 msgstr "帳號設定"
 
-#: src/mainwindow.c:2527
+#: src/mainwindow.c:2498
 msgid "You are offline. Click the icon to go online."
 msgstr "您目前正離線中。按下按鈕恢復連線。"
 
-#: src/mainwindow.c:2538
+#: src/mainwindow.c:2509
 msgid "You are online. Click the icon to go offline."
 msgstr "您目前正連線中。按下按鈕離線工作。"
 
-#: src/mainwindow.c:2731
+#: src/mainwindow.c:2702
 msgid "Exit"
 msgstr "離開"
 
-#: src/mainwindow.c:2731
+#: src/mainwindow.c:2702
 msgid "Exit this program?"
 msgstr "您確定要離開嗎？"
 
@@ -5506,11 +5506,11 @@ msgstr ""
 msgid "Status"
 msgstr "狀態"
 
-#: src/recv.c:113
+#: src/recv.c:112
 msgid "error occurred while retrieving data.\n"
 msgstr "抓取資料時發生錯誤。\n"
 
-#: src/recv.c:155 src/recv.c:197 src/recv.c:213
+#: src/recv.c:154 src/recv.c:196 src/recv.c:211
 msgid "Can't write to file.\n"
 msgstr "無法寫入檔案。\n"
 
@@ -6246,7 +6246,7 @@ msgstr ""
 msgid "%.2fGB"
 msgstr ""
 
-#: src/utils.c:2372 src/utils.c:2496
+#: src/utils.c:2386 src/utils.c:2510
 #, c-format
 msgid "writing to %s failed.\n"
 msgstr "寫入到 %s 的動作失敗。\n"
author	hiro <hiro@ee746299-78ed-0310-b773-934348b2243d>	2005-08-23 06:53:36 +0000
committer	hiro <hiro@ee746299-78ed-0310-b773-934348b2243d>	2005-08-23 06:53:36 +0000
commit	0868b16f30f3590b4b0026517c487ced7105d5a7 (patch)
tree	d592ce64e7653e05f80da5a950d6b982c6e1ac54 /po
parent	867b9d4c7c1422ddf8ebb2f58c87deaedea1563f (diff)