added Arabic encoding, and 2.2.0beta7 release.

git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@949 ee746299-78ed-0310-b773-934348b2243d

29 files changed, 17104 insertions, 16224 deletions

diff --git a/po/bg.po b/po/bg.po
index a8a18dfb..70ab3474 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: 2006-01-27 18:11+0900\n"
+"POT-Creation-Date: 2006-01-31 15:20+0900\n"
 "PO-Revision-Date: 2004-01-09 02:06+0200\n"
 "Last-Translator: Pavel Pyuter <pavel@unix-bg.org>\n"
 "Language-Team: Bulgarian <bg@li.org>\n"
@@ -501,7 +501,7 @@ msgstr "Намерени %s\n"
 msgid "Configuration is saved.\n"
 msgstr "Настройките са запазени.\n"
 
-#: libsylph/prefs_common.c:489
+#: libsylph/prefs_common.c:491
 #, fuzzy
 msgid "Junk mail filter"
 msgstr "Папка"
@@ -617,8 +617,8 @@ msgstr "%.2fMB"
 msgid "%.2fGB"
 msgstr "%.2fGB"
 
-#: libsylph/utils.c:2373 src/compose.c:2858 src/compose.c:3121
-#: src/compose.c:3184 src/compose.c:3304
+#: libsylph/utils.c:2373 src/compose.c:2867 src/compose.c:3130
+#: src/compose.c:3193 src/compose.c:3313
 msgid "can't change file mode\n"
 msgstr "не може да се смени вида на файла\n"
 
@@ -703,8 +703,8 @@ msgstr ""
 "За нови съобщения ще бъде проверявано в този ред. Отметнете кутийките\n"
 "в колонка `G' за разрешаване на изтегляне на съобщенията от `Get All'."
 
-#: src/account_dialog.c:366 src/addressadd.c:192 src/addressbook.c:491
-#: src/compose.c:4262 src/editaddress.c:200 src/editaddress.c:942
+#: src/account_dialog.c:366 src/addressadd.c:192 src/addressbook.c:493
+#: src/compose.c:4271 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:206 src/prefs_filter.c:259 src/prefs_folder_item.c:171
@@ -842,12 +842,12 @@ msgstr "Потребителски аргумент на действието"
 msgid "Add Address to Book"
 msgstr "Добавяне на Адреса към Книгата"
 
-#: src/addressadd.c:202 src/compose.c:4762 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4771 src/editaddress.c:201
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "Адрес"
 
-#: src/addressadd.c:212 src/addressbook.c:493 src/editaddress.c:202
+#: src/addressadd.c:212 src/addressbook.c:495 src/editaddress.c:202
 #: src/editaddress.c:795 src/editaddress.c:860 src/editgroup.c:267
 msgid "Remarks"
 msgstr "Забележки"
@@ -856,183 +856,183 @@ msgstr "Забележки"
 msgid "Select Address Book Folder"
 msgstr "Изберете папка от адресната книга"
 
-#: src/addressbook.c:336 src/compose.c:515 src/mainwindow.c:477
+#: src/addressbook.c:338 src/compose.c:515 src/mainwindow.c:480
 #: src/messageview.c:138
 msgid "/_File"
 msgstr "/_Файл"
 
-#: src/addressbook.c:337
+#: src/addressbook.c:339
 msgid "/_File/New _Book"
 msgstr "/_Файл/Нова _Книга"
 
-#: src/addressbook.c:338
+#: src/addressbook.c:340
 msgid "/_File/New _vCard"
 msgstr "/_Файл/Нова _vCard"
 
-#: src/addressbook.c:340
+#: src/addressbook.c:342
 msgid "/_File/New _JPilot"
 msgstr "/_Файл/Нов _JPilot"
 
-#: src/addressbook.c:343
+#: src/addressbook.c:345
 msgid "/_File/New _Server"
 msgstr "/_Файл/Нов _Сървър"
 
-#: src/addressbook.c:345 src/addressbook.c:348 src/compose.c:520
-#: src/compose.c:525 src/compose.c:528 src/compose.c:531 src/mainwindow.c:495
-#: src/mainwindow.c:498 src/mainwindow.c:500 src/mainwindow.c:503
-#: src/mainwindow.c:505 src/messageview.c:141
+#: src/addressbook.c:347 src/addressbook.c:350 src/compose.c:520
+#: src/compose.c:525 src/compose.c:528 src/compose.c:531 src/mainwindow.c:498
+#: src/mainwindow.c:501 src/mainwindow.c:503 src/mainwindow.c:506
+#: src/mainwindow.c:508 src/messageview.c:141
 msgid "/_File/---"
 msgstr "/_Файл/---"
 
-#: src/addressbook.c:346
+#: src/addressbook.c:348
 msgid "/_File/_Edit"
 msgstr "/_Файл/_Редактиране"
 
-#: src/addressbook.c:347
+#: src/addressbook.c:349
 msgid "/_File/_Delete"
 msgstr "/_Файл/_Изтриване"
 
-#: src/addressbook.c:349
+#: src/addressbook.c:351
 msgid "/_File/_Save"
 msgstr "/_файл/_Запазване"
 
-#: src/addressbook.c:350 src/compose.c:532 src/messageview.c:142
+#: src/addressbook.c:352 src/compose.c:532 src/messageview.c:142
 msgid "/_File/_Close"
 msgstr "/_Файл/_Затваряне"
 
-#: src/addressbook.c:351
+#: src/addressbook.c:353
 msgid "/_Address"
 msgstr "/_Адрес"
 
-#: src/addressbook.c:352
+#: src/addressbook.c:354
 msgid "/_Address/New _Address"
 msgstr "/_Адрес/Нов _Адрес"
 
-#: src/addressbook.c:353
+#: src/addressbook.c:355
 msgid "/_Address/New _Group"
 msgstr "/_Адрес/Нова _Група"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:356
 msgid "/_Address/New _Folder"
 msgstr "/_Адрес/Нова _Папка"
 
-#: src/addressbook.c:355
+#: src/addressbook.c:357
 msgid "/_Address/---"
 msgstr "/_Адрес/---"
 
-#: src/addressbook.c:356
+#: src/addressbook.c:358
 msgid "/_Address/_Edit"
 msgstr "/_Адрес/_Редактиране"
 
-#: src/addressbook.c:357
+#: src/addressbook.c:359
 msgid "/_Address/_Delete"
 msgstr "/_Адрес/_Изтриване"
 
-#: src/addressbook.c:358 src/compose.c:639 src/mainwindow.c:738
-#: src/messageview.c:259
+#: src/addressbook.c:360 src/compose.c:645 src/mainwindow.c:749
+#: src/messageview.c:264
 msgid "/_Tools"
 msgstr "/_Инструменти"
 
-#: src/addressbook.c:359
+#: src/addressbook.c:361
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Инструменти/Внасяне на _LDIF файл"
 
-#: src/addressbook.c:360 src/compose.c:658 src/mainwindow.c:788
-#: src/messageview.c:277
+#: src/addressbook.c:362 src/compose.c:664 src/mainwindow.c:799
+#: src/messageview.c:282
 msgid "/_Help"
 msgstr "/_Помощ"
 
-#: src/addressbook.c:361 src/compose.c:659 src/mainwindow.c:799
-#: src/messageview.c:278
+#: src/addressbook.c:363 src/compose.c:665 src/mainwindow.c:810
+#: src/messageview.c:283
 msgid "/_Help/_About"
 msgstr "/_Помощ/_Относно"
 
-#: src/addressbook.c:380 src/addressbook.c:390
+#: src/addressbook.c:382 src/addressbook.c:392
 msgid "/New _Address"
 msgstr "/Нов _Адрес"
 
-#: src/addressbook.c:381 src/addressbook.c:391
+#: src/addressbook.c:383 src/addressbook.c:393
 msgid "/New _Group"
 msgstr "/Нова _Група"
 
-#: src/addressbook.c:382 src/addressbook.c:392
+#: src/addressbook.c:384 src/addressbook.c:394
 msgid "/New _Folder"
 msgstr "/Нова _Папка"
 
-#: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:509
+#: src/addressbook.c:385 src/addressbook.c:395 src/compose.c:509
 #: src/folderview.c:246 src/folderview.c:248 src/folderview.c:253
 #: src/folderview.c:266 src/folderview.c:268 src/folderview.c:270
 #: src/folderview.c:275 src/folderview.c:289 src/folderview.c:291
 #: src/folderview.c:295 src/summaryview.c:414 src/summaryview.c:418
-#: src/summaryview.c:421 src/summaryview.c:431 src/summaryview.c:433
-#: src/summaryview.c:435 src/summaryview.c:447 src/summaryview.c:453
+#: src/summaryview.c:421 src/summaryview.c:433 src/summaryview.c:435
+#: src/summaryview.c:437 src/summaryview.c:449 src/summaryview.c:455
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:534
-#: src/mainwindow.c:509 src/messageview.c:144
+#: src/addressbook.c:386 src/addressbook.c:396 src/compose.c:534
+#: src/mainwindow.c:512 src/messageview.c:144
 msgid "/_Edit"
 msgstr "/_Редактиране"
 
-#: src/addressbook.c:385 src/addressbook.c:395 src/summaryview.c:432
+#: src/addressbook.c:387 src/addressbook.c:397 src/summaryview.c:434
 msgid "/_Delete"
 msgstr "/_Изтриване"
 
-#: src/addressbook.c:492
+#: src/addressbook.c:494
 msgid "E-Mail address"
 msgstr "E-Mail адрес"
 
-#: src/addressbook.c:496 src/compose.c:4763 src/prefs_common_dialog.c:2183
+#: src/addressbook.c:498 src/compose.c:4772 src/prefs_common_dialog.c:2183
 msgid "Address book"
 msgstr "Адресна книга"
 
-#: src/addressbook.c:596 src/prefs_filter_edit.c:249
+#: src/addressbook.c:600 src/prefs_filter_edit.c:249
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "Име:"
 
 #. Buttons
-#: src/addressbook.c:628 src/addressbook.c:1680 src/editaddress.c:884
-#: src/editaddress.c:1017 src/mainwindow.c:2391 src/prefs_actions.c:266
+#: src/addressbook.c:632 src/addressbook.c:1684 src/editaddress.c:884
+#: src/editaddress.c:1017 src/mainwindow.c:2402 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
 #: src/prefs_template.c:233
 msgid "Delete"
 msgstr "Изтриване"
 
-#: src/addressbook.c:631 src/editaddress.c:890 src/editaddress.c:1023
+#: src/addressbook.c:635 src/editaddress.c:890 src/editaddress.c:1023
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:273 src/prefs_display_header.c:328
 #: src/prefs_filter_edit.c:1550
 msgid "Add"
 msgstr "Добавяне"
 
-#: src/addressbook.c:634
+#: src/addressbook.c:638
 msgid "Lookup"
 msgstr "Справка"
 
-#: src/addressbook.c:646 src/headerview.c:55 src/prefs_folder_item.c:339
+#: src/addressbook.c:650 src/headerview.c:55 src/prefs_folder_item.c:339
 #: src/prefs_template.c:176
 msgid "To:"
 msgstr "До:"
 
-#: src/addressbook.c:650 src/prefs_folder_item.c:356 src/prefs_template.c:178
+#: src/addressbook.c:654 src/prefs_folder_item.c:356 src/prefs_template.c:178
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:654 src/prefs_folder_item.c:367
+#: src/addressbook.c:658 src/prefs_folder_item.c:367
 msgid "Bcc:"
 msgstr "Bcc:"
 
 #. Confirm deletion
-#: src/addressbook.c:841
+#: src/addressbook.c:845
 msgid "Delete address(es)"
 msgstr "Изтриване на адрес(ите)"
 
-#: src/addressbook.c:842
+#: src/addressbook.c:846
 msgid "Really delete the address(es)?"
 msgstr "Желаете ли изтриване на адрес(ите)?"
 
-#: src/addressbook.c:1671
+#: src/addressbook.c:1675
 #, fuzzy, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1042,38 +1042,38 @@ msgstr ""
 "Ако изтривате само папката, адресите ще бъдат преместени в родителската "
 "папка."
 
-#: src/addressbook.c:1674 src/folderview.c:2351
+#: src/addressbook.c:1678 src/folderview.c:2351
 msgid "Delete folder"
 msgstr "Изтриване на папка"
 
-#: src/addressbook.c:1674
+#: src/addressbook.c:1678
 #, fuzzy
 msgid "_Folder only"
 msgstr "Само папка"
 
-#: src/addressbook.c:1674
+#: src/addressbook.c:1678
 #, fuzzy
 msgid "Folder and _addresses"
 msgstr "Папка и Адреси"
 
-#: src/addressbook.c:1679
+#: src/addressbook.c:1683
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Желаете ли изтриване на `%s' ?"
 
-#: src/addressbook.c:2365 src/addressbook.c:2498
+#: src/addressbook.c:2369 src/addressbook.c:2502
 msgid "New user, could not save index file."
 msgstr "Нов потребител, не можа да ce запази индексния файл."
 
-#: src/addressbook.c:2369 src/addressbook.c:2502
+#: src/addressbook.c:2373 src/addressbook.c:2506
 msgid "New user, could not save address book files."
 msgstr "Нов потребител, не можа да се запази файла на адресната книга"
 
-#: src/addressbook.c:2379 src/addressbook.c:2512
+#: src/addressbook.c:2383 src/addressbook.c:2516
 msgid "Old address book converted successfully."
 msgstr "Старата адресна книга конвертирана успешно"
 
-#: src/addressbook.c:2384
+#: src/addressbook.c:2388
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1081,7 +1081,7 @@ msgstr ""
 "Старата адресна книга конвертирана,\n"
 "не може да се запази новия индексен файл"
 
-#: src/addressbook.c:2397
+#: src/addressbook.c:2401
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1089,7 +1089,7 @@ msgstr ""
 "Неуспя конвертирането на адресната книга,\n"
 "създадени са нови празни файлове на адресната книга."
 
-#: src/addressbook.c:2403
+#: src/addressbook.c:2407
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1097,7 +1097,7 @@ msgstr ""
 "Неуспя конвертирането на адресната книга\n"
 "и създаване на нови файлове на адресната книга."
 
-#: src/addressbook.c:2408
+#: src/addressbook.c:2412
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1105,91 +1105,91 @@ msgstr ""
 "Неуспя конвертирането на адресната книга\n"
 "и създаване на нови файлове на адресната книга."
 
-#: src/addressbook.c:2415
+#: src/addressbook.c:2419
 msgid "Addressbook conversion error"
 msgstr "Грешка при конвертиране на адресната книга"
 
-#: src/addressbook.c:2419
+#: src/addressbook.c:2423
 msgid "Addressbook conversion"
 msgstr "Конвертиране на адресната книга"
 
-#: src/addressbook.c:2454
+#: src/addressbook.c:2458
 msgid "Addressbook Error"
 msgstr "Грешка на адресната книга"
 
-#: src/addressbook.c:2455 src/addressbook.c:2555
+#: src/addressbook.c:2459 src/addressbook.c:2559
 msgid "Could not read address index"
 msgstr "Не може да се прочете адресния индекс"
 
-#: src/addressbook.c:2517
+#: src/addressbook.c:2521
 msgid "Old address book converted, could not save new address index file"
 msgstr ""
 "Старата адресна книга конвертирана, не може да се запази новия индексен файл"
 
-#: src/addressbook.c:2531
+#: src/addressbook.c:2535
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr ""
 "Неуспя конвертирането на адресната книга, създадени са нови празни файлове "
 "на адресната книга."
 
-#: src/addressbook.c:2537
+#: src/addressbook.c:2541
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr ""
 "Неуспя конвертирането на адресната книга, неуспя създаване на нови файлове "
 "на адресната книга."
 
-#: src/addressbook.c:2543
+#: src/addressbook.c:2547
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr ""
 "Неуспя конвертирането на адресната книга и създаване на нови файлове на "
 "адресната книга."
 
-#: src/addressbook.c:2561
+#: src/addressbook.c:2565
 msgid "Addressbook Conversion Error"
 msgstr "Грешка при конвертиране на адресната книга"
 
-#: src/addressbook.c:2567
+#: src/addressbook.c:2571
 msgid "Addressbook Conversion"
 msgstr "Конвертиране на адресната книга"
 
-#: src/addressbook.c:3072 src/prefs_common_dialog.c:2033
+#: src/addressbook.c:3086 src/prefs_common_dialog.c:2033
 msgid "Interface"
 msgstr "Интерфейс"
 
-#: src/addressbook.c:3088 src/importldif.c:514
+#: src/addressbook.c:3102 src/importldif.c:514
 msgid "Address Book"
 msgstr "Адресна книга"
 
-#: src/addressbook.c:3104
+#: src/addressbook.c:3118
 msgid "Person"
 msgstr "Лице"
 
-#: src/addressbook.c:3120
+#: src/addressbook.c:3134
 msgid "EMail Address"
 msgstr "EMail Адрес"
 
-#: src/addressbook.c:3136
+#: src/addressbook.c:3150
 msgid "Group"
 msgstr "Група"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3152 src/folderview.c:367 src/prefs_account_dialog.c:1694
+#: src/addressbook.c:3166 src/folderview.c:367 src/prefs_account_dialog.c:1694
 #: src/query_search.c:370
 msgid "Folder"
 msgstr "Папка"
 
-#: src/addressbook.c:3168
+#: src/addressbook.c:3182
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3184 src/addressbook.c:3200
+#: src/addressbook.c:3198 src/addressbook.c:3214
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3216
+#: src/addressbook.c:3230
 msgid "LDAP Server"
 msgstr "LDAP сървър"
 
@@ -1201,7 +1201,7 @@ msgstr "Публичен адрес"
 msgid "Personal address"
 msgstr "Личен адрес"
 
-#: src/alertpanel.c:141 src/compose.c:5485 src/main.c:573
+#: src/alertpanel.c:141 src/compose.c:5494 src/main.c:573
 msgid "Notice"
 msgstr "Забележка"
 
@@ -1252,7 +1252,7 @@ msgstr "Кафяв"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4593
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4750
 msgid "None"
 msgstr "Никой"
 
@@ -1314,7 +1314,7 @@ msgstr "/_Редактиране/_Отмяна"
 msgid "/_Edit/_Redo"
 msgstr "/_Редактиране/_Повтаряне"
 
-#: src/compose.c:537 src/compose.c:544 src/mainwindow.c:513
+#: src/compose.c:537 src/compose.c:544 src/mainwindow.c:516
 #: src/messageview.c:147
 msgid "/_Edit/---"
 msgstr "/_Редактиране/---"
@@ -1323,7 +1323,7 @@ msgstr "/_Редактиране/---"
 msgid "/_Edit/Cu_t"
 msgstr "/_Редактиране/_Отрязване"
 
-#: src/compose.c:539 src/mainwindow.c:510 src/messageview.c:145
+#: src/compose.c:539 src/mainwindow.c:513 src/messageview.c:145
 msgid "/_Edit/_Copy"
 msgstr "/_Редактиране/_Копиране"
 
@@ -1335,7 +1335,7 @@ msgstr "/_Редактиране/_Вмъкване"
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Редактиране/Вмъкване като _цитат"
 
-#: src/compose.c:543 src/mainwindow.c:511 src/messageview.c:146
+#: src/compose.c:543 src/mainwindow.c:514 src/messageview.c:146
 msgid "/_Edit/Select _all"
 msgstr "/_Редактиране/_Избиране на всички"
 
@@ -1352,8 +1352,8 @@ msgstr "/_Редактиране/П_ренасяне на всички дълг�
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Редактиране/_Копиране"
 
-#: src/compose.c:550 src/mainwindow.c:518 src/messageview.c:151
-#: src/summaryview.c:448
+#: src/compose.c:550 src/mainwindow.c:521 src/messageview.c:151
+#: src/summaryview.c:450
 msgid "/_View"
 msgstr "/_Изглед"
 
@@ -1374,9 +1374,9 @@ msgid "/_View/_Reply to"
 msgstr "/_Изглед/_Отговор до"
 
 #: src/compose.c:555 src/compose.c:557 src/compose.c:559 src/compose.c:561
-#: src/mainwindow.c:538 src/mainwindow.c:541 src/mainwindow.c:568
-#: src/mainwindow.c:592 src/mainwindow.c:687 src/mainwindow.c:691
-#: src/messageview.c:236
+#: src/mainwindow.c:541 src/mainwindow.c:544 src/mainwindow.c:571
+#: src/mainwindow.c:595 src/mainwindow.c:696 src/mainwindow.c:700
+#: src/messageview.c:241
 msgid "/_View/---"
 msgstr "/_Изглед/---"
 
@@ -1392,7 +1392,7 @@ msgstr "/_Изглед/_Линия"
 msgid "/_View/_Attachment"
 msgstr "/_Изглед/_Притурка"
 
-#: src/compose.c:567 src/mainwindow.c:599 src/messageview.c:158
+#: src/compose.c:567 src/mainwindow.c:602 src/messageview.c:158
 #, fuzzy
 msgid "/_View/Character _encoding"
 msgstr "/_Изглед/_Сортиране/Низходящо"
@@ -1402,241 +1402,252 @@ msgid "/_View/Character _encoding/_Automatic"
 msgstr ""
 
 #: src/compose.c:570 src/compose.c:576 src/compose.c:582 src/compose.c:586
-#: src/compose.c:592 src/compose.c:596 src/compose.c:602 src/compose.c:606
-#: src/compose.c:616 src/compose.c:620 src/compose.c:628 src/compose.c:632
-#: src/mainwindow.c:595 src/mainwindow.c:602 src/messageview.c:154
+#: src/compose.c:592 src/compose.c:596 src/compose.c:602 src/compose.c:608
+#: src/compose.c:612 src/compose.c:622 src/compose.c:626 src/compose.c:634
+#: src/compose.c:638 src/mainwindow.c:598 src/mainwindow.c:605
+#: src/messageview.c:154
 #, fuzzy
 msgid "/_View/Character _encoding/---"
 msgstr "/_Изглед/_Сортиране/Низходящо"
 
-#: src/compose.c:572 src/mainwindow.c:603 src/messageview.c:162
+#: src/compose.c:572 src/mainwindow.c:606 src/messageview.c:162
 #, fuzzy
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Изглед/_Кодиране/7bit ascii (US-ASC_II)"
 
-#: src/compose.c:574 src/mainwindow.c:605 src/messageview.c:165
+#: src/compose.c:574 src/mainwindow.c:608 src/messageview.c:165
 #, fuzzy
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Изглед/_Кодиране/Unicode (_UTF-8)"
 
-#: src/compose.c:578 src/mainwindow.c:609 src/messageview.c:168
+#: src/compose.c:578 src/mainwindow.c:612 src/messageview.c:168
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Изглед/_Кодиране/Western European (ISO-8859-_1)"
 
-#: src/compose.c:580 src/mainwindow.c:611 src/messageview.c:170
+#: src/compose.c:580 src/mainwindow.c:614 src/messageview.c:170
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Изглед/_Кодиране/Western European (ISO-8859-15)"
 
-#: src/compose.c:584 src/mainwindow.c:617 src/messageview.c:175
+#: src/compose.c:584 src/mainwindow.c:620 src/messageview.c:175
 #, fuzzy
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Изглед/_Кодиране/Central European (ISO-8859-_2)"
 
-#: src/compose.c:588 src/mainwindow.c:621 src/messageview.c:178
+#: src/compose.c:588 src/mainwindow.c:624 src/messageview.c:178
 #, fuzzy
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Изглед/_Кодиране/_Baltic (ISO-8859-13)"
 
-#: src/compose.c:590 src/mainwindow.c:623 src/messageview.c:180
+#: src/compose.c:590 src/mainwindow.c:626 src/messageview.c:180
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Изглед/_Кодиране/Baltic (ISO-8859-_4)"
 
-#: src/compose.c:594 src/mainwindow.c:627 src/messageview.c:183
+#: src/compose.c:594 src/mainwindow.c:630 src/messageview.c:183
 #, fuzzy
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Изглед/_Кодиране/Greek (ISO-8859-_7)"
 
-#: src/compose.c:598 src/mainwindow.c:631 src/messageview.c:186
+#: src/compose.c:598 src/mainwindow.c:634 src/messageview.c:186
+#, fuzzy
+msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
+msgstr "/_Изглед/_Кодиране/Baltic (ISO-8859-_4)"
+
+#: src/compose.c:600 src/mainwindow.c:636 src/messageview.c:188
+#, fuzzy
+msgid "/_View/Character _encoding/Arabic (Windows-1256)"
+msgstr "/_Изглед/_Кодиране/Cyrillic (Windows-1251)"
+
+#: src/compose.c:604 src/mainwindow.c:640 src/messageview.c:191
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Изглед/_Кодиране/Greek (ISO-8859-_7)"
 
-#: src/compose.c:600 src/mainwindow.c:633 src/messageview.c:188
+#: src/compose.c:606 src/mainwindow.c:642 src/messageview.c:193
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Изглед/_Кодиране/Cyrillic (Windows-1251)"
 
-#: src/compose.c:604 src/mainwindow.c:637 src/messageview.c:191
+#: src/compose.c:610 src/mainwindow.c:646 src/messageview.c:196
 #, fuzzy
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Изглед/_Кодиране/Turkish (ISO-8859-_9)"
 
-#: src/compose.c:608 src/mainwindow.c:641 src/messageview.c:194
+#: src/compose.c:614 src/mainwindow.c:650 src/messageview.c:199
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Изглед/_Кодиране/Cyrillic (ISO-8859-_5)"
 
-#: src/compose.c:610 src/mainwindow.c:643 src/messageview.c:196
+#: src/compose.c:616 src/mainwindow.c:652 src/messageview.c:201
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Изглед/_Кодиране/Cyrillic (KOI8-_R)"
 
-#: src/compose.c:612 src/mainwindow.c:645 src/messageview.c:198
+#: src/compose.c:618 src/mainwindow.c:654 src/messageview.c:203
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Изглед/_Кодиране/Cyrillic (KOI8-_R)"
 
-#: src/compose.c:614 src/mainwindow.c:647 src/messageview.c:200
+#: src/compose.c:620 src/mainwindow.c:656 src/messageview.c:205
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Изглед/_Кодиране/Cyrillic (Windows-1251)"
 
-#: src/compose.c:618 src/mainwindow.c:651 src/messageview.c:203
+#: src/compose.c:624 src/mainwindow.c:660 src/messageview.c:208
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Изглед/_Кодиране/Japanese (ISO-2022-_JP)"
 
-#: src/compose.c:622 src/mainwindow.c:661 src/messageview.c:212
+#: src/compose.c:628 src/mainwindow.c:670 src/messageview.c:217
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Изглед/_Кодиране/Simplified Chinese (_GB2312)"
 
-#: src/compose.c:624 src/mainwindow.c:663 src/messageview.c:214
+#: src/compose.c:630 src/mainwindow.c:672 src/messageview.c:219
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Изглед/_Кодиране/Simplified Chinese (_GB2312)"
 
-#: src/compose.c:626 src/mainwindow.c:665 src/messageview.c:216
+#: src/compose.c:632 src/mainwindow.c:674 src/messageview.c:221
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Изглед/_Кодиране/Traditional Chinese (_Big5)"
 
-#: src/compose.c:630 src/mainwindow.c:673 src/messageview.c:223
+#: src/compose.c:636 src/mainwindow.c:682 src/messageview.c:228
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Изглед/_Кодиране/Korean (EUC-_KR)"
 
-#: src/compose.c:634 src/mainwindow.c:679 src/messageview.c:228
+#: src/compose.c:640 src/mainwindow.c:688 src/messageview.c:233
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Изглед/_Кодиране/Thai (TIS-620)"
 
-#: src/compose.c:636 src/mainwindow.c:681 src/messageview.c:230
+#: src/compose.c:642 src/mainwindow.c:690 src/messageview.c:235
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Изглед/_Кодиране/Thai (Windows-874)"
 
-#: src/compose.c:640 src/mainwindow.c:739 src/messageview.c:260
+#: src/compose.c:646 src/mainwindow.c:750 src/messageview.c:265
 msgid "/_Tools/_Address book"
 msgstr "/_Инструменти/_Адресна книга"
 
-#: src/compose.c:641
+#: src/compose.c:647
 msgid "/_Tools/_Template"
 msgstr "/_Инструменти/_Шаблон"
 
-#: src/compose.c:642 src/mainwindow.c:762 src/messageview.c:275
+#: src/compose.c:648 src/mainwindow.c:773 src/messageview.c:280
 msgid "/_Tools/Actio_ns"
 msgstr "/_Инструменти/_Действия"
 
-#: src/compose.c:643 src/compose.c:647 src/compose.c:653 src/mainwindow.c:742
-#: src/mainwindow.c:756 src/mainwindow.c:761 src/mainwindow.c:763
-#: src/mainwindow.c:766 src/mainwindow.c:768 src/messageview.c:263
-#: src/messageview.c:274
+#: src/compose.c:649 src/compose.c:653 src/compose.c:659 src/mainwindow.c:753
+#: src/mainwindow.c:767 src/mainwindow.c:772 src/mainwindow.c:774
+#: src/mainwindow.c:777 src/mainwindow.c:779 src/messageview.c:268
+#: src/messageview.c:279
 msgid "/_Tools/---"
 msgstr "/_Инструменти/---"
 
-#: src/compose.c:644
+#: src/compose.c:650
 #, fuzzy
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/_Редактиране/Редактиране с _външен редактор"
 
-#: src/compose.c:648
+#: src/compose.c:654
 #, fuzzy
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Инструменти/_Действия"
 
-#: src/compose.c:649
+#: src/compose.c:655
 #, fuzzy
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/_Съобщение/_Криптиране"
 
-#: src/compose.c:654
+#: src/compose.c:660
 #, fuzzy
 msgid "/_Tools/_Check spell"
 msgstr "/_Инструменти/_Изпълнение"
 
-#: src/compose.c:655
+#: src/compose.c:661
 #, fuzzy
 msgid "/_Tools/_Set spell language"
 msgstr "/_Инструменти/_Шаблон"
 
-#: src/compose.c:899
+#: src/compose.c:908
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: файлът не съществува\n"
 
-#: src/compose.c:1003 src/compose.c:1074
+#: src/compose.c:1012 src/compose.c:1083
 msgid "Can't get text part\n"
 msgstr "Не може да се намери текстовата част\n"
 
-#: src/compose.c:1475
+#: src/compose.c:1484
 msgid "Quote mark format error."
 msgstr "Грешка в формата на цитат."
 
-#: src/compose.c:1487
+#: src/compose.c:1496
 msgid "Message reply/forward format error."
 msgstr "Грешка в reply/forward формата на съобщението."
 
-#: src/compose.c:1907
+#: src/compose.c:1916
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Файлът %s не съществува\n"
 
-#: src/compose.c:1911
+#: src/compose.c:1920
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Не може да се намери големината на %s\n"
 
-#: src/compose.c:1915
+#: src/compose.c:1924
 #, c-format
 msgid "File %s is empty."
 msgstr "Файлът %s е празен."
 
-#: src/compose.c:1919
+#: src/compose.c:1928
 #, c-format
 msgid "Can't read %s."
 msgstr "Не може да се прочете %s."
 
-#: src/compose.c:1952
+#: src/compose.c:1961
 #, c-format
 msgid "Message: %s"
 msgstr "Съобщение: %s"
 
-#: src/compose.c:2012 src/mimeview.c:565
+#: src/compose.c:2021 src/mimeview.c:565
 msgid "Can't get the part of multipart message."
 msgstr "Не може да се намери част от multipart съобщение."
 
-#: src/compose.c:2496 src/headerview.c:195 src/query_search.c:636
-#: src/summaryview.c:2107
+#: src/compose.c:2505 src/headerview.c:195 src/query_search.c:636
+#: src/summaryview.c:2124
 msgid "(No Subject)"
 msgstr "(Няма Тема)"
 
-#: src/compose.c:2499
+#: src/compose.c:2508
 #, fuzzy, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Съставяне на съобщение%s"
 
-#: src/compose.c:2612
+#: src/compose.c:2621
 msgid "Recipient is not specified."
 msgstr "Не е указан получател"
 
-#: src/compose.c:2620
+#: src/compose.c:2629
 #, fuzzy
 msgid "Empty subject"
 msgstr "Тема"
 
-#: src/compose.c:2621
+#: src/compose.c:2630
 msgid "Subject is empty. Send it anyway?"
 msgstr "Празна тема. Изпращане така?"
 
-#: src/compose.c:2680
+#: src/compose.c:2689
 msgid "can't get recipient list."
 msgstr "не може да се получи списък с получатели."
 
-#: src/compose.c:2700
+#: src/compose.c:2709
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1644,21 +1655,21 @@ msgstr ""
 "Не е указан акаунт за изпращане на пощата.\n"
 "Моля изберете пощенску акаунт преди изпращане."
 
-#: src/compose.c:2714 src/send_message.c:299
+#: src/compose.c:2723 src/send_message.c:299
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Възникна грешка при пращане на съобщението до %s."
 
-#: src/compose.c:2756
+#: src/compose.c:2765
 msgid "Can't save the message to outbox."
 msgstr "Не може да се запази съобщението в изходящата кутия."
 
-#: src/compose.c:2794
+#: src/compose.c:2803
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "Не можа да се намери бутон асоцииран с избрания `%s'."
 
-#: src/compose.c:2891
+#: src/compose.c:2900
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1669,12 +1680,12 @@ msgstr ""
 "%s към %s.\n"
 "Изпращане така?"
 
-#: src/compose.c:2897
+#: src/compose.c:2906
 #, fuzzy
 msgid "Code conversion error"
 msgstr "Грешка при конвертиране на адресната книга"
 
-#: src/compose.c:2970
+#: src/compose.c:2979
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1683,159 +1694,159 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:2974
+#: src/compose.c:2983
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3264
+#: src/compose.c:3273
 msgid "can't remove the old message\n"
 msgstr "не може да се изтрие старото съобщение\n"
 
-#: src/compose.c:3282
+#: src/compose.c:3291
 msgid "queueing message...\n"
 msgstr "нареждане на съобщението на опашката...\n"
 
-#: src/compose.c:3364
+#: src/compose.c:3373
 msgid "can't find queue folder\n"
 msgstr "не може да се намери папката за опашка\n"
 
-#: src/compose.c:3371
+#: src/compose.c:3380
 msgid "can't queue the message\n"
 msgstr "не може да се нареди съобщението на опашката\n"
 
-#: src/compose.c:3964
+#: src/compose.c:3973
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "генерирано Message-ID: %s\n"
 
-#: src/compose.c:4077
+#: src/compose.c:4086
 msgid "Creating compose window...\n"
 msgstr "Създаване на прозорец за съставяне...\n"
 
-#: src/compose.c:4128 src/headerview.c:54
+#: src/compose.c:4137 src/headerview.c:54
 msgid "From:"
 msgstr "От:"
 
-#: src/compose.c:4202
+#: src/compose.c:4211
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/_Инструменти/_Действия"
 
-#: src/compose.c:4205
+#: src/compose.c:4214
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/_Съобщение/_Криптиране"
 
-#: src/compose.c:4243 src/compose.c:5317
+#: src/compose.c:4252 src/compose.c:5326
 msgid "MIME type"
 msgstr "MIME тип"
 
 #. S_COL_DATE
-#: src/compose.c:4252 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4740
+#: src/compose.c:4261 src/mimeview.c:197 src/prefs_filter_edit.c:496
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4897
 msgid "Size"
 msgstr "Размер"
 
-#: src/compose.c:4683 src/mainwindow.c:2324 src/prefs_account_dialog.c:528
+#: src/compose.c:4692 src/mainwindow.c:2335 src/prefs_account_dialog.c:528
 #: src/prefs_common_dialog.c:661
 msgid "Send"
 msgstr "Изпращане"
 
-#: src/compose.c:4684
+#: src/compose.c:4693
 msgid "Send message"
 msgstr "Изпращане на съобщение"
 
-#: src/compose.c:4692
+#: src/compose.c:4701
 msgid "Send later"
 msgstr "Изпращане по-късно"
 
-#: src/compose.c:4693
+#: src/compose.c:4702
 msgid "Put into queue folder and send later"
 msgstr "Поставяне в папката за опашка и изпращане по-късно"
 
-#: src/compose.c:4701
+#: src/compose.c:4710
 msgid "Draft"
 msgstr "Чернови"
 
-#: src/compose.c:4702
+#: src/compose.c:4711
 msgid "Save to draft folder"
 msgstr "Запазване в папката с чернови"
 
-#: src/compose.c:4712
+#: src/compose.c:4721
 msgid "Insert"
 msgstr "Вмъкване"
 
-#: src/compose.c:4713
+#: src/compose.c:4722
 msgid "Insert file"
 msgstr "Вмъкване на файл"
 
-#: src/compose.c:4721
+#: src/compose.c:4730
 msgid "Attach"
 msgstr "Прикрепване"
 
-#: src/compose.c:4722
+#: src/compose.c:4731
 msgid "Attach file"
 msgstr "Прикрепване на файл"
 
 #. signature
-#: src/compose.c:4732 src/prefs_account_dialog.c:1208
+#: src/compose.c:4741 src/prefs_account_dialog.c:1208
 #: src/prefs_common_dialog.c:953
 msgid "Signature"
 msgstr "Сигнатура"
 
-#: src/compose.c:4733
+#: src/compose.c:4742
 #, fuzzy
 msgid "Append signature"
 msgstr "НЕВАЛИДЕН подпис"
 
 #. editor
-#: src/compose.c:4742 src/prefs_common_dialog.c:991
+#: src/compose.c:4751 src/prefs_common_dialog.c:991
 #: src/prefs_common_dialog.c:2315
 msgid "Editor"
 msgstr "Редактор"
 
-#: src/compose.c:4743
+#: src/compose.c:4752
 msgid "Edit with external editor"
 msgstr "Редакция с външен редактор"
 
-#: src/compose.c:4751
+#: src/compose.c:4760
 msgid "Linewrap"
 msgstr "Свиванен на редовете"
 
-#: src/compose.c:4752
+#: src/compose.c:4761
 msgid "Wrap all long lines"
 msgstr "Свиване на всички дълги редове"
 
-#: src/compose.c:5213
+#: src/compose.c:5222
 msgid "Invalid MIME type."
 msgstr "Невалиден MIME тип"
 
-#: src/compose.c:5231
+#: src/compose.c:5240
 msgid "File doesn't exist or is empty."
 msgstr "Файлът не съществува или е празен"
 
-#: src/compose.c:5299
+#: src/compose.c:5308
 msgid "Properties"
 msgstr "Аксесоари"
 
-#: src/compose.c:5319 src/prefs_common_dialog.c:1444
+#: src/compose.c:5328 src/prefs_common_dialog.c:1444
 msgid "Encoding"
 msgstr "Кодиране"
 
-#: src/compose.c:5342 src/prefs_folder_item.c:202
+#: src/compose.c:5351 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Път"
 
-#: src/compose.c:5343
+#: src/compose.c:5352
 msgid "File name"
 msgstr "Име на файл"
 
-#: src/compose.c:5436
+#: src/compose.c:5445
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Командния ред за външен редактор е невалиден: `%s'\n"
 
-#: src/compose.c:5482
+#: src/compose.c:5491
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1845,48 +1856,48 @@ msgstr ""
 "Желаете ли принудително прекратяване на процеса?\n"
 "process group id: %d"
 
-#: src/compose.c:5857 src/compose.c:5862 src/compose.c:5868
+#: src/compose.c:5866 src/compose.c:5871 src/compose.c:5877
 msgid "Can't queue the message."
 msgstr "Не може да се нареди съобщението на опашката."
 
-#: src/compose.c:5959
+#: src/compose.c:5968
 #, fuzzy
 msgid "Select files"
 msgstr "Избор на файл"
 
-#: src/compose.c:5982
+#: src/compose.c:5991
 msgid "Select file"
 msgstr "Избор на файл"
 
-#: src/compose.c:6017
+#: src/compose.c:6026
 #, fuzzy
 msgid "Save message"
 msgstr "Изпращане на съобщение"
 
-#: src/compose.c:6018
+#: src/compose.c:6027
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Съобщението беше променено. Изоставяне?"
 
-#: src/compose.c:6020
+#: src/compose.c:6029
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:6062
+#: src/compose.c:6071
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Желаете ли да приложите шаблонът `%s' ?"
 
-#: src/compose.c:6064
+#: src/compose.c:6073
 msgid "Apply template"
 msgstr "Прилагане на шаблон"
 
-#: src/compose.c:6065
+#: src/compose.c:6074
 #, fuzzy
 msgid "_Replace"
 msgstr "Заменяне"
 
-#: src/compose.c:6065
+#: src/compose.c:6074
 #, fuzzy
 msgid "_Insert"
 msgstr "Вмъкване"
@@ -2327,7 +2338,7 @@ msgstr "Нови"
 
 #. S_COL_MARK
 #: src/folderview.c:412 src/prefs_filter_edit.c:500
-#: src/prefs_summary_column.c:71 src/summaryview.c:509
+#: src/prefs_summary_column.c:71 src/summaryview.c:511
 msgid "Unread"
 msgstr "Непрочетени"
 
@@ -2343,12 +2354,12 @@ msgstr "Установяване информация за папка...\n"
 msgid "Setting folder info..."
 msgstr "Установяване информация за папка..."
 
-#: src/folderview.c:858 src/mainwindow.c:3464 src/setup.c:80
+#: src/folderview.c:858 src/mainwindow.c:3481 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Сканиране на папка %s%c%s ..."
 
-#: src/folderview.c:862 src/mainwindow.c:3469 src/setup.c:85
+#: src/folderview.c:862 src/mainwindow.c:3486 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Сканиране на папка %s ..."
@@ -2373,7 +2384,7 @@ msgstr "Възобновяване на дървото на папката пр�
 msgid "Checking for new messages in all folders..."
 msgstr "Проверяване за нови съобщения във всички папки..."
 
-#: src/folderview.c:1200 src/mainwindow.c:2400 src/prefs_common_dialog.c:1789
+#: src/folderview.c:1200 src/mainwindow.c:2411 src/prefs_common_dialog.c:1789
 msgid "Junk"
 msgstr ""
 
@@ -2512,7 +2523,7 @@ msgstr "Тема:"
 msgid "Creating header view...\n"
 msgstr "Създаване изглед на заглавните блокове...\n"
 
-#: src/headerview.c:180 src/query_search.c:637 src/summaryview.c:2110
+#: src/headerview.c:180 src/query_search.c:637 src/summaryview.c:2127
 msgid "(No From)"
 msgstr "(Няма От)"
 
@@ -2621,7 +2632,7 @@ msgstr "Внасяне на LDIF файл в Адресната книга"
 msgid "Prev"
 msgstr "Предишен"
 
-#: src/importldif.c:768 src/mainwindow.c:2420
+#: src/importldif.c:768 src/mainwindow.c:2431
 msgid "Next"
 msgstr "Следващ"
 
@@ -2968,676 +2979,681 @@ msgstr ""
 msgid "another Sylpheed is already running.\n"
 msgstr "друг Sylpheed е стартиран вече.\n"
 
-#: src/main.c:1064
+#: src/main.c:1083
 #, fuzzy
 msgid "Migration of configuration"
 msgstr "Конфигурация на действия"
 
-#: src/main.c:1065
+#: src/main.c:1084
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
 msgstr ""
 
-#: src/mainwindow.c:478
+#: src/mainwindow.c:481
 msgid "/_File/_Folder"
 msgstr "/_Файл/_Папка"
 
-#: src/mainwindow.c:479
+#: src/mainwindow.c:482
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/_Файл/_Папка/Създаване на _нова папка"
 
-#: src/mainwindow.c:481
+#: src/mainwindow.c:484
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/_Файл/_Папка/П_реименуване на папка..."
 
-#: src/mainwindow.c:482
+#: src/mainwindow.c:485
 #, fuzzy
 msgid "/_File/_Folder/_Move folder..."
 msgstr "/_Файл/_Папка/П_реименуване на папка..."
 
-#: src/mainwindow.c:483
+#: src/mainwindow.c:486
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/_Файл/_Папка/_Изтриване на папка"
 
-#: src/mainwindow.c:484
+#: src/mainwindow.c:487
 #, fuzzy
 msgid "/_File/_Mailbox"
 msgstr "/_Файл/_Добаване на пощенска кутия..."
 
-#: src/mainwindow.c:485
+#: src/mainwindow.c:488
 #, fuzzy
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/_Файл/_Добаване на пощенска кутия..."
 
-#: src/mainwindow.c:486
+#: src/mainwindow.c:489
 #, fuzzy
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/П_ремахване на пощенска кутия"
 
-#: src/mainwindow.c:487 src/mainwindow.c:492
+#: src/mainwindow.c:490 src/mainwindow.c:495
 #, fuzzy
 msgid "/_File/_Mailbox/---"
 msgstr "/_Файл/_Папка/---"
 
-#: src/mainwindow.c:488
+#: src/mainwindow.c:491
 #, fuzzy
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "/_Проверка за нови съобщения"
 
-#: src/mainwindow.c:490
+#: src/mainwindow.c:493
 #, fuzzy
 msgid "/_File/_Mailbox/Check for new messages in _all mailboxes"
 msgstr "/_Файл/_Папка/_Проверка за нови съобщения във всички папки"
 
-#: src/mainwindow.c:493
+#: src/mainwindow.c:496
 #, fuzzy
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "/_Възобновяване дървото на папката"
 
-#: src/mainwindow.c:496
+#: src/mainwindow.c:499
 msgid "/_File/_Import mbox file..."
 msgstr "/_Файл/_Внасяне на mbox файл..."
 
-#: src/mainwindow.c:497
+#: src/mainwindow.c:500
 msgid "/_File/_Export to mbox file..."
 msgstr "/_Файл/_Изнасяне на mbox файл..."
 
-#: src/mainwindow.c:499
+#: src/mainwindow.c:502
 #, fuzzy
 msgid "/_File/Empty all _trash"
 msgstr "/_Файл/Изпразване на _кошчето"
 
-#: src/mainwindow.c:501 src/messageview.c:139
+#: src/mainwindow.c:504 src/messageview.c:139
 msgid "/_File/_Save as..."
 msgstr "/_Файл/З_апазване в..."
 
-#: src/mainwindow.c:502 src/messageview.c:140
+#: src/mainwindow.c:505 src/messageview.c:140
 msgid "/_File/_Print..."
 msgstr "/_Файл/Пе_чат..."
 
-#: src/mainwindow.c:504
+#: src/mainwindow.c:507
 msgid "/_File/_Work offline"
 msgstr "/_Файл/_Работа без мрежа"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:507
+#: src/mainwindow.c:510
 msgid "/_File/E_xit"
 msgstr "/_Файл/Из_ход"
 
-#: src/mainwindow.c:512
+#: src/mainwindow.c:515
 msgid "/_Edit/Select _thread"
 msgstr "/_Редактиране/Избор по _тема"
 
-#: src/mainwindow.c:514 src/messageview.c:148
+#: src/mainwindow.c:517 src/messageview.c:148
 msgid "/_Edit/_Find in current message..."
 msgstr "/_Редактиране/_Търсене в текущото съобщение..."
 
-#: src/mainwindow.c:516
+#: src/mainwindow.c:519
 msgid "/_Edit/_Search messages..."
 msgstr "/_Редактиране/Търсене в _съобщенията..."
 
-#: src/mainwindow.c:519
+#: src/mainwindow.c:522
 msgid "/_View/Show or hi_de"
 msgstr "/_Изглед/Показване или _скриване"
 
-#: src/mainwindow.c:520
+#: src/mainwindow.c:523
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/_Изглед/Показване или _скриване/_Дърво на папките"
 
-#: src/mainwindow.c:522
+#: src/mainwindow.c:525
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/_Изглед/Показване или _скриване/_Изглед на съобщенията"
 
-#: src/mainwindow.c:524
+#: src/mainwindow.c:527
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/_Изглед/Показване или _скриване/_Лента"
 
-#: src/mainwindow.c:526
+#: src/mainwindow.c:529
 msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/_Изглед/Показване или _скриване/_Лента/Икони и _текст"
 
-#: src/mainwindow.c:528
+#: src/mainwindow.c:531
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/_Изглед/Показване или _скриване/_Лента/_Икони"
 
-#: src/mainwindow.c:530
+#: src/mainwindow.c:533
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/_Изглед/Показване или _скриване/_Лента/Т_екст"
 
-#: src/mainwindow.c:532
+#: src/mainwindow.c:535
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/_Изглед/Показване или _скриване/_Лента/_Без показване"
 
-#: src/mainwindow.c:534
+#: src/mainwindow.c:537
 #, fuzzy
 msgid "/_View/Show or hi_de/_Search bar"
 msgstr "/_Изглед/Показване или _скриване/Лента на _състоянието"
 
-#: src/mainwindow.c:536
+#: src/mainwindow.c:539
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/_Изглед/Показване или _скриване/Лента на _състоянието"
 
-#: src/mainwindow.c:539
+#: src/mainwindow.c:542
 msgid "/_View/Separate f_older tree"
 msgstr "/_Изглед/_Отделно дърво на папките"
 
-#: src/mainwindow.c:540
+#: src/mainwindow.c:543
 #, fuzzy
 msgid "/_View/Separate _message view"
 msgstr "/_Изглед/Отделен изглед на съобщенията"
 
-#: src/mainwindow.c:542
+#: src/mainwindow.c:545
 msgid "/_View/_Sort"
 msgstr "/_Изглед/_Сортиране"
 
-#: src/mainwindow.c:543
+#: src/mainwindow.c:546
 msgid "/_View/_Sort/by _number"
 msgstr "/_Изглед/_Сортиране/по _номер"
 
-#: src/mainwindow.c:544
+#: src/mainwindow.c:547
 msgid "/_View/_Sort/by s_ize"
 msgstr "/_Изглед/_Сортиране/по _размер"
 
-#: src/mainwindow.c:545
+#: src/mainwindow.c:548
 msgid "/_View/_Sort/by _date"
 msgstr "/_Изглед/_Сортиране/по _дата"
 
-#: src/mainwindow.c:546
+#: src/mainwindow.c:549
 #, fuzzy
 msgid "/_View/_Sort/by t_hread date"
 msgstr "/_Изглед/_Сортиране/по _дата"
 
-#: src/mainwindow.c:547
+#: src/mainwindow.c:550
 msgid "/_View/_Sort/by _from"
 msgstr "/_Изглед/_Сортиране/по _подател"
 
-#: src/mainwindow.c:548
+#: src/mainwindow.c:551
 msgid "/_View/_Sort/by _recipient"
 msgstr "/_Изглед/_Сортиране/по п_олучател"
 
-#: src/mainwindow.c:549
+#: src/mainwindow.c:552
 msgid "/_View/_Sort/by _subject"
 msgstr "/_Изглед/_Сортиране/по _тема"
 
-#: src/mainwindow.c:550
+#: src/mainwindow.c:553
 msgid "/_View/_Sort/by _color label"
 msgstr "/_Изглед/_Сортиране/по _цвят"
 
-#: src/mainwindow.c:552
+#: src/mainwindow.c:555
 msgid "/_View/_Sort/by _mark"
 msgstr "/_Изглед/_Сортиране/по _отбелязване"
 
-#: src/mainwindow.c:553
+#: src/mainwindow.c:556
 msgid "/_View/_Sort/by _unread"
 msgstr "/_Изглед/_Сортиране/по _непрочетени"
 
-#: src/mainwindow.c:554
+#: src/mainwindow.c:557
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/_Изглед/_Сортиране/по _притурка"
 
-#: src/mainwindow.c:556
+#: src/mainwindow.c:559
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/_Изглед/_Сортиране/_Без сортиране"
 
-#: src/mainwindow.c:557 src/mainwindow.c:560
+#: src/mainwindow.c:560 src/mainwindow.c:563
 msgid "/_View/_Sort/---"
 msgstr "/_Изглед/_Сортиране/---"
 
-#: src/mainwindow.c:558
+#: src/mainwindow.c:561
 msgid "/_View/_Sort/Ascending"
 msgstr "/_Изглед/_Сортиране/Възходящо"
 
-#: src/mainwindow.c:559
+#: src/mainwindow.c:562
 msgid "/_View/_Sort/Descending"
 msgstr "/_Изглед/_Сортиране/Низходящо"
 
-#: src/mainwindow.c:561
+#: src/mainwindow.c:564
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/_Изглед/_Сортиране/_Привличане по тема"
 
-#: src/mainwindow.c:563
+#: src/mainwindow.c:566
 msgid "/_View/Th_read view"
 msgstr "/_Изглед/_Нишков изглед"
 
-#: src/mainwindow.c:564
+#: src/mainwindow.c:567
 msgid "/_View/E_xpand all threads"
 msgstr "/_Изглед/_Развиване на всички нишки"
 
-#: src/mainwindow.c:565
+#: src/mainwindow.c:568
 msgid "/_View/Co_llapse all threads"
 msgstr "/_Изглед/_Свиване на всички нишки"
 
-#: src/mainwindow.c:566
+#: src/mainwindow.c:569
 msgid "/_View/Set display _item..."
 msgstr "/_Изглед/Атрибути на извадката"
 
-#: src/mainwindow.c:569
+#: src/mainwindow.c:572
 msgid "/_View/_Go to"
 msgstr "/_Изглед/П_реход до"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:573
 msgid "/_View/_Go to/_Prev message"
 msgstr "/_Изглед/П_реход до/_Предишно съобщение"
 
-#: src/mainwindow.c:571
+#: src/mainwindow.c:574
 msgid "/_View/_Go to/_Next message"
 msgstr "/_Изглед/П_реход до/_Следващо съобщение"
 
-#: src/mainwindow.c:572 src/mainwindow.c:577 src/mainwindow.c:580
-#: src/mainwindow.c:585 src/mainwindow.c:590
+#: src/mainwindow.c:575 src/mainwindow.c:580 src/mainwindow.c:583
+#: src/mainwindow.c:588 src/mainwindow.c:593
 msgid "/_View/_Go to/---"
 msgstr "/_Изглед/П_реход до/---"
 
-#: src/mainwindow.c:573
+#: src/mainwindow.c:576
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/_Изглед/П_реход до/П_редишно непрочетено съобщение"
 
-#: src/mainwindow.c:575
+#: src/mainwindow.c:578
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/_Изглед/П_реход до/С_ледващо непрочетено съобщение"
 
-#: src/mainwindow.c:578
+#: src/mainwindow.c:581
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/_Изглед/П_реход до/Предишно _ново съобщение"
 
-#: src/mainwindow.c:579
+#: src/mainwindow.c:582
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/_Изглед/П_реход до/Следващо н_ово съобщение"
 
-#: src/mainwindow.c:581
+#: src/mainwindow.c:584
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/_Изглед/П_реход до/Предишно _маркирано съобщение"
 
-#: src/mainwindow.c:583
+#: src/mainwindow.c:586
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/_Изглед/П_реход до/Следващо м_аркирано съобщение"
 
-#: src/mainwindow.c:586
+#: src/mainwindow.c:589
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/_Изглед/П_реход до/Предишно _оцветено съобщение"
 
-#: src/mainwindow.c:588
+#: src/mainwindow.c:591
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/_Изглед/П_реход до/Следващо о_цветено съобщение"
 
-#: src/mainwindow.c:591
+#: src/mainwindow.c:594
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Изглед/П_реход до/_Друга папка"
 
-#: src/mainwindow.c:600 src/messageview.c:159
+#: src/mainwindow.c:603 src/messageview.c:159
 #, fuzzy
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Изглед/_Кодиране/_Автоматично разпознаване"
 
-#: src/mainwindow.c:613 src/messageview.c:172
+#: src/mainwindow.c:616 src/messageview.c:172
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr "/_Изглед/_Кодиране/Western European (ISO-8859-15)"
 
-#: src/mainwindow.c:653 src/messageview.c:205
+#: src/mainwindow.c:662 src/messageview.c:210
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Изглед/_Кодиране/Japanese (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:655 src/messageview.c:207
+#: src/mainwindow.c:664 src/messageview.c:212
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Изглед/_Кодиране/Japanese (_EUC-JP)"
 
-#: src/mainwindow.c:657 src/messageview.c:209
+#: src/mainwindow.c:666 src/messageview.c:214
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Изглед/_Кодиране/Japanese (_Shift__JIS)"
 
-#: src/mainwindow.c:667 src/messageview.c:218
+#: src/mainwindow.c:676 src/messageview.c:223
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Изглед/_Кодиране/Traditional Chinese (EUC-_TW)"
 
-#: src/mainwindow.c:669 src/messageview.c:220
+#: src/mainwindow.c:678 src/messageview.c:225
 #, fuzzy
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Изглед/_Кодиране/Chinese (ISO-2022-_CN)"
 
-#: src/mainwindow.c:675 src/messageview.c:225
+#: src/mainwindow.c:684 src/messageview.c:230
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Изглед/_Кодиране/Korean (ISO-2022-KR)"
 
-#: src/mainwindow.c:688 src/summaryview.c:449
+#: src/mainwindow.c:697 src/summaryview.c:451
 msgid "/_View/Open in new _window"
 msgstr "/_Изглед/Отваряне в _нов прозорец"
 
-#: src/mainwindow.c:689 src/messageview.c:237
+#: src/mainwindow.c:698 src/messageview.c:242
 msgid "/_View/Mess_age source"
 msgstr "/_Изглед/_Изходен код"
 
-#: src/mainwindow.c:690 src/messageview.c:238
+#: src/mainwindow.c:699 src/messageview.c:243
 msgid "/_View/Show all _header"
 msgstr "/_Изглед/_Показване на заглавните части(headers)"
 
-#: src/mainwindow.c:692
+#: src/mainwindow.c:701
 msgid "/_View/_Update summary"
 msgstr "/_Изглед/_Обновяване на извадката"
 
-#: src/mainwindow.c:694 src/messageview.c:240
+#: src/mainwindow.c:703 src/messageview.c:245
 msgid "/_Message"
 msgstr "/_Съобщение"
 
-#: src/mainwindow.c:695
+#: src/mainwindow.c:704
 #, fuzzy
 msgid "/_Message/Recei_ve"
 msgstr "/_Съобщение/_Редактиране"
 
-#: src/mainwindow.c:696
+#: src/mainwindow.c:705
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/_Съобщение/Получаване от _всички акаунти"
 
-#: src/mainwindow.c:698
+#: src/mainwindow.c:707
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/_Съобщение/Получаване от _всички акаунти"
 
-#: src/mainwindow.c:700
+#: src/mainwindow.c:709
 #, fuzzy
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/_Съобщение/_Отказ на получаване"
 
-#: src/mainwindow.c:702
+#: src/mainwindow.c:711
 #, fuzzy
 msgid "/_Message/Recei_ve/---"
 msgstr "/_Съобщение/---"
 
-#: src/mainwindow.c:703
+#: src/mainwindow.c:712
 msgid "/_Message/_Send queued messages"
 msgstr "/_Съобщение/_Изпращане на съобщенията в опашката"
 
-#: src/mainwindow.c:704 src/mainwindow.c:706 src/mainwindow.c:713
-#: src/mainwindow.c:718 src/mainwindow.c:721 src/mainwindow.c:730
-#: src/mainwindow.c:732 src/mainwindow.c:735 src/messageview.c:243
-#: src/messageview.c:251 src/messageview.c:256
+#: src/mainwindow.c:713 src/mainwindow.c:715 src/mainwindow.c:722
+#: src/mainwindow.c:727 src/mainwindow.c:730 src/mainwindow.c:741
+#: src/mainwindow.c:743 src/mainwindow.c:746 src/messageview.c:248
+#: src/messageview.c:256 src/messageview.c:261
 msgid "/_Message/---"
 msgstr "/_Съобщение/---"
 
-#: src/mainwindow.c:705 src/messageview.c:241
+#: src/mainwindow.c:714 src/messageview.c:246
 msgid "/_Message/Compose _new message"
 msgstr "/_Съобщение/_Съставяне на ново съобщение"
 
-#: src/mainwindow.c:707 src/messageview.c:244
+#: src/mainwindow.c:716 src/messageview.c:249
 msgid "/_Message/_Reply"
 msgstr "/_Съобщение/_Отговор"
 
-#: src/mainwindow.c:708
+#: src/mainwindow.c:717
 msgid "/_Message/Repl_y to"
 msgstr "/_Съобщение/Отговор _до"
 
-#: src/mainwindow.c:709 src/messageview.c:245
+#: src/mainwindow.c:718 src/messageview.c:250
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Съобщение/Отговор _до/_всички"
 
-#: src/mainwindow.c:710 src/messageview.c:247
+#: src/mainwindow.c:719 src/messageview.c:252
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Съобщение/Отговор _до/_подател"
 
-#: src/mainwindow.c:711 src/messageview.c:249
+#: src/mainwindow.c:720 src/messageview.c:254
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Съобщение/Отговор _до/_пощенски списък"
 
-#: src/mainwindow.c:714 src/messageview.c:252
+#: src/mainwindow.c:723 src/messageview.c:257
 msgid "/_Message/_Forward"
 msgstr "/_Съобщение/П_репращане"
 
-#: src/mainwindow.c:715 src/messageview.c:253
+#: src/mainwindow.c:724 src/messageview.c:258
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Съобщение/Пр_епращане като притурка"
 
-#: src/mainwindow.c:717 src/messageview.c:255
+#: src/mainwindow.c:726 src/messageview.c:260
 msgid "/_Message/Redirec_t"
 msgstr "/_Съобщение/_Пренасочване"
 
-#: src/mainwindow.c:719
+#: src/mainwindow.c:728
 msgid "/_Message/M_ove..."
 msgstr "/_Съобщение/_Преместване"
 
-#: src/mainwindow.c:720
+#: src/mainwindow.c:729
 msgid "/_Message/_Copy..."
 msgstr "/_Съобщение/_Копиране"
 
-#: src/mainwindow.c:722
+#: src/mainwindow.c:731
 msgid "/_Message/_Mark"
 msgstr "/_Съобщение/_Маркиране"
 
-#: src/mainwindow.c:723
+#: src/mainwindow.c:732
 msgid "/_Message/_Mark/_Mark"
 msgstr "/_Съобщение/_Маркиране/_Маркиране"
 
-#: src/mainwindow.c:724
+#: src/mainwindow.c:733
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/_Съобщение/_Маркиране/_Размаркиране"
 
-#: src/mainwindow.c:725
+#: src/mainwindow.c:734
 msgid "/_Message/_Mark/---"
 msgstr "/_Съобщение/_Маркиране/---"
 
-#: src/mainwindow.c:726
+#: src/mainwindow.c:735
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/_Съобщение/_Маркиране/като _непрочетено"
 
-#: src/mainwindow.c:727
+#: src/mainwindow.c:736
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/_Съобщение/_Маркиране/като _прочетено"
 
-#: src/mainwindow.c:729
+#: src/mainwindow.c:738
+#, fuzzy
+msgid "/_Message/_Mark/Mark _thread as read"
+msgstr "/_Съобщение/_Маркиране/като _прочетено"
+
+#: src/mainwindow.c:740
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/_Съобщение/_Маркиране/_всички като прочетени"
 
-#: src/mainwindow.c:731
+#: src/mainwindow.c:742
 msgid "/_Message/_Delete"
 msgstr "/_Съобщение/_Изтриване"
 
-#: src/mainwindow.c:733
+#: src/mainwindow.c:744
 #, fuzzy
 msgid "/_Message/Set as _junk mail"
 msgstr "/_Съобщение/_Получаване на нова поща"
 
-#: src/mainwindow.c:734
+#: src/mainwindow.c:745
 #, fuzzy
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/_Съобщение/_Получаване на нова поща"
 
-#: src/mainwindow.c:736 src/messageview.c:257
+#: src/mainwindow.c:747 src/messageview.c:262
 msgid "/_Message/Re-_edit"
 msgstr "/_Съобщение/_Редактиране"
 
-#: src/mainwindow.c:740
+#: src/mainwindow.c:751
 #, fuzzy
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/_Инструменти/_Добавяне на подател в адресната книга"
 
-#: src/mainwindow.c:743
+#: src/mainwindow.c:754
 #, fuzzy
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/_Инструменти/_Филтриране на съобщенията"
 
-#: src/mainwindow.c:745
+#: src/mainwindow.c:756
 #, fuzzy
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Инструменти/_Филтриране на съобщенията"
 
-#: src/mainwindow.c:747 src/messageview.c:264
+#: src/mainwindow.c:758 src/messageview.c:269
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Инструменти/_Създаване на правило за филтриране"
 
-#: src/mainwindow.c:748 src/messageview.c:266
+#: src/mainwindow.c:759 src/messageview.c:271
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Инструменти/_Създаване на правило за филтриране/_Автоматично"
 
-#: src/mainwindow.c:750 src/messageview.c:268
+#: src/mainwindow.c:761 src/messageview.c:273
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Инструменти/_Създаване на правило за филтриране/по _Подател"
 
-#: src/mainwindow.c:752 src/messageview.c:270
+#: src/mainwindow.c:763 src/messageview.c:275
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Инструменти/_Създаване на правило за филтриране/по П_олучател"
 
-#: src/mainwindow.c:754 src/messageview.c:272
+#: src/mainwindow.c:765 src/messageview.c:277
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Инструменти/_Създаване на правило за филтриране/по _Тема"
 
-#: src/mainwindow.c:757
+#: src/mainwindow.c:768
 #, fuzzy
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/_Инструменти/_Филтриране на съобщенията"
 
-#: src/mainwindow.c:759
+#: src/mainwindow.c:770
 #, fuzzy
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/_Инструменти/_Филтриране на съобщенията"
 
-#: src/mainwindow.c:764
+#: src/mainwindow.c:775
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/_Инструменти/И_зтриване на повтарящи се съобщения"
 
-#: src/mainwindow.c:767
+#: src/mainwindow.c:778
 msgid "/_Tools/E_xecute"
 msgstr "/_Инструменти/_Изпълнение"
 
-#: src/mainwindow.c:769
+#: src/mainwindow.c:780
 msgid "/_Tools/_Log window"
 msgstr "/_Инструменти/_Журнален прозорец"
 
-#: src/mainwindow.c:771
+#: src/mainwindow.c:782
 msgid "/_Configuration"
 msgstr "/_Конфигуриране"
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:783
 msgid "/_Configuration/_Common preferences..."
 msgstr "/_Конфигуриране/_Общи предпочитания"
 
-#: src/mainwindow.c:774
+#: src/mainwindow.c:785
 msgid "/_Configuration/_Filter setting..."
 msgstr "/_Конфигуриране/_Установяване на филтър"
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:787
 msgid "/_Configuration/_Template..."
 msgstr "/_Конфигуриране/_Шаблон"
 
-#: src/mainwindow.c:777
+#: src/mainwindow.c:788
 msgid "/_Configuration/_Actions..."
 msgstr "/_Конфигуриране/_Действия"
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:789
 msgid "/_Configuration/---"
 msgstr "/_Конфигуриране/---"
 
-#: src/mainwindow.c:779
+#: src/mainwindow.c:790
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Конфигуриране/_Предпочитания за текущия акаунт"
 
-#: src/mainwindow.c:781
+#: src/mainwindow.c:792
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Конфигуриране/_Създаване на нов акаунт"
 
-#: src/mainwindow.c:783
+#: src/mainwindow.c:794
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Конфигуриране/_Редактиране на акаунтите"
 
-#: src/mainwindow.c:785
+#: src/mainwindow.c:796
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Конфигуриране/С_мяна на текущия акаунт"
 
-#: src/mainwindow.c:789
+#: src/mainwindow.c:800
 msgid "/_Help/_Manual"
 msgstr "/_Помощ/_Наръчник"
 
-#: src/mainwindow.c:790
+#: src/mainwindow.c:801
 msgid "/_Help/_Manual/_English"
 msgstr "/_Помощ/_Наръчник/_Английски"
 
-#: src/mainwindow.c:791
+#: src/mainwindow.c:802
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/_Помощ/_Наръчник/_Японски"
 
-#: src/mainwindow.c:792
+#: src/mainwindow.c:803
 msgid "/_Help/_FAQ"
 msgstr "/_Помощ/_Чести въпроси"
 
-#: src/mainwindow.c:793
+#: src/mainwindow.c:804
 msgid "/_Help/_FAQ/_English"
 msgstr "/_Помощ/_Чести въпроси/_Английски"
 
-#: src/mainwindow.c:794
+#: src/mainwindow.c:805
 msgid "/_Help/_FAQ/_German"
 msgstr "/_Помощ/_Чести въпроси/_Немски"
 
-#: src/mainwindow.c:795
+#: src/mainwindow.c:806
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/_Помощ/_Чести въпроси/_Испански"
 
-#: src/mainwindow.c:796
+#: src/mainwindow.c:807
 msgid "/_Help/_FAQ/_French"
 msgstr "/_Помощ/_Чести въпроси/_Френски"
 
-#: src/mainwindow.c:797
+#: src/mainwindow.c:808
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/_Помощ/_Чести въпроси/_Италиански"
 
-#: src/mainwindow.c:798
+#: src/mainwindow.c:809
 msgid "/_Help/---"
 msgstr "/_Помощ/---"
 
-#: src/mainwindow.c:841
+#: src/mainwindow.c:852
 msgid "Creating main window...\n"
 msgstr "Създаване на главен прозорец...\n"
 
-#: src/mainwindow.c:1011
+#: src/mainwindow.c:1022
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr ""
 
-#: src/mainwindow.c:1108 src/summaryview.c:2258 src/summaryview.c:2343
-#: src/summaryview.c:3739 src/summaryview.c:3868 src/summaryview.c:4226
+#: src/mainwindow.c:1119 src/summaryview.c:2275 src/summaryview.c:2360
+#: src/summaryview.c:3896 src/summaryview.c:4025 src/summaryview.c:4383
 msgid "done.\n"
 msgstr "готово.\n"
 
-#: src/mainwindow.c:1235 src/mainwindow.c:1276 src/mainwindow.c:1301
+#: src/mainwindow.c:1246 src/mainwindow.c:1287 src/mainwindow.c:1312
 msgid "Untitled"
 msgstr "Неозаглавен"
 
-#: src/mainwindow.c:1302
+#: src/mainwindow.c:1313
 msgid "none"
 msgstr "липсва"
 
-#: src/mainwindow.c:1355
+#: src/mainwindow.c:1366
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "Промяна на разделението на прозореца от %d до %d\n"
 
-#: src/mainwindow.c:1605
+#: src/mainwindow.c:1616
 msgid "Offline"
 msgstr "Без достъп до мрежа"
 
-#: src/mainwindow.c:1606
+#: src/mainwindow.c:1617
 msgid "You are offline. Go online?"
 msgstr "Работите без достъп до мрежа. Желаете ли да включите мрежата?"
 
-#: src/mainwindow.c:1623
+#: src/mainwindow.c:1634
 #, fuzzy
 msgid "Empty all trash"
 msgstr "Изчистване на кошчето"
 
-#: src/mainwindow.c:1624
+#: src/mainwindow.c:1635
 #, fuzzy
 msgid "Delete all messages in trash folders?"
 msgstr "Желаете ли изчистване на кошчето?"
 
-#: src/mainwindow.c:1652
+#: src/mainwindow.c:1663
 msgid "Add mailbox"
 msgstr "Добавяне на пощенска кутия"
 
-#: src/mainwindow.c:1653
+#: src/mainwindow.c:1664
 #, fuzzy
 msgid ""
 "Specify the location of mailbox.\n"
@@ -3648,16 +3664,16 @@ msgstr ""
 "Ако е указана съществуваща кутия, тя ще бъде\n"
 "сканирана автоматично."
 
-#: src/mainwindow.c:1659 src/setup.c:49
+#: src/mainwindow.c:1670 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Вече съществува пощенска кутия `%s'."
 
-#: src/mainwindow.c:1664 src/setup.c:56
+#: src/mainwindow.c:1675 src/setup.c:56
 msgid "Mailbox"
 msgstr "Пощенска кутия"
 
-#: src/mainwindow.c:1670 src/setup.c:62
+#: src/mainwindow.c:1681 src/setup.c:62
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3666,149 +3682,149 @@ msgstr ""
 "Създаването на пощенска кутия се провали.\n"
 "Вече съществуват някакви файлове, или нямате права за запис."
 
-#: src/mainwindow.c:2088
+#: src/mainwindow.c:2099
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Изглед на папките"
 
-#: src/mainwindow.c:2107
+#: src/mainwindow.c:2118
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Изглед на съобщенията"
 
-#: src/mainwindow.c:2259 src/summaryview.c:408
+#: src/mainwindow.c:2270 src/summaryview.c:408
 msgid "/_Reply"
 msgstr "/_Отговор"
 
-#: src/mainwindow.c:2260
+#: src/mainwindow.c:2271
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "Отговаряне на всички"
 
-#: src/mainwindow.c:2261
+#: src/mainwindow.c:2272
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/Отговор _до/_подател"
 
-#: src/mainwindow.c:2262
+#: src/mainwindow.c:2273
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/Отговор _до/пощенски _списък"
 
-#: src/mainwindow.c:2267 src/summaryview.c:415
+#: src/mainwindow.c:2278 src/summaryview.c:415
 msgid "/_Forward"
 msgstr "/_Препращане"
 
-#: src/mainwindow.c:2268 src/summaryview.c:416
+#: src/mainwindow.c:2279 src/summaryview.c:416
 msgid "/For_ward as attachment"
 msgstr "/Пр_епращане като притурка"
 
-#: src/mainwindow.c:2269 src/summaryview.c:417
+#: src/mainwindow.c:2280 src/summaryview.c:417
 msgid "/Redirec_t"
 msgstr "/П_ренасочване"
 
-#: src/mainwindow.c:2305
+#: src/mainwindow.c:2316
 msgid "Get"
 msgstr "Получаване"
 
-#: src/mainwindow.c:2306
+#: src/mainwindow.c:2317
 msgid "Incorporate new mail"
 msgstr "Приемане на нова поща"
 
-#: src/mainwindow.c:2313
+#: src/mainwindow.c:2324
 msgid "Get all"
 msgstr "Получаване от всички"
 
-#: src/mainwindow.c:2314
+#: src/mainwindow.c:2325
 msgid "Incorporate new mail of all accounts"
 msgstr "Приемане на нова поща от всички акаунти"
 
-#: src/mainwindow.c:2325
+#: src/mainwindow.c:2336
 msgid "Send queued message(s)"
 msgstr "Изпращане на съобщенията в опашката"
 
-#: src/mainwindow.c:2335 src/prefs_account_dialog.c:530
+#: src/mainwindow.c:2346 src/prefs_account_dialog.c:530
 #: src/prefs_common_dialog.c:663 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "Съставяне"
 
-#: src/mainwindow.c:2336
+#: src/mainwindow.c:2347
 msgid "Compose new message"
 msgstr "Съставяне на ново съобщение"
 
-#: src/mainwindow.c:2344 src/prefs_common_dialog.c:975
+#: src/mainwindow.c:2355 src/prefs_common_dialog.c:975
 msgid "Reply"
 msgstr "Отговаряне"
 
-#: src/mainwindow.c:2345 src/mainwindow.c:2358
+#: src/mainwindow.c:2356 src/mainwindow.c:2369
 msgid "Reply to the message"
 msgstr "Отговаряне на съобщение"
 
-#: src/mainwindow.c:2362
+#: src/mainwindow.c:2373
 msgid "Reply all"
 msgstr "На всички"
 
-#: src/mainwindow.c:2363
+#: src/mainwindow.c:2374
 msgid "Reply to all"
 msgstr "Отговаряне на всички"
 
-#: src/mainwindow.c:2371 src/prefs_filter_edit.c:672
+#: src/mainwindow.c:2382 src/prefs_filter_edit.c:672
 msgid "Forward"
 msgstr "Препращане"
 
-#: src/mainwindow.c:2372 src/mainwindow.c:2385
+#: src/mainwindow.c:2383 src/mainwindow.c:2396
 msgid "Forward the message"
 msgstr "Препращане на съобщението"
 
-#: src/mainwindow.c:2392
+#: src/mainwindow.c:2403
 msgid "Delete the message"
 msgstr "Изтриване на съобщението"
 
-#: src/mainwindow.c:2401
+#: src/mainwindow.c:2412
 #, fuzzy
 msgid "Set as junk mail"
 msgstr "Установяване като подразбиращ се"
 
-#: src/mainwindow.c:2410
+#: src/mainwindow.c:2421
 msgid "Execute"
 msgstr "Изпълняване"
 
-#: src/mainwindow.c:2411
+#: src/mainwindow.c:2422
 msgid "Execute marked process"
 msgstr "Изпълняване на маркирания процес"
 
-#: src/mainwindow.c:2421
+#: src/mainwindow.c:2432
 msgid "Next unread message"
 msgstr "Следващо непрочетено съобщение"
 
-#: src/mainwindow.c:2433
+#: src/mainwindow.c:2444
 msgid "Prefs"
 msgstr "Предпочитания"
 
-#: src/mainwindow.c:2434
+#: src/mainwindow.c:2445
 msgid "Common preferences"
 msgstr "Общи предпочитания"
 
-#: src/mainwindow.c:2442 src/prefs_folder_item.c:289
+#: src/mainwindow.c:2453 src/prefs_folder_item.c:289
 #: src/prefs_folder_item.c:300 src/progressdialog.c:128
 msgid "Account"
 msgstr "Акаунт"
 
-#: src/mainwindow.c:2443
+#: src/mainwindow.c:2454
 msgid "Account setting"
 msgstr "Конфигуриране на акаунт"
 
-#: src/mainwindow.c:2615
+#: src/mainwindow.c:2626
 msgid "You are offline. Click the icon to go online."
 msgstr "Работите без достъп до мрежа. Щракнете иконата за да включите мрежата."
 
-#: src/mainwindow.c:2626
+#: src/mainwindow.c:2637
 msgid "You are online. Click the icon to go offline."
 msgstr "Работите с достъп до мрежа. Щракнете иконата за да изключите мрежата."
 
-#: src/mainwindow.c:2892
+#: src/mainwindow.c:2903
 msgid "Exit"
 msgstr "Изход"
 
-#: src/mainwindow.c:2892
+#: src/mainwindow.c:2903
 msgid "Exit this program?"
 msgstr "Желаете ли изход от програмата?"
 
@@ -3845,45 +3861,45 @@ msgstr "Достигнат е краят на съобщението; продъ
 msgid "Search finished"
 msgstr "Търсенето приключи"
 
-#: src/messageview.c:261
+#: src/messageview.c:266
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/_Инструменти/_Добавяне на подател в адресната книга"
 
-#: src/messageview.c:291
+#: src/messageview.c:296
 msgid "Creating message view...\n"
 msgstr "Създаване на изглед на съобщениято...\n"
 
-#: src/messageview.c:316
+#: src/messageview.c:321
 msgid "Text"
 msgstr "Текст"
 
-#: src/messageview.c:321
+#: src/messageview.c:326
 msgid "Attachments"
 msgstr "Притурки"
 
-#: src/messageview.c:371
+#: src/messageview.c:376
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:669 src/summaryview.c:3268
+#: src/messageview.c:674 src/summaryview.c:3425
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Не може да се запази файлът `%s'."
 
-#: src/messageview.c:728 src/summaryview.c:3291
+#: src/messageview.c:733 src/summaryview.c:3448
 msgid "The message will be printed with the following command:"
 msgstr ""
 
-#: src/messageview.c:729 src/summaryview.c:3292
+#: src/messageview.c:734 src/summaryview.c:3449
 #, fuzzy
 msgid "(Default print command)"
 msgstr "Изпълняване"
 
-#: src/messageview.c:731 src/prefs_common_dialog.c:2304 src/summaryview.c:3294
+#: src/messageview.c:736 src/prefs_common_dialog.c:2304 src/summaryview.c:3451
 msgid "Print"
 msgstr "Печат"
 
-#: src/messageview.c:740 src/summaryview.c:3303
+#: src/messageview.c:745 src/summaryview.c:3460
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -4793,8 +4809,8 @@ msgstr "Показване на получателя в `От' колоната,
 msgid "Expand threads"
 msgstr "Развиване на нишките..."
 
-#: src/prefs_common_dialog.c:1413 src/prefs_common_dialog.c:2713
-#: src/prefs_common_dialog.c:2751
+#: src/prefs_common_dialog.c:1413 src/prefs_common_dialog.c:2716
+#: src/prefs_common_dialog.c:2754
 msgid "Date format"
 msgstr "Формат на датата"
 
@@ -5095,8 +5111,8 @@ msgstr "Външни команди (%s ще бъде заменен с име �
 msgid "Web browser"
 msgstr "Уеб браузър"
 
-#: src/prefs_common_dialog.c:2288 src/prefs_common_dialog.c:3775
-#: src/prefs_common_dialog.c:3796
+#: src/prefs_common_dialog.c:2288 src/prefs_common_dialog.c:3778
+#: src/prefs_common_dialog.c:3799
 #, fuzzy
 msgid "(Default browser)"
 msgstr "Входяща кутия"
@@ -5172,216 +5188,226 @@ msgstr "Гръцки (ISO-8859-7)"
 
 #: src/prefs_common_dialog.c:2495
 #, fuzzy
+msgid "Arabic (ISO-8859-6)"
+msgstr "Балтийски (ISO-8859-4)"
+
+#: src/prefs_common_dialog.c:2496
+#, fuzzy
+msgid "Arabic (Windows-1256)"
+msgstr "Кирилица (Windows-1251)"
+
+#: src/prefs_common_dialog.c:2498
+#, fuzzy
 msgid "Hebrew (ISO-8859-8)"
 msgstr "Гръцки (ISO-8859-7)"
 
-#: src/prefs_common_dialog.c:2496
+#: src/prefs_common_dialog.c:2499
 #, fuzzy
 msgid "Hebrew (Windows-1255)"
 msgstr "Кирилица (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2498
+#: src/prefs_common_dialog.c:2501
 msgid "Turkish (ISO-8859-9)"
 msgstr "Турски (ISO-8859-9)"
 
-#: src/prefs_common_dialog.c:2500
+#: src/prefs_common_dialog.c:2503
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Кирилица (ISO-8859-5)"
 
-#: src/prefs_common_dialog.c:2501
+#: src/prefs_common_dialog.c:2504
 msgid "Cyrillic (KOI8-R)"
 msgstr "Кирилица (KOI8-R)"
 
-#: src/prefs_common_dialog.c:2502
+#: src/prefs_common_dialog.c:2505
 msgid "Cyrillic (KOI8-U)"
 msgstr "Кирилица (KOI8-U)"
 
-#: src/prefs_common_dialog.c:2503
+#: src/prefs_common_dialog.c:2506
 msgid "Cyrillic (Windows-1251)"
 msgstr "Кирилица (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2505
+#: src/prefs_common_dialog.c:2508
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Японски (ISO-2022-JP)"
 
-#: src/prefs_common_dialog.c:2507
+#: src/prefs_common_dialog.c:2510
 msgid "Japanese (EUC-JP)"
 msgstr "Японски (EUC-JP)"
 
-#: src/prefs_common_dialog.c:2508
+#: src/prefs_common_dialog.c:2511
 msgid "Japanese (Shift_JIS)"
 msgstr "Японски (Shift_JIS)"
 
-#: src/prefs_common_dialog.c:2511
+#: src/prefs_common_dialog.c:2514
 msgid "Simplified Chinese (GB2312)"
 msgstr "Опростен китайски (GB2312)"
 
-#: src/prefs_common_dialog.c:2512
+#: src/prefs_common_dialog.c:2515
 #, fuzzy
 msgid "Simplified Chinese (GBK)"
 msgstr "Опростен китайски (GB2312)"
 
-#: src/prefs_common_dialog.c:2513
+#: src/prefs_common_dialog.c:2516
 msgid "Traditional Chinese (Big5)"
 msgstr "Традиционен китайски (Big5)"
 
-#: src/prefs_common_dialog.c:2515
+#: src/prefs_common_dialog.c:2518
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Традиционен китайски (EUC-TW)"
 
-#: src/prefs_common_dialog.c:2516
+#: src/prefs_common_dialog.c:2519
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Китайски (ISO-2022-CN)"
 
-#: src/prefs_common_dialog.c:2519
+#: src/prefs_common_dialog.c:2522
 msgid "Korean (EUC-KR)"
 msgstr "Корейски (EUC-KR)"
 
-#: src/prefs_common_dialog.c:2521
+#: src/prefs_common_dialog.c:2524
 msgid "Thai (TIS-620)"
 msgstr "Тайландски (TIS-620)"
 
-#: src/prefs_common_dialog.c:2522
+#: src/prefs_common_dialog.c:2525
 msgid "Thai (Windows-874)"
 msgstr "Тайландски (Windows-874)"
 
-#: src/prefs_common_dialog.c:2689
+#: src/prefs_common_dialog.c:2692
 msgid "the full abbreviated weekday name"
 msgstr "напълно съкратеното име на делника"
 
-#: src/prefs_common_dialog.c:2690
+#: src/prefs_common_dialog.c:2693
 msgid "the full weekday name"
 msgstr "пълното име на делника"
 
-#: src/prefs_common_dialog.c:2691
+#: src/prefs_common_dialog.c:2694
 msgid "the abbreviated month name"
 msgstr "съкратеното име на месеца"
 
-#: src/prefs_common_dialog.c:2692
+#: src/prefs_common_dialog.c:2695
 msgid "the full month name"
 msgstr "пълното име на месеца"
 
-#: src/prefs_common_dialog.c:2693
+#: src/prefs_common_dialog.c:2696
 msgid "the preferred date and time for the current locale"
 msgstr "предпочитаната дата и час за текущия локал"
 
-#: src/prefs_common_dialog.c:2694
+#: src/prefs_common_dialog.c:2697
 msgid "the century number (year/100)"
 msgstr "век (годинa/100)"
 
-#: src/prefs_common_dialog.c:2695
+#: src/prefs_common_dialog.c:2698
 msgid "the day of the month as a decimal number"
 msgstr "денят от месеца като десетично число"
 
-#: src/prefs_common_dialog.c:2696
+#: src/prefs_common_dialog.c:2699
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "часа като десетично число ползвайки 24-часов часовник"
 
-#: src/prefs_common_dialog.c:2697
+#: src/prefs_common_dialog.c:2700
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "часа като десетично число ползвайки 12-часов часовник"
 
-#: src/prefs_common_dialog.c:2698
+#: src/prefs_common_dialog.c:2701
 msgid "the day of the year as a decimal number"
 msgstr "деня от годината като десетично число"
 
-#: src/prefs_common_dialog.c:2699
+#: src/prefs_common_dialog.c:2702
 msgid "the month as a decimal number"
 msgstr "месеца като десетично число"
 
-#: src/prefs_common_dialog.c:2700
+#: src/prefs_common_dialog.c:2703
 msgid "the minute as a decimal number"
 msgstr "минутата като десетично число"
 
-#: src/prefs_common_dialog.c:2701
+#: src/prefs_common_dialog.c:2704
 msgid "either AM or PM"
 msgstr "или AM или PM"
 
-#: src/prefs_common_dialog.c:2702
+#: src/prefs_common_dialog.c:2705
 msgid "the second as a decimal number"
 msgstr "секундата като десетично число"
 
-#: src/prefs_common_dialog.c:2703
+#: src/prefs_common_dialog.c:2706
 msgid "the day of the week as a decimal number"
 msgstr "деня от седмицата като десетично число"
 
-#: src/prefs_common_dialog.c:2704
+#: src/prefs_common_dialog.c:2707
 msgid "the preferred date for the current locale"
 msgstr "предпочитаната дата за текущия локал"
 
-#: src/prefs_common_dialog.c:2705
+#: src/prefs_common_dialog.c:2708
 msgid "the last two digits of a year"
 msgstr "последните две цифри от годината"
 
-#: src/prefs_common_dialog.c:2706
+#: src/prefs_common_dialog.c:2709
 msgid "the year as a decimal number"
 msgstr "годината като десетично число"
 
-#: src/prefs_common_dialog.c:2707
+#: src/prefs_common_dialog.c:2710
 msgid "the time zone or name or abbreviation"
 msgstr "времевата зона или име или съкращение"
 
-#: src/prefs_common_dialog.c:2728
+#: src/prefs_common_dialog.c:2731
 msgid "Specifier"
 msgstr "Идентификатор"
 
-#: src/prefs_common_dialog.c:2729
+#: src/prefs_common_dialog.c:2732
 msgid "Description"
 msgstr "Описание"
 
-#: src/prefs_common_dialog.c:2769
+#: src/prefs_common_dialog.c:2772
 msgid "Example"
 msgstr "Пример"
 
-#: src/prefs_common_dialog.c:2850
+#: src/prefs_common_dialog.c:2853
 msgid "Set message colors"
 msgstr "Определяне на цветове на съобщението"
 
-#: src/prefs_common_dialog.c:2858
+#: src/prefs_common_dialog.c:2861
 msgid "Colors"
 msgstr "Цветове"
 
-#: src/prefs_common_dialog.c:2892
+#: src/prefs_common_dialog.c:2895
 msgid "Quoted Text - First Level"
 msgstr "Цитиран Текст - Първо Ниво"
 
-#: src/prefs_common_dialog.c:2898
+#: src/prefs_common_dialog.c:2901
 msgid "Quoted Text - Second Level"
 msgstr "Цитиран Текст - Второ Ниво"
 
-#: src/prefs_common_dialog.c:2904
+#: src/prefs_common_dialog.c:2907
 msgid "Quoted Text - Third Level"
 msgstr "Цитиран Текст - Трето Ниво"
 
-#: src/prefs_common_dialog.c:2910
+#: src/prefs_common_dialog.c:2913
 msgid "URI link"
 msgstr "URI връзка"
 
-#: src/prefs_common_dialog.c:2917
+#: src/prefs_common_dialog.c:2920
 msgid "Recycle quote colors"
 msgstr "Преизползване на цветовете за цитат"
 
-#: src/prefs_common_dialog.c:2984
+#: src/prefs_common_dialog.c:2987
 msgid "Pick color for quotation level 1"
 msgstr "Изберете цвят за цитат първо ниво"
 
-#: src/prefs_common_dialog.c:2987
+#: src/prefs_common_dialog.c:2990
 msgid "Pick color for quotation level 2"
 msgstr "Изберете цвят за цитат второ ниво"
 
-#: src/prefs_common_dialog.c:2990
+#: src/prefs_common_dialog.c:2993
 msgid "Pick color for quotation level 3"
 msgstr "Изберете цвят за цитат трето ниво"
 
-#: src/prefs_common_dialog.c:2993
+#: src/prefs_common_dialog.c:2996
 msgid "Pick color for URI"
 msgstr "Изберете цвят за URL"
 
-#: src/prefs_common_dialog.c:3133
+#: src/prefs_common_dialog.c:3136
 msgid "Description of symbols"
 msgstr "Описание на символите"
 
-#: src/prefs_common_dialog.c:3189
+#: src/prefs_common_dialog.c:3192
 msgid ""
 "Date\n"
 "From\n"
@@ -5405,11 +5431,11 @@ msgstr ""
 "Новинарски групи\n"
 "Message-ID"
 
-#: src/prefs_common_dialog.c:3202
+#: src/prefs_common_dialog.c:3205
 msgid "If x is set, displays expr"
 msgstr "Ако x е установен, показва expr"
 
-#: src/prefs_common_dialog.c:3206
+#: src/prefs_common_dialog.c:3209
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -5423,7 +5449,7 @@ msgstr ""
 "Цитирано тяло на съобщение без подпис\n"
 "Символ %"
 
-#: src/prefs_common_dialog.c:3214
+#: src/prefs_common_dialog.c:3217
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -5435,20 +5461,20 @@ msgstr ""
 "Символ отваряща къдрава скоба\n"
 "Символ затваряща къдрава скоба"
 
-#: src/prefs_common_dialog.c:3260
+#: src/prefs_common_dialog.c:3263
 msgid "Key bindings"
 msgstr "Клавишни комбинации"
 
-#: src/prefs_common_dialog.c:3273
+#: src/prefs_common_dialog.c:3276
 #, fuzzy
 msgid "Select the preset of key bindings."
 msgstr "Определяне на клавишни комбинации"
 
-#: src/prefs_common_dialog.c:3283 src/prefs_common_dialog.c:3607
+#: src/prefs_common_dialog.c:3286 src/prefs_common_dialog.c:3610
 msgid "Default"
 msgstr "По подразбиране"
 
-#: src/prefs_common_dialog.c:3286 src/prefs_common_dialog.c:3616
+#: src/prefs_common_dialog.c:3289 src/prefs_common_dialog.c:3619
 msgid "Old Sylpheed"
 msgstr "Стар Sylpheed"
 
@@ -5573,7 +5599,7 @@ msgstr ""
 msgid "Age"
 msgstr ""
 
-#: src/prefs_filter_edit.c:501 src/summaryview.c:510
+#: src/prefs_filter_edit.c:501 src/summaryview.c:512
 #, fuzzy
 msgid "Marked"
 msgstr "Макиране"
@@ -5826,17 +5852,17 @@ msgid "Attachment"
 msgstr "Притурка"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73 src/query_search.c:371 src/summaryview.c:4733
+#: src/prefs_summary_column.c:73 src/query_search.c:371 src/summaryview.c:4890
 msgid "Subject"
 msgstr "Тема"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/query_search.c:372 src/summaryview.c:4736
+#: src/prefs_summary_column.c:74 src/query_search.c:372 src/summaryview.c:4893
 msgid "From"
 msgstr "Подател"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/query_search.c:373 src/summaryview.c:4738
+#: src/prefs_summary_column.c:75 src/query_search.c:373 src/summaryview.c:4895
 msgid "Date"
 msgstr "Дата"
 
@@ -5939,7 +5965,7 @@ msgstr "Търсене на съобщения"
 msgid "_Save as search folder"
 msgstr "Запазване в папката с чернови"
 
-#: src/query_search.c:512 src/subscribedialog.c:523 src/summaryview.c:840
+#: src/query_search.c:512 src/subscribedialog.c:523 src/summaryview.c:842
 msgid "Done."
 msgstr "Изпълнено."
 
@@ -5953,7 +5979,7 @@ msgstr "Сканиране на папка %s ..."
 msgid "Searching %s (%d / %d)..."
 msgstr "Филтриране..."
 
-#: src/query_search.c:645 src/summaryview.c:2048
+#: src/query_search.c:645 src/summaryview.c:2051
 msgid "(No Date)"
 msgstr "(Няма Дата)"
 
@@ -6325,304 +6351,309 @@ msgid "/_Mark/Mark as rea_d"
 msgstr "/_Маркиране/Маркиране като _прочетено"
 
 #: src/summaryview.c:429
+#, fuzzy
+msgid "/_Mark/Mark _thread as read"
+msgstr "/_Маркиране/Маркиране като _прочетено"
+
+#: src/summaryview.c:431
 msgid "/_Mark/Mark all _read"
 msgstr "/_Маркиране/Маркиране на _всички като прочетени"
 
-#: src/summaryview.c:430
+#: src/summaryview.c:432
 msgid "/Color la_bel"
 msgstr "/Цветен _етикет"
 
-#: src/summaryview.c:434
+#: src/summaryview.c:436
 msgid "/Re-_edit"
 msgstr "/Ре_дактиране "
 
-#: src/summaryview.c:436
+#: src/summaryview.c:438
 #, fuzzy
 msgid "/Add sender to address boo_k..."
 msgstr "/Добавяне на подателя в адресната книга"
 
-#: src/summaryview.c:438
+#: src/summaryview.c:440
 msgid "/Create f_ilter rule"
 msgstr "/Създаване на _правило за филтриране"
 
-#: src/summaryview.c:439
+#: src/summaryview.c:441
 msgid "/Create f_ilter rule/_Automatically"
 msgstr "/Създаване на _правило за филтриране/_Автоматично"
 
-#: src/summaryview.c:441
+#: src/summaryview.c:443
 msgid "/Create f_ilter rule/by _From"
 msgstr "/Създаване на _правило за филтриране/по _подател"
 
-#: src/summaryview.c:443
+#: src/summaryview.c:445
 msgid "/Create f_ilter rule/by _To"
 msgstr "/Създаване на _правило за филтриране/по п_олучател"
 
-#: src/summaryview.c:445
+#: src/summaryview.c:447
 msgid "/Create f_ilter rule/by _Subject"
 msgstr "/Създаване на _правило за филтриране/по _тема"
 
-#: src/summaryview.c:451
+#: src/summaryview.c:453
 msgid "/_View/_Source"
 msgstr "/_Изглед/_Изходен код"
 
-#: src/summaryview.c:452
+#: src/summaryview.c:454
 msgid "/_View/All _header"
 msgstr "/_Изглед/_Цялата заглавна част"
 
-#: src/summaryview.c:454
+#: src/summaryview.c:456
 msgid "/_Print..."
 msgstr "/_Печат..."
 
-#: src/summaryview.c:486
+#: src/summaryview.c:488
 msgid "Creating summary view...\n"
 msgstr "Създаване на изглед на извадката...\n"
 
-#: src/summaryview.c:508
+#: src/summaryview.c:510
 msgid "All"
 msgstr ""
 
-#: src/summaryview.c:511
+#: src/summaryview.c:513
 #, fuzzy
 msgid "Have color label"
 msgstr "/Цветен _етикет"
 
-#: src/summaryview.c:512
+#: src/summaryview.c:514
 #, fuzzy
 msgid "Have attachment"
 msgstr "Притурка"
 
-#: src/summaryview.c:521
+#: src/summaryview.c:523
 #, fuzzy
 msgid "Search:"
 msgstr "Търсене"
 
-#: src/summaryview.c:535
+#: src/summaryview.c:537
 msgid "Search for Subject or From"
 msgstr ""
 
-#: src/summaryview.c:702
+#: src/summaryview.c:704
 msgid "Process mark"
 msgstr "Обработване на маркер"
 
-#: src/summaryview.c:703
+#: src/summaryview.c:705
 msgid "Some marks are left. Process it?"
 msgstr "Има останали маркери. Желаете ли да се обработят?"
 
-#: src/summaryview.c:749
+#: src/summaryview.c:751
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "Сканиране на папка (%s)..."
 
-#: src/summaryview.c:1292
+#: src/summaryview.c:1295
 #, fuzzy
 msgid "_Search again"
 msgstr "Търсене отново"
 
-#: src/summaryview.c:1313 src/summaryview.c:1322
+#: src/summaryview.c:1316 src/summaryview.c:1325
 msgid "No more unread messages"
 msgstr "Няма повече непрочетени съобщения"
 
-#: src/summaryview.c:1314
+#: src/summaryview.c:1317
 msgid "No unread message found. Search from the end?"
 msgstr "Не е намерено непрочетено съобщение. Търсене от края?"
 
-#: src/summaryview.c:1316
+#: src/summaryview.c:1319
 msgid "No unread messages."
 msgstr "Няма непрочетени съобщения."
 
-#: src/summaryview.c:1323
+#: src/summaryview.c:1326
 msgid "No unread message found. Go to next folder?"
 msgstr "Не е намерено непрочетено съобщение. Търсене в следващата папка?"
 
-#: src/summaryview.c:1331 src/summaryview.c:1340
+#: src/summaryview.c:1334 src/summaryview.c:1343
 msgid "No more new messages"
 msgstr "Няма повече нови съобщения"
 
-#: src/summaryview.c:1332
+#: src/summaryview.c:1335
 msgid "No new message found. Search from the end?"
 msgstr "Не е намерено ново съобщение. Търсене от края?"
 
-#: src/summaryview.c:1334
+#: src/summaryview.c:1337
 msgid "No new messages."
 msgstr "Няма нови съобщения."
 
-#: src/summaryview.c:1341
+#: src/summaryview.c:1344
 msgid "No new message found. Go to next folder?"
 msgstr "Не е намерено ново съобщение. Търсене в следващата папка?"
 
-#: src/summaryview.c:1349 src/summaryview.c:1358
+#: src/summaryview.c:1352 src/summaryview.c:1361
 msgid "No more marked messages"
 msgstr "Няма повече маркирани съобщения"
 
-#: src/summaryview.c:1350
+#: src/summaryview.c:1353
 msgid "No marked message found. Search from the end?"
 msgstr "Не е намерено маркирано съобщение. Търсене от края?"
 
-#: src/summaryview.c:1352 src/summaryview.c:1361
+#: src/summaryview.c:1355 src/summaryview.c:1364
 msgid "No marked messages."
 msgstr "Няма маркирани съобщения."
 
-#: src/summaryview.c:1359
+#: src/summaryview.c:1362
 msgid "No marked message found. Search from the beginning?"
 msgstr "Не е намерено маркирано съобщение. Търсене от началото?"
 
-#: src/summaryview.c:1367 src/summaryview.c:1376
+#: src/summaryview.c:1370 src/summaryview.c:1379
 msgid "No more labeled messages"
 msgstr "Няма повече съобщения с етикет"
 
-#: src/summaryview.c:1368
+#: src/summaryview.c:1371
 msgid "No labeled message found. Search from the end?"
 msgstr "Не е намерено съобщение с етикет. Търсене от края?"
 
-#: src/summaryview.c:1370 src/summaryview.c:1379
+#: src/summaryview.c:1373 src/summaryview.c:1382
 msgid "No labeled messages."
 msgstr "Няма съобщения с етикет"
 
-#: src/summaryview.c:1377
+#: src/summaryview.c:1380
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Не е намерено съобщение с етикет. Търсене от началото?"
 
-#: src/summaryview.c:1693
+#: src/summaryview.c:1696
 msgid "Attracting messages by subject..."
 msgstr "Събиране на съобщения по тема..."
 
-#: src/summaryview.c:1887
+#: src/summaryview.c:1890
 #, c-format
 msgid "%d deleted"
 msgstr "%d изтрити"
 
-#: src/summaryview.c:1891
+#: src/summaryview.c:1894
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d преместени"
 
-#: src/summaryview.c:1892 src/summaryview.c:1897
+#: src/summaryview.c:1895 src/summaryview.c:1900
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:1896
+#: src/summaryview.c:1899
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d копирани"
 
-#: src/summaryview.c:1911
+#: src/summaryview.c:1914
 msgid " item(s) selected"
 msgstr "избран(и)"
 
-#: src/summaryview.c:1933
+#: src/summaryview.c:1936
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d нови, %d непрочетени, %d общо (%s)"
 
-#: src/summaryview.c:1937
+#: src/summaryview.c:1940
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d нови, %d непрочетени, %d общо"
 
-#: src/summaryview.c:1971
+#: src/summaryview.c:1974
 msgid "Sorting summary..."
 msgstr "Сортиране на извадката..."
 
-#: src/summaryview.c:2194
+#: src/summaryview.c:2211
 msgid "\tSetting summary from message data..."
 msgstr "\tСъставяне на извадката от данните на съобщенията..."
 
-#: src/summaryview.c:2196
+#: src/summaryview.c:2213
 msgid "Setting summary from message data..."
 msgstr "Съставяне на извадката от данните на съобщенията..."
 
-#: src/summaryview.c:2302
+#: src/summaryview.c:2319
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Записване на кеша на извадката (%s)..."
 
-#: src/summaryview.c:2643
+#: src/summaryview.c:2660
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Съобщение %d е маркирано\n"
 
-#: src/summaryview.c:2701
+#: src/summaryview.c:2718
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Съобщение %d е маркирано като прочетено\n"
 
-#: src/summaryview.c:2789
+#: src/summaryview.c:2908
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Съобщение %d е маркирано като непрочетено\n"
 
-#: src/summaryview.c:2850
+#: src/summaryview.c:2969
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Съобщение %s/%d е определено за изтриване\n"
 
-#: src/summaryview.c:2878
+#: src/summaryview.c:2997
 msgid "Delete message(s)"
 msgstr "Изтриване на съобщение(я)"
 
-#: src/summaryview.c:2879
+#: src/summaryview.c:2998
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Наистина ли желаете да изтриете съобщенията от кошчето?"
 
-#: src/summaryview.c:2953
+#: src/summaryview.c:3072
 msgid "Deleting duplicated messages..."
 msgstr "Изтриване на повтарящи се съобщения..."
 
-#: src/summaryview.c:2991
+#: src/summaryview.c:3110
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Съобщение %s/%d е размаркирано\n"
 
-#: src/summaryview.c:3049
+#: src/summaryview.c:3168
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Съобщение %d е определено за местене в %s\n"
 
-#: src/summaryview.c:3066
+#: src/summaryview.c:3196
 msgid "Destination is same as current folder."
 msgstr "Назначението е същото като текущата папка."
 
-#: src/summaryview.c:3122
+#: src/summaryview.c:3260
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Съобщение %d е определено за копиране в %s\n"
 
-#: src/summaryview.c:3139
+#: src/summaryview.c:3288
 #, fuzzy
 msgid "Destination for copy is same as current folder."
 msgstr "Назначението за копиране е същото като текущата папка."
 
-#: src/summaryview.c:3338
+#: src/summaryview.c:3495
 msgid "Error occurred while processing messages."
 msgstr "Възникна грешка при обработка на съобщенията."
 
-#: src/summaryview.c:3646 src/summaryview.c:3647
+#: src/summaryview.c:3803 src/summaryview.c:3804
 msgid "Building threads..."
 msgstr "Изграждане на нишките..."
 
-#: src/summaryview.c:3797 src/summaryview.c:3798
+#: src/summaryview.c:3954 src/summaryview.c:3955
 msgid "Unthreading..."
 msgstr "Махане на нишките..."
 
-#: src/summaryview.c:4091 src/summaryview.c:4147
+#: src/summaryview.c:4248 src/summaryview.c:4304
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Филтриране..."
 
-#: src/summaryview.c:4196
+#: src/summaryview.c:4353
 msgid "filtering..."
 msgstr "филтриране..."
 
-#: src/summaryview.c:4197
+#: src/summaryview.c:4354
 msgid "Filtering..."
 msgstr "Филтриране..."
 
-#: src/summaryview.c:4233
+#: src/summaryview.c:4390
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr ""
 
-#: src/summaryview.c:4742
+#: src/summaryview.c:4899
 msgid "No."
 msgstr "No."
 
@@ -6639,36 +6670,36 @@ msgstr "Създаване на текстов изглед...\n"
 msgid "This message can't be displayed.\n"
 msgstr "Съобщението не може да бъде показано.\n"
 
-#: src/textview.c:1929
+#: src/textview.c:1925
 #, fuzzy
 msgid "Sa_ve this image as..."
 msgstr "/_Запазване като..."
 
-#: src/textview.c:1945 src/trayicon.c:109
+#: src/textview.c:1941 src/trayicon.c:109
 #, fuzzy
 msgid "Compose _new message"
 msgstr "Съставяне на ново съобщение"
 
-#: src/textview.c:1947
+#: src/textview.c:1943
 #, fuzzy
 msgid "Add to address _book..."
 msgstr "/Добавяне на подателя в адресната книга"
 
-#: src/textview.c:1949
+#: src/textview.c:1945
 #, fuzzy
 msgid "Copy this add_ress"
 msgstr "Публичен адрес"
 
-#: src/textview.c:1952
+#: src/textview.c:1948
 #, fuzzy
 msgid "_Open with Web browser"
 msgstr "Уеб браузър"
 
-#: src/textview.c:1954
+#: src/textview.c:1950
 msgid "Copy this _link"
 msgstr ""
 
-#: src/textview.c:2097
+#: src/textview.c:2093
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6677,7 +6708,7 @@ msgid ""
 "Open it anyway?"
 msgstr ""
 
-#: src/textview.c:2102
+#: src/textview.c:2098
 msgid "Fake URL warning"
 msgstr ""
 
diff --git a/po/cs.po b/po/cs.po
index a49c14f1..ae68c6c7 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: 2006-01-27 18:11+0900\n"
+"POT-Creation-Date: 2006-01-31 15:20+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"
@@ -504,7 +504,7 @@ msgstr "Nalezený %s\n"
 msgid "Configuration is saved.\n"
 msgstr "Konfigurace je uložena.\n"
 
-#: libsylph/prefs_common.c:489
+#: libsylph/prefs_common.c:491
 #, fuzzy
 msgid "Junk mail filter"
 msgstr "Složka"
@@ -620,8 +620,8 @@ msgstr "%.2fMB"
 msgid "%.2fGB"
 msgstr "%.2fGB"
 
-#: libsylph/utils.c:2373 src/compose.c:2858 src/compose.c:3121
-#: src/compose.c:3184 src/compose.c:3304
+#: libsylph/utils.c:2373 src/compose.c:2867 src/compose.c:3130
+#: src/compose.c:3193 src/compose.c:3313
 msgid "can't change file mode\n"
 msgstr "nelze změnit mód souboru\n"
 
@@ -706,8 +706,8 @@ msgstr ""
 "Nové zprávy budou kontrolovány v tomto pořadí. Pokud má být účet\n"
 "kontrolován při volbě 'Stáhnout vše, zaškrtněte políčko ve sloupci 'G'."
 
-#: src/account_dialog.c:366 src/addressadd.c:192 src/addressbook.c:491
-#: src/compose.c:4262 src/editaddress.c:200 src/editaddress.c:942
+#: src/account_dialog.c:366 src/addressadd.c:192 src/addressbook.c:493
+#: src/compose.c:4271 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:206 src/prefs_filter.c:259 src/prefs_folder_item.c:171
@@ -845,12 +845,12 @@ 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:4762 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4771 src/editaddress.c:201
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "Adresa"
 
-#: src/addressadd.c:212 src/addressbook.c:493 src/editaddress.c:202
+#: src/addressadd.c:212 src/addressbook.c:495 src/editaddress.c:202
 #: src/editaddress.c:795 src/editaddress.c:860 src/editgroup.c:267
 msgid "Remarks"
 msgstr "Poznámky"
@@ -859,183 +859,183 @@ msgstr "Poznámky"
 msgid "Select Address Book Folder"
 msgstr "Vybrat složku pro databázi adres"
 
-#: src/addressbook.c:336 src/compose.c:515 src/mainwindow.c:477
+#: src/addressbook.c:338 src/compose.c:515 src/mainwindow.c:480
 #: src/messageview.c:138
 msgid "/_File"
 msgstr "/_Soubor"
 
-#: src/addressbook.c:337
+#: src/addressbook.c:339
 msgid "/_File/New _Book"
 msgstr "/_Soubor/Nová _databáze"
 
-#: src/addressbook.c:338
+#: src/addressbook.c:340
 msgid "/_File/New _vCard"
 msgstr "/_Soubor/Nová _vCard"
 
-#: src/addressbook.c:340
+#: src/addressbook.c:342
 msgid "/_File/New _JPilot"
 msgstr "/_Soubor/Nový _JPilot"
 
-#: src/addressbook.c:343
+#: src/addressbook.c:345
 msgid "/_File/New _Server"
 msgstr "/_Soubor/Nový _server"
 
-#: src/addressbook.c:345 src/addressbook.c:348 src/compose.c:520
-#: src/compose.c:525 src/compose.c:528 src/compose.c:531 src/mainwindow.c:495
-#: src/mainwindow.c:498 src/mainwindow.c:500 src/mainwindow.c:503
-#: src/mainwindow.c:505 src/messageview.c:141
+#: src/addressbook.c:347 src/addressbook.c:350 src/compose.c:520
+#: src/compose.c:525 src/compose.c:528 src/compose.c:531 src/mainwindow.c:498
+#: src/mainwindow.c:501 src/mainwindow.c:503 src/mainwindow.c:506
+#: src/mainwindow.c:508 src/messageview.c:141
 msgid "/_File/---"
 msgstr "/_Soubor/---"
 
-#: src/addressbook.c:346
+#: src/addressbook.c:348
 msgid "/_File/_Edit"
 msgstr "/_Soubor/Up_ravit"
 
-#: src/addressbook.c:347
+#: src/addressbook.c:349
 msgid "/_File/_Delete"
 msgstr "/_Soubor/_Smazat"
 
-#: src/addressbook.c:349
+#: src/addressbook.c:351
 msgid "/_File/_Save"
 msgstr "/_Soubor/_Uložit"
 
-#: src/addressbook.c:350 src/compose.c:532 src/messageview.c:142
+#: src/addressbook.c:352 src/compose.c:532 src/messageview.c:142
 msgid "/_File/_Close"
 msgstr "/_Soubor/_Zavřít"
 
-#: src/addressbook.c:351
+#: src/addressbook.c:353
 msgid "/_Address"
 msgstr "/_Adresa"
 
-#: src/addressbook.c:352
+#: src/addressbook.c:354
 msgid "/_Address/New _Address"
 msgstr "/_Adresa/Nová _adresa"
 
-#: src/addressbook.c:353
+#: src/addressbook.c:355
 msgid "/_Address/New _Group"
 msgstr "/_Adresa/Nová _skupina"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:356
 msgid "/_Address/New _Folder"
 msgstr "/_Adresa/Nová s_ložka"
 
-#: src/addressbook.c:355
+#: src/addressbook.c:357
 msgid "/_Address/---"
 msgstr "/_Adresa/--"
 
-#: src/addressbook.c:356
+#: src/addressbook.c:358
 msgid "/_Address/_Edit"
 msgstr "/_Adresa/U_pravit"
 
-#: src/addressbook.c:357
+#: src/addressbook.c:359
 msgid "/_Address/_Delete"
 msgstr "/_Adresa/S_mazat"
 
-#: src/addressbook.c:358 src/compose.c:639 src/mainwindow.c:738
-#: src/messageview.c:259
+#: src/addressbook.c:360 src/compose.c:645 src/mainwindow.c:749
+#: src/messageview.c:264
 msgid "/_Tools"
 msgstr "/_Nástroje"
 
-#: src/addressbook.c:359
+#: src/addressbook.c:361
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Nástroje/Importovat _LDIF soubor"
 
-#: src/addressbook.c:360 src/compose.c:658 src/mainwindow.c:788
-#: src/messageview.c:277
+#: src/addressbook.c:362 src/compose.c:664 src/mainwindow.c:799
+#: src/messageview.c:282
 msgid "/_Help"
 msgstr "/Nápo_věda"
 
-#: src/addressbook.c:361 src/compose.c:659 src/mainwindow.c:799
-#: src/messageview.c:278
+#: src/addressbook.c:363 src/compose.c:665 src/mainwindow.c:810
+#: src/messageview.c:283
 msgid "/_Help/_About"
 msgstr "/Nápo_věda/_O aplikaci"
 
-#: src/addressbook.c:380 src/addressbook.c:390
+#: src/addressbook.c:382 src/addressbook.c:392
 msgid "/New _Address"
 msgstr "/Nová _adresa"
 
-#: src/addressbook.c:381 src/addressbook.c:391
+#: src/addressbook.c:383 src/addressbook.c:393
 msgid "/New _Group"
 msgstr "/Nová _skupina"
 
-#: src/addressbook.c:382 src/addressbook.c:392
+#: src/addressbook.c:384 src/addressbook.c:394
 msgid "/New _Folder"
 msgstr "/Nová s_ložka"
 
-#: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:509
+#: src/addressbook.c:385 src/addressbook.c:395 src/compose.c:509
 #: src/folderview.c:246 src/folderview.c:248 src/folderview.c:253
 #: src/folderview.c:266 src/folderview.c:268 src/folderview.c:270
 #: src/folderview.c:275 src/folderview.c:289 src/folderview.c:291
 #: src/folderview.c:295 src/summaryview.c:414 src/summaryview.c:418
-#: src/summaryview.c:421 src/summaryview.c:431 src/summaryview.c:433
-#: src/summaryview.c:435 src/summaryview.c:447 src/summaryview.c:453
+#: src/summaryview.c:421 src/summaryview.c:433 src/summaryview.c:435
+#: src/summaryview.c:437 src/summaryview.c:449 src/summaryview.c:455
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:534
-#: src/mainwindow.c:509 src/messageview.c:144
+#: src/addressbook.c:386 src/addressbook.c:396 src/compose.c:534
+#: src/mainwindow.c:512 src/messageview.c:144
 msgid "/_Edit"
 msgstr "/Úp_ravy"
 
-#: src/addressbook.c:385 src/addressbook.c:395 src/summaryview.c:432
+#: src/addressbook.c:387 src/addressbook.c:397 src/summaryview.c:434
 msgid "/_Delete"
 msgstr "/_Smazat"
 
-#: src/addressbook.c:492
+#: src/addressbook.c:494
 msgid "E-Mail address"
 msgstr "E-mail adresa"
 
-#: src/addressbook.c:496 src/compose.c:4763 src/prefs_common_dialog.c:2183
+#: src/addressbook.c:498 src/compose.c:4772 src/prefs_common_dialog.c:2183
 msgid "Address book"
 msgstr "Databáze adres"
 
-#: src/addressbook.c:596 src/prefs_filter_edit.c:249
+#: src/addressbook.c:600 src/prefs_filter_edit.c:249
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "Jméno:"
 
 #. Buttons
-#: src/addressbook.c:628 src/addressbook.c:1680 src/editaddress.c:884
-#: src/editaddress.c:1017 src/mainwindow.c:2391 src/prefs_actions.c:266
+#: src/addressbook.c:632 src/addressbook.c:1684 src/editaddress.c:884
+#: src/editaddress.c:1017 src/mainwindow.c:2402 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
 #: src/prefs_template.c:233
 msgid "Delete"
 msgstr "Smazat"
 
-#: src/addressbook.c:631 src/editaddress.c:890 src/editaddress.c:1023
+#: src/addressbook.c:635 src/editaddress.c:890 src/editaddress.c:1023
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:273 src/prefs_display_header.c:328
 #: src/prefs_filter_edit.c:1550
 msgid "Add"
 msgstr "Přidat"
 
-#: src/addressbook.c:634
+#: src/addressbook.c:638
 msgid "Lookup"
 msgstr "Hledat"
 
-#: src/addressbook.c:646 src/headerview.c:55 src/prefs_folder_item.c:339
+#: src/addressbook.c:650 src/headerview.c:55 src/prefs_folder_item.c:339
 #: src/prefs_template.c:176
 msgid "To:"
 msgstr "Komu:"
 
-#: src/addressbook.c:650 src/prefs_folder_item.c:356 src/prefs_template.c:178
+#: src/addressbook.c:654 src/prefs_folder_item.c:356 src/prefs_template.c:178
 msgid "Cc:"
 msgstr "Kopie:"
 
-#: src/addressbook.c:654 src/prefs_folder_item.c:367
+#: src/addressbook.c:658 src/prefs_folder_item.c:367
 msgid "Bcc:"
 msgstr "Slepá kopie:"
 
 #. Confirm deletion
-#: src/addressbook.c:841
+#: src/addressbook.c:845
 msgid "Delete address(es)"
 msgstr "Smazat adresu(y)"
 
-#: src/addressbook.c:842
+#: src/addressbook.c:846
 msgid "Really delete the address(es)?"
 msgstr "Opravdu chcete smazat tuto adresu(y)?"
 
-#: src/addressbook.c:1671
+#: src/addressbook.c:1675
 #, fuzzy, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1044,38 +1044,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:1674 src/folderview.c:2351
+#: src/addressbook.c:1678 src/folderview.c:2351
 msgid "Delete folder"
 msgstr "Smazat složku "
 
-#: src/addressbook.c:1674
+#: src/addressbook.c:1678
 #, fuzzy
 msgid "_Folder only"
 msgstr "Pouze složku"
 
-#: src/addressbook.c:1674
+#: src/addressbook.c:1678
 #, fuzzy
 msgid "Folder and _addresses"
 msgstr "Složku a adresy"
 
-#: src/addressbook.c:1679
+#: src/addressbook.c:1683
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Opravdu smazat '%s' ?"
 
-#: src/addressbook.c:2365 src/addressbook.c:2498
+#: src/addressbook.c:2369 src/addressbook.c:2502
 msgid "New user, could not save index file."
 msgstr "Nový uživatel, nelze uložit index soubor."
 
-#: src/addressbook.c:2369 src/addressbook.c:2502
+#: src/addressbook.c:2373 src/addressbook.c:2506
 msgid "New user, could not save address book files."
 msgstr "Nový uživatel, nelze uložit soubory s databází adres."
 
-#: src/addressbook.c:2379 src/addressbook.c:2512
+#: src/addressbook.c:2383 src/addressbook.c:2516
 msgid "Old address book converted successfully."
 msgstr "Konverze staré databáze adres proběhla úspěšně."
 
-#: src/addressbook.c:2384
+#: src/addressbook.c:2388
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1083,7 +1083,7 @@ msgstr ""
 "Stará databáze adres převedena,\n"
 "nelze uložit nový soubor s indexem"
 
-#: src/addressbook.c:2397
+#: src/addressbook.c:2401
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1091,7 +1091,7 @@ msgstr ""
 "Nelze provést konverzi databáze adres,\n"
 "ale byl vytvořen nový soubor pro databázi adres."
 
-#: src/addressbook.c:2403
+#: src/addressbook.c:2407
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1099,7 +1099,7 @@ msgstr ""
 "Nelze provést konverzi databáze adres,\n"
 "nelze ani vytvořit nové soubory databáze adres."
 
-#: src/addressbook.c:2408
+#: src/addressbook.c:2412
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1107,90 +1107,90 @@ msgstr ""
 "Nelze provést konverzi databáze adres\n"
 "a nelze ani vytvořit nové soubory databáze adres."
 
-#: src/addressbook.c:2415
+#: src/addressbook.c:2419
 msgid "Addressbook conversion error"
 msgstr "Chyba při konverzi databáze adres"
 
-#: src/addressbook.c:2419
+#: src/addressbook.c:2423
 msgid "Addressbook conversion"
 msgstr "Konverze databáze adres"
 
-#: src/addressbook.c:2454
+#: src/addressbook.c:2458
 msgid "Addressbook Error"
 msgstr "Chyba v databázi adres"
 
-#: src/addressbook.c:2455 src/addressbook.c:2555
+#: src/addressbook.c:2459 src/addressbook.c:2559
 msgid "Could not read address index"
 msgstr "Nelze načíst index adres"
 
-#: src/addressbook.c:2517
+#: src/addressbook.c:2521
 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:2531
+#: src/addressbook.c:2535
 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:2537
+#: src/addressbook.c:2541
 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:2543
+#: src/addressbook.c:2547
 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:2561
+#: src/addressbook.c:2565
 msgid "Addressbook Conversion Error"
 msgstr "Chyba při konverzi databáze adres"
 
-#: src/addressbook.c:2567
+#: src/addressbook.c:2571
 msgid "Addressbook Conversion"
 msgstr "Konverze databáze adres"
 
-#: src/addressbook.c:3072 src/prefs_common_dialog.c:2033
+#: src/addressbook.c:3086 src/prefs_common_dialog.c:2033
 msgid "Interface"
 msgstr "Rozhraní"
 
-#: src/addressbook.c:3088 src/importldif.c:514
+#: src/addressbook.c:3102 src/importldif.c:514
 msgid "Address Book"
 msgstr "Databáze adres"
 
-#: src/addressbook.c:3104
+#: src/addressbook.c:3118
 msgid "Person"
 msgstr "Osoba"
 
-#: src/addressbook.c:3120
+#: src/addressbook.c:3134
 msgid "EMail Address"
 msgstr "Email adresa"
 
-#: src/addressbook.c:3136
+#: src/addressbook.c:3150
 msgid "Group"
 msgstr "Skupina"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3152 src/folderview.c:367 src/prefs_account_dialog.c:1694
+#: src/addressbook.c:3166 src/folderview.c:367 src/prefs_account_dialog.c:1694
 #: src/query_search.c:370
 msgid "Folder"
 msgstr "Složka"
 
-#: src/addressbook.c:3168
+#: src/addressbook.c:3182
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3184 src/addressbook.c:3200
+#: src/addressbook.c:3198 src/addressbook.c:3214
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3216
+#: src/addressbook.c:3230
 msgid "LDAP Server"
 msgstr "LDAP server"
 
@@ -1202,7 +1202,7 @@ msgstr "Společná adresa"
 msgid "Personal address"
 msgstr "Osobní adresa"
 
-#: src/alertpanel.c:141 src/compose.c:5485 src/main.c:573
+#: src/alertpanel.c:141 src/compose.c:5494 src/main.c:573
 msgid "Notice"
 msgstr "Poznámka"
 
@@ -1253,7 +1253,7 @@ msgstr "Hnědá"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4593
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4750
 msgid "None"
 msgstr "Žádná"
 
@@ -1315,7 +1315,7 @@ msgstr "/Úp_ravy/_Zpět"
 msgid "/_Edit/_Redo"
 msgstr "/Úp_ravy/Z_nova"
 
-#: src/compose.c:537 src/compose.c:544 src/mainwindow.c:513
+#: src/compose.c:537 src/compose.c:544 src/mainwindow.c:516
 #: src/messageview.c:147
 msgid "/_Edit/---"
 msgstr "/Úp_ravy/---"
@@ -1324,7 +1324,7 @@ msgstr "/Úp_ravy/---"
 msgid "/_Edit/Cu_t"
 msgstr "/Úp_ravy/_Vyjmout"
 
-#: src/compose.c:539 src/mainwindow.c:510 src/messageview.c:145
+#: src/compose.c:539 src/mainwindow.c:513 src/messageview.c:145
 msgid "/_Edit/_Copy"
 msgstr "/Úp_ravy/_Kopírovat"
 
@@ -1336,7 +1336,7 @@ msgstr "/Úp_ravy/V_ložit"
 msgid "/_Edit/Paste as _quotation"
 msgstr "/Úp_ravy/Vložit jako _citaci"
 
-#: src/compose.c:543 src/mainwindow.c:511 src/messageview.c:146
+#: src/compose.c:543 src/mainwindow.c:514 src/messageview.c:146
 msgid "/_Edit/Select _all"
 msgstr "/Úp_ravy/Vybr_at vše"
 
@@ -1353,8 +1353,8 @@ msgstr "/Úp_ravy/Zarovnat _všechny dlouhá řádky"
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/Úp_ravy/_Kopírovat"
 
-#: src/compose.c:550 src/mainwindow.c:518 src/messageview.c:151
-#: src/summaryview.c:448
+#: src/compose.c:550 src/mainwindow.c:521 src/messageview.c:151
+#: src/summaryview.c:450
 msgid "/_View"
 msgstr "/Z_obrazit"
 
@@ -1375,9 +1375,9 @@ msgid "/_View/_Reply to"
 msgstr "/Z_obrazit/_Odpověď komu "
 
 #: src/compose.c:555 src/compose.c:557 src/compose.c:559 src/compose.c:561
-#: src/mainwindow.c:538 src/mainwindow.c:541 src/mainwindow.c:568
-#: src/mainwindow.c:592 src/mainwindow.c:687 src/mainwindow.c:691
-#: src/messageview.c:236
+#: src/mainwindow.c:541 src/mainwindow.c:544 src/mainwindow.c:571
+#: src/mainwindow.c:595 src/mainwindow.c:696 src/mainwindow.c:700
+#: src/messageview.c:241
 msgid "/_View/---"
 msgstr "/Z_obrazit/---"
 
@@ -1393,7 +1393,7 @@ msgstr "/Z_obrazit/Praví_tko"
 msgid "/_View/_Attachment"
 msgstr "/Z_obrazit/Přílo_ha"
 
-#: src/compose.c:567 src/mainwindow.c:599 src/messageview.c:158
+#: src/compose.c:567 src/mainwindow.c:602 src/messageview.c:158
 #, fuzzy
 msgid "/_View/Character _encoding"
 msgstr "/Z_obrazit/Setříd_it/Sestupně"
@@ -1403,241 +1403,252 @@ msgid "/_View/Character _encoding/_Automatic"
 msgstr ""
 
 #: src/compose.c:570 src/compose.c:576 src/compose.c:582 src/compose.c:586
-#: src/compose.c:592 src/compose.c:596 src/compose.c:602 src/compose.c:606
-#: src/compose.c:616 src/compose.c:620 src/compose.c:628 src/compose.c:632
-#: src/mainwindow.c:595 src/mainwindow.c:602 src/messageview.c:154
+#: src/compose.c:592 src/compose.c:596 src/compose.c:602 src/compose.c:608
+#: src/compose.c:612 src/compose.c:622 src/compose.c:626 src/compose.c:634
+#: src/compose.c:638 src/mainwindow.c:598 src/mainwindow.c:605
+#: src/messageview.c:154
 #, fuzzy
 msgid "/_View/Character _encoding/---"
 msgstr "/Z_obrazit/Setříd_it/Sestupně"
 
-#: src/compose.c:572 src/mainwindow.c:603 src/messageview.c:162
+#: src/compose.c:572 src/mainwindow.c:606 src/messageview.c:162
 #, fuzzy
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/Z_obrazit/_Znaková sada/7bitová ascii (US-ASC_II)"
 
-#: src/compose.c:574 src/mainwindow.c:605 src/messageview.c:165
+#: src/compose.c:574 src/mainwindow.c:608 src/messageview.c:165
 #, fuzzy
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/Z_obrazit/_Znaková sada/Unicode (_UTF-8)"
 
-#: src/compose.c:578 src/mainwindow.c:609 src/messageview.c:168
+#: src/compose.c:578 src/mainwindow.c:612 src/messageview.c:168
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/Z_obrazit/_Znaková sada/Západní Evropa (ISO-8859-_1)"
 
-#: src/compose.c:580 src/mainwindow.c:611 src/messageview.c:170
+#: src/compose.c:580 src/mainwindow.c:614 src/messageview.c:170
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/Z_obrazit/_Znaková sada/Západní Evropa (ISO-8859-15)"
 
-#: src/compose.c:584 src/mainwindow.c:617 src/messageview.c:175
+#: src/compose.c:584 src/mainwindow.c:620 src/messageview.c:175
 #, fuzzy
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/Z_obrazit/_Znaková sada/Střední Evropa (ISO-8859-_2)"
 
-#: src/compose.c:588 src/mainwindow.c:621 src/messageview.c:178
+#: src/compose.c:588 src/mainwindow.c:624 src/messageview.c:178
 #, fuzzy
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/Z_obrazit/_Znaková sada/_Baltská (ISO-8859-13)"
 
-#: src/compose.c:590 src/mainwindow.c:623 src/messageview.c:180
+#: src/compose.c:590 src/mainwindow.c:626 src/messageview.c:180
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/Z_obrazit/_Znaková sada/Baltská (ISO-8859-_4)"
 
-#: src/compose.c:594 src/mainwindow.c:627 src/messageview.c:183
+#: src/compose.c:594 src/mainwindow.c:630 src/messageview.c:183
 #, fuzzy
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/Z_obrazit/_Znaková sada/Řecká (ISO-8859-_7)"
 
-#: src/compose.c:598 src/mainwindow.c:631 src/messageview.c:186
+#: src/compose.c:598 src/mainwindow.c:634 src/messageview.c:186
+#, fuzzy
+msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
+msgstr "/Z_obrazit/_Znaková sada/Baltská (ISO-8859-_4)"
+
+#: src/compose.c:600 src/mainwindow.c:636 src/messageview.c:188
+#, fuzzy
+msgid "/_View/Character _encoding/Arabic (Windows-1256)"
+msgstr "/Z_obrazit/_Znaková sada/Azbuka (Windows-1251)"
+
+#: src/compose.c:604 src/mainwindow.c:640 src/messageview.c:191
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/Z_obrazit/_Znaková sada/Řecká (ISO-8859-_7)"
 
-#: src/compose.c:600 src/mainwindow.c:633 src/messageview.c:188
+#: src/compose.c:606 src/mainwindow.c:642 src/messageview.c:193
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/Z_obrazit/_Znaková sada/Azbuka (Windows-1251)"
 
-#: src/compose.c:604 src/mainwindow.c:637 src/messageview.c:191
+#: src/compose.c:610 src/mainwindow.c:646 src/messageview.c:196
 #, fuzzy
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/Z_obrazit/_Znaková sada/Turecká (ISO-8859-_9)"
 
-#: src/compose.c:608 src/mainwindow.c:641 src/messageview.c:194
+#: src/compose.c:614 src/mainwindow.c:650 src/messageview.c:199
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/Z_obrazit/_Znaková sada/Azbuka (ISO-8859-_5)"
 
-#: src/compose.c:610 src/mainwindow.c:643 src/messageview.c:196
+#: src/compose.c:616 src/mainwindow.c:652 src/messageview.c:201
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/Z_obrazit/_Znaková sada/Azbuka (KOI8-_R)"
 
-#: src/compose.c:612 src/mainwindow.c:645 src/messageview.c:198
+#: src/compose.c:618 src/mainwindow.c:654 src/messageview.c:203
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/Z_obrazit/_Znaková sada/Azbuka (KOI8-_R)"
 
-#: src/compose.c:614 src/mainwindow.c:647 src/messageview.c:200
+#: src/compose.c:620 src/mainwindow.c:656 src/messageview.c:205
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/Z_obrazit/_Znaková sada/Azbuka (Windows-1251)"
 
-#: src/compose.c:618 src/mainwindow.c:651 src/messageview.c:203
+#: src/compose.c:624 src/mainwindow.c:660 src/messageview.c:208
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/Z_obrazit/_Znaková sada/Japonská (ISO-2022-_JP)"
 
-#: src/compose.c:622 src/mainwindow.c:661 src/messageview.c:212
+#: src/compose.c:628 src/mainwindow.c:670 src/messageview.c:217
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/Z_obrazit/_Znaková sada/Zjednodušená čínská (_GB2312)"
 
-#: src/compose.c:624 src/mainwindow.c:663 src/messageview.c:214
+#: src/compose.c:630 src/mainwindow.c:672 src/messageview.c:219
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/Z_obrazit/_Znaková sada/Zjednodušená čínská (_GB2312)"
 
-#: src/compose.c:626 src/mainwindow.c:665 src/messageview.c:216
+#: src/compose.c:632 src/mainwindow.c:674 src/messageview.c:221
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/Z_obrazit/_Znaková sada/Tradiční čínská (_Big5)"
 
-#: src/compose.c:630 src/mainwindow.c:673 src/messageview.c:223
+#: src/compose.c:636 src/mainwindow.c:682 src/messageview.c:228
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/Z_obrazit/_Znaková sada/Korejská (EUC-_KR)"
 
-#: src/compose.c:634 src/mainwindow.c:679 src/messageview.c:228
+#: src/compose.c:640 src/mainwindow.c:688 src/messageview.c:233
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/Z_obrazit/_Znaková sada/Thajská (TIS-620)"
 
-#: src/compose.c:636 src/mainwindow.c:681 src/messageview.c:230
+#: src/compose.c:642 src/mainwindow.c:690 src/messageview.c:235
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/Z_obrazit/_Znaková sada/Thajská (Windows-874)"
 
-#: src/compose.c:640 src/mainwindow.c:739 src/messageview.c:260
+#: src/compose.c:646 src/mainwindow.c:750 src/messageview.c:265
 msgid "/_Tools/_Address book"
 msgstr "/_Nástroje/_Databáze adres"
 
-#: src/compose.c:641
+#: src/compose.c:647
 msgid "/_Tools/_Template"
 msgstr "/_Nástroje/Ša_blona"
 
-#: src/compose.c:642 src/mainwindow.c:762 src/messageview.c:275
+#: src/compose.c:648 src/mainwindow.c:773 src/messageview.c:280
 msgid "/_Tools/Actio_ns"
 msgstr "/_Nástroje/_Akce"
 
-#: src/compose.c:643 src/compose.c:647 src/compose.c:653 src/mainwindow.c:742
-#: src/mainwindow.c:756 src/mainwindow.c:761 src/mainwindow.c:763
-#: src/mainwindow.c:766 src/mainwindow.c:768 src/messageview.c:263
-#: src/messageview.c:274
+#: src/compose.c:649 src/compose.c:653 src/compose.c:659 src/mainwindow.c:753
+#: src/mainwindow.c:767 src/mainwindow.c:772 src/mainwindow.c:774
+#: src/mainwindow.c:777 src/mainwindow.c:779 src/messageview.c:268
+#: src/messageview.c:279
 msgid "/_Tools/---"
 msgstr "/_Nástroje/---"
 
-#: src/compose.c:644
+#: src/compose.c:650
 #, fuzzy
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/Úp_ravy/Upravit pomocí e_xterního editoru"
 
-#: src/compose.c:648
+#: src/compose.c:654
 #, fuzzy
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Nástroje/_Akce"
 
-#: src/compose.c:649
+#: src/compose.c:655
 #, fuzzy
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/_Zpráva/Zaši_frovat"
 
-#: src/compose.c:654
+#: src/compose.c:660
 #, fuzzy
 msgid "/_Tools/_Check spell"
 msgstr "/_Nástroje/S_pustit"
 
-#: src/compose.c:655
+#: src/compose.c:661
 #, fuzzy
 msgid "/_Tools/_Set spell language"
 msgstr "/_Nástroje/Ša_blona"
 
-#: src/compose.c:899
+#: src/compose.c:908
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: soubor neexistuje\n"
 
-#: src/compose.c:1003 src/compose.c:1074
+#: src/compose.c:1012 src/compose.c:1083
 msgid "Can't get text part\n"
 msgstr "Nelze získat část textu\n"
 
-#: src/compose.c:1475
+#: src/compose.c:1484
 msgid "Quote mark format error."
 msgstr "Chyba v uvozovkách."
 
-#: src/compose.c:1487
+#: src/compose.c:1496
 msgid "Message reply/forward format error."
 msgstr "Chyba formátu odpovědi/přeposlání."
 
-#: src/compose.c:1907
+#: src/compose.c:1916
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Soubor %s neexistuje\n"
 
-#: src/compose.c:1911
+#: src/compose.c:1920
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Nemohu zjistit délku souboru %s\n"
 
-#: src/compose.c:1915
+#: src/compose.c:1924
 #, c-format
 msgid "File %s is empty."
 msgstr "Soubor %s je prázdný."
 
-#: src/compose.c:1919
+#: src/compose.c:1928
 #, c-format
 msgid "Can't read %s."
 msgstr "Nemohu načíst %s."
 
-#: src/compose.c:1952
+#: src/compose.c:1961
 #, c-format
 msgid "Message: %s"
 msgstr "Zpráva: %s"
 
-#: src/compose.c:2012 src/mimeview.c:565
+#: src/compose.c:2021 src/mimeview.c:565
 msgid "Can't get the part of multipart message."
 msgstr "Nemohu získat část z mnohačásťové zprávy."
 
-#: src/compose.c:2496 src/headerview.c:195 src/query_search.c:636
-#: src/summaryview.c:2107
+#: src/compose.c:2505 src/headerview.c:195 src/query_search.c:636
+#: src/summaryview.c:2124
 msgid "(No Subject)"
 msgstr "(Žádný předmět)"
 
-#: src/compose.c:2499
+#: src/compose.c:2508
 #, fuzzy, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Psaní zprávy%s"
 
-#: src/compose.c:2612
+#: src/compose.c:2621
 msgid "Recipient is not specified."
 msgstr "Není uveden příjemce."
 
-#: src/compose.c:2620
+#: src/compose.c:2629
 #, fuzzy
 msgid "Empty subject"
 msgstr "Předmět"
 
-#: src/compose.c:2621
+#: src/compose.c:2630
 msgid "Subject is empty. Send it anyway?"
 msgstr "Předmět je prázdný. Přesto mám zprávu odeslat?"
 
-#: src/compose.c:2680
+#: src/compose.c:2689
 msgid "can't get recipient list."
 msgstr "Nelze načíst seznam příjemců."
 
-#: src/compose.c:2700
+#: src/compose.c:2709
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1645,21 +1656,21 @@ 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:2714 src/send_message.c:299
+#: src/compose.c:2723 src/send_message.c:299
 #, 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:2756
+#: src/compose.c:2765
 msgid "Can't save the message to outbox."
 msgstr "Zprávu nelze uložit do odeslané pošty."
 
-#: src/compose.c:2794
+#: src/compose.c:2803
 #, 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:2891
+#: src/compose.c:2900
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1670,12 +1681,12 @@ msgstr ""
 "%s na %s.\n"
 "Přesto poslat?"
 
-#: src/compose.c:2897
+#: src/compose.c:2906
 #, fuzzy
 msgid "Code conversion error"
 msgstr "Chyba při konverzi databáze adres"
 
-#: src/compose.c:2970
+#: src/compose.c:2979
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1684,159 +1695,159 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:2974
+#: src/compose.c:2983
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3264
+#: src/compose.c:3273
 msgid "can't remove the old message\n"
 msgstr "nelze smazat staré zprávy\n"
 
-#: src/compose.c:3282
+#: src/compose.c:3291
 msgid "queueing message...\n"
 msgstr "zařazuji zprávu...\n"
 
-#: src/compose.c:3364
+#: src/compose.c:3373
 msgid "can't find queue folder\n"
 msgstr "nelze najít složku s frontou zpráv\n"
 
-#: src/compose.c:3371
+#: src/compose.c:3380
 msgid "can't queue the message\n"
 msgstr "Zprávu nelze zařadit\n"
 
-#: src/compose.c:3964
+#: src/compose.c:3973
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "vytvářím číslo zprávy: %s\n"
 
-#: src/compose.c:4077
+#: src/compose.c:4086
 msgid "Creating compose window...\n"
 msgstr "Vytvářím okno pro psaní...\n"
 
-#: src/compose.c:4128 src/headerview.c:54
+#: src/compose.c:4137 src/headerview.c:54
 msgid "From:"
 msgstr "Od:"
 
-#: src/compose.c:4202
+#: src/compose.c:4211
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/_Nástroje/_Akce"
 
-#: src/compose.c:4205
+#: src/compose.c:4214
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/_Zpráva/Zaši_frovat"
 
-#: src/compose.c:4243 src/compose.c:5317
+#: src/compose.c:4252 src/compose.c:5326
 msgid "MIME type"
 msgstr "MIME typ"
 
 #. S_COL_DATE
-#: src/compose.c:4252 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4740
+#: src/compose.c:4261 src/mimeview.c:197 src/prefs_filter_edit.c:496
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4897
 msgid "Size"
 msgstr "Délka"
 
-#: src/compose.c:4683 src/mainwindow.c:2324 src/prefs_account_dialog.c:528
+#: src/compose.c:4692 src/mainwindow.c:2335 src/prefs_account_dialog.c:528
 #: src/prefs_common_dialog.c:661
 msgid "Send"
 msgstr "Odeslat"
 
-#: src/compose.c:4684
+#: src/compose.c:4693
 msgid "Send message"
 msgstr "Odešle zprávu"
 
-#: src/compose.c:4692
+#: src/compose.c:4701
 msgid "Send later"
 msgstr "Poslat později"
 
-#: src/compose.c:4693
+#: src/compose.c:4702
 msgid "Put into queue folder and send later"
 msgstr "Zařadí do výstupní fronty a odešle později"
 
-#: src/compose.c:4701
+#: src/compose.c:4710
 msgid "Draft"
 msgstr "Koncept"
 
-#: src/compose.c:4702
+#: src/compose.c:4711
 msgid "Save to draft folder"
 msgstr "Uloží koncept do složky"
 
-#: src/compose.c:4712
+#: src/compose.c:4721
 msgid "Insert"
 msgstr "Vložit"
 
-#: src/compose.c:4713
+#: src/compose.c:4722
 msgid "Insert file"
 msgstr "Vloží soubor"
 
-#: src/compose.c:4721
+#: src/compose.c:4730
 msgid "Attach"
 msgstr "Příloha"
 
-#: src/compose.c:4722
+#: src/compose.c:4731
 msgid "Attach file"
 msgstr "Připojí soubor"
 
 #. signature
-#: src/compose.c:4732 src/prefs_account_dialog.c:1208
+#: src/compose.c:4741 src/prefs_account_dialog.c:1208
 #: src/prefs_common_dialog.c:953
 msgid "Signature"
 msgstr "Podpis"
 
-#: src/compose.c:4733
+#: src/compose.c:4742
 #, fuzzy
 msgid "Append signature"
 msgstr "ŠPATNÝ podpis"
 
 #. editor
-#: src/compose.c:4742 src/prefs_common_dialog.c:991
+#: src/compose.c:4751 src/prefs_common_dialog.c:991
 #: src/prefs_common_dialog.c:2315
 msgid "Editor"
 msgstr "Editor"
 
-#: src/compose.c:4743
+#: src/compose.c:4752
 msgid "Edit with external editor"
 msgstr "Úprava externím editorem"
 
-#: src/compose.c:4751
+#: src/compose.c:4760
 msgid "Linewrap"
 msgstr "Zarovnání"
 
-#: src/compose.c:4752
+#: src/compose.c:4761
 msgid "Wrap all long lines"
 msgstr "Zarovnání dlouhých řádků"
 
-#: src/compose.c:5213
+#: src/compose.c:5222
 msgid "Invalid MIME type."
 msgstr "Neplatný MIME typ."
 
-#: src/compose.c:5231
+#: src/compose.c:5240
 msgid "File doesn't exist or is empty."
 msgstr "Soubor neexistuje nebo je prázdný."
 
-#: src/compose.c:5299
+#: src/compose.c:5308
 msgid "Properties"
 msgstr "Vlastnosti"
 
-#: src/compose.c:5319 src/prefs_common_dialog.c:1444
+#: src/compose.c:5328 src/prefs_common_dialog.c:1444
 msgid "Encoding"
 msgstr "Kódování"
 
-#: src/compose.c:5342 src/prefs_folder_item.c:202
+#: src/compose.c:5351 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Cesta k souboru"
 
-#: src/compose.c:5343
+#: src/compose.c:5352
 msgid "File name"
 msgstr "Název souboru"
 
-#: src/compose.c:5436
+#: src/compose.c:5445
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Špatný příkaz v externím editoru: '%s'\n"
 
-#: src/compose.c:5482
+#: src/compose.c:5491
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1846,48 +1857,48 @@ msgstr ""
 "Mám přerušit proces?\n"
 "číslo procesu: %d"
 
-#: src/compose.c:5857 src/compose.c:5862 src/compose.c:5868
+#: src/compose.c:5866 src/compose.c:5871 src/compose.c:5877
 msgid "Can't queue the message."
 msgstr "Zprávu nelze zařadit."
 
-#: src/compose.c:5959
+#: src/compose.c:5968
 #, fuzzy
 msgid "Select files"
 msgstr "Vybrat soubor"
 
-#: src/compose.c:5982
+#: src/compose.c:5991
 msgid "Select file"
 msgstr "Vybrat soubor"
 
-#: src/compose.c:6017
+#: src/compose.c:6026
 #, fuzzy
 msgid "Save message"
 msgstr "Odešle zprávu"
 
-#: src/compose.c:6018
+#: src/compose.c:6027
 #, 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:6020
+#: src/compose.c:6029
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:6062
+#: src/compose.c:6071
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Opravdu chcete použít šablonu '%s' ?"
 
-#: src/compose.c:6064
+#: src/compose.c:6073
 msgid "Apply template"
 msgstr "Přidat šablonu"
 
-#: src/compose.c:6065
+#: src/compose.c:6074
 #, fuzzy
 msgid "_Replace"
 msgstr "Nahradit"
 
-#: src/compose.c:6065
+#: src/compose.c:6074
 #, fuzzy
 msgid "_Insert"
 msgstr "Vložit"
@@ -2329,7 +2340,7 @@ msgstr "Nová"
 
 #. S_COL_MARK
 #: src/folderview.c:412 src/prefs_filter_edit.c:500
-#: src/prefs_summary_column.c:71 src/summaryview.c:509
+#: src/prefs_summary_column.c:71 src/summaryview.c:511
 msgid "Unread"
 msgstr "Nepřečtené"
 
@@ -2345,12 +2356,12 @@ msgstr "Nastavuji informace o složce...\n"
 msgid "Setting folder info..."
 msgstr "Nastavuji informace o složce..."
 
-#: src/folderview.c:858 src/mainwindow.c:3464 src/setup.c:80
+#: src/folderview.c:858 src/mainwindow.c:3481 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Prohledávám složku %s%c%s ..."
 
-#: src/folderview.c:862 src/mainwindow.c:3469 src/setup.c:85
+#: src/folderview.c:862 src/mainwindow.c:3486 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Prohledávám složku %s ..."
@@ -2376,7 +2387,7 @@ msgstr "Provádím obnovu stromu složek..."
 msgid "Checking for new messages in all folders..."
 msgstr "Zjišťuji nové zprávy ve všech složkách..."
 
-#: src/folderview.c:1200 src/mainwindow.c:2400 src/prefs_common_dialog.c:1789
+#: src/folderview.c:1200 src/mainwindow.c:2411 src/prefs_common_dialog.c:1789
 msgid "Junk"
 msgstr ""
 
@@ -2515,7 +2526,7 @@ msgstr "Předmět:"
 msgid "Creating header view...\n"
 msgstr "Vytvářím náhled na záhlaví...\n"
 
-#: src/headerview.c:180 src/query_search.c:637 src/summaryview.c:2110
+#: src/headerview.c:180 src/query_search.c:637 src/summaryview.c:2127
 msgid "(No From)"
 msgstr "(není znám odesílatel)"
 
@@ -2624,7 +2635,7 @@ msgstr "Importovat LDIF soubor do databáze adres"
 msgid "Prev"
 msgstr "Předchozí"
 
-#: src/importldif.c:768 src/mainwindow.c:2420
+#: src/importldif.c:768 src/mainwindow.c:2431
 msgid "Next"
 msgstr "Další"
 
@@ -2970,677 +2981,682 @@ msgstr ""
 msgid "another Sylpheed is already running.\n"
 msgstr "aplikace Sylpheed je již spuštěna.\n"
 
-#: src/main.c:1064
+#: src/main.c:1083
 #, fuzzy
 msgid "Migration of configuration"
 msgstr "Nastavení akcí"
 
-#: src/main.c:1065
+#: src/main.c:1084
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
 msgstr ""
 
-#: src/mainwindow.c:478
+#: src/mainwindow.c:481
 msgid "/_File/_Folder"
 msgstr "/_Soubor/_Složka"
 
-#: src/mainwindow.c:479
+#: src/mainwindow.c:482
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/_Soubor/_Složka/_Vytvořit novou složku..."
 
-#: src/mainwindow.c:481
+#: src/mainwindow.c:484
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/_Soubor/_Složka/_Přejmenovat složku..."
 
-#: src/mainwindow.c:482
+#: src/mainwindow.c:485
 #, fuzzy
 msgid "/_File/_Folder/_Move folder..."
 msgstr "/_Soubor/_Složka/_Přejmenovat složku..."
 
-#: src/mainwindow.c:483
+#: src/mainwindow.c:486
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/_Soubor/_Složka/_Smazat složku"
 
-#: src/mainwindow.c:484
+#: src/mainwindow.c:487
 #, fuzzy
 msgid "/_File/_Mailbox"
 msgstr "/_Soubor/Při_dat poštovní schránku...."
 
-#: src/mainwindow.c:485
+#: src/mainwindow.c:488
 #, fuzzy
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/_Soubor/Při_dat poštovní schránku...."
 
-#: src/mainwindow.c:486
+#: src/mainwindow.c:489
 #, fuzzy
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/Odebrat _poštovní schránku"
 
-#: src/mainwindow.c:487 src/mainwindow.c:492
+#: src/mainwindow.c:490 src/mainwindow.c:495
 #, fuzzy
 msgid "/_File/_Mailbox/---"
 msgstr "/_Soubor/_Složka/---"
 
-#: src/mainwindow.c:488
+#: src/mainwindow.c:491
 #, fuzzy
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "/_Zkontrolovat nové zprávy"
 
-#: src/mainwindow.c:490
+#: src/mainwindow.c:493
 #, 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:493
+#: src/mainwindow.c:496
 #, fuzzy
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "/O_bnovit strom složek"
 
-#: src/mainwindow.c:496
+#: src/mainwindow.c:499
 msgid "/_File/_Import mbox file..."
 msgstr "/_Soubor/_Importovat soubor mbox..."
 
-#: src/mainwindow.c:497
+#: src/mainwindow.c:500
 msgid "/_File/_Export to mbox file..."
 msgstr "/_Soubor/E_xportovat do mbox souboru..."
 
-#: src/mainwindow.c:499
+#: src/mainwindow.c:502
 #, fuzzy
 msgid "/_File/Empty all _trash"
 msgstr "/_Soubor/_Vyprázdnit koš"
 
-#: src/mainwindow.c:501 src/messageview.c:139
+#: src/mainwindow.c:504 src/messageview.c:139
 msgid "/_File/_Save as..."
 msgstr "/_Soubor/Uložit j_ako..."
 
-#: src/mainwindow.c:502 src/messageview.c:140
+#: src/mainwindow.c:505 src/messageview.c:140
 msgid "/_File/_Print..."
 msgstr "/_Soubor/_Tisk..."
 
-#: src/mainwindow.c:504
+#: src/mainwindow.c:507
 #, fuzzy
 msgid "/_File/_Work offline"
 msgstr "/_Soubor/_Vložit soubor"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:507
+#: src/mainwindow.c:510
 msgid "/_File/E_xit"
 msgstr "/_Soubor/_Konec"
 
-#: src/mainwindow.c:512
+#: src/mainwindow.c:515
 msgid "/_Edit/Select _thread"
 msgstr "/Úp_ravy/Vybrat _vlákno"
 
-#: src/mainwindow.c:514 src/messageview.c:148
+#: src/mainwindow.c:517 src/messageview.c:148
 msgid "/_Edit/_Find in current message..."
 msgstr "/Ú_pravy/_Najít v aktuální zprávě..."
 
-#: src/mainwindow.c:516
+#: src/mainwindow.c:519
 msgid "/_Edit/_Search messages..."
 msgstr "/Ú_pravy/Na_jít zprávy..."
 
-#: src/mainwindow.c:519
+#: src/mainwindow.c:522
 msgid "/_View/Show or hi_de"
 msgstr "/Z_obrazit/Zobrazit nebo s_krýt"
 
-#: src/mainwindow.c:520
+#: src/mainwindow.c:523
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/Z_obrazit/Zobrazit nebo s_krýt/_Strom složek "
 
-#: src/mainwindow.c:522
+#: src/mainwindow.c:525
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/Z_obrazit/Zobrazit nebo s_krýt/Ná_hled na zprávu"
 
-#: src/mainwindow.c:524
+#: src/mainwindow.c:527
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/Z_obrazit/Zobrazit nebo s_krýt/_Nástrojová lišta"
 
-#: src/mainwindow.c:526
+#: src/mainwindow.c:529
 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:528
+#: src/mainwindow.c:531
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/Z_obrazit/Zobrazit nebo s_krýt/_Nástrojová lišta/_Ikony"
 
-#: src/mainwindow.c:530
+#: src/mainwindow.c:533
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/Z_obrazit/Zobrazit nebo s_krýt/_Nástrojová lišta/_Text"
 
-#: src/mainwindow.c:532
+#: src/mainwindow.c:535
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/Z_obrazit/Zobrazit nebo s_krýt/_Nástrojová lišta/_Nic"
 
-#: src/mainwindow.c:534
+#: src/mainwindow.c:537
 #, fuzzy
 msgid "/_View/Show or hi_de/_Search bar"
 msgstr "/Z_obrazit/Zobrazit nebo s_krýt/Stavová _lišta"
 
-#: src/mainwindow.c:536
+#: src/mainwindow.c:539
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/Z_obrazit/Zobrazit nebo s_krýt/Stavová _lišta"
 
-#: src/mainwindow.c:539
+#: src/mainwindow.c:542
 msgid "/_View/Separate f_older tree"
 msgstr "/Z_obrazit/Samostatný s_trom složek "
 
-#: src/mainwindow.c:540
+#: src/mainwindow.c:543
 #, fuzzy
 msgid "/_View/Separate _message view"
 msgstr "/Z_obrazit/Samostatné pro_hlédnutí zprávy"
 
-#: src/mainwindow.c:542
+#: src/mainwindow.c:545
 msgid "/_View/_Sort"
 msgstr "/Z_obrazit/Setříd_it"
 
-#: src/mainwindow.c:543
+#: src/mainwindow.c:546
 msgid "/_View/_Sort/by _number"
 msgstr "/Z_obrazit/Setříd_it/podle čí_sla"
 
-#: src/mainwindow.c:544
+#: src/mainwindow.c:547
 msgid "/_View/_Sort/by s_ize"
 msgstr "/Z_obrazit/Setříd_it/podle _velikosti"
 
-#: src/mainwindow.c:545
+#: src/mainwindow.c:548
 msgid "/_View/_Sort/by _date"
 msgstr "/Z_obrazit/Setříd_it/podle _data"
 
-#: src/mainwindow.c:546
+#: src/mainwindow.c:549
 #, fuzzy
 msgid "/_View/_Sort/by t_hread date"
 msgstr "/Z_obrazit/Setříd_it/podle _data"
 
-#: src/mainwindow.c:547
+#: src/mainwindow.c:550
 msgid "/_View/_Sort/by _from"
 msgstr "/Z_obrazit/Setříd_it/podle _od koho"
 
-#: src/mainwindow.c:548
+#: src/mainwindow.c:551
 msgid "/_View/_Sort/by _recipient"
 msgstr "/Z_obrazit/Setříd_it/podle odesí_latele"
 
-#: src/mainwindow.c:549
+#: src/mainwindow.c:552
 msgid "/_View/_Sort/by _subject"
 msgstr "/Z_obrazit/Setříd_it/podle př_edmětu"
 
-#: src/mainwindow.c:550
+#: src/mainwindow.c:553
 msgid "/_View/_Sort/by _color label"
 msgstr "/Z_obrazit/Setříd_it/podle _barevné značky"
 
-#: src/mainwindow.c:552
+#: src/mainwindow.c:555
 msgid "/_View/_Sort/by _mark"
 msgstr "/Z_obrazit/Setříd_it/podle o_značení"
 
-#: src/mainwindow.c:553
+#: src/mainwindow.c:556
 msgid "/_View/_Sort/by _unread"
 msgstr "/Z_obrazit/Setříd_it/podle ne_přečtených"
 
-#: src/mainwindow.c:554
+#: src/mainwindow.c:557
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/Z_obrazit/Setříd_it/podle připo_jených souborů"
 
-#: src/mainwindow.c:556
+#: src/mainwindow.c:559
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/Z_obrazit/Setříd_it/_Netřídit"
 
-#: src/mainwindow.c:557 src/mainwindow.c:560
+#: src/mainwindow.c:560 src/mainwindow.c:563
 msgid "/_View/_Sort/---"
 msgstr "/Z_obrazit/Setříd_it/---"
 
-#: src/mainwindow.c:558
+#: src/mainwindow.c:561
 msgid "/_View/_Sort/Ascending"
 msgstr "/Z_obrazit/Setříd_it/Vzestupně"
 
-#: src/mainwindow.c:559
+#: src/mainwindow.c:562
 msgid "/_View/_Sort/Descending"
 msgstr "/Z_obrazit/Setříd_it/Sestupně"
 
-#: src/mainwindow.c:561
+#: src/mainwindow.c:564
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/Z_obrazit/Setříd_it/_Získat z předmětu"
 
-#: src/mainwindow.c:563
+#: src/mainwindow.c:566
 msgid "/_View/Th_read view"
 msgstr "/Z_obrazit/Zobrazit _vlákna"
 
-#: src/mainwindow.c:564
+#: src/mainwindow.c:567
 msgid "/_View/E_xpand all threads"
 msgstr "/Z_obrazit/Rozbalit vše_chna vlákna"
 
-#: src/mainwindow.c:565
+#: src/mainwindow.c:568
 msgid "/_View/Co_llapse all threads"
 msgstr "/Z_obrazit/_Sbalit všechna vlákna"
 
-#: src/mainwindow.c:566
+#: src/mainwindow.c:569
 msgid "/_View/Set display _item..."
 msgstr "/Z_obrazit/Nastavit zobrazené po_ložky..."
 
-#: src/mainwindow.c:569
+#: src/mainwindow.c:572
 msgid "/_View/_Go to"
 msgstr "/Z_obrazit/_Přejít"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:573
 msgid "/_View/_Go to/_Prev message"
 msgstr "/Z_obrazit/_Přejít/Př_edchozí zpráva"
 
-#: src/mainwindow.c:571
+#: src/mainwindow.c:574
 msgid "/_View/_Go to/_Next message"
 msgstr "/Z_obrazit/_Přejít/_Další zpráva"
 
-#: src/mainwindow.c:572 src/mainwindow.c:577 src/mainwindow.c:580
-#: src/mainwindow.c:585 src/mainwindow.c:590
+#: src/mainwindow.c:575 src/mainwindow.c:580 src/mainwindow.c:583
+#: src/mainwindow.c:588 src/mainwindow.c:593
 msgid "/_View/_Go to/---"
 msgstr "/Z_obrazit/_Přejít/---"
 
-#: src/mainwindow.c:573
+#: src/mainwindow.c:576
 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:575
+#: src/mainwindow.c:578
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/Z_obrazit/_Přejít/Další nepřeč_tená zpráva"
 
-#: src/mainwindow.c:578
+#: src/mainwindow.c:581
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/Z_obrazit/_Přejít/_Předchozí nová zpráva"
 
-#: src/mainwindow.c:579
+#: src/mainwindow.c:582
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/Z_obrazit/_Přejít/Další n_ová zpráva"
 
-#: src/mainwindow.c:581
+#: src/mainwindow.c:584
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/Z_obrazit/_Přejít/Před_chozí označená zpráva"
 
-#: src/mainwindow.c:583
+#: src/mainwindow.c:586
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/Z_obrazit/_Přejít/Další oz_načená zpráva"
 
-#: src/mainwindow.c:586
+#: src/mainwindow.c:589
 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:588
+#: src/mainwindow.c:591
 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:591
+#: src/mainwindow.c:594
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/Z_obrazit/_Přejít/Do _jiné složky"
 
-#: src/mainwindow.c:600 src/messageview.c:159
+#: src/mainwindow.c:603 src/messageview.c:159
 #, fuzzy
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/Z_obrazit/_Znaková sada/_Autodetekce "
 
-#: src/mainwindow.c:613 src/messageview.c:172
+#: src/mainwindow.c:616 src/messageview.c:172
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr "/Z_obrazit/_Znaková sada/Západní Evropa (ISO-8859-15)"
 
-#: src/mainwindow.c:653 src/messageview.c:205
+#: src/mainwindow.c:662 src/messageview.c:210
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/Z_obrazit/_Znaková sada/Japonská (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:655 src/messageview.c:207
+#: src/mainwindow.c:664 src/messageview.c:212
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/Z_obrazit/_Znaková sada/Japonská (_EUC-JP)"
 
-#: src/mainwindow.c:657 src/messageview.c:209
+#: src/mainwindow.c:666 src/messageview.c:214
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/Z_obrazit/_Znaková sada/Japonská (_Shift__JIS)"
 
-#: src/mainwindow.c:667 src/messageview.c:218
+#: src/mainwindow.c:676 src/messageview.c:223
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/Z_obrazit/_Znaková sada/Tradiční čínská (EUC-_TW)"
 
-#: src/mainwindow.c:669 src/messageview.c:220
+#: src/mainwindow.c:678 src/messageview.c:225
 #, fuzzy
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/Z_obrazit/_Znaková sada/Čínská (ISO-2022-_CN)"
 
-#: src/mainwindow.c:675 src/messageview.c:225
+#: src/mainwindow.c:684 src/messageview.c:230
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/Z_obrazit/_Znaková sada/Korejská (ISO-2022-KR)"
 
-#: src/mainwindow.c:688 src/summaryview.c:449
+#: src/mainwindow.c:697 src/summaryview.c:451
 msgid "/_View/Open in new _window"
 msgstr "/Z_obrazit/Otevřít v _novém okně"
 
-#: src/mainwindow.c:689 src/messageview.c:237
+#: src/mainwindow.c:698 src/messageview.c:242
 msgid "/_View/Mess_age source"
 msgstr "/Z_obrazit/Zd_roj zprávy"
 
-#: src/mainwindow.c:690 src/messageview.c:238
+#: src/mainwindow.c:699 src/messageview.c:243
 msgid "/_View/Show all _header"
 msgstr "/Z_obrazit/Zobrazit všechna zá_hlaví"
 
-#: src/mainwindow.c:692
+#: src/mainwindow.c:701
 msgid "/_View/_Update summary"
 msgstr "/Z_obrazit/_Aktualizace souhrnu"
 
-#: src/mainwindow.c:694 src/messageview.c:240
+#: src/mainwindow.c:703 src/messageview.c:245
 msgid "/_Message"
 msgstr "/_Zpráva"
 
-#: src/mainwindow.c:695
+#: src/mainwindow.c:704
 #, fuzzy
 msgid "/_Message/Recei_ve"
 msgstr "/_Zpráva/Znov_u editovat"
 
-#: src/mainwindow.c:696
+#: src/mainwindow.c:705
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/_Zpráva/Přijmout _ze všech účtů"
 
-#: src/mainwindow.c:698
+#: src/mainwindow.c:707
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/_Zpráva/Přijmout _ze všech účtů"
 
-#: src/mainwindow.c:700
+#: src/mainwindow.c:709
 #, fuzzy
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/_Zpráva/Přerušit pří_jem zpráv"
 
-#: src/mainwindow.c:702
+#: src/mainwindow.c:711
 #, fuzzy
 msgid "/_Message/Recei_ve/---"
 msgstr "/_Zpráva/Znov_u editovat"
 
-#: src/mainwindow.c:703
+#: src/mainwindow.c:712
 msgid "/_Message/_Send queued messages"
 msgstr "/_Zpráva/Odeslat pozd_ržené zprávy"
 
-#: src/mainwindow.c:704 src/mainwindow.c:706 src/mainwindow.c:713
-#: src/mainwindow.c:718 src/mainwindow.c:721 src/mainwindow.c:730
-#: src/mainwindow.c:732 src/mainwindow.c:735 src/messageview.c:243
-#: src/messageview.c:251 src/messageview.c:256
+#: src/mainwindow.c:713 src/mainwindow.c:715 src/mainwindow.c:722
+#: src/mainwindow.c:727 src/mainwindow.c:730 src/mainwindow.c:741
+#: src/mainwindow.c:743 src/mainwindow.c:746 src/messageview.c:248
+#: src/messageview.c:256 src/messageview.c:261
 msgid "/_Message/---"
 msgstr "/_Zpráva/---"
 
-#: src/mainwindow.c:705 src/messageview.c:241
+#: src/mainwindow.c:714 src/messageview.c:246
 msgid "/_Message/Compose _new message"
 msgstr "/_Zpráva/_Nová zpráva"
 
-#: src/mainwindow.c:707 src/messageview.c:244
+#: src/mainwindow.c:716 src/messageview.c:249
 msgid "/_Message/_Reply"
 msgstr "/_Zpráva/_Odpovědět"
 
-#: src/mainwindow.c:708
+#: src/mainwindow.c:717
 msgid "/_Message/Repl_y to"
 msgstr "/_Zpráva/Odpo_vědět komu"
 
-#: src/mainwindow.c:709 src/messageview.c:245
+#: src/mainwindow.c:718 src/messageview.c:250
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Zpráva/Odpo_vědět komu/_všem"
 
-#: src/mainwindow.c:710 src/messageview.c:247
+#: src/mainwindow.c:719 src/messageview.c:252
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Zpráva/Odpo_vědět komu/_odesílateli"
 
-#: src/mainwindow.c:711 src/messageview.c:249
+#: src/mainwindow.c:720 src/messageview.c:254
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Zpráva/Odpo_vědět komu/do _diskusního listu"
 
-#: src/mainwindow.c:714 src/messageview.c:252
+#: src/mainwindow.c:723 src/messageview.c:257
 msgid "/_Message/_Forward"
 msgstr "/_Zpráva/Předat dá_l"
 
-#: src/mainwindow.c:715 src/messageview.c:253
+#: src/mainwindow.c:724 src/messageview.c:258
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Zpráva/Přeposlat _jako přílohu"
 
-#: src/mainwindow.c:717 src/messageview.c:255
+#: src/mainwindow.c:726 src/messageview.c:260
 msgid "/_Message/Redirec_t"
 msgstr "/_Zpráva/Přesměrov_at"
 
-#: src/mainwindow.c:719
+#: src/mainwindow.c:728
 msgid "/_Message/M_ove..."
 msgstr "/_Zpráva/Pře_sunout..."
 
-#: src/mainwindow.c:720
+#: src/mainwindow.c:729
 msgid "/_Message/_Copy..."
 msgstr "/_Zpráva/_Kopírovat..."
 
-#: src/mainwindow.c:722
+#: src/mainwindow.c:731
 msgid "/_Message/_Mark"
 msgstr "/_Zpráva/Označ_it"
 
-#: src/mainwindow.c:723
+#: src/mainwindow.c:732
 msgid "/_Message/_Mark/_Mark"
 msgstr "/_Zpráva/Označ_it/_Označit"
 
-#: src/mainwindow.c:724
+#: src/mainwindow.c:733
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/_Zpráva/Označ_it/_Zrušit označení"
 
-#: src/mainwindow.c:725
+#: src/mainwindow.c:734
 msgid "/_Message/_Mark/---"
 msgstr "/_Zpráva/Označ_it/---"
 
-#: src/mainwindow.c:726
+#: src/mainwindow.c:735
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/_Zpráva/Označ_it/Označit jako _nepřečtené"
 
-#: src/mainwindow.c:727
+#: src/mainwindow.c:736
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/_Zpráva/Označ_it/Označit jako _přečtenou"
 
-#: src/mainwindow.c:729
+#: src/mainwindow.c:738
+#, fuzzy
+msgid "/_Message/_Mark/Mark _thread as read"
+msgstr "/_Zpráva/Označ_it/Označit jako _přečtenou"
+
+#: src/mainwindow.c:740
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/_Zpráva/Označ_it/Označit _všechny jako přečtené"
 
-#: src/mainwindow.c:731
+#: src/mainwindow.c:742
 msgid "/_Message/_Delete"
 msgstr "/_Zpráva/S_mazat"
 
-#: src/mainwindow.c:733
+#: src/mainwindow.c:744
 #, fuzzy
 msgid "/_Message/Set as _junk mail"
 msgstr "/_Zpráva/_Příjem nové pošty"
 
-#: src/mainwindow.c:734
+#: src/mainwindow.c:745
 #, fuzzy
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/_Zpráva/_Příjem nové pošty"
 
-#: src/mainwindow.c:736 src/messageview.c:257
+#: src/mainwindow.c:747 src/messageview.c:262
 msgid "/_Message/Re-_edit"
 msgstr "/_Zpráva/Znov_u editovat"
 
-#: src/mainwindow.c:740
+#: src/mainwindow.c:751
 #, fuzzy
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/_Nástroje/Přidat odesílatele do a_dresáře"
 
-#: src/mainwindow.c:743
+#: src/mainwindow.c:754
 #, fuzzy
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/_Nástroje/_Filtr zpráv "
 
-#: src/mainwindow.c:745
+#: src/mainwindow.c:756
 #, fuzzy
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Nástroje/_Filtr zpráv "
 
-#: src/mainwindow.c:747 src/messageview.c:264
+#: src/mainwindow.c:758 src/messageview.c:269
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Nástroje/_Vytvoření filtru"
 
-#: src/mainwindow.c:748 src/messageview.c:266
+#: src/mainwindow.c:759 src/messageview.c:271
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Nástroje/_Vytvoření filtru/_Automaticky"
 
-#: src/mainwindow.c:750 src/messageview.c:268
+#: src/mainwindow.c:761 src/messageview.c:273
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Nástroje/_Vytvoření filtru/podle _Od"
 
-#: src/mainwindow.c:752 src/messageview.c:270
+#: src/mainwindow.c:763 src/messageview.c:275
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Nástroje/_Vytvoření filtru/podle _Komu"
 
-#: src/mainwindow.c:754 src/messageview.c:272
+#: src/mainwindow.c:765 src/messageview.c:277
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Nástroje/_Vytvoření filtru/podle _Předmětu"
 
-#: src/mainwindow.c:757
+#: src/mainwindow.c:768
 #, fuzzy
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/_Nástroje/_Filtr zpráv "
 
-#: src/mainwindow.c:759
+#: src/mainwindow.c:770
 #, fuzzy
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/_Nástroje/_Filtr zpráv "
 
-#: src/mainwindow.c:764
+#: src/mainwindow.c:775
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/_Nástroje/_Smazat duplikované zprávy"
 
-#: src/mainwindow.c:767
+#: src/mainwindow.c:778
 msgid "/_Tools/E_xecute"
 msgstr "/_Nástroje/S_pustit"
 
-#: src/mainwindow.c:769
+#: src/mainwindow.c:780
 msgid "/_Tools/_Log window"
 msgstr "/_Nástroje/Okno _záznamů "
 
-#: src/mainwindow.c:771
+#: src/mainwindow.c:782
 msgid "/_Configuration"
 msgstr "/Nastav_ení"
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:783
 msgid "/_Configuration/_Common preferences..."
 msgstr "/Nastav_ení/_Společná nastavení..."
 
-#: src/mainwindow.c:774
+#: src/mainwindow.c:785
 msgid "/_Configuration/_Filter setting..."
 msgstr "/Nastav_ení/Nastavení _filtrů..."
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:787
 msgid "/_Configuration/_Template..."
 msgstr "/Nastav_ení/Ša_blona..."
 
-#: src/mainwindow.c:777
+#: src/mainwindow.c:788
 msgid "/_Configuration/_Actions..."
 msgstr "/Nastav_ení/_Akce..."
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:789
 msgid "/_Configuration/---"
 msgstr "/Nastav_ení/---"
 
-#: src/mainwindow.c:779
+#: src/mainwindow.c:790
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/Nastav_ení/Nas_tavení aktuálního účtu..."
 
-#: src/mainwindow.c:781
+#: src/mainwindow.c:792
 msgid "/_Configuration/Create _new account..."
 msgstr "/Nastav_ení/Založit _nový účet..."
 
-#: src/mainwindow.c:783
+#: src/mainwindow.c:794
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/Nastav_ení/Ú_pravy účtů..."
 
-#: src/mainwindow.c:785
+#: src/mainwindow.c:796
 msgid "/_Configuration/C_hange current account"
 msgstr "/Nastav_ení/_Změna aktuálního účtu"
 
-#: src/mainwindow.c:789
+#: src/mainwindow.c:800
 msgid "/_Help/_Manual"
 msgstr "/Nápo_věda/_Manuál"
 
-#: src/mainwindow.c:790
+#: src/mainwindow.c:801
 msgid "/_Help/_Manual/_English"
 msgstr "/Nápo_věda/_Manuál/_Anglicky"
 
-#: src/mainwindow.c:791
+#: src/mainwindow.c:802
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/Nápo_věda/_Manuál/_Japonsky"
 
-#: src/mainwindow.c:792
+#: src/mainwindow.c:803
 msgid "/_Help/_FAQ"
 msgstr "/Nápo_věda/_FAQ"
 
-#: src/mainwindow.c:793
+#: src/mainwindow.c:804
 msgid "/_Help/_FAQ/_English"
 msgstr "/Nápo_věda/_FAQ/_Anglicky"
 
-#: src/mainwindow.c:794
+#: src/mainwindow.c:805
 msgid "/_Help/_FAQ/_German"
 msgstr "/Nápo_věda/_FAQ/_Německy"
 
-#: src/mainwindow.c:795
+#: src/mainwindow.c:806
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/Nápo_věda/_FAQ/Š_panělsky"
 
-#: src/mainwindow.c:796
+#: src/mainwindow.c:807
 msgid "/_Help/_FAQ/_French"
 msgstr "/Nápo_věda/_FAQ/_Francouzsky"
 
-#: src/mainwindow.c:797
+#: src/mainwindow.c:808
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/Nápo_věda/_FAQ/_Italsky"
 
-#: src/mainwindow.c:798
+#: src/mainwindow.c:809
 msgid "/_Help/---"
 msgstr "/Nápo_věda/---"
 
-#: src/mainwindow.c:841
+#: src/mainwindow.c:852
 msgid "Creating main window...\n"
 msgstr "Vytvářím hlavní okno...\n"
 
-#: src/mainwindow.c:1011
+#: src/mainwindow.c:1022
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Hlavní okno: barevné rozvržení %d bylo neúspěšné\n"
 
-#: src/mainwindow.c:1108 src/summaryview.c:2258 src/summaryview.c:2343
-#: src/summaryview.c:3739 src/summaryview.c:3868 src/summaryview.c:4226
+#: src/mainwindow.c:1119 src/summaryview.c:2275 src/summaryview.c:2360
+#: src/summaryview.c:3896 src/summaryview.c:4025 src/summaryview.c:4383
 msgid "done.\n"
 msgstr "hotovo.\n"
 
-#: src/mainwindow.c:1235 src/mainwindow.c:1276 src/mainwindow.c:1301
+#: src/mainwindow.c:1246 src/mainwindow.c:1287 src/mainwindow.c:1312
 msgid "Untitled"
 msgstr "Neoznačený"
 
-#: src/mainwindow.c:1302
+#: src/mainwindow.c:1313
 msgid "none"
 msgstr "žádný"
 
-#: src/mainwindow.c:1355
+#: src/mainwindow.c:1366
 #, 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:1605
+#: src/mainwindow.c:1616
 msgid "Offline"
 msgstr ""
 
-#: src/mainwindow.c:1606
+#: src/mainwindow.c:1617
 msgid "You are offline. Go online?"
 msgstr ""
 
-#: src/mainwindow.c:1623
+#: src/mainwindow.c:1634
 #, fuzzy
 msgid "Empty all trash"
 msgstr "Vyprázdnit koš"
 
-#: src/mainwindow.c:1624
+#: src/mainwindow.c:1635
 #, fuzzy
 msgid "Delete all messages in trash folders?"
 msgstr "Vyprázdnit všechny zprávy v koši?"
 
-#: src/mainwindow.c:1652
+#: src/mainwindow.c:1663
 msgid "Add mailbox"
 msgstr "Přidat poštovní schránku"
 
-#: src/mainwindow.c:1653
+#: src/mainwindow.c:1664
 #, fuzzy
 msgid ""
 "Specify the location of mailbox.\n"
@@ -3651,16 +3667,16 @@ msgstr ""
 "Pokud je zadán existující, bude automaticky\n"
 "prohledán."
 
-#: src/mainwindow.c:1659 src/setup.c:49
+#: src/mainwindow.c:1670 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Poštovní schránka '%s' již existuje."
 
-#: src/mainwindow.c:1664 src/setup.c:56
+#: src/mainwindow.c:1675 src/setup.c:56
 msgid "Mailbox"
 msgstr "Poštovní schránka"
 
-#: src/mainwindow.c:1670 src/setup.c:62
+#: src/mainwindow.c:1681 src/setup.c:62
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3670,149 +3686,149 @@ 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:2088
+#: src/mainwindow.c:2099
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Zobrazení složky"
 
-#: src/mainwindow.c:2107
+#: src/mainwindow.c:2118
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Zobrazení zprávy"
 
-#: src/mainwindow.c:2259 src/summaryview.c:408
+#: src/mainwindow.c:2270 src/summaryview.c:408
 msgid "/_Reply"
 msgstr "/_Odpovědět"
 
-#: src/mainwindow.c:2260
+#: src/mainwindow.c:2271
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "Odpovídá všem"
 
-#: src/mainwindow.c:2261
+#: src/mainwindow.c:2272
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/Odpovědět _komu/_odesílateli"
 
-#: src/mainwindow.c:2262
+#: src/mainwindow.c:2273
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/Odpovědět _komu/do _diskusního listu"
 
-#: src/mainwindow.c:2267 src/summaryview.c:415
+#: src/mainwindow.c:2278 src/summaryview.c:415
 msgid "/_Forward"
 msgstr "/Př_edat dál"
 
-#: src/mainwindow.c:2268 src/summaryview.c:416
+#: src/mainwindow.c:2279 src/summaryview.c:416
 msgid "/For_ward as attachment"
 msgstr "/Přeposlat _jako přílohu"
 
-#: src/mainwindow.c:2269 src/summaryview.c:417
+#: src/mainwindow.c:2280 src/summaryview.c:417
 msgid "/Redirec_t"
 msgstr "/Přes_měrovat"
 
-#: src/mainwindow.c:2305
+#: src/mainwindow.c:2316
 msgid "Get"
 msgstr "Stáhnout"
 
-#: src/mainwindow.c:2306
+#: src/mainwindow.c:2317
 msgid "Incorporate new mail"
 msgstr "Začlenit novou poštu"
 
-#: src/mainwindow.c:2313
+#: src/mainwindow.c:2324
 msgid "Get all"
 msgstr "Stáhnout vše"
 
-#: src/mainwindow.c:2314
+#: src/mainwindow.c:2325
 msgid "Incorporate new mail of all accounts"
 msgstr "Začlení novou poštu ze všech účtů"
 
-#: src/mainwindow.c:2325
+#: src/mainwindow.c:2336
 msgid "Send queued message(s)"
 msgstr "Odešle pozdrženou zprávu(y)"
 
-#: src/mainwindow.c:2335 src/prefs_account_dialog.c:530
+#: src/mainwindow.c:2346 src/prefs_account_dialog.c:530
 #: src/prefs_common_dialog.c:663 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "Napsat"
 
-#: src/mainwindow.c:2336
+#: src/mainwindow.c:2347
 msgid "Compose new message"
 msgstr "Vytváří novou zprávu"
 
-#: src/mainwindow.c:2344 src/prefs_common_dialog.c:975
+#: src/mainwindow.c:2355 src/prefs_common_dialog.c:975
 msgid "Reply"
 msgstr "Odpovědět"
 
-#: src/mainwindow.c:2345 src/mainwindow.c:2358
+#: src/mainwindow.c:2356 src/mainwindow.c:2369
 msgid "Reply to the message"
 msgstr "Odpovídá na zprávu"
 
-#: src/mainwindow.c:2362
+#: src/mainwindow.c:2373
 msgid "Reply all"
 msgstr "Odpov. všem"
 
-#: src/mainwindow.c:2363
+#: src/mainwindow.c:2374
 msgid "Reply to all"
 msgstr "Odpovídá všem"
 
-#: src/mainwindow.c:2371 src/prefs_filter_edit.c:672
+#: src/mainwindow.c:2382 src/prefs_filter_edit.c:672
 msgid "Forward"
 msgstr "Poslat dál"
 
-#: src/mainwindow.c:2372 src/mainwindow.c:2385
+#: src/mainwindow.c:2383 src/mainwindow.c:2396
 msgid "Forward the message"
 msgstr "Předává zprávu dál"
 
-#: src/mainwindow.c:2392
+#: src/mainwindow.c:2403
 msgid "Delete the message"
 msgstr "Smazat zprávu"
 
-#: src/mainwindow.c:2401
+#: src/mainwindow.c:2412
 #, fuzzy
 msgid "Set as junk mail"
 msgstr "Nastavit jako výchozí"
 
-#: src/mainwindow.c:2410
+#: src/mainwindow.c:2421
 msgid "Execute"
 msgstr "Provést"
 
-#: src/mainwindow.c:2411
+#: src/mainwindow.c:2422
 msgid "Execute marked process"
 msgstr "Provést označený proces "
 
-#: src/mainwindow.c:2421
+#: src/mainwindow.c:2432
 msgid "Next unread message"
 msgstr "Další nepřečtenou zprávu"
 
-#: src/mainwindow.c:2433
+#: src/mainwindow.c:2444
 msgid "Prefs"
 msgstr "Nastavení"
 
-#: src/mainwindow.c:2434
+#: src/mainwindow.c:2445
 msgid "Common preferences"
 msgstr "Společná nastavení"
 
-#: src/mainwindow.c:2442 src/prefs_folder_item.c:289
+#: src/mainwindow.c:2453 src/prefs_folder_item.c:289
 #: src/prefs_folder_item.c:300 src/progressdialog.c:128
 msgid "Account"
 msgstr "Účet"
 
-#: src/mainwindow.c:2443
+#: src/mainwindow.c:2454
 msgid "Account setting"
 msgstr "Nastavení účtu"
 
-#: src/mainwindow.c:2615
+#: src/mainwindow.c:2626
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 
-#: src/mainwindow.c:2626
+#: src/mainwindow.c:2637
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 
-#: src/mainwindow.c:2892
+#: src/mainwindow.c:2903
 msgid "Exit"
 msgstr "Ukončení programu"
 
-#: src/mainwindow.c:2892
+#: src/mainwindow.c:2903
 msgid "Exit this program?"
 msgstr "Chcete ukončit tento program?"
 
@@ -3849,45 +3865,45 @@ msgstr "Dosažen konec zprávy, pokračovat od začátku?"
 msgid "Search finished"
 msgstr "Hledání ukončeno"
 
-#: src/messageview.c:261
+#: src/messageview.c:266
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/_Nástroje/Přidat odesílatele do a_dresáře"
 
-#: src/messageview.c:291
+#: src/messageview.c:296
 msgid "Creating message view...\n"
 msgstr "Vyvolávám zobrazení zprávy...\n"
 
-#: src/messageview.c:316
+#: src/messageview.c:321
 msgid "Text"
 msgstr "Text"
 
-#: src/messageview.c:321
+#: src/messageview.c:326
 msgid "Attachments"
 msgstr "Přílohy"
 
-#: src/messageview.c:371
+#: src/messageview.c:376
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:669 src/summaryview.c:3268
+#: src/messageview.c:674 src/summaryview.c:3425
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Nemohu uložit soubor '%s'."
 
-#: src/messageview.c:728 src/summaryview.c:3291
+#: src/messageview.c:733 src/summaryview.c:3448
 msgid "The message will be printed with the following command:"
 msgstr ""
 
-#: src/messageview.c:729 src/summaryview.c:3292
+#: src/messageview.c:734 src/summaryview.c:3449
 #, fuzzy
 msgid "(Default print command)"
 msgstr "Provést"
 
-#: src/messageview.c:731 src/prefs_common_dialog.c:2304 src/summaryview.c:3294
+#: src/messageview.c:736 src/prefs_common_dialog.c:2304 src/summaryview.c:3451
 msgid "Print"
 msgstr "Tisk"
 
-#: src/messageview.c:740 src/summaryview.c:3303
+#: src/messageview.c:745 src/summaryview.c:3460
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -4795,8 +4811,8 @@ msgstr "Zobrazit příjemce ve sloupci 'Od', jestliže odesílatel jste vy sám"
 msgid "Expand threads"
 msgstr "Rozbalit vlákna"
 
-#: src/prefs_common_dialog.c:1413 src/prefs_common_dialog.c:2713
-#: src/prefs_common_dialog.c:2751
+#: src/prefs_common_dialog.c:1413 src/prefs_common_dialog.c:2716
+#: src/prefs_common_dialog.c:2754
 msgid "Date format"
 msgstr "Formát datumu"
 
@@ -5097,8 +5113,8 @@ msgstr "Externí příkaz (%s bude nahrazen jménem souboru / URI)"
 msgid "Web browser"
 msgstr "Webový prohlížeč"
 
-#: src/prefs_common_dialog.c:2288 src/prefs_common_dialog.c:3775
-#: src/prefs_common_dialog.c:3796
+#: src/prefs_common_dialog.c:2288 src/prefs_common_dialog.c:3778
+#: src/prefs_common_dialog.c:3799
 #, fuzzy
 msgid "(Default browser)"
 msgstr "Výchozí inbox"
@@ -5174,216 +5190,226 @@ msgstr "Řecká (ISO-8859-7)"
 
 #: src/prefs_common_dialog.c:2495
 #, fuzzy
+msgid "Arabic (ISO-8859-6)"
+msgstr "Baltická (ISO-8859-4)"
+
+#: src/prefs_common_dialog.c:2496
+#, fuzzy
+msgid "Arabic (Windows-1256)"
+msgstr "Azbuka (Windows-1251)"
+
+#: src/prefs_common_dialog.c:2498
+#, fuzzy
 msgid "Hebrew (ISO-8859-8)"
 msgstr "Řecká (ISO-8859-7)"
 
-#: src/prefs_common_dialog.c:2496
+#: src/prefs_common_dialog.c:2499
 #, fuzzy
 msgid "Hebrew (Windows-1255)"
 msgstr "Azbuka (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2498
+#: src/prefs_common_dialog.c:2501
 msgid "Turkish (ISO-8859-9)"
 msgstr "Turecká (ISO-8859-9)"
 
-#: src/prefs_common_dialog.c:2500
+#: src/prefs_common_dialog.c:2503
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Azbuka (ISO-8859-5)"
 
-#: src/prefs_common_dialog.c:2501
+#: src/prefs_common_dialog.c:2504
 msgid "Cyrillic (KOI8-R)"
 msgstr "Azbuka (KOI8-R)"
 
-#: src/prefs_common_dialog.c:2502
+#: src/prefs_common_dialog.c:2505
 msgid "Cyrillic (KOI8-U)"
 msgstr "Azbuka (KOI8-U)"
 
-#: src/prefs_common_dialog.c:2503
+#: src/prefs_common_dialog.c:2506
 msgid "Cyrillic (Windows-1251)"
 msgstr "Azbuka (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2505
+#: src/prefs_common_dialog.c:2508
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Japonská (ISO-2022-JP)"
 
-#: src/prefs_common_dialog.c:2507
+#: src/prefs_common_dialog.c:2510
 msgid "Japanese (EUC-JP)"
 msgstr "Japonská (EUC-JP)"
 
-#: src/prefs_common_dialog.c:2508
+#: src/prefs_common_dialog.c:2511
 msgid "Japanese (Shift_JIS)"
 msgstr "Japonská (Shift_JIS)"
 
-#: src/prefs_common_dialog.c:2511
+#: src/prefs_common_dialog.c:2514
 msgid "Simplified Chinese (GB2312)"
 msgstr "Zjednodušená čínská (GB2312)"
 
-#: src/prefs_common_dialog.c:2512
+#: src/prefs_common_dialog.c:2515
 #, fuzzy
 msgid "Simplified Chinese (GBK)"
 msgstr "Zjednodušená čínská (GB2312)"
 
-#: src/prefs_common_dialog.c:2513
+#: src/prefs_common_dialog.c:2516
 msgid "Traditional Chinese (Big5)"
 msgstr "Tradiční čínská (Big5)"
 
-#: src/prefs_common_dialog.c:2515
+#: src/prefs_common_dialog.c:2518
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Tradiční čínská (EUC-TW)"
 
-#: src/prefs_common_dialog.c:2516
+#: src/prefs_common_dialog.c:2519
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Čínská (ISO-2022-CN)"
 
-#: src/prefs_common_dialog.c:2519
+#: src/prefs_common_dialog.c:2522
 msgid "Korean (EUC-KR)"
 msgstr "Korejská (EUC-KR)"
 
-#: src/prefs_common_dialog.c:2521
+#: src/prefs_common_dialog.c:2524
 msgid "Thai (TIS-620)"
 msgstr "Thajská (TIS-620)"
 
-#: src/prefs_common_dialog.c:2522
+#: src/prefs_common_dialog.c:2525
 msgid "Thai (Windows-874)"
 msgstr "Thajská (Windows-874)"
 
-#: src/prefs_common_dialog.c:2689
+#: src/prefs_common_dialog.c:2692
 msgid "the full abbreviated weekday name"
 msgstr "zkratky pro názvy dnů v týdnu"
 
-#: src/prefs_common_dialog.c:2690
+#: src/prefs_common_dialog.c:2693
 msgid "the full weekday name"
 msgstr "plný název dne v týdnu"
 
-#: src/prefs_common_dialog.c:2691
+#: src/prefs_common_dialog.c:2694
 msgid "the abbreviated month name"
 msgstr "zkratka pro měsíc"
 
-#: src/prefs_common_dialog.c:2692
+#: src/prefs_common_dialog.c:2695
 msgid "the full month name"
 msgstr "plný název měsíce"
 
-#: src/prefs_common_dialog.c:2693
+#: src/prefs_common_dialog.c:2696
 msgid "the preferred date and time for the current locale"
 msgstr "preferované datum a čas podle aktuálního locale"
 
-#: src/prefs_common_dialog.c:2694
+#: src/prefs_common_dialog.c:2697
 msgid "the century number (year/100)"
 msgstr "století (rok/100)"
 
-#: src/prefs_common_dialog.c:2695
+#: src/prefs_common_dialog.c:2698
 msgid "the day of the month as a decimal number"
 msgstr "den v měsíci číselně"
 
-#: src/prefs_common_dialog.c:2696
+#: src/prefs_common_dialog.c:2699
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "hodiny číselně s 24 hodinových cyklem"
 
-#: src/prefs_common_dialog.c:2697
+#: src/prefs_common_dialog.c:2700
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "hodiny číselně s 12 hodinových cyklem"
 
-#: src/prefs_common_dialog.c:2698
+#: src/prefs_common_dialog.c:2701
 msgid "the day of the year as a decimal number"
 msgstr "rok číselně"
 
-#: src/prefs_common_dialog.c:2699
+#: src/prefs_common_dialog.c:2702
 msgid "the month as a decimal number"
 msgstr "měsíc číselně"
 
-#: src/prefs_common_dialog.c:2700
+#: src/prefs_common_dialog.c:2703
 msgid "the minute as a decimal number"
 msgstr "minuty číselně"
 
-#: src/prefs_common_dialog.c:2701
+#: src/prefs_common_dialog.c:2704
 msgid "either AM or PM"
 msgstr "AM nebo PM"
 
-#: src/prefs_common_dialog.c:2702
+#: src/prefs_common_dialog.c:2705
 msgid "the second as a decimal number"
 msgstr "vteřiny číselně"
 
-#: src/prefs_common_dialog.c:2703
+#: src/prefs_common_dialog.c:2706
 msgid "the day of the week as a decimal number"
 msgstr "den v týdnu číselně"
 
-#: src/prefs_common_dialog.c:2704
+#: src/prefs_common_dialog.c:2707
 msgid "the preferred date for the current locale"
 msgstr "preferovaný datum pro aktuální locale"
 
-#: src/prefs_common_dialog.c:2705
+#: src/prefs_common_dialog.c:2708
 msgid "the last two digits of a year"
 msgstr "poslední dvě číslice z roku"
 
-#: src/prefs_common_dialog.c:2706
+#: src/prefs_common_dialog.c:2709
 msgid "the year as a decimal number"
 msgstr "rok jako desítkové číslo"
 
-#: src/prefs_common_dialog.c:2707
+#: src/prefs_common_dialog.c:2710
 msgid "the time zone or name or abbreviation"
 msgstr "časová zóna, název nebo zkratka"
 
-#: src/prefs_common_dialog.c:2728
+#: src/prefs_common_dialog.c:2731
 msgid "Specifier"
 msgstr "Specifikátor"
 
-#: src/prefs_common_dialog.c:2729
+#: src/prefs_common_dialog.c:2732
 msgid "Description"
 msgstr "Popis"
 
-#: src/prefs_common_dialog.c:2769
+#: src/prefs_common_dialog.c:2772
 msgid "Example"
 msgstr "Příklad"
 
-#: src/prefs_common_dialog.c:2850
+#: src/prefs_common_dialog.c:2853
 msgid "Set message colors"
 msgstr "Nastavení barev pro zprávy"
 
-#: src/prefs_common_dialog.c:2858
+#: src/prefs_common_dialog.c:2861
 msgid "Colors"
 msgstr "Barvy"
 
-#: src/prefs_common_dialog.c:2892
+#: src/prefs_common_dialog.c:2895
 msgid "Quoted Text - First Level"
 msgstr "Citovaný text - První úroveň"
 
-#: src/prefs_common_dialog.c:2898
+#: src/prefs_common_dialog.c:2901
 msgid "Quoted Text - Second Level"
 msgstr "Citovaný text - Druhá úroveň"
 
-#: src/prefs_common_dialog.c:2904
+#: src/prefs_common_dialog.c:2907
 msgid "Quoted Text - Third Level"
 msgstr "Citovaný text - Třetí úroveň"
 
-#: src/prefs_common_dialog.c:2910
+#: src/prefs_common_dialog.c:2913
 msgid "URI link"
 msgstr "URI odkaz"
 
-#: src/prefs_common_dialog.c:2917
+#: src/prefs_common_dialog.c:2920
 msgid "Recycle quote colors"
 msgstr "Rotovat barvy citací"
 
-#: src/prefs_common_dialog.c:2984
+#: src/prefs_common_dialog.c:2987
 msgid "Pick color for quotation level 1"
 msgstr "Zvolte barvu pro 1 úroveň citace"
 
-#: src/prefs_common_dialog.c:2987
+#: src/prefs_common_dialog.c:2990
 msgid "Pick color for quotation level 2"
 msgstr "Zvolte barvu pro 2 úroveň citace"
 
-#: src/prefs_common_dialog.c:2990
+#: src/prefs_common_dialog.c:2993
 msgid "Pick color for quotation level 3"
 msgstr "Zvolte barvu pro 3 úroveň citace"
 
-#: src/prefs_common_dialog.c:2993
+#: src/prefs_common_dialog.c:2996
 msgid "Pick color for URI"
 msgstr "Získat barvu z URI"
 
-#: src/prefs_common_dialog.c:3133
+#: src/prefs_common_dialog.c:3136
 msgid "Description of symbols"
 msgstr "Popis symbolů"
 
-#: src/prefs_common_dialog.c:3189
+#: src/prefs_common_dialog.c:3192
 msgid ""
 "Date\n"
 "From\n"
@@ -5407,11 +5433,11 @@ msgstr ""
 "Diskuzní skupina\n"
 "Číslo zprávy"
 
-#: src/prefs_common_dialog.c:3202
+#: src/prefs_common_dialog.c:3205
 msgid "If x is set, displays expr"
 msgstr ""
 
-#: src/prefs_common_dialog.c:3206
+#: src/prefs_common_dialog.c:3209
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -5425,7 +5451,7 @@ msgstr ""
 "Citované tělo zprávy bez podpisu\n"
 "Znak %"
 
-#: src/prefs_common_dialog.c:3214
+#: src/prefs_common_dialog.c:3217
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -5437,20 +5463,20 @@ msgstr ""
 "Znak levá složená závorka\n"
 "Znak pravá složená závorka"
 
-#: src/prefs_common_dialog.c:3260
+#: src/prefs_common_dialog.c:3263
 msgid "Key bindings"
 msgstr "Klávesové zkratky"
 
-#: src/prefs_common_dialog.c:3273
+#: src/prefs_common_dialog.c:3276
 #, fuzzy
 msgid "Select the preset of key bindings."
 msgstr " Nastavit klávesové zkratky... "
 
-#: src/prefs_common_dialog.c:3283 src/prefs_common_dialog.c:3607
+#: src/prefs_common_dialog.c:3286 src/prefs_common_dialog.c:3610
 msgid "Default"
 msgstr "Výchozí"
 
-#: src/prefs_common_dialog.c:3286 src/prefs_common_dialog.c:3616
+#: src/prefs_common_dialog.c:3289 src/prefs_common_dialog.c:3619
 msgid "Old Sylpheed"
 msgstr "Starý Sylpheed"
 
@@ -5575,7 +5601,7 @@ msgstr ""
 msgid "Age"
 msgstr ""
 
-#: src/prefs_filter_edit.c:501 src/summaryview.c:510
+#: src/prefs_filter_edit.c:501 src/summaryview.c:512
 #, fuzzy
 msgid "Marked"
 msgstr "Označit"
@@ -5829,17 +5855,17 @@ msgid "Attachment"
 msgstr "Příloha"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73 src/query_search.c:371 src/summaryview.c:4733
+#: src/prefs_summary_column.c:73 src/query_search.c:371 src/summaryview.c:4890
 msgid "Subject"
 msgstr "Předmět"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/query_search.c:372 src/summaryview.c:4736
+#: src/prefs_summary_column.c:74 src/query_search.c:372 src/summaryview.c:4893
 msgid "From"
 msgstr "Od"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/query_search.c:373 src/summaryview.c:4738
+#: src/prefs_summary_column.c:75 src/query_search.c:373 src/summaryview.c:4895
 msgid "Date"
 msgstr "Datum"
 
@@ -5941,7 +5967,7 @@ msgstr "Vyhledat zprávy"
 msgid "_Save as search folder"
 msgstr "Vyhledání složky"
 
-#: src/query_search.c:512 src/subscribedialog.c:523 src/summaryview.c:840
+#: src/query_search.c:512 src/subscribedialog.c:523 src/summaryview.c:842
 msgid "Done."
 msgstr "Hotovo."
 
@@ -5955,7 +5981,7 @@ msgstr "Prohledávám složku %s ..."
 msgid "Searching %s (%d / %d)..."
 msgstr "Filtruji..."
 
-#: src/query_search.c:645 src/summaryview.c:2048
+#: src/query_search.c:645 src/summaryview.c:2051
 msgid "(No Date)"
 msgstr "(Žádné datum)"
 
@@ -6329,305 +6355,310 @@ msgid "/_Mark/Mark as rea_d"
 msgstr "/_Označit/Označit jako př_ečtené"
 
 #: src/summaryview.c:429
+#, fuzzy
+msgid "/_Mark/Mark _thread as read"
+msgstr "/_Označit/Označit jako př_ečtené"
+
+#: src/summaryview.c:431
 msgid "/_Mark/Mark all _read"
 msgstr "/_Označit/Označit všechny jako _přečtené"
 
-#: src/summaryview.c:430
+#: src/summaryview.c:432
 msgid "/Color la_bel"
 msgstr "/_Barevné označení"
 
-#: src/summaryview.c:434
+#: src/summaryview.c:436
 msgid "/Re-_edit"
 msgstr "/Z_novu upravit"
 
-#: src/summaryview.c:436
+#: src/summaryview.c:438
 #, fuzzy
 msgid "/Add sender to address boo_k..."
 msgstr "/Přidat odesílatele do data_báze adres"
 
-#: src/summaryview.c:438
+#: src/summaryview.c:440
 msgid "/Create f_ilter rule"
 msgstr "/_Vytvořit filtr"
 
-#: src/summaryview.c:439
+#: src/summaryview.c:441
 msgid "/Create f_ilter rule/_Automatically"
 msgstr "/_Vytvořit filtr/_Automaticky"
 
-#: src/summaryview.c:441
+#: src/summaryview.c:443
 msgid "/Create f_ilter rule/by _From"
 msgstr "/_Vytvořit filtr/podle _Od"
 
-#: src/summaryview.c:443
+#: src/summaryview.c:445
 msgid "/Create f_ilter rule/by _To"
 msgstr "/_Vytvořit filtr/podle _Komu"
 
-#: src/summaryview.c:445
+#: src/summaryview.c:447
 msgid "/Create f_ilter rule/by _Subject"
 msgstr "/_Vytvořit filtr/podle _Předmětu"
 
-#: src/summaryview.c:451
+#: src/summaryview.c:453
 msgid "/_View/_Source"
 msgstr "/_Zobrazit/_Zdroj"
 
-#: src/summaryview.c:452
+#: src/summaryview.c:454
 msgid "/_View/All _header"
 msgstr "/_Zobrazit/Všechna zá_hlaví"
 
-#: src/summaryview.c:454
+#: src/summaryview.c:456
 msgid "/_Print..."
 msgstr "/_Tisk..."
 
-#: src/summaryview.c:486
+#: src/summaryview.c:488
 msgid "Creating summary view...\n"
 msgstr "Vytvářím celkový pohled...\n"
 
-#: src/summaryview.c:508
+#: src/summaryview.c:510
 msgid "All"
 msgstr ""
 
-#: src/summaryview.c:511
+#: src/summaryview.c:513
 #, fuzzy
 msgid "Have color label"
 msgstr "/_Barevné označení"
 
-#: src/summaryview.c:512
+#: src/summaryview.c:514
 #, fuzzy
 msgid "Have attachment"
 msgstr "Příloha"
 
-#: src/summaryview.c:521
+#: src/summaryview.c:523
 #, fuzzy
 msgid "Search:"
 msgstr "Vyhledat"
 
-#: src/summaryview.c:535
+#: src/summaryview.c:537
 msgid "Search for Subject or From"
 msgstr ""
 
-#: src/summaryview.c:702
+#: src/summaryview.c:704
 msgid "Process mark"
 msgstr "Zpracovat označené"
 
-#: src/summaryview.c:703
+#: src/summaryview.c:705
 msgid "Some marks are left. Process it?"
 msgstr "Zbyly nějaké označené. Zpracovat je?"
 
-#: src/summaryview.c:749
+#: src/summaryview.c:751
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "Prohledávám složku (%s)..."
 
-#: src/summaryview.c:1292
+#: src/summaryview.c:1295
 #, fuzzy
 msgid "_Search again"
 msgstr "Hledat znova"
 
-#: src/summaryview.c:1313 src/summaryview.c:1322
+#: src/summaryview.c:1316 src/summaryview.c:1325
 msgid "No more unread messages"
 msgstr "Nejsou již žádné nepřečtené zprávy"
 
-#: src/summaryview.c:1314
+#: src/summaryview.c:1317
 msgid "No unread message found. Search from the end?"
 msgstr "Nebyla nalezena žádná nepřečtená zpráva. Hledat od konce?"
 
-#: src/summaryview.c:1316
+#: src/summaryview.c:1319
 msgid "No unread messages."
 msgstr "Žádné nepřečtené zprávy."
 
-#: src/summaryview.c:1323
+#: src/summaryview.c:1326
 msgid "No unread message found. Go to next folder?"
 msgstr "Nebyla nalezena žádná nepřečtená zpráva. Chcete jít do další složky?"
 
-#: src/summaryview.c:1331 src/summaryview.c:1340
+#: src/summaryview.c:1334 src/summaryview.c:1343
 msgid "No more new messages"
 msgstr "Nejsou již žádné nové zprávy"
 
-#: src/summaryview.c:1332
+#: src/summaryview.c:1335
 msgid "No new message found. Search from the end?"
 msgstr "Nebyla nalezena žádná nová zpráva. Hledat od konce?"
 
-#: src/summaryview.c:1334
+#: src/summaryview.c:1337
 msgid "No new messages."
 msgstr "Žádné nové zprávy."
 
-#: src/summaryview.c:1341
+#: src/summaryview.c:1344
 msgid "No new message found. Go to next folder?"
 msgstr "Nebyla nalezena žádná nová zpráva. Chcete jít do další složky?"
 
-#: src/summaryview.c:1349 src/summaryview.c:1358
+#: src/summaryview.c:1352 src/summaryview.c:1361
 msgid "No more marked messages"
 msgstr "Nejsou již žádné označené zprávy"
 
-#: src/summaryview.c:1350
+#: src/summaryview.c:1353
 msgid "No marked message found. Search from the end?"
 msgstr "Nebyla nalezena žádná nepřečtená zpráva. Hledat od konce?"
 
-#: src/summaryview.c:1352 src/summaryview.c:1361
+#: src/summaryview.c:1355 src/summaryview.c:1364
 msgid "No marked messages."
 msgstr "Žádná neoznačená zpráva."
 
-#: src/summaryview.c:1359
+#: src/summaryview.c:1362
 msgid "No marked message found. Search from the beginning?"
 msgstr "Nebyla nalezena žádná neoznačená zpráva. Hledat od začátku?"
 
-#: src/summaryview.c:1367 src/summaryview.c:1376
+#: src/summaryview.c:1370 src/summaryview.c:1379
 msgid "No more labeled messages"
 msgstr "Nejsou již žádné zprávy s návěštím"
 
-#: src/summaryview.c:1368
+#: src/summaryview.c:1371
 msgid "No labeled message found. Search from the end?"
 msgstr "Nebyla nalezena žádná zpráva s návěštím. Hledat od konce?"
 
-#: src/summaryview.c:1370 src/summaryview.c:1379
+#: src/summaryview.c:1373 src/summaryview.c:1382
 msgid "No labeled messages."
 msgstr "Žádná zpráva s návěštím."
 
-#: src/summaryview.c:1377
+#: src/summaryview.c:1380
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Nenalezena žádná zpráva s návěštím. Hledat od začátku?"
 
-#: src/summaryview.c:1693
+#: src/summaryview.c:1696
 msgid "Attracting messages by subject..."
 msgstr "Získávám zprávy od osoby..."
 
-#: src/summaryview.c:1887
+#: src/summaryview.c:1890
 #, c-format
 msgid "%d deleted"
 msgstr "%d smazané"
 
-#: src/summaryview.c:1891
+#: src/summaryview.c:1894
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d přemístěné"
 
-#: src/summaryview.c:1892 src/summaryview.c:1897
+#: src/summaryview.c:1895 src/summaryview.c:1900
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:1896
+#: src/summaryview.c:1899
 #, c-format
 msgid "%s%d copied"
 msgstr "%s %d zkopírováno"
 
-#: src/summaryview.c:1911
+#: src/summaryview.c:1914
 msgid " item(s) selected"
 msgstr " položky(ek) vybrány"
 
-#: src/summaryview.c:1933
+#: src/summaryview.c:1936
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d nová(é), %d nepřečtená(é), celkem %d (%s)"
 
-#: src/summaryview.c:1937
+#: src/summaryview.c:1940
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d nových, %d nepřečtených, %d celkem"
 
-#: src/summaryview.c:1971
+#: src/summaryview.c:1974
 msgid "Sorting summary..."
 msgstr "Celkové setřídění..."
 
-#: src/summaryview.c:2194
+#: src/summaryview.c:2211
 msgid "\tSetting summary from message data..."
 msgstr "\tNastavuji přehled z dat zpráv..."
 
-#: src/summaryview.c:2196
+#: src/summaryview.c:2213
 msgid "Setting summary from message data..."
 msgstr "Nastavuji přehled z dat zpráv..."
 
-#: src/summaryview.c:2302
+#: src/summaryview.c:2319
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Zapisuji celkovou mezipaměť (%s)..."
 
-#: src/summaryview.c:2643
+#: src/summaryview.c:2660
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Zpráva %d je označena\n"
 
-#: src/summaryview.c:2701
+#: src/summaryview.c:2718
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Zpráva %d je označena jako přečtená\n"
 
-#: src/summaryview.c:2789
+#: src/summaryview.c:2908
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Zpráva %d je označena jako nepřečtená\n"
 
-#: src/summaryview.c:2850
+#: src/summaryview.c:2969
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Zpráva %s/%d je nastavena ke smazání\n"
 
-#: src/summaryview.c:2878
+#: src/summaryview.c:2997
 msgid "Delete message(s)"
 msgstr "Smazat zprávu(y)"
 
-#: src/summaryview.c:2879
+#: src/summaryview.c:2998
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Opravdu chcete smazat tuto zprávu(y) z koše?"
 
-#: src/summaryview.c:2953
+#: src/summaryview.c:3072
 msgid "Deleting duplicated messages..."
 msgstr "Vymazávám duplikované zprávy..."
 
-#: src/summaryview.c:2991
+#: src/summaryview.c:3110
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Zpráva %s/%d je odznačena\n"
 
-#: src/summaryview.c:3049
+#: src/summaryview.c:3168
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Zpráva %d je nastavena pro přesun do %s\n"
 
-#: src/summaryview.c:3066
+#: src/summaryview.c:3196
 msgid "Destination is same as current folder."
 msgstr "Cílová položka je stejná jako aktuální složka."
 
-#: src/summaryview.c:3122
+#: src/summaryview.c:3260
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Zpráva %d je nastavena pro kopírování do %s\n"
 
-#: src/summaryview.c:3139
+#: src/summaryview.c:3288
 #, fuzzy
 msgid "Destination for copy is same as current folder."
 msgstr "Cíl kopírování je stejný jako aktuální složka."
 
-#: src/summaryview.c:3338
+#: src/summaryview.c:3495
 #, fuzzy
 msgid "Error occurred while processing messages."
 msgstr "Během zpracovávání pošty se vyskytla chyba ."
 
-#: src/summaryview.c:3646 src/summaryview.c:3647
+#: src/summaryview.c:3803 src/summaryview.c:3804
 msgid "Building threads..."
 msgstr "Vytvářím vlákna..."
 
-#: src/summaryview.c:3797 src/summaryview.c:3798
+#: src/summaryview.c:3954 src/summaryview.c:3955
 msgid "Unthreading..."
 msgstr "Ruším vlákna..."
 
-#: src/summaryview.c:4091 src/summaryview.c:4147
+#: src/summaryview.c:4248 src/summaryview.c:4304
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtruji..."
 
-#: src/summaryview.c:4196
+#: src/summaryview.c:4353
 msgid "filtering..."
 msgstr "filtruji..."
 
-#: src/summaryview.c:4197
+#: src/summaryview.c:4354
 msgid "Filtering..."
 msgstr "Filtruji..."
 
-#: src/summaryview.c:4233
+#: src/summaryview.c:4390
 #, fuzzy, c-format
 msgid "%d message(s) have been filtered."
 msgstr "Zpráva %d už byla v mezipaměti.\n"
 
-#: src/summaryview.c:4742
+#: src/summaryview.c:4899
 msgid "No."
 msgstr "Čís."
 
@@ -6645,36 +6676,36 @@ msgstr "Vytvářím zobrazení textu...\n"
 msgid "This message can't be displayed.\n"
 msgstr "zpráva nebyla přijata\n"
 
-#: src/textview.c:1929
+#: src/textview.c:1925
 #, fuzzy
 msgid "Sa_ve this image as..."
 msgstr "/_Uložit jako..."
 
-#: src/textview.c:1945 src/trayicon.c:109
+#: src/textview.c:1941 src/trayicon.c:109
 #, fuzzy
 msgid "Compose _new message"
 msgstr "Vytváří novou zprávu"
 
-#: src/textview.c:1947
+#: src/textview.c:1943
 #, fuzzy
 msgid "Add to address _book..."
 msgstr "/Přidat odesílatele do data_báze adres"
 
-#: src/textview.c:1949
+#: src/textview.c:1945
 #, fuzzy
 msgid "Copy this add_ress"
 msgstr "Společná adresa"
 
-#: src/textview.c:1952
+#: src/textview.c:1948
 #, fuzzy
 msgid "_Open with Web browser"
 msgstr "Webový prohlížeč"
 
-#: src/textview.c:1954
+#: src/textview.c:1950
 msgid "Copy this _link"
 msgstr ""
 
-#: src/textview.c:2097
+#: src/textview.c:2093
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6683,7 +6714,7 @@ msgid ""
 "Open it anyway?"
 msgstr ""
 
-#: src/textview.c:2102
+#: src/textview.c:2098
 msgid "Fake URL warning"
 msgstr ""
 
diff --git a/po/da.po b/po/da.po
index 33007683..d8c184e1 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: 2006-01-27 18:11+0900\n"
+"POT-Creation-Date: 2006-01-31 15:20+0900\n"
 "PO-Revision-Date: 2003-07-29 09:05+0200\n"
 "Last-Translator: Andreas Hinz <news3@acci.dk>\n"
 "Language-Team: \n"
@@ -505,7 +505,7 @@ msgstr "Fundet %s\n"
 msgid "Configuration is saved.\n"
 msgstr "Konfiguration er gemt.\n"
 
-#: libsylph/prefs_common.c:489
+#: libsylph/prefs_common.c:491
 #, fuzzy
 msgid "Junk mail filter"
 msgstr "Mappe"
@@ -621,8 +621,8 @@ msgstr "%.2fMB"
 msgid "%.2fGB"
 msgstr "%.2fGB"
 
-#: libsylph/utils.c:2373 src/compose.c:2858 src/compose.c:3121
-#: src/compose.c:3184 src/compose.c:3304
+#: libsylph/utils.c:2373 src/compose.c:2867 src/compose.c:3130
+#: src/compose.c:3193 src/compose.c:3313
 msgid "can't change file mode\n"
 msgstr "kan ikke ændre fil mode\n"
 
@@ -707,8 +707,8 @@ msgstr ""
 "Nye meddelelser bliver testet i denne rækkefølge. Afmærk\n"
 "`G'-kolonnen, for at aktivere hentning via `hent alle'."
 
-#: src/account_dialog.c:366 src/addressadd.c:192 src/addressbook.c:491
-#: src/compose.c:4262 src/editaddress.c:200 src/editaddress.c:942
+#: src/account_dialog.c:366 src/addressadd.c:192 src/addressbook.c:493
+#: src/compose.c:4271 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:206 src/prefs_filter.c:259 src/prefs_folder_item.c:171
@@ -846,12 +846,12 @@ msgstr "Handlingens bruger parameter"
 msgid "Add Address to Book"
 msgstr "Tilføj adresse i adressebog"
 
-#: src/addressadd.c:202 src/compose.c:4762 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4771 src/editaddress.c:201
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "Adresse"
 
-#: src/addressadd.c:212 src/addressbook.c:493 src/editaddress.c:202
+#: src/addressadd.c:212 src/addressbook.c:495 src/editaddress.c:202
 #: src/editaddress.c:795 src/editaddress.c:860 src/editgroup.c:267
 msgid "Remarks"
 msgstr "Kommentar"
@@ -860,183 +860,183 @@ msgstr "Kommentar"
 msgid "Select Address Book Folder"
 msgstr "Vælg adressebog mappe"
 
-#: src/addressbook.c:336 src/compose.c:515 src/mainwindow.c:477
+#: src/addressbook.c:338 src/compose.c:515 src/mainwindow.c:480
 #: src/messageview.c:138
 msgid "/_File"
 msgstr "/_Filer"
 
-#: src/addressbook.c:337
+#: src/addressbook.c:339
 msgid "/_File/New _Book"
 msgstr "/_Filer/Ny _adressebog"
 
-#: src/addressbook.c:338
+#: src/addressbook.c:340
 msgid "/_File/New _vCard"
 msgstr "/_Filer/Ny _vCard"
 
-#: src/addressbook.c:340
+#: src/addressbook.c:342
 msgid "/_File/New _JPilot"
 msgstr "/_Filer/Ny _JPilot"
 
-#: src/addressbook.c:343
+#: src/addressbook.c:345
 msgid "/_File/New _Server"
 msgstr "/_Filer/Ny _server"
 
-#: src/addressbook.c:345 src/addressbook.c:348 src/compose.c:520
-#: src/compose.c:525 src/compose.c:528 src/compose.c:531 src/mainwindow.c:495
-#: src/mainwindow.c:498 src/mainwindow.c:500 src/mainwindow.c:503
-#: src/mainwindow.c:505 src/messageview.c:141
+#: src/addressbook.c:347 src/addressbook.c:350 src/compose.c:520
+#: src/compose.c:525 src/compose.c:528 src/compose.c:531 src/mainwindow.c:498
+#: src/mainwindow.c:501 src/mainwindow.c:503 src/mainwindow.c:506
+#: src/mainwindow.c:508 src/messageview.c:141
 msgid "/_File/---"
 msgstr "/_Filer/---"
 
-#: src/addressbook.c:346
+#: src/addressbook.c:348
 msgid "/_File/_Edit"
 msgstr "/_Filer/_Redigér"
 
-#: src/addressbook.c:347
+#: src/addressbook.c:349
 msgid "/_File/_Delete"
 msgstr "/_Filer/_Slet"
 
-#: src/addressbook.c:349
+#: src/addressbook.c:351
 msgid "/_File/_Save"
 msgstr "/_Filer/_Gem"
 
-#: src/addressbook.c:350 src/compose.c:532 src/messageview.c:142
+#: src/addressbook.c:352 src/compose.c:532 src/messageview.c:142
 msgid "/_File/_Close"
 msgstr "/_Filer/_Luk"
 
-#: src/addressbook.c:351
+#: src/addressbook.c:353
 msgid "/_Address"
 msgstr "/_Adresse"
 
-#: src/addressbook.c:352
+#: src/addressbook.c:354
 msgid "/_Address/New _Address"
 msgstr "/_Adresse/Ny _adresse"
 
-#: src/addressbook.c:353
+#: src/addressbook.c:355
 msgid "/_Address/New _Group"
 msgstr "/_Adresse/Ny _gruppe"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:356
 msgid "/_Address/New _Folder"
 msgstr "/_Adresse/Ny _mappe"
 
-#: src/addressbook.c:355
+#: src/addressbook.c:357
 msgid "/_Address/---"
 msgstr "/_Adresse/---"
 
-#: src/addressbook.c:356
+#: src/addressbook.c:358
 msgid "/_Address/_Edit"
 msgstr "/_Adresse/_Redigér"
 
-#: src/addressbook.c:357
+#: src/addressbook.c:359
 msgid "/_Address/_Delete"
 msgstr "/_Adresse/_Slet"
 
-#: src/addressbook.c:358 src/compose.c:639 src/mainwindow.c:738
-#: src/messageview.c:259
+#: src/addressbook.c:360 src/compose.c:645 src/mainwindow.c:749
+#: src/messageview.c:264
 msgid "/_Tools"
 msgstr "/_Funktioner"
 
-#: src/addressbook.c:359
+#: src/addressbook.c:361
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Funktioner/Importer _LDIF-Fil"
 
-#: src/addressbook.c:360 src/compose.c:658 src/mainwindow.c:788
-#: src/messageview.c:277
+#: src/addressbook.c:362 src/compose.c:664 src/mainwindow.c:799
+#: src/messageview.c:282
 msgid "/_Help"
 msgstr "/_Hjælp"
 
-#: src/addressbook.c:361 src/compose.c:659 src/mainwindow.c:799
-#: src/messageview.c:278
+#: src/addressbook.c:363 src/compose.c:665 src/mainwindow.c:810
+#: src/messageview.c:283
 msgid "/_Help/_About"
 msgstr "/_Hjælp/_Om"
 
-#: src/addressbook.c:380 src/addressbook.c:390
+#: src/addressbook.c:382 src/addressbook.c:392
 msgid "/New _Address"
 msgstr "/Ny _adresse"
 
-#: src/addressbook.c:381 src/addressbook.c:391
+#: src/addressbook.c:383 src/addressbook.c:393
 msgid "/New _Group"
 msgstr "/Ny _gruppe"
 
-#: src/addressbook.c:382 src/addressbook.c:392
+#: src/addressbook.c:384 src/addressbook.c:394
 msgid "/New _Folder"
 msgstr "/Ny _mappe"
 
-#: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:509
+#: src/addressbook.c:385 src/addressbook.c:395 src/compose.c:509
 #: src/folderview.c:246 src/folderview.c:248 src/folderview.c:253
 #: src/folderview.c:266 src/folderview.c:268 src/folderview.c:270
 #: src/folderview.c:275 src/folderview.c:289 src/folderview.c:291
 #: src/folderview.c:295 src/summaryview.c:414 src/summaryview.c:418
-#: src/summaryview.c:421 src/summaryview.c:431 src/summaryview.c:433
-#: src/summaryview.c:435 src/summaryview.c:447 src/summaryview.c:453
+#: src/summaryview.c:421 src/summaryview.c:433 src/summaryview.c:435
+#: src/summaryview.c:437 src/summaryview.c:449 src/summaryview.c:455
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:534
-#: src/mainwindow.c:509 src/messageview.c:144
+#: src/addressbook.c:386 src/addressbook.c:396 src/compose.c:534
+#: src/mainwindow.c:512 src/messageview.c:144
 msgid "/_Edit"
 msgstr "/_Redigér"
 
-#: src/addressbook.c:385 src/addressbook.c:395 src/summaryview.c:432
+#: src/addressbook.c:387 src/addressbook.c:397 src/summaryview.c:434
 msgid "/_Delete"
 msgstr "/_Slet"
 
-#: src/addressbook.c:492
+#: src/addressbook.c:494
 msgid "E-Mail address"
 msgstr "E-post adresse"
 
-#: src/addressbook.c:496 src/compose.c:4763 src/prefs_common_dialog.c:2183
+#: src/addressbook.c:498 src/compose.c:4772 src/prefs_common_dialog.c:2183
 msgid "Address book"
 msgstr "Adressebog"
 
-#: src/addressbook.c:596 src/prefs_filter_edit.c:249
+#: src/addressbook.c:600 src/prefs_filter_edit.c:249
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "Navn:"
 
 #. Buttons
-#: src/addressbook.c:628 src/addressbook.c:1680 src/editaddress.c:884
-#: src/editaddress.c:1017 src/mainwindow.c:2391 src/prefs_actions.c:266
+#: src/addressbook.c:632 src/addressbook.c:1684 src/editaddress.c:884
+#: src/editaddress.c:1017 src/mainwindow.c:2402 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
 #: src/prefs_template.c:233
 msgid "Delete"
 msgstr "Slet"
 
-#: src/addressbook.c:631 src/editaddress.c:890 src/editaddress.c:1023
+#: src/addressbook.c:635 src/editaddress.c:890 src/editaddress.c:1023
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:273 src/prefs_display_header.c:328
 #: src/prefs_filter_edit.c:1550
 msgid "Add"
 msgstr "Tilføj"
 
-#: src/addressbook.c:634
+#: src/addressbook.c:638
 msgid "Lookup"
 msgstr "Overblik"
 
-#: src/addressbook.c:646 src/headerview.c:55 src/prefs_folder_item.c:339
+#: src/addressbook.c:650 src/headerview.c:55 src/prefs_folder_item.c:339
 #: src/prefs_template.c:176
 msgid "To:"
 msgstr "Til:"
 
-#: src/addressbook.c:650 src/prefs_folder_item.c:356 src/prefs_template.c:178
+#: src/addressbook.c:654 src/prefs_folder_item.c:356 src/prefs_template.c:178
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:654 src/prefs_folder_item.c:367
+#: src/addressbook.c:658 src/prefs_folder_item.c:367
 msgid "Bcc:"
 msgstr "Bcc:"
 
 #. Confirm deletion
-#: src/addressbook.c:841
+#: src/addressbook.c:845
 msgid "Delete address(es)"
 msgstr "Slet adresse(r)"
 
-#: src/addressbook.c:842
+#: src/addressbook.c:846
 msgid "Really delete the address(es)?"
 msgstr "Virklig slette adresse(r)?"
 
-#: src/addressbook.c:1671
+#: src/addressbook.c:1675
 #, fuzzy, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1045,38 +1045,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:1674 src/folderview.c:2351
+#: src/addressbook.c:1678 src/folderview.c:2351
 msgid "Delete folder"
 msgstr "Slet mappe"
 
-#: src/addressbook.c:1674
+#: src/addressbook.c:1678
 #, fuzzy
 msgid "_Folder only"
 msgstr "Ny mappe"
 
-#: src/addressbook.c:1674
+#: src/addressbook.c:1678
 #, fuzzy
 msgid "Folder and _addresses"
 msgstr "Mappe og adresser"
 
-#: src/addressbook.c:1679
+#: src/addressbook.c:1683
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Virklig slette `%s' ?"
 
-#: src/addressbook.c:2365 src/addressbook.c:2498
+#: src/addressbook.c:2369 src/addressbook.c:2502
 msgid "New user, could not save index file."
 msgstr "Ny bruger, kunne ikke gemme index fil."
 
-#: src/addressbook.c:2369 src/addressbook.c:2502
+#: src/addressbook.c:2373 src/addressbook.c:2506
 msgid "New user, could not save address book files."
 msgstr "Ny bruger, kunne ikke gemme adressebogs fil."
 
-#: src/addressbook.c:2379 src/addressbook.c:2512
+#: src/addressbook.c:2383 src/addressbook.c:2516
 msgid "Old address book converted successfully."
 msgstr "Gammel adressebog konverteret."
 
-#: src/addressbook.c:2384
+#: src/addressbook.c:2388
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1084,7 +1084,7 @@ msgstr ""
 "Gammel adressebog konverteret,\n"
 "men kunne ikke gemme index filen"
 
-#: src/addressbook.c:2397
+#: src/addressbook.c:2401
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1092,7 +1092,7 @@ msgstr ""
 "Kunne ikke konvertere adressebog,\n"
 "men nye og tomme filer blev oprettet."
 
-#: src/addressbook.c:2403
+#: src/addressbook.c:2407
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1100,7 +1100,7 @@ msgstr ""
 "Kunne ikke konvertere adressebog,\n"
 "kunne ikke oprette nye filer."
 
-#: src/addressbook.c:2408
+#: src/addressbook.c:2412
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1108,86 +1108,86 @@ msgstr ""
 "Kunne ikke konvertere adressebog,\n"
 "kunne ikke oprette nye filer."
 
-#: src/addressbook.c:2415
+#: src/addressbook.c:2419
 msgid "Addressbook conversion error"
 msgstr "Adressebog konverterings fejl"
 
-#: src/addressbook.c:2419
+#: src/addressbook.c:2423
 msgid "Addressbook conversion"
 msgstr "Adressebog konvertering"
 
-#: src/addressbook.c:2454
+#: src/addressbook.c:2458
 msgid "Addressbook Error"
 msgstr "Adressebog fejl"
 
-#: src/addressbook.c:2455 src/addressbook.c:2555
+#: src/addressbook.c:2459 src/addressbook.c:2559
 msgid "Could not read address index"
 msgstr "Kunne ikke læse adressebog"
 
-#: src/addressbook.c:2517
+#: src/addressbook.c:2521
 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:2531
+#: src/addressbook.c:2535
 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:2537
+#: src/addressbook.c:2541
 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:2543
+#: src/addressbook.c:2547
 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:2561
+#: src/addressbook.c:2565
 msgid "Addressbook Conversion Error"
 msgstr "Adressebog konverterings fejl"
 
-#: src/addressbook.c:2567
+#: src/addressbook.c:2571
 msgid "Addressbook Conversion"
 msgstr "Adressebog konvertering"
 
-#: src/addressbook.c:3072 src/prefs_common_dialog.c:2033
+#: src/addressbook.c:3086 src/prefs_common_dialog.c:2033
 msgid "Interface"
 msgstr "Brugerflade"
 
-#: src/addressbook.c:3088 src/importldif.c:514
+#: src/addressbook.c:3102 src/importldif.c:514
 msgid "Address Book"
 msgstr "Adressebog"
 
-#: src/addressbook.c:3104
+#: src/addressbook.c:3118
 msgid "Person"
 msgstr "Person"
 
-#: src/addressbook.c:3120
+#: src/addressbook.c:3134
 msgid "EMail Address"
 msgstr "E-post adresse"
 
-#: src/addressbook.c:3136
+#: src/addressbook.c:3150
 msgid "Group"
 msgstr "Gruppe"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3152 src/folderview.c:367 src/prefs_account_dialog.c:1694
+#: src/addressbook.c:3166 src/folderview.c:367 src/prefs_account_dialog.c:1694
 #: src/query_search.c:370
 msgid "Folder"
 msgstr "Mappe"
 
-#: src/addressbook.c:3168
+#: src/addressbook.c:3182
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3184 src/addressbook.c:3200
+#: src/addressbook.c:3198 src/addressbook.c:3214
 msgid "JPilot"
 msgstr "J-Pilot"
 
-#: src/addressbook.c:3216
+#: src/addressbook.c:3230
 msgid "LDAP Server"
 msgstr "LDAP server"
 
@@ -1199,7 +1199,7 @@ msgstr "Normale adresser"
 msgid "Personal address"
 msgstr "Personlige adresser"
 
-#: src/alertpanel.c:141 src/compose.c:5485 src/main.c:573
+#: src/alertpanel.c:141 src/compose.c:5494 src/main.c:573
 msgid "Notice"
 msgstr "Note"
 
@@ -1250,7 +1250,7 @@ msgstr "Brun"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4593
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4750
 msgid "None"
 msgstr "Ingen"
 
@@ -1312,7 +1312,7 @@ msgstr "/_Redigér/_Fortryd"
 msgid "/_Edit/_Redo"
 msgstr "/_Redigér/_Gentag"
 
-#: src/compose.c:537 src/compose.c:544 src/mainwindow.c:513
+#: src/compose.c:537 src/compose.c:544 src/mainwindow.c:516
 #: src/messageview.c:147
 msgid "/_Edit/---"
 msgstr "/_Redigér/---"
@@ -1321,7 +1321,7 @@ msgstr "/_Redigér/---"
 msgid "/_Edit/Cu_t"
 msgstr "/_Redigér/_Klip"
 
-#: src/compose.c:539 src/mainwindow.c:510 src/messageview.c:145
+#: src/compose.c:539 src/mainwindow.c:513 src/messageview.c:145
 msgid "/_Edit/_Copy"
 msgstr "/_Redigér/K_opiere"
 
@@ -1333,7 +1333,7 @@ msgstr "/_Redigér/_Sæt ind"
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Redigér/_Sæt ind som citat"
 
-#: src/compose.c:543 src/mainwindow.c:511 src/messageview.c:146
+#: src/compose.c:543 src/mainwindow.c:514 src/messageview.c:146
 msgid "/_Edit/Select _all"
 msgstr "/_Redigér/Markér _alle"
 
@@ -1350,8 +1350,8 @@ msgstr "/_Redigér/Formater _alle lange linier"
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Redigér/K_opiere"
 
-#: src/compose.c:550 src/mainwindow.c:518 src/messageview.c:151
-#: src/summaryview.c:448
+#: src/compose.c:550 src/mainwindow.c:521 src/messageview.c:151
+#: src/summaryview.c:450
 msgid "/_View"
 msgstr "/_Vis"
 
@@ -1372,9 +1372,9 @@ msgid "/_View/_Reply to"
 msgstr "/_Vis/_Svar til"
 
 #: src/compose.c:555 src/compose.c:557 src/compose.c:559 src/compose.c:561
-#: src/mainwindow.c:538 src/mainwindow.c:541 src/mainwindow.c:568
-#: src/mainwindow.c:592 src/mainwindow.c:687 src/mainwindow.c:691
-#: src/messageview.c:236
+#: src/mainwindow.c:541 src/mainwindow.c:544 src/mainwindow.c:571
+#: src/mainwindow.c:595 src/mainwindow.c:696 src/mainwindow.c:700
+#: src/messageview.c:241
 msgid "/_View/---"
 msgstr "/_Vis/---"
 
@@ -1390,7 +1390,7 @@ msgstr "/_Vis/_Linieal"
 msgid "/_View/_Attachment"
 msgstr "/_Vis/_Vedhæft"
 
-#: src/compose.c:567 src/mainwindow.c:599 src/messageview.c:158
+#: src/compose.c:567 src/mainwindow.c:602 src/messageview.c:158
 #, fuzzy
 msgid "/_View/Character _encoding"
 msgstr "/_Vis/_Sortere/Faldende"
@@ -1400,241 +1400,252 @@ msgid "/_View/Character _encoding/_Automatic"
 msgstr ""
 
 #: src/compose.c:570 src/compose.c:576 src/compose.c:582 src/compose.c:586
-#: src/compose.c:592 src/compose.c:596 src/compose.c:602 src/compose.c:606
-#: src/compose.c:616 src/compose.c:620 src/compose.c:628 src/compose.c:632
-#: src/mainwindow.c:595 src/mainwindow.c:602 src/messageview.c:154
+#: src/compose.c:592 src/compose.c:596 src/compose.c:602 src/compose.c:608
+#: src/compose.c:612 src/compose.c:622 src/compose.c:626 src/compose.c:634
+#: src/compose.c:638 src/mainwindow.c:598 src/mainwindow.c:605
+#: src/messageview.c:154
 #, fuzzy
 msgid "/_View/Character _encoding/---"
 msgstr "/_Vis/_Sortere/Faldende"
 
-#: src/compose.c:572 src/mainwindow.c:603 src/messageview.c:162
+#: src/compose.c:572 src/mainwindow.c:606 src/messageview.c:162
 #, fuzzy
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Vis/_Tegnsæt/7bit ascii (US-ASC_II)"
 
-#: src/compose.c:574 src/mainwindow.c:605 src/messageview.c:165
+#: src/compose.c:574 src/mainwindow.c:608 src/messageview.c:165
 #, fuzzy
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Vis/_Tegnsæt/Unicode (_UTF-8)"
 
-#: src/compose.c:578 src/mainwindow.c:609 src/messageview.c:168
+#: src/compose.c:578 src/mainwindow.c:612 src/messageview.c:168
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Vis/_Tegnsæt/Western European (ISO-8859-_1)"
 
-#: src/compose.c:580 src/mainwindow.c:611 src/messageview.c:170
+#: src/compose.c:580 src/mainwindow.c:614 src/messageview.c:170
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Vis/_Tegnsæt/Western European (ISO-8859-_15)"
 
-#: src/compose.c:584 src/mainwindow.c:617 src/messageview.c:175
+#: src/compose.c:584 src/mainwindow.c:620 src/messageview.c:175
 #, fuzzy
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Vis/_Tegnsæt/Central European (ISO-8859-_2)"
 
-#: src/compose.c:588 src/mainwindow.c:621 src/messageview.c:178
+#: src/compose.c:588 src/mainwindow.c:624 src/messageview.c:178
 #, fuzzy
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Vis/_Tegnsæt/_Baltic (ISO-8859-13)"
 
-#: src/compose.c:590 src/mainwindow.c:623 src/messageview.c:180
+#: src/compose.c:590 src/mainwindow.c:626 src/messageview.c:180
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Vis/_Tegnsæt/Baltic (ISO-8859-_4)"
 
-#: src/compose.c:594 src/mainwindow.c:627 src/messageview.c:183
+#: src/compose.c:594 src/mainwindow.c:630 src/messageview.c:183
 #, fuzzy
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Vis/_Tegnsæt/Greek (ISO-8859-_7)"
 
-#: src/compose.c:598 src/mainwindow.c:631 src/messageview.c:186
+#: src/compose.c:598 src/mainwindow.c:634 src/messageview.c:186
+#, fuzzy
+msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
+msgstr "/_Vis/_Tegnsæt/Baltic (ISO-8859-_4)"
+
+#: src/compose.c:600 src/mainwindow.c:636 src/messageview.c:188
+#, fuzzy
+msgid "/_View/Character _encoding/Arabic (Windows-1256)"
+msgstr "/_Vis/_Tegnsæt/Cyrillic (Windows-1251)"
+
+#: src/compose.c:604 src/mainwindow.c:640 src/messageview.c:191
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Vis/_Tegnsæt/Greek (ISO-8859-_7)"
 
-#: src/compose.c:600 src/mainwindow.c:633 src/messageview.c:188
+#: src/compose.c:606 src/mainwindow.c:642 src/messageview.c:193
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Vis/_Tegnsæt/Cyrillic (Windows-1251)"
 
-#: src/compose.c:604 src/mainwindow.c:637 src/messageview.c:191
+#: src/compose.c:610 src/mainwindow.c:646 src/messageview.c:196
 #, fuzzy
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Vis/_Tegnsæt/Turkish (ISO-8859-_9)"
 
-#: src/compose.c:608 src/mainwindow.c:641 src/messageview.c:194
+#: src/compose.c:614 src/mainwindow.c:650 src/messageview.c:199
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Vis/_Tegnsæt/Cyrillic (ISO-8859-_5)"
 
-#: src/compose.c:610 src/mainwindow.c:643 src/messageview.c:196
+#: src/compose.c:616 src/mainwindow.c:652 src/messageview.c:201
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Vis/_Tegnsæt/Cyrillic (KOI8-_R)"
 
-#: src/compose.c:612 src/mainwindow.c:645 src/messageview.c:198
+#: src/compose.c:618 src/mainwindow.c:654 src/messageview.c:203
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Vis/_Tegnsæt/Cyrillic (KOI8-_R)"
 
-#: src/compose.c:614 src/mainwindow.c:647 src/messageview.c:200
+#: src/compose.c:620 src/mainwindow.c:656 src/messageview.c:205
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Vis/_Tegnsæt/Cyrillic (Windows-1251)"
 
-#: src/compose.c:618 src/mainwindow.c:651 src/messageview.c:203
+#: src/compose.c:624 src/mainwindow.c:660 src/messageview.c:208
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Vis/_Tegnsæt/Japanese (ISO-2022-_JP)"
 
-#: src/compose.c:622 src/mainwindow.c:661 src/messageview.c:212
+#: src/compose.c:628 src/mainwindow.c:670 src/messageview.c:217
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Vis/_Tegnsæt/Simplified Chinese (_GB2312)"
 
-#: src/compose.c:624 src/mainwindow.c:663 src/messageview.c:214
+#: src/compose.c:630 src/mainwindow.c:672 src/messageview.c:219
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Vis/_Tegnsæt/Simplified Chinese (_GB2312)"
 
-#: src/compose.c:626 src/mainwindow.c:665 src/messageview.c:216
+#: src/compose.c:632 src/mainwindow.c:674 src/messageview.c:221
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Vis/_Tegnsæt/Traditional Chinese (_Big5)"
 
-#: src/compose.c:630 src/mainwindow.c:673 src/messageview.c:223
+#: src/compose.c:636 src/mainwindow.c:682 src/messageview.c:228
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Vis/_Tegnsæt/Korean (EUC-_KR)"
 
-#: src/compose.c:634 src/mainwindow.c:679 src/messageview.c:228
+#: src/compose.c:640 src/mainwindow.c:688 src/messageview.c:233
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Vis/_Tegnsæt/Thai (TIS-620)"
 
-#: src/compose.c:636 src/mainwindow.c:681 src/messageview.c:230
+#: src/compose.c:642 src/mainwindow.c:690 src/messageview.c:235
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Vis/_Tegnsæt/Thai (Windows-874)"
 
-#: src/compose.c:640 src/mainwindow.c:739 src/messageview.c:260
+#: src/compose.c:646 src/mainwindow.c:750 src/messageview.c:265
 msgid "/_Tools/_Address book"
 msgstr "/_Funktioner/_Adressebog"
 
-#: src/compose.c:641
+#: src/compose.c:647
 msgid "/_Tools/_Template"
 msgstr "/_Funktioner/_Skabelon"
 
-#: src/compose.c:642 src/mainwindow.c:762 src/messageview.c:275
+#: src/compose.c:648 src/mainwindow.c:773 src/messageview.c:280
 msgid "/_Tools/Actio_ns"
 msgstr "/_Funktioner/_Handlinger"
 
-#: src/compose.c:643 src/compose.c:647 src/compose.c:653 src/mainwindow.c:742
-#: src/mainwindow.c:756 src/mainwindow.c:761 src/mainwindow.c:763
-#: src/mainwindow.c:766 src/mainwindow.c:768 src/messageview.c:263
-#: src/messageview.c:274
+#: src/compose.c:649 src/compose.c:653 src/compose.c:659 src/mainwindow.c:753
+#: src/mainwindow.c:767 src/mainwindow.c:772 src/mainwindow.c:774
+#: src/mainwindow.c:777 src/mainwindow.c:779 src/messageview.c:268
+#: src/messageview.c:279
 msgid "/_Tools/---"
 msgstr "/_Funktioner/---"
 
-#: src/compose.c:644
+#: src/compose.c:650
 #, fuzzy
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/_Redigér/Redigér med e_kstern editor"
 
-#: src/compose.c:648
+#: src/compose.c:654
 #, fuzzy
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Funktioner/_Handlinger"
 
-#: src/compose.c:649
+#: src/compose.c:655
 #, fuzzy
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/_Meddelelse/_Kryptere"
 
-#: src/compose.c:654
+#: src/compose.c:660
 #, fuzzy
 msgid "/_Tools/_Check spell"
 msgstr "/_Funktioner/_Udfør"
 
-#: src/compose.c:655
+#: src/compose.c:661
 #, fuzzy
 msgid "/_Tools/_Set spell language"
 msgstr "/_Funktioner/_Skabelon"
 
-#: src/compose.c:899
+#: src/compose.c:908
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: fil findes ikke\n"
 
-#: src/compose.c:1003 src/compose.c:1074
+#: src/compose.c:1012 src/compose.c:1083
 msgid "Can't get text part\n"
 msgstr "Kan ikke læse tekst afsnit\n"
 
-#: src/compose.c:1475
+#: src/compose.c:1484
 msgid "Quote mark format error."
 msgstr "Citat markérings format fejl."
 
-#: src/compose.c:1487
+#: src/compose.c:1496
 msgid "Message reply/forward format error."
 msgstr "Meddelelses svar / videresend fejl."
 
-#: src/compose.c:1907
+#: src/compose.c:1916
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Filen %s findes ikke\n"
 
-#: src/compose.c:1911
+#: src/compose.c:1920
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Kan ikke læse størrelse på %s\n"
 
-#: src/compose.c:1915
+#: src/compose.c:1924
 #, c-format
 msgid "File %s is empty."
 msgstr "Filen %s er tom."
 
-#: src/compose.c:1919
+#: src/compose.c:1928
 #, c-format
 msgid "Can't read %s."
 msgstr "kan ikke læse %s"
 
-#: src/compose.c:1952
+#: src/compose.c:1961
 #, c-format
 msgid "Message: %s"
 msgstr "Meddelelse: %s"
 
-#: src/compose.c:2012 src/mimeview.c:565
+#: src/compose.c:2021 src/mimeview.c:565
 msgid "Can't get the part of multipart message."
 msgstr "Kan ikke hente del af multipart meddelese."
 
-#: src/compose.c:2496 src/headerview.c:195 src/query_search.c:636
-#: src/summaryview.c:2107
+#: src/compose.c:2505 src/headerview.c:195 src/query_search.c:636
+#: src/summaryview.c:2124
 msgid "(No Subject)"
 msgstr "(Intet emne)"
 
-#: src/compose.c:2499
+#: src/compose.c:2508
 #, fuzzy, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Ny meddelelse%s"
 
-#: src/compose.c:2612
+#: src/compose.c:2621
 msgid "Recipient is not specified."
 msgstr "Mangler modtager"
 
-#: src/compose.c:2620
+#: src/compose.c:2629
 #, fuzzy
 msgid "Empty subject"
 msgstr "Emne"
 
-#: src/compose.c:2621
+#: src/compose.c:2630
 msgid "Subject is empty. Send it anyway?"
 msgstr "Emne er tom. Send alligevel?"
 
-#: src/compose.c:2680
+#: src/compose.c:2689
 msgid "can't get recipient list."
 msgstr "Kan ikke åbne modtager liste."
 
-#: src/compose.c:2700
+#: src/compose.c:2709
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1642,21 +1653,21 @@ msgstr ""
 "Konto til afsendelse af e-post er ikke valgt.\n"
 "Vælg konto før afsendelse er mulig."
 
-#: src/compose.c:2714 src/send_message.c:299
+#: src/compose.c:2723 src/send_message.c:299
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Fejl ved afsendelse af meddelelse til %s ."
 
-#: src/compose.c:2756
+#: src/compose.c:2765
 msgid "Can't save the message to outbox."
 msgstr "Kan ikke gemme meddelelse i Sendt"
 
-#: src/compose.c:2794
+#: src/compose.c:2803
 #, 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:2891
+#: src/compose.c:2900
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1667,12 +1678,12 @@ msgstr ""
 "%s til %s.\n"
 "Send den alligevel?"
 
-#: src/compose.c:2897
+#: src/compose.c:2906
 #, fuzzy
 msgid "Code conversion error"
 msgstr "Adressebog konverterings fejl"
 
-#: src/compose.c:2970
+#: src/compose.c:2979
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1681,159 +1692,159 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:2974
+#: src/compose.c:2983
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3264
+#: src/compose.c:3273
 msgid "can't remove the old message\n"
 msgstr "kan ikke slette gammel meddelelse\n"
 
-#: src/compose.c:3282
+#: src/compose.c:3291
 msgid "queueing message...\n"
 msgstr "meddelelse i kø...\n"
 
-#: src/compose.c:3364
+#: src/compose.c:3373
 msgid "can't find queue folder\n"
 msgstr "kan ikke vælge mappe %s\n"
 
-#: src/compose.c:3371
+#: src/compose.c:3380
 msgid "can't queue the message\n"
 msgstr "meddelelse kan ikke lægges i kø\n"
 
-#: src/compose.c:3964
+#: src/compose.c:3973
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "genereret meddelelses ID: %s\n"
 
-#: src/compose.c:4077
+#: src/compose.c:4086
 msgid "Creating compose window...\n"
 msgstr "Opretter instastnings vindue...\n"
 
-#: src/compose.c:4128 src/headerview.c:54
+#: src/compose.c:4137 src/headerview.c:54
 msgid "From:"
 msgstr "Fra:"
 
-#: src/compose.c:4202
+#: src/compose.c:4211
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/_Funktioner/_Handlinger"
 
-#: src/compose.c:4205
+#: src/compose.c:4214
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/_Meddelelse/_Kryptere"
 
-#: src/compose.c:4243 src/compose.c:5317
+#: src/compose.c:4252 src/compose.c:5326
 msgid "MIME type"
 msgstr "MIME type"
 
 #. S_COL_DATE
-#: src/compose.c:4252 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4740
+#: src/compose.c:4261 src/mimeview.c:197 src/prefs_filter_edit.c:496
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4897
 msgid "Size"
 msgstr "Størrelse"
 
-#: src/compose.c:4683 src/mainwindow.c:2324 src/prefs_account_dialog.c:528
+#: src/compose.c:4692 src/mainwindow.c:2335 src/prefs_account_dialog.c:528
 #: src/prefs_common_dialog.c:661
 msgid "Send"
 msgstr "Send"
 
-#: src/compose.c:4684
+#: src/compose.c:4693
 msgid "Send message"
 msgstr "Sende meddelelse"
 
-#: src/compose.c:4692
+#: src/compose.c:4701
 msgid "Send later"
 msgstr "Send senere"
 
-#: src/compose.c:4693
+#: src/compose.c:4702
 msgid "Put into queue folder and send later"
 msgstr "Læg i kø og send senere"
 
-#: src/compose.c:4701
+#: src/compose.c:4710
 msgid "Draft"
 msgstr "Kladde"
 
-#: src/compose.c:4702
+#: src/compose.c:4711
 msgid "Save to draft folder"
 msgstr "Gem i Kladde"
 
-#: src/compose.c:4712
+#: src/compose.c:4721
 msgid "Insert"
 msgstr "Indæst"
 
-#: src/compose.c:4713
+#: src/compose.c:4722
 msgid "Insert file"
 msgstr "Insæt fil"
 
-#: src/compose.c:4721
+#: src/compose.c:4730
 msgid "Attach"
 msgstr "Vedhæft"
 
-#: src/compose.c:4722
+#: src/compose.c:4731
 msgid "Attach file"
 msgstr "Vedhæft fil"
 
 #. signature
-#: src/compose.c:4732 src/prefs_account_dialog.c:1208
+#: src/compose.c:4741 src/prefs_account_dialog.c:1208
 #: src/prefs_common_dialog.c:953
 msgid "Signature"
 msgstr "Underskrift"
 
-#: src/compose.c:4733
+#: src/compose.c:4742
 #, fuzzy
 msgid "Append signature"
 msgstr "DÅRLIG underskrift"
 
 #. editor
-#: src/compose.c:4742 src/prefs_common_dialog.c:991
+#: src/compose.c:4751 src/prefs_common_dialog.c:991
 #: src/prefs_common_dialog.c:2315
 msgid "Editor"
 msgstr "Editor"
 
-#: src/compose.c:4743
+#: src/compose.c:4752
 msgid "Edit with external editor"
 msgstr "Redigér med ekstern Editor"
 
-#: src/compose.c:4751
+#: src/compose.c:4760
 msgid "Linewrap"
 msgstr "Linie deling"
 
-#: src/compose.c:4752
+#: src/compose.c:4761
 msgid "Wrap all long lines"
 msgstr "/_Redigér/Formater _alle lange linier"
 
-#: src/compose.c:5213
+#: src/compose.c:5222
 msgid "Invalid MIME type."
 msgstr "Ugyldig MIME type"
 
-#: src/compose.c:5231
+#: src/compose.c:5240
 msgid "File doesn't exist or is empty."
 msgstr "Fil eksisterer ikke eller er tom."
 
-#: src/compose.c:5299
+#: src/compose.c:5308
 msgid "Properties"
 msgstr "Egenskaber"
 
-#: src/compose.c:5319 src/prefs_common_dialog.c:1444
+#: src/compose.c:5328 src/prefs_common_dialog.c:1444
 msgid "Encoding"
 msgstr "Tegnsæt kodning"
 
-#: src/compose.c:5342 src/prefs_folder_item.c:202
+#: src/compose.c:5351 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Sti"
 
-#: src/compose.c:5343
+#: src/compose.c:5352
 msgid "File name"
 msgstr "Fil navn"
 
-#: src/compose.c:5436
+#: src/compose.c:5445
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Sti til ekstern editor er ugyldig: `%s'\n"
 
-#: src/compose.c:5482
+#: src/compose.c:5491
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1843,48 +1854,48 @@ msgstr ""
 "Afbryde?\n"
 "ID: %d"
 
-#: src/compose.c:5857 src/compose.c:5862 src/compose.c:5868
+#: src/compose.c:5866 src/compose.c:5871 src/compose.c:5877
 msgid "Can't queue the message."
 msgstr "Meddelelse kan ikke lægges i kø."
 
-#: src/compose.c:5959
+#: src/compose.c:5968
 #, fuzzy
 msgid "Select files"
 msgstr "Vælg fil"
 
-#: src/compose.c:5982
+#: src/compose.c:5991
 msgid "Select file"
 msgstr "Vælg fil"
 
-#: src/compose.c:6017
+#: src/compose.c:6026
 #, fuzzy
 msgid "Save message"
 msgstr "Sende meddelelse"
 
-#: src/compose.c:6018
+#: src/compose.c:6027
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Denne meddelelse er ændret. Slet?"
 
-#: src/compose.c:6020
+#: src/compose.c:6029
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:6062
+#: src/compose.c:6071
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Vil du benytte skabelon `%s' ?"
 
-#: src/compose.c:6064
+#: src/compose.c:6073
 msgid "Apply template"
 msgstr "Benyt skabelon"
 
-#: src/compose.c:6065
+#: src/compose.c:6074
 #, fuzzy
 msgid "_Replace"
 msgstr "Erstat"
 
-#: src/compose.c:6065
+#: src/compose.c:6074
 #, fuzzy
 msgid "_Insert"
 msgstr "Indæst"
@@ -2325,7 +2336,7 @@ msgstr "Ny"
 
 #. S_COL_MARK
 #: src/folderview.c:412 src/prefs_filter_edit.c:500
-#: src/prefs_summary_column.c:71 src/summaryview.c:509
+#: src/prefs_summary_column.c:71 src/summaryview.c:511
 msgid "Unread"
 msgstr "Ulæst"
 
@@ -2341,12 +2352,12 @@ msgstr "Indtast mappe information...\n"
 msgid "Setting folder info..."
 msgstr "Indtast mappe information..."
 
-#: src/folderview.c:858 src/mainwindow.c:3464 src/setup.c:80
+#: src/folderview.c:858 src/mainwindow.c:3481 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Gennemsøger mappe %s%c%s ..."
 
-#: src/folderview.c:862 src/mainwindow.c:3469 src/setup.c:85
+#: src/folderview.c:862 src/mainwindow.c:3486 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Gennemsøger mappe %s ..."
@@ -2372,7 +2383,7 @@ msgstr "Gendanner mappe træ..."
 msgid "Checking for new messages in all folders..."
 msgstr "Henter nye meddelelser i alle mapper..."
 
-#: src/folderview.c:1200 src/mainwindow.c:2400 src/prefs_common_dialog.c:1789
+#: src/folderview.c:1200 src/mainwindow.c:2411 src/prefs_common_dialog.c:1789
 msgid "Junk"
 msgstr ""
 
@@ -2511,7 +2522,7 @@ msgstr "Emne:"
 msgid "Creating header view...\n"
 msgstr "Opretter hoved visning...\n"
 
-#: src/headerview.c:180 src/query_search.c:637 src/summaryview.c:2110
+#: src/headerview.c:180 src/query_search.c:637 src/summaryview.c:2127
 msgid "(No From)"
 msgstr "(Ingen Fra)"
 
@@ -2620,7 +2631,7 @@ msgstr "Importer LDIF fil til adressebog"
 msgid "Prev"
 msgstr "Forrige"
 
-#: src/importldif.c:768 src/mainwindow.c:2420
+#: src/importldif.c:768 src/mainwindow.c:2431
 msgid "Next"
 msgstr "Næste"
 
@@ -2970,677 +2981,682 @@ msgstr ""
 msgid "another Sylpheed is already running.\n"
 msgstr "sylpheed kører allerede.\n"
 
-#: src/main.c:1064
+#: src/main.c:1083
 #, fuzzy
 msgid "Migration of configuration"
 msgstr "Handlingsopsæt"
 
-#: src/main.c:1065
+#: src/main.c:1084
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
 msgstr ""
 
-#: src/mainwindow.c:478
+#: src/mainwindow.c:481
 msgid "/_File/_Folder"
 msgstr "/_Filer/_Mappe"
 
-#: src/mainwindow.c:479
+#: src/mainwindow.c:482
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/_Filer/_Mappe/Opret _ny mappe..."
 
-#: src/mainwindow.c:481
+#: src/mainwindow.c:484
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/_Filer/_Mappe/_Omdøb mappe..."
 
-#: src/mainwindow.c:482
+#: src/mainwindow.c:485
 #, fuzzy
 msgid "/_File/_Folder/_Move folder..."
 msgstr "/_Filer/_Mappe/_Omdøb mappe..."
 
-#: src/mainwindow.c:483
+#: src/mainwindow.c:486
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/_Filer/_Mappe/_Slet mappe"
 
-#: src/mainwindow.c:484
+#: src/mainwindow.c:487
 #, fuzzy
 msgid "/_File/_Mailbox"
 msgstr "/_Filer/_Tilføj mailbox..."
 
-#: src/mainwindow.c:485
+#: src/mainwindow.c:488
 #, fuzzy
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/_Filer/_Tilføj mailbox..."
 
-#: src/mainwindow.c:486
+#: src/mainwindow.c:489
 #, fuzzy
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/Slet _mappe"
 
-#: src/mainwindow.c:487 src/mainwindow.c:492
+#: src/mainwindow.c:490 src/mainwindow.c:495
 #, fuzzy
 msgid "/_File/_Mailbox/---"
 msgstr "/_Filer/_Mappe/---"
 
-#: src/mainwindow.c:488
+#: src/mainwindow.c:491
 #, fuzzy
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "_Hent nye meddelelser"
 
-#: src/mainwindow.c:490
+#: src/mainwindow.c:493
 #, fuzzy
 msgid "/_File/_Mailbox/Check for new messages in _all mailboxes"
 msgstr "/_Filer/_Mappe/_Hent nye meddelelser i alle mapper"
 
-#: src/mainwindow.c:493
+#: src/mainwindow.c:496
 #, fuzzy
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "/G_endan mappe træ"
 
-#: src/mainwindow.c:496
+#: src/mainwindow.c:499
 msgid "/_File/_Import mbox file..."
 msgstr "/_Filer/_Importere mbox fil..."
 
-#: src/mainwindow.c:497
+#: src/mainwindow.c:500
 msgid "/_File/_Export to mbox file..."
 msgstr "/_Filer/_Eksportere mbox fil..."
 
-#: src/mainwindow.c:499
+#: src/mainwindow.c:502
 #, fuzzy
 msgid "/_File/Empty all _trash"
 msgstr "/_Filer/_Tøm slettet post"
 
-#: src/mainwindow.c:501 src/messageview.c:139
+#: src/mainwindow.c:504 src/messageview.c:139
 msgid "/_File/_Save as..."
 msgstr "/_Filer/_Gem som..."
 
-#: src/mainwindow.c:502 src/messageview.c:140
+#: src/mainwindow.c:505 src/messageview.c:140
 msgid "/_File/_Print..."
 msgstr "/_Filer/_Udskriv..."
 
-#: src/mainwindow.c:504
+#: src/mainwindow.c:507
 #, fuzzy
 msgid "/_File/_Work offline"
 msgstr "/_Filer/_Indsæt fil"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:507
+#: src/mainwindow.c:510
 msgid "/_File/E_xit"
 msgstr "/_Filer/_Afslut"
 
-#: src/mainwindow.c:512
+#: src/mainwindow.c:515
 msgid "/_Edit/Select _thread"
 msgstr "/_Redigér/Markér _tråd"
 
-#: src/mainwindow.c:514 src/messageview.c:148
+#: src/mainwindow.c:517 src/messageview.c:148
 msgid "/_Edit/_Find in current message..."
 msgstr "/_Redigér/_Søg i aktuel meddelelse"
 
-#: src/mainwindow.c:516
+#: src/mainwindow.c:519
 msgid "/_Edit/_Search messages..."
 msgstr "/_Søg meddelelser..."
 
-#: src/mainwindow.c:519
+#: src/mainwindow.c:522
 msgid "/_View/Show or hi_de"
 msgstr "/_Vis/_Vis eller skjul"
 
-#: src/mainwindow.c:520
+#: src/mainwindow.c:523
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/_Vis/_Vis eller skjul/_Mappe træ"
 
-#: src/mainwindow.c:522
+#: src/mainwindow.c:525
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/_Vis/_Vis eller skjul/_Besked"
 
-#: src/mainwindow.c:524
+#: src/mainwindow.c:527
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/_Vis/_Vis eller skjul/_Værktøjslinie"
 
-#: src/mainwindow.c:526
+#: src/mainwindow.c:529
 msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/_Vis/_Vis eller skjul/_Værktøjslinie/Ikon _og tekst"
 
-#: src/mainwindow.c:528
+#: src/mainwindow.c:531
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/_Vis/_Vis eller skjul/_Værktøjslinie/_Ikon"
 
-#: src/mainwindow.c:530
+#: src/mainwindow.c:533
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/_Vis/_Vis eller skjul/_Værktøjslinie/_Tekst"
 
-#: src/mainwindow.c:532
+#: src/mainwindow.c:535
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/_Vis/_Vis eller skjul/_Værktøjslinie/_Ingen"
 
-#: src/mainwindow.c:534
+#: src/mainwindow.c:537
 #, fuzzy
 msgid "/_View/Show or hi_de/_Search bar"
 msgstr "/_Vis/_Vis eller skjul/_Status linie"
 
-#: src/mainwindow.c:536
+#: src/mainwindow.c:539
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/_Vis/_Vis eller skjul/_Status linie"
 
-#: src/mainwindow.c:539
+#: src/mainwindow.c:542
 msgid "/_View/Separate f_older tree"
 msgstr "/_Vis/_Seperat mappe træ"
 
-#: src/mainwindow.c:540
+#: src/mainwindow.c:543
 #, fuzzy
 msgid "/_View/Separate _message view"
 msgstr "/_Vis/Seperat m_eddelelses vindue"
 
-#: src/mainwindow.c:542
+#: src/mainwindow.c:545
 msgid "/_View/_Sort"
 msgstr "/_Vis/_Sortere"
 
-#: src/mainwindow.c:543
+#: src/mainwindow.c:546
 msgid "/_View/_Sort/by _number"
 msgstr "/_Vis/_Sortere/_Nummer orden"
 
-#: src/mainwindow.c:544
+#: src/mainwindow.c:547
 msgid "/_View/_Sort/by s_ize"
 msgstr "/_Vis/_Sortere/_Størrelses orden"
 
-#: src/mainwindow.c:545
+#: src/mainwindow.c:548
 msgid "/_View/_Sort/by _date"
 msgstr "/_Vis/_Sortere/_Dato orden"
 
-#: src/mainwindow.c:546
+#: src/mainwindow.c:549
 #, fuzzy
 msgid "/_View/_Sort/by t_hread date"
 msgstr "/_Vis/_Sortere/_Dato orden"
 
-#: src/mainwindow.c:547
+#: src/mainwindow.c:550
 msgid "/_View/_Sort/by _from"
 msgstr "/_Vis/_Sortere/_Fra orden"
 
-#: src/mainwindow.c:548
+#: src/mainwindow.c:551
 msgid "/_View/_Sort/by _recipient"
 msgstr "/_Vis/_Sortere/Efter _modtager"
 
-#: src/mainwindow.c:549
+#: src/mainwindow.c:552
 msgid "/_View/_Sort/by _subject"
 msgstr "/_Vis/_Sortere/_Emne orden"
 
-#: src/mainwindow.c:550
+#: src/mainwindow.c:553
 msgid "/_View/_Sort/by _color label"
 msgstr "/_Vis/_Sortere/_Farvet label orden"
 
-#: src/mainwindow.c:552
+#: src/mainwindow.c:555
 msgid "/_View/_Sort/by _mark"
 msgstr "/_Vis/_Sortere/_Markéret orden"
 
-#: src/mainwindow.c:553
+#: src/mainwindow.c:556
 msgid "/_View/_Sort/by _unread"
 msgstr "/_Vis/_Sortere/_Ulæst orden"
 
-#: src/mainwindow.c:554
+#: src/mainwindow.c:557
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/_Vis/_Sortere/_Vedhæft orden"
 
-#: src/mainwindow.c:556
+#: src/mainwindow.c:559
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/_Vis/_Sortere/Sorter _ikke"
 
-#: src/mainwindow.c:557 src/mainwindow.c:560
+#: src/mainwindow.c:560 src/mainwindow.c:563
 msgid "/_View/_Sort/---"
 msgstr "/_Vis/_Sortere/---"
 
-#: src/mainwindow.c:558
+#: src/mainwindow.c:561
 msgid "/_View/_Sort/Ascending"
 msgstr "/_Vis/_Sortere/Stigende"
 
-#: src/mainwindow.c:559
+#: src/mainwindow.c:562
 msgid "/_View/_Sort/Descending"
 msgstr "/_Vis/_Sortere/Faldende"
 
-#: src/mainwindow.c:561
+#: src/mainwindow.c:564
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/_Vis/_Sortere/_Emne orden"
 
-#: src/mainwindow.c:563
+#: src/mainwindow.c:566
 msgid "/_View/Th_read view"
 msgstr "/_Vis/_Trådet"
 
-#: src/mainwindow.c:564
+#: src/mainwindow.c:567
 msgid "/_View/E_xpand all threads"
 msgstr "_Vis/Åbn tråde"
 
-#: src/mainwindow.c:565
+#: src/mainwindow.c:568
 msgid "/_View/Co_llapse all threads"
 msgstr "/_Vis/_Saml alle tråde"
 
-#: src/mainwindow.c:566
+#: src/mainwindow.c:569
 msgid "/_View/Set display _item..."
 msgstr "/_Vis/_Sæt visning ..."
 
-#: src/mainwindow.c:569
+#: src/mainwindow.c:572
 msgid "/_View/_Go to"
 msgstr "/_Vis/_Gå til"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:573
 msgid "/_View/_Go to/_Prev message"
 msgstr "/_Vis/_Gå til/_Forrige meddelelse"
 
-#: src/mainwindow.c:571
+#: src/mainwindow.c:574
 msgid "/_View/_Go to/_Next message"
 msgstr "/_Vis/_Gå til/_Næste meddelelse"
 
-#: src/mainwindow.c:572 src/mainwindow.c:577 src/mainwindow.c:580
-#: src/mainwindow.c:585 src/mainwindow.c:590
+#: src/mainwindow.c:575 src/mainwindow.c:580 src/mainwindow.c:583
+#: src/mainwindow.c:588 src/mainwindow.c:593
 msgid "/_View/_Go to/---"
 msgstr "/_Vis/_Gå til/---"
 
-#: src/mainwindow.c:573
+#: src/mainwindow.c:576
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/Vis/_Gå til/Forrige ulæste meddelelse"
 
-#: src/mainwindow.c:575
+#: src/mainwindow.c:578
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/_Vis/_Gå til/Næste ulæste meddelelse"
 
-#: src/mainwindow.c:578
+#: src/mainwindow.c:581
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/_Vis/_Gå til/_Forrige nye meddelelse"
 
-#: src/mainwindow.c:579
+#: src/mainwindow.c:582
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/_Vis/_Gå til/_Næste nye meddelelse"
 
-#: src/mainwindow.c:581
+#: src/mainwindow.c:584
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/_Vis/_Gå til/Forrige _markéret meddelelse"
 
-#: src/mainwindow.c:583
+#: src/mainwindow.c:586
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/_Vis/_Gå til/Næste  _markéret meddelelse"
 
-#: src/mainwindow.c:586
+#: src/mainwindow.c:589
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/_Vis/_Gå til/Forrige _label meddelelse"
 
-#: src/mainwindow.c:588
+#: src/mainwindow.c:591
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/_Vis/_Gå til/Næste _label meddelelse"
 
-#: src/mainwindow.c:591
+#: src/mainwindow.c:594
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Vis/_Gå til/Anden _mappe..."
 
-#: src/mainwindow.c:600 src/messageview.c:159
+#: src/mainwindow.c:603 src/messageview.c:159
 #, fuzzy
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Vis/_Tegnsæt/_Automatisk"
 
-#: src/mainwindow.c:613 src/messageview.c:172
+#: src/mainwindow.c:616 src/messageview.c:172
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr "/_Vis/_Tegnsæt/Western European (ISO-8859-_15)"
 
-#: src/mainwindow.c:653 src/messageview.c:205
+#: src/mainwindow.c:662 src/messageview.c:210
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Vis/_TegnsætJapanese (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:655 src/messageview.c:207
+#: src/mainwindow.c:664 src/messageview.c:212
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Vis/_Tegnsæt/Japanese (_EUC-JP)"
 
-#: src/mainwindow.c:657 src/messageview.c:209
+#: src/mainwindow.c:666 src/messageview.c:214
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Vis//_Tegnsæt/Japanese (_Shift_JIS)"
 
-#: src/mainwindow.c:667 src/messageview.c:218
+#: src/mainwindow.c:676 src/messageview.c:223
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Vis/_Tegnsæt/Traditional Chinese (EUC-_TW)"
 
-#: src/mainwindow.c:669 src/messageview.c:220
+#: src/mainwindow.c:678 src/messageview.c:225
 #, fuzzy
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Vis/_Tegnsæt/Chinese (ISO-2022-_CN)"
 
-#: src/mainwindow.c:675 src/messageview.c:225
+#: src/mainwindow.c:684 src/messageview.c:230
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Vis/_Tegnsæt/Korean (ISO-2022-KR)"
 
-#: src/mainwindow.c:688 src/summaryview.c:449
+#: src/mainwindow.c:697 src/summaryview.c:451
 msgid "/_View/Open in new _window"
 msgstr "/_Vis/Åbn i nyt vindue"
 
-#: src/mainwindow.c:689 src/messageview.c:237
+#: src/mainwindow.c:698 src/messageview.c:242
 msgid "/_View/Mess_age source"
 msgstr "/_Vis/_Kilde"
 
-#: src/mainwindow.c:690 src/messageview.c:238
+#: src/mainwindow.c:699 src/messageview.c:243
 msgid "/_View/Show all _header"
 msgstr "/_Vis/_Alle hoved linier"
 
-#: src/mainwindow.c:692
+#: src/mainwindow.c:701
 msgid "/_View/_Update summary"
 msgstr "/_Vis/_Opdatér oversigt"
 
-#: src/mainwindow.c:694 src/messageview.c:240
+#: src/mainwindow.c:703 src/messageview.c:245
 msgid "/_Message"
 msgstr "/_Meddelelse"
 
-#: src/mainwindow.c:695
+#: src/mainwindow.c:704
 #, fuzzy
 msgid "/_Message/Recei_ve"
 msgstr "/_Meddelelse/Redigér _igen"
 
-#: src/mainwindow.c:696
+#: src/mainwindow.c:705
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/_Meddelelse/Hent fra _alle konti"
 
-#: src/mainwindow.c:698
+#: src/mainwindow.c:707
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/_Meddelelse/Hent fra _alle konti"
 
-#: src/mainwindow.c:700
+#: src/mainwindow.c:709
 #, fuzzy
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/_Meddelelse/_Afbryd afsendelse"
 
-#: src/mainwindow.c:702
+#: src/mainwindow.c:711
 #, fuzzy
 msgid "/_Message/Recei_ve/---"
 msgstr "/_Meddelelse/Redigér _igen"
 
-#: src/mainwindow.c:703
+#: src/mainwindow.c:712
 msgid "/_Message/_Send queued messages"
 msgstr "/_Meddelelse/Send meddelelser i _kø"
 
-#: src/mainwindow.c:704 src/mainwindow.c:706 src/mainwindow.c:713
-#: src/mainwindow.c:718 src/mainwindow.c:721 src/mainwindow.c:730
-#: src/mainwindow.c:732 src/mainwindow.c:735 src/messageview.c:243
-#: src/messageview.c:251 src/messageview.c:256
+#: src/mainwindow.c:713 src/mainwindow.c:715 src/mainwindow.c:722
+#: src/mainwindow.c:727 src/mainwindow.c:730 src/mainwindow.c:741
+#: src/mainwindow.c:743 src/mainwindow.c:746 src/messageview.c:248
+#: src/messageview.c:256 src/messageview.c:261
 msgid "/_Message/---"
 msgstr "/_Meddelelse/---"
 
-#: src/mainwindow.c:705 src/messageview.c:241
+#: src/mainwindow.c:714 src/messageview.c:246
 msgid "/_Message/Compose _new message"
 msgstr "/_Meddelelse/Opret _ny meddelelse"
 
-#: src/mainwindow.c:707 src/messageview.c:244
+#: src/mainwindow.c:716 src/messageview.c:249
 msgid "/_Message/_Reply"
 msgstr "/_Meddelelse/_Besvar"
 
-#: src/mainwindow.c:708
+#: src/mainwindow.c:717
 msgid "/_Message/Repl_y to"
 msgstr "/_Meddelelse/_Svar til"
 
-#: src/mainwindow.c:709 src/messageview.c:245
+#: src/mainwindow.c:718 src/messageview.c:250
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Meddelelse/_Svar til/A_lle"
 
-#: src/mainwindow.c:710 src/messageview.c:247
+#: src/mainwindow.c:719 src/messageview.c:252
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Meddelelse/_Svar til/Af_sender"
 
-#: src/mainwindow.c:711 src/messageview.c:249
+#: src/mainwindow.c:720 src/messageview.c:254
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Meddelelse/_Svar til/_Alle"
 
-#: src/mainwindow.c:714 src/messageview.c:252
+#: src/mainwindow.c:723 src/messageview.c:257
 msgid "/_Message/_Forward"
 msgstr "/_Meddelelse/_Videresend"
 
-#: src/mainwindow.c:715 src/messageview.c:253
+#: src/mainwindow.c:724 src/messageview.c:258
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Meddelelse/Videresend som _vedhæftet"
 
-#: src/mainwindow.c:717 src/messageview.c:255
+#: src/mainwindow.c:726 src/messageview.c:260
 msgid "/_Message/Redirec_t"
 msgstr "/_Meddelelse/_Omdirigér"
 
-#: src/mainwindow.c:719
+#: src/mainwindow.c:728
 msgid "/_Message/M_ove..."
 msgstr "/_Meddelelse/_Flyt..."
 
-#: src/mainwindow.c:720
+#: src/mainwindow.c:729
 msgid "/_Message/_Copy..."
 msgstr "/_Meddelelse/_Kopiere..."
 
-#: src/mainwindow.c:722
+#: src/mainwindow.c:731
 msgid "/_Message/_Mark"
 msgstr "/_Meddelelse/_Markér"
 
-#: src/mainwindow.c:723
+#: src/mainwindow.c:732
 msgid "/_Message/_Mark/_Mark"
 msgstr "/_Meddelelse/_Markér/_Markér"
 
-#: src/mainwindow.c:724
+#: src/mainwindow.c:733
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/_Meddelelse/_Markér/_Slet markéring"
 
-#: src/mainwindow.c:725
+#: src/mainwindow.c:734
 msgid "/_Message/_Mark/---"
 msgstr "/_Meddelelse/_Markér/---"
 
-#: src/mainwindow.c:726
+#: src/mainwindow.c:735
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/_Meddelelse/_Markér/Som ulæst"
 
-#: src/mainwindow.c:727
+#: src/mainwindow.c:736
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/_Meddelelse/_Markér/Som læst"
 
-#: src/mainwindow.c:729
+#: src/mainwindow.c:738
+#, fuzzy
+msgid "/_Message/_Mark/Mark _thread as read"
+msgstr "/_Meddelelse/_Markér/Som læst"
+
+#: src/mainwindow.c:740
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/_Meddelelse/_Markér/Alle som læst"
 
-#: src/mainwindow.c:731
+#: src/mainwindow.c:742
 msgid "/_Message/_Delete"
 msgstr "/_Meddelelse/_Slet"
 
-#: src/mainwindow.c:733
+#: src/mainwindow.c:744
 #, fuzzy
 msgid "/_Message/Set as _junk mail"
 msgstr "/_Meddelelse/Hent _ny post"
 
-#: src/mainwindow.c:734
+#: src/mainwindow.c:745
 #, fuzzy
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/_Meddelelse/Hent _ny post"
 
-#: src/mainwindow.c:736 src/messageview.c:257
+#: src/mainwindow.c:747 src/messageview.c:262
 msgid "/_Message/Re-_edit"
 msgstr "/_Meddelelse/Redigér _igen"
 
-#: src/mainwindow.c:740
+#: src/mainwindow.c:751
 #, fuzzy
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/_Funktioner/Tilføj afsender til adressebog"
 
-#: src/mainwindow.c:743
+#: src/mainwindow.c:754
 #, fuzzy
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/_Funktioner/_Filtrere meddelelse"
 
-#: src/mainwindow.c:745
+#: src/mainwindow.c:756
 #, fuzzy
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Funktioner/_Filtrere meddelelse"
 
-#: src/mainwindow.c:747 src/messageview.c:264
+#: src/mainwindow.c:758 src/messageview.c:269
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Funktioner/_Opret filter"
 
-#: src/mainwindow.c:748 src/messageview.c:266
+#: src/mainwindow.c:759 src/messageview.c:271
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Funktioner/_Opret filter/_Automatisk"
 
-#: src/mainwindow.c:750 src/messageview.c:268
+#: src/mainwindow.c:761 src/messageview.c:273
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Funktioner/_Opret filter/Efter _Fra"
 
-#: src/mainwindow.c:752 src/messageview.c:270
+#: src/mainwindow.c:763 src/messageview.c:275
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Funktioner/_Opret filter/Efter _Til"
 
-#: src/mainwindow.c:754 src/messageview.c:272
+#: src/mainwindow.c:765 src/messageview.c:277
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Funktioner/_Opret filter/Efter _Emne"
 
-#: src/mainwindow.c:757
+#: src/mainwindow.c:768
 #, fuzzy
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/_Funktioner/_Filtrere meddelelse"
 
-#: src/mainwindow.c:759
+#: src/mainwindow.c:770
 #, fuzzy
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/_Funktioner/_Filtrere meddelelse"
 
-#: src/mainwindow.c:764
+#: src/mainwindow.c:775
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/_Meddelelse/Slet alle du_blikerede meddelelser"
 
-#: src/mainwindow.c:767
+#: src/mainwindow.c:778
 msgid "/_Tools/E_xecute"
 msgstr "/_Funktioner/_Udfør"
 
-#: src/mainwindow.c:769
+#: src/mainwindow.c:780
 msgid "/_Tools/_Log window"
 msgstr "/Funktioner/_Logbog vindue"
 
-#: src/mainwindow.c:771
+#: src/mainwindow.c:782
 msgid "/_Configuration"
 msgstr "/_Opsæt"
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:783
 msgid "/_Configuration/_Common preferences..."
 msgstr "/_Opsæt/Generelt _opsæt..."
 
-#: src/mainwindow.c:774
+#: src/mainwindow.c:785
 msgid "/_Configuration/_Filter setting..."
 msgstr "/_Opsæt/_Filter opsæt..."
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:787
 msgid "/_Configuration/_Template..."
 msgstr "/_Opsæt/_Skabelon..."
 
-#: src/mainwindow.c:777
+#: src/mainwindow.c:788
 msgid "/_Configuration/_Actions..."
 msgstr "/_Opsæt/_Handlinger..."
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:789
 msgid "/_Configuration/---"
 msgstr "/_Opsæt/---"
 
-#: src/mainwindow.c:779
+#: src/mainwindow.c:790
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Opsæt/_Den aktuelle konto..."
 
-#: src/mainwindow.c:781
+#: src/mainwindow.c:792
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Opsæt/_Opret ny konto..."
 
-#: src/mainwindow.c:783
+#: src/mainwindow.c:794
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Opsæt/_Redigér konti..."
 
-#: src/mainwindow.c:785
+#: src/mainwindow.c:796
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Opsæt/_Skift aktuel konto..."
 
-#: src/mainwindow.c:789
+#: src/mainwindow.c:800
 msgid "/_Help/_Manual"
 msgstr "/_Hjælp/_Vejledning"
 
-#: src/mainwindow.c:790
+#: src/mainwindow.c:801
 msgid "/_Help/_Manual/_English"
 msgstr "/_Hilfe/_Vejledning/_Engelsk"
 
-#: src/mainwindow.c:791
+#: src/mainwindow.c:802
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/_Hilfe/_Vejledning/_Japansk"
 
-#: src/mainwindow.c:792
+#: src/mainwindow.c:803
 msgid "/_Help/_FAQ"
 msgstr "/_Hjælp/_OSS"
 
-#: src/mainwindow.c:793
+#: src/mainwindow.c:804
 msgid "/_Help/_FAQ/_English"
 msgstr "/_Hjælp/_OSS/_Engelsk"
 
-#: src/mainwindow.c:794
+#: src/mainwindow.c:805
 msgid "/_Help/_FAQ/_German"
 msgstr "/_Hjælp/_OSS/_Tysk"
 
-#: src/mainwindow.c:795
+#: src/mainwindow.c:806
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/_Hjælp/_OSS/_Spansk"
 
-#: src/mainwindow.c:796
+#: src/mainwindow.c:807
 msgid "/_Help/_FAQ/_French"
 msgstr "/_Hjælp/_OSS/_Fransk"
 
-#: src/mainwindow.c:797
+#: src/mainwindow.c:808
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/_Hjælp/_OSS/_Italiensk"
 
-#: src/mainwindow.c:798
+#: src/mainwindow.c:809
 msgid "/_Help/---"
 msgstr "/_Hjælp/---"
 
-#: src/mainwindow.c:841
+#: src/mainwindow.c:852
 msgid "Creating main window...\n"
 msgstr "Opretter hoved vindue...\n"
 
-#: src/mainwindow.c:1011
+#: src/mainwindow.c:1022
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "HovedVindue: fejl i farve %d\n"
 
-#: src/mainwindow.c:1108 src/summaryview.c:2258 src/summaryview.c:2343
-#: src/summaryview.c:3739 src/summaryview.c:3868 src/summaryview.c:4226
+#: src/mainwindow.c:1119 src/summaryview.c:2275 src/summaryview.c:2360
+#: src/summaryview.c:3896 src/summaryview.c:4025 src/summaryview.c:4383
 msgid "done.\n"
 msgstr "Afsluttet.\n"
 
-#: src/mainwindow.c:1235 src/mainwindow.c:1276 src/mainwindow.c:1301
+#: src/mainwindow.c:1246 src/mainwindow.c:1287 src/mainwindow.c:1312
 msgid "Untitled"
 msgstr "Uden titel"
 
-#: src/mainwindow.c:1302
+#: src/mainwindow.c:1313
 msgid "none"
 msgstr "ingen"
 
-#: src/mainwindow.c:1355
+#: src/mainwindow.c:1366
 #, 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:1605
+#: src/mainwindow.c:1616
 msgid "Offline"
 msgstr ""
 
-#: src/mainwindow.c:1606
+#: src/mainwindow.c:1617
 msgid "You are offline. Go online?"
 msgstr ""
 
-#: src/mainwindow.c:1623
+#: src/mainwindow.c:1634
 #, fuzzy
 msgid "Empty all trash"
 msgstr "Tøm Slettet"
 
-#: src/mainwindow.c:1624
+#: src/mainwindow.c:1635
 #, fuzzy
 msgid "Delete all messages in trash folders?"
 msgstr "Slet alle meddelelser i Slettet?"
 
-#: src/mainwindow.c:1652
+#: src/mainwindow.c:1663
 msgid "Add mailbox"
 msgstr "Ny mailbox"
 
-#: src/mainwindow.c:1653
+#: src/mainwindow.c:1664
 #, fuzzy
 msgid ""
 "Specify the location of mailbox.\n"
@@ -3651,16 +3667,16 @@ msgstr ""
 "Hvis den eksisterende mailbox angives, vil den blive\n"
 "gennemsøgt automatisk."
 
-#: src/mainwindow.c:1659 src/setup.c:49
+#: src/mainwindow.c:1670 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Mailbox `%s' eksisterer allerede."
 
-#: src/mainwindow.c:1664 src/setup.c:56
+#: src/mainwindow.c:1675 src/setup.c:56
 msgid "Mailbox"
 msgstr "Mailbox"
 
-#: src/mainwindow.c:1670 src/setup.c:62
+#: src/mainwindow.c:1681 src/setup.c:62
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3669,149 +3685,149 @@ msgstr ""
 "Fejl i oprettelse af mailbox.\n"
 "Måske findes filerne allerede eller du har ikke skrive rettighedder."
 
-#: src/mainwindow.c:2088
+#: src/mainwindow.c:2099
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Mappe visning"
 
-#: src/mainwindow.c:2107
+#: src/mainwindow.c:2118
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Meddelelses visning"
 
-#: src/mainwindow.c:2259 src/summaryview.c:408
+#: src/mainwindow.c:2270 src/summaryview.c:408
 msgid "/_Reply"
 msgstr "/_Svar"
 
-#: src/mainwindow.c:2260
+#: src/mainwindow.c:2271
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "Svar til alle"
 
-#: src/mainwindow.c:2261
+#: src/mainwindow.c:2272
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/_Svar til/_Afsender"
 
-#: src/mainwindow.c:2262
+#: src/mainwindow.c:2273
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/_Svar til/_Mail liste"
 
-#: src/mainwindow.c:2267 src/summaryview.c:415
+#: src/mainwindow.c:2278 src/summaryview.c:415
 msgid "/_Forward"
 msgstr "/_Videresend"
 
-#: src/mainwindow.c:2268 src/summaryview.c:416
+#: src/mainwindow.c:2279 src/summaryview.c:416
 msgid "/For_ward as attachment"
 msgstr "/Videresend som _vedhæftet"
 
-#: src/mainwindow.c:2269 src/summaryview.c:417
+#: src/mainwindow.c:2280 src/summaryview.c:417
 msgid "/Redirec_t"
 msgstr "/_Omdirigér"
 
-#: src/mainwindow.c:2305
+#: src/mainwindow.c:2316
 msgid "Get"
 msgstr "Hent"
 
-#: src/mainwindow.c:2306
+#: src/mainwindow.c:2317
 msgid "Incorporate new mail"
 msgstr "Hent ny post"
 
-#: src/mainwindow.c:2313
+#: src/mainwindow.c:2324
 msgid "Get all"
 msgstr "Hent alt"
 
-#: src/mainwindow.c:2314
+#: src/mainwindow.c:2325
 msgid "Incorporate new mail of all accounts"
 msgstr "Hent ny post fra alle konti"
 
-#: src/mainwindow.c:2325
+#: src/mainwindow.c:2336
 msgid "Send queued message(s)"
 msgstr "Sender meddelelse(r) i kø"
 
-#: src/mainwindow.c:2335 src/prefs_account_dialog.c:530
+#: src/mainwindow.c:2346 src/prefs_account_dialog.c:530
 #: src/prefs_common_dialog.c:663 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "Opret"
 
-#: src/mainwindow.c:2336
+#: src/mainwindow.c:2347
 msgid "Compose new message"
 msgstr "Opret ny meddelelse"
 
-#: src/mainwindow.c:2344 src/prefs_common_dialog.c:975
+#: src/mainwindow.c:2355 src/prefs_common_dialog.c:975
 msgid "Reply"
 msgstr "Besvar"
 
-#: src/mainwindow.c:2345 src/mainwindow.c:2358
+#: src/mainwindow.c:2356 src/mainwindow.c:2369
 msgid "Reply to the message"
 msgstr "Besvar meddelelse"
 
-#: src/mainwindow.c:2362
+#: src/mainwindow.c:2373
 msgid "Reply all"
 msgstr "Besvar alle"
 
-#: src/mainwindow.c:2363
+#: src/mainwindow.c:2374
 msgid "Reply to all"
 msgstr "Svar til alle"
 
-#: src/mainwindow.c:2371 src/prefs_filter_edit.c:672
+#: src/mainwindow.c:2382 src/prefs_filter_edit.c:672
 msgid "Forward"
 msgstr "Videresend"
 
-#: src/mainwindow.c:2372 src/mainwindow.c:2385
+#: src/mainwindow.c:2383 src/mainwindow.c:2396
 msgid "Forward the message"
 msgstr "Videresend meddelelse"
 
-#: src/mainwindow.c:2392
+#: src/mainwindow.c:2403
 msgid "Delete the message"
 msgstr "Slet meddelelse"
 
-#: src/mainwindow.c:2401
+#: src/mainwindow.c:2412
 #, fuzzy
 msgid "Set as junk mail"
 msgstr "Standard konto"
 
-#: src/mainwindow.c:2410
+#: src/mainwindow.c:2421
 msgid "Execute"
 msgstr "Udfør"
 
-#: src/mainwindow.c:2411
+#: src/mainwindow.c:2422
 msgid "Execute marked process"
 msgstr "Udfør markéret process"
 
-#: src/mainwindow.c:2421
+#: src/mainwindow.c:2432
 msgid "Next unread message"
 msgstr "Næste ulæste"
 
-#: src/mainwindow.c:2433
+#: src/mainwindow.c:2444
 msgid "Prefs"
 msgstr "Opsæt"
 
-#: src/mainwindow.c:2434
+#: src/mainwindow.c:2445
 msgid "Common preferences"
 msgstr "Generelt opsæt"
 
-#: src/mainwindow.c:2442 src/prefs_folder_item.c:289
+#: src/mainwindow.c:2453 src/prefs_folder_item.c:289
 #: src/prefs_folder_item.c:300 src/progressdialog.c:128
 msgid "Account"
 msgstr "Konto"
 
-#: src/mainwindow.c:2443
+#: src/mainwindow.c:2454
 msgid "Account setting"
 msgstr "Konto indstillinger"
 
-#: src/mainwindow.c:2615
+#: src/mainwindow.c:2626
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 
-#: src/mainwindow.c:2626
+#: src/mainwindow.c:2637
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 
-#: src/mainwindow.c:2892
+#: src/mainwindow.c:2903
 msgid "Exit"
 msgstr "Afslut"
 
-#: src/mainwindow.c:2892
+#: src/mainwindow.c:2903
 msgid "Exit this program?"
 msgstr "Afslut program?"
 
@@ -3848,45 +3864,45 @@ msgstr "Slutnigen af meddelelse nået; fortsæt fra starten?"
 msgid "Search finished"
 msgstr "Søgning afsluttet"
 
-#: src/messageview.c:261
+#: src/messageview.c:266
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/_Funktioner/Tilføj afsender til adressebog"
 
-#: src/messageview.c:291
+#: src/messageview.c:296
 msgid "Creating message view...\n"
 msgstr "Opretter meddelelses vindue...\n"
 
-#: src/messageview.c:316
+#: src/messageview.c:321
 msgid "Text"
 msgstr "Tekst"
 
-#: src/messageview.c:321
+#: src/messageview.c:326
 msgid "Attachments"
 msgstr "Vedhæftet"
 
-#: src/messageview.c:371
+#: src/messageview.c:376
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:669 src/summaryview.c:3268
+#: src/messageview.c:674 src/summaryview.c:3425
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Kan ikke gemme fil `%s'."
 
-#: src/messageview.c:728 src/summaryview.c:3291
+#: src/messageview.c:733 src/summaryview.c:3448
 msgid "The message will be printed with the following command:"
 msgstr ""
 
-#: src/messageview.c:729 src/summaryview.c:3292
+#: src/messageview.c:734 src/summaryview.c:3449
 #, fuzzy
 msgid "(Default print command)"
 msgstr "Udfør"
 
-#: src/messageview.c:731 src/prefs_common_dialog.c:2304 src/summaryview.c:3294
+#: src/messageview.c:736 src/prefs_common_dialog.c:2304 src/summaryview.c:3451
 msgid "Print"
 msgstr "Udskriv"
 
-#: src/messageview.c:740 src/summaryview.c:3303
+#: src/messageview.c:745 src/summaryview.c:3460
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -4793,8 +4809,8 @@ msgstr "Vis modtager i `Fra' hvis du er afsender"
 msgid "Expand threads"
 msgstr "Åbn tråde"
 
-#: src/prefs_common_dialog.c:1413 src/prefs_common_dialog.c:2713
-#: src/prefs_common_dialog.c:2751
+#: src/prefs_common_dialog.c:1413 src/prefs_common_dialog.c:2716
+#: src/prefs_common_dialog.c:2754
 msgid "Date format"
 msgstr "Dato format"
 
@@ -5093,8 +5109,8 @@ msgstr "Ekstern editor (%s erstattes af filnavn / URI)"
 msgid "Web browser"
 msgstr "Web browser"
 
-#: src/prefs_common_dialog.c:2288 src/prefs_common_dialog.c:3775
-#: src/prefs_common_dialog.c:3796
+#: src/prefs_common_dialog.c:2288 src/prefs_common_dialog.c:3778
+#: src/prefs_common_dialog.c:3799
 #, fuzzy
 msgid "(Default browser)"
 msgstr "Standard indbakke"
@@ -5170,216 +5186,226 @@ msgstr "Greek (ISO-8859-7)"
 
 #: src/prefs_common_dialog.c:2495
 #, fuzzy
+msgid "Arabic (ISO-8859-6)"
+msgstr "Baltic (ISO-8859-4)"
+
+#: src/prefs_common_dialog.c:2496
+#, fuzzy
+msgid "Arabic (Windows-1256)"
+msgstr "Cyrillic (Windows-1251)"
+
+#: src/prefs_common_dialog.c:2498
+#, fuzzy
 msgid "Hebrew (ISO-8859-8)"
 msgstr "Greek (ISO-8859-7)"
 
-#: src/prefs_common_dialog.c:2496
+#: src/prefs_common_dialog.c:2499
 #, fuzzy
 msgid "Hebrew (Windows-1255)"
 msgstr "Cyrillic (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2498
+#: src/prefs_common_dialog.c:2501
 msgid "Turkish (ISO-8859-9)"
 msgstr "Turkish (ISO-8859-9)"
 
-#: src/prefs_common_dialog.c:2500
+#: src/prefs_common_dialog.c:2503
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Cyrillic (ISO-8859-5)"
 
-#: src/prefs_common_dialog.c:2501
+#: src/prefs_common_dialog.c:2504
 msgid "Cyrillic (KOI8-R)"
 msgstr "Cyrillic (KOI8-R)"
 
-#: src/prefs_common_dialog.c:2502
+#: src/prefs_common_dialog.c:2505
 msgid "Cyrillic (KOI8-U)"
 msgstr "Cyrillic (KOI8-U)"
 
-#: src/prefs_common_dialog.c:2503
+#: src/prefs_common_dialog.c:2506
 msgid "Cyrillic (Windows-1251)"
 msgstr "Cyrillic (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2505
+#: src/prefs_common_dialog.c:2508
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Japanese (ISO-2022-JP)"
 
-#: src/prefs_common_dialog.c:2507
+#: src/prefs_common_dialog.c:2510
 msgid "Japanese (EUC-JP)"
 msgstr "Japanese (EUC-JP)"
 
-#: src/prefs_common_dialog.c:2508
+#: src/prefs_common_dialog.c:2511
 msgid "Japanese (Shift_JIS)"
 msgstr "Japanese (Shift_JIS)"
 
-#: src/prefs_common_dialog.c:2511
+#: src/prefs_common_dialog.c:2514
 msgid "Simplified Chinese (GB2312)"
 msgstr "Simplified Chinese (GB2312)"
 
-#: src/prefs_common_dialog.c:2512
+#: src/prefs_common_dialog.c:2515
 #, fuzzy
 msgid "Simplified Chinese (GBK)"
 msgstr "Simplified Chinese (GB2312)"
 
-#: src/prefs_common_dialog.c:2513
+#: src/prefs_common_dialog.c:2516
 msgid "Traditional Chinese (Big5)"
 msgstr "Traditional Chinese (Big5)"
 
-#: src/prefs_common_dialog.c:2515
+#: src/prefs_common_dialog.c:2518
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Traditional Chinese (EUC-TW)"
 
-#: src/prefs_common_dialog.c:2516
+#: src/prefs_common_dialog.c:2519
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Chinese (ISO-2022-CN)"
 
-#: src/prefs_common_dialog.c:2519
+#: src/prefs_common_dialog.c:2522
 msgid "Korean (EUC-KR)"
 msgstr "Korean (EUC-KR)"
 
-#: src/prefs_common_dialog.c:2521
+#: src/prefs_common_dialog.c:2524
 msgid "Thai (TIS-620)"
 msgstr "Thai (TIS-620)"
 
-#: src/prefs_common_dialog.c:2522
+#: src/prefs_common_dialog.c:2525
 msgid "Thai (Windows-874)"
 msgstr "Thai (Windows-874)"
 
-#: src/prefs_common_dialog.c:2689
+#: src/prefs_common_dialog.c:2692
 msgid "the full abbreviated weekday name"
 msgstr "kort ugedags navn"
 
-#: src/prefs_common_dialog.c:2690
+#: src/prefs_common_dialog.c:2693
 msgid "the full weekday name"
 msgstr "Ugedags navn"
 
-#: src/prefs_common_dialog.c:2691
+#: src/prefs_common_dialog.c:2694
 msgid "the abbreviated month name"
 msgstr "kort måneds navn"
 
-#: src/prefs_common_dialog.c:2692
+#: src/prefs_common_dialog.c:2695
 msgid "the full month name"
 msgstr "måneds navn"
 
-#: src/prefs_common_dialog.c:2693
+#: src/prefs_common_dialog.c:2696
 msgid "the preferred date and time for the current locale"
 msgstr "ønsket dato format for nuværende locale"
 
-#: src/prefs_common_dialog.c:2694
+#: src/prefs_common_dialog.c:2697
 msgid "the century number (year/100)"
 msgstr "århundrede (år/100)"
 
-#: src/prefs_common_dialog.c:2695
+#: src/prefs_common_dialog.c:2698
 msgid "the day of the month as a decimal number"
 msgstr "dag i måned som tal"
 
-#: src/prefs_common_dialog.c:2696
+#: src/prefs_common_dialog.c:2699
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "time som tal (24 timers visning)"
 
-#: src/prefs_common_dialog.c:2697
+#: src/prefs_common_dialog.c:2700
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "time som tal (12 timers visning)"
 
-#: src/prefs_common_dialog.c:2698
+#: src/prefs_common_dialog.c:2701
 msgid "the day of the year as a decimal number"
 msgstr "århundrede som tal"
 
-#: src/prefs_common_dialog.c:2699
+#: src/prefs_common_dialog.c:2702
 msgid "the month as a decimal number"
 msgstr "måned som tal"
 
-#: src/prefs_common_dialog.c:2700
+#: src/prefs_common_dialog.c:2703
 msgid "the minute as a decimal number"
 msgstr "minut som tal"
 
-#: src/prefs_common_dialog.c:2701
+#: src/prefs_common_dialog.c:2704
 msgid "either AM or PM"
 msgstr "enten AM eller PM"
 
-#: src/prefs_common_dialog.c:2702
+#: src/prefs_common_dialog.c:2705
 msgid "the second as a decimal number"
 msgstr "sekund som tal"
 
-#: src/prefs_common_dialog.c:2703
+#: src/prefs_common_dialog.c:2706
 msgid "the day of the week as a decimal number"
 msgstr "ugedag som tal"
 
-#: src/prefs_common_dialog.c:2704
+#: src/prefs_common_dialog.c:2707
 msgid "the preferred date for the current locale"
 msgstr "ønsket dato format for nuværende locale"
 
-#: src/prefs_common_dialog.c:2705
+#: src/prefs_common_dialog.c:2708
 msgid "the last two digits of a year"
 msgstr "de sidste to cifre i året"
 
-#: src/prefs_common_dialog.c:2706
+#: src/prefs_common_dialog.c:2709
 msgid "the year as a decimal number"
 msgstr "året som tal"
 
-#: src/prefs_common_dialog.c:2707
+#: src/prefs_common_dialog.c:2710
 msgid "the time zone or name or abbreviation"
 msgstr "tidszone som navn eller forkortelse"
 
-#: src/prefs_common_dialog.c:2728
+#: src/prefs_common_dialog.c:2731
 msgid "Specifier"
 msgstr "Vælger"
 
-#: src/prefs_common_dialog.c:2729
+#: src/prefs_common_dialog.c:2732
 msgid "Description"
 msgstr "Beskrivelse"
 
-#: src/prefs_common_dialog.c:2769
+#: src/prefs_common_dialog.c:2772
 msgid "Example"
 msgstr "Eksempel"
 
-#: src/prefs_common_dialog.c:2850
+#: src/prefs_common_dialog.c:2853
 msgid "Set message colors"
 msgstr "Angiv meddelelses farve"
 
-#: src/prefs_common_dialog.c:2858
+#: src/prefs_common_dialog.c:2861
 msgid "Colors"
 msgstr "Farve"
 
-#: src/prefs_common_dialog.c:2892
+#: src/prefs_common_dialog.c:2895
 msgid "Quoted Text - First Level"
 msgstr "Citeret tekst - 1. niveau"
 
-#: src/prefs_common_dialog.c:2898
+#: src/prefs_common_dialog.c:2901
 msgid "Quoted Text - Second Level"
 msgstr "Citeret tekst - 2. niveau"
 
-#: src/prefs_common_dialog.c:2904
+#: src/prefs_common_dialog.c:2907
 msgid "Quoted Text - Third Level"
 msgstr "Citeret tekst - 3. nivaur"
 
-#: src/prefs_common_dialog.c:2910
+#: src/prefs_common_dialog.c:2913
 msgid "URI link"
 msgstr "URI-Link"
 
-#: src/prefs_common_dialog.c:2917
+#: src/prefs_common_dialog.c:2920
 msgid "Recycle quote colors"
 msgstr "Genbrug citat farver"
 
-#: src/prefs_common_dialog.c:2984
+#: src/prefs_common_dialog.c:2987
 msgid "Pick color for quotation level 1"
 msgstr "Vælg farve for nivau 1"
 
-#: src/prefs_common_dialog.c:2987
+#: src/prefs_common_dialog.c:2990
 msgid "Pick color for quotation level 2"
 msgstr "Vælg farve for nivau 2"
 
-#: src/prefs_common_dialog.c:2990
+#: src/prefs_common_dialog.c:2993
 msgid "Pick color for quotation level 3"
 msgstr "Vælg farve for nivau 3"
 
-#: src/prefs_common_dialog.c:2993
+#: src/prefs_common_dialog.c:2996
 msgid "Pick color for URI"
 msgstr "Vælg farve for URI"
 
-#: src/prefs_common_dialog.c:3133
+#: src/prefs_common_dialog.c:3136
 msgid "Description of symbols"
 msgstr "Beskrivelse af symboler"
 
-#: src/prefs_common_dialog.c:3189
+#: src/prefs_common_dialog.c:3192
 msgid ""
 "Date\n"
 "From\n"
@@ -5403,11 +5429,11 @@ msgstr ""
 "Nyhedsgrupper\n"
 "Meddelelses ID"
 
-#: src/prefs_common_dialog.c:3202
+#: src/prefs_common_dialog.c:3205
 msgid "If x is set, displays expr"
 msgstr "Hvis x er valgt vises expr"
 
-#: src/prefs_common_dialog.c:3206
+#: src/prefs_common_dialog.c:3209
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -5421,7 +5447,7 @@ msgstr ""
 "Citeret meddelelses krop uden signatur\n"
 "%"
 
-#: src/prefs_common_dialog.c:3214
+#: src/prefs_common_dialog.c:3217
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -5433,20 +5459,20 @@ msgstr ""
 "{\n"
 "}"
 
-#: src/prefs_common_dialog.c:3260
+#: src/prefs_common_dialog.c:3263
 msgid "Key bindings"
 msgstr "Tast bindinger"
 
-#: src/prefs_common_dialog.c:3273
+#: src/prefs_common_dialog.c:3276
 #, fuzzy
 msgid "Select the preset of key bindings."
 msgstr " Vælg tast bindinger... "
 
-#: src/prefs_common_dialog.c:3283 src/prefs_common_dialog.c:3607
+#: src/prefs_common_dialog.c:3286 src/prefs_common_dialog.c:3610
 msgid "Default"
 msgstr "Standard"
 
-#: src/prefs_common_dialog.c:3286 src/prefs_common_dialog.c:3616
+#: src/prefs_common_dialog.c:3289 src/prefs_common_dialog.c:3619
 msgid "Old Sylpheed"
 msgstr "Gl. Sylpheed"
 
@@ -5571,7 +5597,7 @@ msgstr ""
 msgid "Age"
 msgstr ""
 
-#: src/prefs_filter_edit.c:501 src/summaryview.c:510
+#: src/prefs_filter_edit.c:501 src/summaryview.c:512
 #, fuzzy
 msgid "Marked"
 msgstr "Markér"
@@ -5824,17 +5850,17 @@ msgid "Attachment"
 msgstr "Vedhæftet"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73 src/query_search.c:371 src/summaryview.c:4733
+#: src/prefs_summary_column.c:73 src/query_search.c:371 src/summaryview.c:4890
 msgid "Subject"
 msgstr "Emne"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/query_search.c:372 src/summaryview.c:4736
+#: src/prefs_summary_column.c:74 src/query_search.c:372 src/summaryview.c:4893
 msgid "From"
 msgstr "Fra"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/query_search.c:373 src/summaryview.c:4738
+#: src/prefs_summary_column.c:75 src/query_search.c:373 src/summaryview.c:4895
 msgid "Date"
 msgstr "Dato"
 
@@ -5936,7 +5962,7 @@ msgstr "Søg meddelelse"
 msgid "_Save as search folder"
 msgstr "Gennemsøg mappe"
 
-#: src/query_search.c:512 src/subscribedialog.c:523 src/summaryview.c:840
+#: src/query_search.c:512 src/subscribedialog.c:523 src/summaryview.c:842
 msgid "Done."
 msgstr "Afsluttet."
 
@@ -5950,7 +5976,7 @@ msgstr "Gennemsøger mappe %s ..."
 msgid "Searching %s (%d / %d)..."
 msgstr "Filtrering..."
 
-#: src/query_search.c:645 src/summaryview.c:2048
+#: src/query_search.c:645 src/summaryview.c:2051
 msgid "(No Date)"
 msgstr "(Ingen dato)"
 
@@ -6327,307 +6353,312 @@ msgid "/_Mark/Mark as rea_d"
 msgstr "/_Markér/_Læst"
 
 #: src/summaryview.c:429
+#, fuzzy
+msgid "/_Mark/Mark _thread as read"
+msgstr "/_Markér/_Læst"
+
+#: src/summaryview.c:431
 msgid "/_Mark/Mark all _read"
 msgstr "/_Markér/_Alle læst"
 
-#: src/summaryview.c:430
+#: src/summaryview.c:432
 msgid "/Color la_bel"
 msgstr "/Farve la_bel"
 
-#: src/summaryview.c:434
+#: src/summaryview.c:436
 msgid "/Re-_edit"
 msgstr "/Redigér _igen"
 
-#: src/summaryview.c:436
+#: src/summaryview.c:438
 #, fuzzy
 msgid "/Add sender to address boo_k..."
 msgstr "/Tilføj afsender til adressebo_g"
 
-#: src/summaryview.c:438
+#: src/summaryview.c:440
 msgid "/Create f_ilter rule"
 msgstr "/_Opret filter"
 
-#: src/summaryview.c:439
+#: src/summaryview.c:441
 msgid "/Create f_ilter rule/_Automatically"
 msgstr "/_Opret filter/_Automatisk"
 
-#: src/summaryview.c:441
+#: src/summaryview.c:443
 msgid "/Create f_ilter rule/by _From"
 msgstr "/_Opret filter/Efter _Fra"
 
-#: src/summaryview.c:443
+#: src/summaryview.c:445
 msgid "/Create f_ilter rule/by _To"
 msgstr "/_Opret filter/Efter _Til"
 
-#: src/summaryview.c:445
+#: src/summaryview.c:447
 msgid "/Create f_ilter rule/by _Subject"
 msgstr "/_Opret filter/Efter _Emne"
 
-#: src/summaryview.c:451
+#: src/summaryview.c:453
 msgid "/_View/_Source"
 msgstr "/_Vis/_Kilde"
 
-#: src/summaryview.c:452
+#: src/summaryview.c:454
 msgid "/_View/All _header"
 msgstr "/_Vis/Alle _hoveder"
 
-#: src/summaryview.c:454
+#: src/summaryview.c:456
 msgid "/_Print..."
 msgstr "/_Udskriv..."
 
-#: src/summaryview.c:486
+#: src/summaryview.c:488
 msgid "Creating summary view...\n"
 msgstr "Opretter oversigt...\n"
 
-#: src/summaryview.c:508
+#: src/summaryview.c:510
 msgid "All"
 msgstr ""
 
-#: src/summaryview.c:511
+#: src/summaryview.c:513
 #, fuzzy
 msgid "Have color label"
 msgstr "/Farve la_bel"
 
-#: src/summaryview.c:512
+#: src/summaryview.c:514
 #, fuzzy
 msgid "Have attachment"
 msgstr "Vedhæftet"
 
-#: src/summaryview.c:521
+#: src/summaryview.c:523
 #, fuzzy
 msgid "Search:"
 msgstr "Søg"
 
-#: src/summaryview.c:535
+#: src/summaryview.c:537
 msgid "Search for Subject or From"
 msgstr ""
 
-#: src/summaryview.c:702
+#: src/summaryview.c:704
 msgid "Process mark"
 msgstr "Bearbejder markéring"
 
-#: src/summaryview.c:703
+#: src/summaryview.c:705
 msgid "Some marks are left. Process it?"
 msgstr "Nogle markéringer er tilbage. Bearbejde dem?"
 
-#: src/summaryview.c:749
+#: src/summaryview.c:751
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "Søger mappe (%s)..."
 
-#: src/summaryview.c:1292
+#: src/summaryview.c:1295
 #, fuzzy
 msgid "_Search again"
 msgstr "Søg igen"
 
-#: src/summaryview.c:1313 src/summaryview.c:1322
+#: src/summaryview.c:1316 src/summaryview.c:1325
 msgid "No more unread messages"
 msgstr "Ikke flere ulæste meddelelser"
 
-#: src/summaryview.c:1314
+#: src/summaryview.c:1317
 msgid "No unread message found. Search from the end?"
 msgstr "Ingen ulæste meddelelser fundet. Søg fra slutning?"
 
-#: src/summaryview.c:1316
+#: src/summaryview.c:1319
 msgid "No unread messages."
 msgstr "Ingen ulæste meddelelser."
 
-#: src/summaryview.c:1323
+#: src/summaryview.c:1326
 msgid "No unread message found. Go to next folder?"
 msgstr "Ingen ulæste meddeleleser fundet. Fortsæt til næste mappe?"
 
-#: src/summaryview.c:1331 src/summaryview.c:1340
+#: src/summaryview.c:1334 src/summaryview.c:1343
 msgid "No more new messages"
 msgstr "Ikke flere nye meddelelser"
 
-#: src/summaryview.c:1332
+#: src/summaryview.c:1335
 msgid "No new message found. Search from the end?"
 msgstr "Ingen nye meddelelser fundet. Søg fra slutning?"
 
-#: src/summaryview.c:1334
+#: src/summaryview.c:1337
 msgid "No new messages."
 msgstr "Ingen nye meddelelser."
 
-#: src/summaryview.c:1341
+#: src/summaryview.c:1344
 msgid "No new message found. Go to next folder?"
 msgstr "Ingen nye meddeleleser fundet. Fortsæt til næste mappe?"
 
-#: src/summaryview.c:1349 src/summaryview.c:1358
+#: src/summaryview.c:1352 src/summaryview.c:1361
 msgid "No more marked messages"
 msgstr "Ikke flere ulæste meddelelser"
 
-#: src/summaryview.c:1350
+#: src/summaryview.c:1353
 msgid "No marked message found. Search from the end?"
 msgstr "Ingen markérede meddelelser fundet. Søg bagfra?"
 
-#: src/summaryview.c:1352 src/summaryview.c:1361
+#: src/summaryview.c:1355 src/summaryview.c:1364
 msgid "No marked messages."
 msgstr "Ingen markérede eddelelser."
 
-#: src/summaryview.c:1359
+#: src/summaryview.c:1362
 msgid "No marked message found. Search from the beginning?"
 msgstr "Ingen markérede meddelelser fundet. Søg forfra?"
 
-#: src/summaryview.c:1367 src/summaryview.c:1376
+#: src/summaryview.c:1370 src/summaryview.c:1379
 msgid "No more labeled messages"
 msgstr "Ikke flere markérede eddelelser"
 
-#: src/summaryview.c:1368
+#: src/summaryview.c:1371
 msgid "No labeled message found. Search from the end?"
 msgstr "Ingen markérede meddelelser funder. Søg bagfra?"
 
-#: src/summaryview.c:1370 src/summaryview.c:1379
+#: src/summaryview.c:1373 src/summaryview.c:1382
 msgid "No labeled messages."
 msgstr "Ingen markérede meddelelser."
 
-#: src/summaryview.c:1377
+#: src/summaryview.c:1380
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Ingen markérede meddelelser fundet. Søg forfra?"
 
-#: src/summaryview.c:1693
+#: src/summaryview.c:1696
 msgid "Attracting messages by subject..."
 msgstr "Samler meddelelser via Emne..."
 
-#: src/summaryview.c:1887
+#: src/summaryview.c:1890
 #, c-format
 msgid "%d deleted"
 msgstr "%d slettet"
 
-#: src/summaryview.c:1891
+#: src/summaryview.c:1894
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d flyttet"
 
-#: src/summaryview.c:1892 src/summaryview.c:1897
+#: src/summaryview.c:1895 src/summaryview.c:1900
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:1896
+#: src/summaryview.c:1899
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d kopieret"
 
-#: src/summaryview.c:1911
+#: src/summaryview.c:1914
 msgid " item(s) selected"
 msgstr " valgte"
 
-#: src/summaryview.c:1933
+#: src/summaryview.c:1936
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d nye, %d ulæst, %d total (%s)"
 
-#: src/summaryview.c:1937
+#: src/summaryview.c:1940
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d nye, %d ulæste, %d total"
 
-#: src/summaryview.c:1971
+#: src/summaryview.c:1974
 msgid "Sorting summary..."
 msgstr "Sorterer oversigt..."
 
-#: src/summaryview.c:2194
+#: src/summaryview.c:2211
 msgid "\tSetting summary from message data..."
 msgstr "\tOpretter oversigt ud fra meddelelses data..."
 
-#: src/summaryview.c:2196
+#: src/summaryview.c:2213
 msgid "Setting summary from message data..."
 msgstr "Opretter oversigt ud fra meddelelses data..."
 
-#: src/summaryview.c:2302
+#: src/summaryview.c:2319
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Skriver oversigt (%s)..."
 
-#: src/summaryview.c:2643
+#: src/summaryview.c:2660
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Meddelelse %d er markéret\n"
 
-#: src/summaryview.c:2701
+#: src/summaryview.c:2718
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Meddelelse %d er markéret som læst\n"
 
-#: src/summaryview.c:2789
+#: src/summaryview.c:2908
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Meddelelse %d er markéret som ulæst\n"
 
-#: src/summaryview.c:2850
+#: src/summaryview.c:2969
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Meddelelse %s/%d er markéret til sletning\n"
 
-#: src/summaryview.c:2878
+#: src/summaryview.c:2997
 msgid "Delete message(s)"
 msgstr "Slet meddelelse(er)"
 
-#: src/summaryview.c:2879
+#: src/summaryview.c:2998
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Vil du virkelig slette meddelelse(r) fra Slettet?"
 
-#: src/summaryview.c:2953
+#: src/summaryview.c:3072
 msgid "Deleting duplicated messages..."
 msgstr "Sletter dublikerede meddelelser..."
 
-#: src/summaryview.c:2991
+#: src/summaryview.c:3110
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Meddelelse %s/%d er ikke markéret.\n"
 
-#: src/summaryview.c:3049
+#: src/summaryview.c:3168
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Meddelelse %d er markéret til flytning til %s\n"
 
-#: src/summaryview.c:3066
+#: src/summaryview.c:3196
 msgid "Destination is same as current folder."
 msgstr "Fra og til mappe er ens"
 
-#: src/summaryview.c:3122
+#: src/summaryview.c:3260
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Meddelelse %d er markéret til kopiering til %s\n"
 
-#: src/summaryview.c:3139
+#: src/summaryview.c:3288
 #, fuzzy
 msgid "Destination for copy is same as current folder."
 msgstr "Fra og til mappe er ens."
 
-#: src/summaryview.c:3338
+#: src/summaryview.c:3495
 #, fuzzy
 msgid "Error occurred while processing messages."
 msgstr ""
 "Fejl ved bearbejdning af e-post:\n"
 "%s"
 
-#: src/summaryview.c:3646 src/summaryview.c:3647
+#: src/summaryview.c:3803 src/summaryview.c:3804
 msgid "Building threads..."
 msgstr "Opretter tråde"
 
-#: src/summaryview.c:3797 src/summaryview.c:3798
+#: src/summaryview.c:3954 src/summaryview.c:3955
 msgid "Unthreading..."
 msgstr "Fjerner tråde"
 
-#: src/summaryview.c:4091 src/summaryview.c:4147
+#: src/summaryview.c:4248 src/summaryview.c:4304
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtrering..."
 
-#: src/summaryview.c:4196
+#: src/summaryview.c:4353
 msgid "filtering..."
 msgstr "filtrering..."
 
-#: src/summaryview.c:4197
+#: src/summaryview.c:4354
 msgid "Filtering..."
 msgstr "Filtrering..."
 
-#: src/summaryview.c:4233
+#: src/summaryview.c:4390
 #, fuzzy, c-format
 msgid "%d message(s) have been filtered."
 msgstr "meddelelse %d er allerede gemt.\n"
 
-#: src/summaryview.c:4742
+#: src/summaryview.c:4899
 msgid "No."
 msgstr "Nr."
 
@@ -6645,36 +6676,36 @@ msgstr "Opretter tekst vindue...\n"
 msgid "This message can't be displayed.\n"
 msgstr "en meddelelse vil ikke blive modtaget\n"
 
-#: src/textview.c:1929
+#: src/textview.c:1925
 #, fuzzy
 msgid "Sa_ve this image as..."
 msgstr "/_Gem som..."
 
-#: src/textview.c:1945 src/trayicon.c:109
+#: src/textview.c:1941 src/trayicon.c:109
 #, fuzzy
 msgid "Compose _new message"
 msgstr "Opret ny meddelelse"
 
-#: src/textview.c:1947
+#: src/textview.c:1943
 #, fuzzy
 msgid "Add to address _book..."
 msgstr "/Tilføj afsender til adressebo_g"
 
-#: src/textview.c:1949
+#: src/textview.c:1945
 #, fuzzy
 msgid "Copy this add_ress"
 msgstr "Normale adresser"
 
-#: src/textview.c:1952
+#: src/textview.c:1948
 #, fuzzy
 msgid "_Open with Web browser"
 msgstr "Web browser"
 
-#: src/textview.c:1954
+#: src/textview.c:1950
 msgid "Copy this _link"
 msgstr ""
 
-#: src/textview.c:2097
+#: src/textview.c:2093
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6683,7 +6714,7 @@ msgid ""
 "Open it anyway?"
 msgstr ""
 
-#: src/textview.c:2102
+#: src/textview.c:2098
 msgid "Fake URL warning"
 msgstr ""
 
diff --git a/po/de.po b/po/de.po
index addf3893..b03f5c24 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: 2006-01-27 18:11+0900\n"
+"POT-Creation-Date: 2006-01-31 15:20+0900\n"
 "PO-Revision-Date: 2006-01-25 14:18+0100\n"
 "Last-Translator: Fridtjof Busse <fridtjof@fbunet.de>\n"
 "Language-Team: German <gnome-de@gnome.org>\n"
@@ -506,7 +506,7 @@ msgstr "Gefunden %s\n"
 msgid "Configuration is saved.\n"
 msgstr "Konfiguration wurde gespeichert.\n"
 
-#: libsylph/prefs_common.c:489
+#: libsylph/prefs_common.c:491
 msgid "Junk mail filter"
 msgstr "Spam-Mail Filter"
 
@@ -621,8 +621,8 @@ msgstr "%.2fMB"
 msgid "%.2fGB"
 msgstr "%.2fGB"
 
-#: libsylph/utils.c:2373 src/compose.c:2858 src/compose.c:3121
-#: src/compose.c:3184 src/compose.c:3304
+#: libsylph/utils.c:2373 src/compose.c:2867 src/compose.c:3130
+#: src/compose.c:3193 src/compose.c:3313
 msgid "can't change file mode\n"
 msgstr "kann Dateimodus nicht ändern\n"
 
@@ -710,8 +710,8 @@ msgstr ""
 "Schalter\n"
 "in der 'G'-Spalte, um den Nachrichten-Empfang bei 'Hole alle' einzuschalten."
 
-#: src/account_dialog.c:366 src/addressadd.c:192 src/addressbook.c:491
-#: src/compose.c:4262 src/editaddress.c:200 src/editaddress.c:942
+#: src/account_dialog.c:366 src/addressadd.c:192 src/addressbook.c:493
+#: src/compose.c:4271 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:206 src/prefs_filter.c:259 src/prefs_folder_item.c:171
@@ -847,12 +847,12 @@ msgstr "Aktionen Benutzer-Parameter"
 msgid "Add Address to Book"
 msgstr "Adresse in Adressbuch einfügen"
 
-#: src/addressadd.c:202 src/compose.c:4762 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4771 src/editaddress.c:201
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "Adresse"
 
-#: src/addressadd.c:212 src/addressbook.c:493 src/editaddress.c:202
+#: src/addressadd.c:212 src/addressbook.c:495 src/editaddress.c:202
 #: src/editaddress.c:795 src/editaddress.c:860 src/editgroup.c:267
 msgid "Remarks"
 msgstr "Kommentar"
@@ -861,183 +861,183 @@ msgstr "Kommentar"
 msgid "Select Address Book Folder"
 msgstr "Wähle Adressbuchablage"
 
-#: src/addressbook.c:336 src/compose.c:515 src/mainwindow.c:477
+#: src/addressbook.c:338 src/compose.c:515 src/mainwindow.c:480
 #: src/messageview.c:138
 msgid "/_File"
 msgstr "/_Datei"
 
-#: src/addressbook.c:337
+#: src/addressbook.c:339
 msgid "/_File/New _Book"
 msgstr "/_Datei/Neues Adress_buch"
 
-#: src/addressbook.c:338
+#: src/addressbook.c:340
 msgid "/_File/New _vCard"
 msgstr "/_Datei/Neue _vCard"
 
-#: src/addressbook.c:340
+#: src/addressbook.c:342
 msgid "/_File/New _JPilot"
 msgstr "/_Datei/Neues _JPilot"
 
-#: src/addressbook.c:343
+#: src/addressbook.c:345
 msgid "/_File/New _Server"
 msgstr "/_Datei/Neuer _Server"
 
-#: src/addressbook.c:345 src/addressbook.c:348 src/compose.c:520
-#: src/compose.c:525 src/compose.c:528 src/compose.c:531 src/mainwindow.c:495
-#: src/mainwindow.c:498 src/mainwindow.c:500 src/mainwindow.c:503
-#: src/mainwindow.c:505 src/messageview.c:141
+#: src/addressbook.c:347 src/addressbook.c:350 src/compose.c:520
+#: src/compose.c:525 src/compose.c:528 src/compose.c:531 src/mainwindow.c:498
+#: src/mainwindow.c:501 src/mainwindow.c:503 src/mainwindow.c:506
+#: src/mainwindow.c:508 src/messageview.c:141
 msgid "/_File/---"
 msgstr "/_Datei/---"
 
-#: src/addressbook.c:346
+#: src/addressbook.c:348
 msgid "/_File/_Edit"
 msgstr "/_Datei/_Bearbeiten"
 
-#: src/addressbook.c:347
+#: src/addressbook.c:349
 msgid "/_File/_Delete"
 msgstr "/_Datei/_Löschen"
 
-#: src/addressbook.c:349
+#: src/addressbook.c:351
 msgid "/_File/_Save"
 msgstr "/_Datei/_Speichern"
 
-#: src/addressbook.c:350 src/compose.c:532 src/messageview.c:142
+#: src/addressbook.c:352 src/compose.c:532 src/messageview.c:142
 msgid "/_File/_Close"
 msgstr "/_Datei/S_chließen"
 
-#: src/addressbook.c:351
+#: src/addressbook.c:353
 msgid "/_Address"
 msgstr "/_Adresse"
 
-#: src/addressbook.c:352
+#: src/addressbook.c:354
 msgid "/_Address/New _Address"
 msgstr "/_Adresse/Neue _Adresse"
 
-#: src/addressbook.c:353
+#: src/addressbook.c:355
 msgid "/_Address/New _Group"
 msgstr "/_Adresse/Neue _Gruppe"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:356
 msgid "/_Address/New _Folder"
 msgstr "/_Adresse/Neue Ab_lage"
 
-#: src/addressbook.c:355
+#: src/addressbook.c:357
 msgid "/_Address/---"
 msgstr "/_Adresse/---"
 
-#: src/addressbook.c:356
+#: src/addressbook.c:358
 msgid "/_Address/_Edit"
 msgstr "/_Adresse/_Bearbeiten"
 
-#: src/addressbook.c:357
+#: src/addressbook.c:359
 msgid "/_Address/_Delete"
 msgstr "/_Adresse/_Löschen"
 
-#: src/addressbook.c:358 src/compose.c:639 src/mainwindow.c:738
-#: src/messageview.c:259
+#: src/addressbook.c:360 src/compose.c:645 src/mainwindow.c:749
+#: src/messageview.c:264
 msgid "/_Tools"
 msgstr "/_Werkzeug"
 
-#: src/addressbook.c:359
+#: src/addressbook.c:361
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Werkzeug/Importiere _LDIF-Datei"
 
-#: src/addressbook.c:360 src/compose.c:658 src/mainwindow.c:788
-#: src/messageview.c:277
+#: src/addressbook.c:362 src/compose.c:664 src/mainwindow.c:799
+#: src/messageview.c:282
 msgid "/_Help"
 msgstr "/_Hilfe"
 
-#: src/addressbook.c:361 src/compose.c:659 src/mainwindow.c:799
-#: src/messageview.c:278
+#: src/addressbook.c:363 src/compose.c:665 src/mainwindow.c:810
+#: src/messageview.c:283
 msgid "/_Help/_About"
 msgstr "/_Hilfe/_Über"
 
-#: src/addressbook.c:380 src/addressbook.c:390
+#: src/addressbook.c:382 src/addressbook.c:392
 msgid "/New _Address"
 msgstr "/Neue _Adresse"
 
-#: src/addressbook.c:381 src/addressbook.c:391
+#: src/addressbook.c:383 src/addressbook.c:393
 msgid "/New _Group"
 msgstr "/Neue _Gruppe"
 
-#: src/addressbook.c:382 src/addressbook.c:392
+#: src/addressbook.c:384 src/addressbook.c:394
 msgid "/New _Folder"
 msgstr "/Neue Ab_lage"
 
-#: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:509
+#: src/addressbook.c:385 src/addressbook.c:395 src/compose.c:509
 #: src/folderview.c:246 src/folderview.c:248 src/folderview.c:253
 #: src/folderview.c:266 src/folderview.c:268 src/folderview.c:270
 #: src/folderview.c:275 src/folderview.c:289 src/folderview.c:291
 #: src/folderview.c:295 src/summaryview.c:414 src/summaryview.c:418
-#: src/summaryview.c:421 src/summaryview.c:431 src/summaryview.c:433
-#: src/summaryview.c:435 src/summaryview.c:447 src/summaryview.c:453
+#: src/summaryview.c:421 src/summaryview.c:433 src/summaryview.c:435
+#: src/summaryview.c:437 src/summaryview.c:449 src/summaryview.c:455
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:534
-#: src/mainwindow.c:509 src/messageview.c:144
+#: src/addressbook.c:386 src/addressbook.c:396 src/compose.c:534
+#: src/mainwindow.c:512 src/messageview.c:144
 msgid "/_Edit"
 msgstr "/_Bearbeiten"
 
-#: src/addressbook.c:385 src/addressbook.c:395 src/summaryview.c:432
+#: src/addressbook.c:387 src/addressbook.c:397 src/summaryview.c:434
 msgid "/_Delete"
 msgstr "/_Löschen"
 
-#: src/addressbook.c:492
+#: src/addressbook.c:494
 msgid "E-Mail address"
 msgstr "E-Mail Adresse"
 
-#: src/addressbook.c:496 src/compose.c:4763 src/prefs_common_dialog.c:2183
+#: src/addressbook.c:498 src/compose.c:4772 src/prefs_common_dialog.c:2183
 msgid "Address book"
 msgstr "Adressbuch"
 
-#: src/addressbook.c:596 src/prefs_filter_edit.c:249
+#: src/addressbook.c:600 src/prefs_filter_edit.c:249
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "Name:"
 
 #. Buttons
-#: src/addressbook.c:628 src/addressbook.c:1680 src/editaddress.c:884
-#: src/editaddress.c:1017 src/mainwindow.c:2391 src/prefs_actions.c:266
+#: src/addressbook.c:632 src/addressbook.c:1684 src/editaddress.c:884
+#: src/editaddress.c:1017 src/mainwindow.c:2402 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
 #: src/prefs_template.c:233
 msgid "Delete"
 msgstr "Löschen"
 
-#: src/addressbook.c:631 src/editaddress.c:890 src/editaddress.c:1023
+#: src/addressbook.c:635 src/editaddress.c:890 src/editaddress.c:1023
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:273 src/prefs_display_header.c:328
 #: src/prefs_filter_edit.c:1550
 msgid "Add"
 msgstr "Hinzufügen"
 
-#: src/addressbook.c:634
+#: src/addressbook.c:638
 msgid "Lookup"
 msgstr "Vorschau"
 
-#: src/addressbook.c:646 src/headerview.c:55 src/prefs_folder_item.c:339
+#: src/addressbook.c:650 src/headerview.c:55 src/prefs_folder_item.c:339
 #: src/prefs_template.c:176
 msgid "To:"
 msgstr "An:"
 
-#: src/addressbook.c:650 src/prefs_folder_item.c:356 src/prefs_template.c:178
+#: src/addressbook.c:654 src/prefs_folder_item.c:356 src/prefs_template.c:178
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:654 src/prefs_folder_item.c:367
+#: src/addressbook.c:658 src/prefs_folder_item.c:367
 msgid "Bcc:"
 msgstr "Bcc:"
 
 #. Confirm deletion
-#: src/addressbook.c:841
+#: src/addressbook.c:845
 msgid "Delete address(es)"
 msgstr "Adresse(n) löschen"
 
-#: src/addressbook.c:842
+#: src/addressbook.c:846
 msgid "Really delete the address(es)?"
 msgstr "Adresse(n) wirklich löschen?"
 
-#: src/addressbook.c:1671
+#: src/addressbook.c:1675
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1047,36 +1047,36 @@ msgstr ""
 "Wenn Sie nur die Ablage löschen, werden die Adressen in das übergeordnete "
 "Verzeichnis verschoben."
 
-#: src/addressbook.c:1674 src/folderview.c:2351
+#: src/addressbook.c:1678 src/folderview.c:2351
 msgid "Delete folder"
 msgstr "Ablage löschen"
 
-#: src/addressbook.c:1674
+#: src/addressbook.c:1678
 msgid "_Folder only"
 msgstr "Nur Abla_ge"
 
-#: src/addressbook.c:1674
+#: src/addressbook.c:1678
 msgid "Folder and _addresses"
 msgstr "Ablage und _Adressen"
 
-#: src/addressbook.c:1679
+#: src/addressbook.c:1683
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Wirklich '%s' löschen ?"
 
-#: src/addressbook.c:2365 src/addressbook.c:2498
+#: src/addressbook.c:2369 src/addressbook.c:2502
 msgid "New user, could not save index file."
 msgstr "Neuer Benutzer, kann Index-Datei nicht speichern."
 
-#: src/addressbook.c:2369 src/addressbook.c:2502
+#: src/addressbook.c:2373 src/addressbook.c:2506
 msgid "New user, could not save address book files."
 msgstr "Neuer Benutzer, kann Adressbuch-Dateien nicht speichern."
 
-#: src/addressbook.c:2379 src/addressbook.c:2512
+#: src/addressbook.c:2383 src/addressbook.c:2516
 msgid "Old address book converted successfully."
 msgstr "Altes Adressbuch erfolgreich konvertiert."
 
-#: src/addressbook.c:2384
+#: src/addressbook.c:2388
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1084,7 +1084,7 @@ msgstr ""
 "Altes Adressbuch konvertiert,\n"
 "kann neue Adress-Index-Datei nicht speichern"
 
-#: src/addressbook.c:2397
+#: src/addressbook.c:2401
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1092,7 +1092,7 @@ msgstr ""
 "Konnte Adressbuch nicht konvertieren,\n"
 "aber erstellte neue leere Adressbuch-Dateien."
 
-#: src/addressbook.c:2403
+#: src/addressbook.c:2407
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1100,7 +1100,7 @@ msgstr ""
 "Konnte Adressbuch nicht konvertieren,\n"
 "konnte neue Adressbuch-Dateien nicht erstellen."
 
-#: src/addressbook.c:2408
+#: src/addressbook.c:2412
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1108,92 +1108,92 @@ msgstr ""
 "Konnte Adressbuch nicht konvertieren\n"
 "und konnte neue Adressbuch-Dateien erstellen."
 
-#: src/addressbook.c:2415
+#: src/addressbook.c:2419
 msgid "Addressbook conversion error"
 msgstr "Adressbuch-Konvertierungs-Fehler"
 
-#: src/addressbook.c:2419
+#: src/addressbook.c:2423
 msgid "Addressbook conversion"
 msgstr "Adressbuch-Konvertierung"
 
-#: src/addressbook.c:2454
+#: src/addressbook.c:2458
 msgid "Addressbook Error"
 msgstr "Adressbuch-Fehler"
 
-#: src/addressbook.c:2455 src/addressbook.c:2555
+#: src/addressbook.c:2459 src/addressbook.c:2559
 msgid "Could not read address index"
 msgstr "Konnte Adress-Index nicht lesen"
 
-#: src/addressbook.c:2517
+#: src/addressbook.c:2521
 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:2531
+#: src/addressbook.c:2535
 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:2537
+#: src/addressbook.c:2541
 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:2543
+#: src/addressbook.c:2547
 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:2561
+#: src/addressbook.c:2565
 msgid "Addressbook Conversion Error"
 msgstr "Adressbuch-Konvertierungs-Fehler"
 
-#: src/addressbook.c:2567
+#: src/addressbook.c:2571
 msgid "Addressbook Conversion"
 msgstr "Adressbuch-Konvertierung"
 
-#: src/addressbook.c:3072 src/prefs_common_dialog.c:2033
+#: src/addressbook.c:3086 src/prefs_common_dialog.c:2033
 msgid "Interface"
 msgstr "Benutzerschnittstelle"
 
-#: src/addressbook.c:3088 src/importldif.c:514
+#: src/addressbook.c:3102 src/importldif.c:514
 msgid "Address Book"
 msgstr "Adressbuch"
 
-#: src/addressbook.c:3104
+#: src/addressbook.c:3118
 msgid "Person"
 msgstr "Person"
 
-#: src/addressbook.c:3120
+#: src/addressbook.c:3134
 msgid "EMail Address"
 msgstr "E-Mail Adresse"
 
-#: src/addressbook.c:3136
+#: src/addressbook.c:3150
 msgid "Group"
 msgstr "Gruppe"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3152 src/folderview.c:367 src/prefs_account_dialog.c:1694
+#: src/addressbook.c:3166 src/folderview.c:367 src/prefs_account_dialog.c:1694
 #: src/query_search.c:370
 msgid "Folder"
 msgstr "Ablage"
 
-#: src/addressbook.c:3168
+#: src/addressbook.c:3182
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3184 src/addressbook.c:3200
+#: src/addressbook.c:3198 src/addressbook.c:3214
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3216
+#: src/addressbook.c:3230
 msgid "LDAP Server"
 msgstr "LDAP-Server"
 
@@ -1205,7 +1205,7 @@ msgstr "Allgemeine Adressen"
 msgid "Personal address"
 msgstr "Persönliche Adressen"
 
-#: src/alertpanel.c:141 src/compose.c:5485 src/main.c:573
+#: src/alertpanel.c:141 src/compose.c:5494 src/main.c:573
 msgid "Notice"
 msgstr "Notiz"
 
@@ -1256,7 +1256,7 @@ msgstr "Braun"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4593
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4750
 msgid "None"
 msgstr "Keine"
 
@@ -1313,7 +1313,7 @@ msgstr "/_Bearbeiten/_Zurück"
 msgid "/_Edit/_Redo"
 msgstr "/_Bearbeiten/_Wiederholen"
 
-#: src/compose.c:537 src/compose.c:544 src/mainwindow.c:513
+#: src/compose.c:537 src/compose.c:544 src/mainwindow.c:516
 #: src/messageview.c:147
 msgid "/_Edit/---"
 msgstr "/_Bearbeiten/---"
@@ -1322,7 +1322,7 @@ msgstr "/_Bearbeiten/---"
 msgid "/_Edit/Cu_t"
 msgstr "/_Bearbeiten/_Ausschneiden"
 
-#: src/compose.c:539 src/mainwindow.c:510 src/messageview.c:145
+#: src/compose.c:539 src/mainwindow.c:513 src/messageview.c:145
 msgid "/_Edit/_Copy"
 msgstr "/_Bearbeiten/_Kopieren"
 
@@ -1334,7 +1334,7 @@ msgstr "/_Bearbeiten/_Einfügen"
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Bearbeiten/Als Zitat _einfügen"
 
-#: src/compose.c:543 src/mainwindow.c:511 src/messageview.c:146
+#: src/compose.c:543 src/mainwindow.c:514 src/messageview.c:146
 msgid "/_Edit/Select _all"
 msgstr "/_Bearbeiten/Alle au_swählen"
 
@@ -1350,8 +1350,8 @@ msgstr "/_Bearbeiten/Alle langen Zeilen _umbrechen"
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Bearbeiten/Aut_omatisches umbrechen"
 
-#: src/compose.c:550 src/mainwindow.c:518 src/messageview.c:151
-#: src/summaryview.c:448
+#: src/compose.c:550 src/mainwindow.c:521 src/messageview.c:151
+#: src/summaryview.c:450
 msgid "/_View"
 msgstr "/_Ansicht"
 
@@ -1372,9 +1372,9 @@ msgid "/_View/_Reply to"
 msgstr "/_Ansicht/A_ntwort an"
 
 #: src/compose.c:555 src/compose.c:557 src/compose.c:559 src/compose.c:561
-#: src/mainwindow.c:538 src/mainwindow.c:541 src/mainwindow.c:568
-#: src/mainwindow.c:592 src/mainwindow.c:687 src/mainwindow.c:691
-#: src/messageview.c:236
+#: src/mainwindow.c:541 src/mainwindow.c:544 src/mainwindow.c:571
+#: src/mainwindow.c:595 src/mainwindow.c:696 src/mainwindow.c:700
+#: src/messageview.c:241
 msgid "/_View/---"
 msgstr "/_Ansicht/---"
 
@@ -1390,7 +1390,7 @@ msgstr "/_Ansicht/_Lineal"
 msgid "/_View/_Attachment"
 msgstr "/_Ansicht/An_hang"
 
-#: src/compose.c:567 src/mainwindow.c:599 src/messageview.c:158
+#: src/compose.c:567 src/mainwindow.c:602 src/messageview.c:158
 msgid "/_View/Character _encoding"
 msgstr "/_Ansicht/_Zeichensatz"
 
@@ -1399,212 +1399,223 @@ msgid "/_View/Character _encoding/_Automatic"
 msgstr "/_Ansicht/_Zeichensatz/_Automatisch"
 
 #: src/compose.c:570 src/compose.c:576 src/compose.c:582 src/compose.c:586
-#: src/compose.c:592 src/compose.c:596 src/compose.c:602 src/compose.c:606
-#: src/compose.c:616 src/compose.c:620 src/compose.c:628 src/compose.c:632
-#: src/mainwindow.c:595 src/mainwindow.c:602 src/messageview.c:154
+#: src/compose.c:592 src/compose.c:596 src/compose.c:602 src/compose.c:608
+#: src/compose.c:612 src/compose.c:622 src/compose.c:626 src/compose.c:634
+#: src/compose.c:638 src/mainwindow.c:598 src/mainwindow.c:605
+#: src/messageview.c:154
 msgid "/_View/Character _encoding/---"
 msgstr "/_Ansicht/_Zeichensatz/---"
 
-#: src/compose.c:572 src/mainwindow.c:603 src/messageview.c:162
+#: src/compose.c:572 src/mainwindow.c:606 src/messageview.c:162
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Ansicht/_Zeichensatz/7bit ascii (US-ASC_II)"
 
-#: src/compose.c:574 src/mainwindow.c:605 src/messageview.c:165
+#: src/compose.c:574 src/mainwindow.c:608 src/messageview.c:165
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Ansicht/_Zeichensatz/Unicode (_UTF-8)"
 
-#: src/compose.c:578 src/mainwindow.c:609 src/messageview.c:168
+#: src/compose.c:578 src/mainwindow.c:612 src/messageview.c:168
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Ansicht/_Zeichensatz/West Europa (ISO-8859-_1)"
 
-#: src/compose.c:580 src/mainwindow.c:611 src/messageview.c:170
+#: src/compose.c:580 src/mainwindow.c:614 src/messageview.c:170
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Ansicht/_Zeichensatz/West Europa (ISO-8859-15)"
 
-#: src/compose.c:584 src/mainwindow.c:617 src/messageview.c:175
+#: src/compose.c:584 src/mainwindow.c:620 src/messageview.c:175
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Ansicht/_Zeichensatz/Zentral Europa (ISO-8859-_2)"
 
-#: src/compose.c:588 src/mainwindow.c:621 src/messageview.c:178
+#: src/compose.c:588 src/mainwindow.c:624 src/messageview.c:178
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Ansicht/_Zeichensatz/_Baltisch (ISO-8859-13)"
 
-#: src/compose.c:590 src/mainwindow.c:623 src/messageview.c:180
+#: src/compose.c:590 src/mainwindow.c:626 src/messageview.c:180
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Ansicht/_Zeichensatz/Baltisch (ISO-8859-_4)"
 
-#: src/compose.c:594 src/mainwindow.c:627 src/messageview.c:183
+#: src/compose.c:594 src/mainwindow.c:630 src/messageview.c:183
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Ansicht/_Zeichensatz/Griechisch (ISO-8859-_7)"
 
-#: src/compose.c:598 src/mainwindow.c:631 src/messageview.c:186
+#: src/compose.c:598 src/mainwindow.c:634 src/messageview.c:186
+#, fuzzy
+msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
+msgstr "/_Ansicht/_Zeichensatz/Baltisch (ISO-8859-_4)"
+
+#: src/compose.c:600 src/mainwindow.c:636 src/messageview.c:188
+#, fuzzy
+msgid "/_View/Character _encoding/Arabic (Windows-1256)"
+msgstr "/_Ansicht/_Zeichensatz/Kyrillisch (Windows-1251)"
+
+#: src/compose.c:604 src/mainwindow.c:640 src/messageview.c:191
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Ansicht/_Zeichensatz/Griechisch (ISO-8859-_7)"
 
-#: src/compose.c:600 src/mainwindow.c:633 src/messageview.c:188
+#: src/compose.c:606 src/mainwindow.c:642 src/messageview.c:193
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Ansicht/_Zeichensatz/Hebräisch (Windows-1255)"
 
-#: src/compose.c:604 src/mainwindow.c:637 src/messageview.c:191
+#: src/compose.c:610 src/mainwindow.c:646 src/messageview.c:196
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Ansicht/_Zeichensatz/Türkisch (ISO-8859-_9)"
 
-#: src/compose.c:608 src/mainwindow.c:641 src/messageview.c:194
+#: src/compose.c:614 src/mainwindow.c:650 src/messageview.c:199
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Ansicht/_Zeichensatz/Kyrillisch (ISO-8859-_5)"
 
-#: src/compose.c:610 src/mainwindow.c:643 src/messageview.c:196
+#: src/compose.c:616 src/mainwindow.c:652 src/messageview.c:201
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Ansicht/_Zeichensatz/Kyrillisch (KOI8-_R)"
 
-#: src/compose.c:612 src/mainwindow.c:645 src/messageview.c:198
+#: src/compose.c:618 src/mainwindow.c:654 src/messageview.c:203
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Ansicht/_Zeichensatz/Kyrillisch (KOI8-_U)"
 
-#: src/compose.c:614 src/mainwindow.c:647 src/messageview.c:200
+#: src/compose.c:620 src/mainwindow.c:656 src/messageview.c:205
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Ansicht/_Zeichensatz/Kyrillisch (Windows-1251)"
 
-#: src/compose.c:618 src/mainwindow.c:651 src/messageview.c:203
+#: src/compose.c:624 src/mainwindow.c:660 src/messageview.c:208
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Ansicht/_Zeichensatz/Japanisch (ISO-2022-_JP)"
 
-#: src/compose.c:622 src/mainwindow.c:661 src/messageview.c:212
+#: src/compose.c:628 src/mainwindow.c:670 src/messageview.c:217
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Ansicht/_Zeichensatz/Einfaches Chinesisch (_GB2312)"
 
-#: src/compose.c:624 src/mainwindow.c:663 src/messageview.c:214
+#: src/compose.c:630 src/mainwindow.c:672 src/messageview.c:219
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Ansicht/_Zeichensatz/Einfaches Chinesisch (_GB2312)"
 
-#: src/compose.c:626 src/mainwindow.c:665 src/messageview.c:216
+#: src/compose.c:632 src/mainwindow.c:674 src/messageview.c:221
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Ansicht/_Zeichensatz/Traditionelles Chinesisch (_Big5)"
 
-#: src/compose.c:630 src/mainwindow.c:673 src/messageview.c:223
+#: src/compose.c:636 src/mainwindow.c:682 src/messageview.c:228
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Ansicht/_Zeichensatz/Koreanisch (EUC-_KR)"
 
-#: src/compose.c:634 src/mainwindow.c:679 src/messageview.c:228
+#: src/compose.c:640 src/mainwindow.c:688 src/messageview.c:233
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Ansicht/_Zeichensatz/Thai (TIS-620)"
 
-#: src/compose.c:636 src/mainwindow.c:681 src/messageview.c:230
+#: src/compose.c:642 src/mainwindow.c:690 src/messageview.c:235
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Ansicht/_Zeichensatz/Thai (Windows-874)"
 
-#: src/compose.c:640 src/mainwindow.c:739 src/messageview.c:260
+#: src/compose.c:646 src/mainwindow.c:750 src/messageview.c:265
 msgid "/_Tools/_Address book"
 msgstr "/_Werkzeug/_Adressbuch"
 
-#: src/compose.c:641
+#: src/compose.c:647
 msgid "/_Tools/_Template"
 msgstr "/_Werkzeug/_Schablone"
 
-#: src/compose.c:642 src/mainwindow.c:762 src/messageview.c:275
+#: src/compose.c:648 src/mainwindow.c:773 src/messageview.c:280
 msgid "/_Tools/Actio_ns"
 msgstr "/_Werkzeug/Aktio_nen"
 
-#: src/compose.c:643 src/compose.c:647 src/compose.c:653 src/mainwindow.c:742
-#: src/mainwindow.c:756 src/mainwindow.c:761 src/mainwindow.c:763
-#: src/mainwindow.c:766 src/mainwindow.c:768 src/messageview.c:263
-#: src/messageview.c:274
+#: src/compose.c:649 src/compose.c:653 src/compose.c:659 src/mainwindow.c:753
+#: src/mainwindow.c:767 src/mainwindow.c:772 src/mainwindow.c:774
+#: src/mainwindow.c:777 src/mainwindow.c:779 src/messageview.c:268
+#: src/messageview.c:279
 msgid "/_Tools/---"
 msgstr "/_Werkzeug/---"
 
-#: src/compose.c:644
+#: src/compose.c:650
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/_Werkzeug/Mit e_xternem Editor bearbeiten"
 
-#: src/compose.c:648
+#: src/compose.c:654
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Werkzeug/PGP _Unterschreiben"
 
-#: src/compose.c:649
+#: src/compose.c:655
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/_Werkzeug/PGP _Verschlüsseln"
 
-#: src/compose.c:654
+#: src/compose.c:660
 msgid "/_Tools/_Check spell"
 msgstr "/_Werkzeuge/_Rechtschreibprüfung"
 
-#: src/compose.c:655
+#: src/compose.c:661
 msgid "/_Tools/_Set spell language"
 msgstr "/_Werkzeug/_Sprache einstellen"
 
-#: src/compose.c:899
+#: src/compose.c:908
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: Datei existiert nicht\n"
 
-#: src/compose.c:1003 src/compose.c:1074
+#: src/compose.c:1012 src/compose.c:1083
 msgid "Can't get text part\n"
 msgstr "Kann Textabschnitt nicht lesen\n"
 
-#: src/compose.c:1475
+#: src/compose.c:1484
 msgid "Quote mark format error."
 msgstr "Zitatzeichen Formatfehler."
 
-#: src/compose.c:1487
+#: src/compose.c:1496
 msgid "Message reply/forward format error."
 msgstr "Formatfehler in Nachrichtenantwort oder -Weiterleitung."
 
-#: src/compose.c:1907
+#: src/compose.c:1916
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Datei %s existiert nicht\n"
 
-#: src/compose.c:1911
+#: src/compose.c:1920
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Kann Dateigröße von %s nicht ermitteln\n"
 
-#: src/compose.c:1915
+#: src/compose.c:1924
 #, c-format
 msgid "File %s is empty."
 msgstr "Datei %s ist leer."
 
-#: src/compose.c:1919
+#: src/compose.c:1928
 #, c-format
 msgid "Can't read %s."
 msgstr "Kann %s nicht lesen."
 
-#: src/compose.c:1952
+#: src/compose.c:1961
 #, c-format
 msgid "Message: %s"
 msgstr "Nachricht: %s"
 
-#: src/compose.c:2012 src/mimeview.c:565
+#: src/compose.c:2021 src/mimeview.c:565
 msgid "Can't get the part of multipart message."
 msgstr "Kann einen Teil einer mehrteiligen Nachricht nicht bekommen."
 
-#: src/compose.c:2496 src/headerview.c:195 src/query_search.c:636
-#: src/summaryview.c:2107
+#: src/compose.c:2505 src/headerview.c:195 src/query_search.c:636
+#: src/summaryview.c:2124
 msgid "(No Subject)"
 msgstr "(Kein Betreff)"
 
-#: src/compose.c:2499
+#: src/compose.c:2508
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Verfassen%s"
 
-#: src/compose.c:2612
+#: src/compose.c:2621
 msgid "Recipient is not specified."
 msgstr "Empfänger nicht angegeben"
 
-#: src/compose.c:2620
+#: src/compose.c:2629
 msgid "Empty subject"
 msgstr "Leerer Betreff"
 
-#: src/compose.c:2621
+#: src/compose.c:2630
 msgid "Subject is empty. Send it anyway?"
 msgstr "Betreff ist leer. Trotzdem verschicken?"
 
-#: src/compose.c:2680
+#: src/compose.c:2689
 msgid "can't get recipient list."
 msgstr "Kann die Empfängerliste nicht holen."
 
-#: src/compose.c:2700
+#: src/compose.c:2709
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1612,21 +1623,21 @@ 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:2714 src/send_message.c:299
+#: src/compose.c:2723 src/send_message.c:299
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Fehler beim Senden der Nachricht an %s ."
 
-#: src/compose.c:2756
+#: src/compose.c:2765
 msgid "Can't save the message to outbox."
 msgstr "Kann die Nachricht nicht in der Gesendet-Ablage speichern."
 
-#: src/compose.c:2794
+#: src/compose.c:2803
 #, 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:2891
+#: src/compose.c:2900
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1637,11 +1648,11 @@ msgstr ""
 "\n"
 "Dennoch mit %s senden?"
 
-#: src/compose.c:2897
+#: src/compose.c:2906
 msgid "Code conversion error"
 msgstr "Zeichensatz-Konvertierungs-Fehler"
 
-#: src/compose.c:2970
+#: src/compose.c:2979
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1654,156 +1665,156 @@ msgstr ""
 "\n"
 "Dennoch senden?"
 
-#: src/compose.c:2974
+#: src/compose.c:2983
 msgid "Line length limit"
 msgstr "maximale Zeilenlänge"
 
-#: src/compose.c:3264
+#: src/compose.c:3273
 msgid "can't remove the old message\n"
 msgstr "Kann die alte Nachricht nicht entfernen\n"
 
-#: src/compose.c:3282
+#: src/compose.c:3291
 msgid "queueing message...\n"
 msgstr "Nachricht einreihen...\n"
 
-#: src/compose.c:3364
+#: src/compose.c:3373
 msgid "can't find queue folder\n"
 msgstr "kann Queue-Ablage nicht finden\n"
 
-#: src/compose.c:3371
+#: src/compose.c:3380
 msgid "can't queue the message\n"
 msgstr "Nachricht kann nicht eingereiht werden\n"
 
-#: src/compose.c:3964
+#: src/compose.c:3973
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "erzeugte Nachrichten-ID: %s\n"
 
-#: src/compose.c:4077
+#: src/compose.c:4086
 msgid "Creating compose window...\n"
 msgstr "Erstelle Verfassenfenster...\n"
 
-#: src/compose.c:4128 src/headerview.c:54
+#: src/compose.c:4137 src/headerview.c:54
 msgid "From:"
 msgstr "Von:"
 
-#: src/compose.c:4202
+#: src/compose.c:4211
 msgid "PGP Sign"
 msgstr "PGP Unterschreiben"
 
-#: src/compose.c:4205
+#: src/compose.c:4214
 msgid "PGP Encrypt"
 msgstr "PGP Verschlüsseln"
 
-#: src/compose.c:4243 src/compose.c:5317
+#: src/compose.c:4252 src/compose.c:5326
 msgid "MIME type"
 msgstr "MIME-Typ"
 
 #. S_COL_DATE
-#: src/compose.c:4252 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4740
+#: src/compose.c:4261 src/mimeview.c:197 src/prefs_filter_edit.c:496
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4897
 msgid "Size"
 msgstr "Größe"
 
-#: src/compose.c:4683 src/mainwindow.c:2324 src/prefs_account_dialog.c:528
+#: src/compose.c:4692 src/mainwindow.c:2335 src/prefs_account_dialog.c:528
 #: src/prefs_common_dialog.c:661
 msgid "Send"
 msgstr "Senden"
 
-#: src/compose.c:4684
+#: src/compose.c:4693
 msgid "Send message"
 msgstr "Sende Nachricht"
 
-#: src/compose.c:4692
+#: src/compose.c:4701
 msgid "Send later"
 msgstr "Später senden"
 
-#: src/compose.c:4693
+#: src/compose.c:4702
 msgid "Put into queue folder and send later"
 msgstr "In Queue-Ablage und später senden"
 
-#: src/compose.c:4701
+#: src/compose.c:4710
 msgid "Draft"
 msgstr "Entwurf"
 
-#: src/compose.c:4702
+#: src/compose.c:4711
 msgid "Save to draft folder"
 msgstr "Speichern in Entwurfablage"
 
-#: src/compose.c:4712
+#: src/compose.c:4721
 msgid "Insert"
 msgstr "Einfügen"
 
-#: src/compose.c:4713
+#: src/compose.c:4722
 msgid "Insert file"
 msgstr "Datei einfügen"
 
-#: src/compose.c:4721
+#: src/compose.c:4730
 msgid "Attach"
 msgstr "Anhängen"
 
-#: src/compose.c:4722
+#: src/compose.c:4731
 msgid "Attach file"
 msgstr "Datei anhängen"
 
 #. signature
-#: src/compose.c:4732 src/prefs_account_dialog.c:1208
+#: src/compose.c:4741 src/prefs_account_dialog.c:1208
 #: src/prefs_common_dialog.c:953
 msgid "Signature"
 msgstr "Unterschrift"
 
-#: src/compose.c:4733
+#: src/compose.c:4742
 msgid "Append signature"
 msgstr "Signatur anhängen"
 
 #. editor
-#: src/compose.c:4742 src/prefs_common_dialog.c:991
+#: src/compose.c:4751 src/prefs_common_dialog.c:991
 #: src/prefs_common_dialog.c:2315
 msgid "Editor"
 msgstr "Editor"
 
-#: src/compose.c:4743
+#: src/compose.c:4752
 msgid "Edit with external editor"
 msgstr "Bearbeiten mit externem Editor"
 
-#: src/compose.c:4751
+#: src/compose.c:4760
 msgid "Linewrap"
 msgstr "Zeilenumbruch"
 
-#: src/compose.c:4752
+#: src/compose.c:4761
 msgid "Wrap all long lines"
 msgstr "Alle langen Zeilen umbrechen"
 
-#: src/compose.c:5213
+#: src/compose.c:5222
 msgid "Invalid MIME type."
 msgstr "Ungültiger MIME Typ"
 
-#: src/compose.c:5231
+#: src/compose.c:5240
 msgid "File doesn't exist or is empty."
 msgstr "Datei existiert nicht oder ist leer."
 
-#: src/compose.c:5299
+#: src/compose.c:5308
 msgid "Properties"
 msgstr "Eigenschaften"
 
-#: src/compose.c:5319 src/prefs_common_dialog.c:1444
+#: src/compose.c:5328 src/prefs_common_dialog.c:1444
 msgid "Encoding"
 msgstr "Zeichensatzkodierung"
 
-#: src/compose.c:5342 src/prefs_folder_item.c:202
+#: src/compose.c:5351 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Pfad"
 
-#: src/compose.c:5343
+#: src/compose.c:5352
 msgid "File name"
 msgstr "Dateiname"
 
-#: src/compose.c:5436
+#: src/compose.c:5445
 #, 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:5482
+#: src/compose.c:5491
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1812,44 +1823,44 @@ msgstr ""
 "Der externe Editor arbeitet noch.\n"
 "Prozess terminieren (pid: %d)?\n"
 
-#: src/compose.c:5857 src/compose.c:5862 src/compose.c:5868
+#: src/compose.c:5866 src/compose.c:5871 src/compose.c:5877
 msgid "Can't queue the message."
 msgstr "Nachricht kann nicht eingereiht werden."
 
-#: src/compose.c:5959
+#: src/compose.c:5968
 msgid "Select files"
 msgstr "Wähle Datei(en)"
 
-#: src/compose.c:5982
+#: src/compose.c:5991
 msgid "Select file"
 msgstr "Wähle Datei"
 
-#: src/compose.c:6017
+#: src/compose.c:6026
 msgid "Save message"
 msgstr "Speichern der Nachricht"
 
-#: src/compose.c:6018
+#: src/compose.c:6027
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Diese Nachricht wurde geändert. Speichern als Entwurf?"
 
-#: src/compose.c:6020
+#: src/compose.c:6029
 msgid "Close _without saving"
 msgstr "Schließen _ohne Speichern"
 
-#: src/compose.c:6062
+#: src/compose.c:6071
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Wollen Sie die Schablone '%s' übernehmen ?"
 
-#: src/compose.c:6064
+#: src/compose.c:6073
 msgid "Apply template"
 msgstr "Schablone übernehmen"
 
-#: src/compose.c:6065
+#: src/compose.c:6074
 msgid "_Replace"
 msgstr "E_rsetzen"
 
-#: src/compose.c:6065
+#: src/compose.c:6074
 msgid "_Insert"
 msgstr "_Einfügen"
 
@@ -2284,7 +2295,7 @@ msgstr "Neu"
 
 #. S_COL_MARK
 #: src/folderview.c:412 src/prefs_filter_edit.c:500
-#: src/prefs_summary_column.c:71 src/summaryview.c:509
+#: src/prefs_summary_column.c:71 src/summaryview.c:511
 msgid "Unread"
 msgstr "Ungelesen"
 
@@ -2300,12 +2311,12 @@ msgstr "Setze Ablageinformation...\n"
 msgid "Setting folder info..."
 msgstr "Setze Ablageinformation..."
 
-#: src/folderview.c:858 src/mainwindow.c:3464 src/setup.c:80
+#: src/folderview.c:858 src/mainwindow.c:3481 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Durchsuche Ablage %s%c%s ..."
 
-#: src/folderview.c:862 src/mainwindow.c:3469 src/setup.c:85
+#: src/folderview.c:862 src/mainwindow.c:3486 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Durchsuche Ablage %s ..."
@@ -2330,7 +2341,7 @@ msgstr "Ablagenbaum erneuern fehlgeschlagen..."
 msgid "Checking for new messages in all folders..."
 msgstr "Alle Ablagen auf neue Nachrichten prüfen..."
 
-#: src/folderview.c:1200 src/mainwindow.c:2400 src/prefs_common_dialog.c:1789
+#: src/folderview.c:1200 src/mainwindow.c:2411 src/prefs_common_dialog.c:1789
 msgid "Junk"
 msgstr "Spam"
 
@@ -2469,7 +2480,7 @@ msgstr "Betreff:"
 msgid "Creating header view...\n"
 msgstr "Erzeuge Kopfzeilenansicht...\n"
 
-#: src/headerview.c:180 src/query_search.c:637 src/summaryview.c:2110
+#: src/headerview.c:180 src/query_search.c:637 src/summaryview.c:2127
 msgid "(No From)"
 msgstr "(Kein Von)"
 
@@ -2579,7 +2590,7 @@ msgstr "Importiere LDIF-Datei in Adressbuch"
 msgid "Prev"
 msgstr "Vorherige"
 
-#: src/importldif.c:768 src/mainwindow.c:2420
+#: src/importldif.c:768 src/mainwindow.c:2431
 msgid "Next"
 msgstr "Nächste"
 
@@ -2931,11 +2942,11 @@ msgstr ""
 msgid "another Sylpheed is already running.\n"
 msgstr "Ein anderes Sylpheed läuft schon.\n"
 
-#: src/main.c:1064
+#: src/main.c:1083
 msgid "Migration of configuration"
 msgstr "Konfigurationsmigration"
 
-#: src/main.c:1065
+#: src/main.c:1084
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -2943,631 +2954,636 @@ msgstr ""
 "Ein frühere Konfiguration wurde gefunden.\n"
 "Soll sie migriert werden?"
 
-#: src/mainwindow.c:478
+#: src/mainwindow.c:481
 msgid "/_File/_Folder"
 msgstr "/_Datei/Ab_lage"
 
-#: src/mainwindow.c:479
+#: src/mainwindow.c:482
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/_Datei/Ab_lage/_Neue Ablage erstellen..."
 
-#: src/mainwindow.c:481
+#: src/mainwindow.c:484
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/_Datei/Ab_lage/Ablage _umbenennen..."
 
-#: src/mainwindow.c:482
+#: src/mainwindow.c:485
 msgid "/_File/_Folder/_Move folder..."
 msgstr "/_Datei/Ab_lage/Ablage _verschieben..."
 
-#: src/mainwindow.c:483
+#: src/mainwindow.c:486
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/_Datei/Ab_lage/Ablage _löschen"
 
-#: src/mainwindow.c:484
+#: src/mainwindow.c:487
 msgid "/_File/_Mailbox"
 msgstr "/_Datei/_Mailbox"
 
-#: src/mainwindow.c:485
+#: src/mainwindow.c:488
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/_Datei/_Mailbox/Mailbox _hinzufügen..."
 
-#: src/mainwindow.c:486
+#: src/mainwindow.c:489
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/_Datei/_Mailbox/Mailbox _entfernen"
 
-#: src/mainwindow.c:487 src/mainwindow.c:492
+#: src/mainwindow.c:490 src/mainwindow.c:495
 msgid "/_File/_Mailbox/---"
 msgstr "/_Datei/_Mailbox/---"
 
-#: src/mainwindow.c:488
+#: src/mainwindow.c:491
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "/_Datei/_Mailbox/Auf neue Nachrichten _prüfen"
 
-#: src/mainwindow.c:490
+#: src/mainwindow.c:493
 msgid "/_File/_Mailbox/Check for new messages in _all mailboxes"
 msgstr "/_Datei/_Mailbox/_Alle Ablagen auf neue Nachrichten prüfen"
 
-#: src/mainwindow.c:493
+#: src/mainwindow.c:496
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "//_Datei/_Mailbox/Ablagebaum _erneuern"
 
-#: src/mainwindow.c:496
+#: src/mainwindow.c:499
 msgid "/_File/_Import mbox file..."
 msgstr "/_Datei/_Importiere Mbox-Datei..."
 
-#: src/mainwindow.c:497
+#: src/mainwindow.c:500
 msgid "/_File/_Export to mbox file..."
 msgstr "/_Datei/_Exportiere in Mbox-Datei..."
 
-#: src/mainwindow.c:499
+#: src/mainwindow.c:502
 msgid "/_File/Empty all _trash"
 msgstr "/_Datei/Alle _Papierkörbe leeren"
 
-#: src/mainwindow.c:501 src/messageview.c:139
+#: src/mainwindow.c:504 src/messageview.c:139
 msgid "/_File/_Save as..."
 msgstr "/_Datei/Speichern _als..."
 
-#: src/mainwindow.c:502 src/messageview.c:140
+#: src/mainwindow.c:505 src/messageview.c:140
 msgid "/_File/_Print..."
 msgstr "/_Datei/_Drucken..."
 
-#: src/mainwindow.c:504
+#: src/mainwindow.c:507
 msgid "/_File/_Work offline"
 msgstr "/_Datei/_Ohne Verbindung arbeiten"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:507
+#: src/mainwindow.c:510
 msgid "/_File/E_xit"
 msgstr "/_Datei/_Beenden"
 
-#: src/mainwindow.c:512
+#: src/mainwindow.c:515
 msgid "/_Edit/Select _thread"
 msgstr "/_Bearbeiten/_Thread auswählen"
 
-#: src/mainwindow.c:514 src/messageview.c:148
+#: src/mainwindow.c:517 src/messageview.c:148
 msgid "/_Edit/_Find in current message..."
 msgstr "/_Bearbeiten/_Aktuelle Nachricht durchsuchen..."
 
-#: src/mainwindow.c:516
+#: src/mainwindow.c:519
 msgid "/_Edit/_Search messages..."
 msgstr "/_Bearbeiten/_Suche Nachrichten..."
 
-#: src/mainwindow.c:519
+#: src/mainwindow.c:522
 msgid "/_View/Show or hi_de"
 msgstr "/_Ansicht/Zeigen oder _Verstecken"
 
-#: src/mainwindow.c:520
+#: src/mainwindow.c:523
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/_Ansicht/Zeigen oder _Verstecken/Ablagebaum"
 
-#: src/mainwindow.c:522
+#: src/mainwindow.c:525
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/_Ansicht/Zeigen oder _Verstecken/_Nachrichtenansicht"
 
-#: src/mainwindow.c:524
+#: src/mainwindow.c:527
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/_Ansicht/Zeigen oder _Verstecken/_Werkzeugleiste"
 
-#: src/mainwindow.c:526
+#: src/mainwindow.c:529
 msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/_Ansicht/Zeigen oder _Verstecken/_Werkzeugleiste/Bilder _und Text"
 
-#: src/mainwindow.c:528
+#: src/mainwindow.c:531
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/_Ansicht/Zeigen oder _Verstecken/_Werkzeugleiste/_Bilder"
 
-#: src/mainwindow.c:530
+#: src/mainwindow.c:533
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/_Ansicht/Zeigen oder _Verstecken/_Werkzeugleiste/_Text"
 
-#: src/mainwindow.c:532
+#: src/mainwindow.c:535
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/_Ansicht/Zeigen oder _Verstecken/_Werkzeugleiste/_Nichts"
 
-#: src/mainwindow.c:534
+#: src/mainwindow.c:537
 msgid "/_View/Show or hi_de/_Search bar"
 msgstr "/_Ansicht/Zeigen oder _Verstecken/_Suchleiste"
 
-#: src/mainwindow.c:536
+#: src/mainwindow.c:539
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/_Ansicht/Zeigen oder _Verstecken/_Statuszeile"
 
-#: src/mainwindow.c:539
+#: src/mainwindow.c:542
 msgid "/_View/Separate f_older tree"
 msgstr "/_Ansicht/Einzelner _Ablagebaum"
 
-#: src/mainwindow.c:540
+#: src/mainwindow.c:543
 msgid "/_View/Separate _message view"
 msgstr "/_Ansicht/Einzelne _Nachrichtenansicht"
 
-#: src/mainwindow.c:542
+#: src/mainwindow.c:545
 msgid "/_View/_Sort"
 msgstr "/_Ansicht/_Sortieren"
 
-#: src/mainwindow.c:543
+#: src/mainwindow.c:546
 msgid "/_View/_Sort/by _number"
 msgstr "/_Ansicht/_Sortieren/nach _Nummer"
 
-#: src/mainwindow.c:544
+#: src/mainwindow.c:547
 msgid "/_View/_Sort/by s_ize"
 msgstr "/_Ansicht/_Sortieren/nach _Größe"
 
-#: src/mainwindow.c:545
+#: src/mainwindow.c:548
 msgid "/_View/_Sort/by _date"
 msgstr "/_Ansicht/_Sortieren/nach _Datum"
 
-#: src/mainwindow.c:546
+#: src/mainwindow.c:549
 msgid "/_View/_Sort/by t_hread date"
 msgstr "/_Ansicht/_Sortieren/nach _Threaddatum"
 
-#: src/mainwindow.c:547
+#: src/mainwindow.c:550
 msgid "/_View/_Sort/by _from"
 msgstr "/_Ansicht/_Sortieren/nach _Absender"
 
-#: src/mainwindow.c:548
+#: src/mainwindow.c:551
 msgid "/_View/_Sort/by _recipient"
 msgstr "/_Ansicht/_Sortieren/nach _Sender"
 
-#: src/mainwindow.c:549
+#: src/mainwindow.c:552
 msgid "/_View/_Sort/by _subject"
 msgstr "/_Ansicht/_Sortieren/nach _Betreff"
 
-#: src/mainwindow.c:550
+#: src/mainwindow.c:553
 msgid "/_View/_Sort/by _color label"
 msgstr "/_Ansicht/_Sortieren/nach _Farbetikett"
 
-#: src/mainwindow.c:552
+#: src/mainwindow.c:555
 msgid "/_View/_Sort/by _mark"
 msgstr "/_Ansicht/_Sortieren/nach _Markierung"
 
-#: src/mainwindow.c:553
+#: src/mainwindow.c:556
 msgid "/_View/_Sort/by _unread"
 msgstr "/_Ansicht/_Sortieren/nach _Ungelesen"
 
-#: src/mainwindow.c:554
+#: src/mainwindow.c:557
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/_Ansicht/_Sortieren/nach An_hang"
 
-#: src/mainwindow.c:556
+#: src/mainwindow.c:559
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/_Ansicht/_Sortieren/Nicht S_ortieren"
 
-#: src/mainwindow.c:557 src/mainwindow.c:560
+#: src/mainwindow.c:560 src/mainwindow.c:563
 msgid "/_View/_Sort/---"
 msgstr "/_Ansicht/_Sortieren/---"
 
-#: src/mainwindow.c:558
+#: src/mainwindow.c:561
 msgid "/_View/_Sort/Ascending"
 msgstr "/_Ansicht/_Sortieren/Aufsteigend"
 
-#: src/mainwindow.c:559
+#: src/mainwindow.c:562
 msgid "/_View/_Sort/Descending"
 msgstr "/_Ansicht/_Sortieren/Absteigend"
 
-#: src/mainwindow.c:561
+#: src/mainwindow.c:564
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/_Ansicht/_Sortieren/Threads nach Betreff _aufbauen"
 
-#: src/mainwindow.c:563
+#: src/mainwindow.c:566
 msgid "/_View/Th_read view"
 msgstr "/_Ansicht/_Threads einschalten"
 
-#: src/mainwindow.c:564
+#: src/mainwindow.c:567
 msgid "/_View/E_xpand all threads"
 msgstr "/_Ansicht/Alle Threads entfalten"
 
-#: src/mainwindow.c:565
+#: src/mainwindow.c:568
 msgid "/_View/Co_llapse all threads"
 msgstr "/_Ansicht/Alle Threads zusammenfalten"
 
-#: src/mainwindow.c:566
+#: src/mainwindow.c:569
 msgid "/_View/Set display _item..."
 msgstr "/_Ansicht/Anzuzeigende _Informationen setzen..."
 
-#: src/mainwindow.c:569
+#: src/mainwindow.c:572
 msgid "/_View/_Go to"
 msgstr "/_Ansicht/Gehe _zu"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:573
 msgid "/_View/_Go to/_Prev message"
 msgstr "/_Ansicht/Gehe _zu/_Vorheriger Nachricht"
 
-#: src/mainwindow.c:571
+#: src/mainwindow.c:574
 msgid "/_View/_Go to/_Next message"
 msgstr "/_Ansicht/Gehe _zu/_Nächster Nachricht"
 
-#: src/mainwindow.c:572 src/mainwindow.c:577 src/mainwindow.c:580
-#: src/mainwindow.c:585 src/mainwindow.c:590
+#: src/mainwindow.c:575 src/mainwindow.c:580 src/mainwindow.c:583
+#: src/mainwindow.c:588 src/mainwindow.c:593
 msgid "/_View/_Go to/---"
 msgstr "/_Ansicht/_Gehe _zu/---"
 
-#: src/mainwindow.c:573
+#: src/mainwindow.c:576
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/_Ansicht/Gehe _zu/V_orheriger ungelesener Nachricht"
 
-#: src/mainwindow.c:575
+#: src/mainwindow.c:578
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/_Ansicht/Gehe _zu/N_ächster ungelesener Nachricht"
 
-#: src/mainwindow.c:578
+#: src/mainwindow.c:581
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/_Ansicht/Gehe _zu/Vorheriger ne_uer Nachricht"
 
-#: src/mainwindow.c:579
+#: src/mainwindow.c:582
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/_Ansicht/Gehe _zu/Nächster _neuer Nachricht"
 
-#: src/mainwindow.c:581
+#: src/mainwindow.c:584
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/_Ansicht/Gehe _zu/Vorheriger _markierter Nachricht"
 
-#: src/mainwindow.c:583
+#: src/mainwindow.c:586
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/_Ansicht/Gehe _zu/Nächster m_arkierter Nachricht"
 
-#: src/mainwindow.c:586
+#: src/mainwindow.c:589
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/_Ansicht/Gehe _zu/Vorheriger _etikettierter Nachricht"
 
-#: src/mainwindow.c:588
+#: src/mainwindow.c:591
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/_Ansicht/Gehe _zu/Nächster e_tikettierter Nachricht"
 
-#: src/mainwindow.c:591
+#: src/mainwindow.c:594
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Ansicht/_Gehe zu/Anderer Ab_lage..."
 
-#: src/mainwindow.c:600 src/messageview.c:159
+#: src/mainwindow.c:603 src/messageview.c:159
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Ansicht/_Zeichensatz/_Automatische Erkennung"
 
-#: src/mainwindow.c:613 src/messageview.c:172
+#: src/mainwindow.c:616 src/messageview.c:172
 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr "/_Ansicht/_Zeichensatz/West Europa (Windows-1252)"
 
-#: src/mainwindow.c:653 src/messageview.c:205
+#: src/mainwindow.c:662 src/messageview.c:210
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Ansicht/_Zeichensatz/Japanisch (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:655 src/messageview.c:207
+#: src/mainwindow.c:664 src/messageview.c:212
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Ansicht/_Zeichensatz/Japanisch (_EUC-JP)"
 
-#: src/mainwindow.c:657 src/messageview.c:209
+#: src/mainwindow.c:666 src/messageview.c:214
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Ansicht/_Zeichensatz/Japanisch (_Shift_JIS)"
 
-#: src/mainwindow.c:667 src/messageview.c:218
+#: src/mainwindow.c:676 src/messageview.c:223
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Ansicht/_Zeichensatz/Traditionelles Chinesisch (EUC-_TW)"
 
-#: src/mainwindow.c:669 src/messageview.c:220
+#: src/mainwindow.c:678 src/messageview.c:225
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Ansicht/_Zeichensatz/Chinesisch (ISO-2022-_CN)"
 
-#: src/mainwindow.c:675 src/messageview.c:225
+#: src/mainwindow.c:684 src/messageview.c:230
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Ansicht/_Zeichensatz/Koreanisch (ISO-2022-KR)"
 
-#: src/mainwindow.c:688 src/summaryview.c:449
+#: src/mainwindow.c:697 src/summaryview.c:451
 msgid "/_View/Open in new _window"
 msgstr "/_Ansicht/Öffnen in _neuem Fenster"
 
-#: src/mainwindow.c:689 src/messageview.c:237
+#: src/mainwindow.c:698 src/messageview.c:242
 msgid "/_View/Mess_age source"
 msgstr "/_Ansicht/Nachrichten_quelle"
 
-#: src/mainwindow.c:690 src/messageview.c:238
+#: src/mainwindow.c:699 src/messageview.c:243
 msgid "/_View/Show all _header"
 msgstr "/_Ansicht/Zeige alle _Kopfzeilen"
 
-#: src/mainwindow.c:692
+#: src/mainwindow.c:701
 msgid "/_View/_Update summary"
 msgstr "/_Ansicht/Akt_ualisiere Ablageninhalt"
 
-#: src/mainwindow.c:694 src/messageview.c:240
+#: src/mainwindow.c:703 src/messageview.c:245
 msgid "/_Message"
 msgstr "/_Nachricht"
 
-#: src/mainwindow.c:695
+#: src/mainwindow.c:704
 msgid "/_Message/Recei_ve"
 msgstr "/_Nachricht/Empfang"
 
-#: src/mainwindow.c:696
+#: src/mainwindow.c:705
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/_Nachricht/Empfang/Empfange vom aktuellen Account"
 
-#: src/mainwindow.c:698
+#: src/mainwindow.c:707
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/_Nachricht/Empfang/Empfange von _allen Accounts"
 
-#: src/mainwindow.c:700
+#: src/mainwindow.c:709
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/_Nachricht/Empfang/Empfan_g abbrechen"
 
-#: src/mainwindow.c:702
+#: src/mainwindow.c:711
 msgid "/_Message/Recei_ve/---"
 msgstr "/_Nachricht/Empfang/---"
 
-#: src/mainwindow.c:703
+#: src/mainwindow.c:712
 msgid "/_Message/_Send queued messages"
 msgstr "/_Nachricht/Sende _wartende Nachrichten"
 
-#: src/mainwindow.c:704 src/mainwindow.c:706 src/mainwindow.c:713
-#: src/mainwindow.c:718 src/mainwindow.c:721 src/mainwindow.c:730
-#: src/mainwindow.c:732 src/mainwindow.c:735 src/messageview.c:243
-#: src/messageview.c:251 src/messageview.c:256
+#: src/mainwindow.c:713 src/mainwindow.c:715 src/mainwindow.c:722
+#: src/mainwindow.c:727 src/mainwindow.c:730 src/mainwindow.c:741
+#: src/mainwindow.c:743 src/mainwindow.c:746 src/messageview.c:248
+#: src/messageview.c:256 src/messageview.c:261
 msgid "/_Message/---"
 msgstr "/_Nachricht/---"
 
-#: src/mainwindow.c:705 src/messageview.c:241
+#: src/mainwindow.c:714 src/messageview.c:246
 msgid "/_Message/Compose _new message"
 msgstr "/_Nachricht/Verfasse n_eue Nachricht"
 
-#: src/mainwindow.c:707 src/messageview.c:244
+#: src/mainwindow.c:716 src/messageview.c:249
 msgid "/_Message/_Reply"
 msgstr "/_Nachricht/An_twort"
 
-#: src/mainwindow.c:708
+#: src/mainwindow.c:717
 msgid "/_Message/Repl_y to"
 msgstr "/_Nachricht/Ant_wort an"
 
-#: src/mainwindow.c:709 src/messageview.c:245
+#: src/mainwindow.c:718 src/messageview.c:250
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Nachricht/Ant_wort an/_Alle"
 
-#: src/mainwindow.c:710 src/messageview.c:247
+#: src/mainwindow.c:719 src/messageview.c:252
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Nachricht/Ant_wort an/Ab_sender"
 
-#: src/mainwindow.c:711 src/messageview.c:249
+#: src/mainwindow.c:720 src/messageview.c:254
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Nachricht/Ant_wort an/Mailing-_Liste"
 
-#: src/mainwindow.c:714 src/messageview.c:252
+#: src/mainwindow.c:723 src/messageview.c:257
 msgid "/_Message/_Forward"
 msgstr "/_Nachricht/We_iterleiten"
 
-#: src/mainwindow.c:715 src/messageview.c:253
+#: src/mainwindow.c:724 src/messageview.c:258
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Nachricht/Weiterleiten als An_hang"
 
-#: src/mainwindow.c:717 src/messageview.c:255
+#: src/mainwindow.c:726 src/messageview.c:260
 msgid "/_Message/Redirec_t"
 msgstr "/_Nachricht/_Umadressieren"
 
-#: src/mainwindow.c:719
+#: src/mainwindow.c:728
 msgid "/_Message/M_ove..."
 msgstr "/_Nachricht/_Verschieben..."
 
-#: src/mainwindow.c:720
+#: src/mainwindow.c:729
 msgid "/_Message/_Copy..."
 msgstr "/_Nachricht/_Kopieren..."
 
-#: src/mainwindow.c:722
+#: src/mainwindow.c:731
 msgid "/_Message/_Mark"
 msgstr "/_Nachricht/_Markieren"
 
-#: src/mainwindow.c:723
+#: src/mainwindow.c:732
 msgid "/_Message/_Mark/_Mark"
 msgstr "/_Nachricht/_Markieren/_Markieren"
 
-#: src/mainwindow.c:724
+#: src/mainwindow.c:733
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/_Nachricht/_Markieren/Markierung _entfernen"
 
-#: src/mainwindow.c:725
+#: src/mainwindow.c:734
 msgid "/_Message/_Mark/---"
 msgstr "/_Nachricht/_Markieren/---"
 
-#: src/mainwindow.c:726
+#: src/mainwindow.c:735
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/_Nachricht/_Markieren/Als _ungelesen"
 
-#: src/mainwindow.c:727
+#: src/mainwindow.c:736
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/_Nachricht/_Markieren/Als _gelesen"
 
-#: src/mainwindow.c:729
+#: src/mainwindow.c:738
+#, fuzzy
+msgid "/_Message/_Mark/Mark _thread as read"
+msgstr "/_Nachricht/_Markieren/Als _gelesen"
+
+#: src/mainwindow.c:740
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/_Nachricht/_Markieren/Alle _als gelesen"
 
-#: src/mainwindow.c:731
+#: src/mainwindow.c:742
 msgid "/_Message/_Delete"
 msgstr "/_Nachricht/_Löschen"
 
-#: src/mainwindow.c:733
+#: src/mainwindow.c:744
 msgid "/_Message/Set as _junk mail"
 msgstr "/_Nachricht/Markiere als Spam-Mail"
 
-#: src/mainwindow.c:734
+#: src/mainwindow.c:745
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/_Nachricht/Markiere als Nicht-Spam-Mail"
 
-#: src/mainwindow.c:736 src/messageview.c:257
+#: src/mainwindow.c:747 src/messageview.c:262
 msgid "/_Message/Re-_edit"
 msgstr "/_Nachricht/Wieder_bearbeiten"
 
-#: src/mainwindow.c:740
+#: src/mainwindow.c:751
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/_Werkzeug/Absender in Adress_buch einfügen"
 
-#: src/mainwindow.c:743
+#: src/mainwindow.c:754
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/_Werkzeug/Alle Nachrichten einer Ablage _filtern"
 
-#: src/mainwindow.c:745
+#: src/mainwindow.c:756
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Werkzeug/Aus_gewählte Nachrichten filtern"
 
-#: src/mainwindow.c:747 src/messageview.c:264
+#: src/mainwindow.c:758 src/messageview.c:269
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Werkzeug/Filter _erstellen"
 
-#: src/mainwindow.c:748 src/messageview.c:266
+#: src/mainwindow.c:759 src/messageview.c:271
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Werkzeug/Filter _erstellen/_Automatisch"
 
-#: src/mainwindow.c:750 src/messageview.c:268
+#: src/mainwindow.c:761 src/messageview.c:273
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Werkzeug/Filter _erstellen/nach _Von"
 
-#: src/mainwindow.c:752 src/messageview.c:270
+#: src/mainwindow.c:763 src/messageview.c:275
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Werkzeug/Filter _erstellen/nach A_n"
 
-#: src/mainwindow.c:754 src/messageview.c:272
+#: src/mainwindow.c:765 src/messageview.c:277
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Werkzeug/Filter _erstellen/nach _Betreff"
 
-#: src/mainwindow.c:757
+#: src/mainwindow.c:768
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/_Werkzeug/Nachrichten einer Ablage nach Spams _filtern"
 
-#: src/mainwindow.c:759
+#: src/mainwindow.c:770
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/_Werkzeug/Aus_gewählte Nachrichten nach Spams filtern"
 
-#: src/mainwindow.c:764
+#: src/mainwindow.c:775
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/_Werkzeug/_Lösche mehrfach vorhandene Nachrichten"
 
-#: src/mainwindow.c:767
+#: src/mainwindow.c:778
 msgid "/_Tools/E_xecute"
 msgstr "/_Werkzeug/A_usführen"
 
-#: src/mainwindow.c:769
+#: src/mainwindow.c:780
 msgid "/_Tools/_Log window"
 msgstr "/_Werkzeug/L_ogbuch-Fenster"
 
-#: src/mainwindow.c:771
+#: src/mainwindow.c:782
 msgid "/_Configuration"
 msgstr "/_Einstellungen"
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:783
 msgid "/_Configuration/_Common preferences..."
 msgstr "/_Einstellungen/Allgemeine _Einstellungen..."
 
-#: src/mainwindow.c:774
+#: src/mainwindow.c:785
 msgid "/_Configuration/_Filter setting..."
 msgstr "/_Einstellungen/_Filtereinstellungen..."
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:787
 msgid "/_Configuration/_Template..."
 msgstr "/_Einstellungen/_Schablone..."
 
-#: src/mainwindow.c:777
+#: src/mainwindow.c:788
 msgid "/_Configuration/_Actions..."
 msgstr "/_Einstellungen/Aktionen..."
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:789
 msgid "/_Configuration/---"
 msgstr "/_Einstellungen/---"
 
-#: src/mainwindow.c:779
+#: src/mainwindow.c:790
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Einstellungen/_Einstellungen für den aktuellen Account..."
 
-#: src/mainwindow.c:781
+#: src/mainwindow.c:792
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Einstellungen/_Neuen Account erstellen..."
 
-#: src/mainwindow.c:783
+#: src/mainwindow.c:794
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Einstellungen/Accounts _bearbeiten..."
 
-#: src/mainwindow.c:785
+#: src/mainwindow.c:796
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Einstellungen/Aktuellen Account _wechseln..."
 
-#: src/mainwindow.c:789
+#: src/mainwindow.c:800
 msgid "/_Help/_Manual"
 msgstr "/_Hilfe/_Anleitung"
 
-#: src/mainwindow.c:790
+#: src/mainwindow.c:801
 msgid "/_Help/_Manual/_English"
 msgstr "/_Hilfe/Anleitung/_English"
 
-#: src/mainwindow.c:791
+#: src/mainwindow.c:802
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/_Hilfe/Anleitung/_Japanese"
 
-#: src/mainwindow.c:792
+#: src/mainwindow.c:803
 msgid "/_Help/_FAQ"
 msgstr "/_Hilfe/_FAQ"
 
-#: src/mainwindow.c:793
+#: src/mainwindow.c:804
 msgid "/_Help/_FAQ/_English"
 msgstr "/_Hilfe/_FAQ/_English"
 
-#: src/mainwindow.c:794
+#: src/mainwindow.c:805
 msgid "/_Help/_FAQ/_German"
 msgstr "/_Hilfe/_FAQ/_German"
 
-#: src/mainwindow.c:795
+#: src/mainwindow.c:806
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/_Hilfe/_FAQ/_Spanish"
 
-#: src/mainwindow.c:796
+#: src/mainwindow.c:807
 msgid "/_Help/_FAQ/_French"
 msgstr "/_Hilfe/_FAQ/_French"
 
-#: src/mainwindow.c:797
+#: src/mainwindow.c:808
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/_Hilfe/_FAQ/_Italian"
 
-#: src/mainwindow.c:798
+#: src/mainwindow.c:809
 msgid "/_Help/---"
 msgstr "/_Hilfe/---"
 
-#: src/mainwindow.c:841
+#: src/mainwindow.c:852
 msgid "Creating main window...\n"
 msgstr "Erstelle Hauptfenster...\n"
 
-#: src/mainwindow.c:1011
+#: src/mainwindow.c:1022
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Haupt-Fenster: Bereitstellung von Farbe %d fehlgeschlagen\n"
 
-#: src/mainwindow.c:1108 src/summaryview.c:2258 src/summaryview.c:2343
-#: src/summaryview.c:3739 src/summaryview.c:3868 src/summaryview.c:4226
+#: src/mainwindow.c:1119 src/summaryview.c:2275 src/summaryview.c:2360
+#: src/summaryview.c:3896 src/summaryview.c:4025 src/summaryview.c:4383
 msgid "done.\n"
 msgstr "Fertig.\n"
 
-#: src/mainwindow.c:1235 src/mainwindow.c:1276 src/mainwindow.c:1301
+#: src/mainwindow.c:1246 src/mainwindow.c:1287 src/mainwindow.c:1312
 msgid "Untitled"
 msgstr "Unbenannt"
 
-#: src/mainwindow.c:1302
+#: src/mainwindow.c:1313
 msgid "none"
 msgstr "nicht"
 
-#: src/mainwindow.c:1355
+#: src/mainwindow.c:1366
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "Wechsle Fenstertrennungstyp von %d zu %d\n"
 
-#: src/mainwindow.c:1605
+#: src/mainwindow.c:1616
 msgid "Offline"
 msgstr "Verbindungslos"
 
-#: src/mainwindow.c:1606
+#: src/mainwindow.c:1617
 msgid "You are offline. Go online?"
 msgstr "Sie sind nicht verbunden. Verbinden?"
 
-#: src/mainwindow.c:1623
+#: src/mainwindow.c:1634
 msgid "Empty all trash"
 msgstr "Leere alle Papierkörbe"
 
-#: src/mainwindow.c:1624
+#: src/mainwindow.c:1635
 msgid "Delete all messages in trash folders?"
 msgstr "Lösche alle Nachrichten in den Papierkörben?"
 
-#: src/mainwindow.c:1652
+#: src/mainwindow.c:1663
 msgid "Add mailbox"
 msgstr "Neue Mailbox"
 
-#: src/mainwindow.c:1653
+#: src/mainwindow.c:1664
 msgid ""
 "Specify the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3577,16 +3593,16 @@ msgstr ""
 "Wenn die existierende Mailbox angegeben wurde, wird\n"
 "sie automatisch durchsucht."
 
-#: src/mainwindow.c:1659 src/setup.c:49
+#: src/mainwindow.c:1670 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Die Mailbox `%s' existiert bereits."
 
-#: src/mainwindow.c:1664 src/setup.c:56
+#: src/mainwindow.c:1675 src/setup.c:56
 msgid "Mailbox"
 msgstr "Mailbox"
 
-#: src/mainwindow.c:1670 src/setup.c:62
+#: src/mainwindow.c:1681 src/setup.c:62
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3595,145 +3611,145 @@ msgstr ""
 "Erstellen der Mailbox fehlgeschlagen.\n"
 "Vielleicht existieren einige Dateien, oder Sie haben keine Schreibrechte"
 
-#: src/mainwindow.c:2088
+#: src/mainwindow.c:2099
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Ablagenansicht"
 
-#: src/mainwindow.c:2107
+#: src/mainwindow.c:2118
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Nachrichtenansicht"
 
-#: src/mainwindow.c:2259 src/summaryview.c:408
+#: src/mainwindow.c:2270 src/summaryview.c:408
 msgid "/_Reply"
 msgstr "/An_twort"
 
-#: src/mainwindow.c:2260
+#: src/mainwindow.c:2271
 msgid "/Reply to _all"
 msgstr "/Antwort an alle"
 
-#: src/mainwindow.c:2261
+#: src/mainwindow.c:2272
 msgid "/Reply to _sender"
 msgstr "/Ant_wort an Ab_sender"
 
-#: src/mainwindow.c:2262
+#: src/mainwindow.c:2273
 msgid "/Reply to mailing _list"
 msgstr "/Antwort an Mailing-_Liste"
 
-#: src/mainwindow.c:2267 src/summaryview.c:415
+#: src/mainwindow.c:2278 src/summaryview.c:415
 msgid "/_Forward"
 msgstr "/_Weiterleiten"
 
-#: src/mainwindow.c:2268 src/summaryview.c:416
+#: src/mainwindow.c:2279 src/summaryview.c:416
 msgid "/For_ward as attachment"
 msgstr "/Weiterleiten als An_hang"
 
-#: src/mainwindow.c:2269 src/summaryview.c:417
+#: src/mainwindow.c:2280 src/summaryview.c:417
 msgid "/Redirec_t"
 msgstr "/_Umadressieren"
 
-#: src/mainwindow.c:2305
+#: src/mainwindow.c:2316
 msgid "Get"
 msgstr "Holen"
 
-#: src/mainwindow.c:2306
+#: src/mainwindow.c:2317
 msgid "Incorporate new mail"
 msgstr "Neue E-Mail aufnehmen"
 
-#: src/mainwindow.c:2313
+#: src/mainwindow.c:2324
 msgid "Get all"
 msgstr "Hole alle"
 
-#: src/mainwindow.c:2314
+#: src/mainwindow.c:2325
 msgid "Incorporate new mail of all accounts"
 msgstr "Neue E-Mail aller Accounts aufnehmen"
 
-#: src/mainwindow.c:2325
+#: src/mainwindow.c:2336
 msgid "Send queued message(s)"
 msgstr "Senden wartender Nachrichten"
 
-#: src/mainwindow.c:2335 src/prefs_account_dialog.c:530
+#: src/mainwindow.c:2346 src/prefs_account_dialog.c:530
 #: src/prefs_common_dialog.c:663 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "Verfassen"
 
-#: src/mainwindow.c:2336
+#: src/mainwindow.c:2347
 msgid "Compose new message"
 msgstr "Neue Nachricht verfassen"
 
-#: src/mainwindow.c:2344 src/prefs_common_dialog.c:975
+#: src/mainwindow.c:2355 src/prefs_common_dialog.c:975
 msgid "Reply"
 msgstr "Antwort"
 
-#: src/mainwindow.c:2345 src/mainwindow.c:2358
+#: src/mainwindow.c:2356 src/mainwindow.c:2369
 msgid "Reply to the message"
 msgstr "Nachricht beantworten"
 
-#: src/mainwindow.c:2362
+#: src/mainwindow.c:2373
 msgid "Reply all"
 msgstr "Alle beantworten"
 
-#: src/mainwindow.c:2363
+#: src/mainwindow.c:2374
 msgid "Reply to all"
 msgstr "Antwort an alle"
 
-#: src/mainwindow.c:2371 src/prefs_filter_edit.c:672
+#: src/mainwindow.c:2382 src/prefs_filter_edit.c:672
 msgid "Forward"
 msgstr "Weiterleiten"
 
-#: src/mainwindow.c:2372 src/mainwindow.c:2385
+#: src/mainwindow.c:2383 src/mainwindow.c:2396
 msgid "Forward the message"
 msgstr "Nachricht weiterleiten"
 
-#: src/mainwindow.c:2392
+#: src/mainwindow.c:2403
 msgid "Delete the message"
 msgstr "Nachricht löschen"
 
-#: src/mainwindow.c:2401
+#: src/mainwindow.c:2412
 msgid "Set as junk mail"
 msgstr "Markiere als Spam-Mail"
 
-#: src/mainwindow.c:2410
+#: src/mainwindow.c:2421
 msgid "Execute"
 msgstr "Ausführen"
 
-#: src/mainwindow.c:2411
+#: src/mainwindow.c:2422
 msgid "Execute marked process"
 msgstr "Markierten Prozess ausführen"
 
-#: src/mainwindow.c:2421
+#: src/mainwindow.c:2432
 msgid "Next unread message"
 msgstr "Nächste ungelesene Nachricht"
 
-#: src/mainwindow.c:2433
+#: src/mainwindow.c:2444
 msgid "Prefs"
 msgstr "Einstellungen"
 
-#: src/mainwindow.c:2434
+#: src/mainwindow.c:2445
 msgid "Common preferences"
 msgstr "Allgemeine Einstellungen"
 
-#: src/mainwindow.c:2442 src/prefs_folder_item.c:289
+#: src/mainwindow.c:2453 src/prefs_folder_item.c:289
 #: src/prefs_folder_item.c:300 src/progressdialog.c:128
 msgid "Account"
 msgstr "Account"
 
-#: src/mainwindow.c:2443
+#: src/mainwindow.c:2454
 msgid "Account setting"
 msgstr "Accounteinstellungen"
 
-#: src/mainwindow.c:2615
+#: src/mainwindow.c:2626
 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:2626
+#: src/mainwindow.c:2637
 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:2892
+#: src/mainwindow.c:2903
 msgid "Exit"
 msgstr "Beenden"
 
-#: src/mainwindow.c:2892
+#: src/mainwindow.c:2903
 msgid "Exit this program?"
 msgstr "Beenden des Programms?"
 
@@ -3770,44 +3786,44 @@ msgstr "Ende der Liste erreicht; weiter vom Anfang?"
 msgid "Search finished"
 msgstr "Suche beendet"
 
-#: src/messageview.c:261
+#: src/messageview.c:266
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/_Werkzeug/Absender in Adress_buch einfügen"
 
-#: src/messageview.c:291
+#: src/messageview.c:296
 msgid "Creating message view...\n"
 msgstr "Erstelle Nachrichtenansicht...\n"
 
-#: src/messageview.c:316
+#: src/messageview.c:321
 msgid "Text"
 msgstr "Text"
 
-#: src/messageview.c:321
+#: src/messageview.c:326
 msgid "Attachments"
 msgstr "Anhänge"
 
-#: src/messageview.c:371
+#: src/messageview.c:376
 msgid "Message View - Sylpheed"
 msgstr "Nachrichtenansich - Sylpheed"
 
-#: src/messageview.c:669 src/summaryview.c:3268
+#: src/messageview.c:674 src/summaryview.c:3425
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Kann Datei `%s' nicht speichern."
 
-#: src/messageview.c:728 src/summaryview.c:3291
+#: src/messageview.c:733 src/summaryview.c:3448
 msgid "The message will be printed with the following command:"
 msgstr "Diese Nachricht wird mit dem folgenden Befehl gedruckt:"
 
-#: src/messageview.c:729 src/summaryview.c:3292
+#: src/messageview.c:734 src/summaryview.c:3449
 msgid "(Default print command)"
 msgstr "(Standarddruckbefehl)"
 
-#: src/messageview.c:731 src/prefs_common_dialog.c:2304 src/summaryview.c:3294
+#: src/messageview.c:736 src/prefs_common_dialog.c:2304 src/summaryview.c:3451
 msgid "Print"
 msgstr "Drucken"
 
-#: src/messageview.c:740 src/summaryview.c:3303
+#: src/messageview.c:745 src/summaryview.c:3460
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -4694,8 +4710,8 @@ msgstr "Zeige Empfänger in `Von'-Spalte, wenn Sie selbst der Sender sind"
 msgid "Expand threads"
 msgstr "Threads entfalten"
 
-#: src/prefs_common_dialog.c:1413 src/prefs_common_dialog.c:2713
-#: src/prefs_common_dialog.c:2751
+#: src/prefs_common_dialog.c:1413 src/prefs_common_dialog.c:2716
+#: src/prefs_common_dialog.c:2754
 msgid "Date format"
 msgstr "Datumsformat"
 
@@ -4987,8 +5003,8 @@ msgstr "Externe Befehle (%s wird durch Dateinamen / URI ersetzt)"
 msgid "Web browser"
 msgstr "Internet-Browser"
 
-#: src/prefs_common_dialog.c:2288 src/prefs_common_dialog.c:3775
-#: src/prefs_common_dialog.c:3796
+#: src/prefs_common_dialog.c:2288 src/prefs_common_dialog.c:3778
+#: src/prefs_common_dialog.c:3799
 msgid "(Default browser)"
 msgstr "(Standardbrowser)"
 
@@ -5063,214 +5079,224 @@ msgid "Greek (ISO-8859-7)"
 msgstr "Greek (ISO-8859-7)"
 
 #: src/prefs_common_dialog.c:2495
+#, fuzzy
+msgid "Arabic (ISO-8859-6)"
+msgstr "Baltic (ISO-8859-4)"
+
+#: src/prefs_common_dialog.c:2496
+#, fuzzy
+msgid "Arabic (Windows-1256)"
+msgstr "Cyrillic (Windows-1251)"
+
+#: src/prefs_common_dialog.c:2498
 msgid "Hebrew (ISO-8859-8)"
 msgstr "Hebräisch (ISO-8859-8)"
 
-#: src/prefs_common_dialog.c:2496
+#: src/prefs_common_dialog.c:2499
 msgid "Hebrew (Windows-1255)"
 msgstr "Hebräiisch (Windows-1255)"
 
-#: src/prefs_common_dialog.c:2498
+#: src/prefs_common_dialog.c:2501
 msgid "Turkish (ISO-8859-9)"
 msgstr "Turkish (ISO-8859-9)"
 
-#: src/prefs_common_dialog.c:2500
+#: src/prefs_common_dialog.c:2503
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Cyrillic (ISO-8859-5)"
 
-#: src/prefs_common_dialog.c:2501
+#: src/prefs_common_dialog.c:2504
 msgid "Cyrillic (KOI8-R)"
 msgstr "Cyrillic (KOI8-R)"
 
-#: src/prefs_common_dialog.c:2502
+#: src/prefs_common_dialog.c:2505
 msgid "Cyrillic (KOI8-U)"
 msgstr "Cyrillic (KOI8-U)"
 
-#: src/prefs_common_dialog.c:2503
+#: src/prefs_common_dialog.c:2506
 msgid "Cyrillic (Windows-1251)"
 msgstr "Cyrillic (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2505
+#: src/prefs_common_dialog.c:2508
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Japanese (ISO-2022-JP)"
 
-#: src/prefs_common_dialog.c:2507
+#: src/prefs_common_dialog.c:2510
 msgid "Japanese (EUC-JP)"
 msgstr "Japanese (EUC-JP)"
 
-#: src/prefs_common_dialog.c:2508
+#: src/prefs_common_dialog.c:2511
 msgid "Japanese (Shift_JIS)"
 msgstr "Japanese (Shift_JIS)"
 
-#: src/prefs_common_dialog.c:2511
+#: src/prefs_common_dialog.c:2514
 msgid "Simplified Chinese (GB2312)"
 msgstr "Simplified Chinese (GB2312)"
 
-#: src/prefs_common_dialog.c:2512
+#: src/prefs_common_dialog.c:2515
 msgid "Simplified Chinese (GBK)"
 msgstr "Einfaches Chinesisch (GB2312)"
 
-#: src/prefs_common_dialog.c:2513
+#: src/prefs_common_dialog.c:2516
 msgid "Traditional Chinese (Big5)"
 msgstr "Traditional Chinese (Big5)"
 
-#: src/prefs_common_dialog.c:2515
+#: src/prefs_common_dialog.c:2518
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Traditional Chinese (EUC-TW)"
 
-#: src/prefs_common_dialog.c:2516
+#: src/prefs_common_dialog.c:2519
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Chinese (ISO-2022-CN)"
 
-#: src/prefs_common_dialog.c:2519
+#: src/prefs_common_dialog.c:2522
 msgid "Korean (EUC-KR)"
 msgstr "Korean (EUC-KR)"
 
-#: src/prefs_common_dialog.c:2521
+#: src/prefs_common_dialog.c:2524
 msgid "Thai (TIS-620)"
 msgstr "Thai (TIS-620)"
 
-#: src/prefs_common_dialog.c:2522
+#: src/prefs_common_dialog.c:2525
 msgid "Thai (Windows-874)"
 msgstr "Thai (Windows-874)"
 
-#: src/prefs_common_dialog.c:2689
+#: src/prefs_common_dialog.c:2692
 msgid "the full abbreviated weekday name"
 msgstr "gekürzter Wochentagsname"
 
-#: src/prefs_common_dialog.c:2690
+#: src/prefs_common_dialog.c:2693
 msgid "the full weekday name"
 msgstr "Wochentagsname"
 
-#: src/prefs_common_dialog.c:2691
+#: src/prefs_common_dialog.c:2694
 msgid "the abbreviated month name"
 msgstr "gekürzter Monatsname"
 
-#: src/prefs_common_dialog.c:2692
+#: src/prefs_common_dialog.c:2695
 msgid "the full month name"
 msgstr "Monatsname"
 
-#: src/prefs_common_dialog.c:2693
+#: src/prefs_common_dialog.c:2696
 msgid "the preferred date and time for the current locale"
 msgstr "bevorzugtes Datums- und Zeitformat für die aktuelle Locale-Einstellung"
 
-#: src/prefs_common_dialog.c:2694
+#: src/prefs_common_dialog.c:2697
 msgid "the century number (year/100)"
 msgstr "Jahrhundert (Jahr/100)"
 
-#: src/prefs_common_dialog.c:2695
+#: src/prefs_common_dialog.c:2698
 msgid "the day of the month as a decimal number"
 msgstr "Tag des Monats als Zahl"
 
-#: src/prefs_common_dialog.c:2696
+#: src/prefs_common_dialog.c:2699
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "Stunde als Zahl (24h Anzeige)"
 
-#: src/prefs_common_dialog.c:2697
+#: src/prefs_common_dialog.c:2700
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "Stunde als Zahl (12h Anzeige)"
 
-#: src/prefs_common_dialog.c:2698
+#: src/prefs_common_dialog.c:2701
 msgid "the day of the year as a decimal number"
 msgstr "Tag des Jahres als Zahl"
 
-#: src/prefs_common_dialog.c:2699
+#: src/prefs_common_dialog.c:2702
 msgid "the month as a decimal number"
 msgstr "Monat als Zahl"
 
-#: src/prefs_common_dialog.c:2700
+#: src/prefs_common_dialog.c:2703
 msgid "the minute as a decimal number"
 msgstr "Minute als Zahl"
 
-#: src/prefs_common_dialog.c:2701
+#: src/prefs_common_dialog.c:2704
 msgid "either AM or PM"
 msgstr "entweder AM oder PM"
 
-#: src/prefs_common_dialog.c:2702
+#: src/prefs_common_dialog.c:2705
 msgid "the second as a decimal number"
 msgstr "Sekunde als Zahl"
 
-#: src/prefs_common_dialog.c:2703
+#: src/prefs_common_dialog.c:2706
 msgid "the day of the week as a decimal number"
 msgstr "Wochentag als Zahl"
 
-#: src/prefs_common_dialog.c:2704
+#: src/prefs_common_dialog.c:2707
 msgid "the preferred date for the current locale"
 msgstr "bevorzugtes Datumsformat für die aktuelle Locale-Einstellung"
 
-#: src/prefs_common_dialog.c:2705
+#: src/prefs_common_dialog.c:2708
 msgid "the last two digits of a year"
 msgstr "letzten beiden Stellen des Jahres"
 
-#: src/prefs_common_dialog.c:2706
+#: src/prefs_common_dialog.c:2709
 msgid "the year as a decimal number"
 msgstr "Jahr als Zahl"
 
-#: src/prefs_common_dialog.c:2707
+#: src/prefs_common_dialog.c:2710
 msgid "the time zone or name or abbreviation"
 msgstr "Zeitzone oder Name oder Abkürzung"
 
-#: src/prefs_common_dialog.c:2728
+#: src/prefs_common_dialog.c:2731
 msgid "Specifier"
 msgstr "Steuerzeichen"
 
-#: src/prefs_common_dialog.c:2729
+#: src/prefs_common_dialog.c:2732
 msgid "Description"
 msgstr "Beschreibung"
 
-#: src/prefs_common_dialog.c:2769
+#: src/prefs_common_dialog.c:2772
 msgid "Example"
 msgstr "Beispiel"
 
-#: src/prefs_common_dialog.c:2850
+#: src/prefs_common_dialog.c:2853
 msgid "Set message colors"
 msgstr "Setze Nachrichtenfarbe"
 
-#: src/prefs_common_dialog.c:2858
+#: src/prefs_common_dialog.c:2861
 msgid "Colors"
 msgstr "Farben"
 
-#: src/prefs_common_dialog.c:2892
+#: src/prefs_common_dialog.c:2895
 msgid "Quoted Text - First Level"
 msgstr "Zitierter Text - Erste Ebene"
 
-#: src/prefs_common_dialog.c:2898
+#: src/prefs_common_dialog.c:2901
 msgid "Quoted Text - Second Level"
 msgstr "Zitierter Text - Zweite Ebene"
 
-#: src/prefs_common_dialog.c:2904
+#: src/prefs_common_dialog.c:2907
 msgid "Quoted Text - Third Level"
 msgstr "Zitierter Text - Dritte Ebene"
 
-#: src/prefs_common_dialog.c:2910
+#: src/prefs_common_dialog.c:2913
 msgid "URI link"
 msgstr "URI-Link"
 
-#: src/prefs_common_dialog.c:2917
+#: src/prefs_common_dialog.c:2920
 msgid "Recycle quote colors"
 msgstr "Stelle Zitatfarben wiederher"
 
-#: src/prefs_common_dialog.c:2984
+#: src/prefs_common_dialog.c:2987
 msgid "Pick color for quotation level 1"
 msgstr "Wähle Farbe für Zitatebene 1"
 
-#: src/prefs_common_dialog.c:2987
+#: src/prefs_common_dialog.c:2990
 msgid "Pick color for quotation level 2"
 msgstr "Wähle Farbe für Zitatebene 2"
 
-#: src/prefs_common_dialog.c:2990
+#: src/prefs_common_dialog.c:2993
 msgid "Pick color for quotation level 3"
 msgstr "Wähle Farbe für Zitatebene 3"
 
-#: src/prefs_common_dialog.c:2993
+#: src/prefs_common_dialog.c:2996
 msgid "Pick color for URI"
 msgstr "Wähle Farbe für URI"
 
-#: src/prefs_common_dialog.c:3133
+#: src/prefs_common_dialog.c:3136
 msgid "Description of symbols"
 msgstr "Beschreibung der Symbole"
 
-#: src/prefs_common_dialog.c:3189
+#: src/prefs_common_dialog.c:3192
 msgid ""
 "Date\n"
 "From\n"
@@ -5294,11 +5320,11 @@ msgstr ""
 "News-Gruppen\n"
 "Nachrichten-ID"
 
-#: src/prefs_common_dialog.c:3202
+#: src/prefs_common_dialog.c:3205
 msgid "If x is set, displays expr"
 msgstr "Wenn x gesetzt ist, zeige expr"
 
-#: src/prefs_common_dialog.c:3206
+#: src/prefs_common_dialog.c:3209
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -5312,7 +5338,7 @@ msgstr ""
 "Zitierter Nachrichteninhalt ohne Unterschrift\n"
 "Wörtlich %"
 
-#: src/prefs_common_dialog.c:3214
+#: src/prefs_common_dialog.c:3217
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -5324,19 +5350,19 @@ msgstr ""
 "öffnende Klammer\n"
 "schließende Klammer"
 
-#: src/prefs_common_dialog.c:3260
+#: src/prefs_common_dialog.c:3263
 msgid "Key bindings"
 msgstr "Tastenkombinationen"
 
-#: src/prefs_common_dialog.c:3273
+#: src/prefs_common_dialog.c:3276
 msgid "Select the preset of key bindings."
 msgstr "Voreingestellte Tastenkombinationen wählen."
 
-#: src/prefs_common_dialog.c:3283 src/prefs_common_dialog.c:3607
+#: src/prefs_common_dialog.c:3286 src/prefs_common_dialog.c:3610
 msgid "Default"
 msgstr "Standard"
 
-#: src/prefs_common_dialog.c:3286 src/prefs_common_dialog.c:3616
+#: src/prefs_common_dialog.c:3289 src/prefs_common_dialog.c:3619
 msgid "Old Sylpheed"
 msgstr "Altes Sylpheed"
 
@@ -5457,7 +5483,7 @@ msgstr "Ergebnis des Befehls"
 msgid "Age"
 msgstr "Alter"
 
-#: src/prefs_filter_edit.c:501 src/summaryview.c:510
+#: src/prefs_filter_edit.c:501 src/summaryview.c:512
 msgid "Marked"
 msgstr "Markiert"
 
@@ -5683,17 +5709,17 @@ msgid "Attachment"
 msgstr "Anhang"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73 src/query_search.c:371 src/summaryview.c:4733
+#: src/prefs_summary_column.c:73 src/query_search.c:371 src/summaryview.c:4890
 msgid "Subject"
 msgstr "Betreff"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/query_search.c:372 src/summaryview.c:4736
+#: src/prefs_summary_column.c:74 src/query_search.c:372 src/summaryview.c:4893
 msgid "From"
 msgstr "Von"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/query_search.c:373 src/summaryview.c:4738
+#: src/prefs_summary_column.c:75 src/query_search.c:373 src/summaryview.c:4895
 msgid "Date"
 msgstr "Datum"
 
@@ -5796,7 +5822,7 @@ msgstr "Suche Nachrichten"
 msgid "_Save as search folder"
 msgstr "_Speichern in Suchablage"
 
-#: src/query_search.c:512 src/subscribedialog.c:523 src/summaryview.c:840
+#: src/query_search.c:512 src/subscribedialog.c:523 src/summaryview.c:842
 msgid "Done."
 msgstr "Fertig."
 
@@ -5810,7 +5836,7 @@ msgstr "Suche %s ..."
 msgid "Searching %s (%d / %d)..."
 msgstr "Suche %s (%d / %d)..."
 
-#: src/query_search.c:645 src/summaryview.c:2048
+#: src/query_search.c:645 src/summaryview.c:2051
 msgid "(No Date)"
 msgstr "(Kein Datum)"
 
@@ -6190,298 +6216,303 @@ msgid "/_Mark/Mark as rea_d"
 msgstr "/_Markieren/Als _gelesen markieren"
 
 #: src/summaryview.c:429
+#, fuzzy
+msgid "/_Mark/Mark _thread as read"
+msgstr "/_Markieren/Als _gelesen markieren"
+
+#: src/summaryview.c:431
 msgid "/_Mark/Mark all _read"
 msgstr "/_Markieren/_Alle als gelesen markieren"
 
-#: src/summaryview.c:430
+#: src/summaryview.c:432
 msgid "/Color la_bel"
 msgstr "/Far_betikett"
 
-#: src/summaryview.c:434
+#: src/summaryview.c:436
 msgid "/Re-_edit"
 msgstr "/Wi_ederbearbeiten"
 
-#: src/summaryview.c:436
+#: src/summaryview.c:438
 msgid "/Add sender to address boo_k..."
 msgstr "/Absender in Adress_buch einfügen"
 
-#: src/summaryview.c:438
+#: src/summaryview.c:440
 msgid "/Create f_ilter rule"
 msgstr "/Filter _erstellen"
 
-#: src/summaryview.c:439
+#: src/summaryview.c:441
 msgid "/Create f_ilter rule/_Automatically"
 msgstr "/Filter _erstellen/_Automatisch"
 
-#: src/summaryview.c:441
+#: src/summaryview.c:443
 msgid "/Create f_ilter rule/by _From"
 msgstr "/Filter _erstellen/nach _Von"
 
-#: src/summaryview.c:443
+#: src/summaryview.c:445
 msgid "/Create f_ilter rule/by _To"
 msgstr "/Filter _erstellen/nach A_n"
 
-#: src/summaryview.c:445
+#: src/summaryview.c:447
 msgid "/Create f_ilter rule/by _Subject"
 msgstr "/Filter _erstellen/nach _Betreff"
 
-#: src/summaryview.c:451
+#: src/summaryview.c:453
 msgid "/_View/_Source"
 msgstr "/_Ansicht/_Quellen"
 
-#: src/summaryview.c:452
+#: src/summaryview.c:454
 msgid "/_View/All _header"
 msgstr "/_Ansicht/Alle _Kopfzeilen"
 
-#: src/summaryview.c:454
+#: src/summaryview.c:456
 msgid "/_Print..."
 msgstr "/_Drucken..."
 
-#: src/summaryview.c:486
+#: src/summaryview.c:488
 msgid "Creating summary view...\n"
 msgstr "Erstelle Ablageninhaltsansicht...\n"
 
-#: src/summaryview.c:508
+#: src/summaryview.c:510
 msgid "All"
 msgstr "Alle"
 
-#: src/summaryview.c:511
+#: src/summaryview.c:513
 msgid "Have color label"
 msgstr "Hat Farbetikett"
 
-#: src/summaryview.c:512
+#: src/summaryview.c:514
 msgid "Have attachment"
 msgstr "Hat Anhang"
 
-#: src/summaryview.c:521
+#: src/summaryview.c:523
 msgid "Search:"
 msgstr "Suchen:"
 
-#: src/summaryview.c:535
+#: src/summaryview.c:537
 msgid "Search for Subject or From"
 msgstr "Suche nach Betreff oder Absender"
 
-#: src/summaryview.c:702
+#: src/summaryview.c:704
 msgid "Process mark"
 msgstr "Markierte verarbeiten"
 
-#: src/summaryview.c:703
+#: src/summaryview.c:705
 msgid "Some marks are left. Process it?"
 msgstr "Einige Markierungen sind übrig. Verarbeiten?"
 
-#: src/summaryview.c:749
+#: src/summaryview.c:751
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "Durchsuche Ablage (%s)..."
 
-#: src/summaryview.c:1292
+#: src/summaryview.c:1295
 msgid "_Search again"
 msgstr "Weiter_suchen"
 
-#: src/summaryview.c:1313 src/summaryview.c:1322
+#: src/summaryview.c:1316 src/summaryview.c:1325
 msgid "No more unread messages"
 msgstr "Keine weiteren ungelesenen Nachrichten"
 
-#: src/summaryview.c:1314
+#: src/summaryview.c:1317
 msgid "No unread message found. Search from the end?"
 msgstr "Keine ungelesene Nachricht gefunden. Vom Ende suchen?"
 
-#: src/summaryview.c:1316
+#: src/summaryview.c:1319
 msgid "No unread messages."
 msgstr "Keine ungelesenen Nachrichten."
 
-#: src/summaryview.c:1323
+#: src/summaryview.c:1326
 msgid "No unread message found. Go to next folder?"
 msgstr "Keine ungelesene Nachricht gefunden. Gehe zu nächster Ablage?"
 
-#: src/summaryview.c:1331 src/summaryview.c:1340
+#: src/summaryview.c:1334 src/summaryview.c:1343
 msgid "No more new messages"
 msgstr "Keine weiteren neuen ungelesenen Nachrichten"
 
-#: src/summaryview.c:1332
+#: src/summaryview.c:1335
 msgid "No new message found. Search from the end?"
 msgstr "Keine neue Nachricht gefunden. Vom Ende suchen?"
 
-#: src/summaryview.c:1334
+#: src/summaryview.c:1337
 msgid "No new messages."
 msgstr "Keine neuen Nachrichten."
 
-#: src/summaryview.c:1341
+#: src/summaryview.c:1344
 msgid "No new message found. Go to next folder?"
 msgstr "Keine neue Nachricht gefunden. Gehe zu nächster Ablage?"
 
-#: src/summaryview.c:1349 src/summaryview.c:1358
+#: src/summaryview.c:1352 src/summaryview.c:1361
 msgid "No more marked messages"
 msgstr "Keine weiteren ungelesenen Nachrichten"
 
-#: src/summaryview.c:1350
+#: src/summaryview.c:1353
 msgid "No marked message found. Search from the end?"
 msgstr "Keine markierte Nachricht gefunden. Vom Ende suchen?"
 
-#: src/summaryview.c:1352 src/summaryview.c:1361
+#: src/summaryview.c:1355 src/summaryview.c:1364
 msgid "No marked messages."
 msgstr "Keine markieten Nachrichten."
 
-#: src/summaryview.c:1359
+#: src/summaryview.c:1362
 msgid "No marked message found. Search from the beginning?"
 msgstr "Keine markierte Nachricht gefunden. Vom Anfang suchen?"
 
-#: src/summaryview.c:1367 src/summaryview.c:1376
+#: src/summaryview.c:1370 src/summaryview.c:1379
 msgid "No more labeled messages"
 msgstr "Keine weiteren etikettierten Nachrichten"
 
-#: src/summaryview.c:1368
+#: src/summaryview.c:1371
 msgid "No labeled message found. Search from the end?"
 msgstr "Keine etikettierte Nachricht gefunden. Vom Ende suchen?"
 
-#: src/summaryview.c:1370 src/summaryview.c:1379
+#: src/summaryview.c:1373 src/summaryview.c:1382
 msgid "No labeled messages."
 msgstr "Keine etikettierten Nachrichten."
 
-#: src/summaryview.c:1377
+#: src/summaryview.c:1380
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Keine etikettierte Nachricht gefunden. Vom Anfang suchen?"
 
-#: src/summaryview.c:1693
+#: src/summaryview.c:1696
 msgid "Attracting messages by subject..."
 msgstr "Ziehe Nachrichten nach Betreff an..."
 
-#: src/summaryview.c:1887
+#: src/summaryview.c:1890
 #, c-format
 msgid "%d deleted"
 msgstr "%d gelöscht"
 
-#: src/summaryview.c:1891
+#: src/summaryview.c:1894
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d verschoben"
 
-#: src/summaryview.c:1892 src/summaryview.c:1897
+#: src/summaryview.c:1895 src/summaryview.c:1900
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:1896
+#: src/summaryview.c:1899
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d kopiert"
 
-#: src/summaryview.c:1911
+#: src/summaryview.c:1914
 msgid " item(s) selected"
 msgstr " Einträge gewählt"
 
-#: src/summaryview.c:1933
+#: src/summaryview.c:1936
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d Neue, %d Ungelesene, %d Gesamt (%s)"
 
-#: src/summaryview.c:1937
+#: src/summaryview.c:1940
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d Neue, %d Ungelesene, %d Gesamt"
 
-#: src/summaryview.c:1971
+#: src/summaryview.c:1974
 msgid "Sorting summary..."
 msgstr "Sortiere Ablagenansicht..."
 
-#: src/summaryview.c:2194
+#: src/summaryview.c:2211
 msgid "\tSetting summary from message data..."
 msgstr "\tErstelle Ablageninhalt aus Nachrichtendaten"
 
-#: src/summaryview.c:2196
+#: src/summaryview.c:2213
 msgid "Setting summary from message data..."
 msgstr "Erstelle Ablageninhalt aus Nachrichtendaten..."
 
-#: src/summaryview.c:2302
+#: src/summaryview.c:2319
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Schreibe Ablageninhaltszwischenspeicher (%s)..."
 
-#: src/summaryview.c:2643
+#: src/summaryview.c:2660
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Nachricht %d ist markiert.\n"
 
-#: src/summaryview.c:2701
+#: src/summaryview.c:2718
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Nachricht %d ist markiert als gelesen\n"
 
-#: src/summaryview.c:2789
+#: src/summaryview.c:2908
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Nachricht %d ist markiert als ungelesen\n"
 
-#: src/summaryview.c:2850
+#: src/summaryview.c:2969
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Nachricht %s/%d ist zum Löschen markiert\n"
 
-#: src/summaryview.c:2878
+#: src/summaryview.c:2997
 msgid "Delete message(s)"
 msgstr "Nachricht(en) löschen"
 
-#: src/summaryview.c:2879
+#: src/summaryview.c:2998
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Wollen Sie wirklich diese Nachricht(en) aus dem Papierkorb löschen?"
 
-#: src/summaryview.c:2953
+#: src/summaryview.c:3072
 msgid "Deleting duplicated messages..."
 msgstr "Lösche mehrfach vorhandene Nachrichten..."
 
-#: src/summaryview.c:2991
+#: src/summaryview.c:3110
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Nachricht %s/%d ist nicht markiert.\n"
 
-#: src/summaryview.c:3049
+#: src/summaryview.c:3168
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Nachricht %d ist markiert zum Verschieben nach %s\n"
 
-#: src/summaryview.c:3066
+#: src/summaryview.c:3196
 msgid "Destination is same as current folder."
 msgstr "Das Ziel ist gleich der aktuellen Ablage."
 
-#: src/summaryview.c:3122
+#: src/summaryview.c:3260
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Nachricht %d ist markiert zum Kopieren nach %s\n"
 
-#: src/summaryview.c:3139
+#: src/summaryview.c:3288
 msgid "Destination for copy is same as current folder."
 msgstr "Das Kopierziel ist gleich der aktuellen Ablage."
 
-#: src/summaryview.c:3338
+#: src/summaryview.c:3495
 msgid "Error occurred while processing messages."
 msgstr "Fehler beim Verarbeiten der Nachrichten."
 
-#: src/summaryview.c:3646 src/summaryview.c:3647
+#: src/summaryview.c:3803 src/summaryview.c:3804
 msgid "Building threads..."
 msgstr "Threads erstellen..."
 
-#: src/summaryview.c:3797 src/summaryview.c:3798
+#: src/summaryview.c:3954 src/summaryview.c:3955
 msgid "Unthreading..."
 msgstr "Threads aufheben..."
 
-#: src/summaryview.c:4091 src/summaryview.c:4147
+#: src/summaryview.c:4248 src/summaryview.c:4304
 #, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtern (%d / %d)..."
 
-#: src/summaryview.c:4196
+#: src/summaryview.c:4353
 msgid "filtering..."
 msgstr "filtern..."
 
-#: src/summaryview.c:4197
+#: src/summaryview.c:4354
 msgid "Filtering..."
 msgstr "Filtern..."
 
-#: src/summaryview.c:4233
+#: src/summaryview.c:4390
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "Es wurde(n) %d Nachricht(en) gefiltert."
 
-#: src/summaryview.c:4742
+#: src/summaryview.c:4899
 msgid "No."
 msgstr "Nr."
 
@@ -6498,31 +6529,31 @@ msgstr "Erstelle Textansicht...\n"
 msgid "This message can't be displayed.\n"
 msgstr "Diese Nachricht kann nicht dargestellt werden.\n"
 
-#: src/textview.c:1929
+#: src/textview.c:1925
 msgid "Sa_ve this image as..."
 msgstr "/Speichere dieses Bild _als..."
 
-#: src/textview.c:1945 src/trayicon.c:109
+#: src/textview.c:1941 src/trayicon.c:109
 msgid "Compose _new message"
 msgstr "Neue Nachricht verfassen"
 
-#: src/textview.c:1947
+#: src/textview.c:1943
 msgid "Add to address _book..."
 msgstr "Absender in Adress_buch einfügen"
 
-#: src/textview.c:1949
+#: src/textview.c:1945
 msgid "Copy this add_ress"
 msgstr "Kopiere diese Adresse"
 
-#: src/textview.c:1952
+#: src/textview.c:1948
 msgid "_Open with Web browser"
 msgstr "Öffne _mit Internet-Browser"
 
-#: src/textview.c:1954
+#: src/textview.c:1950
 msgid "Copy this _link"
 msgstr "Kopiere diese _Verknüpfung"
 
-#: src/textview.c:2097
+#: src/textview.c:2093
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6535,7 +6566,7 @@ msgstr ""
 "\n"
 "Trotzdem öffnen?"
 
-#: src/textview.c:2102
+#: src/textview.c:2098
 msgid "Fake URL warning"
 msgstr "Falsche URL Warnung"
 
diff --git a/po/el.po b/po/el.po
index 76b1d26a..77570f31 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: 2006-01-27 18:11+0900\n"
+"POT-Creation-Date: 2006-01-31 15:20+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"
@@ -509,7 +509,7 @@ msgstr "Βρέθηκε %s\n"
 msgid "Configuration is saved.\n"
 msgstr "Οι ρυθμίσεις αποθηκεύτηκαν.\n"
 
-#: libsylph/prefs_common.c:489
+#: libsylph/prefs_common.c:491
 #, fuzzy
 msgid "Junk mail filter"
 msgstr "Κατάλογος"
@@ -628,8 +628,8 @@ msgstr ""
 msgid "%.2fGB"
 msgstr ""
 
-#: libsylph/utils.c:2373 src/compose.c:2858 src/compose.c:3121
-#: src/compose.c:3184 src/compose.c:3304
+#: libsylph/utils.c:2373 src/compose.c:2867 src/compose.c:3130
+#: src/compose.c:3193 src/compose.c:3313
 msgid "can't change file mode\n"
 msgstr "δεν μπορώ να αλλάξω το mode του αρχείου\n"
 
@@ -717,8 +717,8 @@ msgid ""
 "on the `G' column to enable message retrieval by `Get all'."
 msgstr ""
 
-#: src/account_dialog.c:366 src/addressadd.c:192 src/addressbook.c:491
-#: src/compose.c:4262 src/editaddress.c:200 src/editaddress.c:942
+#: src/account_dialog.c:366 src/addressadd.c:192 src/addressbook.c:493
+#: src/compose.c:4271 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:206 src/prefs_filter.c:259 src/prefs_folder_item.c:171
@@ -851,12 +851,12 @@ msgstr ""
 msgid "Add Address to Book"
 msgstr "Προσθήκη διεύθυνσης στο βιβλίο"
 
-#: src/addressadd.c:202 src/compose.c:4762 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4771 src/editaddress.c:201
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "Διεύθυνση"
 
-#: src/addressadd.c:212 src/addressbook.c:493 src/editaddress.c:202
+#: src/addressadd.c:212 src/addressbook.c:495 src/editaddress.c:202
 #: src/editaddress.c:795 src/editaddress.c:860 src/editgroup.c:267
 msgid "Remarks"
 msgstr "Σχόλια"
@@ -865,187 +865,187 @@ msgstr "Σχόλια"
 msgid "Select Address Book Folder"
 msgstr "Επιλογή καταλόγου βιβλίου διευθύνσεων"
 
-#: src/addressbook.c:336 src/compose.c:515 src/mainwindow.c:477
+#: src/addressbook.c:338 src/compose.c:515 src/mainwindow.c:480
 #: src/messageview.c:138
 msgid "/_File"
 msgstr "/Αρχείο"
 
-#: src/addressbook.c:337
+#: src/addressbook.c:339
 msgid "/_File/New _Book"
 msgstr "/Αρχείο/Νέο βιβλίο"
 
-#: src/addressbook.c:338
+#: src/addressbook.c:340
 #, fuzzy
 msgid "/_File/New _vCard"
 msgstr "/Αρχείο/Νέα _V-Card"
 
-#: src/addressbook.c:340
+#: src/addressbook.c:342
 #, fuzzy
 msgid "/_File/New _JPilot"
 msgstr "/Αρχείο/Νέο _J-Pilot"
 
-#: src/addressbook.c:343
+#: src/addressbook.c:345
 msgid "/_File/New _Server"
 msgstr "/Αρχείο/Νέος εξυπηρετητής"
 
-#: src/addressbook.c:345 src/addressbook.c:348 src/compose.c:520
-#: src/compose.c:525 src/compose.c:528 src/compose.c:531 src/mainwindow.c:495
-#: src/mainwindow.c:498 src/mainwindow.c:500 src/mainwindow.c:503
-#: src/mainwindow.c:505 src/messageview.c:141
+#: src/addressbook.c:347 src/addressbook.c:350 src/compose.c:520
+#: src/compose.c:525 src/compose.c:528 src/compose.c:531 src/mainwindow.c:498
+#: src/mainwindow.c:501 src/mainwindow.c:503 src/mainwindow.c:506
+#: src/mainwindow.c:508 src/messageview.c:141
 msgid "/_File/---"
 msgstr "/Αρχείο/---"
 
-#: src/addressbook.c:346
+#: src/addressbook.c:348
 msgid "/_File/_Edit"
 msgstr "/Αρχείο/Επεξεργασία"
 
-#: src/addressbook.c:347
+#: src/addressbook.c:349
 msgid "/_File/_Delete"
 msgstr "/Αρχείο/Διαγραφή"
 
-#: src/addressbook.c:349
+#: src/addressbook.c:351
 msgid "/_File/_Save"
 msgstr "/Αρχείο/Αποθήκευση"
 
-#: src/addressbook.c:350 src/compose.c:532 src/messageview.c:142
+#: src/addressbook.c:352 src/compose.c:532 src/messageview.c:142
 msgid "/_File/_Close"
 msgstr "/Αρχείο/Κλείσιμο"
 
-#: src/addressbook.c:351
+#: src/addressbook.c:353
 msgid "/_Address"
 msgstr "/Διεύθυνση"
 
-#: src/addressbook.c:352
+#: src/addressbook.c:354
 msgid "/_Address/New _Address"
 msgstr "/Διεύθυνση/Νέα διεύθυνση"
 
-#: src/addressbook.c:353
+#: src/addressbook.c:355
 msgid "/_Address/New _Group"
 msgstr "/Διεύθυνση/Νέα ομάδα"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:356
 msgid "/_Address/New _Folder"
 msgstr "/Διεύθυνση/Νέος κατάλογος"
 
-#: src/addressbook.c:355
+#: src/addressbook.c:357
 msgid "/_Address/---"
 msgstr "/Διεύθυνση/---"
 
-#: src/addressbook.c:356
+#: src/addressbook.c:358
 msgid "/_Address/_Edit"
 msgstr "/Διεύθυνση/Επεξεργασία"
 
-#: src/addressbook.c:357
+#: src/addressbook.c:359
 msgid "/_Address/_Delete"
 msgstr "/Διεύθυνση/Διαγραφή"
 
-#: src/addressbook.c:358 src/compose.c:639 src/mainwindow.c:738
-#: src/messageview.c:259
+#: src/addressbook.c:360 src/compose.c:645 src/mainwindow.c:749
+#: src/messageview.c:264
 #, fuzzy
 msgid "/_Tools"
 msgstr "/Εργαλεία"
 
-#: src/addressbook.c:359
+#: src/addressbook.c:361
 #, fuzzy
 msgid "/_Tools/Import _LDIF file"
 msgstr "/Αρχείο/Εισαγωγή αρχείου mbox..."
 
-#: src/addressbook.c:360 src/compose.c:658 src/mainwindow.c:788
-#: src/messageview.c:277
+#: src/addressbook.c:362 src/compose.c:664 src/mainwindow.c:799
+#: src/messageview.c:282
 msgid "/_Help"
 msgstr "/Βοήθεια"
 
-#: src/addressbook.c:361 src/compose.c:659 src/mainwindow.c:799
-#: src/messageview.c:278
+#: src/addressbook.c:363 src/compose.c:665 src/mainwindow.c:810
+#: src/messageview.c:283
 msgid "/_Help/_About"
 msgstr "/Βοήθεια/Σχετικά"
 
-#: src/addressbook.c:380 src/addressbook.c:390
+#: src/addressbook.c:382 src/addressbook.c:392
 msgid "/New _Address"
 msgstr "/Νέα διεύθυνση"
 
-#: src/addressbook.c:381 src/addressbook.c:391
+#: src/addressbook.c:383 src/addressbook.c:393
 msgid "/New _Group"
 msgstr "/Νέα ομάδα"
 
-#: src/addressbook.c:382 src/addressbook.c:392
+#: src/addressbook.c:384 src/addressbook.c:394
 msgid "/New _Folder"
 msgstr "/Νέος κατάλογος"
 
-#: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:509
+#: src/addressbook.c:385 src/addressbook.c:395 src/compose.c:509
 #: src/folderview.c:246 src/folderview.c:248 src/folderview.c:253
 #: src/folderview.c:266 src/folderview.c:268 src/folderview.c:270
 #: src/folderview.c:275 src/folderview.c:289 src/folderview.c:291
 #: src/folderview.c:295 src/summaryview.c:414 src/summaryview.c:418
-#: src/summaryview.c:421 src/summaryview.c:431 src/summaryview.c:433
-#: src/summaryview.c:435 src/summaryview.c:447 src/summaryview.c:453
+#: src/summaryview.c:421 src/summaryview.c:433 src/summaryview.c:435
+#: src/summaryview.c:437 src/summaryview.c:449 src/summaryview.c:455
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:534
-#: src/mainwindow.c:509 src/messageview.c:144
+#: src/addressbook.c:386 src/addressbook.c:396 src/compose.c:534
+#: src/mainwindow.c:512 src/messageview.c:144
 msgid "/_Edit"
 msgstr "/Επεξεργασία"
 
-#: src/addressbook.c:385 src/addressbook.c:395 src/summaryview.c:432
+#: src/addressbook.c:387 src/addressbook.c:397 src/summaryview.c:434
 msgid "/_Delete"
 msgstr "/Διαγραφή"
 
-#: src/addressbook.c:492
+#: src/addressbook.c:494
 msgid "E-Mail address"
 msgstr "Διεύθυνση e-mail"
 
-#: src/addressbook.c:496 src/compose.c:4763 src/prefs_common_dialog.c:2183
+#: src/addressbook.c:498 src/compose.c:4772 src/prefs_common_dialog.c:2183
 msgid "Address book"
 msgstr "Κατάλογος διευθύνσεων"
 
-#: src/addressbook.c:596 src/prefs_filter_edit.c:249
+#: src/addressbook.c:600 src/prefs_filter_edit.c:249
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "Όνομα:"
 
 #. Buttons
-#: src/addressbook.c:628 src/addressbook.c:1680 src/editaddress.c:884
-#: src/editaddress.c:1017 src/mainwindow.c:2391 src/prefs_actions.c:266
+#: src/addressbook.c:632 src/addressbook.c:1684 src/editaddress.c:884
+#: src/editaddress.c:1017 src/mainwindow.c:2402 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
 #: src/prefs_template.c:233
 msgid "Delete"
 msgstr "Διαγραφή"
 
-#: src/addressbook.c:631 src/editaddress.c:890 src/editaddress.c:1023
+#: src/addressbook.c:635 src/editaddress.c:890 src/editaddress.c:1023
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:273 src/prefs_display_header.c:328
 #: src/prefs_filter_edit.c:1550
 msgid "Add"
 msgstr "Προσθήκη"
 
-#: src/addressbook.c:634
+#: src/addressbook.c:638
 msgid "Lookup"
 msgstr "Αναζήτηση"
 
-#: src/addressbook.c:646 src/headerview.c:55 src/prefs_folder_item.c:339
+#: src/addressbook.c:650 src/headerview.c:55 src/prefs_folder_item.c:339
 #: src/prefs_template.c:176
 msgid "To:"
 msgstr "Προς:"
 
-#: src/addressbook.c:650 src/prefs_folder_item.c:356 src/prefs_template.c:178
+#: src/addressbook.c:654 src/prefs_folder_item.c:356 src/prefs_template.c:178
 msgid "Cc:"
 msgstr "Κοινοποίηση:"
 
-#: src/addressbook.c:654 src/prefs_folder_item.c:367
+#: src/addressbook.c:658 src/prefs_folder_item.c:367
 msgid "Bcc:"
 msgstr ""
 
 #. Confirm deletion
-#: src/addressbook.c:841
+#: src/addressbook.c:845
 msgid "Delete address(es)"
 msgstr "Διαγραφή διεύθυνσης (διευθύνσεων)"
 
-#: src/addressbook.c:842
+#: src/addressbook.c:846
 msgid "Really delete the address(es)?"
 msgstr "Σίγουρα να διαγράψω την (τις) διεύθυνση (διευθύνσεις);"
 
-#: src/addressbook.c:1671
+#: src/addressbook.c:1675
 #, fuzzy, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1055,38 +1055,38 @@ msgstr ""
 "Αν διαγράφετε τον κατάλογο μόνο, οι διευθύνσεις θα μετακινηθούν στον από "
 "πάνω κατάλογο"
 
-#: src/addressbook.c:1674 src/folderview.c:2351
+#: src/addressbook.c:1678 src/folderview.c:2351
 msgid "Delete folder"
 msgstr "Διαγραφή καταλόγου"
 
-#: src/addressbook.c:1674
+#: src/addressbook.c:1678
 #, fuzzy
 msgid "_Folder only"
 msgstr "Κατάλογος μόνο"
 
-#: src/addressbook.c:1674
+#: src/addressbook.c:1678
 #, fuzzy
 msgid "Folder and _addresses"
 msgstr "Κατάλογος και διευθύνσεις"
 
-#: src/addressbook.c:1679
+#: src/addressbook.c:1683
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Σίγουρα να διαγραφεί το `%s' ;"
 
-#: src/addressbook.c:2365 src/addressbook.c:2498
+#: src/addressbook.c:2369 src/addressbook.c:2502
 msgid "New user, could not save index file."
 msgstr "Νέος χρήστης, δεν μπόρεσα να σώσω το αρχείο δείκτη."
 
-#: src/addressbook.c:2369 src/addressbook.c:2502
+#: src/addressbook.c:2373 src/addressbook.c:2506
 msgid "New user, could not save address book files."
 msgstr "Νέος χρήστης, δεν μπόρεσα να σώσω τα αρχεία του βιβλίου διευθύνσεων."
 
-#: src/addressbook.c:2379 src/addressbook.c:2512
+#: src/addressbook.c:2383 src/addressbook.c:2516
 msgid "Old address book converted successfully."
 msgstr "Το παλιό βιβλίο διευθύνσεων μετατράπηκε επιτυχώς."
 
-#: src/addressbook.c:2384
+#: src/addressbook.c:2388
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1094,7 +1094,7 @@ msgstr ""
 "Το παλιό βιβλίο διευθύνσεων μετατράπηκε,\n"
 "δεν μπόρεσα να σώσω το νέο αρχείο δείκτη διευθύνσεων"
 
-#: src/addressbook.c:2397
+#: src/addressbook.c:2401
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1102,7 +1102,7 @@ msgstr ""
 "Δεν μπόρεσα να μετατρέψω το βιβλίο διευθύνσεων,\n"
 "αλλά δημιούργησα νέα άδεια αρχεία βιβλίου διευθύνσεων."
 
-#: src/addressbook.c:2403
+#: src/addressbook.c:2407
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1110,7 +1110,7 @@ msgstr ""
 "Δεν μπόρεσα να μετατρέψω το βιβλίο διευθύνσεων,\n"
 "δεν μπόρεσα να δημιουργήσω νέα αρχεία βιβλίου διευθύνσεων."
 
-#: src/addressbook.c:2408
+#: src/addressbook.c:2412
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1118,86 +1118,86 @@ msgstr ""
 "Δεν μπόρεσα να μετατρέψω το βιβλίο διευθύνσεων,\n"
 "και δεν μπόρεσα να δημιουργήσω νέα αρχεία βιβλίου διευθύνσεων."
 
-#: src/addressbook.c:2415
+#: src/addressbook.c:2419
 msgid "Addressbook conversion error"
 msgstr "Σφάλμα μετατροπής βιβλίου διευθύνσεων"
 
-#: src/addressbook.c:2419
+#: src/addressbook.c:2423
 msgid "Addressbook conversion"
 msgstr "Μετατροπή βιβλίου διευθύνσεων"
 
-#: src/addressbook.c:2454
+#: src/addressbook.c:2458
 msgid "Addressbook Error"
 msgstr "Σφάλμα βιβλίου διευθύνσεων"
 
-#: src/addressbook.c:2455 src/addressbook.c:2555
+#: src/addressbook.c:2459 src/addressbook.c:2559
 msgid "Could not read address index"
 msgstr "Δεν μπόρεσα να διαβάσω το δείκτη της διεύθυνσης"
 
-#: src/addressbook.c:2517
+#: src/addressbook.c:2521
 msgid "Old address book converted, could not save new address index file"
 msgstr ""
 
-#: src/addressbook.c:2531
+#: src/addressbook.c:2535
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr ""
 
-#: src/addressbook.c:2537
+#: src/addressbook.c:2541
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr ""
 
-#: src/addressbook.c:2543
+#: src/addressbook.c:2547
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr ""
 
-#: src/addressbook.c:2561
+#: src/addressbook.c:2565
 msgid "Addressbook Conversion Error"
 msgstr "Σφάλμα μετατροπής βιβλίου διευθύνσεων"
 
-#: src/addressbook.c:2567
+#: src/addressbook.c:2571
 msgid "Addressbook Conversion"
 msgstr "Μετατροπή βιβλίου διευθύνσεων"
 
-#: src/addressbook.c:3072 src/prefs_common_dialog.c:2033
+#: src/addressbook.c:3086 src/prefs_common_dialog.c:2033
 msgid "Interface"
 msgstr "Διεπαφή"
 
-#: src/addressbook.c:3088 src/importldif.c:514
+#: src/addressbook.c:3102 src/importldif.c:514
 msgid "Address Book"
 msgstr "Βιβλίο διευθύνσεων"
 
-#: src/addressbook.c:3104
+#: src/addressbook.c:3118
 msgid "Person"
 msgstr "Άτομο"
 
-#: src/addressbook.c:3120
+#: src/addressbook.c:3134
 msgid "EMail Address"
 msgstr "Διεύθυνση e-mail"
 
-#: src/addressbook.c:3136
+#: src/addressbook.c:3150
 msgid "Group"
 msgstr "ΝέαΟμάδα"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3152 src/folderview.c:367 src/prefs_account_dialog.c:1694
+#: src/addressbook.c:3166 src/folderview.c:367 src/prefs_account_dialog.c:1694
 #: src/query_search.c:370
 msgid "Folder"
 msgstr "Κατάλογος"
 
-#: src/addressbook.c:3168
+#: src/addressbook.c:3182
 #, fuzzy
 msgid "vCard"
 msgstr "V-Card"
 
-#: src/addressbook.c:3184 src/addressbook.c:3200
+#: src/addressbook.c:3198 src/addressbook.c:3214
 #, fuzzy
 msgid "JPilot"
 msgstr "J-Pilot"
 
-#: src/addressbook.c:3216
+#: src/addressbook.c:3230
 msgid "LDAP Server"
 msgstr "Εξυπηρέτης LDAP"
 
@@ -1209,7 +1209,7 @@ msgstr "Κοινές διευθύνσεις"
 msgid "Personal address"
 msgstr "Προσωπικές διευθύνσεις"
 
-#: src/alertpanel.c:141 src/compose.c:5485 src/main.c:573
+#: src/alertpanel.c:141 src/compose.c:5494 src/main.c:573
 msgid "Notice"
 msgstr "Σημείωση"
 
@@ -1260,7 +1260,7 @@ msgstr "Καφέ"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4593
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4750
 msgid "None"
 msgstr "Τέλος"
 
@@ -1323,7 +1323,7 @@ msgstr "/Επεξεργασία/Αναίρεση"
 msgid "/_Edit/_Redo"
 msgstr "/Επεξεργασία/Επανάληψη"
 
-#: src/compose.c:537 src/compose.c:544 src/mainwindow.c:513
+#: src/compose.c:537 src/compose.c:544 src/mainwindow.c:516
 #: src/messageview.c:147
 msgid "/_Edit/---"
 msgstr "/Επεξεργασία/---"
@@ -1332,7 +1332,7 @@ msgstr "/Επεξεργασία/---"
 msgid "/_Edit/Cu_t"
 msgstr "/Επεξεργασία/Κοπή"
 
-#: src/compose.c:539 src/mainwindow.c:510 src/messageview.c:145
+#: src/compose.c:539 src/mainwindow.c:513 src/messageview.c:145
 msgid "/_Edit/_Copy"
 msgstr "/Επεξεργασία/Αντιγραφή"
 
@@ -1345,7 +1345,7 @@ msgstr "/Επεξεργασία/Επικόλληση"
 msgid "/_Edit/Paste as _quotation"
 msgstr "/Επεξεργασία/Επικόλληση"
 
-#: src/compose.c:543 src/mainwindow.c:511 src/messageview.c:146
+#: src/compose.c:543 src/mainwindow.c:514 src/messageview.c:146
 msgid "/_Edit/Select _all"
 msgstr "/Επεξεργασία/Επιλογή όλων"
 
@@ -1362,8 +1362,8 @@ msgstr "/Επεξεργασία/Αναδίπλωση μακριών γραμμώ
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/Επεξεργασία/Αντιγραφή"
 
-#: src/compose.c:550 src/mainwindow.c:518 src/messageview.c:151
-#: src/summaryview.c:448
+#: src/compose.c:550 src/mainwindow.c:521 src/messageview.c:151
+#: src/summaryview.c:450
 msgid "/_View"
 msgstr "/Απεικόνιση"
 
@@ -1388,9 +1388,9 @@ msgid "/_View/_Reply to"
 msgstr "/Απεικόνιση/Κωδικοσύνολο"
 
 #: src/compose.c:555 src/compose.c:557 src/compose.c:559 src/compose.c:561
-#: src/mainwindow.c:538 src/mainwindow.c:541 src/mainwindow.c:568
-#: src/mainwindow.c:592 src/mainwindow.c:687 src/mainwindow.c:691
-#: src/messageview.c:236
+#: src/mainwindow.c:541 src/mainwindow.c:544 src/mainwindow.c:571
+#: src/mainwindow.c:595 src/mainwindow.c:696 src/mainwindow.c:700
+#: src/messageview.c:241
 msgid "/_View/---"
 msgstr "/Απεικόνιση/---"
 
@@ -1409,7 +1409,7 @@ msgstr "/Απεικόνιση/Εμφάνιση του πηγαίου"
 msgid "/_View/_Attachment"
 msgstr "Προσάρτηση"
 
-#: src/compose.c:567 src/mainwindow.c:599 src/messageview.c:158
+#: src/compose.c:567 src/mainwindow.c:602 src/messageview.c:158
 #, fuzzy
 msgid "/_View/Character _encoding"
 msgstr "/Απεικόνιση/Εμφάνιση του πηγαίου"
@@ -1419,245 +1419,256 @@ msgid "/_View/Character _encoding/_Automatic"
 msgstr ""
 
 #: src/compose.c:570 src/compose.c:576 src/compose.c:582 src/compose.c:586
-#: src/compose.c:592 src/compose.c:596 src/compose.c:602 src/compose.c:606
-#: src/compose.c:616 src/compose.c:620 src/compose.c:628 src/compose.c:632
-#: src/mainwindow.c:595 src/mainwindow.c:602 src/messageview.c:154
+#: src/compose.c:592 src/compose.c:596 src/compose.c:602 src/compose.c:608
+#: src/compose.c:612 src/compose.c:622 src/compose.c:626 src/compose.c:634
+#: src/compose.c:638 src/mainwindow.c:598 src/mainwindow.c:605
+#: src/messageview.c:154
 #, fuzzy
 msgid "/_View/Character _encoding/---"
 msgstr "/Απεικόνιση/Εμφάνιση του πηγαίου"
 
-#: src/compose.c:572 src/mainwindow.c:603 src/messageview.c:162
+#: src/compose.c:572 src/mainwindow.c:606 src/messageview.c:162
 #, fuzzy
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/7bit ascii (US-ASC_II)"
 
-#: src/compose.c:574 src/mainwindow.c:605 src/messageview.c:165
+#: src/compose.c:574 src/mainwindow.c:608 src/messageview.c:165
 #, fuzzy
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/Unicode (_UTF-8)"
 
-#: src/compose.c:578 src/mainwindow.c:609 src/messageview.c:168
+#: src/compose.c:578 src/mainwindow.c:612 src/messageview.c:168
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/Δυτικής Ευρώπης (ISO-8859-_1)"
 
-#: src/compose.c:580 src/mainwindow.c:611 src/messageview.c:170
+#: src/compose.c:580 src/mainwindow.c:614 src/messageview.c:170
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/Δυτικής Ευρώπης (ISO-8859-_1)"
 
-#: src/compose.c:584 src/mainwindow.c:617 src/messageview.c:175
+#: src/compose.c:584 src/mainwindow.c:620 src/messageview.c:175
 #, fuzzy
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/Κεντρικής Ευρώπης (ISO-8859-_2)"
 
-#: src/compose.c:588 src/mainwindow.c:621 src/messageview.c:178
+#: src/compose.c:588 src/mainwindow.c:624 src/messageview.c:178
 #, fuzzy
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/Βαλτικής (ISO-8859-13)"
 
-#: src/compose.c:590 src/mainwindow.c:623 src/messageview.c:180
+#: src/compose.c:590 src/mainwindow.c:626 src/messageview.c:180
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/Βαλτικής (ISO-8859-_4)"
 
-#: src/compose.c:594 src/mainwindow.c:627 src/messageview.c:183
+#: src/compose.c:594 src/mainwindow.c:630 src/messageview.c:183
 #, fuzzy
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/Ελληνικό (ISO-8859-_7)"
 
-#: src/compose.c:598 src/mainwindow.c:631 src/messageview.c:186
+#: src/compose.c:598 src/mainwindow.c:634 src/messageview.c:186
+#, fuzzy
+msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
+msgstr "/Απεικόνιση/Κωδικοσύνολο/Βαλτικής (ISO-8859-_4)"
+
+#: src/compose.c:600 src/mainwindow.c:636 src/messageview.c:188
+#, fuzzy
+msgid "/_View/Character _encoding/Arabic (Windows-1256)"
+msgstr "/Απεικόνιση/Κωδικοσύνολο/Κυριλλικό (Windows-1251)"
+
+#: src/compose.c:604 src/mainwindow.c:640 src/messageview.c:191
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/Ελληνικό (ISO-8859-_7)"
 
-#: src/compose.c:600 src/mainwindow.c:633 src/messageview.c:188
+#: src/compose.c:606 src/mainwindow.c:642 src/messageview.c:193
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/Κυριλλικό (Windows-1251)"
 
-#: src/compose.c:604 src/mainwindow.c:637 src/messageview.c:191
+#: src/compose.c:610 src/mainwindow.c:646 src/messageview.c:196
 #, fuzzy
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/Τουρκικό (ISO-8859-_9)"
 
-#: src/compose.c:608 src/mainwindow.c:641 src/messageview.c:194
+#: src/compose.c:614 src/mainwindow.c:650 src/messageview.c:199
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/Κυριλλικό (ISO-8859-_5)"
 
-#: src/compose.c:610 src/mainwindow.c:643 src/messageview.c:196
+#: src/compose.c:616 src/mainwindow.c:652 src/messageview.c:201
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/Κυριλλικό (KOI8-_R)"
 
-#: src/compose.c:612 src/mainwindow.c:645 src/messageview.c:198
+#: src/compose.c:618 src/mainwindow.c:654 src/messageview.c:203
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/Κυριλλικό (KOI8-_R)"
 
-#: src/compose.c:614 src/mainwindow.c:647 src/messageview.c:200
+#: src/compose.c:620 src/mainwindow.c:656 src/messageview.c:205
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/Κυριλλικό (Windows-1251)"
 
-#: src/compose.c:618 src/mainwindow.c:651 src/messageview.c:203
+#: src/compose.c:624 src/mainwindow.c:660 src/messageview.c:208
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/Ιαπωνέζικο (ISO-2022-_JP)"
 
-#: src/compose.c:622 src/mainwindow.c:661 src/messageview.c:212
+#: src/compose.c:628 src/mainwindow.c:670 src/messageview.c:217
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/Απλοποιημένο Κινεζικό (_GB2312)"
 
-#: src/compose.c:624 src/mainwindow.c:663 src/messageview.c:214
+#: src/compose.c:630 src/mainwindow.c:672 src/messageview.c:219
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/Απλοποιημένο Κινεζικό (_GB2312)"
 
-#: src/compose.c:626 src/mainwindow.c:665 src/messageview.c:216
+#: src/compose.c:632 src/mainwindow.c:674 src/messageview.c:221
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/Παραδοσιακό Κινεζικό (_Big5)"
 
-#: src/compose.c:630 src/mainwindow.c:673 src/messageview.c:223
+#: src/compose.c:636 src/mainwindow.c:682 src/messageview.c:228
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/Κορεάτικο (EUC-_KR)"
 
-#: src/compose.c:634 src/mainwindow.c:679 src/messageview.c:228
+#: src/compose.c:640 src/mainwindow.c:688 src/messageview.c:233
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/Κινεζικό (ISO-2022-_CN)"
 
-#: src/compose.c:636 src/mainwindow.c:681 src/messageview.c:230
+#: src/compose.c:642 src/mainwindow.c:690 src/messageview.c:235
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/Κυριλλικό (Windows-1251)"
 
-#: src/compose.c:640 src/mainwindow.c:739 src/messageview.c:260
+#: src/compose.c:646 src/mainwindow.c:750 src/messageview.c:265
 #, fuzzy
 msgid "/_Tools/_Address book"
 msgstr "/Εργαλεία/Κατάλογος διευθύνσεων"
 
-#: src/compose.c:641
+#: src/compose.c:647
 #, fuzzy
 msgid "/_Tools/_Template"
 msgstr "/Αρχείο/Διαγραφή"
 
-#: src/compose.c:642 src/mainwindow.c:762 src/messageview.c:275
+#: src/compose.c:648 src/mainwindow.c:773 src/messageview.c:280
 #, fuzzy
 msgid "/_Tools/Actio_ns"
 msgstr "/Εκτέλεση"
 
-#: src/compose.c:643 src/compose.c:647 src/compose.c:653 src/mainwindow.c:742
-#: src/mainwindow.c:756 src/mainwindow.c:761 src/mainwindow.c:763
-#: src/mainwindow.c:766 src/mainwindow.c:768 src/messageview.c:263
-#: src/messageview.c:274
+#: src/compose.c:649 src/compose.c:653 src/compose.c:659 src/mainwindow.c:753
+#: src/mainwindow.c:767 src/mainwindow.c:772 src/mainwindow.c:774
+#: src/mainwindow.c:777 src/mainwindow.c:779 src/messageview.c:268
+#: src/messageview.c:279
 #, fuzzy
 msgid "/_Tools/---"
 msgstr "/Εργαλεία"
 
-#: src/compose.c:644
+#: src/compose.c:650
 #, fuzzy
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/Επεξεργασία/Επεξεργασία με εξωτερικό πρόγραμμα"
 
-#: src/compose.c:648
+#: src/compose.c:654
 #, fuzzy
 msgid "/_Tools/PGP Si_gn"
 msgstr "/Εκτέλεση"
 
-#: src/compose.c:649
+#: src/compose.c:655
 #, fuzzy
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/Μήνυμα/Κρυπτογράφηση"
 
-#: src/compose.c:654
+#: src/compose.c:660
 #, fuzzy
 msgid "/_Tools/_Check spell"
 msgstr "/Εκτέλεση"
 
-#: src/compose.c:655
+#: src/compose.c:661
 #, fuzzy
 msgid "/_Tools/_Set spell language"
 msgstr "/Αρχείο/Διαγραφή"
 
-#: src/compose.c:899
+#: src/compose.c:908
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: το αρχείο δεν υπάρχει\n"
 
-#: src/compose.c:1003 src/compose.c:1074
+#: src/compose.c:1012 src/compose.c:1083
 msgid "Can't get text part\n"
 msgstr "Δεν μπορώ να λάβω το τμήμα κειμένου\n"
 
-#: src/compose.c:1475
+#: src/compose.c:1484
 msgid "Quote mark format error."
 msgstr ""
 
-#: src/compose.c:1487
+#: src/compose.c:1496
 msgid "Message reply/forward format error."
 msgstr ""
 
-#: src/compose.c:1907
+#: src/compose.c:1916
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Το αρχείο %s δεν υπάρχει\n"
 
-#: src/compose.c:1911
+#: src/compose.c:1920
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Δεν μπορώ να βρω το μέγεθος του αρχείου %s\n"
 
-#: src/compose.c:1915
+#: src/compose.c:1924
 #, fuzzy, c-format
 msgid "File %s is empty."
 msgstr "Το αρχείο %s είναι άδειο\n"
 
-#: src/compose.c:1919
+#: src/compose.c:1928
 #, fuzzy, c-format
 msgid "Can't read %s."
 msgstr "δεν μπορώ να δημιουργήσω %s\n"
 
-#: src/compose.c:1952
+#: src/compose.c:1961
 #, c-format
 msgid "Message: %s"
 msgstr "Μήνυμα: %s"
 
-#: src/compose.c:2012 src/mimeview.c:565
+#: src/compose.c:2021 src/mimeview.c:565
 msgid "Can't get the part of multipart message."
 msgstr "Δεν μπορώ να λάβω το τμήμα του πολυτμηματικού μηνύματος"
 
-#: src/compose.c:2496 src/headerview.c:195 src/query_search.c:636
-#: src/summaryview.c:2107
+#: src/compose.c:2505 src/headerview.c:195 src/query_search.c:636
+#: src/summaryview.c:2124
 msgid "(No Subject)"
 msgstr "(Χωρίς Θέμα)"
 
-#: src/compose.c:2499
+#: src/compose.c:2508
 #, fuzzy, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Σύνθεση μηνύματος%s"
 
-#: src/compose.c:2612
+#: src/compose.c:2621
 msgid "Recipient is not specified."
 msgstr "Ο παραλήπτης δεν έχει οριστεί."
 
-#: src/compose.c:2620
+#: src/compose.c:2629
 #, fuzzy
 msgid "Empty subject"
 msgstr "Θέμα"
 
-#: src/compose.c:2621
+#: src/compose.c:2630
 msgid "Subject is empty. Send it anyway?"
 msgstr ""
 
-#: src/compose.c:2680
+#: src/compose.c:2689
 msgid "can't get recipient list."
 msgstr "δεν μπορώ να πάρω την λίστα παραληπτών"
 
-#: src/compose.c:2700
+#: src/compose.c:2709
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1665,21 +1676,21 @@ msgstr ""
 "Ο λογαριασμός για αποστολή μηνύματος δεν έχει οριστεί.\n"
 "Παρακαλώ επιλέξτε ένα λογαριασμό πριν στείλετε."
 
-#: src/compose.c:2714 src/send_message.c:299
+#: src/compose.c:2723 src/send_message.c:299
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Συνέβη σφάλμα κατά την αποστολή του μηνύματος σε %s ."
 
-#: src/compose.c:2756
+#: src/compose.c:2765
 msgid "Can't save the message to outbox."
 msgstr "Δεν μπορώ να αποθηκεύσω το μήνυμα στα εξερχόμενα."
 
-#: src/compose.c:2794
+#: src/compose.c:2803
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr ""
 
-#: src/compose.c:2891
+#: src/compose.c:2900
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1687,12 +1698,12 @@ msgid ""
 "Send it as %s anyway?"
 msgstr "Δεν μπορώ να αλλάξω το κωδικοσύνολο του μηνύματος."
 
-#: src/compose.c:2897
+#: src/compose.c:2906
 #, fuzzy
 msgid "Code conversion error"
 msgstr "Σφάλμα μετατροπής βιβλίου διευθύνσεων"
 
-#: src/compose.c:2970
+#: src/compose.c:2979
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1701,166 +1712,166 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:2974
+#: src/compose.c:2983
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3264
+#: src/compose.c:3273
 msgid "can't remove the old message\n"
 msgstr "δεν μπορώ να αφαιρέσω το παλιό μήνυμα\n"
 
-#: src/compose.c:3282
+#: src/compose.c:3291
 msgid "queueing message...\n"
 msgstr "βάζω το μήνυμα στην ουρά...\n"
 
-#: src/compose.c:3364
+#: src/compose.c:3373
 #, fuzzy
 msgid "can't find queue folder\n"
 msgstr "δεν μπορώ να επιλέξω τον κατάλογο: %s\n"
 
-#: src/compose.c:3371
+#: src/compose.c:3380
 msgid "can't queue the message\n"
 msgstr "δεν μπορώ να βάλω το μήνυμα στην ουρά\n"
 
-#: src/compose.c:3964
+#: src/compose.c:3973
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "generated Message-ID: %s\n"
 
-#: src/compose.c:4077
+#: src/compose.c:4086
 msgid "Creating compose window...\n"
 msgstr "Δημιουργώ το παράθυρο σύνθεσης...\n"
 
-#: src/compose.c:4128 src/headerview.c:54
+#: src/compose.c:4137 src/headerview.c:54
 msgid "From:"
 msgstr "Από:"
 
-#: src/compose.c:4202
+#: src/compose.c:4211
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/Εκτέλεση"
 
-#: src/compose.c:4205
+#: src/compose.c:4214
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/Μήνυμα/Κρυπτογράφηση"
 
-#: src/compose.c:4243 src/compose.c:5317
+#: src/compose.c:4252 src/compose.c:5326
 msgid "MIME type"
 msgstr "τύπος MIME"
 
 #. S_COL_DATE
-#: src/compose.c:4252 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4740
+#: src/compose.c:4261 src/mimeview.c:197 src/prefs_filter_edit.c:496
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4897
 msgid "Size"
 msgstr "Μέγεθος"
 
-#: src/compose.c:4683 src/mainwindow.c:2324 src/prefs_account_dialog.c:528
+#: src/compose.c:4692 src/mainwindow.c:2335 src/prefs_account_dialog.c:528
 #: src/prefs_common_dialog.c:661
 msgid "Send"
 msgstr "Αποστολή"
 
-#: src/compose.c:4684
+#: src/compose.c:4693
 msgid "Send message"
 msgstr "Αποστολή μηνύματος"
 
-#: src/compose.c:4692
+#: src/compose.c:4701
 msgid "Send later"
 msgstr ""
 "Αποστολή\n"
 "αργότερα"
 
-#: src/compose.c:4693
+#: src/compose.c:4702
 msgid "Put into queue folder and send later"
 msgstr "Τοποθέτηση στον κατάλογο ουράς και αποστολή αργότερα"
 
-#: src/compose.c:4701
+#: src/compose.c:4710
 msgid "Draft"
 msgstr "Πρόχειρα"
 
-#: src/compose.c:4702
+#: src/compose.c:4711
 msgid "Save to draft folder"
 msgstr "Αποθήκευση στον κατάλογο προχείρων"
 
-#: src/compose.c:4712
+#: src/compose.c:4721
 msgid "Insert"
 msgstr "Εισαγωγή"
 
-#: src/compose.c:4713
+#: src/compose.c:4722
 msgid "Insert file"
 msgstr "Εισαγωγή αρχείου"
 
-#: src/compose.c:4721
+#: src/compose.c:4730
 msgid "Attach"
 msgstr "Προσάρτηση"
 
-#: src/compose.c:4722
+#: src/compose.c:4731
 msgid "Attach file"
 msgstr "Προσάρτηση αρχείου"
 
 #. signature
-#: src/compose.c:4732 src/prefs_account_dialog.c:1208
+#: src/compose.c:4741 src/prefs_account_dialog.c:1208
 #: src/prefs_common_dialog.c:953
 msgid "Signature"
 msgstr "Yπογραφή"
 
-#: src/compose.c:4733
+#: src/compose.c:4742
 #, fuzzy
 msgid "Append signature"
 msgstr "Λάθος υπογραφή"
 
 #. editor
-#: src/compose.c:4742 src/prefs_common_dialog.c:991
+#: src/compose.c:4751 src/prefs_common_dialog.c:991
 #: src/prefs_common_dialog.c:2315
 msgid "Editor"
 msgstr "Συνθέτης"
 
-#: src/compose.c:4743
+#: src/compose.c:4752
 msgid "Edit with external editor"
 msgstr "Επεξεργασία με εξωτερικό πρόγραμμα"
 
-#: src/compose.c:4751
+#: src/compose.c:4760
 msgid "Linewrap"
 msgstr ""
 "Τύλιξη\n"
 "γραμμής"
 
-#: src/compose.c:4752
+#: src/compose.c:4761
 #, fuzzy
 msgid "Wrap all long lines"
 msgstr "Αναδίπλωση γραμμών"
 
-#: src/compose.c:5213
+#: src/compose.c:5222
 msgid "Invalid MIME type."
 msgstr "Μη έγκυρος τύπος MIME"
 
-#: src/compose.c:5231
+#: src/compose.c:5240
 msgid "File doesn't exist or is empty."
 msgstr "Το αρχείο δεν υπάρχει, ή είναι άδειο."
 
-#: src/compose.c:5299
+#: src/compose.c:5308
 #, fuzzy
 msgid "Properties"
 msgstr "Ιδιότητες"
 
-#: src/compose.c:5319 src/prefs_common_dialog.c:1444
+#: src/compose.c:5328 src/prefs_common_dialog.c:1444
 msgid "Encoding"
 msgstr "Κωδικοποίηση"
 
-#: src/compose.c:5342 src/prefs_folder_item.c:202
+#: src/compose.c:5351 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Διάδρομος"
 
-#: src/compose.c:5343
+#: src/compose.c:5352
 msgid "File name"
 msgstr "Όνομα αρχείου"
 
-#: src/compose.c:5436
+#: src/compose.c:5445
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Η εντολή για το εξωτερικό πρόγραμμα δεν είναι έγκυρη: `%s'\n"
 
-#: src/compose.c:5482
+#: src/compose.c:5491
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1870,49 +1881,49 @@ msgstr ""
 "Να επιβάλλω τερματισμό της διεργασίας;\n"
 "process group id:  %d"
 
-#: src/compose.c:5857 src/compose.c:5862 src/compose.c:5868
+#: src/compose.c:5866 src/compose.c:5871 src/compose.c:5877
 msgid "Can't queue the message."
 msgstr "Δεν μπορώ να βάλω στην ουρά το μήνυμα."
 
-#: src/compose.c:5959
+#: src/compose.c:5968
 #, fuzzy
 msgid "Select files"
 msgstr "Επιλογή αρχείου"
 
-#: src/compose.c:5982
+#: src/compose.c:5991
 msgid "Select file"
 msgstr "Επιλογή αρχείου"
 
-#: src/compose.c:6017
+#: src/compose.c:6026
 #, fuzzy
 msgid "Save message"
 msgstr "Αποστολή μηνύματος"
 
-#: src/compose.c:6018
+#: src/compose.c:6027
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Αυτό το μήνυμα έχει τροποποιηθεί, να απορριφθεί;"
 
-#: src/compose.c:6020
+#: src/compose.c:6029
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:6062
+#: src/compose.c:6071
 #, fuzzy, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Θέλετε πράγματι να διαγραφεί αυτή η κεφαλίδα;"
 
-#: src/compose.c:6064
+#: src/compose.c:6073
 #, fuzzy
 msgid "Apply template"
 msgstr "Διαγραφή μηνύματος"
 
-#: src/compose.c:6065
+#: src/compose.c:6074
 #, fuzzy
 msgid "_Replace"
 msgstr "Απάντηση"
 
-#: src/compose.c:6065
+#: src/compose.c:6074
 #, fuzzy
 msgid "_Insert"
 msgstr "Εισαγωγή"
@@ -2367,7 +2378,7 @@ msgstr "Νέα"
 
 #. S_COL_MARK
 #: src/folderview.c:412 src/prefs_filter_edit.c:500
-#: src/prefs_summary_column.c:71 src/summaryview.c:509
+#: src/prefs_summary_column.c:71 src/summaryview.c:511
 msgid "Unread"
 msgstr "Αδιάβαστα"
 
@@ -2383,12 +2394,12 @@ msgstr "Θέτω τις πληροφορίες καταλόγων...\n"
 msgid "Setting folder info..."
 msgstr "Θέτω τις πληροφορίες καταλόγων..."
 
-#: src/folderview.c:858 src/mainwindow.c:3464 src/setup.c:80
+#: src/folderview.c:858 src/mainwindow.c:3481 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Σάρωση καταλόγων %s%c%s ..."
 
-#: src/folderview.c:862 src/mainwindow.c:3469 src/setup.c:85
+#: src/folderview.c:862 src/mainwindow.c:3486 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Σάρωση καταλόγου %s ..."
@@ -2417,7 +2428,7 @@ msgstr "Ενημέρωση της δομής καταλόγων..."
 msgid "Checking for new messages in all folders..."
 msgstr "Σύνθεση νέου μηνύματος"
 
-#: src/folderview.c:1200 src/mainwindow.c:2400 src/prefs_common_dialog.c:1789
+#: src/folderview.c:1200 src/mainwindow.c:2411 src/prefs_common_dialog.c:1789
 msgid "Junk"
 msgstr ""
 
@@ -2557,7 +2568,7 @@ msgstr "Θέμα:"
 msgid "Creating header view...\n"
 msgstr "Δημιουργώ την απεικόνιση κεφαλίδας...\n"
 
-#: src/headerview.c:180 src/query_search.c:637 src/summaryview.c:2110
+#: src/headerview.c:180 src/query_search.c:637 src/summaryview.c:2127
 msgid "(No From)"
 msgstr "(Χωρίς αποστολέα)"
 
@@ -2677,7 +2688,7 @@ msgstr ""
 msgid "Prev"
 msgstr "Επιλογές"
 
-#: src/importldif.c:768 src/mainwindow.c:2420
+#: src/importldif.c:768 src/mainwindow.c:2431
 msgid "Next"
 msgstr "Επόμενο"
 
@@ -3022,748 +3033,753 @@ msgstr ""
 msgid "another Sylpheed is already running.\n"
 msgstr "ένα άλλο Sylpheed τρέχει ήδη.\n"
 
-#: src/main.c:1064
+#: src/main.c:1083
 #, fuzzy
 msgid "Migration of configuration"
 msgstr "Γράφω τις ρυθμίσεις των φίλτρων...\n"
 
-#: src/main.c:1065
+#: src/main.c:1084
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
 msgstr ""
 
-#: src/mainwindow.c:478
+#: src/mainwindow.c:481
 msgid "/_File/_Folder"
 msgstr "/Αρχείο/Κατάλογος"
 
-#: src/mainwindow.c:479
+#: src/mainwindow.c:482
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/Αρχείο/Κατάλογος/Δημιουργία νέου καταλόγου..."
 
-#: src/mainwindow.c:481
+#: src/mainwindow.c:484
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/Αρχείο/Κατάλογος/Μετονομασία καταλόγου..."
 
-#: src/mainwindow.c:482
+#: src/mainwindow.c:485
 #, fuzzy
 msgid "/_File/_Folder/_Move folder..."
 msgstr "/Αρχείο/Κατάλογος/Μετονομασία καταλόγου..."
 
-#: src/mainwindow.c:483
+#: src/mainwindow.c:486
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/Αρχείο/Κατάλογος/Διαγραφή καταλόγου"
 
-#: src/mainwindow.c:484
+#: src/mainwindow.c:487
 #, fuzzy
 msgid "/_File/_Mailbox"
 msgstr "/Αρχείο/Προσθήκη mailbox..."
 
-#: src/mainwindow.c:485
+#: src/mainwindow.c:488
 #, fuzzy
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/Αρχείο/Προσθήκη mailbox..."
 
-#: src/mainwindow.c:486
+#: src/mainwindow.c:489
 #, fuzzy
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/Διαγραφή mailbox"
 
-#: src/mainwindow.c:487 src/mainwindow.c:492
+#: src/mainwindow.c:490 src/mainwindow.c:495
 #, fuzzy
 msgid "/_File/_Mailbox/---"
 msgstr "/Αρχείο/Κατάλογος"
 
-#: src/mainwindow.c:488
+#: src/mainwindow.c:491
 #, fuzzy
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "Σύνθεση νέου μηνύματος"
 
-#: src/mainwindow.c:490
+#: src/mainwindow.c:493
 #, fuzzy
 msgid "/_File/_Mailbox/Check for new messages in _all mailboxes"
 msgstr "Σύνθεση νέου μηνύματος"
 
-#: src/mainwindow.c:493
+#: src/mainwindow.c:496
 #, fuzzy
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "/Ενημέρωση δομής καταλόγων"
 
-#: src/mainwindow.c:496
+#: src/mainwindow.c:499
 msgid "/_File/_Import mbox file..."
 msgstr "/Αρχείο/Εισαγωγή αρχείου mbox..."
 
-#: src/mainwindow.c:497
+#: src/mainwindow.c:500
 msgid "/_File/_Export to mbox file..."
 msgstr "/Αρχείο/Εξαγωγή σε αρχείο mbox..."
 
-#: src/mainwindow.c:499
+#: src/mainwindow.c:502
 #, fuzzy
 msgid "/_File/Empty all _trash"
 msgstr "/Αρχείο/Άδειασμα διαγραμμένων"
 
-#: src/mainwindow.c:501 src/messageview.c:139
+#: src/mainwindow.c:504 src/messageview.c:139
 msgid "/_File/_Save as..."
 msgstr "/Αρχείο/Αποθήκευση ως..."
 
-#: src/mainwindow.c:502 src/messageview.c:140
+#: src/mainwindow.c:505 src/messageview.c:140
 msgid "/_File/_Print..."
 msgstr "/Αρχείο/Εκτύπωση..."
 
-#: src/mainwindow.c:504
+#: src/mainwindow.c:507
 #, fuzzy
 msgid "/_File/_Work offline"
 msgstr "/Αρχείο/Εισαγωγή αρχείου"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:507
+#: src/mainwindow.c:510
 msgid "/_File/E_xit"
 msgstr "/Αρχείο/Έξοδος"
 
-#: src/mainwindow.c:512
+#: src/mainwindow.c:515
 #, fuzzy
 msgid "/_Edit/Select _thread"
 msgstr "/Επεξεργασία/Επιλογή όλων"
 
-#: src/mainwindow.c:514 src/messageview.c:148
+#: src/mainwindow.c:517 src/messageview.c:148
 #, fuzzy
 msgid "/_Edit/_Find in current message..."
 msgstr "/Επεξεργασία/Αναδίπλωση τρέχουσας παραγράφου"
 
-#: src/mainwindow.c:516
+#: src/mainwindow.c:519
 #, fuzzy
 msgid "/_Edit/_Search messages..."
 msgstr "\tΑναζήτηση στα απροσπέλαστα μηνύματα... "
 
-#: src/mainwindow.c:519
+#: src/mainwindow.c:522
 #, fuzzy
 msgid "/_View/Show or hi_de"
 msgstr "/Απεικόνιση/Εμφάνιση της πλήρους κεφαλίδας"
 
-#: src/mainwindow.c:520
+#: src/mainwindow.c:523
 #, fuzzy
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/Απεικόνιση/Δομή καταλόγων"
 
-#: src/mainwindow.c:522
+#: src/mainwindow.c:525
 #, fuzzy
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/Απεικόνιση/Απεικόνιση μηνυνάτων"
 
-#: src/mainwindow.c:524
+#: src/mainwindow.c:527
 #, fuzzy
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/Απεικόνιση/Ράβδος εργαλείων"
 
-#: src/mainwindow.c:526
+#: src/mainwindow.c:529
 #, fuzzy
 msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/Απεικόνιση/Ράβδος εργαλείων/Εικόνες και κείμενο"
 
-#: src/mainwindow.c:528
+#: src/mainwindow.c:531
 #, fuzzy
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/Απεικόνιση/Ράβδος εργαλείων/Εικόνες"
 
-#: src/mainwindow.c:530
+#: src/mainwindow.c:533
 #, fuzzy
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/Απεικόνιση/Ράβδος εργαλείων/Κείμενο"
 
-#: src/mainwindow.c:532
+#: src/mainwindow.c:535
 #, fuzzy
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/Απεικόνιση/Ράβδος εργαλείων/Καμία"
 
-#: src/mainwindow.c:534
+#: src/mainwindow.c:537
 #, fuzzy
 msgid "/_View/Show or hi_de/_Search bar"
 msgstr "/Απεικόνιση/Ράβδος κατάστασης"
 
-#: src/mainwindow.c:536
+#: src/mainwindow.c:539
 #, fuzzy
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/Απεικόνιση/Ράβδος κατάστασης"
 
-#: src/mainwindow.c:539
+#: src/mainwindow.c:542
 msgid "/_View/Separate f_older tree"
 msgstr "/Απεικόνιση/Ξεχωριστό παράθυρο δομής καταλόγων"
 
-#: src/mainwindow.c:540
+#: src/mainwindow.c:543
 #, fuzzy
 msgid "/_View/Separate _message view"
 msgstr "/Απεικόνιση/Ξεχωριστή απεικόνιση μηνυμάτων"
 
-#: src/mainwindow.c:542
+#: src/mainwindow.c:545
 #, fuzzy
 msgid "/_View/_Sort"
 msgstr "/Απεικόνιση/Εμφάνιση του πηγαίου"
 
-#: src/mainwindow.c:543
+#: src/mainwindow.c:546
 #, fuzzy
 msgid "/_View/_Sort/by _number"
 msgstr "/Περίληψη/Ταξινόμηση/Ταξινόμηση κατά αριθμό"
 
-#: src/mainwindow.c:544
+#: src/mainwindow.c:547
 #, fuzzy
 msgid "/_View/_Sort/by s_ize"
 msgstr "/Περίληψη/Ταξινόμηση/Ταξινόμηση κατά μέγεθος"
 
-#: src/mainwindow.c:545
+#: src/mainwindow.c:548
 #, fuzzy
 msgid "/_View/_Sort/by _date"
 msgstr "/Περίληψη/Ταξινόμηση/Ταξινόμηση κατά ημερομηνία"
 
-#: src/mainwindow.c:546
+#: src/mainwindow.c:549
 #, fuzzy
 msgid "/_View/_Sort/by t_hread date"
 msgstr "/Περίληψη/Ταξινόμηση/Ταξινόμηση κατά ημερομηνία"
 
-#: src/mainwindow.c:547
+#: src/mainwindow.c:550
 #, fuzzy
 msgid "/_View/_Sort/by _from"
 msgstr "/Περίληψη/Ταξινόμηση/Ταξινόμηση κατά αποστολέα"
 
-#: src/mainwindow.c:548
+#: src/mainwindow.c:551
 #, fuzzy
 msgid "/_View/_Sort/by _recipient"
 msgstr "/Περίληψη/Ταξινόμηση/Ταξινόμηση κατά μέγεθος"
 
-#: src/mainwindow.c:549
+#: src/mainwindow.c:552
 #, fuzzy
 msgid "/_View/_Sort/by _subject"
 msgstr "/Περίληψη/Ταξινόμηση/Ταξινόμηση κατά θέμα"
 
-#: src/mainwindow.c:550
+#: src/mainwindow.c:553
 #, fuzzy
 msgid "/_View/_Sort/by _color label"
 msgstr "/Περίληψη/Ταξινόμηση/Ταξινόμηση κατά χρώμα ετικέτας"
 
-#: src/mainwindow.c:552
+#: src/mainwindow.c:555
 #, fuzzy
 msgid "/_View/_Sort/by _mark"
 msgstr "/Περίληψη/Ταξινόμηση/Ταξινόμηση κατά σήμανση"
 
-#: src/mainwindow.c:553
+#: src/mainwindow.c:556
 #, fuzzy
 msgid "/_View/_Sort/by _unread"
 msgstr "/Περίληψη/Ταξινόμηση/Ταξινόμηση κατά αδιάβαστα"
 
-#: src/mainwindow.c:554
+#: src/mainwindow.c:557
 #, fuzzy
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/Περίληψη/Ταξινόμηση/Ταξινόμηση κατά προσάρτηση"
 
-#: src/mainwindow.c:556
+#: src/mainwindow.c:559
 #, fuzzy
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/Περίληψη/Ταξινόμηση/Ταξινόμηση κατά αδιάβαστα"
 
-#: src/mainwindow.c:557 src/mainwindow.c:560
+#: src/mainwindow.c:560 src/mainwindow.c:563
 #, fuzzy
 msgid "/_View/_Sort/---"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/---"
 
-#: src/mainwindow.c:558
+#: src/mainwindow.c:561
 #, fuzzy
 msgid "/_View/_Sort/Ascending"
 msgstr "/Απεικόνιση/Εμφάνιση του πηγαίου"
 
-#: src/mainwindow.c:559
+#: src/mainwindow.c:562
 #, fuzzy
 msgid "/_View/_Sort/Descending"
 msgstr "/Απεικόνιση/Εμφάνιση του πηγαίου"
 
-#: src/mainwindow.c:561
+#: src/mainwindow.c:564
 #, fuzzy
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/Περίληψη/Ταξινόμηση/_Attract by subject"
 
-#: src/mainwindow.c:563
+#: src/mainwindow.c:566
 #, fuzzy
 msgid "/_View/Th_read view"
 msgstr "/Απεικόνιση/Απεικόνιση μηνυνάτων"
 
-#: src/mainwindow.c:564
+#: src/mainwindow.c:567
 #, fuzzy
 msgid "/_View/E_xpand all threads"
 msgstr "/Απεικόνιση/Εμφάνιση της πλήρους κεφαλίδας"
 
-#: src/mainwindow.c:565
+#: src/mainwindow.c:568
 #, fuzzy
 msgid "/_View/Co_llapse all threads"
 msgstr "/Απεικόνιση/Εμφάνιση της πλήρους κεφαλίδας"
 
-#: src/mainwindow.c:566
+#: src/mainwindow.c:569
 #, fuzzy
 msgid "/_View/Set display _item..."
 msgstr "/Περίληψη/Ορισμός εμφανιζόμενων στοιχείων..."
 
-#: src/mainwindow.c:569
+#: src/mainwindow.c:572
 #, fuzzy
 msgid "/_View/_Go to"
 msgstr "/Απεικόνιση/Κωδικοσύνολο"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:573
 #, fuzzy
 msgid "/_View/_Go to/_Prev message"
 msgstr "/Περίληψη/Πήγαινε στο/Προηγούμενο μήνυμα"
 
-#: src/mainwindow.c:571
+#: src/mainwindow.c:574
 #, fuzzy
 msgid "/_View/_Go to/_Next message"
 msgstr "/Περίληψη/Πήγαινε στο/Επόμενο μήνυμα"
 
-#: src/mainwindow.c:572 src/mainwindow.c:577 src/mainwindow.c:580
-#: src/mainwindow.c:585 src/mainwindow.c:590
+#: src/mainwindow.c:575 src/mainwindow.c:580 src/mainwindow.c:583
+#: src/mainwindow.c:588 src/mainwindow.c:593
 #, fuzzy
 msgid "/_View/_Go to/---"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/---"
 
-#: src/mainwindow.c:573
+#: src/mainwindow.c:576
 #, fuzzy
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/Περίληψη/Πήγαινε στο/Προηγούμενο αδιάβαστο μήνυμα"
 
-#: src/mainwindow.c:575
+#: src/mainwindow.c:578
 #, fuzzy
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/Περίληψη/Πήγαινε στο/Επόμενο αδιάβαστο μήνυμα"
 
-#: src/mainwindow.c:578
+#: src/mainwindow.c:581
 #, fuzzy
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/Περίληψη/Πήγαινε στο/Προηγούμενο μήνυμα"
 
-#: src/mainwindow.c:579
+#: src/mainwindow.c:582
 #, fuzzy
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/Περίληψη/Πήγαινε στο/Επόμενο μήνυμα"
 
-#: src/mainwindow.c:581
+#: src/mainwindow.c:584
 #, fuzzy
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/Περίληψη/Πήγαινε στο/Προηγούμενο σημειωμένο μήνυμα"
 
-#: src/mainwindow.c:583
+#: src/mainwindow.c:586
 #, fuzzy
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/Περίληψη/Πήγαινε στο/Επόμενο σημειωμένο μήνυμα"
 
-#: src/mainwindow.c:586
+#: src/mainwindow.c:589
 #, fuzzy
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/Περίληψη/Πήγαινε στο/Προηγούμενο μήνυμα με ετικέτα"
 
-#: src/mainwindow.c:588
+#: src/mainwindow.c:591
 #, fuzzy
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/Περίληψη/Πήγαινε στο/Επόμενο μήνυμα με ετικέτα"
 
-#: src/mainwindow.c:591
+#: src/mainwindow.c:594
 #, fuzzy
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/Περίληψη/Μετακίνηση σε άλλο κατάλογο..."
 
-#: src/mainwindow.c:600 src/messageview.c:159
+#: src/mainwindow.c:603 src/messageview.c:159
 #, fuzzy
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/Αυτόματη αναγνώριση"
 
-#: src/mainwindow.c:613 src/messageview.c:172
+#: src/mainwindow.c:616 src/messageview.c:172
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/Δυτικής Ευρώπης (ISO-8859-_1)"
 
-#: src/mainwindow.c:653 src/messageview.c:205
+#: src/mainwindow.c:662 src/messageview.c:210
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/Ιαπωνέζικο (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:655 src/messageview.c:207
+#: src/mainwindow.c:664 src/messageview.c:212
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/Ιαπωνέζικο (_EUC-JP)"
 
-#: src/mainwindow.c:657 src/messageview.c:209
+#: src/mainwindow.c:666 src/messageview.c:214
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/Ιαπωνέζικο (_Shift__JIS)"
 
-#: src/mainwindow.c:667 src/messageview.c:218
+#: src/mainwindow.c:676 src/messageview.c:223
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/Παραδοσιακό Κινεζικό (EUC-_TW)"
 
-#: src/mainwindow.c:669 src/messageview.c:220
+#: src/mainwindow.c:678 src/messageview.c:225
 #, fuzzy
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/Κινεζικό (ISO-2022-_CN)"
 
-#: src/mainwindow.c:675 src/messageview.c:225
+#: src/mainwindow.c:684 src/messageview.c:230
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/Κορεάτικο (ISO-2022-KR)"
 
-#: src/mainwindow.c:688 src/summaryview.c:449
+#: src/mainwindow.c:697 src/summaryview.c:451
 #, fuzzy
 msgid "/_View/Open in new _window"
 msgstr "/Άνοιγμα σε νέο παράθυρο"
 
-#: src/mainwindow.c:689 src/messageview.c:237
+#: src/mainwindow.c:698 src/messageview.c:242
 #, fuzzy
 msgid "/_View/Mess_age source"
 msgstr "/Απεικόνιση/Εμφάνιση του πηγαίου"
 
-#: src/mainwindow.c:690 src/messageview.c:238
+#: src/mainwindow.c:699 src/messageview.c:243
 msgid "/_View/Show all _header"
 msgstr "/Απεικόνιση/Εμφάνιση της πλήρους κεφαλίδας"
 
-#: src/mainwindow.c:692
+#: src/mainwindow.c:701
 #, fuzzy
 msgid "/_View/_Update summary"
 msgstr "/Απεικόνιση/Κωδικοσύνολο"
 
-#: src/mainwindow.c:694 src/messageview.c:240
+#: src/mainwindow.c:703 src/messageview.c:245
 msgid "/_Message"
 msgstr "/Μήνυμα"
 
-#: src/mainwindow.c:695
+#: src/mainwindow.c:704
 #, fuzzy
 msgid "/_Message/Recei_ve"
 msgstr "/Μήνυμα/Επαν-επεξεργασία"
 
-#: src/mainwindow.c:696
+#: src/mainwindow.c:705
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/Μήνυμα/Λήψη από όλους τους λογαριασμούς"
 
-#: src/mainwindow.c:698
+#: src/mainwindow.c:707
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/Μήνυμα/Λήψη από όλους τους λογαριασμούς"
 
-#: src/mainwindow.c:700
+#: src/mainwindow.c:709
 #, fuzzy
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/Μήνυμα/Αποστολή αργότερα"
 
-#: src/mainwindow.c:702
+#: src/mainwindow.c:711
 #, fuzzy
 msgid "/_Message/Recei_ve/---"
 msgstr "/Μήνυμα/Επαν-επεξεργασία"
 
-#: src/mainwindow.c:703
+#: src/mainwindow.c:712
 #, fuzzy
 msgid "/_Message/_Send queued messages"
 msgstr "/Μήνυμα/Αποστολή μηνυμάτων από την ουρά"
 
-#: src/mainwindow.c:704 src/mainwindow.c:706 src/mainwindow.c:713
-#: src/mainwindow.c:718 src/mainwindow.c:721 src/mainwindow.c:730
-#: src/mainwindow.c:732 src/mainwindow.c:735 src/messageview.c:243
-#: src/messageview.c:251 src/messageview.c:256
+#: src/mainwindow.c:713 src/mainwindow.c:715 src/mainwindow.c:722
+#: src/mainwindow.c:727 src/mainwindow.c:730 src/mainwindow.c:741
+#: src/mainwindow.c:743 src/mainwindow.c:746 src/messageview.c:248
+#: src/messageview.c:256 src/messageview.c:261
 msgid "/_Message/---"
 msgstr "/Μήνυμα/---"
 
-#: src/mainwindow.c:705 src/messageview.c:241
+#: src/mainwindow.c:714 src/messageview.c:246
 msgid "/_Message/Compose _new message"
 msgstr "/Μήνυμα/Σύνθεση νέου μηνύματος"
 
-#: src/mainwindow.c:707 src/messageview.c:244
+#: src/mainwindow.c:716 src/messageview.c:249
 msgid "/_Message/_Reply"
 msgstr "/Μήνυμα/Απάντηση"
 
-#: src/mainwindow.c:708
+#: src/mainwindow.c:717
 #, fuzzy
 msgid "/_Message/Repl_y to"
 msgstr "/Μήνυμα/Απάντηση σε"
 
-#: src/mainwindow.c:709 src/messageview.c:245
+#: src/mainwindow.c:718 src/messageview.c:250
 #, fuzzy
 msgid "/_Message/Repl_y to/_all"
 msgstr "/Μήνυμα/Απάντηση σε όλους"
 
-#: src/mainwindow.c:710 src/messageview.c:247
+#: src/mainwindow.c:719 src/messageview.c:252
 #, fuzzy
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/Μήνυμα/Απάντηση στον αποστολέα"
 
-#: src/mainwindow.c:711 src/messageview.c:249
+#: src/mainwindow.c:720 src/messageview.c:254
 #, fuzzy
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/Μήνυμα/Απάντηση σε όλους"
 
-#: src/mainwindow.c:714 src/messageview.c:252
+#: src/mainwindow.c:723 src/messageview.c:257
 msgid "/_Message/_Forward"
 msgstr "/Μήνυμα/Προώθηση"
 
-#: src/mainwindow.c:715 src/messageview.c:253
+#: src/mainwindow.c:724 src/messageview.c:258
 #, fuzzy
 msgid "/_Message/For_ward as attachment"
 msgstr "/Μήνυμα/Προώθηση σαν προσάρτηση"
 
-#: src/mainwindow.c:717 src/messageview.c:255
+#: src/mainwindow.c:726 src/messageview.c:260
 #, fuzzy
 msgid "/_Message/Redirec_t"
 msgstr "/Μήνυμα/Επαν-επεξεργασία"
 
-#: src/mainwindow.c:719
+#: src/mainwindow.c:728
 msgid "/_Message/M_ove..."
 msgstr "/Μήνυμα/Μετακίνηση..."
 
-#: src/mainwindow.c:720
+#: src/mainwindow.c:729
 msgid "/_Message/_Copy..."
 msgstr "/Μήνυμα/Αντιγραφή..."
 
-#: src/mainwindow.c:722
+#: src/mainwindow.c:731
 msgid "/_Message/_Mark"
 msgstr "/Μήνυμα/Σήμανση"
 
-#: src/mainwindow.c:723
+#: src/mainwindow.c:732
 msgid "/_Message/_Mark/_Mark"
 msgstr "/Mήνυμα/Σήμανση/Σήμανση"
 
-#: src/mainwindow.c:724
+#: src/mainwindow.c:733
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/Mήνυμα/Σήμανση/Αναίρεση σήμανσης"
 
-#: src/mainwindow.c:725
+#: src/mainwindow.c:734
 msgid "/_Message/_Mark/---"
 msgstr "/Mήνυμα/Σήμανση/---"
 
-#: src/mainwindow.c:726
+#: src/mainwindow.c:735
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/Mήνυμα/Σήμανση/Σήμανση ως αδιάβαστο"
 
-#: src/mainwindow.c:727
+#: src/mainwindow.c:736
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/Mήνυμα/Σήμανση/Σήμανση ως διαβασμένο"
 
-#: src/mainwindow.c:729
+#: src/mainwindow.c:738
+#, fuzzy
+msgid "/_Message/_Mark/Mark _thread as read"
+msgstr "/Mήνυμα/Σήμανση/Σήμανση ως διαβασμένο"
+
+#: src/mainwindow.c:740
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/Mήνυμα/Σήμανση/Σήμανση όλων ως διαβασμένα"
 
-#: src/mainwindow.c:731
+#: src/mainwindow.c:742
 msgid "/_Message/_Delete"
 msgstr "/Μήνυμα/Διαγραφή"
 
-#: src/mainwindow.c:733
+#: src/mainwindow.c:744
 #, fuzzy
 msgid "/_Message/Set as _junk mail"
 msgstr "/Μήνυμα/Λήψη νέων μηνυμάτων"
 
-#: src/mainwindow.c:734
+#: src/mainwindow.c:745
 #, fuzzy
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/Μήνυμα/Λήψη νέων μηνυμάτων"
 
-#: src/mainwindow.c:736 src/messageview.c:257
+#: src/mainwindow.c:747 src/messageview.c:262
 msgid "/_Message/Re-_edit"
 msgstr "/Μήνυμα/Επαν-επεξεργασία"
 
-#: src/mainwindow.c:740
+#: src/mainwindow.c:751
 #, fuzzy
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/Προσθήκη αποστολέα στον κατάλογο διευθύνσεων"
 
-#: src/mainwindow.c:743
+#: src/mainwindow.c:754
 #, fuzzy
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/Περίληψη/Φιλτράρισμα μηνυμάτων"
 
-#: src/mainwindow.c:745
+#: src/mainwindow.c:756
 #, fuzzy
 msgid "/_Tools/Filter _selected messages"
 msgstr "/Περίληψη/Φιλτράρισμα μηνυμάτων"
 
-#: src/mainwindow.c:747 src/messageview.c:264
+#: src/mainwindow.c:758 src/messageview.c:269
 #, fuzzy
 msgid "/_Tools/_Create filter rule"
 msgstr "/Περίληψη/Φιλτράρισμα μηνυμάτων"
 
-#: src/mainwindow.c:748 src/messageview.c:266
+#: src/mainwindow.c:759 src/messageview.c:271
 #, fuzzy
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/Περίληψη/Φιλτράρισμα μηνυμάτων"
 
-#: src/mainwindow.c:750 src/messageview.c:268
+#: src/mainwindow.c:761 src/messageview.c:273
 #, fuzzy
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/Περίληψη/Φιλτράρισμα μηνυμάτων"
 
-#: src/mainwindow.c:752 src/messageview.c:270
+#: src/mainwindow.c:763 src/messageview.c:275
 #, fuzzy
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/Περίληψη/Φιλτράρισμα μηνυμάτων"
 
-#: src/mainwindow.c:754 src/messageview.c:272
+#: src/mainwindow.c:765 src/messageview.c:277
 #, fuzzy
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/Περίληψη/Φιλτράρισμα μηνυμάτων"
 
-#: src/mainwindow.c:757
+#: src/mainwindow.c:768
 #, fuzzy
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/Περίληψη/Φιλτράρισμα μηνυμάτων"
 
-#: src/mainwindow.c:759
+#: src/mainwindow.c:770
 #, fuzzy
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/Περίληψη/Φιλτράρισμα μηνυμάτων"
 
-#: src/mainwindow.c:764
+#: src/mainwindow.c:775
 #, fuzzy
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/Περίληψη/Διαγραφή διπλών μηνυμάτων"
 
-#: src/mainwindow.c:767
+#: src/mainwindow.c:778
 #, fuzzy
 msgid "/_Tools/E_xecute"
 msgstr "/Εκτέλεση"
 
-#: src/mainwindow.c:769
+#: src/mainwindow.c:780
 #, fuzzy
 msgid "/_Tools/_Log window"
 msgstr "/Εργαλεία/Παράθυρο καταγραφής"
 
-#: src/mainwindow.c:771
+#: src/mainwindow.c:782
 msgid "/_Configuration"
 msgstr "/Ρυθμίσεις"
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:783
 msgid "/_Configuration/_Common preferences..."
 msgstr "/Ρυθμίσεις/Κοινές επιλογές..."
 
-#: src/mainwindow.c:774
+#: src/mainwindow.c:785
 msgid "/_Configuration/_Filter setting..."
 msgstr "/Ρυθμίσεις/Επιλογές φίλτρων..."
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:787
 #, fuzzy
 msgid "/_Configuration/_Template..."
 msgstr "/Ρυθμίσεις/Επιλογές φίλτρων..."
 
-#: src/mainwindow.c:777
+#: src/mainwindow.c:788
 #, fuzzy
 msgid "/_Configuration/_Actions..."
 msgstr "/Ρυθμίσεις/Επεξεργασία λογαριασμών..."
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:789
 msgid "/_Configuration/---"
 msgstr "/Ρυθμίσεις/---"
 
-#: src/mainwindow.c:779
+#: src/mainwindow.c:790
 #, fuzzy
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/Ρυθμίσεις/Επιλογές ανά λογαριασμό..."
 
-#: src/mainwindow.c:781
+#: src/mainwindow.c:792
 msgid "/_Configuration/Create _new account..."
 msgstr "/Ρυθμίσεις/Δημιουργία νέου λογαριασμού..."
 
-#: src/mainwindow.c:783
+#: src/mainwindow.c:794
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/Ρυθμίσεις/Επεξεργασία λογαριασμών..."
 
-#: src/mainwindow.c:785
+#: src/mainwindow.c:796
 msgid "/_Configuration/C_hange current account"
 msgstr "/Ρυθμίσεις/Αλλαγή τρέχοντος λογαριασμού"
 
-#: src/mainwindow.c:789
+#: src/mainwindow.c:800
 msgid "/_Help/_Manual"
 msgstr "/Βοήθεια/_Manual"
 
-#: src/mainwindow.c:790
+#: src/mainwindow.c:801
 msgid "/_Help/_Manual/_English"
 msgstr "/Βοήθεια/_Manual/Αγγλικό"
 
-#: src/mainwindow.c:791
+#: src/mainwindow.c:802
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/Βοήθεια/_Manual/Ιαπωνέζικο"
 
-#: src/mainwindow.c:792
+#: src/mainwindow.c:803
 #, fuzzy
 msgid "/_Help/_FAQ"
 msgstr "/Βοήθεια/Σχετικά"
 
-#: src/mainwindow.c:793
+#: src/mainwindow.c:804
 #, fuzzy
 msgid "/_Help/_FAQ/_English"
 msgstr "/Βοήθεια/_Manual/Αγγλικό"
 
-#: src/mainwindow.c:794
+#: src/mainwindow.c:805
 #, fuzzy
 msgid "/_Help/_FAQ/_German"
 msgstr "/Βοήθεια/_Manual/Αγγλικό"
 
-#: src/mainwindow.c:795
+#: src/mainwindow.c:806
 #, fuzzy
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/Βοήθεια/_Manual/Αγγλικό"
 
-#: src/mainwindow.c:796
+#: src/mainwindow.c:807
 msgid "/_Help/_FAQ/_French"
 msgstr ""
 
-#: src/mainwindow.c:797
+#: src/mainwindow.c:808
 #, fuzzy
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/Βοήθεια/_Manual/Αγγλικό"
 
-#: src/mainwindow.c:798
+#: src/mainwindow.c:809
 msgid "/_Help/---"
 msgstr "/Βοήθεια/---"
 
-#: src/mainwindow.c:841
+#: src/mainwindow.c:852
 msgid "Creating main window...\n"
 msgstr "Δημιουργώ το κυρίως παράθυρο...\n"
 
-#: src/mainwindow.c:1011
+#: src/mainwindow.c:1022
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "MainWindow: η κατανομή χρωμάτων %d απέτυχε\n"
 
-#: src/mainwindow.c:1108 src/summaryview.c:2258 src/summaryview.c:2343
-#: src/summaryview.c:3739 src/summaryview.c:3868 src/summaryview.c:4226
+#: src/mainwindow.c:1119 src/summaryview.c:2275 src/summaryview.c:2360
+#: src/summaryview.c:3896 src/summaryview.c:4025 src/summaryview.c:4383
 msgid "done.\n"
 msgstr "έγινε.\n"
 
-#: src/mainwindow.c:1235 src/mainwindow.c:1276 src/mainwindow.c:1301
+#: src/mainwindow.c:1246 src/mainwindow.c:1287 src/mainwindow.c:1312
 msgid "Untitled"
 msgstr "Χωρίς τίτλο"
 
-#: src/mainwindow.c:1302
+#: src/mainwindow.c:1313
 msgid "none"
 msgstr "κανένα"
 
-#: src/mainwindow.c:1355
+#: src/mainwindow.c:1366
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr ""
 
-#: src/mainwindow.c:1605
+#: src/mainwindow.c:1616
 msgid "Offline"
 msgstr ""
 
-#: src/mainwindow.c:1606
+#: src/mainwindow.c:1617
 msgid "You are offline. Go online?"
 msgstr ""
 
-#: src/mainwindow.c:1623
+#: src/mainwindow.c:1634
 #, fuzzy
 msgid "Empty all trash"
 msgstr "Άδειασμα διαγραμμένων"
 
-#: src/mainwindow.c:1624
+#: src/mainwindow.c:1635
 #, fuzzy
 msgid "Delete all messages in trash folders?"
 msgstr "Να αδειάσω όλα τα διαγραμμένα μηνύματα"
 
-#: src/mainwindow.c:1652
+#: src/mainwindow.c:1663
 msgid "Add mailbox"
 msgstr "Προσθήκη mailbox"
 
-#: src/mainwindow.c:1653
+#: src/mainwindow.c:1664
 #, fuzzy
 msgid ""
 "Specify the location of mailbox.\n"
@@ -3774,16 +3790,16 @@ msgstr ""
 "Αν οριστεί το υπάρχον mailbox, θα\n"
 "σαρωθεί αυτόματα."
 
-#: src/mainwindow.c:1659 src/setup.c:49
+#: src/mainwindow.c:1670 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Το mailbox `%s' υπάρχει ήδη"
 
-#: src/mainwindow.c:1664 src/setup.c:56
+#: src/mainwindow.c:1675 src/setup.c:56
 msgid "Mailbox"
 msgstr "Mailbox"
 
-#: src/mainwindow.c:1670 src/setup.c:62
+#: src/mainwindow.c:1681 src/setup.c:62
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3792,156 +3808,156 @@ msgstr ""
 "Η δημιουργία του mailbox απέτυχε.\n"
 "Ίσως κάποια αρχεία να υπάρχουν ήδη, ή δεν έχετε δικαίωμα να γράψετε εκεί. "
 
-#: src/mainwindow.c:2088
+#: src/mainwindow.c:2099
 msgid "Sylpheed - Folder View"
 msgstr ""
 
-#: src/mainwindow.c:2107
+#: src/mainwindow.c:2118
 msgid "Sylpheed - Message View"
 msgstr ""
 
-#: src/mainwindow.c:2259 src/summaryview.c:408
+#: src/mainwindow.c:2270 src/summaryview.c:408
 msgid "/_Reply"
 msgstr "/Απάντηση"
 
-#: src/mainwindow.c:2260
+#: src/mainwindow.c:2271
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "Απάντηση σε όλους"
 
-#: src/mainwindow.c:2261
+#: src/mainwindow.c:2272
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/Απάντηση στον αποστολέα"
 
-#: src/mainwindow.c:2262
+#: src/mainwindow.c:2273
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/Απάντηση σε όλους"
 
-#: src/mainwindow.c:2267 src/summaryview.c:415
+#: src/mainwindow.c:2278 src/summaryview.c:415
 msgid "/_Forward"
 msgstr "/Προώθηση"
 
-#: src/mainwindow.c:2268 src/summaryview.c:416
+#: src/mainwindow.c:2279 src/summaryview.c:416
 #, fuzzy
 msgid "/For_ward as attachment"
 msgstr "/Προώθηση ως προσάρτηση"
 
-#: src/mainwindow.c:2269 src/summaryview.c:417
+#: src/mainwindow.c:2280 src/summaryview.c:417
 #, fuzzy
 msgid "/Redirec_t"
 msgstr "/Επαν-επεξεργασία"
 
-#: src/mainwindow.c:2305
+#: src/mainwindow.c:2316
 msgid "Get"
 msgstr "Λήψη"
 
-#: src/mainwindow.c:2306
+#: src/mainwindow.c:2317
 msgid "Incorporate new mail"
 msgstr "Λήψη νέου mail"
 
-#: src/mainwindow.c:2313
+#: src/mainwindow.c:2324
 msgid "Get all"
 msgstr ""
 "Λήψη\n"
 "όλων"
 
-#: src/mainwindow.c:2314
+#: src/mainwindow.c:2325
 msgid "Incorporate new mail of all accounts"
 msgstr "Λήψη νέου mail από όλους τους λογαριασμούς"
 
-#: src/mainwindow.c:2325
+#: src/mainwindow.c:2336
 msgid "Send queued message(s)"
 msgstr "Αποστολή όλων των μηνυμάτων από την ουρά"
 
-#: src/mainwindow.c:2335 src/prefs_account_dialog.c:530
+#: src/mainwindow.c:2346 src/prefs_account_dialog.c:530
 #: src/prefs_common_dialog.c:663 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "Σύνθεση"
 
-#: src/mainwindow.c:2336
+#: src/mainwindow.c:2347
 msgid "Compose new message"
 msgstr "Σύνθεση νέου μηνύματος"
 
-#: src/mainwindow.c:2344 src/prefs_common_dialog.c:975
+#: src/mainwindow.c:2355 src/prefs_common_dialog.c:975
 msgid "Reply"
 msgstr "Απάντηση"
 
-#: src/mainwindow.c:2345 src/mainwindow.c:2358
+#: src/mainwindow.c:2356 src/mainwindow.c:2369
 msgid "Reply to the message"
 msgstr "Απάντηση στο μήνυμα"
 
-#: src/mainwindow.c:2362
+#: src/mainwindow.c:2373
 msgid "Reply all"
 msgstr ""
 "Απάντηση\n"
 "όλων"
 
-#: src/mainwindow.c:2363
+#: src/mainwindow.c:2374
 msgid "Reply to all"
 msgstr "Απάντηση σε όλους"
 
-#: src/mainwindow.c:2371 src/prefs_filter_edit.c:672
+#: src/mainwindow.c:2382 src/prefs_filter_edit.c:672
 msgid "Forward"
 msgstr "Προώθηση"
 
-#: src/mainwindow.c:2372 src/mainwindow.c:2385
+#: src/mainwindow.c:2383 src/mainwindow.c:2396
 msgid "Forward the message"
 msgstr "Προώθηση μηνύματος"
 
-#: src/mainwindow.c:2392
+#: src/mainwindow.c:2403
 msgid "Delete the message"
 msgstr "Διαγραφή μηνύματος"
 
-#: src/mainwindow.c:2401
+#: src/mainwindow.c:2412
 #, fuzzy
 msgid "Set as junk mail"
 msgstr " Θέσε ως σύνηθη λογαριασμό "
 
-#: src/mainwindow.c:2410
+#: src/mainwindow.c:2421
 msgid "Execute"
 msgstr "Εκτέλεση"
 
-#: src/mainwindow.c:2411
+#: src/mainwindow.c:2422
 msgid "Execute marked process"
 msgstr "Εκτέλεση σημειωμένης εργασίας"
 
-#: src/mainwindow.c:2421
+#: src/mainwindow.c:2432
 msgid "Next unread message"
 msgstr "Επόμενο αδιάβαστο μήνυμα"
 
-#: src/mainwindow.c:2433
+#: src/mainwindow.c:2444
 msgid "Prefs"
 msgstr "Επιλογές"
 
-#: src/mainwindow.c:2434
+#: src/mainwindow.c:2445
 #, fuzzy
 msgid "Common preferences"
 msgstr "Κοινές Επιλογές"
 
-#: src/mainwindow.c:2442 src/prefs_folder_item.c:289
+#: src/mainwindow.c:2453 src/prefs_folder_item.c:289
 #: src/prefs_folder_item.c:300 src/progressdialog.c:128
 msgid "Account"
 msgstr "Λογ/σμός"
 
-#: src/mainwindow.c:2443
+#: src/mainwindow.c:2454
 msgid "Account setting"
 msgstr "Ρυθμίσεις λογαριασμού"
 
-#: src/mainwindow.c:2615
+#: src/mainwindow.c:2626
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 
-#: src/mainwindow.c:2626
+#: src/mainwindow.c:2637
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 
-#: src/mainwindow.c:2892
+#: src/mainwindow.c:2903
 msgid "Exit"
 msgstr "Έξοδος"
 
-#: src/mainwindow.c:2892
+#: src/mainwindow.c:2903
 msgid "Exit this program?"
 msgstr "Έξοδος από αυτό το πρόγραμμα;"
 
@@ -3981,47 +3997,47 @@ msgstr "Έφτασα το τέλος της λίστας. Να συνεχίσω
 msgid "Search finished"
 msgstr "Η αναζήτηση τελείωσε"
 
-#: src/messageview.c:261
+#: src/messageview.c:266
 #, fuzzy
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/Προσθήκη αποστολέα στον κατάλογο διευθύνσεων"
 
-#: src/messageview.c:291
+#: src/messageview.c:296
 msgid "Creating message view...\n"
 msgstr "Δημιουργώ απεικόνιση μηνύματος...\n"
 
-#: src/messageview.c:316
+#: src/messageview.c:321
 msgid "Text"
 msgstr "Κείμενο"
 
-#: src/messageview.c:321
+#: src/messageview.c:326
 #, fuzzy
 msgid "Attachments"
 msgstr "Προσάρτηση"
 
-#: src/messageview.c:371
+#: src/messageview.c:376
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:669 src/summaryview.c:3268
+#: src/messageview.c:674 src/summaryview.c:3425
 #, fuzzy, c-format
 msgid "Can't save the file `%s'."
 msgstr "Δεν μπορώ να διαγράψω τον κατάλογο `%s'."
 
-#: src/messageview.c:728 src/summaryview.c:3291
+#: src/messageview.c:733 src/summaryview.c:3448
 msgid "The message will be printed with the following command:"
 msgstr ""
 
-#: src/messageview.c:729 src/summaryview.c:3292
+#: src/messageview.c:734 src/summaryview.c:3449
 #, fuzzy
 msgid "(Default print command)"
 msgstr "Εκτέλεση"
 
-#: src/messageview.c:731 src/prefs_common_dialog.c:2304 src/summaryview.c:3294
+#: src/messageview.c:736 src/prefs_common_dialog.c:2304 src/summaryview.c:3451
 msgid "Print"
 msgstr "Εκτύπωση"
 
-#: src/messageview.c:740 src/summaryview.c:3303
+#: src/messageview.c:745 src/summaryview.c:3460
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -4933,8 +4949,8 @@ msgstr ""
 msgid "Expand threads"
 msgstr "/Απεικόνιση/Εμφάνιση της πλήρους κεφαλίδας"
 
-#: src/prefs_common_dialog.c:1413 src/prefs_common_dialog.c:2713
-#: src/prefs_common_dialog.c:2751
+#: src/prefs_common_dialog.c:1413 src/prefs_common_dialog.c:2716
+#: src/prefs_common_dialog.c:2754
 msgid "Date format"
 msgstr "Μορφοποίηση ημερομηνίας"
 
@@ -5239,8 +5255,8 @@ msgstr ""
 msgid "Web browser"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2288 src/prefs_common_dialog.c:3775
-#: src/prefs_common_dialog.c:3796
+#: src/prefs_common_dialog.c:2288 src/prefs_common_dialog.c:3778
+#: src/prefs_common_dialog.c:3799
 #, fuzzy
 msgid "(Default browser)"
 msgstr "Προκαθορισμένο κλειδί υπογραφής"
@@ -5316,216 +5332,226 @@ msgstr "Ελληνική (ISO-8859-7)"
 
 #: src/prefs_common_dialog.c:2495
 #, fuzzy
+msgid "Arabic (ISO-8859-6)"
+msgstr "Βαλτικής (ISO-8859-4)"
+
+#: src/prefs_common_dialog.c:2496
+#, fuzzy
+msgid "Arabic (Windows-1256)"
+msgstr "Κυριλλική (Windows-1251)"
+
+#: src/prefs_common_dialog.c:2498
+#, fuzzy
 msgid "Hebrew (ISO-8859-8)"
 msgstr "Ελληνική (ISO-8859-7)"
 
-#: src/prefs_common_dialog.c:2496
+#: src/prefs_common_dialog.c:2499
 #, fuzzy
 msgid "Hebrew (Windows-1255)"
 msgstr "Κυριλλική (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2498
+#: src/prefs_common_dialog.c:2501
 msgid "Turkish (ISO-8859-9)"
 msgstr "Τουρκική (ISO-8859-9)"
 
-#: src/prefs_common_dialog.c:2500
+#: src/prefs_common_dialog.c:2503
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Κυριλλική (ISO-8859-5)"
 
-#: src/prefs_common_dialog.c:2501
+#: src/prefs_common_dialog.c:2504
 msgid "Cyrillic (KOI8-R)"
 msgstr "Κυριλλική (KOI8-R)"
 
-#: src/prefs_common_dialog.c:2502
+#: src/prefs_common_dialog.c:2505
 msgid "Cyrillic (KOI8-U)"
 msgstr "Κυριλλική (KOI8-U)"
 
-#: src/prefs_common_dialog.c:2503
+#: src/prefs_common_dialog.c:2506
 msgid "Cyrillic (Windows-1251)"
 msgstr "Κυριλλική (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2505
+#: src/prefs_common_dialog.c:2508
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Ιαπωνέζικη (ISO-2022-JP)"
 
-#: src/prefs_common_dialog.c:2507
+#: src/prefs_common_dialog.c:2510
 msgid "Japanese (EUC-JP)"
 msgstr "Ιαπωνέζικη (EUC-JP)"
 
-#: src/prefs_common_dialog.c:2508
+#: src/prefs_common_dialog.c:2511
 msgid "Japanese (Shift_JIS)"
 msgstr "Ιαπωνέζικη (Shift_JIS)"
 
-#: src/prefs_common_dialog.c:2511
+#: src/prefs_common_dialog.c:2514
 msgid "Simplified Chinese (GB2312)"
 msgstr "Απλοποιημένη Κινεζική (GB2312)"
 
-#: src/prefs_common_dialog.c:2512
+#: src/prefs_common_dialog.c:2515
 #, fuzzy
 msgid "Simplified Chinese (GBK)"
 msgstr "Απλοποιημένη Κινεζική (GB2312)"
 
-#: src/prefs_common_dialog.c:2513
+#: src/prefs_common_dialog.c:2516
 msgid "Traditional Chinese (Big5)"
 msgstr "Παραδοσιακή Κινεζική (Big5)"
 
-#: src/prefs_common_dialog.c:2515
+#: src/prefs_common_dialog.c:2518
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Παραδοσιακή Κινεζική (EUC-TW)"
 
-#: src/prefs_common_dialog.c:2516
+#: src/prefs_common_dialog.c:2519
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Κινεζική (ISO-2022-CN)"
 
-#: src/prefs_common_dialog.c:2519
+#: src/prefs_common_dialog.c:2522
 msgid "Korean (EUC-KR)"
 msgstr "Κορεατική (EUC-KR)"
 
-#: src/prefs_common_dialog.c:2521
+#: src/prefs_common_dialog.c:2524
 msgid "Thai (TIS-620)"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2522
+#: src/prefs_common_dialog.c:2525
 msgid "Thai (Windows-874)"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2689
+#: src/prefs_common_dialog.c:2692
 msgid "the full abbreviated weekday name"
 msgstr "η συντομογραφία ημέρας της εβδομάδας"
 
-#: src/prefs_common_dialog.c:2690
+#: src/prefs_common_dialog.c:2693
 msgid "the full weekday name"
 msgstr "το πλήρες όνομα της μέρας της εβδομάδας"
 
-#: src/prefs_common_dialog.c:2691
+#: src/prefs_common_dialog.c:2694
 msgid "the abbreviated month name"
 msgstr "η συντομογραφία του μήνα"
 
-#: src/prefs_common_dialog.c:2692
+#: src/prefs_common_dialog.c:2695
 msgid "the full month name"
 msgstr "το πλήρες όνομα του μήνα"
 
-#: src/prefs_common_dialog.c:2693
+#: src/prefs_common_dialog.c:2696
 msgid "the preferred date and time for the current locale"
 msgstr "η προτιμώμενη ημερομηνία και ώρα για το τρέχον locale"
 
-#: src/prefs_common_dialog.c:2694
+#: src/prefs_common_dialog.c:2697
 msgid "the century number (year/100)"
 msgstr "ο αριθμός αιώνα (έτη / 100)"
 
-#: src/prefs_common_dialog.c:2695
+#: src/prefs_common_dialog.c:2698
 msgid "the day of the month as a decimal number"
 msgstr "η μέρα του μήνα ως δεκαδικός αριθμός"
 
-#: src/prefs_common_dialog.c:2696
+#: src/prefs_common_dialog.c:2699
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "η ώρα ως δεκαδικός αριθμός χρησιμοποιώντας 24ωρο ρολόι"
 
-#: src/prefs_common_dialog.c:2697
+#: src/prefs_common_dialog.c:2700
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "η ώρα ως δεκαδικός αριθμός χρησιμοποιώντας 12ωρο ρολόι"
 
-#: src/prefs_common_dialog.c:2698
+#: src/prefs_common_dialog.c:2701
 msgid "the day of the year as a decimal number"
 msgstr "η μέρα του έτους ως δεκαδικός αριθμός"
 
-#: src/prefs_common_dialog.c:2699
+#: src/prefs_common_dialog.c:2702
 msgid "the month as a decimal number"
 msgstr "ο μήνας ως δεκαδικός αριθμός"
 
-#: src/prefs_common_dialog.c:2700
+#: src/prefs_common_dialog.c:2703
 msgid "the minute as a decimal number"
 msgstr "το λεπτό ως δεκαδικός αριθμός"
 
-#: src/prefs_common_dialog.c:2701
+#: src/prefs_common_dialog.c:2704
 msgid "either AM or PM"
 msgstr "είτε ΠΜ ή ΜΜ"
 
-#: src/prefs_common_dialog.c:2702
+#: src/prefs_common_dialog.c:2705
 msgid "the second as a decimal number"
 msgstr "το δευτερόλεπτο ως δεκαδικός αριθμός"
 
-#: src/prefs_common_dialog.c:2703
+#: src/prefs_common_dialog.c:2706
 msgid "the day of the week as a decimal number"
 msgstr "η μέρα της εβδομάδας ως δεκαδικός αριθμός"
 
-#: src/prefs_common_dialog.c:2704
+#: src/prefs_common_dialog.c:2707
 msgid "the preferred date for the current locale"
 msgstr "η προτιμώμενη ημερομηνία για το τρέχον locale"
 
-#: src/prefs_common_dialog.c:2705
+#: src/prefs_common_dialog.c:2708
 msgid "the last two digits of a year"
 msgstr "τα τελευταία δύο ψηφία του έτους"
 
-#: src/prefs_common_dialog.c:2706
+#: src/prefs_common_dialog.c:2709
 msgid "the year as a decimal number"
 msgstr "το έτος ως δεκαδικός αριθμός"
 
-#: src/prefs_common_dialog.c:2707
+#: src/prefs_common_dialog.c:2710
 msgid "the time zone or name or abbreviation"
 msgstr "Η ζώνη ώρας ή όνομα, ή συνμτομογραφία"
 
-#: src/prefs_common_dialog.c:2728
+#: src/prefs_common_dialog.c:2731
 msgid "Specifier"
 msgstr "Προσδιοριστής"
 
-#: src/prefs_common_dialog.c:2729
+#: src/prefs_common_dialog.c:2732
 msgid "Description"
 msgstr "Περιγραφή"
 
-#: src/prefs_common_dialog.c:2769
+#: src/prefs_common_dialog.c:2772
 msgid "Example"
 msgstr "Παράδειγμα"
 
-#: src/prefs_common_dialog.c:2850
+#: src/prefs_common_dialog.c:2853
 msgid "Set message colors"
 msgstr "Όρισμος χρωμάτων μηνύματος"
 
-#: src/prefs_common_dialog.c:2858
+#: src/prefs_common_dialog.c:2861
 msgid "Colors"
 msgstr "Χρώματα"
 
-#: src/prefs_common_dialog.c:2892
+#: src/prefs_common_dialog.c:2895
 msgid "Quoted Text - First Level"
 msgstr "Παρατιθέμενο κείμενο - Πρώτο επίπεδο"
 
-#: src/prefs_common_dialog.c:2898
+#: src/prefs_common_dialog.c:2901
 msgid "Quoted Text - Second Level"
 msgstr "Παρατιθέμενο κείμενο - Δεύτερο επίπεδο"
 
-#: src/prefs_common_dialog.c:2904
+#: src/prefs_common_dialog.c:2907
 msgid "Quoted Text - Third Level"
 msgstr "Παρατιθέμενο κείμενο - Τρίτο επίπεδο"
 
-#: src/prefs_common_dialog.c:2910
+#: src/prefs_common_dialog.c:2913
 msgid "URI link"
 msgstr "Σύνδεσμος URI"
 
-#: src/prefs_common_dialog.c:2917
+#: src/prefs_common_dialog.c:2920
 msgid "Recycle quote colors"
 msgstr "Ανακύκλωση χρωμάτων παράθεσης"
 
-#: src/prefs_common_dialog.c:2984
+#: src/prefs_common_dialog.c:2987
 msgid "Pick color for quotation level 1"
 msgstr "Επιλογή χρώματος πρώτου επιπέδου παράθεσης"
 
-#: src/prefs_common_dialog.c:2987
+#: src/prefs_common_dialog.c:2990
 msgid "Pick color for quotation level 2"
 msgstr "Επιλογή χρώματος δεύτερου επιπέδου παράθεσης"
 
-#: src/prefs_common_dialog.c:2990
+#: src/prefs_common_dialog.c:2993
 msgid "Pick color for quotation level 3"
 msgstr "Επιλογή χρώματος τρίτου επιπέδου παράθεσης"
 
-#: src/prefs_common_dialog.c:2993
+#: src/prefs_common_dialog.c:2996
 msgid "Pick color for URI"
 msgstr "Επιλογή χρώματος για URI"
 
-#: src/prefs_common_dialog.c:3133
+#: src/prefs_common_dialog.c:3136
 msgid "Description of symbols"
 msgstr "Περιγραφή των συμβόλων"
 
-#: src/prefs_common_dialog.c:3189
+#: src/prefs_common_dialog.c:3192
 #, fuzzy
 msgid ""
 "Date\n"
@@ -5550,11 +5576,11 @@ msgstr ""
 "Message-ID\n"
 "%"
 
-#: src/prefs_common_dialog.c:3202
+#: src/prefs_common_dialog.c:3205
 msgid "If x is set, displays expr"
 msgstr ""
 
-#: src/prefs_common_dialog.c:3206
+#: src/prefs_common_dialog.c:3209
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -5563,7 +5589,7 @@ msgid ""
 "Literal %"
 msgstr ""
 
-#: src/prefs_common_dialog.c:3214
+#: src/prefs_common_dialog.c:3217
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -5571,22 +5597,22 @@ msgid ""
 "Literal closing curly brace"
 msgstr ""
 
-#: src/prefs_common_dialog.c:3260
+#: src/prefs_common_dialog.c:3263
 #, fuzzy
 msgid "Key bindings"
 msgstr "Στέλνω"
 
-#: src/prefs_common_dialog.c:3273
+#: src/prefs_common_dialog.c:3276
 #, fuzzy
 msgid "Select the preset of key bindings."
 msgstr "Στέλνω"
 
-#: src/prefs_common_dialog.c:3283 src/prefs_common_dialog.c:3607
+#: src/prefs_common_dialog.c:3286 src/prefs_common_dialog.c:3610
 #, fuzzy
 msgid "Default"
 msgstr "Προκαθορισμένο κλειδί υπογραφής"
 
-#: src/prefs_common_dialog.c:3286 src/prefs_common_dialog.c:3616
+#: src/prefs_common_dialog.c:3289 src/prefs_common_dialog.c:3619
 msgid "Old Sylpheed"
 msgstr ""
 
@@ -5711,7 +5737,7 @@ msgstr ""
 msgid "Age"
 msgstr ""
 
-#: src/prefs_filter_edit.c:501 src/summaryview.c:510
+#: src/prefs_filter_edit.c:501 src/summaryview.c:512
 #, fuzzy
 msgid "Marked"
 msgstr "Σήμανση"
@@ -5968,17 +5994,17 @@ msgid "Attachment"
 msgstr "Προσάρτηση"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73 src/query_search.c:371 src/summaryview.c:4733
+#: src/prefs_summary_column.c:73 src/query_search.c:371 src/summaryview.c:4890
 msgid "Subject"
 msgstr "Θέμα"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/query_search.c:372 src/summaryview.c:4736
+#: src/prefs_summary_column.c:74 src/query_search.c:372 src/summaryview.c:4893
 msgid "From"
 msgstr "Από"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/query_search.c:373 src/summaryview.c:4738
+#: src/prefs_summary_column.c:75 src/query_search.c:373 src/summaryview.c:4895
 msgid "Date"
 msgstr "Ημερομηνία"
 
@@ -6089,7 +6115,7 @@ msgstr "\tΑναζήτηση στα απροσπέλαστα μηνύματα...
 msgid "_Save as search folder"
 msgstr "Επιλογή καταλόγου"
 
-#: src/query_search.c:512 src/subscribedialog.c:523 src/summaryview.c:840
+#: src/query_search.c:512 src/subscribedialog.c:523 src/summaryview.c:842
 msgid "Done."
 msgstr "Τέλος"
 
@@ -6103,7 +6129,7 @@ msgstr "Σάρωση καταλόγου %s ..."
 msgid "Searching %s (%d / %d)..."
 msgstr "Φιλτράρω..."
 
-#: src/query_search.c:645 src/summaryview.c:2048
+#: src/query_search.c:645 src/summaryview.c:2051
 msgid "(No Date)"
 msgstr "(Χωρίς ημερομηνία)"
 
@@ -6488,318 +6514,323 @@ msgid "/_Mark/Mark as rea_d"
 msgstr "/Σήμανση/Σήμανση ως διαβασμένο"
 
 #: src/summaryview.c:429
+#, fuzzy
+msgid "/_Mark/Mark _thread as read"
+msgstr "/Σήμανση/Σήμανση ως διαβασμένο"
+
+#: src/summaryview.c:431
 msgid "/_Mark/Mark all _read"
 msgstr "/Σήμανση/Σήμανση όλων ως διαβασμένα"
 
-#: src/summaryview.c:430
+#: src/summaryview.c:432
 msgid "/Color la_bel"
 msgstr "/Χρωματική ταμπέλα"
 
-#: src/summaryview.c:434
+#: src/summaryview.c:436
 msgid "/Re-_edit"
 msgstr "/Επαν-επεξεργασία"
 
-#: src/summaryview.c:436
+#: src/summaryview.c:438
 #, fuzzy
 msgid "/Add sender to address boo_k..."
 msgstr "/Προσθήκη αποστολέα στον κατάλογο διευθύνσεων"
 
-#: src/summaryview.c:438
+#: src/summaryview.c:440
 #, fuzzy
 msgid "/Create f_ilter rule"
 msgstr "/Περίληψη/Φιλτράρισμα μηνυμάτων"
 
-#: src/summaryview.c:439
+#: src/summaryview.c:441
 #, fuzzy
 msgid "/Create f_ilter rule/_Automatically"
 msgstr "/Περίληψη/Φιλτράρισμα μηνυμάτων"
 
-#: src/summaryview.c:441
+#: src/summaryview.c:443
 #, fuzzy
 msgid "/Create f_ilter rule/by _From"
 msgstr "/Περίληψη/Φιλτράρισμα μηνυμάτων"
 
-#: src/summaryview.c:443
+#: src/summaryview.c:445
 #, fuzzy
 msgid "/Create f_ilter rule/by _To"
 msgstr "/Περίληψη/Φιλτράρισμα μηνυμάτων"
 
-#: src/summaryview.c:445
+#: src/summaryview.c:447
 #, fuzzy
 msgid "/Create f_ilter rule/by _Subject"
 msgstr "/Περίληψη/Φιλτράρισμα μηνυμάτων"
 
-#: src/summaryview.c:451
+#: src/summaryview.c:453
 #, fuzzy
 msgid "/_View/_Source"
 msgstr "/Απεικόνιση/Εμφάνιση του πηγαίου"
 
-#: src/summaryview.c:452
+#: src/summaryview.c:454
 #, fuzzy
 msgid "/_View/All _header"
 msgstr "/Απεικόνιση/Εμφάνιση της πλήρους κεφαλίδας"
 
-#: src/summaryview.c:454
+#: src/summaryview.c:456
 msgid "/_Print..."
 msgstr "/Εκτύπωση..."
 
-#: src/summaryview.c:486
+#: src/summaryview.c:488
 msgid "Creating summary view...\n"
 msgstr "Δημιουργία απεικόνισης περίληψης...\n"
 
-#: src/summaryview.c:508
+#: src/summaryview.c:510
 msgid "All"
 msgstr ""
 
-#: src/summaryview.c:511
+#: src/summaryview.c:513
 #, fuzzy
 msgid "Have color label"
 msgstr "/Χρωματική ταμπέλα"
 
-#: src/summaryview.c:512
+#: src/summaryview.c:514
 #, fuzzy
 msgid "Have attachment"
 msgstr "Προσάρτηση"
 
-#: src/summaryview.c:521
+#: src/summaryview.c:523
 #, fuzzy
 msgid "Search:"
 msgstr "Αναζήτηση"
 
-#: src/summaryview.c:535
+#: src/summaryview.c:537
 msgid "Search for Subject or From"
 msgstr ""
 
-#: src/summaryview.c:702
+#: src/summaryview.c:704
 msgid "Process mark"
 msgstr ""
 
-#: src/summaryview.c:703
+#: src/summaryview.c:705
 msgid "Some marks are left. Process it?"
 msgstr "Μερικές σημάνσεις έχουν απομείνει. Να επεξεργαστούν;"
 
-#: src/summaryview.c:749
+#: src/summaryview.c:751
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "Σάρωση καταλόγου (%s)..."
 
-#: src/summaryview.c:1292
+#: src/summaryview.c:1295
 #, fuzzy
 msgid "_Search again"
 msgstr "Η αναζήτηση απέτυχε"
 
-#: src/summaryview.c:1313 src/summaryview.c:1322
+#: src/summaryview.c:1316 src/summaryview.c:1325
 msgid "No more unread messages"
 msgstr "Δεν υπάρχουν αδιάβαστα μηνύματα"
 
-#: src/summaryview.c:1314
+#: src/summaryview.c:1317
 msgid "No unread message found. Search from the end?"
 msgstr "Δεν βρέθηκαν αδιάβαστα μηνύματα. Να ψάξω από το τέλος;"
 
-#: src/summaryview.c:1316
+#: src/summaryview.c:1319
 msgid "No unread messages."
 msgstr "Δεν υπάρχουν αδιάβαστα μηνύματα"
 
-#: src/summaryview.c:1323
+#: src/summaryview.c:1326
 msgid "No unread message found. Go to next folder?"
 msgstr "Δεν βρέθηκαν αδιάβαστα μηνύματα. Να πάω στον επόμενο κατάλογο;"
 
-#: src/summaryview.c:1331 src/summaryview.c:1340
+#: src/summaryview.c:1334 src/summaryview.c:1343
 #, fuzzy
 msgid "No more new messages"
 msgstr "Δεν υπάρχουν αδιάβαστα μηνύματα"
 
-#: src/summaryview.c:1332
+#: src/summaryview.c:1335
 #, fuzzy
 msgid "No new message found. Search from the end?"
 msgstr "Δεν βρέθηκαν αδιάβαστα μηνύματα. Να ψάξω από το τέλος;"
 
-#: src/summaryview.c:1334
+#: src/summaryview.c:1337
 #, fuzzy
 msgid "No new messages."
 msgstr "Δεν υπάρχουν αδιάβαστα μηνύματα"
 
-#: src/summaryview.c:1341
+#: src/summaryview.c:1344
 #, fuzzy
 msgid "No new message found. Go to next folder?"
 msgstr "Δεν βρέθηκαν αδιάβαστα μηνύματα. Να πάω στον επόμενο κατάλογο;"
 
-#: src/summaryview.c:1349 src/summaryview.c:1358
+#: src/summaryview.c:1352 src/summaryview.c:1361
 msgid "No more marked messages"
 msgstr "Δεν υπάρχουν άλλα σημειωμένα μηνύματα"
 
-#: src/summaryview.c:1350
+#: src/summaryview.c:1353
 msgid "No marked message found. Search from the end?"
 msgstr "Δεν βρέθηκαν σημειωμένα μηνύματα. Να ψάξω από το τέλος;"
 
-#: src/summaryview.c:1352 src/summaryview.c:1361
+#: src/summaryview.c:1355 src/summaryview.c:1364
 msgid "No marked messages."
 msgstr "Δεν υπάρχουν σημειωμένα μηνύματα."
 
-#: src/summaryview.c:1359
+#: src/summaryview.c:1362
 msgid "No marked message found. Search from the beginning?"
 msgstr "Δεν βρέθηκαν σημειωμένα μηνύματα. Να ψάξω από την αρχή;"
 
-#: src/summaryview.c:1367 src/summaryview.c:1376
+#: src/summaryview.c:1370 src/summaryview.c:1379
 msgid "No more labeled messages"
 msgstr "Δεν υπάρχουν άλλα μηνύματα με ετικέτες"
 
-#: src/summaryview.c:1368
+#: src/summaryview.c:1371
 msgid "No labeled message found. Search from the end?"
 msgstr "Δεν βρέθηκαν μηνύματα με ετικέτες. Να ψάξω από το τέλος;"
 
-#: src/summaryview.c:1370 src/summaryview.c:1379
+#: src/summaryview.c:1373 src/summaryview.c:1382
 msgid "No labeled messages."
 msgstr "Δεν υπάρχουν μηνύματα με ετικέτες."
 
-#: src/summaryview.c:1377
+#: src/summaryview.c:1380
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Δεν βρέθηκαν μηνύματα με ετικέτες. Να ψάξω από την αρχή;"
 
-#: src/summaryview.c:1693
+#: src/summaryview.c:1696
 msgid "Attracting messages by subject..."
 msgstr ""
 
-#: src/summaryview.c:1887
+#: src/summaryview.c:1890
 #, c-format
 msgid "%d deleted"
 msgstr "%d διαγράφηκαν"
 
-#: src/summaryview.c:1891
+#: src/summaryview.c:1894
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d μετακινήθηκαν"
 
-#: src/summaryview.c:1892 src/summaryview.c:1897
+#: src/summaryview.c:1895 src/summaryview.c:1900
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:1896
+#: src/summaryview.c:1899
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d αντιγράφηκαν"
 
-#: src/summaryview.c:1911
+#: src/summaryview.c:1914
 msgid " item(s) selected"
 msgstr " μήνυμα(τα) επιλέχθηκε(αν)"
 
-#: src/summaryview.c:1933
+#: src/summaryview.c:1936
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d νέα, %d αδιάβαστα, %d συνολικά (%s)"
 
-#: src/summaryview.c:1937
+#: src/summaryview.c:1940
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d νέα, %d αδιάβαστα, %d συνολικά"
 
-#: src/summaryview.c:1971
+#: src/summaryview.c:1974
 msgid "Sorting summary..."
 msgstr "Περίληψη ταξινόμησης..."
 
-#: src/summaryview.c:2194
+#: src/summaryview.c:2211
 msgid "\tSetting summary from message data..."
 msgstr "\tΟρισμός περίληψης από τα δεδομένα του μηνύματος..."
 
-#: src/summaryview.c:2196
+#: src/summaryview.c:2213
 msgid "Setting summary from message data..."
 msgstr "Ορισμός περίληψης από τα δεδομένα του μηνύματος..."
 
-#: src/summaryview.c:2302
+#: src/summaryview.c:2319
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr ""
 
-#: src/summaryview.c:2643
+#: src/summaryview.c:2660
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Το μήνυμα %d σημειώθηκε\n"
 
-#: src/summaryview.c:2701
+#: src/summaryview.c:2718
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Το μήνυμα %d σημειώθηκε ως διαβασμένο\n"
 
-#: src/summaryview.c:2789
+#: src/summaryview.c:2908
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Το μήνυμα %d σημειώθηκε ως αδιάβαστο\n"
 
-#: src/summaryview.c:2850
+#: src/summaryview.c:2969
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Το μήνυμα %s/%d έχει οριστεί για διαγραφή\n"
 
-#: src/summaryview.c:2878
+#: src/summaryview.c:2997
 #, fuzzy
 msgid "Delete message(s)"
 msgstr "Διαγραφή μηνύματος"
 
-#: src/summaryview.c:2879
+#: src/summaryview.c:2998
 #, fuzzy
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Θέλετε πράγματι να διαγραφεί αυτή η κεφαλίδα;"
 
-#: src/summaryview.c:2953
+#: src/summaryview.c:3072
 msgid "Deleting duplicated messages..."
 msgstr "Διαγράφω τα διπλά μηνύματα..."
 
-#: src/summaryview.c:2991
+#: src/summaryview.c:3110
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Το μήνυμα %s/%d δεν έχει σημειωθεί\n"
 
-#: src/summaryview.c:3049
+#: src/summaryview.c:3168
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Το μήνυμα %d έχει οριστεί για μετακίνηση στο %s\n"
 
-#: src/summaryview.c:3066
+#: src/summaryview.c:3196
 msgid "Destination is same as current folder."
 msgstr "Ο προορισμός είναι ίδιος με τον τρέχοντα κατάλογο."
 
-#: src/summaryview.c:3122
+#: src/summaryview.c:3260
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Το μήνυμα %d έχει οριστεί να αντιγραφεί στο %s\n"
 
-#: src/summaryview.c:3139
+#: src/summaryview.c:3288
 #, fuzzy
 msgid "Destination for copy is same as current folder."
 msgstr "Ο προορισμός αντιγραφής είναι ίδιος με τον τρέχοντα κατάλογο."
 
-#: src/summaryview.c:3338
+#: src/summaryview.c:3495
 #, fuzzy
 msgid "Error occurred while processing messages."
 msgstr "Ένα σφάλμα συνέβη καθώς επεξεργάζομαι το mail."
 
-#: src/summaryview.c:3646 src/summaryview.c:3647
+#: src/summaryview.c:3803 src/summaryview.c:3804
 msgid "Building threads..."
 msgstr "Δημιουργώ τα νήματα..."
 
-#: src/summaryview.c:3797 src/summaryview.c:3798
+#: src/summaryview.c:3954 src/summaryview.c:3955
 msgid "Unthreading..."
 msgstr ""
 
-#: src/summaryview.c:4091 src/summaryview.c:4147
+#: src/summaryview.c:4248 src/summaryview.c:4304
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Φιλτράρω..."
 
-#: src/summaryview.c:4196
+#: src/summaryview.c:4353
 msgid "filtering..."
 msgstr "φιλτράρω..."
 
-#: src/summaryview.c:4197
+#: src/summaryview.c:4354
 msgid "Filtering..."
 msgstr "Φιλτράρω..."
 
-#: src/summaryview.c:4233
+#: src/summaryview.c:4390
 #, fuzzy, c-format
 msgid "%d message(s) have been filtered."
 msgstr "το μήνυμα %d είναι ήδη στη μνήμη.\n"
 
-#: src/summaryview.c:4742
+#: src/summaryview.c:4899
 msgid "No."
 msgstr "Αρ."
 
@@ -6817,35 +6848,35 @@ msgstr "Δημιουργώ απεικόνιση κειμένου...\n"
 msgid "This message can't be displayed.\n"
 msgstr "ένα μήνυμα δεν θα παραληφθεί\n"
 
-#: src/textview.c:1929
+#: src/textview.c:1925
 #, fuzzy
 msgid "Sa_ve this image as..."
 msgstr "/Αποθήκευση ως..."
 
-#: src/textview.c:1945 src/trayicon.c:109
+#: src/textview.c:1941 src/trayicon.c:109
 #, fuzzy
 msgid "Compose _new message"
 msgstr "Σύνθεση νέου μηνύματος"
 
-#: src/textview.c:1947
+#: src/textview.c:1943
 #, fuzzy
 msgid "Add to address _book..."
 msgstr "/Προσθήκη αποστολέα στον κατάλογο διευθύνσεων"
 
-#: src/textview.c:1949
+#: src/textview.c:1945
 #, fuzzy
 msgid "Copy this add_ress"
 msgstr "Κοινές διευθύνσεις"
 
-#: src/textview.c:1952
+#: src/textview.c:1948
 msgid "_Open with Web browser"
 msgstr ""
 
-#: src/textview.c:1954
+#: src/textview.c:1950
 msgid "Copy this _link"
 msgstr ""
 
-#: src/textview.c:2097
+#: src/textview.c:2093
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6854,7 +6885,7 @@ msgid ""
 "Open it anyway?"
 msgstr ""
 
-#: src/textview.c:2102
+#: src/textview.c:2098
 msgid "Fake URL warning"
 msgstr ""
 
diff --git a/po/es.po b/po/es.po
index 2ed20c7f..a4a987ae 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: 2006-01-27 18:11+0900\n"
+"POT-Creation-Date: 2006-01-31 15:20+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"
@@ -506,7 +506,7 @@ msgstr "Encontrado %s\n"
 msgid "Configuration is saved.\n"
 msgstr "Configuración guardada.\n"
 
-#: libsylph/prefs_common.c:489
+#: libsylph/prefs_common.c:491
 msgid "Junk mail filter"
 msgstr "Filtro de correo basura"
 
@@ -621,8 +621,8 @@ msgstr "%.2fMB"
 msgid "%.2fGB"
 msgstr "%.2fGB"
 
-#: libsylph/utils.c:2373 src/compose.c:2858 src/compose.c:3121
-#: src/compose.c:3184 src/compose.c:3304
+#: libsylph/utils.c:2373 src/compose.c:2867 src/compose.c:3130
+#: src/compose.c:3193 src/compose.c:3313
 msgid "can't change file mode\n"
 msgstr "no se pueden cambiar los permisos de archivo\n"
 
@@ -709,8 +709,8 @@ msgstr ""
 "El orden de comprobación de mensajes será éste. Marque las casillas\n"
 "en la columna `G' para habilitar la descarga mediante `Traer todo'."
 
-#: src/account_dialog.c:366 src/addressadd.c:192 src/addressbook.c:491
-#: src/compose.c:4262 src/editaddress.c:200 src/editaddress.c:942
+#: src/account_dialog.c:366 src/addressadd.c:192 src/addressbook.c:493
+#: src/compose.c:4271 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:206 src/prefs_filter.c:259 src/prefs_folder_item.c:171
@@ -846,12 +846,12 @@ 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:4762 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4771 src/editaddress.c:201
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "Dirección"
 
-#: src/addressadd.c:212 src/addressbook.c:493 src/editaddress.c:202
+#: src/addressadd.c:212 src/addressbook.c:495 src/editaddress.c:202
 #: src/editaddress.c:795 src/editaddress.c:860 src/editgroup.c:267
 msgid "Remarks"
 msgstr "Notas"
@@ -860,183 +860,183 @@ msgstr "Notas"
 msgid "Select Address Book Folder"
 msgstr "Seleccionar carpeta de la agenda"
 
-#: src/addressbook.c:336 src/compose.c:515 src/mainwindow.c:477
+#: src/addressbook.c:338 src/compose.c:515 src/mainwindow.c:480
 #: src/messageview.c:138
 msgid "/_File"
 msgstr "/_Fichero"
 
-#: src/addressbook.c:337
+#: src/addressbook.c:339
 msgid "/_File/New _Book"
 msgstr "/_Fichero/Nueva _agenda"
 
-#: src/addressbook.c:338
+#: src/addressbook.c:340
 msgid "/_File/New _vCard"
 msgstr "/_Fichero/Nueva _vCard"
 
-#: src/addressbook.c:340
+#: src/addressbook.c:342
 msgid "/_File/New _JPilot"
 msgstr "/_Fichero/Nuevo _JPilot"
 
-#: src/addressbook.c:343
+#: src/addressbook.c:345
 msgid "/_File/New _Server"
 msgstr "/_Fichero/Nuevo _servidor"
 
-#: src/addressbook.c:345 src/addressbook.c:348 src/compose.c:520
-#: src/compose.c:525 src/compose.c:528 src/compose.c:531 src/mainwindow.c:495
-#: src/mainwindow.c:498 src/mainwindow.c:500 src/mainwindow.c:503
-#: src/mainwindow.c:505 src/messageview.c:141
+#: src/addressbook.c:347 src/addressbook.c:350 src/compose.c:520
+#: src/compose.c:525 src/compose.c:528 src/compose.c:531 src/mainwindow.c:498
+#: src/mainwindow.c:501 src/mainwindow.c:503 src/mainwindow.c:506
+#: src/mainwindow.c:508 src/messageview.c:141
 msgid "/_File/---"
 msgstr "/_Fichero/---"
 
-#: src/addressbook.c:346
+#: src/addressbook.c:348
 msgid "/_File/_Edit"
 msgstr "/_Fichero/_Editar"
 
-#: src/addressbook.c:347
+#: src/addressbook.c:349
 msgid "/_File/_Delete"
 msgstr "/_Fichero/_Borrar"
 
-#: src/addressbook.c:349
+#: src/addressbook.c:351
 msgid "/_File/_Save"
 msgstr "/_Fichero/_Guardar"
 
-#: src/addressbook.c:350 src/compose.c:532 src/messageview.c:142
+#: src/addressbook.c:352 src/compose.c:532 src/messageview.c:142
 msgid "/_File/_Close"
 msgstr "/_Fichero/_Cerrar"
 
-#: src/addressbook.c:351
+#: src/addressbook.c:353
 msgid "/_Address"
 msgstr "/_Dirección"
 
-#: src/addressbook.c:352
+#: src/addressbook.c:354
 msgid "/_Address/New _Address"
 msgstr "/_Dirección/Nueva _dirección"
 
-#: src/addressbook.c:353
+#: src/addressbook.c:355
 msgid "/_Address/New _Group"
 msgstr "/_Dirección/Nuevo _grupo"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:356
 msgid "/_Address/New _Folder"
 msgstr "/_Dirección/Nueva _carpeta"
 
-#: src/addressbook.c:355
+#: src/addressbook.c:357
 msgid "/_Address/---"
 msgstr "/_Dirección/---"
 
-#: src/addressbook.c:356
+#: src/addressbook.c:358
 msgid "/_Address/_Edit"
 msgstr "/_Dirección/_Editar"
 
-#: src/addressbook.c:357
+#: src/addressbook.c:359
 msgid "/_Address/_Delete"
 msgstr "/_Dirección/_Borrar"
 
-#: src/addressbook.c:358 src/compose.c:639 src/mainwindow.c:738
-#: src/messageview.c:259
+#: src/addressbook.c:360 src/compose.c:645 src/mainwindow.c:749
+#: src/messageview.c:264
 msgid "/_Tools"
 msgstr "/_Herramientas"
 
-#: src/addressbook.c:359
+#: src/addressbook.c:361
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Herramientas/Importar fichero _LDIF"
 
-#: src/addressbook.c:360 src/compose.c:658 src/mainwindow.c:788
-#: src/messageview.c:277
+#: src/addressbook.c:362 src/compose.c:664 src/mainwindow.c:799
+#: src/messageview.c:282
 msgid "/_Help"
 msgstr "/_Ayuda"
 
-#: src/addressbook.c:361 src/compose.c:659 src/mainwindow.c:799
-#: src/messageview.c:278
+#: src/addressbook.c:363 src/compose.c:665 src/mainwindow.c:810
+#: src/messageview.c:283
 msgid "/_Help/_About"
 msgstr "/_Ayuda/_Acerca de"
 
-#: src/addressbook.c:380 src/addressbook.c:390
+#: src/addressbook.c:382 src/addressbook.c:392
 msgid "/New _Address"
 msgstr "/Nueva _dirección"
 
-#: src/addressbook.c:381 src/addressbook.c:391
+#: src/addressbook.c:383 src/addressbook.c:393
 msgid "/New _Group"
 msgstr "/Nuevo _grupo"
 
-#: src/addressbook.c:382 src/addressbook.c:392
+#: src/addressbook.c:384 src/addressbook.c:394
 msgid "/New _Folder"
 msgstr "/Nueva _carpeta"
 
-#: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:509
+#: src/addressbook.c:385 src/addressbook.c:395 src/compose.c:509
 #: src/folderview.c:246 src/folderview.c:248 src/folderview.c:253
 #: src/folderview.c:266 src/folderview.c:268 src/folderview.c:270
 #: src/folderview.c:275 src/folderview.c:289 src/folderview.c:291
 #: src/folderview.c:295 src/summaryview.c:414 src/summaryview.c:418
-#: src/summaryview.c:421 src/summaryview.c:431 src/summaryview.c:433
-#: src/summaryview.c:435 src/summaryview.c:447 src/summaryview.c:453
+#: src/summaryview.c:421 src/summaryview.c:433 src/summaryview.c:435
+#: src/summaryview.c:437 src/summaryview.c:449 src/summaryview.c:455
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:534
-#: src/mainwindow.c:509 src/messageview.c:144
+#: src/addressbook.c:386 src/addressbook.c:396 src/compose.c:534
+#: src/mainwindow.c:512 src/messageview.c:144
 msgid "/_Edit"
 msgstr "/_Editar"
 
-#: src/addressbook.c:385 src/addressbook.c:395 src/summaryview.c:432
+#: src/addressbook.c:387 src/addressbook.c:397 src/summaryview.c:434
 msgid "/_Delete"
 msgstr "/_Borrar"
 
-#: src/addressbook.c:492
+#: src/addressbook.c:494
 msgid "E-Mail address"
 msgstr "Dirección e-mail"
 
-#: src/addressbook.c:496 src/compose.c:4763 src/prefs_common_dialog.c:2183
+#: src/addressbook.c:498 src/compose.c:4772 src/prefs_common_dialog.c:2183
 msgid "Address book"
 msgstr "Agenda de direcciones"
 
-#: src/addressbook.c:596 src/prefs_filter_edit.c:249
+#: src/addressbook.c:600 src/prefs_filter_edit.c:249
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "Nombre:"
 
 #. Buttons
-#: src/addressbook.c:628 src/addressbook.c:1680 src/editaddress.c:884
-#: src/editaddress.c:1017 src/mainwindow.c:2391 src/prefs_actions.c:266
+#: src/addressbook.c:632 src/addressbook.c:1684 src/editaddress.c:884
+#: src/editaddress.c:1017 src/mainwindow.c:2402 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
 #: src/prefs_template.c:233
 msgid "Delete"
 msgstr "Borrar"
 
-#: src/addressbook.c:631 src/editaddress.c:890 src/editaddress.c:1023
+#: src/addressbook.c:635 src/editaddress.c:890 src/editaddress.c:1023
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:273 src/prefs_display_header.c:328
 #: src/prefs_filter_edit.c:1550
 msgid "Add"
 msgstr "Añadir"
 
-#: src/addressbook.c:634
+#: src/addressbook.c:638
 msgid "Lookup"
 msgstr "Buscar"
 
-#: src/addressbook.c:646 src/headerview.c:55 src/prefs_folder_item.c:339
+#: src/addressbook.c:650 src/headerview.c:55 src/prefs_folder_item.c:339
 #: src/prefs_template.c:176
 msgid "To:"
 msgstr "Para:"
 
-#: src/addressbook.c:650 src/prefs_folder_item.c:356 src/prefs_template.c:178
+#: src/addressbook.c:654 src/prefs_folder_item.c:356 src/prefs_template.c:178
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:654 src/prefs_folder_item.c:367
+#: src/addressbook.c:658 src/prefs_folder_item.c:367
 msgid "Bcc:"
 msgstr "Bcc:"
 
 #. Confirm deletion
-#: src/addressbook.c:841
+#: src/addressbook.c:845
 msgid "Delete address(es)"
 msgstr "Borrar dirección(es)"
 
-#: src/addressbook.c:842
+#: src/addressbook.c:846
 msgid "Really delete the address(es)?"
 msgstr "¿Borrar realmente la(s) dirección(es)?"
 
-#: src/addressbook.c:1671
+#: src/addressbook.c:1675
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1045,36 +1045,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:1674 src/folderview.c:2351
+#: src/addressbook.c:1678 src/folderview.c:2351
 msgid "Delete folder"
 msgstr "Borrar carpeta"
 
-#: src/addressbook.c:1674
+#: src/addressbook.c:1678
 msgid "_Folder only"
 msgstr "Sólo la _carpeta"
 
-#: src/addressbook.c:1674
+#: src/addressbook.c:1678
 msgid "Folder and _addresses"
 msgstr "La carpeta y las _direcciones"
 
-#: src/addressbook.c:1679
+#: src/addressbook.c:1683
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "¿Borrar realmente «%s»?"
 
-#: src/addressbook.c:2365 src/addressbook.c:2498
+#: src/addressbook.c:2369 src/addressbook.c:2502
 msgid "New user, could not save index file."
 msgstr "Nuevo usuario, no se pudo guardar el fichero índice."
 
-#: src/addressbook.c:2369 src/addressbook.c:2502
+#: src/addressbook.c:2373 src/addressbook.c:2506
 msgid "New user, could not save address book files."
 msgstr "Nuevo usuario, no se pudo guardar los ficheros de direcciones"
 
-#: src/addressbook.c:2379 src/addressbook.c:2512
+#: src/addressbook.c:2383 src/addressbook.c:2516
 msgid "Old address book converted successfully."
 msgstr "Antigua agenda de direcciones convertida con éxito"
 
-#: src/addressbook.c:2384
+#: src/addressbook.c:2388
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1082,7 +1082,7 @@ msgstr ""
 "Antigua agenda de direcciones convertida,\n"
 "no se pudo guardar el nuevo fichero índice"
 
-#: src/addressbook.c:2397
+#: src/addressbook.c:2401
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1090,7 +1090,7 @@ msgstr ""
 "No se pudo convertir la antigua agenda,\n"
 "pero se crearon nuevos ficheros vacíos."
 
-#: src/addressbook.c:2403
+#: src/addressbook.c:2407
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1098,7 +1098,7 @@ msgstr ""
 "No se pudo convertir la antigua agenda,\n"
 "no se pudieron crear los ficheros para la nueva."
 
-#: src/addressbook.c:2408
+#: src/addressbook.c:2412
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1106,92 +1106,92 @@ msgstr ""
 "No se pudo convertir la antigua agenda\n"
 "y no se pudieron crear ficheros para una nueva."
 
-#: src/addressbook.c:2415
+#: src/addressbook.c:2419
 msgid "Addressbook conversion error"
 msgstr "Error en la conversión de la agenda"
 
-#: src/addressbook.c:2419
+#: src/addressbook.c:2423
 msgid "Addressbook conversion"
 msgstr "Conversión de la agenda"
 
-#: src/addressbook.c:2454
+#: src/addressbook.c:2458
 msgid "Addressbook Error"
 msgstr "Error en la agenda"
 
-#: src/addressbook.c:2455 src/addressbook.c:2555
+#: src/addressbook.c:2459 src/addressbook.c:2559
 msgid "Could not read address index"
 msgstr "No se pudo leer el índice de direcciones"
 
-#: src/addressbook.c:2517
+#: src/addressbook.c:2521
 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:2531
+#: src/addressbook.c:2535
 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:2537
+#: src/addressbook.c:2541
 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:2543
+#: src/addressbook.c:2547
 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:2561
+#: src/addressbook.c:2565
 msgid "Addressbook Conversion Error"
 msgstr "Error en la conversión de la agenda"
 
-#: src/addressbook.c:2567
+#: src/addressbook.c:2571
 msgid "Addressbook Conversion"
 msgstr "Conversión de la agenda"
 
-#: src/addressbook.c:3072 src/prefs_common_dialog.c:2033
+#: src/addressbook.c:3086 src/prefs_common_dialog.c:2033
 msgid "Interface"
 msgstr "Interfaz"
 
-#: src/addressbook.c:3088 src/importldif.c:514
+#: src/addressbook.c:3102 src/importldif.c:514
 msgid "Address Book"
 msgstr "Agenda de direcciones"
 
-#: src/addressbook.c:3104
+#: src/addressbook.c:3118
 msgid "Person"
 msgstr "Persona"
 
-#: src/addressbook.c:3120
+#: src/addressbook.c:3134
 msgid "EMail Address"
 msgstr "Dirección e-mail"
 
-#: src/addressbook.c:3136
+#: src/addressbook.c:3150
 msgid "Group"
 msgstr "Grupo"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3152 src/folderview.c:367 src/prefs_account_dialog.c:1694
+#: src/addressbook.c:3166 src/folderview.c:367 src/prefs_account_dialog.c:1694
 #: src/query_search.c:370
 msgid "Folder"
 msgstr "Carpeta"
 
-#: src/addressbook.c:3168
+#: src/addressbook.c:3182
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3184 src/addressbook.c:3200
+#: src/addressbook.c:3198 src/addressbook.c:3214
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3216
+#: src/addressbook.c:3230
 msgid "LDAP Server"
 msgstr "Servidor LDAP"
 
@@ -1203,7 +1203,7 @@ msgstr "Dirección común"
 msgid "Personal address"
 msgstr "Dirección personal"
 
-#: src/alertpanel.c:141 src/compose.c:5485 src/main.c:573
+#: src/alertpanel.c:141 src/compose.c:5494 src/main.c:573
 msgid "Notice"
 msgstr "Notificación"
 
@@ -1254,7 +1254,7 @@ msgstr "Marrón"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4593
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4750
 msgid "None"
 msgstr "Ninguno"
 
@@ -1312,7 +1312,7 @@ msgstr "/_Editar/_Deshacer"
 msgid "/_Edit/_Redo"
 msgstr "/_Editar/_Rehacer"
 
-#: src/compose.c:537 src/compose.c:544 src/mainwindow.c:513
+#: src/compose.c:537 src/compose.c:544 src/mainwindow.c:516
 #: src/messageview.c:147
 msgid "/_Edit/---"
 msgstr "/_Editar/---"
@@ -1321,7 +1321,7 @@ msgstr "/_Editar/---"
 msgid "/_Edit/Cu_t"
 msgstr "/_Editar/Cor_tar"
 
-#: src/compose.c:539 src/mainwindow.c:510 src/messageview.c:145
+#: src/compose.c:539 src/mainwindow.c:513 src/messageview.c:145
 msgid "/_Edit/_Copy"
 msgstr "/_Editar/_Copiar"
 
@@ -1333,7 +1333,7 @@ msgstr "/_Editar/_Pegar"
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Editar/Pegar como c_itación"
 
-#: src/compose.c:543 src/mainwindow.c:511 src/messageview.c:146
+#: src/compose.c:543 src/mainwindow.c:514 src/messageview.c:146
 msgid "/_Edit/Select _all"
 msgstr "/_Editar/_Seleccionar todo"
 
@@ -1349,8 +1349,8 @@ msgstr "/_Editar/_Cortar todas las líneas largas"
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Editar/Aut_o-recorte"
 
-#: src/compose.c:550 src/mainwindow.c:518 src/messageview.c:151
-#: src/summaryview.c:448
+#: src/compose.c:550 src/mainwindow.c:521 src/messageview.c:151
+#: src/summaryview.c:450
 msgid "/_View"
 msgstr "/_Ver"
 
@@ -1371,9 +1371,9 @@ msgid "/_View/_Reply to"
 msgstr "/_Ver/_Responder a"
 
 #: src/compose.c:555 src/compose.c:557 src/compose.c:559 src/compose.c:561
-#: src/mainwindow.c:538 src/mainwindow.c:541 src/mainwindow.c:568
-#: src/mainwindow.c:592 src/mainwindow.c:687 src/mainwindow.c:691
-#: src/messageview.c:236
+#: src/mainwindow.c:541 src/mainwindow.c:544 src/mainwindow.c:571
+#: src/mainwindow.c:595 src/mainwindow.c:696 src/mainwindow.c:700
+#: src/messageview.c:241
 msgid "/_View/---"
 msgstr "/_Ver/---"
 
@@ -1389,7 +1389,7 @@ msgstr "/_Ver/_Regleta"
 msgid "/_View/_Attachment"
 msgstr "/_Ver/_Adjuntos"
 
-#: src/compose.c:567 src/mainwindow.c:599 src/messageview.c:158
+#: src/compose.c:567 src/mainwindow.c:602 src/messageview.c:158
 msgid "/_View/Character _encoding"
 msgstr "/_Ver/Codificación de caract_eres"
 
@@ -1398,214 +1398,225 @@ msgid "/_View/Character _encoding/_Automatic"
 msgstr "/_Ver/Codificación de caract_eres/_Automática"
 
 #: src/compose.c:570 src/compose.c:576 src/compose.c:582 src/compose.c:586
-#: src/compose.c:592 src/compose.c:596 src/compose.c:602 src/compose.c:606
-#: src/compose.c:616 src/compose.c:620 src/compose.c:628 src/compose.c:632
-#: src/mainwindow.c:595 src/mainwindow.c:602 src/messageview.c:154
+#: src/compose.c:592 src/compose.c:596 src/compose.c:602 src/compose.c:608
+#: src/compose.c:612 src/compose.c:622 src/compose.c:626 src/compose.c:634
+#: src/compose.c:638 src/mainwindow.c:598 src/mainwindow.c:605
+#: src/messageview.c:154
 msgid "/_View/Character _encoding/---"
 msgstr "/_Ver/Codificación de caract_eres/---"
 
-#: src/compose.c:572 src/mainwindow.c:603 src/messageview.c:162
+#: src/compose.c:572 src/mainwindow.c:606 src/messageview.c:162
 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:574 src/mainwindow.c:605 src/messageview.c:165
+#: src/compose.c:574 src/mainwindow.c:608 src/messageview.c:165
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Ver/Codificación de caract_eres/Unicode (_UTF-8)"
 
-#: src/compose.c:578 src/mainwindow.c:609 src/messageview.c:168
+#: src/compose.c:578 src/mainwindow.c:612 src/messageview.c:168
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Ver/Codificación de caract_eres/Europeo occidental (ISO-8859-_1)"
 
-#: src/compose.c:580 src/mainwindow.c:611 src/messageview.c:170
+#: src/compose.c:580 src/mainwindow.c:614 src/messageview.c:170
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Ver/Codificación de caract_eres/Europeo occidental (ISO-8859-_15)"
 
-#: src/compose.c:584 src/mainwindow.c:617 src/messageview.c:175
+#: src/compose.c:584 src/mainwindow.c:620 src/messageview.c:175
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Ver/Codificación de caract_eres/Centroeuropeo (ISO-8859-_2)"
 
-#: src/compose.c:588 src/mainwindow.c:621 src/messageview.c:178
+#: src/compose.c:588 src/mainwindow.c:624 src/messageview.c:178
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Ver/Codificación de caract_eres/Báltico (ISO-8859-13)"
 
-#: src/compose.c:590 src/mainwindow.c:623 src/messageview.c:180
+#: src/compose.c:590 src/mainwindow.c:626 src/messageview.c:180
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Ver/Codificación de caract_eres/Báltico (ISO-8859-_4)"
 
-#: src/compose.c:594 src/mainwindow.c:627 src/messageview.c:183
+#: src/compose.c:594 src/mainwindow.c:630 src/messageview.c:183
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Ver/Codificación de caract_eres/Griego (ISO-8859-_7)"
 
-#: src/compose.c:598 src/mainwindow.c:631 src/messageview.c:186
+#: src/compose.c:598 src/mainwindow.c:634 src/messageview.c:186
+#, fuzzy
+msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
+msgstr "/_Ver/Codificación de caract_eres/Báltico (ISO-8859-_4)"
+
+#: src/compose.c:600 src/mainwindow.c:636 src/messageview.c:188
+#, fuzzy
+msgid "/_View/Character _encoding/Arabic (Windows-1256)"
+msgstr "/_Ver/Codificación de caract_eres/Cirílico (Windows-1251)"
+
+#: src/compose.c:604 src/mainwindow.c:640 src/messageview.c:191
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Ver/Codificación de caract_eres/Hebreo (ISO-8859-_8)"
 
-#: src/compose.c:600 src/mainwindow.c:633 src/messageview.c:188
+#: src/compose.c:606 src/mainwindow.c:642 src/messageview.c:193
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Ver/Codificación de caract_eres/Hebreo (Windows-1255)"
 
-#: src/compose.c:604 src/mainwindow.c:637 src/messageview.c:191
+#: src/compose.c:610 src/mainwindow.c:646 src/messageview.c:196
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Ver/Codificación de caract_eres/Turco (ISO-8859-_9)"
 
-#: src/compose.c:608 src/mainwindow.c:641 src/messageview.c:194
+#: src/compose.c:614 src/mainwindow.c:650 src/messageview.c:199
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Ver/Codificación de caract_eres/Cirílico (ISO-8859-_5)"
 
-#: src/compose.c:610 src/mainwindow.c:643 src/messageview.c:196
+#: src/compose.c:616 src/mainwindow.c:652 src/messageview.c:201
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Ver/Codificación de caract_eres/Cirílico (KOI8-_R)"
 
-#: src/compose.c:612 src/mainwindow.c:645 src/messageview.c:198
+#: src/compose.c:618 src/mainwindow.c:654 src/messageview.c:203
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Ver/Codificación de caract_eres/Cirílico (KOI8-U)"
 
-#: src/compose.c:614 src/mainwindow.c:647 src/messageview.c:200
+#: src/compose.c:620 src/mainwindow.c:656 src/messageview.c:205
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Ver/Codificación de caract_eres/Cirílico (Windows-1251)"
 
-#: src/compose.c:618 src/mainwindow.c:651 src/messageview.c:203
+#: src/compose.c:624 src/mainwindow.c:660 src/messageview.c:208
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Ver/Codificación de caract_eres/Japonés (ISO-2022-_JP)"
 
-#: src/compose.c:622 src/mainwindow.c:661 src/messageview.c:212
+#: src/compose.c:628 src/mainwindow.c:670 src/messageview.c:217
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Ver/Codificación de caract_eres/Chino simplificado (_GB2312)"
 
-#: src/compose.c:624 src/mainwindow.c:663 src/messageview.c:214
+#: src/compose.c:630 src/mainwindow.c:672 src/messageview.c:219
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Ver/Codificación de caract_eres/Chino simplificado (_GB2312)"
 
-#: src/compose.c:626 src/mainwindow.c:665 src/messageview.c:216
+#: src/compose.c:632 src/mainwindow.c:674 src/messageview.c:221
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Ver/Codificación de caract_eres/Chino tradicional (_Big5)"
 
-#: src/compose.c:630 src/mainwindow.c:673 src/messageview.c:223
+#: src/compose.c:636 src/mainwindow.c:682 src/messageview.c:228
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Ver/Codificación de caract_eres/Coreano (EUC-_KR)"
 
-#: src/compose.c:634 src/mainwindow.c:679 src/messageview.c:228
+#: src/compose.c:640 src/mainwindow.c:688 src/messageview.c:233
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Ver/Codificación de caract_eres/Tailandés (TIS-620)"
 
-#: src/compose.c:636 src/mainwindow.c:681 src/messageview.c:230
+#: src/compose.c:642 src/mainwindow.c:690 src/messageview.c:235
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Ver/Codificación de caract_eres/Tailandés (Windows-874)"
 
-#: src/compose.c:640 src/mainwindow.c:739 src/messageview.c:260
+#: src/compose.c:646 src/mainwindow.c:750 src/messageview.c:265
 msgid "/_Tools/_Address book"
 msgstr "/_Herramientas/_Agenda de direcciones"
 
-#: src/compose.c:641
+#: src/compose.c:647
 msgid "/_Tools/_Template"
 msgstr "/_Herramientas/Plan_tillas"
 
-#: src/compose.c:642 src/mainwindow.c:762 src/messageview.c:275
+#: src/compose.c:648 src/mainwindow.c:773 src/messageview.c:280
 msgid "/_Tools/Actio_ns"
 msgstr "/_Herramientas/Accio_nes"
 
-#: src/compose.c:643 src/compose.c:647 src/compose.c:653 src/mainwindow.c:742
-#: src/mainwindow.c:756 src/mainwindow.c:761 src/mainwindow.c:763
-#: src/mainwindow.c:766 src/mainwindow.c:768 src/messageview.c:263
-#: src/messageview.c:274
+#: src/compose.c:649 src/compose.c:653 src/compose.c:659 src/mainwindow.c:753
+#: src/mainwindow.c:767 src/mainwindow.c:772 src/mainwindow.c:774
+#: src/mainwindow.c:777 src/mainwindow.c:779 src/messageview.c:268
+#: src/messageview.c:279
 msgid "/_Tools/---"
 msgstr "/_Herramientas/---"
 
-#: src/compose.c:644
+#: src/compose.c:650
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/_Editar/Editar con el editor e_xterno"
 
-#: src/compose.c:648
+#: src/compose.c:654
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Herramientas/Fir_mar con PGP"
 
-#: src/compose.c:649
+#: src/compose.c:655
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/_Mensaje/_Encriptar con PGP"
 
-#: src/compose.c:654
+#: src/compose.c:660
 #, fuzzy
 msgid "/_Tools/_Check spell"
 msgstr "/_Herramientas/E_jecutar"
 
-#: src/compose.c:655
+#: src/compose.c:661
 #, fuzzy
 msgid "/_Tools/_Set spell language"
 msgstr "/_Herramientas/Plan_tillas"
 
-#: src/compose.c:899
+#: src/compose.c:908
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: el fichero no existe\n"
 
-#: src/compose.c:1003 src/compose.c:1074
+#: src/compose.c:1012 src/compose.c:1083
 msgid "Can't get text part\n"
 msgstr "No se puede obtener la parte de texto\n"
 
-#: src/compose.c:1475
+#: src/compose.c:1484
 msgid "Quote mark format error."
 msgstr "Error en el formato de la marca de cita."
 
-#: src/compose.c:1487
+#: src/compose.c:1496
 msgid "Message reply/forward format error."
 msgstr "Error en el formato de responder/redirijir."
 
-#: src/compose.c:1907
+#: src/compose.c:1916
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "El fichero %s no existe\n"
 
-#: src/compose.c:1911
+#: src/compose.c:1920
 #, 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:1915
+#: src/compose.c:1924
 #, c-format
 msgid "File %s is empty."
 msgstr "El fichero %s esta vacío."
 
-#: src/compose.c:1919
+#: src/compose.c:1928
 #, c-format
 msgid "Can't read %s."
 msgstr "No se puede leer %s."
 
-#: src/compose.c:1952
+#: src/compose.c:1961
 #, c-format
 msgid "Message: %s"
 msgstr "Mensaje: %s"
 
-#: src/compose.c:2012 src/mimeview.c:565
+#: src/compose.c:2021 src/mimeview.c:565
 msgid "Can't get the part of multipart message."
 msgstr "No se puede obtener la parte del mensaje multipartes."
 
-#: src/compose.c:2496 src/headerview.c:195 src/query_search.c:636
-#: src/summaryview.c:2107
+#: src/compose.c:2505 src/headerview.c:195 src/query_search.c:636
+#: src/summaryview.c:2124
 msgid "(No Subject)"
 msgstr "(Sin asunto)"
 
-#: src/compose.c:2499
+#: src/compose.c:2508
 #, fuzzy, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Componer mensaje%s"
 
-#: src/compose.c:2612
+#: src/compose.c:2621
 msgid "Recipient is not specified."
 msgstr "No se especificó el destinatario."
 
-#: src/compose.c:2620
+#: src/compose.c:2629
 msgid "Empty subject"
 msgstr "Asunto vacío"
 
-#: src/compose.c:2621
+#: src/compose.c:2630
 msgid "Subject is empty. Send it anyway?"
 msgstr "El asunto esta vacío. ¿Enviar de todas formas?"
 
-#: src/compose.c:2680
+#: src/compose.c:2689
 msgid "can't get recipient list."
 msgstr "no se puede obtener la lista de destinatarios."
 
-#: src/compose.c:2700
+#: src/compose.c:2709
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1613,23 +1624,23 @@ msgstr ""
 "No especificó ninguna cuenta para enviar.\n"
 "Seleccione alguna cuenta antes de enviar."
 
-#: src/compose.c:2714 src/send_message.c:299
+#: src/compose.c:2723 src/send_message.c:299
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Hubo un error enviando el mensaje a %s ."
 
-#: src/compose.c:2756
+#: src/compose.c:2765
 msgid "Can't save the message to outbox."
 msgstr "No se puede guardar el mensaje en Salida."
 
-#: src/compose.c:2794
+#: src/compose.c:2803
 #, 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:2891
+#: src/compose.c:2900
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1640,11 +1651,11 @@ msgstr ""
 "\n"
 "¿Enviarlo como %s de todas formas?"
 
-#: src/compose.c:2897
+#: src/compose.c:2906
 msgid "Code conversion error"
 msgstr "Error en la conversión de códigos"
 
-#: src/compose.c:2970
+#: src/compose.c:2979
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1657,157 +1668,157 @@ msgstr ""
 "\n"
 "¿Enviarlo de todas formas?"
 
-#: src/compose.c:2974
+#: src/compose.c:2983
 msgid "Line length limit"
 msgstr "Límite de longitud de línea"
 
-#: src/compose.c:3264
+#: src/compose.c:3273
 msgid "can't remove the old message\n"
 msgstr "no se puede eliminar el mensaje antiguo\n"
 
-#: src/compose.c:3282
+#: src/compose.c:3291
 msgid "queueing message...\n"
 msgstr "poniendo en la cola...\n"
 
-#: src/compose.c:3364
+#: src/compose.c:3373
 msgid "can't find queue folder\n"
 msgstr "no puedo encontrar la carpeta de cola\n"
 
-#: src/compose.c:3371
+#: src/compose.c:3380
 msgid "can't queue the message\n"
 msgstr "El mensaje no se puede poner en la cola\n"
 
-#: src/compose.c:3964
+#: src/compose.c:3973
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "Message-ID generado: %s\n"
 
-#: src/compose.c:4077
+#: src/compose.c:4086
 msgid "Creating compose window...\n"
 msgstr "Creando ventana de composición...\n"
 
-#: src/compose.c:4128 src/headerview.c:54
+#: src/compose.c:4137 src/headerview.c:54
 msgid "From:"
 msgstr "Desde:"
 
-#: src/compose.c:4202
+#: src/compose.c:4211
 msgid "PGP Sign"
 msgstr "Firmar con PGP"
 
-#: src/compose.c:4205
+#: src/compose.c:4214
 msgid "PGP Encrypt"
 msgstr "Cifrar con PGP"
 
-#: src/compose.c:4243 src/compose.c:5317
+#: src/compose.c:4252 src/compose.c:5326
 msgid "MIME type"
 msgstr "Tipo MIME"
 
 #. S_COL_DATE
-#: src/compose.c:4252 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4740
+#: src/compose.c:4261 src/mimeview.c:197 src/prefs_filter_edit.c:496
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4897
 msgid "Size"
 msgstr "Tamaño"
 
-#: src/compose.c:4683 src/mainwindow.c:2324 src/prefs_account_dialog.c:528
+#: src/compose.c:4692 src/mainwindow.c:2335 src/prefs_account_dialog.c:528
 #: src/prefs_common_dialog.c:661
 msgid "Send"
 msgstr "Enviar"
 
-#: src/compose.c:4684
+#: src/compose.c:4693
 msgid "Send message"
 msgstr "Enviar mensaje"
 
-#: src/compose.c:4692
+#: src/compose.c:4701
 msgid "Send later"
 msgstr "Enviar después"
 
-#: src/compose.c:4693
+#: src/compose.c:4702
 msgid "Put into queue folder and send later"
 msgstr "Poner en la cola y enviar después"
 
-#: src/compose.c:4701
+#: src/compose.c:4710
 msgid "Draft"
 msgstr "Borrador"
 
-#: src/compose.c:4702
+#: src/compose.c:4711
 msgid "Save to draft folder"
 msgstr "Guardar como borrador"
 
-#: src/compose.c:4712
+#: src/compose.c:4721
 msgid "Insert"
 msgstr "Insertar"
 
-#: src/compose.c:4713
+#: src/compose.c:4722
 msgid "Insert file"
 msgstr "Insertar fichero"
 
-#: src/compose.c:4721
+#: src/compose.c:4730
 msgid "Attach"
 msgstr "Adjuntar"
 
-#: src/compose.c:4722
+#: src/compose.c:4731
 msgid "Attach file"
 msgstr "Adjuntar fichero"
 
 #. signature
-#: src/compose.c:4732 src/prefs_account_dialog.c:1208
+#: src/compose.c:4741 src/prefs_account_dialog.c:1208
 #: src/prefs_common_dialog.c:953
 msgid "Signature"
 msgstr "Firma"
 
-#: src/compose.c:4733
+#: src/compose.c:4742
 #, fuzzy
 msgid "Append signature"
 msgstr "Firma INVÁLIDA"
 
 #. editor
-#: src/compose.c:4742 src/prefs_common_dialog.c:991
+#: src/compose.c:4751 src/prefs_common_dialog.c:991
 #: src/prefs_common_dialog.c:2315
 msgid "Editor"
 msgstr "Editor"
 
-#: src/compose.c:4743
+#: src/compose.c:4752
 msgid "Edit with external editor"
 msgstr "Editar con un editor externo"
 
-#: src/compose.c:4751
+#: src/compose.c:4760
 msgid "Linewrap"
 msgstr "Recortar"
 
-#: src/compose.c:4752
+#: src/compose.c:4761
 msgid "Wrap all long lines"
 msgstr "Cortar todas las líneas largas"
 
-#: src/compose.c:5213
+#: src/compose.c:5222
 msgid "Invalid MIME type."
 msgstr "Tipo MIME inválido."
 
-#: src/compose.c:5231
+#: src/compose.c:5240
 msgid "File doesn't exist or is empty."
 msgstr "El fichero no existe o está vacío."
 
-#: src/compose.c:5299
+#: src/compose.c:5308
 msgid "Properties"
 msgstr "Propiedades"
 
-#: src/compose.c:5319 src/prefs_common_dialog.c:1444
+#: src/compose.c:5328 src/prefs_common_dialog.c:1444
 msgid "Encoding"
 msgstr "Codificación"
 
-#: src/compose.c:5342 src/prefs_folder_item.c:202
+#: src/compose.c:5351 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Ruta"
 
-#: src/compose.c:5343
+#: src/compose.c:5352
 msgid "File name"
 msgstr "Nombre de fichero"
 
-#: src/compose.c:5436
+#: src/compose.c:5445
 #, 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:5482
+#: src/compose.c:5491
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1817,44 +1828,44 @@ msgstr ""
 "¿Desea terminar el proceso?\n"
 "Id. de grupo de proceso: %d"
 
-#: src/compose.c:5857 src/compose.c:5862 src/compose.c:5868
+#: src/compose.c:5866 src/compose.c:5871 src/compose.c:5877
 msgid "Can't queue the message."
 msgstr "El mensaje no se puede poner en la cola."
 
-#: src/compose.c:5959
+#: src/compose.c:5968
 msgid "Select files"
 msgstr "Seleccionar ficheros"
 
-#: src/compose.c:5982
+#: src/compose.c:5991
 msgid "Select file"
 msgstr "Seleccionar fichero"
 
-#: src/compose.c:6017
+#: src/compose.c:6026
 msgid "Save message"
 msgstr "Guardar mensaje"
 
-#: src/compose.c:6018
+#: src/compose.c:6027
 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:6020
+#: src/compose.c:6029
 msgid "Close _without saving"
 msgstr "Cerrar _sin guardar"
 
-#: src/compose.c:6062
+#: src/compose.c:6071
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "¿Quiere aplicar la plantilla «%s»?"
 
-#: src/compose.c:6064
+#: src/compose.c:6073
 msgid "Apply template"
 msgstr "Aplicar plantilla"
 
-#: src/compose.c:6065
+#: src/compose.c:6074
 msgid "_Replace"
 msgstr "_Reemplazar"
 
-#: src/compose.c:6065
+#: src/compose.c:6074
 msgid "_Insert"
 msgstr "_Insertar"
 
@@ -2292,7 +2303,7 @@ msgstr "Nuevos"
 
 #. S_COL_MARK
 #: src/folderview.c:412 src/prefs_filter_edit.c:500
-#: src/prefs_summary_column.c:71 src/summaryview.c:509
+#: src/prefs_summary_column.c:71 src/summaryview.c:511
 msgid "Unread"
 msgstr "No leídos"
 
@@ -2308,12 +2319,12 @@ msgstr "Estableciendo información de carpeta...\n"
 msgid "Setting folder info..."
 msgstr "Estableciendo información de carpeta..."
 
-#: src/folderview.c:858 src/mainwindow.c:3464 src/setup.c:80
+#: src/folderview.c:858 src/mainwindow.c:3481 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Revisando carpeta %s%c%s ..."
 
-#: src/folderview.c:862 src/mainwindow.c:3469 src/setup.c:85
+#: src/folderview.c:862 src/mainwindow.c:3486 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Revisando carpeta %s ..."
@@ -2338,7 +2349,7 @@ msgstr "La reconstrucción del árbol de carpetas falló."
 msgid "Checking for new messages in all folders..."
 msgstr "Comprobar si hay mensajes nuevos en todas las carpetas..."
 
-#: src/folderview.c:1200 src/mainwindow.c:2400 src/prefs_common_dialog.c:1789
+#: src/folderview.c:1200 src/mainwindow.c:2411 src/prefs_common_dialog.c:1789
 msgid "Junk"
 msgstr "Basura"
 
@@ -2479,7 +2490,7 @@ msgstr "Asunto:"
 msgid "Creating header view...\n"
 msgstr "Creando vista de cabeceras...\n"
 
-#: src/headerview.c:180 src/query_search.c:637 src/summaryview.c:2110
+#: src/headerview.c:180 src/query_search.c:637 src/summaryview.c:2127
 msgid "(No From)"
 msgstr "(Sin remite)"
 
@@ -2588,7 +2599,7 @@ msgstr "Importar fichero LDIF a la agenda"
 msgid "Prev"
 msgstr "Anterior"
 
-#: src/importldif.c:768 src/mainwindow.c:2420
+#: src/importldif.c:768 src/mainwindow.c:2431
 msgid "Next"
 msgstr "Siguiente"
 
@@ -2940,11 +2951,11 @@ msgstr ""
 msgid "another Sylpheed is already running.\n"
 msgstr "ya hay otro Sylpheed ejecutándose.\n"
 
-#: src/main.c:1064
+#: src/main.c:1083
 msgid "Migration of configuration"
 msgstr "Migración de la configuración"
 
-#: src/main.c:1065
+#: src/main.c:1084
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -2952,635 +2963,640 @@ msgstr ""
 "Se encontró una versión anterior de la confguración.\n"
 "¿Desea migrarla?"
 
-#: src/mainwindow.c:478
+#: src/mainwindow.c:481
 msgid "/_File/_Folder"
 msgstr "/_Fichero/_Carpeta"
 
-#: src/mainwindow.c:479
+#: src/mainwindow.c:482
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/_Fichero/_Carpeta_/Crear _nueva carpeta..."
 
-#: src/mainwindow.c:481
+#: src/mainwindow.c:484
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/_Fichero/_Carpeta_/_Renombrar carpeta..."
 
-#: src/mainwindow.c:482
+#: src/mainwindow.c:485
 msgid "/_File/_Folder/_Move folder..."
 msgstr "/_Fichero/_Carpeta_/_Mover carpeta..."
 
-#: src/mainwindow.c:483
+#: src/mainwindow.c:486
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/_Fichero/_Carpeta_/_Borrar carpeta"
 
-#: src/mainwindow.c:484
+#: src/mainwindow.c:487
 msgid "/_File/_Mailbox"
 msgstr "/_Fichero/_Buzón"
 
-#: src/mainwindow.c:485
+#: src/mainwindow.c:488
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/_Fichero/_Buzón/_Añadir buzón..."
 
-#: src/mainwindow.c:486
+#: src/mainwindow.c:489
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/_Fichero/_Buzón/_Eliminar buzón"
 
-#: src/mainwindow.c:487 src/mainwindow.c:492
+#: src/mainwindow.c:490 src/mainwindow.c:495
 msgid "/_File/_Mailbox/---"
 msgstr "/_Fichero/_Buzón/---"
 
-#: src/mainwindow.c:488
+#: src/mainwindow.c:491
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "/_Fichero/_Buzón/_Comprobar si hay mensajes nuevos"
 
-#: src/mainwindow.c:490
+#: src/mainwindow.c:493
 msgid "/_File/_Mailbox/Check for new messages in _all mailboxes"
 msgstr "/_Fichero/_Buzón/_Comprobar mensajes nuevos en todas las carpetas"
 
-#: src/mainwindow.c:493
+#: src/mainwindow.c:496
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "/_Fichero/_Buzón/R_econstruir árbol de carpetas"
 
-#: src/mainwindow.c:496
+#: src/mainwindow.c:499
 msgid "/_File/_Import mbox file..."
 msgstr "/_Fichero/I_mportar fichero mbox..."
 
-#: src/mainwindow.c:497
+#: src/mainwindow.c:500
 msgid "/_File/_Export to mbox file..."
 msgstr "/_Fichero/_Exportar a un fichero mbox..."
 
-#: src/mainwindow.c:499
+#: src/mainwindow.c:502
 msgid "/_File/Empty all _trash"
 msgstr "/_Fichero/_Vaciar todas las papeleras"
 
-#: src/mainwindow.c:501 src/messageview.c:139
+#: src/mainwindow.c:504 src/messageview.c:139
 msgid "/_File/_Save as..."
 msgstr "/_Fichero/_Guardar como..."
 
-#: src/mainwindow.c:502 src/messageview.c:140
+#: src/mainwindow.c:505 src/messageview.c:140
 msgid "/_File/_Print..."
 msgstr "/_Fichero/_Imprimir..."
 
-#: src/mainwindow.c:504
+#: src/mainwindow.c:507
 msgid "/_File/_Work offline"
 msgstr "/_Fichero/_Trabajar sin conexión"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:507
+#: src/mainwindow.c:510
 msgid "/_File/E_xit"
 msgstr "/_Fichero/Sali_r"
 
-#: src/mainwindow.c:512
+#: src/mainwindow.c:515
 msgid "/_Edit/Select _thread"
 msgstr "/_Editar/Seleccionar _hilo"
 
-#: src/mainwindow.c:514 src/messageview.c:148
+#: src/mainwindow.c:517 src/messageview.c:148
 msgid "/_Edit/_Find in current message..."
 msgstr "/_Edición/_Buscar en el mensaje actual..."
 
-#: src/mainwindow.c:516
+#: src/mainwindow.c:519
 msgid "/_Edit/_Search messages..."
 msgstr "/_Edición/_Buscar en los mensajes..."
 
-#: src/mainwindow.c:519
+#: src/mainwindow.c:522
 msgid "/_View/Show or hi_de"
 msgstr "/_Ver/Mostrar u o_cultar"
 
-#: src/mainwindow.c:520
+#: src/mainwindow.c:523
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/_Ver/Mostrar u o_cultar/_Árbol de carpetas"
 
-#: src/mainwindow.c:522
+#: src/mainwindow.c:525
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/_Ver/Mostrar u o_cultar/Vista de _mensajes"
 
-#: src/mainwindow.c:524
+#: src/mainwindow.c:527
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/_Ver/Mostrar u o_cultar/_Herramientas"
 
-#: src/mainwindow.c:526
+#: src/mainwindow.c:529
 msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/_Ver/Mostrar u o_cultar/_Herramientas/Iconos _y texto"
 
-#: src/mainwindow.c:528
+#: src/mainwindow.c:531
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/_Ver/Mostrar u o_cultar/_Herramientas/_Iconos"
 
-#: src/mainwindow.c:530
+#: src/mainwindow.c:533
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/_Ver/Mostrar u o_cultar/_Herramientas/_Texto"
 
-#: src/mainwindow.c:532
+#: src/mainwindow.c:535
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/_Ver/Mostrar u o_cultar/_Herramientas/_Ocultar"
 
-#: src/mainwindow.c:534
+#: src/mainwindow.c:537
 #, fuzzy
 msgid "/_View/Show or hi_de/_Search bar"
 msgstr "/_Ver/Mostrar u o_cultar/_Barra de estado"
 
-#: src/mainwindow.c:536
+#: src/mainwindow.c:539
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/_Ver/Mostrar u o_cultar/_Barra de estado"
 
-#: src/mainwindow.c:539
+#: src/mainwindow.c:542
 msgid "/_View/Separate f_older tree"
 msgstr "/_Ver/Separar árb_ol de carpetas"
 
-#: src/mainwindow.c:540
+#: src/mainwindow.c:543
 msgid "/_View/Separate _message view"
 msgstr "/_Ver/Separar vista de m_ensajes"
 
-#: src/mainwindow.c:542
+#: src/mainwindow.c:545
 msgid "/_View/_Sort"
 msgstr "/_Ver/_Ordenar"
 
-#: src/mainwindow.c:543
+#: src/mainwindow.c:546
 msgid "/_View/_Sort/by _number"
 msgstr "/_Ver/_Ordenar/Por _número"
 
-#: src/mainwindow.c:544
+#: src/mainwindow.c:547
 msgid "/_View/_Sort/by s_ize"
 msgstr "/_Ver/_Ordenar/Por _tamaño"
 
-#: src/mainwindow.c:545
+#: src/mainwindow.c:548
 msgid "/_View/_Sort/by _date"
 msgstr "/_Ver/_Ordenar/Por _fecha"
 
-#: src/mainwindow.c:546
+#: src/mainwindow.c:549
 #, fuzzy
 msgid "/_View/_Sort/by t_hread date"
 msgstr "/_Ver/_Ordenar/Por _fecha"
 
-#: src/mainwindow.c:547
+#: src/mainwindow.c:550
 msgid "/_View/_Sort/by _from"
 msgstr "/_Ver/_Ordenar/Por _remitente"
 
-#: src/mainwindow.c:548
+#: src/mainwindow.c:551
 msgid "/_View/_Sort/by _recipient"
 msgstr "/_Ver/_Ordenar/Por _destinatario"
 
-#: src/mainwindow.c:549
+#: src/mainwindow.c:552
 msgid "/_View/_Sort/by _subject"
 msgstr "/_Ver/_Ordenar/Por a_sunto"
 
-#: src/mainwindow.c:550
+#: src/mainwindow.c:553
 msgid "/_View/_Sort/by _color label"
 msgstr "/_Ver/_Ordenar/Por _color de la etiqueta"
 
-#: src/mainwindow.c:552
+#: src/mainwindow.c:555
 msgid "/_View/_Sort/by _mark"
 msgstr "/_Ver/_Ordenar/Por _marca"
 
-#: src/mainwindow.c:553
+#: src/mainwindow.c:556
 msgid "/_View/_Sort/by _unread"
 msgstr "/_Ver/_Ordenar/Por _no leído"
 
-#: src/mainwindow.c:554
+#: src/mainwindow.c:557
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/_Ver/_Ordenar/Por adj_unto"
 
-#: src/mainwindow.c:556
+#: src/mainwindow.c:559
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/_Ver/_Ordenar/N_o ordenar"
 
-#: src/mainwindow.c:557 src/mainwindow.c:560
+#: src/mainwindow.c:560 src/mainwindow.c:563
 msgid "/_View/_Sort/---"
 msgstr "/_Ver/_Ordenar/---"
 
-#: src/mainwindow.c:558
+#: src/mainwindow.c:561
 msgid "/_View/_Sort/Ascending"
 msgstr "/_Ver/_Ordenar/Ascendente"
 
-#: src/mainwindow.c:559
+#: src/mainwindow.c:562
 msgid "/_View/_Sort/Descending"
 msgstr "/_Ver/_Ordenar/Descendente"
 
-#: src/mainwindow.c:561
+#: src/mainwindow.c:564
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/_Ver/_Ordenar/Atraer _por asunto"
 
-#: src/mainwindow.c:563
+#: src/mainwindow.c:566
 msgid "/_View/Th_read view"
 msgstr "/_Ver/_Vista jerárquica"
 
-#: src/mainwindow.c:564
+#: src/mainwindow.c:567
 msgid "/_View/E_xpand all threads"
 msgstr "/_Ver/E_xpandir todos los hilos"
 
-#: src/mainwindow.c:565
+#: src/mainwindow.c:568
 msgid "/_View/Co_llapse all threads"
 msgstr "/_Ver/Co_lapsar todos los hilos"
 
-#: src/mainwindow.c:566
+#: src/mainwindow.c:569
 msgid "/_View/Set display _item..."
 msgstr "/_Ver/Elementos visibles..."
 
-#: src/mainwindow.c:569
+#: src/mainwindow.c:572
 msgid "/_View/_Go to"
 msgstr "/_Ver/_Ir a"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:573
 msgid "/_View/_Go to/_Prev message"
 msgstr "/_Ver/_Ir a/Mensaje a_nterior"
 
-#: src/mainwindow.c:571
+#: src/mainwindow.c:574
 msgid "/_View/_Go to/_Next message"
 msgstr "/_Ver/_Ir a/Mensaje s_iguiente"
 
-#: src/mainwindow.c:572 src/mainwindow.c:577 src/mainwindow.c:580
-#: src/mainwindow.c:585 src/mainwindow.c:590
+#: src/mainwindow.c:575 src/mainwindow.c:580 src/mainwindow.c:583
+#: src/mainwindow.c:588 src/mainwindow.c:593
 msgid "/_View/_Go to/---"
 msgstr "/_Ver/_Ir a/---"
 
-#: src/mainwindow.c:573
+#: src/mainwindow.c:576
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/_Ver/_Ir a/_Anterior sin leer"
 
-#: src/mainwindow.c:575
+#: src/mainwindow.c:578
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/_Ver/_Ir a/_Siguiente sin leer"
 
-#: src/mainwindow.c:578
+#: src/mainwindow.c:581
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/_Ver/_Ir a/Mensaje nue_vo anterior"
 
-#: src/mainwindow.c:579
+#: src/mainwindow.c:582
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/_Ver/_Ir a/Mensaje n_uevo s_iguiente"
 
-#: src/mainwindow.c:581
+#: src/mainwindow.c:584
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/_Ver/_Ir a/Mensaje marcado a_nterior"
 
-#: src/mainwindow.c:583
+#: src/mainwindow.c:586
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/_Ver/_Ir a/Siguiente mensaje marcado"
 
-#: src/mainwindow.c:586
+#: src/mainwindow.c:589
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/_Ver/_Ir a/Mensaje etiquetado anterior"
 
-#: src/mainwindow.c:588
+#: src/mainwindow.c:591
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/_Ver/_Ir a/Siguiente mensaje etiquetado"
 
-#: src/mainwindow.c:591
+#: src/mainwindow.c:594
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Ver/_Ir a/_Ir a otra carpeta..."
 
-#: src/mainwindow.c:600 src/messageview.c:159
+#: src/mainwindow.c:603 src/messageview.c:159
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Ver/Codificación de caract_eres/_Autodetectar"
 
-#: src/mainwindow.c:613 src/messageview.c:172
+#: src/mainwindow.c:616 src/messageview.c:172
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr "/_Ver/Codificación de caract_eres/Europeo occidental (ISO-8859-_15)"
 
-#: src/mainwindow.c:653 src/messageview.c:205
+#: src/mainwindow.c:662 src/messageview.c:210
 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:655 src/messageview.c:207
+#: src/mainwindow.c:664 src/messageview.c:212
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Ver/Codificación de caract_eres/Japonés (_EUC-JP)"
 
-#: src/mainwindow.c:657 src/messageview.c:209
+#: src/mainwindow.c:666 src/messageview.c:214
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Ver/Codificación de caract_eres/Japonés (_Shift__JIS)"
 
-#: src/mainwindow.c:667 src/messageview.c:218
+#: src/mainwindow.c:676 src/messageview.c:223
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Ver/Codificación de caract_eres/Chino tradicional (EUC-_TW)"
 
-#: src/mainwindow.c:669 src/messageview.c:220
+#: src/mainwindow.c:678 src/messageview.c:225
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Ver/Codificación de caract_eres/Chino (ISO-2022-_CN)"
 
-#: src/mainwindow.c:675 src/messageview.c:225
+#: src/mainwindow.c:684 src/messageview.c:230
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Ver/Codificación de caract_eres/Coreano (ISO-2022-KR)"
 
-#: src/mainwindow.c:688 src/summaryview.c:449
+#: src/mainwindow.c:697 src/summaryview.c:451
 msgid "/_View/Open in new _window"
 msgstr "/_Ver/Abrir en una ventana _nueva"
 
-#: src/mainwindow.c:689 src/messageview.c:237
+#: src/mainwindow.c:698 src/messageview.c:242
 msgid "/_View/Mess_age source"
 msgstr "/_Ver/Fuente del mens_aje"
 
-#: src/mainwindow.c:690 src/messageview.c:238
+#: src/mainwindow.c:699 src/messageview.c:243
 msgid "/_View/Show all _header"
 msgstr "/_Ver/Mostrar todas las cabeceras"
 
-#: src/mainwindow.c:692
+#: src/mainwindow.c:701
 msgid "/_View/_Update summary"
 msgstr "/_Ver/Actualizar res_umen"
 
-#: src/mainwindow.c:694 src/messageview.c:240
+#: src/mainwindow.c:703 src/messageview.c:245
 msgid "/_Message"
 msgstr "/_Mensaje"
 
-#: src/mainwindow.c:695
+#: src/mainwindow.c:704
 msgid "/_Message/Recei_ve"
 msgstr "/_Mensaje/Reci_bir"
 
-#: src/mainwindow.c:696
+#: src/mainwindow.c:705
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/_Mensaje/Reci_bir/De la cuenta a_ctual"
 
-#: src/mainwindow.c:698
+#: src/mainwindow.c:707
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/_Mensaje/Reci_bir/De tod_as las cuentas"
 
-#: src/mainwindow.c:700
+#: src/mainwindow.c:709
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/_Mensaje/Reci_bir/Ca_ncelar recepción"
 
-#: src/mainwindow.c:702
+#: src/mainwindow.c:711
 msgid "/_Message/Recei_ve/---"
 msgstr "/_Mensaje/Reci_bir/---"
 
-#: src/mainwindow.c:703
+#: src/mainwindow.c:712
 msgid "/_Message/_Send queued messages"
 msgstr "/_Mensaje/Enviar mensa_jes en cola"
 
-#: src/mainwindow.c:704 src/mainwindow.c:706 src/mainwindow.c:713
-#: src/mainwindow.c:718 src/mainwindow.c:721 src/mainwindow.c:730
-#: src/mainwindow.c:732 src/mainwindow.c:735 src/messageview.c:243
-#: src/messageview.c:251 src/messageview.c:256
+#: src/mainwindow.c:713 src/mainwindow.c:715 src/mainwindow.c:722
+#: src/mainwindow.c:727 src/mainwindow.c:730 src/mainwindow.c:741
+#: src/mainwindow.c:743 src/mainwindow.c:746 src/messageview.c:248
+#: src/messageview.c:256 src/messageview.c:261
 msgid "/_Message/---"
 msgstr "/_Mensaje/---"
 
-#: src/mainwindow.c:705 src/messageview.c:241
+#: src/mainwindow.c:714 src/messageview.c:246
 msgid "/_Message/Compose _new message"
 msgstr "/_Mensaje/Componer _nuevo mensaje"
 
-#: src/mainwindow.c:707 src/messageview.c:244
+#: src/mainwindow.c:716 src/messageview.c:249
 msgid "/_Message/_Reply"
 msgstr "/_Mensaje/_Responder"
 
-#: src/mainwindow.c:708
+#: src/mainwindow.c:717
 msgid "/_Message/Repl_y to"
 msgstr "/_Mensaje/Respon_der a"
 
-#: src/mainwindow.c:709 src/messageview.c:245
+#: src/mainwindow.c:718 src/messageview.c:250
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Mensaje/Respon_der a/A _todos"
 
-#: src/mainwindow.c:710 src/messageview.c:247
+#: src/mainwindow.c:719 src/messageview.c:252
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Mensaje/Respon_der a/Al _remitente"
 
-#: src/mainwindow.c:711 src/messageview.c:249
+#: src/mainwindow.c:720 src/messageview.c:254
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Mensaje/Respon_der a/A la _lista de correo"
 
-#: src/mainwindow.c:714 src/messageview.c:252
+#: src/mainwindow.c:723 src/messageview.c:257
 msgid "/_Message/_Forward"
 msgstr "/_Mensaje/_Reenviar"
 
-#: src/mainwindow.c:715 src/messageview.c:253
+#: src/mainwindow.c:724 src/messageview.c:258
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Mensaje/Reen_viar como adjunto"
 
-#: src/mainwindow.c:717 src/messageview.c:255
+#: src/mainwindow.c:726 src/messageview.c:260
 msgid "/_Message/Redirec_t"
 msgstr "/_Mensaje/Red_irigir"
 
-#: src/mainwindow.c:719
+#: src/mainwindow.c:728
 msgid "/_Message/M_ove..."
 msgstr "/_Mensaje/M_over..."
 
-#: src/mainwindow.c:720
+#: src/mainwindow.c:729
 msgid "/_Message/_Copy..."
 msgstr "/_Mensaje/_Copiar..."
 
-#: src/mainwindow.c:722
+#: src/mainwindow.c:731
 msgid "/_Message/_Mark"
 msgstr "/_Mensaje/_Marcar"
 
-#: src/mainwindow.c:723
+#: src/mainwindow.c:732
 msgid "/_Message/_Mark/_Mark"
 msgstr "/_Mensaje/_Marcar/_Marcar"
 
-#: src/mainwindow.c:724
+#: src/mainwindow.c:733
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/_Mensaje/_Marcar/_Desmarcar"
 
-#: src/mainwindow.c:725
+#: src/mainwindow.c:734
 msgid "/_Message/_Mark/---"
 msgstr "/_Mensaje/_Marcar/---"
 
-#: src/mainwindow.c:726
+#: src/mainwindow.c:735
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/_Mensaje/_Marcar/Marcar como no leído"
 
-#: src/mainwindow.c:727
+#: src/mainwindow.c:736
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/_Mensaje/_Marcar/Marcar como leído"
 
-#: src/mainwindow.c:729
+#: src/mainwindow.c:738
+#, fuzzy
+msgid "/_Message/_Mark/Mark _thread as read"
+msgstr "/_Mensaje/_Marcar/Marcar como leído"
+
+#: src/mainwindow.c:740
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/_Mensaje/_Marcar/Marcar todo como leído"
 
-#: src/mainwindow.c:731
+#: src/mainwindow.c:742
 msgid "/_Message/_Delete"
 msgstr "/_Mensaje/_Borrar"
 
-#: src/mainwindow.c:733
+#: src/mainwindow.c:744
 msgid "/_Message/Set as _junk mail"
 msgstr "/_Mensaje/Es un correo _basura"
 
-#: src/mainwindow.c:734
+#: src/mainwindow.c:745
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/_Mensaje/No es un correo _basura"
 
-#: src/mainwindow.c:736 src/messageview.c:257
+#: src/mainwindow.c:747 src/messageview.c:262
 msgid "/_Message/Re-_edit"
 msgstr "/_Mensaje/Re_editar"
 
-#: src/mainwindow.c:740
+#: src/mainwindow.c:751
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/_Herramientas/Añadir remitente a la age_nda..."
 
-#: src/mainwindow.c:743
+#: src/mainwindow.c:754
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/_Herramientas/_Filtrar todos los mensajes de la carpeta"
 
-#: src/mainwindow.c:745
+#: src/mainwindow.c:756
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Herramientas/_Filtrar los mensajes seleccionados"
 
-#: src/mainwindow.c:747 src/messageview.c:264
+#: src/mainwindow.c:758 src/messageview.c:269
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Herramientas/_Crear regla de filtrado"
 
-#: src/mainwindow.c:748 src/messageview.c:266
+#: src/mainwindow.c:759 src/messageview.c:271
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Herramientas/_Crear regla de filtrado/_Automáticamente"
 
-#: src/mainwindow.c:750 src/messageview.c:268
+#: src/mainwindow.c:761 src/messageview.c:273
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Herramientas/_Crear regla de filtrado/Basada en _Desde"
 
-#: src/mainwindow.c:752 src/messageview.c:270
+#: src/mainwindow.c:763 src/messageview.c:275
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Herramientas/_Crear regla de filtrado/Basada en _Para"
 
-#: src/mainwindow.c:754 src/messageview.c:272
+#: src/mainwindow.c:765 src/messageview.c:277
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Herramientas/_Crear regla de filtrado/Basada en el _Asunto"
 
-#: src/mainwindow.c:757
+#: src/mainwindow.c:768
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/_Herramientas/_Filtrar mensajes basura en la carpeta"
 
-#: src/mainwindow.c:759
+#: src/mainwindow.c:770
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/_Herramientas/_Filtrar mensajes basura en los seleccionados"
 
-#: src/mainwindow.c:764
+#: src/mainwindow.c:775
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/_Herramientas/Borrar los mensajes re_petidos"
 
-#: src/mainwindow.c:767
+#: src/mainwindow.c:778
 msgid "/_Tools/E_xecute"
 msgstr "/_Herramientas/E_jecutar"
 
-#: src/mainwindow.c:769
+#: src/mainwindow.c:780
 msgid "/_Tools/_Log window"
 msgstr "/_Herramientas/_Ventana de traza"
 
-#: src/mainwindow.c:771
+#: src/mainwindow.c:782
 msgid "/_Configuration"
 msgstr "/_Configuración"
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:783
 msgid "/_Configuration/_Common preferences..."
 msgstr "/_Configuración/Preferencias _comunes..."
 
-#: src/mainwindow.c:774
+#: src/mainwindow.c:785
 msgid "/_Configuration/_Filter setting..."
 msgstr "/_Configuración/Preferencias de _filtrado..."
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:787
 msgid "/_Configuration/_Template..."
 msgstr "/_Configuración/_Plantillas ..."
 
-#: src/mainwindow.c:777
+#: src/mainwindow.c:788
 msgid "/_Configuration/_Actions..."
 msgstr "/_Configuración/_Acciones..."
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:789
 msgid "/_Configuration/---"
 msgstr "/_Configuración/---"
 
-#: src/mainwindow.c:779
+#: src/mainwindow.c:790
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Configuración/_Preferencias de la cuenta actual..."
 
-#: src/mainwindow.c:781
+#: src/mainwindow.c:792
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Configuración/Crear _nueva cuenta..."
 
-#: src/mainwindow.c:783
+#: src/mainwindow.c:794
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Configuración/_Editar cuentas..."
 
-#: src/mainwindow.c:785
+#: src/mainwindow.c:796
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Configuración/_Cambiar cuenta actual"
 
-#: src/mainwindow.c:789
+#: src/mainwindow.c:800
 msgid "/_Help/_Manual"
 msgstr "/_Ayuda/_Manual"
 
-#: src/mainwindow.c:790
+#: src/mainwindow.c:801
 msgid "/_Help/_Manual/_English"
 msgstr "/_Ayuda/_Manual/_Inglés"
 
-#: src/mainwindow.c:791
+#: src/mainwindow.c:802
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/_Ayuda/_Manual/_Japonés"
 
-#: src/mainwindow.c:792
+#: src/mainwindow.c:803
 msgid "/_Help/_FAQ"
 msgstr "/_Ayuda/_FAQ"
 
-#: src/mainwindow.c:793
+#: src/mainwindow.c:804
 msgid "/_Help/_FAQ/_English"
 msgstr "/_Ayuda/_FAQ/_Inglés"
 
-#: src/mainwindow.c:794
+#: src/mainwindow.c:805
 msgid "/_Help/_FAQ/_German"
 msgstr "/_Ayuda/_FAQ/_Alemán"
 
-#: src/mainwindow.c:795
+#: src/mainwindow.c:806
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/_Ayuda/_FAQ/_Español"
 
-#: src/mainwindow.c:796
+#: src/mainwindow.c:807
 msgid "/_Help/_FAQ/_French"
 msgstr "/_Ayuda/_FAQ/_Francés"
 
-#: src/mainwindow.c:797
+#: src/mainwindow.c:808
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/_Ayuda/_FAQ/_Italiano"
 
-#: src/mainwindow.c:798
+#: src/mainwindow.c:809
 msgid "/_Help/---"
 msgstr "/_Ayuda/---"
 
-#: src/mainwindow.c:841
+#: src/mainwindow.c:852
 msgid "Creating main window...\n"
 msgstr "Creando ventana principal...\n"
 
-#: src/mainwindow.c:1011
+#: src/mainwindow.c:1022
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "MainWindow: fallo solicitando color %d\n"
 
-#: src/mainwindow.c:1108 src/summaryview.c:2258 src/summaryview.c:2343
-#: src/summaryview.c:3739 src/summaryview.c:3868 src/summaryview.c:4226
+#: src/mainwindow.c:1119 src/summaryview.c:2275 src/summaryview.c:2360
+#: src/summaryview.c:3896 src/summaryview.c:4025 src/summaryview.c:4383
 msgid "done.\n"
 msgstr "hecho.\n"
 
-#: src/mainwindow.c:1235 src/mainwindow.c:1276 src/mainwindow.c:1301
+#: src/mainwindow.c:1246 src/mainwindow.c:1287 src/mainwindow.c:1312
 msgid "Untitled"
 msgstr "Sin título"
 
-#: src/mainwindow.c:1302
+#: src/mainwindow.c:1313
 msgid "none"
 msgstr "ninguna"
 
-#: src/mainwindow.c:1355
+#: src/mainwindow.c:1366
 #, 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:1605
+#: src/mainwindow.c:1616
 msgid "Offline"
 msgstr "Desconectado"
 
-#: src/mainwindow.c:1606
+#: src/mainwindow.c:1617
 msgid "You are offline. Go online?"
 msgstr "Esta desconectado. ¿Conectar?"
 
-#: src/mainwindow.c:1623
+#: src/mainwindow.c:1634
 msgid "Empty all trash"
 msgstr "Vaciar todas las papeleras"
 
-#: src/mainwindow.c:1624
+#: src/mainwindow.c:1635
 #, fuzzy
 msgid "Delete all messages in trash folders?"
 msgstr "¿Vaciar todos los mensajes de la papelera?"
 
-#: src/mainwindow.c:1652
+#: src/mainwindow.c:1663
 msgid "Add mailbox"
 msgstr "Añadir buzón"
 
-#: src/mainwindow.c:1653
+#: src/mainwindow.c:1664
 #, fuzzy
 msgid ""
 "Specify the location of mailbox.\n"
@@ -3591,16 +3607,16 @@ msgstr ""
 "Si el buzón especificado ya existe será\n"
 "escaneado automáticamente."
 
-#: src/mainwindow.c:1659 src/setup.c:49
+#: src/mainwindow.c:1670 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "El buzón «%s» ya existe."
 
-#: src/mainwindow.c:1664 src/setup.c:56
+#: src/mainwindow.c:1675 src/setup.c:56
 msgid "Mailbox"
 msgstr "Correo"
 
-#: src/mainwindow.c:1670 src/setup.c:62
+#: src/mainwindow.c:1681 src/setup.c:62
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3610,145 +3626,145 @@ msgstr ""
 "Quizás ya existan los ficheros o no tenga permisos suficientes para "
 "escribir  en el directorio."
 
-#: src/mainwindow.c:2088
+#: src/mainwindow.c:2099
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Árbol de carpetas"
 
-#: src/mainwindow.c:2107
+#: src/mainwindow.c:2118
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Vista de mensaje"
 
-#: src/mainwindow.c:2259 src/summaryview.c:408
+#: src/mainwindow.c:2270 src/summaryview.c:408
 msgid "/_Reply"
 msgstr "/_Responder"
 
-#: src/mainwindow.c:2260
+#: src/mainwindow.c:2271
 msgid "/Reply to _all"
 msgstr "/Responder a _todos"
 
-#: src/mainwindow.c:2261
+#: src/mainwindow.c:2272
 msgid "/Reply to _sender"
 msgstr "/Responder al _remitente"
 
-#: src/mainwindow.c:2262
+#: src/mainwindow.c:2273
 msgid "/Reply to mailing _list"
 msgstr "/Responder a la _lista de correo"
 
-#: src/mainwindow.c:2267 src/summaryview.c:415
+#: src/mainwindow.c:2278 src/summaryview.c:415
 msgid "/_Forward"
 msgstr "/_Reenviar"
 
-#: src/mainwindow.c:2268 src/summaryview.c:416
+#: src/mainwindow.c:2279 src/summaryview.c:416
 msgid "/For_ward as attachment"
 msgstr "/Reen_viar como adjunto"
 
-#: src/mainwindow.c:2269 src/summaryview.c:417
+#: src/mainwindow.c:2280 src/summaryview.c:417
 msgid "/Redirec_t"
 msgstr "/Red_irigir"
 
-#: src/mainwindow.c:2305
+#: src/mainwindow.c:2316
 msgid "Get"
 msgstr "Traer"
 
-#: src/mainwindow.c:2306
+#: src/mainwindow.c:2317
 msgid "Incorporate new mail"
 msgstr "Incorporar correo nuevo"
 
-#: src/mainwindow.c:2313
+#: src/mainwindow.c:2324
 msgid "Get all"
 msgstr "Traer todo"
 
-#: src/mainwindow.c:2314
+#: src/mainwindow.c:2325
 msgid "Incorporate new mail of all accounts"
 msgstr "Incorporar correo nuevo de todas las cuentas"
 
-#: src/mainwindow.c:2325
+#: src/mainwindow.c:2336
 msgid "Send queued message(s)"
 msgstr "Enviar mensaje(s) en la cola"
 
-#: src/mainwindow.c:2335 src/prefs_account_dialog.c:530
+#: src/mainwindow.c:2346 src/prefs_account_dialog.c:530
 #: src/prefs_common_dialog.c:663 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "Componer"
 
-#: src/mainwindow.c:2336
+#: src/mainwindow.c:2347
 msgid "Compose new message"
 msgstr "Componer mensaje nuevo"
 
-#: src/mainwindow.c:2344 src/prefs_common_dialog.c:975
+#: src/mainwindow.c:2355 src/prefs_common_dialog.c:975
 msgid "Reply"
 msgstr "Responder"
 
-#: src/mainwindow.c:2345 src/mainwindow.c:2358
+#: src/mainwindow.c:2356 src/mainwindow.c:2369
 msgid "Reply to the message"
 msgstr "Responder al mensaje"
 
-#: src/mainwindow.c:2362
+#: src/mainwindow.c:2373
 msgid "Reply all"
 msgstr "A todos"
 
-#: src/mainwindow.c:2363
+#: src/mainwindow.c:2374
 msgid "Reply to all"
 msgstr "Responder a todos"
 
-#: src/mainwindow.c:2371 src/prefs_filter_edit.c:672
+#: src/mainwindow.c:2382 src/prefs_filter_edit.c:672
 msgid "Forward"
 msgstr "Reenviar"
 
-#: src/mainwindow.c:2372 src/mainwindow.c:2385
+#: src/mainwindow.c:2383 src/mainwindow.c:2396
 msgid "Forward the message"
 msgstr "Reenviar el mensaje"
 
-#: src/mainwindow.c:2392
+#: src/mainwindow.c:2403
 msgid "Delete the message"
 msgstr "Borrar el mensaje"
 
-#: src/mainwindow.c:2401
+#: src/mainwindow.c:2412
 msgid "Set as junk mail"
 msgstr "Es correo basura"
 
-#: src/mainwindow.c:2410
+#: src/mainwindow.c:2421
 msgid "Execute"
 msgstr "Ejecutar"
 
-#: src/mainwindow.c:2411
+#: src/mainwindow.c:2422
 msgid "Execute marked process"
 msgstr "Ejecutar el proceso marcado"
 
-#: src/mainwindow.c:2421
+#: src/mainwindow.c:2432
 msgid "Next unread message"
 msgstr "Siguiente no leído"
 
-#: src/mainwindow.c:2433
+#: src/mainwindow.c:2444
 msgid "Prefs"
 msgstr "Preferencias"
 
-#: src/mainwindow.c:2434
+#: src/mainwindow.c:2445
 msgid "Common preferences"
 msgstr "Preferencias comunes"
 
-#: src/mainwindow.c:2442 src/prefs_folder_item.c:289
+#: src/mainwindow.c:2453 src/prefs_folder_item.c:289
 #: src/prefs_folder_item.c:300 src/progressdialog.c:128
 msgid "Account"
 msgstr "Cuenta"
 
-#: src/mainwindow.c:2443
+#: src/mainwindow.c:2454
 msgid "Account setting"
 msgstr "Preferencias de la cuenta"
 
-#: src/mainwindow.c:2615
+#: src/mainwindow.c:2626
 msgid "You are offline. Click the icon to go online."
 msgstr "Esta desconectado. Haga click en el icono para conectar."
 
-#: src/mainwindow.c:2626
+#: src/mainwindow.c:2637
 msgid "You are online. Click the icon to go offline."
 msgstr "Esta conectado. Haga click en el icono para desconectar."
 
-#: src/mainwindow.c:2892
+#: src/mainwindow.c:2903
 msgid "Exit"
 msgstr "Salir"
 
-#: src/mainwindow.c:2892
+#: src/mainwindow.c:2903
 msgid "Exit this program?"
 msgstr "¿Salir del programa?"
 
@@ -3785,45 +3801,45 @@ msgstr "Se llegó al final del mensaje. ¿Seguir desde el principio?"
 msgid "Search finished"
 msgstr "Búsqueda concluida"
 
-#: src/messageview.c:261
+#: src/messageview.c:266
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/_Herramientas/Añadir _remitente a la agenda"
 
-#: src/messageview.c:291
+#: src/messageview.c:296
 msgid "Creating message view...\n"
 msgstr "Creando visor de mensaje...\n"
 
-#: src/messageview.c:316
+#: src/messageview.c:321
 msgid "Text"
 msgstr "Texto"
 
-#: src/messageview.c:321
+#: src/messageview.c:326
 msgid "Attachments"
 msgstr "Adjuntos"
 
-#: src/messageview.c:371
+#: src/messageview.c:376
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:669 src/summaryview.c:3268
+#: src/messageview.c:674 src/summaryview.c:3425
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "No puedo guardar el fichero «%s»."
 
-#: src/messageview.c:728 src/summaryview.c:3291
+#: src/messageview.c:733 src/summaryview.c:3448
 msgid "The message will be printed with the following command:"
 msgstr ""
 
-#: src/messageview.c:729 src/summaryview.c:3292
+#: src/messageview.c:734 src/summaryview.c:3449
 #, fuzzy
 msgid "(Default print command)"
 msgstr "Orden para aprender:"
 
-#: src/messageview.c:731 src/prefs_common_dialog.c:2304 src/summaryview.c:3294
+#: src/messageview.c:736 src/prefs_common_dialog.c:2304 src/summaryview.c:3451
 msgid "Print"
 msgstr "Imprimir"
 
-#: src/messageview.c:740 src/summaryview.c:3303
+#: src/messageview.c:745 src/summaryview.c:3460
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -4718,8 +4734,8 @@ msgstr "Ver destinatario en la columna `Desde' si el remitente es usted mismo"
 msgid "Expand threads"
 msgstr "Expandir hilos"
 
-#: src/prefs_common_dialog.c:1413 src/prefs_common_dialog.c:2713
-#: src/prefs_common_dialog.c:2751
+#: src/prefs_common_dialog.c:1413 src/prefs_common_dialog.c:2716
+#: src/prefs_common_dialog.c:2754
 msgid "Date format"
 msgstr "Formato de fecha"
 
@@ -5004,8 +5020,8 @@ msgstr "Órdenes externas (%s se sustituirá con el nombre de fichero / URI)"
 msgid "Web browser"
 msgstr "Navegador web"
 
-#: src/prefs_common_dialog.c:2288 src/prefs_common_dialog.c:3775
-#: src/prefs_common_dialog.c:3796
+#: src/prefs_common_dialog.c:2288 src/prefs_common_dialog.c:3778
+#: src/prefs_common_dialog.c:3799
 #, fuzzy
 msgid "(Default browser)"
 msgstr "Buzón por defecto"
@@ -5082,214 +5098,224 @@ msgid "Greek (ISO-8859-7)"
 msgstr "Griego (ISO-8859-7)"
 
 #: src/prefs_common_dialog.c:2495
+#, fuzzy
+msgid "Arabic (ISO-8859-6)"
+msgstr "Báltico (ISO-8859-4)"
+
+#: src/prefs_common_dialog.c:2496
+#, fuzzy
+msgid "Arabic (Windows-1256)"
+msgstr "Cirílico (Windows-1251)"
+
+#: src/prefs_common_dialog.c:2498
 msgid "Hebrew (ISO-8859-8)"
 msgstr "Hebreo (ISO-8859-8)"
 
-#: src/prefs_common_dialog.c:2496
+#: src/prefs_common_dialog.c:2499
 msgid "Hebrew (Windows-1255)"
 msgstr "Hebreo (Windows-1255)"
 
-#: src/prefs_common_dialog.c:2498
+#: src/prefs_common_dialog.c:2501
 msgid "Turkish (ISO-8859-9)"
 msgstr "Turco (ISO-8859-9)"
 
-#: src/prefs_common_dialog.c:2500
+#: src/prefs_common_dialog.c:2503
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Cirílico (ISO-8859-5)"
 
-#: src/prefs_common_dialog.c:2501
+#: src/prefs_common_dialog.c:2504
 msgid "Cyrillic (KOI8-R)"
 msgstr "Cirílico (KOI8-R)"
 
-#: src/prefs_common_dialog.c:2502
+#: src/prefs_common_dialog.c:2505
 msgid "Cyrillic (KOI8-U)"
 msgstr "Cirílico (KOI8-U)"
 
-#: src/prefs_common_dialog.c:2503
+#: src/prefs_common_dialog.c:2506
 msgid "Cyrillic (Windows-1251)"
 msgstr "Cirílico (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2505
+#: src/prefs_common_dialog.c:2508
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Japonés (ISO-2022-JP)"
 
-#: src/prefs_common_dialog.c:2507
+#: src/prefs_common_dialog.c:2510
 msgid "Japanese (EUC-JP)"
 msgstr "Japonés (EUC-JP)"
 
-#: src/prefs_common_dialog.c:2508
+#: src/prefs_common_dialog.c:2511
 msgid "Japanese (Shift_JIS)"
 msgstr "Japonés (Shift_JIS)"
 
-#: src/prefs_common_dialog.c:2511
+#: src/prefs_common_dialog.c:2514
 msgid "Simplified Chinese (GB2312)"
 msgstr "Chino simplificado (GB2312)"
 
-#: src/prefs_common_dialog.c:2512
+#: src/prefs_common_dialog.c:2515
 msgid "Simplified Chinese (GBK)"
 msgstr "Chino simplificado (GBK)"
 
-#: src/prefs_common_dialog.c:2513
+#: src/prefs_common_dialog.c:2516
 msgid "Traditional Chinese (Big5)"
 msgstr "Chino tradicional (Big5)"
 
-#: src/prefs_common_dialog.c:2515
+#: src/prefs_common_dialog.c:2518
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Chino tradicional (EUC-TW)"
 
-#: src/prefs_common_dialog.c:2516
+#: src/prefs_common_dialog.c:2519
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Chino (ISO-2022-CN)"
 
-#: src/prefs_common_dialog.c:2519
+#: src/prefs_common_dialog.c:2522
 msgid "Korean (EUC-KR)"
 msgstr "Coreano (EUC-KR)"
 
-#: src/prefs_common_dialog.c:2521
+#: src/prefs_common_dialog.c:2524
 msgid "Thai (TIS-620)"
 msgstr "Tailandés (TIS-620)"
 
-#: src/prefs_common_dialog.c:2522
+#: src/prefs_common_dialog.c:2525
 msgid "Thai (Windows-874)"
 msgstr "Tailandés (Windows-874)"
 
-#: src/prefs_common_dialog.c:2689
+#: src/prefs_common_dialog.c:2692
 msgid "the full abbreviated weekday name"
 msgstr "el dia de la semana abreviado"
 
-#: src/prefs_common_dialog.c:2690
+#: src/prefs_common_dialog.c:2693
 msgid "the full weekday name"
 msgstr "el dia de la semana completo"
 
-#: src/prefs_common_dialog.c:2691
+#: src/prefs_common_dialog.c:2694
 msgid "the abbreviated month name"
 msgstr "el nombre del mes abreviado"
 
-#: src/prefs_common_dialog.c:2692
+#: src/prefs_common_dialog.c:2695
 msgid "the full month name"
 msgstr "el nombre del mes completo"
 
-#: src/prefs_common_dialog.c:2693
+#: src/prefs_common_dialog.c:2696
 msgid "the preferred date and time for the current locale"
 msgstr "la fecha y hora preferida para la localización actual"
 
-#: src/prefs_common_dialog.c:2694
+#: src/prefs_common_dialog.c:2697
 msgid "the century number (year/100)"
 msgstr "el número de siglo (año/100)"
 
-#: src/prefs_common_dialog.c:2695
+#: src/prefs_common_dialog.c:2698
 msgid "the day of the month as a decimal number"
 msgstr "el dia del mes como número decimal"
 
-#: src/prefs_common_dialog.c:2696
+#: src/prefs_common_dialog.c:2699
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "la hora como número usando el reloj de 24 horas"
 
-#: src/prefs_common_dialog.c:2697
+#: src/prefs_common_dialog.c:2700
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "la hora como número usando el reloj de 12 horas"
 
-#: src/prefs_common_dialog.c:2698
+#: src/prefs_common_dialog.c:2701
 msgid "the day of the year as a decimal number"
 msgstr "el dia del año como número decimal"
 
-#: src/prefs_common_dialog.c:2699
+#: src/prefs_common_dialog.c:2702
 msgid "the month as a decimal number"
 msgstr "el mes como número decimal"
 
-#: src/prefs_common_dialog.c:2700
+#: src/prefs_common_dialog.c:2703
 msgid "the minute as a decimal number"
 msgstr "el minuto como número decimal"
 
-#: src/prefs_common_dialog.c:2701
+#: src/prefs_common_dialog.c:2704
 msgid "either AM or PM"
 msgstr "AM o PM"
 
-#: src/prefs_common_dialog.c:2702
+#: src/prefs_common_dialog.c:2705
 msgid "the second as a decimal number"
 msgstr "el segundo como número decimal"
 
-#: src/prefs_common_dialog.c:2703
+#: src/prefs_common_dialog.c:2706
 msgid "the day of the week as a decimal number"
 msgstr "el dia de la semana como número decimal"
 
-#: src/prefs_common_dialog.c:2704
+#: src/prefs_common_dialog.c:2707
 msgid "the preferred date for the current locale"
 msgstr "la fecha preferida para la localización actual"
 
-#: src/prefs_common_dialog.c:2705
+#: src/prefs_common_dialog.c:2708
 msgid "the last two digits of a year"
 msgstr "los dos últimos dígitos del año"
 
-#: src/prefs_common_dialog.c:2706
+#: src/prefs_common_dialog.c:2709
 msgid "the year as a decimal number"
 msgstr "el año como número decimal"
 
-#: src/prefs_common_dialog.c:2707
+#: src/prefs_common_dialog.c:2710
 msgid "the time zone or name or abbreviation"
 msgstr "zona horaria o nombre o abreviatura"
 
-#: src/prefs_common_dialog.c:2728
+#: src/prefs_common_dialog.c:2731
 msgid "Specifier"
 msgstr "Especificador"
 
-#: src/prefs_common_dialog.c:2729
+#: src/prefs_common_dialog.c:2732
 msgid "Description"
 msgstr "Descripción"
 
-#: src/prefs_common_dialog.c:2769
+#: src/prefs_common_dialog.c:2772
 msgid "Example"
 msgstr "Ejemplo"
 
-#: src/prefs_common_dialog.c:2850
+#: src/prefs_common_dialog.c:2853
 msgid "Set message colors"
 msgstr "Colores del mensaje"
 
-#: src/prefs_common_dialog.c:2858
+#: src/prefs_common_dialog.c:2861
 msgid "Colors"
 msgstr "Colores"
 
-#: src/prefs_common_dialog.c:2892
+#: src/prefs_common_dialog.c:2895
 msgid "Quoted Text - First Level"
 msgstr "Texto citado - Primer nivel"
 
-#: src/prefs_common_dialog.c:2898
+#: src/prefs_common_dialog.c:2901
 msgid "Quoted Text - Second Level"
 msgstr "Texto citado - Segundo nivel"
 
-#: src/prefs_common_dialog.c:2904
+#: src/prefs_common_dialog.c:2907
 msgid "Quoted Text - Third Level"
 msgstr "Texto citado - Tercer nivel"
 
-#: src/prefs_common_dialog.c:2910
+#: src/prefs_common_dialog.c:2913
 msgid "URI link"
 msgstr "Enlace URI"
 
-#: src/prefs_common_dialog.c:2917
+#: src/prefs_common_dialog.c:2920
 msgid "Recycle quote colors"
 msgstr "Reutilizar colores de citación"
 
-#: src/prefs_common_dialog.c:2984
+#: src/prefs_common_dialog.c:2987
 msgid "Pick color for quotation level 1"
 msgstr "Elejir color para el nivel de citado 1"
 
-#: src/prefs_common_dialog.c:2987
+#: src/prefs_common_dialog.c:2990
 msgid "Pick color for quotation level 2"
 msgstr "Elejir color para el nivel de citado 2"
 
-#: src/prefs_common_dialog.c:2990
+#: src/prefs_common_dialog.c:2993
 msgid "Pick color for quotation level 3"
 msgstr "Elejir color para el nivel de citado 3"
 
-#: src/prefs_common_dialog.c:2993
+#: src/prefs_common_dialog.c:2996
 msgid "Pick color for URI"
 msgstr "Elejir color para URIs"
 
-#: src/prefs_common_dialog.c:3133
+#: src/prefs_common_dialog.c:3136
 msgid "Description of symbols"
 msgstr "Descripción de símbolos"
 
-#: src/prefs_common_dialog.c:3189
+#: src/prefs_common_dialog.c:3192
 msgid ""
 "Date\n"
 "From\n"
@@ -5313,11 +5339,11 @@ msgstr ""
 "Grupos de noticias\n"
 "ID-Mensaje"
 
-#: src/prefs_common_dialog.c:3202
+#: src/prefs_common_dialog.c:3205
 msgid "If x is set, displays expr"
 msgstr "Si x está, muestra expr"
 
-#: src/prefs_common_dialog.c:3206
+#: src/prefs_common_dialog.c:3209
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -5331,7 +5357,7 @@ msgstr ""
 "Cuerpo del mensaje citado sin firma\n"
 "El carácter %"
 
-#: src/prefs_common_dialog.c:3214
+#: src/prefs_common_dialog.c:3217
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -5343,20 +5369,20 @@ msgstr ""
 "Carácter llave abierta\n"
 "Carácter llave cerrada"
 
-#: src/prefs_common_dialog.c:3260
+#: src/prefs_common_dialog.c:3263
 msgid "Key bindings"
 msgstr "Atajos de teclado"
 
-#: src/prefs_common_dialog.c:3273
+#: src/prefs_common_dialog.c:3276
 #, fuzzy
 msgid "Select the preset of key bindings."
 msgstr " Establecer atajos de teclado... "
 
-#: src/prefs_common_dialog.c:3283 src/prefs_common_dialog.c:3607
+#: src/prefs_common_dialog.c:3286 src/prefs_common_dialog.c:3610
 msgid "Default"
 msgstr "Por defecto"
 
-#: src/prefs_common_dialog.c:3286 src/prefs_common_dialog.c:3616
+#: src/prefs_common_dialog.c:3289 src/prefs_common_dialog.c:3619
 msgid "Old Sylpheed"
 msgstr "Antiguos de Sylpheed"
 
@@ -5477,7 +5503,7 @@ msgstr "Resultado de una orden"
 msgid "Age"
 msgstr "Edad"
 
-#: src/prefs_filter_edit.c:501 src/summaryview.c:510
+#: src/prefs_filter_edit.c:501 src/summaryview.c:512
 #, fuzzy
 msgid "Marked"
 msgstr "Marca"
@@ -5708,17 +5734,17 @@ msgid "Attachment"
 msgstr "Adjunto"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73 src/query_search.c:371 src/summaryview.c:4733
+#: src/prefs_summary_column.c:73 src/query_search.c:371 src/summaryview.c:4890
 msgid "Subject"
 msgstr "Asunto"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/query_search.c:372 src/summaryview.c:4736
+#: src/prefs_summary_column.c:74 src/query_search.c:372 src/summaryview.c:4893
 msgid "From"
 msgstr "Desde"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/query_search.c:373 src/summaryview.c:4738
+#: src/prefs_summary_column.c:75 src/query_search.c:373 src/summaryview.c:4895
 msgid "Date"
 msgstr "Fecha"
 
@@ -5820,7 +5846,7 @@ msgstr "Buscar en los mensajes"
 msgid "_Save as search folder"
 msgstr "Guardar como borrador"
 
-#: src/query_search.c:512 src/subscribedialog.c:523 src/summaryview.c:840
+#: src/query_search.c:512 src/subscribedialog.c:523 src/summaryview.c:842
 msgid "Done."
 msgstr "Hecho."
 
@@ -5834,7 +5860,7 @@ msgstr "Revisando carpeta %s ..."
 msgid "Searching %s (%d / %d)..."
 msgstr "Filtrando..."
 
-#: src/query_search.c:645 src/summaryview.c:2048
+#: src/query_search.c:645 src/summaryview.c:2051
 msgid "(No Date)"
 msgstr "(Sin fecha)"
 
@@ -6208,306 +6234,311 @@ msgid "/_Mark/Mark as rea_d"
 msgstr "/_Marcar/Marcar como _leído"
 
 #: src/summaryview.c:429
+#, fuzzy
+msgid "/_Mark/Mark _thread as read"
+msgstr "/_Marcar/Marcar como _leído"
+
+#: src/summaryview.c:431
 msgid "/_Mark/Mark all _read"
 msgstr "/_Marcar/Marca_r todos leídos"
 
-#: src/summaryview.c:430
+#: src/summaryview.c:432
 msgid "/Color la_bel"
 msgstr "/E_tiquetar de color"
 
-#: src/summaryview.c:434
+#: src/summaryview.c:436
 msgid "/Re-_edit"
 msgstr "/Re_editar"
 
-#: src/summaryview.c:436
+#: src/summaryview.c:438
 msgid "/Add sender to address boo_k..."
 msgstr "/Añadir _remitente a la agenda..."
 
-#: src/summaryview.c:438
+#: src/summaryview.c:440
 #, fuzzy
 msgid "/Create f_ilter rule"
 msgstr "/_Herramientas/_Crear regla de filtrado"
 
-#: src/summaryview.c:439
+#: src/summaryview.c:441
 #, fuzzy
 msgid "/Create f_ilter rule/_Automatically"
 msgstr "/_Herramientas/_Crear regla de filtrado/_Automáticamente"
 
-#: src/summaryview.c:441
+#: src/summaryview.c:443
 #, fuzzy
 msgid "/Create f_ilter rule/by _From"
 msgstr "/_Herramientas/_Crear regla de filtrado/Basada en _Desde"
 
-#: src/summaryview.c:443
+#: src/summaryview.c:445
 #, fuzzy
 msgid "/Create f_ilter rule/by _To"
 msgstr "/_Herramientas/_Crear regla de filtrado/Basada en _Para"
 
-#: src/summaryview.c:445
+#: src/summaryview.c:447
 #, fuzzy
 msgid "/Create f_ilter rule/by _Subject"
 msgstr "/_Herramientas/_Crear regla de filtrado/Basada en el _Asunto"
 
-#: src/summaryview.c:451
+#: src/summaryview.c:453
 msgid "/_View/_Source"
 msgstr "/_Ver/_Fuente"
 
-#: src/summaryview.c:452
+#: src/summaryview.c:454
 msgid "/_View/All _header"
 msgstr "/_Ver/Todas las cabeceras"
 
-#: src/summaryview.c:454
+#: src/summaryview.c:456
 msgid "/_Print..."
 msgstr "/_Imprimir..."
 
-#: src/summaryview.c:486
+#: src/summaryview.c:488
 msgid "Creating summary view...\n"
 msgstr "Creando vista de cabeceras...\n"
 
-#: src/summaryview.c:508
+#: src/summaryview.c:510
 msgid "All"
 msgstr ""
 
-#: src/summaryview.c:511
+#: src/summaryview.c:513
 #, fuzzy
 msgid "Have color label"
 msgstr "/E_tiquetar de color"
 
-#: src/summaryview.c:512
+#: src/summaryview.c:514
 #, fuzzy
 msgid "Have attachment"
 msgstr "Adjunto"
 
-#: src/summaryview.c:521
+#: src/summaryview.c:523
 #, fuzzy
 msgid "Search:"
 msgstr " Buscar "
 
-#: src/summaryview.c:535
+#: src/summaryview.c:537
 msgid "Search for Subject or From"
 msgstr ""
 
-#: src/summaryview.c:702
+#: src/summaryview.c:704
 msgid "Process mark"
 msgstr "Procesar marcas"
 
-#: src/summaryview.c:703
+#: src/summaryview.c:705
 msgid "Some marks are left. Process it?"
 msgstr "Queda alguna marca. ¿Procesarla?"
 
-#: src/summaryview.c:749
+#: src/summaryview.c:751
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "Revisando carpeta (%s)..."
 
-#: src/summaryview.c:1292
+#: src/summaryview.c:1295
 msgid "_Search again"
 msgstr "_Buscar de nuevo"
 
-#: src/summaryview.c:1313 src/summaryview.c:1322
+#: src/summaryview.c:1316 src/summaryview.c:1325
 msgid "No more unread messages"
 msgstr "No hay más mensajes sin leer"
 
-#: src/summaryview.c:1314
+#: src/summaryview.c:1317
 msgid "No unread message found. Search from the end?"
 msgstr "No hay mensajes sin leer. ¿Buscar desde el final?"
 
-#: src/summaryview.c:1316
+#: src/summaryview.c:1319
 msgid "No unread messages."
 msgstr "No hay mensajes sin leer."
 
-#: src/summaryview.c:1323
+#: src/summaryview.c:1326
 msgid "No unread message found. Go to next folder?"
 msgstr "No hay mensajes sin leer. ¿Ir a la carpeta siguiente?"
 
-#: src/summaryview.c:1331 src/summaryview.c:1340
+#: src/summaryview.c:1334 src/summaryview.c:1343
 msgid "No more new messages"
 msgstr "No hay más mensajes nuevos"
 
-#: src/summaryview.c:1332
+#: src/summaryview.c:1335
 msgid "No new message found. Search from the end?"
 msgstr "No hay más mensajes nuevos. ¿Buscar desde el final?"
 
-#: src/summaryview.c:1334
+#: src/summaryview.c:1337
 msgid "No new messages."
 msgstr "No hay mensajes nuevos."
 
-#: src/summaryview.c:1341
+#: src/summaryview.c:1344
 msgid "No new message found. Go to next folder?"
 msgstr "No hay más mensajes nuevos. ¿Ir a la carpeta siguiente?"
 
-#: src/summaryview.c:1349 src/summaryview.c:1358
+#: src/summaryview.c:1352 src/summaryview.c:1361
 msgid "No more marked messages"
 msgstr "No hay más mensajes marcados"
 
-#: src/summaryview.c:1350
+#: src/summaryview.c:1353
 msgid "No marked message found. Search from the end?"
 msgstr "No hay mensajes marcados. ¿Buscar desde el final?"
 
-#: src/summaryview.c:1352 src/summaryview.c:1361
+#: src/summaryview.c:1355 src/summaryview.c:1364
 msgid "No marked messages."
 msgstr "No hay mensajes marcados."
 
-#: src/summaryview.c:1359
+#: src/summaryview.c:1362
 msgid "No marked message found. Search from the beginning?"
 msgstr "No hay mensajes marcados. ¿Buscar desde el principio?"
 
-#: src/summaryview.c:1367 src/summaryview.c:1376
+#: src/summaryview.c:1370 src/summaryview.c:1379
 msgid "No more labeled messages"
 msgstr "No hay más mensajes etiquetados"
 
-#: src/summaryview.c:1368
+#: src/summaryview.c:1371
 msgid "No labeled message found. Search from the end?"
 msgstr "No hay mensajes etiquetados. ¿Buscar desde el final?"
 
-#: src/summaryview.c:1370 src/summaryview.c:1379
+#: src/summaryview.c:1373 src/summaryview.c:1382
 msgid "No labeled messages."
 msgstr "No hay mensajes etiquetados."
 
-#: src/summaryview.c:1377
+#: src/summaryview.c:1380
 msgid "No labeled message found. Search from the beginning?"
 msgstr "No hay mensajes etiquetados. ¿Buscar desde el principio?"
 
-#: src/summaryview.c:1693
+#: src/summaryview.c:1696
 msgid "Attracting messages by subject..."
 msgstr "Agrupando mensajes por asunto..."
 
-#: src/summaryview.c:1887
+#: src/summaryview.c:1890
 #, c-format
 msgid "%d deleted"
 msgstr "%d borrados"
 
-#: src/summaryview.c:1891
+#: src/summaryview.c:1894
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d movidos"
 
-#: src/summaryview.c:1892 src/summaryview.c:1897
+#: src/summaryview.c:1895 src/summaryview.c:1900
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:1896
+#: src/summaryview.c:1899
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d copiado"
 
-#: src/summaryview.c:1911
+#: src/summaryview.c:1914
 msgid " item(s) selected"
 msgstr " elemento(s) seleccionados"
 
-#: src/summaryview.c:1933
+#: src/summaryview.c:1936
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d nuevos, %d no leídos, %d totales (%s)"
 
-#: src/summaryview.c:1937
+#: src/summaryview.c:1940
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d nuevos, %d no leídos, %d totales"
 
-#: src/summaryview.c:1971
+#: src/summaryview.c:1974
 msgid "Sorting summary..."
 msgstr "Ordenando cabeceras..."
 
-#: src/summaryview.c:2194
+#: src/summaryview.c:2211
 msgid "\tSetting summary from message data..."
 msgstr "\tExtrayendo cabeceras de los mensajes..."
 
-#: src/summaryview.c:2196
+#: src/summaryview.c:2213
 msgid "Setting summary from message data..."
 msgstr "Resumiendo los mensajes..."
 
-#: src/summaryview.c:2302
+#: src/summaryview.c:2319
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Escribiendo caché resumen (%s)..."
 
-#: src/summaryview.c:2643
+#: src/summaryview.c:2660
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Mensaje %d está marcado\n"
 
-#: src/summaryview.c:2701
+#: src/summaryview.c:2718
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Mensaje %d marcado como leído\n"
 
-#: src/summaryview.c:2789
+#: src/summaryview.c:2908
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Mensaje %d marcado como no leído\n"
 
-#: src/summaryview.c:2850
+#: src/summaryview.c:2969
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Mensaje %s/%d marcado para borrar\n"
 
-#: src/summaryview.c:2878
+#: src/summaryview.c:2997
 msgid "Delete message(s)"
 msgstr "Borrar mensaje(s)"
 
-#: src/summaryview.c:2879
+#: src/summaryview.c:2998
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "¿Quiere realmente borrar el/los mensaje(s) de la papelera?"
 
-#: src/summaryview.c:2953
+#: src/summaryview.c:3072
 msgid "Deleting duplicated messages..."
 msgstr "Borrando mensajes duplicados..."
 
-#: src/summaryview.c:2991
+#: src/summaryview.c:3110
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Mensaje %s/%d desmarcado\n"
 
-#: src/summaryview.c:3049
+#: src/summaryview.c:3168
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Mensaje %d marcado para mover a %s\n"
 
-#: src/summaryview.c:3066
+#: src/summaryview.c:3196
 msgid "Destination is same as current folder."
 msgstr "El destino es el mismo que la carpeta actual."
 
-#: src/summaryview.c:3122
+#: src/summaryview.c:3260
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Mensaje %d marcado para copiar a %s\n"
 
-#: src/summaryview.c:3139
+#: src/summaryview.c:3288
 msgid "Destination for copy is same as current folder."
 msgstr "El destino de la copia es el mismo que la carpeta actual."
 
-#: src/summaryview.c:3338
+#: src/summaryview.c:3495
 msgid "Error occurred while processing messages."
 msgstr "Hubo algún error al procesar los mensajes."
 
-#: src/summaryview.c:3646 src/summaryview.c:3647
+#: src/summaryview.c:3803 src/summaryview.c:3804
 msgid "Building threads..."
 msgstr "Construyendo hilos..."
 
-#: src/summaryview.c:3797 src/summaryview.c:3798
+#: src/summaryview.c:3954 src/summaryview.c:3955
 msgid "Unthreading..."
 msgstr "Deshaciendo hilos..."
 
-#: src/summaryview.c:4091 src/summaryview.c:4147
+#: src/summaryview.c:4248 src/summaryview.c:4304
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtrando..."
 
-#: src/summaryview.c:4196
+#: src/summaryview.c:4353
 msgid "filtering..."
 msgstr "filtrando..."
 
-#: src/summaryview.c:4197
+#: src/summaryview.c:4354
 msgid "Filtering..."
 msgstr "Filtrando..."
 
-#: src/summaryview.c:4233
+#: src/summaryview.c:4390
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "se ha(n) filtrado %d mensaje(s)."
 
-#: src/summaryview.c:4742
+#: src/summaryview.c:4899
 msgid "No."
 msgstr "No."
 
@@ -6524,31 +6555,31 @@ msgstr "Creando vista de texto...\n"
 msgid "This message can't be displayed.\n"
 msgstr "Este mensaje no puede visualizarse.\n"
 
-#: src/textview.c:1929
+#: src/textview.c:1925
 msgid "Sa_ve this image as..."
 msgstr "_Guardar imagen como..."
 
-#: src/textview.c:1945 src/trayicon.c:109
+#: src/textview.c:1941 src/trayicon.c:109
 msgid "Compose _new message"
 msgstr "Componer mensaje _nuevo"
 
-#: src/textview.c:1947
+#: src/textview.c:1943
 msgid "Add to address _book..."
 msgstr "Añadir _remitente a la agenda..."
 
-#: src/textview.c:1949
+#: src/textview.c:1945
 msgid "Copy this add_ress"
 msgstr "Copiar esta di_rección"
 
-#: src/textview.c:1952
+#: src/textview.c:1948
 msgid "_Open with Web browser"
 msgstr "_Abrir con el navegador web"
 
-#: src/textview.c:1954
+#: src/textview.c:1950
 msgid "Copy this _link"
 msgstr "Copiar el en_lace"
 
-#: src/textview.c:2097
+#: src/textview.c:2093
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6560,7 +6591,7 @@ msgstr ""
 "URL aparente (%s).\n"
 "¿Quiere abrirla de todas maneras?"
 
-#: src/textview.c:2102
+#: src/textview.c:2098
 msgid "Fake URL warning"
 msgstr "Aviso de URL falsa"
 
diff --git a/po/et.po b/po/et.po
index 9f44a206..af15c70a 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: 2006-01-27 18:11+0900\n"
+"POT-Creation-Date: 2006-01-31 15:20+0900\n"
 "PO-Revision-Date: 2002-10-02 09:08+0300\n"
 "Last-Translator: Peeter Vois <Peeter.Vois@mail.ee>\n"
 "Language-Team: Estonian <et@li.org>\n"
@@ -508,7 +508,7 @@ msgstr "Leiti %s\n"
 msgid "Configuration is saved.\n"
 msgstr "Häälestus on salvestatud.\n"
 
-#: libsylph/prefs_common.c:489
+#: libsylph/prefs_common.c:491
 #, fuzzy
 msgid "Junk mail filter"
 msgstr "Kaust"
@@ -625,8 +625,8 @@ msgstr ""
 msgid "%.2fGB"
 msgstr ""
 
-#: libsylph/utils.c:2373 src/compose.c:2858 src/compose.c:3121
-#: src/compose.c:3184 src/compose.c:3304
+#: libsylph/utils.c:2373 src/compose.c:2867 src/compose.c:3130
+#: src/compose.c:3193 src/compose.c:3313
 msgid "can't change file mode\n"
 msgstr "Ei suuda muuta faili omadusi\n"
 
@@ -711,8 +711,8 @@ msgstr ""
 "*Uusi teateid võetakse selles järjekorras. Märgi kastikesed\n"
 "'G' tulbas lubamaks kirjade võtmist kasutades 'Võta kõik'."
 
-#: src/account_dialog.c:366 src/addressadd.c:192 src/addressbook.c:491
-#: src/compose.c:4262 src/editaddress.c:200 src/editaddress.c:942
+#: src/account_dialog.c:366 src/addressadd.c:192 src/addressbook.c:493
+#: src/compose.c:4271 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:206 src/prefs_filter.c:259 src/prefs_folder_item.c:171
@@ -848,12 +848,12 @@ msgstr ""
 msgid "Add Address to Book"
 msgstr "Lisa aadress raamatusse"
 
-#: src/addressadd.c:202 src/compose.c:4762 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4771 src/editaddress.c:201
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "Aadress"
 
-#: src/addressadd.c:212 src/addressbook.c:493 src/editaddress.c:202
+#: src/addressadd.c:212 src/addressbook.c:495 src/editaddress.c:202
 #: src/editaddress.c:795 src/editaddress.c:860 src/editgroup.c:267
 msgid "Remarks"
 msgstr "Märkused"
@@ -862,183 +862,183 @@ msgstr "Märkused"
 msgid "Select Address Book Folder"
 msgstr "Vali aadressiraamatu kaust"
 
-#: src/addressbook.c:336 src/compose.c:515 src/mainwindow.c:477
+#: src/addressbook.c:338 src/compose.c:515 src/mainwindow.c:480
 #: src/messageview.c:138
 msgid "/_File"
 msgstr "/_Fail"
 
-#: src/addressbook.c:337
+#: src/addressbook.c:339
 msgid "/_File/New _Book"
 msgstr "/_Fail/Uus raamat"
 
-#: src/addressbook.c:338
+#: src/addressbook.c:340
 msgid "/_File/New _vCard"
 msgstr "/_Fail/Uus _V-Kaart"
 
-#: src/addressbook.c:340
+#: src/addressbook.c:342
 msgid "/_File/New _JPilot"
 msgstr "/_Fail/Uus _JPiloot"
 
-#: src/addressbook.c:343
+#: src/addressbook.c:345
 msgid "/_File/New _Server"
 msgstr "/_Fail/Uus _Server"
 
-#: src/addressbook.c:345 src/addressbook.c:348 src/compose.c:520
-#: src/compose.c:525 src/compose.c:528 src/compose.c:531 src/mainwindow.c:495
-#: src/mainwindow.c:498 src/mainwindow.c:500 src/mainwindow.c:503
-#: src/mainwindow.c:505 src/messageview.c:141
+#: src/addressbook.c:347 src/addressbook.c:350 src/compose.c:520
+#: src/compose.c:525 src/compose.c:528 src/compose.c:531 src/mainwindow.c:498
+#: src/mainwindow.c:501 src/mainwindow.c:503 src/mainwindow.c:506
+#: src/mainwindow.c:508 src/messageview.c:141
 msgid "/_File/---"
 msgstr "/_Fail/---"
 
-#: src/addressbook.c:346
+#: src/addressbook.c:348
 msgid "/_File/_Edit"
 msgstr "/_Fail/R_edigeeri"
 
-#: src/addressbook.c:347
+#: src/addressbook.c:349
 msgid "/_File/_Delete"
 msgstr "/_Fail/Kustuta"
 
-#: src/addressbook.c:349
+#: src/addressbook.c:351
 msgid "/_File/_Save"
 msgstr "/_Fail/_Salvesta"
 
-#: src/addressbook.c:350 src/compose.c:532 src/messageview.c:142
+#: src/addressbook.c:352 src/compose.c:532 src/messageview.c:142
 msgid "/_File/_Close"
 msgstr "/_Fail/Sul_ge"
 
-#: src/addressbook.c:351
+#: src/addressbook.c:353
 msgid "/_Address"
 msgstr "/_Aadress"
 
-#: src/addressbook.c:352
+#: src/addressbook.c:354
 msgid "/_Address/New _Address"
 msgstr "/_Aadress/Uus _Aadress"
 
-#: src/addressbook.c:353
+#: src/addressbook.c:355
 msgid "/_Address/New _Group"
 msgstr "/_Aadress/Uus _Grupp"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:356
 msgid "/_Address/New _Folder"
 msgstr "/_Aadress/Uus Kaust"
 
-#: src/addressbook.c:355
+#: src/addressbook.c:357
 msgid "/_Address/---"
 msgstr "/_Aadress/---"
 
-#: src/addressbook.c:356
+#: src/addressbook.c:358
 msgid "/_Address/_Edit"
 msgstr "/_Aadress/R_edigeeri"
 
-#: src/addressbook.c:357
+#: src/addressbook.c:359
 msgid "/_Address/_Delete"
 msgstr "/_Aadress/Kustuta"
 
-#: src/addressbook.c:358 src/compose.c:639 src/mainwindow.c:738
-#: src/messageview.c:259
+#: src/addressbook.c:360 src/compose.c:645 src/mainwindow.c:749
+#: src/messageview.c:264
 msgid "/_Tools"
 msgstr "/_Tööriist"
 
-#: src/addressbook.c:359
+#: src/addressbook.c:361
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Tööriist/Impordi _LDIF fail"
 
-#: src/addressbook.c:360 src/compose.c:658 src/mainwindow.c:788
-#: src/messageview.c:277
+#: src/addressbook.c:362 src/compose.c:664 src/mainwindow.c:799
+#: src/messageview.c:282
 msgid "/_Help"
 msgstr "/_Abi"
 
-#: src/addressbook.c:361 src/compose.c:659 src/mainwindow.c:799
-#: src/messageview.c:278
+#: src/addressbook.c:363 src/compose.c:665 src/mainwindow.c:810
+#: src/messageview.c:283
 msgid "/_Help/_About"
 msgstr "/_Abi/Sellest"
 
-#: src/addressbook.c:380 src/addressbook.c:390
+#: src/addressbook.c:382 src/addressbook.c:392
 msgid "/New _Address"
 msgstr "/Uus _Aadress"
 
-#: src/addressbook.c:381 src/addressbook.c:391
+#: src/addressbook.c:383 src/addressbook.c:393
 msgid "/New _Group"
 msgstr "/Uus _Grupp"
 
-#: src/addressbook.c:382 src/addressbook.c:392
+#: src/addressbook.c:384 src/addressbook.c:394
 msgid "/New _Folder"
 msgstr "/Uus Kaust"
 
-#: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:509
+#: src/addressbook.c:385 src/addressbook.c:395 src/compose.c:509
 #: src/folderview.c:246 src/folderview.c:248 src/folderview.c:253
 #: src/folderview.c:266 src/folderview.c:268 src/folderview.c:270
 #: src/folderview.c:275 src/folderview.c:289 src/folderview.c:291
 #: src/folderview.c:295 src/summaryview.c:414 src/summaryview.c:418
-#: src/summaryview.c:421 src/summaryview.c:431 src/summaryview.c:433
-#: src/summaryview.c:435 src/summaryview.c:447 src/summaryview.c:453
+#: src/summaryview.c:421 src/summaryview.c:433 src/summaryview.c:435
+#: src/summaryview.c:437 src/summaryview.c:449 src/summaryview.c:455
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:534
-#: src/mainwindow.c:509 src/messageview.c:144
+#: src/addressbook.c:386 src/addressbook.c:396 src/compose.c:534
+#: src/mainwindow.c:512 src/messageview.c:144
 msgid "/_Edit"
 msgstr "/R_edaktor"
 
-#: src/addressbook.c:385 src/addressbook.c:395 src/summaryview.c:432
+#: src/addressbook.c:387 src/addressbook.c:397 src/summaryview.c:434
 msgid "/_Delete"
 msgstr "/Kustuta"
 
-#: src/addressbook.c:492
+#: src/addressbook.c:494
 msgid "E-Mail address"
 msgstr "E-Posti aadress"
 
-#: src/addressbook.c:496 src/compose.c:4763 src/prefs_common_dialog.c:2183
+#: src/addressbook.c:498 src/compose.c:4772 src/prefs_common_dialog.c:2183
 msgid "Address book"
 msgstr "Aadressiraamat"
 
-#: src/addressbook.c:596 src/prefs_filter_edit.c:249
+#: src/addressbook.c:600 src/prefs_filter_edit.c:249
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "Nimi:"
 
 #. Buttons
-#: src/addressbook.c:628 src/addressbook.c:1680 src/editaddress.c:884
-#: src/editaddress.c:1017 src/mainwindow.c:2391 src/prefs_actions.c:266
+#: src/addressbook.c:632 src/addressbook.c:1684 src/editaddress.c:884
+#: src/editaddress.c:1017 src/mainwindow.c:2402 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
 #: src/prefs_template.c:233
 msgid "Delete"
 msgstr "Kustuta"
 
-#: src/addressbook.c:631 src/editaddress.c:890 src/editaddress.c:1023
+#: src/addressbook.c:635 src/editaddress.c:890 src/editaddress.c:1023
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:273 src/prefs_display_header.c:328
 #: src/prefs_filter_edit.c:1550
 msgid "Add"
 msgstr "Lisa"
 
-#: src/addressbook.c:634
+#: src/addressbook.c:638
 msgid "Lookup"
 msgstr "Otsi"
 
-#: src/addressbook.c:646 src/headerview.c:55 src/prefs_folder_item.c:339
+#: src/addressbook.c:650 src/headerview.c:55 src/prefs_folder_item.c:339
 #: src/prefs_template.c:176
 msgid "To:"
 msgstr "Kellele:"
 
-#: src/addressbook.c:650 src/prefs_folder_item.c:356 src/prefs_template.c:178
+#: src/addressbook.c:654 src/prefs_folder_item.c:356 src/prefs_template.c:178
 msgid "Cc:"
 msgstr "Koopia:"
 
-#: src/addressbook.c:654 src/prefs_folder_item.c:367
+#: src/addressbook.c:658 src/prefs_folder_item.c:367
 msgid "Bcc:"
 msgstr "Pimekoopia:"
 
 #. Confirm deletion
-#: src/addressbook.c:841
+#: src/addressbook.c:845
 msgid "Delete address(es)"
 msgstr "Kustuta aadress(id)"
 
-#: src/addressbook.c:842
+#: src/addressbook.c:846
 msgid "Really delete the address(es)?"
 msgstr "Kas te tõesti soovite aadresse kustutada?"
 
-#: src/addressbook.c:1671
+#: src/addressbook.c:1675
 #, fuzzy, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1047,38 +1047,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:1674 src/folderview.c:2351
+#: src/addressbook.c:1678 src/folderview.c:2351
 msgid "Delete folder"
 msgstr "Kustuta kaust"
 
-#: src/addressbook.c:1674
+#: src/addressbook.c:1678
 #, fuzzy
 msgid "_Folder only"
 msgstr "Ainult kataloog"
 
-#: src/addressbook.c:1674
+#: src/addressbook.c:1678
 #, fuzzy
 msgid "Folder and _addresses"
 msgstr "Kaust ja aadressid"
 
-#: src/addressbook.c:1679
+#: src/addressbook.c:1683
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Kas tõesti kustutada `%s' ?"
 
-#: src/addressbook.c:2365 src/addressbook.c:2498
+#: src/addressbook.c:2369 src/addressbook.c:2502
 msgid "New user, could not save index file."
 msgstr "Uus kasutaja, ei saanud salvestada indeksifaili."
 
-#: src/addressbook.c:2369 src/addressbook.c:2502
+#: src/addressbook.c:2373 src/addressbook.c:2506
 msgid "New user, could not save address book files."
 msgstr "Uus kasutaja, ei saanud salvestada aadressiraamatu faile."
 
-#: src/addressbook.c:2379 src/addressbook.c:2512
+#: src/addressbook.c:2383 src/addressbook.c:2516
 msgid "Old address book converted successfully."
 msgstr "Vana aadressiraamat uuendati edukalt."
 
-#: src/addressbook.c:2384
+#: src/addressbook.c:2388
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1086,7 +1086,7 @@ msgstr ""
 "Vana aadressiraamat uuendati.\n"
 "ei saanud salvestada uut aadresside indeksifaili"
 
-#: src/addressbook.c:2397
+#: src/addressbook.c:2401
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1094,7 +1094,7 @@ msgstr ""
 "Ei saanud uuendada aadressiraamatut,\n"
 "kuid loodi uued ja tühjad aadressiraamatu failid."
 
-#: src/addressbook.c:2403
+#: src/addressbook.c:2407
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1102,7 +1102,7 @@ msgstr ""
 "Ei suutnud uuendada aadressiraamatut,\n"
 "ei suutnud luua uusi aadressiraamatu faile."
 
-#: src/addressbook.c:2408
+#: src/addressbook.c:2412
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1110,91 +1110,91 @@ msgstr ""
 "Ei suutnud uuendada aadressiraamatut,\n"
 "ja ei suutnud luua uut aadressiraamatu faile."
 
-#: src/addressbook.c:2415
+#: src/addressbook.c:2419
 msgid "Addressbook conversion error"
 msgstr "Aadressiraamatu uuendamise viga"
 
-#: src/addressbook.c:2419
+#: src/addressbook.c:2423
 msgid "Addressbook conversion"
 msgstr "Aadressiraamat viiakse uude formaati"
 
-#: src/addressbook.c:2454
+#: src/addressbook.c:2458
 msgid "Addressbook Error"
 msgstr "Aadressiraamatu viga"
 
-#: src/addressbook.c:2455 src/addressbook.c:2555
+#: src/addressbook.c:2459 src/addressbook.c:2559
 msgid "Could not read address index"
 msgstr "Ei suutnud lugeda aadresside indeksit"
 
-#: src/addressbook.c:2517
+#: src/addressbook.c:2521
 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:2531
+#: src/addressbook.c:2535
 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:2537
+#: src/addressbook.c:2541
 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:2543
+#: src/addressbook.c:2547
 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:2561
+#: src/addressbook.c:2565
 msgid "Addressbook Conversion Error"
 msgstr "Aadressiraamatu uuendamise viga"
 
-#: src/addressbook.c:2567
+#: src/addressbook.c:2571
 msgid "Addressbook Conversion"
 msgstr "Aadressiraamatu uuendamine"
 
-#: src/addressbook.c:3072 src/prefs_common_dialog.c:2033
+#: src/addressbook.c:3086 src/prefs_common_dialog.c:2033
 msgid "Interface"
 msgstr "Kasutajaliides"
 
-#: src/addressbook.c:3088 src/importldif.c:514
+#: src/addressbook.c:3102 src/importldif.c:514
 msgid "Address Book"
 msgstr "Aadressiraamat"
 
-#: src/addressbook.c:3104
+#: src/addressbook.c:3118
 msgid "Person"
 msgstr "Persoon"
 
-#: src/addressbook.c:3120
+#: src/addressbook.c:3134
 msgid "EMail Address"
 msgstr "EPosti Aadress"
 
-#: src/addressbook.c:3136
+#: src/addressbook.c:3150
 msgid "Group"
 msgstr "Grupp"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3152 src/folderview.c:367 src/prefs_account_dialog.c:1694
+#: src/addressbook.c:3166 src/folderview.c:367 src/prefs_account_dialog.c:1694
 #: src/query_search.c:370
 msgid "Folder"
 msgstr "Kaust"
 
-#: src/addressbook.c:3168
+#: src/addressbook.c:3182
 msgid "vCard"
 msgstr "V-Kaart"
 
-#: src/addressbook.c:3184 src/addressbook.c:3200
+#: src/addressbook.c:3198 src/addressbook.c:3214
 msgid "JPilot"
 msgstr "JPiloot"
 
-#: src/addressbook.c:3216
+#: src/addressbook.c:3230
 msgid "LDAP Server"
 msgstr "LDAP Server"
 
@@ -1206,7 +1206,7 @@ msgstr "Üldine aadress"
 msgid "Personal address"
 msgstr "Isiklik aadress"
 
-#: src/alertpanel.c:141 src/compose.c:5485 src/main.c:573
+#: src/alertpanel.c:141 src/compose.c:5494 src/main.c:573
 msgid "Notice"
 msgstr "Märkus"
 
@@ -1257,7 +1257,7 @@ msgstr "Pruun"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4593
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4750
 msgid "None"
 msgstr "Mittemiski"
 
@@ -1320,7 +1320,7 @@ msgstr "/R_edigeeri/_Tühista"
 msgid "/_Edit/_Redo"
 msgstr "R_edigeeri/_Ennista"
 
-#: src/compose.c:537 src/compose.c:544 src/mainwindow.c:513
+#: src/compose.c:537 src/compose.c:544 src/mainwindow.c:516
 #: src/messageview.c:147
 msgid "/_Edit/---"
 msgstr "/R-edaktor/---"
@@ -1329,7 +1329,7 @@ msgstr "/R-edaktor/---"
 msgid "/_Edit/Cu_t"
 msgstr "/R_edaktor/_Lõika"
 
-#: src/compose.c:539 src/mainwindow.c:510 src/messageview.c:145
+#: src/compose.c:539 src/mainwindow.c:513 src/messageview.c:145
 msgid "/_Edit/_Copy"
 msgstr "/R_edaktor/_Kopeeri"
 
@@ -1341,7 +1341,7 @@ msgstr "/R_edaktor/_Aseta"
 msgid "/_Edit/Paste as _quotation"
 msgstr "/R_edaktor/Aseta kui tsitaat"
 
-#: src/compose.c:543 src/mainwindow.c:511 src/messageview.c:146
+#: src/compose.c:543 src/mainwindow.c:514 src/messageview.c:146
 msgid "/_Edit/Select _all"
 msgstr "/R_edaktor/_Märgi kõik"
 
@@ -1358,8 +1358,8 @@ msgstr "/R_edaktor/Ää_rista kõik pikad read"
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/R_edaktor/_Kopeeri"
 
-#: src/compose.c:550 src/mainwindow.c:518 src/messageview.c:151
-#: src/summaryview.c:448
+#: src/compose.c:550 src/mainwindow.c:521 src/messageview.c:151
+#: src/summaryview.c:450
 msgid "/_View"
 msgstr "/_Vaade"
 
@@ -1380,9 +1380,9 @@ msgid "/_View/_Reply to"
 msgstr "/_Vaade/_Vasta"
 
 #: src/compose.c:555 src/compose.c:557 src/compose.c:559 src/compose.c:561
-#: src/mainwindow.c:538 src/mainwindow.c:541 src/mainwindow.c:568
-#: src/mainwindow.c:592 src/mainwindow.c:687 src/mainwindow.c:691
-#: src/messageview.c:236
+#: src/mainwindow.c:541 src/mainwindow.c:544 src/mainwindow.c:571
+#: src/mainwindow.c:595 src/mainwindow.c:696 src/mainwindow.c:700
+#: src/messageview.c:241
 msgid "/_View/---"
 msgstr "/_vaade/---"
 
@@ -1398,7 +1398,7 @@ msgstr "/_Vaade/Joonla_ud"
 msgid "/_View/_Attachment"
 msgstr "/_Vaade/_Manus"
 
-#: src/compose.c:567 src/mainwindow.c:599 src/messageview.c:158
+#: src/compose.c:567 src/mainwindow.c:602 src/messageview.c:158
 #, fuzzy
 msgid "/_View/Character _encoding"
 msgstr "/Vaade/_Sorteeri/Kahanevas järjekorras"
@@ -1408,241 +1408,252 @@ msgid "/_View/Character _encoding/_Automatic"
 msgstr ""
 
 #: src/compose.c:570 src/compose.c:576 src/compose.c:582 src/compose.c:586
-#: src/compose.c:592 src/compose.c:596 src/compose.c:602 src/compose.c:606
-#: src/compose.c:616 src/compose.c:620 src/compose.c:628 src/compose.c:632
-#: src/mainwindow.c:595 src/mainwindow.c:602 src/messageview.c:154
+#: src/compose.c:592 src/compose.c:596 src/compose.c:602 src/compose.c:608
+#: src/compose.c:612 src/compose.c:622 src/compose.c:626 src/compose.c:634
+#: src/compose.c:638 src/mainwindow.c:598 src/mainwindow.c:605
+#: src/messageview.c:154
 #, fuzzy
 msgid "/_View/Character _encoding/---"
 msgstr "/Vaade/_Sorteeri/Kahanevas järjekorras"
 
-#: src/compose.c:572 src/mainwindow.c:603 src/messageview.c:162
+#: src/compose.c:572 src/mainwindow.c:606 src/messageview.c:162
 #, fuzzy
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Vaade/_Kooditabel/7bitine ascii (US-ASCII)"
 
-#: src/compose.c:574 src/mainwindow.c:605 src/messageview.c:165
+#: src/compose.c:574 src/mainwindow.c:608 src/messageview.c:165
 #, fuzzy
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Vaade/_Kooditabel/Unicode (_UTF-8)"
 
-#: src/compose.c:578 src/mainwindow.c:609 src/messageview.c:168
+#: src/compose.c:578 src/mainwindow.c:612 src/messageview.c:168
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Vaade/_Kooditabel/Lääne-Euroopa (ISO-8859-_1)"
 
-#: src/compose.c:580 src/mainwindow.c:611 src/messageview.c:170
+#: src/compose.c:580 src/mainwindow.c:614 src/messageview.c:170
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Vaade/_Kooditabel/Lääne-Euroopa (ISO-8859-_15)"
 
-#: src/compose.c:584 src/mainwindow.c:617 src/messageview.c:175
+#: src/compose.c:584 src/mainwindow.c:620 src/messageview.c:175
 #, fuzzy
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Vaade/_Kooditabel/Kesk-Euroopa (ISO-8859-_2)"
 
-#: src/compose.c:588 src/mainwindow.c:621 src/messageview.c:178
+#: src/compose.c:588 src/mainwindow.c:624 src/messageview.c:178
 #, fuzzy
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Vaade/_Kooditabel/_Balti (ISO-8859-13)"
 
-#: src/compose.c:590 src/mainwindow.c:623 src/messageview.c:180
+#: src/compose.c:590 src/mainwindow.c:626 src/messageview.c:180
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Vaade/_Kooditabel/Balti (ISO-8859-_4)"
 
-#: src/compose.c:594 src/mainwindow.c:627 src/messageview.c:183
+#: src/compose.c:594 src/mainwindow.c:630 src/messageview.c:183
 #, fuzzy
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Vaade/_Kooditabel/Greeka (ISO-8859-_7)"
 
-#: src/compose.c:598 src/mainwindow.c:631 src/messageview.c:186
+#: src/compose.c:598 src/mainwindow.c:634 src/messageview.c:186
+#, fuzzy
+msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
+msgstr "/_Vaade/_Kooditabel/Balti (ISO-8859-_4)"
+
+#: src/compose.c:600 src/mainwindow.c:636 src/messageview.c:188
+#, fuzzy
+msgid "/_View/Character _encoding/Arabic (Windows-1256)"
+msgstr "/_Vaade/_Kooditabel/Kirillits (Windows-1251)"
+
+#: src/compose.c:604 src/mainwindow.c:640 src/messageview.c:191
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Vaade/_Kooditabel/Greeka (ISO-8859-_7)"
 
-#: src/compose.c:600 src/mainwindow.c:633 src/messageview.c:188
+#: src/compose.c:606 src/mainwindow.c:642 src/messageview.c:193
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Vaade/_Kooditabel/Kirillits (Windows-1251)"
 
-#: src/compose.c:604 src/mainwindow.c:637 src/messageview.c:191
+#: src/compose.c:610 src/mainwindow.c:646 src/messageview.c:196
 #, fuzzy
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Vaade/_Kooditabel/Türgi (ISO-8859-_9)"
 
-#: src/compose.c:608 src/mainwindow.c:641 src/messageview.c:194
+#: src/compose.c:614 src/mainwindow.c:650 src/messageview.c:199
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Vaade/_Kooditabel/Kirillits (ISO-8859-_5)"
 
-#: src/compose.c:610 src/mainwindow.c:643 src/messageview.c:196
+#: src/compose.c:616 src/mainwindow.c:652 src/messageview.c:201
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Vaade/_Kooditabel/Kirillits (KOI8-_R)"
 
-#: src/compose.c:612 src/mainwindow.c:645 src/messageview.c:198
+#: src/compose.c:618 src/mainwindow.c:654 src/messageview.c:203
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Vaade/_Kooditabel/Kirillits (KOI8-_R)"
 
-#: src/compose.c:614 src/mainwindow.c:647 src/messageview.c:200
+#: src/compose.c:620 src/mainwindow.c:656 src/messageview.c:205
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Vaade/_Kooditabel/Kirillits (Windows-1251)"
 
-#: src/compose.c:618 src/mainwindow.c:651 src/messageview.c:203
+#: src/compose.c:624 src/mainwindow.c:660 src/messageview.c:208
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Vaade/_Kooditabel/Jaapan (ISO-2022-_JP)"
 
-#: src/compose.c:622 src/mainwindow.c:661 src/messageview.c:212
+#: src/compose.c:628 src/mainwindow.c:670 src/messageview.c:217
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Vaade/_Kooditabel/Lihtsustatud Hiina (_GB2312)"
 
-#: src/compose.c:624 src/mainwindow.c:663 src/messageview.c:214
+#: src/compose.c:630 src/mainwindow.c:672 src/messageview.c:219
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Vaade/_Kooditabel/Lihtsustatud Hiina (_GB2312)"
 
-#: src/compose.c:626 src/mainwindow.c:665 src/messageview.c:216
+#: src/compose.c:632 src/mainwindow.c:674 src/messageview.c:221
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Vaade/_Kooditabel/Traditsionaalne Hiine (_Big5)"
 
-#: src/compose.c:630 src/mainwindow.c:673 src/messageview.c:223
+#: src/compose.c:636 src/mainwindow.c:682 src/messageview.c:228
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Vaade/_Kooditabel/Korea (EUC-_KR)"
 
-#: src/compose.c:634 src/mainwindow.c:679 src/messageview.c:228
+#: src/compose.c:640 src/mainwindow.c:688 src/messageview.c:233
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Vaade/_Kooditabel/Tai (TIS-620)"
 
-#: src/compose.c:636 src/mainwindow.c:681 src/messageview.c:230
+#: src/compose.c:642 src/mainwindow.c:690 src/messageview.c:235
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Vaade/_Kooditabel/Tai (Windows-874)"
 
-#: src/compose.c:640 src/mainwindow.c:739 src/messageview.c:260
+#: src/compose.c:646 src/mainwindow.c:750 src/messageview.c:265
 msgid "/_Tools/_Address book"
 msgstr "/_Tööriist/_Aadressiraamat"
 
-#: src/compose.c:641
+#: src/compose.c:647
 msgid "/_Tools/_Template"
 msgstr "/_Tööriist/_Mall"
 
-#: src/compose.c:642 src/mainwindow.c:762 src/messageview.c:275
+#: src/compose.c:648 src/mainwindow.c:773 src/messageview.c:280
 msgid "/_Tools/Actio_ns"
 msgstr "/_Tööriist/Tegevused"
 
-#: src/compose.c:643 src/compose.c:647 src/compose.c:653 src/mainwindow.c:742
-#: src/mainwindow.c:756 src/mainwindow.c:761 src/mainwindow.c:763
-#: src/mainwindow.c:766 src/mainwindow.c:768 src/messageview.c:263
-#: src/messageview.c:274
+#: src/compose.c:649 src/compose.c:653 src/compose.c:659 src/mainwindow.c:753
+#: src/mainwindow.c:767 src/mainwindow.c:772 src/mainwindow.c:774
+#: src/mainwindow.c:777 src/mainwindow.c:779 src/messageview.c:268
+#: src/messageview.c:279
 msgid "/_Tools/---"
 msgstr "/_Tööriist/---"
 
-#: src/compose.c:644
+#: src/compose.c:650
 #, fuzzy
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/R_edaktor/Redi_geeri välise redaktoriga"
 
-#: src/compose.c:648
+#: src/compose.c:654
 #, fuzzy
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Tööriist/Tegevused"
 
-#: src/compose.c:649
+#: src/compose.c:655
 #, fuzzy
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/_Kiri/Krüpteeri"
 
-#: src/compose.c:654
+#: src/compose.c:660
 #, fuzzy
 msgid "/_Tools/_Check spell"
 msgstr "/_Tööriist/Käivita"
 
-#: src/compose.c:655
+#: src/compose.c:661
 #, fuzzy
 msgid "/_Tools/_Set spell language"
 msgstr "/_Tööriist/_Mall"
 
-#: src/compose.c:899
+#: src/compose.c:908
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "faili %s ei leidu\n"
 
-#: src/compose.c:1003 src/compose.c:1074
+#: src/compose.c:1012 src/compose.c:1083
 msgid "Can't get text part\n"
 msgstr "Ei saa tekstiosa kätte\n"
 
-#: src/compose.c:1475
+#: src/compose.c:1484
 msgid "Quote mark format error."
 msgstr "*Tsitaadimärgi formaadi viga."
 
-#: src/compose.c:1487
+#: src/compose.c:1496
 msgid "Message reply/forward format error."
 msgstr "Kirja vasta/edasta formaadi viga."
 
-#: src/compose.c:1907
+#: src/compose.c:1916
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Faili %s ei leidu\n"
 
-#: src/compose.c:1911
+#: src/compose.c:1920
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Ei saanud failile %s suurust\n"
 
-#: src/compose.c:1915
+#: src/compose.c:1924
 #, c-format
 msgid "File %s is empty."
 msgstr "Fail %s on tühi."
 
-#: src/compose.c:1919
+#: src/compose.c:1928
 #, c-format
 msgid "Can't read %s."
 msgstr "ei suuda lugeda %s-i"
 
-#: src/compose.c:1952
+#: src/compose.c:1961
 #, c-format
 msgid "Message: %s"
 msgstr "Kiri: %s"
 
-#: src/compose.c:2012 src/mimeview.c:565
+#: src/compose.c:2021 src/mimeview.c:565
 msgid "Can't get the part of multipart message."
 msgstr "Ei saa mitmeosalise kirja osa kätte."
 
-#: src/compose.c:2496 src/headerview.c:195 src/query_search.c:636
-#: src/summaryview.c:2107
+#: src/compose.c:2505 src/headerview.c:195 src/query_search.c:636
+#: src/summaryview.c:2124
 msgid "(No Subject)"
 msgstr "(Pole pealkirja)"
 
-#: src/compose.c:2499
+#: src/compose.c:2508
 #, fuzzy, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Kirjuta kiri%s"
 
-#: src/compose.c:2612
+#: src/compose.c:2621
 msgid "Recipient is not specified."
 msgstr "Saaja pole määratud."
 
-#: src/compose.c:2620
+#: src/compose.c:2629
 #, fuzzy
 msgid "Empty subject"
 msgstr "Pealkiri"
 
-#: src/compose.c:2621
+#: src/compose.c:2630
 msgid "Subject is empty. Send it anyway?"
 msgstr "Päälkiri on tühi. Kas saadame igal juhul?"
 
-#: src/compose.c:2680
+#: src/compose.c:2689
 msgid "can't get recipient list."
 msgstr "ei leia saajate nimistut."
 
-#: src/compose.c:2700
+#: src/compose.c:2709
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1650,22 +1661,22 @@ msgstr ""
 "Kirja saatmiseks pole määratud kasutajtunnust.\n"
 "Palun vali kirja konto enne saatmist."
 
-#: src/compose.c:2714 src/send_message.c:299
+#: src/compose.c:2723 src/send_message.c:299
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Tekkis viga kirja saatmisel %s-le."
 
-#: src/compose.c:2756
+#: src/compose.c:2765
 msgid "Can't save the message to outbox."
 msgstr "Kirja ei õnnestunud asetada väljunute kausta."
 
-#: src/compose.c:2794
+#: src/compose.c:2803
 #, 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:2891
+#: src/compose.c:2900
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1675,12 +1686,12 @@ msgstr ""
 "Ei suuda transleerida kirja tekstikoodi.\n"
 "Kas igatahes saata ?"
 
-#: src/compose.c:2897
+#: src/compose.c:2906
 #, fuzzy
 msgid "Code conversion error"
 msgstr "Aadressiraamatu uuendamise viga"
 
-#: src/compose.c:2970
+#: src/compose.c:2979
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1689,160 +1700,160 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:2974
+#: src/compose.c:2983
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3264
+#: src/compose.c:3273
 msgid "can't remove the old message\n"
 msgstr "Ei suuda eemaldada vana kirja\n"
 
-#: src/compose.c:3282
+#: src/compose.c:3291
 msgid "queueing message...\n"
 msgstr "Asetan kirja järjekorda...\n"
 
-#: src/compose.c:3364
+#: src/compose.c:3373
 msgid "can't find queue folder\n"
 msgstr "järjekorra kausta ei leidunud\n"
 
-#: src/compose.c:3371
+#: src/compose.c:3380
 msgid "can't queue the message\n"
 msgstr "Ei suutnud kirja järjekorda asetada\n"
 
-#: src/compose.c:3964
+#: src/compose.c:3973
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "Loodud Kirja-ID: %s\n"
 
-#: src/compose.c:4077
+#: src/compose.c:4086
 msgid "Creating compose window...\n"
 msgstr "Loon kirjutamise akent...\n"
 
-#: src/compose.c:4128 src/headerview.c:54
+#: src/compose.c:4137 src/headerview.c:54
 msgid "From:"
 msgstr "Kellelt:"
 
-#: src/compose.c:4202
+#: src/compose.c:4211
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/_Tööriist/Tegevused"
 
-#: src/compose.c:4205
+#: src/compose.c:4214
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/_Kiri/Krüpteeri"
 
-#: src/compose.c:4243 src/compose.c:5317
+#: src/compose.c:4252 src/compose.c:5326
 msgid "MIME type"
 msgstr "MIME tüüp"
 
 #. S_COL_DATE
-#: src/compose.c:4252 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4740
+#: src/compose.c:4261 src/mimeview.c:197 src/prefs_filter_edit.c:496
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4897
 msgid "Size"
 msgstr "Suurus"
 
-#: src/compose.c:4683 src/mainwindow.c:2324 src/prefs_account_dialog.c:528
+#: src/compose.c:4692 src/mainwindow.c:2335 src/prefs_account_dialog.c:528
 #: src/prefs_common_dialog.c:661
 msgid "Send"
 msgstr "Saada"
 
-#: src/compose.c:4684
+#: src/compose.c:4693
 msgid "Send message"
 msgstr "Saada kiri"
 
-#: src/compose.c:4692
+#: src/compose.c:4701
 msgid "Send later"
 msgstr "Hiljem"
 
-#: src/compose.c:4693
+#: src/compose.c:4702
 msgid "Put into queue folder and send later"
 msgstr "Pane järjekorda ja saada hiljem"
 
-#: src/compose.c:4701
+#: src/compose.c:4710
 msgid "Draft"
 msgstr "Mustand"
 
-#: src/compose.c:4702
+#: src/compose.c:4711
 msgid "Save to draft folder"
 msgstr "Salvesta mustandite kausta"
 
-#: src/compose.c:4712
+#: src/compose.c:4721
 msgid "Insert"
 msgstr "Lisa"
 
-#: src/compose.c:4713
+#: src/compose.c:4722
 msgid "Insert file"
 msgstr "Lisa fail"
 
-#: src/compose.c:4721
+#: src/compose.c:4730
 msgid "Attach"
 msgstr "Manusta"
 
-#: src/compose.c:4722
+#: src/compose.c:4731
 msgid "Attach file"
 msgstr "Manusta fail"
 
 #. signature
-#: src/compose.c:4732 src/prefs_account_dialog.c:1208
+#: src/compose.c:4741 src/prefs_account_dialog.c:1208
 #: src/prefs_common_dialog.c:953
 msgid "Signature"
 msgstr "Allkiri"
 
-#: src/compose.c:4733
+#: src/compose.c:4742
 #, fuzzy
 msgid "Append signature"
 msgstr "HALB allkiri"
 
 #. editor
-#: src/compose.c:4742 src/prefs_common_dialog.c:991
+#: src/compose.c:4751 src/prefs_common_dialog.c:991
 #: src/prefs_common_dialog.c:2315
 msgid "Editor"
 msgstr "Redaktor"
 
-#: src/compose.c:4743
+#: src/compose.c:4752
 msgid "Edit with external editor"
 msgstr "Redigeeri välise redaktoriga"
 
-#: src/compose.c:4751
+#: src/compose.c:4760
 msgid "Linewrap"
 msgstr "Reaäär"
 
-#: src/compose.c:4752
+#: src/compose.c:4761
 msgid "Wrap all long lines"
 msgstr "Murra kõik pikad read"
 
-#: src/compose.c:5213
+#: src/compose.c:5222
 msgid "Invalid MIME type."
 msgstr "Vale MIME tüüp."
 
-#: src/compose.c:5231
+#: src/compose.c:5240
 msgid "File doesn't exist or is empty."
 msgstr "Faili ei eksisteeri või on see tühi."
 
-#: src/compose.c:5299
+#: src/compose.c:5308
 #, fuzzy
 msgid "Properties"
 msgstr "Omadus"
 
-#: src/compose.c:5319 src/prefs_common_dialog.c:1444
+#: src/compose.c:5328 src/prefs_common_dialog.c:1444
 msgid "Encoding"
 msgstr "Kodeerimine"
 
-#: src/compose.c:5342 src/prefs_folder_item.c:202
+#: src/compose.c:5351 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Tee"
 
-#: src/compose.c:5343
+#: src/compose.c:5352
 msgid "File name"
 msgstr "Failinimi"
 
-#: src/compose.c:5436
+#: src/compose.c:5445
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Välise redaktori käsurida on vale: `%s'\n"
 
-#: src/compose.c:5482
+#: src/compose.c:5491
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1852,48 +1863,48 @@ msgstr ""
 "Kas hävitame protsessi?\n"
 "protsessi grupi id: %d"
 
-#: src/compose.c:5857 src/compose.c:5862 src/compose.c:5868
+#: src/compose.c:5866 src/compose.c:5871 src/compose.c:5877
 msgid "Can't queue the message."
 msgstr "Kirja ei õnnestunud järjekorda asetada."
 
-#: src/compose.c:5959
+#: src/compose.c:5968
 #, fuzzy
 msgid "Select files"
 msgstr "Määra fail"
 
-#: src/compose.c:5982
+#: src/compose.c:5991
 msgid "Select file"
 msgstr "Määra fail"
 
-#: src/compose.c:6017
+#: src/compose.c:6026
 #, fuzzy
 msgid "Save message"
 msgstr "Saada kiri"
 
-#: src/compose.c:6018
+#: src/compose.c:6027
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Seda kirja on muudetud. kas kaotame selle?"
 
-#: src/compose.c:6020
+#: src/compose.c:6029
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:6062
+#: src/compose.c:6071
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Kas te tahate seda malli lisada '%s'-e ?"
 
-#: src/compose.c:6064
+#: src/compose.c:6073
 msgid "Apply template"
 msgstr "Lisa mall"
 
-#: src/compose.c:6065
+#: src/compose.c:6074
 #, fuzzy
 msgid "_Replace"
 msgstr "Asenda"
 
-#: src/compose.c:6065
+#: src/compose.c:6074
 #, fuzzy
 msgid "_Insert"
 msgstr "Lisa"
@@ -2335,7 +2346,7 @@ msgstr "Uus"
 
 #. S_COL_MARK
 #: src/folderview.c:412 src/prefs_filter_edit.c:500
-#: src/prefs_summary_column.c:71 src/summaryview.c:509
+#: src/prefs_summary_column.c:71 src/summaryview.c:511
 msgid "Unread"
 msgstr "Pole loetud"
 
@@ -2351,12 +2362,12 @@ msgstr "Sean kausta info...\n"
 msgid "Setting folder info..."
 msgstr "Sean kausta info..."
 
-#: src/folderview.c:858 src/mainwindow.c:3464 src/setup.c:80
+#: src/folderview.c:858 src/mainwindow.c:3481 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Tuhnin kaustas %s%c%s ..."
 
-#: src/folderview.c:862 src/mainwindow.c:3469 src/setup.c:85
+#: src/folderview.c:862 src/mainwindow.c:3486 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Tuhnin kaustas %s ..."
@@ -2384,7 +2395,7 @@ msgstr "Uuendan kasuta puu..."
 msgid "Checking for new messages in all folders..."
 msgstr "Kõigis kaustades otsitakse uusi kirju..."
 
-#: src/folderview.c:1200 src/mainwindow.c:2400 src/prefs_common_dialog.c:1789
+#: src/folderview.c:1200 src/mainwindow.c:2411 src/prefs_common_dialog.c:1789
 msgid "Junk"
 msgstr ""
 
@@ -2523,7 +2534,7 @@ msgstr "Pealkiri:"
 msgid "Creating header view...\n"
 msgstr "Loon päise vaadet...\n"
 
-#: src/headerview.c:180 src/query_search.c:637 src/summaryview.c:2110
+#: src/headerview.c:180 src/query_search.c:637 src/summaryview.c:2127
 msgid "(No From)"
 msgstr "(Eikelleltki)"
 
@@ -2632,7 +2643,7 @@ msgstr "Impordi LDIF fail aadressiraamatusse"
 msgid "Prev"
 msgstr "Eelm"
 
-#: src/importldif.c:768 src/mainwindow.c:2420
+#: src/importldif.c:768 src/mainwindow.c:2431
 msgid "Next"
 msgstr "Järgmine"
 
@@ -2974,678 +2985,683 @@ msgstr ""
 msgid "another Sylpheed is already running.\n"
 msgstr "üks teine Sylpheed juba töötab.\n"
 
-#: src/main.c:1064
+#: src/main.c:1083
 #, fuzzy
 msgid "Migration of configuration"
 msgstr "Tegevuste konfiguratsiooni kirjutamine...\n"
 
-#: src/main.c:1065
+#: src/main.c:1084
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
 msgstr ""
 
-#: src/mainwindow.c:478
+#: src/mainwindow.c:481
 msgid "/_File/_Folder"
 msgstr "/_Fail/_Kaust"
 
-#: src/mainwindow.c:479
+#: src/mainwindow.c:482
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/_Fail/_Kaust/_Loo uus kaust..."
 
-#: src/mainwindow.c:481
+#: src/mainwindow.c:484
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/_Fail/_Kaust/_Nimeta kaust ümber"
 
-#: src/mainwindow.c:482
+#: src/mainwindow.c:485
 #, fuzzy
 msgid "/_File/_Folder/_Move folder..."
 msgstr "/_Fail/_Kaust/_Nimeta kaust ümber"
 
-#: src/mainwindow.c:483
+#: src/mainwindow.c:486
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/_Fail/_Kaust/_Kustuta kaust"
 
-#: src/mainwindow.c:484
+#: src/mainwindow.c:487
 #, fuzzy
 msgid "/_File/_Mailbox"
 msgstr "/_Fail/_Lisa kirjakast..."
 
-#: src/mainwindow.c:485
+#: src/mainwindow.c:488
 #, fuzzy
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/_Fail/_Lisa kirjakast..."
 
-#: src/mainwindow.c:486
+#: src/mainwindow.c:489
 #, fuzzy
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/Ee_malda kirjakst"
 
-#: src/mainwindow.c:487 src/mainwindow.c:492
+#: src/mainwindow.c:490 src/mainwindow.c:495
 #, fuzzy
 msgid "/_File/_Mailbox/---"
 msgstr "/_Fail/_Kaust"
 
-#: src/mainwindow.c:488
+#: src/mainwindow.c:491
 #, fuzzy
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "/_Vaata uusi kirju"
 
-#: src/mainwindow.c:490
+#: src/mainwindow.c:493
 #, fuzzy
 msgid "/_File/_Mailbox/Check for new messages in _all mailboxes"
 msgstr "/_Fail/_Vaata uusi kirju kõigis kaustades"
 
-#: src/mainwindow.c:493
+#: src/mainwindow.c:496
 #, fuzzy
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "/_Uuenda kausta puu"
 
-#: src/mainwindow.c:496
+#: src/mainwindow.c:499
 msgid "/_File/_Import mbox file..."
 msgstr "/_Fail/_Impordi kirjakasti fail..."
 
-#: src/mainwindow.c:497
+#: src/mainwindow.c:500
 msgid "/_File/_Export to mbox file..."
 msgstr "/_Fail/_Ekspordi kirjakasti faili..."
 
-#: src/mainwindow.c:499
+#: src/mainwindow.c:502
 #, fuzzy
 msgid "/_File/Empty all _trash"
 msgstr "/_Fail/_Tühjenda prügikast"
 
-#: src/mainwindow.c:501 src/messageview.c:139
+#: src/mainwindow.c:504 src/messageview.c:139
 msgid "/_File/_Save as..."
 msgstr "/_Fail/_Salvesta kui..."
 
-#: src/mainwindow.c:502 src/messageview.c:140
+#: src/mainwindow.c:505 src/messageview.c:140
 msgid "/_File/_Print..."
 msgstr "/_Fail/_Trüki..."
 
-#: src/mainwindow.c:504
+#: src/mainwindow.c:507
 #, fuzzy
 msgid "/_File/_Work offline"
 msgstr "/_Fail/L_isa fail"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:507
+#: src/mainwindow.c:510
 msgid "/_File/E_xit"
 msgstr "/_Fail/_Välju"
 
-#: src/mainwindow.c:512
+#: src/mainwindow.c:515
 msgid "/_Edit/Select _thread"
 msgstr "/R_edaktor/Märgi _teema"
 
-#: src/mainwindow.c:514 src/messageview.c:148
+#: src/mainwindow.c:517 src/messageview.c:148
 msgid "/_Edit/_Find in current message..."
 msgstr "/_Redaktor/_Leia käesolevast kirjast..."
 
-#: src/mainwindow.c:516
+#: src/mainwindow.c:519
 msgid "/_Edit/_Search messages..."
 msgstr "/_Redaktor/_Otsi kirju..."
 
-#: src/mainwindow.c:519
+#: src/mainwindow.c:522
 msgid "/_View/Show or hi_de"
 msgstr "/_Vaade/Näita või varja"
 
-#: src/mainwindow.c:520
+#: src/mainwindow.c:523
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/_Vaade/Näita või varja/Kausta_puud"
 
-#: src/mainwindow.c:522
+#: src/mainwindow.c:525
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/_Vaade/Näita või varja/Kirja_vaadet"
 
-#: src/mainwindow.c:524
+#: src/mainwindow.c:527
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/_Vaadde/Näita või varja/_Nupuribal"
 
-#: src/mainwindow.c:526
+#: src/mainwindow.c:529
 msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/_Vaade/Näita või varja/_Nupuribal/Pilti _ja teksti"
 
-#: src/mainwindow.c:528
+#: src/mainwindow.c:531
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/_Vaade/Näita või varja/_Nupuribal/_Pilti"
 
-#: src/mainwindow.c:530
+#: src/mainwindow.c:533
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/_Vaade/Näita või varja/_Nupuribal/_Teksti"
 
-#: src/mainwindow.c:532
+#: src/mainwindow.c:535
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/_Vaade/Näita või varja/_Nupuribal/_Mitte midagi"
 
-#: src/mainwindow.c:534
+#: src/mainwindow.c:537
 #, fuzzy
 msgid "/_View/Show or hi_de/_Search bar"
 msgstr "/_Vaade/Näita või varja/Staatusri_ba"
 
-#: src/mainwindow.c:536
+#: src/mainwindow.c:539
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/_Vaade/Näita või varja/Staatusri_ba"
 
-#: src/mainwindow.c:539
+#: src/mainwindow.c:542
 msgid "/_View/Separate f_older tree"
 msgstr "/_Vaade/Eraldi kausta puu"
 
-#: src/mainwindow.c:540
+#: src/mainwindow.c:543
 #, fuzzy
 msgid "/_View/Separate _message view"
 msgstr "/_Vaade/Eraldi kirja vaade"
 
-#: src/mainwindow.c:542
+#: src/mainwindow.c:545
 msgid "/_View/_Sort"
 msgstr "/_Vaade/_Sorteeri"
 
-#: src/mainwindow.c:543
+#: src/mainwindow.c:546
 msgid "/_View/_Sort/by _number"
 msgstr "/_Vaade/_Sorteeri/_numbri järgi"
 
-#: src/mainwindow.c:544
+#: src/mainwindow.c:547
 msgid "/_View/_Sort/by s_ize"
 msgstr "/_Vaade/_Sorteeri/_suuruse järgi"
 
-#: src/mainwindow.c:545
+#: src/mainwindow.c:548
 msgid "/_View/_Sort/by _date"
 msgstr "/_Vaade/_Sorteeri/_kuupäeva järgi"
 
-#: src/mainwindow.c:546
+#: src/mainwindow.c:549
 #, fuzzy
 msgid "/_View/_Sort/by t_hread date"
 msgstr "/_Vaade/_Sorteeri/_kuupäeva järgi"
 
-#: src/mainwindow.c:547
+#: src/mainwindow.c:550
 msgid "/_View/_Sort/by _from"
 msgstr "/_Vaade/_Sorteeri/_vormi järgi"
 
-#: src/mainwindow.c:548
+#: src/mainwindow.c:551
 #, fuzzy
 msgid "/_View/_Sort/by _recipient"
 msgstr "/_Vaade/_Sorteeri/_suuruse järgi"
 
-#: src/mainwindow.c:549
+#: src/mainwindow.c:552
 msgid "/_View/_Sort/by _subject"
 msgstr "/_Vaade/_Sorteeri/_pealkirja järgi"
 
-#: src/mainwindow.c:550
+#: src/mainwindow.c:553
 msgid "/_View/_Sort/by _color label"
 msgstr "/_Vaade/_Sorteeri/v_ärvi järgi"
 
-#: src/mainwindow.c:552
+#: src/mainwindow.c:555
 msgid "/_View/_Sort/by _mark"
 msgstr "/_Vaade/_Sorteeri/_märgi järgi"
 
-#: src/mainwindow.c:553
+#: src/mainwindow.c:556
 msgid "/_View/_Sort/by _unread"
 msgstr "/_Vaade/_Sorteeri/m_itteloetute järgi"
 
-#: src/mainwindow.c:554
+#: src/mainwindow.c:557
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/_Vaade/_Sorteeri/kirja_lisade järgi"
 
-#: src/mainwindow.c:556
+#: src/mainwindow.c:559
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/_Vaade/_Sorteeri/Ära sorteeri"
 
-#: src/mainwindow.c:557 src/mainwindow.c:560
+#: src/mainwindow.c:560 src/mainwindow.c:563
 msgid "/_View/_Sort/---"
 msgstr "/_Vaade/_Sorteeri/---"
 
-#: src/mainwindow.c:558
+#: src/mainwindow.c:561
 msgid "/_View/_Sort/Ascending"
 msgstr "/Vaade/_Sorteeri/Kasvavas järjekorras"
 
-#: src/mainwindow.c:559
+#: src/mainwindow.c:562
 msgid "/_View/_Sort/Descending"
 msgstr "/Vaade/_Sorteeri/Kahanevas järjekorras"
 
-#: src/mainwindow.c:561
+#: src/mainwindow.c:564
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/_Vaade/_Sorteeri/*'_Attract' subjekti järgi"
 
-#: src/mainwindow.c:563
+#: src/mainwindow.c:566
 msgid "/_View/Th_read view"
 msgstr "/_Vaade/Teema_vaade"
 
-#: src/mainwindow.c:564
+#: src/mainwindow.c:567
 msgid "/_View/E_xpand all threads"
 msgstr "/_Vaade/Paisuta kõik teemad"
 
-#: src/mainwindow.c:565
+#: src/mainwindow.c:568
 msgid "/_View/Co_llapse all threads"
 msgstr "/_Vaade/Sulge kõik teemad"
 
-#: src/mainwindow.c:566
+#: src/mainwindow.c:569
 msgid "/_View/Set display _item..."
 msgstr "/_Vaade/Mää_ra näidatavad parameetrid"
 
-#: src/mainwindow.c:569
+#: src/mainwindow.c:572
 msgid "/_View/_Go to"
 msgstr "/_Vaade/_Ava"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:573
 msgid "/_View/_Go to/_Prev message"
 msgstr "/_Vaade/_Ava/Eelmine kiri"
 
-#: src/mainwindow.c:571
+#: src/mainwindow.c:574
 msgid "/_View/_Go to/_Next message"
 msgstr "/_Vaade/_Ava/Järgmine kiri"
 
-#: src/mainwindow.c:572 src/mainwindow.c:577 src/mainwindow.c:580
-#: src/mainwindow.c:585 src/mainwindow.c:590
+#: src/mainwindow.c:575 src/mainwindow.c:580 src/mainwindow.c:583
+#: src/mainwindow.c:588 src/mainwindow.c:593
 msgid "/_View/_Go to/---"
 msgstr "/_Vaade/_Ava/---"
 
-#: src/mainwindow.c:573
+#: src/mainwindow.c:576
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/_Vaade/_Ava/_Eelmine mitteloetud kiri"
 
-#: src/mainwindow.c:575
+#: src/mainwindow.c:578
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/_Vaade/_Ava/_Järgmine mitteloetud kiri"
 
-#: src/mainwindow.c:578
+#: src/mainwindow.c:581
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/_Vaade/Mine/Eelmisele uuele kirjale"
 
-#: src/mainwindow.c:579
+#: src/mainwindow.c:582
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/_Vaade/Mine/Järgmisele uuele kirjale"
 
-#: src/mainwindow.c:581
+#: src/mainwindow.c:584
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/_Vaade/_Ava/Eelmine _märgitud kiri"
 
-#: src/mainwindow.c:583
+#: src/mainwindow.c:586
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/_Vaade/_Ava/Järgmine m_ärgitud kiri"
 
-#: src/mainwindow.c:586
+#: src/mainwindow.c:589
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/_Vaade/_Ava/Eelmine _sildiga kiri"
 
-#: src/mainwindow.c:588
+#: src/mainwindow.c:591
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/_Vaade/_Ava/Jägmine s_ildiga kiri"
 
-#: src/mainwindow.c:591
+#: src/mainwindow.c:594
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Vaade/_Ava/Teine kaust..."
 
-#: src/mainwindow.c:600 src/messageview.c:159
+#: src/mainwindow.c:603 src/messageview.c:159
 #, fuzzy
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Vaade/_Kooditabel/Määra _Automaatselt"
 
-#: src/mainwindow.c:613 src/messageview.c:172
+#: src/mainwindow.c:616 src/messageview.c:172
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr "/_Vaade/_Kooditabel/Lääne-Euroopa (ISO-8859-_15)"
 
-#: src/mainwindow.c:653 src/messageview.c:205
+#: src/mainwindow.c:662 src/messageview.c:210
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Vaade/_Kooditabel/Jaapan (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:655 src/messageview.c:207
+#: src/mainwindow.c:664 src/messageview.c:212
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Vaade/_Kooditabel/Jaapan (_EUC-JP)"
 
-#: src/mainwindow.c:657 src/messageview.c:209
+#: src/mainwindow.c:666 src/messageview.c:214
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Vaade/_Kooditabel/Jaapan (_Shift__JIS)"
 
-#: src/mainwindow.c:667 src/messageview.c:218
+#: src/mainwindow.c:676 src/messageview.c:223
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Vaade/_Kooditabel/Traditsionaalne Hiina (EUC-_TW)"
 
-#: src/mainwindow.c:669 src/messageview.c:220
+#: src/mainwindow.c:678 src/messageview.c:225
 #, fuzzy
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Vaade/_Kooditabel/Hiina (ISO-2022-_CN)"
 
-#: src/mainwindow.c:675 src/messageview.c:225
+#: src/mainwindow.c:684 src/messageview.c:230
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Vaade/_Kooditabel/Korea (ISO-2022-KR)"
 
-#: src/mainwindow.c:688 src/summaryview.c:449
+#: src/mainwindow.c:697 src/summaryview.c:451
 msgid "/_View/Open in new _window"
 msgstr "/Vaade/Ava uues aknas"
 
-#: src/mainwindow.c:689 src/messageview.c:237
+#: src/mainwindow.c:698 src/messageview.c:242
 msgid "/_View/Mess_age source"
 msgstr "/_Vaade/Näita kirja lähtekoodi"
 
-#: src/mainwindow.c:690 src/messageview.c:238
+#: src/mainwindow.c:699 src/messageview.c:243
 msgid "/_View/Show all _header"
 msgstr "/_Vaade/Näita ko_gu päist"
 
-#: src/mainwindow.c:692
+#: src/mainwindow.c:701
 msgid "/_View/_Update summary"
 msgstr "/_Vaade/_Uuenda koond"
 
-#: src/mainwindow.c:694 src/messageview.c:240
+#: src/mainwindow.c:703 src/messageview.c:245
 msgid "/_Message"
 msgstr "/_Kiri"
 
-#: src/mainwindow.c:695
+#: src/mainwindow.c:704
 #, fuzzy
 msgid "/_Message/Recei_ve"
 msgstr "/_Kiri/Kirjuta _ümber"
 
-#: src/mainwindow.c:696
+#: src/mainwindow.c:705
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/_Kiri/Võta _kõigilt kontodelt"
 
-#: src/mainwindow.c:698
+#: src/mainwindow.c:707
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/_Kiri/Võta _kõigilt kontodelt"
 
-#: src/mainwindow.c:700
+#: src/mainwindow.c:709
 #, fuzzy
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/_Kiri/Katkesta kirjade võtmine"
 
-#: src/mainwindow.c:702
+#: src/mainwindow.c:711
 #, fuzzy
 msgid "/_Message/Recei_ve/---"
 msgstr "/_Kiri/Kirjuta _ümber"
 
-#: src/mainwindow.c:703
+#: src/mainwindow.c:712
 msgid "/_Message/_Send queued messages"
 msgstr "/_Kiri/_Saada järjekorras olevad kirjad"
 
-#: src/mainwindow.c:704 src/mainwindow.c:706 src/mainwindow.c:713
-#: src/mainwindow.c:718 src/mainwindow.c:721 src/mainwindow.c:730
-#: src/mainwindow.c:732 src/mainwindow.c:735 src/messageview.c:243
-#: src/messageview.c:251 src/messageview.c:256
+#: src/mainwindow.c:713 src/mainwindow.c:715 src/mainwindow.c:722
+#: src/mainwindow.c:727 src/mainwindow.c:730 src/mainwindow.c:741
+#: src/mainwindow.c:743 src/mainwindow.c:746 src/messageview.c:248
+#: src/messageview.c:256 src/messageview.c:261
 msgid "/_Message/---"
 msgstr "/_Kiri/---"
 
-#: src/mainwindow.c:705 src/messageview.c:241
+#: src/mainwindow.c:714 src/messageview.c:246
 msgid "/_Message/Compose _new message"
 msgstr "/_Kiri/Uus k_iri"
 
-#: src/mainwindow.c:707 src/messageview.c:244
+#: src/mainwindow.c:716 src/messageview.c:249
 msgid "/_Message/_Reply"
 msgstr "/_Kiri/_Vasta"
 
-#: src/mainwindow.c:708
+#: src/mainwindow.c:717
 msgid "/_Message/Repl_y to"
 msgstr "/_Kiri/_Vasta"
 
-#: src/mainwindow.c:709 src/messageview.c:245
+#: src/mainwindow.c:718 src/messageview.c:250
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Kiri/Vasta/k_õigile"
 
-#: src/mainwindow.c:710 src/messageview.c:247
+#: src/mainwindow.c:719 src/messageview.c:252
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Kiri/Vas_ta/_saatjale"
 
-#: src/mainwindow.c:711 src/messageview.c:249
+#: src/mainwindow.c:720 src/messageview.c:254
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Kiri/Vasta/kirja _listi"
 
-#: src/mainwindow.c:714 src/messageview.c:252
+#: src/mainwindow.c:723 src/messageview.c:257
 msgid "/_Message/_Forward"
 msgstr "/_Kiri/Saada _edasi"
 
-#: src/mainwindow.c:715 src/messageview.c:253
+#: src/mainwindow.c:724 src/messageview.c:258
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Kiri/Saada edasi _manusena"
 
-#: src/mainwindow.c:717 src/messageview.c:255
+#: src/mainwindow.c:726 src/messageview.c:260
 msgid "/_Message/Redirec_t"
 msgstr "/_Kiri/Suuna _ümber"
 
-#: src/mainwindow.c:719
+#: src/mainwindow.c:728
 msgid "/_Message/M_ove..."
 msgstr "/_Kiri/_Nihuta..."
 
-#: src/mainwindow.c:720
+#: src/mainwindow.c:729
 msgid "/_Message/_Copy..."
 msgstr "/_Kiri/K_opeeri..."
 
-#: src/mainwindow.c:722
+#: src/mainwindow.c:731
 msgid "/_Message/_Mark"
 msgstr "/_Kiri/M_ärk"
 
-#: src/mainwindow.c:723
+#: src/mainwindow.c:732
 msgid "/_Message/_Mark/_Mark"
 msgstr "/_Kiri/M_ärk/M_ärgi"
 
-#: src/mainwindow.c:724
+#: src/mainwindow.c:733
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/_Kiri/M_ärk/_Eemaldan märgi"
 
-#: src/mainwindow.c:725
+#: src/mainwindow.c:734
 msgid "/_Message/_Mark/---"
 msgstr "/_Kiri/M_ärk/---"
 
-#: src/mainwindow.c:726
+#: src/mainwindow.c:735
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/_Kiri/M_ärk/Märgin _mitteloetuks"
 
-#: src/mainwindow.c:727
+#: src/mainwindow.c:736
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/_Kiri/M_ärk/Märgin _loetuks"
 
-#: src/mainwindow.c:729
+#: src/mainwindow.c:738
+#, fuzzy
+msgid "/_Message/_Mark/Mark _thread as read"
+msgstr "/_Kiri/M_ärk/Märgin _loetuks"
+
+#: src/mainwindow.c:740
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/_Kiri/M_ärk/Märgin _kõik loetuks"
 
-#: src/mainwindow.c:731
+#: src/mainwindow.c:742
 msgid "/_Message/_Delete"
 msgstr "/_Kiri/Kustuta"
 
-#: src/mainwindow.c:733
+#: src/mainwindow.c:744
 #, fuzzy
 msgid "/_Message/Set as _junk mail"
 msgstr "/_Kiri/Võta _uued kirjad"
 
-#: src/mainwindow.c:734
+#: src/mainwindow.c:745
 #, fuzzy
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/_Kiri/Võta _uued kirjad"
 
-#: src/mainwindow.c:736 src/messageview.c:257
+#: src/mainwindow.c:747 src/messageview.c:262
 msgid "/_Message/Re-_edit"
 msgstr "/_Kiri/Kirjuta _ümber"
 
-#: src/mainwindow.c:740
+#: src/mainwindow.c:751
 #, fuzzy
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/_Tööriist/Lisa saatja aadressi raamatusse"
 
-#: src/mainwindow.c:743
+#: src/mainwindow.c:754
 #, fuzzy
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/_Tööriist/_Filtreeri kirjad"
 
-#: src/mainwindow.c:745
+#: src/mainwindow.c:756
 #, fuzzy
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Tööriist/_Filtreeri kirjad"
 
-#: src/mainwindow.c:747 src/messageview.c:264
+#: src/mainwindow.c:758 src/messageview.c:269
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Tööriist/Loo filtri reeglistik"
 
-#: src/mainwindow.c:748 src/messageview.c:266
+#: src/mainwindow.c:759 src/messageview.c:271
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Tööriist/Loo filtri reeglistik/Automaatselt"
 
-#: src/mainwindow.c:750 src/messageview.c:268
+#: src/mainwindow.c:761 src/messageview.c:273
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Tööriist/Loo filtri reeglistik/ kasutades Kellelt"
 
-#: src/mainwindow.c:752 src/messageview.c:270
+#: src/mainwindow.c:763 src/messageview.c:275
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Tööriist/Loo filtri reeglistik/kasutades Kellele"
 
-#: src/mainwindow.c:754 src/messageview.c:272
+#: src/mainwindow.c:765 src/messageview.c:277
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Tööriist/Loo filtri reeglistik/ kasutades päälkirja"
 
-#: src/mainwindow.c:757
+#: src/mainwindow.c:768
 #, fuzzy
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/_Tööriist/_Filtreeri kirjad"
 
-#: src/mainwindow.c:759
+#: src/mainwindow.c:770
 #, fuzzy
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/_Tööriist/_Filtreeri kirjad"
 
-#: src/mainwindow.c:764
+#: src/mainwindow.c:775
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/_Tööriist/_Kustuta topelt kirjad"
 
-#: src/mainwindow.c:767
+#: src/mainwindow.c:778
 msgid "/_Tools/E_xecute"
 msgstr "/_Tööriist/Käivita"
 
-#: src/mainwindow.c:769
+#: src/mainwindow.c:780
 msgid "/_Tools/_Log window"
 msgstr "/_Tööriist/_Teadete aken"
 
-#: src/mainwindow.c:771
+#: src/mainwindow.c:782
 msgid "/_Configuration"
 msgstr "/_Häälestus"
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:783
 msgid "/_Configuration/_Common preferences..."
 msgstr "/_Häälestus/_Üldised omadused..."
 
-#: src/mainwindow.c:774
+#: src/mainwindow.c:785
 msgid "/_Configuration/_Filter setting..."
 msgstr "/_Häälestus/_Filtri seaded..."
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:787
 msgid "/_Configuration/_Template..."
 msgstr "/_Häälestus/_Mall..."
 
-#: src/mainwindow.c:777
+#: src/mainwindow.c:788
 msgid "/_Configuration/_Actions..."
 msgstr "/_Häälestus/Tegevused..."
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:789
 msgid "/_Configuration/---"
 msgstr "/_Häälestus/---"
 
-#: src/mainwindow.c:779
+#: src/mainwindow.c:790
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Häälestus/_Hetkel kasutatava konto omadused..."
 
-#: src/mainwindow.c:781
+#: src/mainwindow.c:792
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Häälestus/_Loo uus konto..."
 
-#: src/mainwindow.c:783
+#: src/mainwindow.c:794
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Häälestus/_Redigeeri kontosid..."
 
-#: src/mainwindow.c:785
+#: src/mainwindow.c:796
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Häälestus/_Muuda kasutatavat kontot"
 
-#: src/mainwindow.c:789
+#: src/mainwindow.c:800
 msgid "/_Help/_Manual"
 msgstr "/_Abi/_Juhend"
 
-#: src/mainwindow.c:790
+#: src/mainwindow.c:801
 msgid "/_Help/_Manual/_English"
 msgstr "/_Abi/_Juhend/_Inglise"
 
-#: src/mainwindow.c:791
+#: src/mainwindow.c:802
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/_Abi/_Juhend/_Jaapani"
 
-#: src/mainwindow.c:792
+#: src/mainwindow.c:803
 msgid "/_Help/_FAQ"
 msgstr "/_Abi/_KKK"
 
-#: src/mainwindow.c:793
+#: src/mainwindow.c:804
 msgid "/_Help/_FAQ/_English"
 msgstr "/_Abi/_KKK/_Inglise"
 
-#: src/mainwindow.c:794
+#: src/mainwindow.c:805
 msgid "/_Help/_FAQ/_German"
 msgstr "/_Abi/_KKK/_Saksa"
 
-#: src/mainwindow.c:795
+#: src/mainwindow.c:806
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/_Abi/_KKK/_Hispaania"
 
-#: src/mainwindow.c:796
+#: src/mainwindow.c:807
 msgid "/_Help/_FAQ/_French"
 msgstr "/_Abi/_KKK/_Prantsuse"
 
-#: src/mainwindow.c:797
+#: src/mainwindow.c:808
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/_Abi/_KKK/_Itaalia"
 
-#: src/mainwindow.c:798
+#: src/mainwindow.c:809
 msgid "/_Help/---"
 msgstr "/_Abi/---"
 
-#: src/mainwindow.c:841
+#: src/mainwindow.c:852
 msgid "Creating main window...\n"
 msgstr "Loon peamise akna...\n"
 
-#: src/mainwindow.c:1011
+#: src/mainwindow.c:1022
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "PeaAken: värvi haldamine %d ebaõnnestus\n"
 
-#: src/mainwindow.c:1108 src/summaryview.c:2258 src/summaryview.c:2343
-#: src/summaryview.c:3739 src/summaryview.c:3868 src/summaryview.c:4226
+#: src/mainwindow.c:1119 src/summaryview.c:2275 src/summaryview.c:2360
+#: src/summaryview.c:3896 src/summaryview.c:4025 src/summaryview.c:4383
 msgid "done.\n"
 msgstr "tehtud.\n"
 
-#: src/mainwindow.c:1235 src/mainwindow.c:1276 src/mainwindow.c:1301
+#: src/mainwindow.c:1246 src/mainwindow.c:1287 src/mainwindow.c:1312
 msgid "Untitled"
 msgstr "Tiitlita"
 
-#: src/mainwindow.c:1302
+#: src/mainwindow.c:1313
 msgid "none"
 msgstr "mittemiski"
 
-#: src/mainwindow.c:1355
+#: src/mainwindow.c:1366
 #, 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:1605
+#: src/mainwindow.c:1616
 msgid "Offline"
 msgstr ""
 
-#: src/mainwindow.c:1606
+#: src/mainwindow.c:1617
 msgid "You are offline. Go online?"
 msgstr ""
 
-#: src/mainwindow.c:1623
+#: src/mainwindow.c:1634
 #, fuzzy
 msgid "Empty all trash"
 msgstr "Tühjenda prügikast"
 
-#: src/mainwindow.c:1624
+#: src/mainwindow.c:1635
 #, fuzzy
 msgid "Delete all messages in trash folders?"
 msgstr "Kas eemaldada kõik kirjad prügikastist?"
 
-#: src/mainwindow.c:1652
+#: src/mainwindow.c:1663
 msgid "Add mailbox"
 msgstr "Lisa kirjakast"
 
-#: src/mainwindow.c:1653
+#: src/mainwindow.c:1664
 #, fuzzy
 msgid ""
 "Specify the location of mailbox.\n"
@@ -3655,16 +3671,16 @@ msgstr ""
 "Sisesta kirjakasti asukoht.\n"
 "Kui määrate juba olemasoleva kirjakasti, siis seeskaneeritakse automaatselt."
 
-#: src/mainwindow.c:1659 src/setup.c:49
+#: src/mainwindow.c:1670 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Kirjakast %s on juba olemas."
 
-#: src/mainwindow.c:1664 src/setup.c:56
+#: src/mainwindow.c:1675 src/setup.c:56
 msgid "Mailbox"
 msgstr "Kirjakast"
 
-#: src/mainwindow.c:1670 src/setup.c:62
+#: src/mainwindow.c:1681 src/setup.c:62
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3673,149 +3689,149 @@ msgstr ""
 "Kirjakasti loomine ebaõnnestus.\n"
 "Võibolla mõned failid on olemas, või teil pole õigusi sinna kirjutamiseks."
 
-#: src/mainwindow.c:2088
+#: src/mainwindow.c:2099
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - kausta vaade"
 
-#: src/mainwindow.c:2107
+#: src/mainwindow.c:2118
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - kirja vaade"
 
-#: src/mainwindow.c:2259 src/summaryview.c:408
+#: src/mainwindow.c:2270 src/summaryview.c:408
 msgid "/_Reply"
 msgstr "/Vastan"
 
-#: src/mainwindow.c:2260
+#: src/mainwindow.c:2271
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "Vasta ja saada koopia kõigile, kes said selle kirja"
 
-#: src/mainwindow.c:2261
+#: src/mainwindow.c:2272
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/Vasta/_saatjale"
 
-#: src/mainwindow.c:2262
+#: src/mainwindow.c:2273
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/Vasta/kirja_listi"
 
-#: src/mainwindow.c:2267 src/summaryview.c:415
+#: src/mainwindow.c:2278 src/summaryview.c:415
 msgid "/_Forward"
 msgstr "/Saadan edasi"
 
-#: src/mainwindow.c:2268 src/summaryview.c:416
+#: src/mainwindow.c:2279 src/summaryview.c:416
 msgid "/For_ward as attachment"
 msgstr "/Saada edasi manusena"
 
-#: src/mainwindow.c:2269 src/summaryview.c:417
+#: src/mainwindow.c:2280 src/summaryview.c:417
 msgid "/Redirec_t"
 msgstr "/Suuna ümber"
 
-#: src/mainwindow.c:2305
+#: src/mainwindow.c:2316
 msgid "Get"
 msgstr "Võta"
 
-#: src/mainwindow.c:2306
+#: src/mainwindow.c:2317
 msgid "Incorporate new mail"
 msgstr "Võta uued kirjad"
 
-#: src/mainwindow.c:2313
+#: src/mainwindow.c:2324
 msgid "Get all"
 msgstr "Võta kõik"
 
-#: src/mainwindow.c:2314
+#: src/mainwindow.c:2325
 msgid "Incorporate new mail of all accounts"
 msgstr "Võta kõigilt kontodelt uued kirjad"
 
-#: src/mainwindow.c:2325
+#: src/mainwindow.c:2336
 msgid "Send queued message(s)"
 msgstr "Saada kirjad järjekorrast"
 
-#: src/mainwindow.c:2335 src/prefs_account_dialog.c:530
+#: src/mainwindow.c:2346 src/prefs_account_dialog.c:530
 #: src/prefs_common_dialog.c:663 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "Kirjuta"
 
-#: src/mainwindow.c:2336
+#: src/mainwindow.c:2347
 msgid "Compose new message"
 msgstr "Kirjuta uus kiri"
 
-#: src/mainwindow.c:2344 src/prefs_common_dialog.c:975
+#: src/mainwindow.c:2355 src/prefs_common_dialog.c:975
 msgid "Reply"
 msgstr "Vasta"
 
-#: src/mainwindow.c:2345 src/mainwindow.c:2358
+#: src/mainwindow.c:2356 src/mainwindow.c:2369
 msgid "Reply to the message"
 msgstr "Vasta kirjale"
 
-#: src/mainwindow.c:2362
+#: src/mainwindow.c:2373
 msgid "Reply all"
 msgstr "Vasta ja"
 
-#: src/mainwindow.c:2363
+#: src/mainwindow.c:2374
 msgid "Reply to all"
 msgstr "Vasta ja saada koopia kõigile, kes said selle kirja"
 
-#: src/mainwindow.c:2371 src/prefs_filter_edit.c:672
+#: src/mainwindow.c:2382 src/prefs_filter_edit.c:672
 msgid "Forward"
 msgstr "Edasta"
 
-#: src/mainwindow.c:2372 src/mainwindow.c:2385
+#: src/mainwindow.c:2383 src/mainwindow.c:2396
 msgid "Forward the message"
 msgstr "Saada kiri edasi"
 
-#: src/mainwindow.c:2392
+#: src/mainwindow.c:2403
 msgid "Delete the message"
 msgstr "Kustuta kiri"
 
-#: src/mainwindow.c:2401
+#: src/mainwindow.c:2412
 #, fuzzy
 msgid "Set as junk mail"
 msgstr " Määra vaikimisi kontoks "
 
-#: src/mainwindow.c:2410
+#: src/mainwindow.c:2421
 msgid "Execute"
 msgstr "Käivita"
 
-#: src/mainwindow.c:2411
+#: src/mainwindow.c:2422
 msgid "Execute marked process"
 msgstr "Käivita märgitud protsess"
 
-#: src/mainwindow.c:2421
+#: src/mainwindow.c:2432
 msgid "Next unread message"
 msgstr "Järgmine kiri mida pole loetud"
 
-#: src/mainwindow.c:2433
+#: src/mainwindow.c:2444
 msgid "Prefs"
 msgstr "Seaded"
 
-#: src/mainwindow.c:2434
+#: src/mainwindow.c:2445
 msgid "Common preferences"
 msgstr "Üldised omaduse"
 
-#: src/mainwindow.c:2442 src/prefs_folder_item.c:289
+#: src/mainwindow.c:2453 src/prefs_folder_item.c:289
 #: src/prefs_folder_item.c:300 src/progressdialog.c:128
 msgid "Account"
 msgstr "Konto"
 
-#: src/mainwindow.c:2443
+#: src/mainwindow.c:2454
 msgid "Account setting"
 msgstr "Konto seaded"
 
-#: src/mainwindow.c:2615
+#: src/mainwindow.c:2626
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 
-#: src/mainwindow.c:2626
+#: src/mainwindow.c:2637
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 
-#: src/mainwindow.c:2892
+#: src/mainwindow.c:2903
 msgid "Exit"
 msgstr "Välju"
 
-#: src/mainwindow.c:2892
+#: src/mainwindow.c:2903
 msgid "Exit this program?"
 msgstr "Lõpetame programmi töö."
 
@@ -3852,45 +3868,45 @@ msgstr "Jõudsin kirja lõppu; kas alustan algusest?"
 msgid "Search finished"
 msgstr "Otsimine lõpetatud"
 
-#: src/messageview.c:261
+#: src/messageview.c:266
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/_Tööriist/Lisa saatja aadressi raamatusse"
 
-#: src/messageview.c:291
+#: src/messageview.c:296
 msgid "Creating message view...\n"
 msgstr "Loon kirja vaate...\n"
 
-#: src/messageview.c:316
+#: src/messageview.c:321
 msgid "Text"
 msgstr "Tekst"
 
-#: src/messageview.c:321
+#: src/messageview.c:326
 msgid "Attachments"
 msgstr "Manused"
 
-#: src/messageview.c:371
+#: src/messageview.c:376
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:669 src/summaryview.c:3268
+#: src/messageview.c:674 src/summaryview.c:3425
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Ei suuda faili '%s' salvestada."
 
-#: src/messageview.c:728 src/summaryview.c:3291
+#: src/messageview.c:733 src/summaryview.c:3448
 msgid "The message will be printed with the following command:"
 msgstr ""
 
-#: src/messageview.c:729 src/summaryview.c:3292
+#: src/messageview.c:734 src/summaryview.c:3449
 #, fuzzy
 msgid "(Default print command)"
 msgstr "Käivita"
 
-#: src/messageview.c:731 src/prefs_common_dialog.c:2304 src/summaryview.c:3294
+#: src/messageview.c:736 src/prefs_common_dialog.c:2304 src/summaryview.c:3451
 msgid "Print"
 msgstr "Trüki"
 
-#: src/messageview.c:740 src/summaryview.c:3303
+#: src/messageview.c:745 src/summaryview.c:3460
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -4795,8 +4811,8 @@ msgstr "Näita kirja saajat 'Kellelt' tulbas, kui saatja olen mina ise"
 msgid "Expand threads"
 msgstr "Paisuta teemad"
 
-#: src/prefs_common_dialog.c:1413 src/prefs_common_dialog.c:2713
-#: src/prefs_common_dialog.c:2751
+#: src/prefs_common_dialog.c:1413 src/prefs_common_dialog.c:2716
+#: src/prefs_common_dialog.c:2754
 msgid "Date format"
 msgstr "Kuupäeva formaat"
 
@@ -5097,8 +5113,8 @@ msgstr "Välised käsklused (%s asendatakse faili / URI nimega)"
 msgid "Web browser"
 msgstr "Weebi sirvur"
 
-#: src/prefs_common_dialog.c:2288 src/prefs_common_dialog.c:3775
-#: src/prefs_common_dialog.c:3796
+#: src/prefs_common_dialog.c:2288 src/prefs_common_dialog.c:3778
+#: src/prefs_common_dialog.c:3799
 #, fuzzy
 msgid "(Default browser)"
 msgstr "Vaikimisi sisendkast"
@@ -5174,216 +5190,226 @@ msgstr "Kreeka (ISO-8859-7)"
 
 #: src/prefs_common_dialog.c:2495
 #, fuzzy
+msgid "Arabic (ISO-8859-6)"
+msgstr "Balti (ISO-8859-4)"
+
+#: src/prefs_common_dialog.c:2496
+#, fuzzy
+msgid "Arabic (Windows-1256)"
+msgstr "Kirillits (Windows-1251)"
+
+#: src/prefs_common_dialog.c:2498
+#, fuzzy
 msgid "Hebrew (ISO-8859-8)"
 msgstr "Kreeka (ISO-8859-7)"
 
-#: src/prefs_common_dialog.c:2496
+#: src/prefs_common_dialog.c:2499
 #, fuzzy
 msgid "Hebrew (Windows-1255)"
 msgstr "Kirillits (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2498
+#: src/prefs_common_dialog.c:2501
 msgid "Turkish (ISO-8859-9)"
 msgstr "Türgi (ISO-8859-9)"
 
-#: src/prefs_common_dialog.c:2500
+#: src/prefs_common_dialog.c:2503
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Kirillits (ISO-8859-5)"
 
-#: src/prefs_common_dialog.c:2501
+#: src/prefs_common_dialog.c:2504
 msgid "Cyrillic (KOI8-R)"
 msgstr "Kirillits (KOI8-R)"
 
-#: src/prefs_common_dialog.c:2502
+#: src/prefs_common_dialog.c:2505
 msgid "Cyrillic (KOI8-U)"
 msgstr "Kirillits (KOI8-U)"
 
-#: src/prefs_common_dialog.c:2503
+#: src/prefs_common_dialog.c:2506
 msgid "Cyrillic (Windows-1251)"
 msgstr "Kirillits (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2505
+#: src/prefs_common_dialog.c:2508
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Jaapani (ISO-2022-JP)"
 
-#: src/prefs_common_dialog.c:2507
+#: src/prefs_common_dialog.c:2510
 msgid "Japanese (EUC-JP)"
 msgstr "Jaapani (EUC-JP)"
 
-#: src/prefs_common_dialog.c:2508
+#: src/prefs_common_dialog.c:2511
 msgid "Japanese (Shift_JIS)"
 msgstr "Jaapani (Shift_JIS)"
 
-#: src/prefs_common_dialog.c:2511
+#: src/prefs_common_dialog.c:2514
 msgid "Simplified Chinese (GB2312)"
 msgstr "Lihtsustatud Hiina (GB2312)"
 
-#: src/prefs_common_dialog.c:2512
+#: src/prefs_common_dialog.c:2515
 #, fuzzy
 msgid "Simplified Chinese (GBK)"
 msgstr "Lihtsustatud Hiina (GB2312)"
 
-#: src/prefs_common_dialog.c:2513
+#: src/prefs_common_dialog.c:2516
 msgid "Traditional Chinese (Big5)"
 msgstr "Traditsionaalne Hiina (Big5)"
 
-#: src/prefs_common_dialog.c:2515
+#: src/prefs_common_dialog.c:2518
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Traditsionaalne Hiina (EUC-TW)"
 
-#: src/prefs_common_dialog.c:2516
+#: src/prefs_common_dialog.c:2519
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Hiina (ISO-2022-CN)"
 
-#: src/prefs_common_dialog.c:2519
+#: src/prefs_common_dialog.c:2522
 msgid "Korean (EUC-KR)"
 msgstr "Korea (EUC-KR)"
 
-#: src/prefs_common_dialog.c:2521
+#: src/prefs_common_dialog.c:2524
 msgid "Thai (TIS-620)"
 msgstr "Tai (TIS-620)"
 
-#: src/prefs_common_dialog.c:2522
+#: src/prefs_common_dialog.c:2525
 msgid "Thai (Windows-874)"
 msgstr "Tai (Windows-874)"
 
-#: src/prefs_common_dialog.c:2689
+#: src/prefs_common_dialog.c:2692
 msgid "the full abbreviated weekday name"
 msgstr "nädalapäeva esitähed"
 
-#: src/prefs_common_dialog.c:2690
+#: src/prefs_common_dialog.c:2693
 msgid "the full weekday name"
 msgstr "täielik nädalapäeva nimi"
 
-#: src/prefs_common_dialog.c:2691
+#: src/prefs_common_dialog.c:2694
 msgid "the abbreviated month name"
 msgstr "lühendatud kuu nimetus"
 
-#: src/prefs_common_dialog.c:2692
+#: src/prefs_common_dialog.c:2695
 msgid "the full month name"
 msgstr "täispikk kuu nimetus"
 
-#: src/prefs_common_dialog.c:2693
+#: src/prefs_common_dialog.c:2696
 msgid "the preferred date and time for the current locale"
 msgstr "eelistatud kuupäev ja aeg kasutusel lokaali jaoks"
 
-#: src/prefs_common_dialog.c:2694
+#: src/prefs_common_dialog.c:2697
 msgid "the century number (year/100)"
 msgstr "sajandi number (aasta/100)"
 
-#: src/prefs_common_dialog.c:2695
+#: src/prefs_common_dialog.c:2698
 msgid "the day of the month as a decimal number"
 msgstr "Kuupäev kümnendnumbrina"
 
-#: src/prefs_common_dialog.c:2696
+#: src/prefs_common_dialog.c:2699
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "tund kümnendnumbrina kasutades 24-tunnilist kella"
 
-#: src/prefs_common_dialog.c:2697
+#: src/prefs_common_dialog.c:2700
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "tund kümnendnumbrina kasutades 12-tunnilist kella"
 
-#: src/prefs_common_dialog.c:2698
+#: src/prefs_common_dialog.c:2701
 msgid "the day of the year as a decimal number"
 msgstr "päev aastas kui kümnendnumber"
 
-#: src/prefs_common_dialog.c:2699
+#: src/prefs_common_dialog.c:2702
 msgid "the month as a decimal number"
 msgstr "kuu kui kümnendnumber"
 
-#: src/prefs_common_dialog.c:2700
+#: src/prefs_common_dialog.c:2703
 msgid "the minute as a decimal number"
 msgstr "minutid kümnendnumbrina"
 
-#: src/prefs_common_dialog.c:2701
+#: src/prefs_common_dialog.c:2704
 msgid "either AM or PM"
 msgstr "kas EL või PL"
 
-#: src/prefs_common_dialog.c:2702
+#: src/prefs_common_dialog.c:2705
 msgid "the second as a decimal number"
 msgstr "sekundin kümnendnumbrina"
 
-#: src/prefs_common_dialog.c:2703
+#: src/prefs_common_dialog.c:2706
 msgid "the day of the week as a decimal number"
 msgstr "nädalapäev kümnendnumbrina"
 
-#: src/prefs_common_dialog.c:2704
+#: src/prefs_common_dialog.c:2707
 msgid "the preferred date for the current locale"
 msgstr "eelistatud kuupäev"
 
-#: src/prefs_common_dialog.c:2705
+#: src/prefs_common_dialog.c:2708
 msgid "the last two digits of a year"
 msgstr "viimased kaks aasta numbrit"
 
-#: src/prefs_common_dialog.c:2706
+#: src/prefs_common_dialog.c:2709
 msgid "the year as a decimal number"
 msgstr "aasta kümnendnumbrina"
 
-#: src/prefs_common_dialog.c:2707
+#: src/prefs_common_dialog.c:2710
 msgid "the time zone or name or abbreviation"
 msgstr "ajatsoon või nimi või lühend"
 
-#: src/prefs_common_dialog.c:2728
+#: src/prefs_common_dialog.c:2731
 msgid "Specifier"
 msgstr "*Määraja"
 
-#: src/prefs_common_dialog.c:2729
+#: src/prefs_common_dialog.c:2732
 msgid "Description"
 msgstr "Seletus"
 
-#: src/prefs_common_dialog.c:2769
+#: src/prefs_common_dialog.c:2772
 msgid "Example"
 msgstr "Näide"
 
-#: src/prefs_common_dialog.c:2850
+#: src/prefs_common_dialog.c:2853
 msgid "Set message colors"
 msgstr "Säti kirja värvid"
 
-#: src/prefs_common_dialog.c:2858
+#: src/prefs_common_dialog.c:2861
 msgid "Colors"
 msgstr "Värvid"
 
-#: src/prefs_common_dialog.c:2892
+#: src/prefs_common_dialog.c:2895
 msgid "Quoted Text - First Level"
 msgstr "Tsiteeritud tekst - Aste 1"
 
-#: src/prefs_common_dialog.c:2898
+#: src/prefs_common_dialog.c:2901
 msgid "Quoted Text - Second Level"
 msgstr "Tsiteeritud tekst - Aste 2"
 
-#: src/prefs_common_dialog.c:2904
+#: src/prefs_common_dialog.c:2907
 msgid "Quoted Text - Third Level"
 msgstr "Tsiteeritud tekst - Aste 3"
 
-#: src/prefs_common_dialog.c:2910
+#: src/prefs_common_dialog.c:2913
 msgid "URI link"
 msgstr "URI viide"
 
-#: src/prefs_common_dialog.c:2917
+#: src/prefs_common_dialog.c:2920
 msgid "Recycle quote colors"
 msgstr "Tsitaadi värvid ringelvad"
 
-#: src/prefs_common_dialog.c:2984
+#: src/prefs_common_dialog.c:2987
 msgid "Pick color for quotation level 1"
 msgstr "Vali astme 1 tsitaadile värv"
 
-#: src/prefs_common_dialog.c:2987
+#: src/prefs_common_dialog.c:2990
 msgid "Pick color for quotation level 2"
 msgstr "Vali astme 2 tsitaadile värv"
 
-#: src/prefs_common_dialog.c:2990
+#: src/prefs_common_dialog.c:2993
 msgid "Pick color for quotation level 3"
 msgstr "Vali astme 3 tsitaadile värv"
 
-#: src/prefs_common_dialog.c:2993
+#: src/prefs_common_dialog.c:2996
 msgid "Pick color for URI"
 msgstr "Vali URI-le värv"
 
-#: src/prefs_common_dialog.c:3133
+#: src/prefs_common_dialog.c:3136
 msgid "Description of symbols"
 msgstr "Sümbolite kirjeldus"
 
-#: src/prefs_common_dialog.c:3189
+#: src/prefs_common_dialog.c:3192
 msgid ""
 "Date\n"
 "From\n"
@@ -5407,11 +5433,11 @@ msgstr ""
 "Uudistegrupp\n"
 "Kirja-ID"
 
-#: src/prefs_common_dialog.c:3202
+#: src/prefs_common_dialog.c:3205
 msgid "If x is set, displays expr"
 msgstr "Kui x on seatud, näitab väljendit"
 
-#: src/prefs_common_dialog.c:3206
+#: src/prefs_common_dialog.c:3209
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -5425,7 +5451,7 @@ msgstr ""
 "Tsiteeritud teate keha allkirjata\n"
 "Literaal %"
 
-#: src/prefs_common_dialog.c:3214
+#: src/prefs_common_dialog.c:3217
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -5437,20 +5463,20 @@ msgstr ""
 "Täht avanev loogeline sulg\n"
 "Täht sulgev loogeline sulg"
 
-#: src/prefs_common_dialog.c:3260
+#: src/prefs_common_dialog.c:3263
 msgid "Key bindings"
 msgstr "Klahvi seosed"
 
-#: src/prefs_common_dialog.c:3273
+#: src/prefs_common_dialog.c:3276
 #, fuzzy
 msgid "Select the preset of key bindings."
 msgstr " Määra klahvi seosed... "
 
-#: src/prefs_common_dialog.c:3283 src/prefs_common_dialog.c:3607
+#: src/prefs_common_dialog.c:3286 src/prefs_common_dialog.c:3610
 msgid "Default"
 msgstr "Vaikimisi"
 
-#: src/prefs_common_dialog.c:3286 src/prefs_common_dialog.c:3616
+#: src/prefs_common_dialog.c:3289 src/prefs_common_dialog.c:3619
 msgid "Old Sylpheed"
 msgstr "Vana Sylpheed"
 
@@ -5575,7 +5601,7 @@ msgstr ""
 msgid "Age"
 msgstr ""
 
-#: src/prefs_filter_edit.c:501 src/summaryview.c:510
+#: src/prefs_filter_edit.c:501 src/summaryview.c:512
 #, fuzzy
 msgid "Marked"
 msgstr "Märk"
@@ -5830,17 +5856,17 @@ msgid "Attachment"
 msgstr "Manus"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73 src/query_search.c:371 src/summaryview.c:4733
+#: src/prefs_summary_column.c:73 src/query_search.c:371 src/summaryview.c:4890
 msgid "Subject"
 msgstr "Pealkiri"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/query_search.c:372 src/summaryview.c:4736
+#: src/prefs_summary_column.c:74 src/query_search.c:372 src/summaryview.c:4893
 msgid "From"
 msgstr "Kellelt"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/query_search.c:373 src/summaryview.c:4738
+#: src/prefs_summary_column.c:75 src/query_search.c:373 src/summaryview.c:4895
 msgid "Date"
 msgstr "Kuupäev"
 
@@ -5942,7 +5968,7 @@ msgstr "Otsi kirju"
 msgid "_Save as search folder"
 msgstr "Kataloogist otsimine"
 
-#: src/query_search.c:512 src/subscribedialog.c:523 src/summaryview.c:840
+#: src/query_search.c:512 src/subscribedialog.c:523 src/summaryview.c:842
 msgid "Done."
 msgstr "Tehtud."
 
@@ -5956,7 +5982,7 @@ msgstr "Tuhnin kaustas %s ..."
 msgid "Searching %s (%d / %d)..."
 msgstr "Filtreerin..."
 
-#: src/query_search.c:645 src/summaryview.c:2048
+#: src/query_search.c:645 src/summaryview.c:2051
 msgid "(No Date)"
 msgstr "(Kuupäeva pole)"
 
@@ -6330,305 +6356,310 @@ msgid "/_Mark/Mark as rea_d"
 msgstr "/Märk/Märgi loetuks"
 
 #: src/summaryview.c:429
+#, fuzzy
+msgid "/_Mark/Mark _thread as read"
+msgstr "/Märk/Märgi loetuks"
+
+#: src/summaryview.c:431
 msgid "/_Mark/Mark all _read"
 msgstr "/Märk/Märgi kõik loetuks"
 
-#: src/summaryview.c:430
+#: src/summaryview.c:432
 msgid "/Color la_bel"
 msgstr "/Värviline silt"
 
-#: src/summaryview.c:434
+#: src/summaryview.c:436
 msgid "/Re-_edit"
 msgstr "/Kirjutan uuesti"
 
-#: src/summaryview.c:436
+#: src/summaryview.c:438
 #, fuzzy
 msgid "/Add sender to address boo_k..."
 msgstr "/Lisa saatje aadressi raamatusse"
 
-#: src/summaryview.c:438
+#: src/summaryview.c:440
 msgid "/Create f_ilter rule"
 msgstr "/Loo filtri reeglistik"
 
-#: src/summaryview.c:439
+#: src/summaryview.c:441
 msgid "/Create f_ilter rule/_Automatically"
 msgstr "/Loo filtri reeglistik/Automaatselt"
 
-#: src/summaryview.c:441
+#: src/summaryview.c:443
 msgid "/Create f_ilter rule/by _From"
 msgstr "/Loo filtri reeglistik/ kasutades Kellelt"
 
-#: src/summaryview.c:443
+#: src/summaryview.c:445
 msgid "/Create f_ilter rule/by _To"
 msgstr "/Loo filtri reeglistik/kasutades Kellele"
 
-#: src/summaryview.c:445
+#: src/summaryview.c:447
 msgid "/Create f_ilter rule/by _Subject"
 msgstr "/Loo filtri reeglistik/ kasutades päälkirja"
 
-#: src/summaryview.c:451
+#: src/summaryview.c:453
 msgid "/_View/_Source"
 msgstr "/Vaade/Lähtekood"
 
-#: src/summaryview.c:452
+#: src/summaryview.c:454
 msgid "/_View/All _header"
 msgstr "/Vaade/Kõik päised"
 
-#: src/summaryview.c:454
+#: src/summaryview.c:456
 msgid "/_Print..."
 msgstr "Trüki..."
 
-#: src/summaryview.c:486
+#: src/summaryview.c:488
 msgid "Creating summary view...\n"
 msgstr "Loon kokkuvõtte vaate...\n"
 
-#: src/summaryview.c:508
+#: src/summaryview.c:510
 msgid "All"
 msgstr ""
 
-#: src/summaryview.c:511
+#: src/summaryview.c:513
 #, fuzzy
 msgid "Have color label"
 msgstr "/Värviline silt"
 
-#: src/summaryview.c:512
+#: src/summaryview.c:514
 #, fuzzy
 msgid "Have attachment"
 msgstr "Manus"
 
-#: src/summaryview.c:521
+#: src/summaryview.c:523
 #, fuzzy
 msgid "Search:"
 msgstr "Otsi"
 
-#: src/summaryview.c:535
+#: src/summaryview.c:537
 msgid "Search for Subject or From"
 msgstr ""
 
-#: src/summaryview.c:702
+#: src/summaryview.c:704
 msgid "Process mark"
 msgstr "Protsessi märk"
 
-#: src/summaryview.c:703
+#: src/summaryview.c:705
 msgid "Some marks are left. Process it?"
 msgstr "Mõned märgid on jäänud. Protsessime selle?"
 
-#: src/summaryview.c:749
+#: src/summaryview.c:751
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "Tuhnin kaustas (%s)..."
 
-#: src/summaryview.c:1292
+#: src/summaryview.c:1295
 #, fuzzy
 msgid "_Search again"
 msgstr "Otsi uuesti"
 
-#: src/summaryview.c:1313 src/summaryview.c:1322
+#: src/summaryview.c:1316 src/summaryview.c:1325
 msgid "No more unread messages"
 msgstr "Pole rohkem kirju, mida pole loetud."
 
-#: src/summaryview.c:1314
+#: src/summaryview.c:1317
 msgid "No unread message found. Search from the end?"
 msgstr "Pole rohkem kirju, mida pole loetud. Otsime alates lõpust?"
 
-#: src/summaryview.c:1316
+#: src/summaryview.c:1319
 msgid "No unread messages."
 msgstr "Kirju mida pole loetud ei ole."
 
-#: src/summaryview.c:1323
+#: src/summaryview.c:1326
 msgid "No unread message found. Go to next folder?"
 msgstr "Ei leidunud kirju mida pole loetud. Otsime järgmisest kaustast?"
 
-#: src/summaryview.c:1331 src/summaryview.c:1340
+#: src/summaryview.c:1334 src/summaryview.c:1343
 msgid "No more new messages"
 msgstr "Pole rohkem kirju"
 
-#: src/summaryview.c:1332
+#: src/summaryview.c:1335
 msgid "No new message found. Search from the end?"
 msgstr "Pole rohkem uusi kirju. Otsime alates lõpust?"
 
-#: src/summaryview.c:1334
+#: src/summaryview.c:1337
 msgid "No new messages."
 msgstr "Uusi kirju ei ole."
 
-#: src/summaryview.c:1341
+#: src/summaryview.c:1344
 msgid "No new message found. Go to next folder?"
 msgstr "Uusi kirju ei leidu. Otsime järgmisest kaustast?"
 
-#: src/summaryview.c:1349 src/summaryview.c:1358
+#: src/summaryview.c:1352 src/summaryview.c:1361
 msgid "No more marked messages"
 msgstr "Pole Rohkem märgitud kirju"
 
-#: src/summaryview.c:1350
+#: src/summaryview.c:1353
 msgid "No marked message found. Search from the end?"
 msgstr "Märgitud kirju ei leidunud. Kas otsime lõpust?"
 
-#: src/summaryview.c:1352 src/summaryview.c:1361
+#: src/summaryview.c:1355 src/summaryview.c:1364
 msgid "No marked messages."
 msgstr "Märgitud kirju ei ole."
 
-#: src/summaryview.c:1359
+#: src/summaryview.c:1362
 msgid "No marked message found. Search from the beginning?"
 msgstr "Märgitud kirju ei leidunud. Kas otsime algusest?"
 
-#: src/summaryview.c:1367 src/summaryview.c:1376
+#: src/summaryview.c:1370 src/summaryview.c:1379
 msgid "No more labeled messages"
 msgstr "Rohkem sildiga kirju ei ole"
 
-#: src/summaryview.c:1368
+#: src/summaryview.c:1371
 msgid "No labeled message found. Search from the end?"
 msgstr "Rohkem sildiga kirju ei leitud. Kas otsime lõpust?"
 
-#: src/summaryview.c:1370 src/summaryview.c:1379
+#: src/summaryview.c:1373 src/summaryview.c:1382
 msgid "No labeled messages."
 msgstr "Rohkem sildiga kirju ei ole."
 
-#: src/summaryview.c:1377
+#: src/summaryview.c:1380
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Rohkem seildiga kirju ei leitud. Kas otsime algusest?"
 
-#: src/summaryview.c:1693
+#: src/summaryview.c:1696
 msgid "Attracting messages by subject..."
 msgstr "*Võtan kirju päälkirja järgi..."
 
-#: src/summaryview.c:1887
+#: src/summaryview.c:1890
 #, c-format
 msgid "%d deleted"
 msgstr "%d on kustutatud"
 
-#: src/summaryview.c:1891
+#: src/summaryview.c:1894
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d on ülekantud"
 
-#: src/summaryview.c:1892 src/summaryview.c:1897
+#: src/summaryview.c:1895 src/summaryview.c:1900
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:1896
+#: src/summaryview.c:1899
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d on kopeeritud"
 
-#: src/summaryview.c:1911
+#: src/summaryview.c:1914
 msgid " item(s) selected"
 msgstr " kirja märgitud"
 
-#: src/summaryview.c:1933
+#: src/summaryview.c:1936
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "uusi %d, mitteloetuid %d, kokku %d (%s)"
 
-#: src/summaryview.c:1937
+#: src/summaryview.c:1940
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "uusi %d, mitteloetuid %d, kokku %d"
 
-#: src/summaryview.c:1971
+#: src/summaryview.c:1974
 msgid "Sorting summary..."
 msgstr "Sorteerin kirjaloendi..."
 
-#: src/summaryview.c:2194
+#: src/summaryview.c:2211
 msgid "\tSetting summary from message data..."
 msgstr "\t sätin kokkuvõtte kirja andmetest..."
 
-#: src/summaryview.c:2196
+#: src/summaryview.c:2213
 msgid "Setting summary from message data..."
 msgstr "Teen kokkuvõtte teadete andmetest..."
 
-#: src/summaryview.c:2302
+#: src/summaryview.c:2319
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "*Kirjutan koondy puvrisse (%s)..."
 
-#: src/summaryview.c:2643
+#: src/summaryview.c:2660
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Kiri %d on märgitud\n"
 
-#: src/summaryview.c:2701
+#: src/summaryview.c:2718
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Kiri %d on märgitud kui läbiloetu\n"
 
-#: src/summaryview.c:2789
+#: src/summaryview.c:2908
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Kiri %d on märgitud kui mitteloetu\n"
 
-#: src/summaryview.c:2850
+#: src/summaryview.c:2969
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Kiri %s/%d on määratud kustutamisele\n"
 
-#: src/summaryview.c:2878
+#: src/summaryview.c:2997
 msgid "Delete message(s)"
 msgstr "Kustuta kirjad"
 
-#: src/summaryview.c:2879
+#: src/summaryview.c:2998
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Kas te tõesti soovite kirju eemaldada prügikastist?"
 
-#: src/summaryview.c:2953
+#: src/summaryview.c:3072
 msgid "Deleting duplicated messages..."
 msgstr "Kustutan duplitseeritud kirju..."
 
-#: src/summaryview.c:2991
+#: src/summaryview.c:3110
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Kiri %s/%d pole märgitud\n"
 
-#: src/summaryview.c:3049
+#: src/summaryview.c:3168
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Kiri %d on määratud ülekandmiseks %s-i\n"
 
-#: src/summaryview.c:3066
+#: src/summaryview.c:3196
 msgid "Destination is same as current folder."
 msgstr "Sihtpunkt on sama mis aktiivne kaust."
 
-#: src/summaryview.c:3122
+#: src/summaryview.c:3260
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Kiri %d on määratud kopeerimisele %s-i\n"
 
-#: src/summaryview.c:3139
+#: src/summaryview.c:3288
 #, fuzzy
 msgid "Destination for copy is same as current folder."
 msgstr "Kopeerimise sihtpunkt on sama mis aktiivne kaust."
 
-#: src/summaryview.c:3338
+#: src/summaryview.c:3495
 #, fuzzy
 msgid "Error occurred while processing messages."
 msgstr "Tekkis viga kirja protsessimisel."
 
-#: src/summaryview.c:3646 src/summaryview.c:3647
+#: src/summaryview.c:3803 src/summaryview.c:3804
 msgid "Building threads..."
 msgstr "Loon teemad..."
 
-#: src/summaryview.c:3797 src/summaryview.c:3798
+#: src/summaryview.c:3954 src/summaryview.c:3955
 msgid "Unthreading..."
 msgstr "Eemaldan teemad..."
 
-#: src/summaryview.c:4091 src/summaryview.c:4147
+#: src/summaryview.c:4248 src/summaryview.c:4304
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtreerin..."
 
-#: src/summaryview.c:4196
+#: src/summaryview.c:4353
 msgid "filtering..."
 msgstr "filtreerin..."
 
-#: src/summaryview.c:4197
+#: src/summaryview.c:4354
 msgid "Filtering..."
 msgstr "Filtreerin..."
 
-#: src/summaryview.c:4233
+#: src/summaryview.c:4390
 #, fuzzy, c-format
 msgid "%d message(s) have been filtered."
 msgstr "kiri %d on juba salvestatud.\n"
 
-#: src/summaryview.c:4742
+#: src/summaryview.c:4899
 msgid "No."
 msgstr "Ei."
 
@@ -6646,36 +6677,36 @@ msgstr "Loon tekstivaate...\n"
 msgid "This message can't be displayed.\n"
 msgstr "kirja ei saanud\n"
 
-#: src/textview.c:1929
+#: src/textview.c:1925
 #, fuzzy
 msgid "Sa_ve this image as..."
 msgstr "/Salveta kui..."
 
-#: src/textview.c:1945 src/trayicon.c:109
+#: src/textview.c:1941 src/trayicon.c:109
 #, fuzzy
 msgid "Compose _new message"
 msgstr "Kirjuta uus kiri"
 
-#: src/textview.c:1947
+#: src/textview.c:1943
 #, fuzzy
 msgid "Add to address _book..."
 msgstr "/Lisa saatje aadressi raamatusse"
 
-#: src/textview.c:1949
+#: src/textview.c:1945
 #, fuzzy
 msgid "Copy this add_ress"
 msgstr "Üldine aadress"
 
-#: src/textview.c:1952
+#: src/textview.c:1948
 #, fuzzy
 msgid "_Open with Web browser"
 msgstr "Weebi sirvur"
 
-#: src/textview.c:1954
+#: src/textview.c:1950
 msgid "Copy this _link"
 msgstr ""
 
-#: src/textview.c:2097
+#: src/textview.c:2093
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6684,7 +6715,7 @@ msgid ""
 "Open it anyway?"
 msgstr ""
 
-#: src/textview.c:2102
+#: src/textview.c:2098
 msgid "Fake URL warning"
 msgstr ""
 
diff --git a/po/fr.po b/po/fr.po
index ad24afca..f72774fb 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: 2006-01-27 18:11+0900\n"
+"POT-Creation-Date: 2006-01-31 15:20+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"
@@ -517,7 +517,7 @@ msgstr "Trouvé : %s\n"
 msgid "Configuration is saved.\n"
 msgstr "La configuration est enregistrée.\n"
 
-#: libsylph/prefs_common.c:489
+#: libsylph/prefs_common.c:491
 msgid "Junk mail filter"
 msgstr "Dossier des messages indésirables"
 
@@ -633,8 +633,8 @@ msgstr "%.2f Mo"
 msgid "%.2fGB"
 msgstr "%.2f Go"
 
-#: libsylph/utils.c:2373 src/compose.c:2858 src/compose.c:3121
-#: src/compose.c:3184 src/compose.c:3304
+#: libsylph/utils.c:2373 src/compose.c:2867 src/compose.c:3130
+#: src/compose.c:3193 src/compose.c:3313
 msgid "can't change file mode\n"
 msgstr "impossible de modifier les droits d'accès du fichier\n"
 
@@ -721,8 +721,8 @@ msgstr ""
 "case dans la colonne G pour relever le courrier du compte \n"
 "correspondant lorsque « Tout relever » est activé"
 
-#: src/account_dialog.c:366 src/addressadd.c:192 src/addressbook.c:491
-#: src/compose.c:4262 src/editaddress.c:200 src/editaddress.c:942
+#: src/account_dialog.c:366 src/addressadd.c:192 src/addressbook.c:493
+#: src/compose.c:4271 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:206 src/prefs_filter.c:259 src/prefs_folder_item.c:171
@@ -858,12 +858,12 @@ msgstr "Argument de l'action"
 msgid "Add Address to Book"
 msgstr "Ajouter l'adresse au carnet"
 
-#: src/addressadd.c:202 src/compose.c:4762 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4771 src/editaddress.c:201
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "Adresse"
 
-#: src/addressadd.c:212 src/addressbook.c:493 src/editaddress.c:202
+#: src/addressadd.c:212 src/addressbook.c:495 src/editaddress.c:202
 #: src/editaddress.c:795 src/editaddress.c:860 src/editgroup.c:267
 msgid "Remarks"
 msgstr "Remarques"
@@ -872,183 +872,183 @@ msgstr "Remarques"
 msgid "Select Address Book Folder"
 msgstr "Choisissez un dossier"
 
-#: src/addressbook.c:336 src/compose.c:515 src/mainwindow.c:477
+#: src/addressbook.c:338 src/compose.c:515 src/mainwindow.c:480
 #: src/messageview.c:138
 msgid "/_File"
 msgstr "/_Fichier"
 
-#: src/addressbook.c:337
+#: src/addressbook.c:339
 msgid "/_File/New _Book"
 msgstr "/_Fichier/Nouveau _carnet d'adresses"
 
-#: src/addressbook.c:338
+#: src/addressbook.c:340
 msgid "/_File/New _vCard"
 msgstr "/_Fichier/Nouveau carnet _vCard"
 
-#: src/addressbook.c:340
+#: src/addressbook.c:342
 msgid "/_File/New _JPilot"
 msgstr "/_Fichier/Nouveau carnet _JPilot"
 
-#: src/addressbook.c:343
+#: src/addressbook.c:345
 msgid "/_File/New _Server"
 msgstr "/_Fichier/Nouveau _serveur LDAP"
 
-#: src/addressbook.c:345 src/addressbook.c:348 src/compose.c:520
-#: src/compose.c:525 src/compose.c:528 src/compose.c:531 src/mainwindow.c:495
-#: src/mainwindow.c:498 src/mainwindow.c:500 src/mainwindow.c:503
-#: src/mainwindow.c:505 src/messageview.c:141
+#: src/addressbook.c:347 src/addressbook.c:350 src/compose.c:520
+#: src/compose.c:525 src/compose.c:528 src/compose.c:531 src/mainwindow.c:498
+#: src/mainwindow.c:501 src/mainwindow.c:503 src/mainwindow.c:506
+#: src/mainwindow.c:508 src/messageview.c:141
 msgid "/_File/---"
 msgstr "/_Fichier/---"
 
-#: src/addressbook.c:346
+#: src/addressbook.c:348
 msgid "/_File/_Edit"
 msgstr "/_Fichier/Édit_er"
 
-#: src/addressbook.c:347
+#: src/addressbook.c:349
 msgid "/_File/_Delete"
 msgstr "/_Fichier/_Supprimer"
 
-#: src/addressbook.c:349
+#: src/addressbook.c:351
 msgid "/_File/_Save"
 msgstr "/_Fichier/En_registrer"
 
-#: src/addressbook.c:350 src/compose.c:532 src/messageview.c:142
+#: src/addressbook.c:352 src/compose.c:532 src/messageview.c:142
 msgid "/_File/_Close"
 msgstr "/_Fichier/_Fermer"
 
-#: src/addressbook.c:351
+#: src/addressbook.c:353
 msgid "/_Address"
 msgstr "/_Adresse"
 
-#: src/addressbook.c:352
+#: src/addressbook.c:354
 msgid "/_Address/New _Address"
 msgstr "/_Adresse/Nouvelle _adresse"
 
-#: src/addressbook.c:353
+#: src/addressbook.c:355
 msgid "/_Address/New _Group"
 msgstr "/_Adresse/Nouveau _groupe"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:356
 msgid "/_Address/New _Folder"
 msgstr "/_Adresse/Nouveau _dossier"
 
-#: src/addressbook.c:355
+#: src/addressbook.c:357
 msgid "/_Address/---"
 msgstr "/_Adresse/---"
 
-#: src/addressbook.c:356
+#: src/addressbook.c:358
 msgid "/_Address/_Edit"
 msgstr "/_Adresse/Édit_er"
 
-#: src/addressbook.c:357
+#: src/addressbook.c:359
 msgid "/_Address/_Delete"
 msgstr "/_Adresse/_Supprimer"
 
-#: src/addressbook.c:358 src/compose.c:639 src/mainwindow.c:738
-#: src/messageview.c:259
+#: src/addressbook.c:360 src/compose.c:645 src/mainwindow.c:749
+#: src/messageview.c:264
 msgid "/_Tools"
 msgstr "/_Outils"
 
-#: src/addressbook.c:359
+#: src/addressbook.c:361
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Outils/Importer un fichier _LDIF"
 
-#: src/addressbook.c:360 src/compose.c:658 src/mainwindow.c:788
-#: src/messageview.c:277
+#: src/addressbook.c:362 src/compose.c:664 src/mainwindow.c:799
+#: src/messageview.c:282
 msgid "/_Help"
 msgstr "/A_ide"
 
-#: src/addressbook.c:361 src/compose.c:659 src/mainwindow.c:799
-#: src/messageview.c:278
+#: src/addressbook.c:363 src/compose.c:665 src/mainwindow.c:810
+#: src/messageview.c:283
 msgid "/_Help/_About"
 msgstr "/A_ide/À _propos"
 
-#: src/addressbook.c:380 src/addressbook.c:390
+#: src/addressbook.c:382 src/addressbook.c:392
 msgid "/New _Address"
 msgstr "/Nouvelle _adresse"
 
-#: src/addressbook.c:381 src/addressbook.c:391
+#: src/addressbook.c:383 src/addressbook.c:393
 msgid "/New _Group"
 msgstr "/Nouveau _groupe"
 
-#: src/addressbook.c:382 src/addressbook.c:392
+#: src/addressbook.c:384 src/addressbook.c:394
 msgid "/New _Folder"
 msgstr "/Nouveau _dossier"
 
-#: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:509
+#: src/addressbook.c:385 src/addressbook.c:395 src/compose.c:509
 #: src/folderview.c:246 src/folderview.c:248 src/folderview.c:253
 #: src/folderview.c:266 src/folderview.c:268 src/folderview.c:270
 #: src/folderview.c:275 src/folderview.c:289 src/folderview.c:291
 #: src/folderview.c:295 src/summaryview.c:414 src/summaryview.c:418
-#: src/summaryview.c:421 src/summaryview.c:431 src/summaryview.c:433
-#: src/summaryview.c:435 src/summaryview.c:447 src/summaryview.c:453
+#: src/summaryview.c:421 src/summaryview.c:433 src/summaryview.c:435
+#: src/summaryview.c:437 src/summaryview.c:449 src/summaryview.c:455
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:534
-#: src/mainwindow.c:509 src/messageview.c:144
+#: src/addressbook.c:386 src/addressbook.c:396 src/compose.c:534
+#: src/mainwindow.c:512 src/messageview.c:144
 msgid "/_Edit"
 msgstr "/É_dition"
 
-#: src/addressbook.c:385 src/addressbook.c:395 src/summaryview.c:432
+#: src/addressbook.c:387 src/addressbook.c:397 src/summaryview.c:434
 msgid "/_Delete"
 msgstr "/_Supprimer"
 
-#: src/addressbook.c:492
+#: src/addressbook.c:494
 msgid "E-Mail address"
 msgstr "Adresse électronique"
 
-#: src/addressbook.c:496 src/compose.c:4763 src/prefs_common_dialog.c:2183
+#: src/addressbook.c:498 src/compose.c:4772 src/prefs_common_dialog.c:2183
 msgid "Address book"
 msgstr "Carnet d'adresses"
 
-#: src/addressbook.c:596 src/prefs_filter_edit.c:249
+#: src/addressbook.c:600 src/prefs_filter_edit.c:249
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "Nom :"
 
 #. Buttons
-#: src/addressbook.c:628 src/addressbook.c:1680 src/editaddress.c:884
-#: src/editaddress.c:1017 src/mainwindow.c:2391 src/prefs_actions.c:266
+#: src/addressbook.c:632 src/addressbook.c:1684 src/editaddress.c:884
+#: src/editaddress.c:1017 src/mainwindow.c:2402 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
 #: src/prefs_template.c:233
 msgid "Delete"
 msgstr "Supprimer"
 
-#: src/addressbook.c:631 src/editaddress.c:890 src/editaddress.c:1023
+#: src/addressbook.c:635 src/editaddress.c:890 src/editaddress.c:1023
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:273 src/prefs_display_header.c:328
 #: src/prefs_filter_edit.c:1550
 msgid "Add"
 msgstr "Ajouter"
 
-#: src/addressbook.c:634
+#: src/addressbook.c:638
 msgid "Lookup"
 msgstr "Rechercher"
 
-#: src/addressbook.c:646 src/headerview.c:55 src/prefs_folder_item.c:339
+#: src/addressbook.c:650 src/headerview.c:55 src/prefs_folder_item.c:339
 #: src/prefs_template.c:176
 msgid "To:"
 msgstr "À :"
 
-#: src/addressbook.c:650 src/prefs_folder_item.c:356 src/prefs_template.c:178
+#: src/addressbook.c:654 src/prefs_folder_item.c:356 src/prefs_template.c:178
 msgid "Cc:"
 msgstr "Copie :"
 
-#: src/addressbook.c:654 src/prefs_folder_item.c:367
+#: src/addressbook.c:658 src/prefs_folder_item.c:367
 msgid "Bcc:"
 msgstr "Copie discrète :"
 
 #. Confirm deletion
-#: src/addressbook.c:841
+#: src/addressbook.c:845
 msgid "Delete address(es)"
 msgstr "Suppression d'adresse(s)"
 
-#: src/addressbook.c:842
+#: src/addressbook.c:846
 msgid "Really delete the address(es)?"
 msgstr "Voulez-vous supprimer la(les) adresse(s) sélectionnée(s) ?"
 
-#: src/addressbook.c:1671
+#: src/addressbook.c:1675
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1058,37 +1058,37 @@ msgstr ""
 "Si vous supprimez uniquement le dossier, les adresses seront déplacées dans "
 "le dossier parent."
 
-#: src/addressbook.c:1674 src/folderview.c:2351
+#: src/addressbook.c:1678 src/folderview.c:2351
 msgid "Delete folder"
 msgstr "Suppression de dossier"
 
-#: src/addressbook.c:1674
+#: src/addressbook.c:1678
 msgid "_Folder only"
 msgstr "_Dossier uniquement"
 
-#: src/addressbook.c:1674
+#: src/addressbook.c:1678
 msgid "Folder and _addresses"
 msgstr "Dossier et _adresses"
 
-#: src/addressbook.c:1679
+#: src/addressbook.c:1683
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Voulez-vous vraiment supprimer « %s » ?"
 
-#: src/addressbook.c:2365 src/addressbook.c:2498
+#: src/addressbook.c:2369 src/addressbook.c:2502
 msgid "New user, could not save index file."
 msgstr "Nouvel utilisateur. Impossible d'enregistrer le fichier index."
 
-#: src/addressbook.c:2369 src/addressbook.c:2502
+#: src/addressbook.c:2373 src/addressbook.c:2506
 msgid "New user, could not save address book files."
 msgstr ""
 "Nouvel utilisateur, impossible d'enregistrer le fichier carnet d'adresses."
 
-#: src/addressbook.c:2379 src/addressbook.c:2512
+#: src/addressbook.c:2383 src/addressbook.c:2516
 msgid "Old address book converted successfully."
 msgstr "Ancien carnet d'adresses converti avec succès."
 
-#: src/addressbook.c:2384
+#: src/addressbook.c:2388
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1096,7 +1096,7 @@ msgstr ""
 "Ancien carnet d'adresses converti,\n"
 "mais impossible d'enregistrer le nouveau fichier index."
 
-#: src/addressbook.c:2397
+#: src/addressbook.c:2401
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1104,7 +1104,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:2403
+#: src/addressbook.c:2407
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1112,7 +1112,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:2408
+#: src/addressbook.c:2412
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1120,92 +1120,92 @@ 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:2415
+#: src/addressbook.c:2419
 msgid "Addressbook conversion error"
 msgstr "Erreur de conversion du carnet d'adresses"
 
-#: src/addressbook.c:2419
+#: src/addressbook.c:2423
 msgid "Addressbook conversion"
 msgstr "Conversion de carnets d'adresses"
 
-#: src/addressbook.c:2454
+#: src/addressbook.c:2458
 msgid "Addressbook Error"
 msgstr "Erreur dans le carnet d'adresses"
 
-#: src/addressbook.c:2455 src/addressbook.c:2555
+#: src/addressbook.c:2459 src/addressbook.c:2559
 msgid "Could not read address index"
 msgstr "Échec lors de la lecture de l'index des adresses"
 
-#: src/addressbook.c:2517
+#: src/addressbook.c:2521
 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:2531
+#: src/addressbook.c:2535
 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:2537
+#: src/addressbook.c:2541
 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:2543
+#: src/addressbook.c:2547
 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:2561
+#: src/addressbook.c:2565
 msgid "Addressbook Conversion Error"
 msgstr "Erreur de conversion du carnet d'adresses"
 
-#: src/addressbook.c:2567
+#: src/addressbook.c:2571
 msgid "Addressbook Conversion"
 msgstr "Conversion de carnets d'adresses"
 
-#: src/addressbook.c:3072 src/prefs_common_dialog.c:2033
+#: src/addressbook.c:3086 src/prefs_common_dialog.c:2033
 msgid "Interface"
 msgstr "Interface"
 
-#: src/addressbook.c:3088 src/importldif.c:514
+#: src/addressbook.c:3102 src/importldif.c:514
 msgid "Address Book"
 msgstr "Carnet d'adresses"
 
-#: src/addressbook.c:3104
+#: src/addressbook.c:3118
 msgid "Person"
 msgstr "Personne"
 
-#: src/addressbook.c:3120
+#: src/addressbook.c:3134
 msgid "EMail Address"
 msgstr "Adresse électronique"
 
-#: src/addressbook.c:3136
+#: src/addressbook.c:3150
 msgid "Group"
 msgstr "Groupe"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3152 src/folderview.c:367 src/prefs_account_dialog.c:1694
+#: src/addressbook.c:3166 src/folderview.c:367 src/prefs_account_dialog.c:1694
 #: src/query_search.c:370
 msgid "Folder"
 msgstr "Dossier"
 
-#: src/addressbook.c:3168
+#: src/addressbook.c:3182
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3184 src/addressbook.c:3200
+#: src/addressbook.c:3198 src/addressbook.c:3214
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3216
+#: src/addressbook.c:3230
 msgid "LDAP Server"
 msgstr "Serveur LDAP"
 
@@ -1217,7 +1217,7 @@ msgstr "Adresse courante :"
 msgid "Personal address"
 msgstr "Adresse personnelle :"
 
-#: src/alertpanel.c:141 src/compose.c:5485 src/main.c:573
+#: src/alertpanel.c:141 src/compose.c:5494 src/main.c:573
 msgid "Notice"
 msgstr "Information"
 
@@ -1268,7 +1268,7 @@ msgstr "Brun"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4593
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4750
 msgid "None"
 msgstr "Aucun"
 
@@ -1326,7 +1326,7 @@ msgstr "/É_dition/_Annuler"
 msgid "/_Edit/_Redo"
 msgstr "/É_dition/_Refaire"
 
-#: src/compose.c:537 src/compose.c:544 src/mainwindow.c:513
+#: src/compose.c:537 src/compose.c:544 src/mainwindow.c:516
 #: src/messageview.c:147
 msgid "/_Edit/---"
 msgstr "/É_dition/---"
@@ -1335,7 +1335,7 @@ msgstr "/É_dition/---"
 msgid "/_Edit/Cu_t"
 msgstr "/É_dition/Co_uper"
 
-#: src/compose.c:539 src/mainwindow.c:510 src/messageview.c:145
+#: src/compose.c:539 src/mainwindow.c:513 src/messageview.c:145
 msgid "/_Edit/_Copy"
 msgstr "/É_dition/_Copier"
 
@@ -1347,7 +1347,7 @@ msgstr "/É_dition/Co_ller"
 msgid "/_Edit/Paste as _quotation"
 msgstr "/É_dition/Coller comme ci_tation"
 
-#: src/compose.c:543 src/mainwindow.c:511 src/messageview.c:146
+#: src/compose.c:543 src/mainwindow.c:514 src/messageview.c:146
 msgid "/_Edit/Select _all"
 msgstr "/É_dition/Tout sélectio_nner"
 
@@ -1363,8 +1363,8 @@ msgstr "/É_dition/Justifier tout le _message"
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/É_dition/Justification aut_omatique"
 
-#: src/compose.c:550 src/mainwindow.c:518 src/messageview.c:151
-#: src/summaryview.c:448
+#: src/compose.c:550 src/mainwindow.c:521 src/messageview.c:151
+#: src/summaryview.c:450
 msgid "/_View"
 msgstr "/_Affichage"
 
@@ -1385,9 +1385,9 @@ msgid "/_View/_Reply to"
 msgstr "/_Affichage/_Répondre à"
 
 #: src/compose.c:555 src/compose.c:557 src/compose.c:559 src/compose.c:561
-#: src/mainwindow.c:538 src/mainwindow.c:541 src/mainwindow.c:568
-#: src/mainwindow.c:592 src/mainwindow.c:687 src/mainwindow.c:691
-#: src/messageview.c:236
+#: src/mainwindow.c:541 src/mainwindow.c:544 src/mainwindow.c:571
+#: src/mainwindow.c:595 src/mainwindow.c:696 src/mainwindow.c:700
+#: src/messageview.c:241
 msgid "/_View/---"
 msgstr "/_Affichage/---"
 
@@ -1403,7 +1403,7 @@ msgstr "/_Affichage/_Afficher une règle"
 msgid "/_View/_Attachment"
 msgstr "/_Affichage/_Pièce(s) jointe(s)"
 
-#: src/compose.c:567 src/mainwindow.c:599 src/messageview.c:158
+#: src/compose.c:567 src/mainwindow.c:602 src/messageview.c:158
 msgid "/_View/Character _encoding"
 msgstr "/_Affichage/_Jeu de caractères"
 
@@ -1412,216 +1412,227 @@ msgid "/_View/Character _encoding/_Automatic"
 msgstr "/_Affichage/_Jeu de caractères/_Automatique"
 
 #: src/compose.c:570 src/compose.c:576 src/compose.c:582 src/compose.c:586
-#: src/compose.c:592 src/compose.c:596 src/compose.c:602 src/compose.c:606
-#: src/compose.c:616 src/compose.c:620 src/compose.c:628 src/compose.c:632
-#: src/mainwindow.c:595 src/mainwindow.c:602 src/messageview.c:154
+#: src/compose.c:592 src/compose.c:596 src/compose.c:602 src/compose.c:608
+#: src/compose.c:612 src/compose.c:622 src/compose.c:626 src/compose.c:634
+#: src/compose.c:638 src/mainwindow.c:598 src/mainwindow.c:605
+#: src/messageview.c:154
 msgid "/_View/Character _encoding/---"
 msgstr "/_Affichage/_Jeu de caractères/---"
 
-#: src/compose.c:572 src/mainwindow.c:603 src/messageview.c:162
+#: src/compose.c:572 src/mainwindow.c:606 src/messageview.c:162
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Affichage/_Jeu de caractères/ASCII 7 bits (US-ASC_II)"
 
-#: src/compose.c:574 src/mainwindow.c:605 src/messageview.c:165
+#: src/compose.c:574 src/mainwindow.c:608 src/messageview.c:165
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Affichage/_Jeu de caractères/Unicode (_UTF-8)"
 
-#: src/compose.c:578 src/mainwindow.c:609 src/messageview.c:168
+#: src/compose.c:578 src/mainwindow.c:612 src/messageview.c:168
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Affichage/_Jeu de caractères/Europe occidentale (ISO-8859-_1)"
 
-#: src/compose.c:580 src/mainwindow.c:611 src/messageview.c:170
+#: src/compose.c:580 src/mainwindow.c:614 src/messageview.c:170
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Affichage/_Jeu de caractères/Europe occidentale (ISO-8859-15)"
 
-#: src/compose.c:584 src/mainwindow.c:617 src/messageview.c:175
+#: src/compose.c:584 src/mainwindow.c:620 src/messageview.c:175
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Affichage/_Jeu de caractères/Europe centrale (ISO-8859-_2)"
 
-#: src/compose.c:588 src/mainwindow.c:621 src/messageview.c:178
+#: src/compose.c:588 src/mainwindow.c:624 src/messageview.c:178
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Affichage/_Jeu de caractères/_Baltique (ISO-8859-13)"
 
-#: src/compose.c:590 src/mainwindow.c:623 src/messageview.c:180
+#: src/compose.c:590 src/mainwindow.c:626 src/messageview.c:180
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Affichage/_Jeu de caractères/Europe du Nord (ISO-8859-_4)"
 
-#: src/compose.c:594 src/mainwindow.c:627 src/messageview.c:183
+#: src/compose.c:594 src/mainwindow.c:630 src/messageview.c:183
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Affichage/_Jeu de caractères/Grec (ISO-8859-_7)"
 
-#: src/compose.c:598 src/mainwindow.c:631 src/messageview.c:186
+#: src/compose.c:598 src/mainwindow.c:634 src/messageview.c:186
+#, fuzzy
+msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
+msgstr "/_Affichage/_Jeu de caractères/Europe du Nord (ISO-8859-_4)"
+
+#: src/compose.c:600 src/mainwindow.c:636 src/messageview.c:188
+#, fuzzy
+msgid "/_View/Character _encoding/Arabic (Windows-1256)"
+msgstr "/_Affichage/_Jeu de caractères/Cyrillique (Windows-1251)"
+
+#: src/compose.c:604 src/mainwindow.c:640 src/messageview.c:191
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Affichage/_Jeu de caractères/Hébreu (ISO-8859-_8)"
 
-#: src/compose.c:600 src/mainwindow.c:633 src/messageview.c:188
+#: src/compose.c:606 src/mainwindow.c:642 src/messageview.c:193
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Affichage/_Jeu de caractères/Hébreu (Windows-1255)"
 
-#: src/compose.c:604 src/mainwindow.c:637 src/messageview.c:191
+#: src/compose.c:610 src/mainwindow.c:646 src/messageview.c:196
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Affichage/_Jeu de caractères/Turc (ISO-8859-_9)"
 
-#: src/compose.c:608 src/mainwindow.c:641 src/messageview.c:194
+#: src/compose.c:614 src/mainwindow.c:650 src/messageview.c:199
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Affichage/_Jeu de caractères/Cyrillique (ISO-8859-_5)"
 
-#: src/compose.c:610 src/mainwindow.c:643 src/messageview.c:196
+#: src/compose.c:616 src/mainwindow.c:652 src/messageview.c:201
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Affichage/_Jeu de caractères/Cyrillique (KOI8-_R)"
 
-#: src/compose.c:612 src/mainwindow.c:645 src/messageview.c:198
+#: src/compose.c:618 src/mainwindow.c:654 src/messageview.c:203
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Affichage/_Jeu de caractères/Cyrillique (KOI8-U)"
 
-#: src/compose.c:614 src/mainwindow.c:647 src/messageview.c:200
+#: src/compose.c:620 src/mainwindow.c:656 src/messageview.c:205
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Affichage/_Jeu de caractères/Cyrillique (Windows-1251)"
 
-#: src/compose.c:618 src/mainwindow.c:651 src/messageview.c:203
+#: src/compose.c:624 src/mainwindow.c:660 src/messageview.c:208
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Affichage/_Jeu de caractères/Japonais (ISO-2022-_JP)"
 
-#: src/compose.c:622 src/mainwindow.c:661 src/messageview.c:212
+#: src/compose.c:628 src/mainwindow.c:670 src/messageview.c:217
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Affichage/_Jeu de caractères/Chinois simplifié (_GB2312)"
 
-#: src/compose.c:624 src/mainwindow.c:663 src/messageview.c:214
+#: src/compose.c:630 src/mainwindow.c:672 src/messageview.c:219
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Affichage/_Jeu de caractères/Chinois simplifié (GBK)"
 
-#: src/compose.c:626 src/mainwindow.c:665 src/messageview.c:216
+#: src/compose.c:632 src/mainwindow.c:674 src/messageview.c:221
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Affichage/_Jeu de caractères/Chinois traditionnel (_Big5)"
 
-#: src/compose.c:630 src/mainwindow.c:673 src/messageview.c:223
+#: src/compose.c:636 src/mainwindow.c:682 src/messageview.c:228
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Affichage/_Jeu de caractères/Coréen (EUC-_KR)"
 
-#: src/compose.c:634 src/mainwindow.c:679 src/messageview.c:228
+#: src/compose.c:640 src/mainwindow.c:688 src/messageview.c:233
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Affichage/_Jeu de caractères/Thaï (TIS-620)"
 
-#: src/compose.c:636 src/mainwindow.c:681 src/messageview.c:230
+#: src/compose.c:642 src/mainwindow.c:690 src/messageview.c:235
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Affichage/_Jeu de caractères/Thaï (Windows-874)"
 
-#: src/compose.c:640 src/mainwindow.c:739 src/messageview.c:260
+#: src/compose.c:646 src/mainwindow.c:750 src/messageview.c:265
 msgid "/_Tools/_Address book"
 msgstr "/_Outils/_Carnet d'adresses"
 
-#: src/compose.c:641
+#: src/compose.c:647
 msgid "/_Tools/_Template"
 msgstr "/_Outils/_Modèle"
 
-#: src/compose.c:642 src/mainwindow.c:762 src/messageview.c:275
+#: src/compose.c:648 src/mainwindow.c:773 src/messageview.c:280
 msgid "/_Tools/Actio_ns"
 msgstr "/_Outils/_Actions"
 
-#: src/compose.c:643 src/compose.c:647 src/compose.c:653 src/mainwindow.c:742
-#: src/mainwindow.c:756 src/mainwindow.c:761 src/mainwindow.c:763
-#: src/mainwindow.c:766 src/mainwindow.c:768 src/messageview.c:263
-#: src/messageview.c:274
+#: src/compose.c:649 src/compose.c:653 src/compose.c:659 src/mainwindow.c:753
+#: src/mainwindow.c:767 src/mainwindow.c:772 src/mainwindow.c:774
+#: src/mainwindow.c:777 src/mainwindow.c:779 src/messageview.c:268
+#: src/messageview.c:279
 msgid "/_Tools/---"
 msgstr "/_Outils/---"
 
-#: src/compose.c:644
+#: src/compose.c:650
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/_Outils/Modifier avec un éditeur e_xterne"
 
-#: src/compose.c:648
+#: src/compose.c:654
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Outils/_Signer"
 
-#: src/compose.c:649
+#: src/compose.c:655
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/_Outils/_Chiffrer"
 
-#: src/compose.c:654
+#: src/compose.c:660
 #, fuzzy
 msgid "/_Tools/_Check spell"
 msgstr "/_Outils/E_xécuter"
 
-#: src/compose.c:655
+#: src/compose.c:661
 #, fuzzy
 msgid "/_Tools/_Set spell language"
 msgstr "/_Outils/_Modèle"
 
-#: src/compose.c:899
+#: src/compose.c:908
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s : le fichier n'existe pas\n"
 
-#: src/compose.c:1003 src/compose.c:1074
+#: src/compose.c:1012 src/compose.c:1083
 msgid "Can't get text part\n"
 msgstr "Impossible d'obtenir la partie texte\n"
 
-#: src/compose.c:1475
+#: src/compose.c:1484
 msgid "Quote mark format error."
 msgstr "Erreur du format de citation."
 
-#: src/compose.c:1487
+#: src/compose.c:1496
 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:1907
+#: src/compose.c:1916
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Le fichier %s n'existe pas\n"
 
-#: src/compose.c:1911
+#: src/compose.c:1920
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Impossible d'obtenir la taille de %s\n"
 
-#: src/compose.c:1915
+#: src/compose.c:1924
 #, c-format
 msgid "File %s is empty."
 msgstr "Le fichier %s est vide."
 
-#: src/compose.c:1919
+#: src/compose.c:1928
 #, c-format
 msgid "Can't read %s."
 msgstr "Impossible de lire %s."
 
-#: src/compose.c:1952
+#: src/compose.c:1961
 #, c-format
 msgid "Message: %s"
 msgstr "Message : %s"
 
-#: src/compose.c:2012 src/mimeview.c:565
+#: src/compose.c:2021 src/mimeview.c:565
 msgid "Can't get the part of multipart message."
 msgstr "Impossible de lire une partie d'un message multipart."
 
-#: src/compose.c:2496 src/headerview.c:195 src/query_search.c:636
-#: src/summaryview.c:2107
+#: src/compose.c:2505 src/headerview.c:195 src/query_search.c:636
+#: src/summaryview.c:2124
 msgid "(No Subject)"
 msgstr "(Pas de sujet)"
 
-#: src/compose.c:2499
+#: src/compose.c:2508
 #, fuzzy, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Composition d'un message%s"
 
-#: src/compose.c:2612
+#: src/compose.c:2621
 msgid "Recipient is not specified."
 msgstr "Destinataire non spécifié."
 
-#: src/compose.c:2620
+#: src/compose.c:2629
 msgid "Empty subject"
 msgstr "Sujet absent"
 
-#: src/compose.c:2621
+#: src/compose.c:2630
 msgid "Subject is empty. Send it anyway?"
 msgstr "Le sujet est vide. Envoyer malgré cela ?"
 
-#: src/compose.c:2680
+#: src/compose.c:2689
 msgid "can't get recipient list."
 msgstr "liste de destinataires vide."
 
-#: src/compose.c:2700
+#: src/compose.c:2709
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1629,21 +1640,21 @@ 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:2714 src/send_message.c:299
+#: src/compose.c:2723 src/send_message.c:299
 #, 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:2756
+#: src/compose.c:2765
 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:2794
+#: src/compose.c:2803
 #, 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:2891
+#: src/compose.c:2900
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1654,11 +1665,11 @@ msgstr ""
 "\n"
 "Voulez-vous néanmoins l'envoyer avec %s ?"
 
-#: src/compose.c:2897
+#: src/compose.c:2906
 msgid "Code conversion error"
 msgstr "Erreur de conversion de code"
 
-#: src/compose.c:2970
+#: src/compose.c:2979
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1671,157 +1682,157 @@ msgstr ""
 "\n"
 "Voulez-vous néanmoins l'envoyer ?"
 
-#: src/compose.c:2974
+#: src/compose.c:2983
 msgid "Line length limit"
 msgstr "Longueur de ligne maximale"
 
-#: src/compose.c:3264
+#: src/compose.c:3273
 msgid "can't remove the old message\n"
 msgstr "Impossible d'enlever l'ancien message\n"
 
-#: src/compose.c:3282
+#: src/compose.c:3291
 msgid "queueing message...\n"
 msgstr "Mise en file d'attente des messages...\n"
 
-#: src/compose.c:3364
+#: src/compose.c:3373
 msgid "can't find queue folder\n"
 msgstr "Impossible de trouver le dossier de file d'attente\n"
 
-#: src/compose.c:3371
+#: src/compose.c:3380
 msgid "can't queue the message\n"
 msgstr "Impossible de mettre ce message dans la file d'attente\n"
 
-#: src/compose.c:3964
+#: src/compose.c:3973
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "Message-ID créé : %s\n"
 
-#: src/compose.c:4077
+#: src/compose.c:4086
 msgid "Creating compose window...\n"
 msgstr "Création de la fenêtre de composition...\n"
 
-#: src/compose.c:4128 src/headerview.c:54
+#: src/compose.c:4137 src/headerview.c:54
 msgid "From:"
 msgstr "De :"
 
-#: src/compose.c:4202
+#: src/compose.c:4211
 msgid "PGP Sign"
 msgstr "Signature PGP"
 
-#: src/compose.c:4205
+#: src/compose.c:4214
 msgid "PGP Encrypt"
 msgstr "Chiffrement PGP"
 
-#: src/compose.c:4243 src/compose.c:5317
+#: src/compose.c:4252 src/compose.c:5326
 msgid "MIME type"
 msgstr "Type MIME"
 
 #. S_COL_DATE
-#: src/compose.c:4252 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4740
+#: src/compose.c:4261 src/mimeview.c:197 src/prefs_filter_edit.c:496
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4897
 msgid "Size"
 msgstr "Taille"
 
-#: src/compose.c:4683 src/mainwindow.c:2324 src/prefs_account_dialog.c:528
+#: src/compose.c:4692 src/mainwindow.c:2335 src/prefs_account_dialog.c:528
 #: src/prefs_common_dialog.c:661
 msgid "Send"
 msgstr "Envoyer"
 
-#: src/compose.c:4684
+#: src/compose.c:4693
 msgid "Send message"
 msgstr "Envoyer le message"
 
-#: src/compose.c:4692
+#: src/compose.c:4701
 msgid "Send later"
 msgstr "Envoi différé"
 
-#: src/compose.c:4693
+#: src/compose.c:4702
 msgid "Put into queue folder and send later"
 msgstr "Mettre en file d'attente et envoyer plus tard"
 
-#: src/compose.c:4701
+#: src/compose.c:4710
 msgid "Draft"
 msgstr "Brouillon"
 
-#: src/compose.c:4702
+#: src/compose.c:4711
 msgid "Save to draft folder"
 msgstr "Enregistrer dans le dossier brouillon"
 
-#: src/compose.c:4712
+#: src/compose.c:4721
 msgid "Insert"
 msgstr "Insertion"
 
-#: src/compose.c:4713
+#: src/compose.c:4722
 msgid "Insert file"
 msgstr "Insérer un fichier"
 
-#: src/compose.c:4721
+#: src/compose.c:4730
 msgid "Attach"
 msgstr "Joindre"
 
-#: src/compose.c:4722
+#: src/compose.c:4731
 msgid "Attach file"
 msgstr "Joindre un fichier"
 
 #. signature
-#: src/compose.c:4732 src/prefs_account_dialog.c:1208
+#: src/compose.c:4741 src/prefs_account_dialog.c:1208
 #: src/prefs_common_dialog.c:953
 msgid "Signature"
 msgstr "Signature"
 
-#: src/compose.c:4733
+#: src/compose.c:4742
 #, fuzzy
 msgid "Append signature"
 msgstr "MAUVAISE signature"
 
 #. editor
-#: src/compose.c:4742 src/prefs_common_dialog.c:991
+#: src/compose.c:4751 src/prefs_common_dialog.c:991
 #: src/prefs_common_dialog.c:2315
 msgid "Editor"
 msgstr "Éditeur de texte"
 
-#: src/compose.c:4743
+#: src/compose.c:4752
 msgid "Edit with external editor"
 msgstr "Éditer avec un éditeur externe"
 
-#: src/compose.c:4751
+#: src/compose.c:4760
 msgid "Linewrap"
 msgstr "Justifier"
 
-#: src/compose.c:4752
+#: src/compose.c:4761
 msgid "Wrap all long lines"
 msgstr "Justifier tout le message"
 
-#: src/compose.c:5213
+#: src/compose.c:5222
 msgid "Invalid MIME type."
 msgstr "Type MIME invalide."
 
-#: src/compose.c:5231
+#: src/compose.c:5240
 msgid "File doesn't exist or is empty."
 msgstr "Le fichier n'existe pas ou est vide."
 
-#: src/compose.c:5299
+#: src/compose.c:5308
 msgid "Properties"
 msgstr "Propriétés"
 
-#: src/compose.c:5319 src/prefs_common_dialog.c:1444
+#: src/compose.c:5328 src/prefs_common_dialog.c:1444
 msgid "Encoding"
 msgstr "Encodage"
 
-#: src/compose.c:5342 src/prefs_folder_item.c:202
+#: src/compose.c:5351 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Chemin d'accès"
 
-#: src/compose.c:5343
+#: src/compose.c:5352
 msgid "File name"
 msgstr "Nom du fichier"
 
-#: src/compose.c:5436
+#: src/compose.c:5445
 #, 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:5482
+#: src/compose.c:5491
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1831,46 +1842,46 @@ msgstr ""
 "Forcer sa fermeture ?\n"
 "id de traitement de groupe: %d"
 
-#: src/compose.c:5857 src/compose.c:5862 src/compose.c:5868
+#: src/compose.c:5866 src/compose.c:5871 src/compose.c:5877
 msgid "Can't queue the message."
 msgstr "Impossible de mettre ce message dans la file d'attente."
 
-#: src/compose.c:5959
+#: src/compose.c:5968
 msgid "Select files"
 msgstr "Sélection de fichier"
 
-#: src/compose.c:5982
+#: src/compose.c:5991
 msgid "Select file"
 msgstr "Choisissez un fichier"
 
-#: src/compose.c:6017
+#: src/compose.c:6026
 msgid "Save message"
 msgstr "Enregistrer le message"
 
-#: src/compose.c:6018
+#: src/compose.c:6027
 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:6020
+#: src/compose.c:6029
 msgid "Close _without saving"
 msgstr "Fermer _sans enregistrer"
 
-#: src/compose.c:6062
+#: src/compose.c:6071
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Voulez-vous appliquer le modèle « %s » ?"
 
-#: src/compose.c:6064
+#: src/compose.c:6073
 msgid "Apply template"
 msgstr "Appliquer un modèle"
 
-#: src/compose.c:6065
+#: src/compose.c:6074
 msgid "_Replace"
 msgstr "_Remplacer"
 
-#: src/compose.c:6065
+#: src/compose.c:6074
 msgid "_Insert"
 msgstr "_Insérer"
 
@@ -2309,7 +2320,7 @@ msgstr "Nouveau"
 
 #. S_COL_MARK
 #: src/folderview.c:412 src/prefs_filter_edit.c:500
-#: src/prefs_summary_column.c:71 src/summaryview.c:509
+#: src/prefs_summary_column.c:71 src/summaryview.c:511
 msgid "Unread"
 msgstr "Non lu"
 
@@ -2325,12 +2336,12 @@ msgstr "Enregistrement des données des dossiers...\n"
 msgid "Setting folder info..."
 msgstr "Initialisation des données des dossiers..."
 
-#: src/folderview.c:858 src/mainwindow.c:3464 src/setup.c:80
+#: src/folderview.c:858 src/mainwindow.c:3481 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Analyse du dossier %s%c%s ..."
 
-#: src/folderview.c:862 src/mainwindow.c:3469 src/setup.c:85
+#: src/folderview.c:862 src/mainwindow.c:3486 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Analyse du dossier %s ..."
@@ -2355,7 +2366,7 @@ msgstr "La reconstruction de l'arborescence a échoué."
 msgid "Checking for new messages in all folders..."
 msgstr "Recherche des nouveaux messages..."
 
-#: src/folderview.c:1200 src/mainwindow.c:2400 src/prefs_common_dialog.c:1789
+#: src/folderview.c:1200 src/mainwindow.c:2411 src/prefs_common_dialog.c:1789
 msgid "Junk"
 msgstr "Indésirable"
 
@@ -2495,7 +2506,7 @@ msgstr "Sujet :"
 msgid "Creating header view...\n"
 msgstr "Création de la vue des en-têtes...\n"
 
-#: src/headerview.c:180 src/query_search.c:637 src/summaryview.c:2110
+#: src/headerview.c:180 src/query_search.c:637 src/summaryview.c:2127
 msgid "(No From)"
 msgstr "(Pas d'expéditeur)"
 
@@ -2606,7 +2617,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:2420
+#: src/importldif.c:768 src/mainwindow.c:2431
 msgid "Next"
 msgstr "Suivant"
 
@@ -2964,11 +2975,11 @@ msgstr ""
 msgid "another Sylpheed is already running.\n"
 msgstr "une autre session de Sylpheed existe.\n"
 
-#: src/main.c:1064
+#: src/main.c:1083
 msgid "Migration of configuration"
 msgstr "Migration de la configuration"
 
-#: src/main.c:1065
+#: src/main.c:1084
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -2976,638 +2987,643 @@ msgstr ""
 "Une ancienne version de configuration a été trouvée.\n"
 "Voulez-vous migrer vers la nouvelle ?"
 
-#: src/mainwindow.c:478
+#: src/mainwindow.c:481
 msgid "/_File/_Folder"
 msgstr "/_Fichier/_Dossier"
 
-#: src/mainwindow.c:479
+#: src/mainwindow.c:482
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/_Fichier/_Dossier/Créer un _nouveau dossier..."
 
-#: src/mainwindow.c:481
+#: src/mainwindow.c:484
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/_Fichier/_Dossier/_Renommer le dossier..."
 
-#: src/mainwindow.c:482
+#: src/mainwindow.c:485
 msgid "/_File/_Folder/_Move folder..."
 msgstr "/_Fichier/_Dossier/_Déplacer le dossier..."
 
-#: src/mainwindow.c:483
+#: src/mainwindow.c:486
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/_Fichier/_Dossier/_Supprimer le dossier"
 
-#: src/mainwindow.c:484
+#: src/mainwindow.c:487
 msgid "/_File/_Mailbox"
 msgstr "/_Fichier/_Boîte aux lettres"
 
-#: src/mainwindow.c:485
+#: src/mainwindow.c:488
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/_Fichier/_Boîte aux lettres/Ajouter une _boîte aux lettres..."
 
-#: src/mainwindow.c:486
+#: src/mainwindow.c:489
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/_Fichier/_Boîte aux lettres/_Supprimer la boîte aux lettres"
 
-#: src/mainwindow.c:487 src/mainwindow.c:492
+#: src/mainwindow.c:490 src/mainwindow.c:495
 msgid "/_File/_Mailbox/---"
 msgstr "/_Fichier/_Boîte aux lettres/---"
 
-#: src/mainwindow.c:488
+#: src/mainwindow.c:491
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "/_Fichier/_Boîte aux lettres/Re_chercher les nouveaux messages"
 
-#: src/mainwindow.c:490
+#: src/mainwindow.c:493
 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:493
+#: src/mainwindow.c:496
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "/_Fichier/_Boîte aux lettres/Reconstruire l'_arborescence"
 
-#: src/mainwindow.c:496
+#: src/mainwindow.c:499
 msgid "/_File/_Import mbox file..."
 msgstr "/_Fichier/_Importer un fichier mbox..."
 
-#: src/mainwindow.c:497
+#: src/mainwindow.c:500
 msgid "/_File/_Export to mbox file..."
 msgstr "/_Fichier/_Exporter vers un fichier mbox..."
 
-#: src/mainwindow.c:499
+#: src/mainwindow.c:502
 msgid "/_File/Empty all _trash"
 msgstr "/_Fichier/_Vider les corbeilles"
 
-#: src/mainwindow.c:501 src/messageview.c:139
+#: src/mainwindow.c:504 src/messageview.c:139
 msgid "/_File/_Save as..."
 msgstr "/_Fichier/Enregistrer _sous..."
 
-#: src/mainwindow.c:502 src/messageview.c:140
+#: src/mainwindow.c:505 src/messageview.c:140
 msgid "/_File/_Print..."
 msgstr "/_Fichier/Im_primer..."
 
-#: src/mainwindow.c:504
+#: src/mainwindow.c:507
 msgid "/_File/_Work offline"
 msgstr "/_Fichier/_Travailler déconnecté"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:507
+#: src/mainwindow.c:510
 msgid "/_File/E_xit"
 msgstr "/_Fichier/_Quitter"
 
-#: src/mainwindow.c:512
+#: src/mainwindow.c:515
 msgid "/_Edit/Select _thread"
 msgstr "/É_dition/Sélectionner l'en_filade"
 
-#: src/mainwindow.c:514 src/messageview.c:148
+#: src/mainwindow.c:517 src/messageview.c:148
 msgid "/_Edit/_Find in current message..."
 msgstr "/É_dition/Rechercher dans le _message..."
 
-#: src/mainwindow.c:516
+#: src/mainwindow.c:519
 msgid "/_Edit/_Search messages..."
 msgstr "/É_dition/Rechercher dans le _dossier..."
 
-#: src/mainwindow.c:519
+#: src/mainwindow.c:522
 msgid "/_View/Show or hi_de"
 msgstr "/_Affichage/Affic_her ou masquer"
 
-#: src/mainwindow.c:520
+#: src/mainwindow.c:523
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/_Affichage/Affic_her ou masquer/Fenêtre des _dossiers"
 
-#: src/mainwindow.c:522
+#: src/mainwindow.c:525
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/_Affichage/Affic_her ou masquer/Fenêtre de _message"
 
-#: src/mainwindow.c:524
+#: src/mainwindow.c:527
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/_Affichage/Affic_her ou masquer/Barre d'_outils"
 
-#: src/mainwindow.c:526
+#: src/mainwindow.c:529
 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:528
+#: src/mainwindow.c:531
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/_Affichage/Affic_her ou masquer/Barre d'_outils/_Icônes seulement"
 
-#: src/mainwindow.c:530
+#: src/mainwindow.c:533
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/_Affichage/Affic_her ou masquer/Barre d'_outils/_Textes seulement"
 
-#: src/mainwindow.c:532
+#: src/mainwindow.c:535
 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:534
+#: src/mainwindow.c:537
 #, fuzzy
 msgid "/_View/Show or hi_de/_Search bar"
 msgstr "/_Affichage/Affic_her ou masquer/_Barre d'état"
 
-#: src/mainwindow.c:536
+#: src/mainwindow.c:539
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/_Affichage/Affic_her ou masquer/_Barre d'état"
 
-#: src/mainwindow.c:539
+#: src/mainwindow.c:542
 msgid "/_View/Separate f_older tree"
 msgstr "/_Affichage/Séparer la fenêtre des _dossiers"
 
-#: src/mainwindow.c:540
+#: src/mainwindow.c:543
 msgid "/_View/Separate _message view"
 msgstr "/_Affichage/Séparer la fenêtre des _messages"
 
-#: src/mainwindow.c:542
+#: src/mainwindow.c:545
 msgid "/_View/_Sort"
 msgstr "/_Affichage/_Trier"
 
-#: src/mainwindow.c:543
+#: src/mainwindow.c:546
 msgid "/_View/_Sort/by _number"
 msgstr "/_Affichage/_Trier/Trier par _numéro"
 
-#: src/mainwindow.c:544
+#: src/mainwindow.c:547
 msgid "/_View/_Sort/by s_ize"
 msgstr "/_Affichage/_Trier/Trier par _taille"
 
-#: src/mainwindow.c:545
+#: src/mainwindow.c:548
 msgid "/_View/_Sort/by _date"
 msgstr "/_Affichage/_Trier/Trier par _date"
 
-#: src/mainwindow.c:546
+#: src/mainwindow.c:549
 #, fuzzy
 msgid "/_View/_Sort/by t_hread date"
 msgstr "/_Affichage/_Trier/Trier par _date"
 
-#: src/mainwindow.c:547
+#: src/mainwindow.c:550
 msgid "/_View/_Sort/by _from"
 msgstr "/_Affichage/_Trier/Trier par e_xpéditeur"
 
-#: src/mainwindow.c:548
+#: src/mainwindow.c:551
 msgid "/_View/_Sort/by _recipient"
 msgstr "/_Affichage/_Trier/Trier par d_estinataire"
 
-#: src/mainwindow.c:549
+#: src/mainwindow.c:552
 msgid "/_View/_Sort/by _subject"
 msgstr "/_Affichage/_Trier/Trier par _sujet"
 
-#: src/mainwindow.c:550
+#: src/mainwindow.c:553
 msgid "/_View/_Sort/by _color label"
 msgstr "/_Affichage/_Trier/Trier par _couleur"
 
-#: src/mainwindow.c:552
+#: src/mainwindow.c:555
 msgid "/_View/_Sort/by _mark"
 msgstr "/_Affichage/_Trier/Trier par _marque"
 
-#: src/mainwindow.c:553
+#: src/mainwindow.c:556
 msgid "/_View/_Sort/by _unread"
 msgstr "/_Affichage/_Trier/Trier par non _lu"
 
-#: src/mainwindow.c:554
+#: src/mainwindow.c:557
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/_Affichage/_Trier/Trier par pièce _jointe"
 
-#: src/mainwindow.c:556
+#: src/mainwindow.c:559
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/_Affichage/_Trier/Ne _pas trier"
 
-#: src/mainwindow.c:557 src/mainwindow.c:560
+#: src/mainwindow.c:560 src/mainwindow.c:563
 msgid "/_View/_Sort/---"
 msgstr "/_Affichage/_Trier/---"
 
-#: src/mainwindow.c:558
+#: src/mainwindow.c:561
 msgid "/_View/_Sort/Ascending"
 msgstr "/_Affichage/_Trier/_Ordre croissant"
 
-#: src/mainwindow.c:559
+#: src/mainwindow.c:562
 msgid "/_View/_Sort/Descending"
 msgstr "/_Affichage/_Trier/O_rdre décroissant"
 
-#: src/mainwindow.c:561
+#: src/mainwindow.c:564
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/_Affichage/_Trier/_Attirer par sujet"
 
-#: src/mainwindow.c:563
+#: src/mainwindow.c:566
 msgid "/_View/Th_read view"
 msgstr "/_Affichage/Affichage par _fil de conversation"
 
-#: src/mainwindow.c:564
+#: src/mainwindow.c:567
 msgid "/_View/E_xpand all threads"
 msgstr "/_Affichage/Dé_ployer les fils de conversation"
 
-#: src/mainwindow.c:565
+#: src/mainwindow.c:568
 msgid "/_View/Co_llapse all threads"
 msgstr "/_Affichage/_Compacter les fils de conversation"
 
-#: src/mainwindow.c:566
+#: src/mainwindow.c:569
 msgid "/_View/Set display _item..."
 msgstr "/_Affichage/Sélect_ion des éléments affichés..."
 
-#: src/mainwindow.c:569
+#: src/mainwindow.c:572
 msgid "/_View/_Go to"
 msgstr "/_Affichage/_Aller à"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:573
 msgid "/_View/_Go to/_Prev message"
 msgstr "/_Affichage/_Aller à/Message _précédent"
 
-#: src/mainwindow.c:571
+#: src/mainwindow.c:574
 msgid "/_View/_Go to/_Next message"
 msgstr "/_Affichage/_Aller à/Message suiva_nt"
 
-#: src/mainwindow.c:572 src/mainwindow.c:577 src/mainwindow.c:580
-#: src/mainwindow.c:585 src/mainwindow.c:590
+#: src/mainwindow.c:575 src/mainwindow.c:580 src/mainwindow.c:583
+#: src/mainwindow.c:588 src/mainwindow.c:593
 msgid "/_View/_Go to/---"
 msgstr "/_Affichage/_Aller à/---"
 
-#: src/mainwindow.c:573
+#: src/mainwindow.c:576
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/_Affichage/_Aller à/Non l_u précédent"
 
-#: src/mainwindow.c:575
+#: src/mainwindow.c:578
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/_Affichage/_Aller à/Non _lu suivant"
 
-#: src/mainwindow.c:578
+#: src/mainwindow.c:581
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/_Affichage/_Aller à/Message nouveau précédent"
 
-#: src/mainwindow.c:579
+#: src/mainwindow.c:582
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/_Affichage/_Aller à/Message nouveau suivant"
 
-#: src/mainwindow.c:581
+#: src/mainwindow.c:584
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/_Affichage/_Aller à/M_arqué précédent"
 
-#: src/mainwindow.c:583
+#: src/mainwindow.c:586
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/_Affichage/_Aller à/_Marqué suivant"
 
-#: src/mainwindow.c:586
+#: src/mainwindow.c:589
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/_Affichage/_Aller à/C_oloré précédent"
 
-#: src/mainwindow.c:588
+#: src/mainwindow.c:591
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/_Affichage/_Aller à/_Coloré suivant"
 
-#: src/mainwindow.c:591
+#: src/mainwindow.c:594
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Affichage/_Aller à/Autre _dossier..."
 
-#: src/mainwindow.c:600 src/messageview.c:159
+#: src/mainwindow.c:603 src/messageview.c:159
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Affichage/_Jeu de caractères/Détection _automatique"
 
-#: src/mainwindow.c:613 src/messageview.c:172
+#: src/mainwindow.c:616 src/messageview.c:172
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr "/_Affichage/_Jeu de caractères/Europe occidentale (ISO-8859-15)"
 
-#: src/mainwindow.c:653 src/messageview.c:205
+#: src/mainwindow.c:662 src/messageview.c:210
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Affichage/_Jeu de caractères/Japonais (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:655 src/messageview.c:207
+#: src/mainwindow.c:664 src/messageview.c:212
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Affichage/_Jeu de caractères/Japonais (_EUC-JP)"
 
-#: src/mainwindow.c:657 src/messageview.c:209
+#: src/mainwindow.c:666 src/messageview.c:214
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Affichage/_Jeu de caractères/Japonais (_Shift__JIS)"
 
-#: src/mainwindow.c:667 src/messageview.c:218
+#: src/mainwindow.c:676 src/messageview.c:223
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Affichage/_Jeu de caractères/Chinois traditionnel (EUC-_TW)"
 
-#: src/mainwindow.c:669 src/messageview.c:220
+#: src/mainwindow.c:678 src/messageview.c:225
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Affichage/_Jeu de caractères/Chinois (ISO-2022-_CN)"
 
-#: src/mainwindow.c:675 src/messageview.c:225
+#: src/mainwindow.c:684 src/messageview.c:230
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Affichage/_Jeu de caractères/Coréen (ISO-2022-KR)"
 
-#: src/mainwindow.c:688 src/summaryview.c:449
+#: src/mainwindow.c:697 src/summaryview.c:451
 msgid "/_View/Open in new _window"
 msgstr "/_Affichage/_Ouvrir dans une nouvelle fenêtre"
 
-#: src/mainwindow.c:689 src/messageview.c:237
+#: src/mainwindow.c:698 src/messageview.c:242
 msgid "/_View/Mess_age source"
 msgstr "/_Affichage/_Voir le message complet"
 
-#: src/mainwindow.c:690 src/messageview.c:238
+#: src/mainwindow.c:699 src/messageview.c:243
 msgid "/_View/Show all _header"
 msgstr "/_Affichage/Afficher tous les e_n-têtes"
 
-#: src/mainwindow.c:692
+#: src/mainwindow.c:701
 msgid "/_View/_Update summary"
 msgstr "/_Affichage/Mettre à jo_ur le résumé des messages"
 
-#: src/mainwindow.c:694 src/messageview.c:240
+#: src/mainwindow.c:703 src/messageview.c:245
 msgid "/_Message"
 msgstr "/_Message"
 
-#: src/mainwindow.c:695
+#: src/mainwindow.c:704
 msgid "/_Message/Recei_ve"
 msgstr "/_Message/Réce_ptionner"
 
-#: src/mainwindow.c:696
+#: src/mainwindow.c:705
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/_Message/Réce_ptionner/le courrier du _compte courant"
 
-#: src/mainwindow.c:698
+#: src/mainwindow.c:707
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/_Message/Réce_ptionner/le courrier de _tous les comptes"
 
-#: src/mainwindow.c:700
+#: src/mainwindow.c:709
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/_Message/Réce_ptionner/_Annuler la réception"
 
-#: src/mainwindow.c:702
+#: src/mainwindow.c:711
 msgid "/_Message/Recei_ve/---"
 msgstr "/_Message/Réce_ptionner/---"
 
-#: src/mainwindow.c:703
+#: src/mainwindow.c:712
 msgid "/_Message/_Send queued messages"
 msgstr "/_Message/En_voyer les messages en file d'attente"
 
-#: src/mainwindow.c:704 src/mainwindow.c:706 src/mainwindow.c:713
-#: src/mainwindow.c:718 src/mainwindow.c:721 src/mainwindow.c:730
-#: src/mainwindow.c:732 src/mainwindow.c:735 src/messageview.c:243
-#: src/messageview.c:251 src/messageview.c:256
+#: src/mainwindow.c:713 src/mainwindow.c:715 src/mainwindow.c:722
+#: src/mainwindow.c:727 src/mainwindow.c:730 src/mainwindow.c:741
+#: src/mainwindow.c:743 src/mainwindow.c:746 src/messageview.c:248
+#: src/messageview.c:256 src/messageview.c:261
 msgid "/_Message/---"
 msgstr "/_Message/---"
 
-#: src/mainwindow.c:705 src/messageview.c:241
+#: src/mainwindow.c:714 src/messageview.c:246
 msgid "/_Message/Compose _new message"
 msgstr "/_Message/Composer un _nouveau message"
 
-#: src/mainwindow.c:707 src/messageview.c:244
+#: src/mainwindow.c:716 src/messageview.c:249
 msgid "/_Message/_Reply"
 msgstr "/_Message/_Répondre"
 
-#: src/mainwindow.c:708
+#: src/mainwindow.c:717
 msgid "/_Message/Repl_y to"
 msgstr "/_Message/Rép_ondre à"
 
-#: src/mainwindow.c:709 src/messageview.c:245
+#: src/mainwindow.c:718 src/messageview.c:250
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Message/Rép_ondre à/_tous"
 
-#: src/mainwindow.c:710 src/messageview.c:247
+#: src/mainwindow.c:719 src/messageview.c:252
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Message/Rép_ondre à/l'_expéditeur"
 
-#: src/mainwindow.c:711 src/messageview.c:249
+#: src/mainwindow.c:720 src/messageview.c:254
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Message/Rép_ondre à/la _liste"
 
-#: src/mainwindow.c:714 src/messageview.c:252
+#: src/mainwindow.c:723 src/messageview.c:257
 msgid "/_Message/_Forward"
 msgstr "/_Message/_Transférer"
 
-#: src/mainwindow.c:715 src/messageview.c:253
+#: src/mainwindow.c:724 src/messageview.c:258
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Message/Transférer en tant que pièce _jointe"
 
-#: src/mainwindow.c:717 src/messageview.c:255
+#: src/mainwindow.c:726 src/messageview.c:260
 msgid "/_Message/Redirec_t"
 msgstr "/_Message/Rediri_ger"
 
-#: src/mainwindow.c:719
+#: src/mainwindow.c:728
 msgid "/_Message/M_ove..."
 msgstr "/_Message/_Déplacer..."
 
-#: src/mainwindow.c:720
+#: src/mainwindow.c:729
 msgid "/_Message/_Copy..."
 msgstr "/_Message/_Copier..."
 
-#: src/mainwindow.c:722
+#: src/mainwindow.c:731
 msgid "/_Message/_Mark"
 msgstr "/_Message/_Marquer"
 
-#: src/mainwindow.c:723
+#: src/mainwindow.c:732
 msgid "/_Message/_Mark/_Mark"
 msgstr "/_Message/_Marquer/_Marquer"
 
-#: src/mainwindow.c:724
+#: src/mainwindow.c:733
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/_Message/_Marquer/_Démarquer"
 
-#: src/mainwindow.c:725
+#: src/mainwindow.c:734
 msgid "/_Message/_Mark/---"
 msgstr "/_Message/_Marquer/---"
 
-#: src/mainwindow.c:726
+#: src/mainwindow.c:735
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/_Message/_Marque/Marquer comme _non lu"
 
-#: src/mainwindow.c:727
+#: src/mainwindow.c:736
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/_Message/_Marque/Marquer comme _lu"
 
-#: src/mainwindow.c:729
+#: src/mainwindow.c:738
+#, fuzzy
+msgid "/_Message/_Mark/Mark _thread as read"
+msgstr "/_Message/_Marque/Marquer comme _lu"
+
+#: src/mainwindow.c:740
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/_Message/_Marque/Marquer _tous comme lu"
 
-#: src/mainwindow.c:731
+#: src/mainwindow.c:742
 msgid "/_Message/_Delete"
 msgstr "/_Message/_Supprimer"
 
-#: src/mainwindow.c:733
+#: src/mainwindow.c:744
 msgid "/_Message/Set as _junk mail"
 msgstr "/_Message/_Marquer comme _indésirable"
 
-#: src/mainwindow.c:734
+#: src/mainwindow.c:745
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/_Message/Marquer comme in_téressant"
 
-#: src/mainwindow.c:736 src/messageview.c:257
+#: src/mainwindow.c:747 src/messageview.c:262
 msgid "/_Message/Re-_edit"
 msgstr "/_Message/Réédit_er"
 
-#: src/mainwindow.c:740
+#: src/mainwindow.c:751
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/_Outils/Aj_outer l'expéditeur dans le carnet d'adresses..."
 
-#: src/mainwindow.c:743
+#: src/mainwindow.c:754
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/_Outils/_Filtrer les messages du dossier"
 
-#: src/mainwindow.c:745
+#: src/mainwindow.c:756
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Outils/Filtrer les messages _sélectionnés"
 
-#: src/mainwindow.c:747 src/messageview.c:264
+#: src/mainwindow.c:758 src/messageview.c:269
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Outils/Créer une règle de f_iltrage"
 
-#: src/mainwindow.c:748 src/messageview.c:266
+#: src/mainwindow.c:759 src/messageview.c:271
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Outils/Créer une règle de f_iltrage/automatiq_uement"
 
-#: src/mainwindow.c:750 src/messageview.c:268
+#: src/mainwindow.c:761 src/messageview.c:273
 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:752 src/messageview.c:270
+#: src/mainwindow.c:763 src/messageview.c:275
 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:754 src/messageview.c:272
+#: src/mainwindow.c:765 src/messageview.c:277
 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:757
+#: src/mainwindow.c:768
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/_Outils/Filtrer les _indésirables du dossier"
 
-#: src/mainwindow.c:759
+#: src/mainwindow.c:770
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/_Outils/Filtrer les indésirables dans les _messages sélectionnés"
 
-#: src/mainwindow.c:764
+#: src/mainwindow.c:775
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/_Message/Supprimer les messages en dou_ble"
 
-#: src/mainwindow.c:767
+#: src/mainwindow.c:778
 msgid "/_Tools/E_xecute"
 msgstr "/_Outils/E_xécuter"
 
-#: src/mainwindow.c:769
+#: src/mainwindow.c:780
 msgid "/_Tools/_Log window"
 msgstr "/Ou_tils/_Journal de connexion"
 
-#: src/mainwindow.c:771
+#: src/mainwindow.c:782
 msgid "/_Configuration"
 msgstr "/_Configuration"
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:783
 msgid "/_Configuration/_Common preferences..."
 msgstr "/_Configuration/Préférences _générales..."
 
-#: src/mainwindow.c:774
+#: src/mainwindow.c:785
 msgid "/_Configuration/_Filter setting..."
 msgstr "/_Configuration/_Filtres..."
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:787
 msgid "/_Configuration/_Template..."
 msgstr "/_Configuration/_Modèles..."
 
-#: src/mainwindow.c:777
+#: src/mainwindow.c:788
 msgid "/_Configuration/_Actions..."
 msgstr "/_Configuration/_Actions..."
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:789
 msgid "/_Configuration/---"
 msgstr "/_Configuration/---"
 
-#: src/mainwindow.c:779
+#: src/mainwindow.c:790
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Configuration/_Configuration du compte courant..."
 
-#: src/mainwindow.c:781
+#: src/mainwindow.c:792
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Configuration/Création d'un _nouveau compte..."
 
-#: src/mainwindow.c:783
+#: src/mainwindow.c:794
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Configuration/Édition des compt_es..."
 
-#: src/mainwindow.c:785
+#: src/mainwindow.c:796
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Configuration/Choi_sir un autre compte"
 
-#: src/mainwindow.c:789
+#: src/mainwindow.c:800
 msgid "/_Help/_Manual"
 msgstr "/A_ide/_Manuel"
 
-#: src/mainwindow.c:790
+#: src/mainwindow.c:801
 msgid "/_Help/_Manual/_English"
 msgstr "/A_ide/_Manuel/_Anglais"
 
-#: src/mainwindow.c:791
+#: src/mainwindow.c:802
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/A_ide/_Manuel/_Japonais"
 
-#: src/mainwindow.c:792
+#: src/mainwindow.c:803
 msgid "/_Help/_FAQ"
 msgstr "/A_ide/_Foire Aux Questions (FAQ)"
 
-#: src/mainwindow.c:793
+#: src/mainwindow.c:804
 msgid "/_Help/_FAQ/_English"
 msgstr "/A_ide/_Foire Aux Questions (FAQ)/_Anglais"
 
-#: src/mainwindow.c:794
+#: src/mainwindow.c:805
 msgid "/_Help/_FAQ/_German"
 msgstr "/A_ide/_Foire Aux Questions (FAQ)/A_llemand"
 
-#: src/mainwindow.c:795
+#: src/mainwindow.c:806
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/A_ide/_Foire Aux Questions (FAQ)/_Espagnol"
 
-#: src/mainwindow.c:796
+#: src/mainwindow.c:807
 msgid "/_Help/_FAQ/_French"
 msgstr "/A_ide/_Foire Aux Questions (FAQ)/_Français"
 
-#: src/mainwindow.c:797
+#: src/mainwindow.c:808
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/A_ide/_Foire Aux Questions (FAQ)/_Italien"
 
-#: src/mainwindow.c:798
+#: src/mainwindow.c:809
 msgid "/_Help/---"
 msgstr "/A_ide/---"
 
-#: src/mainwindow.c:841
+#: src/mainwindow.c:852
 msgid "Creating main window...\n"
 msgstr "Création de la fenêtre principale...\n"
 
-#: src/mainwindow.c:1011
+#: src/mainwindow.c:1022
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Fenêtre principale : allocation de la couleur %d échouée\n"
 
-#: src/mainwindow.c:1108 src/summaryview.c:2258 src/summaryview.c:2343
-#: src/summaryview.c:3739 src/summaryview.c:3868 src/summaryview.c:4226
+#: src/mainwindow.c:1119 src/summaryview.c:2275 src/summaryview.c:2360
+#: src/summaryview.c:3896 src/summaryview.c:4025 src/summaryview.c:4383
 msgid "done.\n"
 msgstr "terminé.\n"
 
-#: src/mainwindow.c:1235 src/mainwindow.c:1276 src/mainwindow.c:1301
+#: src/mainwindow.c:1246 src/mainwindow.c:1287 src/mainwindow.c:1312
 msgid "Untitled"
 msgstr "Sans titre"
 
-#: src/mainwindow.c:1302
+#: src/mainwindow.c:1313
 msgid "none"
 msgstr "aucun"
 
-#: src/mainwindow.c:1355
+#: src/mainwindow.c:1366
 #, 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:1605
+#: src/mainwindow.c:1616
 msgid "Offline"
 msgstr "Déconnecté"
 
-#: src/mainwindow.c:1606
+#: src/mainwindow.c:1617
 msgid "You are offline. Go online?"
 msgstr "Vous êtes déconnecté. Voulez-vous vous connecter ?"
 
-#: src/mainwindow.c:1623
+#: src/mainwindow.c:1634
 msgid "Empty all trash"
 msgstr "Vider toutes les corbeilles"
 
-#: src/mainwindow.c:1624
+#: src/mainwindow.c:1635
 #, fuzzy
 msgid "Delete all messages in trash folders?"
 msgstr "Supprimer tous les messages dans la corbeille ?"
 
-#: src/mainwindow.c:1652
+#: src/mainwindow.c:1663
 msgid "Add mailbox"
 msgstr "Nouvelle boîte aux lettres"
 
-#: src/mainwindow.c:1653
+#: src/mainwindow.c:1664
 #, fuzzy
 msgid ""
 "Specify the location of mailbox.\n"
@@ -3617,16 +3633,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:1659 src/setup.c:49
+#: src/mainwindow.c:1670 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "La boîte aux lettres « %s » existe déjà."
 
-#: src/mainwindow.c:1664 src/setup.c:56
+#: src/mainwindow.c:1675 src/setup.c:56
 msgid "Mailbox"
 msgstr "Boîte aux lettres"
 
-#: src/mainwindow.c:1670 src/setup.c:62
+#: src/mainwindow.c:1681 src/setup.c:62
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3636,145 +3652,145 @@ msgstr ""
 "Il se peut que les fichiers existent déjà, ou que vous n'ayez pas les droits "
 "en écriture."
 
-#: src/mainwindow.c:2088
+#: src/mainwindow.c:2099
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Dossiers"
 
-#: src/mainwindow.c:2107
+#: src/mainwindow.c:2118
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Message"
 
-#: src/mainwindow.c:2259 src/summaryview.c:408
+#: src/mainwindow.c:2270 src/summaryview.c:408
 msgid "/_Reply"
 msgstr "/_Répondre"
 
-#: src/mainwindow.c:2260
+#: src/mainwindow.c:2271
 msgid "/Reply to _all"
 msgstr "/Répondre à _tous"
 
-#: src/mainwindow.c:2261
+#: src/mainwindow.c:2272
 msgid "/Reply to _sender"
 msgstr "/Répondre à l'_expéditeur"
 
-#: src/mainwindow.c:2262
+#: src/mainwindow.c:2273
 msgid "/Reply to mailing _list"
 msgstr "/Répondre à la _liste"
 
-#: src/mainwindow.c:2267 src/summaryview.c:415
+#: src/mainwindow.c:2278 src/summaryview.c:415
 msgid "/_Forward"
 msgstr "/_Transférer"
 
-#: src/mainwindow.c:2268 src/summaryview.c:416
+#: src/mainwindow.c:2279 src/summaryview.c:416
 msgid "/For_ward as attachment"
 msgstr "/Transférer en pièce _jointe"
 
-#: src/mainwindow.c:2269 src/summaryview.c:417
+#: src/mainwindow.c:2280 src/summaryview.c:417
 msgid "/Redirec_t"
 msgstr "/Rediri_ger"
 
-#: src/mainwindow.c:2305
+#: src/mainwindow.c:2316
 msgid "Get"
 msgstr "Relever"
 
-#: src/mainwindow.c:2306
+#: src/mainwindow.c:2317
 msgid "Incorporate new mail"
 msgstr "Relever le courrier du compte courant"
 
-#: src/mainwindow.c:2313
+#: src/mainwindow.c:2324
 msgid "Get all"
 msgstr "Tout relever"
 
-#: src/mainwindow.c:2314
+#: src/mainwindow.c:2325
 msgid "Incorporate new mail of all accounts"
 msgstr "Relever le courrier de tous les comptes"
 
-#: src/mainwindow.c:2325
+#: src/mainwindow.c:2336
 msgid "Send queued message(s)"
 msgstr "Envoyer les messages en attente"
 
-#: src/mainwindow.c:2335 src/prefs_account_dialog.c:530
+#: src/mainwindow.c:2346 src/prefs_account_dialog.c:530
 #: src/prefs_common_dialog.c:663 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "Composer"
 
-#: src/mainwindow.c:2336
+#: src/mainwindow.c:2347
 msgid "Compose new message"
 msgstr "Composer un nouveau message"
 
-#: src/mainwindow.c:2344 src/prefs_common_dialog.c:975
+#: src/mainwindow.c:2355 src/prefs_common_dialog.c:975
 msgid "Reply"
 msgstr "Répondre"
 
-#: src/mainwindow.c:2345 src/mainwindow.c:2358
+#: src/mainwindow.c:2356 src/mainwindow.c:2369
 msgid "Reply to the message"
 msgstr "Répondre au message"
 
-#: src/mainwindow.c:2362
+#: src/mainwindow.c:2373
 msgid "Reply all"
 msgstr "À tous"
 
-#: src/mainwindow.c:2363
+#: src/mainwindow.c:2374
 msgid "Reply to all"
 msgstr "Répondre à tous"
 
-#: src/mainwindow.c:2371 src/prefs_filter_edit.c:672
+#: src/mainwindow.c:2382 src/prefs_filter_edit.c:672
 msgid "Forward"
 msgstr "Transférer"
 
-#: src/mainwindow.c:2372 src/mainwindow.c:2385
+#: src/mainwindow.c:2383 src/mainwindow.c:2396
 msgid "Forward the message"
 msgstr "Transférer le message"
 
-#: src/mainwindow.c:2392
+#: src/mainwindow.c:2403
 msgid "Delete the message"
 msgstr "Supprimer le message"
 
-#: src/mainwindow.c:2401
+#: src/mainwindow.c:2412
 msgid "Set as junk mail"
 msgstr "Marquer comme indésirable"
 
-#: src/mainwindow.c:2410
+#: src/mainwindow.c:2421
 msgid "Execute"
 msgstr "Exécuter"
 
-#: src/mainwindow.c:2411
+#: src/mainwindow.c:2422
 msgid "Execute marked process"
 msgstr "Exécuter les commandes marquées"
 
-#: src/mainwindow.c:2421
+#: src/mainwindow.c:2432
 msgid "Next unread message"
 msgstr "Message non lu suivant"
 
-#: src/mainwindow.c:2433
+#: src/mainwindow.c:2444
 msgid "Prefs"
 msgstr "Préférences"
 
-#: src/mainwindow.c:2434
+#: src/mainwindow.c:2445
 msgid "Common preferences"
 msgstr "Préférences générales"
 
-#: src/mainwindow.c:2442 src/prefs_folder_item.c:289
+#: src/mainwindow.c:2453 src/prefs_folder_item.c:289
 #: src/prefs_folder_item.c:300 src/progressdialog.c:128
 msgid "Account"
 msgstr "Compte"
 
-#: src/mainwindow.c:2443
+#: src/mainwindow.c:2454
 msgid "Account setting"
 msgstr "Configuration du compte courant"
 
-#: src/mainwindow.c:2615
+#: src/mainwindow.c:2626
 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:2626
+#: src/mainwindow.c:2637
 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:2892
+#: src/mainwindow.c:2903
 msgid "Exit"
 msgstr "Quitter"
 
-#: src/mainwindow.c:2892
+#: src/mainwindow.c:2903
 msgid "Exit this program?"
 msgstr "Quitter Sylpheed ?"
 
@@ -3811,45 +3827,45 @@ msgstr "Fin de message atteint, reprendre depuis le début ?"
 msgid "Search finished"
 msgstr "Recherche terminée"
 
-#: src/messageview.c:261
+#: src/messageview.c:266
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/_Outils/Aj_outer l'expéditeur dans le carnet d'adresses"
 
-#: src/messageview.c:291
+#: src/messageview.c:296
 msgid "Creating message view...\n"
 msgstr "Création de la vue message...\n"
 
-#: src/messageview.c:316
+#: src/messageview.c:321
 msgid "Text"
 msgstr "Texte"
 
-#: src/messageview.c:321
+#: src/messageview.c:326
 msgid "Attachments"
 msgstr "Pièces jointes"
 
-#: src/messageview.c:371
+#: src/messageview.c:376
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:669 src/summaryview.c:3268
+#: src/messageview.c:674 src/summaryview.c:3425
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Impossible d'enregistrer le fichier « %s »."
 
-#: src/messageview.c:728 src/summaryview.c:3291
+#: src/messageview.c:733 src/summaryview.c:3448
 msgid "The message will be printed with the following command:"
 msgstr ""
 
-#: src/messageview.c:729 src/summaryview.c:3292
+#: src/messageview.c:734 src/summaryview.c:3449
 #, fuzzy
 msgid "(Default print command)"
 msgstr "Commande d'apprentissage :"
 
-#: src/messageview.c:731 src/prefs_common_dialog.c:2304 src/summaryview.c:3294
+#: src/messageview.c:736 src/prefs_common_dialog.c:2304 src/summaryview.c:3451
 msgid "Print"
 msgstr "Impression"
 
-#: src/messageview.c:740 src/summaryview.c:3303
+#: src/messageview.c:745 src/summaryview.c:3460
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -4747,8 +4763,8 @@ msgstr ""
 msgid "Expand threads"
 msgstr "Déployer les fils de conversation"
 
-#: src/prefs_common_dialog.c:1413 src/prefs_common_dialog.c:2713
-#: src/prefs_common_dialog.c:2751
+#: src/prefs_common_dialog.c:1413 src/prefs_common_dialog.c:2716
+#: src/prefs_common_dialog.c:2754
 msgid "Date format"
 msgstr "Format de la date"
 
@@ -5037,8 +5053,8 @@ msgstr "Commandes externes (%s sera remplacé par le nom du fichier/URI)"
 msgid "Web browser"
 msgstr "Navigateur web"
 
-#: src/prefs_common_dialog.c:2288 src/prefs_common_dialog.c:3775
-#: src/prefs_common_dialog.c:3796
+#: src/prefs_common_dialog.c:2288 src/prefs_common_dialog.c:3778
+#: src/prefs_common_dialog.c:3799
 #, fuzzy
 msgid "(Default browser)"
 msgstr "Boîte de réception par défaut"
@@ -5115,214 +5131,224 @@ msgid "Greek (ISO-8859-7)"
 msgstr "Grec (ISO-8859-7)"
 
 #: src/prefs_common_dialog.c:2495
+#, fuzzy
+msgid "Arabic (ISO-8859-6)"
+msgstr "Europe du Nord (ISO-8859-4)"
+
+#: src/prefs_common_dialog.c:2496
+#, fuzzy
+msgid "Arabic (Windows-1256)"
+msgstr "Cyrillique (Windows-1251)"
+
+#: src/prefs_common_dialog.c:2498
 msgid "Hebrew (ISO-8859-8)"
 msgstr "Hébreu (ISO-8859-8)"
 
-#: src/prefs_common_dialog.c:2496
+#: src/prefs_common_dialog.c:2499
 msgid "Hebrew (Windows-1255)"
 msgstr "Hébreu (Windows-1255)"
 
-#: src/prefs_common_dialog.c:2498
+#: src/prefs_common_dialog.c:2501
 msgid "Turkish (ISO-8859-9)"
 msgstr "Turc (ISO-8859-9)"
 
-#: src/prefs_common_dialog.c:2500
+#: src/prefs_common_dialog.c:2503
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Cyrillique (ISO-8859-5)"
 
-#: src/prefs_common_dialog.c:2501
+#: src/prefs_common_dialog.c:2504
 msgid "Cyrillic (KOI8-R)"
 msgstr "Cyrillique (KOI8-R)"
 
-#: src/prefs_common_dialog.c:2502
+#: src/prefs_common_dialog.c:2505
 msgid "Cyrillic (KOI8-U)"
 msgstr "Cyrillique (KOI8-U)"
 
-#: src/prefs_common_dialog.c:2503
+#: src/prefs_common_dialog.c:2506
 msgid "Cyrillic (Windows-1251)"
 msgstr "Cyrillique (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2505
+#: src/prefs_common_dialog.c:2508
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Japonais (ISO-2022-JP)"
 
-#: src/prefs_common_dialog.c:2507
+#: src/prefs_common_dialog.c:2510
 msgid "Japanese (EUC-JP)"
 msgstr "Japonais (EUC-JP)"
 
-#: src/prefs_common_dialog.c:2508
+#: src/prefs_common_dialog.c:2511
 msgid "Japanese (Shift_JIS)"
 msgstr "Japonais (Shift_JIS)"
 
-#: src/prefs_common_dialog.c:2511
+#: src/prefs_common_dialog.c:2514
 msgid "Simplified Chinese (GB2312)"
 msgstr "Chinois simplifié (GB2312)"
 
-#: src/prefs_common_dialog.c:2512
+#: src/prefs_common_dialog.c:2515
 msgid "Simplified Chinese (GBK)"
 msgstr "Chinois simplifié (GBK)"
 
-#: src/prefs_common_dialog.c:2513
+#: src/prefs_common_dialog.c:2516
 msgid "Traditional Chinese (Big5)"
 msgstr "Chinois traditionnel (Big5)"
 
-#: src/prefs_common_dialog.c:2515
+#: src/prefs_common_dialog.c:2518
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Chinois traditionnel (EUC-TW)"
 
-#: src/prefs_common_dialog.c:2516
+#: src/prefs_common_dialog.c:2519
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Chinois (ISO-2022-CN)"
 
-#: src/prefs_common_dialog.c:2519
+#: src/prefs_common_dialog.c:2522
 msgid "Korean (EUC-KR)"
 msgstr "Coréen (EUC-KR)"
 
-#: src/prefs_common_dialog.c:2521
+#: src/prefs_common_dialog.c:2524
 msgid "Thai (TIS-620)"
 msgstr "Thaï (TIS-620)"
 
-#: src/prefs_common_dialog.c:2522
+#: src/prefs_common_dialog.c:2525
 msgid "Thai (Windows-874)"
 msgstr "Thaï (Windows-874)"
 
-#: src/prefs_common_dialog.c:2689
+#: src/prefs_common_dialog.c:2692
 msgid "the full abbreviated weekday name"
 msgstr "nom du jour de la semaine (abrégé)"
 
-#: src/prefs_common_dialog.c:2690
+#: src/prefs_common_dialog.c:2693
 msgid "the full weekday name"
 msgstr "nom du jour de la semaine"
 
-#: src/prefs_common_dialog.c:2691
+#: src/prefs_common_dialog.c:2694
 msgid "the abbreviated month name"
 msgstr "nom du mois (abrégé)"
 
-#: src/prefs_common_dialog.c:2692
+#: src/prefs_common_dialog.c:2695
 msgid "the full month name"
 msgstr "nom du mois"
 
-#: src/prefs_common_dialog.c:2693
+#: src/prefs_common_dialog.c:2696
 msgid "the preferred date and time for the current locale"
 msgstr "le format par défaut de la date et de l'heure"
 
-#: src/prefs_common_dialog.c:2694
+#: src/prefs_common_dialog.c:2697
 msgid "the century number (year/100)"
 msgstr "le 'siècle' (année/100)"
 
-#: src/prefs_common_dialog.c:2695
+#: src/prefs_common_dialog.c:2698
 msgid "the day of the month as a decimal number"
 msgstr "le jour du mois"
 
-#: src/prefs_common_dialog.c:2696
+#: src/prefs_common_dialog.c:2699
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "l'heure en tant que nombre (0-23)"
 
-#: src/prefs_common_dialog.c:2697
+#: src/prefs_common_dialog.c:2700
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "l'heure en tant que nombre (1-12)"
 
-#: src/prefs_common_dialog.c:2698
+#: src/prefs_common_dialog.c:2701
 msgid "the day of the year as a decimal number"
 msgstr "le jour de l'année en tant que nombre"
 
-#: src/prefs_common_dialog.c:2699
+#: src/prefs_common_dialog.c:2702
 msgid "the month as a decimal number"
 msgstr "le mois en tant que nombre"
 
-#: src/prefs_common_dialog.c:2700
+#: src/prefs_common_dialog.c:2703
 msgid "the minute as a decimal number"
 msgstr "les minutes en tant que nombre"
 
-#: src/prefs_common_dialog.c:2701
+#: src/prefs_common_dialog.c:2704
 msgid "either AM or PM"
 msgstr "AM (matin) ou PM (après-midi)"
 
-#: src/prefs_common_dialog.c:2702
+#: src/prefs_common_dialog.c:2705
 msgid "the second as a decimal number"
 msgstr "les secondes en tant que nombre"
 
-#: src/prefs_common_dialog.c:2703
+#: src/prefs_common_dialog.c:2706
 msgid "the day of the week as a decimal number"
 msgstr "le jour de la semaine en tant que nombre"
 
-#: src/prefs_common_dialog.c:2704
+#: src/prefs_common_dialog.c:2707
 msgid "the preferred date for the current locale"
 msgstr "le format par défaut de la date"
 
-#: src/prefs_common_dialog.c:2705
+#: src/prefs_common_dialog.c:2708
 msgid "the last two digits of a year"
 msgstr "les deux derniers chiffres de l'année"
 
-#: src/prefs_common_dialog.c:2706
+#: src/prefs_common_dialog.c:2709
 msgid "the year as a decimal number"
 msgstr "l'année"
 
-#: src/prefs_common_dialog.c:2707
+#: src/prefs_common_dialog.c:2710
 msgid "the time zone or name or abbreviation"
 msgstr "le fuseau horaire, son nom ou abréviation"
 
-#: src/prefs_common_dialog.c:2728
+#: src/prefs_common_dialog.c:2731
 msgid "Specifier"
 msgstr "Code"
 
-#: src/prefs_common_dialog.c:2729
+#: src/prefs_common_dialog.c:2732
 msgid "Description"
 msgstr "Description"
 
-#: src/prefs_common_dialog.c:2769
+#: src/prefs_common_dialog.c:2772
 msgid "Example"
 msgstr "Exemple"
 
-#: src/prefs_common_dialog.c:2850
+#: src/prefs_common_dialog.c:2853
 msgid "Set message colors"
 msgstr "Paramétrer les couleurs de message"
 
-#: src/prefs_common_dialog.c:2858
+#: src/prefs_common_dialog.c:2861
 msgid "Colors"
 msgstr "Couleurs"
 
-#: src/prefs_common_dialog.c:2892
+#: src/prefs_common_dialog.c:2895
 msgid "Quoted Text - First Level"
 msgstr "Texte cité - 1er niveau"
 
-#: src/prefs_common_dialog.c:2898
+#: src/prefs_common_dialog.c:2901
 msgid "Quoted Text - Second Level"
 msgstr "Texte cité - 2e niveau"
 
-#: src/prefs_common_dialog.c:2904
+#: src/prefs_common_dialog.c:2907
 msgid "Quoted Text - Third Level"
 msgstr "Texte cité - 3e niveau"
 
-#: src/prefs_common_dialog.c:2910
+#: src/prefs_common_dialog.c:2913
 msgid "URI link"
 msgstr "Lien URI"
 
-#: src/prefs_common_dialog.c:2917
+#: src/prefs_common_dialog.c:2920
 msgid "Recycle quote colors"
 msgstr "Réutiliser les couleurs"
 
-#: src/prefs_common_dialog.c:2984
+#: src/prefs_common_dialog.c:2987
 msgid "Pick color for quotation level 1"
 msgstr "Choix de la couleur de la citation niveau 1"
 
-#: src/prefs_common_dialog.c:2987
+#: src/prefs_common_dialog.c:2990
 msgid "Pick color for quotation level 2"
 msgstr "Choix de la couleur de la citation niveau 2"
 
-#: src/prefs_common_dialog.c:2990
+#: src/prefs_common_dialog.c:2993
 msgid "Pick color for quotation level 3"
 msgstr "Choix de la couleur de la citation niveau 3"
 
-#: src/prefs_common_dialog.c:2993
+#: src/prefs_common_dialog.c:2996
 msgid "Pick color for URI"
 msgstr "Choix de la couleur pour les liens URI"
 
-#: src/prefs_common_dialog.c:3133
+#: src/prefs_common_dialog.c:3136
 msgid "Description of symbols"
 msgstr "Description des symboles"
 
-#: src/prefs_common_dialog.c:3189
+#: src/prefs_common_dialog.c:3192
 msgid ""
 "Date\n"
 "From\n"
@@ -5346,11 +5372,11 @@ msgstr ""
 "Groupes de discussions\n"
 "Message-ID"
 
-#: src/prefs_common_dialog.c:3202
+#: src/prefs_common_dialog.c:3205
 msgid "If x is set, displays expr"
 msgstr "Si x est défini, afficher expr"
 
-#: src/prefs_common_dialog.c:3206
+#: src/prefs_common_dialog.c:3209
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -5364,7 +5390,7 @@ msgstr ""
 "Corps du message sans signature en tant que citation\n"
 "Caractère pourcent « % »"
 
-#: src/prefs_common_dialog.c:3214
+#: src/prefs_common_dialog.c:3217
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -5376,20 +5402,20 @@ msgstr ""
 "Caractère « { »\n"
 "Caractère « } »"
 
-#: src/prefs_common_dialog.c:3260
+#: src/prefs_common_dialog.c:3263
 msgid "Key bindings"
 msgstr "Raccourcis clavier"
 
-#: src/prefs_common_dialog.c:3273
+#: src/prefs_common_dialog.c:3276
 #, fuzzy
 msgid "Select the preset of key bindings."
 msgstr " Choisir les raccourcis clavier... "
 
-#: src/prefs_common_dialog.c:3283 src/prefs_common_dialog.c:3607
+#: src/prefs_common_dialog.c:3286 src/prefs_common_dialog.c:3610
 msgid "Default"
 msgstr "Par défaut"
 
-#: src/prefs_common_dialog.c:3286 src/prefs_common_dialog.c:3616
+#: src/prefs_common_dialog.c:3289 src/prefs_common_dialog.c:3619
 msgid "Old Sylpheed"
 msgstr "Ancien Sylpheed"
 
@@ -5510,7 +5536,7 @@ msgstr "Résultat de la commande"
 msgid "Age"
 msgstr "Age"
 
-#: src/prefs_filter_edit.c:501 src/summaryview.c:510
+#: src/prefs_filter_edit.c:501 src/summaryview.c:512
 #, fuzzy
 msgid "Marked"
 msgstr "Marque"
@@ -5741,17 +5767,17 @@ msgid "Attachment"
 msgstr "Pièces jointes"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73 src/query_search.c:371 src/summaryview.c:4733
+#: src/prefs_summary_column.c:73 src/query_search.c:371 src/summaryview.c:4890
 msgid "Subject"
 msgstr "Sujet"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/query_search.c:372 src/summaryview.c:4736
+#: src/prefs_summary_column.c:74 src/query_search.c:372 src/summaryview.c:4893
 msgid "From"
 msgstr "Expéditeur"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/query_search.c:373 src/summaryview.c:4738
+#: src/prefs_summary_column.c:75 src/query_search.c:373 src/summaryview.c:4895
 msgid "Date"
 msgstr "Date"
 
@@ -5854,7 +5880,7 @@ msgstr "Recherche dans le dossier"
 msgid "_Save as search folder"
 msgstr "Enregistrer dans le dossier brouillon"
 
-#: src/query_search.c:512 src/subscribedialog.c:523 src/summaryview.c:840
+#: src/query_search.c:512 src/subscribedialog.c:523 src/summaryview.c:842
 msgid "Done."
 msgstr "Terminé."
 
@@ -5868,7 +5894,7 @@ msgstr "Analyse du dossier %s ..."
 msgid "Searching %s (%d / %d)..."
 msgstr "Tri en cours..."
 
-#: src/query_search.c:645 src/summaryview.c:2048
+#: src/query_search.c:645 src/summaryview.c:2051
 msgid "(No Date)"
 msgstr "(aucune date)"
 
@@ -6243,308 +6269,313 @@ msgid "/_Mark/Mark as rea_d"
 msgstr "/_Marquer/Marquer comme _lu"
 
 #: src/summaryview.c:429
+#, fuzzy
+msgid "/_Mark/Mark _thread as read"
+msgstr "/_Marquer/Marquer comme _lu"
+
+#: src/summaryview.c:431
 msgid "/_Mark/Mark all _read"
 msgstr "/_Marquer/Marquer _tous comme lus"
 
-#: src/summaryview.c:430
+#: src/summaryview.c:432
 msgid "/Color la_bel"
 msgstr "/Co_lorer"
 
-#: src/summaryview.c:434
+#: src/summaryview.c:436
 msgid "/Re-_edit"
 msgstr "/Réédit_er"
 
-#: src/summaryview.c:436
+#: src/summaryview.c:438
 msgid "/Add sender to address boo_k..."
 msgstr "_Ajouter l'expéditeur au carnet d'adresses..."
 
-#: src/summaryview.c:438
+#: src/summaryview.c:440
 #, fuzzy
 msgid "/Create f_ilter rule"
 msgstr "/_Outils/Créer une règle de f_iltrage"
 
-#: src/summaryview.c:439
+#: src/summaryview.c:441
 #, fuzzy
 msgid "/Create f_ilter rule/_Automatically"
 msgstr "/_Outils/Créer une règle de f_iltrage/automatiq_uement"
 
-#: src/summaryview.c:441
+#: src/summaryview.c:443
 #, fuzzy
 msgid "/Create f_ilter rule/by _From"
 msgstr "/_Outils/Créer une règle de f_iltrage/basée sur l'_expéditeur"
 
-#: src/summaryview.c:443
+#: src/summaryview.c:445
 #, fuzzy
 msgid "/Create f_ilter rule/by _To"
 msgstr "/_Outils/Créer une règle de f_iltrage/basée sur le(s) _destinataire(s)"
 
-#: src/summaryview.c:445
+#: src/summaryview.c:447
 #, fuzzy
 msgid "/Create f_ilter rule/by _Subject"
 msgstr "/_Outils/Créer une règle de f_iltrage/basée sur le _sujet"
 
-#: src/summaryview.c:451
+#: src/summaryview.c:453
 msgid "/_View/_Source"
 msgstr "/_Affichage/_Voir le message complet"
 
-#: src/summaryview.c:452
+#: src/summaryview.c:454
 msgid "/_View/All _header"
 msgstr "/_Affichage/Afficher tous les e_n-têtes"
 
-#: src/summaryview.c:454
+#: src/summaryview.c:456
 msgid "/_Print..."
 msgstr "/Im_primer..."
 
-#: src/summaryview.c:486
+#: src/summaryview.c:488
 msgid "Creating summary view...\n"
 msgstr "Création de la vue de l'index...\n"
 
-#: src/summaryview.c:508
+#: src/summaryview.c:510
 msgid "All"
 msgstr ""
 
-#: src/summaryview.c:511
+#: src/summaryview.c:513
 #, fuzzy
 msgid "Have color label"
 msgstr "/Co_lorer"
 
-#: src/summaryview.c:512
+#: src/summaryview.c:514
 #, fuzzy
 msgid "Have attachment"
 msgstr "Pièces jointes"
 
-#: src/summaryview.c:521
+#: src/summaryview.c:523
 #, fuzzy
 msgid "Search:"
 msgstr " Rechercher "
 
-#: src/summaryview.c:535
+#: src/summaryview.c:537
 msgid "Search for Subject or From"
 msgstr ""
 
-#: src/summaryview.c:702
+#: src/summaryview.c:704
 msgid "Process mark"
 msgstr "Traitement des messages marqués"
 
-#: src/summaryview.c:703
+#: src/summaryview.c:705
 msgid "Some marks are left. Process it?"
 msgstr "Il reste des messages marqués, voulez-vous les traiter ?"
 
-#: src/summaryview.c:749
+#: src/summaryview.c:751
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "Analyse du dossier (%s)..."
 
-#: src/summaryview.c:1292
+#: src/summaryview.c:1295
 msgid "_Search again"
 msgstr "_Chercher encore"
 
-#: src/summaryview.c:1313 src/summaryview.c:1322
+#: src/summaryview.c:1316 src/summaryview.c:1325
 msgid "No more unread messages"
 msgstr "Plus de messages non lus"
 
-#: src/summaryview.c:1314
+#: src/summaryview.c:1317
 msgid "No unread message found. Search from the end?"
 msgstr "Plus de message non lu. Rechercher depuis la fin ?"
 
-#: src/summaryview.c:1316
+#: src/summaryview.c:1319
 msgid "No unread messages."
 msgstr "Plus de messages non lus"
 
-#: src/summaryview.c:1323
+#: src/summaryview.c:1326
 msgid "No unread message found. Go to next folder?"
 msgstr "Pas de message non lu. Passer au dossier suivant ?"
 
-#: src/summaryview.c:1331 src/summaryview.c:1340
+#: src/summaryview.c:1334 src/summaryview.c:1343
 msgid "No more new messages"
 msgstr "Plus de nouveaux messages"
 
-#: src/summaryview.c:1332
+#: src/summaryview.c:1335
 msgid "No new message found. Search from the end?"
 msgstr "Plus de nouveaux messages. Rechercher depuis la fin ?"
 
-#: src/summaryview.c:1334
+#: src/summaryview.c:1337
 msgid "No new messages."
 msgstr "Pas de nouveaux messages."
 
-#: src/summaryview.c:1341
+#: src/summaryview.c:1344
 msgid "No new message found. Go to next folder?"
 msgstr "Plus de nouveaux messages. Aller au dossier suivant ?"
 
-#: src/summaryview.c:1349 src/summaryview.c:1358
+#: src/summaryview.c:1352 src/summaryview.c:1361
 msgid "No more marked messages"
 msgstr "Plus de messages marqués"
 
-#: src/summaryview.c:1350
+#: src/summaryview.c:1353
 msgid "No marked message found. Search from the end?"
 msgstr "Plus de messages marqués. Rechercher depuis la fin ?"
 
-#: src/summaryview.c:1352 src/summaryview.c:1361
+#: src/summaryview.c:1355 src/summaryview.c:1364
 msgid "No marked messages."
 msgstr "Pas de message marqué."
 
-#: src/summaryview.c:1359
+#: src/summaryview.c:1362
 msgid "No marked message found. Search from the beginning?"
 msgstr "Plus de messages marqués. Rechercher depuis le début ?"
 
-#: src/summaryview.c:1367 src/summaryview.c:1376
+#: src/summaryview.c:1370 src/summaryview.c:1379
 msgid "No more labeled messages"
 msgstr "Plus de messages marqués"
 
-#: src/summaryview.c:1368
+#: src/summaryview.c:1371
 msgid "No labeled message found. Search from the end?"
 msgstr "Plus de messages marqués. Rechercher depuis la fin ?"
 
-#: src/summaryview.c:1370 src/summaryview.c:1379
+#: src/summaryview.c:1373 src/summaryview.c:1382
 msgid "No labeled messages."
 msgstr "Plus de messages marqués."
 
-#: src/summaryview.c:1377
+#: src/summaryview.c:1380
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Plus de messages marqués. Rechercher depuis le début ?"
 
-#: src/summaryview.c:1693
+#: src/summaryview.c:1696
 msgid "Attracting messages by subject..."
 msgstr "Tri des messages par sujet..."
 
-#: src/summaryview.c:1887
+#: src/summaryview.c:1890
 #, c-format
 msgid "%d deleted"
 msgstr "%d effacé"
 
-#: src/summaryview.c:1891
+#: src/summaryview.c:1894
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d déplacé"
 
-#: src/summaryview.c:1892 src/summaryview.c:1897
+#: src/summaryview.c:1895 src/summaryview.c:1900
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:1896
+#: src/summaryview.c:1899
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d copié"
 
-#: src/summaryview.c:1911
+#: src/summaryview.c:1914
 msgid " item(s) selected"
 msgstr " élément(s) sélectionné(s)"
 
-#: src/summaryview.c:1933
+#: src/summaryview.c:1936
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d nouveau(x), %d non lu(s), %d au total (%s)"
 
-#: src/summaryview.c:1937
+#: src/summaryview.c:1940
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d nouveau(x), %d non lu(s), %d au total"
 
-#: src/summaryview.c:1971
+#: src/summaryview.c:1974
 msgid "Sorting summary..."
 msgstr "Tri de l'index..."
 
-#: src/summaryview.c:2194
+#: src/summaryview.c:2211
 msgid "\tSetting summary from message data..."
 msgstr "\tDéfinition de l'index à partir des données du message..."
 
-#: src/summaryview.c:2196
+#: src/summaryview.c:2213
 msgid "Setting summary from message data..."
 msgstr "Définition de l'index à partir des données du message..."
 
-#: src/summaryview.c:2302
+#: src/summaryview.c:2319
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Écriture du cache index (%s)..."
 
-#: src/summaryview.c:2643
+#: src/summaryview.c:2660
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Le message %d est marqué\n"
 
-#: src/summaryview.c:2701
+#: src/summaryview.c:2718
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Le message %d est marqué comme lu\n"
 
-#: src/summaryview.c:2789
+#: src/summaryview.c:2908
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Le message %d est marqué comme non lu\n"
 
-#: src/summaryview.c:2850
+#: src/summaryview.c:2969
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Le message %s/%d sera effacé\n"
 
-#: src/summaryview.c:2878
+#: src/summaryview.c:2997
 msgid "Delete message(s)"
 msgstr "Suppression de message(s)"
 
-#: src/summaryview.c:2879
+#: src/summaryview.c:2998
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr ""
 "Voulez-vous vraiment supprimer définitivement ce(s) message(s) de la "
 "corbeille ?"
 
-#: src/summaryview.c:2953
+#: src/summaryview.c:3072
 msgid "Deleting duplicated messages..."
 msgstr "Suppression des messages en double..."
 
-#: src/summaryview.c:2991
+#: src/summaryview.c:3110
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Le message %s/%d est démarqué\n"
 
-#: src/summaryview.c:3049
+#: src/summaryview.c:3168
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Le message %d est marqué pour déplacement dans %s\n"
 
-#: src/summaryview.c:3066
+#: src/summaryview.c:3196
 msgid "Destination is same as current folder."
 msgstr "La destination est identique au dossier actuel."
 
-#: src/summaryview.c:3122
+#: src/summaryview.c:3260
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Le message %d est à copier vers %s\n"
 
-#: src/summaryview.c:3139
+#: src/summaryview.c:3288
 msgid "Destination for copy is same as current folder."
 msgstr "La destination et la source de la copie sont identiques."
 
-#: src/summaryview.c:3338
+#: src/summaryview.c:3495
 msgid "Error occurred while processing messages."
 msgstr "Une erreur est survenue pendant le traitement des messages."
 
-#: src/summaryview.c:3646 src/summaryview.c:3647
+#: src/summaryview.c:3803 src/summaryview.c:3804
 msgid "Building threads..."
 msgstr "Construction des threads..."
 
-#: src/summaryview.c:3797 src/summaryview.c:3798
+#: src/summaryview.c:3954 src/summaryview.c:3955
 msgid "Unthreading..."
 msgstr "Suppression des threads..."
 
-#: src/summaryview.c:4091 src/summaryview.c:4147
+#: src/summaryview.c:4248 src/summaryview.c:4304
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Tri en cours..."
 
-#: src/summaryview.c:4196
+#: src/summaryview.c:4353
 msgid "filtering..."
 msgstr "tri en cours..."
 
-#: src/summaryview.c:4197
+#: src/summaryview.c:4354
 msgid "Filtering..."
 msgstr "Tri en cours..."
 
-#: src/summaryview.c:4233
+#: src/summaryview.c:4390
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "%d message(s) ont été filtré(s)."
 
-#: src/summaryview.c:4742
+#: src/summaryview.c:4899
 msgid "No."
 msgstr "N°"
 
@@ -6561,31 +6592,31 @@ msgstr "Création de la vue texte...\n"
 msgid "This message can't be displayed.\n"
 msgstr "Impossible d'afficher ce message.\n"
 
-#: src/textview.c:1929
+#: src/textview.c:1925
 msgid "Sa_ve this image as..."
 msgstr "Enregistrer cette _image sous..."
 
-#: src/textview.c:1945 src/trayicon.c:109
+#: src/textview.c:1941 src/trayicon.c:109
 msgid "Compose _new message"
 msgstr "Composer un _nouveau message"
 
-#: src/textview.c:1947
+#: src/textview.c:1943
 msgid "Add to address _book..."
 msgstr "_Ajouter au carnet d'adresses..."
 
-#: src/textview.c:1949
+#: src/textview.c:1945
 msgid "Copy this add_ress"
 msgstr "Copier cette ad_resse"
 
-#: src/textview.c:1952
+#: src/textview.c:1948
 msgid "_Open with Web browser"
 msgstr "_Ouvrir dans le navigateur Web"
 
-#: src/textview.c:1954
+#: src/textview.c:1950
 msgid "Copy this _link"
 msgstr "Copier ce _lien"
 
-#: src/textview.c:2097
+#: src/textview.c:2093
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6597,7 +6628,7 @@ msgstr ""
 "\n"
 "Voulez-vous néanmoins l'ouvrir ?"
 
-#: src/textview.c:2102
+#: src/textview.c:2098
 msgid "Fake URL warning"
 msgstr "Localisateur (URL) suspect"
 
diff --git a/po/gl.po b/po/gl.po
index 81b537b9..14944abd 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: 2006-01-27 18:11+0900\n"
+"POT-Creation-Date: 2006-01-31 15:20+0900\n"
 "PO-Revision-Date: 2003-01-17 10:05+0100\n"
 "Last-Translator: Jorge Rivas\n"
 "Language-Team: Jorge Rivas\n"
@@ -505,7 +505,7 @@ msgstr "Atopado %s\n"
 msgid "Configuration is saved.\n"
 msgstr "Configuración gardada.\n"
 
-#: libsylph/prefs_common.c:489
+#: libsylph/prefs_common.c:491
 #, fuzzy
 msgid "Junk mail filter"
 msgstr "Carpeta"
@@ -621,8 +621,8 @@ msgstr ""
 msgid "%.2fGB"
 msgstr ""
 
-#: libsylph/utils.c:2373 src/compose.c:2858 src/compose.c:3121
-#: src/compose.c:3184 src/compose.c:3304
+#: libsylph/utils.c:2373 src/compose.c:2867 src/compose.c:3130
+#: src/compose.c:3193 src/compose.c:3313
 msgid "can't change file mode\n"
 msgstr "non se pode cambiar os permisos de ficheiro\n"
 
@@ -709,8 +709,8 @@ msgstr ""
 "A orde de comprobación de mensaxes será este. Marque as casilas\n"
 "na columna `G' para activar a descarga mediante `Traer todo'."
 
-#: src/account_dialog.c:366 src/addressadd.c:192 src/addressbook.c:491
-#: src/compose.c:4262 src/editaddress.c:200 src/editaddress.c:942
+#: src/account_dialog.c:366 src/addressadd.c:192 src/addressbook.c:493
+#: src/compose.c:4271 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:206 src/prefs_filter.c:259 src/prefs_folder_item.c:171
@@ -846,12 +846,12 @@ msgstr ""
 msgid "Add Address to Book"
 msgstr "Engadir enderezo á axenda"
 
-#: src/addressadd.c:202 src/compose.c:4762 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4771 src/editaddress.c:201
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "Enderezo"
 
-#: src/addressadd.c:212 src/addressbook.c:493 src/editaddress.c:202
+#: src/addressadd.c:212 src/addressbook.c:495 src/editaddress.c:202
 #: src/editaddress.c:795 src/editaddress.c:860 src/editgroup.c:267
 msgid "Remarks"
 msgstr "Notas"
@@ -860,183 +860,183 @@ msgstr "Notas"
 msgid "Select Address Book Folder"
 msgstr "Seleccionar carpeta da axenda"
 
-#: src/addressbook.c:336 src/compose.c:515 src/mainwindow.c:477
+#: src/addressbook.c:338 src/compose.c:515 src/mainwindow.c:480
 #: src/messageview.c:138
 msgid "/_File"
 msgstr "/_Ficheiro"
 
-#: src/addressbook.c:337
+#: src/addressbook.c:339
 msgid "/_File/New _Book"
 msgstr "/_Ficheiro/Nova _axenda"
 
-#: src/addressbook.c:338
+#: src/addressbook.c:340
 msgid "/_File/New _vCard"
 msgstr "/_Ficheiro/Nova _vCard"
 
-#: src/addressbook.c:340
+#: src/addressbook.c:342
 msgid "/_File/New _JPilot"
 msgstr "/_Ficheiro/Novo _JPilot"
 
-#: src/addressbook.c:343
+#: src/addressbook.c:345
 msgid "/_File/New _Server"
 msgstr "/_Ficheiro/Novo _servidor"
 
-#: src/addressbook.c:345 src/addressbook.c:348 src/compose.c:520
-#: src/compose.c:525 src/compose.c:528 src/compose.c:531 src/mainwindow.c:495
-#: src/mainwindow.c:498 src/mainwindow.c:500 src/mainwindow.c:503
-#: src/mainwindow.c:505 src/messageview.c:141
+#: src/addressbook.c:347 src/addressbook.c:350 src/compose.c:520
+#: src/compose.c:525 src/compose.c:528 src/compose.c:531 src/mainwindow.c:498
+#: src/mainwindow.c:501 src/mainwindow.c:503 src/mainwindow.c:506
+#: src/mainwindow.c:508 src/messageview.c:141
 msgid "/_File/---"
 msgstr "/_Ficheiro/---"
 
-#: src/addressbook.c:346
+#: src/addressbook.c:348
 msgid "/_File/_Edit"
 msgstr "/_Ficheiro/_Editar"
 
-#: src/addressbook.c:347
+#: src/addressbook.c:349
 msgid "/_File/_Delete"
 msgstr "/_Ficheiro/_Borrar"
 
-#: src/addressbook.c:349
+#: src/addressbook.c:351
 msgid "/_File/_Save"
 msgstr "/_Ficheiro/_Gardar"
 
-#: src/addressbook.c:350 src/compose.c:532 src/messageview.c:142
+#: src/addressbook.c:352 src/compose.c:532 src/messageview.c:142
 msgid "/_File/_Close"
 msgstr "/_Ficheiro/_Pechar"
 
-#: src/addressbook.c:351
+#: src/addressbook.c:353
 msgid "/_Address"
 msgstr "/_Enderezo"
 
-#: src/addressbook.c:352
+#: src/addressbook.c:354
 msgid "/_Address/New _Address"
 msgstr "/_Enderezo/Novo _enderezo"
 
-#: src/addressbook.c:353
+#: src/addressbook.c:355
 msgid "/_Address/New _Group"
 msgstr "//_Enderezo/Novo _grupo"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:356
 msgid "/_Address/New _Folder"
 msgstr "/_Enderezo/Nova _carpeta"
 
-#: src/addressbook.c:355
+#: src/addressbook.c:357
 msgid "/_Address/---"
 msgstr "/_Enderezo/---"
 
-#: src/addressbook.c:356
+#: src/addressbook.c:358
 msgid "/_Address/_Edit"
 msgstr "/_Enderezo/_Editar"
 
-#: src/addressbook.c:357
+#: src/addressbook.c:359
 msgid "/_Address/_Delete"
 msgstr "/_Enderezo/_Borrar"
 
-#: src/addressbook.c:358 src/compose.c:639 src/mainwindow.c:738
-#: src/messageview.c:259
+#: src/addressbook.c:360 src/compose.c:645 src/mainwindow.c:749
+#: src/messageview.c:264
 msgid "/_Tools"
 msgstr "/_Ferramentas"
 
-#: src/addressbook.c:359
+#: src/addressbook.c:361
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Ferramentas/Importar ficheiro _LDIF"
 
-#: src/addressbook.c:360 src/compose.c:658 src/mainwindow.c:788
-#: src/messageview.c:277
+#: src/addressbook.c:362 src/compose.c:664 src/mainwindow.c:799
+#: src/messageview.c:282
 msgid "/_Help"
 msgstr "/_Axuda"
 
-#: src/addressbook.c:361 src/compose.c:659 src/mainwindow.c:799
-#: src/messageview.c:278
+#: src/addressbook.c:363 src/compose.c:665 src/mainwindow.c:810
+#: src/messageview.c:283
 msgid "/_Help/_About"
 msgstr "/_Ayuda/_Acerca de"
 
-#: src/addressbook.c:380 src/addressbook.c:390
+#: src/addressbook.c:382 src/addressbook.c:392
 msgid "/New _Address"
 msgstr "/Novo _enderezo"
 
-#: src/addressbook.c:381 src/addressbook.c:391
+#: src/addressbook.c:383 src/addressbook.c:393
 msgid "/New _Group"
 msgstr "/Novo _grupo"
 
-#: src/addressbook.c:382 src/addressbook.c:392
+#: src/addressbook.c:384 src/addressbook.c:394
 msgid "/New _Folder"
 msgstr "/Nova _carpeta"
 
-#: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:509
+#: src/addressbook.c:385 src/addressbook.c:395 src/compose.c:509
 #: src/folderview.c:246 src/folderview.c:248 src/folderview.c:253
 #: src/folderview.c:266 src/folderview.c:268 src/folderview.c:270
 #: src/folderview.c:275 src/folderview.c:289 src/folderview.c:291
 #: src/folderview.c:295 src/summaryview.c:414 src/summaryview.c:418
-#: src/summaryview.c:421 src/summaryview.c:431 src/summaryview.c:433
-#: src/summaryview.c:435 src/summaryview.c:447 src/summaryview.c:453
+#: src/summaryview.c:421 src/summaryview.c:433 src/summaryview.c:435
+#: src/summaryview.c:437 src/summaryview.c:449 src/summaryview.c:455
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:534
-#: src/mainwindow.c:509 src/messageview.c:144
+#: src/addressbook.c:386 src/addressbook.c:396 src/compose.c:534
+#: src/mainwindow.c:512 src/messageview.c:144
 msgid "/_Edit"
 msgstr "/_Editar"
 
-#: src/addressbook.c:385 src/addressbook.c:395 src/summaryview.c:432
+#: src/addressbook.c:387 src/addressbook.c:397 src/summaryview.c:434
 msgid "/_Delete"
 msgstr "/_Borrar"
 
-#: src/addressbook.c:492
+#: src/addressbook.c:494
 msgid "E-Mail address"
 msgstr "Enderezo e-mail"
 
-#: src/addressbook.c:496 src/compose.c:4763 src/prefs_common_dialog.c:2183
+#: src/addressbook.c:498 src/compose.c:4772 src/prefs_common_dialog.c:2183
 msgid "Address book"
 msgstr "Axenda de enderezos"
 
-#: src/addressbook.c:596 src/prefs_filter_edit.c:249
+#: src/addressbook.c:600 src/prefs_filter_edit.c:249
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "Nome:"
 
 #. Buttons
-#: src/addressbook.c:628 src/addressbook.c:1680 src/editaddress.c:884
-#: src/editaddress.c:1017 src/mainwindow.c:2391 src/prefs_actions.c:266
+#: src/addressbook.c:632 src/addressbook.c:1684 src/editaddress.c:884
+#: src/editaddress.c:1017 src/mainwindow.c:2402 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
 #: src/prefs_template.c:233
 msgid "Delete"
 msgstr "Borrar"
 
-#: src/addressbook.c:631 src/editaddress.c:890 src/editaddress.c:1023
+#: src/addressbook.c:635 src/editaddress.c:890 src/editaddress.c:1023
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:273 src/prefs_display_header.c:328
 #: src/prefs_filter_edit.c:1550
 msgid "Add"
 msgstr "Engadir"
 
-#: src/addressbook.c:634
+#: src/addressbook.c:638
 msgid "Lookup"
 msgstr "Buscar"
 
-#: src/addressbook.c:646 src/headerview.c:55 src/prefs_folder_item.c:339
+#: src/addressbook.c:650 src/headerview.c:55 src/prefs_folder_item.c:339
 #: src/prefs_template.c:176
 msgid "To:"
 msgstr "Para:"
 
-#: src/addressbook.c:650 src/prefs_folder_item.c:356 src/prefs_template.c:178
+#: src/addressbook.c:654 src/prefs_folder_item.c:356 src/prefs_template.c:178
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:654 src/prefs_folder_item.c:367
+#: src/addressbook.c:658 src/prefs_folder_item.c:367
 msgid "Bcc:"
 msgstr "Bcc:"
 
 #. Confirm deletion
-#: src/addressbook.c:841
+#: src/addressbook.c:845
 msgid "Delete address(es)"
 msgstr "Borrar enderezo(s)"
 
-#: src/addressbook.c:842
+#: src/addressbook.c:846
 msgid "Really delete the address(es)?"
 msgstr "¿Borrar realmente o(s) enderezo(s)?"
 
-#: src/addressbook.c:1671
+#: src/addressbook.c:1675
 #, fuzzy, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1045,38 +1045,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:1674 src/folderview.c:2351
+#: src/addressbook.c:1678 src/folderview.c:2351
 msgid "Delete folder"
 msgstr "Borrar carpeta"
 
-#: src/addressbook.c:1674
+#: src/addressbook.c:1678
 #, fuzzy
 msgid "_Folder only"
 msgstr "Carpeta só"
 
-#: src/addressbook.c:1674
+#: src/addressbook.c:1678
 #, fuzzy
 msgid "Folder and _addresses"
 msgstr "Carpeta e enderezos"
 
-#: src/addressbook.c:1679
+#: src/addressbook.c:1683
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "¿Borrar realmente `%s' ?"
 
-#: src/addressbook.c:2365 src/addressbook.c:2498
+#: src/addressbook.c:2369 src/addressbook.c:2502
 msgid "New user, could not save index file."
 msgstr "Novo usuario, non se puido gardar o ficheiro índice."
 
-#: src/addressbook.c:2369 src/addressbook.c:2502
+#: src/addressbook.c:2373 src/addressbook.c:2506
 msgid "New user, could not save address book files."
 msgstr "Novo usuario, non se puido gardar os ficheiros de enderezos"
 
-#: src/addressbook.c:2379 src/addressbook.c:2512
+#: src/addressbook.c:2383 src/addressbook.c:2516
 msgid "Old address book converted successfully."
 msgstr "Antiga axenda de enderezos convertida con éxito"
 
-#: src/addressbook.c:2384
+#: src/addressbook.c:2388
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1084,7 +1084,7 @@ msgstr ""
 "Antiga axenda de enderezos convertida,\n"
 "non se puido gardar o novo ficheiro índice"
 
-#: src/addressbook.c:2397
+#: src/addressbook.c:2401
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1092,7 +1092,7 @@ msgstr ""
 "Non se puido convertir a antiga axenda,\n"
 "pero crearonse novos ficheiros valeiros."
 
-#: src/addressbook.c:2403
+#: src/addressbook.c:2407
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1100,7 +1100,7 @@ msgstr ""
 "Non se puido convertir a antiga axenda,\n"
 "Non se puideron crear os ficheiros para a nova."
 
-#: src/addressbook.c:2408
+#: src/addressbook.c:2412
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1108,92 +1108,92 @@ msgstr ""
 "Non se puido convertir a antiga axenda\n"
 "e non se puideron crear ficheiros para unha nova."
 
-#: src/addressbook.c:2415
+#: src/addressbook.c:2419
 msgid "Addressbook conversion error"
 msgstr "Error na conversión da axenda"
 
-#: src/addressbook.c:2419
+#: src/addressbook.c:2423
 msgid "Addressbook conversion"
 msgstr "Conversión da  axenda"
 
-#: src/addressbook.c:2454
+#: src/addressbook.c:2458
 msgid "Addressbook Error"
 msgstr "Error na axenda"
 
-#: src/addressbook.c:2455 src/addressbook.c:2555
+#: src/addressbook.c:2459 src/addressbook.c:2559
 msgid "Could not read address index"
 msgstr "Non se puido ler o índice de enderezos"
 
-#: src/addressbook.c:2517
+#: src/addressbook.c:2521
 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:2531
+#: src/addressbook.c:2535
 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:2537
+#: src/addressbook.c:2541
 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:2543
+#: src/addressbook.c:2547
 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:2561
+#: src/addressbook.c:2565
 msgid "Addressbook Conversion Error"
 msgstr "Erro na conversión da axenda"
 
-#: src/addressbook.c:2567
+#: src/addressbook.c:2571
 msgid "Addressbook Conversion"
 msgstr "Conversión da axenda"
 
-#: src/addressbook.c:3072 src/prefs_common_dialog.c:2033
+#: src/addressbook.c:3086 src/prefs_common_dialog.c:2033
 msgid "Interface"
 msgstr "Interfaz"
 
-#: src/addressbook.c:3088 src/importldif.c:514
+#: src/addressbook.c:3102 src/importldif.c:514
 msgid "Address Book"
 msgstr "Axenda de enderezos"
 
-#: src/addressbook.c:3104
+#: src/addressbook.c:3118
 msgid "Person"
 msgstr "Persoa"
 
-#: src/addressbook.c:3120
+#: src/addressbook.c:3134
 msgid "EMail Address"
 msgstr "Enderezo e-mail"
 
-#: src/addressbook.c:3136
+#: src/addressbook.c:3150
 msgid "Group"
 msgstr "Grupo"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3152 src/folderview.c:367 src/prefs_account_dialog.c:1694
+#: src/addressbook.c:3166 src/folderview.c:367 src/prefs_account_dialog.c:1694
 #: src/query_search.c:370
 msgid "Folder"
 msgstr "Carpeta"
 
-#: src/addressbook.c:3168
+#: src/addressbook.c:3182
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3184 src/addressbook.c:3200
+#: src/addressbook.c:3198 src/addressbook.c:3214
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3216
+#: src/addressbook.c:3230
 msgid "LDAP Server"
 msgstr "Servidor LDAP"
 
@@ -1205,7 +1205,7 @@ msgstr "Enderezo común"
 msgid "Personal address"
 msgstr "Enderezo persoal"
 
-#: src/alertpanel.c:141 src/compose.c:5485 src/main.c:573
+#: src/alertpanel.c:141 src/compose.c:5494 src/main.c:573
 msgid "Notice"
 msgstr "Notificación"
 
@@ -1256,7 +1256,7 @@ msgstr "Marrón"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4593
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4750
 msgid "None"
 msgstr "Ningún"
 
@@ -1318,7 +1318,7 @@ msgstr "/_Editar/_Desfacer"
 msgid "/_Edit/_Redo"
 msgstr "/_Editar/_Refacer"
 
-#: src/compose.c:537 src/compose.c:544 src/mainwindow.c:513
+#: src/compose.c:537 src/compose.c:544 src/mainwindow.c:516
 #: src/messageview.c:147
 msgid "/_Edit/---"
 msgstr "/_Editar/---"
@@ -1327,7 +1327,7 @@ msgstr "/_Editar/---"
 msgid "/_Edit/Cu_t"
 msgstr "/_Editar/Cor_tar"
 
-#: src/compose.c:539 src/mainwindow.c:510 src/messageview.c:145
+#: src/compose.c:539 src/mainwindow.c:513 src/messageview.c:145
 msgid "/_Edit/_Copy"
 msgstr "/_Editar/_Copiar"
 
@@ -1339,7 +1339,7 @@ msgstr "/_Editar/_Pegar"
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Editar/Pegar como c_itación"
 
-#: src/compose.c:543 src/mainwindow.c:511 src/messageview.c:146
+#: src/compose.c:543 src/mainwindow.c:514 src/messageview.c:146
 msgid "/_Edit/Select _all"
 msgstr "/_Editar/_Seleccionar todo"
 
@@ -1356,8 +1356,8 @@ msgstr "/_Editar/_Cortar todas as líneas longas"
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Editar/_Copiar"
 
-#: src/compose.c:550 src/mainwindow.c:518 src/messageview.c:151
-#: src/summaryview.c:448
+#: src/compose.c:550 src/mainwindow.c:521 src/messageview.c:151
+#: src/summaryview.c:450
 msgid "/_View"
 msgstr "/_Ver"
 
@@ -1378,9 +1378,9 @@ msgid "/_View/_Reply to"
 msgstr "/_Ver/_Respostar a"
 
 #: src/compose.c:555 src/compose.c:557 src/compose.c:559 src/compose.c:561
-#: src/mainwindow.c:538 src/mainwindow.c:541 src/mainwindow.c:568
-#: src/mainwindow.c:592 src/mainwindow.c:687 src/mainwindow.c:691
-#: src/messageview.c:236
+#: src/mainwindow.c:541 src/mainwindow.c:544 src/mainwindow.c:571
+#: src/mainwindow.c:595 src/mainwindow.c:696 src/mainwindow.c:700
+#: src/messageview.c:241
 msgid "/_View/---"
 msgstr "/_Ver/---"
 
@@ -1396,7 +1396,7 @@ msgstr "/_Ver/_Regra"
 msgid "/_View/_Attachment"
 msgstr "/_Ver/_Adxuntos"
 
-#: src/compose.c:567 src/mainwindow.c:599 src/messageview.c:158
+#: src/compose.c:567 src/mainwindow.c:602 src/messageview.c:158
 #, fuzzy
 msgid "/_View/Character _encoding"
 msgstr "/_Ver/_Ordear/Descendente"
@@ -1406,242 +1406,253 @@ msgid "/_View/Character _encoding/_Automatic"
 msgstr ""
 
 #: src/compose.c:570 src/compose.c:576 src/compose.c:582 src/compose.c:586
-#: src/compose.c:592 src/compose.c:596 src/compose.c:602 src/compose.c:606
-#: src/compose.c:616 src/compose.c:620 src/compose.c:628 src/compose.c:632
-#: src/mainwindow.c:595 src/mainwindow.c:602 src/messageview.c:154
+#: src/compose.c:592 src/compose.c:596 src/compose.c:602 src/compose.c:608
+#: src/compose.c:612 src/compose.c:622 src/compose.c:626 src/compose.c:634
+#: src/compose.c:638 src/mainwindow.c:598 src/mainwindow.c:605
+#: src/messageview.c:154
 #, fuzzy
 msgid "/_View/Character _encoding/---"
 msgstr "/_Ver/_Ordear/Descendente"
 
-#: src/compose.c:572 src/mainwindow.c:603 src/messageview.c:162
+#: src/compose.c:572 src/mainwindow.c:606 src/messageview.c:162
 #, fuzzy
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Ver/_Codificación/ASCII de 7 bits (US-ASC_II)"
 
-#: src/compose.c:574 src/mainwindow.c:605 src/messageview.c:165
+#: src/compose.c:574 src/mainwindow.c:608 src/messageview.c:165
 #, fuzzy
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Ver/_Codificación/Unicode (_UTF-8)"
 
-#: src/compose.c:578 src/mainwindow.c:609 src/messageview.c:168
+#: src/compose.c:578 src/mainwindow.c:612 src/messageview.c:168
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Ver/_Codificación/Europeo Occidental (ISO-8859-_1)"
 
-#: src/compose.c:580 src/mainwindow.c:611 src/messageview.c:170
+#: src/compose.c:580 src/mainwindow.c:614 src/messageview.c:170
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Ver/_Codificación/Europeo Occidental (ISO-8859-_15)"
 
-#: src/compose.c:584 src/mainwindow.c:617 src/messageview.c:175
+#: src/compose.c:584 src/mainwindow.c:620 src/messageview.c:175
 #, fuzzy
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Ver/_Codificación/Centroeuropeo (ISO-8859-_2)"
 
-#: src/compose.c:588 src/mainwindow.c:621 src/messageview.c:178
+#: src/compose.c:588 src/mainwindow.c:624 src/messageview.c:178
 #, fuzzy
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Ver/_Codificación/Báltico (ISO-8859-13)"
 
-#: src/compose.c:590 src/mainwindow.c:623 src/messageview.c:180
+#: src/compose.c:590 src/mainwindow.c:626 src/messageview.c:180
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Ver/_Codificación/Báltico (ISO-8859-_4)"
 
-#: src/compose.c:594 src/mainwindow.c:627 src/messageview.c:183
+#: src/compose.c:594 src/mainwindow.c:630 src/messageview.c:183
 #, fuzzy
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Ver/_Codificación/Grego (ISO-8859-_7)"
 
-#: src/compose.c:598 src/mainwindow.c:631 src/messageview.c:186
+#: src/compose.c:598 src/mainwindow.c:634 src/messageview.c:186
+#, fuzzy
+msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
+msgstr "/_Ver/_Codificación/Báltico (ISO-8859-_4)"
+
+#: src/compose.c:600 src/mainwindow.c:636 src/messageview.c:188
+#, fuzzy
+msgid "/_View/Character _encoding/Arabic (Windows-1256)"
+msgstr "/_Ver/_Codificación/Cirílico (Windows-1251)"
+
+#: src/compose.c:604 src/mainwindow.c:640 src/messageview.c:191
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Ver/_Codificación/Grego (ISO-8859-_7)"
 
-#: src/compose.c:600 src/mainwindow.c:633 src/messageview.c:188
+#: src/compose.c:606 src/mainwindow.c:642 src/messageview.c:193
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Ver/_Codificación/Cirílico (Windows-1251)"
 
-#: src/compose.c:604 src/mainwindow.c:637 src/messageview.c:191
+#: src/compose.c:610 src/mainwindow.c:646 src/messageview.c:196
 #, fuzzy
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Ver/_Codificación/Turco (ISO-8859-_9)"
 
-#: src/compose.c:608 src/mainwindow.c:641 src/messageview.c:194
+#: src/compose.c:614 src/mainwindow.c:650 src/messageview.c:199
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Ver/_Codificación/Cirílico (ISO-8859-_5)"
 
-#: src/compose.c:610 src/mainwindow.c:643 src/messageview.c:196
+#: src/compose.c:616 src/mainwindow.c:652 src/messageview.c:201
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Ver/_Codificación/Cirílico (KOI8-_R)"
 
-#: src/compose.c:612 src/mainwindow.c:645 src/messageview.c:198
+#: src/compose.c:618 src/mainwindow.c:654 src/messageview.c:203
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Ver/_Codificación/Cirílico (KOI8-_R)"
 
-#: src/compose.c:614 src/mainwindow.c:647 src/messageview.c:200
+#: src/compose.c:620 src/mainwindow.c:656 src/messageview.c:205
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Ver/_Codificación/Cirílico (Windows-1251)"
 
-#: src/compose.c:618 src/mainwindow.c:651 src/messageview.c:203
+#: src/compose.c:624 src/mainwindow.c:660 src/messageview.c:208
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Ver/_Codificación/Xaponés (ISO-2022-_JP)"
 
-#: src/compose.c:622 src/mainwindow.c:661 src/messageview.c:212
+#: src/compose.c:628 src/mainwindow.c:670 src/messageview.c:217
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Ver/_Codificación/Chines simplificado (_GB2312)"
 
-#: src/compose.c:624 src/mainwindow.c:663 src/messageview.c:214
+#: src/compose.c:630 src/mainwindow.c:672 src/messageview.c:219
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Ver/_Codificación/Chines simplificado (_GB2312)"
 
-#: src/compose.c:626 src/mainwindow.c:665 src/messageview.c:216
+#: src/compose.c:632 src/mainwindow.c:674 src/messageview.c:221
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Ver/_Codificación/Chines tradicional (_Big5)"
 
-#: src/compose.c:630 src/mainwindow.c:673 src/messageview.c:223
+#: src/compose.c:636 src/mainwindow.c:682 src/messageview.c:228
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Ver/_Codificación/Coreano (EUC-_KR)"
 
-#: src/compose.c:634 src/mainwindow.c:679 src/messageview.c:228
+#: src/compose.c:640 src/mainwindow.c:688 src/messageview.c:233
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Ver/_Codificación/Tailandés (TIS-620)"
 
-#: src/compose.c:636 src/mainwindow.c:681 src/messageview.c:230
+#: src/compose.c:642 src/mainwindow.c:690 src/messageview.c:235
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Ver/_Codificación/Tailandés (Windows-874)"
 
-#: src/compose.c:640 src/mainwindow.c:739 src/messageview.c:260
+#: src/compose.c:646 src/mainwindow.c:750 src/messageview.c:265
 msgid "/_Tools/_Address book"
 msgstr "/_Ferramentas/_Axenda de enderezos"
 
-#: src/compose.c:641
+#: src/compose.c:647
 msgid "/_Tools/_Template"
 msgstr "/_Ferramentas/Plan_tillas"
 
-#: src/compose.c:642 src/mainwindow.c:762 src/messageview.c:275
+#: src/compose.c:648 src/mainwindow.c:773 src/messageview.c:280
 msgid "/_Tools/Actio_ns"
 msgstr "/_Ferramentas/Acció_ns"
 
-#: src/compose.c:643 src/compose.c:647 src/compose.c:653 src/mainwindow.c:742
-#: src/mainwindow.c:756 src/mainwindow.c:761 src/mainwindow.c:763
-#: src/mainwindow.c:766 src/mainwindow.c:768 src/messageview.c:263
-#: src/messageview.c:274
+#: src/compose.c:649 src/compose.c:653 src/compose.c:659 src/mainwindow.c:753
+#: src/mainwindow.c:767 src/mainwindow.c:772 src/mainwindow.c:774
+#: src/mainwindow.c:777 src/mainwindow.c:779 src/messageview.c:268
+#: src/messageview.c:279
 msgid "/_Tools/---"
 msgstr "/_Ferramentas/---"
 
-#: src/compose.c:644
+#: src/compose.c:650
 #, fuzzy
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/_Editar/Editar con editor e_xterno"
 
-#: src/compose.c:648
+#: src/compose.c:654
 #, fuzzy
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Ferramentas/Acció_ns"
 
-#: src/compose.c:649
+#: src/compose.c:655
 #, fuzzy
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/_Mensaxe/_Encriptar"
 
-#: src/compose.c:654
+#: src/compose.c:660
 #, fuzzy
 msgid "/_Tools/_Check spell"
 msgstr "/_Ferramentas/E_xecutar"
 
-#: src/compose.c:655
+#: src/compose.c:661
 #, fuzzy
 msgid "/_Tools/_Set spell language"
 msgstr "/_Ferramentas/Plan_tillas"
 
-#: src/compose.c:899
+#: src/compose.c:908
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: o ficheiro non existe\n"
 
-#: src/compose.c:1003 src/compose.c:1074
+#: src/compose.c:1012 src/compose.c:1083
 msgid "Can't get text part\n"
 msgstr "Non se pode obter o texto\n"
 
-#: src/compose.c:1475
+#: src/compose.c:1484
 #, fuzzy
 msgid "Quote mark format error."
 msgstr "Marca de cita para erro."
 
-#: src/compose.c:1487
+#: src/compose.c:1496
 msgid "Message reply/forward format error."
 msgstr "Erro no formato da mensaxe para respostar/redirixir "
 
-#: src/compose.c:1907
+#: src/compose.c:1916
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "o ficheiro %s non existe\n"
 
-#: src/compose.c:1911
+#: src/compose.c:1920
 #, 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:1915
+#: src/compose.c:1924
 #, c-format
 msgid "File %s is empty."
 msgstr "o Ficheiro %s esta valeiro."
 
-#: src/compose.c:1919
+#: src/compose.c:1928
 #, c-format
 msgid "Can't read %s."
 msgstr "Non poido ler %s."
 
-#: src/compose.c:1952
+#: src/compose.c:1961
 #, c-format
 msgid "Message: %s"
 msgstr "Mensaxe: %s"
 
-#: src/compose.c:2012 src/mimeview.c:565
+#: src/compose.c:2021 src/mimeview.c:565
 msgid "Can't get the part of multipart message."
 msgstr "Non se pode obter a parte do mensaxe multipartes."
 
-#: src/compose.c:2496 src/headerview.c:195 src/query_search.c:636
-#: src/summaryview.c:2107
+#: src/compose.c:2505 src/headerview.c:195 src/query_search.c:636
+#: src/summaryview.c:2124
 msgid "(No Subject)"
 msgstr "(Sin asunto)"
 
-#: src/compose.c:2499
+#: src/compose.c:2508
 #, fuzzy, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Compoñer mensaxe%s"
 
-#: src/compose.c:2612
+#: src/compose.c:2621
 msgid "Recipient is not specified."
 msgstr "Non se especificou o destinatario."
 
-#: src/compose.c:2620
+#: src/compose.c:2629
 #, fuzzy
 msgid "Empty subject"
 msgstr "Asunto"
 
-#: src/compose.c:2621
+#: src/compose.c:2630
 msgid "Subject is empty. Send it anyway?"
 msgstr "o asunto esta valeiro. ¿Enviar de todas formas?"
 
-#: src/compose.c:2680
+#: src/compose.c:2689
 msgid "can't get recipient list."
 msgstr "non se pode obter a lista de destinatarios."
 
-#: src/compose.c:2700
+#: src/compose.c:2709
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1649,21 +1660,21 @@ msgstr ""
 "Non especificó ningunha conta para enviar.\n"
 "Seleccione algunha conta antes de enviar."
 
-#: src/compose.c:2714 src/send_message.c:299
+#: src/compose.c:2723 src/send_message.c:299
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Ocurriu un erro enviando o mensaxe a %s ."
 
-#: src/compose.c:2756
+#: src/compose.c:2765
 msgid "Can't save the message to outbox."
 msgstr "Non se pode gardar a mensaxe en Saida."
 
-#: src/compose.c:2794
+#: src/compose.c:2803
 #, 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:2891
+#: src/compose.c:2900
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1674,12 +1685,12 @@ msgstr ""
 "%s a %s.\n"
 "¿Envia-lo de todo xeito?"
 
-#: src/compose.c:2897
+#: src/compose.c:2906
 #, fuzzy
 msgid "Code conversion error"
 msgstr "Error na conversión da axenda"
 
-#: src/compose.c:2970
+#: src/compose.c:2979
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1688,159 +1699,159 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:2974
+#: src/compose.c:2983
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3264
+#: src/compose.c:3273
 msgid "can't remove the old message\n"
 msgstr "non se pode eliminar a mensaxe antiga\n"
 
-#: src/compose.c:3282
+#: src/compose.c:3291
 msgid "queueing message...\n"
 msgstr "poñendo na cola...\n"
 
-#: src/compose.c:3364
+#: src/compose.c:3373
 msgid "can't find queue folder\n"
 msgstr "non podo atopar a carpeta de cola\n"
 
-#: src/compose.c:3371
+#: src/compose.c:3380
 msgid "can't queue the message\n"
 msgstr "a mensaxe non se pode poñer na cola\n"
 
-#: src/compose.c:3964
+#: src/compose.c:3973
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "Message-ID generado: %s\n"
 
-#: src/compose.c:4077
+#: src/compose.c:4086
 msgid "Creating compose window...\n"
 msgstr "Creando fiestra de composicion...\n"
 
-#: src/compose.c:4128 src/headerview.c:54
+#: src/compose.c:4137 src/headerview.c:54
 msgid "From:"
 msgstr "Dende:"
 
-#: src/compose.c:4202
+#: src/compose.c:4211
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/_Ferramentas/Acció_ns"
 
-#: src/compose.c:4205
+#: src/compose.c:4214
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/_Mensaxe/_Encriptar"
 
-#: src/compose.c:4243 src/compose.c:5317
+#: src/compose.c:4252 src/compose.c:5326
 msgid "MIME type"
 msgstr "Tipo MIME"
 
 #. S_COL_DATE
-#: src/compose.c:4252 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4740
+#: src/compose.c:4261 src/mimeview.c:197 src/prefs_filter_edit.c:496
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4897
 msgid "Size"
 msgstr "Tamaño"
 
-#: src/compose.c:4683 src/mainwindow.c:2324 src/prefs_account_dialog.c:528
+#: src/compose.c:4692 src/mainwindow.c:2335 src/prefs_account_dialog.c:528
 #: src/prefs_common_dialog.c:661
 msgid "Send"
 msgstr "Enviar"
 
-#: src/compose.c:4684
+#: src/compose.c:4693
 msgid "Send message"
 msgstr "Enviar Mensaxe"
 
-#: src/compose.c:4692
+#: src/compose.c:4701
 msgid "Send later"
 msgstr "Enviar mais tarde"
 
-#: src/compose.c:4693
+#: src/compose.c:4702
 msgid "Put into queue folder and send later"
 msgstr "Poñer na cola e enviar mais tarde"
 
-#: src/compose.c:4701
+#: src/compose.c:4710
 msgid "Draft"
 msgstr "Borrador"
 
-#: src/compose.c:4702
+#: src/compose.c:4711
 msgid "Save to draft folder"
 msgstr "Gardar como borrador"
 
-#: src/compose.c:4712
+#: src/compose.c:4721
 msgid "Insert"
 msgstr "Inserir"
 
-#: src/compose.c:4713
+#: src/compose.c:4722
 msgid "Insert file"
 msgstr "Inserir ficheiro"
 
-#: src/compose.c:4721
+#: src/compose.c:4730
 msgid "Attach"
 msgstr "Adxuntar"
 
-#: src/compose.c:4722
+#: src/compose.c:4731
 msgid "Attach file"
 msgstr "Adxuntar ficheiro"
 
 #. signature
-#: src/compose.c:4732 src/prefs_account_dialog.c:1208
+#: src/compose.c:4741 src/prefs_account_dialog.c:1208
 #: src/prefs_common_dialog.c:953
 msgid "Signature"
 msgstr "Sinatura"
 
-#: src/compose.c:4733
+#: src/compose.c:4742
 #, fuzzy
 msgid "Append signature"
 msgstr "Sinatura INVÁLIDA"
 
 #. editor
-#: src/compose.c:4742 src/prefs_common_dialog.c:991
+#: src/compose.c:4751 src/prefs_common_dialog.c:991
 #: src/prefs_common_dialog.c:2315
 msgid "Editor"
 msgstr "Editor"
 
-#: src/compose.c:4743
+#: src/compose.c:4752
 msgid "Edit with external editor"
 msgstr "Editar con un editor externo"
 
-#: src/compose.c:4751
+#: src/compose.c:4760
 msgid "Linewrap"
 msgstr "Recortar"
 
-#: src/compose.c:4752
+#: src/compose.c:4761
 msgid "Wrap all long lines"
 msgstr "Cortar todas as líneas longas"
 
-#: src/compose.c:5213
+#: src/compose.c:5222
 msgid "Invalid MIME type."
 msgstr "Tipo MIME inválido."
 
-#: src/compose.c:5231
+#: src/compose.c:5240
 msgid "File doesn't exist or is empty."
 msgstr "O ficheiro non existe ou está valeiro."
 
-#: src/compose.c:5299
+#: src/compose.c:5308
 msgid "Properties"
 msgstr "Propiedades"
 
-#: src/compose.c:5319 src/prefs_common_dialog.c:1444
+#: src/compose.c:5328 src/prefs_common_dialog.c:1444
 msgid "Encoding"
 msgstr "Codificación"
 
-#: src/compose.c:5342 src/prefs_folder_item.c:202
+#: src/compose.c:5351 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Ruta"
 
-#: src/compose.c:5343
+#: src/compose.c:5352
 msgid "File name"
 msgstr "Nome de ficheiro"
 
-#: src/compose.c:5436
+#: src/compose.c:5445
 #, 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:5482
+#: src/compose.c:5491
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1850,48 +1861,48 @@ msgstr ""
 "¿Desea terminar o proceso?\n"
 "Id. de proceso: %d"
 
-#: src/compose.c:5857 src/compose.c:5862 src/compose.c:5868
+#: src/compose.c:5866 src/compose.c:5871 src/compose.c:5877
 msgid "Can't queue the message."
 msgstr "O mensaxe non se pode poñer na cola."
 
-#: src/compose.c:5959
+#: src/compose.c:5968
 #, fuzzy
 msgid "Select files"
 msgstr "Seleccionar ficheiro"
 
-#: src/compose.c:5982
+#: src/compose.c:5991
 msgid "Select file"
 msgstr "Seleccionar ficheiro"
 
-#: src/compose.c:6017
+#: src/compose.c:6026
 #, fuzzy
 msgid "Save message"
 msgstr "Enviar Mensaxe"
 
-#: src/compose.c:6018
+#: src/compose.c:6027
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Esta mensaxe foi modificado. ¿Desea descartala?"
 
-#: src/compose.c:6020
+#: src/compose.c:6029
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:6062
+#: src/compose.c:6071
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "¿Quere aplicar a plantilla `%s' ?"
 
-#: src/compose.c:6064
+#: src/compose.c:6073
 msgid "Apply template"
 msgstr "Aplicar plantilla"
 
-#: src/compose.c:6065
+#: src/compose.c:6074
 #, fuzzy
 msgid "_Replace"
 msgstr "Substituír"
 
-#: src/compose.c:6065
+#: src/compose.c:6074
 #, fuzzy
 msgid "_Insert"
 msgstr "Inserir"
@@ -2333,7 +2344,7 @@ msgstr "Novos"
 
 #. S_COL_MARK
 #: src/folderview.c:412 src/prefs_filter_edit.c:500
-#: src/prefs_summary_column.c:71 src/summaryview.c:509
+#: src/prefs_summary_column.c:71 src/summaryview.c:511
 msgid "Unread"
 msgstr "Non leídos"
 
@@ -2349,12 +2360,12 @@ msgstr "Establecendo información de carpeta...\n"
 msgid "Setting folder info..."
 msgstr "Establecendo información de carpeta..."
 
-#: src/folderview.c:858 src/mainwindow.c:3464 src/setup.c:80
+#: src/folderview.c:858 src/mainwindow.c:3481 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Revisando carpeta %s%c%s ..."
 
-#: src/folderview.c:862 src/mainwindow.c:3469 src/setup.c:85
+#: src/folderview.c:862 src/mainwindow.c:3486 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Revisando carpeta %s ..."
@@ -2380,7 +2391,7 @@ msgstr "Reconstruindo a arbre de carpetas..."
 msgid "Checking for new messages in all folders..."
 msgstr "Comprobar si hai mensaxes novos en todas as carpetas..."
 
-#: src/folderview.c:1200 src/mainwindow.c:2400 src/prefs_common_dialog.c:1789
+#: src/folderview.c:1200 src/mainwindow.c:2411 src/prefs_common_dialog.c:1789
 msgid "Junk"
 msgstr ""
 
@@ -2519,7 +2530,7 @@ msgstr "Asunto:"
 msgid "Creating header view...\n"
 msgstr "Creando vista de cabeceiras...\n"
 
-#: src/headerview.c:180 src/query_search.c:637 src/summaryview.c:2110
+#: src/headerview.c:180 src/query_search.c:637 src/summaryview.c:2127
 msgid "(No From)"
 msgstr "(Sin remite)"
 
@@ -2628,7 +2639,7 @@ msgstr "Importar ficheiro LDIF na axenda"
 msgid "Prev"
 msgstr "Anterior"
 
-#: src/importldif.c:768 src/mainwindow.c:2420
+#: src/importldif.c:768 src/mainwindow.c:2431
 msgid "Next"
 msgstr "Seguinte"
 
@@ -2974,677 +2985,682 @@ msgstr ""
 msgid "another Sylpheed is already running.\n"
 msgstr "xa hai outro Sylpheed executándose.\n"
 
-#: src/main.c:1064
+#: src/main.c:1083
 #, fuzzy
 msgid "Migration of configuration"
 msgstr "configuración das accions"
 
-#: src/main.c:1065
+#: src/main.c:1084
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
 msgstr ""
 
-#: src/mainwindow.c:478
+#: src/mainwindow.c:481
 msgid "/_File/_Folder"
 msgstr "/_Ficheiro/_Carpeta"
 
-#: src/mainwindow.c:479
+#: src/mainwindow.c:482
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/_Ficheiro/_Carpeta_/Crear _nova carpeta..."
 
-#: src/mainwindow.c:481
+#: src/mainwindow.c:484
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/_Ficheiro/_Carpeta_/_Renomear carpeta..."
 
-#: src/mainwindow.c:482
+#: src/mainwindow.c:485
 #, fuzzy
 msgid "/_File/_Folder/_Move folder..."
 msgstr "/_Ficheiro/_Carpeta_/_Renomear carpeta..."
 
-#: src/mainwindow.c:483
+#: src/mainwindow.c:486
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/_Ficheiro/_Carpeta_/_Borrar carpeta"
 
-#: src/mainwindow.c:484
+#: src/mainwindow.c:487
 #, fuzzy
 msgid "/_File/_Mailbox"
 msgstr "/_Ficheiro/_Engadir caixa de correo"
 
-#: src/mainwindow.c:485
+#: src/mainwindow.c:488
 #, fuzzy
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/_Ficheiro/_Engadir caixa de correo"
 
-#: src/mainwindow.c:486
+#: src/mainwindow.c:489
 #, fuzzy
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/Eliminar _mailbox"
 
-#: src/mainwindow.c:487 src/mainwindow.c:492
+#: src/mainwindow.c:490 src/mainwindow.c:495
 #, fuzzy
 msgid "/_File/_Mailbox/---"
 msgstr "/_Ficheiro/_Carpeta"
 
-#: src/mainwindow.c:488
+#: src/mainwindow.c:491
 #, fuzzy
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "/_Comprobar si hai mensaxes novas"
 
-#: src/mainwindow.c:490
+#: src/mainwindow.c:493
 #, fuzzy
 msgid "/_File/_Mailbox/Check for new messages in _all mailboxes"
 msgstr "/_Ficheiro/_Comprobar mensaxes novas en todas as carpetas"
 
-#: src/mainwindow.c:493
+#: src/mainwindow.c:496
 #, fuzzy
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "/R_econstruir árbre de carpetas"
 
-#: src/mainwindow.c:496
+#: src/mainwindow.c:499
 msgid "/_File/_Import mbox file..."
 msgstr "/_Ficheiro/I_mportar ficheiro mbox..."
 
-#: src/mainwindow.c:497
+#: src/mainwindow.c:500
 msgid "/_File/_Export to mbox file..."
 msgstr "/_Ficheiro/_Exportar a ficheiro mbox..."
 
-#: src/mainwindow.c:499
+#: src/mainwindow.c:502
 #, fuzzy
 msgid "/_File/Empty all _trash"
 msgstr "/_Ficheiro/_Baleirar Papeleira"
 
-#: src/mainwindow.c:501 src/messageview.c:139
+#: src/mainwindow.c:504 src/messageview.c:139
 msgid "/_File/_Save as..."
 msgstr "/_Ficheiro/_Gardar como..."
 
-#: src/mainwindow.c:502 src/messageview.c:140
+#: src/mainwindow.c:505 src/messageview.c:140
 msgid "/_File/_Print..."
 msgstr "/_Ficheiro/_Imprimir"
 
-#: src/mainwindow.c:504
+#: src/mainwindow.c:507
 #, fuzzy
 msgid "/_File/_Work offline"
 msgstr "/_Ficheiro/_Inserir ficheiro"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:507
+#: src/mainwindow.c:510
 msgid "/_File/E_xit"
 msgstr "/_Ficheiro/Sai_r"
 
-#: src/mainwindow.c:512
+#: src/mainwindow.c:515
 msgid "/_Edit/Select _thread"
 msgstr "/_Editar/Seleccionar _fio"
 
-#: src/mainwindow.c:514 src/messageview.c:148
+#: src/mainwindow.c:517 src/messageview.c:148
 msgid "/_Edit/_Find in current message..."
 msgstr "/_Edición/_Buscar na mensaxe actual..."
 
-#: src/mainwindow.c:516
+#: src/mainwindow.c:519
 msgid "/_Edit/_Search messages..."
 msgstr "/_Edición/_Buscar en carpeta..."
 
-#: src/mainwindow.c:519
+#: src/mainwindow.c:522
 msgid "/_View/Show or hi_de"
 msgstr "/_Ver/Mostrar ou o_cultar"
 
-#: src/mainwindow.c:520
+#: src/mainwindow.c:523
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/_Ver/Mostrar ou o_cultar/_Arbre de carpetas"
 
-#: src/mainwindow.c:522
+#: src/mainwindow.c:525
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/_Ver/Mostrar ou o_cultar/_Mensaxes"
 
-#: src/mainwindow.c:524
+#: src/mainwindow.c:527
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/_Ver/Mostrar ou o_cultar/_Ferramentas"
 
-#: src/mainwindow.c:526
+#: src/mainwindow.c:529
 msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/_Ver/Mostrar ou o_cultar/_Ferramentas/Iconos _e texto"
 
-#: src/mainwindow.c:528
+#: src/mainwindow.c:531
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/_Ver/Mostrar ou o_cultar/_Ferramentas/_Iconos"
 
-#: src/mainwindow.c:530
+#: src/mainwindow.c:533
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/_Ver/Mostrar ou o_cultar/_Ferramentas/_Texto"
 
-#: src/mainwindow.c:532
+#: src/mainwindow.c:535
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/_Ver/Mostrar ou o_cultar/_Ferramentas/_Ocultar"
 
-#: src/mainwindow.c:534
+#: src/mainwindow.c:537
 #, fuzzy
 msgid "/_View/Show or hi_de/_Search bar"
 msgstr "/_Ver/Mostrar ou o_cultar/_Barra de estado"
 
-#: src/mainwindow.c:536
+#: src/mainwindow.c:539
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/_Ver/Mostrar ou o_cultar/_Barra de estado"
 
-#: src/mainwindow.c:539
+#: src/mainwindow.c:542
 msgid "/_View/Separate f_older tree"
 msgstr "/_Ver/Separar arb_re de carpetas"
 
-#: src/mainwindow.c:540
+#: src/mainwindow.c:543
 #, fuzzy
 msgid "/_View/Separate _message view"
 msgstr "/_Ver/Separar vista de m_ensaxes"
 
-#: src/mainwindow.c:542
+#: src/mainwindow.c:545
 msgid "/_View/_Sort"
 msgstr "/_Ver/_Ordear"
 
-#: src/mainwindow.c:543
+#: src/mainwindow.c:546
 msgid "/_View/_Sort/by _number"
 msgstr "/_Ver/_Ordear/Por _número"
 
-#: src/mainwindow.c:544
+#: src/mainwindow.c:547
 msgid "/_View/_Sort/by s_ize"
 msgstr "/_Ver/_Ordear/Por tamañ_o"
 
-#: src/mainwindow.c:545
+#: src/mainwindow.c:548
 msgid "/_View/_Sort/by _date"
 msgstr "/_Ver/_Ordear/Por _data"
 
-#: src/mainwindow.c:546
+#: src/mainwindow.c:549
 #, fuzzy
 msgid "/_View/_Sort/by t_hread date"
 msgstr "/_Ver/_Ordear/Por _data"
 
-#: src/mainwindow.c:547
+#: src/mainwindow.c:550
 msgid "/_View/_Sort/by _from"
 msgstr "/_Ver/_Ordear/Por _remitente"
 
-#: src/mainwindow.c:548
+#: src/mainwindow.c:551
 msgid "/_View/_Sort/by _recipient"
 msgstr "/_Ver/_Ordear/Por _destinatario"
 
-#: src/mainwindow.c:549
+#: src/mainwindow.c:552
 msgid "/_View/_Sort/by _subject"
 msgstr "/_Ver/_Ordear/Por as_unto"
 
-#: src/mainwindow.c:550
+#: src/mainwindow.c:553
 msgid "/_View/_Sort/by _color label"
 msgstr "/_Ver/_Ordear/Por _cor da etiqueta"
 
-#: src/mainwindow.c:552
+#: src/mainwindow.c:555
 msgid "/_View/_Sort/by _mark"
 msgstr "/_Ver/_Ordear/Por _marca"
 
-#: src/mainwindow.c:553
+#: src/mainwindow.c:556
 msgid "/_View/_Sort/by _unread"
 msgstr "/_Ver/_Ordear/Por _non leído"
 
-#: src/mainwindow.c:554
+#: src/mainwindow.c:557
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/_Ver/_Ordear/Por adxun_to"
 
-#: src/mainwindow.c:556
+#: src/mainwindow.c:559
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/_Ver/_Ordear/N_on ordear"
 
-#: src/mainwindow.c:557 src/mainwindow.c:560
+#: src/mainwindow.c:560 src/mainwindow.c:563
 msgid "/_View/_Sort/---"
 msgstr "/_Ver/_Ordear/---"
 
-#: src/mainwindow.c:558
+#: src/mainwindow.c:561
 msgid "/_View/_Sort/Ascending"
 msgstr "/_Ver/_Ordear/Ascendente"
 
-#: src/mainwindow.c:559
+#: src/mainwindow.c:562
 msgid "/_View/_Sort/Descending"
 msgstr "/_Ver/_Ordear/Descendente"
 
-#: src/mainwindow.c:561
+#: src/mainwindow.c:564
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/_Ver/_Ordear/Atraer _por asunto"
 
-#: src/mainwindow.c:563
+#: src/mainwindow.c:566
 msgid "/_View/Th_read view"
 msgstr "/_Ver/_Vista xerárquica"
 
-#: src/mainwindow.c:564
+#: src/mainwindow.c:567
 msgid "/_View/E_xpand all threads"
 msgstr "/_Ver/E_xpandir todos os fios"
 
-#: src/mainwindow.c:565
+#: src/mainwindow.c:568
 msgid "/_View/Co_llapse all threads"
 msgstr "/_Ver/Co_lapsar todos os fios"
 
-#: src/mainwindow.c:566
+#: src/mainwindow.c:569
 msgid "/_View/Set display _item..."
 msgstr "/_Ver/Elementos visibles..."
 
-#: src/mainwindow.c:569
+#: src/mainwindow.c:572
 msgid "/_View/_Go to"
 msgstr "/_Ver/_Ir a"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:573
 msgid "/_View/_Go to/_Prev message"
 msgstr "/_Ver/_Ir a/Mensaxe a_nterior"
 
-#: src/mainwindow.c:571
+#: src/mainwindow.c:574
 msgid "/_View/_Go to/_Next message"
 msgstr "/_Ver/_Ir a/Mensaxe s_eguinte"
 
-#: src/mainwindow.c:572 src/mainwindow.c:577 src/mainwindow.c:580
-#: src/mainwindow.c:585 src/mainwindow.c:590
+#: src/mainwindow.c:575 src/mainwindow.c:580 src/mainwindow.c:583
+#: src/mainwindow.c:588 src/mainwindow.c:593
 msgid "/_View/_Go to/---"
 msgstr "/_Ver/_Ir a/---"
 
-#: src/mainwindow.c:573
+#: src/mainwindow.c:576
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/_Ver/_Ir a/_Anterior sin ler"
 
-#: src/mainwindow.c:575
+#: src/mainwindow.c:578
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/_Ver/_Ir a/_Seguinte sin ler"
 
-#: src/mainwindow.c:578
+#: src/mainwindow.c:581
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/_Ver/_Ir a/Mensaxe no_va anterior"
 
-#: src/mainwindow.c:579
+#: src/mainwindow.c:582
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/_Ver/_Ir a/Mensaxe nova s_eguinte"
 
-#: src/mainwindow.c:581
+#: src/mainwindow.c:584
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/_Ver/_Ir a/Mensaxe marcada a_nterior"
 
-#: src/mainwindow.c:583
+#: src/mainwindow.c:586
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/_Ver/_Ir a/Seguinte mensaxe _marcada"
 
-#: src/mainwindow.c:586
+#: src/mainwindow.c:589
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/_Ver/_Ir a/Mensaxe etiqueta_da anterior"
 
-#: src/mainwindow.c:588
+#: src/mainwindow.c:591
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/_Ver/_Ir a/Seguinte Mensaxe e_tiquetada"
 
-#: src/mainwindow.c:591
+#: src/mainwindow.c:594
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Ver/_Ir a/_Ir a outra carpeta"
 
-#: src/mainwindow.c:600 src/messageview.c:159
+#: src/mainwindow.c:603 src/messageview.c:159
 #, fuzzy
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Ver/_Codificación/_Autodetectar"
 
-#: src/mainwindow.c:613 src/messageview.c:172
+#: src/mainwindow.c:616 src/messageview.c:172
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr "/_Ver/_Codificación/Europeo Occidental (ISO-8859-_15)"
 
-#: src/mainwindow.c:653 src/messageview.c:205
+#: src/mainwindow.c:662 src/messageview.c:210
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Ver/_Codificación/Xaponés (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:655 src/messageview.c:207
+#: src/mainwindow.c:664 src/messageview.c:212
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Ver/_Codificación/Xaponés (_EUC-JP)"
 
-#: src/mainwindow.c:657 src/messageview.c:209
+#: src/mainwindow.c:666 src/messageview.c:214
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Ver/_Codificación/Xaponés (_Shift__JIS)"
 
-#: src/mainwindow.c:667 src/messageview.c:218
+#: src/mainwindow.c:676 src/messageview.c:223
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Ver/_Codificación/Chines tradicional (EUC-_TW)"
 
-#: src/mainwindow.c:669 src/messageview.c:220
+#: src/mainwindow.c:678 src/messageview.c:225
 #, fuzzy
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Ver/_Codificación/Chines (ISO-2022-_CN)"
 
-#: src/mainwindow.c:675 src/messageview.c:225
+#: src/mainwindow.c:684 src/messageview.c:230
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Ver/_Codificación/Coreano (ISO-2022-KR)"
 
-#: src/mainwindow.c:688 src/summaryview.c:449
+#: src/mainwindow.c:697 src/summaryview.c:451
 msgid "/_View/Open in new _window"
 msgstr "/_Ver/Abrir en fiestra _nova"
 
-#: src/mainwindow.c:689 src/messageview.c:237
+#: src/mainwindow.c:698 src/messageview.c:242
 msgid "/_View/Mess_age source"
 msgstr "/_Ver/Fonte da mens_axe"
 
-#: src/mainwindow.c:690 src/messageview.c:238
+#: src/mainwindow.c:699 src/messageview.c:243
 msgid "/_View/Show all _header"
 msgstr "/_Ver/Mostrar todas as cabeceiras"
 
-#: src/mainwindow.c:692
+#: src/mainwindow.c:701
 msgid "/_View/_Update summary"
 msgstr "/_Ver/Actualizar res_umen"
 
-#: src/mainwindow.c:694 src/messageview.c:240
+#: src/mainwindow.c:703 src/messageview.c:245
 msgid "/_Message"
 msgstr "/_Mensaxe"
 
-#: src/mainwindow.c:695
+#: src/mainwindow.c:704
 #, fuzzy
 msgid "/_Message/Recei_ve"
 msgstr "/_Mensaxe/Re_editar"
 
-#: src/mainwindow.c:696
+#: src/mainwindow.c:705
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/_Mensaxe/Recibir de tod_as as contas"
 
-#: src/mainwindow.c:698
+#: src/mainwindow.c:707
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/_Mensaxe/Recibir de tod_as as contas"
 
-#: src/mainwindow.c:700
+#: src/mainwindow.c:709
 #, fuzzy
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/_Mensaxe/_Cancelar recepción"
 
-#: src/mainwindow.c:702
+#: src/mainwindow.c:711
 #, fuzzy
 msgid "/_Message/Recei_ve/---"
 msgstr "/_Mensaxe/Re_editar"
 
-#: src/mainwindow.c:703
+#: src/mainwindow.c:712
 msgid "/_Message/_Send queued messages"
 msgstr "/_Mensaxe/Enviar mensa_xes da cola"
 
-#: src/mainwindow.c:704 src/mainwindow.c:706 src/mainwindow.c:713
-#: src/mainwindow.c:718 src/mainwindow.c:721 src/mainwindow.c:730
-#: src/mainwindow.c:732 src/mainwindow.c:735 src/messageview.c:243
-#: src/messageview.c:251 src/messageview.c:256
+#: src/mainwindow.c:713 src/mainwindow.c:715 src/mainwindow.c:722
+#: src/mainwindow.c:727 src/mainwindow.c:730 src/mainwindow.c:741
+#: src/mainwindow.c:743 src/mainwindow.c:746 src/messageview.c:248
+#: src/messageview.c:256 src/messageview.c:261
 msgid "/_Message/---"
 msgstr "/_Mensaxe/---"
 
-#: src/mainwindow.c:705 src/messageview.c:241
+#: src/mainwindow.c:714 src/messageview.c:246
 msgid "/_Message/Compose _new message"
 msgstr "/_Mensaxe/Compoñer _nova mensaxe"
 
-#: src/mainwindow.c:707 src/messageview.c:244
+#: src/mainwindow.c:716 src/messageview.c:249
 msgid "/_Message/_Reply"
 msgstr "/_Mensaxe/_Respostar"
 
-#: src/mainwindow.c:708
+#: src/mainwindow.c:717
 msgid "/_Message/Repl_y to"
 msgstr "/_Mensaxe/Respos_tar a"
 
-#: src/mainwindow.c:709 src/messageview.c:245
+#: src/mainwindow.c:718 src/messageview.c:250
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Mensaxe/Respos_tar a/A _todos"
 
-#: src/mainwindow.c:710 src/messageview.c:247
+#: src/mainwindow.c:719 src/messageview.c:252
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Mensaxe/Respos_tar a/Ó _remitente"
 
-#: src/mainwindow.c:711 src/messageview.c:249
+#: src/mainwindow.c:720 src/messageview.c:254
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Mensaxe/Respos_tar a/Á _lista de correo"
 
-#: src/mainwindow.c:714 src/messageview.c:252
+#: src/mainwindow.c:723 src/messageview.c:257
 msgid "/_Message/_Forward"
 msgstr "/_Mensaxe/_Reenviar"
 
-#: src/mainwindow.c:715 src/messageview.c:253
+#: src/mainwindow.c:724 src/messageview.c:258
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Mensaxe/Reen_viar como adxunto"
 
-#: src/mainwindow.c:717 src/messageview.c:255
+#: src/mainwindow.c:726 src/messageview.c:260
 msgid "/_Message/Redirec_t"
 msgstr "/_Mensaxe/Red_irixir"
 
-#: src/mainwindow.c:719
+#: src/mainwindow.c:728
 msgid "/_Message/M_ove..."
 msgstr "/_Mensaxe/M_over..."
 
-#: src/mainwindow.c:720
+#: src/mainwindow.c:729
 msgid "/_Message/_Copy..."
 msgstr "/_Mensaxe/_Copiar..."
 
-#: src/mainwindow.c:722
+#: src/mainwindow.c:731
 msgid "/_Message/_Mark"
 msgstr "/_Mensaxe/_Marcar"
 
-#: src/mainwindow.c:723
+#: src/mainwindow.c:732
 msgid "/_Message/_Mark/_Mark"
 msgstr "/_Mensaxe/_Marcar/_Marcar"
 
-#: src/mainwindow.c:724
+#: src/mainwindow.c:733
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/_Mensaxe/_Marcar/_Desmarcar"
 
-#: src/mainwindow.c:725
+#: src/mainwindow.c:734
 msgid "/_Message/_Mark/---"
 msgstr "/_Mensaxe/_Marcar/---"
 
-#: src/mainwindow.c:726
+#: src/mainwindow.c:735
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/_Mensaxe/_Marcar/Marcar como non leído"
 
-#: src/mainwindow.c:727
+#: src/mainwindow.c:736
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/_Mensaxe/_Marcar/Marcar como leído"
 
-#: src/mainwindow.c:729
+#: src/mainwindow.c:738
+#, fuzzy
+msgid "/_Message/_Mark/Mark _thread as read"
+msgstr "/_Mensaxe/_Marcar/Marcar como leído"
+
+#: src/mainwindow.c:740
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/_Mensaxe/_Marcar/Marcar todo como leído"
 
-#: src/mainwindow.c:731
+#: src/mainwindow.c:742
 msgid "/_Message/_Delete"
 msgstr "/_Mensaxe/_Borrar"
 
-#: src/mainwindow.c:733
+#: src/mainwindow.c:744
 #, fuzzy
 msgid "/_Message/Set as _junk mail"
 msgstr "/_Mensaxe/Rec_ibir correo novo"
 
-#: src/mainwindow.c:734
+#: src/mainwindow.c:745
 #, fuzzy
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/_Mensaxe/Rec_ibir correo novo"
 
-#: src/mainwindow.c:736 src/messageview.c:257
+#: src/mainwindow.c:747 src/messageview.c:262
 msgid "/_Message/Re-_edit"
 msgstr "/_Mensaxe/Re_editar"
 
-#: src/mainwindow.c:740
+#: src/mainwindow.c:751
 #, fuzzy
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/_Ferramentas/Engadir _remitente á axenda"
 
-#: src/mainwindow.c:743
+#: src/mainwindow.c:754
 #, fuzzy
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/_Ferramentas/_Filtrar Mensaxes"
 
-#: src/mainwindow.c:745
+#: src/mainwindow.c:756
 #, fuzzy
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Ferramentas/_Filtrar Mensaxes"
 
-#: src/mainwindow.c:747 src/messageview.c:264
+#: src/mainwindow.c:758 src/messageview.c:269
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Ferramentas/_Crear Regra de filtrado"
 
-#: src/mainwindow.c:748 src/messageview.c:266
+#: src/mainwindow.c:759 src/messageview.c:271
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Ferramentas/_Crear Regra de filtrado/_Automáticamente"
 
-#: src/mainwindow.c:750 src/messageview.c:268
+#: src/mainwindow.c:761 src/messageview.c:273
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Ferramentas/_Crear Regra de filtrado/Baseada en _Dende"
 
-#: src/mainwindow.c:752 src/messageview.c:270
+#: src/mainwindow.c:763 src/messageview.c:275
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Ferramentas/_Crear Regra de filtrado/Baseada en _Para"
 
-#: src/mainwindow.c:754 src/messageview.c:272
+#: src/mainwindow.c:765 src/messageview.c:277
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Ferramentas/_Crear Regra de filtrado/Baseada no _Asunto"
 
-#: src/mainwindow.c:757
+#: src/mainwindow.c:768
 #, fuzzy
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/_Ferramentas/_Filtrar Mensaxes"
 
-#: src/mainwindow.c:759
+#: src/mainwindow.c:770
 #, fuzzy
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/_Ferramentas/_Filtrar Mensaxes"
 
-#: src/mainwindow.c:764
+#: src/mainwindow.c:775
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/_Ferramentas/Borrar as mensaxes re_petidas"
 
-#: src/mainwindow.c:767
+#: src/mainwindow.c:778
 msgid "/_Tools/E_xecute"
 msgstr "/_Ferramentas/E_xecutar"
 
-#: src/mainwindow.c:769
+#: src/mainwindow.c:780
 msgid "/_Tools/_Log window"
 msgstr "/_Ferramentas/_Fiestra de traza"
 
-#: src/mainwindow.c:771
+#: src/mainwindow.c:782
 msgid "/_Configuration"
 msgstr "/_Configuración"
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:783
 msgid "/_Configuration/_Common preferences..."
 msgstr "/_Configuración/Preferencias _comuns..."
 
-#: src/mainwindow.c:774
+#: src/mainwindow.c:785
 msgid "/_Configuration/_Filter setting..."
 msgstr "/_Configuración/Preferencias de _filtrado..."
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:787
 msgid "/_Configuration/_Template..."
 msgstr "/_Configuración/_Plantillas ..."
 
-#: src/mainwindow.c:777
+#: src/mainwindow.c:788
 msgid "/_Configuration/_Actions..."
 msgstr "/_Configuración/_Accions..."
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:789
 msgid "/_Configuration/---"
 msgstr "/_Configuración/---"
 
-#: src/mainwindow.c:779
+#: src/mainwindow.c:790
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Configuración/_Preferencias da conta actual..."
 
-#: src/mainwindow.c:781
+#: src/mainwindow.c:792
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Configuración/Crear _nova conta..."
 
-#: src/mainwindow.c:783
+#: src/mainwindow.c:794
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Configuración/_Editar contas..."
 
-#: src/mainwindow.c:785
+#: src/mainwindow.c:796
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Configuración/_Cambiar conta actual"
 
-#: src/mainwindow.c:789
+#: src/mainwindow.c:800
 msgid "/_Help/_Manual"
 msgstr "/_Axuda/_Manual"
 
-#: src/mainwindow.c:790
+#: src/mainwindow.c:801
 msgid "/_Help/_Manual/_English"
 msgstr "/_Axuda/_Manual/_Inglés"
 
-#: src/mainwindow.c:791
+#: src/mainwindow.c:802
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/_Axuda/_Manual/_Xaponés"
 
-#: src/mainwindow.c:792
+#: src/mainwindow.c:803
 msgid "/_Help/_FAQ"
 msgstr "/_Axuda/_FAQ"
 
-#: src/mainwindow.c:793
+#: src/mainwindow.c:804
 msgid "/_Help/_FAQ/_English"
 msgstr "/_Axuda/_FAQ/_Inglés"
 
-#: src/mainwindow.c:794
+#: src/mainwindow.c:805
 msgid "/_Help/_FAQ/_German"
 msgstr "/_Axyuda/_FAQ/_Alemán"
 
-#: src/mainwindow.c:795
+#: src/mainwindow.c:806
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/_Axuda/_FAQ/_Español"
 
-#: src/mainwindow.c:796
+#: src/mainwindow.c:807
 msgid "/_Help/_FAQ/_French"
 msgstr "/_Axuda/_FAQ/_Francés"
 
-#: src/mainwindow.c:797
+#: src/mainwindow.c:808
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/_Axuda/_FAQ/_Italiano"
 
-#: src/mainwindow.c:798
+#: src/mainwindow.c:809
 msgid "/_Help/---"
 msgstr "/_Axuda/---"
 
-#: src/mainwindow.c:841
+#: src/mainwindow.c:852
 msgid "Creating main window...\n"
 msgstr "Creando Fiestra principal...\n"
 
-#: src/mainwindow.c:1011
+#: src/mainwindow.c:1022
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "MainWindow: fallo solicitando cor %d\n"
 
-#: src/mainwindow.c:1108 src/summaryview.c:2258 src/summaryview.c:2343
-#: src/summaryview.c:3739 src/summaryview.c:3868 src/summaryview.c:4226
+#: src/mainwindow.c:1119 src/summaryview.c:2275 src/summaryview.c:2360
+#: src/summaryview.c:3896 src/summaryview.c:4025 src/summaryview.c:4383
 msgid "done.\n"
 msgstr "feito.\n"
 
-#: src/mainwindow.c:1235 src/mainwindow.c:1276 src/mainwindow.c:1301
+#: src/mainwindow.c:1246 src/mainwindow.c:1287 src/mainwindow.c:1312
 msgid "Untitled"
 msgstr "Sen título"
 
-#: src/mainwindow.c:1302
+#: src/mainwindow.c:1313
 msgid "none"
 msgstr "ningunha"
 
-#: src/mainwindow.c:1355
+#: src/mainwindow.c:1366
 #, 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:1605
+#: src/mainwindow.c:1616
 msgid "Offline"
 msgstr ""
 
-#: src/mainwindow.c:1606
+#: src/mainwindow.c:1617
 msgid "You are offline. Go online?"
 msgstr ""
 
-#: src/mainwindow.c:1623
+#: src/mainwindow.c:1634
 #, fuzzy
 msgid "Empty all trash"
 msgstr "Baleirar papeleira"
 
-#: src/mainwindow.c:1624
+#: src/mainwindow.c:1635
 #, fuzzy
 msgid "Delete all messages in trash folders?"
 msgstr "¿Baleirar todas as mensaxes da papeleira?"
 
-#: src/mainwindow.c:1652
+#: src/mainwindow.c:1663
 msgid "Add mailbox"
 msgstr "Engadir caixa de correo"
 
-#: src/mainwindow.c:1653
+#: src/mainwindow.c:1664
 #, fuzzy
 msgid ""
 "Specify the location of mailbox.\n"
@@ -3655,16 +3671,16 @@ msgstr ""
 "Si xa existe será\n"
 "examinado automáticamente."
 
-#: src/mainwindow.c:1659 src/setup.c:49
+#: src/mainwindow.c:1670 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "a caixa de correo `%s' xa existe."
 
-#: src/mainwindow.c:1664 src/setup.c:56
+#: src/mainwindow.c:1675 src/setup.c:56
 msgid "Mailbox"
 msgstr "Correo"
 
-#: src/mainwindow.c:1670 src/setup.c:62
+#: src/mainwindow.c:1681 src/setup.c:62
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3674,149 +3690,149 @@ msgstr ""
 "Quizáis xa existan os ficheiros ou non teña permisos suficientes para "
 "escribir no directorio."
 
-#: src/mainwindow.c:2088
+#: src/mainwindow.c:2099
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Arbre de carpetas"
 
-#: src/mainwindow.c:2107
+#: src/mainwindow.c:2118
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Vista de mensaxe"
 
-#: src/mainwindow.c:2259 src/summaryview.c:408
+#: src/mainwindow.c:2270 src/summaryview.c:408
 msgid "/_Reply"
 msgstr "/_Respostar"
 
-#: src/mainwindow.c:2260
+#: src/mainwindow.c:2271
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "Respostar a todos"
 
-#: src/mainwindow.c:2261
+#: src/mainwindow.c:2272
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/Respon_der a/Ó _remitente"
 
-#: src/mainwindow.c:2262
+#: src/mainwindow.c:2273
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/Respon_der a/Á _lista de correo"
 
-#: src/mainwindow.c:2267 src/summaryview.c:415
+#: src/mainwindow.c:2278 src/summaryview.c:415
 msgid "/_Forward"
 msgstr "/_Reenviar"
 
-#: src/mainwindow.c:2268 src/summaryview.c:416
+#: src/mainwindow.c:2279 src/summaryview.c:416
 msgid "/For_ward as attachment"
 msgstr "/Reen_viar como adxunto"
 
-#: src/mainwindow.c:2269 src/summaryview.c:417
+#: src/mainwindow.c:2280 src/summaryview.c:417
 msgid "/Redirec_t"
 msgstr "/Red_irixir"
 
-#: src/mainwindow.c:2305
+#: src/mainwindow.c:2316
 msgid "Get"
 msgstr "Traer"
 
-#: src/mainwindow.c:2306
+#: src/mainwindow.c:2317
 msgid "Incorporate new mail"
 msgstr "Incorporar correo novo"
 
-#: src/mainwindow.c:2313
+#: src/mainwindow.c:2324
 msgid "Get all"
 msgstr "Traer todo"
 
-#: src/mainwindow.c:2314
+#: src/mainwindow.c:2325
 msgid "Incorporate new mail of all accounts"
 msgstr "Incorporar correo novo de todas as contas"
 
-#: src/mainwindow.c:2325
+#: src/mainwindow.c:2336
 msgid "Send queued message(s)"
 msgstr "Enviar mensaxe(s) na cola"
 
-#: src/mainwindow.c:2335 src/prefs_account_dialog.c:530
+#: src/mainwindow.c:2346 src/prefs_account_dialog.c:530
 #: src/prefs_common_dialog.c:663 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "Compoñer"
 
-#: src/mainwindow.c:2336
+#: src/mainwindow.c:2347
 msgid "Compose new message"
 msgstr "Compoñer mensaxe novo"
 
-#: src/mainwindow.c:2344 src/prefs_common_dialog.c:975
+#: src/mainwindow.c:2355 src/prefs_common_dialog.c:975
 msgid "Reply"
 msgstr "Respostar"
 
-#: src/mainwindow.c:2345 src/mainwindow.c:2358
+#: src/mainwindow.c:2356 src/mainwindow.c:2369
 msgid "Reply to the message"
 msgstr "Respostar ó mensaxe"
 
-#: src/mainwindow.c:2362
+#: src/mainwindow.c:2373
 msgid "Reply all"
 msgstr "A todos"
 
-#: src/mainwindow.c:2363
+#: src/mainwindow.c:2374
 msgid "Reply to all"
 msgstr "Respostar a todos"
 
-#: src/mainwindow.c:2371 src/prefs_filter_edit.c:672
+#: src/mainwindow.c:2382 src/prefs_filter_edit.c:672
 msgid "Forward"
 msgstr "Reenviar"
 
-#: src/mainwindow.c:2372 src/mainwindow.c:2385
+#: src/mainwindow.c:2383 src/mainwindow.c:2396
 msgid "Forward the message"
 msgstr "Reenviar o mensaxe"
 
-#: src/mainwindow.c:2392
+#: src/mainwindow.c:2403
 msgid "Delete the message"
 msgstr "Borrar o mensaxe"
 
-#: src/mainwindow.c:2401
+#: src/mainwindow.c:2412
 #, fuzzy
 msgid "Set as junk mail"
 msgstr "conta por defecto"
 
-#: src/mainwindow.c:2410
+#: src/mainwindow.c:2421
 msgid "Execute"
 msgstr "Executar"
 
-#: src/mainwindow.c:2411
+#: src/mainwindow.c:2422
 msgid "Execute marked process"
 msgstr "Executar o proceso marcado"
 
-#: src/mainwindow.c:2421
+#: src/mainwindow.c:2432
 msgid "Next unread message"
 msgstr "Seguinte non leído"
 
-#: src/mainwindow.c:2433
+#: src/mainwindow.c:2444
 msgid "Prefs"
 msgstr "Preferencias"
 
-#: src/mainwindow.c:2434
+#: src/mainwindow.c:2445
 msgid "Common preferences"
 msgstr "Preferencias comuns"
 
-#: src/mainwindow.c:2442 src/prefs_folder_item.c:289
+#: src/mainwindow.c:2453 src/prefs_folder_item.c:289
 #: src/prefs_folder_item.c:300 src/progressdialog.c:128
 msgid "Account"
 msgstr "conta"
 
-#: src/mainwindow.c:2443
+#: src/mainwindow.c:2454
 msgid "Account setting"
 msgstr "Preferencias da conta"
 
-#: src/mainwindow.c:2615
+#: src/mainwindow.c:2626
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 
-#: src/mainwindow.c:2626
+#: src/mainwindow.c:2637
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 
-#: src/mainwindow.c:2892
+#: src/mainwindow.c:2903
 msgid "Exit"
 msgstr "Sair"
 
-#: src/mainwindow.c:2892
+#: src/mainwindow.c:2903
 msgid "Exit this program?"
 msgstr "¿Sair do programa?"
 
@@ -3853,45 +3869,45 @@ msgstr "Chegóuse ó final da mensaxe. ¿Seguir dende o principio?"
 msgid "Search finished"
 msgstr "Búsqueda concluida"
 
-#: src/messageview.c:261
+#: src/messageview.c:266
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/_Ferramentas/Engadir _remitente á axenda"
 
-#: src/messageview.c:291
+#: src/messageview.c:296
 msgid "Creating message view...\n"
 msgstr "Creando visor de mensaxe...\n"
 
-#: src/messageview.c:316
+#: src/messageview.c:321
 msgid "Text"
 msgstr "Texto"
 
-#: src/messageview.c:321
+#: src/messageview.c:326
 msgid "Attachments"
 msgstr "Adxuntos"
 
-#: src/messageview.c:371
+#: src/messageview.c:376
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:669 src/summaryview.c:3268
+#: src/messageview.c:674 src/summaryview.c:3425
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Non podo gardar o ficheiro `%s'."
 
-#: src/messageview.c:728 src/summaryview.c:3291
+#: src/messageview.c:733 src/summaryview.c:3448
 msgid "The message will be printed with the following command:"
 msgstr ""
 
-#: src/messageview.c:729 src/summaryview.c:3292
+#: src/messageview.c:734 src/summaryview.c:3449
 #, fuzzy
 msgid "(Default print command)"
 msgstr "Executar"
 
-#: src/messageview.c:731 src/prefs_common_dialog.c:2304 src/summaryview.c:3294
+#: src/messageview.c:736 src/prefs_common_dialog.c:2304 src/summaryview.c:3451
 msgid "Print"
 msgstr "Imprimir"
 
-#: src/messageview.c:740 src/summaryview.c:3303
+#: src/messageview.c:745 src/summaryview.c:3460
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -4795,8 +4811,8 @@ msgstr "Ver destinatario na columna `Dende' si o remitente é vostede mismo"
 msgid "Expand threads"
 msgstr "Expandir fíos"
 
-#: src/prefs_common_dialog.c:1413 src/prefs_common_dialog.c:2713
-#: src/prefs_common_dialog.c:2751
+#: src/prefs_common_dialog.c:1413 src/prefs_common_dialog.c:2716
+#: src/prefs_common_dialog.c:2754
 msgid "Date format"
 msgstr "Formato de data"
 
@@ -5097,8 +5113,8 @@ msgstr "Comandos externos (%s se sustituirá con o nome de ficheiro / URI)"
 msgid "Web browser"
 msgstr "Navegador web"
 
-#: src/prefs_common_dialog.c:2288 src/prefs_common_dialog.c:3775
-#: src/prefs_common_dialog.c:3796
+#: src/prefs_common_dialog.c:2288 src/prefs_common_dialog.c:3778
+#: src/prefs_common_dialog.c:3799
 #, fuzzy
 msgid "(Default browser)"
 msgstr "Caixa de correo por defecto"
@@ -5174,216 +5190,226 @@ msgstr "Grego (ISO-8859-7)"
 
 #: src/prefs_common_dialog.c:2495
 #, fuzzy
+msgid "Arabic (ISO-8859-6)"
+msgstr "Báltico (ISO-8859-4)"
+
+#: src/prefs_common_dialog.c:2496
+#, fuzzy
+msgid "Arabic (Windows-1256)"
+msgstr "Cirílico (Windows-1251)"
+
+#: src/prefs_common_dialog.c:2498
+#, fuzzy
 msgid "Hebrew (ISO-8859-8)"
 msgstr "Grego (ISO-8859-7)"
 
-#: src/prefs_common_dialog.c:2496
+#: src/prefs_common_dialog.c:2499
 #, fuzzy
 msgid "Hebrew (Windows-1255)"
 msgstr "Cirílico (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2498
+#: src/prefs_common_dialog.c:2501
 msgid "Turkish (ISO-8859-9)"
 msgstr "Turco (ISO-8859-9)"
 
-#: src/prefs_common_dialog.c:2500
+#: src/prefs_common_dialog.c:2503
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Cirílico (ISO-8859-5)"
 
-#: src/prefs_common_dialog.c:2501
+#: src/prefs_common_dialog.c:2504
 msgid "Cyrillic (KOI8-R)"
 msgstr "Cirílico (KOI8-R)"
 
-#: src/prefs_common_dialog.c:2502
+#: src/prefs_common_dialog.c:2505
 msgid "Cyrillic (KOI8-U)"
 msgstr "Cirílico (KOI8-U)"
 
-#: src/prefs_common_dialog.c:2503
+#: src/prefs_common_dialog.c:2506
 msgid "Cyrillic (Windows-1251)"
 msgstr "Cirílico (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2505
+#: src/prefs_common_dialog.c:2508
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Xaponés (ISO-2022-JP)"
 
-#: src/prefs_common_dialog.c:2507
+#: src/prefs_common_dialog.c:2510
 msgid "Japanese (EUC-JP)"
 msgstr "Xaponés (EUC-JP)"
 
-#: src/prefs_common_dialog.c:2508
+#: src/prefs_common_dialog.c:2511
 msgid "Japanese (Shift_JIS)"
 msgstr "Xaponés (Shift_JIS)"
 
-#: src/prefs_common_dialog.c:2511
+#: src/prefs_common_dialog.c:2514
 msgid "Simplified Chinese (GB2312)"
 msgstr "Chines simplificado (GB2312)"
 
-#: src/prefs_common_dialog.c:2512
+#: src/prefs_common_dialog.c:2515
 #, fuzzy
 msgid "Simplified Chinese (GBK)"
 msgstr "Chines simplificado (GB2312)"
 
-#: src/prefs_common_dialog.c:2513
+#: src/prefs_common_dialog.c:2516
 msgid "Traditional Chinese (Big5)"
 msgstr "Chines tradicional (Big5)"
 
-#: src/prefs_common_dialog.c:2515
+#: src/prefs_common_dialog.c:2518
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Chines tradicional (EUC-TW)"
 
-#: src/prefs_common_dialog.c:2516
+#: src/prefs_common_dialog.c:2519
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Chines (ISO-2022-CN)"
 
-#: src/prefs_common_dialog.c:2519
+#: src/prefs_common_dialog.c:2522
 msgid "Korean (EUC-KR)"
 msgstr "Coreano (EUC-KR)"
 
-#: src/prefs_common_dialog.c:2521
+#: src/prefs_common_dialog.c:2524
 msgid "Thai (TIS-620)"
 msgstr "Tailandés (TIS-620)"
 
-#: src/prefs_common_dialog.c:2522
+#: src/prefs_common_dialog.c:2525
 msgid "Thai (Windows-874)"
 msgstr "Tailandés (Windows-874)"
 
-#: src/prefs_common_dialog.c:2689
+#: src/prefs_common_dialog.c:2692
 msgid "the full abbreviated weekday name"
 msgstr "o dia da semana abreviado"
 
-#: src/prefs_common_dialog.c:2690
+#: src/prefs_common_dialog.c:2693
 msgid "the full weekday name"
 msgstr "o dia da semana completo"
 
-#: src/prefs_common_dialog.c:2691
+#: src/prefs_common_dialog.c:2694
 msgid "the abbreviated month name"
 msgstr "o nome do mes abreviado"
 
-#: src/prefs_common_dialog.c:2692
+#: src/prefs_common_dialog.c:2695
 msgid "the full month name"
 msgstr "o nome do mes completo"
 
-#: src/prefs_common_dialog.c:2693
+#: src/prefs_common_dialog.c:2696
 msgid "the preferred date and time for the current locale"
 msgstr "a data e hora preferida para a localización actual"
 
-#: src/prefs_common_dialog.c:2694
+#: src/prefs_common_dialog.c:2697
 msgid "the century number (year/100)"
 msgstr "o número de século (año/100)"
 
-#: src/prefs_common_dialog.c:2695
+#: src/prefs_common_dialog.c:2698
 msgid "the day of the month as a decimal number"
 msgstr "o dia do mes como número decimal"
 
-#: src/prefs_common_dialog.c:2696
+#: src/prefs_common_dialog.c:2699
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "a hora como número usando o reloxo de 24 horas"
 
-#: src/prefs_common_dialog.c:2697
+#: src/prefs_common_dialog.c:2700
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "a hora como número usando o reloxo de 12 horas"
 
-#: src/prefs_common_dialog.c:2698
+#: src/prefs_common_dialog.c:2701
 msgid "the day of the year as a decimal number"
 msgstr "o dia do ano como número decimal"
 
-#: src/prefs_common_dialog.c:2699
+#: src/prefs_common_dialog.c:2702
 msgid "the month as a decimal number"
 msgstr "o mes como número decimal"
 
-#: src/prefs_common_dialog.c:2700
+#: src/prefs_common_dialog.c:2703
 msgid "the minute as a decimal number"
 msgstr "o minuto como número decimal"
 
-#: src/prefs_common_dialog.c:2701
+#: src/prefs_common_dialog.c:2704
 msgid "either AM or PM"
 msgstr "AM o PM"
 
-#: src/prefs_common_dialog.c:2702
+#: src/prefs_common_dialog.c:2705
 msgid "the second as a decimal number"
 msgstr "o segundo como número decimal"
 
-#: src/prefs_common_dialog.c:2703
+#: src/prefs_common_dialog.c:2706
 msgid "the day of the week as a decimal number"
 msgstr "o dia da semana como número decimal"
 
-#: src/prefs_common_dialog.c:2704
+#: src/prefs_common_dialog.c:2707
 msgid "the preferred date for the current locale"
 msgstr "a data preferida para a localización actual"
 
-#: src/prefs_common_dialog.c:2705
+#: src/prefs_common_dialog.c:2708
 msgid "the last two digits of a year"
 msgstr "os dous últimos díxitos do ano"
 
-#: src/prefs_common_dialog.c:2706
+#: src/prefs_common_dialog.c:2709
 msgid "the year as a decimal number"
 msgstr "o ano como número decimal"
 
-#: src/prefs_common_dialog.c:2707
+#: src/prefs_common_dialog.c:2710
 msgid "the time zone or name or abbreviation"
 msgstr "zona horaria ou nome ou abreviatura"
 
-#: src/prefs_common_dialog.c:2728
+#: src/prefs_common_dialog.c:2731
 msgid "Specifier"
 msgstr "Especificador"
 
-#: src/prefs_common_dialog.c:2729
+#: src/prefs_common_dialog.c:2732
 msgid "Description"
 msgstr "Descripción"
 
-#: src/prefs_common_dialog.c:2769
+#: src/prefs_common_dialog.c:2772
 msgid "Example"
 msgstr "Exemplo"
 
-#: src/prefs_common_dialog.c:2850
+#: src/prefs_common_dialog.c:2853
 msgid "Set message colors"
 msgstr "Cores do mensaxe"
 
-#: src/prefs_common_dialog.c:2858
+#: src/prefs_common_dialog.c:2861
 msgid "Colors"
 msgstr "Cores"
 
-#: src/prefs_common_dialog.c:2892
+#: src/prefs_common_dialog.c:2895
 msgid "Quoted Text - First Level"
 msgstr "Texto citado - Primer nivel"
 
-#: src/prefs_common_dialog.c:2898
+#: src/prefs_common_dialog.c:2901
 msgid "Quoted Text - Second Level"
 msgstr "Texto citado - Segundo nivel"
 
-#: src/prefs_common_dialog.c:2904
+#: src/prefs_common_dialog.c:2907
 msgid "Quoted Text - Third Level"
 msgstr "Texto citado - Tercer nivel"
 
-#: src/prefs_common_dialog.c:2910
+#: src/prefs_common_dialog.c:2913
 msgid "URI link"
 msgstr "Enlace URI"
 
-#: src/prefs_common_dialog.c:2917
+#: src/prefs_common_dialog.c:2920
 msgid "Recycle quote colors"
 msgstr "Reutilizar cores de citación"
 
-#: src/prefs_common_dialog.c:2984
+#: src/prefs_common_dialog.c:2987
 msgid "Pick color for quotation level 1"
 msgstr "Escoller cor para o nivel de citado 1"
 
-#: src/prefs_common_dialog.c:2987
+#: src/prefs_common_dialog.c:2990
 msgid "Pick color for quotation level 2"
 msgstr "Escoller cor para o nivel de citado 2"
 
-#: src/prefs_common_dialog.c:2990
+#: src/prefs_common_dialog.c:2993
 msgid "Pick color for quotation level 3"
 msgstr "Escoller cor para o nivel de citado 3"
 
-#: src/prefs_common_dialog.c:2993
+#: src/prefs_common_dialog.c:2996
 msgid "Pick color for URI"
 msgstr "Escoller cor para URIs"
 
-#: src/prefs_common_dialog.c:3133
+#: src/prefs_common_dialog.c:3136
 msgid "Description of symbols"
 msgstr "Descripción de símbolos"
 
-#: src/prefs_common_dialog.c:3189
+#: src/prefs_common_dialog.c:3192
 msgid ""
 "Date\n"
 "From\n"
@@ -5407,11 +5433,11 @@ msgstr ""
 "Grupos de novas\n"
 "ID-Mensaxe"
 
-#: src/prefs_common_dialog.c:3202
+#: src/prefs_common_dialog.c:3205
 msgid "If x is set, displays expr"
 msgstr "Si x está, mostra expr"
 
-#: src/prefs_common_dialog.c:3206
+#: src/prefs_common_dialog.c:3209
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -5425,7 +5451,7 @@ msgstr ""
 "Corpo da mensaxe citado sen sinatura\n"
 "o carácter %"
 
-#: src/prefs_common_dialog.c:3214
+#: src/prefs_common_dialog.c:3217
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -5437,20 +5463,20 @@ msgstr ""
 "Carácter chave aberta\n"
 "Carácter chave pechada"
 
-#: src/prefs_common_dialog.c:3260
+#: src/prefs_common_dialog.c:3263
 msgid "Key bindings"
 msgstr "Atallos de teclado"
 
-#: src/prefs_common_dialog.c:3273
+#: src/prefs_common_dialog.c:3276
 #, fuzzy
 msgid "Select the preset of key bindings."
 msgstr " Establecer atallos de teclado... "
 
-#: src/prefs_common_dialog.c:3283 src/prefs_common_dialog.c:3607
+#: src/prefs_common_dialog.c:3286 src/prefs_common_dialog.c:3610
 msgid "Default"
 msgstr "Por defecto"
 
-#: src/prefs_common_dialog.c:3286 src/prefs_common_dialog.c:3616
+#: src/prefs_common_dialog.c:3289 src/prefs_common_dialog.c:3619
 msgid "Old Sylpheed"
 msgstr "Antigos de Sylpheed"
 
@@ -5575,7 +5601,7 @@ msgstr ""
 msgid "Age"
 msgstr ""
 
-#: src/prefs_filter_edit.c:501 src/summaryview.c:510
+#: src/prefs_filter_edit.c:501 src/summaryview.c:512
 #, fuzzy
 msgid "Marked"
 msgstr "Marca"
@@ -5828,17 +5854,17 @@ msgid "Attachment"
 msgstr "Adxunto"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73 src/query_search.c:371 src/summaryview.c:4733
+#: src/prefs_summary_column.c:73 src/query_search.c:371 src/summaryview.c:4890
 msgid "Subject"
 msgstr "Asunto"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/query_search.c:372 src/summaryview.c:4736
+#: src/prefs_summary_column.c:74 src/query_search.c:372 src/summaryview.c:4893
 msgid "From"
 msgstr "Dende"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/query_search.c:373 src/summaryview.c:4738
+#: src/prefs_summary_column.c:75 src/query_search.c:373 src/summaryview.c:4895
 msgid "Date"
 msgstr "Data"
 
@@ -5940,7 +5966,7 @@ msgstr "Buscar nas mensaxes"
 msgid "_Save as search folder"
 msgstr "Gardar como borrador"
 
-#: src/query_search.c:512 src/subscribedialog.c:523 src/summaryview.c:840
+#: src/query_search.c:512 src/subscribedialog.c:523 src/summaryview.c:842
 msgid "Done."
 msgstr "Feito."
 
@@ -5954,7 +5980,7 @@ msgstr "Revisando carpeta %s ..."
 msgid "Searching %s (%d / %d)..."
 msgstr "Filtrando..."
 
-#: src/query_search.c:645 src/summaryview.c:2048
+#: src/query_search.c:645 src/summaryview.c:2051
 msgid "(No Date)"
 msgstr "(Sin data)"
 
@@ -6327,305 +6353,310 @@ msgid "/_Mark/Mark as rea_d"
 msgstr "/_Marcar/Marcar como _leído"
 
 #: src/summaryview.c:429
+#, fuzzy
+msgid "/_Mark/Mark _thread as read"
+msgstr "/_Marcar/Marcar como _leído"
+
+#: src/summaryview.c:431
 msgid "/_Mark/Mark all _read"
 msgstr "/_Marcar/Marca_r todos leídos"
 
-#: src/summaryview.c:430
+#: src/summaryview.c:432
 msgid "/Color la_bel"
 msgstr "/E_tiquetar de cor"
 
-#: src/summaryview.c:434
+#: src/summaryview.c:436
 msgid "/Re-_edit"
 msgstr "/Re_editar"
 
-#: src/summaryview.c:436
+#: src/summaryview.c:438
 #, fuzzy
 msgid "/Add sender to address boo_k..."
 msgstr "/Engadir _remitente á axenda"
 
-#: src/summaryview.c:438
+#: src/summaryview.c:440
 msgid "/Create f_ilter rule"
 msgstr "/Crear Regra de f_iltrado"
 
-#: src/summaryview.c:439
+#: src/summaryview.c:441
 msgid "/Create f_ilter rule/_Automatically"
 msgstr "/Crear Regra de f_iltrado/_Automáticamente"
 
-#: src/summaryview.c:441
+#: src/summaryview.c:443
 msgid "/Create f_ilter rule/by _From"
 msgstr "/Crear Regra de f_iltrado/Baseada en _Dende"
 
-#: src/summaryview.c:443
+#: src/summaryview.c:445
 msgid "/Create f_ilter rule/by _To"
 msgstr "/Crear Regra de f_iltrado/Baseada en _Para"
 
-#: src/summaryview.c:445
+#: src/summaryview.c:447
 msgid "/Create f_ilter rule/by _Subject"
 msgstr "/Crear Regra de f_iltrado/Baseada no _Asunto"
 
-#: src/summaryview.c:451
+#: src/summaryview.c:453
 msgid "/_View/_Source"
 msgstr "/_Ver/_Fonte"
 
-#: src/summaryview.c:452
+#: src/summaryview.c:454
 msgid "/_View/All _header"
 msgstr "/_Ver/Todas as cabeceiras"
 
-#: src/summaryview.c:454
+#: src/summaryview.c:456
 msgid "/_Print..."
 msgstr "/_Imprimir..."
 
-#: src/summaryview.c:486
+#: src/summaryview.c:488
 msgid "Creating summary view...\n"
 msgstr "Creando vista de cabeceiras...\n"
 
-#: src/summaryview.c:508
+#: src/summaryview.c:510
 msgid "All"
 msgstr ""
 
-#: src/summaryview.c:511
+#: src/summaryview.c:513
 #, fuzzy
 msgid "Have color label"
 msgstr "/E_tiquetar de cor"
 
-#: src/summaryview.c:512
+#: src/summaryview.c:514
 #, fuzzy
 msgid "Have attachment"
 msgstr "Adxunto"
 
-#: src/summaryview.c:521
+#: src/summaryview.c:523
 #, fuzzy
 msgid "Search:"
 msgstr "Buscar"
 
-#: src/summaryview.c:535
+#: src/summaryview.c:537
 msgid "Search for Subject or From"
 msgstr ""
 
-#: src/summaryview.c:702
+#: src/summaryview.c:704
 msgid "Process mark"
 msgstr "Procesar marcas"
 
-#: src/summaryview.c:703
+#: src/summaryview.c:705
 msgid "Some marks are left. Process it?"
 msgstr "Queda algunha marca. ¿Procesa-la?"
 
-#: src/summaryview.c:749
+#: src/summaryview.c:751
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "Revisando carpeta (%s)..."
 
-#: src/summaryview.c:1292
+#: src/summaryview.c:1295
 #, fuzzy
 msgid "_Search again"
 msgstr "Búscar de novo"
 
-#: src/summaryview.c:1313 src/summaryview.c:1322
+#: src/summaryview.c:1316 src/summaryview.c:1325
 msgid "No more unread messages"
 msgstr "Non hai mais mensaxes sin ler"
 
-#: src/summaryview.c:1314
+#: src/summaryview.c:1317
 msgid "No unread message found. Search from the end?"
 msgstr "Non hai mensaxes sin ler. ¿Buscar dende o final?"
 
-#: src/summaryview.c:1316
+#: src/summaryview.c:1319
 msgid "No unread messages."
 msgstr "Non hai mensaxes sin leer."
 
-#: src/summaryview.c:1323
+#: src/summaryview.c:1326
 msgid "No unread message found. Go to next folder?"
 msgstr "Non hai mensaxes sen ler. ¿Ir á carpeta seguinte?"
 
-#: src/summaryview.c:1331 src/summaryview.c:1340
+#: src/summaryview.c:1334 src/summaryview.c:1343
 msgid "No more new messages"
 msgstr "Non hai mais mensaxes novas"
 
-#: src/summaryview.c:1332
+#: src/summaryview.c:1335
 msgid "No new message found. Search from the end?"
 msgstr "Non hai mais mensaxes novas. ¿Buscar dende o final?"
 
-#: src/summaryview.c:1334
+#: src/summaryview.c:1337
 msgid "No new messages."
 msgstr "Non hai mensaxes novas."
 
-#: src/summaryview.c:1341
+#: src/summaryview.c:1344
 msgid "No new message found. Go to next folder?"
 msgstr "Non hai máis mensaxes novas. ¿Ir a a carpeta seguinte?"
 
-#: src/summaryview.c:1349 src/summaryview.c:1358
+#: src/summaryview.c:1352 src/summaryview.c:1361
 msgid "No more marked messages"
 msgstr "Non hai mais mensaxes marcadas"
 
-#: src/summaryview.c:1350
+#: src/summaryview.c:1353
 msgid "No marked message found. Search from the end?"
 msgstr "Non hai mensaxes marcadas. ¿Buscar dende o final?"
 
-#: src/summaryview.c:1352 src/summaryview.c:1361
+#: src/summaryview.c:1355 src/summaryview.c:1364
 msgid "No marked messages."
 msgstr "Non hai mensaxes marcadas."
 
-#: src/summaryview.c:1359
+#: src/summaryview.c:1362
 msgid "No marked message found. Search from the beginning?"
 msgstr "Non hai mensaxes marcadas. ¿Buscar dende o principio?"
 
-#: src/summaryview.c:1367 src/summaryview.c:1376
+#: src/summaryview.c:1370 src/summaryview.c:1379
 msgid "No more labeled messages"
 msgstr "Non hai mais mensaxes etiquetadas"
 
-#: src/summaryview.c:1368
+#: src/summaryview.c:1371
 msgid "No labeled message found. Search from the end?"
 msgstr "Non hai mensaxes etiquetadas. ¿Buscar dende o final?"
 
-#: src/summaryview.c:1370 src/summaryview.c:1379
+#: src/summaryview.c:1373 src/summaryview.c:1382
 msgid "No labeled messages."
 msgstr "Non hai mensaxes etiquetadas."
 
-#: src/summaryview.c:1377
+#: src/summaryview.c:1380
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Non hai mensaxes etiquetadas. ¿Buscar dende o principio?"
 
-#: src/summaryview.c:1693
+#: src/summaryview.c:1696
 msgid "Attracting messages by subject..."
 msgstr "Agrupando mensaxes por asunto..."
 
-#: src/summaryview.c:1887
+#: src/summaryview.c:1890
 #, c-format
 msgid "%d deleted"
 msgstr "%d borrados"
 
-#: src/summaryview.c:1891
+#: src/summaryview.c:1894
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d movidos"
 
-#: src/summaryview.c:1892 src/summaryview.c:1897
+#: src/summaryview.c:1895 src/summaryview.c:1900
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:1896
+#: src/summaryview.c:1899
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d copiado"
 
-#: src/summaryview.c:1911
+#: src/summaryview.c:1914
 msgid " item(s) selected"
 msgstr " elemento(s) seleccionados"
 
-#: src/summaryview.c:1933
+#: src/summaryview.c:1936
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d novas, %d non leídos, %d totales (%s)"
 
-#: src/summaryview.c:1937
+#: src/summaryview.c:1940
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d novas, %d non leídos, %d totales"
 
-#: src/summaryview.c:1971
+#: src/summaryview.c:1974
 msgid "Sorting summary..."
 msgstr "Ordeando cabeceiras..."
 
-#: src/summaryview.c:2194
+#: src/summaryview.c:2211
 msgid "\tSetting summary from message data..."
 msgstr "\tExtraindo cabeceiras das mensaxes..."
 
-#: src/summaryview.c:2196
+#: src/summaryview.c:2213
 msgid "Setting summary from message data..."
 msgstr "Resumindo as mensaxes..."
 
-#: src/summaryview.c:2302
+#: src/summaryview.c:2319
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Escribindo caché resumo (%s)..."
 
-#: src/summaryview.c:2643
+#: src/summaryview.c:2660
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Mensaxe %d está marcado\n"
 
-#: src/summaryview.c:2701
+#: src/summaryview.c:2718
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Mensaxe %d marcada como leído\n"
 
-#: src/summaryview.c:2789
+#: src/summaryview.c:2908
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Mensaxe %d marcada como non leído\n"
 
-#: src/summaryview.c:2850
+#: src/summaryview.c:2969
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Mensaxe %s/%d marcada para borrar\n"
 
-#: src/summaryview.c:2878
+#: src/summaryview.c:2997
 msgid "Delete message(s)"
 msgstr "Borrar mensaxe(s)"
 
-#: src/summaryview.c:2879
+#: src/summaryview.c:2998
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "¿Quere realmente borrar a/as mensaxe(s) da papeleira?"
 
-#: src/summaryview.c:2953
+#: src/summaryview.c:3072
 msgid "Deleting duplicated messages..."
 msgstr "Borrando mensaxes duplicadas..."
 
-#: src/summaryview.c:2991
+#: src/summaryview.c:3110
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Mensaxe %s/%d desmarcada\n"
 
-#: src/summaryview.c:3049
+#: src/summaryview.c:3168
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Mensaxe %d marcada para mover a %s\n"
 
-#: src/summaryview.c:3066
+#: src/summaryview.c:3196
 msgid "Destination is same as current folder."
 msgstr "o destino e o mismo que a carpeta actual."
 
-#: src/summaryview.c:3122
+#: src/summaryview.c:3260
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Mensaxe %d marcada para copiar a %s\n"
 
-#: src/summaryview.c:3139
+#: src/summaryview.c:3288
 #, fuzzy
 msgid "Destination for copy is same as current folder."
 msgstr "o destino de copia é a carpeta actual."
 
-#: src/summaryview.c:3338
+#: src/summaryview.c:3495
 #, fuzzy
 msgid "Error occurred while processing messages."
 msgstr "Ocurriu un erro mentras se procesaba o correo."
 
-#: src/summaryview.c:3646 src/summaryview.c:3647
+#: src/summaryview.c:3803 src/summaryview.c:3804
 msgid "Building threads..."
 msgstr "Construindo xerarquía..."
 
-#: src/summaryview.c:3797 src/summaryview.c:3798
+#: src/summaryview.c:3954 src/summaryview.c:3955
 msgid "Unthreading..."
 msgstr "Desfacendo xerarquía..."
 
-#: src/summaryview.c:4091 src/summaryview.c:4147
+#: src/summaryview.c:4248 src/summaryview.c:4304
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtrando..."
 
-#: src/summaryview.c:4196
+#: src/summaryview.c:4353
 msgid "filtering..."
 msgstr "filtrando..."
 
-#: src/summaryview.c:4197
+#: src/summaryview.c:4354
 msgid "Filtering..."
 msgstr "Filtrando..."
 
-#: src/summaryview.c:4233
+#: src/summaryview.c:4390
 #, fuzzy, c-format
 msgid "%d message(s) have been filtered."
 msgstr "o mensaxe %d xa esta en caché.\n"
 
-#: src/summaryview.c:4742
+#: src/summaryview.c:4899
 msgid "No."
 msgstr "Non."
 
@@ -6643,36 +6674,36 @@ msgstr "Creando vista de texto...\n"
 msgid "This message can't be displayed.\n"
 msgstr "unha mensaxe non será recibido\n"
 
-#: src/textview.c:1929
+#: src/textview.c:1925
 #, fuzzy
 msgid "Sa_ve this image as..."
 msgstr "/_Gardar como..."
 
-#: src/textview.c:1945 src/trayicon.c:109
+#: src/textview.c:1941 src/trayicon.c:109
 #, fuzzy
 msgid "Compose _new message"
 msgstr "Compoñer mensaxe novo"
 
-#: src/textview.c:1947
+#: src/textview.c:1943
 #, fuzzy
 msgid "Add to address _book..."
 msgstr "/Engadir _remitente á axenda"
 
-#: src/textview.c:1949
+#: src/textview.c:1945
 #, fuzzy
 msgid "Copy this add_ress"
 msgstr "Enderezo común"
 
-#: src/textview.c:1952
+#: src/textview.c:1948
 #, fuzzy
 msgid "_Open with Web browser"
 msgstr "Navegador web"
 
-#: src/textview.c:1954
+#: src/textview.c:1950
 msgid "Copy this _link"
 msgstr ""
 
-#: src/textview.c:2097
+#: src/textview.c:2093
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6681,7 +6712,7 @@ msgid ""
 "Open it anyway?"
 msgstr ""
 
-#: src/textview.c:2102
+#: src/textview.c:2098
 msgid "Fake URL warning"
 msgstr ""
 
diff --git a/po/hr.po b/po/hr.po
index 04bd85c2..f7eb71e3 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: 2006-01-27 18:11+0900\n"
+"POT-Creation-Date: 2006-01-31 15:20+0900\n"
 "PO-Revision-Date: 2001-09-17 13:22+0100\n"
 "Last-Translator: Ante Karamatić <ante@cdnet.com.hr>\n"
 "Language-Team: Croatian <lokalizacija@linux.hr>\n"
@@ -511,7 +511,7 @@ msgstr "Pronađen %s\n"
 msgid "Configuration is saved.\n"
 msgstr "Konfiguracija je spremljena.\n"
 
-#: libsylph/prefs_common.c:489
+#: libsylph/prefs_common.c:491
 #, fuzzy
 msgid "Junk mail filter"
 msgstr "Spis"
@@ -629,8 +629,8 @@ msgstr ""
 msgid "%.2fGB"
 msgstr ""
 
-#: libsylph/utils.c:2373 src/compose.c:2858 src/compose.c:3121
-#: src/compose.c:3184 src/compose.c:3304
+#: libsylph/utils.c:2373 src/compose.c:2867 src/compose.c:3130
+#: src/compose.c:3193 src/compose.c:3313
 msgid "can't change file mode\n"
 msgstr "ne mogu promjeniti atribut datoteke\n"
 
@@ -716,8 +716,8 @@ msgstr ""
 "Nove poruke biti će provjerene ovim redom. Označite pod\n"
 "S one račune s kojih želite skinuti poštu sa `Primi sve'."
 
-#: src/account_dialog.c:366 src/addressadd.c:192 src/addressbook.c:491
-#: src/compose.c:4262 src/editaddress.c:200 src/editaddress.c:942
+#: src/account_dialog.c:366 src/addressadd.c:192 src/addressbook.c:493
+#: src/compose.c:4271 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:206 src/prefs_filter.c:259 src/prefs_folder_item.c:171
@@ -850,12 +850,12 @@ msgstr ""
 msgid "Add Address to Book"
 msgstr "Dodaj adresu u adresar"
 
-#: src/addressadd.c:202 src/compose.c:4762 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4771 src/editaddress.c:201
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "Adresa"
 
-#: src/addressadd.c:212 src/addressbook.c:493 src/editaddress.c:202
+#: src/addressadd.c:212 src/addressbook.c:495 src/editaddress.c:202
 #: src/editaddress.c:795 src/editaddress.c:860 src/editgroup.c:267
 msgid "Remarks"
 msgstr "Bilješke"
@@ -864,184 +864,184 @@ msgstr "Bilješke"
 msgid "Select Address Book Folder"
 msgstr "Odaberite spis adresara"
 
-#: src/addressbook.c:336 src/compose.c:515 src/mainwindow.c:477
+#: src/addressbook.c:338 src/compose.c:515 src/mainwindow.c:480
 #: src/messageview.c:138
 msgid "/_File"
 msgstr "/_Datoteka"
 
-#: src/addressbook.c:337
+#: src/addressbook.c:339
 msgid "/_File/New _Book"
 msgstr "/_Datoteka/Nova _knjiga"
 
-#: src/addressbook.c:338
+#: src/addressbook.c:340
 msgid "/_File/New _vCard"
 msgstr "/_Datoteka/Nova _V-kartica"
 
-#: src/addressbook.c:340
+#: src/addressbook.c:342
 #, fuzzy
 msgid "/_File/New _JPilot"
 msgstr "/_Datoteka/Novi _J-Pilot"
 
-#: src/addressbook.c:343
+#: src/addressbook.c:345
 msgid "/_File/New _Server"
 msgstr "/_Datoteka/Novi _poslužitelj"
 
-#: src/addressbook.c:345 src/addressbook.c:348 src/compose.c:520
-#: src/compose.c:525 src/compose.c:528 src/compose.c:531 src/mainwindow.c:495
-#: src/mainwindow.c:498 src/mainwindow.c:500 src/mainwindow.c:503
-#: src/mainwindow.c:505 src/messageview.c:141
+#: src/addressbook.c:347 src/addressbook.c:350 src/compose.c:520
+#: src/compose.c:525 src/compose.c:528 src/compose.c:531 src/mainwindow.c:498
+#: src/mainwindow.c:501 src/mainwindow.c:503 src/mainwindow.c:506
+#: src/mainwindow.c:508 src/messageview.c:141
 msgid "/_File/---"
 msgstr "/_Datoteka/---"
 
-#: src/addressbook.c:346
+#: src/addressbook.c:348
 msgid "/_File/_Edit"
 msgstr "/_Datoteka/_Uredi"
 
-#: src/addressbook.c:347
+#: src/addressbook.c:349
 msgid "/_File/_Delete"
 msgstr "/_Datoteka/_Obriši"
 
-#: src/addressbook.c:349
+#: src/addressbook.c:351
 msgid "/_File/_Save"
 msgstr "/_Datoteka/_Spremi"
 
-#: src/addressbook.c:350 src/compose.c:532 src/messageview.c:142
+#: src/addressbook.c:352 src/compose.c:532 src/messageview.c:142
 msgid "/_File/_Close"
 msgstr "/_Datoteka/_Zatvori"
 
-#: src/addressbook.c:351
+#: src/addressbook.c:353
 msgid "/_Address"
 msgstr "/_Adresa"
 
-#: src/addressbook.c:352
+#: src/addressbook.c:354
 msgid "/_Address/New _Address"
 msgstr "/_Adresa/Nova _adresa"
 
-#: src/addressbook.c:353
+#: src/addressbook.c:355
 msgid "/_Address/New _Group"
 msgstr "/_Adresa/Nova _grupa"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:356
 msgid "/_Address/New _Folder"
 msgstr "/_Adresa/Novi _spis"
 
-#: src/addressbook.c:355
+#: src/addressbook.c:357
 msgid "/_Address/---"
 msgstr "/_Adresa/---"
 
-#: src/addressbook.c:356
+#: src/addressbook.c:358
 msgid "/_Address/_Edit"
 msgstr "/_Adresa/_Uredi"
 
-#: src/addressbook.c:357
+#: src/addressbook.c:359
 msgid "/_Address/_Delete"
 msgstr "/_Adresa/O_briši"
 
-#: src/addressbook.c:358 src/compose.c:639 src/mainwindow.c:738
-#: src/messageview.c:259
+#: src/addressbook.c:360 src/compose.c:645 src/mainwindow.c:749
+#: src/messageview.c:264
 msgid "/_Tools"
 msgstr "/_Alati"
 
-#: src/addressbook.c:359
+#: src/addressbook.c:361
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Datoteka/Unesi _LDIF datoteku"
 
-#: src/addressbook.c:360 src/compose.c:658 src/mainwindow.c:788
-#: src/messageview.c:277
+#: src/addressbook.c:362 src/compose.c:664 src/mainwindow.c:799
+#: src/messageview.c:282
 msgid "/_Help"
 msgstr "/_Pomoć"
 
-#: src/addressbook.c:361 src/compose.c:659 src/mainwindow.c:799
-#: src/messageview.c:278
+#: src/addressbook.c:363 src/compose.c:665 src/mainwindow.c:810
+#: src/messageview.c:283
 msgid "/_Help/_About"
 msgstr "/_Pomoć/_O"
 
-#: src/addressbook.c:380 src/addressbook.c:390
+#: src/addressbook.c:382 src/addressbook.c:392
 msgid "/New _Address"
 msgstr "/Nova _adresa"
 
-#: src/addressbook.c:381 src/addressbook.c:391
+#: src/addressbook.c:383 src/addressbook.c:393
 msgid "/New _Group"
 msgstr "/Nova _grupa"
 
-#: src/addressbook.c:382 src/addressbook.c:392
+#: src/addressbook.c:384 src/addressbook.c:394
 msgid "/New _Folder"
 msgstr "/Novi _spis"
 
-#: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:509
+#: src/addressbook.c:385 src/addressbook.c:395 src/compose.c:509
 #: src/folderview.c:246 src/folderview.c:248 src/folderview.c:253
 #: src/folderview.c:266 src/folderview.c:268 src/folderview.c:270
 #: src/folderview.c:275 src/folderview.c:289 src/folderview.c:291
 #: src/folderview.c:295 src/summaryview.c:414 src/summaryview.c:418
-#: src/summaryview.c:421 src/summaryview.c:431 src/summaryview.c:433
-#: src/summaryview.c:435 src/summaryview.c:447 src/summaryview.c:453
+#: src/summaryview.c:421 src/summaryview.c:433 src/summaryview.c:435
+#: src/summaryview.c:437 src/summaryview.c:449 src/summaryview.c:455
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:534
-#: src/mainwindow.c:509 src/messageview.c:144
+#: src/addressbook.c:386 src/addressbook.c:396 src/compose.c:534
+#: src/mainwindow.c:512 src/messageview.c:144
 msgid "/_Edit"
 msgstr "/_Uredi"
 
-#: src/addressbook.c:385 src/addressbook.c:395 src/summaryview.c:432
+#: src/addressbook.c:387 src/addressbook.c:397 src/summaryview.c:434
 msgid "/_Delete"
 msgstr "/_Obriši"
 
-#: src/addressbook.c:492
+#: src/addressbook.c:494
 msgid "E-Mail address"
 msgstr "E-mail adresa"
 
-#: src/addressbook.c:496 src/compose.c:4763 src/prefs_common_dialog.c:2183
+#: src/addressbook.c:498 src/compose.c:4772 src/prefs_common_dialog.c:2183
 msgid "Address book"
 msgstr "Adresar"
 
-#: src/addressbook.c:596 src/prefs_filter_edit.c:249
+#: src/addressbook.c:600 src/prefs_filter_edit.c:249
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "Ime:"
 
 #. Buttons
-#: src/addressbook.c:628 src/addressbook.c:1680 src/editaddress.c:884
-#: src/editaddress.c:1017 src/mainwindow.c:2391 src/prefs_actions.c:266
+#: src/addressbook.c:632 src/addressbook.c:1684 src/editaddress.c:884
+#: src/editaddress.c:1017 src/mainwindow.c:2402 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
 #: src/prefs_template.c:233
 msgid "Delete"
 msgstr "Obriši"
 
-#: src/addressbook.c:631 src/editaddress.c:890 src/editaddress.c:1023
+#: src/addressbook.c:635 src/editaddress.c:890 src/editaddress.c:1023
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:273 src/prefs_display_header.c:328
 #: src/prefs_filter_edit.c:1550
 msgid "Add"
 msgstr "Dodaj"
 
-#: src/addressbook.c:634
+#: src/addressbook.c:638
 msgid "Lookup"
 msgstr "Potraži"
 
-#: src/addressbook.c:646 src/headerview.c:55 src/prefs_folder_item.c:339
+#: src/addressbook.c:650 src/headerview.c:55 src/prefs_folder_item.c:339
 #: src/prefs_template.c:176
 msgid "To:"
 msgstr "Za:"
 
-#: src/addressbook.c:650 src/prefs_folder_item.c:356 src/prefs_template.c:178
+#: src/addressbook.c:654 src/prefs_folder_item.c:356 src/prefs_template.c:178
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:654 src/prefs_folder_item.c:367
+#: src/addressbook.c:658 src/prefs_folder_item.c:367
 msgid "Bcc:"
 msgstr "Bcc:"
 
 #. Confirm deletion
-#: src/addressbook.c:841
+#: src/addressbook.c:845
 msgid "Delete address(es)"
 msgstr "Obriši adresu/e"
 
-#: src/addressbook.c:842
+#: src/addressbook.c:846
 msgid "Really delete the address(es)?"
 msgstr "Uistinu obrisati adresu/e?"
 
-#: src/addressbook.c:1671
+#: src/addressbook.c:1675
 #, fuzzy, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1050,38 +1050,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:1674 src/folderview.c:2351
+#: src/addressbook.c:1678 src/folderview.c:2351
 msgid "Delete folder"
 msgstr "Obriši spis"
 
-#: src/addressbook.c:1674
+#: src/addressbook.c:1678
 #, fuzzy
 msgid "_Folder only"
 msgstr "Samo spis"
 
-#: src/addressbook.c:1674
+#: src/addressbook.c:1678
 #, fuzzy
 msgid "Folder and _addresses"
 msgstr "Spis i adrese"
 
-#: src/addressbook.c:1679
+#: src/addressbook.c:1683
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Uistinu obrisati `%s' ?"
 
-#: src/addressbook.c:2365 src/addressbook.c:2498
+#: src/addressbook.c:2369 src/addressbook.c:2502
 msgid "New user, could not save index file."
 msgstr "Novi korisnik, ne mogu spretmiti index datoteku."
 
-#: src/addressbook.c:2369 src/addressbook.c:2502
+#: src/addressbook.c:2373 src/addressbook.c:2506
 msgid "New user, could not save address book files."
 msgstr "Novi korisnik, ne mogu spremiti datoteke adresara."
 
-#: src/addressbook.c:2379 src/addressbook.c:2512
+#: src/addressbook.c:2383 src/addressbook.c:2516
 msgid "Old address book converted successfully."
 msgstr "Stari adresar uspješno unešen."
 
-#: src/addressbook.c:2384
+#: src/addressbook.c:2388
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1089,7 +1089,7 @@ msgstr ""
 "Stari adresar ne može biti unešen,\n"
 "ne mogu spremiti novu index datoteku adresara."
 
-#: src/addressbook.c:2397
+#: src/addressbook.c:2401
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1097,7 +1097,7 @@ msgstr ""
 "Ne mogu unjeti adesar,\n"
 "ali sam kreirao nove prazne datoteke adresara."
 
-#: src/addressbook.c:2403
+#: src/addressbook.c:2407
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1105,7 +1105,7 @@ msgstr ""
 "Ne mogu unjeti adresar,\n"
 "ne mogu kreirati nove datoteke adresara."
 
-#: src/addressbook.c:2408
+#: src/addressbook.c:2412
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1113,85 +1113,85 @@ msgstr ""
 "Ne mogu unjeti adresar,\n"
 "i ne mogu stvoriti nove datoteke adresara."
 
-#: src/addressbook.c:2415
+#: src/addressbook.c:2419
 msgid "Addressbook conversion error"
 msgstr "Greška pri unosu adresara"
 
-#: src/addressbook.c:2419
+#: src/addressbook.c:2423
 msgid "Addressbook conversion"
 msgstr "Unos adresara"
 
-#: src/addressbook.c:2454
+#: src/addressbook.c:2458
 msgid "Addressbook Error"
 msgstr "Greška adresara"
 
-#: src/addressbook.c:2455 src/addressbook.c:2555
+#: src/addressbook.c:2459 src/addressbook.c:2559
 msgid "Could not read address index"
 msgstr "Ne mogu čitati index adresara"
 
-#: src/addressbook.c:2517
+#: src/addressbook.c:2521
 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:2531
+#: src/addressbook.c:2535
 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:2537
+#: src/addressbook.c:2541
 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:2543
+#: src/addressbook.c:2547
 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:2561
+#: src/addressbook.c:2565
 msgid "Addressbook Conversion Error"
 msgstr "Greška pri unosu adresara"
 
-#: src/addressbook.c:2567
+#: src/addressbook.c:2571
 msgid "Addressbook Conversion"
 msgstr "Unos adresara"
 
-#: src/addressbook.c:3072 src/prefs_common_dialog.c:2033
+#: src/addressbook.c:3086 src/prefs_common_dialog.c:2033
 msgid "Interface"
 msgstr "Sučelje"
 
-#: src/addressbook.c:3088 src/importldif.c:514
+#: src/addressbook.c:3102 src/importldif.c:514
 msgid "Address Book"
 msgstr "Adresar"
 
-#: src/addressbook.c:3104
+#: src/addressbook.c:3118
 msgid "Person"
 msgstr "Osoba"
 
-#: src/addressbook.c:3120
+#: src/addressbook.c:3134
 msgid "EMail Address"
 msgstr "E-mail adresa"
 
-#: src/addressbook.c:3136
+#: src/addressbook.c:3150
 msgid "Group"
 msgstr "Grupa"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3152 src/folderview.c:367 src/prefs_account_dialog.c:1694
+#: src/addressbook.c:3166 src/folderview.c:367 src/prefs_account_dialog.c:1694
 #: src/query_search.c:370
 msgid "Folder"
 msgstr "Spis"
 
-#: src/addressbook.c:3168
+#: src/addressbook.c:3182
 msgid "vCard"
 msgstr "V-kartica"
 
-#: src/addressbook.c:3184 src/addressbook.c:3200
+#: src/addressbook.c:3198 src/addressbook.c:3214
 #, fuzzy
 msgid "JPilot"
 msgstr "J-Pilot"
 
-#: src/addressbook.c:3216
+#: src/addressbook.c:3230
 msgid "LDAP Server"
 msgstr "LDAP Poslužitelj"
 
@@ -1203,7 +1203,7 @@ msgstr "Uobičajene adrese"
 msgid "Personal address"
 msgstr "Osobne adrese"
 
-#: src/alertpanel.c:141 src/compose.c:5485 src/main.c:573
+#: src/alertpanel.c:141 src/compose.c:5494 src/main.c:573
 msgid "Notice"
 msgstr "Obavijest"
 
@@ -1254,7 +1254,7 @@ msgstr "Smeđa"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4593
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4750
 msgid "None"
 msgstr "Ništa"
 
@@ -1317,7 +1317,7 @@ msgstr "/_Uredi/_Undo"
 msgid "/_Edit/_Redo"
 msgstr "/_Uredi/_Redo"
 
-#: src/compose.c:537 src/compose.c:544 src/mainwindow.c:513
+#: src/compose.c:537 src/compose.c:544 src/mainwindow.c:516
 #: src/messageview.c:147
 msgid "/_Edit/---"
 msgstr "/_Uredi/---"
@@ -1326,7 +1326,7 @@ msgstr "/_Uredi/---"
 msgid "/_Edit/Cu_t"
 msgstr "/_Uredi/R_eži"
 
-#: src/compose.c:539 src/mainwindow.c:510 src/messageview.c:145
+#: src/compose.c:539 src/mainwindow.c:513 src/messageview.c:145
 msgid "/_Edit/_Copy"
 msgstr "/_Uredi/_Kopiraj"
 
@@ -1339,7 +1339,7 @@ msgstr "/_Uredi/U_baci"
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Uredi/U_baci"
 
-#: src/compose.c:543 src/mainwindow.c:511 src/messageview.c:146
+#: src/compose.c:543 src/mainwindow.c:514 src/messageview.c:146
 msgid "/_Edit/Select _all"
 msgstr "/_Uredi/Odaberi _sve"
 
@@ -1356,8 +1356,8 @@ msgstr "/_Uredi/Sažmi sve duge _linije"
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Uredi/_Kopiraj"
 
-#: src/compose.c:550 src/mainwindow.c:518 src/messageview.c:151
-#: src/summaryview.c:448
+#: src/compose.c:550 src/mainwindow.c:521 src/messageview.c:151
+#: src/summaryview.c:450
 msgid "/_View"
 msgstr "/_Pregled"
 
@@ -1382,9 +1382,9 @@ msgid "/_View/_Reply to"
 msgstr "/_Pregled/_Znakovni standard"
 
 #: src/compose.c:555 src/compose.c:557 src/compose.c:559 src/compose.c:561
-#: src/mainwindow.c:538 src/mainwindow.c:541 src/mainwindow.c:568
-#: src/mainwindow.c:592 src/mainwindow.c:687 src/mainwindow.c:691
-#: src/messageview.c:236
+#: src/mainwindow.c:541 src/mainwindow.c:544 src/mainwindow.c:571
+#: src/mainwindow.c:595 src/mainwindow.c:696 src/mainwindow.c:700
+#: src/messageview.c:241
 msgid "/_View/---"
 msgstr "/_Pregled/---"
 
@@ -1403,7 +1403,7 @@ msgstr "/_Pregled/Pr_egledaj izvor"
 msgid "/_View/_Attachment"
 msgstr "Prilog"
 
-#: src/compose.c:567 src/mainwindow.c:599 src/messageview.c:158
+#: src/compose.c:567 src/mainwindow.c:602 src/messageview.c:158
 #, fuzzy
 msgid "/_View/Character _encoding"
 msgstr "/_Pregled/Pr_egledaj izvor"
@@ -1413,245 +1413,256 @@ msgid "/_View/Character _encoding/_Automatic"
 msgstr ""
 
 #: src/compose.c:570 src/compose.c:576 src/compose.c:582 src/compose.c:586
-#: src/compose.c:592 src/compose.c:596 src/compose.c:602 src/compose.c:606
-#: src/compose.c:616 src/compose.c:620 src/compose.c:628 src/compose.c:632
-#: src/mainwindow.c:595 src/mainwindow.c:602 src/messageview.c:154
+#: src/compose.c:592 src/compose.c:596 src/compose.c:602 src/compose.c:608
+#: src/compose.c:612 src/compose.c:622 src/compose.c:626 src/compose.c:634
+#: src/compose.c:638 src/mainwindow.c:598 src/mainwindow.c:605
+#: src/messageview.c:154
 #, fuzzy
 msgid "/_View/Character _encoding/---"
 msgstr "/_Pregled/Pr_egledaj izvor"
 
-#: src/compose.c:572 src/mainwindow.c:603 src/messageview.c:162
+#: src/compose.c:572 src/mainwindow.c:606 src/messageview.c:162
 #, fuzzy
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Pregled/_Znakovni standard/7bit ascii (US-ASC_II)"
 
-#: src/compose.c:574 src/mainwindow.c:605 src/messageview.c:165
+#: src/compose.c:574 src/mainwindow.c:608 src/messageview.c:165
 #, fuzzy
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Pregled/_Znakovni standard/Unicode (_UTF-8)"
 
-#: src/compose.c:578 src/mainwindow.c:609 src/messageview.c:168
+#: src/compose.c:578 src/mainwindow.c:612 src/messageview.c:168
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Pregled/_Znakovni standard/Zapadna Europa (ISO-8859-_1)"
 
-#: src/compose.c:580 src/mainwindow.c:611 src/messageview.c:170
+#: src/compose.c:580 src/mainwindow.c:614 src/messageview.c:170
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Pregled/_Znakovni standard/Zapadna Europa (ISO-8859-_1)"
 
-#: src/compose.c:584 src/mainwindow.c:617 src/messageview.c:175
+#: src/compose.c:584 src/mainwindow.c:620 src/messageview.c:175
 #, fuzzy
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Pregled/_Znakovni standard/Srednja Europa (ISO-8859-_2)"
 
-#: src/compose.c:588 src/mainwindow.c:621 src/messageview.c:178
+#: src/compose.c:588 src/mainwindow.c:624 src/messageview.c:178
 #, fuzzy
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Pregled/_Znakovni standard/_Baltik (ISO-8859-13)"
 
-#: src/compose.c:590 src/mainwindow.c:623 src/messageview.c:180
+#: src/compose.c:590 src/mainwindow.c:626 src/messageview.c:180
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Pregled/_Znakovni standard/Baltik (ISO-8859-_4)"
 
-#: src/compose.c:594 src/mainwindow.c:627 src/messageview.c:183
+#: src/compose.c:594 src/mainwindow.c:630 src/messageview.c:183
 #, fuzzy
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Pregled/_Znakovni standard/Grčka (ISO-8859-_7)"
 
-#: src/compose.c:598 src/mainwindow.c:631 src/messageview.c:186
+#: src/compose.c:598 src/mainwindow.c:634 src/messageview.c:186
+#, fuzzy
+msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
+msgstr "/_Pregled/_Znakovni standard/Baltik (ISO-8859-_4)"
+
+#: src/compose.c:600 src/mainwindow.c:636 src/messageview.c:188
+#, fuzzy
+msgid "/_View/Character _encoding/Arabic (Windows-1256)"
+msgstr "/_Pregled/_Znakovni standard/Čirilica (Windows-1251)"
+
+#: src/compose.c:604 src/mainwindow.c:640 src/messageview.c:191
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Pregled/_Znakovni standard/Grčka (ISO-8859-_7)"
 
-#: src/compose.c:600 src/mainwindow.c:633 src/messageview.c:188
+#: src/compose.c:606 src/mainwindow.c:642 src/messageview.c:193
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Pregled/_Znakovni standard/Čirilica (Windows-1251)"
 
-#: src/compose.c:604 src/mainwindow.c:637 src/messageview.c:191
+#: src/compose.c:610 src/mainwindow.c:646 src/messageview.c:196
 #, fuzzy
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Pregled/_Znakovni standard/Turska (ISO-8859-_9)"
 
-#: src/compose.c:608 src/mainwindow.c:641 src/messageview.c:194
+#: src/compose.c:614 src/mainwindow.c:650 src/messageview.c:199
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Pregled/_Znakovni standard/Čirilica (ISO-8859-_5)"
 
-#: src/compose.c:610 src/mainwindow.c:643 src/messageview.c:196
+#: src/compose.c:616 src/mainwindow.c:652 src/messageview.c:201
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Pregled/_Znakovni standard/Čirilica (KOI8-_R)"
 
-#: src/compose.c:612 src/mainwindow.c:645 src/messageview.c:198
+#: src/compose.c:618 src/mainwindow.c:654 src/messageview.c:203
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Pregled/_Znakovni standard/Čirilica (KOI8-_R)"
 
-#: src/compose.c:614 src/mainwindow.c:647 src/messageview.c:200
+#: src/compose.c:620 src/mainwindow.c:656 src/messageview.c:205
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Pregled/_Znakovni standard/Čirilica (Windows-1251)"
 
-#: src/compose.c:618 src/mainwindow.c:651 src/messageview.c:203
+#: src/compose.c:624 src/mainwindow.c:660 src/messageview.c:208
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Pregled/_Znakovni standard/Japan (ISO-2022-_JP)"
 
-#: src/compose.c:622 src/mainwindow.c:661 src/messageview.c:212
+#: src/compose.c:628 src/mainwindow.c:670 src/messageview.c:217
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Pregled/_Znakovni standard/Pojednostavljeni Kineski (_GB2312)"
 
-#: src/compose.c:624 src/mainwindow.c:663 src/messageview.c:214
+#: src/compose.c:630 src/mainwindow.c:672 src/messageview.c:219
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Pregled/_Znakovni standard/Pojednostavljeni Kineski (_GB2312)"
 
-#: src/compose.c:626 src/mainwindow.c:665 src/messageview.c:216
+#: src/compose.c:632 src/mainwindow.c:674 src/messageview.c:221
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Pregled/_Znakovni standard/Tradicionalni Kineski (_Big5)"
 
-#: src/compose.c:630 src/mainwindow.c:673 src/messageview.c:223
+#: src/compose.c:636 src/mainwindow.c:682 src/messageview.c:228
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Pregled/_Znakovni standard/Koreja (EUC-_KR)"
 
-#: src/compose.c:634 src/mainwindow.c:679 src/messageview.c:228
+#: src/compose.c:640 src/mainwindow.c:688 src/messageview.c:233
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Pregled/_Znakovni standard/Thai (TIS-620)"
 
-#: src/compose.c:636 src/mainwindow.c:681 src/messageview.c:230
+#: src/compose.c:642 src/mainwindow.c:690 src/messageview.c:235
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Pregled/_Znakovni standard/Thai (Windows-874)"
 
-#: src/compose.c:640 src/mainwindow.c:739 src/messageview.c:260
+#: src/compose.c:646 src/mainwindow.c:750 src/messageview.c:265
 #, fuzzy
 msgid "/_Tools/_Address book"
 msgstr "/_Alat/_Adresar"
 
-#: src/compose.c:641
+#: src/compose.c:647
 #, fuzzy
 msgid "/_Tools/_Template"
 msgstr "/_Alat/_Obrazac"
 
-#: src/compose.c:642 src/mainwindow.c:762 src/messageview.c:275
+#: src/compose.c:648 src/mainwindow.c:773 src/messageview.c:280
 #, fuzzy
 msgid "/_Tools/Actio_ns"
 msgstr "/_Izvrši"
 
-#: src/compose.c:643 src/compose.c:647 src/compose.c:653 src/mainwindow.c:742
-#: src/mainwindow.c:756 src/mainwindow.c:761 src/mainwindow.c:763
-#: src/mainwindow.c:766 src/mainwindow.c:768 src/messageview.c:263
-#: src/messageview.c:274
+#: src/compose.c:649 src/compose.c:653 src/compose.c:659 src/mainwindow.c:753
+#: src/mainwindow.c:767 src/mainwindow.c:772 src/mainwindow.c:774
+#: src/mainwindow.c:777 src/mainwindow.c:779 src/messageview.c:268
+#: src/messageview.c:279
 #, fuzzy
 msgid "/_Tools/---"
 msgstr "/_Alat"
 
-#: src/compose.c:644
+#: src/compose.c:650
 #, fuzzy
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/_Uredi/Uredi s _vanjskim uređivačem"
 
-#: src/compose.c:648
+#: src/compose.c:654
 #, fuzzy
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Izvrši"
 
-#: src/compose.c:649
+#: src/compose.c:655
 #, fuzzy
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/_Poruka/_Kriptiraj"
 
-#: src/compose.c:654
+#: src/compose.c:660
 #, fuzzy
 msgid "/_Tools/_Check spell"
 msgstr "/_Izvrši"
 
-#: src/compose.c:655
+#: src/compose.c:661
 #, fuzzy
 msgid "/_Tools/_Set spell language"
 msgstr "/_Alat/_Obrazac"
 
-#: src/compose.c:899
+#: src/compose.c:908
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: datoteka ne postoji\n"
 
-#: src/compose.c:1003 src/compose.c:1074
+#: src/compose.c:1012 src/compose.c:1083
 msgid "Can't get text part\n"
 msgstr "Ne mogu dobiti dio tekst\n"
 
-#: src/compose.c:1475
+#: src/compose.c:1484
 msgid "Quote mark format error."
 msgstr "Greška formata citata."
 
-#: src/compose.c:1487
+#: src/compose.c:1496
 msgid "Message reply/forward format error."
 msgstr "Greška poruke odgovori/proslijedi."
 
-#: src/compose.c:1907
+#: src/compose.c:1916
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Datoteka %s ne postoji\n"
 
-#: src/compose.c:1911
+#: src/compose.c:1920
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Ne mogu dobiti veličinu datoteke %s\n"
 
-#: src/compose.c:1915
+#: src/compose.c:1924
 #, fuzzy, c-format
 msgid "File %s is empty."
 msgstr "Datoteka %s je prazna\n"
 
-#: src/compose.c:1919
+#: src/compose.c:1928
 #, fuzzy, c-format
 msgid "Can't read %s."
 msgstr "ne mogu kreirati %s\n"
 
-#: src/compose.c:1952
+#: src/compose.c:1961
 #, c-format
 msgid "Message: %s"
 msgstr "Poruka: %s"
 
-#: src/compose.c:2012 src/mimeview.c:565
+#: src/compose.c:2021 src/mimeview.c:565
 msgid "Can't get the part of multipart message."
 msgstr "Ne mogu dobiti dio višedjelne poruke."
 
-#: src/compose.c:2496 src/headerview.c:195 src/query_search.c:636
-#: src/summaryview.c:2107
+#: src/compose.c:2505 src/headerview.c:195 src/query_search.c:636
+#: src/summaryview.c:2124
 msgid "(No Subject)"
 msgstr "(Bez teme)"
 
-#: src/compose.c:2499
+#: src/compose.c:2508
 #, fuzzy, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Pisanje poruke%s"
 
-#: src/compose.c:2612
+#: src/compose.c:2621
 msgid "Recipient is not specified."
 msgstr "Nije upisan primatelj."
 
-#: src/compose.c:2620
+#: src/compose.c:2629
 #, fuzzy
 msgid "Empty subject"
 msgstr "Tema"
 
-#: src/compose.c:2621
+#: src/compose.c:2630
 msgid "Subject is empty. Send it anyway?"
 msgstr ""
 
-#: src/compose.c:2680
+#: src/compose.c:2689
 msgid "can't get recipient list."
 msgstr "ne mogu dobiti listu primatelja."
 
-#: src/compose.c:2700
+#: src/compose.c:2709
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1659,21 +1670,21 @@ msgstr ""
 "Račun za slanje pošte nije definiran.\n"
 "Molim, odaberite račun prije slanja."
 
-#: src/compose.c:2714 src/send_message.c:299
+#: src/compose.c:2723 src/send_message.c:299
 #, 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:2756
+#: src/compose.c:2765
 msgid "Can't save the message to outbox."
 msgstr "Ne mogu snimiti poruku u spis poslano."
 
-#: src/compose.c:2794
+#: src/compose.c:2803
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr ""
 
-#: src/compose.c:2891
+#: src/compose.c:2900
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1681,12 +1692,12 @@ msgid ""
 "Send it as %s anyway?"
 msgstr "Ne mogu promjeniti charset poruke."
 
-#: src/compose.c:2897
+#: src/compose.c:2906
 #, fuzzy
 msgid "Code conversion error"
 msgstr "Greška pri unosu adresara"
 
-#: src/compose.c:2970
+#: src/compose.c:2979
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1695,162 +1706,162 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:2974
+#: src/compose.c:2983
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3264
+#: src/compose.c:3273
 msgid "can't remove the old message\n"
 msgstr "ne mogu ukloniti staru poruku\n"
 
-#: src/compose.c:3282
+#: src/compose.c:3291
 msgid "queueing message...\n"
 msgstr "odlažem poruku...\n"
 
-#: src/compose.c:3364
+#: src/compose.c:3373
 #, fuzzy
 msgid "can't find queue folder\n"
 msgstr "ne mogu odabrati spis: %s\n"
 
-#: src/compose.c:3371
+#: src/compose.c:3380
 msgid "can't queue the message\n"
 msgstr "ne mogu odložiti poruku\n"
 
-#: src/compose.c:3964
+#: src/compose.c:3973
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "generiran ID-poruke: %s\n"
 
-#: src/compose.c:4077
+#: src/compose.c:4086
 msgid "Creating compose window...\n"
 msgstr "Stvaram prozor za pisanje...\n"
 
-#: src/compose.c:4128 src/headerview.c:54
+#: src/compose.c:4137 src/headerview.c:54
 msgid "From:"
 msgstr "Od:"
 
-#: src/compose.c:4202
+#: src/compose.c:4211
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/_Izvrši"
 
-#: src/compose.c:4205
+#: src/compose.c:4214
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/_Poruka/_Kriptiraj"
 
-#: src/compose.c:4243 src/compose.c:5317
+#: src/compose.c:4252 src/compose.c:5326
 msgid "MIME type"
 msgstr "MIME tip"
 
 #. S_COL_DATE
-#: src/compose.c:4252 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4740
+#: src/compose.c:4261 src/mimeview.c:197 src/prefs_filter_edit.c:496
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4897
 msgid "Size"
 msgstr "Veličina"
 
-#: src/compose.c:4683 src/mainwindow.c:2324 src/prefs_account_dialog.c:528
+#: src/compose.c:4692 src/mainwindow.c:2335 src/prefs_account_dialog.c:528
 #: src/prefs_common_dialog.c:661
 msgid "Send"
 msgstr "Pošalji"
 
-#: src/compose.c:4684
+#: src/compose.c:4693
 msgid "Send message"
 msgstr "Pošalji poruku"
 
-#: src/compose.c:4692
+#: src/compose.c:4701
 msgid "Send later"
 msgstr "Pošalji kasnije"
 
-#: src/compose.c:4693
+#: src/compose.c:4702
 msgid "Put into queue folder and send later"
 msgstr "Odloži u spis odloženo i pošalji kasnije"
 
-#: src/compose.c:4701
+#: src/compose.c:4710
 msgid "Draft"
 msgstr "Nedovršeno"
 
-#: src/compose.c:4702
+#: src/compose.c:4711
 msgid "Save to draft folder"
 msgstr "Spremi u spis nedovršeno"
 
-#: src/compose.c:4712
+#: src/compose.c:4721
 msgid "Insert"
 msgstr "Unesi"
 
-#: src/compose.c:4713
+#: src/compose.c:4722
 msgid "Insert file"
 msgstr "Unesi datoteku"
 
-#: src/compose.c:4721
+#: src/compose.c:4730
 msgid "Attach"
 msgstr "Priloži"
 
-#: src/compose.c:4722
+#: src/compose.c:4731
 msgid "Attach file"
 msgstr "Priloži datoteku"
 
 #. signature
-#: src/compose.c:4732 src/prefs_account_dialog.c:1208
+#: src/compose.c:4741 src/prefs_account_dialog.c:1208
 #: src/prefs_common_dialog.c:953
 msgid "Signature"
 msgstr "Potpis"
 
-#: src/compose.c:4733
+#: src/compose.c:4742
 #, fuzzy
 msgid "Append signature"
 msgstr "LOŠ potpis"
 
 #. editor
-#: src/compose.c:4742 src/prefs_common_dialog.c:991
+#: src/compose.c:4751 src/prefs_common_dialog.c:991
 #: src/prefs_common_dialog.c:2315
 msgid "Editor"
 msgstr "Uređivač"
 
-#: src/compose.c:4743
+#: src/compose.c:4752
 msgid "Edit with external editor"
 msgstr "Uredi s vanjskim uređivačem"
 
-#: src/compose.c:4751
+#: src/compose.c:4760
 msgid "Linewrap"
 msgstr "Sažimanje"
 
-#: src/compose.c:4752
+#: src/compose.c:4761
 #, fuzzy
 msgid "Wrap all long lines"
 msgstr "/_Uredi/Sažmi sve duge _linije"
 
-#: src/compose.c:5213
+#: src/compose.c:5222
 msgid "Invalid MIME type."
 msgstr "Pogrešan MIME tip"
 
-#: src/compose.c:5231
+#: src/compose.c:5240
 msgid "File doesn't exist or is empty."
 msgstr "Datoteka ne postoji ili je prazna."
 
-#: src/compose.c:5299
+#: src/compose.c:5308
 #, fuzzy
 msgid "Properties"
 msgstr "Postavke"
 
-#: src/compose.c:5319 src/prefs_common_dialog.c:1444
+#: src/compose.c:5328 src/prefs_common_dialog.c:1444
 msgid "Encoding"
 msgstr "Kodiranje"
 
-#: src/compose.c:5342 src/prefs_folder_item.c:202
+#: src/compose.c:5351 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Staza"
 
-#: src/compose.c:5343
+#: src/compose.c:5352
 msgid "File name"
 msgstr "Ime datoteke"
 
-#: src/compose.c:5436
+#: src/compose.c:5445
 #, 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:5482
+#: src/compose.c:5491
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1860,49 +1871,49 @@ msgstr ""
 "Ugasiti proces?\n"
 "grupa procesa: %d"
 
-#: src/compose.c:5857 src/compose.c:5862 src/compose.c:5868
+#: src/compose.c:5866 src/compose.c:5871 src/compose.c:5877
 msgid "Can't queue the message."
 msgstr "Ne mogu odložiti poruku."
 
-#: src/compose.c:5959
+#: src/compose.c:5968
 #, fuzzy
 msgid "Select files"
 msgstr "Odaberite datoteku"
 
-#: src/compose.c:5982
+#: src/compose.c:5991
 msgid "Select file"
 msgstr "Odaberite datoteku"
 
-#: src/compose.c:6017
+#: src/compose.c:6026
 #, fuzzy
 msgid "Save message"
 msgstr "Pošalji poruku"
 
-#: src/compose.c:6018
+#: src/compose.c:6027
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Ova poruka je promijenjena, odbaciti?"
 
-#: src/compose.c:6020
+#: src/compose.c:6029
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:6062
+#: src/compose.c:6071
 #, fuzzy, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Uistinu obrisati ovaj obrazac?"
 
-#: src/compose.c:6064
+#: src/compose.c:6073
 #, fuzzy
 msgid "Apply template"
 msgstr "Briši obrazac"
 
-#: src/compose.c:6065
+#: src/compose.c:6074
 #, fuzzy
 msgid "_Replace"
 msgstr "Obrazac"
 
-#: src/compose.c:6065
+#: src/compose.c:6074
 #, fuzzy
 msgid "_Insert"
 msgstr "Unesi"
@@ -2347,7 +2358,7 @@ msgstr "Novo"
 
 #. S_COL_MARK
 #: src/folderview.c:412 src/prefs_filter_edit.c:500
-#: src/prefs_summary_column.c:71 src/summaryview.c:509
+#: src/prefs_summary_column.c:71 src/summaryview.c:511
 msgid "Unread"
 msgstr "Nepročitano"
 
@@ -2363,12 +2374,12 @@ msgstr "Postavljam info spisa...\n"
 msgid "Setting folder info..."
 msgstr "Postavljam info spisa..."
 
-#: src/folderview.c:858 src/mainwindow.c:3464 src/setup.c:80
+#: src/folderview.c:858 src/mainwindow.c:3481 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Pretražujem spise %s%c%s ..."
 
-#: src/folderview.c:862 src/mainwindow.c:3469 src/setup.c:85
+#: src/folderview.c:862 src/mainwindow.c:3486 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Pretražujem spis %s ..."
@@ -2397,7 +2408,7 @@ msgstr "Osvježavam stablo spisa..."
 msgid "Checking for new messages in all folders..."
 msgstr "Kreiranje nove pošte"
 
-#: src/folderview.c:1200 src/mainwindow.c:2400 src/prefs_common_dialog.c:1789
+#: src/folderview.c:1200 src/mainwindow.c:2411 src/prefs_common_dialog.c:1789
 msgid "Junk"
 msgstr ""
 
@@ -2537,7 +2548,7 @@ msgstr "Tema:"
 msgid "Creating header view...\n"
 msgstr "Stvaram pregled zaglavlja...\n"
 
-#: src/headerview.c:180 src/query_search.c:637 src/summaryview.c:2110
+#: src/headerview.c:180 src/query_search.c:637 src/summaryview.c:2127
 msgid "(No From)"
 msgstr "(Bez pošiljatelja)"
 
@@ -2656,7 +2667,7 @@ msgstr "Unesi LDIF datoteku u Adresar"
 msgid "Prev"
 msgstr "Postav"
 
-#: src/importldif.c:768 src/mainwindow.c:2420
+#: src/importldif.c:768 src/mainwindow.c:2431
 msgid "Next"
 msgstr "Slijedeća"
 
@@ -3003,745 +3014,750 @@ msgstr ""
 msgid "another Sylpheed is already running.\n"
 msgstr "drugi Sylpheed već radi.\n"
 
-#: src/main.c:1064
+#: src/main.c:1083
 #, fuzzy
 msgid "Migration of configuration"
 msgstr "Pišem konfiguraciju filtera...\n"
 
-#: src/main.c:1065
+#: src/main.c:1084
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
 msgstr ""
 
-#: src/mainwindow.c:478
+#: src/mainwindow.c:481
 msgid "/_File/_Folder"
 msgstr "/_Datoteka/_Spis"
 
-#: src/mainwindow.c:479
+#: src/mainwindow.c:482
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/_Datoteka/_Spis/Kreiraj _novi spis..."
 
-#: src/mainwindow.c:481
+#: src/mainwindow.c:484
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/_Datoteka/_Spis/_Preimenuj spis..."
 
-#: src/mainwindow.c:482
+#: src/mainwindow.c:485
 #, fuzzy
 msgid "/_File/_Folder/_Move folder..."
 msgstr "/_Datoteka/_Spis/_Preimenuj spis..."
 
-#: src/mainwindow.c:483
+#: src/mainwindow.c:486
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/_Datoteka/_Spis/_Obriši spis"
 
-#: src/mainwindow.c:484
+#: src/mainwindow.c:487
 #, fuzzy
 msgid "/_File/_Mailbox"
 msgstr "/_Datoteka/Dodaj _sandučić..."
 
-#: src/mainwindow.c:485
+#: src/mainwindow.c:488
 #, fuzzy
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/_Datoteka/Dodaj _sandučić..."
 
-#: src/mainwindow.c:486
+#: src/mainwindow.c:489
 #, fuzzy
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/_Ukloni sandučić"
 
-#: src/mainwindow.c:487 src/mainwindow.c:492
+#: src/mainwindow.c:490 src/mainwindow.c:495
 #, fuzzy
 msgid "/_File/_Mailbox/---"
 msgstr "/_Datoteka/_Spis"
 
-#: src/mainwindow.c:488
+#: src/mainwindow.c:491
 #, fuzzy
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "Kreiranje nove pošte"
 
-#: src/mainwindow.c:490
+#: src/mainwindow.c:493
 #, fuzzy
 msgid "/_File/_Mailbox/Check for new messages in _all mailboxes"
 msgstr "Kreiranje nove pošte"
 
-#: src/mainwindow.c:493
+#: src/mainwindow.c:496
 #, fuzzy
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "/O_svježi stablo spisa"
 
-#: src/mainwindow.c:496
+#: src/mainwindow.c:499
 msgid "/_File/_Import mbox file..."
 msgstr "/_Datoteka/_Unesi mbox datoteku"
 
-#: src/mainwindow.c:497
+#: src/mainwindow.c:500
 msgid "/_File/_Export to mbox file..."
 msgstr "/_Datoteka/_Izvezi u mbox datoteku..."
 
-#: src/mainwindow.c:499
+#: src/mainwindow.c:502
 #, fuzzy
 msgid "/_File/Empty all _trash"
 msgstr "/_Datotkea/Isprazni s_meće"
 
-#: src/mainwindow.c:501 src/messageview.c:139
+#: src/mainwindow.c:504 src/messageview.c:139
 msgid "/_File/_Save as..."
 msgstr "/_Datoteka/Spremi _kao..."
 
-#: src/mainwindow.c:502 src/messageview.c:140
+#: src/mainwindow.c:505 src/messageview.c:140
 msgid "/_File/_Print..."
 msgstr "/_Datoteka/Is_piši..."
 
-#: src/mainwindow.c:504
+#: src/mainwindow.c:507
 #, fuzzy
 msgid "/_File/_Work offline"
 msgstr "/_Datoteka/_Unesi datoteku"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:507
+#: src/mainwindow.c:510
 msgid "/_File/E_xit"
 msgstr "/_Datoteka/I_zlaz"
 
-#: src/mainwindow.c:512
+#: src/mainwindow.c:515
 #, fuzzy
 msgid "/_Edit/Select _thread"
 msgstr "/_Uredi/Odaberi _sve"
 
-#: src/mainwindow.c:514 src/messageview.c:148
+#: src/mainwindow.c:517 src/messageview.c:148
 #, fuzzy
 msgid "/_Edit/_Find in current message..."
 msgstr "/_Uredi/P_ronađi u poruci"
 
-#: src/mainwindow.c:516
+#: src/mainwindow.c:519
 #, fuzzy
 msgid "/_Edit/_Search messages..."
 msgstr "/_Traži poruka..."
 
-#: src/mainwindow.c:519
+#: src/mainwindow.c:522
 #, fuzzy
 msgid "/_View/Show or hi_de"
 msgstr "/_Pregled/Prikaži s_vo zaglavlje"
 
-#: src/mainwindow.c:520
+#: src/mainwindow.c:523
 #, fuzzy
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/_Pregled/_Stablo spisa"
 
-#: src/mainwindow.c:522
+#: src/mainwindow.c:525
 #, fuzzy
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/_Pregled/_Pregled poruka"
 
-#: src/mainwindow.c:524
+#: src/mainwindow.c:527
 #, fuzzy
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/_Pregled/_Traka alata"
 
-#: src/mainwindow.c:526
+#: src/mainwindow.c:529
 #, fuzzy
 msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/_Pregled/_Traka alata/Slike i tekst"
 
-#: src/mainwindow.c:528
+#: src/mainwindow.c:531
 #, fuzzy
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/_Pregled/_Traka alata/_Slike"
 
-#: src/mainwindow.c:530
+#: src/mainwindow.c:533
 #, fuzzy
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/_Pregled/_Traka alata/_Tekst"
 
-#: src/mainwindow.c:532
+#: src/mainwindow.c:535
 #, fuzzy
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/_Pregled/_Traka alata/_Ništa"
 
-#: src/mainwindow.c:534
+#: src/mainwindow.c:537
 #, fuzzy
 msgid "/_View/Show or hi_de/_Search bar"
 msgstr "/_Pregled/Stat_us traka"
 
-#: src/mainwindow.c:536
+#: src/mainwindow.c:539
 #, fuzzy
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/_Pregled/Stat_us traka"
 
-#: src/mainwindow.c:539
+#: src/mainwindow.c:542
 msgid "/_View/Separate f_older tree"
 msgstr "/_Pregled/Odvoji sta_blo spisa"
 
-#: src/mainwindow.c:540
+#: src/mainwindow.c:543
 #, fuzzy
 msgid "/_View/Separate _message view"
 msgstr "/_Pregled/Odvoji pre_gled poruka"
 
-#: src/mainwindow.c:542
+#: src/mainwindow.c:545
 #, fuzzy
 msgid "/_View/_Sort"
 msgstr "/_Pregled/Pr_egledaj izvor"
 
-#: src/mainwindow.c:543
+#: src/mainwindow.c:546
 #, fuzzy
 msgid "/_View/_Sort/by _number"
 msgstr "/_Održavanje/Pos_loži/Posloži po _broju"
 
-#: src/mainwindow.c:544
+#: src/mainwindow.c:547
 #, fuzzy
 msgid "/_View/_Sort/by s_ize"
 msgstr "/_Održavanje/Pos_loži/Posloži po _veličini"
 
-#: src/mainwindow.c:545
+#: src/mainwindow.c:548
 #, fuzzy
 msgid "/_View/_Sort/by _date"
 msgstr "/_Održavanje/Pos_loži/Posloži po _datumu"
 
-#: src/mainwindow.c:546
+#: src/mainwindow.c:549
 #, fuzzy
 msgid "/_View/_Sort/by t_hread date"
 msgstr "/_Održavanje/Pos_loži/Posloži po _datumu"
 
-#: src/mainwindow.c:547
+#: src/mainwindow.c:550
 #, fuzzy
 msgid "/_View/_Sort/by _from"
 msgstr "/_Održavanje/Pos_loži/Posloži po _pošiljatelju"
 
-#: src/mainwindow.c:548
+#: src/mainwindow.c:551
 #, fuzzy
 msgid "/_View/_Sort/by _recipient"
 msgstr "/_Održavanje/Pos_loži/Posloži po _veličini"
 
-#: src/mainwindow.c:549
+#: src/mainwindow.c:552
 #, fuzzy
 msgid "/_View/_Sort/by _subject"
 msgstr "/_Održavanje/Pos_loži/Posloži po _temi"
 
-#: src/mainwindow.c:550
+#: src/mainwindow.c:553
 #, fuzzy
 msgid "/_View/_Sort/by _color label"
 msgstr "/_Održavanje/Pos_loži/Posloži oznaci _boje"
 
-#: src/mainwindow.c:552
+#: src/mainwindow.c:555
 #, fuzzy
 msgid "/_View/_Sort/by _mark"
 msgstr "/_Održavanje/Pos_loži/Posloži po _oznaci"
 
-#: src/mainwindow.c:553
+#: src/mainwindow.c:556
 #, fuzzy
 msgid "/_View/_Sort/by _unread"
 msgstr "/_Održavanje/Pos_loži/Posloži po _nepročitanom"
 
-#: src/mainwindow.c:554
+#: src/mainwindow.c:557
 #, fuzzy
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/_Održavanje/Pos_loži/Posloži po _prilogu"
 
-#: src/mainwindow.c:556
+#: src/mainwindow.c:559
 #, fuzzy
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/_Održavanje/Pos_loži/Posloži po _nepročitanom"
 
-#: src/mainwindow.c:557 src/mainwindow.c:560
+#: src/mainwindow.c:560 src/mainwindow.c:563
 #, fuzzy
 msgid "/_View/_Sort/---"
 msgstr "/_Pregled/_Znakovni standard/---"
 
-#: src/mainwindow.c:558
+#: src/mainwindow.c:561
 #, fuzzy
 msgid "/_View/_Sort/Ascending"
 msgstr "/_Pregled/Pr_egledaj izvor"
 
-#: src/mainwindow.c:559
+#: src/mainwindow.c:562
 #, fuzzy
 msgid "/_View/_Sort/Descending"
 msgstr "/_Pregled/Pr_egledaj izvor"
 
-#: src/mainwindow.c:561
+#: src/mainwindow.c:564
 #, fuzzy
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/_Održavanje/Pos_loži/P_rivuci po temi"
 
-#: src/mainwindow.c:563
+#: src/mainwindow.c:566
 #, fuzzy
 msgid "/_View/Th_read view"
 msgstr "/_Pregled/_Pregled poruka"
 
-#: src/mainwindow.c:564
+#: src/mainwindow.c:567
 #, fuzzy
 msgid "/_View/E_xpand all threads"
 msgstr "Raširi stablo"
 
-#: src/mainwindow.c:565
+#: src/mainwindow.c:568
 #, fuzzy
 msgid "/_View/Co_llapse all threads"
 msgstr "/_Pregled/Prikaži s_vo zaglavlje"
 
-#: src/mainwindow.c:566
+#: src/mainwindow.c:569
 #, fuzzy
 msgid "/_View/Set display _item..."
 msgstr "/Održavanje/Postavi po_jedinosti prikaza"
 
-#: src/mainwindow.c:569
+#: src/mainwindow.c:572
 #, fuzzy
 msgid "/_View/_Go to"
 msgstr "/_Pregled/_Znakovni standard"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:573
 #, fuzzy
 msgid "/_View/_Go to/_Prev message"
 msgstr "/_Održavanje/Idi pre_ma/_Prethodna poruka"
 
-#: src/mainwindow.c:571
+#: src/mainwindow.c:574
 #, fuzzy
 msgid "/_View/_Go to/_Next message"
 msgstr "/_Održavanje/Idi pre_ma/Slij_edeća poruka"
 
-#: src/mainwindow.c:572 src/mainwindow.c:577 src/mainwindow.c:580
-#: src/mainwindow.c:585 src/mainwindow.c:590
+#: src/mainwindow.c:575 src/mainwindow.c:580 src/mainwindow.c:583
+#: src/mainwindow.c:588 src/mainwindow.c:593
 #, fuzzy
 msgid "/_View/_Go to/---"
 msgstr "/_Pregled/_Znakovni standard/---"
 
-#: src/mainwindow.c:573
+#: src/mainwindow.c:576
 #, fuzzy
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/_Održavanje/Idi pre_ma/Prethodna _nepročitana poruka"
 
-#: src/mainwindow.c:575
+#: src/mainwindow.c:578
 #, fuzzy
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/_Održavanje/Idi pre_ma/_Slijedeća nepročitana poruka"
 
-#: src/mainwindow.c:578
+#: src/mainwindow.c:581
 #, fuzzy
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/_Održavanje/Idi pre_ma/_Prethodna poruka"
 
-#: src/mainwindow.c:579
+#: src/mainwindow.c:582
 #, fuzzy
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/_Održavanje/Idi pre_ma/Slij_edeća poruka"
 
-#: src/mainwindow.c:581
+#: src/mainwindow.c:584
 #, fuzzy
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/_Održavanje/P_rethodna označena poruka"
 
-#: src/mainwindow.c:583
+#: src/mainwindow.c:586
 #, fuzzy
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/_Održavanje/Idi pre_ma/Slijedeća _označena poruka"
 
-#: src/mainwindow.c:586
+#: src/mainwindow.c:589
 #, fuzzy
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/_Održavanje/Idi pre_ma/Pre_thodna label poruka"
 
-#: src/mainwindow.c:588
+#: src/mainwindow.c:591
 #, fuzzy
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/_Održavanje/Idi pre_ma/Slijedeća _label poruka"
 
-#: src/mainwindow.c:591
+#: src/mainwindow.c:594
 #, fuzzy
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Održavanje/_Idi u drugi spis..."
 
-#: src/mainwindow.c:600 src/messageview.c:159
+#: src/mainwindow.c:603 src/messageview.c:159
 #, fuzzy
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Pregled/_Znakovni standard/_Auto detekcija"
 
-#: src/mainwindow.c:613 src/messageview.c:172
+#: src/mainwindow.c:616 src/messageview.c:172
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr "/_Pregled/_Znakovni standard/Zapadna Europa (ISO-8859-_1)"
 
-#: src/mainwindow.c:653 src/messageview.c:205
+#: src/mainwindow.c:662 src/messageview.c:210
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Pregled/_Znakovni standard/Japan (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:655 src/messageview.c:207
+#: src/mainwindow.c:664 src/messageview.c:212
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Pregled/_Znakovni standard/Japan (_EUC-JP)"
 
-#: src/mainwindow.c:657 src/messageview.c:209
+#: src/mainwindow.c:666 src/messageview.c:214
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Pregled/_Znakovni standard/Japan (_Shift__JIS)"
 
-#: src/mainwindow.c:667 src/messageview.c:218
+#: src/mainwindow.c:676 src/messageview.c:223
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Pregled/_Znakovni standard/Tradicionalni Kineski (EUC-_TW)"
 
-#: src/mainwindow.c:669 src/messageview.c:220
+#: src/mainwindow.c:678 src/messageview.c:225
 #, fuzzy
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Pregled/_Znakovni standard/Kina (ISO-2022-_CN)"
 
-#: src/mainwindow.c:675 src/messageview.c:225
+#: src/mainwindow.c:684 src/messageview.c:230
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Pregled/_Znakovni standard/Koreja (ISO-2022-KR)"
 
-#: src/mainwindow.c:688 src/summaryview.c:449
+#: src/mainwindow.c:697 src/summaryview.c:451
 msgid "/_View/Open in new _window"
 msgstr "/_Pregled/Otvori u novom _prozoru"
 
-#: src/mainwindow.c:689 src/messageview.c:237
+#: src/mainwindow.c:698 src/messageview.c:242
 #, fuzzy
 msgid "/_View/Mess_age source"
 msgstr "/_Pregled/Pr_egledaj izvor"
 
-#: src/mainwindow.c:690 src/messageview.c:238
+#: src/mainwindow.c:699 src/messageview.c:243
 msgid "/_View/Show all _header"
 msgstr "/_Pregled/Prikaži s_vo zaglavlje"
 
-#: src/mainwindow.c:692
+#: src/mainwindow.c:701
 #, fuzzy
 msgid "/_View/_Update summary"
 msgstr "/_Pregled/_Znakovni standard"
 
-#: src/mainwindow.c:694 src/messageview.c:240
+#: src/mainwindow.c:703 src/messageview.c:245
 msgid "/_Message"
 msgstr "/_Poruka"
 
-#: src/mainwindow.c:695
+#: src/mainwindow.c:704
 #, fuzzy
 msgid "/_Message/Recei_ve"
 msgstr "/_Pošta/Pre_Uredi"
 
-#: src/mainwindow.c:696
+#: src/mainwindow.c:705
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/_Pošta/Primi poštu sa _svih računa"
 
-#: src/mainwindow.c:698
+#: src/mainwindow.c:707
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/_Pošta/Primi poštu sa _svih računa"
 
-#: src/mainwindow.c:700
+#: src/mainwindow.c:709
 #, fuzzy
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/_Poruka/Pošalji _kasnije"
 
-#: src/mainwindow.c:702
+#: src/mainwindow.c:711
 #, fuzzy
 msgid "/_Message/Recei_ve/---"
 msgstr "/_Pošta/Pre_Uredi"
 
-#: src/mainwindow.c:703
+#: src/mainwindow.c:712
 #, fuzzy
 msgid "/_Message/_Send queued messages"
 msgstr "/_Pošta/Pošalji _odložene poruke"
 
-#: src/mainwindow.c:704 src/mainwindow.c:706 src/mainwindow.c:713
-#: src/mainwindow.c:718 src/mainwindow.c:721 src/mainwindow.c:730
-#: src/mainwindow.c:732 src/mainwindow.c:735 src/messageview.c:243
-#: src/messageview.c:251 src/messageview.c:256
+#: src/mainwindow.c:713 src/mainwindow.c:715 src/mainwindow.c:722
+#: src/mainwindow.c:727 src/mainwindow.c:730 src/mainwindow.c:741
+#: src/mainwindow.c:743 src/mainwindow.c:746 src/messageview.c:248
+#: src/messageview.c:256 src/messageview.c:261
 msgid "/_Message/---"
 msgstr "/_Poruka/---"
 
-#: src/mainwindow.c:705 src/messageview.c:241
+#: src/mainwindow.c:714 src/messageview.c:246
 msgid "/_Message/Compose _new message"
 msgstr "/_Pošta/Kreiraj _novu poruku"
 
-#: src/mainwindow.c:707 src/messageview.c:244
+#: src/mainwindow.c:716 src/messageview.c:249
 msgid "/_Message/_Reply"
 msgstr "/_Pošta/O_dgovori"
 
-#: src/mainwindow.c:708
+#: src/mainwindow.c:717
 #, fuzzy
 msgid "/_Message/Repl_y to"
 msgstr "/_Poruka/O_dgovori"
 
-#: src/mainwindow.c:709 src/messageview.c:245
+#: src/mainwindow.c:718 src/messageview.c:250
 #, fuzzy
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Pošta/Odgovori svi_ma"
 
-#: src/mainwindow.c:710 src/messageview.c:247
+#: src/mainwindow.c:719 src/messageview.c:252
 #, fuzzy
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Pošta/Od_govori pošiljatelju"
 
-#: src/mainwindow.c:711 src/messageview.c:249
+#: src/mainwindow.c:720 src/messageview.c:254
 #, fuzzy
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Pošta/Odgovori svi_ma"
 
-#: src/mainwindow.c:714 src/messageview.c:252
+#: src/mainwindow.c:723 src/messageview.c:257
 msgid "/_Message/_Forward"
 msgstr "/_Pošta/P_roslijedi"
 
-#: src/mainwindow.c:715 src/messageview.c:253
+#: src/mainwindow.c:724 src/messageview.c:258
 #, fuzzy
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Pošta/Proslijedi _kao prilog"
 
-#: src/mainwindow.c:717 src/messageview.c:255
+#: src/mainwindow.c:726 src/messageview.c:260
 #, fuzzy
 msgid "/_Message/Redirec_t"
 msgstr "/_Pošta/Pre_Uredi"
 
-#: src/mainwindow.c:719
+#: src/mainwindow.c:728
 msgid "/_Message/M_ove..."
 msgstr "/_Pošta/Prem_jesti..."
 
-#: src/mainwindow.c:720
+#: src/mainwindow.c:729
 msgid "/_Message/_Copy..."
 msgstr "/_Pošta/Kopir_aj"
 
-#: src/mainwindow.c:722
+#: src/mainwindow.c:731
 msgid "/_Message/_Mark"
 msgstr "/_Pošta/O_znači"
 
-#: src/mainwindow.c:723
+#: src/mainwindow.c:732
 msgid "/_Message/_Mark/_Mark"
 msgstr "/_Pošta/O_znači/_Označi"
 
-#: src/mainwindow.c:724
+#: src/mainwindow.c:733
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/_Pošta/O_znači/_Ukloni oznaku"
 
-#: src/mainwindow.c:725
+#: src/mainwindow.c:734
 msgid "/_Message/_Mark/---"
 msgstr "/_Pošta/O_znači/---"
 
-#: src/mainwindow.c:726
+#: src/mainwindow.c:735
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/_Pošta/O_znači/Označi kao _nepročitano"
 
-#: src/mainwindow.c:727
+#: src/mainwindow.c:736
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/_Pošta/O_znači/Označi kao _pročitano"
 
-#: src/mainwindow.c:729
+#: src/mainwindow.c:738
+#, fuzzy
+msgid "/_Message/_Mark/Mark _thread as read"
+msgstr "/_Pošta/O_znači/Označi kao _pročitano"
+
+#: src/mainwindow.c:740
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/_Pošta/O_znači/Označi sve _pročitano"
 
-#: src/mainwindow.c:731
+#: src/mainwindow.c:742
 msgid "/_Message/_Delete"
 msgstr "/_Pošta/O_briši"
 
-#: src/mainwindow.c:733
+#: src/mainwindow.c:744
 #, fuzzy
 msgid "/_Message/Set as _junk mail"
 msgstr "/_Pošta/Primi novu _poštu"
 
-#: src/mainwindow.c:734
+#: src/mainwindow.c:745
 #, fuzzy
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/_Pošta/Primi novu _poštu"
 
-#: src/mainwindow.c:736 src/messageview.c:257
+#: src/mainwindow.c:747 src/messageview.c:262
 msgid "/_Message/Re-_edit"
 msgstr "/_Pošta/Pre_Uredi"
 
-#: src/mainwindow.c:740
+#: src/mainwindow.c:751
 #, fuzzy
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/Dod_aj pošiljatelja u adresar"
 
-#: src/mainwindow.c:743
+#: src/mainwindow.c:754
 #, fuzzy
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/_Održavanje/_Filtriraj poštu"
 
-#: src/mainwindow.c:745
+#: src/mainwindow.c:756
 #, fuzzy
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Održavanje/_Filtriraj poštu"
 
-#: src/mainwindow.c:747 src/messageview.c:264
+#: src/mainwindow.c:758 src/messageview.c:269
 #, fuzzy
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Održavanje/_Filtriraj poštu"
 
-#: src/mainwindow.c:748 src/messageview.c:266
+#: src/mainwindow.c:759 src/messageview.c:271
 #, fuzzy
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Održavanje/_Filtriraj poštu"
 
-#: src/mainwindow.c:750 src/messageview.c:268
+#: src/mainwindow.c:761 src/messageview.c:273
 #, fuzzy
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Održavanje/_Filtriraj poštu"
 
-#: src/mainwindow.c:752 src/messageview.c:270
+#: src/mainwindow.c:763 src/messageview.c:275
 #, fuzzy
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Održavanje/_Filtriraj poštu"
 
-#: src/mainwindow.c:754 src/messageview.c:272
+#: src/mainwindow.c:765 src/messageview.c:277
 #, fuzzy
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Održavanje/_Filtriraj poštu"
 
-#: src/mainwindow.c:757
+#: src/mainwindow.c:768
 #, fuzzy
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/_Održavanje/_Filtriraj poštu"
 
-#: src/mainwindow.c:759
+#: src/mainwindow.c:770
 #, fuzzy
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/_Održavanje/_Filtriraj poštu"
 
-#: src/mainwindow.c:764
+#: src/mainwindow.c:775
 #, fuzzy
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/_Održavanje/_Obriši duplicirane poruke"
 
-#: src/mainwindow.c:767
+#: src/mainwindow.c:778
 #, fuzzy
 msgid "/_Tools/E_xecute"
 msgstr "/_Izvrši"
 
-#: src/mainwindow.c:769
+#: src/mainwindow.c:780
 #, fuzzy
 msgid "/_Tools/_Log window"
 msgstr "/_Alat/Zapisni prozor"
 
-#: src/mainwindow.c:771
+#: src/mainwindow.c:782
 msgid "/_Configuration"
 msgstr "/_Konfiguracija"
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:783
 msgid "/_Configuration/_Common preferences..."
 msgstr "/_Konfiguracija/U_običajene postavke..."
 
-#: src/mainwindow.c:774
+#: src/mainwindow.c:785
 msgid "/_Configuration/_Filter setting..."
 msgstr "/_Konfiguracija/Postavke _filtera..."
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:787
 msgid "/_Configuration/_Template..."
 msgstr "/_Konfiguracija/_Obrazac..."
 
-#: src/mainwindow.c:777
+#: src/mainwindow.c:788
 #, fuzzy
 msgid "/_Configuration/_Actions..."
 msgstr "/_Konfiguracija/_Uredi račune..."
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:789
 msgid "/_Configuration/---"
 msgstr "/_Konfiguracija/---"
 
-#: src/mainwindow.c:779
+#: src/mainwindow.c:790
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Konfiguracija/_Postavke za trenutni račun..."
 
-#: src/mainwindow.c:781
+#: src/mainwindow.c:792
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Konfiguracija/Kreiraj _novi račun..."
 
-#: src/mainwindow.c:783
+#: src/mainwindow.c:794
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Konfiguracija/_Uredi račune..."
 
-#: src/mainwindow.c:785
+#: src/mainwindow.c:796
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Konfiguracija/Promjeni _trenutni račun"
 
-#: src/mainwindow.c:789
+#: src/mainwindow.c:800
 msgid "/_Help/_Manual"
 msgstr "/_Pomoć/_Priručnik"
 
-#: src/mainwindow.c:790
+#: src/mainwindow.c:801
 msgid "/_Help/_Manual/_English"
 msgstr "/_Pomoć/_Priručnik/_Engleski"
 
-#: src/mainwindow.c:791
+#: src/mainwindow.c:802
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/_Pomoć/_Priručnik/_Japanski"
 
-#: src/mainwindow.c:792
+#: src/mainwindow.c:803
 #, fuzzy
 msgid "/_Help/_FAQ"
 msgstr "/_Pomoć/_O"
 
-#: src/mainwindow.c:793
+#: src/mainwindow.c:804
 #, fuzzy
 msgid "/_Help/_FAQ/_English"
 msgstr "/_Pomoć/_Priručnik/_Engleski"
 
-#: src/mainwindow.c:794
+#: src/mainwindow.c:805
 #, fuzzy
 msgid "/_Help/_FAQ/_German"
 msgstr "/_Pomoć/_Priručnik/_Engleski"
 
-#: src/mainwindow.c:795
+#: src/mainwindow.c:806
 #, fuzzy
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/_Pomoć/_Priručnik/_Engleski"
 
-#: src/mainwindow.c:796
+#: src/mainwindow.c:807
 msgid "/_Help/_FAQ/_French"
 msgstr ""
 
-#: src/mainwindow.c:797
+#: src/mainwindow.c:808
 #, fuzzy
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/_Pomoć/_Priručnik/_Engleski"
 
-#: src/mainwindow.c:798
+#: src/mainwindow.c:809
 msgid "/_Help/---"
 msgstr "/_Pomoć/---"
 
-#: src/mainwindow.c:841
+#: src/mainwindow.c:852
 msgid "Creating main window...\n"
 msgstr "Kreiram glavne prozore...\n"
 
-#: src/mainwindow.c:1011
+#: src/mainwindow.c:1022
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "MainWindow: prikaz boje %d nije uspio\n"
 
-#: src/mainwindow.c:1108 src/summaryview.c:2258 src/summaryview.c:2343
-#: src/summaryview.c:3739 src/summaryview.c:3868 src/summaryview.c:4226
+#: src/mainwindow.c:1119 src/summaryview.c:2275 src/summaryview.c:2360
+#: src/summaryview.c:3896 src/summaryview.c:4025 src/summaryview.c:4383
 msgid "done.\n"
 msgstr "gotovo.\n"
 
-#: src/mainwindow.c:1235 src/mainwindow.c:1276 src/mainwindow.c:1301
+#: src/mainwindow.c:1246 src/mainwindow.c:1287 src/mainwindow.c:1312
 msgid "Untitled"
 msgstr "Neimenovano"
 
-#: src/mainwindow.c:1302
+#: src/mainwindow.c:1313
 msgid "none"
 msgstr "ništa"
 
-#: src/mainwindow.c:1355
+#: src/mainwindow.c:1366
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr ""
 
-#: src/mainwindow.c:1605
+#: src/mainwindow.c:1616
 msgid "Offline"
 msgstr ""
 
-#: src/mainwindow.c:1606
+#: src/mainwindow.c:1617
 msgid "You are offline. Go online?"
 msgstr ""
 
-#: src/mainwindow.c:1623
+#: src/mainwindow.c:1634
 #, fuzzy
 msgid "Empty all trash"
 msgstr "Isprazni smeće"
 
-#: src/mainwindow.c:1624
+#: src/mainwindow.c:1635
 #, fuzzy
 msgid "Delete all messages in trash folders?"
 msgstr "Isprazniti sve poruke u smeću?"
 
-#: src/mainwindow.c:1652
+#: src/mainwindow.c:1663
 msgid "Add mailbox"
 msgstr "Dodaj sandučić"
 
-#: src/mainwindow.c:1653
+#: src/mainwindow.c:1664
 #, fuzzy
 msgid ""
 "Specify the location of mailbox.\n"
@@ -3752,16 +3768,16 @@ msgstr ""
 "Ako je unešen postojeći sandučić, biti će\n"
 "automatski pretražen."
 
-#: src/mainwindow.c:1659 src/setup.c:49
+#: src/mainwindow.c:1670 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Sandučić `%s' već postoji."
 
-#: src/mainwindow.c:1664 src/setup.c:56
+#: src/mainwindow.c:1675 src/setup.c:56
 msgid "Mailbox"
 msgstr "Sandučić"
 
-#: src/mainwindow.c:1670 src/setup.c:62
+#: src/mainwindow.c:1681 src/setup.c:62
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3770,152 +3786,152 @@ msgstr ""
 "Kreiranje sandučića propalo.\n"
 "Možda neke datoteke već postoje ili nemate pravo pisanja u direktoriju."
 
-#: src/mainwindow.c:2088
+#: src/mainwindow.c:2099
 msgid "Sylpheed - Folder View"
 msgstr ""
 
-#: src/mainwindow.c:2107
+#: src/mainwindow.c:2118
 msgid "Sylpheed - Message View"
 msgstr ""
 
-#: src/mainwindow.c:2259 src/summaryview.c:408
+#: src/mainwindow.c:2270 src/summaryview.c:408
 msgid "/_Reply"
 msgstr "/Od_govori"
 
-#: src/mainwindow.c:2260
+#: src/mainwindow.c:2271
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "Odgovara svima"
 
-#: src/mainwindow.c:2261
+#: src/mainwindow.c:2272
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/Odgovor_i pošiljatelju"
 
-#: src/mainwindow.c:2262
+#: src/mainwindow.c:2273
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/Odgovori svi_ma"
 
-#: src/mainwindow.c:2267 src/summaryview.c:415
+#: src/mainwindow.c:2278 src/summaryview.c:415
 msgid "/_Forward"
 msgstr "/Prosli_jedi"
 
-#: src/mainwindow.c:2268 src/summaryview.c:416
+#: src/mainwindow.c:2279 src/summaryview.c:416
 #, fuzzy
 msgid "/For_ward as attachment"
 msgstr "/Proslijedi kao prilo_g"
 
-#: src/mainwindow.c:2269 src/summaryview.c:417
+#: src/mainwindow.c:2280 src/summaryview.c:417
 #, fuzzy
 msgid "/Redirec_t"
 msgstr "/Pre-_uredi"
 
-#: src/mainwindow.c:2305
+#: src/mainwindow.c:2316
 msgid "Get"
 msgstr "Primi"
 
-#: src/mainwindow.c:2306
+#: src/mainwindow.c:2317
 msgid "Incorporate new mail"
 msgstr "Prima novu poštu"
 
-#: src/mainwindow.c:2313
+#: src/mainwindow.c:2324
 msgid "Get all"
 msgstr "Primi sve"
 
-#: src/mainwindow.c:2314
+#: src/mainwindow.c:2325
 msgid "Incorporate new mail of all accounts"
 msgstr "Prima novu poštu sa svih računa"
 
-#: src/mainwindow.c:2325
+#: src/mainwindow.c:2336
 msgid "Send queued message(s)"
 msgstr "Šalje odložene poruke"
 
-#: src/mainwindow.c:2335 src/prefs_account_dialog.c:530
+#: src/mainwindow.c:2346 src/prefs_account_dialog.c:530
 #: src/prefs_common_dialog.c:663 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "Kreiraj"
 
-#: src/mainwindow.c:2336
+#: src/mainwindow.c:2347
 msgid "Compose new message"
 msgstr "Kreiranje nove pošte"
 
-#: src/mainwindow.c:2344 src/prefs_common_dialog.c:975
+#: src/mainwindow.c:2355 src/prefs_common_dialog.c:975
 msgid "Reply"
 msgstr "Odgovori"
 
-#: src/mainwindow.c:2345 src/mainwindow.c:2358
+#: src/mainwindow.c:2356 src/mainwindow.c:2369
 msgid "Reply to the message"
 msgstr "Odgovara na poruku"
 
-#: src/mainwindow.c:2362
+#: src/mainwindow.c:2373
 msgid "Reply all"
 msgstr "Odgovori s."
 
-#: src/mainwindow.c:2363
+#: src/mainwindow.c:2374
 msgid "Reply to all"
 msgstr "Odgovara svima"
 
-#: src/mainwindow.c:2371 src/prefs_filter_edit.c:672
+#: src/mainwindow.c:2382 src/prefs_filter_edit.c:672
 msgid "Forward"
 msgstr "Proslijedi"
 
-#: src/mainwindow.c:2372 src/mainwindow.c:2385
+#: src/mainwindow.c:2383 src/mainwindow.c:2396
 msgid "Forward the message"
 msgstr "Prosljeđuje poruku"
 
-#: src/mainwindow.c:2392
+#: src/mainwindow.c:2403
 msgid "Delete the message"
 msgstr "Briše poruke"
 
-#: src/mainwindow.c:2401
+#: src/mainwindow.c:2412
 #, fuzzy
 msgid "Set as junk mail"
 msgstr "Postavi kao uobičajeni"
 
-#: src/mainwindow.c:2410
+#: src/mainwindow.c:2421
 msgid "Execute"
 msgstr "Izvrši"
 
-#: src/mainwindow.c:2411
+#: src/mainwindow.c:2422
 msgid "Execute marked process"
 msgstr "Izvršava označene procese"
 
-#: src/mainwindow.c:2421
+#: src/mainwindow.c:2432
 msgid "Next unread message"
 msgstr "Slijedeća nepročitana poruka"
 
-#: src/mainwindow.c:2433
+#: src/mainwindow.c:2444
 msgid "Prefs"
 msgstr "Postav"
 
-#: src/mainwindow.c:2434
+#: src/mainwindow.c:2445
 #, fuzzy
 msgid "Common preferences"
 msgstr "Uobičajene postavke"
 
-#: src/mainwindow.c:2442 src/prefs_folder_item.c:289
+#: src/mainwindow.c:2453 src/prefs_folder_item.c:289
 #: src/prefs_folder_item.c:300 src/progressdialog.c:128
 msgid "Account"
 msgstr "Račun"
 
-#: src/mainwindow.c:2443
+#: src/mainwindow.c:2454
 msgid "Account setting"
 msgstr "Postavke računa"
 
-#: src/mainwindow.c:2615
+#: src/mainwindow.c:2626
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 
-#: src/mainwindow.c:2626
+#: src/mainwindow.c:2637
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 
-#: src/mainwindow.c:2892
+#: src/mainwindow.c:2903
 msgid "Exit"
 msgstr "Izlaz"
 
-#: src/mainwindow.c:2892
+#: src/mainwindow.c:2903
 msgid "Exit this program?"
 msgstr "Izlaz iz ovog programa?"
 
@@ -3952,47 +3968,47 @@ msgstr "Kraj liste dosegnut; nastaviti od početka?"
 msgid "Search finished"
 msgstr "Potraga završena"
 
-#: src/messageview.c:261
+#: src/messageview.c:266
 #, fuzzy
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/Dod_aj pošiljatelja u adresar"
 
-#: src/messageview.c:291
+#: src/messageview.c:296
 msgid "Creating message view...\n"
 msgstr "Kreiram pregled poruka...\n"
 
-#: src/messageview.c:316
+#: src/messageview.c:321
 msgid "Text"
 msgstr "Tekst"
 
-#: src/messageview.c:321
+#: src/messageview.c:326
 #, fuzzy
 msgid "Attachments"
 msgstr "Prilog"
 
-#: src/messageview.c:371
+#: src/messageview.c:376
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:669 src/summaryview.c:3268
+#: src/messageview.c:674 src/summaryview.c:3425
 #, fuzzy, c-format
 msgid "Can't save the file `%s'."
 msgstr "Ne mogu premjestiti spis `%s'."
 
-#: src/messageview.c:728 src/summaryview.c:3291
+#: src/messageview.c:733 src/summaryview.c:3448
 msgid "The message will be printed with the following command:"
 msgstr ""
 
-#: src/messageview.c:729 src/summaryview.c:3292
+#: src/messageview.c:734 src/summaryview.c:3449
 #, fuzzy
 msgid "(Default print command)"
 msgstr "Izvrši"
 
-#: src/messageview.c:731 src/prefs_common_dialog.c:2304 src/summaryview.c:3294
+#: src/messageview.c:736 src/prefs_common_dialog.c:2304 src/summaryview.c:3451
 msgid "Print"
 msgstr "Ispiši"
 
-#: src/messageview.c:740 src/summaryview.c:3303
+#: src/messageview.c:745 src/summaryview.c:3460
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -4894,8 +4910,8 @@ msgstr "Prikaži primatelja na `Od' ukoliko ste Vi autor"
 msgid "Expand threads"
 msgstr "Raširi stablo"
 
-#: src/prefs_common_dialog.c:1413 src/prefs_common_dialog.c:2713
-#: src/prefs_common_dialog.c:2751
+#: src/prefs_common_dialog.c:1413 src/prefs_common_dialog.c:2716
+#: src/prefs_common_dialog.c:2754
 msgid "Date format"
 msgstr "Format datuma"
 
@@ -5198,8 +5214,8 @@ msgstr "Vanjski uređivač (%s predstavlja ime datoteke)"
 msgid "Web browser"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2288 src/prefs_common_dialog.c:3775
-#: src/prefs_common_dialog.c:3796
+#: src/prefs_common_dialog.c:2288 src/prefs_common_dialog.c:3778
+#: src/prefs_common_dialog.c:3799
 #, fuzzy
 msgid "(Default browser)"
 msgstr "Uobičajeni sandučić"
@@ -5276,216 +5292,226 @@ msgstr "Grčki (ISO-8859-7)"
 
 #: src/prefs_common_dialog.c:2495
 #, fuzzy
+msgid "Arabic (ISO-8859-6)"
+msgstr "Blatički (ISO'8859-4)"
+
+#: src/prefs_common_dialog.c:2496
+#, fuzzy
+msgid "Arabic (Windows-1256)"
+msgstr "Ćirilica (Windows-1251)"
+
+#: src/prefs_common_dialog.c:2498
+#, fuzzy
 msgid "Hebrew (ISO-8859-8)"
 msgstr "Grčki (ISO-8859-7)"
 
-#: src/prefs_common_dialog.c:2496
+#: src/prefs_common_dialog.c:2499
 #, fuzzy
 msgid "Hebrew (Windows-1255)"
 msgstr "Ćirilica (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2498
+#: src/prefs_common_dialog.c:2501
 msgid "Turkish (ISO-8859-9)"
 msgstr "Turski (ISO-8859-9)"
 
-#: src/prefs_common_dialog.c:2500
+#: src/prefs_common_dialog.c:2503
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Čirilica (ISO-8859-5)"
 
-#: src/prefs_common_dialog.c:2501
+#: src/prefs_common_dialog.c:2504
 msgid "Cyrillic (KOI8-R)"
 msgstr "Čirilica (KOI8-R)"
 
-#: src/prefs_common_dialog.c:2502
+#: src/prefs_common_dialog.c:2505
 msgid "Cyrillic (KOI8-U)"
 msgstr "Čirilica (KOI8-U)"
 
-#: src/prefs_common_dialog.c:2503
+#: src/prefs_common_dialog.c:2506
 msgid "Cyrillic (Windows-1251)"
 msgstr "Ćirilica (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2505
+#: src/prefs_common_dialog.c:2508
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Japanski (ISO-2022-JP)"
 
-#: src/prefs_common_dialog.c:2507
+#: src/prefs_common_dialog.c:2510
 msgid "Japanese (EUC-JP)"
 msgstr "Japanski (EUC-JP)"
 
-#: src/prefs_common_dialog.c:2508
+#: src/prefs_common_dialog.c:2511
 msgid "Japanese (Shift_JIS)"
 msgstr "Japanski (Shift_JIS)"
 
-#: src/prefs_common_dialog.c:2511
+#: src/prefs_common_dialog.c:2514
 msgid "Simplified Chinese (GB2312)"
 msgstr "Pojednostavljeni Kineski (GB2312)"
 
-#: src/prefs_common_dialog.c:2512
+#: src/prefs_common_dialog.c:2515
 #, fuzzy
 msgid "Simplified Chinese (GBK)"
 msgstr "Pojednostavljeni Kineski (GB2312)"
 
-#: src/prefs_common_dialog.c:2513
+#: src/prefs_common_dialog.c:2516
 msgid "Traditional Chinese (Big5)"
 msgstr "Tradicionalni Kineski (Big5)"
 
-#: src/prefs_common_dialog.c:2515
+#: src/prefs_common_dialog.c:2518
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Tradicionalni Kineski (EUC-TW)"
 
-#: src/prefs_common_dialog.c:2516
+#: src/prefs_common_dialog.c:2519
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Kineski (ISO-2022-CN)"
 
-#: src/prefs_common_dialog.c:2519
+#: src/prefs_common_dialog.c:2522
 msgid "Korean (EUC-KR)"
 msgstr "Korejski (EUC-KR)"
 
-#: src/prefs_common_dialog.c:2521
+#: src/prefs_common_dialog.c:2524
 msgid "Thai (TIS-620)"
 msgstr "Thai (TIS-620)"
 
-#: src/prefs_common_dialog.c:2522
+#: src/prefs_common_dialog.c:2525
 msgid "Thai (Windows-874)"
 msgstr "Thai (Windows-874)"
 
-#: src/prefs_common_dialog.c:2689
+#: src/prefs_common_dialog.c:2692
 msgid "the full abbreviated weekday name"
 msgstr "pojednostavljeno ime tjedna"
 
-#: src/prefs_common_dialog.c:2690
+#: src/prefs_common_dialog.c:2693
 msgid "the full weekday name"
 msgstr "puno ime tjedna"
 
-#: src/prefs_common_dialog.c:2691
+#: src/prefs_common_dialog.c:2694
 msgid "the abbreviated month name"
 msgstr "skraćeno ime mjeseca"
 
-#: src/prefs_common_dialog.c:2692
+#: src/prefs_common_dialog.c:2695
 msgid "the full month name"
 msgstr "puno ime mjeseca"
 
-#: src/prefs_common_dialog.c:2693
+#: src/prefs_common_dialog.c:2696
 msgid "the preferred date and time for the current locale"
 msgstr "željeni datum i vrijeme za trenutni locale"
 
-#: src/prefs_common_dialog.c:2694
+#: src/prefs_common_dialog.c:2697
 msgid "the century number (year/100)"
 msgstr "broj stoljeća (godina/100)"
 
-#: src/prefs_common_dialog.c:2695
+#: src/prefs_common_dialog.c:2698
 msgid "the day of the month as a decimal number"
 msgstr "dan u mjesecu kao decimalni broj"
 
-#: src/prefs_common_dialog.c:2696
+#: src/prefs_common_dialog.c:2699
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "sat kao decimalni broj koristeći 24 satno vrijeme"
 
-#: src/prefs_common_dialog.c:2697
+#: src/prefs_common_dialog.c:2700
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "sat kao decimalni broj koristeći 12 satno vrijeme"
 
-#: src/prefs_common_dialog.c:2698
+#: src/prefs_common_dialog.c:2701
 msgid "the day of the year as a decimal number"
 msgstr "dan u godini kao decimalni broj"
 
-#: src/prefs_common_dialog.c:2699
+#: src/prefs_common_dialog.c:2702
 msgid "the month as a decimal number"
 msgstr "mjesec kao decimalni broj"
 
-#: src/prefs_common_dialog.c:2700
+#: src/prefs_common_dialog.c:2703
 msgid "the minute as a decimal number"
 msgstr "minute kao decimalni broj"
 
-#: src/prefs_common_dialog.c:2701
+#: src/prefs_common_dialog.c:2704
 msgid "either AM or PM"
 msgstr "AP ili PM"
 
-#: src/prefs_common_dialog.c:2702
+#: src/prefs_common_dialog.c:2705
 msgid "the second as a decimal number"
 msgstr "sekunde kao decimalni broj"
 
-#: src/prefs_common_dialog.c:2703
+#: src/prefs_common_dialog.c:2706
 msgid "the day of the week as a decimal number"
 msgstr "dan u tjednu kao decimalni broj"
 
-#: src/prefs_common_dialog.c:2704
+#: src/prefs_common_dialog.c:2707
 msgid "the preferred date for the current locale"
 msgstr "željeni datum za trenutni locale"
 
-#: src/prefs_common_dialog.c:2705
+#: src/prefs_common_dialog.c:2708
 msgid "the last two digits of a year"
 msgstr "posljednje dvije znamenke godine"
 
-#: src/prefs_common_dialog.c:2706
+#: src/prefs_common_dialog.c:2709
 msgid "the year as a decimal number"
 msgstr "godina kao decimalni broj"
 
-#: src/prefs_common_dialog.c:2707
+#: src/prefs_common_dialog.c:2710
 msgid "the time zone or name or abbreviation"
 msgstr "vremenska zona"
 
-#: src/prefs_common_dialog.c:2728
+#: src/prefs_common_dialog.c:2731
 msgid "Specifier"
 msgstr "Označitelj"
 
-#: src/prefs_common_dialog.c:2729
+#: src/prefs_common_dialog.c:2732
 msgid "Description"
 msgstr "Opis"
 
-#: src/prefs_common_dialog.c:2769
+#: src/prefs_common_dialog.c:2772
 msgid "Example"
 msgstr "Primjer"
 
-#: src/prefs_common_dialog.c:2850
+#: src/prefs_common_dialog.c:2853
 msgid "Set message colors"
 msgstr "Postavi boje poruka"
 
-#: src/prefs_common_dialog.c:2858
+#: src/prefs_common_dialog.c:2861
 msgid "Colors"
 msgstr "Boje"
 
-#: src/prefs_common_dialog.c:2892
+#: src/prefs_common_dialog.c:2895
 msgid "Quoted Text - First Level"
 msgstr "Citirani tekst - prvi stupanj"
 
-#: src/prefs_common_dialog.c:2898
+#: src/prefs_common_dialog.c:2901
 msgid "Quoted Text - Second Level"
 msgstr "Citirani tekst - drugi stupanj"
 
-#: src/prefs_common_dialog.c:2904
+#: src/prefs_common_dialog.c:2907
 msgid "Quoted Text - Third Level"
 msgstr "Citirani tekst - treći stupanj"
 
-#: src/prefs_common_dialog.c:2910
+#: src/prefs_common_dialog.c:2913
 msgid "URI link"
 msgstr "URI poveznice"
 
-#: src/prefs_common_dialog.c:2917
+#: src/prefs_common_dialog.c:2920
 msgid "Recycle quote colors"
 msgstr "Ciklički mijenjaj boje citata"
 
-#: src/prefs_common_dialog.c:2984
+#: src/prefs_common_dialog.c:2987
 msgid "Pick color for quotation level 1"
 msgstr "Odaberite boju za citat 1. stupnja"
 
-#: src/prefs_common_dialog.c:2987
+#: src/prefs_common_dialog.c:2990
 msgid "Pick color for quotation level 2"
 msgstr "Odaberite boju za citat 2. stupnja"
 
-#: src/prefs_common_dialog.c:2990
+#: src/prefs_common_dialog.c:2993
 msgid "Pick color for quotation level 3"
 msgstr "Odaberite boju za citat 3. stupnja"
 
-#: src/prefs_common_dialog.c:2993
+#: src/prefs_common_dialog.c:2996
 msgid "Pick color for URI"
 msgstr "Odaberite boju za URI"
 
-#: src/prefs_common_dialog.c:3133
+#: src/prefs_common_dialog.c:3136
 msgid "Description of symbols"
 msgstr "Obajšnjenje znakova"
 
-#: src/prefs_common_dialog.c:3189
+#: src/prefs_common_dialog.c:3192
 msgid ""
 "Date\n"
 "From\n"
@@ -5509,11 +5535,11 @@ msgstr ""
 "News grupe\n"
 "ID poruke"
 
-#: src/prefs_common_dialog.c:3202
+#: src/prefs_common_dialog.c:3205
 msgid "If x is set, displays expr"
 msgstr "Ako je x odabrano, prikazuje expr"
 
-#: src/prefs_common_dialog.c:3206
+#: src/prefs_common_dialog.c:3209
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -5522,7 +5548,7 @@ msgid ""
 "Literal %"
 msgstr ""
 
-#: src/prefs_common_dialog.c:3214
+#: src/prefs_common_dialog.c:3217
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -5530,22 +5556,22 @@ msgid ""
 "Literal closing curly brace"
 msgstr ""
 
-#: src/prefs_common_dialog.c:3260
+#: src/prefs_common_dialog.c:3263
 #, fuzzy
 msgid "Key bindings"
 msgstr "Šaljem"
 
-#: src/prefs_common_dialog.c:3273
+#: src/prefs_common_dialog.c:3276
 #, fuzzy
 msgid "Select the preset of key bindings."
 msgstr "Šaljem"
 
-#: src/prefs_common_dialog.c:3283 src/prefs_common_dialog.c:3607
+#: src/prefs_common_dialog.c:3286 src/prefs_common_dialog.c:3610
 #, fuzzy
 msgid "Default"
 msgstr "Uobičajeni sandučić"
 
-#: src/prefs_common_dialog.c:3286 src/prefs_common_dialog.c:3616
+#: src/prefs_common_dialog.c:3289 src/prefs_common_dialog.c:3619
 msgid "Old Sylpheed"
 msgstr ""
 
@@ -5670,7 +5696,7 @@ msgstr ""
 msgid "Age"
 msgstr ""
 
-#: src/prefs_filter_edit.c:501 src/summaryview.c:510
+#: src/prefs_filter_edit.c:501 src/summaryview.c:512
 #, fuzzy
 msgid "Marked"
 msgstr "Oznaka"
@@ -5925,17 +5951,17 @@ msgid "Attachment"
 msgstr "Prilog"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73 src/query_search.c:371 src/summaryview.c:4733
+#: src/prefs_summary_column.c:73 src/query_search.c:371 src/summaryview.c:4890
 msgid "Subject"
 msgstr "Tema"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/query_search.c:372 src/summaryview.c:4736
+#: src/prefs_summary_column.c:74 src/query_search.c:372 src/summaryview.c:4893
 msgid "From"
 msgstr "Od"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/query_search.c:373 src/summaryview.c:4738
+#: src/prefs_summary_column.c:75 src/query_search.c:373 src/summaryview.c:4895
 msgid "Date"
 msgstr "Datum"
 
@@ -6038,7 +6064,7 @@ msgstr "/_Traži poruka..."
 msgid "_Save as search folder"
 msgstr "Traži spis"
 
-#: src/query_search.c:512 src/subscribedialog.c:523 src/summaryview.c:840
+#: src/query_search.c:512 src/subscribedialog.c:523 src/summaryview.c:842
 msgid "Done."
 msgstr "Gotovo."
 
@@ -6052,7 +6078,7 @@ msgstr "Pretražujem spis %s ..."
 msgid "Searching %s (%d / %d)..."
 msgstr "Filtriranje..."
 
-#: src/query_search.c:645 src/summaryview.c:2048
+#: src/query_search.c:645 src/summaryview.c:2051
 msgid "(No Date)"
 msgstr "(Nema Datuma)"
 
@@ -6433,314 +6459,319 @@ msgid "/_Mark/Mark as rea_d"
 msgstr "/_Označi/Označi kao _pročitano"
 
 #: src/summaryview.c:429
+#, fuzzy
+msgid "/_Mark/Mark _thread as read"
+msgstr "/_Označi/Označi kao _pročitano"
+
+#: src/summaryview.c:431
 msgid "/_Mark/Mark all _read"
 msgstr "/_Označi/Označi sve _pročitano"
 
-#: src/summaryview.c:430
+#: src/summaryview.c:432
 msgid "/Color la_bel"
 msgstr "/Oznaka _boje"
 
-#: src/summaryview.c:434
+#: src/summaryview.c:436
 msgid "/Re-_edit"
 msgstr "/Pre-_uredi"
 
-#: src/summaryview.c:436
+#: src/summaryview.c:438
 #, fuzzy
 msgid "/Add sender to address boo_k..."
 msgstr "/Dod_aj pošiljatelja u adresar"
 
-#: src/summaryview.c:438
+#: src/summaryview.c:440
 #, fuzzy
 msgid "/Create f_ilter rule"
 msgstr "/_Održavanje/_Filtriraj poštu"
 
-#: src/summaryview.c:439
+#: src/summaryview.c:441
 #, fuzzy
 msgid "/Create f_ilter rule/_Automatically"
 msgstr "/_Održavanje/_Filtriraj poštu"
 
-#: src/summaryview.c:441
+#: src/summaryview.c:443
 #, fuzzy
 msgid "/Create f_ilter rule/by _From"
 msgstr "/_Održavanje/_Filtriraj poštu"
 
-#: src/summaryview.c:443
+#: src/summaryview.c:445
 #, fuzzy
 msgid "/Create f_ilter rule/by _To"
 msgstr "/_Održavanje/_Filtriraj poštu"
 
-#: src/summaryview.c:445
+#: src/summaryview.c:447
 #, fuzzy
 msgid "/Create f_ilter rule/by _Subject"
 msgstr "/_Održavanje/_Filtriraj poštu"
 
-#: src/summaryview.c:451
+#: src/summaryview.c:453
 msgid "/_View/_Source"
 msgstr "/_Pregled/Pr_egledaj izvor"
 
-#: src/summaryview.c:452
+#: src/summaryview.c:454
 msgid "/_View/All _header"
 msgstr "/_Pregled/Prikaži s_vo zaglavlje"
 
-#: src/summaryview.c:454
+#: src/summaryview.c:456
 msgid "/_Print..."
 msgstr "/Is_piši"
 
-#: src/summaryview.c:486
+#: src/summaryview.c:488
 msgid "Creating summary view...\n"
 msgstr "Kreiram pregled održavanja...\n"
 
-#: src/summaryview.c:508
+#: src/summaryview.c:510
 msgid "All"
 msgstr ""
 
-#: src/summaryview.c:511
+#: src/summaryview.c:513
 #, fuzzy
 msgid "Have color label"
 msgstr "/Oznaka _boje"
 
-#: src/summaryview.c:512
+#: src/summaryview.c:514
 #, fuzzy
 msgid "Have attachment"
 msgstr "Prilog"
 
-#: src/summaryview.c:521
+#: src/summaryview.c:523
 #, fuzzy
 msgid "Search:"
 msgstr "Potraga"
 
-#: src/summaryview.c:535
+#: src/summaryview.c:537
 msgid "Search for Subject or From"
 msgstr ""
 
-#: src/summaryview.c:702
+#: src/summaryview.c:704
 msgid "Process mark"
 msgstr "Izvrši oznaku"
 
-#: src/summaryview.c:703
+#: src/summaryview.c:705
 msgid "Some marks are left. Process it?"
 msgstr "Neke oznake su izostavljene. Izvršiti ih?"
 
-#: src/summaryview.c:749
+#: src/summaryview.c:751
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "Pregledavam spis (%s)..."
 
-#: src/summaryview.c:1292
+#: src/summaryview.c:1295
 #, fuzzy
 msgid "_Search again"
 msgstr "Polje potrage"
 
-#: src/summaryview.c:1313 src/summaryview.c:1322
+#: src/summaryview.c:1316 src/summaryview.c:1325
 msgid "No more unread messages"
 msgstr "Nema nepročitanih poruka"
 
-#: src/summaryview.c:1314
+#: src/summaryview.c:1317
 msgid "No unread message found. Search from the end?"
 msgstr "Nema više nepročitanih poruka. Tražiti od kraja?"
 
-#: src/summaryview.c:1316
+#: src/summaryview.c:1319
 msgid "No unread messages."
 msgstr "Nema nepročitanih poruka."
 
-#: src/summaryview.c:1323
+#: src/summaryview.c:1326
 msgid "No unread message found. Go to next folder?"
 msgstr "Nema više nepročitanih poruka. Nastaviti u slijedeći spis?"
 
-#: src/summaryview.c:1331 src/summaryview.c:1340
+#: src/summaryview.c:1334 src/summaryview.c:1343
 #, fuzzy
 msgid "No more new messages"
 msgstr "Nema nepročitanih poruka"
 
-#: src/summaryview.c:1332
+#: src/summaryview.c:1335
 #, fuzzy
 msgid "No new message found. Search from the end?"
 msgstr "Nema više nepročitanih poruka. Tražiti od kraja?"
 
-#: src/summaryview.c:1334
+#: src/summaryview.c:1337
 #, fuzzy
 msgid "No new messages."
 msgstr "Nema nepročitanih poruka."
 
-#: src/summaryview.c:1341
+#: src/summaryview.c:1344
 #, fuzzy
 msgid "No new message found. Go to next folder?"
 msgstr "Nema više nepročitanih poruka. Nastaviti u slijedeći spis?"
 
-#: src/summaryview.c:1349 src/summaryview.c:1358
+#: src/summaryview.c:1352 src/summaryview.c:1361
 msgid "No more marked messages"
 msgstr "Nema više označenih poruka"
 
-#: src/summaryview.c:1350
+#: src/summaryview.c:1353
 msgid "No marked message found. Search from the end?"
 msgstr "Nema više označenih poruka. Nastaviti od kraja?"
 
-#: src/summaryview.c:1352 src/summaryview.c:1361
+#: src/summaryview.c:1355 src/summaryview.c:1364
 msgid "No marked messages."
 msgstr "Nema označenih poruka."
 
-#: src/summaryview.c:1359
+#: src/summaryview.c:1362
 msgid "No marked message found. Search from the beginning?"
 msgstr "Nema označenih poruka. Tražiti od početka?"
 
-#: src/summaryview.c:1367 src/summaryview.c:1376
+#: src/summaryview.c:1370 src/summaryview.c:1379
 msgid "No more labeled messages"
 msgstr "Nema više label poruka"
 
-#: src/summaryview.c:1368
+#: src/summaryview.c:1371
 msgid "No labeled message found. Search from the end?"
 msgstr "Nema label poruka. Tražiti od kraja?"
 
-#: src/summaryview.c:1370 src/summaryview.c:1379
+#: src/summaryview.c:1373 src/summaryview.c:1382
 msgid "No labeled messages."
 msgstr "Nema label poruka."
 
-#: src/summaryview.c:1377
+#: src/summaryview.c:1380
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Nema label poruka. Krenuti od početka?"
 
-#: src/summaryview.c:1693
+#: src/summaryview.c:1696
 msgid "Attracting messages by subject..."
 msgstr "Prihvaćam poruke po temi..."
 
-#: src/summaryview.c:1887
+#: src/summaryview.c:1890
 #, c-format
 msgid "%d deleted"
 msgstr "%d obrisano"
 
-#: src/summaryview.c:1891
+#: src/summaryview.c:1894
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d premješteno"
 
-#: src/summaryview.c:1892 src/summaryview.c:1897
+#: src/summaryview.c:1895 src/summaryview.c:1900
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:1896
+#: src/summaryview.c:1899
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d kopirano"
 
-#: src/summaryview.c:1911
+#: src/summaryview.c:1914
 msgid " item(s) selected"
 msgstr " jedinica odabrano"
 
-#: src/summaryview.c:1933
+#: src/summaryview.c:1936
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d novih, %d nepročitanih, %d ukupno (%s)"
 
-#: src/summaryview.c:1937
+#: src/summaryview.c:1940
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d novih, %d nepročitanih, %d ukupno"
 
-#: src/summaryview.c:1971
+#: src/summaryview.c:1974
 msgid "Sorting summary..."
 msgstr "Slažem pregled..."
 
-#: src/summaryview.c:2194
+#: src/summaryview.c:2211
 msgid "\tSetting summary from message data..."
 msgstr "\tPostavljam pregled od podataka poruke..."
 
-#: src/summaryview.c:2196
+#: src/summaryview.c:2213
 msgid "Setting summary from message data..."
 msgstr "Postavljam pregled od podataka poruke..."
 
-#: src/summaryview.c:2302
+#: src/summaryview.c:2319
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Pišem pohranu pregleda (%s)..."
 
-#: src/summaryview.c:2643
+#: src/summaryview.c:2660
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Poruka %d je označena\n"
 
-#: src/summaryview.c:2701
+#: src/summaryview.c:2718
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Poruka %d je označena kao pročitana\n"
 
-#: src/summaryview.c:2789
+#: src/summaryview.c:2908
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Poruka %d je označena kao nepročitana\n"
 
-#: src/summaryview.c:2850
+#: src/summaryview.c:2969
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Poruka %s/%d označena je za brisanje\n"
 
-#: src/summaryview.c:2878
+#: src/summaryview.c:2997
 msgid "Delete message(s)"
 msgstr "Obriši poruku/e"
 
-#: src/summaryview.c:2879
+#: src/summaryview.c:2998
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Želite li uistinu obrisati poruke iz smeća?"
 
-#: src/summaryview.c:2953
+#: src/summaryview.c:3072
 msgid "Deleting duplicated messages..."
 msgstr "Brišim duplicirane poruke..."
 
-#: src/summaryview.c:2991
+#: src/summaryview.c:3110
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Poruka %s/%d je neoznačena\n"
 
-#: src/summaryview.c:3049
+#: src/summaryview.c:3168
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Poruka %d je označena za premještanje u %s\n"
 
-#: src/summaryview.c:3066
+#: src/summaryview.c:3196
 msgid "Destination is same as current folder."
 msgstr "Destinacija je ista kao i trenutni spis."
 
-#: src/summaryview.c:3122
+#: src/summaryview.c:3260
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Poruka %d je označena za kopiranje u %s\n"
 
-#: src/summaryview.c:3139
+#: src/summaryview.c:3288
 #, fuzzy
 msgid "Destination for copy is same as current folder."
 msgstr "Destinacija za kopiranje je ista kao i trenutni spis."
 
-#: src/summaryview.c:3338
+#: src/summaryview.c:3495
 #, fuzzy
 msgid "Error occurred while processing messages."
 msgstr "Došlo je do greške pri radu s poštom."
 
-#: src/summaryview.c:3646 src/summaryview.c:3647
+#: src/summaryview.c:3803 src/summaryview.c:3804
 msgid "Building threads..."
 msgstr "Izgrađujem stablo..."
 
-#: src/summaryview.c:3797 src/summaryview.c:3798
+#: src/summaryview.c:3954 src/summaryview.c:3955
 msgid "Unthreading..."
 msgstr "Rasipavam..."
 
-#: src/summaryview.c:4091 src/summaryview.c:4147
+#: src/summaryview.c:4248 src/summaryview.c:4304
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtriranje..."
 
-#: src/summaryview.c:4196
+#: src/summaryview.c:4353
 msgid "filtering..."
 msgstr "filtriram..."
 
-#: src/summaryview.c:4197
+#: src/summaryview.c:4354
 msgid "Filtering..."
 msgstr "Filtriranje..."
 
-#: src/summaryview.c:4233
+#: src/summaryview.c:4390
 #, fuzzy, c-format
 msgid "%d message(s) have been filtered."
 msgstr "poruka %d već je prihvaćena.\n"
 
-#: src/summaryview.c:4742
+#: src/summaryview.c:4899
 msgid "No."
 msgstr "Ne."
 
@@ -6758,35 +6789,35 @@ msgstr "Kreiram pregled teksta...\n"
 msgid "This message can't be displayed.\n"
 msgstr "poruka neće biti primljena\n"
 
-#: src/textview.c:1929
+#: src/textview.c:1925
 #, fuzzy
 msgid "Sa_ve this image as..."
 msgstr "/S_premi kao"
 
-#: src/textview.c:1945 src/trayicon.c:109
+#: src/textview.c:1941 src/trayicon.c:109
 #, fuzzy
 msgid "Compose _new message"
 msgstr "Kreiranje nove pošte"
 
-#: src/textview.c:1947
+#: src/textview.c:1943
 #, fuzzy
 msgid "Add to address _book..."
 msgstr "/Dod_aj pošiljatelja u adresar"
 
-#: src/textview.c:1949
+#: src/textview.c:1945
 #, fuzzy
 msgid "Copy this add_ress"
 msgstr "Uobičajene adrese"
 
-#: src/textview.c:1952
+#: src/textview.c:1948
 msgid "_Open with Web browser"
 msgstr ""
 
-#: src/textview.c:1954
+#: src/textview.c:1950
 msgid "Copy this _link"
 msgstr ""
 
-#: src/textview.c:2097
+#: src/textview.c:2093
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6795,7 +6826,7 @@ msgid ""
 "Open it anyway?"
 msgstr ""
 
-#: src/textview.c:2102
+#: src/textview.c:2098
 msgid "Fake URL warning"
 msgstr ""
 
diff --git a/po/hu.po b/po/hu.po
index dd843f6e..2d82c590 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: 2006-01-27 18:11+0900\n"
+"POT-Creation-Date: 2006-01-31 15:20+0900\n"
 "PO-Revision-Date: 2005-12-27 11:05+0100\n"
 "Last-Translator: Németh Tamás <ntomasz@vipmail.hu>\n"
 "Language-Team: <NONE>\n"
@@ -506,7 +506,7 @@ msgstr "Találat %s\n"
 msgid "Configuration is saved.\n"
 msgstr "Beállítások tárolva.\n"
 
-#: libsylph/prefs_common.c:489
+#: libsylph/prefs_common.c:491
 msgid "Junk mail filter"
 msgstr "Levélszemét szűrő"
 
@@ -621,8 +621,8 @@ msgstr "%.2fMB"
 msgid "%.2fGB"
 msgstr "%.2fGB"
 
-#: libsylph/utils.c:2373 src/compose.c:2858 src/compose.c:3121
-#: src/compose.c:3184 src/compose.c:3304
+#: libsylph/utils.c:2373 src/compose.c:2867 src/compose.c:3130
+#: src/compose.c:3193 src/compose.c:3313
 msgid "can't change file mode\n"
 msgstr "fájl módja nem változtatható\n"
 
@@ -711,8 +711,8 @@ msgstr ""
 "letöltése'\n"
 "funkció bekapcsolásához válassza ki a 'G' oszlopban a jelölődobozt!"
 
-#: src/account_dialog.c:366 src/addressadd.c:192 src/addressbook.c:491
-#: src/compose.c:4262 src/editaddress.c:200 src/editaddress.c:942
+#: src/account_dialog.c:366 src/addressadd.c:192 src/addressbook.c:493
+#: src/compose.c:4271 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:206 src/prefs_filter.c:259 src/prefs_folder_item.c:171
@@ -849,12 +849,12 @@ 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:4762 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4771 src/editaddress.c:201
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "Cím"
 
-#: src/addressadd.c:212 src/addressbook.c:493 src/editaddress.c:202
+#: src/addressadd.c:212 src/addressbook.c:495 src/editaddress.c:202
 #: src/editaddress.c:795 src/editaddress.c:860 src/editgroup.c:267
 msgid "Remarks"
 msgstr "Megjegyzések"
@@ -863,183 +863,183 @@ msgstr "Megjegyzések"
 msgid "Select Address Book Folder"
 msgstr "Címjegyzék mappa választás"
 
-#: src/addressbook.c:336 src/compose.c:515 src/mainwindow.c:477
+#: src/addressbook.c:338 src/compose.c:515 src/mainwindow.c:480
 #: src/messageview.c:138
 msgid "/_File"
 msgstr "/_Fájl"
 
-#: src/addressbook.c:337
+#: src/addressbook.c:339
 msgid "/_File/New _Book"
 msgstr "/_Fájl/Új cím_jegyzék"
 
-#: src/addressbook.c:338
+#: src/addressbook.c:340
 msgid "/_File/New _vCard"
 msgstr "/_Fájl/Új _vCard"
 
-#: src/addressbook.c:340
+#: src/addressbook.c:342
 msgid "/_File/New _JPilot"
 msgstr "/_Fájl/Új _JPilot"
 
-#: src/addressbook.c:343
+#: src/addressbook.c:345
 msgid "/_File/New _Server"
 msgstr "/_Fájl/Új _Szerver"
 
-#: src/addressbook.c:345 src/addressbook.c:348 src/compose.c:520
-#: src/compose.c:525 src/compose.c:528 src/compose.c:531 src/mainwindow.c:495
-#: src/mainwindow.c:498 src/mainwindow.c:500 src/mainwindow.c:503
-#: src/mainwindow.c:505 src/messageview.c:141
+#: src/addressbook.c:347 src/addressbook.c:350 src/compose.c:520
+#: src/compose.c:525 src/compose.c:528 src/compose.c:531 src/mainwindow.c:498
+#: src/mainwindow.c:501 src/mainwindow.c:503 src/mainwindow.c:506
+#: src/mainwindow.c:508 src/messageview.c:141
 msgid "/_File/---"
 msgstr "/_Fájl/---"
 
-#: src/addressbook.c:346
+#: src/addressbook.c:348
 msgid "/_File/_Edit"
 msgstr "/_Fájl/_Szerkesztés"
 
-#: src/addressbook.c:347
+#: src/addressbook.c:349
 msgid "/_File/_Delete"
 msgstr "/_Fájl/_Törlés"
 
-#: src/addressbook.c:349
+#: src/addressbook.c:351
 msgid "/_File/_Save"
 msgstr "/_Fájl/_Mentés"
 
-#: src/addressbook.c:350 src/compose.c:532 src/messageview.c:142
+#: src/addressbook.c:352 src/compose.c:532 src/messageview.c:142
 msgid "/_File/_Close"
 msgstr "/_Fájl/_Bezárás"
 
-#: src/addressbook.c:351
+#: src/addressbook.c:353
 msgid "/_Address"
 msgstr "/_Cím"
 
-#: src/addressbook.c:352
+#: src/addressbook.c:354
 msgid "/_Address/New _Address"
 msgstr "/_Cím/Új _cím"
 
-#: src/addressbook.c:353
+#: src/addressbook.c:355
 msgid "/_Address/New _Group"
 msgstr "/_Cím/Új cso_port"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:356
 msgid "/_Address/New _Folder"
 msgstr "/_Cím/Új _mappa"
 
-#: src/addressbook.c:355
+#: src/addressbook.c:357
 msgid "/_Address/---"
 msgstr "/_Cím/---"
 
-#: src/addressbook.c:356
+#: src/addressbook.c:358
 msgid "/_Address/_Edit"
 msgstr "/_Cím/_Szerkesztés"
 
-#: src/addressbook.c:357
+#: src/addressbook.c:359
 msgid "/_Address/_Delete"
 msgstr "/_Cím/_Törlés"
 
-#: src/addressbook.c:358 src/compose.c:639 src/mainwindow.c:738
-#: src/messageview.c:259
+#: src/addressbook.c:360 src/compose.c:645 src/mainwindow.c:749
+#: src/messageview.c:264
 msgid "/_Tools"
 msgstr "/_Eszközök"
 
-#: src/addressbook.c:359
+#: src/addressbook.c:361
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Eszközök/_LDIF fájl importálása"
 
-#: src/addressbook.c:360 src/compose.c:658 src/mainwindow.c:788
-#: src/messageview.c:277
+#: src/addressbook.c:362 src/compose.c:664 src/mainwindow.c:799
+#: src/messageview.c:282
 msgid "/_Help"
 msgstr "/_Súgó"
 
-#: src/addressbook.c:361 src/compose.c:659 src/mainwindow.c:799
-#: src/messageview.c:278
+#: src/addressbook.c:363 src/compose.c:665 src/mainwindow.c:810
+#: src/messageview.c:283
 msgid "/_Help/_About"
 msgstr "/_Súgó/_Névjegy"
 
-#: src/addressbook.c:380 src/addressbook.c:390
+#: src/addressbook.c:382 src/addressbook.c:392
 msgid "/New _Address"
 msgstr "/Új _cím"
 
-#: src/addressbook.c:381 src/addressbook.c:391
+#: src/addressbook.c:383 src/addressbook.c:393
 msgid "/New _Group"
 msgstr "/Új cso_port"
 
-#: src/addressbook.c:382 src/addressbook.c:392
+#: src/addressbook.c:384 src/addressbook.c:394
 msgid "/New _Folder"
 msgstr "/Ú_j Mappa"
 
-#: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:509
+#: src/addressbook.c:385 src/addressbook.c:395 src/compose.c:509
 #: src/folderview.c:246 src/folderview.c:248 src/folderview.c:253
 #: src/folderview.c:266 src/folderview.c:268 src/folderview.c:270
 #: src/folderview.c:275 src/folderview.c:289 src/folderview.c:291
 #: src/folderview.c:295 src/summaryview.c:414 src/summaryview.c:418
-#: src/summaryview.c:421 src/summaryview.c:431 src/summaryview.c:433
-#: src/summaryview.c:435 src/summaryview.c:447 src/summaryview.c:453
+#: src/summaryview.c:421 src/summaryview.c:433 src/summaryview.c:435
+#: src/summaryview.c:437 src/summaryview.c:449 src/summaryview.c:455
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:534
-#: src/mainwindow.c:509 src/messageview.c:144
+#: src/addressbook.c:386 src/addressbook.c:396 src/compose.c:534
+#: src/mainwindow.c:512 src/messageview.c:144
 msgid "/_Edit"
 msgstr "/_Szerkesztés"
 
-#: src/addressbook.c:385 src/addressbook.c:395 src/summaryview.c:432
+#: src/addressbook.c:387 src/addressbook.c:397 src/summaryview.c:434
 msgid "/_Delete"
 msgstr "/_Törlés"
 
-#: src/addressbook.c:492
+#: src/addressbook.c:494
 msgid "E-Mail address"
 msgstr "E-Mail cím"
 
-#: src/addressbook.c:496 src/compose.c:4763 src/prefs_common_dialog.c:2183
+#: src/addressbook.c:498 src/compose.c:4772 src/prefs_common_dialog.c:2183
 msgid "Address book"
 msgstr "Címjegyzék"
 
-#: src/addressbook.c:596 src/prefs_filter_edit.c:249
+#: src/addressbook.c:600 src/prefs_filter_edit.c:249
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "Név:"
 
 #. Buttons
-#: src/addressbook.c:628 src/addressbook.c:1680 src/editaddress.c:884
-#: src/editaddress.c:1017 src/mainwindow.c:2391 src/prefs_actions.c:266
+#: src/addressbook.c:632 src/addressbook.c:1684 src/editaddress.c:884
+#: src/editaddress.c:1017 src/mainwindow.c:2402 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
 #: src/prefs_template.c:233
 msgid "Delete"
 msgstr "Törlés"
 
-#: src/addressbook.c:631 src/editaddress.c:890 src/editaddress.c:1023
+#: src/addressbook.c:635 src/editaddress.c:890 src/editaddress.c:1023
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:273 src/prefs_display_header.c:328
 #: src/prefs_filter_edit.c:1550
 msgid "Add"
 msgstr "Hozzáadás"
 
-#: src/addressbook.c:634
+#: src/addressbook.c:638
 msgid "Lookup"
 msgstr "Előnézet"
 
-#: src/addressbook.c:646 src/headerview.c:55 src/prefs_folder_item.c:339
+#: src/addressbook.c:650 src/headerview.c:55 src/prefs_folder_item.c:339
 #: src/prefs_template.c:176
 msgid "To:"
 msgstr "Címzett:"
 
-#: src/addressbook.c:650 src/prefs_folder_item.c:356 src/prefs_template.c:178
+#: src/addressbook.c:654 src/prefs_folder_item.c:356 src/prefs_template.c:178
 msgid "Cc:"
 msgstr "Másolat:"
 
-#: src/addressbook.c:654 src/prefs_folder_item.c:367
+#: src/addressbook.c:658 src/prefs_folder_item.c:367
 msgid "Bcc:"
 msgstr "Titkos másolat:"
 
 #. Confirm deletion
-#: src/addressbook.c:841
+#: src/addressbook.c:845
 msgid "Delete address(es)"
 msgstr "Cím(ek) törlése"
 
-#: src/addressbook.c:842
+#: src/addressbook.c:846
 msgid "Really delete the address(es)?"
 msgstr "Tényleg töröljem a cím(ek)et?"
 
-#: src/addressbook.c:1671
+#: src/addressbook.c:1675
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1048,36 +1048,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:1674 src/folderview.c:2351
+#: src/addressbook.c:1678 src/folderview.c:2351
 msgid "Delete folder"
 msgstr "Mappa törlése"
 
-#: src/addressbook.c:1674
+#: src/addressbook.c:1678
 msgid "_Folder only"
 msgstr "Cs_ak mappa"
 
-#: src/addressbook.c:1674
+#: src/addressbook.c:1678
 msgid "Folder and _addresses"
 msgstr "Mappa és _címek"
 
-#: src/addressbook.c:1679
+#: src/addressbook.c:1683
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Tényleg törli `%s' elemet?"
 
-#: src/addressbook.c:2365 src/addressbook.c:2498
+#: src/addressbook.c:2369 src/addressbook.c:2502
 msgid "New user, could not save index file."
 msgstr "Az új felhasználó nem tudja menteni az index fájlt."
 
-#: src/addressbook.c:2369 src/addressbook.c:2502
+#: src/addressbook.c:2373 src/addressbook.c:2506
 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:2379 src/addressbook.c:2512
+#: src/addressbook.c:2383 src/addressbook.c:2516
 msgid "Old address book converted successfully."
 msgstr "A régi címjegyzék konvertálása sikerült."
 
-#: src/addressbook.c:2384
+#: src/addressbook.c:2388
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1085,7 +1085,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:2397
+#: src/addressbook.c:2401
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1093,7 +1093,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:2403
+#: src/addressbook.c:2407
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1101,7 +1101,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:2408
+#: src/addressbook.c:2412
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1109,88 +1109,88 @@ 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:2415
+#: src/addressbook.c:2419
 msgid "Addressbook conversion error"
 msgstr "Címjegyzék konvertálási hiba"
 
-#: src/addressbook.c:2419
+#: src/addressbook.c:2423
 msgid "Addressbook conversion"
 msgstr "Címjegyzék konvertálása"
 
-#: src/addressbook.c:2454
+#: src/addressbook.c:2458
 msgid "Addressbook Error"
 msgstr "Címjegyzék hiba"
 
-#: src/addressbook.c:2455 src/addressbook.c:2555
+#: src/addressbook.c:2459 src/addressbook.c:2559
 msgid "Could not read address index"
 msgstr "Cím index olvasása nem sikerült"
 
-#: src/addressbook.c:2517
+#: src/addressbook.c:2521
 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:2531
+#: src/addressbook.c:2535
 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:2537
+#: src/addressbook.c:2541
 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:2543
+#: src/addressbook.c:2547
 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:2561
+#: src/addressbook.c:2565
 msgid "Addressbook Conversion Error"
 msgstr "Címjegyzék konverziós hiba"
 
-#: src/addressbook.c:2567
+#: src/addressbook.c:2571
 msgid "Addressbook Conversion"
 msgstr "Címjegyzék konverzió"
 
-#: src/addressbook.c:3072 src/prefs_common_dialog.c:2033
+#: src/addressbook.c:3086 src/prefs_common_dialog.c:2033
 msgid "Interface"
 msgstr "Illesztő"
 
-#: src/addressbook.c:3088 src/importldif.c:514
+#: src/addressbook.c:3102 src/importldif.c:514
 msgid "Address Book"
 msgstr "Címjegyzék"
 
-#: src/addressbook.c:3104
+#: src/addressbook.c:3118
 msgid "Person"
 msgstr "Személy"
 
-#: src/addressbook.c:3120
+#: src/addressbook.c:3134
 msgid "EMail Address"
 msgstr "E-mail cím"
 
-#: src/addressbook.c:3136
+#: src/addressbook.c:3150
 msgid "Group"
 msgstr "Csoport"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3152 src/folderview.c:367 src/prefs_account_dialog.c:1694
+#: src/addressbook.c:3166 src/folderview.c:367 src/prefs_account_dialog.c:1694
 #: src/query_search.c:370
 msgid "Folder"
 msgstr "Mappa"
 
-#: src/addressbook.c:3168
+#: src/addressbook.c:3182
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3184 src/addressbook.c:3200
+#: src/addressbook.c:3198 src/addressbook.c:3214
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3216
+#: src/addressbook.c:3230
 msgid "LDAP Server"
 msgstr "LDAP Szerver"
 
@@ -1202,7 +1202,7 @@ msgstr "Általános cím"
 msgid "Personal address"
 msgstr "Személyes cím"
 
-#: src/alertpanel.c:141 src/compose.c:5485 src/main.c:573
+#: src/alertpanel.c:141 src/compose.c:5494 src/main.c:573
 msgid "Notice"
 msgstr "Megjegyzés"
 
@@ -1253,7 +1253,7 @@ msgstr "Barna"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4593
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4750
 msgid "None"
 msgstr "Semmi"
 
@@ -1311,7 +1311,7 @@ msgstr "/_Szerkesztés/_Visszavonás"
 msgid "/_Edit/_Redo"
 msgstr "/_Szerkesztés/_Ismétlés"
 
-#: src/compose.c:537 src/compose.c:544 src/mainwindow.c:513
+#: src/compose.c:537 src/compose.c:544 src/mainwindow.c:516
 #: src/messageview.c:147
 msgid "/_Edit/---"
 msgstr "/_Szerkesztés/---"
@@ -1320,7 +1320,7 @@ msgstr "/_Szerkesztés/---"
 msgid "/_Edit/Cu_t"
 msgstr "/_Szerkesztés/_Kivágás"
 
-#: src/compose.c:539 src/mainwindow.c:510 src/messageview.c:145
+#: src/compose.c:539 src/mainwindow.c:513 src/messageview.c:145
 msgid "/_Edit/_Copy"
 msgstr "/_Szerkesztés/_Másolás"
 
@@ -1332,7 +1332,7 @@ msgstr "/_Szerkesztés/_Beillesztés"
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Szerkesztés/_Beillesztés idézetként"
 
-#: src/compose.c:543 src/mainwindow.c:511 src/messageview.c:146
+#: src/compose.c:543 src/mainwindow.c:514 src/messageview.c:146
 msgid "/_Edit/Select _all"
 msgstr "/_Szerkesztés/Mindet kijelöli"
 
@@ -1348,8 +1348,8 @@ msgstr "/__Szerkesztés/Minden hosszú _sor törése"
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Szerkesztés/A_utomata tördelés"
 
-#: src/compose.c:550 src/mainwindow.c:518 src/messageview.c:151
-#: src/summaryview.c:448
+#: src/compose.c:550 src/mainwindow.c:521 src/messageview.c:151
+#: src/summaryview.c:450
 msgid "/_View"
 msgstr "/_Nézet"
 
@@ -1370,9 +1370,9 @@ msgid "/_View/_Reply to"
 msgstr "/_Nézet/_Válasz"
 
 #: src/compose.c:555 src/compose.c:557 src/compose.c:559 src/compose.c:561
-#: src/mainwindow.c:538 src/mainwindow.c:541 src/mainwindow.c:568
-#: src/mainwindow.c:592 src/mainwindow.c:687 src/mainwindow.c:691
-#: src/messageview.c:236
+#: src/mainwindow.c:541 src/mainwindow.c:544 src/mainwindow.c:571
+#: src/mainwindow.c:595 src/mainwindow.c:696 src/mainwindow.c:700
+#: src/messageview.c:241
 msgid "/_View/---"
 msgstr "/_Nézet/---"
 
@@ -1388,7 +1388,7 @@ msgstr "/_Nézet/V_onalzó"
 msgid "/_View/_Attachment"
 msgstr "/_Nézet/_Csatolás"
 
-#: src/compose.c:567 src/mainwindow.c:599 src/messageview.c:158
+#: src/compose.c:567 src/mainwindow.c:602 src/messageview.c:158
 msgid "/_View/Character _encoding"
 msgstr "/_Nézet/_Karakterkódolás"
 
@@ -1397,212 +1397,223 @@ msgid "/_View/Character _encoding/_Automatic"
 msgstr "/_Nézet/_Karakterkódolás/_Automatikus"
 
 #: src/compose.c:570 src/compose.c:576 src/compose.c:582 src/compose.c:586
-#: src/compose.c:592 src/compose.c:596 src/compose.c:602 src/compose.c:606
-#: src/compose.c:616 src/compose.c:620 src/compose.c:628 src/compose.c:632
-#: src/mainwindow.c:595 src/mainwindow.c:602 src/messageview.c:154
+#: src/compose.c:592 src/compose.c:596 src/compose.c:602 src/compose.c:608
+#: src/compose.c:612 src/compose.c:622 src/compose.c:626 src/compose.c:634
+#: src/compose.c:638 src/mainwindow.c:598 src/mainwindow.c:605
+#: src/messageview.c:154
 msgid "/_View/Character _encoding/---"
 msgstr "/_Nézet/_Karakterkódolás/---"
 
-#: src/compose.c:572 src/mainwindow.c:603 src/messageview.c:162
+#: src/compose.c:572 src/mainwindow.c:606 src/messageview.c:162
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Nézet/_Karakterkódolás/7 bites ascii (US-ASC_II)"
 
-#: src/compose.c:574 src/mainwindow.c:605 src/messageview.c:165
+#: src/compose.c:574 src/mainwindow.c:608 src/messageview.c:165
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Nézet/_Karakterkódolás/Unicode (_UTF-8)"
 
-#: src/compose.c:578 src/mainwindow.c:609 src/messageview.c:168
+#: src/compose.c:578 src/mainwindow.c:612 src/messageview.c:168
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Nézet/_Karakterkódolás/Nyugat-Európai (ISO-8859-_1)"
 
-#: src/compose.c:580 src/mainwindow.c:611 src/messageview.c:170
+#: src/compose.c:580 src/mainwindow.c:614 src/messageview.c:170
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Nézet/_Karakterkódolás/Nyugat-Európai (ISO-8859-15)"
 
-#: src/compose.c:584 src/mainwindow.c:617 src/messageview.c:175
+#: src/compose.c:584 src/mainwindow.c:620 src/messageview.c:175
 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:588 src/mainwindow.c:621 src/messageview.c:178
+#: src/compose.c:588 src/mainwindow.c:624 src/messageview.c:178
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Nézet/_Karakterkódolás/_Baltikumi (ISO-8859-13)"
 
-#: src/compose.c:590 src/mainwindow.c:623 src/messageview.c:180
+#: src/compose.c:590 src/mainwindow.c:626 src/messageview.c:180
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Nézet/_Karakterkódolás/Baltikumi (ISO-8859-_4)"
 
-#: src/compose.c:594 src/mainwindow.c:627 src/messageview.c:183
+#: src/compose.c:594 src/mainwindow.c:630 src/messageview.c:183
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Nézet/_Karakterkódolás/Görög (ISO-8859-_7)"
 
-#: src/compose.c:598 src/mainwindow.c:631 src/messageview.c:186
+#: src/compose.c:598 src/mainwindow.c:634 src/messageview.c:186
+#, fuzzy
+msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
+msgstr "/_Nézet/_Karakterkódolás/Baltikumi (ISO-8859-_4)"
+
+#: src/compose.c:600 src/mainwindow.c:636 src/messageview.c:188
+#, fuzzy
+msgid "/_View/Character _encoding/Arabic (Windows-1256)"
+msgstr "/_Nézet/_Karakterkódolás/Cirill (Windows-1251)"
+
+#: src/compose.c:604 src/mainwindow.c:640 src/messageview.c:191
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Nézet/_Karakterkódolás/Héber (ISO-8859-_8)"
 
-#: src/compose.c:600 src/mainwindow.c:633 src/messageview.c:188
+#: src/compose.c:606 src/mainwindow.c:642 src/messageview.c:193
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Nézet/_Karakterkódolás/Héber (Windows-1255)"
 
-#: src/compose.c:604 src/mainwindow.c:637 src/messageview.c:191
+#: src/compose.c:610 src/mainwindow.c:646 src/messageview.c:196
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Nézet/_Karakterkódolás/Török (ISO-8859-_9)"
 
-#: src/compose.c:608 src/mainwindow.c:641 src/messageview.c:194
+#: src/compose.c:614 src/mainwindow.c:650 src/messageview.c:199
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Nézet/_Karakterkódolás/Cirill (ISO-8859-_5)"
 
-#: src/compose.c:610 src/mainwindow.c:643 src/messageview.c:196
+#: src/compose.c:616 src/mainwindow.c:652 src/messageview.c:201
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Nézet/_Karakterkódolás/Cirill (KOI8-_R)"
 
-#: src/compose.c:612 src/mainwindow.c:645 src/messageview.c:198
+#: src/compose.c:618 src/mainwindow.c:654 src/messageview.c:203
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Nézet/_Karakterkódolás/Cirill (KOI8-_U)"
 
-#: src/compose.c:614 src/mainwindow.c:647 src/messageview.c:200
+#: src/compose.c:620 src/mainwindow.c:656 src/messageview.c:205
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Nézet/_Karakterkódolás/Cirill (Windows-1251)"
 
-#: src/compose.c:618 src/mainwindow.c:651 src/messageview.c:203
+#: src/compose.c:624 src/mainwindow.c:660 src/messageview.c:208
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Nézet/_Karakterkódolás/Japán (ISO-2022-_JP)"
 
-#: src/compose.c:622 src/mainwindow.c:661 src/messageview.c:212
+#: src/compose.c:628 src/mainwindow.c:670 src/messageview.c:217
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Nézet/_Karakterkódolás/Egyszerűsített Kínai (_GB2312)"
 
-#: src/compose.c:624 src/mainwindow.c:663 src/messageview.c:214
+#: src/compose.c:630 src/mainwindow.c:672 src/messageview.c:219
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Nézet/_Karakterkódolás/Egyszerűsített Kínai (GBK)"
 
-#: src/compose.c:626 src/mainwindow.c:665 src/messageview.c:216
+#: src/compose.c:632 src/mainwindow.c:674 src/messageview.c:221
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Nézet/_Karakterkódolás/Tradicionális Kínai (_Big5)"
 
-#: src/compose.c:630 src/mainwindow.c:673 src/messageview.c:223
+#: src/compose.c:636 src/mainwindow.c:682 src/messageview.c:228
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Nézet/_Karakterkódolás/Koreai (EUC-_KR)"
 
-#: src/compose.c:634 src/mainwindow.c:679 src/messageview.c:228
+#: src/compose.c:640 src/mainwindow.c:688 src/messageview.c:233
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Nézet/_Karakterkódolás/Thai (TIS-620)"
 
-#: src/compose.c:636 src/mainwindow.c:681 src/messageview.c:230
+#: src/compose.c:642 src/mainwindow.c:690 src/messageview.c:235
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Nézet/_Karakterkódolás/Thai (Windows-874)"
 
-#: src/compose.c:640 src/mainwindow.c:739 src/messageview.c:260
+#: src/compose.c:646 src/mainwindow.c:750 src/messageview.c:265
 msgid "/_Tools/_Address book"
 msgstr "/_Eszközök/_Címjegyzék"
 
-#: src/compose.c:641
+#: src/compose.c:647
 msgid "/_Tools/_Template"
 msgstr "/_Eszközök/_Sablon"
 
-#: src/compose.c:642 src/mainwindow.c:762 src/messageview.c:275
+#: src/compose.c:648 src/mainwindow.c:773 src/messageview.c:280
 msgid "/_Tools/Actio_ns"
 msgstr "/_Eszközök/_Akciók"
 
-#: src/compose.c:643 src/compose.c:647 src/compose.c:653 src/mainwindow.c:742
-#: src/mainwindow.c:756 src/mainwindow.c:761 src/mainwindow.c:763
-#: src/mainwindow.c:766 src/mainwindow.c:768 src/messageview.c:263
-#: src/messageview.c:274
+#: src/compose.c:649 src/compose.c:653 src/compose.c:659 src/mainwindow.c:753
+#: src/mainwindow.c:767 src/mainwindow.c:772 src/mainwindow.c:774
+#: src/mainwindow.c:777 src/mainwindow.c:779 src/messageview.c:268
+#: src/messageview.c:279
 msgid "/_Tools/---"
 msgstr "/_Eszközök/---"
 
-#: src/compose.c:644
+#: src/compose.c:650
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/_Szerkesztés/Szerkesztés _külső programmal"
 
-#: src/compose.c:648
+#: src/compose.c:654
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Eszközök/PGP _Aláírás"
 
-#: src/compose.c:649
+#: src/compose.c:655
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/_Eszközök/PGP _Titkosítás"
 
-#: src/compose.c:654
+#: src/compose.c:660
 msgid "/_Tools/_Check spell"
 msgstr "/_Eszközök/_Helyesírásellenőrzés"
 
-#: src/compose.c:655
+#: src/compose.c:661
 msgid "/_Tools/_Set spell language"
 msgstr "/_Eszközök/Helyesírás _nyelvi beállítások"
 
-#: src/compose.c:899
+#: src/compose.c:908
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: fájl nem létezik\n"
 
-#: src/compose.c:1003 src/compose.c:1074
+#: src/compose.c:1012 src/compose.c:1083
 msgid "Can't get text part\n"
 msgstr "Nem tudtam olvasni a szövegrészt\n"
 
-#: src/compose.c:1475
+#: src/compose.c:1484
 msgid "Quote mark format error."
 msgstr "Idézet jelölés formátum hiba."
 
-#: src/compose.c:1487
+#: src/compose.c:1496
 msgid "Message reply/forward format error."
 msgstr "Üzenet válasz/továbbítás formátum hiba."
 
-#: src/compose.c:1907
+#: src/compose.c:1916
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "%s fájl nem létezik\n"
 
-#: src/compose.c:1911
+#: src/compose.c:1920
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "%s mérete nem meghatározható\n"
 
-#: src/compose.c:1915
+#: src/compose.c:1924
 #, c-format
 msgid "File %s is empty."
 msgstr "A(z) %s fájl üres."
 
-#: src/compose.c:1919
+#: src/compose.c:1928
 #, c-format
 msgid "Can't read %s."
 msgstr "%s nem olvasható."
 
-#: src/compose.c:1952
+#: src/compose.c:1961
 #, c-format
 msgid "Message: %s"
 msgstr "Üzenet: %s"
 
-#: src/compose.c:2012 src/mimeview.c:565
+#: src/compose.c:2021 src/mimeview.c:565
 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:2496 src/headerview.c:195 src/query_search.c:636
-#: src/summaryview.c:2107
+#: src/compose.c:2505 src/headerview.c:195 src/query_search.c:636
+#: src/summaryview.c:2124
 msgid "(No Subject)"
 msgstr "(Nincs Tárgy)"
 
-#: src/compose.c:2499
+#: src/compose.c:2508
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Üzenet írása%s"
 
-#: src/compose.c:2612
+#: src/compose.c:2621
 msgid "Recipient is not specified."
 msgstr "Nincs címzett megadva."
 
-#: src/compose.c:2620
+#: src/compose.c:2629
 msgid "Empty subject"
 msgstr "Nincs tárgy"
 
-#: src/compose.c:2621
+#: src/compose.c:2630
 msgid "Subject is empty. Send it anyway?"
 msgstr "A levél tárgya üres. Ennek ellenére elküldi?"
 
-#: src/compose.c:2680
+#: src/compose.c:2689
 msgid "can't get recipient list."
 msgstr "címzett lista nem hozzáférhető."
 
-#: src/compose.c:2700
+#: src/compose.c:2709
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1610,22 +1621,22 @@ 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:2714 src/send_message.c:299
+#: src/compose.c:2723 src/send_message.c:299
 #, 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:2756
+#: src/compose.c:2765
 msgid "Can't save the message to outbox."
 msgstr "Az üzenet nem menthető a kimenő mappába."
 
-#: src/compose.c:2794
+#: src/compose.c:2803
 #, 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:2891
+#: src/compose.c:2900
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1636,11 +1647,11 @@ msgstr ""
 "\n"
 "Ennek ellenére elküldi mint %s?"
 
-#: src/compose.c:2897
+#: src/compose.c:2906
 msgid "Code conversion error"
 msgstr "Kód konvertálási hiba"
 
-#: src/compose.c:2970
+#: src/compose.c:2979
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1653,157 +1664,157 @@ msgstr ""
 "\n"
 "Ennek ellenére elküldi?"
 
-#: src/compose.c:2974
+#: src/compose.c:2983
 msgid "Line length limit"
 msgstr "Sorhossz határ"
 
-#: src/compose.c:3264
+#: src/compose.c:3273
 msgid "can't remove the old message\n"
 msgstr "a régi üzenetet nem lehet eltávolítani\n"
 
-#: src/compose.c:3282
+#: src/compose.c:3291
 msgid "queueing message...\n"
 msgstr "üzenet a Várakozó sorba...\n"
 
-#: src/compose.c:3364
+#: src/compose.c:3373
 msgid "can't find queue folder\n"
 msgstr "nem található a Várakozó sor mappája\n"
 
-#: src/compose.c:3371
+#: src/compose.c:3380
 msgid "can't queue the message\n"
 msgstr "Az üzenetet nem sikerült a Várakozó sorba rakni\n"
 
-#: src/compose.c:3964
+#: src/compose.c:3973
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "generált Üzenet-azonosító: %s\n"
 
-#: src/compose.c:4077
+#: src/compose.c:4086
 msgid "Creating compose window...\n"
 msgstr "Szerkesztőablak létrehozása...\n"
 
-#: src/compose.c:4128 src/headerview.c:54
+#: src/compose.c:4137 src/headerview.c:54
 msgid "From:"
 msgstr "Feladó:"
 
-#: src/compose.c:4202
+#: src/compose.c:4211
 msgid "PGP Sign"
 msgstr "PGP Aláírás"
 
-#: src/compose.c:4205
+#: src/compose.c:4214
 msgid "PGP Encrypt"
 msgstr "PGP Titkosítás"
 
-#: src/compose.c:4243 src/compose.c:5317
+#: src/compose.c:4252 src/compose.c:5326
 msgid "MIME type"
 msgstr "MIME típus"
 
 #. S_COL_DATE
-#: src/compose.c:4252 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4740
+#: src/compose.c:4261 src/mimeview.c:197 src/prefs_filter_edit.c:496
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4897
 msgid "Size"
 msgstr "Méret"
 
-#: src/compose.c:4683 src/mainwindow.c:2324 src/prefs_account_dialog.c:528
+#: src/compose.c:4692 src/mainwindow.c:2335 src/prefs_account_dialog.c:528
 #: src/prefs_common_dialog.c:661
 msgid "Send"
 msgstr "Küldés"
 
-#: src/compose.c:4684
+#: src/compose.c:4693
 msgid "Send message"
 msgstr "Üzenet küldése"
 
-#: src/compose.c:4692
+#: src/compose.c:4701
 msgid "Send later"
 msgstr "Küldés később"
 
-#: src/compose.c:4693
+#: src/compose.c:4702
 msgid "Put into queue folder and send later"
 msgstr "Üzenet a Várakozó sorba, küldés később"
 
-#: src/compose.c:4701
+#: src/compose.c:4710
 msgid "Draft"
 msgstr "Vázlat"
 
-#: src/compose.c:4702
+#: src/compose.c:4711
 msgid "Save to draft folder"
 msgstr "Mentés a vázlat mappába"
 
-#: src/compose.c:4712
+#: src/compose.c:4721
 msgid "Insert"
 msgstr "Beszúrás"
 
-#: src/compose.c:4713
+#: src/compose.c:4722
 msgid "Insert file"
 msgstr "Fájl beszúrása"
 
-#: src/compose.c:4721
+#: src/compose.c:4730
 msgid "Attach"
 msgstr "Csatolás"
 
-#: src/compose.c:4722
+#: src/compose.c:4731
 msgid "Attach file"
 msgstr "Fájl csatolása"
 
 #. signature
-#: src/compose.c:4732 src/prefs_account_dialog.c:1208
+#: src/compose.c:4741 src/prefs_account_dialog.c:1208
 #: src/prefs_common_dialog.c:953
 msgid "Signature"
 msgstr "Aláírás"
 
-#: src/compose.c:4733
+#: src/compose.c:4742
 #, fuzzy
 msgid "Append signature"
 msgstr "ROSSZ digitális aláírás"
 
 #. editor
-#: src/compose.c:4742 src/prefs_common_dialog.c:991
+#: src/compose.c:4751 src/prefs_common_dialog.c:991
 #: src/prefs_common_dialog.c:2315
 msgid "Editor"
 msgstr "Szerkesztő"
 
-#: src/compose.c:4743
+#: src/compose.c:4752
 msgid "Edit with external editor"
 msgstr "Szerkesztés külső programmal"
 
-#: src/compose.c:4751
+#: src/compose.c:4760
 msgid "Linewrap"
 msgstr "Sortörés"
 
-#: src/compose.c:4752
+#: src/compose.c:4761
 msgid "Wrap all long lines"
 msgstr "Az összes hosszú sor törése"
 
-#: src/compose.c:5213
+#: src/compose.c:5222
 msgid "Invalid MIME type."
 msgstr "Érvénytelen MIME típus."
 
-#: src/compose.c:5231
+#: src/compose.c:5240
 msgid "File doesn't exist or is empty."
 msgstr "A fájl nem létezik vagy üres."
 
-#: src/compose.c:5299
+#: src/compose.c:5308
 msgid "Properties"
 msgstr "Tulajdonságok"
 
-#: src/compose.c:5319 src/prefs_common_dialog.c:1444
+#: src/compose.c:5328 src/prefs_common_dialog.c:1444
 msgid "Encoding"
 msgstr "Kódolás"
 
-#: src/compose.c:5342 src/prefs_folder_item.c:202
+#: src/compose.c:5351 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Elérési út"
 
-#: src/compose.c:5343
+#: src/compose.c:5352
 msgid "File name"
 msgstr "Fájlnév"
 
-#: src/compose.c:5436
+#: src/compose.c:5445
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Külső szerkesztő parancssora érvénytelen: `%s'\n"
 
-#: src/compose.c:5482
+#: src/compose.c:5491
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1812,44 +1823,44 @@ msgstr ""
 "A külső szerkesztő még dolgozik.\n"
 "A processz kényszerített kilövése (pid: %d)?\n"
 
-#: src/compose.c:5857 src/compose.c:5862 src/compose.c:5868
+#: src/compose.c:5866 src/compose.c:5871 src/compose.c:5877
 msgid "Can't queue the message."
 msgstr "Az üzenetet nem sikerült a Várakozó sorba rakni"
 
-#: src/compose.c:5959
+#: src/compose.c:5968
 msgid "Select files"
 msgstr "Fájlok választása"
 
-#: src/compose.c:5982
+#: src/compose.c:5991
 msgid "Select file"
 msgstr "Fájl választás"
 
-#: src/compose.c:6017
+#: src/compose.c:6026
 msgid "Save message"
 msgstr "Üzenet mentése"
 
-#: src/compose.c:6018
+#: src/compose.c:6027
 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:6020
+#: src/compose.c:6029
 msgid "Close _without saving"
 msgstr "Bezárás mentés _nélkül"
 
-#: src/compose.c:6062
+#: src/compose.c:6071
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Tényleg alkalmazni szeretné a(z) `%s' sablont?"
 
-#: src/compose.c:6064
+#: src/compose.c:6073
 msgid "Apply template"
 msgstr "Sablon alkalmazása"
 
-#: src/compose.c:6065
+#: src/compose.c:6074
 msgid "_Replace"
 msgstr "_Helyettesít"
 
-#: src/compose.c:6065
+#: src/compose.c:6074
 msgid "_Insert"
 msgstr "_Beszúrás"
 
@@ -2284,7 +2295,7 @@ msgstr "Új"
 
 #. S_COL_MARK
 #: src/folderview.c:412 src/prefs_filter_edit.c:500
-#: src/prefs_summary_column.c:71 src/summaryview.c:509
+#: src/prefs_summary_column.c:71 src/summaryview.c:511
 msgid "Unread"
 msgstr "Olvasatlan"
 
@@ -2300,12 +2311,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:858 src/mainwindow.c:3464 src/setup.c:80
+#: src/folderview.c:858 src/mainwindow.c:3481 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "%s%c%s mappa átvizsgálása..."
 
-#: src/folderview.c:862 src/mainwindow.c:3469 src/setup.c:85
+#: src/folderview.c:862 src/mainwindow.c:3486 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "%s mappa átvizsgálása..."
@@ -2330,7 +2341,7 @@ msgstr "Mappafa újraépítése sikertelen."
 msgid "Checking for new messages in all folders..."
 msgstr "Új üzenetek keresése minden mappában..."
 
-#: src/folderview.c:1200 src/mainwindow.c:2400 src/prefs_common_dialog.c:1789
+#: src/folderview.c:1200 src/mainwindow.c:2411 src/prefs_common_dialog.c:1789
 msgid "Junk"
 msgstr "Levélszemét"
 
@@ -2470,7 +2481,7 @@ msgstr "Tárgy:"
 msgid "Creating header view...\n"
 msgstr "Fejléc nézet létrehozása...\n"
 
-#: src/headerview.c:180 src/query_search.c:637 src/summaryview.c:2110
+#: src/headerview.c:180 src/query_search.c:637 src/summaryview.c:2127
 msgid "(No From)"
 msgstr "(Nincs Feladó)"
 
@@ -2579,7 +2590,7 @@ msgstr "LDIF fájl importálása a címjegyzékbe"
 msgid "Prev"
 msgstr "Előző"
 
-#: src/importldif.c:768 src/mainwindow.c:2420
+#: src/importldif.c:768 src/mainwindow.c:2431
 msgid "Next"
 msgstr "Következő"
 
@@ -2931,11 +2942,11 @@ msgstr ""
 msgid "another Sylpheed is already running.\n"
 msgstr "Egy másik Sylpheed már fut.\n"
 
-#: src/main.c:1064
+#: src/main.c:1083
 msgid "Migration of configuration"
 msgstr "Beállítások migrálása"
 
-#: src/main.c:1065
+#: src/main.c:1084
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -2943,632 +2954,637 @@ msgstr ""
 "Az előző verzió konfigurációja megtalálva.\n"
 "Szeretné migrálni azokat?"
 
-#: src/mainwindow.c:478
+#: src/mainwindow.c:481
 msgid "/_File/_Folder"
 msgstr "/_Fájl/_Mappa"
 
-#: src/mainwindow.c:479
+#: src/mainwindow.c:482
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/_Fájl/_Mappa/Ú_j mappa létrehozása..."
 
-#: src/mainwindow.c:481
+#: src/mainwindow.c:484
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/_Fájl/_Mappa/Mappa Át_nevezése..."
 
-#: src/mainwindow.c:482
+#: src/mainwindow.c:485
 msgid "/_File/_Folder/_Move folder..."
 msgstr "/_Fájl/_Mappa/Mappa át_helyezése..."
 
-#: src/mainwindow.c:483
+#: src/mainwindow.c:486
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/_Fájl/_Mappa/Mappa _Törlése"
 
-#: src/mainwindow.c:484
+#: src/mainwindow.c:487
 msgid "/_File/_Mailbox"
 msgstr "/_Fájl/_Postaláda"
 
-#: src/mainwindow.c:485
+#: src/mainwindow.c:488
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/_Fájl/_Postaláda/Postaláda _hozzáadása..."
 
-#: src/mainwindow.c:486
+#: src/mainwindow.c:489
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/_Fájl/_Postaláda/Postaláda _eltávolítása"
 
-#: src/mainwindow.c:487 src/mainwindow.c:492
+#: src/mainwindow.c:490 src/mainwindow.c:495
 msgid "/_File/_Mailbox/---"
 msgstr "/_Fájl/_Postaláda/---"
 
-#: src/mainwindow.c:488
+#: src/mainwindow.c:491
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "/_Fájl/_Postaláda/Ú_j üzenetek ellenőrzése"
 
-#: src/mainwindow.c:490
+#: src/mainwindow.c:493
 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:493
+#: src/mainwindow.c:496
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "/_Fájl/_Postaláda/_Mappafa újraépítése"
 
-#: src/mainwindow.c:496
+#: src/mainwindow.c:499
 msgid "/_File/_Import mbox file..."
 msgstr "/_Fájl/Mbox fájl _importálása..."
 
-#: src/mainwindow.c:497
+#: src/mainwindow.c:500
 msgid "/_File/_Export to mbox file..."
 msgstr "/_Fájl/Mbox fájl _exportálása..."
 
-#: src/mainwindow.c:499
+#: src/mainwindow.c:502
 msgid "/_File/Empty all _trash"
 msgstr "/_Fájl/_Kuka ürítése"
 
-#: src/mainwindow.c:501 src/messageview.c:139
+#: src/mainwindow.c:504 src/messageview.c:139
 msgid "/_File/_Save as..."
 msgstr "/_Fájl/_Mentés másként..."
 
-#: src/mainwindow.c:502 src/messageview.c:140
+#: src/mainwindow.c:505 src/messageview.c:140
 msgid "/_File/_Print..."
 msgstr "/_Fájl/_Nyomtatás..."
 
-#: src/mainwindow.c:504
+#: src/mainwindow.c:507
 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:507
+#: src/mainwindow.c:510
 msgid "/_File/E_xit"
 msgstr "/_Fájl/Ki_lépés"
 
-#: src/mainwindow.c:512
+#: src/mainwindow.c:515
 msgid "/_Edit/Select _thread"
 msgstr "/_Szerkesztés/Üzenet_folyam kiválasztása"
 
-#: src/mainwindow.c:514 src/messageview.c:148
+#: src/mainwindow.c:517 src/messageview.c:148
 msgid "/_Edit/_Find in current message..."
 msgstr "/_Szerkesztés/_Keresés az aktuális üzenetben..."
 
-#: src/mainwindow.c:516
+#: src/mainwindow.c:519
 msgid "/_Edit/_Search messages..."
 msgstr "/_Szerkesztés/Ü_zenetek keresése..."
 
-#: src/mainwindow.c:519
+#: src/mainwindow.c:522
 msgid "/_View/Show or hi_de"
 msgstr "/_Nézet/_Megjelenít vagy elrejt"
 
-#: src/mainwindow.c:520
+#: src/mainwindow.c:523
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/_Nézet/_Megjelenít vagy elrejt/Mappa_fa"
 
-#: src/mainwindow.c:522
+#: src/mainwindow.c:525
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/_Nézet/_Megjelenít vagy elrejt/_Üzenet nézet"
 
-#: src/mainwindow.c:524
+#: src/mainwindow.c:527
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/_Nézet/_Megjelenít vagy elrejt/_Eszközsáv"
 
-#: src/mainwindow.c:526
+#: src/mainwindow.c:529
 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:528
+#: src/mainwindow.c:531
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/_Nézet/_Megjelenít vagy elrejt/_Eszközsáv/_Ikon"
 
-#: src/mainwindow.c:530
+#: src/mainwindow.c:533
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/_Nézet/_Megjelenít vagy elrejt/_Eszközsáv/_Szöveg"
 
-#: src/mainwindow.c:532
+#: src/mainwindow.c:535
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/_Nézet/_Megjelenít vagy elrejt/_Eszközsáv/Se_mmi"
 
-#: src/mainwindow.c:534
+#: src/mainwindow.c:537
 #, fuzzy
 msgid "/_View/Show or hi_de/_Search bar"
 msgstr "/_Nézet/_Megjelenít vagy elrejt/Á_llapotsor"
 
-#: src/mainwindow.c:536
+#: src/mainwindow.c:539
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/_Nézet/_Megjelenít vagy elrejt/Á_llapotsor"
 
-#: src/mainwindow.c:539
+#: src/mainwindow.c:542
 msgid "/_View/Separate f_older tree"
 msgstr "/_Nézet/_Külön mappafa"
 
-#: src/mainwindow.c:540
+#: src/mainwindow.c:543
 msgid "/_View/Separate _message view"
 msgstr "/_Nézet/Külön üz_enetnézet"
 
-#: src/mainwindow.c:542
+#: src/mainwindow.c:545
 msgid "/_View/_Sort"
 msgstr "/_Nézet/_Rendezés"
 
-#: src/mainwindow.c:543
+#: src/mainwindow.c:546
 msgid "/_View/_Sort/by _number"
 msgstr "/_Nézet/_Rendezés/_Szám szerint"
 
-#: src/mainwindow.c:544
+#: src/mainwindow.c:547
 msgid "/_View/_Sort/by s_ize"
 msgstr "/_Nézet/_Rendezés/_Méret szerint"
 
-#: src/mainwindow.c:545
+#: src/mainwindow.c:548
 msgid "/_View/_Sort/by _date"
 msgstr "/_Nézet/_Rendezés/_Dátum szerint"
 
-#: src/mainwindow.c:546
+#: src/mainwindow.c:549
 msgid "/_View/_Sort/by t_hread date"
 msgstr "/_Nézet/_Rendezés/_Szál dátuma szerint"
 
-#: src/mainwindow.c:547
+#: src/mainwindow.c:550
 msgid "/_View/_Sort/by _from"
 msgstr "/_Nézet/_Rendezés/_Feladó szerint"
 
-#: src/mainwindow.c:548
+#: src/mainwindow.c:551
 msgid "/_View/_Sort/by _recipient"
 msgstr "/_Nézet/_Rendezés/_Címzett szerint"
 
-#: src/mainwindow.c:549
+#: src/mainwindow.c:552
 msgid "/_View/_Sort/by _subject"
 msgstr "/_Nézet/_Rendezés/_Tárgy szerint"
 
-#: src/mainwindow.c:550
+#: src/mainwindow.c:553
 msgid "/_View/_Sort/by _color label"
 msgstr "/_Nézet/_Rendezés/S_zínes címke szerint"
 
-#: src/mainwindow.c:552
+#: src/mainwindow.c:555
 msgid "/_View/_Sort/by _mark"
 msgstr "/_Nézet/_Rendezés/_Jelölés szerint"
 
-#: src/mainwindow.c:553
+#: src/mainwindow.c:556
 msgid "/_View/_Sort/by _unread"
 msgstr "/_Nézet/_Rendezés/_Olvasatlan szerint"
 
-#: src/mainwindow.c:554
+#: src/mainwindow.c:557
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/_Nézet/_Rendezés/Cs_atolás szerint"
 
-#: src/mainwindow.c:556
+#: src/mainwindow.c:559
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/_Nézet/_Rendezés/Nem _rendez"
 
-#: src/mainwindow.c:557 src/mainwindow.c:560
+#: src/mainwindow.c:560 src/mainwindow.c:563
 msgid "/_View/_Sort/---"
 msgstr "/_Nézet/_Rendez/---"
 
-#: src/mainwindow.c:558
+#: src/mainwindow.c:561
 msgid "/_View/_Sort/Ascending"
 msgstr "/_Nézet/_Rendezés/_Növekvő"
 
-#: src/mainwindow.c:559
+#: src/mainwindow.c:562
 msgid "/_View/_Sort/Descending"
 msgstr "/_Nézet/_Rendezés/_Csökkenő"
 
-#: src/mainwindow.c:561
+#: src/mainwindow.c:564
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/_Nézet/_Rendezés/_Tárgyhoz vonz"
 
-#: src/mainwindow.c:563
+#: src/mainwindow.c:566
 msgid "/_View/Th_read view"
 msgstr "/_Nézet/Ü_zenetfolyam nézet"
 
-#: src/mainwindow.c:564
+#: src/mainwindow.c:567
 msgid "/_View/E_xpand all threads"
 msgstr "/_Nézet/_Minden üzenetfolyam kifejtése"
 
-#: src/mainwindow.c:565
+#: src/mainwindow.c:568
 msgid "/_View/Co_llapse all threads"
 msgstr "/_Nézet/_Minden üzenetfolyam bezárása"
 
-#: src/mainwindow.c:566
+#: src/mainwindow.c:569
 msgid "/_View/Set display _item..."
 msgstr "/_Nézet/K_ijelzett cikk beállítás..."
 
-#: src/mainwindow.c:569
+#: src/mainwindow.c:572
 msgid "/_View/_Go to"
 msgstr "/_Nézet/_Ugrás"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:573
 msgid "/_View/_Go to/_Prev message"
 msgstr "/_Nézet/_Ugrás/_Előző üzenethez"
 
-#: src/mainwindow.c:571
+#: src/mainwindow.c:574
 msgid "/_View/_Go to/_Next message"
 msgstr "/_Nézet/_Ugrás/_Következő üzenethez"
 
-#: src/mainwindow.c:572 src/mainwindow.c:577 src/mainwindow.c:580
-#: src/mainwindow.c:585 src/mainwindow.c:590
+#: src/mainwindow.c:575 src/mainwindow.c:580 src/mainwindow.c:583
+#: src/mainwindow.c:588 src/mainwindow.c:593
 msgid "/_View/_Go to/---"
 msgstr "/_Nézet/_Ugrás/---"
 
-#: src/mainwindow.c:573
+#: src/mainwindow.c:576
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/_Nézet/_Ugrás/_Előző olvasatlan üzenethez"
 
-#: src/mainwindow.c:575
+#: src/mainwindow.c:578
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/_Nézet/_Ugrás/_Következő olvasatlan üzenethez"
 
-#: src/mainwindow.c:578
+#: src/mainwindow.c:581
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/_Nézet/_Ugrás/_Előző új üzenethez"
 
-#: src/mainwindow.c:579
+#: src/mainwindow.c:582
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/_Nézet/_Ugrás/_Következő új üzenethez"
 
-#: src/mainwindow.c:581
+#: src/mainwindow.c:584
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/_Nézet/_Ugrás/_Előző megjelölt üzenethez"
 
-#: src/mainwindow.c:583
+#: src/mainwindow.c:586
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/_Nézet/_Ugrás/_Következő megjelölt üzenethez"
 
-#: src/mainwindow.c:586
+#: src/mainwindow.c:589
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/_Nézet/_Ugrás/_Előző címkézett üzenethez"
 
-#: src/mainwindow.c:588
+#: src/mainwindow.c:591
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/_Nézet/_Ugrás/_Következő címkézett üzenethez"
 
-#: src/mainwindow.c:591
+#: src/mainwindow.c:594
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Nézet/_Ugrás/_Másik _mappához"
 
-#: src/mainwindow.c:600 src/messageview.c:159
+#: src/mainwindow.c:603 src/messageview.c:159
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Nézet/_Karakterkódolás/_Automatikus felismerés"
 
-#: src/mainwindow.c:613 src/messageview.c:172
+#: src/mainwindow.c:616 src/messageview.c:172
 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr "/_Nézet/_Karakterkódolás/Nyugat-Európai (Windows-1252)"
 
-#: src/mainwindow.c:653 src/messageview.c:205
+#: src/mainwindow.c:662 src/messageview.c:210
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Nézet/_Karakterkódolás/Japán (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:655 src/messageview.c:207
+#: src/mainwindow.c:664 src/messageview.c:212
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Nézet/_Karakterkódolás/Japán (_EUC-JP)"
 
-#: src/mainwindow.c:657 src/messageview.c:209
+#: src/mainwindow.c:666 src/messageview.c:214
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Nézet/_Karakterkódolás/Japán (_Shift__JIS)"
 
-#: src/mainwindow.c:667 src/messageview.c:218
+#: src/mainwindow.c:676 src/messageview.c:223
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Nézet/_Karakterkódolás/Tradicionális Kínai (EUC-_TW)"
 
-#: src/mainwindow.c:669 src/messageview.c:220
+#: src/mainwindow.c:678 src/messageview.c:225
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Nézet/_Karakterkódolás/Kínai (ISO-2022-_CN)"
 
-#: src/mainwindow.c:675 src/messageview.c:225
+#: src/mainwindow.c:684 src/messageview.c:230
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Nézet/_Karakterkódolás/Koreai (ISO-2022-KR)"
 
-#: src/mainwindow.c:688 src/summaryview.c:449
+#: src/mainwindow.c:697 src/summaryview.c:451
 msgid "/_View/Open in new _window"
 msgstr "/_Nézet/Me_gnyitás új ablakban"
 
-#: src/mainwindow.c:689 src/messageview.c:237
+#: src/mainwindow.c:698 src/messageview.c:242
 msgid "/_View/Mess_age source"
 msgstr "/_Nézet/Ü_zenet forrása"
 
-#: src/mainwindow.c:690 src/messageview.c:238
+#: src/mainwindow.c:699 src/messageview.c:243
 msgid "/_View/Show all _header"
 msgstr "/_Nézet/_Minden fejléc megjelenítése"
 
-#: src/mainwindow.c:692
+#: src/mainwindow.c:701
 msgid "/_View/_Update summary"
 msgstr "/_Nézet/Ö_sszegzés frissítése"
 
-#: src/mainwindow.c:694 src/messageview.c:240
+#: src/mainwindow.c:703 src/messageview.c:245
 msgid "/_Message"
 msgstr "/_Üzenet"
 
-#: src/mainwindow.c:695
+#: src/mainwindow.c:704
 msgid "/_Message/Recei_ve"
 msgstr "/_Üzenet/Fog_adás"
 
-#: src/mainwindow.c:696
+#: src/mainwindow.c:705
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/_Üzenet/Fog_adás/_Jelenlegi hozzáférésről"
 
-#: src/mainwindow.c:698
+#: src/mainwindow.c:707
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/_Üzenet/Fog_adás/_Minden hozzáférésről"
 
-#: src/mainwindow.c:700
+#: src/mainwindow.c:709
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/_Üzenet/Fo_gadás/Fogadás me_gszakítása"
 
-#: src/mainwindow.c:702
+#: src/mainwindow.c:711
 msgid "/_Message/Recei_ve/---"
 msgstr "/_Üzenet/Fog_adás/---"
 
-#: src/mainwindow.c:703
+#: src/mainwindow.c:712
 msgid "/_Message/_Send queued messages"
 msgstr "/_Üzenet/Ü_zenetek küldése a Várakozó sorból"
 
-#: src/mainwindow.c:704 src/mainwindow.c:706 src/mainwindow.c:713
-#: src/mainwindow.c:718 src/mainwindow.c:721 src/mainwindow.c:730
-#: src/mainwindow.c:732 src/mainwindow.c:735 src/messageview.c:243
-#: src/messageview.c:251 src/messageview.c:256
+#: src/mainwindow.c:713 src/mainwindow.c:715 src/mainwindow.c:722
+#: src/mainwindow.c:727 src/mainwindow.c:730 src/mainwindow.c:741
+#: src/mainwindow.c:743 src/mainwindow.c:746 src/messageview.c:248
+#: src/messageview.c:256 src/messageview.c:261
 msgid "/_Message/---"
 msgstr "/_Üzenet/---"
 
-#: src/mainwindow.c:705 src/messageview.c:241
+#: src/mainwindow.c:714 src/messageview.c:246
 msgid "/_Message/Compose _new message"
 msgstr "/_Üzenet/_Új üzenet szerkesztése"
 
-#: src/mainwindow.c:707 src/messageview.c:244
+#: src/mainwindow.c:716 src/messageview.c:249
 msgid "/_Message/_Reply"
 msgstr "/_Üzenet/Vá_lasz"
 
-#: src/mainwindow.c:708
+#: src/mainwindow.c:717
 msgid "/_Message/Repl_y to"
 msgstr "/_Üzenet/_Válasz másnak"
 
-#: src/mainwindow.c:709 src/messageview.c:245
+#: src/mainwindow.c:718 src/messageview.c:250
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Üzenet/Válasz _másnak/_Mindenkinek"
 
-#: src/mainwindow.c:710 src/messageview.c:247
+#: src/mainwindow.c:719 src/messageview.c:252
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Üzenet/Válasz _másnak/A _küldőnek"
 
-#: src/mainwindow.c:711 src/messageview.c:249
+#: src/mainwindow.c:720 src/messageview.c:254
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Üzenet/Válasz _másnak/_Levelező listának"
 
-#: src/mainwindow.c:714 src/messageview.c:252
+#: src/mainwindow.c:723 src/messageview.c:257
 msgid "/_Message/_Forward"
 msgstr "/_Üzenet/_Továbbítás"
 
-#: src/mainwindow.c:715 src/messageview.c:253
+#: src/mainwindow.c:724 src/messageview.c:258
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Üzenet/Továbbítás _csatolásként"
 
-#: src/mainwindow.c:717 src/messageview.c:255
+#: src/mainwindow.c:726 src/messageview.c:260
 msgid "/_Message/Redirec_t"
 msgstr "/_Üzenet/Á_tirányít"
 
-#: src/mainwindow.c:719
+#: src/mainwindow.c:728
 msgid "/_Message/M_ove..."
 msgstr "/_Üzenet/M_ozgatás..."
 
-#: src/mainwindow.c:720
+#: src/mainwindow.c:729
 msgid "/_Message/_Copy..."
 msgstr "/_Üzenet/_Másolás..."
 
-#: src/mainwindow.c:722
+#: src/mainwindow.c:731
 msgid "/_Message/_Mark"
 msgstr "/_Üzenet/_Megjelöl"
 
-#: src/mainwindow.c:723
+#: src/mainwindow.c:732
 msgid "/_Message/_Mark/_Mark"
 msgstr "/_Üzenet/_Megjelöl/_Megjelöl"
 
-#: src/mainwindow.c:724
+#: src/mainwindow.c:733
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/_Üzenet/_Megjelöl/Megjelölés visszavonása"
 
-#: src/mainwindow.c:725
+#: src/mainwindow.c:734
 msgid "/_Message/_Mark/---"
 msgstr "/_Üzenet/_Megjelöl/---"
 
-#: src/mainwindow.c:726
+#: src/mainwindow.c:735
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/_Üzenet/_Megjelöl/Mint olvasatla_n"
 
-#: src/mainwindow.c:727
+#: src/mainwindow.c:736
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/_Üzenet/_Megjelöl/Mint olvaso_tt"
 
-#: src/mainwindow.c:729
+#: src/mainwindow.c:738
+#, fuzzy
+msgid "/_Message/_Mark/Mark _thread as read"
+msgstr "/_Üzenet/_Megjelöl/Mint olvaso_tt"
+
+#: src/mainwindow.c:740
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/_Üzenet/_Megjelöl/_Minden olvasottat"
 
-#: src/mainwindow.c:731
+#: src/mainwindow.c:742
 msgid "/_Message/_Delete"
 msgstr "/_Üzenet/_Törlés"
 
-#: src/mainwindow.c:733
+#: src/mainwindow.c:744
 msgid "/_Message/Set as _junk mail"
 msgstr "/_Üzenet/_Levélszemétként beállítás"
 
-#: src/mainwindow.c:734
+#: src/mainwindow.c:745
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/_Üzenet/_Nem levélszemétként beállítás"
 
-#: src/mainwindow.c:736 src/messageview.c:257
+#: src/mainwindow.c:747 src/messageview.c:262
 msgid "/_Message/Re-_edit"
 msgstr "/_Üzenet/_Szerkesztés újra"
 
-#: src/mainwindow.c:740
+#: src/mainwindow.c:751
 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:743
+#: src/mainwindow.c:754
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/_Eszközök/Összes üzenet szűrése a mappában"
 
-#: src/mainwindow.c:745
+#: src/mainwindow.c:756
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Eszközök/Kivá_lasztott üzenetek szűrése"
 
-#: src/mainwindow.c:747 src/messageview.c:264
+#: src/mainwindow.c:758 src/messageview.c:269
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Eszközök/_Szűrési szabályok"
 
-#: src/mainwindow.c:748 src/messageview.c:266
+#: src/mainwindow.c:759 src/messageview.c:271
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Eszközök/_Szűrési szabályok/_Automatikusan"
 
-#: src/mainwindow.c:750 src/messageview.c:268
+#: src/mainwindow.c:761 src/messageview.c:273
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Eszközök/_Szűrési szabályok/_Feladó alapján"
 
-#: src/mainwindow.c:752 src/messageview.c:270
+#: src/mainwindow.c:763 src/messageview.c:275
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Eszközök/_Szűrési szabályok/_Címzett alapján"
 
-#: src/mainwindow.c:754 src/messageview.c:272
+#: src/mainwindow.c:765 src/messageview.c:277
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Eszközök/_Szűrési szabályok/_Tárgy alapján"
 
-#: src/mainwindow.c:757
+#: src/mainwindow.c:768
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/_Eszközök/Levélszemét szűrése a mappában"
 
-#: src/mainwindow.c:759
+#: src/mainwindow.c:770
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/_Eszközök/Kivá_lasztott üzenetek levélszemét szűrése"
 
-#: src/mainwindow.c:764
+#: src/mainwindow.c:775
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/_Eszközök/_Duplikált levelek törlése"
 
-#: src/mainwindow.c:767
+#: src/mainwindow.c:778
 msgid "/_Tools/E_xecute"
 msgstr "/_Eszközök/_Futtatás"
 
-#: src/mainwindow.c:769
+#: src/mainwindow.c:780
 msgid "/_Tools/_Log window"
 msgstr "/_Eszközök/_Napló ablak"
 
-#: src/mainwindow.c:771
+#: src/mainwindow.c:782
 msgid "/_Configuration"
 msgstr "/_Beállítások"
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:783
 msgid "/_Configuration/_Common preferences..."
 msgstr "/_Beállítások/Közös _Beállítások..."
 
-#: src/mainwindow.c:774
+#: src/mainwindow.c:785
 msgid "/_Configuration/_Filter setting..."
 msgstr "/_Beállítások/_Szűrő beállítások..."
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:787
 msgid "/_Configuration/_Template..."
 msgstr "/_Beállítások/_Sablon..."
 
-#: src/mainwindow.c:777
+#: src/mainwindow.c:788
 msgid "/_Configuration/_Actions..."
 msgstr "/_Beállítások/_Akciók..."
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:789
 msgid "/_Configuration/---"
 msgstr "/_Beállítások/---"
 
-#: src/mainwindow.c:779
+#: src/mainwindow.c:790
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Beállítások/Aktuális _hozzáférés beállításai..."
 
-#: src/mainwindow.c:781
+#: src/mainwindow.c:792
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Beállítások/_Új hozzáférés létrehozása..."
 
-#: src/mainwindow.c:783
+#: src/mainwindow.c:794
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Beállítások/Hozzáférés _szerkesztése..."
 
-#: src/mainwindow.c:785
+#: src/mainwindow.c:796
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Beállítások/_Aktuális hozzáférés váltása..."
 
-#: src/mainwindow.c:789
+#: src/mainwindow.c:800
 msgid "/_Help/_Manual"
 msgstr "/Sú_gó/_Kézikönyv"
 
-#: src/mainwindow.c:790
+#: src/mainwindow.c:801
 msgid "/_Help/_Manual/_English"
 msgstr "/Sú_gó/Kézikönyv/_Angol"
 
-#: src/mainwindow.c:791
+#: src/mainwindow.c:802
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/Sú_gó/Kézikönyv/_Japán"
 
-#: src/mainwindow.c:792
+#: src/mainwindow.c:803
 msgid "/_Help/_FAQ"
 msgstr "/Sú_gó/_GYIK"
 
-#: src/mainwindow.c:793
+#: src/mainwindow.c:804
 msgid "/_Help/_FAQ/_English"
 msgstr "/Sú_gó/_GYIK/_Angol"
 
-#: src/mainwindow.c:794
+#: src/mainwindow.c:805
 msgid "/_Help/_FAQ/_German"
 msgstr "/Sú_gó/_GYIK/_Német"
 
-#: src/mainwindow.c:795
+#: src/mainwindow.c:806
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/Sú_gó/_GYIK/_Spanyol"
 
-#: src/mainwindow.c:796
+#: src/mainwindow.c:807
 msgid "/_Help/_FAQ/_French"
 msgstr "/Sú_gó/_GYIK/_Francia"
 
-#: src/mainwindow.c:797
+#: src/mainwindow.c:808
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/Sú_gó/_GYIK/_Olasz"
 
-#: src/mainwindow.c:798
+#: src/mainwindow.c:809
 msgid "/_Help/---"
 msgstr "/Sú_gó/---"
 
-#: src/mainwindow.c:841
+#: src/mainwindow.c:852
 msgid "Creating main window...\n"
 msgstr "Főablak létrehozása...\n"
 
-#: src/mainwindow.c:1011
+#: src/mainwindow.c:1022
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Főablak: %d szín foglalása nem sikerült\n"
 
-#: src/mainwindow.c:1108 src/summaryview.c:2258 src/summaryview.c:2343
-#: src/summaryview.c:3739 src/summaryview.c:3868 src/summaryview.c:4226
+#: src/mainwindow.c:1119 src/summaryview.c:2275 src/summaryview.c:2360
+#: src/summaryview.c:3896 src/summaryview.c:4025 src/summaryview.c:4383
 msgid "done.\n"
 msgstr "kész.\n"
 
-#: src/mainwindow.c:1235 src/mainwindow.c:1276 src/mainwindow.c:1301
+#: src/mainwindow.c:1246 src/mainwindow.c:1287 src/mainwindow.c:1312
 msgid "Untitled"
 msgstr "Névtelen"
 
-#: src/mainwindow.c:1302
+#: src/mainwindow.c:1313
 msgid "none"
 msgstr "semmi"
 
-#: src/mainwindow.c:1355
+#: src/mainwindow.c:1366
 #, 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:1605
+#: src/mainwindow.c:1616
 msgid "Offline"
 msgstr "Kapcsolat nélkül"
 
-#: src/mainwindow.c:1606
+#: src/mainwindow.c:1617
 msgid "You are offline. Go online?"
 msgstr "Ön kapcsolat nélküli módban van. Kapcsolódik?"
 
-#: src/mainwindow.c:1623
+#: src/mainwindow.c:1634
 msgid "Empty all trash"
 msgstr "Kuka ürítése"
 
-#: src/mainwindow.c:1624
+#: src/mainwindow.c:1635
 msgid "Delete all messages in trash folders?"
 msgstr "Minden üzenet törlése a kukából?"
 
-#: src/mainwindow.c:1652
+#: src/mainwindow.c:1663
 msgid "Add mailbox"
 msgstr "Postaláda hozzáadása"
 
-#: src/mainwindow.c:1653
+#: src/mainwindow.c:1664
 msgid ""
 "Specify the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3578,16 +3594,16 @@ msgstr ""
 "Ha létező postaládát ad meg, akkor\n"
 "automatikusan átvizsgálom."
 
-#: src/mainwindow.c:1659 src/setup.c:49
+#: src/mainwindow.c:1670 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "A `%s' postaláda már létezik."
 
-#: src/mainwindow.c:1664 src/setup.c:56
+#: src/mainwindow.c:1675 src/setup.c:56
 msgid "Mailbox"
 msgstr "Postaláda"
 
-#: src/mainwindow.c:1670 src/setup.c:62
+#: src/mainwindow.c:1681 src/setup.c:62
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3596,146 +3612,146 @@ 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:2088
+#: src/mainwindow.c:2099
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Mappa nézet"
 
-#: src/mainwindow.c:2107
+#: src/mainwindow.c:2118
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Üzenet nézet"
 
-#: src/mainwindow.c:2259 src/summaryview.c:408
+#: src/mainwindow.c:2270 src/summaryview.c:408
 msgid "/_Reply"
 msgstr "/_Válasz"
 
-#: src/mainwindow.c:2260
+#: src/mainwindow.c:2271
 msgid "/Reply to _all"
 msgstr "Válasz _mindenkinek"
 
-#: src/mainwindow.c:2261
+#: src/mainwindow.c:2272
 msgid "/Reply to _sender"
 msgstr "/Válasz a _küldőnek"
 
-#: src/mainwindow.c:2262
+#: src/mainwindow.c:2273
 msgid "/Reply to mailing _list"
 msgstr "/Válasz a _levelezőlistának"
 
-#: src/mainwindow.c:2267 src/summaryview.c:415
+#: src/mainwindow.c:2278 src/summaryview.c:415
 msgid "/_Forward"
 msgstr "/_Továbbítás"
 
-#: src/mainwindow.c:2268 src/summaryview.c:416
+#: src/mainwindow.c:2279 src/summaryview.c:416
 msgid "/For_ward as attachment"
 msgstr "/Csatoláské_nt továbbít"
 
-#: src/mainwindow.c:2269 src/summaryview.c:417
+#: src/mainwindow.c:2280 src/summaryview.c:417
 msgid "/Redirec_t"
 msgstr "/Átirányí_t"
 
-#: src/mainwindow.c:2305
+#: src/mainwindow.c:2316
 msgid "Get"
 msgstr "Fogadás"
 
-#: src/mainwindow.c:2306
+#: src/mainwindow.c:2317
 msgid "Incorporate new mail"
 msgstr "Új levelek fogadása"
 
-#: src/mainwindow.c:2313
+#: src/mainwindow.c:2324
 msgid "Get all"
 msgstr "Fogadás mindről"
 
-#: src/mainwindow.c:2314
+#: src/mainwindow.c:2325
 msgid "Incorporate new mail of all accounts"
 msgstr "Új levelek fogadása minden hozzáférésen"
 
-#: src/mainwindow.c:2325
+#: src/mainwindow.c:2336
 msgid "Send queued message(s)"
 msgstr "Várakozó sorból üzenet(ek) küldése"
 
-#: src/mainwindow.c:2335 src/prefs_account_dialog.c:530
+#: src/mainwindow.c:2346 src/prefs_account_dialog.c:530
 #: src/prefs_common_dialog.c:663 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "Szerkesztés"
 
-#: src/mainwindow.c:2336
+#: src/mainwindow.c:2347
 msgid "Compose new message"
 msgstr "Új üzenet szerkesztése"
 
-#: src/mainwindow.c:2344 src/prefs_common_dialog.c:975
+#: src/mainwindow.c:2355 src/prefs_common_dialog.c:975
 msgid "Reply"
 msgstr "Válasz"
 
-#: src/mainwindow.c:2345 src/mainwindow.c:2358
+#: src/mainwindow.c:2356 src/mainwindow.c:2369
 msgid "Reply to the message"
 msgstr "Válasz az üzenetre"
 
-#: src/mainwindow.c:2362
+#: src/mainwindow.c:2373
 msgid "Reply all"
 msgstr "Válasz mindre"
 
-#: src/mainwindow.c:2363
+#: src/mainwindow.c:2374
 msgid "Reply to all"
 msgstr "Válasz mindenkinek"
 
-#: src/mainwindow.c:2371 src/prefs_filter_edit.c:672
+#: src/mainwindow.c:2382 src/prefs_filter_edit.c:672
 msgid "Forward"
 msgstr "Továbbít"
 
-#: src/mainwindow.c:2372 src/mainwindow.c:2385
+#: src/mainwindow.c:2383 src/mainwindow.c:2396
 msgid "Forward the message"
 msgstr "Üzenet továbbítása"
 
-#: src/mainwindow.c:2392
+#: src/mainwindow.c:2403
 msgid "Delete the message"
 msgstr "Üzenet törlése"
 
-#: src/mainwindow.c:2401
+#: src/mainwindow.c:2412
 msgid "Set as junk mail"
 msgstr "Levélszemétként beállítás"
 
-#: src/mainwindow.c:2410
+#: src/mainwindow.c:2421
 msgid "Execute"
 msgstr "Futtatás"
 
-#: src/mainwindow.c:2411
+#: src/mainwindow.c:2422
 msgid "Execute marked process"
 msgstr "Megjelölt processz futtatása"
 
-#: src/mainwindow.c:2421
+#: src/mainwindow.c:2432
 msgid "Next unread message"
 msgstr "Következő olvasatlan üzenet"
 
-#: src/mainwindow.c:2433
+#: src/mainwindow.c:2444
 msgid "Prefs"
 msgstr "Beállítások"
 
-#: src/mainwindow.c:2434
+#: src/mainwindow.c:2445
 msgid "Common preferences"
 msgstr "Közös beállítások"
 
-#: src/mainwindow.c:2442 src/prefs_folder_item.c:289
+#: src/mainwindow.c:2453 src/prefs_folder_item.c:289
 #: src/prefs_folder_item.c:300 src/progressdialog.c:128
 msgid "Account"
 msgstr "Hozzáférés"
 
-#: src/mainwindow.c:2443
+#: src/mainwindow.c:2454
 msgid "Account setting"
 msgstr "Hozzáférés beállítások"
 
-#: src/mainwindow.c:2615
+#: src/mainwindow.c:2626
 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:2626
+#: src/mainwindow.c:2637
 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:2892
+#: src/mainwindow.c:2903
 msgid "Exit"
 msgstr "Kilépés"
 
-#: src/mainwindow.c:2892
+#: src/mainwindow.c:2903
 msgid "Exit this program?"
 msgstr "Kilépés a programból?"
 
@@ -3772,44 +3788,44 @@ msgstr "Az üzenet végére értem; folytassam az elejéről?"
 msgid "Search finished"
 msgstr "Keresés befejeződött"
 
-#: src/messageview.c:261
+#: src/messageview.c:266
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/_Eszközök/Küldő hozzáadása a cím_jegyzékhez"
 
-#: src/messageview.c:291
+#: src/messageview.c:296
 msgid "Creating message view...\n"
 msgstr "Üzenet nézet létrehozása...\n"
 
-#: src/messageview.c:316
+#: src/messageview.c:321
 msgid "Text"
 msgstr "Szöveg"
 
-#: src/messageview.c:321
+#: src/messageview.c:326
 msgid "Attachments"
 msgstr "Csatolások"
 
-#: src/messageview.c:371
+#: src/messageview.c:376
 msgid "Message View - Sylpheed"
 msgstr "Üzenetnézet - Sylpheed"
 
-#: src/messageview.c:669 src/summaryview.c:3268
+#: src/messageview.c:674 src/summaryview.c:3425
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "`%s' fájlt nem lehet elmenteni."
 
-#: src/messageview.c:728 src/summaryview.c:3291
+#: src/messageview.c:733 src/summaryview.c:3448
 msgid "The message will be printed with the following command:"
 msgstr "Az üzenet a következő paranccsal lesz kinyomtatva:"
 
-#: src/messageview.c:729 src/summaryview.c:3292
+#: src/messageview.c:734 src/summaryview.c:3449
 msgid "(Default print command)"
 msgstr "(Alapértelmezett nyomtatási parancs)"
 
-#: src/messageview.c:731 src/prefs_common_dialog.c:2304 src/summaryview.c:3294
+#: src/messageview.c:736 src/prefs_common_dialog.c:2304 src/summaryview.c:3451
 msgid "Print"
 msgstr "Nyomtatás"
 
-#: src/messageview.c:740 src/summaryview.c:3303
+#: src/messageview.c:745 src/summaryview.c:3460
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -4699,8 +4715,8 @@ msgstr "Címzett mutatása a `Feladó' oszlopban, ha önmagának küldte"
 msgid "Expand threads"
 msgstr "Folyam kifejtése"
 
-#: src/prefs_common_dialog.c:1413 src/prefs_common_dialog.c:2713
-#: src/prefs_common_dialog.c:2751
+#: src/prefs_common_dialog.c:1413 src/prefs_common_dialog.c:2716
+#: src/prefs_common_dialog.c:2754
 msgid "Date format"
 msgstr "Dátum formátuma"
 
@@ -4987,8 +5003,8 @@ msgstr "Külső parancsok (%s helyére a fájlnév / URI kerül)"
 msgid "Web browser"
 msgstr "Web böngésző"
 
-#: src/prefs_common_dialog.c:2288 src/prefs_common_dialog.c:3775
-#: src/prefs_common_dialog.c:3796
+#: src/prefs_common_dialog.c:2288 src/prefs_common_dialog.c:3778
+#: src/prefs_common_dialog.c:3799
 msgid "(Default browser)"
 msgstr "(Alapértelmezett böngésző)"
 
@@ -5063,214 +5079,224 @@ msgid "Greek (ISO-8859-7)"
 msgstr "Görög (ISO-8859-7)"
 
 #: src/prefs_common_dialog.c:2495
+#, fuzzy
+msgid "Arabic (ISO-8859-6)"
+msgstr "Baltikumi (ISO-8859-4)"
+
+#: src/prefs_common_dialog.c:2496
+#, fuzzy
+msgid "Arabic (Windows-1256)"
+msgstr "Cirill (Windows-1251)"
+
+#: src/prefs_common_dialog.c:2498
 msgid "Hebrew (ISO-8859-8)"
 msgstr "Héber (ISO-8859-8)"
 
-#: src/prefs_common_dialog.c:2496
+#: src/prefs_common_dialog.c:2499
 msgid "Hebrew (Windows-1255)"
 msgstr "Héber (Windows-1255)"
 
-#: src/prefs_common_dialog.c:2498
+#: src/prefs_common_dialog.c:2501
 msgid "Turkish (ISO-8859-9)"
 msgstr "Török (ISO-8859-9)"
 
-#: src/prefs_common_dialog.c:2500
+#: src/prefs_common_dialog.c:2503
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Cirill (ISO-8859-5)"
 
-#: src/prefs_common_dialog.c:2501
+#: src/prefs_common_dialog.c:2504
 msgid "Cyrillic (KOI8-R)"
 msgstr "Cirill (KOI8-R)"
 
-#: src/prefs_common_dialog.c:2502
+#: src/prefs_common_dialog.c:2505
 msgid "Cyrillic (KOI8-U)"
 msgstr "Cirill (KOI8-U)"
 
-#: src/prefs_common_dialog.c:2503
+#: src/prefs_common_dialog.c:2506
 msgid "Cyrillic (Windows-1251)"
 msgstr "Cirill (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2505
+#: src/prefs_common_dialog.c:2508
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Japán (ISO-2022-JP)"
 
-#: src/prefs_common_dialog.c:2507
+#: src/prefs_common_dialog.c:2510
 msgid "Japanese (EUC-JP)"
 msgstr "Japán (EUC-JP)"
 
-#: src/prefs_common_dialog.c:2508
+#: src/prefs_common_dialog.c:2511
 msgid "Japanese (Shift_JIS)"
 msgstr "Japán (Shift_JIS)"
 
-#: src/prefs_common_dialog.c:2511
+#: src/prefs_common_dialog.c:2514
 msgid "Simplified Chinese (GB2312)"
 msgstr "Egyszerűsített Kínai (GB2312)"
 
-#: src/prefs_common_dialog.c:2512
+#: src/prefs_common_dialog.c:2515
 msgid "Simplified Chinese (GBK)"
 msgstr "Egyszerűsített Kínai (GBK)"
 
-#: src/prefs_common_dialog.c:2513
+#: src/prefs_common_dialog.c:2516
 msgid "Traditional Chinese (Big5)"
 msgstr "Tradicionális Kínai (Big5)"
 
-#: src/prefs_common_dialog.c:2515
+#: src/prefs_common_dialog.c:2518
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Tradicionális Kínai (EUC-TW)"
 
-#: src/prefs_common_dialog.c:2516
+#: src/prefs_common_dialog.c:2519
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Kínai (ISO-2022-CN)"
 
-#: src/prefs_common_dialog.c:2519
+#: src/prefs_common_dialog.c:2522
 msgid "Korean (EUC-KR)"
 msgstr "Koreai (EUC-KR)"
 
-#: src/prefs_common_dialog.c:2521
+#: src/prefs_common_dialog.c:2524
 msgid "Thai (TIS-620)"
 msgstr "Thai (TIS-620)"
 
-#: src/prefs_common_dialog.c:2522
+#: src/prefs_common_dialog.c:2525
 msgid "Thai (Windows-874)"
 msgstr "Thai (Windows-874)"
 
-#: src/prefs_common_dialog.c:2689
+#: src/prefs_common_dialog.c:2692
 msgid "the full abbreviated weekday name"
 msgstr "rövidített nap név"
 
-#: src/prefs_common_dialog.c:2690
+#: src/prefs_common_dialog.c:2693
 msgid "the full weekday name"
 msgstr "teljes nap név"
 
-#: src/prefs_common_dialog.c:2691
+#: src/prefs_common_dialog.c:2694
 msgid "the abbreviated month name"
 msgstr "rövidített hónapnév"
 
-#: src/prefs_common_dialog.c:2692
+#: src/prefs_common_dialog.c:2695
 msgid "the full month name"
 msgstr "a teljes hónapnév"
 
-#: src/prefs_common_dialog.c:2693
+#: src/prefs_common_dialog.c:2696
 msgid "the preferred date and time for the current locale"
 msgstr "ajánlott dátum- és időformátum a jelenlegi nyelvi beállításhoz"
 
-#: src/prefs_common_dialog.c:2694
+#: src/prefs_common_dialog.c:2697
 msgid "the century number (year/100)"
 msgstr "évszázad (év/100)"
 
-#: src/prefs_common_dialog.c:2695
+#: src/prefs_common_dialog.c:2698
 msgid "the day of the month as a decimal number"
 msgstr "hónap napja számként"
 
-#: src/prefs_common_dialog.c:2696
+#: src/prefs_common_dialog.c:2699
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "óra számként (24 órás kijelzés)"
 
-#: src/prefs_common_dialog.c:2697
+#: src/prefs_common_dialog.c:2700
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "óra számként (12 órás kijelzés)"
 
-#: src/prefs_common_dialog.c:2698
+#: src/prefs_common_dialog.c:2701
 msgid "the day of the year as a decimal number"
 msgstr "Az év napja számként"
 
-#: src/prefs_common_dialog.c:2699
+#: src/prefs_common_dialog.c:2702
 msgid "the month as a decimal number"
 msgstr "hónap számként"
 
-#: src/prefs_common_dialog.c:2700
+#: src/prefs_common_dialog.c:2703
 msgid "the minute as a decimal number"
 msgstr "perc számként"
 
-#: src/prefs_common_dialog.c:2701
+#: src/prefs_common_dialog.c:2704
 msgid "either AM or PM"
 msgstr "DE vagy DU"
 
-#: src/prefs_common_dialog.c:2702
+#: src/prefs_common_dialog.c:2705
 msgid "the second as a decimal number"
 msgstr "másodperc számként"
 
-#: src/prefs_common_dialog.c:2703
+#: src/prefs_common_dialog.c:2706
 msgid "the day of the week as a decimal number"
 msgstr "hét napja számként"
 
-#: src/prefs_common_dialog.c:2704
+#: src/prefs_common_dialog.c:2707
 msgid "the preferred date for the current locale"
 msgstr "ajánlott dátum az aktuális nyelvi beállításhoz"
 
-#: src/prefs_common_dialog.c:2705
+#: src/prefs_common_dialog.c:2708
 msgid "the last two digits of a year"
 msgstr "az évszám utolsó két számjegye"
 
-#: src/prefs_common_dialog.c:2706
+#: src/prefs_common_dialog.c:2709
 msgid "the year as a decimal number"
 msgstr "év számként"
 
-#: src/prefs_common_dialog.c:2707
+#: src/prefs_common_dialog.c:2710
 msgid "the time zone or name or abbreviation"
 msgstr "időzóna vagy név vagy rövidítés"
 
-#: src/prefs_common_dialog.c:2728
+#: src/prefs_common_dialog.c:2731
 msgid "Specifier"
 msgstr "Vezérlőjel"
 
-#: src/prefs_common_dialog.c:2729
+#: src/prefs_common_dialog.c:2732
 msgid "Description"
 msgstr "Leírás"
 
-#: src/prefs_common_dialog.c:2769
+#: src/prefs_common_dialog.c:2772
 msgid "Example"
 msgstr "Példa"
 
-#: src/prefs_common_dialog.c:2850
+#: src/prefs_common_dialog.c:2853
 msgid "Set message colors"
 msgstr "Üzenetszín beállítása"
 
-#: src/prefs_common_dialog.c:2858
+#: src/prefs_common_dialog.c:2861
 msgid "Colors"
 msgstr "Színek"
 
-#: src/prefs_common_dialog.c:2892
+#: src/prefs_common_dialog.c:2895
 msgid "Quoted Text - First Level"
 msgstr "Idézett szöveg - első szint"
 
-#: src/prefs_common_dialog.c:2898
+#: src/prefs_common_dialog.c:2901
 msgid "Quoted Text - Second Level"
 msgstr "Idézett szöveg - második szint"
 
-#: src/prefs_common_dialog.c:2904
+#: src/prefs_common_dialog.c:2907
 msgid "Quoted Text - Third Level"
 msgstr "Idézett szöveg - harmadik szint"
 
-#: src/prefs_common_dialog.c:2910
+#: src/prefs_common_dialog.c:2913
 msgid "URI link"
 msgstr "URI-kapocs"
 
-#: src/prefs_common_dialog.c:2917
+#: src/prefs_common_dialog.c:2920
 msgid "Recycle quote colors"
 msgstr "Idézet színeinek újrahasznosítása"
 
-#: src/prefs_common_dialog.c:2984
+#: src/prefs_common_dialog.c:2987
 msgid "Pick color for quotation level 1"
 msgstr "1. szintű idézet színe"
 
-#: src/prefs_common_dialog.c:2987
+#: src/prefs_common_dialog.c:2990
 msgid "Pick color for quotation level 2"
 msgstr "2. szintű idézet színe"
 
-#: src/prefs_common_dialog.c:2990
+#: src/prefs_common_dialog.c:2993
 msgid "Pick color for quotation level 3"
 msgstr "3. szintű idézet színe"
 
-#: src/prefs_common_dialog.c:2993
+#: src/prefs_common_dialog.c:2996
 msgid "Pick color for URI"
 msgstr "URI színe"
 
-#: src/prefs_common_dialog.c:3133
+#: src/prefs_common_dialog.c:3136
 msgid "Description of symbols"
 msgstr "Szimbólumok leírása"
 
-#: src/prefs_common_dialog.c:3189
+#: src/prefs_common_dialog.c:3192
 msgid ""
 "Date\n"
 "From\n"
@@ -5294,11 +5320,11 @@ msgstr ""
 "Hírcsoportok\n"
 "Üzenet-azonosító"
 
-#: src/prefs_common_dialog.c:3202
+#: src/prefs_common_dialog.c:3205
 msgid "If x is set, displays expr"
 msgstr "Ha x beállítva, akkor kifejezés megjelenítése"
 
-#: src/prefs_common_dialog.c:3206
+#: src/prefs_common_dialog.c:3209
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -5312,7 +5338,7 @@ msgstr ""
 "Idézett üzenet törzs aláírás nélkül\n"
 "Szó szerint %"
 
-#: src/prefs_common_dialog.c:3214
+#: src/prefs_common_dialog.c:3217
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -5324,19 +5350,19 @@ msgstr ""
 "Nyitó kapcsos zárójel\n"
 "Záró kapcsos zárójel"
 
-#: src/prefs_common_dialog.c:3260
+#: src/prefs_common_dialog.c:3263
 msgid "Key bindings"
 msgstr "Billentyű hozzárendelések"
 
-#: src/prefs_common_dialog.c:3273
+#: src/prefs_common_dialog.c:3276
 msgid "Select the preset of key bindings."
 msgstr "Válasszon a beállított billentyű hozzárendelésekből."
 
-#: src/prefs_common_dialog.c:3283 src/prefs_common_dialog.c:3607
+#: src/prefs_common_dialog.c:3286 src/prefs_common_dialog.c:3610
 msgid "Default"
 msgstr "Alapértelmezés"
 
-#: src/prefs_common_dialog.c:3286 src/prefs_common_dialog.c:3616
+#: src/prefs_common_dialog.c:3289 src/prefs_common_dialog.c:3619
 msgid "Old Sylpheed"
 msgstr "Régi Sylpheed"
 
@@ -5457,7 +5483,7 @@ msgstr "A parancs eredménye"
 msgid "Age"
 msgstr "Kor"
 
-#: src/prefs_filter_edit.c:501 src/summaryview.c:510
+#: src/prefs_filter_edit.c:501 src/summaryview.c:512
 #, fuzzy
 msgid "Marked"
 msgstr "Kijelölt"
@@ -5685,17 +5711,17 @@ msgid "Attachment"
 msgstr "Csatolás"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73 src/query_search.c:371 src/summaryview.c:4733
+#: src/prefs_summary_column.c:73 src/query_search.c:371 src/summaryview.c:4890
 msgid "Subject"
 msgstr "Tárgy"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/query_search.c:372 src/summaryview.c:4736
+#: src/prefs_summary_column.c:74 src/query_search.c:372 src/summaryview.c:4893
 msgid "From"
 msgstr "Feladó"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/query_search.c:373 src/summaryview.c:4738
+#: src/prefs_summary_column.c:75 src/query_search.c:373 src/summaryview.c:4895
 msgid "Date"
 msgstr "Dátum"
 
@@ -5796,7 +5822,7 @@ msgstr "Üzenetek keresése"
 msgid "_Save as search folder"
 msgstr "_Mentés, mint keresési mappa"
 
-#: src/query_search.c:512 src/subscribedialog.c:523 src/summaryview.c:840
+#: src/query_search.c:512 src/subscribedialog.c:523 src/summaryview.c:842
 msgid "Done."
 msgstr "Kész."
 
@@ -5810,7 +5836,7 @@ msgstr "%s keresése..."
 msgid "Searching %s (%d / %d)..."
 msgstr "%s keresése (%d / %d)..."
 
-#: src/query_search.c:645 src/summaryview.c:2048
+#: src/query_search.c:645 src/summaryview.c:2051
 msgid "(No Date)"
 msgstr "(Nincs Dátum)"
 
@@ -6179,301 +6205,306 @@ msgid "/_Mark/Mark as rea_d"
 msgstr "/_Kijelöl/_Olvasottként jelöl"
 
 #: src/summaryview.c:429
+#, fuzzy
+msgid "/_Mark/Mark _thread as read"
+msgstr "/_Kijelöl/_Olvasottként jelöl"
+
+#: src/summaryview.c:431
 msgid "/_Mark/Mark all _read"
 msgstr "/_Kijelöl/_Minden olvasottat kijelöl"
 
-#: src/summaryview.c:430
+#: src/summaryview.c:432
 msgid "/Color la_bel"
 msgstr "/_Színes címke"
 
-#: src/summaryview.c:434
+#: src/summaryview.c:436
 msgid "/Re-_edit"
 msgstr "/Új_raszerkeszt"
 
-#: src/summaryview.c:436
+#: src/summaryview.c:438
 msgid "/Add sender to address boo_k..."
 msgstr "/Küldő hozzáadása a cím_jegyzékhez..."
 
-#: src/summaryview.c:438
+#: src/summaryview.c:440
 msgid "/Create f_ilter rule"
 msgstr "/Szűrési szabály _létrehozása"
 
-#: src/summaryview.c:439
+#: src/summaryview.c:441
 msgid "/Create f_ilter rule/_Automatically"
 msgstr "/_Szűrési szabály _létrehozása/_Automatikusan"
 
-#: src/summaryview.c:441
+#: src/summaryview.c:443
 msgid "/Create f_ilter rule/by _From"
 msgstr "/Szűrési szabály _létrehozása/_Feladó alapján"
 
-#: src/summaryview.c:443
+#: src/summaryview.c:445
 msgid "/Create f_ilter rule/by _To"
 msgstr "/Szűrési szabály létrehozása/_Címzett alapján"
 
-#: src/summaryview.c:445
+#: src/summaryview.c:447
 msgid "/Create f_ilter rule/by _Subject"
 msgstr "/Szűrési szabály _létrehozása/_Tárgy alapján"
 
-#: src/summaryview.c:451
+#: src/summaryview.c:453
 msgid "/_View/_Source"
 msgstr "/_Nézet/_Forrás"
 
-#: src/summaryview.c:452
+#: src/summaryview.c:454
 msgid "/_View/All _header"
 msgstr "/_Nézet/_Minden fejléc megjelenítése"
 
-#: src/summaryview.c:454
+#: src/summaryview.c:456
 msgid "/_Print..."
 msgstr "/_Nyomtat..."
 
-#: src/summaryview.c:486
+#: src/summaryview.c:488
 msgid "Creating summary view...\n"
 msgstr "Áttekintő nézet létrehozása...\n"
 
-#: src/summaryview.c:508
+#: src/summaryview.c:510
 msgid "All"
 msgstr ""
 
-#: src/summaryview.c:511
+#: src/summaryview.c:513
 #, fuzzy
 msgid "Have color label"
 msgstr "/_Színes címke"
 
-#: src/summaryview.c:512
+#: src/summaryview.c:514
 #, fuzzy
 msgid "Have attachment"
 msgstr "Csatolás"
 
-#: src/summaryview.c:521
+#: src/summaryview.c:523
 #, fuzzy
 msgid "Search:"
 msgstr " Keresés "
 
-#: src/summaryview.c:535
+#: src/summaryview.c:537
 msgid "Search for Subject or From"
 msgstr ""
 
-#: src/summaryview.c:702
+#: src/summaryview.c:704
 msgid "Process mark"
 msgstr "Kijelöltek feldolgozása"
 
-#: src/summaryview.c:703
+#: src/summaryview.c:705
 msgid "Some marks are left. Process it?"
 msgstr "Maradt még néhány kijelölt. Feldolgoás?"
 
-#: src/summaryview.c:749
+#: src/summaryview.c:751
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "(%s) mappa átvizsgálása..."
 
-#: src/summaryview.c:1292
+#: src/summaryview.c:1295
 msgid "_Search again"
 msgstr "Keresés ú_jra"
 
-#: src/summaryview.c:1313 src/summaryview.c:1322
+#: src/summaryview.c:1316 src/summaryview.c:1325
 msgid "No more unread messages"
 msgstr "Nincs további olvasatlan üzenet"
 
-#: src/summaryview.c:1314
+#: src/summaryview.c:1317
 msgid "No unread message found. Search from the end?"
 msgstr "Nem található olvasatlan üzenet. Keresés a végéről?"
 
-#: src/summaryview.c:1316
+#: src/summaryview.c:1319
 msgid "No unread messages."
 msgstr "Nincs olvasatlan üzenet.."
 
-#: src/summaryview.c:1323
+#: src/summaryview.c:1326
 msgid "No unread message found. Go to next folder?"
 msgstr "Nem található olvasatlan üzenet. Ugrás a következő mappára?"
 
-#: src/summaryview.c:1331 src/summaryview.c:1340
+#: src/summaryview.c:1334 src/summaryview.c:1343
 msgid "No more new messages"
 msgstr "Nincs több új üzenet"
 
-#: src/summaryview.c:1332
+#: src/summaryview.c:1335
 msgid "No new message found. Search from the end?"
 msgstr "Nem található új üzenet. Keresés a végéről?"
 
-#: src/summaryview.c:1334
+#: src/summaryview.c:1337
 msgid "No new messages."
 msgstr "Nincs új üzenet."
 
-#: src/summaryview.c:1341
+#: src/summaryview.c:1344
 msgid "No new message found. Go to next folder?"
 msgstr "Nem található új üzenet. Ugrás a következő mappára?"
 
-#: src/summaryview.c:1349 src/summaryview.c:1358
+#: src/summaryview.c:1352 src/summaryview.c:1361
 msgid "No more marked messages"
 msgstr "Nincs további kijelölt üzenet"
 
-#: src/summaryview.c:1350
+#: src/summaryview.c:1353
 msgid "No marked message found. Search from the end?"
 msgstr "Nem található kijelölt üzenet. Keresés a végéről?"
 
-#: src/summaryview.c:1352 src/summaryview.c:1361
+#: src/summaryview.c:1355 src/summaryview.c:1364
 msgid "No marked messages."
 msgstr "Nincs kijelölt üzenet."
 
-#: src/summaryview.c:1359
+#: src/summaryview.c:1362
 msgid "No marked message found. Search from the beginning?"
 msgstr "Nem található kijelölt üzenet. Keresés az elejéről?"
 
-#: src/summaryview.c:1367 src/summaryview.c:1376
+#: src/summaryview.c:1370 src/summaryview.c:1379
 msgid "No more labeled messages"
 msgstr "Nincs további címkézett üzenet."
 
-#: src/summaryview.c:1368
+#: src/summaryview.c:1371
 msgid "No labeled message found. Search from the end?"
 msgstr "Nem található címkézett üzenet. Keresés a végéről?"
 
-#: src/summaryview.c:1370 src/summaryview.c:1379
+#: src/summaryview.c:1373 src/summaryview.c:1382
 msgid "No labeled messages."
 msgstr "Nincs címkézett üzenet."
 
-#: src/summaryview.c:1377
+#: src/summaryview.c:1380
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Nem található címkézett üzenet. Keresés az elejéről?"
 
-#: src/summaryview.c:1693
+#: src/summaryview.c:1696
 msgid "Attracting messages by subject..."
 msgstr "Üzenetek tárgy szerint..."
 
-#: src/summaryview.c:1887
+#: src/summaryview.c:1890
 #, c-format
 msgid "%d deleted"
 msgstr "%d törölve"
 
-#: src/summaryview.c:1891
+#: src/summaryview.c:1894
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d mozgatva"
 
-#: src/summaryview.c:1892 src/summaryview.c:1897
+#: src/summaryview.c:1895 src/summaryview.c:1900
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:1896
+#: src/summaryview.c:1899
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d másolva"
 
-#: src/summaryview.c:1911
+#: src/summaryview.c:1914
 msgid " item(s) selected"
 msgstr " elem kiválasztva"
 
-#: src/summaryview.c:1933
+#: src/summaryview.c:1936
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d új, %d olvasatlan, %d összesen (%s)"
 
-#: src/summaryview.c:1937
+#: src/summaryview.c:1940
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d új, %d olvasatlan, %d összesen"
 
-#: src/summaryview.c:1971
+#: src/summaryview.c:1974
 msgid "Sorting summary..."
 msgstr "Összefoglaló rendezése..."
 
-#: src/summaryview.c:2194
+#: src/summaryview.c:2211
 msgid "\tSetting summary from message data..."
 msgstr "\tÖsszefoglaló beállítása az üzenetek adataiból..."
 
-#: src/summaryview.c:2196
+#: src/summaryview.c:2213
 msgid "Setting summary from message data..."
 msgstr "Összefoglaló beállítása az üzenetek adataiból..."
 
-#: src/summaryview.c:2302
+#: src/summaryview.c:2319
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Összefoglaló gyorstár írása (%s)..."
 
-#: src/summaryview.c:2643
+#: src/summaryview.c:2660
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "%d üzenet kijelölve.\n"
 
-#: src/summaryview.c:2701
+#: src/summaryview.c:2718
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "%d üzenet olvasottnak jelölve.\n"
 
-#: src/summaryview.c:2789
+#: src/summaryview.c:2908
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "%d üzenet olvasatlannak jelölve.\n"
 
-#: src/summaryview.c:2850
+#: src/summaryview.c:2969
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "%s/%d üzenet törlésre kijelölve\n"
 
-#: src/summaryview.c:2878
+#: src/summaryview.c:2997
 msgid "Delete message(s)"
 msgstr "Üzenet(ek) törlése"
 
-#: src/summaryview.c:2879
+#: src/summaryview.c:2998
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Tényleg törölni szeretné az üzenete(ke)t a kukából?"
 
-#: src/summaryview.c:2953
+#: src/summaryview.c:3072
 msgid "Deleting duplicated messages..."
 msgstr "Több példányban létező üzenetek törlése..."
 
-#: src/summaryview.c:2991
+#: src/summaryview.c:3110
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "%s/%d üzenet kijelölésének megszüntetése.\n"
 
-#: src/summaryview.c:3049
+#: src/summaryview.c:3168
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "%d üzenet kijelölve %s mappába mozgatásra\n"
 
-#: src/summaryview.c:3066
+#: src/summaryview.c:3196
 msgid "Destination is same as current folder."
 msgstr "A cél azonos az aktuális mappával."
 
-#: src/summaryview.c:3122
+#: src/summaryview.c:3260
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "%d üzenet kijelölve %s mappába másolásra\n"
 
-#: src/summaryview.c:3139
+#: src/summaryview.c:3288
 msgid "Destination for copy is same as current folder."
 msgstr "A másolás célja megegyezik az aktuális mappával."
 
-#: src/summaryview.c:3338
+#: src/summaryview.c:3495
 msgid "Error occurred while processing messages."
 msgstr "Hiba az üzenetek feldolgozása közben."
 
-#: src/summaryview.c:3646 src/summaryview.c:3647
+#: src/summaryview.c:3803 src/summaryview.c:3804
 msgid "Building threads..."
 msgstr "Üzenetfolyam felépítése"
 
-#: src/summaryview.c:3797 src/summaryview.c:3798
+#: src/summaryview.c:3954 src/summaryview.c:3955
 msgid "Unthreading..."
 msgstr "Üzenetfolyam lebontás..."
 
-#: src/summaryview.c:4091 src/summaryview.c:4147
+#: src/summaryview.c:4248 src/summaryview.c:4304
 #, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Szűrés (%d / %d)..."
 
-#: src/summaryview.c:4196
+#: src/summaryview.c:4353
 msgid "filtering..."
 msgstr "szűrés..."
 
-#: src/summaryview.c:4197
+#: src/summaryview.c:4354
 msgid "Filtering..."
 msgstr "Szűrés..."
 
-#: src/summaryview.c:4233
+#: src/summaryview.c:4390
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "%d üzenet szűrése elvégezve."
 
-#: src/summaryview.c:4742
+#: src/summaryview.c:4899
 msgid "No."
 msgstr "Db"
 
@@ -6490,31 +6521,31 @@ msgstr "Szövegnézet létrehozása...\n"
 msgid "This message can't be displayed.\n"
 msgstr "Ez az üzenet nem jeleníthető meg.\n"
 
-#: src/textview.c:1929
+#: src/textview.c:1925
 msgid "Sa_ve this image as..."
 msgstr "A kép me_ntése mint..."
 
-#: src/textview.c:1945 src/trayicon.c:109
+#: src/textview.c:1941 src/trayicon.c:109
 msgid "Compose _new message"
 msgstr "Ú_j üzenet szerkesztése"
 
-#: src/textview.c:1947
+#: src/textview.c:1943
 msgid "Add to address _book..."
 msgstr "Hozzáadás a _címjegyzékhez..."
 
-#: src/textview.c:1949
+#: src/textview.c:1945
 msgid "Copy this add_ress"
 msgstr "A cí_m másolása"
 
-#: src/textview.c:1952
+#: src/textview.c:1948
 msgid "_Open with Web browser"
 msgstr "M_egnyitás webböngészővel"
 
-#: src/textview.c:1954
+#: src/textview.c:1950
 msgid "Copy this _link"
 msgstr "A _hivatkozás másolása"
 
-#: src/textview.c:2097
+#: src/textview.c:2093
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6526,7 +6557,7 @@ msgstr ""
 "látható URL-től (%s).\n"
 "Ennek ellenére megnyitja?"
 
-#: src/textview.c:2102
+#: src/textview.c:2098
 msgid "Fake URL warning"
 msgstr "Hamis URL figyelmeztetés"
 
diff --git a/po/it.po b/po/it.po
index deba5b1a..e63fec36 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed 2.1.9\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-27 18:11+0900\n"
+"POT-Creation-Date: 2006-01-31 15:20+0900\n"
 "PO-Revision-Date: 2005-12-15 19:09+0100\n"
 "Last-Translator: Danilo Bodei <dbodei@lombardiacom.it>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -506,7 +506,7 @@ msgstr "Trovato %s\n"
 msgid "Configuration is saved.\n"
 msgstr "La configurazione è stata salvata.\n"
 
-#: libsylph/prefs_common.c:489
+#: libsylph/prefs_common.c:491
 msgid "Junk mail filter"
 msgstr "Filtro mail spazzatura"
 
@@ -621,8 +621,8 @@ msgstr "%.2fMB"
 msgid "%.2fGB"
 msgstr "%.2fGB"
 
-#: libsylph/utils.c:2373 src/compose.c:2858 src/compose.c:3121
-#: src/compose.c:3184 src/compose.c:3304
+#: libsylph/utils.c:2373 src/compose.c:2867 src/compose.c:3130
+#: src/compose.c:3193 src/compose.c:3313
 msgid "can't change file mode\n"
 msgstr "impossibile cambiare i permessi del file\n"
 
@@ -711,8 +711,8 @@ msgstr ""
 "colonna «G» per consentire il recupero dei messaggi attraverso «Ricevi "
 "tutti»."
 
-#: src/account_dialog.c:366 src/addressadd.c:192 src/addressbook.c:491
-#: src/compose.c:4262 src/editaddress.c:200 src/editaddress.c:942
+#: src/account_dialog.c:366 src/addressadd.c:192 src/addressbook.c:493
+#: src/compose.c:4271 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:206 src/prefs_filter.c:259 src/prefs_folder_item.c:171
@@ -848,12 +848,12 @@ msgstr "Argomento dell'azione utente"
 msgid "Add Address to Book"
 msgstr "Aggiunta dell'indirizzo alla rubrica"
 
-#: src/addressadd.c:202 src/compose.c:4762 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4771 src/editaddress.c:201
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "Indirizzo"
 
-#: src/addressadd.c:212 src/addressbook.c:493 src/editaddress.c:202
+#: src/addressadd.c:212 src/addressbook.c:495 src/editaddress.c:202
 #: src/editaddress.c:795 src/editaddress.c:860 src/editgroup.c:267
 msgid "Remarks"
 msgstr "Note"
@@ -862,183 +862,183 @@ msgstr "Note"
 msgid "Select Address Book Folder"
 msgstr "Selezione della cartella della rubrica"
 
-#: src/addressbook.c:336 src/compose.c:515 src/mainwindow.c:477
+#: src/addressbook.c:338 src/compose.c:515 src/mainwindow.c:480
 #: src/messageview.c:138
 msgid "/_File"
 msgstr "/_File"
 
-#: src/addressbook.c:337
+#: src/addressbook.c:339
 msgid "/_File/New _Book"
 msgstr "/_File/Nuova _rubrica"
 
-#: src/addressbook.c:338
+#: src/addressbook.c:340
 msgid "/_File/New _vCard"
 msgstr "/_File/Nuova _vCard"
 
-#: src/addressbook.c:340
+#: src/addressbook.c:342
 msgid "/_File/New _JPilot"
 msgstr "/_File/Nuovo _JPilot"
 
-#: src/addressbook.c:343
+#: src/addressbook.c:345
 msgid "/_File/New _Server"
 msgstr "/_File/_Nuovo server"
 
-#: src/addressbook.c:345 src/addressbook.c:348 src/compose.c:520
-#: src/compose.c:525 src/compose.c:528 src/compose.c:531 src/mainwindow.c:495
-#: src/mainwindow.c:498 src/mainwindow.c:500 src/mainwindow.c:503
-#: src/mainwindow.c:505 src/messageview.c:141
+#: src/addressbook.c:347 src/addressbook.c:350 src/compose.c:520
+#: src/compose.c:525 src/compose.c:528 src/compose.c:531 src/mainwindow.c:498
+#: src/mainwindow.c:501 src/mainwindow.c:503 src/mainwindow.c:506
+#: src/mainwindow.c:508 src/messageview.c:141
 msgid "/_File/---"
 msgstr "/_File/---"
 
-#: src/addressbook.c:346
+#: src/addressbook.c:348
 msgid "/_File/_Edit"
 msgstr "/_File/_Modifica"
 
-#: src/addressbook.c:347
+#: src/addressbook.c:349
 msgid "/_File/_Delete"
 msgstr "/_File/_Elimina"
 
-#: src/addressbook.c:349
+#: src/addressbook.c:351
 msgid "/_File/_Save"
 msgstr "/_File/_Salva"
 
-#: src/addressbook.c:350 src/compose.c:532 src/messageview.c:142
+#: src/addressbook.c:352 src/compose.c:532 src/messageview.c:142
 msgid "/_File/_Close"
 msgstr "/_File/_Chiudi"
 
-#: src/addressbook.c:351
+#: src/addressbook.c:353
 msgid "/_Address"
 msgstr "/_Indirizzo"
 
-#: src/addressbook.c:352
+#: src/addressbook.c:354
 msgid "/_Address/New _Address"
 msgstr "/_Indirizzo/Nuovo _indirizzo"
 
-#: src/addressbook.c:353
+#: src/addressbook.c:355
 msgid "/_Address/New _Group"
 msgstr "/_Indirizzo/Nuovo _gruppo"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:356
 msgid "/_Address/New _Folder"
 msgstr "/_Indirizzo/Nuova _cartella"
 
-#: src/addressbook.c:355
+#: src/addressbook.c:357
 msgid "/_Address/---"
 msgstr "/_Indirizzo/---"
 
-#: src/addressbook.c:356
+#: src/addressbook.c:358
 msgid "/_Address/_Edit"
 msgstr "/_Indirizzo/_Modifica"
 
-#: src/addressbook.c:357
+#: src/addressbook.c:359
 msgid "/_Address/_Delete"
 msgstr "/_indirizzo/_Elimina"
 
-#: src/addressbook.c:358 src/compose.c:639 src/mainwindow.c:738
-#: src/messageview.c:259
+#: src/addressbook.c:360 src/compose.c:645 src/mainwindow.c:749
+#: src/messageview.c:264
 msgid "/_Tools"
 msgstr "/S_trumenti"
 
-#: src/addressbook.c:359
+#: src/addressbook.c:361
 msgid "/_Tools/Import _LDIF file"
 msgstr "/S_trumenti/Importa file _LDIF"
 
-#: src/addressbook.c:360 src/compose.c:658 src/mainwindow.c:788
-#: src/messageview.c:277
+#: src/addressbook.c:362 src/compose.c:664 src/mainwindow.c:799
+#: src/messageview.c:282
 msgid "/_Help"
 msgstr "/A_iuto"
 
-#: src/addressbook.c:361 src/compose.c:659 src/mainwindow.c:799
-#: src/messageview.c:278
+#: src/addressbook.c:363 src/compose.c:665 src/mainwindow.c:810
+#: src/messageview.c:283
 msgid "/_Help/_About"
 msgstr "/A_iuto/I_nformazioni"
 
-#: src/addressbook.c:380 src/addressbook.c:390
+#: src/addressbook.c:382 src/addressbook.c:392
 msgid "/New _Address"
 msgstr "/Nuovo _indirizzo"
 
-#: src/addressbook.c:381 src/addressbook.c:391
+#: src/addressbook.c:383 src/addressbook.c:393
 msgid "/New _Group"
 msgstr "/Nuovo _gruppo"
 
-#: src/addressbook.c:382 src/addressbook.c:392
+#: src/addressbook.c:384 src/addressbook.c:394
 msgid "/New _Folder"
 msgstr "/Nuova _cartella"
 
-#: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:509
+#: src/addressbook.c:385 src/addressbook.c:395 src/compose.c:509
 #: src/folderview.c:246 src/folderview.c:248 src/folderview.c:253
 #: src/folderview.c:266 src/folderview.c:268 src/folderview.c:270
 #: src/folderview.c:275 src/folderview.c:289 src/folderview.c:291
 #: src/folderview.c:295 src/summaryview.c:414 src/summaryview.c:418
-#: src/summaryview.c:421 src/summaryview.c:431 src/summaryview.c:433
-#: src/summaryview.c:435 src/summaryview.c:447 src/summaryview.c:453
+#: src/summaryview.c:421 src/summaryview.c:433 src/summaryview.c:435
+#: src/summaryview.c:437 src/summaryview.c:449 src/summaryview.c:455
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:534
-#: src/mainwindow.c:509 src/messageview.c:144
+#: src/addressbook.c:386 src/addressbook.c:396 src/compose.c:534
+#: src/mainwindow.c:512 src/messageview.c:144
 msgid "/_Edit"
 msgstr "/_Modifica"
 
-#: src/addressbook.c:385 src/addressbook.c:395 src/summaryview.c:432
+#: src/addressbook.c:387 src/addressbook.c:397 src/summaryview.c:434
 msgid "/_Delete"
 msgstr "/Eli_mina"
 
-#: src/addressbook.c:492
+#: src/addressbook.c:494
 msgid "E-Mail address"
 msgstr "Indirizzo e-mail"
 
-#: src/addressbook.c:496 src/compose.c:4763 src/prefs_common_dialog.c:2183
+#: src/addressbook.c:498 src/compose.c:4772 src/prefs_common_dialog.c:2183
 msgid "Address book"
 msgstr "Rubrica"
 
-#: src/addressbook.c:596 src/prefs_filter_edit.c:249
+#: src/addressbook.c:600 src/prefs_filter_edit.c:249
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "Nome:"
 
 #. Buttons
-#: src/addressbook.c:628 src/addressbook.c:1680 src/editaddress.c:884
-#: src/editaddress.c:1017 src/mainwindow.c:2391 src/prefs_actions.c:266
+#: src/addressbook.c:632 src/addressbook.c:1684 src/editaddress.c:884
+#: src/editaddress.c:1017 src/mainwindow.c:2402 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
 #: src/prefs_template.c:233
 msgid "Delete"
 msgstr "Elimina"
 
-#: src/addressbook.c:631 src/editaddress.c:890 src/editaddress.c:1023
+#: src/addressbook.c:635 src/editaddress.c:890 src/editaddress.c:1023
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:273 src/prefs_display_header.c:328
 #: src/prefs_filter_edit.c:1550
 msgid "Add"
 msgstr " Aggiungi "
 
-#: src/addressbook.c:634
+#: src/addressbook.c:638
 msgid "Lookup"
 msgstr "Cerca"
 
-#: src/addressbook.c:646 src/headerview.c:55 src/prefs_folder_item.c:339
+#: src/addressbook.c:650 src/headerview.c:55 src/prefs_folder_item.c:339
 #: src/prefs_template.c:176
 msgid "To:"
 msgstr "A:"
 
-#: src/addressbook.c:650 src/prefs_folder_item.c:356 src/prefs_template.c:178
+#: src/addressbook.c:654 src/prefs_folder_item.c:356 src/prefs_template.c:178
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:654 src/prefs_folder_item.c:367
+#: src/addressbook.c:658 src/prefs_folder_item.c:367
 msgid "Bcc:"
 msgstr "Bcc:"
 
 #. Confirm deletion
-#: src/addressbook.c:841
+#: src/addressbook.c:845
 msgid "Delete address(es)"
 msgstr "Elimina l'indirizzo(i)"
 
-#: src/addressbook.c:842
+#: src/addressbook.c:846
 msgid "Really delete the address(es)?"
 msgstr "Eliminare l'indirizzo(i)?"
 
-#: src/addressbook.c:1671
+#: src/addressbook.c:1675
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1048,36 +1048,36 @@ msgstr ""
 "Eliminando solo la cartella, gli indirizzi saranno spostati nella cartella "
 "di origine."
 
-#: src/addressbook.c:1674 src/folderview.c:2351
+#: src/addressbook.c:1678 src/folderview.c:2351
 msgid "Delete folder"
 msgstr "Elimina la cartella"
 
-#: src/addressbook.c:1674
+#: src/addressbook.c:1678
 msgid "_Folder only"
 msgstr "_Solo la cartella"
 
-#: src/addressbook.c:1674
+#: src/addressbook.c:1678
 msgid "Folder and _addresses"
 msgstr "Cartella e _indirizzi"
 
-#: src/addressbook.c:1679
+#: src/addressbook.c:1683
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Eliminare «%s» ?"
 
-#: src/addressbook.c:2365 src/addressbook.c:2498
+#: src/addressbook.c:2369 src/addressbook.c:2502
 msgid "New user, could not save index file."
 msgstr "Nuovo utente, impossibile salvare il file indice."
 
-#: src/addressbook.c:2369 src/addressbook.c:2502
+#: src/addressbook.c:2373 src/addressbook.c:2506
 msgid "New user, could not save address book files."
 msgstr "Nuovo utente, impossibile salvare i file della rubrica."
 
-#: src/addressbook.c:2379 src/addressbook.c:2512
+#: src/addressbook.c:2383 src/addressbook.c:2516
 msgid "Old address book converted successfully."
 msgstr "La vecchia rubrica è stata convertita con successo."
 
-#: src/addressbook.c:2384
+#: src/addressbook.c:2388
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1085,7 +1085,7 @@ msgstr ""
 "Vecchia rubrica convertita,\n"
 "impossibile salvare il nuovo file indice dell'indirizzo"
 
-#: src/addressbook.c:2397
+#: src/addressbook.c:2401
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1093,7 +1093,7 @@ msgstr ""
 "Impossibile convertire la rubrica,\n"
 "ma ho creato nuovi file vuoti della rubrica."
 
-#: src/addressbook.c:2403
+#: src/addressbook.c:2407
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1101,7 +1101,7 @@ msgstr ""
 "Impossibile convertire la rubrica,\n"
 "impossibile creare i nuovi file della rubrica."
 
-#: src/addressbook.c:2408
+#: src/addressbook.c:2412
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1109,92 +1109,92 @@ msgstr ""
 "Impossibile convertire la rubrica,\n"
 "e impossibile creare i nuovi file della rubrica."
 
-#: src/addressbook.c:2415
+#: src/addressbook.c:2419
 msgid "Addressbook conversion error"
 msgstr "Errore di conversione della rubrica"
 
-#: src/addressbook.c:2419
+#: src/addressbook.c:2423
 msgid "Addressbook conversion"
 msgstr "Conversione della rubrica"
 
-#: src/addressbook.c:2454
+#: src/addressbook.c:2458
 msgid "Addressbook Error"
 msgstr "Errore nella rubrica"
 
-#: src/addressbook.c:2455 src/addressbook.c:2555
+#: src/addressbook.c:2459 src/addressbook.c:2559
 msgid "Could not read address index"
 msgstr "Impossibile leggere l'indice dell'indirizzo"
 
-#: src/addressbook.c:2517
+#: src/addressbook.c:2521
 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:2531
+#: src/addressbook.c:2535
 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:2537
+#: src/addressbook.c:2541
 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:2543
+#: src/addressbook.c:2547
 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:2561
+#: src/addressbook.c:2565
 msgid "Addressbook Conversion Error"
 msgstr "Errore di conversione della rubrica"
 
-#: src/addressbook.c:2567
+#: src/addressbook.c:2571
 msgid "Addressbook Conversion"
 msgstr "Conversione della rubrica"
 
-#: src/addressbook.c:3072 src/prefs_common_dialog.c:2033
+#: src/addressbook.c:3086 src/prefs_common_dialog.c:2033
 msgid "Interface"
 msgstr "Interfaccia"
 
-#: src/addressbook.c:3088 src/importldif.c:514
+#: src/addressbook.c:3102 src/importldif.c:514
 msgid "Address Book"
 msgstr "Rubrica"
 
-#: src/addressbook.c:3104
+#: src/addressbook.c:3118
 msgid "Person"
 msgstr "Persona"
 
-#: src/addressbook.c:3120
+#: src/addressbook.c:3134
 msgid "EMail Address"
 msgstr "Indirizzo email"
 
-#: src/addressbook.c:3136
+#: src/addressbook.c:3150
 msgid "Group"
 msgstr "Gruppo"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3152 src/folderview.c:367 src/prefs_account_dialog.c:1694
+#: src/addressbook.c:3166 src/folderview.c:367 src/prefs_account_dialog.c:1694
 #: src/query_search.c:370
 msgid "Folder"
 msgstr "Cartella"
 
-#: src/addressbook.c:3168
+#: src/addressbook.c:3182
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3184 src/addressbook.c:3200
+#: src/addressbook.c:3198 src/addressbook.c:3214
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3216
+#: src/addressbook.c:3230
 msgid "LDAP Server"
 msgstr "Server LDAP"
 
@@ -1206,7 +1206,7 @@ msgstr "Indirizzo comune"
 msgid "Personal address"
 msgstr "Indirizzo personale"
 
-#: src/alertpanel.c:141 src/compose.c:5485 src/main.c:573
+#: src/alertpanel.c:141 src/compose.c:5494 src/main.c:573
 msgid "Notice"
 msgstr "Avviso"
 
@@ -1257,7 +1257,7 @@ msgstr "Marrone"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4593
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4750
 msgid "None"
 msgstr "Niente"
 
@@ -1315,7 +1315,7 @@ msgstr "/_Modifica/_Annulla"
 msgid "/_Edit/_Redo"
 msgstr "/_Modifica/_Ripeti"
 
-#: src/compose.c:537 src/compose.c:544 src/mainwindow.c:513
+#: src/compose.c:537 src/compose.c:544 src/mainwindow.c:516
 #: src/messageview.c:147
 msgid "/_Edit/---"
 msgstr "/_Modifica/---"
@@ -1324,7 +1324,7 @@ msgstr "/_Modifica/---"
 msgid "/_Edit/Cu_t"
 msgstr "/_Modifica/_Taglia"
 
-#: src/compose.c:539 src/mainwindow.c:510 src/messageview.c:145
+#: src/compose.c:539 src/mainwindow.c:513 src/messageview.c:145
 msgid "/_Edit/_Copy"
 msgstr "/_Modifica/_Copia"
 
@@ -1336,7 +1336,7 @@ msgstr "/_Modifica/_Incolla"
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Modifica/Incolla co_me citazione"
 
-#: src/compose.c:543 src/mainwindow.c:511 src/messageview.c:146
+#: src/compose.c:543 src/mainwindow.c:514 src/messageview.c:146
 msgid "/_Edit/Select _all"
 msgstr "/_Modifica/_Seleziona tutto"
 
@@ -1352,8 +1352,8 @@ msgstr "/_Modifica/A capo tutte le righe _lunghe"
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Modifica/A cap_o automatico"
 
-#: src/compose.c:550 src/mainwindow.c:518 src/messageview.c:151
-#: src/summaryview.c:448
+#: src/compose.c:550 src/mainwindow.c:521 src/messageview.c:151
+#: src/summaryview.c:450
 msgid "/_View"
 msgstr "/_Visualizza"
 
@@ -1374,9 +1374,9 @@ msgid "/_View/_Reply to"
 msgstr "/_Visualizza/_Rispondi a"
 
 #: src/compose.c:555 src/compose.c:557 src/compose.c:559 src/compose.c:561
-#: src/mainwindow.c:538 src/mainwindow.c:541 src/mainwindow.c:568
-#: src/mainwindow.c:592 src/mainwindow.c:687 src/mainwindow.c:691
-#: src/messageview.c:236
+#: src/mainwindow.c:541 src/mainwindow.c:544 src/mainwindow.c:571
+#: src/mainwindow.c:595 src/mainwindow.c:696 src/mainwindow.c:700
+#: src/messageview.c:241
 msgid "/_View/---"
 msgstr "/_Visualizza/---"
 
@@ -1392,7 +1392,7 @@ msgstr "/_Visualizza/R_ighello"
 msgid "/_View/_Attachment"
 msgstr "/_Visualizza/Alle_gato"
 
-#: src/compose.c:567 src/mainwindow.c:599 src/messageview.c:158
+#: src/compose.c:567 src/mainwindow.c:602 src/messageview.c:158
 msgid "/_View/Character _encoding"
 msgstr "/_Visualizza/Co_difica caratteri"
 
@@ -1401,212 +1401,223 @@ msgid "/_View/Character _encoding/_Automatic"
 msgstr "/_Visualizza/Co_difica caratteri/_Automatica"
 
 #: src/compose.c:570 src/compose.c:576 src/compose.c:582 src/compose.c:586
-#: src/compose.c:592 src/compose.c:596 src/compose.c:602 src/compose.c:606
-#: src/compose.c:616 src/compose.c:620 src/compose.c:628 src/compose.c:632
-#: src/mainwindow.c:595 src/mainwindow.c:602 src/messageview.c:154
+#: src/compose.c:592 src/compose.c:596 src/compose.c:602 src/compose.c:608
+#: src/compose.c:612 src/compose.c:622 src/compose.c:626 src/compose.c:634
+#: src/compose.c:638 src/mainwindow.c:598 src/mainwindow.c:605
+#: src/messageview.c:154
 msgid "/_View/Character _encoding/---"
 msgstr "/_Visualizza/Co_difica·caratteri/---"
 
-#: src/compose.c:572 src/mainwindow.c:603 src/messageview.c:162
+#: src/compose.c:572 src/mainwindow.c:606 src/messageview.c:162
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Visualizza/Co_difica·caratteri/ASCII a 7 bit (US-ASC_II)"
 
-#: src/compose.c:574 src/mainwindow.c:605 src/messageview.c:165
+#: src/compose.c:574 src/mainwindow.c:608 src/messageview.c:165
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Visualizza/Co_difica caratteri/Unicode (_UTF-8)"
 
-#: src/compose.c:578 src/mainwindow.c:609 src/messageview.c:168
+#: src/compose.c:578 src/mainwindow.c:612 src/messageview.c:168
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Visualizza/Co_difica caratteri/Europa Occidentale (ISO-8859-_1)"
 
-#: src/compose.c:580 src/mainwindow.c:611 src/messageview.c:170
+#: src/compose.c:580 src/mainwindow.c:614 src/messageview.c:170
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Visualizza/Co_difica caratteri/Europa Occidentale (IS_O-8859-15)"
 
-#: src/compose.c:584 src/mainwindow.c:617 src/messageview.c:175
+#: src/compose.c:584 src/mainwindow.c:620 src/messageview.c:175
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Visualizza/Co_difica caratteri/Europa Centrale (ISO-8859-_2)"
 
-#: src/compose.c:588 src/mainwindow.c:621 src/messageview.c:178
+#: src/compose.c:588 src/mainwindow.c:624 src/messageview.c:178
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Visualizza/Co_difica caratteri/Baltico (I_SO-8859-13)"
 
-#: src/compose.c:590 src/mainwindow.c:623 src/messageview.c:180
+#: src/compose.c:590 src/mainwindow.c:626 src/messageview.c:180
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Visualizza/Co_difica caratteri/Baltico (ISO-8859-_4)"
 
-#: src/compose.c:594 src/mainwindow.c:627 src/messageview.c:183
+#: src/compose.c:594 src/mainwindow.c:630 src/messageview.c:183
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Visualizza/Co_difica caratteri/Greco (ISO-8859-_7)"
 
-#: src/compose.c:598 src/mainwindow.c:631 src/messageview.c:186
+#: src/compose.c:598 src/mainwindow.c:634 src/messageview.c:186
+#, fuzzy
+msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
+msgstr "/_Visualizza/Co_difica caratteri/Baltico (ISO-8859-_4)"
+
+#: src/compose.c:600 src/mainwindow.c:636 src/messageview.c:188
+#, fuzzy
+msgid "/_View/Character _encoding/Arabic (Windows-1256)"
+msgstr "/_Visualizza/Co_difica caratteri/Cirillico (_Windows-1251)"
+
+#: src/compose.c:604 src/mainwindow.c:640 src/messageview.c:191
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Visualizza/Co_difica caratteri/Ebreo (ISO-8859-_8)"
 
-#: src/compose.c:600 src/mainwindow.c:633 src/messageview.c:188
+#: src/compose.c:606 src/mainwindow.c:642 src/messageview.c:193
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Visualizza/Co_difica caratteri/Ebreo (Windows-1255)"
 
-#: src/compose.c:604 src/mainwindow.c:637 src/messageview.c:191
+#: src/compose.c:610 src/mainwindow.c:646 src/messageview.c:196
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Visualizza/Co_difica caratteri/Turco (ISO-8859-_9)"
 
-#: src/compose.c:608 src/mainwindow.c:641 src/messageview.c:194
+#: src/compose.c:614 src/mainwindow.c:650 src/messageview.c:199
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Visualizza/Co_difica caratteri/Cirillico (ISO-8859-_5)"
 
-#: src/compose.c:610 src/mainwindow.c:643 src/messageview.c:196
+#: src/compose.c:616 src/mainwindow.c:652 src/messageview.c:201
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Visualizza/Co_difica caratteri/Cirillico (KOI8-_R)"
 
-#: src/compose.c:612 src/mainwindow.c:645 src/messageview.c:198
+#: src/compose.c:618 src/mainwindow.c:654 src/messageview.c:203
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Visualizza/Co_difica caratteri/Ciri_llico (KOI8-U)"
 
-#: src/compose.c:614 src/mainwindow.c:647 src/messageview.c:200
+#: src/compose.c:620 src/mainwindow.c:656 src/messageview.c:205
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Visualizza/Co_difica caratteri/Cirillico (_Windows-1251)"
 
-#: src/compose.c:618 src/mainwindow.c:651 src/messageview.c:203
+#: src/compose.c:624 src/mainwindow.c:660 src/messageview.c:208
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Visualizza/Co_difica caratteri/Giapponese (ISO-2022-_JP)"
 
-#: src/compose.c:622 src/mainwindow.c:661 src/messageview.c:212
+#: src/compose.c:628 src/mainwindow.c:670 src/messageview.c:217
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Visualizza/Co_difica caratteri/Cinese semplificato (_GB2312)"
 
-#: src/compose.c:624 src/mainwindow.c:663 src/messageview.c:214
+#: src/compose.c:630 src/mainwindow.c:672 src/messageview.c:219
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Visualizza/Co_difica caratteri/Cinese semplificato (GBK)"
 
-#: src/compose.c:626 src/mainwindow.c:665 src/messageview.c:216
+#: src/compose.c:632 src/mainwindow.c:674 src/messageview.c:221
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Visualizza/Co_difica caratteri/Cinese tradizionale (_Big5)"
 
-#: src/compose.c:630 src/mainwindow.c:673 src/messageview.c:223
+#: src/compose.c:636 src/mainwindow.c:682 src/messageview.c:228
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Visualizza/Co_difica caratteri/Coreano (EUC-_KR)"
 
-#: src/compose.c:634 src/mainwindow.c:679 src/messageview.c:228
+#: src/compose.c:640 src/mainwindow.c:688 src/messageview.c:233
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Visualizza/Co_difica caratteri/Tailandese (TIS-_620)"
 
-#: src/compose.c:636 src/mainwindow.c:681 src/messageview.c:230
+#: src/compose.c:642 src/mainwindow.c:690 src/messageview.c:235
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Visualizza/Co_difica caratteri/Tailan_dese (Windows-874)"
 
-#: src/compose.c:640 src/mainwindow.c:739 src/messageview.c:260
+#: src/compose.c:646 src/mainwindow.c:750 src/messageview.c:265
 msgid "/_Tools/_Address book"
 msgstr "/S_trumenti/_Rubrica"
 
-#: src/compose.c:641
+#: src/compose.c:647
 msgid "/_Tools/_Template"
 msgstr "/S_trumenti/_Modello"
 
-#: src/compose.c:642 src/mainwindow.c:762 src/messageview.c:275
+#: src/compose.c:648 src/mainwindow.c:773 src/messageview.c:280
 msgid "/_Tools/Actio_ns"
 msgstr "/S_trumenti/A_zioni"
 
-#: src/compose.c:643 src/compose.c:647 src/compose.c:653 src/mainwindow.c:742
-#: src/mainwindow.c:756 src/mainwindow.c:761 src/mainwindow.c:763
-#: src/mainwindow.c:766 src/mainwindow.c:768 src/messageview.c:263
-#: src/messageview.c:274
+#: src/compose.c:649 src/compose.c:653 src/compose.c:659 src/mainwindow.c:753
+#: src/mainwindow.c:767 src/mainwindow.c:772 src/mainwindow.c:774
+#: src/mainwindow.c:777 src/mainwindow.c:779 src/messageview.c:268
+#: src/messageview.c:279
 msgid "/_Tools/---"
 msgstr "/S_trumenti/---"
 
-#: src/compose.c:644
+#: src/compose.c:650
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/_Strumenti/Modifica con l'_editor esterno"
 
-#: src/compose.c:648
+#: src/compose.c:654
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Strumenti/Firma P_GP"
 
-#: src/compose.c:649
+#: src/compose.c:655
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/_Strumenti/C_ifratura PGP"
 
-#: src/compose.c:654
+#: src/compose.c:660
 msgid "/_Tools/_Check spell"
 msgstr "/S_trumenti/_Controllo ortografico"
 
-#: src/compose.c:655
+#: src/compose.c:661
 msgid "/_Tools/_Set spell language"
 msgstr "/S_trumenti/Impo_sta lingua"
 
-#: src/compose.c:899
+#: src/compose.c:908
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: il file non esiste\n"
 
-#: src/compose.c:1003 src/compose.c:1074
+#: src/compose.c:1012 src/compose.c:1083
 msgid "Can't get text part\n"
 msgstr "Impossibile ricevere parte del testo\n"
 
-#: src/compose.c:1475
+#: src/compose.c:1484
 msgid "Quote mark format error."
 msgstr "Errore del formato del segno di citazione."
 
-#: src/compose.c:1487
+#: src/compose.c:1496
 msgid "Message reply/forward format error."
 msgstr "Errore del formato nel messaggio di risposta/inoltro."
 
-#: src/compose.c:1907
+#: src/compose.c:1916
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Il file %s non esiste\n"
 
-#: src/compose.c:1911
+#: src/compose.c:1920
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Impossibile ottenere la dimensione di %s\n"
 
-#: src/compose.c:1915
+#: src/compose.c:1924
 #, c-format
 msgid "File %s is empty."
 msgstr "Il file %s è vuoto."
 
-#: src/compose.c:1919
+#: src/compose.c:1928
 #, c-format
 msgid "Can't read %s."
 msgstr "Impossibile leggere %s."
 
-#: src/compose.c:1952
+#: src/compose.c:1961
 #, c-format
 msgid "Message: %s"
 msgstr "Messaggio: %s"
 
-#: src/compose.c:2012 src/mimeview.c:565
+#: src/compose.c:2021 src/mimeview.c:565
 msgid "Can't get the part of multipart message."
 msgstr "Impossibile ricevere parte del messaggio composto."
 
-#: src/compose.c:2496 src/headerview.c:195 src/query_search.c:636
-#: src/summaryview.c:2107
+#: src/compose.c:2505 src/headerview.c:195 src/query_search.c:636
+#: src/summaryview.c:2124
 msgid "(No Subject)"
 msgstr "(Nessun oggetto)"
 
-#: src/compose.c:2499
+#: src/compose.c:2508
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Componi%s"
 
-#: src/compose.c:2612
+#: src/compose.c:2621
 msgid "Recipient is not specified."
 msgstr "Il destinatario non è specificato."
 
-#: src/compose.c:2620
+#: src/compose.c:2629
 msgid "Empty subject"
 msgstr "Oggetto vuoto"
 
-#: src/compose.c:2621
+#: src/compose.c:2630
 msgid "Subject is empty. Send it anyway?"
 msgstr "L'oggetto è vuoto. Inviarlo comunque?"
 
-#: src/compose.c:2680
+#: src/compose.c:2689
 msgid "can't get recipient list."
 msgstr "impossibile ottenere la lista dei destinatari."
 
-#: src/compose.c:2700
+#: src/compose.c:2709
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1614,23 +1625,23 @@ msgstr ""
 "Non è specificato l'account per l'invio della posta.\n"
 "Scegliere un account di posta prima dell'invio."
 
-#: src/compose.c:2714 src/send_message.c:299
+#: src/compose.c:2723 src/send_message.c:299
 #, 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:2756
+#: src/compose.c:2765
 msgid "Can't save the message to outbox."
 msgstr "Impossibile salvare il messaggio nella cartella «Inviata»."
 
-#: src/compose.c:2794
+#: src/compose.c:2803
 #, 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:2891
+#: src/compose.c:2900
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1642,11 +1653,11 @@ msgstr ""
 "\n"
 "Spedirlo come %s comunque?"
 
-#: src/compose.c:2897
+#: src/compose.c:2906
 msgid "Code conversion error"
 msgstr "Errore di conversione del codice"
 
-#: src/compose.c:2970
+#: src/compose.c:2979
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1660,157 +1671,157 @@ msgstr ""
 "\n"
 "Spedirlo comunque?"
 
-#: src/compose.c:2974
+#: src/compose.c:2983
 msgid "Line length limit"
 msgstr "Limite lunghezza linea"
 
-#: src/compose.c:3264
+#: src/compose.c:3273
 msgid "can't remove the old message\n"
 msgstr "impossibile rimuovere il vecchio messaggio\n"
 
-#: src/compose.c:3282
+#: src/compose.c:3291
 msgid "queueing message...\n"
 msgstr "accodamento messaggio...\n"
 
-#: src/compose.c:3364
+#: src/compose.c:3373
 msgid "can't find queue folder\n"
 msgstr "impossibile trovare la cartella «Coda»\n"
 
-#: src/compose.c:3371
+#: src/compose.c:3380
 msgid "can't queue the message\n"
 msgstr "impossibile accodare il messaggio\n"
 
-#: src/compose.c:3964
+#: src/compose.c:3973
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "generato l'ID-messaggio: %s\n"
 
-#: src/compose.c:4077
+#: src/compose.c:4086
 msgid "Creating compose window...\n"
 msgstr "Creazione della finestra di composizione...\n"
 
-#: src/compose.c:4128 src/headerview.c:54
+#: src/compose.c:4137 src/headerview.c:54
 msgid "From:"
 msgstr "Da:"
 
-#: src/compose.c:4202
+#: src/compose.c:4211
 msgid "PGP Sign"
 msgstr "Firma PGP"
 
-#: src/compose.c:4205
+#: src/compose.c:4214
 msgid "PGP Encrypt"
 msgstr "Cifratura PGP"
 
-#: src/compose.c:4243 src/compose.c:5317
+#: src/compose.c:4252 src/compose.c:5326
 msgid "MIME type"
 msgstr "Tipo MIME"
 
 #. S_COL_DATE
-#: src/compose.c:4252 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4740
+#: src/compose.c:4261 src/mimeview.c:197 src/prefs_filter_edit.c:496
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4897
 msgid "Size"
 msgstr "Dimensione"
 
-#: src/compose.c:4683 src/mainwindow.c:2324 src/prefs_account_dialog.c:528
+#: src/compose.c:4692 src/mainwindow.c:2335 src/prefs_account_dialog.c:528
 #: src/prefs_common_dialog.c:661
 msgid "Send"
 msgstr "Invia"
 
-#: src/compose.c:4684
+#: src/compose.c:4693
 msgid "Send message"
 msgstr "Invia il messaggio"
 
-#: src/compose.c:4692
+#: src/compose.c:4701
 msgid "Send later"
 msgstr "Invia più tardi"
 
-#: src/compose.c:4693
+#: src/compose.c:4702
 msgid "Put into queue folder and send later"
 msgstr "Mette nella cartella «Coda» e invia più tardi"
 
-#: src/compose.c:4701
+#: src/compose.c:4710
 msgid "Draft"
 msgstr "Bozze"
 
-#: src/compose.c:4702
+#: src/compose.c:4711
 msgid "Save to draft folder"
 msgstr "Salva nella cartella «Bozze»"
 
-#: src/compose.c:4712
+#: src/compose.c:4721
 msgid "Insert"
 msgstr "Inserisci"
 
-#: src/compose.c:4713
+#: src/compose.c:4722
 msgid "Insert file"
 msgstr "Inserisce il file"
 
-#: src/compose.c:4721
+#: src/compose.c:4730
 msgid "Attach"
 msgstr "Allega"
 
-#: src/compose.c:4722
+#: src/compose.c:4731
 msgid "Attach file"
 msgstr "Allega il file"
 
 #. signature
-#: src/compose.c:4732 src/prefs_account_dialog.c:1208
+#: src/compose.c:4741 src/prefs_account_dialog.c:1208
 #: src/prefs_common_dialog.c:953
 msgid "Signature"
 msgstr "Firma"
 
-#: src/compose.c:4733
+#: src/compose.c:4742
 #, fuzzy
 msgid "Append signature"
 msgstr "Firma DIFETTOSA"
 
 #. editor
-#: src/compose.c:4742 src/prefs_common_dialog.c:991
+#: src/compose.c:4751 src/prefs_common_dialog.c:991
 #: src/prefs_common_dialog.c:2315
 msgid "Editor"
 msgstr "Editor"
 
-#: src/compose.c:4743
+#: src/compose.c:4752
 msgid "Edit with external editor"
 msgstr "Modifica con l'editor esterno"
 
-#: src/compose.c:4751
+#: src/compose.c:4760
 msgid "Linewrap"
 msgstr "A capo riga"
 
-#: src/compose.c:4752
+#: src/compose.c:4761
 msgid "Wrap all long lines"
 msgstr "Manda a capo tutte le righe lunghe"
 
-#: src/compose.c:5213
+#: src/compose.c:5222
 msgid "Invalid MIME type."
 msgstr "Tipo MIME non valido."
 
-#: src/compose.c:5231
+#: src/compose.c:5240
 msgid "File doesn't exist or is empty."
 msgstr "Il file non esiste o è vuoto."
 
-#: src/compose.c:5299
+#: src/compose.c:5308
 msgid "Properties"
 msgstr "Proprietà"
 
-#: src/compose.c:5319 src/prefs_common_dialog.c:1444
+#: src/compose.c:5328 src/prefs_common_dialog.c:1444
 msgid "Encoding"
 msgstr "Codifica"
 
-#: src/compose.c:5342 src/prefs_folder_item.c:202
+#: src/compose.c:5351 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Percorso"
 
-#: src/compose.c:5343
+#: src/compose.c:5352
 msgid "File name"
 msgstr "Nome del file"
 
-#: src/compose.c:5436
+#: src/compose.c:5445
 #, 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:5482
+#: src/compose.c:5491
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1819,44 +1830,44 @@ msgstr ""
 "L'editor esterno è ancora attivo.\n"
 "Forzare la conclusione del processo (pid:%d)?\n"
 
-#: src/compose.c:5857 src/compose.c:5862 src/compose.c:5868
+#: src/compose.c:5866 src/compose.c:5871 src/compose.c:5877
 msgid "Can't queue the message."
 msgstr "Impossibile accodare il messaggio."
 
-#: src/compose.c:5959
+#: src/compose.c:5968
 msgid "Select files"
 msgstr "Seleziona i file"
 
-#: src/compose.c:5982
+#: src/compose.c:5991
 msgid "Select file"
 msgstr "Selezione del file"
 
-#: src/compose.c:6017
+#: src/compose.c:6026
 msgid "Save message"
 msgstr "Salva il messaggio"
 
-#: src/compose.c:6018
+#: src/compose.c:6027
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Questo messaggio è stato modificato. Salvarlo nella cartella bozze?"
 
-#: src/compose.c:6020
+#: src/compose.c:6029
 msgid "Close _without saving"
 msgstr "Chiudi sen_za salvare"
 
-#: src/compose.c:6062
+#: src/compose.c:6071
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Applicare il modello «%s» ?"
 
-#: src/compose.c:6064
+#: src/compose.c:6073
 msgid "Apply template"
 msgstr "Applica il modello"
 
-#: src/compose.c:6065
+#: src/compose.c:6074
 msgid "_Replace"
 msgstr "_Sostituisci"
 
-#: src/compose.c:6065
+#: src/compose.c:6074
 msgid "_Insert"
 msgstr "_Inserisci"
 
@@ -2293,7 +2304,7 @@ msgstr "Nuovi"
 
 #. S_COL_MARK
 #: src/folderview.c:412 src/prefs_filter_edit.c:500
-#: src/prefs_summary_column.c:71 src/summaryview.c:509
+#: src/prefs_summary_column.c:71 src/summaryview.c:511
 msgid "Unread"
 msgstr "Non letti"
 
@@ -2309,12 +2320,12 @@ msgstr "Impostazione delle informazioni della cartella...\n"
 msgid "Setting folder info..."
 msgstr "Impostazione delle informazioni della cartella..."
 
-#: src/folderview.c:858 src/mainwindow.c:3464 src/setup.c:80
+#: src/folderview.c:858 src/mainwindow.c:3481 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Analisi della cartella %s%c%s..."
 
-#: src/folderview.c:862 src/mainwindow.c:3469 src/setup.c:85
+#: src/folderview.c:862 src/mainwindow.c:3486 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Analisi della cartella %s..."
@@ -2339,7 +2350,7 @@ msgstr "La ricostruzione delll'albero della cartella è fallita."
 msgid "Checking for new messages in all folders..."
 msgstr "Controllo per nuovi messaggi in tutte le cartelle..."
 
-#: src/folderview.c:1200 src/mainwindow.c:2400 src/prefs_common_dialog.c:1789
+#: src/folderview.c:1200 src/mainwindow.c:2411 src/prefs_common_dialog.c:1789
 msgid "Junk"
 msgstr "Spazzatura"
 
@@ -2480,7 +2491,7 @@ msgstr "Oggetto:"
 msgid "Creating header view...\n"
 msgstr "Creazione della vista dell'intestazione...\n"
 
-#: src/headerview.c:180 src/query_search.c:637 src/summaryview.c:2110
+#: src/headerview.c:180 src/query_search.c:637 src/summaryview.c:2127
 msgid "(No From)"
 msgstr "(Nessun mittente)"
 
@@ -2589,7 +2600,7 @@ msgstr "Importazione del file LDIF nella rubrica"
 msgid "Prev"
 msgstr "Precedente"
 
-#: src/importldif.c:768 src/mainwindow.c:2420
+#: src/importldif.c:768 src/mainwindow.c:2431
 msgid "Next"
 msgstr "Successivo"
 
@@ -2941,11 +2952,11 @@ msgstr ""
 msgid "another Sylpheed is already running.\n"
 msgstr "un altro Sylpheed è già in esecuzione.\n"
 
-#: src/main.c:1064
+#: src/main.c:1083
 msgid "Migration of configuration"
 msgstr "Migrazione della configurazione"
 
-#: src/main.c:1065
+#: src/main.c:1084
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -2953,633 +2964,638 @@ msgstr ""
 "È stata trovata una versione precedente della configurazione.\n"
 "Trasferirla?"
 
-#: src/mainwindow.c:478
+#: src/mainwindow.c:481
 msgid "/_File/_Folder"
 msgstr "/_File/Ca_rtella"
 
-#: src/mainwindow.c:479
+#: src/mainwindow.c:482
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/_File/Ca_rtella/Crea _nuova cartella..."
 
-#: src/mainwindow.c:481
+#: src/mainwindow.c:484
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/_File/Ca_rtella/_Rinomina cartella..."
 
-#: src/mainwindow.c:482
+#: src/mainwindow.c:485
 msgid "/_File/_Folder/_Move folder..."
 msgstr "/_File/Ca_rtella/_Sposta cartella..."
 
-#: src/mainwindow.c:483
+#: src/mainwindow.c:486
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/_File/Ca_rtella/Eli_mina cartella"
 
-#: src/mainwindow.c:484
+#: src/mainwindow.c:487
 msgid "/_File/_Mailbox"
 msgstr "/_File/_Casella postale"
 
-#: src/mainwindow.c:485
+#: src/mainwindow.c:488
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/_File/_Casella postale/_Aggiungi casella postale..."
 
-#: src/mainwindow.c:486
+#: src/mainwindow.c:489
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/_File/_Casella postale/Rimuovi ca_sella postale"
 
-#: src/mainwindow.c:487 src/mainwindow.c:492
+#: src/mainwindow.c:490 src/mainwindow.c:495
 msgid "/_File/_Mailbox/---"
 msgstr "/_File/_Casella postale/---"
 
-#: src/mainwindow.c:488
+#: src/mainwindow.c:491
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "/_File/_Casella postale/_Controllo nuovi messaggi"
 
-#: src/mainwindow.c:490
+#: src/mainwindow.c:493
 msgid "/_File/_Mailbox/Check for new messages in _all mailboxes"
 msgstr "/_File/_Casella postale/Controllo nuovi _messaggi in tutte le cartelle"
 
-#: src/mainwindow.c:493
+#: src/mainwindow.c:496
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "/_File/_Casella postale/R_icostruisci l'albero cartella"
 
-#: src/mainwindow.c:496
+#: src/mainwindow.c:499
 msgid "/_File/_Import mbox file..."
 msgstr "/_File/_Importa file mbox..."
 
-#: src/mainwindow.c:497
+#: src/mainwindow.c:500
 msgid "/_File/_Export to mbox file..."
 msgstr "/_File/Esp_orta file mbox..."
 
-#: src/mainwindow.c:499
+#: src/mainwindow.c:502
 msgid "/_File/Empty all _trash"
 msgstr "/_File/S_vuota cestino"
 
-#: src/mainwindow.c:501 src/messageview.c:139
+#: src/mainwindow.c:504 src/messageview.c:139
 msgid "/_File/_Save as..."
 msgstr "/_File/Sa_lva come..."
 
-#: src/mainwindow.c:502 src/messageview.c:140
+#: src/mainwindow.c:505 src/messageview.c:140
 msgid "/_File/_Print..."
 msgstr "/_File/Stam_pa..."
 
-#: src/mainwindow.c:504
+#: src/mainwindow.c:507
 msgid "/_File/_Work offline"
 msgstr "/_File/Lavora offli_ne"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:507
+#: src/mainwindow.c:510
 msgid "/_File/E_xit"
 msgstr "/_File/_Esci"
 
-#: src/mainwindow.c:512
+#: src/mainwindow.c:515
 msgid "/_Edit/Select _thread"
 msgstr "/_Modifica/Seleziona t_hread"
 
-#: src/mainwindow.c:514 src/messageview.c:148
+#: src/mainwindow.c:517 src/messageview.c:148
 msgid "/_Edit/_Find in current message..."
 msgstr "/_Modifica/_Trova nel messaggio attuale..."
 
-#: src/mainwindow.c:516
+#: src/mainwindow.c:519
 msgid "/_Edit/_Search messages..."
 msgstr "/_Modifica/Ricerca _messaggi..."
 
-#: src/mainwindow.c:519
+#: src/mainwindow.c:522
 msgid "/_View/Show or hi_de"
 msgstr "/_Visualizza/Mostra o _nascondi"
 
-#: src/mainwindow.c:520
+#: src/mainwindow.c:523
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/_Visualizza/Mostra o _nascondi/A_lbero cartella"
 
-#: src/mainwindow.c:522
+#: src/mainwindow.c:525
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/_Visualizza/Mostra o _nascondi/Vista _messaggio"
 
-#: src/mainwindow.c:524
+#: src/mainwindow.c:527
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/_Visualizza/Mostra o _nascondi/Barra degli _strumenti"
 
-#: src/mainwindow.c:526
+#: src/mainwindow.c:529
 msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/_Visualizza/Mostra o _nascondi/Barra degli _strumenti/Icone _e testo"
 
-#: src/mainwindow.c:528
+#: src/mainwindow.c:531
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/_Visualizza/Mostra o _nascondi/Barra degli _strumenti/I_cone"
 
-#: src/mainwindow.c:530
+#: src/mainwindow.c:533
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/_Visualizza/Mostra o _nascondi/Barra degli _strumenti/_Testo"
 
-#: src/mainwindow.c:532
+#: src/mainwindow.c:535
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/_Visualizza/Mostra o _nascondi/Barra degli _strumenti/_Niente"
 
-#: src/mainwindow.c:534
+#: src/mainwindow.c:537
 #, fuzzy
 msgid "/_View/Show or hi_de/_Search bar"
 msgstr "/_Visualizza/Mostra o _nascondi/Barra di s_tato"
 
-#: src/mainwindow.c:536
+#: src/mainwindow.c:539
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/_Visualizza/Mostra o _nascondi/Barra di s_tato"
 
-#: src/mainwindow.c:539
+#: src/mainwindow.c:542
 msgid "/_View/Separate f_older tree"
 msgstr "/_Visualizza/Albero _cartella separato"
 
-#: src/mainwindow.c:540
+#: src/mainwindow.c:543
 msgid "/_View/Separate _message view"
 msgstr "/_Visualizza/Vista m_essaggio separata"
 
-#: src/mainwindow.c:542
+#: src/mainwindow.c:545
 msgid "/_View/_Sort"
 msgstr "/_Visualizza/_Ordina"
 
-#: src/mainwindow.c:543
+#: src/mainwindow.c:546
 msgid "/_View/_Sort/by _number"
 msgstr "/_Visualizza/_Ordina/per n_umero"
 
-#: src/mainwindow.c:544
+#: src/mainwindow.c:547
 msgid "/_View/_Sort/by s_ize"
 msgstr "/_Visualizza/_Ordina/per dim_ensione"
 
-#: src/mainwindow.c:545
+#: src/mainwindow.c:548
 msgid "/_View/_Sort/by _date"
 msgstr "/_Visualizza/_Ordina/per _data"
 
-#: src/mainwindow.c:546
+#: src/mainwindow.c:549
 msgid "/_View/_Sort/by t_hread date"
 msgstr "/_Visualizza/_Ordina/pe_r data del thread"
 
-#: src/mainwindow.c:547
+#: src/mainwindow.c:550
 msgid "/_View/_Sort/by _from"
 msgstr "/_Visualizza/_Ordina/per _mittente"
 
-#: src/mainwindow.c:548
+#: src/mainwindow.c:551
 msgid "/_View/_Sort/by _recipient"
 msgstr "/_Visualizza/_Ordina/per dest_inatario"
 
-#: src/mainwindow.c:549
+#: src/mainwindow.c:552
 msgid "/_View/_Sort/by _subject"
 msgstr "/_Visualizza/_Ordina/per _oggetto"
 
-#: src/mainwindow.c:550
+#: src/mainwindow.c:553
 msgid "/_View/_Sort/by _color label"
 msgstr "/_Visualizza/_Ordina/per colore etic_hetta"
 
-#: src/mainwindow.c:552
+#: src/mainwindow.c:555
 msgid "/_View/_Sort/by _mark"
 msgstr "/_Visualizza/_Ordina/per _segno"
 
-#: src/mainwindow.c:553
+#: src/mainwindow.c:556
 msgid "/_View/_Sort/by _unread"
 msgstr "/_Visualizza/_Ordina/per non le_tti"
 
-#: src/mainwindow.c:554
+#: src/mainwindow.c:557
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/_Visualizza/_Ordina/per a_llegato"
 
-#: src/mainwindow.c:556
+#: src/mainwindow.c:559
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/_Visualizza/_Ordina/No_n ordinare"
 
-#: src/mainwindow.c:557 src/mainwindow.c:560
+#: src/mainwindow.c:560 src/mainwindow.c:563
 msgid "/_View/_Sort/---"
 msgstr "/_Visualizza/_Ordina/---"
 
-#: src/mainwindow.c:558
+#: src/mainwindow.c:561
 msgid "/_View/_Sort/Ascending"
 msgstr "/_Visualizza/_Ordina/_Ascendente"
 
-#: src/mainwindow.c:559
+#: src/mainwindow.c:562
 msgid "/_View/_Sort/Descending"
 msgstr "/_Visualizza/_Ordina/Dis_cendente"
 
-#: src/mainwindow.c:561
+#: src/mainwindow.c:564
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/_Visualizza/_Ordina/_Raggruppa per oggetto"
 
-#: src/mainwindow.c:563
+#: src/mainwindow.c:566
 msgid "/_View/Th_read view"
 msgstr "/_Visualizza/Vista _thread"
 
-#: src/mainwindow.c:564
+#: src/mainwindow.c:567
 msgid "/_View/E_xpand all threads"
 msgstr "/_Visualizza/E_spandi tutti i thread"
 
-#: src/mainwindow.c:565
+#: src/mainwindow.c:568
 msgid "/_View/Co_llapse all threads"
 msgstr "/_Visualizza/Nascondi tutti i t_hread"
 
-#: src/mainwindow.c:566
+#: src/mainwindow.c:569
 msgid "/_View/Set display _item..."
 msgstr "/_Visualizza/I_mposta voci da visualizzare..."
 
-#: src/mainwindow.c:569
+#: src/mainwindow.c:572
 msgid "/_View/_Go to"
 msgstr "/_Visualizza/V_ai a"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:573
 msgid "/_View/_Go to/_Prev message"
 msgstr "/_Visualizza/V_ai a/Messaggio preced_ente"
 
-#: src/mainwindow.c:571
+#: src/mainwindow.c:574
 msgid "/_View/_Go to/_Next message"
 msgstr "/_Visualizza/V_ai a/Messaggio successi_vo"
 
-#: src/mainwindow.c:572 src/mainwindow.c:577 src/mainwindow.c:580
-#: src/mainwindow.c:585 src/mainwindow.c:590
+#: src/mainwindow.c:575 src/mainwindow.c:580 src/mainwindow.c:583
+#: src/mainwindow.c:588 src/mainwindow.c:593
 msgid "/_View/_Go to/---"
 msgstr "/_Visualizza/V_ai a/---"
 
-#: src/mainwindow.c:573
+#: src/mainwindow.c:576
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/_Visualizza/V_ai a/Messaggio non letto p_recedente"
 
-#: src/mainwindow.c:575
+#: src/mainwindow.c:578
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/_Visualizza/V_ai a/Messaggio non _letto successivo"
 
-#: src/mainwindow.c:578
+#: src/mainwindow.c:581
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/_Visualizza/V_ai a/Messaggio nuovo pre_cedente"
 
-#: src/mainwindow.c:579
+#: src/mainwindow.c:582
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/_Visualizza/V_ai a/Messaggio nu_ovo successivo"
 
-#: src/mainwindow.c:581
+#: src/mainwindow.c:584
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/_Visualizza/V_ai a/Messaggio _segnato precedente"
 
-#: src/mainwindow.c:583
+#: src/mainwindow.c:586
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/_Visualizza/V_ai a/Messaggio se_gnato successivo"
 
-#: src/mainwindow.c:586
+#: src/mainwindow.c:589
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/_Visualizza/V_ai a/Messaggio etic_hettato precedente"
 
-#: src/mainwindow.c:588
+#: src/mainwindow.c:591
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/_Visualizza/V_ai a/Messaggio e_tichettato successivo"
 
-#: src/mainwindow.c:591
+#: src/mainwindow.c:594
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Visualizza/V_ai a/Cartella di_fferente..."
 
-#: src/mainwindow.c:600 src/messageview.c:159
+#: src/mainwindow.c:603 src/messageview.c:159
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Visualizza/Co_difica caratteri/_Autorilevamento"
 
-#: src/mainwindow.c:613 src/messageview.c:172
+#: src/mainwindow.c:616 src/messageview.c:172
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr "/_Visualizza/Co_difica caratteri/Europa Occidentale (IS_O-8859-15)"
 
-#: src/mainwindow.c:653 src/messageview.c:205
+#: src/mainwindow.c:662 src/messageview.c:210
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Visualizza/Co_difica caratteri/Gia_pponese (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:655 src/messageview.c:207
+#: src/mainwindow.c:664 src/messageview.c:212
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Visualizza/Co_difica caratteri/Giapponese (_EUC-JP)"
 
-#: src/mainwindow.c:657 src/messageview.c:209
+#: src/mainwindow.c:666 src/messageview.c:214
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Visualizza/Co_difica caratteri/Giapponese (S_hift__JIS)"
 
-#: src/mainwindow.c:667 src/messageview.c:218
+#: src/mainwindow.c:676 src/messageview.c:223
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Visualizza/Co_difica caratteri/Cinese tradizionale (EUC-_TW)"
 
-#: src/mainwindow.c:669 src/messageview.c:220
+#: src/mainwindow.c:678 src/messageview.c:225
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Visualizza/Co_difica caratteri/Cinese (ISO-2022-_CN)"
 
-#: src/mainwindow.c:675 src/messageview.c:225
+#: src/mainwindow.c:684 src/messageview.c:230
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Visualizza/Co_difica caratteri/Corea_no (ISO-2022-KR)"
 
-#: src/mainwindow.c:688 src/summaryview.c:449
+#: src/mainwindow.c:697 src/summaryview.c:451
 msgid "/_View/Open in new _window"
 msgstr "/_Visualizza/Apri nuova _finestra"
 
-#: src/mainwindow.c:689 src/messageview.c:237
+#: src/mainwindow.c:698 src/messageview.c:242
 msgid "/_View/Mess_age source"
 msgstr "/_Visualizza/Sorgente messagg_io"
 
-#: src/mainwindow.c:690 src/messageview.c:238
+#: src/mainwindow.c:699 src/messageview.c:243
 msgid "/_View/Show all _header"
 msgstr "/_Visualizza/Mostra intesta_zioni"
 
-#: src/mainwindow.c:692
+#: src/mainwindow.c:701
 msgid "/_View/_Update summary"
 msgstr "/_Visualizza/A_ggiorna sommario"
 
-#: src/mainwindow.c:694 src/messageview.c:240
+#: src/mainwindow.c:703 src/messageview.c:245
 msgid "/_Message"
 msgstr "/M_essaggio"
 
-#: src/mainwindow.c:695
+#: src/mainwindow.c:704
 msgid "/_Message/Recei_ve"
 msgstr "/M_essaggio/Rice_vi"
 
-#: src/mainwindow.c:696
+#: src/mainwindow.c:705
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/M_essaggio/Rice_vi/Ricevi dall'a_ccount attuale"
 
-#: src/mainwindow.c:698
+#: src/mainwindow.c:707
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/M_essaggio/Rice_vi/Ricevi da _tutti gli account"
 
-#: src/mainwindow.c:700
+#: src/mainwindow.c:709
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/M_essaggio/Rice_vi/Cancella in rice_zione"
 
-#: src/mainwindow.c:702
+#: src/mainwindow.c:711
 msgid "/_Message/Recei_ve/---"
 msgstr "/M_essaggio/Rice_vi/---"
 
-#: src/mainwindow.c:703
+#: src/mainwindow.c:712
 msgid "/_Message/_Send queued messages"
 msgstr "/M_essaggio/Invia messa_ggi accodati"
 
-#: src/mainwindow.c:704 src/mainwindow.c:706 src/mainwindow.c:713
-#: src/mainwindow.c:718 src/mainwindow.c:721 src/mainwindow.c:730
-#: src/mainwindow.c:732 src/mainwindow.c:735 src/messageview.c:243
-#: src/messageview.c:251 src/messageview.c:256
+#: src/mainwindow.c:713 src/mainwindow.c:715 src/mainwindow.c:722
+#: src/mainwindow.c:727 src/mainwindow.c:730 src/mainwindow.c:741
+#: src/mainwindow.c:743 src/mainwindow.c:746 src/messageview.c:248
+#: src/messageview.c:256 src/messageview.c:261
 msgid "/_Message/---"
 msgstr "/M_essaggio/---"
 
-#: src/mainwindow.c:705 src/messageview.c:241
+#: src/mainwindow.c:714 src/messageview.c:246
 msgid "/_Message/Compose _new message"
 msgstr "/M_essaggio/Componi _nuovo messaggio"
 
-#: src/mainwindow.c:707 src/messageview.c:244
+#: src/mainwindow.c:716 src/messageview.c:249
 msgid "/_Message/_Reply"
 msgstr "/M_essaggio/_Rispondi"
 
-#: src/mainwindow.c:708
+#: src/mainwindow.c:717
 msgid "/_Message/Repl_y to"
 msgstr "/M_essaggio/Rispondi _a"
 
-#: src/mainwindow.c:709 src/messageview.c:245
+#: src/mainwindow.c:718 src/messageview.c:250
 msgid "/_Message/Repl_y to/_all"
 msgstr "/M_essaggio/Rispondi _a/_tutti"
 
-#: src/mainwindow.c:710 src/messageview.c:247
+#: src/mainwindow.c:719 src/messageview.c:252
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/M_essaggio/Rispondi _a/_mittente"
 
-#: src/mainwindow.c:711 src/messageview.c:249
+#: src/mainwindow.c:720 src/messageview.c:254
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/M_essaggio/Rispondi _a/mailing _list"
 
-#: src/mainwindow.c:714 src/messageview.c:252
+#: src/mainwindow.c:723 src/messageview.c:257
 msgid "/_Message/_Forward"
 msgstr "/M_essaggio/_Inoltra"
 
-#: src/mainwindow.c:715 src/messageview.c:253
+#: src/mainwindow.c:724 src/messageview.c:258
 msgid "/_Message/For_ward as attachment"
 msgstr "/M_essaggio/Inoltra come a_llegato"
 
-#: src/mainwindow.c:717 src/messageview.c:255
+#: src/mainwindow.c:726 src/messageview.c:260
 msgid "/_Message/Redirec_t"
 msgstr "/M_essaggio/Rispe_disci"
 
-#: src/mainwindow.c:719
+#: src/mainwindow.c:728
 msgid "/_Message/M_ove..."
 msgstr "/M_essaggio/Sp_osta..."
 
-#: src/mainwindow.c:720
+#: src/mainwindow.c:729
 msgid "/_Message/_Copy..."
 msgstr "M_essaggio/_Copia..."
 
-#: src/mainwindow.c:722
+#: src/mainwindow.c:731
 msgid "/_Message/_Mark"
 msgstr "/M_essaggio/_Segna"
 
-#: src/mainwindow.c:723
+#: src/mainwindow.c:732
 msgid "/_Message/_Mark/_Mark"
 msgstr "/M_essaggio/_Segna/Segn_a"
 
-#: src/mainwindow.c:724
+#: src/mainwindow.c:733
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/M_essaggio/_Segna/To_gli segno"
 
-#: src/mainwindow.c:725
+#: src/mainwindow.c:734
 msgid "/_Message/_Mark/---"
 msgstr "/M_essaggio/_Segna/---"
 
-#: src/mainwindow.c:726
+#: src/mainwindow.c:735
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/M_essaggio/_Segna/Segna co_me non letto"
 
-#: src/mainwindow.c:727
+#: src/mainwindow.c:736
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/M_essaggio/_Segna/Segna come _letto"
 
-#: src/mainwindow.c:729
+#: src/mainwindow.c:738
+#, fuzzy
+msgid "/_Message/_Mark/Mark _thread as read"
+msgstr "/M_essaggio/_Segna/Segna come _letto"
+
+#: src/mainwindow.c:740
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/M_essaggio/_Segna/Segna come tutti l_etti"
 
-#: src/mainwindow.c:731
+#: src/mainwindow.c:742
 msgid "/_Message/_Delete"
 msgstr "/M_essaggio/Eli_mina"
 
-#: src/mainwindow.c:733
+#: src/mainwindow.c:744
 msgid "/_Message/Set as _junk mail"
 msgstr "/M_essaggio/Imposta come mail spa_zzatura"
 
-#: src/mainwindow.c:734
+#: src/mainwindow.c:745
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/_Messaggio/Im_posta come mail normale"
 
-#: src/mainwindow.c:736 src/messageview.c:257
+#: src/mainwindow.c:747 src/messageview.c:262
 msgid "/_Message/Re-_edit"
 msgstr "/M_essaggio/Rimodi_fica"
 
-#: src/mainwindow.c:740
+#: src/mainwindow.c:751
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/S_trumenti/Aggiungi mittente alla ru_brica..."
 
-#: src/mainwindow.c:743
+#: src/mainwindow.c:754
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/S_trumenti/_Filtra tutti i messaggi nella cartella"
 
-#: src/mainwindow.c:745
+#: src/mainwindow.c:756
 msgid "/_Tools/Filter _selected messages"
 msgstr "/S_trumenti/Filtra i messaggi _selezionati"
 
-#: src/mainwindow.c:747 src/messageview.c:264
+#: src/mainwindow.c:758 src/messageview.c:269
 msgid "/_Tools/_Create filter rule"
 msgstr "/S_trumenti/_Crea regola per il filtro"
 
-#: src/mainwindow.c:748 src/messageview.c:266
+#: src/mainwindow.c:759 src/messageview.c:271
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/S_trumenti/_Crea regola per il filtro/A_utomaticamente"
 
-#: src/mainwindow.c:750 src/messageview.c:268
+#: src/mainwindow.c:761 src/messageview.c:273
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/S_trumenti/_Crea regola per il filtro/con _Da"
 
-#: src/mainwindow.c:752 src/messageview.c:270
+#: src/mainwindow.c:763 src/messageview.c:275
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/S_trumenti/_Crea regola per il filtro/con _A"
 
-#: src/mainwindow.c:754 src/messageview.c:272
+#: src/mainwindow.c:765 src/messageview.c:277
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/S_trumenti/_Crea regola per il filtro/con l'_Oggetto"
 
-#: src/mainwindow.c:757
+#: src/mainwindow.c:768
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/S_trumenti/Filtra le mail s_pazzatura nella cartella"
 
-#: src/mainwindow.c:759
+#: src/mainwindow.c:770
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/S_trumenti/Filtra le _mail spazzatura nei messaggi selezionati"
 
-#: src/mainwindow.c:764
+#: src/mainwindow.c:775
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/S_trumenti/Elimina messaggi _duplicati"
 
-#: src/mainwindow.c:767
+#: src/mainwindow.c:778
 msgid "/_Tools/E_xecute"
 msgstr "/S_trumenti/Ese_gui"
 
-#: src/mainwindow.c:769
+#: src/mainwindow.c:780
 msgid "/_Tools/_Log window"
 msgstr "/S_trumenti/Finestra di _log"
 
-#: src/mainwindow.c:771
+#: src/mainwindow.c:782
 msgid "/_Configuration"
 msgstr "/_Configurazione"
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:783
 msgid "/_Configuration/_Common preferences..."
 msgstr "/_Configurazione/Preferenze _comuni..."
 
-#: src/mainwindow.c:774
+#: src/mainwindow.c:785
 msgid "/_Configuration/_Filter setting..."
 msgstr "/_Configurazione/Configurazione _filtri..."
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:787
 msgid "/_Configuration/_Template..."
 msgstr "/_Configurazione/Mo_dello..."
 
-#: src/mainwindow.c:777
+#: src/mainwindow.c:788
 msgid "/_Configuration/_Actions..."
 msgstr "/_Configurazione/_Azioni..."
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:789
 msgid "/_Configuration/---"
 msgstr "/_Configurazione/---"
 
-#: src/mainwindow.c:779
+#: src/mainwindow.c:790
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Configurazione/_Preferenze per l'account attuale..."
 
-#: src/mainwindow.c:781
+#: src/mainwindow.c:792
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Configurazione/Crea _nuovo account..."
 
-#: src/mainwindow.c:783
+#: src/mainwindow.c:794
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Configurazione/_Modifica account..."
 
-#: src/mainwindow.c:785
+#: src/mainwindow.c:796
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Configurazione/Cam_bia account attuale"
 
-#: src/mainwindow.c:789
+#: src/mainwindow.c:800
 msgid "/_Help/_Manual"
 msgstr "/A_iuto/_Manuale"
 
-#: src/mainwindow.c:790
+#: src/mainwindow.c:801
 msgid "/_Help/_Manual/_English"
 msgstr "/A_iuto/_Manuale/Ingl_ese"
 
-#: src/mainwindow.c:791
+#: src/mainwindow.c:802
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/A_iuto/_Manuale/_Giapponese"
 
-#: src/mainwindow.c:792
+#: src/mainwindow.c:803
 msgid "/_Help/_FAQ"
 msgstr "/A_iuto/_FAQ"
 
-#: src/mainwindow.c:793
+#: src/mainwindow.c:804
 msgid "/_Help/_FAQ/_English"
 msgstr "/A_iuto/_FAQ/Ingl_ese"
 
-#: src/mainwindow.c:794
+#: src/mainwindow.c:805
 msgid "/_Help/_FAQ/_German"
 msgstr "/A_iuto/_FAQ/_Tedesco"
 
-#: src/mainwindow.c:795
+#: src/mainwindow.c:806
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/A_iuto/_FAQ/_Spagnolo"
 
-#: src/mainwindow.c:796
+#: src/mainwindow.c:807
 msgid "/_Help/_FAQ/_French"
 msgstr "/A_iuto/_FAQ/_Francese"
 
-#: src/mainwindow.c:797
+#: src/mainwindow.c:808
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/A_iuto/_FAQ/_Italiano"
 
-#: src/mainwindow.c:798
+#: src/mainwindow.c:809
 msgid "/_Help/---"
 msgstr "/A_iuto/---"
 
-#: src/mainwindow.c:841
+#: src/mainwindow.c:852
 msgid "Creating main window...\n"
 msgstr "Creazione della finestra principale...\n"
 
-#: src/mainwindow.c:1011
+#: src/mainwindow.c:1022
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "FinestraPrincipale: l'allocazione del colore %d è fallita.\n"
 
-#: src/mainwindow.c:1108 src/summaryview.c:2258 src/summaryview.c:2343
-#: src/summaryview.c:3739 src/summaryview.c:3868 src/summaryview.c:4226
+#: src/mainwindow.c:1119 src/summaryview.c:2275 src/summaryview.c:2360
+#: src/summaryview.c:3896 src/summaryview.c:4025 src/summaryview.c:4383
 msgid "done.\n"
 msgstr "fatto.\n"
 
-#: src/mainwindow.c:1235 src/mainwindow.c:1276 src/mainwindow.c:1301
+#: src/mainwindow.c:1246 src/mainwindow.c:1287 src/mainwindow.c:1312
 msgid "Untitled"
 msgstr "Senza titolo"
 
-#: src/mainwindow.c:1302
+#: src/mainwindow.c:1313
 msgid "none"
 msgstr "niente"
 
-#: src/mainwindow.c:1355
+#: src/mainwindow.c:1366
 #, 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:1605
+#: src/mainwindow.c:1616
 msgid "Offline"
 msgstr "Offline"
 
-#: src/mainwindow.c:1606
+#: src/mainwindow.c:1617
 msgid "You are offline. Go online?"
 msgstr "Siete offline. Andare online?"
 
-#: src/mainwindow.c:1623
+#: src/mainwindow.c:1634
 msgid "Empty all trash"
 msgstr "Svuota cestino"
 
-#: src/mainwindow.c:1624
+#: src/mainwindow.c:1635
 msgid "Delete all messages in trash folders?"
 msgstr "Svuotare tutti i messaggi nei cestini?"
 
-#: src/mainwindow.c:1652
+#: src/mainwindow.c:1663
 msgid "Add mailbox"
 msgstr "Aggiunta di una casella postale"
 
-#: src/mainwindow.c:1653
+#: src/mainwindow.c:1664
 msgid ""
 "Specify the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3589,16 +3605,16 @@ msgstr ""
 "Se è specificata una casella postale esistente, sarà\n"
 "esaminata automaticamente."
 
-#: src/mainwindow.c:1659 src/setup.c:49
+#: src/mainwindow.c:1670 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "La casella postale «%s» esiste già."
 
-#: src/mainwindow.c:1664 src/setup.c:56
+#: src/mainwindow.c:1675 src/setup.c:56
 msgid "Mailbox"
 msgstr "Casella postale"
 
-#: src/mainwindow.c:1670 src/setup.c:62
+#: src/mainwindow.c:1681 src/setup.c:62
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3608,145 +3624,145 @@ msgstr ""
 "Può darsi che esistano già alcuni file, oppure non si ha il permesso di "
 "scrittura."
 
-#: src/mainwindow.c:2088
+#: src/mainwindow.c:2099
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Vista cartella"
 
-#: src/mainwindow.c:2107
+#: src/mainwindow.c:2118
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Vista messaggio"
 
-#: src/mainwindow.c:2259 src/summaryview.c:408
+#: src/mainwindow.c:2270 src/summaryview.c:408
 msgid "/_Reply"
 msgstr "/_Rispondi"
 
-#: src/mainwindow.c:2260
+#: src/mainwindow.c:2271
 msgid "/Reply to _all"
 msgstr "/Rispondi a _tutti"
 
-#: src/mainwindow.c:2261
+#: src/mainwindow.c:2272
 msgid "/Reply to _sender"
 msgstr "/Rispondi _al mittente"
 
-#: src/mainwindow.c:2262
+#: src/mainwindow.c:2273
 msgid "/Reply to mailing _list"
 msgstr "/Rispondi alla mailing _list"
 
-#: src/mainwindow.c:2267 src/summaryview.c:415
+#: src/mainwindow.c:2278 src/summaryview.c:415
 msgid "/_Forward"
 msgstr "/_Inoltra"
 
-#: src/mainwindow.c:2268 src/summaryview.c:416
+#: src/mainwindow.c:2279 src/summaryview.c:416
 msgid "/For_ward as attachment"
 msgstr "/Inoltra com_e allegato"
 
-#: src/mainwindow.c:2269 src/summaryview.c:417
+#: src/mainwindow.c:2280 src/summaryview.c:417
 msgid "/Redirec_t"
 msgstr "/Rispe_disci"
 
-#: src/mainwindow.c:2305
+#: src/mainwindow.c:2316
 msgid "Get"
 msgstr "Ricevi"
 
-#: src/mainwindow.c:2306
+#: src/mainwindow.c:2317
 msgid "Incorporate new mail"
 msgstr "Include la nuova posta"
 
-#: src/mainwindow.c:2313
+#: src/mainwindow.c:2324
 msgid "Get all"
 msgstr "Ricevi tutti"
 
-#: src/mainwindow.c:2314
+#: src/mainwindow.c:2325
 msgid "Incorporate new mail of all accounts"
 msgstr "Include la nuova posta di tutti gli account"
 
-#: src/mainwindow.c:2325
+#: src/mainwindow.c:2336
 msgid "Send queued message(s)"
 msgstr "Invia i messaggi accodati"
 
-#: src/mainwindow.c:2335 src/prefs_account_dialog.c:530
+#: src/mainwindow.c:2346 src/prefs_account_dialog.c:530
 #: src/prefs_common_dialog.c:663 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "Componi"
 
-#: src/mainwindow.c:2336
+#: src/mainwindow.c:2347
 msgid "Compose new message"
 msgstr "Compone un nuovo messaggio"
 
-#: src/mainwindow.c:2344 src/prefs_common_dialog.c:975
+#: src/mainwindow.c:2355 src/prefs_common_dialog.c:975
 msgid "Reply"
 msgstr "Rispondi"
 
-#: src/mainwindow.c:2345 src/mainwindow.c:2358
+#: src/mainwindow.c:2356 src/mainwindow.c:2369
 msgid "Reply to the message"
 msgstr "Risponde al messaggio"
 
-#: src/mainwindow.c:2362
+#: src/mainwindow.c:2373
 msgid "Reply all"
 msgstr "Rispondi tutti"
 
-#: src/mainwindow.c:2363
+#: src/mainwindow.c:2374
 msgid "Reply to all"
 msgstr "Risponde a tutti"
 
-#: src/mainwindow.c:2371 src/prefs_filter_edit.c:672
+#: src/mainwindow.c:2382 src/prefs_filter_edit.c:672
 msgid "Forward"
 msgstr "Inoltra"
 
-#: src/mainwindow.c:2372 src/mainwindow.c:2385
+#: src/mainwindow.c:2383 src/mainwindow.c:2396
 msgid "Forward the message"
 msgstr "Inoltra il messaggio"
 
-#: src/mainwindow.c:2392
+#: src/mainwindow.c:2403
 msgid "Delete the message"
 msgstr "Elimina il messaggio"
 
-#: src/mainwindow.c:2401
+#: src/mainwindow.c:2412
 msgid "Set as junk mail"
 msgstr "Imposta come mail spazzatura"
 
-#: src/mainwindow.c:2410
+#: src/mainwindow.c:2421
 msgid "Execute"
 msgstr "Esegui"
 
-#: src/mainwindow.c:2411
+#: src/mainwindow.c:2422
 msgid "Execute marked process"
 msgstr "Esegue le operazioni segnate"
 
-#: src/mainwindow.c:2421
+#: src/mainwindow.c:2432
 msgid "Next unread message"
 msgstr "Successivo messaggio non letto"
 
-#: src/mainwindow.c:2433
+#: src/mainwindow.c:2444
 msgid "Prefs"
 msgstr "Preferenze"
 
-#: src/mainwindow.c:2434
+#: src/mainwindow.c:2445
 msgid "Common preferences"
 msgstr "Preferenze comuni"
 
-#: src/mainwindow.c:2442 src/prefs_folder_item.c:289
+#: src/mainwindow.c:2453 src/prefs_folder_item.c:289
 #: src/prefs_folder_item.c:300 src/progressdialog.c:128
 msgid "Account"
 msgstr "Account"
 
-#: src/mainwindow.c:2443
+#: src/mainwindow.c:2454
 msgid "Account setting"
 msgstr "Impostazione dell'account"
 
-#: src/mainwindow.c:2615
+#: src/mainwindow.c:2626
 msgid "You are offline. Click the icon to go online."
 msgstr "Siete offline. Fare click sull'icona per andare online."
 
-#: src/mainwindow.c:2626
+#: src/mainwindow.c:2637
 msgid "You are online. Click the icon to go offline."
 msgstr "Siete online. Fare click sull'icona per andare offline."
 
-#: src/mainwindow.c:2892
+#: src/mainwindow.c:2903
 msgid "Exit"
 msgstr "Esci"
 
-#: src/mainwindow.c:2892
+#: src/mainwindow.c:2903
 msgid "Exit this program?"
 msgstr "Uscire da questo programma?"
 
@@ -3783,44 +3799,44 @@ msgstr "Ho raggiunto la fine del messaggio; continuo dall'inizio?"
 msgid "Search finished"
 msgstr "Ricerca terminata"
 
-#: src/messageview.c:261
+#: src/messageview.c:266
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/S_trumenti/Aggiungi mittente alla ru_brica"
 
-#: src/messageview.c:291
+#: src/messageview.c:296
 msgid "Creating message view...\n"
 msgstr "Creazione della vista del messaggio...\n"
 
-#: src/messageview.c:316
+#: src/messageview.c:321
 msgid "Text"
 msgstr "Testo"
 
-#: src/messageview.c:321
+#: src/messageview.c:326
 msgid "Attachments"
 msgstr "Allegati"
 
-#: src/messageview.c:371
+#: src/messageview.c:376
 msgid "Message View - Sylpheed"
 msgstr "Vista messaggio - Sylpheed"
 
-#: src/messageview.c:669 src/summaryview.c:3268
+#: src/messageview.c:674 src/summaryview.c:3425
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Impossibile salvare il file «%s»."
 
-#: src/messageview.c:728 src/summaryview.c:3291
+#: src/messageview.c:733 src/summaryview.c:3448
 msgid "The message will be printed with the following command:"
 msgstr "Il messaggio sarà stampato con il seguente comando:"
 
-#: src/messageview.c:729 src/summaryview.c:3292
+#: src/messageview.c:734 src/summaryview.c:3449
 msgid "(Default print command)"
 msgstr "(Comando di stampa predefinito)"
 
-#: src/messageview.c:731 src/prefs_common_dialog.c:2304 src/summaryview.c:3294
+#: src/messageview.c:736 src/prefs_common_dialog.c:2304 src/summaryview.c:3451
 msgid "Print"
 msgstr "Stampa"
 
-#: src/messageview.c:740 src/summaryview.c:3303
+#: src/messageview.c:745 src/summaryview.c:3460
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -4710,8 +4726,8 @@ msgstr "Mostra il destinatario nella colonna «Da» se il mittente sei tu stesso
 msgid "Expand threads"
 msgstr "Espandi i thread"
 
-#: src/prefs_common_dialog.c:1413 src/prefs_common_dialog.c:2713
-#: src/prefs_common_dialog.c:2751
+#: src/prefs_common_dialog.c:1413 src/prefs_common_dialog.c:2716
+#: src/prefs_common_dialog.c:2754
 msgid "Date format"
 msgstr "Formato della data"
 
@@ -5001,8 +5017,8 @@ msgstr ""
 msgid "Web browser"
 msgstr "Browser web"
 
-#: src/prefs_common_dialog.c:2288 src/prefs_common_dialog.c:3775
-#: src/prefs_common_dialog.c:3796
+#: src/prefs_common_dialog.c:2288 src/prefs_common_dialog.c:3778
+#: src/prefs_common_dialog.c:3799
 msgid "(Default browser)"
 msgstr "(Browser predefinito)"
 
@@ -5078,214 +5094,224 @@ msgid "Greek (ISO-8859-7)"
 msgstr "Greco (ISO-8859-7)"
 
 #: src/prefs_common_dialog.c:2495
+#, fuzzy
+msgid "Arabic (ISO-8859-6)"
+msgstr "Baltico (ISO-8859-4)"
+
+#: src/prefs_common_dialog.c:2496
+#, fuzzy
+msgid "Arabic (Windows-1256)"
+msgstr "Cirillico (Windows-1251)"
+
+#: src/prefs_common_dialog.c:2498
 msgid "Hebrew (ISO-8859-8)"
 msgstr "Ebreo (ISO-8859-8)"
 
-#: src/prefs_common_dialog.c:2496
+#: src/prefs_common_dialog.c:2499
 msgid "Hebrew (Windows-1255)"
 msgstr "Ebreo (Windows-1255)"
 
-#: src/prefs_common_dialog.c:2498
+#: src/prefs_common_dialog.c:2501
 msgid "Turkish (ISO-8859-9)"
 msgstr "Turco (ISO-8859-9)"
 
-#: src/prefs_common_dialog.c:2500
+#: src/prefs_common_dialog.c:2503
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Cirillico (ISO-8859-5)"
 
-#: src/prefs_common_dialog.c:2501
+#: src/prefs_common_dialog.c:2504
 msgid "Cyrillic (KOI8-R)"
 msgstr "Cirillico (KOI8-R)"
 
-#: src/prefs_common_dialog.c:2502
+#: src/prefs_common_dialog.c:2505
 msgid "Cyrillic (KOI8-U)"
 msgstr "Cirillico (KOI8-U)"
 
-#: src/prefs_common_dialog.c:2503
+#: src/prefs_common_dialog.c:2506
 msgid "Cyrillic (Windows-1251)"
 msgstr "Cirillico (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2505
+#: src/prefs_common_dialog.c:2508
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Giapponese (ISO-2022-JP)"
 
-#: src/prefs_common_dialog.c:2507
+#: src/prefs_common_dialog.c:2510
 msgid "Japanese (EUC-JP)"
 msgstr "Giapponese (EUC-JP)"
 
-#: src/prefs_common_dialog.c:2508
+#: src/prefs_common_dialog.c:2511
 msgid "Japanese (Shift_JIS)"
 msgstr "Giapponese (Shift_JIS)"
 
-#: src/prefs_common_dialog.c:2511
+#: src/prefs_common_dialog.c:2514
 msgid "Simplified Chinese (GB2312)"
 msgstr "Cinese semplificato (GB2312)"
 
-#: src/prefs_common_dialog.c:2512
+#: src/prefs_common_dialog.c:2515
 msgid "Simplified Chinese (GBK)"
 msgstr "Cinese semplificato (GBK)"
 
-#: src/prefs_common_dialog.c:2513
+#: src/prefs_common_dialog.c:2516
 msgid "Traditional Chinese (Big5)"
 msgstr "Cinese tradizionale (Big5)"
 
-#: src/prefs_common_dialog.c:2515
+#: src/prefs_common_dialog.c:2518
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Cinese tradizionale (EUC-TW)"
 
-#: src/prefs_common_dialog.c:2516
+#: src/prefs_common_dialog.c:2519
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Cinese (ISO-2022-CN)"
 
-#: src/prefs_common_dialog.c:2519
+#: src/prefs_common_dialog.c:2522
 msgid "Korean (EUC-KR)"
 msgstr "Coreano (EUC-KR)"
 
-#: src/prefs_common_dialog.c:2521
+#: src/prefs_common_dialog.c:2524
 msgid "Thai (TIS-620)"
 msgstr "Tailandese (TIS-620)"
 
-#: src/prefs_common_dialog.c:2522
+#: src/prefs_common_dialog.c:2525
 msgid "Thai (Windows-874)"
 msgstr "Tailandese (Windows-874)"
 
-#: src/prefs_common_dialog.c:2689
+#: src/prefs_common_dialog.c:2692
 msgid "the full abbreviated weekday name"
 msgstr "il nome abbreviato del giorno della settimana"
 
-#: src/prefs_common_dialog.c:2690
+#: src/prefs_common_dialog.c:2693
 msgid "the full weekday name"
 msgstr "il nome completo del giorno della settimana"
 
-#: src/prefs_common_dialog.c:2691
+#: src/prefs_common_dialog.c:2694
 msgid "the abbreviated month name"
 msgstr "il nome abbreviato del mese"
 
-#: src/prefs_common_dialog.c:2692
+#: src/prefs_common_dialog.c:2695
 msgid "the full month name"
 msgstr "il nome completo del mese"
 
-#: src/prefs_common_dialog.c:2693
+#: src/prefs_common_dialog.c:2696
 msgid "the preferred date and time for the current locale"
 msgstr "la data e l'ora preferite per la località attuale"
 
-#: src/prefs_common_dialog.c:2694
+#: src/prefs_common_dialog.c:2697
 msgid "the century number (year/100)"
 msgstr "il numero del secolo (anno/100)"
 
-#: src/prefs_common_dialog.c:2695
+#: src/prefs_common_dialog.c:2698
 msgid "the day of the month as a decimal number"
 msgstr "il giorno del mese come numero decimale"
 
-#: src/prefs_common_dialog.c:2696
+#: src/prefs_common_dialog.c:2699
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "l'ora come numero decimale con l'orologio di 24 ore"
 
-#: src/prefs_common_dialog.c:2697
+#: src/prefs_common_dialog.c:2700
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "l'ora come numero decimale con l'orologio di 12 ore"
 
-#: src/prefs_common_dialog.c:2698
+#: src/prefs_common_dialog.c:2701
 msgid "the day of the year as a decimal number"
 msgstr "il giorno dell'anno come numero decimale"
 
-#: src/prefs_common_dialog.c:2699
+#: src/prefs_common_dialog.c:2702
 msgid "the month as a decimal number"
 msgstr "il mese come numero decimale"
 
-#: src/prefs_common_dialog.c:2700
+#: src/prefs_common_dialog.c:2703
 msgid "the minute as a decimal number"
 msgstr "i minuti come numero decimale"
 
-#: src/prefs_common_dialog.c:2701
+#: src/prefs_common_dialog.c:2704
 msgid "either AM or PM"
 msgstr "AM o PM"
 
-#: src/prefs_common_dialog.c:2702
+#: src/prefs_common_dialog.c:2705
 msgid "the second as a decimal number"
 msgstr "i secondi come numero decimale"
 
-#: src/prefs_common_dialog.c:2703
+#: src/prefs_common_dialog.c:2706
 msgid "the day of the week as a decimal number"
 msgstr "il giorno della settimana come numero decimale"
 
-#: src/prefs_common_dialog.c:2704
+#: src/prefs_common_dialog.c:2707
 msgid "the preferred date for the current locale"
 msgstr "la data preferita per la località attuale"
 
-#: src/prefs_common_dialog.c:2705
+#: src/prefs_common_dialog.c:2708
 msgid "the last two digits of a year"
 msgstr "le ultime due cifre dell'anno"
 
-#: src/prefs_common_dialog.c:2706
+#: src/prefs_common_dialog.c:2709
 msgid "the year as a decimal number"
 msgstr "l'anno come numero decimale"
 
-#: src/prefs_common_dialog.c:2707
+#: src/prefs_common_dialog.c:2710
 msgid "the time zone or name or abbreviation"
 msgstr "il fuso orario o l'abbreviazione"
 
-#: src/prefs_common_dialog.c:2728
+#: src/prefs_common_dialog.c:2731
 msgid "Specifier"
 msgstr "Specificatore"
 
-#: src/prefs_common_dialog.c:2729
+#: src/prefs_common_dialog.c:2732
 msgid "Description"
 msgstr "Descrizione"
 
-#: src/prefs_common_dialog.c:2769
+#: src/prefs_common_dialog.c:2772
 msgid "Example"
 msgstr "Esempio"
 
-#: src/prefs_common_dialog.c:2850
+#: src/prefs_common_dialog.c:2853
 msgid "Set message colors"
 msgstr "Impostazione dei colori del messaggio"
 
-#: src/prefs_common_dialog.c:2858
+#: src/prefs_common_dialog.c:2861
 msgid "Colors"
 msgstr "Colori"
 
-#: src/prefs_common_dialog.c:2892
+#: src/prefs_common_dialog.c:2895
 msgid "Quoted Text - First Level"
 msgstr "Testo citato - Primo livello"
 
-#: src/prefs_common_dialog.c:2898
+#: src/prefs_common_dialog.c:2901
 msgid "Quoted Text - Second Level"
 msgstr "Testo citato - Secondo livello"
 
-#: src/prefs_common_dialog.c:2904
+#: src/prefs_common_dialog.c:2907
 msgid "Quoted Text - Third Level"
 msgstr "Testo citato - Terzo livello"
 
-#: src/prefs_common_dialog.c:2910
+#: src/prefs_common_dialog.c:2913
 msgid "URI link"
 msgstr "Link URI"
 
-#: src/prefs_common_dialog.c:2917
+#: src/prefs_common_dialog.c:2920
 msgid "Recycle quote colors"
 msgstr "Ricicla i colori di citazione"
 
-#: src/prefs_common_dialog.c:2984
+#: src/prefs_common_dialog.c:2987
 msgid "Pick color for quotation level 1"
 msgstr "Scelta del colore per la citazione di livello 1"
 
-#: src/prefs_common_dialog.c:2987
+#: src/prefs_common_dialog.c:2990
 msgid "Pick color for quotation level 2"
 msgstr "Scelta del colore per la citazione di livello 2"
 
-#: src/prefs_common_dialog.c:2990
+#: src/prefs_common_dialog.c:2993
 msgid "Pick color for quotation level 3"
 msgstr "Scelta del colore per la citazione di livello 3"
 
-#: src/prefs_common_dialog.c:2993
+#: src/prefs_common_dialog.c:2996
 msgid "Pick color for URI"
 msgstr "Scelta del colore per l'URI"
 
-#: src/prefs_common_dialog.c:3133
+#: src/prefs_common_dialog.c:3136
 msgid "Description of symbols"
 msgstr "Descrizione dei simboli"
 
-#: src/prefs_common_dialog.c:3189
+#: src/prefs_common_dialog.c:3192
 msgid ""
 "Date\n"
 "From\n"
@@ -5309,11 +5335,11 @@ msgstr ""
 "Newsgroups\n"
 "ID-Messaggio"
 
-#: src/prefs_common_dialog.c:3202
+#: src/prefs_common_dialog.c:3205
 msgid "If x is set, displays expr"
 msgstr "Se è impostato x, mostra expr"
 
-#: src/prefs_common_dialog.c:3206
+#: src/prefs_common_dialog.c:3209
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -5327,7 +5353,7 @@ msgstr ""
 "Corpo del messaggio citato senza firma\n"
 "Percentuale"
 
-#: src/prefs_common_dialog.c:3214
+#: src/prefs_common_dialog.c:3217
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -5339,19 +5365,19 @@ msgstr ""
 "Parentesi graffa aperta\n"
 "Parentesi graffa chiusa"
 
-#: src/prefs_common_dialog.c:3260
+#: src/prefs_common_dialog.c:3263
 msgid "Key bindings"
 msgstr "Associazioni dei tasti"
 
-#: src/prefs_common_dialog.c:3273
+#: src/prefs_common_dialog.c:3276
 msgid "Select the preset of key bindings."
 msgstr "Impostazione delle associazioni dei tasti."
 
-#: src/prefs_common_dialog.c:3283 src/prefs_common_dialog.c:3607
+#: src/prefs_common_dialog.c:3286 src/prefs_common_dialog.c:3610
 msgid "Default"
 msgstr "Predefinita"
 
-#: src/prefs_common_dialog.c:3286 src/prefs_common_dialog.c:3616
+#: src/prefs_common_dialog.c:3289 src/prefs_common_dialog.c:3619
 msgid "Old Sylpheed"
 msgstr "Vecchio sylpheed"
 
@@ -5472,7 +5498,7 @@ msgstr "Risultato del comando"
 msgid "Age"
 msgstr "Età"
 
-#: src/prefs_filter_edit.c:501 src/summaryview.c:510
+#: src/prefs_filter_edit.c:501 src/summaryview.c:512
 #, fuzzy
 msgid "Marked"
 msgstr "Segna"
@@ -5702,17 +5728,17 @@ msgid "Attachment"
 msgstr "Allegato"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73 src/query_search.c:371 src/summaryview.c:4733
+#: src/prefs_summary_column.c:73 src/query_search.c:371 src/summaryview.c:4890
 msgid "Subject"
 msgstr "Oggetto"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/query_search.c:372 src/summaryview.c:4736
+#: src/prefs_summary_column.c:74 src/query_search.c:372 src/summaryview.c:4893
 msgid "From"
 msgstr "Da"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/query_search.c:373 src/summaryview.c:4738
+#: src/prefs_summary_column.c:75 src/query_search.c:373 src/summaryview.c:4895
 msgid "Date"
 msgstr "Data"
 
@@ -5815,7 +5841,7 @@ msgstr "Ricerca dei messaggi"
 msgid "_Save as search folder"
 msgstr "Salva nella cartella «Bozze»"
 
-#: src/query_search.c:512 src/subscribedialog.c:523 src/summaryview.c:840
+#: src/query_search.c:512 src/subscribedialog.c:523 src/summaryview.c:842
 msgid "Done."
 msgstr "Fatto."
 
@@ -5829,7 +5855,7 @@ msgstr "Analisi della cartella %s..."
 msgid "Searching %s (%d / %d)..."
 msgstr "Filtraggio (%d / %d)..."
 
-#: src/query_search.c:645 src/summaryview.c:2048
+#: src/query_search.c:645 src/summaryview.c:2051
 msgid "(No Date)"
 msgstr "(Nessuna Data)"
 
@@ -6200,303 +6226,308 @@ msgid "/_Mark/Mark as rea_d"
 msgstr "/Seg_na/Segna come _letto"
 
 #: src/summaryview.c:429
+#, fuzzy
+msgid "/_Mark/Mark _thread as read"
+msgstr "/Seg_na/Segna come _letto"
+
+#: src/summaryview.c:431
 msgid "/_Mark/Mark all _read"
 msgstr "/Seg_na/Segna come tutti l_etti"
 
-#: src/summaryview.c:430
+#: src/summaryview.c:432
 msgid "/Color la_bel"
 msgstr "/Colore etic_hetta"
 
-#: src/summaryview.c:434
+#: src/summaryview.c:436
 msgid "/Re-_edit"
 msgstr "/Rim_odifica"
 
-#: src/summaryview.c:436
+#: src/summaryview.c:438
 msgid "/Add sender to address boo_k..."
 msgstr "/Aggiungi mittente alla ru_brica..."
 
-#: src/summaryview.c:438
+#: src/summaryview.c:440
 msgid "/Create f_ilter rule"
 msgstr "/Crea re_gola per il filtro"
 
-#: src/summaryview.c:439
+#: src/summaryview.c:441
 msgid "/Create f_ilter rule/_Automatically"
 msgstr "/Crea re_gola per il filtro/A_utomaticamente"
 
-#: src/summaryview.c:441
+#: src/summaryview.c:443
 msgid "/Create f_ilter rule/by _From"
 msgstr "/Crea re_gola per il filtro/con _Da"
 
-#: src/summaryview.c:443
+#: src/summaryview.c:445
 msgid "/Create f_ilter rule/by _To"
 msgstr "/Crea re_gola per il filtro/con _A"
 
-#: src/summaryview.c:445
+#: src/summaryview.c:447
 msgid "/Create f_ilter rule/by _Subject"
 msgstr "/Crea re_gola per il filtro/con l'_Oggetto"
 
-#: src/summaryview.c:451
+#: src/summaryview.c:453
 msgid "/_View/_Source"
 msgstr "/_Visualizza/_Sorgente"
 
-#: src/summaryview.c:452
+#: src/summaryview.c:454
 msgid "/_View/All _header"
 msgstr "/_Visualizza/Tutte le intesta_zioni"
 
-#: src/summaryview.c:454
+#: src/summaryview.c:456
 msgid "/_Print..."
 msgstr "/Stam_pa..."
 
-#: src/summaryview.c:486
+#: src/summaryview.c:488
 msgid "Creating summary view...\n"
 msgstr "Creazione della vista del sommario...\n"
 
-#: src/summaryview.c:508
+#: src/summaryview.c:510
 msgid "All"
 msgstr ""
 
-#: src/summaryview.c:511
+#: src/summaryview.c:513
 #, fuzzy
 msgid "Have color label"
 msgstr "/Colore etic_hetta"
 
-#: src/summaryview.c:512
+#: src/summaryview.c:514
 #, fuzzy
 msgid "Have attachment"
 msgstr "Allegato"
 
-#: src/summaryview.c:521
+#: src/summaryview.c:523
 #, fuzzy
 msgid "Search:"
 msgstr " Ricerca "
 
-#: src/summaryview.c:535
+#: src/summaryview.c:537
 msgid "Search for Subject or From"
 msgstr ""
 
-#: src/summaryview.c:702
+#: src/summaryview.c:704
 msgid "Process mark"
 msgstr "Segno del processo"
 
-#: src/summaryview.c:703
+#: src/summaryview.c:705
 msgid "Some marks are left. Process it?"
 msgstr "Sono rimaste alcune operazioni segnate. Le elaboro?"
 
-#: src/summaryview.c:749
+#: src/summaryview.c:751
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "Esame della cartella (%s)..."
 
-#: src/summaryview.c:1292
+#: src/summaryview.c:1295
 msgid "_Search again"
 msgstr "_Ricerca ancora"
 
-#: src/summaryview.c:1313 src/summaryview.c:1322
+#: src/summaryview.c:1316 src/summaryview.c:1325
 msgid "No more unread messages"
 msgstr "Non esistono più messaggi non letti"
 
-#: src/summaryview.c:1314
+#: src/summaryview.c:1317
 msgid "No unread message found. Search from the end?"
 msgstr "Non è stato trovato nessun messaggio non letto. Ricerco dalla fine?"
 
-#: src/summaryview.c:1316
+#: src/summaryview.c:1319
 msgid "No unread messages."
 msgstr "Non esistono messaggi non letti."
 
-#: src/summaryview.c:1323
+#: src/summaryview.c:1326
 msgid "No unread message found. Go to next folder?"
 msgstr ""
 "Non è stato trovato nessun messaggio non letto. Passo alla cartella seguente?"
 
-#: src/summaryview.c:1331 src/summaryview.c:1340
+#: src/summaryview.c:1334 src/summaryview.c:1343
 msgid "No more new messages"
 msgstr "Non esistono più messaggi nuovi"
 
-#: src/summaryview.c:1332
+#: src/summaryview.c:1335
 msgid "No new message found. Search from the end?"
 msgstr "Non è stato trovato nessun messaggio nuovo. Ricerco dalla fine?"
 
-#: src/summaryview.c:1334
+#: src/summaryview.c:1337
 msgid "No new messages."
 msgstr "Non esistono messaggi nuovi."
 
-#: src/summaryview.c:1341
+#: src/summaryview.c:1344
 msgid "No new message found. Go to next folder?"
 msgstr ""
 "Non è stato trovato nessun messaggio nuovo. Passo alla cartella seguente?"
 
-#: src/summaryview.c:1349 src/summaryview.c:1358
+#: src/summaryview.c:1352 src/summaryview.c:1361
 msgid "No more marked messages"
 msgstr "Non esistono più messaggi segnati"
 
-#: src/summaryview.c:1350
+#: src/summaryview.c:1353
 msgid "No marked message found. Search from the end?"
 msgstr "Non è stato trovato nessun messaggio segnato. Ricerco dalla fine?"
 
-#: src/summaryview.c:1352 src/summaryview.c:1361
+#: src/summaryview.c:1355 src/summaryview.c:1364
 msgid "No marked messages."
 msgstr "Non esistono messaggi segnati."
 
-#: src/summaryview.c:1359
+#: src/summaryview.c:1362
 msgid "No marked message found. Search from the beginning?"
 msgstr "Non è stato trovato nessun messaggio segnato. Ricerco dall'inizio?"
 
-#: src/summaryview.c:1367 src/summaryview.c:1376
+#: src/summaryview.c:1370 src/summaryview.c:1379
 msgid "No more labeled messages"
 msgstr "Non esistono più messaggi etichettati"
 
-#: src/summaryview.c:1368
+#: src/summaryview.c:1371
 msgid "No labeled message found. Search from the end?"
 msgstr "Non è stato trovato nessun messaggio etichettato. Ricerco dalla fine?"
 
-#: src/summaryview.c:1370 src/summaryview.c:1379
+#: src/summaryview.c:1373 src/summaryview.c:1382
 msgid "No labeled messages."
 msgstr "Non esistono messaggi etichettati."
 
-#: src/summaryview.c:1377
+#: src/summaryview.c:1380
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Non è stato trovato nessun messaggio etichettato. Ricerco dall'inizio?"
 
-#: src/summaryview.c:1693
+#: src/summaryview.c:1696
 msgid "Attracting messages by subject..."
 msgstr "Raggruppamento dei messaggi per oggetto..."
 
-#: src/summaryview.c:1887
+#: src/summaryview.c:1890
 #, c-format
 msgid "%d deleted"
 msgstr "%d eliminato"
 
-#: src/summaryview.c:1891
+#: src/summaryview.c:1894
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d spostato"
 
-#: src/summaryview.c:1892 src/summaryview.c:1897
+#: src/summaryview.c:1895 src/summaryview.c:1900
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:1896
+#: src/summaryview.c:1899
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d copiato"
 
-#: src/summaryview.c:1911
+#: src/summaryview.c:1914
 msgid " item(s) selected"
 msgstr " voci selezionate"
 
-#: src/summaryview.c:1933
+#: src/summaryview.c:1936
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d nuovi, %d non letti, %d totale (%s)"
 
-#: src/summaryview.c:1937
+#: src/summaryview.c:1940
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d nuovi, %d non letti, %d totale"
 
-#: src/summaryview.c:1971
+#: src/summaryview.c:1974
 msgid "Sorting summary..."
 msgstr "Ordinamento del sommario..."
 
-#: src/summaryview.c:2194
+#: src/summaryview.c:2211
 msgid "\tSetting summary from message data..."
 msgstr "\tImpostazione del sommario dai dati dei messaggi..."
 
-#: src/summaryview.c:2196
+#: src/summaryview.c:2213
 msgid "Setting summary from message data..."
 msgstr "Impostazione del sommario dai dati dei messaggi..."
 
-#: src/summaryview.c:2302
+#: src/summaryview.c:2319
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Scrittura della cache del sommario (%s)..."
 
-#: src/summaryview.c:2643
+#: src/summaryview.c:2660
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Il messaggio %d è segnato\n"
 
-#: src/summaryview.c:2701
+#: src/summaryview.c:2718
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Il messaggio %d è segnato come già letto\n"
 
-#: src/summaryview.c:2789
+#: src/summaryview.c:2908
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Il messaggio %d è segnato come non letto\n"
 
-#: src/summaryview.c:2850
+#: src/summaryview.c:2969
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Il messaggio %s/%d è impostato per l'eliminazione\n"
 
-#: src/summaryview.c:2878
+#: src/summaryview.c:2997
 msgid "Delete message(s)"
 msgstr "Elimina il(i) messaggio(i)"
 
-#: src/summaryview.c:2879
+#: src/summaryview.c:2998
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Eliminare il(i) messaggio(i) dal cestino?"
 
-#: src/summaryview.c:2953
+#: src/summaryview.c:3072
 msgid "Deleting duplicated messages..."
 msgstr "Eliminazione dei messaggi duplicati..."
 
-#: src/summaryview.c:2991
+#: src/summaryview.c:3110
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Il messaggio %s/%d non è segnato\n"
 
-#: src/summaryview.c:3049
+#: src/summaryview.c:3168
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Il messaggio %d è impostato per lo spostamento in %s\n"
 
-#: src/summaryview.c:3066
+#: src/summaryview.c:3196
 msgid "Destination is same as current folder."
 msgstr "La destinazione coincide con la cartella attuale."
 
-#: src/summaryview.c:3122
+#: src/summaryview.c:3260
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Il messaggio %d è impostato per la copia in %s\n"
 
-#: src/summaryview.c:3139
+#: src/summaryview.c:3288
 msgid "Destination for copy is same as current folder."
 msgstr "La destinazione della copia coincide con la cartella attuale."
 
-#: src/summaryview.c:3338
+#: src/summaryview.c:3495
 msgid "Error occurred while processing messages."
 msgstr "Si è verificato un errore durante l'elaborazione dei messaggi."
 
-#: src/summaryview.c:3646 src/summaryview.c:3647
+#: src/summaryview.c:3803 src/summaryview.c:3804
 msgid "Building threads..."
 msgstr "Costruzione dei thread..."
 
-#: src/summaryview.c:3797 src/summaryview.c:3798
+#: src/summaryview.c:3954 src/summaryview.c:3955
 msgid "Unthreading..."
 msgstr "Senza thread..."
 
-#: src/summaryview.c:4091 src/summaryview.c:4147
+#: src/summaryview.c:4248 src/summaryview.c:4304
 #, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtraggio (%d / %d)..."
 
-#: src/summaryview.c:4196
+#: src/summaryview.c:4353
 msgid "filtering..."
 msgstr "filtraggio..."
 
-#: src/summaryview.c:4197
+#: src/summaryview.c:4354
 msgid "Filtering..."
 msgstr "Filtraggio..."
 
-#: src/summaryview.c:4233
+#: src/summaryview.c:4390
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "sono stati filtrati %d messaggi(o)."
 
-#: src/summaryview.c:4742
+#: src/summaryview.c:4899
 msgid "No."
 msgstr "No."
 
@@ -6513,31 +6544,31 @@ msgstr "Creazione della vista del testo...\n"
 msgid "This message can't be displayed.\n"
 msgstr "Questo messaggio non può essere visualizzato.\n"
 
-#: src/textview.c:1929
+#: src/textview.c:1925
 msgid "Sa_ve this image as..."
 msgstr "Sa_lva questa immagine come..."
 
-#: src/textview.c:1945 src/trayicon.c:109
+#: src/textview.c:1941 src/trayicon.c:109
 msgid "Compose _new message"
 msgstr "Componi un _nuovo messaggio"
 
-#: src/textview.c:1947
+#: src/textview.c:1943
 msgid "Add to address _book..."
 msgstr "Aggiungi alla ru_brica..."
 
-#: src/textview.c:1949
+#: src/textview.c:1945
 msgid "Copy this add_ress"
 msgstr "Copia questo indi_rizzo"
 
-#: src/textview.c:1952
+#: src/textview.c:1948
 msgid "_Open with Web browser"
 msgstr "Apri c_on il browser web"
 
-#: src/textview.c:1954
+#: src/textview.c:1950
 msgid "Copy this _link"
 msgstr "Copia questo _link"
 
-#: src/textview.c:2097
+#: src/textview.c:2093
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6550,7 +6581,7 @@ msgstr ""
 "\n"
 "Aprirlo comunque?"
 
-#: src/textview.c:2102
+#: src/textview.c:2098
 msgid "Fake URL warning"
 msgstr "Avvertimento falsificazione URL"
 
diff --git a/po/ja.po b/po/ja.po
index 8e4f1154..9991f910 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: 2006-01-27 18:11+0900\n"
+"POT-Creation-Date: 2006-01-31 15:20+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"
@@ -505,7 +505,7 @@ msgstr "%s が見つかりました\n"
 msgid "Configuration is saved.\n"
 msgstr "設定を保存しました。\n"
 
-#: libsylph/prefs_common.c:489
+#: libsylph/prefs_common.c:491
 msgid "Junk mail filter"
 msgstr "迷惑メールフィルタ"
 
@@ -620,8 +620,8 @@ msgstr "%.2fMB"
 msgid "%.2fGB"
 msgstr "%.2fGB"
 
-#: libsylph/utils.c:2373 src/compose.c:2858 src/compose.c:3121
-#: src/compose.c:3184 src/compose.c:3304
+#: libsylph/utils.c:2373 src/compose.c:2867 src/compose.c:3130
+#: src/compose.c:3193 src/compose.c:3313
 msgid "can't change file mode\n"
 msgstr "ファイルモードを変更できません\n"
 
@@ -708,8 +708,8 @@ msgstr ""
 "新着メッセージはこの順番でチェックされます。「全受信」によるメッセージ\n"
 "の取得を有効にするには、「G」カラムのボックスをチェックしてください。"
 
-#: src/account_dialog.c:366 src/addressadd.c:192 src/addressbook.c:491
-#: src/compose.c:4262 src/editaddress.c:200 src/editaddress.c:942
+#: src/account_dialog.c:366 src/addressadd.c:192 src/addressbook.c:493
+#: src/compose.c:4271 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:206 src/prefs_filter.c:259 src/prefs_folder_item.c:171
@@ -845,12 +845,12 @@ msgstr "アクションのユーザ引数"
 msgid "Add Address to Book"
 msgstr "アドレスをアドレス帳に追加"
 
-#: src/addressadd.c:202 src/compose.c:4762 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4771 src/editaddress.c:201
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "アドレス"
 
-#: src/addressadd.c:212 src/addressbook.c:493 src/editaddress.c:202
+#: src/addressadd.c:212 src/addressbook.c:495 src/editaddress.c:202
 #: src/editaddress.c:795 src/editaddress.c:860 src/editgroup.c:267
 msgid "Remarks"
 msgstr "備考"
@@ -859,183 +859,183 @@ msgstr "備考"
 msgid "Select Address Book Folder"
 msgstr "アドレス帳フォルダを選択"
 
-#: src/addressbook.c:336 src/compose.c:515 src/mainwindow.c:477
+#: src/addressbook.c:338 src/compose.c:515 src/mainwindow.c:480
 #: src/messageview.c:138
 msgid "/_File"
 msgstr "/ファイル(_F)"
 
-#: src/addressbook.c:337
+#: src/addressbook.c:339
 msgid "/_File/New _Book"
 msgstr "/ファイル(_F)/新規アドレス帳(_B)"
 
-#: src/addressbook.c:338
+#: src/addressbook.c:340
 msgid "/_File/New _vCard"
 msgstr "/ファイル(_F)/新規_vCard"
 
-#: src/addressbook.c:340
+#: src/addressbook.c:342
 msgid "/_File/New _JPilot"
 msgstr "/ファイル(_F)/新規_JPilot"
 
-#: src/addressbook.c:343
+#: src/addressbook.c:345
 msgid "/_File/New _Server"
 msgstr "/ファイル(_F)/新規サーバ(_S)"
 
-#: src/addressbook.c:345 src/addressbook.c:348 src/compose.c:520
-#: src/compose.c:525 src/compose.c:528 src/compose.c:531 src/mainwindow.c:495
-#: src/mainwindow.c:498 src/mainwindow.c:500 src/mainwindow.c:503
-#: src/mainwindow.c:505 src/messageview.c:141
+#: src/addressbook.c:347 src/addressbook.c:350 src/compose.c:520
+#: src/compose.c:525 src/compose.c:528 src/compose.c:531 src/mainwindow.c:498
+#: src/mainwindow.c:501 src/mainwindow.c:503 src/mainwindow.c:506
+#: src/mainwindow.c:508 src/messageview.c:141
 msgid "/_File/---"
 msgstr "/ファイル(_F)/---"
 
-#: src/addressbook.c:346
+#: src/addressbook.c:348
 msgid "/_File/_Edit"
 msgstr "/ファイル(_F)/編集(_E)"
 
-#: src/addressbook.c:347
+#: src/addressbook.c:349
 msgid "/_File/_Delete"
 msgstr "/ファイル(_F)/削除(_D)"
 
-#: src/addressbook.c:349
+#: src/addressbook.c:351
 msgid "/_File/_Save"
 msgstr "/ファイル(_F)/保存(_S)"
 
-#: src/addressbook.c:350 src/compose.c:532 src/messageview.c:142
+#: src/addressbook.c:352 src/compose.c:532 src/messageview.c:142
 msgid "/_File/_Close"
 msgstr "/ファイル(_F)/閉じる(_C)"
 
-#: src/addressbook.c:351
+#: src/addressbook.c:353
 msgid "/_Address"
 msgstr "/アドレス(_A)"
 
-#: src/addressbook.c:352
+#: src/addressbook.c:354
 msgid "/_Address/New _Address"
 msgstr "/アドレス(_A)/新規アドレス(_A)"
 
-#: src/addressbook.c:353
+#: src/addressbook.c:355
 msgid "/_Address/New _Group"
 msgstr "/アドレス(_A)/新規グループ(_G)"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:356
 msgid "/_Address/New _Folder"
 msgstr "/アドレス(_A)/新規フォルダ(_F)"
 
-#: src/addressbook.c:355
+#: src/addressbook.c:357
 msgid "/_Address/---"
 msgstr "/アドレス(_A)/---"
 
-#: src/addressbook.c:356
+#: src/addressbook.c:358
 msgid "/_Address/_Edit"
 msgstr "/アドレス(_A)/編集(_E)"
 
-#: src/addressbook.c:357
+#: src/addressbook.c:359
 msgid "/_Address/_Delete"
 msgstr "/アドレス(_A)/削除(_D)"
 
-#: src/addressbook.c:358 src/compose.c:639 src/mainwindow.c:738
-#: src/messageview.c:259
+#: src/addressbook.c:360 src/compose.c:645 src/mainwindow.c:749
+#: src/messageview.c:264
 msgid "/_Tools"
 msgstr "/ツール(_T)"
 
-#: src/addressbook.c:359
+#: src/addressbook.c:361
 msgid "/_Tools/Import _LDIF file"
 msgstr "/ツール(_T)/_LDIFファイルをインポート"
 
-#: src/addressbook.c:360 src/compose.c:658 src/mainwindow.c:788
-#: src/messageview.c:277
+#: src/addressbook.c:362 src/compose.c:664 src/mainwindow.c:799
+#: src/messageview.c:282
 msgid "/_Help"
 msgstr "/ヘルプ(_H)"
 
-#: src/addressbook.c:361 src/compose.c:659 src/mainwindow.c:799
-#: src/messageview.c:278
+#: src/addressbook.c:363 src/compose.c:665 src/mainwindow.c:810
+#: src/messageview.c:283
 msgid "/_Help/_About"
 msgstr "/ヘルプ(_H)/このプログラムについて(_A)"
 
-#: src/addressbook.c:380 src/addressbook.c:390
+#: src/addressbook.c:382 src/addressbook.c:392
 msgid "/New _Address"
 msgstr "/新規アドレス(_A)"
 
-#: src/addressbook.c:381 src/addressbook.c:391
+#: src/addressbook.c:383 src/addressbook.c:393
 msgid "/New _Group"
 msgstr "/新規グループ(_G)"
 
-#: src/addressbook.c:382 src/addressbook.c:392
+#: src/addressbook.c:384 src/addressbook.c:394
 msgid "/New _Folder"
 msgstr "/新規フォルダ(_F)"
 
-#: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:509
+#: src/addressbook.c:385 src/addressbook.c:395 src/compose.c:509
 #: src/folderview.c:246 src/folderview.c:248 src/folderview.c:253
 #: src/folderview.c:266 src/folderview.c:268 src/folderview.c:270
 #: src/folderview.c:275 src/folderview.c:289 src/folderview.c:291
 #: src/folderview.c:295 src/summaryview.c:414 src/summaryview.c:418
-#: src/summaryview.c:421 src/summaryview.c:431 src/summaryview.c:433
-#: src/summaryview.c:435 src/summaryview.c:447 src/summaryview.c:453
+#: src/summaryview.c:421 src/summaryview.c:433 src/summaryview.c:435
+#: src/summaryview.c:437 src/summaryview.c:449 src/summaryview.c:455
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:534
-#: src/mainwindow.c:509 src/messageview.c:144
+#: src/addressbook.c:386 src/addressbook.c:396 src/compose.c:534
+#: src/mainwindow.c:512 src/messageview.c:144
 msgid "/_Edit"
 msgstr "/編集(_E)"
 
-#: src/addressbook.c:385 src/addressbook.c:395 src/summaryview.c:432
+#: src/addressbook.c:387 src/addressbook.c:397 src/summaryview.c:434
 msgid "/_Delete"
 msgstr "/削除(_D)"
 
-#: src/addressbook.c:492
+#: src/addressbook.c:494
 msgid "E-Mail address"
 msgstr "電子メール アドレス"
 
-#: src/addressbook.c:496 src/compose.c:4763 src/prefs_common_dialog.c:2183
+#: src/addressbook.c:498 src/compose.c:4772 src/prefs_common_dialog.c:2183
 msgid "Address book"
 msgstr "アドレス帳"
 
-#: src/addressbook.c:596 src/prefs_filter_edit.c:249
+#: src/addressbook.c:600 src/prefs_filter_edit.c:249
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "名前:"
 
 #. Buttons
-#: src/addressbook.c:628 src/addressbook.c:1680 src/editaddress.c:884
-#: src/editaddress.c:1017 src/mainwindow.c:2391 src/prefs_actions.c:266
+#: src/addressbook.c:632 src/addressbook.c:1684 src/editaddress.c:884
+#: src/editaddress.c:1017 src/mainwindow.c:2402 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
 #: src/prefs_template.c:233
 msgid "Delete"
 msgstr "削除"
 
-#: src/addressbook.c:631 src/editaddress.c:890 src/editaddress.c:1023
+#: src/addressbook.c:635 src/editaddress.c:890 src/editaddress.c:1023
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:273 src/prefs_display_header.c:328
 #: src/prefs_filter_edit.c:1550
 msgid "Add"
 msgstr "追加"
 
-#: src/addressbook.c:634
+#: src/addressbook.c:638
 msgid "Lookup"
 msgstr "検索"
 
-#: src/addressbook.c:646 src/headerview.c:55 src/prefs_folder_item.c:339
+#: src/addressbook.c:650 src/headerview.c:55 src/prefs_folder_item.c:339
 #: src/prefs_template.c:176
 msgid "To:"
 msgstr "宛先:"
 
-#: src/addressbook.c:650 src/prefs_folder_item.c:356 src/prefs_template.c:178
+#: src/addressbook.c:654 src/prefs_folder_item.c:356 src/prefs_template.c:178
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:654 src/prefs_folder_item.c:367
+#: src/addressbook.c:658 src/prefs_folder_item.c:367
 msgid "Bcc:"
 msgstr "Bcc:"
 
 #. Confirm deletion
-#: src/addressbook.c:841
+#: src/addressbook.c:845
 msgid "Delete address(es)"
 msgstr "アドレスの削除"
 
-#: src/addressbook.c:842
+#: src/addressbook.c:846
 msgid "Really delete the address(es)?"
 msgstr "本当にこのアドレスを削除しますか?"
 
-#: src/addressbook.c:1671
+#: src/addressbook.c:1675
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1044,36 +1044,36 @@ msgstr ""
 "`%s' 内のすべてのフォルダとアドレスを削除してもいいですか?\n"
 "フォルダのみを削除する場合、アドレスは親フォルダに移動します。"
 
-#: src/addressbook.c:1674 src/folderview.c:2351
+#: src/addressbook.c:1678 src/folderview.c:2351
 msgid "Delete folder"
 msgstr "フォルダの削除"
 
-#: src/addressbook.c:1674
+#: src/addressbook.c:1678
 msgid "_Folder only"
 msgstr "フォルダのみ(_F)"
 
-#: src/addressbook.c:1674
+#: src/addressbook.c:1678
 msgid "Folder and _addresses"
 msgstr "フォルダとアドレス(_A)"
 
-#: src/addressbook.c:1679
+#: src/addressbook.c:1683
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "本当に `%s' を削除しますか?"
 
-#: src/addressbook.c:2365 src/addressbook.c:2498
+#: src/addressbook.c:2369 src/addressbook.c:2502
 msgid "New user, could not save index file."
 msgstr "新規ユーザ、インデックスファイルを保存できません。"
 
-#: src/addressbook.c:2369 src/addressbook.c:2502
+#: src/addressbook.c:2373 src/addressbook.c:2506
 msgid "New user, could not save address book files."
 msgstr "新規ユーザ、アドレス帳ファイルを保存できません。"
 
-#: src/addressbook.c:2379 src/addressbook.c:2512
+#: src/addressbook.c:2383 src/addressbook.c:2516
 msgid "Old address book converted successfully."
 msgstr "旧形式のアドレス帳は正しく変換されました。"
 
-#: src/addressbook.c:2384
+#: src/addressbook.c:2388
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1081,7 +1081,7 @@ msgstr ""
 "旧形式のアドレス帳は変換されました。\n"
 "新規アドレスインデックスファイルに保存できません"
 
-#: src/addressbook.c:2397
+#: src/addressbook.c:2401
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1089,7 +1089,7 @@ msgstr ""
 "アドレス帳を変換できません。\n"
 "しかし空の新規アドレス帳ファイルが作成されました。"
 
-#: src/addressbook.c:2403
+#: src/addressbook.c:2407
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1097,7 +1097,7 @@ msgstr ""
 "アドレス帳を変換できません。\n"
 "新規アドレス帳ファイルを作成できません。"
 
-#: src/addressbook.c:2408
+#: src/addressbook.c:2412
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1105,90 +1105,90 @@ msgstr ""
 "アドレス帳を変換できません。\n"
 "新規アドレス帳ファイルを作成できません。"
 
-#: src/addressbook.c:2415
+#: src/addressbook.c:2419
 msgid "Addressbook conversion error"
 msgstr "アドレス帳の変換エラー"
 
-#: src/addressbook.c:2419
+#: src/addressbook.c:2423
 msgid "Addressbook conversion"
 msgstr "アドレス帳の変換"
 
-#: src/addressbook.c:2454
+#: src/addressbook.c:2458
 msgid "Addressbook Error"
 msgstr "アドレス帳のエラー"
 
-#: src/addressbook.c:2455 src/addressbook.c:2555
+#: src/addressbook.c:2459 src/addressbook.c:2559
 msgid "Could not read address index"
 msgstr "アドレスインデックスを読み込めません"
 
-#: src/addressbook.c:2517
+#: src/addressbook.c:2521
 msgid "Old address book converted, could not save new address index file"
 msgstr ""
 "旧形式のアドレス帳は変換されましたが、新規アドレスインデックスファイルを保存"
 "できません"
 
-#: src/addressbook.c:2531
+#: src/addressbook.c:2535
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr ""
 "アドレス帳を変換できませんでしたが、空の新規アドレス帳ファイルが作成されまし"
 "た。"
 
-#: src/addressbook.c:2537
+#: src/addressbook.c:2541
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr ""
 "アドレス帳を変換できません。新規アドレス帳ファイルを作成できませんでした。"
 
-#: src/addressbook.c:2543
+#: src/addressbook.c:2547
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr ""
 "アドレス帳を変換できません。新規アドレス帳ファイルを作成できませんでした。"
 
-#: src/addressbook.c:2561
+#: src/addressbook.c:2565
 msgid "Addressbook Conversion Error"
 msgstr "アドレス帳変換エラー"
 
-#: src/addressbook.c:2567
+#: src/addressbook.c:2571
 msgid "Addressbook Conversion"
 msgstr "アドレス帳変換"
 
-#: src/addressbook.c:3072 src/prefs_common_dialog.c:2033
+#: src/addressbook.c:3086 src/prefs_common_dialog.c:2033
 msgid "Interface"
 msgstr "インタフェース"
 
-#: src/addressbook.c:3088 src/importldif.c:514
+#: src/addressbook.c:3102 src/importldif.c:514
 msgid "Address Book"
 msgstr "アドレス帳"
 
-#: src/addressbook.c:3104
+#: src/addressbook.c:3118
 msgid "Person"
 msgstr "人物"
 
-#: src/addressbook.c:3120
+#: src/addressbook.c:3134
 msgid "EMail Address"
 msgstr "電子メール アドレス"
 
-#: src/addressbook.c:3136
+#: src/addressbook.c:3150
 msgid "Group"
 msgstr "グループ"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3152 src/folderview.c:367 src/prefs_account_dialog.c:1694
+#: src/addressbook.c:3166 src/folderview.c:367 src/prefs_account_dialog.c:1694
 #: src/query_search.c:370
 msgid "Folder"
 msgstr "フォルダ"
 
-#: src/addressbook.c:3168
+#: src/addressbook.c:3182
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3184 src/addressbook.c:3200
+#: src/addressbook.c:3198 src/addressbook.c:3214
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3216
+#: src/addressbook.c:3230
 msgid "LDAP Server"
 msgstr "LDAPサーバ"
 
@@ -1200,7 +1200,7 @@ msgstr "共有アドレス"
 msgid "Personal address"
 msgstr "個人用アドレス"
 
-#: src/alertpanel.c:141 src/compose.c:5485 src/main.c:573
+#: src/alertpanel.c:141 src/compose.c:5494 src/main.c:573
 msgid "Notice"
 msgstr "注意"
 
@@ -1251,7 +1251,7 @@ msgstr "茶"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4593
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4750
 msgid "None"
 msgstr "なし"
 
@@ -1308,7 +1308,7 @@ msgstr "/編集(_E)/元に戻す(_U)"
 msgid "/_Edit/_Redo"
 msgstr "/編集(_E)/やり直し(_R)"
 
-#: src/compose.c:537 src/compose.c:544 src/mainwindow.c:513
+#: src/compose.c:537 src/compose.c:544 src/mainwindow.c:516
 #: src/messageview.c:147
 msgid "/_Edit/---"
 msgstr "/編集(_E)/---"
@@ -1317,7 +1317,7 @@ msgstr "/編集(_E)/---"
 msgid "/_Edit/Cu_t"
 msgstr "/編集(_E)/カット(_T)"
 
-#: src/compose.c:539 src/mainwindow.c:510 src/messageview.c:145
+#: src/compose.c:539 src/mainwindow.c:513 src/messageview.c:145
 msgid "/_Edit/_Copy"
 msgstr "/編集(_E)/コピー(_C)"
 
@@ -1329,7 +1329,7 @@ msgstr "/編集(_E)/ペースト(_P)"
 msgid "/_Edit/Paste as _quotation"
 msgstr "/編集(_E)/引用としてペースト(_Q)"
 
-#: src/compose.c:543 src/mainwindow.c:511 src/messageview.c:146
+#: src/compose.c:543 src/mainwindow.c:514 src/messageview.c:146
 msgid "/_Edit/Select _all"
 msgstr "/編集(_E)/すべて選択(_A)"
 
@@ -1345,8 +1345,8 @@ msgstr "/編集(_E)/すべての長い行を折り返す(_L)"
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/編集(_E)/自動整形(_O)"
 
-#: src/compose.c:550 src/mainwindow.c:518 src/messageview.c:151
-#: src/summaryview.c:448
+#: src/compose.c:550 src/mainwindow.c:521 src/messageview.c:151
+#: src/summaryview.c:450
 msgid "/_View"
 msgstr "/表示(_V)"
 
@@ -1367,9 +1367,9 @@ msgid "/_View/_Reply to"
 msgstr "/表示(_V)/返信先を指定(_R)"
 
 #: src/compose.c:555 src/compose.c:557 src/compose.c:559 src/compose.c:561
-#: src/mainwindow.c:538 src/mainwindow.c:541 src/mainwindow.c:568
-#: src/mainwindow.c:592 src/mainwindow.c:687 src/mainwindow.c:691
-#: src/messageview.c:236
+#: src/mainwindow.c:541 src/mainwindow.c:544 src/mainwindow.c:571
+#: src/mainwindow.c:595 src/mainwindow.c:696 src/mainwindow.c:700
+#: src/messageview.c:241
 msgid "/_View/---"
 msgstr "/表示(_V)/---"
 
@@ -1385,7 +1385,7 @@ msgstr "/表示(_V)/ルーラ(_U)"
 msgid "/_View/_Attachment"
 msgstr "/表示(_V)/添付(_A)"
 
-#: src/compose.c:567 src/mainwindow.c:599 src/messageview.c:158
+#: src/compose.c:567 src/mainwindow.c:602 src/messageview.c:158
 msgid "/_View/Character _encoding"
 msgstr "/表示(_V)/文字エンコーディング(_E)"
 
@@ -1394,212 +1394,221 @@ msgid "/_View/Character _encoding/_Automatic"
 msgstr "/表示(_V)/文字エンコーディング(_E)/自動(_A)"
 
 #: src/compose.c:570 src/compose.c:576 src/compose.c:582 src/compose.c:586
-#: src/compose.c:592 src/compose.c:596 src/compose.c:602 src/compose.c:606
-#: src/compose.c:616 src/compose.c:620 src/compose.c:628 src/compose.c:632
-#: src/mainwindow.c:595 src/mainwindow.c:602 src/messageview.c:154
+#: src/compose.c:592 src/compose.c:596 src/compose.c:602 src/compose.c:608
+#: src/compose.c:612 src/compose.c:622 src/compose.c:626 src/compose.c:634
+#: src/compose.c:638 src/mainwindow.c:598 src/mainwindow.c:605
+#: src/messageview.c:154
 msgid "/_View/Character _encoding/---"
 msgstr "/表示(_V)/文字エンコーディング(_E)/---"
 
-#: src/compose.c:572 src/mainwindow.c:603 src/messageview.c:162
+#: src/compose.c:572 src/mainwindow.c:606 src/messageview.c:162
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/7bit ascii (US-ASC_II)"
 
-#: src/compose.c:574 src/mainwindow.c:605 src/messageview.c:165
+#: src/compose.c:574 src/mainwindow.c:608 src/messageview.c:165
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/Unicode (_UTF-8)"
 
-#: src/compose.c:578 src/mainwindow.c:609 src/messageview.c:168
+#: src/compose.c:578 src/mainwindow.c:612 src/messageview.c:168
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/欧米 (ISO-8859-_1)"
 
-#: src/compose.c:580 src/mainwindow.c:611 src/messageview.c:170
+#: src/compose.c:580 src/mainwindow.c:614 src/messageview.c:170
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/欧米 (ISO-8859-15)"
 
-#: src/compose.c:584 src/mainwindow.c:617 src/messageview.c:175
+#: src/compose.c:584 src/mainwindow.c:620 src/messageview.c:175
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/中欧 (ISO-8859-_2)"
 
-#: src/compose.c:588 src/mainwindow.c:621 src/messageview.c:178
+#: src/compose.c:588 src/mainwindow.c:624 src/messageview.c:178
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/バルト諸国 (ISO-8859-13)"
 
-#: src/compose.c:590 src/mainwindow.c:623 src/messageview.c:180
+#: src/compose.c:590 src/mainwindow.c:626 src/messageview.c:180
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/バルト諸国 (ISO-8859-_4)"
 
-#: src/compose.c:594 src/mainwindow.c:627 src/messageview.c:183
+#: src/compose.c:594 src/mainwindow.c:630 src/messageview.c:183
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/ギリシャ語 (ISO-8859-_7)"
 
-#: src/compose.c:598 src/mainwindow.c:631 src/messageview.c:186
+#: src/compose.c:598 src/mainwindow.c:634 src/messageview.c:186
+msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
+msgstr "/表示(_V)/文字エンコーディング(_E)/アラビア語 (ISO-8859-_6)"
+
+#: src/compose.c:600 src/mainwindow.c:636 src/messageview.c:188
+msgid "/_View/Character _encoding/Arabic (Windows-1256)"
+msgstr "/表示(_V)/文字エンコーディング(_E)/アラビア語 (Windows-1256)"
+
+#: src/compose.c:604 src/mainwindow.c:640 src/messageview.c:191
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/ヘブライ語 (ISO-8859-_8)"
 
-#: src/compose.c:600 src/mainwindow.c:633 src/messageview.c:188
+#: src/compose.c:606 src/mainwindow.c:642 src/messageview.c:193
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/ヘブライ語 (Windows-1255)"
 
-#: src/compose.c:604 src/mainwindow.c:637 src/messageview.c:191
+#: src/compose.c:610 src/mainwindow.c:646 src/messageview.c:196
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/トルコ語 (ISO-8859-_9)"
 
-#: src/compose.c:608 src/mainwindow.c:641 src/messageview.c:194
+#: src/compose.c:614 src/mainwindow.c:650 src/messageview.c:199
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/キリル文字 (ISO-8859-_5)"
 
-#: src/compose.c:610 src/mainwindow.c:643 src/messageview.c:196
+#: src/compose.c:616 src/mainwindow.c:652 src/messageview.c:201
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/キリル文字 (KOI8-_R)"
 
-#: src/compose.c:612 src/mainwindow.c:645 src/messageview.c:198
+#: src/compose.c:618 src/mainwindow.c:654 src/messageview.c:203
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/キリル文字 (KOI8-U)"
 
-#: src/compose.c:614 src/mainwindow.c:647 src/messageview.c:200
+#: src/compose.c:620 src/mainwindow.c:656 src/messageview.c:205
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/キリル文字 (Windows-1251)"
 
-#: src/compose.c:618 src/mainwindow.c:651 src/messageview.c:203
+#: src/compose.c:624 src/mainwindow.c:660 src/messageview.c:208
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/日本語 (ISO-2022-_JP)"
 
-#: src/compose.c:622 src/mainwindow.c:661 src/messageview.c:212
+#: src/compose.c:628 src/mainwindow.c:670 src/messageview.c:217
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/簡体字中国語 (_GB2312)"
 
-#: src/compose.c:624 src/mainwindow.c:663 src/messageview.c:214
+#: src/compose.c:630 src/mainwindow.c:672 src/messageview.c:219
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/簡体字中国語 (GBK)"
 
-#: src/compose.c:626 src/mainwindow.c:665 src/messageview.c:216
+#: src/compose.c:632 src/mainwindow.c:674 src/messageview.c:221
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/繁体字中国語 (_Big5)"
 
-#: src/compose.c:630 src/mainwindow.c:673 src/messageview.c:223
+#: src/compose.c:636 src/mainwindow.c:682 src/messageview.c:228
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/韓国語 (EUC-_KR)"
 
-#: src/compose.c:634 src/mainwindow.c:679 src/messageview.c:228
+#: src/compose.c:640 src/mainwindow.c:688 src/messageview.c:233
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/タイ語 (TIS-620)"
 
-#: src/compose.c:636 src/mainwindow.c:681 src/messageview.c:230
+#: src/compose.c:642 src/mainwindow.c:690 src/messageview.c:235
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/タイ語 (Windows-874)"
 
-#: src/compose.c:640 src/mainwindow.c:739 src/messageview.c:260
+#: src/compose.c:646 src/mainwindow.c:750 src/messageview.c:265
 msgid "/_Tools/_Address book"
 msgstr "/ツール(_T)/アドレス帳(_A)"
 
-#: src/compose.c:641
+#: src/compose.c:647
 msgid "/_Tools/_Template"
 msgstr "/ツール(_T)/テンプレート(_T)"
 
-#: src/compose.c:642 src/mainwindow.c:762 src/messageview.c:275
+#: src/compose.c:648 src/mainwindow.c:773 src/messageview.c:280
 msgid "/_Tools/Actio_ns"
 msgstr "/ツール(_T)/アクション(_N)"
 
-#: src/compose.c:643 src/compose.c:647 src/compose.c:653 src/mainwindow.c:742
-#: src/mainwindow.c:756 src/mainwindow.c:761 src/mainwindow.c:763
-#: src/mainwindow.c:766 src/mainwindow.c:768 src/messageview.c:263
-#: src/messageview.c:274
+#: src/compose.c:649 src/compose.c:653 src/compose.c:659 src/mainwindow.c:753
+#: src/mainwindow.c:767 src/mainwindow.c:772 src/mainwindow.c:774
+#: src/mainwindow.c:777 src/mainwindow.c:779 src/messageview.c:268
+#: src/messageview.c:279
 msgid "/_Tools/---"
 msgstr "/ツール(_T)/---"
 
-#: src/compose.c:644
+#: src/compose.c:650
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/ツール(_T)/外部エディタで編集(_X)"
 
-#: src/compose.c:648
+#: src/compose.c:654
 msgid "/_Tools/PGP Si_gn"
 msgstr "/ツール(_T)/PGP署名(_G)"
 
-#: src/compose.c:649
+#: src/compose.c:655
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/ツール(_T)/PGP暗号化(_E)"
 
-#: src/compose.c:654
+#: src/compose.c:660
 msgid "/_Tools/_Check spell"
 msgstr "/ツール(_T)/スペルチェック(_C)"
 
-#: src/compose.c:655
+#: src/compose.c:661
 msgid "/_Tools/_Set spell language"
 msgstr "/ツール(_T)/スペルチェックの言語を指定(_S)"
 
-#: src/compose.c:899
+#: src/compose.c:908
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: ファイルが存在しません\n"
 
-#: src/compose.c:1003 src/compose.c:1074
+#: src/compose.c:1012 src/compose.c:1083
 msgid "Can't get text part\n"
 msgstr "テキストパートを取得できません\n"
 
-#: src/compose.c:1475
+#: src/compose.c:1484
 msgid "Quote mark format error."
 msgstr "引用符の書式が不正です。"
 
-#: src/compose.c:1487
+#: src/compose.c:1496
 msgid "Message reply/forward format error."
 msgstr "メッセージの返信/転送の書式が不正です。"
 
-#: src/compose.c:1907
+#: src/compose.c:1916
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "ファイル %s は存在しません\n"
 
-#: src/compose.c:1911
+#: src/compose.c:1920
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "ファイル %s のサイズを取得できません\n"
 
-#: src/compose.c:1915
+#: src/compose.c:1924
 #, c-format
 msgid "File %s is empty."
 msgstr "ファイル %s は空です。"
 
-#: src/compose.c:1919
+#: src/compose.c:1928
 #, c-format
 msgid "Can't read %s."
 msgstr "%s を読み込めません。"
 
-#: src/compose.c:1952
+#: src/compose.c:1961
 #, c-format
 msgid "Message: %s"
 msgstr "メッセージ: %s"
 
-#: src/compose.c:2012 src/mimeview.c:565
+#: src/compose.c:2021 src/mimeview.c:565
 msgid "Can't get the part of multipart message."
 msgstr "マルチパートメッセージのパートを取得できません。"
 
-#: src/compose.c:2496 src/headerview.c:195 src/query_search.c:636
-#: src/summaryview.c:2107
+#: src/compose.c:2505 src/headerview.c:195 src/query_search.c:636
+#: src/summaryview.c:2124
 msgid "(No Subject)"
 msgstr "(件名なし)"
 
-#: src/compose.c:2499
+#: src/compose.c:2508
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - 作成%s"
 
-#: src/compose.c:2612
+#: src/compose.c:2621
 msgid "Recipient is not specified."
 msgstr "宛先が指定されていません。"
 
-#: src/compose.c:2620
+#: src/compose.c:2629
 msgid "Empty subject"
 msgstr "空の件名"
 
-#: src/compose.c:2621
+#: src/compose.c:2630
 msgid "Subject is empty. Send it anyway?"
 msgstr "件名が空です。とにかく送信しますか?"
 
-#: src/compose.c:2680
+#: src/compose.c:2689
 msgid "can't get recipient list."
 msgstr "送信先のリストを取得できません。"
 
-#: src/compose.c:2700
+#: src/compose.c:2709
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1607,21 +1616,21 @@ msgstr ""
 "メールを送信するためのアカウントが指定されていません。\n"
 "送信する前にメールアカウントを選択してください。"
 
-#: src/compose.c:2714 src/send_message.c:299
+#: src/compose.c:2723 src/send_message.c:299
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "メッセージを %s にポストする途中にエラーが発生しました。"
 
-#: src/compose.c:2756
+#: src/compose.c:2765
 msgid "Can't save the message to outbox."
 msgstr "メッセージを送信控に保存できません。"
 
-#: src/compose.c:2794
+#: src/compose.c:2803
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "現在選択されている鍵ID `%s' に対応する鍵が見つかりませんでした。"
 
-#: src/compose.c:2891
+#: src/compose.c:2900
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1632,11 +1641,11 @@ msgstr ""
 "\n"
 "%s のままとにかく送信しますか?"
 
-#: src/compose.c:2897
+#: src/compose.c:2906
 msgid "Code conversion error"
 msgstr "文字コード変換エラー"
 
-#: src/compose.c:2970
+#: src/compose.c:2979
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1649,156 +1658,156 @@ msgstr ""
 "\n"
 "とにかく送信しますか?"
 
-#: src/compose.c:2974
+#: src/compose.c:2983
 msgid "Line length limit"
 msgstr "行の長さの制限"
 
-#: src/compose.c:3264
+#: src/compose.c:3273
 msgid "can't remove the old message\n"
 msgstr "古いメッセージを削除できません\n"
 
-#: src/compose.c:3282
+#: src/compose.c:3291
 msgid "queueing message...\n"
 msgstr "メッセージを送信待ちに入れています...\n"
 
-#: src/compose.c:3364
+#: src/compose.c:3373
 msgid "can't find queue folder\n"
 msgstr "送信待ちフォルダが見つかりません\n"
 
-#: src/compose.c:3371
+#: src/compose.c:3380
 msgid "can't queue the message\n"
 msgstr "メッセージを送信待機できません\n"
 
-#: src/compose.c:3964
+#: src/compose.c:3973
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "生成されたメッセージID: %s\n"
 
-#: src/compose.c:4077
+#: src/compose.c:4086
 msgid "Creating compose window...\n"
 msgstr "メッセージ作成ウィンドウを作成中...\n"
 
-#: src/compose.c:4128 src/headerview.c:54
+#: src/compose.c:4137 src/headerview.c:54
 msgid "From:"
 msgstr "差出人:"
 
-#: src/compose.c:4202
+#: src/compose.c:4211
 msgid "PGP Sign"
 msgstr "PGP署名"
 
-#: src/compose.c:4205
+#: src/compose.c:4214
 msgid "PGP Encrypt"
 msgstr "PGP暗号化"
 
-#: src/compose.c:4243 src/compose.c:5317
+#: src/compose.c:4252 src/compose.c:5326
 msgid "MIME type"
 msgstr "MIME タイプ"
 
 #. S_COL_DATE
-#: src/compose.c:4252 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4740
+#: src/compose.c:4261 src/mimeview.c:197 src/prefs_filter_edit.c:496
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4897
 msgid "Size"
 msgstr "サイズ"
 
-#: src/compose.c:4683 src/mainwindow.c:2324 src/prefs_account_dialog.c:528
+#: src/compose.c:4692 src/mainwindow.c:2335 src/prefs_account_dialog.c:528
 #: src/prefs_common_dialog.c:661
 msgid "Send"
 msgstr "送信"
 
-#: src/compose.c:4684
+#: src/compose.c:4693
 msgid "Send message"
 msgstr "メッセージを送信"
 
-#: src/compose.c:4692
+#: src/compose.c:4701
 msgid "Send later"
 msgstr "後で送信"
 
-#: src/compose.c:4693
+#: src/compose.c:4702
 msgid "Put into queue folder and send later"
 msgstr "送信待ちフォルダに入れて後で送信"
 
-#: src/compose.c:4701
+#: src/compose.c:4710
 msgid "Draft"
 msgstr "草稿"
 
-#: src/compose.c:4702
+#: src/compose.c:4711
 msgid "Save to draft folder"
 msgstr "草稿フォルダに保存"
 
-#: src/compose.c:4712
+#: src/compose.c:4721
 msgid "Insert"
 msgstr "挿入"
 
-#: src/compose.c:4713
+#: src/compose.c:4722
 msgid "Insert file"
 msgstr "ファイルを挿入"
 
-#: src/compose.c:4721
+#: src/compose.c:4730
 msgid "Attach"
 msgstr "添付"
 
-#: src/compose.c:4722
+#: src/compose.c:4731
 msgid "Attach file"
 msgstr "ファイルを添付"
 
 #. signature
-#: src/compose.c:4732 src/prefs_account_dialog.c:1208
+#: src/compose.c:4741 src/prefs_account_dialog.c:1208
 #: src/prefs_common_dialog.c:953
 msgid "Signature"
 msgstr "署名"
 
-#: src/compose.c:4733
+#: src/compose.c:4742
 msgid "Append signature"
 msgstr "署名を追加"
 
 #. editor
-#: src/compose.c:4742 src/prefs_common_dialog.c:991
+#: src/compose.c:4751 src/prefs_common_dialog.c:991
 #: src/prefs_common_dialog.c:2315
 msgid "Editor"
 msgstr "エディタ"
 
-#: src/compose.c:4743
+#: src/compose.c:4752
 msgid "Edit with external editor"
 msgstr "外部エディタで編集"
 
-#: src/compose.c:4751
+#: src/compose.c:4760
 msgid "Linewrap"
 msgstr "整形"
 
-#: src/compose.c:4752
+#: src/compose.c:4761
 msgid "Wrap all long lines"
 msgstr "すべての長い行を折り返す"
 
-#: src/compose.c:5213
+#: src/compose.c:5222
 msgid "Invalid MIME type."
 msgstr "無効な MIME タイプです。"
 
-#: src/compose.c:5231
+#: src/compose.c:5240
 msgid "File doesn't exist or is empty."
 msgstr "ファイルが存在しないかまたは空です。"
 
-#: src/compose.c:5299
+#: src/compose.c:5308
 msgid "Properties"
 msgstr "プロパティ"
 
-#: src/compose.c:5319 src/prefs_common_dialog.c:1444
+#: src/compose.c:5328 src/prefs_common_dialog.c:1444
 msgid "Encoding"
 msgstr "エンコーディング"
 
-#: src/compose.c:5342 src/prefs_folder_item.c:202
+#: src/compose.c:5351 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "パス"
 
-#: src/compose.c:5343
+#: src/compose.c:5352
 msgid "File name"
 msgstr "ファイル名"
 
-#: src/compose.c:5436
+#: src/compose.c:5445
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "外部エディタのコマンドラインが無効です: `%s'\n"
 
-#: src/compose.c:5482
+#: src/compose.c:5491
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1807,44 +1816,44 @@ msgstr ""
 "外部エディタが動作中です。\n"
 "プロセスを強制終了しますか(pid: %d)?\n"
 
-#: src/compose.c:5857 src/compose.c:5862 src/compose.c:5868
+#: src/compose.c:5866 src/compose.c:5871 src/compose.c:5877
 msgid "Can't queue the message."
 msgstr "メッセージを送信待機できません。"
 
-#: src/compose.c:5959
+#: src/compose.c:5968
 msgid "Select files"
 msgstr "ファイルの選択"
 
-#: src/compose.c:5982
+#: src/compose.c:5991
 msgid "Select file"
 msgstr "ファイルの選択"
 
-#: src/compose.c:6017
+#: src/compose.c:6026
 msgid "Save message"
 msgstr "メッセージの保存"
 
-#: src/compose.c:6018
+#: src/compose.c:6027
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "このメッセージは変更されています。草稿に保存しますか?"
 
-#: src/compose.c:6020
+#: src/compose.c:6029
 msgid "Close _without saving"
 msgstr "保存せずに閉じる(_W)"
 
-#: src/compose.c:6062
+#: src/compose.c:6071
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "テンプレート `%s' を適用しますか?"
 
-#: src/compose.c:6064
+#: src/compose.c:6073
 msgid "Apply template"
 msgstr "テンプレートの適用"
 
-#: src/compose.c:6065
+#: src/compose.c:6074
 msgid "_Replace"
 msgstr "置換(_R)"
 
-#: src/compose.c:6065
+#: src/compose.c:6074
 msgid "_Insert"
 msgstr "挿入(_I)"
 
@@ -2279,7 +2288,7 @@ msgstr "新着"
 
 #. S_COL_MARK
 #: src/folderview.c:412 src/prefs_filter_edit.c:500
-#: src/prefs_summary_column.c:71 src/summaryview.c:509
+#: src/prefs_summary_column.c:71 src/summaryview.c:511
 msgid "Unread"
 msgstr "未読"
 
@@ -2295,12 +2304,12 @@ msgstr "フォルダ情報を設定中...\n"
 msgid "Setting folder info..."
 msgstr "フォルダ情報を設定中..."
 
-#: src/folderview.c:858 src/mainwindow.c:3464 src/setup.c:80
+#: src/folderview.c:858 src/mainwindow.c:3481 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "フォルダをスキャン中 (%s%c%s) ..."
 
-#: src/folderview.c:862 src/mainwindow.c:3469 src/setup.c:85
+#: src/folderview.c:862 src/mainwindow.c:3486 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "フォルダをスキャン中 (%s)..."
@@ -2325,7 +2334,7 @@ msgstr "フォルダツリーの再構築に失敗しました。"
 msgid "Checking for new messages in all folders..."
 msgstr "全フォルダの新着メッセージをチェック中..."
 
-#: src/folderview.c:1200 src/mainwindow.c:2400 src/prefs_common_dialog.c:1789
+#: src/folderview.c:1200 src/mainwindow.c:2411 src/prefs_common_dialog.c:1789
 msgid "Junk"
 msgstr "迷惑メール"
 
@@ -2464,7 +2473,7 @@ msgstr "件名:"
 msgid "Creating header view...\n"
 msgstr "ヘッダビューを作成中...\n"
 
-#: src/headerview.c:180 src/query_search.c:637 src/summaryview.c:2110
+#: src/headerview.c:180 src/query_search.c:637 src/summaryview.c:2127
 msgid "(No From)"
 msgstr "(差出人不明)"
 
@@ -2573,7 +2582,7 @@ msgstr "LDIFファイルをアドレス帳へインポート"
 msgid "Prev"
 msgstr "前へ"
 
-#: src/importldif.c:768 src/mainwindow.c:2420
+#: src/importldif.c:768 src/mainwindow.c:2431
 msgid "Next"
 msgstr "次へ"
 
@@ -2922,11 +2931,11 @@ msgstr ""
 msgid "another Sylpheed is already running.\n"
 msgstr "別の Sylpheed がすでに起動しています。\n"
 
-#: src/main.c:1064
+#: src/main.c:1083
 msgid "Migration of configuration"
 msgstr "設定の移行"
 
-#: src/main.c:1065
+#: src/main.c:1084
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -2934,633 +2943,637 @@ msgstr ""
 "以前のバージョンの設定が見つかりました。\n"
 "移行しますか?"
 
-#: src/mainwindow.c:478
+#: src/mainwindow.c:481
 msgid "/_File/_Folder"
 msgstr "/ファイル(_F)/フォルダ(_F)"
 
-#: src/mainwindow.c:479
+#: src/mainwindow.c:482
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/ファイル(_F)/フォルダ(_F)/新規フォルダを作成(_N)..."
 
-#: src/mainwindow.c:481
+#: src/mainwindow.c:484
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/ファイル(_F)/フォルダ(_F)/フォルダ名を変更(_R)..."
 
-#: src/mainwindow.c:482
+#: src/mainwindow.c:485
 msgid "/_File/_Folder/_Move folder..."
 msgstr "/ファイル(_F)/フォルダ(_F)/フォルダを移動(_M)..."
 
-#: src/mainwindow.c:483
+#: src/mainwindow.c:486
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/ファイル(_F)/フォルダ(_F)/フォルダを削除(_D)"
 
-#: src/mainwindow.c:484
+#: src/mainwindow.c:487
 msgid "/_File/_Mailbox"
 msgstr "/ファイル(_F)/メールボックス(_M)"
 
-#: src/mainwindow.c:485
+#: src/mainwindow.c:488
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/ファイル(_F)/メールボックス(_M)/メールボックスを追加(_M)..."
 
-#: src/mainwindow.c:486
+#: src/mainwindow.c:489
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/ファイル(_F)/メールボックス(_M)/メールボックスを削除(_R)"
 
-#: src/mainwindow.c:487 src/mainwindow.c:492
+#: src/mainwindow.c:490 src/mainwindow.c:495
 msgid "/_File/_Mailbox/---"
 msgstr "/ファイル(_F)/メールボックス(_M)/---"
 
-#: src/mainwindow.c:488
+#: src/mainwindow.c:491
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "/ファイル(_F)/メールボックス(_M)/新着メッセージをチェック(_C)"
 
-#: src/mainwindow.c:490
+#: src/mainwindow.c:493
 msgid "/_File/_Mailbox/Check for new messages in _all mailboxes"
 msgstr ""
 "/ファイル(_F)/メールボックス(_M)/すべてのメールボックスの新着メッセージを"
 "チェック(_A)"
 
-#: src/mainwindow.c:493
+#: src/mainwindow.c:496
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "//ファイル(_F)/メールボックス(_M)/フォルダツリーを再構築(_E)"
 
-#: src/mainwindow.c:496
+#: src/mainwindow.c:499
 msgid "/_File/_Import mbox file..."
 msgstr "/ファイル(_F)/mboxファイルをインポート(_I)..."
 
-#: src/mainwindow.c:497
+#: src/mainwindow.c:500
 msgid "/_File/_Export to mbox file..."
 msgstr "/ファイル(_F)/mboxファイルにエクスポート(_E)..."
 
-#: src/mainwindow.c:499
+#: src/mainwindow.c:502
 msgid "/_File/Empty all _trash"
 msgstr "/ファイル(_F)/すべてのごみ箱を空にする(_T)"
 
-#: src/mainwindow.c:501 src/messageview.c:139
+#: src/mainwindow.c:504 src/messageview.c:139
 msgid "/_File/_Save as..."
 msgstr "/ファイル(_F)/名前を付けて保存(_S)..."
 
-#: src/mainwindow.c:502 src/messageview.c:140
+#: src/mainwindow.c:505 src/messageview.c:140
 msgid "/_File/_Print..."
 msgstr "/ファイル(_F)/印刷(_P)..."
 
-#: src/mainwindow.c:504
+#: src/mainwindow.c:507
 msgid "/_File/_Work offline"
 msgstr "/ファイル(_F)/オフラインにする(_W)"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:507
+#: src/mainwindow.c:510
 msgid "/_File/E_xit"
 msgstr "/ファイル(_F)/終了(_X)"
 
-#: src/mainwindow.c:512
+#: src/mainwindow.c:515
 msgid "/_Edit/Select _thread"
 msgstr "/編集(_E)/スレッドを選択(_T)"
 
-#: src/mainwindow.c:514 src/messageview.c:148
+#: src/mainwindow.c:517 src/messageview.c:148
 msgid "/_Edit/_Find in current message..."
 msgstr "/編集(_E)/現在のメッセージ内を検索(_F)..."
 
-#: src/mainwindow.c:516
+#: src/mainwindow.c:519
 msgid "/_Edit/_Search messages..."
 msgstr "/編集(_E)/メッセージを検索(_S)..."
 
-#: src/mainwindow.c:519
+#: src/mainwindow.c:522
 msgid "/_View/Show or hi_de"
 msgstr "/表示(_V)/表示・非表示(_D)"
 
-#: src/mainwindow.c:520
+#: src/mainwindow.c:523
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/表示(_V)/表示・非表示(_D)/フォルダツリー(_F)"
 
-#: src/mainwindow.c:522
+#: src/mainwindow.c:525
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/表示(_V)/表示・非表示(_D)/メッセージビュー(_M)"
 
-#: src/mainwindow.c:524
+#: src/mainwindow.c:527
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/表示(_V)/表示・非表示(_D)/ツールバー(_T)"
 
-#: src/mainwindow.c:526
+#: src/mainwindow.c:529
 msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/表示(_V)/表示・非表示(_D)/ツールバー(_T)/アイコンと文字(_A)"
 
-#: src/mainwindow.c:528
+#: src/mainwindow.c:531
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/表示(_V)/表示・非表示(_D)/ツールバー(_T)/アイコン(_I)"
 
-#: src/mainwindow.c:530
+#: src/mainwindow.c:533
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/表示(_V)/表示・非表示(_D)/ツールバー(_T)/文字(_T)"
 
-#: src/mainwindow.c:532
+#: src/mainwindow.c:535
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/表示(_V)/表示・非表示(_D)/ツールバー(_T)/非表示(_N)"
 
-#: src/mainwindow.c:534
+#: src/mainwindow.c:537
 msgid "/_View/Show or hi_de/_Search bar"
 msgstr "/表示(_V)/表示・非表示(_D)/検索バー(_S)"
 
-#: src/mainwindow.c:536
+#: src/mainwindow.c:539
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/表示(_V)/表示・非表示(_D)/ステータスバー(_B)"
 
-#: src/mainwindow.c:539
+#: src/mainwindow.c:542
 msgid "/_View/Separate f_older tree"
 msgstr "/表示(_V)/フォルダツリーを分離(_O)"
 
-#: src/mainwindow.c:540
+#: src/mainwindow.c:543
 msgid "/_View/Separate _message view"
 msgstr "/表示(_V)/メッセージビューを分離(_M)"
 
-#: src/mainwindow.c:542
+#: src/mainwindow.c:545
 msgid "/_View/_Sort"
 msgstr "/表示(_V)/ソート(_S)"
 
-#: src/mainwindow.c:543
+#: src/mainwindow.c:546
 msgid "/_View/_Sort/by _number"
 msgstr "/表示(_V)/ソート(_S)/番号順(_N)"
 
-#: src/mainwindow.c:544
+#: src/mainwindow.c:547
 msgid "/_View/_Sort/by s_ize"
 msgstr "/表示(_V)/ソート(_S)/サイズ順(_I)"
 
-#: src/mainwindow.c:545
+#: src/mainwindow.c:548
 msgid "/_View/_Sort/by _date"
 msgstr "/表示(_V)/ソート(_S)/日付順(_D)"
 
-#: src/mainwindow.c:546
+#: src/mainwindow.c:549
 msgid "/_View/_Sort/by t_hread date"
 msgstr "/表示(_V)/ソート(_S)/スレッドの日付順(_H)"
 
-#: src/mainwindow.c:547
+#: src/mainwindow.c:550
 msgid "/_View/_Sort/by _from"
 msgstr "/表示(_V)/ソート(_S)/差出人順(_F)"
 
-#: src/mainwindow.c:548
+#: src/mainwindow.c:551
 msgid "/_View/_Sort/by _recipient"
 msgstr "/表示(_V)/ソート(_S)/宛先順(_R)"
 
-#: src/mainwindow.c:549
+#: src/mainwindow.c:552
 msgid "/_View/_Sort/by _subject"
 msgstr "/表示(_V)/ソート(_S)/件名順(_S)"
 
-#: src/mainwindow.c:550
+#: src/mainwindow.c:553
 msgid "/_View/_Sort/by _color label"
 msgstr "/表示(_V)/ソート(_S)/カラーラベル順(_C)"
 
-#: src/mainwindow.c:552
+#: src/mainwindow.c:555
 msgid "/_View/_Sort/by _mark"
 msgstr "/表示(_V)/ソート(_S)/マーク(_M)"
 
-#: src/mainwindow.c:553
+#: src/mainwindow.c:556
 msgid "/_View/_Sort/by _unread"
 msgstr "/表示(_V)/ソート(_S)/未読(_U)"
 
-#: src/mainwindow.c:554
+#: src/mainwindow.c:557
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/表示(_V)/ソート(_S)/添付(_T)"
 
-#: src/mainwindow.c:556
+#: src/mainwindow.c:559
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/表示(_V)/ソート(_S)/ソートしない(_O)"
 
-#: src/mainwindow.c:557 src/mainwindow.c:560
+#: src/mainwindow.c:560 src/mainwindow.c:563
 msgid "/_View/_Sort/---"
 msgstr "/表示(_V)/ソート(_S)/---"
 
-#: src/mainwindow.c:558
+#: src/mainwindow.c:561
 msgid "/_View/_Sort/Ascending"
 msgstr "/表示(_V)/ソート(_S)/昇順"
 
-#: src/mainwindow.c:559
+#: src/mainwindow.c:562
 msgid "/_View/_Sort/Descending"
 msgstr "/表示(_V)/ソート(_S)/降順"
 
-#: src/mainwindow.c:561
+#: src/mainwindow.c:564
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/表示(_V)/ソート(_S)/件名でまとめる(_A)"
 
-#: src/mainwindow.c:563
+#: src/mainwindow.c:566
 msgid "/_View/Th_read view"
 msgstr "/表示(_V)/スレッド表示(_R)"
 
-#: src/mainwindow.c:564
+#: src/mainwindow.c:567
 msgid "/_View/E_xpand all threads"
 msgstr "/表示(_V)/すべてのスレッドを展開(_X)"
 
-#: src/mainwindow.c:565
+#: src/mainwindow.c:568
 msgid "/_View/Co_llapse all threads"
 msgstr "/表示(_V)/すべてのスレッドを閉じる(_L)"
 
-#: src/mainwindow.c:566
+#: src/mainwindow.c:569
 msgid "/_View/Set display _item..."
 msgstr "/表示(_V)/表示項目の設定(_I)..."
 
-#: src/mainwindow.c:569
+#: src/mainwindow.c:572
 msgid "/_View/_Go to"
 msgstr "/表示(_V)/移動(_G)"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:573
 msgid "/_View/_Go to/_Prev message"
 msgstr "/表示(_V)/移動(_G)/前のメッセージ(_P)"
 
-#: src/mainwindow.c:571
+#: src/mainwindow.c:574
 msgid "/_View/_Go to/_Next message"
 msgstr "/表示(_V)/移動(_G)/次のメッセージ(_N)"
 
-#: src/mainwindow.c:572 src/mainwindow.c:577 src/mainwindow.c:580
-#: src/mainwindow.c:585 src/mainwindow.c:590
+#: src/mainwindow.c:575 src/mainwindow.c:580 src/mainwindow.c:583
+#: src/mainwindow.c:588 src/mainwindow.c:593
 msgid "/_View/_Go to/---"
 msgstr "/表示(_V)/移動(_G)/---"
 
-#: src/mainwindow.c:573
+#: src/mainwindow.c:576
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/表示(_V)/移動(_G)/前の未読メッセージ(_R)"
 
-#: src/mainwindow.c:575
+#: src/mainwindow.c:578
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/表示(_V)/移動(_G)/次の未読メッセージ(_E)"
 
-#: src/mainwindow.c:578
+#: src/mainwindow.c:581
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/表示(_V)/移動(_G)/前の新着メッセージ(_W)"
 
-#: src/mainwindow.c:579
+#: src/mainwindow.c:582
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/表示(_V)/移動(_G)/次の新着メッセージ(_X)"
 
-#: src/mainwindow.c:581
+#: src/mainwindow.c:584
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/表示(_V)/移動(_G)/前のマーク付きメッセージ(_M)"
 
-#: src/mainwindow.c:583
+#: src/mainwindow.c:586
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/表示(_V)/移動(_G)/次のマーク付きメッセージ(_A)"
 
-#: src/mainwindow.c:586
+#: src/mainwindow.c:589
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/表示(_V)/移動(_G)/前のラベル付きメッセージ(_L)"
 
-#: src/mainwindow.c:588
+#: src/mainwindow.c:591
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/表示(_V)/移動(_G)/次のラベル付きメッセージ(_B)"
 
-#: src/mainwindow.c:591
+#: src/mainwindow.c:594
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/表示(_V)/移動(_G)/別のフォルダ(_F)..."
 
-#: src/mainwindow.c:600 src/messageview.c:159
+#: src/mainwindow.c:603 src/messageview.c:159
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/表示(_V)/文字エンコーディング(_E)/自動検出(_A)"
 
-#: src/mainwindow.c:613 src/messageview.c:172
+#: src/mainwindow.c:616 src/messageview.c:172
 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/欧米 (Windows-1252)"
 
-#: src/mainwindow.c:653 src/messageview.c:205
+#: src/mainwindow.c:662 src/messageview.c:210
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/日本語 (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:655 src/messageview.c:207
+#: src/mainwindow.c:664 src/messageview.c:212
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/日本語 (_EUC-JP)"
 
-#: src/mainwindow.c:657 src/messageview.c:209
+#: src/mainwindow.c:666 src/messageview.c:214
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/日本語 (_Shift__JIS)"
 
-#: src/mainwindow.c:667 src/messageview.c:218
+#: src/mainwindow.c:676 src/messageview.c:223
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/繁体字中国語 (EUC-_TW)"
 
-#: src/mainwindow.c:669 src/messageview.c:220
+#: src/mainwindow.c:678 src/messageview.c:225
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/中国語 (ISO-2022-_CN)"
 
-#: src/mainwindow.c:675 src/messageview.c:225
+#: src/mainwindow.c:684 src/messageview.c:230
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/韓国語 (ISO-2022-KR)"
 
-#: src/mainwindow.c:688 src/summaryview.c:449
+#: src/mainwindow.c:697 src/summaryview.c:451
 msgid "/_View/Open in new _window"
 msgstr "/表示(_V)/新しいウィンドウで開く(_W)"
 
-#: src/mainwindow.c:689 src/messageview.c:237
+#: src/mainwindow.c:698 src/messageview.c:242
 msgid "/_View/Mess_age source"
 msgstr "/表示(_V)/メッセージのソース(_A)"
 
-#: src/mainwindow.c:690 src/messageview.c:238
+#: src/mainwindow.c:699 src/messageview.c:243
 msgid "/_View/Show all _header"
 msgstr "/表示(_V)/すべてのヘッダを表示(_H)"
 
-#: src/mainwindow.c:692
+#: src/mainwindow.c:701
 msgid "/_View/_Update summary"
 msgstr "/表示(_V)/サマリを更新(_U)"
 
-#: src/mainwindow.c:694 src/messageview.c:240
+#: src/mainwindow.c:703 src/messageview.c:245
 msgid "/_Message"
 msgstr "/メッセージ(_M)"
 
-#: src/mainwindow.c:695
+#: src/mainwindow.c:704
 msgid "/_Message/Recei_ve"
 msgstr "/メッセージ(_M)/受信(_V)"
 
-#: src/mainwindow.c:696
+#: src/mainwindow.c:705
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/メッセージ(_M)/受信(_V)/現在のアカウントから受信(_C)"
 
-#: src/mainwindow.c:698
+#: src/mainwindow.c:707
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/メッセージ(_M)/受信(_V)/全アカウントから受信(_A)"
 
-#: src/mainwindow.c:700
+#: src/mainwindow.c:709
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/メッセージ(_M)/受信(_V)/受信を中止(_G)"
 
-#: src/mainwindow.c:702
+#: src/mainwindow.c:711
 msgid "/_Message/Recei_ve/---"
 msgstr "/メッセージ(_M)/受信(_V)/---"
 
-#: src/mainwindow.c:703
+#: src/mainwindow.c:712
 msgid "/_Message/_Send queued messages"
 msgstr "/メッセージ(_M)/送信待機中のメッセージを送信(_S)"
 
-#: src/mainwindow.c:704 src/mainwindow.c:706 src/mainwindow.c:713
-#: src/mainwindow.c:718 src/mainwindow.c:721 src/mainwindow.c:730
-#: src/mainwindow.c:732 src/mainwindow.c:735 src/messageview.c:243
-#: src/messageview.c:251 src/messageview.c:256
+#: src/mainwindow.c:713 src/mainwindow.c:715 src/mainwindow.c:722
+#: src/mainwindow.c:727 src/mainwindow.c:730 src/mainwindow.c:741
+#: src/mainwindow.c:743 src/mainwindow.c:746 src/messageview.c:248
+#: src/messageview.c:256 src/messageview.c:261
 msgid "/_Message/---"
 msgstr "/メッセージ(_M)/---"
 
-#: src/mainwindow.c:705 src/messageview.c:241
+#: src/mainwindow.c:714 src/messageview.c:246
 msgid "/_Message/Compose _new message"
 msgstr "/メッセージ(_M)/新規メッセージを作成(_N)"
 
-#: src/mainwindow.c:707 src/messageview.c:244
+#: src/mainwindow.c:716 src/messageview.c:249
 msgid "/_Message/_Reply"
 msgstr "/メッセージ(_M)/返信(_R)"
 
-#: src/mainwindow.c:708
+#: src/mainwindow.c:717
 msgid "/_Message/Repl_y to"
 msgstr "/メッセージ(_M)/返信の宛先(_Y)"
 
-#: src/mainwindow.c:709 src/messageview.c:245
+#: src/mainwindow.c:718 src/messageview.c:250
 msgid "/_Message/Repl_y to/_all"
 msgstr "/メッセージ(_M)/返信の宛先(_Y)/全員に返信(_A)"
 
-#: src/mainwindow.c:710 src/messageview.c:247
+#: src/mainwindow.c:719 src/messageview.c:252
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/メッセージ(_M)/返信の宛先(_Y)/差出人に返信(_S)"
 
-#: src/mainwindow.c:711 src/messageview.c:249
+#: src/mainwindow.c:720 src/messageview.c:254
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/メッセージ(_M)/返信の宛先(_Y)/メーリングリストに返信(_L)"
 
-#: src/mainwindow.c:714 src/messageview.c:252
+#: src/mainwindow.c:723 src/messageview.c:257
 msgid "/_Message/_Forward"
 msgstr "/メッセージ(_M)/転送(_F)"
 
-#: src/mainwindow.c:715 src/messageview.c:253
+#: src/mainwindow.c:724 src/messageview.c:258
 msgid "/_Message/For_ward as attachment"
 msgstr "/メッセージ(_M)/添付として転送(_W)"
 
-#: src/mainwindow.c:717 src/messageview.c:255
+#: src/mainwindow.c:726 src/messageview.c:260
 msgid "/_Message/Redirec_t"
 msgstr "/メッセージ(_M)/手を加えずに転送(_T)"
 
-#: src/mainwindow.c:719
+#: src/mainwindow.c:728
 msgid "/_Message/M_ove..."
 msgstr "/メッセージ(_M)/移動(_O)..."
 
-#: src/mainwindow.c:720
+#: src/mainwindow.c:729
 msgid "/_Message/_Copy..."
 msgstr "/メッセージ(_M)/コピー(_C)..."
 
-#: src/mainwindow.c:722
+#: src/mainwindow.c:731
 msgid "/_Message/_Mark"
 msgstr "/メッセージ(_M)/マーク(_M)"
 
-#: src/mainwindow.c:723
+#: src/mainwindow.c:732
 msgid "/_Message/_Mark/_Mark"
 msgstr "/メッセージ(_M)/マーク(_M)/マーク(_M)"
 
-#: src/mainwindow.c:724
+#: src/mainwindow.c:733
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/メッセージ(_M)/マーク(_M)/マーク解除(_U)"
 
-#: src/mainwindow.c:725
+#: src/mainwindow.c:734
 msgid "/_Message/_Mark/---"
 msgstr "/メッセージ(_M)/マーク(_M)/---"
 
-#: src/mainwindow.c:726
+#: src/mainwindow.c:735
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/メッセージ(_M)/マーク(_M)/未読としてマーク(_E)"
 
-#: src/mainwindow.c:727
+#: src/mainwindow.c:736
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/メッセージ(_M)/マーク(_M)/読んだことにする(_D)"
 
-#: src/mainwindow.c:729
+#: src/mainwindow.c:738
+msgid "/_Message/_Mark/Mark _thread as read"
+msgstr "/メッセージ(_M)/マーク(_M)/スレッドを読んだことにする(_T)"
+
+#: src/mainwindow.c:740
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/メッセージ(_M)/マーク(_M)/すべて読んだことにする(_R)"
 
-#: src/mainwindow.c:731
+#: src/mainwindow.c:742
 msgid "/_Message/_Delete"
 msgstr "/メッセージ(_M)/削除(_D)"
 
-#: src/mainwindow.c:733
+#: src/mainwindow.c:744
 msgid "/_Message/Set as _junk mail"
 msgstr "/メッセージ(_M)/迷惑メールに指定(_J)"
 
-#: src/mainwindow.c:734
+#: src/mainwindow.c:745
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/メッセージ(_M)/迷惑メールではない(_U)"
 
-#: src/mainwindow.c:736 src/messageview.c:257
+#: src/mainwindow.c:747 src/messageview.c:262
 msgid "/_Message/Re-_edit"
 msgstr "/メッセージ(_M)/再編集(_E)"
 
-#: src/mainwindow.c:740
+#: src/mainwindow.c:751
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/ツール(_T)/差出人をアドレス帳に追加(_K)..."
 
-#: src/mainwindow.c:743
+#: src/mainwindow.c:754
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/ツール(_T)/フォルダ中のすべてのメッセージを振り分け(_F)"
 
-#: src/mainwindow.c:745
+#: src/mainwindow.c:756
 msgid "/_Tools/Filter _selected messages"
 msgstr "/ツール(_T)/選択中のメッセージを振り分け(_S)"
 
-#: src/mainwindow.c:747 src/messageview.c:264
+#: src/mainwindow.c:758 src/messageview.c:269
 msgid "/_Tools/_Create filter rule"
 msgstr "/ツール(_T)/振り分けルールを作成(_C)"
 
-#: src/mainwindow.c:748 src/messageview.c:266
+#: src/mainwindow.c:759 src/messageview.c:271
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/ツール(_T)/振り分けルールを作成(_C)/自動(_A)"
 
-#: src/mainwindow.c:750 src/messageview.c:268
+#: src/mainwindow.c:761 src/messageview.c:273
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/ツール(_T)/振り分けルールを作成(_C)/_Fromから"
 
-#: src/mainwindow.c:752 src/messageview.c:270
+#: src/mainwindow.c:763 src/messageview.c:275
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/ツール(_T)/振り分けルールを作成(_C)/_Toから"
 
-#: src/mainwindow.c:754 src/messageview.c:272
+#: src/mainwindow.c:765 src/messageview.c:277
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/ツール(_T)/振り分けルールを作成(_C)/_Subjectから"
 
-#: src/mainwindow.c:757
+#: src/mainwindow.c:768
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/ツール(_T)/フォルダ中の迷惑メールを振り分け(_J)"
 
-#: src/mainwindow.c:759
+#: src/mainwindow.c:770
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/ツール(_T)/選択メッセージ中の迷惑メールを振り分け(_M)"
 
-#: src/mainwindow.c:764
+#: src/mainwindow.c:775
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/メッセージ(_M)/重複メッセージを削除(_P)"
 
-#: src/mainwindow.c:767
+#: src/mainwindow.c:778
 msgid "/_Tools/E_xecute"
 msgstr "/ツール(_T)/実行(_X)"
 
-#: src/mainwindow.c:769
+#: src/mainwindow.c:780
 msgid "/_Tools/_Log window"
 msgstr "/ツール(_T)/ログウィンドウ(_L)"
 
-#: src/mainwindow.c:771
+#: src/mainwindow.c:782
 msgid "/_Configuration"
 msgstr "/設定(_C)"
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:783
 msgid "/_Configuration/_Common preferences..."
 msgstr "/設定(_C)/全般の設定(_C)..."
 
-#: src/mainwindow.c:774
+#: src/mainwindow.c:785
 msgid "/_Configuration/_Filter setting..."
 msgstr "/設定(_C)/振り分けの設定(_F)..."
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:787
 msgid "/_Configuration/_Template..."
 msgstr "/設定(_C)/テンプレート(_T)..."
 
-#: src/mainwindow.c:777
+#: src/mainwindow.c:788
 msgid "/_Configuration/_Actions..."
 msgstr "/設定(_C)/アクション(_A)..."
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:789
 msgid "/_Configuration/---"
 msgstr "/設定(_C)/---"
 
-#: src/mainwindow.c:779
+#: src/mainwindow.c:790
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/設定(_C)/現在のアカウントの設定(_P)..."
 
-#: src/mainwindow.c:781
+#: src/mainwindow.c:792
 msgid "/_Configuration/Create _new account..."
 msgstr "/設定(_C)/新規アカウントの作成(_N)..."
 
-#: src/mainwindow.c:783
+#: src/mainwindow.c:794
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/設定(_C)/アカウントの編集(_E)..."
 
-#: src/mainwindow.c:785
+#: src/mainwindow.c:796
 msgid "/_Configuration/C_hange current account"
 msgstr "/設定(_C)/現在のアカウントを変更(_H)"
 
-#: src/mainwindow.c:789
+#: src/mainwindow.c:800
 msgid "/_Help/_Manual"
 msgstr "/ヘルプ(_H)/マニュアル(_M)"
 
-#: src/mainwindow.c:790
+#: src/mainwindow.c:801
 msgid "/_Help/_Manual/_English"
 msgstr "/ヘルプ(_H)/マニュアル(_M)/英語(_E)"
 
-#: src/mainwindow.c:791
+#: src/mainwindow.c:802
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/ヘルプ(_H)/マニュアル(_M)/日本語(_J)"
 
-#: src/mainwindow.c:792
+#: src/mainwindow.c:803
 msgid "/_Help/_FAQ"
 msgstr "/ヘルプ(_H)/_FAQ"
 
-#: src/mainwindow.c:793
+#: src/mainwindow.c:804
 msgid "/_Help/_FAQ/_English"
 msgstr "/ヘルプ(_H)/_FAQ/英語(_E)"
 
-#: src/mainwindow.c:794
+#: src/mainwindow.c:805
 msgid "/_Help/_FAQ/_German"
 msgstr "/ヘルプ(_H)/_FAQ/ドイツ語(_G)"
 
-#: src/mainwindow.c:795
+#: src/mainwindow.c:806
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/ヘルプ(_H)/_FAQ/スペイン語(_S)"
 
-#: src/mainwindow.c:796
+#: src/mainwindow.c:807
 msgid "/_Help/_FAQ/_French"
 msgstr "/ヘルプ(_H)/_FAQ/フランス語(_F)"
 
-#: src/mainwindow.c:797
+#: src/mainwindow.c:808
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/ヘルプ(_H)/_FAQ/イタリア語(_I)"
 
-#: src/mainwindow.c:798
+#: src/mainwindow.c:809
 msgid "/_Help/---"
 msgstr "/ヘルプ(_H)/---"
 
-#: src/mainwindow.c:841
+#: src/mainwindow.c:852
 msgid "Creating main window...\n"
 msgstr "メインウィンドウを作成中...\n"
 
-#: src/mainwindow.c:1011
+#: src/mainwindow.c:1022
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "MainWindow: 色の割り当て %d に失敗しました\n"
 
-#: src/mainwindow.c:1108 src/summaryview.c:2258 src/summaryview.c:2343
-#: src/summaryview.c:3739 src/summaryview.c:3868 src/summaryview.c:4226
+#: src/mainwindow.c:1119 src/summaryview.c:2275 src/summaryview.c:2360
+#: src/summaryview.c:3896 src/summaryview.c:4025 src/summaryview.c:4383
 msgid "done.\n"
 msgstr "完了。\n"
 
-#: src/mainwindow.c:1235 src/mainwindow.c:1276 src/mainwindow.c:1301
+#: src/mainwindow.c:1246 src/mainwindow.c:1287 src/mainwindow.c:1312
 msgid "Untitled"
 msgstr "名称未設定"
 
-#: src/mainwindow.c:1302
+#: src/mainwindow.c:1313
 msgid "none"
 msgstr "なし"
 
-#: src/mainwindow.c:1355
+#: src/mainwindow.c:1366
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "ウィンドウの分離タイプを %d から %d に変更しています\n"
 
-#: src/mainwindow.c:1605
+#: src/mainwindow.c:1616
 msgid "Offline"
 msgstr "オフライン"
 
-#: src/mainwindow.c:1606
+#: src/mainwindow.c:1617
 msgid "You are offline. Go online?"
 msgstr "現在オフラインです。オンラインにしますか?"
 
-#: src/mainwindow.c:1623
+#: src/mainwindow.c:1634
 msgid "Empty all trash"
 msgstr "すべてのごみ箱を空にする"
 
-#: src/mainwindow.c:1624
+#: src/mainwindow.c:1635
 msgid "Delete all messages in trash folders?"
 msgstr "ごみ箱の中のメッセージをすべて削除しますか?"
 
-#: src/mainwindow.c:1652
+#: src/mainwindow.c:1663
 msgid "Add mailbox"
 msgstr "メールボックスを追加"
 
-#: src/mainwindow.c:1653
+#: src/mainwindow.c:1664
 msgid ""
 "Specify the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3569,16 +3582,16 @@ msgstr ""
 "メールボックスの場所を入力してください。\n"
 "既存のメールボックスを指定するとその内容を自動的にスキャンします。"
 
-#: src/mainwindow.c:1659 src/setup.c:49
+#: src/mainwindow.c:1670 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "メールボックス `%s' はすでに存在します。"
 
-#: src/mainwindow.c:1664 src/setup.c:56
+#: src/mainwindow.c:1675 src/setup.c:56
 msgid "Mailbox"
 msgstr "メール箱"
 
-#: src/mainwindow.c:1670 src/setup.c:62
+#: src/mainwindow.c:1681 src/setup.c:62
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3587,145 +3600,145 @@ msgstr ""
 "メールボックスの作成に失敗しました。\n"
 "いくつかのファイルがすでに存在するか、あるいは書き込む権限がありません。"
 
-#: src/mainwindow.c:2088
+#: src/mainwindow.c:2099
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - フォルダビュー"
 
-#: src/mainwindow.c:2107
+#: src/mainwindow.c:2118
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - メッセージビュー"
 
-#: src/mainwindow.c:2259 src/summaryview.c:408
+#: src/mainwindow.c:2270 src/summaryview.c:408
 msgid "/_Reply"
 msgstr "/返信(_R)"
 
-#: src/mainwindow.c:2260
+#: src/mainwindow.c:2271
 msgid "/Reply to _all"
 msgstr "/全員に返信(_A)"
 
-#: src/mainwindow.c:2261
+#: src/mainwindow.c:2272
 msgid "/Reply to _sender"
 msgstr "/差出人に返信(_S)"
 
-#: src/mainwindow.c:2262
+#: src/mainwindow.c:2273
 msgid "/Reply to mailing _list"
 msgstr "/メーリングリストに返信(_L)"
 
-#: src/mainwindow.c:2267 src/summaryview.c:415
+#: src/mainwindow.c:2278 src/summaryview.c:415
 msgid "/_Forward"
 msgstr "/転送(_F)"
 
-#: src/mainwindow.c:2268 src/summaryview.c:416
+#: src/mainwindow.c:2279 src/summaryview.c:416
 msgid "/For_ward as attachment"
 msgstr "/添付として転送(_W)"
 
-#: src/mainwindow.c:2269 src/summaryview.c:417
+#: src/mainwindow.c:2280 src/summaryview.c:417
 msgid "/Redirec_t"
 msgstr "/手を加えずに転送(_T)"
 
-#: src/mainwindow.c:2305
+#: src/mainwindow.c:2316
 msgid "Get"
 msgstr "受信"
 
-#: src/mainwindow.c:2306
+#: src/mainwindow.c:2317
 msgid "Incorporate new mail"
 msgstr "新着メールの取込"
 
-#: src/mainwindow.c:2313
+#: src/mainwindow.c:2324
 msgid "Get all"
 msgstr "全受信"
 
-#: src/mainwindow.c:2314
+#: src/mainwindow.c:2325
 msgid "Incorporate new mail of all accounts"
 msgstr "全アカウントの新着メールの取込"
 
-#: src/mainwindow.c:2325
+#: src/mainwindow.c:2336
 msgid "Send queued message(s)"
 msgstr "送信待機中のメッセージを送信する"
 
-#: src/mainwindow.c:2335 src/prefs_account_dialog.c:530
+#: src/mainwindow.c:2346 src/prefs_account_dialog.c:530
 #: src/prefs_common_dialog.c:663 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "作成"
 
-#: src/mainwindow.c:2336
+#: src/mainwindow.c:2347
 msgid "Compose new message"
 msgstr "新規メッセージを作成"
 
-#: src/mainwindow.c:2344 src/prefs_common_dialog.c:975
+#: src/mainwindow.c:2355 src/prefs_common_dialog.c:975
 msgid "Reply"
 msgstr "返信"
 
-#: src/mainwindow.c:2345 src/mainwindow.c:2358
+#: src/mainwindow.c:2356 src/mainwindow.c:2369
 msgid "Reply to the message"
 msgstr "メッセージに返信する"
 
-#: src/mainwindow.c:2362
+#: src/mainwindow.c:2373
 msgid "Reply all"
 msgstr "全員に返信"
 
-#: src/mainwindow.c:2363
+#: src/mainwindow.c:2374
 msgid "Reply to all"
 msgstr "全員に返信"
 
-#: src/mainwindow.c:2371 src/prefs_filter_edit.c:672
+#: src/mainwindow.c:2382 src/prefs_filter_edit.c:672
 msgid "Forward"
 msgstr "転送"
 
-#: src/mainwindow.c:2372 src/mainwindow.c:2385
+#: src/mainwindow.c:2383 src/mainwindow.c:2396
 msgid "Forward the message"
 msgstr "メッセージを転送する"
 
-#: src/mainwindow.c:2392
+#: src/mainwindow.c:2403
 msgid "Delete the message"
 msgstr "メッセージを削除する"
 
-#: src/mainwindow.c:2401
+#: src/mainwindow.c:2412
 msgid "Set as junk mail"
 msgstr "迷惑メールに指定"
 
-#: src/mainwindow.c:2410
+#: src/mainwindow.c:2421
 msgid "Execute"
 msgstr "実行"
 
-#: src/mainwindow.c:2411
+#: src/mainwindow.c:2422
 msgid "Execute marked process"
 msgstr "マークされた処理を実行"
 
-#: src/mainwindow.c:2421
+#: src/mainwindow.c:2432
 msgid "Next unread message"
 msgstr "次の未読メッセージ"
 
-#: src/mainwindow.c:2433
+#: src/mainwindow.c:2444
 msgid "Prefs"
 msgstr "設定"
 
-#: src/mainwindow.c:2434
+#: src/mainwindow.c:2445
 msgid "Common preferences"
 msgstr "全般の設定"
 
-#: src/mainwindow.c:2442 src/prefs_folder_item.c:289
+#: src/mainwindow.c:2453 src/prefs_folder_item.c:289
 #: src/prefs_folder_item.c:300 src/progressdialog.c:128
 msgid "Account"
 msgstr "アカウント"
 
-#: src/mainwindow.c:2443
+#: src/mainwindow.c:2454
 msgid "Account setting"
 msgstr "アカウントの設定"
 
-#: src/mainwindow.c:2615
+#: src/mainwindow.c:2626
 msgid "You are offline. Click the icon to go online."
 msgstr "現在オフラインです。アイコンをクリックするとオンラインになります。"
 
-#: src/mainwindow.c:2626
+#: src/mainwindow.c:2637
 msgid "You are online. Click the icon to go offline."
 msgstr "現在オンラインです。アイコンをクリックするとオフラインになります。"
 
-#: src/mainwindow.c:2892
+#: src/mainwindow.c:2903
 msgid "Exit"
 msgstr "終了"
 
-#: src/mainwindow.c:2892
+#: src/mainwindow.c:2903
 msgid "Exit this program?"
 msgstr "このプログラムを終了しますか?"
 
@@ -3762,44 +3775,44 @@ msgstr "メッセージの終わりまで検索しました。始めから検索
 msgid "Search finished"
 msgstr "検索完了"
 
-#: src/messageview.c:261
+#: src/messageview.c:266
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/ツール(_T)/差出人をアドレス帳に追加(_K)"
 
-#: src/messageview.c:291
+#: src/messageview.c:296
 msgid "Creating message view...\n"
 msgstr "メッセージビューを作成中...\n"
 
-#: src/messageview.c:316
+#: src/messageview.c:321
 msgid "Text"
 msgstr "テキスト"
 
-#: src/messageview.c:321
+#: src/messageview.c:326
 msgid "Attachments"
 msgstr "添付"
 
-#: src/messageview.c:371
+#: src/messageview.c:376
 msgid "Message View - Sylpheed"
 msgstr "メッセージビュー - Sylpheed"
 
-#: src/messageview.c:669 src/summaryview.c:3268
+#: src/messageview.c:674 src/summaryview.c:3425
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "ファイル `%s' を保存できません。"
 
-#: src/messageview.c:728 src/summaryview.c:3291
+#: src/messageview.c:733 src/summaryview.c:3448
 msgid "The message will be printed with the following command:"
 msgstr "メッセージを以下のコマンドで印刷します:"
 
-#: src/messageview.c:729 src/summaryview.c:3292
+#: src/messageview.c:734 src/summaryview.c:3449
 msgid "(Default print command)"
 msgstr "(既定の印刷コマンド)"
 
-#: src/messageview.c:731 src/prefs_common_dialog.c:2304 src/summaryview.c:3294
+#: src/messageview.c:736 src/prefs_common_dialog.c:2304 src/summaryview.c:3451
 msgid "Print"
 msgstr "印刷"
 
-#: src/messageview.c:740 src/summaryview.c:3303
+#: src/messageview.c:745 src/summaryview.c:3460
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -4685,8 +4698,8 @@ msgstr "差出人が自分の場合は `差出人' カラムに宛先を表示�
 msgid "Expand threads"
 msgstr "スレッドを展開する"
 
-#: src/prefs_common_dialog.c:1413 src/prefs_common_dialog.c:2713
-#: src/prefs_common_dialog.c:2751
+#: src/prefs_common_dialog.c:1413 src/prefs_common_dialog.c:2716
+#: src/prefs_common_dialog.c:2754
 msgid "Date format"
 msgstr "日付の書式"
 
@@ -4967,8 +4980,8 @@ msgstr "外部コマンド (%s はファイル名・URIで置き換えられま�
 msgid "Web browser"
 msgstr "Webブラウザ"
 
-#: src/prefs_common_dialog.c:2288 src/prefs_common_dialog.c:3775
-#: src/prefs_common_dialog.c:3796
+#: src/prefs_common_dialog.c:2288 src/prefs_common_dialog.c:3778
+#: src/prefs_common_dialog.c:3799
 msgid "(Default browser)"
 msgstr "(既定のブラウザ)"
 
@@ -5043,214 +5056,222 @@ msgid "Greek (ISO-8859-7)"
 msgstr "ギリシャ語 (ISO-8859-7)"
 
 #: src/prefs_common_dialog.c:2495
+msgid "Arabic (ISO-8859-6)"
+msgstr "アラビア語 (ISO-8859-4)"
+
+#: src/prefs_common_dialog.c:2496
+msgid "Arabic (Windows-1256)"
+msgstr "アラビア語 (Windows-1251)"
+
+#: src/prefs_common_dialog.c:2498
 msgid "Hebrew (ISO-8859-8)"
 msgstr "ヘブライ語 (ISO-8859-8)"
 
-#: src/prefs_common_dialog.c:2496
+#: src/prefs_common_dialog.c:2499
 msgid "Hebrew (Windows-1255)"
 msgstr "ヘブライ語 (Windows-1255)"
 
-#: src/prefs_common_dialog.c:2498
+#: src/prefs_common_dialog.c:2501
 msgid "Turkish (ISO-8859-9)"
 msgstr "トルコ語 (ISO-8859-9)"
 
-#: src/prefs_common_dialog.c:2500
+#: src/prefs_common_dialog.c:2503
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "キリル文字 (ISO-8859-5)"
 
-#: src/prefs_common_dialog.c:2501
+#: src/prefs_common_dialog.c:2504
 msgid "Cyrillic (KOI8-R)"
 msgstr "キリル文字 (KOI8-R)"
 
-#: src/prefs_common_dialog.c:2502
+#: src/prefs_common_dialog.c:2505
 msgid "Cyrillic (KOI8-U)"
 msgstr "キリル文字 (KOI8-U)"
 
-#: src/prefs_common_dialog.c:2503
+#: src/prefs_common_dialog.c:2506
 msgid "Cyrillic (Windows-1251)"
 msgstr "キリル文字 (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2505
+#: src/prefs_common_dialog.c:2508
 msgid "Japanese (ISO-2022-JP)"
 msgstr "日本語 (ISO-2022-JP)"
 
-#: src/prefs_common_dialog.c:2507
+#: src/prefs_common_dialog.c:2510
 msgid "Japanese (EUC-JP)"
 msgstr "日本語 (EUC-JP)"
 
-#: src/prefs_common_dialog.c:2508
+#: src/prefs_common_dialog.c:2511
 msgid "Japanese (Shift_JIS)"
 msgstr "日本語 (Shift_JIS)"
 
-#: src/prefs_common_dialog.c:2511
+#: src/prefs_common_dialog.c:2514
 msgid "Simplified Chinese (GB2312)"
 msgstr "簡体字中国語 (GB2312)"
 
-#: src/prefs_common_dialog.c:2512
+#: src/prefs_common_dialog.c:2515
 msgid "Simplified Chinese (GBK)"
 msgstr "簡体字中国語 (GBK)"
 
-#: src/prefs_common_dialog.c:2513
+#: src/prefs_common_dialog.c:2516
 msgid "Traditional Chinese (Big5)"
 msgstr "繁体字中国語 (Big5)"
 
-#: src/prefs_common_dialog.c:2515
+#: src/prefs_common_dialog.c:2518
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "繁体字中国語 (EUC-TW)"
 
-#: src/prefs_common_dialog.c:2516
+#: src/prefs_common_dialog.c:2519
 msgid "Chinese (ISO-2022-CN)"
 msgstr "中国語 (ISO-2022-CN)"
 
-#: src/prefs_common_dialog.c:2519
+#: src/prefs_common_dialog.c:2522
 msgid "Korean (EUC-KR)"
 msgstr "韓国語 (EUC-KR)"
 
-#: src/prefs_common_dialog.c:2521
+#: src/prefs_common_dialog.c:2524
 msgid "Thai (TIS-620)"
 msgstr "タイ語 (TIS-620)"
 
-#: src/prefs_common_dialog.c:2522
+#: src/prefs_common_dialog.c:2525
 msgid "Thai (Windows-874)"
 msgstr "タイ語 (Windows-874)"
 
-#: src/prefs_common_dialog.c:2689
+#: src/prefs_common_dialog.c:2692
 msgid "the full abbreviated weekday name"
 msgstr "曜日の省略名"
 
-#: src/prefs_common_dialog.c:2690
+#: src/prefs_common_dialog.c:2693
 msgid "the full weekday name"
 msgstr "曜日の完全な名前"
 
-#: src/prefs_common_dialog.c:2691
+#: src/prefs_common_dialog.c:2694
 msgid "the abbreviated month name"
 msgstr "月の省略名"
 
-#: src/prefs_common_dialog.c:2692
+#: src/prefs_common_dialog.c:2695
 msgid "the full month name"
 msgstr "月の完全な名前"
 
-#: src/prefs_common_dialog.c:2693
+#: src/prefs_common_dialog.c:2696
 msgid "the preferred date and time for the current locale"
 msgstr "現在の地域における一般的な日付と時刻の表記"
 
-#: src/prefs_common_dialog.c:2694
+#: src/prefs_common_dialog.c:2697
 msgid "the century number (year/100)"
 msgstr "世紀(西暦年の上2桁)"
 
-#: src/prefs_common_dialog.c:2695
+#: src/prefs_common_dialog.c:2698
 msgid "the day of the month as a decimal number"
 msgstr "日(10進数表記)"
 
-#: src/prefs_common_dialog.c:2696
+#: src/prefs_common_dialog.c:2699
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "24時間時計での時"
 
-#: src/prefs_common_dialog.c:2697
+#: src/prefs_common_dialog.c:2700
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "12時間時計での時"
 
-#: src/prefs_common_dialog.c:2698
+#: src/prefs_common_dialog.c:2701
 msgid "the day of the year as a decimal number"
 msgstr "年の初めから通算の日数(10進数表記)"
 
-#: src/prefs_common_dialog.c:2699
+#: src/prefs_common_dialog.c:2702
 msgid "the month as a decimal number"
 msgstr "月(10進数表記)"
 
-#: src/prefs_common_dialog.c:2700
+#: src/prefs_common_dialog.c:2703
 msgid "the minute as a decimal number"
 msgstr "分(10進数表記)"
 
-#: src/prefs_common_dialog.c:2701
+#: src/prefs_common_dialog.c:2704
 msgid "either AM or PM"
 msgstr "午前または午後"
 
-#: src/prefs_common_dialog.c:2702
+#: src/prefs_common_dialog.c:2705
 msgid "the second as a decimal number"
 msgstr "秒(10進数表記)"
 
-#: src/prefs_common_dialog.c:2703
+#: src/prefs_common_dialog.c:2706
 msgid "the day of the week as a decimal number"
 msgstr "週の何番目の日か(10進数表記)"
 
-#: src/prefs_common_dialog.c:2704
+#: src/prefs_common_dialog.c:2707
 msgid "the preferred date for the current locale"
 msgstr "現在の地域における一般的な日付表記"
 
-#: src/prefs_common_dialog.c:2705
+#: src/prefs_common_dialog.c:2708
 msgid "the last two digits of a year"
 msgstr "西暦の下2桁(世紀部分を含まない年)"
 
-#: src/prefs_common_dialog.c:2706
+#: src/prefs_common_dialog.c:2709
 msgid "the year as a decimal number"
 msgstr "(4桁の)西暦年"
 
-#: src/prefs_common_dialog.c:2707
+#: src/prefs_common_dialog.c:2710
 msgid "the time zone or name or abbreviation"
 msgstr "タイムゾーンまたはゾーン名または省略名"
 
-#: src/prefs_common_dialog.c:2728
+#: src/prefs_common_dialog.c:2731
 msgid "Specifier"
 msgstr "指定子"
 
-#: src/prefs_common_dialog.c:2729
+#: src/prefs_common_dialog.c:2732
 msgid "Description"
 msgstr "説明"
 
-#: src/prefs_common_dialog.c:2769
+#: src/prefs_common_dialog.c:2772
 msgid "Example"
 msgstr "例"
 
-#: src/prefs_common_dialog.c:2850
+#: src/prefs_common_dialog.c:2853
 msgid "Set message colors"
 msgstr "メッセージの色を指定"
 
-#: src/prefs_common_dialog.c:2858
+#: src/prefs_common_dialog.c:2861
 msgid "Colors"
 msgstr "色"
 
-#: src/prefs_common_dialog.c:2892
+#: src/prefs_common_dialog.c:2895
 msgid "Quoted Text - First Level"
 msgstr "引用文 - 1段階"
 
-#: src/prefs_common_dialog.c:2898
+#: src/prefs_common_dialog.c:2901
 msgid "Quoted Text - Second Level"
 msgstr "引用文 - 2段階"
 
-#: src/prefs_common_dialog.c:2904
+#: src/prefs_common_dialog.c:2907
 msgid "Quoted Text - Third Level"
 msgstr "引用文 - 3段階"
 
-#: src/prefs_common_dialog.c:2910
+#: src/prefs_common_dialog.c:2913
 msgid "URI link"
 msgstr "URI リンク"
 
-#: src/prefs_common_dialog.c:2917
+#: src/prefs_common_dialog.c:2920
 msgid "Recycle quote colors"
 msgstr "引用色を循環"
 
-#: src/prefs_common_dialog.c:2984
+#: src/prefs_common_dialog.c:2987
 msgid "Pick color for quotation level 1"
 msgstr "引用レベル1の色を選択"
 
-#: src/prefs_common_dialog.c:2987
+#: src/prefs_common_dialog.c:2990
 msgid "Pick color for quotation level 2"
 msgstr "引用レベル2の色を選択"
 
-#: src/prefs_common_dialog.c:2990
+#: src/prefs_common_dialog.c:2993
 msgid "Pick color for quotation level 3"
 msgstr "引用レベル3の色を選択"
 
-#: src/prefs_common_dialog.c:2993
+#: src/prefs_common_dialog.c:2996
 msgid "Pick color for URI"
 msgstr "URI の色を選択"
 
-#: src/prefs_common_dialog.c:3133
+#: src/prefs_common_dialog.c:3136
 msgid "Description of symbols"
 msgstr "記号の説明"
 
-#: src/prefs_common_dialog.c:3189
+#: src/prefs_common_dialog.c:3192
 msgid ""
 "Date\n"
 "From\n"
@@ -5274,11 +5295,11 @@ msgstr ""
 "ニュースグループ\n"
 "メッセージID"
 
-#: src/prefs_common_dialog.c:3202
+#: src/prefs_common_dialog.c:3205
 msgid "If x is set, displays expr"
 msgstr "xが指定されていればexprを表示"
 
-#: src/prefs_common_dialog.c:3206
+#: src/prefs_common_dialog.c:3209
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -5292,7 +5313,7 @@ msgstr ""
 "引用符付きメッセージ本文(署名なし)\n"
 "文字 %"
 
-#: src/prefs_common_dialog.c:3214
+#: src/prefs_common_dialog.c:3217
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -5304,19 +5325,19 @@ msgstr ""
 "文字 開き中括弧\n"
 "文字 閉じ中括弧"
 
-#: src/prefs_common_dialog.c:3260
+#: src/prefs_common_dialog.c:3263
 msgid "Key bindings"
 msgstr "キーバインド"
 
-#: src/prefs_common_dialog.c:3273
+#: src/prefs_common_dialog.c:3276
 msgid "Select the preset of key bindings."
 msgstr " キーバインドのプリセットを選択してください。"
 
-#: src/prefs_common_dialog.c:3283 src/prefs_common_dialog.c:3607
+#: src/prefs_common_dialog.c:3286 src/prefs_common_dialog.c:3610
 msgid "Default"
 msgstr "標準"
 
-#: src/prefs_common_dialog.c:3286 src/prefs_common_dialog.c:3616
+#: src/prefs_common_dialog.c:3289 src/prefs_common_dialog.c:3619
 msgid "Old Sylpheed"
 msgstr "旧Sylpheed"
 
@@ -5437,7 +5458,7 @@ msgstr "コマンドの実行結果"
 msgid "Age"
 msgstr "経過日数"
 
-#: src/prefs_filter_edit.c:501 src/summaryview.c:510
+#: src/prefs_filter_edit.c:501 src/summaryview.c:512
 msgid "Marked"
 msgstr "マーク付き"
 
@@ -5661,17 +5682,17 @@ msgid "Attachment"
 msgstr "添付"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73 src/query_search.c:371 src/summaryview.c:4733
+#: src/prefs_summary_column.c:73 src/query_search.c:371 src/summaryview.c:4890
 msgid "Subject"
 msgstr "件名"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/query_search.c:372 src/summaryview.c:4736
+#: src/prefs_summary_column.c:74 src/query_search.c:372 src/summaryview.c:4893
 msgid "From"
 msgstr "差出人"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/query_search.c:373 src/summaryview.c:4738
+#: src/prefs_summary_column.c:75 src/query_search.c:373 src/summaryview.c:4895
 msgid "Date"
 msgstr "日付"
 
@@ -5772,7 +5793,7 @@ msgstr "メッセージを検索"
 msgid "_Save as search folder"
 msgstr "検索フォルダとして保存(_S)"
 
-#: src/query_search.c:512 src/subscribedialog.c:523 src/summaryview.c:840
+#: src/query_search.c:512 src/subscribedialog.c:523 src/summaryview.c:842
 msgid "Done."
 msgstr "完了."
 
@@ -5786,7 +5807,7 @@ msgstr "%s を検索中..."
 msgid "Searching %s (%d / %d)..."
 msgstr "%s を検索中 (%d / %d)..."
 
-#: src/query_search.c:645 src/summaryview.c:2048
+#: src/query_search.c:645 src/summaryview.c:2051
 msgid "(No Date)"
 msgstr "(日付なし)"
 
@@ -6155,298 +6176,302 @@ msgid "/_Mark/Mark as rea_d"
 msgstr "/マーク(_M)/読んだことにする(_D)"
 
 #: src/summaryview.c:429
+msgid "/_Mark/Mark _thread as read"
+msgstr "/マーク(_M)/スレッドを読んだことにする(_T)"
+
+#: src/summaryview.c:431
 msgid "/_Mark/Mark all _read"
 msgstr "/マーク(_M)/すべて読んだことにする(_R)"
 
-#: src/summaryview.c:430
+#: src/summaryview.c:432
 msgid "/Color la_bel"
 msgstr "/カラーラベル(_B)"
 
-#: src/summaryview.c:434
+#: src/summaryview.c:436
 msgid "/Re-_edit"
 msgstr "/再編集(_E)"
 
-#: src/summaryview.c:436
+#: src/summaryview.c:438
 msgid "/Add sender to address boo_k..."
 msgstr "/差出人をアドレス帳に追加(_K)..."
 
-#: src/summaryview.c:438
+#: src/summaryview.c:440
 msgid "/Create f_ilter rule"
 msgstr "/振り分けルールを作成(_I)"
 
-#: src/summaryview.c:439
+#: src/summaryview.c:441
 msgid "/Create f_ilter rule/_Automatically"
 msgstr "/振り分けルールを作成(_I)/自動(_A)"
 
-#: src/summaryview.c:441
+#: src/summaryview.c:443
 msgid "/Create f_ilter rule/by _From"
 msgstr "/振り分けルールを作成(_I)/_Fromから"
 
-#: src/summaryview.c:443
+#: src/summaryview.c:445
 msgid "/Create f_ilter rule/by _To"
 msgstr "/振り分けルールを作成(_I)/_Toから"
 
-#: src/summaryview.c:445
+#: src/summaryview.c:447
 msgid "/Create f_ilter rule/by _Subject"
 msgstr "/振り分けルールを作成(_I)/_Subjectから"
 
-#: src/summaryview.c:451
+#: src/summaryview.c:453
 msgid "/_View/_Source"
 msgstr "/表示(_V)/ソース(_S)"
 
-#: src/summaryview.c:452
+#: src/summaryview.c:454
 msgid "/_View/All _header"
 msgstr "/表示(_V)/すべてのヘッダ(_H)"
 
-#: src/summaryview.c:454
+#: src/summaryview.c:456
 msgid "/_Print..."
 msgstr "/印刷(_P)..."
 
-#: src/summaryview.c:486
+#: src/summaryview.c:488
 msgid "Creating summary view...\n"
 msgstr "サマリビューを作成中...\n"
 
-#: src/summaryview.c:508
+#: src/summaryview.c:510
 msgid "All"
 msgstr "すべて"
 
-#: src/summaryview.c:511
+#: src/summaryview.c:513
 msgid "Have color label"
 msgstr "カラーラベル付き"
 
-#: src/summaryview.c:512
+#: src/summaryview.c:514
 msgid "Have attachment"
 msgstr "添付ファイル付き"
 
-#: src/summaryview.c:521
+#: src/summaryview.c:523
 msgid "Search:"
 msgstr "検索:"
 
-#: src/summaryview.c:535
+#: src/summaryview.c:537
 msgid "Search for Subject or From"
 msgstr "件名または差出人を検索"
 
-#: src/summaryview.c:702
+#: src/summaryview.c:704
 msgid "Process mark"
 msgstr "マークの処理"
 
-#: src/summaryview.c:703
+#: src/summaryview.c:705
 msgid "Some marks are left. Process it?"
 msgstr "マークが残っています。処理しますか?"
 
-#: src/summaryview.c:749
+#: src/summaryview.c:751
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "フォルダをスキャン中 (%s)..."
 
-#: src/summaryview.c:1292
+#: src/summaryview.c:1295
 msgid "_Search again"
 msgstr "再検索(_S)"
 
-#: src/summaryview.c:1313 src/summaryview.c:1322
+#: src/summaryview.c:1316 src/summaryview.c:1325
 msgid "No more unread messages"
 msgstr "未読メッセージなし"
 
-#: src/summaryview.c:1314
+#: src/summaryview.c:1317
 msgid "No unread message found. Search from the end?"
 msgstr "未読メッセージがありません。最後から検索しますか?"
 
-#: src/summaryview.c:1316
+#: src/summaryview.c:1319
 msgid "No unread messages."
 msgstr "未読メッセージがありません。"
 
-#: src/summaryview.c:1323
+#: src/summaryview.c:1326
 msgid "No unread message found. Go to next folder?"
 msgstr "未読メッセージがありません。次のフォルダに移動しますか?"
 
-#: src/summaryview.c:1331 src/summaryview.c:1340
+#: src/summaryview.c:1334 src/summaryview.c:1343
 msgid "No more new messages"
 msgstr "新着メッセージなし"
 
-#: src/summaryview.c:1332
+#: src/summaryview.c:1335
 msgid "No new message found. Search from the end?"
 msgstr "新着メッセージがありません。最後から検索しますか?"
 
-#: src/summaryview.c:1334
+#: src/summaryview.c:1337
 msgid "No new messages."
 msgstr "新着メッセージがありません。"
 
-#: src/summaryview.c:1341
+#: src/summaryview.c:1344
 msgid "No new message found. Go to next folder?"
 msgstr "新着メッセージがありません。次のフォルダに移動しますか?"
 
-#: src/summaryview.c:1349 src/summaryview.c:1358
+#: src/summaryview.c:1352 src/summaryview.c:1361
 msgid "No more marked messages"
 msgstr "マーク付きメッセージなし"
 
-#: src/summaryview.c:1350
+#: src/summaryview.c:1353
 msgid "No marked message found. Search from the end?"
 msgstr "マーク付きメッセージがありません。最後から検索しますか?"
 
-#: src/summaryview.c:1352 src/summaryview.c:1361
+#: src/summaryview.c:1355 src/summaryview.c:1364
 msgid "No marked messages."
 msgstr "マーク付きメッセージがありません。"
 
-#: src/summaryview.c:1359
+#: src/summaryview.c:1362
 msgid "No marked message found. Search from the beginning?"
 msgstr "マーク付きメッセージがありません。最初から検索しますか?"
 
-#: src/summaryview.c:1367 src/summaryview.c:1376
+#: src/summaryview.c:1370 src/summaryview.c:1379
 msgid "No more labeled messages"
 msgstr "ラベル付きメッセージなし"
 
-#: src/summaryview.c:1368
+#: src/summaryview.c:1371
 msgid "No labeled message found. Search from the end?"
 msgstr "ラベル付きメッセージがありません。最後から検索しますか?"
 
-#: src/summaryview.c:1370 src/summaryview.c:1379
+#: src/summaryview.c:1373 src/summaryview.c:1382
 msgid "No labeled messages."
 msgstr "ラベル付きメッセージがありません。"
 
-#: src/summaryview.c:1377
+#: src/summaryview.c:1380
 msgid "No labeled message found. Search from the beginning?"
 msgstr "ラベル付きメッセージがありません。最初から検索しますか?"
 
-#: src/summaryview.c:1693
+#: src/summaryview.c:1696
 msgid "Attracting messages by subject..."
 msgstr "メッセージを件名でまとめています..."
 
-#: src/summaryview.c:1887
+#: src/summaryview.c:1890
 #, c-format
 msgid "%d deleted"
 msgstr "%d 通削除"
 
-#: src/summaryview.c:1891
+#: src/summaryview.c:1894
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d 通移動"
 
-#: src/summaryview.c:1892 src/summaryview.c:1897
+#: src/summaryview.c:1895 src/summaryview.c:1900
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:1896
+#: src/summaryview.c:1899
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d 通コピー"
 
-#: src/summaryview.c:1911
+#: src/summaryview.c:1914
 msgid " item(s) selected"
 msgstr " 通選択"
 
-#: src/summaryview.c:1933
+#: src/summaryview.c:1936
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "新着 %d 通, 未読 %d 通, 総数 %d 通 (%s)"
 
-#: src/summaryview.c:1937
+#: src/summaryview.c:1940
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "新着 %d 通, 未読 %d 通, 総数 %d 通"
 
-#: src/summaryview.c:1971
+#: src/summaryview.c:1974
 msgid "Sorting summary..."
 msgstr "サマリをソート中..."
 
-#: src/summaryview.c:2194
+#: src/summaryview.c:2211
 msgid "\tSetting summary from message data..."
 msgstr "\tメッセージデータからサマリを設定中..."
 
-#: src/summaryview.c:2196
+#: src/summaryview.c:2213
 msgid "Setting summary from message data..."
 msgstr "メッセージデータからサマリを設定中..."
 
-#: src/summaryview.c:2302
+#: src/summaryview.c:2319
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "サマリキャッシュを書き込み中 (%s)..."
 
-#: src/summaryview.c:2643
+#: src/summaryview.c:2660
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "メッセージ %d をマークしました\n"
 
-#: src/summaryview.c:2701
+#: src/summaryview.c:2718
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "メッセージ %d を既読としてマークしました\n"
 
-#: src/summaryview.c:2789
+#: src/summaryview.c:2908
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "メッセージ %d を未読としてマークしました\n"
 
-#: src/summaryview.c:2850
+#: src/summaryview.c:2969
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "メッセージ %s/%d を削除するようにセットしました\n"
 
-#: src/summaryview.c:2878
+#: src/summaryview.c:2997
 msgid "Delete message(s)"
 msgstr "メッセージの削除"
 
-#: src/summaryview.c:2879
+#: src/summaryview.c:2998
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "本当にごみ箱からメッセージを削除してもいいですか?"
 
-#: src/summaryview.c:2953
+#: src/summaryview.c:3072
 msgid "Deleting duplicated messages..."
 msgstr "重複メッセージを削除しています..."
 
-#: src/summaryview.c:2991
+#: src/summaryview.c:3110
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "メッセージ %s/%d をマーク解除しました\n"
 
-#: src/summaryview.c:3049
+#: src/summaryview.c:3168
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "メッセージ %d を %s に移動するようにセットしました\n"
 
-#: src/summaryview.c:3066
+#: src/summaryview.c:3196
 msgid "Destination is same as current folder."
 msgstr "移動先が現在のフォルダと同じです。"
 
-#: src/summaryview.c:3122
+#: src/summaryview.c:3260
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "メッセージ %d を %s にコピーするようにセットしました\n"
 
-#: src/summaryview.c:3139
+#: src/summaryview.c:3288
 msgid "Destination for copy is same as current folder."
 msgstr "コピー先が現在のフォルダと同じです。"
 
-#: src/summaryview.c:3338
+#: src/summaryview.c:3495
 msgid "Error occurred while processing messages."
 msgstr "メッセージの処理中にエラーが発生しました。"
 
-#: src/summaryview.c:3646 src/summaryview.c:3647
+#: src/summaryview.c:3803 src/summaryview.c:3804
 msgid "Building threads..."
 msgstr "スレッドを構築中..."
 
-#: src/summaryview.c:3797 src/summaryview.c:3798
+#: src/summaryview.c:3954 src/summaryview.c:3955
 msgid "Unthreading..."
 msgstr "スレッドを解除中..."
 
-#: src/summaryview.c:4091 src/summaryview.c:4147
+#: src/summaryview.c:4248 src/summaryview.c:4304
 #, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "振り分け中 (%d / %d)..."
 
-#: src/summaryview.c:4196
+#: src/summaryview.c:4353
 msgid "filtering..."
 msgstr "振り分け中..."
 
-#: src/summaryview.c:4197
+#: src/summaryview.c:4354
 msgid "Filtering..."
 msgstr "振り分け中..."
 
-#: src/summaryview.c:4233
+#: src/summaryview.c:4390
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "%d 通のメッセージが振り分けられました。"
 
-#: src/summaryview.c:4742
+#: src/summaryview.c:4899
 msgid "No."
 msgstr "番号"
 
@@ -6463,31 +6488,31 @@ msgstr "テキストビューを作成中...\n"
 msgid "This message can't be displayed.\n"
 msgstr "このメッセージは表示できません。\n"
 
-#: src/textview.c:1929
+#: src/textview.c:1925
 msgid "Sa_ve this image as..."
 msgstr "画像を保存(_V)..."
 
-#: src/textview.c:1945 src/trayicon.c:109
+#: src/textview.c:1941 src/trayicon.c:109
 msgid "Compose _new message"
 msgstr "新規メッセージを作成(_N)"
 
-#: src/textview.c:1947
+#: src/textview.c:1943
 msgid "Add to address _book..."
 msgstr "アドレス帳に追加(_B)..."
 
-#: src/textview.c:1949
+#: src/textview.c:1945
 msgid "Copy this add_ress"
 msgstr "アドレスをコピー(_R)"
 
-#: src/textview.c:1952
+#: src/textview.c:1948
 msgid "_Open with Web browser"
 msgstr "Webブラウザで開く(_O)"
 
-#: src/textview.c:1954
+#: src/textview.c:1950
 msgid "Copy this _link"
 msgstr "リンクをコピー(_L)"
 
-#: src/textview.c:2097
+#: src/textview.c:2093
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6500,7 +6525,7 @@ msgstr ""
 "\n"
 "とにかく開きますか?"
 
-#: src/textview.c:2102
+#: src/textview.c:2098
 msgid "Fake URL warning"
 msgstr "偽装URLの警告"
 
@@ -6523,6 +6548,3 @@ msgstr "このプログラムについて(_A)"
 #: src/trayicon.c:119
 msgid "E_xit"
 msgstr "終了(_X)"
-
-#~ msgid "Wrap before sending"
-#~ msgstr "送信時に自動整形する"
diff --git a/po/ko.po b/po/ko.po
index 92adab7c..edf294ec 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: 2006-01-27 18:11+0900\n"
+"POT-Creation-Date: 2006-01-31 15:20+0900\n"
 "PO-Revision-Date: 2002-12-02 11:09+0900\n"
 "Last-Translator: Nam SungHyun <namsh@kldp.org>\n"
 "Language-Team: Korean <gnome-kr-translation@lists.sourceforge.net>\n"
@@ -508,7 +508,7 @@ msgstr "%s을 발견\n"
 msgid "Configuration is saved.\n"
 msgstr "설정이 저장되었습니다.\n"
 
-#: libsylph/prefs_common.c:489
+#: libsylph/prefs_common.c:491
 #, fuzzy
 msgid "Junk mail filter"
 msgstr "폴더"
@@ -625,8 +625,8 @@ msgstr ""
 msgid "%.2fGB"
 msgstr ""
 
-#: libsylph/utils.c:2373 src/compose.c:2858 src/compose.c:3121
-#: src/compose.c:3184 src/compose.c:3304
+#: libsylph/utils.c:2373 src/compose.c:2867 src/compose.c:3130
+#: src/compose.c:3193 src/compose.c:3313
 msgid "can't change file mode\n"
 msgstr "파일 모드를 바꿀수가 없습니다\n"
 
@@ -700,8 +700,8 @@ msgstr ""
 "새 메시지는 이 순서대로 확인될 것입니다. `모두 받기'로 메시지를\n"
 "받으려면 `G' 컬럼 상자를 선택하세요."
 
-#: src/account_dialog.c:366 src/addressadd.c:192 src/addressbook.c:491
-#: src/compose.c:4262 src/editaddress.c:200 src/editaddress.c:942
+#: src/account_dialog.c:366 src/addressadd.c:192 src/addressbook.c:493
+#: src/compose.c:4271 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:206 src/prefs_filter.c:259 src/prefs_folder_item.c:171
@@ -837,12 +837,12 @@ msgstr ""
 msgid "Add Address to Book"
 msgstr "주소록에 추가"
 
-#: src/addressadd.c:202 src/compose.c:4762 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4771 src/editaddress.c:201
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "주소"
 
-#: src/addressadd.c:212 src/addressbook.c:493 src/editaddress.c:202
+#: src/addressadd.c:212 src/addressbook.c:495 src/editaddress.c:202
 #: src/editaddress.c:795 src/editaddress.c:860 src/editgroup.c:267
 msgid "Remarks"
 msgstr "메모"
@@ -851,183 +851,183 @@ msgstr "메모"
 msgid "Select Address Book Folder"
 msgstr "주소록 폴더 선택"
 
-#: src/addressbook.c:336 src/compose.c:515 src/mainwindow.c:477
+#: src/addressbook.c:338 src/compose.c:515 src/mainwindow.c:480
 #: src/messageview.c:138
 msgid "/_File"
 msgstr "/파일(_F)"
 
-#: src/addressbook.c:337
+#: src/addressbook.c:339
 msgid "/_File/New _Book"
 msgstr "/파일(_F)/새 주소록(_B)"
 
-#: src/addressbook.c:338
+#: src/addressbook.c:340
 msgid "/_File/New _vCard"
 msgstr "/파일(_F)/새 vCard(_v)"
 
-#: src/addressbook.c:340
+#: src/addressbook.c:342
 msgid "/_File/New _JPilot"
 msgstr "/파일(_F)/새 JPilot(_J)"
 
-#: src/addressbook.c:343
+#: src/addressbook.c:345
 msgid "/_File/New _Server"
 msgstr "/파일(_F)/새 서버(_S)"
 
-#: src/addressbook.c:345 src/addressbook.c:348 src/compose.c:520
-#: src/compose.c:525 src/compose.c:528 src/compose.c:531 src/mainwindow.c:495
-#: src/mainwindow.c:498 src/mainwindow.c:500 src/mainwindow.c:503
-#: src/mainwindow.c:505 src/messageview.c:141
+#: src/addressbook.c:347 src/addressbook.c:350 src/compose.c:520
+#: src/compose.c:525 src/compose.c:528 src/compose.c:531 src/mainwindow.c:498
+#: src/mainwindow.c:501 src/mainwindow.c:503 src/mainwindow.c:506
+#: src/mainwindow.c:508 src/messageview.c:141
 msgid "/_File/---"
 msgstr "/파일(_F)/---"
 
-#: src/addressbook.c:346
+#: src/addressbook.c:348
 msgid "/_File/_Edit"
 msgstr "/파일(_F)/편집(_E)"
 
-#: src/addressbook.c:347
+#: src/addressbook.c:349
 msgid "/_File/_Delete"
 msgstr "/파일(_F)/삭제(_D)"
 
-#: src/addressbook.c:349
+#: src/addressbook.c:351
 msgid "/_File/_Save"
 msgstr "/파일(_F)/저장(_S)"
 
-#: src/addressbook.c:350 src/compose.c:532 src/messageview.c:142
+#: src/addressbook.c:352 src/compose.c:532 src/messageview.c:142
 msgid "/_File/_Close"
 msgstr "/파일(_F)/닫기(_C)"
 
-#: src/addressbook.c:351
+#: src/addressbook.c:353
 msgid "/_Address"
 msgstr "/주소(_A)"
 
-#: src/addressbook.c:352
+#: src/addressbook.c:354
 msgid "/_Address/New _Address"
 msgstr "/주소(_A)/새 주소(_A)"
 
-#: src/addressbook.c:353
+#: src/addressbook.c:355
 msgid "/_Address/New _Group"
 msgstr "/주소(_A)/새 그룹(_G)"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:356
 msgid "/_Address/New _Folder"
 msgstr "/주소(_A)/새 폴더(_F)"
 
-#: src/addressbook.c:355
+#: src/addressbook.c:357
 msgid "/_Address/---"
 msgstr "/주소(_A)/---"
 
-#: src/addressbook.c:356
+#: src/addressbook.c:358
 msgid "/_Address/_Edit"
 msgstr "/주소(_A)/편집(_E)"
 
-#: src/addressbook.c:357
+#: src/addressbook.c:359
 msgid "/_Address/_Delete"
 msgstr "/주소(_A)/삭제(_D)"
 
-#: src/addressbook.c:358 src/compose.c:639 src/mainwindow.c:738
-#: src/messageview.c:259
+#: src/addressbook.c:360 src/compose.c:645 src/mainwindow.c:749
+#: src/messageview.c:264
 msgid "/_Tools"
 msgstr "/도구(_T)"
 
-#: src/addressbook.c:359
+#: src/addressbook.c:361
 msgid "/_Tools/Import _LDIF file"
 msgstr "/도구(_T)/LDIF 파일 가져오기(_L)"
 
-#: src/addressbook.c:360 src/compose.c:658 src/mainwindow.c:788
-#: src/messageview.c:277
+#: src/addressbook.c:362 src/compose.c:664 src/mainwindow.c:799
+#: src/messageview.c:282
 msgid "/_Help"
 msgstr "/도움말(_H)"
 
-#: src/addressbook.c:361 src/compose.c:659 src/mainwindow.c:799
-#: src/messageview.c:278
+#: src/addressbook.c:363 src/compose.c:665 src/mainwindow.c:810
+#: src/messageview.c:283
 msgid "/_Help/_About"
 msgstr "/도움말(_H)/sylpheed 정보(_A)"
 
-#: src/addressbook.c:380 src/addressbook.c:390
+#: src/addressbook.c:382 src/addressbook.c:392
 msgid "/New _Address"
 msgstr "/새 주소(_A)"
 
-#: src/addressbook.c:381 src/addressbook.c:391
+#: src/addressbook.c:383 src/addressbook.c:393
 msgid "/New _Group"
 msgstr "/새 그룹(_G)"
 
-#: src/addressbook.c:382 src/addressbook.c:392
+#: src/addressbook.c:384 src/addressbook.c:394
 msgid "/New _Folder"
 msgstr "/새 폴더(_F)"
 
-#: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:509
+#: src/addressbook.c:385 src/addressbook.c:395 src/compose.c:509
 #: src/folderview.c:246 src/folderview.c:248 src/folderview.c:253
 #: src/folderview.c:266 src/folderview.c:268 src/folderview.c:270
 #: src/folderview.c:275 src/folderview.c:289 src/folderview.c:291
 #: src/folderview.c:295 src/summaryview.c:414 src/summaryview.c:418
-#: src/summaryview.c:421 src/summaryview.c:431 src/summaryview.c:433
-#: src/summaryview.c:435 src/summaryview.c:447 src/summaryview.c:453
+#: src/summaryview.c:421 src/summaryview.c:433 src/summaryview.c:435
+#: src/summaryview.c:437 src/summaryview.c:449 src/summaryview.c:455
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:534
-#: src/mainwindow.c:509 src/messageview.c:144
+#: src/addressbook.c:386 src/addressbook.c:396 src/compose.c:534
+#: src/mainwindow.c:512 src/messageview.c:144
 msgid "/_Edit"
 msgstr "/편집(_E)"
 
-#: src/addressbook.c:385 src/addressbook.c:395 src/summaryview.c:432
+#: src/addressbook.c:387 src/addressbook.c:397 src/summaryview.c:434
 msgid "/_Delete"
 msgstr "/삭제(_D)"
 
-#: src/addressbook.c:492
+#: src/addressbook.c:494
 msgid "E-Mail address"
 msgstr "이메일 주소"
 
-#: src/addressbook.c:496 src/compose.c:4763 src/prefs_common_dialog.c:2183
+#: src/addressbook.c:498 src/compose.c:4772 src/prefs_common_dialog.c:2183
 msgid "Address book"
 msgstr "주소록"
 
-#: src/addressbook.c:596 src/prefs_filter_edit.c:249
+#: src/addressbook.c:600 src/prefs_filter_edit.c:249
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "이름:"
 
 #. Buttons
-#: src/addressbook.c:628 src/addressbook.c:1680 src/editaddress.c:884
-#: src/editaddress.c:1017 src/mainwindow.c:2391 src/prefs_actions.c:266
+#: src/addressbook.c:632 src/addressbook.c:1684 src/editaddress.c:884
+#: src/editaddress.c:1017 src/mainwindow.c:2402 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
 #: src/prefs_template.c:233
 msgid "Delete"
 msgstr "삭제"
 
-#: src/addressbook.c:631 src/editaddress.c:890 src/editaddress.c:1023
+#: src/addressbook.c:635 src/editaddress.c:890 src/editaddress.c:1023
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:273 src/prefs_display_header.c:328
 #: src/prefs_filter_edit.c:1550
 msgid "Add"
 msgstr "추가"
 
-#: src/addressbook.c:634
+#: src/addressbook.c:638
 msgid "Lookup"
 msgstr "찾기"
 
-#: src/addressbook.c:646 src/headerview.c:55 src/prefs_folder_item.c:339
+#: src/addressbook.c:650 src/headerview.c:55 src/prefs_folder_item.c:339
 #: src/prefs_template.c:176
 msgid "To:"
 msgstr "받는 사람:"
 
-#: src/addressbook.c:650 src/prefs_folder_item.c:356 src/prefs_template.c:178
+#: src/addressbook.c:654 src/prefs_folder_item.c:356 src/prefs_template.c:178
 msgid "Cc:"
 msgstr "참조:"
 
-#: src/addressbook.c:654 src/prefs_folder_item.c:367
+#: src/addressbook.c:658 src/prefs_folder_item.c:367
 msgid "Bcc:"
 msgstr "숨은 참조:"
 
 #. Confirm deletion
-#: src/addressbook.c:841
+#: src/addressbook.c:845
 msgid "Delete address(es)"
 msgstr "주소를 삭제"
 
-#: src/addressbook.c:842
+#: src/addressbook.c:846
 msgid "Really delete the address(es)?"
 msgstr "정말로 주소를 삭제하시겠습니까?"
 
-#: src/addressbook.c:1671
+#: src/addressbook.c:1675
 #, fuzzy, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1036,38 +1036,38 @@ msgstr ""
 "`%s'의 모든 주소와 폴더를 삭제할까요 ? \n"
 "폴더만 지울 경우 주소는 그 상위 폴더로 옮겨집니다."
 
-#: src/addressbook.c:1674 src/folderview.c:2351
+#: src/addressbook.c:1678 src/folderview.c:2351
 msgid "Delete folder"
 msgstr "폴더 삭제"
 
-#: src/addressbook.c:1674
+#: src/addressbook.c:1678
 #, fuzzy
 msgid "_Folder only"
 msgstr "폴더만"
 
-#: src/addressbook.c:1674
+#: src/addressbook.c:1678
 #, fuzzy
 msgid "Folder and _addresses"
 msgstr "폴더와 주소"
 
-#: src/addressbook.c:1679
+#: src/addressbook.c:1683
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "정말로 `%s'를 지우시겠습니까?"
 
-#: src/addressbook.c:2365 src/addressbook.c:2498
+#: src/addressbook.c:2369 src/addressbook.c:2502
 msgid "New user, could not save index file."
 msgstr "새 사용자, 색인 파일을 저장할 수 없습니다."
 
-#: src/addressbook.c:2369 src/addressbook.c:2502
+#: src/addressbook.c:2373 src/addressbook.c:2506
 msgid "New user, could not save address book files."
 msgstr "새 사용자, 주소록 파일을 저장할 수 없습니다."
 
-#: src/addressbook.c:2379 src/addressbook.c:2512
+#: src/addressbook.c:2383 src/addressbook.c:2516
 msgid "Old address book converted successfully."
 msgstr "예전 주소록을 성공적으로 변환하였습니다."
 
-#: src/addressbook.c:2384
+#: src/addressbook.c:2388
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1075,7 +1075,7 @@ msgstr ""
 "예전 주소록이 변환되었습니다,\n"
 "새 주소록의 색인 파일을 저장할 수 없습니다"
 
-#: src/addressbook.c:2397
+#: src/addressbook.c:2401
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1083,7 +1083,7 @@ msgstr ""
 "주소록을 변환할 수 없습니다,\n"
 "대신에 빈 새 주소록 파일을 생성하였습니다."
 
-#: src/addressbook.c:2403
+#: src/addressbook.c:2407
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1091,7 +1091,7 @@ msgstr ""
 "주소록을 변환하지 못했습니다,\n"
 "새 주소록 파일을 생성하지 못했습니다."
 
-#: src/addressbook.c:2408
+#: src/addressbook.c:2412
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1099,85 +1099,85 @@ msgstr ""
 "주소록을 변환하지 못했고\n"
 "새 주소록 파일도 생성하지 못했습니다."
 
-#: src/addressbook.c:2415
+#: src/addressbook.c:2419
 msgid "Addressbook conversion error"
 msgstr "주소록 변환 에러"
 
-#: src/addressbook.c:2419
+#: src/addressbook.c:2423
 msgid "Addressbook conversion"
 msgstr "주소록 변환"
 
-#: src/addressbook.c:2454
+#: src/addressbook.c:2458
 msgid "Addressbook Error"
 msgstr "주소록 에러"
 
-#: src/addressbook.c:2455 src/addressbook.c:2555
+#: src/addressbook.c:2459 src/addressbook.c:2559
 msgid "Could not read address index"
 msgstr "주소 색인을 읽을 수 없습니다"
 
-#: src/addressbook.c:2517
+#: src/addressbook.c:2521
 msgid "Old address book converted, could not save new address index file"
 msgstr "예전 주소록이 변환되었습니다, 새 주소록 색인 파일을 저장할 수 없습니다"
 
-#: src/addressbook.c:2531
+#: src/addressbook.c:2535
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr ""
 "주소록을 변환할 수 없습니다, 대신에 빈 새 주소록 파일을 생성하였습니다."
 
-#: src/addressbook.c:2537
+#: src/addressbook.c:2541
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr "주소록을 변환하지 못했습니다, 새 주소록 파일을 생성하지 못했습니다."
 
-#: src/addressbook.c:2543
+#: src/addressbook.c:2547
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr "주소록을 변환하지 못했고 새 주소록 파일도 생성하지 못했습니다."
 
-#: src/addressbook.c:2561
+#: src/addressbook.c:2565
 msgid "Addressbook Conversion Error"
 msgstr "주소록 변환 에러"
 
-#: src/addressbook.c:2567
+#: src/addressbook.c:2571
 msgid "Addressbook Conversion"
 msgstr "주소록 변환"
 
-#: src/addressbook.c:3072 src/prefs_common_dialog.c:2033
+#: src/addressbook.c:3086 src/prefs_common_dialog.c:2033
 msgid "Interface"
 msgstr "인터페이스"
 
-#: src/addressbook.c:3088 src/importldif.c:514
+#: src/addressbook.c:3102 src/importldif.c:514
 msgid "Address Book"
 msgstr "주소록"
 
-#: src/addressbook.c:3104
+#: src/addressbook.c:3118
 msgid "Person"
 msgstr "사람"
 
-#: src/addressbook.c:3120
+#: src/addressbook.c:3134
 msgid "EMail Address"
 msgstr "이메일 주소"
 
-#: src/addressbook.c:3136
+#: src/addressbook.c:3150
 msgid "Group"
 msgstr "그룹"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3152 src/folderview.c:367 src/prefs_account_dialog.c:1694
+#: src/addressbook.c:3166 src/folderview.c:367 src/prefs_account_dialog.c:1694
 #: src/query_search.c:370
 msgid "Folder"
 msgstr "폴더"
 
-#: src/addressbook.c:3168
+#: src/addressbook.c:3182
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3184 src/addressbook.c:3200
+#: src/addressbook.c:3198 src/addressbook.c:3214
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3216
+#: src/addressbook.c:3230
 msgid "LDAP Server"
 msgstr "LDAP 서버"
 
@@ -1189,7 +1189,7 @@ msgstr "공용 주소록"
 msgid "Personal address"
 msgstr "개인 주소록"
 
-#: src/alertpanel.c:141 src/compose.c:5485 src/main.c:573
+#: src/alertpanel.c:141 src/compose.c:5494 src/main.c:573
 msgid "Notice"
 msgstr "알림"
 
@@ -1240,7 +1240,7 @@ msgstr "갈색"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4593
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4750
 msgid "None"
 msgstr "없음"
 
@@ -1303,7 +1303,7 @@ msgstr "/편집(_E)/실행취소(_U)"
 msgid "/_Edit/_Redo"
 msgstr "/편집(_E)/다시 실행(_R)"
 
-#: src/compose.c:537 src/compose.c:544 src/mainwindow.c:513
+#: src/compose.c:537 src/compose.c:544 src/mainwindow.c:516
 #: src/messageview.c:147
 msgid "/_Edit/---"
 msgstr "/편집(_E)/---"
@@ -1312,7 +1312,7 @@ msgstr "/편집(_E)/---"
 msgid "/_Edit/Cu_t"
 msgstr "/편집(_E)/잘라내기(_t)"
 
-#: src/compose.c:539 src/mainwindow.c:510 src/messageview.c:145
+#: src/compose.c:539 src/mainwindow.c:513 src/messageview.c:145
 msgid "/_Edit/_Copy"
 msgstr "/편집(_E)/복사(_C)"
 
@@ -1324,7 +1324,7 @@ msgstr "/편집(_E)/붙여넣기(_P)"
 msgid "/_Edit/Paste as _quotation"
 msgstr "/편집(_E)/quotation으로 붙여넣기(_q)"
 
-#: src/compose.c:543 src/mainwindow.c:511 src/messageview.c:146
+#: src/compose.c:543 src/mainwindow.c:514 src/messageview.c:146
 msgid "/_Edit/Select _all"
 msgstr "/편집(_E)/모두 선택(_a)"
 
@@ -1341,8 +1341,8 @@ msgstr "/편집(_E)/모든 긴 라인 자동 줄바꿈(_l)"
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/편집(_E)/복사(_C)"
 
-#: src/compose.c:550 src/mainwindow.c:518 src/messageview.c:151
-#: src/summaryview.c:448
+#: src/compose.c:550 src/mainwindow.c:521 src/messageview.c:151
+#: src/summaryview.c:450
 msgid "/_View"
 msgstr "/보기(_V)"
 
@@ -1363,9 +1363,9 @@ msgid "/_View/_Reply to"
 msgstr "/보기(_V)/Reply to(_R)"
 
 #: src/compose.c:555 src/compose.c:557 src/compose.c:559 src/compose.c:561
-#: src/mainwindow.c:538 src/mainwindow.c:541 src/mainwindow.c:568
-#: src/mainwindow.c:592 src/mainwindow.c:687 src/mainwindow.c:691
-#: src/messageview.c:236
+#: src/mainwindow.c:541 src/mainwindow.c:544 src/mainwindow.c:571
+#: src/mainwindow.c:595 src/mainwindow.c:696 src/mainwindow.c:700
+#: src/messageview.c:241
 msgid "/_View/---"
 msgstr "/보기(_V)/---"
 
@@ -1381,7 +1381,7 @@ msgstr "/보기(_V)/Ruler(_u)"
 msgid "/_View/_Attachment"
 msgstr "/보기(_V)/첨부(_A)"
 
-#: src/compose.c:567 src/mainwindow.c:599 src/messageview.c:158
+#: src/compose.c:567 src/mainwindow.c:602 src/messageview.c:158
 #, fuzzy
 msgid "/_View/Character _encoding"
 msgstr "/보기(_V)/정렬(_S)/내림차순"
@@ -1391,241 +1391,252 @@ msgid "/_View/Character _encoding/_Automatic"
 msgstr ""
 
 #: src/compose.c:570 src/compose.c:576 src/compose.c:582 src/compose.c:586
-#: src/compose.c:592 src/compose.c:596 src/compose.c:602 src/compose.c:606
-#: src/compose.c:616 src/compose.c:620 src/compose.c:628 src/compose.c:632
-#: src/mainwindow.c:595 src/mainwindow.c:602 src/messageview.c:154
+#: src/compose.c:592 src/compose.c:596 src/compose.c:602 src/compose.c:608
+#: src/compose.c:612 src/compose.c:622 src/compose.c:626 src/compose.c:634
+#: src/compose.c:638 src/mainwindow.c:598 src/mainwindow.c:605
+#: src/messageview.c:154
 #, fuzzy
 msgid "/_View/Character _encoding/---"
 msgstr "/보기(_V)/정렬(_S)/내림차순"
 
-#: src/compose.c:572 src/mainwindow.c:603 src/messageview.c:162
+#: src/compose.c:572 src/mainwindow.c:606 src/messageview.c:162
 #, fuzzy
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/보기(_V)/문자셋(_C)/7bit 아스키 (US-ASC_II)"
 
-#: src/compose.c:574 src/mainwindow.c:605 src/messageview.c:165
+#: src/compose.c:574 src/mainwindow.c:608 src/messageview.c:165
 #, fuzzy
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/보기(_V)/문자셋(_C)/유니코드(_UTF-8)"
 
-#: src/compose.c:578 src/mainwindow.c:609 src/messageview.c:168
+#: src/compose.c:578 src/mainwindow.c:612 src/messageview.c:168
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/보기(_V)/문자셋(_C)/서부 유럽(ISO-8859-_1)"
 
-#: src/compose.c:580 src/mainwindow.c:611 src/messageview.c:170
+#: src/compose.c:580 src/mainwindow.c:614 src/messageview.c:170
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/보기(_V)/문자셋(_C)/서부 유럽(ISO-8859-15)"
 
-#: src/compose.c:584 src/mainwindow.c:617 src/messageview.c:175
+#: src/compose.c:584 src/mainwindow.c:620 src/messageview.c:175
 #, fuzzy
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/보기(_V)/문자셋(_C)/중앙 유럽(ISO-8859-_2)"
 
-#: src/compose.c:588 src/mainwindow.c:621 src/messageview.c:178
+#: src/compose.c:588 src/mainwindow.c:624 src/messageview.c:178
 #, fuzzy
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/보기(_V)/문자셋(_C)/_Baltic (ISO-8859-13)"
 
-#: src/compose.c:590 src/mainwindow.c:623 src/messageview.c:180
+#: src/compose.c:590 src/mainwindow.c:626 src/messageview.c:180
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/보기(_V)/문자셋(_C)/Baltic (ISO-8859-_4)"
 
-#: src/compose.c:594 src/mainwindow.c:627 src/messageview.c:183
+#: src/compose.c:594 src/mainwindow.c:630 src/messageview.c:183
 #, fuzzy
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/보기(_V)/문자셋(_C)/그리스(ISO-8859-_7)"
 
-#: src/compose.c:598 src/mainwindow.c:631 src/messageview.c:186
+#: src/compose.c:598 src/mainwindow.c:634 src/messageview.c:186
+#, fuzzy
+msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
+msgstr "/보기(_V)/문자셋(_C)/Baltic (ISO-8859-_4)"
+
+#: src/compose.c:600 src/mainwindow.c:636 src/messageview.c:188
+#, fuzzy
+msgid "/_View/Character _encoding/Arabic (Windows-1256)"
+msgstr "/보기(_V)/문자셋(_C)/Cyrillic (Windows-1251)"
+
+#: src/compose.c:604 src/mainwindow.c:640 src/messageview.c:191
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/보기(_V)/문자셋(_C)/그리스(ISO-8859-_7)"
 
-#: src/compose.c:600 src/mainwindow.c:633 src/messageview.c:188
+#: src/compose.c:606 src/mainwindow.c:642 src/messageview.c:193
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/보기(_V)/문자셋(_C)/Cyrillic (Windows-1251)"
 
-#: src/compose.c:604 src/mainwindow.c:637 src/messageview.c:191
+#: src/compose.c:610 src/mainwindow.c:646 src/messageview.c:196
 #, fuzzy
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/보기(_V)/문자셋(_C)/터기 (ISO-8859-_9)"
 
-#: src/compose.c:608 src/mainwindow.c:641 src/messageview.c:194
+#: src/compose.c:614 src/mainwindow.c:650 src/messageview.c:199
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/보기(_V)/문자셋(_C)/Cyrillic (ISo-8859-_5)"
 
-#: src/compose.c:610 src/mainwindow.c:643 src/messageview.c:196
+#: src/compose.c:616 src/mainwindow.c:652 src/messageview.c:201
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/보기(_V)/문자셋(_C)/Cyrillic (KOI8-_R)"
 
-#: src/compose.c:612 src/mainwindow.c:645 src/messageview.c:198
+#: src/compose.c:618 src/mainwindow.c:654 src/messageview.c:203
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/보기(_V)/문자셋(_C)/Cyrillic (KOI8-_R)"
 
-#: src/compose.c:614 src/mainwindow.c:647 src/messageview.c:200
+#: src/compose.c:620 src/mainwindow.c:656 src/messageview.c:205
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/보기(_V)/문자셋(_C)/Cyrillic (Windows-1251)"
 
-#: src/compose.c:618 src/mainwindow.c:651 src/messageview.c:203
+#: src/compose.c:624 src/mainwindow.c:660 src/messageview.c:208
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/보기(_V)/문자셋(_C)/일본 (ISO-2022-_JP)"
 
-#: src/compose.c:622 src/mainwindow.c:661 src/messageview.c:212
+#: src/compose.c:628 src/mainwindow.c:670 src/messageview.c:217
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/보기(_V)/문자셋(_C)/Simplified Chinese (_GB2312)"
 
-#: src/compose.c:624 src/mainwindow.c:663 src/messageview.c:214
+#: src/compose.c:630 src/mainwindow.c:672 src/messageview.c:219
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/보기(_V)/문자셋(_C)/Simplified Chinese (_GB2312)"
 
-#: src/compose.c:626 src/mainwindow.c:665 src/messageview.c:216
+#: src/compose.c:632 src/mainwindow.c:674 src/messageview.c:221
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/보기(_V)/문자셋(_C)/Traditional Chinese (_Big5)"
 
-#: src/compose.c:630 src/mainwindow.c:673 src/messageview.c:223
+#: src/compose.c:636 src/mainwindow.c:682 src/messageview.c:228
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/보기(_V)/문자셋(_C)/한국 (EUC-KR)"
 
-#: src/compose.c:634 src/mainwindow.c:679 src/messageview.c:228
+#: src/compose.c:640 src/mainwindow.c:688 src/messageview.c:233
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/보기(_V)/문자셋(_C)/Thai (TIS-620)"
 
-#: src/compose.c:636 src/mainwindow.c:681 src/messageview.c:230
+#: src/compose.c:642 src/mainwindow.c:690 src/messageview.c:235
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/보기(_V)/문자셋(_C)/Thai (Windows-874)"
 
-#: src/compose.c:640 src/mainwindow.c:739 src/messageview.c:260
+#: src/compose.c:646 src/mainwindow.c:750 src/messageview.c:265
 msgid "/_Tools/_Address book"
 msgstr "/도구(_T)/주소록(_A)"
 
-#: src/compose.c:641
+#: src/compose.c:647
 msgid "/_Tools/_Template"
 msgstr "/도구(_T)/템플릿(_T)"
 
-#: src/compose.c:642 src/mainwindow.c:762 src/messageview.c:275
+#: src/compose.c:648 src/mainwindow.c:773 src/messageview.c:280
 msgid "/_Tools/Actio_ns"
 msgstr "/도구(_T)/동작(_n)"
 
-#: src/compose.c:643 src/compose.c:647 src/compose.c:653 src/mainwindow.c:742
-#: src/mainwindow.c:756 src/mainwindow.c:761 src/mainwindow.c:763
-#: src/mainwindow.c:766 src/mainwindow.c:768 src/messageview.c:263
-#: src/messageview.c:274
+#: src/compose.c:649 src/compose.c:653 src/compose.c:659 src/mainwindow.c:753
+#: src/mainwindow.c:767 src/mainwindow.c:772 src/mainwindow.c:774
+#: src/mainwindow.c:777 src/mainwindow.c:779 src/messageview.c:268
+#: src/messageview.c:279
 msgid "/_Tools/---"
 msgstr "/도구(_T)/---"
 
-#: src/compose.c:644
+#: src/compose.c:650
 #, fuzzy
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/편집(_E)/외부 편집기로 편집(_x)"
 
-#: src/compose.c:648
+#: src/compose.c:654
 #, fuzzy
 msgid "/_Tools/PGP Si_gn"
 msgstr "/도구(_T)/동작(_n)"
 
-#: src/compose.c:649
+#: src/compose.c:655
 #, fuzzy
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/메시지(_M)/암호화(_E)"
 
-#: src/compose.c:654
+#: src/compose.c:660
 #, fuzzy
 msgid "/_Tools/_Check spell"
 msgstr "/도구(_T)/실행(_x)"
 
-#: src/compose.c:655
+#: src/compose.c:661
 #, fuzzy
 msgid "/_Tools/_Set spell language"
 msgstr "/도구(_T)/템플릿(_T)"
 
-#: src/compose.c:899
+#: src/compose.c:908
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: 파일이 없습니다\n"
 
-#: src/compose.c:1003 src/compose.c:1074
+#: src/compose.c:1012 src/compose.c:1083
 msgid "Can't get text part\n"
 msgstr "텍스트 부분을 얻을 수가 없습니다\n"
 
-#: src/compose.c:1475
+#: src/compose.c:1484
 msgid "Quote mark format error."
 msgstr "인용 부호 형식 에러."
 
-#: src/compose.c:1487
+#: src/compose.c:1496
 msgid "Message reply/forward format error."
 msgstr "메시지 회신/전달 형식 에러."
 
-#: src/compose.c:1907
+#: src/compose.c:1916
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "%s파일이 없습니다\n"
 
-#: src/compose.c:1911
+#: src/compose.c:1920
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "%s의 파일 크기를 알수가 없습니다\n"
 
-#: src/compose.c:1915
+#: src/compose.c:1924
 #, c-format
 msgid "File %s is empty."
 msgstr "%s 파일이 빈 파일입니다."
 
-#: src/compose.c:1919
+#: src/compose.c:1928
 #, c-format
 msgid "Can't read %s."
 msgstr "%s를 읽을 수가 없습니다."
 
-#: src/compose.c:1952
+#: src/compose.c:1961
 #, c-format
 msgid "Message: %s"
 msgstr "메시지: %s"
 
-#: src/compose.c:2012 src/mimeview.c:565
+#: src/compose.c:2021 src/mimeview.c:565
 msgid "Can't get the part of multipart message."
 msgstr "multipart 메시지의 부분을 얻을 수가 없습니다."
 
-#: src/compose.c:2496 src/headerview.c:195 src/query_search.c:636
-#: src/summaryview.c:2107
+#: src/compose.c:2505 src/headerview.c:195 src/query_search.c:636
+#: src/summaryview.c:2124
 msgid "(No Subject)"
 msgstr "(제목 없음)"
 
-#: src/compose.c:2499
+#: src/compose.c:2508
 #, fuzzy, c-format
 msgid "%s - Compose%s"
 msgstr "%s - 메시지 편집%s "
 
-#: src/compose.c:2612
+#: src/compose.c:2621
 msgid "Recipient is not specified."
 msgstr "받는 사람이 지정되지않았습니다"
 
-#: src/compose.c:2620
+#: src/compose.c:2629
 #, fuzzy
 msgid "Empty subject"
 msgstr "제목"
 
-#: src/compose.c:2621
+#: src/compose.c:2630
 msgid "Subject is empty. Send it anyway?"
 msgstr "제목이 비었습니다. 그래도 보낼까요?"
 
-#: src/compose.c:2680
+#: src/compose.c:2689
 msgid "can't get recipient list."
 msgstr "받는 사람 목록을 얻을 수가 없습니다"
 
-#: src/compose.c:2700
+#: src/compose.c:2709
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1633,21 +1644,21 @@ msgstr ""
 "메일을 보내기위한 계정이 지정되어있지않습니다.\n"
 "보내기 전에 메일 계정을 선택하세요."
 
-#: src/compose.c:2714 src/send_message.c:299
+#: src/compose.c:2723 src/send_message.c:299
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "%s로 메시지를 보내는 중 에러가 발생했습니다."
 
-#: src/compose.c:2756
+#: src/compose.c:2765
 msgid "Can't save the message to outbox."
 msgstr "메시지를 보낸 편지함에 저장할 수가 없습니다"
 
-#: src/compose.c:2794
+#: src/compose.c:2803
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "현재 선택된 키 ID `%s'에 연결된 어떤 키도 찾을 수 없습니다."
 
-#: src/compose.c:2891
+#: src/compose.c:2900
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1657,12 +1668,12 @@ msgstr ""
 "메시지의 문자셋을 변경할 수가 없습니다.\n"
 "그래도 보낼까요?"
 
-#: src/compose.c:2897
+#: src/compose.c:2906
 #, fuzzy
 msgid "Code conversion error"
 msgstr "주소록 변환 에러"
 
-#: src/compose.c:2970
+#: src/compose.c:2979
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1671,160 +1682,160 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:2974
+#: src/compose.c:2983
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3264
+#: src/compose.c:3273
 msgid "can't remove the old message\n"
 msgstr "오래된 메시지를 제거할 수가 없습니다\n"
 
-#: src/compose.c:3282
+#: src/compose.c:3291
 msgid "queueing message...\n"
 msgstr "메시지를 임시 보관합니다...\n"
 
-#: src/compose.c:3364
+#: src/compose.c:3373
 msgid "can't find queue folder\n"
 msgstr "큐 폴더를 찾을 수가 없습니다\n"
 
-#: src/compose.c:3371
+#: src/compose.c:3380
 msgid "can't queue the message\n"
 msgstr "메시지를 임시 보관할 수가 없습니다\n"
 
-#: src/compose.c:3964
+#: src/compose.c:3973
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "생성된 Message-ID: %s\n"
 
-#: src/compose.c:4077
+#: src/compose.c:4086
 msgid "Creating compose window...\n"
 msgstr "편집창을 생성합니다...\n"
 
-#: src/compose.c:4128 src/headerview.c:54
+#: src/compose.c:4137 src/headerview.c:54
 msgid "From:"
 msgstr "보낸 사람:"
 
-#: src/compose.c:4202
+#: src/compose.c:4211
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/도구(_T)/동작(_n)"
 
-#: src/compose.c:4205
+#: src/compose.c:4214
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/메시지(_M)/암호화(_E)"
 
-#: src/compose.c:4243 src/compose.c:5317
+#: src/compose.c:4252 src/compose.c:5326
 msgid "MIME type"
 msgstr "마임 타입"
 
 #. S_COL_DATE
-#: src/compose.c:4252 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4740
+#: src/compose.c:4261 src/mimeview.c:197 src/prefs_filter_edit.c:496
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4897
 msgid "Size"
 msgstr "크기"
 
-#: src/compose.c:4683 src/mainwindow.c:2324 src/prefs_account_dialog.c:528
+#: src/compose.c:4692 src/mainwindow.c:2335 src/prefs_account_dialog.c:528
 #: src/prefs_common_dialog.c:661
 msgid "Send"
 msgstr "메일 발송"
 
-#: src/compose.c:4684
+#: src/compose.c:4693
 msgid "Send message"
 msgstr "메시지 보내기"
 
-#: src/compose.c:4692
+#: src/compose.c:4701
 msgid "Send later"
 msgstr "나중에 보내기"
 
-#: src/compose.c:4693
+#: src/compose.c:4702
 msgid "Put into queue folder and send later"
 msgstr "보낼 편지함에 넣어서 나중에 보내기"
 
-#: src/compose.c:4701
+#: src/compose.c:4710
 msgid "Draft"
 msgstr "임시 보관함"
 
-#: src/compose.c:4702
+#: src/compose.c:4711
 msgid "Save to draft folder"
 msgstr "임시 보관함에 넣기"
 
-#: src/compose.c:4712
+#: src/compose.c:4721
 msgid "Insert"
 msgstr "삽입"
 
-#: src/compose.c:4713
+#: src/compose.c:4722
 msgid "Insert file"
 msgstr "파일을 삽입합니다"
 
-#: src/compose.c:4721
+#: src/compose.c:4730
 msgid "Attach"
 msgstr "첨부"
 
-#: src/compose.c:4722
+#: src/compose.c:4731
 msgid "Attach file"
 msgstr "파일 첨부"
 
 #. signature
-#: src/compose.c:4732 src/prefs_account_dialog.c:1208
+#: src/compose.c:4741 src/prefs_account_dialog.c:1208
 #: src/prefs_common_dialog.c:953
 msgid "Signature"
 msgstr "서명"
 
-#: src/compose.c:4733
+#: src/compose.c:4742
 #, fuzzy
 msgid "Append signature"
 msgstr "BAD signature"
 
 #. editor
-#: src/compose.c:4742 src/prefs_common_dialog.c:991
+#: src/compose.c:4751 src/prefs_common_dialog.c:991
 #: src/prefs_common_dialog.c:2315
 msgid "Editor"
 msgstr "편집기"
 
-#: src/compose.c:4743
+#: src/compose.c:4752
 msgid "Edit with external editor"
 msgstr "외부 편집기로 편집"
 
-#: src/compose.c:4751
+#: src/compose.c:4760
 msgid "Linewrap"
 msgstr "줄바꿈"
 
-#: src/compose.c:4752
+#: src/compose.c:4761
 msgid "Wrap all long lines"
 msgstr "긴 줄에대해 자동 줄바꿈을 합니다"
 
-#: src/compose.c:5213
+#: src/compose.c:5222
 msgid "Invalid MIME type."
 msgstr "올바르지않은 마임 타입."
 
-#: src/compose.c:5231
+#: src/compose.c:5240
 msgid "File doesn't exist or is empty."
 msgstr "파일이 없거나 비여있습니다."
 
-#: src/compose.c:5299
+#: src/compose.c:5308
 #, fuzzy
 msgid "Properties"
 msgstr "특성"
 
-#: src/compose.c:5319 src/prefs_common_dialog.c:1444
+#: src/compose.c:5328 src/prefs_common_dialog.c:1444
 msgid "Encoding"
 msgstr "인코딩"
 
-#: src/compose.c:5342 src/prefs_folder_item.c:202
+#: src/compose.c:5351 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "경로"
 
-#: src/compose.c:5343
+#: src/compose.c:5352
 msgid "File name"
 msgstr "파일 이름"
 
-#: src/compose.c:5436
+#: src/compose.c:5445
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "외부 편집기 명령어가 올바르지않습니다: `%s'\n"
 
-#: src/compose.c:5482
+#: src/compose.c:5491
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1834,48 +1845,48 @@ msgstr ""
 "이 프로세스를 강제로 종료시킬까요?\n"
 "프로세스 그룹 아이디: %d"
 
-#: src/compose.c:5857 src/compose.c:5862 src/compose.c:5868
+#: src/compose.c:5866 src/compose.c:5871 src/compose.c:5877
 msgid "Can't queue the message."
 msgstr "메시지를 임시 보관함에 넣을수가 없습니다."
 
-#: src/compose.c:5959
+#: src/compose.c:5968
 #, fuzzy
 msgid "Select files"
 msgstr "파일 선택"
 
-#: src/compose.c:5982
+#: src/compose.c:5991
 msgid "Select file"
 msgstr "파일 선택"
 
-#: src/compose.c:6017
+#: src/compose.c:6026
 #, fuzzy
 msgid "Save message"
 msgstr "메시지 보내기"
 
-#: src/compose.c:6018
+#: src/compose.c:6027
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "이 메시지는 수정되었습니다. 변경사항을 버릴까요?"
 
-#: src/compose.c:6020
+#: src/compose.c:6029
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:6062
+#: src/compose.c:6071
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "`%s' 템플릿을 적용할까요?"
 
-#: src/compose.c:6064
+#: src/compose.c:6073
 msgid "Apply template"
 msgstr "템플릿을 적용합니다."
 
-#: src/compose.c:6065
+#: src/compose.c:6074
 #, fuzzy
 msgid "_Replace"
 msgstr "대체"
 
-#: src/compose.c:6065
+#: src/compose.c:6074
 #, fuzzy
 msgid "_Insert"
 msgstr "삽입"
@@ -2316,7 +2327,7 @@ msgstr "새것"
 
 #. S_COL_MARK
 #: src/folderview.c:412 src/prefs_filter_edit.c:500
-#: src/prefs_summary_column.c:71 src/summaryview.c:509
+#: src/prefs_summary_column.c:71 src/summaryview.c:511
 msgid "Unread"
 msgstr "안읽음"
 
@@ -2332,12 +2343,12 @@ msgstr "폴더 정보를 설정합니다...\n"
 msgid "Setting folder info..."
 msgstr "폴더 정보를 설정합니다..."
 
-#: src/folderview.c:858 src/mainwindow.c:3464 src/setup.c:80
+#: src/folderview.c:858 src/mainwindow.c:3481 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "%s%c%s를 스캔합니다..."
 
-#: src/folderview.c:862 src/mainwindow.c:3469 src/setup.c:85
+#: src/folderview.c:862 src/mainwindow.c:3486 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "%s 폴더를 스캔합니다..."
@@ -2363,7 +2374,7 @@ msgstr "폴더 트리를 갱신합니다..."
 msgid "Checking for new messages in all folders..."
 msgstr "모든 폴더의 새로운 메시지를 확인합니다..."
 
-#: src/folderview.c:1200 src/mainwindow.c:2400 src/prefs_common_dialog.c:1789
+#: src/folderview.c:1200 src/mainwindow.c:2411 src/prefs_common_dialog.c:1789
 msgid "Junk"
 msgstr ""
 
@@ -2502,7 +2513,7 @@ msgstr "제목:"
 msgid "Creating header view...\n"
 msgstr "헤더 뷰를 생성합니다...\n"
 
-#: src/headerview.c:180 src/query_search.c:637 src/summaryview.c:2110
+#: src/headerview.c:180 src/query_search.c:637 src/summaryview.c:2127
 msgid "(No From)"
 msgstr "(???)"
 
@@ -2611,7 +2622,7 @@ msgstr "LDIF 파일을 주소록으로 가져오기"
 msgid "Prev"
 msgstr "이전"
 
-#: src/importldif.c:768 src/mainwindow.c:2420
+#: src/importldif.c:768 src/mainwindow.c:2431
 msgid "Next"
 msgstr "다음"
 
@@ -2950,678 +2961,683 @@ msgstr ""
 msgid "another Sylpheed is already running.\n"
 msgstr "다른 Sylpheed가 이미 실행되고 있습니다.\n"
 
-#: src/main.c:1064
+#: src/main.c:1083
 #, fuzzy
 msgid "Migration of configuration"
 msgstr "동작 설정을 씁니다...\n"
 
-#: src/main.c:1065
+#: src/main.c:1084
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
 msgstr ""
 
-#: src/mainwindow.c:478
+#: src/mainwindow.c:481
 msgid "/_File/_Folder"
 msgstr "/파일(_F)/폴더(_F)"
 
-#: src/mainwindow.c:479
+#: src/mainwindow.c:482
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/파일(_F)/폴더(_F)/새 폴더(_n)"
 
-#: src/mainwindow.c:481
+#: src/mainwindow.c:484
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/파일(_F)/폴더(_F)/폴더 이름 변경(_R)..."
 
-#: src/mainwindow.c:482
+#: src/mainwindow.c:485
 #, fuzzy
 msgid "/_File/_Folder/_Move folder..."
 msgstr "/파일(_F)/폴더(_F)/폴더 이름 변경(_R)..."
 
-#: src/mainwindow.c:483
+#: src/mainwindow.c:486
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/파일(_F)/폴더(_F)/폴더 삭제(_D)"
 
-#: src/mainwindow.c:484
+#: src/mainwindow.c:487
 #, fuzzy
 msgid "/_File/_Mailbox"
 msgstr "/파일(_F)/메일 박스 추가(_A)..."
 
-#: src/mainwindow.c:485
+#: src/mainwindow.c:488
 #, fuzzy
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/파일(_F)/메일 박스 추가(_A)..."
 
-#: src/mainwindow.c:486
+#: src/mainwindow.c:489
 #, fuzzy
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/메일박스를 지우기(_m)"
 
-#: src/mainwindow.c:487 src/mainwindow.c:492
+#: src/mainwindow.c:490 src/mainwindow.c:495
 #, fuzzy
 msgid "/_File/_Mailbox/---"
 msgstr "/파일(_F)/폴더(_F)"
 
-#: src/mainwindow.c:488
+#: src/mainwindow.c:491
 #, fuzzy
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "/새 메시지 확인(_C)"
 
-#: src/mainwindow.c:490
+#: src/mainwindow.c:493
 #, fuzzy
 msgid "/_File/_Mailbox/Check for new messages in _all mailboxes"
 msgstr "/파일(_F)/모든 폴더의 새 메시지 확인(_C)"
 
-#: src/mainwindow.c:493
+#: src/mainwindow.c:496
 #, fuzzy
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "/폴더 트리 갱신(_e)"
 
-#: src/mainwindow.c:496
+#: src/mainwindow.c:499
 msgid "/_File/_Import mbox file..."
 msgstr "/파일(_F)/mbox 파일 가져오기(_I)..."
 
-#: src/mainwindow.c:497
+#: src/mainwindow.c:500
 msgid "/_File/_Export to mbox file..."
 msgstr "/파일(_F)/mbox 파일로 저장(_E)..."
 
-#: src/mainwindow.c:499
+#: src/mainwindow.c:502
 #, fuzzy
 msgid "/_File/Empty all _trash"
 msgstr "/파일(_F)/지운 편지함 비우기(_t)"
 
-#: src/mainwindow.c:501 src/messageview.c:139
+#: src/mainwindow.c:504 src/messageview.c:139
 msgid "/_File/_Save as..."
 msgstr "/파일(_F)/새 이름으로(_S)..."
 
-#: src/mainwindow.c:502 src/messageview.c:140
+#: src/mainwindow.c:505 src/messageview.c:140
 msgid "/_File/_Print..."
 msgstr "/파일(_F)/인쇄(_P)..."
 
-#: src/mainwindow.c:504
+#: src/mainwindow.c:507
 #, fuzzy
 msgid "/_File/_Work offline"
 msgstr "/파일(_F)/파일 삽입(_I)"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:507
+#: src/mainwindow.c:510
 msgid "/_File/E_xit"
 msgstr "/파일(_F)/끝내기(_x)"
 
-#: src/mainwindow.c:512
+#: src/mainwindow.c:515
 msgid "/_Edit/Select _thread"
 msgstr "/편집(_E)/쓰레드 선택(_t)"
 
-#: src/mainwindow.c:514 src/messageview.c:148
+#: src/mainwindow.c:517 src/messageview.c:148
 msgid "/_Edit/_Find in current message..."
 msgstr "/편집(_E)/현재 메시지 찾기(_F)..."
 
-#: src/mainwindow.c:516
+#: src/mainwindow.c:519
 msgid "/_Edit/_Search messages..."
 msgstr "/편집(_E)/메시지 찾기(_S)..."
 
-#: src/mainwindow.c:519
+#: src/mainwindow.c:522
 msgid "/_View/Show or hi_de"
 msgstr "/보기(_V)/보이거나 감추기(_d)"
 
-#: src/mainwindow.c:520
+#: src/mainwindow.c:523
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/보기(_V)/보이거나 감추기(d)/폴더 트리(_F)"
 
-#: src/mainwindow.c:522
+#: src/mainwindow.c:525
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/보기(_V)/보이거나 감추기(_d)/메시지 보기(_M)"
 
-#: src/mainwindow.c:524
+#: src/mainwindow.c:527
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/보기(_V)/보이거나 감추기(_d)/툴바(_T)"
 
-#: src/mainwindow.c:526
+#: src/mainwindow.c:529
 msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/보기(_V)/보이거나 감추기(_d)/툴바(_T)/아이콘과 텍스트(_a)"
 
-#: src/mainwindow.c:528
+#: src/mainwindow.c:531
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/보기(_V)/보이거나 감추기(_d)/툴바(_T)/아이콘(_I)"
 
-#: src/mainwindow.c:530
+#: src/mainwindow.c:533
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/보기(_V)/보이거나 감추기(_d)/툴바(_T)/텍스트(_T)"
 
-#: src/mainwindow.c:532
+#: src/mainwindow.c:535
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/보기(_V)/보이거나 감추기(_d)/툴바(_T)/없음(_N)"
 
-#: src/mainwindow.c:534
+#: src/mainwindow.c:537
 #, fuzzy
 msgid "/_View/Show or hi_de/_Search bar"
 msgstr "/보기(_V)/보이거나 감추기(_d)/상태바(_b)"
 
-#: src/mainwindow.c:536
+#: src/mainwindow.c:539
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/보기(_V)/보이거나 감추기(_d)/상태바(_b)"
 
-#: src/mainwindow.c:539
+#: src/mainwindow.c:542
 msgid "/_View/Separate f_older tree"
 msgstr "/보기(_V)/별도의 폴더 트리 창(_o)"
 
-#: src/mainwindow.c:540
+#: src/mainwindow.c:543
 #, fuzzy
 msgid "/_View/Separate _message view"
 msgstr "/보기(_V)/별도의 메시지 창(_e)"
 
-#: src/mainwindow.c:542
+#: src/mainwindow.c:545
 msgid "/_View/_Sort"
 msgstr "/보기(_V)/정렬(_S)"
 
-#: src/mainwindow.c:543
+#: src/mainwindow.c:546
 msgid "/_View/_Sort/by _number"
 msgstr "/보기(_V)/정렬(_S)/번호(_n)"
 
-#: src/mainwindow.c:544
+#: src/mainwindow.c:547
 msgid "/_View/_Sort/by s_ize"
 msgstr "/보기(_V)/정렬(_S)/크기(_i)"
 
-#: src/mainwindow.c:545
+#: src/mainwindow.c:548
 msgid "/_View/_Sort/by _date"
 msgstr "/보기(_V)/정렬(_S)/날짜(_d)"
 
-#: src/mainwindow.c:546
+#: src/mainwindow.c:549
 #, fuzzy
 msgid "/_View/_Sort/by t_hread date"
 msgstr "/보기(_V)/정렬(_S)/날짜(_d)"
 
-#: src/mainwindow.c:547
+#: src/mainwindow.c:550
 msgid "/_View/_Sort/by _from"
 msgstr "/보기(_V)/정렬(_S)/보낸 사람(_f)"
 
-#: src/mainwindow.c:548
+#: src/mainwindow.c:551
 #, fuzzy
 msgid "/_View/_Sort/by _recipient"
 msgstr "/보기(_V)/정렬(_S)/크기(_i)"
 
-#: src/mainwindow.c:549
+#: src/mainwindow.c:552
 msgid "/_View/_Sort/by _subject"
 msgstr "/보기(_V)/정렬(_S)/제목(_s)"
 
-#: src/mainwindow.c:550
+#: src/mainwindow.c:553
 msgid "/_View/_Sort/by _color label"
 msgstr "/보기(_V)/정렬(_S)/색 라벨(_c)"
 
-#: src/mainwindow.c:552
+#: src/mainwindow.c:555
 msgid "/_View/_Sort/by _mark"
 msgstr "/보기(_V)/정렬(_S)/표시(_m)"
 
-#: src/mainwindow.c:553
+#: src/mainwindow.c:556
 msgid "/_View/_Sort/by _unread"
 msgstr "/보기(_V)/정렬(_S)/않읽음(_u)"
 
-#: src/mainwindow.c:554
+#: src/mainwindow.c:557
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/보기(_V)/정렬(_S)/첨부(_t)"
 
-#: src/mainwindow.c:556
+#: src/mainwindow.c:559
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/보기(_V)/정렬(_S)/않함(_o)"
 
-#: src/mainwindow.c:557 src/mainwindow.c:560
+#: src/mainwindow.c:560 src/mainwindow.c:563
 msgid "/_View/_Sort/---"
 msgstr "/보기(_V)/정렬(_S)/---"
 
-#: src/mainwindow.c:558
+#: src/mainwindow.c:561
 msgid "/_View/_Sort/Ascending"
 msgstr "/보기(_V)/정렬(_S)/오름차순"
 
-#: src/mainwindow.c:559
+#: src/mainwindow.c:562
 msgid "/_View/_Sort/Descending"
 msgstr "/보기(_V)/정렬(_S)/내림차순"
 
-#: src/mainwindow.c:561
+#: src/mainwindow.c:564
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/명령(_S)/정렬(_S)/제목(_A)"
 
-#: src/mainwindow.c:563
+#: src/mainwindow.c:566
 msgid "/_View/Th_read view"
 msgstr "/보기(_V)/쓰레드 보기(_r)"
 
-#: src/mainwindow.c:564
+#: src/mainwindow.c:567
 msgid "/_View/E_xpand all threads"
 msgstr "/보기(_V)/모든 쓰레드 펴기(_x)"
 
-#: src/mainwindow.c:565
+#: src/mainwindow.c:568
 msgid "/_View/Co_llapse all threads"
 msgstr "/보기(_V)/모든 쓰레드 접기(_l)"
 
-#: src/mainwindow.c:566
+#: src/mainwindow.c:569
 msgid "/_View/Set display _item..."
 msgstr "/보기(_V)/표시 항목 설정(_i)..."
 
-#: src/mainwindow.c:569
+#: src/mainwindow.c:572
 msgid "/_View/_Go to"
 msgstr "/보기(_V)/가기(_G)"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:573
 msgid "/_View/_Go to/_Prev message"
 msgstr "/명령(_S)/가기(_G)/이전 메시지(_P)"
 
-#: src/mainwindow.c:571
+#: src/mainwindow.c:574
 msgid "/_View/_Go to/_Next message"
 msgstr "/보기(_V)/가기(_G)/다음 메시지(_N)"
 
-#: src/mainwindow.c:572 src/mainwindow.c:577 src/mainwindow.c:580
-#: src/mainwindow.c:585 src/mainwindow.c:590
+#: src/mainwindow.c:575 src/mainwindow.c:580 src/mainwindow.c:583
+#: src/mainwindow.c:588 src/mainwindow.c:593
 msgid "/_View/_Go to/---"
 msgstr "/보기(_V)/가기(_G)/---"
 
-#: src/mainwindow.c:573
+#: src/mainwindow.c:576
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/보기(_V)/가기(_G)/안읽은 다음 메시지(_e)"
 
-#: src/mainwindow.c:575
+#: src/mainwindow.c:578
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/보기(_V)/가기(_G)/안읽은 다음 메시지(_e)"
 
-#: src/mainwindow.c:578
+#: src/mainwindow.c:581
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/보기(_V)/가기(_G)/이전 새 메시지(_w)"
 
-#: src/mainwindow.c:579
+#: src/mainwindow.c:582
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/보기(_V)/가기(_G)/다음 새 메시지(_x)"
 
-#: src/mainwindow.c:581
+#: src/mainwindow.c:584
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/보기(_V)/가기(_G)/표시된 이전 메시지(_m)"
 
-#: src/mainwindow.c:583
+#: src/mainwindow.c:586
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/보기(_V)/가기(_G)/표시된 다음 메시지(_a)"
 
-#: src/mainwindow.c:586
+#: src/mainwindow.c:589
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/보기(_V)/가기(_G)/꼬리표있는 이전 메시지(_l)"
 
-#: src/mainwindow.c:588
+#: src/mainwindow.c:591
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/보기(_V)/가기(_G)/꼬리표있는 다음 메시지(_b)"
 
-#: src/mainwindow.c:591
+#: src/mainwindow.c:594
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/보기(_V)/가기(_G)/다른 폴더로(_f)..."
 
-#: src/mainwindow.c:600 src/messageview.c:159
+#: src/mainwindow.c:603 src/messageview.c:159
 #, fuzzy
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/보기(_V)/문자셋(_C)/자동(_A)"
 
-#: src/mainwindow.c:613 src/messageview.c:172
+#: src/mainwindow.c:616 src/messageview.c:172
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr "/보기(_V)/문자셋(_C)/서부 유럽(ISO-8859-15)"
 
-#: src/mainwindow.c:653 src/messageview.c:205
+#: src/mainwindow.c:662 src/messageview.c:210
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/보기(_V)/문자셋(_C)/일본 (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:655 src/messageview.c:207
+#: src/mainwindow.c:664 src/messageview.c:212
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/보기(_V)/문자셋(_C)/일본 (_EUC-JP)"
 
-#: src/mainwindow.c:657 src/messageview.c:209
+#: src/mainwindow.c:666 src/messageview.c:214
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/보기(_V)/문자셋(_C)/일본 (_Shift__JIS)"
 
-#: src/mainwindow.c:667 src/messageview.c:218
+#: src/mainwindow.c:676 src/messageview.c:223
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/보기(_V)/문자셋(_C)/Traditional Chinese (EUC-_TW)"
 
-#: src/mainwindow.c:669 src/messageview.c:220
+#: src/mainwindow.c:678 src/messageview.c:225
 #, fuzzy
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/보기(_V)/문자셋(_C)/Chinese (ISO-2022-_CN)"
 
-#: src/mainwindow.c:675 src/messageview.c:225
+#: src/mainwindow.c:684 src/messageview.c:230
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/보기(_V)/문자셋(_C)/한국 (ISO-2022-KR)"
 
-#: src/mainwindow.c:688 src/summaryview.c:449
+#: src/mainwindow.c:697 src/summaryview.c:451
 msgid "/_View/Open in new _window"
 msgstr "/보기(_V)/새 창으로 열기(_w)"
 
-#: src/mainwindow.c:689 src/messageview.c:237
+#: src/mainwindow.c:698 src/messageview.c:242
 msgid "/_View/Mess_age source"
 msgstr "/보기(_V)/메시지 소스(_a)"
 
-#: src/mainwindow.c:690 src/messageview.c:238
+#: src/mainwindow.c:699 src/messageview.c:243
 msgid "/_View/Show all _header"
 msgstr "/보기(_V)/모든 헤더보기(_h)"
 
-#: src/mainwindow.c:692
+#: src/mainwindow.c:701
 msgid "/_View/_Update summary"
 msgstr "/보기(_V)/요약 갱신(_U)"
 
-#: src/mainwindow.c:694 src/messageview.c:240
+#: src/mainwindow.c:703 src/messageview.c:245
 msgid "/_Message"
 msgstr "/메시지(_M)"
 
-#: src/mainwindow.c:695
+#: src/mainwindow.c:704
 #, fuzzy
 msgid "/_Message/Recei_ve"
 msgstr "/메시지(_M)/다시 편집(_e)"
 
-#: src/mainwindow.c:696
+#: src/mainwindow.c:705
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/메시지(_M)/모든 계정에서 받기(_a)"
 
-#: src/mainwindow.c:698
+#: src/mainwindow.c:707
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/메시지(_M)/모든 계정에서 받기(_a)"
 
-#: src/mainwindow.c:700
+#: src/mainwindow.c:709
 #, fuzzy
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/메시지(_M)/받기 취소(_g)"
 
-#: src/mainwindow.c:702
+#: src/mainwindow.c:711
 #, fuzzy
 msgid "/_Message/Recei_ve/---"
 msgstr "/메시지(_M)/다시 편집(_e)"
 
-#: src/mainwindow.c:703
+#: src/mainwindow.c:712
 msgid "/_Message/_Send queued messages"
 msgstr "/메시지(_M)/임시 보관된 메시지 발송(_S)"
 
-#: src/mainwindow.c:704 src/mainwindow.c:706 src/mainwindow.c:713
-#: src/mainwindow.c:718 src/mainwindow.c:721 src/mainwindow.c:730
-#: src/mainwindow.c:732 src/mainwindow.c:735 src/messageview.c:243
-#: src/messageview.c:251 src/messageview.c:256
+#: src/mainwindow.c:713 src/mainwindow.c:715 src/mainwindow.c:722
+#: src/mainwindow.c:727 src/mainwindow.c:730 src/mainwindow.c:741
+#: src/mainwindow.c:743 src/mainwindow.c:746 src/messageview.c:248
+#: src/messageview.c:256 src/messageview.c:261
 msgid "/_Message/---"
 msgstr "/메시지(_M)/---"
 
-#: src/mainwindow.c:705 src/messageview.c:241
+#: src/mainwindow.c:714 src/messageview.c:246
 msgid "/_Message/Compose _new message"
 msgstr "/메시지(_M)/새로 만들기(_n)"
 
-#: src/mainwindow.c:707 src/messageview.c:244
+#: src/mainwindow.c:716 src/messageview.c:249
 msgid "/_Message/_Reply"
 msgstr "/메시지(_M)/회신(_R)"
 
-#: src/mainwindow.c:708
+#: src/mainwindow.c:717
 msgid "/_Message/Repl_y to"
 msgstr "/메시지(_M)/회신(_y)"
 
-#: src/mainwindow.c:709 src/messageview.c:245
+#: src/mainwindow.c:718 src/messageview.c:250
 msgid "/_Message/Repl_y to/_all"
 msgstr "/메시지(_M)/회신(_y)/전체(_a)"
 
-#: src/mainwindow.c:710 src/messageview.c:247
+#: src/mainwindow.c:719 src/messageview.c:252
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/메시지(_M)/회신(_y)/보낸이(_s)"
 
-#: src/mainwindow.c:711 src/messageview.c:249
+#: src/mainwindow.c:720 src/messageview.c:254
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/메시지(_M)/회신(_y)/메일링리스트(_l)"
 
-#: src/mainwindow.c:714 src/messageview.c:252
+#: src/mainwindow.c:723 src/messageview.c:257
 msgid "/_Message/_Forward"
 msgstr "/메시지(_M)/전달(_F)"
 
-#: src/mainwindow.c:715 src/messageview.c:253
+#: src/mainwindow.c:724 src/messageview.c:258
 msgid "/_Message/For_ward as attachment"
 msgstr "/메시지(_M)/첨부파일로 전달(_w)"
 
-#: src/mainwindow.c:717 src/messageview.c:255
+#: src/mainwindow.c:726 src/messageview.c:260
 msgid "/_Message/Redirec_t"
 msgstr "/메시지(_M)/Redirec_t"
 
-#: src/mainwindow.c:719
+#: src/mainwindow.c:728
 msgid "/_Message/M_ove..."
 msgstr "/메시지(_M)/이동(_o)..."
 
-#: src/mainwindow.c:720
+#: src/mainwindow.c:729
 msgid "/_Message/_Copy..."
 msgstr "/메시지(_M)/복사(_C)..."
 
-#: src/mainwindow.c:722
+#: src/mainwindow.c:731
 msgid "/_Message/_Mark"
 msgstr "/메시지(_M)/표시(_M)"
 
-#: src/mainwindow.c:723
+#: src/mainwindow.c:732
 msgid "/_Message/_Mark/_Mark"
 msgstr "/메시지(_M)/표시(_M)/표시(_M)"
 
-#: src/mainwindow.c:724
+#: src/mainwindow.c:733
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/메시지(_M)/표시(_M)/표시 지움(_U)"
 
-#: src/mainwindow.c:725
+#: src/mainwindow.c:734
 msgid "/_Message/_Mark/---"
 msgstr "/메시지(_M)/표시(_M)/---"
 
-#: src/mainwindow.c:726
+#: src/mainwindow.c:735
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/메시지(_M)/표시(_M)/읽지않은 것으로 표시(_e)"
 
-#: src/mainwindow.c:727
+#: src/mainwindow.c:736
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/메시지(_M)/표시(_M)/읽은 것으로 표시(_d)"
 
-#: src/mainwindow.c:729
+#: src/mainwindow.c:738
+#, fuzzy
+msgid "/_Message/_Mark/Mark _thread as read"
+msgstr "/메시지(_M)/표시(_M)/읽은 것으로 표시(_d)"
+
+#: src/mainwindow.c:740
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/메시지(_M)/표시(_M)/모두 읽은 것으로 표시(_r)"
 
-#: src/mainwindow.c:731
+#: src/mainwindow.c:742
 msgid "/_Message/_Delete"
 msgstr "/메시지(_M)/삭제(_D)"
 
-#: src/mainwindow.c:733
+#: src/mainwindow.c:744
 #, fuzzy
 msgid "/_Message/Set as _junk mail"
 msgstr "/메시지(_M)/새 메일 받기(_i)"
 
-#: src/mainwindow.c:734
+#: src/mainwindow.c:745
 #, fuzzy
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/메시지(_M)/새 메일 받기(_i)"
 
-#: src/mainwindow.c:736 src/messageview.c:257
+#: src/mainwindow.c:747 src/messageview.c:262
 msgid "/_Message/Re-_edit"
 msgstr "/메시지(_M)/다시 편집(_e)"
 
-#: src/mainwindow.c:740
+#: src/mainwindow.c:751
 #, fuzzy
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/도구(_T)/주소록에 보낸이 추가(_k)"
 
-#: src/mainwindow.c:743
+#: src/mainwindow.c:754
 #, fuzzy
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/도구(_T)/메시지 필터(_F)"
 
-#: src/mainwindow.c:745
+#: src/mainwindow.c:756
 #, fuzzy
 msgid "/_Tools/Filter _selected messages"
 msgstr "/도구(_T)/메시지 필터(_F)"
 
-#: src/mainwindow.c:747 src/messageview.c:264
+#: src/mainwindow.c:758 src/messageview.c:269
 msgid "/_Tools/_Create filter rule"
 msgstr "/도구(_T)/필터 규칙 생성(_C)"
 
-#: src/mainwindow.c:748 src/messageview.c:266
+#: src/mainwindow.c:759 src/messageview.c:271
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/도구(_T)/필터 규칙 생성(_C)/자동(_A)"
 
-#: src/mainwindow.c:750 src/messageview.c:268
+#: src/mainwindow.c:761 src/messageview.c:273
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/도구(_T)/필터 규칙 생성(_C)/보낸이로(_F)"
 
-#: src/mainwindow.c:752 src/messageview.c:270
+#: src/mainwindow.c:763 src/messageview.c:275
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/도구(_T)/필터 규칙 생성(_C)/받는이로(_T)"
 
-#: src/mainwindow.c:754 src/messageview.c:272
+#: src/mainwindow.c:765 src/messageview.c:277
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/도구(_T)/필터 규칙 생성(_C)/제목으로(_S)"
 
-#: src/mainwindow.c:757
+#: src/mainwindow.c:768
 #, fuzzy
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/도구(_T)/메시지 필터(_F)"
 
-#: src/mainwindow.c:759
+#: src/mainwindow.c:770
 #, fuzzy
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/도구(_T)/메시지 필터(_F)"
 
-#: src/mainwindow.c:764
+#: src/mainwindow.c:775
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/도구(_T)/중복된 메시지 지우기(_p)"
 
-#: src/mainwindow.c:767
+#: src/mainwindow.c:778
 msgid "/_Tools/E_xecute"
 msgstr "/도구(_T)/실행(_x)"
 
-#: src/mainwindow.c:769
+#: src/mainwindow.c:780
 msgid "/_Tools/_Log window"
 msgstr "/도구(_T)/로그 창(_L)"
 
-#: src/mainwindow.c:771
+#: src/mainwindow.c:782
 msgid "/_Configuration"
 msgstr "/설정(_C)"
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:783
 msgid "/_Configuration/_Common preferences..."
 msgstr "/설정(_C)/기본적인 설정(_C)..."
 
-#: src/mainwindow.c:774
+#: src/mainwindow.c:785
 msgid "/_Configuration/_Filter setting..."
 msgstr "/설정(_C)/필터 설정(_F)..."
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:787
 msgid "/_Configuration/_Template..."
 msgstr "/설정(_C)/템플릿(_T)..."
 
-#: src/mainwindow.c:777
+#: src/mainwindow.c:788
 msgid "/_Configuration/_Actions..."
 msgstr "/설정(_C)/동작(_A)..."
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:789
 msgid "/_Configuration/---"
 msgstr "/설정(_C)/---"
 
-#: src/mainwindow.c:779
+#: src/mainwindow.c:790
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/설정(_C)/계정에 따른 설정(_P)..."
 
-#: src/mainwindow.c:781
+#: src/mainwindow.c:792
 msgid "/_Configuration/Create _new account..."
 msgstr "/설정(_C)/새 계정 만들기(_n)..."
 
-#: src/mainwindow.c:783
+#: src/mainwindow.c:794
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/설정(_C)/계정 편집(_E)..."
 
-#: src/mainwindow.c:785
+#: src/mainwindow.c:796
 msgid "/_Configuration/C_hange current account"
 msgstr "/설정(_C)/현재 계정을 변경(_h)"
 
-#: src/mainwindow.c:789
+#: src/mainwindow.c:800
 msgid "/_Help/_Manual"
 msgstr "/도움말(_H)/설명서(_M)"
 
-#: src/mainwindow.c:790
+#: src/mainwindow.c:801
 msgid "/_Help/_Manual/_English"
 msgstr "/도움말(_H)/설명서(_M)/영어(_E)"
 
-#: src/mainwindow.c:791
+#: src/mainwindow.c:802
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/도움말(_H)/설명서(_M)/일본어(_J)"
 
-#: src/mainwindow.c:792
+#: src/mainwindow.c:803
 msgid "/_Help/_FAQ"
 msgstr "/도움말(_H)/FAQ(_F)"
 
-#: src/mainwindow.c:793
+#: src/mainwindow.c:804
 msgid "/_Help/_FAQ/_English"
 msgstr "/도움말(_H)/FAQ(_F)/영어(_E)"
 
-#: src/mainwindow.c:794
+#: src/mainwindow.c:805
 msgid "/_Help/_FAQ/_German"
 msgstr "/도움말(_H)/FAQ(_F)/독일어(_G)"
 
-#: src/mainwindow.c:795
+#: src/mainwindow.c:806
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/도움말(_H)/FAQ(_F)/스페인어(_S)"
 
-#: src/mainwindow.c:796
+#: src/mainwindow.c:807
 msgid "/_Help/_FAQ/_French"
 msgstr "/도움말(_H)/FAQ(_F)/프랑스어(_F)"
 
-#: src/mainwindow.c:797
+#: src/mainwindow.c:808
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/도움말(_H)/FAQ(_F)/이태리어(_I)"
 
-#: src/mainwindow.c:798
+#: src/mainwindow.c:809
 msgid "/_Help/---"
 msgstr "/도움말(_H)/---"
 
-#: src/mainwindow.c:841
+#: src/mainwindow.c:852
 msgid "Creating main window...\n"
 msgstr "새 창을 만듭니다...\n"
 
-#: src/mainwindow.c:1011
+#: src/mainwindow.c:1022
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "메인 창: 색 할당 %d 실패\n"
 
-#: src/mainwindow.c:1108 src/summaryview.c:2258 src/summaryview.c:2343
-#: src/summaryview.c:3739 src/summaryview.c:3868 src/summaryview.c:4226
+#: src/mainwindow.c:1119 src/summaryview.c:2275 src/summaryview.c:2360
+#: src/summaryview.c:3896 src/summaryview.c:4025 src/summaryview.c:4383
 msgid "done.\n"
 msgstr "마침.\n"
 
-#: src/mainwindow.c:1235 src/mainwindow.c:1276 src/mainwindow.c:1301
+#: src/mainwindow.c:1246 src/mainwindow.c:1287 src/mainwindow.c:1312
 msgid "Untitled"
 msgstr "제목 없슴"
 
-#: src/mainwindow.c:1302
+#: src/mainwindow.c:1313
 msgid "none"
 msgstr "없음"
 
-#: src/mainwindow.c:1355
+#: src/mainwindow.c:1366
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "창 분리 형식을 %d에서 %d로 바꿉니다\n"
 
-#: src/mainwindow.c:1605
+#: src/mainwindow.c:1616
 msgid "Offline"
 msgstr ""
 
-#: src/mainwindow.c:1606
+#: src/mainwindow.c:1617
 msgid "You are offline. Go online?"
 msgstr ""
 
-#: src/mainwindow.c:1623
+#: src/mainwindow.c:1634
 #, fuzzy
 msgid "Empty all trash"
 msgstr "지운 편지함 비우기"
 
-#: src/mainwindow.c:1624
+#: src/mainwindow.c:1635
 #, fuzzy
 msgid "Delete all messages in trash folders?"
 msgstr "지운 편지함에있는 모든 메시지를 비울까요?"
 
-#: src/mainwindow.c:1652
+#: src/mainwindow.c:1663
 msgid "Add mailbox"
 msgstr "메일박스 추가"
 
-#: src/mainwindow.c:1653
+#: src/mainwindow.c:1664
 #, fuzzy
 msgid ""
 "Specify the location of mailbox.\n"
@@ -3632,16 +3648,16 @@ msgstr ""
 "기존의 메일 박스가 지정되면 자동으로\n"
 "스캔될것입니다."
 
-#: src/mainwindow.c:1659 src/setup.c:49
+#: src/mainwindow.c:1670 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "메일 박스 `%s'가 이미 존재합니다."
 
-#: src/mainwindow.c:1664 src/setup.c:56
+#: src/mainwindow.c:1675 src/setup.c:56
 msgid "Mailbox"
 msgstr "메일박스"
 
-#: src/mainwindow.c:1670 src/setup.c:62
+#: src/mainwindow.c:1681 src/setup.c:62
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3650,149 +3666,149 @@ msgstr ""
 "메일박스 생성이 실패했습니다.\n"
 "아마 어떤 파일이 이미 존재하거나 그 곳에 쓰기 권한이 없습니다."
 
-#: src/mainwindow.c:2088
+#: src/mainwindow.c:2099
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - 폴더 보기"
 
-#: src/mainwindow.c:2107
+#: src/mainwindow.c:2118
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - 메시지 보기"
 
-#: src/mainwindow.c:2259 src/summaryview.c:408
+#: src/mainwindow.c:2270 src/summaryview.c:408
 msgid "/_Reply"
 msgstr "/회신(_R)"
 
-#: src/mainwindow.c:2260
+#: src/mainwindow.c:2271
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "전부에게 회신을 보냅니다"
 
-#: src/mainwindow.c:2261
+#: src/mainwindow.c:2272
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/회신(_y)/보낸이(_s)"
 
-#: src/mainwindow.c:2262
+#: src/mainwindow.c:2273
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/회신(_y)/메일링리스트(_l)"
 
-#: src/mainwindow.c:2267 src/summaryview.c:415
+#: src/mainwindow.c:2278 src/summaryview.c:415
 msgid "/_Forward"
 msgstr "/전달(_F)"
 
-#: src/mainwindow.c:2268 src/summaryview.c:416
+#: src/mainwindow.c:2279 src/summaryview.c:416
 msgid "/For_ward as attachment"
 msgstr "/첨부로 전달(_w)"
 
-#: src/mainwindow.c:2269 src/summaryview.c:417
+#: src/mainwindow.c:2280 src/summaryview.c:417
 msgid "/Redirec_t"
 msgstr "/Redirec_t"
 
-#: src/mainwindow.c:2305
+#: src/mainwindow.c:2316
 msgid "Get"
 msgstr "받기"
 
-#: src/mainwindow.c:2306
+#: src/mainwindow.c:2317
 msgid "Incorporate new mail"
 msgstr "새 메일을 가져옵니다"
 
-#: src/mainwindow.c:2313
+#: src/mainwindow.c:2324
 msgid "Get all"
 msgstr "전부 받기"
 
-#: src/mainwindow.c:2314
+#: src/mainwindow.c:2325
 msgid "Incorporate new mail of all accounts"
 msgstr "모든 계정에서 새 메일을 가져옵니다"
 
-#: src/mainwindow.c:2325
+#: src/mainwindow.c:2336
 msgid "Send queued message(s)"
 msgstr "임시 보관된 메시지를 보냅니다"
 
-#: src/mainwindow.c:2335 src/prefs_account_dialog.c:530
+#: src/mainwindow.c:2346 src/prefs_account_dialog.c:530
 #: src/prefs_common_dialog.c:663 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "작성"
 
-#: src/mainwindow.c:2336
+#: src/mainwindow.c:2347
 msgid "Compose new message"
 msgstr "새 메시지를 작성합니다"
 
-#: src/mainwindow.c:2344 src/prefs_common_dialog.c:975
+#: src/mainwindow.c:2355 src/prefs_common_dialog.c:975
 msgid "Reply"
 msgstr "회신"
 
-#: src/mainwindow.c:2345 src/mainwindow.c:2358
+#: src/mainwindow.c:2356 src/mainwindow.c:2369
 msgid "Reply to the message"
 msgstr "메시지에 회신을 보냅니다"
 
-#: src/mainwindow.c:2362
+#: src/mainwindow.c:2373
 msgid "Reply all"
 msgstr "전체 회신"
 
-#: src/mainwindow.c:2363
+#: src/mainwindow.c:2374
 msgid "Reply to all"
 msgstr "전부에게 회신을 보냅니다"
 
-#: src/mainwindow.c:2371 src/prefs_filter_edit.c:672
+#: src/mainwindow.c:2382 src/prefs_filter_edit.c:672
 msgid "Forward"
 msgstr "전달"
 
-#: src/mainwindow.c:2372 src/mainwindow.c:2385
+#: src/mainwindow.c:2383 src/mainwindow.c:2396
 msgid "Forward the message"
 msgstr "메시지를 다른 사람에게 전달합니다"
 
-#: src/mainwindow.c:2392
+#: src/mainwindow.c:2403
 msgid "Delete the message"
 msgstr "메시지를 지웁니다"
 
-#: src/mainwindow.c:2401
+#: src/mainwindow.c:2412
 #, fuzzy
 msgid "Set as junk mail"
 msgstr "기본 계정으로 설정"
 
-#: src/mainwindow.c:2410
+#: src/mainwindow.c:2421
 msgid "Execute"
 msgstr "실행"
 
-#: src/mainwindow.c:2411
+#: src/mainwindow.c:2422
 msgid "Execute marked process"
 msgstr "표시된 프로세스들을 실행합니다"
 
-#: src/mainwindow.c:2421
+#: src/mainwindow.c:2432
 msgid "Next unread message"
 msgstr "다음 안 읽은 메시지를 보여줍니다"
 
-#: src/mainwindow.c:2433
+#: src/mainwindow.c:2444
 msgid "Prefs"
 msgstr "설정"
 
-#: src/mainwindow.c:2434
+#: src/mainwindow.c:2445
 msgid "Common preferences"
 msgstr "기본적인 환경 설정"
 
-#: src/mainwindow.c:2442 src/prefs_folder_item.c:289
+#: src/mainwindow.c:2453 src/prefs_folder_item.c:289
 #: src/prefs_folder_item.c:300 src/progressdialog.c:128
 msgid "Account"
 msgstr "계정"
 
-#: src/mainwindow.c:2443
+#: src/mainwindow.c:2454
 msgid "Account setting"
 msgstr "계정을 설정합니다"
 
-#: src/mainwindow.c:2615
+#: src/mainwindow.c:2626
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 
-#: src/mainwindow.c:2626
+#: src/mainwindow.c:2637
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 
-#: src/mainwindow.c:2892
+#: src/mainwindow.c:2903
 msgid "Exit"
 msgstr "끝내기"
 
-#: src/mainwindow.c:2892
+#: src/mainwindow.c:2903
 msgid "Exit this program?"
 msgstr "이 프로그램을 끝내시겠습니까?"
 
@@ -3829,45 +3845,45 @@ msgstr "메시지의 끝에 도달했습니다; 시작부분에서 계속할까�
 msgid "Search finished"
 msgstr "찾기가 완료"
 
-#: src/messageview.c:261
+#: src/messageview.c:266
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/도구(_T)/주소록에 보낸이 추가(_k)"
 
-#: src/messageview.c:291
+#: src/messageview.c:296
 msgid "Creating message view...\n"
 msgstr "메시지 뷰를 생성합니다...\n"
 
-#: src/messageview.c:316
+#: src/messageview.c:321
 msgid "Text"
 msgstr "텍스트"
 
-#: src/messageview.c:321
+#: src/messageview.c:326
 msgid "Attachments"
 msgstr "첨부"
 
-#: src/messageview.c:371
+#: src/messageview.c:376
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:669 src/summaryview.c:3268
+#: src/messageview.c:674 src/summaryview.c:3425
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "`%s' 파일을 저장할 수가 없습니다."
 
-#: src/messageview.c:728 src/summaryview.c:3291
+#: src/messageview.c:733 src/summaryview.c:3448
 msgid "The message will be printed with the following command:"
 msgstr ""
 
-#: src/messageview.c:729 src/summaryview.c:3292
+#: src/messageview.c:734 src/summaryview.c:3449
 #, fuzzy
 msgid "(Default print command)"
 msgstr "실행"
 
-#: src/messageview.c:731 src/prefs_common_dialog.c:2304 src/summaryview.c:3294
+#: src/messageview.c:736 src/prefs_common_dialog.c:2304 src/summaryview.c:3451
 msgid "Print"
 msgstr "인쇄"
 
-#: src/messageview.c:740 src/summaryview.c:3303
+#: src/messageview.c:745 src/summaryview.c:3460
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -4756,8 +4772,8 @@ msgstr "보낸 사람이 본인인 경우 보낸 사람 칸에 받는 사람을
 msgid "Expand threads"
 msgstr "쓰레드 펴기"
 
-#: src/prefs_common_dialog.c:1413 src/prefs_common_dialog.c:2713
-#: src/prefs_common_dialog.c:2751
+#: src/prefs_common_dialog.c:1413 src/prefs_common_dialog.c:2716
+#: src/prefs_common_dialog.c:2754
 msgid "Date format"
 msgstr "날짜 형식"
 
@@ -5057,8 +5073,8 @@ msgstr "외부 명령 (%s는 파일 이름 / URI로 대체됩니다)"
 msgid "Web browser"
 msgstr "웹 탐색기"
 
-#: src/prefs_common_dialog.c:2288 src/prefs_common_dialog.c:3775
-#: src/prefs_common_dialog.c:3796
+#: src/prefs_common_dialog.c:2288 src/prefs_common_dialog.c:3778
+#: src/prefs_common_dialog.c:3799
 #, fuzzy
 msgid "(Default browser)"
 msgstr "기본 우편함"
@@ -5134,218 +5150,228 @@ msgstr "그리스 (ISO-8859-7)"
 
 #: src/prefs_common_dialog.c:2495
 #, fuzzy
+msgid "Arabic (ISO-8859-6)"
+msgstr "Baltic (ISO-8859-4)"
+
+#: src/prefs_common_dialog.c:2496
+#, fuzzy
+msgid "Arabic (Windows-1256)"
+msgstr "Cyrillic (Windows-1251)"
+
+#: src/prefs_common_dialog.c:2498
+#, fuzzy
 msgid "Hebrew (ISO-8859-8)"
 msgstr "그리스 (ISO-8859-7)"
 
-#: src/prefs_common_dialog.c:2496
+#: src/prefs_common_dialog.c:2499
 #, fuzzy
 msgid "Hebrew (Windows-1255)"
 msgstr "Cyrillic (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2498
+#: src/prefs_common_dialog.c:2501
 msgid "Turkish (ISO-8859-9)"
 msgstr "터키 (ISO-8859-9)"
 
-#: src/prefs_common_dialog.c:2500
+#: src/prefs_common_dialog.c:2503
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Cyrillic (ISO-8859-5)"
 
-#: src/prefs_common_dialog.c:2501
+#: src/prefs_common_dialog.c:2504
 msgid "Cyrillic (KOI8-R)"
 msgstr "Cyrillic (KOI8-R)"
 
-#: src/prefs_common_dialog.c:2502
+#: src/prefs_common_dialog.c:2505
 msgid "Cyrillic (KOI8-U)"
 msgstr "Cyrillic (KOI8-U)"
 
-#: src/prefs_common_dialog.c:2503
+#: src/prefs_common_dialog.c:2506
 msgid "Cyrillic (Windows-1251)"
 msgstr "Cyrillic (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2505
+#: src/prefs_common_dialog.c:2508
 msgid "Japanese (ISO-2022-JP)"
 msgstr "일본 (ISO-2022-JP)"
 
-#: src/prefs_common_dialog.c:2507
+#: src/prefs_common_dialog.c:2510
 msgid "Japanese (EUC-JP)"
 msgstr "일본 (EUC-JP)"
 
-#: src/prefs_common_dialog.c:2508
+#: src/prefs_common_dialog.c:2511
 msgid "Japanese (Shift_JIS)"
 msgstr "일본 (Shift_JIS)"
 
-#: src/prefs_common_dialog.c:2511
+#: src/prefs_common_dialog.c:2514
 msgid "Simplified Chinese (GB2312)"
 msgstr "Simplified Chinese (GB2312)"
 
-#: src/prefs_common_dialog.c:2512
+#: src/prefs_common_dialog.c:2515
 #, fuzzy
 msgid "Simplified Chinese (GBK)"
 msgstr "Simplified Chinese (GB2312)"
 
-#: src/prefs_common_dialog.c:2513
+#: src/prefs_common_dialog.c:2516
 msgid "Traditional Chinese (Big5)"
 msgstr "Traditional Chinese (Big5)"
 
-#: src/prefs_common_dialog.c:2515
+#: src/prefs_common_dialog.c:2518
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Traditional Chinese (EUC-TW)"
 
-#: src/prefs_common_dialog.c:2516
+#: src/prefs_common_dialog.c:2519
 msgid "Chinese (ISO-2022-CN)"
 msgstr "중국 (ISO-2022-CN)"
 
-#: src/prefs_common_dialog.c:2519
+#: src/prefs_common_dialog.c:2522
 msgid "Korean (EUC-KR)"
 msgstr "한국 (EUC-KR)"
 
-#: src/prefs_common_dialog.c:2521
+#: src/prefs_common_dialog.c:2524
 msgid "Thai (TIS-620)"
 msgstr "Thai (TIS-620)"
 
-#: src/prefs_common_dialog.c:2522
+#: src/prefs_common_dialog.c:2525
 msgid "Thai (Windows-874)"
 msgstr "Thai (Windows-874)"
 
-#: src/prefs_common_dialog.c:2689
+#: src/prefs_common_dialog.c:2692
 msgid "the full abbreviated weekday name"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2690
+#: src/prefs_common_dialog.c:2693
 msgid "the full weekday name"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2691
+#: src/prefs_common_dialog.c:2694
 msgid "the abbreviated month name"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2692
+#: src/prefs_common_dialog.c:2695
 msgid "the full month name"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2693
+#: src/prefs_common_dialog.c:2696
 msgid "the preferred date and time for the current locale"
 msgstr "현재 로케일에 적당한 날짜와 시간"
 
-#: src/prefs_common_dialog.c:2694
+#: src/prefs_common_dialog.c:2697
 msgid "the century number (year/100)"
 msgstr "년도 (년/100)"
 
-#: src/prefs_common_dialog.c:2695
+#: src/prefs_common_dialog.c:2698
 msgid "the day of the month as a decimal number"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2696
+#: src/prefs_common_dialog.c:2699
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2697
+#: src/prefs_common_dialog.c:2700
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2698
+#: src/prefs_common_dialog.c:2701
 msgid "the day of the year as a decimal number"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2699
+#: src/prefs_common_dialog.c:2702
 msgid "the month as a decimal number"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2700
+#: src/prefs_common_dialog.c:2703
 msgid "the minute as a decimal number"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2701
+#: src/prefs_common_dialog.c:2704
 msgid "either AM or PM"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2702
+#: src/prefs_common_dialog.c:2705
 msgid "the second as a decimal number"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2703
+#: src/prefs_common_dialog.c:2706
 msgid "the day of the week as a decimal number"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2704
+#: src/prefs_common_dialog.c:2707
 #, fuzzy
 msgid "the preferred date for the current locale"
 msgstr "현재 로케일에 적당한 날짜와 시간"
 
-#: src/prefs_common_dialog.c:2705
+#: src/prefs_common_dialog.c:2708
 msgid "the last two digits of a year"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2706
+#: src/prefs_common_dialog.c:2709
 msgid "the year as a decimal number"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2707
+#: src/prefs_common_dialog.c:2710
 msgid "the time zone or name or abbreviation"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2728
+#: src/prefs_common_dialog.c:2731
 #, fuzzy
 msgid "Specifier"
 msgstr "파일 선택"
 
-#: src/prefs_common_dialog.c:2729
+#: src/prefs_common_dialog.c:2732
 msgid "Description"
 msgstr "설명"
 
-#: src/prefs_common_dialog.c:2769
+#: src/prefs_common_dialog.c:2772
 msgid "Example"
 msgstr "예제"
 
-#: src/prefs_common_dialog.c:2850
+#: src/prefs_common_dialog.c:2853
 msgid "Set message colors"
 msgstr "메시지 색 설정"
 
-#: src/prefs_common_dialog.c:2858
+#: src/prefs_common_dialog.c:2861
 msgid "Colors"
 msgstr "색"
 
-#: src/prefs_common_dialog.c:2892
+#: src/prefs_common_dialog.c:2895
 msgid "Quoted Text - First Level"
 msgstr "인용문 - 첫번째 단계"
 
-#: src/prefs_common_dialog.c:2898
+#: src/prefs_common_dialog.c:2901
 msgid "Quoted Text - Second Level"
 msgstr "인용문 - 두번째 단계"
 
-#: src/prefs_common_dialog.c:2904
+#: src/prefs_common_dialog.c:2907
 msgid "Quoted Text - Third Level"
 msgstr "인용문 - 세번째 단계"
 
-#: src/prefs_common_dialog.c:2910
+#: src/prefs_common_dialog.c:2913
 msgid "URI link"
 msgstr "URI 링크"
 
-#: src/prefs_common_dialog.c:2917
+#: src/prefs_common_dialog.c:2920
 msgid "Recycle quote colors"
 msgstr "인용 색 반복"
 
-#: src/prefs_common_dialog.c:2984
+#: src/prefs_common_dialog.c:2987
 msgid "Pick color for quotation level 1"
 msgstr "첫번째 단계 인용문 색 선택"
 
-#: src/prefs_common_dialog.c:2987
+#: src/prefs_common_dialog.c:2990
 msgid "Pick color for quotation level 2"
 msgstr "두번째 단계 인용문 색 선택"
 
-#: src/prefs_common_dialog.c:2990
+#: src/prefs_common_dialog.c:2993
 msgid "Pick color for quotation level 3"
 msgstr "세번째 단계 인용문 색 선택"
 
-#: src/prefs_common_dialog.c:2993
+#: src/prefs_common_dialog.c:2996
 msgid "Pick color for URI"
 msgstr "URI 색 선택"
 
-#: src/prefs_common_dialog.c:3133
+#: src/prefs_common_dialog.c:3136
 msgid "Description of symbols"
 msgstr "부호 설명"
 
-#: src/prefs_common_dialog.c:3189
+#: src/prefs_common_dialog.c:3192
 msgid ""
 "Date\n"
 "From\n"
@@ -5369,11 +5395,11 @@ msgstr ""
 "뉴스그룹\n"
 "메시지-ID"
 
-#: src/prefs_common_dialog.c:3202
+#: src/prefs_common_dialog.c:3205
 msgid "If x is set, displays expr"
 msgstr ""
 
-#: src/prefs_common_dialog.c:3206
+#: src/prefs_common_dialog.c:3209
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -5382,7 +5408,7 @@ msgid ""
 "Literal %"
 msgstr ""
 
-#: src/prefs_common_dialog.c:3214
+#: src/prefs_common_dialog.c:3217
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -5390,20 +5416,20 @@ msgid ""
 "Literal closing curly brace"
 msgstr ""
 
-#: src/prefs_common_dialog.c:3260
+#: src/prefs_common_dialog.c:3263
 msgid "Key bindings"
 msgstr "키 바인딩"
 
-#: src/prefs_common_dialog.c:3273
+#: src/prefs_common_dialog.c:3276
 #, fuzzy
 msgid "Select the preset of key bindings."
 msgstr " 키 바인딩 설정... "
 
-#: src/prefs_common_dialog.c:3283 src/prefs_common_dialog.c:3607
+#: src/prefs_common_dialog.c:3286 src/prefs_common_dialog.c:3610
 msgid "Default"
 msgstr "기본"
 
-#: src/prefs_common_dialog.c:3286 src/prefs_common_dialog.c:3616
+#: src/prefs_common_dialog.c:3289 src/prefs_common_dialog.c:3619
 msgid "Old Sylpheed"
 msgstr "예전 Sylpheed"
 
@@ -5528,7 +5554,7 @@ msgstr ""
 msgid "Age"
 msgstr ""
 
-#: src/prefs_filter_edit.c:501 src/summaryview.c:510
+#: src/prefs_filter_edit.c:501 src/summaryview.c:512
 #, fuzzy
 msgid "Marked"
 msgstr "표시"
@@ -5781,17 +5807,17 @@ msgid "Attachment"
 msgstr "첨부"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73 src/query_search.c:371 src/summaryview.c:4733
+#: src/prefs_summary_column.c:73 src/query_search.c:371 src/summaryview.c:4890
 msgid "Subject"
 msgstr "제목"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/query_search.c:372 src/summaryview.c:4736
+#: src/prefs_summary_column.c:74 src/query_search.c:372 src/summaryview.c:4893
 msgid "From"
 msgstr "보낸 사람"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/query_search.c:373 src/summaryview.c:4738
+#: src/prefs_summary_column.c:75 src/query_search.c:373 src/summaryview.c:4895
 msgid "Date"
 msgstr "날짜"
 
@@ -5891,7 +5917,7 @@ msgstr "메시지 찾기"
 msgid "_Save as search folder"
 msgstr "임시 보관함에 넣기"
 
-#: src/query_search.c:512 src/subscribedialog.c:523 src/summaryview.c:840
+#: src/query_search.c:512 src/subscribedialog.c:523 src/summaryview.c:842
 msgid "Done."
 msgstr "완료."
 
@@ -5905,7 +5931,7 @@ msgstr "%s 폴더를 스캔합니다..."
 msgid "Searching %s (%d / %d)..."
 msgstr "필터링..."
 
-#: src/query_search.c:645 src/summaryview.c:2048
+#: src/query_search.c:645 src/summaryview.c:2051
 msgid "(No Date)"
 msgstr "(날짜 없슴)"
 
@@ -6275,305 +6301,310 @@ msgid "/_Mark/Mark as rea_d"
 msgstr "/표시(_M)/읽은 것으로 표시(_d)"
 
 #: src/summaryview.c:429
+#, fuzzy
+msgid "/_Mark/Mark _thread as read"
+msgstr "/표시(_M)/읽은 것으로 표시(_d)"
+
+#: src/summaryview.c:431
 msgid "/_Mark/Mark all _read"
 msgstr "/표시(_M)/모두 읽은 것으로 표시(_r)"
 
-#: src/summaryview.c:430
+#: src/summaryview.c:432
 msgid "/Color la_bel"
 msgstr "/색 라벨(_b)"
 
-#: src/summaryview.c:434
+#: src/summaryview.c:436
 msgid "/Re-_edit"
 msgstr "/다시 편집(_e)"
 
-#: src/summaryview.c:436
+#: src/summaryview.c:438
 #, fuzzy
 msgid "/Add sender to address boo_k..."
 msgstr "/주소록에 보낸이 추가(_k)"
 
-#: src/summaryview.c:438
+#: src/summaryview.c:440
 msgid "/Create f_ilter rule"
 msgstr "/필터 규칙 생성(_i)"
 
-#: src/summaryview.c:439
+#: src/summaryview.c:441
 msgid "/Create f_ilter rule/_Automatically"
 msgstr "/필터 규칙 생성(_i)/자동(_A)"
 
-#: src/summaryview.c:441
+#: src/summaryview.c:443
 msgid "/Create f_ilter rule/by _From"
 msgstr "/필터 규칙 생성(_i)/보낸이로(_F)"
 
-#: src/summaryview.c:443
+#: src/summaryview.c:445
 msgid "/Create f_ilter rule/by _To"
 msgstr "/필터 규칙 생성(_i)/받는이로(_T)"
 
-#: src/summaryview.c:445
+#: src/summaryview.c:447
 msgid "/Create f_ilter rule/by _Subject"
 msgstr "/필터 규칙 생성(_i)/제목으로(_S)"
 
-#: src/summaryview.c:451
+#: src/summaryview.c:453
 msgid "/_View/_Source"
 msgstr "/보기(_V)/소스(_S)"
 
-#: src/summaryview.c:452
+#: src/summaryview.c:454
 msgid "/_View/All _header"
 msgstr "/보기(_V)/모든 헤더(_h)"
 
-#: src/summaryview.c:454
+#: src/summaryview.c:456
 msgid "/_Print..."
 msgstr "/인쇄(_)..."
 
-#: src/summaryview.c:486
+#: src/summaryview.c:488
 msgid "Creating summary view...\n"
 msgstr "요약 창을 생성합니다...\n"
 
-#: src/summaryview.c:508
+#: src/summaryview.c:510
 msgid "All"
 msgstr ""
 
-#: src/summaryview.c:511
+#: src/summaryview.c:513
 #, fuzzy
 msgid "Have color label"
 msgstr "/색 라벨(_b)"
 
-#: src/summaryview.c:512
+#: src/summaryview.c:514
 #, fuzzy
 msgid "Have attachment"
 msgstr "첨부"
 
-#: src/summaryview.c:521
+#: src/summaryview.c:523
 #, fuzzy
 msgid "Search:"
 msgstr "찾기"
 
-#: src/summaryview.c:535
+#: src/summaryview.c:537
 msgid "Search for Subject or From"
 msgstr ""
 
-#: src/summaryview.c:702
+#: src/summaryview.c:704
 msgid "Process mark"
 msgstr "표시 처리"
 
-#: src/summaryview.c:703
+#: src/summaryview.c:705
 msgid "Some marks are left. Process it?"
 msgstr "표시가 여전히 남아있습니다. 그것들을 처리할까요?"
 
-#: src/summaryview.c:749
+#: src/summaryview.c:751
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "폴더(%s)를 스캔..."
 
-#: src/summaryview.c:1292
+#: src/summaryview.c:1295
 #, fuzzy
 msgid "_Search again"
 msgstr "다시 찾기"
 
-#: src/summaryview.c:1313 src/summaryview.c:1322
+#: src/summaryview.c:1316 src/summaryview.c:1325
 msgid "No more unread messages"
 msgstr "안 읽은 메시지가 없슴 "
 
-#: src/summaryview.c:1314
+#: src/summaryview.c:1317
 msgid "No unread message found. Search from the end?"
 msgstr "안 읽은 메시지가 없습니다. 끝에서 부터 찾을까요?"
 
-#: src/summaryview.c:1316
+#: src/summaryview.c:1319
 msgid "No unread messages."
 msgstr "안 읽은 메시지가 없습니다."
 
-#: src/summaryview.c:1323
+#: src/summaryview.c:1326
 msgid "No unread message found. Go to next folder?"
 msgstr "안 읽은 메시지가 없습니다. 다음 폴더로 갈까요?"
 
-#: src/summaryview.c:1331 src/summaryview.c:1340
+#: src/summaryview.c:1334 src/summaryview.c:1343
 msgid "No more new messages"
 msgstr "새 메시지가 없습니다."
 
-#: src/summaryview.c:1332
+#: src/summaryview.c:1335
 msgid "No new message found. Search from the end?"
 msgstr "새 메시지가 없습니다. 끝에서 부터 찾을까요?"
 
-#: src/summaryview.c:1334
+#: src/summaryview.c:1337
 msgid "No new messages."
 msgstr "새 메시지가 없습니다."
 
-#: src/summaryview.c:1341
+#: src/summaryview.c:1344
 msgid "No new message found. Go to next folder?"
 msgstr "새 메시지가 없습니다. 다음 폴더로 갈까요?"
 
-#: src/summaryview.c:1349 src/summaryview.c:1358
+#: src/summaryview.c:1352 src/summaryview.c:1361
 msgid "No more marked messages"
 msgstr "표시된 메시지가 없습니다"
 
-#: src/summaryview.c:1350
+#: src/summaryview.c:1353
 msgid "No marked message found. Search from the end?"
 msgstr "표시된 메시지가 없습니다. 끝에서 부터 찾을까요?"
 
-#: src/summaryview.c:1352 src/summaryview.c:1361
+#: src/summaryview.c:1355 src/summaryview.c:1364
 msgid "No marked messages."
 msgstr "표시된 메시지가 없습니다."
 
-#: src/summaryview.c:1359
+#: src/summaryview.c:1362
 msgid "No marked message found. Search from the beginning?"
 msgstr "표시된 메시지가 없습니다. 다음 폴더로 갈까요?"
 
-#: src/summaryview.c:1367 src/summaryview.c:1376
+#: src/summaryview.c:1370 src/summaryview.c:1379
 msgid "No more labeled messages"
 msgstr "꼬리표있는 메시지가 없습니다"
 
-#: src/summaryview.c:1368
+#: src/summaryview.c:1371
 msgid "No labeled message found. Search from the end?"
 msgstr "꼬리표있는 메시지가 없습니다. 끝에서 부터 찾을까요?"
 
-#: src/summaryview.c:1370 src/summaryview.c:1379
+#: src/summaryview.c:1373 src/summaryview.c:1382
 msgid "No labeled messages."
 msgstr "꼬리표있는 메시지가 없습니다."
 
-#: src/summaryview.c:1377
+#: src/summaryview.c:1380
 msgid "No labeled message found. Search from the beginning?"
 msgstr "꼬리표있는 메시지가 없습니다. 처음부터 찾을까요?"
 
-#: src/summaryview.c:1693
+#: src/summaryview.c:1696
 msgid "Attracting messages by subject..."
 msgstr ""
 
-#: src/summaryview.c:1887
+#: src/summaryview.c:1890
 #, c-format
 msgid "%d deleted"
 msgstr "%d개 삭제됨"
 
-#: src/summaryview.c:1891
+#: src/summaryview.c:1894
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d개 이동"
 
-#: src/summaryview.c:1892 src/summaryview.c:1897
+#: src/summaryview.c:1895 src/summaryview.c:1900
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:1896
+#: src/summaryview.c:1899
 #, c-format
 msgid "%s%d copied"
 msgstr ""
 
-#: src/summaryview.c:1911
+#: src/summaryview.c:1914
 msgid " item(s) selected"
 msgstr " 아이템 선택"
 
-#: src/summaryview.c:1933
+#: src/summaryview.c:1936
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d 새 메시지, %d 안 읽음, %d개 메시지(%s)"
 
-#: src/summaryview.c:1937
+#: src/summaryview.c:1940
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d 새 메시지, %d 안 읽음, %d개 메시지"
 
-#: src/summaryview.c:1971
+#: src/summaryview.c:1974
 msgid "Sorting summary..."
 msgstr "요약을 정렬합니다..."
 
-#: src/summaryview.c:2194
+#: src/summaryview.c:2211
 msgid "\tSetting summary from message data..."
 msgstr "\t메시지 데이타로부터 요약을 만듭니다..."
 
-#: src/summaryview.c:2196
+#: src/summaryview.c:2213
 msgid "Setting summary from message data..."
 msgstr "메시지 데이타로부터 요약을 만듭니다..."
 
-#: src/summaryview.c:2302
+#: src/summaryview.c:2319
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "요약 캐쉬 (%s)를 씁니다..."
 
-#: src/summaryview.c:2643
+#: src/summaryview.c:2660
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "메시지 %d가 표시되었습니다\n"
 
-#: src/summaryview.c:2701
+#: src/summaryview.c:2718
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "메시지 %d가 읽은 것으로 표시되었습니다\n"
 
-#: src/summaryview.c:2789
+#: src/summaryview.c:2908
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "메시지 %d가 읽지않은 것으로 표시되었습니다\n"
 
-#: src/summaryview.c:2850
+#: src/summaryview.c:2969
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "메시지 %s/%d가 지울것으로 표시되었습니다\n"
 
-#: src/summaryview.c:2878
+#: src/summaryview.c:2997
 msgid "Delete message(s)"
 msgstr "메시지를 지웁니다"
 
-#: src/summaryview.c:2879
+#: src/summaryview.c:2998
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "정말로 이 메시지를 휴지통에서 삭제하시겠습니까?"
 
-#: src/summaryview.c:2953
+#: src/summaryview.c:3072
 msgid "Deleting duplicated messages..."
 msgstr "중복된 메시지를 지웁니다..."
 
-#: src/summaryview.c:2991
+#: src/summaryview.c:3110
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "메시지 %s/%d의 표시를 지웠습니다\n"
 
-#: src/summaryview.c:3049
+#: src/summaryview.c:3168
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "메시지 %d가 %s로 이동하도록 했습니다\n"
 
-#: src/summaryview.c:3066
+#: src/summaryview.c:3196
 msgid "Destination is same as current folder."
 msgstr "도착지가 현재 폴더와 같습니다"
 
-#: src/summaryview.c:3122
+#: src/summaryview.c:3260
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr ""
 
-#: src/summaryview.c:3139
+#: src/summaryview.c:3288
 #, fuzzy
 msgid "Destination for copy is same as current folder."
 msgstr "복사할 대상이 현재 폴더와 같습니다."
 
-#: src/summaryview.c:3338
+#: src/summaryview.c:3495
 #, fuzzy
 msgid "Error occurred while processing messages."
 msgstr "메일을 처리하는 도중 에러"
 
-#: src/summaryview.c:3646 src/summaryview.c:3647
+#: src/summaryview.c:3803 src/summaryview.c:3804
 msgid "Building threads..."
 msgstr "쓰레드를 만듭니다..."
 
-#: src/summaryview.c:3797 src/summaryview.c:3798
+#: src/summaryview.c:3954 src/summaryview.c:3955
 msgid "Unthreading..."
 msgstr "쓰레드를 없앱니다..."
 
-#: src/summaryview.c:4091 src/summaryview.c:4147
+#: src/summaryview.c:4248 src/summaryview.c:4304
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "필터링..."
 
-#: src/summaryview.c:4196
+#: src/summaryview.c:4353
 msgid "filtering..."
 msgstr "필터링..."
 
-#: src/summaryview.c:4197
+#: src/summaryview.c:4354
 msgid "Filtering..."
 msgstr "필터링..."
 
-#: src/summaryview.c:4233
+#: src/summaryview.c:4390
 #, fuzzy, c-format
 msgid "%d message(s) have been filtered."
 msgstr "메시지 %d는 이미 캐쉬되었습니다.\n"
 
-#: src/summaryview.c:4742
+#: src/summaryview.c:4899
 msgid "No."
 msgstr "번호"
 
@@ -6591,36 +6622,36 @@ msgstr "텍스트 뷰를 생성합니다...\n"
 msgid "This message can't be displayed.\n"
 msgstr "이 메시지를 받지않을 것입니다\n"
 
-#: src/textview.c:1929
+#: src/textview.c:1925
 #, fuzzy
 msgid "Sa_ve this image as..."
 msgstr "/새 이름으로(_S)..."
 
-#: src/textview.c:1945 src/trayicon.c:109
+#: src/textview.c:1941 src/trayicon.c:109
 #, fuzzy
 msgid "Compose _new message"
 msgstr "새 메시지를 작성합니다"
 
-#: src/textview.c:1947
+#: src/textview.c:1943
 #, fuzzy
 msgid "Add to address _book..."
 msgstr "/주소록에 보낸이 추가(_k)"
 
-#: src/textview.c:1949
+#: src/textview.c:1945
 #, fuzzy
 msgid "Copy this add_ress"
 msgstr "공용 주소록"
 
-#: src/textview.c:1952
+#: src/textview.c:1948
 #, fuzzy
 msgid "_Open with Web browser"
 msgstr "웹 탐색기"
 
-#: src/textview.c:1954
+#: src/textview.c:1950
 msgid "Copy this _link"
 msgstr ""
 
-#: src/textview.c:2097
+#: src/textview.c:2093
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6629,7 +6660,7 @@ msgid ""
 "Open it anyway?"
 msgstr ""
 
-#: src/textview.c:2102
+#: src/textview.c:2098
 msgid "Fake URL warning"
 msgstr ""
 
diff --git a/po/lt.po b/po/lt.po
index e337331c..b4349203 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: 2006-01-27 18:11+0900\n"
+"POT-Creation-Date: 2006-01-31 15:20+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"
@@ -506,7 +506,7 @@ msgstr "Rasta %s\n"
 msgid "Configuration is saved.\n"
 msgstr "Nustatymai išsaugoti.\n"
 
-#: libsylph/prefs_common.c:489
+#: libsylph/prefs_common.c:491
 msgid "Junk mail filter"
 msgstr "Nereikalingo pašto filtras"
 
@@ -621,8 +621,8 @@ msgstr "%.2fMB"
 msgid "%.2fGB"
 msgstr "%.2fGB"
 
-#: libsylph/utils.c:2373 src/compose.c:2858 src/compose.c:3121
-#: src/compose.c:3184 src/compose.c:3304
+#: libsylph/utils.c:2373 src/compose.c:2867 src/compose.c:3130
+#: src/compose.c:3193 src/compose.c:3313
 msgid "can't change file mode\n"
 msgstr "negaliu pakeisti bylos rėžimo\n"
 
@@ -708,8 +708,8 @@ msgstr ""
 "Naujos žinutės bus tikrinamos šia tvarka. Pažymėkite laukelį\n"
 "skulpelyje „G“ jei norite gauti žinutes pasirinkę „Gauti visus“."
 
-#: src/account_dialog.c:366 src/addressadd.c:192 src/addressbook.c:491
-#: src/compose.c:4262 src/editaddress.c:200 src/editaddress.c:942
+#: src/account_dialog.c:366 src/addressadd.c:192 src/addressbook.c:493
+#: src/compose.c:4271 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:206 src/prefs_filter.c:259 src/prefs_folder_item.c:171
@@ -845,12 +845,12 @@ msgstr "Vartotojo veiksmo argumentas"
 msgid "Add Address to Book"
 msgstr "Įdėti adresą į knygą"
 
-#: src/addressadd.c:202 src/compose.c:4762 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4771 src/editaddress.c:201
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "Adresas"
 
-#: src/addressadd.c:212 src/addressbook.c:493 src/editaddress.c:202
+#: src/addressadd.c:212 src/addressbook.c:495 src/editaddress.c:202
 #: src/editaddress.c:795 src/editaddress.c:860 src/editgroup.c:267
 msgid "Remarks"
 msgstr "Pastabos"
@@ -859,183 +859,183 @@ msgstr "Pastabos"
 msgid "Select Address Book Folder"
 msgstr "Pažymėkite adresų knygos katalogą"
 
-#: src/addressbook.c:336 src/compose.c:515 src/mainwindow.c:477
+#: src/addressbook.c:338 src/compose.c:515 src/mainwindow.c:480
 #: src/messageview.c:138
 msgid "/_File"
 msgstr "/_Byla"
 
-#: src/addressbook.c:337
+#: src/addressbook.c:339
 msgid "/_File/New _Book"
 msgstr "/_Byla/Nauja _Knyga"
 
-#: src/addressbook.c:338
+#: src/addressbook.c:340
 msgid "/_File/New _vCard"
 msgstr "/_Byla/Nauja „_vCard“ kortelė"
 
-#: src/addressbook.c:340
+#: src/addressbook.c:342
 msgid "/_File/New _JPilot"
 msgstr "/_Byla/Naujas _JPilot"
 
-#: src/addressbook.c:343
+#: src/addressbook.c:345
 msgid "/_File/New _Server"
 msgstr "/_Byla/Naujas _serveris"
 
-#: src/addressbook.c:345 src/addressbook.c:348 src/compose.c:520
-#: src/compose.c:525 src/compose.c:528 src/compose.c:531 src/mainwindow.c:495
-#: src/mainwindow.c:498 src/mainwindow.c:500 src/mainwindow.c:503
-#: src/mainwindow.c:505 src/messageview.c:141
+#: src/addressbook.c:347 src/addressbook.c:350 src/compose.c:520
+#: src/compose.c:525 src/compose.c:528 src/compose.c:531 src/mainwindow.c:498
+#: src/mainwindow.c:501 src/mainwindow.c:503 src/mainwindow.c:506
+#: src/mainwindow.c:508 src/messageview.c:141
 msgid "/_File/---"
 msgstr "/_Byla/---"
 
-#: src/addressbook.c:346
+#: src/addressbook.c:348
 msgid "/_File/_Edit"
 msgstr "/_Byla/_Taisyti"
 
-#: src/addressbook.c:347
+#: src/addressbook.c:349
 msgid "/_File/_Delete"
 msgstr "/_Byla/Išt_rinti"
 
-#: src/addressbook.c:349
+#: src/addressbook.c:351
 msgid "/_File/_Save"
 msgstr "/_Byla/Iš_saugoti"
 
-#: src/addressbook.c:350 src/compose.c:532 src/messageview.c:142
+#: src/addressbook.c:352 src/compose.c:532 src/messageview.c:142
 msgid "/_File/_Close"
 msgstr "/_Byla/_Užverti"
 
-#: src/addressbook.c:351
+#: src/addressbook.c:353
 msgid "/_Address"
 msgstr "/_Adresas"
 
-#: src/addressbook.c:352
+#: src/addressbook.c:354
 msgid "/_Address/New _Address"
 msgstr "/_Adresas/Naujas _adresas"
 
-#: src/addressbook.c:353
+#: src/addressbook.c:355
 msgid "/_Address/New _Group"
 msgstr "/_Adresas/Nauja _grupė"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:356
 msgid "/_Address/New _Folder"
 msgstr "/_Adresas/Naujas _katalogas"
 
-#: src/addressbook.c:355
+#: src/addressbook.c:357
 msgid "/_Address/---"
 msgstr "/_Adresas/---"
 
-#: src/addressbook.c:356
+#: src/addressbook.c:358
 msgid "/_Address/_Edit"
 msgstr "/_Adresas/_Redaguoti"
 
-#: src/addressbook.c:357
+#: src/addressbook.c:359
 msgid "/_Address/_Delete"
 msgstr "/_Adresas/Išt_rinti"
 
-#: src/addressbook.c:358 src/compose.c:639 src/mainwindow.c:738
-#: src/messageview.c:259
+#: src/addressbook.c:360 src/compose.c:645 src/mainwindow.c:749
+#: src/messageview.c:264
 msgid "/_Tools"
 msgstr "/Į_rankiai"
 
-#: src/addressbook.c:359
+#: src/addressbook.c:361
 msgid "/_Tools/Import _LDIF file"
 msgstr "/Į_rankiai/Importuoti _LDIF bylą"
 
-#: src/addressbook.c:360 src/compose.c:658 src/mainwindow.c:788
-#: src/messageview.c:277
+#: src/addressbook.c:362 src/compose.c:664 src/mainwindow.c:799
+#: src/messageview.c:282
 msgid "/_Help"
 msgstr "/_Pagalba"
 
-#: src/addressbook.c:361 src/compose.c:659 src/mainwindow.c:799
-#: src/messageview.c:278
+#: src/addressbook.c:363 src/compose.c:665 src/mainwindow.c:810
+#: src/messageview.c:283
 msgid "/_Help/_About"
 msgstr "/_Pagalba/_Apie"
 
-#: src/addressbook.c:380 src/addressbook.c:390
+#: src/addressbook.c:382 src/addressbook.c:392
 msgid "/New _Address"
 msgstr "/Naujas _adresas"
 
-#: src/addressbook.c:381 src/addressbook.c:391
+#: src/addressbook.c:383 src/addressbook.c:393
 msgid "/New _Group"
 msgstr "/Nauja _grupė"
 
-#: src/addressbook.c:382 src/addressbook.c:392
+#: src/addressbook.c:384 src/addressbook.c:394
 msgid "/New _Folder"
 msgstr "/Naujas _katalogas"
 
-#: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:509
+#: src/addressbook.c:385 src/addressbook.c:395 src/compose.c:509
 #: src/folderview.c:246 src/folderview.c:248 src/folderview.c:253
 #: src/folderview.c:266 src/folderview.c:268 src/folderview.c:270
 #: src/folderview.c:275 src/folderview.c:289 src/folderview.c:291
 #: src/folderview.c:295 src/summaryview.c:414 src/summaryview.c:418
-#: src/summaryview.c:421 src/summaryview.c:431 src/summaryview.c:433
-#: src/summaryview.c:435 src/summaryview.c:447 src/summaryview.c:453
+#: src/summaryview.c:421 src/summaryview.c:433 src/summaryview.c:435
+#: src/summaryview.c:437 src/summaryview.c:449 src/summaryview.c:455
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:534
-#: src/mainwindow.c:509 src/messageview.c:144
+#: src/addressbook.c:386 src/addressbook.c:396 src/compose.c:534
+#: src/mainwindow.c:512 src/messageview.c:144
 msgid "/_Edit"
 msgstr "/_Taisyti"
 
-#: src/addressbook.c:385 src/addressbook.c:395 src/summaryview.c:432
+#: src/addressbook.c:387 src/addressbook.c:397 src/summaryview.c:434
 msgid "/_Delete"
 msgstr "/_Ištrinti"
 
-#: src/addressbook.c:492
+#: src/addressbook.c:494
 msgid "E-Mail address"
 msgstr "El. pašto adresas"
 
-#: src/addressbook.c:496 src/compose.c:4763 src/prefs_common_dialog.c:2183
+#: src/addressbook.c:498 src/compose.c:4772 src/prefs_common_dialog.c:2183
 msgid "Address book"
 msgstr "Adresų knyga"
 
-#: src/addressbook.c:596 src/prefs_filter_edit.c:249
+#: src/addressbook.c:600 src/prefs_filter_edit.c:249
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "Vardas:"
 
 #. Buttons
-#: src/addressbook.c:628 src/addressbook.c:1680 src/editaddress.c:884
-#: src/editaddress.c:1017 src/mainwindow.c:2391 src/prefs_actions.c:266
+#: src/addressbook.c:632 src/addressbook.c:1684 src/editaddress.c:884
+#: src/editaddress.c:1017 src/mainwindow.c:2402 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
 #: src/prefs_template.c:233
 msgid "Delete"
 msgstr "Ištrinti"
 
-#: src/addressbook.c:631 src/editaddress.c:890 src/editaddress.c:1023
+#: src/addressbook.c:635 src/editaddress.c:890 src/editaddress.c:1023
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:273 src/prefs_display_header.c:328
 #: src/prefs_filter_edit.c:1550
 msgid "Add"
 msgstr "Pridėti"
 
-#: src/addressbook.c:634
+#: src/addressbook.c:638
 msgid "Lookup"
 msgstr "Ieškoti"
 
-#: src/addressbook.c:646 src/headerview.c:55 src/prefs_folder_item.c:339
+#: src/addressbook.c:650 src/headerview.c:55 src/prefs_folder_item.c:339
 #: src/prefs_template.c:176
 msgid "To:"
 msgstr "Kam:"
 
-#: src/addressbook.c:650 src/prefs_folder_item.c:356 src/prefs_template.c:178
+#: src/addressbook.c:654 src/prefs_folder_item.c:356 src/prefs_template.c:178
 msgid "Cc:"
 msgstr "Kopija:"
 
-#: src/addressbook.c:654 src/prefs_folder_item.c:367
+#: src/addressbook.c:658 src/prefs_folder_item.c:367
 msgid "Bcc:"
 msgstr "Slapta kopija:"
 
 #. Confirm deletion
-#: src/addressbook.c:841
+#: src/addressbook.c:845
 msgid "Delete address(es)"
 msgstr "Pašalinti adresą(-us)"
 
-#: src/addressbook.c:842
+#: src/addressbook.c:846
 msgid "Really delete the address(es)?"
 msgstr "Ar tikrai pašalinti adresą(-us)?"
 
-#: src/addressbook.c:1671
+#: src/addressbook.c:1675
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1044,36 +1044,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:1674 src/folderview.c:2351
+#: src/addressbook.c:1678 src/folderview.c:2351
 msgid "Delete folder"
 msgstr "Ištrinti katalogą"
 
-#: src/addressbook.c:1674
+#: src/addressbook.c:1678
 msgid "_Folder only"
 msgstr "Tik _katalogą"
 
-#: src/addressbook.c:1674
+#: src/addressbook.c:1678
 msgid "Folder and _addresses"
 msgstr "Katalogą ir _adresus jame"
 
-#: src/addressbook.c:1679
+#: src/addressbook.c:1683
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Tikrai pašalinti „%s“?"
 
-#: src/addressbook.c:2365 src/addressbook.c:2498
+#: src/addressbook.c:2369 src/addressbook.c:2502
 msgid "New user, could not save index file."
 msgstr "Naujas vartotojas, negaliu išsaugoti „index“ bylos."
 
-#: src/addressbook.c:2369 src/addressbook.c:2502
+#: src/addressbook.c:2373 src/addressbook.c:2506
 msgid "New user, could not save address book files."
 msgstr "Naujas vartotojas, negaliu išsaugoti adresų knygos bylų."
 
-#: src/addressbook.c:2379 src/addressbook.c:2512
+#: src/addressbook.c:2383 src/addressbook.c:2516
 msgid "Old address book converted successfully."
 msgstr "Adresų knyga sėkmingai konvertuota"
 
-#: src/addressbook.c:2384
+#: src/addressbook.c:2388
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1081,7 +1081,7 @@ msgstr ""
 "Sena adresų knyga konvertuota,\n"
 "negaliu išsaugoti naujo adresų indekso bylos"
 
-#: src/addressbook.c:2397
+#: src/addressbook.c:2401
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1089,7 +1089,7 @@ msgstr ""
 "Negaliu konvertuoti adresų knygos,\n"
 "bet sukūriau tuščias naujos knygos bylas."
 
-#: src/addressbook.c:2403
+#: src/addressbook.c:2407
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1097,7 +1097,7 @@ msgstr ""
 "Negaliu konvertuoti adresų knygos,\n"
 "negaliu sukurti naujos knygos bylų."
 
-#: src/addressbook.c:2408
+#: src/addressbook.c:2412
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1105,87 +1105,87 @@ msgstr ""
 "Negaliu konvertuoti adresų knygos,\n"
 "ir negaliu sukurti naujos knygos bylų."
 
-#: src/addressbook.c:2415
+#: src/addressbook.c:2419
 msgid "Addressbook conversion error"
 msgstr "Adresų knygos konvertavimo klaida"
 
-#: src/addressbook.c:2419
+#: src/addressbook.c:2423
 msgid "Addressbook conversion"
 msgstr "Adresų knygos konvertavimas"
 
-#: src/addressbook.c:2454
+#: src/addressbook.c:2458
 msgid "Addressbook Error"
 msgstr "Adresų knygos klaida"
 
-#: src/addressbook.c:2455 src/addressbook.c:2555
+#: src/addressbook.c:2459 src/addressbook.c:2559
 msgid "Could not read address index"
 msgstr "Negaliu perskaityti adresų indekso"
 
-#: src/addressbook.c:2517
+#: src/addressbook.c:2521
 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:2531
+#: src/addressbook.c:2535
 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:2537
+#: src/addressbook.c:2541
 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:2543
+#: src/addressbook.c:2547
 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:2561
+#: src/addressbook.c:2565
 msgid "Addressbook Conversion Error"
 msgstr "Adresų knygos konvertavimo klaida"
 
-#: src/addressbook.c:2567
+#: src/addressbook.c:2571
 msgid "Addressbook Conversion"
 msgstr "Adresų knygos konvertavimas"
 
-#: src/addressbook.c:3072 src/prefs_common_dialog.c:2033
+#: src/addressbook.c:3086 src/prefs_common_dialog.c:2033
 msgid "Interface"
 msgstr "Sąsaja"
 
-#: src/addressbook.c:3088 src/importldif.c:514
+#: src/addressbook.c:3102 src/importldif.c:514
 msgid "Address Book"
 msgstr "Adresų knyga"
 
-#: src/addressbook.c:3104
+#: src/addressbook.c:3118
 msgid "Person"
 msgstr "Asmuo"
 
-#: src/addressbook.c:3120
+#: src/addressbook.c:3134
 msgid "EMail Address"
 msgstr "El. pašto adresas"
 
-#: src/addressbook.c:3136
+#: src/addressbook.c:3150
 msgid "Group"
 msgstr "Grupė"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3152 src/folderview.c:367 src/prefs_account_dialog.c:1694
+#: src/addressbook.c:3166 src/folderview.c:367 src/prefs_account_dialog.c:1694
 #: src/query_search.c:370
 msgid "Folder"
 msgstr "Katalogas"
 
-#: src/addressbook.c:3168
+#: src/addressbook.c:3182
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3184 src/addressbook.c:3200
+#: src/addressbook.c:3198 src/addressbook.c:3214
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3216
+#: src/addressbook.c:3230
 msgid "LDAP Server"
 msgstr "LDAP serveris"
 
@@ -1197,7 +1197,7 @@ msgstr "Bendras adresas"
 msgid "Personal address"
 msgstr "Asmeninis adresas"
 
-#: src/alertpanel.c:141 src/compose.c:5485 src/main.c:573
+#: src/alertpanel.c:141 src/compose.c:5494 src/main.c:573
 msgid "Notice"
 msgstr "Pranešimas"
 
@@ -1248,7 +1248,7 @@ msgstr "Ruda"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4593
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4750
 msgid "None"
 msgstr "Nieko"
 
@@ -1306,7 +1306,7 @@ msgstr "/_Taisyti/_Atšaukti"
 msgid "/_Edit/_Redo"
 msgstr "/_Taisyti/Pa_kartoti"
 
-#: src/compose.c:537 src/compose.c:544 src/mainwindow.c:513
+#: src/compose.c:537 src/compose.c:544 src/mainwindow.c:516
 #: src/messageview.c:147
 msgid "/_Edit/---"
 msgstr "/_Taisyti/---"
@@ -1315,7 +1315,7 @@ msgstr "/_Taisyti/---"
 msgid "/_Edit/Cu_t"
 msgstr "/_Taisyti/Iškirp_ti"
 
-#: src/compose.c:539 src/mainwindow.c:510 src/messageview.c:145
+#: src/compose.c:539 src/mainwindow.c:513 src/messageview.c:145
 msgid "/_Edit/_Copy"
 msgstr "/_Taisyti/Kopi_juoti"
 
@@ -1327,7 +1327,7 @@ msgstr "/_Taisyti/Į_dėti"
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Taisyti/Įdėti kaip _citatą"
 
-#: src/compose.c:543 src/mainwindow.c:511 src/messageview.c:146
+#: src/compose.c:543 src/mainwindow.c:514 src/messageview.c:146
 msgid "/_Edit/Select _all"
 msgstr "/_Taisyti/Žymėti _viską"
 
@@ -1343,8 +1343,8 @@ msgstr "/_Taisyti/Laužyti _visas ilgas eilutes"
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Taisyti/_Automatiškai laužyti"
 
-#: src/compose.c:550 src/mainwindow.c:518 src/messageview.c:151
-#: src/summaryview.c:448
+#: src/compose.c:550 src/mainwindow.c:521 src/messageview.c:151
+#: src/summaryview.c:450
 msgid "/_View"
 msgstr "/_Rodyti"
 
@@ -1365,9 +1365,9 @@ msgid "/_View/_Reply to"
 msgstr "/_Rodyti/Kam _atsakyti"
 
 #: src/compose.c:555 src/compose.c:557 src/compose.c:559 src/compose.c:561
-#: src/mainwindow.c:538 src/mainwindow.c:541 src/mainwindow.c:568
-#: src/mainwindow.c:592 src/mainwindow.c:687 src/mainwindow.c:691
-#: src/messageview.c:236
+#: src/mainwindow.c:541 src/mainwindow.c:544 src/mainwindow.c:571
+#: src/mainwindow.c:595 src/mainwindow.c:696 src/mainwindow.c:700
+#: src/messageview.c:241
 msgid "/_View/---"
 msgstr "/_Rodyti/---"
 
@@ -1383,7 +1383,7 @@ msgstr "/_Rodyti/_Liniuotė"
 msgid "/_View/_Attachment"
 msgstr "/_Rodyti/Prise_gtos bylos"
 
-#: src/compose.c:567 src/mainwindow.c:599 src/messageview.c:158
+#: src/compose.c:567 src/mainwindow.c:602 src/messageview.c:158
 msgid "/_View/Character _encoding"
 msgstr "/_Rodyti/Simbolių ko_duotė"
 
@@ -1392,214 +1392,225 @@ msgid "/_View/Character _encoding/_Automatic"
 msgstr "/_Rodyti/Simbolių ko_duotė/_Automatiškai"
 
 #: src/compose.c:570 src/compose.c:576 src/compose.c:582 src/compose.c:586
-#: src/compose.c:592 src/compose.c:596 src/compose.c:602 src/compose.c:606
-#: src/compose.c:616 src/compose.c:620 src/compose.c:628 src/compose.c:632
-#: src/mainwindow.c:595 src/mainwindow.c:602 src/messageview.c:154
+#: src/compose.c:592 src/compose.c:596 src/compose.c:602 src/compose.c:608
+#: src/compose.c:612 src/compose.c:622 src/compose.c:626 src/compose.c:634
+#: src/compose.c:638 src/mainwindow.c:598 src/mainwindow.c:605
+#: src/messageview.c:154
 msgid "/_View/Character _encoding/---"
 msgstr "/_Rodyti/Simbolių ko_duotė/---"
 
-#: src/compose.c:572 src/mainwindow.c:603 src/messageview.c:162
+#: src/compose.c:572 src/mainwindow.c:606 src/messageview.c:162
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Rodyti/Simbolių ko_duotė/7bit ascii (US-ASC_II)"
 
-#: src/compose.c:574 src/mainwindow.c:605 src/messageview.c:165
+#: src/compose.c:574 src/mainwindow.c:608 src/messageview.c:165
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Rodyti/Simbolių ko_duotė/Unikodas (_UTF-8)"
 
-#: src/compose.c:578 src/mainwindow.c:609 src/messageview.c:168
+#: src/compose.c:578 src/mainwindow.c:612 src/messageview.c:168
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Rodyti/Simbolių ko_duotė/Vakarų Europos (ISO-8859-_1)"
 
-#: src/compose.c:580 src/mainwindow.c:611 src/messageview.c:170
+#: src/compose.c:580 src/mainwindow.c:614 src/messageview.c:170
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Rodyti/Simbolių ko_duotė/Vakarų Europos (ISO-8859-15)"
 
-#: src/compose.c:584 src/mainwindow.c:617 src/messageview.c:175
+#: src/compose.c:584 src/mainwindow.c:620 src/messageview.c:175
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Rodyti/Simbolių ko_duotė/Centrinės Europos (ISO-8859-_2)"
 
-#: src/compose.c:588 src/mainwindow.c:621 src/messageview.c:178
+#: src/compose.c:588 src/mainwindow.c:624 src/messageview.c:178
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Rodyti/Simbolių ko_duotė/_Baltų (ISO-8859-13)"
 
-#: src/compose.c:590 src/mainwindow.c:623 src/messageview.c:180
+#: src/compose.c:590 src/mainwindow.c:626 src/messageview.c:180
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Rodyti/Simbolių ko_duotė/Baltų (ISO-8859-_4)"
 
-#: src/compose.c:594 src/mainwindow.c:627 src/messageview.c:183
+#: src/compose.c:594 src/mainwindow.c:630 src/messageview.c:183
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Rodyti/Simbolių ko_duotė/Graikų (ISO-8859-_7)"
 
-#: src/compose.c:598 src/mainwindow.c:631 src/messageview.c:186
+#: src/compose.c:598 src/mainwindow.c:634 src/messageview.c:186
+#, fuzzy
+msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
+msgstr "/_Rodyti/Simbolių ko_duotė/Baltų (ISO-8859-_4)"
+
+#: src/compose.c:600 src/mainwindow.c:636 src/messageview.c:188
+#, fuzzy
+msgid "/_View/Character _encoding/Arabic (Windows-1256)"
+msgstr "/_Rodyti/Simbolių ko_duotė/Kirilica (Windows-1251)"
+
+#: src/compose.c:604 src/mainwindow.c:640 src/messageview.c:191
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Rodyti/Simbolių ko_duotė/Hebrajų (ISO-8859-_8)"
 
-#: src/compose.c:600 src/mainwindow.c:633 src/messageview.c:188
+#: src/compose.c:606 src/mainwindow.c:642 src/messageview.c:193
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Rodyti/Simbolių ko_duotė/Hebrajų (Windows-1255)"
 
-#: src/compose.c:604 src/mainwindow.c:637 src/messageview.c:191
+#: src/compose.c:610 src/mainwindow.c:646 src/messageview.c:196
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Rodyti/Simbolių ko_duotė/Turkų (ISO-8859-_9)"
 
-#: src/compose.c:608 src/mainwindow.c:641 src/messageview.c:194
+#: src/compose.c:614 src/mainwindow.c:650 src/messageview.c:199
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Rodyti/Simbolių ko_duotė/Kirilica (ISO-8859-_5)"
 
-#: src/compose.c:610 src/mainwindow.c:643 src/messageview.c:196
+#: src/compose.c:616 src/mainwindow.c:652 src/messageview.c:201
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Rodyti/Simbolių ko_duotė/Kirilica (KOI8-_R)"
 
-#: src/compose.c:612 src/mainwindow.c:645 src/messageview.c:198
+#: src/compose.c:618 src/mainwindow.c:654 src/messageview.c:203
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Rodyti/Simbolių ko_duotė/Kirilica (KOI8-U)"
 
-#: src/compose.c:614 src/mainwindow.c:647 src/messageview.c:200
+#: src/compose.c:620 src/mainwindow.c:656 src/messageview.c:205
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Rodyti/Simbolių ko_duotė/Kirilica (Windows-1251)"
 
-#: src/compose.c:618 src/mainwindow.c:651 src/messageview.c:203
+#: src/compose.c:624 src/mainwindow.c:660 src/messageview.c:208
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Rodyti/Simbolių ko_duotė/Japonų (ISO-2022-_JP)"
 
-#: src/compose.c:622 src/mainwindow.c:661 src/messageview.c:212
+#: src/compose.c:628 src/mainwindow.c:670 src/messageview.c:217
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Rodyti/Simbolių ko_duotė/Supaprastinta Kinų (_GB2312)"
 
-#: src/compose.c:624 src/mainwindow.c:663 src/messageview.c:214
+#: src/compose.c:630 src/mainwindow.c:672 src/messageview.c:219
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Rodyti/Simbolių ko_duotė/Supaprastinta Kinų (GBK)"
 
-#: src/compose.c:626 src/mainwindow.c:665 src/messageview.c:216
+#: src/compose.c:632 src/mainwindow.c:674 src/messageview.c:221
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Rodyti/Simbolių ko_duotė/Tradicinė Kinų (_Big5)"
 
-#: src/compose.c:630 src/mainwindow.c:673 src/messageview.c:223
+#: src/compose.c:636 src/mainwindow.c:682 src/messageview.c:228
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Rodyti/Simbolių ko_duotė/Korėjiečių (EUC-_KR)"
 
-#: src/compose.c:634 src/mainwindow.c:679 src/messageview.c:228
+#: src/compose.c:640 src/mainwindow.c:688 src/messageview.c:233
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Rodyti/Simbolių ko_duotė/Tailandiečių (TIS-620)"
 
-#: src/compose.c:636 src/mainwindow.c:681 src/messageview.c:230
+#: src/compose.c:642 src/mainwindow.c:690 src/messageview.c:235
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Rodyti/Simbolių ko_duotė/Tailandiečių (Windows-874)"
 
-#: src/compose.c:640 src/mainwindow.c:739 src/messageview.c:260
+#: src/compose.c:646 src/mainwindow.c:750 src/messageview.c:265
 msgid "/_Tools/_Address book"
 msgstr "/Į_rankiai/_Adresų knyga"
 
-#: src/compose.c:641
+#: src/compose.c:647
 msgid "/_Tools/_Template"
 msgstr "/Į_rankiai/_Šablonas"
 
-#: src/compose.c:642 src/mainwindow.c:762 src/messageview.c:275
+#: src/compose.c:648 src/mainwindow.c:773 src/messageview.c:280
 msgid "/_Tools/Actio_ns"
 msgstr "/Į_rankiai/_Veiksmai"
 
-#: src/compose.c:643 src/compose.c:647 src/compose.c:653 src/mainwindow.c:742
-#: src/mainwindow.c:756 src/mainwindow.c:761 src/mainwindow.c:763
-#: src/mainwindow.c:766 src/mainwindow.c:768 src/messageview.c:263
-#: src/messageview.c:274
+#: src/compose.c:649 src/compose.c:653 src/compose.c:659 src/mainwindow.c:753
+#: src/mainwindow.c:767 src/mainwindow.c:772 src/mainwindow.c:774
+#: src/mainwindow.c:777 src/mainwindow.c:779 src/messageview.c:268
+#: src/messageview.c:279
 msgid "/_Tools/---"
 msgstr "/Į_rankiai/---"
 
-#: src/compose.c:644
+#: src/compose.c:650
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/Į_rankiai/Naudoti išorinį redaktorių"
 
-#: src/compose.c:648
+#: src/compose.c:654
 msgid "/_Tools/PGP Si_gn"
 msgstr "/Į_rankiai/PGP _parašas"
 
-#: src/compose.c:649
+#: src/compose.c:655
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/Į_rankiai/PGP ši_fravimas"
 
-#: src/compose.c:654
+#: src/compose.c:660
 #, fuzzy
 msgid "/_Tools/_Check spell"
 msgstr "/Į_rankiai/Vykdyti"
 
-#: src/compose.c:655
+#: src/compose.c:661
 #, fuzzy
 msgid "/_Tools/_Set spell language"
 msgstr "/Į_rankiai/_Šablonas"
 
-#: src/compose.c:899
+#: src/compose.c:908
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: byla neegzistuoja\n"
 
-#: src/compose.c:1003 src/compose.c:1074
+#: src/compose.c:1012 src/compose.c:1083
 msgid "Can't get text part\n"
 msgstr "Negaliu gauti dalies teksto\n"
 
-#: src/compose.c:1475
+#: src/compose.c:1484
 msgid "Quote mark format error."
 msgstr "Formato klaida."
 
-#: src/compose.c:1487
+#: src/compose.c:1496
 msgid "Message reply/forward format error."
 msgstr "Atsakymo/persiuntimo formato klaida."
 
-#: src/compose.c:1907
+#: src/compose.c:1916
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Byla %s neegzistuoja\n"
 
-#: src/compose.c:1911
+#: src/compose.c:1920
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Negaliu gauti bylos „%s“ dydžio\n"
 
-#: src/compose.c:1915
+#: src/compose.c:1924
 #, c-format
 msgid "File %s is empty."
 msgstr "Byla %s yra tuščia"
 
-#: src/compose.c:1919
+#: src/compose.c:1928
 #, c-format
 msgid "Can't read %s."
 msgstr "Negaliu perskaityti %s."
 
-#: src/compose.c:1952
+#: src/compose.c:1961
 #, c-format
 msgid "Message: %s"
 msgstr "Žinutė: %s"
 
-#: src/compose.c:2012 src/mimeview.c:565
+#: src/compose.c:2021 src/mimeview.c:565
 msgid "Can't get the part of multipart message."
 msgstr "Negaliu gauti sudėtinės žinutės dalies"
 
-#: src/compose.c:2496 src/headerview.c:195 src/query_search.c:636
-#: src/summaryview.c:2107
+#: src/compose.c:2505 src/headerview.c:195 src/query_search.c:636
+#: src/summaryview.c:2124
 msgid "(No Subject)"
 msgstr "(Nėra temos)"
 
-#: src/compose.c:2499
+#: src/compose.c:2508
 #, fuzzy, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Rašyti laišką%s"
 
-#: src/compose.c:2612
+#: src/compose.c:2621
 msgid "Recipient is not specified."
 msgstr "Nenurodytas gavėjas."
 
-#: src/compose.c:2620
+#: src/compose.c:2629
 msgid "Empty subject"
 msgstr "Nėra temos"
 
-#: src/compose.c:2621
+#: src/compose.c:2630
 msgid "Subject is empty. Send it anyway?"
 msgstr "Nenurodyta laiško tema (subject). Siųsti?"
 
-#: src/compose.c:2680
+#: src/compose.c:2689
 msgid "can't get recipient list."
 msgstr "Negaliu gauti gavėjų sąrašo."
 
-#: src/compose.c:2700
+#: src/compose.c:2709
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1607,21 +1618,21 @@ msgstr ""
 "Nenurodyta sąskaita pašto siuntimui.\n"
 "Prieš siųsdami pažymėkitę norimą sąskaitą."
 
-#: src/compose.c:2714 src/send_message.c:299
+#: src/compose.c:2723 src/send_message.c:299
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Klaida siunčiant žinutę %s ."
 
-#: src/compose.c:2756
+#: src/compose.c:2765
 msgid "Can't save the message to outbox."
 msgstr "Negaliu išsaugoti žinutės „outbox“."
 
-#: src/compose.c:2794
+#: src/compose.c:2803
 #, 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:2891
+#: src/compose.c:2900
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1632,11 +1643,11 @@ msgstr ""
 "\n"
 "Ar siųsti kaip %s?"
 
-#: src/compose.c:2897
+#: src/compose.c:2906
 msgid "Code conversion error"
 msgstr "Kodo konvertavimo klaida"
 
-#: src/compose.c:2970
+#: src/compose.c:2979
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1649,157 +1660,157 @@ msgstr ""
 "\n"
 "Ar tikrai norite ją išsiųsti?"
 
-#: src/compose.c:2974
+#: src/compose.c:2983
 msgid "Line length limit"
 msgstr "Eilutės ilgio limitas"
 
-#: src/compose.c:3264
+#: src/compose.c:3273
 msgid "can't remove the old message\n"
 msgstr "Negaliu pašalinti senos žinutės\n"
 
-#: src/compose.c:3282
+#: src/compose.c:3291
 msgid "queueing message...\n"
 msgstr "Žinutė dedama į eilę\n"
 
-#: src/compose.c:3364
+#: src/compose.c:3373
 msgid "can't find queue folder\n"
 msgstr "Negaliu rasti eilės (queue) katalogo\n"
 
-#: src/compose.c:3371
+#: src/compose.c:3380
 msgid "can't queue the message\n"
 msgstr "Negaliu įdėti žinutės į eilę\n"
 
-#: src/compose.c:3964
+#: src/compose.c:3973
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "sugeneruotas Message-ID: %s\n"
 
-#: src/compose.c:4077
+#: src/compose.c:4086
 msgid "Creating compose window...\n"
 msgstr "Sukuriamas laiško kūrimo langas...\n"
 
-#: src/compose.c:4128 src/headerview.c:54
+#: src/compose.c:4137 src/headerview.c:54
 msgid "From:"
 msgstr "Nuo:"
 
-#: src/compose.c:4202
+#: src/compose.c:4211
 msgid "PGP Sign"
 msgstr "PGP parašas"
 
-#: src/compose.c:4205
+#: src/compose.c:4214
 msgid "PGP Encrypt"
 msgstr "PGP šifravimas"
 
-#: src/compose.c:4243 src/compose.c:5317
+#: src/compose.c:4252 src/compose.c:5326
 msgid "MIME type"
 msgstr "MIME tipas"
 
 #. S_COL_DATE
-#: src/compose.c:4252 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4740
+#: src/compose.c:4261 src/mimeview.c:197 src/prefs_filter_edit.c:496
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4897
 msgid "Size"
 msgstr "Dydis"
 
-#: src/compose.c:4683 src/mainwindow.c:2324 src/prefs_account_dialog.c:528
+#: src/compose.c:4692 src/mainwindow.c:2335 src/prefs_account_dialog.c:528
 #: src/prefs_common_dialog.c:661
 msgid "Send"
 msgstr "Siųsti"
 
-#: src/compose.c:4684
+#: src/compose.c:4693
 msgid "Send message"
 msgstr "Siųsti žinutę"
 
-#: src/compose.c:4692
+#: src/compose.c:4701
 msgid "Send later"
 msgstr "Siųsti vėliau"
 
-#: src/compose.c:4693
+#: src/compose.c:4702
 msgid "Put into queue folder and send later"
 msgstr "Įdėti į eilę ir siųsti vėliau"
 
-#: src/compose.c:4701
+#: src/compose.c:4710
 msgid "Draft"
 msgstr "Juodraštis"
 
-#: src/compose.c:4702
+#: src/compose.c:4711
 msgid "Save to draft folder"
 msgstr "Išsaugoti į juodraščių katalogą"
 
-#: src/compose.c:4712
+#: src/compose.c:4721
 msgid "Insert"
 msgstr "Įterpti"
 
-#: src/compose.c:4713
+#: src/compose.c:4722
 msgid "Insert file"
 msgstr "Įterpti bylą"
 
-#: src/compose.c:4721
+#: src/compose.c:4730
 msgid "Attach"
 msgstr "Prisegti"
 
-#: src/compose.c:4722
+#: src/compose.c:4731
 msgid "Attach file"
 msgstr "Prisegti bylą"
 
 #. signature
-#: src/compose.c:4732 src/prefs_account_dialog.c:1208
+#: src/compose.c:4741 src/prefs_account_dialog.c:1208
 #: src/prefs_common_dialog.c:953
 msgid "Signature"
 msgstr "Parašas"
 
-#: src/compose.c:4733
+#: src/compose.c:4742
 #, fuzzy
 msgid "Append signature"
 msgstr "BLOGAS parašas"
 
 #. editor
-#: src/compose.c:4742 src/prefs_common_dialog.c:991
+#: src/compose.c:4751 src/prefs_common_dialog.c:991
 #: src/prefs_common_dialog.c:2315
 msgid "Editor"
 msgstr "Redaktorius"
 
-#: src/compose.c:4743
+#: src/compose.c:4752
 msgid "Edit with external editor"
 msgstr "Naudoti išorinį redaktorių"
 
-#: src/compose.c:4751
+#: src/compose.c:4760
 msgid "Linewrap"
 msgstr "Eilučių laužymas"
 
-#: src/compose.c:4752
+#: src/compose.c:4761
 msgid "Wrap all long lines"
 msgstr "Laužyti ilgas eilutes"
 
-#: src/compose.c:5213
+#: src/compose.c:5222
 msgid "Invalid MIME type."
 msgstr "Neteisingas MIME tipas"
 
-#: src/compose.c:5231
+#: src/compose.c:5240
 msgid "File doesn't exist or is empty."
 msgstr "Byla neegzistuoja arba yra tuščia."
 
-#: src/compose.c:5299
+#: src/compose.c:5308
 msgid "Properties"
 msgstr "Savybės"
 
-#: src/compose.c:5319 src/prefs_common_dialog.c:1444
+#: src/compose.c:5328 src/prefs_common_dialog.c:1444
 msgid "Encoding"
 msgstr "Koduotė"
 
-#: src/compose.c:5342 src/prefs_folder_item.c:202
+#: src/compose.c:5351 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Kelias"
 
-#: src/compose.c:5343
+#: src/compose.c:5352
 msgid "File name"
 msgstr "Bylos vardas"
 
-#: src/compose.c:5436
+#: src/compose.c:5445
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Neteisinga išorinio redaktoriaus komanda: „%s“\n"
 
-#: src/compose.c:5482
+#: src/compose.c:5491
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1809,44 +1820,44 @@ msgstr ""
 "Nutraukti procesą?\n"
 "proceso grupės id: %d"
 
-#: src/compose.c:5857 src/compose.c:5862 src/compose.c:5868
+#: src/compose.c:5866 src/compose.c:5871 src/compose.c:5877
 msgid "Can't queue the message."
 msgstr "Negaliu įdėti žinutės į eilę."
 
-#: src/compose.c:5959
+#: src/compose.c:5968
 msgid "Select files"
 msgstr "Žymėti bylas"
 
-#: src/compose.c:5982
+#: src/compose.c:5991
 msgid "Select file"
 msgstr "Žymėti bylą"
 
-#: src/compose.c:6017
+#: src/compose.c:6026
 msgid "Save message"
 msgstr "Išsaugoti žinutę"
 
-#: src/compose.c:6018
+#: src/compose.c:6027
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Žinutė buvo redaguota. Saugoti „Juodraščiuose“?"
 
-#: src/compose.c:6020
+#: src/compose.c:6029
 msgid "Close _without saving"
 msgstr "Uždaryti _neišsaugant"
 
-#: src/compose.c:6062
+#: src/compose.c:6071
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Ar norite naudoti šabloną „%s“?"
 
-#: src/compose.c:6064
+#: src/compose.c:6073
 msgid "Apply template"
 msgstr "Naudoti šabloną"
 
-#: src/compose.c:6065
+#: src/compose.c:6074
 msgid "_Replace"
 msgstr "_Pakeisti"
 
-#: src/compose.c:6065
+#: src/compose.c:6074
 msgid "_Insert"
 msgstr "Įterpt_i"
 
@@ -2283,7 +2294,7 @@ msgstr "Nauji"
 
 #. S_COL_MARK
 #: src/folderview.c:412 src/prefs_filter_edit.c:500
-#: src/prefs_summary_column.c:71 src/summaryview.c:509
+#: src/prefs_summary_column.c:71 src/summaryview.c:511
 msgid "Unread"
 msgstr "Nesk."
 
@@ -2299,12 +2310,12 @@ msgstr "Nustatoma katalogo informacija...\n"
 msgid "Setting folder info..."
 msgstr "Nustatoma katalogo informacija..."
 
-#: src/folderview.c:858 src/mainwindow.c:3464 src/setup.c:80
+#: src/folderview.c:858 src/mainwindow.c:3481 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Skanuojamas katalogas “%s%c%s“..."
 
-#: src/folderview.c:862 src/mainwindow.c:3469 src/setup.c:85
+#: src/folderview.c:862 src/mainwindow.c:3486 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Skanuojamas katalogas „%s“..."
@@ -2329,7 +2340,7 @@ msgstr "Katalogų medžio perkūrimas nepavyko."
 msgid "Checking for new messages in all folders..."
 msgstr "Tikrinamos naujos žinutės visuose kataloguose..."
 
-#: src/folderview.c:1200 src/mainwindow.c:2400 src/prefs_common_dialog.c:1789
+#: src/folderview.c:1200 src/mainwindow.c:2411 src/prefs_common_dialog.c:1789
 msgid "Junk"
 msgstr "Nereikalingas"
 
@@ -2470,7 +2481,7 @@ msgstr "Tema:"
 msgid "Creating header view...\n"
 msgstr "Sukuria antraščių peržiūra...\n"
 
-#: src/headerview.c:180 src/query_search.c:637 src/summaryview.c:2110
+#: src/headerview.c:180 src/query_search.c:637 src/summaryview.c:2127
 msgid "(No From)"
 msgstr "(Nėra gavėjo)"
 
@@ -2579,7 +2590,7 @@ msgstr "Importuioti LDIF bylą į adresų knygą"
 msgid "Prev"
 msgstr "Atgal"
 
-#: src/importldif.c:768 src/mainwindow.c:2420
+#: src/importldif.c:768 src/mainwindow.c:2431
 msgid "Next"
 msgstr "Kitas"
 
@@ -2931,11 +2942,11 @@ msgstr ""
 msgid "another Sylpheed is already running.\n"
 msgstr "Sylpheed jau paleistas.\n"
 
-#: src/main.c:1064
+#: src/main.c:1083
 msgid "Migration of configuration"
 msgstr "Konfigūracijos atnaujinimas"
 
-#: src/main.c:1065
+#: src/main.c:1084
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -2943,635 +2954,640 @@ msgstr ""
 "Rasta senos versijos konfigūracija.\n"
 "Ar norite ją atnaujinti?"
 
-#: src/mainwindow.c:478
+#: src/mainwindow.c:481
 msgid "/_File/_Folder"
 msgstr "/_Byla/_Katalogas"
 
-#: src/mainwindow.c:479
+#: src/mainwindow.c:482
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/_Byla/_Katalogas/Sukurti _naują..."
 
-#: src/mainwindow.c:481
+#: src/mainwindow.c:484
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/_Byla/_Katalogas/Pe_rvadinti..."
 
-#: src/mainwindow.c:482
+#: src/mainwindow.c:485
 msgid "/_File/_Folder/_Move folder..."
 msgstr "/_Byla/_Katalogas/Per_kelti..."
 
-#: src/mainwindow.c:483
+#: src/mainwindow.c:486
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/_Byla/_Katalogas/_Ištrinti"
 
-#: src/mainwindow.c:484
+#: src/mainwindow.c:487
 msgid "/_File/_Mailbox"
 msgstr "/_Byla/_Dėžutė"
 
-#: src/mainwindow.c:485
+#: src/mainwindow.c:488
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/_Byla/_Dėžutė/Pridėti _naują"
 
-#: src/mainwindow.c:486
+#: src/mainwindow.c:489
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/_Byla/_Dėžutė/_Pašalinti"
 
-#: src/mainwindow.c:487 src/mainwindow.c:492
+#: src/mainwindow.c:490 src/mainwindow.c:495
 msgid "/_File/_Mailbox/---"
 msgstr "/_Byla/_Dėžutė/---"
 
-#: src/mainwindow.c:488
+#: src/mainwindow.c:491
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "/_Byla/_Dėžutė/Patikrinti naujas ž_inutes"
 
-#: src/mainwindow.c:490
+#: src/mainwindow.c:493
 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:493
+#: src/mainwindow.c:496
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "/_Byla/_Dėžutė/P_erkurti katalogų medį"
 
-#: src/mainwindow.c:496
+#: src/mainwindow.c:499
 msgid "/_File/_Import mbox file..."
 msgstr "/_Byla/_Importuoti „mbox“ bylą..."
 
-#: src/mainwindow.c:497
+#: src/mainwindow.c:500
 msgid "/_File/_Export to mbox file..."
 msgstr "/_Byla/_Eksportuoti į „mbox“ bylą..."
 
-#: src/mainwindow.c:499
+#: src/mainwindow.c:502
 msgid "/_File/Empty all _trash"
 msgstr "/_Byla/Išvaly_ti šiukšlinę"
 
-#: src/mainwindow.c:501 src/messageview.c:139
+#: src/mainwindow.c:504 src/messageview.c:139
 msgid "/_File/_Save as..."
 msgstr "/_Byla/Išsaugoti _kaip..."
 
-#: src/mainwindow.c:502 src/messageview.c:140
+#: src/mainwindow.c:505 src/messageview.c:140
 msgid "/_File/_Print..."
 msgstr "/_Byla/_Spausdinti..."
 
-#: src/mainwindow.c:504
+#: src/mainwindow.c:507
 msgid "/_File/_Work offline"
 msgstr "/_Byla/_Dirbti atsijungus"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:507
+#: src/mainwindow.c:510
 msgid "/_File/E_xit"
 msgstr "/_Byla/Iš_eiti"
 
-#: src/mainwindow.c:512
+#: src/mainwindow.c:515
 msgid "/_Edit/Select _thread"
 msgstr "/_Taisyti/Pažymė_ti giją"
 
-#: src/mainwindow.c:514 src/messageview.c:148
+#: src/mainwindow.c:517 src/messageview.c:148
 msgid "/_Edit/_Find in current message..."
 msgstr "/_Taisyti/_Rasti žinutėje"
 
-#: src/mainwindow.c:516
+#: src/mainwindow.c:519
 msgid "/_Edit/_Search messages..."
 msgstr "/_Taisyti/_Ieškoti žinučių..."
 
-#: src/mainwindow.c:519
+#: src/mainwindow.c:522
 msgid "/_View/Show or hi_de"
 msgstr "/_Rodyti/Ro_dyti arba paslėpti"
 
-#: src/mainwindow.c:520
+#: src/mainwindow.c:523
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/_Rodyti/Ro_dyti arba paslėpti/_Katalogų medis"
 
-#: src/mainwindow.c:522
+#: src/mainwindow.c:525
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/_Rodyti/Ro_dyti arba paslėpti/_Žinutės peržiūra"
 
-#: src/mainwindow.c:524
+#: src/mainwindow.c:527
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/_Rodyti/Ro_dyti arba paslėpti/Į_rankių juosta"
 
-#: src/mainwindow.c:526
+#: src/mainwindow.c:529
 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:528
+#: src/mainwindow.c:531
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/_Rodyti/Ro_dyti arba paslėpti/Į_rankių juosta/P_iktogramos"
 
-#: src/mainwindow.c:530
+#: src/mainwindow.c:533
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/_Rodyti/Ro_dyti arba paslėpti/Į_rankių juosta/_Tekstas"
 
-#: src/mainwindow.c:532
+#: src/mainwindow.c:535
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/_Rodyti/Ro_dyti arba paslėpti/Į_rankių juosta/_Nieko"
 
-#: src/mainwindow.c:534
+#: src/mainwindow.c:537
 #, fuzzy
 msgid "/_View/Show or hi_de/_Search bar"
 msgstr "/_Rodyti/Ro_dyti arba paslėpti/_Būsenos juosta"
 
-#: src/mainwindow.c:536
+#: src/mainwindow.c:539
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/_Rodyti/Ro_dyti arba paslėpti/_Būsenos juosta"
 
-#: src/mainwindow.c:539
+#: src/mainwindow.c:542
 msgid "/_View/Separate f_older tree"
 msgstr "/_Rodyti/Atskirti _katalogų medį"
 
-#: src/mainwindow.c:540
+#: src/mainwindow.c:543
 msgid "/_View/Separate _message view"
 msgstr "/_Rodyti/Atskirti žin_utės peržiūrą"
 
-#: src/mainwindow.c:542
+#: src/mainwindow.c:545
 msgid "/_View/_Sort"
 msgstr "/_Rodyti/_Rikiuoti"
 
-#: src/mainwindow.c:543
+#: src/mainwindow.c:546
 msgid "/_View/_Sort/by _number"
 msgstr "/_Rodyti/_Rikiuoti/pagal _numerį"
 
-#: src/mainwindow.c:544
+#: src/mainwindow.c:547
 msgid "/_View/_Sort/by s_ize"
 msgstr "/_Rodyti/_Rikiuoti/pagal _dydį"
 
-#: src/mainwindow.c:545
+#: src/mainwindow.c:548
 msgid "/_View/_Sort/by _date"
 msgstr "/_Rodyti/_Rikiuoti/pagal d_atą"
 
-#: src/mainwindow.c:546
+#: src/mainwindow.c:549
 #, fuzzy
 msgid "/_View/_Sort/by t_hread date"
 msgstr "/_Rodyti/_Rikiuoti/pagal d_atą"
 
-#: src/mainwindow.c:547
+#: src/mainwindow.c:550
 msgid "/_View/_Sort/by _from"
 msgstr "/_Rodyti/_Rikiuoti/pagal _siuntėją"
 
-#: src/mainwindow.c:548
+#: src/mainwindow.c:551
 msgid "/_View/_Sort/by _recipient"
 msgstr "/_Rodyti/_Rikiuoti/pagal _gavėją"
 
-#: src/mainwindow.c:549
+#: src/mainwindow.c:552
 msgid "/_View/_Sort/by _subject"
 msgstr "/_Rodyti/_Rikiuoti/pagal _temą"
 
-#: src/mainwindow.c:550
+#: src/mainwindow.c:553
 msgid "/_View/_Sort/by _color label"
 msgstr "/_Rodyti/_Rikiuoti/pagal _spalvos etiketę"
 
-#: src/mainwindow.c:552
+#: src/mainwindow.c:555
 msgid "/_View/_Sort/by _mark"
 msgstr "/_Rodyti/_Rikiuoti/pagal ž_ymę"
 
-#: src/mainwindow.c:553
+#: src/mainwindow.c:556
 msgid "/_View/_Sort/by _unread"
 msgstr "/_Rodyti/_Rikiuoti/pagal ne_skaitytus"
 
-#: src/mainwindow.c:554
+#: src/mainwindow.c:557
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/_Rodyti/_Rikiuoti/pagal _priedą"
 
-#: src/mainwindow.c:556
+#: src/mainwindow.c:559
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/_Rodyti/_Rikiuoti/Ne_rikiuoti"
 
-#: src/mainwindow.c:557 src/mainwindow.c:560
+#: src/mainwindow.c:560 src/mainwindow.c:563
 msgid "/_View/_Sort/---"
 msgstr "/_Rodyti/_Rikiuoti/---"
 
-#: src/mainwindow.c:558
+#: src/mainwindow.c:561
 msgid "/_View/_Sort/Ascending"
 msgstr "/_Rodyti/_Rikiuoti/_Didėjimo tvarka"
 
-#: src/mainwindow.c:559
+#: src/mainwindow.c:562
 msgid "/_View/_Sort/Descending"
 msgstr "/_Rodyti/_Rikiuoti/_Mažėjimo tvarka"
 
-#: src/mainwindow.c:561
+#: src/mainwindow.c:564
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/_Rodyti/_Rikiuoti/P_agal temą"
 
-#: src/mainwindow.c:563
+#: src/mainwindow.c:566
 msgid "/_View/Th_read view"
 msgstr "/_Rodyti/_Gijų peržiūra"
 
-#: src/mainwindow.c:564
+#: src/mainwindow.c:567
 msgid "/_View/E_xpand all threads"
 msgstr "/_Rodyti/Iš_skleisti visas gijas"
 
-#: src/mainwindow.c:565
+#: src/mainwindow.c:568
 msgid "/_View/Co_llapse all threads"
 msgstr "/_Rodyti/Su_traukti visas gijas"
 
-#: src/mainwindow.c:566
+#: src/mainwindow.c:569
 msgid "/_View/Set display _item..."
 msgstr "/_Rodyti/Nustatyt_i rodomus laukus"
 
-#: src/mainwindow.c:569
+#: src/mainwindow.c:572
 msgid "/_View/_Go to"
 msgstr "/_Rodyti/_Eiti į"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:573
 msgid "/_View/_Go to/_Prev message"
 msgstr "/_Rodyti/_Eiti į/_Ankstesnė žinutė"
 
-#: src/mainwindow.c:571
+#: src/mainwindow.c:574
 msgid "/_View/_Go to/_Next message"
 msgstr "/_Rodyti/_Eiti į/_Kita žinutė"
 
-#: src/mainwindow.c:572 src/mainwindow.c:577 src/mainwindow.c:580
-#: src/mainwindow.c:585 src/mainwindow.c:590
+#: src/mainwindow.c:575 src/mainwindow.c:580 src/mainwindow.c:583
+#: src/mainwindow.c:588 src/mainwindow.c:593
 msgid "/_View/_Go to/---"
 msgstr "/_Rodyti/_Eiti į/---"
 
-#: src/mainwindow.c:573
+#: src/mainwindow.c:576
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/_Rodyti/_Eiti į/Ankstesnė neskaityta žinutė"
 
-#: src/mainwindow.c:575
+#: src/mainwindow.c:578
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/_Rodyti/_Eiti į/Kita neskaityta žinutė"
 
-#: src/mainwindow.c:578
+#: src/mainwindow.c:581
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/_Rodyti/_Eiti į/Ankstesnė nauja žinutė"
 
-#: src/mainwindow.c:579
+#: src/mainwindow.c:582
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/_Rodyti/_Eiti į/Kita nauja žinutė"
 
-#: src/mainwindow.c:581
+#: src/mainwindow.c:584
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/_Rodyti/_Eiti į/Ankstesnė pažymėta žinutė"
 
-#: src/mainwindow.c:583
+#: src/mainwindow.c:586
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/_Rodyti/_Eiti į/Kita pažymėta žinutė"
 
-#: src/mainwindow.c:586
+#: src/mainwindow.c:589
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/_Rodyti/_Eiti į/Ankstesnė žinutė su etikete"
 
-#: src/mainwindow.c:588
+#: src/mainwindow.c:591
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/_Rodyti/_Eiti į/Kita žinutė su etikete"
 
-#: src/mainwindow.c:591
+#: src/mainwindow.c:594
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Rodyti/_Eiti į/Kitas ka_talogas"
 
-#: src/mainwindow.c:600 src/messageview.c:159
+#: src/mainwindow.c:603 src/messageview.c:159
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Rodyti/Simbolių ko_duotė/_Automatiškai"
 
-#: src/mainwindow.c:613 src/messageview.c:172
+#: src/mainwindow.c:616 src/messageview.c:172
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr "/_Rodyti/Simbolių ko_duotė/Vakarų Europos (ISO-8859-15)"
 
-#: src/mainwindow.c:653 src/messageview.c:205
+#: src/mainwindow.c:662 src/messageview.c:210
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Rodyti/Simbolių ko_duotė/Japonų (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:655 src/messageview.c:207
+#: src/mainwindow.c:664 src/messageview.c:212
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Rodyti/Simbolių ko_duotė/Japonų (_EUC-JP)"
 
-#: src/mainwindow.c:657 src/messageview.c:209
+#: src/mainwindow.c:666 src/messageview.c:214
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Rodyti/Simbolių ko_duotė/Japonų (_Shift__JIS)"
 
-#: src/mainwindow.c:667 src/messageview.c:218
+#: src/mainwindow.c:676 src/messageview.c:223
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Rodyti/Simbolių ko_duotė/Tradicinė Kinų (EUC-_TW)"
 
-#: src/mainwindow.c:669 src/messageview.c:220
+#: src/mainwindow.c:678 src/messageview.c:225
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Rodyti/Simbolių ko_duotė/Kinų (ISO-2022-_CN)"
 
-#: src/mainwindow.c:675 src/messageview.c:225
+#: src/mainwindow.c:684 src/messageview.c:230
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Rodyti/Simbolių ko_duotė/Korėjiečių (ISO-2022-KR)"
 
-#: src/mainwindow.c:688 src/summaryview.c:449
+#: src/mainwindow.c:697 src/summaryview.c:451
 msgid "/_View/Open in new _window"
 msgstr "/_Rodyti/Atverti naujame _lange"
 
-#: src/mainwindow.c:689 src/messageview.c:237
+#: src/mainwindow.c:698 src/messageview.c:242
 msgid "/_View/Mess_age source"
 msgstr "/_Rodyti/Žinutės pr_adinis tekstas"
 
-#: src/mainwindow.c:690 src/messageview.c:238
+#: src/mainwindow.c:699 src/messageview.c:243
 msgid "/_View/Show all _header"
 msgstr "/_Rodyti/Rodyti _visas antraštes"
 
-#: src/mainwindow.c:692
+#: src/mainwindow.c:701
 msgid "/_View/_Update summary"
 msgstr "/_Rodyti/Atna_ujinti santrauką"
 
-#: src/mainwindow.c:694 src/messageview.c:240
+#: src/mainwindow.c:703 src/messageview.c:245
 msgid "/_Message"
 msgstr "/Ži_nutė"
 
-#: src/mainwindow.c:695
+#: src/mainwindow.c:704
 msgid "/_Message/Recei_ve"
 msgstr "/Ži_nutė/_Gauti"
 
-#: src/mainwindow.c:696
+#: src/mainwindow.c:705
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/Ži_nutė/_Gauti/Gauti iš _esamos sąskaitos"
 
-#: src/mainwindow.c:698
+#: src/mainwindow.c:707
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/Ži_nutė/_Gauti/Gauti iš _visų sąskaitų"
 
-#: src/mainwindow.c:700
+#: src/mainwindow.c:709
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/Ži_nutė/_Gauti/_Nutraukti gavimą"
 
-#: src/mainwindow.c:702
+#: src/mainwindow.c:711
 msgid "/_Message/Recei_ve/---"
 msgstr "/Ži_nutė/_Gauti/---"
 
-#: src/mainwindow.c:703
+#: src/mainwindow.c:712
 msgid "/_Message/_Send queued messages"
 msgstr "/Ži_nutė/_Siųsti žinutes eilėje"
 
-#: src/mainwindow.c:704 src/mainwindow.c:706 src/mainwindow.c:713
-#: src/mainwindow.c:718 src/mainwindow.c:721 src/mainwindow.c:730
-#: src/mainwindow.c:732 src/mainwindow.c:735 src/messageview.c:243
-#: src/messageview.c:251 src/messageview.c:256
+#: src/mainwindow.c:713 src/mainwindow.c:715 src/mainwindow.c:722
+#: src/mainwindow.c:727 src/mainwindow.c:730 src/mainwindow.c:741
+#: src/mainwindow.c:743 src/mainwindow.c:746 src/messageview.c:248
+#: src/messageview.c:256 src/messageview.c:261
 msgid "/_Message/---"
 msgstr "/Ži_nutė/---"
 
-#: src/mainwindow.c:705 src/messageview.c:241
+#: src/mainwindow.c:714 src/messageview.c:246
 msgid "/_Message/Compose _new message"
 msgstr "/Ži_nutė/Rašyti _naują"
 
-#: src/mainwindow.c:707 src/messageview.c:244
+#: src/mainwindow.c:716 src/messageview.c:249
 msgid "/_Message/_Reply"
 msgstr "/Ži_nutė/_Atsakyti"
 
-#: src/mainwindow.c:708
+#: src/mainwindow.c:717
 msgid "/_Message/Repl_y to"
 msgstr "/Ži_nutė/Atsak_yti kam"
 
-#: src/mainwindow.c:709 src/messageview.c:245
+#: src/mainwindow.c:718 src/messageview.c:250
 msgid "/_Message/Repl_y to/_all"
 msgstr "/Ži_nutė/Atsak_yti kam/_visiems"
 
-#: src/mainwindow.c:710 src/messageview.c:247
+#: src/mainwindow.c:719 src/messageview.c:252
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/Ži_nutė/Atsak_yti kam/_siuntėjui"
 
-#: src/mainwindow.c:711 src/messageview.c:249
+#: src/mainwindow.c:720 src/messageview.c:254
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/Ži_nutė/Atsak_yti kam/pašto _konferencijai"
 
-#: src/mainwindow.c:714 src/messageview.c:252
+#: src/mainwindow.c:723 src/messageview.c:257
 msgid "/_Message/_Forward"
 msgstr "/Ži_nutė/_Persiųsti"
 
-#: src/mainwindow.c:715 src/messageview.c:253
+#: src/mainwindow.c:724 src/messageview.c:258
 msgid "/_Message/For_ward as attachment"
 msgstr "/Ži_nutė/Persiųsti kaip p_riedą"
 
-#: src/mainwindow.c:717 src/messageview.c:255
+#: src/mainwindow.c:726 src/messageview.c:260
 msgid "/_Message/Redirec_t"
 msgstr "/Ži_nutė/Nukreip_ti"
 
-#: src/mainwindow.c:719
+#: src/mainwindow.c:728
 msgid "/_Message/M_ove..."
 msgstr "/Ži_nutė/Per_kelti..."
 
-#: src/mainwindow.c:720
+#: src/mainwindow.c:729
 msgid "/_Message/_Copy..."
 msgstr "/Ži_nutė/K_opijuoti..."
 
-#: src/mainwindow.c:722
+#: src/mainwindow.c:731
 msgid "/_Message/_Mark"
 msgstr "/Ži_nutė/Žy_ma"
 
-#: src/mainwindow.c:723
+#: src/mainwindow.c:732
 msgid "/_Message/_Mark/_Mark"
 msgstr "/Ži_nutė/Žy_ma/Pažy_mėti"
 
-#: src/mainwindow.c:724
+#: src/mainwindow.c:733
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/Ži_nutė/Žy_ma/_Nežymėti"
 
-#: src/mainwindow.c:725
+#: src/mainwindow.c:734
 msgid "/_Message/_Mark/---"
 msgstr "/Ži_nutė/Žy_ma/---"
 
-#: src/mainwindow.c:726
+#: src/mainwindow.c:735
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/Ži_nutė/Žy_ma/Ne_skaityta"
 
-#: src/mainwindow.c:727
+#: src/mainwindow.c:736
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/Ži_nutė/Žy_ma/Skai_tyta"
 
-#: src/mainwindow.c:729
+#: src/mainwindow.c:738
+#, fuzzy
+msgid "/_Message/_Mark/Mark _thread as read"
+msgstr "/Ži_nutė/Žy_ma/Skai_tyta"
+
+#: src/mainwindow.c:740
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/Ži_nutė/Žy_ma/_Visos kaip skaitytos"
 
-#: src/mainwindow.c:731
+#: src/mainwindow.c:742
 msgid "/_Message/_Delete"
 msgstr "/Ži_nutė/_Trinti"
 
-#: src/mainwindow.c:733
+#: src/mainwindow.c:744
 msgid "/_Message/Set as _junk mail"
 msgstr "/Ži_nutė/Pažymėti kaip nereikalingą"
 
-#: src/mainwindow.c:734
+#: src/mainwindow.c:745
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/Ži_nutė/Pažymėti kaip reikalingą"
 
-#: src/mainwindow.c:736 src/messageview.c:257
+#: src/mainwindow.c:747 src/messageview.c:262
 msgid "/_Message/Re-_edit"
 msgstr "/_Message/P_ertaisyti"
 
-#: src/mainwindow.c:740
+#: src/mainwindow.c:751
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/Į_rankiai/Įrašyti siuntėją į adresų _knygą"
 
-#: src/mainwindow.c:743
+#: src/mainwindow.c:754
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/Į_rankiai/_Filtruoti žinutes kataloge"
 
-#: src/mainwindow.c:745
+#: src/mainwindow.c:756
 msgid "/_Tools/Filter _selected messages"
 msgstr "/Į_rankiai/Filtruoti pa_sirinktas žinutes"
 
-#: src/mainwindow.c:747 src/messageview.c:264
+#: src/mainwindow.c:758 src/messageview.c:269
 msgid "/_Tools/_Create filter rule"
 msgstr "/Į_rankiai/Sukurti filtravimo _taisyklę"
 
-#: src/mainwindow.c:748 src/messageview.c:266
+#: src/mainwindow.c:759 src/messageview.c:271
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/Į_rankiai/Sukurti filtravimo _taisyklę/_Automatiškai"
 
-#: src/mainwindow.c:750 src/messageview.c:268
+#: src/mainwindow.c:761 src/messageview.c:273
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/Į_rankiai/Sukurti filtravimo _taisyklę/pagal _Siuntėją"
 
-#: src/mainwindow.c:752 src/messageview.c:270
+#: src/mainwindow.c:763 src/messageview.c:275
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/Į_rankiai/Sukurti filtravimo _taisyklę/pagal _Gavėją"
 
-#: src/mainwindow.c:754 src/messageview.c:272
+#: src/mainwindow.c:765 src/messageview.c:277
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/Į_rankiai/Sukurti filtravimo _taisyklę/pagal _Temą"
 
-#: src/mainwindow.c:757
+#: src/mainwindow.c:768
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/Į_rankiai/_Filtruoti nereikalingas žinutes kataloge"
 
-#: src/mainwindow.c:759
+#: src/mainwindow.c:770
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/Į_rankiai/Filtruoti nereikalingas tarp pa_sirinktų žinučių"
 
-#: src/mainwindow.c:764
+#: src/mainwindow.c:775
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/Į_rankiai/Ištrinti _vienodas žinutes"
 
-#: src/mainwindow.c:767
+#: src/mainwindow.c:778
 msgid "/_Tools/E_xecute"
 msgstr "/Į_rankiai/Vykdyti"
 
-#: src/mainwindow.c:769
+#: src/mainwindow.c:780
 msgid "/_Tools/_Log window"
 msgstr "/Į_rankiai/„_Log“ langas"
 
-#: src/mainwindow.c:771
+#: src/mainwindow.c:782
 msgid "/_Configuration"
 msgstr "/_Nustatymai"
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:783
 msgid "/_Configuration/_Common preferences..."
 msgstr "/_Nustatymai/Bendri _nustatymai..."
 
-#: src/mainwindow.c:774
+#: src/mainwindow.c:785
 msgid "/_Configuration/_Filter setting..."
 msgstr "/_Nustatymai/_Filtro nustatymai..."
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:787
 msgid "/_Configuration/_Template..."
 msgstr "/_Nustatymai/Ša_blonai..."
 
-#: src/mainwindow.c:777
+#: src/mainwindow.c:788
 msgid "/_Configuration/_Actions..."
 msgstr "/_Nustatymai/Veiksm_ai..."
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:789
 msgid "/_Configuration/---"
 msgstr "/_Nustatymai/---"
 
-#: src/mainwindow.c:779
+#: src/mainwindow.c:790
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Nustatymai/_Esamos sąskaitos nustatymai"
 
-#: src/mainwindow.c:781
+#: src/mainwindow.c:792
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Nustatymai/Sukurti _naują sąskaitą..."
 
-#: src/mainwindow.c:783
+#: src/mainwindow.c:794
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Nustatymai/R_edaguoti sąskaitas..."
 
-#: src/mainwindow.c:785
+#: src/mainwindow.c:796
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Nustatymai/Keisti esamą sąskaitą"
 
-#: src/mainwindow.c:789
+#: src/mainwindow.c:800
 msgid "/_Help/_Manual"
 msgstr "/_Pagalba/_Instrukcija"
 
-#: src/mainwindow.c:790
+#: src/mainwindow.c:801
 msgid "/_Help/_Manual/_English"
 msgstr "/_Pagalba/_Instrukcija/_English"
 
-#: src/mainwindow.c:791
+#: src/mainwindow.c:802
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/_Pagalba/_Instrukcija/_Japanese"
 
-#: src/mainwindow.c:792
+#: src/mainwindow.c:803
 msgid "/_Help/_FAQ"
 msgstr "/_Pagalba/_DUK"
 
-#: src/mainwindow.c:793
+#: src/mainwindow.c:804
 msgid "/_Help/_FAQ/_English"
 msgstr "/_Pagalba/_DUK/_English"
 
-#: src/mainwindow.c:794
+#: src/mainwindow.c:805
 msgid "/_Help/_FAQ/_German"
 msgstr "/_Pagalba/_DUK/_German"
 
-#: src/mainwindow.c:795
+#: src/mainwindow.c:806
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/_Pagalba/_DUK/_Spanish"
 
-#: src/mainwindow.c:796
+#: src/mainwindow.c:807
 msgid "/_Help/_FAQ/_French"
 msgstr "/_Pagalba/_DUK/_French"
 
-#: src/mainwindow.c:797
+#: src/mainwindow.c:808
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/_Pagalba/_DUK/_Italian"
 
-#: src/mainwindow.c:798
+#: src/mainwindow.c:809
 msgid "/_Help/---"
 msgstr "/_Pagalba/---"
 
-#: src/mainwindow.c:841
+#: src/mainwindow.c:852
 msgid "Creating main window...\n"
 msgstr "Kuriamas pagrindinis langas..\n"
 
-#: src/mainwindow.c:1011
+#: src/mainwindow.c:1022
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "MainWindow: nepavyko spalvos priskyrimas %d\n"
 
-#: src/mainwindow.c:1108 src/summaryview.c:2258 src/summaryview.c:2343
-#: src/summaryview.c:3739 src/summaryview.c:3868 src/summaryview.c:4226
+#: src/mainwindow.c:1119 src/summaryview.c:2275 src/summaryview.c:2360
+#: src/summaryview.c:3896 src/summaryview.c:4025 src/summaryview.c:4383
 msgid "done.\n"
 msgstr "atlikta.\n"
 
-#: src/mainwindow.c:1235 src/mainwindow.c:1276 src/mainwindow.c:1301
+#: src/mainwindow.c:1246 src/mainwindow.c:1287 src/mainwindow.c:1312
 msgid "Untitled"
 msgstr "Bevardis"
 
-#: src/mainwindow.c:1302
+#: src/mainwindow.c:1313
 msgid "none"
 msgstr "nieko"
 
-#: src/mainwindow.c:1355
+#: src/mainwindow.c:1366
 #, 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:1605
+#: src/mainwindow.c:1616
 msgid "Offline"
 msgstr "Atsijungęs"
 
-#: src/mainwindow.c:1606
+#: src/mainwindow.c:1617
 msgid "You are offline. Go online?"
 msgstr "Jūs esate atsijungęs. Prisijungti?"
 
-#: src/mainwindow.c:1623
+#: src/mainwindow.c:1634
 msgid "Empty all trash"
 msgstr "Išvalyti visas šiukšlines"
 
-#: src/mainwindow.c:1624
+#: src/mainwindow.c:1635
 #, fuzzy
 msgid "Delete all messages in trash folders?"
 msgstr "Ištrinti visas žinutes šiukšlinėje?"
 
-#: src/mainwindow.c:1652
+#: src/mainwindow.c:1663
 msgid "Add mailbox"
 msgstr "Pridėti dėžutę"
 
-#: src/mainwindow.c:1653
+#: src/mainwindow.c:1664
 #, fuzzy
 msgid ""
 "Specify the location of mailbox.\n"
@@ -3582,16 +3598,16 @@ msgstr ""
 "Jeigu ji egzistuoja, ji bus\n"
 "nuskanuota automatiškai."
 
-#: src/mainwindow.c:1659 src/setup.c:49
+#: src/mainwindow.c:1670 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Dėžutė „%s“ egzistuoja."
 
-#: src/mainwindow.c:1664 src/setup.c:56
+#: src/mainwindow.c:1675 src/setup.c:56
 msgid "Mailbox"
 msgstr "Dėžutė"
 
-#: src/mainwindow.c:1670 src/setup.c:62
+#: src/mainwindow.c:1681 src/setup.c:62
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3600,145 +3616,145 @@ 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:2088
+#: src/mainwindow.c:2099
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Katalogų peržiūra"
 
-#: src/mainwindow.c:2107
+#: src/mainwindow.c:2118
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Žinutės peržiūra"
 
-#: src/mainwindow.c:2259 src/summaryview.c:408
+#: src/mainwindow.c:2270 src/summaryview.c:408
 msgid "/_Reply"
 msgstr "/_Atsakyti"
 
-#: src/mainwindow.c:2260
+#: src/mainwindow.c:2271
 msgid "/Reply to _all"
 msgstr "/Atsakyti _visiems"
 
-#: src/mainwindow.c:2261
+#: src/mainwindow.c:2272
 msgid "/Reply to _sender"
 msgstr "/Atsakyti _siuntėjui"
 
-#: src/mainwindow.c:2262
+#: src/mainwindow.c:2273
 msgid "/Reply to mailing _list"
 msgstr "/Atsakyti _konferencijai"
 
-#: src/mainwindow.c:2267 src/summaryview.c:415
+#: src/mainwindow.c:2278 src/summaryview.c:415
 msgid "/_Forward"
 msgstr "/_Persiųsti"
 
-#: src/mainwindow.c:2268 src/summaryview.c:416
+#: src/mainwindow.c:2279 src/summaryview.c:416
 msgid "/For_ward as attachment"
 msgstr "/Pe_rsiųsti kaip priedą"
 
-#: src/mainwindow.c:2269 src/summaryview.c:417
+#: src/mainwindow.c:2280 src/summaryview.c:417
 msgid "/Redirec_t"
 msgstr "/Nukreip_ti"
 
-#: src/mainwindow.c:2305
+#: src/mainwindow.c:2316
 msgid "Get"
 msgstr "Gauti"
 
-#: src/mainwindow.c:2306
+#: src/mainwindow.c:2317
 msgid "Incorporate new mail"
 msgstr "Prijungti naują paštą"
 
-#: src/mainwindow.c:2313
+#: src/mainwindow.c:2324
 msgid "Get all"
 msgstr "Gauti visus"
 
-#: src/mainwindow.c:2314
+#: src/mainwindow.c:2325
 msgid "Incorporate new mail of all accounts"
 msgstr "Prijungti naują visų sąskaitų paštą"
 
-#: src/mainwindow.c:2325
+#: src/mainwindow.c:2336
 msgid "Send queued message(s)"
 msgstr "Siųsti laiškus eilėje"
 
-#: src/mainwindow.c:2335 src/prefs_account_dialog.c:530
+#: src/mainwindow.c:2346 src/prefs_account_dialog.c:530
 #: src/prefs_common_dialog.c:663 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "Rašyti"
 
-#: src/mainwindow.c:2336
+#: src/mainwindow.c:2347
 msgid "Compose new message"
 msgstr "Rašyti naują laišką"
 
-#: src/mainwindow.c:2344 src/prefs_common_dialog.c:975
+#: src/mainwindow.c:2355 src/prefs_common_dialog.c:975
 msgid "Reply"
 msgstr "Atsakyti"
 
-#: src/mainwindow.c:2345 src/mainwindow.c:2358
+#: src/mainwindow.c:2356 src/mainwindow.c:2369
 msgid "Reply to the message"
 msgstr "Atsakyti į laišką"
 
-#: src/mainwindow.c:2362
+#: src/mainwindow.c:2373
 msgid "Reply all"
 msgstr "Atsakyti visus"
 
-#: src/mainwindow.c:2363
+#: src/mainwindow.c:2374
 msgid "Reply to all"
 msgstr "Atsakyti į visus"
 
-#: src/mainwindow.c:2371 src/prefs_filter_edit.c:672
+#: src/mainwindow.c:2382 src/prefs_filter_edit.c:672
 msgid "Forward"
 msgstr "Persiųsti"
 
-#: src/mainwindow.c:2372 src/mainwindow.c:2385
+#: src/mainwindow.c:2383 src/mainwindow.c:2396
 msgid "Forward the message"
 msgstr "Persiųsti laišką"
 
-#: src/mainwindow.c:2392
+#: src/mainwindow.c:2403
 msgid "Delete the message"
 msgstr "Ištrinti laišką"
 
-#: src/mainwindow.c:2401
+#: src/mainwindow.c:2412
 msgid "Set as junk mail"
 msgstr "Pažymėti kaip nereikalingą"
 
-#: src/mainwindow.c:2410
+#: src/mainwindow.c:2421
 msgid "Execute"
 msgstr "Vykdyti"
 
-#: src/mainwindow.c:2411
+#: src/mainwindow.c:2422
 msgid "Execute marked process"
 msgstr "Vykdyti pažymėtus procesus"
 
-#: src/mainwindow.c:2421
+#: src/mainwindow.c:2432
 msgid "Next unread message"
 msgstr "Kitas neskaitytas laiškas"
 
-#: src/mainwindow.c:2433
+#: src/mainwindow.c:2444
 msgid "Prefs"
 msgstr "Nustatymai"
 
-#: src/mainwindow.c:2434
+#: src/mainwindow.c:2445
 msgid "Common preferences"
 msgstr "Bendri nustatymai"
 
-#: src/mainwindow.c:2442 src/prefs_folder_item.c:289
+#: src/mainwindow.c:2453 src/prefs_folder_item.c:289
 #: src/prefs_folder_item.c:300 src/progressdialog.c:128
 msgid "Account"
 msgstr "Sąskaita"
 
-#: src/mainwindow.c:2443
+#: src/mainwindow.c:2454
 msgid "Account setting"
 msgstr "Sąskaitos nustatymai"
 
-#: src/mainwindow.c:2615
+#: src/mainwindow.c:2626
 msgid "You are offline. Click the icon to go online."
 msgstr "Jūs esate atsijungęs. Spustelkite piktogramą jei norite prisijungti."
 
-#: src/mainwindow.c:2626
+#: src/mainwindow.c:2637
 msgid "You are online. Click the icon to go offline."
 msgstr "Jūs esate prisijungęs. Spustelkite piktogramą jei norite atsijungti."
 
-#: src/mainwindow.c:2892
+#: src/mainwindow.c:2903
 msgid "Exit"
 msgstr "Išeiti"
 
-#: src/mainwindow.c:2892
+#: src/mainwindow.c:2903
 msgid "Exit this program?"
 msgstr "Užverti programą?"
 
@@ -3775,45 +3791,45 @@ msgstr "Pasiekta žinutės pabaiga; tęsti nuo pradžios?"
 msgid "Search finished"
 msgstr "Paieška baigta"
 
-#: src/messageview.c:261
+#: src/messageview.c:266
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/Į_rankiai/Įrašyti siuntėją į adresų _knygą"
 
-#: src/messageview.c:291
+#: src/messageview.c:296
 msgid "Creating message view...\n"
 msgstr "Sukuriama žinutės peržiūra...\n"
 
-#: src/messageview.c:316
+#: src/messageview.c:321
 msgid "Text"
 msgstr "Tekstas"
 
-#: src/messageview.c:321
+#: src/messageview.c:326
 msgid "Attachments"
 msgstr "Priedai"
 
-#: src/messageview.c:371
+#: src/messageview.c:376
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:669 src/summaryview.c:3268
+#: src/messageview.c:674 src/summaryview.c:3425
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Negaliu išsaugoti bylos „%s“."
 
-#: src/messageview.c:728 src/summaryview.c:3291
+#: src/messageview.c:733 src/summaryview.c:3448
 msgid "The message will be printed with the following command:"
 msgstr ""
 
-#: src/messageview.c:729 src/summaryview.c:3292
+#: src/messageview.c:734 src/summaryview.c:3449
 #, fuzzy
 msgid "(Default print command)"
 msgstr "Mokymosi komanda"
 
-#: src/messageview.c:731 src/prefs_common_dialog.c:2304 src/summaryview.c:3294
+#: src/messageview.c:736 src/prefs_common_dialog.c:2304 src/summaryview.c:3451
 msgid "Print"
 msgstr "Spausdinti"
 
-#: src/messageview.c:740 src/summaryview.c:3303
+#: src/messageview.c:745 src/summaryview.c:3460
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -4708,8 +4724,8 @@ msgstr "Rodyti gavėją lauke „Siuntėjas“, jei siuntėjas esate Jūs"
 msgid "Expand threads"
 msgstr "Išskleisti gijas"
 
-#: src/prefs_common_dialog.c:1413 src/prefs_common_dialog.c:2713
-#: src/prefs_common_dialog.c:2751
+#: src/prefs_common_dialog.c:1413 src/prefs_common_dialog.c:2716
+#: src/prefs_common_dialog.c:2754
 msgid "Date format"
 msgstr "Datos formatas"
 
@@ -4994,8 +5010,8 @@ msgstr "Išorinė komanda (%s bus pakeista bylos vardu / URI)"
 msgid "Web browser"
 msgstr "Naršyklė"
 
-#: src/prefs_common_dialog.c:2288 src/prefs_common_dialog.c:3775
-#: src/prefs_common_dialog.c:3796
+#: src/prefs_common_dialog.c:2288 src/prefs_common_dialog.c:3778
+#: src/prefs_common_dialog.c:3799
 #, fuzzy
 msgid "(Default browser)"
 msgstr "Gaunamų laiškų dėžutė"
@@ -5071,214 +5087,224 @@ msgid "Greek (ISO-8859-7)"
 msgstr "Graikų (ISO-8859-7)"
 
 #: src/prefs_common_dialog.c:2495
+#, fuzzy
+msgid "Arabic (ISO-8859-6)"
+msgstr "Baltų (ISO-8859-4)"
+
+#: src/prefs_common_dialog.c:2496
+#, fuzzy
+msgid "Arabic (Windows-1256)"
+msgstr "Kirilica (Windows-1251)"
+
+#: src/prefs_common_dialog.c:2498
 msgid "Hebrew (ISO-8859-8)"
 msgstr "Hebrajų (ISO-8859-8)"
 
-#: src/prefs_common_dialog.c:2496
+#: src/prefs_common_dialog.c:2499
 msgid "Hebrew (Windows-1255)"
 msgstr "Hebrajų (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2498
+#: src/prefs_common_dialog.c:2501
 msgid "Turkish (ISO-8859-9)"
 msgstr "Turkų (ISO-8859-9)"
 
-#: src/prefs_common_dialog.c:2500
+#: src/prefs_common_dialog.c:2503
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Kirilica (ISO-8859-5)"
 
-#: src/prefs_common_dialog.c:2501
+#: src/prefs_common_dialog.c:2504
 msgid "Cyrillic (KOI8-R)"
 msgstr "Kirilica (KOI8-R)"
 
-#: src/prefs_common_dialog.c:2502
+#: src/prefs_common_dialog.c:2505
 msgid "Cyrillic (KOI8-U)"
 msgstr "Kirilica (KOI8-U)"
 
-#: src/prefs_common_dialog.c:2503
+#: src/prefs_common_dialog.c:2506
 msgid "Cyrillic (Windows-1251)"
 msgstr "Kirilica (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2505
+#: src/prefs_common_dialog.c:2508
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Japonų (ISO-2022-JP)"
 
-#: src/prefs_common_dialog.c:2507
+#: src/prefs_common_dialog.c:2510
 msgid "Japanese (EUC-JP)"
 msgstr "Japonų (EUC-JP)"
 
-#: src/prefs_common_dialog.c:2508
+#: src/prefs_common_dialog.c:2511
 msgid "Japanese (Shift_JIS)"
 msgstr "Japonų (Shift_JIS)"
 
-#: src/prefs_common_dialog.c:2511
+#: src/prefs_common_dialog.c:2514
 msgid "Simplified Chinese (GB2312)"
 msgstr "Supaprastinta Kinų (GB2312)"
 
-#: src/prefs_common_dialog.c:2512
+#: src/prefs_common_dialog.c:2515
 msgid "Simplified Chinese (GBK)"
 msgstr "Supaprastinta Kinų (GBK)"
 
-#: src/prefs_common_dialog.c:2513
+#: src/prefs_common_dialog.c:2516
 msgid "Traditional Chinese (Big5)"
 msgstr "Tradicinė Kinų (Big5)"
 
-#: src/prefs_common_dialog.c:2515
+#: src/prefs_common_dialog.c:2518
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Tradicinė Kinų (EUC-TW)"
 
-#: src/prefs_common_dialog.c:2516
+#: src/prefs_common_dialog.c:2519
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Kinų (ISO-2022-CN)"
 
-#: src/prefs_common_dialog.c:2519
+#: src/prefs_common_dialog.c:2522
 msgid "Korean (EUC-KR)"
 msgstr "Korėjiečių (EUC-KR)"
 
-#: src/prefs_common_dialog.c:2521
+#: src/prefs_common_dialog.c:2524
 msgid "Thai (TIS-620)"
 msgstr "Tailandiečių (TIS-620)"
 
-#: src/prefs_common_dialog.c:2522
+#: src/prefs_common_dialog.c:2525
 msgid "Thai (Windows-874)"
 msgstr "Tailandiečių (Windows-874)"
 
-#: src/prefs_common_dialog.c:2689
+#: src/prefs_common_dialog.c:2692
 msgid "the full abbreviated weekday name"
 msgstr "sutrumpinta savaitės diena"
 
-#: src/prefs_common_dialog.c:2690
+#: src/prefs_common_dialog.c:2693
 msgid "the full weekday name"
 msgstr "pilna savaitės diena"
 
-#: src/prefs_common_dialog.c:2691
+#: src/prefs_common_dialog.c:2694
 msgid "the abbreviated month name"
 msgstr "sutrumpintas mėnuo"
 
-#: src/prefs_common_dialog.c:2692
+#: src/prefs_common_dialog.c:2695
 msgid "the full month name"
 msgstr "pilnas mėnuo"
 
-#: src/prefs_common_dialog.c:2693
+#: src/prefs_common_dialog.c:2696
 msgid "the preferred date and time for the current locale"
 msgstr "pageidaujama data ir laikas esamai lokalei"
 
-#: src/prefs_common_dialog.c:2694
+#: src/prefs_common_dialog.c:2697
 msgid "the century number (year/100)"
 msgstr "amžius (metai/100)"
 
-#: src/prefs_common_dialog.c:2695
+#: src/prefs_common_dialog.c:2698
 msgid "the day of the month as a decimal number"
 msgstr "mėnesio diena"
 
-#: src/prefs_common_dialog.c:2696
+#: src/prefs_common_dialog.c:2699
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "valanda (24)"
 
-#: src/prefs_common_dialog.c:2697
+#: src/prefs_common_dialog.c:2700
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "valanda (12)"
 
-#: src/prefs_common_dialog.c:2698
+#: src/prefs_common_dialog.c:2701
 msgid "the day of the year as a decimal number"
 msgstr "metų diena"
 
-#: src/prefs_common_dialog.c:2699
+#: src/prefs_common_dialog.c:2702
 msgid "the month as a decimal number"
 msgstr "mėnesio numeris"
 
-#: src/prefs_common_dialog.c:2700
+#: src/prefs_common_dialog.c:2703
 msgid "the minute as a decimal number"
 msgstr "minutės"
 
-#: src/prefs_common_dialog.c:2701
+#: src/prefs_common_dialog.c:2704
 msgid "either AM or PM"
 msgstr "AM / PM"
 
-#: src/prefs_common_dialog.c:2702
+#: src/prefs_common_dialog.c:2705
 msgid "the second as a decimal number"
 msgstr "sekundės"
 
-#: src/prefs_common_dialog.c:2703
+#: src/prefs_common_dialog.c:2706
 msgid "the day of the week as a decimal number"
 msgstr "savaitės dienos numeris"
 
-#: src/prefs_common_dialog.c:2704
+#: src/prefs_common_dialog.c:2707
 msgid "the preferred date for the current locale"
 msgstr "pageidaujama data esamai lokalei"
 
-#: src/prefs_common_dialog.c:2705
+#: src/prefs_common_dialog.c:2708
 msgid "the last two digits of a year"
 msgstr "paskutiniai du metų skaitmenys"
 
-#: src/prefs_common_dialog.c:2706
+#: src/prefs_common_dialog.c:2709
 msgid "the year as a decimal number"
 msgstr "metai"
 
-#: src/prefs_common_dialog.c:2707
+#: src/prefs_common_dialog.c:2710
 msgid "the time zone or name or abbreviation"
 msgstr "laiko zona"
 
-#: src/prefs_common_dialog.c:2728
+#: src/prefs_common_dialog.c:2731
 msgid "Specifier"
 msgstr "Simbolis"
 
-#: src/prefs_common_dialog.c:2729
+#: src/prefs_common_dialog.c:2732
 msgid "Description"
 msgstr "Aprašymas"
 
-#: src/prefs_common_dialog.c:2769
+#: src/prefs_common_dialog.c:2772
 msgid "Example"
 msgstr "Pavyzdys"
 
-#: src/prefs_common_dialog.c:2850
+#: src/prefs_common_dialog.c:2853
 msgid "Set message colors"
 msgstr "Nustatyti žinutės spalvas"
 
-#: src/prefs_common_dialog.c:2858
+#: src/prefs_common_dialog.c:2861
 msgid "Colors"
 msgstr "Spalvos"
 
-#: src/prefs_common_dialog.c:2892
+#: src/prefs_common_dialog.c:2895
 msgid "Quoted Text - First Level"
 msgstr "Cituojams tekstas - Pirmas lygis"
 
-#: src/prefs_common_dialog.c:2898
+#: src/prefs_common_dialog.c:2901
 msgid "Quoted Text - Second Level"
 msgstr "Cituojams tekstas - Antras lygis"
 
-#: src/prefs_common_dialog.c:2904
+#: src/prefs_common_dialog.c:2907
 msgid "Quoted Text - Third Level"
 msgstr "Cituojams tekstas - Trečias lygis"
 
-#: src/prefs_common_dialog.c:2910
+#: src/prefs_common_dialog.c:2913
 msgid "URI link"
 msgstr "Nuoroda"
 
-#: src/prefs_common_dialog.c:2917
+#: src/prefs_common_dialog.c:2920
 msgid "Recycle quote colors"
 msgstr "Atkurti citatos spalvas"
 
-#: src/prefs_common_dialog.c:2984
+#: src/prefs_common_dialog.c:2987
 msgid "Pick color for quotation level 1"
 msgstr "Pasirinkite spalvą pirmam citatos lygiui"
 
-#: src/prefs_common_dialog.c:2987
+#: src/prefs_common_dialog.c:2990
 msgid "Pick color for quotation level 2"
 msgstr "Pasirinkite spalvą antram citatos lygiui"
 
-#: src/prefs_common_dialog.c:2990
+#: src/prefs_common_dialog.c:2993
 msgid "Pick color for quotation level 3"
 msgstr "Pasirinkite spalvą trečiam citatos lygiui"
 
-#: src/prefs_common_dialog.c:2993
+#: src/prefs_common_dialog.c:2996
 msgid "Pick color for URI"
 msgstr "Pasirinkite nuorodos spalvą"
 
-#: src/prefs_common_dialog.c:3133
+#: src/prefs_common_dialog.c:3136
 msgid "Description of symbols"
 msgstr "Simbolių apibūdinimas"
 
-#: src/prefs_common_dialog.c:3189
+#: src/prefs_common_dialog.c:3192
 msgid ""
 "Date\n"
 "From\n"
@@ -5302,11 +5328,11 @@ msgstr ""
 "Naujienų grupė\n"
 "Žinutės-ID"
 
-#: src/prefs_common_dialog.c:3202
+#: src/prefs_common_dialog.c:3205
 msgid "If x is set, displays expr"
 msgstr "Jei egzistuoja „x“, rodo „expr“"
 
-#: src/prefs_common_dialog.c:3206
+#: src/prefs_common_dialog.c:3209
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -5320,7 +5346,7 @@ msgstr ""
 "Cituojamas tekstas be parašo\n"
 "Simbolis %"
 
-#: src/prefs_common_dialog.c:3214
+#: src/prefs_common_dialog.c:3217
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -5332,20 +5358,20 @@ msgstr ""
 "Atidarantys riestiniai skliaustai\n"
 "Uždarantys riestiniai skliaustai"
 
-#: src/prefs_common_dialog.c:3260
+#: src/prefs_common_dialog.c:3263
 msgid "Key bindings"
 msgstr "Klavišų susiejimai"
 
-#: src/prefs_common_dialog.c:3273
+#: src/prefs_common_dialog.c:3276
 #, fuzzy
 msgid "Select the preset of key bindings."
 msgstr " Klavišų susiejimai... "
 
-#: src/prefs_common_dialog.c:3283 src/prefs_common_dialog.c:3607
+#: src/prefs_common_dialog.c:3286 src/prefs_common_dialog.c:3610
 msgid "Default"
 msgstr "Įprastas"
 
-#: src/prefs_common_dialog.c:3286 src/prefs_common_dialog.c:3616
+#: src/prefs_common_dialog.c:3289 src/prefs_common_dialog.c:3619
 msgid "Old Sylpheed"
 msgstr "Senas „Sylpheed“"
 
@@ -5466,7 +5492,7 @@ msgstr "Komandos rezultatas"
 msgid "Age"
 msgstr "Amžius"
 
-#: src/prefs_filter_edit.c:501 src/summaryview.c:510
+#: src/prefs_filter_edit.c:501 src/summaryview.c:512
 #, fuzzy
 msgid "Marked"
 msgstr "Žyma"
@@ -5697,17 +5723,17 @@ msgid "Attachment"
 msgstr "Priedas"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73 src/query_search.c:371 src/summaryview.c:4733
+#: src/prefs_summary_column.c:73 src/query_search.c:371 src/summaryview.c:4890
 msgid "Subject"
 msgstr "Tema"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/query_search.c:372 src/summaryview.c:4736
+#: src/prefs_summary_column.c:74 src/query_search.c:372 src/summaryview.c:4893
 msgid "From"
 msgstr "Siuntėjas"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/query_search.c:373 src/summaryview.c:4738
+#: src/prefs_summary_column.c:75 src/query_search.c:373 src/summaryview.c:4895
 msgid "Date"
 msgstr "Data"
 
@@ -5809,7 +5835,7 @@ msgstr "Ieškoti žinučių"
 msgid "_Save as search folder"
 msgstr "Išsaugoti į juodraščių katalogą"
 
-#: src/query_search.c:512 src/subscribedialog.c:523 src/summaryview.c:840
+#: src/query_search.c:512 src/subscribedialog.c:523 src/summaryview.c:842
 msgid "Done."
 msgstr "Atlikta."
 
@@ -5823,7 +5849,7 @@ msgstr "Skanuojamas katalogas „%s“..."
 msgid "Searching %s (%d / %d)..."
 msgstr "Filtruojama..."
 
-#: src/query_search.c:645 src/summaryview.c:2048
+#: src/query_search.c:645 src/summaryview.c:2051
 msgid "(No Date)"
 msgstr "(Be datos)"
 
@@ -6197,306 +6223,311 @@ msgid "/_Mark/Mark as rea_d"
 msgstr "/Žy_ma/Žymėti skai_tyta"
 
 #: src/summaryview.c:429
+#, fuzzy
+msgid "/_Mark/Mark _thread as read"
+msgstr "/Žy_ma/Žymėti skai_tyta"
+
+#: src/summaryview.c:431
 msgid "/_Mark/Mark all _read"
 msgstr "/Žy_ma/Žymėti _visas skaitytomis"
 
-#: src/summaryview.c:430
+#: src/summaryview.c:432
 msgid "/Color la_bel"
 msgstr "/Spa_lva"
 
-#: src/summaryview.c:434
+#: src/summaryview.c:436
 msgid "/Re-_edit"
 msgstr "/R_edaguoti"
 
-#: src/summaryview.c:436
+#: src/summaryview.c:438
 msgid "/Add sender to address boo_k..."
 msgstr "/Pridėti siuntėją į adresų _knygą"
 
-#: src/summaryview.c:438
+#: src/summaryview.c:440
 #, fuzzy
 msgid "/Create f_ilter rule"
 msgstr "/Į_rankiai/Sukurti filtravimo _taisyklę"
 
-#: src/summaryview.c:439
+#: src/summaryview.c:441
 #, fuzzy
 msgid "/Create f_ilter rule/_Automatically"
 msgstr "/Į_rankiai/Sukurti filtravimo _taisyklę/_Automatiškai"
 
-#: src/summaryview.c:441
+#: src/summaryview.c:443
 #, fuzzy
 msgid "/Create f_ilter rule/by _From"
 msgstr "/Į_rankiai/Sukurti filtravimo _taisyklę/pagal _Siuntėją"
 
-#: src/summaryview.c:443
+#: src/summaryview.c:445
 #, fuzzy
 msgid "/Create f_ilter rule/by _To"
 msgstr "/Į_rankiai/Sukurti filtravimo _taisyklę/pagal _Gavėją"
 
-#: src/summaryview.c:445
+#: src/summaryview.c:447
 #, fuzzy
 msgid "/Create f_ilter rule/by _Subject"
 msgstr "/Į_rankiai/Sukurti filtravimo _taisyklę/pagal _Temą"
 
-#: src/summaryview.c:451
+#: src/summaryview.c:453
 msgid "/_View/_Source"
 msgstr "/_Rodyti/P_radinis tekstas"
 
-#: src/summaryview.c:452
+#: src/summaryview.c:454
 msgid "/_View/All _header"
 msgstr "/_Rodyti/_Visos antraštės"
 
-#: src/summaryview.c:454
+#: src/summaryview.c:456
 msgid "/_Print..."
 msgstr "/S_pausdinti..."
 
-#: src/summaryview.c:486
+#: src/summaryview.c:488
 msgid "Creating summary view...\n"
 msgstr "Sukuriamas santraukos vaizdas...\n"
 
-#: src/summaryview.c:508
+#: src/summaryview.c:510
 msgid "All"
 msgstr ""
 
-#: src/summaryview.c:511
+#: src/summaryview.c:513
 #, fuzzy
 msgid "Have color label"
 msgstr "/Spa_lva"
 
-#: src/summaryview.c:512
+#: src/summaryview.c:514
 #, fuzzy
 msgid "Have attachment"
 msgstr "Priedas"
 
-#: src/summaryview.c:521
+#: src/summaryview.c:523
 #, fuzzy
 msgid "Search:"
 msgstr " Paieška "
 
-#: src/summaryview.c:535
+#: src/summaryview.c:537
 msgid "Search for Subject or From"
 msgstr ""
 
-#: src/summaryview.c:702
+#: src/summaryview.c:704
 msgid "Process mark"
 msgstr "Vykdyti žymą"
 
-#: src/summaryview.c:703
+#: src/summaryview.c:705
 msgid "Some marks are left. Process it?"
 msgstr "Palikta žymių. Vykdyti jas?"
 
-#: src/summaryview.c:749
+#: src/summaryview.c:751
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "Skanuojamas katalogas (%s)..."
 
-#: src/summaryview.c:1292
+#: src/summaryview.c:1295
 msgid "_Search again"
 msgstr "_Ieškoti dar kartą"
 
-#: src/summaryview.c:1313 src/summaryview.c:1322
+#: src/summaryview.c:1316 src/summaryview.c:1325
 msgid "No more unread messages"
 msgstr "Daugiau nėra neskaitytų žinučių."
 
-#: src/summaryview.c:1314
+#: src/summaryview.c:1317
 msgid "No unread message found. Search from the end?"
 msgstr "Nėra neskaitytų žinučių. Ieškoti nuo pabaigos?"
 
-#: src/summaryview.c:1316
+#: src/summaryview.c:1319
 msgid "No unread messages."
 msgstr "Nėra neskaitytų žinučių."
 
-#: src/summaryview.c:1323
+#: src/summaryview.c:1326
 msgid "No unread message found. Go to next folder?"
 msgstr "Nėra neskaitytų žinučių. Eiti į kitą katalogą?"
 
-#: src/summaryview.c:1331 src/summaryview.c:1340
+#: src/summaryview.c:1334 src/summaryview.c:1343
 msgid "No more new messages"
 msgstr "Daugiau nėra naujų žinučių."
 
-#: src/summaryview.c:1332
+#: src/summaryview.c:1335
 msgid "No new message found. Search from the end?"
 msgstr "Nėra naujų žinučių. Ieškoti nuo pabaigos?"
 
-#: src/summaryview.c:1334
+#: src/summaryview.c:1337
 msgid "No new messages."
 msgstr "Nėra naujų žinučių."
 
-#: src/summaryview.c:1341
+#: src/summaryview.c:1344
 msgid "No new message found. Go to next folder?"
 msgstr "Nėra naujų žinučių. Eiti į kitą katalogą?"
 
-#: src/summaryview.c:1349 src/summaryview.c:1358
+#: src/summaryview.c:1352 src/summaryview.c:1361
 msgid "No more marked messages"
 msgstr "Daugiau nėra pažymėtų žinučių"
 
-#: src/summaryview.c:1350
+#: src/summaryview.c:1353
 msgid "No marked message found. Search from the end?"
 msgstr "Nėra pažymėtų žinučių. Ieškoti nuo pabaigos?"
 
-#: src/summaryview.c:1352 src/summaryview.c:1361
+#: src/summaryview.c:1355 src/summaryview.c:1364
 msgid "No marked messages."
 msgstr "Nėra pažymėtų žinučių."
 
-#: src/summaryview.c:1359
+#: src/summaryview.c:1362
 msgid "No marked message found. Search from the beginning?"
 msgstr "Nėra pažymėtų žinučių. Ieškoti nuo pradžios?"
 
-#: src/summaryview.c:1367 src/summaryview.c:1376
+#: src/summaryview.c:1370 src/summaryview.c:1379
 msgid "No more labeled messages"
 msgstr "Daugiau nėra žinučių su etiketėmis"
 
-#: src/summaryview.c:1368
+#: src/summaryview.c:1371
 msgid "No labeled message found. Search from the end?"
 msgstr "Nėra žinučių su etiketėmis. Ieškoti nuo pabaigos?"
 
-#: src/summaryview.c:1370 src/summaryview.c:1379
+#: src/summaryview.c:1373 src/summaryview.c:1382
 msgid "No labeled messages."
 msgstr "Nėra žinučių su etiketėmis."
 
-#: src/summaryview.c:1377
+#: src/summaryview.c:1380
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Nėra žinučių su etiketėmis. Ieškoti nuo pradžios?"
 
-#: src/summaryview.c:1693
+#: src/summaryview.c:1696
 msgid "Attracting messages by subject..."
 msgstr "Žinutės pritraukiamos pagal temą..."
 
-#: src/summaryview.c:1887
+#: src/summaryview.c:1890
 #, c-format
 msgid "%d deleted"
 msgstr "%d ištrinta"
 
-#: src/summaryview.c:1891
+#: src/summaryview.c:1894
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d perkelta"
 
-#: src/summaryview.c:1892 src/summaryview.c:1897
+#: src/summaryview.c:1895 src/summaryview.c:1900
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:1896
+#: src/summaryview.c:1899
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d nukopijuota"
 
-#: src/summaryview.c:1911
+#: src/summaryview.c:1914
 msgid " item(s) selected"
 msgstr " objektas(-ai) pažymėti"
 
-#: src/summaryview.c:1933
+#: src/summaryview.c:1936
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "nauji: %d, neskaityti: %d, viso: %d (%s)"
 
-#: src/summaryview.c:1937
+#: src/summaryview.c:1940
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "nauji: %d, neskaityti: %d, viso: %d"
 
-#: src/summaryview.c:1971
+#: src/summaryview.c:1974
 msgid "Sorting summary..."
 msgstr "Rikiuojama santrauka..."
 
-#: src/summaryview.c:2194
+#: src/summaryview.c:2211
 msgid "\tSetting summary from message data..."
 msgstr "\tNustatoma santrauka iš žinutės duomenų..."
 
-#: src/summaryview.c:2196
+#: src/summaryview.c:2213
 msgid "Setting summary from message data..."
 msgstr "Nustatoma santrauka iš žinutės duomenų..."
 
-#: src/summaryview.c:2302
+#: src/summaryview.c:2319
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Rašoma santraukos laikinoji atmintis (%s)..."
 
-#: src/summaryview.c:2643
+#: src/summaryview.c:2660
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Žinutė %d pažymėta\n"
 
-#: src/summaryview.c:2701
+#: src/summaryview.c:2718
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Žinutė %d pažymėta skaityta\n"
 
-#: src/summaryview.c:2789
+#: src/summaryview.c:2908
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Žinutė %d pažymėta neskaityta\n"
 
-#: src/summaryview.c:2850
+#: src/summaryview.c:2969
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Žinutė %s/%d pažymėta trinimui\n"
 
-#: src/summaryview.c:2878
+#: src/summaryview.c:2997
 msgid "Delete message(s)"
 msgstr "Ištrinti žinutę(-es)"
 
-#: src/summaryview.c:2879
+#: src/summaryview.c:2998
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Ar tikrai norite ištrinti žinutes iš šiukšlinės?"
 
-#: src/summaryview.c:2953
+#: src/summaryview.c:3072
 msgid "Deleting duplicated messages..."
 msgstr "Trinamos identiškos žinutės..."
 
-#: src/summaryview.c:2991
+#: src/summaryview.c:3110
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Žinutė %s/%d atžymėta\n"
 
-#: src/summaryview.c:3049
+#: src/summaryview.c:3168
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Žinutė %d pažymėta perkėlimui į %s\n"
 
-#: src/summaryview.c:3066
+#: src/summaryview.c:3196
 msgid "Destination is same as current folder."
 msgstr "Paskirtis yra tas pats katalogas."
 
-#: src/summaryview.c:3122
+#: src/summaryview.c:3260
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Žinutė %d pažymėta kopijavimui į %s\n"
 
-#: src/summaryview.c:3139
+#: src/summaryview.c:3288
 msgid "Destination for copy is same as current folder."
 msgstr "Kopijavimo paskirtis yra tas pats katalogas."
 
-#: src/summaryview.c:3338
+#: src/summaryview.c:3495
 msgid "Error occurred while processing messages."
 msgstr "Klaida vykdant operacijas su žinutėmis."
 
-#: src/summaryview.c:3646 src/summaryview.c:3647
+#: src/summaryview.c:3803 src/summaryview.c:3804
 msgid "Building threads..."
 msgstr "Statomos gijos..."
 
-#: src/summaryview.c:3797 src/summaryview.c:3798
+#: src/summaryview.c:3954 src/summaryview.c:3955
 msgid "Unthreading..."
 msgstr "Griaunamos gijos..."
 
-#: src/summaryview.c:4091 src/summaryview.c:4147
+#: src/summaryview.c:4248 src/summaryview.c:4304
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtruojama..."
 
-#: src/summaryview.c:4196
+#: src/summaryview.c:4353
 msgid "filtering..."
 msgstr "filtruojama..."
 
-#: src/summaryview.c:4197
+#: src/summaryview.c:4354
 msgid "Filtering..."
 msgstr "Filtruojama..."
 
-#: src/summaryview.c:4233
+#: src/summaryview.c:4390
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "Filtruota žinučių: %d"
 
-#: src/summaryview.c:4742
+#: src/summaryview.c:4899
 msgid "No."
 msgstr "Nr."
 
@@ -6513,31 +6544,31 @@ msgstr "Sukuriama teksto peržiūra...\n"
 msgid "This message can't be displayed.\n"
 msgstr "Žinutė negali būti parodyta.\n"
 
-#: src/textview.c:1929
+#: src/textview.c:1925
 msgid "Sa_ve this image as..."
 msgstr "Saugoti pa_veikslėlį kaip"
 
-#: src/textview.c:1945 src/trayicon.c:109
+#: src/textview.c:1941 src/trayicon.c:109
 msgid "Compose _new message"
 msgstr "Rašyti _naują laišką"
 
-#: src/textview.c:1947
+#: src/textview.c:1943
 msgid "Add to address _book..."
 msgstr "Pridėti į adresų _knygą"
 
-#: src/textview.c:1949
+#: src/textview.c:1945
 msgid "Copy this add_ress"
 msgstr "Kopijuoti ad_resą"
 
-#: src/textview.c:1952
+#: src/textview.c:1948
 msgid "_Open with Web browser"
 msgstr "_Atverti su naršykle"
 
-#: src/textview.c:1954
+#: src/textview.c:1950
 msgid "Copy this _link"
 msgstr "Kopijuoti _nuorodą"
 
-#: src/textview.c:2097
+#: src/textview.c:2093
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6550,7 +6581,7 @@ msgstr ""
 "\n"
 "Visvien atverti?"
 
-#: src/textview.c:2102
+#: src/textview.c:2098
 msgid "Fake URL warning"
 msgstr "Perspėjimas dėl netikro URL"
 
diff --git a/po/nl.po b/po/nl.po
index 70f408b5..1212cbf1 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: 2006-01-27 18:11+0900\n"
+"POT-Creation-Date: 2006-01-31 15:20+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"
@@ -513,7 +513,7 @@ msgstr "%s gevonden\n"
 msgid "Configuration is saved.\n"
 msgstr "Configuratie is opgeslagen.\n"
 
-#: libsylph/prefs_common.c:489
+#: libsylph/prefs_common.c:491
 #, fuzzy
 msgid "Junk mail filter"
 msgstr "Accounts"
@@ -630,8 +630,8 @@ msgstr "%.2fMB"
 msgid "%.2fGB"
 msgstr "%.2fGB"
 
-#: libsylph/utils.c:2373 src/compose.c:2858 src/compose.c:3121
-#: src/compose.c:3184 src/compose.c:3304
+#: libsylph/utils.c:2373 src/compose.c:2867 src/compose.c:3130
+#: src/compose.c:3193 src/compose.c:3313
 msgid "can't change file mode\n"
 msgstr "kan de bestandmodus niet veranderen\n"
 
@@ -720,8 +720,8 @@ msgstr ""
 "Zet een vinkje in de 'G' kolom om berichten binnen te halen wanneer\n"
 "u op de knop 'Alles ophalen' klikt."
 
-#: src/account_dialog.c:366 src/addressadd.c:192 src/addressbook.c:491
-#: src/compose.c:4262 src/editaddress.c:200 src/editaddress.c:942
+#: src/account_dialog.c:366 src/addressadd.c:192 src/addressbook.c:493
+#: src/compose.c:4271 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:206 src/prefs_filter.c:259 src/prefs_folder_item.c:171
@@ -857,12 +857,12 @@ msgstr ""
 msgid "Add Address to Book"
 msgstr "Adres toevoegen aan adresboek"
 
-#: src/addressadd.c:202 src/compose.c:4762 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4771 src/editaddress.c:201
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "Adres"
 
-#: src/addressadd.c:212 src/addressbook.c:493 src/editaddress.c:202
+#: src/addressadd.c:212 src/addressbook.c:495 src/editaddress.c:202
 #: src/editaddress.c:795 src/editaddress.c:860 src/editgroup.c:267
 msgid "Remarks"
 msgstr "Opmerkingen"
@@ -871,183 +871,183 @@ msgstr "Opmerkingen"
 msgid "Select Address Book Folder"
 msgstr "Selecteer adresboekmap"
 
-#: src/addressbook.c:336 src/compose.c:515 src/mainwindow.c:477
+#: src/addressbook.c:338 src/compose.c:515 src/mainwindow.c:480
 #: src/messageview.c:138
 msgid "/_File"
 msgstr "/_Bestand"
 
-#: src/addressbook.c:337
+#: src/addressbook.c:339
 msgid "/_File/New _Book"
 msgstr "/_Bestand/Nieuw _adresboek"
 
-#: src/addressbook.c:338
+#: src/addressbook.c:340
 msgid "/_File/New _vCard"
 msgstr "/_Bestand/Nieuwe _vCard"
 
-#: src/addressbook.c:340
+#: src/addressbook.c:342
 msgid "/_File/New _JPilot"
 msgstr "/_Bestand/Nieuwe _JPilot"
 
-#: src/addressbook.c:343
+#: src/addressbook.c:345
 msgid "/_File/New _Server"
 msgstr "/_Bestand/Nieuwe _Server"
 
-#: src/addressbook.c:345 src/addressbook.c:348 src/compose.c:520
-#: src/compose.c:525 src/compose.c:528 src/compose.c:531 src/mainwindow.c:495
-#: src/mainwindow.c:498 src/mainwindow.c:500 src/mainwindow.c:503
-#: src/mainwindow.c:505 src/messageview.c:141
+#: src/addressbook.c:347 src/addressbook.c:350 src/compose.c:520
+#: src/compose.c:525 src/compose.c:528 src/compose.c:531 src/mainwindow.c:498
+#: src/mainwindow.c:501 src/mainwindow.c:503 src/mainwindow.c:506
+#: src/mainwindow.c:508 src/messageview.c:141
 msgid "/_File/---"
 msgstr "/_Bestand/---"
 
-#: src/addressbook.c:346
+#: src/addressbook.c:348
 msgid "/_File/_Edit"
 msgstr "/_Bestand/Aanpassen"
 
-#: src/addressbook.c:347
+#: src/addressbook.c:349
 msgid "/_File/_Delete"
 msgstr "/_Bestand/_Verwijderen"
 
-#: src/addressbook.c:349
+#: src/addressbook.c:351
 msgid "/_File/_Save"
 msgstr "/_Bestand/_Opslaan"
 
-#: src/addressbook.c:350 src/compose.c:532 src/messageview.c:142
+#: src/addressbook.c:352 src/compose.c:532 src/messageview.c:142
 msgid "/_File/_Close"
 msgstr "/_Bestand/_Sluiten"
 
-#: src/addressbook.c:351
+#: src/addressbook.c:353
 msgid "/_Address"
 msgstr "/_Adres"
 
-#: src/addressbook.c:352
+#: src/addressbook.c:354
 msgid "/_Address/New _Address"
 msgstr "/_Adres/Nieuw _adres"
 
-#: src/addressbook.c:353
+#: src/addressbook.c:355
 msgid "/_Address/New _Group"
 msgstr "/_Adres/Nieuwe _groep"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:356
 msgid "/_Address/New _Folder"
 msgstr "/_Adres/Nieuwe _map"
 
-#: src/addressbook.c:355
+#: src/addressbook.c:357
 msgid "/_Address/---"
 msgstr "/_Adres/---"
 
-#: src/addressbook.c:356
+#: src/addressbook.c:358
 msgid "/_Address/_Edit"
 msgstr "/_Adres/_Bewerken"
 
-#: src/addressbook.c:357
+#: src/addressbook.c:359
 msgid "/_Address/_Delete"
 msgstr "/_Adres/_Verwijderen"
 
-#: src/addressbook.c:358 src/compose.c:639 src/mainwindow.c:738
-#: src/messageview.c:259
+#: src/addressbook.c:360 src/compose.c:645 src/mainwindow.c:749
+#: src/messageview.c:264
 msgid "/_Tools"
 msgstr "/_Gereedschap"
 
-#: src/addressbook.c:359
+#: src/addressbook.c:361
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Gereedschap/_LDIF bestand importeren"
 
-#: src/addressbook.c:360 src/compose.c:658 src/mainwindow.c:788
-#: src/messageview.c:277
+#: src/addressbook.c:362 src/compose.c:664 src/mainwindow.c:799
+#: src/messageview.c:282
 msgid "/_Help"
 msgstr "/_Hulp"
 
-#: src/addressbook.c:361 src/compose.c:659 src/mainwindow.c:799
-#: src/messageview.c:278
+#: src/addressbook.c:363 src/compose.c:665 src/mainwindow.c:810
+#: src/messageview.c:283
 msgid "/_Help/_About"
 msgstr "/_Hulp/_Info"
 
-#: src/addressbook.c:380 src/addressbook.c:390
+#: src/addressbook.c:382 src/addressbook.c:392
 msgid "/New _Address"
 msgstr "/Nieuw _adres"
 
-#: src/addressbook.c:381 src/addressbook.c:391
+#: src/addressbook.c:383 src/addressbook.c:393
 msgid "/New _Group"
 msgstr "/Nieuwe _groep"
 
-#: src/addressbook.c:382 src/addressbook.c:392
+#: src/addressbook.c:384 src/addressbook.c:394
 msgid "/New _Folder"
 msgstr "/Nieuwe _map"
 
-#: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:509
+#: src/addressbook.c:385 src/addressbook.c:395 src/compose.c:509
 #: src/folderview.c:246 src/folderview.c:248 src/folderview.c:253
 #: src/folderview.c:266 src/folderview.c:268 src/folderview.c:270
 #: src/folderview.c:275 src/folderview.c:289 src/folderview.c:291
 #: src/folderview.c:295 src/summaryview.c:414 src/summaryview.c:418
-#: src/summaryview.c:421 src/summaryview.c:431 src/summaryview.c:433
-#: src/summaryview.c:435 src/summaryview.c:447 src/summaryview.c:453
+#: src/summaryview.c:421 src/summaryview.c:433 src/summaryview.c:435
+#: src/summaryview.c:437 src/summaryview.c:449 src/summaryview.c:455
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:534
-#: src/mainwindow.c:509 src/messageview.c:144
+#: src/addressbook.c:386 src/addressbook.c:396 src/compose.c:534
+#: src/mainwindow.c:512 src/messageview.c:144
 msgid "/_Edit"
 msgstr "/Be_werken"
 
-#: src/addressbook.c:385 src/addressbook.c:395 src/summaryview.c:432
+#: src/addressbook.c:387 src/addressbook.c:397 src/summaryview.c:434
 msgid "/_Delete"
 msgstr "/Ver_wijderen"
 
-#: src/addressbook.c:492
+#: src/addressbook.c:494
 msgid "E-Mail address"
 msgstr "E-mail adres"
 
-#: src/addressbook.c:496 src/compose.c:4763 src/prefs_common_dialog.c:2183
+#: src/addressbook.c:498 src/compose.c:4772 src/prefs_common_dialog.c:2183
 msgid "Address book"
 msgstr "Adresboek"
 
-#: src/addressbook.c:596 src/prefs_filter_edit.c:249
+#: src/addressbook.c:600 src/prefs_filter_edit.c:249
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "Naam:"
 
 #. Buttons
-#: src/addressbook.c:628 src/addressbook.c:1680 src/editaddress.c:884
-#: src/editaddress.c:1017 src/mainwindow.c:2391 src/prefs_actions.c:266
+#: src/addressbook.c:632 src/addressbook.c:1684 src/editaddress.c:884
+#: src/editaddress.c:1017 src/mainwindow.c:2402 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
 #: src/prefs_template.c:233
 msgid "Delete"
 msgstr "Verwijderen"
 
-#: src/addressbook.c:631 src/editaddress.c:890 src/editaddress.c:1023
+#: src/addressbook.c:635 src/editaddress.c:890 src/editaddress.c:1023
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:273 src/prefs_display_header.c:328
 #: src/prefs_filter_edit.c:1550
 msgid "Add"
 msgstr "Toevoegen"
 
-#: src/addressbook.c:634
+#: src/addressbook.c:638
 msgid "Lookup"
 msgstr "Zoeken"
 
-#: src/addressbook.c:646 src/headerview.c:55 src/prefs_folder_item.c:339
+#: src/addressbook.c:650 src/headerview.c:55 src/prefs_folder_item.c:339
 #: src/prefs_template.c:176
 msgid "To:"
 msgstr "Aan:"
 
-#: src/addressbook.c:650 src/prefs_folder_item.c:356 src/prefs_template.c:178
+#: src/addressbook.c:654 src/prefs_folder_item.c:356 src/prefs_template.c:178
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:654 src/prefs_folder_item.c:367
+#: src/addressbook.c:658 src/prefs_folder_item.c:367
 msgid "Bcc:"
 msgstr "Bcc:"
 
 #. Confirm deletion
-#: src/addressbook.c:841
+#: src/addressbook.c:845
 msgid "Delete address(es)"
 msgstr "Adres(sen) verwijderen"
 
-#: src/addressbook.c:842
+#: src/addressbook.c:846
 msgid "Really delete the address(es)?"
 msgstr "Wilt u de adressen werkelijk verwijderen?"
 
-#: src/addressbook.c:1671
+#: src/addressbook.c:1675
 #, fuzzy, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1057,38 +1057,38 @@ msgstr ""
 "Als u alleen de map verwijdert, dan zullen de adressen naar de \n"
 "hoger gelegen map verplaatst worden."
 
-#: src/addressbook.c:1674 src/folderview.c:2351
+#: src/addressbook.c:1678 src/folderview.c:2351
 msgid "Delete folder"
 msgstr "Verwijder map"
 
-#: src/addressbook.c:1674
+#: src/addressbook.c:1678
 #, fuzzy
 msgid "_Folder only"
 msgstr "Alleen map"
 
-#: src/addressbook.c:1674
+#: src/addressbook.c:1678
 #, fuzzy
 msgid "Folder and _addresses"
 msgstr "Map en adressen"
 
-#: src/addressbook.c:1679
+#: src/addressbook.c:1683
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Wilt u '%s' werkelijk verwijderen?"
 
-#: src/addressbook.c:2365 src/addressbook.c:2498
+#: src/addressbook.c:2369 src/addressbook.c:2502
 msgid "New user, could not save index file."
 msgstr "Nieuwe gebruiker: Kon indexbestand niet opslaan."
 
-#: src/addressbook.c:2369 src/addressbook.c:2502
+#: src/addressbook.c:2373 src/addressbook.c:2506
 msgid "New user, could not save address book files."
 msgstr "Nieuwe gebruiker: Kon adresboekbestanden niet opslaan."
 
-#: src/addressbook.c:2379 src/addressbook.c:2512
+#: src/addressbook.c:2383 src/addressbook.c:2516
 msgid "Old address book converted successfully."
 msgstr "Oude adresboekgegevens succesvol omgezet."
 
-#: src/addressbook.c:2384
+#: src/addressbook.c:2388
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1096,7 +1096,7 @@ msgstr ""
 "Oude adresboekgegevens omgezet.\n"
 "Kon het nieuwe adresboek indexbestand niet opslaan."
 
-#: src/addressbook.c:2397
+#: src/addressbook.c:2401
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1104,7 +1104,7 @@ msgstr ""
 "Kon adresboekgegevens niet omzetten.\n"
 "Nieuw leeg adresboek is gemaakt."
 
-#: src/addressbook.c:2403
+#: src/addressbook.c:2407
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1112,7 +1112,7 @@ msgstr ""
 "Kon adresboekgegevens niet omzetten.\n"
 "Kon geen nieuwe adresboek bestanden aanmaken."
 
-#: src/addressbook.c:2408
+#: src/addressbook.c:2412
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1120,90 +1120,90 @@ msgstr ""
 "Kon adresboekgegevens niet omzetten.\n"
 "Kon ook geen nieuwe adresboekbestanden aanmaken."
 
-#: src/addressbook.c:2415
+#: src/addressbook.c:2419
 msgid "Addressbook conversion error"
 msgstr "Adresboek omzetprobleem"
 
-#: src/addressbook.c:2419
+#: src/addressbook.c:2423
 msgid "Addressbook conversion"
 msgstr "Adresboek omzetting"
 
-#: src/addressbook.c:2454
+#: src/addressbook.c:2458
 msgid "Addressbook Error"
 msgstr "Adresboekprobleem"
 
-#: src/addressbook.c:2455 src/addressbook.c:2555
+#: src/addressbook.c:2459 src/addressbook.c:2559
 msgid "Could not read address index"
 msgstr "Kon adresboek index niet lezen"
 
-#: src/addressbook.c:2517
+#: src/addressbook.c:2521
 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:2531
+#: src/addressbook.c:2535
 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:2537
+#: src/addressbook.c:2541
 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:2543
+#: src/addressbook.c:2547
 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:2561
+#: src/addressbook.c:2565
 msgid "Addressbook Conversion Error"
 msgstr "Adresboek omzetprobleem"
 
-#: src/addressbook.c:2567
+#: src/addressbook.c:2571
 msgid "Addressbook Conversion"
 msgstr "Adresboek Omzetting"
 
-#: src/addressbook.c:3072 src/prefs_common_dialog.c:2033
+#: src/addressbook.c:3086 src/prefs_common_dialog.c:2033
 msgid "Interface"
 msgstr "Interface"
 
-#: src/addressbook.c:3088 src/importldif.c:514
+#: src/addressbook.c:3102 src/importldif.c:514
 msgid "Address Book"
 msgstr "Adresboek"
 
-#: src/addressbook.c:3104
+#: src/addressbook.c:3118
 msgid "Person"
 msgstr "Persoon"
 
-#: src/addressbook.c:3120
+#: src/addressbook.c:3134
 msgid "EMail Address"
 msgstr "E-mail adres"
 
-#: src/addressbook.c:3136
+#: src/addressbook.c:3150
 msgid "Group"
 msgstr "Groep"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3152 src/folderview.c:367 src/prefs_account_dialog.c:1694
+#: src/addressbook.c:3166 src/folderview.c:367 src/prefs_account_dialog.c:1694
 #: src/query_search.c:370
 msgid "Folder"
 msgstr "Accounts"
 
-#: src/addressbook.c:3168
+#: src/addressbook.c:3182
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3184 src/addressbook.c:3200
+#: src/addressbook.c:3198 src/addressbook.c:3214
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3216
+#: src/addressbook.c:3230
 msgid "LDAP Server"
 msgstr "LDAP Server"
 
@@ -1215,7 +1215,7 @@ msgstr "Algemene adressen"
 msgid "Personal address"
 msgstr "Persoonlijke adressen"
 
-#: src/alertpanel.c:141 src/compose.c:5485 src/main.c:573
+#: src/alertpanel.c:141 src/compose.c:5494 src/main.c:573
 msgid "Notice"
 msgstr "Bericht"
 
@@ -1266,7 +1266,7 @@ msgstr "Bruin"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4593
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4750
 msgid "None"
 msgstr "Geen"
 
@@ -1328,7 +1328,7 @@ msgstr "/B_ewerken/_Ongedaan maken"
 msgid "/_Edit/_Redo"
 msgstr "/B_ewerken/O_pnieuw toepassen"
 
-#: src/compose.c:537 src/compose.c:544 src/mainwindow.c:513
+#: src/compose.c:537 src/compose.c:544 src/mainwindow.c:516
 #: src/messageview.c:147
 msgid "/_Edit/---"
 msgstr "/B_ewerken/---"
@@ -1337,7 +1337,7 @@ msgstr "/B_ewerken/---"
 msgid "/_Edit/Cu_t"
 msgstr "/B_ewerken/Knippen"
 
-#: src/compose.c:539 src/mainwindow.c:510 src/messageview.c:145
+#: src/compose.c:539 src/mainwindow.c:513 src/messageview.c:145
 msgid "/_Edit/_Copy"
 msgstr "/B_ewerken/_Kopiëren"
 
@@ -1349,7 +1349,7 @@ msgstr "/B_ewerken/_Plakken"
 msgid "/_Edit/Paste as _quotation"
 msgstr "/B_ewerken/Plakken als _citaat"
 
-#: src/compose.c:543 src/mainwindow.c:511 src/messageview.c:146
+#: src/compose.c:543 src/mainwindow.c:514 src/messageview.c:146
 msgid "/_Edit/Select _all"
 msgstr "/B_ewerken/_Alles selecteren"
 
@@ -1366,8 +1366,8 @@ msgstr "/B_ewerken/Regelterugloop in hele bericht"
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/B_ewerken/_Kopiëren"
 
-#: src/compose.c:550 src/mainwindow.c:518 src/messageview.c:151
-#: src/summaryview.c:448
+#: src/compose.c:550 src/mainwindow.c:521 src/messageview.c:151
+#: src/summaryview.c:450
 msgid "/_View"
 msgstr "/B_eeld"
 
@@ -1388,9 +1388,9 @@ msgid "/_View/_Reply to"
 msgstr "/B_eeld/Ant_woord naar"
 
 #: src/compose.c:555 src/compose.c:557 src/compose.c:559 src/compose.c:561
-#: src/mainwindow.c:538 src/mainwindow.c:541 src/mainwindow.c:568
-#: src/mainwindow.c:592 src/mainwindow.c:687 src/mainwindow.c:691
-#: src/messageview.c:236
+#: src/mainwindow.c:541 src/mainwindow.c:544 src/mainwindow.c:571
+#: src/mainwindow.c:595 src/mainwindow.c:696 src/mainwindow.c:700
+#: src/messageview.c:241
 msgid "/_View/---"
 msgstr "/B_eeld/---"
 
@@ -1406,7 +1406,7 @@ msgstr "/B_eeld/_Lineaal"
 msgid "/_View/_Attachment"
 msgstr "/B_eeld/_Bijvoeging"
 
-#: src/compose.c:567 src/mainwindow.c:599 src/messageview.c:158
+#: src/compose.c:567 src/mainwindow.c:602 src/messageview.c:158
 #, fuzzy
 msgid "/_View/Character _encoding"
 msgstr "/B_eeld/_Sorteren/Aflopend"
@@ -1416,241 +1416,252 @@ msgid "/_View/Character _encoding/_Automatic"
 msgstr ""
 
 #: src/compose.c:570 src/compose.c:576 src/compose.c:582 src/compose.c:586
-#: src/compose.c:592 src/compose.c:596 src/compose.c:602 src/compose.c:606
-#: src/compose.c:616 src/compose.c:620 src/compose.c:628 src/compose.c:632
-#: src/mainwindow.c:595 src/mainwindow.c:602 src/messageview.c:154
+#: src/compose.c:592 src/compose.c:596 src/compose.c:602 src/compose.c:608
+#: src/compose.c:612 src/compose.c:622 src/compose.c:626 src/compose.c:634
+#: src/compose.c:638 src/mainwindow.c:598 src/mainwindow.c:605
+#: src/messageview.c:154
 #, fuzzy
 msgid "/_View/Character _encoding/---"
 msgstr "/B_eeld/_Sorteren/Aflopend"
 
-#: src/compose.c:572 src/mainwindow.c:603 src/messageview.c:162
+#: src/compose.c:572 src/mainwindow.c:606 src/messageview.c:162
 #, fuzzy
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/B_eeld/Codering/7bit ascii (US-ASC_II)"
 
-#: src/compose.c:574 src/mainwindow.c:605 src/messageview.c:165
+#: src/compose.c:574 src/mainwindow.c:608 src/messageview.c:165
 #, fuzzy
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/B_eeld/Codering/Unicode (_UTF-8)"
 
-#: src/compose.c:578 src/mainwindow.c:609 src/messageview.c:168
+#: src/compose.c:578 src/mainwindow.c:612 src/messageview.c:168
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/B_eeld/Codering/Westeuropees (ISO-8859-_1)"
 
-#: src/compose.c:580 src/mainwindow.c:611 src/messageview.c:170
+#: src/compose.c:580 src/mainwindow.c:614 src/messageview.c:170
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/B_eeld/_Codering/Westeuropees (ISO-8859-_1)"
 
-#: src/compose.c:584 src/mainwindow.c:617 src/messageview.c:175
+#: src/compose.c:584 src/mainwindow.c:620 src/messageview.c:175
 #, fuzzy
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/B_eeld/_Codering/Centraaleuropees (ISO-8859-_2)"
 
-#: src/compose.c:588 src/mainwindow.c:621 src/messageview.c:178
+#: src/compose.c:588 src/mainwindow.c:624 src/messageview.c:178
 #, fuzzy
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/B_eeld/_Codering/Baltisch (ISO-8859-13)"
 
-#: src/compose.c:590 src/mainwindow.c:623 src/messageview.c:180
+#: src/compose.c:590 src/mainwindow.c:626 src/messageview.c:180
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/B_eeld/_Codering/Baltisch (ISO-8859-_4)"
 
-#: src/compose.c:594 src/mainwindow.c:627 src/messageview.c:183
+#: src/compose.c:594 src/mainwindow.c:630 src/messageview.c:183
 #, fuzzy
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/B_eeld/_Codering/Grieks (ISO-8859-_7)"
 
-#: src/compose.c:598 src/mainwindow.c:631 src/messageview.c:186
+#: src/compose.c:598 src/mainwindow.c:634 src/messageview.c:186
+#, fuzzy
+msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
+msgstr "/B_eeld/_Codering/Baltisch (ISO-8859-_4)"
+
+#: src/compose.c:600 src/mainwindow.c:636 src/messageview.c:188
+#, fuzzy
+msgid "/_View/Character _encoding/Arabic (Windows-1256)"
+msgstr "/B_eeld/_Codering/Cyrillisch (Windows-1251)"
+
+#: src/compose.c:604 src/mainwindow.c:640 src/messageview.c:191
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/B_eeld/_Codering/Grieks (ISO-8859-_7)"
 
-#: src/compose.c:600 src/mainwindow.c:633 src/messageview.c:188
+#: src/compose.c:606 src/mainwindow.c:642 src/messageview.c:193
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/B_eeld/_Codering/Cyrillisch (Windows-1251)"
 
-#: src/compose.c:604 src/mainwindow.c:637 src/messageview.c:191
+#: src/compose.c:610 src/mainwindow.c:646 src/messageview.c:196
 #, fuzzy
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/B_eeld/_Codering/Turks (ISO-8859-_9)"
 
-#: src/compose.c:608 src/mainwindow.c:641 src/messageview.c:194
+#: src/compose.c:614 src/mainwindow.c:650 src/messageview.c:199
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/B_eeld/_Codering/Cyrillisch (ISO-8859-_5)"
 
-#: src/compose.c:610 src/mainwindow.c:643 src/messageview.c:196
+#: src/compose.c:616 src/mainwindow.c:652 src/messageview.c:201
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/B_eeld/_Codering/Cyrillisch (KOI8-_R)"
 
-#: src/compose.c:612 src/mainwindow.c:645 src/messageview.c:198
+#: src/compose.c:618 src/mainwindow.c:654 src/messageview.c:203
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/B_eeld/_Codering/Cyrillisch (KOI8-_R)"
 
-#: src/compose.c:614 src/mainwindow.c:647 src/messageview.c:200
+#: src/compose.c:620 src/mainwindow.c:656 src/messageview.c:205
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/B_eeld/_Codering/Cyrillisch (Windows-1251)"
 
-#: src/compose.c:618 src/mainwindow.c:651 src/messageview.c:203
+#: src/compose.c:624 src/mainwindow.c:660 src/messageview.c:208
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/B_eeld/_Codering/Japans (ISO-2022-_JP)"
 
-#: src/compose.c:622 src/mainwindow.c:661 src/messageview.c:212
+#: src/compose.c:628 src/mainwindow.c:670 src/messageview.c:217
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/B_eeld/_Codering/Simpel Chinees (_GB2312)"
 
-#: src/compose.c:624 src/mainwindow.c:663 src/messageview.c:214
+#: src/compose.c:630 src/mainwindow.c:672 src/messageview.c:219
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/B_eeld/_Codering/Simpel Chinees (_GB2312)"
 
-#: src/compose.c:626 src/mainwindow.c:665 src/messageview.c:216
+#: src/compose.c:632 src/mainwindow.c:674 src/messageview.c:221
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/B_eeld/_Codering/Traditioneel Chinees (_Big5)"
 
-#: src/compose.c:630 src/mainwindow.c:673 src/messageview.c:223
+#: src/compose.c:636 src/mainwindow.c:682 src/messageview.c:228
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/B_eeld/_Codering/Koreaans (EUC-_KR)"
 
-#: src/compose.c:634 src/mainwindow.c:679 src/messageview.c:228
+#: src/compose.c:640 src/mainwindow.c:688 src/messageview.c:233
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/B_eeld/_Codering/Thais (TIS-620)"
 
-#: src/compose.c:636 src/mainwindow.c:681 src/messageview.c:230
+#: src/compose.c:642 src/mainwindow.c:690 src/messageview.c:235
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/B_eeld/_Codering/Thais (Windows-874)"
 
-#: src/compose.c:640 src/mainwindow.c:739 src/messageview.c:260
+#: src/compose.c:646 src/mainwindow.c:750 src/messageview.c:265
 msgid "/_Tools/_Address book"
 msgstr "/_Gereedschap/_Adresboek"
 
-#: src/compose.c:641
+#: src/compose.c:647
 msgid "/_Tools/_Template"
 msgstr "/_Gereedschap/_Sjabloon"
 
-#: src/compose.c:642 src/mainwindow.c:762 src/messageview.c:275
+#: src/compose.c:648 src/mainwindow.c:773 src/messageview.c:280
 msgid "/_Tools/Actio_ns"
 msgstr "/_Gereedschap/A_cties"
 
-#: src/compose.c:643 src/compose.c:647 src/compose.c:653 src/mainwindow.c:742
-#: src/mainwindow.c:756 src/mainwindow.c:761 src/mainwindow.c:763
-#: src/mainwindow.c:766 src/mainwindow.c:768 src/messageview.c:263
-#: src/messageview.c:274
+#: src/compose.c:649 src/compose.c:653 src/compose.c:659 src/mainwindow.c:753
+#: src/mainwindow.c:767 src/mainwindow.c:772 src/mainwindow.c:774
+#: src/mainwindow.c:777 src/mainwindow.c:779 src/messageview.c:268
+#: src/messageview.c:279
 msgid "/_Tools/---"
 msgstr "/_Gereedschap/---"
 
-#: src/compose.c:644
+#: src/compose.c:650
 #, fuzzy
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/B_ewerken/Be_werken met externe editor"
 
-#: src/compose.c:648
+#: src/compose.c:654
 #, fuzzy
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Gereedschap/A_cties"
 
-#: src/compose.c:649
+#: src/compose.c:655
 #, fuzzy
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/Be_richt/Codeer"
 
-#: src/compose.c:654
+#: src/compose.c:660
 #, fuzzy
 msgid "/_Tools/_Check spell"
 msgstr "/_Gereedschap/_Uitvoeren"
 
-#: src/compose.c:655
+#: src/compose.c:661
 #, fuzzy
 msgid "/_Tools/_Set spell language"
 msgstr "/_Gereedschap/_Sjabloon"
 
-#: src/compose.c:899
+#: src/compose.c:908
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: bestand bestaat niet\n"
 
-#: src/compose.c:1003 src/compose.c:1074
+#: src/compose.c:1012 src/compose.c:1083
 msgid "Can't get text part\n"
 msgstr "Kan tekstgedeelte niet ophalen\n"
 
-#: src/compose.c:1475
+#: src/compose.c:1484
 msgid "Quote mark format error."
 msgstr "Citeerteken opmaakfout."
 
-#: src/compose.c:1487
+#: src/compose.c:1496
 msgid "Message reply/forward format error."
 msgstr "Bericht beantwoorden/doorsturen opmaakfout."
 
-#: src/compose.c:1907
+#: src/compose.c:1916
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Bestand %s bestaat niet\n"
 
-#: src/compose.c:1911
+#: src/compose.c:1920
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Kan de bestandsgrootte niet bepalen van %s\n"
 
-#: src/compose.c:1915
+#: src/compose.c:1924
 #, c-format
 msgid "File %s is empty."
 msgstr "Bestand %s is leeg"
 
-#: src/compose.c:1919
+#: src/compose.c:1928
 #, c-format
 msgid "Can't read %s."
 msgstr "Kan %s niet inlezen."
 
-#: src/compose.c:1952
+#: src/compose.c:1961
 #, c-format
 msgid "Message: %s"
 msgstr "Bericht: %s"
 
-#: src/compose.c:2012 src/mimeview.c:565
+#: src/compose.c:2021 src/mimeview.c:565
 msgid "Can't get the part of multipart message."
 msgstr "Ik kan het deel van een meerdelig bericht niet ophalen."
 
-#: src/compose.c:2496 src/headerview.c:195 src/query_search.c:636
-#: src/summaryview.c:2107
+#: src/compose.c:2505 src/headerview.c:195 src/query_search.c:636
+#: src/summaryview.c:2124
 msgid "(No Subject)"
 msgstr "(Geen onderwerp)"
 
-#: src/compose.c:2499
+#: src/compose.c:2508
 #, fuzzy, c-format
 msgid "%s - Compose%s"
 msgstr "%s - bericht opstellen%s"
 
-#: src/compose.c:2612
+#: src/compose.c:2621
 msgid "Recipient is not specified."
 msgstr "Ontvanger is niet gespecificeerd."
 
-#: src/compose.c:2620
+#: src/compose.c:2629
 #, fuzzy
 msgid "Empty subject"
 msgstr "Onderwerp"
 
-#: src/compose.c:2621
+#: src/compose.c:2630
 msgid "Subject is empty. Send it anyway?"
 msgstr "U heeft geen onderwerp ingevuld. Toch versturen?"
 
-#: src/compose.c:2680
+#: src/compose.c:2689
 msgid "can't get recipient list."
 msgstr "Kan geen ontvangerlijst opvragen."
 
-#: src/compose.c:2700
+#: src/compose.c:2709
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1658,21 +1669,21 @@ msgstr ""
 "Account voor het verzenden van email is niet gespecificeerd.\n"
 "Selecteer een account voordat u verzend."
 
-#: src/compose.c:2714 src/send_message.c:299
+#: src/compose.c:2723 src/send_message.c:299
 #, 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:2756
+#: src/compose.c:2765
 msgid "Can't save the message to outbox."
 msgstr "Het bericht kan niet opgeslagen worden in de outbox."
 
-#: src/compose.c:2794
+#: src/compose.c:2803
 #, 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:2891
+#: src/compose.c:2900
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1683,12 +1694,12 @@ msgstr ""
 "%s naar %s.\n"
 "Toch versturen?"
 
-#: src/compose.c:2897
+#: src/compose.c:2906
 #, fuzzy
 msgid "Code conversion error"
 msgstr "Adresboek omzetprobleem"
 
-#: src/compose.c:2970
+#: src/compose.c:2979
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1697,159 +1708,159 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:2974
+#: src/compose.c:2983
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3264
+#: src/compose.c:3273
 msgid "can't remove the old message\n"
 msgstr "kan het oude bericht niet verwijderen\n"
 
-#: src/compose.c:3282
+#: src/compose.c:3291
 msgid "queueing message...\n"
 msgstr "bericht wordt in de wachtrij geplaatst...\n"
 
-#: src/compose.c:3364
+#: src/compose.c:3373
 msgid "can't find queue folder\n"
 msgstr "kan de Wachtrij-map niet vinden\n"
 
-#: src/compose.c:3371
+#: src/compose.c:3380
 msgid "can't queue the message\n"
 msgstr "kan het bericht niet in de wachtrij plaatsen\n"
 
-#: src/compose.c:3964
+#: src/compose.c:3973
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "gegenereerd bericht-ID: %s\n"
 
-#: src/compose.c:4077
+#: src/compose.c:4086
 msgid "Creating compose window...\n"
 msgstr "Venster \"Bericht opstellen\" wordt aangemaakt...\n"
 
-#: src/compose.c:4128 src/headerview.c:54
+#: src/compose.c:4137 src/headerview.c:54
 msgid "From:"
 msgstr "Afzender:"
 
-#: src/compose.c:4202
+#: src/compose.c:4211
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/_Gereedschap/A_cties"
 
-#: src/compose.c:4205
+#: src/compose.c:4214
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/Be_richt/Codeer"
 
-#: src/compose.c:4243 src/compose.c:5317
+#: src/compose.c:4252 src/compose.c:5326
 msgid "MIME type"
 msgstr "MIME type"
 
 #. S_COL_DATE
-#: src/compose.c:4252 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4740
+#: src/compose.c:4261 src/mimeview.c:197 src/prefs_filter_edit.c:496
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4897
 msgid "Size"
 msgstr "Grootte"
 
-#: src/compose.c:4683 src/mainwindow.c:2324 src/prefs_account_dialog.c:528
+#: src/compose.c:4692 src/mainwindow.c:2335 src/prefs_account_dialog.c:528
 #: src/prefs_common_dialog.c:661
 msgid "Send"
 msgstr "Verzenden"
 
-#: src/compose.c:4684
+#: src/compose.c:4693
 msgid "Send message"
 msgstr "Verzend bericht"
 
-#: src/compose.c:4692
+#: src/compose.c:4701
 msgid "Send later"
 msgstr "Wachtrij"
 
-#: src/compose.c:4693
+#: src/compose.c:4702
 msgid "Put into queue folder and send later"
 msgstr "In de wachtrij plaatsen en later verzenden"
 
-#: src/compose.c:4701
+#: src/compose.c:4710
 msgid "Draft"
 msgstr "Klad"
 
-#: src/compose.c:4702
+#: src/compose.c:4711
 msgid "Save to draft folder"
 msgstr "Opslaan als klad"
 
-#: src/compose.c:4712
+#: src/compose.c:4721
 msgid "Insert"
 msgstr "Invoegen"
 
-#: src/compose.c:4713
+#: src/compose.c:4722
 msgid "Insert file"
 msgstr "Bestand invoegen"
 
-#: src/compose.c:4721
+#: src/compose.c:4730
 msgid "Attach"
 msgstr "Bijvoegen"
 
-#: src/compose.c:4722
+#: src/compose.c:4731
 msgid "Attach file"
 msgstr "Bestand bijvoegen"
 
 #. signature
-#: src/compose.c:4732 src/prefs_account_dialog.c:1208
+#: src/compose.c:4741 src/prefs_account_dialog.c:1208
 #: src/prefs_common_dialog.c:953
 msgid "Signature"
 msgstr "Tekenen"
 
-#: src/compose.c:4733
+#: src/compose.c:4742
 #, fuzzy
 msgid "Append signature"
 msgstr "FOUTIEVE handtekening"
 
 #. editor
-#: src/compose.c:4742 src/prefs_common_dialog.c:991
+#: src/compose.c:4751 src/prefs_common_dialog.c:991
 #: src/prefs_common_dialog.c:2315
 msgid "Editor"
 msgstr "Editor"
 
-#: src/compose.c:4743
+#: src/compose.c:4752
 msgid "Edit with external editor"
 msgstr "Bewerken met ander (extern) programma"
 
-#: src/compose.c:4751
+#: src/compose.c:4760
 msgid "Linewrap"
 msgstr "Terugloop"
 
-#: src/compose.c:4752
+#: src/compose.c:4761
 msgid "Wrap all long lines"
 msgstr "Lange regels op meerdere regels zetten"
 
-#: src/compose.c:5213
+#: src/compose.c:5222
 msgid "Invalid MIME type."
 msgstr "Ongeldig MIME type."
 
-#: src/compose.c:5231
+#: src/compose.c:5240
 msgid "File doesn't exist or is empty."
 msgstr "Bestand bestaat niet of is leeg."
 
-#: src/compose.c:5299
+#: src/compose.c:5308
 msgid "Properties"
 msgstr "Eigenschappen"
 
-#: src/compose.c:5319 src/prefs_common_dialog.c:1444
+#: src/compose.c:5328 src/prefs_common_dialog.c:1444
 msgid "Encoding"
 msgstr "Codering"
 
-#: src/compose.c:5342 src/prefs_folder_item.c:202
+#: src/compose.c:5351 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Pad"
 
-#: src/compose.c:5343
+#: src/compose.c:5352
 msgid "File name"
 msgstr "Bestandsnaam"
 
-#: src/compose.c:5436
+#: src/compose.c:5445
 #, 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:5482
+#: src/compose.c:5491
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1859,48 +1870,48 @@ msgstr ""
 "Zal ik het programma afbreken?\n"
 "procesgroep id: %d"
 
-#: src/compose.c:5857 src/compose.c:5862 src/compose.c:5868
+#: src/compose.c:5866 src/compose.c:5871 src/compose.c:5877
 msgid "Can't queue the message."
 msgstr "Kan bericht niet in de wachtrij plaatsen."
 
-#: src/compose.c:5959
+#: src/compose.c:5968
 #, fuzzy
 msgid "Select files"
 msgstr "Selecteer bestand"
 
-#: src/compose.c:5982
+#: src/compose.c:5991
 msgid "Select file"
 msgstr "Selecteer bestand"
 
-#: src/compose.c:6017
+#: src/compose.c:6026
 #, fuzzy
 msgid "Save message"
 msgstr "Verzend bericht"
 
-#: src/compose.c:6018
+#: src/compose.c:6027
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Dit bericht is aangepast. weggooien?"
 
-#: src/compose.c:6020
+#: src/compose.c:6029
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:6062
+#: src/compose.c:6071
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Wilt u het sjabloon '%s' toepassen?"
 
-#: src/compose.c:6064
+#: src/compose.c:6073
 msgid "Apply template"
 msgstr "Sjabloon toepassen"
 
-#: src/compose.c:6065
+#: src/compose.c:6074
 #, fuzzy
 msgid "_Replace"
 msgstr "Vervangen"
 
-#: src/compose.c:6065
+#: src/compose.c:6074
 #, fuzzy
 msgid "_Insert"
 msgstr "Invoegen"
@@ -2343,7 +2354,7 @@ msgstr "Nieuw"
 
 #. S_COL_MARK
 #: src/folderview.c:412 src/prefs_filter_edit.c:500
-#: src/prefs_summary_column.c:71 src/summaryview.c:509
+#: src/prefs_summary_column.c:71 src/summaryview.c:511
 msgid "Unread"
 msgstr "Ongelezen"
 
@@ -2359,12 +2370,12 @@ msgstr "Mapinfo wordt ingesteld...\n"
 msgid "Setting folder info..."
 msgstr "Mapinfo wordt ingesteld..."
 
-#: src/folderview.c:858 src/mainwindow.c:3464 src/setup.c:80
+#: src/folderview.c:858 src/mainwindow.c:3481 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Bezig met inlezen van map %s%c%s ..."
 
-#: src/folderview.c:862 src/mainwindow.c:3469 src/setup.c:85
+#: src/folderview.c:862 src/mainwindow.c:3486 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Bezig met inlezen van map %s ..."
@@ -2390,7 +2401,7 @@ msgstr "Accountlijst wordt ververst..."
 msgid "Checking for new messages in all folders..."
 msgstr "Bezig met controleren op nieuwe berichten in alle mappen..."
 
-#: src/folderview.c:1200 src/mainwindow.c:2400 src/prefs_common_dialog.c:1789
+#: src/folderview.c:1200 src/mainwindow.c:2411 src/prefs_common_dialog.c:1789
 msgid "Junk"
 msgstr ""
 
@@ -2529,7 +2540,7 @@ msgstr "Onderwerp:"
 msgid "Creating header view...\n"
 msgstr "Header view wordt aangemaakt...\n"
 
-#: src/headerview.c:180 src/query_search.c:637 src/summaryview.c:2110
+#: src/headerview.c:180 src/query_search.c:637 src/summaryview.c:2127
 msgid "(No From)"
 msgstr "(Geen afzender)"
 
@@ -2639,7 +2650,7 @@ msgstr "Importeer LDIF bestand in het adresboek"
 msgid "Prev"
 msgstr "Vorig"
 
-#: src/importldif.c:768 src/mainwindow.c:2420
+#: src/importldif.c:768 src/mainwindow.c:2431
 msgid "Next"
 msgstr "Volgende"
 
@@ -2981,677 +2992,682 @@ msgstr ""
 msgid "another Sylpheed is already running.\n"
 msgstr "er draait al een Sylpheed.\n"
 
-#: src/main.c:1064
+#: src/main.c:1083
 #, fuzzy
 msgid "Migration of configuration"
 msgstr "Bezig met wegschrijven van configuratie van acties...\n"
 
-#: src/main.c:1065
+#: src/main.c:1084
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
 msgstr ""
 
-#: src/mainwindow.c:478
+#: src/mainwindow.c:481
 msgid "/_File/_Folder"
 msgstr "/_Bestand/_Map"
 
-#: src/mainwindow.c:479
+#: src/mainwindow.c:482
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/_Bestand/_Map/Nieuwe map aanmaken..."
 
-#: src/mainwindow.c:481
+#: src/mainwindow.c:484
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/_Bestand/_Map/Map _hernoemen..."
 
-#: src/mainwindow.c:482
+#: src/mainwindow.c:485
 #, fuzzy
 msgid "/_File/_Folder/_Move folder..."
 msgstr "/_Bestand/_Map/Map _hernoemen..."
 
-#: src/mainwindow.c:483
+#: src/mainwindow.c:486
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/_Bestand/_Map/Map ver_wijderen"
 
-#: src/mainwindow.c:484
+#: src/mainwindow.c:487
 #, fuzzy
 msgid "/_File/_Mailbox"
 msgstr "/_Bestand/Mailbox toevoegen..."
 
-#: src/mainwindow.c:485
+#: src/mainwindow.c:488
 #, fuzzy
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/_Bestand/Mailbox toevoegen..."
 
-#: src/mainwindow.c:486
+#: src/mainwindow.c:489
 #, fuzzy
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/_Mailbox verwijderen"
 
-#: src/mainwindow.c:487 src/mainwindow.c:492
+#: src/mainwindow.c:490 src/mainwindow.c:495
 #, fuzzy
 msgid "/_File/_Mailbox/---"
 msgstr "/_Bestand/_Map"
 
-#: src/mainwindow.c:488
+#: src/mainwindow.c:491
 #, fuzzy
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "/Nieuwe e-mail _ophalen"
 
-#: src/mainwindow.c:490
+#: src/mainwindow.c:493
 #, fuzzy
 msgid "/_File/_Mailbox/Check for new messages in _all mailboxes"
 msgstr "/_Bestand/Nieuwe e-mail _ophalen"
 
-#: src/mainwindow.c:493
+#: src/mainwindow.c:496
 #, fuzzy
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "/Accountlijst _verversen"
 
-#: src/mainwindow.c:496
+#: src/mainwindow.c:499
 msgid "/_File/_Import mbox file..."
 msgstr "/_Bestand/Mbox bestand importeren..."
 
-#: src/mainwindow.c:497
+#: src/mainwindow.c:500
 msgid "/_File/_Export to mbox file..."
 msgstr "/_Bestand/Mbox bestand _exporteren..."
 
-#: src/mainwindow.c:499
+#: src/mainwindow.c:502
 #, fuzzy
 msgid "/_File/Empty all _trash"
 msgstr "/_Bestand/Prullenbak _leegmaken"
 
-#: src/mainwindow.c:501 src/messageview.c:139
+#: src/mainwindow.c:504 src/messageview.c:139
 msgid "/_File/_Save as..."
 msgstr "/_Bestand/Opslaan _als..."
 
-#: src/mainwindow.c:502 src/messageview.c:140
+#: src/mainwindow.c:505 src/messageview.c:140
 msgid "/_File/_Print..."
 msgstr "/_Bestand/Af_drukken..."
 
-#: src/mainwindow.c:504
+#: src/mainwindow.c:507
 #, fuzzy
 msgid "/_File/_Work offline"
 msgstr "/_Bestand/Bijlage _invoegen"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:507
+#: src/mainwindow.c:510
 msgid "/_File/E_xit"
 msgstr "/_Bestand/A_fsluiten"
 
-#: src/mainwindow.c:512
+#: src/mainwindow.c:515
 msgid "/_Edit/Select _thread"
 msgstr "/B_ewerken/_Discussie selecteren"
 
-#: src/mainwindow.c:514 src/messageview.c:148
+#: src/mainwindow.c:517 src/messageview.c:148
 msgid "/_Edit/_Find in current message..."
 msgstr "/Be_werken/_Huidig bericht doorzoeken..."
 
-#: src/mainwindow.c:516
+#: src/mainwindow.c:519
 msgid "/_Edit/_Search messages..."
 msgstr "/Be_werken/Berichten door_zoeken..."
 
-#: src/mainwindow.c:519
+#: src/mainwindow.c:522
 msgid "/_View/Show or hi_de"
 msgstr "/B_eeld/_Tonen of Verbergen"
 
-#: src/mainwindow.c:520
+#: src/mainwindow.c:523
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/B_eeld/_Tonen of Verbergen/_Accountlijst"
 
-#: src/mainwindow.c:522
+#: src/mainwindow.c:525
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/B_eeld/_Tonen of Verbergen/_Bericht"
 
-#: src/mainwindow.c:524
+#: src/mainwindow.c:527
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/B_eeld/_Tonen of Verbergen/_Werkbalk"
 
-#: src/mainwindow.c:526
+#: src/mainwindow.c:529
 msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/B_eeld/_Tonen of Verbergen/_Werkbalk/Afbeelding _en tekst"
 
-#: src/mainwindow.c:528
+#: src/mainwindow.c:531
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/B_eeld/_Tonen of Verbergen/_Werkbalk/_Afbeelding"
 
-#: src/mainwindow.c:530
+#: src/mainwindow.c:533
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/B_eeld/_Tonen of Verbergen/_Werkbalk/_Tekst"
 
-#: src/mainwindow.c:532
+#: src/mainwindow.c:535
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/B_eeld/_Tonen of Verbergen/_Werkbalk/_Niet weergeven"
 
-#: src/mainwindow.c:534
+#: src/mainwindow.c:537
 #, fuzzy
 msgid "/_View/Show or hi_de/_Search bar"
 msgstr "/B_eeld/_Tonen of Verbergen/Status_balk"
 
-#: src/mainwindow.c:536
+#: src/mainwindow.c:539
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/B_eeld/_Tonen of Verbergen/Status_balk"
 
-#: src/mainwindow.c:539
+#: src/mainwindow.c:542
 msgid "/_View/Separate f_older tree"
 msgstr "/B_eeld/Acc_ountlijst los"
 
-#: src/mainwindow.c:540
+#: src/mainwindow.c:543
 #, fuzzy
 msgid "/_View/Separate _message view"
 msgstr "/B_eeld/_Bericht los"
 
-#: src/mainwindow.c:542
+#: src/mainwindow.c:545
 msgid "/_View/_Sort"
 msgstr "/B_eeld/_Sorteren"
 
-#: src/mainwindow.c:543
+#: src/mainwindow.c:546
 msgid "/_View/_Sort/by _number"
 msgstr "/B_eeld/_Sorteren/Op _nummer"
 
-#: src/mainwindow.c:544
+#: src/mainwindow.c:547
 msgid "/_View/_Sort/by s_ize"
 msgstr "/B_eeld/_Sorteren/Op _grootte"
 
-#: src/mainwindow.c:545
+#: src/mainwindow.c:548
 msgid "/_View/_Sort/by _date"
 msgstr "/B_eeld/_Sorteren/Op _datum"
 
-#: src/mainwindow.c:546
+#: src/mainwindow.c:549
 #, fuzzy
 msgid "/_View/_Sort/by t_hread date"
 msgstr "/B_eeld/_Sorteren/Op _datum"
 
-#: src/mainwindow.c:547
+#: src/mainwindow.c:550
 msgid "/_View/_Sort/by _from"
 msgstr "/B_eeld/_Sorteren/Op _afzender"
 
-#: src/mainwindow.c:548
+#: src/mainwindow.c:551
 msgid "/_View/_Sort/by _recipient"
 msgstr "/B_eeld/_Sorteren/Op _ontvanger"
 
-#: src/mainwindow.c:549
+#: src/mainwindow.c:552
 msgid "/_View/_Sort/by _subject"
 msgstr "/B_eeld/_Sorteren/Op _onderwerp"
 
-#: src/mainwindow.c:550
+#: src/mainwindow.c:553
 msgid "/_View/_Sort/by _color label"
 msgstr "/B_eeld/_Sorteren/Op _kleurlabel"
 
-#: src/mainwindow.c:552
+#: src/mainwindow.c:555
 msgid "/_View/_Sort/by _mark"
 msgstr "/B_eeld/_Sorteren/Op _markering"
 
-#: src/mainwindow.c:553
+#: src/mainwindow.c:556
 msgid "/_View/_Sort/by _unread"
 msgstr "/B_eeld/_Sorteren/Op on_gelezen"
 
-#: src/mainwindow.c:554
+#: src/mainwindow.c:557
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/B_eeld/_Sorteren/Op _bijvoeging"
 
-#: src/mainwindow.c:556
+#: src/mainwindow.c:559
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/B_eeld/_Sorteren/_Ongesorteerd"
 
-#: src/mainwindow.c:557 src/mainwindow.c:560
+#: src/mainwindow.c:560 src/mainwindow.c:563
 msgid "/_View/_Sort/---"
 msgstr "/B_eeld/_Sorteren/---"
 
-#: src/mainwindow.c:558
+#: src/mainwindow.c:561
 msgid "/_View/_Sort/Ascending"
 msgstr "/B_eeld/_Sorteren/Oplopend"
 
-#: src/mainwindow.c:559
+#: src/mainwindow.c:562
 msgid "/_View/_Sort/Descending"
 msgstr "/B_eeld/_Sorteren/Aflopend"
 
-#: src/mainwindow.c:561
+#: src/mainwindow.c:564
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/B_eeld/_Sorteren/Aantrekken op onderwerp"
 
-#: src/mainwindow.c:563
+#: src/mainwindow.c:566
 msgid "/_View/Th_read view"
 msgstr "/B_eeld/Ge_nest"
 
-#: src/mainwindow.c:564
+#: src/mainwindow.c:567
 msgid "/_View/E_xpand all threads"
 msgstr "/B_eeld/Discussies _uitklappen"
 
-#: src/mainwindow.c:565
+#: src/mainwindow.c:568
 msgid "/_View/Co_llapse all threads"
 msgstr "/B_eeld/Discussies _inklappen"
 
-#: src/mainwindow.c:566
+#: src/mainwindow.c:569
 msgid "/_View/Set display _item..."
 msgstr "/B_eeld/Beeld_item instellen..."
 
-#: src/mainwindow.c:569
+#: src/mainwindow.c:572
 msgid "/_View/_Go to"
 msgstr "/B_eeld/_Ga naar"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:573
 msgid "/_View/_Go to/_Prev message"
 msgstr "/B_eeld/_Ga naar/_Vorige bericht"
 
-#: src/mainwindow.c:571
+#: src/mainwindow.c:574
 msgid "/_View/_Go to/_Next message"
 msgstr "/B_eeld/_Ga naar/Vo_lgende bericht"
 
-#: src/mainwindow.c:572 src/mainwindow.c:577 src/mainwindow.c:580
-#: src/mainwindow.c:585 src/mainwindow.c:590
+#: src/mainwindow.c:575 src/mainwindow.c:580 src/mainwindow.c:583
+#: src/mainwindow.c:588 src/mainwindow.c:593
 msgid "/_View/_Go to/---"
 msgstr "/B_eeld/_Ga naar/---"
 
-#: src/mainwindow.c:573
+#: src/mainwindow.c:576
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/B_eeld/_Ga naar/Vo_rige ongelezen bericht"
 
-#: src/mainwindow.c:575
+#: src/mainwindow.c:578
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/B_eeld/_Ga naar/Volgende on_gelezen bericht"
 
-#: src/mainwindow.c:578
+#: src/mainwindow.c:581
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/B_eeld/_Ga naar/_Vorige nieuwe bericht"
 
-#: src/mainwindow.c:579
+#: src/mainwindow.c:582
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/B_eeld/_Ga naar/Vo_lgende nieuwe bericht"
 
-#: src/mainwindow.c:581
+#: src/mainwindow.c:584
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/B_eeld/_Ga naar/Vorige ge_markeerd bericht"
 
-#: src/mainwindow.c:583
+#: src/mainwindow.c:586
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/B_eeld/_Ga naar/Volgende gem_arkeerd bericht"
 
-#: src/mainwindow.c:586
+#: src/mainwindow.c:589
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/B_eeld/_Ga naar/Vorige gela_beld bericht"
 
-#: src/mainwindow.c:588
+#: src/mainwindow.c:591
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/B_eeld/_Ga naar/Volgende gelab_eld bericht"
 
-#: src/mainwindow.c:591
+#: src/mainwindow.c:594
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/B_eeld/_Ga naar/Andere _map..."
 
-#: src/mainwindow.c:600 src/messageview.c:159
+#: src/mainwindow.c:603 src/messageview.c:159
 #, fuzzy
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/B_eeld/Codering/Automatisch"
 
-#: src/mainwindow.c:613 src/messageview.c:172
+#: src/mainwindow.c:616 src/messageview.c:172
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr "/B_eeld/_Codering/Westeuropees (ISO-8859-_1)"
 
-#: src/mainwindow.c:653 src/messageview.c:205
+#: src/mainwindow.c:662 src/messageview.c:210
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/B_eeld/_Codering/Japans (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:655 src/messageview.c:207
+#: src/mainwindow.c:664 src/messageview.c:212
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/B_eeld/_Codering/Japans (_EUC-JP)"
 
-#: src/mainwindow.c:657 src/messageview.c:209
+#: src/mainwindow.c:666 src/messageview.c:214
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/B_eeld/_Codering/Japans (_Shift__JIS)"
 
-#: src/mainwindow.c:667 src/messageview.c:218
+#: src/mainwindow.c:676 src/messageview.c:223
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/B_eeld/_Codering/Traditioneel Chinees (EUC-_TW)"
 
-#: src/mainwindow.c:669 src/messageview.c:220
+#: src/mainwindow.c:678 src/messageview.c:225
 #, fuzzy
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/B_eeld/_Codering/Chinees (ISO-2022-_CN)"
 
-#: src/mainwindow.c:675 src/messageview.c:225
+#: src/mainwindow.c:684 src/messageview.c:230
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/B_eeld/_Codering/Koreaans (ISO-2022-KR)"
 
-#: src/mainwindow.c:688 src/summaryview.c:449
+#: src/mainwindow.c:697 src/summaryview.c:451
 msgid "/_View/Open in new _window"
 msgstr "/B_eeld/Open in _nieuw venster"
 
-#: src/mainwindow.c:689 src/messageview.c:237
+#: src/mainwindow.c:698 src/messageview.c:242
 msgid "/_View/Mess_age source"
 msgstr "/B_eeld/Bekijk _broncode"
 
-#: src/mainwindow.c:690 src/messageview.c:238
+#: src/mainwindow.c:699 src/messageview.c:243
 msgid "/_View/Show all _header"
 msgstr "/B_eeld/Vo_lledige header"
 
-#: src/mainwindow.c:692
+#: src/mainwindow.c:701
 msgid "/_View/_Update summary"
 msgstr "/B_eeld/_Verversen"
 
-#: src/mainwindow.c:694 src/messageview.c:240
+#: src/mainwindow.c:703 src/messageview.c:245
 msgid "/_Message"
 msgstr "/Be_richt"
 
-#: src/mainwindow.c:695
+#: src/mainwindow.c:704
 #, fuzzy
 msgid "/_Message/Recei_ve"
 msgstr "/Be_richt/Bewerken"
 
-#: src/mainwindow.c:696
+#: src/mainwindow.c:705
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/Be_richt/_Alle e-mail ophalen"
 
-#: src/mainwindow.c:698
+#: src/mainwindow.c:707
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/Be_richt/_Alle e-mail ophalen"
 
-#: src/mainwindow.c:700
+#: src/mainwindow.c:709
 #, fuzzy
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/Be_richt/Ontvangen af_breken"
 
-#: src/mainwindow.c:702
+#: src/mainwindow.c:711
 #, fuzzy
 msgid "/_Message/Recei_ve/---"
 msgstr "/Be_richt/Bewerken"
 
-#: src/mainwindow.c:703
+#: src/mainwindow.c:712
 msgid "/_Message/_Send queued messages"
 msgstr "/Be_richt/Berichten uit wachtrij verzenden"
 
-#: src/mainwindow.c:704 src/mainwindow.c:706 src/mainwindow.c:713
-#: src/mainwindow.c:718 src/mainwindow.c:721 src/mainwindow.c:730
-#: src/mainwindow.c:732 src/mainwindow.c:735 src/messageview.c:243
-#: src/messageview.c:251 src/messageview.c:256
+#: src/mainwindow.c:713 src/mainwindow.c:715 src/mainwindow.c:722
+#: src/mainwindow.c:727 src/mainwindow.c:730 src/mainwindow.c:741
+#: src/mainwindow.c:743 src/mainwindow.c:746 src/messageview.c:248
+#: src/messageview.c:256 src/messageview.c:261
 msgid "/_Message/---"
 msgstr "/Be_richt/---"
 
-#: src/mainwindow.c:705 src/messageview.c:241
+#: src/mainwindow.c:714 src/messageview.c:246
 msgid "/_Message/Compose _new message"
 msgstr "/Be_richt/_Nieuw bericht opstellen"
 
-#: src/mainwindow.c:707 src/messageview.c:244
+#: src/mainwindow.c:716 src/messageview.c:249
 msgid "/_Message/_Reply"
 msgstr "/Be_richt/_Beantwoorden"
 
-#: src/mainwindow.c:708
+#: src/mainwindow.c:717
 msgid "/_Message/Repl_y to"
 msgstr "/Be_richt/Antwoord _sturen aan"
 
-#: src/mainwindow.c:709 src/messageview.c:245
+#: src/mainwindow.c:718 src/messageview.c:250
 msgid "/_Message/Repl_y to/_all"
 msgstr "/Be_richt/Antwoord _sturen aan/_iedereen"
 
-#: src/mainwindow.c:710 src/messageview.c:247
+#: src/mainwindow.c:719 src/messageview.c:252
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/Be_richt/Antwoord _sturen aan/_afzender"
 
-#: src/mainwindow.c:711 src/messageview.c:249
+#: src/mainwindow.c:720 src/messageview.c:254
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/Be_richt/Antwoord _sturen aan/_mailinglijst"
 
-#: src/mainwindow.c:714 src/messageview.c:252
+#: src/mainwindow.c:723 src/messageview.c:257
 msgid "/_Message/_Forward"
 msgstr "/Be_richt/_Doorsturen"
 
-#: src/mainwindow.c:715 src/messageview.c:253
+#: src/mainwindow.c:724 src/messageview.c:258
 msgid "/_Message/For_ward as attachment"
 msgstr "/Be_richt/Doorsturen als bij_voeging"
 
-#: src/mainwindow.c:717 src/messageview.c:255
+#: src/mainwindow.c:726 src/messageview.c:260
 msgid "/_Message/Redirec_t"
 msgstr "/Be_richt/Om_leiden"
 
-#: src/mainwindow.c:719
+#: src/mainwindow.c:728
 msgid "/_Message/M_ove..."
 msgstr "/Be_richt/_Verplaatsen..."
 
-#: src/mainwindow.c:720
+#: src/mainwindow.c:729
 msgid "/_Message/_Copy..."
 msgstr "/Be_richt/_Kopiëren..."
 
-#: src/mainwindow.c:722
+#: src/mainwindow.c:731
 msgid "/_Message/_Mark"
 msgstr "/Be_richt/_Markeren"
 
-#: src/mainwindow.c:723
+#: src/mainwindow.c:732
 msgid "/_Message/_Mark/_Mark"
 msgstr "/Be_richt/_Markeren/_Markeren"
 
-#: src/mainwindow.c:724
+#: src/mainwindow.c:733
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/Be_richt/_Markeren/_Demarkeren"
 
-#: src/mainwindow.c:725
+#: src/mainwindow.c:734
 msgid "/_Message/_Mark/---"
 msgstr "/Be_richt/_Markeren/---"
 
-#: src/mainwindow.c:726
+#: src/mainwindow.c:735
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/Be_richt/_Markeren/Als _ongelezen"
 
-#: src/mainwindow.c:727
+#: src/mainwindow.c:736
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/Be_richt/_Markeren/Als _gelezen"
 
-#: src/mainwindow.c:729
+#: src/mainwindow.c:738
+#, fuzzy
+msgid "/_Message/_Mark/Mark _thread as read"
+msgstr "/Be_richt/_Markeren/Als _gelezen"
+
+#: src/mainwindow.c:740
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/Be_richt/_Markeren/_Alles gelezen"
 
-#: src/mainwindow.c:731
+#: src/mainwindow.c:742
 msgid "/_Message/_Delete"
 msgstr "/Be_richt/Ver_wijderen"
 
-#: src/mainwindow.c:733
+#: src/mainwindow.c:744
 #, fuzzy
 msgid "/_Message/Set as _junk mail"
 msgstr "/Be_richt/E-mail _ophalen"
 
-#: src/mainwindow.c:734
+#: src/mainwindow.c:745
 #, fuzzy
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/Be_richt/E-mail _ophalen"
 
-#: src/mainwindow.c:736 src/messageview.c:257
+#: src/mainwindow.c:747 src/messageview.c:262
 msgid "/_Message/Re-_edit"
 msgstr "/Be_richt/Bewerken"
 
-#: src/mainwindow.c:740
+#: src/mainwindow.c:751
 #, fuzzy
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/_Gereedschap/Af_zender toevoegen aan adresboek"
 
-#: src/mainwindow.c:743
+#: src/mainwindow.c:754
 #, fuzzy
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/_Gereedschap/Berichten _filteren"
 
-#: src/mainwindow.c:745
+#: src/mainwindow.c:756
 #, fuzzy
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Gereedschap/Berichten _filteren"
 
-#: src/mainwindow.c:747 src/messageview.c:264
+#: src/mainwindow.c:758 src/messageview.c:269
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Gereedschap/Filterregel _aanmaken"
 
-#: src/mainwindow.c:748 src/messageview.c:266
+#: src/mainwindow.c:759 src/messageview.c:271
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Gereedschap/_Creëer Filterregel/_Automatisch"
 
-#: src/mainwindow.c:750 src/messageview.c:268
+#: src/mainwindow.c:761 src/messageview.c:273
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Gereedschap/_Creëer filterregel/voor A_fzender"
 
-#: src/mainwindow.c:752 src/messageview.c:270
+#: src/mainwindow.c:763 src/messageview.c:275
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Gereedschap/_Creëer filterregel/voor _Geadresseerde"
 
-#: src/mainwindow.c:754 src/messageview.c:272
+#: src/mainwindow.c:765 src/messageview.c:277
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Gereedschap/_Creëer filterregel/voor _Onderwerp"
 
-#: src/mainwindow.c:757
+#: src/mainwindow.c:768
 #, fuzzy
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/_Gereedschap/Berichten _filteren"
 
-#: src/mainwindow.c:759
+#: src/mainwindow.c:770
 #, fuzzy
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/_Gereedschap/Berichten _filteren"
 
-#: src/mainwindow.c:764
+#: src/mainwindow.c:775
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/_Gereedschap/Du_bbele berichten verwijderen"
 
-#: src/mainwindow.c:767
+#: src/mainwindow.c:778
 msgid "/_Tools/E_xecute"
 msgstr "/_Gereedschap/_Uitvoeren"
 
-#: src/mainwindow.c:769
+#: src/mainwindow.c:780
 msgid "/_Tools/_Log window"
 msgstr "/_Gereedschap/_Logboek"
 
-#: src/mainwindow.c:771
+#: src/mainwindow.c:782
 msgid "/_Configuration"
 msgstr "/_Instellingen"
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:783
 msgid "/_Configuration/_Common preferences..."
 msgstr "/_Instellingen/Algemene voorkeuren..."
 
-#: src/mainwindow.c:774
+#: src/mainwindow.c:785
 msgid "/_Configuration/_Filter setting..."
 msgstr "/_Instellingen/_Filterbeheer..."
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:787
 msgid "/_Configuration/_Template..."
 msgstr "/_Instellingen/_Sjabloonbeheer..."
 
-#: src/mainwindow.c:777
+#: src/mainwindow.c:788
 msgid "/_Configuration/_Actions..."
 msgstr "/_Instellingen/A_cties..."
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:789
 msgid "/_Configuration/---"
 msgstr "/_Instellingen/---"
 
-#: src/mainwindow.c:779
+#: src/mainwindow.c:790
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Instellingen/Accountvoorkeuren..."
 
-#: src/mainwindow.c:781
+#: src/mainwindow.c:792
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Instellingen/Nieuw account aanmaken..."
 
-#: src/mainwindow.c:783
+#: src/mainwindow.c:794
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Instellingen/Accountbeheer..."
 
-#: src/mainwindow.c:785
+#: src/mainwindow.c:796
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Instellingen/Huidig account veranderen"
 
-#: src/mainwindow.c:789
+#: src/mainwindow.c:800
 msgid "/_Help/_Manual"
 msgstr "/_Hulp/_Handboek"
 
-#: src/mainwindow.c:790
+#: src/mainwindow.c:801
 msgid "/_Help/_Manual/_English"
 msgstr "/_Hulp/_Handboek/_Engels"
 
-#: src/mainwindow.c:791
+#: src/mainwindow.c:802
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/_Hulp/_Handboek/_Japans"
 
-#: src/mainwindow.c:792
+#: src/mainwindow.c:803
 msgid "/_Help/_FAQ"
 msgstr "/_Hulp/_FAQ"
 
-#: src/mainwindow.c:793
+#: src/mainwindow.c:804
 msgid "/_Help/_FAQ/_English"
 msgstr "/_Hulp/_FAQ/_Engels"
 
-#: src/mainwindow.c:794
+#: src/mainwindow.c:805
 msgid "/_Help/_FAQ/_German"
 msgstr "/_Hulp/_FAQ/_Duits"
 
-#: src/mainwindow.c:795
+#: src/mainwindow.c:806
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/_Hulp/_FAQ/_Spaans"
 
-#: src/mainwindow.c:796
+#: src/mainwindow.c:807
 msgid "/_Help/_FAQ/_French"
 msgstr "/_Hulp/_FAQ/_Frans"
 
-#: src/mainwindow.c:797
+#: src/mainwindow.c:808
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/_Hulp/_FAQ/_Italiaans"
 
-#: src/mainwindow.c:798
+#: src/mainwindow.c:809
 msgid "/_Help/---"
 msgstr "/_Hulp/---"
 
-#: src/mainwindow.c:841
+#: src/mainwindow.c:852
 msgid "Creating main window...\n"
 msgstr "Hoofdvenster wordt aangemaakt...\n"
 
-#: src/mainwindow.c:1011
+#: src/mainwindow.c:1022
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "HoofdVenster: kleur %d kon niet gealloceerd worden\n"
 
-#: src/mainwindow.c:1108 src/summaryview.c:2258 src/summaryview.c:2343
-#: src/summaryview.c:3739 src/summaryview.c:3868 src/summaryview.c:4226
+#: src/mainwindow.c:1119 src/summaryview.c:2275 src/summaryview.c:2360
+#: src/summaryview.c:3896 src/summaryview.c:4025 src/summaryview.c:4383
 msgid "done.\n"
 msgstr "klaar.\n"
 
-#: src/mainwindow.c:1235 src/mainwindow.c:1276 src/mainwindow.c:1301
+#: src/mainwindow.c:1246 src/mainwindow.c:1287 src/mainwindow.c:1312
 msgid "Untitled"
 msgstr "Geen titel"
 
-#: src/mainwindow.c:1302
+#: src/mainwindow.c:1313
 msgid "none"
 msgstr "niets"
 
-#: src/mainwindow.c:1355
+#: src/mainwindow.c:1366
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "Vensterscheidingstype wordt gewijzigd van %d naar %d\n"
 
-#: src/mainwindow.c:1605
+#: src/mainwindow.c:1616
 msgid "Offline"
 msgstr ""
 
-#: src/mainwindow.c:1606
+#: src/mainwindow.c:1617
 msgid "You are offline. Go online?"
 msgstr ""
 
-#: src/mainwindow.c:1623
+#: src/mainwindow.c:1634
 #, fuzzy
 msgid "Empty all trash"
 msgstr "Prullenbak leegmaken"
 
-#: src/mainwindow.c:1624
+#: src/mainwindow.c:1635
 #, fuzzy
 msgid "Delete all messages in trash folders?"
 msgstr "Alle berichten uit de prullenbak weggooien?"
 
-#: src/mainwindow.c:1652
+#: src/mainwindow.c:1663
 msgid "Add mailbox"
 msgstr "Mailbox toevoegen"
 
-#: src/mainwindow.c:1653
+#: src/mainwindow.c:1664
 #, fuzzy
 msgid ""
 "Specify the location of mailbox.\n"
@@ -3662,16 +3678,16 @@ msgstr ""
 "Als een bestaande mailbox wordt ingevuld,\n"
 "dan wordt hij automatisch gescand."
 
-#: src/mainwindow.c:1659 src/setup.c:49
+#: src/mainwindow.c:1670 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "De mailbox '%s' bestaat al."
 
-#: src/mainwindow.c:1664 src/setup.c:56
+#: src/mainwindow.c:1675 src/setup.c:56
 msgid "Mailbox"
 msgstr "Mailbox"
 
-#: src/mainwindow.c:1670 src/setup.c:62
+#: src/mainwindow.c:1681 src/setup.c:62
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3681,149 +3697,149 @@ msgstr ""
 "Misschien bestaan er al wat bestanden, of heb je geen toestemming om er te "
 "schrijven."
 
-#: src/mainwindow.c:2088
+#: src/mainwindow.c:2099
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Mappenoverzicht"
 
-#: src/mainwindow.c:2107
+#: src/mainwindow.c:2118
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Berichtenoverzicht"
 
-#: src/mainwindow.c:2259 src/summaryview.c:408
+#: src/mainwindow.c:2270 src/summaryview.c:408
 msgid "/_Reply"
 msgstr "/_Antwoord"
 
-#: src/mainwindow.c:2260
+#: src/mainwindow.c:2271
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "Bericht naar iedereen terugsturen."
 
-#: src/mainwindow.c:2261
+#: src/mainwindow.c:2272
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/Ant_woord sturen aan/_afzender"
 
-#: src/mainwindow.c:2262
+#: src/mainwindow.c:2273
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/Ant_woord sturen aan/_mailinglijst"
 
-#: src/mainwindow.c:2267 src/summaryview.c:415
+#: src/mainwindow.c:2278 src/summaryview.c:415
 msgid "/_Forward"
 msgstr "/D_oorsturen"
 
-#: src/mainwindow.c:2268 src/summaryview.c:416
+#: src/mainwindow.c:2279 src/summaryview.c:416
 msgid "/For_ward as attachment"
 msgstr "/Doorsturen als _bijvoeging"
 
-#: src/mainwindow.c:2269 src/summaryview.c:417
+#: src/mainwindow.c:2280 src/summaryview.c:417
 msgid "/Redirec_t"
 msgstr "/_Omleiden"
 
-#: src/mainwindow.c:2305
+#: src/mainwindow.c:2316
 msgid "Get"
 msgstr "Ophalen"
 
-#: src/mainwindow.c:2306
+#: src/mainwindow.c:2317
 msgid "Incorporate new mail"
 msgstr "E-mail ophalen en in de lijst zetten."
 
-#: src/mainwindow.c:2313
+#: src/mainwindow.c:2324
 msgid "Get all"
 msgstr "Alles oph."
 
-#: src/mainwindow.c:2314
+#: src/mainwindow.c:2325
 msgid "Incorporate new mail of all accounts"
 msgstr "E-mail van alle accounts ophalen en in de lijsten zetten"
 
-#: src/mainwindow.c:2325
+#: src/mainwindow.c:2336
 msgid "Send queued message(s)"
 msgstr "Verzend berichten uit de wachtrij"
 
-#: src/mainwindow.c:2335 src/prefs_account_dialog.c:530
+#: src/mainwindow.c:2346 src/prefs_account_dialog.c:530
 #: src/prefs_common_dialog.c:663 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "Opstellen"
 
-#: src/mainwindow.c:2336
+#: src/mainwindow.c:2347
 msgid "Compose new message"
 msgstr "Nieuw bericht opstellen"
 
-#: src/mainwindow.c:2344 src/prefs_common_dialog.c:975
+#: src/mainwindow.c:2355 src/prefs_common_dialog.c:975
 msgid "Reply"
 msgstr "Antwoord"
 
-#: src/mainwindow.c:2345 src/mainwindow.c:2358
+#: src/mainwindow.c:2356 src/mainwindow.c:2369
 msgid "Reply to the message"
 msgstr "Stuur een bericht terug naar de afzender"
 
-#: src/mainwindow.c:2362
+#: src/mainwindow.c:2373
 msgid "Reply all"
 msgstr "Iedereen"
 
-#: src/mainwindow.c:2363
+#: src/mainwindow.c:2374
 msgid "Reply to all"
 msgstr "Bericht naar iedereen terugsturen."
 
-#: src/mainwindow.c:2371 src/prefs_filter_edit.c:672
+#: src/mainwindow.c:2382 src/prefs_filter_edit.c:672
 msgid "Forward"
 msgstr "Doorsturen"
 
-#: src/mainwindow.c:2372 src/mainwindow.c:2385
+#: src/mainwindow.c:2383 src/mainwindow.c:2396
 msgid "Forward the message"
 msgstr "Stuur dit bericht door"
 
-#: src/mainwindow.c:2392
+#: src/mainwindow.c:2403
 msgid "Delete the message"
 msgstr "Verwijder dit bericht"
 
-#: src/mainwindow.c:2401
+#: src/mainwindow.c:2412
 #, fuzzy
 msgid "Set as junk mail"
 msgstr "Instellen als standaard"
 
-#: src/mainwindow.c:2410
+#: src/mainwindow.c:2421
 msgid "Execute"
 msgstr "Uitvoeren"
 
-#: src/mainwindow.c:2411
+#: src/mainwindow.c:2422
 msgid "Execute marked process"
 msgstr "Voer de gemarkeerde acties uit"
 
-#: src/mainwindow.c:2421
+#: src/mainwindow.c:2432
 msgid "Next unread message"
 msgstr "Volgende ongelezen"
 
-#: src/mainwindow.c:2433
+#: src/mainwindow.c:2444
 msgid "Prefs"
 msgstr "Voork."
 
-#: src/mainwindow.c:2434
+#: src/mainwindow.c:2445
 msgid "Common preferences"
 msgstr "Algemene voorkeuren"
 
-#: src/mainwindow.c:2442 src/prefs_folder_item.c:289
+#: src/mainwindow.c:2453 src/prefs_folder_item.c:289
 #: src/prefs_folder_item.c:300 src/progressdialog.c:128
 msgid "Account"
 msgstr "Account"
 
-#: src/mainwindow.c:2443
+#: src/mainwindow.c:2454
 msgid "Account setting"
 msgstr "Accountinstellingen"
 
-#: src/mainwindow.c:2615
+#: src/mainwindow.c:2626
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 
-#: src/mainwindow.c:2626
+#: src/mainwindow.c:2637
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 
-#: src/mainwindow.c:2892
+#: src/mainwindow.c:2903
 msgid "Exit"
 msgstr "Afsluiten"
 
-#: src/mainwindow.c:2892
+#: src/mainwindow.c:2903
 msgid "Exit this program?"
 msgstr "Sylpheed afsluiten?"
 
@@ -3860,45 +3876,45 @@ msgstr "Einde van het bericht bereikt; verdergaan vanaf het begin?"
 msgid "Search finished"
 msgstr "Zoeken voltooid"
 
-#: src/messageview.c:261
+#: src/messageview.c:266
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/_Gereedschap/Af_zender toevoegen aan adresboek"
 
-#: src/messageview.c:291
+#: src/messageview.c:296
 msgid "Creating message view...\n"
 msgstr "Berichtview wordt gemaakt...\n"
 
-#: src/messageview.c:316
+#: src/messageview.c:321
 msgid "Text"
 msgstr "Tekst"
 
-#: src/messageview.c:321
+#: src/messageview.c:326
 msgid "Attachments"
 msgstr "Bijvoegingen"
 
-#: src/messageview.c:371
+#: src/messageview.c:376
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:669 src/summaryview.c:3268
+#: src/messageview.c:674 src/summaryview.c:3425
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Kan het bestand '%s' niet opslaan."
 
-#: src/messageview.c:728 src/summaryview.c:3291
+#: src/messageview.c:733 src/summaryview.c:3448
 msgid "The message will be printed with the following command:"
 msgstr ""
 
-#: src/messageview.c:729 src/summaryview.c:3292
+#: src/messageview.c:734 src/summaryview.c:3449
 #, fuzzy
 msgid "(Default print command)"
 msgstr "Uitvoeren"
 
-#: src/messageview.c:731 src/prefs_common_dialog.c:2304 src/summaryview.c:3294
+#: src/messageview.c:736 src/prefs_common_dialog.c:2304 src/summaryview.c:3451
 msgid "Print"
 msgstr "Afdrukken"
 
-#: src/messageview.c:740 src/summaryview.c:3303
+#: src/messageview.c:745 src/summaryview.c:3460
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -4804,8 +4820,8 @@ msgstr ""
 msgid "Expand threads"
 msgstr "Discussies uitklappen"
 
-#: src/prefs_common_dialog.c:1413 src/prefs_common_dialog.c:2713
-#: src/prefs_common_dialog.c:2751
+#: src/prefs_common_dialog.c:1413 src/prefs_common_dialog.c:2716
+#: src/prefs_common_dialog.c:2754
 msgid "Date format"
 msgstr "Datumopmaak"
 
@@ -5109,8 +5125,8 @@ msgstr "Externe opdrachten (%s is het bestand / URI)"
 msgid "Web browser"
 msgstr "Webbrowser"
 
-#: src/prefs_common_dialog.c:2288 src/prefs_common_dialog.c:3775
-#: src/prefs_common_dialog.c:3796
+#: src/prefs_common_dialog.c:2288 src/prefs_common_dialog.c:3778
+#: src/prefs_common_dialog.c:3799
 #, fuzzy
 msgid "(Default browser)"
 msgstr "Standaard inbox"
@@ -5186,216 +5202,226 @@ msgstr "Grieks (ISO-8859-7)"
 
 #: src/prefs_common_dialog.c:2495
 #, fuzzy
+msgid "Arabic (ISO-8859-6)"
+msgstr "Baltisch (ISO-8859-4)"
+
+#: src/prefs_common_dialog.c:2496
+#, fuzzy
+msgid "Arabic (Windows-1256)"
+msgstr "Cyrillisch (Windows-1251)"
+
+#: src/prefs_common_dialog.c:2498
+#, fuzzy
 msgid "Hebrew (ISO-8859-8)"
 msgstr "Grieks (ISO-8859-7)"
 
-#: src/prefs_common_dialog.c:2496
+#: src/prefs_common_dialog.c:2499
 #, fuzzy
 msgid "Hebrew (Windows-1255)"
 msgstr "Cyrillisch (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2498
+#: src/prefs_common_dialog.c:2501
 msgid "Turkish (ISO-8859-9)"
 msgstr "Turks (ISO-8859-9)"
 
-#: src/prefs_common_dialog.c:2500
+#: src/prefs_common_dialog.c:2503
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Cyrillisch (ISO-8859-5)"
 
-#: src/prefs_common_dialog.c:2501
+#: src/prefs_common_dialog.c:2504
 msgid "Cyrillic (KOI8-R)"
 msgstr "Cyrillisch (KOI8-R)"
 
-#: src/prefs_common_dialog.c:2502
+#: src/prefs_common_dialog.c:2505
 msgid "Cyrillic (KOI8-U)"
 msgstr "Cyrillisch (KOI8-U)"
 
-#: src/prefs_common_dialog.c:2503
+#: src/prefs_common_dialog.c:2506
 msgid "Cyrillic (Windows-1251)"
 msgstr "Cyrillisch (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2505
+#: src/prefs_common_dialog.c:2508
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Japans (ISO-2022-JP)"
 
-#: src/prefs_common_dialog.c:2507
+#: src/prefs_common_dialog.c:2510
 msgid "Japanese (EUC-JP)"
 msgstr "Japans (EUC-JP)"
 
-#: src/prefs_common_dialog.c:2508
+#: src/prefs_common_dialog.c:2511
 msgid "Japanese (Shift_JIS)"
 msgstr "Japans (Shift_JIS)"
 
-#: src/prefs_common_dialog.c:2511
+#: src/prefs_common_dialog.c:2514
 msgid "Simplified Chinese (GB2312)"
 msgstr "Vereenvoudigd Chinees (GB2312)"
 
-#: src/prefs_common_dialog.c:2512
+#: src/prefs_common_dialog.c:2515
 #, fuzzy
 msgid "Simplified Chinese (GBK)"
 msgstr "Vereenvoudigd Chinees (GB2312)"
 
-#: src/prefs_common_dialog.c:2513
+#: src/prefs_common_dialog.c:2516
 msgid "Traditional Chinese (Big5)"
 msgstr "Traditioneel Chinees (Big5)"
 
-#: src/prefs_common_dialog.c:2515
+#: src/prefs_common_dialog.c:2518
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Traditioneel Chinees (EUC-TW)"
 
-#: src/prefs_common_dialog.c:2516
+#: src/prefs_common_dialog.c:2519
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Chinees (ISO-2022-CN)"
 
-#: src/prefs_common_dialog.c:2519
+#: src/prefs_common_dialog.c:2522
 msgid "Korean (EUC-KR)"
 msgstr "Koreaans (EUC-KR)"
 
-#: src/prefs_common_dialog.c:2521
+#: src/prefs_common_dialog.c:2524
 msgid "Thai (TIS-620)"
 msgstr "Thais (TIS-620)"
 
-#: src/prefs_common_dialog.c:2522
+#: src/prefs_common_dialog.c:2525
 msgid "Thai (Windows-874)"
 msgstr "Thais (Windows-874)"
 
-#: src/prefs_common_dialog.c:2689
+#: src/prefs_common_dialog.c:2692
 msgid "the full abbreviated weekday name"
 msgstr "afgekorte dag van de week"
 
-#: src/prefs_common_dialog.c:2690
+#: src/prefs_common_dialog.c:2693
 msgid "the full weekday name"
 msgstr "volledige dag van de week"
 
-#: src/prefs_common_dialog.c:2691
+#: src/prefs_common_dialog.c:2694
 msgid "the abbreviated month name"
 msgstr "afgekorte naam van de maand"
 
-#: src/prefs_common_dialog.c:2692
+#: src/prefs_common_dialog.c:2695
 msgid "the full month name"
 msgstr "volledig naam van de maand"
 
-#: src/prefs_common_dialog.c:2693
+#: src/prefs_common_dialog.c:2696
 msgid "the preferred date and time for the current locale"
 msgstr "de voorkeurs datum en tijd voor de huidige locale"
 
-#: src/prefs_common_dialog.c:2694
+#: src/prefs_common_dialog.c:2697
 msgid "the century number (year/100)"
 msgstr "eeuwnummer (jaar/100)"
 
-#: src/prefs_common_dialog.c:2695
+#: src/prefs_common_dialog.c:2698
 msgid "the day of the month as a decimal number"
 msgstr "dag van de maand als decimaal nummer"
 
-#: src/prefs_common_dialog.c:2696
+#: src/prefs_common_dialog.c:2699
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "het uur als decimaal nummer op een 24 uurs klok"
 
-#: src/prefs_common_dialog.c:2697
+#: src/prefs_common_dialog.c:2700
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "het uur als decimaal nummer op een 12-uurs klok"
 
-#: src/prefs_common_dialog.c:2698
+#: src/prefs_common_dialog.c:2701
 msgid "the day of the year as a decimal number"
 msgstr "dag van het jaar als decimaal nummer"
 
-#: src/prefs_common_dialog.c:2699
+#: src/prefs_common_dialog.c:2702
 msgid "the month as a decimal number"
 msgstr "de maand als decimaal nummer"
 
-#: src/prefs_common_dialog.c:2700
+#: src/prefs_common_dialog.c:2703
 msgid "the minute as a decimal number"
 msgstr "de minuut als decimaal nummer"
 
-#: src/prefs_common_dialog.c:2701
+#: src/prefs_common_dialog.c:2704
 msgid "either AM or PM"
 msgstr "AM of PM"
 
-#: src/prefs_common_dialog.c:2702
+#: src/prefs_common_dialog.c:2705
 msgid "the second as a decimal number"
 msgstr "de seconde als decimaal nummer"
 
-#: src/prefs_common_dialog.c:2703
+#: src/prefs_common_dialog.c:2706
 msgid "the day of the week as a decimal number"
 msgstr "de dag van de week als decimaal nummer"
 
-#: src/prefs_common_dialog.c:2704
+#: src/prefs_common_dialog.c:2707
 msgid "the preferred date for the current locale"
 msgstr "de voorkeursdatum voor de huidige locale"
 
-#: src/prefs_common_dialog.c:2705
+#: src/prefs_common_dialog.c:2708
 msgid "the last two digits of a year"
 msgstr "de laatste twee cijfers van het jaartal"
 
-#: src/prefs_common_dialog.c:2706
+#: src/prefs_common_dialog.c:2709
 msgid "the year as a decimal number"
 msgstr "het jaartal als decimaal nummer"
 
-#: src/prefs_common_dialog.c:2707
+#: src/prefs_common_dialog.c:2710
 msgid "the time zone or name or abbreviation"
 msgstr "de tijdzone of naam of afkorting"
 
-#: src/prefs_common_dialog.c:2728
+#: src/prefs_common_dialog.c:2731
 msgid "Specifier"
 msgstr "Selecteer"
 
-#: src/prefs_common_dialog.c:2729
+#: src/prefs_common_dialog.c:2732
 msgid "Description"
 msgstr "Beschrijving"
 
-#: src/prefs_common_dialog.c:2769
+#: src/prefs_common_dialog.c:2772
 msgid "Example"
 msgstr "Voorbeeld"
 
-#: src/prefs_common_dialog.c:2850
+#: src/prefs_common_dialog.c:2853
 msgid "Set message colors"
 msgstr "Berichtkleuren instellen"
 
-#: src/prefs_common_dialog.c:2858
+#: src/prefs_common_dialog.c:2861
 msgid "Colors"
 msgstr "Kleuren"
 
-#: src/prefs_common_dialog.c:2892
+#: src/prefs_common_dialog.c:2895
 msgid "Quoted Text - First Level"
 msgstr "Geciteerde tekst - eerste niveau"
 
-#: src/prefs_common_dialog.c:2898
+#: src/prefs_common_dialog.c:2901
 msgid "Quoted Text - Second Level"
 msgstr "Geciteerde tekst - tweede niveau"
 
-#: src/prefs_common_dialog.c:2904
+#: src/prefs_common_dialog.c:2907
 msgid "Quoted Text - Third Level"
 msgstr "Geciteerde tekst - derde niveau"
 
-#: src/prefs_common_dialog.c:2910
+#: src/prefs_common_dialog.c:2913
 msgid "URI link"
 msgstr "URI link"
 
-#: src/prefs_common_dialog.c:2917
+#: src/prefs_common_dialog.c:2920
 msgid "Recycle quote colors"
 msgstr "Gebruikte kleuren opnieuw gebruiken"
 
-#: src/prefs_common_dialog.c:2984
+#: src/prefs_common_dialog.c:2987
 msgid "Pick color for quotation level 1"
 msgstr "Selecteer kleur voor niveau 1"
 
-#: src/prefs_common_dialog.c:2987
+#: src/prefs_common_dialog.c:2990
 msgid "Pick color for quotation level 2"
 msgstr "Selecteer kleur voor niveau 2"
 
-#: src/prefs_common_dialog.c:2990
+#: src/prefs_common_dialog.c:2993
 msgid "Pick color for quotation level 3"
 msgstr "Selecteer kleur voor niveau 3"
 
-#: src/prefs_common_dialog.c:2993
+#: src/prefs_common_dialog.c:2996
 msgid "Pick color for URI"
 msgstr "Selecteer kleur voor URI"
 
-#: src/prefs_common_dialog.c:3133
+#: src/prefs_common_dialog.c:3136
 msgid "Description of symbols"
 msgstr "Beschrijving der symbolen"
 
-#: src/prefs_common_dialog.c:3189
+#: src/prefs_common_dialog.c:3192
 msgid ""
 "Date\n"
 "From\n"
@@ -5419,11 +5445,11 @@ msgstr ""
 "Nieuwsgroepen\n"
 "Bericht-ID"
 
-#: src/prefs_common_dialog.c:3202
+#: src/prefs_common_dialog.c:3205
 msgid "If x is set, displays expr"
 msgstr "Als x ingesteld is, expr weergeven"
 
-#: src/prefs_common_dialog.c:3206
+#: src/prefs_common_dialog.c:3209
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -5437,7 +5463,7 @@ msgstr ""
 "Geciteerde berichtinhoud zonder handtekening\n"
 "Letterlijk %"
 
-#: src/prefs_common_dialog.c:3214
+#: src/prefs_common_dialog.c:3217
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -5449,20 +5475,20 @@ msgstr ""
 "Letterlijk haakje openen\n"
 "Letterlijk haakje sluiten"
 
-#: src/prefs_common_dialog.c:3260
+#: src/prefs_common_dialog.c:3263
 msgid "Key bindings"
 msgstr "Sneltoetsen"
 
-#: src/prefs_common_dialog.c:3273
+#: src/prefs_common_dialog.c:3276
 #, fuzzy
 msgid "Select the preset of key bindings."
 msgstr " Sneltoetsen instellen..."
 
-#: src/prefs_common_dialog.c:3283 src/prefs_common_dialog.c:3607
+#: src/prefs_common_dialog.c:3286 src/prefs_common_dialog.c:3610
 msgid "Default"
 msgstr "Standaard"
 
-#: src/prefs_common_dialog.c:3286 src/prefs_common_dialog.c:3616
+#: src/prefs_common_dialog.c:3289 src/prefs_common_dialog.c:3619
 msgid "Old Sylpheed"
 msgstr "Oude Sylpheed"
 
@@ -5587,7 +5613,7 @@ msgstr ""
 msgid "Age"
 msgstr ""
 
-#: src/prefs_filter_edit.c:501 src/summaryview.c:510
+#: src/prefs_filter_edit.c:501 src/summaryview.c:512
 #, fuzzy
 msgid "Marked"
 msgstr "Gemarkeerd"
@@ -5843,17 +5869,17 @@ msgid "Attachment"
 msgstr "Bijvoeging"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73 src/query_search.c:371 src/summaryview.c:4733
+#: src/prefs_summary_column.c:73 src/query_search.c:371 src/summaryview.c:4890
 msgid "Subject"
 msgstr "Onderwerp"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/query_search.c:372 src/summaryview.c:4736
+#: src/prefs_summary_column.c:74 src/query_search.c:372 src/summaryview.c:4893
 msgid "From"
 msgstr "Afzender"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/query_search.c:373 src/summaryview.c:4738
+#: src/prefs_summary_column.c:75 src/query_search.c:373 src/summaryview.c:4895
 msgid "Date"
 msgstr "Datum"
 
@@ -5956,7 +5982,7 @@ msgstr "Berichten doorzoeken"
 msgid "_Save as search folder"
 msgstr "Opslaan als klad"
 
-#: src/query_search.c:512 src/subscribedialog.c:523 src/summaryview.c:840
+#: src/query_search.c:512 src/subscribedialog.c:523 src/summaryview.c:842
 msgid "Done."
 msgstr "Klaar."
 
@@ -5970,7 +5996,7 @@ msgstr "Bezig met inlezen van map %s ..."
 msgid "Searching %s (%d / %d)..."
 msgstr "Bezig met filteren..."
 
-#: src/query_search.c:645 src/summaryview.c:2048
+#: src/query_search.c:645 src/summaryview.c:2051
 msgid "(No Date)"
 msgstr "(Geen datum)"
 
@@ -6341,306 +6367,311 @@ msgid "/_Mark/Mark as rea_d"
 msgstr "/_Markeren/Als _gelezen"
 
 #: src/summaryview.c:429
+#, fuzzy
+msgid "/_Mark/Mark _thread as read"
+msgstr "/_Markeren/Als _gelezen"
+
+#: src/summaryview.c:431
 msgid "/_Mark/Mark all _read"
 msgstr "/_Markeren/_Alles als gelezen"
 
-#: src/summaryview.c:430
+#: src/summaryview.c:432
 msgid "/Color la_bel"
 msgstr "/Kle_urlabel"
 
-#: src/summaryview.c:434
+#: src/summaryview.c:436
 msgid "/Re-_edit"
 msgstr "/Be_werken"
 
-#: src/summaryview.c:436
+#: src/summaryview.c:438
 #, fuzzy
 msgid "/Add sender to address boo_k..."
 msgstr "/Afz_ender toevoegen aan adresboek"
 
-#: src/summaryview.c:438
+#: src/summaryview.c:440
 msgid "/Create f_ilter rule"
 msgstr "/F_ilterregel aanmaken"
 
-#: src/summaryview.c:439
+#: src/summaryview.c:441
 msgid "/Create f_ilter rule/_Automatically"
 msgstr "/F_ilterregel aanmaken/_Automatisch"
 
-#: src/summaryview.c:441
+#: src/summaryview.c:443
 msgid "/Create f_ilter rule/by _From"
 msgstr "/F_ilterregel aanmaken/op _Afzender"
 
-#: src/summaryview.c:443
+#: src/summaryview.c:445
 msgid "/Create f_ilter rule/by _To"
 msgstr "/F_ilterregel aanmaken/op _Geadresseerde"
 
-#: src/summaryview.c:445
+#: src/summaryview.c:447
 msgid "/Create f_ilter rule/by _Subject"
 msgstr "/F_ilterregel aanmaken/op _Onderwerp"
 
-#: src/summaryview.c:451
+#: src/summaryview.c:453
 msgid "/_View/_Source"
 msgstr "/B_eeld/Bekijk broncode"
 
-#: src/summaryview.c:452
+#: src/summaryview.c:454
 msgid "/_View/All _header"
 msgstr "/B_eeld/Vo_lledige header"
 
-#: src/summaryview.c:454
+#: src/summaryview.c:456
 msgid "/_Print..."
 msgstr "/Afdrukken..."
 
-#: src/summaryview.c:486
+#: src/summaryview.c:488
 msgid "Creating summary view...\n"
 msgstr "Venster Berichtenlijst wordt aangemaakt...\n"
 
-#: src/summaryview.c:508
+#: src/summaryview.c:510
 msgid "All"
 msgstr ""
 
-#: src/summaryview.c:511
+#: src/summaryview.c:513
 #, fuzzy
 msgid "Have color label"
 msgstr "/Kle_urlabel"
 
-#: src/summaryview.c:512
+#: src/summaryview.c:514
 #, fuzzy
 msgid "Have attachment"
 msgstr "Bijvoeging"
 
-#: src/summaryview.c:521
+#: src/summaryview.c:523
 #, fuzzy
 msgid "Search:"
 msgstr "Zoek"
 
-#: src/summaryview.c:535
+#: src/summaryview.c:537
 msgid "Search for Subject or From"
 msgstr ""
 
-#: src/summaryview.c:702
+#: src/summaryview.c:704
 msgid "Process mark"
 msgstr "Verwerk markering"
 
-#: src/summaryview.c:703
+#: src/summaryview.c:705
 msgid "Some marks are left. Process it?"
 msgstr "Sommige markeringen zijn nog aanwezig. Verwerken?"
 
-#: src/summaryview.c:749
+#: src/summaryview.c:751
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "Bezig met inlezen van map (%s)..."
 
-#: src/summaryview.c:1292
+#: src/summaryview.c:1295
 #, fuzzy
 msgid "_Search again"
 msgstr "Opnieuw zoeken"
 
-#: src/summaryview.c:1313 src/summaryview.c:1322
+#: src/summaryview.c:1316 src/summaryview.c:1325
 msgid "No more unread messages"
 msgstr "Geen ongelezen berichten meer"
 
-#: src/summaryview.c:1314
+#: src/summaryview.c:1317
 msgid "No unread message found. Search from the end?"
 msgstr "Geen ongelezen berichten gevonden. Doorgaan naar de volgende map?"
 
-#: src/summaryview.c:1316
+#: src/summaryview.c:1319
 msgid "No unread messages."
 msgstr "Geen ongelezen berichten."
 
-#: src/summaryview.c:1323
+#: src/summaryview.c:1326
 msgid "No unread message found. Go to next folder?"
 msgstr "Geen ongelezen berichten gevonden. Doorgaan naar de volgende map?"
 
-#: src/summaryview.c:1331 src/summaryview.c:1340
+#: src/summaryview.c:1334 src/summaryview.c:1343
 msgid "No more new messages"
 msgstr "Geen nieuwe berichten meer"
 
-#: src/summaryview.c:1332
+#: src/summaryview.c:1335
 msgid "No new message found. Search from the end?"
 msgstr "Geen nieuw bericht gevonden. Zoeken vanaf het einde?"
 
-#: src/summaryview.c:1334
+#: src/summaryview.c:1337
 msgid "No new messages."
 msgstr "Geen nieuwe berichten."
 
-#: src/summaryview.c:1341
+#: src/summaryview.c:1344
 msgid "No new message found. Go to next folder?"
 msgstr "Geen nieuwe berichten gevonden. Doorgaan naar de volgende map?"
 
-#: src/summaryview.c:1349 src/summaryview.c:1358
+#: src/summaryview.c:1352 src/summaryview.c:1361
 msgid "No more marked messages"
 msgstr "Geen gemarkeerde berichten meer"
 
-#: src/summaryview.c:1350
+#: src/summaryview.c:1353
 msgid "No marked message found. Search from the end?"
 msgstr "Geen gemarkeerd bericht gevonden. Zoeken vanaf het einde?"
 
-#: src/summaryview.c:1352 src/summaryview.c:1361
+#: src/summaryview.c:1355 src/summaryview.c:1364
 msgid "No marked messages."
 msgstr "Geen gemarkeerde berichten."
 
-#: src/summaryview.c:1359
+#: src/summaryview.c:1362
 msgid "No marked message found. Search from the beginning?"
 msgstr "Geen gemarkeerd bericht gevonden. Zoeken vanaf het begin?"
 
-#: src/summaryview.c:1367 src/summaryview.c:1376
+#: src/summaryview.c:1370 src/summaryview.c:1379
 msgid "No more labeled messages"
 msgstr "Geen gelabelde berichten meer"
 
-#: src/summaryview.c:1368
+#: src/summaryview.c:1371
 msgid "No labeled message found. Search from the end?"
 msgstr "Geen gelabeld bericht gevonden. Zoeken vanaf het einde?"
 
-#: src/summaryview.c:1370 src/summaryview.c:1379
+#: src/summaryview.c:1373 src/summaryview.c:1382
 msgid "No labeled messages."
 msgstr "Geen gelabelde berichten."
 
-#: src/summaryview.c:1377
+#: src/summaryview.c:1380
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Geen gelablede berichten gevonden. Zoeken vanaf het begin?"
 
-#: src/summaryview.c:1693
+#: src/summaryview.c:1696
 msgid "Attracting messages by subject..."
 msgstr "Berichten worden aangetrokken op onderwerp..."
 
-#: src/summaryview.c:1887
+#: src/summaryview.c:1890
 #, c-format
 msgid "%d deleted"
 msgstr "%d verwijderd"
 
-#: src/summaryview.c:1891
+#: src/summaryview.c:1894
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d verplaatst"
 
-#: src/summaryview.c:1892 src/summaryview.c:1897
+#: src/summaryview.c:1895 src/summaryview.c:1900
 msgid ", "
 msgstr ","
 
-#: src/summaryview.c:1896
+#: src/summaryview.c:1899
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d gekopieerd"
 
-#: src/summaryview.c:1911
+#: src/summaryview.c:1914
 msgid " item(s) selected"
 msgstr "item(s) geselecteerd"
 
-#: src/summaryview.c:1933
+#: src/summaryview.c:1936
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "nieuw: %d, ongelezen:%d, totaal: %d (%s)"
 
-#: src/summaryview.c:1937
+#: src/summaryview.c:1940
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "nieuw: %d, ongelezen:%d, totaal: %d"
 
-#: src/summaryview.c:1971
+#: src/summaryview.c:1974
 msgid "Sorting summary..."
 msgstr "Lijst wordt gesorteerd..."
 
-#: src/summaryview.c:2194
+#: src/summaryview.c:2211
 msgid "\tSetting summary from message data..."
 msgstr "\t"
 
-#: src/summaryview.c:2196
+#: src/summaryview.c:2213
 msgid "Setting summary from message data..."
 msgstr "Samenvatting wordt ingesteld van berichtinformatie..."
 
-#: src/summaryview.c:2302
+#: src/summaryview.c:2319
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Samenvattingbuffer wordt weggeschreven (%s)..."
 
-#: src/summaryview.c:2643
+#: src/summaryview.c:2660
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Bericht %d is gemarkeerd\n"
 
-#: src/summaryview.c:2701
+#: src/summaryview.c:2718
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Bericht %d is gemarkeerd als 'wordt gelezen'.\n"
 
-#: src/summaryview.c:2789
+#: src/summaryview.c:2908
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Bericht %d is gemarkeerd als ongelezen\n"
 
-#: src/summaryview.c:2850
+#: src/summaryview.c:2969
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Bericht %s/%d staat klaar om verwijderd te worden\n"
 
-#: src/summaryview.c:2878
+#: src/summaryview.c:2997
 msgid "Delete message(s)"
 msgstr "Verwijder bericht(en)"
 
-#: src/summaryview.c:2879
+#: src/summaryview.c:2998
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr ""
 "Wilt u dit bericht / deze berichten werkelijk verwijderen uit de prullenbak?"
 
-#: src/summaryview.c:2953
+#: src/summaryview.c:3072
 msgid "Deleting duplicated messages..."
 msgstr "Bezig met verwijderen van dubbele berichten..."
 
-#: src/summaryview.c:2991
+#: src/summaryview.c:3110
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Bericht %s/%d is gedemarkeerd\n"
 
-#: src/summaryview.c:3049
+#: src/summaryview.c:3168
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Bericht %d staat klaar om verplaatst te worden naar %s\n"
 
-#: src/summaryview.c:3066
+#: src/summaryview.c:3196
 msgid "Destination is same as current folder."
 msgstr "Doel is gelijk aan de huidige map."
 
-#: src/summaryview.c:3122
+#: src/summaryview.c:3260
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Bericht %d staat klaar om gekopieerd te worden naar %s\n"
 
-#: src/summaryview.c:3139
+#: src/summaryview.c:3288
 #, fuzzy
 msgid "Destination for copy is same as current folder."
 msgstr "Doel is gelijk aan de huidige map."
 
-#: src/summaryview.c:3338
+#: src/summaryview.c:3495
 #, fuzzy
 msgid "Error occurred while processing messages."
 msgstr "Fout bij het verwerken van de e-mail"
 
-#: src/summaryview.c:3646 src/summaryview.c:3647
+#: src/summaryview.c:3803 src/summaryview.c:3804
 msgid "Building threads..."
 msgstr "Discussies worden bij elkaar gevoegd..."
 
-#: src/summaryview.c:3797 src/summaryview.c:3798
+#: src/summaryview.c:3954 src/summaryview.c:3955
 msgid "Unthreading..."
 msgstr "Discussies worden uit elkaar gehaald..."
 
-#: src/summaryview.c:4091 src/summaryview.c:4147
+#: src/summaryview.c:4248 src/summaryview.c:4304
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Bezig met filteren..."
 
-#: src/summaryview.c:4196
+#: src/summaryview.c:4353
 msgid "filtering..."
 msgstr "Bezig met filteren..."
 
-#: src/summaryview.c:4197
+#: src/summaryview.c:4354
 msgid "Filtering..."
 msgstr "Bezig met filteren..."
 
-#: src/summaryview.c:4233
+#: src/summaryview.c:4390
 #, fuzzy, c-format
 msgid "%d message(s) have been filtered."
 msgstr "bericht %d is reeds gebufferd.\n"
 
-#: src/summaryview.c:4742
+#: src/summaryview.c:4899
 msgid "No."
 msgstr "Nr."
 
@@ -6658,36 +6689,36 @@ msgstr "Tekstvenster wordt aangemaakt...\n"
 msgid "This message can't be displayed.\n"
 msgstr "een bericht wordt niet ontvangen\n"
 
-#: src/textview.c:1929
+#: src/textview.c:1925
 #, fuzzy
 msgid "Sa_ve this image as..."
 msgstr "/Opslaan als..."
 
-#: src/textview.c:1945 src/trayicon.c:109
+#: src/textview.c:1941 src/trayicon.c:109
 #, fuzzy
 msgid "Compose _new message"
 msgstr "Nieuw bericht opstellen"
 
-#: src/textview.c:1947
+#: src/textview.c:1943
 #, fuzzy
 msgid "Add to address _book..."
 msgstr "/Afz_ender toevoegen aan adresboek"
 
-#: src/textview.c:1949
+#: src/textview.c:1945
 #, fuzzy
 msgid "Copy this add_ress"
 msgstr "Algemene adressen"
 
-#: src/textview.c:1952
+#: src/textview.c:1948
 #, fuzzy
 msgid "_Open with Web browser"
 msgstr "Webbrowser"
 
-#: src/textview.c:1954
+#: src/textview.c:1950
 msgid "Copy this _link"
 msgstr ""
 
-#: src/textview.c:2097
+#: src/textview.c:2093
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6696,7 +6727,7 @@ msgid ""
 "Open it anyway?"
 msgstr ""
 
-#: src/textview.c:2102
+#: src/textview.c:2098
 msgid "Fake URL warning"
 msgstr ""
 
diff --git a/po/pl.po b/po/pl.po
index 27789db2..ae91c135 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: 2006-01-27 18:11+0900\n"
+"POT-Creation-Date: 2006-01-31 15:20+0900\n"
 "PO-Revision-Date: 2005-03-05 18:57+0100\n"
 "Last-Translator: Wit Wilinski <madman at linux dot bydg dot org>\n"
 "Language-Team: POLISH <pl@li.org>\n"
@@ -499,7 +499,7 @@ msgstr "Znaleziono: %s\n"
 msgid "Configuration is saved.\n"
 msgstr "Konfiguracja zapisana.\n"
 
-#: libsylph/prefs_common.c:489
+#: libsylph/prefs_common.c:491
 #, fuzzy
 msgid "Junk mail filter"
 msgstr "Niechciana poczta"
@@ -615,8 +615,8 @@ msgstr "%.2fMB"
 msgid "%.2fGB"
 msgstr "%.2fGB"
 
-#: libsylph/utils.c:2373 src/compose.c:2858 src/compose.c:3121
-#: src/compose.c:3184 src/compose.c:3304
+#: libsylph/utils.c:2373 src/compose.c:2867 src/compose.c:3130
+#: src/compose.c:3193 src/compose.c:3313
 msgid "can't change file mode\n"
 msgstr "nie można zmienić trybu pliku\n"
 
@@ -704,8 +704,8 @@ msgstr ""
 "Nowe wiadomości zostaną sprawdzone w tej kolejności. Zaznacz\n"
 "w kolumnie \"G\" konta, które mają być sprawdzone przez 'Odbierz wsz.'"
 
-#: src/account_dialog.c:366 src/addressadd.c:192 src/addressbook.c:491
-#: src/compose.c:4262 src/editaddress.c:200 src/editaddress.c:942
+#: src/account_dialog.c:366 src/addressadd.c:192 src/addressbook.c:493
+#: src/compose.c:4271 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:206 src/prefs_filter.c:259 src/prefs_folder_item.c:171
@@ -842,12 +842,12 @@ msgstr "Argumenty użytkownika dla akcji"
 msgid "Add Address to Book"
 msgstr "Dodaj do książki adresowej"
 
-#: src/addressadd.c:202 src/compose.c:4762 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4771 src/editaddress.c:201
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "Adres"
 
-#: src/addressadd.c:212 src/addressbook.c:493 src/editaddress.c:202
+#: src/addressadd.c:212 src/addressbook.c:495 src/editaddress.c:202
 #: src/editaddress.c:795 src/editaddress.c:860 src/editgroup.c:267
 msgid "Remarks"
 msgstr "Uwagi"
@@ -856,183 +856,183 @@ msgstr "Uwagi"
 msgid "Select Address Book Folder"
 msgstr "Wybierz katalog książki adresowej"
 
-#: src/addressbook.c:336 src/compose.c:515 src/mainwindow.c:477
+#: src/addressbook.c:338 src/compose.c:515 src/mainwindow.c:480
 #: src/messageview.c:138
 msgid "/_File"
 msgstr "/_Plik"
 
-#: src/addressbook.c:337
+#: src/addressbook.c:339
 msgid "/_File/New _Book"
 msgstr "/_Plik/Nowa _książka"
 
-#: src/addressbook.c:338
+#: src/addressbook.c:340
 msgid "/_File/New _vCard"
 msgstr "/_Plik/Nowy _vCard"
 
-#: src/addressbook.c:340
+#: src/addressbook.c:342
 msgid "/_File/New _JPilot"
 msgstr "/_Plik/Nowy _J-Pilot"
 
-#: src/addressbook.c:343
+#: src/addressbook.c:345
 msgid "/_File/New _Server"
 msgstr "/_Plik/Nowy _Serwer"
 
-#: src/addressbook.c:345 src/addressbook.c:348 src/compose.c:520
-#: src/compose.c:525 src/compose.c:528 src/compose.c:531 src/mainwindow.c:495
-#: src/mainwindow.c:498 src/mainwindow.c:500 src/mainwindow.c:503
-#: src/mainwindow.c:505 src/messageview.c:141
+#: src/addressbook.c:347 src/addressbook.c:350 src/compose.c:520
+#: src/compose.c:525 src/compose.c:528 src/compose.c:531 src/mainwindow.c:498
+#: src/mainwindow.c:501 src/mainwindow.c:503 src/mainwindow.c:506
+#: src/mainwindow.c:508 src/messageview.c:141
 msgid "/_File/---"
 msgstr "/_Plik/---"
 
-#: src/addressbook.c:346
+#: src/addressbook.c:348
 msgid "/_File/_Edit"
 msgstr "/_Plik/_Edycja"
 
-#: src/addressbook.c:347
+#: src/addressbook.c:349
 msgid "/_File/_Delete"
 msgstr "/_Plik/_Usuń"
 
-#: src/addressbook.c:349
+#: src/addressbook.c:351
 msgid "/_File/_Save"
 msgstr "/_Plik/Zapi_sz"
 
-#: src/addressbook.c:350 src/compose.c:532 src/messageview.c:142
+#: src/addressbook.c:352 src/compose.c:532 src/messageview.c:142
 msgid "/_File/_Close"
 msgstr "/_Plik/_Zamknij"
 
-#: src/addressbook.c:351
+#: src/addressbook.c:353
 msgid "/_Address"
 msgstr "/_Adres"
 
-#: src/addressbook.c:352
+#: src/addressbook.c:354
 msgid "/_Address/New _Address"
 msgstr "/_Plik/Nowy _adres"
 
-#: src/addressbook.c:353
+#: src/addressbook.c:355
 msgid "/_Address/New _Group"
 msgstr "/_Plik/Nowa _grupa"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:356
 msgid "/_Address/New _Folder"
 msgstr "/_Plik/Nowy _katalog"
 
-#: src/addressbook.c:355
+#: src/addressbook.c:357
 msgid "/_Address/---"
 msgstr "/_Adres/---"
 
-#: src/addressbook.c:356
+#: src/addressbook.c:358
 msgid "/_Address/_Edit"
 msgstr "/_Adres/_Edycja"
 
-#: src/addressbook.c:357
+#: src/addressbook.c:359
 msgid "/_Address/_Delete"
 msgstr "/_Adres/_Usuń"
 
-#: src/addressbook.c:358 src/compose.c:639 src/mainwindow.c:738
-#: src/messageview.c:259
+#: src/addressbook.c:360 src/compose.c:645 src/mainwindow.c:749
+#: src/messageview.c:264
 msgid "/_Tools"
 msgstr "/_Narzędzia"
 
-#: src/addressbook.c:359
+#: src/addressbook.c:361
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Plik/Importuj plik _LDIF"
 
-#: src/addressbook.c:360 src/compose.c:658 src/mainwindow.c:788
-#: src/messageview.c:277
+#: src/addressbook.c:362 src/compose.c:664 src/mainwindow.c:799
+#: src/messageview.c:282
 msgid "/_Help"
 msgstr "/Pomo_c"
 
-#: src/addressbook.c:361 src/compose.c:659 src/mainwindow.c:799
-#: src/messageview.c:278
+#: src/addressbook.c:363 src/compose.c:665 src/mainwindow.c:810
+#: src/messageview.c:283
 msgid "/_Help/_About"
 msgstr "/Pomo_c/_O programie"
 
-#: src/addressbook.c:380 src/addressbook.c:390
+#: src/addressbook.c:382 src/addressbook.c:392
 msgid "/New _Address"
 msgstr "/Nowy _adres"
 
-#: src/addressbook.c:381 src/addressbook.c:391
+#: src/addressbook.c:383 src/addressbook.c:393
 msgid "/New _Group"
 msgstr "/Nowa _grupa"
 
-#: src/addressbook.c:382 src/addressbook.c:392
+#: src/addressbook.c:384 src/addressbook.c:394
 msgid "/New _Folder"
 msgstr "/Nowy _katalog"
 
-#: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:509
+#: src/addressbook.c:385 src/addressbook.c:395 src/compose.c:509
 #: src/folderview.c:246 src/folderview.c:248 src/folderview.c:253
 #: src/folderview.c:266 src/folderview.c:268 src/folderview.c:270
 #: src/folderview.c:275 src/folderview.c:289 src/folderview.c:291
 #: src/folderview.c:295 src/summaryview.c:414 src/summaryview.c:418
-#: src/summaryview.c:421 src/summaryview.c:431 src/summaryview.c:433
-#: src/summaryview.c:435 src/summaryview.c:447 src/summaryview.c:453
+#: src/summaryview.c:421 src/summaryview.c:433 src/summaryview.c:435
+#: src/summaryview.c:437 src/summaryview.c:449 src/summaryview.c:455
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:534
-#: src/mainwindow.c:509 src/messageview.c:144
+#: src/addressbook.c:386 src/addressbook.c:396 src/compose.c:534
+#: src/mainwindow.c:512 src/messageview.c:144
 msgid "/_Edit"
 msgstr "/_Edycja"
 
-#: src/addressbook.c:385 src/addressbook.c:395 src/summaryview.c:432
+#: src/addressbook.c:387 src/addressbook.c:397 src/summaryview.c:434
 msgid "/_Delete"
 msgstr "/_Usuń"
 
-#: src/addressbook.c:492
+#: src/addressbook.c:494
 msgid "E-Mail address"
 msgstr "Adres e-mail"
 
-#: src/addressbook.c:496 src/compose.c:4763 src/prefs_common_dialog.c:2183
+#: src/addressbook.c:498 src/compose.c:4772 src/prefs_common_dialog.c:2183
 msgid "Address book"
 msgstr "Książka adresowa"
 
-#: src/addressbook.c:596 src/prefs_filter_edit.c:249
+#: src/addressbook.c:600 src/prefs_filter_edit.c:249
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "Nazwa:"
 
 #. Buttons
-#: src/addressbook.c:628 src/addressbook.c:1680 src/editaddress.c:884
-#: src/editaddress.c:1017 src/mainwindow.c:2391 src/prefs_actions.c:266
+#: src/addressbook.c:632 src/addressbook.c:1684 src/editaddress.c:884
+#: src/editaddress.c:1017 src/mainwindow.c:2402 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
 #: src/prefs_template.c:233
 msgid "Delete"
 msgstr "Usuń"
 
-#: src/addressbook.c:631 src/editaddress.c:890 src/editaddress.c:1023
+#: src/addressbook.c:635 src/editaddress.c:890 src/editaddress.c:1023
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:273 src/prefs_display_header.c:328
 #: src/prefs_filter_edit.c:1550
 msgid "Add"
 msgstr "Dodaj"
 
-#: src/addressbook.c:634
+#: src/addressbook.c:638
 msgid "Lookup"
 msgstr "Wyszukaj"
 
-#: src/addressbook.c:646 src/headerview.c:55 src/prefs_folder_item.c:339
+#: src/addressbook.c:650 src/headerview.c:55 src/prefs_folder_item.c:339
 #: src/prefs_template.c:176
 msgid "To:"
 msgstr "Do:"
 
-#: src/addressbook.c:650 src/prefs_folder_item.c:356 src/prefs_template.c:178
+#: src/addressbook.c:654 src/prefs_folder_item.c:356 src/prefs_template.c:178
 msgid "Cc:"
 msgstr "Kopia:"
 
-#: src/addressbook.c:654 src/prefs_folder_item.c:367
+#: src/addressbook.c:658 src/prefs_folder_item.c:367
 msgid "Bcc:"
 msgstr "Ukryta kopia:"
 
 #. Confirm deletion
-#: src/addressbook.c:841
+#: src/addressbook.c:845
 msgid "Delete address(es)"
 msgstr "Usuń adres(y)"
 
-#: src/addressbook.c:842
+#: src/addressbook.c:846
 msgid "Really delete the address(es)?"
 msgstr "Czy naprawdę chcesz usunąć ten adres(y)?"
 
-#: src/addressbook.c:1671
+#: src/addressbook.c:1675
 #, fuzzy, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1042,38 +1042,38 @@ msgstr ""
 "Jeśli usuniesz tylko katalog, adresy zostaną przeniesione do nadrzędnego "
 "katalogu."
 
-#: src/addressbook.c:1674 src/folderview.c:2351
+#: src/addressbook.c:1678 src/folderview.c:2351
 msgid "Delete folder"
 msgstr "Usuń katalog"
 
-#: src/addressbook.c:1674
+#: src/addressbook.c:1678
 #, fuzzy
 msgid "_Folder only"
 msgstr "Tylko katalog"
 
-#: src/addressbook.c:1674
+#: src/addressbook.c:1678
 #, fuzzy
 msgid "Folder and _addresses"
 msgstr "Katalog i adresy"
 
-#: src/addressbook.c:1679
+#: src/addressbook.c:1683
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Czy naprawdę usunąć \"%s\" ?"
 
-#: src/addressbook.c:2365 src/addressbook.c:2498
+#: src/addressbook.c:2369 src/addressbook.c:2502
 msgid "New user, could not save index file."
 msgstr "Nowy użytkownik, nie można było zapisać pliku indeksu."
 
-#: src/addressbook.c:2369 src/addressbook.c:2502
+#: src/addressbook.c:2373 src/addressbook.c:2506
 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:2379 src/addressbook.c:2512
+#: src/addressbook.c:2383 src/addressbook.c:2516
 msgid "Old address book converted successfully."
 msgstr "Konwersja starej książki adresowej została zakończona pomyślnie."
 
-#: src/addressbook.c:2384
+#: src/addressbook.c:2388
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1081,7 +1081,7 @@ msgstr ""
 "Stara książka adresowa została skonwertowana,\n"
 "nie można było zapisać nowego pliku indeksu adresów."
 
-#: src/addressbook.c:2397
+#: src/addressbook.c:2401
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1089,7 +1089,7 @@ msgstr ""
 "Nie można było skonwertować książki adresowej,\n"
 "utworzono puste pliki nowej książki adresowej."
 
-#: src/addressbook.c:2403
+#: src/addressbook.c:2407
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1097,7 +1097,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:2408
+#: src/addressbook.c:2412
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1105,92 +1105,92 @@ msgstr ""
 "Nie można było skonwertować książki adresowej\n"
 "oraz utworzyć nowych plików książki adresowej."
 
-#: src/addressbook.c:2415
+#: src/addressbook.c:2419
 msgid "Addressbook conversion error"
 msgstr "Błąd konwersji książki adresowej"
 
-#: src/addressbook.c:2419
+#: src/addressbook.c:2423
 msgid "Addressbook conversion"
 msgstr "Konwersja książki adresowej"
 
-#: src/addressbook.c:2454
+#: src/addressbook.c:2458
 msgid "Addressbook Error"
 msgstr "Błąd książki adresowej"
 
-#: src/addressbook.c:2455 src/addressbook.c:2555
+#: src/addressbook.c:2459 src/addressbook.c:2559
 msgid "Could not read address index"
 msgstr "Nie można odczytać książki adresowej"
 
-#: src/addressbook.c:2517
+#: src/addressbook.c:2521
 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:2531
+#: src/addressbook.c:2535
 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:2537
+#: src/addressbook.c:2541
 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:2543
+#: src/addressbook.c:2547
 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:2561
+#: src/addressbook.c:2565
 msgid "Addressbook Conversion Error"
 msgstr "Błąd konwersji książki adresowej"
 
-#: src/addressbook.c:2567
+#: src/addressbook.c:2571
 msgid "Addressbook Conversion"
 msgstr "Konwersja książki adresowej"
 
-#: src/addressbook.c:3072 src/prefs_common_dialog.c:2033
+#: src/addressbook.c:3086 src/prefs_common_dialog.c:2033
 msgid "Interface"
 msgstr "Interfejs"
 
-#: src/addressbook.c:3088 src/importldif.c:514
+#: src/addressbook.c:3102 src/importldif.c:514
 msgid "Address Book"
 msgstr "Książka adresowa"
 
-#: src/addressbook.c:3104
+#: src/addressbook.c:3118
 msgid "Person"
 msgstr "Osoba"
 
-#: src/addressbook.c:3120
+#: src/addressbook.c:3134
 msgid "EMail Address"
 msgstr "Adres e-mail"
 
-#: src/addressbook.c:3136
+#: src/addressbook.c:3150
 msgid "Group"
 msgstr "Grupa"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3152 src/folderview.c:367 src/prefs_account_dialog.c:1694
+#: src/addressbook.c:3166 src/folderview.c:367 src/prefs_account_dialog.c:1694
 #: src/query_search.c:370
 msgid "Folder"
 msgstr "Katalog"
 
-#: src/addressbook.c:3168
+#: src/addressbook.c:3182
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3184 src/addressbook.c:3200
+#: src/addressbook.c:3198 src/addressbook.c:3214
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3216
+#: src/addressbook.c:3230
 msgid "LDAP Server"
 msgstr "Serwer LDAP"
 
@@ -1202,7 +1202,7 @@ msgstr "Wspólny adres:"
 msgid "Personal address"
 msgstr "Osobisty adres:"
 
-#: src/alertpanel.c:141 src/compose.c:5485 src/main.c:573
+#: src/alertpanel.c:141 src/compose.c:5494 src/main.c:573
 msgid "Notice"
 msgstr "Notatka"
 
@@ -1253,7 +1253,7 @@ msgstr "Brązowy"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4593
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4750
 msgid "None"
 msgstr "Brak"
 
@@ -1311,7 +1311,7 @@ msgstr "/_Edycja/_Cofnij"
 msgid "/_Edit/_Redo"
 msgstr "/_Edycja/Po_nów"
 
-#: src/compose.c:537 src/compose.c:544 src/mainwindow.c:513
+#: src/compose.c:537 src/compose.c:544 src/mainwindow.c:516
 #: src/messageview.c:147
 msgid "/_Edit/---"
 msgstr "/_Edycja/---"
@@ -1320,7 +1320,7 @@ msgstr "/_Edycja/---"
 msgid "/_Edit/Cu_t"
 msgstr "/_Edycja/Wy_tnij"
 
-#: src/compose.c:539 src/mainwindow.c:510 src/messageview.c:145
+#: src/compose.c:539 src/mainwindow.c:513 src/messageview.c:145
 msgid "/_Edit/_Copy"
 msgstr "/_Edycja/_Kopiuj"
 
@@ -1332,7 +1332,7 @@ msgstr "/_Edycja/_Wstaw"
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Edycja/Wstaw jako c_ytat"
 
-#: src/compose.c:543 src/mainwindow.c:511 src/messageview.c:146
+#: src/compose.c:543 src/mainwindow.c:514 src/messageview.c:146
 msgid "/_Edit/Select _all"
 msgstr "/_Edycja/W_ybierz wszystko"
 
@@ -1348,8 +1348,8 @@ msgstr "/_Edycja/Zawijaj wszystkie długie _linie"
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Edycja/Aut_o-zawijanie"
 
-#: src/compose.c:550 src/mainwindow.c:518 src/messageview.c:151
-#: src/summaryview.c:448
+#: src/compose.c:550 src/mainwindow.c:521 src/messageview.c:151
+#: src/summaryview.c:450
 msgid "/_View"
 msgstr "/_Widok"
 
@@ -1370,9 +1370,9 @@ msgid "/_View/_Reply to"
 msgstr "/_Widok/_Odpowiedz do"
 
 #: src/compose.c:555 src/compose.c:557 src/compose.c:559 src/compose.c:561
-#: src/mainwindow.c:538 src/mainwindow.c:541 src/mainwindow.c:568
-#: src/mainwindow.c:592 src/mainwindow.c:687 src/mainwindow.c:691
-#: src/messageview.c:236
+#: src/mainwindow.c:541 src/mainwindow.c:544 src/mainwindow.c:571
+#: src/mainwindow.c:595 src/mainwindow.c:696 src/mainwindow.c:700
+#: src/messageview.c:241
 msgid "/_View/---"
 msgstr "/_Widok/---"
 
@@ -1388,7 +1388,7 @@ msgstr "/_Widok/_Linijka"
 msgid "/_View/_Attachment"
 msgstr "/_Widok/Załączniki"
 
-#: src/compose.c:567 src/mainwindow.c:599 src/messageview.c:158
+#: src/compose.c:567 src/mainwindow.c:602 src/messageview.c:158
 msgid "/_View/Character _encoding"
 msgstr "/_Widok/Kodowani_e znaków"
 
@@ -1397,215 +1397,226 @@ msgid "/_View/Character _encoding/_Automatic"
 msgstr "/_Widok/Kodowani_e znaków/Automatyczne"
 
 #: src/compose.c:570 src/compose.c:576 src/compose.c:582 src/compose.c:586
-#: src/compose.c:592 src/compose.c:596 src/compose.c:602 src/compose.c:606
-#: src/compose.c:616 src/compose.c:620 src/compose.c:628 src/compose.c:632
-#: src/mainwindow.c:595 src/mainwindow.c:602 src/messageview.c:154
+#: src/compose.c:592 src/compose.c:596 src/compose.c:602 src/compose.c:608
+#: src/compose.c:612 src/compose.c:622 src/compose.c:626 src/compose.c:634
+#: src/compose.c:638 src/mainwindow.c:598 src/mainwindow.c:605
+#: src/messageview.c:154
 msgid "/_View/Character _encoding/---"
 msgstr "/_Widok/Kodowani_e znaków/---"
 
-#: src/compose.c:572 src/mainwindow.c:603 src/messageview.c:162
+#: src/compose.c:572 src/mainwindow.c:606 src/messageview.c:162
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Widok/Kodowani_e znaków/7-bitowe ascii (US-ASC_II)"
 
-#: src/compose.c:574 src/mainwindow.c:605 src/messageview.c:165
+#: src/compose.c:574 src/mainwindow.c:608 src/messageview.c:165
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Widok/Kodowani_e znaków/Unikod (_UTF-8)"
 
-#: src/compose.c:578 src/mainwindow.c:609 src/messageview.c:168
+#: src/compose.c:578 src/mainwindow.c:612 src/messageview.c:168
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Widok/Kodowani_e znaków/Europa Zachodnia (ISO-8859-_1)"
 
-#: src/compose.c:580 src/mainwindow.c:611 src/messageview.c:170
+#: src/compose.c:580 src/mainwindow.c:614 src/messageview.c:170
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Widok/Kodowani_e znaków/Europa Zachodnia (ISO-8859-15)"
 
-#: src/compose.c:584 src/mainwindow.c:617 src/messageview.c:175
+#: src/compose.c:584 src/mainwindow.c:620 src/messageview.c:175
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Widok/Kodowani_e znaków/Europa Środkowa (ISO-8859-_2)"
 
-#: src/compose.c:588 src/mainwindow.c:621 src/messageview.c:178
+#: src/compose.c:588 src/mainwindow.c:624 src/messageview.c:178
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Widok/Kodowani_e znaków/_Bałtyckie (ISO-8859-13)"
 
-#: src/compose.c:590 src/mainwindow.c:623 src/messageview.c:180
+#: src/compose.c:590 src/mainwindow.c:626 src/messageview.c:180
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Widok/Kodowani_e znaków/Bałtyckie (ISO-8859-_4)"
 
-#: src/compose.c:594 src/mainwindow.c:627 src/messageview.c:183
+#: src/compose.c:594 src/mainwindow.c:630 src/messageview.c:183
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Widok/Kodowani_e znaków/Greckie (ISO-8859-_7)"
 
-#: src/compose.c:598 src/mainwindow.c:631 src/messageview.c:186
+#: src/compose.c:598 src/mainwindow.c:634 src/messageview.c:186
+#, fuzzy
+msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
+msgstr "/_Widok/Kodowani_e znaków/Bałtyckie (ISO-8859-_4)"
+
+#: src/compose.c:600 src/mainwindow.c:636 src/messageview.c:188
+#, fuzzy
+msgid "/_View/Character _encoding/Arabic (Windows-1256)"
+msgstr "/_Widok/Kodowani_e znaków/Cyrylica (Windows-1251)"
+
+#: src/compose.c:604 src/mainwindow.c:640 src/messageview.c:191
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Widok/Kodowani_e znaków/Hebrajskie (ISO-8859-_8)"
 
-#: src/compose.c:600 src/mainwindow.c:633 src/messageview.c:188
+#: src/compose.c:606 src/mainwindow.c:642 src/messageview.c:193
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Widok/Kodowani_e znaków/Hebrajskie (Windows-1251)"
 
-#: src/compose.c:604 src/mainwindow.c:637 src/messageview.c:191
+#: src/compose.c:610 src/mainwindow.c:646 src/messageview.c:196
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Widok/Kodowani_e znaków/Tureckie (ISO-8859-_9)"
 
-#: src/compose.c:608 src/mainwindow.c:641 src/messageview.c:194
+#: src/compose.c:614 src/mainwindow.c:650 src/messageview.c:199
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Widok/Kodowani_e znaków/Cyrylica (ISO-8859-_5)"
 
-#: src/compose.c:610 src/mainwindow.c:643 src/messageview.c:196
+#: src/compose.c:616 src/mainwindow.c:652 src/messageview.c:201
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Widok/Kodowani_e znaków/Cyrylica (KOI8-_R)"
 
-#: src/compose.c:612 src/mainwindow.c:645 src/messageview.c:198
+#: src/compose.c:618 src/mainwindow.c:654 src/messageview.c:203
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Widok/Kodowani_e znaków/Cyrylica (KOI8-U)"
 
-#: src/compose.c:614 src/mainwindow.c:647 src/messageview.c:200
+#: src/compose.c:620 src/mainwindow.c:656 src/messageview.c:205
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Widok/Kodowani_e znaków/Cyrylica (Windows-1251)"
 
-#: src/compose.c:618 src/mainwindow.c:651 src/messageview.c:203
+#: src/compose.c:624 src/mainwindow.c:660 src/messageview.c:208
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Widok/Kodowani_e znaków/Japońskie (ISO-2022-_JP)"
 
-#: src/compose.c:622 src/mainwindow.c:661 src/messageview.c:212
+#: src/compose.c:628 src/mainwindow.c:670 src/messageview.c:217
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Widok/Kodowani_e znaków/Uproszczone Chińskie (_GB2312)"
 
-#: src/compose.c:624 src/mainwindow.c:663 src/messageview.c:214
+#: src/compose.c:630 src/mainwindow.c:672 src/messageview.c:219
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Widok/Kodowani_e znaków/Uproszczone Chińskie (GBK)"
 
-#: src/compose.c:626 src/mainwindow.c:665 src/messageview.c:216
+#: src/compose.c:632 src/mainwindow.c:674 src/messageview.c:221
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Widok/Kodowani_e znaków/Tradycyjne Chińskie (_Big5)"
 
-#: src/compose.c:630 src/mainwindow.c:673 src/messageview.c:223
+#: src/compose.c:636 src/mainwindow.c:682 src/messageview.c:228
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Widok/Kodowani_e znaków/Koreańskie (EUC-_KR)"
 
-#: src/compose.c:634 src/mainwindow.c:679 src/messageview.c:228
+#: src/compose.c:640 src/mainwindow.c:688 src/messageview.c:233
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Widok/Kodowani_e znaków/Tajskie (TIS-620)"
 
-#: src/compose.c:636 src/mainwindow.c:681 src/messageview.c:230
+#: src/compose.c:642 src/mainwindow.c:690 src/messageview.c:235
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Widok/Kodowani_e znaków/Tajskie (Windows-874)"
 
-#: src/compose.c:640 src/mainwindow.c:739 src/messageview.c:260
+#: src/compose.c:646 src/mainwindow.c:750 src/messageview.c:265
 msgid "/_Tools/_Address book"
 msgstr "/_Narzędzia/_Książka adresowa"
 
-#: src/compose.c:641
+#: src/compose.c:647
 msgid "/_Tools/_Template"
 msgstr "/_Narzędzia/_Szablon"
 
-#: src/compose.c:642 src/mainwindow.c:762 src/messageview.c:275
+#: src/compose.c:648 src/mainwindow.c:773 src/messageview.c:280
 msgid "/_Tools/Actio_ns"
 msgstr "/_Narzędzia/Polecen_ia"
 
-#: src/compose.c:643 src/compose.c:647 src/compose.c:653 src/mainwindow.c:742
-#: src/mainwindow.c:756 src/mainwindow.c:761 src/mainwindow.c:763
-#: src/mainwindow.c:766 src/mainwindow.c:768 src/messageview.c:263
-#: src/messageview.c:274
+#: src/compose.c:649 src/compose.c:653 src/compose.c:659 src/mainwindow.c:753
+#: src/mainwindow.c:767 src/mainwindow.c:772 src/mainwindow.c:774
+#: src/mainwindow.c:777 src/mainwindow.c:779 src/messageview.c:268
+#: src/messageview.c:279
 msgid "/_Tools/---"
 msgstr "/_Narzędzia/---"
 
-#: src/compose.c:644
+#: src/compose.c:650
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/_Narzędzia/Edytuj za pomocą z_ewnętrznego edytora"
 
-#: src/compose.c:648
+#: src/compose.c:654
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Narzędzia/Podpis _PGP"
 
-#: src/compose.c:649
+#: src/compose.c:655
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/_Narzędzia/Szyfrowani_e GPG"
 
-#: src/compose.c:654
+#: src/compose.c:660
 #, fuzzy
 msgid "/_Tools/_Check spell"
 msgstr "/_Narzędzia/_Wykonaj"
 
-#: src/compose.c:655
+#: src/compose.c:661
 #, fuzzy
 msgid "/_Tools/_Set spell language"
 msgstr "/_Narzędzia/_Szablon"
 
-#: src/compose.c:899
+#: src/compose.c:908
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: brak pliku\n"
 
-#: src/compose.c:1003 src/compose.c:1074
+#: src/compose.c:1012 src/compose.c:1083
 msgid "Can't get text part\n"
 msgstr "Nie mogę pobrać części tekstu\n"
 
-#: src/compose.c:1475
+#: src/compose.c:1484
 msgid "Quote mark format error."
 msgstr "Błąd formatu znacznika cytatu."
 
-#: src/compose.c:1487
+#: src/compose.c:1496
 msgid "Message reply/forward format error."
 msgstr "Błąd formatu odpowiedz/przekaż wiadomość."
 
-#: src/compose.c:1907
+#: src/compose.c:1916
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Plik %s nie istnieje\n"
 
-#: src/compose.c:1911
+#: src/compose.c:1920
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Nie można odczytać wielkości pliku %s\n"
 
-#: src/compose.c:1915
+#: src/compose.c:1924
 #, c-format
 msgid "File %s is empty."
 msgstr "Plik %s jest pusty."
 
-#: src/compose.c:1919
+#: src/compose.c:1928
 #, c-format
 msgid "Can't read %s."
 msgstr "Nie można odczytać %s."
 
-#: src/compose.c:1952
+#: src/compose.c:1961
 #, c-format
 msgid "Message: %s"
 msgstr "Wiadomość: %s"
 
-#: src/compose.c:2012 src/mimeview.c:565
+#: src/compose.c:2021 src/mimeview.c:565
 msgid "Can't get the part of multipart message."
 msgstr "Nie można pobrać części wiadomości wieloczęściowej."
 
-#: src/compose.c:2496 src/headerview.c:195 src/query_search.c:636
-#: src/summaryview.c:2107
+#: src/compose.c:2505 src/headerview.c:195 src/query_search.c:636
+#: src/summaryview.c:2124
 msgid "(No Subject)"
 msgstr "(Bez tematu)"
 
-#: src/compose.c:2499
+#: src/compose.c:2508
 #, fuzzy, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Utwórz wiadomość%s"
 
-#: src/compose.c:2612
+#: src/compose.c:2621
 msgid "Recipient is not specified."
 msgstr "Nie podano odbiorcy."
 
-#: src/compose.c:2620
+#: src/compose.c:2629
 #, fuzzy
 msgid "Empty subject"
 msgstr "Temat"
 
-#: src/compose.c:2621
+#: src/compose.c:2630
 msgid "Subject is empty. Send it anyway?"
 msgstr "Wiadomość nie posiada tematu. Czy wysłać ją mimo tego ?"
 
-#: src/compose.c:2680
+#: src/compose.c:2689
 msgid "can't get recipient list."
 msgstr "nie można pobrać listy odbiorców."
 
-#: src/compose.c:2700
+#: src/compose.c:2709
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1613,22 +1624,22 @@ msgstr ""
 "Nie podano konta pocztowego do wysyłania wiadomości.\n"
 "Należy wybrać konto przed wysłaniem."
 
-#: src/compose.c:2714 src/send_message.c:299
+#: src/compose.c:2723 src/send_message.c:299
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Błąd podczas wysyłania wiadomości do %s."
 
-#: src/compose.c:2756
+#: src/compose.c:2765
 msgid "Can't save the message to outbox."
 msgstr "Nie można zapisać wiadomości do outbox."
 
-#: src/compose.c:2794
+#: src/compose.c:2803
 #, 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:2891
+#: src/compose.c:2900
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1638,12 +1649,12 @@ msgstr ""
 "Nie można przekonwertować treści wiadomości z %s na %s.\n"
 "Wysłać wiadomość mimo to %s ?"
 
-#: src/compose.c:2897
+#: src/compose.c:2906
 #, fuzzy
 msgid "Code conversion error"
 msgstr "Błąd konwersji książki adresowej"
 
-#: src/compose.c:2970
+#: src/compose.c:2979
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1652,157 +1663,157 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:2974
+#: src/compose.c:2983
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3264
+#: src/compose.c:3273
 msgid "can't remove the old message\n"
 msgstr "Nie można usunąć starej wiadomości\n"
 
-#: src/compose.c:3282
+#: src/compose.c:3291
 msgid "queueing message...\n"
 msgstr "kolejkowanie wiadomości...\n"
 
-#: src/compose.c:3364
+#: src/compose.c:3373
 msgid "can't find queue folder\n"
 msgstr "nie można znaleźć katalogu kolejki\n"
 
-#: src/compose.c:3371
+#: src/compose.c:3380
 msgid "can't queue the message\n"
 msgstr "nie można zapisać wiadomości do kolejki\n"
 
-#: src/compose.c:3964
+#: src/compose.c:3973
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "wygenerowany Message-ID: %s\n"
 
-#: src/compose.c:4077
+#: src/compose.c:4086
 msgid "Creating compose window...\n"
 msgstr "Tworzenie okna edycji...\n"
 
-#: src/compose.c:4128 src/headerview.c:54
+#: src/compose.c:4137 src/headerview.c:54
 msgid "From:"
 msgstr "Od:"
 
-#: src/compose.c:4202
+#: src/compose.c:4211
 msgid "PGP Sign"
 msgstr "Podpis PGP"
 
-#: src/compose.c:4205
+#: src/compose.c:4214
 msgid "PGP Encrypt"
 msgstr "Szyfrowanie PGP"
 
-#: src/compose.c:4243 src/compose.c:5317
+#: src/compose.c:4252 src/compose.c:5326
 msgid "MIME type"
 msgstr "typ MIME"
 
 #. S_COL_DATE
-#: src/compose.c:4252 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4740
+#: src/compose.c:4261 src/mimeview.c:197 src/prefs_filter_edit.c:496
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4897
 msgid "Size"
 msgstr "Rozmiar"
 
-#: src/compose.c:4683 src/mainwindow.c:2324 src/prefs_account_dialog.c:528
+#: src/compose.c:4692 src/mainwindow.c:2335 src/prefs_account_dialog.c:528
 #: src/prefs_common_dialog.c:661
 msgid "Send"
 msgstr "Wyślij"
 
-#: src/compose.c:4684
+#: src/compose.c:4693
 msgid "Send message"
 msgstr "Wyślij wiadomość"
 
-#: src/compose.c:4692
+#: src/compose.c:4701
 msgid "Send later"
 msgstr "Wyślij później"
 
-#: src/compose.c:4693
+#: src/compose.c:4702
 msgid "Put into queue folder and send later"
 msgstr "Umieść w katalogu kolejki i wyślij później"
 
-#: src/compose.c:4701
+#: src/compose.c:4710
 msgid "Draft"
 msgstr "Draft"
 
-#: src/compose.c:4702
+#: src/compose.c:4711
 msgid "Save to draft folder"
 msgstr "Zapisz w katalogu szablonów"
 
-#: src/compose.c:4712
+#: src/compose.c:4721
 msgid "Insert"
 msgstr "Wstaw"
 
-#: src/compose.c:4713
+#: src/compose.c:4722
 msgid "Insert file"
 msgstr "Wstaw plik"
 
-#: src/compose.c:4721
+#: src/compose.c:4730
 msgid "Attach"
 msgstr "Dołącz"
 
-#: src/compose.c:4722
+#: src/compose.c:4731
 msgid "Attach file"
 msgstr "Dołącz plik"
 
 #. signature
-#: src/compose.c:4732 src/prefs_account_dialog.c:1208
+#: src/compose.c:4741 src/prefs_account_dialog.c:1208
 #: src/prefs_common_dialog.c:953
 msgid "Signature"
 msgstr "Podpis"
 
-#: src/compose.c:4733
+#: src/compose.c:4742
 #, fuzzy
 msgid "Append signature"
 msgstr "ZŁY podpis"
 
 #. editor
-#: src/compose.c:4742 src/prefs_common_dialog.c:991
+#: src/compose.c:4751 src/prefs_common_dialog.c:991
 #: src/prefs_common_dialog.c:2315
 msgid "Editor"
 msgstr "Edytor"
 
-#: src/compose.c:4743
+#: src/compose.c:4752
 msgid "Edit with external editor"
 msgstr "Edytuj w zewnętrznym edytorze"
 
-#: src/compose.c:4751
+#: src/compose.c:4760
 msgid "Linewrap"
 msgstr "Zawijanie linii"
 
-#: src/compose.c:4752
+#: src/compose.c:4761
 msgid "Wrap all long lines"
 msgstr "Zawijaj wszystkie długie linie"
 
-#: src/compose.c:5213
+#: src/compose.c:5222
 msgid "Invalid MIME type."
 msgstr "Niepoprawny typ MIME."
 
-#: src/compose.c:5231
+#: src/compose.c:5240
 msgid "File doesn't exist or is empty."
 msgstr "Brak pliku lub pusty plik."
 
-#: src/compose.c:5299
+#: src/compose.c:5308
 msgid "Properties"
 msgstr "Właściwości"
 
-#: src/compose.c:5319 src/prefs_common_dialog.c:1444
+#: src/compose.c:5328 src/prefs_common_dialog.c:1444
 msgid "Encoding"
 msgstr "Kodowanie"
 
-#: src/compose.c:5342 src/prefs_folder_item.c:202
+#: src/compose.c:5351 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Ścieżka"
 
-#: src/compose.c:5343
+#: src/compose.c:5352
 msgid "File name"
 msgstr "Nazwa pliku"
 
-#: src/compose.c:5436
+#: src/compose.c:5445
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Niepoprawna linia wywołania zewnętrznego edytora: \"%s\"\n"
 
-#: src/compose.c:5482
+#: src/compose.c:5491
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1812,47 +1823,47 @@ msgstr ""
 "Czy wymusić zakończenie procesu?\n"
 "identyfikator grupy procesów: %d"
 
-#: src/compose.c:5857 src/compose.c:5862 src/compose.c:5868
+#: src/compose.c:5866 src/compose.c:5871 src/compose.c:5877
 msgid "Can't queue the message."
 msgstr "Nie można wstawić wiadomości do kolejki."
 
-#: src/compose.c:5959
+#: src/compose.c:5968
 msgid "Select files"
 msgstr "Wybierz pliki"
 
-#: src/compose.c:5982
+#: src/compose.c:5991
 msgid "Select file"
 msgstr "Wybierz plik"
 
-#: src/compose.c:6017
+#: src/compose.c:6026
 #, fuzzy
 msgid "Save message"
 msgstr "Wyślij wiadomość"
 
-#: src/compose.c:6018
+#: src/compose.c:6027
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Wiadomość została zmieniona, czy porzucić ją?"
 
-#: src/compose.c:6020
+#: src/compose.c:6029
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:6062
+#: src/compose.c:6071
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Czy chcesz zastosować szablon \"%s\"?"
 
-#: src/compose.c:6064
+#: src/compose.c:6073
 msgid "Apply template"
 msgstr "Zastosuj szablon"
 
-#: src/compose.c:6065
+#: src/compose.c:6074
 #, fuzzy
 msgid "_Replace"
 msgstr "Zamień"
 
-#: src/compose.c:6065
+#: src/compose.c:6074
 #, fuzzy
 msgid "_Insert"
 msgstr "Wstaw"
@@ -2291,7 +2302,7 @@ msgstr "Nowy"
 
 #. S_COL_MARK
 #: src/folderview.c:412 src/prefs_filter_edit.c:500
-#: src/prefs_summary_column.c:71 src/summaryview.c:509
+#: src/prefs_summary_column.c:71 src/summaryview.c:511
 msgid "Unread"
 msgstr "Nieprzeczytane"
 
@@ -2307,12 +2318,12 @@ msgstr "Ustawianie informacji o katalogu...\n"
 msgid "Setting folder info..."
 msgstr "Ustawianie informacji o katalogu..."
 
-#: src/folderview.c:858 src/mainwindow.c:3464 src/setup.c:80
+#: src/folderview.c:858 src/mainwindow.c:3481 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Przeszukiwanie katalogu %s%c%s ..."
 
-#: src/folderview.c:862 src/mainwindow.c:3469 src/setup.c:85
+#: src/folderview.c:862 src/mainwindow.c:3486 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Przeszukiwanie katalogu %s ..."
@@ -2337,7 +2348,7 @@ msgstr "Błąd podczas odbudowywania drzewa katalogów."
 msgid "Checking for new messages in all folders..."
 msgstr "Sprawdzanie nowych wiadomości we wszystkich katalogach..."
 
-#: src/folderview.c:1200 src/mainwindow.c:2400 src/prefs_common_dialog.c:1789
+#: src/folderview.c:1200 src/mainwindow.c:2411 src/prefs_common_dialog.c:1789
 msgid "Junk"
 msgstr ""
 
@@ -2476,7 +2487,7 @@ msgstr "Temat:"
 msgid "Creating header view...\n"
 msgstr "Tworzenie widoku nagłówków...\n"
 
-#: src/headerview.c:180 src/query_search.c:637 src/summaryview.c:2110
+#: src/headerview.c:180 src/query_search.c:637 src/summaryview.c:2127
 msgid "(No From)"
 msgstr "(Bez Od)"
 
@@ -2585,7 +2596,7 @@ msgstr "Importuj plik LDIF do książki adresowej"
 msgid "Prev"
 msgstr "Poprzednia"
 
-#: src/importldif.c:768 src/mainwindow.c:2420
+#: src/importldif.c:768 src/mainwindow.c:2431
 msgid "Next"
 msgstr "Następna"
 
@@ -2929,650 +2940,655 @@ msgstr ""
 msgid "another Sylpheed is already running.\n"
 msgstr "Jest już uruchomiona kopia programu Sylpheed.\n"
 
-#: src/main.c:1064
+#: src/main.c:1083
 msgid "Migration of configuration"
 msgstr "Migracja ustawień"
 
-#: src/main.c:1065
+#: src/main.c:1084
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
 msgstr ""
 
-#: src/mainwindow.c:478
+#: src/mainwindow.c:481
 msgid "/_File/_Folder"
 msgstr "/_Plik/_Katalog"
 
-#: src/mainwindow.c:479
+#: src/mainwindow.c:482
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/_Plik/_Katalog/Utwórz _nowy katalog..."
 
-#: src/mainwindow.c:481
+#: src/mainwindow.c:484
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/_Plik/_Katalog/_Zmień nazwę katalo_gu..."
 
-#: src/mainwindow.c:482
+#: src/mainwindow.c:485
 #, fuzzy
 msgid "/_File/_Folder/_Move folder..."
 msgstr "/_Plik/_Katalog/_Zmień nazwę katalo_gu..."
 
-#: src/mainwindow.c:483
+#: src/mainwindow.c:486
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/_Plik/_Katalog/_Usuń kata_log"
 
-#: src/mainwindow.c:484
+#: src/mainwindow.c:487
 msgid "/_File/_Mailbox"
 msgstr "/_Plik/S_krzynka"
 
-#: src/mainwindow.c:485
+#: src/mainwindow.c:488
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/_Plik/S_krzynka/Dod_aj skrzynkę..."
 
-#: src/mainwindow.c:486
+#: src/mainwindow.c:489
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/Usuń _skrzynkę"
 
-#: src/mainwindow.c:487 src/mainwindow.c:492
+#: src/mainwindow.c:490 src/mainwindow.c:495
 msgid "/_File/_Mailbox/---"
 msgstr "/_Plik/S_krzynka/---"
 
-#: src/mainwindow.c:488
+#: src/mainwindow.c:491
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "/_Plik/S_krzynka/Sprawdź nowe wiadomoś_ci"
 
-#: src/mainwindow.c:490
+#: src/mainwindow.c:493
 msgid "/_File/_Mailbox/Check for new messages in _all mailboxes"
 msgstr "/_Plik/S_krzynka/Sprawdź wiadomoś_ci we wszystkich skrzynkach"
 
-#: src/mainwindow.c:493
+#: src/mainwindow.c:496
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "/_Plik/S_krzynka/Odbuduj drz_ewo katalogów"
 
-#: src/mainwindow.c:496
+#: src/mainwindow.c:499
 msgid "/_File/_Import mbox file..."
 msgstr "/_Plik/_Importuj plik mbox..."
 
-#: src/mainwindow.c:497
+#: src/mainwindow.c:500
 msgid "/_File/_Export to mbox file..."
 msgstr "/_Plik/_Eksportuj do pliku mbox..."
 
-#: src/mainwindow.c:499
+#: src/mainwindow.c:502
 msgid "/_File/Empty all _trash"
 msgstr "/_Plik/Opróżnij śmie_tnik"
 
-#: src/mainwindow.c:501 src/messageview.c:139
+#: src/mainwindow.c:504 src/messageview.c:139
 msgid "/_File/_Save as..."
 msgstr "/_Plik/Zapi_sz jako..."
 
-#: src/mainwindow.c:502 src/messageview.c:140
+#: src/mainwindow.c:505 src/messageview.c:140
 msgid "/_File/_Print..."
 msgstr "/_Plik/_Drukuj..."
 
-#: src/mainwindow.c:504
+#: src/mainwindow.c:507
 msgid "/_File/_Work offline"
 msgstr "/_Plik/Praca _offline"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:507
+#: src/mainwindow.c:510
 msgid "/_File/E_xit"
 msgstr "/_Plik/_Koniec"
 
-#: src/mainwindow.c:512
+#: src/mainwindow.c:515
 msgid "/_Edit/Select _thread"
 msgstr "/_Edycja/Wybierz wą_tek"
 
-#: src/mainwindow.c:514 src/messageview.c:148
+#: src/mainwindow.c:517 src/messageview.c:148
 msgid "/_Edit/_Find in current message..."
 msgstr "/_Edycja/Zna_jdź w bieżącej wiadomości..."
 
-#: src/mainwindow.c:516
+#: src/mainwindow.c:519
 msgid "/_Edit/_Search messages..."
 msgstr "/_Edycja/Wy_szukaj wiadomości..."
 
-#: src/mainwindow.c:519
+#: src/mainwindow.c:522
 msgid "/_View/Show or hi_de"
 msgstr "/_Widok/Wyświetl lub _ukryj"
 
-#: src/mainwindow.c:520
+#: src/mainwindow.c:523
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/_Widok/Wyświetl lub _ukryj/_Drzewo katalogów"
 
-#: src/mainwindow.c:522
+#: src/mainwindow.c:525
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/_Widok/Wyświetl lub _ukryj/Widok wiado_mości"
 
-#: src/mainwindow.c:524
+#: src/mainwindow.c:527
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/_Widok/Wyświetl lub _ukryj/_Pasek narzędzi"
 
-#: src/mainwindow.c:526
+#: src/mainwindow.c:529
 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:528
+#: src/mainwindow.c:531
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/_Widok/Wyświetl lub _ukryj/_Pasek narzędzi/_Ikony"
 
-#: src/mainwindow.c:530
+#: src/mainwindow.c:533
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/_Widok/Wyświetl lub _ukryj/_Pasek narzędzi/_Tekst"
 
-#: src/mainwindow.c:532
+#: src/mainwindow.c:535
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/_Widok/Wyświetl lub _ukryj/_Pasek narzędzi/Żade_n"
 
-#: src/mainwindow.c:534
+#: src/mainwindow.c:537
 #, fuzzy
 msgid "/_View/Show or hi_de/_Search bar"
 msgstr "/_Widok/Wyświetl lub _ukryj/Pa_sek stanu"
 
-#: src/mainwindow.c:536
+#: src/mainwindow.c:539
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/_Widok/Wyświetl lub _ukryj/Pa_sek stanu"
 
-#: src/mainwindow.c:539
+#: src/mainwindow.c:542
 msgid "/_View/Separate f_older tree"
 msgstr "/_Widok/_Oddzielne drzewo katalogów"
 
-#: src/mainwindow.c:540
+#: src/mainwindow.c:543
 msgid "/_View/Separate _message view"
 msgstr "/_Widok/Oddzielny widok wiado_mości"
 
-#: src/mainwindow.c:542
+#: src/mainwindow.c:545
 msgid "/_View/_Sort"
 msgstr "/_Widok/_Sortuj"
 
-#: src/mainwindow.c:543
+#: src/mainwindow.c:546
 msgid "/_View/_Sort/by _number"
 msgstr "/_Widok/_Sortuj/wg _numeru"
 
-#: src/mainwindow.c:544
+#: src/mainwindow.c:547
 msgid "/_View/_Sort/by s_ize"
 msgstr "/_Widok/_Sortuj/wg w_ielkości"
 
-#: src/mainwindow.c:545
+#: src/mainwindow.c:548
 msgid "/_View/_Sort/by _date"
 msgstr "/_Widok/_Sortuj/wg _daty"
 
-#: src/mainwindow.c:546
+#: src/mainwindow.c:549
 #, fuzzy
 msgid "/_View/_Sort/by t_hread date"
 msgstr "/_Widok/_Sortuj/wg _daty"
 
-#: src/mainwindow.c:547
+#: src/mainwindow.c:550
 msgid "/_View/_Sort/by _from"
 msgstr "/_Widok/_Sortuj/wg pola _od"
 
-#: src/mainwindow.c:548
+#: src/mainwindow.c:551
 msgid "/_View/_Sort/by _recipient"
 msgstr "/_Widok/_Sortuj/wg odbio_rcy"
 
-#: src/mainwindow.c:549
+#: src/mainwindow.c:552
 msgid "/_View/_Sort/by _subject"
 msgstr "/_Widok/_Sortuj/wg _tematu"
 
-#: src/mainwindow.c:550
+#: src/mainwindow.c:553
 msgid "/_View/_Sort/by _color label"
 msgstr "/_Widok/_Sortuj/wg _kolorów etykiet"
 
-#: src/mainwindow.c:552
+#: src/mainwindow.c:555
 msgid "/_View/_Sort/by _mark"
 msgstr "/_Widok/_Sortuj/wg _zaznaczeń"
 
-#: src/mainwindow.c:553
+#: src/mainwindow.c:556
 msgid "/_View/_Sort/by _unread"
 msgstr "/_Widok/_Sortuj/wg _nieprzeczytanych"
 
-#: src/mainwindow.c:554
+#: src/mainwindow.c:557
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/_Widok/_Sortuj/wg z_ałączników"
 
-#: src/mainwindow.c:556
+#: src/mainwindow.c:559
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/_Widok/_Sortuj/Nie s_ortuj"
 
-#: src/mainwindow.c:557 src/mainwindow.c:560
+#: src/mainwindow.c:560 src/mainwindow.c:563
 msgid "/_View/_Sort/---"
 msgstr "/_Widok/_Sortuj/---"
 
-#: src/mainwindow.c:558
+#: src/mainwindow.c:561
 msgid "/_View/_Sort/Ascending"
 msgstr "/_Widok/_Sortuj/Rosnąco"
 
-#: src/mainwindow.c:559
+#: src/mainwindow.c:562
 msgid "/_View/_Sort/Descending"
 msgstr "/_Widok/_Sortuj/Malejąco"
 
-#: src/mainwindow.c:561
+#: src/mainwindow.c:564
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/_Widok/_Sortuj/_Grupuj wg tematu"
 
-#: src/mainwindow.c:563
+#: src/mainwindow.c:566
 msgid "/_View/Th_read view"
 msgstr "/_Widok/Widok wą_tków"
 
-#: src/mainwindow.c:564
+#: src/mainwindow.c:567
 msgid "/_View/E_xpand all threads"
 msgstr "/_Widok/_Rozwiń wszystkie wątki"
 
-#: src/mainwindow.c:565
+#: src/mainwindow.c:568
 msgid "/_View/Co_llapse all threads"
 msgstr "/_Widok/_Zwiń wszystkie wątki"
 
-#: src/mainwindow.c:566
+#: src/mainwindow.c:569
 msgid "/_View/Set display _item..."
 msgstr "/_Widok/Ustaw wyświetlane _elementy..."
 
-#: src/mainwindow.c:569
+#: src/mainwindow.c:572
 msgid "/_View/_Go to"
 msgstr "/_Widok/_Idź do"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:573
 msgid "/_View/_Go to/_Prev message"
 msgstr "/_Widok/_Idź do/_Poprzednia wiadomość"
 
-#: src/mainwindow.c:571
+#: src/mainwindow.c:574
 msgid "/_View/_Go to/_Next message"
 msgstr "/_Widok/_Idź do/_Następna wiadomość"
 
-#: src/mainwindow.c:572 src/mainwindow.c:577 src/mainwindow.c:580
-#: src/mainwindow.c:585 src/mainwindow.c:590
+#: src/mainwindow.c:575 src/mainwindow.c:580 src/mainwindow.c:583
+#: src/mainwindow.c:588 src/mainwindow.c:593
 msgid "/_View/_Go to/---"
 msgstr "/_Widok/_Idź do/---"
 
-#: src/mainwindow.c:573
+#: src/mainwindow.c:576
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/_Widok/_Idź do/Poprzednia niep_rzeczytana wiadomość"
 
-#: src/mainwindow.c:575
+#: src/mainwindow.c:578
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/_Widok/_Idź do/Następna ni_eprzeczytana wiadomość"
 
-#: src/mainwindow.c:578
+#: src/mainwindow.c:581
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/_Widok/_Idź do/_Poprzednia wiadomość"
 
-#: src/mainwindow.c:579
+#: src/mainwindow.c:582
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/_Widok/_Idź do/_Następna nowa wiadomość"
 
-#: src/mainwindow.c:581
+#: src/mainwindow.c:584
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/_Widok/_Idź do/Poprzednia zaznaczona wiado_mość"
 
-#: src/mainwindow.c:583
+#: src/mainwindow.c:586
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/_Widok/_Idź do/Następna z_aznaczona wiadomość"
 
-#: src/mainwindow.c:586
+#: src/mainwindow.c:589
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/_Widok/_Idź do/_Poprzednia etykietowana wiadomość"
 
-#: src/mainwindow.c:588
+#: src/mainwindow.c:591
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/_Widok/_Idź do/_Następna etykietowana wiadomość"
 
-#: src/mainwindow.c:591
+#: src/mainwindow.c:594
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Widok/Idź do inne_go katalogu..."
 
-#: src/mainwindow.c:600 src/messageview.c:159
+#: src/mainwindow.c:603 src/messageview.c:159
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Widok/Kodowani_e znaków/_Automatyczne"
 
-#: src/mainwindow.c:613 src/messageview.c:172
+#: src/mainwindow.c:616 src/messageview.c:172
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr "/_Widok/Kodowani_e znaków/Europa Zachodnia (ISO-8859-15)"
 
-#: src/mainwindow.c:653 src/messageview.c:205
+#: src/mainwindow.c:662 src/messageview.c:210
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Widok/Kodowani_e znaków/Japońskie (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:655 src/messageview.c:207
+#: src/mainwindow.c:664 src/messageview.c:212
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Widok/Kodowani_e znaków/Japońskie (_EUC-JP)"
 
-#: src/mainwindow.c:657 src/messageview.c:209
+#: src/mainwindow.c:666 src/messageview.c:214
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Widok/Kodowani_e znaków/Japońskie (_Shift__JIS)"
 
-#: src/mainwindow.c:667 src/messageview.c:218
+#: src/mainwindow.c:676 src/messageview.c:223
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Widok/Kodowani_e znaków/Tradycyjne Chińskie (EUC-_TW)"
 
-#: src/mainwindow.c:669 src/messageview.c:220
+#: src/mainwindow.c:678 src/messageview.c:225
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Widok/Kodowani_e znaków/Chińskie (ISO-2022-_CN)"
 
-#: src/mainwindow.c:675 src/messageview.c:225
+#: src/mainwindow.c:684 src/messageview.c:230
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Widok/Kodowani_e znaków/Koreańskie (ISO-2022-KR)"
 
-#: src/mainwindow.c:688 src/summaryview.c:449
+#: src/mainwindow.c:697 src/summaryview.c:451
 msgid "/_View/Open in new _window"
 msgstr "/W_Widok/Ot_wórz w nowym oknie"
 
-#: src/mainwindow.c:689 src/messageview.c:237
+#: src/mainwindow.c:698 src/messageview.c:242
 msgid "/_View/Mess_age source"
 msgstr "/_Widok/P_okaż źródło"
 
-#: src/mainwindow.c:690 src/messageview.c:238
+#: src/mainwindow.c:699 src/messageview.c:243
 msgid "/_View/Show all _header"
 msgstr "/_Widok/Pokaż wszystkie na_główki"
 
-#: src/mainwindow.c:692
+#: src/mainwindow.c:701
 msgid "/_View/_Update summary"
 msgstr "/_Widok/_Odśwież podsumowanie"
 
-#: src/mainwindow.c:694 src/messageview.c:240
+#: src/mainwindow.c:703 src/messageview.c:245
 msgid "/_Message"
 msgstr "/_Wiadomość"
 
-#: src/mainwindow.c:695
+#: src/mainwindow.c:704
 msgid "/_Message/Recei_ve"
 msgstr "/Wiado_mość/Odbier_z"
 
-#: src/mainwindow.c:696
+#: src/mainwindow.c:705
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/Wiado_mość/Odbier_z/Pobierz z bieżą_cego konta"
 
-#: src/mainwindow.c:698
+#: src/mainwindow.c:707
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/Wiado_mość/Odbier_z/Pobierz ze _wszystkich kont"
 
-#: src/mainwindow.c:700
+#: src/mainwindow.c:709
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/_Wiadomość/Odbier_z/Anuluj pob_ieranie"
 
-#: src/mainwindow.c:702
+#: src/mainwindow.c:711
 msgid "/_Message/Recei_ve/---"
 msgstr "/Wiado_mość/Odbier_z/---"
 
-#: src/mainwindow.c:703
+#: src/mainwindow.c:712
 msgid "/_Message/_Send queued messages"
 msgstr "/Wiado_mość/Wyślij wia_domości z kolejki"
 
-#: src/mainwindow.c:704 src/mainwindow.c:706 src/mainwindow.c:713
-#: src/mainwindow.c:718 src/mainwindow.c:721 src/mainwindow.c:730
-#: src/mainwindow.c:732 src/mainwindow.c:735 src/messageview.c:243
-#: src/messageview.c:251 src/messageview.c:256
+#: src/mainwindow.c:713 src/mainwindow.c:715 src/mainwindow.c:722
+#: src/mainwindow.c:727 src/mainwindow.c:730 src/mainwindow.c:741
+#: src/mainwindow.c:743 src/mainwindow.c:746 src/messageview.c:248
+#: src/messageview.c:256 src/messageview.c:261
 msgid "/_Message/---"
 msgstr "/_Wiadomość/---"
 
-#: src/mainwindow.c:705 src/messageview.c:241
+#: src/mainwindow.c:714 src/messageview.c:246
 msgid "/_Message/Compose _new message"
 msgstr "/Wiado_mość/Twórz _nową wiadomość"
 
-#: src/mainwindow.c:707 src/messageview.c:244
+#: src/mainwindow.c:716 src/messageview.c:249
 msgid "/_Message/_Reply"
 msgstr "/Wiado_mość/_Odpowiedz"
 
-#: src/mainwindow.c:708
+#: src/mainwindow.c:717
 msgid "/_Message/Repl_y to"
 msgstr "/Wiado_mość/Odpowied_z"
 
-#: src/mainwindow.c:709 src/messageview.c:245
+#: src/mainwindow.c:718 src/messageview.c:250
 msgid "/_Message/Repl_y to/_all"
 msgstr "/Wiado_mość/Odpowied_z/w_szystkim"
 
-#: src/mainwindow.c:710 src/messageview.c:247
+#: src/mainwindow.c:719 src/messageview.c:252
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/Wiado_mość/Odpowied_z/nadawc_y"
 
-#: src/mainwindow.c:711 src/messageview.c:249
+#: src/mainwindow.c:720 src/messageview.c:254
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/Wiado_mość/Odpowiedz/_liście dyskusyjnej"
 
-#: src/mainwindow.c:714 src/messageview.c:252
+#: src/mainwindow.c:723 src/messageview.c:257
 msgid "/_Message/_Forward"
 msgstr "/Wiado_mość/Przekaż da_lej"
 
-#: src/mainwindow.c:715 src/messageview.c:253
+#: src/mainwindow.c:724 src/messageview.c:258
 msgid "/_Message/For_ward as attachment"
 msgstr "/Wiado_mość/Przekaż j_ako załącznik"
 
-#: src/mainwindow.c:717 src/messageview.c:255
+#: src/mainwindow.c:726 src/messageview.c:260
 msgid "/_Message/Redirec_t"
 msgstr "/Wiado_mość/Prze_kieruj"
 
-#: src/mainwindow.c:719
+#: src/mainwindow.c:728
 msgid "/_Message/M_ove..."
 msgstr "/Wiado_mość/_Przesuń..."
 
-#: src/mainwindow.c:720
+#: src/mainwindow.c:729
 msgid "/_Message/_Copy..."
 msgstr "/Wiado_mość/_Kopiuj"
 
-#: src/mainwindow.c:722
+#: src/mainwindow.c:731
 msgid "/_Message/_Mark"
 msgstr "/Wiado_mość/_Zaznacz"
 
-#: src/mainwindow.c:723
+#: src/mainwindow.c:732
 msgid "/_Message/_Mark/_Mark"
 msgstr "/Wiado_mość/_Zaznacz/_Zaznacz"
 
-#: src/mainwindow.c:724
+#: src/mainwindow.c:733
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/Wiado_mość/_Zaznacz/_Odznacz"
 
-#: src/mainwindow.c:725
+#: src/mainwindow.c:734
 msgid "/_Message/_Mark/---"
 msgstr "/Wiado_mość/_Zaznacz/---"
 
-#: src/mainwindow.c:726
+#: src/mainwindow.c:735
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/Wiado_mość/_Zaznacz/Zaznacz jako ni_eprzeczytane"
 
-#: src/mainwindow.c:727
+#: src/mainwindow.c:736
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/Wiado_mość/_Zaznacz/Zaznacz jako przecz_ytane"
 
-#: src/mainwindow.c:729
+#: src/mainwindow.c:738
+#, fuzzy
+msgid "/_Message/_Mark/Mark _thread as read"
+msgstr "/Wiado_mość/_Zaznacz/Zaznacz jako przecz_ytane"
+
+#: src/mainwindow.c:740
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/Wiado_mość/_Zaznacz/Zaznacz wszystkie jako przecz_ytane"
 
-#: src/mainwindow.c:731
+#: src/mainwindow.c:742
 msgid "/_Message/_Delete"
 msgstr "/Wiado_mość/_Usuń"
 
-#: src/mainwindow.c:733
+#: src/mainwindow.c:744
 #, fuzzy
 msgid "/_Message/Set as _junk mail"
 msgstr "/Wiado_mość/_Zaznacz/_Odznacz"
 
-#: src/mainwindow.c:734
+#: src/mainwindow.c:745
 msgid "/_Message/Set as not j_unk mail"
 msgstr ""
 
-#: src/mainwindow.c:736 src/messageview.c:257
+#: src/mainwindow.c:747 src/messageview.c:262
 msgid "/_Message/Re-_edit"
 msgstr "/Wiado_mość/Prz_eedytuj"
 
-#: src/mainwindow.c:740
+#: src/mainwindow.c:751
 #, fuzzy
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/_Narzędzia/Dodaj nadawcę do _książki adresowej"
 
-#: src/mainwindow.c:743
+#: src/mainwindow.c:754
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/_Narzędzia/_Filtruj wiadomości w katalogu"
 
-#: src/mainwindow.c:745
+#: src/mainwindow.c:756
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Narzędzia/Filtruj zaznaczonne wiadomości"
 
-#: src/mainwindow.c:747 src/messageview.c:264
+#: src/mainwindow.c:758 src/messageview.c:269
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Narzędzia/_Utwórz regułę filtrowania"
 
-#: src/mainwindow.c:748 src/messageview.c:266
+#: src/mainwindow.c:759 src/messageview.c:271
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Narzędzia/_Utwórz regułę filtrowania/_Automatycznie"
 
-#: src/mainwindow.c:750 src/messageview.c:268
+#: src/mainwindow.c:761 src/messageview.c:273
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Narzędzia/_Utwórz regułę filtrowania/_Od"
 
-#: src/mainwindow.c:752 src/messageview.c:270
+#: src/mainwindow.c:763 src/messageview.c:275
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Narzędzia/_Utwórz regułę filtrowania/_Do"
 
-#: src/mainwindow.c:754 src/messageview.c:272
+#: src/mainwindow.c:765 src/messageview.c:277
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Narzędzia/_Utwórz regułę filtrowania/_Temat"
 
-#: src/mainwindow.c:757
+#: src/mainwindow.c:768
 #, fuzzy
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/_Narzędzia/_Filtruj wiadomości w katalogu"
 
-#: src/mainwindow.c:759
+#: src/mainwindow.c:770
 #, fuzzy
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/_Narzędzia/Filtruj zaznaczonne wiadomości"
 
-#: src/mainwindow.c:764
+#: src/mainwindow.c:775
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/Wiado_mość/Usuń z_duplikowane wiadomości"
 
-#: src/mainwindow.c:767
+#: src/mainwindow.c:778
 msgid "/_Tools/E_xecute"
 msgstr "/_Narzędzia/_Wykonaj"
 
-#: src/mainwindow.c:769
+#: src/mainwindow.c:780
 msgid "/_Tools/_Log window"
 msgstr "/_Narzędzia/Okno _logów"
 
-#: src/mainwindow.c:771
+#: src/mainwindow.c:782
 msgid "/_Configuration"
 msgstr "/Konfigura_cja"
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:783
 msgid "/_Configuration/_Common preferences..."
 msgstr "/Konfigura_cja/Preferen_cje..."
 
-#: src/mainwindow.c:774
+#: src/mainwindow.c:785
 msgid "/_Configuration/_Filter setting..."
 msgstr "/Konfigura_cja/Ustawienia _filtrowania"
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:787
 msgid "/_Configuration/_Template..."
 msgstr "/Konfigura_cja/_Szablon..."
 
-#: src/mainwindow.c:777
+#: src/mainwindow.c:788
 msgid "/_Configuration/_Actions..."
 msgstr "/Konfigura_cja/Poleceni_a..."
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:789
 msgid "/_Configuration/---"
 msgstr "/Konfigura_cja/---"
 
-#: src/mainwindow.c:779
+#: src/mainwindow.c:790
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/Konfigura_cja/_Preferencje bieżącego konta..."
 
-#: src/mainwindow.c:781
+#: src/mainwindow.c:792
 msgid "/_Configuration/Create _new account..."
 msgstr "/Konfigura_cja/Utwórz _nowe konto..."
 
-#: src/mainwindow.c:783
+#: src/mainwindow.c:794
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/Konfigura_cja/_Edytuj konta..."
 
-#: src/mainwindow.c:785
+#: src/mainwindow.c:796
 msgid "/_Configuration/C_hange current account"
 msgstr "/Konfigura_cja/Zmień bieżą_ce konto"
 
-#: src/mainwindow.c:789
+#: src/mainwindow.c:800
 msgid "/_Help/_Manual"
 msgstr "/_Pomoc/_Podręcznik"
 
-#: src/mainwindow.c:790
+#: src/mainwindow.c:801
 msgid "/_Help/_Manual/_English"
 msgstr "/_Pomoc/_Podręcznik/Angi_elski"
 
-#: src/mainwindow.c:791
+#: src/mainwindow.c:802
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/_Pomoc/_Podręcznik/_Japoński"
 
-#: src/mainwindow.c:792
+#: src/mainwindow.c:803
 msgid "/_Help/_FAQ"
 msgstr "/Pomo_c/_FAQ"
 
-#: src/mainwindow.c:793
+#: src/mainwindow.c:804
 msgid "/_Help/_FAQ/_English"
 msgstr "/_Pomoc/_FAQ/Angi_elskie"
 
-#: src/mainwindow.c:794
+#: src/mainwindow.c:805
 msgid "/_Help/_FAQ/_German"
 msgstr "/_Pomoc/_FAQ/_Niemieckie"
 
-#: src/mainwindow.c:795
+#: src/mainwindow.c:806
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/_Pomoc/_FAQ/Hi_szpańskie"
 
-#: src/mainwindow.c:796
+#: src/mainwindow.c:807
 msgid "/_Help/_FAQ/_French"
 msgstr "/_Pomoc/_FAQ/_Francuskie"
 
-#: src/mainwindow.c:797
+#: src/mainwindow.c:808
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/_Pomoc/_FAQ/_Włoskie"
 
-#: src/mainwindow.c:798
+#: src/mainwindow.c:809
 msgid "/_Help/---"
 msgstr "/_Pomoc/---"
 
-#: src/mainwindow.c:841
+#: src/mainwindow.c:852
 msgid "Creating main window...\n"
 msgstr "Tworzenie głównego okna...\n"
 
-#: src/mainwindow.c:1011
+#: src/mainwindow.c:1022
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Okno główne: błąd alokacji kolorów %d\n"
 
-#: src/mainwindow.c:1108 src/summaryview.c:2258 src/summaryview.c:2343
-#: src/summaryview.c:3739 src/summaryview.c:3868 src/summaryview.c:4226
+#: src/mainwindow.c:1119 src/summaryview.c:2275 src/summaryview.c:2360
+#: src/summaryview.c:3896 src/summaryview.c:4025 src/summaryview.c:4383
 msgid "done.\n"
 msgstr "gotowe.\n"
 
-#: src/mainwindow.c:1235 src/mainwindow.c:1276 src/mainwindow.c:1301
+#: src/mainwindow.c:1246 src/mainwindow.c:1287 src/mainwindow.c:1312
 msgid "Untitled"
 msgstr "Bez tytułu"
 
-#: src/mainwindow.c:1302
+#: src/mainwindow.c:1313
 msgid "none"
 msgstr "żaden"
 
-#: src/mainwindow.c:1355
+#: src/mainwindow.c:1366
 #, 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:1605
+#: src/mainwindow.c:1616
 msgid "Offline"
 msgstr "Offline"
 
-#: src/mainwindow.c:1606
+#: src/mainwindow.c:1617
 msgid "You are offline. Go online?"
 msgstr "Jesteś offline. Przejść do trybu online?"
 
-#: src/mainwindow.c:1623
+#: src/mainwindow.c:1634
 msgid "Empty all trash"
 msgstr "Opróżnij śmietnik"
 
-#: src/mainwindow.c:1624
+#: src/mainwindow.c:1635
 #, fuzzy
 msgid "Delete all messages in trash folders?"
 msgstr "Czy usunąć wszystkie wiadomości ze śmietnika?"
 
-#: src/mainwindow.c:1652
+#: src/mainwindow.c:1663
 msgid "Add mailbox"
 msgstr "Dodaj skrzynkę"
 
-#: src/mainwindow.c:1653
+#: src/mainwindow.c:1664
 #, fuzzy
 msgid ""
 "Specify the location of mailbox.\n"
@@ -3583,16 +3599,16 @@ msgstr ""
 "Jeśli zostanie podana istniejąca skrzynka, będzie ona\n"
 "automatycznie skanowana."
 
-#: src/mainwindow.c:1659 src/setup.c:49
+#: src/mainwindow.c:1670 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Skrzynka \"%s\" już istnieje."
 
-#: src/mainwindow.c:1664 src/setup.c:56
+#: src/mainwindow.c:1675 src/setup.c:56
 msgid "Mailbox"
 msgstr "Skrzynka"
 
-#: src/mainwindow.c:1670 src/setup.c:62
+#: src/mainwindow.c:1681 src/setup.c:62
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3602,146 +3618,146 @@ msgstr ""
 "Być może pliki już istnieją lub brak jest wystarczających uprawnień do "
 "zapisu w tym miejscu."
 
-#: src/mainwindow.c:2088
+#: src/mainwindow.c:2099
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Widok Katalogów"
 
-#: src/mainwindow.c:2107
+#: src/mainwindow.c:2118
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Widok Wiadomości"
 
-#: src/mainwindow.c:2259 src/summaryview.c:408
+#: src/mainwindow.c:2270 src/summaryview.c:408
 msgid "/_Reply"
 msgstr "/_Odpowiedz"
 
-#: src/mainwindow.c:2260
+#: src/mainwindow.c:2271
 msgid "/Reply to _all"
 msgstr "/Odpowiedz wszystkim"
 
-#: src/mainwindow.c:2261
+#: src/mainwindow.c:2272
 msgid "/Reply to _sender"
 msgstr "/Odpowiedz nadawcy"
 
-#: src/mainwindow.c:2262
+#: src/mainwindow.c:2273
 msgid "/Reply to mailing _list"
 msgstr "/Odpowiedz _liście dyskusyjnej"
 
-#: src/mainwindow.c:2267 src/summaryview.c:415
+#: src/mainwindow.c:2278 src/summaryview.c:415
 msgid "/_Forward"
 msgstr "/Prze_każ"
 
-#: src/mainwindow.c:2268 src/summaryview.c:416
+#: src/mainwindow.c:2279 src/summaryview.c:416
 msgid "/For_ward as attachment"
 msgstr "/Przekaż jako załącznik"
 
-#: src/mainwindow.c:2269 src/summaryview.c:417
+#: src/mainwindow.c:2280 src/summaryview.c:417
 msgid "/Redirec_t"
 msgstr "/Prze_kieruj"
 
-#: src/mainwindow.c:2305
+#: src/mainwindow.c:2316
 msgid "Get"
 msgstr "Odbierz"
 
-#: src/mainwindow.c:2306
+#: src/mainwindow.c:2317
 msgid "Incorporate new mail"
 msgstr "Odbierz nową pocztę"
 
-#: src/mainwindow.c:2313
+#: src/mainwindow.c:2324
 msgid "Get all"
 msgstr "Odbierz wsz."
 
-#: src/mainwindow.c:2314
+#: src/mainwindow.c:2325
 msgid "Incorporate new mail of all accounts"
 msgstr "Odbierz nową pocztę z wszystkich kont"
 
-#: src/mainwindow.c:2325
+#: src/mainwindow.c:2336
 msgid "Send queued message(s)"
 msgstr "Wyślij wiadomości z kolejki"
 
-#: src/mainwindow.c:2335 src/prefs_account_dialog.c:530
+#: src/mainwindow.c:2346 src/prefs_account_dialog.c:530
 #: src/prefs_common_dialog.c:663 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "Utwórz"
 
-#: src/mainwindow.c:2336
+#: src/mainwindow.c:2347
 msgid "Compose new message"
 msgstr "Utwórz nową wiadomość"
 
-#: src/mainwindow.c:2344 src/prefs_common_dialog.c:975
+#: src/mainwindow.c:2355 src/prefs_common_dialog.c:975
 msgid "Reply"
 msgstr "Odpowiedz"
 
-#: src/mainwindow.c:2345 src/mainwindow.c:2358
+#: src/mainwindow.c:2356 src/mainwindow.c:2369
 msgid "Reply to the message"
 msgstr "Odpowiedz na wiadomość"
 
-#: src/mainwindow.c:2362
+#: src/mainwindow.c:2373
 msgid "Reply all"
 msgstr "Odp. na wsz."
 
-#: src/mainwindow.c:2363
+#: src/mainwindow.c:2374
 msgid "Reply to all"
 msgstr "Odpowiedz na wszystkie"
 
-#: src/mainwindow.c:2371 src/prefs_filter_edit.c:672
+#: src/mainwindow.c:2382 src/prefs_filter_edit.c:672
 msgid "Forward"
 msgstr "Przekaż"
 
-#: src/mainwindow.c:2372 src/mainwindow.c:2385
+#: src/mainwindow.c:2383 src/mainwindow.c:2396
 msgid "Forward the message"
 msgstr "Przekaż wiadomość dalej"
 
-#: src/mainwindow.c:2392
+#: src/mainwindow.c:2403
 msgid "Delete the message"
 msgstr "Usuń wiadomość"
 
-#: src/mainwindow.c:2401
+#: src/mainwindow.c:2412
 #, fuzzy
 msgid "Set as junk mail"
 msgstr "Ustaw jako domyślne"
 
-#: src/mainwindow.c:2410
+#: src/mainwindow.c:2421
 msgid "Execute"
 msgstr "Wykonaj"
 
-#: src/mainwindow.c:2411
+#: src/mainwindow.c:2422
 msgid "Execute marked process"
 msgstr "Wykonaj zaznaczony proces"
 
-#: src/mainwindow.c:2421
+#: src/mainwindow.c:2432
 msgid "Next unread message"
 msgstr "Następna nieprzeczytana wiadomość"
 
-#: src/mainwindow.c:2433
+#: src/mainwindow.c:2444
 msgid "Prefs"
 msgstr "Preferencje"
 
-#: src/mainwindow.c:2434
+#: src/mainwindow.c:2445
 msgid "Common preferences"
 msgstr "Wspólne preferencje "
 
-#: src/mainwindow.c:2442 src/prefs_folder_item.c:289
+#: src/mainwindow.c:2453 src/prefs_folder_item.c:289
 #: src/prefs_folder_item.c:300 src/progressdialog.c:128
 msgid "Account"
 msgstr "Konto"
 
-#: src/mainwindow.c:2443
+#: src/mainwindow.c:2454
 msgid "Account setting"
 msgstr "Ustawienia konta"
 
-#: src/mainwindow.c:2615
+#: src/mainwindow.c:2626
 msgid "You are offline. Click the icon to go online."
 msgstr "Jesteś offline. Kliknij ikonę by przejść do trybu online."
 
-#: src/mainwindow.c:2626
+#: src/mainwindow.c:2637
 msgid "You are online. Click the icon to go offline."
 msgstr "Jesteś online. Kliknij ikonę, by przejść do trybu offline."
 
-#: src/mainwindow.c:2892
+#: src/mainwindow.c:2903
 msgid "Exit"
 msgstr "Koniec programu"
 
-#: src/mainwindow.c:2892
+#: src/mainwindow.c:2903
 msgid "Exit this program?"
 msgstr "Czy zakończyć program?"
 
@@ -3778,45 +3794,45 @@ msgstr "Osiągnięto koniec wiadomości; czy kontynuować od początku?"
 msgid "Search finished"
 msgstr "Przeszukiwanie zakończone"
 
-#: src/messageview.c:261
+#: src/messageview.c:266
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/_Narzędzia/Dodaj nadawcę do _książki adresowej"
 
-#: src/messageview.c:291
+#: src/messageview.c:296
 msgid "Creating message view...\n"
 msgstr "Tworzenie widoku wiadomości...\n"
 
-#: src/messageview.c:316
+#: src/messageview.c:321
 msgid "Text"
 msgstr "Tekst"
 
-#: src/messageview.c:321
+#: src/messageview.c:326
 msgid "Attachments"
 msgstr "Załączniki"
 
-#: src/messageview.c:371
+#: src/messageview.c:376
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:669 src/summaryview.c:3268
+#: src/messageview.c:674 src/summaryview.c:3425
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Nie można zapisać pliku \"%s\"."
 
-#: src/messageview.c:728 src/summaryview.c:3291
+#: src/messageview.c:733 src/summaryview.c:3448
 msgid "The message will be printed with the following command:"
 msgstr ""
 
-#: src/messageview.c:729 src/summaryview.c:3292
+#: src/messageview.c:734 src/summaryview.c:3449
 #, fuzzy
 msgid "(Default print command)"
 msgstr "Wynik polecenia"
 
-#: src/messageview.c:731 src/prefs_common_dialog.c:2304 src/summaryview.c:3294
+#: src/messageview.c:736 src/prefs_common_dialog.c:2304 src/summaryview.c:3451
 msgid "Print"
 msgstr "Drukuj"
 
-#: src/messageview.c:740 src/summaryview.c:3303
+#: src/messageview.c:745 src/summaryview.c:3460
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -4717,8 +4733,8 @@ msgstr "Wyświetlanie odbiorcy w kolumnie \"Od\" gdy użytkownik jest nadawcą"
 msgid "Expand threads"
 msgstr "Rozwijanie wątków"
 
-#: src/prefs_common_dialog.c:1413 src/prefs_common_dialog.c:2713
-#: src/prefs_common_dialog.c:2751
+#: src/prefs_common_dialog.c:1413 src/prefs_common_dialog.c:2716
+#: src/prefs_common_dialog.c:2754
 msgid "Date format"
 msgstr "Format daty"
 
@@ -5009,8 +5025,8 @@ msgstr "Polecenia zewnętrzne  (%s zostanie zastąpione nazwą pliku / URI)"
 msgid "Web browser"
 msgstr "Przeglądarka Web"
 
-#: src/prefs_common_dialog.c:2288 src/prefs_common_dialog.c:3775
-#: src/prefs_common_dialog.c:3796
+#: src/prefs_common_dialog.c:2288 src/prefs_common_dialog.c:3778
+#: src/prefs_common_dialog.c:3799
 #, fuzzy
 msgid "(Default browser)"
 msgstr "Domyślny inbox"
@@ -5085,214 +5101,224 @@ msgid "Greek (ISO-8859-7)"
 msgstr "Greckie (ISO-8859-7)"
 
 #: src/prefs_common_dialog.c:2495
+#, fuzzy
+msgid "Arabic (ISO-8859-6)"
+msgstr "Bałtyckie (ISO-8859-4)"
+
+#: src/prefs_common_dialog.c:2496
+#, fuzzy
+msgid "Arabic (Windows-1256)"
+msgstr "Cyrylica (Windows-1251)"
+
+#: src/prefs_common_dialog.c:2498
 msgid "Hebrew (ISO-8859-8)"
 msgstr "Hebrajskie (ISO-8859-8)"
 
-#: src/prefs_common_dialog.c:2496
+#: src/prefs_common_dialog.c:2499
 msgid "Hebrew (Windows-1255)"
 msgstr "Hebrajskie (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2498
+#: src/prefs_common_dialog.c:2501
 msgid "Turkish (ISO-8859-9)"
 msgstr "Tureckie (ISO-8859-9)"
 
-#: src/prefs_common_dialog.c:2500
+#: src/prefs_common_dialog.c:2503
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Cyrylica (ISO-8859-5)"
 
-#: src/prefs_common_dialog.c:2501
+#: src/prefs_common_dialog.c:2504
 msgid "Cyrillic (KOI8-R)"
 msgstr "Cyrylica (KOI8-R)"
 
-#: src/prefs_common_dialog.c:2502
+#: src/prefs_common_dialog.c:2505
 msgid "Cyrillic (KOI8-U)"
 msgstr "Cyrylica (KOI8-U)"
 
-#: src/prefs_common_dialog.c:2503
+#: src/prefs_common_dialog.c:2506
 msgid "Cyrillic (Windows-1251)"
 msgstr "Cyrylica (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2505
+#: src/prefs_common_dialog.c:2508
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Japońskie (ISO-2022-JP)"
 
-#: src/prefs_common_dialog.c:2507
+#: src/prefs_common_dialog.c:2510
 msgid "Japanese (EUC-JP)"
 msgstr "Japońskie (EUC-JP)"
 
-#: src/prefs_common_dialog.c:2508
+#: src/prefs_common_dialog.c:2511
 msgid "Japanese (Shift_JIS)"
 msgstr "Japońskie (Shift_JIS)"
 
-#: src/prefs_common_dialog.c:2511
+#: src/prefs_common_dialog.c:2514
 msgid "Simplified Chinese (GB2312)"
 msgstr "Uproszczone Chińskie (GB2312)"
 
-#: src/prefs_common_dialog.c:2512
+#: src/prefs_common_dialog.c:2515
 msgid "Simplified Chinese (GBK)"
 msgstr "Uproszczone Chińskie (GBK)"
 
-#: src/prefs_common_dialog.c:2513
+#: src/prefs_common_dialog.c:2516
 msgid "Traditional Chinese (Big5)"
 msgstr "Tradycyjne Chińskie (Big5)"
 
-#: src/prefs_common_dialog.c:2515
+#: src/prefs_common_dialog.c:2518
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Tradycyjne Chińskie (EUC-TW)"
 
-#: src/prefs_common_dialog.c:2516
+#: src/prefs_common_dialog.c:2519
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Chińskie (ISO-2022-CN)"
 
-#: src/prefs_common_dialog.c:2519
+#: src/prefs_common_dialog.c:2522
 msgid "Korean (EUC-KR)"
 msgstr "Koreańskie (EUC-KR)"
 
-#: src/prefs_common_dialog.c:2521
+#: src/prefs_common_dialog.c:2524
 msgid "Thai (TIS-620)"
 msgstr "Tajskie (TIS-620)"
 
-#: src/prefs_common_dialog.c:2522
+#: src/prefs_common_dialog.c:2525
 msgid "Thai (Windows-874)"
 msgstr "Tajskie (Windows-874)"
 
-#: src/prefs_common_dialog.c:2689
+#: src/prefs_common_dialog.c:2692
 msgid "the full abbreviated weekday name"
 msgstr "skrócona nazwa dnia tygodnia"
 
-#: src/prefs_common_dialog.c:2690
+#: src/prefs_common_dialog.c:2693
 msgid "the full weekday name"
 msgstr "pełna nazwa dnia tygodnia"
 
-#: src/prefs_common_dialog.c:2691
+#: src/prefs_common_dialog.c:2694
 msgid "the abbreviated month name"
 msgstr "skrócona nazwa miesiąca"
 
-#: src/prefs_common_dialog.c:2692
+#: src/prefs_common_dialog.c:2695
 msgid "the full month name"
 msgstr "pełna nazwa miesiąca"
 
-#: src/prefs_common_dialog.c:2693
+#: src/prefs_common_dialog.c:2696
 msgid "the preferred date and time for the current locale"
 msgstr "preferowana data i czas dla ustawień lokalnych"
 
-#: src/prefs_common_dialog.c:2694
+#: src/prefs_common_dialog.c:2697
 msgid "the century number (year/100)"
 msgstr "numer roku (rok/100)"
 
-#: src/prefs_common_dialog.c:2695
+#: src/prefs_common_dialog.c:2698
 msgid "the day of the month as a decimal number"
 msgstr "dzień miesiąca jako liczba dziesiętna"
 
-#: src/prefs_common_dialog.c:2696
+#: src/prefs_common_dialog.c:2699
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "godzina jako liczba dziesiętna z użyciem czasu 24-ro godzinnego"
 
-#: src/prefs_common_dialog.c:2697
+#: src/prefs_common_dialog.c:2700
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "godzina jako liczba dziesiętna z użyciem czasu 12-to godzinnego"
 
-#: src/prefs_common_dialog.c:2698
+#: src/prefs_common_dialog.c:2701
 msgid "the day of the year as a decimal number"
 msgstr "dzień roku jako liczba dziesiętna"
 
-#: src/prefs_common_dialog.c:2699
+#: src/prefs_common_dialog.c:2702
 msgid "the month as a decimal number"
 msgstr "miesiąc jako liczba dziesiętna"
 
-#: src/prefs_common_dialog.c:2700
+#: src/prefs_common_dialog.c:2703
 msgid "the minute as a decimal number"
 msgstr "minuta jako liczba dziesiętna"
 
-#: src/prefs_common_dialog.c:2701
+#: src/prefs_common_dialog.c:2704
 msgid "either AM or PM"
 msgstr "albo AM albo PM"
 
-#: src/prefs_common_dialog.c:2702
+#: src/prefs_common_dialog.c:2705
 msgid "the second as a decimal number"
 msgstr "sekunda jako liczba dziesiętna"
 
-#: src/prefs_common_dialog.c:2703
+#: src/prefs_common_dialog.c:2706
 msgid "the day of the week as a decimal number"
 msgstr "dzień tygodnia jako liczba dziesiętna"
 
-#: src/prefs_common_dialog.c:2704
+#: src/prefs_common_dialog.c:2707
 msgid "the preferred date for the current locale"
 msgstr "preferowana data dla ustawień lokalnych"
 
-#: src/prefs_common_dialog.c:2705
+#: src/prefs_common_dialog.c:2708
 msgid "the last two digits of a year"
 msgstr "ostatnie dwie cyfry roku"
 
-#: src/prefs_common_dialog.c:2706
+#: src/prefs_common_dialog.c:2709
 msgid "the year as a decimal number"
 msgstr "rok jako liczba dziesiętna"
 
-#: src/prefs_common_dialog.c:2707
+#: src/prefs_common_dialog.c:2710
 msgid "the time zone or name or abbreviation"
 msgstr "strefa czasowa jako nazwa lub skrót"
 
-#: src/prefs_common_dialog.c:2728
+#: src/prefs_common_dialog.c:2731
 msgid "Specifier"
 msgstr "Wyszczególniacz"
 
-#: src/prefs_common_dialog.c:2729
+#: src/prefs_common_dialog.c:2732
 msgid "Description"
 msgstr "Opis"
 
-#: src/prefs_common_dialog.c:2769
+#: src/prefs_common_dialog.c:2772
 msgid "Example"
 msgstr "Przykład"
 
-#: src/prefs_common_dialog.c:2850
+#: src/prefs_common_dialog.c:2853
 msgid "Set message colors"
 msgstr "Ustaw kolory wiadomości"
 
-#: src/prefs_common_dialog.c:2858
+#: src/prefs_common_dialog.c:2861
 msgid "Colors"
 msgstr "Kolory"
 
-#: src/prefs_common_dialog.c:2892
+#: src/prefs_common_dialog.c:2895
 msgid "Quoted Text - First Level"
 msgstr "Cytowany tekst - poziom pierwszy"
 
-#: src/prefs_common_dialog.c:2898
+#: src/prefs_common_dialog.c:2901
 msgid "Quoted Text - Second Level"
 msgstr "Cytowany tekst - poziom drugi"
 
-#: src/prefs_common_dialog.c:2904
+#: src/prefs_common_dialog.c:2907
 msgid "Quoted Text - Third Level"
 msgstr "Cytowany tekst - poziom trzeci"
 
-#: src/prefs_common_dialog.c:2910
+#: src/prefs_common_dialog.c:2913
 msgid "URI link"
 msgstr "Łącze URI"
 
-#: src/prefs_common_dialog.c:2917
+#: src/prefs_common_dialog.c:2920
 msgid "Recycle quote colors"
 msgstr "Powtarzanie kolorów cytowania"
 
-#: src/prefs_common_dialog.c:2984
+#: src/prefs_common_dialog.c:2987
 msgid "Pick color for quotation level 1"
 msgstr "Wybierz kolor dla pierwszego poziomu cytowania"
 
-#: src/prefs_common_dialog.c:2987
+#: src/prefs_common_dialog.c:2990
 msgid "Pick color for quotation level 2"
 msgstr "Wybierz kolor dla drugiego poziomu cytowania"
 
-#: src/prefs_common_dialog.c:2990
+#: src/prefs_common_dialog.c:2993
 msgid "Pick color for quotation level 3"
 msgstr "Wybierz kolor dla trzeciego poziomu cytowania"
 
-#: src/prefs_common_dialog.c:2993
+#: src/prefs_common_dialog.c:2996
 msgid "Pick color for URI"
 msgstr "Wybierz kolor dla URI"
 
-#: src/prefs_common_dialog.c:3133
+#: src/prefs_common_dialog.c:3136
 msgid "Description of symbols"
 msgstr "Opis symboli"
 
-#: src/prefs_common_dialog.c:3189
+#: src/prefs_common_dialog.c:3192
 msgid ""
 "Date\n"
 "From\n"
@@ -5316,11 +5342,11 @@ msgstr ""
 "Grupy news\n"
 "ID wiadomości"
 
-#: src/prefs_common_dialog.c:3202
+#: src/prefs_common_dialog.c:3205
 msgid "If x is set, displays expr"
 msgstr "Wyświetla expr jeśli ustawiono x"
 
-#: src/prefs_common_dialog.c:3206
+#: src/prefs_common_dialog.c:3209
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -5334,7 +5360,7 @@ msgstr ""
 "Ciało cytowanej wiadomości bez sygnatury\n"
 "Literalny %"
 
-#: src/prefs_common_dialog.c:3214
+#: src/prefs_common_dialog.c:3217
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -5346,20 +5372,20 @@ msgstr ""
 "Literalny nawias klamrowy otwierający\n"
 "Literalny nawias klamrowy zamykający"
 
-#: src/prefs_common_dialog.c:3260
+#: src/prefs_common_dialog.c:3263
 msgid "Key bindings"
 msgstr "Dowiązania klawiszy"
 
-#: src/prefs_common_dialog.c:3273
+#: src/prefs_common_dialog.c:3276
 #, fuzzy
 msgid "Select the preset of key bindings."
 msgstr " Ustaw dowiązania klawiszy... "
 
-#: src/prefs_common_dialog.c:3283 src/prefs_common_dialog.c:3607
+#: src/prefs_common_dialog.c:3286 src/prefs_common_dialog.c:3610
 msgid "Default"
 msgstr "Domyślny"
 
-#: src/prefs_common_dialog.c:3286 src/prefs_common_dialog.c:3616
+#: src/prefs_common_dialog.c:3289 src/prefs_common_dialog.c:3619
 msgid "Old Sylpheed"
 msgstr "Dawny Sylpheed"
 
@@ -5480,7 +5506,7 @@ msgstr "Wynik polecenia"
 msgid "Age"
 msgstr "Wiek"
 
-#: src/prefs_filter_edit.c:501 src/summaryview.c:510
+#: src/prefs_filter_edit.c:501 src/summaryview.c:512
 #, fuzzy
 msgid "Marked"
 msgstr "Zaznacz"
@@ -5714,17 +5740,17 @@ msgid "Attachment"
 msgstr "Załącznik"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73 src/query_search.c:371 src/summaryview.c:4733
+#: src/prefs_summary_column.c:73 src/query_search.c:371 src/summaryview.c:4890
 msgid "Subject"
 msgstr "Temat"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/query_search.c:372 src/summaryview.c:4736
+#: src/prefs_summary_column.c:74 src/query_search.c:372 src/summaryview.c:4893
 msgid "From"
 msgstr "Od"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/query_search.c:373 src/summaryview.c:4738
+#: src/prefs_summary_column.c:75 src/query_search.c:373 src/summaryview.c:4895
 msgid "Date"
 msgstr "Data"
 
@@ -5826,7 +5852,7 @@ msgstr "Wyszukaj wiadomości"
 msgid "_Save as search folder"
 msgstr "Zapisz w katalogu szablonów"
 
-#: src/query_search.c:512 src/subscribedialog.c:523 src/summaryview.c:840
+#: src/query_search.c:512 src/subscribedialog.c:523 src/summaryview.c:842
 msgid "Done."
 msgstr "Gotowe."
 
@@ -5840,7 +5866,7 @@ msgstr "Przeszukiwanie katalogu %s ..."
 msgid "Searching %s (%d / %d)..."
 msgstr "Filtowanie..."
 
-#: src/query_search.c:645 src/summaryview.c:2048
+#: src/query_search.c:645 src/summaryview.c:2051
 msgid "(No Date)"
 msgstr "(Bez daty)"
 
@@ -6210,324 +6236,329 @@ msgid "/_Mark/Mark as rea_d"
 msgstr "/_Zaznacz/Zaznacz jako prz_eczytane"
 
 #: src/summaryview.c:429
+#, fuzzy
+msgid "/_Mark/Mark _thread as read"
+msgstr "/_Zaznacz/Zaznacz jako prz_eczytane"
+
+#: src/summaryview.c:431
 msgid "/_Mark/Mark all _read"
 msgstr "/_Zaznacz/Zaznacz wszystkie jako prz_eczytane"
 
-#: src/summaryview.c:430
+#: src/summaryview.c:432
 msgid "/Color la_bel"
 msgstr "/Kolor etykiety"
 
-#: src/summaryview.c:434
+#: src/summaryview.c:436
 msgid "/Re-_edit"
 msgstr "/Prz_eedytuj"
 
-#: src/summaryview.c:436
+#: src/summaryview.c:438
 #, fuzzy
 msgid "/Add sender to address boo_k..."
 msgstr "/Dodaj nadawcę do _książki adresowej"
 
-#: src/summaryview.c:438
+#: src/summaryview.c:440
 #, fuzzy
 msgid "/Create f_ilter rule"
 msgstr "/_Narzędzia/_Utwórz regułę filtrowania"
 
-#: src/summaryview.c:439
+#: src/summaryview.c:441
 #, fuzzy
 msgid "/Create f_ilter rule/_Automatically"
 msgstr "/_Narzędzia/_Utwórz regułę filtrowania/_Automatycznie"
 
-#: src/summaryview.c:441
+#: src/summaryview.c:443
 #, fuzzy
 msgid "/Create f_ilter rule/by _From"
 msgstr "/_Narzędzia/_Utwórz regułę filtrowania/_Od"
 
-#: src/summaryview.c:443
+#: src/summaryview.c:445
 #, fuzzy
 msgid "/Create f_ilter rule/by _To"
 msgstr "/_Narzędzia/_Utwórz regułę filtrowania/_Do"
 
-#: src/summaryview.c:445
+#: src/summaryview.c:447
 #, fuzzy
 msgid "/Create f_ilter rule/by _Subject"
 msgstr "/_Narzędzia/_Utwórz regułę filtrowania/_Temat"
 
-#: src/summaryview.c:451
+#: src/summaryview.c:453
 msgid "/_View/_Source"
 msgstr "/_Widok/Źródł_o"
 
-#: src/summaryview.c:452
+#: src/summaryview.c:454
 msgid "/_View/All _header"
 msgstr "/_Widok/Wszystkie na_główki"
 
-#: src/summaryview.c:454
+#: src/summaryview.c:456
 msgid "/_Print..."
 msgstr "/_Drukuj..."
 
-#: src/summaryview.c:486
+#: src/summaryview.c:488
 msgid "Creating summary view...\n"
 msgstr "Tworzenie widoku podsumowania...\n"
 
-#: src/summaryview.c:508
+#: src/summaryview.c:510
 msgid "All"
 msgstr ""
 
-#: src/summaryview.c:511
+#: src/summaryview.c:513
 #, fuzzy
 msgid "Have color label"
 msgstr "/Kolor etykiety"
 
-#: src/summaryview.c:512
+#: src/summaryview.c:514
 #, fuzzy
 msgid "Have attachment"
 msgstr "Załącznik"
 
-#: src/summaryview.c:521
+#: src/summaryview.c:523
 #, fuzzy
 msgid "Search:"
 msgstr " Szukaj "
 
-#: src/summaryview.c:535
+#: src/summaryview.c:537
 msgid "Search for Subject or From"
 msgstr ""
 
-#: src/summaryview.c:702
+#: src/summaryview.c:704
 msgid "Process mark"
 msgstr "Znacznik procesu"
 
-#: src/summaryview.c:703
+#: src/summaryview.c:705
 msgid "Some marks are left. Process it?"
 msgstr "brak niektórych znaczników, czy wykonać ?"
 
-#: src/summaryview.c:749
+#: src/summaryview.c:751
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "Skanowanie katalogu (%s)..."
 
-#: src/summaryview.c:1292
+#: src/summaryview.c:1295
 #, fuzzy
 msgid "_Search again"
 msgstr "Szukaj ponownie"
 
-#: src/summaryview.c:1313 src/summaryview.c:1322
+#: src/summaryview.c:1316 src/summaryview.c:1325
 msgid "No more unread messages"
 msgstr "Nie ma więcej nieprzeczytanych wiadomości"
 
-#: src/summaryview.c:1314
+#: src/summaryview.c:1317
 msgid "No unread message found. Search from the end?"
 msgstr ""
 "Nie znaleziono nieprzeczytanych wiadomości.\n"
 "Czy rozpocząć wyszukiwanie od końca?"
 
-#: src/summaryview.c:1316
+#: src/summaryview.c:1319
 msgid "No unread messages."
 msgstr "Brak nieprzeczytanych wiadomości."
 
-#: src/summaryview.c:1323
+#: src/summaryview.c:1326
 msgid "No unread message found. Go to next folder?"
 msgstr ""
 "Nie znaleziono nieprzeczytanych wiadomości.\n"
 "Czy przejść do następnego folderu?"
 
-#: src/summaryview.c:1331 src/summaryview.c:1340
+#: src/summaryview.c:1334 src/summaryview.c:1343
 msgid "No more new messages"
 msgstr "Nie ma więcej nowych wiadomości"
 
-#: src/summaryview.c:1332
+#: src/summaryview.c:1335
 msgid "No new message found. Search from the end?"
 msgstr ""
 "Nie znaleziono nowych wiadomości.\n"
 "Czy rozpocząć wyszukiwanie od końca?"
 
-#: src/summaryview.c:1334
+#: src/summaryview.c:1337
 msgid "No new messages."
 msgstr "Brak nowych wiadomości"
 
-#: src/summaryview.c:1341
+#: src/summaryview.c:1344
 msgid "No new message found. Go to next folder?"
 msgstr ""
 "Nie znaleziono nowych wiadomości.\n"
 "Czy przejść do następnego folderu?"
 
-#: src/summaryview.c:1349 src/summaryview.c:1358
+#: src/summaryview.c:1352 src/summaryview.c:1361
 msgid "No more marked messages"
 msgstr "Nie ma więcej zaznaczonych wiadomości"
 
-#: src/summaryview.c:1350
+#: src/summaryview.c:1353
 msgid "No marked message found. Search from the end?"
 msgstr ""
 "Nie znaleziono zaznaczonych wiadomości.\n"
 "Czy rozpoczać wyszukiwanie od końca?"
 
-#: src/summaryview.c:1352 src/summaryview.c:1361
+#: src/summaryview.c:1355 src/summaryview.c:1364
 msgid "No marked messages."
 msgstr "Brak zaznaczonych wiadomości"
 
-#: src/summaryview.c:1359
+#: src/summaryview.c:1362
 msgid "No marked message found. Search from the beginning?"
 msgstr ""
 "Nie znaleziono zaznaczonych wiadomości.\n"
 "Czy rozpocząć wyszukiwanie od początku?"
 
-#: src/summaryview.c:1367 src/summaryview.c:1376
+#: src/summaryview.c:1370 src/summaryview.c:1379
 msgid "No more labeled messages"
 msgstr "Nie ma więcej etykietowanych wiadomości"
 
-#: src/summaryview.c:1368
+#: src/summaryview.c:1371
 msgid "No labeled message found. Search from the end?"
 msgstr ""
 "Nie znaleziono etykietowanych wiadomości.\n"
 "Czy rozpocząć wyszukiwanie od końca?"
 
-#: src/summaryview.c:1370 src/summaryview.c:1379
+#: src/summaryview.c:1373 src/summaryview.c:1382
 msgid "No labeled messages."
 msgstr "Brak etykietowanych wiadomości."
 
-#: src/summaryview.c:1377
+#: src/summaryview.c:1380
 msgid "No labeled message found. Search from the beginning?"
 msgstr ""
 "Nie znaleziono etykietowanych wiadomości.\n"
 "Czy rozpocząć wyszukiwanie od początku?"
 
-#: src/summaryview.c:1693
+#: src/summaryview.c:1696
 msgid "Attracting messages by subject..."
 msgstr "Łączenie wiadomości wg tematu..."
 
-#: src/summaryview.c:1887
+#: src/summaryview.c:1890
 #, c-format
 msgid "%d deleted"
 msgstr "%d usunięto"
 
-#: src/summaryview.c:1891
+#: src/summaryview.c:1894
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d przeniesiono"
 
-#: src/summaryview.c:1892 src/summaryview.c:1897
+#: src/summaryview.c:1895 src/summaryview.c:1900
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:1896
+#: src/summaryview.c:1899
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d skopiowano"
 
-#: src/summaryview.c:1911
+#: src/summaryview.c:1914
 msgid " item(s) selected"
 msgstr " element(ów) wybrany(o)"
 
-#: src/summaryview.c:1933
+#: src/summaryview.c:1936
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d nowych, %d nieprzeczytanych, razem %d (%s)"
 
-#: src/summaryview.c:1937
+#: src/summaryview.c:1940
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d nowych, %d nieprzeczytanych, %d razem"
 
-#: src/summaryview.c:1971
+#: src/summaryview.c:1974
 msgid "Sorting summary..."
 msgstr "Sortowanie podsumowania..."
 
-#: src/summaryview.c:2194
+#: src/summaryview.c:2211
 msgid "\tSetting summary from message data..."
 msgstr "\tUstawianie podsumowania z danych wiadomości..."
 
-#: src/summaryview.c:2196
+#: src/summaryview.c:2213
 msgid "Setting summary from message data..."
 msgstr "Ustawianie podsumowania z danych wiadomości..."
 
-#: src/summaryview.c:2302
+#: src/summaryview.c:2319
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Zapisywanie cache podsumowania (%s)..."
 
-#: src/summaryview.c:2643
+#: src/summaryview.c:2660
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Wiadomość %d zaznaczona\n"
 
-#: src/summaryview.c:2701
+#: src/summaryview.c:2718
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Wiadomość %d zaznaczona jako przeczytana\n"
 
-#: src/summaryview.c:2789
+#: src/summaryview.c:2908
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Wiadomość %d zaznaczona jako nieprzeczytana\n"
 
-#: src/summaryview.c:2850
+#: src/summaryview.c:2969
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Wiadomość %s/%d ustawiona do usunięcia\n"
 
-#: src/summaryview.c:2878
+#: src/summaryview.c:2997
 msgid "Delete message(s)"
 msgstr "Usuń wiadomość"
 
-#: src/summaryview.c:2879
+#: src/summaryview.c:2998
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Czy naprawdę chcesz usunąć wiadomości z kosza?"
 
-#: src/summaryview.c:2953
+#: src/summaryview.c:3072
 msgid "Deleting duplicated messages..."
 msgstr "Kasowanie powielonych wiadomości..."
 
-#: src/summaryview.c:2991
+#: src/summaryview.c:3110
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Wiadomość %s/%d niezaznaczona\n"
 
-#: src/summaryview.c:3049
+#: src/summaryview.c:3168
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Wiadomość %d ustawiona do przesunięcia do %s\n"
 
-#: src/summaryview.c:3066
+#: src/summaryview.c:3196
 msgid "Destination is same as current folder."
 msgstr "Katalog docelowy taki sam jak bieżący."
 
-#: src/summaryview.c:3122
+#: src/summaryview.c:3260
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Wiadomość %d ustawiona do kopiowania do %s\n"
 
-#: src/summaryview.c:3139
+#: src/summaryview.c:3288
 msgid "Destination for copy is same as current folder."
 msgstr "Katalog docelowy kopiowania jest taki sam jak bieżący."
 
-#: src/summaryview.c:3338
+#: src/summaryview.c:3495
 msgid "Error occurred while processing messages."
 msgstr "Błąd podczas przetwarzania wiadomości."
 
-#: src/summaryview.c:3646 src/summaryview.c:3647
+#: src/summaryview.c:3803 src/summaryview.c:3804
 msgid "Building threads..."
 msgstr "Tworzenie wątków..."
 
-#: src/summaryview.c:3797 src/summaryview.c:3798
+#: src/summaryview.c:3954 src/summaryview.c:3955
 msgid "Unthreading..."
 msgstr "Odwątkowanie .."
 
-#: src/summaryview.c:4091 src/summaryview.c:4147
+#: src/summaryview.c:4248 src/summaryview.c:4304
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtowanie..."
 
-#: src/summaryview.c:4196
+#: src/summaryview.c:4353
 msgid "filtering..."
 msgstr "filtrowanie..."
 
-#: src/summaryview.c:4197
+#: src/summaryview.c:4354
 msgid "Filtering..."
 msgstr "Filtowanie..."
 
-#: src/summaryview.c:4233
+#: src/summaryview.c:4390
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "%d wiadomość(i) przefiltrowano."
 
-#: src/summaryview.c:4742
+#: src/summaryview.c:4899
 msgid "No."
 msgstr "Nr"
 
@@ -6544,35 +6575,35 @@ msgstr "Tworzenie widoku tekstowego...\n"
 msgid "This message can't be displayed.\n"
 msgstr "Ta wiadomość nie może zostać wyświetlona.\n"
 
-#: src/textview.c:1929
+#: src/textview.c:1925
 msgid "Sa_ve this image as..."
 msgstr "Zapi_sz grafikę jako..."
 
-#: src/textview.c:1945 src/trayicon.c:109
+#: src/textview.c:1941 src/trayicon.c:109
 #, fuzzy
 msgid "Compose _new message"
 msgstr "Utwórz nową wiadomość"
 
-#: src/textview.c:1947
+#: src/textview.c:1943
 #, fuzzy
 msgid "Add to address _book..."
 msgstr "/Dodaj nadawcę do _książki adresowej"
 
-#: src/textview.c:1949
+#: src/textview.c:1945
 #, fuzzy
 msgid "Copy this add_ress"
 msgstr "Kopiuj ten _link"
 
-#: src/textview.c:1952
+#: src/textview.c:1948
 #, fuzzy
 msgid "_Open with Web browser"
 msgstr "Przeglądarka Web"
 
-#: src/textview.c:1954
+#: src/textview.c:1950
 msgid "Copy this _link"
 msgstr "Kopiuj ten _link"
 
-#: src/textview.c:2097
+#: src/textview.c:2093
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6581,7 +6612,7 @@ msgid ""
 "Open it anyway?"
 msgstr ""
 
-#: src/textview.c:2102
+#: src/textview.c:2098
 msgid "Fake URL warning"
 msgstr ""
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 3124698c..df9c147f 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: 2006-01-27 18:11+0900\n"
+"POT-Creation-Date: 2006-01-31 15:20+0900\n"
 "PO-Revision-Date: 2006-01-05 09:40-0300\n"
 "Last-Translator: Ricardo Nabinger Sanchez <rnsanchez@gmail.com>\n"
 "Language-Team: André Casteliano <digitalcoder@users.sourceforge.net> Isaías "
@@ -508,7 +508,7 @@ msgstr "Encontrado %s\n"
 msgid "Configuration is saved.\n"
 msgstr "Configuração salva.\n"
 
-#: libsylph/prefs_common.c:489
+#: libsylph/prefs_common.c:491
 msgid "Junk mail filter"
 msgstr "Filtro de spam"
 
@@ -623,8 +623,8 @@ msgstr "%.2fMB"
 msgid "%.2fGB"
 msgstr "%.2fGB"
 
-#: libsylph/utils.c:2373 src/compose.c:2858 src/compose.c:3121
-#: src/compose.c:3184 src/compose.c:3304
+#: libsylph/utils.c:2373 src/compose.c:2867 src/compose.c:3130
+#: src/compose.c:3193 src/compose.c:3313
 msgid "can't change file mode\n"
 msgstr "não foi possível modificar as permissões do arquivo\n"
 
@@ -709,8 +709,8 @@ msgstr ""
 "Mensagens novas serão baixadas nessa ordem. Marque as caixas\n"
 "na coluna `G' para habilitar essa caixa no `Baixar tudo'."
 
-#: src/account_dialog.c:366 src/addressadd.c:192 src/addressbook.c:491
-#: src/compose.c:4262 src/editaddress.c:200 src/editaddress.c:942
+#: src/account_dialog.c:366 src/addressadd.c:192 src/addressbook.c:493
+#: src/compose.c:4271 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:206 src/prefs_filter.c:259 src/prefs_folder_item.c:171
@@ -846,12 +846,12 @@ 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:4762 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4771 src/editaddress.c:201
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "Endereço"
 
-#: src/addressadd.c:212 src/addressbook.c:493 src/editaddress.c:202
+#: src/addressadd.c:212 src/addressbook.c:495 src/editaddress.c:202
 #: src/editaddress.c:795 src/editaddress.c:860 src/editgroup.c:267
 msgid "Remarks"
 msgstr "Notas"
@@ -860,183 +860,183 @@ msgstr "Notas"
 msgid "Select Address Book Folder"
 msgstr "Selecione Pasta do Catálogo de Endereços"
 
-#: src/addressbook.c:336 src/compose.c:515 src/mainwindow.c:477
+#: src/addressbook.c:338 src/compose.c:515 src/mainwindow.c:480
 #: src/messageview.c:138
 msgid "/_File"
 msgstr "/_Arquivo"
 
-#: src/addressbook.c:337
+#: src/addressbook.c:339
 msgid "/_File/New _Book"
 msgstr "/_Arquivo/Novo _Livro"
 
-#: src/addressbook.c:338
+#: src/addressbook.c:340
 msgid "/_File/New _vCard"
 msgstr "/_Arquivo/Novo _vCard"
 
-#: src/addressbook.c:340
+#: src/addressbook.c:342
 msgid "/_File/New _JPilot"
 msgstr "/_Arquivo/Novo _JPilot"
 
-#: src/addressbook.c:343
+#: src/addressbook.c:345
 msgid "/_File/New _Server"
 msgstr "/_Arquivo/Novo _Servidor"
 
-#: src/addressbook.c:345 src/addressbook.c:348 src/compose.c:520
-#: src/compose.c:525 src/compose.c:528 src/compose.c:531 src/mainwindow.c:495
-#: src/mainwindow.c:498 src/mainwindow.c:500 src/mainwindow.c:503
-#: src/mainwindow.c:505 src/messageview.c:141
+#: src/addressbook.c:347 src/addressbook.c:350 src/compose.c:520
+#: src/compose.c:525 src/compose.c:528 src/compose.c:531 src/mainwindow.c:498
+#: src/mainwindow.c:501 src/mainwindow.c:503 src/mainwindow.c:506
+#: src/mainwindow.c:508 src/messageview.c:141
 msgid "/_File/---"
 msgstr "/_Arquivo/---"
 
-#: src/addressbook.c:346
+#: src/addressbook.c:348
 msgid "/_File/_Edit"
 msgstr "/_Arquivo/_Editar"
 
-#: src/addressbook.c:347
+#: src/addressbook.c:349
 msgid "/_File/_Delete"
 msgstr "/_Arquivo/_Apagar"
 
-#: src/addressbook.c:349
+#: src/addressbook.c:351
 msgid "/_File/_Save"
 msgstr "/_Arquivo/_Salvar"
 
-#: src/addressbook.c:350 src/compose.c:532 src/messageview.c:142
+#: src/addressbook.c:352 src/compose.c:532 src/messageview.c:142
 msgid "/_File/_Close"
 msgstr "/_Arquivo/_Fechar"
 
-#: src/addressbook.c:351
+#: src/addressbook.c:353
 msgid "/_Address"
 msgstr "/_Endereço"
 
-#: src/addressbook.c:352
+#: src/addressbook.c:354
 msgid "/_Address/New _Address"
 msgstr "/_Endereço/Novo _Endereço"
 
-#: src/addressbook.c:353
+#: src/addressbook.c:355
 msgid "/_Address/New _Group"
 msgstr "/_Endereço/Novo _Grupo"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:356
 msgid "/_Address/New _Folder"
 msgstr "/_Endereço/Nova _Pasta"
 
-#: src/addressbook.c:355
+#: src/addressbook.c:357
 msgid "/_Address/---"
 msgstr "/_Endereço/---"
 
-#: src/addressbook.c:356
+#: src/addressbook.c:358
 msgid "/_Address/_Edit"
 msgstr "/_Endereço/_Editar"
 
-#: src/addressbook.c:357
+#: src/addressbook.c:359
 msgid "/_Address/_Delete"
 msgstr "/_Endereço/_Apagar"
 
-#: src/addressbook.c:358 src/compose.c:639 src/mainwindow.c:738
-#: src/messageview.c:259
+#: src/addressbook.c:360 src/compose.c:645 src/mainwindow.c:749
+#: src/messageview.c:264
 msgid "/_Tools"
 msgstr "/_Ferramentas"
 
-#: src/addressbook.c:359
+#: src/addressbook.c:361
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Ferramentas/Importar arquivo _LDIF"
 
-#: src/addressbook.c:360 src/compose.c:658 src/mainwindow.c:788
-#: src/messageview.c:277
+#: src/addressbook.c:362 src/compose.c:664 src/mainwindow.c:799
+#: src/messageview.c:282
 msgid "/_Help"
 msgstr "/_Ajuda"
 
-#: src/addressbook.c:361 src/compose.c:659 src/mainwindow.c:799
-#: src/messageview.c:278
+#: src/addressbook.c:363 src/compose.c:665 src/mainwindow.c:810
+#: src/messageview.c:283
 msgid "/_Help/_About"
 msgstr "/_Ajuda/_Sobre"
 
-#: src/addressbook.c:380 src/addressbook.c:390
+#: src/addressbook.c:382 src/addressbook.c:392
 msgid "/New _Address"
 msgstr "/Novo _Endereço"
 
-#: src/addressbook.c:381 src/addressbook.c:391
+#: src/addressbook.c:383 src/addressbook.c:393
 msgid "/New _Group"
 msgstr "/Novo _Grupo"
 
-#: src/addressbook.c:382 src/addressbook.c:392
+#: src/addressbook.c:384 src/addressbook.c:394
 msgid "/New _Folder"
 msgstr "/Nova _Pasta"
 
-#: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:509
+#: src/addressbook.c:385 src/addressbook.c:395 src/compose.c:509
 #: src/folderview.c:246 src/folderview.c:248 src/folderview.c:253
 #: src/folderview.c:266 src/folderview.c:268 src/folderview.c:270
 #: src/folderview.c:275 src/folderview.c:289 src/folderview.c:291
 #: src/folderview.c:295 src/summaryview.c:414 src/summaryview.c:418
-#: src/summaryview.c:421 src/summaryview.c:431 src/summaryview.c:433
-#: src/summaryview.c:435 src/summaryview.c:447 src/summaryview.c:453
+#: src/summaryview.c:421 src/summaryview.c:433 src/summaryview.c:435
+#: src/summaryview.c:437 src/summaryview.c:449 src/summaryview.c:455
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:534
-#: src/mainwindow.c:509 src/messageview.c:144
+#: src/addressbook.c:386 src/addressbook.c:396 src/compose.c:534
+#: src/mainwindow.c:512 src/messageview.c:144
 msgid "/_Edit"
 msgstr "/_Editar"
 
-#: src/addressbook.c:385 src/addressbook.c:395 src/summaryview.c:432
+#: src/addressbook.c:387 src/addressbook.c:397 src/summaryview.c:434
 msgid "/_Delete"
 msgstr "/_Apagar"
 
-#: src/addressbook.c:492
+#: src/addressbook.c:494
 msgid "E-Mail address"
 msgstr "Endereço de e-mail"
 
-#: src/addressbook.c:496 src/compose.c:4763 src/prefs_common_dialog.c:2183
+#: src/addressbook.c:498 src/compose.c:4772 src/prefs_common_dialog.c:2183
 msgid "Address book"
 msgstr "Catálogo de endereços"
 
-#: src/addressbook.c:596 src/prefs_filter_edit.c:249
+#: src/addressbook.c:600 src/prefs_filter_edit.c:249
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "Nome:"
 
 #. Buttons
-#: src/addressbook.c:628 src/addressbook.c:1680 src/editaddress.c:884
-#: src/editaddress.c:1017 src/mainwindow.c:2391 src/prefs_actions.c:266
+#: src/addressbook.c:632 src/addressbook.c:1684 src/editaddress.c:884
+#: src/editaddress.c:1017 src/mainwindow.c:2402 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
 #: src/prefs_template.c:233
 msgid "Delete"
 msgstr "Apagar"
 
-#: src/addressbook.c:631 src/editaddress.c:890 src/editaddress.c:1023
+#: src/addressbook.c:635 src/editaddress.c:890 src/editaddress.c:1023
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:273 src/prefs_display_header.c:328
 #: src/prefs_filter_edit.c:1550
 msgid "Add"
 msgstr "Adicionar"
 
-#: src/addressbook.c:634
+#: src/addressbook.c:638
 msgid "Lookup"
 msgstr "Procurar"
 
-#: src/addressbook.c:646 src/headerview.c:55 src/prefs_folder_item.c:339
+#: src/addressbook.c:650 src/headerview.c:55 src/prefs_folder_item.c:339
 #: src/prefs_template.c:176
 msgid "To:"
 msgstr "Para:"
 
-#: src/addressbook.c:650 src/prefs_folder_item.c:356 src/prefs_template.c:178
+#: src/addressbook.c:654 src/prefs_folder_item.c:356 src/prefs_template.c:178
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:654 src/prefs_folder_item.c:367
+#: src/addressbook.c:658 src/prefs_folder_item.c:367
 msgid "Bcc:"
 msgstr "Cco:"
 
 #. Confirm deletion
-#: src/addressbook.c:841
+#: src/addressbook.c:845
 msgid "Delete address(es)"
 msgstr "Apagar endereço(s)"
 
-#: src/addressbook.c:842
+#: src/addressbook.c:846
 msgid "Really delete the address(es)?"
 msgstr "Apagar realmente o(s) endereço(s)?"
 
-#: src/addressbook.c:1671
+#: src/addressbook.c:1675
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1045,36 +1045,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:1674 src/folderview.c:2351
+#: src/addressbook.c:1678 src/folderview.c:2351
 msgid "Delete folder"
 msgstr "Apagar pasta"
 
-#: src/addressbook.c:1674
+#: src/addressbook.c:1678
 msgid "_Folder only"
 msgstr "_Pasta apenas"
 
-#: src/addressbook.c:1674
+#: src/addressbook.c:1678
 msgid "Folder and _addresses"
 msgstr "Pasta e _endereços"
 
-#: src/addressbook.c:1679
+#: src/addressbook.c:1683
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Apagar realmente `%s' ?"
 
-#: src/addressbook.c:2365 src/addressbook.c:2498
+#: src/addressbook.c:2369 src/addressbook.c:2502
 msgid "New user, could not save index file."
 msgstr "Novo usuário, não foi possível salvar arquivo de índice."
 
-#: src/addressbook.c:2369 src/addressbook.c:2502
+#: src/addressbook.c:2373 src/addressbook.c:2506
 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:2379 src/addressbook.c:2512
+#: src/addressbook.c:2383 src/addressbook.c:2516
 msgid "Old address book converted successfully."
 msgstr "Catálogo de endereços antigo convertido com sucesso."
 
-#: src/addressbook.c:2384
+#: src/addressbook.c:2388
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1082,7 +1082,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:2397
+#: src/addressbook.c:2401
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1090,7 +1090,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:2403
+#: src/addressbook.c:2407
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1098,7 +1098,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:2408
+#: src/addressbook.c:2412
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1106,92 +1106,92 @@ 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:2415
+#: src/addressbook.c:2419
 msgid "Addressbook conversion error"
 msgstr "Erro convertendo catálogo de endereços"
 
-#: src/addressbook.c:2419
+#: src/addressbook.c:2423
 msgid "Addressbook conversion"
 msgstr "Conversão do catálogo de endereços"
 
-#: src/addressbook.c:2454
+#: src/addressbook.c:2458
 msgid "Addressbook Error"
 msgstr "Erro no Catálogo de Endereços"
 
-#: src/addressbook.c:2455 src/addressbook.c:2555
+#: src/addressbook.c:2459 src/addressbook.c:2559
 msgid "Could not read address index"
 msgstr "Não foi possível ler o índice do endereço"
 
-#: src/addressbook.c:2517
+#: src/addressbook.c:2521
 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:2531
+#: src/addressbook.c:2535
 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:2537
+#: src/addressbook.c:2541
 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:2543
+#: src/addressbook.c:2547
 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:2561
+#: src/addressbook.c:2565
 msgid "Addressbook Conversion Error"
 msgstr "Erro na conversão do catálogo de endereços"
 
-#: src/addressbook.c:2567
+#: src/addressbook.c:2571
 msgid "Addressbook Conversion"
 msgstr "Conversão do Catálogo de Endereços"
 
-#: src/addressbook.c:3072 src/prefs_common_dialog.c:2033
+#: src/addressbook.c:3086 src/prefs_common_dialog.c:2033
 msgid "Interface"
 msgstr "Interface"
 
-#: src/addressbook.c:3088 src/importldif.c:514
+#: src/addressbook.c:3102 src/importldif.c:514
 msgid "Address Book"
 msgstr "Catálogo de Endereços"
 
-#: src/addressbook.c:3104
+#: src/addressbook.c:3118
 msgid "Person"
 msgstr "Pessoa"
 
-#: src/addressbook.c:3120
+#: src/addressbook.c:3134
 msgid "EMail Address"
 msgstr "Endereço de e-mail"
 
-#: src/addressbook.c:3136
+#: src/addressbook.c:3150
 msgid "Group"
 msgstr "Grupo"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3152 src/folderview.c:367 src/prefs_account_dialog.c:1694
+#: src/addressbook.c:3166 src/folderview.c:367 src/prefs_account_dialog.c:1694
 #: src/query_search.c:370
 msgid "Folder"
 msgstr "Pasta"
 
-#: src/addressbook.c:3168
+#: src/addressbook.c:3182
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3184 src/addressbook.c:3200
+#: src/addressbook.c:3198 src/addressbook.c:3214
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3216
+#: src/addressbook.c:3230
 msgid "LDAP Server"
 msgstr "Servidor LDAP"
 
@@ -1203,7 +1203,7 @@ msgstr "Endereços comuns"
 msgid "Personal address"
 msgstr "Endereços pessoais"
 
-#: src/alertpanel.c:141 src/compose.c:5485 src/main.c:573
+#: src/alertpanel.c:141 src/compose.c:5494 src/main.c:573
 msgid "Notice"
 msgstr "Notificação"
 
@@ -1254,7 +1254,7 @@ msgstr "Marrom"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4593
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4750
 msgid "None"
 msgstr "Nenhuma"
 
@@ -1312,7 +1312,7 @@ msgstr "/_Editar/_Desfazer"
 msgid "/_Edit/_Redo"
 msgstr "/_Editar/_Refazer"
 
-#: src/compose.c:537 src/compose.c:544 src/mainwindow.c:513
+#: src/compose.c:537 src/compose.c:544 src/mainwindow.c:516
 #: src/messageview.c:147
 msgid "/_Edit/---"
 msgstr "/_Editar/---"
@@ -1321,7 +1321,7 @@ msgstr "/_Editar/---"
 msgid "/_Edit/Cu_t"
 msgstr "/_Editar/_Cortar"
 
-#: src/compose.c:539 src/mainwindow.c:510 src/messageview.c:145
+#: src/compose.c:539 src/mainwindow.c:513 src/messageview.c:145
 msgid "/_Edit/_Copy"
 msgstr "/_Editar/C_opiar"
 
@@ -1333,7 +1333,7 @@ msgstr "/_Editar/Co_lar"
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Editar/Colar como ci_tação"
 
-#: src/compose.c:543 src/mainwindow.c:511 src/messageview.c:146
+#: src/compose.c:543 src/mainwindow.c:514 src/messageview.c:146
 msgid "/_Edit/Select _all"
 msgstr "/_Editar/_Selecionar tudo"
 
@@ -1349,8 +1349,8 @@ msgstr "/_Editar/Quebrar todas as _linhas compridas"
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Editar/_Quebra automática de linha"
 
-#: src/compose.c:550 src/mainwindow.c:518 src/messageview.c:151
-#: src/summaryview.c:448
+#: src/compose.c:550 src/mainwindow.c:521 src/messageview.c:151
+#: src/summaryview.c:450
 msgid "/_View"
 msgstr "/E_xibir"
 
@@ -1371,9 +1371,9 @@ msgid "/_View/_Reply to"
 msgstr "/E_xibir/_Responder para"
 
 #: src/compose.c:555 src/compose.c:557 src/compose.c:559 src/compose.c:561
-#: src/mainwindow.c:538 src/mainwindow.c:541 src/mainwindow.c:568
-#: src/mainwindow.c:592 src/mainwindow.c:687 src/mainwindow.c:691
-#: src/messageview.c:236
+#: src/mainwindow.c:541 src/mainwindow.c:544 src/mainwindow.c:571
+#: src/mainwindow.c:595 src/mainwindow.c:696 src/mainwindow.c:700
+#: src/messageview.c:241
 msgid "/_View/---"
 msgstr "/E_xibir/---"
 
@@ -1389,7 +1389,7 @@ msgstr "/E_xibir/_Régua"
 msgid "/_View/_Attachment"
 msgstr "/E_xibir/_Anexo"
 
-#: src/compose.c:567 src/mainwindow.c:599 src/messageview.c:158
+#: src/compose.c:567 src/mainwindow.c:602 src/messageview.c:158
 msgid "/_View/Character _encoding"
 msgstr "/E_xibir/_Codificação de caracteres"
 
@@ -1398,212 +1398,223 @@ msgid "/_View/Character _encoding/_Automatic"
 msgstr "/E_xibir/Codificação de caracteres/_Automático"
 
 #: src/compose.c:570 src/compose.c:576 src/compose.c:582 src/compose.c:586
-#: src/compose.c:592 src/compose.c:596 src/compose.c:602 src/compose.c:606
-#: src/compose.c:616 src/compose.c:620 src/compose.c:628 src/compose.c:632
-#: src/mainwindow.c:595 src/mainwindow.c:602 src/messageview.c:154
+#: src/compose.c:592 src/compose.c:596 src/compose.c:602 src/compose.c:608
+#: src/compose.c:612 src/compose.c:622 src/compose.c:626 src/compose.c:634
+#: src/compose.c:638 src/mainwindow.c:598 src/mainwindow.c:605
+#: src/messageview.c:154
 msgid "/_View/Character _encoding/---"
 msgstr "/E_xibir/_Codificação de caracteres/---"
 
-#: src/compose.c:572 src/mainwindow.c:603 src/messageview.c:162
+#: src/compose.c:572 src/mainwindow.c:606 src/messageview.c:162
 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:574 src/mainwindow.c:605 src/messageview.c:165
+#: src/compose.c:574 src/mainwindow.c:608 src/messageview.c:165
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/E_xibir/_/Codificação de caracteresUnicode (_UTF-8)"
 
-#: src/compose.c:578 src/mainwindow.c:609 src/messageview.c:168
+#: src/compose.c:578 src/mainwindow.c:612 src/messageview.c:168
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/E_xibir/_Codificação de caracteres/Europa Ocidental (ISO-8859-_1)"
 
-#: src/compose.c:580 src/mainwindow.c:611 src/messageview.c:170
+#: src/compose.c:580 src/mainwindow.c:614 src/messageview.c:170
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/E_xibir/_Codificação de caracteres/Europa Ocidental (ISO-8859-15)"
 
-#: src/compose.c:584 src/mainwindow.c:617 src/messageview.c:175
+#: src/compose.c:584 src/mainwindow.c:620 src/messageview.c:175
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/E_xibir/_/Codificação de caracteres/Europa Central (ISO-8859-_2)"
 
-#: src/compose.c:588 src/mainwindow.c:621 src/messageview.c:178
+#: src/compose.c:588 src/mainwindow.c:624 src/messageview.c:178
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/E_xibir/_Codificação de caracteres/_Báltico (ISO-8859-13)"
 
-#: src/compose.c:590 src/mainwindow.c:623 src/messageview.c:180
+#: src/compose.c:590 src/mainwindow.c:626 src/messageview.c:180
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/E_xibir/_Codificação de caracteres/Báltico (ISO-8859-_4)"
 
-#: src/compose.c:594 src/mainwindow.c:627 src/messageview.c:183
+#: src/compose.c:594 src/mainwindow.c:630 src/messageview.c:183
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/E_xibir/_Codificação de caracteres/Grego (ISO-8859-_7)"
 
-#: src/compose.c:598 src/mainwindow.c:631 src/messageview.c:186
+#: src/compose.c:598 src/mainwindow.c:634 src/messageview.c:186
+#, fuzzy
+msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
+msgstr "/E_xibir/_Codificação de caracteres/Báltico (ISO-8859-_4)"
+
+#: src/compose.c:600 src/mainwindow.c:636 src/messageview.c:188
+#, fuzzy
+msgid "/_View/Character _encoding/Arabic (Windows-1256)"
+msgstr "/E_xibir/_Codificação de caracteres/Cirílico (Windows-1251)"
+
+#: src/compose.c:604 src/mainwindow.c:640 src/messageview.c:191
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/E_xibir/_Codificação de caracteres/Hebreu (ISO-8859-_8)"
 
-#: src/compose.c:600 src/mainwindow.c:633 src/messageview.c:188
+#: src/compose.c:606 src/mainwindow.c:642 src/messageview.c:193
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/E_xibir/_Codificação de caracteres/Hebreu (Windows-1255)"
 
-#: src/compose.c:604 src/mainwindow.c:637 src/messageview.c:191
+#: src/compose.c:610 src/mainwindow.c:646 src/messageview.c:196
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/E_xibir/_Codificação de caracteres/Turco (ISO-8859-_9)"
 
-#: src/compose.c:608 src/mainwindow.c:641 src/messageview.c:194
+#: src/compose.c:614 src/mainwindow.c:650 src/messageview.c:199
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/E_xibir/_Codificação de caracteres/Cirílico (ISO-8859-_5)"
 
-#: src/compose.c:610 src/mainwindow.c:643 src/messageview.c:196
+#: src/compose.c:616 src/mainwindow.c:652 src/messageview.c:201
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/E_xibir/_Codificação de caracteres/Cirílico (KOI8-_R)"
 
-#: src/compose.c:612 src/mainwindow.c:645 src/messageview.c:198
+#: src/compose.c:618 src/mainwindow.c:654 src/messageview.c:203
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/E_xibir/_Codificação de caracteres/Cirílico (KOI8-U)"
 
-#: src/compose.c:614 src/mainwindow.c:647 src/messageview.c:200
+#: src/compose.c:620 src/mainwindow.c:656 src/messageview.c:205
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/E_xibir/_Codificação de caracteres/Cirílico (Windows-1251)"
 
-#: src/compose.c:618 src/mainwindow.c:651 src/messageview.c:203
+#: src/compose.c:624 src/mainwindow.c:660 src/messageview.c:208
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/E_xibir/_Codificação de caracteres/Japonês (ISO-2022-_JP)"
 
-#: src/compose.c:622 src/mainwindow.c:661 src/messageview.c:212
+#: src/compose.c:628 src/mainwindow.c:670 src/messageview.c:217
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/E_xibir/_Codificação de caracteres/Chinês simplificado (_GB2312)"
 
-#: src/compose.c:624 src/mainwindow.c:663 src/messageview.c:214
+#: src/compose.c:630 src/mainwindow.c:672 src/messageview.c:219
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/E_xibir/_Codificação de caracteres/Chinês simplificado (GBK)"
 
-#: src/compose.c:626 src/mainwindow.c:665 src/messageview.c:216
+#: src/compose.c:632 src/mainwindow.c:674 src/messageview.c:221
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/E_xibir/_Codificação de caracteres/Chinês tradicional (_Big5)"
 
-#: src/compose.c:630 src/mainwindow.c:673 src/messageview.c:223
+#: src/compose.c:636 src/mainwindow.c:682 src/messageview.c:228
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/E_xibir/_Codificação de caracteres/Coreano (EUC-_KR)"
 
-#: src/compose.c:634 src/mainwindow.c:679 src/messageview.c:228
+#: src/compose.c:640 src/mainwindow.c:688 src/messageview.c:233
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/E_xibir/_Codificação de caracteres/Thai (TIS-620)"
 
-#: src/compose.c:636 src/mainwindow.c:681 src/messageview.c:230
+#: src/compose.c:642 src/mainwindow.c:690 src/messageview.c:235
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/E_xibir/_Codificação de caracteres/Thai (Windows-874)"
 
-#: src/compose.c:640 src/mainwindow.c:739 src/messageview.c:260
+#: src/compose.c:646 src/mainwindow.c:750 src/messageview.c:265
 msgid "/_Tools/_Address book"
 msgstr "/_Ferramentas/_Catálogo de endereços"
 
-#: src/compose.c:641
+#: src/compose.c:647
 msgid "/_Tools/_Template"
 msgstr "/_Ferramenta/_Modelo"
 
-#: src/compose.c:642 src/mainwindow.c:762 src/messageview.c:275
+#: src/compose.c:648 src/mainwindow.c:773 src/messageview.c:280
 msgid "/_Tools/Actio_ns"
 msgstr "/_Ferramentas/_Ações"
 
-#: src/compose.c:643 src/compose.c:647 src/compose.c:653 src/mainwindow.c:742
-#: src/mainwindow.c:756 src/mainwindow.c:761 src/mainwindow.c:763
-#: src/mainwindow.c:766 src/mainwindow.c:768 src/messageview.c:263
-#: src/messageview.c:274
+#: src/compose.c:649 src/compose.c:653 src/compose.c:659 src/mainwindow.c:753
+#: src/mainwindow.c:767 src/mainwindow.c:772 src/mainwindow.c:774
+#: src/mainwindow.c:777 src/mainwindow.c:779 src/messageview.c:268
+#: src/messageview.c:279
 msgid "/_Tools/---"
 msgstr "/_Ferramentas/---"
 
-#: src/compose.c:644
+#: src/compose.c:650
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/_Ferramentas/Editar com editor e_xterno"
 
-#: src/compose.c:648
+#: src/compose.c:654
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Ferramentas/_Assinar (PGP)"
 
-#: src/compose.c:649
+#: src/compose.c:655
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/_Ferramentas/_Encriptar (PGP)"
 
-#: src/compose.c:654
+#: src/compose.c:660
 msgid "/_Tools/_Check spell"
 msgstr "/_Ferramentas/_Verificar ortografia"
 
-#: src/compose.c:655
+#: src/compose.c:661
 msgid "/_Tools/_Set spell language"
 msgstr "/_Ferramentas/Definir _idioma do verificador ortográfico"
 
-#: src/compose.c:899
+#: src/compose.c:908
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: o arquivo não existe\n"
 
-#: src/compose.c:1003 src/compose.c:1074
+#: src/compose.c:1012 src/compose.c:1083
 msgid "Can't get text part\n"
 msgstr "Não foi possível obter o texto\n"
 
-#: src/compose.c:1475
+#: src/compose.c:1484
 msgid "Quote mark format error."
 msgstr "Erro no formato de marca de citação."
 
-#: src/compose.c:1487
+#: src/compose.c:1496
 msgid "Message reply/forward format error."
 msgstr "Erro no formato de mensagem de resposta/encaminhada."
 
-#: src/compose.c:1907
+#: src/compose.c:1916
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "O arquivo %s não existe\n"
 
-#: src/compose.c:1911
+#: src/compose.c:1920
 #, 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:1915
+#: src/compose.c:1924
 #, c-format
 msgid "File %s is empty."
 msgstr "O arquivo %s está vazio."
 
-#: src/compose.c:1919
+#: src/compose.c:1928
 #, c-format
 msgid "Can't read %s."
 msgstr "Não foi possível ler %s."
 
-#: src/compose.c:1952
+#: src/compose.c:1961
 #, c-format
 msgid "Message: %s"
 msgstr "Mensagem: %s"
 
-#: src/compose.c:2012 src/mimeview.c:565
+#: src/compose.c:2021 src/mimeview.c:565
 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:2496 src/headerview.c:195 src/query_search.c:636
-#: src/summaryview.c:2107
+#: src/compose.c:2505 src/headerview.c:195 src/query_search.c:636
+#: src/summaryview.c:2124
 msgid "(No Subject)"
 msgstr "(Sem assunto)"
 
-#: src/compose.c:2499
+#: src/compose.c:2508
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Compondo%s"
 
-#: src/compose.c:2612
+#: src/compose.c:2621
 msgid "Recipient is not specified."
 msgstr "Destinatário não especificado."
 
-#: src/compose.c:2620
+#: src/compose.c:2629
 msgid "Empty subject"
 msgstr "Sem assunto"
 
-#: src/compose.c:2621
+#: src/compose.c:2630
 msgid "Subject is empty. Send it anyway?"
 msgstr "Assunto em branco. Enviar assim mesmo?"
 
-#: src/compose.c:2680
+#: src/compose.c:2689
 msgid "can't get recipient list."
 msgstr "não pude obter a lista de destinatários."
 
-#: src/compose.c:2700
+#: src/compose.c:2709
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1611,21 +1622,21 @@ 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:2714 src/send_message.c:299
+#: src/compose.c:2723 src/send_message.c:299
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Erro ao postar a mensagem para %s ."
 
-#: src/compose.c:2756
+#: src/compose.c:2765
 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:2794
+#: src/compose.c:2803
 #, 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:2891
+#: src/compose.c:2900
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1637,11 +1648,11 @@ msgstr ""
 "\n"
 "Enviar como %s mesmo assim?"
 
-#: src/compose.c:2897
+#: src/compose.c:2906
 msgid "Code conversion error"
 msgstr "Erro convertendo codificação"
 
-#: src/compose.c:2970
+#: src/compose.c:2979
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1654,157 +1665,157 @@ msgstr ""
 "\n"
 "Enviar mesmo assim?"
 
-#: src/compose.c:2974
+#: src/compose.c:2983
 msgid "Line length limit"
 msgstr "Limite de comprimento da linha"
 
-#: src/compose.c:3264
+#: src/compose.c:3273
 msgid "can't remove the old message\n"
 msgstr "não posso remover a mensagem antiga\n"
 
-#: src/compose.c:3282
+#: src/compose.c:3291
 msgid "queueing message...\n"
 msgstr "enfileirando mensagem...\n"
 
-#: src/compose.c:3364
+#: src/compose.c:3373
 msgid "can't find queue folder\n"
 msgstr "não foi possível encontrar a pasta da fila\n"
 
-#: src/compose.c:3371
+#: src/compose.c:3380
 msgid "can't queue the message\n"
 msgstr "não foi possível enfileirar a mensagem\n"
 
-#: src/compose.c:3964
+#: src/compose.c:3973
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "Message-ID gerado: %s\n"
 
-#: src/compose.c:4077
+#: src/compose.c:4086
 msgid "Creating compose window...\n"
 msgstr "Criando janela de composição...\n"
 
-#: src/compose.c:4128 src/headerview.c:54
+#: src/compose.c:4137 src/headerview.c:54
 msgid "From:"
 msgstr "De:"
 
-#: src/compose.c:4202
+#: src/compose.c:4211
 msgid "PGP Sign"
 msgstr "Assinar (PGP)"
 
-#: src/compose.c:4205
+#: src/compose.c:4214
 msgid "PGP Encrypt"
 msgstr "Encriptar (PGP)"
 
-#: src/compose.c:4243 src/compose.c:5317
+#: src/compose.c:4252 src/compose.c:5326
 msgid "MIME type"
 msgstr "Tipo MIME"
 
 #. S_COL_DATE
-#: src/compose.c:4252 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4740
+#: src/compose.c:4261 src/mimeview.c:197 src/prefs_filter_edit.c:496
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4897
 msgid "Size"
 msgstr "Tamanho"
 
-#: src/compose.c:4683 src/mainwindow.c:2324 src/prefs_account_dialog.c:528
+#: src/compose.c:4692 src/mainwindow.c:2335 src/prefs_account_dialog.c:528
 #: src/prefs_common_dialog.c:661
 msgid "Send"
 msgstr "Enviar"
 
-#: src/compose.c:4684
+#: src/compose.c:4693
 msgid "Send message"
 msgstr "Enviar mensagem"
 
-#: src/compose.c:4692
+#: src/compose.c:4701
 msgid "Send later"
 msgstr "Enviar depois"
 
-#: src/compose.c:4693
+#: src/compose.c:4702
 msgid "Put into queue folder and send later"
 msgstr "Pôr na 'fila de saída' e enviar depois"
 
-#: src/compose.c:4701
+#: src/compose.c:4710
 msgid "Draft"
 msgstr "Rascunho"
 
-#: src/compose.c:4702
+#: src/compose.c:4711
 msgid "Save to draft folder"
 msgstr "Salvar na pasta Rascunho"
 
-#: src/compose.c:4712
+#: src/compose.c:4721
 msgid "Insert"
 msgstr "Inserir"
 
-#: src/compose.c:4713
+#: src/compose.c:4722
 msgid "Insert file"
 msgstr "Inserir arquivo"
 
-#: src/compose.c:4721
+#: src/compose.c:4730
 msgid "Attach"
 msgstr "Anexar"
 
-#: src/compose.c:4722
+#: src/compose.c:4731
 msgid "Attach file"
 msgstr "Anexar arquivo"
 
 #. signature
-#: src/compose.c:4732 src/prefs_account_dialog.c:1208
+#: src/compose.c:4741 src/prefs_account_dialog.c:1208
 #: src/prefs_common_dialog.c:953
 msgid "Signature"
 msgstr "Assinatura"
 
-#: src/compose.c:4733
+#: src/compose.c:4742
 #, fuzzy
 msgid "Append signature"
 msgstr "Assinatura ERRADA"
 
 #. editor
-#: src/compose.c:4742 src/prefs_common_dialog.c:991
+#: src/compose.c:4751 src/prefs_common_dialog.c:991
 #: src/prefs_common_dialog.c:2315
 msgid "Editor"
 msgstr "Editor"
 
-#: src/compose.c:4743
+#: src/compose.c:4752
 msgid "Edit with external editor"
 msgstr "Editar com um editor externo"
 
-#: src/compose.c:4751
+#: src/compose.c:4760
 msgid "Linewrap"
 msgstr "Quebra de linha"
 
-#: src/compose.c:4752
+#: src/compose.c:4761
 msgid "Wrap all long lines"
 msgstr "Quebrar todas as linhas compridas"
 
-#: src/compose.c:5213
+#: src/compose.c:5222
 msgid "Invalid MIME type."
 msgstr "Tipo MIME inválido."
 
-#: src/compose.c:5231
+#: src/compose.c:5240
 msgid "File doesn't exist or is empty."
 msgstr "O arquivo não existe ou está vazio."
 
-#: src/compose.c:5299
+#: src/compose.c:5308
 msgid "Properties"
 msgstr "Propriedades"
 
-#: src/compose.c:5319 src/prefs_common_dialog.c:1444
+#: src/compose.c:5328 src/prefs_common_dialog.c:1444
 msgid "Encoding"
 msgstr "Codificação"
 
-#: src/compose.c:5342 src/prefs_folder_item.c:202
+#: src/compose.c:5351 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Caminho"
 
-#: src/compose.c:5343
+#: src/compose.c:5352
 msgid "File name"
 msgstr "Nome do arquivo"
 
-#: src/compose.c:5436
+#: src/compose.c:5445
 #, 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:5482
+#: src/compose.c:5491
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1813,44 +1824,44 @@ msgstr ""
 "O editor externo está ativo.\n"
 "Forçar a finalização do processo (pid: %d)?\n"
 
-#: src/compose.c:5857 src/compose.c:5862 src/compose.c:5868
+#: src/compose.c:5866 src/compose.c:5871 src/compose.c:5877
 msgid "Can't queue the message."
 msgstr "Não foi possível enfileirar a mensagem."
 
-#: src/compose.c:5959
+#: src/compose.c:5968
 msgid "Select files"
 msgstr "Selecionar arquivos"
 
-#: src/compose.c:5982
+#: src/compose.c:5991
 msgid "Select file"
 msgstr "Selecionar arquivo"
 
-#: src/compose.c:6017
+#: src/compose.c:6026
 msgid "Save message"
 msgstr "Salvar mensagem"
 
-#: src/compose.c:6018
+#: src/compose.c:6027
 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:6020
+#: src/compose.c:6029
 msgid "Close _without saving"
 msgstr "_Fechar sem salvar"
 
-#: src/compose.c:6062
+#: src/compose.c:6071
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Quer aplicar o modelo `%s'?"
 
-#: src/compose.c:6064
+#: src/compose.c:6073
 msgid "Apply template"
 msgstr "Aplicar Modelo"
 
-#: src/compose.c:6065
+#: src/compose.c:6074
 msgid "_Replace"
 msgstr "_Substituir"
 
-#: src/compose.c:6065
+#: src/compose.c:6074
 msgid "_Insert"
 msgstr "_Inserir"
 
@@ -2288,7 +2299,7 @@ msgstr "Nova"
 
 #. S_COL_MARK
 #: src/folderview.c:412 src/prefs_filter_edit.c:500
-#: src/prefs_summary_column.c:71 src/summaryview.c:509
+#: src/prefs_summary_column.c:71 src/summaryview.c:511
 msgid "Unread"
 msgstr "Não lido"
 
@@ -2304,12 +2315,12 @@ msgstr "Configurando informações da pasta...\n"
 msgid "Setting folder info..."
 msgstr "Configurando informações da pasta..."
 
-#: src/folderview.c:858 src/mainwindow.c:3464 src/setup.c:80
+#: src/folderview.c:858 src/mainwindow.c:3481 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Revisando pasta %s%c%s ..."
 
-#: src/folderview.c:862 src/mainwindow.c:3469 src/setup.c:85
+#: src/folderview.c:862 src/mainwindow.c:3486 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Revisando pasta %s ..."
@@ -2334,7 +2345,7 @@ msgstr "Falha ao tentar reconstruir a árvore de pastas."
 msgid "Checking for new messages in all folders..."
 msgstr "Checar novas mensagens em todas as pastas..."
 
-#: src/folderview.c:1200 src/mainwindow.c:2400 src/prefs_common_dialog.c:1789
+#: src/folderview.c:1200 src/mainwindow.c:2411 src/prefs_common_dialog.c:1789
 msgid "Junk"
 msgstr "Spam"
 
@@ -2474,7 +2485,7 @@ msgstr "Assunto:"
 msgid "Creating header view...\n"
 msgstr "Criando visualizador de cabeçalhos...\n"
 
-#: src/headerview.c:180 src/query_search.c:637 src/summaryview.c:2110
+#: src/headerview.c:180 src/query_search.c:637 src/summaryview.c:2127
 msgid "(No From)"
 msgstr "(Sem remetente)"
 
@@ -2584,7 +2595,7 @@ msgstr "Importar arquivo LDIF para o Livro de Endereços"
 msgid "Prev"
 msgstr "Anterior"
 
-#: src/importldif.c:768 src/mainwindow.c:2420
+#: src/importldif.c:768 src/mainwindow.c:2431
 msgid "Next"
 msgstr "Próxima"
 
@@ -2936,11 +2947,11 @@ msgstr ""
 msgid "another Sylpheed is already running.\n"
 msgstr "outra cópia do Sylpheed já está sendo executada.\n"
 
-#: src/main.c:1064
+#: src/main.c:1083
 msgid "Migration of configuration"
 msgstr "Migração da configuração"
 
-#: src/main.c:1065
+#: src/main.c:1084
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -2948,632 +2959,637 @@ msgstr ""
 "As configurações antigas foram encontradas.\n"
 "Deseja migrar para o novo formato?"
 
-#: src/mainwindow.c:478
+#: src/mainwindow.c:481
 msgid "/_File/_Folder"
 msgstr "/_Arquivo/_Pasta"
 
-#: src/mainwindow.c:479
+#: src/mainwindow.c:482
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "_Arquivo/_Pasta/Criar _nova pasta ..."
 
-#: src/mainwindow.c:481
+#: src/mainwindow.c:484
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/_Arquivo/_Pasta/_Renomear pasta..."
 
-#: src/mainwindow.c:482
+#: src/mainwindow.c:485
 msgid "/_File/_Folder/_Move folder..."
 msgstr "/_Arquivo/_Pasta/_Mover pasta..."
 
-#: src/mainwindow.c:483
+#: src/mainwindow.c:486
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/_Arquivo/_Pasta/A_pagar pasta"
 
-#: src/mainwindow.c:484
+#: src/mainwindow.c:487
 msgid "/_File/_Mailbox"
 msgstr "/_Arquivo/_Caixa de correio"
 
-#: src/mainwindow.c:485
+#: src/mainwindow.c:488
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/_Arquivo/_Caixa de correio/_Adicionar caixa de correio..."
 
-#: src/mainwindow.c:486
+#: src/mainwindow.c:489
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/_Arquivo/_Caixa de correio/Remover _caixa de correio"
 
-#: src/mainwindow.c:487 src/mainwindow.c:492
+#: src/mainwindow.c:490 src/mainwindow.c:495
 msgid "/_File/_Mailbox/---"
 msgstr "/_Arquivo/_Caixa de correio/---"
 
-#: src/mainwindow.c:488
+#: src/mainwindow.c:491
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "/_Arquivo/_Caixa de correio/_Procurar por mensagens novas"
 
-#: src/mainwindow.c:490
+#: src/mainwindow.c:493
 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:493
+#: src/mainwindow.c:496
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "/_Arquivo/_Caixa de correio/_Reconstruir árvore de pastas"
 
-#: src/mainwindow.c:496
+#: src/mainwindow.c:499
 msgid "/_File/_Import mbox file..."
 msgstr "/_Arquivo/I_mportar arquivo mbox..."
 
-#: src/mainwindow.c:497
+#: src/mainwindow.c:500
 msgid "/_File/_Export to mbox file..."
 msgstr "/_Arquivo/_Exportar para arquivo mbox..."
 
-#: src/mainwindow.c:499
+#: src/mainwindow.c:502
 msgid "/_File/Empty all _trash"
 msgstr "/_Arquivo/Esvaziar _lixeira"
 
-#: src/mainwindow.c:501 src/messageview.c:139
+#: src/mainwindow.c:504 src/messageview.c:139
 msgid "/_File/_Save as..."
 msgstr "/_Arquivo/_Salvar como..."
 
-#: src/mainwindow.c:502 src/messageview.c:140
+#: src/mainwindow.c:505 src/messageview.c:140
 msgid "/_File/_Print..."
 msgstr "/_Arquivo/Im_primir"
 
-#: src/mainwindow.c:504
+#: src/mainwindow.c:507
 msgid "/_File/_Work offline"
 msgstr "/_Arquivo/_Trabalhar desconectado"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:507
+#: src/mainwindow.c:510
 msgid "/_File/E_xit"
 msgstr "/_Arquivo/Sai_r"
 
-#: src/mainwindow.c:512
+#: src/mainwindow.c:515
 msgid "/_Edit/Select _thread"
 msgstr "/_Editar/_Selecionar t_hread"
 
-#: src/mainwindow.c:514 src/messageview.c:148
+#: src/mainwindow.c:517 src/messageview.c:148
 msgid "/_Edit/_Find in current message..."
 msgstr "/_Editar/_Encontrar na mensagem atual..."
 
-#: src/mainwindow.c:516
+#: src/mainwindow.c:519
 msgid "/_Edit/_Search messages..."
 msgstr "/_Editar/_Procurar mensagens..."
 
-#: src/mainwindow.c:519
+#: src/mainwindow.c:522
 msgid "/_View/Show or hi_de"
 msgstr "/E_xibir/_Mostrar ou esconder"
 
-#: src/mainwindow.c:520
+#: src/mainwindow.c:523
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/E_xibir/_Mostrar ou esconder/_Árvore de pastas"
 
-#: src/mainwindow.c:522
+#: src/mainwindow.c:525
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/E_xibir/_Mostrar ou esconder/Ver _Mensagens"
 
-#: src/mainwindow.c:524
+#: src/mainwindow.c:527
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/E_xibir/_Mostrar ou esconder/_Barra de Ferramentas"
 
-#: src/mainwindow.c:526
+#: src/mainwindow.c:529
 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:528
+#: src/mainwindow.c:531
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/E_xibir/_Mostrar ou esconder/_Barra de Ferramentas/Í_cones"
 
-#: src/mainwindow.c:530
+#: src/mainwindow.c:533
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/E_xibir/_Mostrar ou esconder/_Barra de Ferramentas/_Texto"
 
-#: src/mainwindow.c:532
+#: src/mainwindow.c:535
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/E_xibir/_Mostrar ou esconder/_Barra de Ferramentas/_Nenhum"
 
-#: src/mainwindow.c:534
+#: src/mainwindow.c:537
 #, fuzzy
 msgid "/_View/Show or hi_de/_Search bar"
 msgstr "/E_xibir/_Mostrar ou esconder/Barra de _estado"
 
-#: src/mainwindow.c:536
+#: src/mainwindow.c:539
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/E_xibir/_Mostrar ou esconder/Barra de _estado"
 
-#: src/mainwindow.c:539
+#: src/mainwindow.c:542
 msgid "/_View/Separate f_older tree"
 msgstr "/E_xibir/Á_rvore de pastas separadas"
 
-#: src/mainwindow.c:540
+#: src/mainwindow.c:543
 msgid "/_View/Separate _message view"
 msgstr "/E_xibir/Visualização separada da _mensagem"
 
-#: src/mainwindow.c:542
+#: src/mainwindow.c:545
 msgid "/_View/_Sort"
 msgstr "/E_xibir/_Ordenação"
 
-#: src/mainwindow.c:543
+#: src/mainwindow.c:546
 msgid "/_View/_Sort/by _number"
 msgstr "/E_xibir/_Ordenar/por _número"
 
-#: src/mainwindow.c:544
+#: src/mainwindow.c:547
 msgid "/_View/_Sort/by s_ize"
 msgstr "/E_xibir/_Ordenar/por _tamanho"
 
-#: src/mainwindow.c:545
+#: src/mainwindow.c:548
 msgid "/_View/_Sort/by _date"
 msgstr "/E_xibir/_Ordenar/por _data"
 
-#: src/mainwindow.c:546
+#: src/mainwindow.c:549
 msgid "/_View/_Sort/by t_hread date"
 msgstr "/E_xibir/_Ordenar/por _data da discussão"
 
-#: src/mainwindow.c:547
+#: src/mainwindow.c:550
 msgid "/_View/_Sort/by _from"
 msgstr "/E_xibir/_Ordenar/por _remetente"
 
-#: src/mainwindow.c:548
+#: src/mainwindow.c:551
 msgid "/_View/_Sort/by _recipient"
 msgstr "/E_xibir/_Ordenar/por _destinatário"
 
-#: src/mainwindow.c:549
+#: src/mainwindow.c:552
 msgid "/_View/_Sort/by _subject"
 msgstr "/E_xibir/_Ordenar/por as_sunto"
 
-#: src/mainwindow.c:550
+#: src/mainwindow.c:553
 msgid "/_View/_Sort/by _color label"
 msgstr "/E_xibir/_Ordenar/por _etiqueta de cor"
 
-#: src/mainwindow.c:552
+#: src/mainwindow.c:555
 msgid "/_View/_Sort/by _mark"
 msgstr "/E_xibir/_Ordenar/por _marca"
 
-#: src/mainwindow.c:553
+#: src/mainwindow.c:556
 msgid "/_View/_Sort/by _unread"
 msgstr "/E_xibir/_Ordenar/por _não lidas"
 
-#: src/mainwindow.c:554
+#: src/mainwindow.c:557
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/E_xibir/_Ordenar/por _anexos"
 
-#: src/mainwindow.c:556
+#: src/mainwindow.c:559
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/E_xibir/_Ordenar/_Não ordenar"
 
-#: src/mainwindow.c:557 src/mainwindow.c:560
+#: src/mainwindow.c:560 src/mainwindow.c:563
 msgid "/_View/_Sort/---"
 msgstr "/E_xibir/_Ordenar/---"
 
-#: src/mainwindow.c:558
+#: src/mainwindow.c:561
 msgid "/_View/_Sort/Ascending"
 msgstr "/E_xibir/_Ordenar/Crescente"
 
-#: src/mainwindow.c:559
+#: src/mainwindow.c:562
 msgid "/_View/_Sort/Descending"
 msgstr "/E_xibir/_Ordenar/Decrescente"
 
-#: src/mainwindow.c:561
+#: src/mainwindow.c:564
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/E_xibir/_Ordenar/Atrair _por assunto"
 
-#: src/mainwindow.c:563
+#: src/mainwindow.c:566
 msgid "/_View/Th_read view"
 msgstr "/E_xibir/Visão de th_read"
 
-#: src/mainwindow.c:564
+#: src/mainwindow.c:567
 msgid "/_View/E_xpand all threads"
 msgstr "/E_xibir/E_xpandir todas as threads"
 
-#: src/mainwindow.c:565
+#: src/mainwindow.c:568
 msgid "/_View/Co_llapse all threads"
 msgstr "/E_xibir/_Fechar todas as threads"
 
-#: src/mainwindow.c:566
+#: src/mainwindow.c:569
 msgid "/_View/Set display _item..."
 msgstr "/E_xibir/Elementos _visíveis..."
 
-#: src/mainwindow.c:569
+#: src/mainwindow.c:572
 msgid "/_View/_Go to"
 msgstr "/E_xibir/Ir _Para"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:573
 msgid "/_View/_Go to/_Prev message"
 msgstr "/E_xibir/Ir _Para/Mensagem a_nterior"
 
-#: src/mainwindow.c:571
+#: src/mainwindow.c:574
 msgid "/_View/_Go to/_Next message"
 msgstr "/E_xibir/Ir _Para/_Próxima mensagem"
 
-#: src/mainwindow.c:572 src/mainwindow.c:577 src/mainwindow.c:580
-#: src/mainwindow.c:585 src/mainwindow.c:590
+#: src/mainwindow.c:575 src/mainwindow.c:580 src/mainwindow.c:583
+#: src/mainwindow.c:588 src/mainwindow.c:593
 msgid "/_View/_Go to/---"
 msgstr "/E_xibir/Ir _Para/---"
 
-#: src/mainwindow.c:573
+#: src/mainwindow.c:576
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/E_xibir/Ir _Para/Anterior não _lida"
 
-#: src/mainwindow.c:575
+#: src/mainwindow.c:578
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/E_xibir/Ir _Para/Próxima não l_ida"
 
-#: src/mainwindow.c:578
+#: src/mainwindow.c:581
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/E_xibir/Ir _Para/Mensagem n_ova anterior"
 
-#: src/mainwindow.c:579
+#: src/mainwindow.c:582
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/E_xibir/Ir _Para/Próxima mensagem _nova"
 
-#: src/mainwindow.c:581
+#: src/mainwindow.c:584
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/E_xibir/Ir _Para/Mensagem marcada a_nterior"
 
-#: src/mainwindow.c:583
+#: src/mainwindow.c:586
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/E_xibir/Ir _Para/Próxima mensagem ma_rcada"
 
-#: src/mainwindow.c:586
+#: src/mainwindow.c:589
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/E_xibir/Ir _Para/Mensagem eti_quetada anterior"
 
-#: src/mainwindow.c:588
+#: src/mainwindow.c:591
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/E_xibir/Ir _Para/Próxima mensagem etique_tada"
 
-#: src/mainwindow.c:591
+#: src/mainwindow.c:594
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/E_xibir/Ir _Para/Outra _pasta..."
 
-#: src/mainwindow.c:600 src/messageview.c:159
+#: src/mainwindow.c:603 src/messageview.c:159
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/E_xibir/_Codificação de caracteres/_Detectar automaticamente"
 
-#: src/mainwindow.c:613 src/messageview.c:172
+#: src/mainwindow.c:616 src/messageview.c:172
 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr "/E_xibir/_Codificação de caracteres/Europeu Ocidental (Windows-1252)"
 
-#: src/mainwindow.c:653 src/messageview.c:205
+#: src/mainwindow.c:662 src/messageview.c:210
 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:655 src/messageview.c:207
+#: src/mainwindow.c:664 src/messageview.c:212
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/E_xibir/_Codificação de caracteres/Japonês (_EUC-JP)"
 
-#: src/mainwindow.c:657 src/messageview.c:209
+#: src/mainwindow.c:666 src/messageview.c:214
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/E_xibir/_Codificação de caracteres/Japonês (_Shift__JIS)"
 
-#: src/mainwindow.c:667 src/messageview.c:218
+#: src/mainwindow.c:676 src/messageview.c:223
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/E_xibir/_Codificação de caracteres/Chinês tradicional (EUC-_TW)"
 
-#: src/mainwindow.c:669 src/messageview.c:220
+#: src/mainwindow.c:678 src/messageview.c:225
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/E_xibir/_Codificação de caracteres/Chinês (ISO-2022-_CN)"
 
-#: src/mainwindow.c:675 src/messageview.c:225
+#: src/mainwindow.c:684 src/messageview.c:230
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/E_xibir/_Codificação de caracteres/Coreano (ISO-2022-KR)"
 
-#: src/mainwindow.c:688 src/summaryview.c:449
+#: src/mainwindow.c:697 src/summaryview.c:451
 msgid "/_View/Open in new _window"
 msgstr "/E_xibir/Abrir em uma n_ova janela"
 
-#: src/mainwindow.c:689 src/messageview.c:237
+#: src/mainwindow.c:698 src/messageview.c:242
 msgid "/_View/Mess_age source"
 msgstr "/E_xibir/Ver _fonte"
 
-#: src/mainwindow.c:690 src/messageview.c:238
+#: src/mainwindow.c:699 src/messageview.c:243
 msgid "/_View/Show all _header"
 msgstr "/E_xibir/_Mostrar todos os cabeçalhos"
 
-#: src/mainwindow.c:692
+#: src/mainwindow.c:701
 msgid "/_View/_Update summary"
 msgstr "/E_xibir/A_tualizar sumário"
 
-#: src/mainwindow.c:694 src/messageview.c:240
+#: src/mainwindow.c:703 src/messageview.c:245
 msgid "/_Message"
 msgstr "/_Mensagem"
 
-#: src/mainwindow.c:695
+#: src/mainwindow.c:704
 msgid "/_Message/Recei_ve"
 msgstr "/_Mensagem/_Receber"
 
-#: src/mainwindow.c:696
+#: src/mainwindow.c:705
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/_Mensagem/_Receber/Receber da conta _atual"
 
-#: src/mainwindow.c:698
+#: src/mainwindow.c:707
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/_Mensagem/_Receber/Receber de _todas as contas"
 
-#: src/mainwindow.c:700
+#: src/mainwindow.c:709
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/_Mensagem/_Receber/_Cancelar recebimento"
 
-#: src/mainwindow.c:702
+#: src/mainwindow.c:711
 msgid "/_Message/Recei_ve/---"
 msgstr "/_Mensagem/_Receber/---"
 
-#: src/mainwindow.c:703
+#: src/mainwindow.c:712
 msgid "/_Message/_Send queued messages"
 msgstr "/_Mensagem/Enviar mensagens da _fila"
 
-#: src/mainwindow.c:704 src/mainwindow.c:706 src/mainwindow.c:713
-#: src/mainwindow.c:718 src/mainwindow.c:721 src/mainwindow.c:730
-#: src/mainwindow.c:732 src/mainwindow.c:735 src/messageview.c:243
-#: src/messageview.c:251 src/messageview.c:256
+#: src/mainwindow.c:713 src/mainwindow.c:715 src/mainwindow.c:722
+#: src/mainwindow.c:727 src/mainwindow.c:730 src/mainwindow.c:741
+#: src/mainwindow.c:743 src/mainwindow.c:746 src/messageview.c:248
+#: src/messageview.c:256 src/messageview.c:261
 msgid "/_Message/---"
 msgstr "/_Mensagem/---"
 
-#: src/mainwindow.c:705 src/messageview.c:241
+#: src/mainwindow.c:714 src/messageview.c:246
 msgid "/_Message/Compose _new message"
 msgstr "/_Mensagem/Compor _nova mensagem"
 
-#: src/mainwindow.c:707 src/messageview.c:244
+#: src/mainwindow.c:716 src/messageview.c:249
 msgid "/_Message/_Reply"
 msgstr "/_Mensagem/_Responder"
 
-#: src/mainwindow.c:708
+#: src/mainwindow.c:717
 msgid "/_Message/Repl_y to"
 msgstr "/_Mensagem/_Responder para"
 
-#: src/mainwindow.c:709 src/messageview.c:245
+#: src/mainwindow.c:718 src/messageview.c:250
 msgid "/_Message/Repl_y to/_all"
 msgstr "/Mensagem/Responder para/_todos"
 
-#: src/mainwindow.c:710 src/messageview.c:247
+#: src/mainwindow.c:719 src/messageview.c:252
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Mensagem/Responder para/_quem enviou"
 
-#: src/mainwindow.c:711 src/messageview.c:249
+#: src/mainwindow.c:720 src/messageview.c:254
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/Mensagem/Responder para/_lista"
 
-#: src/mainwindow.c:714 src/messageview.c:252
+#: src/mainwindow.c:723 src/messageview.c:257
 msgid "/_Message/_Forward"
 msgstr "/_Mensagem/Encam_inhar"
 
-#: src/mainwindow.c:715 src/messageview.c:253
+#: src/mainwindow.c:724 src/messageview.c:258
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Mensagem/Encaminhar como ane_xo"
 
-#: src/mainwindow.c:717 src/messageview.c:255
+#: src/mainwindow.c:726 src/messageview.c:260
 msgid "/_Message/Redirec_t"
 msgstr "/_Mensagem/Redire_cionar"
 
-#: src/mainwindow.c:719
+#: src/mainwindow.c:728
 msgid "/_Message/M_ove..."
 msgstr "/_Mensagem/Mo_ver..."
 
-#: src/mainwindow.c:720
+#: src/mainwindow.c:729
 msgid "/_Message/_Copy..."
 msgstr "/_Mensagem/_Copiar..."
 
-#: src/mainwindow.c:722
+#: src/mainwindow.c:731
 msgid "/_Message/_Mark"
 msgstr "/_Mensagem/_Marcar"
 
-#: src/mainwindow.c:723
+#: src/mainwindow.c:732
 msgid "/_Message/_Mark/_Mark"
 msgstr "/_Mensagem/_Marcar/_Marcar"
 
-#: src/mainwindow.c:724
+#: src/mainwindow.c:733
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/_Mensagem/_Marcar/_Desmarcar"
 
-#: src/mainwindow.c:725
+#: src/mainwindow.c:734
 msgid "/_Message/_Mark/---"
 msgstr "/_Mensagem/_Marcar/---"
 
-#: src/mainwindow.c:726
+#: src/mainwindow.c:735
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/_Mensagem/_Marcar/Marcar como _não lida"
 
-#: src/mainwindow.c:727
+#: src/mainwindow.c:736
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/_Mensagem/_Marcar/Marcar como l_ida"
 
-#: src/mainwindow.c:729
+#: src/mainwindow.c:738
+#, fuzzy
+msgid "/_Message/_Mark/Mark _thread as read"
+msgstr "/_Mensagem/_Marcar/Marcar como l_ida"
+
+#: src/mainwindow.c:740
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/_Mensagem/_Marcar/Marcar todas como _lidas"
 
-#: src/mainwindow.c:731
+#: src/mainwindow.c:742
 msgid "/_Message/_Delete"
 msgstr "/_Mensagem/_Apagar"
 
-#: src/mainwindow.c:733
+#: src/mainwindow.c:744
 msgid "/_Message/Set as _junk mail"
 msgstr "/_Mensagem/Classificar como _spam"
 
-#: src/mainwindow.c:734
+#: src/mainwindow.c:745
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/_Mensagem/Classificar como _não-spam"
 
-#: src/mainwindow.c:736 src/messageview.c:257
+#: src/mainwindow.c:747 src/messageview.c:262
 msgid "/_Message/Re-_edit"
 msgstr "/_Mensagem/Ed_itar novamente"
 
-#: src/mainwindow.c:740
+#: src/mainwindow.c:751
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/_Ferramentas/Adicionar remetente ao catálogo de _endereços"
 
-#: src/mainwindow.c:743
+#: src/mainwindow.c:754
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/_Ferramentas/Filtrar _todas as mensagens na pasta"
 
-#: src/mainwindow.c:745
+#: src/mainwindow.c:756
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Ferramentas/_Filtrar mensagens selecionadas"
 
-#: src/mainwindow.c:747 src/messageview.c:264
+#: src/mainwindow.c:758 src/messageview.c:269
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Ferramentas/_Criar regra de filtro"
 
-#: src/mainwindow.c:748 src/messageview.c:266
+#: src/mainwindow.c:759 src/messageview.c:271
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Ferramentas/_Criar regra de filtro/_Automaticamente"
 
-#: src/mainwindow.c:750 src/messageview.c:268
+#: src/mainwindow.c:761 src/messageview.c:273
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Ferramentas/_Criar regra de filtro/pelo _remtente"
 
-#: src/mainwindow.c:752 src/messageview.c:270
+#: src/mainwindow.c:763 src/messageview.c:275
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Ferramentas/_Criar regra de filtro/pelo _destinatário"
 
-#: src/mainwindow.c:754 src/messageview.c:272
+#: src/mainwindow.c:765 src/messageview.c:277
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Ferramentas/_Criar regra de filtro/pelo A_ssunto"
 
-#: src/mainwindow.c:757
+#: src/mainwindow.c:768
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/_Ferramentas/Filtrar spam na _pasta"
 
-#: src/mainwindow.c:759
+#: src/mainwindow.c:770
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/_Ferramentas/Filtrar _spam nas mensagens selecionadas"
 
-#: src/mainwindow.c:764
+#: src/mainwindow.c:775
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/_Ferramentas/_Apagar mensagens duplicadas"
 
-#: src/mainwindow.c:767
+#: src/mainwindow.c:778
 msgid "/_Tools/E_xecute"
 msgstr "/_Ferramentas/E_xecutar"
 
-#: src/mainwindow.c:769
+#: src/mainwindow.c:780
 msgid "/_Tools/_Log window"
 msgstr "/_Ferramentas/_Janela de log"
 
-#: src/mainwindow.c:771
+#: src/mainwindow.c:782
 msgid "/_Configuration"
 msgstr "/_Configuração"
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:783
 msgid "/_Configuration/_Common preferences..."
 msgstr "/_Configuração/_Preferências comuns..."
 
-#: src/mainwindow.c:774
+#: src/mainwindow.c:785
 msgid "/_Configuration/_Filter setting..."
 msgstr "/_Configuração/Configuração de _filtros..."
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:787
 msgid "/_Configuration/_Template..."
 msgstr "/_Configuração/_Modelo..."
 
-#: src/mainwindow.c:777
+#: src/mainwindow.c:788
 msgid "/_Configuration/_Actions..."
 msgstr "/_Configuração/_Ações..."
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:789
 msgid "/_Configuration/---"
 msgstr "/_Configuração/---"
 
-#: src/mainwindow.c:779
+#: src/mainwindow.c:790
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Configuração/Preferências da conta _atual..."
 
-#: src/mainwindow.c:781
+#: src/mainwindow.c:792
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Configuração/Criar uma _nova conta..."
 
-#: src/mainwindow.c:783
+#: src/mainwindow.c:794
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Configuração/_Editar contas..."
 
-#: src/mainwindow.c:785
+#: src/mainwindow.c:796
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Configuração/_Mudar conta atual"
 
-#: src/mainwindow.c:789
+#: src/mainwindow.c:800
 msgid "/_Help/_Manual"
 msgstr "/_Ajuda/_Manual"
 
-#: src/mainwindow.c:790
+#: src/mainwindow.c:801
 msgid "/_Help/_Manual/_English"
 msgstr "/_Ajuda/_Manual/_Inglês"
 
-#: src/mainwindow.c:791
+#: src/mainwindow.c:802
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/_Ajuda/_Manual/_Japonês"
 
-#: src/mainwindow.c:792
+#: src/mainwindow.c:803
 msgid "/_Help/_FAQ"
 msgstr "/_Ajuda/_FAQ"
 
-#: src/mainwindow.c:793
+#: src/mainwindow.c:804
 msgid "/_Help/_FAQ/_English"
 msgstr "/_Ajuda/_FAQ/_Inglês"
 
-#: src/mainwindow.c:794
+#: src/mainwindow.c:805
 msgid "/_Help/_FAQ/_German"
 msgstr "/_Ajuda/_FAQ/_Alemão"
 
-#: src/mainwindow.c:795
+#: src/mainwindow.c:806
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/_Ajuda/_FAQ/_Espanhol"
 
-#: src/mainwindow.c:796
+#: src/mainwindow.c:807
 msgid "/_Help/_FAQ/_French"
 msgstr "/_Ajuda/_FAQ/_Francês"
 
-#: src/mainwindow.c:797
+#: src/mainwindow.c:808
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/_Ajuda/_FAQ/_Italiano"
 
-#: src/mainwindow.c:798
+#: src/mainwindow.c:809
 msgid "/_Help/---"
 msgstr "/_Ajuda/---"
 
-#: src/mainwindow.c:841
+#: src/mainwindow.c:852
 msgid "Creating main window...\n"
 msgstr "Criando janela principal...\n"
 
-#: src/mainwindow.c:1011
+#: src/mainwindow.c:1022
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "MainWindow: falhou ao alocar cores %d\n"
 
-#: src/mainwindow.c:1108 src/summaryview.c:2258 src/summaryview.c:2343
-#: src/summaryview.c:3739 src/summaryview.c:3868 src/summaryview.c:4226
+#: src/mainwindow.c:1119 src/summaryview.c:2275 src/summaryview.c:2360
+#: src/summaryview.c:3896 src/summaryview.c:4025 src/summaryview.c:4383
 msgid "done.\n"
 msgstr "Pronto.\n"
 
-#: src/mainwindow.c:1235 src/mainwindow.c:1276 src/mainwindow.c:1301
+#: src/mainwindow.c:1246 src/mainwindow.c:1287 src/mainwindow.c:1312
 msgid "Untitled"
 msgstr "Sem título"
 
-#: src/mainwindow.c:1302
+#: src/mainwindow.c:1313
 msgid "none"
 msgstr "nenhuma"
 
-#: src/mainwindow.c:1355
+#: src/mainwindow.c:1366
 #, 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:1605
+#: src/mainwindow.c:1616
 msgid "Offline"
 msgstr "Desconectado"
 
-#: src/mainwindow.c:1606
+#: src/mainwindow.c:1617
 msgid "You are offline. Go online?"
 msgstr "Você está desconectado. Conectar?"
 
-#: src/mainwindow.c:1623
+#: src/mainwindow.c:1634
 msgid "Empty all trash"
 msgstr "Esvaziar lixeira"
 
-#: src/mainwindow.c:1624
+#: src/mainwindow.c:1635
 msgid "Delete all messages in trash folders?"
 msgstr "Apagar todas as mensagens nas lixeiras?"
 
-#: src/mainwindow.c:1652
+#: src/mainwindow.c:1663
 msgid "Add mailbox"
 msgstr "Adicionar caixa de correio"
 
-#: src/mainwindow.c:1653
+#: src/mainwindow.c:1664
 msgid ""
 "Specify the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3583,16 +3599,16 @@ msgstr ""
 "Se uma caixa de correio existente for especificada, ela será\n"
 "analisada automaticamente."
 
-#: src/mainwindow.c:1659 src/setup.c:49
+#: src/mainwindow.c:1670 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "A caixa de correio `%s' já existe."
 
-#: src/mainwindow.c:1664 src/setup.c:56
+#: src/mainwindow.c:1675 src/setup.c:56
 msgid "Mailbox"
 msgstr "Correio"
 
-#: src/mainwindow.c:1670 src/setup.c:62
+#: src/mainwindow.c:1681 src/setup.c:62
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3602,145 +3618,145 @@ msgstr ""
 "Talvez alguns arquivos já existam, ou você não tem permissão para escrever "
 "lá."
 
-#: src/mainwindow.c:2088
+#: src/mainwindow.c:2099
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Visão de Pastas"
 
-#: src/mainwindow.c:2107
+#: src/mainwindow.c:2118
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Visão de Mensagens"
 
-#: src/mainwindow.c:2259 src/summaryview.c:408
+#: src/mainwindow.c:2270 src/summaryview.c:408
 msgid "/_Reply"
 msgstr "/_Responder"
 
-#: src/mainwindow.c:2260
+#: src/mainwindow.c:2271
 msgid "/Reply to _all"
 msgstr "/Responder para _todos"
 
-#: src/mainwindow.c:2261
+#: src/mainwindow.c:2272
 msgid "/Reply to _sender"
 msgstr "/Responder para o _remetente"
 
-#: src/mainwindow.c:2262
+#: src/mainwindow.c:2273
 msgid "/Reply to mailing _list"
 msgstr "/Responder para a /_lista"
 
-#: src/mainwindow.c:2267 src/summaryview.c:415
+#: src/mainwindow.c:2278 src/summaryview.c:415
 msgid "/_Forward"
 msgstr "/En_caminhar"
 
-#: src/mainwindow.c:2268 src/summaryview.c:416
+#: src/mainwindow.c:2279 src/summaryview.c:416
 msgid "/For_ward as attachment"
 msgstr "/Encaminhar como ane_xo"
 
-#: src/mainwindow.c:2269 src/summaryview.c:417
+#: src/mainwindow.c:2280 src/summaryview.c:417
 msgid "/Redirec_t"
 msgstr "/Re_direcionar"
 
-#: src/mainwindow.c:2305
+#: src/mainwindow.c:2316
 msgid "Get"
 msgstr "Baixar"
 
-#: src/mainwindow.c:2306
+#: src/mainwindow.c:2317
 msgid "Incorporate new mail"
 msgstr "Incorporar mensagens novas"
 
-#: src/mainwindow.c:2313
+#: src/mainwindow.c:2324
 msgid "Get all"
 msgstr "Baixar tudo"
 
-#: src/mainwindow.c:2314
+#: src/mainwindow.c:2325
 msgid "Incorporate new mail of all accounts"
 msgstr "Incorporar novas mensagens de todas as contas"
 
-#: src/mainwindow.c:2325
+#: src/mainwindow.c:2336
 msgid "Send queued message(s)"
 msgstr "Enviar Mensagem(s) da fila"
 
-#: src/mainwindow.c:2335 src/prefs_account_dialog.c:530
+#: src/mainwindow.c:2346 src/prefs_account_dialog.c:530
 #: src/prefs_common_dialog.c:663 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "Escrever"
 
-#: src/mainwindow.c:2336
+#: src/mainwindow.c:2347
 msgid "Compose new message"
 msgstr "Escrever nova mensagem"
 
-#: src/mainwindow.c:2344 src/prefs_common_dialog.c:975
+#: src/mainwindow.c:2355 src/prefs_common_dialog.c:975
 msgid "Reply"
 msgstr "Responder"
 
-#: src/mainwindow.c:2345 src/mainwindow.c:2358
+#: src/mainwindow.c:2356 src/mainwindow.c:2369
 msgid "Reply to the message"
 msgstr "Responder à Mensagem"
 
-#: src/mainwindow.c:2362
+#: src/mainwindow.c:2373
 msgid "Reply all"
 msgstr "Responder todas"
 
-#: src/mainwindow.c:2363
+#: src/mainwindow.c:2374
 msgid "Reply to all"
 msgstr "Responder para todos"
 
-#: src/mainwindow.c:2371 src/prefs_filter_edit.c:672
+#: src/mainwindow.c:2382 src/prefs_filter_edit.c:672
 msgid "Forward"
 msgstr "Encaminhar"
 
-#: src/mainwindow.c:2372 src/mainwindow.c:2385
+#: src/mainwindow.c:2383 src/mainwindow.c:2396
 msgid "Forward the message"
 msgstr "Encaminhar a mensagem"
 
-#: src/mainwindow.c:2392
+#: src/mainwindow.c:2403
 msgid "Delete the message"
 msgstr "Apagar a mensagem"
 
-#: src/mainwindow.c:2401
+#: src/mainwindow.c:2412
 msgid "Set as junk mail"
 msgstr "Marcar como spam"
 
-#: src/mainwindow.c:2410
+#: src/mainwindow.c:2421
 msgid "Execute"
 msgstr "Executar"
 
-#: src/mainwindow.c:2411
+#: src/mainwindow.c:2422
 msgid "Execute marked process"
 msgstr "Executar os processos marcados"
 
-#: src/mainwindow.c:2421
+#: src/mainwindow.c:2432
 msgid "Next unread message"
 msgstr "Próxima mensagem não lida"
 
-#: src/mainwindow.c:2433
+#: src/mainwindow.c:2444
 msgid "Prefs"
 msgstr "Preferências"
 
-#: src/mainwindow.c:2434
+#: src/mainwindow.c:2445
 msgid "Common preferences"
 msgstr "Preferências comuns"
 
-#: src/mainwindow.c:2442 src/prefs_folder_item.c:289
+#: src/mainwindow.c:2453 src/prefs_folder_item.c:289
 #: src/prefs_folder_item.c:300 src/progressdialog.c:128
 msgid "Account"
 msgstr "Conta"
 
-#: src/mainwindow.c:2443
+#: src/mainwindow.c:2454
 msgid "Account setting"
 msgstr "Preferências da conta"
 
-#: src/mainwindow.c:2615
+#: src/mainwindow.c:2626
 msgid "You are offline. Click the icon to go online."
 msgstr "Você está desconectado. Clique no ícone para conectar."
 
-#: src/mainwindow.c:2626
+#: src/mainwindow.c:2637
 msgid "You are online. Click the icon to go offline."
 msgstr "Você está conectado. Clique no ícone para desconectar."
 
-#: src/mainwindow.c:2892
+#: src/mainwindow.c:2903
 msgid "Exit"
 msgstr "Sair"
 
-#: src/mainwindow.c:2892
+#: src/mainwindow.c:2903
 msgid "Exit this program?"
 msgstr "Sair do programa?"
 
@@ -3777,44 +3793,44 @@ msgstr "Fim da mensagem atingido; continuar do início?"
 msgid "Search finished"
 msgstr "Procura concluída"
 
-#: src/messageview.c:261
+#: src/messageview.c:266
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/_Ferramentas/Adicionar remetente ao Livro de _Endereços"
 
-#: src/messageview.c:291
+#: src/messageview.c:296
 msgid "Creating message view...\n"
 msgstr "Criando visualizador de mensagem...\n"
 
-#: src/messageview.c:316
+#: src/messageview.c:321
 msgid "Text"
 msgstr "Texto"
 
-#: src/messageview.c:321
+#: src/messageview.c:326
 msgid "Attachments"
 msgstr "Anexos"
 
-#: src/messageview.c:371
+#: src/messageview.c:376
 msgid "Message View - Sylpheed"
 msgstr "Visualização da Mensagem - Sylpheed"
 
-#: src/messageview.c:669 src/summaryview.c:3268
+#: src/messageview.c:674 src/summaryview.c:3425
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Não foi possível salvar arquivo `%s'."
 
-#: src/messageview.c:728 src/summaryview.c:3291
+#: src/messageview.c:733 src/summaryview.c:3448
 msgid "The message will be printed with the following command:"
 msgstr "A mensagem será impressa com o seguinte comando:"
 
-#: src/messageview.c:729 src/summaryview.c:3292
+#: src/messageview.c:734 src/summaryview.c:3449
 msgid "(Default print command)"
 msgstr "(Comando padrão de impressão)"
 
-#: src/messageview.c:731 src/prefs_common_dialog.c:2304 src/summaryview.c:3294
+#: src/messageview.c:736 src/prefs_common_dialog.c:2304 src/summaryview.c:3451
 msgid "Print"
 msgstr "Imprimir"
 
-#: src/messageview.c:740 src/summaryview.c:3303
+#: src/messageview.c:745 src/summaryview.c:3460
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -4703,8 +4719,8 @@ msgstr "Mostrar remetente na coluna `De' se ele for o mesmo"
 msgid "Expand threads"
 msgstr "Expandir threads"
 
-#: src/prefs_common_dialog.c:1413 src/prefs_common_dialog.c:2713
-#: src/prefs_common_dialog.c:2751
+#: src/prefs_common_dialog.c:1413 src/prefs_common_dialog.c:2716
+#: src/prefs_common_dialog.c:2754
 msgid "Date format"
 msgstr "Formato de data"
 
@@ -4988,8 +5004,8 @@ msgstr "Comandos externos (%s será sustituido pelo nome do arquivo)"
 msgid "Web browser"
 msgstr "Navegador Web"
 
-#: src/prefs_common_dialog.c:2288 src/prefs_common_dialog.c:3775
-#: src/prefs_common_dialog.c:3796
+#: src/prefs_common_dialog.c:2288 src/prefs_common_dialog.c:3778
+#: src/prefs_common_dialog.c:3799
 msgid "(Default browser)"
 msgstr "(Navegador padrão)"
 
@@ -5065,214 +5081,224 @@ msgid "Greek (ISO-8859-7)"
 msgstr "Grego (ISO-8859-7)"
 
 #: src/prefs_common_dialog.c:2495
+#, fuzzy
+msgid "Arabic (ISO-8859-6)"
+msgstr "Báltico (ISO-8859-4)"
+
+#: src/prefs_common_dialog.c:2496
+#, fuzzy
+msgid "Arabic (Windows-1256)"
+msgstr "Cirílico (Windows-1251)"
+
+#: src/prefs_common_dialog.c:2498
 msgid "Hebrew (ISO-8859-8)"
 msgstr "Hebreu (ISO-8859-8)"
 
-#: src/prefs_common_dialog.c:2496
+#: src/prefs_common_dialog.c:2499
 msgid "Hebrew (Windows-1255)"
 msgstr "Hebreu (Windows-1255)"
 
-#: src/prefs_common_dialog.c:2498
+#: src/prefs_common_dialog.c:2501
 msgid "Turkish (ISO-8859-9)"
 msgstr "Turco (ISO-8859-9)"
 
-#: src/prefs_common_dialog.c:2500
+#: src/prefs_common_dialog.c:2503
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Cirílico (ISO-8859-5)"
 
-#: src/prefs_common_dialog.c:2501
+#: src/prefs_common_dialog.c:2504
 msgid "Cyrillic (KOI8-R)"
 msgstr "Cirílico (KOI8-R)"
 
-#: src/prefs_common_dialog.c:2502
+#: src/prefs_common_dialog.c:2505
 msgid "Cyrillic (KOI8-U)"
 msgstr "Cirílico (KOI8-U)"
 
-#: src/prefs_common_dialog.c:2503
+#: src/prefs_common_dialog.c:2506
 msgid "Cyrillic (Windows-1251)"
 msgstr "Cirílico (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2505
+#: src/prefs_common_dialog.c:2508
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Japonês (ISO-2022-JP)"
 
-#: src/prefs_common_dialog.c:2507
+#: src/prefs_common_dialog.c:2510
 msgid "Japanese (EUC-JP)"
 msgstr "Japonês (EUC-JP)"
 
-#: src/prefs_common_dialog.c:2508
+#: src/prefs_common_dialog.c:2511
 msgid "Japanese (Shift_JIS)"
 msgstr "Japonês (Shift_JIS)"
 
-#: src/prefs_common_dialog.c:2511
+#: src/prefs_common_dialog.c:2514
 msgid "Simplified Chinese (GB2312)"
 msgstr "Chinês simplificado (GB2312)"
 
-#: src/prefs_common_dialog.c:2512
+#: src/prefs_common_dialog.c:2515
 msgid "Simplified Chinese (GBK)"
 msgstr "Chinês simplificado (GBK)"
 
-#: src/prefs_common_dialog.c:2513
+#: src/prefs_common_dialog.c:2516
 msgid "Traditional Chinese (Big5)"
 msgstr "Chinês tradicional (Big5)"
 
-#: src/prefs_common_dialog.c:2515
+#: src/prefs_common_dialog.c:2518
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Chinês tradicional (EUC-TW)"
 
-#: src/prefs_common_dialog.c:2516
+#: src/prefs_common_dialog.c:2519
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Chinês (ISO-2022-CN)"
 
-#: src/prefs_common_dialog.c:2519
+#: src/prefs_common_dialog.c:2522
 msgid "Korean (EUC-KR)"
 msgstr "Coreano (EUC-KR)"
 
-#: src/prefs_common_dialog.c:2521
+#: src/prefs_common_dialog.c:2524
 msgid "Thai (TIS-620)"
 msgstr "Thai (TIS-620)"
 
-#: src/prefs_common_dialog.c:2522
+#: src/prefs_common_dialog.c:2525
 msgid "Thai (Windows-874)"
 msgstr "Thai (Windows-874)"
 
-#: src/prefs_common_dialog.c:2689
+#: src/prefs_common_dialog.c:2692
 msgid "the full abbreviated weekday name"
 msgstr "o nome completo do mês abreviado"
 
-#: src/prefs_common_dialog.c:2690
+#: src/prefs_common_dialog.c:2693
 msgid "the full weekday name"
 msgstr "o nome completo do dia da semana"
 
-#: src/prefs_common_dialog.c:2691
+#: src/prefs_common_dialog.c:2694
 msgid "the abbreviated month name"
 msgstr "o nome do mês abreviado"
 
-#: src/prefs_common_dialog.c:2692
+#: src/prefs_common_dialog.c:2695
 msgid "the full month name"
 msgstr "o nome completo do mês"
 
-#: src/prefs_common_dialog.c:2693
+#: src/prefs_common_dialog.c:2696
 msgid "the preferred date and time for the current locale"
 msgstr "a data é hora preferida para a localização atual"
 
-#: src/prefs_common_dialog.c:2694
+#: src/prefs_common_dialog.c:2697
 msgid "the century number (year/100)"
 msgstr "o número do século (ano/100)"
 
-#: src/prefs_common_dialog.c:2695
+#: src/prefs_common_dialog.c:2698
 msgid "the day of the month as a decimal number"
 msgstr "o dia do mês como um número decimal"
 
-#: src/prefs_common_dialog.c:2696
+#: src/prefs_common_dialog.c:2699
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "a hora como um número decimal usando um relógio de 24 horas"
 
-#: src/prefs_common_dialog.c:2697
+#: src/prefs_common_dialog.c:2700
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "a hora como um número decimal usando um relógio de 12 horas"
 
-#: src/prefs_common_dialog.c:2698
+#: src/prefs_common_dialog.c:2701
 msgid "the day of the year as a decimal number"
 msgstr "o dia do ano como um número decimal"
 
-#: src/prefs_common_dialog.c:2699
+#: src/prefs_common_dialog.c:2702
 msgid "the month as a decimal number"
 msgstr "o mês como um número decimal"
 
-#: src/prefs_common_dialog.c:2700
+#: src/prefs_common_dialog.c:2703
 msgid "the minute as a decimal number"
 msgstr "o minuto como um número decimal"
 
-#: src/prefs_common_dialog.c:2701
+#: src/prefs_common_dialog.c:2704
 msgid "either AM or PM"
 msgstr "ou AM ou PM"
 
-#: src/prefs_common_dialog.c:2702
+#: src/prefs_common_dialog.c:2705
 msgid "the second as a decimal number"
 msgstr "o segundo como um número decimal"
 
-#: src/prefs_common_dialog.c:2703
+#: src/prefs_common_dialog.c:2706
 msgid "the day of the week as a decimal number"
 msgstr "o dia da semana como um número decimal"
 
-#: src/prefs_common_dialog.c:2704
+#: src/prefs_common_dialog.c:2707
 msgid "the preferred date for the current locale"
 msgstr "a data preferida para localização atual"
 
-#: src/prefs_common_dialog.c:2705
+#: src/prefs_common_dialog.c:2708
 msgid "the last two digits of a year"
 msgstr "os últimos dois dígitos de um ano"
 
-#: src/prefs_common_dialog.c:2706
+#: src/prefs_common_dialog.c:2709
 msgid "the year as a decimal number"
 msgstr "o ano como um número decimal"
 
-#: src/prefs_common_dialog.c:2707
+#: src/prefs_common_dialog.c:2710
 msgid "the time zone or name or abbreviation"
 msgstr "o zona de tempo ou nome ou abreviação"
 
-#: src/prefs_common_dialog.c:2728
+#: src/prefs_common_dialog.c:2731
 msgid "Specifier"
 msgstr "Especificador"
 
-#: src/prefs_common_dialog.c:2729
+#: src/prefs_common_dialog.c:2732
 msgid "Description"
 msgstr "Descrição"
 
-#: src/prefs_common_dialog.c:2769
+#: src/prefs_common_dialog.c:2772
 msgid "Example"
 msgstr "Exemplo"
 
-#: src/prefs_common_dialog.c:2850
+#: src/prefs_common_dialog.c:2853
 msgid "Set message colors"
 msgstr "Defina as cores de mensagens"
 
-#: src/prefs_common_dialog.c:2858
+#: src/prefs_common_dialog.c:2861
 msgid "Colors"
 msgstr "Cores"
 
-#: src/prefs_common_dialog.c:2892
+#: src/prefs_common_dialog.c:2895
 msgid "Quoted Text - First Level"
 msgstr "Texto Quotado - Primeiro Nível"
 
-#: src/prefs_common_dialog.c:2898
+#: src/prefs_common_dialog.c:2901
 msgid "Quoted Text - Second Level"
 msgstr "Texto Quotado - Segundo Nível"
 
-#: src/prefs_common_dialog.c:2904
+#: src/prefs_common_dialog.c:2907
 msgid "Quoted Text - Third Level"
 msgstr "Texto Quotado - Terceiro Nível"
 
-#: src/prefs_common_dialog.c:2910
+#: src/prefs_common_dialog.c:2913
 msgid "URI link"
 msgstr "Ligação URI"
 
-#: src/prefs_common_dialog.c:2917
+#: src/prefs_common_dialog.c:2920
 msgid "Recycle quote colors"
 msgstr "Reaproveitar cores de quote"
 
-#: src/prefs_common_dialog.c:2984
+#: src/prefs_common_dialog.c:2987
 msgid "Pick color for quotation level 1"
 msgstr "Escolher cor para quotação nível 1"
 
-#: src/prefs_common_dialog.c:2987
+#: src/prefs_common_dialog.c:2990
 msgid "Pick color for quotation level 2"
 msgstr "Escolher cor para quotação nível 2"
 
-#: src/prefs_common_dialog.c:2990
+#: src/prefs_common_dialog.c:2993
 msgid "Pick color for quotation level 3"
 msgstr "Escolher cor para quotação nível 3"
 
-#: src/prefs_common_dialog.c:2993
+#: src/prefs_common_dialog.c:2996
 msgid "Pick color for URI"
 msgstr "Escolher cor para URI"
 
-#: src/prefs_common_dialog.c:3133
+#: src/prefs_common_dialog.c:3136
 msgid "Description of symbols"
 msgstr "Descrição dos símbolos"
 
-#: src/prefs_common_dialog.c:3189
+#: src/prefs_common_dialog.c:3192
 msgid ""
 "Date\n"
 "From\n"
@@ -5297,11 +5323,11 @@ msgstr ""
 "Message-ID\n"
 "%"
 
-#: src/prefs_common_dialog.c:3202
+#: src/prefs_common_dialog.c:3205
 msgid "If x is set, displays expr"
 msgstr "Se x estiver definido, mostra expr"
 
-#: src/prefs_common_dialog.c:3206
+#: src/prefs_common_dialog.c:3209
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -5315,7 +5341,7 @@ msgstr ""
 "Corpo da mensagem citada sem assinatura\n"
 "%% literal"
 
-#: src/prefs_common_dialog.c:3214
+#: src/prefs_common_dialog.c:3217
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -5327,19 +5353,19 @@ msgstr ""
 "Abre-chave literal\n"
 "Fecha-chave literal"
 
-#: src/prefs_common_dialog.c:3260
+#: src/prefs_common_dialog.c:3263
 msgid "Key bindings"
 msgstr "Atalhos de teclado"
 
-#: src/prefs_common_dialog.c:3273
+#: src/prefs_common_dialog.c:3276
 msgid "Select the preset of key bindings."
 msgstr "Selecione o conjunto pré-definido de mapeamento de teclas."
 
-#: src/prefs_common_dialog.c:3283 src/prefs_common_dialog.c:3607
+#: src/prefs_common_dialog.c:3286 src/prefs_common_dialog.c:3610
 msgid "Default"
 msgstr "Padrão"
 
-#: src/prefs_common_dialog.c:3286 src/prefs_common_dialog.c:3616
+#: src/prefs_common_dialog.c:3289 src/prefs_common_dialog.c:3619
 msgid "Old Sylpheed"
 msgstr "Sylpheed antigo"
 
@@ -5460,7 +5486,7 @@ msgstr "Resultado de comando"
 msgid "Age"
 msgstr "Idade"
 
-#: src/prefs_filter_edit.c:501 src/summaryview.c:510
+#: src/prefs_filter_edit.c:501 src/summaryview.c:512
 #, fuzzy
 msgid "Marked"
 msgstr "Marca"
@@ -5688,17 +5714,17 @@ msgid "Attachment"
 msgstr "Anexo"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73 src/query_search.c:371 src/summaryview.c:4733
+#: src/prefs_summary_column.c:73 src/query_search.c:371 src/summaryview.c:4890
 msgid "Subject"
 msgstr "Assunto"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/query_search.c:372 src/summaryview.c:4736
+#: src/prefs_summary_column.c:74 src/query_search.c:372 src/summaryview.c:4893
 msgid "From"
 msgstr "De"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/query_search.c:373 src/summaryview.c:4738
+#: src/prefs_summary_column.c:75 src/query_search.c:373 src/summaryview.c:4895
 msgid "Date"
 msgstr "Data"
 
@@ -5800,7 +5826,7 @@ msgstr "Procurar mensagens"
 msgid "_Save as search folder"
 msgstr "_Salvar como pasta de busca"
 
-#: src/query_search.c:512 src/subscribedialog.c:523 src/summaryview.c:840
+#: src/query_search.c:512 src/subscribedialog.c:523 src/summaryview.c:842
 msgid "Done."
 msgstr "Feito."
 
@@ -5814,7 +5840,7 @@ msgstr "Procurando %s ..."
 msgid "Searching %s (%d / %d)..."
 msgstr "Procurando %s (%d / %d)..."
 
-#: src/query_search.c:645 src/summaryview.c:2048
+#: src/query_search.c:645 src/summaryview.c:2051
 msgid "(No Date)"
 msgstr "(Sem data)"
 
@@ -6183,301 +6209,306 @@ msgid "/_Mark/Mark as rea_d"
 msgstr "/_Marcar/Marcar como _lida"
 
 #: src/summaryview.c:429
+#, fuzzy
+msgid "/_Mark/Mark _thread as read"
+msgstr "/_Marcar/Marcar como _lida"
+
+#: src/summaryview.c:431
 msgid "/_Mark/Mark all _read"
 msgstr "/_Marcar/Marcar _todas como lidas"
 
-#: src/summaryview.c:430
+#: src/summaryview.c:432
 msgid "/Color la_bel"
 msgstr "/Cor de _identificação"
 
-#: src/summaryview.c:434
+#: src/summaryview.c:436
 msgid "/Re-_edit"
 msgstr "/Re-_editar"
 
-#: src/summaryview.c:436
+#: src/summaryview.c:438
 msgid "/Add sender to address boo_k..."
 msgstr "/Adicionar remetente ao _catálogo de endereços"
 
-#: src/summaryview.c:438
+#: src/summaryview.c:440
 msgid "/Create f_ilter rule"
 msgstr "/_Criar regra de filtro"
 
-#: src/summaryview.c:439
+#: src/summaryview.c:441
 msgid "/Create f_ilter rule/_Automatically"
 msgstr "/_Criar regra de filtro/_Automaticamente"
 
-#: src/summaryview.c:441
+#: src/summaryview.c:443
 msgid "/Create f_ilter rule/by _From"
 msgstr "/_Criar regra de filtro/pelo _remtente"
 
-#: src/summaryview.c:443
+#: src/summaryview.c:445
 msgid "/Create f_ilter rule/by _To"
 msgstr "/_Criar regra de filtro/pelo _destinatário"
 
-#: src/summaryview.c:445
+#: src/summaryview.c:447
 msgid "/Create f_ilter rule/by _Subject"
 msgstr "/_Criar regra de filtro/pelo A_ssunto"
 
-#: src/summaryview.c:451
+#: src/summaryview.c:453
 msgid "/_View/_Source"
 msgstr "/E_xibir/_Fonte"
 
-#: src/summaryview.c:452
+#: src/summaryview.c:454
 msgid "/_View/All _header"
 msgstr "/E_xibir/_Todos os cabeçalhos"
 
-#: src/summaryview.c:454
+#: src/summaryview.c:456
 msgid "/_Print..."
 msgstr "/_Imprimir..."
 
-#: src/summaryview.c:486
+#: src/summaryview.c:488
 msgid "Creating summary view...\n"
 msgstr "Criando visualizador de sumários...\n"
 
-#: src/summaryview.c:508
+#: src/summaryview.c:510
 msgid "All"
 msgstr ""
 
-#: src/summaryview.c:511
+#: src/summaryview.c:513
 #, fuzzy
 msgid "Have color label"
 msgstr "/Cor de _identificação"
 
-#: src/summaryview.c:512
+#: src/summaryview.c:514
 #, fuzzy
 msgid "Have attachment"
 msgstr "Anexo"
 
-#: src/summaryview.c:521
+#: src/summaryview.c:523
 #, fuzzy
 msgid "Search:"
 msgstr "Procurar"
 
-#: src/summaryview.c:535
+#: src/summaryview.c:537
 msgid "Search for Subject or From"
 msgstr ""
 
-#: src/summaryview.c:702
+#: src/summaryview.c:704
 msgid "Process mark"
 msgstr "Procesar marca"
 
-#: src/summaryview.c:703
+#: src/summaryview.c:705
 msgid "Some marks are left. Process it?"
 msgstr "Algumas marcas foram deixadas. Processá-las?"
 
-#: src/summaryview.c:749
+#: src/summaryview.c:751
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "Revisando pasta (%s)..."
 
-#: src/summaryview.c:1292
+#: src/summaryview.c:1295
 msgid "_Search again"
 msgstr "Procurar _novamente"
 
-#: src/summaryview.c:1313 src/summaryview.c:1322
+#: src/summaryview.c:1316 src/summaryview.c:1325
 msgid "No more unread messages"
 msgstr "Não há mais mensagens não lidas"
 
-#: src/summaryview.c:1314
+#: src/summaryview.c:1317
 msgid "No unread message found. Search from the end?"
 msgstr "Nenhuma mensagens não lidas encontrada. Procurar a partir do fim?"
 
-#: src/summaryview.c:1316
+#: src/summaryview.c:1319
 msgid "No unread messages."
 msgstr "Não há mensagens não lidas."
 
-#: src/summaryview.c:1323
+#: src/summaryview.c:1326
 msgid "No unread message found. Go to next folder?"
 msgstr "Não há mensagens não lidas. Ir para a próxima pasta?"
 
-#: src/summaryview.c:1331 src/summaryview.c:1340
+#: src/summaryview.c:1334 src/summaryview.c:1343
 msgid "No more new messages"
 msgstr "Não há mais mensagens novas"
 
-#: src/summaryview.c:1332
+#: src/summaryview.c:1335
 msgid "No new message found. Search from the end?"
 msgstr "Nenhuma mensagens nova encontrada. Procurar a partir do fim?"
 
-#: src/summaryview.c:1334
+#: src/summaryview.c:1337
 msgid "No new messages."
 msgstr "Não há mensagens novas."
 
-#: src/summaryview.c:1341
+#: src/summaryview.c:1344
 msgid "No new message found. Go to next folder?"
 msgstr "Não há mensagens novas. Ir para a próxima pasta?"
 
-#: src/summaryview.c:1349 src/summaryview.c:1358
+#: src/summaryview.c:1352 src/summaryview.c:1361
 msgid "No more marked messages"
 msgstr "Não há mais mensagens marcadas"
 
-#: src/summaryview.c:1350
+#: src/summaryview.c:1353
 msgid "No marked message found. Search from the end?"
 msgstr "Não foram encontradas mensagens marcadas. Procurar a partir do fim?"
 
-#: src/summaryview.c:1352 src/summaryview.c:1361
+#: src/summaryview.c:1355 src/summaryview.c:1364
 msgid "No marked messages."
 msgstr "Não há mensagens marcadas"
 
-#: src/summaryview.c:1359
+#: src/summaryview.c:1362
 msgid "No marked message found. Search from the beginning?"
 msgstr "Não foram encontradas mensagens marcadas. Procurar a partir do início?"
 
-#: src/summaryview.c:1367 src/summaryview.c:1376
+#: src/summaryview.c:1370 src/summaryview.c:1379
 msgid "No more labeled messages"
 msgstr "Não há mais mensagens etiquetadas"
 
-#: src/summaryview.c:1368
+#: src/summaryview.c:1371
 msgid "No labeled message found. Search from the end?"
 msgstr "Não foram encontradas mensagens etiquetadas. Procurar a partir do fim?"
 
-#: src/summaryview.c:1370 src/summaryview.c:1379
+#: src/summaryview.c:1373 src/summaryview.c:1382
 msgid "No labeled messages."
 msgstr "Não há mensagens etiquetadas."
 
-#: src/summaryview.c:1377
+#: src/summaryview.c:1380
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Nenhuma mensagem não lida encontrada. Procurar do início ?"
 
-#: src/summaryview.c:1693
+#: src/summaryview.c:1696
 msgid "Attracting messages by subject..."
 msgstr "Agrupando mensagens por assunto..."
 
-#: src/summaryview.c:1887
+#: src/summaryview.c:1890
 #, c-format
 msgid "%d deleted"
 msgstr "%d apagadas"
 
-#: src/summaryview.c:1891
+#: src/summaryview.c:1894
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d movidas"
 
-#: src/summaryview.c:1892 src/summaryview.c:1897
+#: src/summaryview.c:1895 src/summaryview.c:1900
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:1896
+#: src/summaryview.c:1899
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d copiadas"
 
-#: src/summaryview.c:1911
+#: src/summaryview.c:1914
 msgid " item(s) selected"
 msgstr " item(ns) selecionado(s)"
 
-#: src/summaryview.c:1933
+#: src/summaryview.c:1936
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d novas, %d não lidas, %d  no total (%s)"
 
-#: src/summaryview.c:1937
+#: src/summaryview.c:1940
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d novas, %d não lidas, %d no total"
 
-#: src/summaryview.c:1971
+#: src/summaryview.c:1974
 msgid "Sorting summary..."
 msgstr "Ordenando resumos..."
 
-#: src/summaryview.c:2194
+#: src/summaryview.c:2211
 msgid "\tSetting summary from message data..."
 msgstr "\tConfigurando resumo a partir dos dados das mensagens..."
 
-#: src/summaryview.c:2196
+#: src/summaryview.c:2213
 msgid "Setting summary from message data..."
 msgstr "Configurando resumo a partir dos dados das mensgens..."
 
-#: src/summaryview.c:2302
+#: src/summaryview.c:2319
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Gravando cache de resumo (%s)..."
 
-#: src/summaryview.c:2643
+#: src/summaryview.c:2660
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Mensagem %d marcada\n"
 
-#: src/summaryview.c:2701
+#: src/summaryview.c:2718
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Mensagem %d marcada como sendo lida\n"
 
-#: src/summaryview.c:2789
+#: src/summaryview.c:2908
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Mensagem %d marcada como não lida\n"
 
-#: src/summaryview.c:2850
+#: src/summaryview.c:2969
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Mensagem %s/%d marcada para deleção\n"
 
-#: src/summaryview.c:2878
+#: src/summaryview.c:2997
 msgid "Delete message(s)"
 msgstr "Apagar a(s) mensagem(s)"
 
-#: src/summaryview.c:2879
+#: src/summaryview.c:2998
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Quer realmente apagar a(s) mensagem(s) da lixeira?"
 
-#: src/summaryview.c:2953
+#: src/summaryview.c:3072
 msgid "Deleting duplicated messages..."
 msgstr "Apagando mensagens duplicadas..."
 
-#: src/summaryview.c:2991
+#: src/summaryview.c:3110
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Mensagem %s/%d está desmarcada\n"
 
-#: src/summaryview.c:3049
+#: src/summaryview.c:3168
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Mensagem %d marcada para ser movida para %s\n"
 
-#: src/summaryview.c:3066
+#: src/summaryview.c:3196
 msgid "Destination is same as current folder."
 msgstr "O destino é o mesmo que a pasta atual."
 
-#: src/summaryview.c:3122
+#: src/summaryview.c:3260
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Mensagem %d está marcada para ser copiada para %s\n"
 
-#: src/summaryview.c:3139
+#: src/summaryview.c:3288
 msgid "Destination for copy is same as current folder."
 msgstr "O destino para cópia é o mesmo que a pasta atual."
 
-#: src/summaryview.c:3338
+#: src/summaryview.c:3495
 msgid "Error occurred while processing messages."
 msgstr "Erro ao processar mensagens."
 
-#: src/summaryview.c:3646 src/summaryview.c:3647
+#: src/summaryview.c:3803 src/summaryview.c:3804
 msgid "Building threads..."
 msgstr "Construindo a hierarquia..."
 
-#: src/summaryview.c:3797 src/summaryview.c:3798
+#: src/summaryview.c:3954 src/summaryview.c:3955
 msgid "Unthreading..."
 msgstr "Desfazendo a hierarquia..."
 
-#: src/summaryview.c:4091 src/summaryview.c:4147
+#: src/summaryview.c:4248 src/summaryview.c:4304
 #, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtrando (%d / %d)..."
 
-#: src/summaryview.c:4196
+#: src/summaryview.c:4353
 msgid "filtering..."
 msgstr "filtrando..."
 
-#: src/summaryview.c:4197
+#: src/summaryview.c:4354
 msgid "Filtering..."
 msgstr "Filtrando..."
 
-#: src/summaryview.c:4233
+#: src/summaryview.c:4390
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "%d mensagem(ns) foram filtradas."
 
-#: src/summaryview.c:4742
+#: src/summaryview.c:4899
 msgid "No."
 msgstr "Não."
 
@@ -6494,31 +6525,31 @@ msgstr "Criando visualização do texto...\n"
 msgid "This message can't be displayed.\n"
 msgstr "Esta mensagem não pode ser exibida.\n"
 
-#: src/textview.c:1929
+#: src/textview.c:1925
 msgid "Sa_ve this image as..."
 msgstr "_Salvar imagem como..."
 
-#: src/textview.c:1945 src/trayicon.c:109
+#: src/textview.c:1941 src/trayicon.c:109
 msgid "Compose _new message"
 msgstr "Escrever _nova mensagem"
 
-#: src/textview.c:1947
+#: src/textview.c:1943
 msgid "Add to address _book..."
 msgstr "Adicionar ao _catálogo de endereços"
 
-#: src/textview.c:1949
+#: src/textview.c:1945
 msgid "Copy this add_ress"
 msgstr "Copiar este _endereço"
 
-#: src/textview.c:1952
+#: src/textview.c:1948
 msgid "_Open with Web browser"
 msgstr "A_brir com o navegador Web"
 
-#: src/textview.c:1954
+#: src/textview.c:1950
 msgid "Copy this _link"
 msgstr "Copiar este _link"
 
-#: src/textview.c:2097
+#: src/textview.c:2093
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6531,7 +6562,7 @@ msgstr ""
 "\n"
 "Abrí-la mesmo assim?"
 
-#: src/textview.c:2102
+#: src/textview.c:2098
 msgid "Fake URL warning"
 msgstr "Aviso de URL falsa"
 
diff --git a/po/ro.po b/po/ro.po
index 140da21d..d349ff39 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed 2.2.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-31 15:03+0900\n"
+"POT-Creation-Date: 2006-01-31 15:20+0900\n"
 "PO-Revision-Date: 2006-01-30 19:37+0200\n"
 "Last-Translator: Cristian Secară <cristi@secarica.ro>\n"
 "Language-Team: \n"
@@ -633,8 +633,8 @@ msgstr "%.2fMB"
 msgid "%.2fGB"
 msgstr "%.2fGB"
 
-#: libsylph/utils.c:2373 src/compose.c:2861 src/compose.c:3124
-#: src/compose.c:3187 src/compose.c:3307
+#: libsylph/utils.c:2373 src/compose.c:2867 src/compose.c:3130
+#: src/compose.c:3193 src/compose.c:3313
 msgid "can't change file mode\n"
 msgstr "schimbarea permisiunilor fişierului este imposibilă\n"
 
@@ -726,7 +726,7 @@ msgstr ""
 "recepţionarea mesajelor la comanda 'Verifică tot'."
 
 #: src/account_dialog.c:366 src/addressadd.c:192 src/addressbook.c:493
-#: src/compose.c:4265 src/editaddress.c:200 src/editaddress.c:942
+#: src/compose.c:4271 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:206 src/prefs_filter.c:259 src/prefs_folder_item.c:171
@@ -872,7 +872,7 @@ msgid "Add Address to Book"
 msgstr "Adăugare în agendă"
 
 # (în meniu la compunere)
-#: src/addressadd.c:202 src/compose.c:4765 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4771 src/editaddress.c:201
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "Agendă"
@@ -958,8 +958,8 @@ msgstr "/_Adresă/_Editează"
 msgid "/_Address/_Delete"
 msgstr "/_Adresă/Ş_terge"
 
-#: src/addressbook.c:360 src/compose.c:639 src/mainwindow.c:743
-#: src/messageview.c:259
+#: src/addressbook.c:360 src/compose.c:645 src/mainwindow.c:749
+#: src/messageview.c:264
 msgid "/_Tools"
 msgstr "/_Unelte"
 
@@ -967,13 +967,13 @@ msgstr "/_Unelte"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Unelte/Importă fişier _LDIF"
 
-#: src/addressbook.c:362 src/compose.c:658 src/mainwindow.c:793
-#: src/messageview.c:277
+#: src/addressbook.c:362 src/compose.c:664 src/mainwindow.c:799
+#: src/messageview.c:282
 msgid "/_Help"
 msgstr "/A_jutor"
 
-#: src/addressbook.c:363 src/compose.c:659 src/mainwindow.c:804
-#: src/messageview.c:278
+#: src/addressbook.c:363 src/compose.c:665 src/mainwindow.c:810
+#: src/messageview.c:283
 msgid "/_Help/_About"
 msgstr "/A_jutor/_Despre"
 
@@ -1014,7 +1014,7 @@ msgstr "/Şter_ge"
 msgid "E-Mail address"
 msgstr "Adresă e-mail"
 
-#: src/addressbook.c:498 src/compose.c:4766 src/prefs_common_dialog.c:2183
+#: src/addressbook.c:498 src/compose.c:4772 src/prefs_common_dialog.c:2183
 msgid "Address book"
 msgstr "Agendă"
 
@@ -1025,7 +1025,7 @@ msgstr " Nume:"
 
 #. Buttons
 #: src/addressbook.c:632 src/addressbook.c:1684 src/editaddress.c:884
-#: src/editaddress.c:1017 src/mainwindow.c:2396 src/prefs_actions.c:266
+#: src/editaddress.c:1017 src/mainwindow.c:2402 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
 #: src/prefs_template.c:233
 msgid "Delete"
@@ -1229,7 +1229,7 @@ msgstr "Adresse comună:"
 msgid "Personal address"
 msgstr "Adresse personală:"
 
-#: src/alertpanel.c:141 src/compose.c:5488 src/main.c:573
+#: src/alertpanel.c:141 src/compose.c:5494 src/main.c:573
 msgid "Notice"
 msgstr "Notiţă"
 
@@ -1398,8 +1398,8 @@ msgstr "/_Vizualizare/_Răspunde la"
 
 #: src/compose.c:555 src/compose.c:557 src/compose.c:559 src/compose.c:561
 #: src/mainwindow.c:541 src/mainwindow.c:544 src/mainwindow.c:571
-#: src/mainwindow.c:595 src/mainwindow.c:690 src/mainwindow.c:694
-#: src/messageview.c:236
+#: src/mainwindow.c:595 src/mainwindow.c:696 src/mainwindow.c:700
+#: src/messageview.c:241
 msgid "/_View/---"
 msgstr "/_Vizualizare/---"
 
@@ -1425,9 +1425,10 @@ msgid "/_View/Character _encoding/_Automatic"
 msgstr "/_Vizualizare/_Codificare caractere/_Automat"
 
 #: src/compose.c:570 src/compose.c:576 src/compose.c:582 src/compose.c:586
-#: src/compose.c:592 src/compose.c:596 src/compose.c:602 src/compose.c:606
-#: src/compose.c:616 src/compose.c:620 src/compose.c:628 src/compose.c:632
-#: src/mainwindow.c:598 src/mainwindow.c:605 src/messageview.c:154
+#: src/compose.c:592 src/compose.c:596 src/compose.c:602 src/compose.c:608
+#: src/compose.c:612 src/compose.c:622 src/compose.c:626 src/compose.c:634
+#: src/compose.c:638 src/mainwindow.c:598 src/mainwindow.c:605
+#: src/messageview.c:154
 msgid "/_View/Character _encoding/---"
 msgstr "/_Vizualizare/_Codificare caractere/---"
 
@@ -1464,174 +1465,184 @@ msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Vizualizare/_Codificare caractere/Greek (ISO-8859-7)"
 
 #: src/compose.c:598 src/mainwindow.c:634 src/messageview.c:186
+#, fuzzy
+msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
+msgstr "/_Vizualizare/_Codificare caractere/Baltic (ISO-8859-4)"
+
+#: src/compose.c:600 src/mainwindow.c:636 src/messageview.c:188
+#, fuzzy
+msgid "/_View/Character _encoding/Arabic (Windows-1256)"
+msgstr "/_Vizualizare/_Codificare caractere/Cyirillic (Windows-1251)"
+
+#: src/compose.c:604 src/mainwindow.c:640 src/messageview.c:191
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Vizualizare/_Codificare caractere/Hebrew (ISO-8859-8)"
 
-#: src/compose.c:600 src/mainwindow.c:636 src/messageview.c:188
+#: src/compose.c:606 src/mainwindow.c:642 src/messageview.c:193
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Vizualizare/_Codificare caractere/Hebrew (Windows-1255)"
 
-#: src/compose.c:604 src/mainwindow.c:640 src/messageview.c:191
+#: src/compose.c:610 src/mainwindow.c:646 src/messageview.c:196
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Vizualizare/_Codificare caractere/Turkish (ISO-8859-9)"
 
-#: src/compose.c:608 src/mainwindow.c:644 src/messageview.c:194
+#: src/compose.c:614 src/mainwindow.c:650 src/messageview.c:199
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Vizualizare/_Codificare caractere/Cyrillic (ISO-8859-5)"
 
-#: src/compose.c:610 src/mainwindow.c:646 src/messageview.c:196
+#: src/compose.c:616 src/mainwindow.c:652 src/messageview.c:201
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Vizualizare/_Codificare caractere/Cyrillic (KOI8-R)"
 
-#: src/compose.c:612 src/mainwindow.c:648 src/messageview.c:198
+#: src/compose.c:618 src/mainwindow.c:654 src/messageview.c:203
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Vizualizare/_Codificare caractere/Cyrillic (KOI8-U)"
 
-#: src/compose.c:614 src/mainwindow.c:650 src/messageview.c:200
+#: src/compose.c:620 src/mainwindow.c:656 src/messageview.c:205
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Vizualizare/_Codificare caractere/Cyirillic (Windows-1251)"
 
-#: src/compose.c:618 src/mainwindow.c:654 src/messageview.c:203
+#: src/compose.c:624 src/mainwindow.c:660 src/messageview.c:208
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Vizualizare/_Codificare caractere/Japanese (ISO-2022-JP)"
 
-#: src/compose.c:622 src/mainwindow.c:664 src/messageview.c:212
+#: src/compose.c:628 src/mainwindow.c:670 src/messageview.c:217
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Vizualizare/_Codificare caractere/Simplified Chinese (GB2312)"
 
-#: src/compose.c:624 src/mainwindow.c:666 src/messageview.c:214
+#: src/compose.c:630 src/mainwindow.c:672 src/messageview.c:219
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Vizualizare/_Codificare caractere/Simplified Chinses (GBK)"
 
-#: src/compose.c:626 src/mainwindow.c:668 src/messageview.c:216
+#: src/compose.c:632 src/mainwindow.c:674 src/messageview.c:221
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Vizualizare/_Codificare caractere/Traditional Chinese (Big5)"
 
-#: src/compose.c:630 src/mainwindow.c:676 src/messageview.c:223
+#: src/compose.c:636 src/mainwindow.c:682 src/messageview.c:228
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Vizualizare/_Codificare caractere/Korean (EUC-KR)"
 
-#: src/compose.c:634 src/mainwindow.c:682 src/messageview.c:228
+#: src/compose.c:640 src/mainwindow.c:688 src/messageview.c:233
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Vizualizare/_Codificare caractere/Thai (TIS-620)"
 
-#: src/compose.c:636 src/mainwindow.c:684 src/messageview.c:230
+#: src/compose.c:642 src/mainwindow.c:690 src/messageview.c:235
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Vizualizare/_Codificare caractere/Thai (Windows-874)"
 
-#: src/compose.c:640 src/mainwindow.c:744 src/messageview.c:260
+#: src/compose.c:646 src/mainwindow.c:750 src/messageview.c:265
 msgid "/_Tools/_Address book"
 msgstr "/_Unelte/_Agendă"
 
-#: src/compose.c:641
+#: src/compose.c:647
 msgid "/_Tools/_Template"
 msgstr "/_Unelte/_Şablon"
 
-#: src/compose.c:642 src/mainwindow.c:767 src/messageview.c:275
+#: src/compose.c:648 src/mainwindow.c:773 src/messageview.c:280
 msgid "/_Tools/Actio_ns"
 msgstr "/_Unelte/Acţiu_ni"
 
-#: src/compose.c:643 src/compose.c:647 src/compose.c:653 src/mainwindow.c:747
-#: src/mainwindow.c:761 src/mainwindow.c:766 src/mainwindow.c:768
-#: src/mainwindow.c:771 src/mainwindow.c:773 src/messageview.c:263
-#: src/messageview.c:274
+#: src/compose.c:649 src/compose.c:653 src/compose.c:659 src/mainwindow.c:753
+#: src/mainwindow.c:767 src/mainwindow.c:772 src/mainwindow.c:774
+#: src/mainwindow.c:777 src/mainwindow.c:779 src/messageview.c:268
+#: src/messageview.c:279
 msgid "/_Tools/---"
 msgstr "/_Unelte/---"
 
-#: src/compose.c:644
+#: src/compose.c:650
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/_Unelte/Editează cu editor e_xtern"
 
-#: src/compose.c:648
+#: src/compose.c:654
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Unelte/Semnează P_GP"
 
-#: src/compose.c:649
+#: src/compose.c:655
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/_Unelte/Cr_iptează PGP"
 
-#: src/compose.c:654
+#: src/compose.c:660
 msgid "/_Tools/_Check spell"
 msgstr "/_Unelte/Verifi_că ortografia"
 
-#: src/compose.c:655
+#: src/compose.c:661
 msgid "/_Tools/_Set spell language"
 msgstr "/_Unelte/_Selectează limba ortografiei"
 
-#: src/compose.c:902
+#: src/compose.c:908
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: fişier inexistent\n"
 
-#: src/compose.c:1006 src/compose.c:1077
+#: src/compose.c:1012 src/compose.c:1083
 msgid "Can't get text part\n"
 msgstr "Nu se poate obţine partea de text\n"
 
-#: src/compose.c:1478
+#: src/compose.c:1484
 msgid "Quote mark format error."
 msgstr "Eroare de formatare a citaţiei."
 
-#: src/compose.c:1490
+#: src/compose.c:1496
 msgid "Message reply/forward format error."
 msgstr "Eroare de format de răspuns sau de înaintare mesaj."
 
-#: src/compose.c:1910
+#: src/compose.c:1916
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Fişierul %s nu există\n"
 
-#: src/compose.c:1914
+#: src/compose.c:1920
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Nu se poate obţine dimensiunea fişierului %s\n"
 
-#: src/compose.c:1918
+#: src/compose.c:1924
 #, c-format
 msgid "File %s is empty."
 msgstr "Fişierul %s este gol."
 
-#: src/compose.c:1922
+#: src/compose.c:1928
 #, c-format
 msgid "Can't read %s."
 msgstr "Nu se poate citi %s."
 
-#: src/compose.c:1955
+#: src/compose.c:1961
 #, c-format
 msgid "Message: %s"
 msgstr "Mesaj: %s"
 
-#: src/compose.c:2015 src/mimeview.c:565
+#: src/compose.c:2021 src/mimeview.c:565
 msgid "Can't get the part of multipart message."
 msgstr "Nu se poate obţine o parte a mesajului multiparte."
 
-#: src/compose.c:2499 src/headerview.c:195 src/query_search.c:636
+#: src/compose.c:2505 src/headerview.c:195 src/query_search.c:636
 #: src/summaryview.c:2124
 msgid "(No Subject)"
 msgstr "(Fără subiect)"
 
-#: src/compose.c:2502
+#: src/compose.c:2508
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Compune%s"
 
-#: src/compose.c:2615
+#: src/compose.c:2621
 msgid "Recipient is not specified."
 msgstr "Destinatarul nu a fost specificat."
 
-#: src/compose.c:2623
+#: src/compose.c:2629
 msgid "Empty subject"
 msgstr "Subiect gol"
 
-#: src/compose.c:2624
+#: src/compose.c:2630
 msgid "Subject is empty. Send it anyway?"
 msgstr "Subiectul este gol. Îl trimt oricum ?"
 
 # hm ?
-#: src/compose.c:2683
+#: src/compose.c:2689
 msgid "can't get recipient list."
 msgstr "nu se poate obţine lista destinatarilor."
 
-#: src/compose.c:2703
+#: src/compose.c:2709
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1639,22 +1650,22 @@ msgstr ""
 "Contul pentru trimitere mail nu a fost specificat.\n"
 "Vă rugăm să selectaţi un cont înainte de a trimite."
 
-#: src/compose.c:2717 src/send_message.c:299
+#: src/compose.c:2723 src/send_message.c:299
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "A avut loc o eroare în timpul trimiterii mesajului pe %s ."
 
 # !!! depinde de traducerea lui Outbox !!!
-#: src/compose.c:2759
+#: src/compose.c:2765
 msgid "Can't save the message to outbox."
 msgstr "Nu se poate salva mesajul în 'Trimise'."
 
-#: src/compose.c:2797
+#: src/compose.c:2803
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "Nici o cheie nu a putut fi asociată cu id-ul cheii selectate '%s'."
 
-#: src/compose.c:2894
+#: src/compose.c:2900
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1666,11 +1677,11 @@ msgstr ""
 "\n"
 "Îl trimiteţi oricum ca %s ?"
 
-#: src/compose.c:2900
+#: src/compose.c:2906
 msgid "Code conversion error"
 msgstr "Eroare conversie cod"
 
-#: src/compose.c:2973
+#: src/compose.c:2979
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1683,157 +1694,157 @@ msgstr ""
 "\n"
 "Îl trimit oricum ?"
 
-#: src/compose.c:2977
+#: src/compose.c:2983
 msgid "Line length limit"
 msgstr "Limită lungime linie"
 
-#: src/compose.c:3267
+#: src/compose.c:3273
 msgid "can't remove the old message\n"
 msgstr "nu se poate şterge mesajul vechi\n"
 
-#: src/compose.c:3285
+#: src/compose.c:3291
 msgid "queueing message...\n"
 msgstr "punere mesaj în coada de aşteptare...\n"
 
-#: src/compose.c:3367
+#: src/compose.c:3373
 msgid "can't find queue folder\n"
 msgstr "nu se poate găsi folderul de coadă de aşteptare\n"
 
-#: src/compose.c:3374
+#: src/compose.c:3380
 msgid "can't queue the message\n"
 msgstr "nu se poate pune mesajului în coada de aşteptare\n"
 
-#: src/compose.c:3967
+#: src/compose.c:3973
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "Message-ID creat: %s\n"
 
-#: src/compose.c:4080
+#: src/compose.c:4086
 msgid "Creating compose window...\n"
 msgstr "Creare fereastra de compunere...\n"
 
-#: src/compose.c:4131 src/headerview.c:54
+#: src/compose.c:4137 src/headerview.c:54
 msgid "From:"
 msgstr "De la:"
 
-#: src/compose.c:4205
+#: src/compose.c:4211
 msgid "PGP Sign"
 msgstr "Semnătură PGP"
 
-#: src/compose.c:4208
+#: src/compose.c:4214
 msgid "PGP Encrypt"
 msgstr "Criptare PGP"
 
-#: src/compose.c:4246 src/compose.c:5320
+#: src/compose.c:4252 src/compose.c:5326
 msgid "MIME type"
 msgstr "Tip MIME"
 
 #. S_COL_DATE
-#: src/compose.c:4255 src/mimeview.c:197 src/prefs_filter_edit.c:496
+#: src/compose.c:4261 src/mimeview.c:197 src/prefs_filter_edit.c:496
 #: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4897
 msgid "Size"
 msgstr "Dimensiune"
 
-#: src/compose.c:4686 src/mainwindow.c:2329 src/prefs_account_dialog.c:528
+#: src/compose.c:4692 src/mainwindow.c:2335 src/prefs_account_dialog.c:528
 #: src/prefs_common_dialog.c:661
 msgid "Send"
 msgstr "Trimite"
 
-#: src/compose.c:4687
+#: src/compose.c:4693
 msgid "Send message"
 msgstr "Trimite acum"
 
 # hm ? sau trimite mai târziu ?
-#: src/compose.c:4695
+#: src/compose.c:4701
 msgid "Send later"
 msgstr "Mai târziu"
 
-#: src/compose.c:4696
+#: src/compose.c:4702
 msgid "Put into queue folder and send later"
 msgstr "Pune în coada de aşteptare şi trimite mai târziu"
 
-#: src/compose.c:4704
+#: src/compose.c:4710
 msgid "Draft"
 msgstr "Ciornă"
 
-#: src/compose.c:4705
+#: src/compose.c:4711
 msgid "Save to draft folder"
 msgstr "Salvează în folderul de ciorne"
 
-#: src/compose.c:4715
+#: src/compose.c:4721
 msgid "Insert"
 msgstr "Inserează"
 
-#: src/compose.c:4716
+#: src/compose.c:4722
 msgid "Insert file"
 msgstr "Iserează fişier"
 
-#: src/compose.c:4724
+#: src/compose.c:4730
 msgid "Attach"
 msgstr "Ataşează"
 
-#: src/compose.c:4725
+#: src/compose.c:4731
 msgid "Attach file"
 msgstr "Ataşează fişier"
 
 #. signature
-#: src/compose.c:4735 src/prefs_account_dialog.c:1208
+#: src/compose.c:4741 src/prefs_account_dialog.c:1208
 #: src/prefs_common_dialog.c:953
 msgid "Signature"
 msgstr "Semnătură"
 
-#: src/compose.c:4736
+#: src/compose.c:4742
 msgid "Append signature"
 msgstr "Adaugă semnătură"
 
 #. editor
-#: src/compose.c:4745 src/prefs_common_dialog.c:991
+#: src/compose.c:4751 src/prefs_common_dialog.c:991
 #: src/prefs_common_dialog.c:2315
 msgid "Editor"
 msgstr "Editor"
 
-#: src/compose.c:4746
+#: src/compose.c:4752
 msgid "Edit with external editor"
 msgstr "Editare cu editor extern"
 
-#: src/compose.c:4754
+#: src/compose.c:4760
 msgid "Linewrap"
 msgstr "Desparte liniile"
 
-#: src/compose.c:4755
+#: src/compose.c:4761
 msgid "Wrap all long lines"
 msgstr "Desparte toate liniile lungi"
 
-#: src/compose.c:5216
+#: src/compose.c:5222
 msgid "Invalid MIME type."
 msgstr "Tip MIME invalid."
 
-#: src/compose.c:5234
+#: src/compose.c:5240
 msgid "File doesn't exist or is empty."
 msgstr "Fişierul nu există sau este gol."
 
-#: src/compose.c:5302
+#: src/compose.c:5308
 msgid "Properties"
 msgstr "Proprietăţi"
 
-#: src/compose.c:5322 src/prefs_common_dialog.c:1444
+#: src/compose.c:5328 src/prefs_common_dialog.c:1444
 msgid "Encoding"
 msgstr "Codificare"
 
-#: src/compose.c:5345 src/prefs_folder_item.c:202
+#: src/compose.c:5351 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Cale"
 
-#: src/compose.c:5346
+#: src/compose.c:5352
 msgid "File name"
 msgstr "Nume fişier"
 
-#: src/compose.c:5439
+#: src/compose.c:5445
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Linia de comandă este invalidă: '%s'\n"
 
-#: src/compose.c:5485
+#: src/compose.c:5491
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1842,44 +1853,44 @@ msgstr ""
 "Editorul extern este încă în funcţiune.\n"
 "Forţaţi terminarea procesului (pid: %d) ?\n"
 
-#: src/compose.c:5860 src/compose.c:5865 src/compose.c:5871
+#: src/compose.c:5866 src/compose.c:5871 src/compose.c:5877
 msgid "Can't queue the message."
 msgstr "Nu se poate pune mesajul în coada de aşteptare."
 
-#: src/compose.c:5962
+#: src/compose.c:5968
 msgid "Select files"
 msgstr "Selectează fişiere"
 
-#: src/compose.c:5985
+#: src/compose.c:5991
 msgid "Select file"
 msgstr "Selectează fişier"
 
-#: src/compose.c:6020
+#: src/compose.c:6026
 msgid "Save message"
 msgstr "Salvează mesaj"
 
-#: src/compose.c:6021
+#: src/compose.c:6027
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Acest mesaj a fost modificat. Îl salvaţi în folderul ciorne ?"
 
-#: src/compose.c:6023
+#: src/compose.c:6029
 msgid "Close _without saving"
 msgstr "Închide _fără salvare"
 
-#: src/compose.c:6065
+#: src/compose.c:6071
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Doriţi să aplicaţi şablonul '%s' ?"
 
-#: src/compose.c:6067
+#: src/compose.c:6073
 msgid "Apply template"
 msgstr "Aplică şablon"
 
-#: src/compose.c:6068
+#: src/compose.c:6074
 msgid "_Replace"
 msgstr "Înl_ocuieşte"
 
-#: src/compose.c:6068
+#: src/compose.c:6074
 msgid "_Insert"
 msgstr "_Inserează"
 
@@ -2333,12 +2344,12 @@ msgstr "Setare informaţii folder...\n"
 msgid "Setting folder info..."
 msgstr "Setare informaţii folder..."
 
-#: src/folderview.c:858 src/mainwindow.c:3475 src/setup.c:80
+#: src/folderview.c:858 src/mainwindow.c:3481 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Scanare folder %s%c%s ..."
 
-#: src/folderview.c:862 src/mainwindow.c:3480 src/setup.c:85
+#: src/folderview.c:862 src/mainwindow.c:3486 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Scanare folder %s ..."
@@ -2363,7 +2374,7 @@ msgstr "Reconstrucţia arborelui de foldere a eşuat."
 msgid "Checking for new messages in all folders..."
 msgstr "Verifică pentru mesaje noi în toate folderele..."
 
-#: src/folderview.c:1200 src/mainwindow.c:2405 src/prefs_common_dialog.c:1789
+#: src/folderview.c:1200 src/mainwindow.c:2411 src/prefs_common_dialog.c:1789
 msgid "Junk"
 msgstr "Spam"
 
@@ -2618,7 +2629,7 @@ msgid "Prev"
 msgstr "Precedent"
 
 # hm ? sau înainte ?
-#: src/importldif.c:768 src/mainwindow.c:2425
+#: src/importldif.c:768 src/mainwindow.c:2431
 msgid "Next"
 msgstr "Următor"
 
@@ -3272,359 +3283,359 @@ msgstr "/_Vizualizare/Codificare caract_ere/Detectare _automată"
 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr "/_Vizualizare/Codificare caract_ere/Western European (Windows-1252)"
 
-#: src/mainwindow.c:656 src/messageview.c:205
+#: src/mainwindow.c:662 src/messageview.c:210
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Vizualizare/Codificare caract_ere/Japanese (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:658 src/messageview.c:207
+#: src/mainwindow.c:664 src/messageview.c:212
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Vizualizare/Codificare caract_ere/Japanese (EUC-JP)"
 
-#: src/mainwindow.c:660 src/messageview.c:209
+#: src/mainwindow.c:666 src/messageview.c:214
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Vizualizare/Codificare caract_ere/Japanese (Shift__JIS)"
 
-#: src/mainwindow.c:670 src/messageview.c:218
+#: src/mainwindow.c:676 src/messageview.c:223
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Vizualizare/Codificare caract_ere/Chinezesc Tradiţional (EUC-TW)"
 
-#: src/mainwindow.c:672 src/messageview.c:220
+#: src/mainwindow.c:678 src/messageview.c:225
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Vizualizare/Codificare caract_ere/Chinese (ISO-2022-CN)"
 
-#: src/mainwindow.c:678 src/messageview.c:225
+#: src/mainwindow.c:684 src/messageview.c:230
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Vizualizare/Codificare caract_ere/Korean (ISO-2022-KR)"
 
-#: src/mainwindow.c:691 src/summaryview.c:451
+#: src/mainwindow.c:697 src/summaryview.c:451
 msgid "/_View/Open in new _window"
 msgstr "/_Vizualizare/Des_chide în fereastră nouă"
 
-#: src/mainwindow.c:692 src/messageview.c:237
+#: src/mainwindow.c:698 src/messageview.c:242
 msgid "/_View/Mess_age source"
 msgstr "/_Vizualizare/Sursă mes_aj"
 
-#: src/mainwindow.c:693 src/messageview.c:238
+#: src/mainwindow.c:699 src/messageview.c:243
 msgid "/_View/Show all _header"
 msgstr "/_Vizualizare/Arată tot _header-ul"
 
-#: src/mainwindow.c:695
+#: src/mainwindow.c:701
 msgid "/_View/_Update summary"
 msgstr "/_Vizualizare/Sumar act_ualizare"
 
-#: src/mainwindow.c:697 src/messageview.c:240
+#: src/mainwindow.c:703 src/messageview.c:245
 msgid "/_Message"
 msgstr "/_Mesaj"
 
-#: src/mainwindow.c:698
+#: src/mainwindow.c:704
 msgid "/_Message/Recei_ve"
 msgstr "/_Mesaj/_Primire"
 
-#: src/mainwindow.c:699
+#: src/mainwindow.c:705
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/_Mesaj/_Primire/Primeşte pentru contul _curent"
 
-#: src/mainwindow.c:701
+#: src/mainwindow.c:707
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/_Mesaj/_Primire/Primeşte pentru _toate conturile"
 
-#: src/mainwindow.c:703
+#: src/mainwindow.c:709
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/_Mesaj/_Primire/A_nulează primirea"
 
-#: src/mainwindow.c:705
+#: src/mainwindow.c:711
 msgid "/_Message/Recei_ve/---"
 msgstr "/_Mesaj/_Primire/---"
 
-#: src/mainwindow.c:706
+#: src/mainwindow.c:712
 msgid "/_Message/_Send queued messages"
 msgstr "/_Mesaj/Trimite me_sajele de la coadă"
 
-#: src/mainwindow.c:707 src/mainwindow.c:709 src/mainwindow.c:716
-#: src/mainwindow.c:721 src/mainwindow.c:724 src/mainwindow.c:735
-#: src/mainwindow.c:737 src/mainwindow.c:740 src/messageview.c:243
-#: src/messageview.c:251 src/messageview.c:256
+#: src/mainwindow.c:713 src/mainwindow.c:715 src/mainwindow.c:722
+#: src/mainwindow.c:727 src/mainwindow.c:730 src/mainwindow.c:741
+#: src/mainwindow.c:743 src/mainwindow.c:746 src/messageview.c:248
+#: src/messageview.c:256 src/messageview.c:261
 msgid "/_Message/---"
 msgstr "/_Mesaj/---"
 
-#: src/mainwindow.c:708 src/messageview.c:241
+#: src/mainwindow.c:714 src/messageview.c:246
 msgid "/_Message/Compose _new message"
 msgstr "/_Mesaj/Compune mesaj _nou"
 
-#: src/mainwindow.c:710 src/messageview.c:244
+#: src/mainwindow.c:716 src/messageview.c:249
 msgid "/_Message/_Reply"
 msgstr "/_Mesaj/_Răspunde"
 
-#: src/mainwindow.c:711
+#: src/mainwindow.c:717
 msgid "/_Message/Repl_y to"
 msgstr "/_Mesaj/Răsp_uns"
 
-#: src/mainwindow.c:712 src/messageview.c:245
+#: src/mainwindow.c:718 src/messageview.c:250
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Mesaj/Răsp_uns/Răspunde la _toţi"
 
-#: src/mainwindow.c:713 src/messageview.c:247
+#: src/mainwindow.c:719 src/messageview.c:252
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Mesaj/Răsp_uns/Răspunde _expeditorului"
 
-#: src/mainwindow.c:714 src/messageview.c:249
+#: src/mainwindow.c:720 src/messageview.c:254
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Mesaj/Răsp_uns/Răspunde _listei de discuţii"
 
-#: src/mainwindow.c:717 src/messageview.c:252
+#: src/mainwindow.c:723 src/messageview.c:257
 msgid "/_Message/_Forward"
 msgstr "/_Mesaj/Îna_intează"
 
-#: src/mainwindow.c:718 src/messageview.c:253
+#: src/mainwindow.c:724 src/messageview.c:258
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Mesaj/Înaintează ca _ataşament"
 
-#: src/mainwindow.c:720 src/messageview.c:255
+#: src/mainwindow.c:726 src/messageview.c:260
 msgid "/_Message/Redirec_t"
 msgstr "/_Mesaj/Redirecţionea_ză"
 
-#: src/mainwindow.c:722
+#: src/mainwindow.c:728
 msgid "/_Message/M_ove..."
 msgstr "/_Mesaj/Mu_tă..."
 
-#: src/mainwindow.c:723
+#: src/mainwindow.c:729
 msgid "/_Message/_Copy..."
 msgstr "/_Mesaj/_Copiază..."
 
-#: src/mainwindow.c:725
+#: src/mainwindow.c:731
 msgid "/_Message/_Mark"
 msgstr "/_Mesaj/_Marcare"
 
-#: src/mainwindow.c:726
+#: src/mainwindow.c:732
 msgid "/_Message/_Mark/_Mark"
 msgstr "/_Mesaj/_Marcare/_Marchează"
 
-#: src/mainwindow.c:727
+#: src/mainwindow.c:733
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/_Mesaj/_Marcare/_Demarchează"
 
-#: src/mainwindow.c:728
+#: src/mainwindow.c:734
 msgid "/_Message/_Mark/---"
 msgstr "/_Mesaj/_Marcare/---"
 
-#: src/mainwindow.c:729
+#: src/mainwindow.c:735
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/_Mesaj/_Marcare/Marchează ca _necitit"
 
-#: src/mainwindow.c:730
+#: src/mainwindow.c:736
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/_Mesaj/_Marcare/Marchează ca _citit"
 
-#: src/mainwindow.c:732
+#: src/mainwindow.c:738
 #, fuzzy
 msgid "/_Message/_Mark/Mark _thread as read"
 msgstr "/_Mesaj/_Marcare/Marchează ca _citit"
 
-#: src/mainwindow.c:734
+#: src/mainwindow.c:740
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/_Mesaj/_Marcare/Marchează _totul ca fiind citit"
 
-#: src/mainwindow.c:736
+#: src/mainwindow.c:742
 msgid "/_Message/_Delete"
 msgstr "/_Mesaj/Şter_ge"
 
-#: src/mainwindow.c:738
+#: src/mainwindow.c:744
 msgid "/_Message/Set as _junk mail"
 msgstr "/_Mesaj/Setează ca s_pam"
 
-#: src/mainwindow.c:739
+#: src/mainwindow.c:745
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/_Mesaj/Setează ca n_on-spam"
 
-#: src/mainwindow.c:741 src/messageview.c:257
+#: src/mainwindow.c:747 src/messageview.c:262
 msgid "/_Message/Re-_edit"
 msgstr "/_Mesaj/Re_editează"
 
-#: src/mainwindow.c:745
+#: src/mainwindow.c:751
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/_Unelte/Adaugă expeditorul în _agendă..."
 
-#: src/mainwindow.c:748
+#: src/mainwindow.c:754
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/_Unelte/_Filtrează toate mesajele în folder"
 
-#: src/mainwindow.c:750
+#: src/mainwindow.c:756
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Unelte/Filtrează mesajele _selectate"
 
-#: src/mainwindow.c:752 src/messageview.c:264
+#: src/mainwindow.c:758 src/messageview.c:269
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Unelte/_Crează regulă de filtrare"
 
-#: src/mainwindow.c:753 src/messageview.c:266
+#: src/mainwindow.c:759 src/messageview.c:271
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Unelte/_Crează regulă de filtrare/_Automat"
 
-#: src/mainwindow.c:755 src/messageview.c:268
+#: src/mainwindow.c:761 src/messageview.c:273
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Unelte/_Crează regulă de filtrare/pe baza câmpului _De la"
 
-#: src/mainwindow.c:757 src/messageview.c:270
+#: src/mainwindow.c:763 src/messageview.c:275
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Unelte/_Crează regulă de filtrare/pe baza câmpului _Către"
 
-#: src/mainwindow.c:759 src/messageview.c:272
+#: src/mainwindow.c:765 src/messageview.c:277
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Unelte/_Crează regulă de filtrare/pe baza câmpului _Subiect"
 
-#: src/mainwindow.c:762
+#: src/mainwindow.c:768
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/_Unelte/Filtrează spamul în f_older"
 
-#: src/mainwindow.c:764
+#: src/mainwindow.c:770
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/_Unelte/Filtrează spamul în _mesajele selectate"
 
-#: src/mainwindow.c:769
+#: src/mainwindow.c:775
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/_Unelte/Şterge mesaje du_plicate"
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:778
 msgid "/_Tools/E_xecute"
 msgstr "/_Unelte/E_xecută"
 
 # temporar (log)
-#: src/mainwindow.c:774
+#: src/mainwindow.c:780
 msgid "/_Tools/_Log window"
 msgstr "/_Unelte/Fereastră _log"
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:782
 msgid "/_Configuration"
 msgstr "/_Configuraţie"
 
-#: src/mainwindow.c:777
+#: src/mainwindow.c:783
 msgid "/_Configuration/_Common preferences..."
 msgstr "/_Configuraţie/Preferinţe _comune..."
 
-#: src/mainwindow.c:779
+#: src/mainwindow.c:785
 msgid "/_Configuration/_Filter setting..."
 msgstr "/_Configuraţie/Setări _filtre..."
 
-#: src/mainwindow.c:781
+#: src/mainwindow.c:787
 msgid "/_Configuration/_Template..."
 msgstr "/_Configuraţie/Şa_blon..."
 
-#: src/mainwindow.c:782
+#: src/mainwindow.c:788
 msgid "/_Configuration/_Actions..."
 msgstr "/_Configuraţie/_Acţiuni..."
 
-#: src/mainwindow.c:783
+#: src/mainwindow.c:789
 msgid "/_Configuration/---"
 msgstr "/_Configuraţie/---"
 
-#: src/mainwindow.c:784
+#: src/mainwindow.c:790
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Configuraţie/_Preferinţe pentru contul curent..."
 
-#: src/mainwindow.c:786
+#: src/mainwindow.c:792
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Configuraţie/Crează cont _nou..."
 
-#: src/mainwindow.c:788
+#: src/mainwindow.c:794
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Configuraţie/_Editare conturi..."
 
 # hm ? eu zic că e mai bine decît schimbare cont curent
-#: src/mainwindow.c:790
+#: src/mainwindow.c:796
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Configuraţie/_Selectare cont curent"
 
-#: src/mainwindow.c:794
+#: src/mainwindow.c:800
 msgid "/_Help/_Manual"
 msgstr "/_Ajutor/_Manual"
 
-#: src/mainwindow.c:795
+#: src/mainwindow.c:801
 msgid "/_Help/_Manual/_English"
 msgstr "/_Ajutor/_Manual/_Engleză"
 
-#: src/mainwindow.c:796
+#: src/mainwindow.c:802
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/_Ajutor/_Manual/_Japoneză"
 
-#: src/mainwindow.c:797
+#: src/mainwindow.c:803
 msgid "/_Help/_FAQ"
 msgstr "/_Ajutor/_FAQ"
 
-#: src/mainwindow.c:798
+#: src/mainwindow.c:804
 msgid "/_Help/_FAQ/_English"
 msgstr "/_Ajutor/_FAQ/_Engleză"
 
-#: src/mainwindow.c:799
+#: src/mainwindow.c:805
 msgid "/_Help/_FAQ/_German"
 msgstr "/_Ajutor/_FAQ/_German"
 
-#: src/mainwindow.c:800
+#: src/mainwindow.c:806
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/_Ajutor/_FAQ/_Spanish"
 
-#: src/mainwindow.c:801
+#: src/mainwindow.c:807
 msgid "/_Help/_FAQ/_French"
 msgstr "/_Ajutor/_FAQ/_French"
 
-#: src/mainwindow.c:802
+#: src/mainwindow.c:808
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/_Ajutor/_FAQ/_Italian"
 
-#: src/mainwindow.c:803
+#: src/mainwindow.c:809
 msgid "/_Help/---"
 msgstr "/_Ajutor/---"
 
-#: src/mainwindow.c:846
+#: src/mainwindow.c:852
 msgid "Creating main window...\n"
 msgstr "Creare fereastră principală...\n"
 
-#: src/mainwindow.c:1016
+#: src/mainwindow.c:1022
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Fereastra principală: alocarea culorii %d a eşuat\n"
 
-#: src/mainwindow.c:1113 src/summaryview.c:2275 src/summaryview.c:2360
+#: src/mainwindow.c:1119 src/summaryview.c:2275 src/summaryview.c:2360
 #: src/summaryview.c:3896 src/summaryview.c:4025 src/summaryview.c:4383
 msgid "done.\n"
 msgstr "gata.\n"
 
-#: src/mainwindow.c:1240 src/mainwindow.c:1281 src/mainwindow.c:1306
+#: src/mainwindow.c:1246 src/mainwindow.c:1287 src/mainwindow.c:1312
 msgid "Untitled"
 msgstr "Neintitulat"
 
-#: src/mainwindow.c:1307
+#: src/mainwindow.c:1313
 msgid "none"
 msgstr "nimic"
 
-#: src/mainwindow.c:1360
+#: src/mainwindow.c:1366
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "Schimbare tip separator fereastră din %d în %d\n"
 
-#: src/mainwindow.c:1610
+#: src/mainwindow.c:1616
 msgid "Offline"
 msgstr "Deconectat"
 
 # hm ?
-#: src/mainwindow.c:1611
+#: src/mainwindow.c:1617
 msgid "You are offline. Go online?"
 msgstr "Sunteţi în modul deconectat. Treceţi în modul conectat ?"
 
 # hm ? nu merge goleşte gunoiul cu fraza următoare, sau trebuie reformulată fraza următoare
-#: src/mainwindow.c:1628
+#: src/mainwindow.c:1634
 msgid "Empty all trash"
 msgstr "Golire gunoi"
 
-#: src/mainwindow.c:1629
+#: src/mainwindow.c:1635
 msgid "Delete all messages in trash folders?"
 msgstr "Ştergeţi toate mesajele din containerele de gunoi ?"
 
-#: src/mainwindow.c:1657
+#: src/mainwindow.c:1663
 msgid "Add mailbox"
 msgstr "Adaugă căsuţă poştală"
 
 # hm ? sau specificați ? este o explicaţie sau o comandă ?
-#: src/mainwindow.c:1658
+#: src/mainwindow.c:1664
 msgid ""
 "Specify the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3634,16 +3645,16 @@ msgstr ""
 "Dacă este specificată căsuţa poştală existentă,\n"
 "aceasta va fi scanată automat."
 
-#: src/mainwindow.c:1664 src/setup.c:49
+#: src/mainwindow.c:1670 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Cutia poştală '%s' există deja."
 
-#: src/mainwindow.c:1669 src/setup.c:56
+#: src/mainwindow.c:1675 src/setup.c:56
 msgid "Mailbox"
 msgstr "Căsuţă poştală"
 
-#: src/mainwindow.c:1675 src/setup.c:62
+#: src/mainwindow.c:1681 src/setup.c:62
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3653,152 +3664,152 @@ msgstr ""
 "Poate că anumite fişiere există deja, sau acolo nu aveţi permisiuni de "
 "scriere."
 
-#: src/mainwindow.c:2093
+#: src/mainwindow.c:2099
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Vizualizare folder"
 
-#: src/mainwindow.c:2112
+#: src/mainwindow.c:2118
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Vizualizare mesaj"
 
-#: src/mainwindow.c:2264 src/summaryview.c:408
+#: src/mainwindow.c:2270 src/summaryview.c:408
 msgid "/_Reply"
 msgstr "/_Răspunde"
 
-#: src/mainwindow.c:2265
+#: src/mainwindow.c:2271
 msgid "/Reply to _all"
 msgstr "/Răspunde la _toţi"
 
-#: src/mainwindow.c:2266
+#: src/mainwindow.c:2272
 msgid "/Reply to _sender"
 msgstr "/Răspunde _expeditorului"
 
-#: src/mainwindow.c:2267
+#: src/mainwindow.c:2273
 msgid "/Reply to mailing _list"
 msgstr "/Răspunde _listei de discuţii"
 
-#: src/mainwindow.c:2272 src/summaryview.c:415
+#: src/mainwindow.c:2278 src/summaryview.c:415
 msgid "/_Forward"
 msgstr "/Înaintează mesa_jul"
 
-#: src/mainwindow.c:2273 src/summaryview.c:416
+#: src/mainwindow.c:2279 src/summaryview.c:416
 msgid "/For_ward as attachment"
 msgstr "/Înaintează mesajul ca a_taşament"
 
-#: src/mainwindow.c:2274 src/summaryview.c:417
+#: src/mainwindow.c:2280 src/summaryview.c:417
 msgid "/Redirec_t"
 msgstr "/Re_direcţionează mesajul"
 
-#: src/mainwindow.c:2310
+#: src/mainwindow.c:2316
 msgid "Get"
 msgstr "Verifică"
 
 # ???
-#: src/mainwindow.c:2311
+#: src/mainwindow.c:2317
 msgid "Incorporate new mail"
 msgstr "Verifică şi eventual recepţionează mesaje noi"
 
-#: src/mainwindow.c:2318
+#: src/mainwindow.c:2324
 msgid "Get all"
 msgstr "Verifică tot"
 
-#: src/mainwindow.c:2319
+#: src/mainwindow.c:2325
 msgid "Incorporate new mail of all accounts"
 msgstr "Verifică şi eventual recepţionează mesaje noi pentru toate conturile"
 
-#: src/mainwindow.c:2330
+#: src/mainwindow.c:2336
 msgid "Send queued message(s)"
 msgstr "Trimite eventualele mesaje din coada de aşteptare"
 
 # obs: este comun şi pentru butonul din toolbar şi pentru tab-ul din common preferences
-#: src/mainwindow.c:2340 src/prefs_account_dialog.c:530
+#: src/mainwindow.c:2346 src/prefs_account_dialog.c:530
 #: src/prefs_common_dialog.c:663 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "Compune"
 
-#: src/mainwindow.c:2341
+#: src/mainwindow.c:2347
 msgid "Compose new message"
 msgstr "Compune mesaj nou"
 
 # obs: comun şi pentru buton şi pentru chenarul din common preferencews... -> compose -> general
-#: src/mainwindow.c:2349 src/prefs_common_dialog.c:975
+#: src/mainwindow.c:2355 src/prefs_common_dialog.c:975
 msgid "Reply"
 msgstr "Răspunde"
 
-#: src/mainwindow.c:2350 src/mainwindow.c:2363
+#: src/mainwindow.c:2356 src/mainwindow.c:2369
 msgid "Reply to the message"
 msgstr "Răspunde la mesaj"
 
-#: src/mainwindow.c:2367
+#: src/mainwindow.c:2373
 msgid "Reply all"
 msgstr "Răspunde la toţi"
 
-#: src/mainwindow.c:2368
+#: src/mainwindow.c:2374
 msgid "Reply to all"
 msgstr "Răspunde la toţi"
 
-#: src/mainwindow.c:2376 src/prefs_filter_edit.c:672
+#: src/mainwindow.c:2382 src/prefs_filter_edit.c:672
 msgid "Forward"
 msgstr "Înaintează"
 
-#: src/mainwindow.c:2377 src/mainwindow.c:2390
+#: src/mainwindow.c:2383 src/mainwindow.c:2396
 msgid "Forward the message"
 msgstr "Înaintează mesajul"
 
-#: src/mainwindow.c:2397
+#: src/mainwindow.c:2403
 msgid "Delete the message"
 msgstr "Şterge mesajul"
 
-#: src/mainwindow.c:2406
+#: src/mainwindow.c:2412
 msgid "Set as junk mail"
 msgstr "Setează ca spam"
 
-#: src/mainwindow.c:2415
+#: src/mainwindow.c:2421
 msgid "Execute"
 msgstr "Execută"
 
-#: src/mainwindow.c:2416
+#: src/mainwindow.c:2422
 msgid "Execute marked process"
 msgstr "Execută procesele marcate"
 
-#: src/mainwindow.c:2426
+#: src/mainwindow.c:2432
 msgid "Next unread message"
 msgstr "Următorul mesaj necitit"
 
-#: src/mainwindow.c:2438
+#: src/mainwindow.c:2444
 msgid "Prefs"
 msgstr "Preferinţe"
 
-#: src/mainwindow.c:2439
+#: src/mainwindow.c:2445
 msgid "Common preferences"
 msgstr "Preferinţe comune"
 
-#: src/mainwindow.c:2447 src/prefs_folder_item.c:289
+#: src/mainwindow.c:2453 src/prefs_folder_item.c:289
 #: src/prefs_folder_item.c:300 src/progressdialog.c:128
 msgid "Account"
 msgstr "Cont"
 
-#: src/mainwindow.c:2448
+#: src/mainwindow.c:2454
 msgid "Account setting"
 msgstr "Setări cont"
 
 # hm ?
-#: src/mainwindow.c:2620
+#: src/mainwindow.c:2626
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 "Sunteţi în modul deconectat. Clic pe icon pentru a trece în modul conectat."
 
 # hm ?
-#: src/mainwindow.c:2631
+#: src/mainwindow.c:2637
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 "Sunteţi în modul conectat. Clic pe icon pentru a trece în modul deconectat."
 
-#: src/mainwindow.c:2897
+#: src/mainwindow.c:2903
 msgid "Exit"
 msgstr "Ieşire"
 
-#: src/mainwindow.c:2897
+#: src/mainwindow.c:2903
 msgid "Exit this program?"
 msgstr "Ieşire din acest program ?"
 
@@ -3837,45 +3848,45 @@ msgstr "S-a ajuns la sfârşitul mesajului; continuaţi de la început ?"
 msgid "Search finished"
 msgstr "Căutare terminată"
 
-#: src/messageview.c:261
+#: src/messageview.c:266
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/_Unelte/Adaugă expeditorul în _agendă"
 
-#: src/messageview.c:291
+#: src/messageview.c:296
 msgid "Creating message view...\n"
 msgstr "Creare vedere mesaj...\n"
 
-#: src/messageview.c:316
+#: src/messageview.c:321
 msgid "Text"
 msgstr "Text"
 
-#: src/messageview.c:321
+#: src/messageview.c:326
 msgid "Attachments"
 msgstr "Ataşamente"
 
-#: src/messageview.c:371
+#: src/messageview.c:376
 msgid "Message View - Sylpheed"
 msgstr "Vizualizare mesaje - Syplheed"
 
-#: src/messageview.c:669 src/summaryview.c:3425
+#: src/messageview.c:674 src/summaryview.c:3425
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Nu se poate salva fişierul '%s'."
 
 # hm ?
-#: src/messageview.c:728 src/summaryview.c:3448
+#: src/messageview.c:733 src/summaryview.c:3448
 msgid "The message will be printed with the following command:"
 msgstr "Mesajul va fi imprimat cu următoarea comandă:"
 
-#: src/messageview.c:729 src/summaryview.c:3449
+#: src/messageview.c:734 src/summaryview.c:3449
 msgid "(Default print command)"
 msgstr "(Comandă de imprimare predefinită)"
 
-#: src/messageview.c:731 src/prefs_common_dialog.c:2304 src/summaryview.c:3451
+#: src/messageview.c:736 src/prefs_common_dialog.c:2304 src/summaryview.c:3451
 msgid "Print"
 msgstr "Imprimare"
 
-#: src/messageview.c:740 src/summaryview.c:3460
+#: src/messageview.c:745 src/summaryview.c:3460
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -4784,8 +4795,8 @@ msgstr ""
 msgid "Expand threads"
 msgstr "Desfăşoară firul discuţiilor"
 
-#: src/prefs_common_dialog.c:1413 src/prefs_common_dialog.c:2713
-#: src/prefs_common_dialog.c:2751
+#: src/prefs_common_dialog.c:1413 src/prefs_common_dialog.c:2716
+#: src/prefs_common_dialog.c:2754
 msgid "Date format"
 msgstr "Format dată"
 
@@ -5076,8 +5087,8 @@ msgstr "Comenzi externe (%s va fi înlocuit de nume fişier / URI)"
 msgid "Web browser"
 msgstr "Browser Web"
 
-#: src/prefs_common_dialog.c:2288 src/prefs_common_dialog.c:3775
-#: src/prefs_common_dialog.c:3796
+#: src/prefs_common_dialog.c:2288 src/prefs_common_dialog.c:3778
+#: src/prefs_common_dialog.c:3799
 msgid "(Default browser)"
 msgstr "(Browser implicit)"
 
@@ -5153,214 +5164,224 @@ msgid "Greek (ISO-8859-7)"
 msgstr "Greek (ISO-8859-7)"
 
 #: src/prefs_common_dialog.c:2495
+#, fuzzy
+msgid "Arabic (ISO-8859-6)"
+msgstr "Baltic (ISO-8859-4)"
+
+#: src/prefs_common_dialog.c:2496
+#, fuzzy
+msgid "Arabic (Windows-1256)"
+msgstr "Cyrillic (Windows-1251)"
+
+#: src/prefs_common_dialog.c:2498
 msgid "Hebrew (ISO-8859-8)"
 msgstr "Hebrew (ISO-8859-8)"
 
-#: src/prefs_common_dialog.c:2496
+#: src/prefs_common_dialog.c:2499
 msgid "Hebrew (Windows-1255)"
 msgstr "Hebrew (Windows-1255)"
 
-#: src/prefs_common_dialog.c:2498
+#: src/prefs_common_dialog.c:2501
 msgid "Turkish (ISO-8859-9)"
 msgstr "Turkish (ISO-8859-9)"
 
-#: src/prefs_common_dialog.c:2500
+#: src/prefs_common_dialog.c:2503
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Cyrillic (ISO-8859-5)"
 
-#: src/prefs_common_dialog.c:2501
+#: src/prefs_common_dialog.c:2504
 msgid "Cyrillic (KOI8-R)"
 msgstr "Cyrillic (KOI8-R)"
 
-#: src/prefs_common_dialog.c:2502
+#: src/prefs_common_dialog.c:2505
 msgid "Cyrillic (KOI8-U)"
 msgstr "Cyrillic (KOI8-U)"
 
-#: src/prefs_common_dialog.c:2503
+#: src/prefs_common_dialog.c:2506
 msgid "Cyrillic (Windows-1251)"
 msgstr "Cyrillic (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2505
+#: src/prefs_common_dialog.c:2508
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Japanese (ISO-2022-JP)"
 
-#: src/prefs_common_dialog.c:2507
+#: src/prefs_common_dialog.c:2510
 msgid "Japanese (EUC-JP)"
 msgstr "Japanese (EUC-JP)"
 
-#: src/prefs_common_dialog.c:2508
+#: src/prefs_common_dialog.c:2511
 msgid "Japanese (Shift_JIS)"
 msgstr "Japanese (Shift_JIS)"
 
-#: src/prefs_common_dialog.c:2511
+#: src/prefs_common_dialog.c:2514
 msgid "Simplified Chinese (GB2312)"
 msgstr "Simplified Chinese (GB2312)"
 
-#: src/prefs_common_dialog.c:2512
+#: src/prefs_common_dialog.c:2515
 msgid "Simplified Chinese (GBK)"
 msgstr "Simplified Chinese (GBK)"
 
-#: src/prefs_common_dialog.c:2513
+#: src/prefs_common_dialog.c:2516
 msgid "Traditional Chinese (Big5)"
 msgstr "Traditional Chinese (Big5)"
 
-#: src/prefs_common_dialog.c:2515
+#: src/prefs_common_dialog.c:2518
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Traditional Chinese (EUC-TW)"
 
-#: src/prefs_common_dialog.c:2516
+#: src/prefs_common_dialog.c:2519
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Chinese (ISO-2022-CN)"
 
-#: src/prefs_common_dialog.c:2519
+#: src/prefs_common_dialog.c:2522
 msgid "Korean (EUC-KR)"
 msgstr "Korean (EUC-KR)"
 
-#: src/prefs_common_dialog.c:2521
+#: src/prefs_common_dialog.c:2524
 msgid "Thai (TIS-620)"
 msgstr "Thai (TIS-620)"
 
-#: src/prefs_common_dialog.c:2522
+#: src/prefs_common_dialog.c:2525
 msgid "Thai (Windows-874)"
 msgstr "Thai (Windows-874)"
 
-#: src/prefs_common_dialog.c:2689
+#: src/prefs_common_dialog.c:2692
 msgid "the full abbreviated weekday name"
 msgstr "numele abreviat al zilei săptămânii"
 
-#: src/prefs_common_dialog.c:2690
+#: src/prefs_common_dialog.c:2693
 msgid "the full weekday name"
 msgstr "numele complet al zilei săptămânii"
 
-#: src/prefs_common_dialog.c:2691
+#: src/prefs_common_dialog.c:2694
 msgid "the abbreviated month name"
 msgstr "numele abreviat al lunii"
 
-#: src/prefs_common_dialog.c:2692
+#: src/prefs_common_dialog.c:2695
 msgid "the full month name"
 msgstr "numele complet al lunii"
 
-#: src/prefs_common_dialog.c:2693
+#: src/prefs_common_dialog.c:2696
 msgid "the preferred date and time for the current locale"
 msgstr "data şi timpul preferat pentru localele curente"
 
-#: src/prefs_common_dialog.c:2694
+#: src/prefs_common_dialog.c:2697
 msgid "the century number (year/100)"
 msgstr "numărul secolului (an/100)"
 
-#: src/prefs_common_dialog.c:2695
+#: src/prefs_common_dialog.c:2698
 msgid "the day of the month as a decimal number"
 msgstr "ziua săptămânii ca număr zecimal"
 
-#: src/prefs_common_dialog.c:2696
+#: src/prefs_common_dialog.c:2699
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "ora ca număr zecimal utilizând formatul de 24 ore"
 
-#: src/prefs_common_dialog.c:2697
+#: src/prefs_common_dialog.c:2700
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "ora ca număr zecimal utilizând formatul de 12 ore"
 
-#: src/prefs_common_dialog.c:2698
+#: src/prefs_common_dialog.c:2701
 msgid "the day of the year as a decimal number"
 msgstr "ziua anului ca număr zecimal"
 
-#: src/prefs_common_dialog.c:2699
+#: src/prefs_common_dialog.c:2702
 msgid "the month as a decimal number"
 msgstr "luna ca număr zecimal"
 
-#: src/prefs_common_dialog.c:2700
+#: src/prefs_common_dialog.c:2703
 msgid "the minute as a decimal number"
 msgstr "minutul ca număr zecimal"
 
-#: src/prefs_common_dialog.c:2701
+#: src/prefs_common_dialog.c:2704
 msgid "either AM or PM"
 msgstr "indiferent AM sau PM"
 
-#: src/prefs_common_dialog.c:2702
+#: src/prefs_common_dialog.c:2705
 msgid "the second as a decimal number"
 msgstr "secunda ca număr zecimal"
 
-#: src/prefs_common_dialog.c:2703
+#: src/prefs_common_dialog.c:2706
 msgid "the day of the week as a decimal number"
 msgstr "ziua săptămânii ca număr zecimal"
 
-#: src/prefs_common_dialog.c:2704
+#: src/prefs_common_dialog.c:2707
 msgid "the preferred date for the current locale"
 msgstr "data preferată pentru localele curente"
 
-#: src/prefs_common_dialog.c:2705
+#: src/prefs_common_dialog.c:2708
 msgid "the last two digits of a year"
 msgstr "ultimii doi digiţi ai numărului anului"
 
-#: src/prefs_common_dialog.c:2706
+#: src/prefs_common_dialog.c:2709
 msgid "the year as a decimal number"
 msgstr "anul ca număr zecimal"
 
-#: src/prefs_common_dialog.c:2707
+#: src/prefs_common_dialog.c:2710
 msgid "the time zone or name or abbreviation"
 msgstr "timpul zonal sau numele sau abrevierea"
 
-#: src/prefs_common_dialog.c:2728
+#: src/prefs_common_dialog.c:2731
 msgid "Specifier"
 msgstr "Specificator"
 
-#: src/prefs_common_dialog.c:2729
+#: src/prefs_common_dialog.c:2732
 msgid "Description"
 msgstr "Descriere"
 
-#: src/prefs_common_dialog.c:2769
+#: src/prefs_common_dialog.c:2772
 msgid "Example"
 msgstr "Exemplu"
 
-#: src/prefs_common_dialog.c:2850
+#: src/prefs_common_dialog.c:2853
 msgid "Set message colors"
 msgstr "Stabilire culori mesaj"
 
-#: src/prefs_common_dialog.c:2858
+#: src/prefs_common_dialog.c:2861
 msgid "Colors"
 msgstr "Culori"
 
-#: src/prefs_common_dialog.c:2892
+#: src/prefs_common_dialog.c:2895
 msgid "Quoted Text - First Level"
 msgstr "Citat - primul nivel"
 
-#: src/prefs_common_dialog.c:2898
+#: src/prefs_common_dialog.c:2901
 msgid "Quoted Text - Second Level"
 msgstr "Citat - nivelul al doilea"
 
-#: src/prefs_common_dialog.c:2904
+#: src/prefs_common_dialog.c:2907
 msgid "Quoted Text - Third Level"
 msgstr "Citat - nivelul al treilea"
 
-#: src/prefs_common_dialog.c:2910
+#: src/prefs_common_dialog.c:2913
 msgid "URI link"
 msgstr "Legătură URI"
 
-#: src/prefs_common_dialog.c:2917
+#: src/prefs_common_dialog.c:2920
 msgid "Recycle quote colors"
 msgstr "Reciclează culori citat"
 
-#: src/prefs_common_dialog.c:2984
+#: src/prefs_common_dialog.c:2987
 msgid "Pick color for quotation level 1"
 msgstr "Alege culoarea pentru citatul de nivel 1"
 
-#: src/prefs_common_dialog.c:2987
+#: src/prefs_common_dialog.c:2990
 msgid "Pick color for quotation level 2"
 msgstr "Alege culoarea pentru citatul de nivel 2"
 
-#: src/prefs_common_dialog.c:2990
+#: src/prefs_common_dialog.c:2993
 msgid "Pick color for quotation level 3"
 msgstr "Alege culoarea pentru citatul de nivel 3"
 
-#: src/prefs_common_dialog.c:2993
+#: src/prefs_common_dialog.c:2996
 msgid "Pick color for URI"
 msgstr "Alege culoarea pentru URI"
 
-#: src/prefs_common_dialog.c:3133
+#: src/prefs_common_dialog.c:3136
 msgid "Description of symbols"
 msgstr "Descrierea simbolurilor"
 
-#: src/prefs_common_dialog.c:3189
+#: src/prefs_common_dialog.c:3192
 msgid ""
 "Date\n"
 "From\n"
@@ -5385,11 +5406,11 @@ msgstr ""
 "ID-mesaj"
 
 # ???
-#: src/prefs_common_dialog.c:3202
+#: src/prefs_common_dialog.c:3205
 msgid "If x is set, displays expr"
 msgstr "Dacă x este setat, afişează expr"
 
-#: src/prefs_common_dialog.c:3206
+#: src/prefs_common_dialog.c:3209
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -5404,7 +5425,7 @@ msgstr ""
 "Caracterul %"
 
 # sau linie ?
-#: src/prefs_common_dialog.c:3214
+#: src/prefs_common_dialog.c:3217
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -5416,20 +5437,20 @@ msgstr ""
 "Caracterul {\n"
 "Caracterul }"
 
-#: src/prefs_common_dialog.c:3260
+#: src/prefs_common_dialog.c:3263
 msgid "Key bindings"
 msgstr "Legături chei"
 
 # sau ... stabilirea anticipată a ... ?
-#: src/prefs_common_dialog.c:3273
+#: src/prefs_common_dialog.c:3276
 msgid "Select the preset of key bindings."
 msgstr "Selectează prestabilirea legăturilor de chei."
 
-#: src/prefs_common_dialog.c:3283 src/prefs_common_dialog.c:3607
+#: src/prefs_common_dialog.c:3286 src/prefs_common_dialog.c:3610
 msgid "Default"
 msgstr "Implicit"
 
-#: src/prefs_common_dialog.c:3286 src/prefs_common_dialog.c:3616
+#: src/prefs_common_dialog.c:3289 src/prefs_common_dialog.c:3619
 msgid "Old Sylpheed"
 msgstr "Sylpheed vechi"
 
diff --git a/po/ru.po b/po/ru.po
index 672eebdb..6ea62a32 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: 2006-01-27 18:11+0900\n"
+"POT-Creation-Date: 2006-01-31 15:20+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"
@@ -503,7 +503,7 @@ msgstr "Найдено %s\n"
 msgid "Configuration is saved.\n"
 msgstr "Настройки сохранены.\n"
 
-#: libsylph/prefs_common.c:489
+#: libsylph/prefs_common.c:491
 #, fuzzy
 msgid "Junk mail filter"
 msgstr "папку:"
@@ -619,8 +619,8 @@ msgstr "%.2f Мб"
 msgid "%.2fGB"
 msgstr "%.2f Гб"
 
-#: libsylph/utils.c:2373 src/compose.c:2858 src/compose.c:3121
-#: src/compose.c:3184 src/compose.c:3304
+#: libsylph/utils.c:2373 src/compose.c:2867 src/compose.c:3130
+#: src/compose.c:3193 src/compose.c:3313
 msgid "can't change file mode\n"
 msgstr "не удалось изменить свойства файла\n"
 
@@ -707,8 +707,8 @@ msgstr ""
 "Пометьте в колонке 'G' учетные записи, которые нужно проверять\n"
 "по команде 'Получить все'."
 
-#: src/account_dialog.c:366 src/addressadd.c:192 src/addressbook.c:491
-#: src/compose.c:4262 src/editaddress.c:200 src/editaddress.c:942
+#: src/account_dialog.c:366 src/addressadd.c:192 src/addressbook.c:493
+#: src/compose.c:4271 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:206 src/prefs_filter.c:259 src/prefs_folder_item.c:171
@@ -846,12 +846,12 @@ msgstr "Пользовательский параметр действия"
 msgid "Add Address to Book"
 msgstr "Добавление адреса в книгу"
 
-#: src/addressadd.c:202 src/compose.c:4762 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4771 src/editaddress.c:201
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "Адрес"
 
-#: src/addressadd.c:212 src/addressbook.c:493 src/editaddress.c:202
+#: src/addressadd.c:212 src/addressbook.c:495 src/editaddress.c:202
 #: src/editaddress.c:795 src/editaddress.c:860 src/editgroup.c:267
 msgid "Remarks"
 msgstr "Примечание"
@@ -860,183 +860,183 @@ msgstr "Примечание"
 msgid "Select Address Book Folder"
 msgstr "Выберите папку в адресной книге"
 
-#: src/addressbook.c:336 src/compose.c:515 src/mainwindow.c:477
+#: src/addressbook.c:338 src/compose.c:515 src/mainwindow.c:480
 #: src/messageview.c:138
 msgid "/_File"
 msgstr "/Файл"
 
-#: src/addressbook.c:337
+#: src/addressbook.c:339
 msgid "/_File/New _Book"
 msgstr "/Файл/Новая книга"
 
-#: src/addressbook.c:338
+#: src/addressbook.c:340
 msgid "/_File/New _vCard"
 msgstr "/Файл/Новый файл vCard"
 
-#: src/addressbook.c:340
+#: src/addressbook.c:342
 msgid "/_File/New _JPilot"
 msgstr "/Файл/Новый файл JPilot"
 
-#: src/addressbook.c:343
+#: src/addressbook.c:345
 msgid "/_File/New _Server"
 msgstr "/Файл/Новый сервер"
 
-#: src/addressbook.c:345 src/addressbook.c:348 src/compose.c:520
-#: src/compose.c:525 src/compose.c:528 src/compose.c:531 src/mainwindow.c:495
-#: src/mainwindow.c:498 src/mainwindow.c:500 src/mainwindow.c:503
-#: src/mainwindow.c:505 src/messageview.c:141
+#: src/addressbook.c:347 src/addressbook.c:350 src/compose.c:520
+#: src/compose.c:525 src/compose.c:528 src/compose.c:531 src/mainwindow.c:498
+#: src/mainwindow.c:501 src/mainwindow.c:503 src/mainwindow.c:506
+#: src/mainwindow.c:508 src/messageview.c:141
 msgid "/_File/---"
 msgstr "/Файл/---"
 
-#: src/addressbook.c:346
+#: src/addressbook.c:348
 msgid "/_File/_Edit"
 msgstr "/Файл/Правка"
 
-#: src/addressbook.c:347
+#: src/addressbook.c:349
 msgid "/_File/_Delete"
 msgstr "/Файл/Удалить"
 
-#: src/addressbook.c:349
+#: src/addressbook.c:351
 msgid "/_File/_Save"
 msgstr "/Файл/Сохранить"
 
-#: src/addressbook.c:350 src/compose.c:532 src/messageview.c:142
+#: src/addressbook.c:352 src/compose.c:532 src/messageview.c:142
 msgid "/_File/_Close"
 msgstr "/Файл/Закрыть"
 
-#: src/addressbook.c:351
+#: src/addressbook.c:353
 msgid "/_Address"
 msgstr "/Адрес"
 
-#: src/addressbook.c:352
+#: src/addressbook.c:354
 msgid "/_Address/New _Address"
 msgstr "/Адрес/Новый адрес"
 
-#: src/addressbook.c:353
+#: src/addressbook.c:355
 msgid "/_Address/New _Group"
 msgstr "/Адрес/Новая группа"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:356
 msgid "/_Address/New _Folder"
 msgstr "/Адрес/Новая папка"
 
-#: src/addressbook.c:355
+#: src/addressbook.c:357
 msgid "/_Address/---"
 msgstr "/Адрес/---"
 
-#: src/addressbook.c:356
+#: src/addressbook.c:358
 msgid "/_Address/_Edit"
 msgstr "/Адрес/Правка"
 
-#: src/addressbook.c:357
+#: src/addressbook.c:359
 msgid "/_Address/_Delete"
 msgstr "/Адрес/Удалить"
 
-#: src/addressbook.c:358 src/compose.c:639 src/mainwindow.c:738
-#: src/messageview.c:259
+#: src/addressbook.c:360 src/compose.c:645 src/mainwindow.c:749
+#: src/messageview.c:264
 msgid "/_Tools"
 msgstr "/Инструменты"
 
-#: src/addressbook.c:359
+#: src/addressbook.c:361
 msgid "/_Tools/Import _LDIF file"
 msgstr "/Инструменты/Импорт файла LDIF"
 
-#: src/addressbook.c:360 src/compose.c:658 src/mainwindow.c:788
-#: src/messageview.c:277
+#: src/addressbook.c:362 src/compose.c:664 src/mainwindow.c:799
+#: src/messageview.c:282
 msgid "/_Help"
 msgstr "/Справка"
 
-#: src/addressbook.c:361 src/compose.c:659 src/mainwindow.c:799
-#: src/messageview.c:278
+#: src/addressbook.c:363 src/compose.c:665 src/mainwindow.c:810
+#: src/messageview.c:283
 msgid "/_Help/_About"
 msgstr "/Справка/О программе"
 
-#: src/addressbook.c:380 src/addressbook.c:390
+#: src/addressbook.c:382 src/addressbook.c:392
 msgid "/New _Address"
 msgstr "/Новый адрес"
 
-#: src/addressbook.c:381 src/addressbook.c:391
+#: src/addressbook.c:383 src/addressbook.c:393
 msgid "/New _Group"
 msgstr "/Новая группа"
 
-#: src/addressbook.c:382 src/addressbook.c:392
+#: src/addressbook.c:384 src/addressbook.c:394
 msgid "/New _Folder"
 msgstr "/Новая папка"
 
-#: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:509
+#: src/addressbook.c:385 src/addressbook.c:395 src/compose.c:509
 #: src/folderview.c:246 src/folderview.c:248 src/folderview.c:253
 #: src/folderview.c:266 src/folderview.c:268 src/folderview.c:270
 #: src/folderview.c:275 src/folderview.c:289 src/folderview.c:291
 #: src/folderview.c:295 src/summaryview.c:414 src/summaryview.c:418
-#: src/summaryview.c:421 src/summaryview.c:431 src/summaryview.c:433
-#: src/summaryview.c:435 src/summaryview.c:447 src/summaryview.c:453
+#: src/summaryview.c:421 src/summaryview.c:433 src/summaryview.c:435
+#: src/summaryview.c:437 src/summaryview.c:449 src/summaryview.c:455
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:534
-#: src/mainwindow.c:509 src/messageview.c:144
+#: src/addressbook.c:386 src/addressbook.c:396 src/compose.c:534
+#: src/mainwindow.c:512 src/messageview.c:144
 msgid "/_Edit"
 msgstr "/Правка"
 
-#: src/addressbook.c:385 src/addressbook.c:395 src/summaryview.c:432
+#: src/addressbook.c:387 src/addressbook.c:397 src/summaryview.c:434
 msgid "/_Delete"
 msgstr "/Удалить"
 
-#: src/addressbook.c:492
+#: src/addressbook.c:494
 msgid "E-Mail address"
 msgstr "Адрес E-Mail"
 
-#: src/addressbook.c:496 src/compose.c:4763 src/prefs_common_dialog.c:2183
+#: src/addressbook.c:498 src/compose.c:4772 src/prefs_common_dialog.c:2183
 msgid "Address book"
 msgstr "Адресная книга"
 
-#: src/addressbook.c:596 src/prefs_filter_edit.c:249
+#: src/addressbook.c:600 src/prefs_filter_edit.c:249
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "Имя:"
 
 #. Buttons
-#: src/addressbook.c:628 src/addressbook.c:1680 src/editaddress.c:884
-#: src/editaddress.c:1017 src/mainwindow.c:2391 src/prefs_actions.c:266
+#: src/addressbook.c:632 src/addressbook.c:1684 src/editaddress.c:884
+#: src/editaddress.c:1017 src/mainwindow.c:2402 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
 #: src/prefs_template.c:233
 msgid "Delete"
 msgstr "Удалить"
 
-#: src/addressbook.c:631 src/editaddress.c:890 src/editaddress.c:1023
+#: src/addressbook.c:635 src/editaddress.c:890 src/editaddress.c:1023
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:273 src/prefs_display_header.c:328
 #: src/prefs_filter_edit.c:1550
 msgid "Add"
 msgstr "Добавить"
 
-#: src/addressbook.c:634
+#: src/addressbook.c:638
 msgid "Lookup"
 msgstr "Найти"
 
-#: src/addressbook.c:646 src/headerview.c:55 src/prefs_folder_item.c:339
+#: src/addressbook.c:650 src/headerview.c:55 src/prefs_folder_item.c:339
 #: src/prefs_template.c:176
 msgid "To:"
 msgstr "Кому:"
 
-#: src/addressbook.c:650 src/prefs_folder_item.c:356 src/prefs_template.c:178
+#: src/addressbook.c:654 src/prefs_folder_item.c:356 src/prefs_template.c:178
 msgid "Cc:"
 msgstr "Копия:"
 
-#: src/addressbook.c:654 src/prefs_folder_item.c:367
+#: src/addressbook.c:658 src/prefs_folder_item.c:367
 msgid "Bcc:"
 msgstr "Скрытно:"
 
 #. Confirm deletion
-#: src/addressbook.c:841
+#: src/addressbook.c:845
 msgid "Delete address(es)"
 msgstr "Удалить адрес(а)"
 
-#: src/addressbook.c:842
+#: src/addressbook.c:846
 msgid "Really delete the address(es)?"
 msgstr "Действительно удалить адрес(а)?"
 
-#: src/addressbook.c:1671
+#: src/addressbook.c:1675
 #, fuzzy, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1045,38 +1045,38 @@ msgstr ""
 "Вы хотите удалить папку \"%s\" и все адреса в ней?\n"
 "Если удалить только папку, адреса будут перемещены в родительскую папку."
 
-#: src/addressbook.c:1674 src/folderview.c:2351
+#: src/addressbook.c:1678 src/folderview.c:2351
 msgid "Delete folder"
 msgstr "Удалить папку"
 
-#: src/addressbook.c:1674
+#: src/addressbook.c:1678
 #, fuzzy
 msgid "_Folder only"
 msgstr "Только папку"
 
-#: src/addressbook.c:1674
+#: src/addressbook.c:1678
 #, fuzzy
 msgid "Folder and _addresses"
 msgstr "Папку и адреса"
 
-#: src/addressbook.c:1679
+#: src/addressbook.c:1683
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Действительно удалить '%s' ?"
 
-#: src/addressbook.c:2365 src/addressbook.c:2498
+#: src/addressbook.c:2369 src/addressbook.c:2502
 msgid "New user, could not save index file."
 msgstr "Новый пользователь; не удалось сохранить индексный файл."
 
-#: src/addressbook.c:2369 src/addressbook.c:2502
+#: src/addressbook.c:2373 src/addressbook.c:2506
 msgid "New user, could not save address book files."
 msgstr "Новый пользователь; не удалось сохранить файлы адресной книги."
 
-#: src/addressbook.c:2379 src/addressbook.c:2512
+#: src/addressbook.c:2383 src/addressbook.c:2516
 msgid "Old address book converted successfully."
 msgstr "Старая адресная книга успешно преобразована."
 
-#: src/addressbook.c:2384
+#: src/addressbook.c:2388
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1084,7 +1084,7 @@ msgstr ""
 "Старая адресная книга преобразована,\n"
 "не удалось сохранить новый индексный файл."
 
-#: src/addressbook.c:2397
+#: src/addressbook.c:2401
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1092,7 +1092,7 @@ msgstr ""
 "Не удалось преобразовать адресную книгу,\n"
 "создана пустая адресная книга."
 
-#: src/addressbook.c:2403
+#: src/addressbook.c:2407
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1100,7 +1100,7 @@ msgstr ""
 "Не удалось преобразовать адресную книгу,\n"
 "ошибка при создании файлов адресной книги."
 
-#: src/addressbook.c:2408
+#: src/addressbook.c:2412
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1108,91 +1108,91 @@ msgstr ""
 "Не удалось преобразовать адресную книгу,\n"
 "кроме того, произошла ошибка при создании файлов новой адресной книги."
 
-#: src/addressbook.c:2415
+#: src/addressbook.c:2419
 msgid "Addressbook conversion error"
 msgstr "Ошибка преобразования адресной книги"
 
-#: src/addressbook.c:2419
+#: src/addressbook.c:2423
 msgid "Addressbook conversion"
 msgstr "Преобразование адресной книги"
 
-#: src/addressbook.c:2454
+#: src/addressbook.c:2458
 msgid "Addressbook Error"
 msgstr "Ошибка при работе с адресной книгой"
 
-#: src/addressbook.c:2455 src/addressbook.c:2555
+#: src/addressbook.c:2459 src/addressbook.c:2559
 msgid "Could not read address index"
 msgstr "Не удалось прочитать индекс адресов"
 
-#: src/addressbook.c:2517
+#: src/addressbook.c:2521
 msgid "Old address book converted, could not save new address index file"
 msgstr ""
 "Старая адресная книга преобразована, не удалось сохранить новый индексный "
 "файл"
 
-#: src/addressbook.c:2531
+#: src/addressbook.c:2535
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr ""
 "Не удалось преобразовать адресную книгу, создана пустая адресная книга."
 
-#: src/addressbook.c:2537
+#: src/addressbook.c:2541
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr ""
 "Не удалось преобразовать адресную книгу, ошибка при создании новых файлов "
 "адресной книги"
 
-#: src/addressbook.c:2543
+#: src/addressbook.c:2547
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr ""
 "Не удалось преобразовать адресную книгу, кроме того, произошла ошибка при "
 "создании новых файлов адресной книги."
 
-#: src/addressbook.c:2561
+#: src/addressbook.c:2565
 msgid "Addressbook Conversion Error"
 msgstr "Ошибка преобразования адресной книги"
 
-#: src/addressbook.c:2567
+#: src/addressbook.c:2571
 msgid "Addressbook Conversion"
 msgstr "Преобразование адресной книги"
 
-#: src/addressbook.c:3072 src/prefs_common_dialog.c:2033
+#: src/addressbook.c:3086 src/prefs_common_dialog.c:2033
 msgid "Interface"
 msgstr "Интерфейс"
 
-#: src/addressbook.c:3088 src/importldif.c:514
+#: src/addressbook.c:3102 src/importldif.c:514
 msgid "Address Book"
 msgstr "Адресная книга"
 
-#: src/addressbook.c:3104
+#: src/addressbook.c:3118
 msgid "Person"
 msgstr "Контакт"
 
-#: src/addressbook.c:3120
+#: src/addressbook.c:3134
 msgid "EMail Address"
 msgstr "Адрес E-Mail"
 
-#: src/addressbook.c:3136
+#: src/addressbook.c:3150
 msgid "Group"
 msgstr "Группа"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3152 src/folderview.c:367 src/prefs_account_dialog.c:1694
+#: src/addressbook.c:3166 src/folderview.c:367 src/prefs_account_dialog.c:1694
 #: src/query_search.c:370
 msgid "Folder"
 msgstr "Папка"
 
-#: src/addressbook.c:3168
+#: src/addressbook.c:3182
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3184 src/addressbook.c:3200
+#: src/addressbook.c:3198 src/addressbook.c:3214
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3216
+#: src/addressbook.c:3230
 msgid "LDAP Server"
 msgstr "Сервер LDAP"
 
@@ -1204,7 +1204,7 @@ msgstr "Адреса организаций"
 msgid "Personal address"
 msgstr "Личные адреса"
 
-#: src/alertpanel.c:141 src/compose.c:5485 src/main.c:573
+#: src/alertpanel.c:141 src/compose.c:5494 src/main.c:573
 msgid "Notice"
 msgstr "Уведомление"
 
@@ -1255,7 +1255,7 @@ msgstr "Коричневый"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4593
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4750
 msgid "None"
 msgstr "Нет"
 
@@ -1313,7 +1313,7 @@ msgstr "/Правка/Откат"
 msgid "/_Edit/_Redo"
 msgstr "/Правка/Откат отката"
 
-#: src/compose.c:537 src/compose.c:544 src/mainwindow.c:513
+#: src/compose.c:537 src/compose.c:544 src/mainwindow.c:516
 #: src/messageview.c:147
 msgid "/_Edit/---"
 msgstr "/Правка/---"
@@ -1322,7 +1322,7 @@ msgstr "/Правка/---"
 msgid "/_Edit/Cu_t"
 msgstr "/Правка/Вырезать"
 
-#: src/compose.c:539 src/mainwindow.c:510 src/messageview.c:145
+#: src/compose.c:539 src/mainwindow.c:513 src/messageview.c:145
 msgid "/_Edit/_Copy"
 msgstr "/Правка/Копировать"
 
@@ -1334,7 +1334,7 @@ msgstr "/Правка/Вставить"
 msgid "/_Edit/Paste as _quotation"
 msgstr "/Правка/Вставить как цитату"
 
-#: src/compose.c:543 src/mainwindow.c:511 src/messageview.c:146
+#: src/compose.c:543 src/mainwindow.c:514 src/messageview.c:146
 msgid "/_Edit/Select _all"
 msgstr "/Правка/Выделить все"
 
@@ -1350,8 +1350,8 @@ msgstr "/Правка/Отформатировать все сообщение"
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/Правка/Перенос по словам при вводе"
 
-#: src/compose.c:550 src/mainwindow.c:518 src/messageview.c:151
-#: src/summaryview.c:448
+#: src/compose.c:550 src/mainwindow.c:521 src/messageview.c:151
+#: src/summaryview.c:450
 msgid "/_View"
 msgstr "/Вид"
 
@@ -1372,9 +1372,9 @@ msgid "/_View/_Reply to"
 msgstr "/Вид/Адрес для ответа"
 
 #: src/compose.c:555 src/compose.c:557 src/compose.c:559 src/compose.c:561
-#: src/mainwindow.c:538 src/mainwindow.c:541 src/mainwindow.c:568
-#: src/mainwindow.c:592 src/mainwindow.c:687 src/mainwindow.c:691
-#: src/messageview.c:236
+#: src/mainwindow.c:541 src/mainwindow.c:544 src/mainwindow.c:571
+#: src/mainwindow.c:595 src/mainwindow.c:696 src/mainwindow.c:700
+#: src/messageview.c:241
 msgid "/_View/---"
 msgstr "/Вид/---"
 
@@ -1390,7 +1390,7 @@ msgstr "/Вид/Линейка"
 msgid "/_View/_Attachment"
 msgstr "/Вид/Вложения"
 
-#: src/compose.c:567 src/mainwindow.c:599 src/messageview.c:158
+#: src/compose.c:567 src/mainwindow.c:602 src/messageview.c:158
 #, fuzzy
 msgid "/_View/Character _encoding"
 msgstr "/Вид/Сортировка/По убыванию"
@@ -1400,238 +1400,249 @@ msgid "/_View/Character _encoding/_Automatic"
 msgstr ""
 
 #: src/compose.c:570 src/compose.c:576 src/compose.c:582 src/compose.c:586
-#: src/compose.c:592 src/compose.c:596 src/compose.c:602 src/compose.c:606
-#: src/compose.c:616 src/compose.c:620 src/compose.c:628 src/compose.c:632
-#: src/mainwindow.c:595 src/mainwindow.c:602 src/messageview.c:154
+#: src/compose.c:592 src/compose.c:596 src/compose.c:602 src/compose.c:608
+#: src/compose.c:612 src/compose.c:622 src/compose.c:626 src/compose.c:634
+#: src/compose.c:638 src/mainwindow.c:598 src/mainwindow.c:605
+#: src/messageview.c:154
 #, fuzzy
 msgid "/_View/Character _encoding/---"
 msgstr "/Вид/Сортировка/По убыванию"
 
-#: src/compose.c:572 src/mainwindow.c:603 src/messageview.c:162
+#: src/compose.c:572 src/mainwindow.c:606 src/messageview.c:162
 #, fuzzy
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/Вид/Кодировка/7-битный ascii (US-ASC_II)"
 
-#: src/compose.c:574 src/mainwindow.c:605 src/messageview.c:165
+#: src/compose.c:574 src/mainwindow.c:608 src/messageview.c:165
 #, fuzzy
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/Вид/Кодировка/Unicode (_UTF-8)"
 
-#: src/compose.c:578 src/mainwindow.c:609 src/messageview.c:168
+#: src/compose.c:578 src/mainwindow.c:612 src/messageview.c:168
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/Вид/Кодировка/Западноевропейская (ISO-8859-_1)"
 
-#: src/compose.c:580 src/mainwindow.c:611 src/messageview.c:170
+#: src/compose.c:580 src/mainwindow.c:614 src/messageview.c:170
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/Вид/Кодировка/Западноевропейская (ISO-8859-15)"
 
-#: src/compose.c:584 src/mainwindow.c:617 src/messageview.c:175
+#: src/compose.c:584 src/mainwindow.c:620 src/messageview.c:175
 #, fuzzy
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/Вид/Кодировка/Центральноевропейская (ISO-8859-_2)"
 
-#: src/compose.c:588 src/mainwindow.c:621 src/messageview.c:178
+#: src/compose.c:588 src/mainwindow.c:624 src/messageview.c:178
 #, fuzzy
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/Вид/Кодировка/Балтийская (ISO-8859-13)"
 
-#: src/compose.c:590 src/mainwindow.c:623 src/messageview.c:180
+#: src/compose.c:590 src/mainwindow.c:626 src/messageview.c:180
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/Вид/Кодировка/Балтийская (ISO-8859-_4)"
 
-#: src/compose.c:594 src/mainwindow.c:627 src/messageview.c:183
+#: src/compose.c:594 src/mainwindow.c:630 src/messageview.c:183
 #, fuzzy
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/Вид/Кодировка/Греческая (ISO-8859-_7)"
 
-#: src/compose.c:598 src/mainwindow.c:631 src/messageview.c:186
+#: src/compose.c:598 src/mainwindow.c:634 src/messageview.c:186
+#, fuzzy
+msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
+msgstr "/Вид/Кодировка/Балтийская (ISO-8859-_4)"
+
+#: src/compose.c:600 src/mainwindow.c:636 src/messageview.c:188
+#, fuzzy
+msgid "/_View/Character _encoding/Arabic (Windows-1256)"
+msgstr "/Вид/Кодировка/Кириллическая _Win (Windows-1251)"
+
+#: src/compose.c:604 src/mainwindow.c:640 src/messageview.c:191
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/Вид/Кодировка/Греческая (ISO-8859-_7)"
 
-#: src/compose.c:600 src/mainwindow.c:633 src/messageview.c:188
+#: src/compose.c:606 src/mainwindow.c:642 src/messageview.c:193
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/Вид/Кодировка/Кириллическая _Win (Windows-1251)"
 
-#: src/compose.c:604 src/mainwindow.c:637 src/messageview.c:191
+#: src/compose.c:610 src/mainwindow.c:646 src/messageview.c:196
 #, fuzzy
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/Вид/Кодировка/Турецкая (ISO-8859-_9)"
 
-#: src/compose.c:608 src/mainwindow.c:641 src/messageview.c:194
+#: src/compose.c:614 src/mainwindow.c:650 src/messageview.c:199
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/Вид/Кодировка/Кириллическая (ISO-8859-_5)"
 
-#: src/compose.c:610 src/mainwindow.c:643 src/messageview.c:196
+#: src/compose.c:616 src/mainwindow.c:652 src/messageview.c:201
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/Вид/Кодировка/Русская (KOI8-_R)"
 
-#: src/compose.c:612 src/mainwindow.c:645 src/messageview.c:198
+#: src/compose.c:618 src/mainwindow.c:654 src/messageview.c:203
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/Вид/Кодировка/Украинская (KOI8-_U)"
 
-#: src/compose.c:614 src/mainwindow.c:647 src/messageview.c:200
+#: src/compose.c:620 src/mainwindow.c:656 src/messageview.c:205
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/Вид/Кодировка/Кириллическая _Win (Windows-1251)"
 
-#: src/compose.c:618 src/mainwindow.c:651 src/messageview.c:203
+#: src/compose.c:624 src/mainwindow.c:660 src/messageview.c:208
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/Вид/Кодировка/Японская (ISO-2022-_JP)"
 
-#: src/compose.c:622 src/mainwindow.c:661 src/messageview.c:212
+#: src/compose.c:628 src/mainwindow.c:670 src/messageview.c:217
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/Вид/Кодировка/Упрощенная китайская (_GB2312)"
 
-#: src/compose.c:624 src/mainwindow.c:663 src/messageview.c:214
+#: src/compose.c:630 src/mainwindow.c:672 src/messageview.c:219
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/Вид/Кодировка/Упрощенная китайская (_GB2312)"
 
-#: src/compose.c:626 src/mainwindow.c:665 src/messageview.c:216
+#: src/compose.c:632 src/mainwindow.c:674 src/messageview.c:221
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/Вид/Кодировка/Традиционная китайская (_Big5)"
 
-#: src/compose.c:630 src/mainwindow.c:673 src/messageview.c:223
+#: src/compose.c:636 src/mainwindow.c:682 src/messageview.c:228
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/Вид/Кодировка/Корейская (EUC-_KR)"
 
-#: src/compose.c:634 src/mainwindow.c:679 src/messageview.c:228
+#: src/compose.c:640 src/mainwindow.c:688 src/messageview.c:233
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/Вид/Кодировка/Тайская (TIS-620)"
 
-#: src/compose.c:636 src/mainwindow.c:681 src/messageview.c:230
+#: src/compose.c:642 src/mainwindow.c:690 src/messageview.c:235
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/Вид/Кодировка/Тайская (Windows-874)"
 
-#: src/compose.c:640 src/mainwindow.c:739 src/messageview.c:260
+#: src/compose.c:646 src/mainwindow.c:750 src/messageview.c:265
 msgid "/_Tools/_Address book"
 msgstr "/Инструменты/Адресная книга"
 
-#: src/compose.c:641
+#: src/compose.c:647
 msgid "/_Tools/_Template"
 msgstr "/Инструменты/Шаблон"
 
-#: src/compose.c:642 src/mainwindow.c:762 src/messageview.c:275
+#: src/compose.c:648 src/mainwindow.c:773 src/messageview.c:280
 msgid "/_Tools/Actio_ns"
 msgstr "/Инструменты/Действия"
 
-#: src/compose.c:643 src/compose.c:647 src/compose.c:653 src/mainwindow.c:742
-#: src/mainwindow.c:756 src/mainwindow.c:761 src/mainwindow.c:763
-#: src/mainwindow.c:766 src/mainwindow.c:768 src/messageview.c:263
-#: src/messageview.c:274
+#: src/compose.c:649 src/compose.c:653 src/compose.c:659 src/mainwindow.c:753
+#: src/mainwindow.c:767 src/mainwindow.c:772 src/mainwindow.c:774
+#: src/mainwindow.c:777 src/mainwindow.c:779 src/messageview.c:268
+#: src/messageview.c:279
 msgid "/_Tools/---"
 msgstr "/Инструменты/---"
 
-#: src/compose.c:644
+#: src/compose.c:650
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/Инструменты/Вызвать внешний редактор"
 
-#: src/compose.c:648
+#: src/compose.c:654
 msgid "/_Tools/PGP Si_gn"
 msgstr "/Инструменты/Подписать сообщение (PGP)"
 
-#: src/compose.c:649
+#: src/compose.c:655
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/Инструменты/Шифровать сообщение (PGP)"
 
-#: src/compose.c:654
+#: src/compose.c:660
 #, fuzzy
 msgid "/_Tools/_Check spell"
 msgstr "/Инструменты/Выполнить"
 
-#: src/compose.c:655
+#: src/compose.c:661
 #, fuzzy
 msgid "/_Tools/_Set spell language"
 msgstr "/Инструменты/Шаблон"
 
-#: src/compose.c:899
+#: src/compose.c:908
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: файл не существует\n"
 
-#: src/compose.c:1003 src/compose.c:1074
+#: src/compose.c:1012 src/compose.c:1083
 msgid "Can't get text part\n"
 msgstr "Ошибка получения части текста\n"
 
-#: src/compose.c:1475
+#: src/compose.c:1484
 msgid "Quote mark format error."
 msgstr "Неверный формат метки цитирования."
 
-#: src/compose.c:1487
+#: src/compose.c:1496
 msgid "Message reply/forward format error."
 msgstr "Неверный формат шаблона ответа или пересылки."
 
-#: src/compose.c:1907
+#: src/compose.c:1916
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Файл %s не найден\n"
 
-#: src/compose.c:1911
+#: src/compose.c:1920
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Ошибка определения размера файла %s\n"
 
-#: src/compose.c:1915
+#: src/compose.c:1924
 #, c-format
 msgid "File %s is empty."
 msgstr "Файл %s пустой."
 
-#: src/compose.c:1919
+#: src/compose.c:1928
 #, c-format
 msgid "Can't read %s."
 msgstr "Невозможно прочитать %s."
 
-#: src/compose.c:1952
+#: src/compose.c:1961
 #, c-format
 msgid "Message: %s"
 msgstr "Сообщение: %s"
 
-#: src/compose.c:2012 src/mimeview.c:565
+#: src/compose.c:2021 src/mimeview.c:565
 msgid "Can't get the part of multipart message."
 msgstr "Ошибка при получении одного из компонентов сообщения."
 
-#: src/compose.c:2496 src/headerview.c:195 src/query_search.c:636
-#: src/summaryview.c:2107
+#: src/compose.c:2505 src/headerview.c:195 src/query_search.c:636
+#: src/summaryview.c:2124
 msgid "(No Subject)"
 msgstr "(Без темы)"
 
-#: src/compose.c:2499
+#: src/compose.c:2508
 #, fuzzy, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Подготовка сообщения%s"
 
-#: src/compose.c:2612
+#: src/compose.c:2621
 msgid "Recipient is not specified."
 msgstr "Получатель сообщения не указан."
 
-#: src/compose.c:2620
+#: src/compose.c:2629
 #, fuzzy
 msgid "Empty subject"
 msgstr "Тема"
 
-#: src/compose.c:2621
+#: src/compose.c:2630
 msgid "Subject is empty. Send it anyway?"
 msgstr "Тема сообщения не указана. Отправить без темы?"
 
-#: src/compose.c:2680
+#: src/compose.c:2689
 msgid "can't get recipient list."
 msgstr "ошибка определения списка получателей."
 
-#: src/compose.c:2700
+#: src/compose.c:2709
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1639,21 +1650,21 @@ msgstr ""
 "Учетная запись для отправки почты не определена.\n"
 "Пожалуйста, выберите ее перед отправкой."
 
-#: src/compose.c:2714 src/send_message.c:299
+#: src/compose.c:2723 src/send_message.c:299
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Произошла ошибка при отправке сообщения на %s ."
 
-#: src/compose.c:2756
+#: src/compose.c:2765
 msgid "Can't save the message to outbox."
 msgstr "Ошибка сохранения сообщения в папке отправленных."
 
-#: src/compose.c:2794
+#: src/compose.c:2803
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "Не найден ключ, соответствующий выбранному идентификатору '%s'."
 
-#: src/compose.c:2891
+#: src/compose.c:2900
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1664,12 +1675,12 @@ msgstr ""
 "из %s в %s.\n"
 "Все равно послать его?"
 
-#: src/compose.c:2897
+#: src/compose.c:2906
 #, fuzzy
 msgid "Code conversion error"
 msgstr "Ошибка преобразования адресной книги"
 
-#: src/compose.c:2970
+#: src/compose.c:2979
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1678,159 +1689,159 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:2974
+#: src/compose.c:2983
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3264
+#: src/compose.c:3273
 msgid "can't remove the old message\n"
 msgstr "ошибка удаления старого сообщения\n"
 
-#: src/compose.c:3282
+#: src/compose.c:3291
 msgid "queueing message...\n"
 msgstr "постановка сообщения в очередь...\n"
 
-#: src/compose.c:3364
+#: src/compose.c:3373
 msgid "can't find queue folder\n"
 msgstr "невозможно найти папку очереди\n"
 
-#: src/compose.c:3371
+#: src/compose.c:3380
 msgid "can't queue the message\n"
 msgstr "ошибка размещения в очереди\n"
 
-#: src/compose.c:3964
+#: src/compose.c:3973
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "создан Message-ID: %s\n"
 
-#: src/compose.c:4077
+#: src/compose.c:4086
 msgid "Creating compose window...\n"
 msgstr "Создание окна подготовки сообщения...\n"
 
-#: src/compose.c:4128 src/headerview.c:54
+#: src/compose.c:4137 src/headerview.c:54
 msgid "From:"
 msgstr "От:"
 
-#: src/compose.c:4202
+#: src/compose.c:4211
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/Инструменты/Подписать сообщение (PGP)"
 
-#: src/compose.c:4205
+#: src/compose.c:4214
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/Инструменты/Шифровать сообщение (PGP)"
 
-#: src/compose.c:4243 src/compose.c:5317
+#: src/compose.c:4252 src/compose.c:5326
 msgid "MIME type"
 msgstr "Тип MIME"
 
 #. S_COL_DATE
-#: src/compose.c:4252 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4740
+#: src/compose.c:4261 src/mimeview.c:197 src/prefs_filter_edit.c:496
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4897
 msgid "Size"
 msgstr "Размер"
 
-#: src/compose.c:4683 src/mainwindow.c:2324 src/prefs_account_dialog.c:528
+#: src/compose.c:4692 src/mainwindow.c:2335 src/prefs_account_dialog.c:528
 #: src/prefs_common_dialog.c:661
 msgid "Send"
 msgstr "Отправить"
 
-#: src/compose.c:4684
+#: src/compose.c:4693
 msgid "Send message"
 msgstr "Отправить сообщение"
 
-#: src/compose.c:4692
+#: src/compose.c:4701
 msgid "Send later"
 msgstr "Отправить позже"
 
-#: src/compose.c:4693
+#: src/compose.c:4702
 msgid "Put into queue folder and send later"
 msgstr "Поместить в очередь и отправить позже"
 
-#: src/compose.c:4701
+#: src/compose.c:4710
 msgid "Draft"
 msgstr "Черновики"
 
-#: src/compose.c:4702
+#: src/compose.c:4711
 msgid "Save to draft folder"
 msgstr "Сохранить в папке черновиков"
 
-#: src/compose.c:4712
+#: src/compose.c:4721
 msgid "Insert"
 msgstr "Вставить"
 
-#: src/compose.c:4713
+#: src/compose.c:4722
 msgid "Insert file"
 msgstr "Вставить файл"
 
-#: src/compose.c:4721
+#: src/compose.c:4730
 msgid "Attach"
 msgstr "Вложение"
 
-#: src/compose.c:4722
+#: src/compose.c:4731
 msgid "Attach file"
 msgstr "Вложить файл"
 
 #. signature
-#: src/compose.c:4732 src/prefs_account_dialog.c:1208
+#: src/compose.c:4741 src/prefs_account_dialog.c:1208
 #: src/prefs_common_dialog.c:953
 msgid "Signature"
 msgstr "Подпись"
 
-#: src/compose.c:4733
+#: src/compose.c:4742
 #, fuzzy
 msgid "Append signature"
 msgstr "ПЛОХАЯ подпись"
 
 #. editor
-#: src/compose.c:4742 src/prefs_common_dialog.c:991
+#: src/compose.c:4751 src/prefs_common_dialog.c:991
 #: src/prefs_common_dialog.c:2315
 msgid "Editor"
 msgstr "Редактор"
 
-#: src/compose.c:4743
+#: src/compose.c:4752
 msgid "Edit with external editor"
 msgstr "Править внешним редактором"
 
-#: src/compose.c:4751
+#: src/compose.c:4760
 msgid "Linewrap"
 msgstr "Перенос строк"
 
-#: src/compose.c:4752
+#: src/compose.c:4761
 msgid "Wrap all long lines"
 msgstr "Отформатировать все сообщение"
 
-#: src/compose.c:5213
+#: src/compose.c:5222
 msgid "Invalid MIME type."
 msgstr "Неверный тип MIME."
 
-#: src/compose.c:5231
+#: src/compose.c:5240
 msgid "File doesn't exist or is empty."
 msgstr "Файл не существует или пуст."
 
-#: src/compose.c:5299
+#: src/compose.c:5308
 msgid "Properties"
 msgstr "Свойства"
 
-#: src/compose.c:5319 src/prefs_common_dialog.c:1444
+#: src/compose.c:5328 src/prefs_common_dialog.c:1444
 msgid "Encoding"
 msgstr "Кодировка"
 
-#: src/compose.c:5342 src/prefs_folder_item.c:202
+#: src/compose.c:5351 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Путь"
 
-#: src/compose.c:5343
+#: src/compose.c:5352
 msgid "File name"
 msgstr "Имя файла"
 
-#: src/compose.c:5436
+#: src/compose.c:5445
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Неверная команда вызова внешнего редактора: '%s'\n"
 
-#: src/compose.c:5482
+#: src/compose.c:5491
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1840,48 +1851,48 @@ msgstr ""
 "Завершить процесс принудительно?\n"
 "Идентификатор группы процессов: %d"
 
-#: src/compose.c:5857 src/compose.c:5862 src/compose.c:5868
+#: src/compose.c:5866 src/compose.c:5871 src/compose.c:5877
 msgid "Can't queue the message."
 msgstr "Ошибка постановки в очередь."
 
-#: src/compose.c:5959
+#: src/compose.c:5968
 #, fuzzy
 msgid "Select files"
 msgstr "Выбор файла"
 
-#: src/compose.c:5982
+#: src/compose.c:5991
 msgid "Select file"
 msgstr "Выбор файла"
 
-#: src/compose.c:6017
+#: src/compose.c:6026
 #, fuzzy
 msgid "Save message"
 msgstr "Отправить сообщение"
 
-#: src/compose.c:6018
+#: src/compose.c:6027
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Это сообщение изменено. Отказаться от него?"
 
-#: src/compose.c:6020
+#: src/compose.c:6029
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:6062
+#: src/compose.c:6071
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Применить шаблон '%s'?"
 
-#: src/compose.c:6064
+#: src/compose.c:6073
 msgid "Apply template"
 msgstr "Применить шаблон"
 
-#: src/compose.c:6065
+#: src/compose.c:6074
 #, fuzzy
 msgid "_Replace"
 msgstr "Заменить"
 
-#: src/compose.c:6065
+#: src/compose.c:6074
 #, fuzzy
 msgid "_Insert"
 msgstr "Вставить"
@@ -2321,7 +2332,7 @@ msgstr "Новые"
 
 #. S_COL_MARK
 #: src/folderview.c:412 src/prefs_filter_edit.c:500
-#: src/prefs_summary_column.c:71 src/summaryview.c:509
+#: src/prefs_summary_column.c:71 src/summaryview.c:511
 msgid "Unread"
 msgstr "Непрочитанные"
 
@@ -2337,12 +2348,12 @@ msgstr "Установка информации о папке...\n"
 msgid "Setting folder info..."
 msgstr "Установка информации о папке..."
 
-#: src/folderview.c:858 src/mainwindow.c:3464 src/setup.c:80
+#: src/folderview.c:858 src/mainwindow.c:3481 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Просмотр папки %s%c%s ..."
 
-#: src/folderview.c:862 src/mainwindow.c:3469 src/setup.c:85
+#: src/folderview.c:862 src/mainwindow.c:3486 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Просмотр папки %s ..."
@@ -2367,7 +2378,7 @@ msgstr "Ошибка при перестройке дерева папок."
 msgid "Checking for new messages in all folders..."
 msgstr "Проверка новых сообщений во всех папках..."
 
-#: src/folderview.c:1200 src/mainwindow.c:2400 src/prefs_common_dialog.c:1789
+#: src/folderview.c:1200 src/mainwindow.c:2411 src/prefs_common_dialog.c:1789
 msgid "Junk"
 msgstr ""
 
@@ -2506,7 +2517,7 @@ msgstr "Тема:"
 msgid "Creating header view...\n"
 msgstr "Создание области просмотра заголовков...\n"
 
-#: src/headerview.c:180 src/query_search.c:637 src/summaryview.c:2110
+#: src/headerview.c:180 src/query_search.c:637 src/summaryview.c:2127
 msgid "(No From)"
 msgstr "(Без отправителя)"
 
@@ -2615,7 +2626,7 @@ msgstr "Импорт файла LDIF в адресную книгу"
 msgid "Prev"
 msgstr "Назад"
 
-#: src/importldif.c:768 src/mainwindow.c:2420
+#: src/importldif.c:768 src/mainwindow.c:2431
 msgid "Next"
 msgstr "Далее"
 
@@ -2959,659 +2970,664 @@ msgstr ""
 msgid "another Sylpheed is already running.\n"
 msgstr "другая копия Sylpheed уже запущена.\n"
 
-#: src/main.c:1064
+#: src/main.c:1083
 #, fuzzy
 msgid "Migration of configuration"
 msgstr "Настройка действий"
 
-#: src/main.c:1065
+#: src/main.c:1084
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
 msgstr ""
 
-#: src/mainwindow.c:478
+#: src/mainwindow.c:481
 msgid "/_File/_Folder"
 msgstr "/Файл/Папка"
 
-#: src/mainwindow.c:479
+#: src/mainwindow.c:482
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/Файл/Папка/Создать новую папку..."
 
-#: src/mainwindow.c:481
+#: src/mainwindow.c:484
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/Файл/Папка/Переименовать папку..."
 
-#: src/mainwindow.c:482
+#: src/mainwindow.c:485
 #, fuzzy
 msgid "/_File/_Folder/_Move folder..."
 msgstr "/Файл/Папка/Переименовать папку..."
 
-#: src/mainwindow.c:483
+#: src/mainwindow.c:486
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/Файл/Папка/Удалить папку"
 
-#: src/mainwindow.c:484
+#: src/mainwindow.c:487
 msgid "/_File/_Mailbox"
 msgstr "/Файл/Почтовый ящик"
 
-#: src/mainwindow.c:485
+#: src/mainwindow.c:488
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/Файл/Почтовый ящик/Добавить почтовый ящик..."
 
-#: src/mainwindow.c:486
+#: src/mainwindow.c:489
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/Файл/Почтовый ящик/Удалить почтовый ящик"
 
-#: src/mainwindow.c:487 src/mainwindow.c:492
+#: src/mainwindow.c:490 src/mainwindow.c:495
 msgid "/_File/_Mailbox/---"
 msgstr "/Файл/Почтовый ящик/---"
 
-#: src/mainwindow.c:488
+#: src/mainwindow.c:491
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "/Файл/Почтовый ящик/Проверить новые сообщения"
 
-#: src/mainwindow.c:490
+#: src/mainwindow.c:493
 msgid "/_File/_Mailbox/Check for new messages in _all mailboxes"
 msgstr "/Файл/Почтовый ящик/Проверить новые сообщения во всех папках"
 
-#: src/mainwindow.c:493
+#: src/mainwindow.c:496
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "/Файл/Почтовый ящик/Перестроить дерево папок"
 
-#: src/mainwindow.c:496
+#: src/mainwindow.c:499
 msgid "/_File/_Import mbox file..."
 msgstr "/Файл/Импорт mbox-файла..."
 
-#: src/mainwindow.c:497
+#: src/mainwindow.c:500
 msgid "/_File/_Export to mbox file..."
 msgstr "/Файл/Экспорт в mbox-файл..."
 
-#: src/mainwindow.c:499
+#: src/mainwindow.c:502
 msgid "/_File/Empty all _trash"
 msgstr "/Файл/Очистить все корзины"
 
-#: src/mainwindow.c:501 src/messageview.c:139
+#: src/mainwindow.c:504 src/messageview.c:139
 msgid "/_File/_Save as..."
 msgstr "/Файл/Сохранить как..."
 
-#: src/mainwindow.c:502 src/messageview.c:140
+#: src/mainwindow.c:505 src/messageview.c:140
 msgid "/_File/_Print..."
 msgstr "/Файл/Печать..."
 
-#: src/mainwindow.c:504
+#: src/mainwindow.c:507
 msgid "/_File/_Work offline"
 msgstr "/Файл/Работать автономно"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:507
+#: src/mainwindow.c:510
 msgid "/_File/E_xit"
 msgstr "/Файл/Выход"
 
-#: src/mainwindow.c:512
+#: src/mainwindow.c:515
 msgid "/_Edit/Select _thread"
 msgstr "/Правка/Выделить обсуждение"
 
-#: src/mainwindow.c:514 src/messageview.c:148
+#: src/mainwindow.c:517 src/messageview.c:148
 msgid "/_Edit/_Find in current message..."
 msgstr "/Правка/Поиск в текущем сообщении..."
 
-#: src/mainwindow.c:516
+#: src/mainwindow.c:519
 msgid "/_Edit/_Search messages..."
 msgstr "/Правка/Поиск сообщений..."
 
-#: src/mainwindow.c:519
+#: src/mainwindow.c:522
 msgid "/_View/Show or hi_de"
 msgstr "/Вид/Показать или скрыть"
 
-#: src/mainwindow.c:520
+#: src/mainwindow.c:523
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/Вид/Показать или скрыть/Дерево папок"
 
-#: src/mainwindow.c:522
+#: src/mainwindow.c:525
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/Вид/Показать или скрыть/Область просмотра"
 
-#: src/mainwindow.c:524
+#: src/mainwindow.c:527
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/Вид/Показать или скрыть/Панель инструментов"
 
-#: src/mainwindow.c:526
+#: src/mainwindow.c:529
 msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/Вид/Показать или скрыть/Панель инструментов/Пиктограммы и текст"
 
-#: src/mainwindow.c:528
+#: src/mainwindow.c:531
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/Вид/Показать или скрыть/Панель инструментов/Пиктограммы"
 
-#: src/mainwindow.c:530
+#: src/mainwindow.c:533
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/Вид/Показать или скрыть/Панель инструментов/Текст"
 
-#: src/mainwindow.c:532
+#: src/mainwindow.c:535
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/Вид/Показать или скрыть/Панель инструментов/Не показывать"
 
-#: src/mainwindow.c:534
+#: src/mainwindow.c:537
 #, fuzzy
 msgid "/_View/Show or hi_de/_Search bar"
 msgstr "/Вид/Показать или скрыть/Строка состояния"
 
-#: src/mainwindow.c:536
+#: src/mainwindow.c:539
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/Вид/Показать или скрыть/Строка состояния"
 
-#: src/mainwindow.c:539
+#: src/mainwindow.c:542
 msgid "/_View/Separate f_older tree"
 msgstr "/Вид/Отдельное дерево папок"
 
-#: src/mainwindow.c:540
+#: src/mainwindow.c:543
 #, fuzzy
 msgid "/_View/Separate _message view"
 msgstr "/Вид/Отдельная область просмотра"
 
-#: src/mainwindow.c:542
+#: src/mainwindow.c:545
 msgid "/_View/_Sort"
 msgstr "/Вид/Сортировка"
 
-#: src/mainwindow.c:543
+#: src/mainwindow.c:546
 msgid "/_View/_Sort/by _number"
 msgstr "/Вид/Сортировка/По номеру"
 
-#: src/mainwindow.c:544
+#: src/mainwindow.c:547
 msgid "/_View/_Sort/by s_ize"
 msgstr "/Вид/Сортировка/По размеру"
 
-#: src/mainwindow.c:545
+#: src/mainwindow.c:548
 msgid "/_View/_Sort/by _date"
 msgstr "/Вид/Сортировка/По дате"
 
-#: src/mainwindow.c:546
+#: src/mainwindow.c:549
 #, fuzzy
 msgid "/_View/_Sort/by t_hread date"
 msgstr "/Вид/Сортировка/По дате"
 
-#: src/mainwindow.c:547
+#: src/mainwindow.c:550
 msgid "/_View/_Sort/by _from"
 msgstr "/Вид/Сортировка/По отправителю"
 
-#: src/mainwindow.c:548
+#: src/mainwindow.c:551
 msgid "/_View/_Sort/by _recipient"
 msgstr "/Вид/Сортировка/По получателю"
 
-#: src/mainwindow.c:549
+#: src/mainwindow.c:552
 msgid "/_View/_Sort/by _subject"
 msgstr "/Вид/Сортировка/По теме"
 
-#: src/mainwindow.c:550
+#: src/mainwindow.c:553
 msgid "/_View/_Sort/by _color label"
 msgstr "/Вид/Сортировка/По выделению цветом"
 
-#: src/mainwindow.c:552
+#: src/mainwindow.c:555
 msgid "/_View/_Sort/by _mark"
 msgstr "/Вид/Сортировка/По отметке"
 
-#: src/mainwindow.c:553
+#: src/mainwindow.c:556
 msgid "/_View/_Sort/by _unread"
 msgstr "/Вид/Сортировка/По непрочитанным"
 
-#: src/mainwindow.c:554
+#: src/mainwindow.c:557
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/Вид/Сортировка/По вложениям"
 
-#: src/mainwindow.c:556
+#: src/mainwindow.c:559
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/Вид/Сортировка/Без сортировки"
 
-#: src/mainwindow.c:557 src/mainwindow.c:560
+#: src/mainwindow.c:560 src/mainwindow.c:563
 msgid "/_View/_Sort/---"
 msgstr "/Вид/Сортировка/---"
 
-#: src/mainwindow.c:558
+#: src/mainwindow.c:561
 msgid "/_View/_Sort/Ascending"
 msgstr "/Вид/Сортировка/По возрастанию"
 
-#: src/mainwindow.c:559
+#: src/mainwindow.c:562
 msgid "/_View/_Sort/Descending"
 msgstr "/Вид/Сортировка/По убыванию"
 
-#: src/mainwindow.c:561
+#: src/mainwindow.c:564
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/Вид/Сортировка/Группировка по теме"
 
-#: src/mainwindow.c:563
+#: src/mainwindow.c:566
 msgid "/_View/Th_read view"
 msgstr "/Вид/Группировка по дискуссиям"
 
-#: src/mainwindow.c:564
+#: src/mainwindow.c:567
 msgid "/_View/E_xpand all threads"
 msgstr "/Вид/Развернуть все обсуждения"
 
-#: src/mainwindow.c:565
+#: src/mainwindow.c:568
 msgid "/_View/Co_llapse all threads"
 msgstr "/Вид/Свернуть все обсуждения"
 
-#: src/mainwindow.c:566
+#: src/mainwindow.c:569
 msgid "/_View/Set display _item..."
 msgstr "/Вид/Установить видимые поля..."
 
-#: src/mainwindow.c:569
+#: src/mainwindow.c:572
 msgid "/_View/_Go to"
 msgstr "/Вид/Перейти"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:573
 msgid "/_View/_Go to/_Prev message"
 msgstr "/Вид/Перейти/Предыдущее сообщение"
 
-#: src/mainwindow.c:571
+#: src/mainwindow.c:574
 msgid "/_View/_Go to/_Next message"
 msgstr "/Вид/Перейти/Следующее сообщение"
 
-#: src/mainwindow.c:572 src/mainwindow.c:577 src/mainwindow.c:580
-#: src/mainwindow.c:585 src/mainwindow.c:590
+#: src/mainwindow.c:575 src/mainwindow.c:580 src/mainwindow.c:583
+#: src/mainwindow.c:588 src/mainwindow.c:593
 msgid "/_View/_Go to/---"
 msgstr "/Вид/Перейти/---"
 
-#: src/mainwindow.c:573
+#: src/mainwindow.c:576
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/Вид/Перейти/Предыдущее непрочитанное сообщение"
 
-#: src/mainwindow.c:575
+#: src/mainwindow.c:578
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/Вид/Перейти/Следующее непрочитанное сообщение"
 
-#: src/mainwindow.c:578
+#: src/mainwindow.c:581
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/Вид/Перейти/Предыдущее новое сообщение"
 
-#: src/mainwindow.c:579
+#: src/mainwindow.c:582
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/Вид/Перейти/Следующее новое сообщение"
 
-#: src/mainwindow.c:581
+#: src/mainwindow.c:584
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/Вид/Перейти/Предыдущее отмеченное сообщение"
 
-#: src/mainwindow.c:583
+#: src/mainwindow.c:586
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/Вид/Перейти/Следующее отмеченное сообщение"
 
-#: src/mainwindow.c:586
+#: src/mainwindow.c:589
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/Вид/Перейти/Предыдущее выделенное цветом сообщение"
 
-#: src/mainwindow.c:588
+#: src/mainwindow.c:591
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/Вид/Перейти/Следующее выделенное цветом сообщение"
 
-#: src/mainwindow.c:591
+#: src/mainwindow.c:594
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/Вид/Перейти/К другой папке..."
 
-#: src/mainwindow.c:600 src/messageview.c:159
+#: src/mainwindow.c:603 src/messageview.c:159
 #, fuzzy
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/Вид/Кодировка/Автоопределение"
 
-#: src/mainwindow.c:613 src/messageview.c:172
+#: src/mainwindow.c:616 src/messageview.c:172
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr "/Вид/Кодировка/Западноевропейская (ISO-8859-15)"
 
-#: src/mainwindow.c:653 src/messageview.c:205
+#: src/mainwindow.c:662 src/messageview.c:210
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/Вид/Кодировка/Японская (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:655 src/messageview.c:207
+#: src/mainwindow.c:664 src/messageview.c:212
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/Вид/Кодировка/Японская (_EUC-JP)"
 
-#: src/mainwindow.c:657 src/messageview.c:209
+#: src/mainwindow.c:666 src/messageview.c:214
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/Вид/Кодировка/Японская (_Shift__JIS)"
 
-#: src/mainwindow.c:667 src/messageview.c:218
+#: src/mainwindow.c:676 src/messageview.c:223
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/Вид/Кодировка/Традиционная китайская (EUC-_TW)"
 
-#: src/mainwindow.c:669 src/messageview.c:220
+#: src/mainwindow.c:678 src/messageview.c:225
 #, fuzzy
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/Вид/Кодировка/Китайская (ISO-2022-_CN)"
 
-#: src/mainwindow.c:675 src/messageview.c:225
+#: src/mainwindow.c:684 src/messageview.c:230
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/Вид/Кодировка/Корейская (ISO-2022-KR)"
 
-#: src/mainwindow.c:688 src/summaryview.c:449
+#: src/mainwindow.c:697 src/summaryview.c:451
 msgid "/_View/Open in new _window"
 msgstr "/Вид/Открыть в новом окне"
 
-#: src/mainwindow.c:689 src/messageview.c:237
+#: src/mainwindow.c:698 src/messageview.c:242
 msgid "/_View/Mess_age source"
 msgstr "/Вид/Показать исходный текст"
 
-#: src/mainwindow.c:690 src/messageview.c:238
+#: src/mainwindow.c:699 src/messageview.c:243
 msgid "/_View/Show all _header"
 msgstr "/Вид/Показать все заголовки"
 
-#: src/mainwindow.c:692
+#: src/mainwindow.c:701
 msgid "/_View/_Update summary"
 msgstr "/Вид/Обновить список сообщений"
 
-#: src/mainwindow.c:694 src/messageview.c:240
+#: src/mainwindow.c:703 src/messageview.c:245
 msgid "/_Message"
 msgstr "/Сообщение"
 
-#: src/mainwindow.c:695
+#: src/mainwindow.c:704
 msgid "/_Message/Recei_ve"
 msgstr "/Сообщение/Получить"
 
-#: src/mainwindow.c:696
+#: src/mainwindow.c:705
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/Сообщение/Получить/Получить с текущей учетной записи"
 
-#: src/mainwindow.c:698
+#: src/mainwindow.c:707
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/Сообщение/Получить/Получить со всех учетных записей"
 
-#: src/mainwindow.c:700
+#: src/mainwindow.c:709
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/Сообщение/Получить/Прервать получение сообщений"
 
-#: src/mainwindow.c:702
+#: src/mainwindow.c:711
 msgid "/_Message/Recei_ve/---"
 msgstr "/Сообщение/Получить/---"
 
-#: src/mainwindow.c:703
+#: src/mainwindow.c:712
 msgid "/_Message/_Send queued messages"
 msgstr "/Сообщение/Отправить сообщения из очереди"
 
-#: src/mainwindow.c:704 src/mainwindow.c:706 src/mainwindow.c:713
-#: src/mainwindow.c:718 src/mainwindow.c:721 src/mainwindow.c:730
-#: src/mainwindow.c:732 src/mainwindow.c:735 src/messageview.c:243
-#: src/messageview.c:251 src/messageview.c:256
+#: src/mainwindow.c:713 src/mainwindow.c:715 src/mainwindow.c:722
+#: src/mainwindow.c:727 src/mainwindow.c:730 src/mainwindow.c:741
+#: src/mainwindow.c:743 src/mainwindow.c:746 src/messageview.c:248
+#: src/messageview.c:256 src/messageview.c:261
 msgid "/_Message/---"
 msgstr "/Сообщение/---"
 
-#: src/mainwindow.c:705 src/messageview.c:241
+#: src/mainwindow.c:714 src/messageview.c:246
 msgid "/_Message/Compose _new message"
 msgstr "/Сообщение/Написать новое сообщение"
 
-#: src/mainwindow.c:707 src/messageview.c:244
+#: src/mainwindow.c:716 src/messageview.c:249
 msgid "/_Message/_Reply"
 msgstr "/Сообщение/Ответить"
 
-#: src/mainwindow.c:708
+#: src/mainwindow.c:717
 msgid "/_Message/Repl_y to"
 msgstr "/Сообщение/Ответить..."
 
-#: src/mainwindow.c:709 src/messageview.c:245
+#: src/mainwindow.c:718 src/messageview.c:250
 msgid "/_Message/Repl_y to/_all"
 msgstr "/Сообщение/Ответить.../Всем"
 
-#: src/mainwindow.c:710 src/messageview.c:247
+#: src/mainwindow.c:719 src/messageview.c:252
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/Сообщение/Ответить.../Отправителю"
 
-#: src/mainwindow.c:711 src/messageview.c:249
+#: src/mainwindow.c:720 src/messageview.c:254
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/Сообщение/Ответить.../В список рассылки"
 
-#: src/mainwindow.c:714 src/messageview.c:252
+#: src/mainwindow.c:723 src/messageview.c:257
 msgid "/_Message/_Forward"
 msgstr "/Сообщение/Переслать"
 
-#: src/mainwindow.c:715 src/messageview.c:253
+#: src/mainwindow.c:724 src/messageview.c:258
 msgid "/_Message/For_ward as attachment"
 msgstr "/Сообщение/Переслать как вложение"
 
-#: src/mainwindow.c:717 src/messageview.c:255
+#: src/mainwindow.c:726 src/messageview.c:260
 msgid "/_Message/Redirec_t"
 msgstr "/Сообщение/Перенаправить без изменений"
 
-#: src/mainwindow.c:719
+#: src/mainwindow.c:728
 msgid "/_Message/M_ove..."
 msgstr "/Сообщение/Переместить..."
 
-#: src/mainwindow.c:720
+#: src/mainwindow.c:729
 msgid "/_Message/_Copy..."
 msgstr "/Сообщение/Копировать..."
 
-#: src/mainwindow.c:722
+#: src/mainwindow.c:731
 msgid "/_Message/_Mark"
 msgstr "/Сообщение/Отметить"
 
-#: src/mainwindow.c:723
+#: src/mainwindow.c:732
 msgid "/_Message/_Mark/_Mark"
 msgstr "/Сообщение/Отметить/Отметить"
 
-#: src/mainwindow.c:724
+#: src/mainwindow.c:733
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/Сообщение/Отметить/Снять отметку"
 
-#: src/mainwindow.c:725
+#: src/mainwindow.c:734
 msgid "/_Message/_Mark/---"
 msgstr "/Сообщение/Отметить/---"
 
-#: src/mainwindow.c:726
+#: src/mainwindow.c:735
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/Сообщение/Отметить/Пометить как непрочитанное"
 
-#: src/mainwindow.c:727
+#: src/mainwindow.c:736
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/Сообщение/Отметить/Пометить как прочитанное"
 
-#: src/mainwindow.c:729
+#: src/mainwindow.c:738
+#, fuzzy
+msgid "/_Message/_Mark/Mark _thread as read"
+msgstr "/Сообщение/Отметить/Пометить как прочитанное"
+
+#: src/mainwindow.c:740
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/Сообщение/Отметить/Пометить все сообщения как прочитанные"
 
-#: src/mainwindow.c:731
+#: src/mainwindow.c:742
 msgid "/_Message/_Delete"
 msgstr "/Сообщение/Удалить"
 
-#: src/mainwindow.c:733
+#: src/mainwindow.c:744
 #, fuzzy
 msgid "/_Message/Set as _junk mail"
 msgstr "/Сообщение/Отметить/Снять отметку"
 
-#: src/mainwindow.c:734
+#: src/mainwindow.c:745
 msgid "/_Message/Set as not j_unk mail"
 msgstr ""
 
-#: src/mainwindow.c:736 src/messageview.c:257
+#: src/mainwindow.c:747 src/messageview.c:262
 msgid "/_Message/Re-_edit"
 msgstr "/Сообщение/Изменить"
 
-#: src/mainwindow.c:740
+#: src/mainwindow.c:751
 #, fuzzy
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/Инструменты/Добавить отправителя в адресную книгу"
 
-#: src/mainwindow.c:743
+#: src/mainwindow.c:754
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/Инструменты/Отфильтровать все сообщения в папке"
 
-#: src/mainwindow.c:745
+#: src/mainwindow.c:756
 msgid "/_Tools/Filter _selected messages"
 msgstr "/Инструменты/Отфильтровать выбранные сообщения"
 
-#: src/mainwindow.c:747 src/messageview.c:264
+#: src/mainwindow.c:758 src/messageview.c:269
 msgid "/_Tools/_Create filter rule"
 msgstr "/Инструменты/Создать правило фильтрации"
 
-#: src/mainwindow.c:748 src/messageview.c:266
+#: src/mainwindow.c:759 src/messageview.c:271
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/Инструменты/Создать правило фильтрации/Автоматически"
 
-#: src/mainwindow.c:750 src/messageview.c:268
+#: src/mainwindow.c:761 src/messageview.c:273
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/Инструменты/Создать правило фильтрации/По отправителю"
 
-#: src/mainwindow.c:752 src/messageview.c:270
+#: src/mainwindow.c:763 src/messageview.c:275
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/Инструменты/Создать правило фильтрации/По получателю"
 
-#: src/mainwindow.c:754 src/messageview.c:272
+#: src/mainwindow.c:765 src/messageview.c:277
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/Инструменты/Создать правило фильтрации/По теме"
 
-#: src/mainwindow.c:757
+#: src/mainwindow.c:768
 #, fuzzy
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/Инструменты/Отфильтровать все сообщения в папке"
 
-#: src/mainwindow.c:759
+#: src/mainwindow.c:770
 #, fuzzy
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/Инструменты/Отфильтровать выбранные сообщения"
 
-#: src/mainwindow.c:764
+#: src/mainwindow.c:775
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/Инструменты/Удалить повторяющиеся сообщения"
 
-#: src/mainwindow.c:767
+#: src/mainwindow.c:778
 msgid "/_Tools/E_xecute"
 msgstr "/Инструменты/Выполнить"
 
-#: src/mainwindow.c:769
+#: src/mainwindow.c:780
 msgid "/_Tools/_Log window"
 msgstr "/Инструменты/Окно журнала"
 
-#: src/mainwindow.c:771
+#: src/mainwindow.c:782
 msgid "/_Configuration"
 msgstr "/Настройка"
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:783
 msgid "/_Configuration/_Common preferences..."
 msgstr "/Настройка/Общие настройки..."
 
-#: src/mainwindow.c:774
+#: src/mainwindow.c:785
 msgid "/_Configuration/_Filter setting..."
 msgstr "/Настройка/Настройка фильтров..."
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:787
 msgid "/_Configuration/_Template..."
 msgstr "/Настройка/Шаблоны..."
 
-#: src/mainwindow.c:777
+#: src/mainwindow.c:788
 msgid "/_Configuration/_Actions..."
 msgstr "/Настройка/Действия..."
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:789
 msgid "/_Configuration/---"
 msgstr "/Настройка/---"
 
-#: src/mainwindow.c:779
+#: src/mainwindow.c:790
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/Настройка/Настройка текущей учетной записи... "
 
-#: src/mainwindow.c:781
+#: src/mainwindow.c:792
 msgid "/_Configuration/Create _new account..."
 msgstr "/Настройка/Создать новую учетную запись..."
 
-#: src/mainwindow.c:783
+#: src/mainwindow.c:794
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/Настройка/Редактирование учетных записей..."
 
-#: src/mainwindow.c:785
+#: src/mainwindow.c:796
 msgid "/_Configuration/C_hange current account"
 msgstr "/Настройка/Переключить текущую учетную запись"
 
-#: src/mainwindow.c:789
+#: src/mainwindow.c:800
 msgid "/_Help/_Manual"
 msgstr "/Справка/Руководство"
 
-#: src/mainwindow.c:790
+#: src/mainwindow.c:801
 msgid "/_Help/_Manual/_English"
 msgstr "/Справка/Руководство/Английское"
 
-#: src/mainwindow.c:791
+#: src/mainwindow.c:802
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/Справка/Руководство/Японское"
 
-#: src/mainwindow.c:792
+#: src/mainwindow.c:803
 msgid "/_Help/_FAQ"
 msgstr "/Справка/FAQ"
 
-#: src/mainwindow.c:793
+#: src/mainwindow.c:804
 msgid "/_Help/_FAQ/_English"
 msgstr "/Справка/FAQ/Английский"
 
-#: src/mainwindow.c:794
+#: src/mainwindow.c:805
 msgid "/_Help/_FAQ/_German"
 msgstr "/Справка/FAQ/Немецкий"
 
-#: src/mainwindow.c:795
+#: src/mainwindow.c:806
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/Справка/FAQ/Испанский"
 
-#: src/mainwindow.c:796
+#: src/mainwindow.c:807
 msgid "/_Help/_FAQ/_French"
 msgstr "/Справка/FAQ/Французский"
 
-#: src/mainwindow.c:797
+#: src/mainwindow.c:808
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/Справка/FAQ/Итальянский"
 
-#: src/mainwindow.c:798
+#: src/mainwindow.c:809
 msgid "/_Help/---"
 msgstr "/Справка/---"
 
-#: src/mainwindow.c:841
+#: src/mainwindow.c:852
 msgid "Creating main window...\n"
 msgstr "Создание главного окна...\n"
 
-#: src/mainwindow.c:1011
+#: src/mainwindow.c:1022
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Главное окно: проблема с цветом %d\n"
 
-#: src/mainwindow.c:1108 src/summaryview.c:2258 src/summaryview.c:2343
-#: src/summaryview.c:3739 src/summaryview.c:3868 src/summaryview.c:4226
+#: src/mainwindow.c:1119 src/summaryview.c:2275 src/summaryview.c:2360
+#: src/summaryview.c:3896 src/summaryview.c:4025 src/summaryview.c:4383
 msgid "done.\n"
 msgstr "выполнено.\n"
 
-#: src/mainwindow.c:1235 src/mainwindow.c:1276 src/mainwindow.c:1301
+#: src/mainwindow.c:1246 src/mainwindow.c:1287 src/mainwindow.c:1312
 msgid "Untitled"
 msgstr "Без названия"
 
-#: src/mainwindow.c:1302
+#: src/mainwindow.c:1313
 msgid "none"
 msgstr "нет"
 
-#: src/mainwindow.c:1355
+#: src/mainwindow.c:1366
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "Изменение типа разделения окна с %d на %d\n"
 
-#: src/mainwindow.c:1605
+#: src/mainwindow.c:1616
 msgid "Offline"
 msgstr "Автономная работа"
 
-#: src/mainwindow.c:1606
+#: src/mainwindow.c:1617
 msgid "You are offline. Go online?"
 msgstr "Вы работаете в автономном режиме. Подключиться к сети?"
 
-#: src/mainwindow.c:1623
+#: src/mainwindow.c:1634
 msgid "Empty all trash"
 msgstr "Очистить все корзины"
 
-#: src/mainwindow.c:1624
+#: src/mainwindow.c:1635
 #, fuzzy
 msgid "Delete all messages in trash folders?"
 msgstr "Удалить все сообщения из корзины?"
 
-#: src/mainwindow.c:1652
+#: src/mainwindow.c:1663
 msgid "Add mailbox"
 msgstr "Добавить почтовый ящик"
 
-#: src/mainwindow.c:1653
+#: src/mainwindow.c:1664
 #, fuzzy
 msgid ""
 "Specify the location of mailbox.\n"
@@ -3622,16 +3638,16 @@ msgstr ""
 "Если будет указан существующий ящик, то он\n"
 "будет автоматически прочитан."
 
-#: src/mainwindow.c:1659 src/setup.c:49
+#: src/mainwindow.c:1670 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Почтовый ящик '%s' уже существует."
 
-#: src/mainwindow.c:1664 src/setup.c:56
+#: src/mainwindow.c:1675 src/setup.c:56
 msgid "Mailbox"
 msgstr "Почтовый ящик"
 
-#: src/mainwindow.c:1670 src/setup.c:62
+#: src/mainwindow.c:1681 src/setup.c:62
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3641,147 +3657,147 @@ msgstr ""
 "Может быть, некоторые файлы уже существуют, или вы не имеете прав на запись "
 "в каталоге."
 
-#: src/mainwindow.c:2088
+#: src/mainwindow.c:2099
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Папки"
 
-#: src/mainwindow.c:2107
+#: src/mainwindow.c:2118
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Сообщение"
 
-#: src/mainwindow.c:2259 src/summaryview.c:408
+#: src/mainwindow.c:2270 src/summaryview.c:408
 msgid "/_Reply"
 msgstr "/Ответить"
 
-#: src/mainwindow.c:2260
+#: src/mainwindow.c:2271
 msgid "/Reply to _all"
 msgstr "/Ответить всем"
 
-#: src/mainwindow.c:2261
+#: src/mainwindow.c:2272
 msgid "/Reply to _sender"
 msgstr "/Ответить отправителю"
 
-#: src/mainwindow.c:2262
+#: src/mainwindow.c:2273
 msgid "/Reply to mailing _list"
 msgstr "/Ответить в список рассылки"
 
-#: src/mainwindow.c:2267 src/summaryview.c:415
+#: src/mainwindow.c:2278 src/summaryview.c:415
 msgid "/_Forward"
 msgstr "/Переслать"
 
-#: src/mainwindow.c:2268 src/summaryview.c:416
+#: src/mainwindow.c:2279 src/summaryview.c:416
 msgid "/For_ward as attachment"
 msgstr "/Переслать как вложение"
 
-#: src/mainwindow.c:2269 src/summaryview.c:417
+#: src/mainwindow.c:2280 src/summaryview.c:417
 msgid "/Redirec_t"
 msgstr "/Перенаправить без изменений"
 
-#: src/mainwindow.c:2305
+#: src/mainwindow.c:2316
 msgid "Get"
 msgstr "Принять"
 
-#: src/mainwindow.c:2306
+#: src/mainwindow.c:2317
 msgid "Incorporate new mail"
 msgstr "Получить новые сообщения"
 
-#: src/mainwindow.c:2313
+#: src/mainwindow.c:2324
 msgid "Get all"
 msgstr "Принять все"
 
-#: src/mainwindow.c:2314
+#: src/mainwindow.c:2325
 msgid "Incorporate new mail of all accounts"
 msgstr "Получить сообщения со всех учетных записей"
 
-#: src/mainwindow.c:2325
+#: src/mainwindow.c:2336
 msgid "Send queued message(s)"
 msgstr "Послать сообщения из очереди"
 
-#: src/mainwindow.c:2335 src/prefs_account_dialog.c:530
+#: src/mainwindow.c:2346 src/prefs_account_dialog.c:530
 #: src/prefs_common_dialog.c:663 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "Написать"
 
-#: src/mainwindow.c:2336
+#: src/mainwindow.c:2347
 msgid "Compose new message"
 msgstr "Написать новое сообщение"
 
-#: src/mainwindow.c:2344 src/prefs_common_dialog.c:975
+#: src/mainwindow.c:2355 src/prefs_common_dialog.c:975
 msgid "Reply"
 msgstr "Ответить"
 
-#: src/mainwindow.c:2345 src/mainwindow.c:2358
+#: src/mainwindow.c:2356 src/mainwindow.c:2369
 msgid "Reply to the message"
 msgstr "Ответить на сообщение"
 
-#: src/mainwindow.c:2362
+#: src/mainwindow.c:2373
 msgid "Reply all"
 msgstr "Ответить всем"
 
-#: src/mainwindow.c:2363
+#: src/mainwindow.c:2374
 msgid "Reply to all"
 msgstr "Ответить всем"
 
-#: src/mainwindow.c:2371 src/prefs_filter_edit.c:672
+#: src/mainwindow.c:2382 src/prefs_filter_edit.c:672
 msgid "Forward"
 msgstr "Переслать"
 
-#: src/mainwindow.c:2372 src/mainwindow.c:2385
+#: src/mainwindow.c:2383 src/mainwindow.c:2396
 msgid "Forward the message"
 msgstr "Переслать сообщение"
 
-#: src/mainwindow.c:2392
+#: src/mainwindow.c:2403
 msgid "Delete the message"
 msgstr "Удалить сообщение"
 
-#: src/mainwindow.c:2401
+#: src/mainwindow.c:2412
 #, fuzzy
 msgid "Set as junk mail"
 msgstr "По умолчанию"
 
-#: src/mainwindow.c:2410
+#: src/mainwindow.c:2421
 msgid "Execute"
 msgstr "Выполнить"
 
-#: src/mainwindow.c:2411
+#: src/mainwindow.c:2422
 msgid "Execute marked process"
 msgstr "Выполнить отмеченный процесс"
 
-#: src/mainwindow.c:2421
+#: src/mainwindow.c:2432
 msgid "Next unread message"
 msgstr "Следующее непрочитанное сообщение"
 
-#: src/mainwindow.c:2433
+#: src/mainwindow.c:2444
 msgid "Prefs"
 msgstr "Свойства"
 
-#: src/mainwindow.c:2434
+#: src/mainwindow.c:2445
 msgid "Common preferences"
 msgstr "Общие настройки"
 
-#: src/mainwindow.c:2442 src/prefs_folder_item.c:289
+#: src/mainwindow.c:2453 src/prefs_folder_item.c:289
 #: src/prefs_folder_item.c:300 src/progressdialog.c:128
 msgid "Account"
 msgstr "Учетная запись"
 
-#: src/mainwindow.c:2443
+#: src/mainwindow.c:2454
 msgid "Account setting"
 msgstr "Настройка учетной записи"
 
-#: src/mainwindow.c:2615
+#: src/mainwindow.c:2626
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 "Вы работаете в автономном режиме. Щелкните по значку, чтобы подключиться."
 
-#: src/mainwindow.c:2626
+#: src/mainwindow.c:2637
 msgid "You are online. Click the icon to go offline."
 msgstr "Вы подключены. Щелкните по значку, чтобы работать автономно."
 
-#: src/mainwindow.c:2892
+#: src/mainwindow.c:2903
 msgid "Exit"
 msgstr "Выход"
 
-#: src/mainwindow.c:2892
+#: src/mainwindow.c:2903
 msgid "Exit this program?"
 msgstr "Выйти из программы?"
 
@@ -3818,45 +3834,45 @@ msgstr "Достигнут конец сообщения; продолжить �
 msgid "Search finished"
 msgstr "Поиск закончен"
 
-#: src/messageview.c:261
+#: src/messageview.c:266
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/Инструменты/Добавить отправителя в адресную книгу"
 
-#: src/messageview.c:291
+#: src/messageview.c:296
 msgid "Creating message view...\n"
 msgstr "Создание области просмотра сообщения...\n"
 
-#: src/messageview.c:316
+#: src/messageview.c:321
 msgid "Text"
 msgstr "Текст"
 
-#: src/messageview.c:321
+#: src/messageview.c:326
 msgid "Attachments"
 msgstr "Вложения"
 
-#: src/messageview.c:371
+#: src/messageview.c:376
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:669 src/summaryview.c:3268
+#: src/messageview.c:674 src/summaryview.c:3425
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Ошибка при сохранении файла '%s'."
 
-#: src/messageview.c:728 src/summaryview.c:3291
+#: src/messageview.c:733 src/summaryview.c:3448
 msgid "The message will be printed with the following command:"
 msgstr ""
 
-#: src/messageview.c:729 src/summaryview.c:3292
+#: src/messageview.c:734 src/summaryview.c:3449
 #, fuzzy
 msgid "(Default print command)"
 msgstr "Выполнить команду"
 
-#: src/messageview.c:731 src/prefs_common_dialog.c:2304 src/summaryview.c:3294
+#: src/messageview.c:736 src/prefs_common_dialog.c:2304 src/summaryview.c:3451
 msgid "Print"
 msgstr "Печать"
 
-#: src/messageview.c:740 src/summaryview.c:3303
+#: src/messageview.c:745 src/summaryview.c:3460
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -4764,8 +4780,8 @@ msgstr "Показывать получателя в колонке 'От', ес
 msgid "Expand threads"
 msgstr "Разворачивать обсуждения"
 
-#: src/prefs_common_dialog.c:1413 src/prefs_common_dialog.c:2713
-#: src/prefs_common_dialog.c:2751
+#: src/prefs_common_dialog.c:1413 src/prefs_common_dialog.c:2716
+#: src/prefs_common_dialog.c:2754
 msgid "Date format"
 msgstr "Формат даты"
 
@@ -5065,8 +5081,8 @@ msgstr "Внешние команды (%s будет заменен на имя
 msgid "Web browser"
 msgstr "Web-браузер"
 
-#: src/prefs_common_dialog.c:2288 src/prefs_common_dialog.c:3775
-#: src/prefs_common_dialog.c:3796
+#: src/prefs_common_dialog.c:2288 src/prefs_common_dialog.c:3778
+#: src/prefs_common_dialog.c:3799
 #, fuzzy
 msgid "(Default browser)"
 msgstr "Папка для входящих сообщений"
@@ -5142,216 +5158,226 @@ msgstr "Греческая (ISO-8859-7)"
 
 #: src/prefs_common_dialog.c:2495
 #, fuzzy
+msgid "Arabic (ISO-8859-6)"
+msgstr "Балтийская (ISO-8859-4)"
+
+#: src/prefs_common_dialog.c:2496
+#, fuzzy
+msgid "Arabic (Windows-1256)"
+msgstr "Кириллица Win (Windows-1251)"
+
+#: src/prefs_common_dialog.c:2498
+#, fuzzy
 msgid "Hebrew (ISO-8859-8)"
 msgstr "Греческая (ISO-8859-7)"
 
-#: src/prefs_common_dialog.c:2496
+#: src/prefs_common_dialog.c:2499
 #, fuzzy
 msgid "Hebrew (Windows-1255)"
 msgstr "Кириллица Win (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2498
+#: src/prefs_common_dialog.c:2501
 msgid "Turkish (ISO-8859-9)"
 msgstr "Турецкая (ISO-8859-9)"
 
-#: src/prefs_common_dialog.c:2500
+#: src/prefs_common_dialog.c:2503
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Кириллица (ISO-8859-5)"
 
-#: src/prefs_common_dialog.c:2501
+#: src/prefs_common_dialog.c:2504
 msgid "Cyrillic (KOI8-R)"
 msgstr "Русская (KOI8-R)"
 
-#: src/prefs_common_dialog.c:2502
+#: src/prefs_common_dialog.c:2505
 msgid "Cyrillic (KOI8-U)"
 msgstr "Украинская (KOI8-U)"
 
-#: src/prefs_common_dialog.c:2503
+#: src/prefs_common_dialog.c:2506
 msgid "Cyrillic (Windows-1251)"
 msgstr "Кириллица Win (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2505
+#: src/prefs_common_dialog.c:2508
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Японская (ISO-2022-JP)"
 
-#: src/prefs_common_dialog.c:2507
+#: src/prefs_common_dialog.c:2510
 msgid "Japanese (EUC-JP)"
 msgstr "Японская (EUC-JP)"
 
-#: src/prefs_common_dialog.c:2508
+#: src/prefs_common_dialog.c:2511
 msgid "Japanese (Shift_JIS)"
 msgstr "Японская (Shift_JIS)"
 
-#: src/prefs_common_dialog.c:2511
+#: src/prefs_common_dialog.c:2514
 msgid "Simplified Chinese (GB2312)"
 msgstr "Упрощенная китайская (GB2312)"
 
-#: src/prefs_common_dialog.c:2512
+#: src/prefs_common_dialog.c:2515
 #, fuzzy
 msgid "Simplified Chinese (GBK)"
 msgstr "Упрощенная китайская (GB2312)"
 
-#: src/prefs_common_dialog.c:2513
+#: src/prefs_common_dialog.c:2516
 msgid "Traditional Chinese (Big5)"
 msgstr "Традиционная китайская (Big5)"
 
-#: src/prefs_common_dialog.c:2515
+#: src/prefs_common_dialog.c:2518
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Традиционная китайская (EUC-TW)"
 
-#: src/prefs_common_dialog.c:2516
+#: src/prefs_common_dialog.c:2519
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Китайская (ISO-2022-CN)"
 
-#: src/prefs_common_dialog.c:2519
+#: src/prefs_common_dialog.c:2522
 msgid "Korean (EUC-KR)"
 msgstr "Корейская (EUC-KR)"
 
-#: src/prefs_common_dialog.c:2521
+#: src/prefs_common_dialog.c:2524
 msgid "Thai (TIS-620)"
 msgstr "Тайская (TIS-620)"
 
-#: src/prefs_common_dialog.c:2522
+#: src/prefs_common_dialog.c:2525
 msgid "Thai (Windows-874)"
 msgstr "Тайская (Windows-874)"
 
-#: src/prefs_common_dialog.c:2689
+#: src/prefs_common_dialog.c:2692
 msgid "the full abbreviated weekday name"
 msgstr "сокращенное название дня недели"
 
-#: src/prefs_common_dialog.c:2690
+#: src/prefs_common_dialog.c:2693
 msgid "the full weekday name"
 msgstr "полное название дня недели"
 
-#: src/prefs_common_dialog.c:2691
+#: src/prefs_common_dialog.c:2694
 msgid "the abbreviated month name"
 msgstr "сокращенное название месяца"
 
-#: src/prefs_common_dialog.c:2692
+#: src/prefs_common_dialog.c:2695
 msgid "the full month name"
 msgstr "полное название месяца"
 
-#: src/prefs_common_dialog.c:2693
+#: src/prefs_common_dialog.c:2696
 msgid "the preferred date and time for the current locale"
 msgstr "предпочтительный формат даты и времени для выбранной страны"
 
-#: src/prefs_common_dialog.c:2694
+#: src/prefs_common_dialog.c:2697
 msgid "the century number (year/100)"
 msgstr "век (год/100)"
 
-#: src/prefs_common_dialog.c:2695
+#: src/prefs_common_dialog.c:2698
 msgid "the day of the month as a decimal number"
 msgstr "день месяца"
 
-#: src/prefs_common_dialog.c:2696
+#: src/prefs_common_dialog.c:2699
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "час, 24-часовое представление"
 
-#: src/prefs_common_dialog.c:2697
+#: src/prefs_common_dialog.c:2700
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "час, 12-часовое представление"
 
-#: src/prefs_common_dialog.c:2698
+#: src/prefs_common_dialog.c:2701
 msgid "the day of the year as a decimal number"
 msgstr "день года"
 
-#: src/prefs_common_dialog.c:2699
+#: src/prefs_common_dialog.c:2702
 msgid "the month as a decimal number"
 msgstr "номер месяца"
 
-#: src/prefs_common_dialog.c:2700
+#: src/prefs_common_dialog.c:2703
 msgid "the minute as a decimal number"
 msgstr "минута"
 
-#: src/prefs_common_dialog.c:2701
+#: src/prefs_common_dialog.c:2704
 msgid "either AM or PM"
 msgstr "AM или PM"
 
-#: src/prefs_common_dialog.c:2702
+#: src/prefs_common_dialog.c:2705
 msgid "the second as a decimal number"
 msgstr "секунда"
 
-#: src/prefs_common_dialog.c:2703
+#: src/prefs_common_dialog.c:2706
 msgid "the day of the week as a decimal number"
 msgstr "номер дня недели"
 
-#: src/prefs_common_dialog.c:2704
+#: src/prefs_common_dialog.c:2707
 msgid "the preferred date for the current locale"
 msgstr "предпочтительный формат даты для выбранной страны"
 
-#: src/prefs_common_dialog.c:2705
+#: src/prefs_common_dialog.c:2708
 msgid "the last two digits of a year"
 msgstr "последние две цифры года"
 
-#: src/prefs_common_dialog.c:2706
+#: src/prefs_common_dialog.c:2709
 msgid "the year as a decimal number"
 msgstr "год полностью"
 
-#: src/prefs_common_dialog.c:2707
+#: src/prefs_common_dialog.c:2710
 msgid "the time zone or name or abbreviation"
 msgstr "имя или сокращение временной зоны"
 
-#: src/prefs_common_dialog.c:2728
+#: src/prefs_common_dialog.c:2731
 msgid "Specifier"
 msgstr "Элемент формата"
 
-#: src/prefs_common_dialog.c:2729
+#: src/prefs_common_dialog.c:2732
 msgid "Description"
 msgstr "Описание"
 
-#: src/prefs_common_dialog.c:2769
+#: src/prefs_common_dialog.c:2772
 msgid "Example"
 msgstr "Пример"
 
-#: src/prefs_common_dialog.c:2850
+#: src/prefs_common_dialog.c:2853
 msgid "Set message colors"
 msgstr "Настройка цветов сообщений"
 
-#: src/prefs_common_dialog.c:2858
+#: src/prefs_common_dialog.c:2861
 msgid "Colors"
 msgstr "Цвета"
 
-#: src/prefs_common_dialog.c:2892
+#: src/prefs_common_dialog.c:2895
 msgid "Quoted Text - First Level"
 msgstr "Цитата - Первый уровень"
 
-#: src/prefs_common_dialog.c:2898
+#: src/prefs_common_dialog.c:2901
 msgid "Quoted Text - Second Level"
 msgstr "Цитата - Второй уровень"
 
-#: src/prefs_common_dialog.c:2904
+#: src/prefs_common_dialog.c:2907
 msgid "Quoted Text - Third Level"
 msgstr "Цитата - Третий уровень"
 
-#: src/prefs_common_dialog.c:2910
+#: src/prefs_common_dialog.c:2913
 msgid "URI link"
 msgstr "Ссылка (URI)"
 
-#: src/prefs_common_dialog.c:2917
+#: src/prefs_common_dialog.c:2920
 msgid "Recycle quote colors"
 msgstr "Циклически использовать цвета цитат"
 
-#: src/prefs_common_dialog.c:2984
+#: src/prefs_common_dialog.c:2987
 msgid "Pick color for quotation level 1"
 msgstr "Выберите цвет для цитат уровня 1"
 
-#: src/prefs_common_dialog.c:2987
+#: src/prefs_common_dialog.c:2990
 msgid "Pick color for quotation level 2"
 msgstr "Выберите цвет для цитат уровня 2"
 
-#: src/prefs_common_dialog.c:2990
+#: src/prefs_common_dialog.c:2993
 msgid "Pick color for quotation level 3"
 msgstr "Выберите цвет для цитат уровня 3"
 
-#: src/prefs_common_dialog.c:2993
+#: src/prefs_common_dialog.c:2996
 msgid "Pick color for URI"
 msgstr "Выберите цвет для ссылок (URI)"
 
-#: src/prefs_common_dialog.c:3133
+#: src/prefs_common_dialog.c:3136
 msgid "Description of symbols"
 msgstr "Описание символов"
 
-#: src/prefs_common_dialog.c:3189
+#: src/prefs_common_dialog.c:3192
 msgid ""
 "Date\n"
 "From\n"
@@ -5375,11 +5401,11 @@ msgstr ""
 "Группы новостей\n"
 "Message-ID"
 
-#: src/prefs_common_dialog.c:3202
+#: src/prefs_common_dialog.c:3205
 msgid "If x is set, displays expr"
 msgstr "Если x установлено, отображает expr"
 
-#: src/prefs_common_dialog.c:3206
+#: src/prefs_common_dialog.c:3209
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -5393,7 +5419,7 @@ msgstr ""
 "Содержимое сообщения без подписи со знаком цитаты\n"
 "Символ '%'"
 
-#: src/prefs_common_dialog.c:3214
+#: src/prefs_common_dialog.c:3217
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -5405,20 +5431,20 @@ msgstr ""
 "Символ '{'\n"
 "Символ '}'"
 
-#: src/prefs_common_dialog.c:3260
+#: src/prefs_common_dialog.c:3263
 msgid "Key bindings"
 msgstr "Клавиатурные команды"
 
-#: src/prefs_common_dialog.c:3273
+#: src/prefs_common_dialog.c:3276
 #, fuzzy
 msgid "Select the preset of key bindings."
 msgstr " Установить клавиатурные команды... "
 
-#: src/prefs_common_dialog.c:3283 src/prefs_common_dialog.c:3607
+#: src/prefs_common_dialog.c:3286 src/prefs_common_dialog.c:3610
 msgid "Default"
 msgstr "По умолчанию"
 
-#: src/prefs_common_dialog.c:3286 src/prefs_common_dialog.c:3616
+#: src/prefs_common_dialog.c:3289 src/prefs_common_dialog.c:3619
 msgid "Old Sylpheed"
 msgstr "Старая Sylpheed"
 
@@ -5539,7 +5565,7 @@ msgstr "Результат команды"
 msgid "Age"
 msgstr "Возраст сообщения"
 
-#: src/prefs_filter_edit.c:501 src/summaryview.c:510
+#: src/prefs_filter_edit.c:501 src/summaryview.c:512
 #, fuzzy
 msgid "Marked"
 msgstr "Метка"
@@ -5771,17 +5797,17 @@ msgid "Attachment"
 msgstr "Вложение"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73 src/query_search.c:371 src/summaryview.c:4733
+#: src/prefs_summary_column.c:73 src/query_search.c:371 src/summaryview.c:4890
 msgid "Subject"
 msgstr "Тема"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/query_search.c:372 src/summaryview.c:4736
+#: src/prefs_summary_column.c:74 src/query_search.c:372 src/summaryview.c:4893
 msgid "From"
 msgstr "От"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/query_search.c:373 src/summaryview.c:4738
+#: src/prefs_summary_column.c:75 src/query_search.c:373 src/summaryview.c:4895
 msgid "Date"
 msgstr "Дата"
 
@@ -5884,7 +5910,7 @@ msgstr "Поиск сообщений"
 msgid "_Save as search folder"
 msgstr "Сохранить в папке черновиков"
 
-#: src/query_search.c:512 src/subscribedialog.c:523 src/summaryview.c:840
+#: src/query_search.c:512 src/subscribedialog.c:523 src/summaryview.c:842
 msgid "Done."
 msgstr "Выполнено."
 
@@ -5898,7 +5924,7 @@ msgstr "Просмотр папки %s ..."
 msgid "Searching %s (%d / %d)..."
 msgstr "Фильтрация..."
 
-#: src/query_search.c:645 src/summaryview.c:2048
+#: src/query_search.c:645 src/summaryview.c:2051
 msgid "(No Date)"
 msgstr "(Нет даты)"
 
@@ -6270,308 +6296,313 @@ msgid "/_Mark/Mark as rea_d"
 msgstr "/Отметить/Пометить как прочитанное"
 
 #: src/summaryview.c:429
+#, fuzzy
+msgid "/_Mark/Mark _thread as read"
+msgstr "/Отметить/Пометить как прочитанное"
+
+#: src/summaryview.c:431
 msgid "/_Mark/Mark all _read"
 msgstr "/Отметить/Пометить все сообщения как прочитанные"
 
-#: src/summaryview.c:430
+#: src/summaryview.c:432
 msgid "/Color la_bel"
 msgstr "/Выделение цветом"
 
-#: src/summaryview.c:434
+#: src/summaryview.c:436
 msgid "/Re-_edit"
 msgstr "/Изменить"
 
-#: src/summaryview.c:436
+#: src/summaryview.c:438
 #, fuzzy
 msgid "/Add sender to address boo_k..."
 msgstr "/Добавить отправителя в адресную книгу"
 
-#: src/summaryview.c:438
+#: src/summaryview.c:440
 #, fuzzy
 msgid "/Create f_ilter rule"
 msgstr "/Инструменты/Создать правило фильтрации"
 
-#: src/summaryview.c:439
+#: src/summaryview.c:441
 #, fuzzy
 msgid "/Create f_ilter rule/_Automatically"
 msgstr "/Инструменты/Создать правило фильтрации/Автоматически"
 
-#: src/summaryview.c:441
+#: src/summaryview.c:443
 #, fuzzy
 msgid "/Create f_ilter rule/by _From"
 msgstr "/Инструменты/Создать правило фильтрации/По отправителю"
 
-#: src/summaryview.c:443
+#: src/summaryview.c:445
 #, fuzzy
 msgid "/Create f_ilter rule/by _To"
 msgstr "/Инструменты/Создать правило фильтрации/По получателю"
 
-#: src/summaryview.c:445
+#: src/summaryview.c:447
 #, fuzzy
 msgid "/Create f_ilter rule/by _Subject"
 msgstr "/Инструменты/Создать правило фильтрации/По теме"
 
-#: src/summaryview.c:451
+#: src/summaryview.c:453
 msgid "/_View/_Source"
 msgstr "/Вид/Исходный текст"
 
-#: src/summaryview.c:452
+#: src/summaryview.c:454
 msgid "/_View/All _header"
 msgstr "/Вид/Все заголовки"
 
-#: src/summaryview.c:454
+#: src/summaryview.c:456
 msgid "/_Print..."
 msgstr "/Печать..."
 
-#: src/summaryview.c:486
+#: src/summaryview.c:488
 msgid "Creating summary view...\n"
 msgstr "Создание области просмотра списка...\n"
 
-#: src/summaryview.c:508
+#: src/summaryview.c:510
 msgid "All"
 msgstr ""
 
-#: src/summaryview.c:511
+#: src/summaryview.c:513
 #, fuzzy
 msgid "Have color label"
 msgstr "/Выделение цветом"
 
-#: src/summaryview.c:512
+#: src/summaryview.c:514
 #, fuzzy
 msgid "Have attachment"
 msgstr "Вложение"
 
-#: src/summaryview.c:521
+#: src/summaryview.c:523
 #, fuzzy
 msgid "Search:"
 msgstr "Поиск"
 
-#: src/summaryview.c:535
+#: src/summaryview.c:537
 msgid "Search for Subject or From"
 msgstr ""
 
-#: src/summaryview.c:702
+#: src/summaryview.c:704
 msgid "Process mark"
 msgstr "Обработка меток"
 
-#: src/summaryview.c:703
+#: src/summaryview.c:705
 msgid "Some marks are left. Process it?"
 msgstr "Несколько меток осталось. Обработать их?"
 
-#: src/summaryview.c:749
+#: src/summaryview.c:751
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "Просмотр папки (%s)..."
 
-#: src/summaryview.c:1292
+#: src/summaryview.c:1295
 #, fuzzy
 msgid "_Search again"
 msgstr "Искать снова"
 
-#: src/summaryview.c:1313 src/summaryview.c:1322
+#: src/summaryview.c:1316 src/summaryview.c:1325
 msgid "No more unread messages"
 msgstr "Нет непрочитанных сообщений"
 
-#: src/summaryview.c:1314
+#: src/summaryview.c:1317
 msgid "No unread message found. Search from the end?"
 msgstr "Непрочитанные сообщения не найдены. Продолжить поиск с конца?"
 
-#: src/summaryview.c:1316
+#: src/summaryview.c:1319
 msgid "No unread messages."
 msgstr "Нет непрочитанных сообщений."
 
-#: src/summaryview.c:1323
+#: src/summaryview.c:1326
 msgid "No unread message found. Go to next folder?"
 msgstr "Непрочитанные сообщения не найдены. Перейти к следующей папке?"
 
-#: src/summaryview.c:1331 src/summaryview.c:1340
+#: src/summaryview.c:1334 src/summaryview.c:1343
 msgid "No more new messages"
 msgstr "Нет новых сообщений"
 
-#: src/summaryview.c:1332
+#: src/summaryview.c:1335
 msgid "No new message found. Search from the end?"
 msgstr "Новые сообщения не найдены. Продолжить поиск с конца?"
 
-#: src/summaryview.c:1334
+#: src/summaryview.c:1337
 msgid "No new messages."
 msgstr "Нет новых сообщений."
 
-#: src/summaryview.c:1341
+#: src/summaryview.c:1344
 msgid "No new message found. Go to next folder?"
 msgstr "Новые сообщения не найдены. Перейти к следующей папке?"
 
-#: src/summaryview.c:1349 src/summaryview.c:1358
+#: src/summaryview.c:1352 src/summaryview.c:1361
 msgid "No more marked messages"
 msgstr "Нет отмеченных сообщений"
 
-#: src/summaryview.c:1350
+#: src/summaryview.c:1353
 msgid "No marked message found. Search from the end?"
 msgstr "Отмеченные сообщения не найдены. Продолжить поиск с конца?"
 
-#: src/summaryview.c:1352 src/summaryview.c:1361
+#: src/summaryview.c:1355 src/summaryview.c:1364
 msgid "No marked messages."
 msgstr "Нет отмеченных сообщений"
 
-#: src/summaryview.c:1359
+#: src/summaryview.c:1362
 msgid "No marked message found. Search from the beginning?"
 msgstr "Отмеченные сообщения не найдены. Продолжить поиск с начала?"
 
-#: src/summaryview.c:1367 src/summaryview.c:1376
+#: src/summaryview.c:1370 src/summaryview.c:1379
 msgid "No more labeled messages"
 msgstr "Нет выделенных цветом сообщений"
 
-#: src/summaryview.c:1368
+#: src/summaryview.c:1371
 msgid "No labeled message found. Search from the end?"
 msgstr "Выделенные цветом сообщения не найдены. Продолжить поиск с конца?"
 
-#: src/summaryview.c:1370 src/summaryview.c:1379
+#: src/summaryview.c:1373 src/summaryview.c:1382
 msgid "No labeled messages."
 msgstr "Нет выделенных цветом сообщений."
 
-#: src/summaryview.c:1377
+#: src/summaryview.c:1380
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Выделенные цветом сообщения не найдены. Продолжить поиск с начала?"
 
-#: src/summaryview.c:1693
+#: src/summaryview.c:1696
 msgid "Attracting messages by subject..."
 msgstr "Группировка сообщений по темам..."
 
-#: src/summaryview.c:1887
+#: src/summaryview.c:1890
 #, c-format
 msgid "%d deleted"
 msgstr "%d удалено"
 
-#: src/summaryview.c:1891
+#: src/summaryview.c:1894
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d перемещено"
 
-#: src/summaryview.c:1892 src/summaryview.c:1897
+#: src/summaryview.c:1895 src/summaryview.c:1900
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:1896
+#: src/summaryview.c:1899
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d скопировано"
 
-#: src/summaryview.c:1911
+#: src/summaryview.c:1914
 msgid " item(s) selected"
 msgstr " сообщений выбрано"
 
-#: src/summaryview.c:1933
+#: src/summaryview.c:1936
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d новых, %d непрочитанных, %d всего (%s)"
 
-#: src/summaryview.c:1937
+#: src/summaryview.c:1940
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d новых, %d непрочитанных, %d всего"
 
-#: src/summaryview.c:1971
+#: src/summaryview.c:1974
 msgid "Sorting summary..."
 msgstr "Сортировка..."
 
-#: src/summaryview.c:2194
+#: src/summaryview.c:2211
 msgid "\tSetting summary from message data..."
 msgstr "\tФормирование списка сообщений..."
 
-#: src/summaryview.c:2196
+#: src/summaryview.c:2213
 msgid "Setting summary from message data..."
 msgstr "Формирование списка сообщений..."
 
-#: src/summaryview.c:2302
+#: src/summaryview.c:2319
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Запись кеша списка (%s)..."
 
-#: src/summaryview.c:2643
+#: src/summaryview.c:2660
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Сообщение %d помечено\n"
 
-#: src/summaryview.c:2701
+#: src/summaryview.c:2718
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Сообщение %d помечено как прочитанное\n"
 
-#: src/summaryview.c:2789
+#: src/summaryview.c:2908
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Сообщение %d помечено как непрочитанное\n"
 
-#: src/summaryview.c:2850
+#: src/summaryview.c:2969
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Сообщение %s/%d помечено как удаленное\n"
 
-#: src/summaryview.c:2878
+#: src/summaryview.c:2997
 msgid "Delete message(s)"
 msgstr "Удаление сообщений"
 
-#: src/summaryview.c:2879
+#: src/summaryview.c:2998
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Удалить сообщения без возможности восстановления?"
 
-#: src/summaryview.c:2953
+#: src/summaryview.c:3072
 msgid "Deleting duplicated messages..."
 msgstr "Уничтожение повторяющихся сообщений..."
 
-#: src/summaryview.c:2991
+#: src/summaryview.c:3110
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "С сообщения %s/%d сняты пометки\n"
 
-#: src/summaryview.c:3049
+#: src/summaryview.c:3168
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Сообщение %d помечено для перемещения в %s\n"
 
-#: src/summaryview.c:3066
+#: src/summaryview.c:3196
 msgid "Destination is same as current folder."
 msgstr "Место назначения совпадает с текущей папкой."
 
-#: src/summaryview.c:3122
+#: src/summaryview.c:3260
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Сообщение %d помечено для копирования в %s\n"
 
-#: src/summaryview.c:3139
+#: src/summaryview.c:3288
 msgid "Destination for copy is same as current folder."
 msgstr "Место назначения для копирования совпадает с текущей папкой."
 
-#: src/summaryview.c:3338
+#: src/summaryview.c:3495
 msgid "Error occurred while processing messages."
 msgstr "Произошла ошибка при обработке сообщений."
 
-#: src/summaryview.c:3646 src/summaryview.c:3647
+#: src/summaryview.c:3803 src/summaryview.c:3804
 msgid "Building threads..."
 msgstr "Связывание обсуждений..."
 
-#: src/summaryview.c:3797 src/summaryview.c:3798
+#: src/summaryview.c:3954 src/summaryview.c:3955
 msgid "Unthreading..."
 msgstr "Отмена связывания обсуждений..."
 
-#: src/summaryview.c:4091 src/summaryview.c:4147
+#: src/summaryview.c:4248 src/summaryview.c:4304
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Фильтрация..."
 
-#: src/summaryview.c:4196
+#: src/summaryview.c:4353
 msgid "filtering..."
 msgstr "фильтрация..."
 
-#: src/summaryview.c:4197
+#: src/summaryview.c:4354
 msgid "Filtering..."
 msgstr "Фильтрация..."
 
-#: src/summaryview.c:4233
+#: src/summaryview.c:4390
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "%d сообщений отфильтровано."
 
-#: src/summaryview.c:4742
+#: src/summaryview.c:4899
 msgid "No."
 msgstr "Номер"
 
@@ -6588,36 +6619,36 @@ msgstr "Создание области просмотра текста...\n"
 msgid "This message can't be displayed.\n"
 msgstr "Невозможно отобразить сообщение.\n"
 
-#: src/textview.c:1929
+#: src/textview.c:1925
 #, fuzzy
 msgid "Sa_ve this image as..."
 msgstr "/Сохранить как..."
 
-#: src/textview.c:1945 src/trayicon.c:109
+#: src/textview.c:1941 src/trayicon.c:109
 #, fuzzy
 msgid "Compose _new message"
 msgstr "Написать новое сообщение"
 
-#: src/textview.c:1947
+#: src/textview.c:1943
 #, fuzzy
 msgid "Add to address _book..."
 msgstr "/Добавить отправителя в адресную книгу"
 
-#: src/textview.c:1949
+#: src/textview.c:1945
 #, fuzzy
 msgid "Copy this add_ress"
 msgstr "Адреса организаций"
 
-#: src/textview.c:1952
+#: src/textview.c:1948
 #, fuzzy
 msgid "_Open with Web browser"
 msgstr "Web-браузер"
 
-#: src/textview.c:1954
+#: src/textview.c:1950
 msgid "Copy this _link"
 msgstr ""
 
-#: src/textview.c:2097
+#: src/textview.c:2093
 #, fuzzy, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6629,7 +6660,7 @@ msgstr ""
 "отображаемого URL (%s).\n"
 "Все равно открыть?"
 
-#: src/textview.c:2102
+#: src/textview.c:2098
 msgid "Fake URL warning"
 msgstr ""
 
diff --git a/po/sk.po b/po/sk.po
index 0c1b93c0..cfdc3fb8 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: 2006-01-27 18:11+0900\n"
+"POT-Creation-Date: 2006-01-31 15:20+0900\n"
 "PO-Revision-Date: 2004-01-22 17:46+0100\n"
 "Last-Translator: Andrej Kacian <andrej@kacian.sk>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
@@ -503,7 +503,7 @@ msgstr "Nájdené %s\n"
 msgid "Configuration is saved.\n"
 msgstr "Nastavenie uložené.\n"
 
-#: libsylph/prefs_common.c:489
+#: libsylph/prefs_common.c:491
 #, fuzzy
 msgid "Junk mail filter"
 msgstr "Priečinok"
@@ -619,8 +619,8 @@ msgstr "%.2fMB"
 msgid "%.2fGB"
 msgstr "%.2fGB"
 
-#: libsylph/utils.c:2373 src/compose.c:2858 src/compose.c:3121
-#: src/compose.c:3184 src/compose.c:3304
+#: libsylph/utils.c:2373 src/compose.c:2867 src/compose.c:3130
+#: src/compose.c:3193 src/compose.c:3313
 msgid "can't change file mode\n"
 msgstr "nedá sa zmeniť mód súboru\n"
 
@@ -705,8 +705,8 @@ msgstr ""
 "Nové správy budú kontrolované v tomto poradí. Ak má byť konto kontrolované\n"
 "pri voľbe 'Prijať všetko', zatrhnite políčko v stĺpci označenom 'G'."
 
-#: src/account_dialog.c:366 src/addressadd.c:192 src/addressbook.c:491
-#: src/compose.c:4262 src/editaddress.c:200 src/editaddress.c:942
+#: src/account_dialog.c:366 src/addressadd.c:192 src/addressbook.c:493
+#: src/compose.c:4271 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:206 src/prefs_filter.c:259 src/prefs_folder_item.c:171
@@ -844,12 +844,12 @@ 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:4762 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4771 src/editaddress.c:201
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "Adresár"
 
-#: src/addressadd.c:212 src/addressbook.c:493 src/editaddress.c:202
+#: src/addressadd.c:212 src/addressbook.c:495 src/editaddress.c:202
 #: src/editaddress.c:795 src/editaddress.c:860 src/editgroup.c:267
 msgid "Remarks"
 msgstr "Poznámky"
@@ -858,183 +858,183 @@ msgstr "Poznámky"
 msgid "Select Address Book Folder"
 msgstr "Vyberte priečinok adresára"
 
-#: src/addressbook.c:336 src/compose.c:515 src/mainwindow.c:477
+#: src/addressbook.c:338 src/compose.c:515 src/mainwindow.c:480
 #: src/messageview.c:138
 msgid "/_File"
 msgstr "/_Súbor"
 
-#: src/addressbook.c:337
+#: src/addressbook.c:339
 msgid "/_File/New _Book"
 msgstr "/_Súbor/Nový _Adresár"
 
-#: src/addressbook.c:338
+#: src/addressbook.c:340
 msgid "/_File/New _vCard"
 msgstr "/_Súbor/Nový _vCard"
 
-#: src/addressbook.c:340
+#: src/addressbook.c:342
 msgid "/_File/New _JPilot"
 msgstr "/_Súbor/Nový _JPilot"
 
-#: src/addressbook.c:343
+#: src/addressbook.c:345
 msgid "/_File/New _Server"
 msgstr "/_Súbor/Nový _Server"
 
-#: src/addressbook.c:345 src/addressbook.c:348 src/compose.c:520
-#: src/compose.c:525 src/compose.c:528 src/compose.c:531 src/mainwindow.c:495
-#: src/mainwindow.c:498 src/mainwindow.c:500 src/mainwindow.c:503
-#: src/mainwindow.c:505 src/messageview.c:141
+#: src/addressbook.c:347 src/addressbook.c:350 src/compose.c:520
+#: src/compose.c:525 src/compose.c:528 src/compose.c:531 src/mainwindow.c:498
+#: src/mainwindow.c:501 src/mainwindow.c:503 src/mainwindow.c:506
+#: src/mainwindow.c:508 src/messageview.c:141
 msgid "/_File/---"
 msgstr "/_Súbor/---"
 
-#: src/addressbook.c:346
+#: src/addressbook.c:348
 msgid "/_File/_Edit"
 msgstr "/_Súbor/_Upraviť"
 
-#: src/addressbook.c:347
+#: src/addressbook.c:349
 msgid "/_File/_Delete"
 msgstr "/_Súbor/Z_mazať"
 
-#: src/addressbook.c:349
+#: src/addressbook.c:351
 msgid "/_File/_Save"
 msgstr "/_Súbor/U_ložiť"
 
-#: src/addressbook.c:350 src/compose.c:532 src/messageview.c:142
+#: src/addressbook.c:352 src/compose.c:532 src/messageview.c:142
 msgid "/_File/_Close"
 msgstr "/_Súbor/_Zavrieť"
 
-#: src/addressbook.c:351
+#: src/addressbook.c:353
 msgid "/_Address"
 msgstr "/_Adresa"
 
-#: src/addressbook.c:352
+#: src/addressbook.c:354
 msgid "/_Address/New _Address"
 msgstr "/_Adresa/Nová _Adresa"
 
-#: src/addressbook.c:353
+#: src/addressbook.c:355
 msgid "/_Address/New _Group"
 msgstr "/_Adresa/Nová _Skupina"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:356
 msgid "/_Address/New _Folder"
 msgstr "/_Adresa/Nový _Priečinok"
 
-#: src/addressbook.c:355
+#: src/addressbook.c:357
 msgid "/_Address/---"
 msgstr "/_Adresa/--- "
 
-#: src/addressbook.c:356
+#: src/addressbook.c:358
 msgid "/_Address/_Edit"
 msgstr "/_Adresa/_Upraviť"
 
-#: src/addressbook.c:357
+#: src/addressbook.c:359
 msgid "/_Address/_Delete"
 msgstr "/_Adresa/Z_mazať"
 
-#: src/addressbook.c:358 src/compose.c:639 src/mainwindow.c:738
-#: src/messageview.c:259
+#: src/addressbook.c:360 src/compose.c:645 src/mainwindow.c:749
+#: src/messageview.c:264
 msgid "/_Tools"
 msgstr "/_Nástroje"
 
-#: src/addressbook.c:359
+#: src/addressbook.c:361
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Nástroje/Importovať súbor _LDIF"
 
-#: src/addressbook.c:360 src/compose.c:658 src/mainwindow.c:788
-#: src/messageview.c:277
+#: src/addressbook.c:362 src/compose.c:664 src/mainwindow.c:799
+#: src/messageview.c:282
 msgid "/_Help"
 msgstr "/Nápo_veda"
 
-#: src/addressbook.c:361 src/compose.c:659 src/mainwindow.c:799
-#: src/messageview.c:278
+#: src/addressbook.c:363 src/compose.c:665 src/mainwindow.c:810
+#: src/messageview.c:283
 msgid "/_Help/_About"
 msgstr "/Nápo_veda/_O programe"
 
-#: src/addressbook.c:380 src/addressbook.c:390
+#: src/addressbook.c:382 src/addressbook.c:392
 msgid "/New _Address"
 msgstr "/Nová _Adresa"
 
-#: src/addressbook.c:381 src/addressbook.c:391
+#: src/addressbook.c:383 src/addressbook.c:393
 msgid "/New _Group"
 msgstr "/Nová _Skupina"
 
-#: src/addressbook.c:382 src/addressbook.c:392
+#: src/addressbook.c:384 src/addressbook.c:394
 msgid "/New _Folder"
 msgstr "/Nový _Priečinok"
 
-#: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:509
+#: src/addressbook.c:385 src/addressbook.c:395 src/compose.c:509
 #: src/folderview.c:246 src/folderview.c:248 src/folderview.c:253
 #: src/folderview.c:266 src/folderview.c:268 src/folderview.c:270
 #: src/folderview.c:275 src/folderview.c:289 src/folderview.c:291
 #: src/folderview.c:295 src/summaryview.c:414 src/summaryview.c:418
-#: src/summaryview.c:421 src/summaryview.c:431 src/summaryview.c:433
-#: src/summaryview.c:435 src/summaryview.c:447 src/summaryview.c:453
+#: src/summaryview.c:421 src/summaryview.c:433 src/summaryview.c:435
+#: src/summaryview.c:437 src/summaryview.c:449 src/summaryview.c:455
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:534
-#: src/mainwindow.c:509 src/messageview.c:144
+#: src/addressbook.c:386 src/addressbook.c:396 src/compose.c:534
+#: src/mainwindow.c:512 src/messageview.c:144
 msgid "/_Edit"
 msgstr "/_Upraviť"
 
-#: src/addressbook.c:385 src/addressbook.c:395 src/summaryview.c:432
+#: src/addressbook.c:387 src/addressbook.c:397 src/summaryview.c:434
 msgid "/_Delete"
 msgstr "/Z_mazať"
 
-#: src/addressbook.c:492
+#: src/addressbook.c:494
 msgid "E-Mail address"
 msgstr "E-mailová adresa"
 
-#: src/addressbook.c:496 src/compose.c:4763 src/prefs_common_dialog.c:2183
+#: src/addressbook.c:498 src/compose.c:4772 src/prefs_common_dialog.c:2183
 msgid "Address book"
 msgstr "Otvoriť adresár"
 
-#: src/addressbook.c:596 src/prefs_filter_edit.c:249
+#: src/addressbook.c:600 src/prefs_filter_edit.c:249
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "Meno:"
 
 #. Buttons
-#: src/addressbook.c:628 src/addressbook.c:1680 src/editaddress.c:884
-#: src/editaddress.c:1017 src/mainwindow.c:2391 src/prefs_actions.c:266
+#: src/addressbook.c:632 src/addressbook.c:1684 src/editaddress.c:884
+#: src/editaddress.c:1017 src/mainwindow.c:2402 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
 #: src/prefs_template.c:233
 msgid "Delete"
 msgstr "Zmazať"
 
-#: src/addressbook.c:631 src/editaddress.c:890 src/editaddress.c:1023
+#: src/addressbook.c:635 src/editaddress.c:890 src/editaddress.c:1023
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:273 src/prefs_display_header.c:328
 #: src/prefs_filter_edit.c:1550
 msgid "Add"
 msgstr "Pridať"
 
-#: src/addressbook.c:634
+#: src/addressbook.c:638
 msgid "Lookup"
 msgstr "Vyhľadať"
 
-#: src/addressbook.c:646 src/headerview.c:55 src/prefs_folder_item.c:339
+#: src/addressbook.c:650 src/headerview.c:55 src/prefs_folder_item.c:339
 #: src/prefs_template.c:176
 msgid "To:"
 msgstr "Komu:"
 
-#: src/addressbook.c:650 src/prefs_folder_item.c:356 src/prefs_template.c:178
+#: src/addressbook.c:654 src/prefs_folder_item.c:356 src/prefs_template.c:178
 msgid "Cc:"
 msgstr "Kópia:"
 
-#: src/addressbook.c:654 src/prefs_folder_item.c:367
+#: src/addressbook.c:658 src/prefs_folder_item.c:367
 msgid "Bcc:"
 msgstr "Slepá kópia:"
 
 #. Confirm deletion
-#: src/addressbook.c:841
+#: src/addressbook.c:845
 msgid "Delete address(es)"
 msgstr "Zmazať adresu(y)"
 
-#: src/addressbook.c:842
+#: src/addressbook.c:846
 msgid "Really delete the address(es)?"
 msgstr "Naozaj zmazať adresu(y)?"
 
-#: src/addressbook.c:1671
+#: src/addressbook.c:1675
 #, fuzzy, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1043,38 +1043,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:1674 src/folderview.c:2351
+#: src/addressbook.c:1678 src/folderview.c:2351
 msgid "Delete folder"
 msgstr "Odstrániť priečinok"
 
-#: src/addressbook.c:1674
+#: src/addressbook.c:1678
 #, fuzzy
 msgid "_Folder only"
 msgstr "Len priečinok"
 
-#: src/addressbook.c:1674
+#: src/addressbook.c:1678
 #, fuzzy
 msgid "Folder and _addresses"
 msgstr "Priečinok aj adresy"
 
-#: src/addressbook.c:1679
+#: src/addressbook.c:1683
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Naozaj zmazať '%s' ?"
 
-#: src/addressbook.c:2365 src/addressbook.c:2498
+#: src/addressbook.c:2369 src/addressbook.c:2502
 msgid "New user, could not save index file."
 msgstr "Nový uživateľ; nepodarilo sa uložiť indexový súbor."
 
-#: src/addressbook.c:2369 src/addressbook.c:2502
+#: src/addressbook.c:2373 src/addressbook.c:2506
 msgid "New user, could not save address book files."
 msgstr "Nový uživateľ; nedajú sa uložiť súbory adresára."
 
-#: src/addressbook.c:2379 src/addressbook.c:2512
+#: src/addressbook.c:2383 src/addressbook.c:2516
 msgid "Old address book converted successfully."
 msgstr "Konverzia starého adresára prebehla úspešne."
 
-#: src/addressbook.c:2384
+#: src/addressbook.c:2388
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1082,7 +1082,7 @@ msgstr ""
 "Konverzia starého adresára prebehla,\n"
 "nedá sa uložiť indexový súbor nového adresára"
 
-#: src/addressbook.c:2397
+#: src/addressbook.c:2401
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1090,7 +1090,7 @@ msgstr ""
 "Nedá sa konvertovať starý adresár,\n"
 "ale boli vytvorené prázdne súbory nového adresára."
 
-#: src/addressbook.c:2403
+#: src/addressbook.c:2407
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1098,7 +1098,7 @@ msgstr ""
 "Nedá sa konvertovať starý adresár,\n"
 "nedajú sa ani vytvoriť súbory nového adresára."
 
-#: src/addressbook.c:2408
+#: src/addressbook.c:2412
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1106,92 +1106,92 @@ msgstr ""
 "Nedá sa konvertovať starý adresár\n"
 "a nedajú sa ani vytvoriť súbory nového adresára."
 
-#: src/addressbook.c:2415
+#: src/addressbook.c:2419
 msgid "Addressbook conversion error"
 msgstr "Chyba pri konverzii adresára"
 
-#: src/addressbook.c:2419
+#: src/addressbook.c:2423
 msgid "Addressbook conversion"
 msgstr "Konverzia adresára"
 
-#: src/addressbook.c:2454
+#: src/addressbook.c:2458
 msgid "Addressbook Error"
 msgstr "Chyba v adresári"
 
-#: src/addressbook.c:2455 src/addressbook.c:2555
+#: src/addressbook.c:2459 src/addressbook.c:2559
 msgid "Could not read address index"
 msgstr "Nedá sa načítať zoznam adries"
 
-#: src/addressbook.c:2517
+#: src/addressbook.c:2521
 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:2531
+#: src/addressbook.c:2535
 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:2537
+#: src/addressbook.c:2541
 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:2543
+#: src/addressbook.c:2547
 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:2561
+#: src/addressbook.c:2565
 msgid "Addressbook Conversion Error"
 msgstr "Chyba pri konverzii adresára"
 
-#: src/addressbook.c:2567
+#: src/addressbook.c:2571
 msgid "Addressbook Conversion"
 msgstr "Konverzia adresára"
 
-#: src/addressbook.c:3072 src/prefs_common_dialog.c:2033
+#: src/addressbook.c:3086 src/prefs_common_dialog.c:2033
 msgid "Interface"
 msgstr "Ovládanie"
 
-#: src/addressbook.c:3088 src/importldif.c:514
+#: src/addressbook.c:3102 src/importldif.c:514
 msgid "Address Book"
 msgstr "Adresár"
 
-#: src/addressbook.c:3104
+#: src/addressbook.c:3118
 msgid "Person"
 msgstr "Osoba"
 
-#: src/addressbook.c:3120
+#: src/addressbook.c:3134
 msgid "EMail Address"
 msgstr "E-mailová adresa"
 
-#: src/addressbook.c:3136
+#: src/addressbook.c:3150
 msgid "Group"
 msgstr "Skupina"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3152 src/folderview.c:367 src/prefs_account_dialog.c:1694
+#: src/addressbook.c:3166 src/folderview.c:367 src/prefs_account_dialog.c:1694
 #: src/query_search.c:370
 msgid "Folder"
 msgstr "Priečinok"
 
-#: src/addressbook.c:3168
+#: src/addressbook.c:3182
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3184 src/addressbook.c:3200
+#: src/addressbook.c:3198 src/addressbook.c:3214
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3216
+#: src/addressbook.c:3230
 msgid "LDAP Server"
 msgstr "LDAP server"
 
@@ -1203,7 +1203,7 @@ msgstr "Spoločná adresa"
 msgid "Personal address"
 msgstr "Súkromná adresa"
 
-#: src/alertpanel.c:141 src/compose.c:5485 src/main.c:573
+#: src/alertpanel.c:141 src/compose.c:5494 src/main.c:573
 msgid "Notice"
 msgstr "Upozornenie"
 
@@ -1254,7 +1254,7 @@ msgstr "Hnedá"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4593
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4750
 msgid "None"
 msgstr "Žiadna"
 
@@ -1316,7 +1316,7 @@ msgstr "/Úp_ravy"
 msgid "/_Edit/_Redo"
 msgstr "/Úp_ravy/Z_novu urobiť"
 
-#: src/compose.c:537 src/compose.c:544 src/mainwindow.c:513
+#: src/compose.c:537 src/compose.c:544 src/mainwindow.c:516
 #: src/messageview.c:147
 msgid "/_Edit/---"
 msgstr "/Úp_ravy/---"
@@ -1325,7 +1325,7 @@ msgstr "/Úp_ravy/---"
 msgid "/_Edit/Cu_t"
 msgstr "/Úp_ravy/_Vystrihnúť"
 
-#: src/compose.c:539 src/mainwindow.c:510 src/messageview.c:145
+#: src/compose.c:539 src/mainwindow.c:513 src/messageview.c:145
 msgid "/_Edit/_Copy"
 msgstr "/Úp_ravy/_Kopírovať"
 
@@ -1337,7 +1337,7 @@ msgstr "/Úp_ravy/_Prilepiť"
 msgid "/_Edit/Paste as _quotation"
 msgstr "/Úp_ravy/Prilepiť ako _citáciu"
 
-#: src/compose.c:543 src/mainwindow.c:511 src/messageview.c:146
+#: src/compose.c:543 src/mainwindow.c:514 src/messageview.c:146
 msgid "/_Edit/Select _all"
 msgstr "/Úp_ravy/Vy_brať všetko"
 
@@ -1354,8 +1354,8 @@ msgstr "/Úp_ravy/Zalomiť všetky _dlhé riadky"
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/Úp_ravy/_Kopírovať"
 
-#: src/compose.c:550 src/mainwindow.c:518 src/messageview.c:151
-#: src/summaryview.c:448
+#: src/compose.c:550 src/mainwindow.c:521 src/messageview.c:151
+#: src/summaryview.c:450
 msgid "/_View"
 msgstr "/_Zobraziť"
 
@@ -1376,9 +1376,9 @@ msgid "/_View/_Reply to"
 msgstr "/_Zobraziť/_Odpoveď komu"
 
 #: src/compose.c:555 src/compose.c:557 src/compose.c:559 src/compose.c:561
-#: src/mainwindow.c:538 src/mainwindow.c:541 src/mainwindow.c:568
-#: src/mainwindow.c:592 src/mainwindow.c:687 src/mainwindow.c:691
-#: src/messageview.c:236
+#: src/mainwindow.c:541 src/mainwindow.c:544 src/mainwindow.c:571
+#: src/mainwindow.c:595 src/mainwindow.c:696 src/mainwindow.c:700
+#: src/messageview.c:241
 msgid "/_View/---"
 msgstr "/_Zobraziť/---"
 
@@ -1394,7 +1394,7 @@ msgstr "/_Zobraziť/P_ravítko"
 msgid "/_View/_Attachment"
 msgstr "/_Zobraziť/Prí_lohy"
 
-#: src/compose.c:567 src/mainwindow.c:599 src/messageview.c:158
+#: src/compose.c:567 src/mainwindow.c:602 src/messageview.c:158
 #, fuzzy
 msgid "/_View/Character _encoding"
 msgstr "/_Zobraziť/_Triediť/Zostupne"
@@ -1404,241 +1404,252 @@ msgid "/_View/Character _encoding/_Automatic"
 msgstr ""
 
 #: src/compose.c:570 src/compose.c:576 src/compose.c:582 src/compose.c:586
-#: src/compose.c:592 src/compose.c:596 src/compose.c:602 src/compose.c:606
-#: src/compose.c:616 src/compose.c:620 src/compose.c:628 src/compose.c:632
-#: src/mainwindow.c:595 src/mainwindow.c:602 src/messageview.c:154
+#: src/compose.c:592 src/compose.c:596 src/compose.c:602 src/compose.c:608
+#: src/compose.c:612 src/compose.c:622 src/compose.c:626 src/compose.c:634
+#: src/compose.c:638 src/mainwindow.c:598 src/mainwindow.c:605
+#: src/messageview.c:154
 #, fuzzy
 msgid "/_View/Character _encoding/---"
 msgstr "/_Zobraziť/_Triediť/Zostupne"
 
-#: src/compose.c:572 src/mainwindow.c:603 src/messageview.c:162
+#: src/compose.c:572 src/mainwindow.c:606 src/messageview.c:162
 #, fuzzy
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Zobraziť/_Kódovanie/7bit ascii (US-ASC_II)"
 
-#: src/compose.c:574 src/mainwindow.c:605 src/messageview.c:165
+#: src/compose.c:574 src/mainwindow.c:608 src/messageview.c:165
 #, fuzzy
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Zobraziť/_Kódovanie/Unicode (_UTF-8)"
 
-#: src/compose.c:578 src/mainwindow.c:609 src/messageview.c:168
+#: src/compose.c:578 src/mainwindow.c:612 src/messageview.c:168
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Zobraziť/_Kódovanie/Západná Európa (ISO-8859-_1)"
 
-#: src/compose.c:580 src/mainwindow.c:611 src/messageview.c:170
+#: src/compose.c:580 src/mainwindow.c:614 src/messageview.c:170
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Zobraziť/_Kódovanie/Západná Európa (ISO-8859-15)"
 
-#: src/compose.c:584 src/mainwindow.c:617 src/messageview.c:175
+#: src/compose.c:584 src/mainwindow.c:620 src/messageview.c:175
 #, fuzzy
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Zobraziť/_Kódovanie/Stredná Európa (ISO-8859-_2)"
 
-#: src/compose.c:588 src/mainwindow.c:621 src/messageview.c:178
+#: src/compose.c:588 src/mainwindow.c:624 src/messageview.c:178
 #, fuzzy
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Zobraziť/_Kódovanie/_Pobaltie (ISO-8859-13)"
 
-#: src/compose.c:590 src/mainwindow.c:623 src/messageview.c:180
+#: src/compose.c:590 src/mainwindow.c:626 src/messageview.c:180
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Zobraziť/_Kódovanie/Pobaltie (ISO-8859-_4)"
 
-#: src/compose.c:594 src/mainwindow.c:627 src/messageview.c:183
+#: src/compose.c:594 src/mainwindow.c:630 src/messageview.c:183
 #, fuzzy
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Zobraziť/_Kódovanie/Grécko (ISO-8859-_7)"
 
-#: src/compose.c:598 src/mainwindow.c:631 src/messageview.c:186
+#: src/compose.c:598 src/mainwindow.c:634 src/messageview.c:186
+#, fuzzy
+msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
+msgstr "/_Zobraziť/_Kódovanie/Pobaltie (ISO-8859-_4)"
+
+#: src/compose.c:600 src/mainwindow.c:636 src/messageview.c:188
+#, fuzzy
+msgid "/_View/Character _encoding/Arabic (Windows-1256)"
+msgstr "/_Zobraziť/_Kódovanie/Cyrilika (Windows-1251)"
+
+#: src/compose.c:604 src/mainwindow.c:640 src/messageview.c:191
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Zobraziť/_Kódovanie/Grécko (ISO-8859-_7)"
 
-#: src/compose.c:600 src/mainwindow.c:633 src/messageview.c:188
+#: src/compose.c:606 src/mainwindow.c:642 src/messageview.c:193
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Zobraziť/_Kódovanie/Cyrilika (Windows-1251)"
 
-#: src/compose.c:604 src/mainwindow.c:637 src/messageview.c:191
+#: src/compose.c:610 src/mainwindow.c:646 src/messageview.c:196
 #, fuzzy
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Zobraziť/_Kódovanie/Turecko (ISO-8859-_9)"
 
-#: src/compose.c:608 src/mainwindow.c:641 src/messageview.c:194
+#: src/compose.c:614 src/mainwindow.c:650 src/messageview.c:199
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Zobraziť/_Kódovanie/Cyrilika (ISO-8859-_5)"
 
-#: src/compose.c:610 src/mainwindow.c:643 src/messageview.c:196
+#: src/compose.c:616 src/mainwindow.c:652 src/messageview.c:201
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Zobraziť/_Kódovanie/Cyrilika (KOI8-_R)"
 
-#: src/compose.c:612 src/mainwindow.c:645 src/messageview.c:198
+#: src/compose.c:618 src/mainwindow.c:654 src/messageview.c:203
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Zobraziť/_Kódovanie/Cyrilika (KOI8-_R)"
 
-#: src/compose.c:614 src/mainwindow.c:647 src/messageview.c:200
+#: src/compose.c:620 src/mainwindow.c:656 src/messageview.c:205
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Zobraziť/_Kódovanie/Cyrilika (Windows-1251)"
 
-#: src/compose.c:618 src/mainwindow.c:651 src/messageview.c:203
+#: src/compose.c:624 src/mainwindow.c:660 src/messageview.c:208
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Zobraziť/_Kódovanie/Japonsko (ISO-2022-_JP)"
 
-#: src/compose.c:622 src/mainwindow.c:661 src/messageview.c:212
+#: src/compose.c:628 src/mainwindow.c:670 src/messageview.c:217
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Zobraziť/_Kódovanie/Zjednodušená čínština (_GB2312)"
 
-#: src/compose.c:624 src/mainwindow.c:663 src/messageview.c:214
+#: src/compose.c:630 src/mainwindow.c:672 src/messageview.c:219
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Zobraziť/_Kódovanie/Zjednodušená čínština (_GB2312)"
 
-#: src/compose.c:626 src/mainwindow.c:665 src/messageview.c:216
+#: src/compose.c:632 src/mainwindow.c:674 src/messageview.c:221
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Zobraziť/_Kódovanie/Tradičná čínština (_Big5)"
 
-#: src/compose.c:630 src/mainwindow.c:673 src/messageview.c:223
+#: src/compose.c:636 src/mainwindow.c:682 src/messageview.c:228
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Zobraziť/_Kódovanie/Kórea (EUC-_KR)"
 
-#: src/compose.c:634 src/mainwindow.c:679 src/messageview.c:228
+#: src/compose.c:640 src/mainwindow.c:688 src/messageview.c:233
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Zobraziť/_Kódovanie/Thajsko (TIS-620)"
 
-#: src/compose.c:636 src/mainwindow.c:681 src/messageview.c:230
+#: src/compose.c:642 src/mainwindow.c:690 src/messageview.c:235
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Zobraziť/_Kódovanie/Thajsko (Windows-874)"
 
-#: src/compose.c:640 src/mainwindow.c:739 src/messageview.c:260
+#: src/compose.c:646 src/mainwindow.c:750 src/messageview.c:265
 msgid "/_Tools/_Address book"
 msgstr "/_Nástroje/_Adresár"
 
-#: src/compose.c:641
+#: src/compose.c:647
 msgid "/_Tools/_Template"
 msgstr "/_Nástroje/Ša_blóna"
 
-#: src/compose.c:642 src/mainwindow.c:762 src/messageview.c:275
+#: src/compose.c:648 src/mainwindow.c:773 src/messageview.c:280
 msgid "/_Tools/Actio_ns"
 msgstr "/_Nástroje/A_kcie"
 
-#: src/compose.c:643 src/compose.c:647 src/compose.c:653 src/mainwindow.c:742
-#: src/mainwindow.c:756 src/mainwindow.c:761 src/mainwindow.c:763
-#: src/mainwindow.c:766 src/mainwindow.c:768 src/messageview.c:263
-#: src/messageview.c:274
+#: src/compose.c:649 src/compose.c:653 src/compose.c:659 src/mainwindow.c:753
+#: src/mainwindow.c:767 src/mainwindow.c:772 src/mainwindow.c:774
+#: src/mainwindow.c:777 src/mainwindow.c:779 src/messageview.c:268
+#: src/messageview.c:279
 msgid "/_Tools/---"
 msgstr "/_Nástroje/---"
 
-#: src/compose.c:644
+#: src/compose.c:650
 #, fuzzy
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/Úp_ravy/Upraviť e_xterným editorom"
 
-#: src/compose.c:648
+#: src/compose.c:654
 #, fuzzy
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Nástroje/A_kcie"
 
-#: src/compose.c:649
+#: src/compose.c:655
 #, fuzzy
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/Sp_ráva/_Zašifrovať"
 
-#: src/compose.c:654
+#: src/compose.c:660
 #, fuzzy
 msgid "/_Tools/_Check spell"
 msgstr "/_Nástroje/V_ykonať"
 
-#: src/compose.c:655
+#: src/compose.c:661
 #, fuzzy
 msgid "/_Tools/_Set spell language"
 msgstr "/_Nástroje/Ša_blóna"
 
-#: src/compose.c:899
+#: src/compose.c:908
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: súbor neexistuje\n"
 
-#: src/compose.c:1003 src/compose.c:1074
+#: src/compose.c:1012 src/compose.c:1083
 msgid "Can't get text part\n"
 msgstr "Nedá sa získať časť textu\n"
 
-#: src/compose.c:1475
+#: src/compose.c:1484
 msgid "Quote mark format error."
 msgstr "Chyba v úvodzovkách."
 
-#: src/compose.c:1487
+#: src/compose.c:1496
 msgid "Message reply/forward format error."
 msgstr "Chyba formátu odpovede/preposielania."
 
-#: src/compose.c:1907
+#: src/compose.c:1916
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Súbor %s neexistuje\n"
 
-#: src/compose.c:1911
+#: src/compose.c:1920
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Nedá sa zistiť dĺžka súboru %s\n"
 
-#: src/compose.c:1915
+#: src/compose.c:1924
 #, c-format
 msgid "File %s is empty."
 msgstr "Súbor %s je prázdny."
 
-#: src/compose.c:1919
+#: src/compose.c:1928
 #, c-format
 msgid "Can't read %s."
 msgstr "Nedá sa čítať %s."
 
-#: src/compose.c:1952
+#: src/compose.c:1961
 #, c-format
 msgid "Message: %s"
 msgstr "Správa: %s"
 
-#: src/compose.c:2012 src/mimeview.c:565
+#: src/compose.c:2021 src/mimeview.c:565
 msgid "Can't get the part of multipart message."
 msgstr "Nedá sa získať časť viacdielnej správy."
 
-#: src/compose.c:2496 src/headerview.c:195 src/query_search.c:636
-#: src/summaryview.c:2107
+#: src/compose.c:2505 src/headerview.c:195 src/query_search.c:636
+#: src/summaryview.c:2124
 msgid "(No Subject)"
 msgstr "(bez predmetu)"
 
-#: src/compose.c:2499
+#: src/compose.c:2508
 #, fuzzy, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Písanie správy%s"
 
-#: src/compose.c:2612
+#: src/compose.c:2621
 msgid "Recipient is not specified."
 msgstr "Nie je určený príjemca."
 
-#: src/compose.c:2620
+#: src/compose.c:2629
 #, fuzzy
 msgid "Empty subject"
 msgstr "Predmet"
 
-#: src/compose.c:2621
+#: src/compose.c:2630
 msgid "Subject is empty. Send it anyway?"
 msgstr "Predmet je prázdny. Odoslať napriek tomu?"
 
-#: src/compose.c:2680
+#: src/compose.c:2689
 msgid "can't get recipient list."
 msgstr "nedá sa získať zoznam príjemcov."
 
-#: src/compose.c:2700
+#: src/compose.c:2709
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1646,21 +1657,21 @@ msgstr ""
 "Nie je určené konto pre odosielanie správ.\n"
 "Pred odosielaním prosím zvoľte poštové konto."
 
-#: src/compose.c:2714 src/send_message.c:299
+#: src/compose.c:2723 src/send_message.c:299
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Pri odosielaní správy na %s nastala chyba."
 
-#: src/compose.c:2756
+#: src/compose.c:2765
 msgid "Can't save the message to outbox."
 msgstr "Správa sa nedá uložiť medzi odoslané správy."
 
-#: src/compose.c:2794
+#: src/compose.c:2803
 #, 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:2891
+#: src/compose.c:2900
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1671,12 +1682,12 @@ msgstr ""
 "%s na %s.\n"
 "Odoslať správu aj napriek tomu?"
 
-#: src/compose.c:2897
+#: src/compose.c:2906
 #, fuzzy
 msgid "Code conversion error"
 msgstr "Chyba pri konverzii adresára"
 
-#: src/compose.c:2970
+#: src/compose.c:2979
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1685,159 +1696,159 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:2974
+#: src/compose.c:2983
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3264
+#: src/compose.c:3273
 msgid "can't remove the old message\n"
 msgstr "nedá sa odstrániť stará správa\n"
 
-#: src/compose.c:3282
+#: src/compose.c:3291
 msgid "queueing message...\n"
 msgstr "zaraďujem správu do fronty...\n"
 
-#: src/compose.c:3364
+#: src/compose.c:3373
 msgid "can't find queue folder\n"
 msgstr "nemôžem nájsť priečinok Na odoslanie\n"
 
-#: src/compose.c:3371
+#: src/compose.c:3380
 msgid "can't queue the message\n"
 msgstr "nemôžem zaradiť správu do fronty\n"
 
-#: src/compose.c:3964
+#: src/compose.c:3973
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "vygenerovaný Message-ID: %s\n"
 
-#: src/compose.c:4077
+#: src/compose.c:4086
 msgid "Creating compose window...\n"
 msgstr "Vytváram okno pre písanie správy...\n"
 
-#: src/compose.c:4128 src/headerview.c:54
+#: src/compose.c:4137 src/headerview.c:54
 msgid "From:"
 msgstr "Od:"
 
-#: src/compose.c:4202
+#: src/compose.c:4211
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/_Nástroje/A_kcie"
 
-#: src/compose.c:4205
+#: src/compose.c:4214
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/Sp_ráva/_Zašifrovať"
 
-#: src/compose.c:4243 src/compose.c:5317
+#: src/compose.c:4252 src/compose.c:5326
 msgid "MIME type"
 msgstr "MIME typ"
 
 #. S_COL_DATE
-#: src/compose.c:4252 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4740
+#: src/compose.c:4261 src/mimeview.c:197 src/prefs_filter_edit.c:496
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4897
 msgid "Size"
 msgstr "Veľkosť"
 
-#: src/compose.c:4683 src/mainwindow.c:2324 src/prefs_account_dialog.c:528
+#: src/compose.c:4692 src/mainwindow.c:2335 src/prefs_account_dialog.c:528
 #: src/prefs_common_dialog.c:661
 msgid "Send"
 msgstr "Odoslať"
 
-#: src/compose.c:4684
+#: src/compose.c:4693
 msgid "Send message"
 msgstr "Odoslať správu"
 
-#: src/compose.c:4692
+#: src/compose.c:4701
 msgid "Send later"
 msgstr "Odoslať neskôr"
 
-#: src/compose.c:4693
+#: src/compose.c:4702
 msgid "Put into queue folder and send later"
 msgstr "Zaradiť správu do priečinka Na odoslanie a odoslať neskôr"
 
-#: src/compose.c:4701
+#: src/compose.c:4710
 msgid "Draft"
 msgstr "Koncept"
 
-#: src/compose.c:4702
+#: src/compose.c:4711
 msgid "Save to draft folder"
 msgstr "Uložiť medzi koncepty"
 
-#: src/compose.c:4712
+#: src/compose.c:4721
 msgid "Insert"
 msgstr "Vložiť"
 
-#: src/compose.c:4713
+#: src/compose.c:4722
 msgid "Insert file"
 msgstr "Vložiť obsah súboru"
 
-#: src/compose.c:4721
+#: src/compose.c:4730
 msgid "Attach"
 msgstr "Pripojiť"
 
-#: src/compose.c:4722
+#: src/compose.c:4731
 msgid "Attach file"
 msgstr "Pripojiť súbor"
 
 #. signature
-#: src/compose.c:4732 src/prefs_account_dialog.c:1208
+#: src/compose.c:4741 src/prefs_account_dialog.c:1208
 #: src/prefs_common_dialog.c:953
 msgid "Signature"
 msgstr "Podpis"
 
-#: src/compose.c:4733
+#: src/compose.c:4742
 #, fuzzy
 msgid "Append signature"
 msgstr "CHYBNÝ podpis"
 
 #. editor
-#: src/compose.c:4742 src/prefs_common_dialog.c:991
+#: src/compose.c:4751 src/prefs_common_dialog.c:991
 #: src/prefs_common_dialog.c:2315
 msgid "Editor"
 msgstr "Editor"
 
-#: src/compose.c:4743
+#: src/compose.c:4752
 msgid "Edit with external editor"
 msgstr "Upraviť pomocou externého editoru"
 
-#: src/compose.c:4751
+#: src/compose.c:4760
 msgid "Linewrap"
 msgstr "Riadkovanie"
 
-#: src/compose.c:4752
+#: src/compose.c:4761
 msgid "Wrap all long lines"
 msgstr "Zalomiť všetky dlhé riadky"
 
-#: src/compose.c:5213
+#: src/compose.c:5222
 msgid "Invalid MIME type."
 msgstr "Neplatný MIME typ."
 
-#: src/compose.c:5231
+#: src/compose.c:5240
 msgid "File doesn't exist or is empty."
 msgstr "Súbor neexistuje alebo je prázdny."
 
-#: src/compose.c:5299
+#: src/compose.c:5308
 msgid "Properties"
 msgstr "Vlastnosti"
 
-#: src/compose.c:5319 src/prefs_common_dialog.c:1444
+#: src/compose.c:5328 src/prefs_common_dialog.c:1444
 msgid "Encoding"
 msgstr "Kódová stránka"
 
-#: src/compose.c:5342 src/prefs_folder_item.c:202
+#: src/compose.c:5351 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Cesta"
 
-#: src/compose.c:5343
+#: src/compose.c:5352
 msgid "File name"
 msgstr "Názov súboru"
 
-#: src/compose.c:5436
+#: src/compose.c:5445
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Neplatný príkaz pre externý editor: `%s'\n"
 
-#: src/compose.c:5482
+#: src/compose.c:5491
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1847,48 +1858,48 @@ msgstr ""
 "Ukončiť ho násilne?\n"
 "skupinový ID procesu: %d"
 
-#: src/compose.c:5857 src/compose.c:5862 src/compose.c:5868
+#: src/compose.c:5866 src/compose.c:5871 src/compose.c:5877
 msgid "Can't queue the message."
 msgstr "Správa sa nedá zaradiť do fronty."
 
-#: src/compose.c:5959
+#: src/compose.c:5968
 #, fuzzy
 msgid "Select files"
 msgstr "Vybrať súbor"
 
-#: src/compose.c:5982
+#: src/compose.c:5991
 msgid "Select file"
 msgstr "Vybrať súbor"
 
-#: src/compose.c:6017
+#: src/compose.c:6026
 #, fuzzy
 msgid "Save message"
 msgstr "Odoslať správu"
 
-#: src/compose.c:6018
+#: src/compose.c:6027
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Obsah správy sa zmenil. Chcete zahodiť zmeny?"
 
-#: src/compose.c:6020
+#: src/compose.c:6029
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:6062
+#: src/compose.c:6071
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Chcete použiť šablónu `%s' ?"
 
-#: src/compose.c:6064
+#: src/compose.c:6073
 msgid "Apply template"
 msgstr "Použiť šablónu"
 
-#: src/compose.c:6065
+#: src/compose.c:6074
 #, fuzzy
 msgid "_Replace"
 msgstr "Nahradiť"
 
-#: src/compose.c:6065
+#: src/compose.c:6074
 #, fuzzy
 msgid "_Insert"
 msgstr "Vložiť"
@@ -2331,7 +2342,7 @@ msgstr "Nový"
 
 #. S_COL_MARK
 #: src/folderview.c:412 src/prefs_filter_edit.c:500
-#: src/prefs_summary_column.c:71 src/summaryview.c:509
+#: src/prefs_summary_column.c:71 src/summaryview.c:511
 msgid "Unread"
 msgstr "Neprečítané"
 
@@ -2347,12 +2358,12 @@ msgstr "Nastavujem informácie o priečinku...\n"
 msgid "Setting folder info..."
 msgstr "Nastavujem informácie o priečinku..."
 
-#: src/folderview.c:858 src/mainwindow.c:3464 src/setup.c:80
+#: src/folderview.c:858 src/mainwindow.c:3481 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Prehľadávam priečinok %s%c%s ..."
 
-#: src/folderview.c:862 src/mainwindow.c:3469 src/setup.c:85
+#: src/folderview.c:862 src/mainwindow.c:3486 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Prehľadávam priečinok %s ..."
@@ -2377,7 +2388,7 @@ msgstr "Obnova stromu priečinku sa nepodarila."
 msgid "Checking for new messages in all folders..."
 msgstr "Kontrolujem nové spráby vo všetkých priečinkoch..."
 
-#: src/folderview.c:1200 src/mainwindow.c:2400 src/prefs_common_dialog.c:1789
+#: src/folderview.c:1200 src/mainwindow.c:2411 src/prefs_common_dialog.c:1789
 msgid "Junk"
 msgstr ""
 
@@ -2516,7 +2527,7 @@ msgstr "Predmet:"
 msgid "Creating header view...\n"
 msgstr "Vytváram náhľad hlavičky...\n"
 
-#: src/headerview.c:180 src/query_search.c:637 src/summaryview.c:2110
+#: src/headerview.c:180 src/query_search.c:637 src/summaryview.c:2127
 msgid "(No From)"
 msgstr "(nie je známy odosielateľ)"
 
@@ -2625,7 +2636,7 @@ msgstr "Importovať súbor LDIF do adresára"
 msgid "Prev"
 msgstr "Predchádzajúci"
 
-#: src/importldif.c:768 src/mainwindow.c:2420
+#: src/importldif.c:768 src/mainwindow.c:2431
 msgid "Next"
 msgstr "Nasledujúca"
 
@@ -2972,670 +2983,675 @@ msgstr ""
 msgid "another Sylpheed is already running.\n"
 msgstr "už beží iná kópia Sylpheedu.\n"
 
-#: src/main.c:1064
+#: src/main.c:1083
 #, fuzzy
 msgid "Migration of configuration"
 msgstr "Nastavenie akcií"
 
-#: src/main.c:1065
+#: src/main.c:1084
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
 msgstr ""
 
-#: src/mainwindow.c:478
+#: src/mainwindow.c:481
 msgid "/_File/_Folder"
 msgstr "/_Súbor/P_riečinok"
 
-#: src/mainwindow.c:479
+#: src/mainwindow.c:482
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/_Súbor/P_riečinok/Vytvoriť _nový priečinok..."
 
-#: src/mainwindow.c:481
+#: src/mainwindow.c:484
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/_Súbor/P_riečinok/P_remenovať priečinok..."
 
-#: src/mainwindow.c:482
+#: src/mainwindow.c:485
 #, fuzzy
 msgid "/_File/_Folder/_Move folder..."
 msgstr "/_Súbor/P_riečinok/P_remenovať priečinok..."
 
-#: src/mainwindow.c:483
+#: src/mainwindow.c:486
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/_Súbor/P_riečinok/O_dstrániť priečinok"
 
-#: src/mainwindow.c:484
+#: src/mainwindow.c:487
 #, fuzzy
 msgid "/_File/_Mailbox"
 msgstr "/_Súbor/_Pridať schránku..."
 
-#: src/mainwindow.c:485
+#: src/mainwindow.c:488
 #, fuzzy
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/_Súbor/_Pridať schránku..."
 
-#: src/mainwindow.c:486
+#: src/mainwindow.c:489
 #, fuzzy
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/_Odstrániť schránku"
 
-#: src/mainwindow.c:487 src/mainwindow.c:492
+#: src/mainwindow.c:490 src/mainwindow.c:495
 #, fuzzy
 msgid "/_File/_Mailbox/---"
 msgstr "/_Súbor/P_riečinok/---"
 
-#: src/mainwindow.c:488
+#: src/mainwindow.c:491
 #, fuzzy
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "/P_rijať nové správy"
 
-#: src/mainwindow.c:490
+#: src/mainwindow.c:493
 #, 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:493
+#: src/mainwindow.c:496
 #, fuzzy
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "/O_bnoviť štruktúru priečinkov"
 
-#: src/mainwindow.c:496
+#: src/mainwindow.c:499
 msgid "/_File/_Import mbox file..."
 msgstr "/_Súbor/_Importovať súbor mbox..."
 
-#: src/mainwindow.c:497
+#: src/mainwindow.c:500
 msgid "/_File/_Export to mbox file..."
 msgstr "/_Súbor/_Exportovať do súboru mbox..."
 
-#: src/mainwindow.c:499
+#: src/mainwindow.c:502
 #, fuzzy
 msgid "/_File/Empty all _trash"
 msgstr "/_Súbor/Vyčistiť odpadkový _kôš"
 
-#: src/mainwindow.c:501 src/messageview.c:139
+#: src/mainwindow.c:504 src/messageview.c:139
 msgid "/_File/_Save as..."
 msgstr "/_Súbor/_Uložiť ako..."
 
-#: src/mainwindow.c:502 src/messageview.c:140
+#: src/mainwindow.c:505 src/messageview.c:140
 msgid "/_File/_Print..."
 msgstr "/_Súbor/_Tlačiť..."
 
-#: src/mainwindow.c:504
+#: src/mainwindow.c:507
 msgid "/_File/_Work offline"
 msgstr "/_Súbor/P_racovať odpojený"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:507
+#: src/mainwindow.c:510
 msgid "/_File/E_xit"
 msgstr "/_Súbor/Uk_ončiť"
 
-#: src/mainwindow.c:512
+#: src/mainwindow.c:515
 msgid "/_Edit/Select _thread"
 msgstr "/Ú_pravy/Zvoliť _vlákno"
 
-#: src/mainwindow.c:514 src/messageview.c:148
+#: src/mainwindow.c:517 src/messageview.c:148
 msgid "/_Edit/_Find in current message..."
 msgstr "/Ú_pravy/Vy_hľadať v aktuálnej správe..."
 
-#: src/mainwindow.c:516
+#: src/mainwindow.c:519
 msgid "/_Edit/_Search messages..."
 msgstr "/Ú_pravy/_Vyhľadať v správach..."
 
-#: src/mainwindow.c:519
+#: src/mainwindow.c:522
 msgid "/_View/Show or hi_de"
 msgstr "/_Zobraziť/_Ukázať alebo skryť"
 
-#: src/mainwindow.c:520
+#: src/mainwindow.c:523
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/_Zobraziť/_Ukázať alebo skryť/_Strom priečinkov"
 
-#: src/mainwindow.c:522
+#: src/mainwindow.c:525
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/_Zobraziť/_Ukázať alebo skryť/_Zobrazenie správy"
 
-#: src/mainwindow.c:524
+#: src/mainwindow.c:527
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/_Zobraziť/_Ukázať alebo skryť/_Panel nástrojov"
 
-#: src/mainwindow.c:526
+#: src/mainwindow.c:529
 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:528
+#: src/mainwindow.c:531
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/_Zobraziť/_Ukázať alebo skryť/_Panel nástrojov/_Ikony"
 
-#: src/mainwindow.c:530
+#: src/mainwindow.c:533
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/_Zobraziť/_Ukázať alebo skryť/_Panel nástrojov/_Text"
 
-#: src/mainwindow.c:532
+#: src/mainwindow.c:535
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/_Zobraziť/_Ukázať alebo skryť/_Panel nástrojov/Žiad_ne"
 
-#: src/mainwindow.c:534
+#: src/mainwindow.c:537
 #, fuzzy
 msgid "/_View/Show or hi_de/_Search bar"
 msgstr "/_Zobraziť/_Ukázať alebo skryť/Stavový _riadok"
 
-#: src/mainwindow.c:536
+#: src/mainwindow.c:539
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/_Zobraziť/_Ukázať alebo skryť/Stavový _riadok"
 
-#: src/mainwindow.c:539
+#: src/mainwindow.c:542
 msgid "/_View/Separate f_older tree"
 msgstr "/_Zobraziť/Samostatný str_om priečinkov"
 
-#: src/mainwindow.c:540
+#: src/mainwindow.c:543
 #, fuzzy
 msgid "/_View/Separate _message view"
 msgstr "/_Zobraziť/Samostatné zobraz_enie správy"
 
-#: src/mainwindow.c:542
+#: src/mainwindow.c:545
 msgid "/_View/_Sort"
 msgstr "/_Zobraziť/_Triediť"
 
-#: src/mainwindow.c:543
+#: src/mainwindow.c:546
 msgid "/_View/_Sort/by _number"
 msgstr "/_Zobraziť/_Triediť/podľa čí_sla"
 
-#: src/mainwindow.c:544
+#: src/mainwindow.c:547
 msgid "/_View/_Sort/by s_ize"
 msgstr "/_Zobraziť/_Triediť/podľa _veľkosti"
 
-#: src/mainwindow.c:545
+#: src/mainwindow.c:548
 msgid "/_View/_Sort/by _date"
 msgstr "/_Zobraziť/_Triediť/podľa _dátumu"
 
-#: src/mainwindow.c:546
+#: src/mainwindow.c:549
 #, fuzzy
 msgid "/_View/_Sort/by t_hread date"
 msgstr "/_Zobraziť/_Triediť/podľa _dátumu"
 
-#: src/mainwindow.c:547
+#: src/mainwindow.c:550
 msgid "/_View/_Sort/by _from"
 msgstr "/_Zobraziť/_Triediť/podľa _odosielateľa"
 
-#: src/mainwindow.c:548
+#: src/mainwindow.c:551
 msgid "/_View/_Sort/by _recipient"
 msgstr "/_Zobraziť/_Triediť/podľa _príjemcu"
 
-#: src/mainwindow.c:549
+#: src/mainwindow.c:552
 msgid "/_View/_Sort/by _subject"
 msgstr "/_Zobraziť/_Triediť/podľa p_redmetu"
 
-#: src/mainwindow.c:550
+#: src/mainwindow.c:553
 msgid "/_View/_Sort/by _color label"
 msgstr "/_Zobraziť/_Triediť/podľa _farebného označenia"
 
-#: src/mainwindow.c:552
+#: src/mainwindow.c:555
 msgid "/_View/_Sort/by _mark"
 msgstr "/_Zobraziť/_Triediť/podľa _značky"
 
-#: src/mainwindow.c:553
+#: src/mainwindow.c:556
 msgid "/_View/_Sort/by _unread"
 msgstr "/_Zobraziť/_Triediť/podľa pr_ečítania"
 
-#: src/mainwindow.c:554
+#: src/mainwindow.c:557
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/_Zobraziť/_Triediť/podľa prí_loh"
 
-#: src/mainwindow.c:556
+#: src/mainwindow.c:559
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/_Zobraziť/_Triediť/_Netriediť"
 
-#: src/mainwindow.c:557 src/mainwindow.c:560
+#: src/mainwindow.c:560 src/mainwindow.c:563
 msgid "/_View/_Sort/---"
 msgstr "/_Zobraziť/_Triediť/---"
 
-#: src/mainwindow.c:558
+#: src/mainwindow.c:561
 msgid "/_View/_Sort/Ascending"
 msgstr "/_Zobraziť/_Triediť/Vzostupne"
 
-#: src/mainwindow.c:559
+#: src/mainwindow.c:562
 msgid "/_View/_Sort/Descending"
 msgstr "/_Zobraziť/_Triediť/Zostupne"
 
-#: src/mainwindow.c:561
+#: src/mainwindow.c:564
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/_Zobraziť/_Triediť/Zos_kupiť podľa predmetu"
 
-#: src/mainwindow.c:563
+#: src/mainwindow.c:566
 msgid "/_View/Th_read view"
 msgstr "/_Zobraziť/Zobraziť _vlákna"
 
-#: src/mainwindow.c:564
+#: src/mainwindow.c:567
 msgid "/_View/E_xpand all threads"
 msgstr "/_Zobraziť/_Rozbaliť všetky vlákna"
 
-#: src/mainwindow.c:565
+#: src/mainwindow.c:568
 msgid "/_View/Co_llapse all threads"
 msgstr "/_Zobraziť/Zba_liť všetky vlákna"
 
-#: src/mainwindow.c:566
+#: src/mainwindow.c:569
 msgid "/_View/Set display _item..."
 msgstr "/_Zobraziť/Nastav_iť zobrazované položky"
 
-#: src/mainwindow.c:569
+#: src/mainwindow.c:572
 msgid "/_View/_Go to"
 msgstr "/_Zobraziť/Pre_jsť na"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:573
 msgid "/_View/_Go to/_Prev message"
 msgstr "/_Zobraziť/Pre_jsť na/_Predošlú správu"
 
-#: src/mainwindow.c:571
+#: src/mainwindow.c:574
 msgid "/_View/_Go to/_Next message"
 msgstr "/_Zobraziť/Pre_jsť na/Ď_alšiu správu"
 
-#: src/mainwindow.c:572 src/mainwindow.c:577 src/mainwindow.c:580
-#: src/mainwindow.c:585 src/mainwindow.c:590
+#: src/mainwindow.c:575 src/mainwindow.c:580 src/mainwindow.c:583
+#: src/mainwindow.c:588 src/mainwindow.c:593
 msgid "/_View/_Go to/---"
 msgstr "/_Zobraziť/Pre_jsť na/---"
 
-#: src/mainwindow.c:573
+#: src/mainwindow.c:576
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/_Zobraziť/Pre_jsť na/P_redošlú neprečítanú správu"
 
-#: src/mainwindow.c:575
+#: src/mainwindow.c:578
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/_Zobraziť/Pre_jsť na/Ďalšiu n_eprečítanú správu"
 
-#: src/mainwindow.c:578
+#: src/mainwindow.c:581
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/_Zobraziť/Pre_jsť na/Predošlú no_vú správu"
 
-#: src/mainwindow.c:579
+#: src/mainwindow.c:582
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/_Zobraziť/Pre_jsť na/Ďalši_u novú správu"
 
-#: src/mainwindow.c:581
+#: src/mainwindow.c:584
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/_Zobraziť/Pre_jsť na/Predošlú _označenú správu"
 
-#: src/mainwindow.c:583
+#: src/mainwindow.c:586
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/_Zobraziť/Pre_jsť na/Ďalšiu o_značenú správu"
 
-#: src/mainwindow.c:586
+#: src/mainwindow.c:589
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/_Zobraziť/Pre_jsť na/Predošlú správu s návestí_m"
 
-#: src/mainwindow.c:588
+#: src/mainwindow.c:591
 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:591
+#: src/mainwindow.c:594
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Zobraziť/Pre_jsť na/Iný priečino_k..."
 
-#: src/mainwindow.c:600 src/messageview.c:159
+#: src/mainwindow.c:603 src/messageview.c:159
 #, fuzzy
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Zobraziť/_Kódovanie/_Automatické"
 
-#: src/mainwindow.c:613 src/messageview.c:172
+#: src/mainwindow.c:616 src/messageview.c:172
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr "/_Zobraziť/_Kódovanie/Západná Európa (ISO-8859-15)"
 
-#: src/mainwindow.c:653 src/messageview.c:205
+#: src/mainwindow.c:662 src/messageview.c:210
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Zobraziť/_Kódovanie/Japonsko (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:655 src/messageview.c:207
+#: src/mainwindow.c:664 src/messageview.c:212
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Zobraziť/_Kódovanie/Japonsko (_EUC-JP)"
 
-#: src/mainwindow.c:657 src/messageview.c:209
+#: src/mainwindow.c:666 src/messageview.c:214
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Zobraziť/_Kódovanie/Japonsko (_Shift__JIS)"
 
-#: src/mainwindow.c:667 src/messageview.c:218
+#: src/mainwindow.c:676 src/messageview.c:223
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Zobraziť/_Kódovanie/Tradičná čínština (EUC-_TW)"
 
-#: src/mainwindow.c:669 src/messageview.c:220
+#: src/mainwindow.c:678 src/messageview.c:225
 #, fuzzy
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Zobraziť/_Kódovanie/Čínština (ISO-2022-_CN)"
 
-#: src/mainwindow.c:675 src/messageview.c:225
+#: src/mainwindow.c:684 src/messageview.c:230
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Zobraziť/_Kódovanie/Kórea (ISO-2022-KR)"
 
-#: src/mainwindow.c:688 src/summaryview.c:449
+#: src/mainwindow.c:697 src/summaryview.c:451
 msgid "/_View/Open in new _window"
 msgstr "/_Zobraziť/Otvoriť v _novom okne"
 
-#: src/mainwindow.c:689 src/messageview.c:237
+#: src/mainwindow.c:698 src/messageview.c:242
 msgid "/_View/Mess_age source"
 msgstr "/_Zobraziť/Zdrojový kód správ_y"
 
-#: src/mainwindow.c:690 src/messageview.c:238
+#: src/mainwindow.c:699 src/messageview.c:243
 msgid "/_View/Show all _header"
 msgstr "/_Zobraziť/Zobraziť všetky _hlavičky"
 
-#: src/mainwindow.c:692
+#: src/mainwindow.c:701
 msgid "/_View/_Update summary"
 msgstr "/_Zobraziť/_Aktualizovať zoznam"
 
-#: src/mainwindow.c:694 src/messageview.c:240
+#: src/mainwindow.c:703 src/messageview.c:245
 msgid "/_Message"
 msgstr "/Sp_ráva"
 
-#: src/mainwindow.c:695
+#: src/mainwindow.c:704
 msgid "/_Message/Recei_ve"
 msgstr "/Sp_ráva/_Prijať"
 
-#: src/mainwindow.c:696
+#: src/mainwindow.c:705
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/Sp_ráva/_Prijať/Z _aktuálneho konta"
 
-#: src/mainwindow.c:698
+#: src/mainwindow.c:707
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/Sp_ráva/_Prijať/Zo _všetkých kônt"
 
-#: src/mainwindow.c:700
+#: src/mainwindow.c:709
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/Sp_ráva/_Prijať/_Ukončiť prijímanie"
 
-#: src/mainwindow.c:702
+#: src/mainwindow.c:711
 msgid "/_Message/Recei_ve/---"
 msgstr "/Sp_ráva/_Prijať/---"
 
-#: src/mainwindow.c:703
+#: src/mainwindow.c:712
 msgid "/_Message/_Send queued messages"
 msgstr "/Sp_ráva/_Odoslať správy vo fronte"
 
-#: src/mainwindow.c:704 src/mainwindow.c:706 src/mainwindow.c:713
-#: src/mainwindow.c:718 src/mainwindow.c:721 src/mainwindow.c:730
-#: src/mainwindow.c:732 src/mainwindow.c:735 src/messageview.c:243
-#: src/messageview.c:251 src/messageview.c:256
+#: src/mainwindow.c:713 src/mainwindow.c:715 src/mainwindow.c:722
+#: src/mainwindow.c:727 src/mainwindow.c:730 src/mainwindow.c:741
+#: src/mainwindow.c:743 src/mainwindow.c:746 src/messageview.c:248
+#: src/messageview.c:256 src/messageview.c:261
 msgid "/_Message/---"
 msgstr "/Sp_ráva/---"
 
-#: src/mainwindow.c:705 src/messageview.c:241
+#: src/mainwindow.c:714 src/messageview.c:246
 msgid "/_Message/Compose _new message"
 msgstr "/Sp_ráva/_Napísať novú správu"
 
-#: src/mainwindow.c:707 src/messageview.c:244
+#: src/mainwindow.c:716 src/messageview.c:249
 msgid "/_Message/_Reply"
 msgstr "/Sp_ráva/O_dpovedať"
 
-#: src/mainwindow.c:708
+#: src/mainwindow.c:717
 msgid "/_Message/Repl_y to"
 msgstr "/Sp_ráva/Odpo_vedať komu"
 
-#: src/mainwindow.c:709 src/messageview.c:245
+#: src/mainwindow.c:718 src/messageview.c:250
 msgid "/_Message/Repl_y to/_all"
 msgstr "/Sp_ráva/Odpoved_ať komu/_všetkým"
 
-#: src/mainwindow.c:710 src/messageview.c:247
+#: src/mainwindow.c:719 src/messageview.c:252
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/Sp_ráva/Od_povedať komu/_odosielateľovi"
 
-#: src/mainwindow.c:711 src/messageview.c:249
+#: src/mainwindow.c:720 src/messageview.c:254
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/Sp_ráva/Od_povedať komu/do _diskusnej skupiny"
 
-#: src/mainwindow.c:714 src/messageview.c:252
+#: src/mainwindow.c:723 src/messageview.c:257
 msgid "/_Message/_Forward"
 msgstr "/Sp_ráva/_Poslať ďalej"
 
-#: src/mainwindow.c:715 src/messageview.c:253
+#: src/mainwindow.c:724 src/messageview.c:258
 msgid "/_Message/For_ward as attachment"
 msgstr "/Sp_ráva/Poslať ako p_rílohu"
 
-#: src/mainwindow.c:717 src/messageview.c:255
+#: src/mainwindow.c:726 src/messageview.c:260
 msgid "/_Message/Redirec_t"
 msgstr "/Sp_ráva/Pre_smerovať"
 
-#: src/mainwindow.c:719
+#: src/mainwindow.c:728
 msgid "/_Message/M_ove..."
 msgstr "/Sp_ráva/Pres_unúť"
 
-#: src/mainwindow.c:720
+#: src/mainwindow.c:729
 msgid "/_Message/_Copy..."
 msgstr "/Sp_ráva/_Kopírovať"
 
-#: src/mainwindow.c:722
+#: src/mainwindow.c:731
 msgid "/_Message/_Mark"
 msgstr "/Sp_ráva/O_značiť"
 
-#: src/mainwindow.c:723
+#: src/mainwindow.c:732
 msgid "/_Message/_Mark/_Mark"
 msgstr "/Sp_ráva/O_značiť/O_značiť"
 
-#: src/mainwindow.c:724
+#: src/mainwindow.c:733
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/Sp_ráva/O_značiť/O_dznačiť"
 
-#: src/mainwindow.c:725
+#: src/mainwindow.c:734
 msgid "/_Message/_Mark/---"
 msgstr "/Sp_ráva/O_značiť/---"
 
-#: src/mainwindow.c:726
+#: src/mainwindow.c:735
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/Sp_ráva/O_značiť/Označiť ako _neprečítané"
 
-#: src/mainwindow.c:727
+#: src/mainwindow.c:736
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/Sp_ráva/O_značiť/Označiť ako _prečítané"
 
-#: src/mainwindow.c:729
+#: src/mainwindow.c:738
+#, fuzzy
+msgid "/_Message/_Mark/Mark _thread as read"
+msgstr "/Sp_ráva/O_značiť/Označiť ako _prečítané"
+
+#: src/mainwindow.c:740
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/Sp_ráva/O_značiť/Označiť _všetky ako prečítané"
 
-#: src/mainwindow.c:731
+#: src/mainwindow.c:742
 msgid "/_Message/_Delete"
 msgstr "/Sp_ráva/Z_mazať"
 
-#: src/mainwindow.c:733
+#: src/mainwindow.c:744
 #, fuzzy
 msgid "/_Message/Set as _junk mail"
 msgstr "/Sp_ráva/_Odoslať"
 
-#: src/mainwindow.c:734
+#: src/mainwindow.c:745
 msgid "/_Message/Set as not j_unk mail"
 msgstr ""
 
-#: src/mainwindow.c:736 src/messageview.c:257
+#: src/mainwindow.c:747 src/messageview.c:262
 msgid "/_Message/Re-_edit"
 msgstr "/Sp_ráva/Znovu _editovať"
 
-#: src/mainwindow.c:740
+#: src/mainwindow.c:751
 #, fuzzy
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/_Nástroje/Pridať _odosielateľa do adresára"
 
-#: src/mainwindow.c:743
+#: src/mainwindow.c:754
 #, fuzzy
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/_Nástroje/_Filtrovať správy"
 
-#: src/mainwindow.c:745
+#: src/mainwindow.c:756
 #, fuzzy
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Nástroje/_Filtrovať správy"
 
-#: src/mainwindow.c:747 src/messageview.c:264
+#: src/mainwindow.c:758 src/messageview.c:269
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Nástroje/Vytvoriť pravidlo fi_ltra"
 
-#: src/mainwindow.c:748 src/messageview.c:266
+#: src/mainwindow.c:759 src/messageview.c:271
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Nástroje/Vytvoriť pravidlo fi_ltra/_Automaticky"
 
-#: src/mainwindow.c:750 src/messageview.c:268
+#: src/mainwindow.c:761 src/messageview.c:273
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Nástroje/Vytvoriť pravidlo fi_ltra/podľa _odosielateľa"
 
-#: src/mainwindow.c:752 src/messageview.c:270
+#: src/mainwindow.c:763 src/messageview.c:275
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Nástroje/Vytvoriť pravidlo fi_ltra/podľa _príjemcu"
 
-#: src/mainwindow.c:754 src/messageview.c:272
+#: src/mainwindow.c:765 src/messageview.c:277
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Nástroje/Vytvoriť pravidlo fi_ltra/podľa p_redmetu"
 
-#: src/mainwindow.c:757
+#: src/mainwindow.c:768
 #, fuzzy
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/_Nástroje/_Filtrovať správy"
 
-#: src/mainwindow.c:759
+#: src/mainwindow.c:770
 #, fuzzy
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/_Nástroje/_Filtrovať správy"
 
-#: src/mainwindow.c:764
+#: src/mainwindow.c:775
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/_Nástroje/Zmazať du_plikátne správy"
 
-#: src/mainwindow.c:767
+#: src/mainwindow.c:778
 msgid "/_Tools/E_xecute"
 msgstr "/_Nástroje/V_ykonať"
 
-#: src/mainwindow.c:769
+#: src/mainwindow.c:780
 msgid "/_Tools/_Log window"
 msgstr "/_Nástroje/Okno _záznamu"
 
-#: src/mainwindow.c:771
+#: src/mainwindow.c:782
 msgid "/_Configuration"
 msgstr "/Nastav_enia"
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:783
 msgid "/_Configuration/_Common preferences..."
 msgstr "/Nastav_enia/_Všeobecné nastavenia..."
 
-#: src/mainwindow.c:774
+#: src/mainwindow.c:785
 msgid "/_Configuration/_Filter setting..."
 msgstr "/Nastav_enia/Nastavenie _filtru..."
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:787
 msgid "/_Configuration/_Template..."
 msgstr "/Nastav_enia/Š_ablóna..."
 
-#: src/mainwindow.c:777
+#: src/mainwindow.c:788
 msgid "/_Configuration/_Actions..."
 msgstr "/Nastav_enia/_Akcie..."
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:789
 msgid "/_Configuration/---"
 msgstr "/Nastav_enia/---"
 
-#: src/mainwindow.c:779
+#: src/mainwindow.c:790
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/Nastav_enia/Nastavenia aktívneho _konta..."
 
-#: src/mainwindow.c:781
+#: src/mainwindow.c:792
 msgid "/_Configuration/Create _new account..."
 msgstr "/Nastav_enia/Vytvoriť _nové konto..."
 
-#: src/mainwindow.c:783
+#: src/mainwindow.c:794
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/Nastav_enia/_Upraviť kontá..."
 
-#: src/mainwindow.c:785
+#: src/mainwindow.c:796
 msgid "/_Configuration/C_hange current account"
 msgstr "/Nastav_enia/_Zmeniť aktívne konto"
 
-#: src/mainwindow.c:789
+#: src/mainwindow.c:800
 msgid "/_Help/_Manual"
 msgstr "/Nápo_veda/_Manuál"
 
-#: src/mainwindow.c:790
+#: src/mainwindow.c:801
 msgid "/_Help/_Manual/_English"
 msgstr "/Nápo_veda/_Manuál/_Anglicky"
 
-#: src/mainwindow.c:791
+#: src/mainwindow.c:802
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/Nápo_veda/_Manuál/_Japonsky"
 
-#: src/mainwindow.c:792
+#: src/mainwindow.c:803
 msgid "/_Help/_FAQ"
 msgstr "/Nápo_veda/_FAQ"
 
-#: src/mainwindow.c:793
+#: src/mainwindow.c:804
 msgid "/_Help/_FAQ/_English"
 msgstr "/Nápo_veda/_FAQ/_Anglicky"
 
-#: src/mainwindow.c:794
+#: src/mainwindow.c:805
 msgid "/_Help/_FAQ/_German"
 msgstr "/Nápo_veda/_FAQ/_Japonsky"
 
-#: src/mainwindow.c:795
+#: src/mainwindow.c:806
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/Nápo_veda/_FAQ/Š_panielsky"
 
-#: src/mainwindow.c:796
+#: src/mainwindow.c:807
 msgid "/_Help/_FAQ/_French"
 msgstr "/Nápo_veda/_FAQ/_Francúzky"
 
-#: src/mainwindow.c:797
+#: src/mainwindow.c:808
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/Nápo_veda/_FAQ/_Taliansky"
 
-#: src/mainwindow.c:798
+#: src/mainwindow.c:809
 msgid "/_Help/---"
 msgstr "/Nápo_veda/---"
 
-#: src/mainwindow.c:841
+#: src/mainwindow.c:852
 msgid "Creating main window...\n"
 msgstr "Vytváram hlavné okno...\n"
 
-#: src/mainwindow.c:1011
+#: src/mainwindow.c:1022
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Hlavné Okno: alokácia farieb %d bola neúspešná\n"
 
-#: src/mainwindow.c:1108 src/summaryview.c:2258 src/summaryview.c:2343
-#: src/summaryview.c:3739 src/summaryview.c:3868 src/summaryview.c:4226
+#: src/mainwindow.c:1119 src/summaryview.c:2275 src/summaryview.c:2360
+#: src/summaryview.c:3896 src/summaryview.c:4025 src/summaryview.c:4383
 msgid "done.\n"
 msgstr "hotovo.\n"
 
-#: src/mainwindow.c:1235 src/mainwindow.c:1276 src/mainwindow.c:1301
+#: src/mainwindow.c:1246 src/mainwindow.c:1287 src/mainwindow.c:1312
 msgid "Untitled"
 msgstr "Bez názvu"
 
-#: src/mainwindow.c:1302
+#: src/mainwindow.c:1313
 msgid "none"
 msgstr "žiadny"
 
-#: src/mainwindow.c:1355
+#: src/mainwindow.c:1366
 #, 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:1605
+#: src/mainwindow.c:1616
 msgid "Offline"
 msgstr "Odpojené"
 
-#: src/mainwindow.c:1606
+#: src/mainwindow.c:1617
 msgid "You are offline. Go online?"
 msgstr "Ste odpojený. Pripojiť sa?"
 
-#: src/mainwindow.c:1623
+#: src/mainwindow.c:1634
 #, fuzzy
 msgid "Empty all trash"
 msgstr "Vyprázdniť kôš"
 
-#: src/mainwindow.c:1624
+#: src/mainwindow.c:1635
 #, fuzzy
 msgid "Delete all messages in trash folders?"
 msgstr "Zmazať všetky správy v koši?"
 
-#: src/mainwindow.c:1652
+#: src/mainwindow.c:1663
 msgid "Add mailbox"
 msgstr "Pridať mailbox"
 
-#: src/mainwindow.c:1653
+#: src/mainwindow.c:1664
 #, fuzzy
 msgid ""
 "Specify the location of mailbox.\n"
@@ -3646,16 +3662,16 @@ msgstr ""
 "Ak zadáte existujúci mailbox, bude\n"
 "automaticky prehľadaný."
 
-#: src/mainwindow.c:1659 src/setup.c:49
+#: src/mainwindow.c:1670 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Mailbox '%s' už existuje."
 
-#: src/mainwindow.c:1664 src/setup.c:56
+#: src/mainwindow.c:1675 src/setup.c:56
 msgid "Mailbox"
 msgstr "Mailbox"
 
-#: src/mainwindow.c:1670 src/setup.c:62
+#: src/mainwindow.c:1681 src/setup.c:62
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3665,149 +3681,149 @@ msgstr ""
 "Pravdepodobne už niektoré súbory existujú, alebo tam nemáte práva na "
 "zapisovanie."
 
-#: src/mainwindow.c:2088
+#: src/mainwindow.c:2099
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Zobrazenie priečinku"
 
-#: src/mainwindow.c:2107
+#: src/mainwindow.c:2118
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Zobrazenie správy"
 
-#: src/mainwindow.c:2259 src/summaryview.c:408
+#: src/mainwindow.c:2270 src/summaryview.c:408
 msgid "/_Reply"
 msgstr "/_Odpovedať"
 
-#: src/mainwindow.c:2260
+#: src/mainwindow.c:2271
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "Odpovedať odosielateľovi i všetkým príjemcom"
 
-#: src/mainwindow.c:2261
+#: src/mainwindow.c:2272
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/O_dpovedať komu/_odosielateľovi"
 
-#: src/mainwindow.c:2262
+#: src/mainwindow.c:2273
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/O_dpovedať komu/do _diskusnej skupiny"
 
-#: src/mainwindow.c:2267 src/summaryview.c:415
+#: src/mainwindow.c:2278 src/summaryview.c:415
 msgid "/_Forward"
 msgstr "/_Poslať ďalej"
 
-#: src/mainwindow.c:2268 src/summaryview.c:416
+#: src/mainwindow.c:2279 src/summaryview.c:416
 msgid "/For_ward as attachment"
 msgstr "/Poslať ďalej ako p_rílohu"
 
-#: src/mainwindow.c:2269 src/summaryview.c:417
+#: src/mainwindow.c:2280 src/summaryview.c:417
 msgid "/Redirec_t"
 msgstr "/Pr_esmerovať"
 
-#: src/mainwindow.c:2305
+#: src/mainwindow.c:2316
 msgid "Get"
 msgstr "Prijať"
 
-#: src/mainwindow.c:2306
+#: src/mainwindow.c:2317
 msgid "Incorporate new mail"
 msgstr "Prijať novú poštu"
 
-#: src/mainwindow.c:2313
+#: src/mainwindow.c:2324
 msgid "Get all"
 msgstr "Prijať všetko"
 
-#: src/mainwindow.c:2314
+#: src/mainwindow.c:2325
 msgid "Incorporate new mail of all accounts"
 msgstr "Prijať novú poštu pre všetky kontá"
 
-#: src/mainwindow.c:2325
+#: src/mainwindow.c:2336
 msgid "Send queued message(s)"
 msgstr "Odoslať správy vo fronte"
 
-#: src/mainwindow.c:2335 src/prefs_account_dialog.c:530
+#: src/mainwindow.c:2346 src/prefs_account_dialog.c:530
 #: src/prefs_common_dialog.c:663 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "Nová správa"
 
-#: src/mainwindow.c:2336
+#: src/mainwindow.c:2347
 msgid "Compose new message"
 msgstr "Napísať novú správu"
 
-#: src/mainwindow.c:2344 src/prefs_common_dialog.c:975
+#: src/mainwindow.c:2355 src/prefs_common_dialog.c:975
 msgid "Reply"
 msgstr "Odpovedať"
 
-#: src/mainwindow.c:2345 src/mainwindow.c:2358
+#: src/mainwindow.c:2356 src/mainwindow.c:2369
 msgid "Reply to the message"
 msgstr "Odpovedať na správu"
 
-#: src/mainwindow.c:2362
+#: src/mainwindow.c:2373
 msgid "Reply all"
 msgstr "Odp. všetkým"
 
-#: src/mainwindow.c:2363
+#: src/mainwindow.c:2374
 msgid "Reply to all"
 msgstr "Odpovedať odosielateľovi i všetkým príjemcom"
 
-#: src/mainwindow.c:2371 src/prefs_filter_edit.c:672
+#: src/mainwindow.c:2382 src/prefs_filter_edit.c:672
 msgid "Forward"
 msgstr "Poslať ďalej"
 
-#: src/mainwindow.c:2372 src/mainwindow.c:2385
+#: src/mainwindow.c:2383 src/mainwindow.c:2396
 msgid "Forward the message"
 msgstr "Poslať správu ďalej"
 
-#: src/mainwindow.c:2392
+#: src/mainwindow.c:2403
 msgid "Delete the message"
 msgstr "Zmazať správu"
 
-#: src/mainwindow.c:2401
+#: src/mainwindow.c:2412
 #, fuzzy
 msgid "Set as junk mail"
 msgstr "Nastaviť ako východzie"
 
-#: src/mainwindow.c:2410
+#: src/mainwindow.c:2421
 msgid "Execute"
 msgstr "Vykonať"
 
-#: src/mainwindow.c:2411
+#: src/mainwindow.c:2422
 msgid "Execute marked process"
 msgstr "Vykonať označený proces"
 
-#: src/mainwindow.c:2421
+#: src/mainwindow.c:2432
 msgid "Next unread message"
 msgstr "Ďalšia neprečítaná správa"
 
-#: src/mainwindow.c:2433
+#: src/mainwindow.c:2444
 msgid "Prefs"
 msgstr "Nastavenia"
 
-#: src/mainwindow.c:2434
+#: src/mainwindow.c:2445
 msgid "Common preferences"
 msgstr "Všeobecné nastavenia"
 
-#: src/mainwindow.c:2442 src/prefs_folder_item.c:289
+#: src/mainwindow.c:2453 src/prefs_folder_item.c:289
 #: src/prefs_folder_item.c:300 src/progressdialog.c:128
 msgid "Account"
 msgstr "Konto"
 
-#: src/mainwindow.c:2443
+#: src/mainwindow.c:2454
 msgid "Account setting"
 msgstr "Nastavenie konta"
 
-#: src/mainwindow.c:2615
+#: src/mainwindow.c:2626
 msgid "You are offline. Click the icon to go online."
 msgstr "Ste odpojený. Kliknite na ikonu, ak sa chcete pripojiť."
 
-#: src/mainwindow.c:2626
+#: src/mainwindow.c:2637
 msgid "You are online. Click the icon to go offline."
 msgstr "Ste pripojený. Kliknite na ikonu, ak sa chcete odpojiť."
 
-#: src/mainwindow.c:2892
+#: src/mainwindow.c:2903
 msgid "Exit"
 msgstr "Ukončiť"
 
-#: src/mainwindow.c:2892
+#: src/mainwindow.c:2903
 msgid "Exit this program?"
 msgstr "Ukončiť program"
 
@@ -3844,45 +3860,45 @@ msgstr "Dosiahnutý koniec správy; pokračovať od začiatku?"
 msgid "Search finished"
 msgstr "Hľadanie dokončené"
 
-#: src/messageview.c:261
+#: src/messageview.c:266
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/_Nástroje/Pridať _odosielateľa do adresára"
 
-#: src/messageview.c:291
+#: src/messageview.c:296
 msgid "Creating message view...\n"
 msgstr "Vytváram zobrazenie správy...\n"
 
-#: src/messageview.c:316
+#: src/messageview.c:321
 msgid "Text"
 msgstr "Text"
 
-#: src/messageview.c:321
+#: src/messageview.c:326
 msgid "Attachments"
 msgstr "Prílohy"
 
-#: src/messageview.c:371
+#: src/messageview.c:376
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:669 src/summaryview.c:3268
+#: src/messageview.c:674 src/summaryview.c:3425
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Nemôžem uložiť súbor '%s'."
 
-#: src/messageview.c:728 src/summaryview.c:3291
+#: src/messageview.c:733 src/summaryview.c:3448
 msgid "The message will be printed with the following command:"
 msgstr ""
 
-#: src/messageview.c:729 src/summaryview.c:3292
+#: src/messageview.c:734 src/summaryview.c:3449
 #, fuzzy
 msgid "(Default print command)"
 msgstr "Vykonať"
 
-#: src/messageview.c:731 src/prefs_common_dialog.c:2304 src/summaryview.c:3294
+#: src/messageview.c:736 src/prefs_common_dialog.c:2304 src/summaryview.c:3451
 msgid "Print"
 msgstr "Tlačiť"
 
-#: src/messageview.c:740 src/summaryview.c:3303
+#: src/messageview.c:745 src/summaryview.c:3460
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -4792,8 +4808,8 @@ msgstr "Zobraziť príjemcu v stĺpci 'Od' ak ste odosielateľ vy"
 msgid "Expand threads"
 msgstr "Rozbaliť vlákna"
 
-#: src/prefs_common_dialog.c:1413 src/prefs_common_dialog.c:2713
-#: src/prefs_common_dialog.c:2751
+#: src/prefs_common_dialog.c:1413 src/prefs_common_dialog.c:2716
+#: src/prefs_common_dialog.c:2754
 msgid "Date format"
 msgstr "Formát dátumu"
 
@@ -5092,8 +5108,8 @@ msgstr "Externé príkazy (%s bude nahradené názvom súboru / URI)"
 msgid "Web browser"
 msgstr "Webový prehliadač"
 
-#: src/prefs_common_dialog.c:2288 src/prefs_common_dialog.c:3775
-#: src/prefs_common_dialog.c:3796
+#: src/prefs_common_dialog.c:2288 src/prefs_common_dialog.c:3778
+#: src/prefs_common_dialog.c:3799
 #, fuzzy
 msgid "(Default browser)"
 msgstr "Východzí inbox"
@@ -5169,216 +5185,226 @@ msgstr "Grécko (ISO-8859-7)"
 
 #: src/prefs_common_dialog.c:2495
 #, fuzzy
+msgid "Arabic (ISO-8859-6)"
+msgstr "Pobaltie (ISO-8859-4)"
+
+#: src/prefs_common_dialog.c:2496
+#, fuzzy
+msgid "Arabic (Windows-1256)"
+msgstr "Cyrilika (Windows-1251)"
+
+#: src/prefs_common_dialog.c:2498
+#, fuzzy
 msgid "Hebrew (ISO-8859-8)"
 msgstr "Grécko (ISO-8859-7)"
 
-#: src/prefs_common_dialog.c:2496
+#: src/prefs_common_dialog.c:2499
 #, fuzzy
 msgid "Hebrew (Windows-1255)"
 msgstr "Cyrilika (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2498
+#: src/prefs_common_dialog.c:2501
 msgid "Turkish (ISO-8859-9)"
 msgstr "Turecko (ISO-8859-9)"
 
-#: src/prefs_common_dialog.c:2500
+#: src/prefs_common_dialog.c:2503
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Cyrilika (ISO-8859-5)"
 
-#: src/prefs_common_dialog.c:2501
+#: src/prefs_common_dialog.c:2504
 msgid "Cyrillic (KOI8-R)"
 msgstr "Cyrilika (KOI8-R)"
 
-#: src/prefs_common_dialog.c:2502
+#: src/prefs_common_dialog.c:2505
 msgid "Cyrillic (KOI8-U)"
 msgstr "Cyrilika (KOI8-U)"
 
-#: src/prefs_common_dialog.c:2503
+#: src/prefs_common_dialog.c:2506
 msgid "Cyrillic (Windows-1251)"
 msgstr "Cyrilika (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2505
+#: src/prefs_common_dialog.c:2508
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Japonsko (ISO-2022-JP)"
 
-#: src/prefs_common_dialog.c:2507
+#: src/prefs_common_dialog.c:2510
 msgid "Japanese (EUC-JP)"
 msgstr "Japonsko (EUC-JP)"
 
-#: src/prefs_common_dialog.c:2508
+#: src/prefs_common_dialog.c:2511
 msgid "Japanese (Shift_JIS)"
 msgstr "Japonsko (Shift_JIS)"
 
-#: src/prefs_common_dialog.c:2511
+#: src/prefs_common_dialog.c:2514
 msgid "Simplified Chinese (GB2312)"
 msgstr "Zjednodušená čínština (GB2312)"
 
-#: src/prefs_common_dialog.c:2512
+#: src/prefs_common_dialog.c:2515
 #, fuzzy
 msgid "Simplified Chinese (GBK)"
 msgstr "Zjednodušená čínština (GB2312)"
 
-#: src/prefs_common_dialog.c:2513
+#: src/prefs_common_dialog.c:2516
 msgid "Traditional Chinese (Big5)"
 msgstr "Tradičná čínština (Big5)"
 
-#: src/prefs_common_dialog.c:2515
+#: src/prefs_common_dialog.c:2518
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Tradičná čínština (EUC-TW)"
 
-#: src/prefs_common_dialog.c:2516
+#: src/prefs_common_dialog.c:2519
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Čínština (ISO-2022-CN)"
 
-#: src/prefs_common_dialog.c:2519
+#: src/prefs_common_dialog.c:2522
 msgid "Korean (EUC-KR)"
 msgstr "Kórea (EUC-KR)"
 
-#: src/prefs_common_dialog.c:2521
+#: src/prefs_common_dialog.c:2524
 msgid "Thai (TIS-620)"
 msgstr "Thajsko (TIS-620)"
 
-#: src/prefs_common_dialog.c:2522
+#: src/prefs_common_dialog.c:2525
 msgid "Thai (Windows-874)"
 msgstr "Thajsko (Windows-874)"
 
-#: src/prefs_common_dialog.c:2689
+#: src/prefs_common_dialog.c:2692
 msgid "the full abbreviated weekday name"
 msgstr "skrátený názov dňa v týždni"
 
-#: src/prefs_common_dialog.c:2690
+#: src/prefs_common_dialog.c:2693
 msgid "the full weekday name"
 msgstr "názov dňa v týždni"
 
-#: src/prefs_common_dialog.c:2691
+#: src/prefs_common_dialog.c:2694
 msgid "the abbreviated month name"
 msgstr "skrátený názov mesiaca"
 
-#: src/prefs_common_dialog.c:2692
+#: src/prefs_common_dialog.c:2695
 msgid "the full month name"
 msgstr "názov mesiaca"
 
-#: src/prefs_common_dialog.c:2693
+#: src/prefs_common_dialog.c:2696
 msgid "the preferred date and time for the current locale"
 msgstr "uprednostňovaný dátum a čas pre súčasnú lokalizáciu"
 
-#: src/prefs_common_dialog.c:2694
+#: src/prefs_common_dialog.c:2697
 msgid "the century number (year/100)"
 msgstr "storočie (rok/100)"
 
-#: src/prefs_common_dialog.c:2695
+#: src/prefs_common_dialog.c:2698
 msgid "the day of the month as a decimal number"
 msgstr "deň v mesiaci"
 
-#: src/prefs_common_dialog.c:2696
+#: src/prefs_common_dialog.c:2699
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "číslo hodiny pri použití 24-hodinového času"
 
-#: src/prefs_common_dialog.c:2697
+#: src/prefs_common_dialog.c:2700
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "číslo hodiny pri použití 12-hodinového času"
 
-#: src/prefs_common_dialog.c:2698
+#: src/prefs_common_dialog.c:2701
 msgid "the day of the year as a decimal number"
 msgstr "číslo dňa v roku"
 
-#: src/prefs_common_dialog.c:2699
+#: src/prefs_common_dialog.c:2702
 msgid "the month as a decimal number"
 msgstr "číslo mesiaca"
 
-#: src/prefs_common_dialog.c:2700
+#: src/prefs_common_dialog.c:2703
 msgid "the minute as a decimal number"
 msgstr "minúty"
 
-#: src/prefs_common_dialog.c:2701
+#: src/prefs_common_dialog.c:2704
 msgid "either AM or PM"
 msgstr "AM alebo PM"
 
-#: src/prefs_common_dialog.c:2702
+#: src/prefs_common_dialog.c:2705
 msgid "the second as a decimal number"
 msgstr "sekundy"
 
-#: src/prefs_common_dialog.c:2703
+#: src/prefs_common_dialog.c:2706
 msgid "the day of the week as a decimal number"
 msgstr "poradie dňa v týždni"
 
-#: src/prefs_common_dialog.c:2704
+#: src/prefs_common_dialog.c:2707
 msgid "the preferred date for the current locale"
 msgstr "uprednostňovaný dátum pre súčasnú lokalizáciu"
 
-#: src/prefs_common_dialog.c:2705
+#: src/prefs_common_dialog.c:2708
 msgid "the last two digits of a year"
 msgstr "posledné dve číslice roku"
 
-#: src/prefs_common_dialog.c:2706
+#: src/prefs_common_dialog.c:2709
 msgid "the year as a decimal number"
 msgstr "rok"
 
-#: src/prefs_common_dialog.c:2707
+#: src/prefs_common_dialog.c:2710
 msgid "the time zone or name or abbreviation"
 msgstr "časová zóna, jej názov alebo skratka"
 
-#: src/prefs_common_dialog.c:2728
+#: src/prefs_common_dialog.c:2731
 msgid "Specifier"
 msgstr "Symbol"
 
-#: src/prefs_common_dialog.c:2729
+#: src/prefs_common_dialog.c:2732
 msgid "Description"
 msgstr "Popis"
 
-#: src/prefs_common_dialog.c:2769
+#: src/prefs_common_dialog.c:2772
 msgid "Example"
 msgstr "Príklad"
 
-#: src/prefs_common_dialog.c:2850
+#: src/prefs_common_dialog.c:2853
 msgid "Set message colors"
 msgstr "Nastaviť farby správy"
 
-#: src/prefs_common_dialog.c:2858
+#: src/prefs_common_dialog.c:2861
 msgid "Colors"
 msgstr "Farby"
 
-#: src/prefs_common_dialog.c:2892
+#: src/prefs_common_dialog.c:2895
 msgid "Quoted Text - First Level"
 msgstr "Citovaný text - Prvá úroveň"
 
-#: src/prefs_common_dialog.c:2898
+#: src/prefs_common_dialog.c:2901
 msgid "Quoted Text - Second Level"
 msgstr "Citovaný text - Druhá úroveň"
 
-#: src/prefs_common_dialog.c:2904
+#: src/prefs_common_dialog.c:2907
 msgid "Quoted Text - Third Level"
 msgstr "Citovaný text - Tretia úroveň"
 
-#: src/prefs_common_dialog.c:2910
+#: src/prefs_common_dialog.c:2913
 msgid "URI link"
 msgstr "URI odkaz"
 
-#: src/prefs_common_dialog.c:2917
+#: src/prefs_common_dialog.c:2920
 msgid "Recycle quote colors"
 msgstr "Opakovať farby"
 
-#: src/prefs_common_dialog.c:2984
+#: src/prefs_common_dialog.c:2987
 msgid "Pick color for quotation level 1"
 msgstr "Vyberte farbu pre 1. úroveň citácie"
 
-#: src/prefs_common_dialog.c:2987
+#: src/prefs_common_dialog.c:2990
 msgid "Pick color for quotation level 2"
 msgstr "Vyberte farbu pre 2. úroveň citácie"
 
-#: src/prefs_common_dialog.c:2990
+#: src/prefs_common_dialog.c:2993
 msgid "Pick color for quotation level 3"
 msgstr "Vyberte farbu pre 3. úroveň citácie"
 
-#: src/prefs_common_dialog.c:2993
+#: src/prefs_common_dialog.c:2996
 msgid "Pick color for URI"
 msgstr "Vyberte farbu pre URI odkazy"
 
-#: src/prefs_common_dialog.c:3133
+#: src/prefs_common_dialog.c:3136
 msgid "Description of symbols"
 msgstr "Popis symbolov"
 
-#: src/prefs_common_dialog.c:3189
+#: src/prefs_common_dialog.c:3192
 msgid ""
 "Date\n"
 "From\n"
@@ -5402,11 +5428,11 @@ msgstr ""
 "Diskusné skupiny\n"
 "Message-ID"
 
-#: src/prefs_common_dialog.c:3202
+#: src/prefs_common_dialog.c:3205
 msgid "If x is set, displays expr"
 msgstr "Ak je x zadané, zobrazí expr"
 
-#: src/prefs_common_dialog.c:3206
+#: src/prefs_common_dialog.c:3209
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -5420,7 +5446,7 @@ msgstr ""
 "Telo citovanej správy bez podpisu\n"
 "Znak %"
 
-#: src/prefs_common_dialog.c:3214
+#: src/prefs_common_dialog.c:3217
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -5432,20 +5458,20 @@ msgstr ""
 "Ľavá zložená zátvorka\n"
 "Pravá zložená zátvorka"
 
-#: src/prefs_common_dialog.c:3260
+#: src/prefs_common_dialog.c:3263
 msgid "Key bindings"
 msgstr "Klávesové skratky"
 
-#: src/prefs_common_dialog.c:3273
+#: src/prefs_common_dialog.c:3276
 #, fuzzy
 msgid "Select the preset of key bindings."
 msgstr " Nastaviť klávesové skratky... "
 
-#: src/prefs_common_dialog.c:3283 src/prefs_common_dialog.c:3607
+#: src/prefs_common_dialog.c:3286 src/prefs_common_dialog.c:3610
 msgid "Default"
 msgstr "Štandardné"
 
-#: src/prefs_common_dialog.c:3286 src/prefs_common_dialog.c:3616
+#: src/prefs_common_dialog.c:3289 src/prefs_common_dialog.c:3619
 msgid "Old Sylpheed"
 msgstr "Starší Sylpheed"
 
@@ -5570,7 +5596,7 @@ msgstr ""
 msgid "Age"
 msgstr ""
 
-#: src/prefs_filter_edit.c:501 src/summaryview.c:510
+#: src/prefs_filter_edit.c:501 src/summaryview.c:512
 #, fuzzy
 msgid "Marked"
 msgstr "Značka"
@@ -5823,17 +5849,17 @@ msgid "Attachment"
 msgstr "Príloha"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73 src/query_search.c:371 src/summaryview.c:4733
+#: src/prefs_summary_column.c:73 src/query_search.c:371 src/summaryview.c:4890
 msgid "Subject"
 msgstr "Predmet"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/query_search.c:372 src/summaryview.c:4736
+#: src/prefs_summary_column.c:74 src/query_search.c:372 src/summaryview.c:4893
 msgid "From"
 msgstr "Od"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/query_search.c:373 src/summaryview.c:4738
+#: src/prefs_summary_column.c:75 src/query_search.c:373 src/summaryview.c:4895
 msgid "Date"
 msgstr "Dátum"
 
@@ -5936,7 +5962,7 @@ msgstr "Vyhľadať v správach"
 msgid "_Save as search folder"
 msgstr "Uložiť medzi koncepty"
 
-#: src/query_search.c:512 src/subscribedialog.c:523 src/summaryview.c:840
+#: src/query_search.c:512 src/subscribedialog.c:523 src/summaryview.c:842
 msgid "Done."
 msgstr "Hotovo."
 
@@ -5950,7 +5976,7 @@ msgstr "Prehľadávam priečinok %s ..."
 msgid "Searching %s (%d / %d)..."
 msgstr "Filtrujem..."
 
-#: src/query_search.c:645 src/summaryview.c:2048
+#: src/query_search.c:645 src/summaryview.c:2051
 msgid "(No Date)"
 msgstr "(bez dátumu)"
 
@@ -6322,305 +6348,310 @@ msgid "/_Mark/Mark as rea_d"
 msgstr "/Oz_načiť/Označiť ako _prečítané"
 
 #: src/summaryview.c:429
+#, fuzzy
+msgid "/_Mark/Mark _thread as read"
+msgstr "/Oz_načiť/Označiť ako _prečítané"
+
+#: src/summaryview.c:431
 msgid "/_Mark/Mark all _read"
 msgstr "/Oz_načiť/Označiť _všetky ako prečítané"
 
-#: src/summaryview.c:430
+#: src/summaryview.c:432
 msgid "/Color la_bel"
 msgstr "/_Farebné označenie"
 
-#: src/summaryview.c:434
+#: src/summaryview.c:436
 msgid "/Re-_edit"
 msgstr "/Znovu upraviť"
 
-#: src/summaryview.c:436
+#: src/summaryview.c:438
 #, fuzzy
 msgid "/Add sender to address boo_k..."
 msgstr "/Pridať odosielateľa do _adresára"
 
-#: src/summaryview.c:438
+#: src/summaryview.c:440
 msgid "/Create f_ilter rule"
 msgstr "/Vytvor_iť pravidlo filtra"
 
-#: src/summaryview.c:439
+#: src/summaryview.c:441
 msgid "/Create f_ilter rule/_Automatically"
 msgstr "/Vytvor_iť pravidlo filtra/_Automaticky"
 
-#: src/summaryview.c:441
+#: src/summaryview.c:443
 msgid "/Create f_ilter rule/by _From"
 msgstr "/Vytvor_iť pravidlo filtra/podľa _odosielateľa"
 
-#: src/summaryview.c:443
+#: src/summaryview.c:445
 msgid "/Create f_ilter rule/by _To"
 msgstr "/Vytvor_iť pravidlo filtra/podľa _príjemcu"
 
-#: src/summaryview.c:445
+#: src/summaryview.c:447
 msgid "/Create f_ilter rule/by _Subject"
 msgstr "/Vytvor_iť pravidlo filtra/podľa p_redmetu"
 
-#: src/summaryview.c:451
+#: src/summaryview.c:453
 msgid "/_View/_Source"
 msgstr "/_Zobraziť/_Zdroj"
 
-#: src/summaryview.c:452
+#: src/summaryview.c:454
 msgid "/_View/All _header"
 msgstr "/_Zobraziť/Všetky _hlavičky"
 
-#: src/summaryview.c:454
+#: src/summaryview.c:456
 msgid "/_Print..."
 msgstr "/_Tlačiť..."
 
-#: src/summaryview.c:486
+#: src/summaryview.c:488
 msgid "Creating summary view...\n"
 msgstr "Vytváram zoznam správy...\n"
 
-#: src/summaryview.c:508
+#: src/summaryview.c:510
 msgid "All"
 msgstr ""
 
-#: src/summaryview.c:511
+#: src/summaryview.c:513
 #, fuzzy
 msgid "Have color label"
 msgstr "/_Farebné označenie"
 
-#: src/summaryview.c:512
+#: src/summaryview.c:514
 #, fuzzy
 msgid "Have attachment"
 msgstr "Príloha"
 
-#: src/summaryview.c:521
+#: src/summaryview.c:523
 #, fuzzy
 msgid "Search:"
 msgstr "Hľadať"
 
-#: src/summaryview.c:535
+#: src/summaryview.c:537
 msgid "Search for Subject or From"
 msgstr ""
 
-#: src/summaryview.c:702
+#: src/summaryview.c:704
 msgid "Process mark"
 msgstr "Spracovať značky"
 
-#: src/summaryview.c:703
+#: src/summaryview.c:705
 msgid "Some marks are left. Process it?"
 msgstr "Ostali nejaké značky. Spracovať?"
 
-#: src/summaryview.c:749
+#: src/summaryview.c:751
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "Prehľadávam priečinok (%s)..."
 
-#: src/summaryview.c:1292
+#: src/summaryview.c:1295
 #, fuzzy
 msgid "_Search again"
 msgstr "Hľadať znova"
 
-#: src/summaryview.c:1313 src/summaryview.c:1322
+#: src/summaryview.c:1316 src/summaryview.c:1325
 msgid "No more unread messages"
 msgstr "Žiadne neprečítané správy"
 
-#: src/summaryview.c:1314
+#: src/summaryview.c:1317
 msgid "No unread message found. Search from the end?"
 msgstr "Neboli nájdené žiadne neprečítané správy. Hľadať od konca?"
 
-#: src/summaryview.c:1316
+#: src/summaryview.c:1319
 msgid "No unread messages."
 msgstr "Žiadne neprečítané správy."
 
-#: src/summaryview.c:1323
+#: src/summaryview.c:1326
 msgid "No unread message found. Go to next folder?"
 msgstr ""
 "Neboli nájdené žiadne neprečítané správy. Prejsť do ďalšieho priečinku?"
 
-#: src/summaryview.c:1331 src/summaryview.c:1340
+#: src/summaryview.c:1334 src/summaryview.c:1343
 msgid "No more new messages"
 msgstr "Žiadne nové správy"
 
-#: src/summaryview.c:1332
+#: src/summaryview.c:1335
 msgid "No new message found. Search from the end?"
 msgstr "Neboli nájdené žiadne nové správy. Hľadať od konca?"
 
-#: src/summaryview.c:1334
+#: src/summaryview.c:1337
 msgid "No new messages."
 msgstr "Žiadne nové správy."
 
-#: src/summaryview.c:1341
+#: src/summaryview.c:1344
 msgid "No new message found. Go to next folder?"
 msgstr "Neboli nájdené žiadne nové správy. Prejsť do ďalšieho priečinku?"
 
-#: src/summaryview.c:1349 src/summaryview.c:1358
+#: src/summaryview.c:1352 src/summaryview.c:1361
 msgid "No more marked messages"
 msgstr "Žiadne označené správy"
 
-#: src/summaryview.c:1350
+#: src/summaryview.c:1353
 msgid "No marked message found. Search from the end?"
 msgstr "Neboli nájdené žiadné označené správy. Hľadať od konca?"
 
-#: src/summaryview.c:1352 src/summaryview.c:1361
+#: src/summaryview.c:1355 src/summaryview.c:1364
 msgid "No marked messages."
 msgstr "Žiadne označené správy."
 
-#: src/summaryview.c:1359
+#: src/summaryview.c:1362
 msgid "No marked message found. Search from the beginning?"
 msgstr "Neboli nájdené žiadné označené správy. Hľadať od začiatku?"
 
-#: src/summaryview.c:1367 src/summaryview.c:1376
+#: src/summaryview.c:1370 src/summaryview.c:1379
 msgid "No more labeled messages"
 msgstr "Žiadne zafarbené správy"
 
-#: src/summaryview.c:1368
+#: src/summaryview.c:1371
 msgid "No labeled message found. Search from the end?"
 msgstr "Neboli nájdené žiadne zafarbené správy. Hľadať od konca?"
 
-#: src/summaryview.c:1370 src/summaryview.c:1379
+#: src/summaryview.c:1373 src/summaryview.c:1382
 msgid "No labeled messages."
 msgstr "Žiadne zafarbené správy."
 
-#: src/summaryview.c:1377
+#: src/summaryview.c:1380
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Neboli nájdené žiadne zafarbené správy. Hľadať od začiatku?"
 
-#: src/summaryview.c:1693
+#: src/summaryview.c:1696
 msgid "Attracting messages by subject..."
 msgstr "Zoskupujem správu podľa názvu..."
 
-#: src/summaryview.c:1887
+#: src/summaryview.c:1890
 #, c-format
 msgid "%d deleted"
 msgstr "%d zmazaných"
 
-#: src/summaryview.c:1891
+#: src/summaryview.c:1894
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d presunutých"
 
-#: src/summaryview.c:1892 src/summaryview.c:1897
+#: src/summaryview.c:1895 src/summaryview.c:1900
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:1896
+#: src/summaryview.c:1899
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d skopírovaných"
 
-#: src/summaryview.c:1911
+#: src/summaryview.c:1914
 msgid " item(s) selected"
 msgstr " položiek zvolených"
 
-#: src/summaryview.c:1933
+#: src/summaryview.c:1936
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d novýcvh, %d neprečítaných, %d celkovo (%s)"
 
-#: src/summaryview.c:1937
+#: src/summaryview.c:1940
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d novýcvh, %d neprečítaných, %d celkovo"
 
-#: src/summaryview.c:1971
+#: src/summaryview.c:1974
 msgid "Sorting summary..."
 msgstr "Triedim zoznam správ..."
 
-#: src/summaryview.c:2194
+#: src/summaryview.c:2211
 msgid "\tSetting summary from message data..."
 msgstr "\tVytváram zoznam správ..."
 
-#: src/summaryview.c:2196
+#: src/summaryview.c:2213
 msgid "Setting summary from message data..."
 msgstr "Vytváram zoznam správ..."
 
-#: src/summaryview.c:2302
+#: src/summaryview.c:2319
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Zapisujem stav zoznamu do medzipamäte (%s)..."
 
-#: src/summaryview.c:2643
+#: src/summaryview.c:2660
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Správa %d je označená\n"
 
-#: src/summaryview.c:2701
+#: src/summaryview.c:2718
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Správa %d je označená ako čítaná\n"
 
-#: src/summaryview.c:2789
+#: src/summaryview.c:2908
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Správa %d je označená ako neprečítaná\n"
 
-#: src/summaryview.c:2850
+#: src/summaryview.c:2969
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Správa %s/%d je určená na zmazanie\n"
 
-#: src/summaryview.c:2878
+#: src/summaryview.c:2997
 msgid "Delete message(s)"
 msgstr "Zmazať správy"
 
-#: src/summaryview.c:2879
+#: src/summaryview.c:2998
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Naozaj chcete zmazať správy z koša?"
 
-#: src/summaryview.c:2953
+#: src/summaryview.c:3072
 msgid "Deleting duplicated messages..."
 msgstr "Mažem duplikátne správy..."
 
-#: src/summaryview.c:2991
+#: src/summaryview.c:3110
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Správa %s/%d je odznačená\n"
 
-#: src/summaryview.c:3049
+#: src/summaryview.c:3168
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Správa %d je určená k presunutiu do %s\n"
 
-#: src/summaryview.c:3066
+#: src/summaryview.c:3196
 msgid "Destination is same as current folder."
 msgstr "Cieľ je zhodný s aktuálnym priečinkom."
 
-#: src/summaryview.c:3122
+#: src/summaryview.c:3260
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Správa %d je určená ku kopírovaniu do %s\n"
 
-#: src/summaryview.c:3139
+#: src/summaryview.c:3288
 #, fuzzy
 msgid "Destination for copy is same as current folder."
 msgstr "Cieľ kopírovania je zhodný s aktuálnym priečinkom."
 
-#: src/summaryview.c:3338
+#: src/summaryview.c:3495
 msgid "Error occurred while processing messages."
 msgstr "Pri spracovávaní pošty sa vyskytla chyba."
 
-#: src/summaryview.c:3646 src/summaryview.c:3647
+#: src/summaryview.c:3803 src/summaryview.c:3804
 msgid "Building threads..."
 msgstr "Vytváram vlákna..."
 
-#: src/summaryview.c:3797 src/summaryview.c:3798
+#: src/summaryview.c:3954 src/summaryview.c:3955
 msgid "Unthreading..."
 msgstr "Odstraňujem štruktúru vlákien..."
 
-#: src/summaryview.c:4091 src/summaryview.c:4147
+#: src/summaryview.c:4248 src/summaryview.c:4304
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtrujem..."
 
-#: src/summaryview.c:4196
+#: src/summaryview.c:4353
 msgid "filtering..."
 msgstr "filtrujem..."
 
-#: src/summaryview.c:4197
+#: src/summaryview.c:4354
 msgid "Filtering..."
 msgstr "Filtrujem..."
 
-#: src/summaryview.c:4233
+#: src/summaryview.c:4390
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr ""
 
-#: src/summaryview.c:4742
+#: src/summaryview.c:4899
 msgid "No."
 msgstr "Č."
 
@@ -6637,36 +6668,36 @@ msgstr "Vytváram zobrazenie textu...\n"
 msgid "This message can't be displayed.\n"
 msgstr "Táto správa sa nedá zobraziť.\n"
 
-#: src/textview.c:1929
+#: src/textview.c:1925
 #, fuzzy
 msgid "Sa_ve this image as..."
 msgstr "/_Uložiť ako..."
 
-#: src/textview.c:1945 src/trayicon.c:109
+#: src/textview.c:1941 src/trayicon.c:109
 #, fuzzy
 msgid "Compose _new message"
 msgstr "Napísať novú správu"
 
-#: src/textview.c:1947
+#: src/textview.c:1943
 #, fuzzy
 msgid "Add to address _book..."
 msgstr "/Pridať odosielateľa do _adresára"
 
-#: src/textview.c:1949
+#: src/textview.c:1945
 #, fuzzy
 msgid "Copy this add_ress"
 msgstr "Spoločná adresa"
 
-#: src/textview.c:1952
+#: src/textview.c:1948
 #, fuzzy
 msgid "_Open with Web browser"
 msgstr "Webový prehliadač"
 
-#: src/textview.c:1954
+#: src/textview.c:1950
 msgid "Copy this _link"
 msgstr ""
 
-#: src/textview.c:2097
+#: src/textview.c:2093
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6675,7 +6706,7 @@ msgid ""
 "Open it anyway?"
 msgstr ""
 
-#: src/textview.c:2102
+#: src/textview.c:2098
 msgid "Fake URL warning"
 msgstr ""
 
diff --git a/po/sl.po b/po/sl.po
index 48d23f3f..5a4a65ed 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: 2006-01-27 18:11+0900\n"
+"POT-Creation-Date: 2006-01-31 15:20+0900\n"
 "PO-Revision-Date: 2003-01-24 20:39CET\n"
 "Last-Translator: Jernej Kovacic <jkovacic@email.si>\n"
 "Language-Team: Slovenian <translator-team-sl@lists.sourceforge.net>\n"
@@ -508,7 +508,7 @@ msgstr "Najden %s\n"
 msgid "Configuration is saved.\n"
 msgstr "Konfiguracija je shranjena.\n"
 
-#: libsylph/prefs_common.c:489
+#: libsylph/prefs_common.c:491
 #, fuzzy
 msgid "Junk mail filter"
 msgstr "Mapa"
@@ -625,8 +625,8 @@ msgstr ""
 msgid "%.2fGB"
 msgstr ""
 
-#: libsylph/utils.c:2373 src/compose.c:2858 src/compose.c:3121
-#: src/compose.c:3184 src/compose.c:3304
+#: libsylph/utils.c:2373 src/compose.c:2867 src/compose.c:3130
+#: src/compose.c:3193 src/compose.c:3313
 msgid "can't change file mode\n"
 msgstr "Ne morem spremeniti pravic do dostopa do datoteke\n"
 
@@ -713,8 +713,8 @@ msgstr ""
 "Nova sporočila bodo iskana v tem vrstnem redu. Označite izbirnike\n"
 "v stolpcu `G', da omogočite pobiranje sporočil z ukazom `Poberi vsa'."
 
-#: src/account_dialog.c:366 src/addressadd.c:192 src/addressbook.c:491
-#: src/compose.c:4262 src/editaddress.c:200 src/editaddress.c:942
+#: src/account_dialog.c:366 src/addressadd.c:192 src/addressbook.c:493
+#: src/compose.c:4271 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:206 src/prefs_filter.c:259 src/prefs_folder_item.c:171
@@ -850,12 +850,12 @@ msgstr ""
 msgid "Add Address to Book"
 msgstr "Dodaj naslov v adresar"
 
-#: src/addressadd.c:202 src/compose.c:4762 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4771 src/editaddress.c:201
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "Naslov"
 
-#: src/addressadd.c:212 src/addressbook.c:493 src/editaddress.c:202
+#: src/addressadd.c:212 src/addressbook.c:495 src/editaddress.c:202
 #: src/editaddress.c:795 src/editaddress.c:860 src/editgroup.c:267
 msgid "Remarks"
 msgstr "Opombe"
@@ -864,183 +864,183 @@ msgstr "Opombe"
 msgid "Select Address Book Folder"
 msgstr "Izberite mapo za adresar"
 
-#: src/addressbook.c:336 src/compose.c:515 src/mainwindow.c:477
+#: src/addressbook.c:338 src/compose.c:515 src/mainwindow.c:480
 #: src/messageview.c:138
 msgid "/_File"
 msgstr "/_Datoteka"
 
-#: src/addressbook.c:337
+#: src/addressbook.c:339
 msgid "/_File/New _Book"
 msgstr "/_Datoteka/Nova _Knjiga"
 
-#: src/addressbook.c:338
+#: src/addressbook.c:340
 msgid "/_File/New _vCard"
 msgstr "/_Datoteka/Nova _v kartica"
 
-#: src/addressbook.c:340
+#: src/addressbook.c:342
 msgid "/_File/New _JPilot"
 msgstr "/_Datoteka/Nov _JPilot"
 
-#: src/addressbook.c:343
+#: src/addressbook.c:345
 msgid "/_File/New _Server"
 msgstr "/_Datoteka/Nov _strežnik"
 
-#: src/addressbook.c:345 src/addressbook.c:348 src/compose.c:520
-#: src/compose.c:525 src/compose.c:528 src/compose.c:531 src/mainwindow.c:495
-#: src/mainwindow.c:498 src/mainwindow.c:500 src/mainwindow.c:503
-#: src/mainwindow.c:505 src/messageview.c:141
+#: src/addressbook.c:347 src/addressbook.c:350 src/compose.c:520
+#: src/compose.c:525 src/compose.c:528 src/compose.c:531 src/mainwindow.c:498
+#: src/mainwindow.c:501 src/mainwindow.c:503 src/mainwindow.c:506
+#: src/mainwindow.c:508 src/messageview.c:141
 msgid "/_File/---"
 msgstr "/_Datoteka/---"
 
-#: src/addressbook.c:346
+#: src/addressbook.c:348
 msgid "/_File/_Edit"
 msgstr "/_Datoteka/_Urejanje"
 
-#: src/addressbook.c:347
+#: src/addressbook.c:349
 msgid "/_File/_Delete"
 msgstr "/_Datoteka/_Brisanje"
 
-#: src/addressbook.c:349
+#: src/addressbook.c:351
 msgid "/_File/_Save"
 msgstr "/_Datoteka/_Shranjevanje"
 
-#: src/addressbook.c:350 src/compose.c:532 src/messageview.c:142
+#: src/addressbook.c:352 src/compose.c:532 src/messageview.c:142
 msgid "/_File/_Close"
 msgstr "/_Datoteka/_Zapri"
 
-#: src/addressbook.c:351
+#: src/addressbook.c:353
 msgid "/_Address"
 msgstr "/_Naslov"
 
-#: src/addressbook.c:352
+#: src/addressbook.c:354
 msgid "/_Address/New _Address"
 msgstr "/_Naslov/Nov n_aslov"
 
-#: src/addressbook.c:353
+#: src/addressbook.c:355
 msgid "/_Address/New _Group"
 msgstr "/_Naslov/Nova _skupina"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:356
 msgid "/_Address/New _Folder"
 msgstr "/_Naslov/Nova _mapa"
 
-#: src/addressbook.c:355
+#: src/addressbook.c:357
 msgid "/_Address/---"
 msgstr "/_Naslov/---"
 
-#: src/addressbook.c:356
+#: src/addressbook.c:358
 msgid "/_Address/_Edit"
 msgstr "/_Naslov/_Urejanje"
 
-#: src/addressbook.c:357
+#: src/addressbook.c:359
 msgid "/_Address/_Delete"
 msgstr "/_Naslov/_Brisanje"
 
-#: src/addressbook.c:358 src/compose.c:639 src/mainwindow.c:738
-#: src/messageview.c:259
+#: src/addressbook.c:360 src/compose.c:645 src/mainwindow.c:749
+#: src/messageview.c:264
 msgid "/_Tools"
 msgstr "/_Orodja"
 
-#: src/addressbook.c:359
+#: src/addressbook.c:361
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Orodja/Uvoz datoteke _LDIF"
 
-#: src/addressbook.c:360 src/compose.c:658 src/mainwindow.c:788
-#: src/messageview.c:277
+#: src/addressbook.c:362 src/compose.c:664 src/mainwindow.c:799
+#: src/messageview.c:282
 msgid "/_Help"
 msgstr "/_Pomoč"
 
-#: src/addressbook.c:361 src/compose.c:659 src/mainwindow.c:799
-#: src/messageview.c:278
+#: src/addressbook.c:363 src/compose.c:665 src/mainwindow.c:810
+#: src/messageview.c:283
 msgid "/_Help/_About"
 msgstr "/_Pomoč/_O programu"
 
-#: src/addressbook.c:380 src/addressbook.c:390
+#: src/addressbook.c:382 src/addressbook.c:392
 msgid "/New _Address"
 msgstr "/Nov n_aslov"
 
-#: src/addressbook.c:381 src/addressbook.c:391
+#: src/addressbook.c:383 src/addressbook.c:393
 msgid "/New _Group"
 msgstr "/Nova _skupina"
 
-#: src/addressbook.c:382 src/addressbook.c:392
+#: src/addressbook.c:384 src/addressbook.c:394
 msgid "/New _Folder"
 msgstr "/Nova _mapa"
 
-#: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:509
+#: src/addressbook.c:385 src/addressbook.c:395 src/compose.c:509
 #: src/folderview.c:246 src/folderview.c:248 src/folderview.c:253
 #: src/folderview.c:266 src/folderview.c:268 src/folderview.c:270
 #: src/folderview.c:275 src/folderview.c:289 src/folderview.c:291
 #: src/folderview.c:295 src/summaryview.c:414 src/summaryview.c:418
-#: src/summaryview.c:421 src/summaryview.c:431 src/summaryview.c:433
-#: src/summaryview.c:435 src/summaryview.c:447 src/summaryview.c:453
+#: src/summaryview.c:421 src/summaryview.c:433 src/summaryview.c:435
+#: src/summaryview.c:437 src/summaryview.c:449 src/summaryview.c:455
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:534
-#: src/mainwindow.c:509 src/messageview.c:144
+#: src/addressbook.c:386 src/addressbook.c:396 src/compose.c:534
+#: src/mainwindow.c:512 src/messageview.c:144
 msgid "/_Edit"
 msgstr "/_Urejanje"
 
-#: src/addressbook.c:385 src/addressbook.c:395 src/summaryview.c:432
+#: src/addressbook.c:387 src/addressbook.c:397 src/summaryview.c:434
 msgid "/_Delete"
 msgstr "/_Brisanje"
 
-#: src/addressbook.c:492
+#: src/addressbook.c:494
 msgid "E-Mail address"
 msgstr "Elektronski naslov"
 
-#: src/addressbook.c:496 src/compose.c:4763 src/prefs_common_dialog.c:2183
+#: src/addressbook.c:498 src/compose.c:4772 src/prefs_common_dialog.c:2183
 msgid "Address book"
 msgstr "Imenik naslovov"
 
-#: src/addressbook.c:596 src/prefs_filter_edit.c:249
+#: src/addressbook.c:600 src/prefs_filter_edit.c:249
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "Ime:"
 
 #. Buttons
-#: src/addressbook.c:628 src/addressbook.c:1680 src/editaddress.c:884
-#: src/editaddress.c:1017 src/mainwindow.c:2391 src/prefs_actions.c:266
+#: src/addressbook.c:632 src/addressbook.c:1684 src/editaddress.c:884
+#: src/editaddress.c:1017 src/mainwindow.c:2402 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
 #: src/prefs_template.c:233
 msgid "Delete"
 msgstr "Izbriši"
 
-#: src/addressbook.c:631 src/editaddress.c:890 src/editaddress.c:1023
+#: src/addressbook.c:635 src/editaddress.c:890 src/editaddress.c:1023
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:273 src/prefs_display_header.c:328
 #: src/prefs_filter_edit.c:1550
 msgid "Add"
 msgstr "Dodajanje"
 
-#: src/addressbook.c:634
+#: src/addressbook.c:638
 msgid "Lookup"
 msgstr "Poišči"
 
-#: src/addressbook.c:646 src/headerview.c:55 src/prefs_folder_item.c:339
+#: src/addressbook.c:650 src/headerview.c:55 src/prefs_folder_item.c:339
 #: src/prefs_template.c:176
 msgid "To:"
 msgstr "Za:"
 
-#: src/addressbook.c:650 src/prefs_folder_item.c:356 src/prefs_template.c:178
+#: src/addressbook.c:654 src/prefs_folder_item.c:356 src/prefs_template.c:178
 msgid "Cc:"
 msgstr "Kp:"
 
-#: src/addressbook.c:654 src/prefs_folder_item.c:367
+#: src/addressbook.c:658 src/prefs_folder_item.c:367
 msgid "Bcc:"
 msgstr "Skp:"
 
 #. Confirm deletion
-#: src/addressbook.c:841
+#: src/addressbook.c:845
 msgid "Delete address(es)"
 msgstr "Brisanje naslova"
 
-#: src/addressbook.c:842
+#: src/addressbook.c:846
 msgid "Really delete the address(es)?"
 msgstr "Res želite izbrisati naslov(e)?"
 
-#: src/addressbook.c:1671
+#: src/addressbook.c:1675
 #, fuzzy, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1049,38 +1049,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:1674 src/folderview.c:2351
+#: src/addressbook.c:1678 src/folderview.c:2351
 msgid "Delete folder"
 msgstr "Izbriši mapo"
 
-#: src/addressbook.c:1674
+#: src/addressbook.c:1678
 #, fuzzy
 msgid "_Folder only"
 msgstr "Samo mapa"
 
-#: src/addressbook.c:1674
+#: src/addressbook.c:1678
 #, fuzzy
 msgid "Folder and _addresses"
 msgstr "Mapa in naslovi"
 
-#: src/addressbook.c:1679
+#: src/addressbook.c:1683
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Res želite izbrisati '%s' ?"
 
-#: src/addressbook.c:2365 src/addressbook.c:2498
+#: src/addressbook.c:2369 src/addressbook.c:2502
 msgid "New user, could not save index file."
 msgstr "Nov uporabnik, ne morem shraniti indeksne datoteke."
 
-#: src/addressbook.c:2369 src/addressbook.c:2502
+#: src/addressbook.c:2373 src/addressbook.c:2506
 msgid "New user, could not save address book files."
 msgstr "Nov uporabnik, ne morem shraniti datotek z iminiki naslovov."
 
-#: src/addressbook.c:2379 src/addressbook.c:2512
+#: src/addressbook.c:2383 src/addressbook.c:2516
 msgid "Old address book converted successfully."
 msgstr "Star imenik naslovov je bil uspešno pretvorjen."
 
-#: src/addressbook.c:2384
+#: src/addressbook.c:2388
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1088,7 +1088,7 @@ msgstr ""
 "Stari imenik naslovov pretvorjen,\n"
 "ne morem shraniti nove indeksne datoteke naslovov"
 
-#: src/addressbook.c:2397
+#: src/addressbook.c:2401
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1096,7 +1096,7 @@ msgstr ""
 "Ne morem pretvoriti imenika naslovov,\n"
 "sem pa naredil prazne nove datoteke imenikov naslovov."
 
-#: src/addressbook.c:2403
+#: src/addressbook.c:2407
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1104,7 +1104,7 @@ msgstr ""
 "Ne morem pretvoriti imenika naslovov,\n"
 "ne morem narediti novih datotek z imeniki naslovov."
 
-#: src/addressbook.c:2408
+#: src/addressbook.c:2412
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1112,91 +1112,91 @@ msgstr ""
 "Ne morem pretvoriti imenika naslovov\n"
 "in ne morem narediti novih datotek z imeniki naslovov"
 
-#: src/addressbook.c:2415
+#: src/addressbook.c:2419
 msgid "Addressbook conversion error"
 msgstr "Napaka pri pretvorbi imenika naslovov"
 
-#: src/addressbook.c:2419
+#: src/addressbook.c:2423
 msgid "Addressbook conversion"
 msgstr "Pretvarjam imenik naslovov"
 
-#: src/addressbook.c:2454
+#: src/addressbook.c:2458
 msgid "Addressbook Error"
 msgstr "Napaka v imeniku naslovov"
 
-#: src/addressbook.c:2455 src/addressbook.c:2555
+#: src/addressbook.c:2459 src/addressbook.c:2559
 msgid "Could not read address index"
 msgstr "Ne morem prebrati indeksa naslovov"
 
-#: src/addressbook.c:2517
+#: src/addressbook.c:2521
 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:2531
+#: src/addressbook.c:2535
 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:2537
+#: src/addressbook.c:2541
 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:2543
+#: src/addressbook.c:2547
 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:2561
+#: src/addressbook.c:2565
 msgid "Addressbook Conversion Error"
 msgstr "Napaka pri pretvorbi imenika naslovov"
 
-#: src/addressbook.c:2567
+#: src/addressbook.c:2571
 msgid "Addressbook Conversion"
 msgstr "Pretvorba imenika naslovov"
 
-#: src/addressbook.c:3072 src/prefs_common_dialog.c:2033
+#: src/addressbook.c:3086 src/prefs_common_dialog.c:2033
 msgid "Interface"
 msgstr "Vmesnik"
 
-#: src/addressbook.c:3088 src/importldif.c:514
+#: src/addressbook.c:3102 src/importldif.c:514
 msgid "Address Book"
 msgstr "Imenik naslovov"
 
-#: src/addressbook.c:3104
+#: src/addressbook.c:3118
 msgid "Person"
 msgstr "Oseba"
 
-#: src/addressbook.c:3120
+#: src/addressbook.c:3134
 msgid "EMail Address"
 msgstr "Elektronski naslov"
 
-#: src/addressbook.c:3136
+#: src/addressbook.c:3150
 msgid "Group"
 msgstr "Skupina"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3152 src/folderview.c:367 src/prefs_account_dialog.c:1694
+#: src/addressbook.c:3166 src/folderview.c:367 src/prefs_account_dialog.c:1694
 #: src/query_search.c:370
 msgid "Folder"
 msgstr "Mapa"
 
-#: src/addressbook.c:3168
+#: src/addressbook.c:3182
 msgid "vCard"
 msgstr "v-kartica"
 
-#: src/addressbook.c:3184 src/addressbook.c:3200
+#: src/addressbook.c:3198 src/addressbook.c:3214
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3216
+#: src/addressbook.c:3230
 msgid "LDAP Server"
 msgstr "Strežnik LDAP"
 
@@ -1208,7 +1208,7 @@ msgstr "Skupni naslov"
 msgid "Personal address"
 msgstr "Osebni naslov"
 
-#: src/alertpanel.c:141 src/compose.c:5485 src/main.c:573
+#: src/alertpanel.c:141 src/compose.c:5494 src/main.c:573
 msgid "Notice"
 msgstr "Opomba"
 
@@ -1259,7 +1259,7 @@ msgstr "Rjava"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4593
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4750
 msgid "None"
 msgstr "Nič"
 
@@ -1322,7 +1322,7 @@ msgstr "/_Uredi/_Razveljavi"
 msgid "/_Edit/_Redo"
 msgstr "/_Uredi/_Obnovi"
 
-#: src/compose.c:537 src/compose.c:544 src/mainwindow.c:513
+#: src/compose.c:537 src/compose.c:544 src/mainwindow.c:516
 #: src/messageview.c:147
 msgid "/_Edit/---"
 msgstr "/_Uredi/---"
@@ -1331,7 +1331,7 @@ msgstr "/_Uredi/---"
 msgid "/_Edit/Cu_t"
 msgstr "/_Uredi/I_zreži"
 
-#: src/compose.c:539 src/mainwindow.c:510 src/messageview.c:145
+#: src/compose.c:539 src/mainwindow.c:513 src/messageview.c:145
 msgid "/_Edit/_Copy"
 msgstr "/Uredi/_Kopiraj"
 
@@ -1343,7 +1343,7 @@ msgstr "/_Uredi/_Prilepi"
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Uredi/Prilepi kot _citat"
 
-#: src/compose.c:543 src/mainwindow.c:511 src/messageview.c:146
+#: src/compose.c:543 src/mainwindow.c:514 src/messageview.c:146
 msgid "/_Edit/Select _all"
 msgstr "/_Uredi/Izberi _vse"
 
@@ -1360,8 +1360,8 @@ msgstr "/_Uredi/_Prelomi vse _dolge vrstice"
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/Uredi/_Kopiraj"
 
-#: src/compose.c:550 src/mainwindow.c:518 src/messageview.c:151
-#: src/summaryview.c:448
+#: src/compose.c:550 src/mainwindow.c:521 src/messageview.c:151
+#: src/summaryview.c:450
 msgid "/_View"
 msgstr "/_Pogled"
 
@@ -1382,9 +1382,9 @@ msgid "/_View/_Reply to"
 msgstr "/_Ogled/_Odgovor za"
 
 #: src/compose.c:555 src/compose.c:557 src/compose.c:559 src/compose.c:561
-#: src/mainwindow.c:538 src/mainwindow.c:541 src/mainwindow.c:568
-#: src/mainwindow.c:592 src/mainwindow.c:687 src/mainwindow.c:691
-#: src/messageview.c:236
+#: src/mainwindow.c:541 src/mainwindow.c:544 src/mainwindow.c:571
+#: src/mainwindow.c:595 src/mainwindow.c:696 src/mainwindow.c:700
+#: src/messageview.c:241
 msgid "/_View/---"
 msgstr "/_Pogled/---"
 
@@ -1400,7 +1400,7 @@ msgstr "/_Pogled/R_avnilo"
 msgid "/_View/_Attachment"
 msgstr "/_Pogled/_Priloga"
 
-#: src/compose.c:567 src/mainwindow.c:599 src/messageview.c:158
+#: src/compose.c:567 src/mainwindow.c:602 src/messageview.c:158
 #, fuzzy
 msgid "/_View/Character _encoding"
 msgstr "/_Pogled/_Razvrščanje/Pa_dajoče"
@@ -1410,241 +1410,252 @@ msgid "/_View/Character _encoding/_Automatic"
 msgstr ""
 
 #: src/compose.c:570 src/compose.c:576 src/compose.c:582 src/compose.c:586
-#: src/compose.c:592 src/compose.c:596 src/compose.c:602 src/compose.c:606
-#: src/compose.c:616 src/compose.c:620 src/compose.c:628 src/compose.c:632
-#: src/mainwindow.c:595 src/mainwindow.c:602 src/messageview.c:154
+#: src/compose.c:592 src/compose.c:596 src/compose.c:602 src/compose.c:608
+#: src/compose.c:612 src/compose.c:622 src/compose.c:626 src/compose.c:634
+#: src/compose.c:638 src/mainwindow.c:598 src/mainwindow.c:605
+#: src/messageview.c:154
 #, fuzzy
 msgid "/_View/Character _encoding/---"
 msgstr "/_Pogled/_Razvrščanje/Pa_dajoče"
 
-#: src/compose.c:572 src/mainwindow.c:603 src/messageview.c:162
+#: src/compose.c:572 src/mainwindow.c:606 src/messageview.c:162
 #, fuzzy
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Pogled/Nabor zna_kov/7 bitni ASCII (US-ASC_II)"
 
-#: src/compose.c:574 src/mainwindow.c:605 src/messageview.c:165
+#: src/compose.c:574 src/mainwindow.c:608 src/messageview.c:165
 #, fuzzy
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/Videz/Nabor zna_kov/Unicode (_UTF-8)"
 
-#: src/compose.c:578 src/mainwindow.c:609 src/messageview.c:168
+#: src/compose.c:578 src/mainwindow.c:612 src/messageview.c:168
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "_Pogled/Nabor zna_kov/Zahodnoevropski (ISO-8859-_1)"
 
-#: src/compose.c:580 src/mainwindow.c:611 src/messageview.c:170
+#: src/compose.c:580 src/mainwindow.c:614 src/messageview.c:170
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "_Pogled/Nabor zna_kov/Zahodnoevropski (ISO-8859-15)"
 
-#: src/compose.c:584 src/mainwindow.c:617 src/messageview.c:175
+#: src/compose.c:584 src/mainwindow.c:620 src/messageview.c:175
 #, fuzzy
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Pogled/Nabor zna_kov/Srednjeevropski (ISO-8859-_2)"
 
-#: src/compose.c:588 src/mainwindow.c:621 src/messageview.c:178
+#: src/compose.c:588 src/mainwindow.c:624 src/messageview.c:178
 #, fuzzy
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Pogled/Nabor zna_kov/_Baltski (ISO-8859-13)"
 
-#: src/compose.c:590 src/mainwindow.c:623 src/messageview.c:180
+#: src/compose.c:590 src/mainwindow.c:626 src/messageview.c:180
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Pogled/Nabor zna_kov/Baltski (ISO-8859-_4)"
 
-#: src/compose.c:594 src/mainwindow.c:627 src/messageview.c:183
+#: src/compose.c:594 src/mainwindow.c:630 src/messageview.c:183
 #, fuzzy
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Pogled/Nabor zna_kov/Grški (ISO-8859-_7)"
 
-#: src/compose.c:598 src/mainwindow.c:631 src/messageview.c:186
+#: src/compose.c:598 src/mainwindow.c:634 src/messageview.c:186
+#, fuzzy
+msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
+msgstr "/_Pogled/Nabor zna_kov/Baltski (ISO-8859-_4)"
+
+#: src/compose.c:600 src/mainwindow.c:636 src/messageview.c:188
+#, fuzzy
+msgid "/_View/Character _encoding/Arabic (Windows-1256)"
+msgstr "/_Pogled/Nabor zna_kov/Cirilica (Windows-1251)"
+
+#: src/compose.c:604 src/mainwindow.c:640 src/messageview.c:191
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Pogled/Nabor zna_kov/Grški (ISO-8859-_7)"
 
-#: src/compose.c:600 src/mainwindow.c:633 src/messageview.c:188
+#: src/compose.c:606 src/mainwindow.c:642 src/messageview.c:193
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Pogled/Nabor zna_kov/Cirilica (Windows-1251)"
 
-#: src/compose.c:604 src/mainwindow.c:637 src/messageview.c:191
+#: src/compose.c:610 src/mainwindow.c:646 src/messageview.c:196
 #, fuzzy
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Pogled/Nabor zna_kov/Turški (ISO-8859-_9)"
 
-#: src/compose.c:608 src/mainwindow.c:641 src/messageview.c:194
+#: src/compose.c:614 src/mainwindow.c:650 src/messageview.c:199
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Pogled/Nabor zna_kov/Cirilica (ISO-8859-_5)"
 
-#: src/compose.c:610 src/mainwindow.c:643 src/messageview.c:196
+#: src/compose.c:616 src/mainwindow.c:652 src/messageview.c:201
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Pogled/Nabor zna_kov/Cirilica (KOI8-_R)"
 
-#: src/compose.c:612 src/mainwindow.c:645 src/messageview.c:198
+#: src/compose.c:618 src/mainwindow.c:654 src/messageview.c:203
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Pogled/Nabor zna_kov/Cirilica (KOI8-_R)"
 
-#: src/compose.c:614 src/mainwindow.c:647 src/messageview.c:200
+#: src/compose.c:620 src/mainwindow.c:656 src/messageview.c:205
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Pogled/Nabor zna_kov/Cirilica (Windows-1251)"
 
-#: src/compose.c:618 src/mainwindow.c:651 src/messageview.c:203
+#: src/compose.c:624 src/mainwindow.c:660 src/messageview.c:208
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Pogled/Nabor zna_kov/Japonski (ISO-2022-_JP)"
 
-#: src/compose.c:622 src/mainwindow.c:661 src/messageview.c:212
+#: src/compose.c:628 src/mainwindow.c:670 src/messageview.c:217
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Pogled/Nabor zna_kov/Poenostavljena kitajščina (_GB2312)"
 
-#: src/compose.c:624 src/mainwindow.c:663 src/messageview.c:214
+#: src/compose.c:630 src/mainwindow.c:672 src/messageview.c:219
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Pogled/Nabor zna_kov/Poenostavljena kitajščina (_GB2312)"
 
-#: src/compose.c:626 src/mainwindow.c:665 src/messageview.c:216
+#: src/compose.c:632 src/mainwindow.c:674 src/messageview.c:221
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Pogled/Nabor zna_kov/Tradicionalna kitajščina (_Big5)"
 
-#: src/compose.c:630 src/mainwindow.c:673 src/messageview.c:223
+#: src/compose.c:636 src/mainwindow.c:682 src/messageview.c:228
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Pogled/Nabor zna_kov/Korejski (EUC-_KR)"
 
-#: src/compose.c:634 src/mainwindow.c:679 src/messageview.c:228
+#: src/compose.c:640 src/mainwindow.c:688 src/messageview.c:233
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Pogled/Nabor zna_kov/Tajski (TIS-620)"
 
-#: src/compose.c:636 src/mainwindow.c:681 src/messageview.c:230
+#: src/compose.c:642 src/mainwindow.c:690 src/messageview.c:235
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Pogled/Nabor zna_kov/Tajski (Windows-874)"
 
-#: src/compose.c:640 src/mainwindow.c:739 src/messageview.c:260
+#: src/compose.c:646 src/mainwindow.c:750 src/messageview.c:265
 msgid "/_Tools/_Address book"
 msgstr "/_Orodja/_Adresar"
 
-#: src/compose.c:641
+#: src/compose.c:647
 msgid "/_Tools/_Template"
 msgstr "/_Orodja/_Predloga"
 
-#: src/compose.c:642 src/mainwindow.c:762 src/messageview.c:275
+#: src/compose.c:648 src/mainwindow.c:773 src/messageview.c:280
 msgid "/_Tools/Actio_ns"
 msgstr "/_Orodja/Deja_nja"
 
-#: src/compose.c:643 src/compose.c:647 src/compose.c:653 src/mainwindow.c:742
-#: src/mainwindow.c:756 src/mainwindow.c:761 src/mainwindow.c:763
-#: src/mainwindow.c:766 src/mainwindow.c:768 src/messageview.c:263
-#: src/messageview.c:274
+#: src/compose.c:649 src/compose.c:653 src/compose.c:659 src/mainwindow.c:753
+#: src/mainwindow.c:767 src/mainwindow.c:772 src/mainwindow.c:774
+#: src/mainwindow.c:777 src/mainwindow.c:779 src/messageview.c:268
+#: src/messageview.c:279
 msgid "/_Tools/---"
 msgstr "/_Orodja/---"
 
-#: src/compose.c:644
+#: src/compose.c:650
 #, fuzzy
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/_Uredi/Uredi z _zunanjim urejevalnikom"
 
-#: src/compose.c:648
+#: src/compose.c:654
 #, fuzzy
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Orodja/Deja_nja"
 
-#: src/compose.c:649
+#: src/compose.c:655
 #, fuzzy
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/_Sporočilo/_Enkripcija"
 
-#: src/compose.c:654
+#: src/compose.c:660
 #, fuzzy
 msgid "/_Tools/_Check spell"
 msgstr "/_Orodja/_Izvrši"
 
-#: src/compose.c:655
+#: src/compose.c:661
 #, fuzzy
 msgid "/_Tools/_Set spell language"
 msgstr "/_Orodja/_Predloga"
 
-#: src/compose.c:899
+#: src/compose.c:908
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: datoteka ne obstaja\n"
 
-#: src/compose.c:1003 src/compose.c:1074
+#: src/compose.c:1012 src/compose.c:1083
 msgid "Can't get text part\n"
 msgstr "Ne morem dobiti tekstovnega dela\n"
 
-#: src/compose.c:1475
+#: src/compose.c:1484
 msgid "Quote mark format error."
 msgstr "Napaka pri oblikovanju znaka za citiranje."
 
-#: src/compose.c:1487
+#: src/compose.c:1496
 msgid "Message reply/forward format error."
 msgstr "Napaka pri oblikovanju odgovora/posredovanja sporočila."
 
-#: src/compose.c:1907
+#: src/compose.c:1916
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Datoteka %s ne obstaja\n"
 
-#: src/compose.c:1911
+#: src/compose.c:1920
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Ne morem dobiti velikosti datoteke %s\n"
 
-#: src/compose.c:1915
+#: src/compose.c:1924
 #, c-format
 msgid "File %s is empty."
 msgstr "Datoteka %s je prazna."
 
-#: src/compose.c:1919
+#: src/compose.c:1928
 #, c-format
 msgid "Can't read %s."
 msgstr "Ne morem prebrati %s."
 
-#: src/compose.c:1952
+#: src/compose.c:1961
 #, c-format
 msgid "Message: %s"
 msgstr "Sporočilo: %s"
 
-#: src/compose.c:2012 src/mimeview.c:565
+#: src/compose.c:2021 src/mimeview.c:565
 msgid "Can't get the part of multipart message."
 msgstr "Ne morem dobiti dela večdelnega sporočila."
 
-#: src/compose.c:2496 src/headerview.c:195 src/query_search.c:636
-#: src/summaryview.c:2107
+#: src/compose.c:2505 src/headerview.c:195 src/query_search.c:636
+#: src/summaryview.c:2124
 msgid "(No Subject)"
 msgstr "(Brez zadeve)"
 
-#: src/compose.c:2499
+#: src/compose.c:2508
 #, fuzzy, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Sestavi sporočilo%s"
 
-#: src/compose.c:2612
+#: src/compose.c:2621
 msgid "Recipient is not specified."
 msgstr "Naslovnik ni določen."
 
-#: src/compose.c:2620
+#: src/compose.c:2629
 #, fuzzy
 msgid "Empty subject"
 msgstr "Zadeva"
 
-#: src/compose.c:2621
+#: src/compose.c:2630
 msgid "Subject is empty. Send it anyway?"
 msgstr "Zadeva sporočila je prazna. Naj kljub temu pošljem?"
 
-#: src/compose.c:2680
+#: src/compose.c:2689
 msgid "can't get recipient list."
 msgstr "ne morem dobiti seznama naslovnikov"
 
-#: src/compose.c:2700
+#: src/compose.c:2709
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1652,21 +1663,21 @@ msgstr ""
 "Račun za pošiljanje pošte ni določen.\n"
 "Prosim, pred pošiljanjem izberite poštni račun."
 
-#: src/compose.c:2714 src/send_message.c:299
+#: src/compose.c:2723 src/send_message.c:299
 #, 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:2756
+#: src/compose.c:2765
 msgid "Can't save the message to outbox."
 msgstr "Ne morem shraniti sporočila v imenik Outbox."
 
-#: src/compose.c:2794
+#: src/compose.c:2803
 #, 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:2891
+#: src/compose.c:2900
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1676,12 +1687,12 @@ msgstr ""
 "Ne morem pretvoriti nabora znakov sporočila.\n"
 "Naj ga kljub temu pošljem?"
 
-#: src/compose.c:2897
+#: src/compose.c:2906
 #, fuzzy
 msgid "Code conversion error"
 msgstr "Napaka pri pretvorbi imenika naslovov"
 
-#: src/compose.c:2970
+#: src/compose.c:2979
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1690,160 +1701,160 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:2974
+#: src/compose.c:2983
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3264
+#: src/compose.c:3273
 msgid "can't remove the old message\n"
 msgstr "ne morem odstraniti starega sporočila\n"
 
-#: src/compose.c:3282
+#: src/compose.c:3291
 msgid "queueing message...\n"
 msgstr "prestavljam sporočilo v mapo Čakajoče...\n"
 
-#: src/compose.c:3364
+#: src/compose.c:3373
 msgid "can't find queue folder\n"
 msgstr "ne najdem mape s čakajočimi sporočili\n"
 
-#: src/compose.c:3371
+#: src/compose.c:3380
 msgid "can't queue the message\n"
 msgstr "ne morem preložiti sporočila\n"
 
-#: src/compose.c:3964
+#: src/compose.c:3973
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "generiran Message-ID: %s\n"
 
-#: src/compose.c:4077
+#: src/compose.c:4086
 msgid "Creating compose window...\n"
 msgstr "Odpiram okno za sestavljanje sporočila...\n"
 
-#: src/compose.c:4128 src/headerview.c:54
+#: src/compose.c:4137 src/headerview.c:54
 msgid "From:"
 msgstr "Pošiljatelj:"
 
-#: src/compose.c:4202
+#: src/compose.c:4211
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/_Orodja/Deja_nja"
 
-#: src/compose.c:4205
+#: src/compose.c:4214
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/_Sporočilo/_Enkripcija"
 
-#: src/compose.c:4243 src/compose.c:5317
+#: src/compose.c:4252 src/compose.c:5326
 msgid "MIME type"
 msgstr "Tip MIME"
 
 #. S_COL_DATE
-#: src/compose.c:4252 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4740
+#: src/compose.c:4261 src/mimeview.c:197 src/prefs_filter_edit.c:496
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4897
 msgid "Size"
 msgstr "Velikost"
 
-#: src/compose.c:4683 src/mainwindow.c:2324 src/prefs_account_dialog.c:528
+#: src/compose.c:4692 src/mainwindow.c:2335 src/prefs_account_dialog.c:528
 #: src/prefs_common_dialog.c:661
 msgid "Send"
 msgstr "Pošlji"
 
-#: src/compose.c:4684
+#: src/compose.c:4693
 msgid "Send message"
 msgstr "Pošlji sporočilo"
 
-#: src/compose.c:4692
+#: src/compose.c:4701
 msgid "Send later"
 msgstr "Pošlji kasneje"
 
-#: src/compose.c:4693
+#: src/compose.c:4702
 msgid "Put into queue folder and send later"
 msgstr "Postavi v mapo Čakajoče in pošlji kasneje"
 
-#: src/compose.c:4701
+#: src/compose.c:4710
 msgid "Draft"
 msgstr "Osnutek"
 
-#: src/compose.c:4702
+#: src/compose.c:4711
 msgid "Save to draft folder"
 msgstr "Shrani v imenik Draft"
 
-#: src/compose.c:4712
+#: src/compose.c:4721
 msgid "Insert"
 msgstr "Vstavi"
 
-#: src/compose.c:4713
+#: src/compose.c:4722
 msgid "Insert file"
 msgstr "Vstavi datoteko"
 
-#: src/compose.c:4721
+#: src/compose.c:4730
 msgid "Attach"
 msgstr "Pripni"
 
-#: src/compose.c:4722
+#: src/compose.c:4731
 msgid "Attach file"
 msgstr "Pripni datoteko"
 
 #. signature
-#: src/compose.c:4732 src/prefs_account_dialog.c:1208
+#: src/compose.c:4741 src/prefs_account_dialog.c:1208
 #: src/prefs_common_dialog.c:953
 msgid "Signature"
 msgstr "Podpis"
 
-#: src/compose.c:4733
+#: src/compose.c:4742
 #, fuzzy
 msgid "Append signature"
 msgstr "SLAB podpis"
 
 #. editor
-#: src/compose.c:4742 src/prefs_common_dialog.c:991
+#: src/compose.c:4751 src/prefs_common_dialog.c:991
 #: src/prefs_common_dialog.c:2315
 msgid "Editor"
 msgstr "Urejevalnik"
 
-#: src/compose.c:4743
+#: src/compose.c:4752
 msgid "Edit with external editor"
 msgstr "Urejanje z zunanjim urejevalnikom"
 
-#: src/compose.c:4751
+#: src/compose.c:4760
 msgid "Linewrap"
 msgstr "Prelom vrstic"
 
-#: src/compose.c:4752
+#: src/compose.c:4761
 msgid "Wrap all long lines"
 msgstr "Prelomi vse dolge vrstice"
 
-#: src/compose.c:5213
+#: src/compose.c:5222
 msgid "Invalid MIME type."
 msgstr "Napačen tip MIME"
 
-#: src/compose.c:5231
+#: src/compose.c:5240
 msgid "File doesn't exist or is empty."
 msgstr "Datoteka ne obstaja ali pa je prazna."
 
-#: src/compose.c:5299
+#: src/compose.c:5308
 #, fuzzy
 msgid "Properties"
 msgstr "Lastnost"
 
-#: src/compose.c:5319 src/prefs_common_dialog.c:1444
+#: src/compose.c:5328 src/prefs_common_dialog.c:1444
 msgid "Encoding"
 msgstr "Nabor znakov"
 
-#: src/compose.c:5342 src/prefs_folder_item.c:202
+#: src/compose.c:5351 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Pot"
 
-#: src/compose.c:5343
+#: src/compose.c:5352
 msgid "File name"
 msgstr "Ime datoteke"
 
-#: src/compose.c:5436
+#: src/compose.c:5445
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Ukazna vrstica za zunanji urejevalnik je neveljavna: '%s'\n"
 
-#: src/compose.c:5482
+#: src/compose.c:5491
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1853,48 +1864,48 @@ msgstr ""
 "Ali naj ga prisilim k prekinitvi?\n"
 "Št. skupine procesov: %d"
 
-#: src/compose.c:5857 src/compose.c:5862 src/compose.c:5868
+#: src/compose.c:5866 src/compose.c:5871 src/compose.c:5877
 msgid "Can't queue the message."
 msgstr "Ne morem preložiti pošiljanja sporočila."
 
-#: src/compose.c:5959
+#: src/compose.c:5968
 #, fuzzy
 msgid "Select files"
 msgstr "Izberi datoteko"
 
-#: src/compose.c:5982
+#: src/compose.c:5991
 msgid "Select file"
 msgstr "Izberi datoteko"
 
-#: src/compose.c:6017
+#: src/compose.c:6026
 #, fuzzy
 msgid "Save message"
 msgstr "Pošlji sporočilo"
 
-#: src/compose.c:6018
+#: src/compose.c:6027
 #, 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:6020
+#: src/compose.c:6029
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:6062
+#: src/compose.c:6071
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Ali želite uporabiti predlogo `%s' ?"
 
-#: src/compose.c:6064
+#: src/compose.c:6073
 msgid "Apply template"
 msgstr "Uporabi predlogo"
 
-#: src/compose.c:6065
+#: src/compose.c:6074
 #, fuzzy
 msgid "_Replace"
 msgstr "Zamenjaj"
 
-#: src/compose.c:6065
+#: src/compose.c:6074
 #, fuzzy
 msgid "_Insert"
 msgstr "Vstavi"
@@ -2335,7 +2346,7 @@ msgstr "Novo"
 
 #. S_COL_MARK
 #: src/folderview.c:412 src/prefs_filter_edit.c:500
-#: src/prefs_summary_column.c:71 src/summaryview.c:509
+#: src/prefs_summary_column.c:71 src/summaryview.c:511
 msgid "Unread"
 msgstr "Neprebrano"
 
@@ -2351,12 +2362,12 @@ msgstr "Nastavljam informacije o mapi...\n"
 msgid "Setting folder info..."
 msgstr "Nastavljam informacije o mapi..."
 
-#: src/folderview.c:858 src/mainwindow.c:3464 src/setup.c:80
+#: src/folderview.c:858 src/mainwindow.c:3481 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Preiskujem mapo %s%c%s ..."
 
-#: src/folderview.c:862 src/mainwindow.c:3469 src/setup.c:85
+#: src/folderview.c:862 src/mainwindow.c:3486 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Preiskujem mapo %s ..."
@@ -2382,7 +2393,7 @@ msgstr "Ponovno gradim drevo map..."
 msgid "Checking for new messages in all folders..."
 msgstr "Preverjam nova sporočila v vseh mapah..."
 
-#: src/folderview.c:1200 src/mainwindow.c:2400 src/prefs_common_dialog.c:1789
+#: src/folderview.c:1200 src/mainwindow.c:2411 src/prefs_common_dialog.c:1789
 msgid "Junk"
 msgstr ""
 
@@ -2521,7 +2532,7 @@ msgstr "Zadeva:"
 msgid "Creating header view...\n"
 msgstr "Delam gledanje zaglavja...\n"
 
-#: src/headerview.c:180 src/query_search.c:637 src/summaryview.c:2110
+#: src/headerview.c:180 src/query_search.c:637 src/summaryview.c:2127
 msgid "(No From)"
 msgstr "(Brez pošiljatelja)"
 
@@ -2630,7 +2641,7 @@ msgstr "Uvozi datoteko LDIF v imenik naslovov"
 msgid "Prev"
 msgstr "Prejšnji"
 
-#: src/importldif.c:768 src/mainwindow.c:2420
+#: src/importldif.c:768 src/mainwindow.c:2431
 msgid "Next"
 msgstr "Naslednji"
 
@@ -2970,677 +2981,682 @@ msgstr ""
 msgid "another Sylpheed is already running.\n"
 msgstr "Sylpheed že teče.\n"
 
-#: src/main.c:1064
+#: src/main.c:1083
 #, fuzzy
 msgid "Migration of configuration"
 msgstr "Pišem nastavitve dejanj..\n"
 
-#: src/main.c:1065
+#: src/main.c:1084
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
 msgstr ""
 
-#: src/mainwindow.c:478
+#: src/mainwindow.c:481
 msgid "/_File/_Folder"
 msgstr "/_Datoteka/_Mapa"
 
-#: src/mainwindow.c:479
+#: src/mainwindow.c:482
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/_Datoteka/_Mapa/Naredi _novo mapo..."
 
-#: src/mainwindow.c:481
+#: src/mainwindow.c:484
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/_Datoteka/_Mapa/_Preimenuj mapo..."
 
-#: src/mainwindow.c:482
+#: src/mainwindow.c:485
 #, fuzzy
 msgid "/_File/_Folder/_Move folder..."
 msgstr "/_Datoteka/_Mapa/_Preimenuj mapo..."
 
-#: src/mainwindow.c:483
+#: src/mainwindow.c:486
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/_Datoteka/_Mapa/I_zbriši mapo"
 
-#: src/mainwindow.c:484
+#: src/mainwindow.c:487
 #, fuzzy
 msgid "/_File/_Mailbox"
 msgstr "/_Datoteka/_Dodaj poštni predal..."
 
-#: src/mainwindow.c:485
+#: src/mainwindow.c:488
 #, fuzzy
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/_Datoteka/_Dodaj poštni predal..."
 
-#: src/mainwindow.c:486
+#: src/mainwindow.c:489
 #, fuzzy
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/Odstrani poštni pre_dal"
 
-#: src/mainwindow.c:487 src/mainwindow.c:492
+#: src/mainwindow.c:490 src/mainwindow.c:495
 #, fuzzy
 msgid "/_File/_Mailbox/---"
 msgstr "/_Datoteka/_Mapa"
 
-#: src/mainwindow.c:488
+#: src/mainwindow.c:491
 #, fuzzy
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "/_Preveri nova sporočila"
 
-#: src/mainwindow.c:490
+#: src/mainwindow.c:493
 #, fuzzy
 msgid "/_File/_Mailbox/Check for new messages in _all mailboxes"
 msgstr "/Datoteka/_Preveri nova sporočila v vseh imenikih"
 
-#: src/mainwindow.c:493
+#: src/mainwindow.c:496
 #, fuzzy
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "/Ponovno z_gradi drevo map"
 
-#: src/mainwindow.c:496
+#: src/mainwindow.c:499
 msgid "/_File/_Import mbox file..."
 msgstr "/_Datoteka/_Uvozi datoteko mbox..."
 
-#: src/mainwindow.c:497
+#: src/mainwindow.c:500
 msgid "/_File/_Export to mbox file..."
 msgstr "/_Datoteka/_Izvozi v datoteko mbox..."
 
-#: src/mainwindow.c:499
+#: src/mainwindow.c:502
 #, fuzzy
 msgid "/_File/Empty all _trash"
 msgstr "/_Datoteka/Izprazni sme_tnjak"
 
-#: src/mainwindow.c:501 src/messageview.c:139
+#: src/mainwindow.c:504 src/messageview.c:139
 msgid "/_File/_Save as..."
 msgstr "/_Datoteka/_Shrani kot..."
 
-#: src/mainwindow.c:502 src/messageview.c:140
+#: src/mainwindow.c:505 src/messageview.c:140
 msgid "/_File/_Print..."
 msgstr "/_Datoteka/_Natisni..."
 
-#: src/mainwindow.c:504
+#: src/mainwindow.c:507
 #, fuzzy
 msgid "/_File/_Work offline"
 msgstr "/Datoteka/Vr_ini datoteko"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:507
+#: src/mainwindow.c:510
 msgid "/_File/E_xit"
 msgstr "/_Datoteka/_Končaj"
 
-#: src/mainwindow.c:512
+#: src/mainwindow.c:515
 msgid "/_Edit/Select _thread"
 msgstr "/_Uredi/Izberi _nit"
 
-#: src/mainwindow.c:514 src/messageview.c:148
+#: src/mainwindow.c:517 src/messageview.c:148
 msgid "/_Edit/_Find in current message..."
 msgstr "/_Urejanje/_Iskanje v trenutnem sporočilu..."
 
-#: src/mainwindow.c:516
+#: src/mainwindow.c:519
 msgid "/_Edit/_Search messages..."
 msgstr "/_Urejanje/Iskanje _sporočil"
 
-#: src/mainwindow.c:519
+#: src/mainwindow.c:522
 msgid "/_View/Show or hi_de"
 msgstr "/_Pogled/Pri_kaži ali skrij"
 
-#: src/mainwindow.c:520
+#: src/mainwindow.c:523
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/_Pogled/Pri_kaži ali skrij/_Drevo map"
 
-#: src/mainwindow.c:522
+#: src/mainwindow.c:525
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/_Pogled/Pri_kaži ali skrij/_Ogled sporočila"
 
-#: src/mainwindow.c:524
+#: src/mainwindow.c:527
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/_Pogled/Pri_kaži ali skrij/O_rodjarna"
 
-#: src/mainwindow.c:526
+#: src/mainwindow.c:529
 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:528
+#: src/mainwindow.c:531
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/_Pogled/Pri_kaži ali skrij/O_rodjarna/_Ikone"
 
-#: src/mainwindow.c:530
+#: src/mainwindow.c:533
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/_Pogled/Pri_kaži ali skrij/O_rodjarna/_Besedilo"
 
-#: src/mainwindow.c:532
+#: src/mainwindow.c:535
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/_Pogled/Pri_kaži ali skrij/_Orodjarna/_Nič"
 
-#: src/mainwindow.c:534
+#: src/mainwindow.c:537
 #, fuzzy
 msgid "/_View/Show or hi_de/_Search bar"
 msgstr "/_Pogled/Pri_kaži ali skrij/_Statusna vrstica"
 
-#: src/mainwindow.c:536
+#: src/mainwindow.c:539
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/_Pogled/Pri_kaži ali skrij/_Statusna vrstica"
 
-#: src/mainwindow.c:539
+#: src/mainwindow.c:542
 msgid "/_View/Separate f_older tree"
 msgstr "_Pogled/Posebno drev_o map"
 
-#: src/mainwindow.c:540
+#: src/mainwindow.c:543
 #, fuzzy
 msgid "/_View/Separate _message view"
 msgstr "/_Pogled/Poseben ogled _sporočila"
 
-#: src/mainwindow.c:542
+#: src/mainwindow.c:545
 msgid "/_View/_Sort"
 msgstr "/_Pogled/_Razvrščanje"
 
-#: src/mainwindow.c:543
+#: src/mainwindow.c:546
 msgid "/_View/_Sort/by _number"
 msgstr "/_Pogled/_Razvrščanje/po š_tevilu"
 
-#: src/mainwindow.c:544
+#: src/mainwindow.c:547
 msgid "/_View/_Sort/by s_ize"
 msgstr "/_Pogled/_Razvrščanje/po _velikosti"
 
-#: src/mainwindow.c:545
+#: src/mainwindow.c:548
 msgid "/_View/_Sort/by _date"
 msgstr "/_Pogled/_Razvrščanje/po _datumu"
 
-#: src/mainwindow.c:546
+#: src/mainwindow.c:549
 #, fuzzy
 msgid "/_View/_Sort/by t_hread date"
 msgstr "/_Pogled/_Razvrščanje/po _datumu"
 
-#: src/mainwindow.c:547
+#: src/mainwindow.c:550
 msgid "/_View/_Sort/by _from"
 msgstr "/_Pogled/_Razvrščanje/po _pošiljatelju"
 
-#: src/mainwindow.c:548
+#: src/mainwindow.c:551
 msgid "/_View/_Sort/by _recipient"
 msgstr "/_Pogled/_Razvrščanje/po naslovnik_u"
 
-#: src/mainwindow.c:549
+#: src/mainwindow.c:552
 msgid "/_View/_Sort/by _subject"
 msgstr "/_Pogled/_Razvrščanje/po _zadevi"
 
-#: src/mainwindow.c:550
+#: src/mainwindow.c:553
 msgid "/_View/_Sort/by _color label"
 msgstr "/_Pogled/_Razvrščanje/po _barvi oznak"
 
-#: src/mainwindow.c:552
+#: src/mainwindow.c:555
 msgid "/_View/_Sort/by _mark"
 msgstr "/_Pogled/_Razvrščanje/po _oznaki"
 
-#: src/mainwindow.c:553
+#: src/mainwindow.c:556
 msgid "/_View/_Sort/by _unread"
 msgstr "/_Pogled/_Razvrščanje/po _neprebranih"
 
-#: src/mainwindow.c:554
+#: src/mainwindow.c:557
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/_Pogled/_Razvrščanje/po pri_logi"
 
-#: src/mainwindow.c:556
+#: src/mainwindow.c:559
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/_Pogled/_Razvrščanje/Ne raz_vrsti"
 
-#: src/mainwindow.c:557 src/mainwindow.c:560
+#: src/mainwindow.c:560 src/mainwindow.c:563
 msgid "/_View/_Sort/---"
 msgstr "/_Pogled/_Razvrščanje/---"
 
-#: src/mainwindow.c:558
+#: src/mainwindow.c:561
 msgid "/_View/_Sort/Ascending"
 msgstr "/_Pogled/_Razvrščanje/N_araščajoče"
 
-#: src/mainwindow.c:559
+#: src/mainwindow.c:562
 msgid "/_View/_Sort/Descending"
 msgstr "/_Pogled/_Razvrščanje/Pa_dajoče"
 
-#: src/mainwindow.c:561
+#: src/mainwindow.c:564
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/_Pogled/_Razvrščanje/Pri_vlači po zadevi"
 
-#: src/mainwindow.c:563
+#: src/mainwindow.c:566
 msgid "/_View/Th_read view"
 msgstr "/_Pogled/Ogled _niti"
 
-#: src/mainwindow.c:564
+#: src/mainwindow.c:567
 msgid "/_View/E_xpand all threads"
 msgstr "/_Pogled/Razširi _vse niti"
 
-#: src/mainwindow.c:565
+#: src/mainwindow.c:568
 msgid "/_View/Co_llapse all threads"
 msgstr "/_Pogled/Skrči vse _niti"
 
-#: src/mainwindow.c:566
+#: src/mainwindow.c:569
 msgid "/_View/Set display _item..."
 msgstr "/_Pogled/Nastavi kos za _prikaz..."
 
-#: src/mainwindow.c:569
+#: src/mainwindow.c:572
 msgid "/_View/_Go to"
 msgstr "/_Pogled/_Pojdi na"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:573
 msgid "/_View/_Go to/_Prev message"
 msgstr "/_Pogled/_Pojdi na/_Prejšnje sporočilo"
 
-#: src/mainwindow.c:571
+#: src/mainwindow.c:574
 msgid "/_View/_Go to/_Next message"
 msgstr "/_Pogled/_Pojdi na/_Naslednje sporočilo"
 
-#: src/mainwindow.c:572 src/mainwindow.c:577 src/mainwindow.c:580
-#: src/mainwindow.c:585 src/mainwindow.c:590
+#: src/mainwindow.c:575 src/mainwindow.c:580 src/mainwindow.c:583
+#: src/mainwindow.c:588 src/mainwindow.c:593
 msgid "/_View/_Go to/---"
 msgstr "/_Pogled/_Pojdi na/---"
 
-#: src/mainwindow.c:573
+#: src/mainwindow.c:576
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/_Pogled/_Pojdi na/Pre_jšnje neprebrano sporočilo"
 
-#: src/mainwindow.c:575
+#: src/mainwindow.c:578
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/_Pogled/_Pojdi na/Nas_lednje neprebrano sporočilo"
 
-#: src/mainwindow.c:578
+#: src/mainwindow.c:581
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/_Pogled/_Pojdi na/Prejšnje no_vo sporočilo"
 
-#: src/mainwindow.c:579
+#: src/mainwindow.c:582
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/_Pogled/_Pojdi na/Nasled_nje novo sporočilo"
 
-#: src/mainwindow.c:581
+#: src/mainwindow.c:584
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/_Pogled/_Pojdi na/Prejšnje _označeno sporočilo"
 
-#: src/mainwindow.c:583
+#: src/mainwindow.c:586
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/_Pogled/_Pojdi na/Naslednje o_značeno sporočilo"
 
-#: src/mainwindow.c:586
+#: src/mainwindow.c:589
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/_Pogled/_Pojdi na/Prejšnje sporočilo z ozna_ko"
 
-#: src/mainwindow.c:588
+#: src/mainwindow.c:591
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/_Pogled/_Pojdi na/Naslednje sporočilo z oznako"
 
-#: src/mainwindow.c:591
+#: src/mainwindow.c:594
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Pogled/_Pojdi na/_Druga mapa"
 
-#: src/mainwindow.c:600 src/messageview.c:159
+#: src/mainwindow.c:603 src/messageview.c:159
 #, fuzzy
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Pogled/Nabor zna_kov/_Samodejno"
 
-#: src/mainwindow.c:613 src/messageview.c:172
+#: src/mainwindow.c:616 src/messageview.c:172
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr "_Pogled/Nabor zna_kov/Zahodnoevropski (ISO-8859-15)"
 
-#: src/mainwindow.c:653 src/messageview.c:205
+#: src/mainwindow.c:662 src/messageview.c:210
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Pogled/Nabor zna_kov/Japonski (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:655 src/messageview.c:207
+#: src/mainwindow.c:664 src/messageview.c:212
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Pogled/Nabor zna_kov/Japonski (_EUC-JP)"
 
-#: src/mainwindow.c:657 src/messageview.c:209
+#: src/mainwindow.c:666 src/messageview.c:214
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Pogled/Nabor zna_kov/Japonski (_Shift__JIS)"
 
-#: src/mainwindow.c:667 src/messageview.c:218
+#: src/mainwindow.c:676 src/messageview.c:223
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Pogled/Nabor zna_kov/Tradicionalna kitajščina (EUC-_TW)"
 
-#: src/mainwindow.c:669 src/messageview.c:220
+#: src/mainwindow.c:678 src/messageview.c:225
 #, fuzzy
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Pogled/Nabor zna_kov/Kitajski (ISO-2022-_CN)"
 
-#: src/mainwindow.c:675 src/messageview.c:225
+#: src/mainwindow.c:684 src/messageview.c:230
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Pogled/Kodni nabor/Korejski (ISO-2022-KR)"
 
-#: src/mainwindow.c:688 src/summaryview.c:449
+#: src/mainwindow.c:697 src/summaryview.c:451
 msgid "/_View/Open in new _window"
 msgstr "/_Poglej/Odpri v _novem oknu"
 
-#: src/mainwindow.c:689 src/messageview.c:237
+#: src/mainwindow.c:698 src/messageview.c:242
 msgid "/_View/Mess_age source"
 msgstr "/_Pogled/I_zvirnik sporočila"
 
-#: src/mainwindow.c:690 src/messageview.c:238
+#: src/mainwindow.c:699 src/messageview.c:243
 msgid "/_View/Show all _header"
 msgstr "/_Pogled/Pokaži vsa _zaglavja"
 
-#: src/mainwindow.c:692
+#: src/mainwindow.c:701
 msgid "/_View/_Update summary"
 msgstr "/_Pogled/_Posodobi povzetek"
 
-#: src/mainwindow.c:694 src/messageview.c:240
+#: src/mainwindow.c:703 src/messageview.c:245
 msgid "/_Message"
 msgstr "/_Sporočilo"
 
-#: src/mainwindow.c:695
+#: src/mainwindow.c:704
 #, fuzzy
 msgid "/_Message/Recei_ve"
 msgstr "/_Sporočilo/Znova ur_edi"
 
-#: src/mainwindow.c:696
+#: src/mainwindow.c:705
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "_Sporočilo/Poberi z vseh _računov"
 
-#: src/mainwindow.c:698
+#: src/mainwindow.c:707
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "_Sporočilo/Poberi z vseh _računov"
 
-#: src/mainwindow.c:700
+#: src/mainwindow.c:709
 #, fuzzy
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/_Sporočilo/Odpoved sprejeman_ja"
 
-#: src/mainwindow.c:702
+#: src/mainwindow.c:711
 #, fuzzy
 msgid "/_Message/Recei_ve/---"
 msgstr "/_Sporočilo/Znova ur_edi"
 
-#: src/mainwindow.c:703
+#: src/mainwindow.c:712
 msgid "/_Message/_Send queued messages"
 msgstr "/_Sporočilo/Pošlji čakajoča sporoč_ila"
 
-#: src/mainwindow.c:704 src/mainwindow.c:706 src/mainwindow.c:713
-#: src/mainwindow.c:718 src/mainwindow.c:721 src/mainwindow.c:730
-#: src/mainwindow.c:732 src/mainwindow.c:735 src/messageview.c:243
-#: src/messageview.c:251 src/messageview.c:256
+#: src/mainwindow.c:713 src/mainwindow.c:715 src/mainwindow.c:722
+#: src/mainwindow.c:727 src/mainwindow.c:730 src/mainwindow.c:741
+#: src/mainwindow.c:743 src/mainwindow.c:746 src/messageview.c:248
+#: src/messageview.c:256 src/messageview.c:261
 msgid "/_Message/---"
 msgstr "/_Sporočilo/---"
 
-#: src/mainwindow.c:705 src/messageview.c:241
+#: src/mainwindow.c:714 src/messageview.c:246
 msgid "/_Message/Compose _new message"
 msgstr "/_Sporočilo/_Novo sporočilo"
 
-#: src/mainwindow.c:707 src/messageview.c:244
+#: src/mainwindow.c:716 src/messageview.c:249
 msgid "/_Message/_Reply"
 msgstr "/_Sporočilo/_Odgovori"
 
-#: src/mainwindow.c:708
+#: src/mainwindow.c:717
 msgid "/_Message/Repl_y to"
 msgstr "/_Sporočilo/Odgovor _na"
 
-#: src/mainwindow.c:709 src/messageview.c:245
+#: src/mainwindow.c:718 src/messageview.c:250
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Sporočilo/Odgovor _na/_vsem"
 
-#: src/mainwindow.c:710 src/messageview.c:247
+#: src/mainwindow.c:719 src/messageview.c:252
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Sporočilo/Odgovori _na/_pošiljatelju"
 
-#: src/mainwindow.c:711 src/messageview.c:249
+#: src/mainwindow.c:720 src/messageview.c:254
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Sporočilo/Odgovor _na/_dopisni seznam"
 
-#: src/mainwindow.c:714 src/messageview.c:252
+#: src/mainwindow.c:723 src/messageview.c:257
 msgid "/_Message/_Forward"
 msgstr "/Sporočilo/_Posreduj"
 
-#: src/mainwindow.c:715 src/messageview.c:253
+#: src/mainwindow.c:724 src/messageview.c:258
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Sporočilo/Posreduj kot prilo_go"
 
-#: src/mainwindow.c:717 src/messageview.c:255
+#: src/mainwindow.c:726 src/messageview.c:260
 msgid "/_Message/Redirec_t"
 msgstr "/_Sporočilo/Pre_usmeri"
 
-#: src/mainwindow.c:719
+#: src/mainwindow.c:728
 msgid "/_Message/M_ove..."
 msgstr "/_Sporočilo/Pres_tavi..."
 
-#: src/mainwindow.c:720
+#: src/mainwindow.c:729
 msgid "/_Message/_Copy..."
 msgstr "/_Sporočilo/_Kopiraj..."
 
-#: src/mainwindow.c:722
+#: src/mainwindow.c:731
 msgid "/_Message/_Mark"
 msgstr "/_Sporočilo/O_znači"
 
-#: src/mainwindow.c:723
+#: src/mainwindow.c:732
 msgid "/_Message/_Mark/_Mark"
 msgstr "/_Sporočilo/O_znači/_Označi"
 
-#: src/mainwindow.c:724
+#: src/mainwindow.c:733
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/_Sporočilo/O_znači/O_dznači"
 
-#: src/mainwindow.c:725
+#: src/mainwindow.c:734
 msgid "/_Message/_Mark/---"
 msgstr "/_Sporočilo/O_znači/---"
 
-#: src/mainwindow.c:726
+#: src/mainwindow.c:735
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/_Sporočilo/O_znači/Označi kot _neprebrano"
 
-#: src/mainwindow.c:727
+#: src/mainwindow.c:736
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/_Sporočilo/O_znači/Označi kot _prebrano"
 
-#: src/mainwindow.c:729
+#: src/mainwindow.c:738
+#, fuzzy
+msgid "/_Message/_Mark/Mark _thread as read"
+msgstr "/_Sporočilo/O_znači/Označi kot _prebrano"
+
+#: src/mainwindow.c:740
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/_Sporočilo/O_znači/Označi _vsa kot prebrana"
 
-#: src/mainwindow.c:731
+#: src/mainwindow.c:742
 msgid "/_Message/_Delete"
 msgstr "/_Sporočilo/Z_briši"
 
-#: src/mainwindow.c:733
+#: src/mainwindow.c:744
 #, fuzzy
 msgid "/_Message/Set as _junk mail"
 msgstr "/_Sporočilo/_Poberi novo pošto"
 
-#: src/mainwindow.c:734
+#: src/mainwindow.c:745
 #, fuzzy
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/_Sporočilo/_Poberi novo pošto"
 
-#: src/mainwindow.c:736 src/messageview.c:257
+#: src/mainwindow.c:747 src/messageview.c:262
 msgid "/_Message/Re-_edit"
 msgstr "/_Sporočilo/Znova ur_edi"
 
-#: src/mainwindow.c:740
+#: src/mainwindow.c:751
 #, fuzzy
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/_Orodja/Doda_j pošiljatelja v adresar"
 
-#: src/mainwindow.c:743
+#: src/mainwindow.c:754
 #, fuzzy
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/_Orodja/_Filtriraj sporočila"
 
-#: src/mainwindow.c:745
+#: src/mainwindow.c:756
 #, fuzzy
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Orodja/_Filtriraj sporočila"
 
-#: src/mainwindow.c:747 src/messageview.c:264
+#: src/mainwindow.c:758 src/messageview.c:269
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Orodja/_Ustvari pravilo za filtriranje"
 
-#: src/mainwindow.c:748 src/messageview.c:266
+#: src/mainwindow.c:759 src/messageview.c:271
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Orodja/_Ustvari pravilo za filtriranje/S_amodejno"
 
-#: src/mainwindow.c:750 src/messageview.c:268
+#: src/mainwindow.c:761 src/messageview.c:273
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Orodja/_Ustvari pravilo za filtriranje/po p_ošiljatelju"
 
-#: src/mainwindow.c:752 src/messageview.c:270
+#: src/mainwindow.c:763 src/messageview.c:275
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Orodja/_Ustvari pravilo za filtriranje/po _naslovniku"
 
-#: src/mainwindow.c:754 src/messageview.c:272
+#: src/mainwindow.c:765 src/messageview.c:277
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Orodja/_Ustvari pravilo za filtriranje/po _zadevi"
 
-#: src/mainwindow.c:757
+#: src/mainwindow.c:768
 #, fuzzy
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/_Orodja/_Filtriraj sporočila"
 
-#: src/mainwindow.c:759
+#: src/mainwindow.c:770
 #, fuzzy
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/_Orodja/_Filtriraj sporočila"
 
-#: src/mainwindow.c:764
+#: src/mainwindow.c:775
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/_Orodja/_Briši podvojena sporočila"
 
-#: src/mainwindow.c:767
+#: src/mainwindow.c:778
 msgid "/_Tools/E_xecute"
 msgstr "/_Orodja/_Izvrši"
 
-#: src/mainwindow.c:769
+#: src/mainwindow.c:780
 msgid "/_Tools/_Log window"
 msgstr "/_Orodja/_Dnevniško okno"
 
-#: src/mainwindow.c:771
+#: src/mainwindow.c:782
 msgid "/_Configuration"
 msgstr "/_Prikrojitev"
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:783
 msgid "/_Configuration/_Common preferences..."
 msgstr "/_Prikrojitev/_Splošne nastavitve..."
 
-#: src/mainwindow.c:774
+#: src/mainwindow.c:785
 msgid "/_Configuration/_Filter setting..."
 msgstr "/_Prikrojitev/_Nastavitve _filtra..."
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:787
 msgid "/_Configuration/_Template..."
 msgstr "/_Prikrojitev/_Predloga..."
 
-#: src/mainwindow.c:777
+#: src/mainwindow.c:788
 msgid "/_Configuration/_Actions..."
 msgstr "/_Prikrojitev/_Dejanja..."
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:789
 msgid "/_Configuration/---"
 msgstr "/_Prikrojitev/---"
 
-#: src/mainwindow.c:779
+#: src/mainwindow.c:790
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Prikrojitev/_Nastavitve za trenutni _račun..."
 
-#: src/mainwindow.c:781
+#: src/mainwindow.c:792
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Prikrojitev/Naredi _nov račun..."
 
-#: src/mainwindow.c:783
+#: src/mainwindow.c:794
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Prikrojitev/_Uredi račune..."
 
-#: src/mainwindow.c:785
+#: src/mainwindow.c:796
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Prikrojitev/Spremeni _trenutni račun"
 
-#: src/mainwindow.c:789
+#: src/mainwindow.c:800
 msgid "/_Help/_Manual"
 msgstr "/_Pomoč/_Priročnik"
 
-#: src/mainwindow.c:790
+#: src/mainwindow.c:801
 msgid "/_Help/_Manual/_English"
 msgstr "/_Pomoč/_Priročnik/_Angleščina"
 
-#: src/mainwindow.c:791
+#: src/mainwindow.c:802
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/_Pomoč/_Priročnik/_Japonščina"
 
-#: src/mainwindow.c:792
+#: src/mainwindow.c:803
 msgid "/_Help/_FAQ"
 msgstr "/_Pomoč/Pogosto _zastavljena vprašanja"
 
-#: src/mainwindow.c:793
+#: src/mainwindow.c:804
 msgid "/_Help/_FAQ/_English"
 msgstr "/_Pomoč/Pogosto _zastavljena vprašanja/_Angleščina"
 
-#: src/mainwindow.c:794
+#: src/mainwindow.c:805
 msgid "/_Help/_FAQ/_German"
 msgstr "/_Pomoč/Pogosto _zastavljena vprašanja/_Nemščina"
 
-#: src/mainwindow.c:795
+#: src/mainwindow.c:806
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/_Pomoč/Pogosto _zastavljena vprašanja/Š_panščina"
 
-#: src/mainwindow.c:796
+#: src/mainwindow.c:807
 msgid "/_Help/_FAQ/_French"
 msgstr "/_Pomoč/Pogosto _zastavljena vprašanja/_Francoščina"
 
-#: src/mainwindow.c:797
+#: src/mainwindow.c:808
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/_Pomoč/Pogosto _zastavljena vprašanja/_Italijanščina"
 
-#: src/mainwindow.c:798
+#: src/mainwindow.c:809
 msgid "/_Help/---"
 msgstr "/_Pomoč/---"
 
-#: src/mainwindow.c:841
+#: src/mainwindow.c:852
 msgid "Creating main window...\n"
 msgstr "Ustvarjam glavno okno...\n"
 
-#: src/mainwindow.c:1011
+#: src/mainwindow.c:1022
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "GlavnoOkno: alokacija barve %d ni uspela\n"
 
-#: src/mainwindow.c:1108 src/summaryview.c:2258 src/summaryview.c:2343
-#: src/summaryview.c:3739 src/summaryview.c:3868 src/summaryview.c:4226
+#: src/mainwindow.c:1119 src/summaryview.c:2275 src/summaryview.c:2360
+#: src/summaryview.c:3896 src/summaryview.c:4025 src/summaryview.c:4383
 msgid "done.\n"
 msgstr "opravljeno.\n"
 
-#: src/mainwindow.c:1235 src/mainwindow.c:1276 src/mainwindow.c:1301
+#: src/mainwindow.c:1246 src/mainwindow.c:1287 src/mainwindow.c:1312
 msgid "Untitled"
 msgstr "Brez naslova"
 
-#: src/mainwindow.c:1302
+#: src/mainwindow.c:1313
 msgid "none"
 msgstr "nič"
 
-#: src/mainwindow.c:1355
+#: src/mainwindow.c:1366
 #, 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:1605
+#: src/mainwindow.c:1616
 msgid "Offline"
 msgstr ""
 
-#: src/mainwindow.c:1606
+#: src/mainwindow.c:1617
 msgid "You are offline. Go online?"
 msgstr ""
 
-#: src/mainwindow.c:1623
+#: src/mainwindow.c:1634
 #, fuzzy
 msgid "Empty all trash"
 msgstr "Izprazni smetnjak"
 
-#: src/mainwindow.c:1624
+#: src/mainwindow.c:1635
 #, fuzzy
 msgid "Delete all messages in trash folders?"
 msgstr "Izbrišem vsa sporočila v smetnjaku?"
 
-#: src/mainwindow.c:1652
+#: src/mainwindow.c:1663
 msgid "Add mailbox"
 msgstr "Dodaj poštni predal"
 
-#: src/mainwindow.c:1653
+#: src/mainwindow.c:1664
 #, fuzzy
 msgid ""
 "Specify the location of mailbox.\n"
@@ -3651,16 +3667,16 @@ msgstr ""
 "Če je določen obstoječi poštni predal,\n"
 "bo pregledan samodejno."
 
-#: src/mainwindow.c:1659 src/setup.c:49
+#: src/mainwindow.c:1670 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Poštni predal `%s' že obstaja."
 
-#: src/mainwindow.c:1664 src/setup.c:56
+#: src/mainwindow.c:1675 src/setup.c:56
 msgid "Mailbox"
 msgstr "Poštni predal"
 
-#: src/mainwindow.c:1670 src/setup.c:62
+#: src/mainwindow.c:1681 src/setup.c:62
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3669,149 +3685,149 @@ msgstr ""
 "Izdelava poštnega predala ni uspela.\n"
 "Morda obstajajo nekatere datoteke ali pa tam nimate dovoljenja za pisanje."
 
-#: src/mainwindow.c:2088
+#: src/mainwindow.c:2099
 msgid "Sylpheed - Folder View"
 msgstr "Syčpheed - ogled mape"
 
-#: src/mainwindow.c:2107
+#: src/mainwindow.c:2118
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - ogled sporočila"
 
-#: src/mainwindow.c:2259 src/summaryview.c:408
+#: src/mainwindow.c:2270 src/summaryview.c:408
 msgid "/_Reply"
 msgstr "/O_dgovori"
 
-#: src/mainwindow.c:2260
+#: src/mainwindow.c:2271
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "Odgovori vsem"
 
-#: src/mainwindow.c:2261
+#: src/mainwindow.c:2272
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/Odgovor _za/_pošiljatelja"
 
-#: src/mainwindow.c:2262
+#: src/mainwindow.c:2273
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/Odgovor _za/_dopisni seznam"
 
-#: src/mainwindow.c:2267 src/summaryview.c:415
+#: src/mainwindow.c:2278 src/summaryview.c:415
 msgid "/_Forward"
 msgstr "/P_osreduj"
 
-#: src/mainwindow.c:2268 src/summaryview.c:416
+#: src/mainwindow.c:2279 src/summaryview.c:416
 msgid "/For_ward as attachment"
 msgstr "/Posreduj kot prilo_go"
 
-#: src/mainwindow.c:2269 src/summaryview.c:417
+#: src/mainwindow.c:2280 src/summaryview.c:417
 msgid "/Redirec_t"
 msgstr "/Pre_usmeri"
 
-#: src/mainwindow.c:2305
+#: src/mainwindow.c:2316
 msgid "Get"
 msgstr "Poberi"
 
-#: src/mainwindow.c:2306
+#: src/mainwindow.c:2317
 msgid "Incorporate new mail"
 msgstr "Pripoji novo pošto"
 
-#: src/mainwindow.c:2313
+#: src/mainwindow.c:2324
 msgid "Get all"
 msgstr "Poberi vsa"
 
-#: src/mainwindow.c:2314
+#: src/mainwindow.c:2325
 msgid "Incorporate new mail of all accounts"
 msgstr "Pripoji novo pošto z vseh računov"
 
-#: src/mainwindow.c:2325
+#: src/mainwindow.c:2336
 msgid "Send queued message(s)"
 msgstr "Pošlji čakajoča sporočila"
 
-#: src/mainwindow.c:2335 src/prefs_account_dialog.c:530
+#: src/mainwindow.c:2346 src/prefs_account_dialog.c:530
 #: src/prefs_common_dialog.c:663 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "Sestavi"
 
-#: src/mainwindow.c:2336
+#: src/mainwindow.c:2347
 msgid "Compose new message"
 msgstr "Sestavi novo sporočilo"
 
-#: src/mainwindow.c:2344 src/prefs_common_dialog.c:975
+#: src/mainwindow.c:2355 src/prefs_common_dialog.c:975
 msgid "Reply"
 msgstr "Odgovori"
 
-#: src/mainwindow.c:2345 src/mainwindow.c:2358
+#: src/mainwindow.c:2356 src/mainwindow.c:2369
 msgid "Reply to the message"
 msgstr "Odgovori na sporočilo"
 
-#: src/mainwindow.c:2362
+#: src/mainwindow.c:2373
 msgid "Reply all"
 msgstr "Odgovori vsem"
 
-#: src/mainwindow.c:2363
+#: src/mainwindow.c:2374
 msgid "Reply to all"
 msgstr "Odgovori vsem"
 
-#: src/mainwindow.c:2371 src/prefs_filter_edit.c:672
+#: src/mainwindow.c:2382 src/prefs_filter_edit.c:672
 msgid "Forward"
 msgstr "Posreduj"
 
-#: src/mainwindow.c:2372 src/mainwindow.c:2385
+#: src/mainwindow.c:2383 src/mainwindow.c:2396
 msgid "Forward the message"
 msgstr "Posreduj sporočilo"
 
-#: src/mainwindow.c:2392
+#: src/mainwindow.c:2403
 msgid "Delete the message"
 msgstr "Izbriši sporočilo"
 
-#: src/mainwindow.c:2401
+#: src/mainwindow.c:2412
 #, fuzzy
 msgid "Set as junk mail"
 msgstr "Nastavi kot privzeto"
 
-#: src/mainwindow.c:2410
+#: src/mainwindow.c:2421
 msgid "Execute"
 msgstr "Izvedi"
 
-#: src/mainwindow.c:2411
+#: src/mainwindow.c:2422
 msgid "Execute marked process"
 msgstr "Izvedi označen proces"
 
-#: src/mainwindow.c:2421
+#: src/mainwindow.c:2432
 msgid "Next unread message"
 msgstr "Naslednje neprebrano sporočilo"
 
-#: src/mainwindow.c:2433
+#: src/mainwindow.c:2444
 msgid "Prefs"
 msgstr "Nastavitve"
 
-#: src/mainwindow.c:2434
+#: src/mainwindow.c:2445
 msgid "Common preferences"
 msgstr "Splošne preference"
 
-#: src/mainwindow.c:2442 src/prefs_folder_item.c:289
+#: src/mainwindow.c:2453 src/prefs_folder_item.c:289
 #: src/prefs_folder_item.c:300 src/progressdialog.c:128
 msgid "Account"
 msgstr "Račun"
 
-#: src/mainwindow.c:2443
+#: src/mainwindow.c:2454
 msgid "Account setting"
 msgstr "Nastavitev računa"
 
-#: src/mainwindow.c:2615
+#: src/mainwindow.c:2626
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 
-#: src/mainwindow.c:2626
+#: src/mainwindow.c:2637
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 
-#: src/mainwindow.c:2892
+#: src/mainwindow.c:2903
 msgid "Exit"
 msgstr "Končaj"
 
-#: src/mainwindow.c:2892
+#: src/mainwindow.c:2903
 msgid "Exit this program?"
 msgstr "Ali naj končam ta program?"
 
@@ -3848,45 +3864,45 @@ msgstr "Dosežen je konec sporočila. Naj nadaljujem z začetka?"
 msgid "Search finished"
 msgstr "Iskanje končano"
 
-#: src/messageview.c:261
+#: src/messageview.c:266
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/_Orodja/Doda_j pošiljatelja v adresar"
 
-#: src/messageview.c:291
+#: src/messageview.c:296
 msgid "Creating message view...\n"
 msgstr "Ustvarjam videz sporočila...\n"
 
-#: src/messageview.c:316
+#: src/messageview.c:321
 msgid "Text"
 msgstr "Besedilo"
 
-#: src/messageview.c:321
+#: src/messageview.c:326
 msgid "Attachments"
 msgstr "Priloge"
 
-#: src/messageview.c:371
+#: src/messageview.c:376
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:669 src/summaryview.c:3268
+#: src/messageview.c:674 src/summaryview.c:3425
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Ne morem odstraniti datoteke `%s'."
 
-#: src/messageview.c:728 src/summaryview.c:3291
+#: src/messageview.c:733 src/summaryview.c:3448
 msgid "The message will be printed with the following command:"
 msgstr ""
 
-#: src/messageview.c:729 src/summaryview.c:3292
+#: src/messageview.c:734 src/summaryview.c:3449
 #, fuzzy
 msgid "(Default print command)"
 msgstr "Izvedi"
 
-#: src/messageview.c:731 src/prefs_common_dialog.c:2304 src/summaryview.c:3294
+#: src/messageview.c:736 src/prefs_common_dialog.c:2304 src/summaryview.c:3451
 msgid "Print"
 msgstr "Tiskanje"
 
-#: src/messageview.c:740 src/summaryview.c:3303
+#: src/messageview.c:745 src/summaryview.c:3460
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -4791,8 +4807,8 @@ msgstr "Prikaži naslovnika v stolpcu `Od', če ste pošiljatelj vi"
 msgid "Expand threads"
 msgstr "Razširi niti"
 
-#: src/prefs_common_dialog.c:1413 src/prefs_common_dialog.c:2713
-#: src/prefs_common_dialog.c:2751
+#: src/prefs_common_dialog.c:1413 src/prefs_common_dialog.c:2716
+#: src/prefs_common_dialog.c:2754
 msgid "Date format"
 msgstr "Oblika datuma"
 
@@ -5094,8 +5110,8 @@ msgstr "Zunanji ukazi (%s bo zamenjan z imenom datoteke / URI)"
 msgid "Web browser"
 msgstr "Spletni brskalnik"
 
-#: src/prefs_common_dialog.c:2288 src/prefs_common_dialog.c:3775
-#: src/prefs_common_dialog.c:3796
+#: src/prefs_common_dialog.c:2288 src/prefs_common_dialog.c:3778
+#: src/prefs_common_dialog.c:3799
 #, fuzzy
 msgid "(Default browser)"
 msgstr "Privzeta mapa za prejeto pošto"
@@ -5171,216 +5187,226 @@ msgstr "Grški (ISO-8859-7)"
 
 #: src/prefs_common_dialog.c:2495
 #, fuzzy
+msgid "Arabic (ISO-8859-6)"
+msgstr "Baltski (ISO-8859-4)"
+
+#: src/prefs_common_dialog.c:2496
+#, fuzzy
+msgid "Arabic (Windows-1256)"
+msgstr "Cirilica (Windows-1251)"
+
+#: src/prefs_common_dialog.c:2498
+#, fuzzy
 msgid "Hebrew (ISO-8859-8)"
 msgstr "Grški (ISO-8859-7)"
 
-#: src/prefs_common_dialog.c:2496
+#: src/prefs_common_dialog.c:2499
 #, fuzzy
 msgid "Hebrew (Windows-1255)"
 msgstr "Cirilica (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2498
+#: src/prefs_common_dialog.c:2501
 msgid "Turkish (ISO-8859-9)"
 msgstr "Turški (ISO-8859-9)"
 
-#: src/prefs_common_dialog.c:2500
+#: src/prefs_common_dialog.c:2503
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Cirilica (ISO-8859-5)"
 
-#: src/prefs_common_dialog.c:2501
+#: src/prefs_common_dialog.c:2504
 msgid "Cyrillic (KOI8-R)"
 msgstr "Cirilica (KOI8-R)"
 
-#: src/prefs_common_dialog.c:2502
+#: src/prefs_common_dialog.c:2505
 msgid "Cyrillic (KOI8-U)"
 msgstr "Cirilica (KOI8-U)"
 
-#: src/prefs_common_dialog.c:2503
+#: src/prefs_common_dialog.c:2506
 msgid "Cyrillic (Windows-1251)"
 msgstr "Cirilica (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2505
+#: src/prefs_common_dialog.c:2508
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Japonski (ISO-2022-JP)"
 
-#: src/prefs_common_dialog.c:2507
+#: src/prefs_common_dialog.c:2510
 msgid "Japanese (EUC-JP)"
 msgstr "Japonski (EUC-JP)"
 
-#: src/prefs_common_dialog.c:2508
+#: src/prefs_common_dialog.c:2511
 msgid "Japanese (Shift_JIS)"
 msgstr "Japonski (Shift_JIS)"
 
-#: src/prefs_common_dialog.c:2511
+#: src/prefs_common_dialog.c:2514
 msgid "Simplified Chinese (GB2312)"
 msgstr "Poenostavljena kitajščina (GB2312)"
 
-#: src/prefs_common_dialog.c:2512
+#: src/prefs_common_dialog.c:2515
 #, fuzzy
 msgid "Simplified Chinese (GBK)"
 msgstr "Poenostavljena kitajščina (GB2312)"
 
-#: src/prefs_common_dialog.c:2513
+#: src/prefs_common_dialog.c:2516
 msgid "Traditional Chinese (Big5)"
 msgstr "Tradicionalna kitajščina (Big5)"
 
-#: src/prefs_common_dialog.c:2515
+#: src/prefs_common_dialog.c:2518
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Tradicionalna kitajščina (EUC-TW)"
 
-#: src/prefs_common_dialog.c:2516
+#: src/prefs_common_dialog.c:2519
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Kitajski (ISO-2022-CN)"
 
-#: src/prefs_common_dialog.c:2519
+#: src/prefs_common_dialog.c:2522
 msgid "Korean (EUC-KR)"
 msgstr "Korejski (EUC-KR)"
 
-#: src/prefs_common_dialog.c:2521
+#: src/prefs_common_dialog.c:2524
 msgid "Thai (TIS-620)"
 msgstr "Tajski (TIS-620)"
 
-#: src/prefs_common_dialog.c:2522
+#: src/prefs_common_dialog.c:2525
 msgid "Thai (Windows-874)"
 msgstr "Tajski (Windows-874)"
 
-#: src/prefs_common_dialog.c:2689
+#: src/prefs_common_dialog.c:2692
 msgid "the full abbreviated weekday name"
 msgstr "polno okrajšano ime dneva v tednu"
 
-#: src/prefs_common_dialog.c:2690
+#: src/prefs_common_dialog.c:2693
 msgid "the full weekday name"
 msgstr "polno ime dneva v tednu"
 
-#: src/prefs_common_dialog.c:2691
+#: src/prefs_common_dialog.c:2694
 msgid "the abbreviated month name"
 msgstr "okrajšano ime meseca"
 
-#: src/prefs_common_dialog.c:2692
+#: src/prefs_common_dialog.c:2695
 msgid "the full month name"
 msgstr "polno ime meseca"
 
-#: src/prefs_common_dialog.c:2693
+#: src/prefs_common_dialog.c:2696
 msgid "the preferred date and time for the current locale"
 msgstr "najustreznejša oblika datuma in časa za trenutni locale"
 
-#: src/prefs_common_dialog.c:2694
+#: src/prefs_common_dialog.c:2697
 msgid "the century number (year/100)"
 msgstr "številka stoletja (leto/100)"
 
-#: src/prefs_common_dialog.c:2695
+#: src/prefs_common_dialog.c:2698
 msgid "the day of the month as a decimal number"
 msgstr "dan v mesecu kot desetiško število"
 
-#: src/prefs_common_dialog.c:2696
+#: src/prefs_common_dialog.c:2699
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "ura kot desetiško število s 24-urnim prikazom"
 
-#: src/prefs_common_dialog.c:2697
+#: src/prefs_common_dialog.c:2700
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "ura kot desteiško število z 12-urnim prikazom"
 
-#: src/prefs_common_dialog.c:2698
+#: src/prefs_common_dialog.c:2701
 msgid "the day of the year as a decimal number"
 msgstr "dan v letu kot desetiško število"
 
-#: src/prefs_common_dialog.c:2699
+#: src/prefs_common_dialog.c:2702
 msgid "the month as a decimal number"
 msgstr "mesec kot desetiško število"
 
-#: src/prefs_common_dialog.c:2700
+#: src/prefs_common_dialog.c:2703
 msgid "the minute as a decimal number"
 msgstr "minute kot desetiško število"
 
-#: src/prefs_common_dialog.c:2701
+#: src/prefs_common_dialog.c:2704
 msgid "either AM or PM"
 msgstr "AM oz. PM"
 
-#: src/prefs_common_dialog.c:2702
+#: src/prefs_common_dialog.c:2705
 msgid "the second as a decimal number"
 msgstr "sekunde kot desetiško število"
 
-#: src/prefs_common_dialog.c:2703
+#: src/prefs_common_dialog.c:2706
 msgid "the day of the week as a decimal number"
 msgstr "dan v tednu kot desetiško število"
 
-#: src/prefs_common_dialog.c:2704
+#: src/prefs_common_dialog.c:2707
 msgid "the preferred date for the current locale"
 msgstr "najustreznejši datum za trenutni locale"
 
-#: src/prefs_common_dialog.c:2705
+#: src/prefs_common_dialog.c:2708
 msgid "the last two digits of a year"
 msgstr "zadnji dve števki leta"
 
-#: src/prefs_common_dialog.c:2706
+#: src/prefs_common_dialog.c:2709
 msgid "the year as a decimal number"
 msgstr "leto kot desetiško število"
 
-#: src/prefs_common_dialog.c:2707
+#: src/prefs_common_dialog.c:2710
 msgid "the time zone or name or abbreviation"
 msgstr "časovni pas ali ime ali okrajšava"
 
-#: src/prefs_common_dialog.c:2728
+#: src/prefs_common_dialog.c:2731
 msgid "Specifier"
 msgstr "Določevalec"
 
-#: src/prefs_common_dialog.c:2729
+#: src/prefs_common_dialog.c:2732
 msgid "Description"
 msgstr "Opis"
 
-#: src/prefs_common_dialog.c:2769
+#: src/prefs_common_dialog.c:2772
 msgid "Example"
 msgstr "Primer"
 
-#: src/prefs_common_dialog.c:2850
+#: src/prefs_common_dialog.c:2853
 msgid "Set message colors"
 msgstr "Nastavi barve sporočila"
 
-#: src/prefs_common_dialog.c:2858
+#: src/prefs_common_dialog.c:2861
 msgid "Colors"
 msgstr "Barve"
 
-#: src/prefs_common_dialog.c:2892
+#: src/prefs_common_dialog.c:2895
 msgid "Quoted Text - First Level"
 msgstr "Citirano besedilo - prvi nivo"
 
-#: src/prefs_common_dialog.c:2898
+#: src/prefs_common_dialog.c:2901
 msgid "Quoted Text - Second Level"
 msgstr "Citirano besedilo - drugi nivo"
 
-#: src/prefs_common_dialog.c:2904
+#: src/prefs_common_dialog.c:2907
 msgid "Quoted Text - Third Level"
 msgstr "Citirano besedilo - tretji nivo"
 
-#: src/prefs_common_dialog.c:2910
+#: src/prefs_common_dialog.c:2913
 msgid "URI link"
 msgstr "povezava URI"
 
-#: src/prefs_common_dialog.c:2917
+#: src/prefs_common_dialog.c:2920
 msgid "Recycle quote colors"
 msgstr "Obnovi barve za citiranje"
 
-#: src/prefs_common_dialog.c:2984
+#: src/prefs_common_dialog.c:2987
 msgid "Pick color for quotation level 1"
 msgstr "Izberite barvo za citiranje na prvem nivoju"
 
-#: src/prefs_common_dialog.c:2987
+#: src/prefs_common_dialog.c:2990
 msgid "Pick color for quotation level 2"
 msgstr "Izberite barvo za citiranje na drugem nivoju"
 
-#: src/prefs_common_dialog.c:2990
+#: src/prefs_common_dialog.c:2993
 msgid "Pick color for quotation level 3"
 msgstr "Izberite barvo za citiranje na tretjem nivoju"
 
-#: src/prefs_common_dialog.c:2993
+#: src/prefs_common_dialog.c:2996
 msgid "Pick color for URI"
 msgstr "Izberite barvo za URI"
 
-#: src/prefs_common_dialog.c:3133
+#: src/prefs_common_dialog.c:3136
 msgid "Description of symbols"
 msgstr "Opis simbolov"
 
-#: src/prefs_common_dialog.c:3189
+#: src/prefs_common_dialog.c:3192
 msgid ""
 "Date\n"
 "From\n"
@@ -5404,11 +5430,11 @@ msgstr ""
 "Novičarske skupine\n"
 "ID sporočila"
 
-#: src/prefs_common_dialog.c:3202
+#: src/prefs_common_dialog.c:3205
 msgid "If x is set, displays expr"
 msgstr "Če je x nastavljen, prikaži expr"
 
-#: src/prefs_common_dialog.c:3206
+#: src/prefs_common_dialog.c:3209
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -5422,7 +5448,7 @@ msgstr ""
 "Telo citiranega sporočila brez podpisa\n"
 "Dobesedno %"
 
-#: src/prefs_common_dialog.c:3214
+#: src/prefs_common_dialog.c:3217
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -5434,20 +5460,20 @@ msgstr ""
 "Dobesedni zaviti oklepaj\n"
 "Dobesedni zaviti zaklepaj"
 
-#: src/prefs_common_dialog.c:3260
+#: src/prefs_common_dialog.c:3263
 msgid "Key bindings"
 msgstr "Povezave na tipke"
 
-#: src/prefs_common_dialog.c:3273
+#: src/prefs_common_dialog.c:3276
 #, fuzzy
 msgid "Select the preset of key bindings."
 msgstr " Nastavi povezave na tipke... "
 
-#: src/prefs_common_dialog.c:3283 src/prefs_common_dialog.c:3607
+#: src/prefs_common_dialog.c:3286 src/prefs_common_dialog.c:3610
 msgid "Default"
 msgstr "Privzeto"
 
-#: src/prefs_common_dialog.c:3286 src/prefs_common_dialog.c:3616
+#: src/prefs_common_dialog.c:3289 src/prefs_common_dialog.c:3619
 msgid "Old Sylpheed"
 msgstr "Stari Sylpheed"
 
@@ -5572,7 +5598,7 @@ msgstr ""
 msgid "Age"
 msgstr ""
 
-#: src/prefs_filter_edit.c:501 src/summaryview.c:510
+#: src/prefs_filter_edit.c:501 src/summaryview.c:512
 #, fuzzy
 msgid "Marked"
 msgstr "Označi"
@@ -5826,17 +5852,17 @@ msgid "Attachment"
 msgstr "Priloga"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73 src/query_search.c:371 src/summaryview.c:4733
+#: src/prefs_summary_column.c:73 src/query_search.c:371 src/summaryview.c:4890
 msgid "Subject"
 msgstr "Zadeva"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/query_search.c:372 src/summaryview.c:4736
+#: src/prefs_summary_column.c:74 src/query_search.c:372 src/summaryview.c:4893
 msgid "From"
 msgstr "Od"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/query_search.c:373 src/summaryview.c:4738
+#: src/prefs_summary_column.c:75 src/query_search.c:373 src/summaryview.c:4895
 msgid "Date"
 msgstr "Datum"
 
@@ -5938,7 +5964,7 @@ msgstr "Iskanje sporočil"
 msgid "_Save as search folder"
 msgstr "Shrani v imenik Draft"
 
-#: src/query_search.c:512 src/subscribedialog.c:523 src/summaryview.c:840
+#: src/query_search.c:512 src/subscribedialog.c:523 src/summaryview.c:842
 msgid "Done."
 msgstr "Opravljeno."
 
@@ -5952,7 +5978,7 @@ msgstr "Preiskujem mapo %s ..."
 msgid "Searching %s (%d / %d)..."
 msgstr "Filtriram..."
 
-#: src/query_search.c:645 src/summaryview.c:2048
+#: src/query_search.c:645 src/summaryview.c:2051
 msgid "(No Date)"
 msgstr "(Brez datuma)"
 
@@ -6323,306 +6349,311 @@ msgid "/_Mark/Mark as rea_d"
 msgstr "/_Oznaka/Označi kot _prebrano"
 
 #: src/summaryview.c:429
+#, fuzzy
+msgid "/_Mark/Mark _thread as read"
+msgstr "/_Oznaka/Označi kot _prebrano"
+
+#: src/summaryview.c:431
 msgid "/_Mark/Mark all _read"
 msgstr "/_Oznaka/Označi _vsa kot prebrana"
 
-#: src/summaryview.c:430
+#: src/summaryview.c:432
 msgid "/Color la_bel"
 msgstr "/Barvanje oz_nak"
 
-#: src/summaryview.c:434
+#: src/summaryview.c:436
 msgid "/Re-_edit"
 msgstr "/_Znova uredi"
 
-#: src/summaryview.c:436
+#: src/summaryview.c:438
 #, fuzzy
 msgid "/Add sender to address boo_k..."
 msgstr "/Doda_j pošiljatelja v adresar"
 
-#: src/summaryview.c:438
+#: src/summaryview.c:440
 msgid "/Create f_ilter rule"
 msgstr "/Ustvari pravilo za f_iltriranje"
 
-#: src/summaryview.c:439
+#: src/summaryview.c:441
 msgid "/Create f_ilter rule/_Automatically"
 msgstr "/Ustvari pravilo za f_iltriranje/S_amodejno"
 
-#: src/summaryview.c:441
+#: src/summaryview.c:443
 msgid "/Create f_ilter rule/by _From"
 msgstr "/Ustvari pravilo za f_iltriranje/po p_ošiljatelju"
 
-#: src/summaryview.c:443
+#: src/summaryview.c:445
 msgid "/Create f_ilter rule/by _To"
 msgstr "/Ustvari pravilo za f_iltriranje/po _naslovniku"
 
-#: src/summaryview.c:445
+#: src/summaryview.c:447
 msgid "/Create f_ilter rule/by _Subject"
 msgstr "/Ustvari pravilo za f_iltriranje/po _zadevi"
 
-#: src/summaryview.c:451
+#: src/summaryview.c:453
 msgid "/_View/_Source"
 msgstr "/_Pogled/_Izvirnik"
 
-#: src/summaryview.c:452
+#: src/summaryview.c:454
 msgid "/_View/All _header"
 msgstr "/_Pogled/Vsa _zaglavja"
 
-#: src/summaryview.c:454
+#: src/summaryview.c:456
 msgid "/_Print..."
 msgstr "/_Natisni..."
 
-#: src/summaryview.c:486
+#: src/summaryview.c:488
 msgid "Creating summary view...\n"
 msgstr "Delam ogled povzetka...\n"
 
-#: src/summaryview.c:508
+#: src/summaryview.c:510
 msgid "All"
 msgstr ""
 
-#: src/summaryview.c:511
+#: src/summaryview.c:513
 #, fuzzy
 msgid "Have color label"
 msgstr "/Barvanje oz_nak"
 
-#: src/summaryview.c:512
+#: src/summaryview.c:514
 #, fuzzy
 msgid "Have attachment"
 msgstr "Priloga"
 
-#: src/summaryview.c:521
+#: src/summaryview.c:523
 #, fuzzy
 msgid "Search:"
 msgstr "Iskanje"
 
-#: src/summaryview.c:535
+#: src/summaryview.c:537
 msgid "Search for Subject or From"
 msgstr ""
 
-#: src/summaryview.c:702
+#: src/summaryview.c:704
 msgid "Process mark"
 msgstr "Oznaka procesa"
 
-#: src/summaryview.c:703
+#: src/summaryview.c:705
 msgid "Some marks are left. Process it?"
 msgstr "Nekaj oznak je ostalo. Naj obdelam?"
 
-#: src/summaryview.c:749
+#: src/summaryview.c:751
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "Preiskujem mapo (%s) ..."
 
-#: src/summaryview.c:1292
+#: src/summaryview.c:1295
 #, fuzzy
 msgid "_Search again"
 msgstr "Ponovno iskanje"
 
-#: src/summaryview.c:1313 src/summaryview.c:1322
+#: src/summaryview.c:1316 src/summaryview.c:1325
 msgid "No more unread messages"
 msgstr "Ni več neprebranih sporočil"
 
-#: src/summaryview.c:1314
+#: src/summaryview.c:1317
 msgid "No unread message found. Search from the end?"
 msgstr "Nobeno neprebrano sporočilo ni bilo najdeno. Naj iščem s konca?"
 
-#: src/summaryview.c:1316
+#: src/summaryview.c:1319
 msgid "No unread messages."
 msgstr "Ni neprebranih sporočil."
 
-#: src/summaryview.c:1323
+#: src/summaryview.c:1326
 msgid "No unread message found. Go to next folder?"
 msgstr ""
 "Nobeno neprebrano sporočilo ni bilo najdeno. Naj grem v naslednjo mapo?"
 
-#: src/summaryview.c:1331 src/summaryview.c:1340
+#: src/summaryview.c:1334 src/summaryview.c:1343
 msgid "No more new messages"
 msgstr "Ni več neprebranih sporočil"
 
-#: src/summaryview.c:1332
+#: src/summaryview.c:1335
 msgid "No new message found. Search from the end?"
 msgstr "Nobeno novo sporočilo ni bilo najdeno. Naj iščem s konca?"
 
-#: src/summaryview.c:1334
+#: src/summaryview.c:1337
 msgid "No new messages."
 msgstr "Ni novih sporočil."
 
-#: src/summaryview.c:1341
+#: src/summaryview.c:1344
 msgid "No new message found. Go to next folder?"
 msgstr "Nobeno novo sporočilo ni bilo najdeno. Naj grem v naslednjo mapo?"
 
-#: src/summaryview.c:1349 src/summaryview.c:1358
+#: src/summaryview.c:1352 src/summaryview.c:1361
 msgid "No more marked messages"
 msgstr "Ni več označenih sporočil"
 
-#: src/summaryview.c:1350
+#: src/summaryview.c:1353
 msgid "No marked message found. Search from the end?"
 msgstr "Nobeno označeno sporočilo ni bilo najdeno. Naj iščem s konca?"
 
-#: src/summaryview.c:1352 src/summaryview.c:1361
+#: src/summaryview.c:1355 src/summaryview.c:1364
 msgid "No marked messages."
 msgstr "Ni označenih sporočil."
 
-#: src/summaryview.c:1359
+#: src/summaryview.c:1362
 msgid "No marked message found. Search from the beginning?"
 msgstr "Nobeno označeno sporočilo ni bilo najdeno. Naj iščem od začetka?"
 
-#: src/summaryview.c:1367 src/summaryview.c:1376
+#: src/summaryview.c:1370 src/summaryview.c:1379
 msgid "No more labeled messages"
 msgstr "Ni več sporočil z oznako"
 
-#: src/summaryview.c:1368
+#: src/summaryview.c:1371
 msgid "No labeled message found. Search from the end?"
 msgstr "Nobeno sporočilo z oznako ni bilo najdeno. Naj iščem s konca?"
 
-#: src/summaryview.c:1370 src/summaryview.c:1379
+#: src/summaryview.c:1373 src/summaryview.c:1382
 msgid "No labeled messages."
 msgstr "Ni sporočil z oznako"
 
-#: src/summaryview.c:1377
+#: src/summaryview.c:1380
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Nobeno sporočilo z oznako ni bilo najdeno. Naj iščem od začetka?"
 
-#: src/summaryview.c:1693
+#: src/summaryview.c:1696
 msgid "Attracting messages by subject..."
 msgstr "Privlačim sporočila po zadevi..."
 
-#: src/summaryview.c:1887
+#: src/summaryview.c:1890
 #, c-format
 msgid "%d deleted"
 msgstr "%d izbrisanih"
 
-#: src/summaryview.c:1891
+#: src/summaryview.c:1894
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d prestavljenih"
 
-#: src/summaryview.c:1892 src/summaryview.c:1897
+#: src/summaryview.c:1895 src/summaryview.c:1900
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:1896
+#: src/summaryview.c:1899
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d presnetih"
 
-#: src/summaryview.c:1911
+#: src/summaryview.c:1914
 msgid " item(s) selected"
 msgstr " izbranih kosov"
 
-#: src/summaryview.c:1933
+#: src/summaryview.c:1936
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d novih, %d neprebranih, skupaj %d (%s)"
 
-#: src/summaryview.c:1937
+#: src/summaryview.c:1940
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d novih, %d neprebranih, skupaj %d"
 
-#: src/summaryview.c:1971
+#: src/summaryview.c:1974
 msgid "Sorting summary..."
 msgstr "Razvrščam povzetka..."
 
-#: src/summaryview.c:2194
+#: src/summaryview.c:2211
 msgid "\tSetting summary from message data..."
 msgstr "\tNastavljam povzetek iz podatkov sporočila..."
 
-#: src/summaryview.c:2196
+#: src/summaryview.c:2213
 msgid "Setting summary from message data..."
 msgstr "Nastavljam povzetek iz podatkov sporočila..."
 
-#: src/summaryview.c:2302
+#: src/summaryview.c:2319
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Pišem povzetek predpomnilnika (%s)..."
 
-#: src/summaryview.c:2643
+#: src/summaryview.c:2660
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Sporočilo %d je označeno\n"
 
-#: src/summaryview.c:2701
+#: src/summaryview.c:2718
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Sporočilo %d je označeno, kot da se bere\n"
 
-#: src/summaryview.c:2789
+#: src/summaryview.c:2908
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Sporočilo %d je označeno kot neprebrano\n"
 
-#: src/summaryview.c:2850
+#: src/summaryview.c:2969
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Sporočilo %s/%d je nastavljeno za brisanje\n"
 
-#: src/summaryview.c:2878
+#: src/summaryview.c:2997
 msgid "Delete message(s)"
 msgstr "Izbriši sporočilo/a"
 
-#: src/summaryview.c:2879
+#: src/summaryview.c:2998
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Ali res želite izbrisati sporočila iz smetnjaka?"
 
-#: src/summaryview.c:2953
+#: src/summaryview.c:3072
 msgid "Deleting duplicated messages..."
 msgstr "Brišem podvojena sporočila..."
 
-#: src/summaryview.c:2991
+#: src/summaryview.c:3110
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Sporočilo %s/%d je odoznačeno\n"
 
-#: src/summaryview.c:3049
+#: src/summaryview.c:3168
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Sporočilo %d je nastavljeno za prestavitev v %s\n"
 
-#: src/summaryview.c:3066
+#: src/summaryview.c:3196
 msgid "Destination is same as current folder."
 msgstr "Cilj je enak trenutni mapi."
 
-#: src/summaryview.c:3122
+#: src/summaryview.c:3260
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Sporočilo %d je nastavljeno za prepis v %s\n"
 
-#: src/summaryview.c:3139
+#: src/summaryview.c:3288
 #, fuzzy
 msgid "Destination for copy is same as current folder."
 msgstr "Cilj prepisa je enak trenutni mapi"
 
-#: src/summaryview.c:3338
+#: src/summaryview.c:3495
 #, fuzzy
 msgid "Error occurred while processing messages."
 msgstr "Med obdelavo pošte je prišlo do napake."
 
-#: src/summaryview.c:3646 src/summaryview.c:3647
+#: src/summaryview.c:3803 src/summaryview.c:3804
 msgid "Building threads..."
 msgstr "Gradim niti..."
 
-#: src/summaryview.c:3797 src/summaryview.c:3798
+#: src/summaryview.c:3954 src/summaryview.c:3955
 msgid "Unthreading..."
 msgstr "Raznitujem..."
 
-#: src/summaryview.c:4091 src/summaryview.c:4147
+#: src/summaryview.c:4248 src/summaryview.c:4304
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtriram..."
 
-#: src/summaryview.c:4196
+#: src/summaryview.c:4353
 msgid "filtering..."
 msgstr "filtriram..."
 
-#: src/summaryview.c:4197
+#: src/summaryview.c:4354
 msgid "Filtering..."
 msgstr "Filtriram..."
 
-#: src/summaryview.c:4233
+#: src/summaryview.c:4390
 #, fuzzy, c-format
 msgid "%d message(s) have been filtered."
 msgstr "sporočilo %d je že v predpomnilniku.\n"
 
-#: src/summaryview.c:4742
+#: src/summaryview.c:4899
 msgid "No."
 msgstr "Ne."
 
@@ -6640,36 +6671,36 @@ msgstr "Ustvarjam ogled besedila...\n"
 msgid "This message can't be displayed.\n"
 msgstr "sporočilo ne bo sprejeto\n"
 
-#: src/textview.c:1929
+#: src/textview.c:1925
 #, fuzzy
 msgid "Sa_ve this image as..."
 msgstr "/_Shrani kot..."
 
-#: src/textview.c:1945 src/trayicon.c:109
+#: src/textview.c:1941 src/trayicon.c:109
 #, fuzzy
 msgid "Compose _new message"
 msgstr "Sestavi novo sporočilo"
 
-#: src/textview.c:1947
+#: src/textview.c:1943
 #, fuzzy
 msgid "Add to address _book..."
 msgstr "/Doda_j pošiljatelja v adresar"
 
-#: src/textview.c:1949
+#: src/textview.c:1945
 #, fuzzy
 msgid "Copy this add_ress"
 msgstr "Skupni naslov"
 
-#: src/textview.c:1952
+#: src/textview.c:1948
 #, fuzzy
 msgid "_Open with Web browser"
 msgstr "Spletni brskalnik"
 
-#: src/textview.c:1954
+#: src/textview.c:1950
 msgid "Copy this _link"
 msgstr ""
 
-#: src/textview.c:2097
+#: src/textview.c:2093
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6678,7 +6709,7 @@ msgid ""
 "Open it anyway?"
 msgstr ""
 
-#: src/textview.c:2102
+#: src/textview.c:2098
 msgid "Fake URL warning"
 msgstr ""
 
diff --git a/po/sr.po b/po/sr.po
index 2ce8a6ea..8f987e8d 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: 2006-01-27 18:11+0900\n"
+"POT-Creation-Date: 2006-01-31 15:20+0900\n"
 "PO-Revision-Date: 2002-11-29 21:08+0100\n"
 "Last-Translator: garret <garret@garrets.tk>\n"
 "Language-Team: Serbian\n"
@@ -509,7 +509,7 @@ msgstr "Pronađeno %s\n"
 msgid "Configuration is saved.\n"
 msgstr "Konfiguracija je spremljena.\n"
 
-#: libsylph/prefs_common.c:489
+#: libsylph/prefs_common.c:491
 #, fuzzy
 msgid "Junk mail filter"
 msgstr "Direktorijum"
@@ -626,8 +626,8 @@ msgstr ""
 msgid "%.2fGB"
 msgstr ""
 
-#: libsylph/utils.c:2373 src/compose.c:2858 src/compose.c:3121
-#: src/compose.c:3184 src/compose.c:3304
+#: libsylph/utils.c:2373 src/compose.c:2867 src/compose.c:3130
+#: src/compose.c:3193 src/compose.c:3313
 msgid "can't change file mode\n"
 msgstr "ne mogu promeniti atribut datoteke\n"
 
@@ -713,8 +713,8 @@ msgstr ""
 "Nove poruke biti će proveravane ovim redom. Označite pod\n"
 "`G' one naloge sa kojih želite skinuti e-poštu sa `Primi sve'."
 
-#: src/account_dialog.c:366 src/addressadd.c:192 src/addressbook.c:491
-#: src/compose.c:4262 src/editaddress.c:200 src/editaddress.c:942
+#: src/account_dialog.c:366 src/addressadd.c:192 src/addressbook.c:493
+#: src/compose.c:4271 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:206 src/prefs_filter.c:259 src/prefs_folder_item.c:171
@@ -850,12 +850,12 @@ msgstr ""
 msgid "Add Address to Book"
 msgstr "Dodaj adresu u adresar"
 
-#: src/addressadd.c:202 src/compose.c:4762 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4771 src/editaddress.c:201
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "Adresa"
 
-#: src/addressadd.c:212 src/addressbook.c:493 src/editaddress.c:202
+#: src/addressadd.c:212 src/addressbook.c:495 src/editaddress.c:202
 #: src/editaddress.c:795 src/editaddress.c:860 src/editgroup.c:267
 msgid "Remarks"
 msgstr "Beleške"
@@ -864,183 +864,183 @@ msgstr "Beleške"
 msgid "Select Address Book Folder"
 msgstr "Odaberite direktorijum adresara"
 
-#: src/addressbook.c:336 src/compose.c:515 src/mainwindow.c:477
+#: src/addressbook.c:338 src/compose.c:515 src/mainwindow.c:480
 #: src/messageview.c:138
 msgid "/_File"
 msgstr "/_Datoteka"
 
-#: src/addressbook.c:337
+#: src/addressbook.c:339
 msgid "/_File/New _Book"
 msgstr "/_Datoteka/Nova _knjiga"
 
-#: src/addressbook.c:338
+#: src/addressbook.c:340
 msgid "/_File/New _vCard"
 msgstr "/_Datoteka/Nova _vCard"
 
-#: src/addressbook.c:340
+#: src/addressbook.c:342
 msgid "/_File/New _JPilot"
 msgstr "/_Datoteka/Novi _JPilot"
 
-#: src/addressbook.c:343
+#: src/addressbook.c:345
 msgid "/_File/New _Server"
 msgstr "/_Datoteka/Novi _server"
 
-#: src/addressbook.c:345 src/addressbook.c:348 src/compose.c:520
-#: src/compose.c:525 src/compose.c:528 src/compose.c:531 src/mainwindow.c:495
-#: src/mainwindow.c:498 src/mainwindow.c:500 src/mainwindow.c:503
-#: src/mainwindow.c:505 src/messageview.c:141
+#: src/addressbook.c:347 src/addressbook.c:350 src/compose.c:520
+#: src/compose.c:525 src/compose.c:528 src/compose.c:531 src/mainwindow.c:498
+#: src/mainwindow.c:501 src/mainwindow.c:503 src/mainwindow.c:506
+#: src/mainwindow.c:508 src/messageview.c:141
 msgid "/_File/---"
 msgstr "/_Datoteka/---"
 
-#: src/addressbook.c:346
+#: src/addressbook.c:348
 msgid "/_File/_Edit"
 msgstr "/_Datoteka/_Izmeni"
 
-#: src/addressbook.c:347
+#: src/addressbook.c:349
 msgid "/_File/_Delete"
 msgstr "/_Datoteka/_Obriši"
 
-#: src/addressbook.c:349
+#: src/addressbook.c:351
 msgid "/_File/_Save"
 msgstr "/_Datoteka/_Sačuvaj"
 
-#: src/addressbook.c:350 src/compose.c:532 src/messageview.c:142
+#: src/addressbook.c:352 src/compose.c:532 src/messageview.c:142
 msgid "/_File/_Close"
 msgstr "/_Datoteka/_Zatvori"
 
-#: src/addressbook.c:351
+#: src/addressbook.c:353
 msgid "/_Address"
 msgstr "/_Adresa"
 
-#: src/addressbook.c:352
+#: src/addressbook.c:354
 msgid "/_Address/New _Address"
 msgstr "/_Adresa/Nova _adresa"
 
-#: src/addressbook.c:353
+#: src/addressbook.c:355
 msgid "/_Address/New _Group"
 msgstr "/_Adresa/Nova _grupa"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:356
 msgid "/_Address/New _Folder"
 msgstr "/_Adresa/Novi _direktorijum"
 
-#: src/addressbook.c:355
+#: src/addressbook.c:357
 msgid "/_Address/---"
 msgstr "/_Adresa/---"
 
-#: src/addressbook.c:356
+#: src/addressbook.c:358
 msgid "/_Address/_Edit"
 msgstr "/_Adresa/_Izmeni"
 
-#: src/addressbook.c:357
+#: src/addressbook.c:359
 msgid "/_Address/_Delete"
 msgstr "/_Adresa/O_briši"
 
-#: src/addressbook.c:358 src/compose.c:639 src/mainwindow.c:738
-#: src/messageview.c:259
+#: src/addressbook.c:360 src/compose.c:645 src/mainwindow.c:749
+#: src/messageview.c:264
 msgid "/_Tools"
 msgstr "/_Alati"
 
-#: src/addressbook.c:359
+#: src/addressbook.c:361
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Datoteka/Unesi _LDIF datoteku"
 
-#: src/addressbook.c:360 src/compose.c:658 src/mainwindow.c:788
-#: src/messageview.c:277
+#: src/addressbook.c:362 src/compose.c:664 src/mainwindow.c:799
+#: src/messageview.c:282
 msgid "/_Help"
 msgstr "/_Pomoć"
 
-#: src/addressbook.c:361 src/compose.c:659 src/mainwindow.c:799
-#: src/messageview.c:278
+#: src/addressbook.c:363 src/compose.c:665 src/mainwindow.c:810
+#: src/messageview.c:283
 msgid "/_Help/_About"
 msgstr "/_Pomoć/_O"
 
-#: src/addressbook.c:380 src/addressbook.c:390
+#: src/addressbook.c:382 src/addressbook.c:392
 msgid "/New _Address"
 msgstr "/Nova _adresa"
 
-#: src/addressbook.c:381 src/addressbook.c:391
+#: src/addressbook.c:383 src/addressbook.c:393
 msgid "/New _Group"
 msgstr "/Nova _grupa"
 
-#: src/addressbook.c:382 src/addressbook.c:392
+#: src/addressbook.c:384 src/addressbook.c:394
 msgid "/New _Folder"
 msgstr "/Novi _direktorijum"
 
-#: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:509
+#: src/addressbook.c:385 src/addressbook.c:395 src/compose.c:509
 #: src/folderview.c:246 src/folderview.c:248 src/folderview.c:253
 #: src/folderview.c:266 src/folderview.c:268 src/folderview.c:270
 #: src/folderview.c:275 src/folderview.c:289 src/folderview.c:291
 #: src/folderview.c:295 src/summaryview.c:414 src/summaryview.c:418
-#: src/summaryview.c:421 src/summaryview.c:431 src/summaryview.c:433
-#: src/summaryview.c:435 src/summaryview.c:447 src/summaryview.c:453
+#: src/summaryview.c:421 src/summaryview.c:433 src/summaryview.c:435
+#: src/summaryview.c:437 src/summaryview.c:449 src/summaryview.c:455
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:534
-#: src/mainwindow.c:509 src/messageview.c:144
+#: src/addressbook.c:386 src/addressbook.c:396 src/compose.c:534
+#: src/mainwindow.c:512 src/messageview.c:144
 msgid "/_Edit"
 msgstr "/_Izmeni"
 
-#: src/addressbook.c:385 src/addressbook.c:395 src/summaryview.c:432
+#: src/addressbook.c:387 src/addressbook.c:397 src/summaryview.c:434
 msgid "/_Delete"
 msgstr "/_Obriši"
 
-#: src/addressbook.c:492
+#: src/addressbook.c:494
 msgid "E-Mail address"
 msgstr "Adresa e-pošte"
 
-#: src/addressbook.c:496 src/compose.c:4763 src/prefs_common_dialog.c:2183
+#: src/addressbook.c:498 src/compose.c:4772 src/prefs_common_dialog.c:2183
 msgid "Address book"
 msgstr "Adresar"
 
-#: src/addressbook.c:596 src/prefs_filter_edit.c:249
+#: src/addressbook.c:600 src/prefs_filter_edit.c:249
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "Ime:"
 
 #. Buttons
-#: src/addressbook.c:628 src/addressbook.c:1680 src/editaddress.c:884
-#: src/editaddress.c:1017 src/mainwindow.c:2391 src/prefs_actions.c:266
+#: src/addressbook.c:632 src/addressbook.c:1684 src/editaddress.c:884
+#: src/editaddress.c:1017 src/mainwindow.c:2402 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
 #: src/prefs_template.c:233
 msgid "Delete"
 msgstr "Obriši"
 
-#: src/addressbook.c:631 src/editaddress.c:890 src/editaddress.c:1023
+#: src/addressbook.c:635 src/editaddress.c:890 src/editaddress.c:1023
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:273 src/prefs_display_header.c:328
 #: src/prefs_filter_edit.c:1550
 msgid "Add"
 msgstr "Dodaj"
 
-#: src/addressbook.c:634
+#: src/addressbook.c:638
 msgid "Lookup"
 msgstr "Potraži"
 
-#: src/addressbook.c:646 src/headerview.c:55 src/prefs_folder_item.c:339
+#: src/addressbook.c:650 src/headerview.c:55 src/prefs_folder_item.c:339
 #: src/prefs_template.c:176
 msgid "To:"
 msgstr "Za:"
 
-#: src/addressbook.c:650 src/prefs_folder_item.c:356 src/prefs_template.c:178
+#: src/addressbook.c:654 src/prefs_folder_item.c:356 src/prefs_template.c:178
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:654 src/prefs_folder_item.c:367
+#: src/addressbook.c:658 src/prefs_folder_item.c:367
 msgid "Bcc:"
 msgstr "Bcc:"
 
 #. Confirm deletion
-#: src/addressbook.c:841
+#: src/addressbook.c:845
 msgid "Delete address(es)"
 msgstr "Obriši adresu/e"
 
-#: src/addressbook.c:842
+#: src/addressbook.c:846
 msgid "Really delete the address(es)?"
 msgstr "Zaista obrisati adresu/e?"
 
-#: src/addressbook.c:1671
+#: src/addressbook.c:1675
 #, fuzzy, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1050,38 +1050,38 @@ msgstr ""
 "Ako brišete samo direktorijum, adrese će biti premeštene u prethodni "
 "direktorijum."
 
-#: src/addressbook.c:1674 src/folderview.c:2351
+#: src/addressbook.c:1678 src/folderview.c:2351
 msgid "Delete folder"
 msgstr "Obriši direktorijum"
 
-#: src/addressbook.c:1674
+#: src/addressbook.c:1678
 #, fuzzy
 msgid "_Folder only"
 msgstr "Samo direktorijum"
 
-#: src/addressbook.c:1674
+#: src/addressbook.c:1678
 #, fuzzy
 msgid "Folder and _addresses"
 msgstr "Direktorijum i adrese"
 
-#: src/addressbook.c:1679
+#: src/addressbook.c:1683
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Zaista obrisati `%s' ?"
 
-#: src/addressbook.c:2365 src/addressbook.c:2498
+#: src/addressbook.c:2369 src/addressbook.c:2502
 msgid "New user, could not save index file."
 msgstr "Novi korisnik, ne mogu sačuvati index datoteku."
 
-#: src/addressbook.c:2369 src/addressbook.c:2502
+#: src/addressbook.c:2373 src/addressbook.c:2506
 msgid "New user, could not save address book files."
 msgstr "Novi korisnik, ne mogu sačuvati datoteke adresara."
 
-#: src/addressbook.c:2379 src/addressbook.c:2512
+#: src/addressbook.c:2383 src/addressbook.c:2516
 msgid "Old address book converted successfully."
 msgstr "Stari adresar uspešno prebačen."
 
-#: src/addressbook.c:2384
+#: src/addressbook.c:2388
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1089,7 +1089,7 @@ msgstr ""
 "Stari adresar ne može biti prebačen,\n"
 "ne mogu sačuvati novu index datoteku adresara."
 
-#: src/addressbook.c:2397
+#: src/addressbook.c:2401
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1097,7 +1097,7 @@ msgstr ""
 "Ne mogu prebaciti adesar,\n"
 "ali sam kreirao nove prazne datoteke adresara."
 
-#: src/addressbook.c:2403
+#: src/addressbook.c:2407
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1105,7 +1105,7 @@ msgstr ""
 "Ne mogu prebaciti adresar,\n"
 "ne mogu napraviti nove datoteke adresara."
 
-#: src/addressbook.c:2408
+#: src/addressbook.c:2412
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1113,84 +1113,84 @@ msgstr ""
 "Ne mogu prebaciti adresar,\n"
 "i ne mogu napraviti nove datoteke adresara."
 
-#: src/addressbook.c:2415
+#: src/addressbook.c:2419
 msgid "Addressbook conversion error"
 msgstr "Greška pri prebacivanju adresara"
 
-#: src/addressbook.c:2419
+#: src/addressbook.c:2423
 msgid "Addressbook conversion"
 msgstr "Prebacivanje adresara"
 
-#: src/addressbook.c:2454
+#: src/addressbook.c:2458
 msgid "Addressbook Error"
 msgstr "Greška adresara"
 
-#: src/addressbook.c:2455 src/addressbook.c:2555
+#: src/addressbook.c:2459 src/addressbook.c:2559
 msgid "Could not read address index"
 msgstr "Ne mogu čitati index adresara"
 
-#: src/addressbook.c:2517
+#: src/addressbook.c:2521
 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:2531
+#: src/addressbook.c:2535
 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:2537
+#: src/addressbook.c:2541
 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:2543
+#: src/addressbook.c:2547
 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:2561
+#: src/addressbook.c:2565
 msgid "Addressbook Conversion Error"
 msgstr "Greška pri unosu adresara"
 
-#: src/addressbook.c:2567
+#: src/addressbook.c:2571
 msgid "Addressbook Conversion"
 msgstr "Unos adresara"
 
-#: src/addressbook.c:3072 src/prefs_common_dialog.c:2033
+#: src/addressbook.c:3086 src/prefs_common_dialog.c:2033
 msgid "Interface"
 msgstr "Izgled programa"
 
-#: src/addressbook.c:3088 src/importldif.c:514
+#: src/addressbook.c:3102 src/importldif.c:514
 msgid "Address Book"
 msgstr "Adresar"
 
-#: src/addressbook.c:3104
+#: src/addressbook.c:3118
 msgid "Person"
 msgstr "Osoba"
 
-#: src/addressbook.c:3120
+#: src/addressbook.c:3134
 msgid "EMail Address"
 msgstr "Adresa e-pošte"
 
-#: src/addressbook.c:3136
+#: src/addressbook.c:3150
 msgid "Group"
 msgstr "Grupa"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3152 src/folderview.c:367 src/prefs_account_dialog.c:1694
+#: src/addressbook.c:3166 src/folderview.c:367 src/prefs_account_dialog.c:1694
 #: src/query_search.c:370
 msgid "Folder"
 msgstr "Direktorijum"
 
-#: src/addressbook.c:3168
+#: src/addressbook.c:3182
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3184 src/addressbook.c:3200
+#: src/addressbook.c:3198 src/addressbook.c:3214
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3216
+#: src/addressbook.c:3230
 msgid "LDAP Server"
 msgstr "LDAP Server"
 
@@ -1202,7 +1202,7 @@ msgstr "Uobičajene adrese"
 msgid "Personal address"
 msgstr "Lične adrese"
 
-#: src/alertpanel.c:141 src/compose.c:5485 src/main.c:573
+#: src/alertpanel.c:141 src/compose.c:5494 src/main.c:573
 msgid "Notice"
 msgstr "Obaveštenje"
 
@@ -1253,7 +1253,7 @@ msgstr "Smeđa"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4593
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4750
 msgid "None"
 msgstr "Ništa"
 
@@ -1316,7 +1316,7 @@ msgstr "/_Izmeni/_Undo"
 msgid "/_Edit/_Redo"
 msgstr "/_Izmeni/_Redo"
 
-#: src/compose.c:537 src/compose.c:544 src/mainwindow.c:513
+#: src/compose.c:537 src/compose.c:544 src/mainwindow.c:516
 #: src/messageview.c:147
 msgid "/_Edit/---"
 msgstr "/_Izmeni/---"
@@ -1325,7 +1325,7 @@ msgstr "/_Izmeni/---"
 msgid "/_Edit/Cu_t"
 msgstr "/_Izmeni/S_eci"
 
-#: src/compose.c:539 src/mainwindow.c:510 src/messageview.c:145
+#: src/compose.c:539 src/mainwindow.c:513 src/messageview.c:145
 msgid "/_Edit/_Copy"
 msgstr "/_Izmeni/_Kopiraj"
 
@@ -1337,7 +1337,7 @@ msgstr "/_Izmeni/U_baci"
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Izmeni/Ubaci kao _citat"
 
-#: src/compose.c:543 src/mainwindow.c:511 src/messageview.c:146
+#: src/compose.c:543 src/mainwindow.c:514 src/messageview.c:146
 msgid "/_Edit/Select _all"
 msgstr "/_Izmeni/Odaberi _sve"
 
@@ -1354,8 +1354,8 @@ msgstr "/_Izmeni/Sažmi sve dugačke _linije"
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Izmeni/_Kopiraj"
 
-#: src/compose.c:550 src/mainwindow.c:518 src/messageview.c:151
-#: src/summaryview.c:448
+#: src/compose.c:550 src/mainwindow.c:521 src/messageview.c:151
+#: src/summaryview.c:450
 msgid "/_View"
 msgstr "/_Pregled"
 
@@ -1376,9 +1376,9 @@ msgid "/_View/_Reply to"
 msgstr "/_Pregled/_Odgovori"
 
 #: src/compose.c:555 src/compose.c:557 src/compose.c:559 src/compose.c:561
-#: src/mainwindow.c:538 src/mainwindow.c:541 src/mainwindow.c:568
-#: src/mainwindow.c:592 src/mainwindow.c:687 src/mainwindow.c:691
-#: src/messageview.c:236
+#: src/mainwindow.c:541 src/mainwindow.c:544 src/mainwindow.c:571
+#: src/mainwindow.c:595 src/mainwindow.c:696 src/mainwindow.c:700
+#: src/messageview.c:241
 msgid "/_View/---"
 msgstr "/_Pregled/---"
 
@@ -1394,7 +1394,7 @@ msgstr "/_Pregled/Len_jir"
 msgid "/_View/_Attachment"
 msgstr "/_Pregled/_Spajalica"
 
-#: src/compose.c:567 src/mainwindow.c:599 src/messageview.c:158
+#: src/compose.c:567 src/mainwindow.c:602 src/messageview.c:158
 #, fuzzy
 msgid "/_View/Character _encoding"
 msgstr "/_Pregled/_Složi/Opadajuće"
@@ -1404,241 +1404,252 @@ msgid "/_View/Character _encoding/_Automatic"
 msgstr ""
 
 #: src/compose.c:570 src/compose.c:576 src/compose.c:582 src/compose.c:586
-#: src/compose.c:592 src/compose.c:596 src/compose.c:602 src/compose.c:606
-#: src/compose.c:616 src/compose.c:620 src/compose.c:628 src/compose.c:632
-#: src/mainwindow.c:595 src/mainwindow.c:602 src/messageview.c:154
+#: src/compose.c:592 src/compose.c:596 src/compose.c:602 src/compose.c:608
+#: src/compose.c:612 src/compose.c:622 src/compose.c:626 src/compose.c:634
+#: src/compose.c:638 src/mainwindow.c:598 src/mainwindow.c:605
+#: src/messageview.c:154
 #, fuzzy
 msgid "/_View/Character _encoding/---"
 msgstr "/_Pregled/_Složi/Opadajuće"
 
-#: src/compose.c:572 src/mainwindow.c:603 src/messageview.c:162
+#: src/compose.c:572 src/mainwindow.c:606 src/messageview.c:162
 #, fuzzy
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Pregled/_Znakovni standard/7bit ascii (US-ASC_II)"
 
-#: src/compose.c:574 src/mainwindow.c:605 src/messageview.c:165
+#: src/compose.c:574 src/mainwindow.c:608 src/messageview.c:165
 #, fuzzy
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Pregled/_Znakovni standard/Unicode (_UTF-8)"
 
-#: src/compose.c:578 src/mainwindow.c:609 src/messageview.c:168
+#: src/compose.c:578 src/mainwindow.c:612 src/messageview.c:168
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Pregled/_Znakovni standard/Zapadna Evropa (ISO-8859-_1)"
 
-#: src/compose.c:580 src/mainwindow.c:611 src/messageview.c:170
+#: src/compose.c:580 src/mainwindow.c:614 src/messageview.c:170
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Pregled/_Znakovni standard/Zapadna Evropa (ISO-8859-15)"
 
-#: src/compose.c:584 src/mainwindow.c:617 src/messageview.c:175
+#: src/compose.c:584 src/mainwindow.c:620 src/messageview.c:175
 #, fuzzy
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Pregled/_Znakovni standard/Srednja Evropa (ISO-8859-_2)"
 
-#: src/compose.c:588 src/mainwindow.c:621 src/messageview.c:178
+#: src/compose.c:588 src/mainwindow.c:624 src/messageview.c:178
 #, fuzzy
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Pregled/_Znakovni standard/_Baltik (ISO-8859-13)"
 
-#: src/compose.c:590 src/mainwindow.c:623 src/messageview.c:180
+#: src/compose.c:590 src/mainwindow.c:626 src/messageview.c:180
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Pregled/_Znakovni standard/Baltik (ISO-8859-_4)"
 
-#: src/compose.c:594 src/mainwindow.c:627 src/messageview.c:183
+#: src/compose.c:594 src/mainwindow.c:630 src/messageview.c:183
 #, fuzzy
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Pregled/_Znakovni standard/Grčka (ISO-8859-_7)"
 
-#: src/compose.c:598 src/mainwindow.c:631 src/messageview.c:186
+#: src/compose.c:598 src/mainwindow.c:634 src/messageview.c:186
+#, fuzzy
+msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
+msgstr "/_Pregled/_Znakovni standard/Baltik (ISO-8859-_4)"
+
+#: src/compose.c:600 src/mainwindow.c:636 src/messageview.c:188
+#, fuzzy
+msgid "/_View/Character _encoding/Arabic (Windows-1256)"
+msgstr "/_Pregled/_Znakovni standard/Ćirilica (Windows-1251)"
+
+#: src/compose.c:604 src/mainwindow.c:640 src/messageview.c:191
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Pregled/_Znakovni standard/Grčka (ISO-8859-_7)"
 
-#: src/compose.c:600 src/mainwindow.c:633 src/messageview.c:188
+#: src/compose.c:606 src/mainwindow.c:642 src/messageview.c:193
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Pregled/_Znakovni standard/Ćirilica (Windows-1251)"
 
-#: src/compose.c:604 src/mainwindow.c:637 src/messageview.c:191
+#: src/compose.c:610 src/mainwindow.c:646 src/messageview.c:196
 #, fuzzy
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Pregled/_Znakovni standard/Turska (ISO-8859-_9)"
 
-#: src/compose.c:608 src/mainwindow.c:641 src/messageview.c:194
+#: src/compose.c:614 src/mainwindow.c:650 src/messageview.c:199
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Pregled/_Znakovni standard/Ćirilica (ISO-8859-_5)"
 
-#: src/compose.c:610 src/mainwindow.c:643 src/messageview.c:196
+#: src/compose.c:616 src/mainwindow.c:652 src/messageview.c:201
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Pregled/_Znakovni standard/Ćirilica (KOI8-_R)"
 
-#: src/compose.c:612 src/mainwindow.c:645 src/messageview.c:198
+#: src/compose.c:618 src/mainwindow.c:654 src/messageview.c:203
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Pregled/_Znakovni standard/Ćirilica (KOI8-_R)"
 
-#: src/compose.c:614 src/mainwindow.c:647 src/messageview.c:200
+#: src/compose.c:620 src/mainwindow.c:656 src/messageview.c:205
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Pregled/_Znakovni standard/Ćirilica (Windows-1251)"
 
-#: src/compose.c:618 src/mainwindow.c:651 src/messageview.c:203
+#: src/compose.c:624 src/mainwindow.c:660 src/messageview.c:208
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Pregled/_Znakovni standard/Japan (ISO-2022-_JP)"
 
-#: src/compose.c:622 src/mainwindow.c:661 src/messageview.c:212
+#: src/compose.c:628 src/mainwindow.c:670 src/messageview.c:217
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Pregled/_Znakovni standard/Pojednostavljeni Kineski (_GB2312)"
 
-#: src/compose.c:624 src/mainwindow.c:663 src/messageview.c:214
+#: src/compose.c:630 src/mainwindow.c:672 src/messageview.c:219
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Pregled/_Znakovni standard/Pojednostavljeni Kineski (_GB2312)"
 
-#: src/compose.c:626 src/mainwindow.c:665 src/messageview.c:216
+#: src/compose.c:632 src/mainwindow.c:674 src/messageview.c:221
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Pregled/_Znakovni standard/Tradicionalni Kineski (_Big5)"
 
-#: src/compose.c:630 src/mainwindow.c:673 src/messageview.c:223
+#: src/compose.c:636 src/mainwindow.c:682 src/messageview.c:228
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Pregled/_Znakovni standard/Koreja (EUC-_KR)"
 
-#: src/compose.c:634 src/mainwindow.c:679 src/messageview.c:228
+#: src/compose.c:640 src/mainwindow.c:688 src/messageview.c:233
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Pregled/_Znakovni standard/Thai (TIS-620)"
 
-#: src/compose.c:636 src/mainwindow.c:681 src/messageview.c:230
+#: src/compose.c:642 src/mainwindow.c:690 src/messageview.c:235
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Pregled/_Znakovni standard/Thai (Windows-874)"
 
-#: src/compose.c:640 src/mainwindow.c:739 src/messageview.c:260
+#: src/compose.c:646 src/mainwindow.c:750 src/messageview.c:265
 msgid "/_Tools/_Address book"
 msgstr "/_Alat/_Adresar"
 
-#: src/compose.c:641
+#: src/compose.c:647
 msgid "/_Tools/_Template"
 msgstr "/_Alat/_Šablon"
 
-#: src/compose.c:642 src/mainwindow.c:762 src/messageview.c:275
+#: src/compose.c:648 src/mainwindow.c:773 src/messageview.c:280
 msgid "/_Tools/Actio_ns"
 msgstr "/_Alat/Akci_je"
 
-#: src/compose.c:643 src/compose.c:647 src/compose.c:653 src/mainwindow.c:742
-#: src/mainwindow.c:756 src/mainwindow.c:761 src/mainwindow.c:763
-#: src/mainwindow.c:766 src/mainwindow.c:768 src/messageview.c:263
-#: src/messageview.c:274
+#: src/compose.c:649 src/compose.c:653 src/compose.c:659 src/mainwindow.c:753
+#: src/mainwindow.c:767 src/mainwindow.c:772 src/mainwindow.c:774
+#: src/mainwindow.c:777 src/mainwindow.c:779 src/messageview.c:268
+#: src/messageview.c:279
 msgid "/_Tools/---"
 msgstr "/_Alati/---"
 
-#: src/compose.c:644
+#: src/compose.c:650
 #, fuzzy
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/_Izmeni/Izmeni sa neza_visnim editorom"
 
-#: src/compose.c:648
+#: src/compose.c:654
 #, fuzzy
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Alat/Akci_je"
 
-#: src/compose.c:649
+#: src/compose.c:655
 #, fuzzy
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/_Poruka/_Enkriptuj"
 
-#: src/compose.c:654
+#: src/compose.c:660
 #, fuzzy
 msgid "/_Tools/_Check spell"
 msgstr "/_Alati/_Izvrši"
 
-#: src/compose.c:655
+#: src/compose.c:661
 #, fuzzy
 msgid "/_Tools/_Set spell language"
 msgstr "/_Alat/_Šablon"
 
-#: src/compose.c:899
+#: src/compose.c:908
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: datoteka ne postoji\n"
 
-#: src/compose.c:1003 src/compose.c:1074
+#: src/compose.c:1012 src/compose.c:1083
 msgid "Can't get text part\n"
 msgstr "Ne mogu dobiti deo teksta\n"
 
-#: src/compose.c:1475
+#: src/compose.c:1484
 msgid "Quote mark format error."
 msgstr "Greška u formatu citata."
 
-#: src/compose.c:1487
+#: src/compose.c:1496
 msgid "Message reply/forward format error."
 msgstr "Greška u poruci odgovori/prosledi."
 
-#: src/compose.c:1907
+#: src/compose.c:1916
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Datoteka %s ne postoji\n"
 
-#: src/compose.c:1911
+#: src/compose.c:1920
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Ne mogu dobiti veličinu datoteke %s\n"
 
-#: src/compose.c:1915
+#: src/compose.c:1924
 #, c-format
 msgid "File %s is empty."
 msgstr "Datoteka %s je prazna."
 
-#: src/compose.c:1919
+#: src/compose.c:1928
 #, c-format
 msgid "Can't read %s."
 msgstr "Ne mogu pročitati %s."
 
-#: src/compose.c:1952
+#: src/compose.c:1961
 #, c-format
 msgid "Message: %s"
 msgstr "Poruka: %s"
 
-#: src/compose.c:2012 src/mimeview.c:565
+#: src/compose.c:2021 src/mimeview.c:565
 msgid "Can't get the part of multipart message."
 msgstr "Ne mogu dobiti deo poruke iz više delova."
 
-#: src/compose.c:2496 src/headerview.c:195 src/query_search.c:636
-#: src/summaryview.c:2107
+#: src/compose.c:2505 src/headerview.c:195 src/query_search.c:636
+#: src/summaryview.c:2124
 msgid "(No Subject)"
 msgstr "(Bez teme)"
 
-#: src/compose.c:2499
+#: src/compose.c:2508
 #, fuzzy, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Pisanje poruke%s"
 
-#: src/compose.c:2612
+#: src/compose.c:2621
 msgid "Recipient is not specified."
 msgstr "Primalac nije upisan."
 
-#: src/compose.c:2620
+#: src/compose.c:2629
 #, fuzzy
 msgid "Empty subject"
 msgstr "Tema"
 
-#: src/compose.c:2621
+#: src/compose.c:2630
 msgid "Subject is empty. Send it anyway?"
 msgstr "Tema je prazna. Ipak poslati?"
 
-#: src/compose.c:2680
+#: src/compose.c:2689
 msgid "can't get recipient list."
 msgstr "ne mogu dobiti listu prilmalaca."
 
-#: src/compose.c:2700
+#: src/compose.c:2709
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1646,22 +1657,22 @@ msgstr ""
 "Nalog za slanje pošte nije definisan.\n"
 "Odaberite nalog pre slanja."
 
-#: src/compose.c:2714 src/send_message.c:299
+#: src/compose.c:2723 src/send_message.c:299
 #, 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:2756
+#: src/compose.c:2765
 msgid "Can't save the message to outbox."
 msgstr "Ne mogu sačuvati poruku u direktorijumu poslato."
 
-#: src/compose.c:2794
+#: src/compose.c:2803
 #, 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:2891
+#: src/compose.c:2900
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1671,12 +1682,12 @@ msgstr ""
 "Ne mogu promeniti kodni raspored poruke.\n"
 "Da je ipak pošaljem?"
 
-#: src/compose.c:2897
+#: src/compose.c:2906
 #, fuzzy
 msgid "Code conversion error"
 msgstr "Greška pri prebacivanju adresara"
 
-#: src/compose.c:2970
+#: src/compose.c:2979
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1685,160 +1696,160 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:2974
+#: src/compose.c:2983
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3264
+#: src/compose.c:3273
 msgid "can't remove the old message\n"
 msgstr "ne mogu skloniti staru poruku\n"
 
-#: src/compose.c:3282
+#: src/compose.c:3291
 msgid "queueing message...\n"
 msgstr "odlaganje poruke...\n"
 
-#: src/compose.c:3364
+#: src/compose.c:3373
 msgid "can't find queue folder\n"
 msgstr "ne mogu da pronađem direktorijum odloženo\n"
 
-#: src/compose.c:3371
+#: src/compose.c:3380
 msgid "can't queue the message\n"
 msgstr "ne mogu odložiti poruku\n"
 
-#: src/compose.c:3964
+#: src/compose.c:3973
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "generisan ID-poruke: %s\n"
 
-#: src/compose.c:4077
+#: src/compose.c:4086
 msgid "Creating compose window...\n"
 msgstr "Stvaranje prozora za pisanje...\n"
 
-#: src/compose.c:4128 src/headerview.c:54
+#: src/compose.c:4137 src/headerview.c:54
 msgid "From:"
 msgstr "Od:"
 
-#: src/compose.c:4202
+#: src/compose.c:4211
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/_Alat/Akci_je"
 
-#: src/compose.c:4205
+#: src/compose.c:4214
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/_Poruka/_Enkriptuj"
 
-#: src/compose.c:4243 src/compose.c:5317
+#: src/compose.c:4252 src/compose.c:5326
 msgid "MIME type"
 msgstr "MIME tip"
 
 #. S_COL_DATE
-#: src/compose.c:4252 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4740
+#: src/compose.c:4261 src/mimeview.c:197 src/prefs_filter_edit.c:496
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4897
 msgid "Size"
 msgstr "Veličina"
 
-#: src/compose.c:4683 src/mainwindow.c:2324 src/prefs_account_dialog.c:528
+#: src/compose.c:4692 src/mainwindow.c:2335 src/prefs_account_dialog.c:528
 #: src/prefs_common_dialog.c:661
 msgid "Send"
 msgstr "Pošalji"
 
-#: src/compose.c:4684
+#: src/compose.c:4693
 msgid "Send message"
 msgstr "Pošalji poruku"
 
-#: src/compose.c:4692
+#: src/compose.c:4701
 msgid "Send later"
 msgstr "Pošalji kasnije"
 
-#: src/compose.c:4693
+#: src/compose.c:4702
 msgid "Put into queue folder and send later"
 msgstr "Odloži u direktotijum odloženo i pošalji kasnije"
 
-#: src/compose.c:4701
+#: src/compose.c:4710
 msgid "Draft"
 msgstr "Nedovršeno"
 
-#: src/compose.c:4702
+#: src/compose.c:4711
 msgid "Save to draft folder"
 msgstr "Sačuvaj u direktorijum nedovršeno"
 
-#: src/compose.c:4712
+#: src/compose.c:4721
 msgid "Insert"
 msgstr "Unesi"
 
-#: src/compose.c:4713
+#: src/compose.c:4722
 msgid "Insert file"
 msgstr "Unesi datoteku"
 
-#: src/compose.c:4721
+#: src/compose.c:4730
 msgid "Attach"
 msgstr "Prikači"
 
-#: src/compose.c:4722
+#: src/compose.c:4731
 msgid "Attach file"
 msgstr "Prikači datoteku"
 
 #. signature
-#: src/compose.c:4732 src/prefs_account_dialog.c:1208
+#: src/compose.c:4741 src/prefs_account_dialog.c:1208
 #: src/prefs_common_dialog.c:953
 msgid "Signature"
 msgstr "Potpis"
 
-#: src/compose.c:4733
+#: src/compose.c:4742
 #, fuzzy
 msgid "Append signature"
 msgstr "LOŠ potpis"
 
 #. editor
-#: src/compose.c:4742 src/prefs_common_dialog.c:991
+#: src/compose.c:4751 src/prefs_common_dialog.c:991
 #: src/prefs_common_dialog.c:2315
 msgid "Editor"
 msgstr "Editor"
 
-#: src/compose.c:4743
+#: src/compose.c:4752
 msgid "Edit with external editor"
 msgstr "Izmeni sa nezavisnim ediorom"
 
-#: src/compose.c:4751
+#: src/compose.c:4760
 msgid "Linewrap"
 msgstr "Sažimanje"
 
-#: src/compose.c:4752
+#: src/compose.c:4761
 msgid "Wrap all long lines"
 msgstr "Sažmi sve duge linije"
 
-#: src/compose.c:5213
+#: src/compose.c:5222
 msgid "Invalid MIME type."
 msgstr "Pogrešan MIME tip"
 
-#: src/compose.c:5231
+#: src/compose.c:5240
 msgid "File doesn't exist or is empty."
 msgstr "Datoteka ne postoji ili je prazna."
 
-#: src/compose.c:5299
+#: src/compose.c:5308
 #, fuzzy
 msgid "Properties"
 msgstr "Svojstva"
 
-#: src/compose.c:5319 src/prefs_common_dialog.c:1444
+#: src/compose.c:5328 src/prefs_common_dialog.c:1444
 msgid "Encoding"
 msgstr "Kodiranje"
 
-#: src/compose.c:5342 src/prefs_folder_item.c:202
+#: src/compose.c:5351 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Putanja"
 
-#: src/compose.c:5343
+#: src/compose.c:5352
 msgid "File name"
 msgstr "Ime datoteke"
 
-#: src/compose.c:5436
+#: src/compose.c:5445
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Naredba za nezavisni editor je pogrešna: `%s'\n"
 
-#: src/compose.c:5482
+#: src/compose.c:5491
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1848,48 +1859,48 @@ msgstr ""
 "Nasilno prekinuti proces?\n"
 "grupa procesa: %d"
 
-#: src/compose.c:5857 src/compose.c:5862 src/compose.c:5868
+#: src/compose.c:5866 src/compose.c:5871 src/compose.c:5877
 msgid "Can't queue the message."
 msgstr "Ne mogu odložiti poruku."
 
-#: src/compose.c:5959
+#: src/compose.c:5968
 #, fuzzy
 msgid "Select files"
 msgstr "Odaberite datoteku"
 
-#: src/compose.c:5982
+#: src/compose.c:5991
 msgid "Select file"
 msgstr "Odaberite datoteku"
 
-#: src/compose.c:6017
+#: src/compose.c:6026
 #, fuzzy
 msgid "Save message"
 msgstr "Pošalji poruku"
 
-#: src/compose.c:6018
+#: src/compose.c:6027
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Ova poruka je promenjena, odbaciti?"
 
-#: src/compose.c:6020
+#: src/compose.c:6029
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:6062
+#: src/compose.c:6071
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Želite li primeniti šablon `%s'?"
 
-#: src/compose.c:6064
+#: src/compose.c:6073
 msgid "Apply template"
 msgstr "Primeni šablon"
 
-#: src/compose.c:6065
+#: src/compose.c:6074
 #, fuzzy
 msgid "_Replace"
 msgstr "Zameni"
 
-#: src/compose.c:6065
+#: src/compose.c:6074
 #, fuzzy
 msgid "_Insert"
 msgstr "Unesi"
@@ -2330,7 +2341,7 @@ msgstr "Novo"
 
 #. S_COL_MARK
 #: src/folderview.c:412 src/prefs_filter_edit.c:500
-#: src/prefs_summary_column.c:71 src/summaryview.c:509
+#: src/prefs_summary_column.c:71 src/summaryview.c:511
 msgid "Unread"
 msgstr "Nepročitano"
 
@@ -2346,12 +2357,12 @@ msgstr "Postavljam info direktorijuma...\n"
 msgid "Setting folder info..."
 msgstr "Postavljam info direktorijuma..."
 
-#: src/folderview.c:858 src/mainwindow.c:3464 src/setup.c:80
+#: src/folderview.c:858 src/mainwindow.c:3481 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Pretražujem direktorijume %s%c%s ..."
 
-#: src/folderview.c:862 src/mainwindow.c:3469 src/setup.c:85
+#: src/folderview.c:862 src/mainwindow.c:3486 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Pretražujem direktorijum %s ..."
@@ -2377,7 +2388,7 @@ msgstr "Osvežavam stablo direktorijuma..."
 msgid "Checking for new messages in all folders..."
 msgstr "Proveravanje novih poruka u svim direktorijumima..."
 
-#: src/folderview.c:1200 src/mainwindow.c:2400 src/prefs_common_dialog.c:1789
+#: src/folderview.c:1200 src/mainwindow.c:2411 src/prefs_common_dialog.c:1789
 msgid "Junk"
 msgstr ""
 
@@ -2516,7 +2527,7 @@ msgstr "Tema:"
 msgid "Creating header view...\n"
 msgstr "Stvaram pregled zaglavlja...\n"
 
-#: src/headerview.c:180 src/query_search.c:637 src/summaryview.c:2110
+#: src/headerview.c:180 src/query_search.c:637 src/summaryview.c:2127
 msgid "(No From)"
 msgstr "(Bez pošiljaoca)"
 
@@ -2625,7 +2636,7 @@ msgstr "Unesi LDIF datoteku u Adresar"
 msgid "Prev"
 msgstr "Preth."
 
-#: src/importldif.c:768 src/mainwindow.c:2420
+#: src/importldif.c:768 src/mainwindow.c:2431
 msgid "Next"
 msgstr "Sled."
 
@@ -2965,678 +2976,683 @@ msgstr ""
 msgid "another Sylpheed is already running.\n"
 msgstr "drugi Sylpheed već radi.\n"
 
-#: src/main.c:1064
+#: src/main.c:1083
 #, fuzzy
 msgid "Migration of configuration"
 msgstr "Pisanje konfiguracije za akcije...\n"
 
-#: src/main.c:1065
+#: src/main.c:1084
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
 msgstr ""
 
-#: src/mainwindow.c:478
+#: src/mainwindow.c:481
 msgid "/_File/_Folder"
 msgstr "/_Datoteka/_Direktorijum"
 
-#: src/mainwindow.c:479
+#: src/mainwindow.c:482
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/_Datoteka/_Direktorijum/Kreiraj _novi direktorijum..."
 
-#: src/mainwindow.c:481
+#: src/mainwindow.c:484
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/_Datoteka/_Direktorijum/_Preimenuj direktorijum..."
 
-#: src/mainwindow.c:482
+#: src/mainwindow.c:485
 #, fuzzy
 msgid "/_File/_Folder/_Move folder..."
 msgstr "/_Datoteka/_Direktorijum/_Preimenuj direktorijum..."
 
-#: src/mainwindow.c:483
+#: src/mainwindow.c:486
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/_Datoteka/_Direktorijum/_Obriši direktorijum"
 
-#: src/mainwindow.c:484
+#: src/mainwindow.c:487
 #, fuzzy
 msgid "/_File/_Mailbox"
 msgstr "/_Datoteka/Dodaj _sanduče..."
 
-#: src/mainwindow.c:485
+#: src/mainwindow.c:488
 #, fuzzy
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/_Datoteka/Dodaj _sanduče..."
 
-#: src/mainwindow.c:486
+#: src/mainwindow.c:489
 #, fuzzy
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/_Ukloni sanduče"
 
-#: src/mainwindow.c:487 src/mainwindow.c:492
+#: src/mainwindow.c:490 src/mainwindow.c:495
 #, fuzzy
 msgid "/_File/_Mailbox/---"
 msgstr "/_Datoteka/_Direktorijum"
 
-#: src/mainwindow.c:488
+#: src/mainwindow.c:491
 #, fuzzy
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "/_Proveri ima li novih poruka"
 
-#: src/mainwindow.c:490
+#: src/mainwindow.c:493
 #, fuzzy
 msgid "/_File/_Mailbox/Check for new messages in _all mailboxes"
 msgstr "/_Datoteka/_Proveri nove poruke u svim direktorijumima"
 
-#: src/mainwindow.c:493
+#: src/mainwindow.c:496
 #, fuzzy
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "/Osv_eži stablo direktorijuma"
 
-#: src/mainwindow.c:496
+#: src/mainwindow.c:499
 msgid "/_File/_Import mbox file..."
 msgstr "/_Datoteka/_Unos mbox datoteku..."
 
-#: src/mainwindow.c:497
+#: src/mainwindow.c:500
 msgid "/_File/_Export to mbox file..."
 msgstr "/_Datoteka/_Izvoz u mbox datoteku..."
 
-#: src/mainwindow.c:499
+#: src/mainwindow.c:502
 #, fuzzy
 msgid "/_File/Empty all _trash"
 msgstr "/_Datotkea/Isprazni s_meće"
 
-#: src/mainwindow.c:501 src/messageview.c:139
+#: src/mainwindow.c:504 src/messageview.c:139
 msgid "/_File/_Save as..."
 msgstr "/_Datoteka/Snimanje _kao..."
 
-#: src/mainwindow.c:502 src/messageview.c:140
+#: src/mainwindow.c:505 src/messageview.c:140
 msgid "/_File/_Print..."
 msgstr "/_Datoteka/Štampanje..."
 
-#: src/mainwindow.c:504
+#: src/mainwindow.c:507
 #, fuzzy
 msgid "/_File/_Work offline"
 msgstr "/_Datoteka/_Unesi datoteku"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:507
+#: src/mainwindow.c:510
 msgid "/_File/E_xit"
 msgstr "/_Datoteka/I_zlaz"
 
-#: src/mainwindow.c:512
+#: src/mainwindow.c:515
 msgid "/_Edit/Select _thread"
 msgstr "/_Izmene/Odaberi _thread"
 
-#: src/mainwindow.c:514 src/messageview.c:148
+#: src/mainwindow.c:517 src/messageview.c:148
 msgid "/_Edit/_Find in current message..."
 msgstr "/_Izmne/P_retraga u trenutnoj poruci..."
 
-#: src/mainwindow.c:516
+#: src/mainwindow.c:519
 msgid "/_Edit/_Search messages..."
 msgstr "/_Izmene/_Traži poruke..."
 
-#: src/mainwindow.c:519
+#: src/mainwindow.c:522
 msgid "/_View/Show or hi_de"
 msgstr "/_Pregled/Prikaži ili s_kloni"
 
-#: src/mainwindow.c:520
+#: src/mainwindow.c:523
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/_Pregled/Prikaži ili s_kloni/_Drvo direktorijuma"
 
-#: src/mainwindow.c:522
+#: src/mainwindow.c:525
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/_Pregled/Prikaži ili s_kloni/_Pregled poruka"
 
-#: src/mainwindow.c:524
+#: src/mainwindow.c:527
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/_Pregled/Prikaži ili s_kloni/_Traka za alat"
 
-#: src/mainwindow.c:526
+#: src/mainwindow.c:529
 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:528
+#: src/mainwindow.c:531
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/_Pregled/Prikaži ili s_kloni/_Traka alata/_Ikone"
 
-#: src/mainwindow.c:530
+#: src/mainwindow.c:533
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/_Pregled/Prikaži ili s_kloni/_Traka alata/_Tekst"
 
-#: src/mainwindow.c:532
+#: src/mainwindow.c:535
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/_Pregled/Prikaži ili s_kloni/_Traka alata/_Ništa"
 
-#: src/mainwindow.c:534
+#: src/mainwindow.c:537
 #, fuzzy
 msgid "/_View/Show or hi_de/_Search bar"
 msgstr "/_Pregled/Prikaži ili s_kloni/Stat_us traka"
 
-#: src/mainwindow.c:536
+#: src/mainwindow.c:539
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/_Pregled/Prikaži ili s_kloni/Stat_us traka"
 
-#: src/mainwindow.c:539
+#: src/mainwindow.c:542
 msgid "/_View/Separate f_older tree"
 msgstr "/_Pregled/Odvoji sta_blo direktorijuma"
 
-#: src/mainwindow.c:540
+#: src/mainwindow.c:543
 #, fuzzy
 msgid "/_View/Separate _message view"
 msgstr "/_Pregled/Odvoji pre_gled poruka"
 
-#: src/mainwindow.c:542
+#: src/mainwindow.c:545
 msgid "/_View/_Sort"
 msgstr "/_Pregled/_Složi"
 
-#: src/mainwindow.c:543
+#: src/mainwindow.c:546
 msgid "/_View/_Sort/by _number"
 msgstr "/_Pregled/_Složi/po _broju"
 
-#: src/mainwindow.c:544
+#: src/mainwindow.c:547
 msgid "/_View/_Sort/by s_ize"
 msgstr "/_Pregled/_Složi/po _veličini"
 
-#: src/mainwindow.c:545
+#: src/mainwindow.c:548
 msgid "/_View/_Sort/by _date"
 msgstr "/_Pregled/_Složi/po _datumu"
 
-#: src/mainwindow.c:546
+#: src/mainwindow.c:549
 #, fuzzy
 msgid "/_View/_Sort/by t_hread date"
 msgstr "/_Pregled/_Složi/po _datumu"
 
-#: src/mainwindow.c:547
+#: src/mainwindow.c:550
 msgid "/_View/_Sort/by _from"
 msgstr "/_Pregled/_Složi/po _pošiljaocu"
 
-#: src/mainwindow.c:548
+#: src/mainwindow.c:551
 #, fuzzy
 msgid "/_View/_Sort/by _recipient"
 msgstr "/_Pregled/_Složi/po _veličini"
 
-#: src/mainwindow.c:549
+#: src/mainwindow.c:552
 msgid "/_View/_Sort/by _subject"
 msgstr "/_Pregled/_Složi/po _temi"
 
-#: src/mainwindow.c:550
+#: src/mainwindow.c:553
 msgid "/_View/_Sort/by _color label"
 msgstr "/_Pregled/_Složi/po oznaci bo_je"
 
-#: src/mainwindow.c:552
+#: src/mainwindow.c:555
 msgid "/_View/_Sort/by _mark"
 msgstr "/_Pregled/_Složi/po _oznaci"
 
-#: src/mainwindow.c:553
+#: src/mainwindow.c:556
 msgid "/_View/_Sort/by _unread"
 msgstr "/_Pregled/_Složi/po _nepročitanom"
 
-#: src/mainwindow.c:554
+#: src/mainwindow.c:557
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/_Pregled/_Složi/po dodat_ku"
 
-#: src/mainwindow.c:556
+#: src/mainwindow.c:559
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/_Pregled/_Složi/Nemoj složiti"
 
-#: src/mainwindow.c:557 src/mainwindow.c:560
+#: src/mainwindow.c:560 src/mainwindow.c:563
 msgid "/_View/_Sort/---"
 msgstr "/_Pregled/_Složi/---"
 
-#: src/mainwindow.c:558
+#: src/mainwindow.c:561
 msgid "/_View/_Sort/Ascending"
 msgstr "/_Pregled/_Složi/Rastuće"
 
-#: src/mainwindow.c:559
+#: src/mainwindow.c:562
 msgid "/_View/_Sort/Descending"
 msgstr "/_Pregled/_Složi/Opadajuće"
 
-#: src/mainwindow.c:561
+#: src/mainwindow.c:564
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/_Pregled/_Složi/Privuci po te_mi"
 
-#: src/mainwindow.c:563
+#: src/mainwindow.c:566
 msgid "/_View/Th_read view"
 msgstr "/_Pregled/Th_read izgled"
 
-#: src/mainwindow.c:564
+#: src/mainwindow.c:567
 msgid "/_View/E_xpand all threads"
 msgstr "/_Pregled/Proširi kompletan t_hread"
 
-#: src/mainwindow.c:565
+#: src/mainwindow.c:568
 msgid "/_View/Co_llapse all threads"
 msgstr "/_Pregled/Skupi komp_letan thread"
 
-#: src/mainwindow.c:566
+#: src/mainwindow.c:569
 msgid "/_View/Set display _item..."
 msgstr "/_Pregled/Postavi po_jedinosti prikaza..."
 
-#: src/mainwindow.c:569
+#: src/mainwindow.c:572
 msgid "/_View/_Go to"
 msgstr "/_Pregled/_Idi do"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:573
 msgid "/_View/_Go to/_Prev message"
 msgstr "/_Pregled/_Idi do/_Prethodne poruke"
 
-#: src/mainwindow.c:571
+#: src/mainwindow.c:574
 msgid "/_View/_Go to/_Next message"
 msgstr "/_Pregled/_Idi do/_Sledeće poruke"
 
-#: src/mainwindow.c:572 src/mainwindow.c:577 src/mainwindow.c:580
-#: src/mainwindow.c:585 src/mainwindow.c:590
+#: src/mainwindow.c:575 src/mainwindow.c:580 src/mainwindow.c:583
+#: src/mainwindow.c:588 src/mainwindow.c:593
 msgid "/_View/_Go to/---"
 msgstr "/_Pregled/_Idi do/---"
 
-#: src/mainwindow.c:573
+#: src/mainwindow.c:576
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/_Pregled/_Idi do/Prethodne _nepročitane poruke"
 
-#: src/mainwindow.c:575
+#: src/mainwindow.c:578
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/_Pregled/_Idi do/S_ledeće nepročitane poruke"
 
-#: src/mainwindow.c:578
+#: src/mainwindow.c:581
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/_Pregled/_Idi do/Prethodne n_ove poruke"
 
-#: src/mainwindow.c:579
+#: src/mainwindow.c:582
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/_Pregled/_Idi do/Sledeće no_ve poruke"
 
-#: src/mainwindow.c:581
+#: src/mainwindow.c:584
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/_Pregled/_Idi do/Prethodne oz_načene poruke"
 
-#: src/mainwindow.c:583
+#: src/mainwindow.c:586
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/_Pregled/_Idi do/Sledeće o_značene poruke"
 
-#: src/mainwindow.c:586
+#: src/mainwindow.c:589
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/_Pregled/_Idi do/Prethodne etiketirane poruke"
 
-#: src/mainwindow.c:588
+#: src/mainwindow.c:591
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/_Pregled/_Idi do/Sledeće etiketirane poruke"
 
-#: src/mainwindow.c:591
+#: src/mainwindow.c:594
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Pregled/_Idi do/Dru_gog direktorijuma..."
 
-#: src/mainwindow.c:600 src/messageview.c:159
+#: src/mainwindow.c:603 src/messageview.c:159
 #, fuzzy
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Pregled/_Znakovni standard/_Auto detekcija"
 
-#: src/mainwindow.c:613 src/messageview.c:172
+#: src/mainwindow.c:616 src/messageview.c:172
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr "/_Pregled/_Znakovni standard/Zapadna Evropa (ISO-8859-15)"
 
-#: src/mainwindow.c:653 src/messageview.c:205
+#: src/mainwindow.c:662 src/messageview.c:210
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Pregled/_Znakovni standard/Japan (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:655 src/messageview.c:207
+#: src/mainwindow.c:664 src/messageview.c:212
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Pregled/_Znakovni standard/Japan (_EUC-JP)"
 
-#: src/mainwindow.c:657 src/messageview.c:209
+#: src/mainwindow.c:666 src/messageview.c:214
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Pregled/_Znakovni standard/Japan (_Shift__JIS)"
 
-#: src/mainwindow.c:667 src/messageview.c:218
+#: src/mainwindow.c:676 src/messageview.c:223
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Pregled/_Znakovni standard/Tradicionalni Kineski (EUC-_TW)"
 
-#: src/mainwindow.c:669 src/messageview.c:220
+#: src/mainwindow.c:678 src/messageview.c:225
 #, fuzzy
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Pregled/_Znakovni standard/Kina (ISO-2022-_CN)"
 
-#: src/mainwindow.c:675 src/messageview.c:225
+#: src/mainwindow.c:684 src/messageview.c:230
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Pregled/_Znakovni standard/Koreja (ISO-2022-KR)"
 
-#: src/mainwindow.c:688 src/summaryview.c:449
+#: src/mainwindow.c:697 src/summaryview.c:451
 msgid "/_View/Open in new _window"
 msgstr "/_Pregled/Otvori u novom _prozoru"
 
-#: src/mainwindow.c:689 src/messageview.c:237
+#: src/mainwindow.c:698 src/messageview.c:242
 msgid "/_View/Mess_age source"
 msgstr "/_Pregled/Iz_vor poruke"
 
-#: src/mainwindow.c:690 src/messageview.c:238
+#: src/mainwindow.c:699 src/messageview.c:243
 msgid "/_View/Show all _header"
 msgstr "/_Pregled/Prikaži kompletno _zaglavlje"
 
-#: src/mainwindow.c:692
+#: src/mainwindow.c:701
 msgid "/_View/_Update summary"
 msgstr "/_Pregled/_Osveži rezime"
 
-#: src/mainwindow.c:694 src/messageview.c:240
+#: src/mainwindow.c:703 src/messageview.c:245
 msgid "/_Message"
 msgstr "/_Poruka"
 
-#: src/mainwindow.c:695
+#: src/mainwindow.c:704
 #, fuzzy
 msgid "/_Message/Recei_ve"
 msgstr "/_Poruka/I_zmeni/"
 
-#: src/mainwindow.c:696
+#: src/mainwindow.c:705
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/_Poruka/Prove_ri sa svih naloga"
 
-#: src/mainwindow.c:698
+#: src/mainwindow.c:707
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/_Poruka/Prove_ri sa svih naloga"
 
-#: src/mainwindow.c:700
+#: src/mainwindow.c:709
 #, fuzzy
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/_Poruka/Prekini pri_manje"
 
-#: src/mainwindow.c:702
+#: src/mainwindow.c:711
 #, fuzzy
 msgid "/_Message/Recei_ve/---"
 msgstr "/_Poruka/I_zmeni/"
 
-#: src/mainwindow.c:703
+#: src/mainwindow.c:712
 msgid "/_Message/_Send queued messages"
 msgstr "/_Poruka/Pošalji _odložene poruke"
 
-#: src/mainwindow.c:704 src/mainwindow.c:706 src/mainwindow.c:713
-#: src/mainwindow.c:718 src/mainwindow.c:721 src/mainwindow.c:730
-#: src/mainwindow.c:732 src/mainwindow.c:735 src/messageview.c:243
-#: src/messageview.c:251 src/messageview.c:256
+#: src/mainwindow.c:713 src/mainwindow.c:715 src/mainwindow.c:722
+#: src/mainwindow.c:727 src/mainwindow.c:730 src/mainwindow.c:741
+#: src/mainwindow.c:743 src/mainwindow.c:746 src/messageview.c:248
+#: src/messageview.c:256 src/messageview.c:261
 msgid "/_Message/---"
 msgstr "/_Poruka/---"
 
-#: src/mainwindow.c:705 src/messageview.c:241
+#: src/mainwindow.c:714 src/messageview.c:246
 msgid "/_Message/Compose _new message"
 msgstr "/_Poruka/Sastavi _novu poruku"
 
-#: src/mainwindow.c:707 src/messageview.c:244
+#: src/mainwindow.c:716 src/messageview.c:249
 msgid "/_Message/_Reply"
 msgstr "/_Poruka/O_dgovor"
 
-#: src/mainwindow.c:708
+#: src/mainwindow.c:717
 msgid "/_Message/Repl_y to"
 msgstr "/_Poruka/O_dgovori"
 
-#: src/mainwindow.c:709 src/messageview.c:245
+#: src/mainwindow.c:718 src/messageview.c:250
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Poruka/Odgovori/svim_a"
 
-#: src/mainwindow.c:710 src/messageview.c:247
+#: src/mainwindow.c:719 src/messageview.c:252
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Poruka/Odgovori/pošil_jaocu"
 
-#: src/mainwindow.c:711 src/messageview.c:249
+#: src/mainwindow.c:720 src/messageview.c:254
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Poruka/Odgovori/li_sti"
 
-#: src/mainwindow.c:714 src/messageview.c:252
+#: src/mainwindow.c:723 src/messageview.c:257
 msgid "/_Message/_Forward"
 msgstr "/_Poruka/_Prosledi"
 
-#: src/mainwindow.c:715 src/messageview.c:253
+#: src/mainwindow.c:724 src/messageview.c:258
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Poruka/P_rosledi kao spajalicu"
 
-#: src/mainwindow.c:717 src/messageview.c:255
+#: src/mainwindow.c:726 src/messageview.c:260
 msgid "/_Message/Redirec_t"
 msgstr "/_Poruka/Preus_meri"
 
-#: src/mainwindow.c:719
+#: src/mainwindow.c:728
 msgid "/_Message/M_ove..."
 msgstr "/_Poruka/Premeštanje..."
 
-#: src/mainwindow.c:720
+#: src/mainwindow.c:729
 msgid "/_Message/_Copy..."
 msgstr "/_Poruka/_Kopiranje..."
 
-#: src/mainwindow.c:722
+#: src/mainwindow.c:731
 msgid "/_Message/_Mark"
 msgstr "/_Poruka/Označi"
 
-#: src/mainwindow.c:723
+#: src/mainwindow.c:732
 msgid "/_Message/_Mark/_Mark"
 msgstr "/_Poruka/O_znači/_Označi"
 
-#: src/mainwindow.c:724
+#: src/mainwindow.c:733
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/_Poruka/O_znači/_Ukloni oznaku"
 
-#: src/mainwindow.c:725
+#: src/mainwindow.c:734
 msgid "/_Message/_Mark/---"
 msgstr "/_Poruka/O_znači/---"
 
-#: src/mainwindow.c:726
+#: src/mainwindow.c:735
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/_Poruka/O_znači/Označi kao _nepročitano"
 
-#: src/mainwindow.c:727
+#: src/mainwindow.c:736
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/_Poruka/O_znači/Označi kao _pročitano"
 
-#: src/mainwindow.c:729
+#: src/mainwindow.c:738
+#, fuzzy
+msgid "/_Message/_Mark/Mark _thread as read"
+msgstr "/_Poruka/O_znači/Označi kao _pročitano"
+
+#: src/mainwindow.c:740
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/_Poruka/O_znači/Označi sve _pročitano"
 
-#: src/mainwindow.c:731
+#: src/mainwindow.c:742
 msgid "/_Message/_Delete"
 msgstr "/_Poruka/Brisanje..."
 
-#: src/mainwindow.c:733
+#: src/mainwindow.c:744
 #, fuzzy
 msgid "/_Message/Set as _junk mail"
 msgstr "/_Poruka/Prover_i novu poštu"
 
-#: src/mainwindow.c:734
+#: src/mainwindow.c:745
 #, fuzzy
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/_Poruka/Prover_i novu poštu"
 
-#: src/mainwindow.c:736 src/messageview.c:257
+#: src/mainwindow.c:747 src/messageview.c:262
 msgid "/_Message/Re-_edit"
 msgstr "/_Poruka/I_zmeni/"
 
-#: src/mainwindow.c:740
+#: src/mainwindow.c:751
 #, fuzzy
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/_Alati/Dodaj pošiljaoca u adresar"
 
-#: src/mainwindow.c:743
+#: src/mainwindow.c:754
 #, fuzzy
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/_Alati/_Filtriraj poruke"
 
-#: src/mainwindow.c:745
+#: src/mainwindow.c:756
 #, fuzzy
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Alati/_Filtriraj poruke"
 
-#: src/mainwindow.c:747 src/messageview.c:264
+#: src/mainwindow.c:758 src/messageview.c:269
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Alati/_Napravi pravilo za filtriranje"
 
-#: src/mainwindow.c:748 src/messageview.c:266
+#: src/mainwindow.c:759 src/messageview.c:271
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Alati/_Napravi pravilo za filtriranje/_Automatski"
 
-#: src/mainwindow.c:750 src/messageview.c:268
+#: src/mainwindow.c:761 src/messageview.c:273
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Alati/_Napravi pravilo za filtriranje/Po _Od"
 
-#: src/mainwindow.c:752 src/messageview.c:270
+#: src/mainwindow.c:763 src/messageview.c:275
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Alati/_Napravi pravilo za filtriranje/Po _Za"
 
-#: src/mainwindow.c:754 src/messageview.c:272
+#: src/mainwindow.c:765 src/messageview.c:277
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Alati/_Napravi pravilo za filtriranje/Po _temi"
 
-#: src/mainwindow.c:757
+#: src/mainwindow.c:768
 #, fuzzy
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/_Alati/_Filtriraj poruke"
 
-#: src/mainwindow.c:759
+#: src/mainwindow.c:770
 #, fuzzy
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/_Alati/_Filtriraj poruke"
 
-#: src/mainwindow.c:764
+#: src/mainwindow.c:775
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/_Alati/_Obriši duple poruke"
 
-#: src/mainwindow.c:767
+#: src/mainwindow.c:778
 msgid "/_Tools/E_xecute"
 msgstr "/_Alati/_Izvrši"
 
-#: src/mainwindow.c:769
+#: src/mainwindow.c:780
 msgid "/_Tools/_Log window"
 msgstr "/_Alati/Proyor za logove"
 
-#: src/mainwindow.c:771
+#: src/mainwindow.c:782
 msgid "/_Configuration"
 msgstr "/_Konfiguracija"
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:783
 msgid "/_Configuration/_Common preferences..."
 msgstr "/_Konfiguracija/U_običajene postavke..."
 
-#: src/mainwindow.c:774
+#: src/mainwindow.c:785
 msgid "/_Configuration/_Filter setting..."
 msgstr "/_Konfiguracija/Postavke _filtera..."
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:787
 msgid "/_Configuration/_Template..."
 msgstr "/_Konfiguracija/_Šablon..."
 
-#: src/mainwindow.c:777
+#: src/mainwindow.c:788
 msgid "/_Configuration/_Actions..."
 msgstr "/_Konfiguracija/_Akcije..."
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:789
 msgid "/_Configuration/---"
 msgstr "/_Konfiguracija/---"
 
-#: src/mainwindow.c:779
+#: src/mainwindow.c:790
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Konfiguracija/_Postavke za trenutni nalog..."
 
-#: src/mainwindow.c:781
+#: src/mainwindow.c:792
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Konfiguracija/Napravi _nov nalog..."
 
-#: src/mainwindow.c:783
+#: src/mainwindow.c:794
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Konfiguracija/_Izmeni naloge..."
 
-#: src/mainwindow.c:785
+#: src/mainwindow.c:796
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Konfiguracija/Promeni _trenutni nalog"
 
-#: src/mainwindow.c:789
+#: src/mainwindow.c:800
 msgid "/_Help/_Manual"
 msgstr "/_Pomoć/_Priručnik"
 
-#: src/mainwindow.c:790
+#: src/mainwindow.c:801
 msgid "/_Help/_Manual/_English"
 msgstr "/_Pomoć/_Priručnik/_Engleski"
 
-#: src/mainwindow.c:791
+#: src/mainwindow.c:802
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/_Pomoć/_Priručnik/_Japanski"
 
-#: src/mainwindow.c:792
+#: src/mainwindow.c:803
 msgid "/_Help/_FAQ"
 msgstr "/_Pomoć/_FAQ"
 
-#: src/mainwindow.c:793
+#: src/mainwindow.c:804
 msgid "/_Help/_FAQ/_English"
 msgstr "/_Pomoć/_FAQ/_Engleski"
 
-#: src/mainwindow.c:794
+#: src/mainwindow.c:805
 msgid "/_Help/_FAQ/_German"
 msgstr "/_Pomoć/_FAQ/_Nemački"
 
-#: src/mainwindow.c:795
+#: src/mainwindow.c:806
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/_Pomoć/_FAQ/_Španski"
 
-#: src/mainwindow.c:796
+#: src/mainwindow.c:807
 msgid "/_Help/_FAQ/_French"
 msgstr "/_Pomoć/_FAQ/_Francuski"
 
-#: src/mainwindow.c:797
+#: src/mainwindow.c:808
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/_Pomoć/_FAQ/_Italijanski"
 
-#: src/mainwindow.c:798
+#: src/mainwindow.c:809
 msgid "/_Help/---"
 msgstr "/_Pomoć/---"
 
-#: src/mainwindow.c:841
+#: src/mainwindow.c:852
 msgid "Creating main window...\n"
 msgstr "Kreiranje glavnih prozora...\n"
 
-#: src/mainwindow.c:1011
+#: src/mainwindow.c:1022
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Glavni Prozor: prikaz boje %d nije uspeo\n"
 
-#: src/mainwindow.c:1108 src/summaryview.c:2258 src/summaryview.c:2343
-#: src/summaryview.c:3739 src/summaryview.c:3868 src/summaryview.c:4226
+#: src/mainwindow.c:1119 src/summaryview.c:2275 src/summaryview.c:2360
+#: src/summaryview.c:3896 src/summaryview.c:4025 src/summaryview.c:4383
 msgid "done.\n"
 msgstr "gotovo.\n"
 
-#: src/mainwindow.c:1235 src/mainwindow.c:1276 src/mainwindow.c:1301
+#: src/mainwindow.c:1246 src/mainwindow.c:1287 src/mainwindow.c:1312
 msgid "Untitled"
 msgstr "Neimenovano"
 
-#: src/mainwindow.c:1302
+#: src/mainwindow.c:1313
 msgid "none"
 msgstr "ništa"
 
-#: src/mainwindow.c:1355
+#: src/mainwindow.c:1366
 #, 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:1605
+#: src/mainwindow.c:1616
 msgid "Offline"
 msgstr ""
 
-#: src/mainwindow.c:1606
+#: src/mainwindow.c:1617
 msgid "You are offline. Go online?"
 msgstr ""
 
-#: src/mainwindow.c:1623
+#: src/mainwindow.c:1634
 #, fuzzy
 msgid "Empty all trash"
 msgstr "Isprazni smeće"
 
-#: src/mainwindow.c:1624
+#: src/mainwindow.c:1635
 #, fuzzy
 msgid "Delete all messages in trash folders?"
 msgstr "Isprazniti sve poruke iz smeća?"
 
-#: src/mainwindow.c:1652
+#: src/mainwindow.c:1663
 msgid "Add mailbox"
 msgstr "Dodaj sanduče"
 
-#: src/mainwindow.c:1653
+#: src/mainwindow.c:1664
 #, fuzzy
 msgid ""
 "Specify the location of mailbox.\n"
@@ -3647,16 +3663,16 @@ msgstr ""
 "Ako je unešen postojeće sanduče, automatski\n"
 "će biti pretražen."
 
-#: src/mainwindow.c:1659 src/setup.c:49
+#: src/mainwindow.c:1670 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Sanduče`%s' već postoji."
 
-#: src/mainwindow.c:1664 src/setup.c:56
+#: src/mainwindow.c:1675 src/setup.c:56
 msgid "Mailbox"
 msgstr "Sanduče"
 
-#: src/mainwindow.c:1670 src/setup.c:62
+#: src/mainwindow.c:1681 src/setup.c:62
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3665,149 +3681,149 @@ msgstr ""
 "Kreiranje sandučeta nije uspelo.\n"
 "Možda neke datoteke već postoje ili nemate pravo pisanja u direktoriju."
 
-#: src/mainwindow.c:2088
+#: src/mainwindow.c:2099
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Direktorijumi"
 
-#: src/mainwindow.c:2107
+#: src/mainwindow.c:2118
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Poruke"
 
-#: src/mainwindow.c:2259 src/summaryview.c:408
+#: src/mainwindow.c:2270 src/summaryview.c:408
 msgid "/_Reply"
 msgstr "/Od_govor"
 
-#: src/mainwindow.c:2260
+#: src/mainwindow.c:2271
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "Odgovori svima"
 
-#: src/mainwindow.c:2261
+#: src/mainwindow.c:2272
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/O_dgovori/_pošiljaocu"
 
-#: src/mainwindow.c:2262
+#: src/mainwindow.c:2273
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/O_dgovori/na mailing _listu"
 
-#: src/mainwindow.c:2267 src/summaryview.c:415
+#: src/mainwindow.c:2278 src/summaryview.c:415
 msgid "/_Forward"
 msgstr "/P_rosledi"
 
-#: src/mainwindow.c:2268 src/summaryview.c:416
+#: src/mainwindow.c:2279 src/summaryview.c:416
 msgid "/For_ward as attachment"
 msgstr "/Pro_sledi kao dodatak"
 
-#: src/mainwindow.c:2269 src/summaryview.c:417
+#: src/mainwindow.c:2280 src/summaryview.c:417
 msgid "/Redirec_t"
 msgstr "/Pre_usmeri"
 
-#: src/mainwindow.c:2305
+#: src/mainwindow.c:2316
 msgid "Get"
 msgstr "Primi"
 
-#: src/mainwindow.c:2306
+#: src/mainwindow.c:2317
 msgid "Incorporate new mail"
 msgstr "Prima novu poštu"
 
-#: src/mainwindow.c:2313
+#: src/mainwindow.c:2324
 msgid "Get all"
 msgstr "Primi sve"
 
-#: src/mainwindow.c:2314
+#: src/mainwindow.c:2325
 msgid "Incorporate new mail of all accounts"
 msgstr "Prima novu poštu sa svih naloga"
 
-#: src/mainwindow.c:2325
+#: src/mainwindow.c:2336
 msgid "Send queued message(s)"
 msgstr "Šalje odložene poruku/e"
 
-#: src/mainwindow.c:2335 src/prefs_account_dialog.c:530
+#: src/mainwindow.c:2346 src/prefs_account_dialog.c:530
 #: src/prefs_common_dialog.c:663 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "Napiši"
 
-#: src/mainwindow.c:2336
+#: src/mainwindow.c:2347
 msgid "Compose new message"
 msgstr "Napiši novu poruku"
 
-#: src/mainwindow.c:2344 src/prefs_common_dialog.c:975
+#: src/mainwindow.c:2355 src/prefs_common_dialog.c:975
 msgid "Reply"
 msgstr "Odgovori"
 
-#: src/mainwindow.c:2345 src/mainwindow.c:2358
+#: src/mainwindow.c:2356 src/mainwindow.c:2369
 msgid "Reply to the message"
 msgstr "Odgovari na poruku"
 
-#: src/mainwindow.c:2362
+#: src/mainwindow.c:2373
 msgid "Reply all"
 msgstr "Odgovori na sve"
 
-#: src/mainwindow.c:2363
+#: src/mainwindow.c:2374
 msgid "Reply to all"
 msgstr "Odgovori svima"
 
-#: src/mainwindow.c:2371 src/prefs_filter_edit.c:672
+#: src/mainwindow.c:2382 src/prefs_filter_edit.c:672
 msgid "Forward"
 msgstr "Prosledi"
 
-#: src/mainwindow.c:2372 src/mainwindow.c:2385
+#: src/mainwindow.c:2383 src/mainwindow.c:2396
 msgid "Forward the message"
 msgstr "Prosleđuje poruku"
 
-#: src/mainwindow.c:2392
+#: src/mainwindow.c:2403
 msgid "Delete the message"
 msgstr "Obriši poruku"
 
-#: src/mainwindow.c:2401
+#: src/mainwindow.c:2412
 #, fuzzy
 msgid "Set as junk mail"
 msgstr "Postavi kao uobičajeni"
 
-#: src/mainwindow.c:2410
+#: src/mainwindow.c:2421
 msgid "Execute"
 msgstr "Izvrši"
 
-#: src/mainwindow.c:2411
+#: src/mainwindow.c:2422
 msgid "Execute marked process"
 msgstr "Izvrši označene procese"
 
-#: src/mainwindow.c:2421
+#: src/mainwindow.c:2432
 msgid "Next unread message"
 msgstr "Sledeća nepročitana poruka"
 
-#: src/mainwindow.c:2433
+#: src/mainwindow.c:2444
 msgid "Prefs"
 msgstr "Svojstva"
 
-#: src/mainwindow.c:2434
+#: src/mainwindow.c:2445
 msgid "Common preferences"
 msgstr "Uobičajena svojstva"
 
-#: src/mainwindow.c:2442 src/prefs_folder_item.c:289
+#: src/mainwindow.c:2453 src/prefs_folder_item.c:289
 #: src/prefs_folder_item.c:300 src/progressdialog.c:128
 msgid "Account"
 msgstr "Nalog"
 
-#: src/mainwindow.c:2443
+#: src/mainwindow.c:2454
 msgid "Account setting"
 msgstr "Podešavanja naloga"
 
-#: src/mainwindow.c:2615
+#: src/mainwindow.c:2626
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 
-#: src/mainwindow.c:2626
+#: src/mainwindow.c:2637
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 
-#: src/mainwindow.c:2892
+#: src/mainwindow.c:2903
 msgid "Exit"
 msgstr "Izlaz"
 
-#: src/mainwindow.c:2892
+#: src/mainwindow.c:2903
 msgid "Exit this program?"
 msgstr "Izlaz iz ovog programa?"
 
@@ -3844,45 +3860,45 @@ msgstr "Kraj liste dosegnut; nastaviti od početka?"
 msgid "Search finished"
 msgstr "Pretraga završena"
 
-#: src/messageview.c:261
+#: src/messageview.c:266
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/_Alati/Dodaj pošiljaoca u adresar"
 
-#: src/messageview.c:291
+#: src/messageview.c:296
 msgid "Creating message view...\n"
 msgstr "Pravljenje pregleda poruka...\n"
 
-#: src/messageview.c:316
+#: src/messageview.c:321
 msgid "Text"
 msgstr "Tekst"
 
-#: src/messageview.c:321
+#: src/messageview.c:326
 msgid "Attachments"
 msgstr "Dodatak"
 
-#: src/messageview.c:371
+#: src/messageview.c:376
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:669 src/summaryview.c:3268
+#: src/messageview.c:674 src/summaryview.c:3425
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Ne mogu sačuvati datoteku `%s'."
 
-#: src/messageview.c:728 src/summaryview.c:3291
+#: src/messageview.c:733 src/summaryview.c:3448
 msgid "The message will be printed with the following command:"
 msgstr ""
 
-#: src/messageview.c:729 src/summaryview.c:3292
+#: src/messageview.c:734 src/summaryview.c:3449
 #, fuzzy
 msgid "(Default print command)"
 msgstr "Izvrši"
 
-#: src/messageview.c:731 src/prefs_common_dialog.c:2304 src/summaryview.c:3294
+#: src/messageview.c:736 src/prefs_common_dialog.c:2304 src/summaryview.c:3451
 msgid "Print"
 msgstr "Štampaj"
 
-#: src/messageview.c:740 src/summaryview.c:3303
+#: src/messageview.c:745 src/summaryview.c:3460
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -4787,8 +4803,8 @@ msgstr "Prikaži primaoca na `Od' ukoliko ste Vi autor"
 msgid "Expand threads"
 msgstr "Raširi stablo"
 
-#: src/prefs_common_dialog.c:1413 src/prefs_common_dialog.c:2713
-#: src/prefs_common_dialog.c:2751
+#: src/prefs_common_dialog.c:1413 src/prefs_common_dialog.c:2716
+#: src/prefs_common_dialog.c:2754
 msgid "Date format"
 msgstr "Format datuma"
 
@@ -5089,8 +5105,8 @@ msgstr "Spoljašnje naredbe (%s će biti zamenjeno imenom datoteke / URI)"
 msgid "Web browser"
 msgstr "Web čitač"
 
-#: src/prefs_common_dialog.c:2288 src/prefs_common_dialog.c:3775
-#: src/prefs_common_dialog.c:3796
+#: src/prefs_common_dialog.c:2288 src/prefs_common_dialog.c:3778
+#: src/prefs_common_dialog.c:3799
 #, fuzzy
 msgid "(Default browser)"
 msgstr "Uobičajeno sanduče"
@@ -5166,216 +5182,226 @@ msgstr "Grčki (ISO-8859-7)"
 
 #: src/prefs_common_dialog.c:2495
 #, fuzzy
+msgid "Arabic (ISO-8859-6)"
+msgstr "Blatički (ISO'8859-4)"
+
+#: src/prefs_common_dialog.c:2496
+#, fuzzy
+msgid "Arabic (Windows-1256)"
+msgstr "Ćirilica (Windows-1251)"
+
+#: src/prefs_common_dialog.c:2498
+#, fuzzy
 msgid "Hebrew (ISO-8859-8)"
 msgstr "Grčki (ISO-8859-7)"
 
-#: src/prefs_common_dialog.c:2496
+#: src/prefs_common_dialog.c:2499
 #, fuzzy
 msgid "Hebrew (Windows-1255)"
 msgstr "Ćirilica (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2498
+#: src/prefs_common_dialog.c:2501
 msgid "Turkish (ISO-8859-9)"
 msgstr "Turski (ISO-8859-9)"
 
-#: src/prefs_common_dialog.c:2500
+#: src/prefs_common_dialog.c:2503
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Ćirilica (ISO-8859-5)"
 
-#: src/prefs_common_dialog.c:2501
+#: src/prefs_common_dialog.c:2504
 msgid "Cyrillic (KOI8-R)"
 msgstr "Ćirilica (KOI8-R)"
 
-#: src/prefs_common_dialog.c:2502
+#: src/prefs_common_dialog.c:2505
 msgid "Cyrillic (KOI8-U)"
 msgstr "Ćirilica (KOI8-U)"
 
-#: src/prefs_common_dialog.c:2503
+#: src/prefs_common_dialog.c:2506
 msgid "Cyrillic (Windows-1251)"
 msgstr "Ćirilica (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2505
+#: src/prefs_common_dialog.c:2508
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Japanski (ISO-2022-JP)"
 
-#: src/prefs_common_dialog.c:2507
+#: src/prefs_common_dialog.c:2510
 msgid "Japanese (EUC-JP)"
 msgstr "Japanski (EUC-JP)"
 
-#: src/prefs_common_dialog.c:2508
+#: src/prefs_common_dialog.c:2511
 msgid "Japanese (Shift_JIS)"
 msgstr "Japanski (Shift_JIS)"
 
-#: src/prefs_common_dialog.c:2511
+#: src/prefs_common_dialog.c:2514
 msgid "Simplified Chinese (GB2312)"
 msgstr "Pojednostavljeni Kineski (GB2312)"
 
-#: src/prefs_common_dialog.c:2512
+#: src/prefs_common_dialog.c:2515
 #, fuzzy
 msgid "Simplified Chinese (GBK)"
 msgstr "Pojednostavljeni Kineski (GB2312)"
 
-#: src/prefs_common_dialog.c:2513
+#: src/prefs_common_dialog.c:2516
 msgid "Traditional Chinese (Big5)"
 msgstr "Tradicionalni Kineski (Big5)"
 
-#: src/prefs_common_dialog.c:2515
+#: src/prefs_common_dialog.c:2518
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Tradicionalni Kineski (EUC-TW)"
 
-#: src/prefs_common_dialog.c:2516
+#: src/prefs_common_dialog.c:2519
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Kineski (ISO-2022-CN)"
 
-#: src/prefs_common_dialog.c:2519
+#: src/prefs_common_dialog.c:2522
 msgid "Korean (EUC-KR)"
 msgstr "Korejski (EUC-KR)"
 
-#: src/prefs_common_dialog.c:2521
+#: src/prefs_common_dialog.c:2524
 msgid "Thai (TIS-620)"
 msgstr "Thai (TIS-620)"
 
-#: src/prefs_common_dialog.c:2522
+#: src/prefs_common_dialog.c:2525
 msgid "Thai (Windows-874)"
 msgstr "Thai (Windows-874)"
 
-#: src/prefs_common_dialog.c:2689
+#: src/prefs_common_dialog.c:2692
 msgid "the full abbreviated weekday name"
 msgstr "pojednostavljeno ime dana u nedelji"
 
-#: src/prefs_common_dialog.c:2690
+#: src/prefs_common_dialog.c:2693
 msgid "the full weekday name"
 msgstr "puno ime dana u nedelji"
 
-#: src/prefs_common_dialog.c:2691
+#: src/prefs_common_dialog.c:2694
 msgid "the abbreviated month name"
 msgstr "skraćeno ime meseca"
 
-#: src/prefs_common_dialog.c:2692
+#: src/prefs_common_dialog.c:2695
 msgid "the full month name"
 msgstr "puno ime meseca"
 
-#: src/prefs_common_dialog.c:2693
+#: src/prefs_common_dialog.c:2696
 msgid "the preferred date and time for the current locale"
 msgstr "željeni datum i vreme za trenutni locale"
 
-#: src/prefs_common_dialog.c:2694
+#: src/prefs_common_dialog.c:2697
 msgid "the century number (year/100)"
 msgstr "broj veka (godina/100)"
 
-#: src/prefs_common_dialog.c:2695
+#: src/prefs_common_dialog.c:2698
 msgid "the day of the month as a decimal number"
 msgstr "dan u mesecu kao decimalni broj"
 
-#: src/prefs_common_dialog.c:2696
+#: src/prefs_common_dialog.c:2699
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "sat kao decimalni broj koristeći 24 satno vreme"
 
-#: src/prefs_common_dialog.c:2697
+#: src/prefs_common_dialog.c:2700
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "sat kao decimalni broj koristeći 12 satno vreme"
 
-#: src/prefs_common_dialog.c:2698
+#: src/prefs_common_dialog.c:2701
 msgid "the day of the year as a decimal number"
 msgstr "dan u godini kao decimalni broj"
 
-#: src/prefs_common_dialog.c:2699
+#: src/prefs_common_dialog.c:2702
 msgid "the month as a decimal number"
 msgstr "mesec kao decimalni broj"
 
-#: src/prefs_common_dialog.c:2700
+#: src/prefs_common_dialog.c:2703
 msgid "the minute as a decimal number"
 msgstr "minuti kao decimalni broj"
 
-#: src/prefs_common_dialog.c:2701
+#: src/prefs_common_dialog.c:2704
 msgid "either AM or PM"
 msgstr "AM ili PM"
 
-#: src/prefs_common_dialog.c:2702
+#: src/prefs_common_dialog.c:2705
 msgid "the second as a decimal number"
 msgstr "sekunde kao decimalni broj"
 
-#: src/prefs_common_dialog.c:2703
+#: src/prefs_common_dialog.c:2706
 msgid "the day of the week as a decimal number"
 msgstr "dan u nedelji kao decimalni broj"
 
-#: src/prefs_common_dialog.c:2704
+#: src/prefs_common_dialog.c:2707
 msgid "the preferred date for the current locale"
 msgstr "željeni datum za trenutni locale"
 
-#: src/prefs_common_dialog.c:2705
+#: src/prefs_common_dialog.c:2708
 msgid "the last two digits of a year"
 msgstr "posljednje dve cifre godine"
 
-#: src/prefs_common_dialog.c:2706
+#: src/prefs_common_dialog.c:2709
 msgid "the year as a decimal number"
 msgstr "godina kao decimalni broj"
 
-#: src/prefs_common_dialog.c:2707
+#: src/prefs_common_dialog.c:2710
 msgid "the time zone or name or abbreviation"
 msgstr "vremenska zona ili ime ili skraćenica"
 
-#: src/prefs_common_dialog.c:2728
+#: src/prefs_common_dialog.c:2731
 msgid "Specifier"
 msgstr "Specifier"
 
-#: src/prefs_common_dialog.c:2729
+#: src/prefs_common_dialog.c:2732
 msgid "Description"
 msgstr "Opis"
 
-#: src/prefs_common_dialog.c:2769
+#: src/prefs_common_dialog.c:2772
 msgid "Example"
 msgstr "Primer"
 
-#: src/prefs_common_dialog.c:2850
+#: src/prefs_common_dialog.c:2853
 msgid "Set message colors"
 msgstr "Podesi boje poruka"
 
-#: src/prefs_common_dialog.c:2858
+#: src/prefs_common_dialog.c:2861
 msgid "Colors"
 msgstr "Boje"
 
-#: src/prefs_common_dialog.c:2892
+#: src/prefs_common_dialog.c:2895
 msgid "Quoted Text - First Level"
 msgstr "Citirani tekst - prvi nivo"
 
-#: src/prefs_common_dialog.c:2898
+#: src/prefs_common_dialog.c:2901
 msgid "Quoted Text - Second Level"
 msgstr "Citirani tekst - drugi nivo"
 
-#: src/prefs_common_dialog.c:2904
+#: src/prefs_common_dialog.c:2907
 msgid "Quoted Text - Third Level"
 msgstr "Citirani tekst - treći nivo"
 
-#: src/prefs_common_dialog.c:2910
+#: src/prefs_common_dialog.c:2913
 msgid "URI link"
 msgstr "URI link"
 
-#: src/prefs_common_dialog.c:2917
+#: src/prefs_common_dialog.c:2920
 msgid "Recycle quote colors"
 msgstr "Ciklično menjaj boje citata"
 
-#: src/prefs_common_dialog.c:2984
+#: src/prefs_common_dialog.c:2987
 msgid "Pick color for quotation level 1"
 msgstr "Odaberite boju za citat 1. stepena"
 
-#: src/prefs_common_dialog.c:2987
+#: src/prefs_common_dialog.c:2990
 msgid "Pick color for quotation level 2"
 msgstr "Odaberite boju za citat 2. stepena"
 
-#: src/prefs_common_dialog.c:2990
+#: src/prefs_common_dialog.c:2993
 msgid "Pick color for quotation level 3"
 msgstr "Odaberite boju za citat 3. tepena"
 
-#: src/prefs_common_dialog.c:2993
+#: src/prefs_common_dialog.c:2996
 msgid "Pick color for URI"
 msgstr "Odaberite boju za URI"
 
-#: src/prefs_common_dialog.c:3133
+#: src/prefs_common_dialog.c:3136
 msgid "Description of symbols"
 msgstr "Obajšnjenje znakova"
 
-#: src/prefs_common_dialog.c:3189
+#: src/prefs_common_dialog.c:3192
 msgid ""
 "Date\n"
 "From\n"
@@ -5399,11 +5425,11 @@ msgstr ""
 "News grupe\n"
 "ID poruke"
 
-#: src/prefs_common_dialog.c:3202
+#: src/prefs_common_dialog.c:3205
 msgid "If x is set, displays expr"
 msgstr "Ako je x odabrano, prikazuje expr"
 
-#: src/prefs_common_dialog.c:3206
+#: src/prefs_common_dialog.c:3209
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -5417,7 +5443,7 @@ msgstr ""
 "Citirano telo poruke sa potpisom\n"
 "Literal %"
 
-#: src/prefs_common_dialog.c:3214
+#: src/prefs_common_dialog.c:3217
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -5429,20 +5455,20 @@ msgstr ""
 "Literal početna zagrada\n"
 "Literal završna zagrada"
 
-#: src/prefs_common_dialog.c:3260
+#: src/prefs_common_dialog.c:3263
 msgid "Key bindings"
 msgstr "Prečice sa tastature"
 
-#: src/prefs_common_dialog.c:3273
+#: src/prefs_common_dialog.c:3276
 #, fuzzy
 msgid "Select the preset of key bindings."
 msgstr " Podešavanje prečica na tastaturi..."
 
-#: src/prefs_common_dialog.c:3283 src/prefs_common_dialog.c:3607
+#: src/prefs_common_dialog.c:3286 src/prefs_common_dialog.c:3610
 msgid "Default"
 msgstr "Uobičajeno"
 
-#: src/prefs_common_dialog.c:3286 src/prefs_common_dialog.c:3616
+#: src/prefs_common_dialog.c:3289 src/prefs_common_dialog.c:3619
 msgid "Old Sylpheed"
 msgstr "Stari Sylpheed"
 
@@ -5567,7 +5593,7 @@ msgstr ""
 msgid "Age"
 msgstr ""
 
-#: src/prefs_filter_edit.c:501 src/summaryview.c:510
+#: src/prefs_filter_edit.c:501 src/summaryview.c:512
 #, fuzzy
 msgid "Marked"
 msgstr "Oznaka"
@@ -5821,17 +5847,17 @@ msgid "Attachment"
 msgstr "Dodatak"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73 src/query_search.c:371 src/summaryview.c:4733
+#: src/prefs_summary_column.c:73 src/query_search.c:371 src/summaryview.c:4890
 msgid "Subject"
 msgstr "Tema"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/query_search.c:372 src/summaryview.c:4736
+#: src/prefs_summary_column.c:74 src/query_search.c:372 src/summaryview.c:4893
 msgid "From"
 msgstr "Od"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/query_search.c:373 src/summaryview.c:4738
+#: src/prefs_summary_column.c:75 src/query_search.c:373 src/summaryview.c:4895
 msgid "Date"
 msgstr "Datum"
 
@@ -5933,7 +5959,7 @@ msgstr "Pretraži poruke"
 msgid "_Save as search folder"
 msgstr "Traži direktorijum"
 
-#: src/query_search.c:512 src/subscribedialog.c:523 src/summaryview.c:840
+#: src/query_search.c:512 src/subscribedialog.c:523 src/summaryview.c:842
 msgid "Done."
 msgstr "Gotovo."
 
@@ -5947,7 +5973,7 @@ msgstr "Pretražujem direktorijum %s ..."
 msgid "Searching %s (%d / %d)..."
 msgstr "Filtriranje..."
 
-#: src/query_search.c:645 src/summaryview.c:2048
+#: src/query_search.c:645 src/summaryview.c:2051
 msgid "(No Date)"
 msgstr "(Nema Datuma)"
 
@@ -6322,305 +6348,310 @@ msgid "/_Mark/Mark as rea_d"
 msgstr "/_Označi/Označi kao _pročitano"
 
 #: src/summaryview.c:429
+#, fuzzy
+msgid "/_Mark/Mark _thread as read"
+msgstr "/_Označi/Označi kao _pročitano"
+
+#: src/summaryview.c:431
 msgid "/_Mark/Mark all _read"
 msgstr "/_Označi/Označi sve _pročitano"
 
-#: src/summaryview.c:430
+#: src/summaryview.c:432
 msgid "/Color la_bel"
 msgstr "/Oznaka _boje"
 
-#: src/summaryview.c:434
+#: src/summaryview.c:436
 msgid "/Re-_edit"
 msgstr "/Ponovi i_zmeni"
 
-#: src/summaryview.c:436
+#: src/summaryview.c:438
 #, fuzzy
 msgid "/Add sender to address boo_k..."
 msgstr "/Dod_aj pošiljaoca u adresar"
 
-#: src/summaryview.c:438
+#: src/summaryview.c:440
 msgid "/Create f_ilter rule"
 msgstr "/Napravi pravilo za f_iter"
 
-#: src/summaryview.c:439
+#: src/summaryview.c:441
 msgid "/Create f_ilter rule/_Automatically"
 msgstr "/Napravi pravilo za f_iter/_Automatski"
 
-#: src/summaryview.c:441
+#: src/summaryview.c:443
 msgid "/Create f_ilter rule/by _From"
 msgstr "/Napravi pravilo za f_iter/Po _Od"
 
-#: src/summaryview.c:443
+#: src/summaryview.c:445
 msgid "/Create f_ilter rule/by _To"
 msgstr "/Napravi pravilo za f_iter/Po _Za"
 
-#: src/summaryview.c:445
+#: src/summaryview.c:447
 msgid "/Create f_ilter rule/by _Subject"
 msgstr "/Napravi pravilo za f_iter/Po _Temi"
 
-#: src/summaryview.c:451
+#: src/summaryview.c:453
 msgid "/_View/_Source"
 msgstr "/_Pregled/Pr_egledaj izvor"
 
-#: src/summaryview.c:452
+#: src/summaryview.c:454
 msgid "/_View/All _header"
 msgstr "/_Pregled/Prikaži s_vo zaglavlje"
 
-#: src/summaryview.c:454
+#: src/summaryview.c:456
 msgid "/_Print..."
 msgstr "/_Štampanje..."
 
-#: src/summaryview.c:486
+#: src/summaryview.c:488
 msgid "Creating summary view...\n"
 msgstr "Stvaranje pregleda održavanja...\n"
 
-#: src/summaryview.c:508
+#: src/summaryview.c:510
 msgid "All"
 msgstr ""
 
-#: src/summaryview.c:511
+#: src/summaryview.c:513
 #, fuzzy
 msgid "Have color label"
 msgstr "/Oznaka _boje"
 
-#: src/summaryview.c:512
+#: src/summaryview.c:514
 #, fuzzy
 msgid "Have attachment"
 msgstr "Dodatak"
 
-#: src/summaryview.c:521
+#: src/summaryview.c:523
 #, fuzzy
 msgid "Search:"
 msgstr "Pretraga"
 
-#: src/summaryview.c:535
+#: src/summaryview.c:537
 msgid "Search for Subject or From"
 msgstr ""
 
-#: src/summaryview.c:702
+#: src/summaryview.c:704
 msgid "Process mark"
 msgstr "Izvrši oznaku"
 
-#: src/summaryview.c:703
+#: src/summaryview.c:705
 msgid "Some marks are left. Process it?"
 msgstr "Neke oznake su izostavljene. Izvršiti ih?"
 
-#: src/summaryview.c:749
+#: src/summaryview.c:751
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "Pregledanje direktorijuma (%s)..."
 
-#: src/summaryview.c:1292
+#: src/summaryview.c:1295
 #, fuzzy
 msgid "_Search again"
 msgstr "Pretraži ponovo"
 
-#: src/summaryview.c:1313 src/summaryview.c:1322
+#: src/summaryview.c:1316 src/summaryview.c:1325
 msgid "No more unread messages"
 msgstr "Nema nepročitanih poruka"
 
-#: src/summaryview.c:1314
+#: src/summaryview.c:1317
 msgid "No unread message found. Search from the end?"
 msgstr "Nema više nepročitanih poruka. Tražiti od kraja?"
 
-#: src/summaryview.c:1316
+#: src/summaryview.c:1319
 msgid "No unread messages."
 msgstr "Nema nepročitanih poruka."
 
-#: src/summaryview.c:1323
+#: src/summaryview.c:1326
 msgid "No unread message found. Go to next folder?"
 msgstr "Nema više nepročitanih poruka. Preći u sledeći direktorijum?"
 
-#: src/summaryview.c:1331 src/summaryview.c:1340
+#: src/summaryview.c:1334 src/summaryview.c:1343
 msgid "No more new messages"
 msgstr "Nema više novih poruka"
 
-#: src/summaryview.c:1332
+#: src/summaryview.c:1335
 msgid "No new message found. Search from the end?"
 msgstr "Nema više novih poruka. Tražiti od kraja?"
 
-#: src/summaryview.c:1334
+#: src/summaryview.c:1337
 msgid "No new messages."
 msgstr "Nema novih poruka."
 
-#: src/summaryview.c:1341
+#: src/summaryview.c:1344
 msgid "No new message found. Go to next folder?"
 msgstr "Nema više novih poruka. Preći u sledeći direktorijum?"
 
-#: src/summaryview.c:1349 src/summaryview.c:1358
+#: src/summaryview.c:1352 src/summaryview.c:1361
 msgid "No more marked messages"
 msgstr "Nema više označenih poruka"
 
-#: src/summaryview.c:1350
+#: src/summaryview.c:1353
 msgid "No marked message found. Search from the end?"
 msgstr "Nema više označenih poruka. Nastaviti od kraja?"
 
-#: src/summaryview.c:1352 src/summaryview.c:1361
+#: src/summaryview.c:1355 src/summaryview.c:1364
 msgid "No marked messages."
 msgstr "Nema označenih poruka."
 
-#: src/summaryview.c:1359
+#: src/summaryview.c:1362
 msgid "No marked message found. Search from the beginning?"
 msgstr "Nema označenih poruka. Tražiti od početka?"
 
-#: src/summaryview.c:1367 src/summaryview.c:1376
+#: src/summaryview.c:1370 src/summaryview.c:1379
 msgid "No more labeled messages"
 msgstr "Nema više obeleženih poruka"
 
-#: src/summaryview.c:1368
+#: src/summaryview.c:1371
 msgid "No labeled message found. Search from the end?"
 msgstr "Nema više obeleženih poruka. Tražiti od kraja?"
 
-#: src/summaryview.c:1370 src/summaryview.c:1379
+#: src/summaryview.c:1373 src/summaryview.c:1382
 msgid "No labeled messages."
 msgstr "Nema obeleženih poruka."
 
-#: src/summaryview.c:1377
+#: src/summaryview.c:1380
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Nema više obeleženih poruka. Krenuti od početka?"
 
-#: src/summaryview.c:1693
+#: src/summaryview.c:1696
 msgid "Attracting messages by subject..."
 msgstr "Prihvatanje poruka po temi..."
 
-#: src/summaryview.c:1887
+#: src/summaryview.c:1890
 #, c-format
 msgid "%d deleted"
 msgstr "%d obrisano"
 
-#: src/summaryview.c:1891
+#: src/summaryview.c:1894
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d premešteno"
 
-#: src/summaryview.c:1892 src/summaryview.c:1897
+#: src/summaryview.c:1895 src/summaryview.c:1900
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:1896
+#: src/summaryview.c:1899
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d kopirano"
 
-#: src/summaryview.c:1911
+#: src/summaryview.c:1914
 msgid " item(s) selected"
 msgstr " jedinica odabrano"
 
-#: src/summaryview.c:1933
+#: src/summaryview.c:1936
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d novih, %d nepročitanih, %d ukupno (%s)"
 
-#: src/summaryview.c:1937
+#: src/summaryview.c:1940
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d novih, %d nepročitanih, %d ukupno"
 
-#: src/summaryview.c:1971
+#: src/summaryview.c:1974
 msgid "Sorting summary..."
 msgstr "Slažem pregled..."
 
-#: src/summaryview.c:2194
+#: src/summaryview.c:2211
 msgid "\tSetting summary from message data..."
 msgstr "\tPostavljanje pregleda od podataka poruke..."
 
-#: src/summaryview.c:2196
+#: src/summaryview.c:2213
 msgid "Setting summary from message data..."
 msgstr "Postavljanje pregleda od podataka poruke..."
 
-#: src/summaryview.c:2302
+#: src/summaryview.c:2319
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Pišenje pohranu pregleda (%s)..."
 
-#: src/summaryview.c:2643
+#: src/summaryview.c:2660
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Poruka %d je označena\n"
 
-#: src/summaryview.c:2701
+#: src/summaryview.c:2718
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Poruka %d je označena kao pročitana\n"
 
-#: src/summaryview.c:2789
+#: src/summaryview.c:2908
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Poruka %d je označena kao nepročitana\n"
 
-#: src/summaryview.c:2850
+#: src/summaryview.c:2969
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Poruka %s/%d označena je za brisanje\n"
 
-#: src/summaryview.c:2878
+#: src/summaryview.c:2997
 msgid "Delete message(s)"
 msgstr "Obriši poruku/e"
 
-#: src/summaryview.c:2879
+#: src/summaryview.c:2998
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Želite li zaista obrisati poruku/e iz smeća?"
 
-#: src/summaryview.c:2953
+#: src/summaryview.c:3072
 msgid "Deleting duplicated messages..."
 msgstr "Brianje duplih poruka..."
 
-#: src/summaryview.c:2991
+#: src/summaryview.c:3110
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Poruka %s/%d je neoznačena\n"
 
-#: src/summaryview.c:3049
+#: src/summaryview.c:3168
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Poruka %d je označena za premeštanje u %s\n"
 
-#: src/summaryview.c:3066
+#: src/summaryview.c:3196
 msgid "Destination is same as current folder."
 msgstr "Odredište je isto kao i trenutni direktorijum."
 
-#: src/summaryview.c:3122
+#: src/summaryview.c:3260
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Poruka %d je označena za kopiranje u %s\n"
 
-#: src/summaryview.c:3139
+#: src/summaryview.c:3288
 #, fuzzy
 msgid "Destination for copy is same as current folder."
 msgstr "ODredište za kopiranje je isto kao i trenutni direktorijum."
 
-#: src/summaryview.c:3338
+#: src/summaryview.c:3495
 #, fuzzy
 msgid "Error occurred while processing messages."
 msgstr "Došlo je do greške pri radu s poštom."
 
-#: src/summaryview.c:3646 src/summaryview.c:3647
+#: src/summaryview.c:3803 src/summaryview.c:3804
 msgid "Building threads..."
 msgstr "Izgrađivanje stabla..."
 
-#: src/summaryview.c:3797 src/summaryview.c:3798
+#: src/summaryview.c:3954 src/summaryview.c:3955
 msgid "Unthreading..."
 msgstr "Rasipanje..."
 
-#: src/summaryview.c:4091 src/summaryview.c:4147
+#: src/summaryview.c:4248 src/summaryview.c:4304
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtriranje..."
 
-#: src/summaryview.c:4196
+#: src/summaryview.c:4353
 msgid "filtering..."
 msgstr "filtriranje..."
 
-#: src/summaryview.c:4197
+#: src/summaryview.c:4354
 msgid "Filtering..."
 msgstr "Filtriranje..."
 
-#: src/summaryview.c:4233
+#: src/summaryview.c:4390
 #, fuzzy, c-format
 msgid "%d message(s) have been filtered."
 msgstr "poruka %d već je prihvaćena.\n"
 
-#: src/summaryview.c:4742
+#: src/summaryview.c:4899
 msgid "No."
 msgstr "Ne."
 
@@ -6638,36 +6669,36 @@ msgstr "Stvaranje pregleda teksta...\n"
 msgid "This message can't be displayed.\n"
 msgstr "poruka neće biti primljena\n"
 
-#: src/textview.c:1929
+#: src/textview.c:1925
 #, fuzzy
 msgid "Sa_ve this image as..."
 msgstr "/S_ačuvaj kao"
 
-#: src/textview.c:1945 src/trayicon.c:109
+#: src/textview.c:1941 src/trayicon.c:109
 #, fuzzy
 msgid "Compose _new message"
 msgstr "Napiši novu poruku"
 
-#: src/textview.c:1947
+#: src/textview.c:1943
 #, fuzzy
 msgid "Add to address _book..."
 msgstr "/Dod_aj pošiljaoca u adresar"
 
-#: src/textview.c:1949
+#: src/textview.c:1945
 #, fuzzy
 msgid "Copy this add_ress"
 msgstr "Uobičajene adrese"
 
-#: src/textview.c:1952
+#: src/textview.c:1948
 #, fuzzy
 msgid "_Open with Web browser"
 msgstr "Web čitač"
 
-#: src/textview.c:1954
+#: src/textview.c:1950
 msgid "Copy this _link"
 msgstr ""
 
-#: src/textview.c:2097
+#: src/textview.c:2093
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6676,7 +6707,7 @@ msgid ""
 "Open it anyway?"
 msgstr ""
 
-#: src/textview.c:2102
+#: src/textview.c:2098
 msgid "Fake URL warning"
 msgstr ""
 
diff --git a/po/sv.po b/po/sv.po
index 1e81ce58..acdb53e8 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: 2006-01-27 18:11+0900\n"
+"POT-Creation-Date: 2006-01-31 15:20+0900\n"
 "PO-Revision-Date: 2004-12-05 14:40+0100\n"
 "Last-Translator: Roger Lindmark <roger.lindmark@bredband.net>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -506,7 +506,7 @@ msgstr "Fann %s\n"
 msgid "Configuration is saved.\n"
 msgstr "Konfigurationen är sparad.\n"
 
-#: libsylph/prefs_common.c:489
+#: libsylph/prefs_common.c:491
 msgid "Junk mail filter"
 msgstr "Skräppostfilter"
 
@@ -621,8 +621,8 @@ msgstr "%.2fMB"
 msgid "%.2fGB"
 msgstr "%.2fGB"
 
-#: libsylph/utils.c:2373 src/compose.c:2858 src/compose.c:3121
-#: src/compose.c:3184 src/compose.c:3304
+#: libsylph/utils.c:2373 src/compose.c:2867 src/compose.c:3130
+#: src/compose.c:3193 src/compose.c:3313
 msgid "can't change file mode\n"
 msgstr "kan inte ändra filrättigheter\n"
 
@@ -710,8 +710,8 @@ msgstr ""
 "Markera rutorna i `G'-kolumnen för att aktivera meddelandehämtning\n"
 "via \"Hämta alla\""
 
-#: src/account_dialog.c:366 src/addressadd.c:192 src/addressbook.c:491
-#: src/compose.c:4262 src/editaddress.c:200 src/editaddress.c:942
+#: src/account_dialog.c:366 src/addressadd.c:192 src/addressbook.c:493
+#: src/compose.c:4271 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:206 src/prefs_filter.c:259 src/prefs_folder_item.c:171
@@ -847,12 +847,12 @@ msgstr "Åtgärdens användarargument"
 msgid "Add Address to Book"
 msgstr "Lägg till i adressbok"
 
-#: src/addressadd.c:202 src/compose.c:4762 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4771 src/editaddress.c:201
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "Adress"
 
-#: src/addressadd.c:212 src/addressbook.c:493 src/editaddress.c:202
+#: src/addressadd.c:212 src/addressbook.c:495 src/editaddress.c:202
 #: src/editaddress.c:795 src/editaddress.c:860 src/editgroup.c:267
 msgid "Remarks"
 msgstr "Kommentarer"
@@ -861,183 +861,183 @@ msgstr "Kommentarer"
 msgid "Select Address Book Folder"
 msgstr "Välj adressboksmapp"
 
-#: src/addressbook.c:336 src/compose.c:515 src/mainwindow.c:477
+#: src/addressbook.c:338 src/compose.c:515 src/mainwindow.c:480
 #: src/messageview.c:138
 msgid "/_File"
 msgstr "/_Arkiv"
 
-#: src/addressbook.c:337
+#: src/addressbook.c:339
 msgid "/_File/New _Book"
 msgstr "/_Arkiv/Ny _bok"
 
-#: src/addressbook.c:338
+#: src/addressbook.c:340
 msgid "/_File/New _vCard"
 msgstr "/_Arkiv/Nytt _vCard"
 
-#: src/addressbook.c:340
+#: src/addressbook.c:342
 msgid "/_File/New _JPilot"
 msgstr "/_Arkiv/Ny _JPilot"
 
-#: src/addressbook.c:343
+#: src/addressbook.c:345
 msgid "/_File/New _Server"
 msgstr "/_Arkiv/Ny _Server"
 
-#: src/addressbook.c:345 src/addressbook.c:348 src/compose.c:520
-#: src/compose.c:525 src/compose.c:528 src/compose.c:531 src/mainwindow.c:495
-#: src/mainwindow.c:498 src/mainwindow.c:500 src/mainwindow.c:503
-#: src/mainwindow.c:505 src/messageview.c:141
+#: src/addressbook.c:347 src/addressbook.c:350 src/compose.c:520
+#: src/compose.c:525 src/compose.c:528 src/compose.c:531 src/mainwindow.c:498
+#: src/mainwindow.c:501 src/mainwindow.c:503 src/mainwindow.c:506
+#: src/mainwindow.c:508 src/messageview.c:141
 msgid "/_File/---"
 msgstr "/_Arkiv/---"
 
-#: src/addressbook.c:346
+#: src/addressbook.c:348
 msgid "/_File/_Edit"
 msgstr "/_Arkiv/_Redigera"
 
-#: src/addressbook.c:347
+#: src/addressbook.c:349
 msgid "/_File/_Delete"
 msgstr "/_Arkiv/_Ta bort"
 
-#: src/addressbook.c:349
+#: src/addressbook.c:351
 msgid "/_File/_Save"
 msgstr "/_Arkiv/_Spara"
 
-#: src/addressbook.c:350 src/compose.c:532 src/messageview.c:142
+#: src/addressbook.c:352 src/compose.c:532 src/messageview.c:142
 msgid "/_File/_Close"
 msgstr "/_Arkiv/St_äng"
 
-#: src/addressbook.c:351
+#: src/addressbook.c:353
 msgid "/_Address"
 msgstr "/A_dress"
 
-#: src/addressbook.c:352
+#: src/addressbook.c:354
 msgid "/_Address/New _Address"
 msgstr "/A_dress/Ny _adress"
 
-#: src/addressbook.c:353
+#: src/addressbook.c:355
 msgid "/_Address/New _Group"
 msgstr "/A_dress/Ny _grupp"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:356
 msgid "/_Address/New _Folder"
 msgstr "/A_dress/Ny _mapp"
 
-#: src/addressbook.c:355
+#: src/addressbook.c:357
 msgid "/_Address/---"
 msgstr "/A_dress/---"
 
-#: src/addressbook.c:356
+#: src/addressbook.c:358
 msgid "/_Address/_Edit"
 msgstr "/A_dress/_Redigera"
 
-#: src/addressbook.c:357
+#: src/addressbook.c:359
 msgid "/_Address/_Delete"
 msgstr "/_A_dress/_Ta bort"
 
-#: src/addressbook.c:358 src/compose.c:639 src/mainwindow.c:738
-#: src/messageview.c:259
+#: src/addressbook.c:360 src/compose.c:645 src/mainwindow.c:749
+#: src/messageview.c:264
 msgid "/_Tools"
 msgstr "/V_erktyg"
 
-#: src/addressbook.c:359
+#: src/addressbook.c:361
 msgid "/_Tools/Import _LDIF file"
 msgstr "/V_erktyg/Importera _LDIF-fil"
 
-#: src/addressbook.c:360 src/compose.c:658 src/mainwindow.c:788
-#: src/messageview.c:277
+#: src/addressbook.c:362 src/compose.c:664 src/mainwindow.c:799
+#: src/messageview.c:282
 msgid "/_Help"
 msgstr "/_Hjälp"
 
-#: src/addressbook.c:361 src/compose.c:659 src/mainwindow.c:799
-#: src/messageview.c:278
+#: src/addressbook.c:363 src/compose.c:665 src/mainwindow.c:810
+#: src/messageview.c:283
 msgid "/_Help/_About"
 msgstr "/_Hjälp/_Om"
 
-#: src/addressbook.c:380 src/addressbook.c:390
+#: src/addressbook.c:382 src/addressbook.c:392
 msgid "/New _Address"
 msgstr "/Ny _adress"
 
-#: src/addressbook.c:381 src/addressbook.c:391
+#: src/addressbook.c:383 src/addressbook.c:393
 msgid "/New _Group"
 msgstr "/Ny _grupp"
 
-#: src/addressbook.c:382 src/addressbook.c:392
+#: src/addressbook.c:384 src/addressbook.c:394
 msgid "/New _Folder"
 msgstr "/Ny _mapp"
 
-#: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:509
+#: src/addressbook.c:385 src/addressbook.c:395 src/compose.c:509
 #: src/folderview.c:246 src/folderview.c:248 src/folderview.c:253
 #: src/folderview.c:266 src/folderview.c:268 src/folderview.c:270
 #: src/folderview.c:275 src/folderview.c:289 src/folderview.c:291
 #: src/folderview.c:295 src/summaryview.c:414 src/summaryview.c:418
-#: src/summaryview.c:421 src/summaryview.c:431 src/summaryview.c:433
-#: src/summaryview.c:435 src/summaryview.c:447 src/summaryview.c:453
+#: src/summaryview.c:421 src/summaryview.c:433 src/summaryview.c:435
+#: src/summaryview.c:437 src/summaryview.c:449 src/summaryview.c:455
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:534
-#: src/mainwindow.c:509 src/messageview.c:144
+#: src/addressbook.c:386 src/addressbook.c:396 src/compose.c:534
+#: src/mainwindow.c:512 src/messageview.c:144
 msgid "/_Edit"
 msgstr "/_Redigera"
 
-#: src/addressbook.c:385 src/addressbook.c:395 src/summaryview.c:432
+#: src/addressbook.c:387 src/addressbook.c:397 src/summaryview.c:434
 msgid "/_Delete"
 msgstr "/_Ta bort"
 
-#: src/addressbook.c:492
+#: src/addressbook.c:494
 msgid "E-Mail address"
 msgstr "E-postadress"
 
-#: src/addressbook.c:496 src/compose.c:4763 src/prefs_common_dialog.c:2183
+#: src/addressbook.c:498 src/compose.c:4772 src/prefs_common_dialog.c:2183
 msgid "Address book"
 msgstr "Adressbok"
 
-#: src/addressbook.c:596 src/prefs_filter_edit.c:249
+#: src/addressbook.c:600 src/prefs_filter_edit.c:249
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "Namn:"
 
 #. Buttons
-#: src/addressbook.c:628 src/addressbook.c:1680 src/editaddress.c:884
-#: src/editaddress.c:1017 src/mainwindow.c:2391 src/prefs_actions.c:266
+#: src/addressbook.c:632 src/addressbook.c:1684 src/editaddress.c:884
+#: src/editaddress.c:1017 src/mainwindow.c:2402 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
 #: src/prefs_template.c:233
 msgid "Delete"
 msgstr "Ta bort"
 
-#: src/addressbook.c:631 src/editaddress.c:890 src/editaddress.c:1023
+#: src/addressbook.c:635 src/editaddress.c:890 src/editaddress.c:1023
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:273 src/prefs_display_header.c:328
 #: src/prefs_filter_edit.c:1550
 msgid "Add"
 msgstr "Lägg till"
 
-#: src/addressbook.c:634
+#: src/addressbook.c:638
 msgid "Lookup"
 msgstr "Slå upp"
 
-#: src/addressbook.c:646 src/headerview.c:55 src/prefs_folder_item.c:339
+#: src/addressbook.c:650 src/headerview.c:55 src/prefs_folder_item.c:339
 #: src/prefs_template.c:176
 msgid "To:"
 msgstr "Till:"
 
-#: src/addressbook.c:650 src/prefs_folder_item.c:356 src/prefs_template.c:178
+#: src/addressbook.c:654 src/prefs_folder_item.c:356 src/prefs_template.c:178
 msgid "Cc:"
 msgstr "Kopia:"
 
-#: src/addressbook.c:654 src/prefs_folder_item.c:367
+#: src/addressbook.c:658 src/prefs_folder_item.c:367
 msgid "Bcc:"
 msgstr "Dold kopia:"
 
 #. Confirm deletion
-#: src/addressbook.c:841
+#: src/addressbook.c:845
 msgid "Delete address(es)"
 msgstr "Ta bort adress(er)"
 
-#: src/addressbook.c:842
+#: src/addressbook.c:846
 msgid "Really delete the address(es)?"
 msgstr "Vill du verkligen ta bort adress(erna)?"
 
-#: src/addressbook.c:1671
+#: src/addressbook.c:1675
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1047,36 +1047,36 @@ msgstr ""
 "Tar du bara bort mappen, kommer adresserna att flyttas\n"
 "en mapp uppåt i hierarkin."
 
-#: src/addressbook.c:1674 src/folderview.c:2351
+#: src/addressbook.c:1678 src/folderview.c:2351
 msgid "Delete folder"
 msgstr "Ta bort mapp"
 
-#: src/addressbook.c:1674
+#: src/addressbook.c:1678
 msgid "_Folder only"
 msgstr "_Endast mapp"
 
-#: src/addressbook.c:1674
+#: src/addressbook.c:1678
 msgid "Folder and _addresses"
 msgstr "Mapp och _adresser"
 
-#: src/addressbook.c:1679
+#: src/addressbook.c:1683
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Vill du verkligen ta bort \"%s\" ?"
 
-#: src/addressbook.c:2365 src/addressbook.c:2498
+#: src/addressbook.c:2369 src/addressbook.c:2502
 msgid "New user, could not save index file."
 msgstr "Ny användare, kunde inte spara indexfil."
 
-#: src/addressbook.c:2369 src/addressbook.c:2502
+#: src/addressbook.c:2373 src/addressbook.c:2506
 msgid "New user, could not save address book files."
 msgstr "Ny användare, kunde inte spara adressboksfiler."
 
-#: src/addressbook.c:2379 src/addressbook.c:2512
+#: src/addressbook.c:2383 src/addressbook.c:2516
 msgid "Old address book converted successfully."
 msgstr "Den gamla adressboken är konverterad."
 
-#: src/addressbook.c:2384
+#: src/addressbook.c:2388
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1084,7 +1084,7 @@ msgstr ""
 "Gammal adressbok konverterad,\n"
 "kunde inte spara ny adressindexfil"
 
-#: src/addressbook.c:2397
+#: src/addressbook.c:2401
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1092,7 +1092,7 @@ msgstr ""
 "Kunde inte konvertera adressbok,\n"
 "men skapade nya tomma adressboksfiler."
 
-#: src/addressbook.c:2403
+#: src/addressbook.c:2407
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1100,7 +1100,7 @@ msgstr ""
 "Kunde inte konvertera adressbok,\n"
 "kunde inte skapa nya adressboksfiler."
 
-#: src/addressbook.c:2408
+#: src/addressbook.c:2412
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1108,86 +1108,86 @@ msgstr ""
 "Kunde inte konvertera adressbok,\n"
 "och kunde inte skapa nya adressboksfiler."
 
-#: src/addressbook.c:2415
+#: src/addressbook.c:2419
 msgid "Addressbook conversion error"
 msgstr "Fel vid konvertering av adressbok"
 
-#: src/addressbook.c:2419
+#: src/addressbook.c:2423
 msgid "Addressbook conversion"
 msgstr "Adressbokskonvertering"
 
-#: src/addressbook.c:2454
+#: src/addressbook.c:2458
 msgid "Addressbook Error"
 msgstr "Adressboksfel"
 
-#: src/addressbook.c:2455 src/addressbook.c:2555
+#: src/addressbook.c:2459 src/addressbook.c:2559
 msgid "Could not read address index"
 msgstr "Kunde inte läsa adressindex"
 
-#: src/addressbook.c:2517
+#: src/addressbook.c:2521
 msgid "Old address book converted, could not save new address index file"
 msgstr "Gammal adressbok konverterad, kunde inte skapa ny adressindexfil"
 
-#: src/addressbook.c:2531
+#: src/addressbook.c:2535
 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:2537
+#: src/addressbook.c:2541
 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:2543
+#: src/addressbook.c:2547
 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:2561
+#: src/addressbook.c:2565
 msgid "Addressbook Conversion Error"
 msgstr "Fel vid konvertering av adressbok"
 
-#: src/addressbook.c:2567
+#: src/addressbook.c:2571
 msgid "Addressbook Conversion"
 msgstr "Adressbokskonvertering"
 
-#: src/addressbook.c:3072 src/prefs_common_dialog.c:2033
+#: src/addressbook.c:3086 src/prefs_common_dialog.c:2033
 msgid "Interface"
 msgstr "Gränssnitt"
 
-#: src/addressbook.c:3088 src/importldif.c:514
+#: src/addressbook.c:3102 src/importldif.c:514
 msgid "Address Book"
 msgstr "Adressbok"
 
-#: src/addressbook.c:3104
+#: src/addressbook.c:3118
 msgid "Person"
 msgstr "Person"
 
-#: src/addressbook.c:3120
+#: src/addressbook.c:3134
 msgid "EMail Address"
 msgstr "E-postadress"
 
-#: src/addressbook.c:3136
+#: src/addressbook.c:3150
 msgid "Group"
 msgstr "Grupp"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3152 src/folderview.c:367 src/prefs_account_dialog.c:1694
+#: src/addressbook.c:3166 src/folderview.c:367 src/prefs_account_dialog.c:1694
 #: src/query_search.c:370
 msgid "Folder"
 msgstr "Mapp"
 
-#: src/addressbook.c:3168
+#: src/addressbook.c:3182
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3184 src/addressbook.c:3200
+#: src/addressbook.c:3198 src/addressbook.c:3214
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3216
+#: src/addressbook.c:3230
 msgid "LDAP Server"
 msgstr "LDAP-server"
 
@@ -1199,7 +1199,7 @@ msgstr "Vanlig adress"
 msgid "Personal address"
 msgstr "Privat adress"
 
-#: src/alertpanel.c:141 src/compose.c:5485 src/main.c:573
+#: src/alertpanel.c:141 src/compose.c:5494 src/main.c:573
 msgid "Notice"
 msgstr "Notera"
 
@@ -1250,7 +1250,7 @@ msgstr "Brun"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4593
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4750
 msgid "None"
 msgstr "Ingen"
 
@@ -1308,7 +1308,7 @@ msgstr "/_Redigera/_Ångra"
 msgid "/_Edit/_Redo"
 msgstr "/_Redigera/Gör _om"
 
-#: src/compose.c:537 src/compose.c:544 src/mainwindow.c:513
+#: src/compose.c:537 src/compose.c:544 src/mainwindow.c:516
 #: src/messageview.c:147
 msgid "/_Edit/---"
 msgstr "/_Redigera/---"
@@ -1317,7 +1317,7 @@ msgstr "/_Redigera/---"
 msgid "/_Edit/Cu_t"
 msgstr "/_Redigera/Klipp _ut"
 
-#: src/compose.c:539 src/mainwindow.c:510 src/messageview.c:145
+#: src/compose.c:539 src/mainwindow.c:513 src/messageview.c:145
 msgid "/_Edit/_Copy"
 msgstr "/_Redigera/_Kopiera"
 
@@ -1329,7 +1329,7 @@ msgstr "/_Redigera/Klistra _in"
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Redigera/Klistra in som _citat"
 
-#: src/compose.c:543 src/mainwindow.c:511 src/messageview.c:146
+#: src/compose.c:543 src/mainwindow.c:514 src/messageview.c:146
 msgid "/_Edit/Select _all"
 msgstr "/_Redigera/Markera _allt"
 
@@ -1345,8 +1345,8 @@ msgstr "/_Redigera/Bryt _långa rader"
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Redigera/Automatisk _radbrytning"
 
-#: src/compose.c:550 src/mainwindow.c:518 src/messageview.c:151
-#: src/summaryview.c:448
+#: src/compose.c:550 src/mainwindow.c:521 src/messageview.c:151
+#: src/summaryview.c:450
 msgid "/_View"
 msgstr "/_Visa"
 
@@ -1367,9 +1367,9 @@ msgid "/_View/_Reply to"
 msgstr "/_Visa/_Svara till"
 
 #: src/compose.c:555 src/compose.c:557 src/compose.c:559 src/compose.c:561
-#: src/mainwindow.c:538 src/mainwindow.c:541 src/mainwindow.c:568
-#: src/mainwindow.c:592 src/mainwindow.c:687 src/mainwindow.c:691
-#: src/messageview.c:236
+#: src/mainwindow.c:541 src/mainwindow.c:544 src/mainwindow.c:571
+#: src/mainwindow.c:595 src/mainwindow.c:696 src/mainwindow.c:700
+#: src/messageview.c:241
 msgid "/_View/---"
 msgstr "/_Visa/---"
 
@@ -1385,7 +1385,7 @@ msgstr "/_Visa/_Linjal"
 msgid "/_View/_Attachment"
 msgstr "/_Visa/_Bilagor"
 
-#: src/compose.c:567 src/mainwindow.c:599 src/messageview.c:158
+#: src/compose.c:567 src/mainwindow.c:602 src/messageview.c:158
 msgid "/_View/Character _encoding"
 msgstr "/_Visa/_Teckenkodning"
 
@@ -1394,214 +1394,225 @@ msgid "/_View/Character _encoding/_Automatic"
 msgstr "/_Visa/_Teckenkodning/_Automatisk"
 
 #: src/compose.c:570 src/compose.c:576 src/compose.c:582 src/compose.c:586
-#: src/compose.c:592 src/compose.c:596 src/compose.c:602 src/compose.c:606
-#: src/compose.c:616 src/compose.c:620 src/compose.c:628 src/compose.c:632
-#: src/mainwindow.c:595 src/mainwindow.c:602 src/messageview.c:154
+#: src/compose.c:592 src/compose.c:596 src/compose.c:602 src/compose.c:608
+#: src/compose.c:612 src/compose.c:622 src/compose.c:626 src/compose.c:634
+#: src/compose.c:638 src/mainwindow.c:598 src/mainwindow.c:605
+#: src/messageview.c:154
 msgid "/_View/Character _encoding/---"
 msgstr "/_Visa/_Teckenkodning/---"
 
-#: src/compose.c:572 src/mainwindow.c:603 src/messageview.c:162
+#: src/compose.c:572 src/mainwindow.c:606 src/messageview.c:162
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Visa/_Teckenkodning/7 bitars ascii (US-ASC_II)"
 
-#: src/compose.c:574 src/mainwindow.c:605 src/messageview.c:165
+#: src/compose.c:574 src/mainwindow.c:608 src/messageview.c:165
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Visa/_Teckenkodning/Unicode (_UTF-8)"
 
-#: src/compose.c:578 src/mainwindow.c:609 src/messageview.c:168
+#: src/compose.c:578 src/mainwindow.c:612 src/messageview.c:168
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Visa/_Teckenkodning/Västeuropeisk (ISO-8859-_1)"
 
-#: src/compose.c:580 src/mainwindow.c:611 src/messageview.c:170
+#: src/compose.c:580 src/mainwindow.c:614 src/messageview.c:170
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Visa/_Teckenkodning/_Västeuropeisk (ISO-8859-15)"
 
-#: src/compose.c:584 src/mainwindow.c:617 src/messageview.c:175
+#: src/compose.c:584 src/mainwindow.c:620 src/messageview.c:175
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Visa/_Teckenkodning/Centraleuropeisk (ISO-8859-_2)"
 
-#: src/compose.c:588 src/mainwindow.c:621 src/messageview.c:178
+#: src/compose.c:588 src/mainwindow.c:624 src/messageview.c:178
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Visa/_Teckenkodning/_Baltisk (ISO-8859-13)"
 
-#: src/compose.c:590 src/mainwindow.c:623 src/messageview.c:180
+#: src/compose.c:590 src/mainwindow.c:626 src/messageview.c:180
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Visa/_Teckenkodning/Baltisk (ISO-8859-_4)"
 
-#: src/compose.c:594 src/mainwindow.c:627 src/messageview.c:183
+#: src/compose.c:594 src/mainwindow.c:630 src/messageview.c:183
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Visa/_Teckenkodning/Grekisk (ISO-8859-_7)"
 
-#: src/compose.c:598 src/mainwindow.c:631 src/messageview.c:186
+#: src/compose.c:598 src/mainwindow.c:634 src/messageview.c:186
+#, fuzzy
+msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
+msgstr "/_Visa/_Teckenkodning/Baltisk (ISO-8859-_4)"
+
+#: src/compose.c:600 src/mainwindow.c:636 src/messageview.c:188
+#, fuzzy
+msgid "/_View/Character _encoding/Arabic (Windows-1256)"
+msgstr "/_Visa/_Teckenkodning/Kyrillisk (Windows-1251)"
+
+#: src/compose.c:604 src/mainwindow.c:640 src/messageview.c:191
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Visa/_Teckenkodning/Hebreisk (ISO-8859-_8)"
 
-#: src/compose.c:600 src/mainwindow.c:633 src/messageview.c:188
+#: src/compose.c:606 src/mainwindow.c:642 src/messageview.c:193
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Visa/_Teckenkodning/Hebreisk (Windows-1255)"
 
-#: src/compose.c:604 src/mainwindow.c:637 src/messageview.c:191
+#: src/compose.c:610 src/mainwindow.c:646 src/messageview.c:196
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Visa/_Teckenkodning/Turkisk (ISO-8859-_9)"
 
-#: src/compose.c:608 src/mainwindow.c:641 src/messageview.c:194
+#: src/compose.c:614 src/mainwindow.c:650 src/messageview.c:199
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Visa/_Teckenkodning/Kyrillisk (ISO-8859-_5)"
 
-#: src/compose.c:610 src/mainwindow.c:643 src/messageview.c:196
+#: src/compose.c:616 src/mainwindow.c:652 src/messageview.c:201
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Visa/_Teckenkodning/Kyrillisk (KOI8-_R)"
 
-#: src/compose.c:612 src/mainwindow.c:645 src/messageview.c:198
+#: src/compose.c:618 src/mainwindow.c:654 src/messageview.c:203
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Visa/_Teckenkodning/Kyrillisk (KOI8-_U)"
 
-#: src/compose.c:614 src/mainwindow.c:647 src/messageview.c:200
+#: src/compose.c:620 src/mainwindow.c:656 src/messageview.c:205
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Visa/_Teckenkodning/Kyrillisk (Windows-1251)"
 
-#: src/compose.c:618 src/mainwindow.c:651 src/messageview.c:203
+#: src/compose.c:624 src/mainwindow.c:660 src/messageview.c:208
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Visa/_Teckenkodning/Japansk (ISO-2022-_JP)"
 
-#: src/compose.c:622 src/mainwindow.c:661 src/messageview.c:212
+#: src/compose.c:628 src/mainwindow.c:670 src/messageview.c:217
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Visa/_Teckenkodning/Förenklad kinesisk (_GB2312)"
 
-#: src/compose.c:624 src/mainwindow.c:663 src/messageview.c:214
+#: src/compose.c:630 src/mainwindow.c:672 src/messageview.c:219
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Visa/_Teckenkodning/Förenklad kinesisk (_GBK)"
 
-#: src/compose.c:626 src/mainwindow.c:665 src/messageview.c:216
+#: src/compose.c:632 src/mainwindow.c:674 src/messageview.c:221
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Visa/_Teckenkodning/Traditionell kinesisk (_Big5)"
 
-#: src/compose.c:630 src/mainwindow.c:673 src/messageview.c:223
+#: src/compose.c:636 src/mainwindow.c:682 src/messageview.c:228
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Visa/_Teckenkodning/Koreansk (EUC-_KR)"
 
-#: src/compose.c:634 src/mainwindow.c:679 src/messageview.c:228
+#: src/compose.c:640 src/mainwindow.c:688 src/messageview.c:233
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Visa/_Teckenkodning/Thai (TIS-620)"
 
-#: src/compose.c:636 src/mainwindow.c:681 src/messageview.c:230
+#: src/compose.c:642 src/mainwindow.c:690 src/messageview.c:235
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Visa/_Teckenkodning/Thai (Windows-874)"
 
-#: src/compose.c:640 src/mainwindow.c:739 src/messageview.c:260
+#: src/compose.c:646 src/mainwindow.c:750 src/messageview.c:265
 msgid "/_Tools/_Address book"
 msgstr "/V_erktyg/_Adressbok"
 
-#: src/compose.c:641
+#: src/compose.c:647
 msgid "/_Tools/_Template"
 msgstr "/V_erktyg/_Mall"
 
-#: src/compose.c:642 src/mainwindow.c:762 src/messageview.c:275
+#: src/compose.c:648 src/mainwindow.c:773 src/messageview.c:280
 msgid "/_Tools/Actio_ns"
 msgstr "/V_erktyg/_Åtgärder"
 
-#: src/compose.c:643 src/compose.c:647 src/compose.c:653 src/mainwindow.c:742
-#: src/mainwindow.c:756 src/mainwindow.c:761 src/mainwindow.c:763
-#: src/mainwindow.c:766 src/mainwindow.c:768 src/messageview.c:263
-#: src/messageview.c:274
+#: src/compose.c:649 src/compose.c:653 src/compose.c:659 src/mainwindow.c:753
+#: src/mainwindow.c:767 src/mainwindow.c:772 src/mainwindow.c:774
+#: src/mainwindow.c:777 src/mainwindow.c:779 src/messageview.c:268
+#: src/messageview.c:279
 msgid "/_Tools/---"
 msgstr "/V_erktyg/---"
 
-#: src/compose.c:644
+#: src/compose.c:650
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/V_erktyg/Redigera med e_xtern redigerare"
 
-#: src/compose.c:648
+#: src/compose.c:654
 msgid "/_Tools/PGP Si_gn"
 msgstr "/V_erktyg/_Signera"
 
-#: src/compose.c:649
+#: src/compose.c:655
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/V_erktyg/_Kryptera"
 
-#: src/compose.c:654
+#: src/compose.c:660
 #, fuzzy
 msgid "/_Tools/_Check spell"
 msgstr "/V_erktyg/Utför _köade åtgärder"
 
-#: src/compose.c:655
+#: src/compose.c:661
 #, fuzzy
 msgid "/_Tools/_Set spell language"
 msgstr "/V_erktyg/_Mall"
 
-#: src/compose.c:899
+#: src/compose.c:908
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: filen finns inte\n"
 
-#: src/compose.c:1003 src/compose.c:1074
+#: src/compose.c:1012 src/compose.c:1083
 msgid "Can't get text part\n"
 msgstr "Kan inte läsa textdel\n"
 
-#: src/compose.c:1475
+#: src/compose.c:1484
 msgid "Quote mark format error."
 msgstr "Citationsteckensformatfel."
 
-#: src/compose.c:1487
+#: src/compose.c:1496
 msgid "Message reply/forward format error."
 msgstr "Formatfel vid meddelandesvar eller -vidarebefordran"
 
-#: src/compose.c:1907
+#: src/compose.c:1916
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Filen %s finns inte\n"
 
-#: src/compose.c:1911
+#: src/compose.c:1920
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Kan inte läsa filstorlek på %s\n"
 
-#: src/compose.c:1915
+#: src/compose.c:1924
 #, c-format
 msgid "File %s is empty."
 msgstr "Filen %s är tom."
 
-#: src/compose.c:1919
+#: src/compose.c:1928
 #, c-format
 msgid "Can't read %s."
 msgstr "kan inte läsa %s"
 
-#: src/compose.c:1952
+#: src/compose.c:1961
 #, c-format
 msgid "Message: %s"
 msgstr "Meddelande: %s"
 
-#: src/compose.c:2012 src/mimeview.c:565
+#: src/compose.c:2021 src/mimeview.c:565
 msgid "Can't get the part of multipart message."
 msgstr "Kan inte läsa delen av multipart-meddelandet."
 
-#: src/compose.c:2496 src/headerview.c:195 src/query_search.c:636
-#: src/summaryview.c:2107
+#: src/compose.c:2505 src/headerview.c:195 src/query_search.c:636
+#: src/summaryview.c:2124
 msgid "(No Subject)"
 msgstr "(Inget Ämne)"
 
-#: src/compose.c:2499
+#: src/compose.c:2508
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Skriv%s"
 
-#: src/compose.c:2612
+#: src/compose.c:2621
 msgid "Recipient is not specified."
 msgstr "Mottagare är inte angiven."
 
-#: src/compose.c:2620
+#: src/compose.c:2629
 msgid "Empty subject"
 msgstr "Tomt ämne"
 
-#: src/compose.c:2621
+#: src/compose.c:2630
 msgid "Subject is empty. Send it anyway?"
 msgstr "Ämnesraden är tom. Skicka ändå?"
 
-#: src/compose.c:2680
+#: src/compose.c:2689
 msgid "can't get recipient list."
 msgstr "kan inte läsa mottagarlista"
 
-#: src/compose.c:2700
+#: src/compose.c:2709
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1609,22 +1620,22 @@ msgstr ""
 "Konto för att skicka post är inte specificerat.\n"
 "Välj ett e-postkonto innan du skickar."
 
-#: src/compose.c:2714 src/send_message.c:299
+#: src/compose.c:2723 src/send_message.c:299
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Fel uppstod när meddelandet skulle skickas till %s."
 
-#: src/compose.c:2756
+#: src/compose.c:2765
 msgid "Can't save the message to outbox."
 msgstr "Kan inte spara meddelande i kö-mappen."
 
-#: src/compose.c:2794
+#: src/compose.c:2803
 #, 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:2891
+#: src/compose.c:2900
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1635,11 +1646,11 @@ msgstr ""
 "\n"
 "Skicka det som %s ändå?"
 
-#: src/compose.c:2897
+#: src/compose.c:2906
 msgid "Code conversion error"
 msgstr "Fel vid konvertering av kod"
 
-#: src/compose.c:2970
+#: src/compose.c:2979
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1652,157 +1663,157 @@ msgstr ""
 "\n"
 "Sänd det ändå?"
 
-#: src/compose.c:2974
+#: src/compose.c:2983
 msgid "Line length limit"
 msgstr "Radlängdsbegränsning"
 
-#: src/compose.c:3264
+#: src/compose.c:3273
 msgid "can't remove the old message\n"
 msgstr "kan inte ta bort det gamla meddelandet\n"
 
-#: src/compose.c:3282
+#: src/compose.c:3291
 msgid "queueing message...\n"
 msgstr "lägger meddelandet i kö...\n"
 
-#: src/compose.c:3364
+#: src/compose.c:3373
 msgid "can't find queue folder\n"
 msgstr "kan inte hitta kömapp\n"
 
-#: src/compose.c:3371
+#: src/compose.c:3380
 msgid "can't queue the message\n"
 msgstr "kan inte lägga meddelandet i kö\n"
 
-#: src/compose.c:3964
+#: src/compose.c:3973
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "skapat Meddelande-ID: %s\n"
 
-#: src/compose.c:4077
+#: src/compose.c:4086
 msgid "Creating compose window...\n"
 msgstr "Skapar skrivfönster...\n"
 
-#: src/compose.c:4128 src/headerview.c:54
+#: src/compose.c:4137 src/headerview.c:54
 msgid "From:"
 msgstr "Från:"
 
-#: src/compose.c:4202
+#: src/compose.c:4211
 msgid "PGP Sign"
 msgstr "PGP Tecken"
 
-#: src/compose.c:4205
+#: src/compose.c:4214
 msgid "PGP Encrypt"
 msgstr "PGP Kryptera"
 
-#: src/compose.c:4243 src/compose.c:5317
+#: src/compose.c:4252 src/compose.c:5326
 msgid "MIME type"
 msgstr "MIME-typ"
 
 #. S_COL_DATE
-#: src/compose.c:4252 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4740
+#: src/compose.c:4261 src/mimeview.c:197 src/prefs_filter_edit.c:496
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4897
 msgid "Size"
 msgstr "Storlek"
 
-#: src/compose.c:4683 src/mainwindow.c:2324 src/prefs_account_dialog.c:528
+#: src/compose.c:4692 src/mainwindow.c:2335 src/prefs_account_dialog.c:528
 #: src/prefs_common_dialog.c:661
 msgid "Send"
 msgstr "Skicka"
 
-#: src/compose.c:4684
+#: src/compose.c:4693
 msgid "Send message"
 msgstr "Skicka meddelande"
 
-#: src/compose.c:4692
+#: src/compose.c:4701
 msgid "Send later"
 msgstr "Skicka senare"
 
-#: src/compose.c:4693
+#: src/compose.c:4702
 msgid "Put into queue folder and send later"
 msgstr "Placera i kömapp och skicka senare"
 
-#: src/compose.c:4701
+#: src/compose.c:4710
 msgid "Draft"
 msgstr "Utkast"
 
-#: src/compose.c:4702
+#: src/compose.c:4711
 msgid "Save to draft folder"
 msgstr "Spara i utkastsmapp"
 
-#: src/compose.c:4712
+#: src/compose.c:4721
 msgid "Insert"
 msgstr "Infoga"
 
-#: src/compose.c:4713
+#: src/compose.c:4722
 msgid "Insert file"
 msgstr "Infoga fil"
 
-#: src/compose.c:4721
+#: src/compose.c:4730
 msgid "Attach"
 msgstr "Bifoga"
 
-#: src/compose.c:4722
+#: src/compose.c:4731
 msgid "Attach file"
 msgstr "Bifoga fil"
 
 #. signature
-#: src/compose.c:4732 src/prefs_account_dialog.c:1208
+#: src/compose.c:4741 src/prefs_account_dialog.c:1208
 #: src/prefs_common_dialog.c:953
 msgid "Signature"
 msgstr "Signatur"
 
-#: src/compose.c:4733
+#: src/compose.c:4742
 #, fuzzy
 msgid "Append signature"
 msgstr "FELAKTIG signatur"
 
 #. editor
-#: src/compose.c:4742 src/prefs_common_dialog.c:991
+#: src/compose.c:4751 src/prefs_common_dialog.c:991
 #: src/prefs_common_dialog.c:2315
 msgid "Editor"
 msgstr "Redigerare"
 
-#: src/compose.c:4743
+#: src/compose.c:4752
 msgid "Edit with external editor"
 msgstr "Redigera med extern redigerare"
 
-#: src/compose.c:4751
+#: src/compose.c:4760
 msgid "Linewrap"
 msgstr "Radbrytning"
 
-#: src/compose.c:4752
+#: src/compose.c:4761
 msgid "Wrap all long lines"
 msgstr "Radbryt långa rader"
 
-#: src/compose.c:5213
+#: src/compose.c:5222
 msgid "Invalid MIME type."
 msgstr "Ogiltig MIME-typ"
 
-#: src/compose.c:5231
+#: src/compose.c:5240
 msgid "File doesn't exist or is empty."
 msgstr "Filen finns inte eller är tom."
 
-#: src/compose.c:5299
+#: src/compose.c:5308
 msgid "Properties"
 msgstr "Egenskaper"
 
-#: src/compose.c:5319 src/prefs_common_dialog.c:1444
+#: src/compose.c:5328 src/prefs_common_dialog.c:1444
 msgid "Encoding"
 msgstr "Kodning"
 
-#: src/compose.c:5342 src/prefs_folder_item.c:202
+#: src/compose.c:5351 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Sökväg"
 
-#: src/compose.c:5343
+#: src/compose.c:5352
 msgid "File name"
 msgstr "Filnamn"
 
-#: src/compose.c:5436
+#: src/compose.c:5445
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Ogiltig kommandorad för extern redigerare: \"%s\"\n"
 
-#: src/compose.c:5482
+#: src/compose.c:5491
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1812,44 +1823,44 @@ msgstr ""
 "Framtvinga avslutning av processen?\n"
 "processgrupps-id: %d"
 
-#: src/compose.c:5857 src/compose.c:5862 src/compose.c:5868
+#: src/compose.c:5866 src/compose.c:5871 src/compose.c:5877
 msgid "Can't queue the message."
 msgstr "Kan inte lägga meddelandet i kö."
 
-#: src/compose.c:5959
+#: src/compose.c:5968
 msgid "Select files"
 msgstr "Välj filer"
 
-#: src/compose.c:5982
+#: src/compose.c:5991
 msgid "Select file"
 msgstr "Välj fil"
 
-#: src/compose.c:6017
+#: src/compose.c:6026
 msgid "Save message"
 msgstr "Spara meddelande"
 
-#: src/compose.c:6018
+#: src/compose.c:6027
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Detta meddelande har ändrats. Spara det till utkastmappen?"
 
-#: src/compose.c:6020
+#: src/compose.c:6029
 msgid "Close _without saving"
 msgstr "Stäng _utan att spara"
 
-#: src/compose.c:6062
+#: src/compose.c:6071
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Vill du använda mallen \"%s\" ?"
 
-#: src/compose.c:6064
+#: src/compose.c:6073
 msgid "Apply template"
 msgstr "Använd mall"
 
-#: src/compose.c:6065
+#: src/compose.c:6074
 msgid "_Replace"
 msgstr "_Ersätt"
 
-#: src/compose.c:6065
+#: src/compose.c:6074
 msgid "_Insert"
 msgstr "_Infoga"
 
@@ -2285,7 +2296,7 @@ msgstr "Nya"
 
 #. S_COL_MARK
 #: src/folderview.c:412 src/prefs_filter_edit.c:500
-#: src/prefs_summary_column.c:71 src/summaryview.c:509
+#: src/prefs_summary_column.c:71 src/summaryview.c:511
 msgid "Unread"
 msgstr "Olästa"
 
@@ -2301,12 +2312,12 @@ msgstr "Ställer in mappinfo...\n"
 msgid "Setting folder info..."
 msgstr "Ställer in mappinfo..."
 
-#: src/folderview.c:858 src/mainwindow.c:3464 src/setup.c:80
+#: src/folderview.c:858 src/mainwindow.c:3481 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Söker igenom mapp %s%c%s..."
 
-#: src/folderview.c:862 src/mainwindow.c:3469 src/setup.c:85
+#: src/folderview.c:862 src/mainwindow.c:3486 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Söker igenom mapp %s ..."
@@ -2331,7 +2342,7 @@ msgstr "Uppdatering av mappträdet misslyckades."
 msgid "Checking for new messages in all folders..."
 msgstr "Letar efter nya meddelanden i alla mappar..."
 
-#: src/folderview.c:1200 src/mainwindow.c:2400 src/prefs_common_dialog.c:1789
+#: src/folderview.c:1200 src/mainwindow.c:2411 src/prefs_common_dialog.c:1789
 msgid "Junk"
 msgstr "Skräp"
 
@@ -2471,7 +2482,7 @@ msgstr "Ämne:"
 msgid "Creating header view...\n"
 msgstr "Skapar brevhuvudvy...\n"
 
-#: src/headerview.c:180 src/query_search.c:637 src/summaryview.c:2110
+#: src/headerview.c:180 src/query_search.c:637 src/summaryview.c:2127
 msgid "(No From)"
 msgstr "(Inget Från)"
 
@@ -2580,7 +2591,7 @@ msgstr "Importera LDIF-fil till adressboken"
 msgid "Prev"
 msgstr "Föregående"
 
-#: src/importldif.c:768 src/mainwindow.c:2420
+#: src/importldif.c:768 src/mainwindow.c:2431
 msgid "Next"
 msgstr "Nästa"
 
@@ -2931,11 +2942,11 @@ msgstr ""
 msgid "another Sylpheed is already running.\n"
 msgstr "en annan instans av Sylpheed är redan igång.\n"
 
-#: src/main.c:1064
+#: src/main.c:1083
 msgid "Migration of configuration"
 msgstr "Migration av konfiguration"
 
-#: src/main.c:1065
+#: src/main.c:1084
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -2943,633 +2954,638 @@ msgstr ""
 "Den tidigare versionen av konfigurationen hittad.\n"
 "Vill du flytta den?"
 
-#: src/mainwindow.c:478
+#: src/mainwindow.c:481
 msgid "/_File/_Folder"
 msgstr "/_Arkiv/_Mapp"
 
-#: src/mainwindow.c:479
+#: src/mainwindow.c:482
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/_Arkiv/_Mapp/_Ny mapp..."
 
-#: src/mainwindow.c:481
+#: src/mainwindow.c:484
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/_Arkiv/_Mapp/_Byt namn..."
 
-#: src/mainwindow.c:482
+#: src/mainwindow.c:485
 msgid "/_File/_Folder/_Move folder..."
 msgstr "/_Arkiv/_Mapp/_Flytta..."
 
-#: src/mainwindow.c:483
+#: src/mainwindow.c:486
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/_Arkiv/_Mapp/_Ta bort"
 
-#: src/mainwindow.c:484
+#: src/mainwindow.c:487
 msgid "/_File/_Mailbox"
 msgstr "/_Arkiv/_Brevlåda..."
 
-#: src/mainwindow.c:485
+#: src/mainwindow.c:488
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/_Arkiv/_Brevlåda/_Lägg till..."
 
-#: src/mainwindow.c:486
+#: src/mainwindow.c:489
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/_Arkiv/_Brevlåda/_Ta bort"
 
-#: src/mainwindow.c:487 src/mainwindow.c:492
+#: src/mainwindow.c:490 src/mainwindow.c:495
 msgid "/_File/_Mailbox/---"
 msgstr "/_Arkiv/_Brevlåda/---"
 
-#: src/mainwindow.c:488
+#: src/mainwindow.c:491
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "/_Arkiv/_Brevlåda/Ta emot nya _meddelanden"
 
-#: src/mainwindow.c:490
+#: src/mainwindow.c:493
 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:493
+#: src/mainwindow.c:496
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "/_Arkiv/_Brevlåda/_Uppdatera mappträd"
 
-#: src/mainwindow.c:496
+#: src/mainwindow.c:499
 msgid "/_File/_Import mbox file..."
 msgstr "/_Arkiv/_Importera mbox-fil..."
 
-#: src/mainwindow.c:497
+#: src/mainwindow.c:500
 msgid "/_File/_Export to mbox file..."
 msgstr "/_Arkiv/_Exportera till mbox-fil..."
 
-#: src/mainwindow.c:499
+#: src/mainwindow.c:502
 msgid "/_File/Empty all _trash"
 msgstr "/_Arkiv/Töm alla _papperskorgar"
 
-#: src/mainwindow.c:501 src/messageview.c:139
+#: src/mainwindow.c:504 src/messageview.c:139
 msgid "/_File/_Save as..."
 msgstr "/_Arkiv/_Spara som..."
 
-#: src/mainwindow.c:502 src/messageview.c:140
+#: src/mainwindow.c:505 src/messageview.c:140
 msgid "/_File/_Print..."
 msgstr "/_Arkiv/Skriv _ut..."
 
-#: src/mainwindow.c:504
+#: src/mainwindow.c:507
 msgid "/_File/_Work offline"
 msgstr "/_Arkiv/Arbeta _offline"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:507
+#: src/mainwindow.c:510
 msgid "/_File/E_xit"
 msgstr "/_Arkiv/_Avsluta"
 
-#: src/mainwindow.c:512
+#: src/mainwindow.c:515
 msgid "/_Edit/Select _thread"
 msgstr "/_Redigera/Välj _tråd"
 
-#: src/mainwindow.c:514 src/messageview.c:148
+#: src/mainwindow.c:517 src/messageview.c:148
 msgid "/_Edit/_Find in current message..."
 msgstr "/_Redigera/Sök _i aktuellt meddelande..."
 
-#: src/mainwindow.c:516
+#: src/mainwindow.c:519
 msgid "/_Edit/_Search messages..."
 msgstr "/_Redigera/_Sök meddelanden..."
 
-#: src/mainwindow.c:519
+#: src/mainwindow.c:522
 msgid "/_View/Show or hi_de"
 msgstr "/_Visa/_Visa eller dölj"
 
-#: src/mainwindow.c:520
+#: src/mainwindow.c:523
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/_Visa/_Visa eller dölj/_Mappträd"
 
-#: src/mainwindow.c:522
+#: src/mainwindow.c:525
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/_Visa/_Visa eller dölj/Me_ddelandevy"
 
-#: src/mainwindow.c:524
+#: src/mainwindow.c:527
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/_Visa/_Visa eller dölj/_Verktygsrad"
 
-#: src/mainwindow.c:526
+#: src/mainwindow.c:529
 msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/_Visa/_Visa eller dölj/_Verktygsrad/Ikoner _och text"
 
-#: src/mainwindow.c:528
+#: src/mainwindow.c:531
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/_Visa/_Visa eller dölj/_Verktygsrad/_Ikoner"
 
-#: src/mainwindow.c:530
+#: src/mainwindow.c:533
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/_Visa/_Visa eller dölj/_Verktygsrad/_Text"
 
-#: src/mainwindow.c:532
+#: src/mainwindow.c:535
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/_Visa/_Visa eller dölj/_Verktygsrad/I_ngetdera"
 
-#: src/mainwindow.c:534
+#: src/mainwindow.c:537
 #, fuzzy
 msgid "/_View/Show or hi_de/_Search bar"
 msgstr "/_Visa/_Visa eller dölj/_Statusrad"
 
-#: src/mainwindow.c:536
+#: src/mainwindow.c:539
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/_Visa/_Visa eller dölj/_Statusrad"
 
-#: src/mainwindow.c:539
+#: src/mainwindow.c:542
 msgid "/_View/Separate f_older tree"
 msgstr "/_Visa/Separat ma_ppträd"
 
-#: src/mainwindow.c:540
+#: src/mainwindow.c:543
 msgid "/_View/Separate _message view"
 msgstr "/_Visa/Separat m_eddelandevy"
 
-#: src/mainwindow.c:542
+#: src/mainwindow.c:545
 msgid "/_View/_Sort"
 msgstr "/_Visa/_Sortera"
 
-#: src/mainwindow.c:543
+#: src/mainwindow.c:546
 msgid "/_View/_Sort/by _number"
 msgstr "/_Visa/_Sortera/efter _nummer"
 
-#: src/mainwindow.c:544
+#: src/mainwindow.c:547
 msgid "/_View/_Sort/by s_ize"
 msgstr "/_Visa/_Sortera/efter stor_lek"
 
-#: src/mainwindow.c:545
+#: src/mainwindow.c:548
 msgid "/_View/_Sort/by _date"
 msgstr "/_Visa/_Sortera/efter _datum"
 
-#: src/mainwindow.c:546
+#: src/mainwindow.c:549
 msgid "/_View/_Sort/by t_hread date"
 msgstr "/_Visa/_Sortera/efter _tråddatum"
 
-#: src/mainwindow.c:547
+#: src/mainwindow.c:550
 msgid "/_View/_Sort/by _from"
 msgstr "/_Visa/_Sortera/efter _från"
 
-#: src/mainwindow.c:548
+#: src/mainwindow.c:551
 msgid "/_View/_Sort/by _recipient"
 msgstr "/_Visa/_Sortera/efter _mottagare"
 
-#: src/mainwindow.c:549
+#: src/mainwindow.c:552
 msgid "/_View/_Sort/by _subject"
 msgstr "/_Visa/_Sortera/efter _ämne"
 
-#: src/mainwindow.c:550
+#: src/mainwindow.c:553
 msgid "/_View/_Sort/by _color label"
 msgstr "/_Visa/_Sortera/efter fä_rgmarkering"
 
-#: src/mainwindow.c:552
+#: src/mainwindow.c:555
 msgid "/_View/_Sort/by _mark"
 msgstr "/_Visa/_Sortera/efter mar_kering"
 
-#: src/mainwindow.c:553
+#: src/mainwindow.c:556
 msgid "/_View/_Sort/by _unread"
 msgstr "/_Visa/_Sortera/efter _oläst"
 
-#: src/mainwindow.c:554
+#: src/mainwindow.c:557
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/_Visa/_Sortera/efter _bilaga"
 
-#: src/mainwindow.c:556
+#: src/mainwindow.c:559
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/_Visa/_Sortera/_inte alls"
 
-#: src/mainwindow.c:557 src/mainwindow.c:560
+#: src/mainwindow.c:560 src/mainwindow.c:563
 msgid "/_View/_Sort/---"
 msgstr "/_Visa/_Sortera/---"
 
-#: src/mainwindow.c:558
+#: src/mainwindow.c:561
 msgid "/_View/_Sort/Ascending"
 msgstr "/_Visa/_Sortera/Uppstigande"
 
-#: src/mainwindow.c:559
+#: src/mainwindow.c:562
 msgid "/_View/_Sort/Descending"
 msgstr "/_Visa/_Sortera/Nedstigande"
 
-#: src/mainwindow.c:561
+#: src/mainwindow.c:564
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/_Visa/_Sortera/_Attrahera efter ärende"
 
-#: src/mainwindow.c:563
+#: src/mainwindow.c:566
 msgid "/_View/Th_read view"
 msgstr "/_Visa/_Trådvy"
 
-#: src/mainwindow.c:564
+#: src/mainwindow.c:567
 msgid "/_View/E_xpand all threads"
 msgstr "/_Visa/E_xpandera alla trådar"
 
-#: src/mainwindow.c:565
+#: src/mainwindow.c:568
 msgid "/_View/Co_llapse all threads"
 msgstr "/_Visa/Ko_llapsa alla trådar"
 
-#: src/mainwindow.c:566
+#: src/mainwindow.c:569
 msgid "/_View/Set display _item..."
 msgstr "/_Visa/_Poster i summeringsvyn..."
 
-#: src/mainwindow.c:569
+#: src/mainwindow.c:572
 msgid "/_View/_Go to"
 msgstr "/_Visa/_Gå till"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:573
 msgid "/_View/_Go to/_Prev message"
 msgstr "/_Visa/_Gå till/_Föreg. meddelande"
 
-#: src/mainwindow.c:571
+#: src/mainwindow.c:574
 msgid "/_View/_Go to/_Next message"
 msgstr "/_Visa/_Gå till/_Nästa meddelande"
 
-#: src/mainwindow.c:572 src/mainwindow.c:577 src/mainwindow.c:580
-#: src/mainwindow.c:585 src/mainwindow.c:590
+#: src/mainwindow.c:575 src/mainwindow.c:580 src/mainwindow.c:583
+#: src/mainwindow.c:588 src/mainwindow.c:593
 msgid "/_View/_Go to/---"
 msgstr "/_Visa/_Gå till/---"
 
-#: src/mainwindow.c:573
+#: src/mainwindow.c:576
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/_Visa/_Gå till/F_öreg. olästa meddelande"
 
-#: src/mainwindow.c:575
+#: src/mainwindow.c:578
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/_Visa/_Gå till/N_ästa olästa meddelande"
 
-#: src/mainwindow.c:578
+#: src/mainwindow.c:581
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/_Visa/_Gå till/Föreg. n_ya meddelande"
 
-#: src/mainwindow.c:579
+#: src/mainwindow.c:582
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/_Visa/_Gå till/Näs_ta nya meddelande"
 
-#: src/mainwindow.c:581
+#: src/mainwindow.c:584
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/_Visa/_Gå till/Föreg. _markerade meddelande"
 
-#: src/mainwindow.c:583
+#: src/mainwindow.c:586
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/_Visa/_Gå till/Nästa m_arkerade meddelande"
 
-#: src/mainwindow.c:586
+#: src/mainwindow.c:589
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/_Visa/_Gå till/Föreg. _färgade meddelande"
 
-#: src/mainwindow.c:588
+#: src/mainwindow.c:591
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/_Visa/_Gå till/Nästa fä_rgade meddelande"
 
-#: src/mainwindow.c:591
+#: src/mainwindow.c:594
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Visa/_Gå till/_En annan mapp..."
 
-#: src/mainwindow.c:600 src/messageview.c:159
+#: src/mainwindow.c:603 src/messageview.c:159
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Visa/_Teckenkodning/_Automatisk igenkänning"
 
-#: src/mainwindow.c:613 src/messageview.c:172
+#: src/mainwindow.c:616 src/messageview.c:172
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr "/_Visa/_Teckenkodning/_Västeuropeisk (ISO-8859-15)"
 
-#: src/mainwindow.c:653 src/messageview.c:205
+#: src/mainwindow.c:662 src/messageview.c:210
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Visa/_Teckenkodning/Japansk (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:655 src/messageview.c:207
+#: src/mainwindow.c:664 src/messageview.c:212
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Visa/_Teckenkodning/Japansk (_EUC-JP)"
 
-#: src/mainwindow.c:657 src/messageview.c:209
+#: src/mainwindow.c:666 src/messageview.c:214
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Visa/_Teckenkodning/Japansk (_Shift__JIS)"
 
-#: src/mainwindow.c:667 src/messageview.c:218
+#: src/mainwindow.c:676 src/messageview.c:223
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Visa/_Teckenkodning/Traditionell kinesisk (EUC-_TW)"
 
-#: src/mainwindow.c:669 src/messageview.c:220
+#: src/mainwindow.c:678 src/messageview.c:225
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Visa/_Teckenkodning/Kinesisk (ISO-2022-_CN)"
 
-#: src/mainwindow.c:675 src/messageview.c:225
+#: src/mainwindow.c:684 src/messageview.c:230
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Visa/_Teckenkodning/Koreansk (ISO-2022-KR)"
 
-#: src/mainwindow.c:688 src/summaryview.c:449
+#: src/mainwindow.c:697 src/summaryview.c:451
 msgid "/_View/Open in new _window"
 msgstr "/_Visa/_Öppna i nytt fönster"
 
-#: src/mainwindow.c:689 src/messageview.c:237
+#: src/mainwindow.c:698 src/messageview.c:242
 msgid "/_View/Mess_age source"
 msgstr "/_Visa/_Meddelandekällkod"
 
-#: src/mainwindow.c:690 src/messageview.c:238
+#: src/mainwindow.c:699 src/messageview.c:243
 msgid "/_View/Show all _header"
 msgstr "/_Visa/_Hela brevhuvudet"
 
-#: src/mainwindow.c:692
+#: src/mainwindow.c:701
 msgid "/_View/_Update summary"
 msgstr "/_Visa/_Uppdatera summering"
 
-#: src/mainwindow.c:694 src/messageview.c:240
+#: src/mainwindow.c:703 src/messageview.c:245
 msgid "/_Message"
 msgstr "/_Meddelande"
 
-#: src/mainwindow.c:695
+#: src/mainwindow.c:704
 msgid "/_Message/Recei_ve"
 msgstr "/_Meddelande/Mott_ag"
 
-#: src/mainwindow.c:696
+#: src/mainwindow.c:705
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/_Meddelande/Mottag/Hämta från _detta konto"
 
-#: src/mainwindow.c:698
+#: src/mainwindow.c:707
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/_Meddelande/Mottag/Hämta från alla _konton"
 
-#: src/mainwindow.c:700
+#: src/mainwindow.c:709
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/_Meddelande/Mottag/Avbryt hämtnin_g"
 
-#: src/mainwindow.c:702
+#: src/mainwindow.c:711
 msgid "/_Message/Recei_ve/---"
 msgstr "/_Meddelande/Mottag/---"
 
-#: src/mainwindow.c:703
+#: src/mainwindow.c:712
 msgid "/_Message/_Send queued messages"
 msgstr "/_Meddelande/Skicka _köade meddelanden"
 
-#: src/mainwindow.c:704 src/mainwindow.c:706 src/mainwindow.c:713
-#: src/mainwindow.c:718 src/mainwindow.c:721 src/mainwindow.c:730
-#: src/mainwindow.c:732 src/mainwindow.c:735 src/messageview.c:243
-#: src/messageview.c:251 src/messageview.c:256
+#: src/mainwindow.c:713 src/mainwindow.c:715 src/mainwindow.c:722
+#: src/mainwindow.c:727 src/mainwindow.c:730 src/mainwindow.c:741
+#: src/mainwindow.c:743 src/mainwindow.c:746 src/messageview.c:248
+#: src/messageview.c:256 src/messageview.c:261
 msgid "/_Message/---"
 msgstr "/_Meddelande/---"
 
-#: src/mainwindow.c:705 src/messageview.c:241
+#: src/mainwindow.c:714 src/messageview.c:246
 msgid "/_Message/Compose _new message"
 msgstr "/_Meddelande/Skriv _nytt meddelande"
 
-#: src/mainwindow.c:707 src/messageview.c:244
+#: src/mainwindow.c:716 src/messageview.c:249
 msgid "/_Message/_Reply"
 msgstr "/_Meddelande/Sva_ra"
 
-#: src/mainwindow.c:708
+#: src/mainwindow.c:717
 msgid "/_Message/Repl_y to"
 msgstr "/_Meddelande/_Svara till"
 
-#: src/mainwindow.c:709 src/messageview.c:245
+#: src/mainwindow.c:718 src/messageview.c:250
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Meddelande/_Svara till/a_lla"
 
-#: src/mainwindow.c:710 src/messageview.c:247
+#: src/mainwindow.c:719 src/messageview.c:252
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Meddelande/_Svara till/_avsändaren"
 
-#: src/mainwindow.c:711 src/messageview.c:249
+#: src/mainwindow.c:720 src/messageview.c:254
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Meddelande/_Svara till/_e-postlista"
 
-#: src/mainwindow.c:714 src/messageview.c:252
+#: src/mainwindow.c:723 src/messageview.c:257
 msgid "/_Message/_Forward"
 msgstr "/_Meddelande/Vi_darebefordra"
 
-#: src/mainwindow.c:715 src/messageview.c:253
+#: src/mainwindow.c:724 src/messageview.c:258
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Meddelande/Vidarebefordra som bil_aga"
 
-#: src/mainwindow.c:717 src/messageview.c:255
+#: src/mainwindow.c:726 src/messageview.c:260
 msgid "/_Message/Redirec_t"
 msgstr "/_Meddelande/_Omdirigera"
 
-#: src/mainwindow.c:719
+#: src/mainwindow.c:728
 msgid "/_Message/M_ove..."
 msgstr "/_Meddelande/Fl_ytta..."
 
-#: src/mainwindow.c:720
+#: src/mainwindow.c:729
 msgid "/_Message/_Copy..."
 msgstr "/_Meddelande/_Kopiera"
 
-#: src/mainwindow.c:722
+#: src/mainwindow.c:731
 msgid "/_Message/_Mark"
 msgstr "/_Meddelande/_Markera"
 
-#: src/mainwindow.c:723
+#: src/mainwindow.c:732
 msgid "/_Message/_Mark/_Mark"
 msgstr "/_Meddelande/_Markera/_Markera"
 
-#: src/mainwindow.c:724
+#: src/mainwindow.c:733
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/_Meddelande/_Markera/_Avmarkera"
 
-#: src/mainwindow.c:725
+#: src/mainwindow.c:734
 msgid "/_Message/_Mark/---"
 msgstr "/_Meddelande/_Markera/---"
 
-#: src/mainwindow.c:726
+#: src/mainwindow.c:735
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/_Meddelande/_Markera/Markera som _oläst"
 
-#: src/mainwindow.c:727
+#: src/mainwindow.c:736
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/_Meddelande/_Markera/Markera som _läst"
 
-#: src/mainwindow.c:729
+#: src/mainwindow.c:738
+#, fuzzy
+msgid "/_Message/_Mark/Mark _thread as read"
+msgstr "/_Meddelande/_Markera/Markera som _läst"
+
+#: src/mainwindow.c:740
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/_Meddelande/_Markera/Markera alla som l_ästa"
 
-#: src/mainwindow.c:731
+#: src/mainwindow.c:742
 msgid "/_Message/_Delete"
 msgstr "/_Meddelande/_Ta bort"
 
-#: src/mainwindow.c:733
+#: src/mainwindow.c:744
 msgid "/_Message/Set as _junk mail"
 msgstr "/_Meddelande/Sätt som _skräppost"
 
-#: src/mainwindow.c:734
+#: src/mainwindow.c:745
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/_Meddelande/Sätt som inte skr_äppost"
 
-#: src/mainwindow.c:736 src/messageview.c:257
+#: src/mainwindow.c:747 src/messageview.c:262
 msgid "/_Message/Re-_edit"
 msgstr "/_Meddelande/Redigera _om"
 
-#: src/mainwindow.c:740
+#: src/mainwindow.c:751
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/V_erktyg/Lägg till avsändaren i adressbo_k..."
 
-#: src/mainwindow.c:743
+#: src/mainwindow.c:754
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/V_erktyg/_Filtrera alla meddelanden i mappen"
 
-#: src/mainwindow.c:745
+#: src/mainwindow.c:756
 msgid "/_Tools/Filter _selected messages"
 msgstr "/V_erktyg/Filtrera _valda meddelanden"
 
-#: src/mainwindow.c:747 src/messageview.c:264
+#: src/mainwindow.c:758 src/messageview.c:269
 msgid "/_Tools/_Create filter rule"
 msgstr "/V_erktyg/_Skapa filterregel"
 
-#: src/mainwindow.c:748 src/messageview.c:266
+#: src/mainwindow.c:759 src/messageview.c:271
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/V_erktyg/_Skapa filterregel/_Automatiskt"
 
-#: src/mainwindow.c:750 src/messageview.c:268
+#: src/mainwindow.c:761 src/messageview.c:273
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/V_erktyg/_Skapa filterregel/genom _Från"
 
-#: src/mainwindow.c:752 src/messageview.c:270
+#: src/mainwindow.c:763 src/messageview.c:275
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/V_erktyg/_Skapa filterregel/genom _Till"
 
-#: src/mainwindow.c:754 src/messageview.c:272
+#: src/mainwindow.c:765 src/messageview.c:277
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/V_erktyg/_Skapa filterregel/genom _Ämne"
 
-#: src/mainwindow.c:757
+#: src/mainwindow.c:768
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/V_erktyg/Filtrera _skräppost i mappen"
 
-#: src/mainwindow.c:759
+#: src/mainwindow.c:770
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/V_erktyg/Filtrera skräp_post i valda meddelanden"
 
-#: src/mainwindow.c:764
+#: src/mainwindow.c:775
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/V_erktyg/Ta bort meddelande_dubbletter"
 
-#: src/mainwindow.c:767
+#: src/mainwindow.c:778
 msgid "/_Tools/E_xecute"
 msgstr "/V_erktyg/Utför _köade åtgärder"
 
-#: src/mainwindow.c:769
+#: src/mainwindow.c:780
 msgid "/_Tools/_Log window"
 msgstr "/V_erktyg/_Loggfönster"
 
-#: src/mainwindow.c:771
+#: src/mainwindow.c:782
 msgid "/_Configuration"
 msgstr "/_Konfiguration"
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:783
 msgid "/_Configuration/_Common preferences..."
 msgstr "/_Konfiguration/_Allmänna inställningar..."
 
-#: src/mainwindow.c:774
+#: src/mainwindow.c:785
 msgid "/_Configuration/_Filter setting..."
 msgstr "/_Konfiguration/_Filterinställningar..."
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:787
 msgid "/_Configuration/_Template..."
 msgstr "/_Konfiguration/_Mall..."
 
-#: src/mainwindow.c:777
+#: src/mainwindow.c:788
 msgid "/_Configuration/_Actions..."
 msgstr "/_Konfiguration/_Åtgärder..."
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:789
 msgid "/_Configuration/---"
 msgstr "/_Konfiguration/---"
 
-#: src/mainwindow.c:779
+#: src/mainwindow.c:790
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Konfiguration/_Inställningar för aktuellt konto..."
 
-#: src/mainwindow.c:781
+#: src/mainwindow.c:792
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Konfiguration/Skapa _nytt konto..."
 
-#: src/mainwindow.c:783
+#: src/mainwindow.c:794
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Konfiguration/_Redigera konton..."
 
-#: src/mainwindow.c:785
+#: src/mainwindow.c:796
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Konfiguration/_Ändra aktuellt konto"
 
-#: src/mainwindow.c:789
+#: src/mainwindow.c:800
 msgid "/_Help/_Manual"
 msgstr "/_Hjälp/_Handbok"
 
-#: src/mainwindow.c:790
+#: src/mainwindow.c:801
 msgid "/_Help/_Manual/_English"
 msgstr "/_Hjälp/_Handbok/_Engelsk"
 
-#: src/mainwindow.c:791
+#: src/mainwindow.c:802
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/_Hjälp/_Handbok/_Japansk"
 
-#: src/mainwindow.c:792
+#: src/mainwindow.c:803
 msgid "/_Help/_FAQ"
 msgstr "/_Hjälp/_FAQ"
 
-#: src/mainwindow.c:793
+#: src/mainwindow.c:804
 msgid "/_Help/_FAQ/_English"
 msgstr "/_Hjälp/_FAQ/_Engelsk"
 
-#: src/mainwindow.c:794
+#: src/mainwindow.c:805
 msgid "/_Help/_FAQ/_German"
 msgstr "/_Hjälp/_FAQ/_Tysk"
 
-#: src/mainwindow.c:795
+#: src/mainwindow.c:806
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/_Hjälp/_FAQ/_Spansk"
 
-#: src/mainwindow.c:796
+#: src/mainwindow.c:807
 msgid "/_Help/_FAQ/_French"
 msgstr "/_Hjälp/_FAQ/_Fransk"
 
-#: src/mainwindow.c:797
+#: src/mainwindow.c:808
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/_Hjälp/_FAQ/_Italiensk"
 
-#: src/mainwindow.c:798
+#: src/mainwindow.c:809
 msgid "/_Help/---"
 msgstr "/_Hjälp/---"
 
-#: src/mainwindow.c:841
+#: src/mainwindow.c:852
 msgid "Creating main window...\n"
 msgstr "Skapar huvudfönster...\n"
 
-#: src/mainwindow.c:1011
+#: src/mainwindow.c:1022
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Huvudfönster: färgtilldelning %d misslyckades\n"
 
-#: src/mainwindow.c:1108 src/summaryview.c:2258 src/summaryview.c:2343
-#: src/summaryview.c:3739 src/summaryview.c:3868 src/summaryview.c:4226
+#: src/mainwindow.c:1119 src/summaryview.c:2275 src/summaryview.c:2360
+#: src/summaryview.c:3896 src/summaryview.c:4025 src/summaryview.c:4383
 msgid "done.\n"
 msgstr "färdigt.\n"
 
-#: src/mainwindow.c:1235 src/mainwindow.c:1276 src/mainwindow.c:1301
+#: src/mainwindow.c:1246 src/mainwindow.c:1287 src/mainwindow.c:1312
 msgid "Untitled"
 msgstr "Namnlös"
 
-#: src/mainwindow.c:1302
+#: src/mainwindow.c:1313
 msgid "none"
 msgstr "inget"
 
-#: src/mainwindow.c:1355
+#: src/mainwindow.c:1366
 #, 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:1605
+#: src/mainwindow.c:1616
 msgid "Offline"
 msgstr "Frånkopplad"
 
-#: src/mainwindow.c:1606
+#: src/mainwindow.c:1617
 msgid "You are offline. Go online?"
 msgstr "Du är frånkopplad. Vill du ansluta?"
 
-#: src/mainwindow.c:1623
+#: src/mainwindow.c:1634
 msgid "Empty all trash"
 msgstr "Töm alla papperskorgar"
 
-#: src/mainwindow.c:1624
+#: src/mainwindow.c:1635
 msgid "Delete all messages in trash folders?"
 msgstr "Ta bort alla meddelanden i papperskorgen?"
 
-#: src/mainwindow.c:1652
+#: src/mainwindow.c:1663
 msgid "Add mailbox"
 msgstr "Lägg till brevlåda"
 
-#: src/mainwindow.c:1653
+#: src/mainwindow.c:1664
 msgid ""
 "Specify the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3579,16 +3595,16 @@ msgstr ""
 "Om den existerande brevlådan specificeras, kommer den\n"
 "att sökas igenom automatiskt."
 
-#: src/mainwindow.c:1659 src/setup.c:49
+#: src/mainwindow.c:1670 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Brevlådan \"%s\" finns redan."
 
-#: src/mainwindow.c:1664 src/setup.c:56
+#: src/mainwindow.c:1675 src/setup.c:56
 msgid "Mailbox"
 msgstr "Brevlåda"
 
-#: src/mainwindow.c:1670 src/setup.c:62
+#: src/mainwindow.c:1681 src/setup.c:62
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3597,145 +3613,145 @@ msgstr ""
 "Brevlådan kunde inte skapas.\n"
 "Några filer finns redan eller så saknar du skrivrättigheter där."
 
-#: src/mainwindow.c:2088
+#: src/mainwindow.c:2099
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Mappvy"
 
-#: src/mainwindow.c:2107
+#: src/mainwindow.c:2118
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Meddelandevy"
 
-#: src/mainwindow.c:2259 src/summaryview.c:408
+#: src/mainwindow.c:2270 src/summaryview.c:408
 msgid "/_Reply"
 msgstr "/Sva_ra"
 
-#: src/mainwindow.c:2260
+#: src/mainwindow.c:2271
 msgid "/Reply to _all"
 msgstr "/Svara till _alla"
 
-#: src/mainwindow.c:2261
+#: src/mainwindow.c:2272
 msgid "/Reply to _sender"
 msgstr "/Svara till av_sändaren"
 
-#: src/mainwindow.c:2262
+#: src/mainwindow.c:2273
 msgid "/Reply to mailing _list"
 msgstr "/Svara till e-post_lista"
 
-#: src/mainwindow.c:2267 src/summaryview.c:415
+#: src/mainwindow.c:2278 src/summaryview.c:415
 msgid "/_Forward"
 msgstr "/Vi_darebefordra"
 
-#: src/mainwindow.c:2268 src/summaryview.c:416
+#: src/mainwindow.c:2279 src/summaryview.c:416
 msgid "/For_ward as attachment"
 msgstr "/Vidarebefordra som _bilaga"
 
-#: src/mainwindow.c:2269 src/summaryview.c:417
+#: src/mainwindow.c:2280 src/summaryview.c:417
 msgid "/Redirec_t"
 msgstr "/_Omdirigera"
 
-#: src/mainwindow.c:2305
+#: src/mainwindow.c:2316
 msgid "Get"
 msgstr "Hämta"
 
-#: src/mainwindow.c:2306
+#: src/mainwindow.c:2317
 msgid "Incorporate new mail"
 msgstr "Hämta ny post"
 
-#: src/mainwindow.c:2313
+#: src/mainwindow.c:2324
 msgid "Get all"
 msgstr "Hämta allt"
 
-#: src/mainwindow.c:2314
+#: src/mainwindow.c:2325
 msgid "Incorporate new mail of all accounts"
 msgstr "Hämta ny post från alla konton"
 
-#: src/mainwindow.c:2325
+#: src/mainwindow.c:2336
 msgid "Send queued message(s)"
 msgstr "Skicka köade meddelanden"
 
-#: src/mainwindow.c:2335 src/prefs_account_dialog.c:530
+#: src/mainwindow.c:2346 src/prefs_account_dialog.c:530
 #: src/prefs_common_dialog.c:663 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "Skriv"
 
-#: src/mainwindow.c:2336
+#: src/mainwindow.c:2347
 msgid "Compose new message"
 msgstr "Skriv nytt meddelande"
 
-#: src/mainwindow.c:2344 src/prefs_common_dialog.c:975
+#: src/mainwindow.c:2355 src/prefs_common_dialog.c:975
 msgid "Reply"
 msgstr "Svara"
 
-#: src/mainwindow.c:2345 src/mainwindow.c:2358
+#: src/mainwindow.c:2356 src/mainwindow.c:2369
 msgid "Reply to the message"
 msgstr "Svara på meddelandet"
 
-#: src/mainwindow.c:2362
+#: src/mainwindow.c:2373
 msgid "Reply all"
 msgstr "Svara alla"
 
-#: src/mainwindow.c:2363
+#: src/mainwindow.c:2374
 msgid "Reply to all"
 msgstr "Svara till alla"
 
-#: src/mainwindow.c:2371 src/prefs_filter_edit.c:672
+#: src/mainwindow.c:2382 src/prefs_filter_edit.c:672
 msgid "Forward"
 msgstr "Vidarebefordra"
 
-#: src/mainwindow.c:2372 src/mainwindow.c:2385
+#: src/mainwindow.c:2383 src/mainwindow.c:2396
 msgid "Forward the message"
 msgstr "Vidarebefordra meddelandet"
 
-#: src/mainwindow.c:2392
+#: src/mainwindow.c:2403
 msgid "Delete the message"
 msgstr "Ta bort meddelandet"
 
-#: src/mainwindow.c:2401
+#: src/mainwindow.c:2412
 msgid "Set as junk mail"
 msgstr "Sätt som skräppost"
 
-#: src/mainwindow.c:2410
+#: src/mainwindow.c:2421
 msgid "Execute"
 msgstr "Utför köade åtgärder"
 
-#: src/mainwindow.c:2411
+#: src/mainwindow.c:2422
 msgid "Execute marked process"
 msgstr "Kör markerad process"
 
-#: src/mainwindow.c:2421
+#: src/mainwindow.c:2432
 msgid "Next unread message"
 msgstr "Nästa olästa meddelande"
 
-#: src/mainwindow.c:2433
+#: src/mainwindow.c:2444
 msgid "Prefs"
 msgstr "Inst."
 
-#: src/mainwindow.c:2434
+#: src/mainwindow.c:2445
 msgid "Common preferences"
 msgstr "Allmänna inställningar"
 
-#: src/mainwindow.c:2442 src/prefs_folder_item.c:289
+#: src/mainwindow.c:2453 src/prefs_folder_item.c:289
 #: src/prefs_folder_item.c:300 src/progressdialog.c:128
 msgid "Account"
 msgstr "Konto"
 
-#: src/mainwindow.c:2443
+#: src/mainwindow.c:2454
 msgid "Account setting"
 msgstr "Kontoinställningar"
 
-#: src/mainwindow.c:2615
+#: src/mainwindow.c:2626
 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:2626
+#: src/mainwindow.c:2637
 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:2892
+#: src/mainwindow.c:2903
 msgid "Exit"
 msgstr "Avsluta"
 
-#: src/mainwindow.c:2892
+#: src/mainwindow.c:2903
 msgid "Exit this program?"
 msgstr "Avsluta detta program?"
 
@@ -3772,44 +3788,44 @@ msgstr "Slutet av meddelandet nått; fortsätta från början?"
 msgid "Search finished"
 msgstr "Sökning klar"
 
-#: src/messageview.c:261
+#: src/messageview.c:266
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/V_erktyg/Lägg till avsändaren i adressbo_ken"
 
-#: src/messageview.c:291
+#: src/messageview.c:296
 msgid "Creating message view...\n"
 msgstr "Skapar meddelandevy...\n"
 
-#: src/messageview.c:316
+#: src/messageview.c:321
 msgid "Text"
 msgstr "Text"
 
-#: src/messageview.c:321
+#: src/messageview.c:326
 msgid "Attachments"
 msgstr "Bilagor"
 
-#: src/messageview.c:371
+#: src/messageview.c:376
 msgid "Message View - Sylpheed"
 msgstr "Meddelandevy - Sylpheed"
 
-#: src/messageview.c:669 src/summaryview.c:3268
+#: src/messageview.c:674 src/summaryview.c:3425
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Kan inte spara filen \"%s\"."
 
-#: src/messageview.c:728 src/summaryview.c:3291
+#: src/messageview.c:733 src/summaryview.c:3448
 msgid "The message will be printed with the following command:"
 msgstr "Meddelandet kommer att skrivas ut med följande kommando:"
 
-#: src/messageview.c:729 src/summaryview.c:3292
+#: src/messageview.c:734 src/summaryview.c:3449
 msgid "(Default print command)"
 msgstr "(Förvalt utskriftkommando)"
 
-#: src/messageview.c:731 src/prefs_common_dialog.c:2304 src/summaryview.c:3294
+#: src/messageview.c:736 src/prefs_common_dialog.c:2304 src/summaryview.c:3451
 msgid "Print"
 msgstr "Skriv ut"
 
-#: src/messageview.c:740 src/summaryview.c:3303
+#: src/messageview.c:745 src/summaryview.c:3460
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -4704,8 +4720,8 @@ msgstr "Visa mottagare i \"Från\"-kolumnen om du själv är avsändaren"
 msgid "Expand threads"
 msgstr "Expandera trådar"
 
-#: src/prefs_common_dialog.c:1413 src/prefs_common_dialog.c:2713
-#: src/prefs_common_dialog.c:2751
+#: src/prefs_common_dialog.c:1413 src/prefs_common_dialog.c:2716
+#: src/prefs_common_dialog.c:2754
 msgid "Date format"
 msgstr "Datumformat"
 
@@ -4992,8 +5008,8 @@ msgstr "Externa kommandon (%s kommer att ersättas med filnamn / URI)"
 msgid "Web browser"
 msgstr "Webbläsare"
 
-#: src/prefs_common_dialog.c:2288 src/prefs_common_dialog.c:3775
-#: src/prefs_common_dialog.c:3796
+#: src/prefs_common_dialog.c:2288 src/prefs_common_dialog.c:3778
+#: src/prefs_common_dialog.c:3799
 msgid "(Default browser)"
 msgstr "(Förvald webbläsare)"
 
@@ -5069,214 +5085,224 @@ msgid "Greek (ISO-8859-7)"
 msgstr "Grekisk (ISO-8859-7)"
 
 #: src/prefs_common_dialog.c:2495
+#, fuzzy
+msgid "Arabic (ISO-8859-6)"
+msgstr "Baltisk (ISO-8859-4)"
+
+#: src/prefs_common_dialog.c:2496
+#, fuzzy
+msgid "Arabic (Windows-1256)"
+msgstr "Kyrillisk (Windows-1251)"
+
+#: src/prefs_common_dialog.c:2498
 msgid "Hebrew (ISO-8859-8)"
 msgstr "Hebreisk (ISO-8859-7)"
 
-#: src/prefs_common_dialog.c:2496
+#: src/prefs_common_dialog.c:2499
 msgid "Hebrew (Windows-1255)"
 msgstr "Hebreisk (Windows-1255)"
 
-#: src/prefs_common_dialog.c:2498
+#: src/prefs_common_dialog.c:2501
 msgid "Turkish (ISO-8859-9)"
 msgstr "Turkisk (ISO-8859-9)"
 
-#: src/prefs_common_dialog.c:2500
+#: src/prefs_common_dialog.c:2503
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Kyrillisk (ISO-8859-5)"
 
-#: src/prefs_common_dialog.c:2501
+#: src/prefs_common_dialog.c:2504
 msgid "Cyrillic (KOI8-R)"
 msgstr "Kyrillisk (KOI8-R)"
 
-#: src/prefs_common_dialog.c:2502
+#: src/prefs_common_dialog.c:2505
 msgid "Cyrillic (KOI8-U)"
 msgstr "Kyrillisk (KOI8-U)"
 
-#: src/prefs_common_dialog.c:2503
+#: src/prefs_common_dialog.c:2506
 msgid "Cyrillic (Windows-1251)"
 msgstr "Kyrillisk (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2505
+#: src/prefs_common_dialog.c:2508
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Japansk (ISO-2022-JP)"
 
-#: src/prefs_common_dialog.c:2507
+#: src/prefs_common_dialog.c:2510
 msgid "Japanese (EUC-JP)"
 msgstr "Japansk (EUC-JP)"
 
-#: src/prefs_common_dialog.c:2508
+#: src/prefs_common_dialog.c:2511
 msgid "Japanese (Shift_JIS)"
 msgstr "Japansk (Shift_JIS)"
 
-#: src/prefs_common_dialog.c:2511
+#: src/prefs_common_dialog.c:2514
 msgid "Simplified Chinese (GB2312)"
 msgstr "Förenklad kinesisk (GB2312)"
 
-#: src/prefs_common_dialog.c:2512
+#: src/prefs_common_dialog.c:2515
 msgid "Simplified Chinese (GBK)"
 msgstr "Förenklad kinesisk (GBK)"
 
-#: src/prefs_common_dialog.c:2513
+#: src/prefs_common_dialog.c:2516
 msgid "Traditional Chinese (Big5)"
 msgstr "Traditionell kinesisk (Big5)"
 
-#: src/prefs_common_dialog.c:2515
+#: src/prefs_common_dialog.c:2518
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Traditionell kinesisk (EUC-TW)"
 
-#: src/prefs_common_dialog.c:2516
+#: src/prefs_common_dialog.c:2519
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Kinesisk (ISO-2022-CN)"
 
-#: src/prefs_common_dialog.c:2519
+#: src/prefs_common_dialog.c:2522
 msgid "Korean (EUC-KR)"
 msgstr "Koreansk (EUC-KR)"
 
-#: src/prefs_common_dialog.c:2521
+#: src/prefs_common_dialog.c:2524
 msgid "Thai (TIS-620)"
 msgstr "Thai (TIS-620)"
 
-#: src/prefs_common_dialog.c:2522
+#: src/prefs_common_dialog.c:2525
 msgid "Thai (Windows-874)"
 msgstr "Thai (Windows-874)"
 
-#: src/prefs_common_dialog.c:2689
+#: src/prefs_common_dialog.c:2692
 msgid "the full abbreviated weekday name"
 msgstr "förkortat veckodagsnamn"
 
-#: src/prefs_common_dialog.c:2690
+#: src/prefs_common_dialog.c:2693
 msgid "the full weekday name"
 msgstr "fullständigt veckodagsnamn"
 
-#: src/prefs_common_dialog.c:2691
+#: src/prefs_common_dialog.c:2694
 msgid "the abbreviated month name"
 msgstr "förkortat månadsnamn"
 
-#: src/prefs_common_dialog.c:2692
+#: src/prefs_common_dialog.c:2695
 msgid "the full month name"
 msgstr "fullständigt månadsnamn"
 
-#: src/prefs_common_dialog.c:2693
+#: src/prefs_common_dialog.c:2696
 msgid "the preferred date and time for the current locale"
 msgstr "datum och tid gällande lokalt"
 
-#: src/prefs_common_dialog.c:2694
+#: src/prefs_common_dialog.c:2697
 msgid "the century number (year/100)"
 msgstr "århundradetal (årtal/100)"
 
-#: src/prefs_common_dialog.c:2695
+#: src/prefs_common_dialog.c:2698
 msgid "the day of the month as a decimal number"
 msgstr "dagen i månaden som decimaltal"
 
-#: src/prefs_common_dialog.c:2696
+#: src/prefs_common_dialog.c:2699
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "timmen som decimaltal enligt 24-timmarsräkning"
 
-#: src/prefs_common_dialog.c:2697
+#: src/prefs_common_dialog.c:2700
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "timmen som decimaltal enligt 12-timmarsräkning"
 
-#: src/prefs_common_dialog.c:2698
+#: src/prefs_common_dialog.c:2701
 msgid "the day of the year as a decimal number"
 msgstr "dagen på året som ett decimaltal"
 
-#: src/prefs_common_dialog.c:2699
+#: src/prefs_common_dialog.c:2702
 msgid "the month as a decimal number"
 msgstr "månaden som ett decimaltal"
 
-#: src/prefs_common_dialog.c:2700
+#: src/prefs_common_dialog.c:2703
 msgid "the minute as a decimal number"
 msgstr "minuten som ett decimaltal"
 
-#: src/prefs_common_dialog.c:2701
+#: src/prefs_common_dialog.c:2704
 msgid "either AM or PM"
 msgstr "antingen AM eller PM"
 
-#: src/prefs_common_dialog.c:2702
+#: src/prefs_common_dialog.c:2705
 msgid "the second as a decimal number"
 msgstr "sekunden som ett decimaltal"
 
-#: src/prefs_common_dialog.c:2703
+#: src/prefs_common_dialog.c:2706
 msgid "the day of the week as a decimal number"
 msgstr "veckodagen som ett decimaltal"
 
-#: src/prefs_common_dialog.c:2704
+#: src/prefs_common_dialog.c:2707
 msgid "the preferred date for the current locale"
 msgstr "datum gällande lokalt"
 
-#: src/prefs_common_dialog.c:2705
+#: src/prefs_common_dialog.c:2708
 msgid "the last two digits of a year"
 msgstr "de sista två siffrorna av ett årtal"
 
-#: src/prefs_common_dialog.c:2706
+#: src/prefs_common_dialog.c:2709
 msgid "the year as a decimal number"
 msgstr "årtalet som ett decimaltal"
 
-#: src/prefs_common_dialog.c:2707
+#: src/prefs_common_dialog.c:2710
 msgid "the time zone or name or abbreviation"
 msgstr "tidszon eller namn eller förkortning"
 
-#: src/prefs_common_dialog.c:2728
+#: src/prefs_common_dialog.c:2731
 msgid "Specifier"
 msgstr "Symbol"
 
-#: src/prefs_common_dialog.c:2729
+#: src/prefs_common_dialog.c:2732
 msgid "Description"
 msgstr "Beskrivning"
 
-#: src/prefs_common_dialog.c:2769
+#: src/prefs_common_dialog.c:2772
 msgid "Example"
 msgstr "Exempel"
 
-#: src/prefs_common_dialog.c:2850
+#: src/prefs_common_dialog.c:2853
 msgid "Set message colors"
 msgstr "Ställ in meddelandefärger"
 
-#: src/prefs_common_dialog.c:2858
+#: src/prefs_common_dialog.c:2861
 msgid "Colors"
 msgstr "Färger"
 
-#: src/prefs_common_dialog.c:2892
+#: src/prefs_common_dialog.c:2895
 msgid "Quoted Text - First Level"
 msgstr "Citerad text - Första nivån"
 
-#: src/prefs_common_dialog.c:2898
+#: src/prefs_common_dialog.c:2901
 msgid "Quoted Text - Second Level"
 msgstr "Citerad text - Andra nivån"
 
-#: src/prefs_common_dialog.c:2904
+#: src/prefs_common_dialog.c:2907
 msgid "Quoted Text - Third Level"
 msgstr "Citerad text - Tredje nivån"
 
-#: src/prefs_common_dialog.c:2910
+#: src/prefs_common_dialog.c:2913
 msgid "URI link"
 msgstr "URI-länk"
 
-#: src/prefs_common_dialog.c:2917
+#: src/prefs_common_dialog.c:2920
 msgid "Recycle quote colors"
 msgstr "Återanvänd citeringsfärger"
 
-#: src/prefs_common_dialog.c:2984
+#: src/prefs_common_dialog.c:2987
 msgid "Pick color for quotation level 1"
 msgstr "Välj färg för citeringsnivå 1"
 
-#: src/prefs_common_dialog.c:2987
+#: src/prefs_common_dialog.c:2990
 msgid "Pick color for quotation level 2"
 msgstr "Välj färg för citeringsnivå 2"
 
-#: src/prefs_common_dialog.c:2990
+#: src/prefs_common_dialog.c:2993
 msgid "Pick color for quotation level 3"
 msgstr "Välj färg för citeringsnivå 3"
 
-#: src/prefs_common_dialog.c:2993
+#: src/prefs_common_dialog.c:2996
 msgid "Pick color for URI"
 msgstr "Välj färg för URI"
 
-#: src/prefs_common_dialog.c:3133
+#: src/prefs_common_dialog.c:3136
 msgid "Description of symbols"
 msgstr "Beskrivning av symboler"
 
-#: src/prefs_common_dialog.c:3189
+#: src/prefs_common_dialog.c:3192
 msgid ""
 "Date\n"
 "From\n"
@@ -5300,11 +5326,11 @@ msgstr ""
 "Diskussionsgrupper\n"
 "Meddelande-ID"
 
-#: src/prefs_common_dialog.c:3202
+#: src/prefs_common_dialog.c:3205
 msgid "If x is set, displays expr"
 msgstr "Om x är inställd, visas expr"
 
-#: src/prefs_common_dialog.c:3206
+#: src/prefs_common_dialog.c:3209
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -5318,7 +5344,7 @@ msgstr ""
 "Citerad meddelandetext utan signatur\n"
 "Bokstavligt %"
 
-#: src/prefs_common_dialog.c:3214
+#: src/prefs_common_dialog.c:3217
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -5330,19 +5356,19 @@ msgstr ""
 "Bokstavlig öppnande klammerparentes\n"
 "Bokstavlig avslutande klammerparentes"
 
-#: src/prefs_common_dialog.c:3260
+#: src/prefs_common_dialog.c:3263
 msgid "Key bindings"
 msgstr "Tangentbindningar"
 
-#: src/prefs_common_dialog.c:3273
+#: src/prefs_common_dialog.c:3276
 msgid "Select the preset of key bindings."
 msgstr "Välj förvalda tangentbindningar..."
 
-#: src/prefs_common_dialog.c:3283 src/prefs_common_dialog.c:3607
+#: src/prefs_common_dialog.c:3286 src/prefs_common_dialog.c:3610
 msgid "Default"
 msgstr "Standard"
 
-#: src/prefs_common_dialog.c:3286 src/prefs_common_dialog.c:3616
+#: src/prefs_common_dialog.c:3289 src/prefs_common_dialog.c:3619
 msgid "Old Sylpheed"
 msgstr "Gamla Sylpheed"
 
@@ -5463,7 +5489,7 @@ msgstr "Resultat av kommando"
 msgid "Age"
 msgstr "Ålder"
 
-#: src/prefs_filter_edit.c:501 src/summaryview.c:510
+#: src/prefs_filter_edit.c:501 src/summaryview.c:512
 #, fuzzy
 msgid "Marked"
 msgstr "Markering"
@@ -5693,17 +5719,17 @@ msgid "Attachment"
 msgstr "Bilaga"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73 src/query_search.c:371 src/summaryview.c:4733
+#: src/prefs_summary_column.c:73 src/query_search.c:371 src/summaryview.c:4890
 msgid "Subject"
 msgstr "Ärende"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/query_search.c:372 src/summaryview.c:4736
+#: src/prefs_summary_column.c:74 src/query_search.c:372 src/summaryview.c:4893
 msgid "From"
 msgstr "Från"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/query_search.c:373 src/summaryview.c:4738
+#: src/prefs_summary_column.c:75 src/query_search.c:373 src/summaryview.c:4895
 msgid "Date"
 msgstr "Datum"
 
@@ -5806,7 +5832,7 @@ msgstr "Sök meddelanden"
 msgid "_Save as search folder"
 msgstr "Spara i utkastsmapp"
 
-#: src/query_search.c:512 src/subscribedialog.c:523 src/summaryview.c:840
+#: src/query_search.c:512 src/subscribedialog.c:523 src/summaryview.c:842
 msgid "Done."
 msgstr "Färdig."
 
@@ -5820,7 +5846,7 @@ msgstr "Söker igenom mapp %s ..."
 msgid "Searching %s (%d / %d)..."
 msgstr "Filtrerar..."
 
-#: src/query_search.c:645 src/summaryview.c:2048
+#: src/query_search.c:645 src/summaryview.c:2051
 msgid "(No Date)"
 msgstr "(Inget datum)"
 
@@ -6192,301 +6218,306 @@ msgid "/_Mark/Mark as rea_d"
 msgstr "/_Markera/Markera som _läst"
 
 #: src/summaryview.c:429
+#, fuzzy
+msgid "/_Mark/Mark _thread as read"
+msgstr "/_Markera/Markera som _läst"
+
+#: src/summaryview.c:431
 msgid "/_Mark/Mark all _read"
 msgstr "/_Markera/Markera alla som l_ästa"
 
-#: src/summaryview.c:430
+#: src/summaryview.c:432
 msgid "/Color la_bel"
 msgstr "/F_ärgmarkera"
 
-#: src/summaryview.c:434
+#: src/summaryview.c:436
 msgid "/Re-_edit"
 msgstr "/Redigera _om"
 
-#: src/summaryview.c:436
+#: src/summaryview.c:438
 msgid "/Add sender to address boo_k..."
 msgstr "/_Lägg till avsändaren till adressboken"
 
-#: src/summaryview.c:438
+#: src/summaryview.c:440
 msgid "/Create f_ilter rule"
 msgstr "/_Skapa filterregel"
 
-#: src/summaryview.c:439
+#: src/summaryview.c:441
 msgid "/Create f_ilter rule/_Automatically"
 msgstr "/_Skapa filterregel/_Automatiskt"
 
-#: src/summaryview.c:441
+#: src/summaryview.c:443
 msgid "/Create f_ilter rule/by _From"
 msgstr "/_Skapa filterregel/genom _Från"
 
-#: src/summaryview.c:443
+#: src/summaryview.c:445
 msgid "/Create f_ilter rule/by _To"
 msgstr "/_Skapa filterregel/genom _Till"
 
-#: src/summaryview.c:445
+#: src/summaryview.c:447
 msgid "/Create f_ilter rule/by _Subject"
 msgstr "/_Skapa filterregel/genom _Ämne"
 
-#: src/summaryview.c:451
+#: src/summaryview.c:453
 msgid "/_View/_Source"
 msgstr "/_Visa/_Källkod"
 
-#: src/summaryview.c:452
+#: src/summaryview.c:454
 msgid "/_View/All _header"
 msgstr "/_Visa/_Hela brevhuvudet"
 
-#: src/summaryview.c:454
+#: src/summaryview.c:456
 msgid "/_Print..."
 msgstr "/Skriv _ut"
 
-#: src/summaryview.c:486
+#: src/summaryview.c:488
 msgid "Creating summary view...\n"
 msgstr "Skapar summeringsvy...\n"
 
-#: src/summaryview.c:508
+#: src/summaryview.c:510
 msgid "All"
 msgstr ""
 
-#: src/summaryview.c:511
+#: src/summaryview.c:513
 #, fuzzy
 msgid "Have color label"
 msgstr "/F_ärgmarkera"
 
-#: src/summaryview.c:512
+#: src/summaryview.c:514
 #, fuzzy
 msgid "Have attachment"
 msgstr "Bilaga"
 
-#: src/summaryview.c:521
+#: src/summaryview.c:523
 #, fuzzy
 msgid "Search:"
 msgstr "Sök"
 
-#: src/summaryview.c:535
+#: src/summaryview.c:537
 msgid "Search for Subject or From"
 msgstr ""
 
-#: src/summaryview.c:702
+#: src/summaryview.c:704
 msgid "Process mark"
 msgstr "Behandla markering"
 
-#: src/summaryview.c:703
+#: src/summaryview.c:705
 msgid "Some marks are left. Process it?"
 msgstr "Några markeringar finns kvar. Behandla dem?"
 
-#: src/summaryview.c:749
+#: src/summaryview.c:751
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "Söker igenom mapp (%s)..."
 
-#: src/summaryview.c:1292
+#: src/summaryview.c:1295
 msgid "_Search again"
 msgstr "_Sök igen"
 
-#: src/summaryview.c:1313 src/summaryview.c:1322
+#: src/summaryview.c:1316 src/summaryview.c:1325
 msgid "No more unread messages"
 msgstr "Inga fler olästa meddelande"
 
-#: src/summaryview.c:1314
+#: src/summaryview.c:1317
 msgid "No unread message found. Search from the end?"
 msgstr "Inget oläst meddelande funnet. Sök från slutet?"
 
-#: src/summaryview.c:1316
+#: src/summaryview.c:1319
 msgid "No unread messages."
 msgstr "Inga olästa meddelanden."
 
-#: src/summaryview.c:1323
+#: src/summaryview.c:1326
 msgid "No unread message found. Go to next folder?"
 msgstr "Inget oläst meddelande funnet. Gå till nästa mapp?"
 
-#: src/summaryview.c:1331 src/summaryview.c:1340
+#: src/summaryview.c:1334 src/summaryview.c:1343
 msgid "No more new messages"
 msgstr "Inga fler nya meddelanden"
 
-#: src/summaryview.c:1332
+#: src/summaryview.c:1335
 msgid "No new message found. Search from the end?"
 msgstr "Inget nytt meddelande funnet. Sök från slutet?"
 
-#: src/summaryview.c:1334
+#: src/summaryview.c:1337
 msgid "No new messages."
 msgstr "Inga nya meddelanden."
 
-#: src/summaryview.c:1341
+#: src/summaryview.c:1344
 msgid "No new message found. Go to next folder?"
 msgstr "Inget nytt meddelande funnet. Gå till nästa mapp?"
 
-#: src/summaryview.c:1349 src/summaryview.c:1358
+#: src/summaryview.c:1352 src/summaryview.c:1361
 msgid "No more marked messages"
 msgstr "Inga fler markerade meddelanden"
 
-#: src/summaryview.c:1350
+#: src/summaryview.c:1353
 msgid "No marked message found. Search from the end?"
 msgstr "Inget markerat meddelande funnet. Sök från slutet?"
 
-#: src/summaryview.c:1352 src/summaryview.c:1361
+#: src/summaryview.c:1355 src/summaryview.c:1364
 msgid "No marked messages."
 msgstr "Inga markerade meddelanden."
 
-#: src/summaryview.c:1359
+#: src/summaryview.c:1362
 msgid "No marked message found. Search from the beginning?"
 msgstr "Inget markerat meddelande funnet. Sök från början?"
 
-#: src/summaryview.c:1367 src/summaryview.c:1376
+#: src/summaryview.c:1370 src/summaryview.c:1379
 msgid "No more labeled messages"
 msgstr "Inga fler färgade meddelanden"
 
-#: src/summaryview.c:1368
+#: src/summaryview.c:1371
 msgid "No labeled message found. Search from the end?"
 msgstr "Inget färgat meddelande funnet. Sök från slutet?"
 
-#: src/summaryview.c:1370 src/summaryview.c:1379
+#: src/summaryview.c:1373 src/summaryview.c:1382
 msgid "No labeled messages."
 msgstr "Inga färgade meddelanden."
 
-#: src/summaryview.c:1377
+#: src/summaryview.c:1380
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Inget färgat meddelande funnet. Sök från början?"
 
-#: src/summaryview.c:1693
+#: src/summaryview.c:1696
 msgid "Attracting messages by subject..."
 msgstr "Attraherar meddelanden efter ärende..."
 
-#: src/summaryview.c:1887
+#: src/summaryview.c:1890
 #, c-format
 msgid "%d deleted"
 msgstr "%d borttagen"
 
-#: src/summaryview.c:1891
+#: src/summaryview.c:1894
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d flyttad"
 
-#: src/summaryview.c:1892 src/summaryview.c:1897
+#: src/summaryview.c:1895 src/summaryview.c:1900
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:1896
+#: src/summaryview.c:1899
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d kopierad"
 
-#: src/summaryview.c:1911
+#: src/summaryview.c:1914
 msgid " item(s) selected"
 msgstr " objekt valda"
 
-#: src/summaryview.c:1933
+#: src/summaryview.c:1936
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d nya, %d olästa, %d totalt (%s)"
 
-#: src/summaryview.c:1937
+#: src/summaryview.c:1940
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d nya, %d olästa, %d totalt"
 
-#: src/summaryview.c:1971
+#: src/summaryview.c:1974
 msgid "Sorting summary..."
 msgstr "Sorterar summering..."
 
-#: src/summaryview.c:2194
+#: src/summaryview.c:2211
 msgid "\tSetting summary from message data..."
 msgstr "\tSkapar summering från meddelandedata..."
 
-#: src/summaryview.c:2196
+#: src/summaryview.c:2213
 msgid "Setting summary from message data..."
 msgstr "Skapar summering från meddelandedata..."
 
-#: src/summaryview.c:2302
+#: src/summaryview.c:2319
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Skriver summeringscache (%s)..."
 
-#: src/summaryview.c:2643
+#: src/summaryview.c:2660
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Meddelande %d är markerat\n"
 
-#: src/summaryview.c:2701
+#: src/summaryview.c:2718
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Meddelande %d är markerat som läst\n"
 
-#: src/summaryview.c:2789
+#: src/summaryview.c:2908
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Meddelande %d är markerat som oläst\n"
 
-#: src/summaryview.c:2850
+#: src/summaryview.c:2969
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Meddelande %s/%d är valt för borttagning\n"
 
-#: src/summaryview.c:2878
+#: src/summaryview.c:2997
 msgid "Delete message(s)"
 msgstr "Ta bort meddelande(n)"
 
-#: src/summaryview.c:2879
+#: src/summaryview.c:2998
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Vill du verkligen tömma papperkorgen?"
 
-#: src/summaryview.c:2953
+#: src/summaryview.c:3072
 msgid "Deleting duplicated messages..."
 msgstr "Tar bort meddelandedubbletter..."
 
-#: src/summaryview.c:2991
+#: src/summaryview.c:3110
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Meddelande %s/%d är avmarkerat\n"
 
-#: src/summaryview.c:3049
+#: src/summaryview.c:3168
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Meddelande %d är valt för att flyttas till %s\n"
 
-#: src/summaryview.c:3066
+#: src/summaryview.c:3196
 msgid "Destination is same as current folder."
 msgstr "Destinationen är samma som aktuell mapp."
 
-#: src/summaryview.c:3122
+#: src/summaryview.c:3260
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Meddelandet %d är valt för att kopieras till %s\n"
 
-#: src/summaryview.c:3139
+#: src/summaryview.c:3288
 msgid "Destination for copy is same as current folder."
 msgstr "Destinationen att kopiera till är samma som aktuell mapp."
 
-#: src/summaryview.c:3338
+#: src/summaryview.c:3495
 msgid "Error occurred while processing messages."
 msgstr "Fel uppstod när meddelanden behandlades."
 
-#: src/summaryview.c:3646 src/summaryview.c:3647
+#: src/summaryview.c:3803 src/summaryview.c:3804
 msgid "Building threads..."
 msgstr "Skapar trådar..."
 
-#: src/summaryview.c:3797 src/summaryview.c:3798
+#: src/summaryview.c:3954 src/summaryview.c:3955
 msgid "Unthreading..."
 msgstr "Avtrådar..."
 
-#: src/summaryview.c:4091 src/summaryview.c:4147
+#: src/summaryview.c:4248 src/summaryview.c:4304
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtrerar..."
 
-#: src/summaryview.c:4196
+#: src/summaryview.c:4353
 msgid "filtering..."
 msgstr "filtrerar..."
 
-#: src/summaryview.c:4197
+#: src/summaryview.c:4354
 msgid "Filtering..."
 msgstr "Filtrerar..."
 
-#: src/summaryview.c:4233
+#: src/summaryview.c:4390
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "%d meddelande(n) har filtrerats."
 
-#: src/summaryview.c:4742
+#: src/summaryview.c:4899
 msgid "No."
 msgstr "Nr."
 
@@ -6503,31 +6534,31 @@ msgstr "Skapar textvy...\n"
 msgid "This message can't be displayed.\n"
 msgstr "Detta meddelande kan inte visas.\n"
 
-#: src/textview.c:1929
+#: src/textview.c:1925
 msgid "Sa_ve this image as..."
 msgstr "S_para denna bild som..."
 
-#: src/textview.c:1945 src/trayicon.c:109
+#: src/textview.c:1941 src/trayicon.c:109
 msgid "Compose _new message"
 msgstr "Skriv _nytt meddelande"
 
-#: src/textview.c:1947
+#: src/textview.c:1943
 msgid "Add to address _book..."
 msgstr "Lägg till adress_boken"
 
-#: src/textview.c:1949
+#: src/textview.c:1945
 msgid "Copy this add_ress"
 msgstr "Kopiera denna ad_ress"
 
-#: src/textview.c:1952
+#: src/textview.c:1948
 msgid "_Open with Web browser"
 msgstr "_Öppna med Webbläsare"
 
-#: src/textview.c:1954
+#: src/textview.c:1950
 msgid "Copy this _link"
 msgstr "Kopiera denna _länk"
 
-#: src/textview.c:2097
+#: src/textview.c:2093
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6540,7 +6571,7 @@ msgstr ""
 "\n"
 "Öppna den ändå?"
 
-#: src/textview.c:2102
+#: src/textview.c:2098
 msgid "Fake URL warning"
 msgstr "Fejkad URL varning"
 
diff --git a/po/tr.po b/po/tr.po
index 7f257e6f..18da6bbd 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: 2006-01-27 18:11+0900\n"
+"POT-Creation-Date: 2006-01-31 15:20+0900\n"
 "PO-Revision-Date: 2004-12-03 11:44+0200\n"
 "Last-Translator: Arman Aksoy <armish@linux-sevenler.org>\n"
 "Language-Team:  <gnome-turk@gnome.org>\n"
@@ -507,7 +507,7 @@ msgstr "%s bulundu\n"
 msgid "Configuration is saved.\n"
 msgstr "Yapılandırma kaydedildi.\n"
 
-#: libsylph/prefs_common.c:489
+#: libsylph/prefs_common.c:491
 #, fuzzy
 msgid "Junk mail filter"
 msgstr "dizin:"
@@ -623,8 +623,8 @@ msgstr "%.2fMB"
 msgid "%.2fGB"
 msgstr "%.2fGB"
 
-#: libsylph/utils.c:2373 src/compose.c:2858 src/compose.c:3121
-#: src/compose.c:3184 src/compose.c:3304
+#: libsylph/utils.c:2373 src/compose.c:2867 src/compose.c:3130
+#: src/compose.c:3193 src/compose.c:3313
 msgid "can't change file mode\n"
 msgstr "dosya modu değiştirilemedi\n"
 
@@ -708,8 +708,8 @@ msgstr ""
 "kutucukları tıklanarak bu hesaplar için `Hepsini al' seçeneğini \n"
 "etkin duruma getirilebilir."
 
-#: src/account_dialog.c:366 src/addressadd.c:192 src/addressbook.c:491
-#: src/compose.c:4262 src/editaddress.c:200 src/editaddress.c:942
+#: src/account_dialog.c:366 src/addressadd.c:192 src/addressbook.c:493
+#: src/compose.c:4271 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:206 src/prefs_filter.c:259 src/prefs_folder_item.c:171
@@ -847,12 +847,12 @@ msgstr "Eylemin kullanıcı argümanı"
 msgid "Add Address to Book"
 msgstr "Adres Defterine Ekle"
 
-#: src/addressadd.c:202 src/compose.c:4762 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4771 src/editaddress.c:201
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "Adres"
 
-#: src/addressadd.c:212 src/addressbook.c:493 src/editaddress.c:202
+#: src/addressadd.c:212 src/addressbook.c:495 src/editaddress.c:202
 #: src/editaddress.c:795 src/editaddress.c:860 src/editgroup.c:267
 msgid "Remarks"
 msgstr "Notlar"
@@ -861,183 +861,183 @@ msgstr "Notlar"
 msgid "Select Address Book Folder"
 msgstr "Adres Defteri Dizinini Seç"
 
-#: src/addressbook.c:336 src/compose.c:515 src/mainwindow.c:477
+#: src/addressbook.c:338 src/compose.c:515 src/mainwindow.c:480
 #: src/messageview.c:138
 msgid "/_File"
 msgstr "/_Dosya"
 
-#: src/addressbook.c:337
+#: src/addressbook.c:339
 msgid "/_File/New _Book"
 msgstr "/_Dosya/Yeni _Defter"
 
-#: src/addressbook.c:338
+#: src/addressbook.c:340
 msgid "/_File/New _vCard"
 msgstr "/_Dosya/Yeni _vCard"
 
-#: src/addressbook.c:340
+#: src/addressbook.c:342
 msgid "/_File/New _JPilot"
 msgstr "/_Dosya/Yeni _JPilot"
 
-#: src/addressbook.c:343
+#: src/addressbook.c:345
 msgid "/_File/New _Server"
 msgstr "/_Dosya/Yeni _Sunucu"
 
-#: src/addressbook.c:345 src/addressbook.c:348 src/compose.c:520
-#: src/compose.c:525 src/compose.c:528 src/compose.c:531 src/mainwindow.c:495
-#: src/mainwindow.c:498 src/mainwindow.c:500 src/mainwindow.c:503
-#: src/mainwindow.c:505 src/messageview.c:141
+#: src/addressbook.c:347 src/addressbook.c:350 src/compose.c:520
+#: src/compose.c:525 src/compose.c:528 src/compose.c:531 src/mainwindow.c:498
+#: src/mainwindow.c:501 src/mainwindow.c:503 src/mainwindow.c:506
+#: src/mainwindow.c:508 src/messageview.c:141
 msgid "/_File/---"
 msgstr "/_Dosya/---"
 
-#: src/addressbook.c:346
+#: src/addressbook.c:348
 msgid "/_File/_Edit"
 msgstr "/_Dosya/_Düzenle"
 
-#: src/addressbook.c:347
+#: src/addressbook.c:349
 msgid "/_File/_Delete"
 msgstr "/_Dosya/_Sil"
 
-#: src/addressbook.c:349
+#: src/addressbook.c:351
 msgid "/_File/_Save"
 msgstr "/_Dosya/_Kaydet"
 
-#: src/addressbook.c:350 src/compose.c:532 src/messageview.c:142
+#: src/addressbook.c:352 src/compose.c:532 src/messageview.c:142
 msgid "/_File/_Close"
 msgstr "/_Dosya/K_apat"
 
-#: src/addressbook.c:351
+#: src/addressbook.c:353
 msgid "/_Address"
 msgstr "/_Adres"
 
-#: src/addressbook.c:352
+#: src/addressbook.c:354
 msgid "/_Address/New _Address"
 msgstr "/_Adres/Yeni _Adres"
 
-#: src/addressbook.c:353
+#: src/addressbook.c:355
 msgid "/_Address/New _Group"
 msgstr "/_Adres/Yeni _Grup"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:356
 msgid "/_Address/New _Folder"
 msgstr "/_Adres/Yeni _Dizin"
 
-#: src/addressbook.c:355
+#: src/addressbook.c:357
 msgid "/_Address/---"
 msgstr "/_Adres/---"
 
-#: src/addressbook.c:356
+#: src/addressbook.c:358
 msgid "/_Address/_Edit"
 msgstr "/_Adres/Dü_zenle"
 
-#: src/addressbook.c:357
+#: src/addressbook.c:359
 msgid "/_Address/_Delete"
 msgstr "/_Adres/_Sil"
 
-#: src/addressbook.c:358 src/compose.c:639 src/mainwindow.c:738
-#: src/messageview.c:259
+#: src/addressbook.c:360 src/compose.c:645 src/mainwindow.c:749
+#: src/messageview.c:264
 msgid "/_Tools"
 msgstr "/A_raçlar"
 
-#: src/addressbook.c:359
+#: src/addressbook.c:361
 msgid "/_Tools/Import _LDIF file"
 msgstr "/A_raçlar/_LDIF dosyasını ekle"
 
-#: src/addressbook.c:360 src/compose.c:658 src/mainwindow.c:788
-#: src/messageview.c:277
+#: src/addressbook.c:362 src/compose.c:664 src/mainwindow.c:799
+#: src/messageview.c:282
 msgid "/_Help"
 msgstr "/_Yardım"
 
-#: src/addressbook.c:361 src/compose.c:659 src/mainwindow.c:799
-#: src/messageview.c:278
+#: src/addressbook.c:363 src/compose.c:665 src/mainwindow.c:810
+#: src/messageview.c:283
 msgid "/_Help/_About"
 msgstr "/_Yardım/_Hakkında"
 
-#: src/addressbook.c:380 src/addressbook.c:390
+#: src/addressbook.c:382 src/addressbook.c:392
 msgid "/New _Address"
 msgstr "/Yeni _Adres"
 
-#: src/addressbook.c:381 src/addressbook.c:391
+#: src/addressbook.c:383 src/addressbook.c:393
 msgid "/New _Group"
 msgstr "/Yeni _Grup"
 
-#: src/addressbook.c:382 src/addressbook.c:392
+#: src/addressbook.c:384 src/addressbook.c:394
 msgid "/New _Folder"
 msgstr "/Yeni _Dizin"
 
-#: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:509
+#: src/addressbook.c:385 src/addressbook.c:395 src/compose.c:509
 #: src/folderview.c:246 src/folderview.c:248 src/folderview.c:253
 #: src/folderview.c:266 src/folderview.c:268 src/folderview.c:270
 #: src/folderview.c:275 src/folderview.c:289 src/folderview.c:291
 #: src/folderview.c:295 src/summaryview.c:414 src/summaryview.c:418
-#: src/summaryview.c:421 src/summaryview.c:431 src/summaryview.c:433
-#: src/summaryview.c:435 src/summaryview.c:447 src/summaryview.c:453
+#: src/summaryview.c:421 src/summaryview.c:433 src/summaryview.c:435
+#: src/summaryview.c:437 src/summaryview.c:449 src/summaryview.c:455
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:534
-#: src/mainwindow.c:509 src/messageview.c:144
+#: src/addressbook.c:386 src/addressbook.c:396 src/compose.c:534
+#: src/mainwindow.c:512 src/messageview.c:144
 msgid "/_Edit"
 msgstr "/Dü_zenle"
 
-#: src/addressbook.c:385 src/addressbook.c:395 src/summaryview.c:432
+#: src/addressbook.c:387 src/addressbook.c:397 src/summaryview.c:434
 msgid "/_Delete"
 msgstr "/_Sil"
 
-#: src/addressbook.c:492
+#: src/addressbook.c:494
 msgid "E-Mail address"
 msgstr "İleti adresi"
 
-#: src/addressbook.c:496 src/compose.c:4763 src/prefs_common_dialog.c:2183
+#: src/addressbook.c:498 src/compose.c:4772 src/prefs_common_dialog.c:2183
 msgid "Address book"
 msgstr "Adres defteri"
 
-#: src/addressbook.c:596 src/prefs_filter_edit.c:249
+#: src/addressbook.c:600 src/prefs_filter_edit.c:249
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "İsim:"
 
 #. Buttons
-#: src/addressbook.c:628 src/addressbook.c:1680 src/editaddress.c:884
-#: src/editaddress.c:1017 src/mainwindow.c:2391 src/prefs_actions.c:266
+#: src/addressbook.c:632 src/addressbook.c:1684 src/editaddress.c:884
+#: src/editaddress.c:1017 src/mainwindow.c:2402 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
 #: src/prefs_template.c:233
 msgid "Delete"
 msgstr "Sil"
 
-#: src/addressbook.c:631 src/editaddress.c:890 src/editaddress.c:1023
+#: src/addressbook.c:635 src/editaddress.c:890 src/editaddress.c:1023
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:273 src/prefs_display_header.c:328
 #: src/prefs_filter_edit.c:1550
 msgid "Add"
 msgstr "Ekle"
 
-#: src/addressbook.c:634
+#: src/addressbook.c:638
 msgid "Lookup"
 msgstr "Ara"
 
-#: src/addressbook.c:646 src/headerview.c:55 src/prefs_folder_item.c:339
+#: src/addressbook.c:650 src/headerview.c:55 src/prefs_folder_item.c:339
 #: src/prefs_template.c:176
 msgid "To:"
 msgstr "Kime:"
 
-#: src/addressbook.c:650 src/prefs_folder_item.c:356 src/prefs_template.c:178
+#: src/addressbook.c:654 src/prefs_folder_item.c:356 src/prefs_template.c:178
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:654 src/prefs_folder_item.c:367
+#: src/addressbook.c:658 src/prefs_folder_item.c:367
 msgid "Bcc:"
 msgstr "Bcc:"
 
 #. Confirm deletion
-#: src/addressbook.c:841
+#: src/addressbook.c:845
 msgid "Delete address(es)"
 msgstr "Adres(ler)i sil"
 
-#: src/addressbook.c:842
+#: src/addressbook.c:846
 msgid "Really delete the address(es)?"
 msgstr "Adres(ler) silinsin mi?"
 
-#: src/addressbook.c:1671
+#: src/addressbook.c:1675
 #, fuzzy, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1047,38 +1047,38 @@ msgstr ""
 "misiniz?\n"
 "Eğer sadece dizini silerseniz, içindeki adresler ana dizine taşınacaktır."
 
-#: src/addressbook.c:1674 src/folderview.c:2351
+#: src/addressbook.c:1678 src/folderview.c:2351
 msgid "Delete folder"
 msgstr "Dizini sil"
 
-#: src/addressbook.c:1674
+#: src/addressbook.c:1678
 #, fuzzy
 msgid "_Folder only"
 msgstr "Sadece dizin"
 
-#: src/addressbook.c:1674
+#: src/addressbook.c:1678
 #, fuzzy
 msgid "Folder and _addresses"
 msgstr "Dizin ve Adresler"
 
-#: src/addressbook.c:1679
+#: src/addressbook.c:1683
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "`%s' silinsin mi?"
 
-#: src/addressbook.c:2365 src/addressbook.c:2498
+#: src/addressbook.c:2369 src/addressbook.c:2502
 msgid "New user, could not save index file."
 msgstr "Yeni kullanıcı, indeks dosyası kaydedilemedi."
 
-#: src/addressbook.c:2369 src/addressbook.c:2502
+#: src/addressbook.c:2373 src/addressbook.c:2506
 msgid "New user, could not save address book files."
 msgstr "Yeni kullanıcı, adres defteri dosyaları kaydedilemedi."
 
-#: src/addressbook.c:2379 src/addressbook.c:2512
+#: src/addressbook.c:2383 src/addressbook.c:2516
 msgid "Old address book converted successfully."
 msgstr "Eski adres defteri başarıyla çevrildi."
 
-#: src/addressbook.c:2384
+#: src/addressbook.c:2388
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1086,7 +1086,7 @@ msgstr ""
 "Eski adres defteri çevrildi,\n"
 "yeni adres indeks dosyası kaydedilemedi"
 
-#: src/addressbook.c:2397
+#: src/addressbook.c:2401
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1094,7 +1094,7 @@ msgstr ""
 "Adres defteri çevrilemedi,\n"
 "ancak boş bir adres defteri dosyası oluşturuldu."
 
-#: src/addressbook.c:2403
+#: src/addressbook.c:2407
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1102,7 +1102,7 @@ msgstr ""
 "Adres defteri ve yeni adres defteri \n"
 "dosyası oluşturulamadı."
 
-#: src/addressbook.c:2408
+#: src/addressbook.c:2412
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1110,89 +1110,89 @@ msgstr ""
 "Adres defteri ve yeni adres defteri \n"
 "dosyası oluşturulamadı."
 
-#: src/addressbook.c:2415
+#: src/addressbook.c:2419
 msgid "Addressbook conversion error"
 msgstr "Adres defteri çevrim hatası"
 
-#: src/addressbook.c:2419
+#: src/addressbook.c:2423
 msgid "Addressbook conversion"
 msgstr "Adres defteri çevrimi"
 
-#: src/addressbook.c:2454
+#: src/addressbook.c:2458
 msgid "Addressbook Error"
 msgstr "Adres Defteri Hatası"
 
-#: src/addressbook.c:2455 src/addressbook.c:2555
+#: src/addressbook.c:2459 src/addressbook.c:2559
 msgid "Could not read address index"
 msgstr "Adres indeksi okunamadı"
 
-#: src/addressbook.c:2517
+#: src/addressbook.c:2521
 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:2531
+#: src/addressbook.c:2535
 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:2537
+#: src/addressbook.c:2541
 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:2543
+#: src/addressbook.c:2547
 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:2561
+#: src/addressbook.c:2565
 msgid "Addressbook Conversion Error"
 msgstr "Adres Defteri Çevrim Hatası"
 
-#: src/addressbook.c:2567
+#: src/addressbook.c:2571
 msgid "Addressbook Conversion"
 msgstr "Adres Defteri Çevrimi"
 
-#: src/addressbook.c:3072 src/prefs_common_dialog.c:2033
+#: src/addressbook.c:3086 src/prefs_common_dialog.c:2033
 msgid "Interface"
 msgstr "Arayüz"
 
-#: src/addressbook.c:3088 src/importldif.c:514
+#: src/addressbook.c:3102 src/importldif.c:514
 msgid "Address Book"
 msgstr "Adres Defteri"
 
-#: src/addressbook.c:3104
+#: src/addressbook.c:3118
 msgid "Person"
 msgstr "Kişi"
 
-#: src/addressbook.c:3120
+#: src/addressbook.c:3134
 msgid "EMail Address"
 msgstr "İleti Adresi"
 
-#: src/addressbook.c:3136
+#: src/addressbook.c:3150
 msgid "Group"
 msgstr "Grup"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3152 src/folderview.c:367 src/prefs_account_dialog.c:1694
+#: src/addressbook.c:3166 src/folderview.c:367 src/prefs_account_dialog.c:1694
 #: src/query_search.c:370
 msgid "Folder"
 msgstr "Dizin"
 
-#: src/addressbook.c:3168
+#: src/addressbook.c:3182
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3184 src/addressbook.c:3200
+#: src/addressbook.c:3198 src/addressbook.c:3214
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3216
+#: src/addressbook.c:3230
 msgid "LDAP Server"
 msgstr "LDAP Sunucu"
 
@@ -1204,7 +1204,7 @@ msgstr "Ortak adres"
 msgid "Personal address"
 msgstr "Kişisel adres"
 
-#: src/alertpanel.c:141 src/compose.c:5485 src/main.c:573
+#: src/alertpanel.c:141 src/compose.c:5494 src/main.c:573
 msgid "Notice"
 msgstr "Not"
 
@@ -1255,7 +1255,7 @@ msgstr "Kahverengi"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4593
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4750
 msgid "None"
 msgstr "Hiçbiri"
 
@@ -1313,7 +1313,7 @@ msgstr "/Dü_zenle/_Geri al"
 msgid "/_Edit/_Redo"
 msgstr "/Dü_zenle/_Yenile"
 
-#: src/compose.c:537 src/compose.c:544 src/mainwindow.c:513
+#: src/compose.c:537 src/compose.c:544 src/mainwindow.c:516
 #: src/messageview.c:147
 msgid "/_Edit/---"
 msgstr "/Dü_zenle/---"
@@ -1322,7 +1322,7 @@ msgstr "/Dü_zenle/---"
 msgid "/_Edit/Cu_t"
 msgstr "/Dü_zenle/_Kes"
 
-#: src/compose.c:539 src/mainwindow.c:510 src/messageview.c:145
+#: src/compose.c:539 src/mainwindow.c:513 src/messageview.c:145
 msgid "/_Edit/_Copy"
 msgstr "/Dü_zenle/K_opyala"
 
@@ -1334,7 +1334,7 @@ msgstr "/Dü_zenle/_Yapıştır"
 msgid "/_Edit/Paste as _quotation"
 msgstr "/Dü_zenle/_Alıntı Yaparak Yapıştır"
 
-#: src/compose.c:543 src/mainwindow.c:511 src/messageview.c:146
+#: src/compose.c:543 src/mainwindow.c:514 src/messageview.c:146
 msgid "/_Edit/Select _all"
 msgstr "/Dü_zenle/_Tümünü seç"
 
@@ -1350,8 +1350,8 @@ msgstr "/Dü_zenle/Tüm _uzun satırları kaydır"
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/Dü_zenle/Otomatik ka_ydır"
 
-#: src/compose.c:550 src/mainwindow.c:518 src/messageview.c:151
-#: src/summaryview.c:448
+#: src/compose.c:550 src/mainwindow.c:521 src/messageview.c:151
+#: src/summaryview.c:450
 msgid "/_View"
 msgstr "/_Görünüm"
 
@@ -1372,9 +1372,9 @@ msgid "/_View/_Reply to"
 msgstr "/_Görünüm/_Yanıtla/"
 
 #: src/compose.c:555 src/compose.c:557 src/compose.c:559 src/compose.c:561
-#: src/mainwindow.c:538 src/mainwindow.c:541 src/mainwindow.c:568
-#: src/mainwindow.c:592 src/mainwindow.c:687 src/mainwindow.c:691
-#: src/messageview.c:236
+#: src/mainwindow.c:541 src/mainwindow.c:544 src/mainwindow.c:571
+#: src/mainwindow.c:595 src/mainwindow.c:696 src/mainwindow.c:700
+#: src/messageview.c:241
 msgid "/_View/---"
 msgstr "/_Görünüm/---"
 
@@ -1390,7 +1390,7 @@ msgstr "/_Görünüm/_Cetvel"
 msgid "/_View/_Attachment"
 msgstr "/_Görünüm/_Ek"
 
-#: src/compose.c:567 src/mainwindow.c:599 src/messageview.c:158
+#: src/compose.c:567 src/mainwindow.c:602 src/messageview.c:158
 #, fuzzy
 msgid "/_View/Character _encoding"
 msgstr "/_Görünüm/_Sırala/Azalan sırala"
@@ -1400,238 +1400,249 @@ msgid "/_View/Character _encoding/_Automatic"
 msgstr ""
 
 #: src/compose.c:570 src/compose.c:576 src/compose.c:582 src/compose.c:586
-#: src/compose.c:592 src/compose.c:596 src/compose.c:602 src/compose.c:606
-#: src/compose.c:616 src/compose.c:620 src/compose.c:628 src/compose.c:632
-#: src/mainwindow.c:595 src/mainwindow.c:602 src/messageview.c:154
+#: src/compose.c:592 src/compose.c:596 src/compose.c:602 src/compose.c:608
+#: src/compose.c:612 src/compose.c:622 src/compose.c:626 src/compose.c:634
+#: src/compose.c:638 src/mainwindow.c:598 src/mainwindow.c:605
+#: src/messageview.c:154
 #, fuzzy
 msgid "/_View/Character _encoding/---"
 msgstr "/_Görünüm/_Sırala/Azalan sırala"
 
-#: src/compose.c:572 src/mainwindow.c:603 src/messageview.c:162
+#: src/compose.c:572 src/mainwindow.c:606 src/messageview.c:162
 #, 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:574 src/mainwindow.c:605 src/messageview.c:165
+#: src/compose.c:574 src/mainwindow.c:608 src/messageview.c:165
 #, fuzzy
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Görünüm/_Kodlama/Unicode (_UTF-8)"
 
-#: src/compose.c:578 src/mainwindow.c:609 src/messageview.c:168
+#: src/compose.c:578 src/mainwindow.c:612 src/messageview.c:168
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Görünüm/_Kodlama/Batı Avrupa (ISO-8859-_1)"
 
-#: src/compose.c:580 src/mainwindow.c:611 src/messageview.c:170
+#: src/compose.c:580 src/mainwindow.c:614 src/messageview.c:170
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Görünüm/_Kodlama/Batı Avrupa (ISO-8859-_15)"
 
-#: src/compose.c:584 src/mainwindow.c:617 src/messageview.c:175
+#: src/compose.c:584 src/mainwindow.c:620 src/messageview.c:175
 #, fuzzy
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Görünüm/_Kodlama/Orta Avrupa (ISO-8859-_2)"
 
-#: src/compose.c:588 src/mainwindow.c:621 src/messageview.c:178
+#: src/compose.c:588 src/mainwindow.c:624 src/messageview.c:178
 #, fuzzy
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Görünüm/_Kodlama/_Baltık (ISO-8859-13)"
 
-#: src/compose.c:590 src/mainwindow.c:623 src/messageview.c:180
+#: src/compose.c:590 src/mainwindow.c:626 src/messageview.c:180
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Görünüm/_Kodlama/Baltık (ISO-8859-_4)"
 
-#: src/compose.c:594 src/mainwindow.c:627 src/messageview.c:183
+#: src/compose.c:594 src/mainwindow.c:630 src/messageview.c:183
 #, fuzzy
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Görünüm/_Kodlama/Yunanca (ISO-8859-_7)"
 
-#: src/compose.c:598 src/mainwindow.c:631 src/messageview.c:186
+#: src/compose.c:598 src/mainwindow.c:634 src/messageview.c:186
+#, fuzzy
+msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
+msgstr "/_Görünüm/_Kodlama/Baltık (ISO-8859-_4)"
+
+#: src/compose.c:600 src/mainwindow.c:636 src/messageview.c:188
+#, fuzzy
+msgid "/_View/Character _encoding/Arabic (Windows-1256)"
+msgstr "/_Görünüm/_Kodlama/Kiril (Windows-1251)"
+
+#: src/compose.c:604 src/mainwindow.c:640 src/messageview.c:191
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Görünüm/_Kodlama/Yunanca (ISO-8859-_7)"
 
-#: src/compose.c:600 src/mainwindow.c:633 src/messageview.c:188
+#: src/compose.c:606 src/mainwindow.c:642 src/messageview.c:193
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Görünüm/_Kodlama/Kiril (Windows-1251)"
 
-#: src/compose.c:604 src/mainwindow.c:637 src/messageview.c:191
+#: src/compose.c:610 src/mainwindow.c:646 src/messageview.c:196
 #, fuzzy
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Görünüm/_Kodlama/Türkçe (ISO-8859-_9)"
 
-#: src/compose.c:608 src/mainwindow.c:641 src/messageview.c:194
+#: src/compose.c:614 src/mainwindow.c:650 src/messageview.c:199
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Görünüm/_Kodlama/Kiril (ISO-8859-_5)"
 
-#: src/compose.c:610 src/mainwindow.c:643 src/messageview.c:196
+#: src/compose.c:616 src/mainwindow.c:652 src/messageview.c:201
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Görünüm/_Kodlama/Kiril (ISO-8859-_5)"
 
-#: src/compose.c:612 src/mainwindow.c:645 src/messageview.c:198
+#: src/compose.c:618 src/mainwindow.c:654 src/messageview.c:203
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Görünüm/_Kodlama/Kiril (KOI8-U)"
 
-#: src/compose.c:614 src/mainwindow.c:647 src/messageview.c:200
+#: src/compose.c:620 src/mainwindow.c:656 src/messageview.c:205
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Görünüm/_Kodlama/Kiril (Windows-1251)"
 
-#: src/compose.c:618 src/mainwindow.c:651 src/messageview.c:203
+#: src/compose.c:624 src/mainwindow.c:660 src/messageview.c:208
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Görünüm/_Kodlama/Japonca (ISO-2022-_JP)"
 
-#: src/compose.c:622 src/mainwindow.c:661 src/messageview.c:212
+#: src/compose.c:628 src/mainwindow.c:670 src/messageview.c:217
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Görünüm/_Kodlama/Basit Çince (_GB2312)"
 
-#: src/compose.c:624 src/mainwindow.c:663 src/messageview.c:214
+#: src/compose.c:630 src/mainwindow.c:672 src/messageview.c:219
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Görünüm/_Kodlama/Basit Çince (_GB2312)"
 
-#: src/compose.c:626 src/mainwindow.c:665 src/messageview.c:216
+#: src/compose.c:632 src/mainwindow.c:674 src/messageview.c:221
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Görünüm/_Kodlama/Geleneksel Çince (_Big5)"
 
-#: src/compose.c:630 src/mainwindow.c:673 src/messageview.c:223
+#: src/compose.c:636 src/mainwindow.c:682 src/messageview.c:228
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Görünüm/_Kodlama/Korece (EUC-_KR)"
 
-#: src/compose.c:634 src/mainwindow.c:679 src/messageview.c:228
+#: src/compose.c:640 src/mainwindow.c:688 src/messageview.c:233
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Görünüm/_Kodlama/Tayca (TIS-620)"
 
-#: src/compose.c:636 src/mainwindow.c:681 src/messageview.c:230
+#: src/compose.c:642 src/mainwindow.c:690 src/messageview.c:235
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Görünüm/_Kodlama/Tayca (Windows-874)"
 
-#: src/compose.c:640 src/mainwindow.c:739 src/messageview.c:260
+#: src/compose.c:646 src/mainwindow.c:750 src/messageview.c:265
 msgid "/_Tools/_Address book"
 msgstr "/A_raçlar/_Adres defteri"
 
-#: src/compose.c:641
+#: src/compose.c:647
 msgid "/_Tools/_Template"
 msgstr "/A_raçlar/Ş_ablon"
 
-#: src/compose.c:642 src/mainwindow.c:762 src/messageview.c:275
+#: src/compose.c:648 src/mainwindow.c:773 src/messageview.c:280
 msgid "/_Tools/Actio_ns"
 msgstr "/A_raçlar/E_ylemler"
 
-#: src/compose.c:643 src/compose.c:647 src/compose.c:653 src/mainwindow.c:742
-#: src/mainwindow.c:756 src/mainwindow.c:761 src/mainwindow.c:763
-#: src/mainwindow.c:766 src/mainwindow.c:768 src/messageview.c:263
-#: src/messageview.c:274
+#: src/compose.c:649 src/compose.c:653 src/compose.c:659 src/mainwindow.c:753
+#: src/mainwindow.c:767 src/mainwindow.c:772 src/mainwindow.c:774
+#: src/mainwindow.c:777 src/mainwindow.c:779 src/messageview.c:268
+#: src/messageview.c:279
 msgid "/_Tools/---"
 msgstr "/A_raçlar/---"
 
-#: src/compose.c:644
+#: src/compose.c:650
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/A_raçlar/Harici _düzenleyicide aç"
 
-#: src/compose.c:648
+#: src/compose.c:654
 msgid "/_Tools/PGP Si_gn"
 msgstr "/A_raçlar/PGP İ_mza"
 
-#: src/compose.c:649
+#: src/compose.c:655
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/A_raçlar/PGP ile Ş_ifrele"
 
-#: src/compose.c:654
+#: src/compose.c:660
 #, fuzzy
 msgid "/_Tools/_Check spell"
 msgstr "/A_raçlar/Ç_alıştır"
 
-#: src/compose.c:655
+#: src/compose.c:661
 #, fuzzy
 msgid "/_Tools/_Set spell language"
 msgstr "/A_raçlar/Ş_ablon"
 
-#: src/compose.c:899
+#: src/compose.c:908
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: dosya bulunamadı\n"
 
-#: src/compose.c:1003 src/compose.c:1074
+#: src/compose.c:1012 src/compose.c:1083
 msgid "Can't get text part\n"
 msgstr "Metin bölümü alınamadı\n"
 
-#: src/compose.c:1475
+#: src/compose.c:1484
 msgid "Quote mark format error."
 msgstr "Alıntı formatı hatası."
 
-#: src/compose.c:1487
+#: src/compose.c:1496
 msgid "Message reply/forward format error."
 msgstr "Posta cevapla/ilet formatı hatası"
 
-#: src/compose.c:1907
+#: src/compose.c:1916
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "%s dosyası bulunamadı\n"
 
-#: src/compose.c:1911
+#: src/compose.c:1920
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "%s dosyasının boyu bulunamadı\n"
 
-#: src/compose.c:1915
+#: src/compose.c:1924
 #, c-format
 msgid "File %s is empty."
 msgstr "%s dosyası boş."
 
-#: src/compose.c:1919
+#: src/compose.c:1928
 #, c-format
 msgid "Can't read %s."
 msgstr "%s okunamadı."
 
-#: src/compose.c:1952
+#: src/compose.c:1961
 #, c-format
 msgid "Message: %s"
 msgstr "İleti: %s"
 
-#: src/compose.c:2012 src/mimeview.c:565
+#: src/compose.c:2021 src/mimeview.c:565
 msgid "Can't get the part of multipart message."
 msgstr "Çok parçalı mesajın bir kısmı alınamadı"
 
-#: src/compose.c:2496 src/headerview.c:195 src/query_search.c:636
-#: src/summaryview.c:2107
+#: src/compose.c:2505 src/headerview.c:195 src/query_search.c:636
+#: src/summaryview.c:2124
 msgid "(No Subject)"
 msgstr "(Konu yok)"
 
-#: src/compose.c:2499
+#: src/compose.c:2508
 #, fuzzy, c-format
 msgid "%s - Compose%s"
 msgstr "%s - İleti düzenle (%s)"
 
-#: src/compose.c:2612
+#: src/compose.c:2621
 msgid "Recipient is not specified."
 msgstr "Alıcı belirtilmedi."
 
-#: src/compose.c:2620
+#: src/compose.c:2629
 #, fuzzy
 msgid "Empty subject"
 msgstr "Konu"
 
-#: src/compose.c:2621
+#: src/compose.c:2630
 msgid "Subject is empty. Send it anyway?"
 msgstr "Konuyu boş bıraktınız. Yine de göndermek istiyor musunuz?"
 
-#: src/compose.c:2680
+#: src/compose.c:2689
 msgid "can't get recipient list."
 msgstr "alıcı listesi alınamadı."
 
-#: src/compose.c:2700
+#: src/compose.c:2709
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1639,21 +1650,21 @@ msgstr ""
 "İletinin gönderileceği hesap belirtilmedi.\n"
 "Lütfen göndermeden önce bir e-posta hesabı girin."
 
-#: src/compose.c:2714 src/send_message.c:299
+#: src/compose.c:2723 src/send_message.c:299
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "İleti, %s adresine gönderilirken bir hata oluştu."
 
-#: src/compose.c:2756
+#: src/compose.c:2765
 msgid "Can't save the message to outbox."
 msgstr "İleti, giden kutusuna kaydedilemiyor."
 
-#: src/compose.c:2794
+#: src/compose.c:2803
 #, 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:2891
+#: src/compose.c:2900
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1664,12 +1675,12 @@ msgstr ""
 "%s / %s\n"
 "Yine de gönderilsin mi?"
 
-#: src/compose.c:2897
+#: src/compose.c:2906
 #, fuzzy
 msgid "Code conversion error"
 msgstr "Adres defteri çevrim hatası"
 
-#: src/compose.c:2970
+#: src/compose.c:2979
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1678,159 +1689,159 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:2974
+#: src/compose.c:2983
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3264
+#: src/compose.c:3273
 msgid "can't remove the old message\n"
 msgstr "eski ileti silinemedi\n"
 
-#: src/compose.c:3282
+#: src/compose.c:3291
 msgid "queueing message...\n"
 msgstr "ileti kuyruğa gönderiliyor...\n"
 
-#: src/compose.c:3364
+#: src/compose.c:3373
 msgid "can't find queue folder\n"
 msgstr "kuyruk dizini bulunamadı\n"
 
-#: src/compose.c:3371
+#: src/compose.c:3380
 msgid "can't queue the message\n"
 msgstr "ileti kuyruğa gönderilemedi\n"
 
-#: src/compose.c:3964
+#: src/compose.c:3973
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "İleti numarası oluşturuldu: %s\n"
 
-#: src/compose.c:4077
+#: src/compose.c:4086
 msgid "Creating compose window...\n"
 msgstr "Düzenleme penceresi oluşturuluyor...\n"
 
-#: src/compose.c:4128 src/headerview.c:54
+#: src/compose.c:4137 src/headerview.c:54
 msgid "From:"
 msgstr "Kimden:"
 
-#: src/compose.c:4202
+#: src/compose.c:4211
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/A_raçlar/PGP İ_mza"
 
-#: src/compose.c:4205
+#: src/compose.c:4214
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/A_raçlar/PGP ile Ş_ifrele"
 
-#: src/compose.c:4243 src/compose.c:5317
+#: src/compose.c:4252 src/compose.c:5326
 msgid "MIME type"
 msgstr "MIME türü"
 
 #. S_COL_DATE
-#: src/compose.c:4252 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4740
+#: src/compose.c:4261 src/mimeview.c:197 src/prefs_filter_edit.c:496
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4897
 msgid "Size"
 msgstr "Boyut"
 
-#: src/compose.c:4683 src/mainwindow.c:2324 src/prefs_account_dialog.c:528
+#: src/compose.c:4692 src/mainwindow.c:2335 src/prefs_account_dialog.c:528
 #: src/prefs_common_dialog.c:661
 msgid "Send"
 msgstr "Gönder"
 
-#: src/compose.c:4684
+#: src/compose.c:4693
 msgid "Send message"
 msgstr "İletiyi gönder"
 
-#: src/compose.c:4692
+#: src/compose.c:4701
 msgid "Send later"
 msgstr "Sonra gönder"
 
-#: src/compose.c:4693
+#: src/compose.c:4702
 msgid "Put into queue folder and send later"
 msgstr "İletiyi kuyruğa aktar ve sonra gönder"
 
-#: src/compose.c:4701
+#: src/compose.c:4710
 msgid "Draft"
 msgstr "Taslak"
 
-#: src/compose.c:4702
+#: src/compose.c:4711
 msgid "Save to draft folder"
 msgstr "Taslak dizinine kaydet"
 
-#: src/compose.c:4712
+#: src/compose.c:4721
 msgid "Insert"
 msgstr "İçer"
 
-#: src/compose.c:4713
+#: src/compose.c:4722
 msgid "Insert file"
 msgstr "Dosya içer"
 
-#: src/compose.c:4721
+#: src/compose.c:4730
 msgid "Attach"
 msgstr "Ekle"
 
-#: src/compose.c:4722
+#: src/compose.c:4731
 msgid "Attach file"
 msgstr "Dosya ekle"
 
 #. signature
-#: src/compose.c:4732 src/prefs_account_dialog.c:1208
+#: src/compose.c:4741 src/prefs_account_dialog.c:1208
 #: src/prefs_common_dialog.c:953
 msgid "Signature"
 msgstr "İmza"
 
-#: src/compose.c:4733
+#: src/compose.c:4742
 #, fuzzy
 msgid "Append signature"
 msgstr "KÖTÜ imza"
 
 #. editor
-#: src/compose.c:4742 src/prefs_common_dialog.c:991
+#: src/compose.c:4751 src/prefs_common_dialog.c:991
 #: src/prefs_common_dialog.c:2315
 msgid "Editor"
 msgstr "Düzenleyici"
 
-#: src/compose.c:4743
+#: src/compose.c:4752
 msgid "Edit with external editor"
 msgstr "Harici bir düzenleyici kullan"
 
-#: src/compose.c:4751
+#: src/compose.c:4760
 msgid "Linewrap"
 msgstr "Satır kaydır"
 
-#: src/compose.c:4752
+#: src/compose.c:4761
 msgid "Wrap all long lines"
 msgstr "Tüm uzun satırları kaydır"
 
-#: src/compose.c:5213
+#: src/compose.c:5222
 msgid "Invalid MIME type."
 msgstr "Geçersiz MIME türü."
 
-#: src/compose.c:5231
+#: src/compose.c:5240
 msgid "File doesn't exist or is empty."
 msgstr "Dosya yok, ya da boş."
 
-#: src/compose.c:5299
+#: src/compose.c:5308
 msgid "Properties"
 msgstr "Özellikler"
 
-#: src/compose.c:5319 src/prefs_common_dialog.c:1444
+#: src/compose.c:5328 src/prefs_common_dialog.c:1444
 msgid "Encoding"
 msgstr "Kodlama"
 
-#: src/compose.c:5342 src/prefs_folder_item.c:202
+#: src/compose.c:5351 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Yol"
 
-#: src/compose.c:5343
+#: src/compose.c:5352
 msgid "File name"
 msgstr "Dosya adı"
 
-#: src/compose.c:5436
+#: src/compose.c:5445
 #, 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:5482
+#: src/compose.c:5491
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1840,48 +1851,48 @@ msgstr ""
 "Bu süreci sonlandırayım mı?\n"
 "Programın grup numarası (GID): %d"
 
-#: src/compose.c:5857 src/compose.c:5862 src/compose.c:5868
+#: src/compose.c:5866 src/compose.c:5871 src/compose.c:5877
 msgid "Can't queue the message."
 msgstr "İleti kuyruğa gönderilemedi."
 
-#: src/compose.c:5959
+#: src/compose.c:5968
 #, fuzzy
 msgid "Select files"
 msgstr "Dosya seç"
 
-#: src/compose.c:5982
+#: src/compose.c:5991
 msgid "Select file"
 msgstr "Dosya seç"
 
-#: src/compose.c:6017
+#: src/compose.c:6026
 #, fuzzy
 msgid "Save message"
 msgstr "İletiyi gönder"
 
-#: src/compose.c:6018
+#: src/compose.c:6027
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Bu ileti değiştirildi. Silinsin mi?"
 
-#: src/compose.c:6020
+#: src/compose.c:6029
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:6062
+#: src/compose.c:6071
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "%s şablonunu uygulamak istiyor musunuz?"
 
-#: src/compose.c:6064
+#: src/compose.c:6073
 msgid "Apply template"
 msgstr "Şablonu uygula"
 
-#: src/compose.c:6065
+#: src/compose.c:6074
 #, fuzzy
 msgid "_Replace"
 msgstr "Değiştir"
 
-#: src/compose.c:6065
+#: src/compose.c:6074
 #, fuzzy
 msgid "_Insert"
 msgstr "İçer"
@@ -2321,7 +2332,7 @@ msgstr "Yeni"
 
 #. S_COL_MARK
 #: src/folderview.c:412 src/prefs_filter_edit.c:500
-#: src/prefs_summary_column.c:71 src/summaryview.c:509
+#: src/prefs_summary_column.c:71 src/summaryview.c:511
 msgid "Unread"
 msgstr "Okunmamış"
 
@@ -2337,12 +2348,12 @@ msgstr "Dizin bilgisi ayarlanıyor...\n"
 msgid "Setting folder info..."
 msgstr "Dizin bilgisi ayarlanıyor..."
 
-#: src/folderview.c:858 src/mainwindow.c:3464 src/setup.c:80
+#: src/folderview.c:858 src/mainwindow.c:3481 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "%s%c%s dizini taranıyor..."
 
-#: src/folderview.c:862 src/mainwindow.c:3469 src/setup.c:85
+#: src/folderview.c:862 src/mainwindow.c:3486 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "%s dizini taranıyor..."
@@ -2367,7 +2378,7 @@ msgstr "Dizin ağacı yeniden oluşturulamadı."
 msgid "Checking for new messages in all folders..."
 msgstr "Dizinlerde yeni mesajlar kontrol ediliyor..."
 
-#: src/folderview.c:1200 src/mainwindow.c:2400 src/prefs_common_dialog.c:1789
+#: src/folderview.c:1200 src/mainwindow.c:2411 src/prefs_common_dialog.c:1789
 msgid "Junk"
 msgstr ""
 
@@ -2506,7 +2517,7 @@ msgstr "Konu:"
 msgid "Creating header view...\n"
 msgstr "Başlık görünümü oluşturuluyor...\n"
 
-#: src/headerview.c:180 src/query_search.c:637 src/summaryview.c:2110
+#: src/headerview.c:180 src/query_search.c:637 src/summaryview.c:2127
 msgid "(No From)"
 msgstr "(Kimden satırı yok)"
 
@@ -2615,7 +2626,7 @@ msgstr "LDIF dosyasını Adres Defterine aktar"
 msgid "Prev"
 msgstr "Önceki"
 
-#: src/importldif.c:768 src/mainwindow.c:2420
+#: src/importldif.c:768 src/mainwindow.c:2431
 msgid "Next"
 msgstr "Sonraki"
 
@@ -2958,660 +2969,665 @@ msgstr ""
 msgid "another Sylpheed is already running.\n"
 msgstr "Başka bir Sylpheed sistemde çalışıyor.\n"
 
-#: src/main.c:1064
+#: src/main.c:1083
 #, fuzzy
 msgid "Migration of configuration"
 msgstr "Eylem ayarları"
 
-#: src/main.c:1065
+#: src/main.c:1084
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
 msgstr ""
 
-#: src/mainwindow.c:478
+#: src/mainwindow.c:481
 msgid "/_File/_Folder"
 msgstr "/_Dosya/D_izin"
 
-#: src/mainwindow.c:479
+#: src/mainwindow.c:482
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/_Dosya/Di_zin/Y_eni dizin oluştur..."
 
-#: src/mainwindow.c:481
+#: src/mainwindow.c:484
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/_Dosya/Di_zin/Di_zini yeniden adlandır..."
 
-#: src/mainwindow.c:482
+#: src/mainwindow.c:485
 #, fuzzy
 msgid "/_File/_Folder/_Move folder..."
 msgstr "/_Dosya/Di_zin/Di_zini yeniden adlandır..."
 
-#: src/mainwindow.c:483
+#: src/mainwindow.c:486
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/_Dosya/Di_zin/Dizini _sil"
 
-#: src/mainwindow.c:484
+#: src/mainwindow.c:487
 msgid "/_File/_Mailbox"
 msgstr "/_Dosya/_Posta kutusu"
 
-#: src/mainwindow.c:485
+#: src/mainwindow.c:488
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/_Dosya/_Posta kutusu/Posta kutusu e_kle..."
 
-#: src/mainwindow.c:486
+#: src/mainwindow.c:489
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/_Dosya/_Posta Kutusu/_Posta kutusunu kaldır"
 
-#: src/mainwindow.c:487 src/mainwindow.c:492
+#: src/mainwindow.c:490 src/mainwindow.c:495
 msgid "/_File/_Mailbox/---"
 msgstr "/_Dosya/_Posta Kutusu/---"
 
-#: src/mainwindow.c:488
+#: src/mainwindow.c:491
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "/_Dosya/_Posta Kutusu/Yeni mesajlar için k_ontrol et"
 
-#: src/mainwindow.c:490
+#: src/mainwindow.c:493
 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:493
+#: src/mainwindow.c:496
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "/_Dosya/_Posta Kutusu/Dizin ağacını _yeniden oluştur"
 
-#: src/mainwindow.c:496
+#: src/mainwindow.c:499
 msgid "/_File/_Import mbox file..."
 msgstr "/_Dosya/Posta k_utusu dosyasını aktar..."
 
-#: src/mainwindow.c:497
+#: src/mainwindow.c:500
 msgid "/_File/_Export to mbox file..."
 msgstr "/_Dosya/_Posta kutusu dosyasına gönder..."
 
-#: src/mainwindow.c:499
+#: src/mainwindow.c:502
 msgid "/_File/Empty all _trash"
 msgstr "/_Dosya/Tüm çö_pü boşalt"
 
-#: src/mainwindow.c:501 src/messageview.c:139
+#: src/mainwindow.c:504 src/messageview.c:139
 msgid "/_File/_Save as..."
 msgstr "/_Dosya/_Farklı kaydet..."
 
-#: src/mainwindow.c:502 src/messageview.c:140
+#: src/mainwindow.c:505 src/messageview.c:140
 msgid "/_File/_Print..."
 msgstr "/_Dosya/_Yazdır..."
 
-#: src/mainwindow.c:504
+#: src/mainwindow.c:507
 msgid "/_File/_Work offline"
 msgstr "/_Dosya/Çevrimdı_şı çalış"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:507
+#: src/mainwindow.c:510
 msgid "/_File/E_xit"
 msgstr "/_Dosya/Çı_k"
 
-#: src/mainwindow.c:512
+#: src/mainwindow.c:515
 msgid "/_Edit/Select _thread"
 msgstr "/Dü_zenle/_Sıralı seç"
 
-#: src/mainwindow.c:514 src/messageview.c:148
+#: src/mainwindow.c:517 src/messageview.c:148
 msgid "/_Edit/_Find in current message..."
 msgstr "/Dü_zenle/Gü_ncel iletide bul..."
 
-#: src/mainwindow.c:516
+#: src/mainwindow.c:519
 msgid "/_Edit/_Search messages..."
 msgstr "/Dü_zenle/_İletilerde ara..."
 
-#: src/mainwindow.c:519
+#: src/mainwindow.c:522
 msgid "/_View/Show or hi_de"
 msgstr "/_Görünüm/Göster veya _gizle"
 
-#: src/mainwindow.c:520
+#: src/mainwindow.c:523
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/_Görünüm/Göster veya _gizle/_Dizin ağacı"
 
-#: src/mainwindow.c:522
+#: src/mainwindow.c:525
 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:524
+#: src/mainwindow.c:527
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/_Görünüm/Göster veya _gizle/_Araç çubuğu"
 
-#: src/mainwindow.c:526
+#: src/mainwindow.c:529
 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:528
+#: src/mainwindow.c:531
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/_Görünüm/Göster veya _gizle/_Araç çubuğu/_Simge"
 
-#: src/mainwindow.c:530
+#: src/mainwindow.c:533
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/_Görünüm/Göster veya _gizle/_Araç çubuğu/_Metin"
 
-#: src/mainwindow.c:532
+#: src/mainwindow.c:535
 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:534
+#: src/mainwindow.c:537
 #, fuzzy
 msgid "/_View/Show or hi_de/_Search bar"
 msgstr "/_Görünüm/Göster veya _gizle/_Durum çubuğu"
 
-#: src/mainwindow.c:536
+#: src/mainwindow.c:539
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/_Görünüm/Göster veya _gizle/_Durum çubuğu"
 
-#: src/mainwindow.c:539
+#: src/mainwindow.c:542
 msgid "/_View/Separate f_older tree"
 msgstr "/_Görünüm/D_izin ağacını ayır"
 
-#: src/mainwindow.c:540
+#: src/mainwindow.c:543
 #, fuzzy
 msgid "/_View/Separate _message view"
 msgstr "/_Görünüm/Ayrı _ileti görünümü"
 
-#: src/mainwindow.c:542
+#: src/mainwindow.c:545
 msgid "/_View/_Sort"
 msgstr "/_Görünüm/_Sırala"
 
-#: src/mainwindow.c:543
+#: src/mainwindow.c:546
 msgid "/_View/_Sort/by _number"
 msgstr "/_Görünüm/Sıra_la/_Numaraya göre"
 
-#: src/mainwindow.c:544
+#: src/mainwindow.c:547
 msgid "/_View/_Sort/by s_ize"
 msgstr "/_Görünüm/Sıra_la/_Boyuta göre"
 
-#: src/mainwindow.c:545
+#: src/mainwindow.c:548
 msgid "/_View/_Sort/by _date"
 msgstr "/_Görünüm/Sıra_la/_Tarihe göre"
 
-#: src/mainwindow.c:546
+#: src/mainwindow.c:549
 #, fuzzy
 msgid "/_View/_Sort/by t_hread date"
 msgstr "/_Görünüm/Sıra_la/_Tarihe göre"
 
-#: src/mainwindow.c:547
+#: src/mainwindow.c:550
 msgid "/_View/_Sort/by _from"
 msgstr "/_Görünüm/Sıra_la/_Gönderene göre"
 
-#: src/mainwindow.c:548
+#: src/mainwindow.c:551
 msgid "/_View/_Sort/by _recipient"
 msgstr "/_Görünüm/Sıra_la/_Alıcıya göre"
 
-#: src/mainwindow.c:549
+#: src/mainwindow.c:552
 msgid "/_View/_Sort/by _subject"
 msgstr "/_Görünüm/Sıra_la/_Konuya göre"
 
-#: src/mainwindow.c:550
+#: src/mainwindow.c:553
 msgid "/_View/_Sort/by _color label"
 msgstr "/_Görünüm/Sıra_la/_Renge göre"
 
-#: src/mainwindow.c:552
+#: src/mainwindow.c:555
 msgid "/_View/_Sort/by _mark"
 msgstr "/_Görünüm/Sıra_la/İş_arete göre"
 
-#: src/mainwindow.c:553
+#: src/mainwindow.c:556
 msgid "/_View/_Sort/by _unread"
 msgstr "/_Görünüm/Sıra_la/_Okunmamışa göre"
 
-#: src/mainwindow.c:554
+#: src/mainwindow.c:557
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/_Görünüm/Sıra_la/E_klentiye göre"
 
-#: src/mainwindow.c:556
+#: src/mainwindow.c:559
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/_Görünüm/Sıra_la/_Sıralama yapma"
 
-#: src/mainwindow.c:557 src/mainwindow.c:560
+#: src/mainwindow.c:560 src/mainwindow.c:563
 msgid "/_View/_Sort/---"
 msgstr "/_Görünüm/Sıra_la/---"
 
-#: src/mainwindow.c:558
+#: src/mainwindow.c:561
 msgid "/_View/_Sort/Ascending"
 msgstr "/_Görünüm/_Sırala/Artan sırala"
 
-#: src/mainwindow.c:559
+#: src/mainwindow.c:562
 msgid "/_View/_Sort/Descending"
 msgstr "/_Görünüm/_Sırala/Azalan sırala"
 
-#: src/mainwindow.c:561
+#: src/mainwindow.c:564
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/_Görünüm/Sıra_la/Konuya _göre izle"
 
-#: src/mainwindow.c:563
+#: src/mainwindow.c:566
 msgid "/_View/Th_read view"
 msgstr "/_Görünüm/_Konum görünümü"
 
-#: src/mainwindow.c:564
+#: src/mainwindow.c:567
 msgid "/_View/E_xpand all threads"
 msgstr "/_Görünüm/Tüm _başlıkları genişlet"
 
-#: src/mainwindow.c:565
+#: src/mainwindow.c:568
 msgid "/_View/Co_llapse all threads"
 msgstr "/_Görünüm/Tüm _başlıkları küçült"
 
-#: src/mainwindow.c:566
+#: src/mainwindow.c:569
 msgid "/_View/Set display _item..."
 msgstr "/_Görünüm/_Görüntü öğesini seç..."
 
-#: src/mainwindow.c:569
+#: src/mainwindow.c:572
 msgid "/_View/_Go to"
 msgstr "/_Görünüm/_Git/"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:573
 msgid "/_View/_Go to/_Prev message"
 msgstr "/_Görünüm/_Git/Önceki _ileti"
 
-#: src/mainwindow.c:571
+#: src/mainwindow.c:574
 msgid "/_View/_Go to/_Next message"
 msgstr "/_Görünüm/_Git/Sonraki _ileti"
 
-#: src/mainwindow.c:572 src/mainwindow.c:577 src/mainwindow.c:580
-#: src/mainwindow.c:585 src/mainwindow.c:590
+#: src/mainwindow.c:575 src/mainwindow.c:580 src/mainwindow.c:583
+#: src/mainwindow.c:588 src/mainwindow.c:593
 msgid "/_View/_Go to/---"
 msgstr "/_Görünüm/_Git/---"
 
-#: src/mainwindow.c:573
+#: src/mainwindow.c:576
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/_Görünüm/_Git/Ö_nceki okunmamış ileti"
 
-#: src/mainwindow.c:575
+#: src/mainwindow.c:578
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/_Görünüm/_Git/_Sonraki okunmamış ileti"
 
-#: src/mainwindow.c:578
+#: src/mainwindow.c:581
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/_Görünüm/_Git/Ö_nceki yeni ileti"
 
-#: src/mainwindow.c:579
+#: src/mainwindow.c:582
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/_Görünüm/_Git/Sonraki _yeni ileti"
 
-#: src/mainwindow.c:581
+#: src/mainwindow.c:584
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/_Görünüm/Gi_t/Önceki _işaretli ileti"
 
-#: src/mainwindow.c:583
+#: src/mainwindow.c:586
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/_Görünüm/Gi_t/S_onraki işaretli ileti"
 
-#: src/mainwindow.c:586
+#: src/mainwindow.c:589
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/_Görünüm/Gi_t/Ö_nceki _etiketli ileti"
 
-#: src/mainwindow.c:588
+#: src/mainwindow.c:591
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/_Görünüm/Gi_t/Son_raki etiketli ileti"
 
-#: src/mainwindow.c:591
+#: src/mainwindow.c:594
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Görünüm/Gi_t/_Başka dizine git..."
 
-#: src/mainwindow.c:600 src/messageview.c:159
+#: src/mainwindow.c:603 src/messageview.c:159
 #, fuzzy
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Görünüm/_Kodlama/_Otomatik tanı"
 
-#: src/mainwindow.c:613 src/messageview.c:172
+#: src/mainwindow.c:616 src/messageview.c:172
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr "/_Görünüm/_Kodlama/Batı Avrupa (ISO-8859-_15)"
 
-#: src/mainwindow.c:653 src/messageview.c:205
+#: src/mainwindow.c:662 src/messageview.c:210
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Görünüm/_Kodlama/Japonca (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:655 src/messageview.c:207
+#: src/mainwindow.c:664 src/messageview.c:212
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Görünüm/_Kodlama/Japonca (_EUC-JP)"
 
-#: src/mainwindow.c:657 src/messageview.c:209
+#: src/mainwindow.c:666 src/messageview.c:214
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Görünüm/_Kodlama/Japonca (_Shift__JIS)"
 
-#: src/mainwindow.c:667 src/messageview.c:218
+#: src/mainwindow.c:676 src/messageview.c:223
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Görünüm/_Kodlama/Geleneksel Çince (EUC-_TW)"
 
-#: src/mainwindow.c:669 src/messageview.c:220
+#: src/mainwindow.c:678 src/messageview.c:225
 #, fuzzy
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Görünüm/_Kodlama/Çince (ISO-2022-_CN)"
 
-#: src/mainwindow.c:675 src/messageview.c:225
+#: src/mainwindow.c:684 src/messageview.c:230
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Görünüm/_Kodlama/Korece (ISO-2022-KR)"
 
-#: src/mainwindow.c:688 src/summaryview.c:449
+#: src/mainwindow.c:697 src/summaryview.c:451
 msgid "/_View/Open in new _window"
 msgstr "/_Görünüm/Yeni _pencerede aç"
 
-#: src/mainwindow.c:689 src/messageview.c:237
+#: src/mainwindow.c:698 src/messageview.c:242
 msgid "/_View/Mess_age source"
 msgstr "/_Görünüm/İ_leti kaynağı"
 
-#: src/mainwindow.c:690 src/messageview.c:238
+#: src/mainwindow.c:699 src/messageview.c:243
 msgid "/_View/Show all _header"
 msgstr "/_Görünüm/Tüm _başlıkları görüntüle"
 
-#: src/mainwindow.c:692
+#: src/mainwindow.c:701
 msgid "/_View/_Update summary"
 msgstr "/_Görünüm/_Görünümü güncelle"
 
-#: src/mainwindow.c:694 src/messageview.c:240
+#: src/mainwindow.c:703 src/messageview.c:245
 msgid "/_Message"
 msgstr "/İ_leti"
 
-#: src/mainwindow.c:695
+#: src/mainwindow.c:704
 msgid "/_Message/Recei_ve"
 msgstr "/İ_leti/_Al"
 
-#: src/mainwindow.c:696
+#: src/mainwindow.c:705
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/İ_leti/_Al/Ge_çerli hesaptan al"
 
-#: src/mainwindow.c:698
+#: src/mainwindow.c:707
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/İ_leti/_Al/T_üm hesaplardan al"
 
-#: src/mainwindow.c:700
+#: src/mainwindow.c:709
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/İ_leti/_Al/İ_ptal Et"
 
-#: src/mainwindow.c:702
+#: src/mainwindow.c:711
 msgid "/_Message/Recei_ve/---"
 msgstr "/İ_leti/_Al/---"
 
-#: src/mainwindow.c:703
+#: src/mainwindow.c:712
 msgid "/_Message/_Send queued messages"
 msgstr "/İ_leti/_Kuyruktaki iletileri gönder"
 
-#: src/mainwindow.c:704 src/mainwindow.c:706 src/mainwindow.c:713
-#: src/mainwindow.c:718 src/mainwindow.c:721 src/mainwindow.c:730
-#: src/mainwindow.c:732 src/mainwindow.c:735 src/messageview.c:243
-#: src/messageview.c:251 src/messageview.c:256
+#: src/mainwindow.c:713 src/mainwindow.c:715 src/mainwindow.c:722
+#: src/mainwindow.c:727 src/mainwindow.c:730 src/mainwindow.c:741
+#: src/mainwindow.c:743 src/mainwindow.c:746 src/messageview.c:248
+#: src/messageview.c:256 src/messageview.c:261
 msgid "/_Message/---"
 msgstr "/İ_leti/---"
 
-#: src/mainwindow.c:705 src/messageview.c:241
+#: src/mainwindow.c:714 src/messageview.c:246
 msgid "/_Message/Compose _new message"
 msgstr "/İ_leti/Yeni _ileti gönder"
 
-#: src/mainwindow.c:707 src/messageview.c:244
+#: src/mainwindow.c:716 src/messageview.c:249
 msgid "/_Message/_Reply"
 msgstr "/İ_leti/Yanıtl_a"
 
-#: src/mainwindow.c:708
+#: src/mainwindow.c:717
 msgid "/_Message/Repl_y to"
 msgstr "/İ_leti/B_aşkasına yanıtla"
 
-#: src/mainwindow.c:709 src/messageview.c:245
+#: src/mainwindow.c:718 src/messageview.c:250
 msgid "/_Message/Repl_y to/_all"
 msgstr "/İ_leti/B_aşkasına yanıtla/_herkese"
 
-#: src/mainwindow.c:710 src/messageview.c:247
+#: src/mainwindow.c:719 src/messageview.c:252
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/İ_leti/B_aşkasına yanıtla/_gönderene"
 
-#: src/mainwindow.c:711 src/messageview.c:249
+#: src/mainwindow.c:720 src/messageview.c:254
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/İ_leti/B_aşkasına yanıtla/eposta l_istesine"
 
-#: src/mainwindow.c:714 src/messageview.c:252
+#: src/mainwindow.c:723 src/messageview.c:257
 msgid "/_Message/_Forward"
 msgstr "/İ_leti/Yö_nlendir"
 
-#: src/mainwindow.c:715 src/messageview.c:253
+#: src/mainwindow.c:724 src/messageview.c:258
 msgid "/_Message/For_ward as attachment"
 msgstr "/İ_leti/E_k olarak yönlendir"
 
-#: src/mainwindow.c:717 src/messageview.c:255
+#: src/mainwindow.c:726 src/messageview.c:260
 msgid "/_Message/Redirec_t"
 msgstr "/İ_leti/Yö_nlendir"
 
-#: src/mainwindow.c:719
+#: src/mainwindow.c:728
 msgid "/_Message/M_ove..."
 msgstr "/İ_leti/Taşı..."
 
-#: src/mainwindow.c:720
+#: src/mainwindow.c:729
 msgid "/_Message/_Copy..."
 msgstr "/İ_leti/_Kopyala..."
 
-#: src/mainwindow.c:722
+#: src/mainwindow.c:731
 msgid "/_Message/_Mark"
 msgstr "/İ_leti/İş_aretle"
 
-#: src/mainwindow.c:723
+#: src/mainwindow.c:732
 msgid "/_Message/_Mark/_Mark"
 msgstr "/İ_leti/İş_aretle/İş_aretle"
 
-#: src/mainwindow.c:724
+#: src/mainwindow.c:733
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/İ_leti/İş_aretle/İşareti _kaldır"
 
-#: src/mainwindow.c:725
+#: src/mainwindow.c:734
 msgid "/_Message/_Mark/---"
 msgstr "/İ_leti/İş_aretle/---"
 
-#: src/mainwindow.c:726
+#: src/mainwindow.c:735
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/İ_leti/İş_aretle/O_kunmamış olarak işaretle"
 
-#: src/mainwindow.c:727
+#: src/mainwindow.c:736
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/İ_leti/İş_aretle/Ok_unmuş olarak işaretle"
 
-#: src/mainwindow.c:729
+#: src/mainwindow.c:738
+#, fuzzy
+msgid "/_Message/_Mark/Mark _thread as read"
+msgstr "/İ_leti/İş_aretle/Ok_unmuş olarak işaretle"
+
+#: src/mainwindow.c:740
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/İ_leti/İş_aretle/Hepsini _okunmuş olarak işaretle"
 
-#: src/mainwindow.c:731
+#: src/mainwindow.c:742
 msgid "/_Message/_Delete"
 msgstr "/İ_leti/_Sil"
 
-#: src/mainwindow.c:733
+#: src/mainwindow.c:744
 #, fuzzy
 msgid "/_Message/Set as _junk mail"
 msgstr "/İ_leti/İş_aretle/İşareti _kaldır"
 
-#: src/mainwindow.c:734
+#: src/mainwindow.c:745
 msgid "/_Message/Set as not j_unk mail"
 msgstr ""
 
-#: src/mainwindow.c:736 src/messageview.c:257
+#: src/mainwindow.c:747 src/messageview.c:262
 msgid "/_Message/Re-_edit"
 msgstr "/İ_leti/Ye_niden düzenle"
 
-#: src/mainwindow.c:740
+#: src/mainwindow.c:751
 #, fuzzy
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/A_raçlar/Göndereni adres defterine ekle"
 
-#: src/mainwindow.c:743
+#: src/mainwindow.c:754
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/A_raçlar/_Dizin içindeki tüm iletileri filtrele"
 
-#: src/mainwindow.c:745
+#: src/mainwindow.c:756
 msgid "/_Tools/Filter _selected messages"
 msgstr "/A_raçlar/S_eçilen tüm mesajları filtrele"
 
-#: src/mainwindow.c:747 src/messageview.c:264
+#: src/mainwindow.c:758 src/messageview.c:269
 msgid "/_Tools/_Create filter rule"
 msgstr "/A_raçlar/Filtre _kuralı oluştur"
 
-#: src/mainwindow.c:748 src/messageview.c:266
+#: src/mainwindow.c:759 src/messageview.c:271
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/A_raçlar/Filtre _kuralı oluştur/_Otomatik oluştur"
 
-#: src/mainwindow.c:750 src/messageview.c:268
+#: src/mainwindow.c:761 src/messageview.c:273
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/A_raçlar/Filtre _kuralı oluştur/_Gönderene göre oluştur"
 
-#: src/mainwindow.c:752 src/messageview.c:270
+#: src/mainwindow.c:763 src/messageview.c:275
 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:754 src/messageview.c:272
+#: src/mainwindow.c:765 src/messageview.c:277
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/A_raçlar/Filtre _kuralı oluştur/_Konuya göre oluştur"
 
-#: src/mainwindow.c:757
+#: src/mainwindow.c:768
 #, fuzzy
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/A_raçlar/_Dizin içindeki tüm iletileri filtrele"
 
-#: src/mainwindow.c:759
+#: src/mainwindow.c:770
 #, fuzzy
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/A_raçlar/S_eçilen tüm mesajları filtrele"
 
-#: src/mainwindow.c:764
+#: src/mainwindow.c:775
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/A_raçlar/Ç_ift iletileri sil"
 
-#: src/mainwindow.c:767
+#: src/mainwindow.c:778
 msgid "/_Tools/E_xecute"
 msgstr "/A_raçlar/Ç_alıştır"
 
-#: src/mainwindow.c:769
+#: src/mainwindow.c:780
 msgid "/_Tools/_Log window"
 msgstr "/A_raçlar/_Kayıt penceresi"
 
-#: src/mainwindow.c:771
+#: src/mainwindow.c:782
 msgid "/_Configuration"
 msgstr "/_Yapılandırma"
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:783
 msgid "/_Configuration/_Common preferences..."
 msgstr "/_Yapılandırma/_Genel tercihler..."
 
-#: src/mainwindow.c:774
+#: src/mainwindow.c:785
 msgid "/_Configuration/_Filter setting..."
 msgstr "/_Yapılandırma/F_iltre ayarları..."
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:787
 msgid "/_Configuration/_Template..."
 msgstr "/_Yapılandırma/Ş_ablon..."
 
-#: src/mainwindow.c:777
+#: src/mainwindow.c:788
 msgid "/_Configuration/_Actions..."
 msgstr "/_Yapılandırma/_Eylemler..."
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:789
 msgid "/_Configuration/---"
 msgstr "/_Yapılandırma/---"
 
-#: src/mainwindow.c:779
+#: src/mainwindow.c:790
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Yapılandırma/_Güncel hesap tercihleri..."
 
-#: src/mainwindow.c:781
+#: src/mainwindow.c:792
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Yapılandırma/Y_eni hesap oluştur..."
 
-#: src/mainwindow.c:783
+#: src/mainwindow.c:794
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Yapılandırma/Hesapları _düzenle..."
 
-#: src/mainwindow.c:785
+#: src/mainwindow.c:796
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Yapılandırma/_Güncel hesabı değiştir"
 
-#: src/mainwindow.c:789
+#: src/mainwindow.c:800
 msgid "/_Help/_Manual"
 msgstr "/Yardı_m/_Kılavuz"
 
-#: src/mainwindow.c:790
+#: src/mainwindow.c:801
 msgid "/_Help/_Manual/_English"
 msgstr "/Yardı_m/_Kılavuz/İ_ngilizce"
 
-#: src/mainwindow.c:791
+#: src/mainwindow.c:802
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/Yardı_m/_Kılavuz/_Japonca"
 
-#: src/mainwindow.c:792
+#: src/mainwindow.c:803
 msgid "/_Help/_FAQ"
 msgstr "/Yardı_m/_SSS"
 
-#: src/mainwindow.c:793
+#: src/mainwindow.c:804
 msgid "/_Help/_FAQ/_English"
 msgstr "/Yardı_m/_SSS/İ_ngilizce"
 
-#: src/mainwindow.c:794
+#: src/mainwindow.c:805
 msgid "/_Help/_FAQ/_German"
 msgstr "/Yardı_m/_SSS/_Almanca"
 
-#: src/mainwindow.c:795
+#: src/mainwindow.c:806
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/Yardı_m/_SSS/İ_spanyolca"
 
-#: src/mainwindow.c:796
+#: src/mainwindow.c:807
 msgid "/_Help/_FAQ/_French"
 msgstr "/Yardı_m/_SSS/_Fransızca"
 
-#: src/mainwindow.c:797
+#: src/mainwindow.c:808
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/Yardı_m/_SSS/İ_talyanca"
 
-#: src/mainwindow.c:798
+#: src/mainwindow.c:809
 msgid "/_Help/---"
 msgstr "/Yardı_m/---"
 
-#: src/mainwindow.c:841
+#: src/mainwindow.c:852
 msgid "Creating main window...\n"
 msgstr "Yeni pencere oluşturuluyor...\n"
 
-#: src/mainwindow.c:1011
+#: src/mainwindow.c:1022
 #, 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:1108 src/summaryview.c:2258 src/summaryview.c:2343
-#: src/summaryview.c:3739 src/summaryview.c:3868 src/summaryview.c:4226
+#: src/mainwindow.c:1119 src/summaryview.c:2275 src/summaryview.c:2360
+#: src/summaryview.c:3896 src/summaryview.c:4025 src/summaryview.c:4383
 msgid "done.\n"
 msgstr "bitti.\n"
 
-#: src/mainwindow.c:1235 src/mainwindow.c:1276 src/mainwindow.c:1301
+#: src/mainwindow.c:1246 src/mainwindow.c:1287 src/mainwindow.c:1312
 msgid "Untitled"
 msgstr "Başlıksız"
 
-#: src/mainwindow.c:1302
+#: src/mainwindow.c:1313
 msgid "none"
 msgstr "hiçbiri"
 
-#: src/mainwindow.c:1355
+#: src/mainwindow.c:1366
 #, 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:1605
+#: src/mainwindow.c:1616
 msgid "Offline"
 msgstr "Çevrimdışı"
 
-#: src/mainwindow.c:1606
+#: src/mainwindow.c:1617
 msgid "You are offline. Go online?"
 msgstr "Çevrimdışısınız. Çevrimiçi olunsun mu?"
 
-#: src/mainwindow.c:1623
+#: src/mainwindow.c:1634
 msgid "Empty all trash"
 msgstr "Tüm çöpü boşalt"
 
-#: src/mainwindow.c:1624
+#: src/mainwindow.c:1635
 #, fuzzy
 msgid "Delete all messages in trash folders?"
 msgstr "Çöpteki tüm iletiler silinsin mi?"
 
-#: src/mainwindow.c:1652
+#: src/mainwindow.c:1663
 msgid "Add mailbox"
 msgstr "Posta kutusu ekle"
 
-#: src/mainwindow.c:1653
+#: src/mainwindow.c:1664
 #, fuzzy
 msgid ""
 "Specify the location of mailbox.\n"
@@ -3622,16 +3638,16 @@ msgstr ""
 "Eğer varolan potsa kutusu verilirse, otomatik\n"
 "olarak taranacaktır."
 
-#: src/mainwindow.c:1659 src/setup.c:49
+#: src/mainwindow.c:1670 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "`%s' posta kutusu zaten var."
 
-#: src/mainwindow.c:1664 src/setup.c:56
+#: src/mainwindow.c:1675 src/setup.c:56
 msgid "Mailbox"
 msgstr "Posta kutusu"
 
-#: src/mainwindow.c:1670 src/setup.c:62
+#: src/mainwindow.c:1681 src/setup.c:62
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3640,146 +3656,146 @@ msgstr ""
 "Posta kutusu oluşturulurken hata oluştu.\n"
 "Bazı dosyalar bulunuyor olabilir veya yeterli izine sahip olmayabilirsiniz."
 
-#: src/mainwindow.c:2088
+#: src/mainwindow.c:2099
 msgid "Sylpheed - Folder View"
 msgstr "Sylheed - Dizin Görünümü"
 
-#: src/mainwindow.c:2107
+#: src/mainwindow.c:2118
 msgid "Sylpheed - Message View"
 msgstr "Sylpeed - İleti Görünümü"
 
-#: src/mainwindow.c:2259 src/summaryview.c:408
+#: src/mainwindow.c:2270 src/summaryview.c:408
 msgid "/_Reply"
 msgstr "/_Yanıtla"
 
-#: src/mainwindow.c:2260
+#: src/mainwindow.c:2271
 msgid "/Reply to _all"
 msgstr "/Her_kese yanıtla"
 
-#: src/mainwindow.c:2261
+#: src/mainwindow.c:2272
 msgid "/Reply to _sender"
 msgstr "/_Gönderene yanıtla"
 
-#: src/mainwindow.c:2262
+#: src/mainwindow.c:2273
 msgid "/Reply to mailing _list"
 msgstr "/_E-posta listesine yanıtla"
 
-#: src/mainwindow.c:2267 src/summaryview.c:415
+#: src/mainwindow.c:2278 src/summaryview.c:415
 msgid "/_Forward"
 msgstr "/_Yönlendir"
 
-#: src/mainwindow.c:2268 src/summaryview.c:416
+#: src/mainwindow.c:2279 src/summaryview.c:416
 msgid "/For_ward as attachment"
 msgstr "/_Ek olarak yönlendir"
 
-#: src/mainwindow.c:2269 src/summaryview.c:417
+#: src/mainwindow.c:2280 src/summaryview.c:417
 msgid "/Redirec_t"
 msgstr "/Ye_niden yönlendir"
 
-#: src/mainwindow.c:2305
+#: src/mainwindow.c:2316
 msgid "Get"
 msgstr "Al"
 
-#: src/mainwindow.c:2306
+#: src/mainwindow.c:2317
 msgid "Incorporate new mail"
 msgstr "Yeni postaları dağıt"
 
-#: src/mainwindow.c:2313
+#: src/mainwindow.c:2324
 msgid "Get all"
 msgstr "Hepsini al"
 
-#: src/mainwindow.c:2314
+#: src/mainwindow.c:2325
 msgid "Incorporate new mail of all accounts"
 msgstr "Tüm hesaplardaki postaları dağıt"
 
-#: src/mainwindow.c:2325
+#: src/mainwindow.c:2336
 msgid "Send queued message(s)"
 msgstr "Kuyruktaki iletileri gönder"
 
-#: src/mainwindow.c:2335 src/prefs_account_dialog.c:530
+#: src/mainwindow.c:2346 src/prefs_account_dialog.c:530
 #: src/prefs_common_dialog.c:663 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "Düzenle"
 
-#: src/mainwindow.c:2336
+#: src/mainwindow.c:2347
 msgid "Compose new message"
 msgstr "Yeni ileti düzenle"
 
-#: src/mainwindow.c:2344 src/prefs_common_dialog.c:975
+#: src/mainwindow.c:2355 src/prefs_common_dialog.c:975
 msgid "Reply"
 msgstr "Yanıtla"
 
-#: src/mainwindow.c:2345 src/mainwindow.c:2358
+#: src/mainwindow.c:2356 src/mainwindow.c:2369
 msgid "Reply to the message"
 msgstr "İletiyi yanıtla"
 
-#: src/mainwindow.c:2362
+#: src/mainwindow.c:2373
 msgid "Reply all"
 msgstr "Hepsine ynt."
 
-#: src/mainwindow.c:2363
+#: src/mainwindow.c:2374
 msgid "Reply to all"
 msgstr "Herkese yanıtla"
 
-#: src/mainwindow.c:2371 src/prefs_filter_edit.c:672
+#: src/mainwindow.c:2382 src/prefs_filter_edit.c:672
 msgid "Forward"
 msgstr "Yönlendir"
 
-#: src/mainwindow.c:2372 src/mainwindow.c:2385
+#: src/mainwindow.c:2383 src/mainwindow.c:2396
 msgid "Forward the message"
 msgstr "İletiyi yönlendir"
 
-#: src/mainwindow.c:2392
+#: src/mainwindow.c:2403
 msgid "Delete the message"
 msgstr "İletiyi sil"
 
-#: src/mainwindow.c:2401
+#: src/mainwindow.c:2412
 #, fuzzy
 msgid "Set as junk mail"
 msgstr "Öntanımlı kullan"
 
-#: src/mainwindow.c:2410
+#: src/mainwindow.c:2421
 msgid "Execute"
 msgstr "Çalıştır"
 
-#: src/mainwindow.c:2411
+#: src/mainwindow.c:2422
 msgid "Execute marked process"
 msgstr "İşaretli süreçleri çalıştır"
 
-#: src/mainwindow.c:2421
+#: src/mainwindow.c:2432
 msgid "Next unread message"
 msgstr "Sonraki okunmamış ileti"
 
-#: src/mainwindow.c:2433
+#: src/mainwindow.c:2444
 msgid "Prefs"
 msgstr "Tercihler"
 
-#: src/mainwindow.c:2434
+#: src/mainwindow.c:2445
 msgid "Common preferences"
 msgstr "Ortak tercihler"
 
-#: src/mainwindow.c:2442 src/prefs_folder_item.c:289
+#: src/mainwindow.c:2453 src/prefs_folder_item.c:289
 #: src/prefs_folder_item.c:300 src/progressdialog.c:128
 msgid "Account"
 msgstr "Hesap"
 
-#: src/mainwindow.c:2443
+#: src/mainwindow.c:2454
 msgid "Account setting"
 msgstr "Hesap ayarları"
 
-#: src/mainwindow.c:2615
+#: src/mainwindow.c:2626
 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:2626
+#: src/mainwindow.c:2637
 msgid "You are online. Click the icon to go offline."
 msgstr "Çevrimiçisiniz. Çevrimdışı olmak için simgeye tıklayın."
 
-#: src/mainwindow.c:2892
+#: src/mainwindow.c:2903
 msgid "Exit"
 msgstr "Çık"
 
-#: src/mainwindow.c:2892
+#: src/mainwindow.c:2903
 msgid "Exit this program?"
 msgstr "Programdan çıkılsın mı?"
 
@@ -3816,45 +3832,45 @@ msgstr "İletinin sonuna ulaşıldı, başından başlansın mı?"
 msgid "Search finished"
 msgstr "Arama tamamlandı"
 
-#: src/messageview.c:261
+#: src/messageview.c:266
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/A_raçlar/Göndereni adres defterine ekle"
 
-#: src/messageview.c:291
+#: src/messageview.c:296
 msgid "Creating message view...\n"
 msgstr "İleti görüntüsü oluşturuluyor...\n"
 
-#: src/messageview.c:316
+#: src/messageview.c:321
 msgid "Text"
 msgstr "Metin"
 
-#: src/messageview.c:321
+#: src/messageview.c:326
 msgid "Attachments"
 msgstr "Ekler"
 
-#: src/messageview.c:371
+#: src/messageview.c:376
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:669 src/summaryview.c:3268
+#: src/messageview.c:674 src/summaryview.c:3425
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "`%s' dosyası kaydedilemedi."
 
-#: src/messageview.c:728 src/summaryview.c:3291
+#: src/messageview.c:733 src/summaryview.c:3448
 msgid "The message will be printed with the following command:"
 msgstr ""
 
-#: src/messageview.c:729 src/summaryview.c:3292
+#: src/messageview.c:734 src/summaryview.c:3449
 #, fuzzy
 msgid "(Default print command)"
 msgstr "Komut çalıştır"
 
-#: src/messageview.c:731 src/prefs_common_dialog.c:2304 src/summaryview.c:3294
+#: src/messageview.c:736 src/prefs_common_dialog.c:2304 src/summaryview.c:3451
 msgid "Print"
 msgstr "Yazdır"
 
-#: src/messageview.c:740 src/summaryview.c:3303
+#: src/messageview.c:745 src/summaryview.c:3460
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -4764,8 +4780,8 @@ msgstr "Eğer gönderen kendimsem 'Kimden' satırında alıcıyı göster"
 msgid "Expand threads"
 msgstr "Dizileri Genişlet"
 
-#: src/prefs_common_dialog.c:1413 src/prefs_common_dialog.c:2713
-#: src/prefs_common_dialog.c:2751
+#: src/prefs_common_dialog.c:1413 src/prefs_common_dialog.c:2716
+#: src/prefs_common_dialog.c:2754
 msgid "Date format"
 msgstr "Tarih biçimi"
 
@@ -5065,8 +5081,8 @@ msgstr "Harici düzenleyici (%s, dosya adı/URL ile yer değiştirecektir)"
 msgid "Web browser"
 msgstr "Tarayıcı"
 
-#: src/prefs_common_dialog.c:2288 src/prefs_common_dialog.c:3775
-#: src/prefs_common_dialog.c:3796
+#: src/prefs_common_dialog.c:2288 src/prefs_common_dialog.c:3778
+#: src/prefs_common_dialog.c:3799
 #, fuzzy
 msgid "(Default browser)"
 msgstr "Öntanımlı gelen kutusu"
@@ -5142,216 +5158,226 @@ msgstr "Yunanca (ISO-8859-7)"
 
 #: src/prefs_common_dialog.c:2495
 #, fuzzy
+msgid "Arabic (ISO-8859-6)"
+msgstr "Baltık (ISO-8859-4)"
+
+#: src/prefs_common_dialog.c:2496
+#, fuzzy
+msgid "Arabic (Windows-1256)"
+msgstr "Kiril (Windows-1251)"
+
+#: src/prefs_common_dialog.c:2498
+#, fuzzy
 msgid "Hebrew (ISO-8859-8)"
 msgstr "Yunanca (ISO-8859-7)"
 
-#: src/prefs_common_dialog.c:2496
+#: src/prefs_common_dialog.c:2499
 #, fuzzy
 msgid "Hebrew (Windows-1255)"
 msgstr "Kiril (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2498
+#: src/prefs_common_dialog.c:2501
 msgid "Turkish (ISO-8859-9)"
 msgstr "Türkçe (ISO-8859-9)"
 
-#: src/prefs_common_dialog.c:2500
+#: src/prefs_common_dialog.c:2503
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Kiril (ISO-8859-5)"
 
-#: src/prefs_common_dialog.c:2501
+#: src/prefs_common_dialog.c:2504
 msgid "Cyrillic (KOI8-R)"
 msgstr "Kiril (KOI8-R)"
 
-#: src/prefs_common_dialog.c:2502
+#: src/prefs_common_dialog.c:2505
 msgid "Cyrillic (KOI8-U)"
 msgstr "Kiril (KOI8-U)"
 
-#: src/prefs_common_dialog.c:2503
+#: src/prefs_common_dialog.c:2506
 msgid "Cyrillic (Windows-1251)"
 msgstr "Kiril (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2505
+#: src/prefs_common_dialog.c:2508
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Japonca (ISO-2022-JP)"
 
-#: src/prefs_common_dialog.c:2507
+#: src/prefs_common_dialog.c:2510
 msgid "Japanese (EUC-JP)"
 msgstr "Japonca (EUC-JP)"
 
-#: src/prefs_common_dialog.c:2508
+#: src/prefs_common_dialog.c:2511
 msgid "Japanese (Shift_JIS)"
 msgstr "Japonca (Shift_JIS)"
 
-#: src/prefs_common_dialog.c:2511
+#: src/prefs_common_dialog.c:2514
 msgid "Simplified Chinese (GB2312)"
 msgstr "Basitleştirilmiş Çince (GB2312)"
 
-#: src/prefs_common_dialog.c:2512
+#: src/prefs_common_dialog.c:2515
 #, fuzzy
 msgid "Simplified Chinese (GBK)"
 msgstr "Basitleştirilmiş Çince (GB2312)"
 
-#: src/prefs_common_dialog.c:2513
+#: src/prefs_common_dialog.c:2516
 msgid "Traditional Chinese (Big5)"
 msgstr "Geleneksel Çince (Big5)"
 
-#: src/prefs_common_dialog.c:2515
+#: src/prefs_common_dialog.c:2518
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Geleneksel Çince (EUC-TW)"
 
-#: src/prefs_common_dialog.c:2516
+#: src/prefs_common_dialog.c:2519
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Çince (ISO-2022-CN)"
 
-#: src/prefs_common_dialog.c:2519
+#: src/prefs_common_dialog.c:2522
 msgid "Korean (EUC-KR)"
 msgstr "Korece (EUC-KR)"
 
-#: src/prefs_common_dialog.c:2521
+#: src/prefs_common_dialog.c:2524
 msgid "Thai (TIS-620)"
 msgstr "Tayca (TIS-620)"
 
-#: src/prefs_common_dialog.c:2522
+#: src/prefs_common_dialog.c:2525
 msgid "Thai (Windows-874)"
 msgstr "Tayca (Windows-874)"
 
-#: src/prefs_common_dialog.c:2689
+#: src/prefs_common_dialog.c:2692
 msgid "the full abbreviated weekday name"
 msgstr "kısa hafta adı"
 
-#: src/prefs_common_dialog.c:2690
+#: src/prefs_common_dialog.c:2693
 msgid "the full weekday name"
 msgstr "tam hafta adı"
 
-#: src/prefs_common_dialog.c:2691
+#: src/prefs_common_dialog.c:2694
 msgid "the abbreviated month name"
 msgstr "kısa ay adı"
 
-#: src/prefs_common_dialog.c:2692
+#: src/prefs_common_dialog.c:2695
 msgid "the full month name"
 msgstr "tam ay adı"
 
-#: src/prefs_common_dialog.c:2693
+#: src/prefs_common_dialog.c:2696
 msgid "the preferred date and time for the current locale"
 msgstr "güncel yerel bilgisi için tercih edilen gün ve saat"
 
-#: src/prefs_common_dialog.c:2694
+#: src/prefs_common_dialog.c:2697
 msgid "the century number (year/100)"
 msgstr "yüzyıl numarası (yıl/100)"
 
-#: src/prefs_common_dialog.c:2695
+#: src/prefs_common_dialog.c:2698
 msgid "the day of the month as a decimal number"
 msgstr "sayı değerinde ayın günü"
 
-#: src/prefs_common_dialog.c:2696
+#: src/prefs_common_dialog.c:2699
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "24 saatlik format kullanılarak saat"
 
-#: src/prefs_common_dialog.c:2697
+#: src/prefs_common_dialog.c:2700
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "12 saatlik format kullanılarak saat"
 
-#: src/prefs_common_dialog.c:2698
+#: src/prefs_common_dialog.c:2701
 msgid "the day of the year as a decimal number"
 msgstr "yılın gününün sayı değeri"
 
-#: src/prefs_common_dialog.c:2699
+#: src/prefs_common_dialog.c:2702
 msgid "the month as a decimal number"
 msgstr "ay sayı değerinde"
 
-#: src/prefs_common_dialog.c:2700
+#: src/prefs_common_dialog.c:2703
 msgid "the minute as a decimal number"
 msgstr "dakika"
 
-#: src/prefs_common_dialog.c:2701
+#: src/prefs_common_dialog.c:2704
 msgid "either AM or PM"
 msgstr "AM veya PM"
 
-#: src/prefs_common_dialog.c:2702
+#: src/prefs_common_dialog.c:2705
 msgid "the second as a decimal number"
 msgstr "saniye"
 
-#: src/prefs_common_dialog.c:2703
+#: src/prefs_common_dialog.c:2706
 msgid "the day of the week as a decimal number"
 msgstr "haftanın günü"
 
-#: src/prefs_common_dialog.c:2704
+#: src/prefs_common_dialog.c:2707
 msgid "the preferred date for the current locale"
 msgstr "tercih edilen yerek saat"
 
-#: src/prefs_common_dialog.c:2705
+#: src/prefs_common_dialog.c:2708
 msgid "the last two digits of a year"
 msgstr "yılın son iki rakamı"
 
-#: src/prefs_common_dialog.c:2706
+#: src/prefs_common_dialog.c:2709
 msgid "the year as a decimal number"
 msgstr "yıl"
 
-#: src/prefs_common_dialog.c:2707
+#: src/prefs_common_dialog.c:2710
 msgid "the time zone or name or abbreviation"
 msgstr "Zaman dilimi veya adı"
 
-#: src/prefs_common_dialog.c:2728
+#: src/prefs_common_dialog.c:2731
 msgid "Specifier"
 msgstr "Belirtici"
 
-#: src/prefs_common_dialog.c:2729
+#: src/prefs_common_dialog.c:2732
 msgid "Description"
 msgstr "Tanım"
 
-#: src/prefs_common_dialog.c:2769
+#: src/prefs_common_dialog.c:2772
 msgid "Example"
 msgstr "Örnek"
 
-#: src/prefs_common_dialog.c:2850
+#: src/prefs_common_dialog.c:2853
 msgid "Set message colors"
 msgstr "Posta renklerini belirt"
 
-#: src/prefs_common_dialog.c:2858
+#: src/prefs_common_dialog.c:2861
 msgid "Colors"
 msgstr "Renkler"
 
-#: src/prefs_common_dialog.c:2892
+#: src/prefs_common_dialog.c:2895
 msgid "Quoted Text - First Level"
 msgstr "Birinci derecen alıntı metin"
 
-#: src/prefs_common_dialog.c:2898
+#: src/prefs_common_dialog.c:2901
 msgid "Quoted Text - Second Level"
 msgstr "İkinci dereceden alıntı metin"
 
-#: src/prefs_common_dialog.c:2904
+#: src/prefs_common_dialog.c:2907
 msgid "Quoted Text - Third Level"
 msgstr "Üçüncü dereceden alıntı metin"
 
-#: src/prefs_common_dialog.c:2910
+#: src/prefs_common_dialog.c:2913
 msgid "URI link"
 msgstr "URL bağlantısı"
 
-#: src/prefs_common_dialog.c:2917
+#: src/prefs_common_dialog.c:2920
 msgid "Recycle quote colors"
 msgstr "Alıntı renklerini dönüştür"
 
-#: src/prefs_common_dialog.c:2984
+#: src/prefs_common_dialog.c:2987
 msgid "Pick color for quotation level 1"
 msgstr "Birinci dereceden alıntı rengini seçiniz"
 
-#: src/prefs_common_dialog.c:2987
+#: src/prefs_common_dialog.c:2990
 msgid "Pick color for quotation level 2"
 msgstr "İkinci dereceden alıntı rengini seçiniz"
 
-#: src/prefs_common_dialog.c:2990
+#: src/prefs_common_dialog.c:2993
 msgid "Pick color for quotation level 3"
 msgstr "Üçüncü dereceden alıntı rengini seçiniz"
 
-#: src/prefs_common_dialog.c:2993
+#: src/prefs_common_dialog.c:2996
 msgid "Pick color for URI"
 msgstr "URL için renk seçiniz"
 
-#: src/prefs_common_dialog.c:3133
+#: src/prefs_common_dialog.c:3136
 msgid "Description of symbols"
 msgstr "sembollerin açıklamaları"
 
-#: src/prefs_common_dialog.c:3189
+#: src/prefs_common_dialog.c:3192
 msgid ""
 "Date\n"
 "From\n"
@@ -5374,11 +5400,11 @@ msgstr ""
 "Habergrubu\n"
 "Mesaj Nosu"
 
-#: src/prefs_common_dialog.c:3202
+#: src/prefs_common_dialog.c:3205
 msgid "If x is set, displays expr"
 msgstr "Eğer x belirtilmişse expr göster"
 
-#: src/prefs_common_dialog.c:3206
+#: src/prefs_common_dialog.c:3209
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -5392,7 +5418,7 @@ msgstr ""
 "İmzasız alıntı yapılan metin\n"
 "Tam %"
 
-#: src/prefs_common_dialog.c:3214
+#: src/prefs_common_dialog.c:3217
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -5404,20 +5430,20 @@ msgstr ""
 "Tam <\n"
 "Tam >"
 
-#: src/prefs_common_dialog.c:3260
+#: src/prefs_common_dialog.c:3263
 msgid "Key bindings"
 msgstr "Tuş bağıntıları"
 
-#: src/prefs_common_dialog.c:3273
+#: src/prefs_common_dialog.c:3276
 #, fuzzy
 msgid "Select the preset of key bindings."
 msgstr " Tuş kombinasyonları..."
 
-#: src/prefs_common_dialog.c:3283 src/prefs_common_dialog.c:3607
+#: src/prefs_common_dialog.c:3286 src/prefs_common_dialog.c:3610
 msgid "Default"
 msgstr "Öntanımlı"
 
-#: src/prefs_common_dialog.c:3286 src/prefs_common_dialog.c:3616
+#: src/prefs_common_dialog.c:3289 src/prefs_common_dialog.c:3619
 msgid "Old Sylpheed"
 msgstr "Eski Sylpheed"
 
@@ -5538,7 +5564,7 @@ msgstr "Komut sonucu"
 msgid "Age"
 msgstr "Yaş"
 
-#: src/prefs_filter_edit.c:501 src/summaryview.c:510
+#: src/prefs_filter_edit.c:501 src/summaryview.c:512
 #, fuzzy
 msgid "Marked"
 msgstr "İşaretle"
@@ -5770,17 +5796,17 @@ msgid "Attachment"
 msgstr "Ek"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73 src/query_search.c:371 src/summaryview.c:4733
+#: src/prefs_summary_column.c:73 src/query_search.c:371 src/summaryview.c:4890
 msgid "Subject"
 msgstr "Konu"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/query_search.c:372 src/summaryview.c:4736
+#: src/prefs_summary_column.c:74 src/query_search.c:372 src/summaryview.c:4893
 msgid "From"
 msgstr "Kimden"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/query_search.c:373 src/summaryview.c:4738
+#: src/prefs_summary_column.c:75 src/query_search.c:373 src/summaryview.c:4895
 msgid "Date"
 msgstr "Tarih"
 
@@ -5882,7 +5908,7 @@ msgstr "İletilerde ara"
 msgid "_Save as search folder"
 msgstr "Taslak dizinine kaydet"
 
-#: src/query_search.c:512 src/subscribedialog.c:523 src/summaryview.c:840
+#: src/query_search.c:512 src/subscribedialog.c:523 src/summaryview.c:842
 msgid "Done."
 msgstr "Tamamlandı."
 
@@ -5896,7 +5922,7 @@ msgstr "%s dizini taranıyor..."
 msgid "Searching %s (%d / %d)..."
 msgstr "Filtreleniyor..."
 
-#: src/query_search.c:645 src/summaryview.c:2048
+#: src/query_search.c:645 src/summaryview.c:2051
 msgid "(No Date)"
 msgstr "(Tarih Yok)"
 
@@ -6268,308 +6294,313 @@ msgid "/_Mark/Mark as rea_d"
 msgstr "/İşa_retle/_Okunmuş olarak işaretle"
 
 #: src/summaryview.c:429
+#, fuzzy
+msgid "/_Mark/Mark _thread as read"
+msgstr "/İşa_retle/_Okunmuş olarak işaretle"
+
+#: src/summaryview.c:431
 msgid "/_Mark/Mark all _read"
 msgstr "/İşa_retle/H_epsini okunmuş olarak işaretle"
 
-#: src/summaryview.c:430
+#: src/summaryview.c:432
 msgid "/Color la_bel"
 msgstr "/_Renk etiketi"
 
-#: src/summaryview.c:434
+#: src/summaryview.c:436
 msgid "/Re-_edit"
 msgstr "/_Yeniden düzenle"
 
-#: src/summaryview.c:436
+#: src/summaryview.c:438
 #, fuzzy
 msgid "/Add sender to address boo_k..."
 msgstr "/Göndericiyi adres defterine ekle"
 
-#: src/summaryview.c:438
+#: src/summaryview.c:440
 #, fuzzy
 msgid "/Create f_ilter rule"
 msgstr "/A_raçlar/Filtre _kuralı oluştur"
 
-#: src/summaryview.c:439
+#: src/summaryview.c:441
 #, fuzzy
 msgid "/Create f_ilter rule/_Automatically"
 msgstr "/A_raçlar/Filtre _kuralı oluştur/_Otomatik oluştur"
 
-#: src/summaryview.c:441
+#: src/summaryview.c:443
 #, fuzzy
 msgid "/Create f_ilter rule/by _From"
 msgstr "/A_raçlar/Filtre _kuralı oluştur/_Gönderene göre oluştur"
 
-#: src/summaryview.c:443
+#: src/summaryview.c:445
 #, fuzzy
 msgid "/Create f_ilter rule/by _To"
 msgstr "/A_raçlar/Filtre _kuralı oluştur/_Alıcıya göre oluştur"
 
-#: src/summaryview.c:445
+#: src/summaryview.c:447
 #, fuzzy
 msgid "/Create f_ilter rule/by _Subject"
 msgstr "/A_raçlar/Filtre _kuralı oluştur/_Konuya göre oluştur"
 
-#: src/summaryview.c:451
+#: src/summaryview.c:453
 msgid "/_View/_Source"
 msgstr "/_Görünüm/_Kaynak"
 
-#: src/summaryview.c:452
+#: src/summaryview.c:454
 msgid "/_View/All _header"
 msgstr "/_Görünüm/Tüm _başlıklar"
 
-#: src/summaryview.c:454
+#: src/summaryview.c:456
 msgid "/_Print..."
 msgstr "/_Yazdır...."
 
-#: src/summaryview.c:486
+#: src/summaryview.c:488
 msgid "Creating summary view...\n"
 msgstr "Özet oluşturuluyor...\n"
 
-#: src/summaryview.c:508
+#: src/summaryview.c:510
 msgid "All"
 msgstr ""
 
-#: src/summaryview.c:511
+#: src/summaryview.c:513
 #, fuzzy
 msgid "Have color label"
 msgstr "/_Renk etiketi"
 
-#: src/summaryview.c:512
+#: src/summaryview.c:514
 #, fuzzy
 msgid "Have attachment"
 msgstr "Ek"
 
-#: src/summaryview.c:521
+#: src/summaryview.c:523
 #, fuzzy
 msgid "Search:"
 msgstr "Ara"
 
-#: src/summaryview.c:535
+#: src/summaryview.c:537
 msgid "Search for Subject or From"
 msgstr ""
 
-#: src/summaryview.c:702
+#: src/summaryview.c:704
 msgid "Process mark"
 msgstr "Süreç işareti"
 
-#: src/summaryview.c:703
+#: src/summaryview.c:705
 msgid "Some marks are left. Process it?"
 msgstr "Bazı işaretler bırakılmış. İşlemeye devam edilsin mi?"
 
-#: src/summaryview.c:749
+#: src/summaryview.c:751
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "Dizin taranıyor (%s)..."
 
-#: src/summaryview.c:1292
+#: src/summaryview.c:1295
 #, fuzzy
 msgid "_Search again"
 msgstr "Yeniden ara"
 
-#: src/summaryview.c:1313 src/summaryview.c:1322
+#: src/summaryview.c:1316 src/summaryview.c:1325
 msgid "No more unread messages"
 msgstr "Başka okunmamış ileti yok"
 
-#: src/summaryview.c:1314
+#: src/summaryview.c:1317
 msgid "No unread message found. Search from the end?"
 msgstr "Okunmamış ileti bulunamadı. Sondan aratılsın mı?"
 
-#: src/summaryview.c:1316
+#: src/summaryview.c:1319
 msgid "No unread messages."
 msgstr "Okunmamış ileti yok."
 
-#: src/summaryview.c:1323
+#: src/summaryview.c:1326
 msgid "No unread message found. Go to next folder?"
 msgstr "Okunamamış ileti yok. Diğer dizine geçilsin mi?"
 
-#: src/summaryview.c:1331 src/summaryview.c:1340
+#: src/summaryview.c:1334 src/summaryview.c:1343
 msgid "No more new messages"
 msgstr "Başka ileti yok"
 
-#: src/summaryview.c:1332
+#: src/summaryview.c:1335
 msgid "No new message found. Search from the end?"
 msgstr "Yeni ileti yok. Sondan itibaren aransın mı?"
 
-#: src/summaryview.c:1334
+#: src/summaryview.c:1337
 msgid "No new messages."
 msgstr "Yeni ileti yok."
 
-#: src/summaryview.c:1341
+#: src/summaryview.c:1344
 msgid "No new message found. Go to next folder?"
 msgstr "Yeni ileti yok. Sonraki dizine geçilsin mi?"
 
-#: src/summaryview.c:1349 src/summaryview.c:1358
+#: src/summaryview.c:1352 src/summaryview.c:1361
 msgid "No more marked messages"
 msgstr "Başka işaretlenmiş posta yok"
 
-#: src/summaryview.c:1350
+#: src/summaryview.c:1353
 msgid "No marked message found. Search from the end?"
 msgstr "İşaretlenmiş ileti bulunamadı. Sondan aratılsın mı?"
 
-#: src/summaryview.c:1352 src/summaryview.c:1361
+#: src/summaryview.c:1355 src/summaryview.c:1364
 msgid "No marked messages."
 msgstr "İşaretlenmiş ileti yok."
 
-#: src/summaryview.c:1359
+#: src/summaryview.c:1362
 msgid "No marked message found. Search from the beginning?"
 msgstr "İşaretlenmiş ileti bulunamadı. Baştan aratılsın mı?"
 
-#: src/summaryview.c:1367 src/summaryview.c:1376
+#: src/summaryview.c:1370 src/summaryview.c:1379
 msgid "No more labeled messages"
 msgstr "Başka etiketlenmiş ileti yok"
 
-#: src/summaryview.c:1368
+#: src/summaryview.c:1371
 msgid "No labeled message found. Search from the end?"
 msgstr "Başka etiketlenlenmiş ileti yok. Sondan aratılsın mı?"
 
-#: src/summaryview.c:1370 src/summaryview.c:1379
+#: src/summaryview.c:1373 src/summaryview.c:1382
 msgid "No labeled messages."
 msgstr "Başka etiketlenmiş ileti yok."
 
-#: src/summaryview.c:1377
+#: src/summaryview.c:1380
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Etkiketlenmiş ileti bulunamadı. Baştan aratılsın mı?"
 
-#: src/summaryview.c:1693
+#: src/summaryview.c:1696
 msgid "Attracting messages by subject..."
 msgstr "Konularına göre postalar çekiliyor..."
 
-#: src/summaryview.c:1887
+#: src/summaryview.c:1890
 #, c-format
 msgid "%d deleted"
 msgstr "%d silindi"
 
-#: src/summaryview.c:1891
+#: src/summaryview.c:1894
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d taşındı"
 
-#: src/summaryview.c:1892 src/summaryview.c:1897
+#: src/summaryview.c:1895 src/summaryview.c:1900
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:1896
+#: src/summaryview.c:1899
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d kopyalandı"
 
-#: src/summaryview.c:1911
+#: src/summaryview.c:1914
 msgid " item(s) selected"
 msgstr " öğe seçildi"
 
-#: src/summaryview.c:1933
+#: src/summaryview.c:1936
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d yeni, %d okunmamış, toplam %d (%s)"
 
-#: src/summaryview.c:1937
+#: src/summaryview.c:1940
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d yeni, %d okunmamış, toplam %d"
 
-#: src/summaryview.c:1971
+#: src/summaryview.c:1974
 msgid "Sorting summary..."
 msgstr "Özet sıralanıyor..."
 
-#: src/summaryview.c:2194
+#: src/summaryview.c:2211
 msgid "\tSetting summary from message data..."
 msgstr "\tİleti bilgisinden özet atanıyor..."
 
-#: src/summaryview.c:2196
+#: src/summaryview.c:2213
 msgid "Setting summary from message data..."
 msgstr "İleti bilgisinden özet atanıyor..."
 
-#: src/summaryview.c:2302
+#: src/summaryview.c:2319
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Özet (%s) önbelleğe yazılıyor..."
 
-#: src/summaryview.c:2643
+#: src/summaryview.c:2660
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "%d. ileti işaretli\n"
 
-#: src/summaryview.c:2701
+#: src/summaryview.c:2718
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "%d. ileti okunmuş olarak işaretli\n"
 
-#: src/summaryview.c:2789
+#: src/summaryview.c:2908
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "%d ileti okunmamış olarak işaretli\n"
 
-#: src/summaryview.c:2850
+#: src/summaryview.c:2969
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "%s/%d ileti silinecek\n"
 
-#: src/summaryview.c:2878
+#: src/summaryview.c:2997
 msgid "Delete message(s)"
 msgstr "İletileri  sil"
 
-#: src/summaryview.c:2879
+#: src/summaryview.c:2998
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Çöpteki iletileri silmek istiyor musunuz?"
 
-#: src/summaryview.c:2953
+#: src/summaryview.c:3072
 msgid "Deleting duplicated messages..."
 msgstr "Çift iletiler siliniyor..."
 
-#: src/summaryview.c:2991
+#: src/summaryview.c:3110
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "%s%d iletisinin işareti kaldırıldı\n"
 
-#: src/summaryview.c:3049
+#: src/summaryview.c:3168
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "%d iletisi %s e taşındı\n"
 
-#: src/summaryview.c:3066
+#: src/summaryview.c:3196
 msgid "Destination is same as current folder."
 msgstr "Hedef dizin şuanki dizinle aynı."
 
-#: src/summaryview.c:3122
+#: src/summaryview.c:3260
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "%d iletisi %s e kopyalanadı\n"
 
-#: src/summaryview.c:3139
+#: src/summaryview.c:3288
 msgid "Destination for copy is same as current folder."
 msgstr "Kopya için hedef dizin geçerli dizin ile aynı."
 
-#: src/summaryview.c:3338
+#: src/summaryview.c:3495
 msgid "Error occurred while processing messages."
 msgstr "İletiler işlenirken hata oluştu."
 
-#: src/summaryview.c:3646 src/summaryview.c:3647
+#: src/summaryview.c:3803 src/summaryview.c:3804
 msgid "Building threads..."
 msgstr "Konumlar oluşturuluyor..."
 
-#: src/summaryview.c:3797 src/summaryview.c:3798
+#: src/summaryview.c:3954 src/summaryview.c:3955
 msgid "Unthreading..."
 msgstr "Konumlar ayrılıyor..."
 
-#: src/summaryview.c:4091 src/summaryview.c:4147
+#: src/summaryview.c:4248 src/summaryview.c:4304
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtreleniyor..."
 
-#: src/summaryview.c:4196
+#: src/summaryview.c:4353
 msgid "filtering..."
 msgstr "filtreleniyor..."
 
-#: src/summaryview.c:4197
+#: src/summaryview.c:4354
 msgid "Filtering..."
 msgstr "Filtreleniyor..."
 
-#: src/summaryview.c:4233
+#: src/summaryview.c:4390
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "%d mesaj filtrelenedi."
 
-#: src/summaryview.c:4742
+#: src/summaryview.c:4899
 msgid "No."
 msgstr "Hayır."
 
@@ -6586,36 +6617,36 @@ msgstr "Metin görünüm oluşturuluyor...\n"
 msgid "This message can't be displayed.\n"
 msgstr "Bu mesaj görüntülenemiyor.\n"
 
-#: src/textview.c:1929
+#: src/textview.c:1925
 #, fuzzy
 msgid "Sa_ve this image as..."
 msgstr "/_Farklı kaydet..."
 
-#: src/textview.c:1945 src/trayicon.c:109
+#: src/textview.c:1941 src/trayicon.c:109
 #, fuzzy
 msgid "Compose _new message"
 msgstr "Yeni ileti düzenle"
 
-#: src/textview.c:1947
+#: src/textview.c:1943
 #, fuzzy
 msgid "Add to address _book..."
 msgstr "/Göndericiyi adres defterine ekle"
 
-#: src/textview.c:1949
+#: src/textview.c:1945
 #, fuzzy
 msgid "Copy this add_ress"
 msgstr "Ortak adres"
 
-#: src/textview.c:1952
+#: src/textview.c:1948
 #, fuzzy
 msgid "_Open with Web browser"
 msgstr "Tarayıcı"
 
-#: src/textview.c:1954
+#: src/textview.c:1950
 msgid "Copy this _link"
 msgstr ""
 
-#: src/textview.c:2097
+#: src/textview.c:2093
 #, fuzzy, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6627,7 +6658,7 @@ msgstr ""
 "görünenden (%s) farklı.\n"
 "Yine de açılsın mı?"
 
-#: src/textview.c:2102
+#: src/textview.c:2098
 msgid "Fake URL warning"
 msgstr ""
 
diff --git a/po/uk.po b/po/uk.po
index 029dd2dd..71ed0c9e 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed 2.1.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-27 18:11+0900\n"
+"POT-Creation-Date: 2006-01-31 15:20+0900\n"
 "PO-Revision-Date: 2005-10-22 17:21+0300\n"
 "Last-Translator: O.R. Nykyforchyn <nick@pu.if.ua>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
@@ -513,7 +513,7 @@ msgstr "Знайдено %s\n"
 msgid "Configuration is saved.\n"
 msgstr "Конфігурацію збережено.\n"
 
-#: libsylph/prefs_common.c:489
+#: libsylph/prefs_common.c:491
 msgid "Junk mail filter"
 msgstr "фільтр мотлоху"
 
@@ -628,8 +628,8 @@ msgstr "%.2fMB"
 msgid "%.2fGB"
 msgstr "%.2fGB"
 
-#: libsylph/utils.c:2373 src/compose.c:2858 src/compose.c:3121
-#: src/compose.c:3184 src/compose.c:3304
+#: libsylph/utils.c:2373 src/compose.c:2867 src/compose.c:3130
+#: src/compose.c:3193 src/compose.c:3313
 msgid "can't change file mode\n"
 msgstr "не вдалось змінити права доступу файла\n"
 
@@ -715,8 +715,8 @@ msgstr ""
 "Порядок перевірки нових листів. Позначте в колонці `G'\n"
 "account'и, які поповнюються через `Отримати всі'."
 
-#: src/account_dialog.c:366 src/addressadd.c:192 src/addressbook.c:491
-#: src/compose.c:4262 src/editaddress.c:200 src/editaddress.c:942
+#: src/account_dialog.c:366 src/addressadd.c:192 src/addressbook.c:493
+#: src/compose.c:4271 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:206 src/prefs_filter.c:259 src/prefs_folder_item.c:171
@@ -852,12 +852,12 @@ msgstr "Аргумент користувача"
 msgid "Add Address to Book"
 msgstr "Додати адресу до книги"
 
-#: src/addressadd.c:202 src/compose.c:4762 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4771 src/editaddress.c:201
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "Адреса"
 
-#: src/addressadd.c:212 src/addressbook.c:493 src/editaddress.c:202
+#: src/addressadd.c:212 src/addressbook.c:495 src/editaddress.c:202
 #: src/editaddress.c:795 src/editaddress.c:860 src/editgroup.c:267
 msgid "Remarks"
 msgstr "Нотатки"
@@ -866,183 +866,183 @@ msgstr "Нотатки"
 msgid "Select Address Book Folder"
 msgstr "Обрати папку адресної книги"
 
-#: src/addressbook.c:336 src/compose.c:515 src/mainwindow.c:477
+#: src/addressbook.c:338 src/compose.c:515 src/mainwindow.c:480
 #: src/messageview.c:138
 msgid "/_File"
 msgstr "/Файл"
 
-#: src/addressbook.c:337
+#: src/addressbook.c:339
 msgid "/_File/New _Book"
 msgstr "/Файл/Нова книга"
 
-#: src/addressbook.c:338
+#: src/addressbook.c:340
 msgid "/_File/New _vCard"
 msgstr "/Файл/Нова vCard"
 
-#: src/addressbook.c:340
+#: src/addressbook.c:342
 msgid "/_File/New _JPilot"
 msgstr "/Файл/Новий JPilot"
 
-#: src/addressbook.c:343
+#: src/addressbook.c:345
 msgid "/_File/New _Server"
 msgstr "/Файл/Новий сервер"
 
-#: src/addressbook.c:345 src/addressbook.c:348 src/compose.c:520
-#: src/compose.c:525 src/compose.c:528 src/compose.c:531 src/mainwindow.c:495
-#: src/mainwindow.c:498 src/mainwindow.c:500 src/mainwindow.c:503
-#: src/mainwindow.c:505 src/messageview.c:141
+#: src/addressbook.c:347 src/addressbook.c:350 src/compose.c:520
+#: src/compose.c:525 src/compose.c:528 src/compose.c:531 src/mainwindow.c:498
+#: src/mainwindow.c:501 src/mainwindow.c:503 src/mainwindow.c:506
+#: src/mainwindow.c:508 src/messageview.c:141
 msgid "/_File/---"
 msgstr "/Файл/---"
 
-#: src/addressbook.c:346
+#: src/addressbook.c:348
 msgid "/_File/_Edit"
 msgstr "/Файл/Редагувати"
 
-#: src/addressbook.c:347
+#: src/addressbook.c:349
 msgid "/_File/_Delete"
 msgstr "/Файл/Видалити"
 
-#: src/addressbook.c:349
+#: src/addressbook.c:351
 msgid "/_File/_Save"
 msgstr "/Файл/Зберегти"
 
-#: src/addressbook.c:350 src/compose.c:532 src/messageview.c:142
+#: src/addressbook.c:352 src/compose.c:532 src/messageview.c:142
 msgid "/_File/_Close"
 msgstr "/Файл/Закрити"
 
-#: src/addressbook.c:351
+#: src/addressbook.c:353
 msgid "/_Address"
 msgstr "/Адреса"
 
-#: src/addressbook.c:352
+#: src/addressbook.c:354
 msgid "/_Address/New _Address"
 msgstr "/Адреса/Нова адреса"
 
-#: src/addressbook.c:353
+#: src/addressbook.c:355
 msgid "/_Address/New _Group"
 msgstr "/Адреса/Нова група"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:356
 msgid "/_Address/New _Folder"
 msgstr "/Адреса/Нова папка"
 
-#: src/addressbook.c:355
+#: src/addressbook.c:357
 msgid "/_Address/---"
 msgstr "/Адреса/---"
 
-#: src/addressbook.c:356
+#: src/addressbook.c:358
 msgid "/_Address/_Edit"
 msgstr "/Адреса/Редагувати"
 
-#: src/addressbook.c:357
+#: src/addressbook.c:359
 msgid "/_Address/_Delete"
 msgstr "/Адреса/Видалити"
 
-#: src/addressbook.c:358 src/compose.c:639 src/mainwindow.c:738
-#: src/messageview.c:259
+#: src/addressbook.c:360 src/compose.c:645 src/mainwindow.c:749
+#: src/messageview.c:264
 msgid "/_Tools"
 msgstr "/Інструменти"
 
-#: src/addressbook.c:359
+#: src/addressbook.c:361
 msgid "/_Tools/Import _LDIF file"
 msgstr "/Інструменти/Імпортувати файл LDIF"
 
-#: src/addressbook.c:360 src/compose.c:658 src/mainwindow.c:788
-#: src/messageview.c:277
+#: src/addressbook.c:362 src/compose.c:664 src/mainwindow.c:799
+#: src/messageview.c:282
 msgid "/_Help"
 msgstr "/Допомога"
 
-#: src/addressbook.c:361 src/compose.c:659 src/mainwindow.c:799
-#: src/messageview.c:278
+#: src/addressbook.c:363 src/compose.c:665 src/mainwindow.c:810
+#: src/messageview.c:283
 msgid "/_Help/_About"
 msgstr "/Допомога/Про програму"
 
-#: src/addressbook.c:380 src/addressbook.c:390
+#: src/addressbook.c:382 src/addressbook.c:392
 msgid "/New _Address"
 msgstr "/Нова адреса"
 
-#: src/addressbook.c:381 src/addressbook.c:391
+#: src/addressbook.c:383 src/addressbook.c:393
 msgid "/New _Group"
 msgstr "/Нова група"
 
-#: src/addressbook.c:382 src/addressbook.c:392
+#: src/addressbook.c:384 src/addressbook.c:394
 msgid "/New _Folder"
 msgstr "/Нова папка"
 
-#: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:509
+#: src/addressbook.c:385 src/addressbook.c:395 src/compose.c:509
 #: src/folderview.c:246 src/folderview.c:248 src/folderview.c:253
 #: src/folderview.c:266 src/folderview.c:268 src/folderview.c:270
 #: src/folderview.c:275 src/folderview.c:289 src/folderview.c:291
 #: src/folderview.c:295 src/summaryview.c:414 src/summaryview.c:418
-#: src/summaryview.c:421 src/summaryview.c:431 src/summaryview.c:433
-#: src/summaryview.c:435 src/summaryview.c:447 src/summaryview.c:453
+#: src/summaryview.c:421 src/summaryview.c:433 src/summaryview.c:435
+#: src/summaryview.c:437 src/summaryview.c:449 src/summaryview.c:455
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:534
-#: src/mainwindow.c:509 src/messageview.c:144
+#: src/addressbook.c:386 src/addressbook.c:396 src/compose.c:534
+#: src/mainwindow.c:512 src/messageview.c:144
 msgid "/_Edit"
 msgstr "/Редагувати"
 
-#: src/addressbook.c:385 src/addressbook.c:395 src/summaryview.c:432
+#: src/addressbook.c:387 src/addressbook.c:397 src/summaryview.c:434
 msgid "/_Delete"
 msgstr "/Видалити"
 
-#: src/addressbook.c:492
+#: src/addressbook.c:494
 msgid "E-Mail address"
 msgstr "Адреса e-mail"
 
-#: src/addressbook.c:496 src/compose.c:4763 src/prefs_common_dialog.c:2183
+#: src/addressbook.c:498 src/compose.c:4772 src/prefs_common_dialog.c:2183
 msgid "Address book"
 msgstr "Адресна книга"
 
-#: src/addressbook.c:596 src/prefs_filter_edit.c:249
+#: src/addressbook.c:600 src/prefs_filter_edit.c:249
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "Ім'я:"
 
 #. Buttons
-#: src/addressbook.c:628 src/addressbook.c:1680 src/editaddress.c:884
-#: src/editaddress.c:1017 src/mainwindow.c:2391 src/prefs_actions.c:266
+#: src/addressbook.c:632 src/addressbook.c:1684 src/editaddress.c:884
+#: src/editaddress.c:1017 src/mainwindow.c:2402 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
 #: src/prefs_template.c:233
 msgid "Delete"
 msgstr "Видалити"
 
-#: src/addressbook.c:631 src/editaddress.c:890 src/editaddress.c:1023
+#: src/addressbook.c:635 src/editaddress.c:890 src/editaddress.c:1023
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:273 src/prefs_display_header.c:328
 #: src/prefs_filter_edit.c:1550
 msgid "Add"
 msgstr "Додати"
 
-#: src/addressbook.c:634
+#: src/addressbook.c:638
 msgid "Lookup"
 msgstr "Пошук"
 
-#: src/addressbook.c:646 src/headerview.c:55 src/prefs_folder_item.c:339
+#: src/addressbook.c:650 src/headerview.c:55 src/prefs_folder_item.c:339
 #: src/prefs_template.c:176
 msgid "To:"
 msgstr "Кому:"
 
-#: src/addressbook.c:650 src/prefs_folder_item.c:356 src/prefs_template.c:178
+#: src/addressbook.c:654 src/prefs_folder_item.c:356 src/prefs_template.c:178
 msgid "Cc:"
 msgstr "Копія:"
 
-#: src/addressbook.c:654 src/prefs_folder_item.c:367
+#: src/addressbook.c:658 src/prefs_folder_item.c:367
 msgid "Bcc:"
 msgstr "Приховано:"
 
 #. Confirm deletion
-#: src/addressbook.c:841
+#: src/addressbook.c:845
 msgid "Delete address(es)"
 msgstr "Видалити адресу(и)"
 
-#: src/addressbook.c:842
+#: src/addressbook.c:846
 msgid "Really delete the address(es)?"
 msgstr "Дійсно видалити адресу(и)?"
 
-#: src/addressbook.c:1671
+#: src/addressbook.c:1675
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1051,36 +1051,36 @@ msgstr ""
 "Чи бажаєте Ви видалити папку ТА всі адреси в `%s' ? \n"
 "Якщо видалити тільки папку, адреси буде перенесено в охоплюючу папку."
 
-#: src/addressbook.c:1674 src/folderview.c:2351
+#: src/addressbook.c:1678 src/folderview.c:2351
 msgid "Delete folder"
 msgstr "Видалити папку"
 
-#: src/addressbook.c:1674
+#: src/addressbook.c:1678
 msgid "_Folder only"
 msgstr "Тільки папку"
 
-#: src/addressbook.c:1674
+#: src/addressbook.c:1678
 msgid "Folder and _addresses"
 msgstr "Папку та адреси"
 
-#: src/addressbook.c:1679
+#: src/addressbook.c:1683
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Дійсно видалити `%s' ?"
 
-#: src/addressbook.c:2365 src/addressbook.c:2498
+#: src/addressbook.c:2369 src/addressbook.c:2502
 msgid "New user, could not save index file."
 msgstr "Новий користувач, не вдалось зберегти покажчик."
 
-#: src/addressbook.c:2369 src/addressbook.c:2502
+#: src/addressbook.c:2373 src/addressbook.c:2506
 msgid "New user, could not save address book files."
 msgstr "Новий користувач, не вдалось зберегти адресну книгу."
 
-#: src/addressbook.c:2379 src/addressbook.c:2512
+#: src/addressbook.c:2383 src/addressbook.c:2516
 msgid "Old address book converted successfully."
 msgstr "Стару адресну книгу успішно конвертовано."
 
-#: src/addressbook.c:2384
+#: src/addressbook.c:2388
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1088,7 +1088,7 @@ msgstr ""
 "Стару адресну книгу конвертовано,\n"
 "не вдалось зберегти новий покажчик адрес"
 
-#: src/addressbook.c:2397
+#: src/addressbook.c:2401
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1096,7 +1096,7 @@ msgstr ""
 "Не вдалось конвертувати адресну книгу,\n"
 "але створено нову (порожню)."
 
-#: src/addressbook.c:2403
+#: src/addressbook.c:2407
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1104,7 +1104,7 @@ msgstr ""
 "Не вдалось ні конвертувати адресну книгу,\n"
 "ні створити нові файли адресної книги."
 
-#: src/addressbook.c:2408
+#: src/addressbook.c:2412
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1112,85 +1112,85 @@ msgstr ""
 "Не вдалось ні конвертувати адресну книгу,\n"
 "ні створити нові файли адресної книги."
 
-#: src/addressbook.c:2415
+#: src/addressbook.c:2419
 msgid "Addressbook conversion error"
 msgstr "Помилка при конвертуванні адресної книги"
 
-#: src/addressbook.c:2419
+#: src/addressbook.c:2423
 msgid "Addressbook conversion"
 msgstr "Конвертування адресної книги"
 
-#: src/addressbook.c:2454
+#: src/addressbook.c:2458
 msgid "Addressbook Error"
 msgstr "Помилка в адресній книзі"
 
-#: src/addressbook.c:2455 src/addressbook.c:2555
+#: src/addressbook.c:2459 src/addressbook.c:2559
 msgid "Could not read address index"
 msgstr "Не вдалось прочитати покажчик адрес"
 
-#: src/addressbook.c:2517
+#: src/addressbook.c:2521
 msgid "Old address book converted, could not save new address index file"
 msgstr ""
 "Стару адресну книгу конвертовано, не вдалось зберегти новий покажчик адрес"
 
-#: src/addressbook.c:2531
+#: src/addressbook.c:2535
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr "Не вдалось конвертувати адресну книгу, але створено нову (порожню)."
 
-#: src/addressbook.c:2537
+#: src/addressbook.c:2541
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr "Не вдалось ні конвертувати адресну книгу, ні створити нову."
 
-#: src/addressbook.c:2543
+#: src/addressbook.c:2547
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr "Не вдалось ні конвертувати адресну книгу, ні створити нову."
 
-#: src/addressbook.c:2561
+#: src/addressbook.c:2565
 msgid "Addressbook Conversion Error"
 msgstr "Помилка при конвертуванні адресної книги"
 
-#: src/addressbook.c:2567
+#: src/addressbook.c:2571
 msgid "Addressbook Conversion"
 msgstr "Конвертування адресної книги"
 
-#: src/addressbook.c:3072 src/prefs_common_dialog.c:2033
+#: src/addressbook.c:3086 src/prefs_common_dialog.c:2033
 msgid "Interface"
 msgstr "Інтерфейс"
 
-#: src/addressbook.c:3088 src/importldif.c:514
+#: src/addressbook.c:3102 src/importldif.c:514
 msgid "Address Book"
 msgstr "Адресна книга"
 
-#: src/addressbook.c:3104
+#: src/addressbook.c:3118
 msgid "Person"
 msgstr "Особа"
 
-#: src/addressbook.c:3120
+#: src/addressbook.c:3134
 msgid "EMail Address"
 msgstr "Адреса e-mail"
 
-#: src/addressbook.c:3136
+#: src/addressbook.c:3150
 msgid "Group"
 msgstr "Група"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3152 src/folderview.c:367 src/prefs_account_dialog.c:1694
+#: src/addressbook.c:3166 src/folderview.c:367 src/prefs_account_dialog.c:1694
 #: src/query_search.c:370
 msgid "Folder"
 msgstr "Папка"
 
-#: src/addressbook.c:3168
+#: src/addressbook.c:3182
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3184 src/addressbook.c:3200
+#: src/addressbook.c:3198 src/addressbook.c:3214
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3216
+#: src/addressbook.c:3230
 msgid "LDAP Server"
 msgstr "Сервер LDAP"
 
@@ -1202,7 +1202,7 @@ msgstr "Адреса організації"
 msgid "Personal address"
 msgstr "Особиста адреса"
 
-#: src/alertpanel.c:141 src/compose.c:5485 src/main.c:573
+#: src/alertpanel.c:141 src/compose.c:5494 src/main.c:573
 msgid "Notice"
 msgstr "Примітка"
 
@@ -1253,7 +1253,7 @@ msgstr "Коричневий"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4593
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4750
 msgid "None"
 msgstr "Ніякий"
 
@@ -1311,7 +1311,7 @@ msgstr "/Редагувати/Undo"
 msgid "/_Edit/_Redo"
 msgstr "/Редагувати/Redo"
 
-#: src/compose.c:537 src/compose.c:544 src/mainwindow.c:513
+#: src/compose.c:537 src/compose.c:544 src/mainwindow.c:516
 #: src/messageview.c:147
 msgid "/_Edit/---"
 msgstr "/Редагувати/---"
@@ -1320,7 +1320,7 @@ msgstr "/Редагувати/---"
 msgid "/_Edit/Cu_t"
 msgstr "/Редагувати/Вирізати"
 
-#: src/compose.c:539 src/mainwindow.c:510 src/messageview.c:145
+#: src/compose.c:539 src/mainwindow.c:513 src/messageview.c:145
 msgid "/_Edit/_Copy"
 msgstr "/Редагувати/Копіювати"
 
@@ -1332,7 +1332,7 @@ msgstr "/Редагувати/Вставити"
 msgid "/_Edit/Paste as _quotation"
 msgstr "/Редагувати/Вставити як цитату"
 
-#: src/compose.c:543 src/mainwindow.c:511 src/messageview.c:146
+#: src/compose.c:543 src/mainwindow.c:514 src/messageview.c:146
 msgid "/_Edit/Select _all"
 msgstr "/Редагувати/Виділити все"
 
@@ -1348,8 +1348,8 @@ msgstr "/Редагувати/Згорнути всі довгі рядки"
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/Редагувати/Автозгортання"
 
-#: src/compose.c:550 src/mainwindow.c:518 src/messageview.c:151
-#: src/summaryview.c:448
+#: src/compose.c:550 src/mainwindow.c:521 src/messageview.c:151
+#: src/summaryview.c:450
 msgid "/_View"
 msgstr "/Вигляд"
 
@@ -1370,9 +1370,9 @@ msgid "/_View/_Reply to"
 msgstr "/Вигляд/Зворотня адреса"
 
 #: src/compose.c:555 src/compose.c:557 src/compose.c:559 src/compose.c:561
-#: src/mainwindow.c:538 src/mainwindow.c:541 src/mainwindow.c:568
-#: src/mainwindow.c:592 src/mainwindow.c:687 src/mainwindow.c:691
-#: src/messageview.c:236
+#: src/mainwindow.c:541 src/mainwindow.c:544 src/mainwindow.c:571
+#: src/mainwindow.c:595 src/mainwindow.c:696 src/mainwindow.c:700
+#: src/messageview.c:241
 msgid "/_View/---"
 msgstr "/Вигляд/---"
 
@@ -1388,7 +1388,7 @@ msgstr "/Вигляд/Лінійка"
 msgid "/_View/_Attachment"
 msgstr "/Вигляд/Вкладення"
 
-#: src/compose.c:567 src/mainwindow.c:599 src/messageview.c:158
+#: src/compose.c:567 src/mainwindow.c:602 src/messageview.c:158
 msgid "/_View/Character _encoding"
 msgstr "/Вигляд/Кодова таблиця"
 
@@ -1397,214 +1397,225 @@ msgid "/_View/Character _encoding/_Automatic"
 msgstr "/Вигляд/Кодова таблиця/_Aвтоматична"
 
 #: src/compose.c:570 src/compose.c:576 src/compose.c:582 src/compose.c:586
-#: src/compose.c:592 src/compose.c:596 src/compose.c:602 src/compose.c:606
-#: src/compose.c:616 src/compose.c:620 src/compose.c:628 src/compose.c:632
-#: src/mainwindow.c:595 src/mainwindow.c:602 src/messageview.c:154
+#: src/compose.c:592 src/compose.c:596 src/compose.c:602 src/compose.c:608
+#: src/compose.c:612 src/compose.c:622 src/compose.c:626 src/compose.c:634
+#: src/compose.c:638 src/mainwindow.c:598 src/mainwindow.c:605
+#: src/messageview.c:154
 msgid "/_View/Character _encoding/---"
 msgstr "/Вигляд/Кодова таблиця/---"
 
-#: src/compose.c:572 src/mainwindow.c:603 src/messageview.c:162
+#: src/compose.c:572 src/mainwindow.c:606 src/messageview.c:162
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/Вигляд/Кодова таблиця/7bit ascii (US-ASC_II)"
 
-#: src/compose.c:574 src/mainwindow.c:605 src/messageview.c:165
+#: src/compose.c:574 src/mainwindow.c:608 src/messageview.c:165
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/Вигляд/Кодова таблиця/Unicode (UT_F-8)"
 
-#: src/compose.c:578 src/mainwindow.c:609 src/messageview.c:168
+#: src/compose.c:578 src/mainwindow.c:612 src/messageview.c:168
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/Вигляд/Кодова таблиця/Західноєвропейська (ISO-8859-_1)"
 
-#: src/compose.c:580 src/mainwindow.c:611 src/messageview.c:170
+#: src/compose.c:580 src/mainwindow.c:614 src/messageview.c:170
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/Вигляд/Кодова таблиця/Західноєвропейська (ISO-8859-15)"
 
-#: src/compose.c:584 src/mainwindow.c:617 src/messageview.c:175
+#: src/compose.c:584 src/mainwindow.c:620 src/messageview.c:175
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/Вигляд/Кодова таблиця/Західноєвропейська (ISO-8859-_2)"
 
-#: src/compose.c:588 src/mainwindow.c:621 src/messageview.c:178
+#: src/compose.c:588 src/mainwindow.c:624 src/messageview.c:178
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/Вигляд/Кодова таблиця/Балтійська (ISO-8859-1_3)"
 
-#: src/compose.c:590 src/mainwindow.c:623 src/messageview.c:180
+#: src/compose.c:590 src/mainwindow.c:626 src/messageview.c:180
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/Вигляд/Кодова таблиця/Балтійська (ISO-8859-_4)"
 
-#: src/compose.c:594 src/mainwindow.c:627 src/messageview.c:183
+#: src/compose.c:594 src/mainwindow.c:630 src/messageview.c:183
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/Вигляд/Кодова таблиця/Грецька (ISO-8859-_7)"
 
-#: src/compose.c:598 src/mainwindow.c:631 src/messageview.c:186
+#: src/compose.c:598 src/mainwindow.c:634 src/messageview.c:186
+#, fuzzy
+msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
+msgstr "/Вигляд/Кодова таблиця/Балтійська (ISO-8859-_4)"
+
+#: src/compose.c:600 src/mainwindow.c:636 src/messageview.c:188
+#, fuzzy
+msgid "/_View/Character _encoding/Arabic (Windows-1256)"
+msgstr "/Вигляд/Кодова таблиця/Кирилиця (_Windows-1251)"
+
+#: src/compose.c:604 src/mainwindow.c:640 src/messageview.c:191
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/Вигляд/Кодова таблиця/Єврейська (ISO-8859-_8)"
 
-#: src/compose.c:600 src/mainwindow.c:633 src/messageview.c:188
+#: src/compose.c:606 src/mainwindow.c:642 src/messageview.c:193
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/Вигляд/Кодова таблиця/Єврейська (_Windows-1255)"
 
-#: src/compose.c:604 src/mainwindow.c:637 src/messageview.c:191
+#: src/compose.c:610 src/mainwindow.c:646 src/messageview.c:196
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/Вигляд/Кодова таблиця/Турецька (ISO-8859-_9)"
 
-#: src/compose.c:608 src/mainwindow.c:641 src/messageview.c:194
+#: src/compose.c:614 src/mainwindow.c:650 src/messageview.c:199
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/Вигляд/Кодова таблиця/Кирилиця (ISO-8859-_5)"
 
-#: src/compose.c:610 src/mainwindow.c:643 src/messageview.c:196
+#: src/compose.c:616 src/mainwindow.c:652 src/messageview.c:201
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/Вигляд/Кодова таблиця/Кирилиця (KOI8-_R)"
 
-#: src/compose.c:612 src/mainwindow.c:645 src/messageview.c:198
+#: src/compose.c:618 src/mainwindow.c:654 src/messageview.c:203
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/Вигляд/Кодова таблиця/Кирилиця (KOI8-_U)"
 
-#: src/compose.c:614 src/mainwindow.c:647 src/messageview.c:200
+#: src/compose.c:620 src/mainwindow.c:656 src/messageview.c:205
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/Вигляд/Кодова таблиця/Кирилиця (_Windows-1251)"
 
-#: src/compose.c:618 src/mainwindow.c:651 src/messageview.c:203
+#: src/compose.c:624 src/mainwindow.c:660 src/messageview.c:208
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/Вигляд/Кодова таблиця/Японська (ISO-2022-_JP)"
 
-#: src/compose.c:622 src/mainwindow.c:661 src/messageview.c:212
+#: src/compose.c:628 src/mainwindow.c:670 src/messageview.c:217
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/Вигляд/Кодова таблиця/Спрощена китайська (_GB2312)"
 
-#: src/compose.c:624 src/mainwindow.c:663 src/messageview.c:214
+#: src/compose.c:630 src/mainwindow.c:672 src/messageview.c:219
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/Вигляд/Кодова таблиця/Спрощена китайська (_GBK)"
 
-#: src/compose.c:626 src/mainwindow.c:665 src/messageview.c:216
+#: src/compose.c:632 src/mainwindow.c:674 src/messageview.c:221
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/Вигляд/Кодова таблиця/Традиційна китайська (_Big5)"
 
-#: src/compose.c:630 src/mainwindow.c:673 src/messageview.c:223
+#: src/compose.c:636 src/mainwindow.c:682 src/messageview.c:228
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/Вигляд/Кодова таблиця/Корейська (EUC-_KR)"
 
-#: src/compose.c:634 src/mainwindow.c:679 src/messageview.c:228
+#: src/compose.c:640 src/mainwindow.c:688 src/messageview.c:233
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/Вигляд/Кодова таблиця/Тайська (TIS-620)"
 
-#: src/compose.c:636 src/mainwindow.c:681 src/messageview.c:230
+#: src/compose.c:642 src/mainwindow.c:690 src/messageview.c:235
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/Вигляд/Кодова таблиця/Тайська (Windows-874)"
 
-#: src/compose.c:640 src/mainwindow.c:739 src/messageview.c:260
+#: src/compose.c:646 src/mainwindow.c:750 src/messageview.c:265
 msgid "/_Tools/_Address book"
 msgstr "/Інструменти/Адресна книга"
 
-#: src/compose.c:641
+#: src/compose.c:647
 msgid "/_Tools/_Template"
 msgstr "/Інструменти/Шаблон"
 
-#: src/compose.c:642 src/mainwindow.c:762 src/messageview.c:275
+#: src/compose.c:648 src/mainwindow.c:773 src/messageview.c:280
 msgid "/_Tools/Actio_ns"
 msgstr "/Інструменти/Дії"
 
-#: src/compose.c:643 src/compose.c:647 src/compose.c:653 src/mainwindow.c:742
-#: src/mainwindow.c:756 src/mainwindow.c:761 src/mainwindow.c:763
-#: src/mainwindow.c:766 src/mainwindow.c:768 src/messageview.c:263
-#: src/messageview.c:274
+#: src/compose.c:649 src/compose.c:653 src/compose.c:659 src/mainwindow.c:753
+#: src/mainwindow.c:767 src/mainwindow.c:772 src/mainwindow.c:774
+#: src/mainwindow.c:777 src/mainwindow.c:779 src/messageview.c:268
+#: src/messageview.c:279
 msgid "/_Tools/---"
 msgstr "/Інструменти/---"
 
-#: src/compose.c:644
+#: src/compose.c:650
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/Інструменти/Редагувати зовнішнім редактором"
 
-#: src/compose.c:648
+#: src/compose.c:654
 msgid "/_Tools/PGP Si_gn"
 msgstr "/Інструменти/Підпис PGP"
 
-#: src/compose.c:649
+#: src/compose.c:655
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/Інструменти/Шифрування PGP"
 
-#: src/compose.c:654
+#: src/compose.c:660
 #, fuzzy
 msgid "/_Tools/_Check spell"
 msgstr "/Інструменти/Виконати"
 
-#: src/compose.c:655
+#: src/compose.c:661
 #, fuzzy
 msgid "/_Tools/_Set spell language"
 msgstr "/Інструменти/Шаблон"
 
-#: src/compose.c:899
+#: src/compose.c:908
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: файл не існує\n"
 
-#: src/compose.c:1003 src/compose.c:1074
+#: src/compose.c:1012 src/compose.c:1083
 msgid "Can't get text part\n"
 msgstr "Не вдалось отримати текстову частину\n"
 
-#: src/compose.c:1475
+#: src/compose.c:1484
 msgid "Quote mark format error."
 msgstr "Помилка у форматі цитування."
 
-#: src/compose.c:1487
+#: src/compose.c:1496
 msgid "Message reply/forward format error."
 msgstr "Помилка у форматі message reply/forward."
 
-#: src/compose.c:1907
+#: src/compose.c:1916
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Файл %s не існує\n"
 
-#: src/compose.c:1911
+#: src/compose.c:1920
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Не вдалось отримати розмір %s\n"
 
-#: src/compose.c:1915
+#: src/compose.c:1924
 #, c-format
 msgid "File %s is empty."
 msgstr "Файл %s порожній."
 
-#: src/compose.c:1919
+#: src/compose.c:1928
 #, c-format
 msgid "Can't read %s."
 msgstr "Не вдалось прочитати %s."
 
-#: src/compose.c:1952
+#: src/compose.c:1961
 #, c-format
 msgid "Message: %s"
 msgstr "Лист: %s"
 
-#: src/compose.c:2012 src/mimeview.c:565
+#: src/compose.c:2021 src/mimeview.c:565
 msgid "Can't get the part of multipart message."
 msgstr "Не вдалось отримати одну з частин листа."
 
-#: src/compose.c:2496 src/headerview.c:195 src/query_search.c:636
-#: src/summaryview.c:2107
+#: src/compose.c:2505 src/headerview.c:195 src/query_search.c:636
+#: src/summaryview.c:2124
 msgid "(No Subject)"
 msgstr "(Без теми)"
 
-#: src/compose.c:2499
+#: src/compose.c:2508
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Створити лист%s"
 
-#: src/compose.c:2612
+#: src/compose.c:2621
 msgid "Recipient is not specified."
 msgstr "Не вказано отримувача."
 
-#: src/compose.c:2620
+#: src/compose.c:2629
 msgid "Empty subject"
 msgstr "Порожня тема"
 
-#: src/compose.c:2621
+#: src/compose.c:2630
 msgid "Subject is empty. Send it anyway?"
 msgstr "Поле Subject порожнє. Все ж послати?"
 
-#: src/compose.c:2680
+#: src/compose.c:2689
 msgid "can't get recipient list."
 msgstr "не вдалось отримати список отримувачів."
 
-#: src/compose.c:2700
+#: src/compose.c:2709
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1612,21 +1623,21 @@ msgstr ""
 "Обліковий запис для відсилання пошти не вказано.\n"
 "Оберіть, будь-ласка, запис перед відправкою."
 
-#: src/compose.c:2714 src/send_message.c:299
+#: src/compose.c:2723 src/send_message.c:299
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Трапилась помилка при відсиланні листа до %s ."
 
-#: src/compose.c:2756
+#: src/compose.c:2765
 msgid "Can't save the message to outbox."
 msgstr "Не вдалось зберегти лист в outbox."
 
-#: src/compose.c:2794
+#: src/compose.c:2803
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "Не вдалось знайти ключа, відповідного обраному ідентифікатору `%s'."
 
-#: src/compose.c:2891
+#: src/compose.c:2900
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1637,11 +1648,11 @@ msgstr ""
 "%s на %s.\n"
 "Все ж послати як %s?"
 
-#: src/compose.c:2897
+#: src/compose.c:2906
 msgid "Code conversion error"
 msgstr "Помилка при перетворенні кодування"
 
-#: src/compose.c:2970
+#: src/compose.c:2979
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1654,157 +1665,157 @@ msgstr ""
 "\n"
 "Все ж відіслати?"
 
-#: src/compose.c:2974
+#: src/compose.c:2983
 msgid "Line length limit"
 msgstr "Максимальна довжина рядка"
 
-#: src/compose.c:3264
+#: src/compose.c:3273
 msgid "can't remove the old message\n"
 msgstr "не вдалось видалити старий лист\n"
 
-#: src/compose.c:3282
+#: src/compose.c:3291
 msgid "queueing message...\n"
 msgstr "лист в чергу...\n"
 
-#: src/compose.c:3364
+#: src/compose.c:3373
 msgid "can't find queue folder\n"
 msgstr "не вдалось знайти папку черги\n"
 
-#: src/compose.c:3371
+#: src/compose.c:3380
 msgid "can't queue the message\n"
 msgstr "не вдалось поставити лист в чергу\n"
 
-#: src/compose.c:3964
+#: src/compose.c:3973
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "генерований Message-ID: %s\n"
 
-#: src/compose.c:4077
+#: src/compose.c:4086
 msgid "Creating compose window...\n"
 msgstr "Відкриваємо вікно створення листа...\n"
 
-#: src/compose.c:4128 src/headerview.c:54
+#: src/compose.c:4137 src/headerview.c:54
 msgid "From:"
 msgstr "Від:"
 
-#: src/compose.c:4202
+#: src/compose.c:4211
 msgid "PGP Sign"
 msgstr "Підпис PGP"
 
-#: src/compose.c:4205
+#: src/compose.c:4214
 msgid "PGP Encrypt"
 msgstr "Шифрування PGP"
 
-#: src/compose.c:4243 src/compose.c:5317
+#: src/compose.c:4252 src/compose.c:5326
 msgid "MIME type"
 msgstr "тип MIME"
 
 #. S_COL_DATE
-#: src/compose.c:4252 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4740
+#: src/compose.c:4261 src/mimeview.c:197 src/prefs_filter_edit.c:496
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4897
 msgid "Size"
 msgstr "Розмір"
 
-#: src/compose.c:4683 src/mainwindow.c:2324 src/prefs_account_dialog.c:528
+#: src/compose.c:4692 src/mainwindow.c:2335 src/prefs_account_dialog.c:528
 #: src/prefs_common_dialog.c:661
 msgid "Send"
 msgstr "Послати"
 
-#: src/compose.c:4684
+#: src/compose.c:4693
 msgid "Send message"
 msgstr "Послати лист"
 
-#: src/compose.c:4692
+#: src/compose.c:4701
 msgid "Send later"
 msgstr "Послати пізніше"
 
-#: src/compose.c:4693
+#: src/compose.c:4702
 msgid "Put into queue folder and send later"
 msgstr "Покласти в папку черги і послати пізніше"
 
-#: src/compose.c:4701
+#: src/compose.c:4710
 msgid "Draft"
 msgstr "Чернетка"
 
-#: src/compose.c:4702
+#: src/compose.c:4711
 msgid "Save to draft folder"
 msgstr "Зберегти в папці чернеток"
 
-#: src/compose.c:4712
+#: src/compose.c:4721
 msgid "Insert"
 msgstr "Вставити"
 
-#: src/compose.c:4713
+#: src/compose.c:4722
 msgid "Insert file"
 msgstr "Вставити файл"
 
-#: src/compose.c:4721
+#: src/compose.c:4730
 msgid "Attach"
 msgstr "Приєднати"
 
-#: src/compose.c:4722
+#: src/compose.c:4731
 msgid "Attach file"
 msgstr "Приєднати файл"
 
 #. signature
-#: src/compose.c:4732 src/prefs_account_dialog.c:1208
+#: src/compose.c:4741 src/prefs_account_dialog.c:1208
 #: src/prefs_common_dialog.c:953
 msgid "Signature"
 msgstr "Підпис"
 
-#: src/compose.c:4733
+#: src/compose.c:4742
 #, fuzzy
 msgid "Append signature"
 msgstr "ПОГАНИЙ підпис"
 
 #. editor
-#: src/compose.c:4742 src/prefs_common_dialog.c:991
+#: src/compose.c:4751 src/prefs_common_dialog.c:991
 #: src/prefs_common_dialog.c:2315
 msgid "Editor"
 msgstr "Редактор"
 
-#: src/compose.c:4743
+#: src/compose.c:4752
 msgid "Edit with external editor"
 msgstr "Редагувати зовнішнім редактором"
 
-#: src/compose.c:4751
+#: src/compose.c:4760
 msgid "Linewrap"
 msgstr "Згортання рядків"
 
-#: src/compose.c:4752
+#: src/compose.c:4761
 msgid "Wrap all long lines"
 msgstr "Згорнути всі довгі рядки"
 
-#: src/compose.c:5213
+#: src/compose.c:5222
 msgid "Invalid MIME type."
 msgstr "Неправильний тип MIME."
 
-#: src/compose.c:5231
+#: src/compose.c:5240
 msgid "File doesn't exist or is empty."
 msgstr "Файл не існує або порожній."
 
-#: src/compose.c:5299
+#: src/compose.c:5308
 msgid "Properties"
 msgstr "Властивості"
 
-#: src/compose.c:5319 src/prefs_common_dialog.c:1444
+#: src/compose.c:5328 src/prefs_common_dialog.c:1444
 msgid "Encoding"
 msgstr "Кодування"
 
-#: src/compose.c:5342 src/prefs_folder_item.c:202
+#: src/compose.c:5351 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Шлях"
 
-#: src/compose.c:5343
+#: src/compose.c:5352
 msgid "File name"
 msgstr "Ім'я файлу"
 
-#: src/compose.c:5436
+#: src/compose.c:5445
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Командний рядок зовнішнього редактора неправильний: `%s'\n"
 
-#: src/compose.c:5482
+#: src/compose.c:5491
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1814,44 +1825,44 @@ msgstr ""
 "Примусово обірвати процес?\n"
 "group id процесу: %d"
 
-#: src/compose.c:5857 src/compose.c:5862 src/compose.c:5868
+#: src/compose.c:5866 src/compose.c:5871 src/compose.c:5877
 msgid "Can't queue the message."
 msgstr "Не вдалось поставити лист в чергу."
 
-#: src/compose.c:5959
+#: src/compose.c:5968
 msgid "Select files"
 msgstr "Обрати файли"
 
-#: src/compose.c:5982
+#: src/compose.c:5991
 msgid "Select file"
 msgstr "Обрати файл"
 
-#: src/compose.c:6017
+#: src/compose.c:6026
 msgid "Save message"
 msgstr "Зберегти лист"
 
-#: src/compose.c:6018
+#: src/compose.c:6027
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Цей лист було змінено. Зберегти в папці чернеток?"
 
-#: src/compose.c:6020
+#: src/compose.c:6029
 msgid "Close _without saving"
 msgstr "Закрити без збереження"
 
-#: src/compose.c:6062
+#: src/compose.c:6071
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Чи бажаєте Ви застосувати шаблон `%s' ?"
 
-#: src/compose.c:6064
+#: src/compose.c:6073
 msgid "Apply template"
 msgstr "Застосувати шаблон"
 
-#: src/compose.c:6065
+#: src/compose.c:6074
 msgid "_Replace"
 msgstr "Замінити"
 
-#: src/compose.c:6065
+#: src/compose.c:6074
 msgid "_Insert"
 msgstr "Вставити"
 
@@ -2287,7 +2298,7 @@ msgstr "Нові"
 
 #. S_COL_MARK
 #: src/folderview.c:412 src/prefs_filter_edit.c:500
-#: src/prefs_summary_column.c:71 src/summaryview.c:509
+#: src/prefs_summary_column.c:71 src/summaryview.c:511
 msgid "Unread"
 msgstr "Непрочитані"
 
@@ -2303,12 +2314,12 @@ msgstr "Встановлюємо інформацію папки...\n"
 msgid "Setting folder info..."
 msgstr "Встановлюємо інформацію папки..."
 
-#: src/folderview.c:858 src/mainwindow.c:3464 src/setup.c:80
+#: src/folderview.c:858 src/mainwindow.c:3481 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Перечитуємо папку %s%c%s ..."
 
-#: src/folderview.c:862 src/mainwindow.c:3469 src/setup.c:85
+#: src/folderview.c:862 src/mainwindow.c:3486 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Перечитуємо папку %s ..."
@@ -2333,7 +2344,7 @@ msgstr "Не вдалось перебудувати дерево папок."
 msgid "Checking for new messages in all folders..."
 msgstr "Перевірити за новими листами у всіх папках..."
 
-#: src/folderview.c:1200 src/mainwindow.c:2400 src/prefs_common_dialog.c:1789
+#: src/folderview.c:1200 src/mainwindow.c:2411 src/prefs_common_dialog.c:1789
 msgid "Junk"
 msgstr "Мотлох"
 
@@ -2473,7 +2484,7 @@ msgstr "Тема:"
 msgid "Creating header view...\n"
 msgstr "Створюємо область перегляду заголовка...\n"
 
-#: src/headerview.c:180 src/query_search.c:637 src/summaryview.c:2110
+#: src/headerview.c:180 src/query_search.c:637 src/summaryview.c:2127
 msgid "(No From)"
 msgstr "(Без відправника)"
 
@@ -2582,7 +2593,7 @@ msgstr "Імпортувати файл LDIF в адресну книгу"
 msgid "Prev"
 msgstr "Назад"
 
-#: src/importldif.c:768 src/mainwindow.c:2420
+#: src/importldif.c:768 src/mainwindow.c:2431
 msgid "Next"
 msgstr "Далі"
 
@@ -2933,11 +2944,11 @@ msgstr ""
 msgid "another Sylpheed is already running.\n"
 msgstr "вже запущено інший Sylpheed.\n"
 
-#: src/main.c:1064
+#: src/main.c:1083
 msgid "Migration of configuration"
 msgstr "Перенесення налаштувань"
 
-#: src/main.c:1065
+#: src/main.c:1084
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -2945,633 +2956,638 @@ msgstr ""
 "Знайдено налаштування для попередньої\n"
 "версії. Перенести їх у нову версію?"
 
-#: src/mainwindow.c:478
+#: src/mainwindow.c:481
 msgid "/_File/_Folder"
 msgstr "/Файл/Папка"
 
-#: src/mainwindow.c:479
+#: src/mainwindow.c:482
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/Файл/Папка/Створити нову..."
 
-#: src/mainwindow.c:481
+#: src/mainwindow.c:484
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/Файл/Папка/Перейменувати..."
 
-#: src/mainwindow.c:482
+#: src/mainwindow.c:485
 msgid "/_File/_Folder/_Move folder..."
 msgstr "/Файл/Папка/Перенести..."
 
-#: src/mainwindow.c:483
+#: src/mainwindow.c:486
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/Файл/Папка/Видалити папку"
 
-#: src/mainwindow.c:484
+#: src/mainwindow.c:487
 msgid "/_File/_Mailbox"
 msgstr "/Файл/Скринька"
 
-#: src/mainwindow.c:485
+#: src/mainwindow.c:488
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/Файл/Скринька/Додати скриньку..."
 
-#: src/mainwindow.c:486
+#: src/mainwindow.c:489
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/Файл/Скринька/Видалити скриньку"
 
-#: src/mainwindow.c:487 src/mainwindow.c:492
+#: src/mainwindow.c:490 src/mainwindow.c:495
 msgid "/_File/_Mailbox/---"
 msgstr "/Файл/Скринька/---"
 
-#: src/mainwindow.c:488
+#: src/mainwindow.c:491
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "/Файл/Скринька/Перевірити за новими листами"
 
-#: src/mainwindow.c:490
+#: src/mainwindow.c:493
 msgid "/_File/_Mailbox/Check for new messages in _all mailboxes"
 msgstr "/Файл/Скринька/Перевірити за новими листами у всіх скриньках"
 
-#: src/mainwindow.c:493
+#: src/mainwindow.c:496
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "/Файл/Скринька/Перебудувати дерево папок"
 
-#: src/mainwindow.c:496
+#: src/mainwindow.c:499
 msgid "/_File/_Import mbox file..."
 msgstr "/Файл/Імпортувати файл mbox"
 
-#: src/mainwindow.c:497
+#: src/mainwindow.c:500
 msgid "/_File/_Export to mbox file..."
 msgstr "/Файл/Експортувати в файл mbox..."
 
-#: src/mainwindow.c:499
+#: src/mainwindow.c:502
 msgid "/_File/Empty all _trash"
 msgstr "/Файл/Спорожнити весь кошик"
 
-#: src/mainwindow.c:501 src/messageview.c:139
+#: src/mainwindow.c:504 src/messageview.c:139
 msgid "/_File/_Save as..."
 msgstr "/Файл/Зберегти як..."
 
-#: src/mainwindow.c:502 src/messageview.c:140
+#: src/mainwindow.c:505 src/messageview.c:140
 msgid "/_File/_Print..."
 msgstr "/Файл/Друкувати..."
 
-#: src/mainwindow.c:504
+#: src/mainwindow.c:507
 msgid "/_File/_Work offline"
 msgstr "/Файл/Працювати без з'єднання"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:507
+#: src/mainwindow.c:510
 msgid "/_File/E_xit"
 msgstr "/Файл/Вийти"
 
-#: src/mainwindow.c:512
+#: src/mainwindow.c:515
 msgid "/_Edit/Select _thread"
 msgstr "/Редагувати/Виділити обговорення"
 
-#: src/mainwindow.c:514 src/messageview.c:148
+#: src/mainwindow.c:517 src/messageview.c:148
 msgid "/_Edit/_Find in current message..."
 msgstr "/Редагувати/Шукати в поточному листі"
 
-#: src/mainwindow.c:516
+#: src/mainwindow.c:519
 msgid "/_Edit/_Search messages..."
 msgstr "/Редагувати/Пошук листів..."
 
-#: src/mainwindow.c:519
+#: src/mainwindow.c:522
 msgid "/_View/Show or hi_de"
 msgstr "/Вигляд/Показати чи приховати"
 
-#: src/mainwindow.c:520
+#: src/mainwindow.c:523
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/Вигляд/Показати чи приховати/Дерево папок"
 
-#: src/mainwindow.c:522
+#: src/mainwindow.c:525
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/Вигляд/Показати чи приховати/Зміст листа"
 
-#: src/mainwindow.c:524
+#: src/mainwindow.c:527
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/Вигляд/Показати чи приховати/Панель інструментів"
 
-#: src/mainwindow.c:526
+#: src/mainwindow.c:529
 msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/Вигляд/Показати чи приховати/Панель інструментів/Іконка і текст"
 
-#: src/mainwindow.c:528
+#: src/mainwindow.c:531
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/Вигляд/Показати чи приховати/Панель інструментів/Іконка"
 
-#: src/mainwindow.c:530
+#: src/mainwindow.c:533
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/Вигляд/Показати чи приховати/Панель інструментів/Текст"
 
-#: src/mainwindow.c:532
+#: src/mainwindow.c:535
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/Вигляд/Показати чи приховати/Панель інструментів/Немає"
 
-#: src/mainwindow.c:534
+#: src/mainwindow.c:537
 #, fuzzy
 msgid "/_View/Show or hi_de/_Search bar"
 msgstr "/Вигляд/Показати чи приховати/Панель стану"
 
-#: src/mainwindow.c:536
+#: src/mainwindow.c:539
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/Вигляд/Показати чи приховати/Панель стану"
 
-#: src/mainwindow.c:539
+#: src/mainwindow.c:542
 msgid "/_View/Separate f_older tree"
 msgstr "/Вигляд/Окреме дерево папок"
 
-#: src/mainwindow.c:540
+#: src/mainwindow.c:543
 msgid "/_View/Separate _message view"
 msgstr "/Вигляд/Окрема область перегляду змісту"
 
-#: src/mainwindow.c:542
+#: src/mainwindow.c:545
 msgid "/_View/_Sort"
 msgstr "/Вигляд/Сортувати"
 
-#: src/mainwindow.c:543
+#: src/mainwindow.c:546
 msgid "/_View/_Sort/by _number"
 msgstr "/Вигляд/Сортувати/За номером"
 
-#: src/mainwindow.c:544
+#: src/mainwindow.c:547
 msgid "/_View/_Sort/by s_ize"
 msgstr "/Вигляд/Сортувати/За розміром"
 
-#: src/mainwindow.c:545
+#: src/mainwindow.c:548
 msgid "/_View/_Sort/by _date"
 msgstr "/Вигляд/Сортувати/За датою"
 
-#: src/mainwindow.c:546
+#: src/mainwindow.c:549
 msgid "/_View/_Sort/by t_hread date"
 msgstr "/Вигляд/Сортувати/За датою нитки обговорення"
 
-#: src/mainwindow.c:547
+#: src/mainwindow.c:550
 msgid "/_View/_Sort/by _from"
 msgstr "/Вигляд/Сортувати/За відправником"
 
-#: src/mainwindow.c:548
+#: src/mainwindow.c:551
 msgid "/_View/_Sort/by _recipient"
 msgstr "/Вигляд/Сортувати/За одержувачем"
 
-#: src/mainwindow.c:549
+#: src/mainwindow.c:552
 msgid "/_View/_Sort/by _subject"
 msgstr "/Вигляд/Сортувати/За темою"
 
-#: src/mainwindow.c:550
+#: src/mainwindow.c:553
 msgid "/_View/_Sort/by _color label"
 msgstr "/Вигляд/Сортувати/За виділенням кольором"
 
-#: src/mainwindow.c:552
+#: src/mainwindow.c:555
 msgid "/_View/_Sort/by _mark"
 msgstr "/Вигляд/Сортувати/За позначкою"
 
-#: src/mainwindow.c:553
+#: src/mainwindow.c:556
 msgid "/_View/_Sort/by _unread"
 msgstr "/Вигляд/Сортувати/Окремо непрочитані"
 
-#: src/mainwindow.c:554
+#: src/mainwindow.c:557
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/Вигляд/Сортувати/За вкладенням"
 
-#: src/mainwindow.c:556
+#: src/mainwindow.c:559
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/Вигляд/Сортувати/Непотрібно"
 
-#: src/mainwindow.c:557 src/mainwindow.c:560
+#: src/mainwindow.c:560 src/mainwindow.c:563
 msgid "/_View/_Sort/---"
 msgstr "/Вигляд/Сортувати/---"
 
-#: src/mainwindow.c:558
+#: src/mainwindow.c:561
 msgid "/_View/_Sort/Ascending"
 msgstr "/Вигляд/Сортувати/За зростанням"
 
-#: src/mainwindow.c:559
+#: src/mainwindow.c:562
 msgid "/_View/_Sort/Descending"
 msgstr "/Вигляд/Сортувати/За спаданням"
 
-#: src/mainwindow.c:561
+#: src/mainwindow.c:564
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/Вигляд/Сортувати/Групувати за темою"
 
-#: src/mainwindow.c:563
+#: src/mainwindow.c:566
 msgid "/_View/Th_read view"
 msgstr "/Вигляд/Перегляд обговорення"
 
-#: src/mainwindow.c:564
+#: src/mainwindow.c:567
 msgid "/_View/E_xpand all threads"
 msgstr "/Вигляд/Розгортати всі обговорення"
 
-#: src/mainwindow.c:565
+#: src/mainwindow.c:568
 msgid "/_View/Co_llapse all threads"
 msgstr "/Вигляд/Згорнути всі обговорення"
 
-#: src/mainwindow.c:566
+#: src/mainwindow.c:569
 msgid "/_View/Set display _item..."
 msgstr "/Вигляд/Встановити поля для показу..."
 
-#: src/mainwindow.c:569
+#: src/mainwindow.c:572
 msgid "/_View/_Go to"
 msgstr "/Вигляд/Перейти до"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:573
 msgid "/_View/_Go to/_Prev message"
 msgstr "/Вигляд/Перейти до/Наступного листа"
 
-#: src/mainwindow.c:571
+#: src/mainwindow.c:574
 msgid "/_View/_Go to/_Next message"
 msgstr "/Вигляд/Перейти до/Попереднього листа"
 
-#: src/mainwindow.c:572 src/mainwindow.c:577 src/mainwindow.c:580
-#: src/mainwindow.c:585 src/mainwindow.c:590
+#: src/mainwindow.c:575 src/mainwindow.c:580 src/mainwindow.c:583
+#: src/mainwindow.c:588 src/mainwindow.c:593
 msgid "/_View/_Go to/---"
 msgstr "/Вигляд/Перейти до/---"
 
-#: src/mainwindow.c:573
+#: src/mainwindow.c:576
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/Вигляд/Перейти до/Попереднього непрочитаного листа"
 
-#: src/mainwindow.c:575
+#: src/mainwindow.c:578
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/Вигляд/Перейти до/Наступного непрочитаного листа"
 
-#: src/mainwindow.c:578
+#: src/mainwindow.c:581
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/Вигляд/Перейти до/Попереднього нового листа"
 
-#: src/mainwindow.c:579
+#: src/mainwindow.c:582
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/Вигляд/Перейти до/Наступного нового листа"
 
-#: src/mainwindow.c:581
+#: src/mainwindow.c:584
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/Вигляд/Перейти до/Попереднього позначеного листа"
 
-#: src/mainwindow.c:583
+#: src/mainwindow.c:586
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/Вигляд/Перейти до/Наступного позначеного листа"
 
-#: src/mainwindow.c:586
+#: src/mainwindow.c:589
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/Вигляд/Перейти до/Попереднього листа, виділеного кольором"
 
-#: src/mainwindow.c:588
+#: src/mainwindow.c:591
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/Вигляд/Перейти до/Наступного листа, виділеного кольором"
 
-#: src/mainwindow.c:591
+#: src/mainwindow.c:594
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/Вигляд/Перейти до/Іншої папки"
 
-#: src/mainwindow.c:600 src/messageview.c:159
+#: src/mainwindow.c:603 src/messageview.c:159
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/Вигляд/Кодова таблиця/_Aвтовизначення"
 
-#: src/mainwindow.c:613 src/messageview.c:172
+#: src/mainwindow.c:616 src/messageview.c:172
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr "/Вигляд/Кодова таблиця/Західноєвропейська (ISO-8859-15)"
 
-#: src/mainwindow.c:653 src/messageview.c:205
+#: src/mainwindow.c:662 src/messageview.c:210
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/Вигляд/Кодова таблиця/Японська (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:655 src/messageview.c:207
+#: src/mainwindow.c:664 src/messageview.c:212
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/Вигляд/Кодова таблиця/Японська (_EUC-JP)"
 
-#: src/mainwindow.c:657 src/messageview.c:209
+#: src/mainwindow.c:666 src/messageview.c:214
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/Вигляд/Кодова таблиця/Японська (_Shift__JIS)"
 
-#: src/mainwindow.c:667 src/messageview.c:218
+#: src/mainwindow.c:676 src/messageview.c:223
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/Вигляд/Кодова таблиця/Традиційна китайська (EUC-_TW)"
 
-#: src/mainwindow.c:669 src/messageview.c:220
+#: src/mainwindow.c:678 src/messageview.c:225
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/Вигляд/Кодова таблиця/Китайська (ISO-2022-_CN)"
 
-#: src/mainwindow.c:675 src/messageview.c:225
+#: src/mainwindow.c:684 src/messageview.c:230
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/Вигляд/Кодова таблиця/Корейська (ISO-2022-KR)"
 
-#: src/mainwindow.c:688 src/summaryview.c:449
+#: src/mainwindow.c:697 src/summaryview.c:451
 msgid "/_View/Open in new _window"
 msgstr "/Вигляд/Відкрити в новому вікні"
 
-#: src/mainwindow.c:689 src/messageview.c:237
+#: src/mainwindow.c:698 src/messageview.c:242
 msgid "/_View/Mess_age source"
 msgstr "/Вигляд/Вихідний текст листа"
 
-#: src/mainwindow.c:690 src/messageview.c:238
+#: src/mainwindow.c:699 src/messageview.c:243
 msgid "/_View/Show all _header"
 msgstr "/Вигляд/Показати весь заголовок"
 
-#: src/mainwindow.c:692
+#: src/mainwindow.c:701
 msgid "/_View/_Update summary"
 msgstr "/Вигляд/Оновити список"
 
-#: src/mainwindow.c:694 src/messageview.c:240
+#: src/mainwindow.c:703 src/messageview.c:245
 msgid "/_Message"
 msgstr "/Лист"
 
-#: src/mainwindow.c:695
+#: src/mainwindow.c:704
 msgid "/_Message/Recei_ve"
 msgstr "/Лист/Отримати"
 
-#: src/mainwindow.c:696
+#: src/mainwindow.c:705
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/Лист/Отримати/Для поточного запису"
 
-#: src/mainwindow.c:698
+#: src/mainwindow.c:707
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/Лист/Отримати/Для всіх записів"
 
-#: src/mainwindow.c:700
+#: src/mainwindow.c:709
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/Лист/Отримати/Скасувати отримання"
 
-#: src/mainwindow.c:702
+#: src/mainwindow.c:711
 msgid "/_Message/Recei_ve/---"
 msgstr "/Лист/Отримати/---"
 
-#: src/mainwindow.c:703
+#: src/mainwindow.c:712
 msgid "/_Message/_Send queued messages"
 msgstr "/Лист/Відіслати відкладені листи"
 
-#: src/mainwindow.c:704 src/mainwindow.c:706 src/mainwindow.c:713
-#: src/mainwindow.c:718 src/mainwindow.c:721 src/mainwindow.c:730
-#: src/mainwindow.c:732 src/mainwindow.c:735 src/messageview.c:243
-#: src/messageview.c:251 src/messageview.c:256
+#: src/mainwindow.c:713 src/mainwindow.c:715 src/mainwindow.c:722
+#: src/mainwindow.c:727 src/mainwindow.c:730 src/mainwindow.c:741
+#: src/mainwindow.c:743 src/mainwindow.c:746 src/messageview.c:248
+#: src/messageview.c:256 src/messageview.c:261
 msgid "/_Message/---"
 msgstr "/Лист/---"
 
-#: src/mainwindow.c:705 src/messageview.c:241
+#: src/mainwindow.c:714 src/messageview.c:246
 msgid "/_Message/Compose _new message"
 msgstr "/Лист/Написати новий лист"
 
-#: src/mainwindow.c:707 src/messageview.c:244
+#: src/mainwindow.c:716 src/messageview.c:249
 msgid "/_Message/_Reply"
 msgstr "/Лист/Відповісти"
 
-#: src/mainwindow.c:708
+#: src/mainwindow.c:717
 msgid "/_Message/Repl_y to"
 msgstr "/Лист/Відповісти"
 
-#: src/mainwindow.c:709 src/messageview.c:245
+#: src/mainwindow.c:718 src/messageview.c:250
 msgid "/_Message/Repl_y to/_all"
 msgstr "/Лист/Відповісти/всім"
 
-#: src/mainwindow.c:710 src/messageview.c:247
+#: src/mainwindow.c:719 src/messageview.c:252
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/Лист/Відповісти/відправнику"
 
-#: src/mainwindow.c:711 src/messageview.c:249
+#: src/mainwindow.c:720 src/messageview.c:254
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/Лист/Відповісти/конференції"
 
-#: src/mainwindow.c:714 src/messageview.c:252
+#: src/mainwindow.c:723 src/messageview.c:257
 msgid "/_Message/_Forward"
 msgstr "/Лист/Переслати"
 
-#: src/mainwindow.c:715 src/messageview.c:253
+#: src/mainwindow.c:724 src/messageview.c:258
 msgid "/_Message/For_ward as attachment"
 msgstr "/Лист/Переслати як вкладення"
 
-#: src/mainwindow.c:717 src/messageview.c:255
+#: src/mainwindow.c:726 src/messageview.c:260
 msgid "/_Message/Redirec_t"
 msgstr "/Лист/Переспрямувати"
 
-#: src/mainwindow.c:719
+#: src/mainwindow.c:728
 msgid "/_Message/M_ove..."
 msgstr "/Лист/Перемістити"
 
-#: src/mainwindow.c:720
+#: src/mainwindow.c:729
 msgid "/_Message/_Copy..."
 msgstr "/Лист/Копіювати"
 
-#: src/mainwindow.c:722
+#: src/mainwindow.c:731
 msgid "/_Message/_Mark"
 msgstr "/Лист/Позначка"
 
-#: src/mainwindow.c:723
+#: src/mainwindow.c:732
 msgid "/_Message/_Mark/_Mark"
 msgstr "/Лист/Позначка/Зробити"
 
-#: src/mainwindow.c:724
+#: src/mainwindow.c:733
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/Лист/Позначка/Зняти"
 
-#: src/mainwindow.c:725
+#: src/mainwindow.c:734
 msgid "/_Message/_Mark/---"
 msgstr "/Лист/Позначка/---"
 
-#: src/mainwindow.c:726
+#: src/mainwindow.c:735
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/Лист/Позначка/Позначити як непрочитаний"
 
-#: src/mainwindow.c:727
+#: src/mainwindow.c:736
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/Лист/Позначка/Позначити як прочитаний"
 
-#: src/mainwindow.c:729
+#: src/mainwindow.c:738
+#, fuzzy
+msgid "/_Message/_Mark/Mark _thread as read"
+msgstr "/Лист/Позначка/Позначити як прочитаний"
+
+#: src/mainwindow.c:740
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/Лист/Позначка/Позначити всі як прочитані"
 
-#: src/mainwindow.c:731
+#: src/mainwindow.c:742
 msgid "/_Message/_Delete"
 msgstr "/Лист/Видалити"
 
-#: src/mainwindow.c:733
+#: src/mainwindow.c:744
 msgid "/_Message/Set as _junk mail"
 msgstr "/Лист/Вважати мотлохом"
 
-#: src/mainwindow.c:734
+#: src/mainwindow.c:745
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/Лист/Не вважати мотлохом"
 
-#: src/mainwindow.c:736 src/messageview.c:257
+#: src/mainwindow.c:747 src/messageview.c:262
 msgid "/_Message/Re-_edit"
 msgstr "/Лист/Змінити"
 
-#: src/mainwindow.c:740
+#: src/mainwindow.c:751
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/Інструменти/Додати відправника до адресної книги"
 
-#: src/mainwindow.c:743
+#: src/mainwindow.c:754
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/Інструменти/Фільтрувати всі листи в папці"
 
-#: src/mainwindow.c:745
+#: src/mainwindow.c:756
 msgid "/_Tools/Filter _selected messages"
 msgstr "/Інструменти/Фільтрувати виділені листи"
 
-#: src/mainwindow.c:747 src/messageview.c:264
+#: src/mainwindow.c:758 src/messageview.c:269
 msgid "/_Tools/_Create filter rule"
 msgstr "/Інструменти/Створити правило фільтрування"
 
-#: src/mainwindow.c:748 src/messageview.c:266
+#: src/mainwindow.c:759 src/messageview.c:271
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/Інструменти/Створити правило фільтрування/Автоматично"
 
-#: src/mainwindow.c:750 src/messageview.c:268
+#: src/mainwindow.c:761 src/messageview.c:273
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/Інструменти/Створити правило фільтрування/За полем `Від'"
 
-#: src/mainwindow.c:752 src/messageview.c:270
+#: src/mainwindow.c:763 src/messageview.c:275
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/Інструменти/Створити правило фільтрування/За полем `Кому'"
 
-#: src/mainwindow.c:754 src/messageview.c:272
+#: src/mainwindow.c:765 src/messageview.c:277
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/Інструменти/Створити правило фільтрування/За полем `Тема'"
 
-#: src/mainwindow.c:757
+#: src/mainwindow.c:768
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/Інструменти/Фільтрувати мотлох в папці"
 
-#: src/mainwindow.c:759
+#: src/mainwindow.c:770
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/Інструменти/Фільтрувати мотлох у виділених листах"
 
-#: src/mainwindow.c:764
+#: src/mainwindow.c:775
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/Інструменти/Видалити повторювані листи"
 
-#: src/mainwindow.c:767
+#: src/mainwindow.c:778
 msgid "/_Tools/E_xecute"
 msgstr "/Інструменти/Виконати"
 
-#: src/mainwindow.c:769
+#: src/mainwindow.c:780
 msgid "/_Tools/_Log window"
 msgstr "/Інструменти/Вікно журналу"
 
-#: src/mainwindow.c:771
+#: src/mainwindow.c:782
 msgid "/_Configuration"
 msgstr "/Конфігурація"
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:783
 msgid "/_Configuration/_Common preferences..."
 msgstr "/Конфігурація/Спільні налаштування..."
 
-#: src/mainwindow.c:774
+#: src/mainwindow.c:785
 msgid "/_Configuration/_Filter setting..."
 msgstr "/Конфігурація/Налаштування фільтра..."
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:787
 msgid "/_Configuration/_Template..."
 msgstr "/Конфігурація/Шаблон..."
 
-#: src/mainwindow.c:777
+#: src/mainwindow.c:788
 msgid "/_Configuration/_Actions..."
 msgstr "/Конфігурація/Дії..."
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:789
 msgid "/_Configuration/---"
 msgstr "/Конфігурація/---"
 
-#: src/mainwindow.c:779
+#: src/mainwindow.c:790
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/Конфігурація/Налаштування поточного запису..."
 
-#: src/mainwindow.c:781
+#: src/mainwindow.c:792
 msgid "/_Configuration/Create _new account..."
 msgstr "/Конфігурація/Створити новий обліковий запис..."
 
-#: src/mainwindow.c:783
+#: src/mainwindow.c:794
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/Конфігурація/Редагувати облікові записи..."
 
-#: src/mainwindow.c:785
+#: src/mainwindow.c:796
 msgid "/_Configuration/C_hange current account"
 msgstr "/Конфігурація/Змінити поточний запис"
 
-#: src/mainwindow.c:789
+#: src/mainwindow.c:800
 msgid "/_Help/_Manual"
 msgstr "/Довідка/Посібник"
 
-#: src/mainwindow.c:790
+#: src/mainwindow.c:801
 msgid "/_Help/_Manual/_English"
 msgstr "/Довідка/Посібник/Англійський"
 
-#: src/mainwindow.c:791
+#: src/mainwindow.c:802
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/Довідка/Посібник/Японський"
 
-#: src/mainwindow.c:792
+#: src/mainwindow.c:803
 msgid "/_Help/_FAQ"
 msgstr "/Довідка/FAQ"
 
-#: src/mainwindow.c:793
+#: src/mainwindow.c:804
 msgid "/_Help/_FAQ/_English"
 msgstr "/Довідка/FAQ/Англійський"
 
-#: src/mainwindow.c:794
+#: src/mainwindow.c:805
 msgid "/_Help/_FAQ/_German"
 msgstr "/Довідка/FAQ/Німецький"
 
-#: src/mainwindow.c:795
+#: src/mainwindow.c:806
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/Довідка/FAQ/Іспанський"
 
-#: src/mainwindow.c:796
+#: src/mainwindow.c:807
 msgid "/_Help/_FAQ/_French"
 msgstr "/Довідка/FAQ/Французький"
 
-#: src/mainwindow.c:797
+#: src/mainwindow.c:808
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/Довідка/FAQ/Італійський"
 
-#: src/mainwindow.c:798
+#: src/mainwindow.c:809
 msgid "/_Help/---"
 msgstr "/Довідка/---"
 
-#: src/mainwindow.c:841
+#: src/mainwindow.c:852
 msgid "Creating main window...\n"
 msgstr "Створюємо головне вікно...\n"
 
-#: src/mainwindow.c:1011
+#: src/mainwindow.c:1022
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Головне Вікно: невдача розміщення кольору %d\n"
 
-#: src/mainwindow.c:1108 src/summaryview.c:2258 src/summaryview.c:2343
-#: src/summaryview.c:3739 src/summaryview.c:3868 src/summaryview.c:4226
+#: src/mainwindow.c:1119 src/summaryview.c:2275 src/summaryview.c:2360
+#: src/summaryview.c:3896 src/summaryview.c:4025 src/summaryview.c:4383
 msgid "done.\n"
 msgstr "виконано.\n"
 
-#: src/mainwindow.c:1235 src/mainwindow.c:1276 src/mainwindow.c:1301
+#: src/mainwindow.c:1246 src/mainwindow.c:1287 src/mainwindow.c:1312
 msgid "Untitled"
 msgstr "БезНазви"
 
-#: src/mainwindow.c:1302
+#: src/mainwindow.c:1313
 msgid "none"
 msgstr "немає"
 
-#: src/mainwindow.c:1355
+#: src/mainwindow.c:1366
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "Зміна типу розділення вікна з %d на %d\n"
 
-#: src/mainwindow.c:1605
+#: src/mainwindow.c:1616
 msgid "Offline"
 msgstr "Без з'єднання"
 
-#: src/mainwindow.c:1606
+#: src/mainwindow.c:1617
 msgid "You are offline. Go online?"
 msgstr "З'єднання немає. Під'єднатись?"
 
-#: src/mainwindow.c:1623
+#: src/mainwindow.c:1634
 msgid "Empty all trash"
 msgstr "Спорожнити весь кошик"
 
-#: src/mainwindow.c:1624
+#: src/mainwindow.c:1635
 msgid "Delete all messages in trash folders?"
 msgstr "Видалити всі листи з усіх папок кошика?"
 
-#: src/mainwindow.c:1652
+#: src/mainwindow.c:1663
 msgid "Add mailbox"
 msgstr "Додати скриньку"
 
-#: src/mainwindow.c:1653
+#: src/mainwindow.c:1664
 msgid ""
 "Specify the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3581,16 +3597,16 @@ msgstr ""
 "Якщо вона вже існує, її буде перечитано\n"
 "автоматично."
 
-#: src/mainwindow.c:1659 src/setup.c:49
+#: src/mainwindow.c:1670 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Скринька `%s' вже існує."
 
-#: src/mainwindow.c:1664 src/setup.c:56
+#: src/mainwindow.c:1675 src/setup.c:56
 msgid "Mailbox"
 msgstr "Скринька"
 
-#: src/mainwindow.c:1670 src/setup.c:62
+#: src/mainwindow.c:1681 src/setup.c:62
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3600,145 +3616,145 @@ msgstr ""
 "Можливо, деякі файли вже існують, або Ви не маєте\n"
 "права запису тут."
 
-#: src/mainwindow.c:2088
+#: src/mainwindow.c:2099
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Папки"
 
-#: src/mainwindow.c:2107
+#: src/mainwindow.c:2118
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Листи"
 
-#: src/mainwindow.c:2259 src/summaryview.c:408
+#: src/mainwindow.c:2270 src/summaryview.c:408
 msgid "/_Reply"
 msgstr "/Відповісти"
 
-#: src/mainwindow.c:2260
+#: src/mainwindow.c:2271
 msgid "/Reply to _all"
 msgstr "/Відповісти всім"
 
-#: src/mainwindow.c:2261
+#: src/mainwindow.c:2272
 msgid "/Reply to _sender"
 msgstr "/Відповісти відправникові"
 
-#: src/mainwindow.c:2262
+#: src/mainwindow.c:2273
 msgid "/Reply to mailing _list"
 msgstr "/Відповісти конференції"
 
-#: src/mainwindow.c:2267 src/summaryview.c:415
+#: src/mainwindow.c:2278 src/summaryview.c:415
 msgid "/_Forward"
 msgstr "/Переслати далі"
 
-#: src/mainwindow.c:2268 src/summaryview.c:416
+#: src/mainwindow.c:2279 src/summaryview.c:416
 msgid "/For_ward as attachment"
 msgstr "/Переслати далі як вкладення"
 
-#: src/mainwindow.c:2269 src/summaryview.c:417
+#: src/mainwindow.c:2280 src/summaryview.c:417
 msgid "/Redirec_t"
 msgstr "/Переспрямувати"
 
-#: src/mainwindow.c:2305
+#: src/mainwindow.c:2316
 msgid "Get"
 msgstr "Отримати"
 
-#: src/mainwindow.c:2306
+#: src/mainwindow.c:2317
 msgid "Incorporate new mail"
 msgstr "Отримати нові листи"
 
-#: src/mainwindow.c:2313
+#: src/mainwindow.c:2324
 msgid "Get all"
 msgstr "Отримати всі"
 
-#: src/mainwindow.c:2314
+#: src/mainwindow.c:2325
 msgid "Incorporate new mail of all accounts"
 msgstr "Отримати нові листи для всіх записів"
 
-#: src/mainwindow.c:2325
+#: src/mainwindow.c:2336
 msgid "Send queued message(s)"
 msgstr "Відіслати лист(и) з черги"
 
-#: src/mainwindow.c:2335 src/prefs_account_dialog.c:530
+#: src/mainwindow.c:2346 src/prefs_account_dialog.c:530
 #: src/prefs_common_dialog.c:663 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "Створення листа"
 
-#: src/mainwindow.c:2336
+#: src/mainwindow.c:2347
 msgid "Compose new message"
 msgstr "Новий лист"
 
-#: src/mainwindow.c:2344 src/prefs_common_dialog.c:975
+#: src/mainwindow.c:2355 src/prefs_common_dialog.c:975
 msgid "Reply"
 msgstr "Відповісти"
 
-#: src/mainwindow.c:2345 src/mainwindow.c:2358
+#: src/mainwindow.c:2356 src/mainwindow.c:2369
 msgid "Reply to the message"
 msgstr "Відповісти на лист"
 
-#: src/mainwindow.c:2362
+#: src/mainwindow.c:2373
 msgid "Reply all"
 msgstr "Відповісти всім"
 
-#: src/mainwindow.c:2363
+#: src/mainwindow.c:2374
 msgid "Reply to all"
 msgstr "Відповісти всім"
 
-#: src/mainwindow.c:2371 src/prefs_filter_edit.c:672
+#: src/mainwindow.c:2382 src/prefs_filter_edit.c:672
 msgid "Forward"
 msgstr "Переслати"
 
-#: src/mainwindow.c:2372 src/mainwindow.c:2385
+#: src/mainwindow.c:2383 src/mainwindow.c:2396
 msgid "Forward the message"
 msgstr "Переслати лист"
 
-#: src/mainwindow.c:2392
+#: src/mainwindow.c:2403
 msgid "Delete the message"
 msgstr "Видалити лист"
 
-#: src/mainwindow.c:2401
+#: src/mainwindow.c:2412
 msgid "Set as junk mail"
 msgstr "Вважати мотлохом"
 
-#: src/mainwindow.c:2410
+#: src/mainwindow.c:2421
 msgid "Execute"
 msgstr "Виконати"
 
-#: src/mainwindow.c:2411
+#: src/mainwindow.c:2422
 msgid "Execute marked process"
 msgstr "Виконати позначений процес"
 
-#: src/mainwindow.c:2421
+#: src/mainwindow.c:2432
 msgid "Next unread message"
 msgstr "Наступний непрочитаний лист"
 
-#: src/mainwindow.c:2433
+#: src/mainwindow.c:2444
 msgid "Prefs"
 msgstr "Налаштування"
 
-#: src/mainwindow.c:2434
+#: src/mainwindow.c:2445
 msgid "Common preferences"
 msgstr "Спільні налаштування"
 
-#: src/mainwindow.c:2442 src/prefs_folder_item.c:289
+#: src/mainwindow.c:2453 src/prefs_folder_item.c:289
 #: src/prefs_folder_item.c:300 src/progressdialog.c:128
 msgid "Account"
 msgstr "Обліковий запис"
 
-#: src/mainwindow.c:2443
+#: src/mainwindow.c:2454
 msgid "Account setting"
 msgstr "Налаштування запису"
 
-#: src/mainwindow.c:2615
+#: src/mainwindow.c:2626
 msgid "You are offline. Click the icon to go online."
 msgstr "З'єднання немає. Клацніть на іконці, щоб під'єднатись."
 
-#: src/mainwindow.c:2626
+#: src/mainwindow.c:2637
 msgid "You are online. Click the icon to go offline."
 msgstr "Ви під'єднані. Клацніть на іконці, щоб від'єднатись."
 
-#: src/mainwindow.c:2892
+#: src/mainwindow.c:2903
 msgid "Exit"
 msgstr "Вихід"
 
-#: src/mainwindow.c:2892
+#: src/mainwindow.c:2903
 msgid "Exit this program?"
 msgstr "Вийти з цієї програми?"
 
@@ -3775,45 +3791,45 @@ msgstr "Досягнуто кінця листа; продовжити з поч
 msgid "Search finished"
 msgstr "Пошук закінчено"
 
-#: src/messageview.c:261
+#: src/messageview.c:266
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/Інструменти/Додати відправника до адресної книги"
 
-#: src/messageview.c:291
+#: src/messageview.c:296
 msgid "Creating message view...\n"
 msgstr "Створюємо область перегляду листа...\n"
 
-#: src/messageview.c:316
+#: src/messageview.c:321
 msgid "Text"
 msgstr "Текст"
 
-#: src/messageview.c:321
+#: src/messageview.c:326
 msgid "Attachments"
 msgstr "Вкладення"
 
-#: src/messageview.c:371
+#: src/messageview.c:376
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:669 src/summaryview.c:3268
+#: src/messageview.c:674 src/summaryview.c:3425
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Не вдалось зберегти файл `%s'."
 
-#: src/messageview.c:728 src/summaryview.c:3291
+#: src/messageview.c:733 src/summaryview.c:3448
 msgid "The message will be printed with the following command:"
 msgstr ""
 
-#: src/messageview.c:729 src/summaryview.c:3292
+#: src/messageview.c:734 src/summaryview.c:3449
 #, fuzzy
 msgid "(Default print command)"
 msgstr "Вивчення команди:"
 
-#: src/messageview.c:731 src/prefs_common_dialog.c:2304 src/summaryview.c:3294
+#: src/messageview.c:736 src/prefs_common_dialog.c:2304 src/summaryview.c:3451
 msgid "Print"
 msgstr "Друк"
 
-#: src/messageview.c:740 src/summaryview.c:3303
+#: src/messageview.c:745 src/summaryview.c:3460
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -4708,8 +4724,8 @@ msgstr "Показувати отримувача в колонці `Від', я
 msgid "Expand threads"
 msgstr "Розгортати обговорення"
 
-#: src/prefs_common_dialog.c:1413 src/prefs_common_dialog.c:2713
-#: src/prefs_common_dialog.c:2751
+#: src/prefs_common_dialog.c:1413 src/prefs_common_dialog.c:2716
+#: src/prefs_common_dialog.c:2754
 msgid "Date format"
 msgstr "Формат дати"
 
@@ -4994,8 +5010,8 @@ msgstr "Зовнішні команди (%s буде замінено на ім'
 msgid "Web browser"
 msgstr "Web-браузер"
 
-#: src/prefs_common_dialog.c:2288 src/prefs_common_dialog.c:3775
-#: src/prefs_common_dialog.c:3796
+#: src/prefs_common_dialog.c:2288 src/prefs_common_dialog.c:3778
+#: src/prefs_common_dialog.c:3799
 msgid "(Default browser)"
 msgstr "(Браузер за замовчуванням)"
 
@@ -5070,214 +5086,224 @@ msgid "Greek (ISO-8859-7)"
 msgstr "Грецька (ISO-8859-7)"
 
 #: src/prefs_common_dialog.c:2495
+#, fuzzy
+msgid "Arabic (ISO-8859-6)"
+msgstr "Балтійська (ISO-8859-4)"
+
+#: src/prefs_common_dialog.c:2496
+#, fuzzy
+msgid "Arabic (Windows-1256)"
+msgstr "Кирилиця (Windows-1251)"
+
+#: src/prefs_common_dialog.c:2498
 msgid "Hebrew (ISO-8859-8)"
 msgstr "Єврейська (ISO-8859-8)"
 
-#: src/prefs_common_dialog.c:2496
+#: src/prefs_common_dialog.c:2499
 msgid "Hebrew (Windows-1255)"
 msgstr "Єврейська (Windows-1255)"
 
-#: src/prefs_common_dialog.c:2498
+#: src/prefs_common_dialog.c:2501
 msgid "Turkish (ISO-8859-9)"
 msgstr "Турецька (ISO-8859-9)"
 
-#: src/prefs_common_dialog.c:2500
+#: src/prefs_common_dialog.c:2503
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Кирилиця (ISO-8859-5)"
 
-#: src/prefs_common_dialog.c:2501
+#: src/prefs_common_dialog.c:2504
 msgid "Cyrillic (KOI8-R)"
 msgstr "Кирилиця (KOI8-R)"
 
-#: src/prefs_common_dialog.c:2502
+#: src/prefs_common_dialog.c:2505
 msgid "Cyrillic (KOI8-U)"
 msgstr "Кирилиця (KOI8-U)"
 
-#: src/prefs_common_dialog.c:2503
+#: src/prefs_common_dialog.c:2506
 msgid "Cyrillic (Windows-1251)"
 msgstr "Кирилиця (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2505
+#: src/prefs_common_dialog.c:2508
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Японська (ISO-2022-JP)"
 
-#: src/prefs_common_dialog.c:2507
+#: src/prefs_common_dialog.c:2510
 msgid "Japanese (EUC-JP)"
 msgstr "Японська (EUC-JP)"
 
-#: src/prefs_common_dialog.c:2508
+#: src/prefs_common_dialog.c:2511
 msgid "Japanese (Shift_JIS)"
 msgstr "Японська (Shift_JIS)"
 
-#: src/prefs_common_dialog.c:2511
+#: src/prefs_common_dialog.c:2514
 msgid "Simplified Chinese (GB2312)"
 msgstr "Спрощена китайська (GB2312)"
 
-#: src/prefs_common_dialog.c:2512
+#: src/prefs_common_dialog.c:2515
 msgid "Simplified Chinese (GBK)"
 msgstr "Спрощена китайська (GBK)"
 
-#: src/prefs_common_dialog.c:2513
+#: src/prefs_common_dialog.c:2516
 msgid "Traditional Chinese (Big5)"
 msgstr "Традиційна китайська (Big5)"
 
-#: src/prefs_common_dialog.c:2515
+#: src/prefs_common_dialog.c:2518
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Традиційна китайська (EUC-TW)"
 
-#: src/prefs_common_dialog.c:2516
+#: src/prefs_common_dialog.c:2519
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Китайська (ISO-2022-CN)"
 
-#: src/prefs_common_dialog.c:2519
+#: src/prefs_common_dialog.c:2522
 msgid "Korean (EUC-KR)"
 msgstr "Корейська (EUC-KR)"
 
-#: src/prefs_common_dialog.c:2521
+#: src/prefs_common_dialog.c:2524
 msgid "Thai (TIS-620)"
 msgstr "Тайська (TIS-620)"
 
-#: src/prefs_common_dialog.c:2522
+#: src/prefs_common_dialog.c:2525
 msgid "Thai (Windows-874)"
 msgstr "Тайська (Windows-874)"
 
-#: src/prefs_common_dialog.c:2689
+#: src/prefs_common_dialog.c:2692
 msgid "the full abbreviated weekday name"
 msgstr "повна скорочена назва дня тижня"
 
-#: src/prefs_common_dialog.c:2690
+#: src/prefs_common_dialog.c:2693
 msgid "the full weekday name"
 msgstr "повна назва дня тижня"
 
-#: src/prefs_common_dialog.c:2691
+#: src/prefs_common_dialog.c:2694
 msgid "the abbreviated month name"
 msgstr "скорочена назва місяця"
 
-#: src/prefs_common_dialog.c:2692
+#: src/prefs_common_dialog.c:2695
 msgid "the full month name"
 msgstr "повна назва місяця"
 
-#: src/prefs_common_dialog.c:2693
+#: src/prefs_common_dialog.c:2696
 msgid "the preferred date and time for the current locale"
 msgstr "бажана дата і час для поточної locale"
 
-#: src/prefs_common_dialog.c:2694
+#: src/prefs_common_dialog.c:2697
 msgid "the century number (year/100)"
 msgstr "номер сторіччя (рік/100)"
 
-#: src/prefs_common_dialog.c:2695
+#: src/prefs_common_dialog.c:2698
 msgid "the day of the month as a decimal number"
 msgstr "день місяця як десяткове число"
 
-#: src/prefs_common_dialog.c:2696
+#: src/prefs_common_dialog.c:2699
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "година як десяткове число за 24-годинним циферблатом"
 
-#: src/prefs_common_dialog.c:2697
+#: src/prefs_common_dialog.c:2700
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "година як десяткове число за 12-годинним циферблатом"
 
-#: src/prefs_common_dialog.c:2698
+#: src/prefs_common_dialog.c:2701
 msgid "the day of the year as a decimal number"
 msgstr "день року як десяткове число"
 
-#: src/prefs_common_dialog.c:2699
+#: src/prefs_common_dialog.c:2702
 msgid "the month as a decimal number"
 msgstr "місяць як десяткове число"
 
-#: src/prefs_common_dialog.c:2700
+#: src/prefs_common_dialog.c:2703
 msgid "the minute as a decimal number"
 msgstr "хвилини як десяткове число"
 
-#: src/prefs_common_dialog.c:2701
+#: src/prefs_common_dialog.c:2704
 msgid "either AM or PM"
 msgstr "AM чи PM"
 
-#: src/prefs_common_dialog.c:2702
+#: src/prefs_common_dialog.c:2705
 msgid "the second as a decimal number"
 msgstr "секунди як десяткове число"
 
-#: src/prefs_common_dialog.c:2703
+#: src/prefs_common_dialog.c:2706
 msgid "the day of the week as a decimal number"
 msgstr "день тижня як десяткове число"
 
-#: src/prefs_common_dialog.c:2704
+#: src/prefs_common_dialog.c:2707
 msgid "the preferred date for the current locale"
 msgstr "бажана дата для поточної locale"
 
-#: src/prefs_common_dialog.c:2705
+#: src/prefs_common_dialog.c:2708
 msgid "the last two digits of a year"
 msgstr "останні дві цифри року"
 
-#: src/prefs_common_dialog.c:2706
+#: src/prefs_common_dialog.c:2709
 msgid "the year as a decimal number"
 msgstr "рік як десяткове число"
 
-#: src/prefs_common_dialog.c:2707
+#: src/prefs_common_dialog.c:2710
 msgid "the time zone or name or abbreviation"
 msgstr "часова зона або ім'я або скорочення"
 
-#: src/prefs_common_dialog.c:2728
+#: src/prefs_common_dialog.c:2731
 msgid "Specifier"
 msgstr "Специфікатор"
 
-#: src/prefs_common_dialog.c:2729
+#: src/prefs_common_dialog.c:2732
 msgid "Description"
 msgstr "Опис"
 
-#: src/prefs_common_dialog.c:2769
+#: src/prefs_common_dialog.c:2772
 msgid "Example"
 msgstr "Приклад"
 
-#: src/prefs_common_dialog.c:2850
+#: src/prefs_common_dialog.c:2853
 msgid "Set message colors"
 msgstr "Встановити кольори листа"
 
-#: src/prefs_common_dialog.c:2858
+#: src/prefs_common_dialog.c:2861
 msgid "Colors"
 msgstr "Кольори"
 
-#: src/prefs_common_dialog.c:2892
+#: src/prefs_common_dialog.c:2895
 msgid "Quoted Text - First Level"
 msgstr "Цитований текст - перший рівень"
 
-#: src/prefs_common_dialog.c:2898
+#: src/prefs_common_dialog.c:2901
 msgid "Quoted Text - Second Level"
 msgstr "Цитований текст - другий рівень"
 
-#: src/prefs_common_dialog.c:2904
+#: src/prefs_common_dialog.c:2907
 msgid "Quoted Text - Third Level"
 msgstr "Цитований текст - третій рівень"
 
-#: src/prefs_common_dialog.c:2910
+#: src/prefs_common_dialog.c:2913
 msgid "URI link"
 msgstr "URI link"
 
-#: src/prefs_common_dialog.c:2917
+#: src/prefs_common_dialog.c:2920
 msgid "Recycle quote colors"
 msgstr "Повторно використати кольори цитування"
 
-#: src/prefs_common_dialog.c:2984
+#: src/prefs_common_dialog.c:2987
 msgid "Pick color for quotation level 1"
 msgstr "Обрати колір для цитування рівня 1"
 
-#: src/prefs_common_dialog.c:2987
+#: src/prefs_common_dialog.c:2990
 msgid "Pick color for quotation level 2"
 msgstr "Обрати колір для цитування рівня 2"
 
-#: src/prefs_common_dialog.c:2990
+#: src/prefs_common_dialog.c:2993
 msgid "Pick color for quotation level 3"
 msgstr "Обрати колір для цитування рівня 3"
 
-#: src/prefs_common_dialog.c:2993
+#: src/prefs_common_dialog.c:2996
 msgid "Pick color for URI"
 msgstr "Обрати колір для URI"
 
-#: src/prefs_common_dialog.c:3133
+#: src/prefs_common_dialog.c:3136
 msgid "Description of symbols"
 msgstr "Опис символів"
 
-#: src/prefs_common_dialog.c:3189
+#: src/prefs_common_dialog.c:3192
 msgid ""
 "Date\n"
 "From\n"
@@ -5301,11 +5327,11 @@ msgstr ""
 "Newsgroups\n"
 "Message-ID"
 
-#: src/prefs_common_dialog.c:3202
+#: src/prefs_common_dialog.c:3205
 msgid "If x is set, displays expr"
 msgstr "якщо встановлено x, показує expr"
 
-#: src/prefs_common_dialog.c:3206
+#: src/prefs_common_dialog.c:3209
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -5319,7 +5345,7 @@ msgstr ""
 "Тіло цитованого повідомлення без підпису\n"
 "Буквально %"
 
-#: src/prefs_common_dialog.c:3214
+#: src/prefs_common_dialog.c:3217
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -5331,19 +5357,19 @@ msgstr ""
 "Буквальна відкриваюча фігурна дужка\n"
 "Буквальна закриваюча фігурна дужка"
 
-#: src/prefs_common_dialog.c:3260
+#: src/prefs_common_dialog.c:3263
 msgid "Key bindings"
 msgstr "Гарячі клавіші"
 
-#: src/prefs_common_dialog.c:3273
+#: src/prefs_common_dialog.c:3276
 msgid "Select the preset of key bindings."
 msgstr " Обрати попередньо означені гарячі клавіші."
 
-#: src/prefs_common_dialog.c:3283 src/prefs_common_dialog.c:3607
+#: src/prefs_common_dialog.c:3286 src/prefs_common_dialog.c:3610
 msgid "Default"
 msgstr "По замовчуванню"
 
-#: src/prefs_common_dialog.c:3286 src/prefs_common_dialog.c:3616
+#: src/prefs_common_dialog.c:3289 src/prefs_common_dialog.c:3619
 msgid "Old Sylpheed"
 msgstr "Старий Sylpheed"
 
@@ -5464,7 +5490,7 @@ msgstr "Результат команди"
 msgid "Age"
 msgstr "Давність"
 
-#: src/prefs_filter_edit.c:501 src/summaryview.c:510
+#: src/prefs_filter_edit.c:501 src/summaryview.c:512
 #, fuzzy
 msgid "Marked"
 msgstr "Позначка"
@@ -5694,17 +5720,17 @@ msgid "Attachment"
 msgstr "Вкладення"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73 src/query_search.c:371 src/summaryview.c:4733
+#: src/prefs_summary_column.c:73 src/query_search.c:371 src/summaryview.c:4890
 msgid "Subject"
 msgstr "Тема"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/query_search.c:372 src/summaryview.c:4736
+#: src/prefs_summary_column.c:74 src/query_search.c:372 src/summaryview.c:4893
 msgid "From"
 msgstr "Від"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/query_search.c:373 src/summaryview.c:4738
+#: src/prefs_summary_column.c:75 src/query_search.c:373 src/summaryview.c:4895
 msgid "Date"
 msgstr "Дата"
 
@@ -5806,7 +5832,7 @@ msgstr "Шукати повідомлення"
 msgid "_Save as search folder"
 msgstr "Зберегти в папці чернеток"
 
-#: src/query_search.c:512 src/subscribedialog.c:523 src/summaryview.c:840
+#: src/query_search.c:512 src/subscribedialog.c:523 src/summaryview.c:842
 msgid "Done."
 msgstr "Виконано."
 
@@ -5820,7 +5846,7 @@ msgstr "Перечитуємо папку %s ..."
 msgid "Searching %s (%d / %d)..."
 msgstr "Фільтрування..."
 
-#: src/query_search.c:645 src/summaryview.c:2048
+#: src/query_search.c:645 src/summaryview.c:2051
 msgid "(No Date)"
 msgstr "(Без дати)"
 
@@ -6192,301 +6218,306 @@ msgid "/_Mark/Mark as rea_d"
 msgstr "/Позначити/Позначити як прочитане"
 
 #: src/summaryview.c:429
+#, fuzzy
+msgid "/_Mark/Mark _thread as read"
+msgstr "/Позначити/Позначити як прочитане"
+
+#: src/summaryview.c:431
 msgid "/_Mark/Mark all _read"
 msgstr "/Позначити/Позначити все як прочитане"
 
-#: src/summaryview.c:430
+#: src/summaryview.c:432
 msgid "/Color la_bel"
 msgstr "/Кольорова позначка"
 
-#: src/summaryview.c:434
+#: src/summaryview.c:436
 msgid "/Re-_edit"
 msgstr "Змінити"
 
-#: src/summaryview.c:436
+#: src/summaryview.c:438
 msgid "/Add sender to address boo_k..."
 msgstr "/Додати відправника до адресної книги"
 
-#: src/summaryview.c:438
+#: src/summaryview.c:440
 msgid "/Create f_ilter rule"
 msgstr "/Створити правило фільтрування"
 
-#: src/summaryview.c:439
+#: src/summaryview.c:441
 msgid "/Create f_ilter rule/_Automatically"
 msgstr "/Створити правило фільтрування/Автоматично"
 
-#: src/summaryview.c:441
+#: src/summaryview.c:443
 msgid "/Create f_ilter rule/by _From"
 msgstr "/Створити правило фільтрування/За полем `Від'"
 
-#: src/summaryview.c:443
+#: src/summaryview.c:445
 msgid "/Create f_ilter rule/by _To"
 msgstr "/Створити правило фільтрування/За полем `Кому'"
 
-#: src/summaryview.c:445
+#: src/summaryview.c:447
 msgid "/Create f_ilter rule/by _Subject"
 msgstr "//Створити правило фільтрування/За полем `Тема'"
 
-#: src/summaryview.c:451
+#: src/summaryview.c:453
 msgid "/_View/_Source"
 msgstr "/Вигляд/Вихідний текст"
 
-#: src/summaryview.c:452
+#: src/summaryview.c:454
 msgid "/_View/All _header"
 msgstr "/Вигляд/Весь заголовок"
 
-#: src/summaryview.c:454
+#: src/summaryview.c:456
 msgid "/_Print..."
 msgstr "/Друк..."
 
-#: src/summaryview.c:486
+#: src/summaryview.c:488
 msgid "Creating summary view...\n"
 msgstr "Створюємо область перегляду списка...\n"
 
-#: src/summaryview.c:508
+#: src/summaryview.c:510
 msgid "All"
 msgstr ""
 
-#: src/summaryview.c:511
+#: src/summaryview.c:513
 #, fuzzy
 msgid "Have color label"
 msgstr "/Кольорова позначка"
 
-#: src/summaryview.c:512
+#: src/summaryview.c:514
 #, fuzzy
 msgid "Have attachment"
 msgstr "Вкладення"
 
-#: src/summaryview.c:521
+#: src/summaryview.c:523
 #, fuzzy
 msgid "Search:"
 msgstr " Пошук "
 
-#: src/summaryview.c:535
+#: src/summaryview.c:537
 msgid "Search for Subject or From"
 msgstr ""
 
-#: src/summaryview.c:702
+#: src/summaryview.c:704
 msgid "Process mark"
 msgstr "Обробка позначок"
 
-#: src/summaryview.c:703
+#: src/summaryview.c:705
 msgid "Some marks are left. Process it?"
 msgstr "Залишились деякі позначки. Опрацювати?"
 
-#: src/summaryview.c:749
+#: src/summaryview.c:751
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "Перечитуємо папку (%s)..."
 
-#: src/summaryview.c:1292
+#: src/summaryview.c:1295
 msgid "_Search again"
 msgstr "Шукати знову"
 
-#: src/summaryview.c:1313 src/summaryview.c:1322
+#: src/summaryview.c:1316 src/summaryview.c:1325
 msgid "No more unread messages"
 msgstr "Більше немає непрочитаних листів"
 
-#: src/summaryview.c:1314
+#: src/summaryview.c:1317
 msgid "No unread message found. Search from the end?"
 msgstr "Не знайдено непрочитаних листів. Шукати з кінця?"
 
-#: src/summaryview.c:1316
+#: src/summaryview.c:1319
 msgid "No unread messages."
 msgstr "Немає непрочитаних листів"
 
-#: src/summaryview.c:1323
+#: src/summaryview.c:1326
 msgid "No unread message found. Go to next folder?"
 msgstr "Не знайдено непрочитаних листів. Перейти до наступної папки?"
 
-#: src/summaryview.c:1331 src/summaryview.c:1340
+#: src/summaryview.c:1334 src/summaryview.c:1343
 msgid "No more new messages"
 msgstr "Більше немає нових листів"
 
-#: src/summaryview.c:1332
+#: src/summaryview.c:1335
 msgid "No new message found. Search from the end?"
 msgstr "Не знайдено нових листів. Шукати з кінця?"
 
-#: src/summaryview.c:1334
+#: src/summaryview.c:1337
 msgid "No new messages."
 msgstr "Немає нових листів"
 
-#: src/summaryview.c:1341
+#: src/summaryview.c:1344
 msgid "No new message found. Go to next folder?"
 msgstr "Не знайдено нових листів. Перейти до наступної папки?"
 
-#: src/summaryview.c:1349 src/summaryview.c:1358
+#: src/summaryview.c:1352 src/summaryview.c:1361
 msgid "No more marked messages"
 msgstr "Більше немає позначених листів"
 
-#: src/summaryview.c:1350
+#: src/summaryview.c:1353
 msgid "No marked message found. Search from the end?"
 msgstr "Не знайдено позначених листів. Шукати з кінця?"
 
-#: src/summaryview.c:1352 src/summaryview.c:1361
+#: src/summaryview.c:1355 src/summaryview.c:1364
 msgid "No marked messages."
 msgstr "Немає позначених листів."
 
-#: src/summaryview.c:1359
+#: src/summaryview.c:1362
 msgid "No marked message found. Search from the beginning?"
 msgstr "Не знайдено позначених листів. Шукати з початку?"
 
-#: src/summaryview.c:1367 src/summaryview.c:1376
+#: src/summaryview.c:1370 src/summaryview.c:1379
 msgid "No more labeled messages"
 msgstr "Більше немає виділених листів"
 
-#: src/summaryview.c:1368
+#: src/summaryview.c:1371
 msgid "No labeled message found. Search from the end?"
 msgstr "Не знайдено виділених листів. Шукати з кінця?"
 
-#: src/summaryview.c:1370 src/summaryview.c:1379
+#: src/summaryview.c:1373 src/summaryview.c:1382
 msgid "No labeled messages."
 msgstr "Немає виділених листів"
 
-#: src/summaryview.c:1377
+#: src/summaryview.c:1380
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Не знайдено виділених листів. Шукати з початку?"
 
-#: src/summaryview.c:1693
+#: src/summaryview.c:1696
 msgid "Attracting messages by subject..."
 msgstr "Групування листів за темами..."
 
-#: src/summaryview.c:1887
+#: src/summaryview.c:1890
 #, c-format
 msgid "%d deleted"
 msgstr "%d видалено"
 
-#: src/summaryview.c:1891
+#: src/summaryview.c:1894
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d переміщено"
 
-#: src/summaryview.c:1892 src/summaryview.c:1897
+#: src/summaryview.c:1895 src/summaryview.c:1900
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:1896
+#: src/summaryview.c:1899
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d скопійовано"
 
-#: src/summaryview.c:1911
+#: src/summaryview.c:1914
 msgid " item(s) selected"
 msgstr " записів обрано"
 
-#: src/summaryview.c:1933
+#: src/summaryview.c:1936
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d нових, %d непрочитаних, %d загалом (%s)"
 
-#: src/summaryview.c:1937
+#: src/summaryview.c:1940
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d нових, %d непрочитаних, %d загалом"
 
-#: src/summaryview.c:1971
+#: src/summaryview.c:1974
 msgid "Sorting summary..."
 msgstr "Сортуємо список..."
 
-#: src/summaryview.c:2194
+#: src/summaryview.c:2211
 msgid "\tSetting summary from message data..."
 msgstr "\tФормуємо список з даних листів..."
 
-#: src/summaryview.c:2196
+#: src/summaryview.c:2213
 msgid "Setting summary from message data..."
 msgstr "Формуємо список з даних листів..."
 
-#: src/summaryview.c:2302
+#: src/summaryview.c:2319
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Пишемо кеш списка (%s)..."
 
-#: src/summaryview.c:2643
+#: src/summaryview.c:2660
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Лист %d позначено\n"
 
-#: src/summaryview.c:2701
+#: src/summaryview.c:2718
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Лист %d позначено як прочитаний\n"
 
-#: src/summaryview.c:2789
+#: src/summaryview.c:2908
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Лист %d позначено як непрочитаний\n"
 
-#: src/summaryview.c:2850
+#: src/summaryview.c:2969
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Лист %s/%d призначено до видалення\n"
 
-#: src/summaryview.c:2878
+#: src/summaryview.c:2997
 msgid "Delete message(s)"
 msgstr "Видалити лист(и)"
 
-#: src/summaryview.c:2879
+#: src/summaryview.c:2998
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Справді видалити лист(и) з кошика?"
 
-#: src/summaryview.c:2953
+#: src/summaryview.c:3072
 msgid "Deleting duplicated messages..."
 msgstr "Видаляємо повторювані листи..."
 
-#: src/summaryview.c:2991
+#: src/summaryview.c:3110
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "З листа %s/%d знято позначки\n"
 
-#: src/summaryview.c:3049
+#: src/summaryview.c:3168
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Лист %d призначено до переміщення в %s\n"
 
-#: src/summaryview.c:3066
+#: src/summaryview.c:3196
 msgid "Destination is same as current folder."
 msgstr "Призначення збігається з поточною папкою."
 
-#: src/summaryview.c:3122
+#: src/summaryview.c:3260
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Лист %d призначено до копіювання в %s\n"
 
-#: src/summaryview.c:3139
+#: src/summaryview.c:3288
 msgid "Destination for copy is same as current folder."
 msgstr "Пропонується копіювання з папки в неї ж."
 
-#: src/summaryview.c:3338
+#: src/summaryview.c:3495
 msgid "Error occurred while processing messages."
 msgstr "При обробці пошти трапилась помилка."
 
-#: src/summaryview.c:3646 src/summaryview.c:3647
+#: src/summaryview.c:3803 src/summaryview.c:3804
 msgid "Building threads..."
 msgstr "Будуємо нитки обговорення..."
 
-#: src/summaryview.c:3797 src/summaryview.c:3798
+#: src/summaryview.c:3954 src/summaryview.c:3955
 msgid "Unthreading..."
 msgstr "Скасування ниток обговорення..."
 
-#: src/summaryview.c:4091 src/summaryview.c:4147
+#: src/summaryview.c:4248 src/summaryview.c:4304
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Фільтрування..."
 
-#: src/summaryview.c:4196
+#: src/summaryview.c:4353
 msgid "filtering..."
 msgstr "фільтрування..."
 
-#: src/summaryview.c:4197
+#: src/summaryview.c:4354
 msgid "Filtering..."
 msgstr "Фільтрування..."
 
-#: src/summaryview.c:4233
+#: src/summaryview.c:4390
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "%d листів відфільтровано."
 
-#: src/summaryview.c:4742
+#: src/summaryview.c:4899
 msgid "No."
 msgstr "Номер"
 
@@ -6503,31 +6534,31 @@ msgstr "Створюємо область перегляду тексту...\n"
 msgid "This message can't be displayed.\n"
 msgstr "Цей лист неможливо відобразити.\n"
 
-#: src/textview.c:1929
+#: src/textview.c:1925
 msgid "Sa_ve this image as..."
 msgstr "/Зберегти зображення як..."
 
-#: src/textview.c:1945 src/trayicon.c:109
+#: src/textview.c:1941 src/trayicon.c:109
 msgid "Compose _new message"
 msgstr "Створити новий лист"
 
-#: src/textview.c:1947
+#: src/textview.c:1943
 msgid "Add to address _book..."
 msgstr "Додати до адресної книги"
 
-#: src/textview.c:1949
+#: src/textview.c:1945
 msgid "Copy this add_ress"
 msgstr "Копіювати цю адресу"
 
-#: src/textview.c:1952
+#: src/textview.c:1948
 msgid "_Open with Web browser"
 msgstr "Відкрити Web-браузером"
 
-#: src/textview.c:1954
+#: src/textview.c:1950
 msgid "Copy this _link"
 msgstr "Скопіювати посилання"
 
-#: src/textview.c:2097
+#: src/textview.c:2093
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6540,7 +6571,7 @@ msgstr ""
 "\n"
 "Все ж відкрити?"
 
-#: src/textview.c:2102
+#: src/textview.c:2098
 msgid "Fake URL warning"
 msgstr "Попередження: підміна URL"
 
diff --git a/po/vi.po b/po/vi.po
index 9f65a316..416f1c37 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-27 18:11+0900\n"
+"POT-Creation-Date: 2006-01-31 15:20+0900\n"
 "PO-Revision-Date: 2005-11-30 23:05+0700\n"
 "Last-Translator: Pham Thanh Long <ptlong@gmail.com>\n"
 "Language-Team: Vietnamese <gnome-vi-list@gnome.org>\n"
@@ -505,7 +505,7 @@ msgstr "Tìm thấy %s\n"
 msgid "Configuration is saved.\n"
 msgstr "Cấu hình đã được lưu.\n"
 
-#: libsylph/prefs_common.c:489
+#: libsylph/prefs_common.c:491
 msgid "Junk mail filter"
 msgstr "Lọc thư rác"
 
@@ -620,8 +620,8 @@ msgstr "%.2fMB"
 msgid "%.2fGB"
 msgstr "%.2fGB"
 
-#: libsylph/utils.c:2373 src/compose.c:2858 src/compose.c:3121
-#: src/compose.c:3184 src/compose.c:3304
+#: libsylph/utils.c:2373 src/compose.c:2867 src/compose.c:3130
+#: src/compose.c:3193 src/compose.c:3313
 msgid "can't change file mode\n"
 msgstr "không thể đổi chế độ tập tin\n"
 
@@ -693,8 +693,8 @@ msgstr ""
 "Các thư mới sẽ được kiểm tra theo thứ tự này. Đánh dấu các hộp\n"
 "trên cột `G' để cho phép lấy thư về bằng `Lấy tất cả'."
 
-#: src/account_dialog.c:366 src/addressadd.c:192 src/addressbook.c:491
-#: src/compose.c:4262 src/editaddress.c:200 src/editaddress.c:942
+#: src/account_dialog.c:366 src/addressadd.c:192 src/addressbook.c:493
+#: src/compose.c:4271 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:206 src/prefs_filter.c:259 src/prefs_folder_item.c:171
@@ -830,12 +830,12 @@ msgstr "Đối số người dùng của hành động"
 msgid "Add Address to Book"
 msgstr "Thêm địa chỉ vào sổ"
 
-#: src/addressadd.c:202 src/compose.c:4762 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4771 src/editaddress.c:201
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "Địa chỉ"
 
-#: src/addressadd.c:212 src/addressbook.c:493 src/editaddress.c:202
+#: src/addressadd.c:212 src/addressbook.c:495 src/editaddress.c:202
 #: src/editaddress.c:795 src/editaddress.c:860 src/editgroup.c:267
 msgid "Remarks"
 msgstr "Ghi chú"
@@ -844,183 +844,183 @@ msgstr "Ghi chú"
 msgid "Select Address Book Folder"
 msgstr "Chọn thư mục sổ địa chỉ"
 
-#: src/addressbook.c:336 src/compose.c:515 src/mainwindow.c:477
+#: src/addressbook.c:338 src/compose.c:515 src/mainwindow.c:480
 #: src/messageview.c:138
 msgid "/_File"
 msgstr "/_Tập tin"
 
-#: src/addressbook.c:337
+#: src/addressbook.c:339
 msgid "/_File/New _Book"
 msgstr "/_Tập tin/_Sổ mới"
 
-#: src/addressbook.c:338
+#: src/addressbook.c:340
 msgid "/_File/New _vCard"
 msgstr "/_Tập tin/_vCard mới"
 
-#: src/addressbook.c:340
+#: src/addressbook.c:342
 msgid "/_File/New _JPilot"
 msgstr "/_Tập tin/_JPilot mới"
 
-#: src/addressbook.c:343
+#: src/addressbook.c:345
 msgid "/_File/New _Server"
 msgstr "/_Tập tin/_Máy chủ mới"
 
-#: src/addressbook.c:345 src/addressbook.c:348 src/compose.c:520
-#: src/compose.c:525 src/compose.c:528 src/compose.c:531 src/mainwindow.c:495
-#: src/mainwindow.c:498 src/mainwindow.c:500 src/mainwindow.c:503
-#: src/mainwindow.c:505 src/messageview.c:141
+#: src/addressbook.c:347 src/addressbook.c:350 src/compose.c:520
+#: src/compose.c:525 src/compose.c:528 src/compose.c:531 src/mainwindow.c:498
+#: src/mainwindow.c:501 src/mainwindow.c:503 src/mainwindow.c:506
+#: src/mainwindow.c:508 src/messageview.c:141
 msgid "/_File/---"
 msgstr "/_Tập tin/---"
 
-#: src/addressbook.c:346
+#: src/addressbook.c:348
 msgid "/_File/_Edit"
 msgstr "/_Tập tin/Soạ_n"
 
-#: src/addressbook.c:347
+#: src/addressbook.c:349
 msgid "/_File/_Delete"
 msgstr "/_Tập tin/_Xoá"
 
-#: src/addressbook.c:349
+#: src/addressbook.c:351
 msgid "/_File/_Save"
 msgstr "/_Tập tin/_Lưu"
 
-#: src/addressbook.c:350 src/compose.c:532 src/messageview.c:142
+#: src/addressbook.c:352 src/compose.c:532 src/messageview.c:142
 msgid "/_File/_Close"
 msgstr "/_Tập tin/Đón_g"
 
-#: src/addressbook.c:351
+#: src/addressbook.c:353
 msgid "/_Address"
 msgstr "/Đị_a chỉ"
 
-#: src/addressbook.c:352
+#: src/addressbook.c:354
 msgid "/_Address/New _Address"
 msgstr "/Đị_a chỉ/Địa chỉ _mới"
 
-#: src/addressbook.c:353
+#: src/addressbook.c:355
 msgid "/_Address/New _Group"
 msgstr "/Đị_a chỉ/_Nhóm mới"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:356
 msgid "/_Address/New _Folder"
 msgstr "/Đị_a chỉ/_Thư mục mới"
 
-#: src/addressbook.c:355
+#: src/addressbook.c:357
 msgid "/_Address/---"
 msgstr "/Đị_a chỉ/---"
 
-#: src/addressbook.c:356
+#: src/addressbook.c:358
 msgid "/_Address/_Edit"
 msgstr "/Đị_a chỉ/_Soạn"
 
-#: src/addressbook.c:357
+#: src/addressbook.c:359
 msgid "/_Address/_Delete"
 msgstr "/Đị_a chỉ/_Xoá"
 
-#: src/addressbook.c:358 src/compose.c:639 src/mainwindow.c:738
-#: src/messageview.c:259
+#: src/addressbook.c:360 src/compose.c:645 src/mainwindow.c:749
+#: src/messageview.c:264
 msgid "/_Tools"
 msgstr "/_Công cụ"
 
-#: src/addressbook.c:359
+#: src/addressbook.c:361
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Công cụ/_Nhập tập tin LDIF"
 
-#: src/addressbook.c:360 src/compose.c:658 src/mainwindow.c:788
-#: src/messageview.c:277
+#: src/addressbook.c:362 src/compose.c:664 src/mainwindow.c:799
+#: src/messageview.c:282
 msgid "/_Help"
 msgstr "/_Hỗ trợ"
 
-#: src/addressbook.c:361 src/compose.c:659 src/mainwindow.c:799
-#: src/messageview.c:278
+#: src/addressbook.c:363 src/compose.c:665 src/mainwindow.c:810
+#: src/messageview.c:283
 msgid "/_Help/_About"
 msgstr "/_Hỗ trợ/_Giới thiệu"
 
-#: src/addressbook.c:380 src/addressbook.c:390
+#: src/addressbook.c:382 src/addressbook.c:392
 msgid "/New _Address"
 msgstr "/Địa chỉ _mới"
 
-#: src/addressbook.c:381 src/addressbook.c:391
+#: src/addressbook.c:383 src/addressbook.c:393
 msgid "/New _Group"
 msgstr "/_Nhóm mới"
 
-#: src/addressbook.c:382 src/addressbook.c:392
+#: src/addressbook.c:384 src/addressbook.c:394
 msgid "/New _Folder"
 msgstr "/Thư _mục mới"
 
-#: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:509
+#: src/addressbook.c:385 src/addressbook.c:395 src/compose.c:509
 #: src/folderview.c:246 src/folderview.c:248 src/folderview.c:253
 #: src/folderview.c:266 src/folderview.c:268 src/folderview.c:270
 #: src/folderview.c:275 src/folderview.c:289 src/folderview.c:291
 #: src/folderview.c:295 src/summaryview.c:414 src/summaryview.c:418
-#: src/summaryview.c:421 src/summaryview.c:431 src/summaryview.c:433
-#: src/summaryview.c:435 src/summaryview.c:447 src/summaryview.c:453
+#: src/summaryview.c:421 src/summaryview.c:433 src/summaryview.c:435
+#: src/summaryview.c:437 src/summaryview.c:449 src/summaryview.c:455
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:534
-#: src/mainwindow.c:509 src/messageview.c:144
+#: src/addressbook.c:386 src/addressbook.c:396 src/compose.c:534
+#: src/mainwindow.c:512 src/messageview.c:144
 msgid "/_Edit"
 msgstr "/_Soạn"
 
-#: src/addressbook.c:385 src/addressbook.c:395 src/summaryview.c:432
+#: src/addressbook.c:387 src/addressbook.c:397 src/summaryview.c:434
 msgid "/_Delete"
 msgstr "/_Xoá"
 
-#: src/addressbook.c:492
+#: src/addressbook.c:494
 msgid "E-Mail address"
 msgstr "Địa chỉ email"
 
-#: src/addressbook.c:496 src/compose.c:4763 src/prefs_common_dialog.c:2183
+#: src/addressbook.c:498 src/compose.c:4772 src/prefs_common_dialog.c:2183
 msgid "Address book"
 msgstr "Sổ địa chỉ"
 
-#: src/addressbook.c:596 src/prefs_filter_edit.c:249
+#: src/addressbook.c:600 src/prefs_filter_edit.c:249
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "Tên:"
 
 #. Buttons
-#: src/addressbook.c:628 src/addressbook.c:1680 src/editaddress.c:884
-#: src/editaddress.c:1017 src/mainwindow.c:2391 src/prefs_actions.c:266
+#: src/addressbook.c:632 src/addressbook.c:1684 src/editaddress.c:884
+#: src/editaddress.c:1017 src/mainwindow.c:2402 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
 #: src/prefs_template.c:233
 msgid "Delete"
 msgstr "Xoá"
 
-#: src/addressbook.c:631 src/editaddress.c:890 src/editaddress.c:1023
+#: src/addressbook.c:635 src/editaddress.c:890 src/editaddress.c:1023
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:273 src/prefs_display_header.c:328
 #: src/prefs_filter_edit.c:1550
 msgid "Add"
 msgstr "Thêm"
 
-#: src/addressbook.c:634
+#: src/addressbook.c:638
 msgid "Lookup"
 msgstr "Tra cứu"
 
-#: src/addressbook.c:646 src/headerview.c:55 src/prefs_folder_item.c:339
+#: src/addressbook.c:650 src/headerview.c:55 src/prefs_folder_item.c:339
 #: src/prefs_template.c:176
 msgid "To:"
 msgstr "Người nhận:"
 
-#: src/addressbook.c:650 src/prefs_folder_item.c:356 src/prefs_template.c:178
+#: src/addressbook.c:654 src/prefs_folder_item.c:356 src/prefs_template.c:178
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:654 src/prefs_folder_item.c:367
+#: src/addressbook.c:658 src/prefs_folder_item.c:367
 msgid "Bcc:"
 msgstr "Bcc:"
 
 #. Confirm deletion
-#: src/addressbook.c:841
+#: src/addressbook.c:845
 msgid "Delete address(es)"
 msgstr "Xoá địa chỉ"
 
-#: src/addressbook.c:842
+#: src/addressbook.c:846
 msgid "Really delete the address(es)?"
 msgstr "Thực sự muốn xoá (các) địa chỉ này?"
 
-#: src/addressbook.c:1671
+#: src/addressbook.c:1675
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1029,36 +1029,36 @@ msgstr ""
 "Bạn có muốn xoá thư mục VÀ mọi địa chỉ trong `%s' ?\n"
 "Nếu chỉ xoá thư mục, các địa chỉ sẽ được chuyển đến thư mục cấp cao hơn."
 
-#: src/addressbook.c:1674 src/folderview.c:2351
+#: src/addressbook.c:1678 src/folderview.c:2351
 msgid "Delete folder"
 msgstr "Xoá thư mục"
 
-#: src/addressbook.c:1674
+#: src/addressbook.c:1678
 msgid "_Folder only"
 msgstr "_Chỉ thư mục"
 
-#: src/addressbook.c:1674
+#: src/addressbook.c:1678
 msgid "Folder and _addresses"
 msgstr "Thư mục và địa c_hỉ"
 
-#: src/addressbook.c:1679
+#: src/addressbook.c:1683
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Thực sự muốn xoá `%s' ?"
 
-#: src/addressbook.c:2365 src/addressbook.c:2498
+#: src/addressbook.c:2369 src/addressbook.c:2502
 msgid "New user, could not save index file."
 msgstr "Người dùng mới, không thể lưu tập tin mục lục."
 
-#: src/addressbook.c:2369 src/addressbook.c:2502
+#: src/addressbook.c:2373 src/addressbook.c:2506
 msgid "New user, could not save address book files."
 msgstr "Người dùng mới, không thể lưu các tập tin sổ địa chỉ."
 
-#: src/addressbook.c:2379 src/addressbook.c:2512
+#: src/addressbook.c:2383 src/addressbook.c:2516
 msgid "Old address book converted successfully."
 msgstr "Sổ địa chỉ cũ đã được chuyển đổi thành công."
 
-#: src/addressbook.c:2384
+#: src/addressbook.c:2388
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1066,7 +1066,7 @@ msgstr ""
 "Sổ địa chỉ cũ đã được chuyển,\n"
 "không thể lưu tập tin địa chỉ mới"
 
-#: src/addressbook.c:2397
+#: src/addressbook.c:2401
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1074,7 +1074,7 @@ msgstr ""
 "Không thể chuyển đổi sổ địa chỉ,\n"
 "nhưng đã tạo các tập tin sổ địa chỉ trống mới."
 
-#: src/addressbook.c:2403
+#: src/addressbook.c:2407
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1082,7 +1082,7 @@ msgstr ""
 "Không thể chuyển đổi sổ địa chỉ,\n"
 "không thể tạo các tập tin sổ địa chỉ mới."
 
-#: src/addressbook.c:2408
+#: src/addressbook.c:2412
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1090,89 +1090,89 @@ msgstr ""
 "Không thể chuyển đổi sổ địa chỉ\n"
 "và không thể các tập tin sổ địa chỉ mới."
 
-#: src/addressbook.c:2415
+#: src/addressbook.c:2419
 msgid "Addressbook conversion error"
 msgstr "Lỗi chuyển đổi sổ địa chỉ"
 
-#: src/addressbook.c:2419
+#: src/addressbook.c:2423
 msgid "Addressbook conversion"
 msgstr "Chuyển đổi sổ địa chỉ"
 
-#: src/addressbook.c:2454
+#: src/addressbook.c:2458
 msgid "Addressbook Error"
 msgstr "Lỗi sổ địa chỉ"
 
-#: src/addressbook.c:2455 src/addressbook.c:2555
+#: src/addressbook.c:2459 src/addressbook.c:2559
 msgid "Could not read address index"
 msgstr "Không thể đọc mục lục địa chỉ"
 
-#: src/addressbook.c:2517
+#: src/addressbook.c:2521
 msgid "Old address book converted, could not save new address index file"
 msgstr ""
 "Sổ địa chỉ cũ đã được chuyển đổi, không thể lưu tập tin mục lục địa chỉ mới"
 
-#: src/addressbook.c:2531
+#: src/addressbook.c:2535
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr ""
 "Không thể chuyển đổi sổ địa chỉ, nhưng đã tạo các tập tin sổ địa chỉ trống "
 "mới."
 
-#: src/addressbook.c:2537
+#: src/addressbook.c:2541
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr ""
 "Không thể chuyển đổi sổ địa chỉ, không thể tạo các tập tin sổ địa chỉ mới."
 
-#: src/addressbook.c:2543
+#: src/addressbook.c:2547
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr ""
 "Không thể chuyển đổi sổ địa chỉ và không thể tạo các tập tin sổ địa chỉ mới."
 
-#: src/addressbook.c:2561
+#: src/addressbook.c:2565
 msgid "Addressbook Conversion Error"
 msgstr "Lỗi chuyển đổi sổ địa chỉ"
 
-#: src/addressbook.c:2567
+#: src/addressbook.c:2571
 msgid "Addressbook Conversion"
 msgstr "Chuyển đổi sổ địa chỉ"
 
-#: src/addressbook.c:3072 src/prefs_common_dialog.c:2033
+#: src/addressbook.c:3086 src/prefs_common_dialog.c:2033
 msgid "Interface"
 msgstr "Giao diện"
 
-#: src/addressbook.c:3088 src/importldif.c:514
+#: src/addressbook.c:3102 src/importldif.c:514
 msgid "Address Book"
 msgstr "Sổ địa chỉ"
 
-#: src/addressbook.c:3104
+#: src/addressbook.c:3118
 msgid "Person"
 msgstr "Cá nhân"
 
-#: src/addressbook.c:3120
+#: src/addressbook.c:3134
 msgid "EMail Address"
 msgstr "Địa chỉ email"
 
-#: src/addressbook.c:3136
+#: src/addressbook.c:3150
 msgid "Group"
 msgstr "Nhóm"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3152 src/folderview.c:367 src/prefs_account_dialog.c:1694
+#: src/addressbook.c:3166 src/folderview.c:367 src/prefs_account_dialog.c:1694
 #: src/query_search.c:370
 msgid "Folder"
 msgstr "Thư mục"
 
-#: src/addressbook.c:3168
+#: src/addressbook.c:3182
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3184 src/addressbook.c:3200
+#: src/addressbook.c:3198 src/addressbook.c:3214
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3216
+#: src/addressbook.c:3230
 msgid "LDAP Server"
 msgstr "Máy chủ LDAP"
 
@@ -1184,7 +1184,7 @@ msgstr "Địa chỉ chung"
 msgid "Personal address"
 msgstr "Địa chỉ cá nhân"
 
-#: src/alertpanel.c:141 src/compose.c:5485 src/main.c:573
+#: src/alertpanel.c:141 src/compose.c:5494 src/main.c:573
 msgid "Notice"
 msgstr "Chú ý"
 
@@ -1235,7 +1235,7 @@ msgstr "Nâu"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4593
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4750
 msgid "None"
 msgstr "Không"
 
@@ -1293,7 +1293,7 @@ msgstr "/_Soạn/_Hoàn tác"
 msgid "/_Edit/_Redo"
 msgstr "/_Soạn/Ch_uyển tác"
 
-#: src/compose.c:537 src/compose.c:544 src/mainwindow.c:513
+#: src/compose.c:537 src/compose.c:544 src/mainwindow.c:516
 #: src/messageview.c:147
 msgid "/_Edit/---"
 msgstr "/_Soạn/---"
@@ -1302,7 +1302,7 @@ msgstr "/_Soạn/---"
 msgid "/_Edit/Cu_t"
 msgstr "/_Soạn/_Cắt"
 
-#: src/compose.c:539 src/mainwindow.c:510 src/messageview.c:145
+#: src/compose.c:539 src/mainwindow.c:513 src/messageview.c:145
 msgid "/_Edit/_Copy"
 msgstr "/_Soạn/_Sao chép"
 
@@ -1314,7 +1314,7 @@ msgstr "/_Soạn/_Dán"
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Soạn/Dán ở dạng t_rích dẫn"
 
-#: src/compose.c:543 src/mainwindow.c:511 src/messageview.c:146
+#: src/compose.c:543 src/mainwindow.c:514 src/messageview.c:146
 msgid "/_Edit/Select _all"
 msgstr "/_Soạn/Chọ_n tất cả"
 
@@ -1330,8 +1330,8 @@ msgstr "/_Soạn/Khuôn _mọi dòng dài"
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Soạn/Tự độ_ng khuôn dòng"
 
-#: src/compose.c:550 src/mainwindow.c:518 src/messageview.c:151
-#: src/summaryview.c:448
+#: src/compose.c:550 src/mainwindow.c:521 src/messageview.c:151
+#: src/summaryview.c:450
 msgid "/_View"
 msgstr "/_Xem"
 
@@ -1352,9 +1352,9 @@ msgid "/_View/_Reply to"
 msgstr "/_Xem/_Hồi âm cho"
 
 #: src/compose.c:555 src/compose.c:557 src/compose.c:559 src/compose.c:561
-#: src/mainwindow.c:538 src/mainwindow.c:541 src/mainwindow.c:568
-#: src/mainwindow.c:592 src/mainwindow.c:687 src/mainwindow.c:691
-#: src/messageview.c:236
+#: src/mainwindow.c:541 src/mainwindow.c:544 src/mainwindow.c:571
+#: src/mainwindow.c:595 src/mainwindow.c:696 src/mainwindow.c:700
+#: src/messageview.c:241
 msgid "/_View/---"
 msgstr "/_Xem/---"
 
@@ -1370,7 +1370,7 @@ msgstr "/_Xem/_Thước kẻ"
 msgid "/_View/_Attachment"
 msgstr "/_Xem/Đí_nh kèm"
 
-#: src/compose.c:567 src/mainwindow.c:599 src/messageview.c:158
+#: src/compose.c:567 src/mainwindow.c:602 src/messageview.c:158
 msgid "/_View/Character _encoding"
 msgstr "/_Xem/Mã _kí tự"
 
@@ -1379,214 +1379,225 @@ msgid "/_View/Character _encoding/_Automatic"
 msgstr "/_Xem/Mã _kí tự/_Tự động"
 
 #: src/compose.c:570 src/compose.c:576 src/compose.c:582 src/compose.c:586
-#: src/compose.c:592 src/compose.c:596 src/compose.c:602 src/compose.c:606
-#: src/compose.c:616 src/compose.c:620 src/compose.c:628 src/compose.c:632
-#: src/mainwindow.c:595 src/mainwindow.c:602 src/messageview.c:154
+#: src/compose.c:592 src/compose.c:596 src/compose.c:602 src/compose.c:608
+#: src/compose.c:612 src/compose.c:622 src/compose.c:626 src/compose.c:634
+#: src/compose.c:638 src/mainwindow.c:598 src/mainwindow.c:605
+#: src/messageview.c:154
 msgid "/_View/Character _encoding/---"
 msgstr "/_Xem/Mã _kí tự/---"
 
-#: src/compose.c:572 src/mainwindow.c:603 src/messageview.c:162
+#: src/compose.c:572 src/mainwindow.c:606 src/messageview.c:162
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Xem/Mã _kí tự/7bit ascii (US-ASC_II)"
 
-#: src/compose.c:574 src/mainwindow.c:605 src/messageview.c:165
+#: src/compose.c:574 src/mainwindow.c:608 src/messageview.c:165
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Xem/Mã _kí tự/Unicode (_UTF-8)"
 
-#: src/compose.c:578 src/mainwindow.c:609 src/messageview.c:168
+#: src/compose.c:578 src/mainwindow.c:612 src/messageview.c:168
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Xem/Mã _kí tự/Tây Âu (ISO-8859-_1)"
 
-#: src/compose.c:580 src/mainwindow.c:611 src/messageview.c:170
+#: src/compose.c:580 src/mainwindow.c:614 src/messageview.c:170
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Xem/Mã _kí tự/Đông Âu (ISO-8859-15)"
 
-#: src/compose.c:584 src/mainwindow.c:617 src/messageview.c:175
+#: src/compose.c:584 src/mainwindow.c:620 src/messageview.c:175
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Xem/Mã _kí tự/Trung Âu (ISO-8859-_2)"
 
-#: src/compose.c:588 src/mainwindow.c:621 src/messageview.c:178
+#: src/compose.c:588 src/mainwindow.c:624 src/messageview.c:178
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Xem/Mã _kí tự/_Baltic (ISO-8859-13)"
 
-#: src/compose.c:590 src/mainwindow.c:623 src/messageview.c:180
+#: src/compose.c:590 src/mainwindow.c:626 src/messageview.c:180
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Xem/Mã _kí tự/Baltic (ISO-8859-_4)"
 
-#: src/compose.c:594 src/mainwindow.c:627 src/messageview.c:183
+#: src/compose.c:594 src/mainwindow.c:630 src/messageview.c:183
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Xem/Mã _kí tự/Hi Lạp (ISO-8859-_7)"
 
-#: src/compose.c:598 src/mainwindow.c:631 src/messageview.c:186
+#: src/compose.c:598 src/mainwindow.c:634 src/messageview.c:186
+#, fuzzy
+msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
+msgstr "/_Xem/Mã _kí tự/Baltic (ISO-8859-_4)"
+
+#: src/compose.c:600 src/mainwindow.c:636 src/messageview.c:188
+#, fuzzy
+msgid "/_View/Character _encoding/Arabic (Windows-1256)"
+msgstr "/_Xem/Mã _kí tự/Cyrillic (Windows-1251)"
+
+#: src/compose.c:604 src/mainwindow.c:640 src/messageview.c:191
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Xem/Mã _kí tự/Do Thái (ISO-8859-_8)"
 
-#: src/compose.c:600 src/mainwindow.c:633 src/messageview.c:188
+#: src/compose.c:606 src/mainwindow.c:642 src/messageview.c:193
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Xem/Mã _kí tự/Do Thái (Windows-1255)"
 
-#: src/compose.c:604 src/mainwindow.c:637 src/messageview.c:191
+#: src/compose.c:610 src/mainwindow.c:646 src/messageview.c:196
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Xem/Mã _kí tự/Thổ Nhĩ Kì (ISO-8859-_9)"
 
-#: src/compose.c:608 src/mainwindow.c:641 src/messageview.c:194
+#: src/compose.c:614 src/mainwindow.c:650 src/messageview.c:199
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Xem/Mã _kí tự/Cyrillic (ISO-8859-_5)"
 
-#: src/compose.c:610 src/mainwindow.c:643 src/messageview.c:196
+#: src/compose.c:616 src/mainwindow.c:652 src/messageview.c:201
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Xem/Mã _kí tự/Cyrillic (KOI8-_R)"
 
-#: src/compose.c:612 src/mainwindow.c:645 src/messageview.c:198
+#: src/compose.c:618 src/mainwindow.c:654 src/messageview.c:203
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Xem/Mã _kí tự/Cyrillic (KOI8-U)"
 
-#: src/compose.c:614 src/mainwindow.c:647 src/messageview.c:200
+#: src/compose.c:620 src/mainwindow.c:656 src/messageview.c:205
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Xem/Mã _kí tự/Cyrillic (Windows-1251)"
 
-#: src/compose.c:618 src/mainwindow.c:651 src/messageview.c:203
+#: src/compose.c:624 src/mainwindow.c:660 src/messageview.c:208
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Xem/Mã _kí tự/Nhật Bản (ISO-2022-_JP)"
 
-#: src/compose.c:622 src/mainwindow.c:661 src/messageview.c:212
+#: src/compose.c:628 src/mainwindow.c:670 src/messageview.c:217
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Xem/Mã _kí tự/Hán giản thể (_GB2312)"
 
-#: src/compose.c:624 src/mainwindow.c:663 src/messageview.c:214
+#: src/compose.c:630 src/mainwindow.c:672 src/messageview.c:219
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Xem/Mã _kí tự/Hán phồn thể (GBK)"
 
-#: src/compose.c:626 src/mainwindow.c:665 src/messageview.c:216
+#: src/compose.c:632 src/mainwindow.c:674 src/messageview.c:221
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Xem/Mã _kí tự/Hán phồn thể (_Big5)"
 
-#: src/compose.c:630 src/mainwindow.c:673 src/messageview.c:223
+#: src/compose.c:636 src/mainwindow.c:682 src/messageview.c:228
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Xem/Mã _kí tự/Triều Tiên (EUC-_KR)"
 
-#: src/compose.c:634 src/mainwindow.c:679 src/messageview.c:228
+#: src/compose.c:640 src/mainwindow.c:688 src/messageview.c:233
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Xem/Mã _kí tự/Thái (TIS-620)"
 
-#: src/compose.c:636 src/mainwindow.c:681 src/messageview.c:230
+#: src/compose.c:642 src/mainwindow.c:690 src/messageview.c:235
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Xem/Mã _kí tự/Thái (Windows-874)"
 
-#: src/compose.c:640 src/mainwindow.c:739 src/messageview.c:260
+#: src/compose.c:646 src/mainwindow.c:750 src/messageview.c:265
 msgid "/_Tools/_Address book"
 msgstr "/_Công cụ/_Sổ địa chỉ"
 
-#: src/compose.c:641
+#: src/compose.c:647
 msgid "/_Tools/_Template"
 msgstr "/_Công cụ/_Mẫu"
 
-#: src/compose.c:642 src/mainwindow.c:762 src/messageview.c:275
+#: src/compose.c:648 src/mainwindow.c:773 src/messageview.c:280
 msgid "/_Tools/Actio_ns"
 msgstr "/_Công cụ/_Hành động"
 
-#: src/compose.c:643 src/compose.c:647 src/compose.c:653 src/mainwindow.c:742
-#: src/mainwindow.c:756 src/mainwindow.c:761 src/mainwindow.c:763
-#: src/mainwindow.c:766 src/mainwindow.c:768 src/messageview.c:263
-#: src/messageview.c:274
+#: src/compose.c:649 src/compose.c:653 src/compose.c:659 src/mainwindow.c:753
+#: src/mainwindow.c:767 src/mainwindow.c:772 src/mainwindow.c:774
+#: src/mainwindow.c:777 src/mainwindow.c:779 src/messageview.c:268
+#: src/messageview.c:279
 msgid "/_Tools/---"
 msgstr "/_Công cụ/---"
 
-#: src/compose.c:644
+#: src/compose.c:650
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/_Công cụ/Soạ_n với chương trình ngoài"
 
-#: src/compose.c:648
+#: src/compose.c:654
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Công cụ/Chữ _kí PGP"
 
-#: src/compose.c:649
+#: src/compose.c:655
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/_Công cụ/Mã hoá _PGP"
 
-#: src/compose.c:654
+#: src/compose.c:660
 #, fuzzy
 msgid "/_Tools/_Check spell"
 msgstr "/_Công cụ/Chạ_y"
 
-#: src/compose.c:655
+#: src/compose.c:661
 #, fuzzy
 msgid "/_Tools/_Set spell language"
 msgstr "/_Công cụ/_Mẫu"
 
-#: src/compose.c:899
+#: src/compose.c:908
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: tập tin không tồn tại\n"
 
-#: src/compose.c:1003 src/compose.c:1074
+#: src/compose.c:1012 src/compose.c:1083
 msgid "Can't get text part\n"
 msgstr "Không thể lấy phần văn bản\n"
 
-#: src/compose.c:1475
+#: src/compose.c:1484
 msgid "Quote mark format error."
 msgstr "Lỗi định dạng đánh dấu trích dẫn."
 
-#: src/compose.c:1487
+#: src/compose.c:1496
 msgid "Message reply/forward format error."
 msgstr "Lỗi định dạng trả lời/chuyển tiếp thư."
 
-#: src/compose.c:1907
+#: src/compose.c:1916
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Tập tin %s không tồn tại\n"
 
-#: src/compose.c:1911
+#: src/compose.c:1920
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Không thể xác định kích tước tập tin của %s\n"
 
-#: src/compose.c:1915
+#: src/compose.c:1924
 #, c-format
 msgid "File %s is empty."
 msgstr "%s là tập tin trống."
 
-#: src/compose.c:1919
+#: src/compose.c:1928
 #, c-format
 msgid "Can't read %s."
 msgstr "Không thể đọc %s."
 
-#: src/compose.c:1952
+#: src/compose.c:1961
 #, c-format
 msgid "Message: %s"
 msgstr "Thư: %s"
 
-#: src/compose.c:2012 src/mimeview.c:565
+#: src/compose.c:2021 src/mimeview.c:565
 msgid "Can't get the part of multipart message."
 msgstr "Không thể lấy thành phần cho thư nhiều thành phần."
 
-#: src/compose.c:2496 src/headerview.c:195 src/query_search.c:636
-#: src/summaryview.c:2107
+#: src/compose.c:2505 src/headerview.c:195 src/query_search.c:636
+#: src/summaryview.c:2124
 msgid "(No Subject)"
 msgstr "(Không tiêu đề)"
 
-#: src/compose.c:2499
+#: src/compose.c:2508
 #, fuzzy, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Viết thư%s"
 
-#: src/compose.c:2612
+#: src/compose.c:2621
 msgid "Recipient is not specified."
 msgstr "Chưa chỉ định người nhận."
 
-#: src/compose.c:2620
+#: src/compose.c:2629
 msgid "Empty subject"
 msgstr "Tiêu đề bị bỏ trống"
 
-#: src/compose.c:2621
+#: src/compose.c:2630
 msgid "Subject is empty. Send it anyway?"
 msgstr "Tiêu đề bị bỏ trống. Vẫn gửi đi?"
 
-#: src/compose.c:2680
+#: src/compose.c:2689
 msgid "can't get recipient list."
 msgstr "không lấy được danh sách người nhận."
 
-#: src/compose.c:2700
+#: src/compose.c:2709
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1594,21 +1605,21 @@ msgstr ""
 "Chưa xác định tài khoản để gửi thư.\n"
 "Hãy chọn một tài khoản trước khi gửi."
 
-#: src/compose.c:2714 src/send_message.c:299
+#: src/compose.c:2723 src/send_message.c:299
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Xảy ra lỗi khi gửi thư đến %s ."
 
-#: src/compose.c:2756
+#: src/compose.c:2765
 msgid "Can't save the message to outbox."
 msgstr "Không thể lưu thư vào hộp gửi (outbox)."
 
-#: src/compose.c:2794
+#: src/compose.c:2803
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "Không tìm thấy khoá liên quan đến khoá đang chọn với id `%s'."
 
-#: src/compose.c:2891
+#: src/compose.c:2900
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1619,11 +1630,11 @@ msgstr ""
 "\n"
 "Vẫn gửi ở dạng %s?"
 
-#: src/compose.c:2897
+#: src/compose.c:2906
 msgid "Code conversion error"
 msgstr "Lỗi chuyển mã"
 
-#: src/compose.c:2970
+#: src/compose.c:2979
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1636,157 +1647,157 @@ msgstr ""
 "\n"
 "Vẫn gửi đi?"
 
-#: src/compose.c:2974
+#: src/compose.c:2983
 msgid "Line length limit"
 msgstr "Giới hạn độ dài của dòng"
 
-#: src/compose.c:3264
+#: src/compose.c:3273
 msgid "can't remove the old message\n"
 msgstr "không thể xoá thư cũ\n"
 
-#: src/compose.c:3282
+#: src/compose.c:3291
 msgid "queueing message...\n"
 msgstr "đang xếp hàng thư...\n"
 
-#: src/compose.c:3364
+#: src/compose.c:3373
 msgid "can't find queue folder\n"
 msgstr "không thấy thư mục đợi\n"
 
-#: src/compose.c:3371
+#: src/compose.c:3380
 msgid "can't queue the message\n"
 msgstr "không thể xếp hàng thư\n"
 
-#: src/compose.c:3964
+#: src/compose.c:3973
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "đã tạo ID của thư: %s\n"
 
-#: src/compose.c:4077
+#: src/compose.c:4086
 msgid "Creating compose window...\n"
 msgstr "Đang tạo cửa sổ soạn thảo...\n"
 
-#: src/compose.c:4128 src/headerview.c:54
+#: src/compose.c:4137 src/headerview.c:54
 msgid "From:"
 msgstr "Người gửi:"
 
-#: src/compose.c:4202
+#: src/compose.c:4211
 msgid "PGP Sign"
 msgstr "Chữ kí PGP"
 
-#: src/compose.c:4205
+#: src/compose.c:4214
 msgid "PGP Encrypt"
 msgstr "Mã hoá PGP"
 
-#: src/compose.c:4243 src/compose.c:5317
+#: src/compose.c:4252 src/compose.c:5326
 msgid "MIME type"
 msgstr "Kiểu MIME"
 
 #. S_COL_DATE
-#: src/compose.c:4252 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4740
+#: src/compose.c:4261 src/mimeview.c:197 src/prefs_filter_edit.c:496
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4897
 msgid "Size"
 msgstr "Kích thước"
 
-#: src/compose.c:4683 src/mainwindow.c:2324 src/prefs_account_dialog.c:528
+#: src/compose.c:4692 src/mainwindow.c:2335 src/prefs_account_dialog.c:528
 #: src/prefs_common_dialog.c:661
 msgid "Send"
 msgstr "Gửi"
 
-#: src/compose.c:4684
+#: src/compose.c:4693
 msgid "Send message"
 msgstr "Gửi thư"
 
-#: src/compose.c:4692
+#: src/compose.c:4701
 msgid "Send later"
 msgstr "Gửi sau"
 
-#: src/compose.c:4693
+#: src/compose.c:4702
 msgid "Put into queue folder and send later"
 msgstr "Đưa vào thư mục `Đợi gửi' và gửi sau"
 
-#: src/compose.c:4701
+#: src/compose.c:4710
 msgid "Draft"
 msgstr "Bản nháp"
 
-#: src/compose.c:4702
+#: src/compose.c:4711
 msgid "Save to draft folder"
 msgstr "Gửi vào thư mục nháp"
 
-#: src/compose.c:4712
+#: src/compose.c:4721
 msgid "Insert"
 msgstr "Chèn"
 
-#: src/compose.c:4713
+#: src/compose.c:4722
 msgid "Insert file"
 msgstr "Chèn tập tin"
 
-#: src/compose.c:4721
+#: src/compose.c:4730
 msgid "Attach"
 msgstr "Đính kèm"
 
-#: src/compose.c:4722
+#: src/compose.c:4731
 msgid "Attach file"
 msgstr "Đính kèm tập tin"
 
 #. signature
-#: src/compose.c:4732 src/prefs_account_dialog.c:1208
+#: src/compose.c:4741 src/prefs_account_dialog.c:1208
 #: src/prefs_common_dialog.c:953
 msgid "Signature"
 msgstr "Chữ kí"
 
-#: src/compose.c:4733
+#: src/compose.c:4742
 #, fuzzy
 msgid "Append signature"
 msgstr "Chữ kí GIẢ"
 
 #. editor
-#: src/compose.c:4742 src/prefs_common_dialog.c:991
+#: src/compose.c:4751 src/prefs_common_dialog.c:991
 #: src/prefs_common_dialog.c:2315
 msgid "Editor"
 msgstr "Trình soạn thảo"
 
-#: src/compose.c:4743
+#: src/compose.c:4752
 msgid "Edit with external editor"
 msgstr "Soạn với trình soạn thảo ngoài"
 
-#: src/compose.c:4751
+#: src/compose.c:4760
 msgid "Linewrap"
 msgstr "Khuôn dòng"
 
-#: src/compose.c:4752
+#: src/compose.c:4761
 msgid "Wrap all long lines"
 msgstr "Khuôn mọi dòng dài"
 
-#: src/compose.c:5213
+#: src/compose.c:5222
 msgid "Invalid MIME type."
 msgstr "Kiểu MIME không hợp lệ"
 
-#: src/compose.c:5231
+#: src/compose.c:5240
 msgid "File doesn't exist or is empty."
 msgstr "Tập tin không tồn tại hoặc rỗng."
 
-#: src/compose.c:5299
+#: src/compose.c:5308
 msgid "Properties"
 msgstr "Thuộc tính"
 
-#: src/compose.c:5319 src/prefs_common_dialog.c:1444
+#: src/compose.c:5328 src/prefs_common_dialog.c:1444
 msgid "Encoding"
 msgstr "Mã hoá"
 
-#: src/compose.c:5342 src/prefs_folder_item.c:202
+#: src/compose.c:5351 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Đường dẫn"
 
-#: src/compose.c:5343
+#: src/compose.c:5352
 msgid "File name"
 msgstr "Tên tập tin"
 
-#: src/compose.c:5436
+#: src/compose.c:5445
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Dòng lệnh cho trình soạn thảo ngoài không hợp lệ: `%s'\n"
 
-#: src/compose.c:5482
+#: src/compose.c:5491
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1796,44 +1807,44 @@ msgstr ""
 "Bắt buộc dừng tiến trình?\n"
 "id của nhóm tiến trình: %d"
 
-#: src/compose.c:5857 src/compose.c:5862 src/compose.c:5868
+#: src/compose.c:5866 src/compose.c:5871 src/compose.c:5877
 msgid "Can't queue the message."
 msgstr "Không thể xếp hàng thông điệp"
 
-#: src/compose.c:5959
+#: src/compose.c:5968
 msgid "Select files"
 msgstr "Chọn tập tin"
 
-#: src/compose.c:5982
+#: src/compose.c:5991
 msgid "Select file"
 msgstr "Chọn tập tin"
 
-#: src/compose.c:6017
+#: src/compose.c:6026
 msgid "Save message"
 msgstr "Lưu thư"
 
-#: src/compose.c:6018
+#: src/compose.c:6027
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Nội dung đã được thay đổi. Lưu vào thư mục nháp?"
 
-#: src/compose.c:6020
+#: src/compose.c:6029
 msgid "Close _without saving"
 msgstr "_Không lưu"
 
-#: src/compose.c:6062
+#: src/compose.c:6071
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Bạn có muốn dùng mẫu `%s' ?"
 
-#: src/compose.c:6064
+#: src/compose.c:6073
 msgid "Apply template"
 msgstr "Dùng mẫu"
 
-#: src/compose.c:6065
+#: src/compose.c:6074
 msgid "_Replace"
 msgstr "_Thay thế"
 
-#: src/compose.c:6065
+#: src/compose.c:6074
 msgid "_Insert"
 msgstr "_Chèn"
 
@@ -2270,7 +2281,7 @@ msgstr "Mới"
 
 #. S_COL_MARK
 #: src/folderview.c:412 src/prefs_filter_edit.c:500
-#: src/prefs_summary_column.c:71 src/summaryview.c:509
+#: src/prefs_summary_column.c:71 src/summaryview.c:511
 msgid "Unread"
 msgstr "Chưa đọc"
 
@@ -2286,12 +2297,12 @@ msgstr "Thiết lập thông tin thư mục...\n"
 msgid "Setting folder info..."
 msgstr "Thiết lập thông tin thư mục..."
 
-#: src/folderview.c:858 src/mainwindow.c:3464 src/setup.c:80
+#: src/folderview.c:858 src/mainwindow.c:3481 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Đang quét thư mục %s%c%s ..."
 
-#: src/folderview.c:862 src/mainwindow.c:3469 src/setup.c:85
+#: src/folderview.c:862 src/mainwindow.c:3486 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Đang quét thư mục %s ..."
@@ -2316,7 +2327,7 @@ msgstr "Việc làm lại cây thư mục thất bại."
 msgid "Checking for new messages in all folders..."
 msgstr "Kiểm tra thư mới trong mọi thư mục..."
 
-#: src/folderview.c:1200 src/mainwindow.c:2400 src/prefs_common_dialog.c:1789
+#: src/folderview.c:1200 src/mainwindow.c:2411 src/prefs_common_dialog.c:1789
 msgid "Junk"
 msgstr "Rác"
 
@@ -2457,7 +2468,7 @@ msgstr "Tiêu đề:"
 msgid "Creating header view...\n"
 msgstr "Đang tạo khung xem header...\n"
 
-#: src/headerview.c:180 src/query_search.c:637 src/summaryview.c:2110
+#: src/headerview.c:180 src/query_search.c:637 src/summaryview.c:2127
 msgid "(No From)"
 msgstr "(Không rõ người gửi)"
 
@@ -2566,7 +2577,7 @@ msgstr "Nhập khẩu tập tin LDIF vào sổ địa chỉ"
 msgid "Prev"
 msgstr "Trước"
 
-#: src/importldif.c:768 src/mainwindow.c:2420
+#: src/importldif.c:768 src/mainwindow.c:2431
 msgid "Next"
 msgstr "Tiếp"
 
@@ -2918,11 +2929,11 @@ msgstr ""
 msgid "another Sylpheed is already running.\n"
 msgstr "một tiến trình Sylpheed khác đang chạy.\n"
 
-#: src/main.c:1064
+#: src/main.c:1083
 msgid "Migration of configuration"
 msgstr "Di trú cấu hình"
 
-#: src/main.c:1065
+#: src/main.c:1084
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -2930,635 +2941,640 @@ msgstr ""
 "Tìm thấy phiên bản trước của cấu hình.\n"
 "Bạn có muốn di trú nó không?"
 
-#: src/mainwindow.c:478
+#: src/mainwindow.c:481
 msgid "/_File/_Folder"
 msgstr "/_Tập tin/_Thư mục"
 
-#: src/mainwindow.c:479
+#: src/mainwindow.c:482
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/_Tập tin/_Thư mục/_Tạo thư mục mới..."
 
-#: src/mainwindow.c:481
+#: src/mainwindow.c:484
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/_Tập tin/_Thư mục/Đổi tê_n thư mục..."
 
-#: src/mainwindow.c:482
+#: src/mainwindow.c:485
 msgid "/_File/_Folder/_Move folder..."
 msgstr "/_Tập tin/_Thư mục/_Di chuyển thư mục"
 
-#: src/mainwindow.c:483
+#: src/mainwindow.c:486
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/_Tập tin/_Thư mục/_Xoá thư mục"
 
-#: src/mainwindow.c:484
+#: src/mainwindow.c:487
 msgid "/_File/_Mailbox"
 msgstr "/_Tập tin/_Hộp thư"
 
-#: src/mainwindow.c:485
+#: src/mainwindow.c:488
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/_Tập tin/_Hộp thư/_Thêm hộp thư..."
 
-#: src/mainwindow.c:486
+#: src/mainwindow.c:489
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/_Tập tin/_Hộp thư/_Xoá hộp thư"
 
-#: src/mainwindow.c:487 src/mainwindow.c:492
+#: src/mainwindow.c:490 src/mainwindow.c:495
 msgid "/_File/_Mailbox/---"
 msgstr "/_Tập tin/_Hộp thư/---"
 
-#: src/mainwindow.c:488
+#: src/mainwindow.c:491
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "/_Tập tin/_Hộp thư/_Kiểm tra thư mới"
 
-#: src/mainwindow.c:490
+#: src/mainwindow.c:493
 msgid "/_File/_Mailbox/Check for new messages in _all mailboxes"
 msgstr "/_Tập tin/_Hộp thư/Kiể_m tra thư mới ở mọi hộp thư"
 
-#: src/mainwindow.c:493
+#: src/mainwindow.c:496
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "/_Tập tin/_Hộp thư/_Làm lại cây thư mục"
 
-#: src/mainwindow.c:496
+#: src/mainwindow.c:499
 msgid "/_File/_Import mbox file..."
 msgstr "/_Tập tin/_Nhập khẩu tập tin mbox..."
 
-#: src/mainwindow.c:497
+#: src/mainwindow.c:500
 msgid "/_File/_Export to mbox file..."
 msgstr "/_Tập tin/_Xuất khẩu tập tin mbox..."
 
-#: src/mainwindow.c:499
+#: src/mainwindow.c:502
 msgid "/_File/Empty all _trash"
 msgstr "/_Tập tin/Đổ _rác"
 
-#: src/mainwindow.c:501 src/messageview.c:139
+#: src/mainwindow.c:504 src/messageview.c:139
 msgid "/_File/_Save as..."
 msgstr "/_Tập tin/_Lưu là..."
 
-#: src/mainwindow.c:502 src/messageview.c:140
+#: src/mainwindow.c:505 src/messageview.c:140
 msgid "/_File/_Print..."
 msgstr "/_Tập tin/I_n..."
 
-#: src/mainwindow.c:504
+#: src/mainwindow.c:507
 msgid "/_File/_Work offline"
 msgstr "/_Tập tin/Làm _việc ngoại tuyến"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:507
+#: src/mainwindow.c:510
 msgid "/_File/E_xit"
 msgstr "/_Tập tin/Th_oát"
 
-#: src/mainwindow.c:512
+#: src/mainwindow.c:515
 msgid "/_Edit/Select _thread"
 msgstr "/_Soạn/_Chọn luồng"
 
-#: src/mainwindow.c:514 src/messageview.c:148
+#: src/mainwindow.c:517 src/messageview.c:148
 msgid "/_Edit/_Find in current message..."
 msgstr "/_Soạn/_Tìm trong thư hiện tại..."
 
-#: src/mainwindow.c:516
+#: src/mainwindow.c:519
 msgid "/_Edit/_Search messages..."
 msgstr "/_Soạn/Tìm _kiếm thư..."
 
-#: src/mainwindow.c:519
+#: src/mainwindow.c:522
 msgid "/_View/Show or hi_de"
 msgstr "/_Xem/_Hiện hoặc ẩn"
 
-#: src/mainwindow.c:520
+#: src/mainwindow.c:523
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/_Xem/_Hiện hoặc ẩn/_Cây thư mục"
 
-#: src/mainwindow.c:522
+#: src/mainwindow.c:525
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/_Xem/_Hiện hoặc ẩn/_Khung xem thư"
 
-#: src/mainwindow.c:524
+#: src/mainwindow.c:527
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/_Xem/_Hiện hoặc ẩn/_Thanh công cụ"
 
-#: src/mainwindow.c:526
+#: src/mainwindow.c:529
 msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/_Xem/_Hiện hoặc ẩn/_Thanh công cụ/Biểu tượng _và nhãn"
 
-#: src/mainwindow.c:528
+#: src/mainwindow.c:531
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/_Xem/_Hiện hoặc ẩn/_Thanh công cụ/_Biểu tượng"
 
-#: src/mainwindow.c:530
+#: src/mainwindow.c:533
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/_Xem/_Hiện hoặc ẩn/_Thanh công cụ/_Nhãn"
 
-#: src/mainwindow.c:532
+#: src/mainwindow.c:535
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/_Xem/_Hiện hoặc ẩn/_Thanh công cụ/_Không"
 
-#: src/mainwindow.c:534
+#: src/mainwindow.c:537
 #, fuzzy
 msgid "/_View/Show or hi_de/_Search bar"
 msgstr "/_Xem/_Hiện hoặc ẩn/T_hanh trạng thái"
 
-#: src/mainwindow.c:536
+#: src/mainwindow.c:539
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/_Xem/_Hiện hoặc ẩn/T_hanh trạng thái"
 
-#: src/mainwindow.c:539
+#: src/mainwindow.c:542
 msgid "/_View/Separate f_older tree"
 msgstr "/_Xem/_Cây thư mục riêng rẽ"
 
-#: src/mainwindow.c:540
+#: src/mainwindow.c:543
 msgid "/_View/Separate _message view"
 msgstr "/_Xem/_Khung xem thư riêng rẽ"
 
-#: src/mainwindow.c:542
+#: src/mainwindow.c:545
 msgid "/_View/_Sort"
 msgstr "/_Xem/_Sắp xếp"
 
-#: src/mainwindow.c:543
+#: src/mainwindow.c:546
 msgid "/_View/_Sort/by _number"
 msgstr "/_Xem/_Sắp xếp/theo _số"
 
-#: src/mainwindow.c:544
+#: src/mainwindow.c:547
 msgid "/_View/_Sort/by s_ize"
 msgstr "/_Xem/_Sắp xếp/theo _kích thước"
 
-#: src/mainwindow.c:545
+#: src/mainwindow.c:548
 msgid "/_View/_Sort/by _date"
 msgstr "/_Xem/_Sắp xếp/th_eo thời gian"
 
-#: src/mainwindow.c:546
+#: src/mainwindow.c:549
 #, fuzzy
 msgid "/_View/_Sort/by t_hread date"
 msgstr "/_Xem/_Sắp xếp/th_eo thời gian"
 
-#: src/mainwindow.c:547
+#: src/mainwindow.c:550
 msgid "/_View/_Sort/by _from"
 msgstr "/_Xem/_Sắp xếp/theo người _gửi"
 
-#: src/mainwindow.c:548
+#: src/mainwindow.c:551
 msgid "/_View/_Sort/by _recipient"
 msgstr "/_Xem/_Sắp xếp/theo người _nhận"
 
-#: src/mainwindow.c:549
+#: src/mainwindow.c:552
 msgid "/_View/_Sort/by _subject"
 msgstr "/_Xem/_Sắp xếp/theo tiê_u đề"
 
-#: src/mainwindow.c:550
+#: src/mainwindow.c:553
 msgid "/_View/_Sort/by _color label"
 msgstr "/_Xem/_Sắp xếp/theo nhãn _màu"
 
-#: src/mainwindow.c:552
+#: src/mainwindow.c:555
 msgid "/_View/_Sort/by _mark"
 msgstr "/_Xem/_Sắp xếp/theo đánh _dấu"
 
-#: src/mainwindow.c:553
+#: src/mainwindow.c:556
 msgid "/_View/_Sort/by _unread"
 msgstr "/_Xem/_Sắp xếp/theo _chưa đọc"
 
-#: src/mainwindow.c:554
+#: src/mainwindow.c:557
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/_Xem/_Sắp xếp/theo đín_h kèm"
 
-#: src/mainwindow.c:556
+#: src/mainwindow.c:559
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/_Xem/_Sắp xếp/Không sắp _xếp"
 
-#: src/mainwindow.c:557 src/mainwindow.c:560
+#: src/mainwindow.c:560 src/mainwindow.c:563
 msgid "/_View/_Sort/---"
 msgstr "/_Xem/_Sắp xếp/---"
 
-#: src/mainwindow.c:558
+#: src/mainwindow.c:561
 msgid "/_View/_Sort/Ascending"
 msgstr "/_Xem/_Sắp xếp/_Tăng dần"
 
-#: src/mainwindow.c:559
+#: src/mainwindow.c:562
 msgid "/_View/_Sort/Descending"
 msgstr "/_Xem/_Sắp xếp/_Giảm dần"
 
-#: src/mainwindow.c:561
+#: src/mainwindow.c:564
 msgid "/_View/_Sort/_Attract by subject"
 msgstr ""
 
-#: src/mainwindow.c:563
+#: src/mainwindow.c:566
 msgid "/_View/Th_read view"
 msgstr "/_Xem/_Xem theo luồng"
 
-#: src/mainwindow.c:564
+#: src/mainwindow.c:567
 msgid "/_View/E_xpand all threads"
 msgstr "/_Xem/Mở mọi l_uồng"
 
-#: src/mainwindow.c:565
+#: src/mainwindow.c:568
 msgid "/_View/Co_llapse all threads"
 msgstr "/_Xem/Đón_g mọi luồng"
 
-#: src/mainwindow.c:566
+#: src/mainwindow.c:569
 msgid "/_View/Set display _item..."
 msgstr "/_Xem/Chọ_n mục hiển thị..."
 
-#: src/mainwindow.c:569
+#: src/mainwindow.c:572
 msgid "/_View/_Go to"
 msgstr "/_Xem/Đi _tới"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:573
 msgid "/_View/_Go to/_Prev message"
 msgstr "/_Xem/Đi _tới/Thư _trước"
 
-#: src/mainwindow.c:571
+#: src/mainwindow.c:574
 msgid "/_View/_Go to/_Next message"
 msgstr "/_Xem/Đi _tới/Thư tiế_p theo"
 
-#: src/mainwindow.c:572 src/mainwindow.c:577 src/mainwindow.c:580
-#: src/mainwindow.c:585 src/mainwindow.c:590
+#: src/mainwindow.c:575 src/mainwindow.c:580 src/mainwindow.c:583
+#: src/mainwindow.c:588 src/mainwindow.c:593
 msgid "/_View/_Go to/---"
 msgstr "/_Xem/Đi _tới/---"
 
-#: src/mainwindow.c:573
+#: src/mainwindow.c:576
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/_Xem/Đi _tới/Thư trước (_chưa đọc)"
 
-#: src/mainwindow.c:575
+#: src/mainwindow.c:578
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/_Xem/Đi _tới/Thư tiếp theo (chư_a đọc)"
 
-#: src/mainwindow.c:578
+#: src/mainwindow.c:581
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/_Xem/Đi _tới/Thư trước (_mới)"
 
-#: src/mainwindow.c:579
+#: src/mainwindow.c:582
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/_Xem/Đi _tới/T_hư tiếp theo (mới)"
 
-#: src/mainwindow.c:581
+#: src/mainwindow.c:584
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/_Xem/Đi _tới/Thư trước (đánh _dấu)"
 
-#: src/mainwindow.c:583
+#: src/mainwindow.c:586
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/_Xem/Đi _tới/Thư tiếp the_o (đánh dấu)"
 
-#: src/mainwindow.c:586
+#: src/mainwindow.c:589
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/_Xem/Đi _tới/Thư trước (đã _gán nhãn)"
 
-#: src/mainwindow.c:588
+#: src/mainwindow.c:591
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/_Xem/Đi _tới/Thư tiếp th_eo (đã gán nhãn)"
 
-#: src/mainwindow.c:591
+#: src/mainwindow.c:594
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Xem/Đi _tới/Thư mụ_c khác..."
 
-#: src/mainwindow.c:600 src/messageview.c:159
+#: src/mainwindow.c:603 src/messageview.c:159
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Xem/Mã _kí tự/_Tự động xác định"
 
-#: src/mainwindow.c:613 src/messageview.c:172
+#: src/mainwindow.c:616 src/messageview.c:172
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr "/_Xem/Mã _kí tự/Đông Âu (ISO-8859-15)"
 
-#: src/mainwindow.c:653 src/messageview.c:205
+#: src/mainwindow.c:662 src/messageview.c:210
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Xem/Mã _kí tự/Nhật Bản (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:655 src/messageview.c:207
+#: src/mainwindow.c:664 src/messageview.c:212
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Xem/Mã _kí tự/Nhật Bản (_EUC-JP)"
 
-#: src/mainwindow.c:657 src/messageview.c:209
+#: src/mainwindow.c:666 src/messageview.c:214
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Xem/Mã _kí tự/Nhật Bản (_Shift__JIS)"
 
-#: src/mainwindow.c:667 src/messageview.c:218
+#: src/mainwindow.c:676 src/messageview.c:223
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Xem/Mã _kí tự/Hán phồn thể (EUC-_TW)"
 
-#: src/mainwindow.c:669 src/messageview.c:220
+#: src/mainwindow.c:678 src/messageview.c:225
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Xem/Mã _kí tự/Hán (ISO-2022-_CN)"
 
-#: src/mainwindow.c:675 src/messageview.c:225
+#: src/mainwindow.c:684 src/messageview.c:230
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Xem/Mã _kí tự/Triều Tiên (ISO-2022-KR)"
 
-#: src/mainwindow.c:688 src/summaryview.c:449
+#: src/mainwindow.c:697 src/summaryview.c:451
 msgid "/_View/Open in new _window"
 msgstr "/_Xem/_Mở trong cửa sổ mới"
 
-#: src/mainwindow.c:689 src/messageview.c:237
+#: src/mainwindow.c:698 src/messageview.c:242
 msgid "/_View/Mess_age source"
 msgstr "/_Xem/_Nguồn thư"
 
-#: src/mainwindow.c:690 src/messageview.c:238
+#: src/mainwindow.c:699 src/messageview.c:243
 msgid "/_View/Show all _header"
 msgstr "/_Xem/_Hiện mọi header"
 
-#: src/mainwindow.c:692
+#: src/mainwindow.c:701
 msgid "/_View/_Update summary"
 msgstr "/_Xem/_Cập nhật tóm tắt"
 
-#: src/mainwindow.c:694 src/messageview.c:240
+#: src/mainwindow.c:703 src/messageview.c:245
 msgid "/_Message"
 msgstr "/_Thư"
 
-#: src/mainwindow.c:695
+#: src/mainwindow.c:704
 msgid "/_Message/Recei_ve"
 msgstr "/_Thư/_Nhận"
 
-#: src/mainwindow.c:696
+#: src/mainwindow.c:705
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/_Thư/_Nhận/_Từ tài khoản mặc định"
 
-#: src/mainwindow.c:698
+#: src/mainwindow.c:707
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/_Thư/_Nhận/Từ _mọi tài khoản"
 
-#: src/mainwindow.c:700
+#: src/mainwindow.c:709
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/_Thư/_Nhận/_Huỷ bỏ việc lấy thư"
 
-#: src/mainwindow.c:702
+#: src/mainwindow.c:711
 msgid "/_Message/Recei_ve/---"
 msgstr "/_Thư/_Nhận/---"
 
-#: src/mainwindow.c:703
+#: src/mainwindow.c:712
 msgid "/_Message/_Send queued messages"
 msgstr "/_Thư/_Nhận/_Gửi thư đang xếp hàng"
 
-#: src/mainwindow.c:704 src/mainwindow.c:706 src/mainwindow.c:713
-#: src/mainwindow.c:718 src/mainwindow.c:721 src/mainwindow.c:730
-#: src/mainwindow.c:732 src/mainwindow.c:735 src/messageview.c:243
-#: src/messageview.c:251 src/messageview.c:256
+#: src/mainwindow.c:713 src/mainwindow.c:715 src/mainwindow.c:722
+#: src/mainwindow.c:727 src/mainwindow.c:730 src/mainwindow.c:741
+#: src/mainwindow.c:743 src/mainwindow.c:746 src/messageview.c:248
+#: src/messageview.c:256 src/messageview.c:261
 msgid "/_Message/---"
 msgstr "/_Thư/---"
 
-#: src/mainwindow.c:705 src/messageview.c:241
+#: src/mainwindow.c:714 src/messageview.c:246
 msgid "/_Message/Compose _new message"
 msgstr "/_Thư/_Viết thư mới"
 
-#: src/mainwindow.c:707 src/messageview.c:244
+#: src/mainwindow.c:716 src/messageview.c:249
 msgid "/_Message/_Reply"
 msgstr "/_Thư/_Hồi âm"
 
-#: src/mainwindow.c:708
+#: src/mainwindow.c:717
 msgid "/_Message/Repl_y to"
 msgstr "/_Thư/Hồi â_m tới"
 
-#: src/mainwindow.c:709 src/messageview.c:245
+#: src/mainwindow.c:718 src/messageview.c:250
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Thư/Hồi â_m tới/_tất cả"
 
-#: src/mainwindow.c:710 src/messageview.c:247
+#: src/mainwindow.c:719 src/messageview.c:252
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Thư/Hồi â_m tới/_người gửi"
 
-#: src/mainwindow.c:711 src/messageview.c:249
+#: src/mainwindow.c:720 src/messageview.c:254
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Thư/Hồi â_m tới/_hộp thư chung"
 
-#: src/mainwindow.c:714 src/messageview.c:252
+#: src/mainwindow.c:723 src/messageview.c:257
 msgid "/_Message/_Forward"
 msgstr "/_Thư/_Chuyển tiếp"
 
-#: src/mainwindow.c:715 src/messageview.c:253
+#: src/mainwindow.c:724 src/messageview.c:258
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Thư/Ch_uyển tiếp ở dạng đính kèm"
 
-#: src/mainwindow.c:717 src/messageview.c:255
+#: src/mainwindow.c:726 src/messageview.c:260
 msgid "/_Message/Redirec_t"
 msgstr "/_Thư/Chu_yển hướng"
 
-#: src/mainwindow.c:719
+#: src/mainwindow.c:728
 msgid "/_Message/M_ove..."
 msgstr "/_Thư/_Di chuyển..."
 
-#: src/mainwindow.c:720
+#: src/mainwindow.c:729
 msgid "/_Message/_Copy..."
 msgstr "/_Thư/_Sao chép"
 
-#: src/mainwindow.c:722
+#: src/mainwindow.c:731
 msgid "/_Message/_Mark"
 msgstr "/_Thư/Đánh _dấu"
 
-#: src/mainwindow.c:723
+#: src/mainwindow.c:732
 msgid "/_Message/_Mark/_Mark"
 msgstr "/_Thư/Đánh _dấu/Đánh _dấu"
 
-#: src/mainwindow.c:724
+#: src/mainwindow.c:733
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/_Thư/Đánh _dấu/_Bỏ đánh dấu"
 
-#: src/mainwindow.c:725
+#: src/mainwindow.c:734
 msgid "/_Message/_Mark/---"
 msgstr "/_Thư/Đánh _dấu/---"
 
-#: src/mainwindow.c:726
+#: src/mainwindow.c:735
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/_Thư/Đánh _dấu/C_hưa đọc"
 
-#: src/mainwindow.c:727
+#: src/mainwindow.c:736
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/_Thư/Đánh _dấu/Đã đọ_c"
 
-#: src/mainwindow.c:729
+#: src/mainwindow.c:738
+#, fuzzy
+msgid "/_Message/_Mark/Mark _thread as read"
+msgstr "/_Thư/Đánh _dấu/Đã đọ_c"
+
+#: src/mainwindow.c:740
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/_Thư/Đánh _dấu/Đã đọc _tất cả"
 
-#: src/mainwindow.c:731
+#: src/mainwindow.c:742
 msgid "/_Message/_Delete"
 msgstr "/_Thư/_Xoá"
 
-#: src/mainwindow.c:733
+#: src/mainwindow.c:744
 msgid "/_Message/Set as _junk mail"
 msgstr "/_Thư/Đánh dấu là thư _rác"
 
-#: src/mainwindow.c:734
+#: src/mainwindow.c:745
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/_Thư/Đánh dấu _không là thư rác"
 
-#: src/mainwindow.c:736 src/messageview.c:257
+#: src/mainwindow.c:747 src/messageview.c:262
 msgid "/_Message/Re-_edit"
 msgstr "/_Thư/S_oạn lại"
 
-#: src/mainwindow.c:740
+#: src/mainwindow.c:751
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/_Công cụ/_Thêm người gửi vào sổ địa chỉ..."
 
-#: src/mainwindow.c:743
+#: src/mainwindow.c:754
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/_Công cụ/_Lọc mọi thư trong thư mục"
 
-#: src/mainwindow.c:745
+#: src/mainwindow.c:756
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Công cụ/Lọ_c các thư đã chọn"
 
-#: src/mainwindow.c:747 src/messageview.c:264
+#: src/mainwindow.c:758 src/messageview.c:269
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Công cụ/Tạo _quy tắc lọc"
 
-#: src/mainwindow.c:748 src/messageview.c:266
+#: src/mainwindow.c:759 src/messageview.c:271
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Công cụ/Tạo _quy tắc lọc/_Tự động"
 
-#: src/mainwindow.c:750 src/messageview.c:268
+#: src/mainwindow.c:761 src/messageview.c:273
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Công cụ/Tạo _quy tắc lọc/theo _Người gửi"
 
-#: src/mainwindow.c:752 src/messageview.c:270
+#: src/mainwindow.c:763 src/messageview.c:275
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Công cụ/Tạo _quy tắc lọc/theo N_gười nhận"
 
-#: src/mainwindow.c:754 src/messageview.c:272
+#: src/mainwindow.c:765 src/messageview.c:277
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Công cụ/Tạo _quy tắc lọc/theo Tiê_u đề"
 
-#: src/mainwindow.c:757
+#: src/mainwindow.c:768
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/_Công cụ/Lọc _thư rác trong thư mục"
 
-#: src/mainwindow.c:759
+#: src/mainwindow.c:770
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/_Công cụ/Lọc thư _rác trong các thư đã chọn"
 
-#: src/mainwindow.c:764
+#: src/mainwindow.c:775
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/_Công cụ/_Xoá thư trùng"
 
-#: src/mainwindow.c:767
+#: src/mainwindow.c:778
 msgid "/_Tools/E_xecute"
 msgstr "/_Công cụ/Chạ_y"
 
-#: src/mainwindow.c:769
+#: src/mainwindow.c:780
 msgid "/_Tools/_Log window"
 msgstr "/_Công cụ/Cửa sổ theo _dõi"
 
-#: src/mainwindow.c:771
+#: src/mainwindow.c:782
 msgid "/_Configuration"
 msgstr "/Cấ_u hình"
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:783
 msgid "/_Configuration/_Common preferences..."
 msgstr "/Cấ_u hình/_Cấu hình chung..."
 
-#: src/mainwindow.c:774
+#: src/mainwindow.c:785
 msgid "/_Configuration/_Filter setting..."
 msgstr "/Cấ_u hình/_Thiết lập bộ lọc..."
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:787
 msgid "/_Configuration/_Template..."
 msgstr "/Cấ_u hình/_Mẫu..."
 
-#: src/mainwindow.c:777
+#: src/mainwindow.c:788
 msgid "/_Configuration/_Actions..."
 msgstr "/Cấ_u hình/_Hành động..."
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:789
 msgid "/_Configuration/---"
 msgstr "/Cấ_u hình/---"
 
-#: src/mainwindow.c:779
+#: src/mainwindow.c:790
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/Cấ_u hình/Cấ_u hình cho tài khoản mặc định..."
 
-#: src/mainwindow.c:781
+#: src/mainwindow.c:792
 msgid "/_Configuration/Create _new account..."
 msgstr "/Cấ_u hình/Tạ_o tài khoản mới..."
 
-#: src/mainwindow.c:783
+#: src/mainwindow.c:794
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/Cấ_u hình/_Sửa tài khoản..."
 
-#: src/mainwindow.c:785
+#: src/mainwindow.c:796
 msgid "/_Configuration/C_hange current account"
 msgstr "/Cấ_u hình/Đổi tài _khoản mặc định"
 
-#: src/mainwindow.c:789
+#: src/mainwindow.c:800
 msgid "/_Help/_Manual"
 msgstr "/_Hỗ trợ/_Sổ tay hướng dẫn"
 
-#: src/mainwindow.c:790
+#: src/mainwindow.c:801
 msgid "/_Help/_Manual/_English"
 msgstr "/Cấ_u hình/_Sổ tay hướng dẫn/Tiếng _Anh"
 
-#: src/mainwindow.c:791
+#: src/mainwindow.c:802
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/Cấ_u hình/_Sổ tay hướng dẫn/Tiếng _Nhật"
 
-#: src/mainwindow.c:792
+#: src/mainwindow.c:803
 msgid "/_Help/_FAQ"
 msgstr "/Cấ_u hình/_Câu hỏi thường gặp"
 
-#: src/mainwindow.c:793
+#: src/mainwindow.c:804
 msgid "/_Help/_FAQ/_English"
 msgstr "/Cấ_u hình/_Câu hỏi thường gặp/Tiếng _Anh"
 
-#: src/mainwindow.c:794
+#: src/mainwindow.c:805
 msgid "/_Help/_FAQ/_German"
 msgstr "/Cấ_u hình/_Câu hỏi thường gặp/Tiếng Đứ_c"
 
-#: src/mainwindow.c:795
+#: src/mainwindow.c:806
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/Cấ_u hình/_Câu hỏi thường gặp/Tiếng _Tây Ban Nha"
 
-#: src/mainwindow.c:796
+#: src/mainwindow.c:807
 msgid "/_Help/_FAQ/_French"
 msgstr "/Cấ_u hình/_Câu hỏi thường gặp/Tiếng _Pháp"
 
-#: src/mainwindow.c:797
+#: src/mainwindow.c:808
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/Cấ_u hình/_Câu hỏi thường gặp/_Tiếng Italia"
 
-#: src/mainwindow.c:798
+#: src/mainwindow.c:809
 msgid "/_Help/---"
 msgstr "/Cấ_u hình/---"
 
-#: src/mainwindow.c:841
+#: src/mainwindow.c:852
 msgid "Creating main window...\n"
 msgstr "Đang tạo cửa sổ chính...\n"
 
-#: src/mainwindow.c:1011
+#: src/mainwindow.c:1022
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Cửa sổ chính: việc cấp màu %d thất bại\n"
 
-#: src/mainwindow.c:1108 src/summaryview.c:2258 src/summaryview.c:2343
-#: src/summaryview.c:3739 src/summaryview.c:3868 src/summaryview.c:4226
+#: src/mainwindow.c:1119 src/summaryview.c:2275 src/summaryview.c:2360
+#: src/summaryview.c:3896 src/summaryview.c:4025 src/summaryview.c:4383
 msgid "done.\n"
 msgstr "xong.\n"
 
-#: src/mainwindow.c:1235 src/mainwindow.c:1276 src/mainwindow.c:1301
+#: src/mainwindow.c:1246 src/mainwindow.c:1287 src/mainwindow.c:1312
 msgid "Untitled"
 msgstr "Chưa đặt tên"
 
-#: src/mainwindow.c:1302
+#: src/mainwindow.c:1313
 msgid "none"
 msgstr "không"
 
-#: src/mainwindow.c:1355
+#: src/mainwindow.c:1366
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "Đổi kiểu vạch phân cách cửa sổ từ %d sang %d\n"
 
-#: src/mainwindow.c:1605
+#: src/mainwindow.c:1616
 msgid "Offline"
 msgstr "Ngoại tuyến"
 
-#: src/mainwindow.c:1606
+#: src/mainwindow.c:1617
 msgid "You are offline. Go online?"
 msgstr "Bạn đang ngoại tuyến. Chuyển sang trực tuyến?"
 
-#: src/mainwindow.c:1623
+#: src/mainwindow.c:1634
 msgid "Empty all trash"
 msgstr "Đổ mọi thùng rác"
 
-#: src/mainwindow.c:1624
+#: src/mainwindow.c:1635
 #, fuzzy
 msgid "Delete all messages in trash folders?"
 msgstr "Xoá mọi thư trong thùng rác?"
 
-#: src/mainwindow.c:1652
+#: src/mainwindow.c:1663
 msgid "Add mailbox"
 msgstr "Thêm hộp thư"
 
-#: src/mainwindow.c:1653
+#: src/mainwindow.c:1664
 #, fuzzy
 msgid ""
 "Specify the location of mailbox.\n"
@@ -3569,16 +3585,16 @@ msgstr ""
 "Nếu hộp thư có trước được chỉ định, nó sẽ được\n"
 "tự động quét."
 
-#: src/mainwindow.c:1659 src/setup.c:49
+#: src/mainwindow.c:1670 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Hộp thư `%s' đã có trước."
 
-#: src/mainwindow.c:1664 src/setup.c:56
+#: src/mainwindow.c:1675 src/setup.c:56
 msgid "Mailbox"
 msgstr "Hộp thư"
 
-#: src/mainwindow.c:1670 src/setup.c:62
+#: src/mainwindow.c:1681 src/setup.c:62
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3587,145 +3603,145 @@ msgstr ""
 "Việc tạo hộp thư đã thất bại.\n"
 "Có thể một số tập tin đã có trước, hoặc bạn không có quyền ghi lên đó."
 
-#: src/mainwindow.c:2088
+#: src/mainwindow.c:2099
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Khung thư mục"
 
-#: src/mainwindow.c:2107
+#: src/mainwindow.c:2118
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Khung đọc thư"
 
-#: src/mainwindow.c:2259 src/summaryview.c:408
+#: src/mainwindow.c:2270 src/summaryview.c:408
 msgid "/_Reply"
 msgstr "/_Hồi âm"
 
-#: src/mainwindow.c:2260
+#: src/mainwindow.c:2271
 msgid "/Reply to _all"
 msgstr "/Hồi âm _tất cả"
 
-#: src/mainwindow.c:2261
+#: src/mainwindow.c:2272
 msgid "/Reply to _sender"
 msgstr "/Hồi âm cho người _gửi"
 
-#: src/mainwindow.c:2262
+#: src/mainwindow.c:2273
 msgid "/Reply to mailing _list"
 msgstr "/Hồi âm cho _hộp thư chung"
 
-#: src/mainwindow.c:2267 src/summaryview.c:415
+#: src/mainwindow.c:2278 src/summaryview.c:415
 msgid "/_Forward"
 msgstr "/_Chuyển tiếp"
 
-#: src/mainwindow.c:2268 src/summaryview.c:416
+#: src/mainwindow.c:2279 src/summaryview.c:416
 msgid "/For_ward as attachment"
 msgstr "/Ch_uyển tiếp ở dạng đính kèm"
 
-#: src/mainwindow.c:2269 src/summaryview.c:417
+#: src/mainwindow.c:2280 src/summaryview.c:417
 msgid "/Redirec_t"
 msgstr "/Chu_yển hướng"
 
-#: src/mainwindow.c:2305
+#: src/mainwindow.c:2316
 msgid "Get"
 msgstr "Lấy"
 
-#: src/mainwindow.c:2306
+#: src/mainwindow.c:2317
 msgid "Incorporate new mail"
 msgstr "Sáp nhập thư mới"
 
-#: src/mainwindow.c:2313
+#: src/mainwindow.c:2324
 msgid "Get all"
 msgstr "Lấy tất"
 
-#: src/mainwindow.c:2314
+#: src/mainwindow.c:2325
 msgid "Incorporate new mail of all accounts"
 msgstr "Sáp nhật thư mới của mọi tài khoản"
 
-#: src/mainwindow.c:2325
+#: src/mainwindow.c:2336
 msgid "Send queued message(s)"
 msgstr "Gửi thư đang đợi"
 
-#: src/mainwindow.c:2335 src/prefs_account_dialog.c:530
+#: src/mainwindow.c:2346 src/prefs_account_dialog.c:530
 #: src/prefs_common_dialog.c:663 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "Viết thư"
 
-#: src/mainwindow.c:2336
+#: src/mainwindow.c:2347
 msgid "Compose new message"
 msgstr "Viết thư mới"
 
-#: src/mainwindow.c:2344 src/prefs_common_dialog.c:975
+#: src/mainwindow.c:2355 src/prefs_common_dialog.c:975
 msgid "Reply"
 msgstr "Hồi âm"
 
-#: src/mainwindow.c:2345 src/mainwindow.c:2358
+#: src/mainwindow.c:2356 src/mainwindow.c:2369
 msgid "Reply to the message"
 msgstr "Hồi âm cho thư"
 
-#: src/mainwindow.c:2362
+#: src/mainwindow.c:2373
 msgid "Reply all"
 msgstr "Hồi âm tất cả"
 
-#: src/mainwindow.c:2363
+#: src/mainwindow.c:2374
 msgid "Reply to all"
 msgstr "Hồi âm cho tất cả"
 
-#: src/mainwindow.c:2371 src/prefs_filter_edit.c:672
+#: src/mainwindow.c:2382 src/prefs_filter_edit.c:672
 msgid "Forward"
 msgstr "Chuyển tiếp"
 
-#: src/mainwindow.c:2372 src/mainwindow.c:2385
+#: src/mainwindow.c:2383 src/mainwindow.c:2396
 msgid "Forward the message"
 msgstr "Chuyển tiếp thư"
 
-#: src/mainwindow.c:2392
+#: src/mainwindow.c:2403
 msgid "Delete the message"
 msgstr "Xoá thư"
 
-#: src/mainwindow.c:2401
+#: src/mainwindow.c:2412
 msgid "Set as junk mail"
 msgstr "Coi là thư rác"
 
-#: src/mainwindow.c:2410
+#: src/mainwindow.c:2421
 msgid "Execute"
 msgstr "Chạy"
 
-#: src/mainwindow.c:2411
+#: src/mainwindow.c:2422
 msgid "Execute marked process"
 msgstr "Chạy tiến trình đã đánh dấu"
 
-#: src/mainwindow.c:2421
+#: src/mainwindow.c:2432
 msgid "Next unread message"
 msgstr "Thư chưa đọc tiếp theo"
 
-#: src/mainwindow.c:2433
+#: src/mainwindow.c:2444
 msgid "Prefs"
 msgstr ""
 
-#: src/mainwindow.c:2434
+#: src/mainwindow.c:2445
 msgid "Common preferences"
 msgstr "Cấu hình chung"
 
-#: src/mainwindow.c:2442 src/prefs_folder_item.c:289
+#: src/mainwindow.c:2453 src/prefs_folder_item.c:289
 #: src/prefs_folder_item.c:300 src/progressdialog.c:128
 msgid "Account"
 msgstr "Tài khoản"
 
-#: src/mainwindow.c:2443
+#: src/mainwindow.c:2454
 msgid "Account setting"
 msgstr "Thiết lập tài khoản"
 
-#: src/mainwindow.c:2615
+#: src/mainwindow.c:2626
 msgid "You are offline. Click the icon to go online."
 msgstr "Bạn đang ngoại tuyến. Nhấn vào biểu tượng để chuyển sang trực tuyến."
 
-#: src/mainwindow.c:2626
+#: src/mainwindow.c:2637
 msgid "You are online. Click the icon to go offline."
 msgstr "Bạn đang trực tuyến. Nhấn vào biểu tượng để chuyển sang ngoại tuyến."
 
-#: src/mainwindow.c:2892
+#: src/mainwindow.c:2903
 msgid "Exit"
 msgstr "Thoát"
 
-#: src/mainwindow.c:2892
+#: src/mainwindow.c:2903
 msgid "Exit this program?"
 msgstr "Thoát chương trình này?"
 
@@ -3762,45 +3778,45 @@ msgstr "Đã đến cuối thư; tiếp tục từ đầu thư?"
 msgid "Search finished"
 msgstr "Đã tìm xong"
 
-#: src/messageview.c:261
+#: src/messageview.c:266
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/_Công cụ/Thêm người gửi vào _sổ địa chỉ"
 
-#: src/messageview.c:291
+#: src/messageview.c:296
 msgid "Creating message view...\n"
 msgstr "Đang tạo khung xem thư...\n"
 
-#: src/messageview.c:316
+#: src/messageview.c:321
 msgid "Text"
 msgstr "Văn bản"
 
-#: src/messageview.c:321
+#: src/messageview.c:326
 msgid "Attachments"
 msgstr "Đính kèm"
 
-#: src/messageview.c:371
+#: src/messageview.c:376
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:669 src/summaryview.c:3268
+#: src/messageview.c:674 src/summaryview.c:3425
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Không thể lưu tập tin `%s'."
 
-#: src/messageview.c:728 src/summaryview.c:3291
+#: src/messageview.c:733 src/summaryview.c:3448
 msgid "The message will be printed with the following command:"
 msgstr ""
 
-#: src/messageview.c:729 src/summaryview.c:3292
+#: src/messageview.c:734 src/summaryview.c:3449
 #, fuzzy
 msgid "(Default print command)"
 msgstr "Lệnh thu thập:"
 
-#: src/messageview.c:731 src/prefs_common_dialog.c:2304 src/summaryview.c:3294
+#: src/messageview.c:736 src/prefs_common_dialog.c:2304 src/summaryview.c:3451
 msgid "Print"
 msgstr "In ấn"
 
-#: src/messageview.c:740 src/summaryview.c:3303
+#: src/messageview.c:745 src/summaryview.c:3460
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -4694,8 +4710,8 @@ msgstr "Hiện người nhận trên cột `Người gửi' nếu người gửi
 msgid "Expand threads"
 msgstr "Mở rộng các luồng thư"
 
-#: src/prefs_common_dialog.c:1413 src/prefs_common_dialog.c:2713
-#: src/prefs_common_dialog.c:2751
+#: src/prefs_common_dialog.c:1413 src/prefs_common_dialog.c:2716
+#: src/prefs_common_dialog.c:2754
 msgid "Date format"
 msgstr "Định dạng thời gian"
 
@@ -4980,8 +4996,8 @@ msgstr "Lệnh ngoài (%s sẽ được thay thế bằng tên tập tin / URI)"
 msgid "Web browser"
 msgstr "Trình duyệt"
 
-#: src/prefs_common_dialog.c:2288 src/prefs_common_dialog.c:3775
-#: src/prefs_common_dialog.c:3796
+#: src/prefs_common_dialog.c:2288 src/prefs_common_dialog.c:3778
+#: src/prefs_common_dialog.c:3799
 #, fuzzy
 msgid "(Default browser)"
 msgstr "Hộp nhận mặc định"
@@ -5059,214 +5075,224 @@ msgid "Greek (ISO-8859-7)"
 msgstr "Hi Lạp (ISO-8859-7)"
 
 #: src/prefs_common_dialog.c:2495
+#, fuzzy
+msgid "Arabic (ISO-8859-6)"
+msgstr "Baltic (ISO-8859-4)"
+
+#: src/prefs_common_dialog.c:2496
+#, fuzzy
+msgid "Arabic (Windows-1256)"
+msgstr "Cyrillic (Windows-1251)"
+
+#: src/prefs_common_dialog.c:2498
 msgid "Hebrew (ISO-8859-8)"
 msgstr "Do Thái (ISO-8859-8)"
 
-#: src/prefs_common_dialog.c:2496
+#: src/prefs_common_dialog.c:2499
 msgid "Hebrew (Windows-1255)"
 msgstr "Do Thái (Windows-1255)"
 
-#: src/prefs_common_dialog.c:2498
+#: src/prefs_common_dialog.c:2501
 msgid "Turkish (ISO-8859-9)"
 msgstr "Thổ Nhĩ Kì(ISO-8859-9)"
 
-#: src/prefs_common_dialog.c:2500
+#: src/prefs_common_dialog.c:2503
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Cyrillic (ISO-8859-5)"
 
-#: src/prefs_common_dialog.c:2501
+#: src/prefs_common_dialog.c:2504
 msgid "Cyrillic (KOI8-R)"
 msgstr "Cyrillic (KOI8-R)"
 
-#: src/prefs_common_dialog.c:2502
+#: src/prefs_common_dialog.c:2505
 msgid "Cyrillic (KOI8-U)"
 msgstr "Cyrillic (KOI8-U)"
 
-#: src/prefs_common_dialog.c:2503
+#: src/prefs_common_dialog.c:2506
 msgid "Cyrillic (Windows-1251)"
 msgstr "Cyrillic (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2505
+#: src/prefs_common_dialog.c:2508
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Nhật Bản (ISO-2022-JP)"
 
-#: src/prefs_common_dialog.c:2507
+#: src/prefs_common_dialog.c:2510
 msgid "Japanese (EUC-JP)"
 msgstr "Nhật Bản (EUC-JP)"
 
-#: src/prefs_common_dialog.c:2508
+#: src/prefs_common_dialog.c:2511
 msgid "Japanese (Shift_JIS)"
 msgstr "Nhật Bản (Shift_JIS)"
 
-#: src/prefs_common_dialog.c:2511
+#: src/prefs_common_dialog.c:2514
 msgid "Simplified Chinese (GB2312)"
 msgstr "Hán giản thể (GB2312)"
 
-#: src/prefs_common_dialog.c:2512
+#: src/prefs_common_dialog.c:2515
 msgid "Simplified Chinese (GBK)"
 msgstr "Hán giản thể (GBK)"
 
-#: src/prefs_common_dialog.c:2513
+#: src/prefs_common_dialog.c:2516
 msgid "Traditional Chinese (Big5)"
 msgstr "Hán phồn thể (Big5)"
 
-#: src/prefs_common_dialog.c:2515
+#: src/prefs_common_dialog.c:2518
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Hán phồn thể (EUC-TW)"
 
-#: src/prefs_common_dialog.c:2516
+#: src/prefs_common_dialog.c:2519
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Hán (ISO-2022-CN)"
 
-#: src/prefs_common_dialog.c:2519
+#: src/prefs_common_dialog.c:2522
 msgid "Korean (EUC-KR)"
 msgstr "Triều Tiên (EUC-KR)"
 
-#: src/prefs_common_dialog.c:2521
+#: src/prefs_common_dialog.c:2524
 msgid "Thai (TIS-620)"
 msgstr "Thái (TIS-620)"
 
-#: src/prefs_common_dialog.c:2522
+#: src/prefs_common_dialog.c:2525
 msgid "Thai (Windows-874)"
 msgstr "Thái (Windows-874)"
 
-#: src/prefs_common_dialog.c:2689
+#: src/prefs_common_dialog.c:2692
 msgid "the full abbreviated weekday name"
 msgstr "dạng viết tắt của ngày trong tuần (thứ)"
 
-#: src/prefs_common_dialog.c:2690
+#: src/prefs_common_dialog.c:2693
 msgid "the full weekday name"
 msgstr "dạng đầy đủ tên ngày trong tuần (thứ)"
 
-#: src/prefs_common_dialog.c:2691
+#: src/prefs_common_dialog.c:2694
 msgid "the abbreviated month name"
 msgstr "dạng viết tắt của tên tháng"
 
-#: src/prefs_common_dialog.c:2692
+#: src/prefs_common_dialog.c:2695
 msgid "the full month name"
 msgstr "dạng đầy đủ của tên tháng"
 
-#: src/prefs_common_dialog.c:2693
+#: src/prefs_common_dialog.c:2696
 msgid "the preferred date and time for the current locale"
 msgstr "định dạng thời gian cho locale hiện tại"
 
-#: src/prefs_common_dialog.c:2694
+#: src/prefs_common_dialog.c:2697
 msgid "the century number (year/100)"
 msgstr "thế kỉ (năm/100)"
 
-#: src/prefs_common_dialog.c:2695
+#: src/prefs_common_dialog.c:2698
 msgid "the day of the month as a decimal number"
 msgstr "ngày trong tháng ở dạng số thập phân"
 
-#: src/prefs_common_dialog.c:2696
+#: src/prefs_common_dialog.c:2699
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "giờ ở dạng số thập phân, dùng dạng 24 giờ"
 
-#: src/prefs_common_dialog.c:2697
+#: src/prefs_common_dialog.c:2700
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "giờ ở dạng số thập phân, dùng dạng 12 giờ"
 
-#: src/prefs_common_dialog.c:2698
+#: src/prefs_common_dialog.c:2701
 msgid "the day of the year as a decimal number"
 msgstr "ngày trong năm ở dạng số thập phân"
 
-#: src/prefs_common_dialog.c:2699
+#: src/prefs_common_dialog.c:2702
 msgid "the month as a decimal number"
 msgstr "tháng ở dạng số thập phân"
 
-#: src/prefs_common_dialog.c:2700
+#: src/prefs_common_dialog.c:2703
 msgid "the minute as a decimal number"
 msgstr "phút ở dạng số thập phân"
 
-#: src/prefs_common_dialog.c:2701
+#: src/prefs_common_dialog.c:2704
 msgid "either AM or PM"
 msgstr "hoặc là AM hoặc là PM"
 
-#: src/prefs_common_dialog.c:2702
+#: src/prefs_common_dialog.c:2705
 msgid "the second as a decimal number"
 msgstr "giây ở dạng số thập phân"
 
-#: src/prefs_common_dialog.c:2703
+#: src/prefs_common_dialog.c:2706
 msgid "the day of the week as a decimal number"
 msgstr "ngày trong tuần ở dạng số thập phân"
 
-#: src/prefs_common_dialog.c:2704
+#: src/prefs_common_dialog.c:2707
 msgid "the preferred date for the current locale"
 msgstr "định dạng ưu tiên cho ngày tháng của locale hiện tại"
 
-#: src/prefs_common_dialog.c:2705
+#: src/prefs_common_dialog.c:2708
 msgid "the last two digits of a year"
 msgstr "hai số cuối của năm"
 
-#: src/prefs_common_dialog.c:2706
+#: src/prefs_common_dialog.c:2709
 msgid "the year as a decimal number"
 msgstr "năm ở dạng số thập phân"
 
-#: src/prefs_common_dialog.c:2707
+#: src/prefs_common_dialog.c:2710
 msgid "the time zone or name or abbreviation"
 msgstr "múi giờ hoặc tên hoặc dạng viết tắt"
 
-#: src/prefs_common_dialog.c:2728
+#: src/prefs_common_dialog.c:2731
 msgid "Specifier"
 msgstr "Kí hiệu"
 
-#: src/prefs_common_dialog.c:2729
+#: src/prefs_common_dialog.c:2732
 msgid "Description"
 msgstr "Miêu tả"
 
-#: src/prefs_common_dialog.c:2769
+#: src/prefs_common_dialog.c:2772
 msgid "Example"
 msgstr "Ví dụ"
 
-#: src/prefs_common_dialog.c:2850
+#: src/prefs_common_dialog.c:2853
 msgid "Set message colors"
 msgstr "Đặt màu cho thư"
 
-#: src/prefs_common_dialog.c:2858
+#: src/prefs_common_dialog.c:2861
 msgid "Colors"
 msgstr "Màu sắc"
 
-#: src/prefs_common_dialog.c:2892
+#: src/prefs_common_dialog.c:2895
 msgid "Quoted Text - First Level"
 msgstr "Nội dung trích dẫn - Cấp 1"
 
-#: src/prefs_common_dialog.c:2898
+#: src/prefs_common_dialog.c:2901
 msgid "Quoted Text - Second Level"
 msgstr "Nội dung trích dẫn - Cấp 2"
 
-#: src/prefs_common_dialog.c:2904
+#: src/prefs_common_dialog.c:2907
 msgid "Quoted Text - Third Level"
 msgstr "Nội dung trích dẫn - Cấp 3"
 
-#: src/prefs_common_dialog.c:2910
+#: src/prefs_common_dialog.c:2913
 msgid "URI link"
 msgstr "Liên kết URI"
 
-#: src/prefs_common_dialog.c:2917
+#: src/prefs_common_dialog.c:2920
 msgid "Recycle quote colors"
 msgstr "Lặp lại theo vòng"
 
-#: src/prefs_common_dialog.c:2984
+#: src/prefs_common_dialog.c:2987
 msgid "Pick color for quotation level 1"
 msgstr "Chọn màu cho phần trích dẫn cấp 1"
 
-#: src/prefs_common_dialog.c:2987
+#: src/prefs_common_dialog.c:2990
 msgid "Pick color for quotation level 2"
 msgstr "Chọn màu cho phần trích dẫn cấp 2"
 
-#: src/prefs_common_dialog.c:2990
+#: src/prefs_common_dialog.c:2993
 msgid "Pick color for quotation level 3"
 msgstr "Chọn màu cho phần trích dẫn cấp 3"
 
-#: src/prefs_common_dialog.c:2993
+#: src/prefs_common_dialog.c:2996
 msgid "Pick color for URI"
 msgstr "Chọn màu cho URI"
 
-#: src/prefs_common_dialog.c:3133
+#: src/prefs_common_dialog.c:3136
 msgid "Description of symbols"
 msgstr "Miêu tả về biểu tượng"
 
-#: src/prefs_common_dialog.c:3189
+#: src/prefs_common_dialog.c:3192
 msgid ""
 "Date\n"
 "From\n"
@@ -5290,11 +5316,11 @@ msgstr ""
 "Nhóm tin\n"
 "ID của thư"
 
-#: src/prefs_common_dialog.c:3202
+#: src/prefs_common_dialog.c:3205
 msgid "If x is set, displays expr"
 msgstr "Nếu x đã được đặt, hiển thị expr"
 
-#: src/prefs_common_dialog.c:3206
+#: src/prefs_common_dialog.c:3209
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -5308,7 +5334,7 @@ msgstr ""
 "Nội dung thư được trích dẫn không gồm chữ kí\n"
 "Literal %"
 
-#: src/prefs_common_dialog.c:3214
+#: src/prefs_common_dialog.c:3217
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -5320,20 +5346,20 @@ msgstr ""
 "Dấu ngoặc nhọn mở\n"
 "Dấu ngoặc nhọn đóng"
 
-#: src/prefs_common_dialog.c:3260
+#: src/prefs_common_dialog.c:3263
 msgid "Key bindings"
 msgstr "Phím tắt"
 
-#: src/prefs_common_dialog.c:3273
+#: src/prefs_common_dialog.c:3276
 #, fuzzy
 msgid "Select the preset of key bindings."
 msgstr " Đặt phím tắt... "
 
-#: src/prefs_common_dialog.c:3283 src/prefs_common_dialog.c:3607
+#: src/prefs_common_dialog.c:3286 src/prefs_common_dialog.c:3610
 msgid "Default"
 msgstr "Mặc định"
 
-#: src/prefs_common_dialog.c:3286 src/prefs_common_dialog.c:3616
+#: src/prefs_common_dialog.c:3289 src/prefs_common_dialog.c:3619
 msgid "Old Sylpheed"
 msgstr "Sylpheed cũ"
 
@@ -5454,7 +5480,7 @@ msgstr "Kết quả của lệnh"
 msgid "Age"
 msgstr "Tuổi"
 
-#: src/prefs_filter_edit.c:501 src/summaryview.c:510
+#: src/prefs_filter_edit.c:501 src/summaryview.c:512
 #, fuzzy
 msgid "Marked"
 msgstr "Đánh dấu"
@@ -5685,17 +5711,17 @@ msgid "Attachment"
 msgstr "Đính kèm"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73 src/query_search.c:371 src/summaryview.c:4733
+#: src/prefs_summary_column.c:73 src/query_search.c:371 src/summaryview.c:4890
 msgid "Subject"
 msgstr "Tiêu đề"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/query_search.c:372 src/summaryview.c:4736
+#: src/prefs_summary_column.c:74 src/query_search.c:372 src/summaryview.c:4893
 msgid "From"
 msgstr "Người gửi"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/query_search.c:373 src/summaryview.c:4738
+#: src/prefs_summary_column.c:75 src/query_search.c:373 src/summaryview.c:4895
 msgid "Date"
 msgstr "Thời gian"
 
@@ -5797,7 +5823,7 @@ msgstr "Tìm thư"
 msgid "_Save as search folder"
 msgstr "Gửi vào thư mục nháp"
 
-#: src/query_search.c:512 src/subscribedialog.c:523 src/summaryview.c:840
+#: src/query_search.c:512 src/subscribedialog.c:523 src/summaryview.c:842
 msgid "Done."
 msgstr "Xong."
 
@@ -5811,7 +5837,7 @@ msgstr "Đang quét thư mục %s ..."
 msgid "Searching %s (%d / %d)..."
 msgstr "Đang lọc..."
 
-#: src/query_search.c:645 src/summaryview.c:2048
+#: src/query_search.c:645 src/summaryview.c:2051
 msgid "(No Date)"
 msgstr "(Không ngày tháng)"
 
@@ -6181,306 +6207,311 @@ msgid "/_Mark/Mark as rea_d"
 msgstr "/Đánh _dấu/Đán_h dấu đã đọc"
 
 #: src/summaryview.c:429
+#, fuzzy
+msgid "/_Mark/Mark _thread as read"
+msgstr "/Đánh _dấu/Đán_h dấu đã đọc"
+
+#: src/summaryview.c:431
 msgid "/_Mark/Mark all _read"
 msgstr "/Đánh _dấu/Đánh dấ_u đã đọc hết"
 
-#: src/summaryview.c:430
+#: src/summaryview.c:432
 msgid "/Color la_bel"
 msgstr "/_Nhãn màu"
 
-#: src/summaryview.c:434
+#: src/summaryview.c:436
 msgid "/Re-_edit"
 msgstr "/S_oạn lại"
 
-#: src/summaryview.c:436
+#: src/summaryview.c:438
 msgid "/Add sender to address boo_k..."
 msgstr "/_Thêm người gửi vào sổ địa chỉ..."
 
-#: src/summaryview.c:438
+#: src/summaryview.c:440
 #, fuzzy
 msgid "/Create f_ilter rule"
 msgstr "/_Công cụ/Tạo _quy tắc lọc"
 
-#: src/summaryview.c:439
+#: src/summaryview.c:441
 #, fuzzy
 msgid "/Create f_ilter rule/_Automatically"
 msgstr "/_Công cụ/Tạo _quy tắc lọc/_Tự động"
 
-#: src/summaryview.c:441
+#: src/summaryview.c:443
 #, fuzzy
 msgid "/Create f_ilter rule/by _From"
 msgstr "/_Công cụ/Tạo _quy tắc lọc/theo _Người gửi"
 
-#: src/summaryview.c:443
+#: src/summaryview.c:445
 #, fuzzy
 msgid "/Create f_ilter rule/by _To"
 msgstr "/_Công cụ/Tạo _quy tắc lọc/theo N_gười nhận"
 
-#: src/summaryview.c:445
+#: src/summaryview.c:447
 #, fuzzy
 msgid "/Create f_ilter rule/by _Subject"
 msgstr "/_Công cụ/Tạo _quy tắc lọc/theo Tiê_u đề"
 
-#: src/summaryview.c:451
+#: src/summaryview.c:453
 msgid "/_View/_Source"
 msgstr "/_Xem/_Nguồn"
 
-#: src/summaryview.c:452
+#: src/summaryview.c:454
 msgid "/_View/All _header"
 msgstr "/_Xem/Mọi _header"
 
-#: src/summaryview.c:454
+#: src/summaryview.c:456
 msgid "/_Print..."
 msgstr "/I_n ấn..."
 
-#: src/summaryview.c:486
+#: src/summaryview.c:488
 msgid "Creating summary view...\n"
 msgstr "Đang tạo khung xem tóm tắt...\n"
 
-#: src/summaryview.c:508
+#: src/summaryview.c:510
 msgid "All"
 msgstr ""
 
-#: src/summaryview.c:511
+#: src/summaryview.c:513
 #, fuzzy
 msgid "Have color label"
 msgstr "/_Nhãn màu"
 
-#: src/summaryview.c:512
+#: src/summaryview.c:514
 #, fuzzy
 msgid "Have attachment"
 msgstr "Đính kèm"
 
-#: src/summaryview.c:521
+#: src/summaryview.c:523
 #, fuzzy
 msgid "Search:"
 msgstr " Tìm kiếm "
 
-#: src/summaryview.c:535
+#: src/summaryview.c:537
 msgid "Search for Subject or From"
 msgstr ""
 
-#: src/summaryview.c:702
+#: src/summaryview.c:704
 msgid "Process mark"
 msgstr "Đánh dấu tiến trình"
 
-#: src/summaryview.c:703
+#: src/summaryview.c:705
 msgid "Some marks are left. Process it?"
 msgstr "Vẫn còn sót một số dấu. Xử lí chúng?"
 
-#: src/summaryview.c:749
+#: src/summaryview.c:751
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "Đang quét thư mục (%s)..."
 
-#: src/summaryview.c:1292
+#: src/summaryview.c:1295
 msgid "_Search again"
 msgstr "_Tìm lại"
 
-#: src/summaryview.c:1313 src/summaryview.c:1322
+#: src/summaryview.c:1316 src/summaryview.c:1325
 msgid "No more unread messages"
 msgstr "Không có thêm thư chưa đọc"
 
-#: src/summaryview.c:1314
+#: src/summaryview.c:1317
 msgid "No unread message found. Search from the end?"
 msgstr "Không thấy thư nào chưa đọc. Tìm từ dưới lên?"
 
-#: src/summaryview.c:1316
+#: src/summaryview.c:1319
 msgid "No unread messages."
 msgstr "Không có thư nào chưa đọc."
 
-#: src/summaryview.c:1323
+#: src/summaryview.c:1326
 msgid "No unread message found. Go to next folder?"
 msgstr "Không thấy thư nào chưa đọc. Chuyển sang thư mục tiếp theo?"
 
-#: src/summaryview.c:1331 src/summaryview.c:1340
+#: src/summaryview.c:1334 src/summaryview.c:1343
 msgid "No more new messages"
 msgstr "Không có thêm thư mới"
 
-#: src/summaryview.c:1332
+#: src/summaryview.c:1335
 msgid "No new message found. Search from the end?"
 msgstr "Không có thư mới. Tìm từ dưới lên?"
 
-#: src/summaryview.c:1334
+#: src/summaryview.c:1337
 msgid "No new messages."
 msgstr "Không có thư mới."
 
-#: src/summaryview.c:1341
+#: src/summaryview.c:1344
 msgid "No new message found. Go to next folder?"
 msgstr "Không thấy thư mới nào. Tìm trong thư mục tiếp theo?"
 
-#: src/summaryview.c:1349 src/summaryview.c:1358
+#: src/summaryview.c:1352 src/summaryview.c:1361
 msgid "No more marked messages"
 msgstr "Không có thêm thư được đánh dấu"
 
-#: src/summaryview.c:1350
+#: src/summaryview.c:1353
 msgid "No marked message found. Search from the end?"
 msgstr "Không thấy thư nào được đánh dấu. Tìm từ cuối lên?"
 
-#: src/summaryview.c:1352 src/summaryview.c:1361
+#: src/summaryview.c:1355 src/summaryview.c:1364
 msgid "No marked messages."
 msgstr "Không có thư nào được dánh dấu."
 
-#: src/summaryview.c:1359
+#: src/summaryview.c:1362
 msgid "No marked message found. Search from the beginning?"
 msgstr "Không thấy thư nào được đánh dấu. Tìm từ đầu?"
 
-#: src/summaryview.c:1367 src/summaryview.c:1376
+#: src/summaryview.c:1370 src/summaryview.c:1379
 msgid "No more labeled messages"
 msgstr "Không có thêm thư được đánh dấu nào"
 
-#: src/summaryview.c:1368
+#: src/summaryview.c:1371
 msgid "No labeled message found. Search from the end?"
 msgstr "Không thấy nào được gán nhãn. Tìm từ cuối lên?"
 
-#: src/summaryview.c:1370 src/summaryview.c:1379
+#: src/summaryview.c:1373 src/summaryview.c:1382
 msgid "No labeled messages."
 msgstr "Không có thư được gán nhãn."
 
-#: src/summaryview.c:1377
+#: src/summaryview.c:1380
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Không thấy thư nào được gán nhãn. Tìm từ đầu?"
 
-#: src/summaryview.c:1693
+#: src/summaryview.c:1696
 msgid "Attracting messages by subject..."
 msgstr ""
 
-#: src/summaryview.c:1887
+#: src/summaryview.c:1890
 #, c-format
 msgid "%d deleted"
 msgstr "đã xoá %d"
 
-#: src/summaryview.c:1891
+#: src/summaryview.c:1894
 #, c-format
 msgid "%s%d moved"
 msgstr "đã chuyển %s%d"
 
-#: src/summaryview.c:1892 src/summaryview.c:1897
+#: src/summaryview.c:1895 src/summaryview.c:1900
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:1896
+#: src/summaryview.c:1899
 #, c-format
 msgid "%s%d copied"
 msgstr "đã chép %s%d"
 
-#: src/summaryview.c:1911
+#: src/summaryview.c:1914
 msgid " item(s) selected"
 msgstr " mục được chọn"
 
-#: src/summaryview.c:1933
+#: src/summaryview.c:1936
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d mới, %d chưa đọc, %d tổng số (%s)"
 
-#: src/summaryview.c:1937
+#: src/summaryview.c:1940
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d mới, %d chưa đọc, %d tổng số"
 
-#: src/summaryview.c:1971
+#: src/summaryview.c:1974
 msgid "Sorting summary..."
 msgstr "Đang sắp xếp bảng tóm tắt..."
 
-#: src/summaryview.c:2194
+#: src/summaryview.c:2211
 msgid "\tSetting summary from message data..."
 msgstr "\tĐang thiết lập tóm tắt từ dữ liệu thư..."
 
-#: src/summaryview.c:2196
+#: src/summaryview.c:2213
 msgid "Setting summary from message data..."
 msgstr "Đang thiết lập tóm tắt từ dữ liệu thư..."
 
-#: src/summaryview.c:2302
+#: src/summaryview.c:2319
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Đang ghi bộ đệm cho phần tóm tắt (%s)..."
 
-#: src/summaryview.c:2643
+#: src/summaryview.c:2660
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Bức thư %d đã được đánh dấu\n"
 
-#: src/summaryview.c:2701
+#: src/summaryview.c:2718
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Bức thư %d được đánh dấu là đã đọc\n"
 
-#: src/summaryview.c:2789
+#: src/summaryview.c:2908
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Bức thư %d được đánh dấu là chưa đọc\n"
 
-#: src/summaryview.c:2850
+#: src/summaryview.c:2969
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Bức thư %s/%d được chọn để xoá\n"
 
-#: src/summaryview.c:2878
+#: src/summaryview.c:2997
 msgid "Delete message(s)"
 msgstr "Xoá thư"
 
-#: src/summaryview.c:2879
+#: src/summaryview.c:2998
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Bạn có thực sự muốn xoá thư khỏi thùng rác?"
 
-#: src/summaryview.c:2953
+#: src/summaryview.c:3072
 msgid "Deleting duplicated messages..."
 msgstr "Đang xoá thư trùng nhau..."
 
-#: src/summaryview.c:2991
+#: src/summaryview.c:3110
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Thư %s/%d được bỏ đánh đấu\n"
 
-#: src/summaryview.c:3049
+#: src/summaryview.c:3168
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Bức thư %d được chọn để chuyển tới %s\n"
 
-#: src/summaryview.c:3066
+#: src/summaryview.c:3196
 msgid "Destination is same as current folder."
 msgstr "Đích đến trùng với thư mục hiện tại."
 
-#: src/summaryview.c:3122
+#: src/summaryview.c:3260
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Bức thư %d được chọn để chép đến %s\n"
 
-#: src/summaryview.c:3139
+#: src/summaryview.c:3288
 msgid "Destination for copy is same as current folder."
 msgstr "Đích đến trùng với thư mục hiện tại"
 
-#: src/summaryview.c:3338
+#: src/summaryview.c:3495
 msgid "Error occurred while processing messages."
 msgstr "Có lỗi khi xử lí thư."
 
-#: src/summaryview.c:3646 src/summaryview.c:3647
+#: src/summaryview.c:3803 src/summaryview.c:3804
 msgid "Building threads..."
 msgstr "Đang tạo luồng..."
 
-#: src/summaryview.c:3797 src/summaryview.c:3798
+#: src/summaryview.c:3954 src/summaryview.c:3955
 msgid "Unthreading..."
 msgstr "Đang rời luồng..."
 
-#: src/summaryview.c:4091 src/summaryview.c:4147
+#: src/summaryview.c:4248 src/summaryview.c:4304
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Đang lọc..."
 
-#: src/summaryview.c:4196
+#: src/summaryview.c:4353
 msgid "filtering..."
 msgstr "đang lọc..."
 
-#: src/summaryview.c:4197
+#: src/summaryview.c:4354
 msgid "Filtering..."
 msgstr "Đang lọc..."
 
-#: src/summaryview.c:4233
+#: src/summaryview.c:4390
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "%d thư đã được lọc."
 
-#: src/summaryview.c:4742
+#: src/summaryview.c:4899
 msgid "No."
 msgstr "Số "
 
@@ -6497,31 +6528,31 @@ msgstr "Đang tạo khung xem văn bản...\n"
 msgid "This message can't be displayed.\n"
 msgstr "Không thể hiển thị được thư này.\n"
 
-#: src/textview.c:1929
+#: src/textview.c:1925
 msgid "Sa_ve this image as..."
 msgstr "_Lưu hình ảnh này là..."
 
-#: src/textview.c:1945 src/trayicon.c:109
+#: src/textview.c:1941 src/trayicon.c:109
 msgid "Compose _new message"
 msgstr "Soạn _thư mới"
 
-#: src/textview.c:1947
+#: src/textview.c:1943
 msgid "Add to address _book..."
 msgstr "Thêm vào _sổ địa chỉ..."
 
-#: src/textview.c:1949
+#: src/textview.c:1945
 msgid "Copy this add_ress"
 msgstr "_Chép địa chỉ này"
 
-#: src/textview.c:1952
+#: src/textview.c:1948
 msgid "_Open with Web browser"
 msgstr "_Mở với trình duyệt web"
 
-#: src/textview.c:1954
+#: src/textview.c:1950
 msgid "Copy this _link"
 msgstr "Sao chép liên _kết này"
 
-#: src/textview.c:2097
+#: src/textview.c:2093
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6534,7 +6565,7 @@ msgstr ""
 "\n"
 "Vẫn mở nó?"
 
-#: src/textview.c:2102
+#: src/textview.c:2098
 msgid "Fake URL warning"
 msgstr "Cảnh báo URL lừa đảo"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index efa0a450..f0db220b 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: 2006-01-27 18:11+0900\n"
+"POT-Creation-Date: 2006-01-31 15:20+0900\n"
 "PO-Revision-Date: 2005-03-17 09:22+0800\n"
 "Last-Translator: Wang Jian <lark@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
@@ -502,7 +502,7 @@ msgstr "发现 %s\n"
 msgid "Configuration is saved.\n"
 msgstr "配置已经保存。\n"
 
-#: libsylph/prefs_common.c:489
+#: libsylph/prefs_common.c:491
 #, fuzzy
 msgid "Junk mail filter"
 msgstr "文件夹："
@@ -618,8 +618,8 @@ msgstr "%.2fMB"
 msgid "%.2fGB"
 msgstr "%.2fGB"
 
-#: libsylph/utils.c:2373 src/compose.c:2858 src/compose.c:3121
-#: src/compose.c:3184 src/compose.c:3304
+#: libsylph/utils.c:2373 src/compose.c:2867 src/compose.c:3130
+#: src/compose.c:3193 src/compose.c:3313
 msgid "can't change file mode\n"
 msgstr "无法改变文件属性\n"
 
@@ -702,8 +702,8 @@ msgstr ""
 "按照该顺序检查新邮件。选中“G”列的复选框，在“全部接收”\n"
 "时会检查新邮件。"
 
-#: src/account_dialog.c:366 src/addressadd.c:192 src/addressbook.c:491
-#: src/compose.c:4262 src/editaddress.c:200 src/editaddress.c:942
+#: src/account_dialog.c:366 src/addressadd.c:192 src/addressbook.c:493
+#: src/compose.c:4271 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:206 src/prefs_filter.c:259 src/prefs_folder_item.c:171
@@ -841,12 +841,12 @@ msgstr "动作的用户参数"
 msgid "Add Address to Book"
 msgstr "将地址添加到地址簿"
 
-#: src/addressadd.c:202 src/compose.c:4762 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4771 src/editaddress.c:201
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "地址"
 
-#: src/addressadd.c:212 src/addressbook.c:493 src/editaddress.c:202
+#: src/addressadd.c:212 src/addressbook.c:495 src/editaddress.c:202
 #: src/editaddress.c:795 src/editaddress.c:860 src/editgroup.c:267
 msgid "Remarks"
 msgstr "注释"
@@ -855,183 +855,183 @@ msgstr "注释"
 msgid "Select Address Book Folder"
 msgstr "选择地址簿文件夹"
 
-#: src/addressbook.c:336 src/compose.c:515 src/mainwindow.c:477
+#: src/addressbook.c:338 src/compose.c:515 src/mainwindow.c:480
 #: src/messageview.c:138
 msgid "/_File"
 msgstr "/文件(_F)"
 
-#: src/addressbook.c:337
+#: src/addressbook.c:339
 msgid "/_File/New _Book"
 msgstr "/文件(_F)/新建地址簿(_B)"
 
-#: src/addressbook.c:338
+#: src/addressbook.c:340
 msgid "/_File/New _vCard"
 msgstr "/文件(_F)/新建 vCard(_V)"
 
-#: src/addressbook.c:340
+#: src/addressbook.c:342
 msgid "/_File/New _JPilot"
 msgstr "/文件(_F)/新建 JPilot(_J)"
 
-#: src/addressbook.c:343
+#: src/addressbook.c:345
 msgid "/_File/New _Server"
 msgstr "/文件(_F)/新建服务器(_S)"
 
-#: src/addressbook.c:345 src/addressbook.c:348 src/compose.c:520
-#: src/compose.c:525 src/compose.c:528 src/compose.c:531 src/mainwindow.c:495
-#: src/mainwindow.c:498 src/mainwindow.c:500 src/mainwindow.c:503
-#: src/mainwindow.c:505 src/messageview.c:141
+#: src/addressbook.c:347 src/addressbook.c:350 src/compose.c:520
+#: src/compose.c:525 src/compose.c:528 src/compose.c:531 src/mainwindow.c:498
+#: src/mainwindow.c:501 src/mainwindow.c:503 src/mainwindow.c:506
+#: src/mainwindow.c:508 src/messageview.c:141
 msgid "/_File/---"
 msgstr "/文件(_F)/---"
 
-#: src/addressbook.c:346
+#: src/addressbook.c:348
 msgid "/_File/_Edit"
 msgstr "/文件(_F)/编辑(_E)"
 
-#: src/addressbook.c:347
+#: src/addressbook.c:349
 msgid "/_File/_Delete"
 msgstr "/文件(_F)/删除(_D)"
 
-#: src/addressbook.c:349
+#: src/addressbook.c:351
 msgid "/_File/_Save"
 msgstr "/文件(_F)/保存(_S)"
 
-#: src/addressbook.c:350 src/compose.c:532 src/messageview.c:142
+#: src/addressbook.c:352 src/compose.c:532 src/messageview.c:142
 msgid "/_File/_Close"
 msgstr "/文件(_F)/关闭(_C)"
 
-#: src/addressbook.c:351
+#: src/addressbook.c:353
 msgid "/_Address"
 msgstr "/地址(_A)"
 
-#: src/addressbook.c:352
+#: src/addressbook.c:354
 msgid "/_Address/New _Address"
 msgstr "/地址(_A)/新建地址(_A)"
 
-#: src/addressbook.c:353
+#: src/addressbook.c:355
 msgid "/_Address/New _Group"
 msgstr "/地址(_A)/新建组(_G)"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:356
 msgid "/_Address/New _Folder"
 msgstr "/地址(_A)/新建文件夹(_F)"
 
-#: src/addressbook.c:355
+#: src/addressbook.c:357
 msgid "/_Address/---"
 msgstr "/地址(_A)/---"
 
-#: src/addressbook.c:356
+#: src/addressbook.c:358
 msgid "/_Address/_Edit"
 msgstr "/地址(_A)/编辑(_E)"
 
-#: src/addressbook.c:357
+#: src/addressbook.c:359
 msgid "/_Address/_Delete"
 msgstr "/地址(_A)/删除(_D)"
 
-#: src/addressbook.c:358 src/compose.c:639 src/mainwindow.c:738
-#: src/messageview.c:259
+#: src/addressbook.c:360 src/compose.c:645 src/mainwindow.c:749
+#: src/messageview.c:264
 msgid "/_Tools"
 msgstr "/工具(_T)"
 
-#: src/addressbook.c:359
+#: src/addressbook.c:361
 msgid "/_Tools/Import _LDIF file"
 msgstr "/工具(_T)/导入LDIF文件(_L)"
 
-#: src/addressbook.c:360 src/compose.c:658 src/mainwindow.c:788
-#: src/messageview.c:277
+#: src/addressbook.c:362 src/compose.c:664 src/mainwindow.c:799
+#: src/messageview.c:282
 msgid "/_Help"
 msgstr "/帮助(_H)"
 
-#: src/addressbook.c:361 src/compose.c:659 src/mainwindow.c:799
-#: src/messageview.c:278
+#: src/addressbook.c:363 src/compose.c:665 src/mainwindow.c:810
+#: src/messageview.c:283
 msgid "/_Help/_About"
 msgstr "/帮助(_H)/关于(_A)"
 
-#: src/addressbook.c:380 src/addressbook.c:390
+#: src/addressbook.c:382 src/addressbook.c:392
 msgid "/New _Address"
 msgstr "/新建地址(_A)"
 
-#: src/addressbook.c:381 src/addressbook.c:391
+#: src/addressbook.c:383 src/addressbook.c:393
 msgid "/New _Group"
 msgstr "/新建组(_G)"
 
-#: src/addressbook.c:382 src/addressbook.c:392
+#: src/addressbook.c:384 src/addressbook.c:394
 msgid "/New _Folder"
 msgstr "/新建文件夹(_F)"
 
-#: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:509
+#: src/addressbook.c:385 src/addressbook.c:395 src/compose.c:509
 #: src/folderview.c:246 src/folderview.c:248 src/folderview.c:253
 #: src/folderview.c:266 src/folderview.c:268 src/folderview.c:270
 #: src/folderview.c:275 src/folderview.c:289 src/folderview.c:291
 #: src/folderview.c:295 src/summaryview.c:414 src/summaryview.c:418
-#: src/summaryview.c:421 src/summaryview.c:431 src/summaryview.c:433
-#: src/summaryview.c:435 src/summaryview.c:447 src/summaryview.c:453
+#: src/summaryview.c:421 src/summaryview.c:433 src/summaryview.c:435
+#: src/summaryview.c:437 src/summaryview.c:449 src/summaryview.c:455
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:534
-#: src/mainwindow.c:509 src/messageview.c:144
+#: src/addressbook.c:386 src/addressbook.c:396 src/compose.c:534
+#: src/mainwindow.c:512 src/messageview.c:144
 msgid "/_Edit"
 msgstr "/编辑(_E)"
 
-#: src/addressbook.c:385 src/addressbook.c:395 src/summaryview.c:432
+#: src/addressbook.c:387 src/addressbook.c:397 src/summaryview.c:434
 msgid "/_Delete"
 msgstr "/删除(_D)"
 
-#: src/addressbook.c:492
+#: src/addressbook.c:494
 msgid "E-Mail address"
 msgstr "电子邮件地址"
 
-#: src/addressbook.c:496 src/compose.c:4763 src/prefs_common_dialog.c:2183
+#: src/addressbook.c:498 src/compose.c:4772 src/prefs_common_dialog.c:2183
 msgid "Address book"
 msgstr "地址簿"
 
-#: src/addressbook.c:596 src/prefs_filter_edit.c:249
+#: src/addressbook.c:600 src/prefs_filter_edit.c:249
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "姓名："
 
 #. Buttons
-#: src/addressbook.c:628 src/addressbook.c:1680 src/editaddress.c:884
-#: src/editaddress.c:1017 src/mainwindow.c:2391 src/prefs_actions.c:266
+#: src/addressbook.c:632 src/addressbook.c:1684 src/editaddress.c:884
+#: src/editaddress.c:1017 src/mainwindow.c:2402 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
 #: src/prefs_template.c:233
 msgid "Delete"
 msgstr "删除"
 
-#: src/addressbook.c:631 src/editaddress.c:890 src/editaddress.c:1023
+#: src/addressbook.c:635 src/editaddress.c:890 src/editaddress.c:1023
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:273 src/prefs_display_header.c:328
 #: src/prefs_filter_edit.c:1550
 msgid "Add"
 msgstr "添加"
 
-#: src/addressbook.c:634
+#: src/addressbook.c:638
 msgid "Lookup"
 msgstr "查找"
 
-#: src/addressbook.c:646 src/headerview.c:55 src/prefs_folder_item.c:339
+#: src/addressbook.c:650 src/headerview.c:55 src/prefs_folder_item.c:339
 #: src/prefs_template.c:176
 msgid "To:"
 msgstr "收件人："
 
-#: src/addressbook.c:650 src/prefs_folder_item.c:356 src/prefs_template.c:178
+#: src/addressbook.c:654 src/prefs_folder_item.c:356 src/prefs_template.c:178
 msgid "Cc:"
 msgstr "抄送："
 
-#: src/addressbook.c:654 src/prefs_folder_item.c:367
+#: src/addressbook.c:658 src/prefs_folder_item.c:367
 msgid "Bcc:"
 msgstr "密件抄送："
 
 #. Confirm deletion
-#: src/addressbook.c:841
+#: src/addressbook.c:845
 msgid "Delete address(es)"
 msgstr "删除地址"
 
-#: src/addressbook.c:842
+#: src/addressbook.c:846
 msgid "Really delete the address(es)?"
 msgstr "真的要删除地址？"
 
-#: src/addressbook.c:1671
+#: src/addressbook.c:1675
 #, fuzzy, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1040,38 +1040,38 @@ msgstr ""
 "您要删除“%s”中的文件夹和所有地址吗？\n"
 "如果仅删除文件夹，地址将被移到上一级文件夹中。"
 
-#: src/addressbook.c:1674 src/folderview.c:2351
+#: src/addressbook.c:1678 src/folderview.c:2351
 msgid "Delete folder"
 msgstr "删除文件夹"
 
-#: src/addressbook.c:1674
+#: src/addressbook.c:1678
 #, fuzzy
 msgid "_Folder only"
 msgstr "仅文件夹"
 
-#: src/addressbook.c:1674
+#: src/addressbook.c:1678
 #, fuzzy
 msgid "Folder and _addresses"
 msgstr "文件夹和地址"
 
-#: src/addressbook.c:1679
+#: src/addressbook.c:1683
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "真的要删除“%s”？"
 
-#: src/addressbook.c:2365 src/addressbook.c:2498
+#: src/addressbook.c:2369 src/addressbook.c:2502
 msgid "New user, could not save index file."
 msgstr "新建用户，无法保存索引文件。"
 
-#: src/addressbook.c:2369 src/addressbook.c:2502
+#: src/addressbook.c:2373 src/addressbook.c:2506
 msgid "New user, could not save address book files."
 msgstr "新建用户，无法保存地址簿文件。"
 
-#: src/addressbook.c:2379 src/addressbook.c:2512
+#: src/addressbook.c:2383 src/addressbook.c:2516
 msgid "Old address book converted successfully."
 msgstr "成功转换旧的地址簿。"
 
-#: src/addressbook.c:2384
+#: src/addressbook.c:2388
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1079,7 +1079,7 @@ msgstr ""
 "已经转换旧的地址簿，\n"
 "无法保存新的地址索引文件"
 
-#: src/addressbook.c:2397
+#: src/addressbook.c:2401
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1087,7 +1087,7 @@ msgstr ""
 "无法转换地址簿，\n"
 "但创建了空的新地址簿文件。"
 
-#: src/addressbook.c:2403
+#: src/addressbook.c:2407
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1095,90 +1095,90 @@ msgstr ""
 "无法转换地址簿，\n"
 "无法创建新的地址簿文件。"
 
-#: src/addressbook.c:2408
+#: src/addressbook.c:2412
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
 msgstr "无法转换地址簿且无法创建新的地址簿文件。"
 
-#: src/addressbook.c:2415
+#: src/addressbook.c:2419
 msgid "Addressbook conversion error"
 msgstr "地址簿转换错误"
 
-#: src/addressbook.c:2419
+#: src/addressbook.c:2423
 msgid "Addressbook conversion"
 msgstr "地址簿转换"
 
-#: src/addressbook.c:2454
+#: src/addressbook.c:2458
 msgid "Addressbook Error"
 msgstr "地址簿错误"
 
-#: src/addressbook.c:2455 src/addressbook.c:2555
+#: src/addressbook.c:2459 src/addressbook.c:2559
 msgid "Could not read address index"
 msgstr "无法读取地址索引"
 
-#: src/addressbook.c:2517
+#: src/addressbook.c:2521
 msgid "Old address book converted, could not save new address index file"
 msgstr "已经转换旧的地址簿，无法保存新的地址索引文件"
 
-#: src/addressbook.c:2531
+#: src/addressbook.c:2535
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr "无法转换地址簿，但创建了空的新地址簿文件。"
 
-#: src/addressbook.c:2537
+#: src/addressbook.c:2541
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr "无法转换地址簿，无法创建新的地址簿文件。"
 
-#: src/addressbook.c:2543
+#: src/addressbook.c:2547
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr "无法转换地址簿且无法创建新的地址簿文件。"
 
-#: src/addressbook.c:2561
+#: src/addressbook.c:2565
 msgid "Addressbook Conversion Error"
 msgstr "地址簿转换错误"
 
-#: src/addressbook.c:2567
+#: src/addressbook.c:2571
 msgid "Addressbook Conversion"
 msgstr "地址簿转换"
 
-#: src/addressbook.c:3072 src/prefs_common_dialog.c:2033
+#: src/addressbook.c:3086 src/prefs_common_dialog.c:2033
 msgid "Interface"
 msgstr "界面"
 
-#: src/addressbook.c:3088 src/importldif.c:514
+#: src/addressbook.c:3102 src/importldif.c:514
 msgid "Address Book"
 msgstr "地址簿"
 
-#: src/addressbook.c:3104
+#: src/addressbook.c:3118
 msgid "Person"
 msgstr "个人"
 
-#: src/addressbook.c:3120
+#: src/addressbook.c:3134
 msgid "EMail Address"
 msgstr "电子邮件地址"
 
-#: src/addressbook.c:3136
+#: src/addressbook.c:3150
 msgid "Group"
 msgstr "群组"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3152 src/folderview.c:367 src/prefs_account_dialog.c:1694
+#: src/addressbook.c:3166 src/folderview.c:367 src/prefs_account_dialog.c:1694
 #: src/query_search.c:370
 msgid "Folder"
 msgstr "文件夹"
 
-#: src/addressbook.c:3168
+#: src/addressbook.c:3182
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3184 src/addressbook.c:3200
+#: src/addressbook.c:3198 src/addressbook.c:3214
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3216
+#: src/addressbook.c:3230
 msgid "LDAP Server"
 msgstr "LDAP 服务器"
 
@@ -1190,7 +1190,7 @@ msgstr "公用地址"
 msgid "Personal address"
 msgstr "个人地址"
 
-#: src/alertpanel.c:141 src/compose.c:5485 src/main.c:573
+#: src/alertpanel.c:141 src/compose.c:5494 src/main.c:573
 msgid "Notice"
 msgstr "注意"
 
@@ -1241,7 +1241,7 @@ msgstr "棕色"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4593
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4750
 msgid "None"
 msgstr "没有"
 
@@ -1299,7 +1299,7 @@ msgstr "/编辑(_E)/撤销(_U)"
 msgid "/_Edit/_Redo"
 msgstr "/编辑(_E)/重复(_R)"
 
-#: src/compose.c:537 src/compose.c:544 src/mainwindow.c:513
+#: src/compose.c:537 src/compose.c:544 src/mainwindow.c:516
 #: src/messageview.c:147
 msgid "/_Edit/---"
 msgstr "/编辑(_E)/---"
@@ -1308,7 +1308,7 @@ msgstr "/编辑(_E)/---"
 msgid "/_Edit/Cu_t"
 msgstr "/编辑(_E)/剪切(_T)"
 
-#: src/compose.c:539 src/mainwindow.c:510 src/messageview.c:145
+#: src/compose.c:539 src/mainwindow.c:513 src/messageview.c:145
 msgid "/_Edit/_Copy"
 msgstr "/编辑(_E)/复制(_C)"
 
@@ -1320,7 +1320,7 @@ msgstr "/编辑(_E)/粘贴(_P)"
 msgid "/_Edit/Paste as _quotation"
 msgstr "/编辑(_E)/作为引文粘贴(_Q)"
 
-#: src/compose.c:543 src/mainwindow.c:511 src/messageview.c:146
+#: src/compose.c:543 src/mainwindow.c:514 src/messageview.c:146
 msgid "/_Edit/Select _all"
 msgstr "/编辑(_E)/全选(_A)"
 
@@ -1336,8 +1336,8 @@ msgstr "/编辑(_E)/所有长行折行(_L)"
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/编辑(_E)/自动折行(_O)"
 
-#: src/compose.c:550 src/mainwindow.c:518 src/messageview.c:151
-#: src/summaryview.c:448
+#: src/compose.c:550 src/mainwindow.c:521 src/messageview.c:151
+#: src/summaryview.c:450
 msgid "/_View"
 msgstr "/查看(_V)"
 
@@ -1358,9 +1358,9 @@ msgid "/_View/_Reply to"
 msgstr "/查看(_V)/回复至(_R)"
 
 #: src/compose.c:555 src/compose.c:557 src/compose.c:559 src/compose.c:561
-#: src/mainwindow.c:538 src/mainwindow.c:541 src/mainwindow.c:568
-#: src/mainwindow.c:592 src/mainwindow.c:687 src/mainwindow.c:691
-#: src/messageview.c:236
+#: src/mainwindow.c:541 src/mainwindow.c:544 src/mainwindow.c:571
+#: src/mainwindow.c:595 src/mainwindow.c:696 src/mainwindow.c:700
+#: src/messageview.c:241
 msgid "/_View/---"
 msgstr "/查看(_V)/---"
 
@@ -1376,7 +1376,7 @@ msgstr "/查看(_V)/标尺(_U)"
 msgid "/_View/_Attachment"
 msgstr "/查看(_V)/附件(_A)"
 
-#: src/compose.c:567 src/mainwindow.c:599 src/messageview.c:158
+#: src/compose.c:567 src/mainwindow.c:602 src/messageview.c:158
 msgid "/_View/Character _encoding"
 msgstr "/查看(_V)/字符编码(_E)"
 
@@ -1385,218 +1385,229 @@ msgid "/_View/Character _encoding/_Automatic"
 msgstr "/查看(_V)/字符编码(_E)/自动(_A)"
 
 #: src/compose.c:570 src/compose.c:576 src/compose.c:582 src/compose.c:586
-#: src/compose.c:592 src/compose.c:596 src/compose.c:602 src/compose.c:606
-#: src/compose.c:616 src/compose.c:620 src/compose.c:628 src/compose.c:632
-#: src/mainwindow.c:595 src/mainwindow.c:602 src/messageview.c:154
+#: src/compose.c:592 src/compose.c:596 src/compose.c:602 src/compose.c:608
+#: src/compose.c:612 src/compose.c:622 src/compose.c:626 src/compose.c:634
+#: src/compose.c:638 src/mainwindow.c:598 src/mainwindow.c:605
+#: src/messageview.c:154
 msgid "/_View/Character _encoding/---"
 msgstr "/查看(_V)/字符编码(_E)/---"
 
-#: src/compose.c:572 src/mainwindow.c:603 src/messageview.c:162
+#: src/compose.c:572 src/mainwindow.c:606 src/messageview.c:162
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/查看(_V)/字符编码(_E)/7位 ASCII (US-ASC_II)"
 
-#: src/compose.c:574 src/mainwindow.c:605 src/messageview.c:165
+#: src/compose.c:574 src/mainwindow.c:608 src/messageview.c:165
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/查看(_V)/字符编码(_E)/Unicode (_UTF-8)"
 
-#: src/compose.c:578 src/mainwindow.c:609 src/messageview.c:168
+#: src/compose.c:578 src/mainwindow.c:612 src/messageview.c:168
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/查看(_V)/字符编码(_E)/西欧 (ISO-8859-_1)"
 
-#: src/compose.c:580 src/mainwindow.c:611 src/messageview.c:170
+#: src/compose.c:580 src/mainwindow.c:614 src/messageview.c:170
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/查看(_V)/字符编码(_E)/西欧 (ISO-8859-15)"
 
-#: src/compose.c:584 src/mainwindow.c:617 src/messageview.c:175
+#: src/compose.c:584 src/mainwindow.c:620 src/messageview.c:175
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/查看(_V)/字符编码(_E)/中欧 (ISO-8859-_2)"
 
-#: src/compose.c:588 src/mainwindow.c:621 src/messageview.c:178
+#: src/compose.c:588 src/mainwindow.c:624 src/messageview.c:178
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/查看(_V)/字符编码(_E)/波罗的语 (ISO-8859-13)"
 
-#: src/compose.c:590 src/mainwindow.c:623 src/messageview.c:180
+#: src/compose.c:590 src/mainwindow.c:626 src/messageview.c:180
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/查看(_V)/字符编码(_E)/波罗的语 (ISO-8859-_4)"
 
-#: src/compose.c:594 src/mainwindow.c:627 src/messageview.c:183
+#: src/compose.c:594 src/mainwindow.c:630 src/messageview.c:183
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/查看(_V)/字符编码(_E)/希腊语 (ISO-8859-_7)"
 
-#: src/compose.c:598 src/mainwindow.c:631 src/messageview.c:186
+#: src/compose.c:598 src/mainwindow.c:634 src/messageview.c:186
+#, fuzzy
+msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
+msgstr "/查看(_V)/字符编码(_E)/波罗的语 (ISO-8859-_4)"
+
+#: src/compose.c:600 src/mainwindow.c:636 src/messageview.c:188
+#, fuzzy
+msgid "/_View/Character _encoding/Arabic (Windows-1256)"
+msgstr "/查看(_V)/字符编码(_E)/斯拉夫语 (Windows-1251)"
+
+#: src/compose.c:604 src/mainwindow.c:640 src/messageview.c:191
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/查看(_V)/字符编码(_E)/希腊语 (ISO-8859-_7)"
 
-#: src/compose.c:600 src/mainwindow.c:633 src/messageview.c:188
+#: src/compose.c:606 src/mainwindow.c:642 src/messageview.c:193
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/查看(_V)/字符编码(_E)/斯拉夫语 (Windows-1251)"
 
-#: src/compose.c:604 src/mainwindow.c:637 src/messageview.c:191
+#: src/compose.c:610 src/mainwindow.c:646 src/messageview.c:196
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/查看(_V)/字符编码(_E)/土耳其语 (ISO-8859-_9)"
 
-#: src/compose.c:608 src/mainwindow.c:641 src/messageview.c:194
+#: src/compose.c:614 src/mainwindow.c:650 src/messageview.c:199
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/查看(_V)/字符编码(_E)/斯拉夫语 (ISO-8859-_5)"
 
-#: src/compose.c:610 src/mainwindow.c:643 src/messageview.c:196
+#: src/compose.c:616 src/mainwindow.c:652 src/messageview.c:201
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/查看(_V)/字符编码(_E)/斯拉夫语 (KOI8-_R)"
 
-#: src/compose.c:612 src/mainwindow.c:645 src/messageview.c:198
+#: src/compose.c:618 src/mainwindow.c:654 src/messageview.c:203
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/查看(_V)/字符编码(_E)/斯拉夫语 (KOI8-U)"
 
-#: src/compose.c:614 src/mainwindow.c:647 src/messageview.c:200
+#: src/compose.c:620 src/mainwindow.c:656 src/messageview.c:205
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/查看(_V)/字符编码(_E)/斯拉夫语 (Windows-1251)"
 
-#: src/compose.c:618 src/mainwindow.c:651 src/messageview.c:203
+#: src/compose.c:624 src/mainwindow.c:660 src/messageview.c:208
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/查看(_V)/字符编码(_E)/日语 (ISO-2022-_JP)"
 
-#: src/compose.c:622 src/mainwindow.c:661 src/messageview.c:212
+#: src/compose.c:628 src/mainwindow.c:670 src/messageview.c:217
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/查看(_V)/字符编码(_E)/简体中文 (_GB2312)"
 
-#: src/compose.c:624 src/mainwindow.c:663 src/messageview.c:214
+#: src/compose.c:630 src/mainwindow.c:672 src/messageview.c:219
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/查看(_V)/字符编码(_E)/简体中文 (_GB2312)"
 
-#: src/compose.c:626 src/mainwindow.c:665 src/messageview.c:216
+#: src/compose.c:632 src/mainwindow.c:674 src/messageview.c:221
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/查看(_V)/字符编码(_E)/繁体中文 (_Big5)"
 
-#: src/compose.c:630 src/mainwindow.c:673 src/messageview.c:223
+#: src/compose.c:636 src/mainwindow.c:682 src/messageview.c:228
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/查看(_V)/字符编码(_E)/朝鲜语 (EUC-_KR)"
 
-#: src/compose.c:634 src/mainwindow.c:679 src/messageview.c:228
+#: src/compose.c:640 src/mainwindow.c:688 src/messageview.c:233
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/查看(_V)/字符编码(_E)/泰国语 (TIS-620)"
 
-#: src/compose.c:636 src/mainwindow.c:681 src/messageview.c:230
+#: src/compose.c:642 src/mainwindow.c:690 src/messageview.c:235
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/查看(_V)/字符编码(_E)/泰国语 (Windows-874)"
 
-#: src/compose.c:640 src/mainwindow.c:739 src/messageview.c:260
+#: src/compose.c:646 src/mainwindow.c:750 src/messageview.c:265
 msgid "/_Tools/_Address book"
 msgstr "/工具(_T)/地址簿(_A)"
 
-#: src/compose.c:641
+#: src/compose.c:647
 msgid "/_Tools/_Template"
 msgstr "/工具(_T)/模板(_T)"
 
-#: src/compose.c:642 src/mainwindow.c:762 src/messageview.c:275
+#: src/compose.c:648 src/mainwindow.c:773 src/messageview.c:280
 msgid "/_Tools/Actio_ns"
 msgstr "/工具(_T)/动作(_N)"
 
-#: src/compose.c:643 src/compose.c:647 src/compose.c:653 src/mainwindow.c:742
-#: src/mainwindow.c:756 src/mainwindow.c:761 src/mainwindow.c:763
-#: src/mainwindow.c:766 src/mainwindow.c:768 src/messageview.c:263
-#: src/messageview.c:274
+#: src/compose.c:649 src/compose.c:653 src/compose.c:659 src/mainwindow.c:753
+#: src/mainwindow.c:767 src/mainwindow.c:772 src/mainwindow.c:774
+#: src/mainwindow.c:777 src/mainwindow.c:779 src/messageview.c:268
+#: src/messageview.c:279
 msgid "/_Tools/---"
 msgstr "/工具(_T)/---"
 
-#: src/compose.c:644
+#: src/compose.c:650
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/工具(_T)/用外部编辑器编辑(_X)"
 
-#: src/compose.c:648
+#: src/compose.c:654
 msgid "/_Tools/PGP Si_gn"
 msgstr "/工具(_T)/PGP 签名(_G)"
 
-#: src/compose.c:649
+#: src/compose.c:655
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/工具(_T)/PGP 加密(_E)"
 
-#: src/compose.c:654
+#: src/compose.c:660
 #, fuzzy
 msgid "/_Tools/_Check spell"
 msgstr "/工具(_T)/执行(_X)"
 
-#: src/compose.c:655
+#: src/compose.c:661
 #, fuzzy
 msgid "/_Tools/_Set spell language"
 msgstr "/工具(_T)/模板(_T)"
 
-#: src/compose.c:899
+#: src/compose.c:908
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s：文件不存在\n"
 
-#: src/compose.c:1003 src/compose.c:1074
+#: src/compose.c:1012 src/compose.c:1083
 msgid "Can't get text part\n"
 msgstr "无法得到文本分块\n"
 
-#: src/compose.c:1475
+#: src/compose.c:1484
 msgid "Quote mark format error."
 msgstr "引文标记格式错误。"
 
-#: src/compose.c:1487
+#: src/compose.c:1496
 msgid "Message reply/forward format error."
 msgstr "邮件回复/转发格式错误。"
 
-#: src/compose.c:1907
+#: src/compose.c:1916
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "文件 %s 不存在\n"
 
-#: src/compose.c:1911
+#: src/compose.c:1920
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "无法获得文件 %s 的大小\n"
 
-#: src/compose.c:1915
+#: src/compose.c:1924
 #, c-format
 msgid "File %s is empty."
 msgstr "文件 %s 是空的。"
 
-#: src/compose.c:1919
+#: src/compose.c:1928
 #, c-format
 msgid "Can't read %s."
 msgstr "无法读取 %s。"
 
-#: src/compose.c:1952
+#: src/compose.c:1961
 #, c-format
 msgid "Message: %s"
 msgstr "邮件：%s"
 
-#: src/compose.c:2012 src/mimeview.c:565
+#: src/compose.c:2021 src/mimeview.c:565
 msgid "Can't get the part of multipart message."
 msgstr "无法获得分块邮件的分块。"
 
-#: src/compose.c:2496 src/headerview.c:195 src/query_search.c:636
-#: src/summaryview.c:2107
+#: src/compose.c:2505 src/headerview.c:195 src/query_search.c:636
+#: src/summaryview.c:2124
 msgid "(No Subject)"
 msgstr "(没有主题)"
 
-#: src/compose.c:2499
+#: src/compose.c:2508
 #, fuzzy, c-format
 msgid "%s - Compose%s"
 msgstr "%s - 撰写邮件%s"
 
-#: src/compose.c:2612
+#: src/compose.c:2621
 msgid "Recipient is not specified."
 msgstr "没有指定收件人。"
 
-#: src/compose.c:2620
+#: src/compose.c:2629
 #, fuzzy
 msgid "Empty subject"
 msgstr "主题"
 
-#: src/compose.c:2621
+#: src/compose.c:2630
 msgid "Subject is empty. Send it anyway?"
 msgstr "主题是空的。还要发送吗？"
 
-#: src/compose.c:2680
+#: src/compose.c:2689
 msgid "can't get recipient list."
 msgstr "无法获得收件人列表。"
 
-#: src/compose.c:2700
+#: src/compose.c:2709
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1604,21 +1615,21 @@ msgstr ""
 "没有指定发送邮件要用的帐号。\n"
 "请在发送前选择一个邮件帐号。"
 
-#: src/compose.c:2714 src/send_message.c:299
+#: src/compose.c:2723 src/send_message.c:299
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "发送邮件到 %s 时发生错误。"
 
-#: src/compose.c:2756
+#: src/compose.c:2765
 msgid "Can't save the message to outbox."
 msgstr "无法将该邮件保存到发件箱。"
 
-#: src/compose.c:2794
+#: src/compose.c:2803
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "无法找到和当前选中的密钥标识“%s”相联系的钥匙。"
 
-#: src/compose.c:2891
+#: src/compose.c:2900
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1628,12 +1639,12 @@ msgstr ""
 "无法将邮件的字符编码从 %s 转换到 %s。\n"
 "仍然用 %s 发送吗？"
 
-#: src/compose.c:2897
+#: src/compose.c:2906
 #, fuzzy
 msgid "Code conversion error"
 msgstr "地址簿转换错误"
 
-#: src/compose.c:2970
+#: src/compose.c:2979
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1642,159 +1653,159 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:2974
+#: src/compose.c:2983
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3264
+#: src/compose.c:3273
 msgid "can't remove the old message\n"
 msgstr "无法删除旧邮件\n"
 
-#: src/compose.c:3282
+#: src/compose.c:3291
 msgid "queueing message...\n"
 msgstr "正在排队邮件...\n"
 
-#: src/compose.c:3364
+#: src/compose.c:3373
 msgid "can't find queue folder\n"
 msgstr "无法找到队列文件夹：%s\n"
 
-#: src/compose.c:3371
+#: src/compose.c:3380
 msgid "can't queue the message\n"
 msgstr "无法排队该邮件\n"
 
-#: src/compose.c:3964
+#: src/compose.c:3973
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "生成邮件标识号：%s\n"
 
-#: src/compose.c:4077
+#: src/compose.c:4086
 msgid "Creating compose window...\n"
 msgstr "正在创建撰写窗口...\n"
 
-#: src/compose.c:4128 src/headerview.c:54
+#: src/compose.c:4137 src/headerview.c:54
 msgid "From:"
 msgstr "发件人："
 
-#: src/compose.c:4202
+#: src/compose.c:4211
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/工具(_T)/PGP 签名(_G)"
 
-#: src/compose.c:4205
+#: src/compose.c:4214
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/工具(_T)/PGP 加密(_E)"
 
-#: src/compose.c:4243 src/compose.c:5317
+#: src/compose.c:4252 src/compose.c:5326
 msgid "MIME type"
 msgstr "MIME 类型"
 
 #. S_COL_DATE
-#: src/compose.c:4252 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4740
+#: src/compose.c:4261 src/mimeview.c:197 src/prefs_filter_edit.c:496
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4897
 msgid "Size"
 msgstr "大小"
 
-#: src/compose.c:4683 src/mainwindow.c:2324 src/prefs_account_dialog.c:528
+#: src/compose.c:4692 src/mainwindow.c:2335 src/prefs_account_dialog.c:528
 #: src/prefs_common_dialog.c:661
 msgid "Send"
 msgstr "发送"
 
-#: src/compose.c:4684
+#: src/compose.c:4693
 msgid "Send message"
 msgstr "立即发送邮件"
 
-#: src/compose.c:4692
+#: src/compose.c:4701
 msgid "Send later"
 msgstr "以后发送"
 
-#: src/compose.c:4693
+#: src/compose.c:4702
 msgid "Put into queue folder and send later"
 msgstr "放入队列文件夹，在以后发送"
 
-#: src/compose.c:4701
+#: src/compose.c:4710
 msgid "Draft"
 msgstr "草稿"
 
-#: src/compose.c:4702
+#: src/compose.c:4711
 msgid "Save to draft folder"
 msgstr "保存到草稿文件夹"
 
-#: src/compose.c:4712
+#: src/compose.c:4721
 msgid "Insert"
 msgstr "插入"
 
-#: src/compose.c:4713
+#: src/compose.c:4722
 msgid "Insert file"
 msgstr "插入文件内容"
 
-#: src/compose.c:4721
+#: src/compose.c:4730
 msgid "Attach"
 msgstr "附件"
 
-#: src/compose.c:4722
+#: src/compose.c:4731
 msgid "Attach file"
 msgstr "加入附件"
 
 #. signature
-#: src/compose.c:4732 src/prefs_account_dialog.c:1208
+#: src/compose.c:4741 src/prefs_account_dialog.c:1208
 #: src/prefs_common_dialog.c:953
 msgid "Signature"
 msgstr "签名"
 
-#: src/compose.c:4733
+#: src/compose.c:4742
 #, fuzzy
 msgid "Append signature"
 msgstr "签名错误"
 
 #. editor
-#: src/compose.c:4742 src/prefs_common_dialog.c:991
+#: src/compose.c:4751 src/prefs_common_dialog.c:991
 #: src/prefs_common_dialog.c:2315
 msgid "Editor"
 msgstr "编辑器"
 
-#: src/compose.c:4743
+#: src/compose.c:4752
 msgid "Edit with external editor"
 msgstr "使用外部编辑器编辑"
 
-#: src/compose.c:4751
+#: src/compose.c:4760
 msgid "Linewrap"
 msgstr "换行"
 
-#: src/compose.c:4752
+#: src/compose.c:4761
 msgid "Wrap all long lines"
 msgstr "长行换行"
 
-#: src/compose.c:5213
+#: src/compose.c:5222
 msgid "Invalid MIME type."
 msgstr "无效的MIME类型。"
 
-#: src/compose.c:5231
+#: src/compose.c:5240
 msgid "File doesn't exist or is empty."
 msgstr "文件不存在或为空。"
 
-#: src/compose.c:5299
+#: src/compose.c:5308
 msgid "Properties"
 msgstr "属性"
 
-#: src/compose.c:5319 src/prefs_common_dialog.c:1444
+#: src/compose.c:5328 src/prefs_common_dialog.c:1444
 msgid "Encoding"
 msgstr "编码方式"
 
-#: src/compose.c:5342 src/prefs_folder_item.c:202
+#: src/compose.c:5351 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "路径"
 
-#: src/compose.c:5343
+#: src/compose.c:5352
 msgid "File name"
 msgstr "文件名"
 
-#: src/compose.c:5436
+#: src/compose.c:5445
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "外部编辑器命令行无效：“%s”\n"
 
-#: src/compose.c:5482
+#: src/compose.c:5491
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1804,47 +1815,47 @@ msgstr ""
 "强制结束程序？\n"
 "程序组标识号：%d"
 
-#: src/compose.c:5857 src/compose.c:5862 src/compose.c:5868
+#: src/compose.c:5866 src/compose.c:5871 src/compose.c:5877
 msgid "Can't queue the message."
 msgstr "无法将该邮件排队。"
 
-#: src/compose.c:5959
+#: src/compose.c:5968
 msgid "Select files"
 msgstr "选择文件"
 
-#: src/compose.c:5982
+#: src/compose.c:5991
 msgid "Select file"
 msgstr "选择文件"
 
-#: src/compose.c:6017
+#: src/compose.c:6026
 #, fuzzy
 msgid "Save message"
 msgstr "立即发送邮件"
 
-#: src/compose.c:6018
+#: src/compose.c:6027
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "该邮件已修改。丢弃它？"
 
-#: src/compose.c:6020
+#: src/compose.c:6029
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:6062
+#: src/compose.c:6071
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "您要使用模板“%s”吗？"
 
-#: src/compose.c:6064
+#: src/compose.c:6073
 msgid "Apply template"
 msgstr "使用模板"
 
-#: src/compose.c:6065
+#: src/compose.c:6074
 #, fuzzy
 msgid "_Replace"
 msgstr "替换"
 
-#: src/compose.c:6065
+#: src/compose.c:6074
 #, fuzzy
 msgid "_Insert"
 msgstr "插入"
@@ -2283,7 +2294,7 @@ msgstr "新建"
 
 #. S_COL_MARK
 #: src/folderview.c:412 src/prefs_filter_edit.c:500
-#: src/prefs_summary_column.c:71 src/summaryview.c:509
+#: src/prefs_summary_column.c:71 src/summaryview.c:511
 msgid "Unread"
 msgstr "未读"
 
@@ -2299,12 +2310,12 @@ msgstr "正在设置文件夹信息...\n"
 msgid "Setting folder info..."
 msgstr "正在设置文件夹信息..."
 
-#: src/folderview.c:858 src/mainwindow.c:3464 src/setup.c:80
+#: src/folderview.c:858 src/mainwindow.c:3481 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "正在扫描文件夹 %s%c%s ..."
 
-#: src/folderview.c:862 src/mainwindow.c:3469 src/setup.c:85
+#: src/folderview.c:862 src/mainwindow.c:3486 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "正在扫描文件夹 %s ..."
@@ -2329,7 +2340,7 @@ msgstr "重建文件夹树失败。"
 msgid "Checking for new messages in all folders..."
 msgstr "正在检查所有文件夹中的新邮件..."
 
-#: src/folderview.c:1200 src/mainwindow.c:2400 src/prefs_common_dialog.c:1789
+#: src/folderview.c:1200 src/mainwindow.c:2411 src/prefs_common_dialog.c:1789
 msgid "Junk"
 msgstr ""
 
@@ -2468,7 +2479,7 @@ msgstr "标题："
 msgid "Creating header view...\n"
 msgstr "正在创建标题视图...\n"
 
-#: src/headerview.c:180 src/query_search.c:637 src/summaryview.c:2110
+#: src/headerview.c:180 src/query_search.c:637 src/summaryview.c:2127
 msgid "(No From)"
 msgstr "(没有发件人)"
 
@@ -2577,7 +2588,7 @@ msgstr "导入 LDIF 文件到地址簿"
 msgid "Prev"
 msgstr "上一个"
 
-#: src/importldif.c:768 src/mainwindow.c:2420
+#: src/importldif.c:768 src/mainwindow.c:2431
 msgid "Next"
 msgstr "下一个"
 
@@ -2919,11 +2930,11 @@ msgstr ""
 msgid "another Sylpheed is already running.\n"
 msgstr "另外一个 Sylpheed 正在运行。\n"
 
-#: src/main.c:1064
+#: src/main.c:1083
 msgid "Migration of configuration"
 msgstr "正在迁移配置"
 
-#: src/main.c:1065
+#: src/main.c:1084
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -2931,641 +2942,646 @@ msgstr ""
 "发现以前版本的配置。\n"
 "您要迁移吗？"
 
-#: src/mainwindow.c:478
+#: src/mainwindow.c:481
 msgid "/_File/_Folder"
 msgstr "/文件(_F)/文件夹(_F)"
 
-#: src/mainwindow.c:479
+#: src/mainwindow.c:482
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/文件(_F)/文件夹(_F)/新建文件夹(_N)..."
 
-#: src/mainwindow.c:481
+#: src/mainwindow.c:484
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/文件(_F)/文件夹(_F)/重命名文件夹(_R)..."
 
-#: src/mainwindow.c:482
+#: src/mainwindow.c:485
 #, fuzzy
 msgid "/_File/_Folder/_Move folder..."
 msgstr "/文件(_F)/文件夹(_F)/重命名文件夹(_R)..."
 
-#: src/mainwindow.c:483
+#: src/mainwindow.c:486
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/文件(_F)/文件夹(_F)/删除文件夹(_D)"
 
-#: src/mainwindow.c:484
+#: src/mainwindow.c:487
 msgid "/_File/_Mailbox"
 msgstr "/文件(_F)/邮箱(_M)"
 
-#: src/mainwindow.c:485
+#: src/mainwindow.c:488
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/文件(_F)/邮箱(_M)/添加邮箱(_M)..."
 
-#: src/mainwindow.c:486
+#: src/mainwindow.c:489
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/文件(_F)/邮箱(_M)/删除邮箱(_R)..."
 
-#: src/mainwindow.c:487 src/mainwindow.c:492
+#: src/mainwindow.c:490 src/mainwindow.c:495
 msgid "/_File/_Mailbox/---"
 msgstr "/文件(_F)/邮箱(_M)/---"
 
-#: src/mainwindow.c:488
+#: src/mainwindow.c:491
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "/文件(_F)/邮箱(_M)/检查新邮件(_C)"
 
-#: src/mainwindow.c:490
+#: src/mainwindow.c:493
 msgid "/_File/_Mailbox/Check for new messages in _all mailboxes"
 msgstr "/文件(_F)/邮箱(_M)/检查所有邮箱的新邮件(_A)"
 
-#: src/mainwindow.c:493
+#: src/mainwindow.c:496
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "/文件(_F)/邮箱(_M)/重建文件夹树(_E)"
 
-#: src/mainwindow.c:496
+#: src/mainwindow.c:499
 msgid "/_File/_Import mbox file..."
 msgstr "/文件(_F)/导入mbox文件(_I)..."
 
-#: src/mainwindow.c:497
+#: src/mainwindow.c:500
 msgid "/_File/_Export to mbox file..."
 msgstr "/文件(_F)/导出到mbox文件(_E)..."
 
-#: src/mainwindow.c:499
+#: src/mainwindow.c:502
 msgid "/_File/Empty all _trash"
 msgstr "/文件(_F)/清空废件箱(_T)"
 
-#: src/mainwindow.c:501 src/messageview.c:139
+#: src/mainwindow.c:504 src/messageview.c:139
 msgid "/_File/_Save as..."
 msgstr "/文件(_F)/另存为(_S)..."
 
-#: src/mainwindow.c:502 src/messageview.c:140
+#: src/mainwindow.c:505 src/messageview.c:140
 msgid "/_File/_Print..."
 msgstr "/文件(_F)/打印(_P)..."
 
-#: src/mainwindow.c:504
+#: src/mainwindow.c:507
 msgid "/_File/_Work offline"
 msgstr "/文件(_F)/离线工作(_W)"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:507
+#: src/mainwindow.c:510
 msgid "/_File/E_xit"
 msgstr "/文件(_F)/退出(_X)"
 
-#: src/mainwindow.c:512
+#: src/mainwindow.c:515
 msgid "/_Edit/Select _thread"
 msgstr "/编辑(_E)/选择线索(_T)"
 
-#: src/mainwindow.c:514 src/messageview.c:148
+#: src/mainwindow.c:517 src/messageview.c:148
 msgid "/_Edit/_Find in current message..."
 msgstr "/编辑(_E)/在当前邮件中查找(_F)..."
 
-#: src/mainwindow.c:516
+#: src/mainwindow.c:519
 msgid "/_Edit/_Search messages..."
 msgstr "/编辑(_E)/查找邮件(_S)..."
 
-#: src/mainwindow.c:519
+#: src/mainwindow.c:522
 msgid "/_View/Show or hi_de"
 msgstr "/查看(_V)/显示或隐藏(_D)"
 
-#: src/mainwindow.c:520
+#: src/mainwindow.c:523
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/查看(_V)/显示或隐藏(_D)/文件夹树(_F)"
 
-#: src/mainwindow.c:522
+#: src/mainwindow.c:525
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/查看(_V)/显示或隐藏(_D)/邮件视图(_M)"
 
-#: src/mainwindow.c:524
+#: src/mainwindow.c:527
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/查看(_V)/显示或隐藏(_D)/工具栏(_T)"
 
-#: src/mainwindow.c:526
+#: src/mainwindow.c:529
 msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/查看(_V)/显示或隐藏(_D)/工具栏(_T)/图标和文字(_A)"
 
-#: src/mainwindow.c:528
+#: src/mainwindow.c:531
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/查看(_V)/显示或隐藏(_D)/工具栏(_T)/图标(_I)"
 
-#: src/mainwindow.c:530
+#: src/mainwindow.c:533
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/查看(_V)/显示或隐藏(_D)/工具栏(_T)/文字(_T)"
 
-#: src/mainwindow.c:532
+#: src/mainwindow.c:535
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/查看(_V)/显示或隐藏(_D)/工具栏(_T)/无(_N)"
 
-#: src/mainwindow.c:534
+#: src/mainwindow.c:537
 #, fuzzy
 msgid "/_View/Show or hi_de/_Search bar"
 msgstr "/查看(_V)/显示或隐藏(_D)/状态栏(_B)"
 
-#: src/mainwindow.c:536
+#: src/mainwindow.c:539
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/查看(_V)/显示或隐藏(_D)/状态栏(_B)"
 
-#: src/mainwindow.c:539
+#: src/mainwindow.c:542
 msgid "/_View/Separate f_older tree"
 msgstr "/查看(_V)/分离文件夹树窗口(_O)"
 
-#: src/mainwindow.c:540
+#: src/mainwindow.c:543
 msgid "/_View/Separate _message view"
 msgstr "/查看(_V)/分离邮件视图窗口(_M)"
 
-#: src/mainwindow.c:542
+#: src/mainwindow.c:545
 msgid "/_View/_Sort"
 msgstr "/查看/排序(_S)"
 
-#: src/mainwindow.c:543
+#: src/mainwindow.c:546
 msgid "/_View/_Sort/by _number"
 msgstr "/查看(_V)/排序(_S)/按序号(_N)"
 
-#: src/mainwindow.c:544
+#: src/mainwindow.c:547
 msgid "/_View/_Sort/by s_ize"
 msgstr "/查看(_V)/排序(_S)/按大小(_I)"
 
-#: src/mainwindow.c:545
+#: src/mainwindow.c:548
 msgid "/_View/_Sort/by _date"
 msgstr "/查看(_V)/排序(_S)/按日期(_D)"
 
-#: src/mainwindow.c:546
+#: src/mainwindow.c:549
 #, fuzzy
 msgid "/_View/_Sort/by t_hread date"
 msgstr "/查看(_V)/排序(_S)/按日期(_D)"
 
-#: src/mainwindow.c:547
+#: src/mainwindow.c:550
 msgid "/_View/_Sort/by _from"
 msgstr "/查看(_V)/排序(_S)/按发件人(_F)"
 
-#: src/mainwindow.c:548
+#: src/mainwindow.c:551
 msgid "/_View/_Sort/by _recipient"
 msgstr "/查看(_V)/排序(_S)/按收件人(_R)"
 
-#: src/mainwindow.c:549
+#: src/mainwindow.c:552
 msgid "/_View/_Sort/by _subject"
 msgstr "/查看(_V)/排序(_S)/按主题(_S)"
 
-#: src/mainwindow.c:550
+#: src/mainwindow.c:553
 msgid "/_View/_Sort/by _color label"
 msgstr "/查看(_V)/排序(_S)/按颜色标注(_C)"
 
-#: src/mainwindow.c:552
+#: src/mainwindow.c:555
 msgid "/_View/_Sort/by _mark"
 msgstr "/查看(_V)/排序(_S)/按标记(_M)"
 
-#: src/mainwindow.c:553
+#: src/mainwindow.c:556
 msgid "/_View/_Sort/by _unread"
 msgstr "/查看(_V)/排序(_S)/按未读(_U)"
 
-#: src/mainwindow.c:554
+#: src/mainwindow.c:557
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/查看(_V)/排序(_S)/按附件(_T)"
 
-#: src/mainwindow.c:556
+#: src/mainwindow.c:559
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/查看(_V)/排序(_S)/不排序(_O)"
 
-#: src/mainwindow.c:557 src/mainwindow.c:560
+#: src/mainwindow.c:560 src/mainwindow.c:563
 msgid "/_View/_Sort/---"
 msgstr "/查看(_V)/排序(_S)/---"
 
-#: src/mainwindow.c:558
+#: src/mainwindow.c:561
 msgid "/_View/_Sort/Ascending"
 msgstr "/查看(_V)/排序(_S)/升序"
 
-#: src/mainwindow.c:559
+#: src/mainwindow.c:562
 msgid "/_View/_Sort/Descending"
 msgstr "/查看(_V)/排序(_S)/降序"
 
-#: src/mainwindow.c:561
+#: src/mainwindow.c:564
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/查看(_V)/排序(_S)/按主题集中(_A)"
 
-#: src/mainwindow.c:563
+#: src/mainwindow.c:566
 msgid "/_View/Th_read view"
 msgstr "/查看(_V)/按线索查看(_R)"
 
-#: src/mainwindow.c:564
+#: src/mainwindow.c:567
 msgid "/_View/E_xpand all threads"
 msgstr "/查看(_V)/展开所有线索(_X)"
 
-#: src/mainwindow.c:565
+#: src/mainwindow.c:568
 msgid "/_View/Co_llapse all threads"
 msgstr "/查看(_V)/收缩所有线索(_L)"
 
-#: src/mainwindow.c:566
+#: src/mainwindow.c:569
 msgid "/_View/Set display _item..."
 msgstr "/查看(_V)/设置显示项(_I)..."
 
-#: src/mainwindow.c:569
+#: src/mainwindow.c:572
 msgid "/_View/_Go to"
 msgstr "/查看(_V)/转到(_G)"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:573
 msgid "/_View/_Go to/_Prev message"
 msgstr "/查看(_V)/转到(_G)/上一个邮件(_P)"
 
-#: src/mainwindow.c:571
+#: src/mainwindow.c:574
 msgid "/_View/_Go to/_Next message"
 msgstr "/查看(_V)/转到(_G)/下一个邮件(_N)"
 
-#: src/mainwindow.c:572 src/mainwindow.c:577 src/mainwindow.c:580
-#: src/mainwindow.c:585 src/mainwindow.c:590
+#: src/mainwindow.c:575 src/mainwindow.c:580 src/mainwindow.c:583
+#: src/mainwindow.c:588 src/mainwindow.c:593
 msgid "/_View/_Go to/---"
 msgstr "/查看(_V)/转到(_G)/---"
 
-#: src/mainwindow.c:573
+#: src/mainwindow.c:576
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/查看(_V)/转到(_G)/上一个未读邮件(_R)"
 
-#: src/mainwindow.c:575
+#: src/mainwindow.c:578
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/查看(_V)/转到(_G)/下一个未读邮件(_E)"
 
-#: src/mainwindow.c:578
+#: src/mainwindow.c:581
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/查看(_V)/转到(_G)/上一个新邮件(_W)"
 
-#: src/mainwindow.c:579
+#: src/mainwindow.c:582
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/查看(_V)/转到(_G)/下一个新邮件(_X)"
 
-#: src/mainwindow.c:581
+#: src/mainwindow.c:584
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/查看(_V)/转到(_G)/上一个标记的邮件(_M)"
 
-#: src/mainwindow.c:583
+#: src/mainwindow.c:586
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/查看(_V)/转到(_G)/下一个标记的邮件(_A)"
 
-#: src/mainwindow.c:586
+#: src/mainwindow.c:589
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/查看(_V)/转到(_G)/上一个用颜色标注的邮件(_L)"
 
-#: src/mainwindow.c:588
+#: src/mainwindow.c:591
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/查看(_V)/转到(_G)/下一个用颜色标注的邮件(_B)"
 
-#: src/mainwindow.c:591
+#: src/mainwindow.c:594
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/查看(_V)/转到(_G)/其它文件夹(_F)..."
 
-#: src/mainwindow.c:600 src/messageview.c:159
+#: src/mainwindow.c:603 src/messageview.c:159
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/查看(_V)/字符编码(_E)/自动检测(_A)"
 
-#: src/mainwindow.c:613 src/messageview.c:172
+#: src/mainwindow.c:616 src/messageview.c:172
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr "/查看(_V)/字符编码(_E)/西欧 (ISO-8859-15)"
 
-#: src/mainwindow.c:653 src/messageview.c:205
+#: src/mainwindow.c:662 src/messageview.c:210
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/查看(_V)/字符编码(_E)/日语 (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:655 src/messageview.c:207
+#: src/mainwindow.c:664 src/messageview.c:212
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/查看(_V)/字符编码(_E)/日语 (_EUC-JP)"
 
-#: src/mainwindow.c:657 src/messageview.c:209
+#: src/mainwindow.c:666 src/messageview.c:214
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/查看(_V)/字符编码(_E)/日语 (_Shift__JIS)"
 
-#: src/mainwindow.c:667 src/messageview.c:218
+#: src/mainwindow.c:676 src/messageview.c:223
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/查看(_V)/字符编码(_E)/繁体中文 (EUC-_TW)"
 
-#: src/mainwindow.c:669 src/messageview.c:220
+#: src/mainwindow.c:678 src/messageview.c:225
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/查看(_V)/字符编码(_E)/中文 (ISO-2022-_CN)"
 
-#: src/mainwindow.c:675 src/messageview.c:225
+#: src/mainwindow.c:684 src/messageview.c:230
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/查看(_V)/字符编码(_E)/朝鲜语 (ISO-2022-KR)"
 
-#: src/mainwindow.c:688 src/summaryview.c:449
+#: src/mainwindow.c:697 src/summaryview.c:451
 msgid "/_View/Open in new _window"
 msgstr "/查看(_V)/在新窗口中打开(_W)"
 
-#: src/mainwindow.c:689 src/messageview.c:237
+#: src/mainwindow.c:698 src/messageview.c:242
 msgid "/_View/Mess_age source"
 msgstr "/查看(_V)/邮件源文件(_A)"
 
-#: src/mainwindow.c:690 src/messageview.c:238
+#: src/mainwindow.c:699 src/messageview.c:243
 msgid "/_View/Show all _header"
 msgstr "/查看(_V)/显示所有邮件头(_H)"
 
-#: src/mainwindow.c:692
+#: src/mainwindow.c:701
 msgid "/_View/_Update summary"
 msgstr "/查看(_V)/更新摘要(_U)"
 
-#: src/mainwindow.c:694 src/messageview.c:240
+#: src/mainwindow.c:703 src/messageview.c:245
 msgid "/_Message"
 msgstr "/邮件(_M)"
 
-#: src/mainwindow.c:695
+#: src/mainwindow.c:704
 msgid "/_Message/Recei_ve"
 msgstr "/邮件(_M)/接收(_V)"
 
-#: src/mainwindow.c:696
+#: src/mainwindow.c:705
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/邮件(_M)/接收(_V)/当前帐号(_C)"
 
-#: src/mainwindow.c:698
+#: src/mainwindow.c:707
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/邮件(_M)/接收(_V)/所有帐号(_A)"
 
-#: src/mainwindow.c:700
+#: src/mainwindow.c:709
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/邮件(_M)/接收(_V)/取消(_G)"
 
-#: src/mainwindow.c:702
+#: src/mainwindow.c:711
 msgid "/_Message/Recei_ve/---"
 msgstr "/邮件(_M)/接收(_V)/---"
 
-#: src/mainwindow.c:703
+#: src/mainwindow.c:712
 msgid "/_Message/_Send queued messages"
 msgstr "/邮件(_M)/发送队列中的邮件(_S)"
 
-#: src/mainwindow.c:704 src/mainwindow.c:706 src/mainwindow.c:713
-#: src/mainwindow.c:718 src/mainwindow.c:721 src/mainwindow.c:730
-#: src/mainwindow.c:732 src/mainwindow.c:735 src/messageview.c:243
-#: src/messageview.c:251 src/messageview.c:256
+#: src/mainwindow.c:713 src/mainwindow.c:715 src/mainwindow.c:722
+#: src/mainwindow.c:727 src/mainwindow.c:730 src/mainwindow.c:741
+#: src/mainwindow.c:743 src/mainwindow.c:746 src/messageview.c:248
+#: src/messageview.c:256 src/messageview.c:261
 msgid "/_Message/---"
 msgstr "/邮件(_M)/---"
 
-#: src/mainwindow.c:705 src/messageview.c:241
+#: src/mainwindow.c:714 src/messageview.c:246
 msgid "/_Message/Compose _new message"
 msgstr "/邮件(_M)/撰写新邮件(_N)"
 
-#: src/mainwindow.c:707 src/messageview.c:244
+#: src/mainwindow.c:716 src/messageview.c:249
 msgid "/_Message/_Reply"
 msgstr "/邮件(_M)/回复(_R)"
 
-#: src/mainwindow.c:708
+#: src/mainwindow.c:717
 msgid "/_Message/Repl_y to"
 msgstr "/邮件(_M)/回复到(_Y)"
 
-#: src/mainwindow.c:709 src/messageview.c:245
+#: src/mainwindow.c:718 src/messageview.c:250
 msgid "/_Message/Repl_y to/_all"
 msgstr "/邮件(_M)/回复到(_Y)/所有人(_AL)"
 
-#: src/mainwindow.c:710 src/messageview.c:247
+#: src/mainwindow.c:719 src/messageview.c:252
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/邮件(_M)/回复到(_Y)/发件人(_S)"
 
-#: src/mainwindow.c:711 src/messageview.c:249
+#: src/mainwindow.c:720 src/messageview.c:254
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/邮件(_M)/回复到(_Y)/邮件列表(_L)"
 
-#: src/mainwindow.c:714 src/messageview.c:252
+#: src/mainwindow.c:723 src/messageview.c:257
 msgid "/_Message/_Forward"
 msgstr "/邮件(_M)/转发(_F)"
 
-#: src/mainwindow.c:715 src/messageview.c:253
+#: src/mainwindow.c:724 src/messageview.c:258
 msgid "/_Message/For_ward as attachment"
 msgstr "/邮件(_M)/作为附件转发(_W)"
 
-#: src/mainwindow.c:717 src/messageview.c:255
+#: src/mainwindow.c:726 src/messageview.c:260
 msgid "/_Message/Redirec_t"
 msgstr "/邮件(_M)/重定向(_T)"
 
-#: src/mainwindow.c:719
+#: src/mainwindow.c:728
 msgid "/_Message/M_ove..."
 msgstr "/邮件(_M)/移动(_O)..."
 
-#: src/mainwindow.c:720
+#: src/mainwindow.c:729
 msgid "/_Message/_Copy..."
 msgstr "/邮件(_M)/复制(_C)..."
 
-#: src/mainwindow.c:722
+#: src/mainwindow.c:731
 msgid "/_Message/_Mark"
 msgstr "/邮件(_M)/标记(_M)"
 
-#: src/mainwindow.c:723
+#: src/mainwindow.c:732
 msgid "/_Message/_Mark/_Mark"
 msgstr "/邮件(_M)/标记(_M)/标记(_M)"
 
-#: src/mainwindow.c:724
+#: src/mainwindow.c:733
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/邮件(_M)/标记(_M)/取消标记(_U)"
 
-#: src/mainwindow.c:725
+#: src/mainwindow.c:734
 msgid "/_Message/_Mark/---"
 msgstr "/邮件(_M)/标记(_M)/---"
 
-#: src/mainwindow.c:726
+#: src/mainwindow.c:735
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/邮件(_M)/标记(_M)/标记为未读(_E)"
 
-#: src/mainwindow.c:727
+#: src/mainwindow.c:736
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/邮件(_M)/标记(_M)/标记为已读(_D)"
 
-#: src/mainwindow.c:729
+#: src/mainwindow.c:738
+#, fuzzy
+msgid "/_Message/_Mark/Mark _thread as read"
+msgstr "/邮件(_M)/标记(_M)/标记为已读(_D)"
+
+#: src/mainwindow.c:740
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/邮件(_M)/标记(_M)/全部标记为已读(_R)"
 
-#: src/mainwindow.c:731
+#: src/mainwindow.c:742
 msgid "/_Message/_Delete"
 msgstr "/邮件(_M)/删除(_D)"
 
-#: src/mainwindow.c:733
+#: src/mainwindow.c:744
 #, fuzzy
 msgid "/_Message/Set as _junk mail"
 msgstr "/邮件(_M)/接收新邮件(_i)"
 
-#: src/mainwindow.c:734
+#: src/mainwindow.c:745
 #, fuzzy
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/邮件(_M)/接收新邮件(_i)"
 
-#: src/mainwindow.c:736 src/messageview.c:257
+#: src/mainwindow.c:747 src/messageview.c:262
 msgid "/_Message/Re-_edit"
 msgstr "/邮件(_M)/重新编辑(_E)"
 
-#: src/mainwindow.c:740
+#: src/mainwindow.c:751
 #, fuzzy
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/工具(_T)/将发件人添加到地址簿中(_K)"
 
-#: src/mainwindow.c:743
+#: src/mainwindow.c:754
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/工具(_T)/过滤文件夹中所有的邮件(_F)"
 
-#: src/mainwindow.c:745
+#: src/mainwindow.c:756
 msgid "/_Tools/Filter _selected messages"
 msgstr "/工具(_T)/过滤选中的邮件(_S)"
 
-#: src/mainwindow.c:747 src/messageview.c:264
+#: src/mainwindow.c:758 src/messageview.c:269
 msgid "/_Tools/_Create filter rule"
 msgstr "/工具(_T)/创建过滤规则(_C)"
 
-#: src/mainwindow.c:748 src/messageview.c:266
+#: src/mainwindow.c:759 src/messageview.c:271
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/工具(_T)/创建过滤规则(_C)/自动(_A)"
 
-#: src/mainwindow.c:750 src/messageview.c:268
+#: src/mainwindow.c:761 src/messageview.c:273
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/工具(_T)/创建过滤规则(_C)/按发件人(_F)"
 
-#: src/mainwindow.c:752 src/messageview.c:270
+#: src/mainwindow.c:763 src/messageview.c:275
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/工具(_T)/创建过滤规则(_C)/按收件人(_T)"
 
-#: src/mainwindow.c:754 src/messageview.c:272
+#: src/mainwindow.c:765 src/messageview.c:277
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/工具(_T)/创建过滤规则(_C)/按主题(_S)"
 
-#: src/mainwindow.c:757
+#: src/mainwindow.c:768
 #, fuzzy
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/工具(_T)/过滤文件夹中所有的邮件(_F)"
 
-#: src/mainwindow.c:759
+#: src/mainwindow.c:770
 #, fuzzy
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/工具(_T)/过滤选中的邮件(_S)"
 
-#: src/mainwindow.c:764
+#: src/mainwindow.c:775
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/工具(_T)/删除重复的邮件(_P)"
 
-#: src/mainwindow.c:767
+#: src/mainwindow.c:778
 msgid "/_Tools/E_xecute"
 msgstr "/工具(_T)/执行(_X)"
 
-#: src/mainwindow.c:769
+#: src/mainwindow.c:780
 msgid "/_Tools/_Log window"
 msgstr "/工具(_T)/记录窗口(_L)"
 
-#: src/mainwindow.c:771
+#: src/mainwindow.c:782
 msgid "/_Configuration"
 msgstr "/配置(_C)"
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:783
 msgid "/_Configuration/_Common preferences..."
 msgstr "/配置(_C)/通用首选项(_C)..."
 
-#: src/mainwindow.c:774
+#: src/mainwindow.c:785
 msgid "/_Configuration/_Filter setting..."
 msgstr "/配置(_C)/过滤设置(_F)..."
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:787
 msgid "/_Configuration/_Template..."
 msgstr "/配置(_C)/模板(_T)..."
 
-#: src/mainwindow.c:777
+#: src/mainwindow.c:788
 msgid "/_Configuration/_Actions..."
 msgstr "/配置(_C)/动作(_A)..."
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:789
 msgid "/_Configuration/---"
 msgstr "/配置(_C)/---"
 
-#: src/mainwindow.c:779
+#: src/mainwindow.c:790
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/配置(_C)/当前帐号首选项(_P)..."
 
-#: src/mainwindow.c:781
+#: src/mainwindow.c:792
 msgid "/_Configuration/Create _new account..."
 msgstr "/配置(_C)/创建新帐号(_N)..."
 
-#: src/mainwindow.c:783
+#: src/mainwindow.c:794
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/配置(_C)/编辑帐号(_E)..."
 
-#: src/mainwindow.c:785
+#: src/mainwindow.c:796
 msgid "/_Configuration/C_hange current account"
 msgstr "/配置(_C)/改变当前帐号(_H)"
 
-#: src/mainwindow.c:789
+#: src/mainwindow.c:800
 msgid "/_Help/_Manual"
 msgstr "/帮助(_H)/手册(_M)"
 
-#: src/mainwindow.c:790
+#: src/mainwindow.c:801
 msgid "/_Help/_Manual/_English"
 msgstr "/帮助(_H)/手册(_M)/英语(_E)"
 
-#: src/mainwindow.c:791
+#: src/mainwindow.c:802
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/帮助(_H)/手册(_M)/日语(_J)"
 
-#: src/mainwindow.c:792
+#: src/mainwindow.c:803
 msgid "/_Help/_FAQ"
 msgstr "/帮助(_H)/常见问题(_F)"
 
-#: src/mainwindow.c:793
+#: src/mainwindow.c:804
 msgid "/_Help/_FAQ/_English"
 msgstr "/帮助(_H)/常见问题(_F)/英语(_E)"
 
-#: src/mainwindow.c:794
+#: src/mainwindow.c:805
 msgid "/_Help/_FAQ/_German"
 msgstr "/帮助(_H)/常见问题(_F)/德语(_G)"
 
-#: src/mainwindow.c:795
+#: src/mainwindow.c:806
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/帮助(_H)/常见问题(_F)/西班牙语(_S)"
 
-#: src/mainwindow.c:796
+#: src/mainwindow.c:807
 msgid "/_Help/_FAQ/_French"
 msgstr "/帮助(_H)/常见问题(_F)/法语(_F)"
 
-#: src/mainwindow.c:797
+#: src/mainwindow.c:808
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/帮助(_H)/常见问题(_F)/意大利语(_I)"
 
-#: src/mainwindow.c:798
+#: src/mainwindow.c:809
 msgid "/_Help/---"
 msgstr "/帮助(_H)/---"
 
-#: src/mainwindow.c:841
+#: src/mainwindow.c:852
 msgid "Creating main window...\n"
 msgstr "正在创建主窗口...\n"
 
-#: src/mainwindow.c:1011
+#: src/mainwindow.c:1022
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "主窗口：分配颜色 %d 失败\n"
 
-#: src/mainwindow.c:1108 src/summaryview.c:2258 src/summaryview.c:2343
-#: src/summaryview.c:3739 src/summaryview.c:3868 src/summaryview.c:4226
+#: src/mainwindow.c:1119 src/summaryview.c:2275 src/summaryview.c:2360
+#: src/summaryview.c:3896 src/summaryview.c:4025 src/summaryview.c:4383
 msgid "done.\n"
 msgstr "完成。\n"
 
-#: src/mainwindow.c:1235 src/mainwindow.c:1276 src/mainwindow.c:1301
+#: src/mainwindow.c:1246 src/mainwindow.c:1287 src/mainwindow.c:1312
 msgid "Untitled"
 msgstr "无标题"
 
-#: src/mainwindow.c:1302
+#: src/mainwindow.c:1313
 msgid "none"
 msgstr "无"
 
-#: src/mainwindow.c:1355
+#: src/mainwindow.c:1366
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "正在把窗口分隔方式从 %d 改到 %d\n"
 
-#: src/mainwindow.c:1605
+#: src/mainwindow.c:1616
 msgid "Offline"
 msgstr "离线"
 
-#: src/mainwindow.c:1606
+#: src/mainwindow.c:1617
 msgid "You are offline. Go online?"
 msgstr "您处于离线状态。切换到在线状态吗？"
 
-#: src/mainwindow.c:1623
+#: src/mainwindow.c:1634
 msgid "Empty all trash"
 msgstr "清空所有废件箱"
 
-#: src/mainwindow.c:1624
+#: src/mainwindow.c:1635
 #, fuzzy
 msgid "Delete all messages in trash folders?"
 msgstr "清空废件箱里的所有信件？"
 
-#: src/mainwindow.c:1652
+#: src/mainwindow.c:1663
 msgid "Add mailbox"
 msgstr "添加邮箱"
 
-#: src/mainwindow.c:1653
+#: src/mainwindow.c:1664
 #, fuzzy
 msgid ""
 "Specify the location of mailbox.\n"
@@ -3575,16 +3591,16 @@ msgstr ""
 "输入邮箱位置。\n"
 "如果指定了已存在的邮箱，它将被自动扫描。"
 
-#: src/mainwindow.c:1659 src/setup.c:49
+#: src/mainwindow.c:1670 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "邮箱“%s”已经存在。"
 
-#: src/mainwindow.c:1664 src/setup.c:56
+#: src/mainwindow.c:1675 src/setup.c:56
 msgid "Mailbox"
 msgstr "邮箱"
 
-#: src/mainwindow.c:1670 src/setup.c:62
+#: src/mainwindow.c:1681 src/setup.c:62
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3593,146 +3609,146 @@ msgstr ""
 "创建邮件箱失败。\n"
 "也许某些文件已经存在，或者您没有写权限。"
 
-#: src/mainwindow.c:2088
+#: src/mainwindow.c:2099
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed－文件夹视图"
 
-#: src/mainwindow.c:2107
+#: src/mainwindow.c:2118
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed－邮件视图"
 
-#: src/mainwindow.c:2259 src/summaryview.c:408
+#: src/mainwindow.c:2270 src/summaryview.c:408
 msgid "/_Reply"
 msgstr "/回复(_R)"
 
-#: src/mainwindow.c:2260
+#: src/mainwindow.c:2271
 msgid "/Reply to _all"
 msgstr "/回复到所有人(_A)"
 
-#: src/mainwindow.c:2261
+#: src/mainwindow.c:2272
 msgid "/Reply to _sender"
 msgstr "/回复到发件人(_S)"
 
-#: src/mainwindow.c:2262
+#: src/mainwindow.c:2273
 msgid "/Reply to mailing _list"
 msgstr "/回复到邮件列表(_L)"
 
-#: src/mainwindow.c:2267 src/summaryview.c:415
+#: src/mainwindow.c:2278 src/summaryview.c:415
 msgid "/_Forward"
 msgstr "/转发(_F)"
 
-#: src/mainwindow.c:2268 src/summaryview.c:416
+#: src/mainwindow.c:2279 src/summaryview.c:416
 msgid "/For_ward as attachment"
 msgstr "/作为附件转发(_W)"
 
-#: src/mainwindow.c:2269 src/summaryview.c:417
+#: src/mainwindow.c:2280 src/summaryview.c:417
 msgid "/Redirec_t"
 msgstr "/重定向(_T)"
 
-#: src/mainwindow.c:2305
+#: src/mainwindow.c:2316
 msgid "Get"
 msgstr "接收"
 
-#: src/mainwindow.c:2306
+#: src/mainwindow.c:2317
 msgid "Incorporate new mail"
 msgstr "合并新邮件"
 
-#: src/mainwindow.c:2313
+#: src/mainwindow.c:2324
 msgid "Get all"
 msgstr "全部接收"
 
-#: src/mainwindow.c:2314
+#: src/mainwindow.c:2325
 msgid "Incorporate new mail of all accounts"
 msgstr "合并所有帐号的新邮件"
 
-#: src/mainwindow.c:2325
+#: src/mainwindow.c:2336
 msgid "Send queued message(s)"
 msgstr "发送队列中的邮件"
 
-#: src/mainwindow.c:2335 src/prefs_account_dialog.c:530
+#: src/mainwindow.c:2346 src/prefs_account_dialog.c:530
 #: src/prefs_common_dialog.c:663 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "撰写"
 
-#: src/mainwindow.c:2336
+#: src/mainwindow.c:2347
 msgid "Compose new message"
 msgstr "撰写新邮件"
 
-#: src/mainwindow.c:2344 src/prefs_common_dialog.c:975
+#: src/mainwindow.c:2355 src/prefs_common_dialog.c:975
 msgid "Reply"
 msgstr "回复"
 
-#: src/mainwindow.c:2345 src/mainwindow.c:2358
+#: src/mainwindow.c:2356 src/mainwindow.c:2369
 msgid "Reply to the message"
 msgstr "回复该邮件"
 
-#: src/mainwindow.c:2362
+#: src/mainwindow.c:2373
 msgid "Reply all"
 msgstr "全部回复"
 
-#: src/mainwindow.c:2363
+#: src/mainwindow.c:2374
 msgid "Reply to all"
 msgstr "回复给所有人"
 
-#: src/mainwindow.c:2371 src/prefs_filter_edit.c:672
+#: src/mainwindow.c:2382 src/prefs_filter_edit.c:672
 msgid "Forward"
 msgstr "转发"
 
-#: src/mainwindow.c:2372 src/mainwindow.c:2385
+#: src/mainwindow.c:2383 src/mainwindow.c:2396
 msgid "Forward the message"
 msgstr "转发该邮件"
 
-#: src/mainwindow.c:2392
+#: src/mainwindow.c:2403
 msgid "Delete the message"
 msgstr "删除该邮件"
 
-#: src/mainwindow.c:2401
+#: src/mainwindow.c:2412
 #, fuzzy
 msgid "Set as junk mail"
 msgstr "设置为默认帐号"
 
-#: src/mainwindow.c:2410
+#: src/mainwindow.c:2421
 msgid "Execute"
 msgstr "执行"
 
-#: src/mainwindow.c:2411
+#: src/mainwindow.c:2422
 msgid "Execute marked process"
 msgstr "执行标记的处理"
 
-#: src/mainwindow.c:2421
+#: src/mainwindow.c:2432
 msgid "Next unread message"
 msgstr "下一个未读的邮件"
 
-#: src/mainwindow.c:2433
+#: src/mainwindow.c:2444
 msgid "Prefs"
 msgstr "首选项"
 
-#: src/mainwindow.c:2434
+#: src/mainwindow.c:2445
 msgid "Common preferences"
 msgstr "通用首选项"
 
-#: src/mainwindow.c:2442 src/prefs_folder_item.c:289
+#: src/mainwindow.c:2453 src/prefs_folder_item.c:289
 #: src/prefs_folder_item.c:300 src/progressdialog.c:128
 msgid "Account"
 msgstr "帐号"
 
-#: src/mainwindow.c:2443
+#: src/mainwindow.c:2454
 msgid "Account setting"
 msgstr "帐号设置"
 
-#: src/mainwindow.c:2615
+#: src/mainwindow.c:2626
 msgid "You are offline. Click the icon to go online."
 msgstr "您处于离线状态。单击图标切换到在线状态。"
 
-#: src/mainwindow.c:2626
+#: src/mainwindow.c:2637
 msgid "You are online. Click the icon to go offline."
 msgstr "您处于在线状态。单击图标切换到离线状态。"
 
-#: src/mainwindow.c:2892
+#: src/mainwindow.c:2903
 msgid "Exit"
 msgstr "退出"
 
-#: src/mainwindow.c:2892
+#: src/mainwindow.c:2903
 msgid "Exit this program?"
 msgstr "要退出本程序吗？"
 
@@ -3769,45 +3785,45 @@ msgstr "已查找到邮件结尾；从开头继续？"
 msgid "Search finished"
 msgstr "搜索结束"
 
-#: src/messageview.c:261
+#: src/messageview.c:266
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/工具(_T)/将发件人添加到地址簿中(_K)"
 
-#: src/messageview.c:291
+#: src/messageview.c:296
 msgid "Creating message view...\n"
 msgstr "正在创建邮件视图...\n"
 
-#: src/messageview.c:316
+#: src/messageview.c:321
 msgid "Text"
 msgstr "文本"
 
-#: src/messageview.c:321
+#: src/messageview.c:326
 msgid "Attachments"
 msgstr "附件"
 
-#: src/messageview.c:371
+#: src/messageview.c:376
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:669 src/summaryview.c:3268
+#: src/messageview.c:674 src/summaryview.c:3425
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "无法保存文件“%s”'。"
 
-#: src/messageview.c:728 src/summaryview.c:3291
+#: src/messageview.c:733 src/summaryview.c:3448
 msgid "The message will be printed with the following command:"
 msgstr ""
 
-#: src/messageview.c:729 src/summaryview.c:3292
+#: src/messageview.c:734 src/summaryview.c:3449
 #, fuzzy
 msgid "(Default print command)"
 msgstr "执行命令"
 
-#: src/messageview.c:731 src/prefs_common_dialog.c:2304 src/summaryview.c:3294
+#: src/messageview.c:736 src/prefs_common_dialog.c:2304 src/summaryview.c:3451
 msgid "Print"
 msgstr "打印"
 
-#: src/messageview.c:740 src/summaryview.c:3303
+#: src/messageview.c:745 src/summaryview.c:3460
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -4706,8 +4722,8 @@ msgstr "如果发件人是您自己，“发件人”栏中显示的是收件人
 msgid "Expand threads"
 msgstr "展开线索"
 
-#: src/prefs_common_dialog.c:1413 src/prefs_common_dialog.c:2713
-#: src/prefs_common_dialog.c:2751
+#: src/prefs_common_dialog.c:1413 src/prefs_common_dialog.c:2716
+#: src/prefs_common_dialog.c:2754
 msgid "Date format"
 msgstr "日期格式"
 
@@ -4997,8 +5013,8 @@ msgstr "外部命令 (%s 将被替换为文件名或URI)"
 msgid "Web browser"
 msgstr "网页浏览器"
 
-#: src/prefs_common_dialog.c:2288 src/prefs_common_dialog.c:3775
-#: src/prefs_common_dialog.c:3796
+#: src/prefs_common_dialog.c:2288 src/prefs_common_dialog.c:3778
+#: src/prefs_common_dialog.c:3799
 #, fuzzy
 msgid "(Default browser)"
 msgstr "默认收件箱"
@@ -5074,216 +5090,226 @@ msgstr "希腊语 (ISO-8859-7)"
 
 #: src/prefs_common_dialog.c:2495
 #, fuzzy
+msgid "Arabic (ISO-8859-6)"
+msgstr "波罗的语 (ISO-8859-4)"
+
+#: src/prefs_common_dialog.c:2496
+#, fuzzy
+msgid "Arabic (Windows-1256)"
+msgstr "斯拉夫语 (Windows-1251)"
+
+#: src/prefs_common_dialog.c:2498
+#, fuzzy
 msgid "Hebrew (ISO-8859-8)"
 msgstr "希腊语 (ISO-8859-7)"
 
-#: src/prefs_common_dialog.c:2496
+#: src/prefs_common_dialog.c:2499
 #, fuzzy
 msgid "Hebrew (Windows-1255)"
 msgstr "斯拉夫语 (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2498
+#: src/prefs_common_dialog.c:2501
 msgid "Turkish (ISO-8859-9)"
 msgstr "土耳其语 (ISO-8859-9)"
 
-#: src/prefs_common_dialog.c:2500
+#: src/prefs_common_dialog.c:2503
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "斯拉夫语 (ISO-8859-5)"
 
-#: src/prefs_common_dialog.c:2501
+#: src/prefs_common_dialog.c:2504
 msgid "Cyrillic (KOI8-R)"
 msgstr "斯拉夫语 (KOI8-R)"
 
-#: src/prefs_common_dialog.c:2502
+#: src/prefs_common_dialog.c:2505
 msgid "Cyrillic (KOI8-U)"
 msgstr "斯拉夫语 (KOI8-U)"
 
-#: src/prefs_common_dialog.c:2503
+#: src/prefs_common_dialog.c:2506
 msgid "Cyrillic (Windows-1251)"
 msgstr "斯拉夫语 (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2505
+#: src/prefs_common_dialog.c:2508
 msgid "Japanese (ISO-2022-JP)"
 msgstr "日语 (ISO-2022-JP)"
 
-#: src/prefs_common_dialog.c:2507
+#: src/prefs_common_dialog.c:2510
 msgid "Japanese (EUC-JP)"
 msgstr "日语 (EUC-JP)"
 
-#: src/prefs_common_dialog.c:2508
+#: src/prefs_common_dialog.c:2511
 msgid "Japanese (Shift_JIS)"
 msgstr "日语 (Shift_JIS)"
 
-#: src/prefs_common_dialog.c:2511
+#: src/prefs_common_dialog.c:2514
 msgid "Simplified Chinese (GB2312)"
 msgstr "简体中文 (GB2312)"
 
-#: src/prefs_common_dialog.c:2512
+#: src/prefs_common_dialog.c:2515
 #, fuzzy
 msgid "Simplified Chinese (GBK)"
 msgstr "简体中文 (GB2312)"
 
-#: src/prefs_common_dialog.c:2513
+#: src/prefs_common_dialog.c:2516
 msgid "Traditional Chinese (Big5)"
 msgstr "繁体中文 (Big5)"
 
-#: src/prefs_common_dialog.c:2515
+#: src/prefs_common_dialog.c:2518
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "繁体中文 (EUC-TW)"
 
-#: src/prefs_common_dialog.c:2516
+#: src/prefs_common_dialog.c:2519
 msgid "Chinese (ISO-2022-CN)"
 msgstr "中文 (ISO-2022-CN)"
 
-#: src/prefs_common_dialog.c:2519
+#: src/prefs_common_dialog.c:2522
 msgid "Korean (EUC-KR)"
 msgstr "朝鲜文 (EUC-KR)"
 
-#: src/prefs_common_dialog.c:2521
+#: src/prefs_common_dialog.c:2524
 msgid "Thai (TIS-620)"
 msgstr "泰文 (TIS-620)"
 
-#: src/prefs_common_dialog.c:2522
+#: src/prefs_common_dialog.c:2525
 msgid "Thai (Windows-874)"
 msgstr "泰文 (Windows-874)"
 
-#: src/prefs_common_dialog.c:2689
+#: src/prefs_common_dialog.c:2692
 msgid "the full abbreviated weekday name"
 msgstr "缩写的星期名"
 
-#: src/prefs_common_dialog.c:2690
+#: src/prefs_common_dialog.c:2693
 msgid "the full weekday name"
 msgstr "完整的星期名"
 
-#: src/prefs_common_dialog.c:2691
+#: src/prefs_common_dialog.c:2694
 msgid "the abbreviated month name"
 msgstr "缩写的月份名"
 
-#: src/prefs_common_dialog.c:2692
+#: src/prefs_common_dialog.c:2695
 msgid "the full month name"
 msgstr "完整的月份名"
 
-#: src/prefs_common_dialog.c:2693
+#: src/prefs_common_dialog.c:2696
 msgid "the preferred date and time for the current locale"
 msgstr "当前区域设置首选的日期和时间格式"
 
-#: src/prefs_common_dialog.c:2694
+#: src/prefs_common_dialog.c:2697
 msgid "the century number (year/100)"
 msgstr "世纪(年份/100)"
 
-#: src/prefs_common_dialog.c:2695
+#: src/prefs_common_dialog.c:2698
 msgid "the day of the month as a decimal number"
 msgstr "十进制表示的月中的天数"
 
-#: src/prefs_common_dialog.c:2696
+#: src/prefs_common_dialog.c:2699
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "24小时时钟的十进制小时"
 
-#: src/prefs_common_dialog.c:2697
+#: src/prefs_common_dialog.c:2700
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "12小时时钟的十进制小时"
 
-#: src/prefs_common_dialog.c:2698
+#: src/prefs_common_dialog.c:2701
 msgid "the day of the year as a decimal number"
 msgstr "十进制表示的一年中的天数"
 
-#: src/prefs_common_dialog.c:2699
+#: src/prefs_common_dialog.c:2702
 msgid "the month as a decimal number"
 msgstr "十进制表示的月份"
 
-#: src/prefs_common_dialog.c:2700
+#: src/prefs_common_dialog.c:2703
 msgid "the minute as a decimal number"
 msgstr "十进制表示的天数"
 
-#: src/prefs_common_dialog.c:2701
+#: src/prefs_common_dialog.c:2704
 msgid "either AM or PM"
 msgstr "AM或PM"
 
-#: src/prefs_common_dialog.c:2702
+#: src/prefs_common_dialog.c:2705
 msgid "the second as a decimal number"
 msgstr "十进制表示的秒"
 
-#: src/prefs_common_dialog.c:2703
+#: src/prefs_common_dialog.c:2706
 msgid "the day of the week as a decimal number"
 msgstr "十进制表示的星期中的天数"
 
-#: src/prefs_common_dialog.c:2704
+#: src/prefs_common_dialog.c:2707
 msgid "the preferred date for the current locale"
 msgstr "当前区域设置的首选日期格式"
 
-#: src/prefs_common_dialog.c:2705
+#: src/prefs_common_dialog.c:2708
 msgid "the last two digits of a year"
 msgstr "年份的最后两个数字"
 
-#: src/prefs_common_dialog.c:2706
+#: src/prefs_common_dialog.c:2709
 msgid "the year as a decimal number"
 msgstr "十进制的年份"
 
-#: src/prefs_common_dialog.c:2707
+#: src/prefs_common_dialog.c:2710
 msgid "the time zone or name or abbreviation"
 msgstr "时区、名字或缩写"
 
-#: src/prefs_common_dialog.c:2728
+#: src/prefs_common_dialog.c:2731
 msgid "Specifier"
 msgstr "说明符"
 
-#: src/prefs_common_dialog.c:2729
+#: src/prefs_common_dialog.c:2732
 msgid "Description"
 msgstr "描述"
 
-#: src/prefs_common_dialog.c:2769
+#: src/prefs_common_dialog.c:2772
 msgid "Example"
 msgstr "示例"
 
-#: src/prefs_common_dialog.c:2850
+#: src/prefs_common_dialog.c:2853
 msgid "Set message colors"
 msgstr "设置邮件颜色"
 
-#: src/prefs_common_dialog.c:2858
+#: src/prefs_common_dialog.c:2861
 msgid "Colors"
 msgstr "颜色"
 
-#: src/prefs_common_dialog.c:2892
+#: src/prefs_common_dialog.c:2895
 msgid "Quoted Text - First Level"
 msgstr "引文－第一级"
 
-#: src/prefs_common_dialog.c:2898
+#: src/prefs_common_dialog.c:2901
 msgid "Quoted Text - Second Level"
 msgstr "引文－第二级"
 
-#: src/prefs_common_dialog.c:2904
+#: src/prefs_common_dialog.c:2907
 msgid "Quoted Text - Third Level"
 msgstr "引文－第三级"
 
-#: src/prefs_common_dialog.c:2910
+#: src/prefs_common_dialog.c:2913
 msgid "URI link"
 msgstr "URI 链接"
 
-#: src/prefs_common_dialog.c:2917
+#: src/prefs_common_dialog.c:2920
 msgid "Recycle quote colors"
 msgstr "循环使用引文颜色"
 
-#: src/prefs_common_dialog.c:2984
+#: src/prefs_common_dialog.c:2987
 msgid "Pick color for quotation level 1"
 msgstr "选择引文级别 1 的颜色"
 
-#: src/prefs_common_dialog.c:2987
+#: src/prefs_common_dialog.c:2990
 msgid "Pick color for quotation level 2"
 msgstr "选择引文级别 2 的颜色"
 
-#: src/prefs_common_dialog.c:2990
+#: src/prefs_common_dialog.c:2993
 msgid "Pick color for quotation level 3"
 msgstr "选择引文级别 3 的颜色"
 
-#: src/prefs_common_dialog.c:2993
+#: src/prefs_common_dialog.c:2996
 msgid "Pick color for URI"
 msgstr "选择URI的颜色"
 
-#: src/prefs_common_dialog.c:3133
+#: src/prefs_common_dialog.c:3136
 msgid "Description of symbols"
 msgstr "符号的描述"
 
-#: src/prefs_common_dialog.c:3189
+#: src/prefs_common_dialog.c:3192
 msgid ""
 "Date\n"
 "From\n"
@@ -5307,11 +5333,11 @@ msgstr ""
 "新闻组\n"
 "邮件标识号"
 
-#: src/prefs_common_dialog.c:3202
+#: src/prefs_common_dialog.c:3205
 msgid "If x is set, displays expr"
 msgstr "如果 x 设置了值则显示 expr"
 
-#: src/prefs_common_dialog.c:3206
+#: src/prefs_common_dialog.c:3209
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -5325,7 +5351,7 @@ msgstr ""
 "没有签名的引文内容\n"
 "%"
 
-#: src/prefs_common_dialog.c:3214
+#: src/prefs_common_dialog.c:3217
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -5337,20 +5363,20 @@ msgstr ""
 "左括号\n"
 "右括号"
 
-#: src/prefs_common_dialog.c:3260
+#: src/prefs_common_dialog.c:3263
 msgid "Key bindings"
 msgstr "键盘关联"
 
-#: src/prefs_common_dialog.c:3273
+#: src/prefs_common_dialog.c:3276
 #, fuzzy
 msgid "Select the preset of key bindings."
 msgstr " 设置键盘关联... "
 
-#: src/prefs_common_dialog.c:3283 src/prefs_common_dialog.c:3607
+#: src/prefs_common_dialog.c:3286 src/prefs_common_dialog.c:3610
 msgid "Default"
 msgstr "默认"
 
-#: src/prefs_common_dialog.c:3286 src/prefs_common_dialog.c:3616
+#: src/prefs_common_dialog.c:3289 src/prefs_common_dialog.c:3619
 msgid "Old Sylpheed"
 msgstr "旧式的Sylpheed"
 
@@ -5471,7 +5497,7 @@ msgstr "命令结果"
 msgid "Age"
 msgstr "邮件时间"
 
-#: src/prefs_filter_edit.c:501 src/summaryview.c:510
+#: src/prefs_filter_edit.c:501 src/summaryview.c:512
 #, fuzzy
 msgid "Marked"
 msgstr "标记"
@@ -5703,17 +5729,17 @@ msgid "Attachment"
 msgstr "附件"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73 src/query_search.c:371 src/summaryview.c:4733
+#: src/prefs_summary_column.c:73 src/query_search.c:371 src/summaryview.c:4890
 msgid "Subject"
 msgstr "主题"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/query_search.c:372 src/summaryview.c:4736
+#: src/prefs_summary_column.c:74 src/query_search.c:372 src/summaryview.c:4893
 msgid "From"
 msgstr "发件人"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/query_search.c:373 src/summaryview.c:4738
+#: src/prefs_summary_column.c:75 src/query_search.c:373 src/summaryview.c:4895
 msgid "Date"
 msgstr "日期"
 
@@ -5815,7 +5841,7 @@ msgstr "查找邮件"
 msgid "_Save as search folder"
 msgstr "保存到草稿文件夹"
 
-#: src/query_search.c:512 src/subscribedialog.c:523 src/summaryview.c:840
+#: src/query_search.c:512 src/subscribedialog.c:523 src/summaryview.c:842
 msgid "Done."
 msgstr "完成。"
 
@@ -5829,7 +5855,7 @@ msgstr "正在扫描文件夹 %s ..."
 msgid "Searching %s (%d / %d)..."
 msgstr "正在过滤..."
 
-#: src/query_search.c:645 src/summaryview.c:2048
+#: src/query_search.c:645 src/summaryview.c:2051
 msgid "(No Date)"
 msgstr "(没有日期)"
 
@@ -6202,303 +6228,308 @@ msgid "/_Mark/Mark as rea_d"
 msgstr "/标记(_M)/标记为已读(_D)"
 
 #: src/summaryview.c:429
+#, fuzzy
+msgid "/_Mark/Mark _thread as read"
+msgstr "/标记(_M)/标记为已读(_D)"
+
+#: src/summaryview.c:431
 msgid "/_Mark/Mark all _read"
 msgstr "/标记(_M)/全部标记为已读(_R)"
 
-#: src/summaryview.c:430
+#: src/summaryview.c:432
 msgid "/Color la_bel"
 msgstr "/颜色标签(_B)"
 
-#: src/summaryview.c:434
+#: src/summaryview.c:436
 msgid "/Re-_edit"
 msgstr "/重新编辑(_E)"
 
-#: src/summaryview.c:436
+#: src/summaryview.c:438
 #, fuzzy
 msgid "/Add sender to address boo_k..."
 msgstr "/添加发件人到地址簿(_K)"
 
-#: src/summaryview.c:438
+#: src/summaryview.c:440
 msgid "/Create f_ilter rule"
 msgstr "/创建过滤规则(_i)"
 
-#: src/summaryview.c:439
+#: src/summaryview.c:441
 msgid "/Create f_ilter rule/_Automatically"
 msgstr "/创建过滤规则(_i)/自动(_A)"
 
-#: src/summaryview.c:441
+#: src/summaryview.c:443
 msgid "/Create f_ilter rule/by _From"
 msgstr "/创建过滤规则(_i)/按发件人(_F)"
 
-#: src/summaryview.c:443
+#: src/summaryview.c:445
 msgid "/Create f_ilter rule/by _To"
 msgstr "/创建过滤规则(_i)/按收件人(_T)"
 
-#: src/summaryview.c:445
+#: src/summaryview.c:447
 msgid "/Create f_ilter rule/by _Subject"
 msgstr "/创建过滤规则(_i)/按主题(_S)"
 
-#: src/summaryview.c:451
+#: src/summaryview.c:453
 msgid "/_View/_Source"
 msgstr "/查看(_V)/原文(_S)"
 
-#: src/summaryview.c:452
+#: src/summaryview.c:454
 msgid "/_View/All _header"
 msgstr "/查看(_V)/所有标题(_H)"
 
-#: src/summaryview.c:454
+#: src/summaryview.c:456
 msgid "/_Print..."
 msgstr "/打印(_P)..."
 
-#: src/summaryview.c:486
+#: src/summaryview.c:488
 msgid "Creating summary view...\n"
 msgstr "正在创建摘要视图...\n"
 
-#: src/summaryview.c:508
+#: src/summaryview.c:510
 msgid "All"
 msgstr ""
 
-#: src/summaryview.c:511
+#: src/summaryview.c:513
 #, fuzzy
 msgid "Have color label"
 msgstr "/颜色标签(_B)"
 
-#: src/summaryview.c:512
+#: src/summaryview.c:514
 #, fuzzy
 msgid "Have attachment"
 msgstr "附件"
 
-#: src/summaryview.c:521
+#: src/summaryview.c:523
 #, fuzzy
 msgid "Search:"
 msgstr "搜索"
 
-#: src/summaryview.c:535
+#: src/summaryview.c:537
 msgid "Search for Subject or From"
 msgstr ""
 
-#: src/summaryview.c:702
+#: src/summaryview.c:704
 msgid "Process mark"
 msgstr "处理标志"
 
-#: src/summaryview.c:703
+#: src/summaryview.c:705
 msgid "Some marks are left. Process it?"
 msgstr "有一些剩余标记。处理吗？"
 
-#: src/summaryview.c:749
+#: src/summaryview.c:751
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "正在扫描文件夹 (%s)..."
 
-#: src/summaryview.c:1292
+#: src/summaryview.c:1295
 #, fuzzy
 msgid "_Search again"
 msgstr "再次查找"
 
-#: src/summaryview.c:1313 src/summaryview.c:1322
+#: src/summaryview.c:1316 src/summaryview.c:1325
 msgid "No more unread messages"
 msgstr "没有未读邮件"
 
-#: src/summaryview.c:1314
+#: src/summaryview.c:1317
 msgid "No unread message found. Search from the end?"
 msgstr "没发现未读邮件。从后面开始查找？"
 
-#: src/summaryview.c:1316
+#: src/summaryview.c:1319
 msgid "No unread messages."
 msgstr "没有未读邮件"
 
-#: src/summaryview.c:1323
+#: src/summaryview.c:1326
 msgid "No unread message found. Go to next folder?"
 msgstr "没发现未读邮件。到下一个文件夹？"
 
-#: src/summaryview.c:1331 src/summaryview.c:1340
+#: src/summaryview.c:1334 src/summaryview.c:1343
 msgid "No more new messages"
 msgstr "没有新邮件"
 
-#: src/summaryview.c:1332
+#: src/summaryview.c:1335
 msgid "No new message found. Search from the end?"
 msgstr "没发现新邮件。从后面开始查找？"
 
-#: src/summaryview.c:1334
+#: src/summaryview.c:1337
 msgid "No new messages."
 msgstr "没有新邮件"
 
-#: src/summaryview.c:1341
+#: src/summaryview.c:1344
 msgid "No new message found. Go to next folder?"
 msgstr "没发现新邮件。到下一个文件夹？"
 
-#: src/summaryview.c:1349 src/summaryview.c:1358
+#: src/summaryview.c:1352 src/summaryview.c:1361
 msgid "No more marked messages"
 msgstr "没有标记过的邮件"
 
-#: src/summaryview.c:1350
+#: src/summaryview.c:1353
 msgid "No marked message found. Search from the end?"
 msgstr "没有标记过的邮件。从后面开始查找？"
 
-#: src/summaryview.c:1352 src/summaryview.c:1361
+#: src/summaryview.c:1355 src/summaryview.c:1364
 msgid "No marked messages."
 msgstr "没有标记过的邮件"
 
-#: src/summaryview.c:1359
+#: src/summaryview.c:1362
 msgid "No marked message found. Search from the beginning?"
 msgstr "没有标记过的邮件。从前面开始查找？"
 
-#: src/summaryview.c:1367 src/summaryview.c:1376
+#: src/summaryview.c:1370 src/summaryview.c:1379
 msgid "No more labeled messages"
 msgstr "没有找到用颜色标注过的邮件"
 
-#: src/summaryview.c:1368
+#: src/summaryview.c:1371
 msgid "No labeled message found. Search from the end?"
 msgstr "没有找到用颜色标注过的邮件。从后面开始查找？"
 
-#: src/summaryview.c:1370 src/summaryview.c:1379
+#: src/summaryview.c:1373 src/summaryview.c:1382
 msgid "No labeled messages."
 msgstr "没有用颜色标注的邮件。"
 
-#: src/summaryview.c:1377
+#: src/summaryview.c:1380
 msgid "No labeled message found. Search from the beginning?"
 msgstr "没有找到用颜色标注过的邮件。从前面开始查找？"
 
-#: src/summaryview.c:1693
+#: src/summaryview.c:1696
 msgid "Attracting messages by subject..."
 msgstr "正在按标题归类邮件..."
 
-#: src/summaryview.c:1887
+#: src/summaryview.c:1890
 #, c-format
 msgid "%d deleted"
 msgstr "删除了 %d 个邮件"
 
-#: src/summaryview.c:1891
+#: src/summaryview.c:1894
 #, c-format
 msgid "%s%d moved"
 msgstr "移动了 %s%d"
 
-#: src/summaryview.c:1892 src/summaryview.c:1897
+#: src/summaryview.c:1895 src/summaryview.c:1900
 msgid ", "
 msgstr "，"
 
-#: src/summaryview.c:1896
+#: src/summaryview.c:1899
 #, c-format
 msgid "%s%d copied"
 msgstr "复制了 %s%d"
 
-#: src/summaryview.c:1911
+#: src/summaryview.c:1914
 msgid " item(s) selected"
 msgstr " 项被选中"
 
-#: src/summaryview.c:1933
+#: src/summaryview.c:1936
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d 个新邮件，%d 个未读邮件，共 %d 个邮件(%s)"
 
-#: src/summaryview.c:1937
+#: src/summaryview.c:1940
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d 个新邮件邮件，%d 个未读邮件，共 %d 个邮件"
 
-#: src/summaryview.c:1971
+#: src/summaryview.c:1974
 msgid "Sorting summary..."
 msgstr "正在排序摘要..."
 
-#: src/summaryview.c:2194
+#: src/summaryview.c:2211
 msgid "\tSetting summary from message data..."
 msgstr "\t正在从邮件数据中设置摘要..."
 
-#: src/summaryview.c:2196
+#: src/summaryview.c:2213
 msgid "Setting summary from message data..."
 msgstr "正在从邮件数据中设置摘要..."
 
-#: src/summaryview.c:2302
+#: src/summaryview.c:2319
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "正在写摘要缓存(%s)..."
 
-#: src/summaryview.c:2643
+#: src/summaryview.c:2660
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "邮件 %d 被标记\n"
 
-#: src/summaryview.c:2701
+#: src/summaryview.c:2718
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "邮件 %d 被标记为已读\n"
 
-#: src/summaryview.c:2789
+#: src/summaryview.c:2908
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "邮件 %d 被标记为未读\n"
 
-#: src/summaryview.c:2850
+#: src/summaryview.c:2969
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "邮件 %s/%d 设置为要删除\n"
 
-#: src/summaryview.c:2878
+#: src/summaryview.c:2997
 msgid "Delete message(s)"
 msgstr "删除邮件"
 
-#: src/summaryview.c:2879
+#: src/summaryview.c:2998
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "您确实要删除废件箱中的邮件吗？"
 
-#: src/summaryview.c:2953
+#: src/summaryview.c:3072
 msgid "Deleting duplicated messages..."
 msgstr "正在删除重复邮件..."
 
-#: src/summaryview.c:2991
+#: src/summaryview.c:3110
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "邮件 %s/%d 被取消标记\n"
 
-#: src/summaryview.c:3049
+#: src/summaryview.c:3168
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "邮件 %d 被设置为移到 %s\n"
 
-#: src/summaryview.c:3066
+#: src/summaryview.c:3196
 msgid "Destination is same as current folder."
 msgstr "目标与当前文件夹相同。"
 
-#: src/summaryview.c:3122
+#: src/summaryview.c:3260
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "邮件 %d 被设置为复制到 %s\n"
 
-#: src/summaryview.c:3139
+#: src/summaryview.c:3288
 msgid "Destination for copy is same as current folder."
 msgstr "复制目标与当前文件夹相同。"
 
-#: src/summaryview.c:3338
+#: src/summaryview.c:3495
 msgid "Error occurred while processing messages."
 msgstr "处理邮件时发生错误。"
 
-#: src/summaryview.c:3646 src/summaryview.c:3647
+#: src/summaryview.c:3803 src/summaryview.c:3804
 msgid "Building threads..."
 msgstr "正在创建线索..."
 
-#: src/summaryview.c:3797 src/summaryview.c:3798
+#: src/summaryview.c:3954 src/summaryview.c:3955
 msgid "Unthreading..."
 msgstr "正在取消线索..."
 
-#: src/summaryview.c:4091 src/summaryview.c:4147
+#: src/summaryview.c:4248 src/summaryview.c:4304
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "正在过滤..."
 
-#: src/summaryview.c:4196
+#: src/summaryview.c:4353
 msgid "filtering..."
 msgstr "正在过滤..."
 
-#: src/summaryview.c:4197
+#: src/summaryview.c:4354
 msgid "Filtering..."
 msgstr "正在过滤..."
 
-#: src/summaryview.c:4233
+#: src/summaryview.c:4390
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "已经过滤 %d 个邮件。"
 
-#: src/summaryview.c:4742
+#: src/summaryview.c:4899
 msgid "No."
 msgstr "No."
 
@@ -6515,35 +6546,35 @@ msgstr "正在创建文本视图...\n"
 msgid "This message can't be displayed.\n"
 msgstr "无法显示该邮件。\n"
 
-#: src/textview.c:1929
+#: src/textview.c:1925
 msgid "Sa_ve this image as..."
 msgstr "图像另存为(_V)..."
 
-#: src/textview.c:1945 src/trayicon.c:109
+#: src/textview.c:1941 src/trayicon.c:109
 #, fuzzy
 msgid "Compose _new message"
 msgstr "撰写新邮件"
 
-#: src/textview.c:1947
+#: src/textview.c:1943
 #, fuzzy
 msgid "Add to address _book..."
 msgstr "/添加发件人到地址簿(_K)"
 
-#: src/textview.c:1949
+#: src/textview.c:1945
 #, fuzzy
 msgid "Copy this add_ress"
 msgstr "复制链接(_L)"
 
-#: src/textview.c:1952
+#: src/textview.c:1948
 #, fuzzy
 msgid "_Open with Web browser"
 msgstr "网页浏览器"
 
-#: src/textview.c:1954
+#: src/textview.c:1950
 msgid "Copy this _link"
 msgstr "复制链接(_L)"
 
-#: src/textview.c:2097
+#: src/textview.c:2093
 #, fuzzy, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6555,7 +6586,7 @@ msgstr ""
 "显示的 URL (%s) 不同。\n"
 "仍然要打开吗？"
 
-#: src/textview.c:2102
+#: src/textview.c:2098
 msgid "Fake URL warning"
 msgstr ""
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index e6825fdb..9ba4a6d4 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed 2.1.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-27 18:11+0900\n"
+"POT-Creation-Date: 2006-01-31 15:20+0900\n"
 "PO-Revision-Date: 2005-10-25 16:23+0800\n"
 "Last-Translator: Wei-Lun Chao <chaoweilun@pcmail.com.tw>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
@@ -507,7 +507,7 @@ msgstr "找到 %s\n"
 msgid "Configuration is saved.\n"
 msgstr "組態設定已儲存。\n"
 
-#: libsylph/prefs_common.c:489
+#: libsylph/prefs_common.c:491
 msgid "Junk mail filter"
 msgstr "垃圾郵件資料夾"
 
@@ -622,8 +622,8 @@ msgstr "%.2fMB"
 msgid "%.2fGB"
 msgstr "%.2fGB"
 
-#: libsylph/utils.c:2373 src/compose.c:2858 src/compose.c:3121
-#: src/compose.c:3184 src/compose.c:3304
+#: libsylph/utils.c:2373 src/compose.c:2867 src/compose.c:3130
+#: src/compose.c:3193 src/compose.c:3313
 msgid "can't change file mode\n"
 msgstr "無法改變檔案型態\n"
 
@@ -707,8 +707,8 @@ msgstr ""
 "檢查新郵件時將會依照下面的順序。您可以勾選 G 欄位中的方塊，\n"
 "來決定是否在「全部檢查」時要檢查該帳號的郵件。"
 
-#: src/account_dialog.c:366 src/addressadd.c:192 src/addressbook.c:491
-#: src/compose.c:4262 src/editaddress.c:200 src/editaddress.c:942
+#: src/account_dialog.c:366 src/addressadd.c:192 src/addressbook.c:493
+#: src/compose.c:4271 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:206 src/prefs_filter.c:259 src/prefs_folder_item.c:171
@@ -844,12 +844,12 @@ msgstr "使用者設定之命令參數"
 msgid "Add Address to Book"
 msgstr "將地址加入通訊錄"
 
-#: src/addressadd.c:202 src/compose.c:4762 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4771 src/editaddress.c:201
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "地址"
 
-#: src/addressadd.c:212 src/addressbook.c:493 src/editaddress.c:202
+#: src/addressadd.c:212 src/addressbook.c:495 src/editaddress.c:202
 #: src/editaddress.c:795 src/editaddress.c:860 src/editgroup.c:267
 msgid "Remarks"
 msgstr "備註"
@@ -858,183 +858,183 @@ msgstr "備註"
 msgid "Select Address Book Folder"
 msgstr "選擇通訊錄資料夾"
 
-#: src/addressbook.c:336 src/compose.c:515 src/mainwindow.c:477
+#: src/addressbook.c:338 src/compose.c:515 src/mainwindow.c:480
 #: src/messageview.c:138
 msgid "/_File"
 msgstr "/檔案(_F)"
 
-#: src/addressbook.c:337
+#: src/addressbook.c:339
 msgid "/_File/New _Book"
 msgstr "/檔案(_F)/新增通訊錄(_B)"
 
-#: src/addressbook.c:338
+#: src/addressbook.c:340
 msgid "/_File/New _vCard"
 msgstr "/檔案(_F)/新增vCard(_V)"
 
-#: src/addressbook.c:340
+#: src/addressbook.c:342
 msgid "/_File/New _JPilot"
 msgstr "/檔案(_F)/新增J-Pilot(_J)"
 
-#: src/addressbook.c:343
+#: src/addressbook.c:345
 msgid "/_File/New _Server"
 msgstr "/檔案(_F)/新增伺服器(_S)"
 
-#: src/addressbook.c:345 src/addressbook.c:348 src/compose.c:520
-#: src/compose.c:525 src/compose.c:528 src/compose.c:531 src/mainwindow.c:495
-#: src/mainwindow.c:498 src/mainwindow.c:500 src/mainwindow.c:503
-#: src/mainwindow.c:505 src/messageview.c:141
+#: src/addressbook.c:347 src/addressbook.c:350 src/compose.c:520
+#: src/compose.c:525 src/compose.c:528 src/compose.c:531 src/mainwindow.c:498
+#: src/mainwindow.c:501 src/mainwindow.c:503 src/mainwindow.c:506
+#: src/mainwindow.c:508 src/messageview.c:141
 msgid "/_File/---"
 msgstr "/檔案(_F)/---"
 
-#: src/addressbook.c:346
+#: src/addressbook.c:348
 msgid "/_File/_Edit"
 msgstr "/檔案(_F)/編輯(_E)"
 
-#: src/addressbook.c:347
+#: src/addressbook.c:349
 msgid "/_File/_Delete"
 msgstr "/檔案(_F)/刪除(_D)"
 
-#: src/addressbook.c:349
+#: src/addressbook.c:351
 msgid "/_File/_Save"
 msgstr "/檔案(_F)/儲存(_S)"
 
-#: src/addressbook.c:350 src/compose.c:532 src/messageview.c:142
+#: src/addressbook.c:352 src/compose.c:532 src/messageview.c:142
 msgid "/_File/_Close"
 msgstr "/檔案(_F)/關閉(_C)"
 
-#: src/addressbook.c:351
+#: src/addressbook.c:353
 msgid "/_Address"
 msgstr "/地址(_A)"
 
-#: src/addressbook.c:352
+#: src/addressbook.c:354
 msgid "/_Address/New _Address"
 msgstr "/地址(_A)/新增地址(_A)"
 
-#: src/addressbook.c:353
+#: src/addressbook.c:355
 msgid "/_Address/New _Group"
 msgstr "/地址(_A)/新增群組(_G)"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:356
 msgid "/_Address/New _Folder"
 msgstr "/地址(_A)/新增資料夾(_F)"
 
-#: src/addressbook.c:355
+#: src/addressbook.c:357
 msgid "/_Address/---"
 msgstr "/地址(_A)/---"
 
-#: src/addressbook.c:356
+#: src/addressbook.c:358
 msgid "/_Address/_Edit"
 msgstr "/地址(_A)/編輯(_E)"
 
-#: src/addressbook.c:357
+#: src/addressbook.c:359
 msgid "/_Address/_Delete"
 msgstr "/地址(_A)/刪除(_D)"
 
-#: src/addressbook.c:358 src/compose.c:639 src/mainwindow.c:738
-#: src/messageview.c:259
+#: src/addressbook.c:360 src/compose.c:645 src/mainwindow.c:749
+#: src/messageview.c:264
 msgid "/_Tools"
 msgstr "/工具(_T)"
 
-#: src/addressbook.c:359
+#: src/addressbook.c:361
 msgid "/_Tools/Import _LDIF file"
 msgstr "/工具(_T)/匯入 LDIF 檔(_L)"
 
-#: src/addressbook.c:360 src/compose.c:658 src/mainwindow.c:788
-#: src/messageview.c:277
+#: src/addressbook.c:362 src/compose.c:664 src/mainwindow.c:799
+#: src/messageview.c:282
 msgid "/_Help"
 msgstr "/說明(_H)"
 
-#: src/addressbook.c:361 src/compose.c:659 src/mainwindow.c:799
-#: src/messageview.c:278
+#: src/addressbook.c:363 src/compose.c:665 src/mainwindow.c:810
+#: src/messageview.c:283
 msgid "/_Help/_About"
 msgstr "/說明(_H)/關於(_A)"
 
-#: src/addressbook.c:380 src/addressbook.c:390
+#: src/addressbook.c:382 src/addressbook.c:392
 msgid "/New _Address"
 msgstr "/新增地址(_A)"
 
-#: src/addressbook.c:381 src/addressbook.c:391
+#: src/addressbook.c:383 src/addressbook.c:393
 msgid "/New _Group"
 msgstr "/新增群組(_G)"
 
-#: src/addressbook.c:382 src/addressbook.c:392
+#: src/addressbook.c:384 src/addressbook.c:394
 msgid "/New _Folder"
 msgstr "/新增資料夾(_F)"
 
-#: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:509
+#: src/addressbook.c:385 src/addressbook.c:395 src/compose.c:509
 #: src/folderview.c:246 src/folderview.c:248 src/folderview.c:253
 #: src/folderview.c:266 src/folderview.c:268 src/folderview.c:270
 #: src/folderview.c:275 src/folderview.c:289 src/folderview.c:291
 #: src/folderview.c:295 src/summaryview.c:414 src/summaryview.c:418
-#: src/summaryview.c:421 src/summaryview.c:431 src/summaryview.c:433
-#: src/summaryview.c:435 src/summaryview.c:447 src/summaryview.c:453
+#: src/summaryview.c:421 src/summaryview.c:433 src/summaryview.c:435
+#: src/summaryview.c:437 src/summaryview.c:449 src/summaryview.c:455
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:534
-#: src/mainwindow.c:509 src/messageview.c:144
+#: src/addressbook.c:386 src/addressbook.c:396 src/compose.c:534
+#: src/mainwindow.c:512 src/messageview.c:144
 msgid "/_Edit"
 msgstr "/編輯(_E)"
 
-#: src/addressbook.c:385 src/addressbook.c:395 src/summaryview.c:432
+#: src/addressbook.c:387 src/addressbook.c:397 src/summaryview.c:434
 msgid "/_Delete"
 msgstr "/刪除(_D)"
 
-#: src/addressbook.c:492
+#: src/addressbook.c:494
 msgid "E-Mail address"
 msgstr "E-Mail 地址"
 
-#: src/addressbook.c:496 src/compose.c:4763 src/prefs_common_dialog.c:2183
+#: src/addressbook.c:498 src/compose.c:4772 src/prefs_common_dialog.c:2183
 msgid "Address book"
 msgstr "通訊錄"
 
-#: src/addressbook.c:596 src/prefs_filter_edit.c:249
+#: src/addressbook.c:600 src/prefs_filter_edit.c:249
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "姓名："
 
 #. Buttons
-#: src/addressbook.c:628 src/addressbook.c:1680 src/editaddress.c:884
-#: src/editaddress.c:1017 src/mainwindow.c:2391 src/prefs_actions.c:266
+#: src/addressbook.c:632 src/addressbook.c:1684 src/editaddress.c:884
+#: src/editaddress.c:1017 src/mainwindow.c:2402 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
 #: src/prefs_template.c:233
 msgid "Delete"
 msgstr "刪除"
 
-#: src/addressbook.c:631 src/editaddress.c:890 src/editaddress.c:1023
+#: src/addressbook.c:635 src/editaddress.c:890 src/editaddress.c:1023
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:273 src/prefs_display_header.c:328
 #: src/prefs_filter_edit.c:1550
 msgid "Add"
 msgstr "新增"
 
-#: src/addressbook.c:634
+#: src/addressbook.c:638
 msgid "Lookup"
 msgstr "尋找"
 
-#: src/addressbook.c:646 src/headerview.c:55 src/prefs_folder_item.c:339
+#: src/addressbook.c:650 src/headerview.c:55 src/prefs_folder_item.c:339
 #: src/prefs_template.c:176
 msgid "To:"
 msgstr "收件人"
 
-#: src/addressbook.c:650 src/prefs_folder_item.c:356 src/prefs_template.c:178
+#: src/addressbook.c:654 src/prefs_folder_item.c:356 src/prefs_template.c:178
 msgid "Cc:"
 msgstr "副本"
 
-#: src/addressbook.c:654 src/prefs_folder_item.c:367
+#: src/addressbook.c:658 src/prefs_folder_item.c:367
 msgid "Bcc:"
 msgstr "密件副本"
 
 #. Confirm deletion
-#: src/addressbook.c:841
+#: src/addressbook.c:845
 msgid "Delete address(es)"
 msgstr "刪除通訊紀錄"
 
-#: src/addressbook.c:842
+#: src/addressbook.c:846
 msgid "Really delete the address(es)?"
 msgstr "您確定要刪除這些紀錄嗎？"
 
-#: src/addressbook.c:1671
+#: src/addressbook.c:1675
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1043,38 +1043,38 @@ msgstr ""
 "您確定要刪除「%s」資料夾以及裡面所有的地址嗎？\n"
 "如果您選擇只刪除資料夾，裡面的通訊紀錄將移到上一層資料夾中。"
 
-#: src/addressbook.c:1674 src/folderview.c:2351
+#: src/addressbook.c:1678 src/folderview.c:2351
 msgid "Delete folder"
 msgstr "刪除資料夾"
 
-#: src/addressbook.c:1674
+#: src/addressbook.c:1678
 msgid "_Folder only"
 msgstr "只刪除資料夾(_F)"
 
-#: src/addressbook.c:1674
+#: src/addressbook.c:1678
 msgid "Folder and _addresses"
 msgstr "全部刪除(_A)"
 
-#: src/addressbook.c:1679
+#: src/addressbook.c:1683
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "您確定要刪除「%s」? "
 
-#: src/addressbook.c:2365 src/addressbook.c:2498
+#: src/addressbook.c:2369 src/addressbook.c:2502
 msgid "New user, could not save index file."
 msgstr "無法儲存索引檔案。"
 
-#: src/addressbook.c:2369 src/addressbook.c:2502
+#: src/addressbook.c:2373 src/addressbook.c:2506
 msgid "New user, could not save address book files."
 msgstr "無法儲存通訊錄檔案。"
 
-#: src/addressbook.c:2379 src/addressbook.c:2512
+#: src/addressbook.c:2383 src/addressbook.c:2516
 msgid "Old address book converted successfully."
 msgstr ""
 "轉換舊通訊錄格式完成。\n"
 "您可以開始使用新的通訊錄。"
 
-#: src/addressbook.c:2384
+#: src/addressbook.c:2388
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1082,7 +1082,7 @@ msgstr ""
 "舊通訊錄格式已轉換，\n"
 "但無法儲存新的索引檔。"
 
-#: src/addressbook.c:2397
+#: src/addressbook.c:2401
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1090,7 +1090,7 @@ msgstr ""
 "無法轉換通訊錄格式，\n"
 "但已產生空的新通訊錄。"
 
-#: src/addressbook.c:2403
+#: src/addressbook.c:2407
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1098,7 +1098,7 @@ msgstr ""
 "無法轉換通訊錄格式，\n"
 "亦無法產生新的通訊錄。"
 
-#: src/addressbook.c:2408
+#: src/addressbook.c:2412
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1106,84 +1106,84 @@ msgstr ""
 "無法轉換通訊錄格式，\n"
 "亦無法產生新的通訊錄。"
 
-#: src/addressbook.c:2415
+#: src/addressbook.c:2419
 msgid "Addressbook conversion error"
 msgstr "轉換通訊錄格式時發生錯誤"
 
-#: src/addressbook.c:2419
+#: src/addressbook.c:2423
 msgid "Addressbook conversion"
 msgstr "通訊錄格式轉換"
 
-#: src/addressbook.c:2454
+#: src/addressbook.c:2458
 msgid "Addressbook Error"
 msgstr "通訊錄發生錯誤"
 
-#: src/addressbook.c:2455 src/addressbook.c:2555
+#: src/addressbook.c:2459 src/addressbook.c:2559
 msgid "Could not read address index"
 msgstr "無法讀取通訊錄索引"
 
-#: src/addressbook.c:2517
+#: src/addressbook.c:2521
 msgid "Old address book converted, could not save new address index file"
 msgstr "舊通訊錄格式已轉換，但無法儲存新的索引檔。"
 
-#: src/addressbook.c:2531
+#: src/addressbook.c:2535
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr "無法轉換通訊錄格式，但已產生空的新通訊錄。"
 
-#: src/addressbook.c:2537
+#: src/addressbook.c:2541
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr "無法轉換通訊錄格式，亦無法產生新的通訊錄。"
 
-#: src/addressbook.c:2543
+#: src/addressbook.c:2547
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr "無法轉換通訊錄格式，亦無法產生新的通訊錄。"
 
-#: src/addressbook.c:2561
+#: src/addressbook.c:2565
 msgid "Addressbook Conversion Error"
 msgstr "轉換通訊錄格式時發生錯誤"
 
-#: src/addressbook.c:2567
+#: src/addressbook.c:2571
 msgid "Addressbook Conversion"
 msgstr "通訊錄格式轉換"
 
-#: src/addressbook.c:3072 src/prefs_common_dialog.c:2033
+#: src/addressbook.c:3086 src/prefs_common_dialog.c:2033
 msgid "Interface"
 msgstr "介面"
 
-#: src/addressbook.c:3088 src/importldif.c:514
+#: src/addressbook.c:3102 src/importldif.c:514
 msgid "Address Book"
 msgstr "通訊錄"
 
-#: src/addressbook.c:3104
+#: src/addressbook.c:3118
 msgid "Person"
 msgstr "人名"
 
-#: src/addressbook.c:3120
+#: src/addressbook.c:3134
 msgid "EMail Address"
 msgstr "電子郵件信箱"
 
-#: src/addressbook.c:3136
+#: src/addressbook.c:3150
 msgid "Group"
 msgstr "群組"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3152 src/folderview.c:367 src/prefs_account_dialog.c:1694
+#: src/addressbook.c:3166 src/folderview.c:367 src/prefs_account_dialog.c:1694
 #: src/query_search.c:370
 msgid "Folder"
 msgstr "資料夾"
 
-#: src/addressbook.c:3168
+#: src/addressbook.c:3182
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3184 src/addressbook.c:3200
+#: src/addressbook.c:3198 src/addressbook.c:3214
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3216
+#: src/addressbook.c:3230
 msgid "LDAP Server"
 msgstr "LDAP 伺服器"
 
@@ -1195,7 +1195,7 @@ msgstr "共用通訊紀錄"
 msgid "Personal address"
 msgstr "私人通訊紀錄"
 
-#: src/alertpanel.c:141 src/compose.c:5485 src/main.c:573
+#: src/alertpanel.c:141 src/compose.c:5494 src/main.c:573
 msgid "Notice"
 msgstr "注意"
 
@@ -1246,7 +1246,7 @@ msgstr "棕色"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4593
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4750
 msgid "None"
 msgstr "無"
 
@@ -1304,7 +1304,7 @@ msgstr "/編輯(_E)/復原(_U)"
 msgid "/_Edit/_Redo"
 msgstr "/編輯(_E)/重複前一個動作(_R)"
 
-#: src/compose.c:537 src/compose.c:544 src/mainwindow.c:513
+#: src/compose.c:537 src/compose.c:544 src/mainwindow.c:516
 #: src/messageview.c:147
 msgid "/_Edit/---"
 msgstr "/編輯(_E)/---"
@@ -1313,7 +1313,7 @@ msgstr "/編輯(_E)/---"
 msgid "/_Edit/Cu_t"
 msgstr "/編輯(_E)/剪下(_T)"
 
-#: src/compose.c:539 src/mainwindow.c:510 src/messageview.c:145
+#: src/compose.c:539 src/mainwindow.c:513 src/messageview.c:145
 msgid "/_Edit/_Copy"
 msgstr "/編輯(_E)/複製(_C)"
 
@@ -1325,7 +1325,7 @@ msgstr "/編輯(_E)/貼上(_P)"
 msgid "/_Edit/Paste as _quotation"
 msgstr "/編輯(_E)/貼進引言(_Q)"
 
-#: src/compose.c:543 src/mainwindow.c:511 src/messageview.c:146
+#: src/compose.c:543 src/mainwindow.c:514 src/messageview.c:146
 msgid "/_Edit/Select _all"
 msgstr "/編輯(_E)/全選(_A)"
 
@@ -1341,8 +1341,8 @@ msgstr "/編輯(_E)/將所有過長的列折換(_L)"
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/編輯(_E)/自動折列(_O)"
 
-#: src/compose.c:550 src/mainwindow.c:518 src/messageview.c:151
-#: src/summaryview.c:448
+#: src/compose.c:550 src/mainwindow.c:521 src/messageview.c:151
+#: src/summaryview.c:450
 msgid "/_View"
 msgstr "/顯示(_V)"
 
@@ -1363,9 +1363,9 @@ msgid "/_View/_Reply to"
 msgstr "/顯示(_V)/回覆(_R)"
 
 #: src/compose.c:555 src/compose.c:557 src/compose.c:559 src/compose.c:561
-#: src/mainwindow.c:538 src/mainwindow.c:541 src/mainwindow.c:568
-#: src/mainwindow.c:592 src/mainwindow.c:687 src/mainwindow.c:691
-#: src/messageview.c:236
+#: src/mainwindow.c:541 src/mainwindow.c:544 src/mainwindow.c:571
+#: src/mainwindow.c:595 src/mainwindow.c:696 src/mainwindow.c:700
+#: src/messageview.c:241
 msgid "/_View/---"
 msgstr "/顯示(_V)/---"
 
@@ -1381,7 +1381,7 @@ msgstr "/顯示(_V)/尺規(_U)"
 msgid "/_View/_Attachment"
 msgstr "/顯示(_V)/附加(_A)"
 
-#: src/compose.c:567 src/mainwindow.c:599 src/messageview.c:158
+#: src/compose.c:567 src/mainwindow.c:602 src/messageview.c:158
 msgid "/_View/Character _encoding"
 msgstr "/檢視(_V)/字元編碼(_E)"
 
@@ -1390,214 +1390,225 @@ msgid "/_View/Character _encoding/_Automatic"
 msgstr "/檢視(_V)/字元編碼(_E)/自動(_A)"
 
 #: src/compose.c:570 src/compose.c:576 src/compose.c:582 src/compose.c:586
-#: src/compose.c:592 src/compose.c:596 src/compose.c:602 src/compose.c:606
-#: src/compose.c:616 src/compose.c:620 src/compose.c:628 src/compose.c:632
-#: src/mainwindow.c:595 src/mainwindow.c:602 src/messageview.c:154
+#: src/compose.c:592 src/compose.c:596 src/compose.c:602 src/compose.c:608
+#: src/compose.c:612 src/compose.c:622 src/compose.c:626 src/compose.c:634
+#: src/compose.c:638 src/mainwindow.c:598 src/mainwindow.c:605
+#: src/messageview.c:154
 msgid "/_View/Character _encoding/---"
 msgstr "/檢視(_V)/字元編碼(_E)/---"
 
-#: src/compose.c:572 src/mainwindow.c:603 src/messageview.c:162
+#: src/compose.c:572 src/mainwindow.c:606 src/messageview.c:162
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/顯示(_V)/字元編碼(_E)/7位元 ASCII (US-ASC_II)"
 
-#: src/compose.c:574 src/mainwindow.c:605 src/messageview.c:165
+#: src/compose.c:574 src/mainwindow.c:608 src/messageview.c:165
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/顯示(_V)/字元編碼(_E)/Unicode (_UTF-8)"
 
-#: src/compose.c:578 src/mainwindow.c:609 src/messageview.c:168
+#: src/compose.c:578 src/mainwindow.c:612 src/messageview.c:168
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/顯示(_V)/字元編碼(_E)/西歐語系 (ISO-8859-_1)"
 
-#: src/compose.c:580 src/mainwindow.c:611 src/messageview.c:170
+#: src/compose.c:580 src/mainwindow.c:614 src/messageview.c:170
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/顯示(_V)/字元編碼(_E)/西歐語系 (ISO-8859-15)"
 
-#: src/compose.c:584 src/mainwindow.c:617 src/messageview.c:175
+#: src/compose.c:584 src/mainwindow.c:620 src/messageview.c:175
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/顯示(_V)/字元編碼(_E)/中歐語系 (ISO-8859-_2)"
 
-#: src/compose.c:588 src/mainwindow.c:621 src/messageview.c:178
+#: src/compose.c:588 src/mainwindow.c:624 src/messageview.c:178
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/顯示(_V)/字元編碼(_E)/波羅的海語系 (ISO-8859-13)(_B)"
 
-#: src/compose.c:590 src/mainwindow.c:623 src/messageview.c:180
+#: src/compose.c:590 src/mainwindow.c:626 src/messageview.c:180
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/顯示(_V)/字元編碼(_E)/波羅的海語系 (ISO-8859-_4)"
 
-#: src/compose.c:594 src/mainwindow.c:627 src/messageview.c:183
+#: src/compose.c:594 src/mainwindow.c:630 src/messageview.c:183
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/顯示(_V)/字元編碼(_E)/希臘語 (ISO-8859-_7)"
 
-#: src/compose.c:598 src/mainwindow.c:631 src/messageview.c:186
+#: src/compose.c:598 src/mainwindow.c:634 src/messageview.c:186
+#, fuzzy
+msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
+msgstr "/顯示(_V)/字元編碼(_E)/波羅的海語系 (ISO-8859-_4)"
+
+#: src/compose.c:600 src/mainwindow.c:636 src/messageview.c:188
+#, fuzzy
+msgid "/_View/Character _encoding/Arabic (Windows-1256)"
+msgstr "/顯示(_V)/字元編碼(_E)/斯拉夫語 (Windows-1251)"
+
+#: src/compose.c:604 src/mainwindow.c:640 src/messageview.c:191
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/顯示(_V)/字元編碼(_E)/希臘語 (ISO-8859-_8)"
 
-#: src/compose.c:600 src/mainwindow.c:633 src/messageview.c:188
+#: src/compose.c:606 src/mainwindow.c:642 src/messageview.c:193
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/顯示(_V)/字元編碼(_E)/斯拉夫語 (Windows-1255)"
 
-#: src/compose.c:604 src/mainwindow.c:637 src/messageview.c:191
+#: src/compose.c:610 src/mainwindow.c:646 src/messageview.c:196
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/顯示(_V)/字元編碼(_E)/土耳其語 (ISO-8859-_9)"
 
-#: src/compose.c:608 src/mainwindow.c:641 src/messageview.c:194
+#: src/compose.c:614 src/mainwindow.c:650 src/messageview.c:199
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/顯示(_V)/字元編碼(_E)/斯拉夫語 (ISO-8859-_5)"
 
-#: src/compose.c:610 src/mainwindow.c:643 src/messageview.c:196
+#: src/compose.c:616 src/mainwindow.c:652 src/messageview.c:201
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/顯示(_V)/字元編碼(_E)/斯拉夫語 (KOI8-_R)"
 
-#: src/compose.c:612 src/mainwindow.c:645 src/messageview.c:198
+#: src/compose.c:618 src/mainwindow.c:654 src/messageview.c:203
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/顯示(_V)/字元編碼(_E)/斯拉夫語 (KOI8-U)"
 
-#: src/compose.c:614 src/mainwindow.c:647 src/messageview.c:200
+#: src/compose.c:620 src/mainwindow.c:656 src/messageview.c:205
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/顯示(_V)/字元編碼(_E)/斯拉夫語 (Windows-1251)"
 
-#: src/compose.c:618 src/mainwindow.c:651 src/messageview.c:203
+#: src/compose.c:624 src/mainwindow.c:660 src/messageview.c:208
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/顯示(_V)/字元編碼(_E)/日文 (ISO-2022-_JP)"
 
-#: src/compose.c:622 src/mainwindow.c:661 src/messageview.c:212
+#: src/compose.c:628 src/mainwindow.c:670 src/messageview.c:217
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/顯示(_V)/字元編碼(_E)/簡體中文 (_GB2312)"
 
-#: src/compose.c:624 src/mainwindow.c:663 src/messageview.c:214
+#: src/compose.c:630 src/mainwindow.c:672 src/messageview.c:219
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/顯示(_V)/字元編碼(_E)/簡體中文 (_GBK)"
 
-#: src/compose.c:626 src/mainwindow.c:665 src/messageview.c:216
+#: src/compose.c:632 src/mainwindow.c:674 src/messageview.c:221
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/顯示(_V)/字元編碼(_E)/繁體中文 (_Big5)"
 
-#: src/compose.c:630 src/mainwindow.c:673 src/messageview.c:223
+#: src/compose.c:636 src/mainwindow.c:682 src/messageview.c:228
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/顯示(_V)/字元編碼(_E)/韓文 (EUC-_KR)"
 
-#: src/compose.c:634 src/mainwindow.c:679 src/messageview.c:228
+#: src/compose.c:640 src/mainwindow.c:688 src/messageview.c:233
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/顯示(_V)/字元編碼(_E)/泰文 (TIS-620)"
 
-#: src/compose.c:636 src/mainwindow.c:681 src/messageview.c:230
+#: src/compose.c:642 src/mainwindow.c:690 src/messageview.c:235
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/顯示(_V)/字元編碼(_E)/泰文 (Windows-874)"
 
-#: src/compose.c:640 src/mainwindow.c:739 src/messageview.c:260
+#: src/compose.c:646 src/mainwindow.c:750 src/messageview.c:265
 msgid "/_Tools/_Address book"
 msgstr "/工具(_T)/通訊錄(_A)"
 
-#: src/compose.c:641
+#: src/compose.c:647
 msgid "/_Tools/_Template"
 msgstr "/工具(_T)/套用郵件樣板(_T)"
 
-#: src/compose.c:642 src/mainwindow.c:762 src/messageview.c:275
+#: src/compose.c:648 src/mainwindow.c:773 src/messageview.c:280
 msgid "/_Tools/Actio_ns"
 msgstr "/工具(_T)/執行外部指令(_N)"
 
-#: src/compose.c:643 src/compose.c:647 src/compose.c:653 src/mainwindow.c:742
-#: src/mainwindow.c:756 src/mainwindow.c:761 src/mainwindow.c:763
-#: src/mainwindow.c:766 src/mainwindow.c:768 src/messageview.c:263
-#: src/messageview.c:274
+#: src/compose.c:649 src/compose.c:653 src/compose.c:659 src/mainwindow.c:753
+#: src/mainwindow.c:767 src/mainwindow.c:772 src/mainwindow.c:774
+#: src/mainwindow.c:777 src/mainwindow.c:779 src/messageview.c:268
+#: src/messageview.c:279
 msgid "/_Tools/---"
 msgstr "/工具(_T)"
 
-#: src/compose.c:644
+#: src/compose.c:650
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/工具(_T)/使用其他的編輯器(_X)"
 
-#: src/compose.c:648
+#: src/compose.c:654
 msgid "/_Tools/PGP Si_gn"
 msgstr "/工具(_T)/PGP 簽章(_G)"
 
-#: src/compose.c:649
+#: src/compose.c:655
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/工具(_T)/PGP 加密(_E)"
 
-#: src/compose.c:654
+#: src/compose.c:660
 #, fuzzy
 msgid "/_Tools/_Check spell"
 msgstr "/工具(_T)/執行(_X)"
 
-#: src/compose.c:655
+#: src/compose.c:661
 #, fuzzy
 msgid "/_Tools/_Set spell language"
 msgstr "/工具(_T)/套用郵件樣板(_T)"
 
-#: src/compose.c:899
+#: src/compose.c:908
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: 檔案不存在\n"
 
-#: src/compose.c:1003 src/compose.c:1074
+#: src/compose.c:1012 src/compose.c:1083
 msgid "Can't get text part\n"
 msgstr "沒有文字部份\n"
 
-#: src/compose.c:1475
+#: src/compose.c:1484
 msgid "Quote mark format error."
 msgstr "引言格式錯誤。"
 
-#: src/compose.c:1487
+#: src/compose.c:1496
 msgid "Message reply/forward format error."
 msgstr "回覆/轉寄郵件格式錯誤。"
 
-#: src/compose.c:1907
+#: src/compose.c:1916
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "檔案 %s 不存在\n"
 
-#: src/compose.c:1911
+#: src/compose.c:1920
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "無法取得檔案 %s 的大小\n"
 
-#: src/compose.c:1915
+#: src/compose.c:1924
 #, c-format
 msgid "File %s is empty."
 msgstr "檔案 %s 是空的。"
 
-#: src/compose.c:1919
+#: src/compose.c:1928
 #, c-format
 msgid "Can't read %s."
 msgstr "無法讀取 %s。"
 
-#: src/compose.c:1952
+#: src/compose.c:1961
 #, c-format
 msgid "Message: %s"
 msgstr "郵件：%s"
 
-#: src/compose.c:2012 src/mimeview.c:565
+#: src/compose.c:2021 src/mimeview.c:565
 msgid "Can't get the part of multipart message."
 msgstr "無法取得這個附加檔。"
 
-#: src/compose.c:2496 src/headerview.c:195 src/query_search.c:636
-#: src/summaryview.c:2107
+#: src/compose.c:2505 src/headerview.c:195 src/query_search.c:636
+#: src/summaryview.c:2124
 msgid "(No Subject)"
 msgstr "（沒有主旨）"
 
-#: src/compose.c:2499
+#: src/compose.c:2508
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - 編寫郵件%s"
 
-#: src/compose.c:2612
+#: src/compose.c:2621
 msgid "Recipient is not specified."
 msgstr "沒有指定收件人。"
 
-#: src/compose.c:2620
+#: src/compose.c:2629
 msgid "Empty subject"
 msgstr "主旨空白"
 
-#: src/compose.c:2621
+#: src/compose.c:2630
 msgid "Subject is empty. Send it anyway?"
 msgstr "沒有主旨。確定要送出？"
 
-#: src/compose.c:2680
+#: src/compose.c:2689
 msgid "can't get recipient list."
 msgstr "無法取得收件人或收件新聞群組名單。"
 
-#: src/compose.c:2700
+#: src/compose.c:2709
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1605,21 +1616,21 @@ msgstr ""
 "您選用的帳號並非一個電子郵件帳號，可能是用來在新聞群組上發表文章用的。\n"
 "要發送郵件請選擇電子郵件帳號。"
 
-#: src/compose.c:2714 src/send_message.c:299
+#: src/compose.c:2723 src/send_message.c:299
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "向 %s 發出文章時出現錯誤。"
 
-#: src/compose.c:2756
+#: src/compose.c:2765
 msgid "Can't save the message to outbox."
 msgstr "無法將郵件送至寄件夾中。"
 
-#: src/compose.c:2794
+#: src/compose.c:2803
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "無法找到任何與目前選取之金鑰「%s」相關的金鑰。"
 
-#: src/compose.c:2891
+#: src/compose.c:2900
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1629,11 +1640,11 @@ msgstr ""
 "無法將郵件內文的編碼設定由 %s 轉換為 %s。\n"
 "仍舊要以 %s 傳送嗎？"
 
-#: src/compose.c:2897
+#: src/compose.c:2906
 msgid "Code conversion error"
 msgstr "轉換編碼時發生錯誤"
 
-#: src/compose.c:2970
+#: src/compose.c:2979
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1646,157 +1657,157 @@ msgstr ""
 "\n"
 "無論如何都要傳送嗎？"
 
-#: src/compose.c:2974
+#: src/compose.c:2983
 msgid "Line length limit"
 msgstr "列長度限制"
 
-#: src/compose.c:3264
+#: src/compose.c:3273
 msgid "can't remove the old message\n"
 msgstr "無法移除原有的舊郵件\n"
 
-#: src/compose.c:3282
+#: src/compose.c:3291
 msgid "queueing message...\n"
 msgstr "送進暫存資料夾中...\n"
 
-#: src/compose.c:3364
+#: src/compose.c:3373
 msgid "can't find queue folder\n"
 msgstr "找不到暫存資料夾\n"
 
-#: src/compose.c:3371
+#: src/compose.c:3380
 msgid "can't queue the message\n"
 msgstr "無法放進暫存資料夾\n"
 
-#: src/compose.c:3964
+#: src/compose.c:3973
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "產生郵件的編號：%s\n"
 
-#: src/compose.c:4077
+#: src/compose.c:4086
 msgid "Creating compose window...\n"
 msgstr "正在建立編寫視窗...\n"
 
-#: src/compose.c:4128 src/headerview.c:54
+#: src/compose.c:4137 src/headerview.c:54
 msgid "From:"
 msgstr "來源："
 
-#: src/compose.c:4202
+#: src/compose.c:4211
 msgid "PGP Sign"
 msgstr "PGP 簽章"
 
-#: src/compose.c:4205
+#: src/compose.c:4214
 msgid "PGP Encrypt"
 msgstr "PGP 加密"
 
-#: src/compose.c:4243 src/compose.c:5317
+#: src/compose.c:4252 src/compose.c:5326
 msgid "MIME type"
 msgstr "MIME 型態"
 
 #. S_COL_DATE
-#: src/compose.c:4252 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4740
+#: src/compose.c:4261 src/mimeview.c:197 src/prefs_filter_edit.c:496
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4897
 msgid "Size"
 msgstr "大小"
 
-#: src/compose.c:4683 src/mainwindow.c:2324 src/prefs_account_dialog.c:528
+#: src/compose.c:4692 src/mainwindow.c:2335 src/prefs_account_dialog.c:528
 #: src/prefs_common_dialog.c:661
 msgid "Send"
 msgstr "送出"
 
-#: src/compose.c:4684
+#: src/compose.c:4693
 msgid "Send message"
 msgstr "送出郵件"
 
-#: src/compose.c:4692
+#: src/compose.c:4701
 msgid "Send later"
 msgstr "稍後再送出"
 
-#: src/compose.c:4693
+#: src/compose.c:4702
 msgid "Put into queue folder and send later"
 msgstr "放到寄件夾中稍後再送出"
 
-#: src/compose.c:4701
+#: src/compose.c:4710
 msgid "Draft"
 msgstr "草稿"
 
-#: src/compose.c:4702
+#: src/compose.c:4711
 msgid "Save to draft folder"
 msgstr "儲存至草稿資料夾"
 
-#: src/compose.c:4712
+#: src/compose.c:4721
 msgid "Insert"
 msgstr "插入"
 
-#: src/compose.c:4713
+#: src/compose.c:4722
 msgid "Insert file"
 msgstr "插入檔案"
 
-#: src/compose.c:4721
+#: src/compose.c:4730
 msgid "Attach"
 msgstr "附加"
 
-#: src/compose.c:4722
+#: src/compose.c:4731
 msgid "Attach file"
 msgstr "附加檔案"
 
 #. signature
-#: src/compose.c:4732 src/prefs_account_dialog.c:1208
+#: src/compose.c:4741 src/prefs_account_dialog.c:1208
 #: src/prefs_common_dialog.c:953
 msgid "Signature"
 msgstr "簽章"
 
-#: src/compose.c:4733
+#: src/compose.c:4742
 #, fuzzy
 msgid "Append signature"
 msgstr "簽章檢查錯誤"
 
 #. editor
-#: src/compose.c:4742 src/prefs_common_dialog.c:991
+#: src/compose.c:4751 src/prefs_common_dialog.c:991
 #: src/prefs_common_dialog.c:2315
 msgid "Editor"
 msgstr "編輯器"
 
-#: src/compose.c:4743
+#: src/compose.c:4752
 msgid "Edit with external editor"
 msgstr "使用其他的編輯器"
 
-#: src/compose.c:4751
+#: src/compose.c:4760
 msgid "Linewrap"
 msgstr "折列"
 
-#: src/compose.c:4752
+#: src/compose.c:4761
 msgid "Wrap all long lines"
 msgstr "折換所有過長的文字列"
 
-#: src/compose.c:5213
+#: src/compose.c:5222
 msgid "Invalid MIME type."
 msgstr "不合法的 MIME 型態。"
 
-#: src/compose.c:5231
+#: src/compose.c:5240
 msgid "File doesn't exist or is empty."
 msgstr "檔案不存在或者是空的。"
 
-#: src/compose.c:5299
+#: src/compose.c:5308
 msgid "Properties"
 msgstr "內容"
 
-#: src/compose.c:5319 src/prefs_common_dialog.c:1444
+#: src/compose.c:5328 src/prefs_common_dialog.c:1444
 msgid "Encoding"
 msgstr "編碼"
 
-#: src/compose.c:5342 src/prefs_folder_item.c:202
+#: src/compose.c:5351 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "路徑"
 
-#: src/compose.c:5343
+#: src/compose.c:5352
 msgid "File name"
 msgstr "檔名"
 
-#: src/compose.c:5436
+#: src/compose.c:5445
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "外部編輯器的命令是錯誤的：「%s」\n"
 
-#: src/compose.c:5482
+#: src/compose.c:5491
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1806,44 +1817,44 @@ msgstr ""
 "要強迫結束該行程嗎？\n"
 "行程的群組代碼是：%d"
 
-#: src/compose.c:5857 src/compose.c:5862 src/compose.c:5868
+#: src/compose.c:5866 src/compose.c:5871 src/compose.c:5877
 msgid "Can't queue the message."
 msgstr "無法放進暫存資料夾。"
 
-#: src/compose.c:5959
+#: src/compose.c:5968
 msgid "Select files"
 msgstr "選擇檔案"
 
-#: src/compose.c:5982
+#: src/compose.c:5991
 msgid "Select file"
 msgstr "選擇檔案"
 
-#: src/compose.c:6017
+#: src/compose.c:6026
 msgid "Save message"
 msgstr "儲存郵件"
 
-#: src/compose.c:6018
+#: src/compose.c:6027
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "郵件已被修改過。將它儲存到草稿資料夾嗎？"
 
-#: src/compose.c:6020
+#: src/compose.c:6029
 msgid "Close _without saving"
 msgstr "關閉但不儲存(_W)"
 
-#: src/compose.c:6062
+#: src/compose.c:6071
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "您確定要套用「%s」這個郵件樣板嗎？"
 
-#: src/compose.c:6064
+#: src/compose.c:6073
 msgid "Apply template"
 msgstr "套用郵件樣板"
 
-#: src/compose.c:6065
+#: src/compose.c:6074
 msgid "_Replace"
 msgstr "置換(_R)"
 
-#: src/compose.c:6065
+#: src/compose.c:6074
 msgid "_Insert"
 msgstr "插入(_I)"
 
@@ -2279,7 +2290,7 @@ msgstr "新的"
 
 #. S_COL_MARK
 #: src/folderview.c:412 src/prefs_filter_edit.c:500
-#: src/prefs_summary_column.c:71 src/summaryview.c:509
+#: src/prefs_summary_column.c:71 src/summaryview.c:511
 msgid "Unread"
 msgstr "未讀的"
 
@@ -2295,12 +2306,12 @@ msgstr "設定資料夾...\n"
 msgid "Setting folder info..."
 msgstr "設定資料夾..."
 
-#: src/folderview.c:858 src/mainwindow.c:3464 src/setup.c:80
+#: src/folderview.c:858 src/mainwindow.c:3481 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "掃描資料夾 %s%c%s ..."
 
-#: src/folderview.c:862 src/mainwindow.c:3469 src/setup.c:85
+#: src/folderview.c:862 src/mainwindow.c:3486 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "掃描資料夾 %s ..."
@@ -2325,7 +2336,7 @@ msgstr "重建資料夾結構失敗。"
 msgid "Checking for new messages in all folders..."
 msgstr "檢查每個資料夾中的新郵件..."
 
-#: src/folderview.c:1200 src/mainwindow.c:2400 src/prefs_common_dialog.c:1789
+#: src/folderview.c:1200 src/mainwindow.c:2411 src/prefs_common_dialog.c:1789
 msgid "Junk"
 msgstr "垃圾郵件"
 
@@ -2465,7 +2476,7 @@ msgstr "主旨："
 msgid "Creating header view...\n"
 msgstr "產生標頭視窗...\n"
 
-#: src/headerview.c:180 src/query_search.c:637 src/summaryview.c:2110
+#: src/headerview.c:180 src/query_search.c:637 src/summaryview.c:2127
 msgid "(No From)"
 msgstr "（沒有來源）"
 
@@ -2574,7 +2585,7 @@ msgstr "將 LDIF 檔匯入通訊錄"
 msgid "Prev"
 msgstr "前一封"
 
-#: src/importldif.c:768 src/mainwindow.c:2420
+#: src/importldif.c:768 src/mainwindow.c:2431
 msgid "Next"
 msgstr "下一封"
 
@@ -2917,11 +2928,11 @@ msgstr ""
 msgid "another Sylpheed is already running.\n"
 msgstr "已經有 Sylpheed 程式正在執行中。\n"
 
-#: src/main.c:1064
+#: src/main.c:1083
 msgid "Migration of configuration"
 msgstr "設定資料轉移"
 
-#: src/main.c:1065
+#: src/main.c:1084
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -2929,633 +2940,638 @@ msgstr ""
 "找到之前版本的設定檔。\n"
 "您要轉換它嗎？"
 
-#: src/mainwindow.c:478
+#: src/mainwindow.c:481
 msgid "/_File/_Folder"
 msgstr "/檔案(_F)/資料夾管理(_F)"
 
-#: src/mainwindow.c:479
+#: src/mainwindow.c:482
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/檔案(_F)/資料夾管理(_F)/新增資料夾(_N)"
 
-#: src/mainwindow.c:481
+#: src/mainwindow.c:484
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/檔案(_F)/資料夾管理(_F)/重新命名資料夾(_R)"
 
-#: src/mainwindow.c:482
+#: src/mainwindow.c:485
 msgid "/_File/_Folder/_Move folder..."
 msgstr "/檔案(_F)/資料夾管理(_F)/移動資料夾(_M)"
 
-#: src/mainwindow.c:483
+#: src/mainwindow.c:486
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/檔案(_F)/資料夾管理(_F)/刪除資料夾(_D)"
 
-#: src/mainwindow.c:484
+#: src/mainwindow.c:487
 msgid "/_File/_Mailbox"
 msgstr "/檔案(_F)/信箱(_M)"
 
-#: src/mainwindow.c:485
+#: src/mainwindow.c:488
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/檔案(_F)/信箱(_M)/新增信箱(_M)..."
 
-#: src/mainwindow.c:486
+#: src/mainwindow.c:489
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/檔案(_F)/信箱(_M)/移除信箱(_R)"
 
-#: src/mainwindow.c:487 src/mainwindow.c:492
+#: src/mainwindow.c:490 src/mainwindow.c:495
 msgid "/_File/_Mailbox/---"
 msgstr "/檔案(_F)/信箱(_M)/---"
 
-#: src/mainwindow.c:488
+#: src/mainwindow.c:491
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "/檔案(_F)/信箱(_M)/檢查新郵件(_C)"
 
-#: src/mainwindow.c:490
+#: src/mainwindow.c:493
 msgid "/_File/_Mailbox/Check for new messages in _all mailboxes"
 msgstr "/檔案(_F)/信箱(_M)/檢查所有信箱中的新郵件(_A)"
 
-#: src/mainwindow.c:493
+#: src/mainwindow.c:496
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "/檔案(_F)/信箱(_M)/重建資料夾結構(_E)"
 
-#: src/mainwindow.c:496
+#: src/mainwindow.c:499
 msgid "/_File/_Import mbox file..."
 msgstr "/檔案(_F)/匯入郵件(_I)"
 
-#: src/mainwindow.c:497
+#: src/mainwindow.c:500
 msgid "/_File/_Export to mbox file..."
 msgstr "/檔案(_F)/匯出資料夾(_E)"
 
-#: src/mainwindow.c:499
+#: src/mainwindow.c:502
 msgid "/_File/Empty all _trash"
 msgstr "/檔案(_F)/清空刪除的郵件(_T)"
 
-#: src/mainwindow.c:501 src/messageview.c:139
+#: src/mainwindow.c:504 src/messageview.c:139
 msgid "/_File/_Save as..."
 msgstr "/檔案(_F)/另存新檔(_S)..."
 
-#: src/mainwindow.c:502 src/messageview.c:140
+#: src/mainwindow.c:505 src/messageview.c:140
 msgid "/_File/_Print..."
 msgstr "/檔案(_F)/列印(_P)..."
 
-#: src/mainwindow.c:504
+#: src/mainwindow.c:507
 msgid "/_File/_Work offline"
 msgstr "/檔案(_F)/離線工作(_W)"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:507
+#: src/mainwindow.c:510
 msgid "/_File/E_xit"
 msgstr "/檔案(_F)/離開(_X)"
 
-#: src/mainwindow.c:512
+#: src/mainwindow.c:515
 msgid "/_Edit/Select _thread"
 msgstr "/編輯(_E)/選取串列(_T)"
 
-#: src/mainwindow.c:514 src/messageview.c:148
+#: src/mainwindow.c:517 src/messageview.c:148
 msgid "/_Edit/_Find in current message..."
 msgstr "/編輯(_E)/在目前郵件中尋找(_F)"
 
-#: src/mainwindow.c:516
+#: src/mainwindow.c:519
 msgid "/_Edit/_Search messages..."
 msgstr "/編輯(_E)/尋找郵件(_S)"
 
-#: src/mainwindow.c:519
+#: src/mainwindow.c:522
 msgid "/_View/Show or hi_de"
 msgstr "/顯示(_V)/顯示或隱藏(_D)"
 
-#: src/mainwindow.c:520
+#: src/mainwindow.c:523
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/顯示(_V)/顯示或隱藏(_D)/資料夾列表(_F)"
 
-#: src/mainwindow.c:522
+#: src/mainwindow.c:525
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/顯示(_V)/顯示或隱藏(_D)/郵件預覽(_M)"
 
-#: src/mainwindow.c:524
+#: src/mainwindow.c:527
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/顯示(_V)/顯示或隱藏(_D)/工具列(_T)"
 
-#: src/mainwindow.c:526
+#: src/mainwindow.c:529
 msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/顯示(_V)/顯示或隱藏(_D)/工具列(_T)/圖樣與文字(_A)"
 
-#: src/mainwindow.c:528
+#: src/mainwindow.c:531
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/顯示(_V)/顯示或隱藏(_D)/工具列(_T)/圖樣(_I)"
 
-#: src/mainwindow.c:530
+#: src/mainwindow.c:533
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/顯示(_V)/顯示或隱藏(_D)/工具列(_T)/文字(_T)"
 
-#: src/mainwindow.c:532
+#: src/mainwindow.c:535
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/顯示(_V)/顯示或隱藏(_D)/工具列(_T)/不顯示(_N)"
 
-#: src/mainwindow.c:534
+#: src/mainwindow.c:537
 #, fuzzy
 msgid "/_View/Show or hi_de/_Search bar"
 msgstr "/顯示(_V)/顯示或隱藏(_D)/狀態列(_B)"
 
-#: src/mainwindow.c:536
+#: src/mainwindow.c:539
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/顯示(_V)/顯示或隱藏(_D)/狀態列(_B)"
 
-#: src/mainwindow.c:539
+#: src/mainwindow.c:542
 msgid "/_View/Separate f_older tree"
 msgstr "/顯示(_V)/將資料夾列表分離(_O)"
 
-#: src/mainwindow.c:540
+#: src/mainwindow.c:543
 msgid "/_View/Separate _message view"
 msgstr "/顯示(_V)/將郵件預覽分離(_M)"
 
-#: src/mainwindow.c:542
+#: src/mainwindow.c:545
 msgid "/_View/_Sort"
 msgstr "/顯示(_V)/排序(_S)"
 
-#: src/mainwindow.c:543
+#: src/mainwindow.c:546
 msgid "/_View/_Sort/by _number"
 msgstr "/顯示(_V)/排序(_S)/用編號排序(_N)"
 
-#: src/mainwindow.c:544
+#: src/mainwindow.c:547
 msgid "/_View/_Sort/by s_ize"
 msgstr "/顯示(_V)/排序(_S)/用大小排序(_I)"
 
-#: src/mainwindow.c:545
+#: src/mainwindow.c:548
 msgid "/_View/_Sort/by _date"
 msgstr "/顯示(_V)/排序(_S)/用日期排序(_D)"
 
-#: src/mainwindow.c:546
+#: src/mainwindow.c:549
 msgid "/_View/_Sort/by t_hread date"
 msgstr "/顯示(_V)/排序(_S)/用串列日期排序(_H)"
 
-#: src/mainwindow.c:547
+#: src/mainwindow.c:550
 msgid "/_View/_Sort/by _from"
 msgstr "/顯示(_V)/排序(_S)/用來源排序(_F)"
 
-#: src/mainwindow.c:548
+#: src/mainwindow.c:551
 msgid "/_View/_Sort/by _recipient"
 msgstr "/顯示(_V)/排序(_S)/用收件人排序(_R)"
 
-#: src/mainwindow.c:549
+#: src/mainwindow.c:552
 msgid "/_View/_Sort/by _subject"
 msgstr "/顯示(_V)/排序(_S)/用主旨排序(_S)"
 
-#: src/mainwindow.c:550
+#: src/mainwindow.c:553
 msgid "/_View/_Sort/by _color label"
 msgstr "/顯示(_V)/排序(_S)/用標記顏色排序(_C)"
 
-#: src/mainwindow.c:552
+#: src/mainwindow.c:555
 msgid "/_View/_Sort/by _mark"
 msgstr "/顯示(_V)/排序(_S)/用標記排序(_M)"
 
-#: src/mainwindow.c:553
+#: src/mainwindow.c:556
 msgid "/_View/_Sort/by _unread"
 msgstr "/顯示(_V)/排序(_S)/依已讀或未讀排序(_U)"
 
-#: src/mainwindow.c:554
+#: src/mainwindow.c:557
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/顯示(_V)/排序(_S)/用附加檔排序(_T)"
 
-#: src/mainwindow.c:556
+#: src/mainwindow.c:559
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/顯示(_V)/排序(_S)/不排序(_O)"
 
-#: src/mainwindow.c:557 src/mainwindow.c:560
+#: src/mainwindow.c:560 src/mainwindow.c:563
 msgid "/_View/_Sort/---"
 msgstr "/顯示(_V)/排序(_S)/---"
 
-#: src/mainwindow.c:558
+#: src/mainwindow.c:561
 msgid "/_View/_Sort/Ascending"
 msgstr "/顯示(_V)/排序(_S)/遞增排序"
 
-#: src/mainwindow.c:559
+#: src/mainwindow.c:562
 msgid "/_View/_Sort/Descending"
 msgstr "/顯示(_V)/排序(_S)/遞減排序"
 
-#: src/mainwindow.c:561
+#: src/mainwindow.c:564
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/顯示(_V)/排序(_S)/用郵件串列排序(_A)"
 
-#: src/mainwindow.c:563
+#: src/mainwindow.c:566
 msgid "/_View/Th_read view"
 msgstr "/顯示(_V)/將郵件串列顯示(_R)"
 
-#: src/mainwindow.c:564
+#: src/mainwindow.c:567
 msgid "/_View/E_xpand all threads"
 msgstr "/顯示(_V)/展開所有郵件串列(_X)"
 
-#: src/mainwindow.c:565
+#: src/mainwindow.c:568
 msgid "/_View/Co_llapse all threads"
 msgstr "/顯示(_V)/解除所有郵件串列(_L)"
 
-#: src/mainwindow.c:566
+#: src/mainwindow.c:569
 msgid "/_View/Set display _item..."
 msgstr "/顯示(_V)/設定顯示的項目(_I)..."
 
-#: src/mainwindow.c:569
+#: src/mainwindow.c:572
 msgid "/_View/_Go to"
 msgstr "/顯示(_V)/前往(_G)"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:573
 msgid "/_View/_Go to/_Prev message"
 msgstr "/顯示(_V)/前往(_G)/前一封郵件(_P)"
 
-#: src/mainwindow.c:571
+#: src/mainwindow.c:574
 msgid "/_View/_Go to/_Next message"
 msgstr "/顯示(_V)/前往(_G)/下一封郵件(_N)"
 
-#: src/mainwindow.c:572 src/mainwindow.c:577 src/mainwindow.c:580
-#: src/mainwindow.c:585 src/mainwindow.c:590
+#: src/mainwindow.c:575 src/mainwindow.c:580 src/mainwindow.c:583
+#: src/mainwindow.c:588 src/mainwindow.c:593
 msgid "/_View/_Go to/---"
 msgstr "/顯示(_V)/前往(_G)/---"
 
-#: src/mainwindow.c:573
+#: src/mainwindow.c:576
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/顯示(_V)/前往(_G)/前一封未讀郵件(_R)"
 
-#: src/mainwindow.c:575
+#: src/mainwindow.c:578
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/顯示(_V)/前往(_G)/下一封未讀郵件(_E)"
 
-#: src/mainwindow.c:578
+#: src/mainwindow.c:581
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/顯示(_V)/前往(_G)/前一封新郵件(_W)"
 
-#: src/mainwindow.c:579
+#: src/mainwindow.c:582
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/顯示(_V)/前往(_G)/下一封新郵件(_X)"
 
-#: src/mainwindow.c:581
+#: src/mainwindow.c:584
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/顯示(_V)/前往(_G)/前一封已標記郵件(_M)"
 
-#: src/mainwindow.c:583
+#: src/mainwindow.c:586
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/顯示(_V)/前往(_G)/下一封已標記郵件(_A)"
 
-#: src/mainwindow.c:586
+#: src/mainwindow.c:589
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/顯示(_V)/前往(_G)/前一封已標記顏色之郵件(_L)"
 
-#: src/mainwindow.c:588
+#: src/mainwindow.c:591
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/顯示(_V)/前往(_G)/下一封已標記顏色之郵件(_B)"
 
-#: src/mainwindow.c:591
+#: src/mainwindow.c:594
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/顯示(_V)/前往(_G)/到其他資料夾(_F)"
 
-#: src/mainwindow.c:600 src/messageview.c:159
+#: src/mainwindow.c:603 src/messageview.c:159
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/顯示(_V)/字元編碼(_E)/自動偵測(_A)"
 
-#: src/mainwindow.c:613 src/messageview.c:172
+#: src/mainwindow.c:616 src/messageview.c:172
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr "/顯示(_V)/字元編碼(_E)/西歐語系 (ISO-8859-15)"
 
-#: src/mainwindow.c:653 src/messageview.c:205
+#: src/mainwindow.c:662 src/messageview.c:210
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/顯示(_V)/字元編碼(_E)/日文 (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:655 src/messageview.c:207
+#: src/mainwindow.c:664 src/messageview.c:212
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/顯示(_V)/字元編碼(_E)/日文 (_EUC-JP)"
 
-#: src/mainwindow.c:657 src/messageview.c:209
+#: src/mainwindow.c:666 src/messageview.c:214
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/顯示(_V)/字元編碼(_E)/日文 (_Shift__JIS)"
 
-#: src/mainwindow.c:667 src/messageview.c:218
+#: src/mainwindow.c:676 src/messageview.c:223
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/顯示(_V)/字元編碼(_E)/繁體中文 (EUC-_TW)"
 
-#: src/mainwindow.c:669 src/messageview.c:220
+#: src/mainwindow.c:678 src/messageview.c:225
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/顯示(_V)/字元編碼(_E)/中文 (ISO-2022-_CN)"
 
-#: src/mainwindow.c:675 src/messageview.c:225
+#: src/mainwindow.c:684 src/messageview.c:230
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/顯示(_V)/字元編碼(_E)/韓文 (ISO-2022-KR)"
 
-#: src/mainwindow.c:688 src/summaryview.c:449
+#: src/mainwindow.c:697 src/summaryview.c:451
 msgid "/_View/Open in new _window"
 msgstr "/顯示(_V)/在新視窗開啟(_W)"
 
-#: src/mainwindow.c:689 src/messageview.c:237
+#: src/mainwindow.c:698 src/messageview.c:242
 msgid "/_View/Mess_age source"
 msgstr "/顯示(_V)/觀看郵件原始碼(_A)"
 
-#: src/mainwindow.c:690 src/messageview.c:238
+#: src/mainwindow.c:699 src/messageview.c:243
 msgid "/_View/Show all _header"
 msgstr "/顯示(_V)/顯示所有的標頭(_H)"
 
-#: src/mainwindow.c:692
+#: src/mainwindow.c:701
 msgid "/_View/_Update summary"
 msgstr "/顯示(_V)/更新郵件列表(_U)"
 
-#: src/mainwindow.c:694 src/messageview.c:240
+#: src/mainwindow.c:703 src/messageview.c:245
 msgid "/_Message"
 msgstr "/郵件(_M)"
 
-#: src/mainwindow.c:695
+#: src/mainwindow.c:704
 msgid "/_Message/Recei_ve"
 msgstr "/郵件(_M)/接收(_V)"
 
-#: src/mainwindow.c:696
+#: src/mainwindow.c:705
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/郵件(_M)/接收(_V)/從目前帳號中接收新郵件(_C)"
 
-#: src/mainwindow.c:698
+#: src/mainwindow.c:707
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/郵件(_M)/接收(_V)/從所有帳號中接收新郵件(_A)"
 
-#: src/mainwindow.c:700
+#: src/mainwindow.c:709
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/郵件(_M)/接收(_V)/取消接收(_G)"
 
-#: src/mainwindow.c:702
+#: src/mainwindow.c:711
 msgid "/_Message/Recei_ve/---"
 msgstr "/郵件(_M)/接收(_V)/---"
 
-#: src/mainwindow.c:703
+#: src/mainwindow.c:712
 msgid "/_Message/_Send queued messages"
 msgstr "/郵件(_M)/將暫存資料夾中的郵件送出(_S)"
 
-#: src/mainwindow.c:704 src/mainwindow.c:706 src/mainwindow.c:713
-#: src/mainwindow.c:718 src/mainwindow.c:721 src/mainwindow.c:730
-#: src/mainwindow.c:732 src/mainwindow.c:735 src/messageview.c:243
-#: src/messageview.c:251 src/messageview.c:256
+#: src/mainwindow.c:713 src/mainwindow.c:715 src/mainwindow.c:722
+#: src/mainwindow.c:727 src/mainwindow.c:730 src/mainwindow.c:741
+#: src/mainwindow.c:743 src/mainwindow.c:746 src/messageview.c:248
+#: src/messageview.c:256 src/messageview.c:261
 msgid "/_Message/---"
 msgstr "/郵件(_M)/---"
 
-#: src/mainwindow.c:705 src/messageview.c:241
+#: src/mainwindow.c:714 src/messageview.c:246
 msgid "/_Message/Compose _new message"
 msgstr "/郵件(_M)/撰寫郵件(_N)"
 
-#: src/mainwindow.c:707 src/messageview.c:244
+#: src/mainwindow.c:716 src/messageview.c:249
 msgid "/_Message/_Reply"
 msgstr "/郵件(_M)/直接回覆(_R)"
 
-#: src/mainwindow.c:708
+#: src/mainwindow.c:717
 msgid "/_Message/Repl_y to"
 msgstr "/郵件(_M)/回覆給(_Y)"
 
-#: src/mainwindow.c:709 src/messageview.c:245
+#: src/mainwindow.c:718 src/messageview.c:250
 msgid "/_Message/Repl_y to/_all"
 msgstr "/郵件(_M)/回覆給(_Y)/所有收件人(_A)"
 
-#: src/mainwindow.c:710 src/messageview.c:247
+#: src/mainwindow.c:719 src/messageview.c:252
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/郵件(_M)/回覆給(_Y)/原作者(_S)"
 
-#: src/mainwindow.c:711 src/messageview.c:249
+#: src/mainwindow.c:720 src/messageview.c:254
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/郵件(_M)/回覆給(_Y)/郵遞論壇(_L)"
 
-#: src/mainwindow.c:714 src/messageview.c:252
+#: src/mainwindow.c:723 src/messageview.c:257
 msgid "/_Message/_Forward"
 msgstr "/郵件(_M)/轉寄(_F)"
 
-#: src/mainwindow.c:715 src/messageview.c:253
+#: src/mainwindow.c:724 src/messageview.c:258
 msgid "/_Message/For_ward as attachment"
 msgstr "/郵件(_M)/將郵件當成附加檔轉寄(_W)"
 
-#: src/mainwindow.c:717 src/messageview.c:255
+#: src/mainwindow.c:726 src/messageview.c:260
 msgid "/_Message/Redirec_t"
 msgstr "/郵件(_M)/郵件導向(_T)"
 
-#: src/mainwindow.c:719
+#: src/mainwindow.c:728
 msgid "/_Message/M_ove..."
 msgstr "/郵件(_M)/移動(_O)..."
 
-#: src/mainwindow.c:720
+#: src/mainwindow.c:729
 msgid "/_Message/_Copy..."
 msgstr "/郵件(_M)/複製(_C)..."
 
-#: src/mainwindow.c:722
+#: src/mainwindow.c:731
 msgid "/_Message/_Mark"
 msgstr "/郵件(_M)/標記(_M)"
 
-#: src/mainwindow.c:723
+#: src/mainwindow.c:732
 msgid "/_Message/_Mark/_Mark"
 msgstr "/郵件(_M)/標記(_M)/標記(_M)"
 
-#: src/mainwindow.c:724
+#: src/mainwindow.c:733
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/郵件(_M)/標記(_M)/去除標記(_U)"
 
-#: src/mainwindow.c:725
+#: src/mainwindow.c:734
 msgid "/_Message/_Mark/---"
 msgstr "/郵件(_M)/標記(_M)/---"
 
-#: src/mainwindow.c:726
+#: src/mainwindow.c:735
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/郵件(_M)/標記(_M)/標記成未讀(_E)"
 
-#: src/mainwindow.c:727
+#: src/mainwindow.c:736
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/郵件(_M)/標記(_M)/標記成已讀(_D)"
 
-#: src/mainwindow.c:729
+#: src/mainwindow.c:738
+#, fuzzy
+msgid "/_Message/_Mark/Mark _thread as read"
+msgstr "/郵件(_M)/標記(_M)/標記成已讀(_D)"
+
+#: src/mainwindow.c:740
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/郵件(_M)/標記(_M)/標記所有郵件成已讀(_D)"
 
-#: src/mainwindow.c:731
+#: src/mainwindow.c:742
 msgid "/_Message/_Delete"
 msgstr "/郵件(_M)/刪除(_D)"
 
-#: src/mainwindow.c:733
+#: src/mainwindow.c:744
 msgid "/_Message/Set as _junk mail"
 msgstr "/郵件(_M)/歸類為垃圾郵件(_J)"
 
-#: src/mainwindow.c:734
+#: src/mainwindow.c:745
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/郵件(_M)/歸類為非垃圾郵件(_U)"
 
-#: src/mainwindow.c:736 src/messageview.c:257
+#: src/mainwindow.c:747 src/messageview.c:262
 msgid "/_Message/Re-_edit"
 msgstr "/郵件(_M)/重新編輯(_E)"
 
-#: src/mainwindow.c:740
+#: src/mainwindow.c:751
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/工具(_T)/將寄信人加入通訊錄(_K)..."
 
-#: src/mainwindow.c:743
+#: src/mainwindow.c:754
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/工具(_T)/過濾資料夾中所有郵件(_F)"
 
-#: src/mainwindow.c:745
+#: src/mainwindow.c:756
 msgid "/_Tools/Filter _selected messages"
 msgstr "/工具(_T)/過濾選擇的郵件(_F)"
 
-#: src/mainwindow.c:747 src/messageview.c:264
+#: src/mainwindow.c:758 src/messageview.c:269
 msgid "/_Tools/_Create filter rule"
 msgstr "/工具(_T)/產生郵件過濾規則(_C)"
 
-#: src/mainwindow.c:748 src/messageview.c:266
+#: src/mainwindow.c:759 src/messageview.c:271
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/工具(_T)/產生郵件過濾規則(_C)/自動產生"
 
-#: src/mainwindow.c:750 src/messageview.c:268
+#: src/mainwindow.c:761 src/messageview.c:273
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/工具(_T)/產生郵件過濾規則(_C)/依來源(_F)"
 
-#: src/mainwindow.c:752 src/messageview.c:270
+#: src/mainwindow.c:763 src/messageview.c:275
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/工具(_T)/產生郵件過濾規則(_C)/依收信人(_T)"
 
-#: src/mainwindow.c:754 src/messageview.c:272
+#: src/mainwindow.c:765 src/messageview.c:277
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/工具(_T)/產生郵件過濾規則(_C)/依主旨(_S)"
 
-#: src/mainwindow.c:757
+#: src/mainwindow.c:768
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/工具(_T)/過濾資料夾中所有垃圾郵件(_J)"
 
-#: src/mainwindow.c:759
+#: src/mainwindow.c:770
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/工具(_T)/過濾選擇的郵件中所有垃圾郵件(_M)"
 
-#: src/mainwindow.c:764
+#: src/mainwindow.c:775
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/工具(_T)/刪除重覆的郵件(_P)"
 
-#: src/mainwindow.c:767
+#: src/mainwindow.c:778
 msgid "/_Tools/E_xecute"
 msgstr "/工具(_T)/執行(_X)"
 
-#: src/mainwindow.c:769
+#: src/mainwindow.c:780
 msgid "/_Tools/_Log window"
 msgstr "/工具(_T)/紀錄視窗(_L)"
 
-#: src/mainwindow.c:771
+#: src/mainwindow.c:782
 msgid "/_Configuration"
 msgstr "/設定(_C)"
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:783
 msgid "/_Configuration/_Common preferences..."
 msgstr "/設定(_C)/一般設定(_C)..."
 
-#: src/mainwindow.c:774
+#: src/mainwindow.c:785
 msgid "/_Configuration/_Filter setting..."
 msgstr "/設定(_C)/郵件過濾設定(_F)..."
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:787
 msgid "/_Configuration/_Template..."
 msgstr "/設定(_C)/郵件樣板設定(_T)..."
 
-#: src/mainwindow.c:777
+#: src/mainwindow.c:788
 msgid "/_Configuration/_Actions..."
 msgstr "/設定(_C)/外部指令設定(_A)..."
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:789
 msgid "/_Configuration/---"
 msgstr "/設定(_C)/---"
 
-#: src/mainwindow.c:779
+#: src/mainwindow.c:790
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/設定(_C)/目前帳號設定(_P)..."
 
-#: src/mainwindow.c:781
+#: src/mainwindow.c:792
 msgid "/_Configuration/Create _new account..."
 msgstr "/設定(_C)/新增帳號(_N)..."
 
-#: src/mainwindow.c:783
+#: src/mainwindow.c:794
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/設定(_C)/編輯帳號(_E)..."
 
-#: src/mainwindow.c:785
+#: src/mainwindow.c:796
 msgid "/_Configuration/C_hange current account"
 msgstr "/設定(_C)/改變現有帳號(_H)"
 
-#: src/mainwindow.c:789
+#: src/mainwindow.c:800
 msgid "/_Help/_Manual"
 msgstr "/說明(_H)/說明文件(_M)"
 
-#: src/mainwindow.c:790
+#: src/mainwindow.c:801
 msgid "/_Help/_Manual/_English"
 msgstr "/說明(_H)/說明文件(_M)/英文(_E)"
 
-#: src/mainwindow.c:791
+#: src/mainwindow.c:802
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/說明(_H)/說明文件(_M)/日文(_J)"
 
-#: src/mainwindow.c:792
+#: src/mainwindow.c:803
 msgid "/_Help/_FAQ"
 msgstr "/說明(_H)/常問問題解答(_F)"
 
-#: src/mainwindow.c:793
+#: src/mainwindow.c:804
 msgid "/_Help/_FAQ/_English"
 msgstr "/說明(_H)/常問問題解答(_F)/英文(_E)"
 
-#: src/mainwindow.c:794
+#: src/mainwindow.c:805
 msgid "/_Help/_FAQ/_German"
 msgstr "/說明(_H)/常問問題解答(_F)/德文(_G)"
 
-#: src/mainwindow.c:795
+#: src/mainwindow.c:806
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/說明(_H)/常問問題解答(_F)/西班牙文(_S)"
 
-#: src/mainwindow.c:796
+#: src/mainwindow.c:807
 msgid "/_Help/_FAQ/_French"
 msgstr "/說明(_H)/常問問題解答(_F)/法文(_F)"
 
-#: src/mainwindow.c:797
+#: src/mainwindow.c:808
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/說明(_H)/常問問題解答(_F)/義大利文(_I)"
 
-#: src/mainwindow.c:798
+#: src/mainwindow.c:809
 msgid "/_Help/---"
 msgstr "/說明(_H)/---"
 
-#: src/mainwindow.c:841
+#: src/mainwindow.c:852
 msgid "Creating main window...\n"
 msgstr "建立主視窗...\n"
 
-#: src/mainwindow.c:1011
+#: src/mainwindow.c:1022
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "主視窗：顏色 %d 配置失敗。\n"
 
-#: src/mainwindow.c:1108 src/summaryview.c:2258 src/summaryview.c:2343
-#: src/summaryview.c:3739 src/summaryview.c:3868 src/summaryview.c:4226
+#: src/mainwindow.c:1119 src/summaryview.c:2275 src/summaryview.c:2360
+#: src/summaryview.c:3896 src/summaryview.c:4025 src/summaryview.c:4383
 msgid "done.\n"
 msgstr "完成。\n"
 
-#: src/mainwindow.c:1235 src/mainwindow.c:1276 src/mainwindow.c:1301
+#: src/mainwindow.c:1246 src/mainwindow.c:1287 src/mainwindow.c:1312
 msgid "Untitled"
 msgstr "無標題"
 
-#: src/mainwindow.c:1302
+#: src/mainwindow.c:1313
 msgid "none"
 msgstr "無"
 
-#: src/mainwindow.c:1355
+#: src/mainwindow.c:1366
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "正在變更視窗分割類型由 %d 到 %d\n"
 
-#: src/mainwindow.c:1605
+#: src/mainwindow.c:1616
 msgid "Offline"
 msgstr "離線"
 
-#: src/mainwindow.c:1606
+#: src/mainwindow.c:1617
 msgid "You are offline. Go online?"
 msgstr "您目前正離線中。要連線嗎？"
 
-#: src/mainwindow.c:1623
+#: src/mainwindow.c:1634
 msgid "Empty all trash"
 msgstr "清空刪除的郵件"
 
-#: src/mainwindow.c:1624
+#: src/mainwindow.c:1635
 msgid "Delete all messages in trash folders?"
 msgstr "您確定要清除所有被刪除的郵件？"
 
-#: src/mainwindow.c:1652
+#: src/mainwindow.c:1663
 msgid "Add mailbox"
 msgstr "新增信箱"
 
-#: src/mainwindow.c:1653
+#: src/mainwindow.c:1664
 msgid ""
 "Specify the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3565,16 +3581,16 @@ msgstr ""
 "並請注意不要輸入已存在的信箱名稱，\n"
 "系統會自動判別是否它已存在。"
 
-#: src/mainwindow.c:1659 src/setup.c:49
+#: src/mainwindow.c:1670 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "信箱「%s」已存在。"
 
-#: src/mainwindow.c:1664 src/setup.c:56
+#: src/mainwindow.c:1675 src/setup.c:56
 msgid "Mailbox"
 msgstr "信箱"
 
-#: src/mainwindow.c:1670 src/setup.c:62
+#: src/mainwindow.c:1681 src/setup.c:62
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3583,145 +3599,145 @@ msgstr ""
 "無法產生信箱目錄。\n"
 "可能是因為同樣名稱的檔案已經存在，或者是你沒有權限可以開新目錄。"
 
-#: src/mainwindow.c:2088
+#: src/mainwindow.c:2099
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - 資料夾檢視"
 
-#: src/mainwindow.c:2107
+#: src/mainwindow.c:2118
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - 郵件列表"
 
-#: src/mainwindow.c:2259 src/summaryview.c:408
+#: src/mainwindow.c:2270 src/summaryview.c:408
 msgid "/_Reply"
 msgstr "/直接回覆(_R)"
 
-#: src/mainwindow.c:2260
+#: src/mainwindow.c:2271
 msgid "/Reply to _all"
 msgstr "/全部回覆(_A)"
 
-#: src/mainwindow.c:2261
+#: src/mainwindow.c:2272
 msgid "/Reply to _sender"
 msgstr "/回覆給原作者(_S)"
 
-#: src/mainwindow.c:2262
+#: src/mainwindow.c:2273
 msgid "/Reply to mailing _list"
 msgstr "/回覆到郵遞論壇(_L)"
 
-#: src/mainwindow.c:2267 src/summaryview.c:415
+#: src/mainwindow.c:2278 src/summaryview.c:415
 msgid "/_Forward"
 msgstr "/轉寄(_F)"
 
-#: src/mainwindow.c:2268 src/summaryview.c:416
+#: src/mainwindow.c:2279 src/summaryview.c:416
 msgid "/For_ward as attachment"
 msgstr "/將郵件當成附加檔轉寄(_W)"
 
-#: src/mainwindow.c:2269 src/summaryview.c:417
+#: src/mainwindow.c:2280 src/summaryview.c:417
 msgid "/Redirec_t"
 msgstr "/郵件導向(_T)"
 
-#: src/mainwindow.c:2305
+#: src/mainwindow.c:2316
 msgid "Get"
 msgstr "檢查郵件"
 
-#: src/mainwindow.c:2306
+#: src/mainwindow.c:2317
 msgid "Incorporate new mail"
 msgstr "檢查目前帳號的新郵件"
 
-#: src/mainwindow.c:2313
+#: src/mainwindow.c:2324
 msgid "Get all"
 msgstr "全部檢查"
 
-#: src/mainwindow.c:2314
+#: src/mainwindow.c:2325
 msgid "Incorporate new mail of all accounts"
 msgstr "檢查所有帳號的新郵件"
 
-#: src/mainwindow.c:2325
+#: src/mainwindow.c:2336
 msgid "Send queued message(s)"
 msgstr "將暫存資料夾中的郵件送出"
 
-#: src/mainwindow.c:2335 src/prefs_account_dialog.c:530
+#: src/mainwindow.c:2346 src/prefs_account_dialog.c:530
 #: src/prefs_common_dialog.c:663 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "撰寫郵件"
 
-#: src/mainwindow.c:2336
+#: src/mainwindow.c:2347
 msgid "Compose new message"
 msgstr "編輯新郵件"
 
-#: src/mainwindow.c:2344 src/prefs_common_dialog.c:975
+#: src/mainwindow.c:2355 src/prefs_common_dialog.c:975
 msgid "Reply"
 msgstr "回覆"
 
-#: src/mainwindow.c:2345 src/mainwindow.c:2358
+#: src/mainwindow.c:2356 src/mainwindow.c:2369
 msgid "Reply to the message"
 msgstr "回覆郵件"
 
-#: src/mainwindow.c:2362
+#: src/mainwindow.c:2373
 msgid "Reply all"
 msgstr "全部回覆"
 
-#: src/mainwindow.c:2363
+#: src/mainwindow.c:2374
 msgid "Reply to all"
 msgstr "全部回覆"
 
-#: src/mainwindow.c:2371 src/prefs_filter_edit.c:672
+#: src/mainwindow.c:2382 src/prefs_filter_edit.c:672
 msgid "Forward"
 msgstr "轉寄"
 
-#: src/mainwindow.c:2372 src/mainwindow.c:2385
+#: src/mainwindow.c:2383 src/mainwindow.c:2396
 msgid "Forward the message"
 msgstr "轉寄郵件"
 
-#: src/mainwindow.c:2392
+#: src/mainwindow.c:2403
 msgid "Delete the message"
 msgstr "刪除郵件"
 
-#: src/mainwindow.c:2401
+#: src/mainwindow.c:2412
 msgid "Set as junk mail"
 msgstr "歸類為垃圾郵件"
 
-#: src/mainwindow.c:2410
+#: src/mainwindow.c:2421
 msgid "Execute"
 msgstr "執行"
 
-#: src/mainwindow.c:2411
+#: src/mainwindow.c:2422
 msgid "Execute marked process"
 msgstr "執行標記的行程"
 
-#: src/mainwindow.c:2421
+#: src/mainwindow.c:2432
 msgid "Next unread message"
 msgstr "下一封未讀郵件"
 
-#: src/mainwindow.c:2433
+#: src/mainwindow.c:2444
 msgid "Prefs"
 msgstr "設定"
 
-#: src/mainwindow.c:2434
+#: src/mainwindow.c:2445
 msgid "Common preferences"
 msgstr "一般設定"
 
-#: src/mainwindow.c:2442 src/prefs_folder_item.c:289
+#: src/mainwindow.c:2453 src/prefs_folder_item.c:289
 #: src/prefs_folder_item.c:300 src/progressdialog.c:128
 msgid "Account"
 msgstr "帳號"
 
-#: src/mainwindow.c:2443
+#: src/mainwindow.c:2454
 msgid "Account setting"
 msgstr "帳號設定"
 
-#: src/mainwindow.c:2615
+#: src/mainwindow.c:2626
 msgid "You are offline. Click the icon to go online."
 msgstr "您目前正離線中。按下按鈕恢復連線。"
 
-#: src/mainwindow.c:2626
+#: src/mainwindow.c:2637
 msgid "You are online. Click the icon to go offline."
 msgstr "您目前正連線中。按下按鈕離線工作。"
 
-#: src/mainwindow.c:2892
+#: src/mainwindow.c:2903
 msgid "Exit"
 msgstr "離開"
 
-#: src/mainwindow.c:2892
+#: src/mainwindow.c:2903
 msgid "Exit this program?"
 msgstr "您確定要離開嗎？"
 
@@ -3758,45 +3774,45 @@ msgstr "搜尋已到尾端。要從頂端繼續搜尋嗎？"
 msgid "Search finished"
 msgstr "搜尋結束"
 
-#: src/messageview.c:261
+#: src/messageview.c:266
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/工具(_T)/將寄信人加入通訊錄(_K)"
 
-#: src/messageview.c:291
+#: src/messageview.c:296
 msgid "Creating message view...\n"
 msgstr "產生郵件視窗...\n"
 
-#: src/messageview.c:316
+#: src/messageview.c:321
 msgid "Text"
 msgstr "文字"
 
-#: src/messageview.c:321
+#: src/messageview.c:326
 msgid "Attachments"
 msgstr "附加檔"
 
-#: src/messageview.c:371
+#: src/messageview.c:376
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:669 src/summaryview.c:3268
+#: src/messageview.c:674 src/summaryview.c:3425
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "無法儲存檔案「%s」。"
 
-#: src/messageview.c:728 src/summaryview.c:3291
+#: src/messageview.c:733 src/summaryview.c:3448
 msgid "The message will be printed with the following command:"
 msgstr ""
 
-#: src/messageview.c:729 src/summaryview.c:3292
+#: src/messageview.c:734 src/summaryview.c:3449
 #, fuzzy
 msgid "(Default print command)"
 msgstr "正在學習命令:"
 
-#: src/messageview.c:731 src/prefs_common_dialog.c:2304 src/summaryview.c:3294
+#: src/messageview.c:736 src/prefs_common_dialog.c:2304 src/summaryview.c:3451
 msgid "Print"
 msgstr "列印"
 
-#: src/messageview.c:740 src/summaryview.c:3303
+#: src/messageview.c:745 src/summaryview.c:3460
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -4682,8 +4698,8 @@ msgstr "若發信人是你自己，就在郵件列表的來源中顯示收信人
 msgid "Expand threads"
 msgstr "自動展開郵件串列"
 
-#: src/prefs_common_dialog.c:1413 src/prefs_common_dialog.c:2713
-#: src/prefs_common_dialog.c:2751
+#: src/prefs_common_dialog.c:1413 src/prefs_common_dialog.c:2716
+#: src/prefs_common_dialog.c:2754
 msgid "Date format"
 msgstr "日期格式"
 
@@ -4966,8 +4982,8 @@ msgstr "外部指令（%s 將會被置換成檔名或 URI）"
 msgid "Web browser"
 msgstr "瀏覽器"
 
-#: src/prefs_common_dialog.c:2288 src/prefs_common_dialog.c:3775
-#: src/prefs_common_dialog.c:3796
+#: src/prefs_common_dialog.c:2288 src/prefs_common_dialog.c:3778
+#: src/prefs_common_dialog.c:3799
 msgid "(Default browser)"
 msgstr "(預設的瀏覽器)"
 
@@ -5042,214 +5058,224 @@ msgid "Greek (ISO-8859-7)"
 msgstr "希臘語 (ISO-8859-7)"
 
 #: src/prefs_common_dialog.c:2495
+#, fuzzy
+msgid "Arabic (ISO-8859-6)"
+msgstr "波羅的海語系 (ISO-8859-4)"
+
+#: src/prefs_common_dialog.c:2496
+#, fuzzy
+msgid "Arabic (Windows-1256)"
+msgstr "斯拉夫語 (Windows-1251)"
+
+#: src/prefs_common_dialog.c:2498
 msgid "Hebrew (ISO-8859-8)"
 msgstr "希伯來語 (ISO-8859-8)"
 
-#: src/prefs_common_dialog.c:2496
+#: src/prefs_common_dialog.c:2499
 msgid "Hebrew (Windows-1255)"
 msgstr "希伯來語 (Windows-1255)"
 
-#: src/prefs_common_dialog.c:2498
+#: src/prefs_common_dialog.c:2501
 msgid "Turkish (ISO-8859-9)"
 msgstr "土耳其語 (ISO-8859-9)"
 
-#: src/prefs_common_dialog.c:2500
+#: src/prefs_common_dialog.c:2503
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "斯拉夫語 (ISO-8859-5)"
 
-#: src/prefs_common_dialog.c:2501
+#: src/prefs_common_dialog.c:2504
 msgid "Cyrillic (KOI8-R)"
 msgstr "斯拉夫語 (KOI8-R)"
 
-#: src/prefs_common_dialog.c:2502
+#: src/prefs_common_dialog.c:2505
 msgid "Cyrillic (KOI8-U)"
 msgstr "斯拉夫語 (KOI8-U)"
 
-#: src/prefs_common_dialog.c:2503
+#: src/prefs_common_dialog.c:2506
 msgid "Cyrillic (Windows-1251)"
 msgstr "斯拉夫語 (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2505
+#: src/prefs_common_dialog.c:2508
 msgid "Japanese (ISO-2022-JP)"
 msgstr "日文 (ISO-2022-JP)"
 
-#: src/prefs_common_dialog.c:2507
+#: src/prefs_common_dialog.c:2510
 msgid "Japanese (EUC-JP)"
 msgstr "日文 (EUC-JP)"
 
-#: src/prefs_common_dialog.c:2508
+#: src/prefs_common_dialog.c:2511
 msgid "Japanese (Shift_JIS)"
 msgstr "日文 (Shift_JIS)"
 
-#: src/prefs_common_dialog.c:2511
+#: src/prefs_common_dialog.c:2514
 msgid "Simplified Chinese (GB2312)"
 msgstr "簡體中文 (GB2312)"
 
-#: src/prefs_common_dialog.c:2512
+#: src/prefs_common_dialog.c:2515
 msgid "Simplified Chinese (GBK)"
 msgstr "簡體中文 (GBK)"
 
-#: src/prefs_common_dialog.c:2513
+#: src/prefs_common_dialog.c:2516
 msgid "Traditional Chinese (Big5)"
 msgstr "繁體中文 (Big5)"
 
-#: src/prefs_common_dialog.c:2515
+#: src/prefs_common_dialog.c:2518
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "繁體中文 (EUC-TW)"
 
-#: src/prefs_common_dialog.c:2516
+#: src/prefs_common_dialog.c:2519
 msgid "Chinese (ISO-2022-CN)"
 msgstr "中文 (ISO-2022-CN)"
 
-#: src/prefs_common_dialog.c:2519
+#: src/prefs_common_dialog.c:2522
 msgid "Korean (EUC-KR)"
 msgstr "韓文 (EUC-KR)"
 
-#: src/prefs_common_dialog.c:2521
+#: src/prefs_common_dialog.c:2524
 msgid "Thai (TIS-620)"
 msgstr "泰文 (TIS-620)"
 
-#: src/prefs_common_dialog.c:2522
+#: src/prefs_common_dialog.c:2525
 msgid "Thai (Windows-874)"
 msgstr "泰文 (Windows-874)"
 
-#: src/prefs_common_dialog.c:2689
+#: src/prefs_common_dialog.c:2692
 msgid "the full abbreviated weekday name"
 msgstr "週一、週二、..."
 
-#: src/prefs_common_dialog.c:2690
+#: src/prefs_common_dialog.c:2693
 msgid "the full weekday name"
 msgstr "星期一、星期二、..."
 
-#: src/prefs_common_dialog.c:2691
+#: src/prefs_common_dialog.c:2694
 msgid "the abbreviated month name"
 msgstr "1月、2月、..."
 
-#: src/prefs_common_dialog.c:2692
+#: src/prefs_common_dialog.c:2695
 msgid "the full month name"
 msgstr "一月、二月、..."
 
-#: src/prefs_common_dialog.c:2693
+#: src/prefs_common_dialog.c:2696
 msgid "the preferred date and time for the current locale"
 msgstr "目前語區設定所偏好的日期與時間"
 
-#: src/prefs_common_dialog.c:2694
+#: src/prefs_common_dialog.c:2697
 msgid "the century number (year/100)"
 msgstr "世紀 (年/100)"
 
-#: src/prefs_common_dialog.c:2695
+#: src/prefs_common_dialog.c:2698
 msgid "the day of the month as a decimal number"
 msgstr "今天是幾號 (以數字表示)"
 
-#: src/prefs_common_dialog.c:2696
+#: src/prefs_common_dialog.c:2699
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "現在幾點鐘 (廿四時制，以數字表示)"
 
-#: src/prefs_common_dialog.c:2697
+#: src/prefs_common_dialog.c:2700
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "現在幾點鐘 (十二時制，以數字表示)"
 
-#: src/prefs_common_dialog.c:2698
+#: src/prefs_common_dialog.c:2701
 msgid "the day of the year as a decimal number"
 msgstr "今天是今年的第幾天 (以數字表示)"
 
-#: src/prefs_common_dialog.c:2699
+#: src/prefs_common_dialog.c:2702
 msgid "the month as a decimal number"
 msgstr "現在是幾月 (以數字表示)"
 
-#: src/prefs_common_dialog.c:2700
+#: src/prefs_common_dialog.c:2703
 msgid "the minute as a decimal number"
 msgstr "現在是幾分 (以數字表示)"
 
-#: src/prefs_common_dialog.c:2701
+#: src/prefs_common_dialog.c:2704
 msgid "either AM or PM"
 msgstr "上午或下午"
 
-#: src/prefs_common_dialog.c:2702
+#: src/prefs_common_dialog.c:2705
 msgid "the second as a decimal number"
 msgstr "現在是幾秒 (以數字表示)"
 
-#: src/prefs_common_dialog.c:2703
+#: src/prefs_common_dialog.c:2706
 msgid "the day of the week as a decimal number"
 msgstr "現在是一週的第幾天 (以數字表示)"
 
-#: src/prefs_common_dialog.c:2704
+#: src/prefs_common_dialog.c:2707
 msgid "the preferred date for the current locale"
 msgstr "目前語區設定所偏好的日期"
 
-#: src/prefs_common_dialog.c:2705
+#: src/prefs_common_dialog.c:2708
 msgid "the last two digits of a year"
 msgstr "公元年份的後兩位數字"
 
-#: src/prefs_common_dialog.c:2706
+#: src/prefs_common_dialog.c:2709
 msgid "the year as a decimal number"
 msgstr "公元年份 (以數字表示)"
 
-#: src/prefs_common_dialog.c:2707
+#: src/prefs_common_dialog.c:2710
 msgid "the time zone or name or abbreviation"
 msgstr "時區名稱或縮寫"
 
-#: src/prefs_common_dialog.c:2728
+#: src/prefs_common_dialog.c:2731
 msgid "Specifier"
 msgstr "特殊符號"
 
-#: src/prefs_common_dialog.c:2729
+#: src/prefs_common_dialog.c:2732
 msgid "Description"
 msgstr "描述"
 
-#: src/prefs_common_dialog.c:2769
+#: src/prefs_common_dialog.c:2772
 msgid "Example"
 msgstr "範例"
 
-#: src/prefs_common_dialog.c:2850
+#: src/prefs_common_dialog.c:2853
 msgid "Set message colors"
 msgstr "設定顏色"
 
-#: src/prefs_common_dialog.c:2858
+#: src/prefs_common_dialog.c:2861
 msgid "Colors"
 msgstr "顏色"
 
-#: src/prefs_common_dialog.c:2892
+#: src/prefs_common_dialog.c:2895
 msgid "Quoted Text - First Level"
 msgstr "引言內容 - 第一層"
 
-#: src/prefs_common_dialog.c:2898
+#: src/prefs_common_dialog.c:2901
 msgid "Quoted Text - Second Level"
 msgstr "引言內容 - 第二層"
 
-#: src/prefs_common_dialog.c:2904
+#: src/prefs_common_dialog.c:2907
 msgid "Quoted Text - Third Level"
 msgstr "引言內容 - 第三層"
 
-#: src/prefs_common_dialog.c:2910
+#: src/prefs_common_dialog.c:2913
 msgid "URI link"
 msgstr "超連結"
 
-#: src/prefs_common_dialog.c:2917
+#: src/prefs_common_dialog.c:2920
 msgid "Recycle quote colors"
 msgstr "三層以上引言則重複使用指定的顏色"
 
-#: src/prefs_common_dialog.c:2984
+#: src/prefs_common_dialog.c:2987
 msgid "Pick color for quotation level 1"
 msgstr "選擇第一層引言的顏色"
 
-#: src/prefs_common_dialog.c:2987
+#: src/prefs_common_dialog.c:2990
 msgid "Pick color for quotation level 2"
 msgstr "選擇第二層引言的顏色"
 
-#: src/prefs_common_dialog.c:2990
+#: src/prefs_common_dialog.c:2993
 msgid "Pick color for quotation level 3"
 msgstr "選擇第三層引言的顏色"
 
-#: src/prefs_common_dialog.c:2993
+#: src/prefs_common_dialog.c:2996
 msgid "Pick color for URI"
 msgstr "選擇超連結的顏色"
 
-#: src/prefs_common_dialog.c:3133
+#: src/prefs_common_dialog.c:3136
 msgid "Description of symbols"
 msgstr "特殊符號代表的意義"
 
-#: src/prefs_common_dialog.c:3189
+#: src/prefs_common_dialog.c:3192
 msgid ""
 "Date\n"
 "From\n"
@@ -5273,11 +5299,11 @@ msgstr ""
 "新聞群組\n"
 "郵件識別碼"
 
-#: src/prefs_common_dialog.c:3202
+#: src/prefs_common_dialog.c:3205
 msgid "If x is set, displays expr"
 msgstr "若 x 已設定則顯示正規表示式"
 
-#: src/prefs_common_dialog.c:3206
+#: src/prefs_common_dialog.c:3209
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -5291,7 +5317,7 @@ msgstr ""
 "引言（不含簽章）\n"
 "% 符號"
 
-#: src/prefs_common_dialog.c:3214
+#: src/prefs_common_dialog.c:3217
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -5303,19 +5329,19 @@ msgstr ""
 "左大括弧\n"
 "右大括弧"
 
-#: src/prefs_common_dialog.c:3260
+#: src/prefs_common_dialog.c:3263
 msgid "Key bindings"
 msgstr "熱鍵設定"
 
-#: src/prefs_common_dialog.c:3273
+#: src/prefs_common_dialog.c:3276
 msgid "Select the preset of key bindings."
 msgstr "選擇事先設定的按鍵組合。"
 
-#: src/prefs_common_dialog.c:3283 src/prefs_common_dialog.c:3607
+#: src/prefs_common_dialog.c:3286 src/prefs_common_dialog.c:3610
 msgid "Default"
 msgstr "預設值"
 
-#: src/prefs_common_dialog.c:3286 src/prefs_common_dialog.c:3616
+#: src/prefs_common_dialog.c:3289 src/prefs_common_dialog.c:3619
 msgid "Old Sylpheed"
 msgstr "舊設定"
 
@@ -5436,7 +5462,7 @@ msgstr "執行結果"
 msgid "Age"
 msgstr "時效"
 
-#: src/prefs_filter_edit.c:501 src/summaryview.c:510
+#: src/prefs_filter_edit.c:501 src/summaryview.c:512
 #, fuzzy
 msgid "Marked"
 msgstr "標記"
@@ -5666,17 +5692,17 @@ msgid "Attachment"
 msgstr "附加檔案"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73 src/query_search.c:371 src/summaryview.c:4733
+#: src/prefs_summary_column.c:73 src/query_search.c:371 src/summaryview.c:4890
 msgid "Subject"
 msgstr "主旨"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/query_search.c:372 src/summaryview.c:4736
+#: src/prefs_summary_column.c:74 src/query_search.c:372 src/summaryview.c:4893
 msgid "From"
 msgstr "來源"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/query_search.c:373 src/summaryview.c:4738
+#: src/prefs_summary_column.c:75 src/query_search.c:373 src/summaryview.c:4895
 msgid "Date"
 msgstr "日期"
 
@@ -5778,7 +5804,7 @@ msgstr "尋找郵件(_S)"
 msgid "_Save as search folder"
 msgstr "儲存至草稿資料夾"
 
-#: src/query_search.c:512 src/subscribedialog.c:523 src/summaryview.c:840
+#: src/query_search.c:512 src/subscribedialog.c:523 src/summaryview.c:842
 msgid "Done."
 msgstr "完成"
 
@@ -5792,7 +5818,7 @@ msgstr "掃描資料夾 %s ..."
 msgid "Searching %s (%d / %d)..."
 msgstr "過濾中..."
 
-#: src/query_search.c:645 src/summaryview.c:2048
+#: src/query_search.c:645 src/summaryview.c:2051
 msgid "(No Date)"
 msgstr "(沒有日期)"
 
@@ -6164,301 +6190,306 @@ msgid "/_Mark/Mark as rea_d"
 msgstr "/標記(_M)/標記成已讀(_D)"
 
 #: src/summaryview.c:429
+#, fuzzy
+msgid "/_Mark/Mark _thread as read"
+msgstr "/標記(_M)/標記成已讀(_D)"
+
+#: src/summaryview.c:431
 msgid "/_Mark/Mark all _read"
 msgstr "/標記(_M)/標記所有郵件成已讀(_R)"
 
-#: src/summaryview.c:430
+#: src/summaryview.c:432
 msgid "/Color la_bel"
 msgstr "/以顏色做標記(_B)"
 
-#: src/summaryview.c:434
+#: src/summaryview.c:436
 msgid "/Re-_edit"
 msgstr "/重新編輯(_E)"
 
-#: src/summaryview.c:436
+#: src/summaryview.c:438
 msgid "/Add sender to address boo_k..."
 msgstr "/將寄信人加入通訊錄(_K)..."
 
-#: src/summaryview.c:438
+#: src/summaryview.c:440
 msgid "/Create f_ilter rule"
 msgstr "/產生郵件過濾規則(_I)"
 
-#: src/summaryview.c:439
+#: src/summaryview.c:441
 msgid "/Create f_ilter rule/_Automatically"
 msgstr "/產生郵件過濾規則(_I)/自動產生(_A)"
 
-#: src/summaryview.c:441
+#: src/summaryview.c:443
 msgid "/Create f_ilter rule/by _From"
 msgstr "/產生郵件過濾規則(_I)/依來源(_F)"
 
-#: src/summaryview.c:443
+#: src/summaryview.c:445
 msgid "/Create f_ilter rule/by _To"
 msgstr "/產生郵件過濾規則(_I)/依收信人(_T)"
 
-#: src/summaryview.c:445
+#: src/summaryview.c:447
 msgid "/Create f_ilter rule/by _Subject"
 msgstr "/產生郵件過濾規則(_I)/依主旨(_S)"
 
-#: src/summaryview.c:451
+#: src/summaryview.c:453
 msgid "/_View/_Source"
 msgstr "/顯示(_V)/觀看郵件原始碼(_S)"
 
-#: src/summaryview.c:452
+#: src/summaryview.c:454
 msgid "/_View/All _header"
 msgstr "/顯示(_V)/顯示所有的標頭(_H)"
 
-#: src/summaryview.c:454
+#: src/summaryview.c:456
 msgid "/_Print..."
 msgstr "/列印(_P)..."
 
-#: src/summaryview.c:486
+#: src/summaryview.c:488
 msgid "Creating summary view...\n"
 msgstr "正在建立彙總檢視...\n"
 
-#: src/summaryview.c:508
+#: src/summaryview.c:510
 msgid "All"
 msgstr ""
 
-#: src/summaryview.c:511
+#: src/summaryview.c:513
 #, fuzzy
 msgid "Have color label"
 msgstr "/以顏色做標記(_B)"
 
-#: src/summaryview.c:512
+#: src/summaryview.c:514
 #, fuzzy
 msgid "Have attachment"
 msgstr "附加檔案"
 
-#: src/summaryview.c:521
+#: src/summaryview.c:523
 #, fuzzy
 msgid "Search:"
 msgstr "尋找"
 
-#: src/summaryview.c:535
+#: src/summaryview.c:537
 msgid "Search for Subject or From"
 msgstr ""
 
-#: src/summaryview.c:702
+#: src/summaryview.c:704
 msgid "Process mark"
 msgstr "郵件標記"
 
-#: src/summaryview.c:703
+#: src/summaryview.c:705
 msgid "Some marks are left. Process it?"
 msgstr "某些郵件已被標記。要繼續嗎？"
 
-#: src/summaryview.c:749
+#: src/summaryview.c:751
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "掃描資料夾 (%s)..."
 
-#: src/summaryview.c:1292
+#: src/summaryview.c:1295
 msgid "_Search again"
 msgstr "再次搜尋(_S)"
 
-#: src/summaryview.c:1313 src/summaryview.c:1322
+#: src/summaryview.c:1316 src/summaryview.c:1325
 msgid "No more unread messages"
 msgstr "沒有其他未讀郵件"
 
-#: src/summaryview.c:1314
+#: src/summaryview.c:1317
 msgid "No unread message found. Search from the end?"
 msgstr "沒有找到未讀郵件。要從尾部繼續搜尋嗎？"
 
-#: src/summaryview.c:1316
+#: src/summaryview.c:1319
 msgid "No unread messages."
 msgstr "沒有未讀郵件。"
 
-#: src/summaryview.c:1323
+#: src/summaryview.c:1326
 msgid "No unread message found. Go to next folder?"
 msgstr "沒有未讀郵件。要到下一個資料夾嗎？"
 
-#: src/summaryview.c:1331 src/summaryview.c:1340
+#: src/summaryview.c:1334 src/summaryview.c:1343
 msgid "No more new messages"
 msgstr "沒有其他新郵件"
 
-#: src/summaryview.c:1332
+#: src/summaryview.c:1335
 msgid "No new message found. Search from the end?"
 msgstr "沒有找到新郵件。要從尾部繼續搜尋嗎？"
 
-#: src/summaryview.c:1334
+#: src/summaryview.c:1337
 msgid "No new messages."
 msgstr "沒有新郵件。"
 
-#: src/summaryview.c:1341
+#: src/summaryview.c:1344
 msgid "No new message found. Go to next folder?"
 msgstr "沒有新郵件。要到下一個資料夾嗎？"
 
-#: src/summaryview.c:1349 src/summaryview.c:1358
+#: src/summaryview.c:1352 src/summaryview.c:1361
 msgid "No more marked messages"
 msgstr "沒有其他已標記郵件"
 
-#: src/summaryview.c:1350
+#: src/summaryview.c:1353
 msgid "No marked message found. Search from the end?"
 msgstr "沒有找到已標記郵件。要從尾部繼續搜尋嗎？"
 
-#: src/summaryview.c:1352 src/summaryview.c:1361
+#: src/summaryview.c:1355 src/summaryview.c:1364
 msgid "No marked messages."
 msgstr "沒有已標記郵件。"
 
-#: src/summaryview.c:1359
+#: src/summaryview.c:1362
 msgid "No marked message found. Search from the beginning?"
 msgstr "沒有找到已標記郵件。要從開頭繼續搜尋嗎？"
 
-#: src/summaryview.c:1367 src/summaryview.c:1376
+#: src/summaryview.c:1370 src/summaryview.c:1379
 msgid "No more labeled messages"
 msgstr "沒有已標記顏色之郵件"
 
-#: src/summaryview.c:1368
+#: src/summaryview.c:1371
 msgid "No labeled message found. Search from the end?"
 msgstr "沒有找到已標記顏色之郵件。要從尾部繼續搜尋嗎？"
 
-#: src/summaryview.c:1370 src/summaryview.c:1379
+#: src/summaryview.c:1373 src/summaryview.c:1382
 msgid "No labeled messages."
 msgstr "沒有已標記顏色之郵件。"
 
-#: src/summaryview.c:1377
+#: src/summaryview.c:1380
 msgid "No labeled message found. Search from the beginning?"
 msgstr "沒有找到已標記顏色之郵件。要從開頭繼續搜尋嗎？"
 
-#: src/summaryview.c:1693
+#: src/summaryview.c:1696
 msgid "Attracting messages by subject..."
 msgstr "依主旨展開郵件中..."
 
-#: src/summaryview.c:1887
+#: src/summaryview.c:1890
 #, c-format
 msgid "%d deleted"
 msgstr "%d 已刪除"
 
-#: src/summaryview.c:1891
+#: src/summaryview.c:1894
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d 已移動"
 
-#: src/summaryview.c:1892 src/summaryview.c:1897
+#: src/summaryview.c:1895 src/summaryview.c:1900
 msgid ", "
 msgstr "， "
 
-#: src/summaryview.c:1896
+#: src/summaryview.c:1899
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d 已複製"
 
-#: src/summaryview.c:1911
+#: src/summaryview.c:1914
 msgid " item(s) selected"
 msgstr " 封已選擇"
 
-#: src/summaryview.c:1933
+#: src/summaryview.c:1936
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d 封未讀，%d 封已讀，共 %d 封(%s)"
 
-#: src/summaryview.c:1937
+#: src/summaryview.c:1940
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d 封未讀，%d 封已讀，共 %d 封"
 
-#: src/summaryview.c:1971
+#: src/summaryview.c:1974
 msgid "Sorting summary..."
 msgstr "郵件排序中..."
 
-#: src/summaryview.c:2194
+#: src/summaryview.c:2211
 msgid "\tSetting summary from message data..."
 msgstr "\t產生郵件列表中..."
 
-#: src/summaryview.c:2196
+#: src/summaryview.c:2213
 msgid "Setting summary from message data..."
 msgstr "產生郵件列表中..."
 
-#: src/summaryview.c:2302
+#: src/summaryview.c:2319
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "寫入列表快取 (%s)..."
 
-#: src/summaryview.c:2643
+#: src/summaryview.c:2660
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "郵件 %d 已標記\n"
 
-#: src/summaryview.c:2701
+#: src/summaryview.c:2718
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "郵件 %d 已標記成已讀\n"
 
-#: src/summaryview.c:2789
+#: src/summaryview.c:2908
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "郵件 %d 已標記成未讀\n"
 
-#: src/summaryview.c:2850
+#: src/summaryview.c:2969
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "郵件 %s/%d 已標記刪除\n"
 
-#: src/summaryview.c:2878
+#: src/summaryview.c:2997
 msgid "Delete message(s)"
 msgstr "刪除郵件"
 
-#: src/summaryview.c:2879
+#: src/summaryview.c:2998
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "您確定要從刪除的郵件資料夾中刪除這封郵件嗎？"
 
-#: src/summaryview.c:2953
+#: src/summaryview.c:3072
 msgid "Deleting duplicated messages..."
 msgstr "刪除重覆的郵件..."
 
-#: src/summaryview.c:2991
+#: src/summaryview.c:3110
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "郵件 %s/%d 已消除標記\n"
 
-#: src/summaryview.c:3049
+#: src/summaryview.c:3168
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "郵件 %d 已設定移動到 %s\n"
 
-#: src/summaryview.c:3066
+#: src/summaryview.c:3196
 msgid "Destination is same as current folder."
 msgstr "目標資料夾與來源資料夾相同。"
 
-#: src/summaryview.c:3122
+#: src/summaryview.c:3260
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "郵件 %d 已設定複製到 %s\n"
 
-#: src/summaryview.c:3139
+#: src/summaryview.c:3288
 msgid "Destination for copy is same as current folder."
 msgstr "郵件無法複製到同一個資料夾內。"
 
-#: src/summaryview.c:3338
+#: src/summaryview.c:3495
 msgid "Error occurred while processing messages."
 msgstr "處理郵件時發生錯誤。"
 
-#: src/summaryview.c:3646 src/summaryview.c:3647
+#: src/summaryview.c:3803 src/summaryview.c:3804
 msgid "Building threads..."
 msgstr "產生郵件串列中..."
 
-#: src/summaryview.c:3797 src/summaryview.c:3798
+#: src/summaryview.c:3954 src/summaryview.c:3955
 msgid "Unthreading..."
 msgstr "解除郵件串列中..."
 
-#: src/summaryview.c:4091 src/summaryview.c:4147
+#: src/summaryview.c:4248 src/summaryview.c:4304
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "過濾中..."
 
-#: src/summaryview.c:4196
+#: src/summaryview.c:4353
 msgid "filtering..."
 msgstr "過濾中..."
 
-#: src/summaryview.c:4197
+#: src/summaryview.c:4354
 msgid "Filtering..."
 msgstr "過濾中..."
 
-#: src/summaryview.c:4233
+#: src/summaryview.c:4390
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "已過濾 %d 封郵件"
 
-#: src/summaryview.c:4742
+#: src/summaryview.c:4899
 msgid "No."
 msgstr "No."
 
@@ -6475,31 +6506,31 @@ msgstr "產生文字視窗...\n"
 msgid "This message can't be displayed.\n"
 msgstr "無法顯示郵件。\n"
 
-#: src/textview.c:1929
+#: src/textview.c:1925
 msgid "Sa_ve this image as..."
 msgstr "圖片另存新檔(_V)..."
 
-#: src/textview.c:1945 src/trayicon.c:109
+#: src/textview.c:1941 src/trayicon.c:109
 msgid "Compose _new message"
 msgstr "編寫新郵件(_N)"
 
-#: src/textview.c:1947
+#: src/textview.c:1943
 msgid "Add to address _book..."
 msgstr "將寄信人加入通訊錄(_B)..."
 
-#: src/textview.c:1949
+#: src/textview.c:1945
 msgid "Copy this add_ress"
 msgstr "複製此通訊地址(_R)"
 
-#: src/textview.c:1952
+#: src/textview.c:1948
 msgid "_Open with Web browser"
 msgstr "以瀏覽器開啟(_O)"
 
-#: src/textview.c:1954
+#: src/textview.c:1950
 msgid "Copy this _link"
 msgstr "複製此連接(_L)"
 
-#: src/textview.c:2097
+#: src/textview.c:2093
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6511,7 +6542,7 @@ msgstr ""
 "\n"
 "確定要開啟嗎？"
 
-#: src/textview.c:2102
+#: src/textview.c:2098
 msgid "Fake URL warning"
 msgstr "假的 URL 警告訊息"