updated po files.

git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@1043 ee746299-78ed-0310-b773-934348b2243d
author: hiro <hiro@ee746299-78ed-0310-b773-934348b2243d> 2006-03-10 07:09:44 +0000
committer: hiro <hiro@ee746299-78ed-0310-b773-934348b2243d> 2006-03-10 07:09:44 +0000
commit: c00e8b05eaed1cc8bd3c330bad3b6db28851f65d (patch)
tree: ee64d26cc5ca3da1e782e6a784a2d93505fc7429
parent: dcae2789d1ffdd2bc4f1fc32a34789d64f4631f2 (diff)
29 files changed, 7853 insertions, 7856 deletions
diff --git a/po/bg.po b/po/bg.po
index 50a362de..9600915f 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-03-02 19:03+0900\n"
+"POT-Creation-Date: 2006-03-10 16:06+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:491
+#: libsylph/prefs_common.c:496
 #, fuzzy
 msgid "Junk mail filter"
 msgstr "Папка"
@@ -519,7 +519,7 @@ msgstr "не може да се отвори файлът с маркировк�
 msgid "can't fetch message %d\n"
 msgstr "не може да се вземе съобщението %d\n"
 
-#: libsylph/procmsg.c:1375
+#: libsylph/procmsg.c:1378
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Невалиден команден ред за печат: `%s'\n"
@@ -597,12 +597,12 @@ msgstr "  Субект: %s\n"
 msgid "  Issuer: %s\n"
 msgstr "  Издател: %s\n"
 
-#: libsylph/utils.c:2411 src/compose.c:2869 src/compose.c:3132
-#: src/compose.c:3195 src/compose.c:3315
+#: libsylph/utils.c:2430 src/compose.c:2888 src/compose.c:3151
+#: src/compose.c:3214 src/compose.c:3334
 msgid "can't change file mode\n"
 msgstr "не може да се смени вида на файла\n"
 
-#: libsylph/utils.c:2418 libsylph/utils.c:2542
+#: libsylph/utils.c:2437 libsylph/utils.c:2561
 #, c-format
 msgid "writing to %s failed.\n"
 msgstr "записът в %s се провали.\n"
@@ -683,8 +683,8 @@ msgstr ""
 "За нови съобщения ще бъде проверявано в този ред. Отметнете кутийките\n"
 "в колонка `G' за разрешаване на изтегляне на съобщенията от `Get All'."
 
-#: src/account_dialog.c:366 src/addressadd.c:192 src/addressbook.c:493
-#: src/compose.c:4273 src/editaddress.c:200 src/editaddress.c:942
+#: src/account_dialog.c:366 src/addressadd.c:192 src/addressbook.c:491
+#: src/compose.c:4292 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
@@ -822,12 +822,12 @@ msgstr "Потребителски аргумент на действието"
 msgid "Add Address to Book"
 msgstr "Добавяне на Адреса към Книгата"
 
-#: src/addressadd.c:202 src/compose.c:4777 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4796 src/editaddress.c:201
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "Адрес"
 
-#: src/addressadd.c:212 src/addressbook.c:495 src/editaddress.c:202
+#: src/addressadd.c:212 src/addressbook.c:493 src/editaddress.c:202
 #: src/editaddress.c:795 src/editaddress.c:860 src/editgroup.c:267
 msgid "Remarks"
 msgstr "Забележки"
@@ -836,110 +836,111 @@ msgstr "Забележки"
 msgid "Select Address Book Folder"
 msgstr "Изберете папка от адресната книга"
 
-#: src/addressbook.c:338 src/compose.c:515 src/mainwindow.c:489
+#: src/addressbook.c:337 src/compose.c:515 src/mainwindow.c:489
 #: src/messageview.c:140
 msgid "/_File"
 msgstr "/_Файл"
 
-#: src/addressbook.c:339
+#: src/addressbook.c:338
 msgid "/_File/New _Book"
 msgstr "/_Файл/Нова _Книга"
 
-#: src/addressbook.c:340
+#: src/addressbook.c:339
 msgid "/_File/New _vCard"
 msgstr "/_Файл/Нова _vCard"
 
-#: src/addressbook.c:342
+#: src/addressbook.c:341
 msgid "/_File/New _JPilot"
 msgstr "/_Файл/Нов _JPilot"
 
-#: src/addressbook.c:345
-msgid "/_File/New _Server"
+#: src/addressbook.c:344
+#, fuzzy
+msgid "/_File/New _LDAP Server"
 msgstr "/_Файл/Нов _Сървър"
 
-#: src/addressbook.c:347 src/addressbook.c:350 src/compose.c:520
+#: src/addressbook.c:346 src/addressbook.c:349 src/compose.c:520
 #: src/compose.c:525 src/compose.c:528 src/compose.c:531 src/mainwindow.c:507
 #: src/mainwindow.c:510 src/mainwindow.c:512 src/mainwindow.c:515
 #: src/mainwindow.c:517 src/messageview.c:143
 msgid "/_File/---"
 msgstr "/_Файл/---"
 
-#: src/addressbook.c:348
+#: src/addressbook.c:347
 msgid "/_File/_Edit"
 msgstr "/_Файл/_Редактиране"
 
-#: src/addressbook.c:349
+#: src/addressbook.c:348
 msgid "/_File/_Delete"
 msgstr "/_Файл/_Изтриване"
 
-#: src/addressbook.c:351
+#: src/addressbook.c:350
 msgid "/_File/_Save"
 msgstr "/_файл/_Запазване"
 
-#: src/addressbook.c:352 src/compose.c:532 src/messageview.c:144
+#: src/addressbook.c:351 src/compose.c:532 src/messageview.c:144
 msgid "/_File/_Close"
 msgstr "/_Файл/_Затваряне"
 
-#: src/addressbook.c:353
+#: src/addressbook.c:352
 msgid "/_Address"
 msgstr "/_Адрес"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:353
 msgid "/_Address/New _Address"
 msgstr "/_Адрес/Нов _Адрес"
 
-#: src/addressbook.c:355
+#: src/addressbook.c:354
 msgid "/_Address/New _Group"
 msgstr "/_Адрес/Нова _Група"
 
-#: src/addressbook.c:356
+#: src/addressbook.c:355
 msgid "/_Address/New _Folder"
 msgstr "/_Адрес/Нова _Папка"
 
-#: src/addressbook.c:357
+#: src/addressbook.c:356
 msgid "/_Address/---"
 msgstr "/_Адрес/---"
 
-#: src/addressbook.c:358
+#: src/addressbook.c:357
 msgid "/_Address/_Edit"
 msgstr "/_Адрес/_Редактиране"
 
-#: src/addressbook.c:359
+#: src/addressbook.c:358
 msgid "/_Address/_Delete"
 msgstr "/_Адрес/_Изтриване"
 
-#: src/addressbook.c:360 src/compose.c:645 src/mainwindow.c:758
-#: src/messageview.c:266
+#: src/addressbook.c:359 src/compose.c:645 src/mainwindow.c:758
+#: src/messageview.c:267
 msgid "/_Tools"
 msgstr "/_Инструменти"
 
-#: src/addressbook.c:361
+#: src/addressbook.c:360
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Инструменти/Внасяне на _LDIF файл"
 
-#: src/addressbook.c:362 src/compose.c:666 src/mainwindow.c:812
-#: src/messageview.c:286
+#: src/addressbook.c:361 src/compose.c:666 src/mainwindow.c:812
+#: src/messageview.c:287
 msgid "/_Help"
 msgstr "/_Помощ"
 
-#: src/addressbook.c:363 src/compose.c:667 src/mainwindow.c:824
-#: src/messageview.c:287
+#: src/addressbook.c:362 src/compose.c:667 src/mainwindow.c:824
+#: src/messageview.c:288
 msgid "/_Help/_About"
 msgstr "/_Помощ/_Относно"
 
-#: src/addressbook.c:382 src/addressbook.c:392
+#: src/addressbook.c:381 src/addressbook.c:391
 msgid "/New _Address"
 msgstr "/Нов _Адрес"
 
-#: src/addressbook.c:383 src/addressbook.c:393
+#: src/addressbook.c:382 src/addressbook.c:392
 msgid "/New _Group"
 msgstr "/Нова _Група"
 
-#: src/addressbook.c:384 src/addressbook.c:394
+#: src/addressbook.c:383 src/addressbook.c:393
 msgid "/New _Folder"
 msgstr "/Нова _Папка"
 
-#: src/addressbook.c:385 src/addressbook.c:395 src/compose.c:509
+#: src/addressbook.c:384 src/addressbook.c:394 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
@@ -949,70 +950,70 @@ msgstr "/Нова _Папка"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:386 src/addressbook.c:396 src/compose.c:534
+#: src/addressbook.c:385 src/addressbook.c:395 src/compose.c:534
 #: src/mainwindow.c:521 src/messageview.c:146
 msgid "/_Edit"
 msgstr "/_Редактиране"
 
-#: src/addressbook.c:387 src/addressbook.c:397 src/summaryview.c:434
+#: src/addressbook.c:386 src/addressbook.c:396 src/summaryview.c:434
 msgid "/_Delete"
 msgstr "/_Изтриване"
 
-#: src/addressbook.c:494
+#: src/addressbook.c:492
 msgid "E-Mail address"
 msgstr "E-Mail адрес"
 
-#: src/addressbook.c:498 src/compose.c:4778 src/prefs_common_dialog.c:2183
+#: src/addressbook.c:496 src/compose.c:4797 src/prefs_common_dialog.c:2183
 msgid "Address book"
 msgstr "Адресна книга"
 
-#: src/addressbook.c:600 src/prefs_filter_edit.c:249
+#: src/addressbook.c:603 src/prefs_filter_edit.c:249
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "Име:"
 
 #. Buttons
-#: src/addressbook.c:632 src/addressbook.c:1684 src/editaddress.c:884
+#: src/addressbook.c:636 src/addressbook.c:1678 src/editaddress.c:884
 #: src/editaddress.c:1017 src/mainwindow.c:2426 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:635 src/editaddress.c:890 src/editaddress.c:1023
+#: src/addressbook.c:639 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:1552
 msgid "Add"
 msgstr "Добавяне"
 
-#: src/addressbook.c:638
+#: src/addressbook.c:642
 msgid "Lookup"
 msgstr "Справка"
 
-#: src/addressbook.c:650 src/headerview.c:55 src/prefs_folder_item.c:339
+#: src/addressbook.c:654 src/headerview.c:55 src/prefs_folder_item.c:339
 #: src/prefs_template.c:176
 msgid "To:"
 msgstr "До:"
 
-#: src/addressbook.c:654 src/prefs_folder_item.c:356 src/prefs_template.c:178
+#: src/addressbook.c:658 src/prefs_folder_item.c:356 src/prefs_template.c:178
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:658 src/prefs_folder_item.c:367
+#: src/addressbook.c:662 src/prefs_folder_item.c:367
 msgid "Bcc:"
 msgstr "Bcc:"
 
 #. Confirm deletion
-#: src/addressbook.c:845
+#: src/addressbook.c:832
 msgid "Delete address(es)"
 msgstr "Изтриване на адрес(ите)"
 
-#: src/addressbook.c:846
+#: src/addressbook.c:833
 msgid "Really delete the address(es)?"
 msgstr "Желаете ли изтриване на адрес(ите)?"
 
-#: src/addressbook.c:1675
+#: src/addressbook.c:1669
 #, fuzzy, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1022,38 +1023,38 @@ msgstr ""
 "Ако изтривате само папката, адресите ще бъдат преместени в родителската "
 "папка."
 
-#: src/addressbook.c:1678 src/folderview.c:2372
+#: src/addressbook.c:1672 src/folderview.c:2372
 msgid "Delete folder"
 msgstr "Изтриване на папка"
 
-#: src/addressbook.c:1678
+#: src/addressbook.c:1672
 #, fuzzy
 msgid "_Folder only"
 msgstr "Само папка"
 
-#: src/addressbook.c:1678
+#: src/addressbook.c:1672
 #, fuzzy
 msgid "Folder and _addresses"
 msgstr "Папка и Адреси"
 
-#: src/addressbook.c:1683
+#: src/addressbook.c:1677
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Желаете ли изтриване на `%s' ?"
 
-#: src/addressbook.c:2369 src/addressbook.c:2502
+#: src/addressbook.c:2363 src/addressbook.c:2496
 msgid "New user, could not save index file."
 msgstr "Нов потребител, не можа да ce запази индексния файл."
 
-#: src/addressbook.c:2373 src/addressbook.c:2506
+#: src/addressbook.c:2367 src/addressbook.c:2500
 msgid "New user, could not save address book files."
 msgstr "Нов потребител, не можа да се запази файла на адресната книга"
 
-#: src/addressbook.c:2383 src/addressbook.c:2516
+#: src/addressbook.c:2377 src/addressbook.c:2510
 msgid "Old address book converted successfully."
 msgstr "Старата адресна книга конвертирана успешно"
 
-#: src/addressbook.c:2388
+#: src/addressbook.c:2382
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1061,7 +1062,7 @@ msgstr ""
 "Старата адресна книга конвертирана,\n"
 "не може да се запази новия индексен файл"
 
-#: src/addressbook.c:2401
+#: src/addressbook.c:2395
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1069,7 +1070,7 @@ msgstr ""
 "Неуспя конвертирането на адресната книга,\n"
 "създадени са нови празни файлове на адресната книга."
 
-#: src/addressbook.c:2407
+#: src/addressbook.c:2401
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1077,7 +1078,7 @@ msgstr ""
 "Неуспя конвертирането на адресната книга\n"
 "и създаване на нови файлове на адресната книга."
 
-#: src/addressbook.c:2412
+#: src/addressbook.c:2406
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1085,91 +1086,91 @@ msgstr ""
 "Неуспя конвертирането на адресната книга\n"
 "и създаване на нови файлове на адресната книга."
 
-#: src/addressbook.c:2419
+#: src/addressbook.c:2413
 msgid "Addressbook conversion error"
 msgstr "Грешка при конвертиране на адресната книга"
 
-#: src/addressbook.c:2423
+#: src/addressbook.c:2417
 msgid "Addressbook conversion"
 msgstr "Конвертиране на адресната книга"
 
-#: src/addressbook.c:2458
+#: src/addressbook.c:2452
 msgid "Addressbook Error"
 msgstr "Грешка на адресната книга"
 
-#: src/addressbook.c:2459 src/addressbook.c:2559
+#: src/addressbook.c:2453 src/addressbook.c:2553
 msgid "Could not read address index"
 msgstr "Не може да се прочете адресния индекс"
 
-#: src/addressbook.c:2521
+#: src/addressbook.c:2515
 msgid "Old address book converted, could not save new address index file"
 msgstr ""
 "Старата адресна книга конвертирана, не може да се запази новия индексен файл"
 
-#: src/addressbook.c:2535
+#: src/addressbook.c:2529
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr ""
 "Неуспя конвертирането на адресната книга, създадени са нови празни файлове "
 "на адресната книга."
 
-#: src/addressbook.c:2541
+#: src/addressbook.c:2535
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr ""
 "Неуспя конвертирането на адресната книга, неуспя създаване на нови файлове "
 "на адресната книга."
 
-#: src/addressbook.c:2547
+#: src/addressbook.c:2541
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr ""
 "Неуспя конвертирането на адресната книга и създаване на нови файлове на "
 "адресната книга."
 
-#: src/addressbook.c:2565
+#: src/addressbook.c:2559
 msgid "Addressbook Conversion Error"
 msgstr "Грешка при конвертиране на адресната книга"
 
-#: src/addressbook.c:2571
+#: src/addressbook.c:2565
 msgid "Addressbook Conversion"
 msgstr "Конвертиране на адресната книга"
 
-#: src/addressbook.c:3086 src/prefs_common_dialog.c:2033
+#: src/addressbook.c:3080 src/prefs_common_dialog.c:2033
 msgid "Interface"
 msgstr "Интерфейс"
 
-#: src/addressbook.c:3102 src/importldif.c:514
+#: src/addressbook.c:3096 src/importldif.c:514
 msgid "Address Book"
 msgstr "Адресна книга"
 
-#: src/addressbook.c:3118
+#: src/addressbook.c:3112
 msgid "Person"
 msgstr "Лице"
 
-#: src/addressbook.c:3134
+#: src/addressbook.c:3128
 msgid "EMail Address"
 msgstr "EMail Адрес"
 
-#: src/addressbook.c:3150
+#: src/addressbook.c:3144
 msgid "Group"
 msgstr "Група"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3166 src/folderview.c:367 src/prefs_account_dialog.c:1694
-#: src/query_search.c:370
+#: src/addressbook.c:3160 src/folderview.c:367 src/prefs_account_dialog.c:1694
+#: src/query_search.c:398
 msgid "Folder"
 msgstr "Папка"
 
-#: src/addressbook.c:3182
+#: src/addressbook.c:3176
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3198 src/addressbook.c:3214
+#: src/addressbook.c:3192 src/addressbook.c:3208
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3230
+#: src/addressbook.c:3224
 msgid "LDAP Server"
 msgstr "LDAP сървър"
 
@@ -1181,7 +1182,7 @@ msgstr "Публичен адрес"
 msgid "Personal address"
 msgstr "Личен адрес"
 
-#: src/alertpanel.c:142 src/compose.c:5500 src/main.c:621
+#: src/alertpanel.c:142 src/compose.c:5517 src/main.c:621
 msgid "Notice"
 msgstr "Забележка"
 
@@ -1189,7 +1190,7 @@ msgstr "Забележка"
 msgid "Warning"
 msgstr "Предупреждение"
 
-#: src/alertpanel.c:168 src/inc.c:587
+#: src/alertpanel.c:168 src/inc.c:586
 msgid "Error"
 msgstr "Грешка"
 
@@ -1232,7 +1233,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:4761
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4762
 msgid "None"
 msgstr "Никой"
 
@@ -1510,7 +1511,7 @@ msgstr "/_Изглед/_Кодиране/Thai (TIS-620)"
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Изглед/_Кодиране/Thai (Windows-874)"
 
-#: src/compose.c:646 src/mainwindow.c:759 src/messageview.c:267
+#: src/compose.c:646 src/mainwindow.c:759 src/messageview.c:268
 msgid "/_Tools/_Address book"
 msgstr "/_Инструменти/_Адресна книга"
 
@@ -1518,14 +1519,14 @@ msgstr "/_Инструменти/_Адресна книга"
 msgid "/_Tools/_Template"
 msgstr "/_Инструменти/_Шаблон"
 
-#: src/compose.c:649 src/mainwindow.c:783 src/messageview.c:283
+#: src/compose.c:649 src/mainwindow.c:783 src/messageview.c:284
 msgid "/_Tools/Actio_ns"
 msgstr "/_Инструменти/_Действия"
 
 #: src/compose.c:651 src/compose.c:655 src/compose.c:661 src/mainwindow.c:762
 #: src/mainwindow.c:776 src/mainwindow.c:781 src/mainwindow.c:784
-#: src/mainwindow.c:788 src/mainwindow.c:790 src/messageview.c:270
-#: src/messageview.c:282
+#: src/mainwindow.c:788 src/mainwindow.c:790 src/messageview.c:271
+#: src/messageview.c:283
 msgid "/_Tools/---"
 msgstr "/_Инструменти/---"
 
@@ -1554,80 +1555,80 @@ msgstr "/_Инструменти/_Изпълнение"
 msgid "/_Tools/_Set spell language"
 msgstr "/_Инструменти/_Шаблон"
 
-#: src/compose.c:910
+#: src/compose.c:912
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: файлът не съществува\n"
 
-#: src/compose.c:1014 src/compose.c:1085
+#: src/compose.c:1016 src/compose.c:1087
 msgid "Can't get text part\n"
 msgstr "Не може да се намери текстовата част\n"
 
-#: src/compose.c:1486
+#: src/compose.c:1488
 msgid "Quote mark format error."
 msgstr "Грешка в формата на цитат."
 
-#: src/compose.c:1498
+#: src/compose.c:1500
 msgid "Message reply/forward format error."
 msgstr "Грешка в reply/forward формата на съобщението."
 
-#: src/compose.c:1918
+#: src/compose.c:1935
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Файлът %s не съществува\n"
 
-#: src/compose.c:1922
+#: src/compose.c:1939
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Не може да се намери големината на %s\n"
 
-#: src/compose.c:1926
+#: src/compose.c:1943
 #, c-format
 msgid "File %s is empty."
 msgstr "Файлът %s е празен."
 
-#: src/compose.c:1930
+#: src/compose.c:1947
 #, c-format
 msgid "Can't read %s."
 msgstr "Не може да се прочете %s."
 
-#: src/compose.c:1963
+#: src/compose.c:1980
 #, c-format
 msgid "Message: %s"
 msgstr "Съобщение: %s"
 
-#: src/compose.c:2023 src/mimeview.c:565
+#: src/compose.c:2040 src/mimeview.c:565
 msgid "Can't get the part of multipart message."
 msgstr "Не може да се намери част от multipart съобщение."
 
-#: src/compose.c:2507 src/headerview.c:195 src/query_search.c:636
+#: src/compose.c:2524 src/headerview.c:195 src/query_search.c:666
 #: src/summaryview.c:2124
 msgid "(No Subject)"
 msgstr "(Няма Тема)"
 
-#: src/compose.c:2510
+#: src/compose.c:2527
 #, fuzzy, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Съставяне на съобщение%s"
 
-#: src/compose.c:2623
+#: src/compose.c:2642
 msgid "Recipient is not specified."
 msgstr "Не е указан получател"
 
-#: src/compose.c:2631
+#: src/compose.c:2650
 #, fuzzy
 msgid "Empty subject"
 msgstr "Тема"
 
-#: src/compose.c:2632
+#: src/compose.c:2651
 msgid "Subject is empty. Send it anyway?"
 msgstr "Празна тема. Изпращане така?"
 
-#: src/compose.c:2691
+#: src/compose.c:2710
 msgid "can't get recipient list."
 msgstr "не може да се получи списък с получатели."
 
-#: src/compose.c:2711
+#: src/compose.c:2730
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1635,21 +1636,21 @@ msgstr ""
 "Не е указан акаунт за изпращане на пощата.\n"
 "Моля изберете пощенску акаунт преди изпращане."
 
-#: src/compose.c:2725 src/send_message.c:299
+#: src/compose.c:2744 src/send_message.c:299
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Възникна грешка при пращане на съобщението до %s."
 
-#: src/compose.c:2767
+#: src/compose.c:2786
 msgid "Can't save the message to outbox."
 msgstr "Не може да се запази съобщението в изходящата кутия."
 
-#: src/compose.c:2805
+#: src/compose.c:2824
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "Не можа да се намери бутон асоцииран с избрания `%s'."
 
-#: src/compose.c:2902
+#: src/compose.c:2921
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1660,12 +1661,12 @@ msgstr ""
 "%s към %s.\n"
 "Изпращане така?"
 
-#: src/compose.c:2908
+#: src/compose.c:2927
 #, fuzzy
 msgid "Code conversion error"
 msgstr "Грешка при конвертиране на адресната книга"
 
-#: src/compose.c:2981
+#: src/compose.c:3000
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1674,159 +1675,159 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:2985
+#: src/compose.c:3004
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3275
+#: src/compose.c:3294
 msgid "can't remove the old message\n"
 msgstr "не може да се изтрие старото съобщение\n"
 
-#: src/compose.c:3293
+#: src/compose.c:3312
 msgid "queueing message...\n"
 msgstr "нареждане на съобщението на опашката...\n"
 
-#: src/compose.c:3375
+#: src/compose.c:3394
 msgid "can't find queue folder\n"
 msgstr "не може да се намери папката за опашка\n"
 
-#: src/compose.c:3382
+#: src/compose.c:3401
 msgid "can't queue the message\n"
 msgstr "не може да се нареди съобщението на опашката\n"
 
-#: src/compose.c:3975
+#: src/compose.c:3994
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "генерирано Message-ID: %s\n"
 
-#: src/compose.c:4088
+#: src/compose.c:4107
 msgid "Creating compose window...\n"
 msgstr "Създаване на прозорец за съставяне...\n"
 
-#: src/compose.c:4139 src/headerview.c:54
+#: src/compose.c:4158 src/headerview.c:54
 msgid "From:"
 msgstr "От:"
 
-#: src/compose.c:4213
+#: src/compose.c:4232
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/_Инструменти/_Действия"
 
-#: src/compose.c:4216
+#: src/compose.c:4235
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/_Съобщение/_Криптиране"
 
-#: src/compose.c:4254 src/compose.c:5332
+#: src/compose.c:4273 src/compose.c:5351
 msgid "MIME type"
 msgstr "MIME тип"
 
 #. S_COL_DATE
-#: src/compose.c:4263 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4908
+#: src/compose.c:4282 src/mimeview.c:197 src/prefs_filter_edit.c:496
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4909
 msgid "Size"
 msgstr "Размер"
 
-#: src/compose.c:4698 src/mainwindow.c:2359 src/prefs_account_dialog.c:528
+#: src/compose.c:4717 src/mainwindow.c:2359 src/prefs_account_dialog.c:528
 #: src/prefs_common_dialog.c:661
 msgid "Send"
 msgstr "Изпращане"
 
-#: src/compose.c:4699
+#: src/compose.c:4718
 msgid "Send message"
 msgstr "Изпращане на съобщение"
 
-#: src/compose.c:4707
+#: src/compose.c:4726
 msgid "Send later"
 msgstr "Изпращане по-късно"
 
-#: src/compose.c:4708
+#: src/compose.c:4727
 msgid "Put into queue folder and send later"
 msgstr "Поставяне в папката за опашка и изпращане по-късно"
 
-#: src/compose.c:4716
+#: src/compose.c:4735
 msgid "Draft"
 msgstr "Чернови"
 
-#: src/compose.c:4717
+#: src/compose.c:4736
 msgid "Save to draft folder"
 msgstr "Запазване в папката с чернови"
 
-#: src/compose.c:4727
+#: src/compose.c:4746
 msgid "Insert"
 msgstr "Вмъкване"
 
-#: src/compose.c:4728
+#: src/compose.c:4747
 msgid "Insert file"
 msgstr "Вмъкване на файл"
 
-#: src/compose.c:4736
+#: src/compose.c:4755
 msgid "Attach"
 msgstr "Прикрепване"
 
-#: src/compose.c:4737
+#: src/compose.c:4756
 msgid "Attach file"
 msgstr "Прикрепване на файл"
 
 #. signature
-#: src/compose.c:4747 src/prefs_account_dialog.c:1208
+#: src/compose.c:4766 src/prefs_account_dialog.c:1208
 #: src/prefs_common_dialog.c:953
 msgid "Signature"
 msgstr "Сигнатура"
 
-#: src/compose.c:4748
+#: src/compose.c:4767
 #, fuzzy
 msgid "Append signature"
 msgstr "НЕВАЛИДЕН подпис"
 
 #. editor
-#: src/compose.c:4757 src/prefs_common_dialog.c:991
+#: src/compose.c:4776 src/prefs_common_dialog.c:991
 #: src/prefs_common_dialog.c:2315
 msgid "Editor"
 msgstr "Редактор"
 
-#: src/compose.c:4758
+#: src/compose.c:4777
 msgid "Edit with external editor"
 msgstr "Редакция с външен редактор"
 
-#: src/compose.c:4766
+#: src/compose.c:4785
 msgid "Linewrap"
 msgstr "Свиванен на редовете"
 
-#: src/compose.c:4767
+#: src/compose.c:4786
 msgid "Wrap all long lines"
 msgstr "Свиване на всички дълги редове"
 
-#: src/compose.c:5228
+#: src/compose.c:5247
 msgid "Invalid MIME type."
 msgstr "Невалиден MIME тип"
 
-#: src/compose.c:5246
+#: src/compose.c:5265
 msgid "File doesn't exist or is empty."
 msgstr "Файлът не съществува или е празен"
 
-#: src/compose.c:5314
+#: src/compose.c:5333
 msgid "Properties"
 msgstr "Аксесоари"
 
-#: src/compose.c:5334 src/prefs_common_dialog.c:1444
+#: src/compose.c:5353 src/prefs_common_dialog.c:1444
 msgid "Encoding"
 msgstr "Кодиране"
 
-#: src/compose.c:5357 src/prefs_folder_item.c:202
+#: src/compose.c:5376 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Път"
 
-#: src/compose.c:5358
+#: src/compose.c:5377
 msgid "File name"
 msgstr "Име на файл"
 
-#: src/compose.c:5449
+#: src/compose.c:5466
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Командния ред за външен редактор е невалиден: `%s'\n"
 
-#: src/compose.c:5497
+#: src/compose.c:5514
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1836,48 +1837,48 @@ msgstr ""
 "Желаете ли принудително прекратяване на процеса?\n"
 "process group id: %d"
 
-#: src/compose.c:5872 src/compose.c:5877 src/compose.c:5883
+#: src/compose.c:5889 src/compose.c:5894 src/compose.c:5900
 msgid "Can't queue the message."
 msgstr "Не може да се нареди съобщението на опашката."
 
-#: src/compose.c:5974
+#: src/compose.c:5991
 #, fuzzy
 msgid "Select files"
 msgstr "Избор на файл"
 
-#: src/compose.c:5997
+#: src/compose.c:6014
 msgid "Select file"
 msgstr "Избор на файл"
 
-#: src/compose.c:6032
+#: src/compose.c:6049
 #, fuzzy
 msgid "Save message"
 msgstr "Изпращане на съобщение"
 
-#: src/compose.c:6033
+#: src/compose.c:6050
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Съобщението беше променено. Изоставяне?"
 
-#: src/compose.c:6035
+#: src/compose.c:6052
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:6077
+#: src/compose.c:6094
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Желаете ли да приложите шаблонът `%s' ?"
 
-#: src/compose.c:6079
+#: src/compose.c:6096
 msgid "Apply template"
 msgstr "Прилагане на шаблон"
 
-#: src/compose.c:6080
+#: src/compose.c:6097
 #, fuzzy
 msgid "_Replace"
 msgstr "Заменяне"
 
-#: src/compose.c:6080
+#: src/compose.c:6097
 #, fuzzy
 msgid "_Insert"
 msgstr "Вмъкване"
@@ -1999,52 +2000,52 @@ msgstr "Име на Група трябва да бъде попълнено."
 msgid "Edit Group Data"
 msgstr "Редактиране на данни за Група"
 
-#: src/editgroup.c:300
+#: src/editgroup.c:299
 msgid "Group Name"
 msgstr "Име на Група"
 
-#: src/editgroup.c:319
+#: src/editgroup.c:318
 msgid "Addresses in Group"
 msgstr "Адреси в групата"
 
-#: src/editgroup.c:321
+#: src/editgroup.c:320
 msgid " -> "
 msgstr " -> "
 
-#: src/editgroup.c:348
+#: src/editgroup.c:347
 msgid " <- "
 msgstr " <- "
 
-#: src/editgroup.c:350
+#: src/editgroup.c:349
 msgid "Available Addresses"
 msgstr "Налични адреси"
 
-#: src/editgroup.c:416
+#: src/editgroup.c:415
 msgid "Move E-Mail Addresses to or from Group with arrow buttons"
 msgstr "Местене на E-Mail адреси до или от Група с бутоните със стрелки"
 
-#: src/editgroup.c:468
+#: src/editgroup.c:467
 msgid "Edit Group Details"
 msgstr "Редактиране на детайли за Група"
 
-#: src/editgroup.c:471
+#: src/editgroup.c:470
 msgid "Add New Group"
 msgstr "Добавяне на Нова Група"
 
-#: src/editgroup.c:522
+#: src/editgroup.c:521
 msgid "Edit folder"
 msgstr "Редактиране на папка"
 
-#: src/editgroup.c:522
+#: src/editgroup.c:521
 msgid "Input the new name of folder:"
 msgstr "Въведете новото име на папка:"
 
-#: src/editgroup.c:525 src/foldersel.c:541 src/folderview.c:2121
+#: src/editgroup.c:524 src/foldersel.c:541 src/folderview.c:2121
 #: src/folderview.c:2127
 msgid "New folder"
 msgstr "Нова папка"
 
-#: src/editgroup.c:526 src/foldersel.c:542 src/folderview.c:2128
+#: src/editgroup.c:525 src/foldersel.c:542 src/folderview.c:2128
 msgid "Input the name of new folder:"
 msgstr "Въведете име на нова папка:"
 
@@ -2242,7 +2243,7 @@ msgid "`%c' can't be included in folder name."
 msgstr "`%c' не може да бъде включено в име на папка"
 
 #: src/foldersel.c:561 src/folderview.c:2147 src/folderview.c:2206
-#: src/query_search.c:995
+#: src/query_search.c:1031
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Папката `%s' вече съществува"
@@ -2503,7 +2504,7 @@ msgstr "Тема:"
 msgid "Creating header view...\n"
 msgstr "Създаване изглед на заглавните блокове...\n"
 
-#: src/headerview.c:180 src/query_search.c:637 src/summaryview.c:2127
+#: src/headerview.c:180 src/query_search.c:667 src/summaryview.c:2127
 msgid "(No From)"
 msgstr "(Няма От)"
 
@@ -2633,134 +2634,134 @@ msgstr "Завършване"
 msgid "Sylpheed: %d new messages"
 msgstr "Завършено (%d нови съобщения)"
 
-#: src/inc.c:372
+#: src/inc.c:371
 msgid "Retrieving new messages"
 msgstr "Получаване на нови съобщения"
 
-#: src/inc.c:415
+#: src/inc.c:414
 msgid "Standby"
 msgstr "Изчакване"
 
-#: src/inc.c:544 src/inc.c:593
+#: src/inc.c:543 src/inc.c:592
 msgid "Cancelled"
 msgstr "Отказан"
 
-#: src/inc.c:555
+#: src/inc.c:554
 msgid "Retrieving"
 msgstr "Получаване"
 
-#: src/inc.c:564
+#: src/inc.c:563
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "Завършено (%d съобщения (%s) получени)"
 
-#: src/inc.c:568
+#: src/inc.c:567
 msgid "Done (no new messages)"
 msgstr "Завършено (няма нови съобщения)"
 
-#: src/inc.c:574
+#: src/inc.c:573
 msgid "Connection failed"
 msgstr "Връзката се провали"
 
-#: src/inc.c:577
+#: src/inc.c:576
 msgid "Auth failed"
 msgstr "Удостоверяването се провали"
 
-#: src/inc.c:580
+#: src/inc.c:579
 msgid "Locked"
 msgstr "Заключен"
 
-#: src/inc.c:590
+#: src/inc.c:589
 #, fuzzy
 msgid "Timeout"
 msgstr "Пауза (сек)"
 
-#: src/inc.c:640
+#: src/inc.c:639
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Завършено (%d нови съобщения)"
 
-#: src/inc.c:643
+#: src/inc.c:642
 msgid "Finished (no new messages)"
 msgstr "Завършено (няма нови съобщения)"
 
-#: src/inc.c:652
+#: src/inc.c:651
 msgid "Some errors occurred while getting mail."
 msgstr "Възникнаха грешки при получаване на пощата."
 
-#: src/inc.c:688
+#: src/inc.c:687
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "получаване на нови съобщения от акаунт %s...\n"
 
-#: src/inc.c:691
+#: src/inc.c:690
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Получаване на нови съобщения"
 
-#: src/inc.c:710
+#: src/inc.c:709
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Свързване с POP3 сървър: %s..."
 
-#: src/inc.c:719
+#: src/inc.c:718
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Не може да се установи връзка с POP3 сървър: %s:%d\n"
 
-#: src/inc.c:798 src/send_message.c:631
+#: src/inc.c:797 src/send_message.c:631
 msgid "Authenticating..."
 msgstr "Удостоверяване..."
 
-#: src/inc.c:799
+#: src/inc.c:798
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Получаване на съобщения от %s..."
 
-#: src/inc.c:804
+#: src/inc.c:803
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Взимане на броят на нови съобщения (STAT)..."
 
-#: src/inc.c:808
+#: src/inc.c:807
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Взимане на броят на нови съобщения (LAST)..."
 
-#: src/inc.c:812
+#: src/inc.c:811
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Взимане на броят на нови съобщения (UIDL)..."
 
-#: src/inc.c:816
+#: src/inc.c:815
 msgid "Getting the size of messages (LIST)..."
 msgstr "Взимане на размерът на съобщенията (LIST)... "
 
-#: src/inc.c:826
+#: src/inc.c:825
 #, c-format
 msgid "Deleting message %d"
 msgstr "Изтриване на съобщение %d"
 
-#: src/inc.c:833 src/send_message.c:649
+#: src/inc.c:832 src/send_message.c:649
 msgid "Quitting"
 msgstr "Прекъсване"
 
-#: src/inc.c:858
+#: src/inc.c:857
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Получаване на съобшение (%d / %d) (%s / %s)"
 
-#: src/inc.c:879
+#: src/inc.c:878
 #, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Получаване (%d съобщения (%s) получени)"
 
-#: src/inc.c:1107
+#: src/inc.c:1106
 msgid "Connection failed."
 msgstr "Връзката провалена"
 
-#: src/inc.c:1113
+#: src/inc.c:1112
 msgid "Error occurred while processing mail."
 msgstr "Възникна грешка при обработка на пощата"
 
-#: src/inc.c:1118
+#: src/inc.c:1117
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2769,28 +2770,28 @@ msgstr ""
 "Възникна грешка при обработка на пощата:\n"
 "%s"
 
-#: src/inc.c:1124
+#: src/inc.c:1123
 msgid "No disk space left."
 msgstr "Няма свободно място на диска"
 
-#: src/inc.c:1129
+#: src/inc.c:1128
 msgid "Can't write file."
 msgstr "Файлът не може да се запише."
 
-#: src/inc.c:1134
+#: src/inc.c:1133
 msgid "Socket error."
 msgstr "Грешка в сокет."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1140 src/send_message.c:584 src/send_message.c:772
+#: src/inc.c:1139 src/send_message.c:584 src/send_message.c:772
 msgid "Connection closed by the remote host."
 msgstr "Връзката е прекратена от отдалечения хост."
 
-#: src/inc.c:1146
+#: src/inc.c:1145
 msgid "Mailbox is locked."
 msgstr "Пощенската кутия е заключена."
 
-#: src/inc.c:1150
+#: src/inc.c:1149
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2799,11 +2800,11 @@ msgstr ""
 "Пощенската кутия е заключена:\n"
 "%s"
 
-#: src/inc.c:1156 src/send_message.c:757
+#: src/inc.c:1155 src/send_message.c:757
 msgid "Authentication failed."
 msgstr "Удостоверяването се провали."
 
-#: src/inc.c:1161 src/send_message.c:760
+#: src/inc.c:1160 src/send_message.c:760
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2812,16 +2813,16 @@ msgstr ""
 "Удостоверяването се провали:\n"
 "%s"
 
-#: src/inc.c:1166 src/send_message.c:776
+#: src/inc.c:1165 src/send_message.c:776
 #, fuzzy
 msgid "Session timed out."
 msgstr "сесията е просрочена\n"
 
-#: src/inc.c:1202
+#: src/inc.c:1201
 msgid "Incorporation cancelled\n"
 msgstr "Обединяването е отменено\n"
 
-#: src/inc.c:1285
+#: src/inc.c:1284
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Получаване на нови съобшения от %s в %s...\n"
@@ -3307,14 +3308,15 @@ msgid "/_View/Mess_age source"
 msgstr "/_Изглед/_Изходен код"
 
 #: src/mainwindow.c:708 src/messageview.c:245
-msgid "/_View/Show all _header"
+#, fuzzy
+msgid "/_View/Show all _headers"
 msgstr "/_Изглед/_Показване на заглавните части(headers)"
 
 #: src/mainwindow.c:710
 msgid "/_View/_Update summary"
 msgstr "/_Изглед/_Обновяване на извадката"
 
-#: src/mainwindow.c:712 src/messageview.c:247
+#: src/mainwindow.c:712 src/messageview.c:248
 msgid "/_Message"
 msgstr "/_Съобщение"
 
@@ -3349,16 +3351,16 @@ msgstr "/_Съобщение/_Изпращане на съобщенията в
 
 #: src/mainwindow.c:722 src/mainwindow.c:724 src/mainwindow.c:731
 #: src/mainwindow.c:736 src/mainwindow.c:739 src/mainwindow.c:750
-#: src/mainwindow.c:752 src/mainwindow.c:755 src/messageview.c:250
-#: src/messageview.c:258 src/messageview.c:263
+#: src/mainwindow.c:752 src/mainwindow.c:755 src/messageview.c:251
+#: src/messageview.c:259 src/messageview.c:264
 msgid "/_Message/---"
 msgstr "/_Съобщение/---"
 
-#: src/mainwindow.c:723 src/messageview.c:248
+#: src/mainwindow.c:723 src/messageview.c:249
 msgid "/_Message/Compose _new message"
 msgstr "/_Съобщение/_Съставяне на ново съобщение"
 
-#: src/mainwindow.c:725 src/messageview.c:251
+#: src/mainwindow.c:725 src/messageview.c:252
 msgid "/_Message/_Reply"
 msgstr "/_Съобщение/_Отговор"
 
@@ -3366,27 +3368,27 @@ msgstr "/_Съобщение/_Отговор"
 msgid "/_Message/Repl_y to"
 msgstr "/_Съобщение/Отговор _до"
 
-#: src/mainwindow.c:727 src/messageview.c:252
+#: src/mainwindow.c:727 src/messageview.c:253
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Съобщение/Отговор _до/_всички"
 
-#: src/mainwindow.c:728 src/messageview.c:254
+#: src/mainwindow.c:728 src/messageview.c:255
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Съобщение/Отговор _до/_подател"
 
-#: src/mainwindow.c:729 src/messageview.c:256
+#: src/mainwindow.c:729 src/messageview.c:257
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Съобщение/Отговор _до/_пощенски списък"
 
-#: src/mainwindow.c:732 src/messageview.c:259
+#: src/mainwindow.c:732 src/messageview.c:260
 msgid "/_Message/_Forward"
 msgstr "/_Съобщение/П_репращане"
 
-#: src/mainwindow.c:733 src/messageview.c:260
+#: src/mainwindow.c:733 src/messageview.c:261
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Съобщение/Пр_епращане като притурка"
 
-#: src/mainwindow.c:735 src/messageview.c:262
+#: src/mainwindow.c:735 src/messageview.c:263
 msgid "/_Message/Redirec_t"
 msgstr "/_Съобщение/_Пренасочване"
 
@@ -3445,7 +3447,7 @@ msgstr "/_Съобщение/_Получаване на нова поща"
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/_Съобщение/_Получаване на нова поща"
 
-#: src/mainwindow.c:756 src/messageview.c:264
+#: src/mainwindow.c:756 src/messageview.c:265
 msgid "/_Message/Re-_edit"
 msgstr "/_Съобщение/_Редактиране"
 
@@ -3464,23 +3466,23 @@ msgstr "/_Инструменти/_Филтриране на съобщеният
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Инструменти/_Филтриране на съобщенията"
 
-#: src/mainwindow.c:767 src/messageview.c:271
+#: src/mainwindow.c:767 src/messageview.c:272
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Инструменти/_Създаване на правило за филтриране"
 
-#: src/mainwindow.c:768 src/messageview.c:273
+#: src/mainwindow.c:768 src/messageview.c:274
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Инструменти/_Създаване на правило за филтриране/_Автоматично"
 
-#: src/mainwindow.c:770 src/messageview.c:275
+#: src/mainwindow.c:770 src/messageview.c:276
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Инструменти/_Създаване на правило за филтриране/по _Подател"
 
-#: src/mainwindow.c:772 src/messageview.c:277
+#: src/mainwindow.c:772 src/messageview.c:278
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Инструменти/_Създаване на правило за филтриране/по П_олучател"
 
-#: src/mainwindow.c:774 src/messageview.c:279
+#: src/mainwindow.c:774 src/messageview.c:280
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Инструменти/_Създаване на правило за филтриране/по _Тема"
 
@@ -3601,7 +3603,7 @@ msgid "MainWindow: color allocation %d failed\n"
 msgstr ""
 
 #: src/mainwindow.c:1139 src/summaryview.c:2275 src/summaryview.c:2360
-#: src/summaryview.c:3907 src/summaryview.c:4036 src/summaryview.c:4394
+#: src/summaryview.c:3908 src/summaryview.c:4037 src/summaryview.c:4395
 msgid "done.\n"
 msgstr "готово.\n"
 
@@ -3866,7 +3868,7 @@ msgid "Find text:"
 msgstr "Намиране на текст:"
 
 #: src/message_search.c:153 src/prefs_search_folder.c:253
-#: src/query_search.c:326
+#: src/query_search.c:343
 msgid "Case sensitive"
 msgstr "Чувствителност към размера на символите"
 
@@ -3890,27 +3892,27 @@ msgstr "Достигнат е краят на съобщението; продъ
 msgid "Search finished"
 msgstr "Търсенето приключи"
 
-#: src/messageview.c:268
+#: src/messageview.c:269
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/_Инструменти/_Добавяне на подател в адресната книга"
 
-#: src/messageview.c:300
+#: src/messageview.c:301
 msgid "Creating message view...\n"
 msgstr "Създаване на изглед на съобщениято...\n"
 
-#: src/messageview.c:325
+#: src/messageview.c:326
 msgid "Text"
 msgstr "Текст"
 
-#: src/messageview.c:330
+#: src/messageview.c:331
 msgid "Attachments"
 msgstr "Притурки"
 
-#: src/messageview.c:380
+#: src/messageview.c:381
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:699 src/summaryview.c:3436
+#: src/messageview.c:700 src/summaryview.c:3436
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Не може да се запази файлът `%s'."
@@ -3928,7 +3930,7 @@ msgstr "Изпълняване"
 msgid "Print"
 msgstr "Печат"
 
-#: src/messageview.c:770 src/summaryview.c:3471
+#: src/messageview.c:769 src/summaryview.c:3470
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -4028,11 +4030,11 @@ msgstr ""
 "Въведете командният ред за отваряне на файл:\n"
 "(%s ще бъде заменен с име на файл)"
 
-#: src/mimeview.c:1147
+#: src/mimeview.c:1140
 msgid "Opening executable file"
 msgstr ""
 
-#: src/mimeview.c:1148
+#: src/mimeview.c:1141
 msgid ""
 "This is an executable file. Opening executable file is restricted for "
 "security.\n"
@@ -4040,11 +4042,6 @@ msgid ""
 "virus or something like a malicious program."
 msgstr ""
 
-#: src/mimeview.c:1184
-#, c-format
-msgid "MIME viewer command line is invalid: `%s'"
-msgstr "Командния ред за MIME преглед е невалиден: `%s'"
-
 #: src/passphrase.c:96
 msgid "Passphrase"
 msgstr "Парола"
@@ -5852,21 +5849,21 @@ msgstr "Reply-To:"
 msgid "%s - Edit search condition"
 msgstr ""
 
-#: src/prefs_search_folder.c:209 src/query_search.c:257
+#: src/prefs_search_folder.c:209 src/query_search.c:274
 msgid "Match any of the following"
 msgstr ""
 
-#: src/prefs_search_folder.c:211 src/query_search.c:259
+#: src/prefs_search_folder.c:211 src/query_search.c:276
 #, fuzzy
 msgid "Match all of the following"
 msgstr "Автоматично установяване на следните адреси"
 
-#: src/prefs_search_folder.c:231 src/query_search.c:303
+#: src/prefs_search_folder.c:231 src/query_search.c:320
 #, fuzzy
 msgid "Folder:"
 msgstr "Папка"
 
-#: src/prefs_search_folder.c:248 src/query_search.c:321
+#: src/prefs_search_folder.c:248 src/query_search.c:338
 #, fuzzy
 msgid "Search subfolders"
 msgstr "Търсенето се провали"
@@ -5881,17 +5878,17 @@ msgid "Attachment"
 msgstr "Притурка"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73 src/query_search.c:371 src/summaryview.c:4901
+#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4902
 msgid "Subject"
 msgstr "Тема"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/query_search.c:372 src/summaryview.c:4904
+#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4905
 msgid "From"
 msgstr "Подател"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/query_search.c:373 src/summaryview.c:4906
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:4907
 msgid "Date"
 msgstr "Дата"
 
@@ -5985,43 +5982,43 @@ msgstr "Създаване на диалог на прогреса...\n"
 msgid "Status"
 msgstr "Статус"
 
-#: src/query_search.c:234
+#: src/query_search.c:251
 msgid "Search messages"
 msgstr "Търсене на съобщения"
 
-#: src/query_search.c:395
+#: src/query_search.c:423
 #, fuzzy
 msgid "_Save as search folder"
 msgstr "Запазване в папката с чернови"
 
-#: src/query_search.c:512 src/subscribedialog.c:526 src/summaryview.c:842
+#: src/query_search.c:542 src/subscribedialog.c:526 src/summaryview.c:842
 msgid "Done."
 msgstr "Изпълнено."
 
-#: src/query_search.c:536
+#: src/query_search.c:566
 #, fuzzy, c-format
 msgid "Searching %s ..."
 msgstr "Сканиране на папка %s ..."
 
-#: src/query_search.c:564
+#: src/query_search.c:594
 #, fuzzy, c-format
 msgid "Searching %s (%d / %d)..."
 msgstr "Филтриране..."
 
-#: src/query_search.c:645 src/summaryview.c:2051
+#: src/query_search.c:675 src/summaryview.c:2051
 msgid "(No Date)"
 msgstr "(Няма Дата)"
 
-#: src/query_search.c:833
+#: src/query_search.c:869
 #, fuzzy
 msgid "Save as search folder"
 msgstr "Запазване в папката с чернови"
 
-#: src/query_search.c:854
+#: src/query_search.c:890
 msgid "Location:"
 msgstr ""
 
-#: src/query_search.c:869
+#: src/query_search.c:905
 #, fuzzy
 msgid "Folder name:"
 msgstr "Име на файл"
@@ -6652,37 +6649,37 @@ msgstr "Съобщение %d е определено за копиране в %
 msgid "Destination for copy is same as current folder."
 msgstr "Назначението за копиране е същото като текущата папка."
 
-#: src/summaryview.c:3506
+#: src/summaryview.c:3507
 msgid "Error occurred while processing messages."
 msgstr "Възникна грешка при обработка на съобщенията."
 
-#: src/summaryview.c:3814 src/summaryview.c:3815
+#: src/summaryview.c:3815 src/summaryview.c:3816
 msgid "Building threads..."
 msgstr "Изграждане на нишките..."
 
-#: src/summaryview.c:3965 src/summaryview.c:3966
+#: src/summaryview.c:3966 src/summaryview.c:3967
 msgid "Unthreading..."
 msgstr "Махане на нишките..."
 
-#: src/summaryview.c:4259 src/summaryview.c:4315
+#: src/summaryview.c:4260 src/summaryview.c:4316
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Филтриране..."
 
-#: src/summaryview.c:4364
+#: src/summaryview.c:4365
 msgid "filtering..."
 msgstr "филтриране..."
 
-#: src/summaryview.c:4365
+#: src/summaryview.c:4366
 msgid "Filtering..."
 msgstr "Филтриране..."
 
-#: src/summaryview.c:4401
+#: src/summaryview.c:4402
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr ""
 
-#: src/summaryview.c:4910
+#: src/summaryview.c:4911
 msgid "No."
 msgstr "No."
 
@@ -6771,6 +6768,9 @@ msgstr "Изход"
 msgid "Sylpheed"
 msgstr "Стар Sylpheed"
 
+#~ msgid "MIME viewer command line is invalid: `%s'"
+#~ msgstr "Командния ред за MIME преглед е невалиден: `%s'"
+
 #~ msgid "%dB"
 #~ msgstr "%dB"
 
diff --git a/po/cs.po b/po/cs.po
index 9e621e0f..ce134647 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-03-02 19:03+0900\n"
+"POT-Creation-Date: 2006-03-10 16:06+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:491
+#: libsylph/prefs_common.c:496
 #, fuzzy
 msgid "Junk mail filter"
 msgstr "Složka"
@@ -522,7 +522,7 @@ msgstr "nelze otevřít označený soubor\n"
 msgid "can't fetch message %d\n"
 msgstr "nelze načíst zprávu %d\n"
 
-#: libsylph/procmsg.c:1375
+#: libsylph/procmsg.c:1378
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Neplatný příkazový řádek tisku: '%s'\n"
@@ -600,12 +600,12 @@ msgstr "  Předmět: %s\n"
 msgid "  Issuer: %s\n"
 msgstr "  Vydavatel: %s\n"
 
-#: libsylph/utils.c:2411 src/compose.c:2869 src/compose.c:3132
-#: src/compose.c:3195 src/compose.c:3315
+#: libsylph/utils.c:2430 src/compose.c:2888 src/compose.c:3151
+#: src/compose.c:3214 src/compose.c:3334
 msgid "can't change file mode\n"
 msgstr "nelze změnit mód souboru\n"
 
-#: libsylph/utils.c:2418 libsylph/utils.c:2542
+#: libsylph/utils.c:2437 libsylph/utils.c:2561
 #, c-format
 msgid "writing to %s failed.\n"
 msgstr "Neúspěšný zápis do %s.\n"
@@ -686,8 +686,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:493
-#: src/compose.c:4273 src/editaddress.c:200 src/editaddress.c:942
+#: src/account_dialog.c:366 src/addressadd.c:192 src/addressbook.c:491
+#: src/compose.c:4292 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
@@ -825,12 +825,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:4777 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4796 src/editaddress.c:201
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "Adresa"
 
-#: src/addressadd.c:212 src/addressbook.c:495 src/editaddress.c:202
+#: src/addressadd.c:212 src/addressbook.c:493 src/editaddress.c:202
 #: src/editaddress.c:795 src/editaddress.c:860 src/editgroup.c:267
 msgid "Remarks"
 msgstr "Poznámky"
@@ -839,110 +839,111 @@ msgstr "Poznámky"
 msgid "Select Address Book Folder"
 msgstr "Vybrat složku pro databázi adres"
 
-#: src/addressbook.c:338 src/compose.c:515 src/mainwindow.c:489
+#: src/addressbook.c:337 src/compose.c:515 src/mainwindow.c:489
 #: src/messageview.c:140
 msgid "/_File"
 msgstr "/_Soubor"
 
-#: src/addressbook.c:339
+#: src/addressbook.c:338
 msgid "/_File/New _Book"
 msgstr "/_Soubor/Nová _databáze"
 
-#: src/addressbook.c:340
+#: src/addressbook.c:339
 msgid "/_File/New _vCard"
 msgstr "/_Soubor/Nová _vCard"
 
-#: src/addressbook.c:342
+#: src/addressbook.c:341
 msgid "/_File/New _JPilot"
 msgstr "/_Soubor/Nový _JPilot"
 
-#: src/addressbook.c:345
-msgid "/_File/New _Server"
+#: src/addressbook.c:344
+#, fuzzy
+msgid "/_File/New _LDAP Server"
 msgstr "/_Soubor/Nový _server"
 
-#: src/addressbook.c:347 src/addressbook.c:350 src/compose.c:520
+#: src/addressbook.c:346 src/addressbook.c:349 src/compose.c:520
 #: src/compose.c:525 src/compose.c:528 src/compose.c:531 src/mainwindow.c:507
 #: src/mainwindow.c:510 src/mainwindow.c:512 src/mainwindow.c:515
 #: src/mainwindow.c:517 src/messageview.c:143
 msgid "/_File/---"
 msgstr "/_Soubor/---"
 
-#: src/addressbook.c:348
+#: src/addressbook.c:347
 msgid "/_File/_Edit"
 msgstr "/_Soubor/Up_ravit"
 
-#: src/addressbook.c:349
+#: src/addressbook.c:348
 msgid "/_File/_Delete"
 msgstr "/_Soubor/_Smazat"
 
-#: src/addressbook.c:351
+#: src/addressbook.c:350
 msgid "/_File/_Save"
 msgstr "/_Soubor/_Uložit"
 
-#: src/addressbook.c:352 src/compose.c:532 src/messageview.c:144
+#: src/addressbook.c:351 src/compose.c:532 src/messageview.c:144
 msgid "/_File/_Close"
 msgstr "/_Soubor/_Zavřít"
 
-#: src/addressbook.c:353
+#: src/addressbook.c:352
 msgid "/_Address"
 msgstr "/_Adresa"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:353
 msgid "/_Address/New _Address"
 msgstr "/_Adresa/Nová _adresa"
 
-#: src/addressbook.c:355
+#: src/addressbook.c:354
 msgid "/_Address/New _Group"
 msgstr "/_Adresa/Nová _skupina"
 
-#: src/addressbook.c:356
+#: src/addressbook.c:355
 msgid "/_Address/New _Folder"
 msgstr "/_Adresa/Nová s_ložka"
 
-#: src/addressbook.c:357
+#: src/addressbook.c:356
 msgid "/_Address/---"
 msgstr "/_Adresa/--"
 
-#: src/addressbook.c:358
+#: src/addressbook.c:357
 msgid "/_Address/_Edit"
 msgstr "/_Adresa/U_pravit"
 
-#: src/addressbook.c:359
+#: src/addressbook.c:358
 msgid "/_Address/_Delete"
 msgstr "/_Adresa/S_mazat"
 
-#: src/addressbook.c:360 src/compose.c:645 src/mainwindow.c:758
-#: src/messageview.c:266
+#: src/addressbook.c:359 src/compose.c:645 src/mainwindow.c:758
+#: src/messageview.c:267
 msgid "/_Tools"
 msgstr "/_Nástroje"
 
-#: src/addressbook.c:361
+#: src/addressbook.c:360
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Nástroje/Importovat _LDIF soubor"
 
-#: src/addressbook.c:362 src/compose.c:666 src/mainwindow.c:812
-#: src/messageview.c:286
+#: src/addressbook.c:361 src/compose.c:666 src/mainwindow.c:812
+#: src/messageview.c:287
 msgid "/_Help"
 msgstr "/Nápo_věda"
 
-#: src/addressbook.c:363 src/compose.c:667 src/mainwindow.c:824
-#: src/messageview.c:287
+#: src/addressbook.c:362 src/compose.c:667 src/mainwindow.c:824
+#: src/messageview.c:288
 msgid "/_Help/_About"
 msgstr "/Nápo_věda/_O aplikaci"
 
-#: src/addressbook.c:382 src/addressbook.c:392
+#: src/addressbook.c:381 src/addressbook.c:391
 msgid "/New _Address"
 msgstr "/Nová _adresa"
 
-#: src/addressbook.c:383 src/addressbook.c:393
+#: src/addressbook.c:382 src/addressbook.c:392
 msgid "/New _Group"
 msgstr "/Nová _skupina"
 
-#: src/addressbook.c:384 src/addressbook.c:394
+#: src/addressbook.c:383 src/addressbook.c:393
 msgid "/New _Folder"
 msgstr "/Nová s_ložka"
 
-#: src/addressbook.c:385 src/addressbook.c:395 src/compose.c:509
+#: src/addressbook.c:384 src/addressbook.c:394 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
@@ -952,70 +953,70 @@ msgstr "/Nová s_ložka"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:386 src/addressbook.c:396 src/compose.c:534
+#: src/addressbook.c:385 src/addressbook.c:395 src/compose.c:534
 #: src/mainwindow.c:521 src/messageview.c:146
 msgid "/_Edit"
 msgstr "/Úp_ravy"
 
-#: src/addressbook.c:387 src/addressbook.c:397 src/summaryview.c:434
+#: src/addressbook.c:386 src/addressbook.c:396 src/summaryview.c:434
 msgid "/_Delete"
 msgstr "/_Smazat"
 
-#: src/addressbook.c:494
+#: src/addressbook.c:492
 msgid "E-Mail address"
 msgstr "E-mail adresa"
 
-#: src/addressbook.c:498 src/compose.c:4778 src/prefs_common_dialog.c:2183
+#: src/addressbook.c:496 src/compose.c:4797 src/prefs_common_dialog.c:2183
 msgid "Address book"
 msgstr "Databáze adres"
 
-#: src/addressbook.c:600 src/prefs_filter_edit.c:249
+#: src/addressbook.c:603 src/prefs_filter_edit.c:249
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "Jméno:"
 
 #. Buttons
-#: src/addressbook.c:632 src/addressbook.c:1684 src/editaddress.c:884
+#: src/addressbook.c:636 src/addressbook.c:1678 src/editaddress.c:884
 #: src/editaddress.c:1017 src/mainwindow.c:2426 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:635 src/editaddress.c:890 src/editaddress.c:1023
+#: src/addressbook.c:639 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:1552
 msgid "Add"
 msgstr "Přidat"
 
-#: src/addressbook.c:638
+#: src/addressbook.c:642
 msgid "Lookup"
 msgstr "Hledat"
 
-#: src/addressbook.c:650 src/headerview.c:55 src/prefs_folder_item.c:339
+#: src/addressbook.c:654 src/headerview.c:55 src/prefs_folder_item.c:339
 #: src/prefs_template.c:176
 msgid "To:"
 msgstr "Komu:"
 
-#: src/addressbook.c:654 src/prefs_folder_item.c:356 src/prefs_template.c:178
+#: src/addressbook.c:658 src/prefs_folder_item.c:356 src/prefs_template.c:178
 msgid "Cc:"
 msgstr "Kopie:"
 
-#: src/addressbook.c:658 src/prefs_folder_item.c:367
+#: src/addressbook.c:662 src/prefs_folder_item.c:367
 msgid "Bcc:"
 msgstr "Slepá kopie:"
 
 #. Confirm deletion
-#: src/addressbook.c:845
+#: src/addressbook.c:832
 msgid "Delete address(es)"
 msgstr "Smazat adresu(y)"
 
-#: src/addressbook.c:846
+#: src/addressbook.c:833
 msgid "Really delete the address(es)?"
 msgstr "Opravdu chcete smazat tuto adresu(y)?"
 
-#: src/addressbook.c:1675
+#: src/addressbook.c:1669
 #, fuzzy, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1024,38 +1025,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:1678 src/folderview.c:2372
+#: src/addressbook.c:1672 src/folderview.c:2372
 msgid "Delete folder"
 msgstr "Smazat složku "
 
-#: src/addressbook.c:1678
+#: src/addressbook.c:1672
 #, fuzzy
 msgid "_Folder only"
 msgstr "Pouze složku"
 
-#: src/addressbook.c:1678
+#: src/addressbook.c:1672
 #, fuzzy
 msgid "Folder and _addresses"
 msgstr "Složku a adresy"
 
-#: src/addressbook.c:1683
+#: src/addressbook.c:1677
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Opravdu smazat '%s' ?"
 
-#: src/addressbook.c:2369 src/addressbook.c:2502
+#: src/addressbook.c:2363 src/addressbook.c:2496
 msgid "New user, could not save index file."
 msgstr "Nový uživatel, nelze uložit index soubor."
 
-#: src/addressbook.c:2373 src/addressbook.c:2506
+#: src/addressbook.c:2367 src/addressbook.c:2500
 msgid "New user, could not save address book files."
 msgstr "Nový uživatel, nelze uložit soubory s databází adres."
 
-#: src/addressbook.c:2383 src/addressbook.c:2516
+#: src/addressbook.c:2377 src/addressbook.c:2510
 msgid "Old address book converted successfully."
 msgstr "Konverze staré databáze adres proběhla úspěšně."
 
-#: src/addressbook.c:2388
+#: src/addressbook.c:2382
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1063,7 +1064,7 @@ msgstr ""
 "Stará databáze adres převedena,\n"
 "nelze uložit nový soubor s indexem"
 
-#: src/addressbook.c:2401
+#: src/addressbook.c:2395
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1071,7 +1072,7 @@ msgstr ""
 "Nelze provést konverzi databáze adres,\n"
 "ale byl vytvořen nový soubor pro databázi adres."
 
-#: src/addressbook.c:2407
+#: src/addressbook.c:2401
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1079,7 +1080,7 @@ msgstr ""
 "Nelze provést konverzi databáze adres,\n"
 "nelze ani vytvořit nové soubory databáze adres."
 
-#: src/addressbook.c:2412
+#: src/addressbook.c:2406
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1087,90 +1088,90 @@ msgstr ""
 "Nelze provést konverzi databáze adres\n"
 "a nelze ani vytvořit nové soubory databáze adres."
 
-#: src/addressbook.c:2419
+#: src/addressbook.c:2413
 msgid "Addressbook conversion error"
 msgstr "Chyba při konverzi databáze adres"
 
-#: src/addressbook.c:2423
+#: src/addressbook.c:2417
 msgid "Addressbook conversion"
 msgstr "Konverze databáze adres"
 
-#: src/addressbook.c:2458
+#: src/addressbook.c:2452
 msgid "Addressbook Error"
 msgstr "Chyba v databázi adres"
 
-#: src/addressbook.c:2459 src/addressbook.c:2559
+#: src/addressbook.c:2453 src/addressbook.c:2553
 msgid "Could not read address index"
 msgstr "Nelze načíst index adres"
 
-#: src/addressbook.c:2521
+#: src/addressbook.c:2515
 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:2535
+#: src/addressbook.c:2529
 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:2541
+#: src/addressbook.c:2535
 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:2547
+#: src/addressbook.c:2541
 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:2565
+#: src/addressbook.c:2559
 msgid "Addressbook Conversion Error"
 msgstr "Chyba při konverzi databáze adres"
 
-#: src/addressbook.c:2571
+#: src/addressbook.c:2565
 msgid "Addressbook Conversion"
 msgstr "Konverze databáze adres"
 
-#: src/addressbook.c:3086 src/prefs_common_dialog.c:2033
+#: src/addressbook.c:3080 src/prefs_common_dialog.c:2033
 msgid "Interface"
 msgstr "Rozhraní"
 
-#: src/addressbook.c:3102 src/importldif.c:514
+#: src/addressbook.c:3096 src/importldif.c:514
 msgid "Address Book"
 msgstr "Databáze adres"
 
-#: src/addressbook.c:3118
+#: src/addressbook.c:3112
 msgid "Person"
 msgstr "Osoba"
 
-#: src/addressbook.c:3134
+#: src/addressbook.c:3128
 msgid "EMail Address"
 msgstr "Email adresa"
 
-#: src/addressbook.c:3150
+#: src/addressbook.c:3144
 msgid "Group"
 msgstr "Skupina"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3166 src/folderview.c:367 src/prefs_account_dialog.c:1694
-#: src/query_search.c:370
+#: src/addressbook.c:3160 src/folderview.c:367 src/prefs_account_dialog.c:1694
+#: src/query_search.c:398
 msgid "Folder"
 msgstr "Složka"
 
-#: src/addressbook.c:3182
+#: src/addressbook.c:3176
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3198 src/addressbook.c:3214
+#: src/addressbook.c:3192 src/addressbook.c:3208
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3230
+#: src/addressbook.c:3224
 msgid "LDAP Server"
 msgstr "LDAP server"
 
@@ -1182,7 +1183,7 @@ msgstr "Společná adresa"
 msgid "Personal address"
 msgstr "Osobní adresa"
 
-#: src/alertpanel.c:142 src/compose.c:5500 src/main.c:621
+#: src/alertpanel.c:142 src/compose.c:5517 src/main.c:621
 msgid "Notice"
 msgstr "Poznámka"
 
@@ -1190,7 +1191,7 @@ msgstr "Poznámka"
 msgid "Warning"
 msgstr "Varování"
 
-#: src/alertpanel.c:168 src/inc.c:587
+#: src/alertpanel.c:168 src/inc.c:586
 msgid "Error"
 msgstr "Chyba"
 
@@ -1233,7 +1234,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:4761
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4762
 msgid "None"
 msgstr "Žádná"
 
@@ -1511,7 +1512,7 @@ msgstr "/Z_obrazit/_Znaková sada/Thajská (TIS-620)"
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/Z_obrazit/_Znaková sada/Thajská (Windows-874)"
 
-#: src/compose.c:646 src/mainwindow.c:759 src/messageview.c:267
+#: src/compose.c:646 src/mainwindow.c:759 src/messageview.c:268
 msgid "/_Tools/_Address book"
 msgstr "/_Nástroje/_Databáze adres"
 
@@ -1519,14 +1520,14 @@ msgstr "/_Nástroje/_Databáze adres"
 msgid "/_Tools/_Template"
 msgstr "/_Nástroje/Ša_blona"
 
-#: src/compose.c:649 src/mainwindow.c:783 src/messageview.c:283
+#: src/compose.c:649 src/mainwindow.c:783 src/messageview.c:284
 msgid "/_Tools/Actio_ns"
 msgstr "/_Nástroje/_Akce"
 
 #: src/compose.c:651 src/compose.c:655 src/compose.c:661 src/mainwindow.c:762
 #: src/mainwindow.c:776 src/mainwindow.c:781 src/mainwindow.c:784
-#: src/mainwindow.c:788 src/mainwindow.c:790 src/messageview.c:270
-#: src/messageview.c:282
+#: src/mainwindow.c:788 src/mainwindow.c:790 src/messageview.c:271
+#: src/messageview.c:283
 msgid "/_Tools/---"
 msgstr "/_Nástroje/---"
 
@@ -1555,80 +1556,80 @@ msgstr "/_Nástroje/S_pustit"
 msgid "/_Tools/_Set spell language"
 msgstr "/_Nástroje/Ša_blona"
 
-#: src/compose.c:910
+#: src/compose.c:912
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: soubor neexistuje\n"
 
-#: src/compose.c:1014 src/compose.c:1085
+#: src/compose.c:1016 src/compose.c:1087
 msgid "Can't get text part\n"
 msgstr "Nelze získat část textu\n"
 
-#: src/compose.c:1486
+#: src/compose.c:1488
 msgid "Quote mark format error."
 msgstr "Chyba v uvozovkách."
 
-#: src/compose.c:1498
+#: src/compose.c:1500
 msgid "Message reply/forward format error."
 msgstr "Chyba formátu odpovědi/přeposlání."
 
-#: src/compose.c:1918
+#: src/compose.c:1935
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Soubor %s neexistuje\n"
 
-#: src/compose.c:1922
+#: src/compose.c:1939
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Nemohu zjistit délku souboru %s\n"
 
-#: src/compose.c:1926
+#: src/compose.c:1943
 #, c-format
 msgid "File %s is empty."
 msgstr "Soubor %s je prázdný."
 
-#: src/compose.c:1930
+#: src/compose.c:1947
 #, c-format
 msgid "Can't read %s."
 msgstr "Nemohu načíst %s."
 
-#: src/compose.c:1963
+#: src/compose.c:1980
 #, c-format
 msgid "Message: %s"
 msgstr "Zpráva: %s"
 
-#: src/compose.c:2023 src/mimeview.c:565
+#: src/compose.c:2040 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:2507 src/headerview.c:195 src/query_search.c:636
+#: src/compose.c:2524 src/headerview.c:195 src/query_search.c:666
 #: src/summaryview.c:2124
 msgid "(No Subject)"
 msgstr "(Žádný předmět)"
 
-#: src/compose.c:2510
+#: src/compose.c:2527
 #, fuzzy, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Psaní zprávy%s"
 
-#: src/compose.c:2623
+#: src/compose.c:2642
 msgid "Recipient is not specified."
 msgstr "Není uveden příjemce."
 
-#: src/compose.c:2631
+#: src/compose.c:2650
 #, fuzzy
 msgid "Empty subject"
 msgstr "Předmět"
 
-#: src/compose.c:2632
+#: src/compose.c:2651
 msgid "Subject is empty. Send it anyway?"
 msgstr "Předmět je prázdný. Přesto mám zprávu odeslat?"
 
-#: src/compose.c:2691
+#: src/compose.c:2710
 msgid "can't get recipient list."
 msgstr "Nelze načíst seznam příjemců."
 
-#: src/compose.c:2711
+#: src/compose.c:2730
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1636,21 +1637,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:2725 src/send_message.c:299
+#: src/compose.c:2744 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:2767
+#: src/compose.c:2786
 msgid "Can't save the message to outbox."
 msgstr "Zprávu nelze uložit do odeslané pošty."
 
-#: src/compose.c:2805
+#: src/compose.c:2824
 #, 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:2902
+#: src/compose.c:2921
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1661,12 +1662,12 @@ msgstr ""
 "%s na %s.\n"
 "Přesto poslat?"
 
-#: src/compose.c:2908
+#: src/compose.c:2927
 #, fuzzy
 msgid "Code conversion error"
 msgstr "Chyba při konverzi databáze adres"
 
-#: src/compose.c:2981
+#: src/compose.c:3000
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1675,159 +1676,159 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:2985
+#: src/compose.c:3004
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3275
+#: src/compose.c:3294
 msgid "can't remove the old message\n"
 msgstr "nelze smazat staré zprávy\n"
 
-#: src/compose.c:3293
+#: src/compose.c:3312
 msgid "queueing message...\n"
 msgstr "zařazuji zprávu...\n"
 
-#: src/compose.c:3375
+#: src/compose.c:3394
 msgid "can't find queue folder\n"
 msgstr "nelze najít složku s frontou zpráv\n"
 
-#: src/compose.c:3382
+#: src/compose.c:3401
 msgid "can't queue the message\n"
 msgstr "Zprávu nelze zařadit\n"
 
-#: src/compose.c:3975
+#: src/compose.c:3994
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "vytvářím číslo zprávy: %s\n"
 
-#: src/compose.c:4088
+#: src/compose.c:4107
 msgid "Creating compose window...\n"
 msgstr "Vytvářím okno pro psaní...\n"
 
-#: src/compose.c:4139 src/headerview.c:54
+#: src/compose.c:4158 src/headerview.c:54
 msgid "From:"
 msgstr "Od:"
 
-#: src/compose.c:4213
+#: src/compose.c:4232
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/_Nástroje/_Akce"
 
-#: src/compose.c:4216
+#: src/compose.c:4235
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/_Zpráva/Zaši_frovat"
 
-#: src/compose.c:4254 src/compose.c:5332
+#: src/compose.c:4273 src/compose.c:5351
 msgid "MIME type"
 msgstr "MIME typ"
 
 #. S_COL_DATE
-#: src/compose.c:4263 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4908
+#: src/compose.c:4282 src/mimeview.c:197 src/prefs_filter_edit.c:496
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4909
 msgid "Size"
 msgstr "Délka"
 
-#: src/compose.c:4698 src/mainwindow.c:2359 src/prefs_account_dialog.c:528
+#: src/compose.c:4717 src/mainwindow.c:2359 src/prefs_account_dialog.c:528
 #: src/prefs_common_dialog.c:661
 msgid "Send"
 msgstr "Odeslat"
 
-#: src/compose.c:4699
+#: src/compose.c:4718
 msgid "Send message"
 msgstr "Odešle zprávu"
 
-#: src/compose.c:4707
+#: src/compose.c:4726
 msgid "Send later"
 msgstr "Poslat později"
 
-#: src/compose.c:4708
+#: src/compose.c:4727
 msgid "Put into queue folder and send later"
 msgstr "Zařadí do výstupní fronty a odešle později"
 
-#: src/compose.c:4716
+#: src/compose.c:4735
 msgid "Draft"
 msgstr "Koncept"
 
-#: src/compose.c:4717
+#: src/compose.c:4736
 msgid "Save to draft folder"
 msgstr "Uloží koncept do složky"
 
-#: src/compose.c:4727
+#: src/compose.c:4746
 msgid "Insert"
 msgstr "Vložit"
 
-#: src/compose.c:4728
+#: src/compose.c:4747
 msgid "Insert file"
 msgstr "Vloží soubor"
 
-#: src/compose.c:4736
+#: src/compose.c:4755
 msgid "Attach"
 msgstr "Příloha"
 
-#: src/compose.c:4737
+#: src/compose.c:4756
 msgid "Attach file"
 msgstr "Připojí soubor"
 
 #. signature
-#: src/compose.c:4747 src/prefs_account_dialog.c:1208
+#: src/compose.c:4766 src/prefs_account_dialog.c:1208
 #: src/prefs_common_dialog.c:953
 msgid "Signature"
 msgstr "Podpis"
 
-#: src/compose.c:4748
+#: src/compose.c:4767
 #, fuzzy
 msgid "Append signature"
 msgstr "ŠPATNÝ podpis"
 
 #. editor
-#: src/compose.c:4757 src/prefs_common_dialog.c:991
+#: src/compose.c:4776 src/prefs_common_dialog.c:991
 #: src/prefs_common_dialog.c:2315
 msgid "Editor"
 msgstr "Editor"
 
-#: src/compose.c:4758
+#: src/compose.c:4777
 msgid "Edit with external editor"
 msgstr "Úprava externím editorem"
 
-#: src/compose.c:4766
+#: src/compose.c:4785
 msgid "Linewrap"
 msgstr "Zarovnání"
 
-#: src/compose.c:4767
+#: src/compose.c:4786
 msgid "Wrap all long lines"
 msgstr "Zarovnání dlouhých řádků"
 
-#: src/compose.c:5228
+#: src/compose.c:5247
 msgid "Invalid MIME type."
 msgstr "Neplatný MIME typ."
 
-#: src/compose.c:5246
+#: src/compose.c:5265
 msgid "File doesn't exist or is empty."
 msgstr "Soubor neexistuje nebo je prázdný."
 
-#: src/compose.c:5314
+#: src/compose.c:5333
 msgid "Properties"
 msgstr "Vlastnosti"
 
-#: src/compose.c:5334 src/prefs_common_dialog.c:1444
+#: src/compose.c:5353 src/prefs_common_dialog.c:1444
 msgid "Encoding"
 msgstr "Kódování"
 
-#: src/compose.c:5357 src/prefs_folder_item.c:202
+#: src/compose.c:5376 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Cesta k souboru"
 
-#: src/compose.c:5358
+#: src/compose.c:5377
 msgid "File name"
 msgstr "Název souboru"
 
-#: src/compose.c:5449
+#: src/compose.c:5466
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Špatný příkaz v externím editoru: '%s'\n"
 
-#: src/compose.c:5497
+#: src/compose.c:5514
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1837,48 +1838,48 @@ msgstr ""
 "Mám přerušit proces?\n"
 "číslo procesu: %d"
 
-#: src/compose.c:5872 src/compose.c:5877 src/compose.c:5883
+#: src/compose.c:5889 src/compose.c:5894 src/compose.c:5900
 msgid "Can't queue the message."
 msgstr "Zprávu nelze zařadit."
 
-#: src/compose.c:5974
+#: src/compose.c:5991
 #, fuzzy
 msgid "Select files"
 msgstr "Vybrat soubor"
 
-#: src/compose.c:5997
+#: src/compose.c:6014
 msgid "Select file"
 msgstr "Vybrat soubor"
 
-#: src/compose.c:6032
+#: src/compose.c:6049
 #, fuzzy
 msgid "Save message"
 msgstr "Odešle zprávu"
 
-#: src/compose.c:6033
+#: src/compose.c:6050
 #, 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:6035
+#: src/compose.c:6052
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:6077
+#: src/compose.c:6094
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Opravdu chcete použít šablonu '%s' ?"
 
-#: src/compose.c:6079
+#: src/compose.c:6096
 msgid "Apply template"
 msgstr "Přidat šablonu"
 
-#: src/compose.c:6080
+#: src/compose.c:6097
 #, fuzzy
 msgid "_Replace"
 msgstr "Nahradit"
 
-#: src/compose.c:6080
+#: src/compose.c:6097
 #, fuzzy
 msgid "_Insert"
 msgstr "Vložit"
@@ -2000,53 +2001,53 @@ msgstr "Musí být zadáno jméno skupiny."
 msgid "Edit Group Data"
 msgstr "Upravit data o skupině"
 
-#: src/editgroup.c:300
+#: src/editgroup.c:299
 msgid "Group Name"
 msgstr "Jméno skupiny"
 
-#: src/editgroup.c:319
+#: src/editgroup.c:318
 msgid "Addresses in Group"
 msgstr "Adresy ve skupině"
 
-#: src/editgroup.c:321
+#: src/editgroup.c:320
 msgid " -> "
 msgstr " -> "
 
-#: src/editgroup.c:348
+#: src/editgroup.c:347
 msgid " <- "
 msgstr " <- "
 
-#: src/editgroup.c:350
+#: src/editgroup.c:349
 msgid "Available Addresses"
 msgstr "Dostupné adresy"
 
-#: src/editgroup.c:416
+#: src/editgroup.c:415
 msgid "Move E-Mail Addresses to or from Group with arrow buttons"
 msgstr ""
 "E-mail adresy lze přesunovat do a ze skupiny pomocí tlačítek se šipkami"
 
-#: src/editgroup.c:468
+#: src/editgroup.c:467
 msgid "Edit Group Details"
 msgstr "Upravit detaily o skupině"
 
-#: src/editgroup.c:471
+#: src/editgroup.c:470
 msgid "Add New Group"
 msgstr "Přidat novou skupinu"
 
-#: src/editgroup.c:522
+#: src/editgroup.c:521
 msgid "Edit folder"
 msgstr "Upravit složku"
 
-#: src/editgroup.c:522
+#: src/editgroup.c:521
 msgid "Input the new name of folder:"
 msgstr "Zadejte název složky:"
 
-#: src/editgroup.c:525 src/foldersel.c:541 src/folderview.c:2121
+#: src/editgroup.c:524 src/foldersel.c:541 src/folderview.c:2121
 #: src/folderview.c:2127
 msgid "New folder"
 msgstr "Nová složka"
 
-#: src/editgroup.c:526 src/foldersel.c:542 src/folderview.c:2128
+#: src/editgroup.c:525 src/foldersel.c:542 src/folderview.c:2128
 msgid "Input the name of new folder:"
 msgstr "Zadejte název složky:"
 
@@ -2244,7 +2245,7 @@ msgid "`%c' can't be included in folder name."
 msgstr "%c nemůže být obsaženo ve jméně složky."
 
 #: src/foldersel.c:561 src/folderview.c:2147 src/folderview.c:2206
-#: src/query_search.c:995
+#: src/query_search.c:1031
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Složka '%s' už existuje."
@@ -2506,7 +2507,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:2127
+#: src/headerview.c:180 src/query_search.c:667 src/summaryview.c:2127
 msgid "(No From)"
 msgstr "(není znám odesílatel)"
 
@@ -2636,135 +2637,135 @@ msgstr "Konec"
 msgid "Sylpheed: %d new messages"
 msgstr "Dokončeno (%d nová(é) zpráva(y))"
 
-#: src/inc.c:372
+#: src/inc.c:371
 msgid "Retrieving new messages"
 msgstr "Načítám nové zprávy"
 
-#: src/inc.c:415
+#: src/inc.c:414
 msgid "Standby"
 msgstr "V pohotovosti"
 
-#: src/inc.c:544 src/inc.c:593
+#: src/inc.c:543 src/inc.c:592
 msgid "Cancelled"
 msgstr "Zrušeno"
 
-#: src/inc.c:555
+#: src/inc.c:554
 msgid "Retrieving"
 msgstr "Načítám"
 
-#: src/inc.c:564
+#: src/inc.c:563
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "Hotovo (%d zpráv(a) (%s) přijato)"
 
-#: src/inc.c:568
+#: src/inc.c:567
 msgid "Done (no new messages)"
 msgstr "Hotovo (Nejsou žádné nové zprávy)"
 
-#: src/inc.c:574
+#: src/inc.c:573
 msgid "Connection failed"
 msgstr "Spojení selhalo"
 
-#: src/inc.c:577
+#: src/inc.c:576
 msgid "Auth failed"
 msgstr "Autentizace selhala"
 
-#: src/inc.c:580
+#: src/inc.c:579
 msgid "Locked"
 msgstr "Zamknuto"
 
-#: src/inc.c:590
+#: src/inc.c:589
 #, fuzzy
 msgid "Timeout"
 msgstr "Timeout (vteřin)"
 
-#: src/inc.c:640
+#: src/inc.c:639
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Dokončeno (%d nová(é) zpráva(y))"
 
-#: src/inc.c:643
+#: src/inc.c:642
 msgid "Finished (no new messages)"
 msgstr "Dokončeno (nejsou nové zprávy)"
 
-#: src/inc.c:652
+#: src/inc.c:651
 msgid "Some errors occurred while getting mail."
 msgstr "Během načítání zpráv se vyskytly chyby."
 
-#: src/inc.c:688
+#: src/inc.c:687
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "Získávám nové zprávy z účtu %s ...\n"
 
-#: src/inc.c:691
+#: src/inc.c:690
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s : Načítám nové zprávy"
 
-#: src/inc.c:710
+#: src/inc.c:709
 #, fuzzy, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Připojuji se na POP3 server: %s ..."
 
-#: src/inc.c:719
+#: src/inc.c:718
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Nemohu se spojit s POP3 serverem: %s:%d\n"
 
-#: src/inc.c:798 src/send_message.c:631
+#: src/inc.c:797 src/send_message.c:631
 msgid "Authenticating..."
 msgstr "Autentizuji..."
 
-#: src/inc.c:799
+#: src/inc.c:798
 #, fuzzy, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Získávám zprávy z %s do %s...\n"
 
-#: src/inc.c:804
+#: src/inc.c:803
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Zjišťuji počet nových zpráv (STAT)..."
 
-#: src/inc.c:808
+#: src/inc.c:807
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Zjišťuji počet nových zpráv (LAST)..."
 
-#: src/inc.c:812
+#: src/inc.c:811
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Zjišťuji počet nových zpráv (UIDL)..."
 
-#: src/inc.c:816
+#: src/inc.c:815
 msgid "Getting the size of messages (LIST)..."
 msgstr "Zjišťuji počet zpráv (LIST)..."
 
-#: src/inc.c:826
+#: src/inc.c:825
 #, c-format
 msgid "Deleting message %d"
 msgstr "Vymazávám zprávu %d"
 
-#: src/inc.c:833 src/send_message.c:649
+#: src/inc.c:832 src/send_message.c:649
 msgid "Quitting"
 msgstr "Ukončuji"
 
-#: src/inc.c:858
+#: src/inc.c:857
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Načítám zprávu (%d / %d) (%s / %s)"
 
-#: src/inc.c:879
+#: src/inc.c:878
 #, fuzzy, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Hotovo (%d zpráv(a) (%s) přijato)"
 
-#: src/inc.c:1107
+#: src/inc.c:1106
 #, fuzzy
 msgid "Connection failed."
 msgstr "Spojení selhalo"
 
-#: src/inc.c:1113
+#: src/inc.c:1112
 msgid "Error occurred while processing mail."
 msgstr "Během zpracovávání pošty se vyskytla chyba ."
 
-#: src/inc.c:1118
+#: src/inc.c:1117
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2773,28 +2774,28 @@ msgstr ""
 "Během zpracovávání pošty se vyskytla chyba:\n"
 "%s"
 
-#: src/inc.c:1124
+#: src/inc.c:1123
 msgid "No disk space left."
 msgstr "Nezbylo žádné místo na disku."
 
-#: src/inc.c:1129
+#: src/inc.c:1128
 msgid "Can't write file."
 msgstr "Nemohu zapisovat do souboru."
 
-#: src/inc.c:1134
+#: src/inc.c:1133
 msgid "Socket error."
 msgstr "Chyba soketu."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1140 src/send_message.c:584 src/send_message.c:772
+#: src/inc.c:1139 src/send_message.c:584 src/send_message.c:772
 msgid "Connection closed by the remote host."
 msgstr ""
 
-#: src/inc.c:1146
+#: src/inc.c:1145
 msgid "Mailbox is locked."
 msgstr "Poštovní schránka je zamčena."
 
-#: src/inc.c:1150
+#: src/inc.c:1149
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2803,11 +2804,11 @@ msgstr ""
 "Poštovní schránka je zamčena:\n"
 "%s"
 
-#: src/inc.c:1156 src/send_message.c:757
+#: src/inc.c:1155 src/send_message.c:757
 msgid "Authentication failed."
 msgstr "Autentikace selhala."
 
-#: src/inc.c:1161 src/send_message.c:760
+#: src/inc.c:1160 src/send_message.c:760
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2816,16 +2817,16 @@ msgstr ""
 "Autentikace selhala:\n"
 "%s"
 
-#: src/inc.c:1166 src/send_message.c:776
+#: src/inc.c:1165 src/send_message.c:776
 #, fuzzy
 msgid "Session timed out."
 msgstr "vypršel čas relace\n"
 
-#: src/inc.c:1202
+#: src/inc.c:1201
 msgid "Incorporation cancelled\n"
 msgstr "Začleňování zrušeno\n"
 
-#: src/inc.c:1285
+#: src/inc.c:1284
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Načítám nové zprávy z %s do %s...\n"
@@ -3310,14 +3311,15 @@ msgid "/_View/Mess_age source"
 msgstr "/Z_obrazit/Zd_roj zprávy"
 
 #: src/mainwindow.c:708 src/messageview.c:245
-msgid "/_View/Show all _header"
+#, fuzzy
+msgid "/_View/Show all _headers"
 msgstr "/Z_obrazit/Zobrazit všechna zá_hlaví"
 
 #: src/mainwindow.c:710
 msgid "/_View/_Update summary"
 msgstr "/Z_obrazit/_Aktualizace souhrnu"
 
-#: src/mainwindow.c:712 src/messageview.c:247
+#: src/mainwindow.c:712 src/messageview.c:248
 msgid "/_Message"
 msgstr "/_Zpráva"
 
@@ -3352,16 +3354,16 @@ msgstr "/_Zpráva/Odeslat pozd_ržené zprávy"
 
 #: src/mainwindow.c:722 src/mainwindow.c:724 src/mainwindow.c:731
 #: src/mainwindow.c:736 src/mainwindow.c:739 src/mainwindow.c:750
-#: src/mainwindow.c:752 src/mainwindow.c:755 src/messageview.c:250
-#: src/messageview.c:258 src/messageview.c:263
+#: src/mainwindow.c:752 src/mainwindow.c:755 src/messageview.c:251
+#: src/messageview.c:259 src/messageview.c:264
 msgid "/_Message/---"
 msgstr "/_Zpráva/---"
 
-#: src/mainwindow.c:723 src/messageview.c:248
+#: src/mainwindow.c:723 src/messageview.c:249
 msgid "/_Message/Compose _new message"
 msgstr "/_Zpráva/_Nová zpráva"
 
-#: src/mainwindow.c:725 src/messageview.c:251
+#: src/mainwindow.c:725 src/messageview.c:252
 msgid "/_Message/_Reply"
 msgstr "/_Zpráva/_Odpovědět"
 
@@ -3369,27 +3371,27 @@ msgstr "/_Zpráva/_Odpovědět"
 msgid "/_Message/Repl_y to"
 msgstr "/_Zpráva/Odpo_vědět komu"
 
-#: src/mainwindow.c:727 src/messageview.c:252
+#: src/mainwindow.c:727 src/messageview.c:253
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Zpráva/Odpo_vědět komu/_všem"
 
-#: src/mainwindow.c:728 src/messageview.c:254
+#: src/mainwindow.c:728 src/messageview.c:255
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Zpráva/Odpo_vědět komu/_odesílateli"
 
-#: src/mainwindow.c:729 src/messageview.c:256
+#: src/mainwindow.c:729 src/messageview.c:257
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Zpráva/Odpo_vědět komu/do _diskusního listu"
 
-#: src/mainwindow.c:732 src/messageview.c:259
+#: src/mainwindow.c:732 src/messageview.c:260
 msgid "/_Message/_Forward"
 msgstr "/_Zpráva/Předat dá_l"
 
-#: src/mainwindow.c:733 src/messageview.c:260
+#: src/mainwindow.c:733 src/messageview.c:261
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Zpráva/Přeposlat _jako přílohu"
 
-#: src/mainwindow.c:735 src/messageview.c:262
+#: src/mainwindow.c:735 src/messageview.c:263
 msgid "/_Message/Redirec_t"
 msgstr "/_Zpráva/Přesměrov_at"
 
@@ -3448,7 +3450,7 @@ msgstr "/_Zpráva/_Příjem nové pošty"
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/_Zpráva/_Příjem nové pošty"
 
-#: src/mainwindow.c:756 src/messageview.c:264
+#: src/mainwindow.c:756 src/messageview.c:265
 msgid "/_Message/Re-_edit"
 msgstr "/_Zpráva/Znov_u editovat"
 
@@ -3467,23 +3469,23 @@ msgstr "/_Nástroje/_Filtr zpráv "
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Nástroje/_Filtr zpráv "
 
-#: src/mainwindow.c:767 src/messageview.c:271
+#: src/mainwindow.c:767 src/messageview.c:272
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Nástroje/_Vytvoření filtru"
 
-#: src/mainwindow.c:768 src/messageview.c:273
+#: src/mainwindow.c:768 src/messageview.c:274
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Nástroje/_Vytvoření filtru/_Automaticky"
 
-#: src/mainwindow.c:770 src/messageview.c:275
+#: src/mainwindow.c:770 src/messageview.c:276
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Nástroje/_Vytvoření filtru/podle _Od"
 
-#: src/mainwindow.c:772 src/messageview.c:277
+#: src/mainwindow.c:772 src/messageview.c:278
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Nástroje/_Vytvoření filtru/podle _Komu"
 
-#: src/mainwindow.c:774 src/messageview.c:279
+#: src/mainwindow.c:774 src/messageview.c:280
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Nástroje/_Vytvoření filtru/podle _Předmětu"
 
@@ -3604,7 +3606,7 @@ msgid "MainWindow: color allocation %d failed\n"
 msgstr "Hlavní okno: barevné rozvržení %d bylo neúspěšné\n"
 
 #: src/mainwindow.c:1139 src/summaryview.c:2275 src/summaryview.c:2360
-#: src/summaryview.c:3907 src/summaryview.c:4036 src/summaryview.c:4394
+#: src/summaryview.c:3908 src/summaryview.c:4037 src/summaryview.c:4395
 msgid "done.\n"
 msgstr "hotovo.\n"
 
@@ -3870,7 +3872,7 @@ msgid "Find text:"
 msgstr "Najít text:"
 
 #: src/message_search.c:153 src/prefs_search_folder.c:253
-#: src/query_search.c:326
+#: src/query_search.c:343
 msgid "Case sensitive"
 msgstr "Rozlišovat malá a velká písmena"
 
@@ -3894,27 +3896,27 @@ msgstr "Dosažen konec zprávy, pokračovat od začátku?"
 msgid "Search finished"
 msgstr "Hledání ukončeno"
 
-#: src/messageview.c:268
+#: src/messageview.c:269
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/_Nástroje/Přidat odesílatele do a_dresáře"
 
-#: src/messageview.c:300
+#: src/messageview.c:301
 msgid "Creating message view...\n"
 msgstr "Vyvolávám zobrazení zprávy...\n"
 
-#: src/messageview.c:325
+#: src/messageview.c:326
 msgid "Text"
 msgstr "Text"
 
-#: src/messageview.c:330
+#: src/messageview.c:331
 msgid "Attachments"
 msgstr "Přílohy"
 
-#: src/messageview.c:380
+#: src/messageview.c:381
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:699 src/summaryview.c:3436
+#: src/messageview.c:700 src/summaryview.c:3436
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Nemohu uložit soubor '%s'."
@@ -3932,7 +3934,7 @@ msgstr "Provést"
 msgid "Print"
 msgstr "Tisk"
 
-#: src/messageview.c:770 src/summaryview.c:3471
+#: src/messageview.c:769 src/summaryview.c:3470
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -4032,11 +4034,11 @@ msgstr ""
 "Vložte příkazovou řádku pro otevření souboru:\n"
 "('%s' bude nahrazeno jménem souboru)"
 
-#: src/mimeview.c:1147
+#: src/mimeview.c:1140
 msgid "Opening executable file"
 msgstr ""
 
-#: src/mimeview.c:1148
+#: src/mimeview.c:1141
 msgid ""
 "This is an executable file. Opening executable file is restricted for "
 "security.\n"
@@ -4044,11 +4046,6 @@ msgid ""
 "virus or something like a malicious program."
 msgstr ""
 
-#: src/mimeview.c:1184
-#, c-format
-msgid "MIME viewer command line is invalid: `%s'"
-msgstr "Neplatná příkazová řádka prohlížeče MIME: '%s'"
-
 #: src/passphrase.c:96
 msgid "Passphrase"
 msgstr "Passphrase"
@@ -5855,21 +5852,21 @@ msgstr "Odpovědět komu:"
 msgid "%s - Edit search condition"
 msgstr ""
 
-#: src/prefs_search_folder.c:209 src/query_search.c:257
+#: src/prefs_search_folder.c:209 src/query_search.c:274
 msgid "Match any of the following"
 msgstr ""
 
-#: src/prefs_search_folder.c:211 src/query_search.c:259
+#: src/prefs_search_folder.c:211 src/query_search.c:276
 #, fuzzy
 msgid "Match all of the following"
 msgstr "Automaticky nastavit následující adresy"
 
-#: src/prefs_search_folder.c:231 src/query_search.c:303
+#: src/prefs_search_folder.c:231 src/query_search.c:320
 #, fuzzy
 msgid "Folder:"
 msgstr "Složka"
 
-#: src/prefs_search_folder.c:248 src/query_search.c:321
+#: src/prefs_search_folder.c:248 src/query_search.c:338
 #, fuzzy
 msgid "Search subfolders"
 msgstr "Vyhledání složky"
@@ -5884,17 +5881,17 @@ msgid "Attachment"
 msgstr "Příloha"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73 src/query_search.c:371 src/summaryview.c:4901
+#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4902
 msgid "Subject"
 msgstr "Předmět"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/query_search.c:372 src/summaryview.c:4904
+#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4905
 msgid "From"
 msgstr "Od"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/query_search.c:373 src/summaryview.c:4906
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:4907
 msgid "Date"
 msgstr "Datum"
 
@@ -5987,44 +5984,44 @@ msgstr "Vytvářím dialog procesu...\n"
 msgid "Status"
 msgstr "Stav"
 
-#: src/query_search.c:234
+#: src/query_search.c:251
 msgid "Search messages"
 msgstr "Vyhledat zprávy"
 
-#: src/query_search.c:395
+#: src/query_search.c:423
 #, fuzzy
 msgid "_Save as search folder"
 msgstr "Vyhledání složky"
 
-#: src/query_search.c:512 src/subscribedialog.c:526 src/summaryview.c:842
+#: src/query_search.c:542 src/subscribedialog.c:526 src/summaryview.c:842
 msgid "Done."
 msgstr "Hotovo."
 
-#: src/query_search.c:536
+#: src/query_search.c:566
 #, fuzzy, c-format
 msgid "Searching %s ..."
 msgstr "Prohledávám složku %s ..."
 
-#: src/query_search.c:564
+#: src/query_search.c:594
 #, fuzzy, c-format
 msgid "Searching %s (%d / %d)..."
 msgstr "Filtruji..."
 
-#: src/query_search.c:645 src/summaryview.c:2051
+#: src/query_search.c:675 src/summaryview.c:2051
 msgid "(No Date)"
 msgstr "(Žádné datum)"
 
-#: src/query_search.c:833
+#: src/query_search.c:869
 #, fuzzy
 msgid "Save as search folder"
 msgstr "Vyhledání složky"
 
-#: src/query_search.c:854
+#: src/query_search.c:890
 #, fuzzy
 msgid "Location:"
 msgstr "Přerušení akcí"
 
-#: src/query_search.c:869
+#: src/query_search.c:905
 #, fuzzy
 msgid "Folder name:"
 msgstr "Název souboru"
@@ -6656,38 +6653,38 @@ msgstr "Zpráva %d je nastavena pro kopírování do %s\n"
 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:3506
+#: src/summaryview.c:3507
 #, fuzzy
 msgid "Error occurred while processing messages."
 msgstr "Během zpracovávání pošty se vyskytla chyba ."
 
-#: src/summaryview.c:3814 src/summaryview.c:3815
+#: src/summaryview.c:3815 src/summaryview.c:3816
 msgid "Building threads..."
 msgstr "Vytvářím vlákna..."
 
-#: src/summaryview.c:3965 src/summaryview.c:3966
+#: src/summaryview.c:3966 src/summaryview.c:3967
 msgid "Unthreading..."
 msgstr "Ruším vlákna..."
 
-#: src/summaryview.c:4259 src/summaryview.c:4315
+#: src/summaryview.c:4260 src/summaryview.c:4316
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtruji..."
 
-#: src/summaryview.c:4364
+#: src/summaryview.c:4365
 msgid "filtering..."
 msgstr "filtruji..."
 
-#: src/summaryview.c:4365
+#: src/summaryview.c:4366
 msgid "Filtering..."
 msgstr "Filtruji..."
 
-#: src/summaryview.c:4401
+#: src/summaryview.c:4402
 #, fuzzy, c-format
 msgid "%d message(s) have been filtered."
 msgstr "Zpráva %d už byla v mezipaměti.\n"
 
-#: src/summaryview.c:4910
+#: src/summaryview.c:4911
 msgid "No."
 msgstr "Čís."
 
@@ -6777,6 +6774,9 @@ msgstr "Ukončení programu"
 msgid "Sylpheed"
 msgstr "Starý Sylpheed"
 
+#~ msgid "MIME viewer command line is invalid: `%s'"
+#~ msgstr "Neplatná příkazová řádka prohlížeče MIME: '%s'"
+
 #~ msgid "%dB"
 #~ msgstr "%dB"
 
diff --git a/po/da.po b/po/da.po
index ad87d4a1..94451f4f 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-03-02 19:03+0900\n"
+"POT-Creation-Date: 2006-03-10 16:06+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:491
+#: libsylph/prefs_common.c:496
 #, fuzzy
 msgid "Junk mail filter"
 msgstr "Mappe"
@@ -523,7 +523,7 @@ msgstr "kan ikke åbne markéret fil\n"
 msgid "can't fetch message %d\n"
 msgstr "kan ikke hente meddelelse %d\n"
 
-#: libsylph/procmsg.c:1375
+#: libsylph/procmsg.c:1378
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Udskrift kommando er ugyldig: `%s'\n"
@@ -601,12 +601,12 @@ msgstr "  Emne: %s\n"
 msgid "  Issuer: %s\n"
 msgstr "  Afsender: %s\n"
 
-#: libsylph/utils.c:2411 src/compose.c:2869 src/compose.c:3132
-#: src/compose.c:3195 src/compose.c:3315
+#: libsylph/utils.c:2430 src/compose.c:2888 src/compose.c:3151
+#: src/compose.c:3214 src/compose.c:3334
 msgid "can't change file mode\n"
 msgstr "kan ikke ændre fil mode\n"
 
-#: libsylph/utils.c:2418 libsylph/utils.c:2542
+#: libsylph/utils.c:2437 libsylph/utils.c:2561
 #, c-format
 msgid "writing to %s failed.\n"
 msgstr "fejl ved skrivning til %s.\n"
@@ -687,8 +687,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:493
-#: src/compose.c:4273 src/editaddress.c:200 src/editaddress.c:942
+#: src/account_dialog.c:366 src/addressadd.c:192 src/addressbook.c:491
+#: src/compose.c:4292 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
@@ -826,12 +826,12 @@ msgstr "Handlingens bruger parameter"
 msgid "Add Address to Book"
 msgstr "Tilføj adresse i adressebog"
 
-#: src/addressadd.c:202 src/compose.c:4777 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4796 src/editaddress.c:201
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "Adresse"
 
-#: src/addressadd.c:212 src/addressbook.c:495 src/editaddress.c:202
+#: src/addressadd.c:212 src/addressbook.c:493 src/editaddress.c:202
 #: src/editaddress.c:795 src/editaddress.c:860 src/editgroup.c:267
 msgid "Remarks"
 msgstr "Kommentar"
@@ -840,110 +840,111 @@ msgstr "Kommentar"
 msgid "Select Address Book Folder"
 msgstr "Vælg adressebog mappe"
 
-#: src/addressbook.c:338 src/compose.c:515 src/mainwindow.c:489
+#: src/addressbook.c:337 src/compose.c:515 src/mainwindow.c:489
 #: src/messageview.c:140
 msgid "/_File"
 msgstr "/_Filer"
 
-#: src/addressbook.c:339
+#: src/addressbook.c:338
 msgid "/_File/New _Book"
 msgstr "/_Filer/Ny _adressebog"
 
-#: src/addressbook.c:340
+#: src/addressbook.c:339
 msgid "/_File/New _vCard"
 msgstr "/_Filer/Ny _vCard"
 
-#: src/addressbook.c:342
+#: src/addressbook.c:341
 msgid "/_File/New _JPilot"
 msgstr "/_Filer/Ny _JPilot"
 
-#: src/addressbook.c:345
-msgid "/_File/New _Server"
+#: src/addressbook.c:344
+#, fuzzy
+msgid "/_File/New _LDAP Server"
 msgstr "/_Filer/Ny _server"
 
-#: src/addressbook.c:347 src/addressbook.c:350 src/compose.c:520
+#: src/addressbook.c:346 src/addressbook.c:349 src/compose.c:520
 #: src/compose.c:525 src/compose.c:528 src/compose.c:531 src/mainwindow.c:507
 #: src/mainwindow.c:510 src/mainwindow.c:512 src/mainwindow.c:515
 #: src/mainwindow.c:517 src/messageview.c:143
 msgid "/_File/---"
 msgstr "/_Filer/---"
 
-#: src/addressbook.c:348
+#: src/addressbook.c:347
 msgid "/_File/_Edit"
 msgstr "/_Filer/_Redigér"
 
-#: src/addressbook.c:349
+#: src/addressbook.c:348
 msgid "/_File/_Delete"
 msgstr "/_Filer/_Slet"
 
-#: src/addressbook.c:351
+#: src/addressbook.c:350
 msgid "/_File/_Save"
 msgstr "/_Filer/_Gem"
 
-#: src/addressbook.c:352 src/compose.c:532 src/messageview.c:144
+#: src/addressbook.c:351 src/compose.c:532 src/messageview.c:144
 msgid "/_File/_Close"
 msgstr "/_Filer/_Luk"
 
-#: src/addressbook.c:353
+#: src/addressbook.c:352
 msgid "/_Address"
 msgstr "/_Adresse"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:353
 msgid "/_Address/New _Address"
 msgstr "/_Adresse/Ny _adresse"
 
-#: src/addressbook.c:355
+#: src/addressbook.c:354
 msgid "/_Address/New _Group"
 msgstr "/_Adresse/Ny _gruppe"
 
-#: src/addressbook.c:356
+#: src/addressbook.c:355
 msgid "/_Address/New _Folder"
 msgstr "/_Adresse/Ny _mappe"
 
-#: src/addressbook.c:357
+#: src/addressbook.c:356
 msgid "/_Address/---"
 msgstr "/_Adresse/---"
 
-#: src/addressbook.c:358
+#: src/addressbook.c:357
 msgid "/_Address/_Edit"
 msgstr "/_Adresse/_Redigér"
 
-#: src/addressbook.c:359
+#: src/addressbook.c:358
 msgid "/_Address/_Delete"
 msgstr "/_Adresse/_Slet"
 
-#: src/addressbook.c:360 src/compose.c:645 src/mainwindow.c:758
-#: src/messageview.c:266
+#: src/addressbook.c:359 src/compose.c:645 src/mainwindow.c:758
+#: src/messageview.c:267
 msgid "/_Tools"
 msgstr "/_Funktioner"
 
-#: src/addressbook.c:361
+#: src/addressbook.c:360
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Funktioner/Importer _LDIF-Fil"
 
-#: src/addressbook.c:362 src/compose.c:666 src/mainwindow.c:812
-#: src/messageview.c:286
+#: src/addressbook.c:361 src/compose.c:666 src/mainwindow.c:812
+#: src/messageview.c:287
 msgid "/_Help"
 msgstr "/_Hjælp"
 
-#: src/addressbook.c:363 src/compose.c:667 src/mainwindow.c:824
-#: src/messageview.c:287
+#: src/addressbook.c:362 src/compose.c:667 src/mainwindow.c:824
+#: src/messageview.c:288
 msgid "/_Help/_About"
 msgstr "/_Hjælp/_Om"
 
-#: src/addressbook.c:382 src/addressbook.c:392
+#: src/addressbook.c:381 src/addressbook.c:391
 msgid "/New _Address"
 msgstr "/Ny _adresse"
 
-#: src/addressbook.c:383 src/addressbook.c:393
+#: src/addressbook.c:382 src/addressbook.c:392
 msgid "/New _Group"
 msgstr "/Ny _gruppe"
 
-#: src/addressbook.c:384 src/addressbook.c:394
+#: src/addressbook.c:383 src/addressbook.c:393
 msgid "/New _Folder"
 msgstr "/Ny _mappe"
 
-#: src/addressbook.c:385 src/addressbook.c:395 src/compose.c:509
+#: src/addressbook.c:384 src/addressbook.c:394 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
@@ -953,70 +954,70 @@ msgstr "/Ny _mappe"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:386 src/addressbook.c:396 src/compose.c:534
+#: src/addressbook.c:385 src/addressbook.c:395 src/compose.c:534
 #: src/mainwindow.c:521 src/messageview.c:146
 msgid "/_Edit"
 msgstr "/_Redigér"
 
-#: src/addressbook.c:387 src/addressbook.c:397 src/summaryview.c:434
+#: src/addressbook.c:386 src/addressbook.c:396 src/summaryview.c:434
 msgid "/_Delete"
 msgstr "/_Slet"
 
-#: src/addressbook.c:494
+#: src/addressbook.c:492
 msgid "E-Mail address"
 msgstr "E-post adresse"
 
-#: src/addressbook.c:498 src/compose.c:4778 src/prefs_common_dialog.c:2183
+#: src/addressbook.c:496 src/compose.c:4797 src/prefs_common_dialog.c:2183
 msgid "Address book"
 msgstr "Adressebog"
 
-#: src/addressbook.c:600 src/prefs_filter_edit.c:249
+#: src/addressbook.c:603 src/prefs_filter_edit.c:249
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "Navn:"
 
 #. Buttons
-#: src/addressbook.c:632 src/addressbook.c:1684 src/editaddress.c:884
+#: src/addressbook.c:636 src/addressbook.c:1678 src/editaddress.c:884
 #: src/editaddress.c:1017 src/mainwindow.c:2426 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:635 src/editaddress.c:890 src/editaddress.c:1023
+#: src/addressbook.c:639 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:1552
 msgid "Add"
 msgstr "Tilføj"
 
-#: src/addressbook.c:638
+#: src/addressbook.c:642
 msgid "Lookup"
 msgstr "Overblik"
 
-#: src/addressbook.c:650 src/headerview.c:55 src/prefs_folder_item.c:339
+#: src/addressbook.c:654 src/headerview.c:55 src/prefs_folder_item.c:339
 #: src/prefs_template.c:176
 msgid "To:"
 msgstr "Til:"
 
-#: src/addressbook.c:654 src/prefs_folder_item.c:356 src/prefs_template.c:178
+#: src/addressbook.c:658 src/prefs_folder_item.c:356 src/prefs_template.c:178
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:658 src/prefs_folder_item.c:367
+#: src/addressbook.c:662 src/prefs_folder_item.c:367
 msgid "Bcc:"
 msgstr "Bcc:"
 
 #. Confirm deletion
-#: src/addressbook.c:845
+#: src/addressbook.c:832
 msgid "Delete address(es)"
 msgstr "Slet adresse(r)"
 
-#: src/addressbook.c:846
+#: src/addressbook.c:833
 msgid "Really delete the address(es)?"
 msgstr "Virklig slette adresse(r)?"
 
-#: src/addressbook.c:1675
+#: src/addressbook.c:1669
 #, fuzzy, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1025,38 +1026,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:1678 src/folderview.c:2372
+#: src/addressbook.c:1672 src/folderview.c:2372
 msgid "Delete folder"
 msgstr "Slet mappe"
 
-#: src/addressbook.c:1678
+#: src/addressbook.c:1672
 #, fuzzy
 msgid "_Folder only"
 msgstr "Ny mappe"
 
-#: src/addressbook.c:1678
+#: src/addressbook.c:1672
 #, fuzzy
 msgid "Folder and _addresses"
 msgstr "Mappe og adresser"
 
-#: src/addressbook.c:1683
+#: src/addressbook.c:1677
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Virklig slette `%s' ?"
 
-#: src/addressbook.c:2369 src/addressbook.c:2502
+#: src/addressbook.c:2363 src/addressbook.c:2496
 msgid "New user, could not save index file."
 msgstr "Ny bruger, kunne ikke gemme index fil."
 
-#: src/addressbook.c:2373 src/addressbook.c:2506
+#: src/addressbook.c:2367 src/addressbook.c:2500
 msgid "New user, could not save address book files."
 msgstr "Ny bruger, kunne ikke gemme adressebogs fil."
 
-#: src/addressbook.c:2383 src/addressbook.c:2516
+#: src/addressbook.c:2377 src/addressbook.c:2510
 msgid "Old address book converted successfully."
 msgstr "Gammel adressebog konverteret."
 
-#: src/addressbook.c:2388
+#: src/addressbook.c:2382
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1064,7 +1065,7 @@ msgstr ""
 "Gammel adressebog konverteret,\n"
 "men kunne ikke gemme index filen"
 
-#: src/addressbook.c:2401
+#: src/addressbook.c:2395
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1072,7 +1073,7 @@ msgstr ""
 "Kunne ikke konvertere adressebog,\n"
 "men nye og tomme filer blev oprettet."
 
-#: src/addressbook.c:2407
+#: src/addressbook.c:2401
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1080,7 +1081,7 @@ msgstr ""
 "Kunne ikke konvertere adressebog,\n"
 "kunne ikke oprette nye filer."
 
-#: src/addressbook.c:2412
+#: src/addressbook.c:2406
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1088,86 +1089,86 @@ msgstr ""
 "Kunne ikke konvertere adressebog,\n"
 "kunne ikke oprette nye filer."
 
-#: src/addressbook.c:2419
+#: src/addressbook.c:2413
 msgid "Addressbook conversion error"
 msgstr "Adressebog konverterings fejl"
 
-#: src/addressbook.c:2423
+#: src/addressbook.c:2417
 msgid "Addressbook conversion"
 msgstr "Adressebog konvertering"
 
-#: src/addressbook.c:2458
+#: src/addressbook.c:2452
 msgid "Addressbook Error"
 msgstr "Adressebog fejl"
 
-#: src/addressbook.c:2459 src/addressbook.c:2559
+#: src/addressbook.c:2453 src/addressbook.c:2553
 msgid "Could not read address index"
 msgstr "Kunne ikke læse adressebog"
 
-#: src/addressbook.c:2521
+#: src/addressbook.c:2515
 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:2535
+#: src/addressbook.c:2529
 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:2541
+#: src/addressbook.c:2535
 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:2547
+#: src/addressbook.c:2541
 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:2565
+#: src/addressbook.c:2559
 msgid "Addressbook Conversion Error"
 msgstr "Adressebog konverterings fejl"
 
-#: src/addressbook.c:2571
+#: src/addressbook.c:2565
 msgid "Addressbook Conversion"
 msgstr "Adressebog konvertering"
 
-#: src/addressbook.c:3086 src/prefs_common_dialog.c:2033
+#: src/addressbook.c:3080 src/prefs_common_dialog.c:2033
 msgid "Interface"
 msgstr "Brugerflade"
 
-#: src/addressbook.c:3102 src/importldif.c:514
+#: src/addressbook.c:3096 src/importldif.c:514
 msgid "Address Book"
 msgstr "Adressebog"
 
-#: src/addressbook.c:3118
+#: src/addressbook.c:3112
 msgid "Person"
 msgstr "Person"
 
-#: src/addressbook.c:3134
+#: src/addressbook.c:3128
 msgid "EMail Address"
 msgstr "E-post adresse"
 
-#: src/addressbook.c:3150
+#: src/addressbook.c:3144
 msgid "Group"
 msgstr "Gruppe"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3166 src/folderview.c:367 src/prefs_account_dialog.c:1694
-#: src/query_search.c:370
+#: src/addressbook.c:3160 src/folderview.c:367 src/prefs_account_dialog.c:1694
+#: src/query_search.c:398
 msgid "Folder"
 msgstr "Mappe"
 
-#: src/addressbook.c:3182
+#: src/addressbook.c:3176
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3198 src/addressbook.c:3214
+#: src/addressbook.c:3192 src/addressbook.c:3208
 msgid "JPilot"
 msgstr "J-Pilot"
 
-#: src/addressbook.c:3230
+#: src/addressbook.c:3224
 msgid "LDAP Server"
 msgstr "LDAP server"
 
@@ -1179,7 +1180,7 @@ msgstr "Normale adresser"
 msgid "Personal address"
 msgstr "Personlige adresser"
 
-#: src/alertpanel.c:142 src/compose.c:5500 src/main.c:621
+#: src/alertpanel.c:142 src/compose.c:5517 src/main.c:621
 msgid "Notice"
 msgstr "Note"
 
@@ -1187,7 +1188,7 @@ msgstr "Note"
 msgid "Warning"
 msgstr "Advarsel"
 
-#: src/alertpanel.c:168 src/inc.c:587
+#: src/alertpanel.c:168 src/inc.c:586
 msgid "Error"
 msgstr "Fejl"
 
@@ -1230,7 +1231,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:4761
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4762
 msgid "None"
 msgstr "Ingen"
 
@@ -1508,7 +1509,7 @@ msgstr "/_Vis/_Tegnsæt/Thai (TIS-620)"
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Vis/_Tegnsæt/Thai (Windows-874)"
 
-#: src/compose.c:646 src/mainwindow.c:759 src/messageview.c:267
+#: src/compose.c:646 src/mainwindow.c:759 src/messageview.c:268
 msgid "/_Tools/_Address book"
 msgstr "/_Funktioner/_Adressebog"
 
@@ -1516,14 +1517,14 @@ msgstr "/_Funktioner/_Adressebog"
 msgid "/_Tools/_Template"
 msgstr "/_Funktioner/_Skabelon"
 
-#: src/compose.c:649 src/mainwindow.c:783 src/messageview.c:283
+#: src/compose.c:649 src/mainwindow.c:783 src/messageview.c:284
 msgid "/_Tools/Actio_ns"
 msgstr "/_Funktioner/_Handlinger"
 
 #: src/compose.c:651 src/compose.c:655 src/compose.c:661 src/mainwindow.c:762
 #: src/mainwindow.c:776 src/mainwindow.c:781 src/mainwindow.c:784
-#: src/mainwindow.c:788 src/mainwindow.c:790 src/messageview.c:270
-#: src/messageview.c:282
+#: src/mainwindow.c:788 src/mainwindow.c:790 src/messageview.c:271
+#: src/messageview.c:283
 msgid "/_Tools/---"
 msgstr "/_Funktioner/---"
 
@@ -1552,80 +1553,80 @@ msgstr "/_Funktioner/_Udfør"
 msgid "/_Tools/_Set spell language"
 msgstr "/_Funktioner/_Skabelon"
 
-#: src/compose.c:910
+#: src/compose.c:912
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: fil findes ikke\n"
 
-#: src/compose.c:1014 src/compose.c:1085
+#: src/compose.c:1016 src/compose.c:1087
 msgid "Can't get text part\n"
 msgstr "Kan ikke læse tekst afsnit\n"
 
-#: src/compose.c:1486
+#: src/compose.c:1488
 msgid "Quote mark format error."
 msgstr "Citat markérings format fejl."
 
-#: src/compose.c:1498
+#: src/compose.c:1500
 msgid "Message reply/forward format error."
 msgstr "Meddelelses svar / videresend fejl."
 
-#: src/compose.c:1918
+#: src/compose.c:1935
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Filen %s findes ikke\n"
 
-#: src/compose.c:1922
+#: src/compose.c:1939
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Kan ikke læse størrelse på %s\n"
 
-#: src/compose.c:1926
+#: src/compose.c:1943
 #, c-format
 msgid "File %s is empty."
 msgstr "Filen %s er tom."
 
-#: src/compose.c:1930
+#: src/compose.c:1947
 #, c-format
 msgid "Can't read %s."
 msgstr "kan ikke læse %s"
 
-#: src/compose.c:1963
+#: src/compose.c:1980
 #, c-format
 msgid "Message: %s"
 msgstr "Meddelelse: %s"
 
-#: src/compose.c:2023 src/mimeview.c:565
+#: src/compose.c:2040 src/mimeview.c:565
 msgid "Can't get the part of multipart message."
 msgstr "Kan ikke hente del af multipart meddelese."
 
-#: src/compose.c:2507 src/headerview.c:195 src/query_search.c:636
+#: src/compose.c:2524 src/headerview.c:195 src/query_search.c:666
 #: src/summaryview.c:2124
 msgid "(No Subject)"
 msgstr "(Intet emne)"
 
-#: src/compose.c:2510
+#: src/compose.c:2527
 #, fuzzy, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Ny meddelelse%s"
 
-#: src/compose.c:2623
+#: src/compose.c:2642
 msgid "Recipient is not specified."
 msgstr "Mangler modtager"
 
-#: src/compose.c:2631
+#: src/compose.c:2650
 #, fuzzy
 msgid "Empty subject"
 msgstr "Emne"
 
-#: src/compose.c:2632
+#: src/compose.c:2651
 msgid "Subject is empty. Send it anyway?"
 msgstr "Emne er tom. Send alligevel?"
 
-#: src/compose.c:2691
+#: src/compose.c:2710
 msgid "can't get recipient list."
 msgstr "Kan ikke åbne modtager liste."
 
-#: src/compose.c:2711
+#: src/compose.c:2730
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1633,21 +1634,21 @@ msgstr ""
 "Konto til afsendelse af e-post er ikke valgt.\n"
 "Vælg konto før afsendelse er mulig."
 
-#: src/compose.c:2725 src/send_message.c:299
+#: src/compose.c:2744 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:2767
+#: src/compose.c:2786
 msgid "Can't save the message to outbox."
 msgstr "Kan ikke gemme meddelelse i Sendt"
 
-#: src/compose.c:2805
+#: src/compose.c:2824
 #, 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:2902
+#: src/compose.c:2921
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1658,12 +1659,12 @@ msgstr ""
 "%s til %s.\n"
 "Send den alligevel?"
 
-#: src/compose.c:2908
+#: src/compose.c:2927
 #, fuzzy
 msgid "Code conversion error"
 msgstr "Adressebog konverterings fejl"
 
-#: src/compose.c:2981
+#: src/compose.c:3000
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1672,159 +1673,159 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:2985
+#: src/compose.c:3004
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3275
+#: src/compose.c:3294
 msgid "can't remove the old message\n"
 msgstr "kan ikke slette gammel meddelelse\n"
 
-#: src/compose.c:3293
+#: src/compose.c:3312
 msgid "queueing message...\n"
 msgstr "meddelelse i kø...\n"
 
-#: src/compose.c:3375
+#: src/compose.c:3394
 msgid "can't find queue folder\n"
 msgstr "kan ikke vælge mappe %s\n"
 
-#: src/compose.c:3382
+#: src/compose.c:3401
 msgid "can't queue the message\n"
 msgstr "meddelelse kan ikke lægges i kø\n"
 
-#: src/compose.c:3975
+#: src/compose.c:3994
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "genereret meddelelses ID: %s\n"
 
-#: src/compose.c:4088
+#: src/compose.c:4107
 msgid "Creating compose window...\n"
 msgstr "Opretter instastnings vindue...\n"
 
-#: src/compose.c:4139 src/headerview.c:54
+#: src/compose.c:4158 src/headerview.c:54
 msgid "From:"
 msgstr "Fra:"
 
-#: src/compose.c:4213
+#: src/compose.c:4232
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/_Funktioner/_Handlinger"
 
-#: src/compose.c:4216
+#: src/compose.c:4235
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/_Meddelelse/_Kryptere"
 
-#: src/compose.c:4254 src/compose.c:5332
+#: src/compose.c:4273 src/compose.c:5351
 msgid "MIME type"
 msgstr "MIME type"
 
 #. S_COL_DATE
-#: src/compose.c:4263 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4908
+#: src/compose.c:4282 src/mimeview.c:197 src/prefs_filter_edit.c:496
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4909
 msgid "Size"
 msgstr "Størrelse"
 
-#: src/compose.c:4698 src/mainwindow.c:2359 src/prefs_account_dialog.c:528
+#: src/compose.c:4717 src/mainwindow.c:2359 src/prefs_account_dialog.c:528
 #: src/prefs_common_dialog.c:661
 msgid "Send"
 msgstr "Send"
 
-#: src/compose.c:4699
+#: src/compose.c:4718
 msgid "Send message"
 msgstr "Sende meddelelse"
 
-#: src/compose.c:4707
+#: src/compose.c:4726
 msgid "Send later"
 msgstr "Send senere"
 
-#: src/compose.c:4708
+#: src/compose.c:4727
 msgid "Put into queue folder and send later"
 msgstr "Læg i kø og send senere"
 
-#: src/compose.c:4716
+#: src/compose.c:4735
 msgid "Draft"
 msgstr "Kladde"
 
-#: src/compose.c:4717
+#: src/compose.c:4736
 msgid "Save to draft folder"
 msgstr "Gem i Kladde"
 
-#: src/compose.c:4727
+#: src/compose.c:4746
 msgid "Insert"
 msgstr "Indæst"
 
-#: src/compose.c:4728
+#: src/compose.c:4747
 msgid "Insert file"
 msgstr "Insæt fil"
 
-#: src/compose.c:4736
+#: src/compose.c:4755
 msgid "Attach"
 msgstr "Vedhæft"
 
-#: src/compose.c:4737
+#: src/compose.c:4756
 msgid "Attach file"
 msgstr "Vedhæft fil"
 
 #. signature
-#: src/compose.c:4747 src/prefs_account_dialog.c:1208
+#: src/compose.c:4766 src/prefs_account_dialog.c:1208
 #: src/prefs_common_dialog.c:953
 msgid "Signature"
 msgstr "Underskrift"
 
-#: src/compose.c:4748
+#: src/compose.c:4767
 #, fuzzy
 msgid "Append signature"
 msgstr "DÅRLIG underskrift"
 
 #. editor
-#: src/compose.c:4757 src/prefs_common_dialog.c:991
+#: src/compose.c:4776 src/prefs_common_dialog.c:991
 #: src/prefs_common_dialog.c:2315
 msgid "Editor"
 msgstr "Editor"
 
-#: src/compose.c:4758
+#: src/compose.c:4777
 msgid "Edit with external editor"
 msgstr "Redigér med ekstern Editor"
 
-#: src/compose.c:4766
+#: src/compose.c:4785
 msgid "Linewrap"
 msgstr "Linie deling"
 
-#: src/compose.c:4767
+#: src/compose.c:4786
 msgid "Wrap all long lines"
 msgstr "/_Redigér/Formater _alle lange linier"
 
-#: src/compose.c:5228
+#: src/compose.c:5247
 msgid "Invalid MIME type."
 msgstr "Ugyldig MIME type"
 
-#: src/compose.c:5246
+#: src/compose.c:5265
 msgid "File doesn't exist or is empty."
 msgstr "Fil eksisterer ikke eller er tom."
 
-#: src/compose.c:5314
+#: src/compose.c:5333
 msgid "Properties"
 msgstr "Egenskaber"
 
-#: src/compose.c:5334 src/prefs_common_dialog.c:1444
+#: src/compose.c:5353 src/prefs_common_dialog.c:1444
 msgid "Encoding"
 msgstr "Tegnsæt kodning"
 
-#: src/compose.c:5357 src/prefs_folder_item.c:202
+#: src/compose.c:5376 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Sti"
 
-#: src/compose.c:5358
+#: src/compose.c:5377
 msgid "File name"
 msgstr "Fil navn"
 
-#: src/compose.c:5449
+#: src/compose.c:5466
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Sti til ekstern editor er ugyldig: `%s'\n"
 
-#: src/compose.c:5497
+#: src/compose.c:5514
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1834,48 +1835,48 @@ msgstr ""
 "Afbryde?\n"
 "ID: %d"
 
-#: src/compose.c:5872 src/compose.c:5877 src/compose.c:5883
+#: src/compose.c:5889 src/compose.c:5894 src/compose.c:5900
 msgid "Can't queue the message."
 msgstr "Meddelelse kan ikke lægges i kø."
 
-#: src/compose.c:5974
+#: src/compose.c:5991
 #, fuzzy
 msgid "Select files"
 msgstr "Vælg fil"
 
-#: src/compose.c:5997
+#: src/compose.c:6014
 msgid "Select file"
 msgstr "Vælg fil"
 
-#: src/compose.c:6032
+#: src/compose.c:6049
 #, fuzzy
 msgid "Save message"
 msgstr "Sende meddelelse"
 
-#: src/compose.c:6033
+#: src/compose.c:6050
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Denne meddelelse er ændret. Slet?"
 
-#: src/compose.c:6035
+#: src/compose.c:6052
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:6077
+#: src/compose.c:6094
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Vil du benytte skabelon `%s' ?"
 
-#: src/compose.c:6079
+#: src/compose.c:6096
 msgid "Apply template"
 msgstr "Benyt skabelon"
 
-#: src/compose.c:6080
+#: src/compose.c:6097
 #, fuzzy
 msgid "_Replace"
 msgstr "Erstat"
 
-#: src/compose.c:6080
+#: src/compose.c:6097
 #, fuzzy
 msgid "_Insert"
 msgstr "Indæst"
@@ -1997,52 +1998,52 @@ msgstr " Et gruppe navn skal indtastes."
 msgid "Edit Group Data"
 msgstr "Redigér gruppendata"
 
-#: src/editgroup.c:300
+#: src/editgroup.c:299
 msgid "Group Name"
 msgstr "Gruppe navn"
 
-#: src/editgroup.c:319
+#: src/editgroup.c:318
 msgid "Addresses in Group"
 msgstr "Adresser i gruppe"
 
-#: src/editgroup.c:321
+#: src/editgroup.c:320
 msgid " -> "
 msgstr " -> "
 
-#: src/editgroup.c:348
+#: src/editgroup.c:347
 msgid " <- "
 msgstr " <- "
 
-#: src/editgroup.c:350
+#: src/editgroup.c:349
 msgid "Available Addresses"
 msgstr "Mulige adresser"
 
-#: src/editgroup.c:416
+#: src/editgroup.c:415
 msgid "Move E-Mail Addresses to or from Group with arrow buttons"
 msgstr "Flyt e-post adresse fra eller til gruppe med pil tasterne"
 
-#: src/editgroup.c:468
+#: src/editgroup.c:467
 msgid "Edit Group Details"
 msgstr "Redigér gruppendetaljer"
 
-#: src/editgroup.c:471
+#: src/editgroup.c:470
 msgid "Add New Group"
 msgstr "Tilføj gruppe"
 
-#: src/editgroup.c:522
+#: src/editgroup.c:521
 msgid "Edit folder"
 msgstr "Redigér mappe"
 
-#: src/editgroup.c:522
+#: src/editgroup.c:521
 msgid "Input the new name of folder:"
 msgstr "Indtast nyt gruppenavn:"
 
-#: src/editgroup.c:525 src/foldersel.c:541 src/folderview.c:2121
+#: src/editgroup.c:524 src/foldersel.c:541 src/folderview.c:2121
 #: src/folderview.c:2127
 msgid "New folder"
 msgstr "Ny mappe"
 
-#: src/editgroup.c:526 src/foldersel.c:542 src/folderview.c:2128
+#: src/editgroup.c:525 src/foldersel.c:542 src/folderview.c:2128
 msgid "Input the name of new folder:"
 msgstr "Indtast ny mappes navn:"
 
@@ -2240,7 +2241,7 @@ msgid "`%c' can't be included in folder name."
 msgstr "`%c' kan ikke benyttes i mappe navn."
 
 #: src/foldersel.c:561 src/folderview.c:2147 src/folderview.c:2206
-#: src/query_search.c:995
+#: src/query_search.c:1031
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Mappen `%s' eksisterer allerede."
@@ -2502,7 +2503,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:2127
+#: src/headerview.c:180 src/query_search.c:667 src/summaryview.c:2127
 msgid "(No From)"
 msgstr "(Ingen Fra)"
 
@@ -2632,138 +2633,138 @@ msgstr "Slut"
 msgid "Sylpheed: %d new messages"
 msgstr "Hentet (%d nye meddelelse(r))"
 
-#: src/inc.c:372
+#: src/inc.c:371
 msgid "Retrieving new messages"
 msgstr "Modtager nu meddelelse"
 
-#: src/inc.c:415
+#: src/inc.c:414
 msgid "Standby"
 msgstr "Vent"
 
-#: src/inc.c:544 src/inc.c:593
+#: src/inc.c:543 src/inc.c:592
 msgid "Cancelled"
 msgstr "Afbrudt"
 
-#: src/inc.c:555
+#: src/inc.c:554
 msgid "Retrieving"
 msgstr "Modtager"
 
-#: src/inc.c:564
+#: src/inc.c:563
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "Hentet (%d meddelelse(r) (%s)"
 
-#: src/inc.c:568
+#: src/inc.c:567
 msgid "Done (no new messages)"
 msgstr "Ingen nye meddelelser"
 
-#: src/inc.c:574
+#: src/inc.c:573
 msgid "Connection failed"
 msgstr "Forbindelse mislykkedes"
 
-#: src/inc.c:577
+#: src/inc.c:576
 msgid "Auth failed"
 msgstr "Godkendelse mislykkedes"
 
-#: src/inc.c:580
+#: src/inc.c:579
 msgid "Locked"
 msgstr "Låst"
 
-#: src/inc.c:590
+#: src/inc.c:589
 #, fuzzy
 msgid "Timeout"
 msgstr "Timeout (sek)"
 
-#: src/inc.c:640
+#: src/inc.c:639
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Hentet (%d nye meddelelse(r))"
 
-#: src/inc.c:643
+#: src/inc.c:642
 msgid "Finished (no new messages)"
 msgstr "Ingen nye meddelelser"
 
-#: src/inc.c:652
+#: src/inc.c:651
 msgid "Some errors occurred while getting mail."
 msgstr "Fejl ved hentning af e-post."
 
-#: src/inc.c:688
+#: src/inc.c:687
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "modtager nye meddelelser fra konto %s...\n"
 
-#: src/inc.c:691
+#: src/inc.c:690
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: henter nye meddelelser"
 
-#: src/inc.c:710
+#: src/inc.c:709
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Forbinder til POP3 server: %s ..."
 
-#: src/inc.c:719
+#: src/inc.c:718
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Ingen forbindelse med POP3 server: %s:%d\n"
 
-#: src/inc.c:798 src/send_message.c:631
+#: src/inc.c:797 src/send_message.c:631
 msgid "Authenticating..."
 msgstr "Godkender..."
 
-#: src/inc.c:799
+#: src/inc.c:798
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Modtager meddelelse fra %s..."
 
-#: src/inc.c:804
+#: src/inc.c:803
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Modtager antal nye meddelelser (STAT)..."
 
-#: src/inc.c:808
+#: src/inc.c:807
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Modtager antal nye meddelelser (LAST)..."
 
-#: src/inc.c:812
+#: src/inc.c:811
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Modtager antal nye meddelelser (UIDL)..."
 
-#: src/inc.c:816
+#: src/inc.c:815
 msgid "Getting the size of messages (LIST)..."
 msgstr "Modtager antal nye meddelelser (LIST)..."
 
-#: src/inc.c:826
+#: src/inc.c:825
 #, c-format
 msgid "Deleting message %d"
 msgstr "Sletter meddelelse %d"
 
-#: src/inc.c:833 src/send_message.c:649
+#: src/inc.c:832 src/send_message.c:649
 msgid "Quitting"
 msgstr "Afslutter"
 
-#: src/inc.c:858
+#: src/inc.c:857
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Modtager meddelelse (%d / %d) (%s / %s)"
 
-#: src/inc.c:879
+#: src/inc.c:878
 #, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Henter (%d meddelelse(r), (%s) hentet"
 
-#: src/inc.c:1107
+#: src/inc.c:1106
 #, fuzzy
 msgid "Connection failed."
 msgstr "Forbindelse mislykkedes"
 
-#: src/inc.c:1113
+#: src/inc.c:1112
 #, fuzzy
 msgid "Error occurred while processing mail."
 msgstr ""
 "Fejl ved bearbejdning af e-post:\n"
 "%s"
 
-#: src/inc.c:1118
+#: src/inc.c:1117
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2772,29 +2773,29 @@ msgstr ""
 "Fejl ved bearbejdning af e-post:\n"
 "%s"
 
-#: src/inc.c:1124
+#: src/inc.c:1123
 msgid "No disk space left."
 msgstr "Ingen fri disk plads."
 
-#: src/inc.c:1129
+#: src/inc.c:1128
 msgid "Can't write file."
 msgstr "Kan ikke skrive til fil."
 
-#: src/inc.c:1134
+#: src/inc.c:1133
 msgid "Socket error."
 msgstr "Sokkel fejl."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1140 src/send_message.c:584 src/send_message.c:772
+#: src/inc.c:1139 src/send_message.c:584 src/send_message.c:772
 msgid "Connection closed by the remote host."
 msgstr ""
 
-#: src/inc.c:1146
+#: src/inc.c:1145
 #, fuzzy
 msgid "Mailbox is locked."
 msgstr "postkasse er låst\n"
 
-#: src/inc.c:1150
+#: src/inc.c:1149
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2803,11 +2804,11 @@ msgstr ""
 "Mailbox er låst:\n"
 "%s"
 
-#: src/inc.c:1156 src/send_message.c:757
+#: src/inc.c:1155 src/send_message.c:757
 msgid "Authentication failed."
 msgstr "Godkendelses fejlede."
 
-#: src/inc.c:1161 src/send_message.c:760
+#: src/inc.c:1160 src/send_message.c:760
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2816,16 +2817,16 @@ msgstr ""
 "Godkendelsesfejl:\n"
 "%s"
 
-#: src/inc.c:1166 src/send_message.c:776
+#: src/inc.c:1165 src/send_message.c:776
 #, fuzzy
 msgid "Session timed out."
 msgstr "tid udløbet\n"
 
-#: src/inc.c:1202
+#: src/inc.c:1201
 msgid "Incorporation cancelled\n"
 msgstr "Hentning afbrudt\n"
 
-#: src/inc.c:1285
+#: src/inc.c:1284
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Modtager nye meddelelser fra %s til %s...\n"
@@ -3310,14 +3311,15 @@ msgid "/_View/Mess_age source"
 msgstr "/_Vis/_Kilde"
 
 #: src/mainwindow.c:708 src/messageview.c:245
-msgid "/_View/Show all _header"
+#, fuzzy
+msgid "/_View/Show all _headers"
 msgstr "/_Vis/_Alle hoved linier"
 
 #: src/mainwindow.c:710
 msgid "/_View/_Update summary"
 msgstr "/_Vis/_Opdatér oversigt"
 
-#: src/mainwindow.c:712 src/messageview.c:247
+#: src/mainwindow.c:712 src/messageview.c:248
 msgid "/_Message"
 msgstr "/_Meddelelse"
 
@@ -3352,16 +3354,16 @@ msgstr "/_Meddelelse/Send meddelelser i _kø"
 
 #: src/mainwindow.c:722 src/mainwindow.c:724 src/mainwindow.c:731
 #: src/mainwindow.c:736 src/mainwindow.c:739 src/mainwindow.c:750
-#: src/mainwindow.c:752 src/mainwindow.c:755 src/messageview.c:250
-#: src/messageview.c:258 src/messageview.c:263
+#: src/mainwindow.c:752 src/mainwindow.c:755 src/messageview.c:251
+#: src/messageview.c:259 src/messageview.c:264
 msgid "/_Message/---"
 msgstr "/_Meddelelse/---"
 
-#: src/mainwindow.c:723 src/messageview.c:248
+#: src/mainwindow.c:723 src/messageview.c:249
 msgid "/_Message/Compose _new message"
 msgstr "/_Meddelelse/Opret _ny meddelelse"
 
-#: src/mainwindow.c:725 src/messageview.c:251
+#: src/mainwindow.c:725 src/messageview.c:252
 msgid "/_Message/_Reply"
 msgstr "/_Meddelelse/_Besvar"
 
@@ -3369,27 +3371,27 @@ msgstr "/_Meddelelse/_Besvar"
 msgid "/_Message/Repl_y to"
 msgstr "/_Meddelelse/_Svar til"
 
-#: src/mainwindow.c:727 src/messageview.c:252
+#: src/mainwindow.c:727 src/messageview.c:253
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Meddelelse/_Svar til/A_lle"
 
-#: src/mainwindow.c:728 src/messageview.c:254
+#: src/mainwindow.c:728 src/messageview.c:255
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Meddelelse/_Svar til/Af_sender"
 
-#: src/mainwindow.c:729 src/messageview.c:256
+#: src/mainwindow.c:729 src/messageview.c:257
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Meddelelse/_Svar til/_Alle"
 
-#: src/mainwindow.c:732 src/messageview.c:259
+#: src/mainwindow.c:732 src/messageview.c:260
 msgid "/_Message/_Forward"
 msgstr "/_Meddelelse/_Videresend"
 
-#: src/mainwindow.c:733 src/messageview.c:260
+#: src/mainwindow.c:733 src/messageview.c:261
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Meddelelse/Videresend som _vedhæftet"
 
-#: src/mainwindow.c:735 src/messageview.c:262
+#: src/mainwindow.c:735 src/messageview.c:263
 msgid "/_Message/Redirec_t"
 msgstr "/_Meddelelse/_Omdirigér"
 
@@ -3448,7 +3450,7 @@ msgstr "/_Meddelelse/Hent _ny post"
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/_Meddelelse/Hent _ny post"
 
-#: src/mainwindow.c:756 src/messageview.c:264
+#: src/mainwindow.c:756 src/messageview.c:265
 msgid "/_Message/Re-_edit"
 msgstr "/_Meddelelse/Redigér _igen"
 
@@ -3467,23 +3469,23 @@ msgstr "/_Funktioner/_Filtrere meddelelse"
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Funktioner/_Filtrere meddelelse"
 
-#: src/mainwindow.c:767 src/messageview.c:271
+#: src/mainwindow.c:767 src/messageview.c:272
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Funktioner/_Opret filter"
 
-#: src/mainwindow.c:768 src/messageview.c:273
+#: src/mainwindow.c:768 src/messageview.c:274
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Funktioner/_Opret filter/_Automatisk"
 
-#: src/mainwindow.c:770 src/messageview.c:275
+#: src/mainwindow.c:770 src/messageview.c:276
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Funktioner/_Opret filter/Efter _Fra"
 
-#: src/mainwindow.c:772 src/messageview.c:277
+#: src/mainwindow.c:772 src/messageview.c:278
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Funktioner/_Opret filter/Efter _Til"
 
-#: src/mainwindow.c:774 src/messageview.c:279
+#: src/mainwindow.c:774 src/messageview.c:280
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Funktioner/_Opret filter/Efter _Emne"
 
@@ -3604,7 +3606,7 @@ msgid "MainWindow: color allocation %d failed\n"
 msgstr "HovedVindue: fejl i farve %d\n"
 
 #: src/mainwindow.c:1139 src/summaryview.c:2275 src/summaryview.c:2360
-#: src/summaryview.c:3907 src/summaryview.c:4036 src/summaryview.c:4394
+#: src/summaryview.c:3908 src/summaryview.c:4037 src/summaryview.c:4395
 msgid "done.\n"
 msgstr "Afsluttet.\n"
 
@@ -3869,7 +3871,7 @@ msgid "Find text:"
 msgstr "Søg tekst:"
 
 #: src/message_search.c:153 src/prefs_search_folder.c:253
-#: src/query_search.c:326
+#: src/query_search.c:343
 msgid "Case sensitive"
 msgstr "Stor / små forskel"
 
@@ -3893,27 +3895,27 @@ msgstr "Slutnigen af meddelelse nået; fortsæt fra starten?"
 msgid "Search finished"
 msgstr "Søgning afsluttet"
 
-#: src/messageview.c:268
+#: src/messageview.c:269
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/_Funktioner/Tilføj afsender til adressebog"
 
-#: src/messageview.c:300
+#: src/messageview.c:301
 msgid "Creating message view...\n"
 msgstr "Opretter meddelelses vindue...\n"
 
-#: src/messageview.c:325
+#: src/messageview.c:326
 msgid "Text"
 msgstr "Tekst"
 
-#: src/messageview.c:330
+#: src/messageview.c:331
 msgid "Attachments"
 msgstr "Vedhæftet"
 
-#: src/messageview.c:380
+#: src/messageview.c:381
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:699 src/summaryview.c:3436
+#: src/messageview.c:700 src/summaryview.c:3436
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Kan ikke gemme fil `%s'."
@@ -3931,7 +3933,7 @@ msgstr "Udfør"
 msgid "Print"
 msgstr "Udskriv"
 
-#: src/messageview.c:770 src/summaryview.c:3471
+#: src/messageview.c:769 src/summaryview.c:3470
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -4031,11 +4033,11 @@ msgstr ""
 "Indtast kommando til til åbning af fil:\n"
 "(`%s' bilver erstattet med fil navn)"
 
-#: src/mimeview.c:1147
+#: src/mimeview.c:1140
 msgid "Opening executable file"
 msgstr ""
 
-#: src/mimeview.c:1148
+#: src/mimeview.c:1141
 msgid ""
 "This is an executable file. Opening executable file is restricted for "
 "security.\n"
@@ -4043,11 +4045,6 @@ msgid ""
 "virus or something like a malicious program."
 msgstr ""
 
-#: src/mimeview.c:1184
-#, c-format
-msgid "MIME viewer command line is invalid: `%s'"
-msgstr "MIME visnings kommando ugyldig: `%s'"
-
 #: src/passphrase.c:96
 msgid "Passphrase"
 msgstr "Adganssætning"
@@ -5850,21 +5847,21 @@ msgstr "Svar til:"
 msgid "%s - Edit search condition"
 msgstr ""
 
-#: src/prefs_search_folder.c:209 src/query_search.c:257
+#: src/prefs_search_folder.c:209 src/query_search.c:274
 msgid "Match any of the following"
 msgstr ""
 
-#: src/prefs_search_folder.c:211 src/query_search.c:259
+#: src/prefs_search_folder.c:211 src/query_search.c:276
 #, fuzzy
 msgid "Match all of the following"
 msgstr "Udfyld automatisk følgende adresser"
 
-#: src/prefs_search_folder.c:231 src/query_search.c:303
+#: src/prefs_search_folder.c:231 src/query_search.c:320
 #, fuzzy
 msgid "Folder:"
 msgstr "Mappe"
 
-#: src/prefs_search_folder.c:248 src/query_search.c:321
+#: src/prefs_search_folder.c:248 src/query_search.c:338
 #, fuzzy
 msgid "Search subfolders"
 msgstr "Gennemsøg mappe"
@@ -5879,17 +5876,17 @@ msgid "Attachment"
 msgstr "Vedhæftet"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73 src/query_search.c:371 src/summaryview.c:4901
+#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4902
 msgid "Subject"
 msgstr "Emne"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/query_search.c:372 src/summaryview.c:4904
+#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4905
 msgid "From"
 msgstr "Fra"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/query_search.c:373 src/summaryview.c:4906
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:4907
 msgid "Date"
 msgstr "Dato"
 
@@ -5982,44 +5979,44 @@ msgstr "Opretter dialog...\n"
 msgid "Status"
 msgstr "Status"
 
-#: src/query_search.c:234
+#: src/query_search.c:251
 msgid "Search messages"
 msgstr "Søg meddelelse"
 
-#: src/query_search.c:395
+#: src/query_search.c:423
 #, fuzzy
 msgid "_Save as search folder"
 msgstr "Gennemsøg mappe"
 
-#: src/query_search.c:512 src/subscribedialog.c:526 src/summaryview.c:842
+#: src/query_search.c:542 src/subscribedialog.c:526 src/summaryview.c:842
 msgid "Done."
 msgstr "Afsluttet."
 
-#: src/query_search.c:536
+#: src/query_search.c:566
 #, fuzzy, c-format
 msgid "Searching %s ..."
 msgstr "Gennemsøger mappe %s ..."
 
-#: src/query_search.c:564
+#: src/query_search.c:594
 #, fuzzy, c-format
 msgid "Searching %s (%d / %d)..."
 msgstr "Filtrering..."
 
-#: src/query_search.c:645 src/summaryview.c:2051
+#: src/query_search.c:675 src/summaryview.c:2051
 msgid "(No Date)"
 msgstr "(Ingen dato)"
 
-#: src/query_search.c:833
+#: src/query_search.c:869
 #, fuzzy
 msgid "Save as search folder"
 msgstr "Gennemsøg mappe"
 
-#: src/query_search.c:854
+#: src/query_search.c:890
 #, fuzzy
 msgid "Location:"
 msgstr "Afbryd handling"
 
-#: src/query_search.c:869
+#: src/query_search.c:905
 #, fuzzy
 msgid "Folder name:"
 msgstr "Fil navn"
@@ -6654,40 +6651,40 @@ msgstr "Meddelelse %d er markéret til kopiering til %s\n"
 msgid "Destination for copy is same as current folder."
 msgstr "Fra og til mappe er ens."
 
-#: src/summaryview.c:3506
+#: src/summaryview.c:3507
 #, fuzzy
 msgid "Error occurred while processing messages."
 msgstr ""
 "Fejl ved bearbejdning af e-post:\n"
 "%s"
 
-#: src/summaryview.c:3814 src/summaryview.c:3815
+#: src/summaryview.c:3815 src/summaryview.c:3816
 msgid "Building threads..."
 msgstr "Opretter tråde"
 
-#: src/summaryview.c:3965 src/summaryview.c:3966
+#: src/summaryview.c:3966 src/summaryview.c:3967
 msgid "Unthreading..."
 msgstr "Fjerner tråde"
 
-#: src/summaryview.c:4259 src/summaryview.c:4315
+#: src/summaryview.c:4260 src/summaryview.c:4316
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtrering..."
 
-#: src/summaryview.c:4364
+#: src/summaryview.c:4365
 msgid "filtering..."
 msgstr "filtrering..."
 
-#: src/summaryview.c:4365
+#: src/summaryview.c:4366
 msgid "Filtering..."
 msgstr "Filtrering..."
 
-#: src/summaryview.c:4401
+#: src/summaryview.c:4402
 #, fuzzy, c-format
 msgid "%d message(s) have been filtered."
 msgstr "meddelelse %d er allerede gemt.\n"
 
-#: src/summaryview.c:4910
+#: src/summaryview.c:4911
 msgid "No."
 msgstr "Nr."
 
@@ -6777,6 +6774,9 @@ msgstr "Afslut"
 msgid "Sylpheed"
 msgstr "Gl. Sylpheed"
 
+#~ msgid "MIME viewer command line is invalid: `%s'"
+#~ msgstr "MIME visnings kommando ugyldig: `%s'"
+
 #~ msgid "%dB"
 #~ msgstr "%dB"
 
diff --git a/po/de.po b/po/de.po
index 68a77fd4..fd17f2b1 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-03-02 19:03+0900\n"
+"POT-Creation-Date: 2006-03-10 16:06+0900\n"
 "PO-Revision-Date: 2006-02-06 13:01+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:491
+#: libsylph/prefs_common.c:496
 msgid "Junk mail filter"
 msgstr "Spam-Mail Filter"
 
@@ -523,7 +523,7 @@ msgstr "kann markierte Datei nicht öffnen\n"
 msgid "can't fetch message %d\n"
 msgstr "kann Nachricht %d nicht holen\n"
 
-#: libsylph/procmsg.c:1375
+#: libsylph/procmsg.c:1378
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Druck-Befehlszeile ist ungültig: `%s'\n"
@@ -601,12 +601,12 @@ msgstr "  Betreff: %s\n"
 msgid "  Issuer: %s\n"
 msgstr "  Aussteller(in): %s\n"
 
-#: libsylph/utils.c:2411 src/compose.c:2869 src/compose.c:3132
-#: src/compose.c:3195 src/compose.c:3315
+#: libsylph/utils.c:2430 src/compose.c:2888 src/compose.c:3151
+#: src/compose.c:3214 src/compose.c:3334
 msgid "can't change file mode\n"
 msgstr "kann Dateimodus nicht ändern\n"
 
-#: libsylph/utils.c:2418 libsylph/utils.c:2542
+#: libsylph/utils.c:2437 libsylph/utils.c:2561
 #, c-format
 msgid "writing to %s failed.\n"
 msgstr "Schreiben in %s fehlgeschlagen.\n"
@@ -690,8 +690,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:493
-#: src/compose.c:4273 src/editaddress.c:200 src/editaddress.c:942
+#: src/account_dialog.c:366 src/addressadd.c:192 src/addressbook.c:491
+#: src/compose.c:4292 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
@@ -827,12 +827,12 @@ msgstr "Aktionen Benutzer-Parameter"
 msgid "Add Address to Book"
 msgstr "Adresse in Adressbuch einfügen"
 
-#: src/addressadd.c:202 src/compose.c:4777 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4796 src/editaddress.c:201
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "Adresse"
 
-#: src/addressadd.c:212 src/addressbook.c:495 src/editaddress.c:202
+#: src/addressadd.c:212 src/addressbook.c:493 src/editaddress.c:202
 #: src/editaddress.c:795 src/editaddress.c:860 src/editgroup.c:267
 msgid "Remarks"
 msgstr "Kommentar"
@@ -841,110 +841,111 @@ msgstr "Kommentar"
 msgid "Select Address Book Folder"
 msgstr "Wähle Adressbuchablage"
 
-#: src/addressbook.c:338 src/compose.c:515 src/mainwindow.c:489
+#: src/addressbook.c:337 src/compose.c:515 src/mainwindow.c:489
 #: src/messageview.c:140
 msgid "/_File"
 msgstr "/_Datei"
 
-#: src/addressbook.c:339
+#: src/addressbook.c:338
 msgid "/_File/New _Book"
 msgstr "/_Datei/Neues Adress_buch"
 
-#: src/addressbook.c:340
+#: src/addressbook.c:339
 msgid "/_File/New _vCard"
 msgstr "/_Datei/Neue _vCard"
 
-#: src/addressbook.c:342
+#: src/addressbook.c:341
 msgid "/_File/New _JPilot"
 msgstr "/_Datei/Neues _JPilot"
 
-#: src/addressbook.c:345
-msgid "/_File/New _Server"
+#: src/addressbook.c:344
+#, fuzzy
+msgid "/_File/New _LDAP Server"
 msgstr "/_Datei/Neuer _Server"
 
-#: src/addressbook.c:347 src/addressbook.c:350 src/compose.c:520
+#: src/addressbook.c:346 src/addressbook.c:349 src/compose.c:520
 #: src/compose.c:525 src/compose.c:528 src/compose.c:531 src/mainwindow.c:507
 #: src/mainwindow.c:510 src/mainwindow.c:512 src/mainwindow.c:515
 #: src/mainwindow.c:517 src/messageview.c:143
 msgid "/_File/---"
 msgstr "/_Datei/---"
 
-#: src/addressbook.c:348
+#: src/addressbook.c:347
 msgid "/_File/_Edit"
 msgstr "/_Datei/_Bearbeiten"
 
-#: src/addressbook.c:349
+#: src/addressbook.c:348
 msgid "/_File/_Delete"
 msgstr "/_Datei/_Löschen"
 
-#: src/addressbook.c:351
+#: src/addressbook.c:350
 msgid "/_File/_Save"
 msgstr "/_Datei/_Speichern"
 
-#: src/addressbook.c:352 src/compose.c:532 src/messageview.c:144
+#: src/addressbook.c:351 src/compose.c:532 src/messageview.c:144
 msgid "/_File/_Close"
 msgstr "/_Datei/S_chließen"
 
-#: src/addressbook.c:353
+#: src/addressbook.c:352
 msgid "/_Address"
 msgstr "/_Adresse"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:353
 msgid "/_Address/New _Address"
 msgstr "/_Adresse/Neue _Adresse"
 
-#: src/addressbook.c:355
+#: src/addressbook.c:354
 msgid "/_Address/New _Group"
 msgstr "/_Adresse/Neue _Gruppe"
 
-#: src/addressbook.c:356
+#: src/addressbook.c:355
 msgid "/_Address/New _Folder"
 msgstr "/_Adresse/Neue Ab_lage"
 
-#: src/addressbook.c:357
+#: src/addressbook.c:356
 msgid "/_Address/---"
 msgstr "/_Adresse/---"
 
-#: src/addressbook.c:358
+#: src/addressbook.c:357
 msgid "/_Address/_Edit"
 msgstr "/_Adresse/_Bearbeiten"
 
-#: src/addressbook.c:359
+#: src/addressbook.c:358
 msgid "/_Address/_Delete"
 msgstr "/_Adresse/_Löschen"
 
-#: src/addressbook.c:360 src/compose.c:645 src/mainwindow.c:758
-#: src/messageview.c:266
+#: src/addressbook.c:359 src/compose.c:645 src/mainwindow.c:758
+#: src/messageview.c:267
 msgid "/_Tools"
 msgstr "/_Werkzeug"
 
-#: src/addressbook.c:361
+#: src/addressbook.c:360
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Werkzeug/Importiere _LDIF-Datei"
 
-#: src/addressbook.c:362 src/compose.c:666 src/mainwindow.c:812
-#: src/messageview.c:286
+#: src/addressbook.c:361 src/compose.c:666 src/mainwindow.c:812
+#: src/messageview.c:287
 msgid "/_Help"
 msgstr "/_Hilfe"
 
-#: src/addressbook.c:363 src/compose.c:667 src/mainwindow.c:824
-#: src/messageview.c:287
+#: src/addressbook.c:362 src/compose.c:667 src/mainwindow.c:824
+#: src/messageview.c:288
 msgid "/_Help/_About"
 msgstr "/_Hilfe/_Über"
 
-#: src/addressbook.c:382 src/addressbook.c:392
+#: src/addressbook.c:381 src/addressbook.c:391
 msgid "/New _Address"
 msgstr "/Neue _Adresse"
 
-#: src/addressbook.c:383 src/addressbook.c:393
+#: src/addressbook.c:382 src/addressbook.c:392
 msgid "/New _Group"
 msgstr "/Neue _Gruppe"
 
-#: src/addressbook.c:384 src/addressbook.c:394
+#: src/addressbook.c:383 src/addressbook.c:393
 msgid "/New _Folder"
 msgstr "/Neue Ab_lage"
 
-#: src/addressbook.c:385 src/addressbook.c:395 src/compose.c:509
+#: src/addressbook.c:384 src/addressbook.c:394 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
@@ -954,70 +955,70 @@ msgstr "/Neue Ab_lage"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:386 src/addressbook.c:396 src/compose.c:534
+#: src/addressbook.c:385 src/addressbook.c:395 src/compose.c:534
 #: src/mainwindow.c:521 src/messageview.c:146
 msgid "/_Edit"
 msgstr "/_Bearbeiten"
 
-#: src/addressbook.c:387 src/addressbook.c:397 src/summaryview.c:434
+#: src/addressbook.c:386 src/addressbook.c:396 src/summaryview.c:434
 msgid "/_Delete"
 msgstr "/_Löschen"
 
-#: src/addressbook.c:494
+#: src/addressbook.c:492
 msgid "E-Mail address"
 msgstr "E-Mail Adresse"
 
-#: src/addressbook.c:498 src/compose.c:4778 src/prefs_common_dialog.c:2183
+#: src/addressbook.c:496 src/compose.c:4797 src/prefs_common_dialog.c:2183
 msgid "Address book"
 msgstr "Adressbuch"
 
-#: src/addressbook.c:600 src/prefs_filter_edit.c:249
+#: src/addressbook.c:603 src/prefs_filter_edit.c:249
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "Name:"
 
 #. Buttons
-#: src/addressbook.c:632 src/addressbook.c:1684 src/editaddress.c:884
+#: src/addressbook.c:636 src/addressbook.c:1678 src/editaddress.c:884
 #: src/editaddress.c:1017 src/mainwindow.c:2426 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:635 src/editaddress.c:890 src/editaddress.c:1023
+#: src/addressbook.c:639 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:1552
 msgid "Add"
 msgstr "Hinzufügen"
 
-#: src/addressbook.c:638
+#: src/addressbook.c:642
 msgid "Lookup"
 msgstr "Vorschau"
 
-#: src/addressbook.c:650 src/headerview.c:55 src/prefs_folder_item.c:339
+#: src/addressbook.c:654 src/headerview.c:55 src/prefs_folder_item.c:339
 #: src/prefs_template.c:176
 msgid "To:"
 msgstr "An:"
 
-#: src/addressbook.c:654 src/prefs_folder_item.c:356 src/prefs_template.c:178
+#: src/addressbook.c:658 src/prefs_folder_item.c:356 src/prefs_template.c:178
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:658 src/prefs_folder_item.c:367
+#: src/addressbook.c:662 src/prefs_folder_item.c:367
 msgid "Bcc:"
 msgstr "Bcc:"
 
 #. Confirm deletion
-#: src/addressbook.c:845
+#: src/addressbook.c:832
 msgid "Delete address(es)"
 msgstr "Adresse(n) löschen"
 
-#: src/addressbook.c:846
+#: src/addressbook.c:833
 msgid "Really delete the address(es)?"
 msgstr "Adresse(n) wirklich löschen?"
 
-#: src/addressbook.c:1675
+#: src/addressbook.c:1669
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1027,36 +1028,36 @@ msgstr ""
 "Wenn Sie nur die Ablage löschen, werden die Adressen in das übergeordnete "
 "Verzeichnis verschoben."
 
-#: src/addressbook.c:1678 src/folderview.c:2372
+#: src/addressbook.c:1672 src/folderview.c:2372
 msgid "Delete folder"
 msgstr "Ablage löschen"
 
-#: src/addressbook.c:1678
+#: src/addressbook.c:1672
 msgid "_Folder only"
 msgstr "Nur Abla_ge"
 
-#: src/addressbook.c:1678
+#: src/addressbook.c:1672
 msgid "Folder and _addresses"
 msgstr "Ablage und _Adressen"
 
-#: src/addressbook.c:1683
+#: src/addressbook.c:1677
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Wirklich '%s' löschen ?"
 
-#: src/addressbook.c:2369 src/addressbook.c:2502
+#: src/addressbook.c:2363 src/addressbook.c:2496
 msgid "New user, could not save index file."
 msgstr "Neuer Benutzer, kann Index-Datei nicht speichern."
 
-#: src/addressbook.c:2373 src/addressbook.c:2506
+#: src/addressbook.c:2367 src/addressbook.c:2500
 msgid "New user, could not save address book files."
 msgstr "Neuer Benutzer, kann Adressbuch-Dateien nicht speichern."
 
-#: src/addressbook.c:2383 src/addressbook.c:2516
+#: src/addressbook.c:2377 src/addressbook.c:2510
 msgid "Old address book converted successfully."
 msgstr "Altes Adressbuch erfolgreich konvertiert."
 
-#: src/addressbook.c:2388
+#: src/addressbook.c:2382
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1064,7 +1065,7 @@ msgstr ""
 "Altes Adressbuch konvertiert,\n"
 "kann neue Adress-Index-Datei nicht speichern"
 
-#: src/addressbook.c:2401
+#: src/addressbook.c:2395
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1072,7 +1073,7 @@ msgstr ""
 "Konnte Adressbuch nicht konvertieren,\n"
 "aber erstellte neue leere Adressbuch-Dateien."
 
-#: src/addressbook.c:2407
+#: src/addressbook.c:2401
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1080,7 +1081,7 @@ msgstr ""
 "Konnte Adressbuch nicht konvertieren,\n"
 "konnte neue Adressbuch-Dateien nicht erstellen."
 
-#: src/addressbook.c:2412
+#: src/addressbook.c:2406
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1088,92 +1089,92 @@ msgstr ""
 "Konnte Adressbuch nicht konvertieren\n"
 "und konnte neue Adressbuch-Dateien erstellen."
 
-#: src/addressbook.c:2419
+#: src/addressbook.c:2413
 msgid "Addressbook conversion error"
 msgstr "Adressbuch-Konvertierungs-Fehler"
 
-#: src/addressbook.c:2423
+#: src/addressbook.c:2417
 msgid "Addressbook conversion"
 msgstr "Adressbuch-Konvertierung"
 
-#: src/addressbook.c:2458
+#: src/addressbook.c:2452
 msgid "Addressbook Error"
 msgstr "Adressbuch-Fehler"
 
-#: src/addressbook.c:2459 src/addressbook.c:2559
+#: src/addressbook.c:2453 src/addressbook.c:2553
 msgid "Could not read address index"
 msgstr "Konnte Adress-Index nicht lesen"
 
-#: src/addressbook.c:2521
+#: src/addressbook.c:2515
 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:2535
+#: src/addressbook.c:2529
 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:2541
+#: src/addressbook.c:2535
 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:2547
+#: src/addressbook.c:2541
 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:2565
+#: src/addressbook.c:2559
 msgid "Addressbook Conversion Error"
 msgstr "Adressbuch-Konvertierungs-Fehler"
 
-#: src/addressbook.c:2571
+#: src/addressbook.c:2565
 msgid "Addressbook Conversion"
 msgstr "Adressbuch-Konvertierung"
 
-#: src/addressbook.c:3086 src/prefs_common_dialog.c:2033
+#: src/addressbook.c:3080 src/prefs_common_dialog.c:2033
 msgid "Interface"
 msgstr "Benutzerschnittstelle"
 
-#: src/addressbook.c:3102 src/importldif.c:514
+#: src/addressbook.c:3096 src/importldif.c:514
 msgid "Address Book"
 msgstr "Adressbuch"
 
-#: src/addressbook.c:3118
+#: src/addressbook.c:3112
 msgid "Person"
 msgstr "Person"
 
-#: src/addressbook.c:3134
+#: src/addressbook.c:3128
 msgid "EMail Address"
 msgstr "E-Mail Adresse"
 
-#: src/addressbook.c:3150
+#: src/addressbook.c:3144
 msgid "Group"
 msgstr "Gruppe"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3166 src/folderview.c:367 src/prefs_account_dialog.c:1694
-#: src/query_search.c:370
+#: src/addressbook.c:3160 src/folderview.c:367 src/prefs_account_dialog.c:1694
+#: src/query_search.c:398
 msgid "Folder"
 msgstr "Ablage"
 
-#: src/addressbook.c:3182
+#: src/addressbook.c:3176
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3198 src/addressbook.c:3214
+#: src/addressbook.c:3192 src/addressbook.c:3208
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3230
+#: src/addressbook.c:3224
 msgid "LDAP Server"
 msgstr "LDAP-Server"
 
@@ -1185,7 +1186,7 @@ msgstr "Allgemeine Adressen"
 msgid "Personal address"
 msgstr "Persönliche Adressen"
 
-#: src/alertpanel.c:142 src/compose.c:5500 src/main.c:621
+#: src/alertpanel.c:142 src/compose.c:5517 src/main.c:621
 msgid "Notice"
 msgstr "Notiz"
 
@@ -1193,7 +1194,7 @@ msgstr "Notiz"
 msgid "Warning"
 msgstr "Warnung"
 
-#: src/alertpanel.c:168 src/inc.c:587
+#: src/alertpanel.c:168 src/inc.c:586
 msgid "Error"
 msgstr "Fehler"
 
@@ -1236,7 +1237,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:4761
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4762
 msgid "None"
 msgstr "Keine"
 
@@ -1482,7 +1483,7 @@ msgstr "/_Ansicht/_Zeichensatz/Thai (TIS-620)"
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Ansicht/_Zeichensatz/Thai (Windows-874)"
 
-#: src/compose.c:646 src/mainwindow.c:759 src/messageview.c:267
+#: src/compose.c:646 src/mainwindow.c:759 src/messageview.c:268
 msgid "/_Tools/_Address book"
 msgstr "/_Werkzeug/_Adressbuch"
 
@@ -1490,14 +1491,14 @@ msgstr "/_Werkzeug/_Adressbuch"
 msgid "/_Tools/_Template"
 msgstr "/_Werkzeug/_Schablone"
 
-#: src/compose.c:649 src/mainwindow.c:783 src/messageview.c:283
+#: src/compose.c:649 src/mainwindow.c:783 src/messageview.c:284
 msgid "/_Tools/Actio_ns"
 msgstr "/_Werkzeug/Aktio_nen"
 
 #: src/compose.c:651 src/compose.c:655 src/compose.c:661 src/mainwindow.c:762
 #: src/mainwindow.c:776 src/mainwindow.c:781 src/mainwindow.c:784
-#: src/mainwindow.c:788 src/mainwindow.c:790 src/messageview.c:270
-#: src/messageview.c:282
+#: src/mainwindow.c:788 src/mainwindow.c:790 src/messageview.c:271
+#: src/messageview.c:283
 msgid "/_Tools/---"
 msgstr "/_Werkzeug/---"
 
@@ -1521,79 +1522,79 @@ msgstr "/_Werkzeuge/_Rechtschreibprüfung"
 msgid "/_Tools/_Set spell language"
 msgstr "/_Werkzeug/_Sprache einstellen"
 
-#: src/compose.c:910
+#: src/compose.c:912
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: Datei existiert nicht\n"
 
-#: src/compose.c:1014 src/compose.c:1085
+#: src/compose.c:1016 src/compose.c:1087
 msgid "Can't get text part\n"
 msgstr "Kann Textabschnitt nicht lesen\n"
 
-#: src/compose.c:1486
+#: src/compose.c:1488
 msgid "Quote mark format error."
 msgstr "Zitatzeichen Formatfehler."
 
-#: src/compose.c:1498
+#: src/compose.c:1500
 msgid "Message reply/forward format error."
 msgstr "Formatfehler in Nachrichtenantwort oder -Weiterleitung."
 
-#: src/compose.c:1918
+#: src/compose.c:1935
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Datei %s existiert nicht\n"
 
-#: src/compose.c:1922
+#: src/compose.c:1939
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Kann Dateigröße von %s nicht ermitteln\n"
 
-#: src/compose.c:1926
+#: src/compose.c:1943
 #, c-format
 msgid "File %s is empty."
 msgstr "Datei %s ist leer."
 
-#: src/compose.c:1930
+#: src/compose.c:1947
 #, c-format
 msgid "Can't read %s."
 msgstr "Kann %s nicht lesen."
 
-#: src/compose.c:1963
+#: src/compose.c:1980
 #, c-format
 msgid "Message: %s"
 msgstr "Nachricht: %s"
 
-#: src/compose.c:2023 src/mimeview.c:565
+#: src/compose.c:2040 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:2507 src/headerview.c:195 src/query_search.c:636
+#: src/compose.c:2524 src/headerview.c:195 src/query_search.c:666
 #: src/summaryview.c:2124
 msgid "(No Subject)"
 msgstr "(Kein Betreff)"
 
-#: src/compose.c:2510
+#: src/compose.c:2527
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Verfassen%s"
 
-#: src/compose.c:2623
+#: src/compose.c:2642
 msgid "Recipient is not specified."
 msgstr "Empfänger nicht angegeben"
 
-#: src/compose.c:2631
+#: src/compose.c:2650
 msgid "Empty subject"
 msgstr "Leerer Betreff"
 
-#: src/compose.c:2632
+#: src/compose.c:2651
 msgid "Subject is empty. Send it anyway?"
 msgstr "Betreff ist leer. Trotzdem verschicken?"
 
-#: src/compose.c:2691
+#: src/compose.c:2710
 msgid "can't get recipient list."
 msgstr "Kann die Empfängerliste nicht holen."
 
-#: src/compose.c:2711
+#: src/compose.c:2730
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1601,21 +1602,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:2725 src/send_message.c:299
+#: src/compose.c:2744 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:2767
+#: src/compose.c:2786
 msgid "Can't save the message to outbox."
 msgstr "Kann die Nachricht nicht in der Gesendet-Ablage speichern."
 
-#: src/compose.c:2805
+#: src/compose.c:2824
 #, 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:2902
+#: src/compose.c:2921
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1626,11 +1627,11 @@ msgstr ""
 "\n"
 "Dennoch mit %s senden?"
 
-#: src/compose.c:2908
+#: src/compose.c:2927
 msgid "Code conversion error"
 msgstr "Zeichensatz-Konvertierungs-Fehler"
 
-#: src/compose.c:2981
+#: src/compose.c:3000
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1643,156 +1644,156 @@ msgstr ""
 "\n"
 "Dennoch senden?"
 
-#: src/compose.c:2985
+#: src/compose.c:3004
 msgid "Line length limit"
 msgstr "maximale Zeilenlänge"
 
-#: src/compose.c:3275
+#: src/compose.c:3294
 msgid "can't remove the old message\n"
 msgstr "Kann die alte Nachricht nicht entfernen\n"
 
-#: src/compose.c:3293
+#: src/compose.c:3312
 msgid "queueing message...\n"
 msgstr "Nachricht einreihen...\n"
 
-#: src/compose.c:3375
+#: src/compose.c:3394
 msgid "can't find queue folder\n"
 msgstr "kann Queue-Ablage nicht finden\n"
 
-#: src/compose.c:3382
+#: src/compose.c:3401
 msgid "can't queue the message\n"
 msgstr "Nachricht kann nicht eingereiht werden\n"
 
-#: src/compose.c:3975
+#: src/compose.c:3994
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "erzeugte Nachrichten-ID: %s\n"
 
-#: src/compose.c:4088
+#: src/compose.c:4107
 msgid "Creating compose window...\n"
 msgstr "Erstelle Verfassenfenster...\n"
 
-#: src/compose.c:4139 src/headerview.c:54
+#: src/compose.c:4158 src/headerview.c:54
 msgid "From:"
 msgstr "Von:"
 
-#: src/compose.c:4213
+#: src/compose.c:4232
 msgid "PGP Sign"
 msgstr "PGP Unterschreiben"
 
-#: src/compose.c:4216
+#: src/compose.c:4235
 msgid "PGP Encrypt"
 msgstr "PGP Verschlüsseln"
 
-#: src/compose.c:4254 src/compose.c:5332
+#: src/compose.c:4273 src/compose.c:5351
 msgid "MIME type"
 msgstr "MIME-Typ"
 
 #. S_COL_DATE
-#: src/compose.c:4263 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4908
+#: src/compose.c:4282 src/mimeview.c:197 src/prefs_filter_edit.c:496
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4909
 msgid "Size"
 msgstr "Größe"
 
-#: src/compose.c:4698 src/mainwindow.c:2359 src/prefs_account_dialog.c:528
+#: src/compose.c:4717 src/mainwindow.c:2359 src/prefs_account_dialog.c:528
 #: src/prefs_common_dialog.c:661
 msgid "Send"
 msgstr "Senden"
 
-#: src/compose.c:4699
+#: src/compose.c:4718
 msgid "Send message"
 msgstr "Sende Nachricht"
 
-#: src/compose.c:4707
+#: src/compose.c:4726
 msgid "Send later"
 msgstr "Später senden"
 
-#: src/compose.c:4708
+#: src/compose.c:4727
 msgid "Put into queue folder and send later"
 msgstr "In Queue-Ablage und später senden"
 
-#: src/compose.c:4716
+#: src/compose.c:4735
 msgid "Draft"
 msgstr "Entwurf"
 
-#: src/compose.c:4717
+#: src/compose.c:4736
 msgid "Save to draft folder"
 msgstr "Speichern in Entwurfablage"
 
-#: src/compose.c:4727
+#: src/compose.c:4746
 msgid "Insert"
 msgstr "Einfügen"
 
-#: src/compose.c:4728
+#: src/compose.c:4747
 msgid "Insert file"
 msgstr "Datei einfügen"
 
-#: src/compose.c:4736
+#: src/compose.c:4755
 msgid "Attach"
 msgstr "Anhängen"
 
-#: src/compose.c:4737
+#: src/compose.c:4756
 msgid "Attach file"
 msgstr "Datei anhängen"
 
 #. signature
-#: src/compose.c:4747 src/prefs_account_dialog.c:1208
+#: src/compose.c:4766 src/prefs_account_dialog.c:1208
 #: src/prefs_common_dialog.c:953
 msgid "Signature"
 msgstr "Unterschrift"
 
-#: src/compose.c:4748
+#: src/compose.c:4767
 msgid "Append signature"
 msgstr "Signatur anhängen"
 
 #. editor
-#: src/compose.c:4757 src/prefs_common_dialog.c:991
+#: src/compose.c:4776 src/prefs_common_dialog.c:991
 #: src/prefs_common_dialog.c:2315
 msgid "Editor"
 msgstr "Editor"
 
-#: src/compose.c:4758
+#: src/compose.c:4777
 msgid "Edit with external editor"
 msgstr "Bearbeiten mit externem Editor"
 
-#: src/compose.c:4766
+#: src/compose.c:4785
 msgid "Linewrap"
 msgstr "Zeilenumbruch"
 
-#: src/compose.c:4767
+#: src/compose.c:4786
 msgid "Wrap all long lines"
 msgstr "Alle langen Zeilen umbrechen"
 
-#: src/compose.c:5228
+#: src/compose.c:5247
 msgid "Invalid MIME type."
 msgstr "Ungültiger MIME Typ"
 
-#: src/compose.c:5246
+#: src/compose.c:5265
 msgid "File doesn't exist or is empty."
 msgstr "Datei existiert nicht oder ist leer."
 
-#: src/compose.c:5314
+#: src/compose.c:5333
 msgid "Properties"
 msgstr "Eigenschaften"
 
-#: src/compose.c:5334 src/prefs_common_dialog.c:1444
+#: src/compose.c:5353 src/prefs_common_dialog.c:1444
 msgid "Encoding"
 msgstr "Zeichensatzkodierung"
 
-#: src/compose.c:5357 src/prefs_folder_item.c:202
+#: src/compose.c:5376 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Pfad"
 
-#: src/compose.c:5358
+#: src/compose.c:5377
 msgid "File name"
 msgstr "Dateiname"
 
-#: src/compose.c:5449
+#: src/compose.c:5466
 #, 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:5497
+#: src/compose.c:5514
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1801,44 +1802,44 @@ msgstr ""
 "Der externe Editor arbeitet noch.\n"
 "Prozess terminieren (pid: %d)?\n"
 
-#: src/compose.c:5872 src/compose.c:5877 src/compose.c:5883
+#: src/compose.c:5889 src/compose.c:5894 src/compose.c:5900
 msgid "Can't queue the message."
 msgstr "Nachricht kann nicht eingereiht werden."
 
-#: src/compose.c:5974
+#: src/compose.c:5991
 msgid "Select files"
 msgstr "Wähle Datei(en)"
 
-#: src/compose.c:5997
+#: src/compose.c:6014
 msgid "Select file"
 msgstr "Wähle Datei"
 
-#: src/compose.c:6032
+#: src/compose.c:6049
 msgid "Save message"
 msgstr "Speichern der Nachricht"
 
-#: src/compose.c:6033
+#: src/compose.c:6050
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Diese Nachricht wurde geändert. Speichern als Entwurf?"
 
-#: src/compose.c:6035
+#: src/compose.c:6052
 msgid "Close _without saving"
 msgstr "Schließen _ohne Speichern"
 
-#: src/compose.c:6077
+#: src/compose.c:6094
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Wollen Sie die Schablone '%s' übernehmen ?"
 
-#: src/compose.c:6079
+#: src/compose.c:6096
 msgid "Apply template"
 msgstr "Schablone übernehmen"
 
-#: src/compose.c:6080
+#: src/compose.c:6097
 msgid "_Replace"
 msgstr "E_rsetzen"
 
-#: src/compose.c:6080
+#: src/compose.c:6097
 msgid "_Insert"
 msgstr "_Einfügen"
 
@@ -1959,52 +1960,52 @@ msgstr "Ein Gruppenname muss angegeben werden."
 msgid "Edit Group Data"
 msgstr "Gruppendaten bearbeiten"
 
-#: src/editgroup.c:300
+#: src/editgroup.c:299
 msgid "Group Name"
 msgstr "Gruppenname"
 
-#: src/editgroup.c:319
+#: src/editgroup.c:318
 msgid "Addresses in Group"
 msgstr "Adressen in Gruppe"
 
-#: src/editgroup.c:321
+#: src/editgroup.c:320
 msgid " -> "
 msgstr " -> "
 
-#: src/editgroup.c:348
+#: src/editgroup.c:347
 msgid " <- "
 msgstr " <- "
 
-#: src/editgroup.c:350
+#: src/editgroup.c:349
 msgid "Available Addresses"
 msgstr "Vorhandene Adressen"
 
-#: src/editgroup.c:416
+#: src/editgroup.c:415
 msgid "Move E-Mail Addresses to or from Group with arrow buttons"
 msgstr "Bewege E-Mail-Adresse zu oder von einer Gruppe mit den Pfeiltasten"
 
-#: src/editgroup.c:468
+#: src/editgroup.c:467
 msgid "Edit Group Details"
 msgstr "Gruppendetails bearbeiten"
 
-#: src/editgroup.c:471
+#: src/editgroup.c:470
 msgid "Add New Group"
 msgstr "Neue Gruppe hinzufügen"
 
-#: src/editgroup.c:522
+#: src/editgroup.c:521
 msgid "Edit folder"
 msgstr "Ablage bearbeiten"
 
-#: src/editgroup.c:522
+#: src/editgroup.c:521
 msgid "Input the new name of folder:"
 msgstr "Geben Sie den neuen Namen der Ablage ein:"
 
-#: src/editgroup.c:525 src/foldersel.c:541 src/folderview.c:2121
+#: src/editgroup.c:524 src/foldersel.c:541 src/folderview.c:2121
 #: src/folderview.c:2127
 msgid "New folder"
 msgstr "Neue Ablage"
 
-#: src/editgroup.c:526 src/foldersel.c:542 src/folderview.c:2128
+#: src/editgroup.c:525 src/foldersel.c:542 src/folderview.c:2128
 msgid "Input the name of new folder:"
 msgstr "Geben Sie den Namen der neuen Ablage ein:"
 
@@ -2201,7 +2202,7 @@ msgid "`%c' can't be included in folder name."
 msgstr "'%c' kann nicht in den Ablagenamen integriert werden."
 
 #: src/foldersel.c:561 src/folderview.c:2147 src/folderview.c:2206
-#: src/query_search.c:995
+#: src/query_search.c:1031
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Die Ablage '%s' existiert bereits."
@@ -2458,7 +2459,7 @@ msgstr "Betreff:"
 msgid "Creating header view...\n"
 msgstr "Erzeuge Kopfzeilenansicht...\n"
 
-#: src/headerview.c:180 src/query_search.c:637 src/summaryview.c:2127
+#: src/headerview.c:180 src/query_search.c:667 src/summaryview.c:2127
 msgid "(No From)"
 msgstr "(Kein Von)"
 
@@ -2589,133 +2590,133 @@ msgstr "Ende"
 msgid "Sylpheed: %d new messages"
 msgstr "Sylpheed: %d neue Nachricht(en)"
 
-#: src/inc.c:372
+#: src/inc.c:371
 msgid "Retrieving new messages"
 msgstr "Empfange neue Nachricht"
 
-#: src/inc.c:415
+#: src/inc.c:414
 msgid "Standby"
 msgstr "Warten"
 
-#: src/inc.c:544 src/inc.c:593
+#: src/inc.c:543 src/inc.c:592
 msgid "Cancelled"
 msgstr "Abgebrochen"
 
-#: src/inc.c:555
+#: src/inc.c:554
 msgid "Retrieving"
 msgstr "Empfange"
 
-#: src/inc.c:564
+#: src/inc.c:563
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "Fertig (%d Nachricht(en) (%s) empfangen)"
 
-#: src/inc.c:568
+#: src/inc.c:567
 msgid "Done (no new messages)"
 msgstr "Fertig (keine neuen Nachrichten)"
 
-#: src/inc.c:574
+#: src/inc.c:573
 msgid "Connection failed"
 msgstr "Verbindung fehlgeschlagen"
 
-#: src/inc.c:577
+#: src/inc.c:576
 msgid "Auth failed"
 msgstr "Beglaubigung fehlgeschlagen"
 
-#: src/inc.c:580
+#: src/inc.c:579
 msgid "Locked"
 msgstr "Blockiert"
 
-#: src/inc.c:590
+#: src/inc.c:589
 msgid "Timeout"
 msgstr "Timeout"
 
-#: src/inc.c:640
+#: src/inc.c:639
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Beendet (%d neue Nachricht(en))"
 
-#: src/inc.c:643
+#: src/inc.c:642
 msgid "Finished (no new messages)"
 msgstr "Beendet (keine neuen Nachrichten)"
 
-#: src/inc.c:652
+#: src/inc.c:651
 msgid "Some errors occurred while getting mail."
 msgstr "Fehler während des Empfanges der E-Mails."
 
-#: src/inc.c:688
+#: src/inc.c:687
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "erhalte neue Nachrichten vom Account %s...\n"
 
-#: src/inc.c:691
+#: src/inc.c:690
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Empfange neue Nachrichten"
 
-#: src/inc.c:710
+#: src/inc.c:709
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Verbinde mit POP3-Server: %s..."
 
-#: src/inc.c:719
+#: src/inc.c:718
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Keine Verbindung mit POP3-Server: %s:%d\n"
 
-#: src/inc.c:798 src/send_message.c:631
+#: src/inc.c:797 src/send_message.c:631
 msgid "Authenticating..."
 msgstr "Beglaubigen..."
 
-#: src/inc.c:799
+#: src/inc.c:798
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Erhaltene Nachrichten von %s..."
 
-#: src/inc.c:804
+#: src/inc.c:803
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Bekomme Anzahl der neuen Nachrichten (STAT)..."
 
-#: src/inc.c:808
+#: src/inc.c:807
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Bekomme Anzahl der neuen Nachrichten (LAST)..."
 
-#: src/inc.c:812
+#: src/inc.c:811
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Bekomme Anzahl der neuen Nachrichten (UIDL)..."
 
-#: src/inc.c:816
+#: src/inc.c:815
 msgid "Getting the size of messages (LIST)..."
 msgstr "Bekomme Anzahl der neuen Nachrichten (LIST)..."
 
-#: src/inc.c:826
+#: src/inc.c:825
 #, c-format
 msgid "Deleting message %d"
 msgstr "Lösche Nachricht %d"
 
-#: src/inc.c:833 src/send_message.c:649
+#: src/inc.c:832 src/send_message.c:649
 msgid "Quitting"
 msgstr "Beenden"
 
-#: src/inc.c:858
+#: src/inc.c:857
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Empfange Nachricht (%d / %d) (%s / %s)"
 
-#: src/inc.c:879
+#: src/inc.c:878
 #, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Empfange (%d Nachricht(en) (%s) empfangen)"
 
-#: src/inc.c:1107
+#: src/inc.c:1106
 msgid "Connection failed."
 msgstr "Verbindung fehlgeschlagen."
 
-#: src/inc.c:1113
+#: src/inc.c:1112
 msgid "Error occurred while processing mail."
 msgstr "Fehler beim Verarbeiten der E-Mail."
 
-#: src/inc.c:1118
+#: src/inc.c:1117
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2724,28 +2725,28 @@ msgstr ""
 "Fehler beim Verarbeiten der E-Mail:\n"
 "%s"
 
-#: src/inc.c:1124
+#: src/inc.c:1123
 msgid "No disk space left."
 msgstr "Kein Platz mehr auf der Festplatte."
 
-#: src/inc.c:1129
+#: src/inc.c:1128
 msgid "Can't write file."
 msgstr "Kann Datei nicht schreiben."
 
-#: src/inc.c:1134
+#: src/inc.c:1133
 msgid "Socket error."
 msgstr "Socket-Fehler."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1140 src/send_message.c:584 src/send_message.c:772
+#: src/inc.c:1139 src/send_message.c:584 src/send_message.c:772
 msgid "Connection closed by the remote host."
 msgstr "Verbindung geschlossen vom Remote-Host."
 
-#: src/inc.c:1146
+#: src/inc.c:1145
 msgid "Mailbox is locked."
 msgstr "Mailbox ist blockiert."
 
-#: src/inc.c:1150
+#: src/inc.c:1149
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2754,11 +2755,11 @@ msgstr ""
 "Mailbox ist gesperrt:\n"
 "%s"
 
-#: src/inc.c:1156 src/send_message.c:757
+#: src/inc.c:1155 src/send_message.c:757
 msgid "Authentication failed."
 msgstr "Beglaubigung fehlgeschlagen."
 
-#: src/inc.c:1161 src/send_message.c:760
+#: src/inc.c:1160 src/send_message.c:760
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2767,15 +2768,15 @@ msgstr ""
 "Beglaubigung fehlgeschlagen:\n"
 "%s"
 
-#: src/inc.c:1166 src/send_message.c:776
+#: src/inc.c:1165 src/send_message.c:776
 msgid "Session timed out."
 msgstr "Sitzungszeit abgelaufen."
 
-#: src/inc.c:1202
+#: src/inc.c:1201
 msgid "Incorporation cancelled\n"
 msgstr "Empfangen abgebrochen\n"
 
-#: src/inc.c:1285
+#: src/inc.c:1284
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Erhalte neue Nachrichten von %s in %s...\n"
@@ -3247,14 +3248,15 @@ msgid "/_View/Mess_age source"
 msgstr "/_Ansicht/Nachrichten_quelle"
 
 #: src/mainwindow.c:708 src/messageview.c:245
-msgid "/_View/Show all _header"
+#, fuzzy
+msgid "/_View/Show all _headers"
 msgstr "/_Ansicht/Zeige alle _Kopfzeilen"
 
 #: src/mainwindow.c:710
 msgid "/_View/_Update summary"
 msgstr "/_Ansicht/Akt_ualisiere Ablageninhalt"
 
-#: src/mainwindow.c:712 src/messageview.c:247
+#: src/mainwindow.c:712 src/messageview.c:248
 msgid "/_Message"
 msgstr "/_Nachricht"
 
@@ -3284,16 +3286,16 @@ msgstr "/_Nachricht/Sende _wartende Nachrichten"
 
 #: src/mainwindow.c:722 src/mainwindow.c:724 src/mainwindow.c:731
 #: src/mainwindow.c:736 src/mainwindow.c:739 src/mainwindow.c:750
-#: src/mainwindow.c:752 src/mainwindow.c:755 src/messageview.c:250
-#: src/messageview.c:258 src/messageview.c:263
+#: src/mainwindow.c:752 src/mainwindow.c:755 src/messageview.c:251
+#: src/messageview.c:259 src/messageview.c:264
 msgid "/_Message/---"
 msgstr "/_Nachricht/---"
 
-#: src/mainwindow.c:723 src/messageview.c:248
+#: src/mainwindow.c:723 src/messageview.c:249
 msgid "/_Message/Compose _new message"
 msgstr "/_Nachricht/Verfasse n_eue Nachricht"
 
-#: src/mainwindow.c:725 src/messageview.c:251
+#: src/mainwindow.c:725 src/messageview.c:252
 msgid "/_Message/_Reply"
 msgstr "/_Nachricht/An_twort"
 
@@ -3301,27 +3303,27 @@ msgstr "/_Nachricht/An_twort"
 msgid "/_Message/Repl_y to"
 msgstr "/_Nachricht/Ant_wort an"
 
-#: src/mainwindow.c:727 src/messageview.c:252
+#: src/mainwindow.c:727 src/messageview.c:253
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Nachricht/Ant_wort an/_Alle"
 
-#: src/mainwindow.c:728 src/messageview.c:254
+#: src/mainwindow.c:728 src/messageview.c:255
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Nachricht/Ant_wort an/Ab_sender"
 
-#: src/mainwindow.c:729 src/messageview.c:256
+#: src/mainwindow.c:729 src/messageview.c:257
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Nachricht/Ant_wort an/Mailing-_Liste"
 
-#: src/mainwindow.c:732 src/messageview.c:259
+#: src/mainwindow.c:732 src/messageview.c:260
 msgid "/_Message/_Forward"
 msgstr "/_Nachricht/We_iterleiten"
 
-#: src/mainwindow.c:733 src/messageview.c:260
+#: src/mainwindow.c:733 src/messageview.c:261
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Nachricht/Weiterleiten als An_hang"
 
-#: src/mainwindow.c:735 src/messageview.c:262
+#: src/mainwindow.c:735 src/messageview.c:263
 msgid "/_Message/Redirec_t"
 msgstr "/_Nachricht/_Umadressieren"
 
@@ -3377,7 +3379,7 @@ msgstr "/_Nachricht/Markiere als Spam-Mail"
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/_Nachricht/Markiere als Nicht-Spam-Mail"
 
-#: src/mainwindow.c:756 src/messageview.c:264
+#: src/mainwindow.c:756 src/messageview.c:265
 msgid "/_Message/Re-_edit"
 msgstr "/_Nachricht/Wieder_bearbeiten"
 
@@ -3393,23 +3395,23 @@ msgstr "/_Werkzeug/Alle Nachrichten einer Ablage _filtern"
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Werkzeug/Aus_gewählte Nachrichten filtern"
 
-#: src/mainwindow.c:767 src/messageview.c:271
+#: src/mainwindow.c:767 src/messageview.c:272
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Werkzeug/Filter _erstellen"
 
-#: src/mainwindow.c:768 src/messageview.c:273
+#: src/mainwindow.c:768 src/messageview.c:274
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Werkzeug/Filter _erstellen/_Automatisch"
 
-#: src/mainwindow.c:770 src/messageview.c:275
+#: src/mainwindow.c:770 src/messageview.c:276
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Werkzeug/Filter _erstellen/nach _Von"
 
-#: src/mainwindow.c:772 src/messageview.c:277
+#: src/mainwindow.c:772 src/messageview.c:278
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Werkzeug/Filter _erstellen/nach A_n"
 
-#: src/mainwindow.c:774 src/messageview.c:279
+#: src/mainwindow.c:774 src/messageview.c:280
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Werkzeug/Filter _erstellen/nach _Betreff"
 
@@ -3527,7 +3529,7 @@ msgid "MainWindow: color allocation %d failed\n"
 msgstr "Haupt-Fenster: Bereitstellung von Farbe %d fehlgeschlagen\n"
 
 #: src/mainwindow.c:1139 src/summaryview.c:2275 src/summaryview.c:2360
-#: src/summaryview.c:3907 src/summaryview.c:4036 src/summaryview.c:4394
+#: src/summaryview.c:3908 src/summaryview.c:4037 src/summaryview.c:4395
 msgid "done.\n"
 msgstr "Fertig.\n"
 
@@ -3807,7 +3809,7 @@ msgid "Find text:"
 msgstr "Text suchen:"
 
 #: src/message_search.c:153 src/prefs_search_folder.c:253
-#: src/query_search.c:326
+#: src/query_search.c:343
 msgid "Case sensitive"
 msgstr "Groß-/Kleinschreibung"
 
@@ -3831,27 +3833,27 @@ msgstr "Ende der Liste erreicht; weiter vom Anfang?"
 msgid "Search finished"
 msgstr "Suche beendet"
 
-#: src/messageview.c:268
+#: src/messageview.c:269
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/_Werkzeug/Absender in Adress_buch einfügen"
 
-#: src/messageview.c:300
+#: src/messageview.c:301
 msgid "Creating message view...\n"
 msgstr "Erstelle Nachrichtenansicht...\n"
 
-#: src/messageview.c:325
+#: src/messageview.c:326
 msgid "Text"
 msgstr "Text"
 
-#: src/messageview.c:330
+#: src/messageview.c:331
 msgid "Attachments"
 msgstr "Anhänge"
 
-#: src/messageview.c:380
+#: src/messageview.c:381
 msgid "Message View - Sylpheed"
 msgstr "Nachrichtenansich - Sylpheed"
 
-#: src/messageview.c:699 src/summaryview.c:3436
+#: src/messageview.c:700 src/summaryview.c:3436
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Kann Datei `%s' nicht speichern."
@@ -3868,7 +3870,7 @@ msgstr "(Standarddruckbefehl)"
 msgid "Print"
 msgstr "Drucken"
 
-#: src/messageview.c:770 src/summaryview.c:3471
+#: src/messageview.c:769 src/summaryview.c:3470
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -3963,11 +3965,11 @@ msgstr ""
 "Geben Sie die Befehlszeile zum Öffnen der Datei an:\n"
 "(`%s' wird durch den Dateinamen ersetzt)"
 
-#: src/mimeview.c:1147
+#: src/mimeview.c:1140
 msgid "Opening executable file"
 msgstr "Öffne ausführbare Datei"
 
-#: src/mimeview.c:1148
+#: src/mimeview.c:1141
 msgid ""
 "This is an executable file. Opening executable file is restricted for "
 "security.\n"
@@ -3979,11 +3981,6 @@ msgstr ""
 "Wenn Sie es starten möchten, speichern Sie es irgendwo und stellen Sie "
 "sicher,dass es sich nicht um einen Virus oder anderen Schadcode handelt."
 
-#: src/mimeview.c:1184
-#, c-format
-msgid "MIME viewer command line is invalid: `%s'"
-msgstr "MIME Betrachterbefehl ist ungültig: '%s'"
-
 #: src/passphrase.c:96
 msgid "Passphrase"
 msgstr "Mantra"
@@ -5726,19 +5723,19 @@ msgstr "Antwort an:"
 msgid "%s - Edit search condition"
 msgstr "%s - Suchbedingungen bearbeiten"
 
-#: src/prefs_search_folder.c:209 src/query_search.c:257
+#: src/prefs_search_folder.c:209 src/query_search.c:274
 msgid "Match any of the following"
 msgstr "Wenn eine der folgenden Bedingungen zutrifft"
 
-#: src/prefs_search_folder.c:211 src/query_search.c:259
+#: src/prefs_search_folder.c:211 src/query_search.c:276
 msgid "Match all of the following"
 msgstr "Wenn alle der folgenden Bedingungen zutreffen"
 
-#: src/prefs_search_folder.c:231 src/query_search.c:303
+#: src/prefs_search_folder.c:231 src/query_search.c:320
 msgid "Folder:"
 msgstr "Ablage:"
 
-#: src/prefs_search_folder.c:248 src/query_search.c:321
+#: src/prefs_search_folder.c:248 src/query_search.c:338
 msgid "Search subfolders"
 msgstr "Suche Unterablagen"
 
@@ -5752,17 +5749,17 @@ msgid "Attachment"
 msgstr "Anhang"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73 src/query_search.c:371 src/summaryview.c:4901
+#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4902
 msgid "Subject"
 msgstr "Betreff"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/query_search.c:372 src/summaryview.c:4904
+#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4905
 msgid "From"
 msgstr "Von"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/query_search.c:373 src/summaryview.c:4906
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:4907
 msgid "Date"
 msgstr "Datum"
 
@@ -5857,41 +5854,41 @@ msgstr "Erstelle Fortschrittsdialog...\n"
 msgid "Status"
 msgstr "Status"
 
-#: src/query_search.c:234
+#: src/query_search.c:251
 msgid "Search messages"
 msgstr "Suche Nachrichten"
 
-#: src/query_search.c:395
+#: src/query_search.c:423
 msgid "_Save as search folder"
 msgstr "_Speichern in Suchablage"
 
-#: src/query_search.c:512 src/subscribedialog.c:526 src/summaryview.c:842
+#: src/query_search.c:542 src/subscribedialog.c:526 src/summaryview.c:842
 msgid "Done."
 msgstr "Fertig."
 
-#: src/query_search.c:536
+#: src/query_search.c:566
 #, c-format
 msgid "Searching %s ..."
 msgstr "Suche %s ..."
 
-#: src/query_search.c:564
+#: src/query_search.c:594
 #, c-format
 msgid "Searching %s (%d / %d)..."
 msgstr "Suche %s (%d / %d)..."
 
-#: src/query_search.c:645 src/summaryview.c:2051
+#: src/query_search.c:675 src/summaryview.c:2051
 msgid "(No Date)"
 msgstr "(Kein Datum)"
 
-#: src/query_search.c:833
+#: src/query_search.c:869
 msgid "Save as search folder"
 msgstr "Speichern in Suchablage"
 
-#: src/query_search.c:854
+#: src/query_search.c:890
 msgid "Location:"
 msgstr "Speicherort:"
 
-#: src/query_search.c:869
+#: src/query_search.c:905
 msgid "Folder name:"
 msgstr "Ablage Name:"
 
@@ -6524,37 +6521,37 @@ msgstr "Nachricht %d ist markiert zum Kopieren nach %s\n"
 msgid "Destination for copy is same as current folder."
 msgstr "Das Kopierziel ist gleich der aktuellen Ablage."
 
-#: src/summaryview.c:3506
+#: src/summaryview.c:3507
 msgid "Error occurred while processing messages."
 msgstr "Fehler beim Verarbeiten der Nachrichten."
 
-#: src/summaryview.c:3814 src/summaryview.c:3815
+#: src/summaryview.c:3815 src/summaryview.c:3816
 msgid "Building threads..."
 msgstr "Threads erstellen..."
 
-#: src/summaryview.c:3965 src/summaryview.c:3966
+#: src/summaryview.c:3966 src/summaryview.c:3967
 msgid "Unthreading..."
 msgstr "Threads aufheben..."
 
-#: src/summaryview.c:4259 src/summaryview.c:4315
+#: src/summaryview.c:4260 src/summaryview.c:4316
 #, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtern (%d / %d)..."
 
-#: src/summaryview.c:4364
+#: src/summaryview.c:4365
 msgid "filtering..."
 msgstr "filtern..."
 
-#: src/summaryview.c:4365
+#: src/summaryview.c:4366
 msgid "Filtering..."
 msgstr "Filtern..."
 
-#: src/summaryview.c:4401
+#: src/summaryview.c:4402
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "Es wurde(n) %d Nachricht(en) gefiltert."
 
-#: src/summaryview.c:4910
+#: src/summaryview.c:4911
 msgid "No."
 msgstr "Nr."
 
@@ -6636,6 +6633,9 @@ msgstr "Be_enden"
 msgid "Sylpheed"
 msgstr "Sylpheed"
 
+#~ msgid "MIME viewer command line is invalid: `%s'"
+#~ msgstr "MIME Betrachterbefehl ist ungültig: '%s'"
+
 #~ msgid "%dB"
 #~ msgstr "%dB"
 
diff --git a/po/el.po b/po/el.po
index 3e5e7d55..a2272b96 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-03-02 19:03+0900\n"
+"POT-Creation-Date: 2006-03-10 16:06+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:491
+#: libsylph/prefs_common.c:496
 #, fuzzy
 msgid "Junk mail filter"
 msgstr "Κατάλογος"
@@ -528,7 +528,7 @@ msgstr "δεν μπορώ να ανοίξω το αρχείο mark\n"
 msgid "can't fetch message %d\n"
 msgstr "δεν μπορώ να λάβω το μήνυμα %d\n"
 
-#: libsylph/procmsg.c:1375
+#: libsylph/procmsg.c:1378
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Η εντολή εκτύπωσης είναι άκυρη: `%s'\n"
@@ -608,12 +608,12 @@ msgstr "Θέμα: %s\n"
 msgid "  Issuer: %s\n"
 msgstr "  Εκδότης: %s\n"
 
-#: libsylph/utils.c:2411 src/compose.c:2869 src/compose.c:3132
-#: src/compose.c:3195 src/compose.c:3315
+#: libsylph/utils.c:2430 src/compose.c:2888 src/compose.c:3151
+#: src/compose.c:3214 src/compose.c:3334
 msgid "can't change file mode\n"
 msgstr "δεν μπορώ να αλλάξω το mode του αρχείου\n"
 
-#: libsylph/utils.c:2418 libsylph/utils.c:2542
+#: libsylph/utils.c:2437 libsylph/utils.c:2561
 #, c-format
 msgid "writing to %s failed.\n"
 msgstr "απέτυχε το γράψιμο στο %s.\n"
@@ -697,8 +697,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:493
-#: src/compose.c:4273 src/editaddress.c:200 src/editaddress.c:942
+#: src/account_dialog.c:366 src/addressadd.c:192 src/addressbook.c:491
+#: src/compose.c:4292 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
@@ -831,12 +831,12 @@ msgstr ""
 msgid "Add Address to Book"
 msgstr "Προσθήκη διεύθυνσης στο βιβλίο"
 
-#: src/addressadd.c:202 src/compose.c:4777 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4796 src/editaddress.c:201
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "Διεύθυνση"
 
-#: src/addressadd.c:212 src/addressbook.c:495 src/editaddress.c:202
+#: src/addressadd.c:212 src/addressbook.c:493 src/editaddress.c:202
 #: src/editaddress.c:795 src/editaddress.c:860 src/editgroup.c:267
 msgid "Remarks"
 msgstr "Σχόλια"
@@ -845,114 +845,115 @@ msgstr "Σχόλια"
 msgid "Select Address Book Folder"
 msgstr "Επιλογή καταλόγου βιβλίου διευθύνσεων"
 
-#: src/addressbook.c:338 src/compose.c:515 src/mainwindow.c:489
+#: src/addressbook.c:337 src/compose.c:515 src/mainwindow.c:489
 #: src/messageview.c:140
 msgid "/_File"
 msgstr "/Αρχείο"
 
-#: src/addressbook.c:339
+#: src/addressbook.c:338
 msgid "/_File/New _Book"
 msgstr "/Αρχείο/Νέο βιβλίο"
 
-#: src/addressbook.c:340
+#: src/addressbook.c:339
 #, fuzzy
 msgid "/_File/New _vCard"
 msgstr "/Αρχείο/Νέα _V-Card"
 
-#: src/addressbook.c:342
+#: src/addressbook.c:341
 #, fuzzy
 msgid "/_File/New _JPilot"
 msgstr "/Αρχείο/Νέο _J-Pilot"
 
-#: src/addressbook.c:345
-msgid "/_File/New _Server"
+#: src/addressbook.c:344
+#, fuzzy
+msgid "/_File/New _LDAP Server"
 msgstr "/Αρχείο/Νέος εξυπηρετητής"
 
-#: src/addressbook.c:347 src/addressbook.c:350 src/compose.c:520
+#: src/addressbook.c:346 src/addressbook.c:349 src/compose.c:520
 #: src/compose.c:525 src/compose.c:528 src/compose.c:531 src/mainwindow.c:507
 #: src/mainwindow.c:510 src/mainwindow.c:512 src/mainwindow.c:515
 #: src/mainwindow.c:517 src/messageview.c:143
 msgid "/_File/---"
 msgstr "/Αρχείο/---"
 
-#: src/addressbook.c:348
+#: src/addressbook.c:347
 msgid "/_File/_Edit"
 msgstr "/Αρχείο/Επεξεργασία"
 
-#: src/addressbook.c:349
+#: src/addressbook.c:348
 msgid "/_File/_Delete"
 msgstr "/Αρχείο/Διαγραφή"
 
-#: src/addressbook.c:351
+#: src/addressbook.c:350
 msgid "/_File/_Save"
 msgstr "/Αρχείο/Αποθήκευση"
 
-#: src/addressbook.c:352 src/compose.c:532 src/messageview.c:144
+#: src/addressbook.c:351 src/compose.c:532 src/messageview.c:144
 msgid "/_File/_Close"
 msgstr "/Αρχείο/Κλείσιμο"
 
-#: src/addressbook.c:353
+#: src/addressbook.c:352
 msgid "/_Address"
 msgstr "/Διεύθυνση"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:353
 msgid "/_Address/New _Address"
 msgstr "/Διεύθυνση/Νέα διεύθυνση"
 
-#: src/addressbook.c:355
+#: src/addressbook.c:354
 msgid "/_Address/New _Group"
 msgstr "/Διεύθυνση/Νέα ομάδα"
 
-#: src/addressbook.c:356
+#: src/addressbook.c:355
 msgid "/_Address/New _Folder"
 msgstr "/Διεύθυνση/Νέος κατάλογος"
 
-#: src/addressbook.c:357
+#: src/addressbook.c:356
 msgid "/_Address/---"
 msgstr "/Διεύθυνση/---"
 
-#: src/addressbook.c:358
+#: src/addressbook.c:357
 msgid "/_Address/_Edit"
 msgstr "/Διεύθυνση/Επεξεργασία"
 
-#: src/addressbook.c:359
+#: src/addressbook.c:358
 msgid "/_Address/_Delete"
 msgstr "/Διεύθυνση/Διαγραφή"
 
-#: src/addressbook.c:360 src/compose.c:645 src/mainwindow.c:758
-#: src/messageview.c:266
+#: src/addressbook.c:359 src/compose.c:645 src/mainwindow.c:758
+#: src/messageview.c:267
 #, fuzzy
 msgid "/_Tools"
 msgstr "/Εργαλεία"
 
-#: src/addressbook.c:361
+#: src/addressbook.c:360
 #, fuzzy
 msgid "/_Tools/Import _LDIF file"
 msgstr "/Αρχείο/Εισαγωγή αρχείου mbox..."
 
-#: src/addressbook.c:362 src/compose.c:666 src/mainwindow.c:812
-#: src/messageview.c:286
+#: src/addressbook.c:361 src/compose.c:666 src/mainwindow.c:812
+#: src/messageview.c:287
 msgid "/_Help"
 msgstr "/Βοήθεια"
 
-#: src/addressbook.c:363 src/compose.c:667 src/mainwindow.c:824
-#: src/messageview.c:287
+#: src/addressbook.c:362 src/compose.c:667 src/mainwindow.c:824
+#: src/messageview.c:288
 msgid "/_Help/_About"
 msgstr "/Βοήθεια/Σχετικά"
 
-#: src/addressbook.c:382 src/addressbook.c:392
+#: src/addressbook.c:381 src/addressbook.c:391
 msgid "/New _Address"
 msgstr "/Νέα διεύθυνση"
 
-#: src/addressbook.c:383 src/addressbook.c:393
+#: src/addressbook.c:382 src/addressbook.c:392
 msgid "/New _Group"
 msgstr "/Νέα ομάδα"
 
-#: src/addressbook.c:384 src/addressbook.c:394
+#: src/addressbook.c:383 src/addressbook.c:393
 msgid "/New _Folder"
 msgstr "/Νέος κατάλογος"
 
-#: src/addressbook.c:385 src/addressbook.c:395 src/compose.c:509
+#: src/addressbook.c:384 src/addressbook.c:394 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
@@ -962,70 +963,70 @@ msgstr "/Νέος κατάλογος"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:386 src/addressbook.c:396 src/compose.c:534
+#: src/addressbook.c:385 src/addressbook.c:395 src/compose.c:534
 #: src/mainwindow.c:521 src/messageview.c:146
 msgid "/_Edit"
 msgstr "/Επεξεργασία"
 
-#: src/addressbook.c:387 src/addressbook.c:397 src/summaryview.c:434
+#: src/addressbook.c:386 src/addressbook.c:396 src/summaryview.c:434
 msgid "/_Delete"
 msgstr "/Διαγραφή"
 
-#: src/addressbook.c:494
+#: src/addressbook.c:492
 msgid "E-Mail address"
 msgstr "Διεύθυνση e-mail"
 
-#: src/addressbook.c:498 src/compose.c:4778 src/prefs_common_dialog.c:2183
+#: src/addressbook.c:496 src/compose.c:4797 src/prefs_common_dialog.c:2183
 msgid "Address book"
 msgstr "Κατάλογος διευθύνσεων"
 
-#: src/addressbook.c:600 src/prefs_filter_edit.c:249
+#: src/addressbook.c:603 src/prefs_filter_edit.c:249
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "Όνομα:"
 
 #. Buttons
-#: src/addressbook.c:632 src/addressbook.c:1684 src/editaddress.c:884
+#: src/addressbook.c:636 src/addressbook.c:1678 src/editaddress.c:884
 #: src/editaddress.c:1017 src/mainwindow.c:2426 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:635 src/editaddress.c:890 src/editaddress.c:1023
+#: src/addressbook.c:639 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:1552
 msgid "Add"
 msgstr "Προσθήκη"
 
-#: src/addressbook.c:638
+#: src/addressbook.c:642
 msgid "Lookup"
 msgstr "Αναζήτηση"
 
-#: src/addressbook.c:650 src/headerview.c:55 src/prefs_folder_item.c:339
+#: src/addressbook.c:654 src/headerview.c:55 src/prefs_folder_item.c:339
 #: src/prefs_template.c:176
 msgid "To:"
 msgstr "Προς:"
 
-#: src/addressbook.c:654 src/prefs_folder_item.c:356 src/prefs_template.c:178
+#: src/addressbook.c:658 src/prefs_folder_item.c:356 src/prefs_template.c:178
 msgid "Cc:"
 msgstr "Κοινοποίηση:"
 
-#: src/addressbook.c:658 src/prefs_folder_item.c:367
+#: src/addressbook.c:662 src/prefs_folder_item.c:367
 msgid "Bcc:"
 msgstr ""
 
 #. Confirm deletion
-#: src/addressbook.c:845
+#: src/addressbook.c:832
 msgid "Delete address(es)"
 msgstr "Διαγραφή διεύθυνσης (διευθύνσεων)"
 
-#: src/addressbook.c:846
+#: src/addressbook.c:833
 msgid "Really delete the address(es)?"
 msgstr "Σίγουρα να διαγράψω την (τις) διεύθυνση (διευθύνσεις);"
 
-#: src/addressbook.c:1675
+#: src/addressbook.c:1669
 #, fuzzy, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1035,38 +1036,38 @@ msgstr ""
 "Αν διαγράφετε τον κατάλογο μόνο, οι διευθύνσεις θα μετακινηθούν στον από "
 "πάνω κατάλογο"
 
-#: src/addressbook.c:1678 src/folderview.c:2372
+#: src/addressbook.c:1672 src/folderview.c:2372
 msgid "Delete folder"
 msgstr "Διαγραφή καταλόγου"
 
-#: src/addressbook.c:1678
+#: src/addressbook.c:1672
 #, fuzzy
 msgid "_Folder only"
 msgstr "Κατάλογος μόνο"
 
-#: src/addressbook.c:1678
+#: src/addressbook.c:1672
 #, fuzzy
 msgid "Folder and _addresses"
 msgstr "Κατάλογος και διευθύνσεις"
 
-#: src/addressbook.c:1683
+#: src/addressbook.c:1677
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Σίγουρα να διαγραφεί το `%s' ;"
 
-#: src/addressbook.c:2369 src/addressbook.c:2502
+#: src/addressbook.c:2363 src/addressbook.c:2496
 msgid "New user, could not save index file."
 msgstr "Νέος χρήστης, δεν μπόρεσα να σώσω το αρχείο δείκτη."
 
-#: src/addressbook.c:2373 src/addressbook.c:2506
+#: src/addressbook.c:2367 src/addressbook.c:2500
 msgid "New user, could not save address book files."
 msgstr "Νέος χρήστης, δεν μπόρεσα να σώσω τα αρχεία του βιβλίου διευθύνσεων."
 
-#: src/addressbook.c:2383 src/addressbook.c:2516
+#: src/addressbook.c:2377 src/addressbook.c:2510
 msgid "Old address book converted successfully."
 msgstr "Το παλιό βιβλίο διευθύνσεων μετατράπηκε επιτυχώς."
 
-#: src/addressbook.c:2388
+#: src/addressbook.c:2382
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1074,7 +1075,7 @@ msgstr ""
 "Το παλιό βιβλίο διευθύνσεων μετατράπηκε,\n"
 "δεν μπόρεσα να σώσω το νέο αρχείο δείκτη διευθύνσεων"
 
-#: src/addressbook.c:2401
+#: src/addressbook.c:2395
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1082,7 +1083,7 @@ msgstr ""
 "Δεν μπόρεσα να μετατρέψω το βιβλίο διευθύνσεων,\n"
 "αλλά δημιούργησα νέα άδεια αρχεία βιβλίου διευθύνσεων."
 
-#: src/addressbook.c:2407
+#: src/addressbook.c:2401
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1090,7 +1091,7 @@ msgstr ""
 "Δεν μπόρεσα να μετατρέψω το βιβλίο διευθύνσεων,\n"
 "δεν μπόρεσα να δημιουργήσω νέα αρχεία βιβλίου διευθύνσεων."
 
-#: src/addressbook.c:2412
+#: src/addressbook.c:2406
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1098,86 +1099,86 @@ msgstr ""
 "Δεν μπόρεσα να μετατρέψω το βιβλίο διευθύνσεων,\n"
 "και δεν μπόρεσα να δημιουργήσω νέα αρχεία βιβλίου διευθύνσεων."
 
-#: src/addressbook.c:2419
+#: src/addressbook.c:2413
 msgid "Addressbook conversion error"
 msgstr "Σφάλμα μετατροπής βιβλίου διευθύνσεων"
 
-#: src/addressbook.c:2423
+#: src/addressbook.c:2417
 msgid "Addressbook conversion"
 msgstr "Μετατροπή βιβλίου διευθύνσεων"
 
-#: src/addressbook.c:2458
+#: src/addressbook.c:2452
 msgid "Addressbook Error"
 msgstr "Σφάλμα βιβλίου διευθύνσεων"
 
-#: src/addressbook.c:2459 src/addressbook.c:2559
+#: src/addressbook.c:2453 src/addressbook.c:2553
 msgid "Could not read address index"
 msgstr "Δεν μπόρεσα να διαβάσω το δείκτη της διεύθυνσης"
 
-#: src/addressbook.c:2521
+#: src/addressbook.c:2515
 msgid "Old address book converted, could not save new address index file"
 msgstr ""
 
-#: src/addressbook.c:2535
+#: src/addressbook.c:2529
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr ""
 
-#: src/addressbook.c:2541
+#: src/addressbook.c:2535
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr ""
 
-#: src/addressbook.c:2547
+#: src/addressbook.c:2541
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr ""
 
-#: src/addressbook.c:2565
+#: src/addressbook.c:2559
 msgid "Addressbook Conversion Error"
 msgstr "Σφάλμα μετατροπής βιβλίου διευθύνσεων"
 
-#: src/addressbook.c:2571
+#: src/addressbook.c:2565
 msgid "Addressbook Conversion"
 msgstr "Μετατροπή βιβλίου διευθύνσεων"
 
-#: src/addressbook.c:3086 src/prefs_common_dialog.c:2033
+#: src/addressbook.c:3080 src/prefs_common_dialog.c:2033
 msgid "Interface"
 msgstr "Διεπαφή"
 
-#: src/addressbook.c:3102 src/importldif.c:514
+#: src/addressbook.c:3096 src/importldif.c:514
 msgid "Address Book"
 msgstr "Βιβλίο διευθύνσεων"
 
-#: src/addressbook.c:3118
+#: src/addressbook.c:3112
 msgid "Person"
 msgstr "Άτομο"
 
-#: src/addressbook.c:3134
+#: src/addressbook.c:3128
 msgid "EMail Address"
 msgstr "Διεύθυνση e-mail"
 
-#: src/addressbook.c:3150
+#: src/addressbook.c:3144
 msgid "Group"
 msgstr "ΝέαΟμάδα"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3166 src/folderview.c:367 src/prefs_account_dialog.c:1694
-#: src/query_search.c:370
+#: src/addressbook.c:3160 src/folderview.c:367 src/prefs_account_dialog.c:1694
+#: src/query_search.c:398
 msgid "Folder"
 msgstr "Κατάλογος"
 
-#: src/addressbook.c:3182
+#: src/addressbook.c:3176
 #, fuzzy
 msgid "vCard"
 msgstr "V-Card"
 
-#: src/addressbook.c:3198 src/addressbook.c:3214
+#: src/addressbook.c:3192 src/addressbook.c:3208
 #, fuzzy
 msgid "JPilot"
 msgstr "J-Pilot"
 
-#: src/addressbook.c:3230
+#: src/addressbook.c:3224
 msgid "LDAP Server"
 msgstr "Εξυπηρέτης LDAP"
 
@@ -1189,7 +1190,7 @@ msgstr "Κοινές διευθύνσεις"
 msgid "Personal address"
 msgstr "Προσωπικές διευθύνσεις"
 
-#: src/alertpanel.c:142 src/compose.c:5500 src/main.c:621
+#: src/alertpanel.c:142 src/compose.c:5517 src/main.c:621
 msgid "Notice"
 msgstr "Σημείωση"
 
@@ -1197,7 +1198,7 @@ msgstr "Σημείωση"
 msgid "Warning"
 msgstr "Προειδοποίηση"
 
-#: src/alertpanel.c:168 src/inc.c:587
+#: src/alertpanel.c:168 src/inc.c:586
 msgid "Error"
 msgstr "Σφάλμα"
 
@@ -1240,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:4761
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4762
 msgid "None"
 msgstr "Τέλος"
 
@@ -1527,7 +1528,7 @@ msgstr "/Απεικόνιση/Κωδικοσύνολο/Κινεζικό (ISO-202
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/Κυριλλικό (Windows-1251)"
 
-#: src/compose.c:646 src/mainwindow.c:759 src/messageview.c:267
+#: src/compose.c:646 src/mainwindow.c:759 src/messageview.c:268
 #, fuzzy
 msgid "/_Tools/_Address book"
 msgstr "/Εργαλεία/Κατάλογος διευθύνσεων"
@@ -1537,15 +1538,15 @@ msgstr "/Εργαλεία/Κατάλογος διευθύνσεων"
 msgid "/_Tools/_Template"
 msgstr "/Αρχείο/Διαγραφή"
 
-#: src/compose.c:649 src/mainwindow.c:783 src/messageview.c:283
+#: src/compose.c:649 src/mainwindow.c:783 src/messageview.c:284
 #, fuzzy
 msgid "/_Tools/Actio_ns"
 msgstr "/Εκτέλεση"
 
 #: src/compose.c:651 src/compose.c:655 src/compose.c:661 src/mainwindow.c:762
 #: src/mainwindow.c:776 src/mainwindow.c:781 src/mainwindow.c:784
-#: src/mainwindow.c:788 src/mainwindow.c:790 src/messageview.c:270
-#: src/messageview.c:282
+#: src/mainwindow.c:788 src/mainwindow.c:790 src/messageview.c:271
+#: src/messageview.c:283
 #, fuzzy
 msgid "/_Tools/---"
 msgstr "/Εργαλεία"
@@ -1575,80 +1576,80 @@ msgstr "/Εκτέλεση"
 msgid "/_Tools/_Set spell language"
 msgstr "/Αρχείο/Διαγραφή"
 
-#: src/compose.c:910
+#: src/compose.c:912
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: το αρχείο δεν υπάρχει\n"
 
-#: src/compose.c:1014 src/compose.c:1085
+#: src/compose.c:1016 src/compose.c:1087
 msgid "Can't get text part\n"
 msgstr "Δεν μπορώ να λάβω το τμήμα κειμένου\n"
 
-#: src/compose.c:1486
+#: src/compose.c:1488
 msgid "Quote mark format error."
 msgstr ""
 
-#: src/compose.c:1498
+#: src/compose.c:1500
 msgid "Message reply/forward format error."
 msgstr ""
 
-#: src/compose.c:1918
+#: src/compose.c:1935
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Το αρχείο %s δεν υπάρχει\n"
 
-#: src/compose.c:1922
+#: src/compose.c:1939
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Δεν μπορώ να βρω το μέγεθος του αρχείου %s\n"
 
-#: src/compose.c:1926
+#: src/compose.c:1943
 #, fuzzy, c-format
 msgid "File %s is empty."
 msgstr "Το αρχείο %s είναι άδειο\n"
 
-#: src/compose.c:1930
+#: src/compose.c:1947
 #, fuzzy, c-format
 msgid "Can't read %s."
 msgstr "δεν μπορώ να δημιουργήσω %s\n"
 
-#: src/compose.c:1963
+#: src/compose.c:1980
 #, c-format
 msgid "Message: %s"
 msgstr "Μήνυμα: %s"
 
-#: src/compose.c:2023 src/mimeview.c:565
+#: src/compose.c:2040 src/mimeview.c:565
 msgid "Can't get the part of multipart message."
 msgstr "Δεν μπορώ να λάβω το τμήμα του πολυτμηματικού μηνύματος"
 
-#: src/compose.c:2507 src/headerview.c:195 src/query_search.c:636
+#: src/compose.c:2524 src/headerview.c:195 src/query_search.c:666
 #: src/summaryview.c:2124
 msgid "(No Subject)"
 msgstr "(Χωρίς Θέμα)"
 
-#: src/compose.c:2510
+#: src/compose.c:2527
 #, fuzzy, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Σύνθεση μηνύματος%s"
 
-#: src/compose.c:2623
+#: src/compose.c:2642
 msgid "Recipient is not specified."
 msgstr "Ο παραλήπτης δεν έχει οριστεί."
 
-#: src/compose.c:2631
+#: src/compose.c:2650
 #, fuzzy
 msgid "Empty subject"
 msgstr "Θέμα"
 
-#: src/compose.c:2632
+#: src/compose.c:2651
 msgid "Subject is empty. Send it anyway?"
 msgstr ""
 
-#: src/compose.c:2691
+#: src/compose.c:2710
 msgid "can't get recipient list."
 msgstr "δεν μπορώ να πάρω την λίστα παραληπτών"
 
-#: src/compose.c:2711
+#: src/compose.c:2730
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1656,21 +1657,21 @@ msgstr ""
 "Ο λογαριασμός για αποστολή μηνύματος δεν έχει οριστεί.\n"
 "Παρακαλώ επιλέξτε ένα λογαριασμό πριν στείλετε."
 
-#: src/compose.c:2725 src/send_message.c:299
+#: src/compose.c:2744 src/send_message.c:299
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Συνέβη σφάλμα κατά την αποστολή του μηνύματος σε %s ."
 
-#: src/compose.c:2767
+#: src/compose.c:2786
 msgid "Can't save the message to outbox."
 msgstr "Δεν μπορώ να αποθηκεύσω το μήνυμα στα εξερχόμενα."
 
-#: src/compose.c:2805
+#: src/compose.c:2824
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr ""
 
-#: src/compose.c:2902
+#: src/compose.c:2921
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1678,12 +1679,12 @@ msgid ""
 "Send it as %s anyway?"
 msgstr "Δεν μπορώ να αλλάξω το κωδικοσύνολο του μηνύματος."
 
-#: src/compose.c:2908
+#: src/compose.c:2927
 #, fuzzy
 msgid "Code conversion error"
 msgstr "Σφάλμα μετατροπής βιβλίου διευθύνσεων"
 
-#: src/compose.c:2981
+#: src/compose.c:3000
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1692,166 +1693,166 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:2985
+#: src/compose.c:3004
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3275
+#: src/compose.c:3294
 msgid "can't remove the old message\n"
 msgstr "δεν μπορώ να αφαιρέσω το παλιό μήνυμα\n"
 
-#: src/compose.c:3293
+#: src/compose.c:3312
 msgid "queueing message...\n"
 msgstr "βάζω το μήνυμα στην ουρά...\n"
 
-#: src/compose.c:3375
+#: src/compose.c:3394
 #, fuzzy
 msgid "can't find queue folder\n"
 msgstr "δεν μπορώ να επιλέξω τον κατάλογο: %s\n"
 
-#: src/compose.c:3382
+#: src/compose.c:3401
 msgid "can't queue the message\n"
 msgstr "δεν μπορώ να βάλω το μήνυμα στην ουρά\n"
 
-#: src/compose.c:3975
+#: src/compose.c:3994
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "generated Message-ID: %s\n"
 
-#: src/compose.c:4088
+#: src/compose.c:4107
 msgid "Creating compose window...\n"
 msgstr "Δημιουργώ το παράθυρο σύνθεσης...\n"
 
-#: src/compose.c:4139 src/headerview.c:54
+#: src/compose.c:4158 src/headerview.c:54
 msgid "From:"
 msgstr "Από:"
 
-#: src/compose.c:4213
+#: src/compose.c:4232
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/Εκτέλεση"
 
-#: src/compose.c:4216
+#: src/compose.c:4235
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/Μήνυμα/Κρυπτογράφηση"
 
-#: src/compose.c:4254 src/compose.c:5332
+#: src/compose.c:4273 src/compose.c:5351
 msgid "MIME type"
 msgstr "τύπος MIME"
 
 #. S_COL_DATE
-#: src/compose.c:4263 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4908
+#: src/compose.c:4282 src/mimeview.c:197 src/prefs_filter_edit.c:496
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4909
 msgid "Size"
 msgstr "Μέγεθος"
 
-#: src/compose.c:4698 src/mainwindow.c:2359 src/prefs_account_dialog.c:528
+#: src/compose.c:4717 src/mainwindow.c:2359 src/prefs_account_dialog.c:528
 #: src/prefs_common_dialog.c:661
 msgid "Send"
 msgstr "Αποστολή"
 
-#: src/compose.c:4699
+#: src/compose.c:4718
 msgid "Send message"
 msgstr "Αποστολή μηνύματος"
 
-#: src/compose.c:4707
+#: src/compose.c:4726
 msgid "Send later"
 msgstr ""
 "Αποστολή\n"
 "αργότερα"
 
-#: src/compose.c:4708
+#: src/compose.c:4727
 msgid "Put into queue folder and send later"
 msgstr "Τοποθέτηση στον κατάλογο ουράς και αποστολή αργότερα"
 
-#: src/compose.c:4716
+#: src/compose.c:4735
 msgid "Draft"
 msgstr "Πρόχειρα"
 
-#: src/compose.c:4717
+#: src/compose.c:4736
 msgid "Save to draft folder"
 msgstr "Αποθήκευση στον κατάλογο προχείρων"
 
-#: src/compose.c:4727
+#: src/compose.c:4746
 msgid "Insert"
 msgstr "Εισαγωγή"
 
-#: src/compose.c:4728
+#: src/compose.c:4747
 msgid "Insert file"
 msgstr "Εισαγωγή αρχείου"
 
-#: src/compose.c:4736
+#: src/compose.c:4755
 msgid "Attach"
 msgstr "Προσάρτηση"
 
-#: src/compose.c:4737
+#: src/compose.c:4756
 msgid "Attach file"
 msgstr "Προσάρτηση αρχείου"
 
 #. signature
-#: src/compose.c:4747 src/prefs_account_dialog.c:1208
+#: src/compose.c:4766 src/prefs_account_dialog.c:1208
 #: src/prefs_common_dialog.c:953
 msgid "Signature"
 msgstr "Yπογραφή"
 
-#: src/compose.c:4748
+#: src/compose.c:4767
 #, fuzzy
 msgid "Append signature"
 msgstr "Λάθος υπογραφή"
 
 #. editor
-#: src/compose.c:4757 src/prefs_common_dialog.c:991
+#: src/compose.c:4776 src/prefs_common_dialog.c:991
 #: src/prefs_common_dialog.c:2315
 msgid "Editor"
 msgstr "Συνθέτης"
 
-#: src/compose.c:4758
+#: src/compose.c:4777
 msgid "Edit with external editor"
 msgstr "Επεξεργασία με εξωτερικό πρόγραμμα"
 
-#: src/compose.c:4766
+#: src/compose.c:4785
 msgid "Linewrap"
 msgstr ""
 "Τύλιξη\n"
 "γραμμής"
 
-#: src/compose.c:4767
+#: src/compose.c:4786
 #, fuzzy
 msgid "Wrap all long lines"
 msgstr "Αναδίπλωση γραμμών"
 
-#: src/compose.c:5228
+#: src/compose.c:5247
 msgid "Invalid MIME type."
 msgstr "Μη έγκυρος τύπος MIME"
 
-#: src/compose.c:5246
+#: src/compose.c:5265
 msgid "File doesn't exist or is empty."
 msgstr "Το αρχείο δεν υπάρχει, ή είναι άδειο."
 
-#: src/compose.c:5314
+#: src/compose.c:5333
 #, fuzzy
 msgid "Properties"
 msgstr "Ιδιότητες"
 
-#: src/compose.c:5334 src/prefs_common_dialog.c:1444
+#: src/compose.c:5353 src/prefs_common_dialog.c:1444
 msgid "Encoding"
 msgstr "Κωδικοποίηση"
 
-#: src/compose.c:5357 src/prefs_folder_item.c:202
+#: src/compose.c:5376 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Διάδρομος"
 
-#: src/compose.c:5358
+#: src/compose.c:5377
 msgid "File name"
 msgstr "Όνομα αρχείου"
 
-#: src/compose.c:5449
+#: src/compose.c:5466
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Η εντολή για το εξωτερικό πρόγραμμα δεν είναι έγκυρη: `%s'\n"
 
-#: src/compose.c:5497
+#: src/compose.c:5514
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1861,49 +1862,49 @@ msgstr ""
 "Να επιβάλλω τερματισμό της διεργασίας;\n"
 "process group id:  %d"
 
-#: src/compose.c:5872 src/compose.c:5877 src/compose.c:5883
+#: src/compose.c:5889 src/compose.c:5894 src/compose.c:5900
 msgid "Can't queue the message."
 msgstr "Δεν μπορώ να βάλω στην ουρά το μήνυμα."
 
-#: src/compose.c:5974
+#: src/compose.c:5991
 #, fuzzy
 msgid "Select files"
 msgstr "Επιλογή αρχείου"
 
-#: src/compose.c:5997
+#: src/compose.c:6014
 msgid "Select file"
 msgstr "Επιλογή αρχείου"
 
-#: src/compose.c:6032
+#: src/compose.c:6049
 #, fuzzy
 msgid "Save message"
 msgstr "Αποστολή μηνύματος"
 
-#: src/compose.c:6033
+#: src/compose.c:6050
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Αυτό το μήνυμα έχει τροποποιηθεί, να απορριφθεί;"
 
-#: src/compose.c:6035
+#: src/compose.c:6052
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:6077
+#: src/compose.c:6094
 #, fuzzy, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Θέλετε πράγματι να διαγραφεί αυτή η κεφαλίδα;"
 
-#: src/compose.c:6079
+#: src/compose.c:6096
 #, fuzzy
 msgid "Apply template"
 msgstr "Διαγραφή μηνύματος"
 
-#: src/compose.c:6080
+#: src/compose.c:6097
 #, fuzzy
 msgid "_Replace"
 msgstr "Απάντηση"
 
-#: src/compose.c:6080
+#: src/compose.c:6097
 #, fuzzy
 msgid "_Insert"
 msgstr "Εισαγωγή"
@@ -2026,54 +2027,54 @@ msgstr "Πρέπει να δοθεί ένα όνομα ομάδας."
 msgid "Edit Group Data"
 msgstr "Επεξεργασία στοιχείων ομάδας"
 
-#: src/editgroup.c:300
+#: src/editgroup.c:299
 msgid "Group Name"
 msgstr "Όνομα ομάδας"
 
-#: src/editgroup.c:319
+#: src/editgroup.c:318
 msgid "Addresses in Group"
 msgstr "Διευθύνσεις στην ομάδα"
 
-#: src/editgroup.c:321
+#: src/editgroup.c:320
 msgid " -> "
 msgstr ""
 
-#: src/editgroup.c:348
+#: src/editgroup.c:347
 msgid " <- "
 msgstr ""
 
-#: src/editgroup.c:350
+#: src/editgroup.c:349
 msgid "Available Addresses"
 msgstr "Διαθέσιμες διευθύνσεις"
 
-#: src/editgroup.c:416
+#: src/editgroup.c:415
 msgid "Move E-Mail Addresses to or from Group with arrow buttons"
 msgstr ""
 "Μετακίνηση των διευθύνσεων E-Mail προς ή από ομάδες με τα κουμπιά με τα "
 "βελάκια"
 
-#: src/editgroup.c:468
+#: src/editgroup.c:467
 msgid "Edit Group Details"
 msgstr "Επεξεργασία λεπτομερειών ομάδας"
 
-#: src/editgroup.c:471
+#: src/editgroup.c:470
 msgid "Add New Group"
 msgstr "Προσθήκη Νέας Ομάδας"
 
-#: src/editgroup.c:522
+#: src/editgroup.c:521
 msgid "Edit folder"
 msgstr "Επεξεργασία καταλόγου"
 
-#: src/editgroup.c:522
+#: src/editgroup.c:521
 msgid "Input the new name of folder:"
 msgstr "Εισάγετε το νέο όνομα του καταλόγου:"
 
-#: src/editgroup.c:525 src/foldersel.c:541 src/folderview.c:2121
+#: src/editgroup.c:524 src/foldersel.c:541 src/folderview.c:2121
 #: src/folderview.c:2127
 msgid "New folder"
 msgstr "Νέος κατάλογος"
 
-#: src/editgroup.c:526 src/foldersel.c:542 src/folderview.c:2128
+#: src/editgroup.c:525 src/foldersel.c:542 src/folderview.c:2128
 msgid "Input the name of new folder:"
 msgstr "Εισάγετε το όνομα του νέου καταλόγου:"
 
@@ -2278,7 +2279,7 @@ msgid "`%c' can't be included in folder name."
 msgstr "το `%c' δεν μπορεί να συμπεριλαμβάνεται σε όνομα καταλόγου."
 
 #: src/foldersel.c:561 src/folderview.c:2147 src/folderview.c:2206
-#: src/query_search.c:995
+#: src/query_search.c:1031
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Ο κατάλογος `%s' υπάρχει ήδη."
@@ -2548,7 +2549,7 @@ msgstr "Θέμα:"
 msgid "Creating header view...\n"
 msgstr "Δημιουργώ την απεικόνιση κεφαλίδας...\n"
 
-#: src/headerview.c:180 src/query_search.c:637 src/summaryview.c:2127
+#: src/headerview.c:180 src/query_search.c:667 src/summaryview.c:2127
 msgid "(No From)"
 msgstr "(Χωρίς αποστολέα)"
 
@@ -2690,196 +2691,196 @@ msgstr ""
 msgid "Sylpheed: %d new messages"
 msgstr "\t%d νέο(α) μήνυμα(μηνύματα)\n"
 
-#: src/inc.c:372
+#: src/inc.c:371
 msgid "Retrieving new messages"
 msgstr "Λαμβάνω τα νέα μηνύματα"
 
-#: src/inc.c:415
+#: src/inc.c:414
 msgid "Standby"
 msgstr "Περιμένω"
 
-#: src/inc.c:544 src/inc.c:593
+#: src/inc.c:543 src/inc.c:592
 msgid "Cancelled"
 msgstr "Ακυρώθηκε"
 
-#: src/inc.c:555
+#: src/inc.c:554
 msgid "Retrieving"
 msgstr "Λαμβάνω"
 
-#: src/inc.c:564
+#: src/inc.c:563
 #, fuzzy, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "Διαγραφή μηνυμάτων από τον εξυπηρέτη όταν παραληφθούν"
 
-#: src/inc.c:568
+#: src/inc.c:567
 #, fuzzy
 msgid "Done (no new messages)"
 msgstr "Δεν υπάρχουν αδιάβαστα μηνύματα"
 
-#: src/inc.c:574
+#: src/inc.c:573
 msgid "Connection failed"
 msgstr "Η σύνδεση απέτυχε"
 
-#: src/inc.c:577
+#: src/inc.c:576
 msgid "Auth failed"
 msgstr "H πιστοποίηση απέτυχε"
 
-#: src/inc.c:580
+#: src/inc.c:579
 msgid "Locked"
 msgstr ""
 
-#: src/inc.c:590
+#: src/inc.c:589
 msgid "Timeout"
 msgstr ""
 
-#: src/inc.c:640
+#: src/inc.c:639
 #, fuzzy, c-format
 msgid "Finished (%d new message(s))"
 msgstr "\t%d νέο(α) μήνυμα(μηνύματα)\n"
 
-#: src/inc.c:643
+#: src/inc.c:642
 #, fuzzy
 msgid "Finished (no new messages)"
 msgstr "Δεν υπάρχουν αδιάβαστα μηνύματα"
 
-#: src/inc.c:652
+#: src/inc.c:651
 #, fuzzy
 msgid "Some errors occurred while getting mail."
 msgstr "συνέβη σφάλμα καθώς λάμβανα την αλληλογραφία."
 
-#: src/inc.c:688
+#: src/inc.c:687
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "λαμβάνω νέα μηνύματα του λογαριασμού %s...\n"
 
-#: src/inc.c:691
+#: src/inc.c:690
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Λαμβάνω τα νέα μηνύματα"
 
-#: src/inc.c:710
+#: src/inc.c:709
 #, fuzzy, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Συνδέομαι στον POP3 server: %s ..."
 
-#: src/inc.c:719
+#: src/inc.c:718
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Δεν μπορώ να συνδεθώ στον POP3 server: %s:%d\n"
 
-#: src/inc.c:798 src/send_message.c:631
+#: src/inc.c:797 src/send_message.c:631
 msgid "Authenticating..."
 msgstr "Πιστοποίηση"
 
-#: src/inc.c:799
+#: src/inc.c:798
 #, fuzzy, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Λαμβάνω τα μηνύματα από το %s στο %s...\n"
 
-#: src/inc.c:804
+#: src/inc.c:803
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Λαμβάνω τον αριθμό των νέων μηνυμάτων (STAT)..."
 
-#: src/inc.c:808
+#: src/inc.c:807
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Λαμβάνω τον αριθμό των νέων μηνυμάτων (LAST)..."
 
-#: src/inc.c:812
+#: src/inc.c:811
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Λαμβάνω τον αριθμό των νέων μηνυμάτων (UIDL)..."
 
-#: src/inc.c:816
+#: src/inc.c:815
 msgid "Getting the size of messages (LIST)..."
 msgstr "Λαμβάνω το μέγεθος των μηνυμάτων (LIST)..."
 
-#: src/inc.c:826
+#: src/inc.c:825
 #, fuzzy, c-format
 msgid "Deleting message %d"
 msgstr "Διαγράφω το μήνυμα"
 
-#: src/inc.c:833 src/send_message.c:649
+#: src/inc.c:832 src/send_message.c:649
 msgid "Quitting"
 msgstr "Κλείνω τη σύνδεση"
 
-#: src/inc.c:858
+#: src/inc.c:857
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Λαμβάνω το μήνυμα (%d / %d) (%s / %s)"
 
-#: src/inc.c:879
+#: src/inc.c:878
 #, fuzzy, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Διαγραφή μηνυμάτων από τον εξυπηρέτη όταν παραληφθούν"
 
-#: src/inc.c:1107
+#: src/inc.c:1106
 #, fuzzy
 msgid "Connection failed."
 msgstr "Η σύνδεση απέτυχε"
 
-#: src/inc.c:1113
+#: src/inc.c:1112
 msgid "Error occurred while processing mail."
 msgstr "Ένα σφάλμα συνέβη καθώς επεξεργάζομαι το mail."
 
-#: src/inc.c:1118
+#: src/inc.c:1117
 #, fuzzy, c-format
 msgid ""
 "Error occurred while processing mail:\n"
 "%s"
 msgstr "Ένα σφάλμα συνέβη καθώς επεξεργάζομαι το mail."
 
-#: src/inc.c:1124
+#: src/inc.c:1123
 msgid "No disk space left."
 msgstr "Δεν υπάρχει άλλος χώρος στο δίσκο."
 
-#: src/inc.c:1129
+#: src/inc.c:1128
 #, fuzzy
 msgid "Can't write file."
 msgstr "Δεν μπορώ να γράψω σε αρχείο.\n"
 
-#: src/inc.c:1134
+#: src/inc.c:1133
 #, fuzzy
 msgid "Socket error."
 msgstr "σφάλμα πρωτοκόλλου\n"
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1140 src/send_message.c:584 src/send_message.c:772
+#: src/inc.c:1139 src/send_message.c:584 src/send_message.c:772
 msgid "Connection closed by the remote host."
 msgstr ""
 
-#: src/inc.c:1146
+#: src/inc.c:1145
 #, fuzzy
 msgid "Mailbox is locked."
 msgstr "Ρυθμίσεις Mailbox"
 
-#: src/inc.c:1150
+#: src/inc.c:1149
 #, fuzzy, c-format
 msgid ""
 "Mailbox is locked:\n"
 "%s"
 msgstr "Ρυθμίσεις Mailbox"
 
-#: src/inc.c:1156 src/send_message.c:757
+#: src/inc.c:1155 src/send_message.c:757
 #, fuzzy
 msgid "Authentication failed."
 msgstr "Πιστοποίηση"
 
-#: src/inc.c:1161 src/send_message.c:760
+#: src/inc.c:1160 src/send_message.c:760
 #, fuzzy, c-format
 msgid ""
 "Authentication failed:\n"
 "%s"
 msgstr "Πιστοποίηση"
 
-#: src/inc.c:1166 src/send_message.c:776
+#: src/inc.c:1165 src/send_message.c:776
 msgid "Session timed out."
 msgstr ""
 
-#: src/inc.c:1202
+#: src/inc.c:1201
 #, fuzzy
 msgid "Incorporation cancelled\n"
 msgstr "Λήψη νέου mail"
 
-#: src/inc.c:1285
+#: src/inc.c:1284
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Λαμβάνω νέα μηνύματα από το %s στο %s...\n"
@@ -3410,7 +3411,8 @@ msgid "/_View/Mess_age source"
 msgstr "/Απεικόνιση/Εμφάνιση του πηγαίου"
 
 #: src/mainwindow.c:708 src/messageview.c:245
-msgid "/_View/Show all _header"
+#, fuzzy
+msgid "/_View/Show all _headers"
 msgstr "/Απεικόνιση/Εμφάνιση της πλήρους κεφαλίδας"
 
 #: src/mainwindow.c:710
@@ -3418,7 +3420,7 @@ msgstr "/Απεικόνιση/Εμφάνιση της πλήρους κεφαλ�
 msgid "/_View/_Update summary"
 msgstr "/Απεικόνιση/Κωδικοσύνολο"
 
-#: src/mainwindow.c:712 src/messageview.c:247
+#: src/mainwindow.c:712 src/messageview.c:248
 msgid "/_Message"
 msgstr "/Μήνυμα"
 
@@ -3454,16 +3456,16 @@ msgstr "/Μήνυμα/Αποστολή μηνυμάτων από την ουρά
 
 #: src/mainwindow.c:722 src/mainwindow.c:724 src/mainwindow.c:731
 #: src/mainwindow.c:736 src/mainwindow.c:739 src/mainwindow.c:750
-#: src/mainwindow.c:752 src/mainwindow.c:755 src/messageview.c:250
-#: src/messageview.c:258 src/messageview.c:263
+#: src/mainwindow.c:752 src/mainwindow.c:755 src/messageview.c:251
+#: src/messageview.c:259 src/messageview.c:264
 msgid "/_Message/---"
 msgstr "/Μήνυμα/---"
 
-#: src/mainwindow.c:723 src/messageview.c:248
+#: src/mainwindow.c:723 src/messageview.c:249
 msgid "/_Message/Compose _new message"
 msgstr "/Μήνυμα/Σύνθεση νέου μηνύματος"
 
-#: src/mainwindow.c:725 src/messageview.c:251
+#: src/mainwindow.c:725 src/messageview.c:252
 msgid "/_Message/_Reply"
 msgstr "/Μήνυμα/Απάντηση"
 
@@ -3472,31 +3474,31 @@ msgstr "/Μήνυμα/Απάντηση"
 msgid "/_Message/Repl_y to"
 msgstr "/Μήνυμα/Απάντηση σε"
 
-#: src/mainwindow.c:727 src/messageview.c:252
+#: src/mainwindow.c:727 src/messageview.c:253
 #, fuzzy
 msgid "/_Message/Repl_y to/_all"
 msgstr "/Μήνυμα/Απάντηση σε όλους"
 
-#: src/mainwindow.c:728 src/messageview.c:254
+#: src/mainwindow.c:728 src/messageview.c:255
 #, fuzzy
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/Μήνυμα/Απάντηση στον αποστολέα"
 
-#: src/mainwindow.c:729 src/messageview.c:256
+#: src/mainwindow.c:729 src/messageview.c:257
 #, fuzzy
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/Μήνυμα/Απάντηση σε όλους"
 
-#: src/mainwindow.c:732 src/messageview.c:259
+#: src/mainwindow.c:732 src/messageview.c:260
 msgid "/_Message/_Forward"
 msgstr "/Μήνυμα/Προώθηση"
 
-#: src/mainwindow.c:733 src/messageview.c:260
+#: src/mainwindow.c:733 src/messageview.c:261
 #, fuzzy
 msgid "/_Message/For_ward as attachment"
 msgstr "/Μήνυμα/Προώθηση σαν προσάρτηση"
 
-#: src/mainwindow.c:735 src/messageview.c:262
+#: src/mainwindow.c:735 src/messageview.c:263
 #, fuzzy
 msgid "/_Message/Redirec_t"
 msgstr "/Μήνυμα/Επαν-επεξεργασία"
@@ -3556,7 +3558,7 @@ msgstr "/Μήνυμα/Λήψη νέων μηνυμάτων"
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/Μήνυμα/Λήψη νέων μηνυμάτων"
 
-#: src/mainwindow.c:756 src/messageview.c:264
+#: src/mainwindow.c:756 src/messageview.c:265
 msgid "/_Message/Re-_edit"
 msgstr "/Μήνυμα/Επαν-επεξεργασία"
 
@@ -3575,27 +3577,27 @@ msgstr "/Περίληψη/Φιλτράρισμα μηνυμάτων"
 msgid "/_Tools/Filter _selected messages"
 msgstr "/Περίληψη/Φιλτράρισμα μηνυμάτων"
 
-#: src/mainwindow.c:767 src/messageview.c:271
+#: src/mainwindow.c:767 src/messageview.c:272
 #, fuzzy
 msgid "/_Tools/_Create filter rule"
 msgstr "/Περίληψη/Φιλτράρισμα μηνυμάτων"
 
-#: src/mainwindow.c:768 src/messageview.c:273
+#: src/mainwindow.c:768 src/messageview.c:274
 #, fuzzy
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/Περίληψη/Φιλτράρισμα μηνυμάτων"
 
-#: src/mainwindow.c:770 src/messageview.c:275
+#: src/mainwindow.c:770 src/messageview.c:276
 #, fuzzy
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/Περίληψη/Φιλτράρισμα μηνυμάτων"
 
-#: src/mainwindow.c:772 src/messageview.c:277
+#: src/mainwindow.c:772 src/messageview.c:278
 #, fuzzy
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/Περίληψη/Φιλτράρισμα μηνυμάτων"
 
-#: src/mainwindow.c:774 src/messageview.c:279
+#: src/mainwindow.c:774 src/messageview.c:280
 #, fuzzy
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/Περίληψη/Φιλτράρισμα μηνυμάτων"
@@ -3728,7 +3730,7 @@ msgid "MainWindow: color allocation %d failed\n"
 msgstr "MainWindow: η κατανομή χρωμάτων %d απέτυχε\n"
 
 #: src/mainwindow.c:1139 src/summaryview.c:2275 src/summaryview.c:2360
-#: src/summaryview.c:3907 src/summaryview.c:4036 src/summaryview.c:4394
+#: src/summaryview.c:3908 src/summaryview.c:4037 src/summaryview.c:4395
 msgid "done.\n"
 msgstr "έγινε.\n"
 
@@ -4001,7 +4003,7 @@ msgid "Find text:"
 msgstr ""
 
 #: src/message_search.c:153 src/prefs_search_folder.c:253
-#: src/query_search.c:326
+#: src/query_search.c:343
 msgid "Case sensitive"
 msgstr "Διαχωρισμός πεζών/κεφαλαίων"
 
@@ -4027,29 +4029,29 @@ msgstr "Έφτασα το τέλος της λίστας. Να συνεχίσω
 msgid "Search finished"
 msgstr "Η αναζήτηση τελείωσε"
 
-#: src/messageview.c:268
+#: src/messageview.c:269
 #, fuzzy
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/Προσθήκη αποστολέα στον κατάλογο διευθύνσεων"
 
-#: src/messageview.c:300
+#: src/messageview.c:301
 msgid "Creating message view...\n"
 msgstr "Δημιουργώ απεικόνιση μηνύματος...\n"
 
-#: src/messageview.c:325
+#: src/messageview.c:326
 msgid "Text"
 msgstr "Κείμενο"
 
-#: src/messageview.c:330
+#: src/messageview.c:331
 #, fuzzy
 msgid "Attachments"
 msgstr "Προσάρτηση"
 
-#: src/messageview.c:380
+#: src/messageview.c:381
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:699 src/summaryview.c:3436
+#: src/messageview.c:700 src/summaryview.c:3436
 #, fuzzy, c-format
 msgid "Can't save the file `%s'."
 msgstr "Δεν μπορώ να διαγράψω τον κατάλογο `%s'."
@@ -4067,7 +4069,7 @@ msgstr "Εκτέλεση"
 msgid "Print"
 msgstr "Εκτύπωση"
 
-#: src/messageview.c:770 src/summaryview.c:3471
+#: src/messageview.c:769 src/summaryview.c:3470
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -4167,11 +4169,11 @@ msgstr ""
 "Εισάγετε την γραμμή εντολής για το άνοιγμα του αρχείου:\n"
 "(Το `%s' θα αντικατασταθεί με το όνομα αρχείου)"
 
-#: src/mimeview.c:1147
+#: src/mimeview.c:1140
 msgid "Opening executable file"
 msgstr ""
 
-#: src/mimeview.c:1148
+#: src/mimeview.c:1141
 msgid ""
 "This is an executable file. Opening executable file is restricted for "
 "security.\n"
@@ -4179,11 +4181,6 @@ msgid ""
 "virus or something like a malicious program."
 msgstr ""
 
-#: src/mimeview.c:1184
-#, c-format
-msgid "MIME viewer command line is invalid: `%s'"
-msgstr "Η γραμμή εντολής για απεικόνιση MIME είναι μη έγκυρη: `%s'"
-
 #: src/passphrase.c:96
 msgid "Passphrase"
 msgstr "Κωδική φράση"
@@ -5994,21 +5991,21 @@ msgstr "Απάντηση σε"
 msgid "%s - Edit search condition"
 msgstr ""
 
-#: src/prefs_search_folder.c:209 src/query_search.c:257
+#: src/prefs_search_folder.c:209 src/query_search.c:274
 msgid "Match any of the following"
 msgstr ""
 
-#: src/prefs_search_folder.c:211 src/query_search.c:259
+#: src/prefs_search_folder.c:211 src/query_search.c:276
 #, fuzzy
 msgid "Match all of the following"
 msgstr "Αυτόματος ορισμός αυτών των διευθύνσεων"
 
-#: src/prefs_search_folder.c:231 src/query_search.c:303
+#: src/prefs_search_folder.c:231 src/query_search.c:320
 #, fuzzy
 msgid "Folder:"
 msgstr "Κατάλογος"
 
-#: src/prefs_search_folder.c:248 src/query_search.c:321
+#: src/prefs_search_folder.c:248 src/query_search.c:338
 #, fuzzy
 msgid "Search subfolders"
 msgstr "Επιλογή καταλόγου"
@@ -6024,17 +6021,17 @@ msgid "Attachment"
 msgstr "Προσάρτηση"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73 src/query_search.c:371 src/summaryview.c:4901
+#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4902
 msgid "Subject"
 msgstr "Θέμα"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/query_search.c:372 src/summaryview.c:4904
+#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4905
 msgid "From"
 msgstr "Από"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/query_search.c:373 src/summaryview.c:4906
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:4907
 msgid "Date"
 msgstr "Ημερομηνία"
 
@@ -6135,45 +6132,45 @@ msgstr "Δημιουργώ διάλογο προόδου...\n"
 msgid "Status"
 msgstr "Κατάσταση"
 
-#: src/query_search.c:234
+#: src/query_search.c:251
 #, fuzzy
 msgid "Search messages"
 msgstr "\tΑναζήτηση στα απροσπέλαστα μηνύματα... "
 
-#: src/query_search.c:395
+#: src/query_search.c:423
 #, fuzzy
 msgid "_Save as search folder"
 msgstr "Επιλογή καταλόγου"
 
-#: src/query_search.c:512 src/subscribedialog.c:526 src/summaryview.c:842
+#: src/query_search.c:542 src/subscribedialog.c:526 src/summaryview.c:842
 msgid "Done."
 msgstr "Τέλος"
 
-#: src/query_search.c:536
+#: src/query_search.c:566
 #, fuzzy, c-format
 msgid "Searching %s ..."
 msgstr "Σάρωση καταλόγου %s ..."
 
-#: src/query_search.c:564
+#: src/query_search.c:594
 #, fuzzy, c-format
 msgid "Searching %s (%d / %d)..."
 msgstr "Φιλτράρω..."
 
-#: src/query_search.c:645 src/summaryview.c:2051
+#: src/query_search.c:675 src/summaryview.c:2051
 msgid "(No Date)"
 msgstr "(Χωρίς ημερομηνία)"
 
-#: src/query_search.c:833
+#: src/query_search.c:869
 #, fuzzy
 msgid "Save as search folder"
 msgstr "Επιλογή καταλόγου"
 
-#: src/query_search.c:854
+#: src/query_search.c:890
 #, fuzzy
 msgid "Location:"
 msgstr "Παράθεση"
 
-#: src/query_search.c:869
+#: src/query_search.c:905
 #, fuzzy
 msgid "Folder name:"
 msgstr "Όνομα αρχείου"
@@ -6829,38 +6826,38 @@ msgstr "Το μήνυμα %d έχει οριστεί να αντιγραφεί �
 msgid "Destination for copy is same as current folder."
 msgstr "Ο προορισμός αντιγραφής είναι ίδιος με τον τρέχοντα κατάλογο."
 
-#: src/summaryview.c:3506
+#: src/summaryview.c:3507
 #, fuzzy
 msgid "Error occurred while processing messages."
 msgstr "Ένα σφάλμα συνέβη καθώς επεξεργάζομαι το mail."
 
-#: src/summaryview.c:3814 src/summaryview.c:3815
+#: src/summaryview.c:3815 src/summaryview.c:3816
 msgid "Building threads..."
 msgstr "Δημιουργώ τα νήματα..."
 
-#: src/summaryview.c:3965 src/summaryview.c:3966
+#: src/summaryview.c:3966 src/summaryview.c:3967
 msgid "Unthreading..."
 msgstr ""
 
-#: src/summaryview.c:4259 src/summaryview.c:4315
+#: src/summaryview.c:4260 src/summaryview.c:4316
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Φιλτράρω..."
 
-#: src/summaryview.c:4364
+#: src/summaryview.c:4365
 msgid "filtering..."
 msgstr "φιλτράρω..."
 
-#: src/summaryview.c:4365
+#: src/summaryview.c:4366
 msgid "Filtering..."
 msgstr "Φιλτράρω..."
 
-#: src/summaryview.c:4401
+#: src/summaryview.c:4402
 #, fuzzy, c-format
 msgid "%d message(s) have been filtered."
 msgstr "το μήνυμα %d είναι ήδη στη μνήμη.\n"
 
-#: src/summaryview.c:4910
+#: src/summaryview.c:4911
 msgid "No."
 msgstr "Αρ."
 
@@ -6948,6 +6945,9 @@ msgstr "Έξοδος"
 msgid "Sylpheed"
 msgstr ""
 
+#~ msgid "MIME viewer command line is invalid: `%s'"
+#~ msgstr "Η γραμμή εντολής για απεικόνιση MIME είναι μη έγκυρη: `%s'"
+
 #~ msgid "Wrap before sending"
 #~ msgstr "Τύλιξη πριν την αποστολή"
 
diff --git a/po/es.po b/po/es.po
index ec8e759c..48587348 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-03-02 19:03+0900\n"
+"POT-Creation-Date: 2006-03-10 16:06+0900\n"
 "PO-Revision-Date: 2006-02-02 07:38+0100\n"
 "Last-Translator: Ricardo Mones <mones@aic.uniovi.es>\n"
 "Language-Team: Ricardo Mones <mones@aic.uniovi.es>\n"
@@ -505,7 +505,7 @@ msgstr "Encontrado %s\n"
 msgid "Configuration is saved.\n"
 msgstr "Configuración guardada.\n"
 
-#: libsylph/prefs_common.c:491
+#: libsylph/prefs_common.c:496
 msgid "Junk mail filter"
 msgstr "Filtro de correo basura"
 
@@ -522,7 +522,7 @@ msgstr "no se puede abrir el fichero de marcas\n"
 msgid "can't fetch message %d\n"
 msgstr "no se puede obtener el mensaje %d\n"
 
-#: libsylph/procmsg.c:1375
+#: libsylph/procmsg.c:1378
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "La orden para imprimir es inválida: «%s»\n"
@@ -600,12 +600,12 @@ msgstr "  Asunto: %s\n"
 msgid "  Issuer: %s\n"
 msgstr "  Generador: %s\n"
 
-#: libsylph/utils.c:2411 src/compose.c:2869 src/compose.c:3132
-#: src/compose.c:3195 src/compose.c:3315
+#: libsylph/utils.c:2430 src/compose.c:2888 src/compose.c:3151
+#: src/compose.c:3214 src/compose.c:3334
 msgid "can't change file mode\n"
 msgstr "no se pueden cambiar los permisos de archivo\n"
 
-#: libsylph/utils.c:2418 libsylph/utils.c:2542
+#: libsylph/utils.c:2437 libsylph/utils.c:2561
 #, c-format
 msgid "writing to %s failed.\n"
 msgstr "fallo escribiendo en %s.\n"
@@ -688,8 +688,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:493
-#: src/compose.c:4273 src/editaddress.c:200 src/editaddress.c:942
+#: src/account_dialog.c:366 src/addressadd.c:192 src/addressbook.c:491
+#: src/compose.c:4292 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
@@ -825,12 +825,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:4777 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4796 src/editaddress.c:201
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "Dirección"
 
-#: src/addressadd.c:212 src/addressbook.c:495 src/editaddress.c:202
+#: src/addressadd.c:212 src/addressbook.c:493 src/editaddress.c:202
 #: src/editaddress.c:795 src/editaddress.c:860 src/editgroup.c:267
 msgid "Remarks"
 msgstr "Notas"
@@ -839,110 +839,111 @@ msgstr "Notas"
 msgid "Select Address Book Folder"
 msgstr "Seleccionar carpeta de la agenda"
 
-#: src/addressbook.c:338 src/compose.c:515 src/mainwindow.c:489
+#: src/addressbook.c:337 src/compose.c:515 src/mainwindow.c:489
 #: src/messageview.c:140
 msgid "/_File"
 msgstr "/_Fichero"
 
-#: src/addressbook.c:339
+#: src/addressbook.c:338
 msgid "/_File/New _Book"
 msgstr "/_Fichero/Nueva _agenda"
 
-#: src/addressbook.c:340
+#: src/addressbook.c:339
 msgid "/_File/New _vCard"
 msgstr "/_Fichero/Nueva _vCard"
 
-#: src/addressbook.c:342
+#: src/addressbook.c:341
 msgid "/_File/New _JPilot"
 msgstr "/_Fichero/Nuevo _JPilot"
 
-#: src/addressbook.c:345
-msgid "/_File/New _Server"
+#: src/addressbook.c:344
+#, fuzzy
+msgid "/_File/New _LDAP Server"
 msgstr "/_Fichero/Nuevo _servidor"
 
-#: src/addressbook.c:347 src/addressbook.c:350 src/compose.c:520
+#: src/addressbook.c:346 src/addressbook.c:349 src/compose.c:520
 #: src/compose.c:525 src/compose.c:528 src/compose.c:531 src/mainwindow.c:507
 #: src/mainwindow.c:510 src/mainwindow.c:512 src/mainwindow.c:515
 #: src/mainwindow.c:517 src/messageview.c:143
 msgid "/_File/---"
 msgstr "/_Fichero/---"
 
-#: src/addressbook.c:348
+#: src/addressbook.c:347
 msgid "/_File/_Edit"
 msgstr "/_Fichero/_Editar"
 
-#: src/addressbook.c:349
+#: src/addressbook.c:348
 msgid "/_File/_Delete"
 msgstr "/_Fichero/_Borrar"
 
-#: src/addressbook.c:351
+#: src/addressbook.c:350
 msgid "/_File/_Save"
 msgstr "/_Fichero/_Guardar"
 
-#: src/addressbook.c:352 src/compose.c:532 src/messageview.c:144
+#: src/addressbook.c:351 src/compose.c:532 src/messageview.c:144
 msgid "/_File/_Close"
 msgstr "/_Fichero/_Cerrar"
 
-#: src/addressbook.c:353
+#: src/addressbook.c:352
 msgid "/_Address"
 msgstr "/_Dirección"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:353
 msgid "/_Address/New _Address"
 msgstr "/_Dirección/Nueva _dirección"
 
-#: src/addressbook.c:355
+#: src/addressbook.c:354
 msgid "/_Address/New _Group"
 msgstr "/_Dirección/Nuevo _grupo"
 
-#: src/addressbook.c:356
+#: src/addressbook.c:355
 msgid "/_Address/New _Folder"
 msgstr "/_Dirección/Nueva _carpeta"
 
-#: src/addressbook.c:357
+#: src/addressbook.c:356
 msgid "/_Address/---"
 msgstr "/_Dirección/---"
 
-#: src/addressbook.c:358
+#: src/addressbook.c:357
 msgid "/_Address/_Edit"
 msgstr "/_Dirección/_Editar"
 
-#: src/addressbook.c:359
+#: src/addressbook.c:358
 msgid "/_Address/_Delete"
 msgstr "/_Dirección/_Borrar"
 
-#: src/addressbook.c:360 src/compose.c:645 src/mainwindow.c:758
-#: src/messageview.c:266
+#: src/addressbook.c:359 src/compose.c:645 src/mainwindow.c:758
+#: src/messageview.c:267
 msgid "/_Tools"
 msgstr "/_Herramientas"
 
-#: src/addressbook.c:361
+#: src/addressbook.c:360
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Herramientas/Importar fichero _LDIF"
 
-#: src/addressbook.c:362 src/compose.c:666 src/mainwindow.c:812
-#: src/messageview.c:286
+#: src/addressbook.c:361 src/compose.c:666 src/mainwindow.c:812
+#: src/messageview.c:287
 msgid "/_Help"
 msgstr "/_Ayuda"
 
-#: src/addressbook.c:363 src/compose.c:667 src/mainwindow.c:824
-#: src/messageview.c:287
+#: src/addressbook.c:362 src/compose.c:667 src/mainwindow.c:824
+#: src/messageview.c:288
 msgid "/_Help/_About"
 msgstr "/_Ayuda/_Acerca de"
 
-#: src/addressbook.c:382 src/addressbook.c:392
+#: src/addressbook.c:381 src/addressbook.c:391
 msgid "/New _Address"
 msgstr "/Nueva _dirección"
 
-#: src/addressbook.c:383 src/addressbook.c:393
+#: src/addressbook.c:382 src/addressbook.c:392
 msgid "/New _Group"
 msgstr "/Nuevo _grupo"
 
-#: src/addressbook.c:384 src/addressbook.c:394
+#: src/addressbook.c:383 src/addressbook.c:393
 msgid "/New _Folder"
 msgstr "/Nueva _carpeta"
 
-#: src/addressbook.c:385 src/addressbook.c:395 src/compose.c:509
+#: src/addressbook.c:384 src/addressbook.c:394 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
@@ -952,70 +953,70 @@ msgstr "/Nueva _carpeta"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:386 src/addressbook.c:396 src/compose.c:534
+#: src/addressbook.c:385 src/addressbook.c:395 src/compose.c:534
 #: src/mainwindow.c:521 src/messageview.c:146
 msgid "/_Edit"
 msgstr "/_Editar"
 
-#: src/addressbook.c:387 src/addressbook.c:397 src/summaryview.c:434
+#: src/addressbook.c:386 src/addressbook.c:396 src/summaryview.c:434
 msgid "/_Delete"
 msgstr "/_Borrar"
 
-#: src/addressbook.c:494
+#: src/addressbook.c:492
 msgid "E-Mail address"
 msgstr "Dirección e-mail"
 
-#: src/addressbook.c:498 src/compose.c:4778 src/prefs_common_dialog.c:2183
+#: src/addressbook.c:496 src/compose.c:4797 src/prefs_common_dialog.c:2183
 msgid "Address book"
 msgstr "Agenda de direcciones"
 
-#: src/addressbook.c:600 src/prefs_filter_edit.c:249
+#: src/addressbook.c:603 src/prefs_filter_edit.c:249
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "Nombre:"
 
 #. Buttons
-#: src/addressbook.c:632 src/addressbook.c:1684 src/editaddress.c:884
+#: src/addressbook.c:636 src/addressbook.c:1678 src/editaddress.c:884
 #: src/editaddress.c:1017 src/mainwindow.c:2426 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:635 src/editaddress.c:890 src/editaddress.c:1023
+#: src/addressbook.c:639 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:1552
 msgid "Add"
 msgstr "Añadir"
 
-#: src/addressbook.c:638
+#: src/addressbook.c:642
 msgid "Lookup"
 msgstr "Buscar"
 
-#: src/addressbook.c:650 src/headerview.c:55 src/prefs_folder_item.c:339
+#: src/addressbook.c:654 src/headerview.c:55 src/prefs_folder_item.c:339
 #: src/prefs_template.c:176
 msgid "To:"
 msgstr "Para:"
 
-#: src/addressbook.c:654 src/prefs_folder_item.c:356 src/prefs_template.c:178
+#: src/addressbook.c:658 src/prefs_folder_item.c:356 src/prefs_template.c:178
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:658 src/prefs_folder_item.c:367
+#: src/addressbook.c:662 src/prefs_folder_item.c:367
 msgid "Bcc:"
 msgstr "Bcc:"
 
 #. Confirm deletion
-#: src/addressbook.c:845
+#: src/addressbook.c:832
 msgid "Delete address(es)"
 msgstr "Borrar dirección(es)"
 
-#: src/addressbook.c:846
+#: src/addressbook.c:833
 msgid "Really delete the address(es)?"
 msgstr "¿Borrar realmente la(s) dirección(es)?"
 
-#: src/addressbook.c:1675
+#: src/addressbook.c:1669
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1024,36 +1025,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:1678 src/folderview.c:2372
+#: src/addressbook.c:1672 src/folderview.c:2372
 msgid "Delete folder"
 msgstr "Borrar carpeta"
 
-#: src/addressbook.c:1678
+#: src/addressbook.c:1672
 msgid "_Folder only"
 msgstr "Sólo la _carpeta"
 
-#: src/addressbook.c:1678
+#: src/addressbook.c:1672
 msgid "Folder and _addresses"
 msgstr "La carpeta y las _direcciones"
 
-#: src/addressbook.c:1683
+#: src/addressbook.c:1677
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "¿Borrar realmente «%s»?"
 
-#: src/addressbook.c:2369 src/addressbook.c:2502
+#: src/addressbook.c:2363 src/addressbook.c:2496
 msgid "New user, could not save index file."
 msgstr "Nuevo usuario, no se pudo guardar el fichero índice."
 
-#: src/addressbook.c:2373 src/addressbook.c:2506
+#: src/addressbook.c:2367 src/addressbook.c:2500
 msgid "New user, could not save address book files."
 msgstr "Nuevo usuario, no se pudo guardar los ficheros de direcciones"
 
-#: src/addressbook.c:2383 src/addressbook.c:2516
+#: src/addressbook.c:2377 src/addressbook.c:2510
 msgid "Old address book converted successfully."
 msgstr "Antigua agenda de direcciones convertida con éxito"
 
-#: src/addressbook.c:2388
+#: src/addressbook.c:2382
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1061,7 +1062,7 @@ msgstr ""
 "Antigua agenda de direcciones convertida,\n"
 "no se pudo guardar el nuevo fichero índice"
 
-#: src/addressbook.c:2401
+#: src/addressbook.c:2395
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1069,7 +1070,7 @@ msgstr ""
 "No se pudo convertir la antigua agenda,\n"
 "pero se crearon nuevos ficheros vacíos."
 
-#: src/addressbook.c:2407
+#: src/addressbook.c:2401
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1077,7 +1078,7 @@ msgstr ""
 "No se pudo convertir la antigua agenda,\n"
 "no se pudieron crear los ficheros para la nueva."
 
-#: src/addressbook.c:2412
+#: src/addressbook.c:2406
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1085,92 +1086,92 @@ msgstr ""
 "No se pudo convertir la antigua agenda\n"
 "y no se pudieron crear ficheros para una nueva."
 
-#: src/addressbook.c:2419
+#: src/addressbook.c:2413
 msgid "Addressbook conversion error"
 msgstr "Error en la conversión de la agenda"
 
-#: src/addressbook.c:2423
+#: src/addressbook.c:2417
 msgid "Addressbook conversion"
 msgstr "Conversión de la agenda"
 
-#: src/addressbook.c:2458
+#: src/addressbook.c:2452
 msgid "Addressbook Error"
 msgstr "Error en la agenda"
 
-#: src/addressbook.c:2459 src/addressbook.c:2559
+#: src/addressbook.c:2453 src/addressbook.c:2553
 msgid "Could not read address index"
 msgstr "No se pudo leer el índice de direcciones"
 
-#: src/addressbook.c:2521
+#: src/addressbook.c:2515
 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:2535
+#: src/addressbook.c:2529
 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:2541
+#: src/addressbook.c:2535
 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:2547
+#: src/addressbook.c:2541
 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:2565
+#: src/addressbook.c:2559
 msgid "Addressbook Conversion Error"
 msgstr "Error en la conversión de la agenda"
 
-#: src/addressbook.c:2571
+#: src/addressbook.c:2565
 msgid "Addressbook Conversion"
 msgstr "Conversión de la agenda"
 
-#: src/addressbook.c:3086 src/prefs_common_dialog.c:2033
+#: src/addressbook.c:3080 src/prefs_common_dialog.c:2033
 msgid "Interface"
 msgstr "Interfaz"
 
-#: src/addressbook.c:3102 src/importldif.c:514
+#: src/addressbook.c:3096 src/importldif.c:514
 msgid "Address Book"
 msgstr "Agenda de direcciones"
 
-#: src/addressbook.c:3118
+#: src/addressbook.c:3112
 msgid "Person"
 msgstr "Persona"
 
-#: src/addressbook.c:3134
+#: src/addressbook.c:3128
 msgid "EMail Address"
 msgstr "Dirección e-mail"
 
-#: src/addressbook.c:3150
+#: src/addressbook.c:3144
 msgid "Group"
 msgstr "Grupo"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3166 src/folderview.c:367 src/prefs_account_dialog.c:1694
-#: src/query_search.c:370
+#: src/addressbook.c:3160 src/folderview.c:367 src/prefs_account_dialog.c:1694
+#: src/query_search.c:398
 msgid "Folder"
 msgstr "Carpeta"
 
-#: src/addressbook.c:3182
+#: src/addressbook.c:3176
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3198 src/addressbook.c:3214
+#: src/addressbook.c:3192 src/addressbook.c:3208
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3230
+#: src/addressbook.c:3224
 msgid "LDAP Server"
 msgstr "Servidor LDAP"
 
@@ -1182,7 +1183,7 @@ msgstr "Dirección común"
 msgid "Personal address"
 msgstr "Dirección personal"
 
-#: src/alertpanel.c:142 src/compose.c:5500 src/main.c:621
+#: src/alertpanel.c:142 src/compose.c:5517 src/main.c:621
 msgid "Notice"
 msgstr "Notificación"
 
@@ -1190,7 +1191,7 @@ msgstr "Notificación"
 msgid "Warning"
 msgstr "Aviso"
 
-#: src/alertpanel.c:168 src/inc.c:587
+#: src/alertpanel.c:168 src/inc.c:586
 msgid "Error"
 msgstr "Error"
 
@@ -1233,7 +1234,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:4761
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4762
 msgid "None"
 msgstr "Ninguno"
 
@@ -1479,7 +1480,7 @@ msgstr "/_Ver/Codificación de caract_eres/Tailandés (TIS-620)"
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Ver/Codificación de caract_eres/Tailandés (Windows-874)"
 
-#: src/compose.c:646 src/mainwindow.c:759 src/messageview.c:267
+#: src/compose.c:646 src/mainwindow.c:759 src/messageview.c:268
 msgid "/_Tools/_Address book"
 msgstr "/_Herramientas/_Agenda de direcciones"
 
@@ -1487,14 +1488,14 @@ msgstr "/_Herramientas/_Agenda de direcciones"
 msgid "/_Tools/_Template"
 msgstr "/_Herramientas/Plan_tillas"
 
-#: src/compose.c:649 src/mainwindow.c:783 src/messageview.c:283
+#: src/compose.c:649 src/mainwindow.c:783 src/messageview.c:284
 msgid "/_Tools/Actio_ns"
 msgstr "/_Herramientas/Accio_nes"
 
 #: src/compose.c:651 src/compose.c:655 src/compose.c:661 src/mainwindow.c:762
 #: src/mainwindow.c:776 src/mainwindow.c:781 src/mainwindow.c:784
-#: src/mainwindow.c:788 src/mainwindow.c:790 src/messageview.c:270
-#: src/messageview.c:282
+#: src/mainwindow.c:788 src/mainwindow.c:790 src/messageview.c:271
+#: src/messageview.c:283
 msgid "/_Tools/---"
 msgstr "/_Herramientas/---"
 
@@ -1518,79 +1519,79 @@ msgstr "/_Herramientas/_Comprobar ortografía"
 msgid "/_Tools/_Set spell language"
 msgstr "/_Herramientas/_Establecer idioma ortográfico"
 
-#: src/compose.c:910
+#: src/compose.c:912
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: el fichero no existe\n"
 
-#: src/compose.c:1014 src/compose.c:1085
+#: src/compose.c:1016 src/compose.c:1087
 msgid "Can't get text part\n"
 msgstr "No se puede obtener la parte de texto\n"
 
-#: src/compose.c:1486
+#: src/compose.c:1488
 msgid "Quote mark format error."
 msgstr "Error en el formato de la marca de cita."
 
-#: src/compose.c:1498
+#: src/compose.c:1500
 msgid "Message reply/forward format error."
 msgstr "Error en el formato de responder/redirijir."
 
-#: src/compose.c:1918
+#: src/compose.c:1935
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "El fichero %s no existe\n"
 
-#: src/compose.c:1922
+#: src/compose.c:1939
 #, 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:1926
+#: src/compose.c:1943
 #, c-format
 msgid "File %s is empty."
 msgstr "El fichero %s esta vacío."
 
-#: src/compose.c:1930
+#: src/compose.c:1947
 #, c-format
 msgid "Can't read %s."
 msgstr "No se puede leer %s."
 
-#: src/compose.c:1963
+#: src/compose.c:1980
 #, c-format
 msgid "Message: %s"
 msgstr "Mensaje: %s"
 
-#: src/compose.c:2023 src/mimeview.c:565
+#: src/compose.c:2040 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:2507 src/headerview.c:195 src/query_search.c:636
+#: src/compose.c:2524 src/headerview.c:195 src/query_search.c:666
 #: src/summaryview.c:2124
 msgid "(No Subject)"
 msgstr "(Sin asunto)"
 
-#: src/compose.c:2510
+#: src/compose.c:2527
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Componer%s"
 
-#: src/compose.c:2623
+#: src/compose.c:2642
 msgid "Recipient is not specified."
 msgstr "No se especificó el destinatario."
 
-#: src/compose.c:2631
+#: src/compose.c:2650
 msgid "Empty subject"
 msgstr "Asunto vacío"
 
-#: src/compose.c:2632
+#: src/compose.c:2651
 msgid "Subject is empty. Send it anyway?"
 msgstr "El asunto esta vacío. ¿Enviar de todas formas?"
 
-#: src/compose.c:2691
+#: src/compose.c:2710
 msgid "can't get recipient list."
 msgstr "no se puede obtener la lista de destinatarios."
 
-#: src/compose.c:2711
+#: src/compose.c:2730
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1598,23 +1599,23 @@ msgstr ""
 "No especificó ninguna cuenta para enviar.\n"
 "Seleccione alguna cuenta antes de enviar."
 
-#: src/compose.c:2725 src/send_message.c:299
+#: src/compose.c:2744 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:2767
+#: src/compose.c:2786
 msgid "Can't save the message to outbox."
 msgstr "No se puede guardar el mensaje en Salida."
 
-#: src/compose.c:2805
+#: src/compose.c:2824
 #, 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:2902
+#: src/compose.c:2921
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1625,11 +1626,11 @@ msgstr ""
 "\n"
 "¿Enviarlo como %s de todas formas?"
 
-#: src/compose.c:2908
+#: src/compose.c:2927
 msgid "Code conversion error"
 msgstr "Error en la conversión de códigos"
 
-#: src/compose.c:2981
+#: src/compose.c:3000
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1642,156 +1643,156 @@ msgstr ""
 "\n"
 "¿Enviarlo de todas formas?"
 
-#: src/compose.c:2985
+#: src/compose.c:3004
 msgid "Line length limit"
 msgstr "Límite de longitud de línea"
 
-#: src/compose.c:3275
+#: src/compose.c:3294
 msgid "can't remove the old message\n"
 msgstr "no se puede eliminar el mensaje antiguo\n"
 
-#: src/compose.c:3293
+#: src/compose.c:3312
 msgid "queueing message...\n"
 msgstr "poniendo en la cola...\n"
 
-#: src/compose.c:3375
+#: src/compose.c:3394
 msgid "can't find queue folder\n"
 msgstr "no puedo encontrar la carpeta de cola\n"
 
-#: src/compose.c:3382
+#: src/compose.c:3401
 msgid "can't queue the message\n"
 msgstr "El mensaje no se puede poner en la cola\n"
 
-#: src/compose.c:3975
+#: src/compose.c:3994
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "Message-ID generado: %s\n"
 
-#: src/compose.c:4088
+#: src/compose.c:4107
 msgid "Creating compose window...\n"
 msgstr "Creando ventana de composición...\n"
 
-#: src/compose.c:4139 src/headerview.c:54
+#: src/compose.c:4158 src/headerview.c:54
 msgid "From:"
 msgstr "Desde:"
 
-#: src/compose.c:4213
+#: src/compose.c:4232
 msgid "PGP Sign"
 msgstr "Firmar con PGP"
 
-#: src/compose.c:4216
+#: src/compose.c:4235
 msgid "PGP Encrypt"
 msgstr "Cifrar con PGP"
 
-#: src/compose.c:4254 src/compose.c:5332
+#: src/compose.c:4273 src/compose.c:5351
 msgid "MIME type"
 msgstr "Tipo MIME"
 
 #. S_COL_DATE
-#: src/compose.c:4263 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4908
+#: src/compose.c:4282 src/mimeview.c:197 src/prefs_filter_edit.c:496
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4909
 msgid "Size"
 msgstr "Tamaño"
 
-#: src/compose.c:4698 src/mainwindow.c:2359 src/prefs_account_dialog.c:528
+#: src/compose.c:4717 src/mainwindow.c:2359 src/prefs_account_dialog.c:528
 #: src/prefs_common_dialog.c:661
 msgid "Send"
 msgstr "Enviar"
 
-#: src/compose.c:4699
+#: src/compose.c:4718
 msgid "Send message"
 msgstr "Enviar mensaje"
 
-#: src/compose.c:4707
+#: src/compose.c:4726
 msgid "Send later"
 msgstr "Enviar después"
 
-#: src/compose.c:4708
+#: src/compose.c:4727
 msgid "Put into queue folder and send later"
 msgstr "Poner en la cola y enviar después"
 
-#: src/compose.c:4716
+#: src/compose.c:4735
 msgid "Draft"
 msgstr "Borrador"
 
-#: src/compose.c:4717
+#: src/compose.c:4736
 msgid "Save to draft folder"
 msgstr "Guardar como borrador"
 
-#: src/compose.c:4727
+#: src/compose.c:4746
 msgid "Insert"
 msgstr "Insertar"
 
-#: src/compose.c:4728
+#: src/compose.c:4747
 msgid "Insert file"
 msgstr "Insertar fichero"
 
-#: src/compose.c:4736
+#: src/compose.c:4755
 msgid "Attach"
 msgstr "Adjuntar"
 
-#: src/compose.c:4737
+#: src/compose.c:4756
 msgid "Attach file"
 msgstr "Adjuntar fichero"
 
 #. signature
-#: src/compose.c:4747 src/prefs_account_dialog.c:1208
+#: src/compose.c:4766 src/prefs_account_dialog.c:1208
 #: src/prefs_common_dialog.c:953
 msgid "Signature"
 msgstr "Firma"
 
-#: src/compose.c:4748
+#: src/compose.c:4767
 msgid "Append signature"
 msgstr "Agregar firma"
 
 #. editor
-#: src/compose.c:4757 src/prefs_common_dialog.c:991
+#: src/compose.c:4776 src/prefs_common_dialog.c:991
 #: src/prefs_common_dialog.c:2315
 msgid "Editor"
 msgstr "Editor"
 
-#: src/compose.c:4758
+#: src/compose.c:4777
 msgid "Edit with external editor"
 msgstr "Editar con un editor externo"
 
-#: src/compose.c:4766
+#: src/compose.c:4785
 msgid "Linewrap"
 msgstr "Recortar"
 
-#: src/compose.c:4767
+#: src/compose.c:4786
 msgid "Wrap all long lines"
 msgstr "Cortar todas las líneas largas"
 
-#: src/compose.c:5228
+#: src/compose.c:5247
 msgid "Invalid MIME type."
 msgstr "Tipo MIME inválido."
 
-#: src/compose.c:5246
+#: src/compose.c:5265
 msgid "File doesn't exist or is empty."
 msgstr "El fichero no existe o está vacío."
 
-#: src/compose.c:5314
+#: src/compose.c:5333
 msgid "Properties"
 msgstr "Propiedades"
 
-#: src/compose.c:5334 src/prefs_common_dialog.c:1444
+#: src/compose.c:5353 src/prefs_common_dialog.c:1444
 msgid "Encoding"
 msgstr "Codificación"
 
-#: src/compose.c:5357 src/prefs_folder_item.c:202
+#: src/compose.c:5376 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Ruta"
 
-#: src/compose.c:5358
+#: src/compose.c:5377
 msgid "File name"
 msgstr "Nombre de fichero"
 
-#: src/compose.c:5449
+#: src/compose.c:5466
 #, 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:5497
+#: src/compose.c:5514
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1800,44 +1801,44 @@ msgstr ""
 "El editor externo aún esta activo.\n"
 "¿Forzar la finalización del proceso (pid: %d)?\n"
 
-#: src/compose.c:5872 src/compose.c:5877 src/compose.c:5883
+#: src/compose.c:5889 src/compose.c:5894 src/compose.c:5900
 msgid "Can't queue the message."
 msgstr "El mensaje no se puede poner en la cola."
 
-#: src/compose.c:5974
+#: src/compose.c:5991
 msgid "Select files"
 msgstr "Seleccionar ficheros"
 
-#: src/compose.c:5997
+#: src/compose.c:6014
 msgid "Select file"
 msgstr "Seleccionar fichero"
 
-#: src/compose.c:6032
+#: src/compose.c:6049
 msgid "Save message"
 msgstr "Guardar mensaje"
 
-#: src/compose.c:6033
+#: src/compose.c:6050
 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:6035
+#: src/compose.c:6052
 msgid "Close _without saving"
 msgstr "Cerrar _sin guardar"
 
-#: src/compose.c:6077
+#: src/compose.c:6094
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "¿Quiere aplicar la plantilla «%s»?"
 
-#: src/compose.c:6079
+#: src/compose.c:6096
 msgid "Apply template"
 msgstr "Aplicar plantilla"
 
-#: src/compose.c:6080
+#: src/compose.c:6097
 msgid "_Replace"
 msgstr "_Reemplazar"
 
-#: src/compose.c:6080
+#: src/compose.c:6097
 msgid "_Insert"
 msgstr "_Insertar"
 
@@ -1958,52 +1959,52 @@ msgstr "Debe proporcionar un nombre de grupo"
 msgid "Edit Group Data"
 msgstr "Editar datos del grupo"
 
-#: src/editgroup.c:300
+#: src/editgroup.c:299
 msgid "Group Name"
 msgstr "Nombre de grupo"
 
-#: src/editgroup.c:319
+#: src/editgroup.c:318
 msgid "Addresses in Group"
 msgstr "Direcciones en el grupo"
 
-#: src/editgroup.c:321
+#: src/editgroup.c:320
 msgid " -> "
 msgstr " -> "
 
-#: src/editgroup.c:348
+#: src/editgroup.c:347
 msgid " <- "
 msgstr " <- "
 
-#: src/editgroup.c:350
+#: src/editgroup.c:349
 msgid "Available Addresses"
 msgstr "Direcciones disponibles"
 
-#: src/editgroup.c:416
+#: src/editgroup.c:415
 msgid "Move E-Mail Addresses to or from Group with arrow buttons"
 msgstr "Mover las direcciones de correo desde/hacia el grupo con las flechas"
 
-#: src/editgroup.c:468
+#: src/editgroup.c:467
 msgid "Edit Group Details"
 msgstr "Editar detalles del grupo"
 
-#: src/editgroup.c:471
+#: src/editgroup.c:470
 msgid "Add New Group"
 msgstr "Añadir nuevo grupo"
 
-#: src/editgroup.c:522
+#: src/editgroup.c:521
 msgid "Edit folder"
 msgstr "Editar carpeta"
 
-#: src/editgroup.c:522
+#: src/editgroup.c:521
 msgid "Input the new name of folder:"
 msgstr "Nombre de la nueva carpeta:"
 
-#: src/editgroup.c:525 src/foldersel.c:541 src/folderview.c:2121
+#: src/editgroup.c:524 src/foldersel.c:541 src/folderview.c:2121
 #: src/folderview.c:2127
 msgid "New folder"
 msgstr "Nueva carpeta"
 
-#: src/editgroup.c:526 src/foldersel.c:542 src/folderview.c:2128
+#: src/editgroup.c:525 src/foldersel.c:542 src/folderview.c:2128
 msgid "Input the name of new folder:"
 msgstr "Nombre de la nueva carpeta:"
 
@@ -2201,7 +2202,7 @@ msgid "`%c' can't be included in folder name."
 msgstr "`%c' no puede estar en el nombre de la carpeta."
 
 #: src/foldersel.c:561 src/folderview.c:2147 src/folderview.c:2206
-#: src/query_search.c:995
+#: src/query_search.c:1031
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "La carpeta «%s» ya existe."
@@ -2458,7 +2459,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:2127
+#: src/headerview.c:180 src/query_search.c:667 src/summaryview.c:2127
 msgid "(No From)"
 msgstr "(Sin remite)"
 
@@ -2588,133 +2589,133 @@ msgstr "Finalizar"
 msgid "Sylpheed: %d new messages"
 msgstr "Sylpheed: %d mensajes nuevos"
 
-#: src/inc.c:372
+#: src/inc.c:371
 msgid "Retrieving new messages"
 msgstr "Obteniendo nuevos mensajes"
 
-#: src/inc.c:415
+#: src/inc.c:414
 msgid "Standby"
 msgstr "En espera"
 
-#: src/inc.c:544 src/inc.c:593
+#: src/inc.c:543 src/inc.c:592
 msgid "Cancelled"
 msgstr "Cancelado"
 
-#: src/inc.c:555
+#: src/inc.c:554
 msgid "Retrieving"
 msgstr "Recuperando"
 
-#: src/inc.c:564
+#: src/inc.c:563
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "Hecho (%d mensaje(s) (%s) recibido(s))"
 
-#: src/inc.c:568
+#: src/inc.c:567
 msgid "Done (no new messages)"
 msgstr "Hecho (no hay mensajes nuevos)"
 
-#: src/inc.c:574
+#: src/inc.c:573
 msgid "Connection failed"
 msgstr "Conexión fallida"
 
-#: src/inc.c:577
+#: src/inc.c:576
 msgid "Auth failed"
 msgstr "Authorización fallida"
 
-#: src/inc.c:580
+#: src/inc.c:579
 msgid "Locked"
 msgstr "Bloqueado"
 
-#: src/inc.c:590
+#: src/inc.c:589
 msgid "Timeout"
 msgstr "Tiempo límite"
 
-#: src/inc.c:640
+#: src/inc.c:639
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Finalizado (%d mensaje(s) nuevo(s))"
 
-#: src/inc.c:643
+#: src/inc.c:642
 msgid "Finished (no new messages)"
 msgstr "Finalizado (no hay mensajes nuevos)"
 
-#: src/inc.c:652
+#: src/inc.c:651
 msgid "Some errors occurred while getting mail."
 msgstr "Hubo algún error obteniendo el correo."
 
-#: src/inc.c:688
+#: src/inc.c:687
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "obteniendo nuevos mensajes de la cuenta %s...\n"
 
-#: src/inc.c:691
+#: src/inc.c:690
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Recuperando nuevos mensajes"
 
-#: src/inc.c:710
+#: src/inc.c:709
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Conectando al servidor POP3: %s..."
 
-#: src/inc.c:719
+#: src/inc.c:718
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "No se puede conectar al servirdor POP3: %s:%d\n"
 
-#: src/inc.c:798 src/send_message.c:631
+#: src/inc.c:797 src/send_message.c:631
 msgid "Authenticating..."
 msgstr "Autentificando..."
 
-#: src/inc.c:799
+#: src/inc.c:798
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Obteniendo mensajes desde %s..."
 
-#: src/inc.c:804
+#: src/inc.c:803
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Obteniendo el número de nuevos mensajes (STAT)..."
 
-#: src/inc.c:808
+#: src/inc.c:807
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Obteniendo el número de nuevos mensajes (LAST)..."
 
-#: src/inc.c:812
+#: src/inc.c:811
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Obteniendo el número de nuevos mensajes (UIDL)..."
 
-#: src/inc.c:816
+#: src/inc.c:815
 msgid "Getting the size of messages (LIST)..."
 msgstr "Obteniendo el tamaño de nuevos mensajes (LIST)..."
 
-#: src/inc.c:826
+#: src/inc.c:825
 #, c-format
 msgid "Deleting message %d"
 msgstr "Borrando mensaje %d"
 
-#: src/inc.c:833 src/send_message.c:649
+#: src/inc.c:832 src/send_message.c:649
 msgid "Quitting"
 msgstr "Saliendo"
 
-#: src/inc.c:858
+#: src/inc.c:857
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Recuperando mensaje (%d / %d) (%s / %s)"
 
-#: src/inc.c:879
+#: src/inc.c:878
 #, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Obteniendo (%d mensaje(s) (%s) recibido(s))"
 
-#: src/inc.c:1107
+#: src/inc.c:1106
 msgid "Connection failed."
 msgstr "Conexión fallida."
 
-#: src/inc.c:1113
+#: src/inc.c:1112
 msgid "Error occurred while processing mail."
 msgstr "Hubo un error mientras se procesaba el correo."
 
-#: src/inc.c:1118
+#: src/inc.c:1117
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2723,28 +2724,28 @@ msgstr ""
 "Hubo un error procesando el correo:\n"
 "%s"
 
-#: src/inc.c:1124
+#: src/inc.c:1123
 msgid "No disk space left."
 msgstr "No hay espacio libre en disco."
 
-#: src/inc.c:1129
+#: src/inc.c:1128
 msgid "Can't write file."
 msgstr "No se puede escribir el fichero."
 
-#: src/inc.c:1134
+#: src/inc.c:1133
 msgid "Socket error."
 msgstr "Error de socket."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1140 src/send_message.c:584 src/send_message.c:772
+#: src/inc.c:1139 src/send_message.c:584 src/send_message.c:772
 msgid "Connection closed by the remote host."
 msgstr "Conexión cerrada por la máquina remota."
 
-#: src/inc.c:1146
+#: src/inc.c:1145
 msgid "Mailbox is locked."
 msgstr "El buzón esta bloqueado."
 
-#: src/inc.c:1150
+#: src/inc.c:1149
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2753,11 +2754,11 @@ msgstr ""
 "El buzón está bloqueado:\n"
 "%s"
 
-#: src/inc.c:1156 src/send_message.c:757
+#: src/inc.c:1155 src/send_message.c:757
 msgid "Authentication failed."
 msgstr "La autentificación falló."
 
-#: src/inc.c:1161 src/send_message.c:760
+#: src/inc.c:1160 src/send_message.c:760
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2766,15 +2767,15 @@ msgstr ""
 "La autentificación falló:\n"
 "%s"
 
-#: src/inc.c:1166 src/send_message.c:776
+#: src/inc.c:1165 src/send_message.c:776
 msgid "Session timed out."
 msgstr "Se agotó el tiempo de espera de la sesión."
 
-#: src/inc.c:1202
+#: src/inc.c:1201
 msgid "Incorporation cancelled\n"
 msgstr "Incorporación cancelada\n"
 
-#: src/inc.c:1285
+#: src/inc.c:1284
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Obteniendo nuevos mensajes desde %s en %s...\n"
@@ -3245,14 +3246,15 @@ msgid "/_View/Mess_age source"
 msgstr "/_Ver/Fuente del mens_aje"
 
 #: src/mainwindow.c:708 src/messageview.c:245
-msgid "/_View/Show all _header"
+#, fuzzy
+msgid "/_View/Show all _headers"
 msgstr "/_Ver/Mostrar todas las cabeceras"
 
 #: src/mainwindow.c:710
 msgid "/_View/_Update summary"
 msgstr "/_Ver/Actualizar res_umen"
 
-#: src/mainwindow.c:712 src/messageview.c:247
+#: src/mainwindow.c:712 src/messageview.c:248
 msgid "/_Message"
 msgstr "/_Mensaje"
 
@@ -3282,16 +3284,16 @@ msgstr "/_Mensaje/Enviar mensa_jes en cola"
 
 #: src/mainwindow.c:722 src/mainwindow.c:724 src/mainwindow.c:731
 #: src/mainwindow.c:736 src/mainwindow.c:739 src/mainwindow.c:750
-#: src/mainwindow.c:752 src/mainwindow.c:755 src/messageview.c:250
-#: src/messageview.c:258 src/messageview.c:263
+#: src/mainwindow.c:752 src/mainwindow.c:755 src/messageview.c:251
+#: src/messageview.c:259 src/messageview.c:264
 msgid "/_Message/---"
 msgstr "/_Mensaje/---"
 
-#: src/mainwindow.c:723 src/messageview.c:248
+#: src/mainwindow.c:723 src/messageview.c:249
 msgid "/_Message/Compose _new message"
 msgstr "/_Mensaje/Componer _nuevo mensaje"
 
-#: src/mainwindow.c:725 src/messageview.c:251
+#: src/mainwindow.c:725 src/messageview.c:252
 msgid "/_Message/_Reply"
 msgstr "/_Mensaje/_Responder"
 
@@ -3299,27 +3301,27 @@ msgstr "/_Mensaje/_Responder"
 msgid "/_Message/Repl_y to"
 msgstr "/_Mensaje/Respon_der a"
 
-#: src/mainwindow.c:727 src/messageview.c:252
+#: src/mainwindow.c:727 src/messageview.c:253
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Mensaje/Respon_der a/A _todos"
 
-#: src/mainwindow.c:728 src/messageview.c:254
+#: src/mainwindow.c:728 src/messageview.c:255
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Mensaje/Respon_der a/Al _remitente"
 
-#: src/mainwindow.c:729 src/messageview.c:256
+#: src/mainwindow.c:729 src/messageview.c:257
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Mensaje/Respon_der a/A la _lista de correo"
 
-#: src/mainwindow.c:732 src/messageview.c:259
+#: src/mainwindow.c:732 src/messageview.c:260
 msgid "/_Message/_Forward"
 msgstr "/_Mensaje/_Reenviar"
 
-#: src/mainwindow.c:733 src/messageview.c:260
+#: src/mainwindow.c:733 src/messageview.c:261
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Mensaje/Reen_viar como adjunto"
 
-#: src/mainwindow.c:735 src/messageview.c:262
+#: src/mainwindow.c:735 src/messageview.c:263
 msgid "/_Message/Redirec_t"
 msgstr "/_Mensaje/Red_irigir"
 
@@ -3375,7 +3377,7 @@ msgstr "/_Mensaje/Es un correo _basura"
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/_Mensaje/No es un correo _basura"
 
-#: src/mainwindow.c:756 src/messageview.c:264
+#: src/mainwindow.c:756 src/messageview.c:265
 msgid "/_Message/Re-_edit"
 msgstr "/_Mensaje/Re_editar"
 
@@ -3391,23 +3393,23 @@ msgstr "/_Herramientas/_Filtrar todos los mensajes de la carpeta"
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Herramientas/_Filtrar los mensajes seleccionados"
 
-#: src/mainwindow.c:767 src/messageview.c:271
+#: src/mainwindow.c:767 src/messageview.c:272
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Herramientas/_Crear regla de filtrado"
 
-#: src/mainwindow.c:768 src/messageview.c:273
+#: src/mainwindow.c:768 src/messageview.c:274
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Herramientas/_Crear regla de filtrado/_Automáticamente"
 
-#: src/mainwindow.c:770 src/messageview.c:275
+#: src/mainwindow.c:770 src/messageview.c:276
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Herramientas/_Crear regla de filtrado/Basada en _Desde"
 
-#: src/mainwindow.c:772 src/messageview.c:277
+#: src/mainwindow.c:772 src/messageview.c:278
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Herramientas/_Crear regla de filtrado/Basada en _Para"
 
-#: src/mainwindow.c:774 src/messageview.c:279
+#: src/mainwindow.c:774 src/messageview.c:280
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Herramientas/_Crear regla de filtrado/Basada en el _Asunto"
 
@@ -3525,7 +3527,7 @@ msgid "MainWindow: color allocation %d failed\n"
 msgstr "MainWindow: fallo solicitando color %d\n"
 
 #: src/mainwindow.c:1139 src/summaryview.c:2275 src/summaryview.c:2360
-#: src/summaryview.c:3907 src/summaryview.c:4036 src/summaryview.c:4394
+#: src/summaryview.c:3908 src/summaryview.c:4037 src/summaryview.c:4395
 msgid "done.\n"
 msgstr "hecho.\n"
 
@@ -3806,7 +3808,7 @@ msgid "Find text:"
 msgstr "Buscar texto:"
 
 #: src/message_search.c:153 src/prefs_search_folder.c:253
-#: src/query_search.c:326
+#: src/query_search.c:343
 msgid "Case sensitive"
 msgstr "Mayús./minús."
 
@@ -3830,27 +3832,27 @@ msgstr "Se llegó al final del mensaje. ¿Seguir desde el principio?"
 msgid "Search finished"
 msgstr "Búsqueda concluida"
 
-#: src/messageview.c:268
+#: src/messageview.c:269
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/_Herramientas/Añadir _remitente a la agenda"
 
-#: src/messageview.c:300
+#: src/messageview.c:301
 msgid "Creating message view...\n"
 msgstr "Creando visor de mensaje...\n"
 
-#: src/messageview.c:325
+#: src/messageview.c:326
 msgid "Text"
 msgstr "Texto"
 
-#: src/messageview.c:330
+#: src/messageview.c:331
 msgid "Attachments"
 msgstr "Adjuntos"
 
-#: src/messageview.c:380
+#: src/messageview.c:381
 msgid "Message View - Sylpheed"
 msgstr "Vista de mensaje - Sylpheed"
 
-#: src/messageview.c:699 src/summaryview.c:3436
+#: src/messageview.c:700 src/summaryview.c:3436
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "No puedo guardar el fichero «%s»."
@@ -3867,7 +3869,7 @@ msgstr "(Orden para imprimir por omisión)"
 msgid "Print"
 msgstr "Imprimir"
 
-#: src/messageview.c:770 src/summaryview.c:3471
+#: src/messageview.c:769 src/summaryview.c:3470
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -3962,11 +3964,11 @@ msgstr ""
 "Teclee la orden para abrir el fichero:\n"
 "(«%s» será sustituido por el fichero)"
 
-#: src/mimeview.c:1147
+#: src/mimeview.c:1140
 msgid "Opening executable file"
 msgstr "Abriendo fichero ejecutable"
 
-#: src/mimeview.c:1148
+#: src/mimeview.c:1141
 msgid ""
 "This is an executable file. Opening executable file is restricted for "
 "security.\n"
@@ -3978,11 +3980,6 @@ msgstr ""
 "Si quiere lanzarlo, guárdelo en algún lugar y asegúrese de que no es un "
 "virus u otro tipo de software malintencionado."
 
-#: src/mimeview.c:1184
-#, c-format
-msgid "MIME viewer command line is invalid: `%s'"
-msgstr "La orden del visualizador MIME es inválida: «%s»"
-
 #: src/passphrase.c:96
 msgid "Passphrase"
 msgstr "Frase contraseña"
@@ -5713,19 +5710,19 @@ msgstr "Responder-A:"
 msgid "%s - Edit search condition"
 msgstr "%s - Editar condición de búsqueda"
 
-#: src/prefs_search_folder.c:209 src/query_search.c:257
+#: src/prefs_search_folder.c:209 src/query_search.c:274
 msgid "Match any of the following"
 msgstr "Coincidir con alguna de las siguientes"
 
-#: src/prefs_search_folder.c:211 src/query_search.c:259
+#: src/prefs_search_folder.c:211 src/query_search.c:276
 msgid "Match all of the following"
 msgstr "Coincidir con todas las siguientes"
 
-#: src/prefs_search_folder.c:231 src/query_search.c:303
+#: src/prefs_search_folder.c:231 src/query_search.c:320
 msgid "Folder:"
 msgstr "Carpeta:"
 
-#: src/prefs_search_folder.c:248 src/query_search.c:321
+#: src/prefs_search_folder.c:248 src/query_search.c:338
 msgid "Search subfolders"
 msgstr "Buscar en subcarpetas"
 
@@ -5739,17 +5736,17 @@ msgid "Attachment"
 msgstr "Adjunto"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73 src/query_search.c:371 src/summaryview.c:4901
+#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4902
 msgid "Subject"
 msgstr "Asunto"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/query_search.c:372 src/summaryview.c:4904
+#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4905
 msgid "From"
 msgstr "Desde"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/query_search.c:373 src/summaryview.c:4906
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:4907
 msgid "Date"
 msgstr "Fecha"
 
@@ -5842,41 +5839,41 @@ msgstr "Creando diálogo de progreso...\n"
 msgid "Status"
 msgstr "Estado"
 
-#: src/query_search.c:234
+#: src/query_search.c:251
 msgid "Search messages"
 msgstr "Buscar en los mensajes"
 
-#: src/query_search.c:395
+#: src/query_search.c:423
 msgid "_Save as search folder"
 msgstr "_Guardar como carpeta de búsqueda"
 
-#: src/query_search.c:512 src/subscribedialog.c:526 src/summaryview.c:842
+#: src/query_search.c:542 src/subscribedialog.c:526 src/summaryview.c:842
 msgid "Done."
 msgstr "Hecho."
 
-#: src/query_search.c:536
+#: src/query_search.c:566
 #, c-format
 msgid "Searching %s ..."
 msgstr "Buscando %s ..."
 
-#: src/query_search.c:564
+#: src/query_search.c:594
 #, c-format
 msgid "Searching %s (%d / %d)..."
 msgstr "Buscando %s (%d / %d)..."
 
-#: src/query_search.c:645 src/summaryview.c:2051
+#: src/query_search.c:675 src/summaryview.c:2051
 msgid "(No Date)"
 msgstr "(Sin fecha)"
 
-#: src/query_search.c:833
+#: src/query_search.c:869
 msgid "Save as search folder"
 msgstr "Guardar como carpeta de búsqueda"
 
-#: src/query_search.c:854
+#: src/query_search.c:890
 msgid "Location:"
 msgstr "Ubicación:"
 
-#: src/query_search.c:869
+#: src/query_search.c:905
 msgid "Folder name:"
 msgstr "Nombre de carpeta:"
 
@@ -6498,37 +6495,37 @@ msgstr "Mensaje %d marcado para copiar a %s\n"
 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:3506
+#: src/summaryview.c:3507
 msgid "Error occurred while processing messages."
 msgstr "Hubo algún error al procesar los mensajes."
 
-#: src/summaryview.c:3814 src/summaryview.c:3815
+#: src/summaryview.c:3815 src/summaryview.c:3816
 msgid "Building threads..."
 msgstr "Construyendo hilos..."
 
-#: src/summaryview.c:3965 src/summaryview.c:3966
+#: src/summaryview.c:3966 src/summaryview.c:3967
 msgid "Unthreading..."
 msgstr "Deshaciendo hilos..."
 
-#: src/summaryview.c:4259 src/summaryview.c:4315
+#: src/summaryview.c:4260 src/summaryview.c:4316
 #, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtrando (%d / %d)..."
 
-#: src/summaryview.c:4364
+#: src/summaryview.c:4365
 msgid "filtering..."
 msgstr "filtrando..."
 
-#: src/summaryview.c:4365
+#: src/summaryview.c:4366
 msgid "Filtering..."
 msgstr "Filtrando..."
 
-#: src/summaryview.c:4401
+#: src/summaryview.c:4402
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "se ha(n) filtrado %d mensaje(s)."
 
-#: src/summaryview.c:4910
+#: src/summaryview.c:4911
 msgid "No."
 msgstr "No."
 
@@ -6609,6 +6606,9 @@ msgstr "_Salir"
 msgid "Sylpheed"
 msgstr "Sylpheed"
 
+#~ msgid "MIME viewer command line is invalid: `%s'"
+#~ msgstr "La orden del visualizador MIME es inválida: «%s»"
+
 #~ msgid "%dB"
 #~ msgstr "%dB"
 
diff --git a/po/et.po b/po/et.po
index 1934e163..3c4deba6 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-03-02 19:03+0900\n"
+"POT-Creation-Date: 2006-03-10 16:06+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:491
+#: libsylph/prefs_common.c:496
 #, fuzzy
 msgid "Junk mail filter"
 msgstr "Kaust"
@@ -526,7 +526,7 @@ msgstr "Ei suuda avada märgifaili\n"
 msgid "can't fetch message %d\n"
 msgstr "ei suuda võtta kirja %d\n"
 
-#: libsylph/procmsg.c:1375
+#: libsylph/procmsg.c:1378
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Trükkimise käsurida on vale: %s\n"
@@ -605,12 +605,12 @@ msgstr "  Pealkiri: %s\n"
 msgid "  Issuer: %s\n"
 msgstr "  Väljalaskja: %s\n"
 
-#: libsylph/utils.c:2411 src/compose.c:2869 src/compose.c:3132
-#: src/compose.c:3195 src/compose.c:3315
+#: libsylph/utils.c:2430 src/compose.c:2888 src/compose.c:3151
+#: src/compose.c:3214 src/compose.c:3334
 msgid "can't change file mode\n"
 msgstr "Ei suuda muuta faili omadusi\n"
 
-#: libsylph/utils.c:2418 libsylph/utils.c:2542
+#: libsylph/utils.c:2437 libsylph/utils.c:2561
 #, c-format
 msgid "writing to %s failed.\n"
 msgstr "%s-i kirjutamine ebaõnnestus.\n"
@@ -691,8 +691,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:493
-#: src/compose.c:4273 src/editaddress.c:200 src/editaddress.c:942
+#: src/account_dialog.c:366 src/addressadd.c:192 src/addressbook.c:491
+#: src/compose.c:4292 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
@@ -828,12 +828,12 @@ msgstr ""
 msgid "Add Address to Book"
 msgstr "Lisa aadress raamatusse"
 
-#: src/addressadd.c:202 src/compose.c:4777 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4796 src/editaddress.c:201
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "Aadress"
 
-#: src/addressadd.c:212 src/addressbook.c:495 src/editaddress.c:202
+#: src/addressadd.c:212 src/addressbook.c:493 src/editaddress.c:202
 #: src/editaddress.c:795 src/editaddress.c:860 src/editgroup.c:267
 msgid "Remarks"
 msgstr "Märkused"
@@ -842,110 +842,111 @@ msgstr "Märkused"
 msgid "Select Address Book Folder"
 msgstr "Vali aadressiraamatu kaust"
 
-#: src/addressbook.c:338 src/compose.c:515 src/mainwindow.c:489
+#: src/addressbook.c:337 src/compose.c:515 src/mainwindow.c:489
 #: src/messageview.c:140
 msgid "/_File"
 msgstr "/_Fail"
 
-#: src/addressbook.c:339
+#: src/addressbook.c:338
 msgid "/_File/New _Book"
 msgstr "/_Fail/Uus raamat"
 
-#: src/addressbook.c:340
+#: src/addressbook.c:339
 msgid "/_File/New _vCard"
 msgstr "/_Fail/Uus _V-Kaart"
 
-#: src/addressbook.c:342
+#: src/addressbook.c:341
 msgid "/_File/New _JPilot"
 msgstr "/_Fail/Uus _JPiloot"
 
-#: src/addressbook.c:345
-msgid "/_File/New _Server"
+#: src/addressbook.c:344
+#, fuzzy
+msgid "/_File/New _LDAP Server"
 msgstr "/_Fail/Uus _Server"
 
-#: src/addressbook.c:347 src/addressbook.c:350 src/compose.c:520
+#: src/addressbook.c:346 src/addressbook.c:349 src/compose.c:520
 #: src/compose.c:525 src/compose.c:528 src/compose.c:531 src/mainwindow.c:507
 #: src/mainwindow.c:510 src/mainwindow.c:512 src/mainwindow.c:515
 #: src/mainwindow.c:517 src/messageview.c:143
 msgid "/_File/---"
 msgstr "/_Fail/---"
 
-#: src/addressbook.c:348
+#: src/addressbook.c:347
 msgid "/_File/_Edit"
 msgstr "/_Fail/R_edigeeri"
 
-#: src/addressbook.c:349
+#: src/addressbook.c:348
 msgid "/_File/_Delete"
 msgstr "/_Fail/Kustuta"
 
-#: src/addressbook.c:351
+#: src/addressbook.c:350
 msgid "/_File/_Save"
 msgstr "/_Fail/_Salvesta"
 
-#: src/addressbook.c:352 src/compose.c:532 src/messageview.c:144
+#: src/addressbook.c:351 src/compose.c:532 src/messageview.c:144
 msgid "/_File/_Close"
 msgstr "/_Fail/Sul_ge"
 
-#: src/addressbook.c:353
+#: src/addressbook.c:352
 msgid "/_Address"
 msgstr "/_Aadress"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:353
 msgid "/_Address/New _Address"
 msgstr "/_Aadress/Uus _Aadress"
 
-#: src/addressbook.c:355
+#: src/addressbook.c:354
 msgid "/_Address/New _Group"
 msgstr "/_Aadress/Uus _Grupp"
 
-#: src/addressbook.c:356
+#: src/addressbook.c:355
 msgid "/_Address/New _Folder"
 msgstr "/_Aadress/Uus Kaust"
 
-#: src/addressbook.c:357
+#: src/addressbook.c:356
 msgid "/_Address/---"
 msgstr "/_Aadress/---"
 
-#: src/addressbook.c:358
+#: src/addressbook.c:357
 msgid "/_Address/_Edit"
 msgstr "/_Aadress/R_edigeeri"
 
-#: src/addressbook.c:359
+#: src/addressbook.c:358
 msgid "/_Address/_Delete"
 msgstr "/_Aadress/Kustuta"
 
-#: src/addressbook.c:360 src/compose.c:645 src/mainwindow.c:758
-#: src/messageview.c:266
+#: src/addressbook.c:359 src/compose.c:645 src/mainwindow.c:758
+#: src/messageview.c:267
 msgid "/_Tools"
 msgstr "/_Tööriist"
 
-#: src/addressbook.c:361
+#: src/addressbook.c:360
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Tööriist/Impordi _LDIF fail"
 
-#: src/addressbook.c:362 src/compose.c:666 src/mainwindow.c:812
-#: src/messageview.c:286
+#: src/addressbook.c:361 src/compose.c:666 src/mainwindow.c:812
+#: src/messageview.c:287
 msgid "/_Help"
 msgstr "/_Abi"
 
-#: src/addressbook.c:363 src/compose.c:667 src/mainwindow.c:824
-#: src/messageview.c:287
+#: src/addressbook.c:362 src/compose.c:667 src/mainwindow.c:824
+#: src/messageview.c:288
 msgid "/_Help/_About"
 msgstr "/_Abi/Sellest"
 
-#: src/addressbook.c:382 src/addressbook.c:392
+#: src/addressbook.c:381 src/addressbook.c:391
 msgid "/New _Address"
 msgstr "/Uus _Aadress"
 
-#: src/addressbook.c:383 src/addressbook.c:393
+#: src/addressbook.c:382 src/addressbook.c:392
 msgid "/New _Group"
 msgstr "/Uus _Grupp"
 
-#: src/addressbook.c:384 src/addressbook.c:394
+#: src/addressbook.c:383 src/addressbook.c:393
 msgid "/New _Folder"
 msgstr "/Uus Kaust"
 
-#: src/addressbook.c:385 src/addressbook.c:395 src/compose.c:509
+#: src/addressbook.c:384 src/addressbook.c:394 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
@@ -955,70 +956,70 @@ msgstr "/Uus Kaust"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:386 src/addressbook.c:396 src/compose.c:534
+#: src/addressbook.c:385 src/addressbook.c:395 src/compose.c:534
 #: src/mainwindow.c:521 src/messageview.c:146
 msgid "/_Edit"
 msgstr "/R_edaktor"
 
-#: src/addressbook.c:387 src/addressbook.c:397 src/summaryview.c:434
+#: src/addressbook.c:386 src/addressbook.c:396 src/summaryview.c:434
 msgid "/_Delete"
 msgstr "/Kustuta"
 
-#: src/addressbook.c:494
+#: src/addressbook.c:492
 msgid "E-Mail address"
 msgstr "E-Posti aadress"
 
-#: src/addressbook.c:498 src/compose.c:4778 src/prefs_common_dialog.c:2183
+#: src/addressbook.c:496 src/compose.c:4797 src/prefs_common_dialog.c:2183
 msgid "Address book"
 msgstr "Aadressiraamat"
 
-#: src/addressbook.c:600 src/prefs_filter_edit.c:249
+#: src/addressbook.c:603 src/prefs_filter_edit.c:249
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "Nimi:"
 
 #. Buttons
-#: src/addressbook.c:632 src/addressbook.c:1684 src/editaddress.c:884
+#: src/addressbook.c:636 src/addressbook.c:1678 src/editaddress.c:884
 #: src/editaddress.c:1017 src/mainwindow.c:2426 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:635 src/editaddress.c:890 src/editaddress.c:1023
+#: src/addressbook.c:639 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:1552
 msgid "Add"
 msgstr "Lisa"
 
-#: src/addressbook.c:638
+#: src/addressbook.c:642
 msgid "Lookup"
 msgstr "Otsi"
 
-#: src/addressbook.c:650 src/headerview.c:55 src/prefs_folder_item.c:339
+#: src/addressbook.c:654 src/headerview.c:55 src/prefs_folder_item.c:339
 #: src/prefs_template.c:176
 msgid "To:"
 msgstr "Kellele:"
 
-#: src/addressbook.c:654 src/prefs_folder_item.c:356 src/prefs_template.c:178
+#: src/addressbook.c:658 src/prefs_folder_item.c:356 src/prefs_template.c:178
 msgid "Cc:"
 msgstr "Koopia:"
 
-#: src/addressbook.c:658 src/prefs_folder_item.c:367
+#: src/addressbook.c:662 src/prefs_folder_item.c:367
 msgid "Bcc:"
 msgstr "Pimekoopia:"
 
 #. Confirm deletion
-#: src/addressbook.c:845
+#: src/addressbook.c:832
 msgid "Delete address(es)"
 msgstr "Kustuta aadress(id)"
 
-#: src/addressbook.c:846
+#: src/addressbook.c:833
 msgid "Really delete the address(es)?"
 msgstr "Kas te tõesti soovite aadresse kustutada?"
 
-#: src/addressbook.c:1675
+#: src/addressbook.c:1669
 #, fuzzy, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1027,38 +1028,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:1678 src/folderview.c:2372
+#: src/addressbook.c:1672 src/folderview.c:2372
 msgid "Delete folder"
 msgstr "Kustuta kaust"
 
-#: src/addressbook.c:1678
+#: src/addressbook.c:1672
 #, fuzzy
 msgid "_Folder only"
 msgstr "Ainult kataloog"
 
-#: src/addressbook.c:1678
+#: src/addressbook.c:1672
 #, fuzzy
 msgid "Folder and _addresses"
 msgstr "Kaust ja aadressid"
 
-#: src/addressbook.c:1683
+#: src/addressbook.c:1677
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Kas tõesti kustutada `%s' ?"
 
-#: src/addressbook.c:2369 src/addressbook.c:2502
+#: src/addressbook.c:2363 src/addressbook.c:2496
 msgid "New user, could not save index file."
 msgstr "Uus kasutaja, ei saanud salvestada indeksifaili."
 
-#: src/addressbook.c:2373 src/addressbook.c:2506
+#: src/addressbook.c:2367 src/addressbook.c:2500
 msgid "New user, could not save address book files."
 msgstr "Uus kasutaja, ei saanud salvestada aadressiraamatu faile."
 
-#: src/addressbook.c:2383 src/addressbook.c:2516
+#: src/addressbook.c:2377 src/addressbook.c:2510
 msgid "Old address book converted successfully."
 msgstr "Vana aadressiraamat uuendati edukalt."
 
-#: src/addressbook.c:2388
+#: src/addressbook.c:2382
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1066,7 +1067,7 @@ msgstr ""
 "Vana aadressiraamat uuendati.\n"
 "ei saanud salvestada uut aadresside indeksifaili"
 
-#: src/addressbook.c:2401
+#: src/addressbook.c:2395
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1074,7 +1075,7 @@ msgstr ""
 "Ei saanud uuendada aadressiraamatut,\n"
 "kuid loodi uued ja tühjad aadressiraamatu failid."
 
-#: src/addressbook.c:2407
+#: src/addressbook.c:2401
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1082,7 +1083,7 @@ msgstr ""
 "Ei suutnud uuendada aadressiraamatut,\n"
 "ei suutnud luua uusi aadressiraamatu faile."
 
-#: src/addressbook.c:2412
+#: src/addressbook.c:2406
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1090,91 +1091,91 @@ msgstr ""
 "Ei suutnud uuendada aadressiraamatut,\n"
 "ja ei suutnud luua uut aadressiraamatu faile."
 
-#: src/addressbook.c:2419
+#: src/addressbook.c:2413
 msgid "Addressbook conversion error"
 msgstr "Aadressiraamatu uuendamise viga"
 
-#: src/addressbook.c:2423
+#: src/addressbook.c:2417
 msgid "Addressbook conversion"
 msgstr "Aadressiraamat viiakse uude formaati"
 
-#: src/addressbook.c:2458
+#: src/addressbook.c:2452
 msgid "Addressbook Error"
 msgstr "Aadressiraamatu viga"
 
-#: src/addressbook.c:2459 src/addressbook.c:2559
+#: src/addressbook.c:2453 src/addressbook.c:2553
 msgid "Could not read address index"
 msgstr "Ei suutnud lugeda aadresside indeksit"
 
-#: src/addressbook.c:2521
+#: src/addressbook.c:2515
 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:2535
+#: src/addressbook.c:2529
 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:2541
+#: src/addressbook.c:2535
 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:2547
+#: src/addressbook.c:2541
 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:2565
+#: src/addressbook.c:2559
 msgid "Addressbook Conversion Error"
 msgstr "Aadressiraamatu uuendamise viga"
 
-#: src/addressbook.c:2571
+#: src/addressbook.c:2565
 msgid "Addressbook Conversion"
 msgstr "Aadressiraamatu uuendamine"
 
-#: src/addressbook.c:3086 src/prefs_common_dialog.c:2033
+#: src/addressbook.c:3080 src/prefs_common_dialog.c:2033
 msgid "Interface"
 msgstr "Kasutajaliides"
 
-#: src/addressbook.c:3102 src/importldif.c:514
+#: src/addressbook.c:3096 src/importldif.c:514
 msgid "Address Book"
 msgstr "Aadressiraamat"
 
-#: src/addressbook.c:3118
+#: src/addressbook.c:3112
 msgid "Person"
 msgstr "Persoon"
 
-#: src/addressbook.c:3134
+#: src/addressbook.c:3128
 msgid "EMail Address"
 msgstr "EPosti Aadress"
 
-#: src/addressbook.c:3150
+#: src/addressbook.c:3144
 msgid "Group"
 msgstr "Grupp"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3166 src/folderview.c:367 src/prefs_account_dialog.c:1694
-#: src/query_search.c:370
+#: src/addressbook.c:3160 src/folderview.c:367 src/prefs_account_dialog.c:1694
+#: src/query_search.c:398
 msgid "Folder"
 msgstr "Kaust"
 
-#: src/addressbook.c:3182
+#: src/addressbook.c:3176
 msgid "vCard"
 msgstr "V-Kaart"
 
-#: src/addressbook.c:3198 src/addressbook.c:3214
+#: src/addressbook.c:3192 src/addressbook.c:3208
 msgid "JPilot"
 msgstr "JPiloot"
 
-#: src/addressbook.c:3230
+#: src/addressbook.c:3224
 msgid "LDAP Server"
 msgstr "LDAP Server"
 
@@ -1186,7 +1187,7 @@ msgstr "Üldine aadress"
 msgid "Personal address"
 msgstr "Isiklik aadress"
 
-#: src/alertpanel.c:142 src/compose.c:5500 src/main.c:621
+#: src/alertpanel.c:142 src/compose.c:5517 src/main.c:621
 msgid "Notice"
 msgstr "Märkus"
 
@@ -1194,7 +1195,7 @@ msgstr "Märkus"
 msgid "Warning"
 msgstr "Hoiatus"
 
-#: src/alertpanel.c:168 src/inc.c:587
+#: src/alertpanel.c:168 src/inc.c:586
 msgid "Error"
 msgstr "Viga"
 
@@ -1237,7 +1238,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:4761
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4762
 msgid "None"
 msgstr "Mittemiski"
 
@@ -1516,7 +1517,7 @@ msgstr "/_Vaade/_Kooditabel/Tai (TIS-620)"
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Vaade/_Kooditabel/Tai (Windows-874)"
 
-#: src/compose.c:646 src/mainwindow.c:759 src/messageview.c:267
+#: src/compose.c:646 src/mainwindow.c:759 src/messageview.c:268
 msgid "/_Tools/_Address book"
 msgstr "/_Tööriist/_Aadressiraamat"
 
@@ -1524,14 +1525,14 @@ msgstr "/_Tööriist/_Aadressiraamat"
 msgid "/_Tools/_Template"
 msgstr "/_Tööriist/_Mall"
 
-#: src/compose.c:649 src/mainwindow.c:783 src/messageview.c:283
+#: src/compose.c:649 src/mainwindow.c:783 src/messageview.c:284
 msgid "/_Tools/Actio_ns"
 msgstr "/_Tööriist/Tegevused"
 
 #: src/compose.c:651 src/compose.c:655 src/compose.c:661 src/mainwindow.c:762
 #: src/mainwindow.c:776 src/mainwindow.c:781 src/mainwindow.c:784
-#: src/mainwindow.c:788 src/mainwindow.c:790 src/messageview.c:270
-#: src/messageview.c:282
+#: src/mainwindow.c:788 src/mainwindow.c:790 src/messageview.c:271
+#: src/messageview.c:283
 msgid "/_Tools/---"
 msgstr "/_Tööriist/---"
 
@@ -1560,80 +1561,80 @@ msgstr "/_Tööriist/Käivita"
 msgid "/_Tools/_Set spell language"
 msgstr "/_Tööriist/_Mall"
 
-#: src/compose.c:910
+#: src/compose.c:912
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "faili %s ei leidu\n"
 
-#: src/compose.c:1014 src/compose.c:1085
+#: src/compose.c:1016 src/compose.c:1087
 msgid "Can't get text part\n"
 msgstr "Ei saa tekstiosa kätte\n"
 
-#: src/compose.c:1486
+#: src/compose.c:1488
 msgid "Quote mark format error."
 msgstr "*Tsitaadimärgi formaadi viga."
 
-#: src/compose.c:1498
+#: src/compose.c:1500
 msgid "Message reply/forward format error."
 msgstr "Kirja vasta/edasta formaadi viga."
 
-#: src/compose.c:1918
+#: src/compose.c:1935
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Faili %s ei leidu\n"
 
-#: src/compose.c:1922
+#: src/compose.c:1939
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Ei saanud failile %s suurust\n"
 
-#: src/compose.c:1926
+#: src/compose.c:1943
 #, c-format
 msgid "File %s is empty."
 msgstr "Fail %s on tühi."
 
-#: src/compose.c:1930
+#: src/compose.c:1947
 #, c-format
 msgid "Can't read %s."
 msgstr "ei suuda lugeda %s-i"
 
-#: src/compose.c:1963
+#: src/compose.c:1980
 #, c-format
 msgid "Message: %s"
 msgstr "Kiri: %s"
 
-#: src/compose.c:2023 src/mimeview.c:565
+#: src/compose.c:2040 src/mimeview.c:565
 msgid "Can't get the part of multipart message."
 msgstr "Ei saa mitmeosalise kirja osa kätte."
 
-#: src/compose.c:2507 src/headerview.c:195 src/query_search.c:636
+#: src/compose.c:2524 src/headerview.c:195 src/query_search.c:666
 #: src/summaryview.c:2124
 msgid "(No Subject)"
 msgstr "(Pole pealkirja)"
 
-#: src/compose.c:2510
+#: src/compose.c:2527
 #, fuzzy, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Kirjuta kiri%s"
 
-#: src/compose.c:2623
+#: src/compose.c:2642
 msgid "Recipient is not specified."
 msgstr "Saaja pole määratud."
 
-#: src/compose.c:2631
+#: src/compose.c:2650
 #, fuzzy
 msgid "Empty subject"
 msgstr "Pealkiri"
 
-#: src/compose.c:2632
+#: src/compose.c:2651
 msgid "Subject is empty. Send it anyway?"
 msgstr "Päälkiri on tühi. Kas saadame igal juhul?"
 
-#: src/compose.c:2691
+#: src/compose.c:2710
 msgid "can't get recipient list."
 msgstr "ei leia saajate nimistut."
 
-#: src/compose.c:2711
+#: src/compose.c:2730
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1641,22 +1642,22 @@ msgstr ""
 "Kirja saatmiseks pole määratud kasutajtunnust.\n"
 "Palun vali kirja konto enne saatmist."
 
-#: src/compose.c:2725 src/send_message.c:299
+#: src/compose.c:2744 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:2767
+#: src/compose.c:2786
 msgid "Can't save the message to outbox."
 msgstr "Kirja ei õnnestunud asetada väljunute kausta."
 
-#: src/compose.c:2805
+#: src/compose.c:2824
 #, 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:2902
+#: src/compose.c:2921
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1666,12 +1667,12 @@ msgstr ""
 "Ei suuda transleerida kirja tekstikoodi.\n"
 "Kas igatahes saata ?"
 
-#: src/compose.c:2908
+#: src/compose.c:2927
 #, fuzzy
 msgid "Code conversion error"
 msgstr "Aadressiraamatu uuendamise viga"
 
-#: src/compose.c:2981
+#: src/compose.c:3000
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1680,160 +1681,160 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:2985
+#: src/compose.c:3004
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3275
+#: src/compose.c:3294
 msgid "can't remove the old message\n"
 msgstr "Ei suuda eemaldada vana kirja\n"
 
-#: src/compose.c:3293
+#: src/compose.c:3312
 msgid "queueing message...\n"
 msgstr "Asetan kirja järjekorda...\n"
 
-#: src/compose.c:3375
+#: src/compose.c:3394
 msgid "can't find queue folder\n"
 msgstr "järjekorra kausta ei leidunud\n"
 
-#: src/compose.c:3382
+#: src/compose.c:3401
 msgid "can't queue the message\n"
 msgstr "Ei suutnud kirja järjekorda asetada\n"
 
-#: src/compose.c:3975
+#: src/compose.c:3994
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "Loodud Kirja-ID: %s\n"
 
-#: src/compose.c:4088
+#: src/compose.c:4107
 msgid "Creating compose window...\n"
 msgstr "Loon kirjutamise akent...\n"
 
-#: src/compose.c:4139 src/headerview.c:54
+#: src/compose.c:4158 src/headerview.c:54
 msgid "From:"
 msgstr "Kellelt:"
 
-#: src/compose.c:4213
+#: src/compose.c:4232
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/_Tööriist/Tegevused"
 
-#: src/compose.c:4216
+#: src/compose.c:4235
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/_Kiri/Krüpteeri"
 
-#: src/compose.c:4254 src/compose.c:5332
+#: src/compose.c:4273 src/compose.c:5351
 msgid "MIME type"
 msgstr "MIME tüüp"
 
 #. S_COL_DATE
-#: src/compose.c:4263 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4908
+#: src/compose.c:4282 src/mimeview.c:197 src/prefs_filter_edit.c:496
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4909
 msgid "Size"
 msgstr "Suurus"
 
-#: src/compose.c:4698 src/mainwindow.c:2359 src/prefs_account_dialog.c:528
+#: src/compose.c:4717 src/mainwindow.c:2359 src/prefs_account_dialog.c:528
 #: src/prefs_common_dialog.c:661
 msgid "Send"
 msgstr "Saada"
 
-#: src/compose.c:4699
+#: src/compose.c:4718
 msgid "Send message"
 msgstr "Saada kiri"
 
-#: src/compose.c:4707
+#: src/compose.c:4726
 msgid "Send later"
 msgstr "Hiljem"
 
-#: src/compose.c:4708
+#: src/compose.c:4727
 msgid "Put into queue folder and send later"
 msgstr "Pane järjekorda ja saada hiljem"
 
-#: src/compose.c:4716
+#: src/compose.c:4735
 msgid "Draft"
 msgstr "Mustand"
 
-#: src/compose.c:4717
+#: src/compose.c:4736
 msgid "Save to draft folder"
 msgstr "Salvesta mustandite kausta"
 
-#: src/compose.c:4727
+#: src/compose.c:4746
 msgid "Insert"
 msgstr "Lisa"
 
-#: src/compose.c:4728
+#: src/compose.c:4747
 msgid "Insert file"
 msgstr "Lisa fail"
 
-#: src/compose.c:4736
+#: src/compose.c:4755
 msgid "Attach"
 msgstr "Manusta"
 
-#: src/compose.c:4737
+#: src/compose.c:4756
 msgid "Attach file"
 msgstr "Manusta fail"
 
 #. signature
-#: src/compose.c:4747 src/prefs_account_dialog.c:1208
+#: src/compose.c:4766 src/prefs_account_dialog.c:1208
 #: src/prefs_common_dialog.c:953
 msgid "Signature"
 msgstr "Allkiri"
 
-#: src/compose.c:4748
+#: src/compose.c:4767
 #, fuzzy
 msgid "Append signature"
 msgstr "HALB allkiri"
 
 #. editor
-#: src/compose.c:4757 src/prefs_common_dialog.c:991
+#: src/compose.c:4776 src/prefs_common_dialog.c:991
 #: src/prefs_common_dialog.c:2315
 msgid "Editor"
 msgstr "Redaktor"
 
-#: src/compose.c:4758
+#: src/compose.c:4777
 msgid "Edit with external editor"
 msgstr "Redigeeri välise redaktoriga"
 
-#: src/compose.c:4766
+#: src/compose.c:4785
 msgid "Linewrap"
 msgstr "Reaäär"
 
-#: src/compose.c:4767
+#: src/compose.c:4786
 msgid "Wrap all long lines"
 msgstr "Murra kõik pikad read"
 
-#: src/compose.c:5228
+#: src/compose.c:5247
 msgid "Invalid MIME type."
 msgstr "Vale MIME tüüp."
 
-#: src/compose.c:5246
+#: src/compose.c:5265
 msgid "File doesn't exist or is empty."
 msgstr "Faili ei eksisteeri või on see tühi."
 
-#: src/compose.c:5314
+#: src/compose.c:5333
 #, fuzzy
 msgid "Properties"
 msgstr "Omadus"
 
-#: src/compose.c:5334 src/prefs_common_dialog.c:1444
+#: src/compose.c:5353 src/prefs_common_dialog.c:1444
 msgid "Encoding"
 msgstr "Kodeerimine"
 
-#: src/compose.c:5357 src/prefs_folder_item.c:202
+#: src/compose.c:5376 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Tee"
 
-#: src/compose.c:5358
+#: src/compose.c:5377
 msgid "File name"
 msgstr "Failinimi"
 
-#: src/compose.c:5449
+#: src/compose.c:5466
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Välise redaktori käsurida on vale: `%s'\n"
 
-#: src/compose.c:5497
+#: src/compose.c:5514
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1843,48 +1844,48 @@ msgstr ""
 "Kas hävitame protsessi?\n"
 "protsessi grupi id: %d"
 
-#: src/compose.c:5872 src/compose.c:5877 src/compose.c:5883
+#: src/compose.c:5889 src/compose.c:5894 src/compose.c:5900
 msgid "Can't queue the message."
 msgstr "Kirja ei õnnestunud järjekorda asetada."
 
-#: src/compose.c:5974
+#: src/compose.c:5991
 #, fuzzy
 msgid "Select files"
 msgstr "Määra fail"
 
-#: src/compose.c:5997
+#: src/compose.c:6014
 msgid "Select file"
 msgstr "Määra fail"
 
-#: src/compose.c:6032
+#: src/compose.c:6049
 #, fuzzy
 msgid "Save message"
 msgstr "Saada kiri"
 
-#: src/compose.c:6033
+#: src/compose.c:6050
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Seda kirja on muudetud. kas kaotame selle?"
 
-#: src/compose.c:6035
+#: src/compose.c:6052
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:6077
+#: src/compose.c:6094
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Kas te tahate seda malli lisada '%s'-e ?"
 
-#: src/compose.c:6079
+#: src/compose.c:6096
 msgid "Apply template"
 msgstr "Lisa mall"
 
-#: src/compose.c:6080
+#: src/compose.c:6097
 #, fuzzy
 msgid "_Replace"
 msgstr "Asenda"
 
-#: src/compose.c:6080
+#: src/compose.c:6097
 #, fuzzy
 msgid "_Insert"
 msgstr "Lisa"
@@ -2006,52 +2007,52 @@ msgstr "Grupi nimi peab olema antud."
 msgid "Edit Group Data"
 msgstr "Muuda grupi andmeid"
 
-#: src/editgroup.c:300
+#: src/editgroup.c:299
 msgid "Group Name"
 msgstr "Grupi nimi"
 
-#: src/editgroup.c:319
+#: src/editgroup.c:318
 msgid "Addresses in Group"
 msgstr "Aadress grupis"
 
-#: src/editgroup.c:321
+#: src/editgroup.c:320
 msgid " -> "
 msgstr " -> "
 
-#: src/editgroup.c:348
+#: src/editgroup.c:347
 msgid " <- "
 msgstr " <- "
 
-#: src/editgroup.c:350
+#: src/editgroup.c:349
 msgid "Available Addresses"
 msgstr "Olemasolevad aadressid"
 
-#: src/editgroup.c:416
+#: src/editgroup.c:415
 msgid "Move E-Mail Addresses to or from Group with arrow buttons"
 msgstr "Nihuta E-Posti aadressid gruppi või grupist kasutades nooleklahve"
 
-#: src/editgroup.c:468
+#: src/editgroup.c:467
 msgid "Edit Group Details"
 msgstr "Muuda grupi detaile"
 
-#: src/editgroup.c:471
+#: src/editgroup.c:470
 msgid "Add New Group"
 msgstr "Lisa uus grupp"
 
-#: src/editgroup.c:522
+#: src/editgroup.c:521
 msgid "Edit folder"
 msgstr "Redigeeri kausta"
 
-#: src/editgroup.c:522
+#: src/editgroup.c:521
 msgid "Input the new name of folder:"
 msgstr "Sisesta uus nimi või kaust:"
 
-#: src/editgroup.c:525 src/foldersel.c:541 src/folderview.c:2121
+#: src/editgroup.c:524 src/foldersel.c:541 src/folderview.c:2121
 #: src/folderview.c:2127
 msgid "New folder"
 msgstr "Uus kaust"
 
-#: src/editgroup.c:526 src/foldersel.c:542 src/folderview.c:2128
+#: src/editgroup.c:525 src/foldersel.c:542 src/folderview.c:2128
 msgid "Input the name of new folder:"
 msgstr "Sisesta uue kausta nimi:"
 
@@ -2249,7 +2250,7 @@ msgid "`%c' can't be included in folder name."
 msgstr "Sümbol `%c' ei saa olla lisatud kausta nimele."
 
 #: src/foldersel.c:561 src/folderview.c:2147 src/folderview.c:2206
-#: src/query_search.c:995
+#: src/query_search.c:1031
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Kaust %s on juba olemas."
@@ -2514,7 +2515,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:2127
+#: src/headerview.c:180 src/query_search.c:667 src/summaryview.c:2127
 msgid "(No From)"
 msgstr "(Eikelleltki)"
 
@@ -2644,192 +2645,192 @@ msgstr "Soome"
 msgid "Sylpheed: %d new messages"
 msgstr "Lõpetatud (%d uut kirja)"
 
-#: src/inc.c:372
+#: src/inc.c:371
 msgid "Retrieving new messages"
 msgstr "Võtan uusi kirju"
 
-#: src/inc.c:415
+#: src/inc.c:414
 msgid "Standby"
 msgstr "*Juures"
 
-#: src/inc.c:544 src/inc.c:593
+#: src/inc.c:543 src/inc.c:592
 msgid "Cancelled"
 msgstr "Katkestatud"
 
-#: src/inc.c:555
+#: src/inc.c:554
 msgid "Retrieving"
 msgstr "Tirin"
 
-#: src/inc.c:564
+#: src/inc.c:563
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "Valmis (%d kirja (%s)-st võetud)"
 
-#: src/inc.c:568
+#: src/inc.c:567
 msgid "Done (no new messages)"
 msgstr "Valmis (uusi kirju pole)"
 
-#: src/inc.c:574
+#: src/inc.c:573
 msgid "Connection failed"
 msgstr "Ühendus ebaõnnestus"
 
-#: src/inc.c:577
+#: src/inc.c:576
 msgid "Auth failed"
 msgstr "Autoriseerimine ebaõnnestus"
 
-#: src/inc.c:580
+#: src/inc.c:579
 msgid "Locked"
 msgstr "Lukustatud"
 
-#: src/inc.c:590
+#: src/inc.c:589
 #, fuzzy
 msgid "Timeout"
 msgstr "Ajalimiit (sek)"
 
-#: src/inc.c:640
+#: src/inc.c:639
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Lõpetatud (%d uut kirja)"
 
-#: src/inc.c:643
+#: src/inc.c:642
 msgid "Finished (no new messages)"
 msgstr "Lõpetatud (uusi kirju pole)"
 
-#: src/inc.c:652
+#: src/inc.c:651
 msgid "Some errors occurred while getting mail."
 msgstr "Tekksiid mõned vead kirjade võtmisel."
 
-#: src/inc.c:688
+#: src/inc.c:687
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "võtan uued kirjad kontolt %s...\n"
 
-#: src/inc.c:691
+#: src/inc.c:690
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Uute kirjade võtmine"
 
-#: src/inc.c:710
+#: src/inc.c:709
 #, fuzzy, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Ühendan POP3 serveriga: %s ..."
 
-#: src/inc.c:719
+#: src/inc.c:718
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Ei suuda ühenduda POP3 serveriga %s:%d\n"
 
-#: src/inc.c:798 src/send_message.c:631
+#: src/inc.c:797 src/send_message.c:631
 msgid "Authenticating..."
 msgstr "Autoriseerin..."
 
-#: src/inc.c:799
+#: src/inc.c:798
 #, fuzzy, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Võtan kirju %s-st ja panen %s-i...\n"
 
-#: src/inc.c:804
+#: src/inc.c:803
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Võtan uute kirjade arvu (STAT)..."
 
-#: src/inc.c:808
+#: src/inc.c:807
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Võtan uute kirjade arvu (STAT)..."
 
-#: src/inc.c:812
+#: src/inc.c:811
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Võtan uute kirjade arvu (UIDL)..."
 
-#: src/inc.c:816
+#: src/inc.c:815
 msgid "Getting the size of messages (LIST)..."
 msgstr "Võtan kirjade suuruse (LIST)..."
 
-#: src/inc.c:826
+#: src/inc.c:825
 #, c-format
 msgid "Deleting message %d"
 msgstr "Kustutan kirja %d"
 
-#: src/inc.c:833 src/send_message.c:649
+#: src/inc.c:832 src/send_message.c:649
 msgid "Quitting"
 msgstr "Väljun"
 
-#: src/inc.c:858
+#: src/inc.c:857
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Võtan kirja (%d /%d) (%s / %s)"
 
-#: src/inc.c:879
+#: src/inc.c:878
 #, fuzzy, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Valmis (%d kirja (%s)-st võetud)"
 
-#: src/inc.c:1107
+#: src/inc.c:1106
 #, fuzzy
 msgid "Connection failed."
 msgstr "Ühendus ebaõnnestus"
 
-#: src/inc.c:1113
+#: src/inc.c:1112
 msgid "Error occurred while processing mail."
 msgstr "Tekkis viga kirja protsessimisel."
 
-#: src/inc.c:1118
+#: src/inc.c:1117
 #, fuzzy, c-format
 msgid ""
 "Error occurred while processing mail:\n"
 "%s"
 msgstr "Tekkis viga kirja protsessimisel."
 
-#: src/inc.c:1124
+#: src/inc.c:1123
 msgid "No disk space left."
 msgstr "Ketas täis."
 
-#: src/inc.c:1129
+#: src/inc.c:1128
 #, fuzzy
 msgid "Can't write file."
 msgstr "Ei saa kirjutada faili.\n"
 
-#: src/inc.c:1134
+#: src/inc.c:1133
 #, fuzzy
 msgid "Socket error."
 msgstr "Soketi viga\n"
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1140 src/send_message.c:584 src/send_message.c:772
+#: src/inc.c:1139 src/send_message.c:584 src/send_message.c:772
 msgid "Connection closed by the remote host."
 msgstr ""
 
-#: src/inc.c:1146
+#: src/inc.c:1145
 msgid "Mailbox is locked."
 msgstr "Kirjakast on lukus."
 
-#: src/inc.c:1150
+#: src/inc.c:1149
 #, fuzzy, c-format
 msgid ""
 "Mailbox is locked:\n"
 "%s"
 msgstr "Kirjakast on lukus."
 
-#: src/inc.c:1156 src/send_message.c:757
+#: src/inc.c:1155 src/send_message.c:757
 #, fuzzy
 msgid "Authentication failed."
 msgstr "Autoriseerimise meetod"
 
-#: src/inc.c:1161 src/send_message.c:760
+#: src/inc.c:1160 src/send_message.c:760
 #, fuzzy, c-format
 msgid ""
 "Authentication failed:\n"
 "%s"
 msgstr "Autoriseerimise meetod"
 
-#: src/inc.c:1166 src/send_message.c:776
+#: src/inc.c:1165 src/send_message.c:776
 msgid "Session timed out."
 msgstr ""
 
-#: src/inc.c:1202
+#: src/inc.c:1201
 msgid "Incorporation cancelled\n"
 msgstr "Sissekanne peatatud\n"
 
-#: src/inc.c:1285
+#: src/inc.c:1284
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Võtame uued teated %s-ist %s-i.\n"
@@ -3315,14 +3316,15 @@ msgid "/_View/Mess_age source"
 msgstr "/_Vaade/Näita kirja lähtekoodi"
 
 #: src/mainwindow.c:708 src/messageview.c:245
-msgid "/_View/Show all _header"
+#, fuzzy
+msgid "/_View/Show all _headers"
 msgstr "/_Vaade/Näita ko_gu päist"
 
 #: src/mainwindow.c:710
 msgid "/_View/_Update summary"
 msgstr "/_Vaade/_Uuenda koond"
 
-#: src/mainwindow.c:712 src/messageview.c:247
+#: src/mainwindow.c:712 src/messageview.c:248
 msgid "/_Message"
 msgstr "/_Kiri"
 
@@ -3357,16 +3359,16 @@ msgstr "/_Kiri/_Saada järjekorras olevad kirjad"
 
 #: src/mainwindow.c:722 src/mainwindow.c:724 src/mainwindow.c:731
 #: src/mainwindow.c:736 src/mainwindow.c:739 src/mainwindow.c:750
-#: src/mainwindow.c:752 src/mainwindow.c:755 src/messageview.c:250
-#: src/messageview.c:258 src/messageview.c:263
+#: src/mainwindow.c:752 src/mainwindow.c:755 src/messageview.c:251
+#: src/messageview.c:259 src/messageview.c:264
 msgid "/_Message/---"
 msgstr "/_Kiri/---"
 
-#: src/mainwindow.c:723 src/messageview.c:248
+#: src/mainwindow.c:723 src/messageview.c:249
 msgid "/_Message/Compose _new message"
 msgstr "/_Kiri/Uus k_iri"
 
-#: src/mainwindow.c:725 src/messageview.c:251
+#: src/mainwindow.c:725 src/messageview.c:252
 msgid "/_Message/_Reply"
 msgstr "/_Kiri/_Vasta"
 
@@ -3374,27 +3376,27 @@ msgstr "/_Kiri/_Vasta"
 msgid "/_Message/Repl_y to"
 msgstr "/_Kiri/_Vasta"
 
-#: src/mainwindow.c:727 src/messageview.c:252
+#: src/mainwindow.c:727 src/messageview.c:253
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Kiri/Vasta/k_õigile"
 
-#: src/mainwindow.c:728 src/messageview.c:254
+#: src/mainwindow.c:728 src/messageview.c:255
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Kiri/Vas_ta/_saatjale"
 
-#: src/mainwindow.c:729 src/messageview.c:256
+#: src/mainwindow.c:729 src/messageview.c:257
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Kiri/Vasta/kirja _listi"
 
-#: src/mainwindow.c:732 src/messageview.c:259
+#: src/mainwindow.c:732 src/messageview.c:260
 msgid "/_Message/_Forward"
 msgstr "/_Kiri/Saada _edasi"
 
-#: src/mainwindow.c:733 src/messageview.c:260
+#: src/mainwindow.c:733 src/messageview.c:261
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Kiri/Saada edasi _manusena"
 
-#: src/mainwindow.c:735 src/messageview.c:262
+#: src/mainwindow.c:735 src/messageview.c:263
 msgid "/_Message/Redirec_t"
 msgstr "/_Kiri/Suuna _ümber"
 
@@ -3453,7 +3455,7 @@ msgstr "/_Kiri/Võta _uued kirjad"
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/_Kiri/Võta _uued kirjad"
 
-#: src/mainwindow.c:756 src/messageview.c:264
+#: src/mainwindow.c:756 src/messageview.c:265
 msgid "/_Message/Re-_edit"
 msgstr "/_Kiri/Kirjuta _ümber"
 
@@ -3472,23 +3474,23 @@ msgstr "/_Tööriist/_Filtreeri kirjad"
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Tööriist/_Filtreeri kirjad"
 
-#: src/mainwindow.c:767 src/messageview.c:271
+#: src/mainwindow.c:767 src/messageview.c:272
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Tööriist/Loo filtri reeglistik"
 
-#: src/mainwindow.c:768 src/messageview.c:273
+#: src/mainwindow.c:768 src/messageview.c:274
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Tööriist/Loo filtri reeglistik/Automaatselt"
 
-#: src/mainwindow.c:770 src/messageview.c:275
+#: src/mainwindow.c:770 src/messageview.c:276
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Tööriist/Loo filtri reeglistik/ kasutades Kellelt"
 
-#: src/mainwindow.c:772 src/messageview.c:277
+#: src/mainwindow.c:772 src/messageview.c:278
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Tööriist/Loo filtri reeglistik/kasutades Kellele"
 
-#: src/mainwindow.c:774 src/messageview.c:279
+#: src/mainwindow.c:774 src/messageview.c:280
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Tööriist/Loo filtri reeglistik/ kasutades päälkirja"
 
@@ -3609,7 +3611,7 @@ msgid "MainWindow: color allocation %d failed\n"
 msgstr "PeaAken: värvi haldamine %d ebaõnnestus\n"
 
 #: src/mainwindow.c:1139 src/summaryview.c:2275 src/summaryview.c:2360
-#: src/summaryview.c:3907 src/summaryview.c:4036 src/summaryview.c:4394
+#: src/summaryview.c:3908 src/summaryview.c:4037 src/summaryview.c:4395
 msgid "done.\n"
 msgstr "tehtud.\n"
 
@@ -3873,7 +3875,7 @@ msgid "Find text:"
 msgstr "Otsi teksti:"
 
 #: src/message_search.c:153 src/prefs_search_folder.c:253
-#: src/query_search.c:326
+#: src/query_search.c:343
 msgid "Case sensitive"
 msgstr "Tõstutundlik"
 
@@ -3897,27 +3899,27 @@ msgstr "Jõudsin kirja lõppu; kas alustan algusest?"
 msgid "Search finished"
 msgstr "Otsimine lõpetatud"
 
-#: src/messageview.c:268
+#: src/messageview.c:269
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/_Tööriist/Lisa saatja aadressi raamatusse"
 
-#: src/messageview.c:300
+#: src/messageview.c:301
 msgid "Creating message view...\n"
 msgstr "Loon kirja vaate...\n"
 
-#: src/messageview.c:325
+#: src/messageview.c:326
 msgid "Text"
 msgstr "Tekst"
 
-#: src/messageview.c:330
+#: src/messageview.c:331
 msgid "Attachments"
 msgstr "Manused"
 
-#: src/messageview.c:380
+#: src/messageview.c:381
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:699 src/summaryview.c:3436
+#: src/messageview.c:700 src/summaryview.c:3436
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Ei suuda faili '%s' salvestada."
@@ -3935,7 +3937,7 @@ msgstr "Käivita"
 msgid "Print"
 msgstr "Trüki"
 
-#: src/messageview.c:770 src/summaryview.c:3471
+#: src/messageview.c:769 src/summaryview.c:3470
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -4035,11 +4037,11 @@ msgstr ""
 "Faili avamiseks sisesta käsurida:\n"
 "(%s asendatakse failinimega)"
 
-#: src/mimeview.c:1147
+#: src/mimeview.c:1140
 msgid "Opening executable file"
 msgstr ""
 
-#: src/mimeview.c:1148
+#: src/mimeview.c:1141
 msgid ""
 "This is an executable file. Opening executable file is restricted for "
 "security.\n"
@@ -4047,11 +4049,6 @@ msgid ""
 "virus or something like a malicious program."
 msgstr ""
 
-#: src/mimeview.c:1184
-#, c-format
-msgid "MIME viewer command line is invalid: `%s'"
-msgstr "MIME vaataja käsurida pole õige: %s"
-
 #: src/passphrase.c:96
 msgid "Passphrase"
 msgstr "Paroolifraas"
@@ -5856,21 +5853,21 @@ msgstr "Vastus saata"
 msgid "%s - Edit search condition"
 msgstr ""
 
-#: src/prefs_search_folder.c:209 src/query_search.c:257
+#: src/prefs_search_folder.c:209 src/query_search.c:274
 msgid "Match any of the following"
 msgstr ""
 
-#: src/prefs_search_folder.c:211 src/query_search.c:259
+#: src/prefs_search_folder.c:211 src/query_search.c:276
 #, fuzzy
 msgid "Match all of the following"
 msgstr "Säti järgmised aadressid automaatselt"
 
-#: src/prefs_search_folder.c:231 src/query_search.c:303
+#: src/prefs_search_folder.c:231 src/query_search.c:320
 #, fuzzy
 msgid "Folder:"
 msgstr "Kaust"
 
-#: src/prefs_search_folder.c:248 src/query_search.c:321
+#: src/prefs_search_folder.c:248 src/query_search.c:338
 #, fuzzy
 msgid "Search subfolders"
 msgstr "Kataloogist otsimine"
@@ -5885,17 +5882,17 @@ msgid "Attachment"
 msgstr "Manus"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73 src/query_search.c:371 src/summaryview.c:4901
+#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4902
 msgid "Subject"
 msgstr "Pealkiri"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/query_search.c:372 src/summaryview.c:4904
+#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4905
 msgid "From"
 msgstr "Kellelt"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/query_search.c:373 src/summaryview.c:4906
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:4907
 msgid "Date"
 msgstr "Kuupäev"
 
@@ -5988,44 +5985,44 @@ msgstr "Loon progressi dialoogi...\n"
 msgid "Status"
 msgstr "Staatus"
 
-#: src/query_search.c:234
+#: src/query_search.c:251
 msgid "Search messages"
 msgstr "Otsi kirju"
 
-#: src/query_search.c:395
+#: src/query_search.c:423
 #, fuzzy
 msgid "_Save as search folder"
 msgstr "Kataloogist otsimine"
 
-#: src/query_search.c:512 src/subscribedialog.c:526 src/summaryview.c:842
+#: src/query_search.c:542 src/subscribedialog.c:526 src/summaryview.c:842
 msgid "Done."
 msgstr "Tehtud."
 
-#: src/query_search.c:536
+#: src/query_search.c:566
 #, fuzzy, c-format
 msgid "Searching %s ..."
 msgstr "Tuhnin kaustas %s ..."
 
-#: src/query_search.c:564
+#: src/query_search.c:594
 #, fuzzy, c-format
 msgid "Searching %s (%d / %d)..."
 msgstr "Filtreerin..."
 
-#: src/query_search.c:645 src/summaryview.c:2051
+#: src/query_search.c:675 src/summaryview.c:2051
 msgid "(No Date)"
 msgstr "(Kuupäeva pole)"
 
-#: src/query_search.c:833
+#: src/query_search.c:869
 #, fuzzy
 msgid "Save as search folder"
 msgstr "Kataloogist otsimine"
 
-#: src/query_search.c:854
+#: src/query_search.c:890
 #, fuzzy
 msgid "Location:"
 msgstr "Tsiteerimine"
 
-#: src/query_search.c:869
+#: src/query_search.c:905
 #, fuzzy
 msgid "Folder name:"
 msgstr "Failinimi"
@@ -6657,38 +6654,38 @@ msgstr "Kiri %d on määratud kopeerimisele %s-i\n"
 msgid "Destination for copy is same as current folder."
 msgstr "Kopeerimise sihtpunkt on sama mis aktiivne kaust."
 
-#: src/summaryview.c:3506
+#: src/summaryview.c:3507
 #, fuzzy
 msgid "Error occurred while processing messages."
 msgstr "Tekkis viga kirja protsessimisel."
 
-#: src/summaryview.c:3814 src/summaryview.c:3815
+#: src/summaryview.c:3815 src/summaryview.c:3816
 msgid "Building threads..."
 msgstr "Loon teemad..."
 
-#: src/summaryview.c:3965 src/summaryview.c:3966
+#: src/summaryview.c:3966 src/summaryview.c:3967
 msgid "Unthreading..."
 msgstr "Eemaldan teemad..."
 
-#: src/summaryview.c:4259 src/summaryview.c:4315
+#: src/summaryview.c:4260 src/summaryview.c:4316
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtreerin..."
 
-#: src/summaryview.c:4364
+#: src/summaryview.c:4365
 msgid "filtering..."
 msgstr "filtreerin..."
 
-#: src/summaryview.c:4365
+#: src/summaryview.c:4366
 msgid "Filtering..."
 msgstr "Filtreerin..."
 
-#: src/summaryview.c:4401
+#: src/summaryview.c:4402
 #, fuzzy, c-format
 msgid "%d message(s) have been filtered."
 msgstr "kiri %d on juba salvestatud.\n"
 
-#: src/summaryview.c:4910
+#: src/summaryview.c:4911
 msgid "No."
 msgstr "Ei."
 
@@ -6778,6 +6775,9 @@ msgstr "Välju"
 msgid "Sylpheed"
 msgstr "Vana Sylpheed"
 
+#~ msgid "MIME viewer command line is invalid: `%s'"
+#~ msgstr "MIME vaataja käsurida pole õige: %s"
+
 #~ msgid "Wrap before sending"
 #~ msgstr "Äärista enne saatmist"
 
diff --git a/po/fr.po b/po/fr.po
index 1000f744..b26514a0 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-03-02 19:03+0900\n"
+"POT-Creation-Date: 2006-03-10 16:06+0900\n"
 "PO-Revision-Date: 2006-02-23 00:32+0100\n"
 "Last-Translator: Nicolas Boos <nicolas.boos@wanadoo.fr>\n"
 "Language-Team: French <traduc@traduc.org>\n"
@@ -516,7 +516,7 @@ msgstr "Trouvé : %s\n"
 msgid "Configuration is saved.\n"
 msgstr "La configuration est enregistrée.\n"
 
-#: libsylph/prefs_common.c:491
+#: libsylph/prefs_common.c:496
 msgid "Junk mail filter"
 msgstr "Dossier des messages indésirables"
 
@@ -533,7 +533,7 @@ msgstr "Impossible d'ouvrir le fichier des marques\n"
 msgid "can't fetch message %d\n"
 msgstr "impossible de récupérer le message %d\n"
 
-#: libsylph/procmsg.c:1375
+#: libsylph/procmsg.c:1378
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "La ligne de commande d'impression est invalide : « %s »\n"
@@ -612,12 +612,12 @@ msgstr "  Sujet : %s\n"
 msgid "  Issuer: %s\n"
 msgstr "  Délivré par : %s\n"
 
-#: libsylph/utils.c:2411 src/compose.c:2869 src/compose.c:3132
-#: src/compose.c:3195 src/compose.c:3315
+#: libsylph/utils.c:2430 src/compose.c:2888 src/compose.c:3151
+#: src/compose.c:3214 src/compose.c:3334
 msgid "can't change file mode\n"
 msgstr "impossible de modifier les droits d'accès du fichier\n"
 
-#: libsylph/utils.c:2418 libsylph/utils.c:2542
+#: libsylph/utils.c:2437 libsylph/utils.c:2561
 #, c-format
 msgid "writing to %s failed.\n"
 msgstr "L'écriture dans %s a échoué.\n"
@@ -700,8 +700,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:493
-#: src/compose.c:4273 src/editaddress.c:200 src/editaddress.c:942
+#: src/account_dialog.c:366 src/addressadd.c:192 src/addressbook.c:491
+#: src/compose.c:4292 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 "Argument de l'action"
 msgid "Add Address to Book"
 msgstr "Ajouter l'adresse au carnet"
 
-#: src/addressadd.c:202 src/compose.c:4777 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4796 src/editaddress.c:201
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "Adresse"
 
-#: src/addressadd.c:212 src/addressbook.c:495 src/editaddress.c:202
+#: src/addressadd.c:212 src/addressbook.c:493 src/editaddress.c:202
 #: src/editaddress.c:795 src/editaddress.c:860 src/editgroup.c:267
 msgid "Remarks"
 msgstr "Remarques"
@@ -851,110 +851,111 @@ msgstr "Remarques"
 msgid "Select Address Book Folder"
 msgstr "Choisissez un dossier"
 
-#: src/addressbook.c:338 src/compose.c:515 src/mainwindow.c:489
+#: src/addressbook.c:337 src/compose.c:515 src/mainwindow.c:489
 #: src/messageview.c:140
 msgid "/_File"
 msgstr "/_Fichier"
 
-#: src/addressbook.c:339
+#: src/addressbook.c:338
 msgid "/_File/New _Book"
 msgstr "/_Fichier/Nouveau _carnet d'adresses"
 
-#: src/addressbook.c:340
+#: src/addressbook.c:339
 msgid "/_File/New _vCard"
 msgstr "/_Fichier/Nouveau carnet _vCard"
 
-#: src/addressbook.c:342
+#: src/addressbook.c:341
 msgid "/_File/New _JPilot"
 msgstr "/_Fichier/Nouveau carnet _JPilot"
 
-#: src/addressbook.c:345
-msgid "/_File/New _Server"
+#: src/addressbook.c:344
+#, fuzzy
+msgid "/_File/New _LDAP Server"
 msgstr "/_Fichier/Nouveau _serveur LDAP"
 
-#: src/addressbook.c:347 src/addressbook.c:350 src/compose.c:520
+#: src/addressbook.c:346 src/addressbook.c:349 src/compose.c:520
 #: src/compose.c:525 src/compose.c:528 src/compose.c:531 src/mainwindow.c:507
 #: src/mainwindow.c:510 src/mainwindow.c:512 src/mainwindow.c:515
 #: src/mainwindow.c:517 src/messageview.c:143
 msgid "/_File/---"
 msgstr "/_Fichier/---"
 
-#: src/addressbook.c:348
+#: src/addressbook.c:347
 msgid "/_File/_Edit"
 msgstr "/_Fichier/Édit_er"
 
-#: src/addressbook.c:349
+#: src/addressbook.c:348
 msgid "/_File/_Delete"
 msgstr "/_Fichier/_Supprimer"
 
-#: src/addressbook.c:351
+#: src/addressbook.c:350
 msgid "/_File/_Save"
 msgstr "/_Fichier/En_registrer"
 
-#: src/addressbook.c:352 src/compose.c:532 src/messageview.c:144
+#: src/addressbook.c:351 src/compose.c:532 src/messageview.c:144
 msgid "/_File/_Close"
 msgstr "/_Fichier/_Fermer"
 
-#: src/addressbook.c:353
+#: src/addressbook.c:352
 msgid "/_Address"
 msgstr "/_Adresse"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:353
 msgid "/_Address/New _Address"
 msgstr "/_Adresse/Nouvelle _adresse"
 
-#: src/addressbook.c:355
+#: src/addressbook.c:354
 msgid "/_Address/New _Group"
 msgstr "/_Adresse/Nouveau _groupe"
 
-#: src/addressbook.c:356
+#: src/addressbook.c:355
 msgid "/_Address/New _Folder"
 msgstr "/_Adresse/Nouveau _dossier"
 
-#: src/addressbook.c:357
+#: src/addressbook.c:356
 msgid "/_Address/---"
 msgstr "/_Adresse/---"
 
-#: src/addressbook.c:358
+#: src/addressbook.c:357
 msgid "/_Address/_Edit"
 msgstr "/_Adresse/Édit_er"
 
-#: src/addressbook.c:359
+#: src/addressbook.c:358
 msgid "/_Address/_Delete"
 msgstr "/_Adresse/_Supprimer"
 
-#: src/addressbook.c:360 src/compose.c:645 src/mainwindow.c:758
-#: src/messageview.c:266
+#: src/addressbook.c:359 src/compose.c:645 src/mainwindow.c:758
+#: src/messageview.c:267
 msgid "/_Tools"
 msgstr "/_Outils"
 
-#: src/addressbook.c:361
+#: src/addressbook.c:360
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Outils/Importer un fichier _LDIF"
 
-#: src/addressbook.c:362 src/compose.c:666 src/mainwindow.c:812
-#: src/messageview.c:286
+#: src/addressbook.c:361 src/compose.c:666 src/mainwindow.c:812
+#: src/messageview.c:287
 msgid "/_Help"
 msgstr "/A_ide"
 
-#: src/addressbook.c:363 src/compose.c:667 src/mainwindow.c:824
-#: src/messageview.c:287
+#: src/addressbook.c:362 src/compose.c:667 src/mainwindow.c:824
+#: src/messageview.c:288
 msgid "/_Help/_About"
 msgstr "/A_ide/À _propos"
 
-#: src/addressbook.c:382 src/addressbook.c:392
+#: src/addressbook.c:381 src/addressbook.c:391
 msgid "/New _Address"
 msgstr "/Nouvelle _adresse"
 
-#: src/addressbook.c:383 src/addressbook.c:393
+#: src/addressbook.c:382 src/addressbook.c:392
 msgid "/New _Group"
 msgstr "/Nouveau _groupe"
 
-#: src/addressbook.c:384 src/addressbook.c:394
+#: src/addressbook.c:383 src/addressbook.c:393
 msgid "/New _Folder"
 msgstr "/Nouveau _dossier"
 
-#: src/addressbook.c:385 src/addressbook.c:395 src/compose.c:509
+#: src/addressbook.c:384 src/addressbook.c:394 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
@@ -964,70 +965,70 @@ msgstr "/Nouveau _dossier"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:386 src/addressbook.c:396 src/compose.c:534
+#: src/addressbook.c:385 src/addressbook.c:395 src/compose.c:534
 #: src/mainwindow.c:521 src/messageview.c:146
 msgid "/_Edit"
 msgstr "/É_dition"
 
-#: src/addressbook.c:387 src/addressbook.c:397 src/summaryview.c:434
+#: src/addressbook.c:386 src/addressbook.c:396 src/summaryview.c:434
 msgid "/_Delete"
 msgstr "/_Supprimer"
 
-#: src/addressbook.c:494
+#: src/addressbook.c:492
 msgid "E-Mail address"
 msgstr "Adresse électronique"
 
-#: src/addressbook.c:498 src/compose.c:4778 src/prefs_common_dialog.c:2183
+#: src/addressbook.c:496 src/compose.c:4797 src/prefs_common_dialog.c:2183
 msgid "Address book"
 msgstr "Carnet d'adresses"
 
-#: src/addressbook.c:600 src/prefs_filter_edit.c:249
+#: src/addressbook.c:603 src/prefs_filter_edit.c:249
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "Nom :"
 
 #. Buttons
-#: src/addressbook.c:632 src/addressbook.c:1684 src/editaddress.c:884
+#: src/addressbook.c:636 src/addressbook.c:1678 src/editaddress.c:884
 #: src/editaddress.c:1017 src/mainwindow.c:2426 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:635 src/editaddress.c:890 src/editaddress.c:1023
+#: src/addressbook.c:639 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:1552
 msgid "Add"
 msgstr "Ajouter"
 
-#: src/addressbook.c:638
+#: src/addressbook.c:642
 msgid "Lookup"
 msgstr "Rechercher"
 
-#: src/addressbook.c:650 src/headerview.c:55 src/prefs_folder_item.c:339
+#: src/addressbook.c:654 src/headerview.c:55 src/prefs_folder_item.c:339
 #: src/prefs_template.c:176
 msgid "To:"
 msgstr "À :"
 
-#: src/addressbook.c:654 src/prefs_folder_item.c:356 src/prefs_template.c:178
+#: src/addressbook.c:658 src/prefs_folder_item.c:356 src/prefs_template.c:178
 msgid "Cc:"
 msgstr "Copie :"
 
-#: src/addressbook.c:658 src/prefs_folder_item.c:367
+#: src/addressbook.c:662 src/prefs_folder_item.c:367
 msgid "Bcc:"
 msgstr "Copie discrète :"
 
 #. Confirm deletion
-#: src/addressbook.c:845
+#: src/addressbook.c:832
 msgid "Delete address(es)"
 msgstr "Suppression d'adresse(s)"
 
-#: src/addressbook.c:846
+#: src/addressbook.c:833
 msgid "Really delete the address(es)?"
 msgstr "Voulez-vous supprimer la(les) adresse(s) sélectionnée(s) ?"
 
-#: src/addressbook.c:1675
+#: src/addressbook.c:1669
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1037,37 +1038,37 @@ msgstr ""
 "Si vous supprimez uniquement le dossier, les adresses seront déplacées dans "
 "le dossier parent."
 
-#: src/addressbook.c:1678 src/folderview.c:2372
+#: src/addressbook.c:1672 src/folderview.c:2372
 msgid "Delete folder"
 msgstr "Suppression de dossier"
 
-#: src/addressbook.c:1678
+#: src/addressbook.c:1672
 msgid "_Folder only"
 msgstr "_Dossier uniquement"
 
-#: src/addressbook.c:1678
+#: src/addressbook.c:1672
 msgid "Folder and _addresses"
 msgstr "Dossier et _adresses"
 
-#: src/addressbook.c:1683
+#: src/addressbook.c:1677
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Voulez-vous vraiment supprimer « %s » ?"
 
-#: src/addressbook.c:2369 src/addressbook.c:2502
+#: src/addressbook.c:2363 src/addressbook.c:2496
 msgid "New user, could not save index file."
 msgstr "Nouvel utilisateur. Impossible d'enregistrer le fichier index."
 
-#: src/addressbook.c:2373 src/addressbook.c:2506
+#: src/addressbook.c:2367 src/addressbook.c:2500
 msgid "New user, could not save address book files."
 msgstr ""
 "Nouvel utilisateur, impossible d'enregistrer le fichier carnet d'adresses."
 
-#: src/addressbook.c:2383 src/addressbook.c:2516
+#: src/addressbook.c:2377 src/addressbook.c:2510
 msgid "Old address book converted successfully."
 msgstr "Ancien carnet d'adresses converti avec succès."
 
-#: src/addressbook.c:2388
+#: src/addressbook.c:2382
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1075,7 +1076,7 @@ msgstr ""
 "Ancien carnet d'adresses converti,\n"
 "mais impossible d'enregistrer le nouveau fichier index."
 
-#: src/addressbook.c:2401
+#: src/addressbook.c:2395
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1083,7 +1084,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:2407
+#: src/addressbook.c:2401
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1091,7 +1092,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:2412
+#: src/addressbook.c:2406
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1099,92 +1100,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:2419
+#: src/addressbook.c:2413
 msgid "Addressbook conversion error"
 msgstr "Erreur de conversion du carnet d'adresses"
 
-#: src/addressbook.c:2423
+#: src/addressbook.c:2417
 msgid "Addressbook conversion"
 msgstr "Conversion de carnets d'adresses"
 
-#: src/addressbook.c:2458
+#: src/addressbook.c:2452
 msgid "Addressbook Error"
 msgstr "Erreur dans le carnet d'adresses"
 
-#: src/addressbook.c:2459 src/addressbook.c:2559
+#: src/addressbook.c:2453 src/addressbook.c:2553
 msgid "Could not read address index"
 msgstr "Échec lors de la lecture de l'index des adresses"
 
-#: src/addressbook.c:2521
+#: src/addressbook.c:2515
 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:2535
+#: src/addressbook.c:2529
 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:2541
+#: src/addressbook.c:2535
 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:2547
+#: src/addressbook.c:2541
 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:2565
+#: src/addressbook.c:2559
 msgid "Addressbook Conversion Error"
 msgstr "Erreur de conversion du carnet d'adresses"
 
-#: src/addressbook.c:2571
+#: src/addressbook.c:2565
 msgid "Addressbook Conversion"
 msgstr "Conversion de carnets d'adresses"
 
-#: src/addressbook.c:3086 src/prefs_common_dialog.c:2033
+#: src/addressbook.c:3080 src/prefs_common_dialog.c:2033
 msgid "Interface"
 msgstr "Interface"
 
-#: src/addressbook.c:3102 src/importldif.c:514
+#: src/addressbook.c:3096 src/importldif.c:514
 msgid "Address Book"
 msgstr "Carnet d'adresses"
 
-#: src/addressbook.c:3118
+#: src/addressbook.c:3112
 msgid "Person"
 msgstr "Personne"
 
-#: src/addressbook.c:3134
+#: src/addressbook.c:3128
 msgid "EMail Address"
 msgstr "Adresse électronique"
 
-#: src/addressbook.c:3150
+#: src/addressbook.c:3144
 msgid "Group"
 msgstr "Groupe"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3166 src/folderview.c:367 src/prefs_account_dialog.c:1694
-#: src/query_search.c:370
+#: src/addressbook.c:3160 src/folderview.c:367 src/prefs_account_dialog.c:1694
+#: src/query_search.c:398
 msgid "Folder"
 msgstr "Dossier"
 
-#: src/addressbook.c:3182
+#: src/addressbook.c:3176
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3198 src/addressbook.c:3214
+#: src/addressbook.c:3192 src/addressbook.c:3208
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3230
+#: src/addressbook.c:3224
 msgid "LDAP Server"
 msgstr "Serveur LDAP"
 
@@ -1196,7 +1197,7 @@ msgstr "Adresse courante :"
 msgid "Personal address"
 msgstr "Adresse personnelle :"
 
-#: src/alertpanel.c:142 src/compose.c:5500 src/main.c:621
+#: src/alertpanel.c:142 src/compose.c:5517 src/main.c:621
 msgid "Notice"
 msgstr "Information"
 
@@ -1204,7 +1205,7 @@ msgstr "Information"
 msgid "Warning"
 msgstr "Avertissement"
 
-#: src/alertpanel.c:168 src/inc.c:587
+#: src/alertpanel.c:168 src/inc.c:586
 msgid "Error"
 msgstr "Erreur"
 
@@ -1247,7 +1248,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:4761
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4762
 msgid "None"
 msgstr "Aucun"
 
@@ -1493,7 +1494,7 @@ msgstr "/_Affichage/_Jeu de caractères/Thaï (TIS-620)"
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Affichage/_Jeu de caractères/Thaï (Windows-874)"
 
-#: src/compose.c:646 src/mainwindow.c:759 src/messageview.c:267
+#: src/compose.c:646 src/mainwindow.c:759 src/messageview.c:268
 msgid "/_Tools/_Address book"
 msgstr "/_Outils/_Carnet d'adresses"
 
@@ -1501,14 +1502,14 @@ msgstr "/_Outils/_Carnet d'adresses"
 msgid "/_Tools/_Template"
 msgstr "/_Outils/_Modèle"
 
-#: src/compose.c:649 src/mainwindow.c:783 src/messageview.c:283
+#: src/compose.c:649 src/mainwindow.c:783 src/messageview.c:284
 msgid "/_Tools/Actio_ns"
 msgstr "/_Outils/_Actions"
 
 #: src/compose.c:651 src/compose.c:655 src/compose.c:661 src/mainwindow.c:762
 #: src/mainwindow.c:776 src/mainwindow.c:781 src/mainwindow.c:784
-#: src/mainwindow.c:788 src/mainwindow.c:790 src/messageview.c:270
-#: src/messageview.c:282
+#: src/mainwindow.c:788 src/mainwindow.c:790 src/messageview.c:271
+#: src/messageview.c:283
 msgid "/_Tools/---"
 msgstr "/_Outils/---"
 
@@ -1532,81 +1533,81 @@ msgstr "/_Outils/_Vérifier l'orthographe"
 msgid "/_Tools/_Set spell language"
 msgstr "/_Outils/_Définir la langue du message"
 
-#: src/compose.c:910
+#: src/compose.c:912
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s : le fichier n'existe pas\n"
 
-#: src/compose.c:1014 src/compose.c:1085
+#: src/compose.c:1016 src/compose.c:1087
 msgid "Can't get text part\n"
 msgstr "Impossible d'obtenir la partie texte\n"
 
-#: src/compose.c:1486
+#: src/compose.c:1488
 msgid "Quote mark format error."
 msgstr "Erreur du format de citation."
 
-#: src/compose.c:1498
+#: src/compose.c:1500
 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:1918
+#: src/compose.c:1935
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Le fichier %s n'existe pas\n"
 
-#: src/compose.c:1922
+#: src/compose.c:1939
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Impossible d'obtenir la taille de %s\n"
 
-#: src/compose.c:1926
+#: src/compose.c:1943
 #, c-format
 msgid "File %s is empty."
 msgstr "Le fichier %s est vide."
 
-#: src/compose.c:1930
+#: src/compose.c:1947
 #, c-format
 msgid "Can't read %s."
 msgstr "Impossible de lire %s."
 
-#: src/compose.c:1963
+#: src/compose.c:1980
 #, c-format
 msgid "Message: %s"
 msgstr "Message : %s"
 
-#: src/compose.c:2023 src/mimeview.c:565
+#: src/compose.c:2040 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:2507 src/headerview.c:195 src/query_search.c:636
+#: src/compose.c:2524 src/headerview.c:195 src/query_search.c:666
 #: src/summaryview.c:2124
 msgid "(No Subject)"
 msgstr "(Pas de sujet)"
 
-#: src/compose.c:2510
+#: src/compose.c:2527
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Composition%s"
 
-#: src/compose.c:2623
+#: src/compose.c:2642
 msgid "Recipient is not specified."
 msgstr "Destinataire non spécifié."
 
-#: src/compose.c:2631
+#: src/compose.c:2650
 msgid "Empty subject"
 msgstr "Sujet absent"
 
-#: src/compose.c:2632
+#: src/compose.c:2651
 msgid "Subject is empty. Send it anyway?"
 msgstr "Le sujet est vide. Envoyer malgré cela ?"
 
-#: src/compose.c:2691
+#: src/compose.c:2710
 msgid "can't get recipient list."
 msgstr "liste de destinataires vide."
 
-#: src/compose.c:2711
+#: src/compose.c:2730
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1614,21 +1615,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:2725 src/send_message.c:299
+#: src/compose.c:2744 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:2767
+#: src/compose.c:2786
 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:2805
+#: src/compose.c:2824
 #, 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:2902
+#: src/compose.c:2921
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1639,11 +1640,11 @@ msgstr ""
 "\n"
 "Voulez-vous néanmoins l'envoyer avec %s ?"
 
-#: src/compose.c:2908
+#: src/compose.c:2927
 msgid "Code conversion error"
 msgstr "Erreur de conversion de code"
 
-#: src/compose.c:2981
+#: src/compose.c:3000
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1656,156 +1657,156 @@ msgstr ""
 "\n"
 "Voulez-vous néanmoins l'envoyer ?"
 
-#: src/compose.c:2985
+#: src/compose.c:3004
 msgid "Line length limit"
 msgstr "Longueur de ligne maximale"
 
-#: src/compose.c:3275
+#: src/compose.c:3294
 msgid "can't remove the old message\n"
 msgstr "Impossible d'enlever l'ancien message\n"
 
-#: src/compose.c:3293
+#: src/compose.c:3312
 msgid "queueing message...\n"
 msgstr "Mise en file d'attente des messages...\n"
 
-#: src/compose.c:3375
+#: src/compose.c:3394
 msgid "can't find queue folder\n"
 msgstr "Impossible de trouver le dossier de file d'attente\n"
 
-#: src/compose.c:3382
+#: src/compose.c:3401
 msgid "can't queue the message\n"
 msgstr "Impossible de mettre ce message dans la file d'attente\n"
 
-#: src/compose.c:3975
+#: src/compose.c:3994
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "Message-ID créé : %s\n"
 
-#: src/compose.c:4088
+#: src/compose.c:4107
 msgid "Creating compose window...\n"
 msgstr "Création de la fenêtre de composition...\n"
 
-#: src/compose.c:4139 src/headerview.c:54
+#: src/compose.c:4158 src/headerview.c:54
 msgid "From:"
 msgstr "De :"
 
-#: src/compose.c:4213
+#: src/compose.c:4232
 msgid "PGP Sign"
 msgstr "Signature PGP"
 
-#: src/compose.c:4216
+#: src/compose.c:4235
 msgid "PGP Encrypt"
 msgstr "Chiffrement PGP"
 
-#: src/compose.c:4254 src/compose.c:5332
+#: src/compose.c:4273 src/compose.c:5351
 msgid "MIME type"
 msgstr "Type MIME"
 
 #. S_COL_DATE
-#: src/compose.c:4263 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4908
+#: src/compose.c:4282 src/mimeview.c:197 src/prefs_filter_edit.c:496
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4909
 msgid "Size"
 msgstr "Taille"
 
-#: src/compose.c:4698 src/mainwindow.c:2359 src/prefs_account_dialog.c:528
+#: src/compose.c:4717 src/mainwindow.c:2359 src/prefs_account_dialog.c:528
 #: src/prefs_common_dialog.c:661
 msgid "Send"
 msgstr "Envoyer"
 
-#: src/compose.c:4699
+#: src/compose.c:4718
 msgid "Send message"
 msgstr "Envoyer le message"
 
-#: src/compose.c:4707
+#: src/compose.c:4726
 msgid "Send later"
 msgstr "Envoi différé"
 
-#: src/compose.c:4708
+#: src/compose.c:4727
 msgid "Put into queue folder and send later"
 msgstr "Mettre en file d'attente et envoyer plus tard"
 
-#: src/compose.c:4716
+#: src/compose.c:4735
 msgid "Draft"
 msgstr "Brouillon"
 
-#: src/compose.c:4717
+#: src/compose.c:4736
 msgid "Save to draft folder"
 msgstr "Enregistrer dans le dossier brouillon"
 
-#: src/compose.c:4727
+#: src/compose.c:4746
 msgid "Insert"
 msgstr "Insertion"
 
-#: src/compose.c:4728
+#: src/compose.c:4747
 msgid "Insert file"
 msgstr "Insérer un fichier"
 
-#: src/compose.c:4736
+#: src/compose.c:4755
 msgid "Attach"
 msgstr "Joindre"
 
-#: src/compose.c:4737
+#: src/compose.c:4756
 msgid "Attach file"
 msgstr "Joindre un fichier"
 
 #. signature
-#: src/compose.c:4747 src/prefs_account_dialog.c:1208
+#: src/compose.c:4766 src/prefs_account_dialog.c:1208
 #: src/prefs_common_dialog.c:953
 msgid "Signature"
 msgstr "Signature"
 
-#: src/compose.c:4748
+#: src/compose.c:4767
 msgid "Append signature"
 msgstr "Ajouter la signature"
 
 #. editor
-#: src/compose.c:4757 src/prefs_common_dialog.c:991
+#: src/compose.c:4776 src/prefs_common_dialog.c:991
 #: src/prefs_common_dialog.c:2315
 msgid "Editor"
 msgstr "Éditeur de texte"
 
-#: src/compose.c:4758
+#: src/compose.c:4777
 msgid "Edit with external editor"
 msgstr "Éditer avec un éditeur externe"
 
-#: src/compose.c:4766
+#: src/compose.c:4785
 msgid "Linewrap"
 msgstr "Justifier"
 
-#: src/compose.c:4767
+#: src/compose.c:4786
 msgid "Wrap all long lines"
 msgstr "Justifier tout le message"
 
-#: src/compose.c:5228
+#: src/compose.c:5247
 msgid "Invalid MIME type."
 msgstr "Type MIME invalide."
 
-#: src/compose.c:5246
+#: src/compose.c:5265
 msgid "File doesn't exist or is empty."
 msgstr "Le fichier n'existe pas ou est vide."
 
-#: src/compose.c:5314
+#: src/compose.c:5333
 msgid "Properties"
 msgstr "Propriétés"
 
-#: src/compose.c:5334 src/prefs_common_dialog.c:1444
+#: src/compose.c:5353 src/prefs_common_dialog.c:1444
 msgid "Encoding"
 msgstr "Encodage"
 
-#: src/compose.c:5357 src/prefs_folder_item.c:202
+#: src/compose.c:5376 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Chemin d'accès"
 
-#: src/compose.c:5358
+#: src/compose.c:5377
 msgid "File name"
 msgstr "Nom du fichier"
 
-#: src/compose.c:5449
+#: src/compose.c:5466
 #, 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:5497
+#: src/compose.c:5514
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1814,46 +1815,46 @@ msgstr ""
 "L'éditeur externe est encore ouvert.\n"
 "Forcer sa fermeture (id de traitement de groupe : %d) ?\n"
 
-#: src/compose.c:5872 src/compose.c:5877 src/compose.c:5883
+#: src/compose.c:5889 src/compose.c:5894 src/compose.c:5900
 msgid "Can't queue the message."
 msgstr "Impossible de mettre ce message dans la file d'attente."
 
-#: src/compose.c:5974
+#: src/compose.c:5991
 msgid "Select files"
 msgstr "Sélection de fichier"
 
-#: src/compose.c:5997
+#: src/compose.c:6014
 msgid "Select file"
 msgstr "Choisissez un fichier"
 
-#: src/compose.c:6032
+#: src/compose.c:6049
 msgid "Save message"
 msgstr "Enregistrer le message"
 
-#: src/compose.c:6033
+#: src/compose.c:6050
 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:6035
+#: src/compose.c:6052
 msgid "Close _without saving"
 msgstr "Fermer _sans enregistrer"
 
-#: src/compose.c:6077
+#: src/compose.c:6094
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Voulez-vous appliquer le modèle « %s » ?"
 
-#: src/compose.c:6079
+#: src/compose.c:6096
 msgid "Apply template"
 msgstr "Appliquer un modèle"
 
-#: src/compose.c:6080
+#: src/compose.c:6097
 msgid "_Replace"
 msgstr "_Remplacer"
 
-#: src/compose.c:6080
+#: src/compose.c:6097
 msgid "_Insert"
 msgstr "_Insérer"
 
@@ -1974,53 +1975,53 @@ msgstr "Donnez un nom de groupe."
 msgid "Edit Group Data"
 msgstr "Édition du groupe"
 
-#: src/editgroup.c:300
+#: src/editgroup.c:299
 msgid "Group Name"
 msgstr "Nom du groupe"
 
-#: src/editgroup.c:319
+#: src/editgroup.c:318
 msgid "Addresses in Group"
 msgstr "Adresses dans le groupe"
 
-#: src/editgroup.c:321
+#: src/editgroup.c:320
 msgid " -> "
 msgstr " -> "
 
-#: src/editgroup.c:348
+#: src/editgroup.c:347
 msgid " <- "
 msgstr " <- "
 
-#: src/editgroup.c:350
+#: src/editgroup.c:349
 msgid "Available Addresses"
 msgstr "Adresses disponibles"
 
-#: src/editgroup.c:416
+#: src/editgroup.c:415
 msgid "Move E-Mail Addresses to or from Group with arrow buttons"
 msgstr ""
 "Déplacer les adresses souhaitées du/vers le groupe avec les boutons fléchés"
 
-#: src/editgroup.c:468
+#: src/editgroup.c:467
 msgid "Edit Group Details"
 msgstr "Édition du groupe"
 
-#: src/editgroup.c:471
+#: src/editgroup.c:470
 msgid "Add New Group"
 msgstr "Nouveau groupe"
 
-#: src/editgroup.c:522
+#: src/editgroup.c:521
 msgid "Edit folder"
 msgstr "Édition du dossier"
 
-#: src/editgroup.c:522
+#: src/editgroup.c:521
 msgid "Input the new name of folder:"
 msgstr "Saisissez le nouveau nom du dossier :"
 
-#: src/editgroup.c:525 src/foldersel.c:541 src/folderview.c:2121
+#: src/editgroup.c:524 src/foldersel.c:541 src/folderview.c:2121
 #: src/folderview.c:2127
 msgid "New folder"
 msgstr "Nouveau dossier"
 
-#: src/editgroup.c:526 src/foldersel.c:542 src/folderview.c:2128
+#: src/editgroup.c:525 src/foldersel.c:542 src/folderview.c:2128
 msgid "Input the name of new folder:"
 msgstr "Saisissez le nom du nouveau dossier :"
 
@@ -2218,7 +2219,7 @@ msgid "`%c' can't be included in folder name."
 msgstr "« %c » n'est pas valide dans le nom du dossier."
 
 #: src/foldersel.c:561 src/folderview.c:2147 src/folderview.c:2206
-#: src/query_search.c:995
+#: src/query_search.c:1031
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Le dossier « %s » existe déjà."
@@ -2476,7 +2477,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:2127
+#: src/headerview.c:180 src/query_search.c:667 src/summaryview.c:2127
 msgid "(No From)"
 msgstr "(Pas d'expéditeur)"
 
@@ -2608,133 +2609,133 @@ msgstr "Terminé"
 msgid "Sylpheed: %d new messages"
 msgstr "Sylpheed : %d nouveau(x) message(s)"
 
-#: src/inc.c:372
+#: src/inc.c:371
 msgid "Retrieving new messages"
 msgstr "Récupération des nouveaux messages"
 
-#: src/inc.c:415
+#: src/inc.c:414
 msgid "Standby"
 msgstr "Attente"
 
-#: src/inc.c:544 src/inc.c:593
+#: src/inc.c:543 src/inc.c:592
 msgid "Cancelled"
 msgstr "Annulé"
 
-#: src/inc.c:555
+#: src/inc.c:554
 msgid "Retrieving"
 msgstr "Récupération"
 
-#: src/inc.c:564
+#: src/inc.c:563
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "Terminé - %d message(s) %s reçu(s)"
 
-#: src/inc.c:568
+#: src/inc.c:567
 msgid "Done (no new messages)"
 msgstr "Terminé - pas de nouveau(x) message(s)"
 
-#: src/inc.c:574
+#: src/inc.c:573
 msgid "Connection failed"
 msgstr "La connexion a échoué"
 
-#: src/inc.c:577
+#: src/inc.c:576
 msgid "Auth failed"
 msgstr "L'authentification a échoué"
 
-#: src/inc.c:580
+#: src/inc.c:579
 msgid "Locked"
 msgstr "Verrouillé"
 
-#: src/inc.c:590
+#: src/inc.c:589
 msgid "Timeout"
 msgstr "Délai d'attente"
 
-#: src/inc.c:640
+#: src/inc.c:639
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Terminé - %d nouveau(x) message(s)"
 
-#: src/inc.c:643
+#: src/inc.c:642
 msgid "Finished (no new messages)"
 msgstr "Terminé - pas de nouveau(x) message(s)"
 
-#: src/inc.c:652
+#: src/inc.c:651
 msgid "Some errors occurred while getting mail."
 msgstr "Erreur lors de la récupération des messages."
 
-#: src/inc.c:688
+#: src/inc.c:687
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "Récupération des nouveaux messages du compte %s ...\n"
 
-#: src/inc.c:691
+#: src/inc.c:690
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s : Récupération des nouveaux messages"
 
-#: src/inc.c:710
+#: src/inc.c:709
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Connexion au serveur POP3 : %s..."
 
-#: src/inc.c:719
+#: src/inc.c:718
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Impossible de se connecter au serveur POP3 : %s:%d\n"
 
-#: src/inc.c:798 src/send_message.c:631
+#: src/inc.c:797 src/send_message.c:631
 msgid "Authenticating..."
 msgstr "Authentification..."
 
-#: src/inc.c:799
+#: src/inc.c:798
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Réception des messages de %s..."
 
-#: src/inc.c:804
+#: src/inc.c:803
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Récupération du nombre de nouveaux messages (STAT)..."
 
-#: src/inc.c:808
+#: src/inc.c:807
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Récupération du nombre de nouveaux messages (LAST)..."
 
-#: src/inc.c:812
+#: src/inc.c:811
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Récupération du nombre de nouveaux messages (UIDL)..."
 
-#: src/inc.c:816
+#: src/inc.c:815
 msgid "Getting the size of messages (LIST)..."
 msgstr "Récupération de la taille des messages"
 
-#: src/inc.c:826
+#: src/inc.c:825
 #, c-format
 msgid "Deleting message %d"
 msgstr "Suppression du message %d"
 
-#: src/inc.c:833 src/send_message.c:649
+#: src/inc.c:832 src/send_message.c:649
 msgid "Quitting"
 msgstr "Fermeture"
 
-#: src/inc.c:858
+#: src/inc.c:857
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Récupération du message (%d / %d) (%s / %s)"
 
-#: src/inc.c:879
+#: src/inc.c:878
 #, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Réception - %d message(s) %s reçu(s)"
 
-#: src/inc.c:1107
+#: src/inc.c:1106
 msgid "Connection failed."
 msgstr "La connexion a échoué."
 
-#: src/inc.c:1113
+#: src/inc.c:1112
 msgid "Error occurred while processing mail."
 msgstr "Une erreur est survenue pendant le traitement du message."
 
-#: src/inc.c:1118
+#: src/inc.c:1117
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2743,28 +2744,28 @@ msgstr ""
 "Une erreur est survenue pendant le traitement du message :\n"
 "%s"
 
-#: src/inc.c:1124
+#: src/inc.c:1123
 msgid "No disk space left."
 msgstr "Plus de place disponible sur le disque."
 
-#: src/inc.c:1129
+#: src/inc.c:1128
 msgid "Can't write file."
 msgstr "Impossible d'écrire dans le fichier."
 
-#: src/inc.c:1134
+#: src/inc.c:1133
 msgid "Socket error."
 msgstr "Erreur de protocole."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1140 src/send_message.c:584 src/send_message.c:772
+#: src/inc.c:1139 src/send_message.c:584 src/send_message.c:772
 msgid "Connection closed by the remote host."
 msgstr "La connexion a été fermée par le serveur."
 
-#: src/inc.c:1146
+#: src/inc.c:1145
 msgid "Mailbox is locked."
 msgstr "Boîte verrouillée."
 
-#: src/inc.c:1150
+#: src/inc.c:1149
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2773,11 +2774,11 @@ msgstr ""
 "Boîte verrouillée :\n"
 "%s"
 
-#: src/inc.c:1156 src/send_message.c:757
+#: src/inc.c:1155 src/send_message.c:757
 msgid "Authentication failed."
 msgstr "L'authentification à échoué."
 
-#: src/inc.c:1161 src/send_message.c:760
+#: src/inc.c:1160 src/send_message.c:760
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2786,15 +2787,15 @@ msgstr ""
 "L'authentification a échoué :\n"
 "%s"
 
-#: src/inc.c:1166 src/send_message.c:776
+#: src/inc.c:1165 src/send_message.c:776
 msgid "Session timed out."
 msgstr "Dépassement du délai de réponse (timeout) de la session."
 
-#: src/inc.c:1202
+#: src/inc.c:1201
 msgid "Incorporation cancelled\n"
 msgstr "Relève du courrier annulée\n"
 
-#: src/inc.c:1285
+#: src/inc.c:1284
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Récupération des nouveaux messages de %s dans %s...\n"
@@ -3275,14 +3276,15 @@ msgid "/_View/Mess_age source"
 msgstr "/_Affichage/_Voir le message complet"
 
 #: src/mainwindow.c:708 src/messageview.c:245
-msgid "/_View/Show all _header"
+#, fuzzy
+msgid "/_View/Show all _headers"
 msgstr "/_Affichage/Afficher tous les e_n-têtes"
 
 #: src/mainwindow.c:710
 msgid "/_View/_Update summary"
 msgstr "/_Affichage/Mettre à jo_ur le résumé des messages"
 
-#: src/mainwindow.c:712 src/messageview.c:247
+#: src/mainwindow.c:712 src/messageview.c:248
 msgid "/_Message"
 msgstr "/_Message"
 
@@ -3312,16 +3314,16 @@ msgstr "/_Message/En_voyer les messages en file d'attente"
 
 #: src/mainwindow.c:722 src/mainwindow.c:724 src/mainwindow.c:731
 #: src/mainwindow.c:736 src/mainwindow.c:739 src/mainwindow.c:750
-#: src/mainwindow.c:752 src/mainwindow.c:755 src/messageview.c:250
-#: src/messageview.c:258 src/messageview.c:263
+#: src/mainwindow.c:752 src/mainwindow.c:755 src/messageview.c:251
+#: src/messageview.c:259 src/messageview.c:264
 msgid "/_Message/---"
 msgstr "/_Message/---"
 
-#: src/mainwindow.c:723 src/messageview.c:248
+#: src/mainwindow.c:723 src/messageview.c:249
 msgid "/_Message/Compose _new message"
 msgstr "/_Message/Composer un _nouveau message"
 
-#: src/mainwindow.c:725 src/messageview.c:251
+#: src/mainwindow.c:725 src/messageview.c:252
 msgid "/_Message/_Reply"
 msgstr "/_Message/_Répondre"
 
@@ -3329,27 +3331,27 @@ msgstr "/_Message/_Répondre"
 msgid "/_Message/Repl_y to"
 msgstr "/_Message/Rép_ondre à"
 
-#: src/mainwindow.c:727 src/messageview.c:252
+#: src/mainwindow.c:727 src/messageview.c:253
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Message/Rép_ondre à/_tous"
 
-#: src/mainwindow.c:728 src/messageview.c:254
+#: src/mainwindow.c:728 src/messageview.c:255
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Message/Rép_ondre à/l'_expéditeur"
 
-#: src/mainwindow.c:729 src/messageview.c:256
+#: src/mainwindow.c:729 src/messageview.c:257
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Message/Rép_ondre à/la _liste"
 
-#: src/mainwindow.c:732 src/messageview.c:259
+#: src/mainwindow.c:732 src/messageview.c:260
 msgid "/_Message/_Forward"
 msgstr "/_Message/_Transférer"
 
-#: src/mainwindow.c:733 src/messageview.c:260
+#: src/mainwindow.c:733 src/messageview.c:261
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Message/Transférer en tant que pièce _jointe"
 
-#: src/mainwindow.c:735 src/messageview.c:262
+#: src/mainwindow.c:735 src/messageview.c:263
 msgid "/_Message/Redirec_t"
 msgstr "/_Message/Rediri_ger"
 
@@ -3405,7 +3407,7 @@ msgstr "/_Message/_Marquer comme _indésirable"
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/_Message/Marquer comme in_téressant"
 
-#: src/mainwindow.c:756 src/messageview.c:264
+#: src/mainwindow.c:756 src/messageview.c:265
 msgid "/_Message/Re-_edit"
 msgstr "/_Message/Réédit_er"
 
@@ -3421,23 +3423,23 @@ msgstr "/_Outils/_Filtrer les messages du dossier"
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Outils/Filtrer les messages _sélectionnés"
 
-#: src/mainwindow.c:767 src/messageview.c:271
+#: src/mainwindow.c:767 src/messageview.c:272
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Outils/Créer une règle de f_iltrage"
 
-#: src/mainwindow.c:768 src/messageview.c:273
+#: src/mainwindow.c:768 src/messageview.c:274
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Outils/Créer une règle de f_iltrage/automatiq_uement"
 
-#: src/mainwindow.c:770 src/messageview.c:275
+#: src/mainwindow.c:770 src/messageview.c:276
 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:772 src/messageview.c:277
+#: src/mainwindow.c:772 src/messageview.c:278
 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:774 src/messageview.c:279
+#: src/mainwindow.c:774 src/messageview.c:280
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Outils/Créer une règle de f_iltrage/basée sur le _sujet"
 
@@ -3555,7 +3557,7 @@ msgid "MainWindow: color allocation %d failed\n"
 msgstr "Fenêtre principale : allocation de la couleur %d échouée\n"
 
 #: src/mainwindow.c:1139 src/summaryview.c:2275 src/summaryview.c:2360
-#: src/summaryview.c:3907 src/summaryview.c:4036 src/summaryview.c:4394
+#: src/summaryview.c:3908 src/summaryview.c:4037 src/summaryview.c:4395
 msgid "done.\n"
 msgstr "terminé.\n"
 
@@ -3837,7 +3839,7 @@ msgid "Find text:"
 msgstr "Texte recherché :"
 
 #: src/message_search.c:153 src/prefs_search_folder.c:253
-#: src/query_search.c:326
+#: src/query_search.c:343
 msgid "Case sensitive"
 msgstr "Respecter la casse"
 
@@ -3861,27 +3863,27 @@ msgstr "Fin de message atteint, reprendre depuis le début ?"
 msgid "Search finished"
 msgstr "Recherche terminée"
 
-#: src/messageview.c:268
+#: src/messageview.c:269
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/_Outils/Aj_outer l'expéditeur dans le carnet d'adresses"
 
-#: src/messageview.c:300
+#: src/messageview.c:301
 msgid "Creating message view...\n"
 msgstr "Création de la vue message...\n"
 
-#: src/messageview.c:325
+#: src/messageview.c:326
 msgid "Text"
 msgstr "Texte"
 
-#: src/messageview.c:330
+#: src/messageview.c:331
 msgid "Attachments"
 msgstr "Pièces jointes"
 
-#: src/messageview.c:380
+#: src/messageview.c:381
 msgid "Message View - Sylpheed"
 msgstr "Fenêtre des messages - Sylpheed"
 
-#: src/messageview.c:699 src/summaryview.c:3436
+#: src/messageview.c:700 src/summaryview.c:3436
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Impossible d'enregistrer le fichier « %s »."
@@ -3898,7 +3900,7 @@ msgstr "(Commande d'impression par défaut)"
 msgid "Print"
 msgstr "Impression"
 
-#: src/messageview.c:770 src/summaryview.c:3471
+#: src/messageview.c:769 src/summaryview.c:3470
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -3993,11 +3995,11 @@ msgstr ""
 "Saisissez la ligne de commande pour ouvrir le fichier :\n"
 "(« %s » sera remplacé par le nom du fichier)"
 
-#: src/mimeview.c:1147
+#: src/mimeview.c:1140
 msgid "Opening executable file"
 msgstr "Ouverture du fichier exécutable"
 
-#: src/mimeview.c:1148
+#: src/mimeview.c:1141
 msgid ""
 "This is an executable file. Opening executable file is restricted for "
 "security.\n"
@@ -4009,11 +4011,6 @@ msgstr ""
 "Vous pouvez l'enregistrer quelque part pour le lancer vous-même, mais prenez "
 "les précautions d'usage (anti-virus, etc.)."
 
-#: src/mimeview.c:1184
-#, c-format
-msgid "MIME viewer command line is invalid: `%s'"
-msgstr "La ligne de commande du visualiseur MIME est invalide: « %s »"
-
 #: src/passphrase.c:96
 msgid "Passphrase"
 msgstr "Phrase secrète"
@@ -5753,19 +5750,19 @@ msgstr "Répondre à :"
 msgid "%s - Edit search condition"
 msgstr "%s - Modifier le motif de recherche"
 
-#: src/prefs_search_folder.c:209 src/query_search.c:257
+#: src/prefs_search_folder.c:209 src/query_search.c:274
 msgid "Match any of the following"
 msgstr "Si au moins une des conditions suivantes est remplie"
 
-#: src/prefs_search_folder.c:211 src/query_search.c:259
+#: src/prefs_search_folder.c:211 src/query_search.c:276
 msgid "Match all of the following"
 msgstr "Si toutes les conditions suivantes sont remplies"
 
-#: src/prefs_search_folder.c:231 src/query_search.c:303
+#: src/prefs_search_folder.c:231 src/query_search.c:320
 msgid "Folder:"
 msgstr "Dossier :"
 
-#: src/prefs_search_folder.c:248 src/query_search.c:321
+#: src/prefs_search_folder.c:248 src/query_search.c:338
 msgid "Search subfolders"
 msgstr "Rechercher dans les sous-dossiers"
 
@@ -5779,17 +5776,17 @@ msgid "Attachment"
 msgstr "Pièces jointes"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73 src/query_search.c:371 src/summaryview.c:4901
+#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4902
 msgid "Subject"
 msgstr "Sujet"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/query_search.c:372 src/summaryview.c:4904
+#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4905
 msgid "From"
 msgstr "Expéditeur"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/query_search.c:373 src/summaryview.c:4906
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:4907
 msgid "Date"
 msgstr "Date"
 
@@ -5883,41 +5880,41 @@ msgstr "Création du dialogue d'avancement...\n"
 msgid "Status"
 msgstr "État"
 
-#: src/query_search.c:234
+#: src/query_search.c:251
 msgid "Search messages"
 msgstr "Recherche dans le dossier"
 
-#: src/query_search.c:395
+#: src/query_search.c:423
 msgid "_Save as search folder"
 msgstr "_Enregistrer en tant que dossier de tri"
 
-#: src/query_search.c:512 src/subscribedialog.c:526 src/summaryview.c:842
+#: src/query_search.c:542 src/subscribedialog.c:526 src/summaryview.c:842
 msgid "Done."
 msgstr "Terminé."
 
-#: src/query_search.c:536
+#: src/query_search.c:566
 #, c-format
 msgid "Searching %s ..."
 msgstr "Recherche %s ..."
 
-#: src/query_search.c:564
+#: src/query_search.c:594
 #, c-format
 msgid "Searching %s (%d / %d)..."
 msgstr "Recherche %s (%d / %d)..."
 
-#: src/query_search.c:645 src/summaryview.c:2051
+#: src/query_search.c:675 src/summaryview.c:2051
 msgid "(No Date)"
 msgstr "(aucune date)"
 
-#: src/query_search.c:833
+#: src/query_search.c:869
 msgid "Save as search folder"
 msgstr "Enregistrer en tant que dossier de tri"
 
-#: src/query_search.c:854
+#: src/query_search.c:890
 msgid "Location:"
 msgstr "Emplacement :"
 
-#: src/query_search.c:869
+#: src/query_search.c:905
 msgid "Folder name:"
 msgstr "Nom du dossier :"
 
@@ -6543,37 +6540,37 @@ msgstr "Le message %d est à copier vers %s\n"
 msgid "Destination for copy is same as current folder."
 msgstr "La destination et la source de la copie sont identiques."
 
-#: src/summaryview.c:3506
+#: src/summaryview.c:3507
 msgid "Error occurred while processing messages."
 msgstr "Une erreur est survenue pendant le traitement des messages."
 
-#: src/summaryview.c:3814 src/summaryview.c:3815
+#: src/summaryview.c:3815 src/summaryview.c:3816
 msgid "Building threads..."
 msgstr "Construction des threads..."
 
-#: src/summaryview.c:3965 src/summaryview.c:3966
+#: src/summaryview.c:3966 src/summaryview.c:3967
 msgid "Unthreading..."
 msgstr "Suppression des threads..."
 
-#: src/summaryview.c:4259 src/summaryview.c:4315
+#: src/summaryview.c:4260 src/summaryview.c:4316
 #, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtrage (%d / %d)..."
 
-#: src/summaryview.c:4364
+#: src/summaryview.c:4365
 msgid "filtering..."
 msgstr "tri en cours..."
 
-#: src/summaryview.c:4365
+#: src/summaryview.c:4366
 msgid "Filtering..."
 msgstr "Tri en cours..."
 
-#: src/summaryview.c:4401
+#: src/summaryview.c:4402
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "%d message(s) ont été filtré(s)."
 
-#: src/summaryview.c:4910
+#: src/summaryview.c:4911
 msgid "No."
 msgstr "N°"
 
@@ -6654,6 +6651,9 @@ msgstr "_Quitter"
 msgid "Sylpheed"
 msgstr "Sylpheed"
 
+#~ msgid "MIME viewer command line is invalid: `%s'"
+#~ msgstr "La ligne de commande du visualiseur MIME est invalide: « %s »"
+
 #~ msgid "%dB"
 #~ msgstr "%d o"
 
diff --git a/po/gl.po b/po/gl.po
index 5b3f75b6..20d88bec 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-03-02 19:03+0900\n"
+"POT-Creation-Date: 2006-03-10 16:06+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:491
+#: libsylph/prefs_common.c:496
 #, fuzzy
 msgid "Junk mail filter"
 msgstr "Carpeta"
@@ -523,7 +523,7 @@ msgstr "no se pode abrir o ficheiro de marcas\n"
 msgid "can't fetch message %d\n"
 msgstr "non se pode obter o mensaxe %d\n"
 
-#: libsylph/procmsg.c:1375
+#: libsylph/procmsg.c:1378
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "o comando de impresión non é válido: `%s'\n"
@@ -601,12 +601,12 @@ msgstr "  Asunto: %s\n"
 msgid "  Issuer: %s\n"
 msgstr "  Xenerador: %s\n"
 
-#: libsylph/utils.c:2411 src/compose.c:2869 src/compose.c:3132
-#: src/compose.c:3195 src/compose.c:3315
+#: libsylph/utils.c:2430 src/compose.c:2888 src/compose.c:3151
+#: src/compose.c:3214 src/compose.c:3334
 msgid "can't change file mode\n"
 msgstr "non se pode cambiar os permisos de ficheiro\n"
 
-#: libsylph/utils.c:2418 libsylph/utils.c:2542
+#: libsylph/utils.c:2437 libsylph/utils.c:2561
 #, c-format
 msgid "writing to %s failed.\n"
 msgstr "fallo escribindo en %s.\n"
@@ -689,8 +689,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:493
-#: src/compose.c:4273 src/editaddress.c:200 src/editaddress.c:942
+#: src/account_dialog.c:366 src/addressadd.c:192 src/addressbook.c:491
+#: src/compose.c:4292 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
@@ -826,12 +826,12 @@ msgstr ""
 msgid "Add Address to Book"
 msgstr "Engadir enderezo á axenda"
 
-#: src/addressadd.c:202 src/compose.c:4777 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4796 src/editaddress.c:201
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "Enderezo"
 
-#: src/addressadd.c:212 src/addressbook.c:495 src/editaddress.c:202
+#: src/addressadd.c:212 src/addressbook.c:493 src/editaddress.c:202
 #: src/editaddress.c:795 src/editaddress.c:860 src/editgroup.c:267
 msgid "Remarks"
 msgstr "Notas"
@@ -840,110 +840,111 @@ msgstr "Notas"
 msgid "Select Address Book Folder"
 msgstr "Seleccionar carpeta da axenda"
 
-#: src/addressbook.c:338 src/compose.c:515 src/mainwindow.c:489
+#: src/addressbook.c:337 src/compose.c:515 src/mainwindow.c:489
 #: src/messageview.c:140
 msgid "/_File"
 msgstr "/_Ficheiro"
 
-#: src/addressbook.c:339
+#: src/addressbook.c:338
 msgid "/_File/New _Book"
 msgstr "/_Ficheiro/Nova _axenda"
 
-#: src/addressbook.c:340
+#: src/addressbook.c:339
 msgid "/_File/New _vCard"
 msgstr "/_Ficheiro/Nova _vCard"
 
-#: src/addressbook.c:342
+#: src/addressbook.c:341
 msgid "/_File/New _JPilot"
 msgstr "/_Ficheiro/Novo _JPilot"
 
-#: src/addressbook.c:345
-msgid "/_File/New _Server"
+#: src/addressbook.c:344
+#, fuzzy
+msgid "/_File/New _LDAP Server"
 msgstr "/_Ficheiro/Novo _servidor"
 
-#: src/addressbook.c:347 src/addressbook.c:350 src/compose.c:520
+#: src/addressbook.c:346 src/addressbook.c:349 src/compose.c:520
 #: src/compose.c:525 src/compose.c:528 src/compose.c:531 src/mainwindow.c:507
 #: src/mainwindow.c:510 src/mainwindow.c:512 src/mainwindow.c:515
 #: src/mainwindow.c:517 src/messageview.c:143
 msgid "/_File/---"
 msgstr "/_Ficheiro/---"
 
-#: src/addressbook.c:348
+#: src/addressbook.c:347
 msgid "/_File/_Edit"
 msgstr "/_Ficheiro/_Editar"
 
-#: src/addressbook.c:349
+#: src/addressbook.c:348
 msgid "/_File/_Delete"
 msgstr "/_Ficheiro/_Borrar"
 
-#: src/addressbook.c:351
+#: src/addressbook.c:350
 msgid "/_File/_Save"
 msgstr "/_Ficheiro/_Gardar"
 
-#: src/addressbook.c:352 src/compose.c:532 src/messageview.c:144
+#: src/addressbook.c:351 src/compose.c:532 src/messageview.c:144
 msgid "/_File/_Close"
 msgstr "/_Ficheiro/_Pechar"
 
-#: src/addressbook.c:353
+#: src/addressbook.c:352
 msgid "/_Address"
 msgstr "/_Enderezo"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:353
 msgid "/_Address/New _Address"
 msgstr "/_Enderezo/Novo _enderezo"
 
-#: src/addressbook.c:355
+#: src/addressbook.c:354
 msgid "/_Address/New _Group"
 msgstr "//_Enderezo/Novo _grupo"
 
-#: src/addressbook.c:356
+#: src/addressbook.c:355
 msgid "/_Address/New _Folder"
 msgstr "/_Enderezo/Nova _carpeta"
 
-#: src/addressbook.c:357
+#: src/addressbook.c:356
 msgid "/_Address/---"
 msgstr "/_Enderezo/---"
 
-#: src/addressbook.c:358
+#: src/addressbook.c:357
 msgid "/_Address/_Edit"
 msgstr "/_Enderezo/_Editar"
 
-#: src/addressbook.c:359
+#: src/addressbook.c:358
 msgid "/_Address/_Delete"
 msgstr "/_Enderezo/_Borrar"
 
-#: src/addressbook.c:360 src/compose.c:645 src/mainwindow.c:758
-#: src/messageview.c:266
+#: src/addressbook.c:359 src/compose.c:645 src/mainwindow.c:758
+#: src/messageview.c:267
 msgid "/_Tools"
 msgstr "/_Ferramentas"
 
-#: src/addressbook.c:361
+#: src/addressbook.c:360
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Ferramentas/Importar ficheiro _LDIF"
 
-#: src/addressbook.c:362 src/compose.c:666 src/mainwindow.c:812
-#: src/messageview.c:286
+#: src/addressbook.c:361 src/compose.c:666 src/mainwindow.c:812
+#: src/messageview.c:287
 msgid "/_Help"
 msgstr "/_Axuda"
 
-#: src/addressbook.c:363 src/compose.c:667 src/mainwindow.c:824
-#: src/messageview.c:287
+#: src/addressbook.c:362 src/compose.c:667 src/mainwindow.c:824
+#: src/messageview.c:288
 msgid "/_Help/_About"
 msgstr "/_Ayuda/_Acerca de"
 
-#: src/addressbook.c:382 src/addressbook.c:392
+#: src/addressbook.c:381 src/addressbook.c:391
 msgid "/New _Address"
 msgstr "/Novo _enderezo"
 
-#: src/addressbook.c:383 src/addressbook.c:393
+#: src/addressbook.c:382 src/addressbook.c:392
 msgid "/New _Group"
 msgstr "/Novo _grupo"
 
-#: src/addressbook.c:384 src/addressbook.c:394
+#: src/addressbook.c:383 src/addressbook.c:393
 msgid "/New _Folder"
 msgstr "/Nova _carpeta"
 
-#: src/addressbook.c:385 src/addressbook.c:395 src/compose.c:509
+#: src/addressbook.c:384 src/addressbook.c:394 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
@@ -953,70 +954,70 @@ msgstr "/Nova _carpeta"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:386 src/addressbook.c:396 src/compose.c:534
+#: src/addressbook.c:385 src/addressbook.c:395 src/compose.c:534
 #: src/mainwindow.c:521 src/messageview.c:146
 msgid "/_Edit"
 msgstr "/_Editar"
 
-#: src/addressbook.c:387 src/addressbook.c:397 src/summaryview.c:434
+#: src/addressbook.c:386 src/addressbook.c:396 src/summaryview.c:434
 msgid "/_Delete"
 msgstr "/_Borrar"
 
-#: src/addressbook.c:494
+#: src/addressbook.c:492
 msgid "E-Mail address"
 msgstr "Enderezo e-mail"
 
-#: src/addressbook.c:498 src/compose.c:4778 src/prefs_common_dialog.c:2183
+#: src/addressbook.c:496 src/compose.c:4797 src/prefs_common_dialog.c:2183
 msgid "Address book"
 msgstr "Axenda de enderezos"
 
-#: src/addressbook.c:600 src/prefs_filter_edit.c:249
+#: src/addressbook.c:603 src/prefs_filter_edit.c:249
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "Nome:"
 
 #. Buttons
-#: src/addressbook.c:632 src/addressbook.c:1684 src/editaddress.c:884
+#: src/addressbook.c:636 src/addressbook.c:1678 src/editaddress.c:884
 #: src/editaddress.c:1017 src/mainwindow.c:2426 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:635 src/editaddress.c:890 src/editaddress.c:1023
+#: src/addressbook.c:639 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:1552
 msgid "Add"
 msgstr "Engadir"
 
-#: src/addressbook.c:638
+#: src/addressbook.c:642
 msgid "Lookup"
 msgstr "Buscar"
 
-#: src/addressbook.c:650 src/headerview.c:55 src/prefs_folder_item.c:339
+#: src/addressbook.c:654 src/headerview.c:55 src/prefs_folder_item.c:339
 #: src/prefs_template.c:176
 msgid "To:"
 msgstr "Para:"
 
-#: src/addressbook.c:654 src/prefs_folder_item.c:356 src/prefs_template.c:178
+#: src/addressbook.c:658 src/prefs_folder_item.c:356 src/prefs_template.c:178
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:658 src/prefs_folder_item.c:367
+#: src/addressbook.c:662 src/prefs_folder_item.c:367
 msgid "Bcc:"
 msgstr "Bcc:"
 
 #. Confirm deletion
-#: src/addressbook.c:845
+#: src/addressbook.c:832
 msgid "Delete address(es)"
 msgstr "Borrar enderezo(s)"
 
-#: src/addressbook.c:846
+#: src/addressbook.c:833
 msgid "Really delete the address(es)?"
 msgstr "¿Borrar realmente o(s) enderezo(s)?"
 
-#: src/addressbook.c:1675
+#: src/addressbook.c:1669
 #, fuzzy, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1025,38 +1026,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:1678 src/folderview.c:2372
+#: src/addressbook.c:1672 src/folderview.c:2372
 msgid "Delete folder"
 msgstr "Borrar carpeta"
 
-#: src/addressbook.c:1678
+#: src/addressbook.c:1672
 #, fuzzy
 msgid "_Folder only"
 msgstr "Carpeta só"
 
-#: src/addressbook.c:1678
+#: src/addressbook.c:1672
 #, fuzzy
 msgid "Folder and _addresses"
 msgstr "Carpeta e enderezos"
 
-#: src/addressbook.c:1683
+#: src/addressbook.c:1677
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "¿Borrar realmente `%s' ?"
 
-#: src/addressbook.c:2369 src/addressbook.c:2502
+#: src/addressbook.c:2363 src/addressbook.c:2496
 msgid "New user, could not save index file."
 msgstr "Novo usuario, non se puido gardar o ficheiro índice."
 
-#: src/addressbook.c:2373 src/addressbook.c:2506
+#: src/addressbook.c:2367 src/addressbook.c:2500
 msgid "New user, could not save address book files."
 msgstr "Novo usuario, non se puido gardar os ficheiros de enderezos"
 
-#: src/addressbook.c:2383 src/addressbook.c:2516
+#: src/addressbook.c:2377 src/addressbook.c:2510
 msgid "Old address book converted successfully."
 msgstr "Antiga axenda de enderezos convertida con éxito"
 
-#: src/addressbook.c:2388
+#: src/addressbook.c:2382
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1064,7 +1065,7 @@ msgstr ""
 "Antiga axenda de enderezos convertida,\n"
 "non se puido gardar o novo ficheiro índice"
 
-#: src/addressbook.c:2401
+#: src/addressbook.c:2395
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1072,7 +1073,7 @@ msgstr ""
 "Non se puido convertir a antiga axenda,\n"
 "pero crearonse novos ficheiros valeiros."
 
-#: src/addressbook.c:2407
+#: src/addressbook.c:2401
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1080,7 +1081,7 @@ msgstr ""
 "Non se puido convertir a antiga axenda,\n"
 "Non se puideron crear os ficheiros para a nova."
 
-#: src/addressbook.c:2412
+#: src/addressbook.c:2406
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1088,92 +1089,92 @@ msgstr ""
 "Non se puido convertir a antiga axenda\n"
 "e non se puideron crear ficheiros para unha nova."
 
-#: src/addressbook.c:2419
+#: src/addressbook.c:2413
 msgid "Addressbook conversion error"
 msgstr "Error na conversión da axenda"
 
-#: src/addressbook.c:2423
+#: src/addressbook.c:2417
 msgid "Addressbook conversion"
 msgstr "Conversión da  axenda"
 
-#: src/addressbook.c:2458
+#: src/addressbook.c:2452
 msgid "Addressbook Error"
 msgstr "Error na axenda"
 
-#: src/addressbook.c:2459 src/addressbook.c:2559
+#: src/addressbook.c:2453 src/addressbook.c:2553
 msgid "Could not read address index"
 msgstr "Non se puido ler o índice de enderezos"
 
-#: src/addressbook.c:2521
+#: src/addressbook.c:2515
 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:2535
+#: src/addressbook.c:2529
 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:2541
+#: src/addressbook.c:2535
 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:2547
+#: src/addressbook.c:2541
 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:2565
+#: src/addressbook.c:2559
 msgid "Addressbook Conversion Error"
 msgstr "Erro na conversión da axenda"
 
-#: src/addressbook.c:2571
+#: src/addressbook.c:2565
 msgid "Addressbook Conversion"
 msgstr "Conversión da axenda"
 
-#: src/addressbook.c:3086 src/prefs_common_dialog.c:2033
+#: src/addressbook.c:3080 src/prefs_common_dialog.c:2033
 msgid "Interface"
 msgstr "Interfaz"
 
-#: src/addressbook.c:3102 src/importldif.c:514
+#: src/addressbook.c:3096 src/importldif.c:514
 msgid "Address Book"
 msgstr "Axenda de enderezos"
 
-#: src/addressbook.c:3118
+#: src/addressbook.c:3112
 msgid "Person"
 msgstr "Persoa"
 
-#: src/addressbook.c:3134
+#: src/addressbook.c:3128
 msgid "EMail Address"
 msgstr "Enderezo e-mail"
 
-#: src/addressbook.c:3150
+#: src/addressbook.c:3144
 msgid "Group"
 msgstr "Grupo"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3166 src/folderview.c:367 src/prefs_account_dialog.c:1694
-#: src/query_search.c:370
+#: src/addressbook.c:3160 src/folderview.c:367 src/prefs_account_dialog.c:1694
+#: src/query_search.c:398
 msgid "Folder"
 msgstr "Carpeta"
 
-#: src/addressbook.c:3182
+#: src/addressbook.c:3176
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3198 src/addressbook.c:3214
+#: src/addressbook.c:3192 src/addressbook.c:3208
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3230
+#: src/addressbook.c:3224
 msgid "LDAP Server"
 msgstr "Servidor LDAP"
 
@@ -1185,7 +1186,7 @@ msgstr "Enderezo común"
 msgid "Personal address"
 msgstr "Enderezo persoal"
 
-#: src/alertpanel.c:142 src/compose.c:5500 src/main.c:621
+#: src/alertpanel.c:142 src/compose.c:5517 src/main.c:621
 msgid "Notice"
 msgstr "Notificación"
 
@@ -1193,7 +1194,7 @@ msgstr "Notificación"
 msgid "Warning"
 msgstr "Aviso"
 
-#: src/alertpanel.c:168 src/inc.c:587
+#: src/alertpanel.c:168 src/inc.c:586
 msgid "Error"
 msgstr "Erro"
 
@@ -1236,7 +1237,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:4761
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4762
 msgid "None"
 msgstr "Ningún"
 
@@ -1514,7 +1515,7 @@ msgstr "/_Ver/_Codificación/Tailandés (TIS-620)"
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Ver/_Codificación/Tailandés (Windows-874)"
 
-#: src/compose.c:646 src/mainwindow.c:759 src/messageview.c:267
+#: src/compose.c:646 src/mainwindow.c:759 src/messageview.c:268
 msgid "/_Tools/_Address book"
 msgstr "/_Ferramentas/_Axenda de enderezos"
 
@@ -1522,14 +1523,14 @@ msgstr "/_Ferramentas/_Axenda de enderezos"
 msgid "/_Tools/_Template"
 msgstr "/_Ferramentas/Plan_tillas"
 
-#: src/compose.c:649 src/mainwindow.c:783 src/messageview.c:283
+#: src/compose.c:649 src/mainwindow.c:783 src/messageview.c:284
 msgid "/_Tools/Actio_ns"
 msgstr "/_Ferramentas/Acció_ns"
 
 #: src/compose.c:651 src/compose.c:655 src/compose.c:661 src/mainwindow.c:762
 #: src/mainwindow.c:776 src/mainwindow.c:781 src/mainwindow.c:784
-#: src/mainwindow.c:788 src/mainwindow.c:790 src/messageview.c:270
-#: src/messageview.c:282
+#: src/mainwindow.c:788 src/mainwindow.c:790 src/messageview.c:271
+#: src/messageview.c:283
 msgid "/_Tools/---"
 msgstr "/_Ferramentas/---"
 
@@ -1558,81 +1559,81 @@ msgstr "/_Ferramentas/E_xecutar"
 msgid "/_Tools/_Set spell language"
 msgstr "/_Ferramentas/Plan_tillas"
 
-#: src/compose.c:910
+#: src/compose.c:912
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: o ficheiro non existe\n"
 
-#: src/compose.c:1014 src/compose.c:1085
+#: src/compose.c:1016 src/compose.c:1087
 msgid "Can't get text part\n"
 msgstr "Non se pode obter o texto\n"
 
-#: src/compose.c:1486
+#: src/compose.c:1488
 #, fuzzy
 msgid "Quote mark format error."
 msgstr "Marca de cita para erro."
 
-#: src/compose.c:1498
+#: src/compose.c:1500
 msgid "Message reply/forward format error."
 msgstr "Erro no formato da mensaxe para respostar/redirixir "
 
-#: src/compose.c:1918
+#: src/compose.c:1935
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "o ficheiro %s non existe\n"
 
-#: src/compose.c:1922
+#: src/compose.c:1939
 #, 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:1926
+#: src/compose.c:1943
 #, c-format
 msgid "File %s is empty."
 msgstr "o Ficheiro %s esta valeiro."
 
-#: src/compose.c:1930
+#: src/compose.c:1947
 #, c-format
 msgid "Can't read %s."
 msgstr "Non poido ler %s."
 
-#: src/compose.c:1963
+#: src/compose.c:1980
 #, c-format
 msgid "Message: %s"
 msgstr "Mensaxe: %s"
 
-#: src/compose.c:2023 src/mimeview.c:565
+#: src/compose.c:2040 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:2507 src/headerview.c:195 src/query_search.c:636
+#: src/compose.c:2524 src/headerview.c:195 src/query_search.c:666
 #: src/summaryview.c:2124
 msgid "(No Subject)"
 msgstr "(Sin asunto)"
 
-#: src/compose.c:2510
+#: src/compose.c:2527
 #, fuzzy, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Compoñer mensaxe%s"
 
-#: src/compose.c:2623
+#: src/compose.c:2642
 msgid "Recipient is not specified."
 msgstr "Non se especificou o destinatario."
 
-#: src/compose.c:2631
+#: src/compose.c:2650
 #, fuzzy
 msgid "Empty subject"
 msgstr "Asunto"
 
-#: src/compose.c:2632
+#: src/compose.c:2651
 msgid "Subject is empty. Send it anyway?"
 msgstr "o asunto esta valeiro. ¿Enviar de todas formas?"
 
-#: src/compose.c:2691
+#: src/compose.c:2710
 msgid "can't get recipient list."
 msgstr "non se pode obter a lista de destinatarios."
 
-#: src/compose.c:2711
+#: src/compose.c:2730
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1640,21 +1641,21 @@ msgstr ""
 "Non especificó ningunha conta para enviar.\n"
 "Seleccione algunha conta antes de enviar."
 
-#: src/compose.c:2725 src/send_message.c:299
+#: src/compose.c:2744 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:2767
+#: src/compose.c:2786
 msgid "Can't save the message to outbox."
 msgstr "Non se pode gardar a mensaxe en Saida."
 
-#: src/compose.c:2805
+#: src/compose.c:2824
 #, 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:2902
+#: src/compose.c:2921
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1665,12 +1666,12 @@ msgstr ""
 "%s a %s.\n"
 "¿Envia-lo de todo xeito?"
 
-#: src/compose.c:2908
+#: src/compose.c:2927
 #, fuzzy
 msgid "Code conversion error"
 msgstr "Error na conversión da axenda"
 
-#: src/compose.c:2981
+#: src/compose.c:3000
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1679,159 +1680,159 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:2985
+#: src/compose.c:3004
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3275
+#: src/compose.c:3294
 msgid "can't remove the old message\n"
 msgstr "non se pode eliminar a mensaxe antiga\n"
 
-#: src/compose.c:3293
+#: src/compose.c:3312
 msgid "queueing message...\n"
 msgstr "poñendo na cola...\n"
 
-#: src/compose.c:3375
+#: src/compose.c:3394
 msgid "can't find queue folder\n"
 msgstr "non podo atopar a carpeta de cola\n"
 
-#: src/compose.c:3382
+#: src/compose.c:3401
 msgid "can't queue the message\n"
 msgstr "a mensaxe non se pode poñer na cola\n"
 
-#: src/compose.c:3975
+#: src/compose.c:3994
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "Message-ID generado: %s\n"
 
-#: src/compose.c:4088
+#: src/compose.c:4107
 msgid "Creating compose window...\n"
 msgstr "Creando fiestra de composicion...\n"
 
-#: src/compose.c:4139 src/headerview.c:54
+#: src/compose.c:4158 src/headerview.c:54
 msgid "From:"
 msgstr "Dende:"
 
-#: src/compose.c:4213
+#: src/compose.c:4232
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/_Ferramentas/Acció_ns"
 
-#: src/compose.c:4216
+#: src/compose.c:4235
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/_Mensaxe/_Encriptar"
 
-#: src/compose.c:4254 src/compose.c:5332
+#: src/compose.c:4273 src/compose.c:5351
 msgid "MIME type"
 msgstr "Tipo MIME"
 
 #. S_COL_DATE
-#: src/compose.c:4263 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4908
+#: src/compose.c:4282 src/mimeview.c:197 src/prefs_filter_edit.c:496
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4909
 msgid "Size"
 msgstr "Tamaño"
 
-#: src/compose.c:4698 src/mainwindow.c:2359 src/prefs_account_dialog.c:528
+#: src/compose.c:4717 src/mainwindow.c:2359 src/prefs_account_dialog.c:528
 #: src/prefs_common_dialog.c:661
 msgid "Send"
 msgstr "Enviar"
 
-#: src/compose.c:4699
+#: src/compose.c:4718
 msgid "Send message"
 msgstr "Enviar Mensaxe"
 
-#: src/compose.c:4707
+#: src/compose.c:4726
 msgid "Send later"
 msgstr "Enviar mais tarde"
 
-#: src/compose.c:4708
+#: src/compose.c:4727
 msgid "Put into queue folder and send later"
 msgstr "Poñer na cola e enviar mais tarde"
 
-#: src/compose.c:4716
+#: src/compose.c:4735
 msgid "Draft"
 msgstr "Borrador"
 
-#: src/compose.c:4717
+#: src/compose.c:4736
 msgid "Save to draft folder"
 msgstr "Gardar como borrador"
 
-#: src/compose.c:4727
+#: src/compose.c:4746
 msgid "Insert"
 msgstr "Inserir"
 
-#: src/compose.c:4728
+#: src/compose.c:4747
 msgid "Insert file"
 msgstr "Inserir ficheiro"
 
-#: src/compose.c:4736
+#: src/compose.c:4755
 msgid "Attach"
 msgstr "Adxuntar"
 
-#: src/compose.c:4737
+#: src/compose.c:4756
 msgid "Attach file"
 msgstr "Adxuntar ficheiro"
 
 #. signature
-#: src/compose.c:4747 src/prefs_account_dialog.c:1208
+#: src/compose.c:4766 src/prefs_account_dialog.c:1208
 #: src/prefs_common_dialog.c:953
 msgid "Signature"
 msgstr "Sinatura"
 
-#: src/compose.c:4748
+#: src/compose.c:4767
 #, fuzzy
 msgid "Append signature"
 msgstr "Sinatura INVÁLIDA"
 
 #. editor
-#: src/compose.c:4757 src/prefs_common_dialog.c:991
+#: src/compose.c:4776 src/prefs_common_dialog.c:991
 #: src/prefs_common_dialog.c:2315
 msgid "Editor"
 msgstr "Editor"
 
-#: src/compose.c:4758
+#: src/compose.c:4777
 msgid "Edit with external editor"
 msgstr "Editar con un editor externo"
 
-#: src/compose.c:4766
+#: src/compose.c:4785
 msgid "Linewrap"
 msgstr "Recortar"
 
-#: src/compose.c:4767
+#: src/compose.c:4786
 msgid "Wrap all long lines"
 msgstr "Cortar todas as líneas longas"
 
-#: src/compose.c:5228
+#: src/compose.c:5247
 msgid "Invalid MIME type."
 msgstr "Tipo MIME inválido."
 
-#: src/compose.c:5246
+#: src/compose.c:5265
 msgid "File doesn't exist or is empty."
 msgstr "O ficheiro non existe ou está valeiro."
 
-#: src/compose.c:5314
+#: src/compose.c:5333
 msgid "Properties"
 msgstr "Propiedades"
 
-#: src/compose.c:5334 src/prefs_common_dialog.c:1444
+#: src/compose.c:5353 src/prefs_common_dialog.c:1444
 msgid "Encoding"
 msgstr "Codificación"
 
-#: src/compose.c:5357 src/prefs_folder_item.c:202
+#: src/compose.c:5376 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Ruta"
 
-#: src/compose.c:5358
+#: src/compose.c:5377
 msgid "File name"
 msgstr "Nome de ficheiro"
 
-#: src/compose.c:5449
+#: src/compose.c:5466
 #, 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:5497
+#: src/compose.c:5514
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1841,48 +1842,48 @@ msgstr ""
 "¿Desea terminar o proceso?\n"
 "Id. de proceso: %d"
 
-#: src/compose.c:5872 src/compose.c:5877 src/compose.c:5883
+#: src/compose.c:5889 src/compose.c:5894 src/compose.c:5900
 msgid "Can't queue the message."
 msgstr "O mensaxe non se pode poñer na cola."
 
-#: src/compose.c:5974
+#: src/compose.c:5991
 #, fuzzy
 msgid "Select files"
 msgstr "Seleccionar ficheiro"
 
-#: src/compose.c:5997
+#: src/compose.c:6014
 msgid "Select file"
 msgstr "Seleccionar ficheiro"
 
-#: src/compose.c:6032
+#: src/compose.c:6049
 #, fuzzy
 msgid "Save message"
 msgstr "Enviar Mensaxe"
 
-#: src/compose.c:6033
+#: src/compose.c:6050
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Esta mensaxe foi modificado. ¿Desea descartala?"
 
-#: src/compose.c:6035
+#: src/compose.c:6052
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:6077
+#: src/compose.c:6094
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "¿Quere aplicar a plantilla `%s' ?"
 
-#: src/compose.c:6079
+#: src/compose.c:6096
 msgid "Apply template"
 msgstr "Aplicar plantilla"
 
-#: src/compose.c:6080
+#: src/compose.c:6097
 #, fuzzy
 msgid "_Replace"
 msgstr "Substituír"
 
-#: src/compose.c:6080
+#: src/compose.c:6097
 #, fuzzy
 msgid "_Insert"
 msgstr "Inserir"
@@ -2004,52 +2005,52 @@ msgstr "Debe proporcionar un nome de grupo"
 msgid "Edit Group Data"
 msgstr "Editar datos do grupo"
 
-#: src/editgroup.c:300
+#: src/editgroup.c:299
 msgid "Group Name"
 msgstr "Nome de grupo"
 
-#: src/editgroup.c:319
+#: src/editgroup.c:318
 msgid "Addresses in Group"
 msgstr "Enderezos no grupo"
 
-#: src/editgroup.c:321
+#: src/editgroup.c:320
 msgid " -> "
 msgstr " -> "
 
-#: src/editgroup.c:348
+#: src/editgroup.c:347
 msgid " <- "
 msgstr " <- "
 
-#: src/editgroup.c:350
+#: src/editgroup.c:349
 msgid "Available Addresses"
 msgstr "Enderezos disponibles"
 
-#: src/editgroup.c:416
+#: src/editgroup.c:415
 msgid "Move E-Mail Addresses to or from Group with arrow buttons"
 msgstr "Mover os enderezos de correo dende/cara o grupo con as flechas"
 
-#: src/editgroup.c:468
+#: src/editgroup.c:467
 msgid "Edit Group Details"
 msgstr "Editar detalles do grupo"
 
-#: src/editgroup.c:471
+#: src/editgroup.c:470
 msgid "Add New Group"
 msgstr "Engadir novo grupo"
 
-#: src/editgroup.c:522
+#: src/editgroup.c:521
 msgid "Edit folder"
 msgstr "Editar carpeta"
 
-#: src/editgroup.c:522
+#: src/editgroup.c:521
 msgid "Input the new name of folder:"
 msgstr "Nome da nova carpeta:"
 
-#: src/editgroup.c:525 src/foldersel.c:541 src/folderview.c:2121
+#: src/editgroup.c:524 src/foldersel.c:541 src/folderview.c:2121
 #: src/folderview.c:2127
 msgid "New folder"
 msgstr "Nova carpeta"
 
-#: src/editgroup.c:526 src/foldersel.c:542 src/folderview.c:2128
+#: src/editgroup.c:525 src/foldersel.c:542 src/folderview.c:2128
 msgid "Input the name of new folder:"
 msgstr "Nome da nova carpeta:"
 
@@ -2248,7 +2249,7 @@ msgid "`%c' can't be included in folder name."
 msgstr "`%c' non pode estar no nome da carpeta."
 
 #: src/foldersel.c:561 src/folderview.c:2147 src/folderview.c:2206
-#: src/query_search.c:995
+#: src/query_search.c:1031
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "a carpeta `%s' xa existe."
@@ -2510,7 +2511,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:2127
+#: src/headerview.c:180 src/query_search.c:667 src/summaryview.c:2127
 msgid "(No From)"
 msgstr "(Sin remite)"
 
@@ -2640,135 +2641,135 @@ msgstr "Finalizar"
 msgid "Sylpheed: %d new messages"
 msgstr "Finalizado (%d mensaxe(s) novo(s))"
 
-#: src/inc.c:372
+#: src/inc.c:371
 msgid "Retrieving new messages"
 msgstr "Obtendo novos mensaxes"
 
-#: src/inc.c:415
+#: src/inc.c:414
 msgid "Standby"
 msgstr "En espera"
 
-#: src/inc.c:544 src/inc.c:593
+#: src/inc.c:543 src/inc.c:592
 msgid "Cancelled"
 msgstr "Cancelado"
 
-#: src/inc.c:555
+#: src/inc.c:554
 msgid "Retrieving"
 msgstr "Recuperando"
 
-#: src/inc.c:564
+#: src/inc.c:563
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "Feito (%d mensaxe(s) (%s) recibido(s))"
 
-#: src/inc.c:568
+#: src/inc.c:567
 msgid "Done (no new messages)"
 msgstr "feito (non hai mensaxes novos)"
 
-#: src/inc.c:574
+#: src/inc.c:573
 msgid "Connection failed"
 msgstr "Conexión fallida"
 
-#: src/inc.c:577
+#: src/inc.c:576
 msgid "Auth failed"
 msgstr "Autorización fallida"
 
-#: src/inc.c:580
+#: src/inc.c:579
 msgid "Locked"
 msgstr "Bloqueado"
 
-#: src/inc.c:590
+#: src/inc.c:589
 #, fuzzy
 msgid "Timeout"
 msgstr "Tiempo límite (seg.)"
 
-#: src/inc.c:640
+#: src/inc.c:639
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Finalizado (%d mensaxe(s) novo(s))"
 
-#: src/inc.c:643
+#: src/inc.c:642
 msgid "Finished (no new messages)"
 msgstr "Finalizado (non hai mensaxes novos)"
 
-#: src/inc.c:652
+#: src/inc.c:651
 msgid "Some errors occurred while getting mail."
 msgstr "Ocurriu algún erro obtendo o correo."
 
-#: src/inc.c:688
+#: src/inc.c:687
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "obtendo novas mensaxes da conta %s...\n"
 
-#: src/inc.c:691
+#: src/inc.c:690
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Recuperando novas mensaxes"
 
-#: src/inc.c:710
+#: src/inc.c:709
 #, fuzzy, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Conectando ó servidor POP3: %s ..."
 
-#: src/inc.c:719
+#: src/inc.c:718
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Non se pode conectar ó servirdor POP3: %s:%d\n"
 
-#: src/inc.c:798 src/send_message.c:631
+#: src/inc.c:797 src/send_message.c:631
 msgid "Authenticating..."
 msgstr "Autenticando..."
 
-#: src/inc.c:799
+#: src/inc.c:798
 #, fuzzy, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Obtendo mensaxes dende %s en %s...\n"
 
-#: src/inc.c:804
+#: src/inc.c:803
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Obtendo o número de novas mensaxes (STAT)..."
 
-#: src/inc.c:808
+#: src/inc.c:807
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Obtendo o número de novas mensaxes (STAT)..."
 
-#: src/inc.c:812
+#: src/inc.c:811
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Obtendo o número de novas mensaxes (UIDL)..."
 
-#: src/inc.c:816
+#: src/inc.c:815
 msgid "Getting the size of messages (LIST)..."
 msgstr "Obtendo o tamaño de novas mensaxes (LIST)..."
 
-#: src/inc.c:826
+#: src/inc.c:825
 #, c-format
 msgid "Deleting message %d"
 msgstr "Borrando mensaxe %d"
 
-#: src/inc.c:833 src/send_message.c:649
+#: src/inc.c:832 src/send_message.c:649
 msgid "Quitting"
 msgstr "Saíndo"
 
-#: src/inc.c:858
+#: src/inc.c:857
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Recuperando mensaxe (%d / %d) (%s / %s)"
 
-#: src/inc.c:879
+#: src/inc.c:878
 #, fuzzy, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Feito (%d mensaxe(s) (%s) recibido(s))"
 
-#: src/inc.c:1107
+#: src/inc.c:1106
 #, fuzzy
 msgid "Connection failed."
 msgstr "Conexión fallida"
 
-#: src/inc.c:1113
+#: src/inc.c:1112
 msgid "Error occurred while processing mail."
 msgstr "Ocurriu un erro mentras se procesaba o correo."
 
-#: src/inc.c:1118
+#: src/inc.c:1117
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2777,28 +2778,28 @@ msgstr ""
 "Ocurriu un erro mentras se procesaba o correo:\n"
 "%s"
 
-#: src/inc.c:1124
+#: src/inc.c:1123
 msgid "No disk space left."
 msgstr "Non hai espacio libre no disco."
 
-#: src/inc.c:1129
+#: src/inc.c:1128
 msgid "Can't write file."
 msgstr "Non se pode escribir o ficheiro."
 
-#: src/inc.c:1134
+#: src/inc.c:1133
 msgid "Socket error."
 msgstr "Error de socket."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1140 src/send_message.c:584 src/send_message.c:772
+#: src/inc.c:1139 src/send_message.c:584 src/send_message.c:772
 msgid "Connection closed by the remote host."
 msgstr ""
 
-#: src/inc.c:1146
+#: src/inc.c:1145
 msgid "Mailbox is locked."
 msgstr "a caixa de correo esta bloqueada."
 
-#: src/inc.c:1150
+#: src/inc.c:1149
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2807,12 +2808,12 @@ msgstr ""
 "a caixa de correo esta bloqueada:\n"
 "%s"
 
-#: src/inc.c:1156 src/send_message.c:757
+#: src/inc.c:1155 src/send_message.c:757
 #, fuzzy
 msgid "Authentication failed."
 msgstr "Fallo de autenticación"
 
-#: src/inc.c:1161 src/send_message.c:760
+#: src/inc.c:1160 src/send_message.c:760
 #, fuzzy, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2821,15 +2822,15 @@ msgstr ""
 "Fallo de autenticación:\n"
 "%s"
 
-#: src/inc.c:1166 src/send_message.c:776
+#: src/inc.c:1165 src/send_message.c:776
 msgid "Session timed out."
 msgstr ""
 
-#: src/inc.c:1202
+#: src/inc.c:1201
 msgid "Incorporation cancelled\n"
 msgstr "Incorporación cancelada\n"
 
-#: src/inc.c:1285
+#: src/inc.c:1284
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Obtendo novos mensaxes dende %s en %s...\n"
@@ -3314,14 +3315,15 @@ msgid "/_View/Mess_age source"
 msgstr "/_Ver/Fonte da mens_axe"
 
 #: src/mainwindow.c:708 src/messageview.c:245
-msgid "/_View/Show all _header"
+#, fuzzy
+msgid "/_View/Show all _headers"
 msgstr "/_Ver/Mostrar todas as cabeceiras"
 
 #: src/mainwindow.c:710
 msgid "/_View/_Update summary"
 msgstr "/_Ver/Actualizar res_umen"
 
-#: src/mainwindow.c:712 src/messageview.c:247
+#: src/mainwindow.c:712 src/messageview.c:248
 msgid "/_Message"
 msgstr "/_Mensaxe"
 
@@ -3356,16 +3358,16 @@ msgstr "/_Mensaxe/Enviar mensa_xes da cola"
 
 #: src/mainwindow.c:722 src/mainwindow.c:724 src/mainwindow.c:731
 #: src/mainwindow.c:736 src/mainwindow.c:739 src/mainwindow.c:750
-#: src/mainwindow.c:752 src/mainwindow.c:755 src/messageview.c:250
-#: src/messageview.c:258 src/messageview.c:263
+#: src/mainwindow.c:752 src/mainwindow.c:755 src/messageview.c:251
+#: src/messageview.c:259 src/messageview.c:264
 msgid "/_Message/---"
 msgstr "/_Mensaxe/---"
 
-#: src/mainwindow.c:723 src/messageview.c:248
+#: src/mainwindow.c:723 src/messageview.c:249
 msgid "/_Message/Compose _new message"
 msgstr "/_Mensaxe/Compoñer _nova mensaxe"
 
-#: src/mainwindow.c:725 src/messageview.c:251
+#: src/mainwindow.c:725 src/messageview.c:252
 msgid "/_Message/_Reply"
 msgstr "/_Mensaxe/_Respostar"
 
@@ -3373,27 +3375,27 @@ msgstr "/_Mensaxe/_Respostar"
 msgid "/_Message/Repl_y to"
 msgstr "/_Mensaxe/Respos_tar a"
 
-#: src/mainwindow.c:727 src/messageview.c:252
+#: src/mainwindow.c:727 src/messageview.c:253
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Mensaxe/Respos_tar a/A _todos"
 
-#: src/mainwindow.c:728 src/messageview.c:254
+#: src/mainwindow.c:728 src/messageview.c:255
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Mensaxe/Respos_tar a/Ó _remitente"
 
-#: src/mainwindow.c:729 src/messageview.c:256
+#: src/mainwindow.c:729 src/messageview.c:257
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Mensaxe/Respos_tar a/Á _lista de correo"
 
-#: src/mainwindow.c:732 src/messageview.c:259
+#: src/mainwindow.c:732 src/messageview.c:260
 msgid "/_Message/_Forward"
 msgstr "/_Mensaxe/_Reenviar"
 
-#: src/mainwindow.c:733 src/messageview.c:260
+#: src/mainwindow.c:733 src/messageview.c:261
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Mensaxe/Reen_viar como adxunto"
 
-#: src/mainwindow.c:735 src/messageview.c:262
+#: src/mainwindow.c:735 src/messageview.c:263
 msgid "/_Message/Redirec_t"
 msgstr "/_Mensaxe/Red_irixir"
 
@@ -3452,7 +3454,7 @@ msgstr "/_Mensaxe/Rec_ibir correo novo"
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/_Mensaxe/Rec_ibir correo novo"
 
-#: src/mainwindow.c:756 src/messageview.c:264
+#: src/mainwindow.c:756 src/messageview.c:265
 msgid "/_Message/Re-_edit"
 msgstr "/_Mensaxe/Re_editar"
 
@@ -3471,23 +3473,23 @@ msgstr "/_Ferramentas/_Filtrar Mensaxes"
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Ferramentas/_Filtrar Mensaxes"
 
-#: src/mainwindow.c:767 src/messageview.c:271
+#: src/mainwindow.c:767 src/messageview.c:272
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Ferramentas/_Crear Regra de filtrado"
 
-#: src/mainwindow.c:768 src/messageview.c:273
+#: src/mainwindow.c:768 src/messageview.c:274
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Ferramentas/_Crear Regra de filtrado/_Automáticamente"
 
-#: src/mainwindow.c:770 src/messageview.c:275
+#: src/mainwindow.c:770 src/messageview.c:276
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Ferramentas/_Crear Regra de filtrado/Baseada en _Dende"
 
-#: src/mainwindow.c:772 src/messageview.c:277
+#: src/mainwindow.c:772 src/messageview.c:278
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Ferramentas/_Crear Regra de filtrado/Baseada en _Para"
 
-#: src/mainwindow.c:774 src/messageview.c:279
+#: src/mainwindow.c:774 src/messageview.c:280
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Ferramentas/_Crear Regra de filtrado/Baseada no _Asunto"
 
@@ -3608,7 +3610,7 @@ msgid "MainWindow: color allocation %d failed\n"
 msgstr "MainWindow: fallo solicitando cor %d\n"
 
 #: src/mainwindow.c:1139 src/summaryview.c:2275 src/summaryview.c:2360
-#: src/summaryview.c:3907 src/summaryview.c:4036 src/summaryview.c:4394
+#: src/summaryview.c:3908 src/summaryview.c:4037 src/summaryview.c:4395
 msgid "done.\n"
 msgstr "feito.\n"
 
@@ -3874,7 +3876,7 @@ msgid "Find text:"
 msgstr "Buscar texto:"
 
 #: src/message_search.c:153 src/prefs_search_folder.c:253
-#: src/query_search.c:326
+#: src/query_search.c:343
 msgid "Case sensitive"
 msgstr "Maiús./minús."
 
@@ -3898,27 +3900,27 @@ msgstr "Chegóuse ó final da mensaxe. ¿Seguir dende o principio?"
 msgid "Search finished"
 msgstr "Búsqueda concluida"
 
-#: src/messageview.c:268
+#: src/messageview.c:269
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/_Ferramentas/Engadir _remitente á axenda"
 
-#: src/messageview.c:300
+#: src/messageview.c:301
 msgid "Creating message view...\n"
 msgstr "Creando visor de mensaxe...\n"
 
-#: src/messageview.c:325
+#: src/messageview.c:326
 msgid "Text"
 msgstr "Texto"
 
-#: src/messageview.c:330
+#: src/messageview.c:331
 msgid "Attachments"
 msgstr "Adxuntos"
 
-#: src/messageview.c:380
+#: src/messageview.c:381
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:699 src/summaryview.c:3436
+#: src/messageview.c:700 src/summaryview.c:3436
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Non podo gardar o ficheiro `%s'."
@@ -3936,7 +3938,7 @@ msgstr "Executar"
 msgid "Print"
 msgstr "Imprimir"
 
-#: src/messageview.c:770 src/summaryview.c:3471
+#: src/messageview.c:769 src/summaryview.c:3470
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -4036,11 +4038,11 @@ msgstr ""
 "Teclee o comando para abrir o Ficheiro:\n"
 "(`%s' será sustituido por o ficheiro)"
 
-#: src/mimeview.c:1147
+#: src/mimeview.c:1140
 msgid "Opening executable file"
 msgstr ""
 
-#: src/mimeview.c:1148
+#: src/mimeview.c:1141
 msgid ""
 "This is an executable file. Opening executable file is restricted for "
 "security.\n"
@@ -4048,11 +4050,6 @@ msgid ""
 "virus or something like a malicious program."
 msgstr ""
 
-#: src/mimeview.c:1184
-#, c-format
-msgid "MIME viewer command line is invalid: `%s'"
-msgstr "o comando do visor MIME non é válido: `%s'"
-
 #: src/passphrase.c:96
 msgid "Passphrase"
 msgstr "Frase contrasinal"
@@ -5854,21 +5851,21 @@ msgstr "Respostar-A:"
 msgid "%s - Edit search condition"
 msgstr ""
 
-#: src/prefs_search_folder.c:209 src/query_search.c:257
+#: src/prefs_search_folder.c:209 src/query_search.c:274
 msgid "Match any of the following"
 msgstr ""
 
-#: src/prefs_search_folder.c:211 src/query_search.c:259
+#: src/prefs_search_folder.c:211 src/query_search.c:276
 #, fuzzy
 msgid "Match all of the following"
 msgstr "Establecer os seguintes enderezos automáticamente"
 
-#: src/prefs_search_folder.c:231 src/query_search.c:303
+#: src/prefs_search_folder.c:231 src/query_search.c:320
 #, fuzzy
 msgid "Folder:"
 msgstr "Carpeta"
 
-#: src/prefs_search_folder.c:248 src/query_search.c:321
+#: src/prefs_search_folder.c:248 src/query_search.c:338
 #, fuzzy
 msgid "Search subfolders"
 msgstr "Búsqueda fallida"
@@ -5883,17 +5880,17 @@ msgid "Attachment"
 msgstr "Adxunto"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73 src/query_search.c:371 src/summaryview.c:4901
+#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4902
 msgid "Subject"
 msgstr "Asunto"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/query_search.c:372 src/summaryview.c:4904
+#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4905
 msgid "From"
 msgstr "Dende"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/query_search.c:373 src/summaryview.c:4906
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:4907
 msgid "Date"
 msgstr "Data"
 
@@ -5986,43 +5983,43 @@ msgstr "Creando diálogo de progreso...\n"
 msgid "Status"
 msgstr "Estado"
 
-#: src/query_search.c:234
+#: src/query_search.c:251
 msgid "Search messages"
 msgstr "Buscar nas mensaxes"
 
-#: src/query_search.c:395
+#: src/query_search.c:423
 #, fuzzy
 msgid "_Save as search folder"
 msgstr "Gardar como borrador"
 
-#: src/query_search.c:512 src/subscribedialog.c:526 src/summaryview.c:842
+#: src/query_search.c:542 src/subscribedialog.c:526 src/summaryview.c:842
 msgid "Done."
 msgstr "Feito."
 
-#: src/query_search.c:536
+#: src/query_search.c:566
 #, fuzzy, c-format
 msgid "Searching %s ..."
 msgstr "Revisando carpeta %s ..."
 
-#: src/query_search.c:564
+#: src/query_search.c:594
 #, fuzzy, c-format
 msgid "Searching %s (%d / %d)..."
 msgstr "Filtrando..."
 
-#: src/query_search.c:645 src/summaryview.c:2051
+#: src/query_search.c:675 src/summaryview.c:2051
 msgid "(No Date)"
 msgstr "(Sin data)"
 
-#: src/query_search.c:833
+#: src/query_search.c:869
 #, fuzzy
 msgid "Save as search folder"
 msgstr "Gardar como borrador"
 
-#: src/query_search.c:854
+#: src/query_search.c:890
 msgid "Location:"
 msgstr ""
 
-#: src/query_search.c:869
+#: src/query_search.c:905
 #, fuzzy
 msgid "Folder name:"
 msgstr "Nome de ficheiro"
@@ -6654,38 +6651,38 @@ msgstr "Mensaxe %d marcada para copiar a %s\n"
 msgid "Destination for copy is same as current folder."
 msgstr "o destino de copia é a carpeta actual."
 
-#: src/summaryview.c:3506
+#: src/summaryview.c:3507
 #, fuzzy
 msgid "Error occurred while processing messages."
 msgstr "Ocurriu un erro mentras se procesaba o correo."
 
-#: src/summaryview.c:3814 src/summaryview.c:3815
+#: src/summaryview.c:3815 src/summaryview.c:3816
 msgid "Building threads..."
 msgstr "Construindo xerarquía..."
 
-#: src/summaryview.c:3965 src/summaryview.c:3966
+#: src/summaryview.c:3966 src/summaryview.c:3967
 msgid "Unthreading..."
 msgstr "Desfacendo xerarquía..."
 
-#: src/summaryview.c:4259 src/summaryview.c:4315
+#: src/summaryview.c:4260 src/summaryview.c:4316
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtrando..."
 
-#: src/summaryview.c:4364
+#: src/summaryview.c:4365
 msgid "filtering..."
 msgstr "filtrando..."
 
-#: src/summaryview.c:4365
+#: src/summaryview.c:4366
 msgid "Filtering..."
 msgstr "Filtrando..."
 
-#: src/summaryview.c:4401
+#: src/summaryview.c:4402
 #, fuzzy, c-format
 msgid "%d message(s) have been filtered."
 msgstr "o mensaxe %d xa esta en caché.\n"
 
-#: src/summaryview.c:4910
+#: src/summaryview.c:4911
 msgid "No."
 msgstr "Non."
 
@@ -6775,6 +6772,9 @@ msgstr "Sair"
 msgid "Sylpheed"
 msgstr "Antigos de Sylpheed"
 
+#~ msgid "MIME viewer command line is invalid: `%s'"
+#~ msgstr "o comando do visor MIME non é válido: `%s'"
+
 #~ msgid "Wrap before sending"
 #~ msgstr "Recortar antes de enviar"
 
diff --git a/po/hr.po b/po/hr.po
index dae21136..e523806e 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-03-02 19:03+0900\n"
+"POT-Creation-Date: 2006-03-10 16:06+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:491
+#: libsylph/prefs_common.c:496
 #, fuzzy
 msgid "Junk mail filter"
 msgstr "Spis"
@@ -529,7 +529,7 @@ msgstr "ne mogu otvoriti obilježenu datoteku\n"
 msgid "can't fetch message %d\n"
 msgstr "ne mogu dohvatiti poruku %d\n"
 
-#: libsylph/procmsg.c:1375
+#: libsylph/procmsg.c:1378
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Naredba za ispis nije dobra: `%s'\n"
@@ -609,12 +609,12 @@ msgstr "  Tema: %s\n"
 msgid "  Issuer: %s\n"
 msgstr "  Izdavač: %s\n"
 
-#: libsylph/utils.c:2411 src/compose.c:2869 src/compose.c:3132
-#: src/compose.c:3195 src/compose.c:3315
+#: libsylph/utils.c:2430 src/compose.c:2888 src/compose.c:3151
+#: src/compose.c:3214 src/compose.c:3334
 msgid "can't change file mode\n"
 msgstr "ne mogu promjeniti atribut datoteke\n"
 
-#: libsylph/utils.c:2418 libsylph/utils.c:2542
+#: libsylph/utils.c:2437 libsylph/utils.c:2561
 #, c-format
 msgid "writing to %s failed.\n"
 msgstr "pisanje u %s nije uspjelo.\n"
@@ -696,8 +696,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:493
-#: src/compose.c:4273 src/editaddress.c:200 src/editaddress.c:942
+#: src/account_dialog.c:366 src/addressadd.c:192 src/addressbook.c:491
+#: src/compose.c:4292 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 ""
 msgid "Add Address to Book"
 msgstr "Dodaj adresu u adresar"
 
-#: src/addressadd.c:202 src/compose.c:4777 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4796 src/editaddress.c:201
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "Adresa"
 
-#: src/addressadd.c:212 src/addressbook.c:495 src/editaddress.c:202
+#: src/addressadd.c:212 src/addressbook.c:493 src/editaddress.c:202
 #: src/editaddress.c:795 src/editaddress.c:860 src/editgroup.c:267
 msgid "Remarks"
 msgstr "Bilješke"
@@ -844,111 +844,112 @@ msgstr "Bilješke"
 msgid "Select Address Book Folder"
 msgstr "Odaberite spis adresara"
 
-#: src/addressbook.c:338 src/compose.c:515 src/mainwindow.c:489
+#: src/addressbook.c:337 src/compose.c:515 src/mainwindow.c:489
 #: src/messageview.c:140
 msgid "/_File"
 msgstr "/_Datoteka"
 
-#: src/addressbook.c:339
+#: src/addressbook.c:338
 msgid "/_File/New _Book"
 msgstr "/_Datoteka/Nova _knjiga"
 
-#: src/addressbook.c:340
+#: src/addressbook.c:339
 msgid "/_File/New _vCard"
 msgstr "/_Datoteka/Nova _V-kartica"
 
-#: src/addressbook.c:342
+#: src/addressbook.c:341
 #, fuzzy
 msgid "/_File/New _JPilot"
 msgstr "/_Datoteka/Novi _J-Pilot"
 
-#: src/addressbook.c:345
-msgid "/_File/New _Server"
+#: src/addressbook.c:344
+#, fuzzy
+msgid "/_File/New _LDAP Server"
 msgstr "/_Datoteka/Novi _poslužitelj"
 
-#: src/addressbook.c:347 src/addressbook.c:350 src/compose.c:520
+#: src/addressbook.c:346 src/addressbook.c:349 src/compose.c:520
 #: src/compose.c:525 src/compose.c:528 src/compose.c:531 src/mainwindow.c:507
 #: src/mainwindow.c:510 src/mainwindow.c:512 src/mainwindow.c:515
 #: src/mainwindow.c:517 src/messageview.c:143
 msgid "/_File/---"
 msgstr "/_Datoteka/---"
 
-#: src/addressbook.c:348
+#: src/addressbook.c:347
 msgid "/_File/_Edit"
 msgstr "/_Datoteka/_Uredi"
 
-#: src/addressbook.c:349
+#: src/addressbook.c:348
 msgid "/_File/_Delete"
 msgstr "/_Datoteka/_Obriši"
 
-#: src/addressbook.c:351
+#: src/addressbook.c:350
 msgid "/_File/_Save"
 msgstr "/_Datoteka/_Spremi"
 
-#: src/addressbook.c:352 src/compose.c:532 src/messageview.c:144
+#: src/addressbook.c:351 src/compose.c:532 src/messageview.c:144
 msgid "/_File/_Close"
 msgstr "/_Datoteka/_Zatvori"
 
-#: src/addressbook.c:353
+#: src/addressbook.c:352
 msgid "/_Address"
 msgstr "/_Adresa"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:353
 msgid "/_Address/New _Address"
 msgstr "/_Adresa/Nova _adresa"
 
-#: src/addressbook.c:355
+#: src/addressbook.c:354
 msgid "/_Address/New _Group"
 msgstr "/_Adresa/Nova _grupa"
 
-#: src/addressbook.c:356
+#: src/addressbook.c:355
 msgid "/_Address/New _Folder"
 msgstr "/_Adresa/Novi _spis"
 
-#: src/addressbook.c:357
+#: src/addressbook.c:356
 msgid "/_Address/---"
 msgstr "/_Adresa/---"
 
-#: src/addressbook.c:358
+#: src/addressbook.c:357
 msgid "/_Address/_Edit"
 msgstr "/_Adresa/_Uredi"
 
-#: src/addressbook.c:359
+#: src/addressbook.c:358
 msgid "/_Address/_Delete"
 msgstr "/_Adresa/O_briši"
 
-#: src/addressbook.c:360 src/compose.c:645 src/mainwindow.c:758
-#: src/messageview.c:266
+#: src/addressbook.c:359 src/compose.c:645 src/mainwindow.c:758
+#: src/messageview.c:267
 msgid "/_Tools"
 msgstr "/_Alati"
 
-#: src/addressbook.c:361
+#: src/addressbook.c:360
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Datoteka/Unesi _LDIF datoteku"
 
-#: src/addressbook.c:362 src/compose.c:666 src/mainwindow.c:812
-#: src/messageview.c:286
+#: src/addressbook.c:361 src/compose.c:666 src/mainwindow.c:812
+#: src/messageview.c:287
 msgid "/_Help"
 msgstr "/_Pomoć"
 
-#: src/addressbook.c:363 src/compose.c:667 src/mainwindow.c:824
-#: src/messageview.c:287
+#: src/addressbook.c:362 src/compose.c:667 src/mainwindow.c:824
+#: src/messageview.c:288
 msgid "/_Help/_About"
 msgstr "/_Pomoć/_O"
 
-#: src/addressbook.c:382 src/addressbook.c:392
+#: src/addressbook.c:381 src/addressbook.c:391
 msgid "/New _Address"
 msgstr "/Nova _adresa"
 
-#: src/addressbook.c:383 src/addressbook.c:393
+#: src/addressbook.c:382 src/addressbook.c:392
 msgid "/New _Group"
 msgstr "/Nova _grupa"
 
-#: src/addressbook.c:384 src/addressbook.c:394
+#: src/addressbook.c:383 src/addressbook.c:393
 msgid "/New _Folder"
 msgstr "/Novi _spis"
 
-#: src/addressbook.c:385 src/addressbook.c:395 src/compose.c:509
+#: src/addressbook.c:384 src/addressbook.c:394 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
@@ -958,70 +959,70 @@ msgstr "/Novi _spis"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:386 src/addressbook.c:396 src/compose.c:534
+#: src/addressbook.c:385 src/addressbook.c:395 src/compose.c:534
 #: src/mainwindow.c:521 src/messageview.c:146
 msgid "/_Edit"
 msgstr "/_Uredi"
 
-#: src/addressbook.c:387 src/addressbook.c:397 src/summaryview.c:434
+#: src/addressbook.c:386 src/addressbook.c:396 src/summaryview.c:434
 msgid "/_Delete"
 msgstr "/_Obriši"
 
-#: src/addressbook.c:494
+#: src/addressbook.c:492
 msgid "E-Mail address"
 msgstr "E-mail adresa"
 
-#: src/addressbook.c:498 src/compose.c:4778 src/prefs_common_dialog.c:2183
+#: src/addressbook.c:496 src/compose.c:4797 src/prefs_common_dialog.c:2183
 msgid "Address book"
 msgstr "Adresar"
 
-#: src/addressbook.c:600 src/prefs_filter_edit.c:249
+#: src/addressbook.c:603 src/prefs_filter_edit.c:249
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "Ime:"
 
 #. Buttons
-#: src/addressbook.c:632 src/addressbook.c:1684 src/editaddress.c:884
+#: src/addressbook.c:636 src/addressbook.c:1678 src/editaddress.c:884
 #: src/editaddress.c:1017 src/mainwindow.c:2426 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:635 src/editaddress.c:890 src/editaddress.c:1023
+#: src/addressbook.c:639 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:1552
 msgid "Add"
 msgstr "Dodaj"
 
-#: src/addressbook.c:638
+#: src/addressbook.c:642
 msgid "Lookup"
 msgstr "Potraži"
 
-#: src/addressbook.c:650 src/headerview.c:55 src/prefs_folder_item.c:339
+#: src/addressbook.c:654 src/headerview.c:55 src/prefs_folder_item.c:339
 #: src/prefs_template.c:176
 msgid "To:"
 msgstr "Za:"
 
-#: src/addressbook.c:654 src/prefs_folder_item.c:356 src/prefs_template.c:178
+#: src/addressbook.c:658 src/prefs_folder_item.c:356 src/prefs_template.c:178
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:658 src/prefs_folder_item.c:367
+#: src/addressbook.c:662 src/prefs_folder_item.c:367
 msgid "Bcc:"
 msgstr "Bcc:"
 
 #. Confirm deletion
-#: src/addressbook.c:845
+#: src/addressbook.c:832
 msgid "Delete address(es)"
 msgstr "Obriši adresu/e"
 
-#: src/addressbook.c:846
+#: src/addressbook.c:833
 msgid "Really delete the address(es)?"
 msgstr "Uistinu obrisati adresu/e?"
 
-#: src/addressbook.c:1675
+#: src/addressbook.c:1669
 #, fuzzy, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1030,38 +1031,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:1678 src/folderview.c:2372
+#: src/addressbook.c:1672 src/folderview.c:2372
 msgid "Delete folder"
 msgstr "Obriši spis"
 
-#: src/addressbook.c:1678
+#: src/addressbook.c:1672
 #, fuzzy
 msgid "_Folder only"
 msgstr "Samo spis"
 
-#: src/addressbook.c:1678
+#: src/addressbook.c:1672
 #, fuzzy
 msgid "Folder and _addresses"
 msgstr "Spis i adrese"
 
-#: src/addressbook.c:1683
+#: src/addressbook.c:1677
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Uistinu obrisati `%s' ?"
 
-#: src/addressbook.c:2369 src/addressbook.c:2502
+#: src/addressbook.c:2363 src/addressbook.c:2496
 msgid "New user, could not save index file."
 msgstr "Novi korisnik, ne mogu spretmiti index datoteku."
 
-#: src/addressbook.c:2373 src/addressbook.c:2506
+#: src/addressbook.c:2367 src/addressbook.c:2500
 msgid "New user, could not save address book files."
 msgstr "Novi korisnik, ne mogu spremiti datoteke adresara."
 
-#: src/addressbook.c:2383 src/addressbook.c:2516
+#: src/addressbook.c:2377 src/addressbook.c:2510
 msgid "Old address book converted successfully."
 msgstr "Stari adresar uspješno unešen."
 
-#: src/addressbook.c:2388
+#: src/addressbook.c:2382
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1069,7 +1070,7 @@ msgstr ""
 "Stari adresar ne može biti unešen,\n"
 "ne mogu spremiti novu index datoteku adresara."
 
-#: src/addressbook.c:2401
+#: src/addressbook.c:2395
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1077,7 +1078,7 @@ msgstr ""
 "Ne mogu unjeti adesar,\n"
 "ali sam kreirao nove prazne datoteke adresara."
 
-#: src/addressbook.c:2407
+#: src/addressbook.c:2401
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1085,7 +1086,7 @@ msgstr ""
 "Ne mogu unjeti adresar,\n"
 "ne mogu kreirati nove datoteke adresara."
 
-#: src/addressbook.c:2412
+#: src/addressbook.c:2406
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1093,85 +1094,85 @@ msgstr ""
 "Ne mogu unjeti adresar,\n"
 "i ne mogu stvoriti nove datoteke adresara."
 
-#: src/addressbook.c:2419
+#: src/addressbook.c:2413
 msgid "Addressbook conversion error"
 msgstr "Greška pri unosu adresara"
 
-#: src/addressbook.c:2423
+#: src/addressbook.c:2417
 msgid "Addressbook conversion"
 msgstr "Unos adresara"
 
-#: src/addressbook.c:2458
+#: src/addressbook.c:2452
 msgid "Addressbook Error"
 msgstr "Greška adresara"
 
-#: src/addressbook.c:2459 src/addressbook.c:2559
+#: src/addressbook.c:2453 src/addressbook.c:2553
 msgid "Could not read address index"
 msgstr "Ne mogu čitati index adresara"
 
-#: src/addressbook.c:2521
+#: src/addressbook.c:2515
 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:2535
+#: src/addressbook.c:2529
 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:2541
+#: src/addressbook.c:2535
 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:2547
+#: src/addressbook.c:2541
 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:2565
+#: src/addressbook.c:2559
 msgid "Addressbook Conversion Error"
 msgstr "Greška pri unosu adresara"
 
-#: src/addressbook.c:2571
+#: src/addressbook.c:2565
 msgid "Addressbook Conversion"
 msgstr "Unos adresara"
 
-#: src/addressbook.c:3086 src/prefs_common_dialog.c:2033
+#: src/addressbook.c:3080 src/prefs_common_dialog.c:2033
 msgid "Interface"
 msgstr "Sučelje"
 
-#: src/addressbook.c:3102 src/importldif.c:514
+#: src/addressbook.c:3096 src/importldif.c:514
 msgid "Address Book"
 msgstr "Adresar"
 
-#: src/addressbook.c:3118
+#: src/addressbook.c:3112
 msgid "Person"
 msgstr "Osoba"
 
-#: src/addressbook.c:3134
+#: src/addressbook.c:3128
 msgid "EMail Address"
 msgstr "E-mail adresa"
 
-#: src/addressbook.c:3150
+#: src/addressbook.c:3144
 msgid "Group"
 msgstr "Grupa"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3166 src/folderview.c:367 src/prefs_account_dialog.c:1694
-#: src/query_search.c:370
+#: src/addressbook.c:3160 src/folderview.c:367 src/prefs_account_dialog.c:1694
+#: src/query_search.c:398
 msgid "Folder"
 msgstr "Spis"
 
-#: src/addressbook.c:3182
+#: src/addressbook.c:3176
 msgid "vCard"
 msgstr "V-kartica"
 
-#: src/addressbook.c:3198 src/addressbook.c:3214
+#: src/addressbook.c:3192 src/addressbook.c:3208
 #, fuzzy
 msgid "JPilot"
 msgstr "J-Pilot"
 
-#: src/addressbook.c:3230
+#: src/addressbook.c:3224
 msgid "LDAP Server"
 msgstr "LDAP Poslužitelj"
 
@@ -1183,7 +1184,7 @@ msgstr "Uobičajene adrese"
 msgid "Personal address"
 msgstr "Osobne adrese"
 
-#: src/alertpanel.c:142 src/compose.c:5500 src/main.c:621
+#: src/alertpanel.c:142 src/compose.c:5517 src/main.c:621
 msgid "Notice"
 msgstr "Obavijest"
 
@@ -1191,7 +1192,7 @@ msgstr "Obavijest"
 msgid "Warning"
 msgstr "Upozorenje"
 
-#: src/alertpanel.c:168 src/inc.c:587
+#: src/alertpanel.c:168 src/inc.c:586
 msgid "Error"
 msgstr "Greška"
 
@@ -1234,7 +1235,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:4761
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4762
 msgid "None"
 msgstr "Ništa"
 
@@ -1521,7 +1522,7 @@ msgstr "/_Pregled/_Znakovni standard/Thai (TIS-620)"
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Pregled/_Znakovni standard/Thai (Windows-874)"
 
-#: src/compose.c:646 src/mainwindow.c:759 src/messageview.c:267
+#: src/compose.c:646 src/mainwindow.c:759 src/messageview.c:268
 #, fuzzy
 msgid "/_Tools/_Address book"
 msgstr "/_Alat/_Adresar"
@@ -1531,15 +1532,15 @@ msgstr "/_Alat/_Adresar"
 msgid "/_Tools/_Template"
 msgstr "/_Alat/_Obrazac"
 
-#: src/compose.c:649 src/mainwindow.c:783 src/messageview.c:283
+#: src/compose.c:649 src/mainwindow.c:783 src/messageview.c:284
 #, fuzzy
 msgid "/_Tools/Actio_ns"
 msgstr "/_Izvrši"
 
 #: src/compose.c:651 src/compose.c:655 src/compose.c:661 src/mainwindow.c:762
 #: src/mainwindow.c:776 src/mainwindow.c:781 src/mainwindow.c:784
-#: src/mainwindow.c:788 src/mainwindow.c:790 src/messageview.c:270
-#: src/messageview.c:282
+#: src/mainwindow.c:788 src/mainwindow.c:790 src/messageview.c:271
+#: src/messageview.c:283
 #, fuzzy
 msgid "/_Tools/---"
 msgstr "/_Alat"
@@ -1569,80 +1570,80 @@ msgstr "/_Izvrši"
 msgid "/_Tools/_Set spell language"
 msgstr "/_Alat/_Obrazac"
 
-#: src/compose.c:910
+#: src/compose.c:912
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: datoteka ne postoji\n"
 
-#: src/compose.c:1014 src/compose.c:1085
+#: src/compose.c:1016 src/compose.c:1087
 msgid "Can't get text part\n"
 msgstr "Ne mogu dobiti dio tekst\n"
 
-#: src/compose.c:1486
+#: src/compose.c:1488
 msgid "Quote mark format error."
 msgstr "Greška formata citata."
 
-#: src/compose.c:1498
+#: src/compose.c:1500
 msgid "Message reply/forward format error."
 msgstr "Greška poruke odgovori/proslijedi."
 
-#: src/compose.c:1918
+#: src/compose.c:1935
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Datoteka %s ne postoji\n"
 
-#: src/compose.c:1922
+#: src/compose.c:1939
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Ne mogu dobiti veličinu datoteke %s\n"
 
-#: src/compose.c:1926
+#: src/compose.c:1943
 #, fuzzy, c-format
 msgid "File %s is empty."
 msgstr "Datoteka %s je prazna\n"
 
-#: src/compose.c:1930
+#: src/compose.c:1947
 #, fuzzy, c-format
 msgid "Can't read %s."
 msgstr "ne mogu kreirati %s\n"
 
-#: src/compose.c:1963
+#: src/compose.c:1980
 #, c-format
 msgid "Message: %s"
 msgstr "Poruka: %s"
 
-#: src/compose.c:2023 src/mimeview.c:565
+#: src/compose.c:2040 src/mimeview.c:565
 msgid "Can't get the part of multipart message."
 msgstr "Ne mogu dobiti dio višedjelne poruke."
 
-#: src/compose.c:2507 src/headerview.c:195 src/query_search.c:636
+#: src/compose.c:2524 src/headerview.c:195 src/query_search.c:666
 #: src/summaryview.c:2124
 msgid "(No Subject)"
 msgstr "(Bez teme)"
 
-#: src/compose.c:2510
+#: src/compose.c:2527
 #, fuzzy, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Pisanje poruke%s"
 
-#: src/compose.c:2623
+#: src/compose.c:2642
 msgid "Recipient is not specified."
 msgstr "Nije upisan primatelj."
 
-#: src/compose.c:2631
+#: src/compose.c:2650
 #, fuzzy
 msgid "Empty subject"
 msgstr "Tema"
 
-#: src/compose.c:2632
+#: src/compose.c:2651
 msgid "Subject is empty. Send it anyway?"
 msgstr ""
 
-#: src/compose.c:2691
+#: src/compose.c:2710
 msgid "can't get recipient list."
 msgstr "ne mogu dobiti listu primatelja."
 
-#: src/compose.c:2711
+#: src/compose.c:2730
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1650,21 +1651,21 @@ msgstr ""
 "Račun za slanje pošte nije definiran.\n"
 "Molim, odaberite račun prije slanja."
 
-#: src/compose.c:2725 src/send_message.c:299
+#: src/compose.c:2744 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:2767
+#: src/compose.c:2786
 msgid "Can't save the message to outbox."
 msgstr "Ne mogu snimiti poruku u spis poslano."
 
-#: src/compose.c:2805
+#: src/compose.c:2824
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr ""
 
-#: src/compose.c:2902
+#: src/compose.c:2921
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1672,12 +1673,12 @@ msgid ""
 "Send it as %s anyway?"
 msgstr "Ne mogu promjeniti charset poruke."
 
-#: src/compose.c:2908
+#: src/compose.c:2927
 #, fuzzy
 msgid "Code conversion error"
 msgstr "Greška pri unosu adresara"
 
-#: src/compose.c:2981
+#: src/compose.c:3000
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1686,162 +1687,162 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:2985
+#: src/compose.c:3004
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3275
+#: src/compose.c:3294
 msgid "can't remove the old message\n"
 msgstr "ne mogu ukloniti staru poruku\n"
 
-#: src/compose.c:3293
+#: src/compose.c:3312
 msgid "queueing message...\n"
 msgstr "odlažem poruku...\n"
 
-#: src/compose.c:3375
+#: src/compose.c:3394
 #, fuzzy
 msgid "can't find queue folder\n"
 msgstr "ne mogu odabrati spis: %s\n"
 
-#: src/compose.c:3382
+#: src/compose.c:3401
 msgid "can't queue the message\n"
 msgstr "ne mogu odložiti poruku\n"
 
-#: src/compose.c:3975
+#: src/compose.c:3994
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "generiran ID-poruke: %s\n"
 
-#: src/compose.c:4088
+#: src/compose.c:4107
 msgid "Creating compose window...\n"
 msgstr "Stvaram prozor za pisanje...\n"
 
-#: src/compose.c:4139 src/headerview.c:54
+#: src/compose.c:4158 src/headerview.c:54
 msgid "From:"
 msgstr "Od:"
 
-#: src/compose.c:4213
+#: src/compose.c:4232
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/_Izvrši"
 
-#: src/compose.c:4216
+#: src/compose.c:4235
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/_Poruka/_Kriptiraj"
 
-#: src/compose.c:4254 src/compose.c:5332
+#: src/compose.c:4273 src/compose.c:5351
 msgid "MIME type"
 msgstr "MIME tip"
 
 #. S_COL_DATE
-#: src/compose.c:4263 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4908
+#: src/compose.c:4282 src/mimeview.c:197 src/prefs_filter_edit.c:496
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4909
 msgid "Size"
 msgstr "Veličina"
 
-#: src/compose.c:4698 src/mainwindow.c:2359 src/prefs_account_dialog.c:528
+#: src/compose.c:4717 src/mainwindow.c:2359 src/prefs_account_dialog.c:528
 #: src/prefs_common_dialog.c:661
 msgid "Send"
 msgstr "Pošalji"
 
-#: src/compose.c:4699
+#: src/compose.c:4718
 msgid "Send message"
 msgstr "Pošalji poruku"
 
-#: src/compose.c:4707
+#: src/compose.c:4726
 msgid "Send later"
 msgstr "Pošalji kasnije"
 
-#: src/compose.c:4708
+#: src/compose.c:4727
 msgid "Put into queue folder and send later"
 msgstr "Odloži u spis odloženo i pošalji kasnije"
 
-#: src/compose.c:4716
+#: src/compose.c:4735
 msgid "Draft"
 msgstr "Nedovršeno"
 
-#: src/compose.c:4717
+#: src/compose.c:4736
 msgid "Save to draft folder"
 msgstr "Spremi u spis nedovršeno"
 
-#: src/compose.c:4727
+#: src/compose.c:4746
 msgid "Insert"
 msgstr "Unesi"
 
-#: src/compose.c:4728
+#: src/compose.c:4747
 msgid "Insert file"
 msgstr "Unesi datoteku"
 
-#: src/compose.c:4736
+#: src/compose.c:4755
 msgid "Attach"
 msgstr "Priloži"
 
-#: src/compose.c:4737
+#: src/compose.c:4756
 msgid "Attach file"
 msgstr "Priloži datoteku"
 
 #. signature
-#: src/compose.c:4747 src/prefs_account_dialog.c:1208
+#: src/compose.c:4766 src/prefs_account_dialog.c:1208
 #: src/prefs_common_dialog.c:953
 msgid "Signature"
 msgstr "Potpis"
 
-#: src/compose.c:4748
+#: src/compose.c:4767
 #, fuzzy
 msgid "Append signature"
 msgstr "LOŠ potpis"
 
 #. editor
-#: src/compose.c:4757 src/prefs_common_dialog.c:991
+#: src/compose.c:4776 src/prefs_common_dialog.c:991
 #: src/prefs_common_dialog.c:2315
 msgid "Editor"
 msgstr "Uređivač"
 
-#: src/compose.c:4758
+#: src/compose.c:4777
 msgid "Edit with external editor"
 msgstr "Uredi s vanjskim uređivačem"
 
-#: src/compose.c:4766
+#: src/compose.c:4785
 msgid "Linewrap"
 msgstr "Sažimanje"
 
-#: src/compose.c:4767
+#: src/compose.c:4786
 #, fuzzy
 msgid "Wrap all long lines"
 msgstr "/_Uredi/Sažmi sve duge _linije"
 
-#: src/compose.c:5228
+#: src/compose.c:5247
 msgid "Invalid MIME type."
 msgstr "Pogrešan MIME tip"
 
-#: src/compose.c:5246
+#: src/compose.c:5265
 msgid "File doesn't exist or is empty."
 msgstr "Datoteka ne postoji ili je prazna."
 
-#: src/compose.c:5314
+#: src/compose.c:5333
 #, fuzzy
 msgid "Properties"
 msgstr "Postavke"
 
-#: src/compose.c:5334 src/prefs_common_dialog.c:1444
+#: src/compose.c:5353 src/prefs_common_dialog.c:1444
 msgid "Encoding"
 msgstr "Kodiranje"
 
-#: src/compose.c:5357 src/prefs_folder_item.c:202
+#: src/compose.c:5376 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Staza"
 
-#: src/compose.c:5358
+#: src/compose.c:5377
 msgid "File name"
 msgstr "Ime datoteke"
 
-#: src/compose.c:5449
+#: src/compose.c:5466
 #, 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:5497
+#: src/compose.c:5514
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1851,49 +1852,49 @@ msgstr ""
 "Ugasiti proces?\n"
 "grupa procesa: %d"
 
-#: src/compose.c:5872 src/compose.c:5877 src/compose.c:5883
+#: src/compose.c:5889 src/compose.c:5894 src/compose.c:5900
 msgid "Can't queue the message."
 msgstr "Ne mogu odložiti poruku."
 
-#: src/compose.c:5974
+#: src/compose.c:5991
 #, fuzzy
 msgid "Select files"
 msgstr "Odaberite datoteku"
 
-#: src/compose.c:5997
+#: src/compose.c:6014
 msgid "Select file"
 msgstr "Odaberite datoteku"
 
-#: src/compose.c:6032
+#: src/compose.c:6049
 #, fuzzy
 msgid "Save message"
 msgstr "Pošalji poruku"
 
-#: src/compose.c:6033
+#: src/compose.c:6050
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Ova poruka je promijenjena, odbaciti?"
 
-#: src/compose.c:6035
+#: src/compose.c:6052
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:6077
+#: src/compose.c:6094
 #, fuzzy, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Uistinu obrisati ovaj obrazac?"
 
-#: src/compose.c:6079
+#: src/compose.c:6096
 #, fuzzy
 msgid "Apply template"
 msgstr "Briši obrazac"
 
-#: src/compose.c:6080
+#: src/compose.c:6097
 #, fuzzy
 msgid "_Replace"
 msgstr "Obrazac"
 
-#: src/compose.c:6080
+#: src/compose.c:6097
 #, fuzzy
 msgid "_Insert"
 msgstr "Unesi"
@@ -2015,52 +2016,52 @@ msgstr "Ime grupe mora biti unešeno."
 msgid "Edit Group Data"
 msgstr "Uredi grupu"
 
-#: src/editgroup.c:300
+#: src/editgroup.c:299
 msgid "Group Name"
 msgstr "Ime grupe"
 
-#: src/editgroup.c:319
+#: src/editgroup.c:318
 msgid "Addresses in Group"
 msgstr "Adrese u grupi"
 
-#: src/editgroup.c:321
+#: src/editgroup.c:320
 msgid " -> "
 msgstr " -> "
 
-#: src/editgroup.c:348
+#: src/editgroup.c:347
 msgid " <- "
 msgstr " <- "
 
-#: src/editgroup.c:350
+#: src/editgroup.c:349
 msgid "Available Addresses"
 msgstr "Dostupne adrese"
 
-#: src/editgroup.c:416
+#: src/editgroup.c:415
 msgid "Move E-Mail Addresses to or from Group with arrow buttons"
 msgstr "Pomaknite E-mail adrese prema ili od grupe sa strelicama"
 
-#: src/editgroup.c:468
+#: src/editgroup.c:467
 msgid "Edit Group Details"
 msgstr "Uredi detalje grupe"
 
-#: src/editgroup.c:471
+#: src/editgroup.c:470
 msgid "Add New Group"
 msgstr "Dodaj novu grupu"
 
-#: src/editgroup.c:522
+#: src/editgroup.c:521
 msgid "Edit folder"
 msgstr "Uredi spis"
 
-#: src/editgroup.c:522
+#: src/editgroup.c:521
 msgid "Input the new name of folder:"
 msgstr "Unesite ime novog spisa:"
 
-#: src/editgroup.c:525 src/foldersel.c:541 src/folderview.c:2121
+#: src/editgroup.c:524 src/foldersel.c:541 src/folderview.c:2121
 #: src/folderview.c:2127
 msgid "New folder"
 msgstr "Novi spis"
 
-#: src/editgroup.c:526 src/foldersel.c:542 src/folderview.c:2128
+#: src/editgroup.c:525 src/foldersel.c:542 src/folderview.c:2128
 msgid "Input the name of new folder:"
 msgstr "Unesite ime novog spisa:"
 
@@ -2260,7 +2261,7 @@ msgid "`%c' can't be included in folder name."
 msgstr "`%c' ne može biti uključen u ime spisa."
 
 #: src/foldersel.c:561 src/folderview.c:2147 src/folderview.c:2206
-#: src/query_search.c:995
+#: src/query_search.c:1031
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Spis `%s' već postoji."
@@ -2528,7 +2529,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:2127
+#: src/headerview.c:180 src/query_search.c:667 src/summaryview.c:2127
 msgid "(No From)"
 msgstr "(Bez pošiljatelja)"
 
@@ -2670,197 +2671,197 @@ msgstr ""
 msgid "Sylpheed: %d new messages"
 msgstr "\t%d novih poruka\n"
 
-#: src/inc.c:372
+#: src/inc.c:371
 msgid "Retrieving new messages"
 msgstr "Primam nove poruke"
 
-#: src/inc.c:415
+#: src/inc.c:414
 msgid "Standby"
 msgstr "Standby"
 
-#: src/inc.c:544 src/inc.c:593
+#: src/inc.c:543 src/inc.c:592
 msgid "Cancelled"
 msgstr "Otkazano"
 
-#: src/inc.c:555
+#: src/inc.c:554
 msgid "Retrieving"
 msgstr "Primam"
 
-#: src/inc.c:564
+#: src/inc.c:563
 #, fuzzy, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "Ukloni poruke sa poslužitelja nakon primanja"
 
-#: src/inc.c:568
+#: src/inc.c:567
 #, fuzzy
 msgid "Done (no new messages)"
 msgstr "Nema nepročitanih poruka"
 
-#: src/inc.c:574
+#: src/inc.c:573
 msgid "Connection failed"
 msgstr "Veza nije uspjela"
 
-#: src/inc.c:577
+#: src/inc.c:576
 msgid "Auth failed"
 msgstr "Identifikacija nije uspjela"
 
-#: src/inc.c:580
+#: src/inc.c:579
 msgid "Locked"
 msgstr ""
 
-#: src/inc.c:590
+#: src/inc.c:589
 #, fuzzy
 msgid "Timeout"
 msgstr "Timeout (sek)"
 
-#: src/inc.c:640
+#: src/inc.c:639
 #, fuzzy, c-format
 msgid "Finished (%d new message(s))"
 msgstr "\t%d novih poruka\n"
 
-#: src/inc.c:643
+#: src/inc.c:642
 #, fuzzy
 msgid "Finished (no new messages)"
 msgstr "Nema nepročitanih poruka"
 
-#: src/inc.c:652
+#: src/inc.c:651
 #, fuzzy
 msgid "Some errors occurred while getting mail."
 msgstr "Došlo je do grešaka prilikom primanja pošte."
 
-#: src/inc.c:688
+#: src/inc.c:687
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "primam nove poruke s računa %s...\n"
 
-#: src/inc.c:691
+#: src/inc.c:690
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Primam nove poruke"
 
-#: src/inc.c:710
+#: src/inc.c:709
 #, fuzzy, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Povezujem se na POP3 poslužitelj: %s ..."
 
-#: src/inc.c:719
+#: src/inc.c:718
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Ne mogu se povezati na POP3 poslužitelj: %s:%d\n"
 
-#: src/inc.c:798 src/send_message.c:631
+#: src/inc.c:797 src/send_message.c:631
 msgid "Authenticating..."
 msgstr "Prijavljujem se..."
 
-#: src/inc.c:799
+#: src/inc.c:798
 #, fuzzy, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Primam poruke sa %s u %s...\n"
 
-#: src/inc.c:804
+#: src/inc.c:803
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Primam broj novih poruka (STAT)..."
 
-#: src/inc.c:808
+#: src/inc.c:807
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Primam broj novih poruka (LAST)..."
 
-#: src/inc.c:812
+#: src/inc.c:811
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Primam broj novih poruka (UIDL)..."
 
-#: src/inc.c:816
+#: src/inc.c:815
 msgid "Getting the size of messages (LIST)..."
 msgstr "Primam veličinu poruka (LIST)..."
 
-#: src/inc.c:826
+#: src/inc.c:825
 #, fuzzy, c-format
 msgid "Deleting message %d"
 msgstr "Brišem poruke"
 
-#: src/inc.c:833 src/send_message.c:649
+#: src/inc.c:832 src/send_message.c:649
 msgid "Quitting"
 msgstr "Izlazim"
 
-#: src/inc.c:858
+#: src/inc.c:857
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Primam poruke (%d / %d) (%s / %s)"
 
-#: src/inc.c:879
+#: src/inc.c:878
 #, fuzzy, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Ukloni poruke sa poslužitelja nakon primanja"
 
-#: src/inc.c:1107
+#: src/inc.c:1106
 #, fuzzy
 msgid "Connection failed."
 msgstr "Veza nije uspjela"
 
-#: src/inc.c:1113
+#: src/inc.c:1112
 msgid "Error occurred while processing mail."
 msgstr "Došlo je do greške pri radu s poštom."
 
-#: src/inc.c:1118
+#: src/inc.c:1117
 #, fuzzy, c-format
 msgid ""
 "Error occurred while processing mail:\n"
 "%s"
 msgstr "Došlo je do greške pri radu s poštom."
 
-#: src/inc.c:1124
+#: src/inc.c:1123
 msgid "No disk space left."
 msgstr "Nema više mjesta na disku."
 
-#: src/inc.c:1129
+#: src/inc.c:1128
 #, fuzzy
 msgid "Can't write file."
 msgstr "Ne mogu pisati u datoteku.\n"
 
-#: src/inc.c:1134
+#: src/inc.c:1133
 #, fuzzy
 msgid "Socket error."
 msgstr "protokol greška\n"
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1140 src/send_message.c:584 src/send_message.c:772
+#: src/inc.c:1139 src/send_message.c:584 src/send_message.c:772
 msgid "Connection closed by the remote host."
 msgstr ""
 
-#: src/inc.c:1146
+#: src/inc.c:1145
 #, fuzzy
 msgid "Mailbox is locked."
 msgstr "Postavke sandučića"
 
-#: src/inc.c:1150
+#: src/inc.c:1149
 #, fuzzy, c-format
 msgid ""
 "Mailbox is locked:\n"
 "%s"
 msgstr "Postavke sandučića"
 
-#: src/inc.c:1156 src/send_message.c:757
+#: src/inc.c:1155 src/send_message.c:757
 #, fuzzy
 msgid "Authentication failed."
 msgstr "Autorizacija"
 
-#: src/inc.c:1161 src/send_message.c:760
+#: src/inc.c:1160 src/send_message.c:760
 #, fuzzy, c-format
 msgid ""
 "Authentication failed:\n"
 "%s"
 msgstr "Autorizacija"
 
-#: src/inc.c:1166 src/send_message.c:776
+#: src/inc.c:1165 src/send_message.c:776
 msgid "Session timed out."
 msgstr ""
 
-#: src/inc.c:1202
+#: src/inc.c:1201
 #, fuzzy
 msgid "Incorporation cancelled\n"
 msgstr "Prima novu poštu"
 
-#: src/inc.c:1285
+#: src/inc.c:1284
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Primam nove poruke s %s u %s...\n"
@@ -3390,7 +3391,8 @@ msgid "/_View/Mess_age source"
 msgstr "/_Pregled/Pr_egledaj izvor"
 
 #: src/mainwindow.c:708 src/messageview.c:245
-msgid "/_View/Show all _header"
+#, fuzzy
+msgid "/_View/Show all _headers"
 msgstr "/_Pregled/Prikaži s_vo zaglavlje"
 
 #: src/mainwindow.c:710
@@ -3398,7 +3400,7 @@ msgstr "/_Pregled/Prikaži s_vo zaglavlje"
 msgid "/_View/_Update summary"
 msgstr "/_Pregled/_Znakovni standard"
 
-#: src/mainwindow.c:712 src/messageview.c:247
+#: src/mainwindow.c:712 src/messageview.c:248
 msgid "/_Message"
 msgstr "/_Poruka"
 
@@ -3434,16 +3436,16 @@ msgstr "/_Pošta/Pošalji _odložene poruke"
 
 #: src/mainwindow.c:722 src/mainwindow.c:724 src/mainwindow.c:731
 #: src/mainwindow.c:736 src/mainwindow.c:739 src/mainwindow.c:750
-#: src/mainwindow.c:752 src/mainwindow.c:755 src/messageview.c:250
-#: src/messageview.c:258 src/messageview.c:263
+#: src/mainwindow.c:752 src/mainwindow.c:755 src/messageview.c:251
+#: src/messageview.c:259 src/messageview.c:264
 msgid "/_Message/---"
 msgstr "/_Poruka/---"
 
-#: src/mainwindow.c:723 src/messageview.c:248
+#: src/mainwindow.c:723 src/messageview.c:249
 msgid "/_Message/Compose _new message"
 msgstr "/_Pošta/Kreiraj _novu poruku"
 
-#: src/mainwindow.c:725 src/messageview.c:251
+#: src/mainwindow.c:725 src/messageview.c:252
 msgid "/_Message/_Reply"
 msgstr "/_Pošta/O_dgovori"
 
@@ -3452,31 +3454,31 @@ msgstr "/_Pošta/O_dgovori"
 msgid "/_Message/Repl_y to"
 msgstr "/_Poruka/O_dgovori"
 
-#: src/mainwindow.c:727 src/messageview.c:252
+#: src/mainwindow.c:727 src/messageview.c:253
 #, fuzzy
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Pošta/Odgovori svi_ma"
 
-#: src/mainwindow.c:728 src/messageview.c:254
+#: src/mainwindow.c:728 src/messageview.c:255
 #, fuzzy
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Pošta/Od_govori pošiljatelju"
 
-#: src/mainwindow.c:729 src/messageview.c:256
+#: src/mainwindow.c:729 src/messageview.c:257
 #, fuzzy
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Pošta/Odgovori svi_ma"
 
-#: src/mainwindow.c:732 src/messageview.c:259
+#: src/mainwindow.c:732 src/messageview.c:260
 msgid "/_Message/_Forward"
 msgstr "/_Pošta/P_roslijedi"
 
-#: src/mainwindow.c:733 src/messageview.c:260
+#: src/mainwindow.c:733 src/messageview.c:261
 #, fuzzy
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Pošta/Proslijedi _kao prilog"
 
-#: src/mainwindow.c:735 src/messageview.c:262
+#: src/mainwindow.c:735 src/messageview.c:263
 #, fuzzy
 msgid "/_Message/Redirec_t"
 msgstr "/_Pošta/Pre_Uredi"
@@ -3536,7 +3538,7 @@ msgstr "/_Pošta/Primi novu _poštu"
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/_Pošta/Primi novu _poštu"
 
-#: src/mainwindow.c:756 src/messageview.c:264
+#: src/mainwindow.c:756 src/messageview.c:265
 msgid "/_Message/Re-_edit"
 msgstr "/_Pošta/Pre_Uredi"
 
@@ -3555,27 +3557,27 @@ msgstr "/_Održavanje/_Filtriraj poštu"
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Održavanje/_Filtriraj poštu"
 
-#: src/mainwindow.c:767 src/messageview.c:271
+#: src/mainwindow.c:767 src/messageview.c:272
 #, fuzzy
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Održavanje/_Filtriraj poštu"
 
-#: src/mainwindow.c:768 src/messageview.c:273
+#: src/mainwindow.c:768 src/messageview.c:274
 #, fuzzy
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Održavanje/_Filtriraj poštu"
 
-#: src/mainwindow.c:770 src/messageview.c:275
+#: src/mainwindow.c:770 src/messageview.c:276
 #, fuzzy
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Održavanje/_Filtriraj poštu"
 
-#: src/mainwindow.c:772 src/messageview.c:277
+#: src/mainwindow.c:772 src/messageview.c:278
 #, fuzzy
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Održavanje/_Filtriraj poštu"
 
-#: src/mainwindow.c:774 src/messageview.c:279
+#: src/mainwindow.c:774 src/messageview.c:280
 #, fuzzy
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Održavanje/_Filtriraj poštu"
@@ -3706,7 +3708,7 @@ msgid "MainWindow: color allocation %d failed\n"
 msgstr "MainWindow: prikaz boje %d nije uspio\n"
 
 #: src/mainwindow.c:1139 src/summaryview.c:2275 src/summaryview.c:2360
-#: src/summaryview.c:3907 src/summaryview.c:4036 src/summaryview.c:4394
+#: src/summaryview.c:3908 src/summaryview.c:4037 src/summaryview.c:4395
 msgid "done.\n"
 msgstr "gotovo.\n"
 
@@ -3974,7 +3976,7 @@ msgid "Find text:"
 msgstr "Pronađi tekst:"
 
 #: src/message_search.c:153 src/prefs_search_folder.c:253
-#: src/query_search.c:326
+#: src/query_search.c:343
 msgid "Case sensitive"
 msgstr "Osjetljiv na velika/mala slova"
 
@@ -3998,29 +4000,29 @@ msgstr "Kraj liste dosegnut; nastaviti od početka?"
 msgid "Search finished"
 msgstr "Potraga završena"
 
-#: src/messageview.c:268
+#: src/messageview.c:269
 #, fuzzy
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/Dod_aj pošiljatelja u adresar"
 
-#: src/messageview.c:300
+#: src/messageview.c:301
 msgid "Creating message view...\n"
 msgstr "Kreiram pregled poruka...\n"
 
-#: src/messageview.c:325
+#: src/messageview.c:326
 msgid "Text"
 msgstr "Tekst"
 
-#: src/messageview.c:330
+#: src/messageview.c:331
 #, fuzzy
 msgid "Attachments"
 msgstr "Prilog"
 
-#: src/messageview.c:380
+#: src/messageview.c:381
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:699 src/summaryview.c:3436
+#: src/messageview.c:700 src/summaryview.c:3436
 #, fuzzy, c-format
 msgid "Can't save the file `%s'."
 msgstr "Ne mogu premjestiti spis `%s'."
@@ -4038,7 +4040,7 @@ msgstr "Izvrši"
 msgid "Print"
 msgstr "Ispiši"
 
-#: src/messageview.c:770 src/summaryview.c:3471
+#: src/messageview.c:769 src/summaryview.c:3470
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -4138,11 +4140,11 @@ msgstr ""
 "Unesite naredbu za otvaranje datoteke:\n"
 "(`%s' je sinonim za ime datoteke)"
 
-#: src/mimeview.c:1147
+#: src/mimeview.c:1140
 msgid "Opening executable file"
 msgstr ""
 
-#: src/mimeview.c:1148
+#: src/mimeview.c:1141
 msgid ""
 "This is an executable file. Opening executable file is restricted for "
 "security.\n"
@@ -4150,11 +4152,6 @@ msgid ""
 "virus or something like a malicious program."
 msgstr ""
 
-#: src/mimeview.c:1184
-#, c-format
-msgid "MIME viewer command line is invalid: `%s'"
-msgstr "Naredba MIME preglednika nije ispravna: `%s'"
-
 #: src/passphrase.c:96
 msgid "Passphrase"
 msgstr "Lozinka"
@@ -5952,21 +5949,21 @@ msgstr "Odvovori-Na"
 msgid "%s - Edit search condition"
 msgstr ""
 
-#: src/prefs_search_folder.c:209 src/query_search.c:257
+#: src/prefs_search_folder.c:209 src/query_search.c:274
 msgid "Match any of the following"
 msgstr ""
 
-#: src/prefs_search_folder.c:211 src/query_search.c:259
+#: src/prefs_search_folder.c:211 src/query_search.c:276
 #, fuzzy
 msgid "Match all of the following"
 msgstr "Automatski postavi slijedeće adrese"
 
-#: src/prefs_search_folder.c:231 src/query_search.c:303
+#: src/prefs_search_folder.c:231 src/query_search.c:320
 #, fuzzy
 msgid "Folder:"
 msgstr "Spis"
 
-#: src/prefs_search_folder.c:248 src/query_search.c:321
+#: src/prefs_search_folder.c:248 src/query_search.c:338
 #, fuzzy
 msgid "Search subfolders"
 msgstr "Traži spis"
@@ -5981,17 +5978,17 @@ msgid "Attachment"
 msgstr "Prilog"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73 src/query_search.c:371 src/summaryview.c:4901
+#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4902
 msgid "Subject"
 msgstr "Tema"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/query_search.c:372 src/summaryview.c:4904
+#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4905
 msgid "From"
 msgstr "Od"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/query_search.c:373 src/summaryview.c:4906
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:4907
 msgid "Date"
 msgstr "Datum"
 
@@ -6084,45 +6081,45 @@ msgstr "Kreiram dijalog napretka...\n"
 msgid "Status"
 msgstr "Status"
 
-#: src/query_search.c:234
+#: src/query_search.c:251
 #, fuzzy
 msgid "Search messages"
 msgstr "/_Traži poruka..."
 
-#: src/query_search.c:395
+#: src/query_search.c:423
 #, fuzzy
 msgid "_Save as search folder"
 msgstr "Traži spis"
 
-#: src/query_search.c:512 src/subscribedialog.c:526 src/summaryview.c:842
+#: src/query_search.c:542 src/subscribedialog.c:526 src/summaryview.c:842
 msgid "Done."
 msgstr "Gotovo."
 
-#: src/query_search.c:536
+#: src/query_search.c:566
 #, fuzzy, c-format
 msgid "Searching %s ..."
 msgstr "Pretražujem spis %s ..."
 
-#: src/query_search.c:564
+#: src/query_search.c:594
 #, fuzzy, c-format
 msgid "Searching %s (%d / %d)..."
 msgstr "Filtriranje..."
 
-#: src/query_search.c:645 src/summaryview.c:2051
+#: src/query_search.c:675 src/summaryview.c:2051
 msgid "(No Date)"
 msgstr "(Nema Datuma)"
 
-#: src/query_search.c:833
+#: src/query_search.c:869
 #, fuzzy
 msgid "Save as search folder"
 msgstr "Traži spis"
 
-#: src/query_search.c:854
+#: src/query_search.c:890
 #, fuzzy
 msgid "Location:"
 msgstr "Citat"
 
-#: src/query_search.c:869
+#: src/query_search.c:905
 #, fuzzy
 msgid "Folder name:"
 msgstr "Ime datoteke"
@@ -6770,38 +6767,38 @@ msgstr "Poruka %d je označena za kopiranje u %s\n"
 msgid "Destination for copy is same as current folder."
 msgstr "Destinacija za kopiranje je ista kao i trenutni spis."
 
-#: src/summaryview.c:3506
+#: src/summaryview.c:3507
 #, fuzzy
 msgid "Error occurred while processing messages."
 msgstr "Došlo je do greške pri radu s poštom."
 
-#: src/summaryview.c:3814 src/summaryview.c:3815
+#: src/summaryview.c:3815 src/summaryview.c:3816
 msgid "Building threads..."
 msgstr "Izgrađujem stablo..."
 
-#: src/summaryview.c:3965 src/summaryview.c:3966
+#: src/summaryview.c:3966 src/summaryview.c:3967
 msgid "Unthreading..."
 msgstr "Rasipavam..."
 
-#: src/summaryview.c:4259 src/summaryview.c:4315
+#: src/summaryview.c:4260 src/summaryview.c:4316
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtriranje..."
 
-#: src/summaryview.c:4364
+#: src/summaryview.c:4365
 msgid "filtering..."
 msgstr "filtriram..."
 
-#: src/summaryview.c:4365
+#: src/summaryview.c:4366
 msgid "Filtering..."
 msgstr "Filtriranje..."
 
-#: src/summaryview.c:4401
+#: src/summaryview.c:4402
 #, fuzzy, c-format
 msgid "%d message(s) have been filtered."
 msgstr "poruka %d već je prihvaćena.\n"
 
-#: src/summaryview.c:4910
+#: src/summaryview.c:4911
 msgid "No."
 msgstr "Ne."
 
@@ -6889,6 +6886,9 @@ msgstr "Izlaz"
 msgid "Sylpheed"
 msgstr ""
 
+#~ msgid "MIME viewer command line is invalid: `%s'"
+#~ msgstr "Naredba MIME preglednika nije ispravna: `%s'"
+
 #~ msgid "Wrap before sending"
 #~ msgstr "Sažmi prije slanja"
 
diff --git a/po/hu.po b/po/hu.po
index b4d4e79a..112b458b 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed-2.0.0beta7\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-03-02 19:03+0900\n"
+"POT-Creation-Date: 2006-03-10 16:06+0900\n"
 "PO-Revision-Date: 2006-02-03 18:15+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:491
+#: libsylph/prefs_common.c:496
 msgid "Junk mail filter"
 msgstr "Levélszemét szűrő"
 
@@ -523,7 +523,7 @@ msgstr "A kijelölt fájl nem nyitható meg\n"
 msgid "can't fetch message %d\n"
 msgstr "%d üzenet vétele nem sikerült\n"
 
-#: libsylph/procmsg.c:1375
+#: libsylph/procmsg.c:1378
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Érvénytelen nyomtató parancs: `%s'\n"
@@ -601,12 +601,12 @@ msgstr "  Tárgy: %s\n"
 msgid "  Issuer: %s\n"
 msgstr "  Szerző: %s\n"
 
-#: libsylph/utils.c:2411 src/compose.c:2869 src/compose.c:3132
-#: src/compose.c:3195 src/compose.c:3315
+#: libsylph/utils.c:2430 src/compose.c:2888 src/compose.c:3151
+#: src/compose.c:3214 src/compose.c:3334
 msgid "can't change file mode\n"
 msgstr "fájl módja nem változtatható\n"
 
-#: libsylph/utils.c:2418 libsylph/utils.c:2542
+#: libsylph/utils.c:2437 libsylph/utils.c:2561
 #, c-format
 msgid "writing to %s failed.\n"
 msgstr "%s fájlba nem sikerült írni.\n"
@@ -691,8 +691,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:493
-#: src/compose.c:4273 src/editaddress.c:200 src/editaddress.c:942
+#: src/account_dialog.c:366 src/addressadd.c:192 src/addressbook.c:491
+#: src/compose.c:4292 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
@@ -829,12 +829,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:4777 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4796 src/editaddress.c:201
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "Cím"
 
-#: src/addressadd.c:212 src/addressbook.c:495 src/editaddress.c:202
+#: src/addressadd.c:212 src/addressbook.c:493 src/editaddress.c:202
 #: src/editaddress.c:795 src/editaddress.c:860 src/editgroup.c:267
 msgid "Remarks"
 msgstr "Megjegyzések"
@@ -843,110 +843,111 @@ msgstr "Megjegyzések"
 msgid "Select Address Book Folder"
 msgstr "Címjegyzék mappa választás"
 
-#: src/addressbook.c:338 src/compose.c:515 src/mainwindow.c:489
+#: src/addressbook.c:337 src/compose.c:515 src/mainwindow.c:489
 #: src/messageview.c:140
 msgid "/_File"
 msgstr "/_Fájl"
 
-#: src/addressbook.c:339
+#: src/addressbook.c:338
 msgid "/_File/New _Book"
 msgstr "/_Fájl/Új cím_jegyzék"
 
-#: src/addressbook.c:340
+#: src/addressbook.c:339
 msgid "/_File/New _vCard"
 msgstr "/_Fájl/Új _vCard"
 
-#: src/addressbook.c:342
+#: src/addressbook.c:341
 msgid "/_File/New _JPilot"
 msgstr "/_Fájl/Új _JPilot"
 
-#: src/addressbook.c:345
-msgid "/_File/New _Server"
+#: src/addressbook.c:344
+#, fuzzy
+msgid "/_File/New _LDAP Server"
 msgstr "/_Fájl/Új _Szerver"
 
-#: src/addressbook.c:347 src/addressbook.c:350 src/compose.c:520
+#: src/addressbook.c:346 src/addressbook.c:349 src/compose.c:520
 #: src/compose.c:525 src/compose.c:528 src/compose.c:531 src/mainwindow.c:507
 #: src/mainwindow.c:510 src/mainwindow.c:512 src/mainwindow.c:515
 #: src/mainwindow.c:517 src/messageview.c:143
 msgid "/_File/---"
 msgstr "/_Fájl/---"
 
-#: src/addressbook.c:348
+#: src/addressbook.c:347
 msgid "/_File/_Edit"
 msgstr "/_Fájl/_Szerkesztés"
 
-#: src/addressbook.c:349
+#: src/addressbook.c:348
 msgid "/_File/_Delete"
 msgstr "/_Fájl/_Törlés"
 
-#: src/addressbook.c:351
+#: src/addressbook.c:350
 msgid "/_File/_Save"
 msgstr "/_Fájl/_Mentés"
 
-#: src/addressbook.c:352 src/compose.c:532 src/messageview.c:144
+#: src/addressbook.c:351 src/compose.c:532 src/messageview.c:144
 msgid "/_File/_Close"
 msgstr "/_Fájl/_Bezárás"
 
-#: src/addressbook.c:353
+#: src/addressbook.c:352
 msgid "/_Address"
 msgstr "/_Cím"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:353
 msgid "/_Address/New _Address"
 msgstr "/_Cím/Új _cím"
 
-#: src/addressbook.c:355
+#: src/addressbook.c:354
 msgid "/_Address/New _Group"
 msgstr "/_Cím/Új cso_port"
 
-#: src/addressbook.c:356
+#: src/addressbook.c:355
 msgid "/_Address/New _Folder"
 msgstr "/_Cím/Új _mappa"
 
-#: src/addressbook.c:357
+#: src/addressbook.c:356
 msgid "/_Address/---"
 msgstr "/_Cím/---"
 
-#: src/addressbook.c:358
+#: src/addressbook.c:357
 msgid "/_Address/_Edit"
 msgstr "/_Cím/_Szerkesztés"
 
-#: src/addressbook.c:359
+#: src/addressbook.c:358
 msgid "/_Address/_Delete"
 msgstr "/_Cím/_Törlés"
 
-#: src/addressbook.c:360 src/compose.c:645 src/mainwindow.c:758
-#: src/messageview.c:266
+#: src/addressbook.c:359 src/compose.c:645 src/mainwindow.c:758
+#: src/messageview.c:267
 msgid "/_Tools"
 msgstr "/_Eszközök"
 
-#: src/addressbook.c:361
+#: src/addressbook.c:360
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Eszközök/_LDIF fájl importálása"
 
-#: src/addressbook.c:362 src/compose.c:666 src/mainwindow.c:812
-#: src/messageview.c:286
+#: src/addressbook.c:361 src/compose.c:666 src/mainwindow.c:812
+#: src/messageview.c:287
 msgid "/_Help"
 msgstr "/_Súgó"
 
-#: src/addressbook.c:363 src/compose.c:667 src/mainwindow.c:824
-#: src/messageview.c:287
+#: src/addressbook.c:362 src/compose.c:667 src/mainwindow.c:824
+#: src/messageview.c:288
 msgid "/_Help/_About"
 msgstr "/_Súgó/_Névjegy"
 
-#: src/addressbook.c:382 src/addressbook.c:392
+#: src/addressbook.c:381 src/addressbook.c:391
 msgid "/New _Address"
 msgstr "/Új _cím"
 
-#: src/addressbook.c:383 src/addressbook.c:393
+#: src/addressbook.c:382 src/addressbook.c:392
 msgid "/New _Group"
 msgstr "/Új cso_port"
 
-#: src/addressbook.c:384 src/addressbook.c:394
+#: src/addressbook.c:383 src/addressbook.c:393
 msgid "/New _Folder"
 msgstr "/Ú_j Mappa"
 
-#: src/addressbook.c:385 src/addressbook.c:395 src/compose.c:509
+#: src/addressbook.c:384 src/addressbook.c:394 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
@@ -956,70 +957,70 @@ msgstr "/Ú_j Mappa"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:386 src/addressbook.c:396 src/compose.c:534
+#: src/addressbook.c:385 src/addressbook.c:395 src/compose.c:534
 #: src/mainwindow.c:521 src/messageview.c:146
 msgid "/_Edit"
 msgstr "/_Szerkesztés"
 
-#: src/addressbook.c:387 src/addressbook.c:397 src/summaryview.c:434
+#: src/addressbook.c:386 src/addressbook.c:396 src/summaryview.c:434
 msgid "/_Delete"
 msgstr "/_Törlés"
 
-#: src/addressbook.c:494
+#: src/addressbook.c:492
 msgid "E-Mail address"
 msgstr "E-Mail cím"
 
-#: src/addressbook.c:498 src/compose.c:4778 src/prefs_common_dialog.c:2183
+#: src/addressbook.c:496 src/compose.c:4797 src/prefs_common_dialog.c:2183
 msgid "Address book"
 msgstr "Címjegyzék"
 
-#: src/addressbook.c:600 src/prefs_filter_edit.c:249
+#: src/addressbook.c:603 src/prefs_filter_edit.c:249
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "Név:"
 
 #. Buttons
-#: src/addressbook.c:632 src/addressbook.c:1684 src/editaddress.c:884
+#: src/addressbook.c:636 src/addressbook.c:1678 src/editaddress.c:884
 #: src/editaddress.c:1017 src/mainwindow.c:2426 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:635 src/editaddress.c:890 src/editaddress.c:1023
+#: src/addressbook.c:639 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:1552
 msgid "Add"
 msgstr "Hozzáadás"
 
-#: src/addressbook.c:638
+#: src/addressbook.c:642
 msgid "Lookup"
 msgstr "Előnézet"
 
-#: src/addressbook.c:650 src/headerview.c:55 src/prefs_folder_item.c:339
+#: src/addressbook.c:654 src/headerview.c:55 src/prefs_folder_item.c:339
 #: src/prefs_template.c:176
 msgid "To:"
 msgstr "Címzett:"
 
-#: src/addressbook.c:654 src/prefs_folder_item.c:356 src/prefs_template.c:178
+#: src/addressbook.c:658 src/prefs_folder_item.c:356 src/prefs_template.c:178
 msgid "Cc:"
 msgstr "Másolat:"
 
-#: src/addressbook.c:658 src/prefs_folder_item.c:367
+#: src/addressbook.c:662 src/prefs_folder_item.c:367
 msgid "Bcc:"
 msgstr "Titkos másolat:"
 
 #. Confirm deletion
-#: src/addressbook.c:845
+#: src/addressbook.c:832
 msgid "Delete address(es)"
 msgstr "Cím(ek) törlése"
 
-#: src/addressbook.c:846
+#: src/addressbook.c:833
 msgid "Really delete the address(es)?"
 msgstr "Tényleg töröljem a cím(ek)et?"
 
-#: src/addressbook.c:1675
+#: src/addressbook.c:1669
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1028,36 +1029,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:1678 src/folderview.c:2372
+#: src/addressbook.c:1672 src/folderview.c:2372
 msgid "Delete folder"
 msgstr "Mappa törlése"
 
-#: src/addressbook.c:1678
+#: src/addressbook.c:1672
 msgid "_Folder only"
 msgstr "Cs_ak mappa"
 
-#: src/addressbook.c:1678
+#: src/addressbook.c:1672
 msgid "Folder and _addresses"
 msgstr "Mappa és _címek"
 
-#: src/addressbook.c:1683
+#: src/addressbook.c:1677
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Tényleg törli `%s' elemet?"
 
-#: src/addressbook.c:2369 src/addressbook.c:2502
+#: src/addressbook.c:2363 src/addressbook.c:2496
 msgid "New user, could not save index file."
 msgstr "Az új felhasználó nem tudja menteni az index fájlt."
 
-#: src/addressbook.c:2373 src/addressbook.c:2506
+#: src/addressbook.c:2367 src/addressbook.c:2500
 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:2383 src/addressbook.c:2516
+#: src/addressbook.c:2377 src/addressbook.c:2510
 msgid "Old address book converted successfully."
 msgstr "A régi címjegyzék konvertálása sikerült."
 
-#: src/addressbook.c:2388
+#: src/addressbook.c:2382
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1065,7 +1066,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:2401
+#: src/addressbook.c:2395
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1073,7 +1074,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:2407
+#: src/addressbook.c:2401
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1081,7 +1082,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:2412
+#: src/addressbook.c:2406
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1089,88 +1090,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:2419
+#: src/addressbook.c:2413
 msgid "Addressbook conversion error"
 msgstr "Címjegyzék konvertálási hiba"
 
-#: src/addressbook.c:2423
+#: src/addressbook.c:2417
 msgid "Addressbook conversion"
 msgstr "Címjegyzék konvertálása"
 
-#: src/addressbook.c:2458
+#: src/addressbook.c:2452
 msgid "Addressbook Error"
 msgstr "Címjegyzék hiba"
 
-#: src/addressbook.c:2459 src/addressbook.c:2559
+#: src/addressbook.c:2453 src/addressbook.c:2553
 msgid "Could not read address index"
 msgstr "Cím index olvasása nem sikerült"
 
-#: src/addressbook.c:2521
+#: src/addressbook.c:2515
 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:2535
+#: src/addressbook.c:2529
 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:2541
+#: src/addressbook.c:2535
 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:2547
+#: src/addressbook.c:2541
 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:2565
+#: src/addressbook.c:2559
 msgid "Addressbook Conversion Error"
 msgstr "Címjegyzék konverziós hiba"
 
-#: src/addressbook.c:2571
+#: src/addressbook.c:2565
 msgid "Addressbook Conversion"
 msgstr "Címjegyzék konverzió"
 
-#: src/addressbook.c:3086 src/prefs_common_dialog.c:2033
+#: src/addressbook.c:3080 src/prefs_common_dialog.c:2033
 msgid "Interface"
 msgstr "Illesztő"
 
-#: src/addressbook.c:3102 src/importldif.c:514
+#: src/addressbook.c:3096 src/importldif.c:514
 msgid "Address Book"
 msgstr "Címjegyzék"
 
-#: src/addressbook.c:3118
+#: src/addressbook.c:3112
 msgid "Person"
 msgstr "Személy"
 
-#: src/addressbook.c:3134
+#: src/addressbook.c:3128
 msgid "EMail Address"
 msgstr "E-mail cím"
 
-#: src/addressbook.c:3150
+#: src/addressbook.c:3144
 msgid "Group"
 msgstr "Csoport"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3166 src/folderview.c:367 src/prefs_account_dialog.c:1694
-#: src/query_search.c:370
+#: src/addressbook.c:3160 src/folderview.c:367 src/prefs_account_dialog.c:1694
+#: src/query_search.c:398
 msgid "Folder"
 msgstr "Mappa"
 
-#: src/addressbook.c:3182
+#: src/addressbook.c:3176
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3198 src/addressbook.c:3214
+#: src/addressbook.c:3192 src/addressbook.c:3208
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3230
+#: src/addressbook.c:3224
 msgid "LDAP Server"
 msgstr "LDAP Szerver"
 
@@ -1182,7 +1183,7 @@ msgstr "Általános cím"
 msgid "Personal address"
 msgstr "Személyes cím"
 
-#: src/alertpanel.c:142 src/compose.c:5500 src/main.c:621
+#: src/alertpanel.c:142 src/compose.c:5517 src/main.c:621
 msgid "Notice"
 msgstr "Megjegyzés"
 
@@ -1190,7 +1191,7 @@ msgstr "Megjegyzés"
 msgid "Warning"
 msgstr "Figyelmeztetés"
 
-#: src/alertpanel.c:168 src/inc.c:587
+#: src/alertpanel.c:168 src/inc.c:586
 msgid "Error"
 msgstr "Hiba"
 
@@ -1233,7 +1234,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:4761
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4762
 msgid "None"
 msgstr "Semmi"
 
@@ -1479,7 +1480,7 @@ msgstr "/_Nézet/_Karakterkódolás/Thai (TIS-620)"
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Nézet/_Karakterkódolás/Thai (Windows-874)"
 
-#: src/compose.c:646 src/mainwindow.c:759 src/messageview.c:267
+#: src/compose.c:646 src/mainwindow.c:759 src/messageview.c:268
 msgid "/_Tools/_Address book"
 msgstr "/_Eszközök/_Címjegyzék"
 
@@ -1487,14 +1488,14 @@ msgstr "/_Eszközök/_Címjegyzék"
 msgid "/_Tools/_Template"
 msgstr "/_Eszközök/_Sablon"
 
-#: src/compose.c:649 src/mainwindow.c:783 src/messageview.c:283
+#: src/compose.c:649 src/mainwindow.c:783 src/messageview.c:284
 msgid "/_Tools/Actio_ns"
 msgstr "/_Eszközök/_Akciók"
 
 #: src/compose.c:651 src/compose.c:655 src/compose.c:661 src/mainwindow.c:762
 #: src/mainwindow.c:776 src/mainwindow.c:781 src/mainwindow.c:784
-#: src/mainwindow.c:788 src/mainwindow.c:790 src/messageview.c:270
-#: src/messageview.c:282
+#: src/mainwindow.c:788 src/mainwindow.c:790 src/messageview.c:271
+#: src/messageview.c:283
 msgid "/_Tools/---"
 msgstr "/_Eszközök/---"
 
@@ -1518,79 +1519,79 @@ msgstr "/_Eszközök/_Helyesírásellenőrzés"
 msgid "/_Tools/_Set spell language"
 msgstr "/_Eszközök/Helyesírás _nyelvi beállítások"
 
-#: src/compose.c:910
+#: src/compose.c:912
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: fájl nem létezik\n"
 
-#: src/compose.c:1014 src/compose.c:1085
+#: src/compose.c:1016 src/compose.c:1087
 msgid "Can't get text part\n"
 msgstr "Nem tudtam olvasni a szövegrészt\n"
 
-#: src/compose.c:1486
+#: src/compose.c:1488
 msgid "Quote mark format error."
 msgstr "Idézet jelölés formátum hiba."
 
-#: src/compose.c:1498
+#: src/compose.c:1500
 msgid "Message reply/forward format error."
 msgstr "Üzenet válasz/továbbítás formátum hiba."
 
-#: src/compose.c:1918
+#: src/compose.c:1935
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "%s fájl nem létezik\n"
 
-#: src/compose.c:1922
+#: src/compose.c:1939
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "%s mérete nem határozható meg\n"
 
-#: src/compose.c:1926
+#: src/compose.c:1943
 #, c-format
 msgid "File %s is empty."
 msgstr "A(z) %s fájl üres."
 
-#: src/compose.c:1930
+#: src/compose.c:1947
 #, c-format
 msgid "Can't read %s."
 msgstr "%s nem olvasható."
 
-#: src/compose.c:1963
+#: src/compose.c:1980
 #, c-format
 msgid "Message: %s"
 msgstr "Üzenet: %s"
 
-#: src/compose.c:2023 src/mimeview.c:565
+#: src/compose.c:2040 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:2507 src/headerview.c:195 src/query_search.c:636
+#: src/compose.c:2524 src/headerview.c:195 src/query_search.c:666
 #: src/summaryview.c:2124
 msgid "(No Subject)"
 msgstr "(Nincs Tárgy)"
 
-#: src/compose.c:2510
+#: src/compose.c:2527
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Üzenet írása%s"
 
-#: src/compose.c:2623
+#: src/compose.c:2642
 msgid "Recipient is not specified."
 msgstr "Nincs címzett megadva."
 
-#: src/compose.c:2631
+#: src/compose.c:2650
 msgid "Empty subject"
 msgstr "Nincs tárgy"
 
-#: src/compose.c:2632
+#: src/compose.c:2651
 msgid "Subject is empty. Send it anyway?"
 msgstr "A levél tárgya üres. Ennek ellenére elküldi?"
 
-#: src/compose.c:2691
+#: src/compose.c:2710
 msgid "can't get recipient list."
 msgstr "címzett lista nem hozzáférhető."
 
-#: src/compose.c:2711
+#: src/compose.c:2730
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1598,22 +1599,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:2725 src/send_message.c:299
+#: src/compose.c:2744 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:2767
+#: src/compose.c:2786
 msgid "Can't save the message to outbox."
 msgstr "Az üzenet nem menthető a kimenő mappába."
 
-#: src/compose.c:2805
+#: src/compose.c:2824
 #, 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:2902
+#: src/compose.c:2921
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1624,11 +1625,11 @@ msgstr ""
 "\n"
 "Ennek ellenére elküldi mint %s?"
 
-#: src/compose.c:2908
+#: src/compose.c:2927
 msgid "Code conversion error"
 msgstr "Kód konvertálási hiba"
 
-#: src/compose.c:2981
+#: src/compose.c:3000
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1641,156 +1642,156 @@ msgstr ""
 "\n"
 "Ennek ellenére elküldi?"
 
-#: src/compose.c:2985
+#: src/compose.c:3004
 msgid "Line length limit"
 msgstr "Sorhossz határ"
 
-#: src/compose.c:3275
+#: src/compose.c:3294
 msgid "can't remove the old message\n"
 msgstr "a régi üzenetet nem lehet eltávolítani\n"
 
-#: src/compose.c:3293
+#: src/compose.c:3312
 msgid "queueing message...\n"
 msgstr "üzenet a Várakozó sorba...\n"
 
-#: src/compose.c:3375
+#: src/compose.c:3394
 msgid "can't find queue folder\n"
 msgstr "nem található a Várakozó sor mappája\n"
 
-#: src/compose.c:3382
+#: src/compose.c:3401
 msgid "can't queue the message\n"
 msgstr "Az üzenetet nem sikerült a Várakozó sorba rakni\n"
 
-#: src/compose.c:3975
+#: src/compose.c:3994
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "generált Üzenet-azonosító: %s\n"
 
-#: src/compose.c:4088
+#: src/compose.c:4107
 msgid "Creating compose window...\n"
 msgstr "Szerkesztőablak létrehozása...\n"
 
-#: src/compose.c:4139 src/headerview.c:54
+#: src/compose.c:4158 src/headerview.c:54
 msgid "From:"
 msgstr "Feladó:"
 
-#: src/compose.c:4213
+#: src/compose.c:4232
 msgid "PGP Sign"
 msgstr "PGP Aláírás"
 
-#: src/compose.c:4216
+#: src/compose.c:4235
 msgid "PGP Encrypt"
 msgstr "PGP Titkosítás"
 
-#: src/compose.c:4254 src/compose.c:5332
+#: src/compose.c:4273 src/compose.c:5351
 msgid "MIME type"
 msgstr "MIME típus"
 
 #. S_COL_DATE
-#: src/compose.c:4263 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4908
+#: src/compose.c:4282 src/mimeview.c:197 src/prefs_filter_edit.c:496
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4909
 msgid "Size"
 msgstr "Méret"
 
-#: src/compose.c:4698 src/mainwindow.c:2359 src/prefs_account_dialog.c:528
+#: src/compose.c:4717 src/mainwindow.c:2359 src/prefs_account_dialog.c:528
 #: src/prefs_common_dialog.c:661
 msgid "Send"
 msgstr "Küldés"
 
-#: src/compose.c:4699
+#: src/compose.c:4718
 msgid "Send message"
 msgstr "Üzenet küldése"
 
-#: src/compose.c:4707
+#: src/compose.c:4726
 msgid "Send later"
 msgstr "Küldés később"
 
-#: src/compose.c:4708
+#: src/compose.c:4727
 msgid "Put into queue folder and send later"
 msgstr "Üzenet a Várakozó sorba, küldés később"
 
-#: src/compose.c:4716
+#: src/compose.c:4735
 msgid "Draft"
 msgstr "Vázlat"
 
-#: src/compose.c:4717
+#: src/compose.c:4736
 msgid "Save to draft folder"
 msgstr "Mentés a vázlat mappába"
 
-#: src/compose.c:4727
+#: src/compose.c:4746
 msgid "Insert"
 msgstr "Beszúrás"
 
-#: src/compose.c:4728
+#: src/compose.c:4747
 msgid "Insert file"
 msgstr "Fájl beszúrása"
 
-#: src/compose.c:4736
+#: src/compose.c:4755
 msgid "Attach"
 msgstr "Csatolás"
 
-#: src/compose.c:4737
+#: src/compose.c:4756
 msgid "Attach file"
 msgstr "Fájl csatolása"
 
 #. signature
-#: src/compose.c:4747 src/prefs_account_dialog.c:1208
+#: src/compose.c:4766 src/prefs_account_dialog.c:1208
 #: src/prefs_common_dialog.c:953
 msgid "Signature"
 msgstr "Aláírás"
 
-#: src/compose.c:4748
+#: src/compose.c:4767
 msgid "Append signature"
 msgstr "Aláírás csatolása"
 
 #. editor
-#: src/compose.c:4757 src/prefs_common_dialog.c:991
+#: src/compose.c:4776 src/prefs_common_dialog.c:991
 #: src/prefs_common_dialog.c:2315
 msgid "Editor"
 msgstr "Szerkesztő"
 
-#: src/compose.c:4758
+#: src/compose.c:4777
 msgid "Edit with external editor"
 msgstr "Szerkesztés külső programmal"
 
-#: src/compose.c:4766
+#: src/compose.c:4785
 msgid "Linewrap"
 msgstr "Sortörés"
 
-#: src/compose.c:4767
+#: src/compose.c:4786
 msgid "Wrap all long lines"
 msgstr "Az összes hosszú sor törése"
 
-#: src/compose.c:5228
+#: src/compose.c:5247
 msgid "Invalid MIME type."
 msgstr "Érvénytelen MIME típus."
 
-#: src/compose.c:5246
+#: src/compose.c:5265
 msgid "File doesn't exist or is empty."
 msgstr "A fájl nem létezik vagy üres."
 
-#: src/compose.c:5314
+#: src/compose.c:5333
 msgid "Properties"
 msgstr "Tulajdonságok"
 
-#: src/compose.c:5334 src/prefs_common_dialog.c:1444
+#: src/compose.c:5353 src/prefs_common_dialog.c:1444
 msgid "Encoding"
 msgstr "Kódolás"
 
-#: src/compose.c:5357 src/prefs_folder_item.c:202
+#: src/compose.c:5376 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Elérési út"
 
-#: src/compose.c:5358
+#: src/compose.c:5377
 msgid "File name"
 msgstr "Fájlnév"
 
-#: src/compose.c:5449
+#: src/compose.c:5466
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Külső szerkesztő parancssora érvénytelen: `%s'\n"
 
-#: src/compose.c:5497
+#: src/compose.c:5514
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1799,44 +1800,44 @@ msgstr ""
 "A külső szerkesztő még dolgozik.\n"
 "A processz kényszerített kilövése (pid: %d)?\n"
 
-#: src/compose.c:5872 src/compose.c:5877 src/compose.c:5883
+#: src/compose.c:5889 src/compose.c:5894 src/compose.c:5900
 msgid "Can't queue the message."
 msgstr "Az üzenetet nem sikerült a Várakozó sorba rakni"
 
-#: src/compose.c:5974
+#: src/compose.c:5991
 msgid "Select files"
 msgstr "Fájlok választása"
 
-#: src/compose.c:5997
+#: src/compose.c:6014
 msgid "Select file"
 msgstr "Fájl választás"
 
-#: src/compose.c:6032
+#: src/compose.c:6049
 msgid "Save message"
 msgstr "Üzenet mentése"
 
-#: src/compose.c:6033
+#: src/compose.c:6050
 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:6035
+#: src/compose.c:6052
 msgid "Close _without saving"
 msgstr "Bezárás mentés _nélkül"
 
-#: src/compose.c:6077
+#: src/compose.c:6094
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Tényleg alkalmazni szeretné a(z) `%s' sablont?"
 
-#: src/compose.c:6079
+#: src/compose.c:6096
 msgid "Apply template"
 msgstr "Sablon alkalmazása"
 
-#: src/compose.c:6080
+#: src/compose.c:6097
 msgid "_Replace"
 msgstr "_Helyettesít"
 
-#: src/compose.c:6080
+#: src/compose.c:6097
 msgid "_Insert"
 msgstr "_Beszúrás"
 
@@ -1957,52 +1958,52 @@ msgstr "Egy csoportnevet meg kell adnia."
 msgid "Edit Group Data"
 msgstr "Csoportadatok szerkesztése"
 
-#: src/editgroup.c:300
+#: src/editgroup.c:299
 msgid "Group Name"
 msgstr "Csoportnév"
 
-#: src/editgroup.c:319
+#: src/editgroup.c:318
 msgid "Addresses in Group"
 msgstr "Címek a csoportban"
 
-#: src/editgroup.c:321
+#: src/editgroup.c:320
 msgid " -> "
 msgstr " -> "
 
-#: src/editgroup.c:348
+#: src/editgroup.c:347
 msgid " <- "
 msgstr " <- "
 
-#: src/editgroup.c:350
+#: src/editgroup.c:349
 msgid "Available Addresses"
 msgstr "Elérhető címek"
 
-#: src/editgroup.c:416
+#: src/editgroup.c:415
 msgid "Move E-Mail Addresses to or from Group with arrow buttons"
 msgstr "E-mail címek mozgatása csoportból vagy csoportba a nyilakkal"
 
-#: src/editgroup.c:468
+#: src/editgroup.c:467
 msgid "Edit Group Details"
 msgstr "Csoport tulajdonságainak szerkesztése"
 
-#: src/editgroup.c:471
+#: src/editgroup.c:470
 msgid "Add New Group"
 msgstr "Új csoport hozzáadása"
 
-#: src/editgroup.c:522
+#: src/editgroup.c:521
 msgid "Edit folder"
 msgstr "Mappa szerkesztése"
 
-#: src/editgroup.c:522
+#: src/editgroup.c:521
 msgid "Input the new name of folder:"
 msgstr "A mappa új neve:"
 
-#: src/editgroup.c:525 src/foldersel.c:541 src/folderview.c:2121
+#: src/editgroup.c:524 src/foldersel.c:541 src/folderview.c:2121
 #: src/folderview.c:2127
 msgid "New folder"
 msgstr "Új mappa"
 
-#: src/editgroup.c:526 src/foldersel.c:542 src/folderview.c:2128
+#: src/editgroup.c:525 src/foldersel.c:542 src/folderview.c:2128
 msgid "Input the name of new folder:"
 msgstr "Az új mappa neve:"
 
@@ -2199,7 +2200,7 @@ msgid "`%c' can't be included in folder name."
 msgstr "`%c' nem tehető a mappanévbe."
 
 #: src/foldersel.c:561 src/folderview.c:2147 src/folderview.c:2206
-#: src/query_search.c:995
+#: src/query_search.c:1031
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "`%s' mappa már létezik."
@@ -2456,7 +2457,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:2127
+#: src/headerview.c:180 src/query_search.c:667 src/summaryview.c:2127
 msgid "(No From)"
 msgstr "(Nincs Feladó)"
 
@@ -2586,133 +2587,133 @@ msgstr "Vége"
 msgid "Sylpheed: %d new messages"
 msgstr "Sylpheed: %d új üzenet"
 
-#: src/inc.c:372
+#: src/inc.c:371
 msgid "Retrieving new messages"
 msgstr "Új üzenetek fogadása"
 
-#: src/inc.c:415
+#: src/inc.c:414
 msgid "Standby"
 msgstr "Készenlét"
 
-#: src/inc.c:544 src/inc.c:593
+#: src/inc.c:543 src/inc.c:592
 msgid "Cancelled"
 msgstr "Megszakítva"
 
-#: src/inc.c:555
+#: src/inc.c:554
 msgid "Retrieving"
 msgstr "Fogadás"
 
-#: src/inc.c:564
+#: src/inc.c:563
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "Kész (%d üzenet (%s) fogadott)"
 
-#: src/inc.c:568
+#: src/inc.c:567
 msgid "Done (no new messages)"
 msgstr "Kész (nincs új üzenet)"
 
-#: src/inc.c:574
+#: src/inc.c:573
 msgid "Connection failed"
 msgstr "Kapcsolat megszakadt"
 
-#: src/inc.c:577
+#: src/inc.c:576
 msgid "Auth failed"
 msgstr "Azonosítás nem sikerült"
 
-#: src/inc.c:580
+#: src/inc.c:579
 msgid "Locked"
 msgstr "Zárolt"
 
-#: src/inc.c:590
+#: src/inc.c:589
 msgid "Timeout"
 msgstr "Időtúllépés"
 
-#: src/inc.c:640
+#: src/inc.c:639
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Vége (%d új üzenet)"
 
-#: src/inc.c:643
+#: src/inc.c:642
 msgid "Finished (no new messages)"
 msgstr "Vége (nincs új üzenet)"
 
-#: src/inc.c:652
+#: src/inc.c:651
 msgid "Some errors occurred while getting mail."
 msgstr "Hiba történt a levelek fogadásakor."
 
-#: src/inc.c:688
+#: src/inc.c:687
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "%s hozzáférésről az új üzenetek letöltése...\n"
 
-#: src/inc.c:691
+#: src/inc.c:690
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Új üzenetek fogadása"
 
-#: src/inc.c:710
+#: src/inc.c:709
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Kapcsolódás a(z) %s POP3 szerverhez ..."
 
-#: src/inc.c:719
+#: src/inc.c:718
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Nem sikerült kapcsolódni a POP3 szerverhez: %s:%d\n"
 
-#: src/inc.c:798 src/send_message.c:631
+#: src/inc.c:797 src/send_message.c:631
 msgid "Authenticating..."
 msgstr "Azonosítás..."
 
-#: src/inc.c:799
+#: src/inc.c:798
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "%s üzeneteinek fogadása..."
 
-#: src/inc.c:804
+#: src/inc.c:803
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Új üzenetek számának megszerzése (STAT)..."
 
-#: src/inc.c:808
+#: src/inc.c:807
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Új üzenetek számának megszerzése (LAST)..."
 
-#: src/inc.c:812
+#: src/inc.c:811
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Új üzenetek számának megszerzése (UIDL)..."
 
-#: src/inc.c:816
+#: src/inc.c:815
 msgid "Getting the size of messages (LIST)..."
 msgstr "Új üzenetek méretének megszerzése (LIST)..."
 
-#: src/inc.c:826
+#: src/inc.c:825
 #, c-format
 msgid "Deleting message %d"
 msgstr "%d üzenet törlése"
 
-#: src/inc.c:833 src/send_message.c:649
+#: src/inc.c:832 src/send_message.c:649
 msgid "Quitting"
 msgstr "Kilépés"
 
-#: src/inc.c:858
+#: src/inc.c:857
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Üzenet vétele (%d / %d) (%s / %s)"
 
-#: src/inc.c:879
+#: src/inc.c:878
 #, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Üzenetek fogadása (%d üzenet (%s) fogadott)"
 
-#: src/inc.c:1107
+#: src/inc.c:1106
 msgid "Connection failed."
 msgstr "Kapcsolat megszakadt."
 
-#: src/inc.c:1113
+#: src/inc.c:1112
 msgid "Error occurred while processing mail."
 msgstr "Hiba a levelek feldolgozása közben."
 
-#: src/inc.c:1118
+#: src/inc.c:1117
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2721,28 +2722,28 @@ msgstr ""
 "Hiba a levelek feldolgozása közben:\n"
 "%s"
 
-#: src/inc.c:1124
+#: src/inc.c:1123
 msgid "No disk space left."
 msgstr "Nincs több szabad hely a lemezen."
 
-#: src/inc.c:1129
+#: src/inc.c:1128
 msgid "Can't write file."
 msgstr "Nem lehet a fájlba írni."
 
-#: src/inc.c:1134
+#: src/inc.c:1133
 msgid "Socket error."
 msgstr "Socket hiba."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1140 src/send_message.c:584 src/send_message.c:772
+#: src/inc.c:1139 src/send_message.c:584 src/send_message.c:772
 msgid "Connection closed by the remote host."
 msgstr "A távoli fél bezárta a kapcsolatot."
 
-#: src/inc.c:1146
+#: src/inc.c:1145
 msgid "Mailbox is locked."
 msgstr "A postafiók zárolt."
 
-#: src/inc.c:1150
+#: src/inc.c:1149
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2751,11 +2752,11 @@ msgstr ""
 "A postafiók zárolt:\n"
 "%s"
 
-#: src/inc.c:1156 src/send_message.c:757
+#: src/inc.c:1155 src/send_message.c:757
 msgid "Authentication failed."
 msgstr "Az azonosítás nem sikerült."
 
-#: src/inc.c:1161 src/send_message.c:760
+#: src/inc.c:1160 src/send_message.c:760
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2764,15 +2765,15 @@ msgstr ""
 "Az azonosítás nem sikerült:\n"
 "%s"
 
-#: src/inc.c:1166 src/send_message.c:776
+#: src/inc.c:1165 src/send_message.c:776
 msgid "Session timed out."
 msgstr "Menet időtúllépése."
 
-#: src/inc.c:1202
+#: src/inc.c:1201
 msgid "Incorporation cancelled\n"
 msgstr "Fogadás megszakítva\n"
 
-#: src/inc.c:1285
+#: src/inc.c:1284
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "%s új üzeneteinek megszerzése %s mappába...\n"
@@ -3244,14 +3245,15 @@ msgid "/_View/Mess_age source"
 msgstr "/_Nézet/Ü_zenet forrása"
 
 #: src/mainwindow.c:708 src/messageview.c:245
-msgid "/_View/Show all _header"
+#, fuzzy
+msgid "/_View/Show all _headers"
 msgstr "/_Nézet/_Minden fejléc megjelenítése"
 
 #: src/mainwindow.c:710
 msgid "/_View/_Update summary"
 msgstr "/_Nézet/Ö_sszegzés frissítése"
 
-#: src/mainwindow.c:712 src/messageview.c:247
+#: src/mainwindow.c:712 src/messageview.c:248
 msgid "/_Message"
 msgstr "/_Üzenet"
 
@@ -3281,16 +3283,16 @@ msgstr "/_Üzenet/Ü_zenetek küldése a Várakozó sorból"
 
 #: src/mainwindow.c:722 src/mainwindow.c:724 src/mainwindow.c:731
 #: src/mainwindow.c:736 src/mainwindow.c:739 src/mainwindow.c:750
-#: src/mainwindow.c:752 src/mainwindow.c:755 src/messageview.c:250
-#: src/messageview.c:258 src/messageview.c:263
+#: src/mainwindow.c:752 src/mainwindow.c:755 src/messageview.c:251
+#: src/messageview.c:259 src/messageview.c:264
 msgid "/_Message/---"
 msgstr "/_Üzenet/---"
 
-#: src/mainwindow.c:723 src/messageview.c:248
+#: src/mainwindow.c:723 src/messageview.c:249
 msgid "/_Message/Compose _new message"
 msgstr "/_Üzenet/_Új üzenet szerkesztése"
 
-#: src/mainwindow.c:725 src/messageview.c:251
+#: src/mainwindow.c:725 src/messageview.c:252
 msgid "/_Message/_Reply"
 msgstr "/_Üzenet/Vá_lasz"
 
@@ -3298,27 +3300,27 @@ msgstr "/_Üzenet/Vá_lasz"
 msgid "/_Message/Repl_y to"
 msgstr "/_Üzenet/_Válasz másnak"
 
-#: src/mainwindow.c:727 src/messageview.c:252
+#: src/mainwindow.c:727 src/messageview.c:253
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Üzenet/Válasz _másnak/_Mindenkinek"
 
-#: src/mainwindow.c:728 src/messageview.c:254
+#: src/mainwindow.c:728 src/messageview.c:255
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Üzenet/Válasz _másnak/A _küldőnek"
 
-#: src/mainwindow.c:729 src/messageview.c:256
+#: src/mainwindow.c:729 src/messageview.c:257
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Üzenet/Válasz _másnak/_Levelező listának"
 
-#: src/mainwindow.c:732 src/messageview.c:259
+#: src/mainwindow.c:732 src/messageview.c:260
 msgid "/_Message/_Forward"
 msgstr "/_Üzenet/_Továbbítás"
 
-#: src/mainwindow.c:733 src/messageview.c:260
+#: src/mainwindow.c:733 src/messageview.c:261
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Üzenet/Továbbítás _csatolásként"
 
-#: src/mainwindow.c:735 src/messageview.c:262
+#: src/mainwindow.c:735 src/messageview.c:263
 msgid "/_Message/Redirec_t"
 msgstr "/_Üzenet/Á_tirányít"
 
@@ -3374,7 +3376,7 @@ msgstr "/_Üzenet/_Levélszemétként beállítás"
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/_Üzenet/_Nem levélszemétként beállítás"
 
-#: src/mainwindow.c:756 src/messageview.c:264
+#: src/mainwindow.c:756 src/messageview.c:265
 msgid "/_Message/Re-_edit"
 msgstr "/_Üzenet/_Szerkesztés újra"
 
@@ -3390,23 +3392,23 @@ msgstr "/_Eszközök/Összes üzenet szűrése a mappában"
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Eszközök/Kivá_lasztott üzenetek szűrése"
 
-#: src/mainwindow.c:767 src/messageview.c:271
+#: src/mainwindow.c:767 src/messageview.c:272
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Eszközök/_Szűrési szabályok"
 
-#: src/mainwindow.c:768 src/messageview.c:273
+#: src/mainwindow.c:768 src/messageview.c:274
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Eszközök/_Szűrési szabályok/_Automatikusan"
 
-#: src/mainwindow.c:770 src/messageview.c:275
+#: src/mainwindow.c:770 src/messageview.c:276
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Eszközök/_Szűrési szabályok/_Feladó alapján"
 
-#: src/mainwindow.c:772 src/messageview.c:277
+#: src/mainwindow.c:772 src/messageview.c:278
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Eszközök/_Szűrési szabályok/_Címzett alapján"
 
-#: src/mainwindow.c:774 src/messageview.c:279
+#: src/mainwindow.c:774 src/messageview.c:280
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Eszközök/_Szűrési szabályok/_Tárgy alapján"
 
@@ -3525,7 +3527,7 @@ msgid "MainWindow: color allocation %d failed\n"
 msgstr "Főablak: %d szín foglalása nem sikerült\n"
 
 #: src/mainwindow.c:1139 src/summaryview.c:2275 src/summaryview.c:2360
-#: src/summaryview.c:3907 src/summaryview.c:4036 src/summaryview.c:4394
+#: src/summaryview.c:3908 src/summaryview.c:4037 src/summaryview.c:4395
 msgid "done.\n"
 msgstr "kész.\n"
 
@@ -3784,7 +3786,7 @@ msgid "Find text:"
 msgstr "Szöveg keresése:"
 
 #: src/message_search.c:153 src/prefs_search_folder.c:253
-#: src/query_search.c:326
+#: src/query_search.c:343
 msgid "Case sensitive"
 msgstr "Nagy- és kisbetű érzékenység"
 
@@ -3808,27 +3810,27 @@ msgstr "Az üzenet végére értem; folytassam az elejéről?"
 msgid "Search finished"
 msgstr "Keresés befejeződött"
 
-#: src/messageview.c:268
+#: src/messageview.c:269
 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:300
+#: src/messageview.c:301
 msgid "Creating message view...\n"
 msgstr "Üzenet nézet létrehozása...\n"
 
-#: src/messageview.c:325
+#: src/messageview.c:326
 msgid "Text"
 msgstr "Szöveg"
 
-#: src/messageview.c:330
+#: src/messageview.c:331
 msgid "Attachments"
 msgstr "Csatolások"
 
-#: src/messageview.c:380
+#: src/messageview.c:381
 msgid "Message View - Sylpheed"
 msgstr "Üzenetnézet - Sylpheed"
 
-#: src/messageview.c:699 src/summaryview.c:3436
+#: src/messageview.c:700 src/summaryview.c:3436
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "`%s' fájlt nem lehet elmenteni."
@@ -3845,7 +3847,7 @@ msgstr "(Alapértelmezett nyomtatási parancs)"
 msgid "Print"
 msgstr "Nyomtatás"
 
-#: src/messageview.c:770 src/summaryview.c:3471
+#: src/messageview.c:769 src/summaryview.c:3470
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -3941,11 +3943,11 @@ msgstr ""
 "Adja meg a fájl megnyitásához szükséges parancsot:\n"
 "(`%s' helyére a fájlnév kerül)"
 
-#: src/mimeview.c:1147
+#: src/mimeview.c:1140
 msgid "Opening executable file"
 msgstr "Futtatható fájl megnyitása"
 
-#: src/mimeview.c:1148
+#: src/mimeview.c:1141
 msgid ""
 "This is an executable file. Opening executable file is restricted for "
 "security.\n"
@@ -3957,11 +3959,6 @@ msgstr ""
 "Ha futtatni szeretné, mentse el valahová, és győződjön meg róla, hogy nem "
 "egy vírus vagy más kártékony program."
 
-#: src/mimeview.c:1184
-#, c-format
-msgid "MIME viewer command line is invalid: `%s'"
-msgstr "MIME megjelenítő parancssor érvénytelen: `%s'"
-
 #: src/passphrase.c:96
 msgid "Passphrase"
 msgstr "Jelmondat"
@@ -5697,19 +5694,19 @@ msgstr "Válaszcím:"
 msgid "%s - Edit search condition"
 msgstr "%s - Keresési feltételek módosítása"
 
-#: src/prefs_search_folder.c:209 src/query_search.c:257
+#: src/prefs_search_folder.c:209 src/query_search.c:274
 msgid "Match any of the following"
 msgstr "Néhány egyezik a következőkből"
 
-#: src/prefs_search_folder.c:211 src/query_search.c:259
+#: src/prefs_search_folder.c:211 src/query_search.c:276
 msgid "Match all of the following"
 msgstr "Minden egyezik a következőkből"
 
-#: src/prefs_search_folder.c:231 src/query_search.c:303
+#: src/prefs_search_folder.c:231 src/query_search.c:320
 msgid "Folder:"
 msgstr "Mappa:"
 
-#: src/prefs_search_folder.c:248 src/query_search.c:321
+#: src/prefs_search_folder.c:248 src/query_search.c:338
 msgid "Search subfolders"
 msgstr "Almappák keresése"
 
@@ -5723,17 +5720,17 @@ msgid "Attachment"
 msgstr "Csatolás"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73 src/query_search.c:371 src/summaryview.c:4901
+#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4902
 msgid "Subject"
 msgstr "Tárgy"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/query_search.c:372 src/summaryview.c:4904
+#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4905
 msgid "From"
 msgstr "Feladó"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/query_search.c:373 src/summaryview.c:4906
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:4907
 msgid "Date"
 msgstr "Dátum"
 
@@ -5826,41 +5823,41 @@ msgstr "Készültségi ablak létrehozása...\n"
 msgid "Status"
 msgstr "Állapot"
 
-#: src/query_search.c:234
+#: src/query_search.c:251
 msgid "Search messages"
 msgstr "Üzenetek keresése"
 
-#: src/query_search.c:395
+#: src/query_search.c:423
 msgid "_Save as search folder"
 msgstr "_Mentés, mint keresési mappa"
 
-#: src/query_search.c:512 src/subscribedialog.c:526 src/summaryview.c:842
+#: src/query_search.c:542 src/subscribedialog.c:526 src/summaryview.c:842
 msgid "Done."
 msgstr "Kész."
 
-#: src/query_search.c:536
+#: src/query_search.c:566
 #, c-format
 msgid "Searching %s ..."
 msgstr "%s keresése..."
 
-#: src/query_search.c:564
+#: src/query_search.c:594
 #, c-format
 msgid "Searching %s (%d / %d)..."
 msgstr "%s keresése (%d / %d)..."
 
-#: src/query_search.c:645 src/summaryview.c:2051
+#: src/query_search.c:675 src/summaryview.c:2051
 msgid "(No Date)"
 msgstr "(Nincs Dátum)"
 
-#: src/query_search.c:833
+#: src/query_search.c:869
 msgid "Save as search folder"
 msgstr "Mentés, mint keresési mappa"
 
-#: src/query_search.c:854
+#: src/query_search.c:890
 msgid "Location:"
 msgstr "Hely:"
 
-#: src/query_search.c:869
+#: src/query_search.c:905
 msgid "Folder name:"
 msgstr "Mappanév:"
 
@@ -6482,37 +6479,37 @@ msgstr "%d üzenet kijelölve %s mappába másolásra\n"
 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:3506
+#: src/summaryview.c:3507
 msgid "Error occurred while processing messages."
 msgstr "Hiba az üzenetek feldolgozása közben."
 
-#: src/summaryview.c:3814 src/summaryview.c:3815
+#: src/summaryview.c:3815 src/summaryview.c:3816
 msgid "Building threads..."
 msgstr "Üzenetfolyam felépítése"
 
-#: src/summaryview.c:3965 src/summaryview.c:3966
+#: src/summaryview.c:3966 src/summaryview.c:3967
 msgid "Unthreading..."
 msgstr "Üzenetfolyam lebontás..."
 
-#: src/summaryview.c:4259 src/summaryview.c:4315
+#: src/summaryview.c:4260 src/summaryview.c:4316
 #, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Szűrés (%d / %d)..."
 
-#: src/summaryview.c:4364
+#: src/summaryview.c:4365
 msgid "filtering..."
 msgstr "szűrés..."
 
-#: src/summaryview.c:4365
+#: src/summaryview.c:4366
 msgid "Filtering..."
 msgstr "Szűrés..."
 
-#: src/summaryview.c:4401
+#: src/summaryview.c:4402
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "%d üzenet szűrése elvégezve."
 
-#: src/summaryview.c:4910
+#: src/summaryview.c:4911
 msgid "No."
 msgstr "Db"
 
@@ -6593,6 +6590,9 @@ msgstr "_Kilépés"
 msgid "Sylpheed"
 msgstr "Sylpheed"
 
+#~ msgid "MIME viewer command line is invalid: `%s'"
+#~ msgstr "MIME megjelenítő parancssor érvénytelen: `%s'"
+
 #~ msgid "%dB"
 #~ msgstr "%dB"
 
diff --git a/po/it.po b/po/it.po
index 66cc3cc4..5228db5a 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed 2.2.0.rc\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-03-02 19:03+0900\n"
+"POT-Creation-Date: 2006-03-10 16:06+0900\n"
 "PO-Revision-Date: 2006-02-11 10:02+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:491
+#: libsylph/prefs_common.c:496
 msgid "Junk mail filter"
 msgstr "Filtro mail spazzatura"
 
@@ -523,7 +523,7 @@ msgstr "Impossibile aprire il file delle segnature\n"
 msgid "can't fetch message %d\n"
 msgstr "impossibile prelevare il messaggio %d\n"
 
-#: libsylph/procmsg.c:1375
+#: libsylph/procmsg.c:1378
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "La riga di comando di stampa non è valida: «%s»\n"
@@ -601,12 +601,12 @@ msgstr "  Oggetto: %s\n"
 msgid "  Issuer: %s\n"
 msgstr "  Distributore: %s\n"
 
-#: libsylph/utils.c:2411 src/compose.c:2869 src/compose.c:3132
-#: src/compose.c:3195 src/compose.c:3315
+#: libsylph/utils.c:2430 src/compose.c:2888 src/compose.c:3151
+#: src/compose.c:3214 src/compose.c:3334
 msgid "can't change file mode\n"
 msgstr "impossibile cambiare i permessi del file\n"
 
-#: libsylph/utils.c:2418 libsylph/utils.c:2542
+#: libsylph/utils.c:2437 libsylph/utils.c:2561
 #, c-format
 msgid "writing to %s failed.\n"
 msgstr "la scrittura su %s è fallita.\n"
@@ -691,8 +691,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:493
-#: src/compose.c:4273 src/editaddress.c:200 src/editaddress.c:942
+#: src/account_dialog.c:366 src/addressadd.c:192 src/addressbook.c:491
+#: src/compose.c:4292 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
@@ -828,12 +828,12 @@ msgstr "Argomento dell'azione utente"
 msgid "Add Address to Book"
 msgstr "Aggiunta dell'indirizzo alla rubrica"
 
-#: src/addressadd.c:202 src/compose.c:4777 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4796 src/editaddress.c:201
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "Indirizzo"
 
-#: src/addressadd.c:212 src/addressbook.c:495 src/editaddress.c:202
+#: src/addressadd.c:212 src/addressbook.c:493 src/editaddress.c:202
 #: src/editaddress.c:795 src/editaddress.c:860 src/editgroup.c:267
 msgid "Remarks"
 msgstr "Note"
@@ -842,110 +842,111 @@ msgstr "Note"
 msgid "Select Address Book Folder"
 msgstr "Selezione della cartella della rubrica"
 
-#: src/addressbook.c:338 src/compose.c:515 src/mainwindow.c:489
+#: src/addressbook.c:337 src/compose.c:515 src/mainwindow.c:489
 #: src/messageview.c:140
 msgid "/_File"
 msgstr "/_File"
 
-#: src/addressbook.c:339
+#: src/addressbook.c:338
 msgid "/_File/New _Book"
 msgstr "/_File/Nuova _rubrica"
 
-#: src/addressbook.c:340
+#: src/addressbook.c:339
 msgid "/_File/New _vCard"
 msgstr "/_File/Nuova _vCard"
 
-#: src/addressbook.c:342
+#: src/addressbook.c:341
 msgid "/_File/New _JPilot"
 msgstr "/_File/Nuovo _JPilot"
 
-#: src/addressbook.c:345
-msgid "/_File/New _Server"
+#: src/addressbook.c:344
+#, fuzzy
+msgid "/_File/New _LDAP Server"
 msgstr "/_File/_Nuovo server"
 
-#: src/addressbook.c:347 src/addressbook.c:350 src/compose.c:520
+#: src/addressbook.c:346 src/addressbook.c:349 src/compose.c:520
 #: src/compose.c:525 src/compose.c:528 src/compose.c:531 src/mainwindow.c:507
 #: src/mainwindow.c:510 src/mainwindow.c:512 src/mainwindow.c:515
 #: src/mainwindow.c:517 src/messageview.c:143
 msgid "/_File/---"
 msgstr "/_File/---"
 
-#: src/addressbook.c:348
+#: src/addressbook.c:347
 msgid "/_File/_Edit"
 msgstr "/_File/_Modifica"
 
-#: src/addressbook.c:349
+#: src/addressbook.c:348
 msgid "/_File/_Delete"
 msgstr "/_File/_Elimina"
 
-#: src/addressbook.c:351
+#: src/addressbook.c:350
 msgid "/_File/_Save"
 msgstr "/_File/_Salva"
 
-#: src/addressbook.c:352 src/compose.c:532 src/messageview.c:144
+#: src/addressbook.c:351 src/compose.c:532 src/messageview.c:144
 msgid "/_File/_Close"
 msgstr "/_File/_Chiudi"
 
-#: src/addressbook.c:353
+#: src/addressbook.c:352
 msgid "/_Address"
 msgstr "/_Indirizzo"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:353
 msgid "/_Address/New _Address"
 msgstr "/_Indirizzo/Nuovo _indirizzo"
 
-#: src/addressbook.c:355
+#: src/addressbook.c:354
 msgid "/_Address/New _Group"
 msgstr "/_Indirizzo/Nuovo _gruppo"
 
-#: src/addressbook.c:356
+#: src/addressbook.c:355
 msgid "/_Address/New _Folder"
 msgstr "/_Indirizzo/Nuova _cartella"
 
-#: src/addressbook.c:357
+#: src/addressbook.c:356
 msgid "/_Address/---"
 msgstr "/_Indirizzo/---"
 
-#: src/addressbook.c:358
+#: src/addressbook.c:357
 msgid "/_Address/_Edit"
 msgstr "/_Indirizzo/_Modifica"
 
-#: src/addressbook.c:359
+#: src/addressbook.c:358
 msgid "/_Address/_Delete"
 msgstr "/_indirizzo/_Elimina"
 
-#: src/addressbook.c:360 src/compose.c:645 src/mainwindow.c:758
-#: src/messageview.c:266
+#: src/addressbook.c:359 src/compose.c:645 src/mainwindow.c:758
+#: src/messageview.c:267
 msgid "/_Tools"
 msgstr "/S_trumenti"
 
-#: src/addressbook.c:361
+#: src/addressbook.c:360
 msgid "/_Tools/Import _LDIF file"
 msgstr "/S_trumenti/Importa file _LDIF"
 
-#: src/addressbook.c:362 src/compose.c:666 src/mainwindow.c:812
-#: src/messageview.c:286
+#: src/addressbook.c:361 src/compose.c:666 src/mainwindow.c:812
+#: src/messageview.c:287
 msgid "/_Help"
 msgstr "/A_iuto"
 
-#: src/addressbook.c:363 src/compose.c:667 src/mainwindow.c:824
-#: src/messageview.c:287
+#: src/addressbook.c:362 src/compose.c:667 src/mainwindow.c:824
+#: src/messageview.c:288
 msgid "/_Help/_About"
 msgstr "/A_iuto/I_nformazioni"
 
-#: src/addressbook.c:382 src/addressbook.c:392
+#: src/addressbook.c:381 src/addressbook.c:391
 msgid "/New _Address"
 msgstr "/Nuovo _indirizzo"
 
-#: src/addressbook.c:383 src/addressbook.c:393
+#: src/addressbook.c:382 src/addressbook.c:392
 msgid "/New _Group"
 msgstr "/Nuovo _gruppo"
 
-#: src/addressbook.c:384 src/addressbook.c:394
+#: src/addressbook.c:383 src/addressbook.c:393
 msgid "/New _Folder"
 msgstr "/Nuova _cartella"
 
-#: src/addressbook.c:385 src/addressbook.c:395 src/compose.c:509
+#: src/addressbook.c:384 src/addressbook.c:394 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
@@ -955,70 +956,70 @@ msgstr "/Nuova _cartella"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:386 src/addressbook.c:396 src/compose.c:534
+#: src/addressbook.c:385 src/addressbook.c:395 src/compose.c:534
 #: src/mainwindow.c:521 src/messageview.c:146
 msgid "/_Edit"
 msgstr "/_Modifica"
 
-#: src/addressbook.c:387 src/addressbook.c:397 src/summaryview.c:434
+#: src/addressbook.c:386 src/addressbook.c:396 src/summaryview.c:434
 msgid "/_Delete"
 msgstr "/Eli_mina"
 
-#: src/addressbook.c:494
+#: src/addressbook.c:492
 msgid "E-Mail address"
 msgstr "Indirizzo e-mail"
 
-#: src/addressbook.c:498 src/compose.c:4778 src/prefs_common_dialog.c:2183
+#: src/addressbook.c:496 src/compose.c:4797 src/prefs_common_dialog.c:2183
 msgid "Address book"
 msgstr "Rubrica"
 
-#: src/addressbook.c:600 src/prefs_filter_edit.c:249
+#: src/addressbook.c:603 src/prefs_filter_edit.c:249
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "Nome:"
 
 #. Buttons
-#: src/addressbook.c:632 src/addressbook.c:1684 src/editaddress.c:884
+#: src/addressbook.c:636 src/addressbook.c:1678 src/editaddress.c:884
 #: src/editaddress.c:1017 src/mainwindow.c:2426 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:635 src/editaddress.c:890 src/editaddress.c:1023
+#: src/addressbook.c:639 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:1552
 msgid "Add"
 msgstr " Aggiungi "
 
-#: src/addressbook.c:638
+#: src/addressbook.c:642
 msgid "Lookup"
 msgstr "Cerca"
 
-#: src/addressbook.c:650 src/headerview.c:55 src/prefs_folder_item.c:339
+#: src/addressbook.c:654 src/headerview.c:55 src/prefs_folder_item.c:339
 #: src/prefs_template.c:176
 msgid "To:"
 msgstr "A:"
 
-#: src/addressbook.c:654 src/prefs_folder_item.c:356 src/prefs_template.c:178
+#: src/addressbook.c:658 src/prefs_folder_item.c:356 src/prefs_template.c:178
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:658 src/prefs_folder_item.c:367
+#: src/addressbook.c:662 src/prefs_folder_item.c:367
 msgid "Bcc:"
 msgstr "Bcc:"
 
 #. Confirm deletion
-#: src/addressbook.c:845
+#: src/addressbook.c:832
 msgid "Delete address(es)"
 msgstr "Elimina l'indirizzo(i)"
 
-#: src/addressbook.c:846
+#: src/addressbook.c:833
 msgid "Really delete the address(es)?"
 msgstr "Eliminare l'indirizzo(i)?"
 
-#: src/addressbook.c:1675
+#: src/addressbook.c:1669
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1028,36 +1029,36 @@ msgstr ""
 "Eliminando solo la cartella, gli indirizzi saranno spostati nella cartella "
 "di origine."
 
-#: src/addressbook.c:1678 src/folderview.c:2372
+#: src/addressbook.c:1672 src/folderview.c:2372
 msgid "Delete folder"
 msgstr "Elimina la cartella"
 
-#: src/addressbook.c:1678
+#: src/addressbook.c:1672
 msgid "_Folder only"
 msgstr "_Solo la cartella"
 
-#: src/addressbook.c:1678
+#: src/addressbook.c:1672
 msgid "Folder and _addresses"
 msgstr "Cartella e _indirizzi"
 
-#: src/addressbook.c:1683
+#: src/addressbook.c:1677
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Eliminare «%s» ?"
 
-#: src/addressbook.c:2369 src/addressbook.c:2502
+#: src/addressbook.c:2363 src/addressbook.c:2496
 msgid "New user, could not save index file."
 msgstr "Nuovo utente, impossibile salvare il file indice."
 
-#: src/addressbook.c:2373 src/addressbook.c:2506
+#: src/addressbook.c:2367 src/addressbook.c:2500
 msgid "New user, could not save address book files."
 msgstr "Nuovo utente, impossibile salvare i file della rubrica."
 
-#: src/addressbook.c:2383 src/addressbook.c:2516
+#: src/addressbook.c:2377 src/addressbook.c:2510
 msgid "Old address book converted successfully."
 msgstr "La vecchia rubrica è stata convertita con successo."
 
-#: src/addressbook.c:2388
+#: src/addressbook.c:2382
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1065,7 +1066,7 @@ msgstr ""
 "Vecchia rubrica convertita,\n"
 "impossibile salvare il nuovo file indice dell'indirizzo"
 
-#: src/addressbook.c:2401
+#: src/addressbook.c:2395
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1073,7 +1074,7 @@ msgstr ""
 "Impossibile convertire la rubrica,\n"
 "ma ho creato nuovi file vuoti della rubrica."
 
-#: src/addressbook.c:2407
+#: src/addressbook.c:2401
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1081,7 +1082,7 @@ msgstr ""
 "Impossibile convertire la rubrica,\n"
 "impossibile creare i nuovi file della rubrica."
 
-#: src/addressbook.c:2412
+#: src/addressbook.c:2406
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1089,92 +1090,92 @@ msgstr ""
 "Impossibile convertire la rubrica,\n"
 "e impossibile creare i nuovi file della rubrica."
 
-#: src/addressbook.c:2419
+#: src/addressbook.c:2413
 msgid "Addressbook conversion error"
 msgstr "Errore di conversione della rubrica"
 
-#: src/addressbook.c:2423
+#: src/addressbook.c:2417
 msgid "Addressbook conversion"
 msgstr "Conversione della rubrica"
 
-#: src/addressbook.c:2458
+#: src/addressbook.c:2452
 msgid "Addressbook Error"
 msgstr "Errore nella rubrica"
 
-#: src/addressbook.c:2459 src/addressbook.c:2559
+#: src/addressbook.c:2453 src/addressbook.c:2553
 msgid "Could not read address index"
 msgstr "Impossibile leggere l'indice dell'indirizzo"
 
-#: src/addressbook.c:2521
+#: src/addressbook.c:2515
 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:2535
+#: src/addressbook.c:2529
 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:2541
+#: src/addressbook.c:2535
 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:2547
+#: src/addressbook.c:2541
 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:2565
+#: src/addressbook.c:2559
 msgid "Addressbook Conversion Error"
 msgstr "Errore di conversione della rubrica"
 
-#: src/addressbook.c:2571
+#: src/addressbook.c:2565
 msgid "Addressbook Conversion"
 msgstr "Conversione della rubrica"
 
-#: src/addressbook.c:3086 src/prefs_common_dialog.c:2033
+#: src/addressbook.c:3080 src/prefs_common_dialog.c:2033
 msgid "Interface"
 msgstr "Interfaccia"
 
-#: src/addressbook.c:3102 src/importldif.c:514
+#: src/addressbook.c:3096 src/importldif.c:514
 msgid "Address Book"
 msgstr "Rubrica"
 
-#: src/addressbook.c:3118
+#: src/addressbook.c:3112
 msgid "Person"
 msgstr "Persona"
 
-#: src/addressbook.c:3134
+#: src/addressbook.c:3128
 msgid "EMail Address"
 msgstr "Indirizzo email"
 
-#: src/addressbook.c:3150
+#: src/addressbook.c:3144
 msgid "Group"
 msgstr "Gruppo"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3166 src/folderview.c:367 src/prefs_account_dialog.c:1694
-#: src/query_search.c:370
+#: src/addressbook.c:3160 src/folderview.c:367 src/prefs_account_dialog.c:1694
+#: src/query_search.c:398
 msgid "Folder"
 msgstr "Cartella"
 
-#: src/addressbook.c:3182
+#: src/addressbook.c:3176
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3198 src/addressbook.c:3214
+#: src/addressbook.c:3192 src/addressbook.c:3208
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3230
+#: src/addressbook.c:3224
 msgid "LDAP Server"
 msgstr "Server LDAP"
 
@@ -1186,7 +1187,7 @@ msgstr "Indirizzo comune"
 msgid "Personal address"
 msgstr "Indirizzo personale"
 
-#: src/alertpanel.c:142 src/compose.c:5500 src/main.c:621
+#: src/alertpanel.c:142 src/compose.c:5517 src/main.c:621
 msgid "Notice"
 msgstr "Avviso"
 
@@ -1194,7 +1195,7 @@ msgstr "Avviso"
 msgid "Warning"
 msgstr "Avvertimento"
 
-#: src/alertpanel.c:168 src/inc.c:587
+#: src/alertpanel.c:168 src/inc.c:586
 msgid "Error"
 msgstr "Errore"
 
@@ -1237,7 +1238,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:4761
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4762
 msgid "None"
 msgstr "Niente"
 
@@ -1483,7 +1484,7 @@ msgstr "/_Visualizza/Co_difica caratteri/Tailandese (TIS-_620)"
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Visualizza/Co_difica caratteri/Tailan_dese (Windows-874)"
 
-#: src/compose.c:646 src/mainwindow.c:759 src/messageview.c:267
+#: src/compose.c:646 src/mainwindow.c:759 src/messageview.c:268
 msgid "/_Tools/_Address book"
 msgstr "/S_trumenti/_Rubrica"
 
@@ -1491,14 +1492,14 @@ msgstr "/S_trumenti/_Rubrica"
 msgid "/_Tools/_Template"
 msgstr "/S_trumenti/_Modello"
 
-#: src/compose.c:649 src/mainwindow.c:783 src/messageview.c:283
+#: src/compose.c:649 src/mainwindow.c:783 src/messageview.c:284
 msgid "/_Tools/Actio_ns"
 msgstr "/S_trumenti/A_zioni"
 
 #: src/compose.c:651 src/compose.c:655 src/compose.c:661 src/mainwindow.c:762
 #: src/mainwindow.c:776 src/mainwindow.c:781 src/mainwindow.c:784
-#: src/mainwindow.c:788 src/mainwindow.c:790 src/messageview.c:270
-#: src/messageview.c:282
+#: src/mainwindow.c:788 src/mainwindow.c:790 src/messageview.c:271
+#: src/messageview.c:283
 msgid "/_Tools/---"
 msgstr "/S_trumenti/---"
 
@@ -1522,79 +1523,79 @@ msgstr "/S_trumenti/_Controllo ortografico"
 msgid "/_Tools/_Set spell language"
 msgstr "/S_trumenti/Impo_sta lingua"
 
-#: src/compose.c:910
+#: src/compose.c:912
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: il file non esiste\n"
 
-#: src/compose.c:1014 src/compose.c:1085
+#: src/compose.c:1016 src/compose.c:1087
 msgid "Can't get text part\n"
 msgstr "Impossibile ricevere parte del testo\n"
 
-#: src/compose.c:1486
+#: src/compose.c:1488
 msgid "Quote mark format error."
 msgstr "Errore del formato del segno di citazione."
 
-#: src/compose.c:1498
+#: src/compose.c:1500
 msgid "Message reply/forward format error."
 msgstr "Errore del formato nel messaggio di risposta/inoltro."
 
-#: src/compose.c:1918
+#: src/compose.c:1935
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Il file %s non esiste\n"
 
-#: src/compose.c:1922
+#: src/compose.c:1939
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Impossibile ottenere la dimensione di %s\n"
 
-#: src/compose.c:1926
+#: src/compose.c:1943
 #, c-format
 msgid "File %s is empty."
 msgstr "Il file %s è vuoto."
 
-#: src/compose.c:1930
+#: src/compose.c:1947
 #, c-format
 msgid "Can't read %s."
 msgstr "Impossibile leggere %s."
 
-#: src/compose.c:1963
+#: src/compose.c:1980
 #, c-format
 msgid "Message: %s"
 msgstr "Messaggio: %s"
 
-#: src/compose.c:2023 src/mimeview.c:565
+#: src/compose.c:2040 src/mimeview.c:565
 msgid "Can't get the part of multipart message."
 msgstr "Impossibile ricevere parte del messaggio composto."
 
-#: src/compose.c:2507 src/headerview.c:195 src/query_search.c:636
+#: src/compose.c:2524 src/headerview.c:195 src/query_search.c:666
 #: src/summaryview.c:2124
 msgid "(No Subject)"
 msgstr "(Nessun oggetto)"
 
-#: src/compose.c:2510
+#: src/compose.c:2527
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Componi%s"
 
-#: src/compose.c:2623
+#: src/compose.c:2642
 msgid "Recipient is not specified."
 msgstr "Il destinatario non è specificato."
 
-#: src/compose.c:2631
+#: src/compose.c:2650
 msgid "Empty subject"
 msgstr "Oggetto vuoto"
 
-#: src/compose.c:2632
+#: src/compose.c:2651
 msgid "Subject is empty. Send it anyway?"
 msgstr "L'oggetto è vuoto. Inviarlo comunque?"
 
-#: src/compose.c:2691
+#: src/compose.c:2710
 msgid "can't get recipient list."
 msgstr "impossibile ottenere la lista dei destinatari."
 
-#: src/compose.c:2711
+#: src/compose.c:2730
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1602,23 +1603,23 @@ msgstr ""
 "Non è specificato l'account per l'invio della posta.\n"
 "Scegliere un account di posta prima dell'invio."
 
-#: src/compose.c:2725 src/send_message.c:299
+#: src/compose.c:2744 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:2767
+#: src/compose.c:2786
 msgid "Can't save the message to outbox."
 msgstr "Impossibile salvare il messaggio nella cartella «Inviata»."
 
-#: src/compose.c:2805
+#: src/compose.c:2824
 #, 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:2902
+#: src/compose.c:2921
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1630,11 +1631,11 @@ msgstr ""
 "\n"
 "Spedirlo come %s comunque?"
 
-#: src/compose.c:2908
+#: src/compose.c:2927
 msgid "Code conversion error"
 msgstr "Errore di conversione del codice"
 
-#: src/compose.c:2981
+#: src/compose.c:3000
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1648,156 +1649,156 @@ msgstr ""
 "\n"
 "Spedirlo comunque?"
 
-#: src/compose.c:2985
+#: src/compose.c:3004
 msgid "Line length limit"
 msgstr "Limite lunghezza linea"
 
-#: src/compose.c:3275
+#: src/compose.c:3294
 msgid "can't remove the old message\n"
 msgstr "impossibile rimuovere il vecchio messaggio\n"
 
-#: src/compose.c:3293
+#: src/compose.c:3312
 msgid "queueing message...\n"
 msgstr "accodamento messaggio...\n"
 
-#: src/compose.c:3375
+#: src/compose.c:3394
 msgid "can't find queue folder\n"
 msgstr "impossibile trovare la cartella «Coda»\n"
 
-#: src/compose.c:3382
+#: src/compose.c:3401
 msgid "can't queue the message\n"
 msgstr "impossibile accodare il messaggio\n"
 
-#: src/compose.c:3975
+#: src/compose.c:3994
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "generato l'ID-messaggio: %s\n"
 
-#: src/compose.c:4088
+#: src/compose.c:4107
 msgid "Creating compose window...\n"
 msgstr "Creazione della finestra di composizione...\n"
 
-#: src/compose.c:4139 src/headerview.c:54
+#: src/compose.c:4158 src/headerview.c:54
 msgid "From:"
 msgstr "Da:"
 
-#: src/compose.c:4213
+#: src/compose.c:4232
 msgid "PGP Sign"
 msgstr "Firma PGP"
 
-#: src/compose.c:4216
+#: src/compose.c:4235
 msgid "PGP Encrypt"
 msgstr "Cifratura PGP"
 
-#: src/compose.c:4254 src/compose.c:5332
+#: src/compose.c:4273 src/compose.c:5351
 msgid "MIME type"
 msgstr "Tipo MIME"
 
 #. S_COL_DATE
-#: src/compose.c:4263 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4908
+#: src/compose.c:4282 src/mimeview.c:197 src/prefs_filter_edit.c:496
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4909
 msgid "Size"
 msgstr "Dimensione"
 
-#: src/compose.c:4698 src/mainwindow.c:2359 src/prefs_account_dialog.c:528
+#: src/compose.c:4717 src/mainwindow.c:2359 src/prefs_account_dialog.c:528
 #: src/prefs_common_dialog.c:661
 msgid "Send"
 msgstr "Invia"
 
-#: src/compose.c:4699
+#: src/compose.c:4718
 msgid "Send message"
 msgstr "Invia il messaggio"
 
-#: src/compose.c:4707
+#: src/compose.c:4726
 msgid "Send later"
 msgstr "Invia più tardi"
 
-#: src/compose.c:4708
+#: src/compose.c:4727
 msgid "Put into queue folder and send later"
 msgstr "Mette nella cartella «Coda» e invia più tardi"
 
-#: src/compose.c:4716
+#: src/compose.c:4735
 msgid "Draft"
 msgstr "Bozze"
 
-#: src/compose.c:4717
+#: src/compose.c:4736
 msgid "Save to draft folder"
 msgstr "Salva nella cartella «Bozze»"
 
-#: src/compose.c:4727
+#: src/compose.c:4746
 msgid "Insert"
 msgstr "Inserisci"
 
-#: src/compose.c:4728
+#: src/compose.c:4747
 msgid "Insert file"
 msgstr "Inserisce il file"
 
-#: src/compose.c:4736
+#: src/compose.c:4755
 msgid "Attach"
 msgstr "Allega"
 
-#: src/compose.c:4737
+#: src/compose.c:4756
 msgid "Attach file"
 msgstr "Allega il file"
 
 #. signature
-#: src/compose.c:4747 src/prefs_account_dialog.c:1208
+#: src/compose.c:4766 src/prefs_account_dialog.c:1208
 #: src/prefs_common_dialog.c:953
 msgid "Signature"
 msgstr "Firma"
 
-#: src/compose.c:4748
+#: src/compose.c:4767
 msgid "Append signature"
 msgstr "Aggiunge la firma"
 
 #. editor
-#: src/compose.c:4757 src/prefs_common_dialog.c:991
+#: src/compose.c:4776 src/prefs_common_dialog.c:991
 #: src/prefs_common_dialog.c:2315
 msgid "Editor"
 msgstr "Editor"
 
-#: src/compose.c:4758
+#: src/compose.c:4777
 msgid "Edit with external editor"
 msgstr "Modifica con l'editor esterno"
 
-#: src/compose.c:4766
+#: src/compose.c:4785
 msgid "Linewrap"
 msgstr "A capo riga"
 
-#: src/compose.c:4767
+#: src/compose.c:4786
 msgid "Wrap all long lines"
 msgstr "Manda a capo tutte le righe lunghe"
 
-#: src/compose.c:5228
+#: src/compose.c:5247
 msgid "Invalid MIME type."
 msgstr "Tipo MIME non valido."
 
-#: src/compose.c:5246
+#: src/compose.c:5265
 msgid "File doesn't exist or is empty."
 msgstr "Il file non esiste o è vuoto."
 
-#: src/compose.c:5314
+#: src/compose.c:5333
 msgid "Properties"
 msgstr "Proprietà"
 
-#: src/compose.c:5334 src/prefs_common_dialog.c:1444
+#: src/compose.c:5353 src/prefs_common_dialog.c:1444
 msgid "Encoding"
 msgstr "Codifica"
 
-#: src/compose.c:5357 src/prefs_folder_item.c:202
+#: src/compose.c:5376 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Percorso"
 
-#: src/compose.c:5358
+#: src/compose.c:5377
 msgid "File name"
 msgstr "Nome del file"
 
-#: src/compose.c:5449
+#: src/compose.c:5466
 #, 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:5497
+#: src/compose.c:5514
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1806,44 +1807,44 @@ msgstr ""
 "L'editor esterno è ancora attivo.\n"
 "Forzare la conclusione del processo (pid:%d)?\n"
 
-#: src/compose.c:5872 src/compose.c:5877 src/compose.c:5883
+#: src/compose.c:5889 src/compose.c:5894 src/compose.c:5900
 msgid "Can't queue the message."
 msgstr "Impossibile accodare il messaggio."
 
-#: src/compose.c:5974
+#: src/compose.c:5991
 msgid "Select files"
 msgstr "Seleziona i file"
 
-#: src/compose.c:5997
+#: src/compose.c:6014
 msgid "Select file"
 msgstr "Selezione del file"
 
-#: src/compose.c:6032
+#: src/compose.c:6049
 msgid "Save message"
 msgstr "Salva il messaggio"
 
-#: src/compose.c:6033
+#: src/compose.c:6050
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Questo messaggio è stato modificato. Salvarlo nella cartella bozze?"
 
-#: src/compose.c:6035
+#: src/compose.c:6052
 msgid "Close _without saving"
 msgstr "Chiudi sen_za salvare"
 
-#: src/compose.c:6077
+#: src/compose.c:6094
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Applicare il modello «%s» ?"
 
-#: src/compose.c:6079
+#: src/compose.c:6096
 msgid "Apply template"
 msgstr "Applica il modello"
 
-#: src/compose.c:6080
+#: src/compose.c:6097
 msgid "_Replace"
 msgstr "_Sostituisci"
 
-#: src/compose.c:6080
+#: src/compose.c:6097
 msgid "_Insert"
 msgstr "_Inserisci"
 
@@ -1964,53 +1965,53 @@ msgstr "Deve essere fornito un nome del gruppo."
 msgid "Edit Group Data"
 msgstr "Modifica i dati del gruppo"
 
-#: src/editgroup.c:300
+#: src/editgroup.c:299
 msgid "Group Name"
 msgstr "Nome del gruppo"
 
-#: src/editgroup.c:319
+#: src/editgroup.c:318
 msgid "Addresses in Group"
 msgstr "Indirizzi nel gruppo"
 
-#: src/editgroup.c:321
+#: src/editgroup.c:320
 msgid " -> "
 msgstr " -> "
 
-#: src/editgroup.c:348
+#: src/editgroup.c:347
 msgid " <- "
 msgstr " <- "
 
-#: src/editgroup.c:350
+#: src/editgroup.c:349
 msgid "Available Addresses"
 msgstr "Indirizzi disponibili"
 
-#: src/editgroup.c:416
+#: src/editgroup.c:415
 msgid "Move E-Mail Addresses to or from Group with arrow buttons"
 msgstr ""
 "Sposta gli indirizzi di e-mail da o in un gruppo con i pulsanti freccia"
 
-#: src/editgroup.c:468
+#: src/editgroup.c:467
 msgid "Edit Group Details"
 msgstr "Modifica i dettagli del gruppo"
 
-#: src/editgroup.c:471
+#: src/editgroup.c:470
 msgid "Add New Group"
 msgstr "Aggiunta di un nuovo gruppo"
 
-#: src/editgroup.c:522
+#: src/editgroup.c:521
 msgid "Edit folder"
 msgstr "Modifica la cartella"
 
-#: src/editgroup.c:522
+#: src/editgroup.c:521
 msgid "Input the new name of folder:"
 msgstr "Inserire il nuovo nome della cartella:"
 
-#: src/editgroup.c:525 src/foldersel.c:541 src/folderview.c:2121
+#: src/editgroup.c:524 src/foldersel.c:541 src/folderview.c:2121
 #: src/folderview.c:2127
 msgid "New folder"
 msgstr "Nuova cartella"
 
-#: src/editgroup.c:526 src/foldersel.c:542 src/folderview.c:2128
+#: src/editgroup.c:525 src/foldersel.c:542 src/folderview.c:2128
 msgid "Input the name of new folder:"
 msgstr "Inserire il nome della nuova cartella:"
 
@@ -2208,7 +2209,7 @@ msgid "`%c' can't be included in folder name."
 msgstr "«%c» non può essere incluso nel nome della cartella."
 
 #: src/foldersel.c:561 src/folderview.c:2147 src/folderview.c:2206
-#: src/query_search.c:995
+#: src/query_search.c:1031
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "La cartella «%s» esiste già."
@@ -2466,7 +2467,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:2127
+#: src/headerview.c:180 src/query_search.c:667 src/summaryview.c:2127
 msgid "(No From)"
 msgstr "(Nessun mittente)"
 
@@ -2596,133 +2597,133 @@ msgstr "Fine"
 msgid "Sylpheed: %d new messages"
 msgstr "Sylpheed: %d nuovi messaggi"
 
-#: src/inc.c:372
+#: src/inc.c:371
 msgid "Retrieving new messages"
 msgstr "Recupero i nuovi messaggi"
 
-#: src/inc.c:415
+#: src/inc.c:414
 msgid "Standby"
 msgstr "Attesa"
 
-#: src/inc.c:544 src/inc.c:593
+#: src/inc.c:543 src/inc.c:592
 msgid "Cancelled"
 msgstr "Cancellato"
 
-#: src/inc.c:555
+#: src/inc.c:554
 msgid "Retrieving"
 msgstr "Recupero"
 
-#: src/inc.c:564
+#: src/inc.c:563
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "Fatto (ricevuti %d messaggio(i) (%s))"
 
-#: src/inc.c:568
+#: src/inc.c:567
 msgid "Done (no new messages)"
 msgstr "Fatto (non ci sono nuovi messaggi)"
 
-#: src/inc.c:574
+#: src/inc.c:573
 msgid "Connection failed"
 msgstr "Connessione fallita"
 
-#: src/inc.c:577
+#: src/inc.c:576
 msgid "Auth failed"
 msgstr "Autenticazione fallita"
 
-#: src/inc.c:580
+#: src/inc.c:579
 msgid "Locked"
 msgstr "Bloccato"
 
-#: src/inc.c:590
+#: src/inc.c:589
 msgid "Timeout"
 msgstr "Timeout"
 
-#: src/inc.c:640
+#: src/inc.c:639
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Finito (%d nuovo(i) messaggio(i))"
 
-#: src/inc.c:643
+#: src/inc.c:642
 msgid "Finished (no new messages)"
 msgstr "Finito (non ci sono nuovi messaggi)"
 
-#: src/inc.c:652
+#: src/inc.c:651
 msgid "Some errors occurred while getting mail."
 msgstr "Ci sono stati degli errori durante la ricezione della posta."
 
-#: src/inc.c:688
+#: src/inc.c:687
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "ricezione dei nuovi messaggi dell'account %s...\n"
 
-#: src/inc.c:691
+#: src/inc.c:690
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Recupero i nuovi messaggi"
 
-#: src/inc.c:710
+#: src/inc.c:709
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Connessione al server POP3: %s..."
 
-#: src/inc.c:719
+#: src/inc.c:718
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Impossibile connettersi al server POP3: %s:%d\n"
 
-#: src/inc.c:798 src/send_message.c:631
+#: src/inc.c:797 src/send_message.c:631
 msgid "Authenticating..."
 msgstr "Autenticazione..."
 
-#: src/inc.c:799
+#: src/inc.c:798
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Ricezione dei messaggi da %s..."
 
-#: src/inc.c:804
+#: src/inc.c:803
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Ricezione del numero dei nuovi messaggi (STAT)..."
 
-#: src/inc.c:808
+#: src/inc.c:807
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Ricezione del numero dei nuovi messaggi (LAST)..."
 
-#: src/inc.c:812
+#: src/inc.c:811
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Ricezione del numero dei nuovi messaggi (UIDL)..."
 
-#: src/inc.c:816
+#: src/inc.c:815
 msgid "Getting the size of messages (LIST)..."
 msgstr "Ricezione della dimensione dei messaggi (LIST)..."
 
-#: src/inc.c:826
+#: src/inc.c:825
 #, c-format
 msgid "Deleting message %d"
 msgstr "Eliminazione del messaggio %d"
 
-#: src/inc.c:833 src/send_message.c:649
+#: src/inc.c:832 src/send_message.c:649
 msgid "Quitting"
 msgstr "Esco"
 
-#: src/inc.c:858
+#: src/inc.c:857
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Recupero il messaggio (%d di %d) (%s di %s)"
 
-#: src/inc.c:879
+#: src/inc.c:878
 #, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Ricezione di (%d messaggio(i) ricevuti (%s))"
 
-#: src/inc.c:1107
+#: src/inc.c:1106
 msgid "Connection failed."
 msgstr "Connessione fallita."
 
-#: src/inc.c:1113
+#: src/inc.c:1112
 msgid "Error occurred while processing mail."
 msgstr "Si è verificato un errore durante l'elaborazione della posta."
 
-#: src/inc.c:1118
+#: src/inc.c:1117
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2731,28 +2732,28 @@ msgstr ""
 "Si è verificato un errore durante l'elaborazione della posta:\n"
 "%s"
 
-#: src/inc.c:1124
+#: src/inc.c:1123
 msgid "No disk space left."
 msgstr "Spazio su disco esaurito."
 
-#: src/inc.c:1129
+#: src/inc.c:1128
 msgid "Can't write file."
 msgstr "Impossibile scrivere il file."
 
-#: src/inc.c:1134
+#: src/inc.c:1133
 msgid "Socket error."
 msgstr "Errore del socket."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1140 src/send_message.c:584 src/send_message.c:772
+#: src/inc.c:1139 src/send_message.c:584 src/send_message.c:772
 msgid "Connection closed by the remote host."
 msgstr "Connessione chiusa dall'host remoto."
 
-#: src/inc.c:1146
+#: src/inc.c:1145
 msgid "Mailbox is locked."
 msgstr "La casella postale è bloccata."
 
-#: src/inc.c:1150
+#: src/inc.c:1149
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2761,11 +2762,11 @@ msgstr ""
 "La casella postale è bloccata:\n"
 "%s"
 
-#: src/inc.c:1156 src/send_message.c:757
+#: src/inc.c:1155 src/send_message.c:757
 msgid "Authentication failed."
 msgstr "Autenticazione fallita."
 
-#: src/inc.c:1161 src/send_message.c:760
+#: src/inc.c:1160 src/send_message.c:760
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2774,15 +2775,15 @@ msgstr ""
 "Autenticazione fallita:\n"
 "%s"
 
-#: src/inc.c:1166 src/send_message.c:776
+#: src/inc.c:1165 src/send_message.c:776
 msgid "Session timed out."
 msgstr "La sessione è andata in timeout."
 
-#: src/inc.c:1202
+#: src/inc.c:1201
 msgid "Incorporation cancelled\n"
 msgstr "Incorporazione cancellata\n"
 
-#: src/inc.c:1285
+#: src/inc.c:1284
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Ricezione in %s dei nuovi messaggi da %s...\n"
@@ -3254,14 +3255,15 @@ msgid "/_View/Mess_age source"
 msgstr "/_Visualizza/Sorgente messagg_io"
 
 #: src/mainwindow.c:708 src/messageview.c:245
-msgid "/_View/Show all _header"
+#, fuzzy
+msgid "/_View/Show all _headers"
 msgstr "/_Visualizza/Mostra intesta_zioni"
 
 #: src/mainwindow.c:710
 msgid "/_View/_Update summary"
 msgstr "/_Visualizza/A_ggiorna sommario"
 
-#: src/mainwindow.c:712 src/messageview.c:247
+#: src/mainwindow.c:712 src/messageview.c:248
 msgid "/_Message"
 msgstr "/M_essaggio"
 
@@ -3291,16 +3293,16 @@ msgstr "/M_essaggio/Invia messa_ggi accodati"
 
 #: src/mainwindow.c:722 src/mainwindow.c:724 src/mainwindow.c:731
 #: src/mainwindow.c:736 src/mainwindow.c:739 src/mainwindow.c:750
-#: src/mainwindow.c:752 src/mainwindow.c:755 src/messageview.c:250
-#: src/messageview.c:258 src/messageview.c:263
+#: src/mainwindow.c:752 src/mainwindow.c:755 src/messageview.c:251
+#: src/messageview.c:259 src/messageview.c:264
 msgid "/_Message/---"
 msgstr "/M_essaggio/---"
 
-#: src/mainwindow.c:723 src/messageview.c:248
+#: src/mainwindow.c:723 src/messageview.c:249
 msgid "/_Message/Compose _new message"
 msgstr "/M_essaggio/Componi _nuovo messaggio"
 
-#: src/mainwindow.c:725 src/messageview.c:251
+#: src/mainwindow.c:725 src/messageview.c:252
 msgid "/_Message/_Reply"
 msgstr "/M_essaggio/_Rispondi"
 
@@ -3308,27 +3310,27 @@ msgstr "/M_essaggio/_Rispondi"
 msgid "/_Message/Repl_y to"
 msgstr "/M_essaggio/Rispondi _a"
 
-#: src/mainwindow.c:727 src/messageview.c:252
+#: src/mainwindow.c:727 src/messageview.c:253
 msgid "/_Message/Repl_y to/_all"
 msgstr "/M_essaggio/Rispondi _a/_tutti"
 
-#: src/mainwindow.c:728 src/messageview.c:254
+#: src/mainwindow.c:728 src/messageview.c:255
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/M_essaggio/Rispondi _a/_mittente"
 
-#: src/mainwindow.c:729 src/messageview.c:256
+#: src/mainwindow.c:729 src/messageview.c:257
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/M_essaggio/Rispondi _a/mailing _list"
 
-#: src/mainwindow.c:732 src/messageview.c:259
+#: src/mainwindow.c:732 src/messageview.c:260
 msgid "/_Message/_Forward"
 msgstr "/M_essaggio/_Inoltra"
 
-#: src/mainwindow.c:733 src/messageview.c:260
+#: src/mainwindow.c:733 src/messageview.c:261
 msgid "/_Message/For_ward as attachment"
 msgstr "/M_essaggio/Inoltra come a_llegato"
 
-#: src/mainwindow.c:735 src/messageview.c:262
+#: src/mainwindow.c:735 src/messageview.c:263
 msgid "/_Message/Redirec_t"
 msgstr "/M_essaggio/Rispe_disci"
 
@@ -3384,7 +3386,7 @@ msgstr "/M_essaggio/Imposta come mail spa_zzatura"
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/_Messaggio/Im_posta come mail normale"
 
-#: src/mainwindow.c:756 src/messageview.c:264
+#: src/mainwindow.c:756 src/messageview.c:265
 msgid "/_Message/Re-_edit"
 msgstr "/M_essaggio/Rimodi_fica"
 
@@ -3400,23 +3402,23 @@ msgstr "/S_trumenti/_Filtra tutti i messaggi nella cartella"
 msgid "/_Tools/Filter _selected messages"
 msgstr "/S_trumenti/Filtra i messaggi _selezionati"
 
-#: src/mainwindow.c:767 src/messageview.c:271
+#: src/mainwindow.c:767 src/messageview.c:272
 msgid "/_Tools/_Create filter rule"
 msgstr "/S_trumenti/_Crea regola per il filtro"
 
-#: src/mainwindow.c:768 src/messageview.c:273
+#: src/mainwindow.c:768 src/messageview.c:274
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/S_trumenti/_Crea regola per il filtro/A_utomaticamente"
 
-#: src/mainwindow.c:770 src/messageview.c:275
+#: src/mainwindow.c:770 src/messageview.c:276
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/S_trumenti/_Crea regola per il filtro/con _Da"
 
-#: src/mainwindow.c:772 src/messageview.c:277
+#: src/mainwindow.c:772 src/messageview.c:278
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/S_trumenti/_Crea regola per il filtro/con _A"
 
-#: src/mainwindow.c:774 src/messageview.c:279
+#: src/mainwindow.c:774 src/messageview.c:280
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/S_trumenti/_Crea regola per il filtro/con l'_Oggetto"
 
@@ -3534,7 +3536,7 @@ msgid "MainWindow: color allocation %d failed\n"
 msgstr "FinestraPrincipale: l'allocazione del colore %d è fallita.\n"
 
 #: src/mainwindow.c:1139 src/summaryview.c:2275 src/summaryview.c:2360
-#: src/summaryview.c:3907 src/summaryview.c:4036 src/summaryview.c:4394
+#: src/summaryview.c:3908 src/summaryview.c:4037 src/summaryview.c:4395
 msgid "done.\n"
 msgstr "fatto.\n"
 
@@ -3815,7 +3817,7 @@ msgid "Find text:"
 msgstr "Testo da trovare:"
 
 #: src/message_search.c:153 src/prefs_search_folder.c:253
-#: src/query_search.c:326
+#: src/query_search.c:343
 msgid "Case sensitive"
 msgstr "Maiuscole/minuscole"
 
@@ -3839,27 +3841,27 @@ msgstr "Ho raggiunto la fine del messaggio; continuo dall'inizio?"
 msgid "Search finished"
 msgstr "Ricerca terminata"
 
-#: src/messageview.c:268
+#: src/messageview.c:269
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/S_trumenti/Aggiungi mittente alla ru_brica"
 
-#: src/messageview.c:300
+#: src/messageview.c:301
 msgid "Creating message view...\n"
 msgstr "Creazione della vista del messaggio...\n"
 
-#: src/messageview.c:325
+#: src/messageview.c:326
 msgid "Text"
 msgstr "Testo"
 
-#: src/messageview.c:330
+#: src/messageview.c:331
 msgid "Attachments"
 msgstr "Allegati"
 
-#: src/messageview.c:380
+#: src/messageview.c:381
 msgid "Message View - Sylpheed"
 msgstr "Vista messaggio - Sylpheed"
 
-#: src/messageview.c:699 src/summaryview.c:3436
+#: src/messageview.c:700 src/summaryview.c:3436
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Impossibile salvare il file «%s»."
@@ -3876,7 +3878,7 @@ msgstr "(Comando di stampa predefinito)"
 msgid "Print"
 msgstr "Stampa"
 
-#: src/messageview.c:770 src/summaryview.c:3471
+#: src/messageview.c:769 src/summaryview.c:3470
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -3971,11 +3973,11 @@ msgstr ""
 "Inserire la riga di comando per aprire il file:\n"
 "(«%s» verrà sostituito col nome del file)"
 
-#: src/mimeview.c:1147
+#: src/mimeview.c:1140
 msgid "Opening executable file"
 msgstr "Apertura file eseguibile"
 
-#: src/mimeview.c:1148
+#: src/mimeview.c:1141
 msgid ""
 "This is an executable file. Opening executable file is restricted for "
 "security.\n"
@@ -3987,11 +3989,6 @@ msgstr ""
 "Se volete lanciarlo, salvatelo da qualche parte e assicuratevi che non sia "
 "un virus o qualcosa di simile a un programma malizioso."
 
-#: src/mimeview.c:1184
-#, c-format
-msgid "MIME viewer command line is invalid: `%s'"
-msgstr "La riga di comando del visualizzatore MIME non è valida: «%s»"
-
 #: src/passphrase.c:96
 msgid "Passphrase"
 msgstr "Passphrase"
@@ -5731,19 +5728,19 @@ msgstr "Rispondi a:"
 msgid "%s - Edit search condition"
 msgstr "%s - Modifica le condizioni di ricerca"
 
-#: src/prefs_search_folder.c:209 src/query_search.c:257
+#: src/prefs_search_folder.c:209 src/query_search.c:274
 msgid "Match any of the following"
 msgstr "Corrisponde a qualcuno dei seguenti"
 
-#: src/prefs_search_folder.c:211 src/query_search.c:259
+#: src/prefs_search_folder.c:211 src/query_search.c:276
 msgid "Match all of the following"
 msgstr "Corrisponde a tutti i seguenti"
 
-#: src/prefs_search_folder.c:231 src/query_search.c:303
+#: src/prefs_search_folder.c:231 src/query_search.c:320
 msgid "Folder:"
 msgstr "Cartella:"
 
-#: src/prefs_search_folder.c:248 src/query_search.c:321
+#: src/prefs_search_folder.c:248 src/query_search.c:338
 msgid "Search subfolders"
 msgstr "Ricerca sottocartelle"
 
@@ -5757,17 +5754,17 @@ msgid "Attachment"
 msgstr "Allegato"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73 src/query_search.c:371 src/summaryview.c:4901
+#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4902
 msgid "Subject"
 msgstr "Oggetto"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/query_search.c:372 src/summaryview.c:4904
+#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4905
 msgid "From"
 msgstr "Da"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/query_search.c:373 src/summaryview.c:4906
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:4907
 msgid "Date"
 msgstr "Data"
 
@@ -5861,41 +5858,41 @@ msgstr "Creazione della finestra di avanzamento...\n"
 msgid "Status"
 msgstr "Stato"
 
-#: src/query_search.c:234
+#: src/query_search.c:251
 msgid "Search messages"
 msgstr "Ricerca dei messaggi"
 
-#: src/query_search.c:395
+#: src/query_search.c:423
 msgid "_Save as search folder"
 msgstr "_Salva come cartella ricerca"
 
-#: src/query_search.c:512 src/subscribedialog.c:526 src/summaryview.c:842
+#: src/query_search.c:542 src/subscribedialog.c:526 src/summaryview.c:842
 msgid "Done."
 msgstr "Fatto."
 
-#: src/query_search.c:536
+#: src/query_search.c:566
 #, c-format
 msgid "Searching %s ..."
 msgstr "Ricerca in %s ..."
 
-#: src/query_search.c:564
+#: src/query_search.c:594
 #, c-format
 msgid "Searching %s (%d / %d)..."
 msgstr "Ricerca in %s (%d / %d)..."
 
-#: src/query_search.c:645 src/summaryview.c:2051
+#: src/query_search.c:675 src/summaryview.c:2051
 msgid "(No Date)"
 msgstr "(Nessuna Data)"
 
-#: src/query_search.c:833
+#: src/query_search.c:869
 msgid "Save as search folder"
 msgstr "Salva come cartella ricerca"
 
-#: src/query_search.c:854
+#: src/query_search.c:890
 msgid "Location:"
 msgstr "Posizione:"
 
-#: src/query_search.c:869
+#: src/query_search.c:905
 msgid "Folder name:"
 msgstr "Nome della cartella:"
 
@@ -6519,37 +6516,37 @@ msgstr "Il messaggio %d è impostato per la copia in %s\n"
 msgid "Destination for copy is same as current folder."
 msgstr "La destinazione della copia coincide con la cartella attuale."
 
-#: src/summaryview.c:3506
+#: src/summaryview.c:3507
 msgid "Error occurred while processing messages."
 msgstr "Si è verificato un errore durante l'elaborazione dei messaggi."
 
-#: src/summaryview.c:3814 src/summaryview.c:3815
+#: src/summaryview.c:3815 src/summaryview.c:3816
 msgid "Building threads..."
 msgstr "Costruzione dei thread..."
 
-#: src/summaryview.c:3965 src/summaryview.c:3966
+#: src/summaryview.c:3966 src/summaryview.c:3967
 msgid "Unthreading..."
 msgstr "Senza thread..."
 
-#: src/summaryview.c:4259 src/summaryview.c:4315
+#: src/summaryview.c:4260 src/summaryview.c:4316
 #, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtraggio (%d / %d)..."
 
-#: src/summaryview.c:4364
+#: src/summaryview.c:4365
 msgid "filtering..."
 msgstr "filtraggio..."
 
-#: src/summaryview.c:4365
+#: src/summaryview.c:4366
 msgid "Filtering..."
 msgstr "Filtraggio..."
 
-#: src/summaryview.c:4401
+#: src/summaryview.c:4402
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "sono stati filtrati %d messaggi(o)."
 
-#: src/summaryview.c:4910
+#: src/summaryview.c:4911
 msgid "No."
 msgstr "No."
 
@@ -6630,3 +6627,6 @@ msgstr "_Esci"
 #: src/trayicon.c:139
 msgid "Sylpheed"
 msgstr "Sylpheed"
+
+#~ msgid "MIME viewer command line is invalid: `%s'"
+#~ msgstr "La riga di comando del visualizzatore MIME non è valida: «%s»"
diff --git a/po/ja.po b/po/ja.po
index 47310fef..20b9e345 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-03-02 19:03+0900\n"
+"POT-Creation-Date: 2006-03-10 16:06+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:491
+#: libsylph/prefs_common.c:496
 msgid "Junk mail filter"
 msgstr "迷惑メールフィルタ"
 
@@ -522,7 +522,7 @@ msgstr "マークファイルを開けません\n"
 msgid "can't fetch message %d\n"
 msgstr "メッセージ %d を取り込めません\n"
 
-#: libsylph/procmsg.c:1375
+#: libsylph/procmsg.c:1378
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "印刷のコマンドラインが無効です: `%s'\n"
@@ -600,12 +600,12 @@ msgstr "  Subject: %s\n"
 msgid "  Issuer: %s\n"
 msgstr "  発行者: %s\n"
 
-#: libsylph/utils.c:2411 src/compose.c:2869 src/compose.c:3132
-#: src/compose.c:3195 src/compose.c:3315
+#: libsylph/utils.c:2430 src/compose.c:2888 src/compose.c:3151
+#: src/compose.c:3214 src/compose.c:3334
 msgid "can't change file mode\n"
 msgstr "ファイルモードを変更できません\n"
 
-#: libsylph/utils.c:2418 libsylph/utils.c:2542
+#: libsylph/utils.c:2437 libsylph/utils.c:2561
 #, c-format
 msgid "writing to %s failed.\n"
 msgstr "%s への書き込みに失敗しました。\n"
@@ -688,8 +688,8 @@ msgstr ""
 "新着メッセージはこの順番でチェックされます。「全受信」によるメッセージ\n"
 "の取得を有効にするには、「G」カラムのボックスをチェックしてください。"
 
-#: src/account_dialog.c:366 src/addressadd.c:192 src/addressbook.c:493
-#: src/compose.c:4273 src/editaddress.c:200 src/editaddress.c:942
+#: src/account_dialog.c:366 src/addressadd.c:192 src/addressbook.c:491
+#: src/compose.c:4292 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
@@ -825,12 +825,12 @@ msgstr "アクションのユーザ引数"
 msgid "Add Address to Book"
 msgstr "アドレスをアドレス帳に追加"
 
-#: src/addressadd.c:202 src/compose.c:4777 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4796 src/editaddress.c:201
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "アドレス"
 
-#: src/addressadd.c:212 src/addressbook.c:495 src/editaddress.c:202
+#: src/addressadd.c:212 src/addressbook.c:493 src/editaddress.c:202
 #: src/editaddress.c:795 src/editaddress.c:860 src/editgroup.c:267
 msgid "Remarks"
 msgstr "備考"
@@ -839,110 +839,110 @@ msgstr "備考"
 msgid "Select Address Book Folder"
 msgstr "アドレス帳フォルダを選択"
 
-#: src/addressbook.c:338 src/compose.c:515 src/mainwindow.c:489
+#: src/addressbook.c:337 src/compose.c:515 src/mainwindow.c:489
 #: src/messageview.c:140
 msgid "/_File"
 msgstr "/ファイル(_F)"
 
-#: src/addressbook.c:339
+#: src/addressbook.c:338
 msgid "/_File/New _Book"
 msgstr "/ファイル(_F)/新規アドレス帳(_B)"
 
-#: src/addressbook.c:340
+#: src/addressbook.c:339
 msgid "/_File/New _vCard"
 msgstr "/ファイル(_F)/新規_vCard"
 
-#: src/addressbook.c:342
+#: src/addressbook.c:341
 msgid "/_File/New _JPilot"
 msgstr "/ファイル(_F)/新規_JPilot"
 
-#: src/addressbook.c:345
-msgid "/_File/New _Server"
-msgstr "/ファイル(_F)/新規サーバ(_S)"
+#: src/addressbook.c:344
+msgid "/_File/New _LDAP Server"
+msgstr "/ファイル(_F)/新規LDAPサーバ(_L)"
 
-#: src/addressbook.c:347 src/addressbook.c:350 src/compose.c:520
+#: src/addressbook.c:346 src/addressbook.c:349 src/compose.c:520
 #: src/compose.c:525 src/compose.c:528 src/compose.c:531 src/mainwindow.c:507
 #: src/mainwindow.c:510 src/mainwindow.c:512 src/mainwindow.c:515
 #: src/mainwindow.c:517 src/messageview.c:143
 msgid "/_File/---"
 msgstr "/ファイル(_F)/---"
 
-#: src/addressbook.c:348
+#: src/addressbook.c:347
 msgid "/_File/_Edit"
 msgstr "/ファイル(_F)/編集(_E)"
 
-#: src/addressbook.c:349
+#: src/addressbook.c:348
 msgid "/_File/_Delete"
 msgstr "/ファイル(_F)/削除(_D)"
 
-#: src/addressbook.c:351
+#: src/addressbook.c:350
 msgid "/_File/_Save"
 msgstr "/ファイル(_F)/保存(_S)"
 
-#: src/addressbook.c:352 src/compose.c:532 src/messageview.c:144
+#: src/addressbook.c:351 src/compose.c:532 src/messageview.c:144
 msgid "/_File/_Close"
 msgstr "/ファイル(_F)/閉じる(_C)"
 
-#: src/addressbook.c:353
+#: src/addressbook.c:352
 msgid "/_Address"
 msgstr "/アドレス(_A)"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:353
 msgid "/_Address/New _Address"
 msgstr "/アドレス(_A)/新規アドレス(_A)"
 
-#: src/addressbook.c:355
+#: src/addressbook.c:354
 msgid "/_Address/New _Group"
 msgstr "/アドレス(_A)/新規グループ(_G)"
 
-#: src/addressbook.c:356
+#: src/addressbook.c:355
 msgid "/_Address/New _Folder"
 msgstr "/アドレス(_A)/新規フォルダ(_F)"
 
-#: src/addressbook.c:357
+#: src/addressbook.c:356
 msgid "/_Address/---"
 msgstr "/アドレス(_A)/---"
 
-#: src/addressbook.c:358
+#: src/addressbook.c:357
 msgid "/_Address/_Edit"
 msgstr "/アドレス(_A)/編集(_E)"
 
-#: src/addressbook.c:359
+#: src/addressbook.c:358
 msgid "/_Address/_Delete"
 msgstr "/アドレス(_A)/削除(_D)"
 
-#: src/addressbook.c:360 src/compose.c:645 src/mainwindow.c:758
-#: src/messageview.c:266
+#: src/addressbook.c:359 src/compose.c:645 src/mainwindow.c:758
+#: src/messageview.c:267
 msgid "/_Tools"
 msgstr "/ツール(_T)"
 
-#: src/addressbook.c:361
+#: src/addressbook.c:360
 msgid "/_Tools/Import _LDIF file"
 msgstr "/ツール(_T)/_LDIFファイルをインポート"
 
-#: src/addressbook.c:362 src/compose.c:666 src/mainwindow.c:812
-#: src/messageview.c:286
+#: src/addressbook.c:361 src/compose.c:666 src/mainwindow.c:812
+#: src/messageview.c:287
 msgid "/_Help"
 msgstr "/ヘルプ(_H)"
 
-#: src/addressbook.c:363 src/compose.c:667 src/mainwindow.c:824
-#: src/messageview.c:287
+#: src/addressbook.c:362 src/compose.c:667 src/mainwindow.c:824
+#: src/messageview.c:288
 msgid "/_Help/_About"
 msgstr "/ヘルプ(_H)/このプログラムについて(_A)"
 
-#: src/addressbook.c:382 src/addressbook.c:392
+#: src/addressbook.c:381 src/addressbook.c:391
 msgid "/New _Address"
 msgstr "/新規アドレス(_A)"
 
-#: src/addressbook.c:383 src/addressbook.c:393
+#: src/addressbook.c:382 src/addressbook.c:392
 msgid "/New _Group"
 msgstr "/新規グループ(_G)"
 
-#: src/addressbook.c:384 src/addressbook.c:394
+#: src/addressbook.c:383 src/addressbook.c:393
 msgid "/New _Folder"
 msgstr "/新規フォルダ(_F)"
 
-#: src/addressbook.c:385 src/addressbook.c:395 src/compose.c:509
+#: src/addressbook.c:384 src/addressbook.c:394 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
@@ -952,70 +952,70 @@ msgstr "/新規フォルダ(_F)"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:386 src/addressbook.c:396 src/compose.c:534
+#: src/addressbook.c:385 src/addressbook.c:395 src/compose.c:534
 #: src/mainwindow.c:521 src/messageview.c:146
 msgid "/_Edit"
 msgstr "/編集(_E)"
 
-#: src/addressbook.c:387 src/addressbook.c:397 src/summaryview.c:434
+#: src/addressbook.c:386 src/addressbook.c:396 src/summaryview.c:434
 msgid "/_Delete"
 msgstr "/削除(_D)"
 
-#: src/addressbook.c:494
+#: src/addressbook.c:492
 msgid "E-Mail address"
 msgstr "電子メール アドレス"
 
-#: src/addressbook.c:498 src/compose.c:4778 src/prefs_common_dialog.c:2183
+#: src/addressbook.c:496 src/compose.c:4797 src/prefs_common_dialog.c:2183
 msgid "Address book"
 msgstr "アドレス帳"
 
-#: src/addressbook.c:600 src/prefs_filter_edit.c:249
+#: src/addressbook.c:603 src/prefs_filter_edit.c:249
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "名前:"
 
 #. Buttons
-#: src/addressbook.c:632 src/addressbook.c:1684 src/editaddress.c:884
+#: src/addressbook.c:636 src/addressbook.c:1678 src/editaddress.c:884
 #: src/editaddress.c:1017 src/mainwindow.c:2426 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:635 src/editaddress.c:890 src/editaddress.c:1023
+#: src/addressbook.c:639 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:1552
 msgid "Add"
 msgstr "追加"
 
-#: src/addressbook.c:638
+#: src/addressbook.c:642
 msgid "Lookup"
 msgstr "検索"
 
-#: src/addressbook.c:650 src/headerview.c:55 src/prefs_folder_item.c:339
+#: src/addressbook.c:654 src/headerview.c:55 src/prefs_folder_item.c:339
 #: src/prefs_template.c:176
 msgid "To:"
 msgstr "宛先:"
 
-#: src/addressbook.c:654 src/prefs_folder_item.c:356 src/prefs_template.c:178
+#: src/addressbook.c:658 src/prefs_folder_item.c:356 src/prefs_template.c:178
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:658 src/prefs_folder_item.c:367
+#: src/addressbook.c:662 src/prefs_folder_item.c:367
 msgid "Bcc:"
 msgstr "Bcc:"
 
 #. Confirm deletion
-#: src/addressbook.c:845
+#: src/addressbook.c:832
 msgid "Delete address(es)"
 msgstr "アドレスの削除"
 
-#: src/addressbook.c:846
+#: src/addressbook.c:833
 msgid "Really delete the address(es)?"
 msgstr "本当にこのアドレスを削除しますか?"
 
-#: src/addressbook.c:1675
+#: src/addressbook.c:1669
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1024,36 +1024,36 @@ msgstr ""
 "`%s' 内のすべてのフォルダとアドレスを削除してもいいですか?\n"
 "フォルダのみを削除する場合、アドレスは親フォルダに移動します。"
 
-#: src/addressbook.c:1678 src/folderview.c:2372
+#: src/addressbook.c:1672 src/folderview.c:2372
 msgid "Delete folder"
 msgstr "フォルダの削除"
 
-#: src/addressbook.c:1678
+#: src/addressbook.c:1672
 msgid "_Folder only"
 msgstr "フォルダのみ(_F)"
 
-#: src/addressbook.c:1678
+#: src/addressbook.c:1672
 msgid "Folder and _addresses"
 msgstr "フォルダとアドレス(_A)"
 
-#: src/addressbook.c:1683
+#: src/addressbook.c:1677
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "本当に `%s' を削除しますか?"
 
-#: src/addressbook.c:2369 src/addressbook.c:2502
+#: src/addressbook.c:2363 src/addressbook.c:2496
 msgid "New user, could not save index file."
 msgstr "新規ユーザ、インデックスファイルを保存できません。"
 
-#: src/addressbook.c:2373 src/addressbook.c:2506
+#: src/addressbook.c:2367 src/addressbook.c:2500
 msgid "New user, could not save address book files."
 msgstr "新規ユーザ、アドレス帳ファイルを保存できません。"
 
-#: src/addressbook.c:2383 src/addressbook.c:2516
+#: src/addressbook.c:2377 src/addressbook.c:2510
 msgid "Old address book converted successfully."
 msgstr "旧形式のアドレス帳は正しく変換されました。"
 
-#: src/addressbook.c:2388
+#: src/addressbook.c:2382
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1061,7 +1061,7 @@ msgstr ""
 "旧形式のアドレス帳は変換されました。\n"
 "新規アドレスインデックスファイルに保存できません"
 
-#: src/addressbook.c:2401
+#: src/addressbook.c:2395
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1069,7 +1069,7 @@ msgstr ""
 "アドレス帳を変換できません。\n"
 "しかし空の新規アドレス帳ファイルが作成されました。"
 
-#: src/addressbook.c:2407
+#: src/addressbook.c:2401
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1077,7 +1077,7 @@ msgstr ""
 "アドレス帳を変換できません。\n"
 "新規アドレス帳ファイルを作成できません。"
 
-#: src/addressbook.c:2412
+#: src/addressbook.c:2406
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1085,90 +1085,90 @@ msgstr ""
 "アドレス帳を変換できません。\n"
 "新規アドレス帳ファイルを作成できません。"
 
-#: src/addressbook.c:2419
+#: src/addressbook.c:2413
 msgid "Addressbook conversion error"
 msgstr "アドレス帳の変換エラー"
 
-#: src/addressbook.c:2423
+#: src/addressbook.c:2417
 msgid "Addressbook conversion"
 msgstr "アドレス帳の変換"
 
-#: src/addressbook.c:2458
+#: src/addressbook.c:2452
 msgid "Addressbook Error"
 msgstr "アドレス帳のエラー"
 
-#: src/addressbook.c:2459 src/addressbook.c:2559
+#: src/addressbook.c:2453 src/addressbook.c:2553
 msgid "Could not read address index"
 msgstr "アドレスインデックスを読み込めません"
 
-#: src/addressbook.c:2521
+#: src/addressbook.c:2515
 msgid "Old address book converted, could not save new address index file"
 msgstr ""
 "旧形式のアドレス帳は変換されましたが、新規アドレスインデックスファイルを保存"
 "できません"
 
-#: src/addressbook.c:2535
+#: src/addressbook.c:2529
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr ""
 "アドレス帳を変換できませんでしたが、空の新規アドレス帳ファイルが作成されまし"
 "た。"
 
-#: src/addressbook.c:2541
+#: src/addressbook.c:2535
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr ""
 "アドレス帳を変換できません。新規アドレス帳ファイルを作成できませんでした。"
 
-#: src/addressbook.c:2547
+#: src/addressbook.c:2541
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr ""
 "アドレス帳を変換できません。新規アドレス帳ファイルを作成できませんでした。"
 
-#: src/addressbook.c:2565
+#: src/addressbook.c:2559
 msgid "Addressbook Conversion Error"
 msgstr "アドレス帳変換エラー"
 
-#: src/addressbook.c:2571
+#: src/addressbook.c:2565
 msgid "Addressbook Conversion"
 msgstr "アドレス帳変換"
 
-#: src/addressbook.c:3086 src/prefs_common_dialog.c:2033
+#: src/addressbook.c:3080 src/prefs_common_dialog.c:2033
 msgid "Interface"
 msgstr "インタフェース"
 
-#: src/addressbook.c:3102 src/importldif.c:514
+#: src/addressbook.c:3096 src/importldif.c:514
 msgid "Address Book"
 msgstr "アドレス帳"
 
-#: src/addressbook.c:3118
+#: src/addressbook.c:3112
 msgid "Person"
 msgstr "人物"
 
-#: src/addressbook.c:3134
+#: src/addressbook.c:3128
 msgid "EMail Address"
 msgstr "電子メール アドレス"
 
-#: src/addressbook.c:3150
+#: src/addressbook.c:3144
 msgid "Group"
 msgstr "グループ"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3166 src/folderview.c:367 src/prefs_account_dialog.c:1694
-#: src/query_search.c:370
+#: src/addressbook.c:3160 src/folderview.c:367 src/prefs_account_dialog.c:1694
+#: src/query_search.c:398
 msgid "Folder"
 msgstr "フォルダ"
 
-#: src/addressbook.c:3182
+#: src/addressbook.c:3176
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3198 src/addressbook.c:3214
+#: src/addressbook.c:3192 src/addressbook.c:3208
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3230
+#: src/addressbook.c:3224
 msgid "LDAP Server"
 msgstr "LDAPサーバ"
 
@@ -1180,7 +1180,7 @@ msgstr "共有アドレス"
 msgid "Personal address"
 msgstr "個人用アドレス"
 
-#: src/alertpanel.c:142 src/compose.c:5500 src/main.c:621
+#: src/alertpanel.c:142 src/compose.c:5517 src/main.c:621
 msgid "Notice"
 msgstr "注意"
 
@@ -1188,7 +1188,7 @@ msgstr "注意"
 msgid "Warning"
 msgstr "警告"
 
-#: src/alertpanel.c:168 src/inc.c:587
+#: src/alertpanel.c:168 src/inc.c:586
 msgid "Error"
 msgstr "エラー"
 
@@ -1231,7 +1231,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:4761
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4762
 msgid "None"
 msgstr "なし"
 
@@ -1477,7 +1477,7 @@ msgstr "/表示(_V)/文字エンコーディング(_E)/タイ語 (TIS-620)"
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/タイ語 (Windows-874)"
 
-#: src/compose.c:646 src/mainwindow.c:759 src/messageview.c:267
+#: src/compose.c:646 src/mainwindow.c:759 src/messageview.c:268
 msgid "/_Tools/_Address book"
 msgstr "/ツール(_T)/アドレス帳(_A)"
 
@@ -1485,14 +1485,14 @@ msgstr "/ツール(_T)/アドレス帳(_A)"
 msgid "/_Tools/_Template"
 msgstr "/ツール(_T)/テンプレート(_T)"
 
-#: src/compose.c:649 src/mainwindow.c:783 src/messageview.c:283
+#: src/compose.c:649 src/mainwindow.c:783 src/messageview.c:284
 msgid "/_Tools/Actio_ns"
 msgstr "/ツール(_T)/アクション(_N)"
 
 #: src/compose.c:651 src/compose.c:655 src/compose.c:661 src/mainwindow.c:762
 #: src/mainwindow.c:776 src/mainwindow.c:781 src/mainwindow.c:784
-#: src/mainwindow.c:788 src/mainwindow.c:790 src/messageview.c:270
-#: src/messageview.c:282
+#: src/mainwindow.c:788 src/mainwindow.c:790 src/messageview.c:271
+#: src/messageview.c:283
 msgid "/_Tools/---"
 msgstr "/ツール(_T)/---"
 
@@ -1516,79 +1516,79 @@ msgstr "/ツール(_T)/スペルチェック(_C)"
 msgid "/_Tools/_Set spell language"
 msgstr "/ツール(_T)/スペルチェックの言語を指定(_S)"
 
-#: src/compose.c:910
+#: src/compose.c:912
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: ファイルが存在しません\n"
 
-#: src/compose.c:1014 src/compose.c:1085
+#: src/compose.c:1016 src/compose.c:1087
 msgid "Can't get text part\n"
 msgstr "テキストパートを取得できません\n"
 
-#: src/compose.c:1486
+#: src/compose.c:1488
 msgid "Quote mark format error."
 msgstr "引用符の書式が不正です。"
 
-#: src/compose.c:1498
+#: src/compose.c:1500
 msgid "Message reply/forward format error."
 msgstr "メッセージの返信/転送の書式が不正です。"
 
-#: src/compose.c:1918
+#: src/compose.c:1935
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "ファイル %s は存在しません\n"
 
-#: src/compose.c:1922
+#: src/compose.c:1939
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "ファイル %s のサイズを取得できません\n"
 
-#: src/compose.c:1926
+#: src/compose.c:1943
 #, c-format
 msgid "File %s is empty."
 msgstr "ファイル %s は空です。"
 
-#: src/compose.c:1930
+#: src/compose.c:1947
 #, c-format
 msgid "Can't read %s."
 msgstr "%s を読み込めません。"
 
-#: src/compose.c:1963
+#: src/compose.c:1980
 #, c-format
 msgid "Message: %s"
 msgstr "メッセージ: %s"
 
-#: src/compose.c:2023 src/mimeview.c:565
+#: src/compose.c:2040 src/mimeview.c:565
 msgid "Can't get the part of multipart message."
 msgstr "マルチパートメッセージのパートを取得できません。"
 
-#: src/compose.c:2507 src/headerview.c:195 src/query_search.c:636
+#: src/compose.c:2524 src/headerview.c:195 src/query_search.c:666
 #: src/summaryview.c:2124
 msgid "(No Subject)"
 msgstr "(件名なし)"
 
-#: src/compose.c:2510
+#: src/compose.c:2527
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - 作成%s"
 
-#: src/compose.c:2623
+#: src/compose.c:2642
 msgid "Recipient is not specified."
 msgstr "宛先が指定されていません。"
 
-#: src/compose.c:2631
+#: src/compose.c:2650
 msgid "Empty subject"
 msgstr "空の件名"
 
-#: src/compose.c:2632
+#: src/compose.c:2651
 msgid "Subject is empty. Send it anyway?"
 msgstr "件名が空です。とにかく送信しますか?"
 
-#: src/compose.c:2691
+#: src/compose.c:2710
 msgid "can't get recipient list."
 msgstr "送信先のリストを取得できません。"
 
-#: src/compose.c:2711
+#: src/compose.c:2730
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1596,21 +1596,21 @@ msgstr ""
 "メールを送信するためのアカウントが指定されていません。\n"
 "送信する前にメールアカウントを選択してください。"
 
-#: src/compose.c:2725 src/send_message.c:299
+#: src/compose.c:2744 src/send_message.c:299
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "メッセージを %s にポストする途中にエラーが発生しました。"
 
-#: src/compose.c:2767
+#: src/compose.c:2786
 msgid "Can't save the message to outbox."
 msgstr "メッセージを送信控に保存できません。"
 
-#: src/compose.c:2805
+#: src/compose.c:2824
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "現在選択されている鍵ID `%s' に対応する鍵が見つかりませんでした。"
 
-#: src/compose.c:2902
+#: src/compose.c:2921
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1621,11 +1621,11 @@ msgstr ""
 "\n"
 "%s のままとにかく送信しますか?"
 
-#: src/compose.c:2908
+#: src/compose.c:2927
 msgid "Code conversion error"
 msgstr "文字コード変換エラー"
 
-#: src/compose.c:2981
+#: src/compose.c:3000
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1638,156 +1638,156 @@ msgstr ""
 "\n"
 "とにかく送信しますか?"
 
-#: src/compose.c:2985
+#: src/compose.c:3004
 msgid "Line length limit"
 msgstr "行の長さの制限"
 
-#: src/compose.c:3275
+#: src/compose.c:3294
 msgid "can't remove the old message\n"
 msgstr "古いメッセージを削除できません\n"
 
-#: src/compose.c:3293
+#: src/compose.c:3312
 msgid "queueing message...\n"
 msgstr "メッセージを送信待ちに入れています...\n"
 
-#: src/compose.c:3375
+#: src/compose.c:3394
 msgid "can't find queue folder\n"
 msgstr "送信待ちフォルダが見つかりません\n"
 
-#: src/compose.c:3382
+#: src/compose.c:3401
 msgid "can't queue the message\n"
 msgstr "メッセージを送信待機できません\n"
 
-#: src/compose.c:3975
+#: src/compose.c:3994
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "生成されたメッセージID: %s\n"
 
-#: src/compose.c:4088
+#: src/compose.c:4107
 msgid "Creating compose window...\n"
 msgstr "メッセージ作成ウィンドウを作成中...\n"
 
-#: src/compose.c:4139 src/headerview.c:54
+#: src/compose.c:4158 src/headerview.c:54
 msgid "From:"
 msgstr "差出人:"
 
-#: src/compose.c:4213
+#: src/compose.c:4232
 msgid "PGP Sign"
 msgstr "PGP署名"
 
-#: src/compose.c:4216
+#: src/compose.c:4235
 msgid "PGP Encrypt"
 msgstr "PGP暗号化"
 
-#: src/compose.c:4254 src/compose.c:5332
+#: src/compose.c:4273 src/compose.c:5351
 msgid "MIME type"
 msgstr "MIME タイプ"
 
 #. S_COL_DATE
-#: src/compose.c:4263 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4908
+#: src/compose.c:4282 src/mimeview.c:197 src/prefs_filter_edit.c:496
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4909
 msgid "Size"
 msgstr "サイズ"
 
-#: src/compose.c:4698 src/mainwindow.c:2359 src/prefs_account_dialog.c:528
+#: src/compose.c:4717 src/mainwindow.c:2359 src/prefs_account_dialog.c:528
 #: src/prefs_common_dialog.c:661
 msgid "Send"
 msgstr "送信"
 
-#: src/compose.c:4699
+#: src/compose.c:4718
 msgid "Send message"
 msgstr "メッセージを送信"
 
-#: src/compose.c:4707
+#: src/compose.c:4726
 msgid "Send later"
 msgstr "後で送信"
 
-#: src/compose.c:4708
+#: src/compose.c:4727
 msgid "Put into queue folder and send later"
 msgstr "送信待ちフォルダに入れて後で送信"
 
-#: src/compose.c:4716
+#: src/compose.c:4735
 msgid "Draft"
 msgstr "草稿"
 
-#: src/compose.c:4717
+#: src/compose.c:4736
 msgid "Save to draft folder"
 msgstr "草稿フォルダに保存"
 
-#: src/compose.c:4727
+#: src/compose.c:4746
 msgid "Insert"
 msgstr "挿入"
 
-#: src/compose.c:4728
+#: src/compose.c:4747
 msgid "Insert file"
 msgstr "ファイルを挿入"
 
-#: src/compose.c:4736
+#: src/compose.c:4755
 msgid "Attach"
 msgstr "添付"
 
-#: src/compose.c:4737
+#: src/compose.c:4756
 msgid "Attach file"
 msgstr "ファイルを添付"
 
 #. signature
-#: src/compose.c:4747 src/prefs_account_dialog.c:1208
+#: src/compose.c:4766 src/prefs_account_dialog.c:1208
 #: src/prefs_common_dialog.c:953
 msgid "Signature"
 msgstr "署名"
 
-#: src/compose.c:4748
+#: src/compose.c:4767
 msgid "Append signature"
 msgstr "署名を追加"
 
 #. editor
-#: src/compose.c:4757 src/prefs_common_dialog.c:991
+#: src/compose.c:4776 src/prefs_common_dialog.c:991
 #: src/prefs_common_dialog.c:2315
 msgid "Editor"
 msgstr "エディタ"
 
-#: src/compose.c:4758
+#: src/compose.c:4777
 msgid "Edit with external editor"
 msgstr "外部エディタで編集"
 
-#: src/compose.c:4766
+#: src/compose.c:4785
 msgid "Linewrap"
 msgstr "整形"
 
-#: src/compose.c:4767
+#: src/compose.c:4786
 msgid "Wrap all long lines"
 msgstr "すべての長い行を折り返す"
 
-#: src/compose.c:5228
+#: src/compose.c:5247
 msgid "Invalid MIME type."
 msgstr "無効な MIME タイプです。"
 
-#: src/compose.c:5246
+#: src/compose.c:5265
 msgid "File doesn't exist or is empty."
 msgstr "ファイルが存在しないかまたは空です。"
 
-#: src/compose.c:5314
+#: src/compose.c:5333
 msgid "Properties"
 msgstr "プロパティ"
 
-#: src/compose.c:5334 src/prefs_common_dialog.c:1444
+#: src/compose.c:5353 src/prefs_common_dialog.c:1444
 msgid "Encoding"
 msgstr "エンコーディング"
 
-#: src/compose.c:5357 src/prefs_folder_item.c:202
+#: src/compose.c:5376 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "パス"
 
-#: src/compose.c:5358
+#: src/compose.c:5377
 msgid "File name"
 msgstr "ファイル名"
 
-#: src/compose.c:5449
+#: src/compose.c:5466
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "外部エディタのコマンドラインが無効です: `%s'\n"
 
-#: src/compose.c:5497
+#: src/compose.c:5514
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1796,44 +1796,44 @@ msgstr ""
 "外部エディタが動作中です。\n"
 "プロセスを強制終了しますか(pid: %d)?\n"
 
-#: src/compose.c:5872 src/compose.c:5877 src/compose.c:5883
+#: src/compose.c:5889 src/compose.c:5894 src/compose.c:5900
 msgid "Can't queue the message."
 msgstr "メッセージを送信待機できません。"
 
-#: src/compose.c:5974
+#: src/compose.c:5991
 msgid "Select files"
 msgstr "ファイルの選択"
 
-#: src/compose.c:5997
+#: src/compose.c:6014
 msgid "Select file"
 msgstr "ファイルの選択"
 
-#: src/compose.c:6032
+#: src/compose.c:6049
 msgid "Save message"
 msgstr "メッセージの保存"
 
-#: src/compose.c:6033
+#: src/compose.c:6050
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "このメッセージは変更されています。草稿に保存しますか?"
 
-#: src/compose.c:6035
+#: src/compose.c:6052
 msgid "Close _without saving"
 msgstr "保存せずに閉じる(_W)"
 
-#: src/compose.c:6077
+#: src/compose.c:6094
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "テンプレート `%s' を適用しますか?"
 
-#: src/compose.c:6079
+#: src/compose.c:6096
 msgid "Apply template"
 msgstr "テンプレートの適用"
 
-#: src/compose.c:6080
+#: src/compose.c:6097
 msgid "_Replace"
 msgstr "置換(_R)"
 
-#: src/compose.c:6080
+#: src/compose.c:6097
 msgid "_Insert"
 msgstr "挿入(_I)"
 
@@ -1954,52 +1954,52 @@ msgstr "グループ名を指定する必要があります。"
 msgid "Edit Group Data"
 msgstr "グループデータの編集"
 
-#: src/editgroup.c:300
+#: src/editgroup.c:299
 msgid "Group Name"
 msgstr "グループ名"
 
-#: src/editgroup.c:319
+#: src/editgroup.c:318
 msgid "Addresses in Group"
 msgstr "グループのアドレス"
 
-#: src/editgroup.c:321
+#: src/editgroup.c:320
 msgid " -> "
 msgstr " → "
 
-#: src/editgroup.c:348
+#: src/editgroup.c:347
 msgid " <- "
 msgstr " ← "
 
-#: src/editgroup.c:350
+#: src/editgroup.c:349
 msgid "Available Addresses"
 msgstr "利用可能なアドレス"
 
-#: src/editgroup.c:416
+#: src/editgroup.c:415
 msgid "Move E-Mail Addresses to or from Group with arrow buttons"
 msgstr "矢印ボタンで電子メールアドレスをグループに(から)移動"
 
-#: src/editgroup.c:468
+#: src/editgroup.c:467
 msgid "Edit Group Details"
 msgstr "グループの詳細の編集"
 
-#: src/editgroup.c:471
+#: src/editgroup.c:470
 msgid "Add New Group"
 msgstr "新規グループの追加"
 
-#: src/editgroup.c:522
+#: src/editgroup.c:521
 msgid "Edit folder"
 msgstr "フォルダの編集"
 
-#: src/editgroup.c:522
+#: src/editgroup.c:521
 msgid "Input the new name of folder:"
 msgstr "フォルダの新しい名前を入力してください:"
 
-#: src/editgroup.c:525 src/foldersel.c:541 src/folderview.c:2121
+#: src/editgroup.c:524 src/foldersel.c:541 src/folderview.c:2121
 #: src/folderview.c:2127
 msgid "New folder"
 msgstr "新規フォルダ"
 
-#: src/editgroup.c:526 src/foldersel.c:542 src/folderview.c:2128
+#: src/editgroup.c:525 src/foldersel.c:542 src/folderview.c:2128
 msgid "Input the name of new folder:"
 msgstr "新規フォルダの名前を入力してください:"
 
@@ -2196,7 +2196,7 @@ msgid "`%c' can't be included in folder name."
 msgstr "フォルダ名に `%c' を含むことはできません。"
 
 #: src/foldersel.c:561 src/folderview.c:2147 src/folderview.c:2206
-#: src/query_search.c:995
+#: src/query_search.c:1031
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "フォルダ `%s' はすでに存在します。"
@@ -2453,7 +2453,7 @@ msgstr "件名:"
 msgid "Creating header view...\n"
 msgstr "ヘッダビューを作成中...\n"
 
-#: src/headerview.c:180 src/query_search.c:637 src/summaryview.c:2127
+#: src/headerview.c:180 src/query_search.c:667 src/summaryview.c:2127
 msgid "(No From)"
 msgstr "(差出人不明)"
 
@@ -2583,133 +2583,133 @@ msgstr "完了"
 msgid "Sylpheed: %d new messages"
 msgstr "Sylpheed: %d 通の新着メッセージ"
 
-#: src/inc.c:372
+#: src/inc.c:371
 msgid "Retrieving new messages"
 msgstr "新着メッセージを受信中"
 
-#: src/inc.c:415
+#: src/inc.c:414
 msgid "Standby"
 msgstr "待機中"
 
-#: src/inc.c:544 src/inc.c:593
+#: src/inc.c:543 src/inc.c:592
 msgid "Cancelled"
 msgstr "キャンセル"
 
-#: src/inc.c:555
+#: src/inc.c:554
 msgid "Retrieving"
 msgstr "受信中"
 
-#: src/inc.c:564
+#: src/inc.c:563
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "完了 (%d 通 (%s) 受信)"
 
-#: src/inc.c:568
+#: src/inc.c:567
 msgid "Done (no new messages)"
 msgstr "完了 (新着メッセージなし)"
 
-#: src/inc.c:574
+#: src/inc.c:573
 msgid "Connection failed"
 msgstr "接続失敗"
 
-#: src/inc.c:577
+#: src/inc.c:576
 msgid "Auth failed"
 msgstr "認証失敗"
 
-#: src/inc.c:580
+#: src/inc.c:579
 msgid "Locked"
 msgstr "ロック中"
 
-#: src/inc.c:590
+#: src/inc.c:589
 msgid "Timeout"
 msgstr "タイムアウト"
 
-#: src/inc.c:640
+#: src/inc.c:639
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "完了 (%d 通の新着メッセージ)"
 
-#: src/inc.c:643
+#: src/inc.c:642
 msgid "Finished (no new messages)"
 msgstr "完了 (新着メッセージなし)"
 
-#: src/inc.c:652
+#: src/inc.c:651
 msgid "Some errors occurred while getting mail."
 msgstr "メールの取得中にエラーが発生しました。"
 
-#: src/inc.c:688
+#: src/inc.c:687
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "アカウント %s の新着メッセージを取り込んでいます...\n"
 
-#: src/inc.c:691
+#: src/inc.c:690
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: 新着メッセージを受信中"
 
-#: src/inc.c:710
+#: src/inc.c:709
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "POP3サーバ: %s に接続中..."
 
-#: src/inc.c:719
+#: src/inc.c:718
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "POP3サーバ: %s:%d に接続できません\n"
 
-#: src/inc.c:798 src/send_message.c:631
+#: src/inc.c:797 src/send_message.c:631
 msgid "Authenticating..."
 msgstr "認証中..."
 
-#: src/inc.c:799
+#: src/inc.c:798
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "%s からメッセージを受信中..."
 
-#: src/inc.c:804
+#: src/inc.c:803
 msgid "Getting the number of new messages (STAT)..."
 msgstr "新着メッセージの数を取得中 (STAT)..."
 
-#: src/inc.c:808
+#: src/inc.c:807
 msgid "Getting the number of new messages (LAST)..."
 msgstr "新着メッセージの数を取得中 (LAST)..."
 
-#: src/inc.c:812
+#: src/inc.c:811
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "新着メッセージの数を取得中 (UIDL)..."
 
-#: src/inc.c:816
+#: src/inc.c:815
 msgid "Getting the size of messages (LIST)..."
 msgstr "メッセージのサイズを取得中 (LIST)..."
 
-#: src/inc.c:826
+#: src/inc.c:825
 #, c-format
 msgid "Deleting message %d"
 msgstr "メッセージ %d を削除中"
 
-#: src/inc.c:833 src/send_message.c:649
+#: src/inc.c:832 src/send_message.c:649
 msgid "Quitting"
 msgstr "切断中"
 
-#: src/inc.c:858
+#: src/inc.c:857
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "メッセージを受信中 (%d / %d) (%s / %s)"
 
-#: src/inc.c:879
+#: src/inc.c:878
 #, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "受信中 (%d 通 (%s) 受信)"
 
-#: src/inc.c:1107
+#: src/inc.c:1106
 msgid "Connection failed."
 msgstr "接続に失敗しました。"
 
-#: src/inc.c:1113
+#: src/inc.c:1112
 msgid "Error occurred while processing mail."
 msgstr "メールの処理中にエラーが発生しました。"
 
-#: src/inc.c:1118
+#: src/inc.c:1117
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2718,28 +2718,28 @@ msgstr ""
 "メールの処理中にエラーが発生しました:\n"
 "%s"
 
-#: src/inc.c:1124
+#: src/inc.c:1123
 msgid "No disk space left."
 msgstr "ディスクの空き容量がありません。"
 
-#: src/inc.c:1129
+#: src/inc.c:1128
 msgid "Can't write file."
 msgstr "ファイルに書き込めません。"
 
-#: src/inc.c:1134
+#: src/inc.c:1133
 msgid "Socket error."
 msgstr "ソケットエラーです。"
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1140 src/send_message.c:584 src/send_message.c:772
+#: src/inc.c:1139 src/send_message.c:584 src/send_message.c:772
 msgid "Connection closed by the remote host."
 msgstr "リモートホストによって接続を切断されました。"
 
-#: src/inc.c:1146
+#: src/inc.c:1145
 msgid "Mailbox is locked."
 msgstr "メールボックスはロックされています。"
 
-#: src/inc.c:1150
+#: src/inc.c:1149
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2748,11 +2748,11 @@ msgstr ""
 "メールボックスはロックされています:\n"
 "%s"
 
-#: src/inc.c:1156 src/send_message.c:757
+#: src/inc.c:1155 src/send_message.c:757
 msgid "Authentication failed."
 msgstr "認証に失敗しました。"
 
-#: src/inc.c:1161 src/send_message.c:760
+#: src/inc.c:1160 src/send_message.c:760
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2761,15 +2761,15 @@ msgstr ""
 "認証に失敗しました:\n"
 "%s"
 
-#: src/inc.c:1166 src/send_message.c:776
+#: src/inc.c:1165 src/send_message.c:776
 msgid "Session timed out."
 msgstr "セッションがタイムアウトしました。"
 
-#: src/inc.c:1202
+#: src/inc.c:1201
 msgid "Incorporation cancelled\n"
 msgstr "受信をキャンセルしました\n"
 
-#: src/inc.c:1285
+#: src/inc.c:1284
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "新しいメッセージを %s から %s に取り込んでいます...\n"
@@ -3240,14 +3240,14 @@ msgid "/_View/Mess_age source"
 msgstr "/表示(_V)/メッセージのソース(_A)"
 
 #: src/mainwindow.c:708 src/messageview.c:245
-msgid "/_View/Show all _header"
+msgid "/_View/Show all _headers"
 msgstr "/表示(_V)/すべてのヘッダを表示(_H)"
 
 #: src/mainwindow.c:710
 msgid "/_View/_Update summary"
 msgstr "/表示(_V)/サマリを更新(_U)"
 
-#: src/mainwindow.c:712 src/messageview.c:247
+#: src/mainwindow.c:712 src/messageview.c:248
 msgid "/_Message"
 msgstr "/メッセージ(_M)"
 
@@ -3277,16 +3277,16 @@ msgstr "/メッセージ(_M)/送信待機中のメッセージを送信(_S)"
 
 #: src/mainwindow.c:722 src/mainwindow.c:724 src/mainwindow.c:731
 #: src/mainwindow.c:736 src/mainwindow.c:739 src/mainwindow.c:750
-#: src/mainwindow.c:752 src/mainwindow.c:755 src/messageview.c:250
-#: src/messageview.c:258 src/messageview.c:263
+#: src/mainwindow.c:752 src/mainwindow.c:755 src/messageview.c:251
+#: src/messageview.c:259 src/messageview.c:264
 msgid "/_Message/---"
 msgstr "/メッセージ(_M)/---"
 
-#: src/mainwindow.c:723 src/messageview.c:248
+#: src/mainwindow.c:723 src/messageview.c:249
 msgid "/_Message/Compose _new message"
 msgstr "/メッセージ(_M)/新規メッセージを作成(_N)"
 
-#: src/mainwindow.c:725 src/messageview.c:251
+#: src/mainwindow.c:725 src/messageview.c:252
 msgid "/_Message/_Reply"
 msgstr "/メッセージ(_M)/返信(_R)"
 
@@ -3294,27 +3294,27 @@ msgstr "/メッセージ(_M)/返信(_R)"
 msgid "/_Message/Repl_y to"
 msgstr "/メッセージ(_M)/返信の宛先(_Y)"
 
-#: src/mainwindow.c:727 src/messageview.c:252
+#: src/mainwindow.c:727 src/messageview.c:253
 msgid "/_Message/Repl_y to/_all"
 msgstr "/メッセージ(_M)/返信の宛先(_Y)/全員に返信(_A)"
 
-#: src/mainwindow.c:728 src/messageview.c:254
+#: src/mainwindow.c:728 src/messageview.c:255
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/メッセージ(_M)/返信の宛先(_Y)/差出人に返信(_S)"
 
-#: src/mainwindow.c:729 src/messageview.c:256
+#: src/mainwindow.c:729 src/messageview.c:257
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/メッセージ(_M)/返信の宛先(_Y)/メーリングリストに返信(_L)"
 
-#: src/mainwindow.c:732 src/messageview.c:259
+#: src/mainwindow.c:732 src/messageview.c:260
 msgid "/_Message/_Forward"
 msgstr "/メッセージ(_M)/転送(_F)"
 
-#: src/mainwindow.c:733 src/messageview.c:260
+#: src/mainwindow.c:733 src/messageview.c:261
 msgid "/_Message/For_ward as attachment"
 msgstr "/メッセージ(_M)/添付として転送(_W)"
 
-#: src/mainwindow.c:735 src/messageview.c:262
+#: src/mainwindow.c:735 src/messageview.c:263
 msgid "/_Message/Redirec_t"
 msgstr "/メッセージ(_M)/手を加えずに転送(_T)"
 
@@ -3370,7 +3370,7 @@ msgstr "/メッセージ(_M)/迷惑メールに指定(_J)"
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/メッセージ(_M)/迷惑メールではない(_U)"
 
-#: src/mainwindow.c:756 src/messageview.c:264
+#: src/mainwindow.c:756 src/messageview.c:265
 msgid "/_Message/Re-_edit"
 msgstr "/メッセージ(_M)/再編集(_E)"
 
@@ -3386,23 +3386,23 @@ msgstr "/ツール(_T)/フォルダ中のすべてのメッセージを振り分
 msgid "/_Tools/Filter _selected messages"
 msgstr "/ツール(_T)/選択中のメッセージを振り分け(_S)"
 
-#: src/mainwindow.c:767 src/messageview.c:271
+#: src/mainwindow.c:767 src/messageview.c:272
 msgid "/_Tools/_Create filter rule"
 msgstr "/ツール(_T)/振り分けルールを作成(_C)"
 
-#: src/mainwindow.c:768 src/messageview.c:273
+#: src/mainwindow.c:768 src/messageview.c:274
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/ツール(_T)/振り分けルールを作成(_C)/自動(_A)"
 
-#: src/mainwindow.c:770 src/messageview.c:275
+#: src/mainwindow.c:770 src/messageview.c:276
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/ツール(_T)/振り分けルールを作成(_C)/_Fromから"
 
-#: src/mainwindow.c:772 src/messageview.c:277
+#: src/mainwindow.c:772 src/messageview.c:278
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/ツール(_T)/振り分けルールを作成(_C)/_Toから"
 
-#: src/mainwindow.c:774 src/messageview.c:279
+#: src/mainwindow.c:774 src/messageview.c:280
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/ツール(_T)/振り分けルールを作成(_C)/_Subjectから"
 
@@ -3520,7 +3520,7 @@ msgid "MainWindow: color allocation %d failed\n"
 msgstr "MainWindow: 色の割り当て %d に失敗しました\n"
 
 #: src/mainwindow.c:1139 src/summaryview.c:2275 src/summaryview.c:2360
-#: src/summaryview.c:3907 src/summaryview.c:4036 src/summaryview.c:4394
+#: src/summaryview.c:3908 src/summaryview.c:4037 src/summaryview.c:4395
 msgid "done.\n"
 msgstr "完了。\n"
 
@@ -3799,7 +3799,7 @@ msgid "Find text:"
 msgstr "検索文字列:"
 
 #: src/message_search.c:153 src/prefs_search_folder.c:253
-#: src/query_search.c:326
+#: src/query_search.c:343
 msgid "Case sensitive"
 msgstr "大文字/小文字を区別"
 
@@ -3823,27 +3823,27 @@ msgstr "メッセージの終わりまで検索しました。始めから検索
 msgid "Search finished"
 msgstr "検索完了"
 
-#: src/messageview.c:268
+#: src/messageview.c:269
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/ツール(_T)/差出人をアドレス帳に追加(_K)"
 
-#: src/messageview.c:300
+#: src/messageview.c:301
 msgid "Creating message view...\n"
 msgstr "メッセージビューを作成中...\n"
 
-#: src/messageview.c:325
+#: src/messageview.c:326
 msgid "Text"
 msgstr "テキスト"
 
-#: src/messageview.c:330
+#: src/messageview.c:331
 msgid "Attachments"
 msgstr "添付"
 
-#: src/messageview.c:380
+#: src/messageview.c:381
 msgid "Message View - Sylpheed"
 msgstr "メッセージビュー - Sylpheed"
 
-#: src/messageview.c:699 src/summaryview.c:3436
+#: src/messageview.c:700 src/summaryview.c:3436
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "ファイル `%s' を保存できません。"
@@ -3860,7 +3860,7 @@ msgstr "(既定の印刷コマンド)"
 msgid "Print"
 msgstr "印刷"
 
-#: src/messageview.c:770 src/summaryview.c:3471
+#: src/messageview.c:769 src/summaryview.c:3470
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -3955,11 +3955,11 @@ msgstr ""
 "ファイルを開くコマンドを入力してください:\n"
 "(`%s' はファイル名で置き換えられます)"
 
-#: src/mimeview.c:1147
+#: src/mimeview.c:1140
 msgid "Opening executable file"
 msgstr "実行可能ファイルを開こうとしています"
 
-#: src/mimeview.c:1148
+#: src/mimeview.c:1141
 msgid ""
 "This is an executable file. Opening executable file is restricted for "
 "security.\n"
@@ -3971,11 +3971,6 @@ msgstr ""
 "起動したい場合は、ファイルを適当な場所に保存した後、それがウィルスやその他の"
 "悪意のあるプログラムでないことを確認してください。"
 
-#: src/mimeview.c:1184
-#, c-format
-msgid "MIME viewer command line is invalid: `%s'"
-msgstr "MIME ビューアのコマンドラインが無効です: `%s'"
-
 #: src/passphrase.c:96
 msgid "Passphrase"
 msgstr "パスフレーズ"
@@ -5704,19 +5699,19 @@ msgstr "Reply-To:"
 msgid "%s - Edit search condition"
 msgstr "%s - 検索条件の編集"
 
-#: src/prefs_search_folder.c:209 src/query_search.c:257
+#: src/prefs_search_folder.c:209 src/query_search.c:274
 msgid "Match any of the following"
 msgstr "次の条件のいずれかが該当"
 
-#: src/prefs_search_folder.c:211 src/query_search.c:259
+#: src/prefs_search_folder.c:211 src/query_search.c:276
 msgid "Match all of the following"
 msgstr "次の条件のすべてが該当"
 
-#: src/prefs_search_folder.c:231 src/query_search.c:303
+#: src/prefs_search_folder.c:231 src/query_search.c:320
 msgid "Folder:"
 msgstr "フォルダ:"
 
-#: src/prefs_search_folder.c:248 src/query_search.c:321
+#: src/prefs_search_folder.c:248 src/query_search.c:338
 msgid "Search subfolders"
 msgstr "サブフォルダも検索"
 
@@ -5730,17 +5725,17 @@ msgid "Attachment"
 msgstr "添付"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73 src/query_search.c:371 src/summaryview.c:4901
+#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4902
 msgid "Subject"
 msgstr "件名"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/query_search.c:372 src/summaryview.c:4904
+#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4905
 msgid "From"
 msgstr "差出人"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/query_search.c:373 src/summaryview.c:4906
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:4907
 msgid "Date"
 msgstr "日付"
 
@@ -5833,41 +5828,41 @@ msgstr "進行状況ダイアログを作成中...\n"
 msgid "Status"
 msgstr "状態"
 
-#: src/query_search.c:234
+#: src/query_search.c:251
 msgid "Search messages"
 msgstr "メッセージを検索"
 
-#: src/query_search.c:395
+#: src/query_search.c:423
 msgid "_Save as search folder"
 msgstr "検索フォルダとして保存(_S)"
 
-#: src/query_search.c:512 src/subscribedialog.c:526 src/summaryview.c:842
+#: src/query_search.c:542 src/subscribedialog.c:526 src/summaryview.c:842
 msgid "Done."
 msgstr "完了."
 
-#: src/query_search.c:536
+#: src/query_search.c:566
 #, c-format
 msgid "Searching %s ..."
 msgstr "%s を検索中..."
 
-#: src/query_search.c:564
+#: src/query_search.c:594
 #, c-format
 msgid "Searching %s (%d / %d)..."
 msgstr "%s を検索中 (%d / %d)..."
 
-#: src/query_search.c:645 src/summaryview.c:2051
+#: src/query_search.c:675 src/summaryview.c:2051
 msgid "(No Date)"
 msgstr "(日付なし)"
 
-#: src/query_search.c:833
+#: src/query_search.c:869
 msgid "Save as search folder"
 msgstr "検索フォルダとして保存"
 
-#: src/query_search.c:854
+#: src/query_search.c:890
 msgid "Location:"
 msgstr "場所:"
 
-#: src/query_search.c:869
+#: src/query_search.c:905
 msgid "Folder name:"
 msgstr "フォルダ名:"
 
@@ -6489,37 +6484,37 @@ msgstr "メッセージ %d を %s にコピーするようにセットしまし�
 msgid "Destination for copy is same as current folder."
 msgstr "コピー先が現在のフォルダと同じです。"
 
-#: src/summaryview.c:3506
+#: src/summaryview.c:3507
 msgid "Error occurred while processing messages."
 msgstr "メッセージの処理中にエラーが発生しました。"
 
-#: src/summaryview.c:3814 src/summaryview.c:3815
+#: src/summaryview.c:3815 src/summaryview.c:3816
 msgid "Building threads..."
 msgstr "スレッドを構築中..."
 
-#: src/summaryview.c:3965 src/summaryview.c:3966
+#: src/summaryview.c:3966 src/summaryview.c:3967
 msgid "Unthreading..."
 msgstr "スレッドを解除中..."
 
-#: src/summaryview.c:4259 src/summaryview.c:4315
+#: src/summaryview.c:4260 src/summaryview.c:4316
 #, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "振り分け中 (%d / %d)..."
 
-#: src/summaryview.c:4364
+#: src/summaryview.c:4365
 msgid "filtering..."
 msgstr "振り分け中..."
 
-#: src/summaryview.c:4365
+#: src/summaryview.c:4366
 msgid "Filtering..."
 msgstr "振り分け中..."
 
-#: src/summaryview.c:4401
+#: src/summaryview.c:4402
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "%d 通のメッセージが振り分けられました。"
 
-#: src/summaryview.c:4910
+#: src/summaryview.c:4911
 msgid "No."
 msgstr "番号"
 
diff --git a/po/ko.po b/po/ko.po
index 3ab6a07e..c2b5e806 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-03-02 19:03+0900\n"
+"POT-Creation-Date: 2006-03-10 16:06+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:491
+#: libsylph/prefs_common.c:496
 #, fuzzy
 msgid "Junk mail filter"
 msgstr "폴더"
@@ -526,7 +526,7 @@ msgstr "표시 파일을 열수가 없습니다\n"
 msgid "can't fetch message %d\n"
 msgstr "메시지 %d를 가져올 수가 없습니다\n"
 
-#: libsylph/procmsg.c:1375
+#: libsylph/procmsg.c:1378
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "인쇄 명령어가 올바르지않습니다: `%s'\n"
@@ -605,12 +605,12 @@ msgstr "  제목: %s\n"
 msgid "  Issuer: %s\n"
 msgstr "  발행인: %s\n"
 
-#: libsylph/utils.c:2411 src/compose.c:2869 src/compose.c:3132
-#: src/compose.c:3195 src/compose.c:3315
+#: libsylph/utils.c:2430 src/compose.c:2888 src/compose.c:3151
+#: src/compose.c:3214 src/compose.c:3334
 msgid "can't change file mode\n"
 msgstr "파일 모드를 바꿀수가 없습니다\n"
 
-#: libsylph/utils.c:2418 libsylph/utils.c:2542
+#: libsylph/utils.c:2437 libsylph/utils.c:2561
 #, c-format
 msgid "writing to %s failed.\n"
 msgstr "%s로 쓰기가 실패했습니다.\n"
@@ -680,8 +680,8 @@ msgstr ""
 "새 메시지는 이 순서대로 확인될 것입니다. `모두 받기'로 메시지를\n"
 "받으려면 `G' 컬럼 상자를 선택하세요."
 
-#: src/account_dialog.c:366 src/addressadd.c:192 src/addressbook.c:493
-#: src/compose.c:4273 src/editaddress.c:200 src/editaddress.c:942
+#: src/account_dialog.c:366 src/addressadd.c:192 src/addressbook.c:491
+#: src/compose.c:4292 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
@@ -817,12 +817,12 @@ msgstr ""
 msgid "Add Address to Book"
 msgstr "주소록에 추가"
 
-#: src/addressadd.c:202 src/compose.c:4777 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4796 src/editaddress.c:201
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "주소"
 
-#: src/addressadd.c:212 src/addressbook.c:495 src/editaddress.c:202
+#: src/addressadd.c:212 src/addressbook.c:493 src/editaddress.c:202
 #: src/editaddress.c:795 src/editaddress.c:860 src/editgroup.c:267
 msgid "Remarks"
 msgstr "메모"
@@ -831,110 +831,111 @@ msgstr "메모"
 msgid "Select Address Book Folder"
 msgstr "주소록 폴더 선택"
 
-#: src/addressbook.c:338 src/compose.c:515 src/mainwindow.c:489
+#: src/addressbook.c:337 src/compose.c:515 src/mainwindow.c:489
 #: src/messageview.c:140
 msgid "/_File"
 msgstr "/파일(_F)"
 
-#: src/addressbook.c:339
+#: src/addressbook.c:338
 msgid "/_File/New _Book"
 msgstr "/파일(_F)/새 주소록(_B)"
 
-#: src/addressbook.c:340
+#: src/addressbook.c:339
 msgid "/_File/New _vCard"
 msgstr "/파일(_F)/새 vCard(_v)"
 
-#: src/addressbook.c:342
+#: src/addressbook.c:341
 msgid "/_File/New _JPilot"
 msgstr "/파일(_F)/새 JPilot(_J)"
 
-#: src/addressbook.c:345
-msgid "/_File/New _Server"
+#: src/addressbook.c:344
+#, fuzzy
+msgid "/_File/New _LDAP Server"
 msgstr "/파일(_F)/새 서버(_S)"
 
-#: src/addressbook.c:347 src/addressbook.c:350 src/compose.c:520
+#: src/addressbook.c:346 src/addressbook.c:349 src/compose.c:520
 #: src/compose.c:525 src/compose.c:528 src/compose.c:531 src/mainwindow.c:507
 #: src/mainwindow.c:510 src/mainwindow.c:512 src/mainwindow.c:515
 #: src/mainwindow.c:517 src/messageview.c:143
 msgid "/_File/---"
 msgstr "/파일(_F)/---"
 
-#: src/addressbook.c:348
+#: src/addressbook.c:347
 msgid "/_File/_Edit"
 msgstr "/파일(_F)/편집(_E)"
 
-#: src/addressbook.c:349
+#: src/addressbook.c:348
 msgid "/_File/_Delete"
 msgstr "/파일(_F)/삭제(_D)"
 
-#: src/addressbook.c:351
+#: src/addressbook.c:350
 msgid "/_File/_Save"
 msgstr "/파일(_F)/저장(_S)"
 
-#: src/addressbook.c:352 src/compose.c:532 src/messageview.c:144
+#: src/addressbook.c:351 src/compose.c:532 src/messageview.c:144
 msgid "/_File/_Close"
 msgstr "/파일(_F)/닫기(_C)"
 
-#: src/addressbook.c:353
+#: src/addressbook.c:352
 msgid "/_Address"
 msgstr "/주소(_A)"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:353
 msgid "/_Address/New _Address"
 msgstr "/주소(_A)/새 주소(_A)"
 
-#: src/addressbook.c:355
+#: src/addressbook.c:354
 msgid "/_Address/New _Group"
 msgstr "/주소(_A)/새 그룹(_G)"
 
-#: src/addressbook.c:356
+#: src/addressbook.c:355
 msgid "/_Address/New _Folder"
 msgstr "/주소(_A)/새 폴더(_F)"
 
-#: src/addressbook.c:357
+#: src/addressbook.c:356
 msgid "/_Address/---"
 msgstr "/주소(_A)/---"
 
-#: src/addressbook.c:358
+#: src/addressbook.c:357
 msgid "/_Address/_Edit"
 msgstr "/주소(_A)/편집(_E)"
 
-#: src/addressbook.c:359
+#: src/addressbook.c:358
 msgid "/_Address/_Delete"
 msgstr "/주소(_A)/삭제(_D)"
 
-#: src/addressbook.c:360 src/compose.c:645 src/mainwindow.c:758
-#: src/messageview.c:266
+#: src/addressbook.c:359 src/compose.c:645 src/mainwindow.c:758
+#: src/messageview.c:267
 msgid "/_Tools"
 msgstr "/도구(_T)"
 
-#: src/addressbook.c:361
+#: src/addressbook.c:360
 msgid "/_Tools/Import _LDIF file"
 msgstr "/도구(_T)/LDIF 파일 가져오기(_L)"
 
-#: src/addressbook.c:362 src/compose.c:666 src/mainwindow.c:812
-#: src/messageview.c:286
+#: src/addressbook.c:361 src/compose.c:666 src/mainwindow.c:812
+#: src/messageview.c:287
 msgid "/_Help"
 msgstr "/도움말(_H)"
 
-#: src/addressbook.c:363 src/compose.c:667 src/mainwindow.c:824
-#: src/messageview.c:287
+#: src/addressbook.c:362 src/compose.c:667 src/mainwindow.c:824
+#: src/messageview.c:288
 msgid "/_Help/_About"
 msgstr "/도움말(_H)/sylpheed 정보(_A)"
 
-#: src/addressbook.c:382 src/addressbook.c:392
+#: src/addressbook.c:381 src/addressbook.c:391
 msgid "/New _Address"
 msgstr "/새 주소(_A)"
 
-#: src/addressbook.c:383 src/addressbook.c:393
+#: src/addressbook.c:382 src/addressbook.c:392
 msgid "/New _Group"
 msgstr "/새 그룹(_G)"
 
-#: src/addressbook.c:384 src/addressbook.c:394
+#: src/addressbook.c:383 src/addressbook.c:393
 msgid "/New _Folder"
 msgstr "/새 폴더(_F)"
 
-#: src/addressbook.c:385 src/addressbook.c:395 src/compose.c:509
+#: src/addressbook.c:384 src/addressbook.c:394 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
@@ -944,70 +945,70 @@ msgstr "/새 폴더(_F)"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:386 src/addressbook.c:396 src/compose.c:534
+#: src/addressbook.c:385 src/addressbook.c:395 src/compose.c:534
 #: src/mainwindow.c:521 src/messageview.c:146
 msgid "/_Edit"
 msgstr "/편집(_E)"
 
-#: src/addressbook.c:387 src/addressbook.c:397 src/summaryview.c:434
+#: src/addressbook.c:386 src/addressbook.c:396 src/summaryview.c:434
 msgid "/_Delete"
 msgstr "/삭제(_D)"
 
-#: src/addressbook.c:494
+#: src/addressbook.c:492
 msgid "E-Mail address"
 msgstr "이메일 주소"
 
-#: src/addressbook.c:498 src/compose.c:4778 src/prefs_common_dialog.c:2183
+#: src/addressbook.c:496 src/compose.c:4797 src/prefs_common_dialog.c:2183
 msgid "Address book"
 msgstr "주소록"
 
-#: src/addressbook.c:600 src/prefs_filter_edit.c:249
+#: src/addressbook.c:603 src/prefs_filter_edit.c:249
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "이름:"
 
 #. Buttons
-#: src/addressbook.c:632 src/addressbook.c:1684 src/editaddress.c:884
+#: src/addressbook.c:636 src/addressbook.c:1678 src/editaddress.c:884
 #: src/editaddress.c:1017 src/mainwindow.c:2426 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:635 src/editaddress.c:890 src/editaddress.c:1023
+#: src/addressbook.c:639 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:1552
 msgid "Add"
 msgstr "추가"
 
-#: src/addressbook.c:638
+#: src/addressbook.c:642
 msgid "Lookup"
 msgstr "찾기"
 
-#: src/addressbook.c:650 src/headerview.c:55 src/prefs_folder_item.c:339
+#: src/addressbook.c:654 src/headerview.c:55 src/prefs_folder_item.c:339
 #: src/prefs_template.c:176
 msgid "To:"
 msgstr "받는 사람:"
 
-#: src/addressbook.c:654 src/prefs_folder_item.c:356 src/prefs_template.c:178
+#: src/addressbook.c:658 src/prefs_folder_item.c:356 src/prefs_template.c:178
 msgid "Cc:"
 msgstr "참조:"
 
-#: src/addressbook.c:658 src/prefs_folder_item.c:367
+#: src/addressbook.c:662 src/prefs_folder_item.c:367
 msgid "Bcc:"
 msgstr "숨은 참조:"
 
 #. Confirm deletion
-#: src/addressbook.c:845
+#: src/addressbook.c:832
 msgid "Delete address(es)"
 msgstr "주소를 삭제"
 
-#: src/addressbook.c:846
+#: src/addressbook.c:833
 msgid "Really delete the address(es)?"
 msgstr "정말로 주소를 삭제하시겠습니까?"
 
-#: src/addressbook.c:1675
+#: src/addressbook.c:1669
 #, fuzzy, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1016,38 +1017,38 @@ msgstr ""
 "`%s'의 모든 주소와 폴더를 삭제할까요 ? \n"
 "폴더만 지울 경우 주소는 그 상위 폴더로 옮겨집니다."
 
-#: src/addressbook.c:1678 src/folderview.c:2372
+#: src/addressbook.c:1672 src/folderview.c:2372
 msgid "Delete folder"
 msgstr "폴더 삭제"
 
-#: src/addressbook.c:1678
+#: src/addressbook.c:1672
 #, fuzzy
 msgid "_Folder only"
 msgstr "폴더만"
 
-#: src/addressbook.c:1678
+#: src/addressbook.c:1672
 #, fuzzy
 msgid "Folder and _addresses"
 msgstr "폴더와 주소"
 
-#: src/addressbook.c:1683
+#: src/addressbook.c:1677
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "정말로 `%s'를 지우시겠습니까?"
 
-#: src/addressbook.c:2369 src/addressbook.c:2502
+#: src/addressbook.c:2363 src/addressbook.c:2496
 msgid "New user, could not save index file."
 msgstr "새 사용자, 색인 파일을 저장할 수 없습니다."
 
-#: src/addressbook.c:2373 src/addressbook.c:2506
+#: src/addressbook.c:2367 src/addressbook.c:2500
 msgid "New user, could not save address book files."
 msgstr "새 사용자, 주소록 파일을 저장할 수 없습니다."
 
-#: src/addressbook.c:2383 src/addressbook.c:2516
+#: src/addressbook.c:2377 src/addressbook.c:2510
 msgid "Old address book converted successfully."
 msgstr "예전 주소록을 성공적으로 변환하였습니다."
 
-#: src/addressbook.c:2388
+#: src/addressbook.c:2382
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1055,7 +1056,7 @@ msgstr ""
 "예전 주소록이 변환되었습니다,\n"
 "새 주소록의 색인 파일을 저장할 수 없습니다"
 
-#: src/addressbook.c:2401
+#: src/addressbook.c:2395
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1063,7 +1064,7 @@ msgstr ""
 "주소록을 변환할 수 없습니다,\n"
 "대신에 빈 새 주소록 파일을 생성하였습니다."
 
-#: src/addressbook.c:2407
+#: src/addressbook.c:2401
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1071,7 +1072,7 @@ msgstr ""
 "주소록을 변환하지 못했습니다,\n"
 "새 주소록 파일을 생성하지 못했습니다."
 
-#: src/addressbook.c:2412
+#: src/addressbook.c:2406
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1079,85 +1080,85 @@ msgstr ""
 "주소록을 변환하지 못했고\n"
 "새 주소록 파일도 생성하지 못했습니다."
 
-#: src/addressbook.c:2419
+#: src/addressbook.c:2413
 msgid "Addressbook conversion error"
 msgstr "주소록 변환 에러"
 
-#: src/addressbook.c:2423
+#: src/addressbook.c:2417
 msgid "Addressbook conversion"
 msgstr "주소록 변환"
 
-#: src/addressbook.c:2458
+#: src/addressbook.c:2452
 msgid "Addressbook Error"
 msgstr "주소록 에러"
 
-#: src/addressbook.c:2459 src/addressbook.c:2559
+#: src/addressbook.c:2453 src/addressbook.c:2553
 msgid "Could not read address index"
 msgstr "주소 색인을 읽을 수 없습니다"
 
-#: src/addressbook.c:2521
+#: src/addressbook.c:2515
 msgid "Old address book converted, could not save new address index file"
 msgstr "예전 주소록이 변환되었습니다, 새 주소록 색인 파일을 저장할 수 없습니다"
 
-#: src/addressbook.c:2535
+#: src/addressbook.c:2529
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr ""
 "주소록을 변환할 수 없습니다, 대신에 빈 새 주소록 파일을 생성하였습니다."
 
-#: src/addressbook.c:2541
+#: src/addressbook.c:2535
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr "주소록을 변환하지 못했습니다, 새 주소록 파일을 생성하지 못했습니다."
 
-#: src/addressbook.c:2547
+#: src/addressbook.c:2541
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr "주소록을 변환하지 못했고 새 주소록 파일도 생성하지 못했습니다."
 
-#: src/addressbook.c:2565
+#: src/addressbook.c:2559
 msgid "Addressbook Conversion Error"
 msgstr "주소록 변환 에러"
 
-#: src/addressbook.c:2571
+#: src/addressbook.c:2565
 msgid "Addressbook Conversion"
 msgstr "주소록 변환"
 
-#: src/addressbook.c:3086 src/prefs_common_dialog.c:2033
+#: src/addressbook.c:3080 src/prefs_common_dialog.c:2033
 msgid "Interface"
 msgstr "인터페이스"
 
-#: src/addressbook.c:3102 src/importldif.c:514
+#: src/addressbook.c:3096 src/importldif.c:514
 msgid "Address Book"
 msgstr "주소록"
 
-#: src/addressbook.c:3118
+#: src/addressbook.c:3112
 msgid "Person"
 msgstr "사람"
 
-#: src/addressbook.c:3134
+#: src/addressbook.c:3128
 msgid "EMail Address"
 msgstr "이메일 주소"
 
-#: src/addressbook.c:3150
+#: src/addressbook.c:3144
 msgid "Group"
 msgstr "그룹"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3166 src/folderview.c:367 src/prefs_account_dialog.c:1694
-#: src/query_search.c:370
+#: src/addressbook.c:3160 src/folderview.c:367 src/prefs_account_dialog.c:1694
+#: src/query_search.c:398
 msgid "Folder"
 msgstr "폴더"
 
-#: src/addressbook.c:3182
+#: src/addressbook.c:3176
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3198 src/addressbook.c:3214
+#: src/addressbook.c:3192 src/addressbook.c:3208
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3230
+#: src/addressbook.c:3224
 msgid "LDAP Server"
 msgstr "LDAP 서버"
 
@@ -1169,7 +1170,7 @@ msgstr "공용 주소록"
 msgid "Personal address"
 msgstr "개인 주소록"
 
-#: src/alertpanel.c:142 src/compose.c:5500 src/main.c:621
+#: src/alertpanel.c:142 src/compose.c:5517 src/main.c:621
 msgid "Notice"
 msgstr "알림"
 
@@ -1177,7 +1178,7 @@ msgstr "알림"
 msgid "Warning"
 msgstr "경고"
 
-#: src/alertpanel.c:168 src/inc.c:587
+#: src/alertpanel.c:168 src/inc.c:586
 msgid "Error"
 msgstr "에러"
 
@@ -1220,7 +1221,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:4761
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4762
 msgid "None"
 msgstr "없음"
 
@@ -1499,7 +1500,7 @@ msgstr "/보기(_V)/문자셋(_C)/Thai (TIS-620)"
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/보기(_V)/문자셋(_C)/Thai (Windows-874)"
 
-#: src/compose.c:646 src/mainwindow.c:759 src/messageview.c:267
+#: src/compose.c:646 src/mainwindow.c:759 src/messageview.c:268
 msgid "/_Tools/_Address book"
 msgstr "/도구(_T)/주소록(_A)"
 
@@ -1507,14 +1508,14 @@ msgstr "/도구(_T)/주소록(_A)"
 msgid "/_Tools/_Template"
 msgstr "/도구(_T)/템플릿(_T)"
 
-#: src/compose.c:649 src/mainwindow.c:783 src/messageview.c:283
+#: src/compose.c:649 src/mainwindow.c:783 src/messageview.c:284
 msgid "/_Tools/Actio_ns"
 msgstr "/도구(_T)/동작(_n)"
 
 #: src/compose.c:651 src/compose.c:655 src/compose.c:661 src/mainwindow.c:762
 #: src/mainwindow.c:776 src/mainwindow.c:781 src/mainwindow.c:784
-#: src/mainwindow.c:788 src/mainwindow.c:790 src/messageview.c:270
-#: src/messageview.c:282
+#: src/mainwindow.c:788 src/mainwindow.c:790 src/messageview.c:271
+#: src/messageview.c:283
 msgid "/_Tools/---"
 msgstr "/도구(_T)/---"
 
@@ -1543,80 +1544,80 @@ msgstr "/도구(_T)/실행(_x)"
 msgid "/_Tools/_Set spell language"
 msgstr "/도구(_T)/템플릿(_T)"
 
-#: src/compose.c:910
+#: src/compose.c:912
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: 파일이 없습니다\n"
 
-#: src/compose.c:1014 src/compose.c:1085
+#: src/compose.c:1016 src/compose.c:1087
 msgid "Can't get text part\n"
 msgstr "텍스트 부분을 얻을 수가 없습니다\n"
 
-#: src/compose.c:1486
+#: src/compose.c:1488
 msgid "Quote mark format error."
 msgstr "인용 부호 형식 에러."
 
-#: src/compose.c:1498
+#: src/compose.c:1500
 msgid "Message reply/forward format error."
 msgstr "메시지 회신/전달 형식 에러."
 
-#: src/compose.c:1918
+#: src/compose.c:1935
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "%s파일이 없습니다\n"
 
-#: src/compose.c:1922
+#: src/compose.c:1939
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "%s의 파일 크기를 알수가 없습니다\n"
 
-#: src/compose.c:1926
+#: src/compose.c:1943
 #, c-format
 msgid "File %s is empty."
 msgstr "%s 파일이 빈 파일입니다."
 
-#: src/compose.c:1930
+#: src/compose.c:1947
 #, c-format
 msgid "Can't read %s."
 msgstr "%s를 읽을 수가 없습니다."
 
-#: src/compose.c:1963
+#: src/compose.c:1980
 #, c-format
 msgid "Message: %s"
 msgstr "메시지: %s"
 
-#: src/compose.c:2023 src/mimeview.c:565
+#: src/compose.c:2040 src/mimeview.c:565
 msgid "Can't get the part of multipart message."
 msgstr "multipart 메시지의 부분을 얻을 수가 없습니다."
 
-#: src/compose.c:2507 src/headerview.c:195 src/query_search.c:636
+#: src/compose.c:2524 src/headerview.c:195 src/query_search.c:666
 #: src/summaryview.c:2124
 msgid "(No Subject)"
 msgstr "(제목 없음)"
 
-#: src/compose.c:2510
+#: src/compose.c:2527
 #, fuzzy, c-format
 msgid "%s - Compose%s"
 msgstr "%s - 메시지 편집%s "
 
-#: src/compose.c:2623
+#: src/compose.c:2642
 msgid "Recipient is not specified."
 msgstr "받는 사람이 지정되지않았습니다"
 
-#: src/compose.c:2631
+#: src/compose.c:2650
 #, fuzzy
 msgid "Empty subject"
 msgstr "제목"
 
-#: src/compose.c:2632
+#: src/compose.c:2651
 msgid "Subject is empty. Send it anyway?"
 msgstr "제목이 비었습니다. 그래도 보낼까요?"
 
-#: src/compose.c:2691
+#: src/compose.c:2710
 msgid "can't get recipient list."
 msgstr "받는 사람 목록을 얻을 수가 없습니다"
 
-#: src/compose.c:2711
+#: src/compose.c:2730
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1624,21 +1625,21 @@ msgstr ""
 "메일을 보내기위한 계정이 지정되어있지않습니다.\n"
 "보내기 전에 메일 계정을 선택하세요."
 
-#: src/compose.c:2725 src/send_message.c:299
+#: src/compose.c:2744 src/send_message.c:299
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "%s로 메시지를 보내는 중 에러가 발생했습니다."
 
-#: src/compose.c:2767
+#: src/compose.c:2786
 msgid "Can't save the message to outbox."
 msgstr "메시지를 보낸 편지함에 저장할 수가 없습니다"
 
-#: src/compose.c:2805
+#: src/compose.c:2824
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "현재 선택된 키 ID `%s'에 연결된 어떤 키도 찾을 수 없습니다."
 
-#: src/compose.c:2902
+#: src/compose.c:2921
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1648,12 +1649,12 @@ msgstr ""
 "메시지의 문자셋을 변경할 수가 없습니다.\n"
 "그래도 보낼까요?"
 
-#: src/compose.c:2908
+#: src/compose.c:2927
 #, fuzzy
 msgid "Code conversion error"
 msgstr "주소록 변환 에러"
 
-#: src/compose.c:2981
+#: src/compose.c:3000
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1662,160 +1663,160 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:2985
+#: src/compose.c:3004
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3275
+#: src/compose.c:3294
 msgid "can't remove the old message\n"
 msgstr "오래된 메시지를 제거할 수가 없습니다\n"
 
-#: src/compose.c:3293
+#: src/compose.c:3312
 msgid "queueing message...\n"
 msgstr "메시지를 임시 보관합니다...\n"
 
-#: src/compose.c:3375
+#: src/compose.c:3394
 msgid "can't find queue folder\n"
 msgstr "큐 폴더를 찾을 수가 없습니다\n"
 
-#: src/compose.c:3382
+#: src/compose.c:3401
 msgid "can't queue the message\n"
 msgstr "메시지를 임시 보관할 수가 없습니다\n"
 
-#: src/compose.c:3975
+#: src/compose.c:3994
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "생성된 Message-ID: %s\n"
 
-#: src/compose.c:4088
+#: src/compose.c:4107
 msgid "Creating compose window...\n"
 msgstr "편집창을 생성합니다...\n"
 
-#: src/compose.c:4139 src/headerview.c:54
+#: src/compose.c:4158 src/headerview.c:54
 msgid "From:"
 msgstr "보낸 사람:"
 
-#: src/compose.c:4213
+#: src/compose.c:4232
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/도구(_T)/동작(_n)"
 
-#: src/compose.c:4216
+#: src/compose.c:4235
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/메시지(_M)/암호화(_E)"
 
-#: src/compose.c:4254 src/compose.c:5332
+#: src/compose.c:4273 src/compose.c:5351
 msgid "MIME type"
 msgstr "마임 타입"
 
 #. S_COL_DATE
-#: src/compose.c:4263 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4908
+#: src/compose.c:4282 src/mimeview.c:197 src/prefs_filter_edit.c:496
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4909
 msgid "Size"
 msgstr "크기"
 
-#: src/compose.c:4698 src/mainwindow.c:2359 src/prefs_account_dialog.c:528
+#: src/compose.c:4717 src/mainwindow.c:2359 src/prefs_account_dialog.c:528
 #: src/prefs_common_dialog.c:661
 msgid "Send"
 msgstr "메일 발송"
 
-#: src/compose.c:4699
+#: src/compose.c:4718
 msgid "Send message"
 msgstr "메시지 보내기"
 
-#: src/compose.c:4707
+#: src/compose.c:4726
 msgid "Send later"
 msgstr "나중에 보내기"
 
-#: src/compose.c:4708
+#: src/compose.c:4727
 msgid "Put into queue folder and send later"
 msgstr "보낼 편지함에 넣어서 나중에 보내기"
 
-#: src/compose.c:4716
+#: src/compose.c:4735
 msgid "Draft"
 msgstr "임시 보관함"
 
-#: src/compose.c:4717
+#: src/compose.c:4736
 msgid "Save to draft folder"
 msgstr "임시 보관함에 넣기"
 
-#: src/compose.c:4727
+#: src/compose.c:4746
 msgid "Insert"
 msgstr "삽입"
 
-#: src/compose.c:4728
+#: src/compose.c:4747
 msgid "Insert file"
 msgstr "파일을 삽입합니다"
 
-#: src/compose.c:4736
+#: src/compose.c:4755
 msgid "Attach"
 msgstr "첨부"
 
-#: src/compose.c:4737
+#: src/compose.c:4756
 msgid "Attach file"
 msgstr "파일 첨부"
 
 #. signature
-#: src/compose.c:4747 src/prefs_account_dialog.c:1208
+#: src/compose.c:4766 src/prefs_account_dialog.c:1208
 #: src/prefs_common_dialog.c:953
 msgid "Signature"
 msgstr "서명"
 
-#: src/compose.c:4748
+#: src/compose.c:4767
 #, fuzzy
 msgid "Append signature"
 msgstr "BAD signature"
 
 #. editor
-#: src/compose.c:4757 src/prefs_common_dialog.c:991
+#: src/compose.c:4776 src/prefs_common_dialog.c:991
 #: src/prefs_common_dialog.c:2315
 msgid "Editor"
 msgstr "편집기"
 
-#: src/compose.c:4758
+#: src/compose.c:4777
 msgid "Edit with external editor"
 msgstr "외부 편집기로 편집"
 
-#: src/compose.c:4766
+#: src/compose.c:4785
 msgid "Linewrap"
 msgstr "줄바꿈"
 
-#: src/compose.c:4767
+#: src/compose.c:4786
 msgid "Wrap all long lines"
 msgstr "긴 줄에대해 자동 줄바꿈을 합니다"
 
-#: src/compose.c:5228
+#: src/compose.c:5247
 msgid "Invalid MIME type."
 msgstr "올바르지않은 마임 타입."
 
-#: src/compose.c:5246
+#: src/compose.c:5265
 msgid "File doesn't exist or is empty."
 msgstr "파일이 없거나 비여있습니다."
 
-#: src/compose.c:5314
+#: src/compose.c:5333
 #, fuzzy
 msgid "Properties"
 msgstr "특성"
 
-#: src/compose.c:5334 src/prefs_common_dialog.c:1444
+#: src/compose.c:5353 src/prefs_common_dialog.c:1444
 msgid "Encoding"
 msgstr "인코딩"
 
-#: src/compose.c:5357 src/prefs_folder_item.c:202
+#: src/compose.c:5376 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "경로"
 
-#: src/compose.c:5358
+#: src/compose.c:5377
 msgid "File name"
 msgstr "파일 이름"
 
-#: src/compose.c:5449
+#: src/compose.c:5466
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "외부 편집기 명령어가 올바르지않습니다: `%s'\n"
 
-#: src/compose.c:5497
+#: src/compose.c:5514
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1825,48 +1826,48 @@ msgstr ""
 "이 프로세스를 강제로 종료시킬까요?\n"
 "프로세스 그룹 아이디: %d"
 
-#: src/compose.c:5872 src/compose.c:5877 src/compose.c:5883
+#: src/compose.c:5889 src/compose.c:5894 src/compose.c:5900
 msgid "Can't queue the message."
 msgstr "메시지를 임시 보관함에 넣을수가 없습니다."
 
-#: src/compose.c:5974
+#: src/compose.c:5991
 #, fuzzy
 msgid "Select files"
 msgstr "파일 선택"
 
-#: src/compose.c:5997
+#: src/compose.c:6014
 msgid "Select file"
 msgstr "파일 선택"
 
-#: src/compose.c:6032
+#: src/compose.c:6049
 #, fuzzy
 msgid "Save message"
 msgstr "메시지 보내기"
 
-#: src/compose.c:6033
+#: src/compose.c:6050
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "이 메시지는 수정되었습니다. 변경사항을 버릴까요?"
 
-#: src/compose.c:6035
+#: src/compose.c:6052
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:6077
+#: src/compose.c:6094
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "`%s' 템플릿을 적용할까요?"
 
-#: src/compose.c:6079
+#: src/compose.c:6096
 msgid "Apply template"
 msgstr "템플릿을 적용합니다."
 
-#: src/compose.c:6080
+#: src/compose.c:6097
 #, fuzzy
 msgid "_Replace"
 msgstr "대체"
 
-#: src/compose.c:6080
+#: src/compose.c:6097
 #, fuzzy
 msgid "_Insert"
 msgstr "삽입"
@@ -1988,52 +1989,52 @@ msgstr "그룹명이 지정되지 않았습니다."
 msgid "Edit Group Data"
 msgstr "그룹 자료 편집"
 
-#: src/editgroup.c:300
+#: src/editgroup.c:299
 msgid "Group Name"
 msgstr "그룹명"
 
-#: src/editgroup.c:319
+#: src/editgroup.c:318
 msgid "Addresses in Group"
 msgstr "그룹의 주소"
 
-#: src/editgroup.c:321
+#: src/editgroup.c:320
 msgid " -> "
 msgstr " -> "
 
-#: src/editgroup.c:348
+#: src/editgroup.c:347
 msgid " <- "
 msgstr " <- "
 
-#: src/editgroup.c:350
+#: src/editgroup.c:349
 msgid "Available Addresses"
 msgstr "사용가능한 주소"
 
-#: src/editgroup.c:416
+#: src/editgroup.c:415
 msgid "Move E-Mail Addresses to or from Group with arrow buttons"
 msgstr "화살표 버튼으로 그룹에서 혹은 그룹으로 전자우편 주소 이동"
 
-#: src/editgroup.c:468
+#: src/editgroup.c:467
 msgid "Edit Group Details"
 msgstr "그룹 상세내용 편집"
 
-#: src/editgroup.c:471
+#: src/editgroup.c:470
 msgid "Add New Group"
 msgstr "새 그룹 추가"
 
-#: src/editgroup.c:522
+#: src/editgroup.c:521
 msgid "Edit folder"
 msgstr "폴더 편집"
 
-#: src/editgroup.c:522
+#: src/editgroup.c:521
 msgid "Input the new name of folder:"
 msgstr "새 폴더의 이름을 넣으세요:"
 
-#: src/editgroup.c:525 src/foldersel.c:541 src/folderview.c:2121
+#: src/editgroup.c:524 src/foldersel.c:541 src/folderview.c:2121
 #: src/folderview.c:2127
 msgid "New folder"
 msgstr "새 폴더"
 
-#: src/editgroup.c:526 src/foldersel.c:542 src/folderview.c:2128
+#: src/editgroup.c:525 src/foldersel.c:542 src/folderview.c:2128
 msgid "Input the name of new folder:"
 msgstr "새 폴더의 이름을 넣으세요:"
 
@@ -2231,7 +2232,7 @@ msgid "`%c' can't be included in folder name."
 msgstr "`%c'는 폴더 이름에 포함될 수 없습니다."
 
 #: src/foldersel.c:561 src/folderview.c:2147 src/folderview.c:2206
-#: src/query_search.c:995
+#: src/query_search.c:1031
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "`%s' 폴더가 이미 존재합니다."
@@ -2493,7 +2494,7 @@ msgstr "제목:"
 msgid "Creating header view...\n"
 msgstr "헤더 뷰를 생성합니다...\n"
 
-#: src/headerview.c:180 src/query_search.c:637 src/summaryview.c:2127
+#: src/headerview.c:180 src/query_search.c:667 src/summaryview.c:2127
 msgid "(No From)"
 msgstr "(???)"
 
@@ -2623,189 +2624,189 @@ msgstr ""
 msgid "Sylpheed: %d new messages"
 msgstr "끝났습니다 (%d개의 새로운 메시지)"
 
-#: src/inc.c:372
+#: src/inc.c:371
 msgid "Retrieving new messages"
 msgstr "새 메시지를 가져옴"
 
-#: src/inc.c:415
+#: src/inc.c:414
 msgid "Standby"
 msgstr ""
 
-#: src/inc.c:544 src/inc.c:593
+#: src/inc.c:543 src/inc.c:592
 msgid "Cancelled"
 msgstr "취소되었습니다"
 
-#: src/inc.c:555
+#: src/inc.c:554
 msgid "Retrieving"
 msgstr ""
 
-#: src/inc.c:564
+#: src/inc.c:563
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "완료 (%d 메시지 (%s)가 받아짐)"
 
-#: src/inc.c:568
+#: src/inc.c:567
 msgid "Done (no new messages)"
 msgstr "완료 (새 메시지 없음)"
 
-#: src/inc.c:574
+#: src/inc.c:573
 msgid "Connection failed"
 msgstr "연결이 실패했습니다"
 
-#: src/inc.c:577
+#: src/inc.c:576
 msgid "Auth failed"
 msgstr "인증이 실패했습니다."
 
-#: src/inc.c:580
+#: src/inc.c:579
 msgid "Locked"
 msgstr ""
 
-#: src/inc.c:590
+#: src/inc.c:589
 msgid "Timeout"
 msgstr ""
 
-#: src/inc.c:640
+#: src/inc.c:639
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "끝났습니다 (%d개의 새로운 메시지)"
 
-#: src/inc.c:643
+#: src/inc.c:642
 msgid "Finished (no new messages)"
 msgstr "끝났습니다 (새 메시지 없음)"
 
-#: src/inc.c:652
+#: src/inc.c:651
 msgid "Some errors occurred while getting mail."
 msgstr "편지를 받다가 에러가 발생했습니다."
 
-#: src/inc.c:688
+#: src/inc.c:687
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "%s 계정으로부터 새 메시지를 얻습니다...\n"
 
-#: src/inc.c:691
+#: src/inc.c:690
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: 새 메시지를 가져옴"
 
-#: src/inc.c:710
+#: src/inc.c:709
 #, fuzzy, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "POP3 서버 %s에 연결합니다..."
 
-#: src/inc.c:719
+#: src/inc.c:718
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "%s:%d POP3 서버에 연결할 수가 없습니다\n"
 
-#: src/inc.c:798 src/send_message.c:631
+#: src/inc.c:797 src/send_message.c:631
 msgid "Authenticating..."
 msgstr "인증 중입니다..."
 
-#: src/inc.c:799
+#: src/inc.c:798
 #, fuzzy, c-format
 msgid "Retrieving messages from %s..."
 msgstr "%s로부터 %s로 메시지를 가져옵니다...\n"
 
-#: src/inc.c:804
+#: src/inc.c:803
 msgid "Getting the number of new messages (STAT)..."
 msgstr "새 메시지의 갯수를 얻는 중 (STAT)..."
 
-#: src/inc.c:808
+#: src/inc.c:807
 msgid "Getting the number of new messages (LAST)..."
 msgstr "새 메시지의 갯수를 얻는 중 (LAST)..."
 
-#: src/inc.c:812
+#: src/inc.c:811
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "새 메시지의 갯수를 얻는 중 (UIDL)..."
 
-#: src/inc.c:816
+#: src/inc.c:815
 msgid "Getting the size of messages (LIST)..."
 msgstr "메시지의 크기를 얻는 중 (LIST)..."
 
-#: src/inc.c:826
+#: src/inc.c:825
 #, c-format
 msgid "Deleting message %d"
 msgstr "%d 메시지를 삭제하는 중"
 
-#: src/inc.c:833 src/send_message.c:649
+#: src/inc.c:832 src/send_message.c:649
 msgid "Quitting"
 msgstr "끝마치는 중"
 
-#: src/inc.c:858
+#: src/inc.c:857
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "메시지 (%d / %d) 를 가져오는 중 (%s / %s)"
 
-#: src/inc.c:879
+#: src/inc.c:878
 #, fuzzy, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "완료 (%d 메시지 (%s)가 받아짐)"
 
-#: src/inc.c:1107
+#: src/inc.c:1106
 #, fuzzy
 msgid "Connection failed."
 msgstr "연결이 실패했습니다"
 
-#: src/inc.c:1113
+#: src/inc.c:1112
 msgid "Error occurred while processing mail."
 msgstr "메일을 처리하는 도중 에러"
 
-#: src/inc.c:1118
+#: src/inc.c:1117
 #, fuzzy, c-format
 msgid ""
 "Error occurred while processing mail:\n"
 "%s"
 msgstr "메일을 처리하는 도중 에러"
 
-#: src/inc.c:1124
+#: src/inc.c:1123
 msgid "No disk space left."
 msgstr "디스크에 남은 공간이 없슴."
 
-#: src/inc.c:1129
+#: src/inc.c:1128
 msgid "Can't write file."
 msgstr "파일에 쓸 수가 없습니다."
 
-#: src/inc.c:1134
+#: src/inc.c:1133
 msgid "Socket error."
 msgstr "소켓 에러."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1140 src/send_message.c:584 src/send_message.c:772
+#: src/inc.c:1139 src/send_message.c:584 src/send_message.c:772
 msgid "Connection closed by the remote host."
 msgstr ""
 
-#: src/inc.c:1146
+#: src/inc.c:1145
 msgid "Mailbox is locked."
 msgstr "메일박스가 잠겨있습니다."
 
-#: src/inc.c:1150
+#: src/inc.c:1149
 #, fuzzy, c-format
 msgid ""
 "Mailbox is locked:\n"
 "%s"
 msgstr "메일박스가 잠겨있습니다."
 
-#: src/inc.c:1156 src/send_message.c:757
+#: src/inc.c:1155 src/send_message.c:757
 #, fuzzy
 msgid "Authentication failed."
 msgstr "인증 방법"
 
-#: src/inc.c:1161 src/send_message.c:760
+#: src/inc.c:1160 src/send_message.c:760
 #, fuzzy, c-format
 msgid ""
 "Authentication failed:\n"
 "%s"
 msgstr "인증 방법"
 
-#: src/inc.c:1166 src/send_message.c:776
+#: src/inc.c:1165 src/send_message.c:776
 msgid "Session timed out."
 msgstr ""
 
-#: src/inc.c:1202
+#: src/inc.c:1201
 msgid "Incorporation cancelled\n"
 msgstr "병합이 취소되었습니다.\n"
 
-#: src/inc.c:1285
+#: src/inc.c:1284
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "%s로부터 %s로 새 메시지를 가져옴...\n"
@@ -3288,14 +3289,15 @@ msgid "/_View/Mess_age source"
 msgstr "/보기(_V)/메시지 소스(_a)"
 
 #: src/mainwindow.c:708 src/messageview.c:245
-msgid "/_View/Show all _header"
+#, fuzzy
+msgid "/_View/Show all _headers"
 msgstr "/보기(_V)/모든 헤더보기(_h)"
 
 #: src/mainwindow.c:710
 msgid "/_View/_Update summary"
 msgstr "/보기(_V)/요약 갱신(_U)"
 
-#: src/mainwindow.c:712 src/messageview.c:247
+#: src/mainwindow.c:712 src/messageview.c:248
 msgid "/_Message"
 msgstr "/메시지(_M)"
 
@@ -3330,16 +3332,16 @@ msgstr "/메시지(_M)/임시 보관된 메시지 발송(_S)"
 
 #: src/mainwindow.c:722 src/mainwindow.c:724 src/mainwindow.c:731
 #: src/mainwindow.c:736 src/mainwindow.c:739 src/mainwindow.c:750
-#: src/mainwindow.c:752 src/mainwindow.c:755 src/messageview.c:250
-#: src/messageview.c:258 src/messageview.c:263
+#: src/mainwindow.c:752 src/mainwindow.c:755 src/messageview.c:251
+#: src/messageview.c:259 src/messageview.c:264
 msgid "/_Message/---"
 msgstr "/메시지(_M)/---"
 
-#: src/mainwindow.c:723 src/messageview.c:248
+#: src/mainwindow.c:723 src/messageview.c:249
 msgid "/_Message/Compose _new message"
 msgstr "/메시지(_M)/새로 만들기(_n)"
 
-#: src/mainwindow.c:725 src/messageview.c:251
+#: src/mainwindow.c:725 src/messageview.c:252
 msgid "/_Message/_Reply"
 msgstr "/메시지(_M)/회신(_R)"
 
@@ -3347,27 +3349,27 @@ msgstr "/메시지(_M)/회신(_R)"
 msgid "/_Message/Repl_y to"
 msgstr "/메시지(_M)/회신(_y)"
 
-#: src/mainwindow.c:727 src/messageview.c:252
+#: src/mainwindow.c:727 src/messageview.c:253
 msgid "/_Message/Repl_y to/_all"
 msgstr "/메시지(_M)/회신(_y)/전체(_a)"
 
-#: src/mainwindow.c:728 src/messageview.c:254
+#: src/mainwindow.c:728 src/messageview.c:255
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/메시지(_M)/회신(_y)/보낸이(_s)"
 
-#: src/mainwindow.c:729 src/messageview.c:256
+#: src/mainwindow.c:729 src/messageview.c:257
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/메시지(_M)/회신(_y)/메일링리스트(_l)"
 
-#: src/mainwindow.c:732 src/messageview.c:259
+#: src/mainwindow.c:732 src/messageview.c:260
 msgid "/_Message/_Forward"
 msgstr "/메시지(_M)/전달(_F)"
 
-#: src/mainwindow.c:733 src/messageview.c:260
+#: src/mainwindow.c:733 src/messageview.c:261
 msgid "/_Message/For_ward as attachment"
 msgstr "/메시지(_M)/첨부파일로 전달(_w)"
 
-#: src/mainwindow.c:735 src/messageview.c:262
+#: src/mainwindow.c:735 src/messageview.c:263
 msgid "/_Message/Redirec_t"
 msgstr "/메시지(_M)/Redirec_t"
 
@@ -3426,7 +3428,7 @@ msgstr "/메시지(_M)/새 메일 받기(_i)"
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/메시지(_M)/새 메일 받기(_i)"
 
-#: src/mainwindow.c:756 src/messageview.c:264
+#: src/mainwindow.c:756 src/messageview.c:265
 msgid "/_Message/Re-_edit"
 msgstr "/메시지(_M)/다시 편집(_e)"
 
@@ -3445,23 +3447,23 @@ msgstr "/도구(_T)/메시지 필터(_F)"
 msgid "/_Tools/Filter _selected messages"
 msgstr "/도구(_T)/메시지 필터(_F)"
 
-#: src/mainwindow.c:767 src/messageview.c:271
+#: src/mainwindow.c:767 src/messageview.c:272
 msgid "/_Tools/_Create filter rule"
 msgstr "/도구(_T)/필터 규칙 생성(_C)"
 
-#: src/mainwindow.c:768 src/messageview.c:273
+#: src/mainwindow.c:768 src/messageview.c:274
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/도구(_T)/필터 규칙 생성(_C)/자동(_A)"
 
-#: src/mainwindow.c:770 src/messageview.c:275
+#: src/mainwindow.c:770 src/messageview.c:276
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/도구(_T)/필터 규칙 생성(_C)/보낸이로(_F)"
 
-#: src/mainwindow.c:772 src/messageview.c:277
+#: src/mainwindow.c:772 src/messageview.c:278
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/도구(_T)/필터 규칙 생성(_C)/받는이로(_T)"
 
-#: src/mainwindow.c:774 src/messageview.c:279
+#: src/mainwindow.c:774 src/messageview.c:280
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/도구(_T)/필터 규칙 생성(_C)/제목으로(_S)"
 
@@ -3582,7 +3584,7 @@ msgid "MainWindow: color allocation %d failed\n"
 msgstr "메인 창: 색 할당 %d 실패\n"
 
 #: src/mainwindow.c:1139 src/summaryview.c:2275 src/summaryview.c:2360
-#: src/summaryview.c:3907 src/summaryview.c:4036 src/summaryview.c:4394
+#: src/summaryview.c:3908 src/summaryview.c:4037 src/summaryview.c:4395
 msgid "done.\n"
 msgstr "마침.\n"
 
@@ -3847,7 +3849,7 @@ msgid "Find text:"
 msgstr "찾을 문자열:"
 
 #: src/message_search.c:153 src/prefs_search_folder.c:253
-#: src/query_search.c:326
+#: src/query_search.c:343
 msgid "Case sensitive"
 msgstr "대소 문자 구별"
 
@@ -3871,27 +3873,27 @@ msgstr "메시지의 끝에 도달했습니다; 시작부분에서 계속할까�
 msgid "Search finished"
 msgstr "찾기가 완료"
 
-#: src/messageview.c:268
+#: src/messageview.c:269
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/도구(_T)/주소록에 보낸이 추가(_k)"
 
-#: src/messageview.c:300
+#: src/messageview.c:301
 msgid "Creating message view...\n"
 msgstr "메시지 뷰를 생성합니다...\n"
 
-#: src/messageview.c:325
+#: src/messageview.c:326
 msgid "Text"
 msgstr "텍스트"
 
-#: src/messageview.c:330
+#: src/messageview.c:331
 msgid "Attachments"
 msgstr "첨부"
 
-#: src/messageview.c:380
+#: src/messageview.c:381
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:699 src/summaryview.c:3436
+#: src/messageview.c:700 src/summaryview.c:3436
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "`%s' 파일을 저장할 수가 없습니다."
@@ -3909,7 +3911,7 @@ msgstr "실행"
 msgid "Print"
 msgstr "인쇄"
 
-#: src/messageview.c:770 src/summaryview.c:3471
+#: src/messageview.c:769 src/summaryview.c:3470
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -4008,11 +4010,11 @@ msgstr ""
 "파일을 열 명령을 입력하세요:\n"
 "(`%s'는 파일이름으로 대체될 것입니다)"
 
-#: src/mimeview.c:1147
+#: src/mimeview.c:1140
 msgid "Opening executable file"
 msgstr ""
 
-#: src/mimeview.c:1148
+#: src/mimeview.c:1141
 msgid ""
 "This is an executable file. Opening executable file is restricted for "
 "security.\n"
@@ -4020,11 +4022,6 @@ msgid ""
 "virus or something like a malicious program."
 msgstr ""
 
-#: src/mimeview.c:1184
-#, c-format
-msgid "MIME viewer command line is invalid: `%s'"
-msgstr "마임 뷰어의 명령행이 부적절합니다: `%s'"
-
 #: src/passphrase.c:96
 msgid "Passphrase"
 msgstr "Passphrase"
@@ -5804,21 +5801,21 @@ msgstr "회신주소:"
 msgid "%s - Edit search condition"
 msgstr ""
 
-#: src/prefs_search_folder.c:209 src/query_search.c:257
+#: src/prefs_search_folder.c:209 src/query_search.c:274
 msgid "Match any of the following"
 msgstr ""
 
-#: src/prefs_search_folder.c:211 src/query_search.c:259
+#: src/prefs_search_folder.c:211 src/query_search.c:276
 #, fuzzy
 msgid "Match all of the following"
 msgstr "다음 주소를 자동적으로 정함"
 
-#: src/prefs_search_folder.c:231 src/query_search.c:303
+#: src/prefs_search_folder.c:231 src/query_search.c:320
 #, fuzzy
 msgid "Folder:"
 msgstr "폴더"
 
-#: src/prefs_search_folder.c:248 src/query_search.c:321
+#: src/prefs_search_folder.c:248 src/query_search.c:338
 #, fuzzy
 msgid "Search subfolders"
 msgstr "찾기 실패"
@@ -5833,17 +5830,17 @@ msgid "Attachment"
 msgstr "첨부"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73 src/query_search.c:371 src/summaryview.c:4901
+#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4902
 msgid "Subject"
 msgstr "제목"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/query_search.c:372 src/summaryview.c:4904
+#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4905
 msgid "From"
 msgstr "보낸 사람"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/query_search.c:373 src/summaryview.c:4906
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:4907
 msgid "Date"
 msgstr "날짜"
 
@@ -5934,43 +5931,43 @@ msgstr "진행 다이얼로그를 생성합니다...\n"
 msgid "Status"
 msgstr "상태"
 
-#: src/query_search.c:234
+#: src/query_search.c:251
 msgid "Search messages"
 msgstr "메시지 찾기"
 
-#: src/query_search.c:395
+#: src/query_search.c:423
 #, fuzzy
 msgid "_Save as search folder"
 msgstr "임시 보관함에 넣기"
 
-#: src/query_search.c:512 src/subscribedialog.c:526 src/summaryview.c:842
+#: src/query_search.c:542 src/subscribedialog.c:526 src/summaryview.c:842
 msgid "Done."
 msgstr "완료."
 
-#: src/query_search.c:536
+#: src/query_search.c:566
 #, fuzzy, c-format
 msgid "Searching %s ..."
 msgstr "%s 폴더를 스캔합니다..."
 
-#: src/query_search.c:564
+#: src/query_search.c:594
 #, fuzzy, c-format
 msgid "Searching %s (%d / %d)..."
 msgstr "필터링..."
 
-#: src/query_search.c:645 src/summaryview.c:2051
+#: src/query_search.c:675 src/summaryview.c:2051
 msgid "(No Date)"
 msgstr "(날짜 없슴)"
 
-#: src/query_search.c:833
+#: src/query_search.c:869
 #, fuzzy
 msgid "Save as search folder"
 msgstr "임시 보관함에 넣기"
 
-#: src/query_search.c:854
+#: src/query_search.c:890
 msgid "Location:"
 msgstr ""
 
-#: src/query_search.c:869
+#: src/query_search.c:905
 #, fuzzy
 msgid "Folder name:"
 msgstr "파일 이름"
@@ -6599,38 +6596,38 @@ msgstr ""
 msgid "Destination for copy is same as current folder."
 msgstr "복사할 대상이 현재 폴더와 같습니다."
 
-#: src/summaryview.c:3506
+#: src/summaryview.c:3507
 #, fuzzy
 msgid "Error occurred while processing messages."
 msgstr "메일을 처리하는 도중 에러"
 
-#: src/summaryview.c:3814 src/summaryview.c:3815
+#: src/summaryview.c:3815 src/summaryview.c:3816
 msgid "Building threads..."
 msgstr "쓰레드를 만듭니다..."
 
-#: src/summaryview.c:3965 src/summaryview.c:3966
+#: src/summaryview.c:3966 src/summaryview.c:3967
 msgid "Unthreading..."
 msgstr "쓰레드를 없앱니다..."
 
-#: src/summaryview.c:4259 src/summaryview.c:4315
+#: src/summaryview.c:4260 src/summaryview.c:4316
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "필터링..."
 
-#: src/summaryview.c:4364
+#: src/summaryview.c:4365
 msgid "filtering..."
 msgstr "필터링..."
 
-#: src/summaryview.c:4365
+#: src/summaryview.c:4366
 msgid "Filtering..."
 msgstr "필터링..."
 
-#: src/summaryview.c:4401
+#: src/summaryview.c:4402
 #, fuzzy, c-format
 msgid "%d message(s) have been filtered."
 msgstr "메시지 %d는 이미 캐쉬되었습니다.\n"
 
-#: src/summaryview.c:4910
+#: src/summaryview.c:4911
 msgid "No."
 msgstr "번호"
 
@@ -6720,6 +6717,9 @@ msgstr "끝내기"
 msgid "Sylpheed"
 msgstr "예전 Sylpheed"
 
+#~ msgid "MIME viewer command line is invalid: `%s'"
+#~ msgstr "마임 뷰어의 명령행이 부적절합니다: `%s'"
+
 #~ msgid "Wrap before sending"
 #~ msgstr "보내기 전에 줄 바꿈"
 
diff --git a/po/lt.po b/po/lt.po
index 9d983abb..8267ba46 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-03-02 19:03+0900\n"
+"POT-Creation-Date: 2006-03-10 16:06+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"
@@ -505,7 +505,7 @@ msgstr "Rasta %s\n"
 msgid "Configuration is saved.\n"
 msgstr "Nustatymai išsaugoti.\n"
 
-#: libsylph/prefs_common.c:491
+#: libsylph/prefs_common.c:496
 msgid "Junk mail filter"
 msgstr "Nereikalingo pašto filtras"
 
@@ -522,7 +522,7 @@ msgstr "negali atidaryti žymų bylos\n"
 msgid "can't fetch message %d\n"
 msgstr "negaliu gauti laiško %d\n"
 
-#: libsylph/procmsg.c:1375
+#: libsylph/procmsg.c:1378
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Bloga spausdinimo komanda: „%s“\n"
@@ -600,12 +600,12 @@ msgstr "  Tema: %s\n"
 msgid "  Issuer: %s\n"
 msgstr "  Leidėjas: %s\n"
 
-#: libsylph/utils.c:2411 src/compose.c:2869 src/compose.c:3132
-#: src/compose.c:3195 src/compose.c:3315
+#: libsylph/utils.c:2430 src/compose.c:2888 src/compose.c:3151
+#: src/compose.c:3214 src/compose.c:3334
 msgid "can't change file mode\n"
 msgstr "negaliu pakeisti bylos rėžimo\n"
 
-#: libsylph/utils.c:2418 libsylph/utils.c:2542
+#: libsylph/utils.c:2437 libsylph/utils.c:2561
 #, c-format
 msgid "writing to %s failed.\n"
 msgstr "nepavyko įrašyti į „%s“.\n"
@@ -687,8 +687,8 @@ msgstr ""
 "Nauji laiškai bus tikrinami šia tvarka. Pažymėkite laukelį\n"
 "skulpelyje „G“ jei norite gauti laiškus pasirinkę „Gauti visus“."
 
-#: src/account_dialog.c:366 src/addressadd.c:192 src/addressbook.c:493
-#: src/compose.c:4273 src/editaddress.c:200 src/editaddress.c:942
+#: src/account_dialog.c:366 src/addressadd.c:192 src/addressbook.c:491
+#: src/compose.c:4292 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
@@ -824,12 +824,12 @@ msgstr "Vartotojo veiksmo argumentas"
 msgid "Add Address to Book"
 msgstr "Įdėti adresą į knygą"
 
-#: src/addressadd.c:202 src/compose.c:4777 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4796 src/editaddress.c:201
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "Adresas"
 
-#: src/addressadd.c:212 src/addressbook.c:495 src/editaddress.c:202
+#: src/addressadd.c:212 src/addressbook.c:493 src/editaddress.c:202
 #: src/editaddress.c:795 src/editaddress.c:860 src/editgroup.c:267
 msgid "Remarks"
 msgstr "Pastabos"
@@ -838,110 +838,111 @@ msgstr "Pastabos"
 msgid "Select Address Book Folder"
 msgstr "Pažymėkite adresų knygos katalogą"
 
-#: src/addressbook.c:338 src/compose.c:515 src/mainwindow.c:489
+#: src/addressbook.c:337 src/compose.c:515 src/mainwindow.c:489
 #: src/messageview.c:140
 msgid "/_File"
 msgstr "/_Byla"
 
-#: src/addressbook.c:339
+#: src/addressbook.c:338
 msgid "/_File/New _Book"
 msgstr "/_Byla/Nauja _Knyga"
 
-#: src/addressbook.c:340
+#: src/addressbook.c:339
 msgid "/_File/New _vCard"
 msgstr "/_Byla/Nauja „_vCard“ kortelė"
 
-#: src/addressbook.c:342
+#: src/addressbook.c:341
 msgid "/_File/New _JPilot"
 msgstr "/_Byla/Naujas _JPilot"
 
-#: src/addressbook.c:345
-msgid "/_File/New _Server"
+#: src/addressbook.c:344
+#, fuzzy
+msgid "/_File/New _LDAP Server"
 msgstr "/_Byla/Naujas _serveris"
 
-#: src/addressbook.c:347 src/addressbook.c:350 src/compose.c:520
+#: src/addressbook.c:346 src/addressbook.c:349 src/compose.c:520
 #: src/compose.c:525 src/compose.c:528 src/compose.c:531 src/mainwindow.c:507
 #: src/mainwindow.c:510 src/mainwindow.c:512 src/mainwindow.c:515
 #: src/mainwindow.c:517 src/messageview.c:143
 msgid "/_File/---"
 msgstr "/_Byla/---"
 
-#: src/addressbook.c:348
+#: src/addressbook.c:347
 msgid "/_File/_Edit"
 msgstr "/_Byla/_Taisyti"
 
-#: src/addressbook.c:349
+#: src/addressbook.c:348
 msgid "/_File/_Delete"
 msgstr "/_Byla/Išt_rinti"
 
-#: src/addressbook.c:351
+#: src/addressbook.c:350
 msgid "/_File/_Save"
 msgstr "/_Byla/Iš_saugoti"
 
-#: src/addressbook.c:352 src/compose.c:532 src/messageview.c:144
+#: src/addressbook.c:351 src/compose.c:532 src/messageview.c:144
 msgid "/_File/_Close"
 msgstr "/_Byla/_Užverti"
 
-#: src/addressbook.c:353
+#: src/addressbook.c:352
 msgid "/_Address"
 msgstr "/_Adresas"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:353
 msgid "/_Address/New _Address"
 msgstr "/_Adresas/Naujas _adresas"
 
-#: src/addressbook.c:355
+#: src/addressbook.c:354
 msgid "/_Address/New _Group"
 msgstr "/_Adresas/Nauja _grupė"
 
-#: src/addressbook.c:356
+#: src/addressbook.c:355
 msgid "/_Address/New _Folder"
 msgstr "/_Adresas/Naujas _katalogas"
 
-#: src/addressbook.c:357
+#: src/addressbook.c:356
 msgid "/_Address/---"
 msgstr "/_Adresas/---"
 
-#: src/addressbook.c:358
+#: src/addressbook.c:357
 msgid "/_Address/_Edit"
 msgstr "/_Adresas/_Redaguoti"
 
-#: src/addressbook.c:359
+#: src/addressbook.c:358
 msgid "/_Address/_Delete"
 msgstr "/_Adresas/Išt_rinti"
 
-#: src/addressbook.c:360 src/compose.c:645 src/mainwindow.c:758
-#: src/messageview.c:266
+#: src/addressbook.c:359 src/compose.c:645 src/mainwindow.c:758
+#: src/messageview.c:267
 msgid "/_Tools"
 msgstr "/Į_rankiai"
 
-#: src/addressbook.c:361
+#: src/addressbook.c:360
 msgid "/_Tools/Import _LDIF file"
 msgstr "/Į_rankiai/Importuoti _LDIF bylą"
 
-#: src/addressbook.c:362 src/compose.c:666 src/mainwindow.c:812
-#: src/messageview.c:286
+#: src/addressbook.c:361 src/compose.c:666 src/mainwindow.c:812
+#: src/messageview.c:287
 msgid "/_Help"
 msgstr "/_Pagalba"
 
-#: src/addressbook.c:363 src/compose.c:667 src/mainwindow.c:824
-#: src/messageview.c:287
+#: src/addressbook.c:362 src/compose.c:667 src/mainwindow.c:824
+#: src/messageview.c:288
 msgid "/_Help/_About"
 msgstr "/_Pagalba/_Apie"
 
-#: src/addressbook.c:382 src/addressbook.c:392
+#: src/addressbook.c:381 src/addressbook.c:391
 msgid "/New _Address"
 msgstr "/Naujas _adresas"
 
-#: src/addressbook.c:383 src/addressbook.c:393
+#: src/addressbook.c:382 src/addressbook.c:392
 msgid "/New _Group"
 msgstr "/Nauja _grupė"
 
-#: src/addressbook.c:384 src/addressbook.c:394
+#: src/addressbook.c:383 src/addressbook.c:393
 msgid "/New _Folder"
 msgstr "/Naujas _katalogas"
 
-#: src/addressbook.c:385 src/addressbook.c:395 src/compose.c:509
+#: src/addressbook.c:384 src/addressbook.c:394 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
@@ -951,70 +952,70 @@ msgstr "/Naujas _katalogas"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:386 src/addressbook.c:396 src/compose.c:534
+#: src/addressbook.c:385 src/addressbook.c:395 src/compose.c:534
 #: src/mainwindow.c:521 src/messageview.c:146
 msgid "/_Edit"
 msgstr "/_Taisyti"
 
-#: src/addressbook.c:387 src/addressbook.c:397 src/summaryview.c:434
+#: src/addressbook.c:386 src/addressbook.c:396 src/summaryview.c:434
 msgid "/_Delete"
 msgstr "/_Ištrinti"
 
-#: src/addressbook.c:494
+#: src/addressbook.c:492
 msgid "E-Mail address"
 msgstr "El. pašto adresas"
 
-#: src/addressbook.c:498 src/compose.c:4778 src/prefs_common_dialog.c:2183
+#: src/addressbook.c:496 src/compose.c:4797 src/prefs_common_dialog.c:2183
 msgid "Address book"
 msgstr "Adresų knyga"
 
-#: src/addressbook.c:600 src/prefs_filter_edit.c:249
+#: src/addressbook.c:603 src/prefs_filter_edit.c:249
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "Vardas:"
 
 #. Buttons
-#: src/addressbook.c:632 src/addressbook.c:1684 src/editaddress.c:884
+#: src/addressbook.c:636 src/addressbook.c:1678 src/editaddress.c:884
 #: src/editaddress.c:1017 src/mainwindow.c:2426 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:635 src/editaddress.c:890 src/editaddress.c:1023
+#: src/addressbook.c:639 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:1552
 msgid "Add"
 msgstr "Pridėti"
 
-#: src/addressbook.c:638
+#: src/addressbook.c:642
 msgid "Lookup"
 msgstr "Ieškoti"
 
-#: src/addressbook.c:650 src/headerview.c:55 src/prefs_folder_item.c:339
+#: src/addressbook.c:654 src/headerview.c:55 src/prefs_folder_item.c:339
 #: src/prefs_template.c:176
 msgid "To:"
 msgstr "Kam:"
 
-#: src/addressbook.c:654 src/prefs_folder_item.c:356 src/prefs_template.c:178
+#: src/addressbook.c:658 src/prefs_folder_item.c:356 src/prefs_template.c:178
 msgid "Cc:"
 msgstr "Kopija:"
 
-#: src/addressbook.c:658 src/prefs_folder_item.c:367
+#: src/addressbook.c:662 src/prefs_folder_item.c:367
 msgid "Bcc:"
 msgstr "Slapta kopija:"
 
 #. Confirm deletion
-#: src/addressbook.c:845
+#: src/addressbook.c:832
 msgid "Delete address(es)"
 msgstr "Pašalinti adresą(-us)"
 
-#: src/addressbook.c:846
+#: src/addressbook.c:833
 msgid "Really delete the address(es)?"
 msgstr "Ar tikrai pašalinti adresą(-us)?"
 
-#: src/addressbook.c:1675
+#: src/addressbook.c:1669
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1023,36 +1024,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:1678 src/folderview.c:2372
+#: src/addressbook.c:1672 src/folderview.c:2372
 msgid "Delete folder"
 msgstr "Ištrinti katalogą"
 
-#: src/addressbook.c:1678
+#: src/addressbook.c:1672
 msgid "_Folder only"
 msgstr "Tik _katalogą"
 
-#: src/addressbook.c:1678
+#: src/addressbook.c:1672
 msgid "Folder and _addresses"
 msgstr "Katalogą ir _adresus jame"
 
-#: src/addressbook.c:1683
+#: src/addressbook.c:1677
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Tikrai pašalinti „%s“?"
 
-#: src/addressbook.c:2369 src/addressbook.c:2502
+#: src/addressbook.c:2363 src/addressbook.c:2496
 msgid "New user, could not save index file."
 msgstr "Naujas vartotojas, negaliu išsaugoti „index“ bylos."
 
-#: src/addressbook.c:2373 src/addressbook.c:2506
+#: src/addressbook.c:2367 src/addressbook.c:2500
 msgid "New user, could not save address book files."
 msgstr "Naujas vartotojas, negaliu išsaugoti adresų knygos bylų."
 
-#: src/addressbook.c:2383 src/addressbook.c:2516
+#: src/addressbook.c:2377 src/addressbook.c:2510
 msgid "Old address book converted successfully."
 msgstr "Adresų knyga sėkmingai konvertuota"
 
-#: src/addressbook.c:2388
+#: src/addressbook.c:2382
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1060,7 +1061,7 @@ msgstr ""
 "Sena adresų knyga konvertuota,\n"
 "negaliu išsaugoti naujo adresų indekso bylos"
 
-#: src/addressbook.c:2401
+#: src/addressbook.c:2395
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1068,7 +1069,7 @@ msgstr ""
 "Negaliu konvertuoti adresų knygos,\n"
 "bet sukūriau tuščias naujos knygos bylas."
 
-#: src/addressbook.c:2407
+#: src/addressbook.c:2401
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1076,7 +1077,7 @@ msgstr ""
 "Negaliu konvertuoti adresų knygos,\n"
 "negaliu sukurti naujos knygos bylų."
 
-#: src/addressbook.c:2412
+#: src/addressbook.c:2406
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1084,87 +1085,87 @@ msgstr ""
 "Negaliu konvertuoti adresų knygos,\n"
 "ir negaliu sukurti naujos knygos bylų."
 
-#: src/addressbook.c:2419
+#: src/addressbook.c:2413
 msgid "Addressbook conversion error"
 msgstr "Adresų knygos konvertavimo klaida"
 
-#: src/addressbook.c:2423
+#: src/addressbook.c:2417
 msgid "Addressbook conversion"
 msgstr "Adresų knygos konvertavimas"
 
-#: src/addressbook.c:2458
+#: src/addressbook.c:2452
 msgid "Addressbook Error"
 msgstr "Adresų knygos klaida"
 
-#: src/addressbook.c:2459 src/addressbook.c:2559
+#: src/addressbook.c:2453 src/addressbook.c:2553
 msgid "Could not read address index"
 msgstr "Negaliu perskaityti adresų indekso"
 
-#: src/addressbook.c:2521
+#: src/addressbook.c:2515
 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:2535
+#: src/addressbook.c:2529
 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:2541
+#: src/addressbook.c:2535
 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:2547
+#: src/addressbook.c:2541
 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:2565
+#: src/addressbook.c:2559
 msgid "Addressbook Conversion Error"
 msgstr "Adresų knygos konvertavimo klaida"
 
-#: src/addressbook.c:2571
+#: src/addressbook.c:2565
 msgid "Addressbook Conversion"
 msgstr "Adresų knygos konvertavimas"
 
-#: src/addressbook.c:3086 src/prefs_common_dialog.c:2033
+#: src/addressbook.c:3080 src/prefs_common_dialog.c:2033
 msgid "Interface"
 msgstr "Sąsaja"
 
-#: src/addressbook.c:3102 src/importldif.c:514
+#: src/addressbook.c:3096 src/importldif.c:514
 msgid "Address Book"
 msgstr "Adresų knyga"
 
-#: src/addressbook.c:3118
+#: src/addressbook.c:3112
 msgid "Person"
 msgstr "Asmuo"
 
-#: src/addressbook.c:3134
+#: src/addressbook.c:3128
 msgid "EMail Address"
 msgstr "El. pašto adresas"
 
-#: src/addressbook.c:3150
+#: src/addressbook.c:3144
 msgid "Group"
 msgstr "Grupė"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3166 src/folderview.c:367 src/prefs_account_dialog.c:1694
-#: src/query_search.c:370
+#: src/addressbook.c:3160 src/folderview.c:367 src/prefs_account_dialog.c:1694
+#: src/query_search.c:398
 msgid "Folder"
 msgstr "Katalogas"
 
-#: src/addressbook.c:3182
+#: src/addressbook.c:3176
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3198 src/addressbook.c:3214
+#: src/addressbook.c:3192 src/addressbook.c:3208
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3230
+#: src/addressbook.c:3224
 msgid "LDAP Server"
 msgstr "LDAP serveris"
 
@@ -1176,7 +1177,7 @@ msgstr "Bendras adresas"
 msgid "Personal address"
 msgstr "Asmeninis adresas"
 
-#: src/alertpanel.c:142 src/compose.c:5500 src/main.c:621
+#: src/alertpanel.c:142 src/compose.c:5517 src/main.c:621
 msgid "Notice"
 msgstr "Pranešimas"
 
@@ -1184,7 +1185,7 @@ msgstr "Pranešimas"
 msgid "Warning"
 msgstr "Įspėjimas"
 
-#: src/alertpanel.c:168 src/inc.c:587
+#: src/alertpanel.c:168 src/inc.c:586
 msgid "Error"
 msgstr "Klaida"
 
@@ -1227,7 +1228,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:4761
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4762
 msgid "None"
 msgstr "Nieko"
 
@@ -1473,7 +1474,7 @@ msgstr "/_Rodyti/Simbolių ko_duotė/Tailandiečių (TIS-620)"
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Rodyti/Simbolių ko_duotė/Tailandiečių (Windows-874)"
 
-#: src/compose.c:646 src/mainwindow.c:759 src/messageview.c:267
+#: src/compose.c:646 src/mainwindow.c:759 src/messageview.c:268
 msgid "/_Tools/_Address book"
 msgstr "/Į_rankiai/_Adresų knyga"
 
@@ -1481,14 +1482,14 @@ msgstr "/Į_rankiai/_Adresų knyga"
 msgid "/_Tools/_Template"
 msgstr "/Į_rankiai/_Šablonas"
 
-#: src/compose.c:649 src/mainwindow.c:783 src/messageview.c:283
+#: src/compose.c:649 src/mainwindow.c:783 src/messageview.c:284
 msgid "/_Tools/Actio_ns"
 msgstr "/Į_rankiai/_Veiksmai"
 
 #: src/compose.c:651 src/compose.c:655 src/compose.c:661 src/mainwindow.c:762
 #: src/mainwindow.c:776 src/mainwindow.c:781 src/mainwindow.c:784
-#: src/mainwindow.c:788 src/mainwindow.c:790 src/messageview.c:270
-#: src/messageview.c:282
+#: src/mainwindow.c:788 src/mainwindow.c:790 src/messageview.c:271
+#: src/messageview.c:283
 msgid "/_Tools/---"
 msgstr "/Į_rankiai/---"
 
@@ -1512,79 +1513,79 @@ msgstr "/Į_rankiai/_Tikrinti rašybą"
 msgid "/_Tools/_Set spell language"
 msgstr "/Į_rankiai/_Nustatyti kalbą"
 
-#: src/compose.c:910
+#: src/compose.c:912
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: byla neegzistuoja\n"
 
-#: src/compose.c:1014 src/compose.c:1085
+#: src/compose.c:1016 src/compose.c:1087
 msgid "Can't get text part\n"
 msgstr "Negaliu gauti dalies teksto\n"
 
-#: src/compose.c:1486
+#: src/compose.c:1488
 msgid "Quote mark format error."
 msgstr "Formato klaida."
 
-#: src/compose.c:1498
+#: src/compose.c:1500
 msgid "Message reply/forward format error."
 msgstr "Atsakymo/persiuntimo formato klaida."
 
-#: src/compose.c:1918
+#: src/compose.c:1935
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Byla %s neegzistuoja\n"
 
-#: src/compose.c:1922
+#: src/compose.c:1939
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Negaliu gauti bylos „%s“ dydžio\n"
 
-#: src/compose.c:1926
+#: src/compose.c:1943
 #, c-format
 msgid "File %s is empty."
 msgstr "Byla %s yra tuščia"
 
-#: src/compose.c:1930
+#: src/compose.c:1947
 #, c-format
 msgid "Can't read %s."
 msgstr "Negaliu perskaityti %s."
 
-#: src/compose.c:1963
+#: src/compose.c:1980
 #, c-format
 msgid "Message: %s"
 msgstr "Laiškas: %s"
 
-#: src/compose.c:2023 src/mimeview.c:565
+#: src/compose.c:2040 src/mimeview.c:565
 msgid "Can't get the part of multipart message."
 msgstr "Negaliu gauti sudėtinės laiško dalies"
 
-#: src/compose.c:2507 src/headerview.c:195 src/query_search.c:636
+#: src/compose.c:2524 src/headerview.c:195 src/query_search.c:666
 #: src/summaryview.c:2124
 msgid "(No Subject)"
 msgstr "(Nėra temos)"
 
-#: src/compose.c:2510
+#: src/compose.c:2527
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Rašyti laišką%s"
 
-#: src/compose.c:2623
+#: src/compose.c:2642
 msgid "Recipient is not specified."
 msgstr "Nenurodytas gavėjas."
 
-#: src/compose.c:2631
+#: src/compose.c:2650
 msgid "Empty subject"
 msgstr "Nėra temos"
 
-#: src/compose.c:2632
+#: src/compose.c:2651
 msgid "Subject is empty. Send it anyway?"
 msgstr "Nenurodyta laiško tema (subject). Siųsti?"
 
-#: src/compose.c:2691
+#: src/compose.c:2710
 msgid "can't get recipient list."
 msgstr "Negaliu gauti gavėjų sąrašo."
 
-#: src/compose.c:2711
+#: src/compose.c:2730
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1592,21 +1593,21 @@ msgstr ""
 "Nenurodyta sąskaita pašto siuntimui.\n"
 "Prieš siųsdami pažymėkitę norimą sąskaitą."
 
-#: src/compose.c:2725 src/send_message.c:299
+#: src/compose.c:2744 src/send_message.c:299
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Klaida siunčiant laišką %s ."
 
-#: src/compose.c:2767
+#: src/compose.c:2786
 msgid "Can't save the message to outbox."
 msgstr "Negaliu išsaugoti laiško „outbox“."
 
-#: src/compose.c:2805
+#: src/compose.c:2824
 #, 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:2902
+#: src/compose.c:2921
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1617,11 +1618,11 @@ msgstr ""
 "\n"
 "Ar siųsti kaip %s?"
 
-#: src/compose.c:2908
+#: src/compose.c:2927
 msgid "Code conversion error"
 msgstr "Kodo konvertavimo klaida"
 
-#: src/compose.c:2981
+#: src/compose.c:3000
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1634,156 +1635,156 @@ msgstr ""
 "\n"
 "Ar tikrai norite ją išsiųsti?"
 
-#: src/compose.c:2985
+#: src/compose.c:3004
 msgid "Line length limit"
 msgstr "Eilutės ilgio limitas"
 
-#: src/compose.c:3275
+#: src/compose.c:3294
 msgid "can't remove the old message\n"
 msgstr "Negaliu pašalinti seno laiško\n"
 
-#: src/compose.c:3293
+#: src/compose.c:3312
 msgid "queueing message...\n"
 msgstr "Laiškas dedamas į eilę...\n"
 
-#: src/compose.c:3375
+#: src/compose.c:3394
 msgid "can't find queue folder\n"
 msgstr "Negaliu rasti eilės (queue) katalogo\n"
 
-#: src/compose.c:3382
+#: src/compose.c:3401
 msgid "can't queue the message\n"
 msgstr "Negaliu įdėti laiško į eilę\n"
 
-#: src/compose.c:3975
+#: src/compose.c:3994
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "sugeneruotas Message-ID: %s\n"
 
-#: src/compose.c:4088
+#: src/compose.c:4107
 msgid "Creating compose window...\n"
 msgstr "Sukuriamas laiško kūrimo langas...\n"
 
-#: src/compose.c:4139 src/headerview.c:54
+#: src/compose.c:4158 src/headerview.c:54
 msgid "From:"
 msgstr "Nuo:"
 
-#: src/compose.c:4213
+#: src/compose.c:4232
 msgid "PGP Sign"
 msgstr "PGP parašas"
 
-#: src/compose.c:4216
+#: src/compose.c:4235
 msgid "PGP Encrypt"
 msgstr "PGP šifravimas"
 
-#: src/compose.c:4254 src/compose.c:5332
+#: src/compose.c:4273 src/compose.c:5351
 msgid "MIME type"
 msgstr "MIME tipas"
 
 #. S_COL_DATE
-#: src/compose.c:4263 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4908
+#: src/compose.c:4282 src/mimeview.c:197 src/prefs_filter_edit.c:496
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4909
 msgid "Size"
 msgstr "Dydis"
 
-#: src/compose.c:4698 src/mainwindow.c:2359 src/prefs_account_dialog.c:528
+#: src/compose.c:4717 src/mainwindow.c:2359 src/prefs_account_dialog.c:528
 #: src/prefs_common_dialog.c:661
 msgid "Send"
 msgstr "Siųsti"
 
-#: src/compose.c:4699
+#: src/compose.c:4718
 msgid "Send message"
 msgstr "Siųsti laišką"
 
-#: src/compose.c:4707
+#: src/compose.c:4726
 msgid "Send later"
 msgstr "Siųsti vėliau"
 
-#: src/compose.c:4708
+#: src/compose.c:4727
 msgid "Put into queue folder and send later"
 msgstr "Įdėti į eilę ir siųsti vėliau"
 
-#: src/compose.c:4716
+#: src/compose.c:4735
 msgid "Draft"
 msgstr "Juodraštis"
 
-#: src/compose.c:4717
+#: src/compose.c:4736
 msgid "Save to draft folder"
 msgstr "Išsaugoti į juodraščių katalogą"
 
-#: src/compose.c:4727
+#: src/compose.c:4746
 msgid "Insert"
 msgstr "Įterpti"
 
-#: src/compose.c:4728
+#: src/compose.c:4747
 msgid "Insert file"
 msgstr "Įterpti bylą"
 
-#: src/compose.c:4736
+#: src/compose.c:4755
 msgid "Attach"
 msgstr "Prisegti"
 
-#: src/compose.c:4737
+#: src/compose.c:4756
 msgid "Attach file"
 msgstr "Prisegti bylą"
 
 #. signature
-#: src/compose.c:4747 src/prefs_account_dialog.c:1208
+#: src/compose.c:4766 src/prefs_account_dialog.c:1208
 #: src/prefs_common_dialog.c:953
 msgid "Signature"
 msgstr "Parašas"
 
-#: src/compose.c:4748
+#: src/compose.c:4767
 msgid "Append signature"
 msgstr "Pridėti parašą"
 
 #. editor
-#: src/compose.c:4757 src/prefs_common_dialog.c:991
+#: src/compose.c:4776 src/prefs_common_dialog.c:991
 #: src/prefs_common_dialog.c:2315
 msgid "Editor"
 msgstr "Redaktorius"
 
-#: src/compose.c:4758
+#: src/compose.c:4777
 msgid "Edit with external editor"
 msgstr "Naudoti išorinį redaktorių"
 
-#: src/compose.c:4766
+#: src/compose.c:4785
 msgid "Linewrap"
 msgstr "Eilučių laužymas"
 
-#: src/compose.c:4767
+#: src/compose.c:4786
 msgid "Wrap all long lines"
 msgstr "Laužyti ilgas eilutes"
 
-#: src/compose.c:5228
+#: src/compose.c:5247
 msgid "Invalid MIME type."
 msgstr "Neteisingas MIME tipas"
 
-#: src/compose.c:5246
+#: src/compose.c:5265
 msgid "File doesn't exist or is empty."
 msgstr "Byla neegzistuoja arba yra tuščia."
 
-#: src/compose.c:5314
+#: src/compose.c:5333
 msgid "Properties"
 msgstr "Savybės"
 
-#: src/compose.c:5334 src/prefs_common_dialog.c:1444
+#: src/compose.c:5353 src/prefs_common_dialog.c:1444
 msgid "Encoding"
 msgstr "Koduotė"
 
-#: src/compose.c:5357 src/prefs_folder_item.c:202
+#: src/compose.c:5376 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Kelias"
 
-#: src/compose.c:5358
+#: src/compose.c:5377
 msgid "File name"
 msgstr "Bylos vardas"
 
-#: src/compose.c:5449
+#: src/compose.c:5466
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Neteisinga išorinio redaktoriaus komanda: „%s“\n"
 
-#: src/compose.c:5497
+#: src/compose.c:5514
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1792,44 +1793,44 @@ msgstr ""
 "Išorinis redaktorius vis dar veikia.\n"
 "Nutraukti procesą? (pid: %d)\n"
 
-#: src/compose.c:5872 src/compose.c:5877 src/compose.c:5883
+#: src/compose.c:5889 src/compose.c:5894 src/compose.c:5900
 msgid "Can't queue the message."
 msgstr "Negaliu įdėti laiško į eilę."
 
-#: src/compose.c:5974
+#: src/compose.c:5991
 msgid "Select files"
 msgstr "Žymėti bylas"
 
-#: src/compose.c:5997
+#: src/compose.c:6014
 msgid "Select file"
 msgstr "Žymėti bylą"
 
-#: src/compose.c:6032
+#: src/compose.c:6049
 msgid "Save message"
 msgstr "Išsaugoti laišką"
 
-#: src/compose.c:6033
+#: src/compose.c:6050
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Laiškas buvo redaguotas. Saugoti „Juodraščiuose“?"
 
-#: src/compose.c:6035
+#: src/compose.c:6052
 msgid "Close _without saving"
 msgstr "Uždaryti _neišsaugant"
 
-#: src/compose.c:6077
+#: src/compose.c:6094
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Ar norite naudoti šabloną „%s“?"
 
-#: src/compose.c:6079
+#: src/compose.c:6096
 msgid "Apply template"
 msgstr "Naudoti šabloną"
 
-#: src/compose.c:6080
+#: src/compose.c:6097
 msgid "_Replace"
 msgstr "_Pakeisti"
 
-#: src/compose.c:6080
+#: src/compose.c:6097
 msgid "_Insert"
 msgstr "Įterpt_i"
 
@@ -1950,52 +1951,52 @@ msgstr "Turi būti nurodytas grupės pavadinimas"
 msgid "Edit Group Data"
 msgstr "Redaguoti grupės duomenis"
 
-#: src/editgroup.c:300
+#: src/editgroup.c:299
 msgid "Group Name"
 msgstr "Grupės pavadinimas"
 
-#: src/editgroup.c:319
+#: src/editgroup.c:318
 msgid "Addresses in Group"
 msgstr "Adresai grupėje"
 
-#: src/editgroup.c:321
+#: src/editgroup.c:320
 msgid " -> "
 msgstr " -> "
 
-#: src/editgroup.c:348
+#: src/editgroup.c:347
 msgid " <- "
 msgstr " <- "
 
-#: src/editgroup.c:350
+#: src/editgroup.c:349
 msgid "Available Addresses"
 msgstr "Prieinami adresai"
 
-#: src/editgroup.c:416
+#: src/editgroup.c:415
 msgid "Move E-Mail Addresses to or from Group with arrow buttons"
 msgstr "Perkelkite adresus iš vienos grupės į kitą rodyklėmis"
 
-#: src/editgroup.c:468
+#: src/editgroup.c:467
 msgid "Edit Group Details"
 msgstr "Redaguoti grupės detales"
 
-#: src/editgroup.c:471
+#: src/editgroup.c:470
 msgid "Add New Group"
 msgstr "Pridėti naują grupę"
 
-#: src/editgroup.c:522
+#: src/editgroup.c:521
 msgid "Edit folder"
 msgstr "Redaguoti katalogą"
 
-#: src/editgroup.c:522
+#: src/editgroup.c:521
 msgid "Input the new name of folder:"
 msgstr "Įveskite katalogo pavadinimą:"
 
-#: src/editgroup.c:525 src/foldersel.c:541 src/folderview.c:2121
+#: src/editgroup.c:524 src/foldersel.c:541 src/folderview.c:2121
 #: src/folderview.c:2127
 msgid "New folder"
 msgstr "Naujas katalogas"
 
-#: src/editgroup.c:526 src/foldersel.c:542 src/folderview.c:2128
+#: src/editgroup.c:525 src/foldersel.c:542 src/folderview.c:2128
 msgid "Input the name of new folder:"
 msgstr "Įveskite naujo katalogo pavadinimą:"
 
@@ -2192,7 +2193,7 @@ msgid "`%c' can't be included in folder name."
 msgstr "„%c“ negali būti katalogo pavadinime."
 
 #: src/foldersel.c:561 src/folderview.c:2147 src/folderview.c:2206
-#: src/query_search.c:995
+#: src/query_search.c:1031
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Katalogas „%s“ egzistuoja."
@@ -2449,7 +2450,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:2127
+#: src/headerview.c:180 src/query_search.c:667 src/summaryview.c:2127
 msgid "(No From)"
 msgstr "(Nėra gavėjo)"
 
@@ -2579,133 +2580,133 @@ msgstr "Baigti"
 msgid "Sylpheed: %d new messages"
 msgstr "Sylpheed: %d nauji laiškai"
 
-#: src/inc.c:372
+#: src/inc.c:371
 msgid "Retrieving new messages"
 msgstr "Gaunami nauji laiškai"
 
-#: src/inc.c:415
+#: src/inc.c:414
 msgid "Standby"
 msgstr "Laukiama"
 
-#: src/inc.c:544 src/inc.c:593
+#: src/inc.c:543 src/inc.c:592
 msgid "Cancelled"
 msgstr "Nutraukta"
 
-#: src/inc.c:555
+#: src/inc.c:554
 msgid "Retrieving"
 msgstr "Gaunama"
 
-#: src/inc.c:564
+#: src/inc.c:563
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "Atlikta (gauta laiškų: %d (%s))"
 
-#: src/inc.c:568
+#: src/inc.c:567
 msgid "Done (no new messages)"
 msgstr "Atlikta (naujų laiškų negauta)"
 
-#: src/inc.c:574
+#: src/inc.c:573
 msgid "Connection failed"
 msgstr "Nepavyko prisijungti"
 
-#: src/inc.c:577
+#: src/inc.c:576
 msgid "Auth failed"
 msgstr "Nepavyko patvirtinti autentiškumo"
 
-#: src/inc.c:580
+#: src/inc.c:579
 msgid "Locked"
 msgstr "Užrakinta"
 
-#: src/inc.c:590
+#: src/inc.c:589
 msgid "Timeout"
 msgstr "Baigėsi skirtasis laikas"
 
-#: src/inc.c:640
+#: src/inc.c:639
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Baigta (Nauji laiškai: %d)"
 
-#: src/inc.c:643
+#: src/inc.c:642
 msgid "Finished (no new messages)"
 msgstr "Baigta (Nėra naujų laiškų: %d)"
 
-#: src/inc.c:652
+#: src/inc.c:651
 msgid "Some errors occurred while getting mail."
 msgstr "Klaidos gaunant paštą."
 
-#: src/inc.c:688
+#: src/inc.c:687
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "gaunami „%s“ sąskaitos laiškai...\n"
 
-#: src/inc.c:691
+#: src/inc.c:690
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: gaunami nauji laiškai"
 
-#: src/inc.c:710
+#: src/inc.c:709
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Jungiuosi prie POP3 serverio: %s..."
 
-#: src/inc.c:719
+#: src/inc.c:718
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Negaliu prisijungti prie POP3 serverio: %s:%d\n"
 
-#: src/inc.c:798 src/send_message.c:631
+#: src/inc.c:797 src/send_message.c:631
 msgid "Authenticating..."
 msgstr "Patvirtinamas autentiškumas..."
 
-#: src/inc.c:799
+#: src/inc.c:798
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Gaunami laiškai iš %s..."
 
-#: src/inc.c:804
+#: src/inc.c:803
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Gaunamas naujų laiškų skaičius (STAT)..."
 
-#: src/inc.c:808
+#: src/inc.c:807
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Gaunamas naujų laiškų skaičius (LAST)..."
 
-#: src/inc.c:812
+#: src/inc.c:811
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Gaunamas naujų laiškų skaičius (UILD)..."
 
-#: src/inc.c:816
+#: src/inc.c:815
 msgid "Getting the size of messages (LIST)..."
 msgstr "Gaunamas naujų laiškų dydis (LIST)..."
 
-#: src/inc.c:826
+#: src/inc.c:825
 #, c-format
 msgid "Deleting message %d"
 msgstr "Trinamas laiškas %d"
 
-#: src/inc.c:833 src/send_message.c:649
+#: src/inc.c:832 src/send_message.c:649
 msgid "Quitting"
 msgstr "Išeinu"
 
-#: src/inc.c:858
+#: src/inc.c:857
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Gaunamas laiškas (%d / %d) (%s / %s)"
 
-#: src/inc.c:879
+#: src/inc.c:878
 #, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Gaunama (Gauti laiškai: %d (%s))"
 
-#: src/inc.c:1107
+#: src/inc.c:1106
 msgid "Connection failed."
 msgstr "Nepavyko prisijungti."
 
-#: src/inc.c:1113
+#: src/inc.c:1112
 msgid "Error occurred while processing mail."
 msgstr "Klaida tvarkant paštą."
 
-#: src/inc.c:1118
+#: src/inc.c:1117
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2714,28 +2715,28 @@ msgstr ""
 "Klaida tvarkant paštą:\n"
 "%s"
 
-#: src/inc.c:1124
+#: src/inc.c:1123
 msgid "No disk space left."
 msgstr "Nėra vietos diske."
 
-#: src/inc.c:1129
+#: src/inc.c:1128
 msgid "Can't write file."
 msgstr "Negaliu įrašyti į bylą."
 
-#: src/inc.c:1134
+#: src/inc.c:1133
 msgid "Socket error."
 msgstr "Socket error."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1140 src/send_message.c:584 src/send_message.c:772
+#: src/inc.c:1139 src/send_message.c:584 src/send_message.c:772
 msgid "Connection closed by the remote host."
 msgstr "Prisijungimas uždarytas nuotolinio serverio."
 
-#: src/inc.c:1146
+#: src/inc.c:1145
 msgid "Mailbox is locked."
 msgstr "Dėžutė užrakinta."
 
-#: src/inc.c:1150
+#: src/inc.c:1149
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2744,11 +2745,11 @@ msgstr ""
 "Dėžutė užrakinta:\n"
 "%s"
 
-#: src/inc.c:1156 src/send_message.c:757
+#: src/inc.c:1155 src/send_message.c:757
 msgid "Authentication failed."
 msgstr "Nepavyko patvirtinti autentiškumo."
 
-#: src/inc.c:1161 src/send_message.c:760
+#: src/inc.c:1160 src/send_message.c:760
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2757,15 +2758,15 @@ msgstr ""
 "Nepavyko patvirtinti autentiškumo:\n"
 "%s"
 
-#: src/inc.c:1166 src/send_message.c:776
+#: src/inc.c:1165 src/send_message.c:776
 msgid "Session timed out."
 msgstr "Baigėsi sesijos laikas."
 
-#: src/inc.c:1202
+#: src/inc.c:1201
 msgid "Incorporation cancelled\n"
 msgstr "Prijungimas nutrauktas\n"
 
-#: src/inc.c:1285
+#: src/inc.c:1284
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Gaunami nauji laiškai iš %s į %s...\n"
@@ -3235,14 +3236,15 @@ msgid "/_View/Mess_age source"
 msgstr "/_Rodyti/Laiško pr_adinis tekstas"
 
 #: src/mainwindow.c:708 src/messageview.c:245
-msgid "/_View/Show all _header"
+#, fuzzy
+msgid "/_View/Show all _headers"
 msgstr "/_Rodyti/Rodyti _visas antraštes"
 
 #: src/mainwindow.c:710
 msgid "/_View/_Update summary"
 msgstr "/_Rodyti/Atna_ujinti santrauką"
 
-#: src/mainwindow.c:712 src/messageview.c:247
+#: src/mainwindow.c:712 src/messageview.c:248
 msgid "/_Message"
 msgstr "/_Laiškas"
 
@@ -3272,16 +3274,16 @@ msgstr "/_Laiškas/_Siųsti laiškus eilėje"
 
 #: src/mainwindow.c:722 src/mainwindow.c:724 src/mainwindow.c:731
 #: src/mainwindow.c:736 src/mainwindow.c:739 src/mainwindow.c:750
-#: src/mainwindow.c:752 src/mainwindow.c:755 src/messageview.c:250
-#: src/messageview.c:258 src/messageview.c:263
+#: src/mainwindow.c:752 src/mainwindow.c:755 src/messageview.c:251
+#: src/messageview.c:259 src/messageview.c:264
 msgid "/_Message/---"
 msgstr "/_Laiškas/---"
 
-#: src/mainwindow.c:723 src/messageview.c:248
+#: src/mainwindow.c:723 src/messageview.c:249
 msgid "/_Message/Compose _new message"
 msgstr "/_Laiškas/Rašyti _naują"
 
-#: src/mainwindow.c:725 src/messageview.c:251
+#: src/mainwindow.c:725 src/messageview.c:252
 msgid "/_Message/_Reply"
 msgstr "/_Laiškas/_Atsakyti"
 
@@ -3289,27 +3291,27 @@ msgstr "/_Laiškas/_Atsakyti"
 msgid "/_Message/Repl_y to"
 msgstr "/_Laiškas/Atsak_yti kam"
 
-#: src/mainwindow.c:727 src/messageview.c:252
+#: src/mainwindow.c:727 src/messageview.c:253
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Laiškas/Atsak_yti kam/_visiems"
 
-#: src/mainwindow.c:728 src/messageview.c:254
+#: src/mainwindow.c:728 src/messageview.c:255
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Laiškas/Atsak_yti kam/_siuntėjui"
 
-#: src/mainwindow.c:729 src/messageview.c:256
+#: src/mainwindow.c:729 src/messageview.c:257
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Laiškas/Atsak_yti kam/pašto _konferencijai"
 
-#: src/mainwindow.c:732 src/messageview.c:259
+#: src/mainwindow.c:732 src/messageview.c:260
 msgid "/_Message/_Forward"
 msgstr "/_Laiškas/_Persiųsti"
 
-#: src/mainwindow.c:733 src/messageview.c:260
+#: src/mainwindow.c:733 src/messageview.c:261
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Laiškas/Persiųsti kaip p_riedą"
 
-#: src/mainwindow.c:735 src/messageview.c:262
+#: src/mainwindow.c:735 src/messageview.c:263
 msgid "/_Message/Redirec_t"
 msgstr "/_Laiškas/Nukreip_ti"
 
@@ -3365,7 +3367,7 @@ msgstr "/_Laiškas/Pažymėti kaip nereikalingą"
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/_Laiškas/Pažymėti kaip reikalingą"
 
-#: src/mainwindow.c:756 src/messageview.c:264
+#: src/mainwindow.c:756 src/messageview.c:265
 msgid "/_Message/Re-_edit"
 msgstr "/_Message/P_ertaisyti"
 
@@ -3381,23 +3383,23 @@ msgstr "/Į_rankiai/_Filtruoti laiškus kataloge"
 msgid "/_Tools/Filter _selected messages"
 msgstr "/Į_rankiai/Filtruoti pa_sirinktus laiškus"
 
-#: src/mainwindow.c:767 src/messageview.c:271
+#: src/mainwindow.c:767 src/messageview.c:272
 msgid "/_Tools/_Create filter rule"
 msgstr "/Į_rankiai/Sukurti filtravimo _taisyklę"
 
-#: src/mainwindow.c:768 src/messageview.c:273
+#: src/mainwindow.c:768 src/messageview.c:274
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/Į_rankiai/Sukurti filtravimo _taisyklę/_Automatiškai"
 
-#: src/mainwindow.c:770 src/messageview.c:275
+#: src/mainwindow.c:770 src/messageview.c:276
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/Į_rankiai/Sukurti filtravimo _taisyklę/pagal _Siuntėją"
 
-#: src/mainwindow.c:772 src/messageview.c:277
+#: src/mainwindow.c:772 src/messageview.c:278
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/Į_rankiai/Sukurti filtravimo _taisyklę/pagal _Gavėją"
 
-#: src/mainwindow.c:774 src/messageview.c:279
+#: src/mainwindow.c:774 src/messageview.c:280
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/Į_rankiai/Sukurti filtravimo _taisyklę/pagal _Temą"
 
@@ -3515,7 +3517,7 @@ msgid "MainWindow: color allocation %d failed\n"
 msgstr "MainWindow: nepavyko spalvos priskyrimas %d\n"
 
 #: src/mainwindow.c:1139 src/summaryview.c:2275 src/summaryview.c:2360
-#: src/summaryview.c:3907 src/summaryview.c:4036 src/summaryview.c:4394
+#: src/summaryview.c:3908 src/summaryview.c:4037 src/summaryview.c:4395
 msgid "done.\n"
 msgstr "atlikta.\n"
 
@@ -3795,7 +3797,7 @@ msgid "Find text:"
 msgstr "Rasti tekstą:"
 
 #: src/message_search.c:153 src/prefs_search_folder.c:253
-#: src/query_search.c:326
+#: src/query_search.c:343
 msgid "Case sensitive"
 msgstr "Skirti didžiąsias-mažąsias raides"
 
@@ -3819,27 +3821,27 @@ msgstr "Pasiekta laiško pabaiga; tęsti nuo pradžios?"
 msgid "Search finished"
 msgstr "Paieška baigta"
 
-#: src/messageview.c:268
+#: src/messageview.c:269
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/Į_rankiai/Įrašyti siuntėją į adresų _knygą"
 
-#: src/messageview.c:300
+#: src/messageview.c:301
 msgid "Creating message view...\n"
 msgstr "Sukuriama laiško peržiūra...\n"
 
-#: src/messageview.c:325
+#: src/messageview.c:326
 msgid "Text"
 msgstr "Tekstas"
 
-#: src/messageview.c:330
+#: src/messageview.c:331
 msgid "Attachments"
 msgstr "Priedai"
 
-#: src/messageview.c:380
+#: src/messageview.c:381
 msgid "Message View - Sylpheed"
 msgstr "Laiško peržiūra - Sylpheed"
 
-#: src/messageview.c:699 src/summaryview.c:3436
+#: src/messageview.c:700 src/summaryview.c:3436
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Negaliu išsaugoti bylos „%s“."
@@ -3856,7 +3858,7 @@ msgstr "(Numatytoji spausdinimo komanda)"
 msgid "Print"
 msgstr "Spausdinti"
 
-#: src/messageview.c:770 src/summaryview.c:3471
+#: src/messageview.c:769 src/summaryview.c:3470
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -3951,11 +3953,11 @@ msgstr ""
 "Įveskite komandą bylai atverti:\n"
 "(„%s“ bus pakeista bylos vardu)"
 
-#: src/mimeview.c:1147
+#: src/mimeview.c:1140
 msgid "Opening executable file"
 msgstr "Atveriama vykdomoji byla"
 
-#: src/mimeview.c:1148
+#: src/mimeview.c:1141
 msgid ""
 "This is an executable file. Opening executable file is restricted for "
 "security.\n"
@@ -3966,11 +3968,6 @@ msgstr ""
 "Jei norite ją paleisti, išsaugokite ją ir įsitikinkite ar tai ne virusas ar "
 "panaši kenkėjiška programa."
 
-#: src/mimeview.c:1184
-#, c-format
-msgid "MIME viewer command line is invalid: `%s'"
-msgstr "Bloga MIME žiūryklės komanda: „%s“"
-
 #: src/passphrase.c:96
 msgid "Passphrase"
 msgstr "Slapta frazė"
@@ -5699,19 +5696,19 @@ msgstr "Atsakyti kam:"
 msgid "%s - Edit search condition"
 msgstr "%s - Redaguoti paieškos kriterijus"
 
-#: src/prefs_search_folder.c:209 src/query_search.c:257
+#: src/prefs_search_folder.c:209 src/query_search.c:274
 msgid "Match any of the following"
 msgstr "Jei teisingas bet kuris"
 
-#: src/prefs_search_folder.c:211 src/query_search.c:259
+#: src/prefs_search_folder.c:211 src/query_search.c:276
 msgid "Match all of the following"
 msgstr "Jei teisingi visi"
 
-#: src/prefs_search_folder.c:231 src/query_search.c:303
+#: src/prefs_search_folder.c:231 src/query_search.c:320
 msgid "Folder:"
 msgstr "Katalogas:"
 
-#: src/prefs_search_folder.c:248 src/query_search.c:321
+#: src/prefs_search_folder.c:248 src/query_search.c:338
 msgid "Search subfolders"
 msgstr "Ieškoti pakatologiuose"
 
@@ -5725,17 +5722,17 @@ msgid "Attachment"
 msgstr "Priedas"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73 src/query_search.c:371 src/summaryview.c:4901
+#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4902
 msgid "Subject"
 msgstr "Tema"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/query_search.c:372 src/summaryview.c:4904
+#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4905
 msgid "From"
 msgstr "Siuntėjas"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/query_search.c:373 src/summaryview.c:4906
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:4907
 msgid "Date"
 msgstr "Data"
 
@@ -5828,41 +5825,41 @@ msgstr "Sukuriamas progreso dialogas...\n"
 msgid "Status"
 msgstr "Būsena"
 
-#: src/query_search.c:234
+#: src/query_search.c:251
 msgid "Search messages"
 msgstr "Ieškoti laiškų"
 
-#: src/query_search.c:395
+#: src/query_search.c:423
 msgid "_Save as search folder"
 msgstr "Iš_saugoti kaip paieškos katalogą"
 
-#: src/query_search.c:512 src/subscribedialog.c:526 src/summaryview.c:842
+#: src/query_search.c:542 src/subscribedialog.c:526 src/summaryview.c:842
 msgid "Done."
 msgstr "Atlikta."
 
-#: src/query_search.c:536
+#: src/query_search.c:566
 #, c-format
 msgid "Searching %s ..."
 msgstr "Ieškoma „%s“..."
 
-#: src/query_search.c:564
+#: src/query_search.c:594
 #, c-format
 msgid "Searching %s (%d / %d)..."
 msgstr "Ieškoma %s (%d / %d)..."
 
-#: src/query_search.c:645 src/summaryview.c:2051
+#: src/query_search.c:675 src/summaryview.c:2051
 msgid "(No Date)"
 msgstr "(Be datos)"
 
-#: src/query_search.c:833
+#: src/query_search.c:869
 msgid "Save as search folder"
 msgstr "Išsaugoti kaip paieškos katalogą"
 
-#: src/query_search.c:854
+#: src/query_search.c:890
 msgid "Location:"
 msgstr "Vieta:"
 
-#: src/query_search.c:869
+#: src/query_search.c:905
 msgid "Folder name:"
 msgstr "Katalogo vardas:"
 
@@ -6484,37 +6481,37 @@ msgstr "Laiškas %d pažymėtas kopijavimui į %s\n"
 msgid "Destination for copy is same as current folder."
 msgstr "Kopijavimo paskirtis yra tas pats katalogas."
 
-#: src/summaryview.c:3506
+#: src/summaryview.c:3507
 msgid "Error occurred while processing messages."
 msgstr "Klaida vykdant operacijas su laiškais."
 
-#: src/summaryview.c:3814 src/summaryview.c:3815
+#: src/summaryview.c:3815 src/summaryview.c:3816
 msgid "Building threads..."
 msgstr "Statomos gijos..."
 
-#: src/summaryview.c:3965 src/summaryview.c:3966
+#: src/summaryview.c:3966 src/summaryview.c:3967
 msgid "Unthreading..."
 msgstr "Griaunamos gijos..."
 
-#: src/summaryview.c:4259 src/summaryview.c:4315
+#: src/summaryview.c:4260 src/summaryview.c:4316
 #, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtruojama (%d / %d)..."
 
-#: src/summaryview.c:4364
+#: src/summaryview.c:4365
 msgid "filtering..."
 msgstr "filtruojama..."
 
-#: src/summaryview.c:4365
+#: src/summaryview.c:4366
 msgid "Filtering..."
 msgstr "Filtruojama..."
 
-#: src/summaryview.c:4401
+#: src/summaryview.c:4402
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "Filtruota laiškų: %d"
 
-#: src/summaryview.c:4910
+#: src/summaryview.c:4911
 msgid "No."
 msgstr "Nr."
 
@@ -6596,6 +6593,9 @@ msgstr "Iš_eiti"
 msgid "Sylpheed"
 msgstr "„Sylpheed“"
 
+#~ msgid "MIME viewer command line is invalid: `%s'"
+#~ msgstr "Bloga MIME žiūryklės komanda: „%s“"
+
 #~ msgid "%dB"
 #~ msgstr "%dB"
 
diff --git a/po/nl.po b/po/nl.po
index b030605f..9098df55 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-03-02 19:03+0900\n"
+"POT-Creation-Date: 2006-03-10 16:06+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:491
+#: libsylph/prefs_common.c:496
 #, fuzzy
 msgid "Junk mail filter"
 msgstr "Accounts"
@@ -531,7 +531,7 @@ msgstr "kan het bestand met markeringen niet openen\n"
 msgid "can't fetch message %d\n"
 msgstr "kan bericht %d niet ophalen\n"
 
-#: libsylph/procmsg.c:1375
+#: libsylph/procmsg.c:1378
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Opdracht voor het afdrukken in onjuist: '%s'\n"
@@ -610,12 +610,12 @@ msgstr "  Onderwerp: %s\n"
 msgid "  Issuer: %s\n"
 msgstr "  Uitgever: %s\n"
 
-#: libsylph/utils.c:2411 src/compose.c:2869 src/compose.c:3132
-#: src/compose.c:3195 src/compose.c:3315
+#: libsylph/utils.c:2430 src/compose.c:2888 src/compose.c:3151
+#: src/compose.c:3214 src/compose.c:3334
 msgid "can't change file mode\n"
 msgstr "kan de bestandmodus niet veranderen\n"
 
-#: libsylph/utils.c:2418 libsylph/utils.c:2542
+#: libsylph/utils.c:2437 libsylph/utils.c:2561
 #, c-format
 msgid "writing to %s failed.\n"
 msgstr "schrijven naar %s is mislukt.\n"
@@ -700,8 +700,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:493
-#: src/compose.c:4273 src/editaddress.c:200 src/editaddress.c:942
+#: src/account_dialog.c:366 src/addressadd.c:192 src/addressbook.c:491
+#: src/compose.c:4292 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 "Adres toevoegen aan adresboek"
 
-#: src/addressadd.c:202 src/compose.c:4777 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4796 src/editaddress.c:201
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "Adres"
 
-#: src/addressadd.c:212 src/addressbook.c:495 src/editaddress.c:202
+#: src/addressadd.c:212 src/addressbook.c:493 src/editaddress.c:202
 #: src/editaddress.c:795 src/editaddress.c:860 src/editgroup.c:267
 msgid "Remarks"
 msgstr "Opmerkingen"
@@ -851,110 +851,111 @@ msgstr "Opmerkingen"
 msgid "Select Address Book Folder"
 msgstr "Selecteer adresboekmap"
 
-#: src/addressbook.c:338 src/compose.c:515 src/mainwindow.c:489
+#: src/addressbook.c:337 src/compose.c:515 src/mainwindow.c:489
 #: src/messageview.c:140
 msgid "/_File"
 msgstr "/_Bestand"
 
-#: src/addressbook.c:339
+#: src/addressbook.c:338
 msgid "/_File/New _Book"
 msgstr "/_Bestand/Nieuw _adresboek"
 
-#: src/addressbook.c:340
+#: src/addressbook.c:339
 msgid "/_File/New _vCard"
 msgstr "/_Bestand/Nieuwe _vCard"
 
-#: src/addressbook.c:342
+#: src/addressbook.c:341
 msgid "/_File/New _JPilot"
 msgstr "/_Bestand/Nieuwe _JPilot"
 
-#: src/addressbook.c:345
-msgid "/_File/New _Server"
+#: src/addressbook.c:344
+#, fuzzy
+msgid "/_File/New _LDAP Server"
 msgstr "/_Bestand/Nieuwe _Server"
 
-#: src/addressbook.c:347 src/addressbook.c:350 src/compose.c:520
+#: src/addressbook.c:346 src/addressbook.c:349 src/compose.c:520
 #: src/compose.c:525 src/compose.c:528 src/compose.c:531 src/mainwindow.c:507
 #: src/mainwindow.c:510 src/mainwindow.c:512 src/mainwindow.c:515
 #: src/mainwindow.c:517 src/messageview.c:143
 msgid "/_File/---"
 msgstr "/_Bestand/---"
 
-#: src/addressbook.c:348
+#: src/addressbook.c:347
 msgid "/_File/_Edit"
 msgstr "/_Bestand/Aanpassen"
 
-#: src/addressbook.c:349
+#: src/addressbook.c:348
 msgid "/_File/_Delete"
 msgstr "/_Bestand/_Verwijderen"
 
-#: src/addressbook.c:351
+#: src/addressbook.c:350
 msgid "/_File/_Save"
 msgstr "/_Bestand/_Opslaan"
 
-#: src/addressbook.c:352 src/compose.c:532 src/messageview.c:144
+#: src/addressbook.c:351 src/compose.c:532 src/messageview.c:144
 msgid "/_File/_Close"
 msgstr "/_Bestand/_Sluiten"
 
-#: src/addressbook.c:353
+#: src/addressbook.c:352
 msgid "/_Address"
 msgstr "/_Adres"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:353
 msgid "/_Address/New _Address"
 msgstr "/_Adres/Nieuw _adres"
 
-#: src/addressbook.c:355
+#: src/addressbook.c:354
 msgid "/_Address/New _Group"
 msgstr "/_Adres/Nieuwe _groep"
 
-#: src/addressbook.c:356
+#: src/addressbook.c:355
 msgid "/_Address/New _Folder"
 msgstr "/_Adres/Nieuwe _map"
 
-#: src/addressbook.c:357
+#: src/addressbook.c:356
 msgid "/_Address/---"
 msgstr "/_Adres/---"
 
-#: src/addressbook.c:358
+#: src/addressbook.c:357
 msgid "/_Address/_Edit"
 msgstr "/_Adres/_Bewerken"
 
-#: src/addressbook.c:359
+#: src/addressbook.c:358
 msgid "/_Address/_Delete"
 msgstr "/_Adres/_Verwijderen"
 
-#: src/addressbook.c:360 src/compose.c:645 src/mainwindow.c:758
-#: src/messageview.c:266
+#: src/addressbook.c:359 src/compose.c:645 src/mainwindow.c:758
+#: src/messageview.c:267
 msgid "/_Tools"
 msgstr "/_Gereedschap"
 
-#: src/addressbook.c:361
+#: src/addressbook.c:360
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Gereedschap/_LDIF bestand importeren"
 
-#: src/addressbook.c:362 src/compose.c:666 src/mainwindow.c:812
-#: src/messageview.c:286
+#: src/addressbook.c:361 src/compose.c:666 src/mainwindow.c:812
+#: src/messageview.c:287
 msgid "/_Help"
 msgstr "/_Hulp"
 
-#: src/addressbook.c:363 src/compose.c:667 src/mainwindow.c:824
-#: src/messageview.c:287
+#: src/addressbook.c:362 src/compose.c:667 src/mainwindow.c:824
+#: src/messageview.c:288
 msgid "/_Help/_About"
 msgstr "/_Hulp/_Info"
 
-#: src/addressbook.c:382 src/addressbook.c:392
+#: src/addressbook.c:381 src/addressbook.c:391
 msgid "/New _Address"
 msgstr "/Nieuw _adres"
 
-#: src/addressbook.c:383 src/addressbook.c:393
+#: src/addressbook.c:382 src/addressbook.c:392
 msgid "/New _Group"
 msgstr "/Nieuwe _groep"
 
-#: src/addressbook.c:384 src/addressbook.c:394
+#: src/addressbook.c:383 src/addressbook.c:393
 msgid "/New _Folder"
 msgstr "/Nieuwe _map"
 
-#: src/addressbook.c:385 src/addressbook.c:395 src/compose.c:509
+#: src/addressbook.c:384 src/addressbook.c:394 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
@@ -964,70 +965,70 @@ msgstr "/Nieuwe _map"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:386 src/addressbook.c:396 src/compose.c:534
+#: src/addressbook.c:385 src/addressbook.c:395 src/compose.c:534
 #: src/mainwindow.c:521 src/messageview.c:146
 msgid "/_Edit"
 msgstr "/Be_werken"
 
-#: src/addressbook.c:387 src/addressbook.c:397 src/summaryview.c:434
+#: src/addressbook.c:386 src/addressbook.c:396 src/summaryview.c:434
 msgid "/_Delete"
 msgstr "/Ver_wijderen"
 
-#: src/addressbook.c:494
+#: src/addressbook.c:492
 msgid "E-Mail address"
 msgstr "E-mail adres"
 
-#: src/addressbook.c:498 src/compose.c:4778 src/prefs_common_dialog.c:2183
+#: src/addressbook.c:496 src/compose.c:4797 src/prefs_common_dialog.c:2183
 msgid "Address book"
 msgstr "Adresboek"
 
-#: src/addressbook.c:600 src/prefs_filter_edit.c:249
+#: src/addressbook.c:603 src/prefs_filter_edit.c:249
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "Naam:"
 
 #. Buttons
-#: src/addressbook.c:632 src/addressbook.c:1684 src/editaddress.c:884
+#: src/addressbook.c:636 src/addressbook.c:1678 src/editaddress.c:884
 #: src/editaddress.c:1017 src/mainwindow.c:2426 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:635 src/editaddress.c:890 src/editaddress.c:1023
+#: src/addressbook.c:639 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:1552
 msgid "Add"
 msgstr "Toevoegen"
 
-#: src/addressbook.c:638
+#: src/addressbook.c:642
 msgid "Lookup"
 msgstr "Zoeken"
 
-#: src/addressbook.c:650 src/headerview.c:55 src/prefs_folder_item.c:339
+#: src/addressbook.c:654 src/headerview.c:55 src/prefs_folder_item.c:339
 #: src/prefs_template.c:176
 msgid "To:"
 msgstr "Aan:"
 
-#: src/addressbook.c:654 src/prefs_folder_item.c:356 src/prefs_template.c:178
+#: src/addressbook.c:658 src/prefs_folder_item.c:356 src/prefs_template.c:178
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:658 src/prefs_folder_item.c:367
+#: src/addressbook.c:662 src/prefs_folder_item.c:367
 msgid "Bcc:"
 msgstr "Bcc:"
 
 #. Confirm deletion
-#: src/addressbook.c:845
+#: src/addressbook.c:832
 msgid "Delete address(es)"
 msgstr "Adres(sen) verwijderen"
 
-#: src/addressbook.c:846
+#: src/addressbook.c:833
 msgid "Really delete the address(es)?"
 msgstr "Wilt u de adressen werkelijk verwijderen?"
 
-#: src/addressbook.c:1675
+#: src/addressbook.c:1669
 #, fuzzy, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1037,38 +1038,38 @@ msgstr ""
 "Als u alleen de map verwijdert, dan zullen de adressen naar de \n"
 "hoger gelegen map verplaatst worden."
 
-#: src/addressbook.c:1678 src/folderview.c:2372
+#: src/addressbook.c:1672 src/folderview.c:2372
 msgid "Delete folder"
 msgstr "Verwijder map"
 
-#: src/addressbook.c:1678
+#: src/addressbook.c:1672
 #, fuzzy
 msgid "_Folder only"
 msgstr "Alleen map"
 
-#: src/addressbook.c:1678
+#: src/addressbook.c:1672
 #, fuzzy
 msgid "Folder and _addresses"
 msgstr "Map en adressen"
 
-#: src/addressbook.c:1683
+#: src/addressbook.c:1677
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Wilt u '%s' werkelijk verwijderen?"
 
-#: src/addressbook.c:2369 src/addressbook.c:2502
+#: src/addressbook.c:2363 src/addressbook.c:2496
 msgid "New user, could not save index file."
 msgstr "Nieuwe gebruiker: Kon indexbestand niet opslaan."
 
-#: src/addressbook.c:2373 src/addressbook.c:2506
+#: src/addressbook.c:2367 src/addressbook.c:2500
 msgid "New user, could not save address book files."
 msgstr "Nieuwe gebruiker: Kon adresboekbestanden niet opslaan."
 
-#: src/addressbook.c:2383 src/addressbook.c:2516
+#: src/addressbook.c:2377 src/addressbook.c:2510
 msgid "Old address book converted successfully."
 msgstr "Oude adresboekgegevens succesvol omgezet."
 
-#: src/addressbook.c:2388
+#: src/addressbook.c:2382
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1076,7 +1077,7 @@ msgstr ""
 "Oude adresboekgegevens omgezet.\n"
 "Kon het nieuwe adresboek indexbestand niet opslaan."
 
-#: src/addressbook.c:2401
+#: src/addressbook.c:2395
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1084,7 +1085,7 @@ msgstr ""
 "Kon adresboekgegevens niet omzetten.\n"
 "Nieuw leeg adresboek is gemaakt."
 
-#: src/addressbook.c:2407
+#: src/addressbook.c:2401
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1092,7 +1093,7 @@ msgstr ""
 "Kon adresboekgegevens niet omzetten.\n"
 "Kon geen nieuwe adresboek bestanden aanmaken."
 
-#: src/addressbook.c:2412
+#: src/addressbook.c:2406
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1100,90 +1101,90 @@ msgstr ""
 "Kon adresboekgegevens niet omzetten.\n"
 "Kon ook geen nieuwe adresboekbestanden aanmaken."
 
-#: src/addressbook.c:2419
+#: src/addressbook.c:2413
 msgid "Addressbook conversion error"
 msgstr "Adresboek omzetprobleem"
 
-#: src/addressbook.c:2423
+#: src/addressbook.c:2417
 msgid "Addressbook conversion"
 msgstr "Adresboek omzetting"
 
-#: src/addressbook.c:2458
+#: src/addressbook.c:2452
 msgid "Addressbook Error"
 msgstr "Adresboekprobleem"
 
-#: src/addressbook.c:2459 src/addressbook.c:2559
+#: src/addressbook.c:2453 src/addressbook.c:2553
 msgid "Could not read address index"
 msgstr "Kon adresboek index niet lezen"
 
-#: src/addressbook.c:2521
+#: src/addressbook.c:2515
 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:2535
+#: src/addressbook.c:2529
 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:2541
+#: src/addressbook.c:2535
 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:2547
+#: src/addressbook.c:2541
 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:2565
+#: src/addressbook.c:2559
 msgid "Addressbook Conversion Error"
 msgstr "Adresboek omzetprobleem"
 
-#: src/addressbook.c:2571
+#: src/addressbook.c:2565
 msgid "Addressbook Conversion"
 msgstr "Adresboek Omzetting"
 
-#: src/addressbook.c:3086 src/prefs_common_dialog.c:2033
+#: src/addressbook.c:3080 src/prefs_common_dialog.c:2033
 msgid "Interface"
 msgstr "Interface"
 
-#: src/addressbook.c:3102 src/importldif.c:514
+#: src/addressbook.c:3096 src/importldif.c:514
 msgid "Address Book"
 msgstr "Adresboek"
 
-#: src/addressbook.c:3118
+#: src/addressbook.c:3112
 msgid "Person"
 msgstr "Persoon"
 
-#: src/addressbook.c:3134
+#: src/addressbook.c:3128
 msgid "EMail Address"
 msgstr "E-mail adres"
 
-#: src/addressbook.c:3150
+#: src/addressbook.c:3144
 msgid "Group"
 msgstr "Groep"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3166 src/folderview.c:367 src/prefs_account_dialog.c:1694
-#: src/query_search.c:370
+#: src/addressbook.c:3160 src/folderview.c:367 src/prefs_account_dialog.c:1694
+#: src/query_search.c:398
 msgid "Folder"
 msgstr "Accounts"
 
-#: src/addressbook.c:3182
+#: src/addressbook.c:3176
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3198 src/addressbook.c:3214
+#: src/addressbook.c:3192 src/addressbook.c:3208
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3230
+#: src/addressbook.c:3224
 msgid "LDAP Server"
 msgstr "LDAP Server"
 
@@ -1195,7 +1196,7 @@ msgstr "Algemene adressen"
 msgid "Personal address"
 msgstr "Persoonlijke adressen"
 
-#: src/alertpanel.c:142 src/compose.c:5500 src/main.c:621
+#: src/alertpanel.c:142 src/compose.c:5517 src/main.c:621
 msgid "Notice"
 msgstr "Bericht"
 
@@ -1203,7 +1204,7 @@ msgstr "Bericht"
 msgid "Warning"
 msgstr "Waarschuwing"
 
-#: src/alertpanel.c:168 src/inc.c:587
+#: src/alertpanel.c:168 src/inc.c:586
 msgid "Error"
 msgstr "Fout"
 
@@ -1246,7 +1247,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:4761
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4762
 msgid "None"
 msgstr "Geen"
 
@@ -1524,7 +1525,7 @@ msgstr "/B_eeld/_Codering/Thais (TIS-620)"
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/B_eeld/_Codering/Thais (Windows-874)"
 
-#: src/compose.c:646 src/mainwindow.c:759 src/messageview.c:267
+#: src/compose.c:646 src/mainwindow.c:759 src/messageview.c:268
 msgid "/_Tools/_Address book"
 msgstr "/_Gereedschap/_Adresboek"
 
@@ -1532,14 +1533,14 @@ msgstr "/_Gereedschap/_Adresboek"
 msgid "/_Tools/_Template"
 msgstr "/_Gereedschap/_Sjabloon"
 
-#: src/compose.c:649 src/mainwindow.c:783 src/messageview.c:283
+#: src/compose.c:649 src/mainwindow.c:783 src/messageview.c:284
 msgid "/_Tools/Actio_ns"
 msgstr "/_Gereedschap/A_cties"
 
 #: src/compose.c:651 src/compose.c:655 src/compose.c:661 src/mainwindow.c:762
 #: src/mainwindow.c:776 src/mainwindow.c:781 src/mainwindow.c:784
-#: src/mainwindow.c:788 src/mainwindow.c:790 src/messageview.c:270
-#: src/messageview.c:282
+#: src/mainwindow.c:788 src/mainwindow.c:790 src/messageview.c:271
+#: src/messageview.c:283
 msgid "/_Tools/---"
 msgstr "/_Gereedschap/---"
 
@@ -1568,80 +1569,80 @@ msgstr "/_Gereedschap/_Uitvoeren"
 msgid "/_Tools/_Set spell language"
 msgstr "/_Gereedschap/_Sjabloon"
 
-#: src/compose.c:910
+#: src/compose.c:912
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: bestand bestaat niet\n"
 
-#: src/compose.c:1014 src/compose.c:1085
+#: src/compose.c:1016 src/compose.c:1087
 msgid "Can't get text part\n"
 msgstr "Kan tekstgedeelte niet ophalen\n"
 
-#: src/compose.c:1486
+#: src/compose.c:1488
 msgid "Quote mark format error."
 msgstr "Citeerteken opmaakfout."
 
-#: src/compose.c:1498
+#: src/compose.c:1500
 msgid "Message reply/forward format error."
 msgstr "Bericht beantwoorden/doorsturen opmaakfout."
 
-#: src/compose.c:1918
+#: src/compose.c:1935
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Bestand %s bestaat niet\n"
 
-#: src/compose.c:1922
+#: src/compose.c:1939
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Kan de bestandsgrootte niet bepalen van %s\n"
 
-#: src/compose.c:1926
+#: src/compose.c:1943
 #, c-format
 msgid "File %s is empty."
 msgstr "Bestand %s is leeg"
 
-#: src/compose.c:1930
+#: src/compose.c:1947
 #, c-format
 msgid "Can't read %s."
 msgstr "Kan %s niet inlezen."
 
-#: src/compose.c:1963
+#: src/compose.c:1980
 #, c-format
 msgid "Message: %s"
 msgstr "Bericht: %s"
 
-#: src/compose.c:2023 src/mimeview.c:565
+#: src/compose.c:2040 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:2507 src/headerview.c:195 src/query_search.c:636
+#: src/compose.c:2524 src/headerview.c:195 src/query_search.c:666
 #: src/summaryview.c:2124
 msgid "(No Subject)"
 msgstr "(Geen onderwerp)"
 
-#: src/compose.c:2510
+#: src/compose.c:2527
 #, fuzzy, c-format
 msgid "%s - Compose%s"
 msgstr "%s - bericht opstellen%s"
 
-#: src/compose.c:2623
+#: src/compose.c:2642
 msgid "Recipient is not specified."
 msgstr "Ontvanger is niet gespecificeerd."
 
-#: src/compose.c:2631
+#: src/compose.c:2650
 #, fuzzy
 msgid "Empty subject"
 msgstr "Onderwerp"
 
-#: src/compose.c:2632
+#: src/compose.c:2651
 msgid "Subject is empty. Send it anyway?"
 msgstr "U heeft geen onderwerp ingevuld. Toch versturen?"
 
-#: src/compose.c:2691
+#: src/compose.c:2710
 msgid "can't get recipient list."
 msgstr "Kan geen ontvangerlijst opvragen."
 
-#: src/compose.c:2711
+#: src/compose.c:2730
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1649,21 +1650,21 @@ msgstr ""
 "Account voor het verzenden van email is niet gespecificeerd.\n"
 "Selecteer een account voordat u verzend."
 
-#: src/compose.c:2725 src/send_message.c:299
+#: src/compose.c:2744 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:2767
+#: src/compose.c:2786
 msgid "Can't save the message to outbox."
 msgstr "Het bericht kan niet opgeslagen worden in de outbox."
 
-#: src/compose.c:2805
+#: src/compose.c:2824
 #, 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:2902
+#: src/compose.c:2921
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1674,12 +1675,12 @@ msgstr ""
 "%s naar %s.\n"
 "Toch versturen?"
 
-#: src/compose.c:2908
+#: src/compose.c:2927
 #, fuzzy
 msgid "Code conversion error"
 msgstr "Adresboek omzetprobleem"
 
-#: src/compose.c:2981
+#: src/compose.c:3000
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1688,159 +1689,159 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:2985
+#: src/compose.c:3004
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3275
+#: src/compose.c:3294
 msgid "can't remove the old message\n"
 msgstr "kan het oude bericht niet verwijderen\n"
 
-#: src/compose.c:3293
+#: src/compose.c:3312
 msgid "queueing message...\n"
 msgstr "bericht wordt in de wachtrij geplaatst...\n"
 
-#: src/compose.c:3375
+#: src/compose.c:3394
 msgid "can't find queue folder\n"
 msgstr "kan de Wachtrij-map niet vinden\n"
 
-#: src/compose.c:3382
+#: src/compose.c:3401
 msgid "can't queue the message\n"
 msgstr "kan het bericht niet in de wachtrij plaatsen\n"
 
-#: src/compose.c:3975
+#: src/compose.c:3994
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "gegenereerd bericht-ID: %s\n"
 
-#: src/compose.c:4088
+#: src/compose.c:4107
 msgid "Creating compose window...\n"
 msgstr "Venster \"Bericht opstellen\" wordt aangemaakt...\n"
 
-#: src/compose.c:4139 src/headerview.c:54
+#: src/compose.c:4158 src/headerview.c:54
 msgid "From:"
 msgstr "Afzender:"
 
-#: src/compose.c:4213
+#: src/compose.c:4232
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/_Gereedschap/A_cties"
 
-#: src/compose.c:4216
+#: src/compose.c:4235
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/Be_richt/Codeer"
 
-#: src/compose.c:4254 src/compose.c:5332
+#: src/compose.c:4273 src/compose.c:5351
 msgid "MIME type"
 msgstr "MIME type"
 
 #. S_COL_DATE
-#: src/compose.c:4263 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4908
+#: src/compose.c:4282 src/mimeview.c:197 src/prefs_filter_edit.c:496
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4909
 msgid "Size"
 msgstr "Grootte"
 
-#: src/compose.c:4698 src/mainwindow.c:2359 src/prefs_account_dialog.c:528
+#: src/compose.c:4717 src/mainwindow.c:2359 src/prefs_account_dialog.c:528
 #: src/prefs_common_dialog.c:661
 msgid "Send"
 msgstr "Verzenden"
 
-#: src/compose.c:4699
+#: src/compose.c:4718
 msgid "Send message"
 msgstr "Verzend bericht"
 
-#: src/compose.c:4707
+#: src/compose.c:4726
 msgid "Send later"
 msgstr "Wachtrij"
 
-#: src/compose.c:4708
+#: src/compose.c:4727
 msgid "Put into queue folder and send later"
 msgstr "In de wachtrij plaatsen en later verzenden"
 
-#: src/compose.c:4716
+#: src/compose.c:4735
 msgid "Draft"
 msgstr "Klad"
 
-#: src/compose.c:4717
+#: src/compose.c:4736
 msgid "Save to draft folder"
 msgstr "Opslaan als klad"
 
-#: src/compose.c:4727
+#: src/compose.c:4746
 msgid "Insert"
 msgstr "Invoegen"
 
-#: src/compose.c:4728
+#: src/compose.c:4747
 msgid "Insert file"
 msgstr "Bestand invoegen"
 
-#: src/compose.c:4736
+#: src/compose.c:4755
 msgid "Attach"
 msgstr "Bijvoegen"
 
-#: src/compose.c:4737
+#: src/compose.c:4756
 msgid "Attach file"
 msgstr "Bestand bijvoegen"
 
 #. signature
-#: src/compose.c:4747 src/prefs_account_dialog.c:1208
+#: src/compose.c:4766 src/prefs_account_dialog.c:1208
 #: src/prefs_common_dialog.c:953
 msgid "Signature"
 msgstr "Tekenen"
 
-#: src/compose.c:4748
+#: src/compose.c:4767
 #, fuzzy
 msgid "Append signature"
 msgstr "FOUTIEVE handtekening"
 
 #. editor
-#: src/compose.c:4757 src/prefs_common_dialog.c:991
+#: src/compose.c:4776 src/prefs_common_dialog.c:991
 #: src/prefs_common_dialog.c:2315
 msgid "Editor"
 msgstr "Editor"
 
-#: src/compose.c:4758
+#: src/compose.c:4777
 msgid "Edit with external editor"
 msgstr "Bewerken met ander (extern) programma"
 
-#: src/compose.c:4766
+#: src/compose.c:4785
 msgid "Linewrap"
 msgstr "Terugloop"
 
-#: src/compose.c:4767
+#: src/compose.c:4786
 msgid "Wrap all long lines"
 msgstr "Lange regels op meerdere regels zetten"
 
-#: src/compose.c:5228
+#: src/compose.c:5247
 msgid "Invalid MIME type."
 msgstr "Ongeldig MIME type."
 
-#: src/compose.c:5246
+#: src/compose.c:5265
 msgid "File doesn't exist or is empty."
 msgstr "Bestand bestaat niet of is leeg."
 
-#: src/compose.c:5314
+#: src/compose.c:5333
 msgid "Properties"
 msgstr "Eigenschappen"
 
-#: src/compose.c:5334 src/prefs_common_dialog.c:1444
+#: src/compose.c:5353 src/prefs_common_dialog.c:1444
 msgid "Encoding"
 msgstr "Codering"
 
-#: src/compose.c:5357 src/prefs_folder_item.c:202
+#: src/compose.c:5376 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Pad"
 
-#: src/compose.c:5358
+#: src/compose.c:5377
 msgid "File name"
 msgstr "Bestandsnaam"
 
-#: src/compose.c:5449
+#: src/compose.c:5466
 #, 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:5497
+#: src/compose.c:5514
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1850,48 +1851,48 @@ msgstr ""
 "Zal ik het programma afbreken?\n"
 "procesgroep id: %d"
 
-#: src/compose.c:5872 src/compose.c:5877 src/compose.c:5883
+#: src/compose.c:5889 src/compose.c:5894 src/compose.c:5900
 msgid "Can't queue the message."
 msgstr "Kan bericht niet in de wachtrij plaatsen."
 
-#: src/compose.c:5974
+#: src/compose.c:5991
 #, fuzzy
 msgid "Select files"
 msgstr "Selecteer bestand"
 
-#: src/compose.c:5997
+#: src/compose.c:6014
 msgid "Select file"
 msgstr "Selecteer bestand"
 
-#: src/compose.c:6032
+#: src/compose.c:6049
 #, fuzzy
 msgid "Save message"
 msgstr "Verzend bericht"
 
-#: src/compose.c:6033
+#: src/compose.c:6050
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Dit bericht is aangepast. weggooien?"
 
-#: src/compose.c:6035
+#: src/compose.c:6052
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:6077
+#: src/compose.c:6094
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Wilt u het sjabloon '%s' toepassen?"
 
-#: src/compose.c:6079
+#: src/compose.c:6096
 msgid "Apply template"
 msgstr "Sjabloon toepassen"
 
-#: src/compose.c:6080
+#: src/compose.c:6097
 #, fuzzy
 msgid "_Replace"
 msgstr "Vervangen"
 
-#: src/compose.c:6080
+#: src/compose.c:6097
 #, fuzzy
 msgid "_Insert"
 msgstr "Invoegen"
@@ -2013,53 +2014,53 @@ msgstr "U moet wel een groepsnaam geven."
 msgid "Edit Group Data"
 msgstr "Groepsgegevens bewerken"
 
-#: src/editgroup.c:300
+#: src/editgroup.c:299
 msgid "Group Name"
 msgstr "Groepsnaam"
 
-#: src/editgroup.c:319
+#: src/editgroup.c:318
 msgid "Addresses in Group"
 msgstr "Adressen in groep"
 
-#: src/editgroup.c:321
+#: src/editgroup.c:320
 msgid " -> "
 msgstr " ->"
 
-#: src/editgroup.c:348
+#: src/editgroup.c:347
 msgid " <- "
 msgstr " <-"
 
-#: src/editgroup.c:350
+#: src/editgroup.c:349
 msgid "Available Addresses"
 msgstr "Beschikbare adressen"
 
-#: src/editgroup.c:416
+#: src/editgroup.c:415
 msgid "Move E-Mail Addresses to or from Group with arrow buttons"
 msgstr ""
 "Verplaats e-mail adressen van en naar de nieuwe groep met de pijl-knoppen"
 
-#: src/editgroup.c:468
+#: src/editgroup.c:467
 msgid "Edit Group Details"
 msgstr "Groepsdetails bewerken"
 
-#: src/editgroup.c:471
+#: src/editgroup.c:470
 msgid "Add New Group"
 msgstr "Nieuwe groep toevoegen"
 
-#: src/editgroup.c:522
+#: src/editgroup.c:521
 msgid "Edit folder"
 msgstr "Map hernoemen"
 
-#: src/editgroup.c:522
+#: src/editgroup.c:521
 msgid "Input the new name of folder:"
 msgstr "Geef de nieuwe naam van de map:"
 
-#: src/editgroup.c:525 src/foldersel.c:541 src/folderview.c:2121
+#: src/editgroup.c:524 src/foldersel.c:541 src/folderview.c:2121
 #: src/folderview.c:2127
 msgid "New folder"
 msgstr "Nieuwe map"
 
-#: src/editgroup.c:526 src/foldersel.c:542 src/folderview.c:2128
+#: src/editgroup.c:525 src/foldersel.c:542 src/folderview.c:2128
 msgid "Input the name of new folder:"
 msgstr "Geef de naam van de nieuwe map:"
 
@@ -2258,7 +2259,7 @@ msgid "`%c' can't be included in folder name."
 msgstr "'%c' mag niet in de naam van een map."
 
 #: src/foldersel.c:561 src/folderview.c:2147 src/folderview.c:2206
-#: src/query_search.c:995
+#: src/query_search.c:1031
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "De map '%s' bestaat al."
@@ -2520,7 +2521,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:2127
+#: src/headerview.c:180 src/query_search.c:667 src/summaryview.c:2127
 msgid "(No From)"
 msgstr "(Geen afzender)"
 
@@ -2651,190 +2652,190 @@ msgstr "Afronden"
 msgid "Sylpheed: %d new messages"
 msgstr "Klaar (%d nieuwe bericht(en))"
 
-#: src/inc.c:372
+#: src/inc.c:371
 msgid "Retrieving new messages"
 msgstr "Nieuwe berichten worden opgehaald"
 
-#: src/inc.c:415
+#: src/inc.c:414
 msgid "Standby"
 msgstr "Een ogenblik geduld alstublieft"
 
-#: src/inc.c:544 src/inc.c:593
+#: src/inc.c:543 src/inc.c:592
 msgid "Cancelled"
 msgstr "Afgebroken"
 
-#: src/inc.c:555
+#: src/inc.c:554
 msgid "Retrieving"
 msgstr "Bezig met ophalen"
 
-#: src/inc.c:564
+#: src/inc.c:563
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "Klaar (%d bericht(en) (%s) ontvangen)"
 
-#: src/inc.c:568
+#: src/inc.c:567
 msgid "Done (no new messages)"
 msgstr "Klaar (geen nieuwe bercihten)"
 
-#: src/inc.c:574
+#: src/inc.c:573
 msgid "Connection failed"
 msgstr "Verbinding mislukt"
 
-#: src/inc.c:577
+#: src/inc.c:576
 msgid "Auth failed"
 msgstr "Identificatie mislukt"
 
-#: src/inc.c:580
+#: src/inc.c:579
 msgid "Locked"
 msgstr "Vergrendeld"
 
-#: src/inc.c:590
+#: src/inc.c:589
 #, fuzzy
 msgid "Timeout"
 msgstr "Timeout (sec)"
 
-#: src/inc.c:640
+#: src/inc.c:639
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Klaar (%d nieuwe bericht(en))"
 
-#: src/inc.c:643
+#: src/inc.c:642
 msgid "Finished (no new messages)"
 msgstr "Klaar (geen nieuwe berichten)"
 
-#: src/inc.c:652
+#: src/inc.c:651
 msgid "Some errors occurred while getting mail."
 msgstr "Er is een fout opgetreden bij het ophalen van de e-mail."
 
-#: src/inc.c:688
+#: src/inc.c:687
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "nieuwe berichten voor account %s worden opgehaald...\n"
 
-#: src/inc.c:691
+#: src/inc.c:690
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Nieuwe berichten worden opgehaald"
 
-#: src/inc.c:710
+#: src/inc.c:709
 #, fuzzy, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Verbinden met POP3 server: %s ..."
 
-#: src/inc.c:719
+#: src/inc.c:718
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Kan niet verbinden met POP3 server: %s:%d\n"
 
-#: src/inc.c:798 src/send_message.c:631
+#: src/inc.c:797 src/send_message.c:631
 msgid "Authenticating..."
 msgstr "Bezig met identificatie..."
 
-#: src/inc.c:799
+#: src/inc.c:798
 #, fuzzy, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Berichten worden van %s naar %s opgehaald...\n"
 
-#: src/inc.c:804
+#: src/inc.c:803
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Opvragen van het aantal nieuwe berichten (STAT)..."
 
-#: src/inc.c:808
+#: src/inc.c:807
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Opvragen van het aantal nieuwe berichten (LAST)..."
 
-#: src/inc.c:812
+#: src/inc.c:811
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Opvragen van het aantal nieuwe berichten (UIDL)..."
 
-#: src/inc.c:816
+#: src/inc.c:815
 msgid "Getting the size of messages (LIST)..."
 msgstr "Opvragen van de grootte van de nieuwe berichten (LIST)..."
 
-#: src/inc.c:826
+#: src/inc.c:825
 #, c-format
 msgid "Deleting message %d"
 msgstr "Bezig met verwijderen van bericht %d"
 
-#: src/inc.c:833 src/send_message.c:649
+#: src/inc.c:832 src/send_message.c:649
 msgid "Quitting"
 msgstr "Bezig met afsluiten"
 
-#: src/inc.c:858
+#: src/inc.c:857
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Bericht wordt opgehaald (%d / %d) (%s / %s)"
 
-#: src/inc.c:879
+#: src/inc.c:878
 #, fuzzy, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Klaar (%d bericht(en) (%s) ontvangen)"
 
-#: src/inc.c:1107
+#: src/inc.c:1106
 #, fuzzy
 msgid "Connection failed."
 msgstr "Verbinding mislukt"
 
-#: src/inc.c:1113
+#: src/inc.c:1112
 msgid "Error occurred while processing mail."
 msgstr "Fout bij het verwerken van de e-mail"
 
-#: src/inc.c:1118
+#: src/inc.c:1117
 #, fuzzy, c-format
 msgid ""
 "Error occurred while processing mail:\n"
 "%s"
 msgstr "Fout bij het verwerken van de e-mail"
 
-#: src/inc.c:1124
+#: src/inc.c:1123
 msgid "No disk space left."
 msgstr "De ruimte op de schijf is op."
 
-#: src/inc.c:1129
+#: src/inc.c:1128
 msgid "Can't write file."
 msgstr "Het bestand is niet beschrijfbaar."
 
-#: src/inc.c:1134
+#: src/inc.c:1133
 msgid "Socket error."
 msgstr "Socket-fout."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1140 src/send_message.c:584 src/send_message.c:772
+#: src/inc.c:1139 src/send_message.c:584 src/send_message.c:772
 msgid "Connection closed by the remote host."
 msgstr ""
 
-#: src/inc.c:1146
+#: src/inc.c:1145
 msgid "Mailbox is locked."
 msgstr "Mailbox is vergrendeld."
 
-#: src/inc.c:1150
+#: src/inc.c:1149
 #, fuzzy, c-format
 msgid ""
 "Mailbox is locked:\n"
 "%s"
 msgstr "Mailbox is vergrendeld."
 
-#: src/inc.c:1156 src/send_message.c:757
+#: src/inc.c:1155 src/send_message.c:757
 #, fuzzy
 msgid "Authentication failed."
 msgstr "Identificatiemethode"
 
-#: src/inc.c:1161 src/send_message.c:760
+#: src/inc.c:1160 src/send_message.c:760
 #, fuzzy, c-format
 msgid ""
 "Authentication failed:\n"
 "%s"
 msgstr "Identificatiemethode"
 
-#: src/inc.c:1166 src/send_message.c:776
+#: src/inc.c:1165 src/send_message.c:776
 msgid "Session timed out."
 msgstr ""
 
-#: src/inc.c:1202
+#: src/inc.c:1201
 msgid "Incorporation cancelled\n"
 msgstr "E-mail verwerken geannuleerd\n"
 
-#: src/inc.c:1285
+#: src/inc.c:1284
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Nieuwe berichten worden opgehaald van %s naar %s ...\n"
@@ -3319,14 +3320,15 @@ msgid "/_View/Mess_age source"
 msgstr "/B_eeld/Bekijk _broncode"
 
 #: src/mainwindow.c:708 src/messageview.c:245
-msgid "/_View/Show all _header"
+#, fuzzy
+msgid "/_View/Show all _headers"
 msgstr "/B_eeld/Vo_lledige header"
 
 #: src/mainwindow.c:710
 msgid "/_View/_Update summary"
 msgstr "/B_eeld/_Verversen"
 
-#: src/mainwindow.c:712 src/messageview.c:247
+#: src/mainwindow.c:712 src/messageview.c:248
 msgid "/_Message"
 msgstr "/Be_richt"
 
@@ -3361,16 +3363,16 @@ msgstr "/Be_richt/Berichten uit wachtrij verzenden"
 
 #: src/mainwindow.c:722 src/mainwindow.c:724 src/mainwindow.c:731
 #: src/mainwindow.c:736 src/mainwindow.c:739 src/mainwindow.c:750
-#: src/mainwindow.c:752 src/mainwindow.c:755 src/messageview.c:250
-#: src/messageview.c:258 src/messageview.c:263
+#: src/mainwindow.c:752 src/mainwindow.c:755 src/messageview.c:251
+#: src/messageview.c:259 src/messageview.c:264
 msgid "/_Message/---"
 msgstr "/Be_richt/---"
 
-#: src/mainwindow.c:723 src/messageview.c:248
+#: src/mainwindow.c:723 src/messageview.c:249
 msgid "/_Message/Compose _new message"
 msgstr "/Be_richt/_Nieuw bericht opstellen"
 
-#: src/mainwindow.c:725 src/messageview.c:251
+#: src/mainwindow.c:725 src/messageview.c:252
 msgid "/_Message/_Reply"
 msgstr "/Be_richt/_Beantwoorden"
 
@@ -3378,27 +3380,27 @@ msgstr "/Be_richt/_Beantwoorden"
 msgid "/_Message/Repl_y to"
 msgstr "/Be_richt/Antwoord _sturen aan"
 
-#: src/mainwindow.c:727 src/messageview.c:252
+#: src/mainwindow.c:727 src/messageview.c:253
 msgid "/_Message/Repl_y to/_all"
 msgstr "/Be_richt/Antwoord _sturen aan/_iedereen"
 
-#: src/mainwindow.c:728 src/messageview.c:254
+#: src/mainwindow.c:728 src/messageview.c:255
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/Be_richt/Antwoord _sturen aan/_afzender"
 
-#: src/mainwindow.c:729 src/messageview.c:256
+#: src/mainwindow.c:729 src/messageview.c:257
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/Be_richt/Antwoord _sturen aan/_mailinglijst"
 
-#: src/mainwindow.c:732 src/messageview.c:259
+#: src/mainwindow.c:732 src/messageview.c:260
 msgid "/_Message/_Forward"
 msgstr "/Be_richt/_Doorsturen"
 
-#: src/mainwindow.c:733 src/messageview.c:260
+#: src/mainwindow.c:733 src/messageview.c:261
 msgid "/_Message/For_ward as attachment"
 msgstr "/Be_richt/Doorsturen als bij_voeging"
 
-#: src/mainwindow.c:735 src/messageview.c:262
+#: src/mainwindow.c:735 src/messageview.c:263
 msgid "/_Message/Redirec_t"
 msgstr "/Be_richt/Om_leiden"
 
@@ -3457,7 +3459,7 @@ msgstr "/Be_richt/E-mail _ophalen"
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/Be_richt/E-mail _ophalen"
 
-#: src/mainwindow.c:756 src/messageview.c:264
+#: src/mainwindow.c:756 src/messageview.c:265
 msgid "/_Message/Re-_edit"
 msgstr "/Be_richt/Bewerken"
 
@@ -3476,23 +3478,23 @@ msgstr "/_Gereedschap/Berichten _filteren"
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Gereedschap/Berichten _filteren"
 
-#: src/mainwindow.c:767 src/messageview.c:271
+#: src/mainwindow.c:767 src/messageview.c:272
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Gereedschap/Filterregel _aanmaken"
 
-#: src/mainwindow.c:768 src/messageview.c:273
+#: src/mainwindow.c:768 src/messageview.c:274
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Gereedschap/_Creëer Filterregel/_Automatisch"
 
-#: src/mainwindow.c:770 src/messageview.c:275
+#: src/mainwindow.c:770 src/messageview.c:276
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Gereedschap/_Creëer filterregel/voor A_fzender"
 
-#: src/mainwindow.c:772 src/messageview.c:277
+#: src/mainwindow.c:772 src/messageview.c:278
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Gereedschap/_Creëer filterregel/voor _Geadresseerde"
 
-#: src/mainwindow.c:774 src/messageview.c:279
+#: src/mainwindow.c:774 src/messageview.c:280
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Gereedschap/_Creëer filterregel/voor _Onderwerp"
 
@@ -3613,7 +3615,7 @@ msgid "MainWindow: color allocation %d failed\n"
 msgstr "HoofdVenster: kleur %d kon niet gealloceerd worden\n"
 
 #: src/mainwindow.c:1139 src/summaryview.c:2275 src/summaryview.c:2360
-#: src/summaryview.c:3907 src/summaryview.c:4036 src/summaryview.c:4394
+#: src/summaryview.c:3908 src/summaryview.c:4037 src/summaryview.c:4395
 msgid "done.\n"
 msgstr "klaar.\n"
 
@@ -3879,7 +3881,7 @@ msgid "Find text:"
 msgstr "Zoek naar:"
 
 #: src/message_search.c:153 src/prefs_search_folder.c:253
-#: src/query_search.c:326
+#: src/query_search.c:343
 msgid "Case sensitive"
 msgstr "Hoofdlettergevoelig"
 
@@ -3903,27 +3905,27 @@ msgstr "Einde van het bericht bereikt; verdergaan vanaf het begin?"
 msgid "Search finished"
 msgstr "Zoeken voltooid"
 
-#: src/messageview.c:268
+#: src/messageview.c:269
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/_Gereedschap/Af_zender toevoegen aan adresboek"
 
-#: src/messageview.c:300
+#: src/messageview.c:301
 msgid "Creating message view...\n"
 msgstr "Berichtview wordt gemaakt...\n"
 
-#: src/messageview.c:325
+#: src/messageview.c:326
 msgid "Text"
 msgstr "Tekst"
 
-#: src/messageview.c:330
+#: src/messageview.c:331
 msgid "Attachments"
 msgstr "Bijvoegingen"
 
-#: src/messageview.c:380
+#: src/messageview.c:381
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:699 src/summaryview.c:3436
+#: src/messageview.c:700 src/summaryview.c:3436
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Kan het bestand '%s' niet opslaan."
@@ -3941,7 +3943,7 @@ msgstr "Uitvoeren"
 msgid "Print"
 msgstr "Afdrukken"
 
-#: src/messageview.c:770 src/summaryview.c:3471
+#: src/messageview.c:769 src/summaryview.c:3470
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -4041,11 +4043,11 @@ msgstr ""
 "Geef de opdracht om het bestand mee te openen:\n"
 "('%s' zal vervangen worden door de bestandsnaam)"
 
-#: src/mimeview.c:1147
+#: src/mimeview.c:1140
 msgid "Opening executable file"
 msgstr ""
 
-#: src/mimeview.c:1148
+#: src/mimeview.c:1141
 msgid ""
 "This is an executable file. Opening executable file is restricted for "
 "security.\n"
@@ -4053,11 +4055,6 @@ msgid ""
 "virus or something like a malicious program."
 msgstr ""
 
-#: src/mimeview.c:1184
-#, c-format
-msgid "MIME viewer command line is invalid: `%s'"
-msgstr "MIMEviewer commandoregel is ongeldig: '%s'"
-
 #: src/passphrase.c:96
 msgid "Passphrase"
 msgstr "Wachtwoord"
@@ -5867,21 +5864,21 @@ msgstr "Antwoord-Aan:"
 msgid "%s - Edit search condition"
 msgstr ""
 
-#: src/prefs_search_folder.c:209 src/query_search.c:257
+#: src/prefs_search_folder.c:209 src/query_search.c:274
 msgid "Match any of the following"
 msgstr ""
 
-#: src/prefs_search_folder.c:211 src/query_search.c:259
+#: src/prefs_search_folder.c:211 src/query_search.c:276
 #, fuzzy
 msgid "Match all of the following"
 msgstr "Stel automatisch de volgende adressen in"
 
-#: src/prefs_search_folder.c:231 src/query_search.c:303
+#: src/prefs_search_folder.c:231 src/query_search.c:320
 #, fuzzy
 msgid "Folder:"
 msgstr "Accounts"
 
-#: src/prefs_search_folder.c:248 src/query_search.c:321
+#: src/prefs_search_folder.c:248 src/query_search.c:338
 #, fuzzy
 msgid "Search subfolders"
 msgstr "Zoeken mislukt"
@@ -5896,17 +5893,17 @@ msgid "Attachment"
 msgstr "Bijvoeging"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73 src/query_search.c:371 src/summaryview.c:4901
+#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4902
 msgid "Subject"
 msgstr "Onderwerp"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/query_search.c:372 src/summaryview.c:4904
+#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4905
 msgid "From"
 msgstr "Afzender"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/query_search.c:373 src/summaryview.c:4906
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:4907
 msgid "Date"
 msgstr "Datum"
 
@@ -6000,43 +5997,43 @@ msgstr "Voortgangsdialoogvenster wordt gemaakt...\n"
 msgid "Status"
 msgstr "Status"
 
-#: src/query_search.c:234
+#: src/query_search.c:251
 msgid "Search messages"
 msgstr "Berichten doorzoeken"
 
-#: src/query_search.c:395
+#: src/query_search.c:423
 #, fuzzy
 msgid "_Save as search folder"
 msgstr "Opslaan als klad"
 
-#: src/query_search.c:512 src/subscribedialog.c:526 src/summaryview.c:842
+#: src/query_search.c:542 src/subscribedialog.c:526 src/summaryview.c:842
 msgid "Done."
 msgstr "Klaar."
 
-#: src/query_search.c:536
+#: src/query_search.c:566
 #, fuzzy, c-format
 msgid "Searching %s ..."
 msgstr "Bezig met inlezen van map %s ..."
 
-#: src/query_search.c:564
+#: src/query_search.c:594
 #, fuzzy, c-format
 msgid "Searching %s (%d / %d)..."
 msgstr "Bezig met filteren..."
 
-#: src/query_search.c:645 src/summaryview.c:2051
+#: src/query_search.c:675 src/summaryview.c:2051
 msgid "(No Date)"
 msgstr "(Geen datum)"
 
-#: src/query_search.c:833
+#: src/query_search.c:869
 #, fuzzy
 msgid "Save as search folder"
 msgstr "Opslaan als klad"
 
-#: src/query_search.c:854
+#: src/query_search.c:890
 msgid "Location:"
 msgstr ""
 
-#: src/query_search.c:869
+#: src/query_search.c:905
 #, fuzzy
 msgid "Folder name:"
 msgstr "Bestandsnaam"
@@ -6667,38 +6664,38 @@ msgstr "Bericht %d staat klaar om gekopieerd te worden naar %s\n"
 msgid "Destination for copy is same as current folder."
 msgstr "Doel is gelijk aan de huidige map."
 
-#: src/summaryview.c:3506
+#: src/summaryview.c:3507
 #, fuzzy
 msgid "Error occurred while processing messages."
 msgstr "Fout bij het verwerken van de e-mail"
 
-#: src/summaryview.c:3814 src/summaryview.c:3815
+#: src/summaryview.c:3815 src/summaryview.c:3816
 msgid "Building threads..."
 msgstr "Discussies worden bij elkaar gevoegd..."
 
-#: src/summaryview.c:3965 src/summaryview.c:3966
+#: src/summaryview.c:3966 src/summaryview.c:3967
 msgid "Unthreading..."
 msgstr "Discussies worden uit elkaar gehaald..."
 
-#: src/summaryview.c:4259 src/summaryview.c:4315
+#: src/summaryview.c:4260 src/summaryview.c:4316
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Bezig met filteren..."
 
-#: src/summaryview.c:4364
+#: src/summaryview.c:4365
 msgid "filtering..."
 msgstr "Bezig met filteren..."
 
-#: src/summaryview.c:4365
+#: src/summaryview.c:4366
 msgid "Filtering..."
 msgstr "Bezig met filteren..."
 
-#: src/summaryview.c:4401
+#: src/summaryview.c:4402
 #, fuzzy, c-format
 msgid "%d message(s) have been filtered."
 msgstr "bericht %d is reeds gebufferd.\n"
 
-#: src/summaryview.c:4910
+#: src/summaryview.c:4911
 msgid "No."
 msgstr "Nr."
 
@@ -6788,6 +6785,9 @@ msgstr "Afsluiten"
 msgid "Sylpheed"
 msgstr "Oude Sylpheed"
 
+#~ msgid "MIME viewer command line is invalid: `%s'"
+#~ msgstr "MIMEviewer commandoregel is ongeldig: '%s'"
+
 #~ msgid "%dB"
 #~ msgstr "%dB"
 
diff --git a/po/pl.po b/po/pl.po
index db9b77c2..0fabcc8b 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-03-02 19:03+0900\n"
+"POT-Creation-Date: 2006-03-10 16:06+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:491
+#: libsylph/prefs_common.c:496
 #, fuzzy
 msgid "Junk mail filter"
 msgstr "Niechciana poczta"
@@ -517,7 +517,7 @@ msgstr "nie można otworzyć pliku zaznaczeń\n"
 msgid "can't fetch message %d\n"
 msgstr "nie można pobrać wiadomości %d\n"
 
-#: libsylph/procmsg.c:1375
+#: libsylph/procmsg.c:1378
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Błędny wiersz polecenia wydruku: \"%s\"\n"
@@ -595,12 +595,12 @@ msgstr "Temat: %s\n"
 msgid "  Issuer: %s\n"
 msgstr "  Nadawca: %s\n"
 
-#: libsylph/utils.c:2411 src/compose.c:2869 src/compose.c:3132
-#: src/compose.c:3195 src/compose.c:3315
+#: libsylph/utils.c:2430 src/compose.c:2888 src/compose.c:3151
+#: src/compose.c:3214 src/compose.c:3334
 msgid "can't change file mode\n"
 msgstr "nie można zmienić trybu pliku\n"
 
-#: libsylph/utils.c:2418 libsylph/utils.c:2542
+#: libsylph/utils.c:2437 libsylph/utils.c:2561
 #, c-format
 msgid "writing to %s failed.\n"
 msgstr "błąd zapisu do %s.\n"
@@ -684,8 +684,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:493
-#: src/compose.c:4273 src/editaddress.c:200 src/editaddress.c:942
+#: src/account_dialog.c:366 src/addressadd.c:192 src/addressbook.c:491
+#: src/compose.c:4292 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
@@ -822,12 +822,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:4777 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4796 src/editaddress.c:201
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "Adres"
 
-#: src/addressadd.c:212 src/addressbook.c:495 src/editaddress.c:202
+#: src/addressadd.c:212 src/addressbook.c:493 src/editaddress.c:202
 #: src/editaddress.c:795 src/editaddress.c:860 src/editgroup.c:267
 msgid "Remarks"
 msgstr "Uwagi"
@@ -836,110 +836,111 @@ msgstr "Uwagi"
 msgid "Select Address Book Folder"
 msgstr "Wybierz katalog książki adresowej"
 
-#: src/addressbook.c:338 src/compose.c:515 src/mainwindow.c:489
+#: src/addressbook.c:337 src/compose.c:515 src/mainwindow.c:489
 #: src/messageview.c:140
 msgid "/_File"
 msgstr "/_Plik"
 
-#: src/addressbook.c:339
+#: src/addressbook.c:338
 msgid "/_File/New _Book"
 msgstr "/_Plik/Nowa _książka"
 
-#: src/addressbook.c:340
+#: src/addressbook.c:339
 msgid "/_File/New _vCard"
 msgstr "/_Plik/Nowy _vCard"
 
-#: src/addressbook.c:342
+#: src/addressbook.c:341
 msgid "/_File/New _JPilot"
 msgstr "/_Plik/Nowy _J-Pilot"
 
-#: src/addressbook.c:345
-msgid "/_File/New _Server"
+#: src/addressbook.c:344
+#, fuzzy
+msgid "/_File/New _LDAP Server"
 msgstr "/_Plik/Nowy _Serwer"
 
-#: src/addressbook.c:347 src/addressbook.c:350 src/compose.c:520
+#: src/addressbook.c:346 src/addressbook.c:349 src/compose.c:520
 #: src/compose.c:525 src/compose.c:528 src/compose.c:531 src/mainwindow.c:507
 #: src/mainwindow.c:510 src/mainwindow.c:512 src/mainwindow.c:515
 #: src/mainwindow.c:517 src/messageview.c:143
 msgid "/_File/---"
 msgstr "/_Plik/---"
 
-#: src/addressbook.c:348
+#: src/addressbook.c:347
 msgid "/_File/_Edit"
 msgstr "/_Plik/_Edycja"
 
-#: src/addressbook.c:349
+#: src/addressbook.c:348
 msgid "/_File/_Delete"
 msgstr "/_Plik/_Usuń"
 
-#: src/addressbook.c:351
+#: src/addressbook.c:350
 msgid "/_File/_Save"
 msgstr "/_Plik/Zapi_sz"
 
-#: src/addressbook.c:352 src/compose.c:532 src/messageview.c:144
+#: src/addressbook.c:351 src/compose.c:532 src/messageview.c:144
 msgid "/_File/_Close"
 msgstr "/_Plik/_Zamknij"
 
-#: src/addressbook.c:353
+#: src/addressbook.c:352
 msgid "/_Address"
 msgstr "/_Adres"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:353
 msgid "/_Address/New _Address"
 msgstr "/_Plik/Nowy _adres"
 
-#: src/addressbook.c:355
+#: src/addressbook.c:354
 msgid "/_Address/New _Group"
 msgstr "/_Plik/Nowa _grupa"
 
-#: src/addressbook.c:356
+#: src/addressbook.c:355
 msgid "/_Address/New _Folder"
 msgstr "/_Plik/Nowy _katalog"
 
-#: src/addressbook.c:357
+#: src/addressbook.c:356
 msgid "/_Address/---"
 msgstr "/_Adres/---"
 
-#: src/addressbook.c:358
+#: src/addressbook.c:357
 msgid "/_Address/_Edit"
 msgstr "/_Adres/_Edycja"
 
-#: src/addressbook.c:359
+#: src/addressbook.c:358
 msgid "/_Address/_Delete"
 msgstr "/_Adres/_Usuń"
 
-#: src/addressbook.c:360 src/compose.c:645 src/mainwindow.c:758
-#: src/messageview.c:266
+#: src/addressbook.c:359 src/compose.c:645 src/mainwindow.c:758
+#: src/messageview.c:267
 msgid "/_Tools"
 msgstr "/_Narzędzia"
 
-#: src/addressbook.c:361
+#: src/addressbook.c:360
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Plik/Importuj plik _LDIF"
 
-#: src/addressbook.c:362 src/compose.c:666 src/mainwindow.c:812
-#: src/messageview.c:286
+#: src/addressbook.c:361 src/compose.c:666 src/mainwindow.c:812
+#: src/messageview.c:287
 msgid "/_Help"
 msgstr "/Pomo_c"
 
-#: src/addressbook.c:363 src/compose.c:667 src/mainwindow.c:824
-#: src/messageview.c:287
+#: src/addressbook.c:362 src/compose.c:667 src/mainwindow.c:824
+#: src/messageview.c:288
 msgid "/_Help/_About"
 msgstr "/Pomo_c/_O programie"
 
-#: src/addressbook.c:382 src/addressbook.c:392
+#: src/addressbook.c:381 src/addressbook.c:391
 msgid "/New _Address"
 msgstr "/Nowy _adres"
 
-#: src/addressbook.c:383 src/addressbook.c:393
+#: src/addressbook.c:382 src/addressbook.c:392
 msgid "/New _Group"
 msgstr "/Nowa _grupa"
 
-#: src/addressbook.c:384 src/addressbook.c:394
+#: src/addressbook.c:383 src/addressbook.c:393
 msgid "/New _Folder"
 msgstr "/Nowy _katalog"
 
-#: src/addressbook.c:385 src/addressbook.c:395 src/compose.c:509
+#: src/addressbook.c:384 src/addressbook.c:394 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
@@ -949,70 +950,70 @@ msgstr "/Nowy _katalog"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:386 src/addressbook.c:396 src/compose.c:534
+#: src/addressbook.c:385 src/addressbook.c:395 src/compose.c:534
 #: src/mainwindow.c:521 src/messageview.c:146
 msgid "/_Edit"
 msgstr "/_Edycja"
 
-#: src/addressbook.c:387 src/addressbook.c:397 src/summaryview.c:434
+#: src/addressbook.c:386 src/addressbook.c:396 src/summaryview.c:434
 msgid "/_Delete"
 msgstr "/_Usuń"
 
-#: src/addressbook.c:494
+#: src/addressbook.c:492
 msgid "E-Mail address"
 msgstr "Adres e-mail"
 
-#: src/addressbook.c:498 src/compose.c:4778 src/prefs_common_dialog.c:2183
+#: src/addressbook.c:496 src/compose.c:4797 src/prefs_common_dialog.c:2183
 msgid "Address book"
 msgstr "Książka adresowa"
 
-#: src/addressbook.c:600 src/prefs_filter_edit.c:249
+#: src/addressbook.c:603 src/prefs_filter_edit.c:249
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "Nazwa:"
 
 #. Buttons
-#: src/addressbook.c:632 src/addressbook.c:1684 src/editaddress.c:884
+#: src/addressbook.c:636 src/addressbook.c:1678 src/editaddress.c:884
 #: src/editaddress.c:1017 src/mainwindow.c:2426 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:635 src/editaddress.c:890 src/editaddress.c:1023
+#: src/addressbook.c:639 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:1552
 msgid "Add"
 msgstr "Dodaj"
 
-#: src/addressbook.c:638
+#: src/addressbook.c:642
 msgid "Lookup"
 msgstr "Wyszukaj"
 
-#: src/addressbook.c:650 src/headerview.c:55 src/prefs_folder_item.c:339
+#: src/addressbook.c:654 src/headerview.c:55 src/prefs_folder_item.c:339
 #: src/prefs_template.c:176
 msgid "To:"
 msgstr "Do:"
 
-#: src/addressbook.c:654 src/prefs_folder_item.c:356 src/prefs_template.c:178
+#: src/addressbook.c:658 src/prefs_folder_item.c:356 src/prefs_template.c:178
 msgid "Cc:"
 msgstr "Kopia:"
 
-#: src/addressbook.c:658 src/prefs_folder_item.c:367
+#: src/addressbook.c:662 src/prefs_folder_item.c:367
 msgid "Bcc:"
 msgstr "Ukryta kopia:"
 
 #. Confirm deletion
-#: src/addressbook.c:845
+#: src/addressbook.c:832
 msgid "Delete address(es)"
 msgstr "Usuń adres(y)"
 
-#: src/addressbook.c:846
+#: src/addressbook.c:833
 msgid "Really delete the address(es)?"
 msgstr "Czy naprawdę chcesz usunąć ten adres(y)?"
 
-#: src/addressbook.c:1675
+#: src/addressbook.c:1669
 #, fuzzy, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1022,38 +1023,38 @@ msgstr ""
 "Jeśli usuniesz tylko katalog, adresy zostaną przeniesione do nadrzędnego "
 "katalogu."
 
-#: src/addressbook.c:1678 src/folderview.c:2372
+#: src/addressbook.c:1672 src/folderview.c:2372
 msgid "Delete folder"
 msgstr "Usuń katalog"
 
-#: src/addressbook.c:1678
+#: src/addressbook.c:1672
 #, fuzzy
 msgid "_Folder only"
 msgstr "Tylko katalog"
 
-#: src/addressbook.c:1678
+#: src/addressbook.c:1672
 #, fuzzy
 msgid "Folder and _addresses"
 msgstr "Katalog i adresy"
 
-#: src/addressbook.c:1683
+#: src/addressbook.c:1677
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Czy naprawdę usunąć \"%s\" ?"
 
-#: src/addressbook.c:2369 src/addressbook.c:2502
+#: src/addressbook.c:2363 src/addressbook.c:2496
 msgid "New user, could not save index file."
 msgstr "Nowy użytkownik, nie można było zapisać pliku indeksu."
 
-#: src/addressbook.c:2373 src/addressbook.c:2506
+#: src/addressbook.c:2367 src/addressbook.c:2500
 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:2383 src/addressbook.c:2516
+#: src/addressbook.c:2377 src/addressbook.c:2510
 msgid "Old address book converted successfully."
 msgstr "Konwersja starej książki adresowej została zakończona pomyślnie."
 
-#: src/addressbook.c:2388
+#: src/addressbook.c:2382
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1061,7 +1062,7 @@ msgstr ""
 "Stara książka adresowa została skonwertowana,\n"
 "nie można było zapisać nowego pliku indeksu adresów."
 
-#: src/addressbook.c:2401
+#: src/addressbook.c:2395
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1069,7 +1070,7 @@ msgstr ""
 "Nie można było skonwertować książki adresowej,\n"
 "utworzono puste pliki nowej książki adresowej."
 
-#: src/addressbook.c:2407
+#: src/addressbook.c:2401
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1077,7 +1078,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:2412
+#: src/addressbook.c:2406
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1085,92 +1086,92 @@ msgstr ""
 "Nie można było skonwertować książki adresowej\n"
 "oraz utworzyć nowych plików książki adresowej."
 
-#: src/addressbook.c:2419
+#: src/addressbook.c:2413
 msgid "Addressbook conversion error"
 msgstr "Błąd konwersji książki adresowej"
 
-#: src/addressbook.c:2423
+#: src/addressbook.c:2417
 msgid "Addressbook conversion"
 msgstr "Konwersja książki adresowej"
 
-#: src/addressbook.c:2458
+#: src/addressbook.c:2452
 msgid "Addressbook Error"
 msgstr "Błąd książki adresowej"
 
-#: src/addressbook.c:2459 src/addressbook.c:2559
+#: src/addressbook.c:2453 src/addressbook.c:2553
 msgid "Could not read address index"
 msgstr "Nie można odczytać książki adresowej"
 
-#: src/addressbook.c:2521
+#: src/addressbook.c:2515
 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:2535
+#: src/addressbook.c:2529
 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:2541
+#: src/addressbook.c:2535
 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:2547
+#: src/addressbook.c:2541
 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:2565
+#: src/addressbook.c:2559
 msgid "Addressbook Conversion Error"
 msgstr "Błąd konwersji książki adresowej"
 
-#: src/addressbook.c:2571
+#: src/addressbook.c:2565
 msgid "Addressbook Conversion"
 msgstr "Konwersja książki adresowej"
 
-#: src/addressbook.c:3086 src/prefs_common_dialog.c:2033
+#: src/addressbook.c:3080 src/prefs_common_dialog.c:2033
 msgid "Interface"
 msgstr "Interfejs"
 
-#: src/addressbook.c:3102 src/importldif.c:514
+#: src/addressbook.c:3096 src/importldif.c:514
 msgid "Address Book"
 msgstr "Książka adresowa"
 
-#: src/addressbook.c:3118
+#: src/addressbook.c:3112
 msgid "Person"
 msgstr "Osoba"
 
-#: src/addressbook.c:3134
+#: src/addressbook.c:3128
 msgid "EMail Address"
 msgstr "Adres e-mail"
 
-#: src/addressbook.c:3150
+#: src/addressbook.c:3144
 msgid "Group"
 msgstr "Grupa"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3166 src/folderview.c:367 src/prefs_account_dialog.c:1694
-#: src/query_search.c:370
+#: src/addressbook.c:3160 src/folderview.c:367 src/prefs_account_dialog.c:1694
+#: src/query_search.c:398
 msgid "Folder"
 msgstr "Katalog"
 
-#: src/addressbook.c:3182
+#: src/addressbook.c:3176
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3198 src/addressbook.c:3214
+#: src/addressbook.c:3192 src/addressbook.c:3208
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3230
+#: src/addressbook.c:3224
 msgid "LDAP Server"
 msgstr "Serwer LDAP"
 
@@ -1182,7 +1183,7 @@ msgstr "Wspólny adres:"
 msgid "Personal address"
 msgstr "Osobisty adres:"
 
-#: src/alertpanel.c:142 src/compose.c:5500 src/main.c:621
+#: src/alertpanel.c:142 src/compose.c:5517 src/main.c:621
 msgid "Notice"
 msgstr "Notatka"
 
@@ -1190,7 +1191,7 @@ msgstr "Notatka"
 msgid "Warning"
 msgstr "Ostrzeżenie"
 
-#: src/alertpanel.c:168 src/inc.c:587
+#: src/alertpanel.c:168 src/inc.c:586
 msgid "Error"
 msgstr "Błąd"
 
@@ -1233,7 +1234,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:4761
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4762
 msgid "None"
 msgstr "Brak"
 
@@ -1482,7 +1483,7 @@ msgstr "/_Widok/Kodowani_e znaków/Tajskie (TIS-620)"
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Widok/Kodowani_e znaków/Tajskie (Windows-874)"
 
-#: src/compose.c:646 src/mainwindow.c:759 src/messageview.c:267
+#: src/compose.c:646 src/mainwindow.c:759 src/messageview.c:268
 msgid "/_Tools/_Address book"
 msgstr "/_Narzędzia/_Książka adresowa"
 
@@ -1490,14 +1491,14 @@ msgstr "/_Narzędzia/_Książka adresowa"
 msgid "/_Tools/_Template"
 msgstr "/_Narzędzia/_Szablon"
 
-#: src/compose.c:649 src/mainwindow.c:783 src/messageview.c:283
+#: src/compose.c:649 src/mainwindow.c:783 src/messageview.c:284
 msgid "/_Tools/Actio_ns"
 msgstr "/_Narzędzia/Polecen_ia"
 
 #: src/compose.c:651 src/compose.c:655 src/compose.c:661 src/mainwindow.c:762
 #: src/mainwindow.c:776 src/mainwindow.c:781 src/mainwindow.c:784
-#: src/mainwindow.c:788 src/mainwindow.c:790 src/messageview.c:270
-#: src/messageview.c:282
+#: src/mainwindow.c:788 src/mainwindow.c:790 src/messageview.c:271
+#: src/messageview.c:283
 msgid "/_Tools/---"
 msgstr "/_Narzędzia/---"
 
@@ -1523,80 +1524,80 @@ msgstr "/_Narzędzia/_Wykonaj"
 msgid "/_Tools/_Set spell language"
 msgstr "/_Narzędzia/_Szablon"
 
-#: src/compose.c:910
+#: src/compose.c:912
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: brak pliku\n"
 
-#: src/compose.c:1014 src/compose.c:1085
+#: src/compose.c:1016 src/compose.c:1087
 msgid "Can't get text part\n"
 msgstr "Nie mogę pobrać części tekstu\n"
 
-#: src/compose.c:1486
+#: src/compose.c:1488
 msgid "Quote mark format error."
 msgstr "Błąd formatu znacznika cytatu."
 
-#: src/compose.c:1498
+#: src/compose.c:1500
 msgid "Message reply/forward format error."
 msgstr "Błąd formatu odpowiedz/przekaż wiadomość."
 
-#: src/compose.c:1918
+#: src/compose.c:1935
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Plik %s nie istnieje\n"
 
-#: src/compose.c:1922
+#: src/compose.c:1939
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Nie można odczytać wielkości pliku %s\n"
 
-#: src/compose.c:1926
+#: src/compose.c:1943
 #, c-format
 msgid "File %s is empty."
 msgstr "Plik %s jest pusty."
 
-#: src/compose.c:1930
+#: src/compose.c:1947
 #, c-format
 msgid "Can't read %s."
 msgstr "Nie można odczytać %s."
 
-#: src/compose.c:1963
+#: src/compose.c:1980
 #, c-format
 msgid "Message: %s"
 msgstr "Wiadomość: %s"
 
-#: src/compose.c:2023 src/mimeview.c:565
+#: src/compose.c:2040 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:2507 src/headerview.c:195 src/query_search.c:636
+#: src/compose.c:2524 src/headerview.c:195 src/query_search.c:666
 #: src/summaryview.c:2124
 msgid "(No Subject)"
 msgstr "(Bez tematu)"
 
-#: src/compose.c:2510
+#: src/compose.c:2527
 #, fuzzy, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Utwórz wiadomość%s"
 
-#: src/compose.c:2623
+#: src/compose.c:2642
 msgid "Recipient is not specified."
 msgstr "Nie podano odbiorcy."
 
-#: src/compose.c:2631
+#: src/compose.c:2650
 #, fuzzy
 msgid "Empty subject"
 msgstr "Temat"
 
-#: src/compose.c:2632
+#: src/compose.c:2651
 msgid "Subject is empty. Send it anyway?"
 msgstr "Wiadomość nie posiada tematu. Czy wysłać ją mimo tego ?"
 
-#: src/compose.c:2691
+#: src/compose.c:2710
 msgid "can't get recipient list."
 msgstr "nie można pobrać listy odbiorców."
 
-#: src/compose.c:2711
+#: src/compose.c:2730
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1604,22 +1605,22 @@ msgstr ""
 "Nie podano konta pocztowego do wysyłania wiadomości.\n"
 "Należy wybrać konto przed wysłaniem."
 
-#: src/compose.c:2725 src/send_message.c:299
+#: src/compose.c:2744 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:2767
+#: src/compose.c:2786
 msgid "Can't save the message to outbox."
 msgstr "Nie można zapisać wiadomości do outbox."
 
-#: src/compose.c:2805
+#: src/compose.c:2824
 #, 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:2902
+#: src/compose.c:2921
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1629,12 +1630,12 @@ msgstr ""
 "Nie można przekonwertować treści wiadomości z %s na %s.\n"
 "Wysłać wiadomość mimo to %s ?"
 
-#: src/compose.c:2908
+#: src/compose.c:2927
 #, fuzzy
 msgid "Code conversion error"
 msgstr "Błąd konwersji książki adresowej"
 
-#: src/compose.c:2981
+#: src/compose.c:3000
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1643,157 +1644,157 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:2985
+#: src/compose.c:3004
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3275
+#: src/compose.c:3294
 msgid "can't remove the old message\n"
 msgstr "Nie można usunąć starej wiadomości\n"
 
-#: src/compose.c:3293
+#: src/compose.c:3312
 msgid "queueing message...\n"
 msgstr "kolejkowanie wiadomości...\n"
 
-#: src/compose.c:3375
+#: src/compose.c:3394
 msgid "can't find queue folder\n"
 msgstr "nie można znaleźć katalogu kolejki\n"
 
-#: src/compose.c:3382
+#: src/compose.c:3401
 msgid "can't queue the message\n"
 msgstr "nie można zapisać wiadomości do kolejki\n"
 
-#: src/compose.c:3975
+#: src/compose.c:3994
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "wygenerowany Message-ID: %s\n"
 
-#: src/compose.c:4088
+#: src/compose.c:4107
 msgid "Creating compose window...\n"
 msgstr "Tworzenie okna edycji...\n"
 
-#: src/compose.c:4139 src/headerview.c:54
+#: src/compose.c:4158 src/headerview.c:54
 msgid "From:"
 msgstr "Od:"
 
-#: src/compose.c:4213
+#: src/compose.c:4232
 msgid "PGP Sign"
 msgstr "Podpis PGP"
 
-#: src/compose.c:4216
+#: src/compose.c:4235
 msgid "PGP Encrypt"
 msgstr "Szyfrowanie PGP"
 
-#: src/compose.c:4254 src/compose.c:5332
+#: src/compose.c:4273 src/compose.c:5351
 msgid "MIME type"
 msgstr "typ MIME"
 
 #. S_COL_DATE
-#: src/compose.c:4263 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4908
+#: src/compose.c:4282 src/mimeview.c:197 src/prefs_filter_edit.c:496
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4909
 msgid "Size"
 msgstr "Rozmiar"
 
-#: src/compose.c:4698 src/mainwindow.c:2359 src/prefs_account_dialog.c:528
+#: src/compose.c:4717 src/mainwindow.c:2359 src/prefs_account_dialog.c:528
 #: src/prefs_common_dialog.c:661
 msgid "Send"
 msgstr "Wyślij"
 
-#: src/compose.c:4699
+#: src/compose.c:4718
 msgid "Send message"
 msgstr "Wyślij wiadomość"
 
-#: src/compose.c:4707
+#: src/compose.c:4726
 msgid "Send later"
 msgstr "Wyślij później"
 
-#: src/compose.c:4708
+#: src/compose.c:4727
 msgid "Put into queue folder and send later"
 msgstr "Umieść w katalogu kolejki i wyślij później"
 
-#: src/compose.c:4716
+#: src/compose.c:4735
 msgid "Draft"
 msgstr "Draft"
 
-#: src/compose.c:4717
+#: src/compose.c:4736
 msgid "Save to draft folder"
 msgstr "Zapisz w katalogu szablonów"
 
-#: src/compose.c:4727
+#: src/compose.c:4746
 msgid "Insert"
 msgstr "Wstaw"
 
-#: src/compose.c:4728
+#: src/compose.c:4747
 msgid "Insert file"
 msgstr "Wstaw plik"
 
-#: src/compose.c:4736
+#: src/compose.c:4755
 msgid "Attach"
 msgstr "Dołącz"
 
-#: src/compose.c:4737
+#: src/compose.c:4756
 msgid "Attach file"
 msgstr "Dołącz plik"
 
 #. signature
-#: src/compose.c:4747 src/prefs_account_dialog.c:1208
+#: src/compose.c:4766 src/prefs_account_dialog.c:1208
 #: src/prefs_common_dialog.c:953
 msgid "Signature"
 msgstr "Podpis"
 
-#: src/compose.c:4748
+#: src/compose.c:4767
 #, fuzzy
 msgid "Append signature"
 msgstr "ZŁY podpis"
 
 #. editor
-#: src/compose.c:4757 src/prefs_common_dialog.c:991
+#: src/compose.c:4776 src/prefs_common_dialog.c:991
 #: src/prefs_common_dialog.c:2315
 msgid "Editor"
 msgstr "Edytor"
 
-#: src/compose.c:4758
+#: src/compose.c:4777
 msgid "Edit with external editor"
 msgstr "Edytuj w zewnętrznym edytorze"
 
-#: src/compose.c:4766
+#: src/compose.c:4785
 msgid "Linewrap"
 msgstr "Zawijanie linii"
 
-#: src/compose.c:4767
+#: src/compose.c:4786
 msgid "Wrap all long lines"
 msgstr "Zawijaj wszystkie długie linie"
 
-#: src/compose.c:5228
+#: src/compose.c:5247
 msgid "Invalid MIME type."
 msgstr "Niepoprawny typ MIME."
 
-#: src/compose.c:5246
+#: src/compose.c:5265
 msgid "File doesn't exist or is empty."
 msgstr "Brak pliku lub pusty plik."
 
-#: src/compose.c:5314
+#: src/compose.c:5333
 msgid "Properties"
 msgstr "Właściwości"
 
-#: src/compose.c:5334 src/prefs_common_dialog.c:1444
+#: src/compose.c:5353 src/prefs_common_dialog.c:1444
 msgid "Encoding"
 msgstr "Kodowanie"
 
-#: src/compose.c:5357 src/prefs_folder_item.c:202
+#: src/compose.c:5376 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Ścieżka"
 
-#: src/compose.c:5358
+#: src/compose.c:5377
 msgid "File name"
 msgstr "Nazwa pliku"
 
-#: src/compose.c:5449
+#: src/compose.c:5466
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Niepoprawna linia wywołania zewnętrznego edytora: \"%s\"\n"
 
-#: src/compose.c:5497
+#: src/compose.c:5514
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1803,47 +1804,47 @@ msgstr ""
 "Czy wymusić zakończenie procesu?\n"
 "identyfikator grupy procesów: %d"
 
-#: src/compose.c:5872 src/compose.c:5877 src/compose.c:5883
+#: src/compose.c:5889 src/compose.c:5894 src/compose.c:5900
 msgid "Can't queue the message."
 msgstr "Nie można wstawić wiadomości do kolejki."
 
-#: src/compose.c:5974
+#: src/compose.c:5991
 msgid "Select files"
 msgstr "Wybierz pliki"
 
-#: src/compose.c:5997
+#: src/compose.c:6014
 msgid "Select file"
 msgstr "Wybierz plik"
 
-#: src/compose.c:6032
+#: src/compose.c:6049
 #, fuzzy
 msgid "Save message"
 msgstr "Wyślij wiadomość"
 
-#: src/compose.c:6033
+#: src/compose.c:6050
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Wiadomość została zmieniona, czy porzucić ją?"
 
-#: src/compose.c:6035
+#: src/compose.c:6052
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:6077
+#: src/compose.c:6094
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Czy chcesz zastosować szablon \"%s\"?"
 
-#: src/compose.c:6079
+#: src/compose.c:6096
 msgid "Apply template"
 msgstr "Zastosuj szablon"
 
-#: src/compose.c:6080
+#: src/compose.c:6097
 #, fuzzy
 msgid "_Replace"
 msgstr "Zamień"
 
-#: src/compose.c:6080
+#: src/compose.c:6097
 #, fuzzy
 msgid "_Insert"
 msgstr "Wstaw"
@@ -1965,52 +1966,52 @@ msgstr "Należy podać nazwę grupy."
 msgid "Edit Group Data"
 msgstr "Edytuj dane grupy"
 
-#: src/editgroup.c:300
+#: src/editgroup.c:299
 msgid "Group Name"
 msgstr "Nazwa grupy"
 
-#: src/editgroup.c:319
+#: src/editgroup.c:318
 msgid "Addresses in Group"
 msgstr "Adresy w grupie"
 
-#: src/editgroup.c:321
+#: src/editgroup.c:320
 msgid " -> "
 msgstr " -> "
 
-#: src/editgroup.c:348
+#: src/editgroup.c:347
 msgid " <- "
 msgstr " <- "
 
-#: src/editgroup.c:350
+#: src/editgroup.c:349
 msgid "Available Addresses"
 msgstr "Dostępne adresy"
 
-#: src/editgroup.c:416
+#: src/editgroup.c:415
 msgid "Move E-Mail Addresses to or from Group with arrow buttons"
 msgstr "Przenieś przyciskami strzałek adresy email do lub z grupy"
 
-#: src/editgroup.c:468
+#: src/editgroup.c:467
 msgid "Edit Group Details"
 msgstr "Edytuj szczegóły grupy"
 
-#: src/editgroup.c:471
+#: src/editgroup.c:470
 msgid "Add New Group"
 msgstr "Dodaj nową grupę"
 
-#: src/editgroup.c:522
+#: src/editgroup.c:521
 msgid "Edit folder"
 msgstr "Edytuj katalog"
 
-#: src/editgroup.c:522
+#: src/editgroup.c:521
 msgid "Input the new name of folder:"
 msgstr "Podaj nową nazwę katalogu:"
 
-#: src/editgroup.c:525 src/foldersel.c:541 src/folderview.c:2121
+#: src/editgroup.c:524 src/foldersel.c:541 src/folderview.c:2121
 #: src/folderview.c:2127
 msgid "New folder"
 msgstr "Nowy katalog"
 
-#: src/editgroup.c:526 src/foldersel.c:542 src/folderview.c:2128
+#: src/editgroup.c:525 src/foldersel.c:542 src/folderview.c:2128
 msgid "Input the name of new folder:"
 msgstr "Podaj nazwę nowego katalogu:"
 
@@ -2208,7 +2209,7 @@ msgid "`%c' can't be included in folder name."
 msgstr "'%c' nie może wystąpić w nazwie katalogu."
 
 #: src/foldersel.c:561 src/folderview.c:2147 src/folderview.c:2206
-#: src/query_search.c:995
+#: src/query_search.c:1031
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Katalog '%s' już istnieje."
@@ -2467,7 +2468,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:2127
+#: src/headerview.c:180 src/query_search.c:667 src/summaryview.c:2127
 msgid "(No From)"
 msgstr "(Bez Od)"
 
@@ -2597,133 +2598,133 @@ msgstr "Koniec"
 msgid "Sylpheed: %d new messages"
 msgstr "Zakończono (%d nowe wiadomości)"
 
-#: src/inc.c:372
+#: src/inc.c:371
 msgid "Retrieving new messages"
 msgstr "Pobieranie nowych wiadomości"
 
-#: src/inc.c:415
+#: src/inc.c:414
 msgid "Standby"
 msgstr "Oczekiwanie"
 
-#: src/inc.c:544 src/inc.c:593
+#: src/inc.c:543 src/inc.c:592
 msgid "Cancelled"
 msgstr "Anulowano"
 
-#: src/inc.c:555
+#: src/inc.c:554
 msgid "Retrieving"
 msgstr "Pobieranie"
 
-#: src/inc.c:564
+#: src/inc.c:563
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "Gotowe (%d wiadomośći (%s) odebrano)"
 
-#: src/inc.c:568
+#: src/inc.c:567
 msgid "Done (no new messages)"
 msgstr "Gotowe (brak nowych wiadomości)"
 
-#: src/inc.c:574
+#: src/inc.c:573
 msgid "Connection failed"
 msgstr "Błąd połączenia"
 
-#: src/inc.c:577
+#: src/inc.c:576
 msgid "Auth failed"
 msgstr "Błąd autoryzacji"
 
-#: src/inc.c:580
+#: src/inc.c:579
 msgid "Locked"
 msgstr "Zablokowano"
 
-#: src/inc.c:590
+#: src/inc.c:589
 msgid "Timeout"
 msgstr "Opóźnienie"
 
-#: src/inc.c:640
+#: src/inc.c:639
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Zakończono (%d nowe wiadomości)"
 
-#: src/inc.c:643
+#: src/inc.c:642
 msgid "Finished (no new messages)"
 msgstr "Zakończono (brak nowych wiadomości)"
 
-#: src/inc.c:652
+#: src/inc.c:651
 msgid "Some errors occurred while getting mail."
 msgstr "Wystąpiły błędy podczas pobierania poczty."
 
-#: src/inc.c:688
+#: src/inc.c:687
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "pobieranie nowych wiadomości z konta %s ...\n"
 
-#: src/inc.c:691
+#: src/inc.c:690
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s : Pobieranie nowych wiadomości"
 
-#: src/inc.c:710
+#: src/inc.c:709
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Nawiązywanie połączenia z serwerem POP3: %s..."
 
-#: src/inc.c:719
+#: src/inc.c:718
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Nie można nawiązać połączenia z serwerem POP3: %s:%d\n"
 
-#: src/inc.c:798 src/send_message.c:631
+#: src/inc.c:797 src/send_message.c:631
 msgid "Authenticating..."
 msgstr "Uwierzytelnianie..."
 
-#: src/inc.c:799
+#: src/inc.c:798
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Pobieranie wiadomości z %s..."
 
-#: src/inc.c:804
+#: src/inc.c:803
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Pobieranie liczby nowych wiadomości (STAT)..."
 
-#: src/inc.c:808
+#: src/inc.c:807
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Pobieranie liczby nowych wiadomości (LAST)..."
 
-#: src/inc.c:812
+#: src/inc.c:811
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Pobieranie liczby nowych wiadomości (UIDL)"
 
-#: src/inc.c:816
+#: src/inc.c:815
 msgid "Getting the size of messages (LIST)..."
 msgstr "Pobieranie rozmiaru wiadomości (LIST)..."
 
-#: src/inc.c:826
+#: src/inc.c:825
 #, c-format
 msgid "Deleting message %d"
 msgstr "Usuwanie wiadomości %d"
 
-#: src/inc.c:833 src/send_message.c:649
+#: src/inc.c:832 src/send_message.c:649
 msgid "Quitting"
 msgstr "Wychodzenie"
 
-#: src/inc.c:858
+#: src/inc.c:857
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Pobieranie wiadomości (%d / %d) (%s / %s)"
 
-#: src/inc.c:879
+#: src/inc.c:878
 #, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Pobieranie (%d wiadomośći (%s) odebrano)"
 
-#: src/inc.c:1107
+#: src/inc.c:1106
 msgid "Connection failed."
 msgstr "Błąd połączenia."
 
-#: src/inc.c:1113
+#: src/inc.c:1112
 msgid "Error occurred while processing mail."
 msgstr "Błąd podczas przetwarzania wiadomości."
 
-#: src/inc.c:1118
+#: src/inc.c:1117
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2732,28 +2733,28 @@ msgstr ""
 "Błąd podczas przetwarzania wiadomości:\n"
 "%s"
 
-#: src/inc.c:1124
+#: src/inc.c:1123
 msgid "No disk space left."
 msgstr "Brak miejsca na dysku."
 
-#: src/inc.c:1129
+#: src/inc.c:1128
 msgid "Can't write file."
 msgstr "Nie można zapisać pliku."
 
-#: src/inc.c:1134
+#: src/inc.c:1133
 msgid "Socket error."
 msgstr "Błąd gniazda."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1140 src/send_message.c:584 src/send_message.c:772
+#: src/inc.c:1139 src/send_message.c:584 src/send_message.c:772
 msgid "Connection closed by the remote host."
 msgstr "Połączenie zamknięte przez zdalny komputer."
 
-#: src/inc.c:1146
+#: src/inc.c:1145
 msgid "Mailbox is locked."
 msgstr "Skrzynka jest zablokowana."
 
-#: src/inc.c:1150
+#: src/inc.c:1149
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2762,11 +2763,11 @@ msgstr ""
 "Skrzynka jest zablokowana:\n"
 "%s"
 
-#: src/inc.c:1156 src/send_message.c:757
+#: src/inc.c:1155 src/send_message.c:757
 msgid "Authentication failed."
 msgstr "Błąd uwierzytelniania."
 
-#: src/inc.c:1161 src/send_message.c:760
+#: src/inc.c:1160 src/send_message.c:760
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2775,15 +2776,15 @@ msgstr ""
 "Błąd uwierzytelniania:\n"
 "%s"
 
-#: src/inc.c:1166 src/send_message.c:776
+#: src/inc.c:1165 src/send_message.c:776
 msgid "Session timed out."
 msgstr "Sesja wygasła."
 
-#: src/inc.c:1202
+#: src/inc.c:1201
 msgid "Incorporation cancelled\n"
 msgstr "Odbieranie anulowano\n"
 
-#: src/inc.c:1285
+#: src/inc.c:1284
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Pobieranie wiadomości z %s do %s...\n"
@@ -3248,14 +3249,15 @@ msgid "/_View/Mess_age source"
 msgstr "/_Widok/P_okaż źródło"
 
 #: src/mainwindow.c:708 src/messageview.c:245
-msgid "/_View/Show all _header"
+#, fuzzy
+msgid "/_View/Show all _headers"
 msgstr "/_Widok/Pokaż wszystkie na_główki"
 
 #: src/mainwindow.c:710
 msgid "/_View/_Update summary"
 msgstr "/_Widok/_Odśwież podsumowanie"
 
-#: src/mainwindow.c:712 src/messageview.c:247
+#: src/mainwindow.c:712 src/messageview.c:248
 msgid "/_Message"
 msgstr "/_Wiadomość"
 
@@ -3285,16 +3287,16 @@ msgstr "/Wiado_mość/Wyślij wia_domości z kolejki"
 
 #: src/mainwindow.c:722 src/mainwindow.c:724 src/mainwindow.c:731
 #: src/mainwindow.c:736 src/mainwindow.c:739 src/mainwindow.c:750
-#: src/mainwindow.c:752 src/mainwindow.c:755 src/messageview.c:250
-#: src/messageview.c:258 src/messageview.c:263
+#: src/mainwindow.c:752 src/mainwindow.c:755 src/messageview.c:251
+#: src/messageview.c:259 src/messageview.c:264
 msgid "/_Message/---"
 msgstr "/_Wiadomość/---"
 
-#: src/mainwindow.c:723 src/messageview.c:248
+#: src/mainwindow.c:723 src/messageview.c:249
 msgid "/_Message/Compose _new message"
 msgstr "/Wiado_mość/Twórz _nową wiadomość"
 
-#: src/mainwindow.c:725 src/messageview.c:251
+#: src/mainwindow.c:725 src/messageview.c:252
 msgid "/_Message/_Reply"
 msgstr "/Wiado_mość/_Odpowiedz"
 
@@ -3302,27 +3304,27 @@ msgstr "/Wiado_mość/_Odpowiedz"
 msgid "/_Message/Repl_y to"
 msgstr "/Wiado_mość/Odpowied_z"
 
-#: src/mainwindow.c:727 src/messageview.c:252
+#: src/mainwindow.c:727 src/messageview.c:253
 msgid "/_Message/Repl_y to/_all"
 msgstr "/Wiado_mość/Odpowied_z/w_szystkim"
 
-#: src/mainwindow.c:728 src/messageview.c:254
+#: src/mainwindow.c:728 src/messageview.c:255
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/Wiado_mość/Odpowied_z/nadawc_y"
 
-#: src/mainwindow.c:729 src/messageview.c:256
+#: src/mainwindow.c:729 src/messageview.c:257
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/Wiado_mość/Odpowiedz/_liście dyskusyjnej"
 
-#: src/mainwindow.c:732 src/messageview.c:259
+#: src/mainwindow.c:732 src/messageview.c:260
 msgid "/_Message/_Forward"
 msgstr "/Wiado_mość/Przekaż da_lej"
 
-#: src/mainwindow.c:733 src/messageview.c:260
+#: src/mainwindow.c:733 src/messageview.c:261
 msgid "/_Message/For_ward as attachment"
 msgstr "/Wiado_mość/Przekaż j_ako załącznik"
 
-#: src/mainwindow.c:735 src/messageview.c:262
+#: src/mainwindow.c:735 src/messageview.c:263
 msgid "/_Message/Redirec_t"
 msgstr "/Wiado_mość/Prze_kieruj"
 
@@ -3380,7 +3382,7 @@ msgstr "/Wiado_mość/_Zaznacz/_Odznacz"
 msgid "/_Message/Set as not j_unk mail"
 msgstr ""
 
-#: src/mainwindow.c:756 src/messageview.c:264
+#: src/mainwindow.c:756 src/messageview.c:265
 msgid "/_Message/Re-_edit"
 msgstr "/Wiado_mość/Prz_eedytuj"
 
@@ -3397,23 +3399,23 @@ msgstr "/_Narzędzia/_Filtruj wiadomości w katalogu"
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Narzędzia/Filtruj zaznaczonne wiadomości"
 
-#: src/mainwindow.c:767 src/messageview.c:271
+#: src/mainwindow.c:767 src/messageview.c:272
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Narzędzia/_Utwórz regułę filtrowania"
 
-#: src/mainwindow.c:768 src/messageview.c:273
+#: src/mainwindow.c:768 src/messageview.c:274
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Narzędzia/_Utwórz regułę filtrowania/_Automatycznie"
 
-#: src/mainwindow.c:770 src/messageview.c:275
+#: src/mainwindow.c:770 src/messageview.c:276
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Narzędzia/_Utwórz regułę filtrowania/_Od"
 
-#: src/mainwindow.c:772 src/messageview.c:277
+#: src/mainwindow.c:772 src/messageview.c:278
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Narzędzia/_Utwórz regułę filtrowania/_Do"
 
-#: src/mainwindow.c:774 src/messageview.c:279
+#: src/mainwindow.c:774 src/messageview.c:280
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Narzędzia/_Utwórz regułę filtrowania/_Temat"
 
@@ -3534,7 +3536,7 @@ msgid "MainWindow: color allocation %d failed\n"
 msgstr "Okno główne: błąd alokacji kolorów %d\n"
 
 #: src/mainwindow.c:1139 src/summaryview.c:2275 src/summaryview.c:2360
-#: src/summaryview.c:3907 src/summaryview.c:4036 src/summaryview.c:4394
+#: src/summaryview.c:3908 src/summaryview.c:4037 src/summaryview.c:4395
 msgid "done.\n"
 msgstr "gotowe.\n"
 
@@ -3796,7 +3798,7 @@ msgid "Find text:"
 msgstr "Znajdź tekst:"
 
 #: src/message_search.c:153 src/prefs_search_folder.c:253
-#: src/query_search.c:326
+#: src/query_search.c:343
 msgid "Case sensitive"
 msgstr "Rozróżnianie wielkości liter"
 
@@ -3820,27 +3822,27 @@ msgstr "Osiągnięto koniec wiadomości; czy kontynuować od początku?"
 msgid "Search finished"
 msgstr "Przeszukiwanie zakończone"
 
-#: src/messageview.c:268
+#: src/messageview.c:269
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/_Narzędzia/Dodaj nadawcę do _książki adresowej"
 
-#: src/messageview.c:300
+#: src/messageview.c:301
 msgid "Creating message view...\n"
 msgstr "Tworzenie widoku wiadomości...\n"
 
-#: src/messageview.c:325
+#: src/messageview.c:326
 msgid "Text"
 msgstr "Tekst"
 
-#: src/messageview.c:330
+#: src/messageview.c:331
 msgid "Attachments"
 msgstr "Załączniki"
 
-#: src/messageview.c:380
+#: src/messageview.c:381
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:699 src/summaryview.c:3436
+#: src/messageview.c:700 src/summaryview.c:3436
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Nie można zapisać pliku \"%s\"."
@@ -3858,7 +3860,7 @@ msgstr "Wynik polecenia"
 msgid "Print"
 msgstr "Drukuj"
 
-#: src/messageview.c:770 src/summaryview.c:3471
+#: src/messageview.c:769 src/summaryview.c:3470
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -3955,11 +3957,11 @@ msgstr ""
 "Wprowadź polecenie dla otwarcia pliku:\n"
 "(\"%s\" zostanie zastąpione nazwą pliku)"
 
-#: src/mimeview.c:1147
+#: src/mimeview.c:1140
 msgid "Opening executable file"
 msgstr ""
 
-#: src/mimeview.c:1148
+#: src/mimeview.c:1141
 msgid ""
 "This is an executable file. Opening executable file is restricted for "
 "security.\n"
@@ -3967,11 +3969,6 @@ msgid ""
 "virus or something like a malicious program."
 msgstr ""
 
-#: src/mimeview.c:1184
-#, c-format
-msgid "MIME viewer command line is invalid: `%s'"
-msgstr "Niepoprawne polecenie podglądu MIME: '%s'"
-
 #: src/passphrase.c:96
 msgid "Passphrase"
 msgstr "Hasło"
@@ -5737,21 +5734,21 @@ msgstr "Adres zwrotny:"
 msgid "%s - Edit search condition"
 msgstr ""
 
-#: src/prefs_search_folder.c:209 src/query_search.c:257
+#: src/prefs_search_folder.c:209 src/query_search.c:274
 msgid "Match any of the following"
 msgstr ""
 
-#: src/prefs_search_folder.c:211 src/query_search.c:259
+#: src/prefs_search_folder.c:211 src/query_search.c:276
 #, fuzzy
 msgid "Match all of the following"
 msgstr "Dopasuj wszystkie"
 
-#: src/prefs_search_folder.c:231 src/query_search.c:303
+#: src/prefs_search_folder.c:231 src/query_search.c:320
 #, fuzzy
 msgid "Folder:"
 msgstr "Katalog"
 
-#: src/prefs_search_folder.c:248 src/query_search.c:321
+#: src/prefs_search_folder.c:248 src/query_search.c:338
 #, fuzzy
 msgid "Search subfolders"
 msgstr "Błąd wyszukiwania"
@@ -5766,17 +5763,17 @@ msgid "Attachment"
 msgstr "Załącznik"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73 src/query_search.c:371 src/summaryview.c:4901
+#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4902
 msgid "Subject"
 msgstr "Temat"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/query_search.c:372 src/summaryview.c:4904
+#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4905
 msgid "From"
 msgstr "Od"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/query_search.c:373 src/summaryview.c:4906
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:4907
 msgid "Date"
 msgstr "Data"
 
@@ -5869,43 +5866,43 @@ msgstr "Tworzenie dialogu postępu...\n"
 msgid "Status"
 msgstr "Stan"
 
-#: src/query_search.c:234
+#: src/query_search.c:251
 msgid "Search messages"
 msgstr "Wyszukaj wiadomości"
 
-#: src/query_search.c:395
+#: src/query_search.c:423
 #, fuzzy
 msgid "_Save as search folder"
 msgstr "Zapisz w katalogu szablonów"
 
-#: src/query_search.c:512 src/subscribedialog.c:526 src/summaryview.c:842
+#: src/query_search.c:542 src/subscribedialog.c:526 src/summaryview.c:842
 msgid "Done."
 msgstr "Gotowe."
 
-#: src/query_search.c:536
+#: src/query_search.c:566
 #, fuzzy, c-format
 msgid "Searching %s ..."
 msgstr "Przeszukiwanie katalogu %s ..."
 
-#: src/query_search.c:564
+#: src/query_search.c:594
 #, fuzzy, c-format
 msgid "Searching %s (%d / %d)..."
 msgstr "Filtowanie..."
 
-#: src/query_search.c:645 src/summaryview.c:2051
+#: src/query_search.c:675 src/summaryview.c:2051
 msgid "(No Date)"
 msgstr "(Bez daty)"
 
-#: src/query_search.c:833
+#: src/query_search.c:869
 #, fuzzy
 msgid "Save as search folder"
 msgstr "Zapisz w katalogu szablonów"
 
-#: src/query_search.c:854
+#: src/query_search.c:890
 msgid "Location:"
 msgstr ""
 
-#: src/query_search.c:869
+#: src/query_search.c:905
 #, fuzzy
 msgid "Folder name:"
 msgstr "Nazwa pliku"
@@ -6554,37 +6551,37 @@ msgstr "Wiadomość %d ustawiona do kopiowania do %s\n"
 msgid "Destination for copy is same as current folder."
 msgstr "Katalog docelowy kopiowania jest taki sam jak bieżący."
 
-#: src/summaryview.c:3506
+#: src/summaryview.c:3507
 msgid "Error occurred while processing messages."
 msgstr "Błąd podczas przetwarzania wiadomości."
 
-#: src/summaryview.c:3814 src/summaryview.c:3815
+#: src/summaryview.c:3815 src/summaryview.c:3816
 msgid "Building threads..."
 msgstr "Tworzenie wątków..."
 
-#: src/summaryview.c:3965 src/summaryview.c:3966
+#: src/summaryview.c:3966 src/summaryview.c:3967
 msgid "Unthreading..."
 msgstr "Odwątkowanie .."
 
-#: src/summaryview.c:4259 src/summaryview.c:4315
+#: src/summaryview.c:4260 src/summaryview.c:4316
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtowanie..."
 
-#: src/summaryview.c:4364
+#: src/summaryview.c:4365
 msgid "filtering..."
 msgstr "filtrowanie..."
 
-#: src/summaryview.c:4365
+#: src/summaryview.c:4366
 msgid "Filtering..."
 msgstr "Filtowanie..."
 
-#: src/summaryview.c:4401
+#: src/summaryview.c:4402
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "%d wiadomość(i) przefiltrowano."
 
-#: src/summaryview.c:4910
+#: src/summaryview.c:4911
 msgid "No."
 msgstr "Nr"
 
@@ -6672,6 +6669,9 @@ msgstr "Koniec programu"
 msgid "Sylpheed"
 msgstr "Dawny Sylpheed"
 
+#~ msgid "MIME viewer command line is invalid: `%s'"
+#~ msgstr "Niepoprawne polecenie podglądu MIME: '%s'"
+
 #~ msgid "%dB"
 #~ msgstr "%dB"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 3d2e97a9..a78947d4 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-03-02 19:03+0900\n"
+"POT-Creation-Date: 2006-03-10 16:06+0900\n"
 "PO-Revision-Date: 2006-02-06 15:02-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:491
+#: libsylph/prefs_common.c:496
 msgid "Junk mail filter"
 msgstr "Filtro de spam"
 
@@ -525,7 +525,7 @@ msgstr "não foi possível abrir o arquivo de marcas\n"
 msgid "can't fetch message %d\n"
 msgstr "não posso obter mensagem %d\n"
 
-#: libsylph/procmsg.c:1375
+#: libsylph/procmsg.c:1378
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "O comando de impressão é inválido: `%s'\n"
@@ -603,12 +603,12 @@ msgstr "  Assunto: %s\n"
 msgid "  Issuer: %s\n"
 msgstr "Emissor: %s\n"
 
-#: libsylph/utils.c:2411 src/compose.c:2869 src/compose.c:3132
-#: src/compose.c:3195 src/compose.c:3315
+#: libsylph/utils.c:2430 src/compose.c:2888 src/compose.c:3151
+#: src/compose.c:3214 src/compose.c:3334
 msgid "can't change file mode\n"
 msgstr "não foi possível modificar as permissões do arquivo\n"
 
-#: libsylph/utils.c:2418 libsylph/utils.c:2542
+#: libsylph/utils.c:2437 libsylph/utils.c:2561
 #, c-format
 msgid "writing to %s failed.\n"
 msgstr "erro ao gravar em %s.\n"
@@ -689,8 +689,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:493
-#: src/compose.c:4273 src/editaddress.c:200 src/editaddress.c:942
+#: src/account_dialog.c:366 src/addressadd.c:192 src/addressbook.c:491
+#: src/compose.c:4292 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
@@ -826,12 +826,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:4777 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4796 src/editaddress.c:201
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "Endereço"
 
-#: src/addressadd.c:212 src/addressbook.c:495 src/editaddress.c:202
+#: src/addressadd.c:212 src/addressbook.c:493 src/editaddress.c:202
 #: src/editaddress.c:795 src/editaddress.c:860 src/editgroup.c:267
 msgid "Remarks"
 msgstr "Notas"
@@ -840,110 +840,111 @@ msgstr "Notas"
 msgid "Select Address Book Folder"
 msgstr "Selecione Pasta do Catálogo de Endereços"
 
-#: src/addressbook.c:338 src/compose.c:515 src/mainwindow.c:489
+#: src/addressbook.c:337 src/compose.c:515 src/mainwindow.c:489
 #: src/messageview.c:140
 msgid "/_File"
 msgstr "/_Arquivo"
 
-#: src/addressbook.c:339
+#: src/addressbook.c:338
 msgid "/_File/New _Book"
 msgstr "/_Arquivo/Novo _Livro"
 
-#: src/addressbook.c:340
+#: src/addressbook.c:339
 msgid "/_File/New _vCard"
 msgstr "/_Arquivo/Novo _vCard"
 
-#: src/addressbook.c:342
+#: src/addressbook.c:341
 msgid "/_File/New _JPilot"
 msgstr "/_Arquivo/Novo _JPilot"
 
-#: src/addressbook.c:345
-msgid "/_File/New _Server"
+#: src/addressbook.c:344
+#, fuzzy
+msgid "/_File/New _LDAP Server"
 msgstr "/_Arquivo/Novo _Servidor"
 
-#: src/addressbook.c:347 src/addressbook.c:350 src/compose.c:520
+#: src/addressbook.c:346 src/addressbook.c:349 src/compose.c:520
 #: src/compose.c:525 src/compose.c:528 src/compose.c:531 src/mainwindow.c:507
 #: src/mainwindow.c:510 src/mainwindow.c:512 src/mainwindow.c:515
 #: src/mainwindow.c:517 src/messageview.c:143
 msgid "/_File/---"
 msgstr "/_Arquivo/---"
 
-#: src/addressbook.c:348
+#: src/addressbook.c:347
 msgid "/_File/_Edit"
 msgstr "/_Arquivo/_Editar"
 
-#: src/addressbook.c:349
+#: src/addressbook.c:348
 msgid "/_File/_Delete"
 msgstr "/_Arquivo/_Apagar"
 
-#: src/addressbook.c:351
+#: src/addressbook.c:350
 msgid "/_File/_Save"
 msgstr "/_Arquivo/_Salvar"
 
-#: src/addressbook.c:352 src/compose.c:532 src/messageview.c:144
+#: src/addressbook.c:351 src/compose.c:532 src/messageview.c:144
 msgid "/_File/_Close"
 msgstr "/_Arquivo/_Fechar"
 
-#: src/addressbook.c:353
+#: src/addressbook.c:352
 msgid "/_Address"
 msgstr "/_Endereço"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:353
 msgid "/_Address/New _Address"
 msgstr "/_Endereço/Novo _Endereço"
 
-#: src/addressbook.c:355
+#: src/addressbook.c:354
 msgid "/_Address/New _Group"
 msgstr "/_Endereço/Novo _Grupo"
 
-#: src/addressbook.c:356
+#: src/addressbook.c:355
 msgid "/_Address/New _Folder"
 msgstr "/_Endereço/Nova _Pasta"
 
-#: src/addressbook.c:357
+#: src/addressbook.c:356
 msgid "/_Address/---"
 msgstr "/_Endereço/---"
 
-#: src/addressbook.c:358
+#: src/addressbook.c:357
 msgid "/_Address/_Edit"
 msgstr "/_Endereço/_Editar"
 
-#: src/addressbook.c:359
+#: src/addressbook.c:358
 msgid "/_Address/_Delete"
 msgstr "/_Endereço/_Apagar"
 
-#: src/addressbook.c:360 src/compose.c:645 src/mainwindow.c:758
-#: src/messageview.c:266
+#: src/addressbook.c:359 src/compose.c:645 src/mainwindow.c:758
+#: src/messageview.c:267
 msgid "/_Tools"
 msgstr "/_Ferramentas"
 
-#: src/addressbook.c:361
+#: src/addressbook.c:360
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Ferramentas/Importar arquivo _LDIF"
 
-#: src/addressbook.c:362 src/compose.c:666 src/mainwindow.c:812
-#: src/messageview.c:286
+#: src/addressbook.c:361 src/compose.c:666 src/mainwindow.c:812
+#: src/messageview.c:287
 msgid "/_Help"
 msgstr "/A_juda"
 
-#: src/addressbook.c:363 src/compose.c:667 src/mainwindow.c:824
-#: src/messageview.c:287
+#: src/addressbook.c:362 src/compose.c:667 src/mainwindow.c:824
+#: src/messageview.c:288
 msgid "/_Help/_About"
 msgstr "/A_juda/_Sobre"
 
-#: src/addressbook.c:382 src/addressbook.c:392
+#: src/addressbook.c:381 src/addressbook.c:391
 msgid "/New _Address"
 msgstr "/Novo _Endereço"
 
-#: src/addressbook.c:383 src/addressbook.c:393
+#: src/addressbook.c:382 src/addressbook.c:392
 msgid "/New _Group"
 msgstr "/Novo _Grupo"
 
-#: src/addressbook.c:384 src/addressbook.c:394
+#: src/addressbook.c:383 src/addressbook.c:393
 msgid "/New _Folder"
 msgstr "/Nova _Pasta"
 
-#: src/addressbook.c:385 src/addressbook.c:395 src/compose.c:509
+#: src/addressbook.c:384 src/addressbook.c:394 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
@@ -953,70 +954,70 @@ msgstr "/Nova _Pasta"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:386 src/addressbook.c:396 src/compose.c:534
+#: src/addressbook.c:385 src/addressbook.c:395 src/compose.c:534
 #: src/mainwindow.c:521 src/messageview.c:146
 msgid "/_Edit"
 msgstr "/_Editar"
 
-#: src/addressbook.c:387 src/addressbook.c:397 src/summaryview.c:434
+#: src/addressbook.c:386 src/addressbook.c:396 src/summaryview.c:434
 msgid "/_Delete"
 msgstr "/_Apagar"
 
-#: src/addressbook.c:494
+#: src/addressbook.c:492
 msgid "E-Mail address"
 msgstr "Endereço de e-mail"
 
-#: src/addressbook.c:498 src/compose.c:4778 src/prefs_common_dialog.c:2183
+#: src/addressbook.c:496 src/compose.c:4797 src/prefs_common_dialog.c:2183
 msgid "Address book"
 msgstr "Catálogo de endereços"
 
-#: src/addressbook.c:600 src/prefs_filter_edit.c:249
+#: src/addressbook.c:603 src/prefs_filter_edit.c:249
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "Nome:"
 
 #. Buttons
-#: src/addressbook.c:632 src/addressbook.c:1684 src/editaddress.c:884
+#: src/addressbook.c:636 src/addressbook.c:1678 src/editaddress.c:884
 #: src/editaddress.c:1017 src/mainwindow.c:2426 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:635 src/editaddress.c:890 src/editaddress.c:1023
+#: src/addressbook.c:639 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:1552
 msgid "Add"
 msgstr "Adicionar"
 
-#: src/addressbook.c:638
+#: src/addressbook.c:642
 msgid "Lookup"
 msgstr "Procurar"
 
-#: src/addressbook.c:650 src/headerview.c:55 src/prefs_folder_item.c:339
+#: src/addressbook.c:654 src/headerview.c:55 src/prefs_folder_item.c:339
 #: src/prefs_template.c:176
 msgid "To:"
 msgstr "Para:"
 
-#: src/addressbook.c:654 src/prefs_folder_item.c:356 src/prefs_template.c:178
+#: src/addressbook.c:658 src/prefs_folder_item.c:356 src/prefs_template.c:178
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:658 src/prefs_folder_item.c:367
+#: src/addressbook.c:662 src/prefs_folder_item.c:367
 msgid "Bcc:"
 msgstr "Cco:"
 
 #. Confirm deletion
-#: src/addressbook.c:845
+#: src/addressbook.c:832
 msgid "Delete address(es)"
 msgstr "Apagar endereço(s)"
 
-#: src/addressbook.c:846
+#: src/addressbook.c:833
 msgid "Really delete the address(es)?"
 msgstr "Apagar realmente o(s) endereço(s)?"
 
-#: src/addressbook.c:1675
+#: src/addressbook.c:1669
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1025,36 +1026,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:1678 src/folderview.c:2372
+#: src/addressbook.c:1672 src/folderview.c:2372
 msgid "Delete folder"
 msgstr "Apagar pasta"
 
-#: src/addressbook.c:1678
+#: src/addressbook.c:1672
 msgid "_Folder only"
 msgstr "_Pasta apenas"
 
-#: src/addressbook.c:1678
+#: src/addressbook.c:1672
 msgid "Folder and _addresses"
 msgstr "Pasta e _endereços"
 
-#: src/addressbook.c:1683
+#: src/addressbook.c:1677
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Apagar realmente `%s' ?"
 
-#: src/addressbook.c:2369 src/addressbook.c:2502
+#: src/addressbook.c:2363 src/addressbook.c:2496
 msgid "New user, could not save index file."
 msgstr "Novo usuário, não foi possível salvar arquivo de índice."
 
-#: src/addressbook.c:2373 src/addressbook.c:2506
+#: src/addressbook.c:2367 src/addressbook.c:2500
 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:2383 src/addressbook.c:2516
+#: src/addressbook.c:2377 src/addressbook.c:2510
 msgid "Old address book converted successfully."
 msgstr "Catálogo de endereços antigo convertido com sucesso."
 
-#: src/addressbook.c:2388
+#: src/addressbook.c:2382
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1062,7 +1063,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:2401
+#: src/addressbook.c:2395
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1070,7 +1071,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:2407
+#: src/addressbook.c:2401
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1078,7 +1079,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:2412
+#: src/addressbook.c:2406
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1086,92 +1087,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:2419
+#: src/addressbook.c:2413
 msgid "Addressbook conversion error"
 msgstr "Erro convertendo catálogo de endereços"
 
-#: src/addressbook.c:2423
+#: src/addressbook.c:2417
 msgid "Addressbook conversion"
 msgstr "Conversão do catálogo de endereços"
 
-#: src/addressbook.c:2458
+#: src/addressbook.c:2452
 msgid "Addressbook Error"
 msgstr "Erro no Catálogo de Endereços"
 
-#: src/addressbook.c:2459 src/addressbook.c:2559
+#: src/addressbook.c:2453 src/addressbook.c:2553
 msgid "Could not read address index"
 msgstr "Não foi possível ler o índice do endereço"
 
-#: src/addressbook.c:2521
+#: src/addressbook.c:2515
 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:2535
+#: src/addressbook.c:2529
 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:2541
+#: src/addressbook.c:2535
 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:2547
+#: src/addressbook.c:2541
 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:2565
+#: src/addressbook.c:2559
 msgid "Addressbook Conversion Error"
 msgstr "Erro na conversão do catálogo de endereços"
 
-#: src/addressbook.c:2571
+#: src/addressbook.c:2565
 msgid "Addressbook Conversion"
 msgstr "Conversão do Catálogo de Endereços"
 
-#: src/addressbook.c:3086 src/prefs_common_dialog.c:2033
+#: src/addressbook.c:3080 src/prefs_common_dialog.c:2033
 msgid "Interface"
 msgstr "Interface"
 
-#: src/addressbook.c:3102 src/importldif.c:514
+#: src/addressbook.c:3096 src/importldif.c:514
 msgid "Address Book"
 msgstr "Catálogo de Endereços"
 
-#: src/addressbook.c:3118
+#: src/addressbook.c:3112
 msgid "Person"
 msgstr "Pessoa"
 
-#: src/addressbook.c:3134
+#: src/addressbook.c:3128
 msgid "EMail Address"
 msgstr "Endereço de e-mail"
 
-#: src/addressbook.c:3150
+#: src/addressbook.c:3144
 msgid "Group"
 msgstr "Grupo"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3166 src/folderview.c:367 src/prefs_account_dialog.c:1694
-#: src/query_search.c:370
+#: src/addressbook.c:3160 src/folderview.c:367 src/prefs_account_dialog.c:1694
+#: src/query_search.c:398
 msgid "Folder"
 msgstr "Pasta"
 
-#: src/addressbook.c:3182
+#: src/addressbook.c:3176
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3198 src/addressbook.c:3214
+#: src/addressbook.c:3192 src/addressbook.c:3208
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3230
+#: src/addressbook.c:3224
 msgid "LDAP Server"
 msgstr "Servidor LDAP"
 
@@ -1183,7 +1184,7 @@ msgstr "Endereços comuns"
 msgid "Personal address"
 msgstr "Endereços pessoais"
 
-#: src/alertpanel.c:142 src/compose.c:5500 src/main.c:621
+#: src/alertpanel.c:142 src/compose.c:5517 src/main.c:621
 msgid "Notice"
 msgstr "Notificação"
 
@@ -1191,7 +1192,7 @@ msgstr "Notificação"
 msgid "Warning"
 msgstr "Aviso"
 
-#: src/alertpanel.c:168 src/inc.c:587
+#: src/alertpanel.c:168 src/inc.c:586
 msgid "Error"
 msgstr "Erro"
 
@@ -1234,7 +1235,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:4761
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4762
 msgid "None"
 msgstr "Nenhuma"
 
@@ -1480,7 +1481,7 @@ msgstr "/E_xibir/_Codificação de caracteres/Thai (TIS-620)"
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/E_xibir/_Codificação de caracteres/Thai (Windows-874)"
 
-#: src/compose.c:646 src/mainwindow.c:759 src/messageview.c:267
+#: src/compose.c:646 src/mainwindow.c:759 src/messageview.c:268
 msgid "/_Tools/_Address book"
 msgstr "/_Ferramentas/_Catálogo de endereços"
 
@@ -1488,14 +1489,14 @@ msgstr "/_Ferramentas/_Catálogo de endereços"
 msgid "/_Tools/_Template"
 msgstr "/_Ferramenta/_Modelo"
 
-#: src/compose.c:649 src/mainwindow.c:783 src/messageview.c:283
+#: src/compose.c:649 src/mainwindow.c:783 src/messageview.c:284
 msgid "/_Tools/Actio_ns"
 msgstr "/_Ferramentas/_Ações"
 
 #: src/compose.c:651 src/compose.c:655 src/compose.c:661 src/mainwindow.c:762
 #: src/mainwindow.c:776 src/mainwindow.c:781 src/mainwindow.c:784
-#: src/mainwindow.c:788 src/mainwindow.c:790 src/messageview.c:270
-#: src/messageview.c:282
+#: src/mainwindow.c:788 src/mainwindow.c:790 src/messageview.c:271
+#: src/messageview.c:283
 msgid "/_Tools/---"
 msgstr "/_Ferramentas/---"
 
@@ -1519,79 +1520,79 @@ msgstr "/_Ferramentas/_Verificar ortografia"
 msgid "/_Tools/_Set spell language"
 msgstr "/_Ferramentas/Definir _idioma do verificador ortográfico"
 
-#: src/compose.c:910
+#: src/compose.c:912
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: o arquivo não existe\n"
 
-#: src/compose.c:1014 src/compose.c:1085
+#: src/compose.c:1016 src/compose.c:1087
 msgid "Can't get text part\n"
 msgstr "Não foi possível obter o texto\n"
 
-#: src/compose.c:1486
+#: src/compose.c:1488
 msgid "Quote mark format error."
 msgstr "Erro no formato de marca de citação."
 
-#: src/compose.c:1498
+#: src/compose.c:1500
 msgid "Message reply/forward format error."
 msgstr "Erro no formato de mensagem de resposta/encaminhada."
 
-#: src/compose.c:1918
+#: src/compose.c:1935
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "O arquivo %s não existe\n"
 
-#: src/compose.c:1922
+#: src/compose.c:1939
 #, 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:1926
+#: src/compose.c:1943
 #, c-format
 msgid "File %s is empty."
 msgstr "O arquivo %s está vazio."
 
-#: src/compose.c:1930
+#: src/compose.c:1947
 #, c-format
 msgid "Can't read %s."
 msgstr "Não foi possível ler %s."
 
-#: src/compose.c:1963
+#: src/compose.c:1980
 #, c-format
 msgid "Message: %s"
 msgstr "Mensagem: %s"
 
-#: src/compose.c:2023 src/mimeview.c:565
+#: src/compose.c:2040 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:2507 src/headerview.c:195 src/query_search.c:636
+#: src/compose.c:2524 src/headerview.c:195 src/query_search.c:666
 #: src/summaryview.c:2124
 msgid "(No Subject)"
 msgstr "(Sem assunto)"
 
-#: src/compose.c:2510
+#: src/compose.c:2527
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Compondo%s"
 
-#: src/compose.c:2623
+#: src/compose.c:2642
 msgid "Recipient is not specified."
 msgstr "Destinatário não especificado."
 
-#: src/compose.c:2631
+#: src/compose.c:2650
 msgid "Empty subject"
 msgstr "Sem assunto"
 
-#: src/compose.c:2632
+#: src/compose.c:2651
 msgid "Subject is empty. Send it anyway?"
 msgstr "Assunto em branco. Enviar assim mesmo?"
 
-#: src/compose.c:2691
+#: src/compose.c:2710
 msgid "can't get recipient list."
 msgstr "não pude obter a lista de destinatários."
 
-#: src/compose.c:2711
+#: src/compose.c:2730
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1599,21 +1600,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:2725 src/send_message.c:299
+#: src/compose.c:2744 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:2767
+#: src/compose.c:2786
 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:2805
+#: src/compose.c:2824
 #, 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:2902
+#: src/compose.c:2921
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1625,11 +1626,11 @@ msgstr ""
 "\n"
 "Enviar como %s mesmo assim?"
 
-#: src/compose.c:2908
+#: src/compose.c:2927
 msgid "Code conversion error"
 msgstr "Erro convertendo codificação"
 
-#: src/compose.c:2981
+#: src/compose.c:3000
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1642,156 +1643,156 @@ msgstr ""
 "\n"
 "Enviar mesmo assim?"
 
-#: src/compose.c:2985
+#: src/compose.c:3004
 msgid "Line length limit"
 msgstr "Limite de comprimento da linha"
 
-#: src/compose.c:3275
+#: src/compose.c:3294
 msgid "can't remove the old message\n"
 msgstr "não posso remover a mensagem antiga\n"
 
-#: src/compose.c:3293
+#: src/compose.c:3312
 msgid "queueing message...\n"
 msgstr "enfileirando mensagem...\n"
 
-#: src/compose.c:3375
+#: src/compose.c:3394
 msgid "can't find queue folder\n"
 msgstr "não foi possível encontrar a pasta da fila\n"
 
-#: src/compose.c:3382
+#: src/compose.c:3401
 msgid "can't queue the message\n"
 msgstr "não foi possível enfileirar a mensagem\n"
 
-#: src/compose.c:3975
+#: src/compose.c:3994
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "Message-ID gerado: %s\n"
 
-#: src/compose.c:4088
+#: src/compose.c:4107
 msgid "Creating compose window...\n"
 msgstr "Criando janela de composição...\n"
 
-#: src/compose.c:4139 src/headerview.c:54
+#: src/compose.c:4158 src/headerview.c:54
 msgid "From:"
 msgstr "De:"
 
-#: src/compose.c:4213
+#: src/compose.c:4232
 msgid "PGP Sign"
 msgstr "Assinar (PGP)"
 
-#: src/compose.c:4216
+#: src/compose.c:4235
 msgid "PGP Encrypt"
 msgstr "Encriptar (PGP)"
 
-#: src/compose.c:4254 src/compose.c:5332
+#: src/compose.c:4273 src/compose.c:5351
 msgid "MIME type"
 msgstr "Tipo MIME"
 
 #. S_COL_DATE
-#: src/compose.c:4263 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4908
+#: src/compose.c:4282 src/mimeview.c:197 src/prefs_filter_edit.c:496
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4909
 msgid "Size"
 msgstr "Tamanho"
 
-#: src/compose.c:4698 src/mainwindow.c:2359 src/prefs_account_dialog.c:528
+#: src/compose.c:4717 src/mainwindow.c:2359 src/prefs_account_dialog.c:528
 #: src/prefs_common_dialog.c:661
 msgid "Send"
 msgstr "Enviar"
 
-#: src/compose.c:4699
+#: src/compose.c:4718
 msgid "Send message"
 msgstr "Enviar mensagem"
 
-#: src/compose.c:4707
+#: src/compose.c:4726
 msgid "Send later"
 msgstr "Enviar depois"
 
-#: src/compose.c:4708
+#: src/compose.c:4727
 msgid "Put into queue folder and send later"
 msgstr "Pôr na 'fila de saída' e enviar depois"
 
-#: src/compose.c:4716
+#: src/compose.c:4735
 msgid "Draft"
 msgstr "Rascunho"
 
-#: src/compose.c:4717
+#: src/compose.c:4736
 msgid "Save to draft folder"
 msgstr "Salvar na pasta Rascunho"
 
-#: src/compose.c:4727
+#: src/compose.c:4746
 msgid "Insert"
 msgstr "Inserir"
 
-#: src/compose.c:4728
+#: src/compose.c:4747
 msgid "Insert file"
 msgstr "Inserir arquivo"
 
-#: src/compose.c:4736
+#: src/compose.c:4755
 msgid "Attach"
 msgstr "Anexar"
 
-#: src/compose.c:4737
+#: src/compose.c:4756
 msgid "Attach file"
 msgstr "Anexar arquivo"
 
 #. signature
-#: src/compose.c:4747 src/prefs_account_dialog.c:1208
+#: src/compose.c:4766 src/prefs_account_dialog.c:1208
 #: src/prefs_common_dialog.c:953
 msgid "Signature"
 msgstr "Assinatura"
 
-#: src/compose.c:4748
+#: src/compose.c:4767
 msgid "Append signature"
 msgstr "Apender assinatura"
 
 #. editor
-#: src/compose.c:4757 src/prefs_common_dialog.c:991
+#: src/compose.c:4776 src/prefs_common_dialog.c:991
 #: src/prefs_common_dialog.c:2315
 msgid "Editor"
 msgstr "Editor"
 
-#: src/compose.c:4758
+#: src/compose.c:4777
 msgid "Edit with external editor"
 msgstr "Editar com um editor externo"
 
-#: src/compose.c:4766
+#: src/compose.c:4785
 msgid "Linewrap"
 msgstr "Quebra de linha"
 
-#: src/compose.c:4767
+#: src/compose.c:4786
 msgid "Wrap all long lines"
 msgstr "Quebrar todas as linhas compridas"
 
-#: src/compose.c:5228
+#: src/compose.c:5247
 msgid "Invalid MIME type."
 msgstr "Tipo MIME inválido."
 
-#: src/compose.c:5246
+#: src/compose.c:5265
 msgid "File doesn't exist or is empty."
 msgstr "O arquivo não existe ou está vazio."
 
-#: src/compose.c:5314
+#: src/compose.c:5333
 msgid "Properties"
 msgstr "Propriedades"
 
-#: src/compose.c:5334 src/prefs_common_dialog.c:1444
+#: src/compose.c:5353 src/prefs_common_dialog.c:1444
 msgid "Encoding"
 msgstr "Codificação"
 
-#: src/compose.c:5357 src/prefs_folder_item.c:202
+#: src/compose.c:5376 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Caminho"
 
-#: src/compose.c:5358
+#: src/compose.c:5377
 msgid "File name"
 msgstr "Nome do arquivo"
 
-#: src/compose.c:5449
+#: src/compose.c:5466
 #, 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:5497
+#: src/compose.c:5514
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1800,44 +1801,44 @@ msgstr ""
 "O editor externo está ativo.\n"
 "Forçar a finalização do processo (pid: %d)?\n"
 
-#: src/compose.c:5872 src/compose.c:5877 src/compose.c:5883
+#: src/compose.c:5889 src/compose.c:5894 src/compose.c:5900
 msgid "Can't queue the message."
 msgstr "Não foi possível enfileirar a mensagem."
 
-#: src/compose.c:5974
+#: src/compose.c:5991
 msgid "Select files"
 msgstr "Selecionar arquivos"
 
-#: src/compose.c:5997
+#: src/compose.c:6014
 msgid "Select file"
 msgstr "Selecionar arquivo"
 
-#: src/compose.c:6032
+#: src/compose.c:6049
 msgid "Save message"
 msgstr "Salvar mensagem"
 
-#: src/compose.c:6033
+#: src/compose.c:6050
 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:6035
+#: src/compose.c:6052
 msgid "Close _without saving"
 msgstr "_Fechar sem salvar"
 
-#: src/compose.c:6077
+#: src/compose.c:6094
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Quer aplicar o modelo `%s'?"
 
-#: src/compose.c:6079
+#: src/compose.c:6096
 msgid "Apply template"
 msgstr "Aplicar Modelo"
 
-#: src/compose.c:6080
+#: src/compose.c:6097
 msgid "_Replace"
 msgstr "_Substituir"
 
-#: src/compose.c:6080
+#: src/compose.c:6097
 msgid "_Insert"
 msgstr "_Inserir"
 
@@ -1958,53 +1959,53 @@ msgstr "Um Nome de Grupo deve ser informado."
 msgid "Edit Group Data"
 msgstr "Editar Dados do Grupo"
 
-#: src/editgroup.c:300
+#: src/editgroup.c:299
 msgid "Group Name"
 msgstr "Nome do Grupo"
 
-#: src/editgroup.c:319
+#: src/editgroup.c:318
 msgid "Addresses in Group"
 msgstr "Endereços no Grupo"
 
-#: src/editgroup.c:321
+#: src/editgroup.c:320
 msgid " -> "
 msgstr " -> "
 
-#: src/editgroup.c:348
+#: src/editgroup.c:347
 msgid " <- "
 msgstr " <- "
 
-#: src/editgroup.c:350
+#: src/editgroup.c:349
 msgid "Available Addresses"
 msgstr "Endereços Disponíveis"
 
-#: src/editgroup.c:416
+#: src/editgroup.c:415
 msgid "Move E-Mail Addresses to or from Group with arrow buttons"
 msgstr ""
 "Mover endreços de e-mail para ou a partir grupos com as setas dos botões"
 
-#: src/editgroup.c:468
+#: src/editgroup.c:467
 msgid "Edit Group Details"
 msgstr "Editar Detalhes de Grupo"
 
-#: src/editgroup.c:471
+#: src/editgroup.c:470
 msgid "Add New Group"
 msgstr "Adicionar Novo Grupo"
 
-#: src/editgroup.c:522
+#: src/editgroup.c:521
 msgid "Edit folder"
 msgstr "Editar pasta"
 
-#: src/editgroup.c:522
+#: src/editgroup.c:521
 msgid "Input the new name of folder:"
 msgstr "Nome da nova pasta:"
 
-#: src/editgroup.c:525 src/foldersel.c:541 src/folderview.c:2121
+#: src/editgroup.c:524 src/foldersel.c:541 src/folderview.c:2121
 #: src/folderview.c:2127
 msgid "New folder"
 msgstr "Nova pasta"
 
-#: src/editgroup.c:526 src/foldersel.c:542 src/folderview.c:2128
+#: src/editgroup.c:525 src/foldersel.c:542 src/folderview.c:2128
 msgid "Input the name of new folder:"
 msgstr "Digite o nome da nova pasta:"
 
@@ -2203,7 +2204,7 @@ msgid "`%c' can't be included in folder name."
 msgstr "`%c' não pode ser usado no nome da pasta."
 
 #: src/foldersel.c:561 src/folderview.c:2147 src/folderview.c:2206
-#: src/query_search.c:995
+#: src/query_search.c:1031
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "A pasta `%s' já existe."
@@ -2460,7 +2461,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:2127
+#: src/headerview.c:180 src/query_search.c:667 src/summaryview.c:2127
 msgid "(No From)"
 msgstr "(Sem remetente)"
 
@@ -2591,133 +2592,133 @@ msgstr "Terminar"
 msgid "Sylpheed: %d new messages"
 msgstr "Sylpheed: %d novas mensagens"
 
-#: src/inc.c:372
+#: src/inc.c:371
 msgid "Retrieving new messages"
 msgstr "Obtendo novas mensagens"
 
-#: src/inc.c:415
+#: src/inc.c:414
 msgid "Standby"
 msgstr "Aguardando"
 
-#: src/inc.c:544 src/inc.c:593
+#: src/inc.c:543 src/inc.c:592
 msgid "Cancelled"
 msgstr "Cancelado"
 
-#: src/inc.c:555
+#: src/inc.c:554
 msgid "Retrieving"
 msgstr "Recuperando"
 
-#: src/inc.c:564
+#: src/inc.c:563
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "Concluído (%d mensagen(s) (%s) recebida(s))"
 
-#: src/inc.c:568
+#: src/inc.c:567
 msgid "Done (no new messages)"
 msgstr "Feito (Não há mensagens novas)"
 
-#: src/inc.c:574
+#: src/inc.c:573
 msgid "Connection failed"
 msgstr "Conexão falhou"
 
-#: src/inc.c:577
+#: src/inc.c:576
 msgid "Auth failed"
 msgstr "Autenticação falhou"
 
-#: src/inc.c:580
+#: src/inc.c:579
 msgid "Locked"
 msgstr "Travado"
 
-#: src/inc.c:590
+#: src/inc.c:589
 msgid "Timeout"
 msgstr "Tempo limite"
 
-#: src/inc.c:640
+#: src/inc.c:639
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Concluído (%d nova(s) mensagem(ns))"
 
-#: src/inc.c:643
+#: src/inc.c:642
 msgid "Finished (no new messages)"
 msgstr "Concluído (Não há mensagens novas)"
 
-#: src/inc.c:652
+#: src/inc.c:651
 msgid "Some errors occurred while getting mail."
 msgstr "Alguns erros aconteceram ao baixar os emails."
 
-#: src/inc.c:688
+#: src/inc.c:687
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "obtendo novas mensagens da conta %s...\n"
 
-#: src/inc.c:691
+#: src/inc.c:690
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Recuperando novas mensagens"
 
-#: src/inc.c:710
+#: src/inc.c:709
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Conectando ao servidor POP3: %s..."
 
-#: src/inc.c:719
+#: src/inc.c:718
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Não foi possível se conectar ao servidor POP3: %s:%d\n"
 
-#: src/inc.c:798 src/send_message.c:631
+#: src/inc.c:797 src/send_message.c:631
 msgid "Authenticating..."
 msgstr "Autenticando..."
 
-#: src/inc.c:799
+#: src/inc.c:798
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Recebendo mensagens de %s..."
 
-#: src/inc.c:804
+#: src/inc.c:803
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Obtendo o número de novas mensagens (STAT)..."
 
-#: src/inc.c:808
+#: src/inc.c:807
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Obtendo o número de novas mensagens (LAST)..."
 
-#: src/inc.c:812
+#: src/inc.c:811
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Obtendo o número de novas mensagens (UIDL)..."
 
-#: src/inc.c:816
+#: src/inc.c:815
 msgid "Getting the size of messages (LIST)..."
 msgstr "Obtendo o número de novas mensagens (LIST)..."
 
-#: src/inc.c:826
+#: src/inc.c:825
 #, c-format
 msgid "Deleting message %d"
 msgstr "Apagando mensagem %d"
 
-#: src/inc.c:833 src/send_message.c:649
+#: src/inc.c:832 src/send_message.c:649
 msgid "Quitting"
 msgstr "Saindo"
 
-#: src/inc.c:858
+#: src/inc.c:857
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Baixando mensagem (%d / %d) (%s / %s)"
 
-#: src/inc.c:879
+#: src/inc.c:878
 #, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Recebendo (%d mensagem(ns) (%s) recebido)"
 
-#: src/inc.c:1107
+#: src/inc.c:1106
 msgid "Connection failed."
 msgstr "Falha na conexão"
 
-#: src/inc.c:1113
+#: src/inc.c:1112
 msgid "Error occurred while processing mail."
 msgstr "Ocorreu um erro enquanto as mensagens eram processadas."
 
-#: src/inc.c:1118
+#: src/inc.c:1117
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2726,28 +2727,28 @@ msgstr ""
 "Erro ao processar mensagens:\n"
 "%s"
 
-#: src/inc.c:1124
+#: src/inc.c:1123
 msgid "No disk space left."
 msgstr "Não há espaço disponível no disco."
 
-#: src/inc.c:1129
+#: src/inc.c:1128
 msgid "Can't write file."
 msgstr "Não foi possível gravar o arquivo."
 
-#: src/inc.c:1134
+#: src/inc.c:1133
 msgid "Socket error."
 msgstr "erro de socket."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1140 src/send_message.c:584 src/send_message.c:772
+#: src/inc.c:1139 src/send_message.c:584 src/send_message.c:772
 msgid "Connection closed by the remote host."
 msgstr "Conexão remota finalizada pela estação remota."
 
-#: src/inc.c:1146
+#: src/inc.c:1145
 msgid "Mailbox is locked."
 msgstr "Caixa de correio está travada."
 
-#: src/inc.c:1150
+#: src/inc.c:1149
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2756,11 +2757,11 @@ msgstr ""
 "Caixa de correio está trancada:\n"
 "%s"
 
-#: src/inc.c:1156 src/send_message.c:757
+#: src/inc.c:1155 src/send_message.c:757
 msgid "Authentication failed."
 msgstr "Falha de autenticação."
 
-#: src/inc.c:1161 src/send_message.c:760
+#: src/inc.c:1160 src/send_message.c:760
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2769,15 +2770,15 @@ msgstr ""
 "Falha de autenticação:\n"
 "%s"
 
-#: src/inc.c:1166 src/send_message.c:776
+#: src/inc.c:1165 src/send_message.c:776
 msgid "Session timed out."
 msgstr "Tempo limite da sessão."
 
-#: src/inc.c:1202
+#: src/inc.c:1201
 msgid "Incorporation cancelled\n"
 msgstr "Incorporação cancelada\n"
 
-#: src/inc.c:1285
+#: src/inc.c:1284
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Obtendo novas mensagens de %s até %s...\n"
@@ -3252,14 +3253,15 @@ msgid "/_View/Mess_age source"
 msgstr "/E_xibir/Ver _fonte"
 
 #: src/mainwindow.c:708 src/messageview.c:245
-msgid "/_View/Show all _header"
+#, fuzzy
+msgid "/_View/Show all _headers"
 msgstr "/E_xibir/_Mostrar todos os cabeçalhos"
 
 #: src/mainwindow.c:710
 msgid "/_View/_Update summary"
 msgstr "/E_xibir/A_tualizar sumário"
 
-#: src/mainwindow.c:712 src/messageview.c:247
+#: src/mainwindow.c:712 src/messageview.c:248
 msgid "/_Message"
 msgstr "/_Mensagem"
 
@@ -3289,16 +3291,16 @@ msgstr "/_Mensagem/Enviar mensagens da _fila"
 
 #: src/mainwindow.c:722 src/mainwindow.c:724 src/mainwindow.c:731
 #: src/mainwindow.c:736 src/mainwindow.c:739 src/mainwindow.c:750
-#: src/mainwindow.c:752 src/mainwindow.c:755 src/messageview.c:250
-#: src/messageview.c:258 src/messageview.c:263
+#: src/mainwindow.c:752 src/mainwindow.c:755 src/messageview.c:251
+#: src/messageview.c:259 src/messageview.c:264
 msgid "/_Message/---"
 msgstr "/_Mensagem/---"
 
-#: src/mainwindow.c:723 src/messageview.c:248
+#: src/mainwindow.c:723 src/messageview.c:249
 msgid "/_Message/Compose _new message"
 msgstr "/_Mensagem/Compor _nova mensagem"
 
-#: src/mainwindow.c:725 src/messageview.c:251
+#: src/mainwindow.c:725 src/messageview.c:252
 msgid "/_Message/_Reply"
 msgstr "/_Mensagem/_Responder"
 
@@ -3306,27 +3308,27 @@ msgstr "/_Mensagem/_Responder"
 msgid "/_Message/Repl_y to"
 msgstr "/_Mensagem/_Responder para"
 
-#: src/mainwindow.c:727 src/messageview.c:252
+#: src/mainwindow.c:727 src/messageview.c:253
 msgid "/_Message/Repl_y to/_all"
 msgstr "/Mensagem/Responder para/_todos"
 
-#: src/mainwindow.c:728 src/messageview.c:254
+#: src/mainwindow.c:728 src/messageview.c:255
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Mensagem/Responder para/_quem enviou"
 
-#: src/mainwindow.c:729 src/messageview.c:256
+#: src/mainwindow.c:729 src/messageview.c:257
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/Mensagem/Responder para/_lista"
 
-#: src/mainwindow.c:732 src/messageview.c:259
+#: src/mainwindow.c:732 src/messageview.c:260
 msgid "/_Message/_Forward"
 msgstr "/_Mensagem/Encam_inhar"
 
-#: src/mainwindow.c:733 src/messageview.c:260
+#: src/mainwindow.c:733 src/messageview.c:261
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Mensagem/Encaminhar como ane_xo"
 
-#: src/mainwindow.c:735 src/messageview.c:262
+#: src/mainwindow.c:735 src/messageview.c:263
 msgid "/_Message/Redirec_t"
 msgstr "/_Mensagem/Redire_cionar"
 
@@ -3382,7 +3384,7 @@ msgstr "/_Mensagem/Classificar como _spam"
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/_Mensagem/Classificar como _não-spam"
 
-#: src/mainwindow.c:756 src/messageview.c:264
+#: src/mainwindow.c:756 src/messageview.c:265
 msgid "/_Message/Re-_edit"
 msgstr "/_Mensagem/Ed_itar novamente"
 
@@ -3398,23 +3400,23 @@ msgstr "/_Ferramentas/Filtrar _todas as mensagens na pasta"
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Ferramentas/_Filtrar mensagens selecionadas"
 
-#: src/mainwindow.c:767 src/messageview.c:271
+#: src/mainwindow.c:767 src/messageview.c:272
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Ferramentas/_Criar regra de filtro"
 
-#: src/mainwindow.c:768 src/messageview.c:273
+#: src/mainwindow.c:768 src/messageview.c:274
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Ferramentas/_Criar regra de filtro/_Automaticamente"
 
-#: src/mainwindow.c:770 src/messageview.c:275
+#: src/mainwindow.c:770 src/messageview.c:276
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Ferramentas/_Criar regra de filtro/pelo _remtente"
 
-#: src/mainwindow.c:772 src/messageview.c:277
+#: src/mainwindow.c:772 src/messageview.c:278
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Ferramentas/_Criar regra de filtro/pelo _destinatário"
 
-#: src/mainwindow.c:774 src/messageview.c:279
+#: src/mainwindow.c:774 src/messageview.c:280
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Ferramentas/_Criar regra de filtro/pelo A_ssunto"
 
@@ -3532,7 +3534,7 @@ msgid "MainWindow: color allocation %d failed\n"
 msgstr "MainWindow: falhou ao alocar cores %d\n"
 
 #: src/mainwindow.c:1139 src/summaryview.c:2275 src/summaryview.c:2360
-#: src/summaryview.c:3907 src/summaryview.c:4036 src/summaryview.c:4394
+#: src/summaryview.c:3908 src/summaryview.c:4037 src/summaryview.c:4395
 msgid "done.\n"
 msgstr "Pronto.\n"
 
@@ -3813,7 +3815,7 @@ msgid "Find text:"
 msgstr "Encontrar texto:"
 
 #: src/message_search.c:153 src/prefs_search_folder.c:253
-#: src/query_search.c:326
+#: src/query_search.c:343
 msgid "Case sensitive"
 msgstr "Maiús./minús."
 
@@ -3837,27 +3839,27 @@ msgstr "Fim da mensagem atingido; continuar do início?"
 msgid "Search finished"
 msgstr "Procura concluída"
 
-#: src/messageview.c:268
+#: src/messageview.c:269
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/_Ferramentas/Adicionar remetente ao Livro de _Endereços"
 
-#: src/messageview.c:300
+#: src/messageview.c:301
 msgid "Creating message view...\n"
 msgstr "Criando visualizador de mensagem...\n"
 
-#: src/messageview.c:325
+#: src/messageview.c:326
 msgid "Text"
 msgstr "Texto"
 
-#: src/messageview.c:330
+#: src/messageview.c:331
 msgid "Attachments"
 msgstr "Anexos"
 
-#: src/messageview.c:380
+#: src/messageview.c:381
 msgid "Message View - Sylpheed"
 msgstr "Visualização da Mensagem - Sylpheed"
 
-#: src/messageview.c:699 src/summaryview.c:3436
+#: src/messageview.c:700 src/summaryview.c:3436
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Não foi possível salvar arquivo `%s'."
@@ -3874,7 +3876,7 @@ msgstr "(Comando padrão de impressão)"
 msgid "Print"
 msgstr "Imprimir"
 
-#: src/messageview.c:770 src/summaryview.c:3471
+#: src/messageview.c:769 src/summaryview.c:3470
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -3969,11 +3971,11 @@ msgstr ""
 "Digite o comando de impressão:\n"
 "(`%s' será sustituído pelo arquivo)"
 
-#: src/mimeview.c:1147
+#: src/mimeview.c:1140
 msgid "Opening executable file"
 msgstr "Abrindo arquivo executável"
 
-#: src/mimeview.c:1148
+#: src/mimeview.c:1141
 msgid ""
 "This is an executable file. Opening executable file is restricted for "
 "security.\n"
@@ -3985,11 +3987,6 @@ msgstr ""
 "Se você quer executá-lo, salve-o em algum diretório e certifique-se de que "
 "não seja um vírus ou programa malicioso."
 
-#: src/mimeview.c:1184
-#, c-format
-msgid "MIME viewer command line is invalid: `%s'"
-msgstr "O comando do visualizador MIME é inválido: `%s'"
-
 #: src/passphrase.c:96
 msgid "Passphrase"
 msgstr "Passphrase"
@@ -5724,19 +5721,19 @@ msgstr "Responder para:"
 msgid "%s - Edit search condition"
 msgstr "%s - Editar a condição de busca"
 
-#: src/prefs_search_folder.c:209 src/query_search.c:257
+#: src/prefs_search_folder.c:209 src/query_search.c:274
 msgid "Match any of the following"
 msgstr "Casar qualquer um dos seguintes"
 
-#: src/prefs_search_folder.c:211 src/query_search.c:259
+#: src/prefs_search_folder.c:211 src/query_search.c:276
 msgid "Match all of the following"
 msgstr "Casar todos os seguintes"
 
-#: src/prefs_search_folder.c:231 src/query_search.c:303
+#: src/prefs_search_folder.c:231 src/query_search.c:320
 msgid "Folder:"
 msgstr "Pasta:"
 
-#: src/prefs_search_folder.c:248 src/query_search.c:321
+#: src/prefs_search_folder.c:248 src/query_search.c:338
 msgid "Search subfolders"
 msgstr "Procurar nas sub-pastas"
 
@@ -5750,17 +5747,17 @@ msgid "Attachment"
 msgstr "Anexo"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73 src/query_search.c:371 src/summaryview.c:4901
+#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4902
 msgid "Subject"
 msgstr "Assunto"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/query_search.c:372 src/summaryview.c:4904
+#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4905
 msgid "From"
 msgstr "De"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/query_search.c:373 src/summaryview.c:4906
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:4907
 msgid "Date"
 msgstr "Data"
 
@@ -5854,41 +5851,41 @@ msgstr "Criando diálogo de progresso...\n"
 msgid "Status"
 msgstr "Status"
 
-#: src/query_search.c:234
+#: src/query_search.c:251
 msgid "Search messages"
 msgstr "Procurar mensagens"
 
-#: src/query_search.c:395
+#: src/query_search.c:423
 msgid "_Save as search folder"
 msgstr "_Salvar como pasta de busca"
 
-#: src/query_search.c:512 src/subscribedialog.c:526 src/summaryview.c:842
+#: src/query_search.c:542 src/subscribedialog.c:526 src/summaryview.c:842
 msgid "Done."
 msgstr "Feito."
 
-#: src/query_search.c:536
+#: src/query_search.c:566
 #, c-format
 msgid "Searching %s ..."
 msgstr "Procurando %s ..."
 
-#: src/query_search.c:564
+#: src/query_search.c:594
 #, c-format
 msgid "Searching %s (%d / %d)..."
 msgstr "Procurando %s (%d / %d)..."
 
-#: src/query_search.c:645 src/summaryview.c:2051
+#: src/query_search.c:675 src/summaryview.c:2051
 msgid "(No Date)"
 msgstr "(Sem data)"
 
-#: src/query_search.c:833
+#: src/query_search.c:869
 msgid "Save as search folder"
 msgstr "Salvar como pasta de busca"
 
-#: src/query_search.c:854
+#: src/query_search.c:890
 msgid "Location:"
 msgstr "Local:"
 
-#: src/query_search.c:869
+#: src/query_search.c:905
 msgid "Folder name:"
 msgstr "Nome da pasta:"
 
@@ -6510,37 +6507,37 @@ msgstr "Mensagem %d está marcada para ser copiada para %s\n"
 msgid "Destination for copy is same as current folder."
 msgstr "O destino para cópia é o mesmo que a pasta atual."
 
-#: src/summaryview.c:3506
+#: src/summaryview.c:3507
 msgid "Error occurred while processing messages."
 msgstr "Erro ao processar mensagens."
 
-#: src/summaryview.c:3814 src/summaryview.c:3815
+#: src/summaryview.c:3815 src/summaryview.c:3816
 msgid "Building threads..."
 msgstr "Construindo a hierarquia..."
 
-#: src/summaryview.c:3965 src/summaryview.c:3966
+#: src/summaryview.c:3966 src/summaryview.c:3967
 msgid "Unthreading..."
 msgstr "Desfazendo a hierarquia..."
 
-#: src/summaryview.c:4259 src/summaryview.c:4315
+#: src/summaryview.c:4260 src/summaryview.c:4316
 #, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtrando (%d / %d)..."
 
-#: src/summaryview.c:4364
+#: src/summaryview.c:4365
 msgid "filtering..."
 msgstr "filtrando..."
 
-#: src/summaryview.c:4365
+#: src/summaryview.c:4366
 msgid "Filtering..."
 msgstr "Filtrando..."
 
-#: src/summaryview.c:4401
+#: src/summaryview.c:4402
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "%d mensagem(ns) foram filtradas."
 
-#: src/summaryview.c:4910
+#: src/summaryview.c:4911
 msgid "No."
 msgstr "Nº"
 
@@ -6622,6 +6619,9 @@ msgstr "Sai_r"
 msgid "Sylpheed"
 msgstr "Sylpheed"
 
+#~ msgid "MIME viewer command line is invalid: `%s'"
+#~ msgstr "O comando do visualizador MIME é inválido: `%s'"
+
 #~ msgid "%dB"
 #~ msgstr "%dB"
 
diff --git a/po/ro.po b/po/ro.po
index 18b3b597..3adeeda8 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-03-08 19:06+0900\n"
+"POT-Creation-Date: 2006-03-10 16:06+0900\n"
 "PO-Revision-Date: 2006-03-06 20:13+0200\n"
 "Last-Translator: Cristian Secară <cristi@secarica.ro>\n"
 "Language-Team: \n"
@@ -516,7 +516,7 @@ msgstr "Găsit %s\n"
 msgid "Configuration is saved.\n"
 msgstr "Configuraţia a fost salvată.\n"
 
-#: libsylph/prefs_common.c:495
+#: libsylph/prefs_common.c:496
 msgid "Junk mail filter"
 msgstr "Filtru spam"
 
@@ -533,7 +533,7 @@ msgstr "nu se poate deschide fişierul de marcaj\n"
 msgid "can't fetch message %d\n"
 msgstr "nu se poate verifica mesajul %d\n"
 
-#: libsylph/procmsg.c:1375
+#: libsylph/procmsg.c:1378
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Linia de comandă pentru imprimare este invalidă: '%s'\n"
@@ -611,12 +611,12 @@ msgstr "  Subiect: %s\n"
 msgid "  Issuer: %s\n"
 msgstr "  Eliberat de: %s\n"
 
-#: libsylph/utils.c:2411 src/compose.c:2888 src/compose.c:3151
+#: libsylph/utils.c:2430 src/compose.c:2888 src/compose.c:3151
 #: src/compose.c:3214 src/compose.c:3334
 msgid "can't change file mode\n"
 msgstr "nu se pot schimba permisiunile fişierului\n"
 
-#: libsylph/utils.c:2418 libsylph/utils.c:2542
+#: libsylph/utils.c:2437 libsylph/utils.c:2561
 #, c-format
 msgid "writing to %s failed.\n"
 msgstr "scrierea în %s a eşuat.\n"
@@ -702,7 +702,7 @@ msgstr ""
 "Activaţi căsuţele de bifare din coloana 'G' pentru a activa\n"
 "recepţionarea mesajelor la comanda 'Verifică tot'."
 
-#: src/account_dialog.c:366 src/addressadd.c:192 src/addressbook.c:490
+#: src/account_dialog.c:366 src/addressadd.c:192 src/addressbook.c:491
 #: src/compose.c:4292 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
@@ -852,7 +852,7 @@ msgstr "Adăugare în agendă"
 msgid "Address"
 msgstr "Agendă"
 
-#: src/addressadd.c:212 src/addressbook.c:492 src/editaddress.c:202
+#: src/addressadd.c:212 src/addressbook.c:493 src/editaddress.c:202
 #: src/editaddress.c:795 src/editaddress.c:860 src/editgroup.c:267
 msgid "Remarks"
 msgstr "Observaţii"
@@ -879,7 +879,8 @@ msgid "/_File/New _JPilot"
 msgstr "/_Fişier/_JPilot nou"
 
 #: src/addressbook.c:344
-msgid "/_File/New _Server"
+#, fuzzy
+msgid "/_File/New _LDAP Server"
 msgstr "/_Fişier/Server _LDAP nou"
 
 #: src/addressbook.c:346 src/addressbook.c:349 src/compose.c:520
@@ -934,7 +935,7 @@ msgid "/_Address/_Delete"
 msgstr "/A_dresă/Ş_terge"
 
 #: src/addressbook.c:359 src/compose.c:645 src/mainwindow.c:758
-#: src/messageview.c:266
+#: src/messageview.c:267
 msgid "/_Tools"
 msgstr "/_Unelte"
 
@@ -943,12 +944,12 @@ msgid "/_Tools/Import _LDIF file"
 msgstr "/_Unelte/Importă fişier _LDIF"
 
 #: src/addressbook.c:361 src/compose.c:666 src/mainwindow.c:812
-#: src/messageview.c:286
+#: src/messageview.c:287
 msgid "/_Help"
 msgstr "/_Ajutor"
 
 #: src/addressbook.c:362 src/compose.c:667 src/mainwindow.c:824
-#: src/messageview.c:287
+#: src/messageview.c:288
 msgid "/_Help/_About"
 msgstr "/_Ajutor/_Despre"
 
@@ -985,61 +986,61 @@ msgstr "/_Editare"
 msgid "/_Delete"
 msgstr "/Ş_terge"
 
-#: src/addressbook.c:491
+#: src/addressbook.c:492
 msgid "E-Mail address"
 msgstr "Adresă e-mail"
 
-#: src/addressbook.c:495 src/compose.c:4797 src/prefs_common_dialog.c:2183
+#: src/addressbook.c:496 src/compose.c:4797 src/prefs_common_dialog.c:2183
 msgid "Address book"
 msgstr "Agendă"
 
-#: src/addressbook.c:599 src/prefs_filter_edit.c:249
+#: src/addressbook.c:603 src/prefs_filter_edit.c:249
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr " Nume:"
 
 #. Buttons
-#: src/addressbook.c:631 src/addressbook.c:1673 src/editaddress.c:884
+#: src/addressbook.c:636 src/addressbook.c:1678 src/editaddress.c:884
 #: src/editaddress.c:1017 src/mainwindow.c:2426 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 "Şterge"
 
-#: src/addressbook.c:634 src/editaddress.c:890 src/editaddress.c:1023
+#: src/addressbook.c:639 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:1552
 msgid "Add"
 msgstr "Adaugă"
 
-#: src/addressbook.c:637
+#: src/addressbook.c:642
 msgid "Lookup"
 msgstr "Căutare"
 
-#: src/addressbook.c:649 src/headerview.c:55 src/prefs_folder_item.c:339
+#: src/addressbook.c:654 src/headerview.c:55 src/prefs_folder_item.c:339
 #: src/prefs_template.c:176
 msgid "To:"
 msgstr "Către:"
 
-#: src/addressbook.c:653 src/prefs_folder_item.c:356 src/prefs_template.c:178
+#: src/addressbook.c:658 src/prefs_folder_item.c:356 src/prefs_template.c:178
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:657 src/prefs_folder_item.c:367
+#: src/addressbook.c:662 src/prefs_folder_item.c:367
 msgid "Bcc:"
 msgstr "Bcc:"
 
 #. Confirm deletion
-#: src/addressbook.c:827
+#: src/addressbook.c:832
 msgid "Delete address(es)"
 msgstr "Şterge adresa (adresele)"
 
-#: src/addressbook.c:828
+#: src/addressbook.c:833
 msgid "Really delete the address(es)?"
 msgstr "Sigur ştergeţi adresa (adresele) ?"
 
-#: src/addressbook.c:1664
+#: src/addressbook.c:1669
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1048,36 +1049,36 @@ msgstr ""
 "Doriţi să ştergeţi folderul ŞI toate adresele din '%s' ?\n"
 "Dacă ştergeţi doar folderul, adresele vor fi mutate în folderul părinte."
 
-#: src/addressbook.c:1667 src/folderview.c:2372
+#: src/addressbook.c:1672 src/folderview.c:2372
 msgid "Delete folder"
 msgstr "Ştergere folder"
 
-#: src/addressbook.c:1667
+#: src/addressbook.c:1672
 msgid "_Folder only"
 msgstr "Doar _folder"
 
-#: src/addressbook.c:1667
+#: src/addressbook.c:1672
 msgid "Folder and _addresses"
 msgstr "Folder şi _adrese"
 
-#: src/addressbook.c:1672
+#: src/addressbook.c:1677
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Sigur ştergeţi '%s' ?"
 
-#: src/addressbook.c:2358 src/addressbook.c:2491
+#: src/addressbook.c:2363 src/addressbook.c:2496
 msgid "New user, could not save index file."
 msgstr "Utilizator nou, fişierul index nu a putut fi salvat."
 
-#: src/addressbook.c:2362 src/addressbook.c:2495
+#: src/addressbook.c:2367 src/addressbook.c:2500
 msgid "New user, could not save address book files."
 msgstr "Utilizator nou, fişierele agendei nu au putut fi salvate."
 
-#: src/addressbook.c:2372 src/addressbook.c:2505
+#: src/addressbook.c:2377 src/addressbook.c:2510
 msgid "Old address book converted successfully."
 msgstr "Agenda veche a fost convertită cu succes."
 
-#: src/addressbook.c:2377
+#: src/addressbook.c:2382
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1085,7 +1086,7 @@ msgstr ""
 "Agenda veche a fost convertită, iar\n"
 "fişierul index al noii agende nu a putut fi salvat."
 
-#: src/addressbook.c:2390
+#: src/addressbook.c:2395
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1093,7 +1094,7 @@ msgstr ""
 "Agenda nu a putut fi convertită, dar\n"
 "au fost create fişierele noi de agendă goală."
 
-#: src/addressbook.c:2396
+#: src/addressbook.c:2401
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1101,7 +1102,7 @@ msgstr ""
 "Agenda nu a putut fi convertită, iar\n"
 "fişierele noi de agendă nu au putut fi create."
 
-#: src/addressbook.c:2401
+#: src/addressbook.c:2406
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1109,92 +1110,92 @@ msgstr ""
 "Agenda nu a putut fi convertită\n"
 "şi fişierele noi de agendă nu au putut fi create."
 
-#: src/addressbook.c:2408
+#: src/addressbook.c:2413
 msgid "Addressbook conversion error"
 msgstr "Eroare de conversie a agendei"
 
-#: src/addressbook.c:2412
+#: src/addressbook.c:2417
 msgid "Addressbook conversion"
 msgstr "Conversie agendă"
 
-#: src/addressbook.c:2447
+#: src/addressbook.c:2452
 msgid "Addressbook Error"
 msgstr "Eroare agendă"
 
-#: src/addressbook.c:2448 src/addressbook.c:2548
+#: src/addressbook.c:2453 src/addressbook.c:2553
 msgid "Could not read address index"
 msgstr "Fişierul index al agendei nu a putut fi citit"
 
-#: src/addressbook.c:2510
+#: src/addressbook.c:2515
 msgid "Old address book converted, could not save new address index file"
 msgstr ""
 "Agenda veche a fost convertită, iar fişierul index al noii agende nu a putut "
 "fi salvat."
 
-#: src/addressbook.c:2524
+#: src/addressbook.c:2529
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr ""
 "Agenda nu a putut fi convertită, dar au fost create fişierele noi de agendă "
 "goală."
 
-#: src/addressbook.c:2530
+#: src/addressbook.c:2535
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr ""
 "Agenda nu a putut fi convertită, iar fişierele noi de agendă nu au putut fi "
 "create."
 
-#: src/addressbook.c:2536
+#: src/addressbook.c:2541
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr ""
 "Agenda nu a putut fi convertită şi fişierele noi de agendă nu au putut fi "
 "create."
 
-#: src/addressbook.c:2554
+#: src/addressbook.c:2559
 msgid "Addressbook Conversion Error"
 msgstr "Eroare de conversie a agendei"
 
-#: src/addressbook.c:2560
+#: src/addressbook.c:2565
 msgid "Addressbook Conversion"
 msgstr "Conversie agendă"
 
-#: src/addressbook.c:3075 src/prefs_common_dialog.c:2033
+#: src/addressbook.c:3080 src/prefs_common_dialog.c:2033
 msgid "Interface"
 msgstr "Interfaţă"
 
-#: src/addressbook.c:3091 src/importldif.c:514
+#: src/addressbook.c:3096 src/importldif.c:514
 msgid "Address Book"
 msgstr "Agendă"
 
-#: src/addressbook.c:3107
+#: src/addressbook.c:3112
 msgid "Person"
 msgstr "Persoană"
 
-#: src/addressbook.c:3123
+#: src/addressbook.c:3128
 msgid "EMail Address"
 msgstr "Adresă e-mail"
 
-#: src/addressbook.c:3139
+#: src/addressbook.c:3144
 msgid "Group"
 msgstr "Grupă"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3155 src/folderview.c:367 src/prefs_account_dialog.c:1694
-#: src/query_search.c:370
+#: src/addressbook.c:3160 src/folderview.c:367 src/prefs_account_dialog.c:1694
+#: src/query_search.c:398
 msgid "Folder"
 msgstr "Folder"
 
-#: src/addressbook.c:3171
+#: src/addressbook.c:3176
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3187 src/addressbook.c:3203
+#: src/addressbook.c:3192 src/addressbook.c:3208
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3219
+#: src/addressbook.c:3224
 msgid "LDAP Server"
 msgstr "Server LDAP"
 
@@ -1206,7 +1207,7 @@ msgstr "Adrese comune:"
 msgid "Personal address"
 msgstr "Adrese personale:"
 
-#: src/alertpanel.c:142 src/compose.c:5519 src/main.c:621
+#: src/alertpanel.c:142 src/compose.c:5517 src/main.c:621
 msgid "Notice"
 msgstr "Notificare"
 
@@ -1214,7 +1215,7 @@ msgstr "Notificare"
 msgid "Warning"
 msgstr "Avertisment"
 
-#: src/alertpanel.c:168 src/inc.c:587
+#: src/alertpanel.c:168 src/inc.c:586
 msgid "Error"
 msgstr "Eroare"
 
@@ -1258,7 +1259,7 @@ msgstr "Maro"
 #. 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:4761
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4762
 msgid "None"
 msgstr "Nimic"
 
@@ -1505,7 +1506,7 @@ msgstr "/_Vizualizare/Codare caract_ere/Thai (TIS-620)"
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Vizualizare/Codare caract_ere/Thai (Windows-874)"
 
-#: src/compose.c:646 src/mainwindow.c:759 src/messageview.c:267
+#: src/compose.c:646 src/mainwindow.c:759 src/messageview.c:268
 msgid "/_Tools/_Address book"
 msgstr "/_Unelte/_Agendă"
 
@@ -1513,14 +1514,14 @@ msgstr "/_Unelte/_Agendă"
 msgid "/_Tools/_Template"
 msgstr "/_Unelte/_Şablon"
 
-#: src/compose.c:649 src/mainwindow.c:783 src/messageview.c:283
+#: src/compose.c:649 src/mainwindow.c:783 src/messageview.c:284
 msgid "/_Tools/Actio_ns"
 msgstr "/_Unelte/Acţiu_ni"
 
 #: src/compose.c:651 src/compose.c:655 src/compose.c:661 src/mainwindow.c:762
 #: src/mainwindow.c:776 src/mainwindow.c:781 src/mainwindow.c:784
-#: src/mainwindow.c:788 src/mainwindow.c:790 src/messageview.c:270
-#: src/messageview.c:282
+#: src/mainwindow.c:788 src/mainwindow.c:790 src/messageview.c:271
+#: src/messageview.c:283
 msgid "/_Tools/---"
 msgstr "/_Unelte/---"
 
@@ -1590,7 +1591,7 @@ msgstr "Mesaj: %s"
 msgid "Can't get the part of multipart message."
 msgstr "Nu se poate obţine o parte a mesajului multiparte."
 
-#: src/compose.c:2524 src/headerview.c:195 src/query_search.c:636
+#: src/compose.c:2524 src/headerview.c:195 src/query_search.c:666
 #: src/summaryview.c:2124
 msgid "(No Subject)"
 msgstr "(Fără subiect)"
@@ -1716,7 +1717,7 @@ msgstr "Tip MIME"
 
 #. S_COL_DATE
 #: src/compose.c:4282 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4908
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4909
 msgid "Size"
 msgstr "Dimensiune"
 
@@ -1815,12 +1816,12 @@ msgstr "Cale"
 msgid "File name"
 msgstr "Nume fişier"
 
-#: src/compose.c:5468
+#: src/compose.c:5466
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Linia de comandă este invalidă: '%s'\n"
 
-#: src/compose.c:5516
+#: src/compose.c:5514
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1829,44 +1830,44 @@ msgstr ""
 "Editorul extern este încă în funcţiune.\n"
 "Forţaţi terminarea procesului (pid: %d) ?\n"
 
-#: src/compose.c:5891 src/compose.c:5896 src/compose.c:5902
+#: src/compose.c:5889 src/compose.c:5894 src/compose.c:5900
 msgid "Can't queue the message."
 msgstr "Nu se poate pune mesajul în coada de aşteptare."
 
-#: src/compose.c:5993
+#: src/compose.c:5991
 msgid "Select files"
 msgstr "Selectează fişiere"
 
-#: src/compose.c:6016
+#: src/compose.c:6014
 msgid "Select file"
 msgstr "Selectează fişier"
 
-#: src/compose.c:6051
+#: src/compose.c:6049
 msgid "Save message"
 msgstr "Salvează mesaj"
 
-#: src/compose.c:6052
+#: src/compose.c:6050
 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:6054
+#: src/compose.c:6052
 msgid "Close _without saving"
 msgstr "Închide _fără salvare"
 
-#: src/compose.c:6096
+#: src/compose.c:6094
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Doriţi să aplicaţi şablonul '%s' ?"
 
-#: src/compose.c:6098
+#: src/compose.c:6096
 msgid "Apply template"
 msgstr "Aplică şablon"
 
-#: src/compose.c:6099
+#: src/compose.c:6097
 msgid "_Replace"
 msgstr "Înl_ocuieşte"
 
-#: src/compose.c:6099
+#: src/compose.c:6097
 msgid "_Insert"
 msgstr "_Inserează"
 
@@ -1988,52 +1989,52 @@ msgstr "Trebuie furnizat un nume de grup."
 msgid "Edit Group Data"
 msgstr "Editează date grup"
 
-#: src/editgroup.c:300
+#: src/editgroup.c:299
 msgid "Group Name"
 msgstr "Nume grup"
 
-#: src/editgroup.c:319
+#: src/editgroup.c:318
 msgid "Addresses in Group"
 msgstr "Adrese în grup"
 
-#: src/editgroup.c:321
+#: src/editgroup.c:320
 msgid " -> "
 msgstr " -> "
 
-#: src/editgroup.c:348
+#: src/editgroup.c:347
 msgid " <- "
 msgstr " <- "
 
-#: src/editgroup.c:350
+#: src/editgroup.c:349
 msgid "Available Addresses"
 msgstr "Adrese disponibile"
 
-#: src/editgroup.c:416
+#: src/editgroup.c:415
 msgid "Move E-Mail Addresses to or from Group with arrow buttons"
 msgstr "Mută adresele e-mail din sau în grup cu ajutorul butoanelor săgeţi"
 
-#: src/editgroup.c:468
+#: src/editgroup.c:467
 msgid "Edit Group Details"
 msgstr "Editează detalii grup"
 
-#: src/editgroup.c:471
+#: src/editgroup.c:470
 msgid "Add New Group"
 msgstr "Adaugă grup nou"
 
-#: src/editgroup.c:522
+#: src/editgroup.c:521
 msgid "Edit folder"
 msgstr "Editează folder"
 
-#: src/editgroup.c:522
+#: src/editgroup.c:521
 msgid "Input the new name of folder:"
 msgstr "Introduceţi noul nume al folderului:"
 
-#: src/editgroup.c:525 src/foldersel.c:541 src/folderview.c:2121
+#: src/editgroup.c:524 src/foldersel.c:541 src/folderview.c:2121
 #: src/folderview.c:2127
 msgid "New folder"
 msgstr "Folder nou"
 
-#: src/editgroup.c:526 src/foldersel.c:542 src/folderview.c:2128
+#: src/editgroup.c:525 src/foldersel.c:542 src/folderview.c:2128
 msgid "Input the name of new folder:"
 msgstr "Introduceţi numele noului folder:"
 
@@ -2234,7 +2235,7 @@ msgid "`%c' can't be included in folder name."
 msgstr "'%c' nu poate fi inclus în numele folderului."
 
 #: src/foldersel.c:561 src/folderview.c:2147 src/folderview.c:2206
-#: src/query_search.c:995
+#: src/query_search.c:1031
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Folderul '%s' există deja."
@@ -2494,7 +2495,7 @@ msgstr "Subiect:"
 msgid "Creating header view...\n"
 msgstr "Creare vedere header...\n"
 
-#: src/headerview.c:180 src/query_search.c:637 src/summaryview.c:2127
+#: src/headerview.c:180 src/query_search.c:667 src/summaryview.c:2127
 msgid "(No From)"
 msgstr "(Fără expeditor)"
 
@@ -2631,134 +2632,134 @@ msgstr "Terminat"
 msgid "Sylpheed: %d new messages"
 msgstr "Sylpheed: %d mesaje noi"
 
-#: src/inc.c:372
+#: src/inc.c:371
 msgid "Retrieving new messages"
 msgstr "Recepţionare mesaje noi"
 
-#: src/inc.c:415
+#: src/inc.c:414
 msgid "Standby"
 msgstr "Adormire"
 
-#: src/inc.c:544 src/inc.c:593
+#: src/inc.c:543 src/inc.c:592
 msgid "Cancelled"
 msgstr "Anulat"
 
-#: src/inc.c:555
+#: src/inc.c:554
 msgid "Retrieving"
 msgstr "Recepţionare"
 
-#: src/inc.c:564
+#: src/inc.c:563
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "Gata (%d mesaj(e) (%s) primit(e))"
 
-#: src/inc.c:568
+#: src/inc.c:567
 msgid "Done (no new messages)"
 msgstr "Gata (nu există mesaje noi)"
 
-#: src/inc.c:574
+#: src/inc.c:573
 msgid "Connection failed"
 msgstr "Conexiunea a eşuat"
 
-#: src/inc.c:577
+#: src/inc.c:576
 msgid "Auth failed"
 msgstr "Autorizarea a eşuat"
 
-#: src/inc.c:580
+#: src/inc.c:579
 msgid "Locked"
 msgstr "Blocat"
 
-#: src/inc.c:590
+#: src/inc.c:589
 msgid "Timeout"
 msgstr "Timp expirat"
 
-#: src/inc.c:640
+#: src/inc.c:639
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Terminat (%d noi mesaj(e))"
 
-#: src/inc.c:643
+#: src/inc.c:642
 msgid "Finished (no new messages)"
 msgstr "Terminat (nu există mesaje noi)"
 
-#: src/inc.c:652
+#: src/inc.c:651
 msgid "Some errors occurred while getting mail."
 msgstr "Au avut loc unele erori în timpul obţinerii mail-ului."
 
-#: src/inc.c:688
+#: src/inc.c:687
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "obţinere mesaje noi pentru contul %s...\n"
 
-#: src/inc.c:691
+#: src/inc.c:690
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Recepţionare mesaje noi"
 
-#: src/inc.c:710
+#: src/inc.c:709
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Conectare la serverul POP3: %s ..."
 
-#: src/inc.c:719
+#: src/inc.c:718
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Încercarea de conectare la serverul POP3 a eşuat: %s:%d\n"
 
-#: src/inc.c:798 src/send_message.c:631
+#: src/inc.c:797 src/send_message.c:631
 msgid "Authenticating..."
 msgstr "Autentificare..."
 
-#: src/inc.c:799
+#: src/inc.c:798
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Descărcare mesaje de la %s"
 
-#: src/inc.c:804
+#: src/inc.c:803
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Obţinerea numărului de mesaje noi (STAT)..."
 
-#: src/inc.c:808
+#: src/inc.c:807
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Obţinerea numărului de mesaje noi (LAST)..."
 
-#: src/inc.c:812
+#: src/inc.c:811
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Obţinerea numărului de mesaje noi (UIDL)..."
 
-#: src/inc.c:816
+#: src/inc.c:815
 msgid "Getting the size of messages (LIST)..."
 msgstr "Obţinerea dimensiunii mesajelor (LIST)..."
 
-#: src/inc.c:826
+#: src/inc.c:825
 #, c-format
 msgid "Deleting message %d"
 msgstr "Ştergere mesaje %d"
 
 # hm ?
-#: src/inc.c:833 src/send_message.c:649
+#: src/inc.c:832 src/send_message.c:649
 msgid "Quitting"
 msgstr "Închidere conexiune"
 
-#: src/inc.c:858
+#: src/inc.c:857
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Recepţionare mesaj (%d / %d) (%s / %s)"
 
-#: src/inc.c:879
+#: src/inc.c:878
 #, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Descărcare (%d mesaj(e) (%s) primit(e))"
 
-#: src/inc.c:1107
+#: src/inc.c:1106
 msgid "Connection failed."
 msgstr "Conexiunea a eşuat"
 
-#: src/inc.c:1113
+#: src/inc.c:1112
 msgid "Error occurred while processing mail."
 msgstr "A avut loc o eroare în timpul procesării mail-ului."
 
-#: src/inc.c:1118
+#: src/inc.c:1117
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2767,28 +2768,28 @@ msgstr ""
 "A avut loc o eroare în timpul procesării mail-ului.\n"
 "%s"
 
-#: src/inc.c:1124
+#: src/inc.c:1123
 msgid "No disk space left."
 msgstr "Nu mai este spaţiu pe disc."
 
-#: src/inc.c:1129
+#: src/inc.c:1128
 msgid "Can't write file."
 msgstr "Nu se poate scrie fişierul."
 
-#: src/inc.c:1134
+#: src/inc.c:1133
 msgid "Socket error."
 msgstr "Eroare socket."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1140 src/send_message.c:584 src/send_message.c:772
+#: src/inc.c:1139 src/send_message.c:584 src/send_message.c:772
 msgid "Connection closed by the remote host."
 msgstr "Conexiune închisă de serverul de la distanţă."
 
-#: src/inc.c:1146
+#: src/inc.c:1145
 msgid "Mailbox is locked."
 msgstr "Căsuţa poştală este blocată"
 
-#: src/inc.c:1150
+#: src/inc.c:1149
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2797,11 +2798,11 @@ msgstr ""
 "Căsuţa poştală este blocată:\n"
 "%s"
 
-#: src/inc.c:1156 src/send_message.c:757
+#: src/inc.c:1155 src/send_message.c:757
 msgid "Authentication failed."
 msgstr "Autentificare eşuată."
 
-#: src/inc.c:1161 src/send_message.c:760
+#: src/inc.c:1160 src/send_message.c:760
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2810,16 +2811,16 @@ msgstr ""
 "Autentificare eşuată:\n"
 "%s"
 
-#: src/inc.c:1166 src/send_message.c:776
+#: src/inc.c:1165 src/send_message.c:776
 msgid "Session timed out."
 msgstr "Timpul sesiunii a expirat."
 
 # ???
-#: src/inc.c:1202
+#: src/inc.c:1201
 msgid "Incorporation cancelled\n"
 msgstr "Încorporare anulată\n"
 
-#: src/inc.c:1285
+#: src/inc.c:1284
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Obţinere mesaje noi de la %s în %s...\n"
@@ -3297,14 +3298,15 @@ msgid "/_View/Mess_age source"
 msgstr "/_Vizualizare/Sursă mes_aj"
 
 #: src/mainwindow.c:708 src/messageview.c:245
-msgid "/_View/Show all _header"
+#, fuzzy
+msgid "/_View/Show all _headers"
 msgstr "/_Vizualizare/Arată tot _header-ul"
 
 #: src/mainwindow.c:710
 msgid "/_View/_Update summary"
 msgstr "/_Vizualizare/Sumar act_ualizare"
 
-#: src/mainwindow.c:712 src/messageview.c:247
+#: src/mainwindow.c:712 src/messageview.c:248
 msgid "/_Message"
 msgstr "/_Mesaj"
 
@@ -3336,16 +3338,16 @@ msgstr "/_Mesaj/Trimite me_sajele de la coadă"
 
 #: src/mainwindow.c:722 src/mainwindow.c:724 src/mainwindow.c:731
 #: src/mainwindow.c:736 src/mainwindow.c:739 src/mainwindow.c:750
-#: src/mainwindow.c:752 src/mainwindow.c:755 src/messageview.c:250
-#: src/messageview.c:258 src/messageview.c:263
+#: src/mainwindow.c:752 src/mainwindow.c:755 src/messageview.c:251
+#: src/messageview.c:259 src/messageview.c:264
 msgid "/_Message/---"
 msgstr "/_Mesaj/---"
 
-#: src/mainwindow.c:723 src/messageview.c:248
+#: src/mainwindow.c:723 src/messageview.c:249
 msgid "/_Message/Compose _new message"
 msgstr "/_Mesaj/Compune mesaj _nou"
 
-#: src/mainwindow.c:725 src/messageview.c:251
+#: src/mainwindow.c:725 src/messageview.c:252
 msgid "/_Message/_Reply"
 msgstr "/_Mesaj/_Răspunde"
 
@@ -3353,27 +3355,27 @@ msgstr "/_Mesaj/_Răspunde"
 msgid "/_Message/Repl_y to"
 msgstr "/_Mesaj/Răsp_unde"
 
-#: src/mainwindow.c:727 src/messageview.c:252
+#: src/mainwindow.c:727 src/messageview.c:253
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Mesaj/Răsp_unde/la _toţi"
 
-#: src/mainwindow.c:728 src/messageview.c:254
+#: src/mainwindow.c:728 src/messageview.c:255
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Mesaj/Răsp_unde/_expeditorului"
 
-#: src/mainwindow.c:729 src/messageview.c:256
+#: src/mainwindow.c:729 src/messageview.c:257
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Mesaj/Răsp_unde/_listei de discuţii"
 
-#: src/mainwindow.c:732 src/messageview.c:259
+#: src/mainwindow.c:732 src/messageview.c:260
 msgid "/_Message/_Forward"
 msgstr "/_Mesaj/Îna_intează"
 
-#: src/mainwindow.c:733 src/messageview.c:260
+#: src/mainwindow.c:733 src/messageview.c:261
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Mesaj/Înaintează ca _ataşament"
 
-#: src/mainwindow.c:735 src/messageview.c:262
+#: src/mainwindow.c:735 src/messageview.c:263
 msgid "/_Message/Redirec_t"
 msgstr "/_Mesaj/Redirecţionea_ză"
 
@@ -3429,7 +3431,7 @@ msgstr "/_Mesaj/Setează ca s_pam"
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/_Mesaj/Setează ca n_on-spam"
 
-#: src/mainwindow.c:756 src/messageview.c:264
+#: src/mainwindow.c:756 src/messageview.c:265
 msgid "/_Message/Re-_edit"
 msgstr "/_Mesaj/Re_editează"
 
@@ -3445,23 +3447,23 @@ msgstr "/_Unelte/_Filtrează toate mesajele în folder"
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Unelte/Filtrează mesajele _selectate"
 
-#: src/mainwindow.c:767 src/messageview.c:271
+#: src/mainwindow.c:767 src/messageview.c:272
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Unelte/_Crează regulă de filtrare"
 
-#: src/mainwindow.c:768 src/messageview.c:273
+#: src/mainwindow.c:768 src/messageview.c:274
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Unelte/_Crează regulă de filtrare/_Automat"
 
-#: src/mainwindow.c:770 src/messageview.c:275
+#: src/mainwindow.c:770 src/messageview.c:276
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Unelte/_Crează regulă de filtrare/pe baza câmpului _De la"
 
-#: src/mainwindow.c:772 src/messageview.c:277
+#: src/mainwindow.c:772 src/messageview.c:278
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Unelte/_Crează regulă de filtrare/pe baza câmpului _Către"
 
-#: src/mainwindow.c:774 src/messageview.c:279
+#: src/mainwindow.c:774 src/messageview.c:280
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Unelte/_Crează regulă de filtrare/pe baza câmpului _Subiect"
 
@@ -3582,7 +3584,7 @@ msgid "MainWindow: color allocation %d failed\n"
 msgstr "Fereastra principală: alocarea culorii %d a eşuat\n"
 
 #: src/mainwindow.c:1139 src/summaryview.c:2275 src/summaryview.c:2360
-#: src/summaryview.c:3907 src/summaryview.c:4036 src/summaryview.c:4394
+#: src/summaryview.c:3908 src/summaryview.c:4037 src/summaryview.c:4395
 msgid "done.\n"
 msgstr "gata.\n"
 
@@ -3873,7 +3875,7 @@ msgid "Find text:"
 msgstr "Caută text:"
 
 #: src/message_search.c:153 src/prefs_search_folder.c:253
-#: src/query_search.c:326
+#: src/query_search.c:343
 msgid "Case sensitive"
 msgstr "Distincţie minuscule/majuscule"
 
@@ -3899,27 +3901,27 @@ msgstr "S-a ajuns la sfârşitul mesajului; continuaţi de la început ?"
 msgid "Search finished"
 msgstr "Căutare terminată"
 
-#: src/messageview.c:268
+#: src/messageview.c:269
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/_Unelte/Adaugă expeditorul în _agendă"
 
-#: src/messageview.c:300
+#: src/messageview.c:301
 msgid "Creating message view...\n"
 msgstr "Creare vedere mesaj...\n"
 
-#: src/messageview.c:325
+#: src/messageview.c:326
 msgid "Text"
 msgstr "Text"
 
-#: src/messageview.c:330
+#: src/messageview.c:331
 msgid "Attachments"
 msgstr "Ataşamente"
 
-#: src/messageview.c:380
+#: src/messageview.c:381
 msgid "Message View - Sylpheed"
 msgstr "Vizualizare mesaje - Syplheed"
 
-#: src/messageview.c:699 src/summaryview.c:3436
+#: src/messageview.c:700 src/summaryview.c:3436
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Nu se poate salva fişierul '%s'."
@@ -3937,7 +3939,7 @@ msgstr "(Comandă de imprimare predefinită)"
 msgid "Print"
 msgstr "Imprimare"
 
-#: src/messageview.c:770 src/summaryview.c:3471
+#: src/messageview.c:769 src/summaryview.c:3470
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -4033,11 +4035,11 @@ msgstr ""
 "Intraţi în linia de comandă pentru deschidere fişier:\n"
 "('%s' va fi înlocuit cu numele fişierului)"
 
-#: src/mimeview.c:1141
+#: src/mimeview.c:1140
 msgid "Opening executable file"
 msgstr "Deschidere fişier executabil"
 
-#: src/mimeview.c:1142
+#: src/mimeview.c:1141
 msgid ""
 "This is an executable file. Opening executable file is restricted for "
 "security.\n"
@@ -5811,19 +5813,19 @@ msgstr "Răspuns la:"
 msgid "%s - Edit search condition"
 msgstr "%s - Editează condiţia de căutare"
 
-#: src/prefs_search_folder.c:209 src/query_search.c:257
+#: src/prefs_search_folder.c:209 src/query_search.c:274
 msgid "Match any of the following"
 msgstr "Potriveşte oricare dintre următoarele"
 
-#: src/prefs_search_folder.c:211 src/query_search.c:259
+#: src/prefs_search_folder.c:211 src/query_search.c:276
 msgid "Match all of the following"
 msgstr "Potriveşte totul de mai departe"
 
-#: src/prefs_search_folder.c:231 src/query_search.c:303
+#: src/prefs_search_folder.c:231 src/query_search.c:320
 msgid "Folder:"
 msgstr "Folder:"
 
-#: src/prefs_search_folder.c:248 src/query_search.c:321
+#: src/prefs_search_folder.c:248 src/query_search.c:338
 msgid "Search subfolders"
 msgstr "Căutare subdirectoare"
 
@@ -5837,17 +5839,17 @@ msgid "Attachment"
 msgstr "Ataşament"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73 src/query_search.c:371 src/summaryview.c:4901
+#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4902
 msgid "Subject"
 msgstr "Subiect"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/query_search.c:372 src/summaryview.c:4904
+#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4905
 msgid "From"
 msgstr "Expeditor"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/query_search.c:373 src/summaryview.c:4906
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:4907
 msgid "Date"
 msgstr "Dată"
 
@@ -5942,41 +5944,41 @@ msgstr "Creare dialog de progres...\n"
 msgid "Status"
 msgstr "Stare"
 
-#: src/query_search.c:234
+#: src/query_search.c:251
 msgid "Search messages"
 msgstr "Caută mesaje"
 
-#: src/query_search.c:395
+#: src/query_search.c:423
 msgid "_Save as search folder"
 msgstr "_Salvează ca folder de căutare"
 
-#: src/query_search.c:512 src/subscribedialog.c:526 src/summaryview.c:842
+#: src/query_search.c:542 src/subscribedialog.c:526 src/summaryview.c:842
 msgid "Done."
 msgstr "Gata."
 
-#: src/query_search.c:536
+#: src/query_search.c:566
 #, c-format
 msgid "Searching %s ..."
 msgstr "Căutare %s ..."
 
-#: src/query_search.c:564
+#: src/query_search.c:594
 #, c-format
 msgid "Searching %s (%d / %d)..."
 msgstr "Căutare %s (%d / %d)..."
 
-#: src/query_search.c:645 src/summaryview.c:2051
+#: src/query_search.c:675 src/summaryview.c:2051
 msgid "(No Date)"
 msgstr "(Fără Dată)"
 
-#: src/query_search.c:833
+#: src/query_search.c:869
 msgid "Save as search folder"
 msgstr "Salvează ca folder de căutare"
 
-#: src/query_search.c:854
+#: src/query_search.c:890
 msgid "Location:"
 msgstr "Locaţie"
 
-#: src/query_search.c:869
+#: src/query_search.c:905
 msgid "Folder name:"
 msgstr "Nume folder:"
 
@@ -6606,37 +6608,37 @@ msgstr "Mesajul %d este setat pentru copiere în %s\n"
 msgid "Destination for copy is same as current folder."
 msgstr "Destinaţia pentru copiere este aceeaşi cu folderul curent."
 
-#: src/summaryview.c:3506
+#: src/summaryview.c:3507
 msgid "Error occurred while processing messages."
 msgstr "A avut loc o eroare în timpul procesării mesajelor."
 
-#: src/summaryview.c:3814 src/summaryview.c:3815
+#: src/summaryview.c:3815 src/summaryview.c:3816
 msgid "Building threads..."
 msgstr "Construire fire de discuţie..."
 
-#: src/summaryview.c:3965 src/summaryview.c:3966
+#: src/summaryview.c:3966 src/summaryview.c:3967
 msgid "Unthreading..."
 msgstr "Distrugere fire de discuţie..."
 
-#: src/summaryview.c:4259 src/summaryview.c:4315
+#: src/summaryview.c:4260 src/summaryview.c:4316
 #, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtrare (%d / %d)..."
 
-#: src/summaryview.c:4364
+#: src/summaryview.c:4365
 msgid "filtering..."
 msgstr "filtrare..."
 
-#: src/summaryview.c:4365
+#: src/summaryview.c:4366
 msgid "Filtering..."
 msgstr "Filtrare..."
 
-#: src/summaryview.c:4401
+#: src/summaryview.c:4402
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "%d messaj(e) au fost filtrate."
 
-#: src/summaryview.c:4910
+#: src/summaryview.c:4911
 msgid "No."
 msgstr "Nu."
 
diff --git a/po/ru.po b/po/ru.po
index 041b4662..161156c0 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-03-02 19:03+0900\n"
+"POT-Creation-Date: 2006-03-10 16:06+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:491
+#: libsylph/prefs_common.c:496
 #, fuzzy
 msgid "Junk mail filter"
 msgstr "папку:"
@@ -521,7 +521,7 @@ msgstr "ошибка открытия файла пометок\n"
 msgid "can't fetch message %d\n"
 msgstr "не удалось получить сообщение %d\n"
 
-#: libsylph/procmsg.c:1375
+#: libsylph/procmsg.c:1378
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Неправильная команда печати: '%s'\n"
@@ -599,12 +599,12 @@ msgstr "  Субъект: %s\n"
 msgid "  Issuer: %s\n"
 msgstr "  Сертификат выдал: %s\n"
 
-#: libsylph/utils.c:2411 src/compose.c:2869 src/compose.c:3132
-#: src/compose.c:3195 src/compose.c:3315
+#: libsylph/utils.c:2430 src/compose.c:2888 src/compose.c:3151
+#: src/compose.c:3214 src/compose.c:3334
 msgid "can't change file mode\n"
 msgstr "не удалось изменить свойства файла\n"
 
-#: libsylph/utils.c:2418 libsylph/utils.c:2542
+#: libsylph/utils.c:2437 libsylph/utils.c:2561
 #, c-format
 msgid "writing to %s failed.\n"
 msgstr "запись в %s не удалась.\n"
@@ -687,8 +687,8 @@ msgstr ""
 "Пометьте в колонке 'G' учетные записи, которые нужно проверять\n"
 "по команде 'Получить все'."
 
-#: src/account_dialog.c:366 src/addressadd.c:192 src/addressbook.c:493
-#: src/compose.c:4273 src/editaddress.c:200 src/editaddress.c:942
+#: src/account_dialog.c:366 src/addressadd.c:192 src/addressbook.c:491
+#: src/compose.c:4292 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
@@ -826,12 +826,12 @@ msgstr "Пользовательский параметр действия"
 msgid "Add Address to Book"
 msgstr "Добавление адреса в книгу"
 
-#: src/addressadd.c:202 src/compose.c:4777 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4796 src/editaddress.c:201
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "Адрес"
 
-#: src/addressadd.c:212 src/addressbook.c:495 src/editaddress.c:202
+#: src/addressadd.c:212 src/addressbook.c:493 src/editaddress.c:202
 #: src/editaddress.c:795 src/editaddress.c:860 src/editgroup.c:267
 msgid "Remarks"
 msgstr "Примечание"
@@ -840,110 +840,111 @@ msgstr "Примечание"
 msgid "Select Address Book Folder"
 msgstr "Выберите папку в адресной книге"
 
-#: src/addressbook.c:338 src/compose.c:515 src/mainwindow.c:489
+#: src/addressbook.c:337 src/compose.c:515 src/mainwindow.c:489
 #: src/messageview.c:140
 msgid "/_File"
 msgstr "/Файл"
 
-#: src/addressbook.c:339
+#: src/addressbook.c:338
 msgid "/_File/New _Book"
 msgstr "/Файл/Новая книга"
 
-#: src/addressbook.c:340
+#: src/addressbook.c:339
 msgid "/_File/New _vCard"
 msgstr "/Файл/Новый файл vCard"
 
-#: src/addressbook.c:342
+#: src/addressbook.c:341
 msgid "/_File/New _JPilot"
 msgstr "/Файл/Новый файл JPilot"
 
-#: src/addressbook.c:345
-msgid "/_File/New _Server"
+#: src/addressbook.c:344
+#, fuzzy
+msgid "/_File/New _LDAP Server"
 msgstr "/Файл/Новый сервер"
 
-#: src/addressbook.c:347 src/addressbook.c:350 src/compose.c:520
+#: src/addressbook.c:346 src/addressbook.c:349 src/compose.c:520
 #: src/compose.c:525 src/compose.c:528 src/compose.c:531 src/mainwindow.c:507
 #: src/mainwindow.c:510 src/mainwindow.c:512 src/mainwindow.c:515
 #: src/mainwindow.c:517 src/messageview.c:143
 msgid "/_File/---"
 msgstr "/Файл/---"
 
-#: src/addressbook.c:348
+#: src/addressbook.c:347
 msgid "/_File/_Edit"
 msgstr "/Файл/Правка"
 
-#: src/addressbook.c:349
+#: src/addressbook.c:348
 msgid "/_File/_Delete"
 msgstr "/Файл/Удалить"
 
-#: src/addressbook.c:351
+#: src/addressbook.c:350
 msgid "/_File/_Save"
 msgstr "/Файл/Сохранить"
 
-#: src/addressbook.c:352 src/compose.c:532 src/messageview.c:144
+#: src/addressbook.c:351 src/compose.c:532 src/messageview.c:144
 msgid "/_File/_Close"
 msgstr "/Файл/Закрыть"
 
-#: src/addressbook.c:353
+#: src/addressbook.c:352
 msgid "/_Address"
 msgstr "/Адрес"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:353
 msgid "/_Address/New _Address"
 msgstr "/Адрес/Новый адрес"
 
-#: src/addressbook.c:355
+#: src/addressbook.c:354
 msgid "/_Address/New _Group"
 msgstr "/Адрес/Новая группа"
 
-#: src/addressbook.c:356
+#: src/addressbook.c:355
 msgid "/_Address/New _Folder"
 msgstr "/Адрес/Новая папка"
 
-#: src/addressbook.c:357
+#: src/addressbook.c:356
 msgid "/_Address/---"
 msgstr "/Адрес/---"
 
-#: src/addressbook.c:358
+#: src/addressbook.c:357
 msgid "/_Address/_Edit"
 msgstr "/Адрес/Правка"
 
-#: src/addressbook.c:359
+#: src/addressbook.c:358
 msgid "/_Address/_Delete"
 msgstr "/Адрес/Удалить"
 
-#: src/addressbook.c:360 src/compose.c:645 src/mainwindow.c:758
-#: src/messageview.c:266
+#: src/addressbook.c:359 src/compose.c:645 src/mainwindow.c:758
+#: src/messageview.c:267
 msgid "/_Tools"
 msgstr "/Инструменты"
 
-#: src/addressbook.c:361
+#: src/addressbook.c:360
 msgid "/_Tools/Import _LDIF file"
 msgstr "/Инструменты/Импорт файла LDIF"
 
-#: src/addressbook.c:362 src/compose.c:666 src/mainwindow.c:812
-#: src/messageview.c:286
+#: src/addressbook.c:361 src/compose.c:666 src/mainwindow.c:812
+#: src/messageview.c:287
 msgid "/_Help"
 msgstr "/Справка"
 
-#: src/addressbook.c:363 src/compose.c:667 src/mainwindow.c:824
-#: src/messageview.c:287
+#: src/addressbook.c:362 src/compose.c:667 src/mainwindow.c:824
+#: src/messageview.c:288
 msgid "/_Help/_About"
 msgstr "/Справка/О программе"
 
-#: src/addressbook.c:382 src/addressbook.c:392
+#: src/addressbook.c:381 src/addressbook.c:391
 msgid "/New _Address"
 msgstr "/Новый адрес"
 
-#: src/addressbook.c:383 src/addressbook.c:393
+#: src/addressbook.c:382 src/addressbook.c:392
 msgid "/New _Group"
 msgstr "/Новая группа"
 
-#: src/addressbook.c:384 src/addressbook.c:394
+#: src/addressbook.c:383 src/addressbook.c:393
 msgid "/New _Folder"
 msgstr "/Новая папка"
 
-#: src/addressbook.c:385 src/addressbook.c:395 src/compose.c:509
+#: src/addressbook.c:384 src/addressbook.c:394 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
@@ -953,70 +954,70 @@ msgstr "/Новая папка"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:386 src/addressbook.c:396 src/compose.c:534
+#: src/addressbook.c:385 src/addressbook.c:395 src/compose.c:534
 #: src/mainwindow.c:521 src/messageview.c:146
 msgid "/_Edit"
 msgstr "/Правка"
 
-#: src/addressbook.c:387 src/addressbook.c:397 src/summaryview.c:434
+#: src/addressbook.c:386 src/addressbook.c:396 src/summaryview.c:434
 msgid "/_Delete"
 msgstr "/Удалить"
 
-#: src/addressbook.c:494
+#: src/addressbook.c:492
 msgid "E-Mail address"
 msgstr "Адрес E-Mail"
 
-#: src/addressbook.c:498 src/compose.c:4778 src/prefs_common_dialog.c:2183
+#: src/addressbook.c:496 src/compose.c:4797 src/prefs_common_dialog.c:2183
 msgid "Address book"
 msgstr "Адресная книга"
 
-#: src/addressbook.c:600 src/prefs_filter_edit.c:249
+#: src/addressbook.c:603 src/prefs_filter_edit.c:249
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "Имя:"
 
 #. Buttons
-#: src/addressbook.c:632 src/addressbook.c:1684 src/editaddress.c:884
+#: src/addressbook.c:636 src/addressbook.c:1678 src/editaddress.c:884
 #: src/editaddress.c:1017 src/mainwindow.c:2426 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:635 src/editaddress.c:890 src/editaddress.c:1023
+#: src/addressbook.c:639 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:1552
 msgid "Add"
 msgstr "Добавить"
 
-#: src/addressbook.c:638
+#: src/addressbook.c:642
 msgid "Lookup"
 msgstr "Найти"
 
-#: src/addressbook.c:650 src/headerview.c:55 src/prefs_folder_item.c:339
+#: src/addressbook.c:654 src/headerview.c:55 src/prefs_folder_item.c:339
 #: src/prefs_template.c:176
 msgid "To:"
 msgstr "Кому:"
 
-#: src/addressbook.c:654 src/prefs_folder_item.c:356 src/prefs_template.c:178
+#: src/addressbook.c:658 src/prefs_folder_item.c:356 src/prefs_template.c:178
 msgid "Cc:"
 msgstr "Копия:"
 
-#: src/addressbook.c:658 src/prefs_folder_item.c:367
+#: src/addressbook.c:662 src/prefs_folder_item.c:367
 msgid "Bcc:"
 msgstr "Скрытно:"
 
 #. Confirm deletion
-#: src/addressbook.c:845
+#: src/addressbook.c:832
 msgid "Delete address(es)"
 msgstr "Удалить адрес(а)"
 
-#: src/addressbook.c:846
+#: src/addressbook.c:833
 msgid "Really delete the address(es)?"
 msgstr "Действительно удалить адрес(а)?"
 
-#: src/addressbook.c:1675
+#: src/addressbook.c:1669
 #, fuzzy, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1025,38 +1026,38 @@ msgstr ""
 "Вы хотите удалить папку \"%s\" и все адреса в ней?\n"
 "Если удалить только папку, адреса будут перемещены в родительскую папку."
 
-#: src/addressbook.c:1678 src/folderview.c:2372
+#: src/addressbook.c:1672 src/folderview.c:2372
 msgid "Delete folder"
 msgstr "Удалить папку"
 
-#: src/addressbook.c:1678
+#: src/addressbook.c:1672
 #, fuzzy
 msgid "_Folder only"
 msgstr "Только папку"
 
-#: src/addressbook.c:1678
+#: src/addressbook.c:1672
 #, fuzzy
 msgid "Folder and _addresses"
 msgstr "Папку и адреса"
 
-#: src/addressbook.c:1683
+#: src/addressbook.c:1677
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Действительно удалить '%s' ?"
 
-#: src/addressbook.c:2369 src/addressbook.c:2502
+#: src/addressbook.c:2363 src/addressbook.c:2496
 msgid "New user, could not save index file."
 msgstr "Новый пользователь; не удалось сохранить индексный файл."
 
-#: src/addressbook.c:2373 src/addressbook.c:2506
+#: src/addressbook.c:2367 src/addressbook.c:2500
 msgid "New user, could not save address book files."
 msgstr "Новый пользователь; не удалось сохранить файлы адресной книги."
 
-#: src/addressbook.c:2383 src/addressbook.c:2516
+#: src/addressbook.c:2377 src/addressbook.c:2510
 msgid "Old address book converted successfully."
 msgstr "Старая адресная книга успешно преобразована."
 
-#: src/addressbook.c:2388
+#: src/addressbook.c:2382
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1064,7 +1065,7 @@ msgstr ""
 "Старая адресная книга преобразована,\n"
 "не удалось сохранить новый индексный файл."
 
-#: src/addressbook.c:2401
+#: src/addressbook.c:2395
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1072,7 +1073,7 @@ msgstr ""
 "Не удалось преобразовать адресную книгу,\n"
 "создана пустая адресная книга."
 
-#: src/addressbook.c:2407
+#: src/addressbook.c:2401
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1080,7 +1081,7 @@ msgstr ""
 "Не удалось преобразовать адресную книгу,\n"
 "ошибка при создании файлов адресной книги."
 
-#: src/addressbook.c:2412
+#: src/addressbook.c:2406
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1088,91 +1089,91 @@ msgstr ""
 "Не удалось преобразовать адресную книгу,\n"
 "кроме того, произошла ошибка при создании файлов новой адресной книги."
 
-#: src/addressbook.c:2419
+#: src/addressbook.c:2413
 msgid "Addressbook conversion error"
 msgstr "Ошибка преобразования адресной книги"
 
-#: src/addressbook.c:2423
+#: src/addressbook.c:2417
 msgid "Addressbook conversion"
 msgstr "Преобразование адресной книги"
 
-#: src/addressbook.c:2458
+#: src/addressbook.c:2452
 msgid "Addressbook Error"
 msgstr "Ошибка при работе с адресной книгой"
 
-#: src/addressbook.c:2459 src/addressbook.c:2559
+#: src/addressbook.c:2453 src/addressbook.c:2553
 msgid "Could not read address index"
 msgstr "Не удалось прочитать индекс адресов"
 
-#: src/addressbook.c:2521
+#: src/addressbook.c:2515
 msgid "Old address book converted, could not save new address index file"
 msgstr ""
 "Старая адресная книга преобразована, не удалось сохранить новый индексный "
 "файл"
 
-#: src/addressbook.c:2535
+#: src/addressbook.c:2529
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr ""
 "Не удалось преобразовать адресную книгу, создана пустая адресная книга."
 
-#: src/addressbook.c:2541
+#: src/addressbook.c:2535
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr ""
 "Не удалось преобразовать адресную книгу, ошибка при создании новых файлов "
 "адресной книги"
 
-#: src/addressbook.c:2547
+#: src/addressbook.c:2541
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr ""
 "Не удалось преобразовать адресную книгу, кроме того, произошла ошибка при "
 "создании новых файлов адресной книги."
 
-#: src/addressbook.c:2565
+#: src/addressbook.c:2559
 msgid "Addressbook Conversion Error"
 msgstr "Ошибка преобразования адресной книги"
 
-#: src/addressbook.c:2571
+#: src/addressbook.c:2565
 msgid "Addressbook Conversion"
 msgstr "Преобразование адресной книги"
 
-#: src/addressbook.c:3086 src/prefs_common_dialog.c:2033
+#: src/addressbook.c:3080 src/prefs_common_dialog.c:2033
 msgid "Interface"
 msgstr "Интерфейс"
 
-#: src/addressbook.c:3102 src/importldif.c:514
+#: src/addressbook.c:3096 src/importldif.c:514
 msgid "Address Book"
 msgstr "Адресная книга"
 
-#: src/addressbook.c:3118
+#: src/addressbook.c:3112
 msgid "Person"
 msgstr "Контакт"
 
-#: src/addressbook.c:3134
+#: src/addressbook.c:3128
 msgid "EMail Address"
 msgstr "Адрес E-Mail"
 
-#: src/addressbook.c:3150
+#: src/addressbook.c:3144
 msgid "Group"
 msgstr "Группа"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3166 src/folderview.c:367 src/prefs_account_dialog.c:1694
-#: src/query_search.c:370
+#: src/addressbook.c:3160 src/folderview.c:367 src/prefs_account_dialog.c:1694
+#: src/query_search.c:398
 msgid "Folder"
 msgstr "Папка"
 
-#: src/addressbook.c:3182
+#: src/addressbook.c:3176
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3198 src/addressbook.c:3214
+#: src/addressbook.c:3192 src/addressbook.c:3208
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3230
+#: src/addressbook.c:3224
 msgid "LDAP Server"
 msgstr "Сервер LDAP"
 
@@ -1184,7 +1185,7 @@ msgstr "Адреса организаций"
 msgid "Personal address"
 msgstr "Личные адреса"
 
-#: src/alertpanel.c:142 src/compose.c:5500 src/main.c:621
+#: src/alertpanel.c:142 src/compose.c:5517 src/main.c:621
 msgid "Notice"
 msgstr "Уведомление"
 
@@ -1192,7 +1193,7 @@ msgstr "Уведомление"
 msgid "Warning"
 msgstr "Предупреждение"
 
-#: src/alertpanel.c:168 src/inc.c:587
+#: src/alertpanel.c:168 src/inc.c:586
 msgid "Error"
 msgstr "Ошибка"
 
@@ -1235,7 +1236,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:4761
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4762
 msgid "None"
 msgstr "Нет"
 
@@ -1508,7 +1509,7 @@ msgstr "/Вид/Кодировка/Тайская (TIS-620)"
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/Вид/Кодировка/Тайская (Windows-874)"
 
-#: src/compose.c:646 src/mainwindow.c:759 src/messageview.c:267
+#: src/compose.c:646 src/mainwindow.c:759 src/messageview.c:268
 msgid "/_Tools/_Address book"
 msgstr "/Инструменты/Адресная книга"
 
@@ -1516,14 +1517,14 @@ msgstr "/Инструменты/Адресная книга"
 msgid "/_Tools/_Template"
 msgstr "/Инструменты/Шаблон"
 
-#: src/compose.c:649 src/mainwindow.c:783 src/messageview.c:283
+#: src/compose.c:649 src/mainwindow.c:783 src/messageview.c:284
 msgid "/_Tools/Actio_ns"
 msgstr "/Инструменты/Действия"
 
 #: src/compose.c:651 src/compose.c:655 src/compose.c:661 src/mainwindow.c:762
 #: src/mainwindow.c:776 src/mainwindow.c:781 src/mainwindow.c:784
-#: src/mainwindow.c:788 src/mainwindow.c:790 src/messageview.c:270
-#: src/messageview.c:282
+#: src/mainwindow.c:788 src/mainwindow.c:790 src/messageview.c:271
+#: src/messageview.c:283
 msgid "/_Tools/---"
 msgstr "/Инструменты/---"
 
@@ -1549,80 +1550,80 @@ msgstr "/Инструменты/Выполнить"
 msgid "/_Tools/_Set spell language"
 msgstr "/Инструменты/Шаблон"
 
-#: src/compose.c:910
+#: src/compose.c:912
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: файл не существует\n"
 
-#: src/compose.c:1014 src/compose.c:1085
+#: src/compose.c:1016 src/compose.c:1087
 msgid "Can't get text part\n"
 msgstr "Ошибка получения части текста\n"
 
-#: src/compose.c:1486
+#: src/compose.c:1488
 msgid "Quote mark format error."
 msgstr "Неверный формат метки цитирования."
 
-#: src/compose.c:1498
+#: src/compose.c:1500
 msgid "Message reply/forward format error."
 msgstr "Неверный формат шаблона ответа или пересылки."
 
-#: src/compose.c:1918
+#: src/compose.c:1935
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Файл %s не найден\n"
 
-#: src/compose.c:1922
+#: src/compose.c:1939
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Ошибка определения размера файла %s\n"
 
-#: src/compose.c:1926
+#: src/compose.c:1943
 #, c-format
 msgid "File %s is empty."
 msgstr "Файл %s пустой."
 
-#: src/compose.c:1930
+#: src/compose.c:1947
 #, c-format
 msgid "Can't read %s."
 msgstr "Невозможно прочитать %s."
 
-#: src/compose.c:1963
+#: src/compose.c:1980
 #, c-format
 msgid "Message: %s"
 msgstr "Сообщение: %s"
 
-#: src/compose.c:2023 src/mimeview.c:565
+#: src/compose.c:2040 src/mimeview.c:565
 msgid "Can't get the part of multipart message."
 msgstr "Ошибка при получении одного из компонентов сообщения."
 
-#: src/compose.c:2507 src/headerview.c:195 src/query_search.c:636
+#: src/compose.c:2524 src/headerview.c:195 src/query_search.c:666
 #: src/summaryview.c:2124
 msgid "(No Subject)"
 msgstr "(Без темы)"
 
-#: src/compose.c:2510
+#: src/compose.c:2527
 #, fuzzy, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Подготовка сообщения%s"
 
-#: src/compose.c:2623
+#: src/compose.c:2642
 msgid "Recipient is not specified."
 msgstr "Получатель сообщения не указан."
 
-#: src/compose.c:2631
+#: src/compose.c:2650
 #, fuzzy
 msgid "Empty subject"
 msgstr "Тема"
 
-#: src/compose.c:2632
+#: src/compose.c:2651
 msgid "Subject is empty. Send it anyway?"
 msgstr "Тема сообщения не указана. Отправить без темы?"
 
-#: src/compose.c:2691
+#: src/compose.c:2710
 msgid "can't get recipient list."
 msgstr "ошибка определения списка получателей."
 
-#: src/compose.c:2711
+#: src/compose.c:2730
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1630,21 +1631,21 @@ msgstr ""
 "Учетная запись для отправки почты не определена.\n"
 "Пожалуйста, выберите ее перед отправкой."
 
-#: src/compose.c:2725 src/send_message.c:299
+#: src/compose.c:2744 src/send_message.c:299
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Произошла ошибка при отправке сообщения на %s ."
 
-#: src/compose.c:2767
+#: src/compose.c:2786
 msgid "Can't save the message to outbox."
 msgstr "Ошибка сохранения сообщения в папке отправленных."
 
-#: src/compose.c:2805
+#: src/compose.c:2824
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "Не найден ключ, соответствующий выбранному идентификатору '%s'."
 
-#: src/compose.c:2902
+#: src/compose.c:2921
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1655,12 +1656,12 @@ msgstr ""
 "из %s в %s.\n"
 "Все равно послать его?"
 
-#: src/compose.c:2908
+#: src/compose.c:2927
 #, fuzzy
 msgid "Code conversion error"
 msgstr "Ошибка преобразования адресной книги"
 
-#: src/compose.c:2981
+#: src/compose.c:3000
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1669,159 +1670,159 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:2985
+#: src/compose.c:3004
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3275
+#: src/compose.c:3294
 msgid "can't remove the old message\n"
 msgstr "ошибка удаления старого сообщения\n"
 
-#: src/compose.c:3293
+#: src/compose.c:3312
 msgid "queueing message...\n"
 msgstr "постановка сообщения в очередь...\n"
 
-#: src/compose.c:3375
+#: src/compose.c:3394
 msgid "can't find queue folder\n"
 msgstr "невозможно найти папку очереди\n"
 
-#: src/compose.c:3382
+#: src/compose.c:3401
 msgid "can't queue the message\n"
 msgstr "ошибка размещения в очереди\n"
 
-#: src/compose.c:3975
+#: src/compose.c:3994
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "создан Message-ID: %s\n"
 
-#: src/compose.c:4088
+#: src/compose.c:4107
 msgid "Creating compose window...\n"
 msgstr "Создание окна подготовки сообщения...\n"
 
-#: src/compose.c:4139 src/headerview.c:54
+#: src/compose.c:4158 src/headerview.c:54
 msgid "From:"
 msgstr "От:"
 
-#: src/compose.c:4213
+#: src/compose.c:4232
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/Инструменты/Подписать сообщение (PGP)"
 
-#: src/compose.c:4216
+#: src/compose.c:4235
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/Инструменты/Шифровать сообщение (PGP)"
 
-#: src/compose.c:4254 src/compose.c:5332
+#: src/compose.c:4273 src/compose.c:5351
 msgid "MIME type"
 msgstr "Тип MIME"
 
 #. S_COL_DATE
-#: src/compose.c:4263 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4908
+#: src/compose.c:4282 src/mimeview.c:197 src/prefs_filter_edit.c:496
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4909
 msgid "Size"
 msgstr "Размер"
 
-#: src/compose.c:4698 src/mainwindow.c:2359 src/prefs_account_dialog.c:528
+#: src/compose.c:4717 src/mainwindow.c:2359 src/prefs_account_dialog.c:528
 #: src/prefs_common_dialog.c:661
 msgid "Send"
 msgstr "Отправить"
 
-#: src/compose.c:4699
+#: src/compose.c:4718
 msgid "Send message"
 msgstr "Отправить сообщение"
 
-#: src/compose.c:4707
+#: src/compose.c:4726
 msgid "Send later"
 msgstr "Отправить позже"
 
-#: src/compose.c:4708
+#: src/compose.c:4727
 msgid "Put into queue folder and send later"
 msgstr "Поместить в очередь и отправить позже"
 
-#: src/compose.c:4716
+#: src/compose.c:4735
 msgid "Draft"
 msgstr "Черновики"
 
-#: src/compose.c:4717
+#: src/compose.c:4736
 msgid "Save to draft folder"
 msgstr "Сохранить в папке черновиков"
 
-#: src/compose.c:4727
+#: src/compose.c:4746
 msgid "Insert"
 msgstr "Вставить"
 
-#: src/compose.c:4728
+#: src/compose.c:4747
 msgid "Insert file"
 msgstr "Вставить файл"
 
-#: src/compose.c:4736
+#: src/compose.c:4755
 msgid "Attach"
 msgstr "Вложение"
 
-#: src/compose.c:4737
+#: src/compose.c:4756
 msgid "Attach file"
 msgstr "Вложить файл"
 
 #. signature
-#: src/compose.c:4747 src/prefs_account_dialog.c:1208
+#: src/compose.c:4766 src/prefs_account_dialog.c:1208
 #: src/prefs_common_dialog.c:953
 msgid "Signature"
 msgstr "Подпись"
 
-#: src/compose.c:4748
+#: src/compose.c:4767
 #, fuzzy
 msgid "Append signature"
 msgstr "ПЛОХАЯ подпись"
 
 #. editor
-#: src/compose.c:4757 src/prefs_common_dialog.c:991
+#: src/compose.c:4776 src/prefs_common_dialog.c:991
 #: src/prefs_common_dialog.c:2315
 msgid "Editor"
 msgstr "Редактор"
 
-#: src/compose.c:4758
+#: src/compose.c:4777
 msgid "Edit with external editor"
 msgstr "Править внешним редактором"
 
-#: src/compose.c:4766
+#: src/compose.c:4785
 msgid "Linewrap"
 msgstr "Перенос строк"
 
-#: src/compose.c:4767
+#: src/compose.c:4786
 msgid "Wrap all long lines"
 msgstr "Отформатировать все сообщение"
 
-#: src/compose.c:5228
+#: src/compose.c:5247
 msgid "Invalid MIME type."
 msgstr "Неверный тип MIME."
 
-#: src/compose.c:5246
+#: src/compose.c:5265
 msgid "File doesn't exist or is empty."
 msgstr "Файл не существует или пуст."
 
-#: src/compose.c:5314
+#: src/compose.c:5333
 msgid "Properties"
 msgstr "Свойства"
 
-#: src/compose.c:5334 src/prefs_common_dialog.c:1444
+#: src/compose.c:5353 src/prefs_common_dialog.c:1444
 msgid "Encoding"
 msgstr "Кодировка"
 
-#: src/compose.c:5357 src/prefs_folder_item.c:202
+#: src/compose.c:5376 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Путь"
 
-#: src/compose.c:5358
+#: src/compose.c:5377
 msgid "File name"
 msgstr "Имя файла"
 
-#: src/compose.c:5449
+#: src/compose.c:5466
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Неверная команда вызова внешнего редактора: '%s'\n"
 
-#: src/compose.c:5497
+#: src/compose.c:5514
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1831,48 +1832,48 @@ msgstr ""
 "Завершить процесс принудительно?\n"
 "Идентификатор группы процессов: %d"
 
-#: src/compose.c:5872 src/compose.c:5877 src/compose.c:5883
+#: src/compose.c:5889 src/compose.c:5894 src/compose.c:5900
 msgid "Can't queue the message."
 msgstr "Ошибка постановки в очередь."
 
-#: src/compose.c:5974
+#: src/compose.c:5991
 #, fuzzy
 msgid "Select files"
 msgstr "Выбор файла"
 
-#: src/compose.c:5997
+#: src/compose.c:6014
 msgid "Select file"
 msgstr "Выбор файла"
 
-#: src/compose.c:6032
+#: src/compose.c:6049
 #, fuzzy
 msgid "Save message"
 msgstr "Отправить сообщение"
 
-#: src/compose.c:6033
+#: src/compose.c:6050
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Это сообщение изменено. Отказаться от него?"
 
-#: src/compose.c:6035
+#: src/compose.c:6052
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:6077
+#: src/compose.c:6094
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Применить шаблон '%s'?"
 
-#: src/compose.c:6079
+#: src/compose.c:6096
 msgid "Apply template"
 msgstr "Применить шаблон"
 
-#: src/compose.c:6080
+#: src/compose.c:6097
 #, fuzzy
 msgid "_Replace"
 msgstr "Заменить"
 
-#: src/compose.c:6080
+#: src/compose.c:6097
 #, fuzzy
 msgid "_Insert"
 msgstr "Вставить"
@@ -1994,52 +1995,52 @@ msgstr "Необходимо указать название группы."
 msgid "Edit Group Data"
 msgstr "Изменение сведений о группе"
 
-#: src/editgroup.c:300
+#: src/editgroup.c:299
 msgid "Group Name"
 msgstr "Название группы"
 
-#: src/editgroup.c:319
+#: src/editgroup.c:318
 msgid "Addresses in Group"
 msgstr "Адреса в группе"
 
-#: src/editgroup.c:321
+#: src/editgroup.c:320
 msgid " -> "
 msgstr " -> "
 
-#: src/editgroup.c:348
+#: src/editgroup.c:347
 msgid " <- "
 msgstr " <- "
 
-#: src/editgroup.c:350
+#: src/editgroup.c:349
 msgid "Available Addresses"
 msgstr "Доступные адреса"
 
-#: src/editgroup.c:416
+#: src/editgroup.c:415
 msgid "Move E-Mail Addresses to or from Group with arrow buttons"
 msgstr "Используйте кнопки со стрелками для изменения списка адресов группы"
 
-#: src/editgroup.c:468
+#: src/editgroup.c:467
 msgid "Edit Group Details"
 msgstr "Изменение сведений о группе"
 
-#: src/editgroup.c:471
+#: src/editgroup.c:470
 msgid "Add New Group"
 msgstr "Добавление новой группы"
 
-#: src/editgroup.c:522
+#: src/editgroup.c:521
 msgid "Edit folder"
 msgstr "Изменить имя папки"
 
-#: src/editgroup.c:522
+#: src/editgroup.c:521
 msgid "Input the new name of folder:"
 msgstr "Введите новое имя папки:"
 
-#: src/editgroup.c:525 src/foldersel.c:541 src/folderview.c:2121
+#: src/editgroup.c:524 src/foldersel.c:541 src/folderview.c:2121
 #: src/folderview.c:2127
 msgid "New folder"
 msgstr "Новая папка"
 
-#: src/editgroup.c:526 src/foldersel.c:542 src/folderview.c:2128
+#: src/editgroup.c:525 src/foldersel.c:542 src/folderview.c:2128
 msgid "Input the name of new folder:"
 msgstr "Введите имя новой папки:"
 
@@ -2238,7 +2239,7 @@ msgid "`%c' can't be included in folder name."
 msgstr "Символ '%c' не может входить в имя папки."
 
 #: src/foldersel.c:561 src/folderview.c:2147 src/folderview.c:2206
-#: src/query_search.c:995
+#: src/query_search.c:1031
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Папка '%s' уже существует."
@@ -2497,7 +2498,7 @@ msgstr "Тема:"
 msgid "Creating header view...\n"
 msgstr "Создание области просмотра заголовков...\n"
 
-#: src/headerview.c:180 src/query_search.c:637 src/summaryview.c:2127
+#: src/headerview.c:180 src/query_search.c:667 src/summaryview.c:2127
 msgid "(No From)"
 msgstr "(Без отправителя)"
 
@@ -2627,133 +2628,133 @@ msgstr "Завершение"
 msgid "Sylpheed: %d new messages"
 msgstr "Завершено (новых сообщений: %d)"
 
-#: src/inc.c:372
+#: src/inc.c:371
 msgid "Retrieving new messages"
 msgstr "Получение новых сообщений"
 
-#: src/inc.c:415
+#: src/inc.c:414
 msgid "Standby"
 msgstr "Ожидание"
 
-#: src/inc.c:544 src/inc.c:593
+#: src/inc.c:543 src/inc.c:592
 msgid "Cancelled"
 msgstr "Отменена"
 
-#: src/inc.c:555
+#: src/inc.c:554
 msgid "Retrieving"
 msgstr "Получение"
 
-#: src/inc.c:564
+#: src/inc.c:563
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "Выполнено (принято сообщений: %d (%s))"
 
-#: src/inc.c:568
+#: src/inc.c:567
 msgid "Done (no new messages)"
 msgstr "Выполнено (нет новых сообщений)"
 
-#: src/inc.c:574
+#: src/inc.c:573
 msgid "Connection failed"
 msgstr "Ошибка соединения"
 
-#: src/inc.c:577
+#: src/inc.c:576
 msgid "Auth failed"
 msgstr "Неверный пароль"
 
-#: src/inc.c:580
+#: src/inc.c:579
 msgid "Locked"
 msgstr "Занято"
 
-#: src/inc.c:590
+#: src/inc.c:589
 msgid "Timeout"
 msgstr "Нет ответа"
 
-#: src/inc.c:640
+#: src/inc.c:639
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Завершено (новых сообщений: %d)"
 
-#: src/inc.c:643
+#: src/inc.c:642
 msgid "Finished (no new messages)"
 msgstr "Завершено (нет новых сообщений)"
 
-#: src/inc.c:652
+#: src/inc.c:651
 msgid "Some errors occurred while getting mail."
 msgstr "При получении сообщений возникли ошибки."
 
-#: src/inc.c:688
+#: src/inc.c:687
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "получение новых сообщений для учетной записи %s...\n"
 
-#: src/inc.c:691
+#: src/inc.c:690
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Получение новых сообщений"
 
-#: src/inc.c:710
+#: src/inc.c:709
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Соединение с сервером POP3: %s..."
 
-#: src/inc.c:719
+#: src/inc.c:718
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Не удалось соединение с сервером POP3: %s:%d\n"
 
-#: src/inc.c:798 src/send_message.c:631
+#: src/inc.c:797 src/send_message.c:631
 msgid "Authenticating..."
 msgstr "Аутентификация..."
 
-#: src/inc.c:799
+#: src/inc.c:798
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Получение сообщений с %s..."
 
-#: src/inc.c:804
+#: src/inc.c:803
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Получение количества новых сообщений (STAT)..."
 
-#: src/inc.c:808
+#: src/inc.c:807
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Получение количества новых сообщений (LAST)..."
 
-#: src/inc.c:812
+#: src/inc.c:811
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Получение количества новых сообщений (UIDL)..."
 
-#: src/inc.c:816
+#: src/inc.c:815
 msgid "Getting the size of messages (LIST)..."
 msgstr "Получение размера сообщений (LIST)..."
 
-#: src/inc.c:826
+#: src/inc.c:825
 #, c-format
 msgid "Deleting message %d"
 msgstr "Удаление сообщения %d"
 
-#: src/inc.c:833 src/send_message.c:649
+#: src/inc.c:832 src/send_message.c:649
 msgid "Quitting"
 msgstr "Выход"
 
-#: src/inc.c:858
+#: src/inc.c:857
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Получение сообщения (%d / %d) (%s / %s)"
 
-#: src/inc.c:879
+#: src/inc.c:878
 #, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Прием (принято сообщений: %d (%s))"
 
-#: src/inc.c:1107
+#: src/inc.c:1106
 msgid "Connection failed."
 msgstr "Ошибка соединения"
 
-#: src/inc.c:1113
+#: src/inc.c:1112
 msgid "Error occurred while processing mail."
 msgstr "Произошла ошибка при обработке сообщений."
 
-#: src/inc.c:1118
+#: src/inc.c:1117
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2762,28 +2763,28 @@ msgstr ""
 "Произошла ошибка при обработке сообщений:\n"
 "%s"
 
-#: src/inc.c:1124
+#: src/inc.c:1123
 msgid "No disk space left."
 msgstr "Не осталось места на диске."
 
-#: src/inc.c:1129
+#: src/inc.c:1128
 msgid "Can't write file."
 msgstr "Ошибка записи в файл."
 
-#: src/inc.c:1134
+#: src/inc.c:1133
 msgid "Socket error."
 msgstr "Ошибка сокета."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1140 src/send_message.c:584 src/send_message.c:772
+#: src/inc.c:1139 src/send_message.c:584 src/send_message.c:772
 msgid "Connection closed by the remote host."
 msgstr "Сервер закрыл соединение."
 
-#: src/inc.c:1146
+#: src/inc.c:1145
 msgid "Mailbox is locked."
 msgstr "Почтовый ящик занят."
 
-#: src/inc.c:1150
+#: src/inc.c:1149
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2792,11 +2793,11 @@ msgstr ""
 "Почтовый ящик занят:\n"
 "%s"
 
-#: src/inc.c:1156 src/send_message.c:757
+#: src/inc.c:1155 src/send_message.c:757
 msgid "Authentication failed."
 msgstr "Ошибка аутентификации."
 
-#: src/inc.c:1161 src/send_message.c:760
+#: src/inc.c:1160 src/send_message.c:760
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2805,15 +2806,15 @@ msgstr ""
 "Ошибка аутентификации:\n"
 "%s"
 
-#: src/inc.c:1166 src/send_message.c:776
+#: src/inc.c:1165 src/send_message.c:776
 msgid "Session timed out."
 msgstr "Время сеанса истекло."
 
-#: src/inc.c:1202
+#: src/inc.c:1201
 msgid "Incorporation cancelled\n"
 msgstr "Прием сообщений прерван\n"
 
-#: src/inc.c:1285
+#: src/inc.c:1284
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Получение новых сообщений из %s в %s...\n"
@@ -3290,14 +3291,15 @@ msgid "/_View/Mess_age source"
 msgstr "/Вид/Показать исходный текст"
 
 #: src/mainwindow.c:708 src/messageview.c:245
-msgid "/_View/Show all _header"
+#, fuzzy
+msgid "/_View/Show all _headers"
 msgstr "/Вид/Показать все заголовки"
 
 #: src/mainwindow.c:710
 msgid "/_View/_Update summary"
 msgstr "/Вид/Обновить список сообщений"
 
-#: src/mainwindow.c:712 src/messageview.c:247
+#: src/mainwindow.c:712 src/messageview.c:248
 msgid "/_Message"
 msgstr "/Сообщение"
 
@@ -3327,16 +3329,16 @@ msgstr "/Сообщение/Отправить сообщения из очер�
 
 #: src/mainwindow.c:722 src/mainwindow.c:724 src/mainwindow.c:731
 #: src/mainwindow.c:736 src/mainwindow.c:739 src/mainwindow.c:750
-#: src/mainwindow.c:752 src/mainwindow.c:755 src/messageview.c:250
-#: src/messageview.c:258 src/messageview.c:263
+#: src/mainwindow.c:752 src/mainwindow.c:755 src/messageview.c:251
+#: src/messageview.c:259 src/messageview.c:264
 msgid "/_Message/---"
 msgstr "/Сообщение/---"
 
-#: src/mainwindow.c:723 src/messageview.c:248
+#: src/mainwindow.c:723 src/messageview.c:249
 msgid "/_Message/Compose _new message"
 msgstr "/Сообщение/Написать новое сообщение"
 
-#: src/mainwindow.c:725 src/messageview.c:251
+#: src/mainwindow.c:725 src/messageview.c:252
 msgid "/_Message/_Reply"
 msgstr "/Сообщение/Ответить"
 
@@ -3344,27 +3346,27 @@ msgstr "/Сообщение/Ответить"
 msgid "/_Message/Repl_y to"
 msgstr "/Сообщение/Ответить..."
 
-#: src/mainwindow.c:727 src/messageview.c:252
+#: src/mainwindow.c:727 src/messageview.c:253
 msgid "/_Message/Repl_y to/_all"
 msgstr "/Сообщение/Ответить.../Всем"
 
-#: src/mainwindow.c:728 src/messageview.c:254
+#: src/mainwindow.c:728 src/messageview.c:255
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/Сообщение/Ответить.../Отправителю"
 
-#: src/mainwindow.c:729 src/messageview.c:256
+#: src/mainwindow.c:729 src/messageview.c:257
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/Сообщение/Ответить.../В список рассылки"
 
-#: src/mainwindow.c:732 src/messageview.c:259
+#: src/mainwindow.c:732 src/messageview.c:260
 msgid "/_Message/_Forward"
 msgstr "/Сообщение/Переслать"
 
-#: src/mainwindow.c:733 src/messageview.c:260
+#: src/mainwindow.c:733 src/messageview.c:261
 msgid "/_Message/For_ward as attachment"
 msgstr "/Сообщение/Переслать как вложение"
 
-#: src/mainwindow.c:735 src/messageview.c:262
+#: src/mainwindow.c:735 src/messageview.c:263
 msgid "/_Message/Redirec_t"
 msgstr "/Сообщение/Перенаправить без изменений"
 
@@ -3422,7 +3424,7 @@ msgstr "/Сообщение/Отметить/Снять отметку"
 msgid "/_Message/Set as not j_unk mail"
 msgstr ""
 
-#: src/mainwindow.c:756 src/messageview.c:264
+#: src/mainwindow.c:756 src/messageview.c:265
 msgid "/_Message/Re-_edit"
 msgstr "/Сообщение/Изменить"
 
@@ -3439,23 +3441,23 @@ msgstr "/Инструменты/Отфильтровать все сообщен
 msgid "/_Tools/Filter _selected messages"
 msgstr "/Инструменты/Отфильтровать выбранные сообщения"
 
-#: src/mainwindow.c:767 src/messageview.c:271
+#: src/mainwindow.c:767 src/messageview.c:272
 msgid "/_Tools/_Create filter rule"
 msgstr "/Инструменты/Создать правило фильтрации"
 
-#: src/mainwindow.c:768 src/messageview.c:273
+#: src/mainwindow.c:768 src/messageview.c:274
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/Инструменты/Создать правило фильтрации/Автоматически"
 
-#: src/mainwindow.c:770 src/messageview.c:275
+#: src/mainwindow.c:770 src/messageview.c:276
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/Инструменты/Создать правило фильтрации/По отправителю"
 
-#: src/mainwindow.c:772 src/messageview.c:277
+#: src/mainwindow.c:772 src/messageview.c:278
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/Инструменты/Создать правило фильтрации/По получателю"
 
-#: src/mainwindow.c:774 src/messageview.c:279
+#: src/mainwindow.c:774 src/messageview.c:280
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/Инструменты/Создать правило фильтрации/По теме"
 
@@ -3576,7 +3578,7 @@ msgid "MainWindow: color allocation %d failed\n"
 msgstr "Главное окно: проблема с цветом %d\n"
 
 #: src/mainwindow.c:1139 src/summaryview.c:2275 src/summaryview.c:2360
-#: src/summaryview.c:3907 src/summaryview.c:4036 src/summaryview.c:4394
+#: src/summaryview.c:3908 src/summaryview.c:4037 src/summaryview.c:4395
 msgid "done.\n"
 msgstr "выполнено.\n"
 
@@ -3839,7 +3841,7 @@ msgid "Find text:"
 msgstr "Искать текст:"
 
 #: src/message_search.c:153 src/prefs_search_folder.c:253
-#: src/query_search.c:326
+#: src/query_search.c:343
 msgid "Case sensitive"
 msgstr "Учитывать регистр"
 
@@ -3863,27 +3865,27 @@ msgstr "Достигнут конец сообщения; продолжить �
 msgid "Search finished"
 msgstr "Поиск закончен"
 
-#: src/messageview.c:268
+#: src/messageview.c:269
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/Инструменты/Добавить отправителя в адресную книгу"
 
-#: src/messageview.c:300
+#: src/messageview.c:301
 msgid "Creating message view...\n"
 msgstr "Создание области просмотра сообщения...\n"
 
-#: src/messageview.c:325
+#: src/messageview.c:326
 msgid "Text"
 msgstr "Текст"
 
-#: src/messageview.c:330
+#: src/messageview.c:331
 msgid "Attachments"
 msgstr "Вложения"
 
-#: src/messageview.c:380
+#: src/messageview.c:381
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:699 src/summaryview.c:3436
+#: src/messageview.c:700 src/summaryview.c:3436
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Ошибка при сохранении файла '%s'."
@@ -3901,7 +3903,7 @@ msgstr "Выполнить команду"
 msgid "Print"
 msgstr "Печать"
 
-#: src/messageview.c:770 src/summaryview.c:3471
+#: src/messageview.c:769 src/summaryview.c:3470
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -4001,11 +4003,11 @@ msgstr ""
 "Введите команду открытия файла:\n"
 "('%s' будет заменено на имя файла)"
 
-#: src/mimeview.c:1147
+#: src/mimeview.c:1140
 msgid "Opening executable file"
 msgstr ""
 
-#: src/mimeview.c:1148
+#: src/mimeview.c:1141
 msgid ""
 "This is an executable file. Opening executable file is restricted for "
 "security.\n"
@@ -4013,11 +4015,6 @@ msgid ""
 "virus or something like a malicious program."
 msgstr ""
 
-#: src/mimeview.c:1184
-#, c-format
-msgid "MIME viewer command line is invalid: `%s'"
-msgstr "Неверная команда просмотра MIME: '%s'"
-
 #: src/passphrase.c:96
 msgid "Passphrase"
 msgstr "Парольная фраза"
@@ -5798,20 +5795,20 @@ msgstr "Адрес для ответов:"
 msgid "%s - Edit search condition"
 msgstr ""
 
-#: src/prefs_search_folder.c:209 src/query_search.c:257
+#: src/prefs_search_folder.c:209 src/query_search.c:274
 msgid "Match any of the following"
 msgstr "Поиск по любому из полей:"
 
-#: src/prefs_search_folder.c:211 src/query_search.c:259
+#: src/prefs_search_folder.c:211 src/query_search.c:276
 msgid "Match all of the following"
 msgstr "Поиск по всем полям:"
 
-#: src/prefs_search_folder.c:231 src/query_search.c:303
+#: src/prefs_search_folder.c:231 src/query_search.c:320
 #, fuzzy
 msgid "Folder:"
 msgstr "Папка"
 
-#: src/prefs_search_folder.c:248 src/query_search.c:321
+#: src/prefs_search_folder.c:248 src/query_search.c:338
 #, fuzzy
 msgid "Search subfolders"
 msgstr "Поиск не удался"
@@ -5826,17 +5823,17 @@ msgid "Attachment"
 msgstr "Вложение"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73 src/query_search.c:371 src/summaryview.c:4901
+#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4902
 msgid "Subject"
 msgstr "Тема"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/query_search.c:372 src/summaryview.c:4904
+#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4905
 msgid "From"
 msgstr "От"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/query_search.c:373 src/summaryview.c:4906
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:4907
 msgid "Date"
 msgstr "Дата"
 
@@ -5930,43 +5927,43 @@ msgstr "Создание диалогового окна прогресса...\n
 msgid "Status"
 msgstr "Состояние"
 
-#: src/query_search.c:234
+#: src/query_search.c:251
 msgid "Search messages"
 msgstr "Поиск сообщений"
 
-#: src/query_search.c:395
+#: src/query_search.c:423
 #, fuzzy
 msgid "_Save as search folder"
 msgstr "Сохранить в папке черновиков"
 
-#: src/query_search.c:512 src/subscribedialog.c:526 src/summaryview.c:842
+#: src/query_search.c:542 src/subscribedialog.c:526 src/summaryview.c:842
 msgid "Done."
 msgstr "Выполнено."
 
-#: src/query_search.c:536
+#: src/query_search.c:566
 #, fuzzy, c-format
 msgid "Searching %s ..."
 msgstr "Просмотр папки %s ..."
 
-#: src/query_search.c:564
+#: src/query_search.c:594
 #, fuzzy, c-format
 msgid "Searching %s (%d / %d)..."
 msgstr "Фильтрация..."
 
-#: src/query_search.c:645 src/summaryview.c:2051
+#: src/query_search.c:675 src/summaryview.c:2051
 msgid "(No Date)"
 msgstr "(Нет даты)"
 
-#: src/query_search.c:833
+#: src/query_search.c:869
 #, fuzzy
 msgid "Save as search folder"
 msgstr "Сохранить в папке черновиков"
 
-#: src/query_search.c:854
+#: src/query_search.c:890
 msgid "Location:"
 msgstr ""
 
-#: src/query_search.c:869
+#: src/query_search.c:905
 #, fuzzy
 msgid "Folder name:"
 msgstr "Имя файла"
@@ -6601,37 +6598,37 @@ msgstr "Сообщение %d помечено для копирования в
 msgid "Destination for copy is same as current folder."
 msgstr "Место назначения для копирования совпадает с текущей папкой."
 
-#: src/summaryview.c:3506
+#: src/summaryview.c:3507
 msgid "Error occurred while processing messages."
 msgstr "Произошла ошибка при обработке сообщений."
 
-#: src/summaryview.c:3814 src/summaryview.c:3815
+#: src/summaryview.c:3815 src/summaryview.c:3816
 msgid "Building threads..."
 msgstr "Связывание обсуждений..."
 
-#: src/summaryview.c:3965 src/summaryview.c:3966
+#: src/summaryview.c:3966 src/summaryview.c:3967
 msgid "Unthreading..."
 msgstr "Отмена связывания обсуждений..."
 
-#: src/summaryview.c:4259 src/summaryview.c:4315
+#: src/summaryview.c:4260 src/summaryview.c:4316
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Фильтрация..."
 
-#: src/summaryview.c:4364
+#: src/summaryview.c:4365
 msgid "filtering..."
 msgstr "фильтрация..."
 
-#: src/summaryview.c:4365
+#: src/summaryview.c:4366
 msgid "Filtering..."
 msgstr "Фильтрация..."
 
-#: src/summaryview.c:4401
+#: src/summaryview.c:4402
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "%d сообщений отфильтровано."
 
-#: src/summaryview.c:4910
+#: src/summaryview.c:4911
 msgid "No."
 msgstr "Номер"
 
@@ -6723,6 +6720,9 @@ msgstr "Выход"
 msgid "Sylpheed"
 msgstr "Старая Sylpheed"
 
+#~ msgid "MIME viewer command line is invalid: `%s'"
+#~ msgstr "Неверная команда просмотра MIME: '%s'"
+
 #~ msgid "%dB"
 #~ msgstr "%d б"
 
diff --git a/po/sk.po b/po/sk.po
index 133570b6..2c7f7347 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-03-02 19:03+0900\n"
+"POT-Creation-Date: 2006-03-10 16:06+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:491
+#: libsylph/prefs_common.c:496
 #, fuzzy
 msgid "Junk mail filter"
 msgstr "Priečinok"
@@ -521,7 +521,7 @@ msgstr "nemôžem otvoriť súbor so značkami\n"
 msgid "can't fetch message %d\n"
 msgstr "nedá sa prijať správa %d\n"
 
-#: libsylph/procmsg.c:1375
+#: libsylph/procmsg.c:1378
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Príkazový riadok tlače je neplatný: '%s'\n"
@@ -599,12 +599,12 @@ msgstr "  Predmet: %s\n"
 msgid "  Issuer: %s\n"
 msgstr "  Vydavateľ: %s\n"
 
-#: libsylph/utils.c:2411 src/compose.c:2869 src/compose.c:3132
-#: src/compose.c:3195 src/compose.c:3315
+#: libsylph/utils.c:2430 src/compose.c:2888 src/compose.c:3151
+#: src/compose.c:3214 src/compose.c:3334
 msgid "can't change file mode\n"
 msgstr "nedá sa zmeniť mód súboru\n"
 
-#: libsylph/utils.c:2418 libsylph/utils.c:2542
+#: libsylph/utils.c:2437 libsylph/utils.c:2561
 #, c-format
 msgid "writing to %s failed.\n"
 msgstr "nepodaril sa zápis do %s.\n"
@@ -685,8 +685,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:493
-#: src/compose.c:4273 src/editaddress.c:200 src/editaddress.c:942
+#: src/account_dialog.c:366 src/addressadd.c:192 src/addressbook.c:491
+#: src/compose.c:4292 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
@@ -824,12 +824,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:4777 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4796 src/editaddress.c:201
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "Adresár"
 
-#: src/addressadd.c:212 src/addressbook.c:495 src/editaddress.c:202
+#: src/addressadd.c:212 src/addressbook.c:493 src/editaddress.c:202
 #: src/editaddress.c:795 src/editaddress.c:860 src/editgroup.c:267
 msgid "Remarks"
 msgstr "Poznámky"
@@ -838,110 +838,111 @@ msgstr "Poznámky"
 msgid "Select Address Book Folder"
 msgstr "Vyberte priečinok adresára"
 
-#: src/addressbook.c:338 src/compose.c:515 src/mainwindow.c:489
+#: src/addressbook.c:337 src/compose.c:515 src/mainwindow.c:489
 #: src/messageview.c:140
 msgid "/_File"
 msgstr "/_Súbor"
 
-#: src/addressbook.c:339
+#: src/addressbook.c:338
 msgid "/_File/New _Book"
 msgstr "/_Súbor/Nový _Adresár"
 
-#: src/addressbook.c:340
+#: src/addressbook.c:339
 msgid "/_File/New _vCard"
 msgstr "/_Súbor/Nový _vCard"
 
-#: src/addressbook.c:342
+#: src/addressbook.c:341
 msgid "/_File/New _JPilot"
 msgstr "/_Súbor/Nový _JPilot"
 
-#: src/addressbook.c:345
-msgid "/_File/New _Server"
+#: src/addressbook.c:344
+#, fuzzy
+msgid "/_File/New _LDAP Server"
 msgstr "/_Súbor/Nový _Server"
 
-#: src/addressbook.c:347 src/addressbook.c:350 src/compose.c:520
+#: src/addressbook.c:346 src/addressbook.c:349 src/compose.c:520
 #: src/compose.c:525 src/compose.c:528 src/compose.c:531 src/mainwindow.c:507
 #: src/mainwindow.c:510 src/mainwindow.c:512 src/mainwindow.c:515
 #: src/mainwindow.c:517 src/messageview.c:143
 msgid "/_File/---"
 msgstr "/_Súbor/---"
 
-#: src/addressbook.c:348
+#: src/addressbook.c:347
 msgid "/_File/_Edit"
 msgstr "/_Súbor/_Upraviť"
 
-#: src/addressbook.c:349
+#: src/addressbook.c:348
 msgid "/_File/_Delete"
 msgstr "/_Súbor/Z_mazať"
 
-#: src/addressbook.c:351
+#: src/addressbook.c:350
 msgid "/_File/_Save"
 msgstr "/_Súbor/U_ložiť"
 
-#: src/addressbook.c:352 src/compose.c:532 src/messageview.c:144
+#: src/addressbook.c:351 src/compose.c:532 src/messageview.c:144
 msgid "/_File/_Close"
 msgstr "/_Súbor/_Zavrieť"
 
-#: src/addressbook.c:353
+#: src/addressbook.c:352
 msgid "/_Address"
 msgstr "/_Adresa"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:353
 msgid "/_Address/New _Address"
 msgstr "/_Adresa/Nová _Adresa"
 
-#: src/addressbook.c:355
+#: src/addressbook.c:354
 msgid "/_Address/New _Group"
 msgstr "/_Adresa/Nová _Skupina"
 
-#: src/addressbook.c:356
+#: src/addressbook.c:355
 msgid "/_Address/New _Folder"
 msgstr "/_Adresa/Nový _Priečinok"
 
-#: src/addressbook.c:357
+#: src/addressbook.c:356
 msgid "/_Address/---"
 msgstr "/_Adresa/--- "
 
-#: src/addressbook.c:358
+#: src/addressbook.c:357
 msgid "/_Address/_Edit"
 msgstr "/_Adresa/_Upraviť"
 
-#: src/addressbook.c:359
+#: src/addressbook.c:358
 msgid "/_Address/_Delete"
 msgstr "/_Adresa/Z_mazať"
 
-#: src/addressbook.c:360 src/compose.c:645 src/mainwindow.c:758
-#: src/messageview.c:266
+#: src/addressbook.c:359 src/compose.c:645 src/mainwindow.c:758
+#: src/messageview.c:267
 msgid "/_Tools"
 msgstr "/_Nástroje"
 
-#: src/addressbook.c:361
+#: src/addressbook.c:360
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Nástroje/Importovať súbor _LDIF"
 
-#: src/addressbook.c:362 src/compose.c:666 src/mainwindow.c:812
-#: src/messageview.c:286
+#: src/addressbook.c:361 src/compose.c:666 src/mainwindow.c:812
+#: src/messageview.c:287
 msgid "/_Help"
 msgstr "/Nápo_veda"
 
-#: src/addressbook.c:363 src/compose.c:667 src/mainwindow.c:824
-#: src/messageview.c:287
+#: src/addressbook.c:362 src/compose.c:667 src/mainwindow.c:824
+#: src/messageview.c:288
 msgid "/_Help/_About"
 msgstr "/Nápo_veda/_O programe"
 
-#: src/addressbook.c:382 src/addressbook.c:392
+#: src/addressbook.c:381 src/addressbook.c:391
 msgid "/New _Address"
 msgstr "/Nová _Adresa"
 
-#: src/addressbook.c:383 src/addressbook.c:393
+#: src/addressbook.c:382 src/addressbook.c:392
 msgid "/New _Group"
 msgstr "/Nová _Skupina"
 
-#: src/addressbook.c:384 src/addressbook.c:394
+#: src/addressbook.c:383 src/addressbook.c:393
 msgid "/New _Folder"
 msgstr "/Nový _Priečinok"
 
-#: src/addressbook.c:385 src/addressbook.c:395 src/compose.c:509
+#: src/addressbook.c:384 src/addressbook.c:394 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
@@ -951,70 +952,70 @@ msgstr "/Nový _Priečinok"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:386 src/addressbook.c:396 src/compose.c:534
+#: src/addressbook.c:385 src/addressbook.c:395 src/compose.c:534
 #: src/mainwindow.c:521 src/messageview.c:146
 msgid "/_Edit"
 msgstr "/_Upraviť"
 
-#: src/addressbook.c:387 src/addressbook.c:397 src/summaryview.c:434
+#: src/addressbook.c:386 src/addressbook.c:396 src/summaryview.c:434
 msgid "/_Delete"
 msgstr "/Z_mazať"
 
-#: src/addressbook.c:494
+#: src/addressbook.c:492
 msgid "E-Mail address"
 msgstr "E-mailová adresa"
 
-#: src/addressbook.c:498 src/compose.c:4778 src/prefs_common_dialog.c:2183
+#: src/addressbook.c:496 src/compose.c:4797 src/prefs_common_dialog.c:2183
 msgid "Address book"
 msgstr "Otvoriť adresár"
 
-#: src/addressbook.c:600 src/prefs_filter_edit.c:249
+#: src/addressbook.c:603 src/prefs_filter_edit.c:249
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "Meno:"
 
 #. Buttons
-#: src/addressbook.c:632 src/addressbook.c:1684 src/editaddress.c:884
+#: src/addressbook.c:636 src/addressbook.c:1678 src/editaddress.c:884
 #: src/editaddress.c:1017 src/mainwindow.c:2426 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:635 src/editaddress.c:890 src/editaddress.c:1023
+#: src/addressbook.c:639 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:1552
 msgid "Add"
 msgstr "Pridať"
 
-#: src/addressbook.c:638
+#: src/addressbook.c:642
 msgid "Lookup"
 msgstr "Vyhľadať"
 
-#: src/addressbook.c:650 src/headerview.c:55 src/prefs_folder_item.c:339
+#: src/addressbook.c:654 src/headerview.c:55 src/prefs_folder_item.c:339
 #: src/prefs_template.c:176
 msgid "To:"
 msgstr "Komu:"
 
-#: src/addressbook.c:654 src/prefs_folder_item.c:356 src/prefs_template.c:178
+#: src/addressbook.c:658 src/prefs_folder_item.c:356 src/prefs_template.c:178
 msgid "Cc:"
 msgstr "Kópia:"
 
-#: src/addressbook.c:658 src/prefs_folder_item.c:367
+#: src/addressbook.c:662 src/prefs_folder_item.c:367
 msgid "Bcc:"
 msgstr "Slepá kópia:"
 
 #. Confirm deletion
-#: src/addressbook.c:845
+#: src/addressbook.c:832
 msgid "Delete address(es)"
 msgstr "Zmazať adresu(y)"
 
-#: src/addressbook.c:846
+#: src/addressbook.c:833
 msgid "Really delete the address(es)?"
 msgstr "Naozaj zmazať adresu(y)?"
 
-#: src/addressbook.c:1675
+#: src/addressbook.c:1669
 #, fuzzy, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1023,38 +1024,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:1678 src/folderview.c:2372
+#: src/addressbook.c:1672 src/folderview.c:2372
 msgid "Delete folder"
 msgstr "Odstrániť priečinok"
 
-#: src/addressbook.c:1678
+#: src/addressbook.c:1672
 #, fuzzy
 msgid "_Folder only"
 msgstr "Len priečinok"
 
-#: src/addressbook.c:1678
+#: src/addressbook.c:1672
 #, fuzzy
 msgid "Folder and _addresses"
 msgstr "Priečinok aj adresy"
 
-#: src/addressbook.c:1683
+#: src/addressbook.c:1677
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Naozaj zmazať '%s' ?"
 
-#: src/addressbook.c:2369 src/addressbook.c:2502
+#: src/addressbook.c:2363 src/addressbook.c:2496
 msgid "New user, could not save index file."
 msgstr "Nový uživateľ; nepodarilo sa uložiť indexový súbor."
 
-#: src/addressbook.c:2373 src/addressbook.c:2506
+#: src/addressbook.c:2367 src/addressbook.c:2500
 msgid "New user, could not save address book files."
 msgstr "Nový uživateľ; nedajú sa uložiť súbory adresára."
 
-#: src/addressbook.c:2383 src/addressbook.c:2516
+#: src/addressbook.c:2377 src/addressbook.c:2510
 msgid "Old address book converted successfully."
 msgstr "Konverzia starého adresára prebehla úspešne."
 
-#: src/addressbook.c:2388
+#: src/addressbook.c:2382
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1062,7 +1063,7 @@ msgstr ""
 "Konverzia starého adresára prebehla,\n"
 "nedá sa uložiť indexový súbor nového adresára"
 
-#: src/addressbook.c:2401
+#: src/addressbook.c:2395
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1070,7 +1071,7 @@ msgstr ""
 "Nedá sa konvertovať starý adresár,\n"
 "ale boli vytvorené prázdne súbory nového adresára."
 
-#: src/addressbook.c:2407
+#: src/addressbook.c:2401
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1078,7 +1079,7 @@ msgstr ""
 "Nedá sa konvertovať starý adresár,\n"
 "nedajú sa ani vytvoriť súbory nového adresára."
 
-#: src/addressbook.c:2412
+#: src/addressbook.c:2406
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1086,92 +1087,92 @@ msgstr ""
 "Nedá sa konvertovať starý adresár\n"
 "a nedajú sa ani vytvoriť súbory nového adresára."
 
-#: src/addressbook.c:2419
+#: src/addressbook.c:2413
 msgid "Addressbook conversion error"
 msgstr "Chyba pri konverzii adresára"
 
-#: src/addressbook.c:2423
+#: src/addressbook.c:2417
 msgid "Addressbook conversion"
 msgstr "Konverzia adresára"
 
-#: src/addressbook.c:2458
+#: src/addressbook.c:2452
 msgid "Addressbook Error"
 msgstr "Chyba v adresári"
 
-#: src/addressbook.c:2459 src/addressbook.c:2559
+#: src/addressbook.c:2453 src/addressbook.c:2553
 msgid "Could not read address index"
 msgstr "Nedá sa načítať zoznam adries"
 
-#: src/addressbook.c:2521
+#: src/addressbook.c:2515
 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:2535
+#: src/addressbook.c:2529
 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:2541
+#: src/addressbook.c:2535
 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:2547
+#: src/addressbook.c:2541
 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:2565
+#: src/addressbook.c:2559
 msgid "Addressbook Conversion Error"
 msgstr "Chyba pri konverzii adresára"
 
-#: src/addressbook.c:2571
+#: src/addressbook.c:2565
 msgid "Addressbook Conversion"
 msgstr "Konverzia adresára"
 
-#: src/addressbook.c:3086 src/prefs_common_dialog.c:2033
+#: src/addressbook.c:3080 src/prefs_common_dialog.c:2033
 msgid "Interface"
 msgstr "Ovládanie"
 
-#: src/addressbook.c:3102 src/importldif.c:514
+#: src/addressbook.c:3096 src/importldif.c:514
 msgid "Address Book"
 msgstr "Adresár"
 
-#: src/addressbook.c:3118
+#: src/addressbook.c:3112
 msgid "Person"
 msgstr "Osoba"
 
-#: src/addressbook.c:3134
+#: src/addressbook.c:3128
 msgid "EMail Address"
 msgstr "E-mailová adresa"
 
-#: src/addressbook.c:3150
+#: src/addressbook.c:3144
 msgid "Group"
 msgstr "Skupina"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3166 src/folderview.c:367 src/prefs_account_dialog.c:1694
-#: src/query_search.c:370
+#: src/addressbook.c:3160 src/folderview.c:367 src/prefs_account_dialog.c:1694
+#: src/query_search.c:398
 msgid "Folder"
 msgstr "Priečinok"
 
-#: src/addressbook.c:3182
+#: src/addressbook.c:3176
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3198 src/addressbook.c:3214
+#: src/addressbook.c:3192 src/addressbook.c:3208
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3230
+#: src/addressbook.c:3224
 msgid "LDAP Server"
 msgstr "LDAP server"
 
@@ -1183,7 +1184,7 @@ msgstr "Spoločná adresa"
 msgid "Personal address"
 msgstr "Súkromná adresa"
 
-#: src/alertpanel.c:142 src/compose.c:5500 src/main.c:621
+#: src/alertpanel.c:142 src/compose.c:5517 src/main.c:621
 msgid "Notice"
 msgstr "Upozornenie"
 
@@ -1191,7 +1192,7 @@ msgstr "Upozornenie"
 msgid "Warning"
 msgstr "Varovanie"
 
-#: src/alertpanel.c:168 src/inc.c:587
+#: src/alertpanel.c:168 src/inc.c:586
 msgid "Error"
 msgstr "Chyba"
 
@@ -1234,7 +1235,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:4761
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4762
 msgid "None"
 msgstr "Žiadna"
 
@@ -1512,7 +1513,7 @@ msgstr "/_Zobraziť/_Kódovanie/Thajsko (TIS-620)"
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Zobraziť/_Kódovanie/Thajsko (Windows-874)"
 
-#: src/compose.c:646 src/mainwindow.c:759 src/messageview.c:267
+#: src/compose.c:646 src/mainwindow.c:759 src/messageview.c:268
 msgid "/_Tools/_Address book"
 msgstr "/_Nástroje/_Adresár"
 
@@ -1520,14 +1521,14 @@ msgstr "/_Nástroje/_Adresár"
 msgid "/_Tools/_Template"
 msgstr "/_Nástroje/Ša_blóna"
 
-#: src/compose.c:649 src/mainwindow.c:783 src/messageview.c:283
+#: src/compose.c:649 src/mainwindow.c:783 src/messageview.c:284
 msgid "/_Tools/Actio_ns"
 msgstr "/_Nástroje/A_kcie"
 
 #: src/compose.c:651 src/compose.c:655 src/compose.c:661 src/mainwindow.c:762
 #: src/mainwindow.c:776 src/mainwindow.c:781 src/mainwindow.c:784
-#: src/mainwindow.c:788 src/mainwindow.c:790 src/messageview.c:270
-#: src/messageview.c:282
+#: src/mainwindow.c:788 src/mainwindow.c:790 src/messageview.c:271
+#: src/messageview.c:283
 msgid "/_Tools/---"
 msgstr "/_Nástroje/---"
 
@@ -1556,80 +1557,80 @@ msgstr "/_Nástroje/V_ykonať"
 msgid "/_Tools/_Set spell language"
 msgstr "/_Nástroje/Ša_blóna"
 
-#: src/compose.c:910
+#: src/compose.c:912
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: súbor neexistuje\n"
 
-#: src/compose.c:1014 src/compose.c:1085
+#: src/compose.c:1016 src/compose.c:1087
 msgid "Can't get text part\n"
 msgstr "Nedá sa získať časť textu\n"
 
-#: src/compose.c:1486
+#: src/compose.c:1488
 msgid "Quote mark format error."
 msgstr "Chyba v úvodzovkách."
 
-#: src/compose.c:1498
+#: src/compose.c:1500
 msgid "Message reply/forward format error."
 msgstr "Chyba formátu odpovede/preposielania."
 
-#: src/compose.c:1918
+#: src/compose.c:1935
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Súbor %s neexistuje\n"
 
-#: src/compose.c:1922
+#: src/compose.c:1939
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Nedá sa zistiť dĺžka súboru %s\n"
 
-#: src/compose.c:1926
+#: src/compose.c:1943
 #, c-format
 msgid "File %s is empty."
 msgstr "Súbor %s je prázdny."
 
-#: src/compose.c:1930
+#: src/compose.c:1947
 #, c-format
 msgid "Can't read %s."
 msgstr "Nedá sa čítať %s."
 
-#: src/compose.c:1963
+#: src/compose.c:1980
 #, c-format
 msgid "Message: %s"
 msgstr "Správa: %s"
 
-#: src/compose.c:2023 src/mimeview.c:565
+#: src/compose.c:2040 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:2507 src/headerview.c:195 src/query_search.c:636
+#: src/compose.c:2524 src/headerview.c:195 src/query_search.c:666
 #: src/summaryview.c:2124
 msgid "(No Subject)"
 msgstr "(bez predmetu)"
 
-#: src/compose.c:2510
+#: src/compose.c:2527
 #, fuzzy, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Písanie správy%s"
 
-#: src/compose.c:2623
+#: src/compose.c:2642
 msgid "Recipient is not specified."
 msgstr "Nie je určený príjemca."
 
-#: src/compose.c:2631
+#: src/compose.c:2650
 #, fuzzy
 msgid "Empty subject"
 msgstr "Predmet"
 
-#: src/compose.c:2632
+#: src/compose.c:2651
 msgid "Subject is empty. Send it anyway?"
 msgstr "Predmet je prázdny. Odoslať napriek tomu?"
 
-#: src/compose.c:2691
+#: src/compose.c:2710
 msgid "can't get recipient list."
 msgstr "nedá sa získať zoznam príjemcov."
 
-#: src/compose.c:2711
+#: src/compose.c:2730
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1637,21 +1638,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:2725 src/send_message.c:299
+#: src/compose.c:2744 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:2767
+#: src/compose.c:2786
 msgid "Can't save the message to outbox."
 msgstr "Správa sa nedá uložiť medzi odoslané správy."
 
-#: src/compose.c:2805
+#: src/compose.c:2824
 #, 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:2902
+#: src/compose.c:2921
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1662,12 +1663,12 @@ msgstr ""
 "%s na %s.\n"
 "Odoslať správu aj napriek tomu?"
 
-#: src/compose.c:2908
+#: src/compose.c:2927
 #, fuzzy
 msgid "Code conversion error"
 msgstr "Chyba pri konverzii adresára"
 
-#: src/compose.c:2981
+#: src/compose.c:3000
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1676,159 +1677,159 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:2985
+#: src/compose.c:3004
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3275
+#: src/compose.c:3294
 msgid "can't remove the old message\n"
 msgstr "nedá sa odstrániť stará správa\n"
 
-#: src/compose.c:3293
+#: src/compose.c:3312
 msgid "queueing message...\n"
 msgstr "zaraďujem správu do fronty...\n"
 
-#: src/compose.c:3375
+#: src/compose.c:3394
 msgid "can't find queue folder\n"
 msgstr "nemôžem nájsť priečinok Na odoslanie\n"
 
-#: src/compose.c:3382
+#: src/compose.c:3401
 msgid "can't queue the message\n"
 msgstr "nemôžem zaradiť správu do fronty\n"
 
-#: src/compose.c:3975
+#: src/compose.c:3994
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "vygenerovaný Message-ID: %s\n"
 
-#: src/compose.c:4088
+#: src/compose.c:4107
 msgid "Creating compose window...\n"
 msgstr "Vytváram okno pre písanie správy...\n"
 
-#: src/compose.c:4139 src/headerview.c:54
+#: src/compose.c:4158 src/headerview.c:54
 msgid "From:"
 msgstr "Od:"
 
-#: src/compose.c:4213
+#: src/compose.c:4232
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/_Nástroje/A_kcie"
 
-#: src/compose.c:4216
+#: src/compose.c:4235
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/Sp_ráva/_Zašifrovať"
 
-#: src/compose.c:4254 src/compose.c:5332
+#: src/compose.c:4273 src/compose.c:5351
 msgid "MIME type"
 msgstr "MIME typ"
 
 #. S_COL_DATE
-#: src/compose.c:4263 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4908
+#: src/compose.c:4282 src/mimeview.c:197 src/prefs_filter_edit.c:496
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4909
 msgid "Size"
 msgstr "Veľkosť"
 
-#: src/compose.c:4698 src/mainwindow.c:2359 src/prefs_account_dialog.c:528
+#: src/compose.c:4717 src/mainwindow.c:2359 src/prefs_account_dialog.c:528
 #: src/prefs_common_dialog.c:661
 msgid "Send"
 msgstr "Odoslať"
 
-#: src/compose.c:4699
+#: src/compose.c:4718
 msgid "Send message"
 msgstr "Odoslať správu"
 
-#: src/compose.c:4707
+#: src/compose.c:4726
 msgid "Send later"
 msgstr "Odoslať neskôr"
 
-#: src/compose.c:4708
+#: src/compose.c:4727
 msgid "Put into queue folder and send later"
 msgstr "Zaradiť správu do priečinka Na odoslanie a odoslať neskôr"
 
-#: src/compose.c:4716
+#: src/compose.c:4735
 msgid "Draft"
 msgstr "Koncept"
 
-#: src/compose.c:4717
+#: src/compose.c:4736
 msgid "Save to draft folder"
 msgstr "Uložiť medzi koncepty"
 
-#: src/compose.c:4727
+#: src/compose.c:4746
 msgid "Insert"
 msgstr "Vložiť"
 
-#: src/compose.c:4728
+#: src/compose.c:4747
 msgid "Insert file"
 msgstr "Vložiť obsah súboru"
 
-#: src/compose.c:4736
+#: src/compose.c:4755
 msgid "Attach"
 msgstr "Pripojiť"
 
-#: src/compose.c:4737
+#: src/compose.c:4756
 msgid "Attach file"
 msgstr "Pripojiť súbor"
 
 #. signature
-#: src/compose.c:4747 src/prefs_account_dialog.c:1208
+#: src/compose.c:4766 src/prefs_account_dialog.c:1208
 #: src/prefs_common_dialog.c:953
 msgid "Signature"
 msgstr "Podpis"
 
-#: src/compose.c:4748
+#: src/compose.c:4767
 #, fuzzy
 msgid "Append signature"
 msgstr "CHYBNÝ podpis"
 
 #. editor
-#: src/compose.c:4757 src/prefs_common_dialog.c:991
+#: src/compose.c:4776 src/prefs_common_dialog.c:991
 #: src/prefs_common_dialog.c:2315
 msgid "Editor"
 msgstr "Editor"
 
-#: src/compose.c:4758
+#: src/compose.c:4777
 msgid "Edit with external editor"
 msgstr "Upraviť pomocou externého editoru"
 
-#: src/compose.c:4766
+#: src/compose.c:4785
 msgid "Linewrap"
 msgstr "Riadkovanie"
 
-#: src/compose.c:4767
+#: src/compose.c:4786
 msgid "Wrap all long lines"
 msgstr "Zalomiť všetky dlhé riadky"
 
-#: src/compose.c:5228
+#: src/compose.c:5247
 msgid "Invalid MIME type."
 msgstr "Neplatný MIME typ."
 
-#: src/compose.c:5246
+#: src/compose.c:5265
 msgid "File doesn't exist or is empty."
 msgstr "Súbor neexistuje alebo je prázdny."
 
-#: src/compose.c:5314
+#: src/compose.c:5333
 msgid "Properties"
 msgstr "Vlastnosti"
 
-#: src/compose.c:5334 src/prefs_common_dialog.c:1444
+#: src/compose.c:5353 src/prefs_common_dialog.c:1444
 msgid "Encoding"
 msgstr "Kódová stránka"
 
-#: src/compose.c:5357 src/prefs_folder_item.c:202
+#: src/compose.c:5376 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Cesta"
 
-#: src/compose.c:5358
+#: src/compose.c:5377
 msgid "File name"
 msgstr "Názov súboru"
 
-#: src/compose.c:5449
+#: src/compose.c:5466
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Neplatný príkaz pre externý editor: `%s'\n"
 
-#: src/compose.c:5497
+#: src/compose.c:5514
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1838,48 +1839,48 @@ msgstr ""
 "Ukončiť ho násilne?\n"
 "skupinový ID procesu: %d"
 
-#: src/compose.c:5872 src/compose.c:5877 src/compose.c:5883
+#: src/compose.c:5889 src/compose.c:5894 src/compose.c:5900
 msgid "Can't queue the message."
 msgstr "Správa sa nedá zaradiť do fronty."
 
-#: src/compose.c:5974
+#: src/compose.c:5991
 #, fuzzy
 msgid "Select files"
 msgstr "Vybrať súbor"
 
-#: src/compose.c:5997
+#: src/compose.c:6014
 msgid "Select file"
 msgstr "Vybrať súbor"
 
-#: src/compose.c:6032
+#: src/compose.c:6049
 #, fuzzy
 msgid "Save message"
 msgstr "Odoslať správu"
 
-#: src/compose.c:6033
+#: src/compose.c:6050
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Obsah správy sa zmenil. Chcete zahodiť zmeny?"
 
-#: src/compose.c:6035
+#: src/compose.c:6052
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:6077
+#: src/compose.c:6094
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Chcete použiť šablónu `%s' ?"
 
-#: src/compose.c:6079
+#: src/compose.c:6096
 msgid "Apply template"
 msgstr "Použiť šablónu"
 
-#: src/compose.c:6080
+#: src/compose.c:6097
 #, fuzzy
 msgid "_Replace"
 msgstr "Nahradiť"
 
-#: src/compose.c:6080
+#: src/compose.c:6097
 #, fuzzy
 msgid "_Insert"
 msgstr "Vložiť"
@@ -2001,53 +2002,53 @@ msgstr "Musíte zadať názov skupiny."
 msgid "Edit Group Data"
 msgstr "Upraviť údaje skupiny"
 
-#: src/editgroup.c:300
+#: src/editgroup.c:299
 msgid "Group Name"
 msgstr "Názov skupiny"
 
-#: src/editgroup.c:319
+#: src/editgroup.c:318
 msgid "Addresses in Group"
 msgstr "Adresy v skupine"
 
-#: src/editgroup.c:321
+#: src/editgroup.c:320
 msgid " -> "
 msgstr " -> "
 
-#: src/editgroup.c:348
+#: src/editgroup.c:347
 msgid " <- "
 msgstr " <- "
 
-#: src/editgroup.c:350
+#: src/editgroup.c:349
 msgid "Available Addresses"
 msgstr "Dostupné adresy"
 
-#: src/editgroup.c:416
+#: src/editgroup.c:415
 msgid "Move E-Mail Addresses to or from Group with arrow buttons"
 msgstr ""
 "E-mailové adresy môžte presúvať z a do skupiny pomocou tlačítok so šípkami"
 
-#: src/editgroup.c:468
+#: src/editgroup.c:467
 msgid "Edit Group Details"
 msgstr "Upraviť detaily skupiny"
 
-#: src/editgroup.c:471
+#: src/editgroup.c:470
 msgid "Add New Group"
 msgstr "Pridať novú skupinu"
 
-#: src/editgroup.c:522
+#: src/editgroup.c:521
 msgid "Edit folder"
 msgstr "Upraviť priečinok"
 
-#: src/editgroup.c:522
+#: src/editgroup.c:521
 msgid "Input the new name of folder:"
 msgstr "Zadajte nový názov priečinka:"
 
-#: src/editgroup.c:525 src/foldersel.c:541 src/folderview.c:2121
+#: src/editgroup.c:524 src/foldersel.c:541 src/folderview.c:2121
 #: src/folderview.c:2127
 msgid "New folder"
 msgstr "Nový priečinok"
 
-#: src/editgroup.c:526 src/foldersel.c:542 src/folderview.c:2128
+#: src/editgroup.c:525 src/foldersel.c:542 src/folderview.c:2128
 msgid "Input the name of new folder:"
 msgstr "Zadajte názov nového priečinka:"
 
@@ -2246,7 +2247,7 @@ msgid "`%c' can't be included in folder name."
 msgstr "Názov priečinka nemôže obsahovať `%c'."
 
 #: src/foldersel.c:561 src/folderview.c:2147 src/folderview.c:2206
-#: src/query_search.c:995
+#: src/query_search.c:1031
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Priečinok `%s' už existuje."
@@ -2507,7 +2508,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:2127
+#: src/headerview.c:180 src/query_search.c:667 src/summaryview.c:2127
 msgid "(No From)"
 msgstr "(nie je známy odosielateľ)"
 
@@ -2637,134 +2638,134 @@ msgstr "Dokončiť"
 msgid "Sylpheed: %d new messages"
 msgstr "Dokončené (%d nových správ)"
 
-#: src/inc.c:372
+#: src/inc.c:371
 msgid "Retrieving new messages"
 msgstr "Prijímam nové správy"
 
-#: src/inc.c:415
+#: src/inc.c:414
 msgid "Standby"
 msgstr "Čakajte"
 
-#: src/inc.c:544 src/inc.c:593
+#: src/inc.c:543 src/inc.c:592
 msgid "Cancelled"
 msgstr "Zrušené"
 
-#: src/inc.c:555
+#: src/inc.c:554
 msgid "Retrieving"
 msgstr "Prijímam"
 
-#: src/inc.c:564
+#: src/inc.c:563
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "Hotovo (%d správ (%s) prijatých)"
 
-#: src/inc.c:568
+#: src/inc.c:567
 msgid "Done (no new messages)"
 msgstr "Hotovo (žiadne nové správy)"
 
-#: src/inc.c:574
+#: src/inc.c:573
 msgid "Connection failed"
 msgstr "Spojenie zlyhalo"
 
-#: src/inc.c:577
+#: src/inc.c:576
 msgid "Auth failed"
 msgstr "Autentizácia zlyhala"
 
-#: src/inc.c:580
+#: src/inc.c:579
 msgid "Locked"
 msgstr "Zamknuté"
 
-#: src/inc.c:590
+#: src/inc.c:589
 #, fuzzy
 msgid "Timeout"
 msgstr "Timeout (v sekundách)"
 
-#: src/inc.c:640
+#: src/inc.c:639
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Dokončené (%d nových správ)"
 
-#: src/inc.c:643
+#: src/inc.c:642
 msgid "Finished (no new messages)"
 msgstr "Dokončené (žiadne nové správy)"
 
-#: src/inc.c:652
+#: src/inc.c:651
 msgid "Some errors occurred while getting mail."
 msgstr "Pri prijímaní pošty sa vyskytli chyby."
 
-#: src/inc.c:688
+#: src/inc.c:687
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "prijímam nové správy pre konto %s...\n"
 
-#: src/inc.c:691
+#: src/inc.c:690
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Prijímam nové správy"
 
-#: src/inc.c:710
+#: src/inc.c:709
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Pripájam sa k serveru POP3: %s..."
 
-#: src/inc.c:719
+#: src/inc.c:718
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Nepodarilo sa pripojiť k serveru POP3: %s:%d\n"
 
-#: src/inc.c:798 src/send_message.c:631
+#: src/inc.c:797 src/send_message.c:631
 msgid "Authenticating..."
 msgstr "Autentizácia..."
 
-#: src/inc.c:799
+#: src/inc.c:798
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Prijímam správy z %s..."
 
-#: src/inc.c:804
+#: src/inc.c:803
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Získavam počet nových správ (STAT)..."
 
-#: src/inc.c:808
+#: src/inc.c:807
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Získavam počet nových správ (LAST)..."
 
-#: src/inc.c:812
+#: src/inc.c:811
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Získavam počet nových správ (UIDL)..."
 
-#: src/inc.c:816
+#: src/inc.c:815
 msgid "Getting the size of messages (LIST)..."
 msgstr "Získavam veľkosť správ (LIST)..."
 
-#: src/inc.c:826
+#: src/inc.c:825
 #, c-format
 msgid "Deleting message %d"
 msgstr "Odstraňujem správu %d"
 
-#: src/inc.c:833 src/send_message.c:649
+#: src/inc.c:832 src/send_message.c:649
 msgid "Quitting"
 msgstr "Odpájam sa"
 
-#: src/inc.c:858
+#: src/inc.c:857
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Prijímam správu (%d / %d) (%s / %s)"
 
-#: src/inc.c:879
+#: src/inc.c:878
 #, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Prijímam (%d správ (%s) prijatých)"
 
-#: src/inc.c:1107
+#: src/inc.c:1106
 msgid "Connection failed."
 msgstr "Spojenie zlyhalo."
 
-#: src/inc.c:1113
+#: src/inc.c:1112
 msgid "Error occurred while processing mail."
 msgstr "Pri spracovávaní pošty sa vyskytla chyba."
 
-#: src/inc.c:1118
+#: src/inc.c:1117
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2773,28 +2774,28 @@ msgstr ""
 "Pri spracovávaní pošty sa vyskytla chyba:\n"
 "%s"
 
-#: src/inc.c:1124
+#: src/inc.c:1123
 msgid "No disk space left."
 msgstr "Na disku už nie je miesto."
 
-#: src/inc.c:1129
+#: src/inc.c:1128
 msgid "Can't write file."
 msgstr "Nedá sa zapisovať do súboru."
 
-#: src/inc.c:1134
+#: src/inc.c:1133
 msgid "Socket error."
 msgstr "Chyba socketu."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1140 src/send_message.c:584 src/send_message.c:772
+#: src/inc.c:1139 src/send_message.c:584 src/send_message.c:772
 msgid "Connection closed by the remote host."
 msgstr "Vzdialený hostiteľ ukončil spojenie."
 
-#: src/inc.c:1146
+#: src/inc.c:1145
 msgid "Mailbox is locked."
 msgstr "Mailbox je zamknutý."
 
-#: src/inc.c:1150
+#: src/inc.c:1149
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2803,11 +2804,11 @@ msgstr ""
 "Mailbox je zamknutý:\n"
 "%s"
 
-#: src/inc.c:1156 src/send_message.c:757
+#: src/inc.c:1155 src/send_message.c:757
 msgid "Authentication failed."
 msgstr "Autentizácia bola neúspešná."
 
-#: src/inc.c:1161 src/send_message.c:760
+#: src/inc.c:1160 src/send_message.c:760
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2816,16 +2817,16 @@ msgstr ""
 "Autentizácia bola neúspešná:\n"
 "%s"
 
-#: src/inc.c:1166 src/send_message.c:776
+#: src/inc.c:1165 src/send_message.c:776
 #, fuzzy
 msgid "Session timed out."
 msgstr "čas spojenia vypršal\n"
 
-#: src/inc.c:1202
+#: src/inc.c:1201
 msgid "Incorporation cancelled\n"
 msgstr "Začleňovanie zrušené\n"
 
-#: src/inc.c:1285
+#: src/inc.c:1284
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Prijímam nové správy z %s do %s...\n"
@@ -3311,14 +3312,15 @@ msgid "/_View/Mess_age source"
 msgstr "/_Zobraziť/Zdrojový kód správ_y"
 
 #: src/mainwindow.c:708 src/messageview.c:245
-msgid "/_View/Show all _header"
+#, fuzzy
+msgid "/_View/Show all _headers"
 msgstr "/_Zobraziť/Zobraziť všetky _hlavičky"
 
 #: src/mainwindow.c:710
 msgid "/_View/_Update summary"
 msgstr "/_Zobraziť/_Aktualizovať zoznam"
 
-#: src/mainwindow.c:712 src/messageview.c:247
+#: src/mainwindow.c:712 src/messageview.c:248
 msgid "/_Message"
 msgstr "/Sp_ráva"
 
@@ -3348,16 +3350,16 @@ msgstr "/Sp_ráva/_Odoslať správy vo fronte"
 
 #: src/mainwindow.c:722 src/mainwindow.c:724 src/mainwindow.c:731
 #: src/mainwindow.c:736 src/mainwindow.c:739 src/mainwindow.c:750
-#: src/mainwindow.c:752 src/mainwindow.c:755 src/messageview.c:250
-#: src/messageview.c:258 src/messageview.c:263
+#: src/mainwindow.c:752 src/mainwindow.c:755 src/messageview.c:251
+#: src/messageview.c:259 src/messageview.c:264
 msgid "/_Message/---"
 msgstr "/Sp_ráva/---"
 
-#: src/mainwindow.c:723 src/messageview.c:248
+#: src/mainwindow.c:723 src/messageview.c:249
 msgid "/_Message/Compose _new message"
 msgstr "/Sp_ráva/_Napísať novú správu"
 
-#: src/mainwindow.c:725 src/messageview.c:251
+#: src/mainwindow.c:725 src/messageview.c:252
 msgid "/_Message/_Reply"
 msgstr "/Sp_ráva/O_dpovedať"
 
@@ -3365,27 +3367,27 @@ msgstr "/Sp_ráva/O_dpovedať"
 msgid "/_Message/Repl_y to"
 msgstr "/Sp_ráva/Odpo_vedať komu"
 
-#: src/mainwindow.c:727 src/messageview.c:252
+#: src/mainwindow.c:727 src/messageview.c:253
 msgid "/_Message/Repl_y to/_all"
 msgstr "/Sp_ráva/Odpoved_ať komu/_všetkým"
 
-#: src/mainwindow.c:728 src/messageview.c:254
+#: src/mainwindow.c:728 src/messageview.c:255
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/Sp_ráva/Od_povedať komu/_odosielateľovi"
 
-#: src/mainwindow.c:729 src/messageview.c:256
+#: src/mainwindow.c:729 src/messageview.c:257
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/Sp_ráva/Od_povedať komu/do _diskusnej skupiny"
 
-#: src/mainwindow.c:732 src/messageview.c:259
+#: src/mainwindow.c:732 src/messageview.c:260
 msgid "/_Message/_Forward"
 msgstr "/Sp_ráva/_Poslať ďalej"
 
-#: src/mainwindow.c:733 src/messageview.c:260
+#: src/mainwindow.c:733 src/messageview.c:261
 msgid "/_Message/For_ward as attachment"
 msgstr "/Sp_ráva/Poslať ako p_rílohu"
 
-#: src/mainwindow.c:735 src/messageview.c:262
+#: src/mainwindow.c:735 src/messageview.c:263
 msgid "/_Message/Redirec_t"
 msgstr "/Sp_ráva/Pre_smerovať"
 
@@ -3443,7 +3445,7 @@ msgstr "/Sp_ráva/_Odoslať"
 msgid "/_Message/Set as not j_unk mail"
 msgstr ""
 
-#: src/mainwindow.c:756 src/messageview.c:264
+#: src/mainwindow.c:756 src/messageview.c:265
 msgid "/_Message/Re-_edit"
 msgstr "/Sp_ráva/Znovu _editovať"
 
@@ -3462,23 +3464,23 @@ msgstr "/_Nástroje/_Filtrovať správy"
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Nástroje/_Filtrovať správy"
 
-#: src/mainwindow.c:767 src/messageview.c:271
+#: src/mainwindow.c:767 src/messageview.c:272
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Nástroje/Vytvoriť pravidlo fi_ltra"
 
-#: src/mainwindow.c:768 src/messageview.c:273
+#: src/mainwindow.c:768 src/messageview.c:274
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Nástroje/Vytvoriť pravidlo fi_ltra/_Automaticky"
 
-#: src/mainwindow.c:770 src/messageview.c:275
+#: src/mainwindow.c:770 src/messageview.c:276
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Nástroje/Vytvoriť pravidlo fi_ltra/podľa _odosielateľa"
 
-#: src/mainwindow.c:772 src/messageview.c:277
+#: src/mainwindow.c:772 src/messageview.c:278
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Nástroje/Vytvoriť pravidlo fi_ltra/podľa _príjemcu"
 
-#: src/mainwindow.c:774 src/messageview.c:279
+#: src/mainwindow.c:774 src/messageview.c:280
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Nástroje/Vytvoriť pravidlo fi_ltra/podľa p_redmetu"
 
@@ -3599,7 +3601,7 @@ msgid "MainWindow: color allocation %d failed\n"
 msgstr "Hlavné Okno: alokácia farieb %d bola neúspešná\n"
 
 #: src/mainwindow.c:1139 src/summaryview.c:2275 src/summaryview.c:2360
-#: src/summaryview.c:3907 src/summaryview.c:4036 src/summaryview.c:4394
+#: src/summaryview.c:3908 src/summaryview.c:4037 src/summaryview.c:4395
 msgid "done.\n"
 msgstr "hotovo.\n"
 
@@ -3865,7 +3867,7 @@ msgid "Find text:"
 msgstr "Nájdi text:"
 
 #: src/message_search.c:153 src/prefs_search_folder.c:253
-#: src/query_search.c:326
+#: src/query_search.c:343
 msgid "Case sensitive"
 msgstr "Záleží na veľkosti písmen"
 
@@ -3889,27 +3891,27 @@ msgstr "Dosiahnutý koniec správy; pokračovať od začiatku?"
 msgid "Search finished"
 msgstr "Hľadanie dokončené"
 
-#: src/messageview.c:268
+#: src/messageview.c:269
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/_Nástroje/Pridať _odosielateľa do adresára"
 
-#: src/messageview.c:300
+#: src/messageview.c:301
 msgid "Creating message view...\n"
 msgstr "Vytváram zobrazenie správy...\n"
 
-#: src/messageview.c:325
+#: src/messageview.c:326
 msgid "Text"
 msgstr "Text"
 
-#: src/messageview.c:330
+#: src/messageview.c:331
 msgid "Attachments"
 msgstr "Prílohy"
 
-#: src/messageview.c:380
+#: src/messageview.c:381
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:699 src/summaryview.c:3436
+#: src/messageview.c:700 src/summaryview.c:3436
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Nemôžem uložiť súbor '%s'."
@@ -3927,7 +3929,7 @@ msgstr "Vykonať"
 msgid "Print"
 msgstr "Tlačiť"
 
-#: src/messageview.c:770 src/summaryview.c:3471
+#: src/messageview.c:769 src/summaryview.c:3470
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -4027,11 +4029,11 @@ msgstr ""
 "Zadajte príkazový riadok pre otvorenie súboru:\n"
 "('%s' bude nahradené názvom súboru)"
 
-#: src/mimeview.c:1147
+#: src/mimeview.c:1140
 msgid "Opening executable file"
 msgstr ""
 
-#: src/mimeview.c:1148
+#: src/mimeview.c:1141
 msgid ""
 "This is an executable file. Opening executable file is restricted for "
 "security.\n"
@@ -4039,11 +4041,6 @@ msgid ""
 "virus or something like a malicious program."
 msgstr ""
 
-#: src/mimeview.c:1184
-#, c-format
-msgid "MIME viewer command line is invalid: `%s'"
-msgstr "Príkazový riadok prehliadača MIME je neplatný: '%s'"
-
 #: src/passphrase.c:96
 msgid "Passphrase"
 msgstr "Heslo"
@@ -5849,21 +5846,21 @@ msgstr "Odpovedať komu:"
 msgid "%s - Edit search condition"
 msgstr ""
 
-#: src/prefs_search_folder.c:209 src/query_search.c:257
+#: src/prefs_search_folder.c:209 src/query_search.c:274
 msgid "Match any of the following"
 msgstr ""
 
-#: src/prefs_search_folder.c:211 src/query_search.c:259
+#: src/prefs_search_folder.c:211 src/query_search.c:276
 #, fuzzy
 msgid "Match all of the following"
 msgstr "Automaticky nastaviť nasledujúce adresy"
 
-#: src/prefs_search_folder.c:231 src/query_search.c:303
+#: src/prefs_search_folder.c:231 src/query_search.c:320
 #, fuzzy
 msgid "Folder:"
 msgstr "Priečinok"
 
-#: src/prefs_search_folder.c:248 src/query_search.c:321
+#: src/prefs_search_folder.c:248 src/query_search.c:338
 #, fuzzy
 msgid "Search subfolders"
 msgstr "Hľadanie sa nepodarilo"
@@ -5878,17 +5875,17 @@ msgid "Attachment"
 msgstr "Príloha"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73 src/query_search.c:371 src/summaryview.c:4901
+#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4902
 msgid "Subject"
 msgstr "Predmet"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/query_search.c:372 src/summaryview.c:4904
+#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4905
 msgid "From"
 msgstr "Od"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/query_search.c:373 src/summaryview.c:4906
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:4907
 msgid "Date"
 msgstr "Dátum"
 
@@ -5982,43 +5979,43 @@ msgstr "Vytváram stavové okno...\n"
 msgid "Status"
 msgstr "Stav"
 
-#: src/query_search.c:234
+#: src/query_search.c:251
 msgid "Search messages"
 msgstr "Vyhľadať v správach"
 
-#: src/query_search.c:395
+#: src/query_search.c:423
 #, fuzzy
 msgid "_Save as search folder"
 msgstr "Uložiť medzi koncepty"
 
-#: src/query_search.c:512 src/subscribedialog.c:526 src/summaryview.c:842
+#: src/query_search.c:542 src/subscribedialog.c:526 src/summaryview.c:842
 msgid "Done."
 msgstr "Hotovo."
 
-#: src/query_search.c:536
+#: src/query_search.c:566
 #, fuzzy, c-format
 msgid "Searching %s ..."
 msgstr "Prehľadávam priečinok %s ..."
 
-#: src/query_search.c:564
+#: src/query_search.c:594
 #, fuzzy, c-format
 msgid "Searching %s (%d / %d)..."
 msgstr "Filtrujem..."
 
-#: src/query_search.c:645 src/summaryview.c:2051
+#: src/query_search.c:675 src/summaryview.c:2051
 msgid "(No Date)"
 msgstr "(bez dátumu)"
 
-#: src/query_search.c:833
+#: src/query_search.c:869
 #, fuzzy
 msgid "Save as search folder"
 msgstr "Uložiť medzi koncepty"
 
-#: src/query_search.c:854
+#: src/query_search.c:890
 msgid "Location:"
 msgstr ""
 
-#: src/query_search.c:869
+#: src/query_search.c:905
 #, fuzzy
 msgid "Folder name:"
 msgstr "Názov súboru"
@@ -6650,37 +6647,37 @@ msgstr "Správa %d je určená ku kopírovaniu do %s\n"
 msgid "Destination for copy is same as current folder."
 msgstr "Cieľ kopírovania je zhodný s aktuálnym priečinkom."
 
-#: src/summaryview.c:3506
+#: src/summaryview.c:3507
 msgid "Error occurred while processing messages."
 msgstr "Pri spracovávaní pošty sa vyskytla chyba."
 
-#: src/summaryview.c:3814 src/summaryview.c:3815
+#: src/summaryview.c:3815 src/summaryview.c:3816
 msgid "Building threads..."
 msgstr "Vytváram vlákna..."
 
-#: src/summaryview.c:3965 src/summaryview.c:3966
+#: src/summaryview.c:3966 src/summaryview.c:3967
 msgid "Unthreading..."
 msgstr "Odstraňujem štruktúru vlákien..."
 
-#: src/summaryview.c:4259 src/summaryview.c:4315
+#: src/summaryview.c:4260 src/summaryview.c:4316
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtrujem..."
 
-#: src/summaryview.c:4364
+#: src/summaryview.c:4365
 msgid "filtering..."
 msgstr "filtrujem..."
 
-#: src/summaryview.c:4365
+#: src/summaryview.c:4366
 msgid "Filtering..."
 msgstr "Filtrujem..."
 
-#: src/summaryview.c:4401
+#: src/summaryview.c:4402
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr ""
 
-#: src/summaryview.c:4910
+#: src/summaryview.c:4911
 msgid "No."
 msgstr "Č."
 
@@ -6769,6 +6766,9 @@ msgstr "Ukončiť"
 msgid "Sylpheed"
 msgstr "Starší Sylpheed"
 
+#~ msgid "MIME viewer command line is invalid: `%s'"
+#~ msgstr "Príkazový riadok prehliadača MIME je neplatný: '%s'"
+
 #~ msgid "%dB"
 #~ msgstr "%dB"
 
diff --git a/po/sl.po b/po/sl.po
index b8b009fc..5d46f3b2 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-03-02 19:03+0900\n"
+"POT-Creation-Date: 2006-03-10 16:06+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:491
+#: libsylph/prefs_common.c:496
 #, fuzzy
 msgid "Junk mail filter"
 msgstr "Mapa"
@@ -526,7 +526,7 @@ msgstr "Ne morem odpreti datoteke z oznakami.\n"
 msgid "can't fetch message %d\n"
 msgstr "ne morem prenesti sporočila %d\n"
 
-#: libsylph/procmsg.c:1375
+#: libsylph/procmsg.c:1378
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Ukazna vrstica za tiskanje ni veljavna: `%s'\n"
@@ -605,12 +605,12 @@ msgstr "  Zadeva: %s\n"
 msgid "  Issuer: %s\n"
 msgstr "  Izdajatelj: %s\n"
 
-#: libsylph/utils.c:2411 src/compose.c:2869 src/compose.c:3132
-#: src/compose.c:3195 src/compose.c:3315
+#: libsylph/utils.c:2430 src/compose.c:2888 src/compose.c:3151
+#: src/compose.c:3214 src/compose.c:3334
 msgid "can't change file mode\n"
 msgstr "Ne morem spremeniti pravic do dostopa do datoteke\n"
 
-#: libsylph/utils.c:2418 libsylph/utils.c:2542
+#: libsylph/utils.c:2437 libsylph/utils.c:2561
 #, c-format
 msgid "writing to %s failed.\n"
 msgstr "pisanje v %s ni uspelo.\n"
@@ -693,8 +693,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:493
-#: src/compose.c:4273 src/editaddress.c:200 src/editaddress.c:942
+#: src/account_dialog.c:366 src/addressadd.c:192 src/addressbook.c:491
+#: src/compose.c:4292 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 ""
 msgid "Add Address to Book"
 msgstr "Dodaj naslov v adresar"
 
-#: src/addressadd.c:202 src/compose.c:4777 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4796 src/editaddress.c:201
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "Naslov"
 
-#: src/addressadd.c:212 src/addressbook.c:495 src/editaddress.c:202
+#: src/addressadd.c:212 src/addressbook.c:493 src/editaddress.c:202
 #: src/editaddress.c:795 src/editaddress.c:860 src/editgroup.c:267
 msgid "Remarks"
 msgstr "Opombe"
@@ -844,110 +844,111 @@ msgstr "Opombe"
 msgid "Select Address Book Folder"
 msgstr "Izberite mapo za adresar"
 
-#: src/addressbook.c:338 src/compose.c:515 src/mainwindow.c:489
+#: src/addressbook.c:337 src/compose.c:515 src/mainwindow.c:489
 #: src/messageview.c:140
 msgid "/_File"
 msgstr "/_Datoteka"
 
-#: src/addressbook.c:339
+#: src/addressbook.c:338
 msgid "/_File/New _Book"
 msgstr "/_Datoteka/Nova _Knjiga"
 
-#: src/addressbook.c:340
+#: src/addressbook.c:339
 msgid "/_File/New _vCard"
 msgstr "/_Datoteka/Nova _v kartica"
 
-#: src/addressbook.c:342
+#: src/addressbook.c:341
 msgid "/_File/New _JPilot"
 msgstr "/_Datoteka/Nov _JPilot"
 
-#: src/addressbook.c:345
-msgid "/_File/New _Server"
+#: src/addressbook.c:344
+#, fuzzy
+msgid "/_File/New _LDAP Server"
 msgstr "/_Datoteka/Nov _strežnik"
 
-#: src/addressbook.c:347 src/addressbook.c:350 src/compose.c:520
+#: src/addressbook.c:346 src/addressbook.c:349 src/compose.c:520
 #: src/compose.c:525 src/compose.c:528 src/compose.c:531 src/mainwindow.c:507
 #: src/mainwindow.c:510 src/mainwindow.c:512 src/mainwindow.c:515
 #: src/mainwindow.c:517 src/messageview.c:143
 msgid "/_File/---"
 msgstr "/_Datoteka/---"
 
-#: src/addressbook.c:348
+#: src/addressbook.c:347
 msgid "/_File/_Edit"
 msgstr "/_Datoteka/_Urejanje"
 
-#: src/addressbook.c:349
+#: src/addressbook.c:348
 msgid "/_File/_Delete"
 msgstr "/_Datoteka/_Brisanje"
 
-#: src/addressbook.c:351
+#: src/addressbook.c:350
 msgid "/_File/_Save"
 msgstr "/_Datoteka/_Shranjevanje"
 
-#: src/addressbook.c:352 src/compose.c:532 src/messageview.c:144
+#: src/addressbook.c:351 src/compose.c:532 src/messageview.c:144
 msgid "/_File/_Close"
 msgstr "/_Datoteka/_Zapri"
 
-#: src/addressbook.c:353
+#: src/addressbook.c:352
 msgid "/_Address"
 msgstr "/_Naslov"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:353
 msgid "/_Address/New _Address"
 msgstr "/_Naslov/Nov n_aslov"
 
-#: src/addressbook.c:355
+#: src/addressbook.c:354
 msgid "/_Address/New _Group"
 msgstr "/_Naslov/Nova _skupina"
 
-#: src/addressbook.c:356
+#: src/addressbook.c:355
 msgid "/_Address/New _Folder"
 msgstr "/_Naslov/Nova _mapa"
 
-#: src/addressbook.c:357
+#: src/addressbook.c:356
 msgid "/_Address/---"
 msgstr "/_Naslov/---"
 
-#: src/addressbook.c:358
+#: src/addressbook.c:357
 msgid "/_Address/_Edit"
 msgstr "/_Naslov/_Urejanje"
 
-#: src/addressbook.c:359
+#: src/addressbook.c:358
 msgid "/_Address/_Delete"
 msgstr "/_Naslov/_Brisanje"
 
-#: src/addressbook.c:360 src/compose.c:645 src/mainwindow.c:758
-#: src/messageview.c:266
+#: src/addressbook.c:359 src/compose.c:645 src/mainwindow.c:758
+#: src/messageview.c:267
 msgid "/_Tools"
 msgstr "/_Orodja"
 
-#: src/addressbook.c:361
+#: src/addressbook.c:360
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Orodja/Uvoz datoteke _LDIF"
 
-#: src/addressbook.c:362 src/compose.c:666 src/mainwindow.c:812
-#: src/messageview.c:286
+#: src/addressbook.c:361 src/compose.c:666 src/mainwindow.c:812
+#: src/messageview.c:287
 msgid "/_Help"
 msgstr "/_Pomoč"
 
-#: src/addressbook.c:363 src/compose.c:667 src/mainwindow.c:824
-#: src/messageview.c:287
+#: src/addressbook.c:362 src/compose.c:667 src/mainwindow.c:824
+#: src/messageview.c:288
 msgid "/_Help/_About"
 msgstr "/_Pomoč/_O programu"
 
-#: src/addressbook.c:382 src/addressbook.c:392
+#: src/addressbook.c:381 src/addressbook.c:391
 msgid "/New _Address"
 msgstr "/Nov n_aslov"
 
-#: src/addressbook.c:383 src/addressbook.c:393
+#: src/addressbook.c:382 src/addressbook.c:392
 msgid "/New _Group"
 msgstr "/Nova _skupina"
 
-#: src/addressbook.c:384 src/addressbook.c:394
+#: src/addressbook.c:383 src/addressbook.c:393
 msgid "/New _Folder"
 msgstr "/Nova _mapa"
 
-#: src/addressbook.c:385 src/addressbook.c:395 src/compose.c:509
+#: src/addressbook.c:384 src/addressbook.c:394 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
@@ -957,70 +958,70 @@ msgstr "/Nova _mapa"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:386 src/addressbook.c:396 src/compose.c:534
+#: src/addressbook.c:385 src/addressbook.c:395 src/compose.c:534
 #: src/mainwindow.c:521 src/messageview.c:146
 msgid "/_Edit"
 msgstr "/_Urejanje"
 
-#: src/addressbook.c:387 src/addressbook.c:397 src/summaryview.c:434
+#: src/addressbook.c:386 src/addressbook.c:396 src/summaryview.c:434
 msgid "/_Delete"
 msgstr "/_Brisanje"
 
-#: src/addressbook.c:494
+#: src/addressbook.c:492
 msgid "E-Mail address"
 msgstr "Elektronski naslov"
 
-#: src/addressbook.c:498 src/compose.c:4778 src/prefs_common_dialog.c:2183
+#: src/addressbook.c:496 src/compose.c:4797 src/prefs_common_dialog.c:2183
 msgid "Address book"
 msgstr "Imenik naslovov"
 
-#: src/addressbook.c:600 src/prefs_filter_edit.c:249
+#: src/addressbook.c:603 src/prefs_filter_edit.c:249
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "Ime:"
 
 #. Buttons
-#: src/addressbook.c:632 src/addressbook.c:1684 src/editaddress.c:884
+#: src/addressbook.c:636 src/addressbook.c:1678 src/editaddress.c:884
 #: src/editaddress.c:1017 src/mainwindow.c:2426 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:635 src/editaddress.c:890 src/editaddress.c:1023
+#: src/addressbook.c:639 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:1552
 msgid "Add"
 msgstr "Dodajanje"
 
-#: src/addressbook.c:638
+#: src/addressbook.c:642
 msgid "Lookup"
 msgstr "Poišči"
 
-#: src/addressbook.c:650 src/headerview.c:55 src/prefs_folder_item.c:339
+#: src/addressbook.c:654 src/headerview.c:55 src/prefs_folder_item.c:339
 #: src/prefs_template.c:176
 msgid "To:"
 msgstr "Za:"
 
-#: src/addressbook.c:654 src/prefs_folder_item.c:356 src/prefs_template.c:178
+#: src/addressbook.c:658 src/prefs_folder_item.c:356 src/prefs_template.c:178
 msgid "Cc:"
 msgstr "Kp:"
 
-#: src/addressbook.c:658 src/prefs_folder_item.c:367
+#: src/addressbook.c:662 src/prefs_folder_item.c:367
 msgid "Bcc:"
 msgstr "Skp:"
 
 #. Confirm deletion
-#: src/addressbook.c:845
+#: src/addressbook.c:832
 msgid "Delete address(es)"
 msgstr "Brisanje naslova"
 
-#: src/addressbook.c:846
+#: src/addressbook.c:833
 msgid "Really delete the address(es)?"
 msgstr "Res želite izbrisati naslov(e)?"
 
-#: src/addressbook.c:1675
+#: src/addressbook.c:1669
 #, fuzzy, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1029,38 +1030,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:1678 src/folderview.c:2372
+#: src/addressbook.c:1672 src/folderview.c:2372
 msgid "Delete folder"
 msgstr "Izbriši mapo"
 
-#: src/addressbook.c:1678
+#: src/addressbook.c:1672
 #, fuzzy
 msgid "_Folder only"
 msgstr "Samo mapa"
 
-#: src/addressbook.c:1678
+#: src/addressbook.c:1672
 #, fuzzy
 msgid "Folder and _addresses"
 msgstr "Mapa in naslovi"
 
-#: src/addressbook.c:1683
+#: src/addressbook.c:1677
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Res želite izbrisati '%s' ?"
 
-#: src/addressbook.c:2369 src/addressbook.c:2502
+#: src/addressbook.c:2363 src/addressbook.c:2496
 msgid "New user, could not save index file."
 msgstr "Nov uporabnik, ne morem shraniti indeksne datoteke."
 
-#: src/addressbook.c:2373 src/addressbook.c:2506
+#: src/addressbook.c:2367 src/addressbook.c:2500
 msgid "New user, could not save address book files."
 msgstr "Nov uporabnik, ne morem shraniti datotek z iminiki naslovov."
 
-#: src/addressbook.c:2383 src/addressbook.c:2516
+#: src/addressbook.c:2377 src/addressbook.c:2510
 msgid "Old address book converted successfully."
 msgstr "Star imenik naslovov je bil uspešno pretvorjen."
 
-#: src/addressbook.c:2388
+#: src/addressbook.c:2382
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1068,7 +1069,7 @@ msgstr ""
 "Stari imenik naslovov pretvorjen,\n"
 "ne morem shraniti nove indeksne datoteke naslovov"
 
-#: src/addressbook.c:2401
+#: src/addressbook.c:2395
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1076,7 +1077,7 @@ msgstr ""
 "Ne morem pretvoriti imenika naslovov,\n"
 "sem pa naredil prazne nove datoteke imenikov naslovov."
 
-#: src/addressbook.c:2407
+#: src/addressbook.c:2401
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1084,7 +1085,7 @@ msgstr ""
 "Ne morem pretvoriti imenika naslovov,\n"
 "ne morem narediti novih datotek z imeniki naslovov."
 
-#: src/addressbook.c:2412
+#: src/addressbook.c:2406
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1092,91 +1093,91 @@ msgstr ""
 "Ne morem pretvoriti imenika naslovov\n"
 "in ne morem narediti novih datotek z imeniki naslovov"
 
-#: src/addressbook.c:2419
+#: src/addressbook.c:2413
 msgid "Addressbook conversion error"
 msgstr "Napaka pri pretvorbi imenika naslovov"
 
-#: src/addressbook.c:2423
+#: src/addressbook.c:2417
 msgid "Addressbook conversion"
 msgstr "Pretvarjam imenik naslovov"
 
-#: src/addressbook.c:2458
+#: src/addressbook.c:2452
 msgid "Addressbook Error"
 msgstr "Napaka v imeniku naslovov"
 
-#: src/addressbook.c:2459 src/addressbook.c:2559
+#: src/addressbook.c:2453 src/addressbook.c:2553
 msgid "Could not read address index"
 msgstr "Ne morem prebrati indeksa naslovov"
 
-#: src/addressbook.c:2521
+#: src/addressbook.c:2515
 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:2535
+#: src/addressbook.c:2529
 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:2541
+#: src/addressbook.c:2535
 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:2547
+#: src/addressbook.c:2541
 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:2565
+#: src/addressbook.c:2559
 msgid "Addressbook Conversion Error"
 msgstr "Napaka pri pretvorbi imenika naslovov"
 
-#: src/addressbook.c:2571
+#: src/addressbook.c:2565
 msgid "Addressbook Conversion"
 msgstr "Pretvorba imenika naslovov"
 
-#: src/addressbook.c:3086 src/prefs_common_dialog.c:2033
+#: src/addressbook.c:3080 src/prefs_common_dialog.c:2033
 msgid "Interface"
 msgstr "Vmesnik"
 
-#: src/addressbook.c:3102 src/importldif.c:514
+#: src/addressbook.c:3096 src/importldif.c:514
 msgid "Address Book"
 msgstr "Imenik naslovov"
 
-#: src/addressbook.c:3118
+#: src/addressbook.c:3112
 msgid "Person"
 msgstr "Oseba"
 
-#: src/addressbook.c:3134
+#: src/addressbook.c:3128
 msgid "EMail Address"
 msgstr "Elektronski naslov"
 
-#: src/addressbook.c:3150
+#: src/addressbook.c:3144
 msgid "Group"
 msgstr "Skupina"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3166 src/folderview.c:367 src/prefs_account_dialog.c:1694
-#: src/query_search.c:370
+#: src/addressbook.c:3160 src/folderview.c:367 src/prefs_account_dialog.c:1694
+#: src/query_search.c:398
 msgid "Folder"
 msgstr "Mapa"
 
-#: src/addressbook.c:3182
+#: src/addressbook.c:3176
 msgid "vCard"
 msgstr "v-kartica"
 
-#: src/addressbook.c:3198 src/addressbook.c:3214
+#: src/addressbook.c:3192 src/addressbook.c:3208
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3230
+#: src/addressbook.c:3224
 msgid "LDAP Server"
 msgstr "Strežnik LDAP"
 
@@ -1188,7 +1189,7 @@ msgstr "Skupni naslov"
 msgid "Personal address"
 msgstr "Osebni naslov"
 
-#: src/alertpanel.c:142 src/compose.c:5500 src/main.c:621
+#: src/alertpanel.c:142 src/compose.c:5517 src/main.c:621
 msgid "Notice"
 msgstr "Opomba"
 
@@ -1196,7 +1197,7 @@ msgstr "Opomba"
 msgid "Warning"
 msgstr "Opozorilo"
 
-#: src/alertpanel.c:168 src/inc.c:587
+#: src/alertpanel.c:168 src/inc.c:586
 msgid "Error"
 msgstr "Napaka"
 
@@ -1239,7 +1240,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:4761
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4762
 msgid "None"
 msgstr "Nič"
 
@@ -1518,7 +1519,7 @@ msgstr "/_Pogled/Nabor zna_kov/Tajski (TIS-620)"
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Pogled/Nabor zna_kov/Tajski (Windows-874)"
 
-#: src/compose.c:646 src/mainwindow.c:759 src/messageview.c:267
+#: src/compose.c:646 src/mainwindow.c:759 src/messageview.c:268
 msgid "/_Tools/_Address book"
 msgstr "/_Orodja/_Adresar"
 
@@ -1526,14 +1527,14 @@ msgstr "/_Orodja/_Adresar"
 msgid "/_Tools/_Template"
 msgstr "/_Orodja/_Predloga"
 
-#: src/compose.c:649 src/mainwindow.c:783 src/messageview.c:283
+#: src/compose.c:649 src/mainwindow.c:783 src/messageview.c:284
 msgid "/_Tools/Actio_ns"
 msgstr "/_Orodja/Deja_nja"
 
 #: src/compose.c:651 src/compose.c:655 src/compose.c:661 src/mainwindow.c:762
 #: src/mainwindow.c:776 src/mainwindow.c:781 src/mainwindow.c:784
-#: src/mainwindow.c:788 src/mainwindow.c:790 src/messageview.c:270
-#: src/messageview.c:282
+#: src/mainwindow.c:788 src/mainwindow.c:790 src/messageview.c:271
+#: src/messageview.c:283
 msgid "/_Tools/---"
 msgstr "/_Orodja/---"
 
@@ -1562,80 +1563,80 @@ msgstr "/_Orodja/_Izvrši"
 msgid "/_Tools/_Set spell language"
 msgstr "/_Orodja/_Predloga"
 
-#: src/compose.c:910
+#: src/compose.c:912
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: datoteka ne obstaja\n"
 
-#: src/compose.c:1014 src/compose.c:1085
+#: src/compose.c:1016 src/compose.c:1087
 msgid "Can't get text part\n"
 msgstr "Ne morem dobiti tekstovnega dela\n"
 
-#: src/compose.c:1486
+#: src/compose.c:1488
 msgid "Quote mark format error."
 msgstr "Napaka pri oblikovanju znaka za citiranje."
 
-#: src/compose.c:1498
+#: src/compose.c:1500
 msgid "Message reply/forward format error."
 msgstr "Napaka pri oblikovanju odgovora/posredovanja sporočila."
 
-#: src/compose.c:1918
+#: src/compose.c:1935
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Datoteka %s ne obstaja\n"
 
-#: src/compose.c:1922
+#: src/compose.c:1939
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Ne morem dobiti velikosti datoteke %s\n"
 
-#: src/compose.c:1926
+#: src/compose.c:1943
 #, c-format
 msgid "File %s is empty."
 msgstr "Datoteka %s je prazna."
 
-#: src/compose.c:1930
+#: src/compose.c:1947
 #, c-format
 msgid "Can't read %s."
 msgstr "Ne morem prebrati %s."
 
-#: src/compose.c:1963
+#: src/compose.c:1980
 #, c-format
 msgid "Message: %s"
 msgstr "Sporočilo: %s"
 
-#: src/compose.c:2023 src/mimeview.c:565
+#: src/compose.c:2040 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:2507 src/headerview.c:195 src/query_search.c:636
+#: src/compose.c:2524 src/headerview.c:195 src/query_search.c:666
 #: src/summaryview.c:2124
 msgid "(No Subject)"
 msgstr "(Brez zadeve)"
 
-#: src/compose.c:2510
+#: src/compose.c:2527
 #, fuzzy, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Sestavi sporočilo%s"
 
-#: src/compose.c:2623
+#: src/compose.c:2642
 msgid "Recipient is not specified."
 msgstr "Naslovnik ni določen."
 
-#: src/compose.c:2631
+#: src/compose.c:2650
 #, fuzzy
 msgid "Empty subject"
 msgstr "Zadeva"
 
-#: src/compose.c:2632
+#: src/compose.c:2651
 msgid "Subject is empty. Send it anyway?"
 msgstr "Zadeva sporočila je prazna. Naj kljub temu pošljem?"
 
-#: src/compose.c:2691
+#: src/compose.c:2710
 msgid "can't get recipient list."
 msgstr "ne morem dobiti seznama naslovnikov"
 
-#: src/compose.c:2711
+#: src/compose.c:2730
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1643,21 +1644,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:2725 src/send_message.c:299
+#: src/compose.c:2744 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:2767
+#: src/compose.c:2786
 msgid "Can't save the message to outbox."
 msgstr "Ne morem shraniti sporočila v imenik Outbox."
 
-#: src/compose.c:2805
+#: src/compose.c:2824
 #, 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:2902
+#: src/compose.c:2921
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1667,12 +1668,12 @@ msgstr ""
 "Ne morem pretvoriti nabora znakov sporočila.\n"
 "Naj ga kljub temu pošljem?"
 
-#: src/compose.c:2908
+#: src/compose.c:2927
 #, fuzzy
 msgid "Code conversion error"
 msgstr "Napaka pri pretvorbi imenika naslovov"
 
-#: src/compose.c:2981
+#: src/compose.c:3000
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1681,160 +1682,160 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:2985
+#: src/compose.c:3004
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3275
+#: src/compose.c:3294
 msgid "can't remove the old message\n"
 msgstr "ne morem odstraniti starega sporočila\n"
 
-#: src/compose.c:3293
+#: src/compose.c:3312
 msgid "queueing message...\n"
 msgstr "prestavljam sporočilo v mapo Čakajoče...\n"
 
-#: src/compose.c:3375
+#: src/compose.c:3394
 msgid "can't find queue folder\n"
 msgstr "ne najdem mape s čakajočimi sporočili\n"
 
-#: src/compose.c:3382
+#: src/compose.c:3401
 msgid "can't queue the message\n"
 msgstr "ne morem preložiti sporočila\n"
 
-#: src/compose.c:3975
+#: src/compose.c:3994
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "generiran Message-ID: %s\n"
 
-#: src/compose.c:4088
+#: src/compose.c:4107
 msgid "Creating compose window...\n"
 msgstr "Odpiram okno za sestavljanje sporočila...\n"
 
-#: src/compose.c:4139 src/headerview.c:54
+#: src/compose.c:4158 src/headerview.c:54
 msgid "From:"
 msgstr "Pošiljatelj:"
 
-#: src/compose.c:4213
+#: src/compose.c:4232
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/_Orodja/Deja_nja"
 
-#: src/compose.c:4216
+#: src/compose.c:4235
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/_Sporočilo/_Enkripcija"
 
-#: src/compose.c:4254 src/compose.c:5332
+#: src/compose.c:4273 src/compose.c:5351
 msgid "MIME type"
 msgstr "Tip MIME"
 
 #. S_COL_DATE
-#: src/compose.c:4263 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4908
+#: src/compose.c:4282 src/mimeview.c:197 src/prefs_filter_edit.c:496
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4909
 msgid "Size"
 msgstr "Velikost"
 
-#: src/compose.c:4698 src/mainwindow.c:2359 src/prefs_account_dialog.c:528
+#: src/compose.c:4717 src/mainwindow.c:2359 src/prefs_account_dialog.c:528
 #: src/prefs_common_dialog.c:661
 msgid "Send"
 msgstr "Pošlji"
 
-#: src/compose.c:4699
+#: src/compose.c:4718
 msgid "Send message"
 msgstr "Pošlji sporočilo"
 
-#: src/compose.c:4707
+#: src/compose.c:4726
 msgid "Send later"
 msgstr "Pošlji kasneje"
 
-#: src/compose.c:4708
+#: src/compose.c:4727
 msgid "Put into queue folder and send later"
 msgstr "Postavi v mapo Čakajoče in pošlji kasneje"
 
-#: src/compose.c:4716
+#: src/compose.c:4735
 msgid "Draft"
 msgstr "Osnutek"
 
-#: src/compose.c:4717
+#: src/compose.c:4736
 msgid "Save to draft folder"
 msgstr "Shrani v imenik Draft"
 
-#: src/compose.c:4727
+#: src/compose.c:4746
 msgid "Insert"
 msgstr "Vstavi"
 
-#: src/compose.c:4728
+#: src/compose.c:4747
 msgid "Insert file"
 msgstr "Vstavi datoteko"
 
-#: src/compose.c:4736
+#: src/compose.c:4755
 msgid "Attach"
 msgstr "Pripni"
 
-#: src/compose.c:4737
+#: src/compose.c:4756
 msgid "Attach file"
 msgstr "Pripni datoteko"
 
 #. signature
-#: src/compose.c:4747 src/prefs_account_dialog.c:1208
+#: src/compose.c:4766 src/prefs_account_dialog.c:1208
 #: src/prefs_common_dialog.c:953
 msgid "Signature"
 msgstr "Podpis"
 
-#: src/compose.c:4748
+#: src/compose.c:4767
 #, fuzzy
 msgid "Append signature"
 msgstr "SLAB podpis"
 
 #. editor
-#: src/compose.c:4757 src/prefs_common_dialog.c:991
+#: src/compose.c:4776 src/prefs_common_dialog.c:991
 #: src/prefs_common_dialog.c:2315
 msgid "Editor"
 msgstr "Urejevalnik"
 
-#: src/compose.c:4758
+#: src/compose.c:4777
 msgid "Edit with external editor"
 msgstr "Urejanje z zunanjim urejevalnikom"
 
-#: src/compose.c:4766
+#: src/compose.c:4785
 msgid "Linewrap"
 msgstr "Prelom vrstic"
 
-#: src/compose.c:4767
+#: src/compose.c:4786
 msgid "Wrap all long lines"
 msgstr "Prelomi vse dolge vrstice"
 
-#: src/compose.c:5228
+#: src/compose.c:5247
 msgid "Invalid MIME type."
 msgstr "Napačen tip MIME"
 
-#: src/compose.c:5246
+#: src/compose.c:5265
 msgid "File doesn't exist or is empty."
 msgstr "Datoteka ne obstaja ali pa je prazna."
 
-#: src/compose.c:5314
+#: src/compose.c:5333
 #, fuzzy
 msgid "Properties"
 msgstr "Lastnost"
 
-#: src/compose.c:5334 src/prefs_common_dialog.c:1444
+#: src/compose.c:5353 src/prefs_common_dialog.c:1444
 msgid "Encoding"
 msgstr "Nabor znakov"
 
-#: src/compose.c:5357 src/prefs_folder_item.c:202
+#: src/compose.c:5376 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Pot"
 
-#: src/compose.c:5358
+#: src/compose.c:5377
 msgid "File name"
 msgstr "Ime datoteke"
 
-#: src/compose.c:5449
+#: src/compose.c:5466
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Ukazna vrstica za zunanji urejevalnik je neveljavna: '%s'\n"
 
-#: src/compose.c:5497
+#: src/compose.c:5514
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1844,48 +1845,48 @@ msgstr ""
 "Ali naj ga prisilim k prekinitvi?\n"
 "Št. skupine procesov: %d"
 
-#: src/compose.c:5872 src/compose.c:5877 src/compose.c:5883
+#: src/compose.c:5889 src/compose.c:5894 src/compose.c:5900
 msgid "Can't queue the message."
 msgstr "Ne morem preložiti pošiljanja sporočila."
 
-#: src/compose.c:5974
+#: src/compose.c:5991
 #, fuzzy
 msgid "Select files"
 msgstr "Izberi datoteko"
 
-#: src/compose.c:5997
+#: src/compose.c:6014
 msgid "Select file"
 msgstr "Izberi datoteko"
 
-#: src/compose.c:6032
+#: src/compose.c:6049
 #, fuzzy
 msgid "Save message"
 msgstr "Pošlji sporočilo"
 
-#: src/compose.c:6033
+#: src/compose.c:6050
 #, 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:6035
+#: src/compose.c:6052
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:6077
+#: src/compose.c:6094
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Ali želite uporabiti predlogo `%s' ?"
 
-#: src/compose.c:6079
+#: src/compose.c:6096
 msgid "Apply template"
 msgstr "Uporabi predlogo"
 
-#: src/compose.c:6080
+#: src/compose.c:6097
 #, fuzzy
 msgid "_Replace"
 msgstr "Zamenjaj"
 
-#: src/compose.c:6080
+#: src/compose.c:6097
 #, fuzzy
 msgid "_Insert"
 msgstr "Vstavi"
@@ -2007,52 +2008,52 @@ msgstr "Ime skupine mora biti podano."
 msgid "Edit Group Data"
 msgstr "Urejanje podatkov o skupini"
 
-#: src/editgroup.c:300
+#: src/editgroup.c:299
 msgid "Group Name"
 msgstr "Ime skupine"
 
-#: src/editgroup.c:319
+#: src/editgroup.c:318
 msgid "Addresses in Group"
 msgstr "Naslovi v skupini"
 
-#: src/editgroup.c:321
+#: src/editgroup.c:320
 msgid " -> "
 msgstr " -> "
 
-#: src/editgroup.c:348
+#: src/editgroup.c:347
 msgid " <- "
 msgstr " <- "
 
-#: src/editgroup.c:350
+#: src/editgroup.c:349
 msgid "Available Addresses"
 msgstr "Razpoložljivi naslovi"
 
-#: src/editgroup.c:416
+#: src/editgroup.c:415
 msgid "Move E-Mail Addresses to or from Group with arrow buttons"
 msgstr "Prestavljate naslove v ali iz skupine s klikanjem na puščice"
 
-#: src/editgroup.c:468
+#: src/editgroup.c:467
 msgid "Edit Group Details"
 msgstr "Urejanje podatkov o skupini"
 
-#: src/editgroup.c:471
+#: src/editgroup.c:470
 msgid "Add New Group"
 msgstr "Dodaj novo skupino"
 
-#: src/editgroup.c:522
+#: src/editgroup.c:521
 msgid "Edit folder"
 msgstr "Urejanje mape"
 
-#: src/editgroup.c:522
+#: src/editgroup.c:521
 msgid "Input the new name of folder:"
 msgstr "Vnesite novo ime mape:"
 
-#: src/editgroup.c:525 src/foldersel.c:541 src/folderview.c:2121
+#: src/editgroup.c:524 src/foldersel.c:541 src/folderview.c:2121
 #: src/folderview.c:2127
 msgid "New folder"
 msgstr "Nova mapa"
 
-#: src/editgroup.c:526 src/foldersel.c:542 src/folderview.c:2128
+#: src/editgroup.c:525 src/foldersel.c:542 src/folderview.c:2128
 msgid "Input the name of new folder:"
 msgstr "Vnesite ime nove mape:"
 
@@ -2250,7 +2251,7 @@ msgid "`%c' can't be included in folder name."
 msgstr "Znaka '%c' ne more biti v imenu mape."
 
 #: src/foldersel.c:561 src/folderview.c:2147 src/folderview.c:2206
-#: src/query_search.c:995
+#: src/query_search.c:1031
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Mapa '%s' že obstaja."
@@ -2512,7 +2513,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:2127
+#: src/headerview.c:180 src/query_search.c:667 src/summaryview.c:2127
 msgid "(No From)"
 msgstr "(Brez pošiljatelja)"
 
@@ -2642,190 +2643,190 @@ msgstr "Končaj"
 msgid "Sylpheed: %d new messages"
 msgstr "Končano (%d novih sporočil)"
 
-#: src/inc.c:372
+#: src/inc.c:371
 msgid "Retrieving new messages"
 msgstr "Prenašam nova sporočila"
 
-#: src/inc.c:415
+#: src/inc.c:414
 msgid "Standby"
 msgstr "V pripravljenosti"
 
-#: src/inc.c:544 src/inc.c:593
+#: src/inc.c:543 src/inc.c:592
 msgid "Cancelled"
 msgstr "Preklicano"
 
-#: src/inc.c:555
+#: src/inc.c:554
 msgid "Retrieving"
 msgstr "Prenašam"
 
-#: src/inc.c:564
+#: src/inc.c:563
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "Opravljeno (%d sporočil (%s) prejetih)"
 
-#: src/inc.c:568
+#: src/inc.c:567
 msgid "Done (no new messages)"
 msgstr "Opravljeno (ni novih sporočil)"
 
-#: src/inc.c:574
+#: src/inc.c:573
 msgid "Connection failed"
 msgstr "Povezava ni uspela"
 
-#: src/inc.c:577
+#: src/inc.c:576
 msgid "Auth failed"
 msgstr "Overovitev ni uspela"
 
-#: src/inc.c:580
+#: src/inc.c:579
 msgid "Locked"
 msgstr "Zaklenjeno"
 
-#: src/inc.c:590
+#: src/inc.c:589
 #, fuzzy
 msgid "Timeout"
 msgstr "Čas izteka (sek.)"
 
-#: src/inc.c:640
+#: src/inc.c:639
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Končano (%d novih sporočil)"
 
-#: src/inc.c:643
+#: src/inc.c:642
 msgid "Finished (no new messages)"
 msgstr "Končano (ni novih sporočil)"
 
-#: src/inc.c:652
+#: src/inc.c:651
 msgid "Some errors occurred while getting mail."
 msgstr "Med prejemanjem pošte je prišlo do nekaterih napak."
 
-#: src/inc.c:688
+#: src/inc.c:687
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "sprejemam nova sporočila z računa %s...\n"
 
-#: src/inc.c:691
+#: src/inc.c:690
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Prenašam nova sporočila"
 
-#: src/inc.c:710
+#: src/inc.c:709
 #, fuzzy, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Povezujem se s strežnikom POP: %s"
 
-#: src/inc.c:719
+#: src/inc.c:718
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Ne morem se povezati s strežnikom POP: %s%d\n"
 
-#: src/inc.c:798 src/send_message.c:631
+#: src/inc.c:797 src/send_message.c:631
 msgid "Authenticating..."
 msgstr "Overovljam..."
 
-#: src/inc.c:799
+#: src/inc.c:798
 #, fuzzy, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Sprejemam sporočila iz %s v %s...\n"
 
-#: src/inc.c:804
+#: src/inc.c:803
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Ugotavljam število novih sporočil (STAT)..."
 
-#: src/inc.c:808
+#: src/inc.c:807
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Ugotavljam število novih sporočil (LAST)..."
 
-#: src/inc.c:812
+#: src/inc.c:811
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Ugotavljam število novih sporočil (UIDL)..."
 
-#: src/inc.c:816
+#: src/inc.c:815
 msgid "Getting the size of messages (LIST)..."
 msgstr "Ugotavljam velikost sporočil (LIST)..."
 
-#: src/inc.c:826
+#: src/inc.c:825
 #, c-format
 msgid "Deleting message %d"
 msgstr "Brišem sporočilo %d"
 
-#: src/inc.c:833 src/send_message.c:649
+#: src/inc.c:832 src/send_message.c:649
 msgid "Quitting"
 msgstr "Zapuščam"
 
-#: src/inc.c:858
+#: src/inc.c:857
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Prenašam sporočilo (%d / %d) (%s / %s)"
 
-#: src/inc.c:879
+#: src/inc.c:878
 #, fuzzy, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Opravljeno (%d sporočil (%s) prejetih)"
 
-#: src/inc.c:1107
+#: src/inc.c:1106
 #, fuzzy
 msgid "Connection failed."
 msgstr "Povezava ni uspela"
 
-#: src/inc.c:1113
+#: src/inc.c:1112
 msgid "Error occurred while processing mail."
 msgstr "Med obdelavo pošte je prišlo do napake."
 
-#: src/inc.c:1118
+#: src/inc.c:1117
 #, fuzzy, c-format
 msgid ""
 "Error occurred while processing mail:\n"
 "%s"
 msgstr "Med obdelavo pošte je prišlo do napake."
 
-#: src/inc.c:1124
+#: src/inc.c:1123
 msgid "No disk space left."
 msgstr "Na disku ni prostora."
 
-#: src/inc.c:1129
+#: src/inc.c:1128
 msgid "Can't write file."
 msgstr "Ne morem napisati datoteke."
 
-#: src/inc.c:1134
+#: src/inc.c:1133
 msgid "Socket error."
 msgstr "napaka v priključku."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1140 src/send_message.c:584 src/send_message.c:772
+#: src/inc.c:1139 src/send_message.c:584 src/send_message.c:772
 msgid "Connection closed by the remote host."
 msgstr ""
 
-#: src/inc.c:1146
+#: src/inc.c:1145
 msgid "Mailbox is locked."
 msgstr "Poštni predal je zaklenjen."
 
-#: src/inc.c:1150
+#: src/inc.c:1149
 #, fuzzy, c-format
 msgid ""
 "Mailbox is locked:\n"
 "%s"
 msgstr "Poštni predal je zaklenjen."
 
-#: src/inc.c:1156 src/send_message.c:757
+#: src/inc.c:1155 src/send_message.c:757
 #, fuzzy
 msgid "Authentication failed."
 msgstr "Overovitvena metoda"
 
-#: src/inc.c:1161 src/send_message.c:760
+#: src/inc.c:1160 src/send_message.c:760
 #, fuzzy, c-format
 msgid ""
 "Authentication failed:\n"
 "%s"
 msgstr "Overovitvena metoda"
 
-#: src/inc.c:1166 src/send_message.c:776
+#: src/inc.c:1165 src/send_message.c:776
 msgid "Session timed out."
 msgstr ""
 
-#: src/inc.c:1202
+#: src/inc.c:1201
 msgid "Incorporation cancelled\n"
 msgstr "Pripojitev odpovedana\n"
 
-#: src/inc.c:1285
+#: src/inc.c:1284
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Pobiram nova sporočila iz %s v %s...\n"
@@ -3310,14 +3311,15 @@ msgid "/_View/Mess_age source"
 msgstr "/_Pogled/I_zvirnik sporočila"
 
 #: src/mainwindow.c:708 src/messageview.c:245
-msgid "/_View/Show all _header"
+#, fuzzy
+msgid "/_View/Show all _headers"
 msgstr "/_Pogled/Pokaži vsa _zaglavja"
 
 #: src/mainwindow.c:710
 msgid "/_View/_Update summary"
 msgstr "/_Pogled/_Posodobi povzetek"
 
-#: src/mainwindow.c:712 src/messageview.c:247
+#: src/mainwindow.c:712 src/messageview.c:248
 msgid "/_Message"
 msgstr "/_Sporočilo"
 
@@ -3352,16 +3354,16 @@ msgstr "/_Sporočilo/Pošlji čakajoča sporoč_ila"
 
 #: src/mainwindow.c:722 src/mainwindow.c:724 src/mainwindow.c:731
 #: src/mainwindow.c:736 src/mainwindow.c:739 src/mainwindow.c:750
-#: src/mainwindow.c:752 src/mainwindow.c:755 src/messageview.c:250
-#: src/messageview.c:258 src/messageview.c:263
+#: src/mainwindow.c:752 src/mainwindow.c:755 src/messageview.c:251
+#: src/messageview.c:259 src/messageview.c:264
 msgid "/_Message/---"
 msgstr "/_Sporočilo/---"
 
-#: src/mainwindow.c:723 src/messageview.c:248
+#: src/mainwindow.c:723 src/messageview.c:249
 msgid "/_Message/Compose _new message"
 msgstr "/_Sporočilo/_Novo sporočilo"
 
-#: src/mainwindow.c:725 src/messageview.c:251
+#: src/mainwindow.c:725 src/messageview.c:252
 msgid "/_Message/_Reply"
 msgstr "/_Sporočilo/_Odgovori"
 
@@ -3369,27 +3371,27 @@ msgstr "/_Sporočilo/_Odgovori"
 msgid "/_Message/Repl_y to"
 msgstr "/_Sporočilo/Odgovor _na"
 
-#: src/mainwindow.c:727 src/messageview.c:252
+#: src/mainwindow.c:727 src/messageview.c:253
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Sporočilo/Odgovor _na/_vsem"
 
-#: src/mainwindow.c:728 src/messageview.c:254
+#: src/mainwindow.c:728 src/messageview.c:255
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Sporočilo/Odgovori _na/_pošiljatelju"
 
-#: src/mainwindow.c:729 src/messageview.c:256
+#: src/mainwindow.c:729 src/messageview.c:257
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Sporočilo/Odgovor _na/_dopisni seznam"
 
-#: src/mainwindow.c:732 src/messageview.c:259
+#: src/mainwindow.c:732 src/messageview.c:260
 msgid "/_Message/_Forward"
 msgstr "/Sporočilo/_Posreduj"
 
-#: src/mainwindow.c:733 src/messageview.c:260
+#: src/mainwindow.c:733 src/messageview.c:261
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Sporočilo/Posreduj kot prilo_go"
 
-#: src/mainwindow.c:735 src/messageview.c:262
+#: src/mainwindow.c:735 src/messageview.c:263
 msgid "/_Message/Redirec_t"
 msgstr "/_Sporočilo/Pre_usmeri"
 
@@ -3448,7 +3450,7 @@ msgstr "/_Sporočilo/_Poberi novo pošto"
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/_Sporočilo/_Poberi novo pošto"
 
-#: src/mainwindow.c:756 src/messageview.c:264
+#: src/mainwindow.c:756 src/messageview.c:265
 msgid "/_Message/Re-_edit"
 msgstr "/_Sporočilo/Znova ur_edi"
 
@@ -3467,23 +3469,23 @@ msgstr "/_Orodja/_Filtriraj sporočila"
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Orodja/_Filtriraj sporočila"
 
-#: src/mainwindow.c:767 src/messageview.c:271
+#: src/mainwindow.c:767 src/messageview.c:272
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Orodja/_Ustvari pravilo za filtriranje"
 
-#: src/mainwindow.c:768 src/messageview.c:273
+#: src/mainwindow.c:768 src/messageview.c:274
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Orodja/_Ustvari pravilo za filtriranje/S_amodejno"
 
-#: src/mainwindow.c:770 src/messageview.c:275
+#: src/mainwindow.c:770 src/messageview.c:276
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Orodja/_Ustvari pravilo za filtriranje/po p_ošiljatelju"
 
-#: src/mainwindow.c:772 src/messageview.c:277
+#: src/mainwindow.c:772 src/messageview.c:278
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Orodja/_Ustvari pravilo za filtriranje/po _naslovniku"
 
-#: src/mainwindow.c:774 src/messageview.c:279
+#: src/mainwindow.c:774 src/messageview.c:280
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Orodja/_Ustvari pravilo za filtriranje/po _zadevi"
 
@@ -3604,7 +3606,7 @@ msgid "MainWindow: color allocation %d failed\n"
 msgstr "GlavnoOkno: alokacija barve %d ni uspela\n"
 
 #: src/mainwindow.c:1139 src/summaryview.c:2275 src/summaryview.c:2360
-#: src/summaryview.c:3907 src/summaryview.c:4036 src/summaryview.c:4394
+#: src/summaryview.c:3908 src/summaryview.c:4037 src/summaryview.c:4395
 msgid "done.\n"
 msgstr "opravljeno.\n"
 
@@ -3869,7 +3871,7 @@ msgid "Find text:"
 msgstr "Poišči besedilo:"
 
 #: src/message_search.c:153 src/prefs_search_folder.c:253
-#: src/query_search.c:326
+#: src/query_search.c:343
 msgid "Case sensitive"
 msgstr "Razlikuj velike in male črke"
 
@@ -3893,27 +3895,27 @@ msgstr "Dosežen je konec sporočila. Naj nadaljujem z začetka?"
 msgid "Search finished"
 msgstr "Iskanje končano"
 
-#: src/messageview.c:268
+#: src/messageview.c:269
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/_Orodja/Doda_j pošiljatelja v adresar"
 
-#: src/messageview.c:300
+#: src/messageview.c:301
 msgid "Creating message view...\n"
 msgstr "Ustvarjam videz sporočila...\n"
 
-#: src/messageview.c:325
+#: src/messageview.c:326
 msgid "Text"
 msgstr "Besedilo"
 
-#: src/messageview.c:330
+#: src/messageview.c:331
 msgid "Attachments"
 msgstr "Priloge"
 
-#: src/messageview.c:380
+#: src/messageview.c:381
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:699 src/summaryview.c:3436
+#: src/messageview.c:700 src/summaryview.c:3436
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Ne morem odstraniti datoteke `%s'."
@@ -3931,7 +3933,7 @@ msgstr "Izvedi"
 msgid "Print"
 msgstr "Tiskanje"
 
-#: src/messageview.c:770 src/summaryview.c:3471
+#: src/messageview.c:769 src/summaryview.c:3470
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -4031,11 +4033,11 @@ msgstr ""
 "Vnesite ukazno vrstico za odpiranje datoteke:\n"
 "(`%s' se bo nadomestil z imenom datoteke)"
 
-#: src/mimeview.c:1147
+#: src/mimeview.c:1140
 msgid "Opening executable file"
 msgstr ""
 
-#: src/mimeview.c:1148
+#: src/mimeview.c:1141
 msgid ""
 "This is an executable file. Opening executable file is restricted for "
 "security.\n"
@@ -4043,11 +4045,6 @@ msgid ""
 "virus or something like a malicious program."
 msgstr ""
 
-#: src/mimeview.c:1184
-#, c-format
-msgid "MIME viewer command line is invalid: `%s'"
-msgstr "Ukazna vrstica pregledovalnika MIME je neveljavna: `%s'"
-
 #: src/passphrase.c:96
 msgid "Passphrase"
 msgstr "Šifrirna fraza"
@@ -5852,21 +5849,21 @@ msgstr "Odgovor za:"
 msgid "%s - Edit search condition"
 msgstr ""
 
-#: src/prefs_search_folder.c:209 src/query_search.c:257
+#: src/prefs_search_folder.c:209 src/query_search.c:274
 msgid "Match any of the following"
 msgstr ""
 
-#: src/prefs_search_folder.c:211 src/query_search.c:259
+#: src/prefs_search_folder.c:211 src/query_search.c:276
 #, fuzzy
 msgid "Match all of the following"
 msgstr "Samodejno nastavi sledeče naslove"
 
-#: src/prefs_search_folder.c:231 src/query_search.c:303
+#: src/prefs_search_folder.c:231 src/query_search.c:320
 #, fuzzy
 msgid "Folder:"
 msgstr "Mapa"
 
-#: src/prefs_search_folder.c:248 src/query_search.c:321
+#: src/prefs_search_folder.c:248 src/query_search.c:338
 #, fuzzy
 msgid "Search subfolders"
 msgstr "Iskanje neuspešno"
@@ -5881,17 +5878,17 @@ msgid "Attachment"
 msgstr "Priloga"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73 src/query_search.c:371 src/summaryview.c:4901
+#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4902
 msgid "Subject"
 msgstr "Zadeva"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/query_search.c:372 src/summaryview.c:4904
+#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4905
 msgid "From"
 msgstr "Od"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/query_search.c:373 src/summaryview.c:4906
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:4907
 msgid "Date"
 msgstr "Datum"
 
@@ -5984,43 +5981,43 @@ msgstr "Ustvarjam pogovorno okno napredka...\n"
 msgid "Status"
 msgstr "Status"
 
-#: src/query_search.c:234
+#: src/query_search.c:251
 msgid "Search messages"
 msgstr "Iskanje sporočil"
 
-#: src/query_search.c:395
+#: src/query_search.c:423
 #, fuzzy
 msgid "_Save as search folder"
 msgstr "Shrani v imenik Draft"
 
-#: src/query_search.c:512 src/subscribedialog.c:526 src/summaryview.c:842
+#: src/query_search.c:542 src/subscribedialog.c:526 src/summaryview.c:842
 msgid "Done."
 msgstr "Opravljeno."
 
-#: src/query_search.c:536
+#: src/query_search.c:566
 #, fuzzy, c-format
 msgid "Searching %s ..."
 msgstr "Preiskujem mapo %s ..."
 
-#: src/query_search.c:564
+#: src/query_search.c:594
 #, fuzzy, c-format
 msgid "Searching %s (%d / %d)..."
 msgstr "Filtriram..."
 
-#: src/query_search.c:645 src/summaryview.c:2051
+#: src/query_search.c:675 src/summaryview.c:2051
 msgid "(No Date)"
 msgstr "(Brez datuma)"
 
-#: src/query_search.c:833
+#: src/query_search.c:869
 #, fuzzy
 msgid "Save as search folder"
 msgstr "Shrani v imenik Draft"
 
-#: src/query_search.c:854
+#: src/query_search.c:890
 msgid "Location:"
 msgstr ""
 
-#: src/query_search.c:869
+#: src/query_search.c:905
 #, fuzzy
 msgid "Folder name:"
 msgstr "Ime datoteke"
@@ -6651,38 +6648,38 @@ msgstr "Sporočilo %d je nastavljeno za prepis v %s\n"
 msgid "Destination for copy is same as current folder."
 msgstr "Cilj prepisa je enak trenutni mapi"
 
-#: src/summaryview.c:3506
+#: src/summaryview.c:3507
 #, fuzzy
 msgid "Error occurred while processing messages."
 msgstr "Med obdelavo pošte je prišlo do napake."
 
-#: src/summaryview.c:3814 src/summaryview.c:3815
+#: src/summaryview.c:3815 src/summaryview.c:3816
 msgid "Building threads..."
 msgstr "Gradim niti..."
 
-#: src/summaryview.c:3965 src/summaryview.c:3966
+#: src/summaryview.c:3966 src/summaryview.c:3967
 msgid "Unthreading..."
 msgstr "Raznitujem..."
 
-#: src/summaryview.c:4259 src/summaryview.c:4315
+#: src/summaryview.c:4260 src/summaryview.c:4316
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtriram..."
 
-#: src/summaryview.c:4364
+#: src/summaryview.c:4365
 msgid "filtering..."
 msgstr "filtriram..."
 
-#: src/summaryview.c:4365
+#: src/summaryview.c:4366
 msgid "Filtering..."
 msgstr "Filtriram..."
 
-#: src/summaryview.c:4401
+#: src/summaryview.c:4402
 #, fuzzy, c-format
 msgid "%d message(s) have been filtered."
 msgstr "sporočilo %d je že v predpomnilniku.\n"
 
-#: src/summaryview.c:4910
+#: src/summaryview.c:4911
 msgid "No."
 msgstr "Ne."
 
@@ -6772,6 +6769,9 @@ msgstr "Končaj"
 msgid "Sylpheed"
 msgstr "Stari Sylpheed"
 
+#~ msgid "MIME viewer command line is invalid: `%s'"
+#~ msgstr "Ukazna vrstica pregledovalnika MIME je neveljavna: `%s'"
+
 #~ msgid "Wrap before sending"
 #~ msgstr "Prelomi pred pošiljanjem"
 
diff --git a/po/sr.po b/po/sr.po
index 77d69a6e..f8b2ea37 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-03-02 19:03+0900\n"
+"POT-Creation-Date: 2006-03-10 16:06+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:491
+#: libsylph/prefs_common.c:496
 #, fuzzy
 msgid "Junk mail filter"
 msgstr "Direktorijum"
@@ -527,7 +527,7 @@ msgstr "ne mogu otvoriti obeleženu datoteku\n"
 msgid "can't fetch message %d\n"
 msgstr "ne mogu dohvatiti poruku %d\n"
 
-#: libsylph/procmsg.c:1375
+#: libsylph/procmsg.c:1378
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Naredba za štampanje nije dobra: `%s'\n"
@@ -606,12 +606,12 @@ msgstr "  Tema: %s\n"
 msgid "  Issuer: %s\n"
 msgstr "  Izdavač: %s\n"
 
-#: libsylph/utils.c:2411 src/compose.c:2869 src/compose.c:3132
-#: src/compose.c:3195 src/compose.c:3315
+#: libsylph/utils.c:2430 src/compose.c:2888 src/compose.c:3151
+#: src/compose.c:3214 src/compose.c:3334
 msgid "can't change file mode\n"
 msgstr "ne mogu promeniti atribut datoteke\n"
 
-#: libsylph/utils.c:2418 libsylph/utils.c:2542
+#: libsylph/utils.c:2437 libsylph/utils.c:2561
 #, c-format
 msgid "writing to %s failed.\n"
 msgstr "pisanje u %s nije uspelo.\n"
@@ -693,8 +693,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:493
-#: src/compose.c:4273 src/editaddress.c:200 src/editaddress.c:942
+#: src/account_dialog.c:366 src/addressadd.c:192 src/addressbook.c:491
+#: src/compose.c:4292 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 ""
 msgid "Add Address to Book"
 msgstr "Dodaj adresu u adresar"
 
-#: src/addressadd.c:202 src/compose.c:4777 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4796 src/editaddress.c:201
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "Adresa"
 
-#: src/addressadd.c:212 src/addressbook.c:495 src/editaddress.c:202
+#: src/addressadd.c:212 src/addressbook.c:493 src/editaddress.c:202
 #: src/editaddress.c:795 src/editaddress.c:860 src/editgroup.c:267
 msgid "Remarks"
 msgstr "Beleške"
@@ -844,110 +844,111 @@ msgstr "Beleške"
 msgid "Select Address Book Folder"
 msgstr "Odaberite direktorijum adresara"
 
-#: src/addressbook.c:338 src/compose.c:515 src/mainwindow.c:489
+#: src/addressbook.c:337 src/compose.c:515 src/mainwindow.c:489
 #: src/messageview.c:140
 msgid "/_File"
 msgstr "/_Datoteka"
 
-#: src/addressbook.c:339
+#: src/addressbook.c:338
 msgid "/_File/New _Book"
 msgstr "/_Datoteka/Nova _knjiga"
 
-#: src/addressbook.c:340
+#: src/addressbook.c:339
 msgid "/_File/New _vCard"
 msgstr "/_Datoteka/Nova _vCard"
 
-#: src/addressbook.c:342
+#: src/addressbook.c:341
 msgid "/_File/New _JPilot"
 msgstr "/_Datoteka/Novi _JPilot"
 
-#: src/addressbook.c:345
-msgid "/_File/New _Server"
+#: src/addressbook.c:344
+#, fuzzy
+msgid "/_File/New _LDAP Server"
 msgstr "/_Datoteka/Novi _server"
 
-#: src/addressbook.c:347 src/addressbook.c:350 src/compose.c:520
+#: src/addressbook.c:346 src/addressbook.c:349 src/compose.c:520
 #: src/compose.c:525 src/compose.c:528 src/compose.c:531 src/mainwindow.c:507
 #: src/mainwindow.c:510 src/mainwindow.c:512 src/mainwindow.c:515
 #: src/mainwindow.c:517 src/messageview.c:143
 msgid "/_File/---"
 msgstr "/_Datoteka/---"
 
-#: src/addressbook.c:348
+#: src/addressbook.c:347
 msgid "/_File/_Edit"
 msgstr "/_Datoteka/_Izmeni"
 
-#: src/addressbook.c:349
+#: src/addressbook.c:348
 msgid "/_File/_Delete"
 msgstr "/_Datoteka/_Obriši"
 
-#: src/addressbook.c:351
+#: src/addressbook.c:350
 msgid "/_File/_Save"
 msgstr "/_Datoteka/_Sačuvaj"
 
-#: src/addressbook.c:352 src/compose.c:532 src/messageview.c:144
+#: src/addressbook.c:351 src/compose.c:532 src/messageview.c:144
 msgid "/_File/_Close"
 msgstr "/_Datoteka/_Zatvori"
 
-#: src/addressbook.c:353
+#: src/addressbook.c:352
 msgid "/_Address"
 msgstr "/_Adresa"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:353
 msgid "/_Address/New _Address"
 msgstr "/_Adresa/Nova _adresa"
 
-#: src/addressbook.c:355
+#: src/addressbook.c:354
 msgid "/_Address/New _Group"
 msgstr "/_Adresa/Nova _grupa"
 
-#: src/addressbook.c:356
+#: src/addressbook.c:355
 msgid "/_Address/New _Folder"
 msgstr "/_Adresa/Novi _direktorijum"
 
-#: src/addressbook.c:357
+#: src/addressbook.c:356
 msgid "/_Address/---"
 msgstr "/_Adresa/---"
 
-#: src/addressbook.c:358
+#: src/addressbook.c:357
 msgid "/_Address/_Edit"
 msgstr "/_Adresa/_Izmeni"
 
-#: src/addressbook.c:359
+#: src/addressbook.c:358
 msgid "/_Address/_Delete"
 msgstr "/_Adresa/O_briši"
 
-#: src/addressbook.c:360 src/compose.c:645 src/mainwindow.c:758
-#: src/messageview.c:266
+#: src/addressbook.c:359 src/compose.c:645 src/mainwindow.c:758
+#: src/messageview.c:267
 msgid "/_Tools"
 msgstr "/_Alati"
 
-#: src/addressbook.c:361
+#: src/addressbook.c:360
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Datoteka/Unesi _LDIF datoteku"
 
-#: src/addressbook.c:362 src/compose.c:666 src/mainwindow.c:812
-#: src/messageview.c:286
+#: src/addressbook.c:361 src/compose.c:666 src/mainwindow.c:812
+#: src/messageview.c:287
 msgid "/_Help"
 msgstr "/_Pomoć"
 
-#: src/addressbook.c:363 src/compose.c:667 src/mainwindow.c:824
-#: src/messageview.c:287
+#: src/addressbook.c:362 src/compose.c:667 src/mainwindow.c:824
+#: src/messageview.c:288
 msgid "/_Help/_About"
 msgstr "/_Pomoć/_O"
 
-#: src/addressbook.c:382 src/addressbook.c:392
+#: src/addressbook.c:381 src/addressbook.c:391
 msgid "/New _Address"
 msgstr "/Nova _adresa"
 
-#: src/addressbook.c:383 src/addressbook.c:393
+#: src/addressbook.c:382 src/addressbook.c:392
 msgid "/New _Group"
 msgstr "/Nova _grupa"
 
-#: src/addressbook.c:384 src/addressbook.c:394
+#: src/addressbook.c:383 src/addressbook.c:393
 msgid "/New _Folder"
 msgstr "/Novi _direktorijum"
 
-#: src/addressbook.c:385 src/addressbook.c:395 src/compose.c:509
+#: src/addressbook.c:384 src/addressbook.c:394 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
@@ -957,70 +958,70 @@ msgstr "/Novi _direktorijum"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:386 src/addressbook.c:396 src/compose.c:534
+#: src/addressbook.c:385 src/addressbook.c:395 src/compose.c:534
 #: src/mainwindow.c:521 src/messageview.c:146
 msgid "/_Edit"
 msgstr "/_Izmeni"
 
-#: src/addressbook.c:387 src/addressbook.c:397 src/summaryview.c:434
+#: src/addressbook.c:386 src/addressbook.c:396 src/summaryview.c:434
 msgid "/_Delete"
 msgstr "/_Obriši"
 
-#: src/addressbook.c:494
+#: src/addressbook.c:492
 msgid "E-Mail address"
 msgstr "Adresa e-pošte"
 
-#: src/addressbook.c:498 src/compose.c:4778 src/prefs_common_dialog.c:2183
+#: src/addressbook.c:496 src/compose.c:4797 src/prefs_common_dialog.c:2183
 msgid "Address book"
 msgstr "Adresar"
 
-#: src/addressbook.c:600 src/prefs_filter_edit.c:249
+#: src/addressbook.c:603 src/prefs_filter_edit.c:249
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "Ime:"
 
 #. Buttons
-#: src/addressbook.c:632 src/addressbook.c:1684 src/editaddress.c:884
+#: src/addressbook.c:636 src/addressbook.c:1678 src/editaddress.c:884
 #: src/editaddress.c:1017 src/mainwindow.c:2426 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:635 src/editaddress.c:890 src/editaddress.c:1023
+#: src/addressbook.c:639 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:1552
 msgid "Add"
 msgstr "Dodaj"
 
-#: src/addressbook.c:638
+#: src/addressbook.c:642
 msgid "Lookup"
 msgstr "Potraži"
 
-#: src/addressbook.c:650 src/headerview.c:55 src/prefs_folder_item.c:339
+#: src/addressbook.c:654 src/headerview.c:55 src/prefs_folder_item.c:339
 #: src/prefs_template.c:176
 msgid "To:"
 msgstr "Za:"
 
-#: src/addressbook.c:654 src/prefs_folder_item.c:356 src/prefs_template.c:178
+#: src/addressbook.c:658 src/prefs_folder_item.c:356 src/prefs_template.c:178
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:658 src/prefs_folder_item.c:367
+#: src/addressbook.c:662 src/prefs_folder_item.c:367
 msgid "Bcc:"
 msgstr "Bcc:"
 
 #. Confirm deletion
-#: src/addressbook.c:845
+#: src/addressbook.c:832
 msgid "Delete address(es)"
 msgstr "Obriši adresu/e"
 
-#: src/addressbook.c:846
+#: src/addressbook.c:833
 msgid "Really delete the address(es)?"
 msgstr "Zaista obrisati adresu/e?"
 
-#: src/addressbook.c:1675
+#: src/addressbook.c:1669
 #, fuzzy, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1030,38 +1031,38 @@ msgstr ""
 "Ako brišete samo direktorijum, adrese će biti premeštene u prethodni "
 "direktorijum."
 
-#: src/addressbook.c:1678 src/folderview.c:2372
+#: src/addressbook.c:1672 src/folderview.c:2372
 msgid "Delete folder"
 msgstr "Obriši direktorijum"
 
-#: src/addressbook.c:1678
+#: src/addressbook.c:1672
 #, fuzzy
 msgid "_Folder only"
 msgstr "Samo direktorijum"
 
-#: src/addressbook.c:1678
+#: src/addressbook.c:1672
 #, fuzzy
 msgid "Folder and _addresses"
 msgstr "Direktorijum i adrese"
 
-#: src/addressbook.c:1683
+#: src/addressbook.c:1677
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Zaista obrisati `%s' ?"
 
-#: src/addressbook.c:2369 src/addressbook.c:2502
+#: src/addressbook.c:2363 src/addressbook.c:2496
 msgid "New user, could not save index file."
 msgstr "Novi korisnik, ne mogu sačuvati index datoteku."
 
-#: src/addressbook.c:2373 src/addressbook.c:2506
+#: src/addressbook.c:2367 src/addressbook.c:2500
 msgid "New user, could not save address book files."
 msgstr "Novi korisnik, ne mogu sačuvati datoteke adresara."
 
-#: src/addressbook.c:2383 src/addressbook.c:2516
+#: src/addressbook.c:2377 src/addressbook.c:2510
 msgid "Old address book converted successfully."
 msgstr "Stari adresar uspešno prebačen."
 
-#: src/addressbook.c:2388
+#: src/addressbook.c:2382
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1069,7 +1070,7 @@ msgstr ""
 "Stari adresar ne može biti prebačen,\n"
 "ne mogu sačuvati novu index datoteku adresara."
 
-#: src/addressbook.c:2401
+#: src/addressbook.c:2395
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1077,7 +1078,7 @@ msgstr ""
 "Ne mogu prebaciti adesar,\n"
 "ali sam kreirao nove prazne datoteke adresara."
 
-#: src/addressbook.c:2407
+#: src/addressbook.c:2401
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1085,7 +1086,7 @@ msgstr ""
 "Ne mogu prebaciti adresar,\n"
 "ne mogu napraviti nove datoteke adresara."
 
-#: src/addressbook.c:2412
+#: src/addressbook.c:2406
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1093,84 +1094,84 @@ msgstr ""
 "Ne mogu prebaciti adresar,\n"
 "i ne mogu napraviti nove datoteke adresara."
 
-#: src/addressbook.c:2419
+#: src/addressbook.c:2413
 msgid "Addressbook conversion error"
 msgstr "Greška pri prebacivanju adresara"
 
-#: src/addressbook.c:2423
+#: src/addressbook.c:2417
 msgid "Addressbook conversion"
 msgstr "Prebacivanje adresara"
 
-#: src/addressbook.c:2458
+#: src/addressbook.c:2452
 msgid "Addressbook Error"
 msgstr "Greška adresara"
 
-#: src/addressbook.c:2459 src/addressbook.c:2559
+#: src/addressbook.c:2453 src/addressbook.c:2553
 msgid "Could not read address index"
 msgstr "Ne mogu čitati index adresara"
 
-#: src/addressbook.c:2521
+#: src/addressbook.c:2515
 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:2535
+#: src/addressbook.c:2529
 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:2541
+#: src/addressbook.c:2535
 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:2547
+#: src/addressbook.c:2541
 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:2565
+#: src/addressbook.c:2559
 msgid "Addressbook Conversion Error"
 msgstr "Greška pri unosu adresara"
 
-#: src/addressbook.c:2571
+#: src/addressbook.c:2565
 msgid "Addressbook Conversion"
 msgstr "Unos adresara"
 
-#: src/addressbook.c:3086 src/prefs_common_dialog.c:2033
+#: src/addressbook.c:3080 src/prefs_common_dialog.c:2033
 msgid "Interface"
 msgstr "Izgled programa"
 
-#: src/addressbook.c:3102 src/importldif.c:514
+#: src/addressbook.c:3096 src/importldif.c:514
 msgid "Address Book"
 msgstr "Adresar"
 
-#: src/addressbook.c:3118
+#: src/addressbook.c:3112
 msgid "Person"
 msgstr "Osoba"
 
-#: src/addressbook.c:3134
+#: src/addressbook.c:3128
 msgid "EMail Address"
 msgstr "Adresa e-pošte"
 
-#: src/addressbook.c:3150
+#: src/addressbook.c:3144
 msgid "Group"
 msgstr "Grupa"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3166 src/folderview.c:367 src/prefs_account_dialog.c:1694
-#: src/query_search.c:370
+#: src/addressbook.c:3160 src/folderview.c:367 src/prefs_account_dialog.c:1694
+#: src/query_search.c:398
 msgid "Folder"
 msgstr "Direktorijum"
 
-#: src/addressbook.c:3182
+#: src/addressbook.c:3176
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3198 src/addressbook.c:3214
+#: src/addressbook.c:3192 src/addressbook.c:3208
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3230
+#: src/addressbook.c:3224
 msgid "LDAP Server"
 msgstr "LDAP Server"
 
@@ -1182,7 +1183,7 @@ msgstr "Uobičajene adrese"
 msgid "Personal address"
 msgstr "Lične adrese"
 
-#: src/alertpanel.c:142 src/compose.c:5500 src/main.c:621
+#: src/alertpanel.c:142 src/compose.c:5517 src/main.c:621
 msgid "Notice"
 msgstr "Obaveštenje"
 
@@ -1190,7 +1191,7 @@ msgstr "Obaveštenje"
 msgid "Warning"
 msgstr "Upozorenje"
 
-#: src/alertpanel.c:168 src/inc.c:587
+#: src/alertpanel.c:168 src/inc.c:586
 msgid "Error"
 msgstr "Greška"
 
@@ -1233,7 +1234,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:4761
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4762
 msgid "None"
 msgstr "Ništa"
 
@@ -1512,7 +1513,7 @@ msgstr "/_Pregled/_Znakovni standard/Thai (TIS-620)"
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Pregled/_Znakovni standard/Thai (Windows-874)"
 
-#: src/compose.c:646 src/mainwindow.c:759 src/messageview.c:267
+#: src/compose.c:646 src/mainwindow.c:759 src/messageview.c:268
 msgid "/_Tools/_Address book"
 msgstr "/_Alat/_Adresar"
 
@@ -1520,14 +1521,14 @@ msgstr "/_Alat/_Adresar"
 msgid "/_Tools/_Template"
 msgstr "/_Alat/_Šablon"
 
-#: src/compose.c:649 src/mainwindow.c:783 src/messageview.c:283
+#: src/compose.c:649 src/mainwindow.c:783 src/messageview.c:284
 msgid "/_Tools/Actio_ns"
 msgstr "/_Alat/Akci_je"
 
 #: src/compose.c:651 src/compose.c:655 src/compose.c:661 src/mainwindow.c:762
 #: src/mainwindow.c:776 src/mainwindow.c:781 src/mainwindow.c:784
-#: src/mainwindow.c:788 src/mainwindow.c:790 src/messageview.c:270
-#: src/messageview.c:282
+#: src/mainwindow.c:788 src/mainwindow.c:790 src/messageview.c:271
+#: src/messageview.c:283
 msgid "/_Tools/---"
 msgstr "/_Alati/---"
 
@@ -1556,80 +1557,80 @@ msgstr "/_Alati/_Izvrši"
 msgid "/_Tools/_Set spell language"
 msgstr "/_Alat/_Šablon"
 
-#: src/compose.c:910
+#: src/compose.c:912
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: datoteka ne postoji\n"
 
-#: src/compose.c:1014 src/compose.c:1085
+#: src/compose.c:1016 src/compose.c:1087
 msgid "Can't get text part\n"
 msgstr "Ne mogu dobiti deo teksta\n"
 
-#: src/compose.c:1486
+#: src/compose.c:1488
 msgid "Quote mark format error."
 msgstr "Greška u formatu citata."
 
-#: src/compose.c:1498
+#: src/compose.c:1500
 msgid "Message reply/forward format error."
 msgstr "Greška u poruci odgovori/prosledi."
 
-#: src/compose.c:1918
+#: src/compose.c:1935
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Datoteka %s ne postoji\n"
 
-#: src/compose.c:1922
+#: src/compose.c:1939
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Ne mogu dobiti veličinu datoteke %s\n"
 
-#: src/compose.c:1926
+#: src/compose.c:1943
 #, c-format
 msgid "File %s is empty."
 msgstr "Datoteka %s je prazna."
 
-#: src/compose.c:1930
+#: src/compose.c:1947
 #, c-format
 msgid "Can't read %s."
 msgstr "Ne mogu pročitati %s."
 
-#: src/compose.c:1963
+#: src/compose.c:1980
 #, c-format
 msgid "Message: %s"
 msgstr "Poruka: %s"
 
-#: src/compose.c:2023 src/mimeview.c:565
+#: src/compose.c:2040 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:2507 src/headerview.c:195 src/query_search.c:636
+#: src/compose.c:2524 src/headerview.c:195 src/query_search.c:666
 #: src/summaryview.c:2124
 msgid "(No Subject)"
 msgstr "(Bez teme)"
 
-#: src/compose.c:2510
+#: src/compose.c:2527
 #, fuzzy, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Pisanje poruke%s"
 
-#: src/compose.c:2623
+#: src/compose.c:2642
 msgid "Recipient is not specified."
 msgstr "Primalac nije upisan."
 
-#: src/compose.c:2631
+#: src/compose.c:2650
 #, fuzzy
 msgid "Empty subject"
 msgstr "Tema"
 
-#: src/compose.c:2632
+#: src/compose.c:2651
 msgid "Subject is empty. Send it anyway?"
 msgstr "Tema je prazna. Ipak poslati?"
 
-#: src/compose.c:2691
+#: src/compose.c:2710
 msgid "can't get recipient list."
 msgstr "ne mogu dobiti listu prilmalaca."
 
-#: src/compose.c:2711
+#: src/compose.c:2730
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1637,22 +1638,22 @@ msgstr ""
 "Nalog za slanje pošte nije definisan.\n"
 "Odaberite nalog pre slanja."
 
-#: src/compose.c:2725 src/send_message.c:299
+#: src/compose.c:2744 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:2767
+#: src/compose.c:2786
 msgid "Can't save the message to outbox."
 msgstr "Ne mogu sačuvati poruku u direktorijumu poslato."
 
-#: src/compose.c:2805
+#: src/compose.c:2824
 #, 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:2902
+#: src/compose.c:2921
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1662,12 +1663,12 @@ msgstr ""
 "Ne mogu promeniti kodni raspored poruke.\n"
 "Da je ipak pošaljem?"
 
-#: src/compose.c:2908
+#: src/compose.c:2927
 #, fuzzy
 msgid "Code conversion error"
 msgstr "Greška pri prebacivanju adresara"
 
-#: src/compose.c:2981
+#: src/compose.c:3000
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1676,160 +1677,160 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:2985
+#: src/compose.c:3004
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3275
+#: src/compose.c:3294
 msgid "can't remove the old message\n"
 msgstr "ne mogu skloniti staru poruku\n"
 
-#: src/compose.c:3293
+#: src/compose.c:3312
 msgid "queueing message...\n"
 msgstr "odlaganje poruke...\n"
 
-#: src/compose.c:3375
+#: src/compose.c:3394
 msgid "can't find queue folder\n"
 msgstr "ne mogu da pronađem direktorijum odloženo\n"
 
-#: src/compose.c:3382
+#: src/compose.c:3401
 msgid "can't queue the message\n"
 msgstr "ne mogu odložiti poruku\n"
 
-#: src/compose.c:3975
+#: src/compose.c:3994
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "generisan ID-poruke: %s\n"
 
-#: src/compose.c:4088
+#: src/compose.c:4107
 msgid "Creating compose window...\n"
 msgstr "Stvaranje prozora za pisanje...\n"
 
-#: src/compose.c:4139 src/headerview.c:54
+#: src/compose.c:4158 src/headerview.c:54
 msgid "From:"
 msgstr "Od:"
 
-#: src/compose.c:4213
+#: src/compose.c:4232
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/_Alat/Akci_je"
 
-#: src/compose.c:4216
+#: src/compose.c:4235
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/_Poruka/_Enkriptuj"
 
-#: src/compose.c:4254 src/compose.c:5332
+#: src/compose.c:4273 src/compose.c:5351
 msgid "MIME type"
 msgstr "MIME tip"
 
 #. S_COL_DATE
-#: src/compose.c:4263 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4908
+#: src/compose.c:4282 src/mimeview.c:197 src/prefs_filter_edit.c:496
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4909
 msgid "Size"
 msgstr "Veličina"
 
-#: src/compose.c:4698 src/mainwindow.c:2359 src/prefs_account_dialog.c:528
+#: src/compose.c:4717 src/mainwindow.c:2359 src/prefs_account_dialog.c:528
 #: src/prefs_common_dialog.c:661
 msgid "Send"
 msgstr "Pošalji"
 
-#: src/compose.c:4699
+#: src/compose.c:4718
 msgid "Send message"
 msgstr "Pošalji poruku"
 
-#: src/compose.c:4707
+#: src/compose.c:4726
 msgid "Send later"
 msgstr "Pošalji kasnije"
 
-#: src/compose.c:4708
+#: src/compose.c:4727
 msgid "Put into queue folder and send later"
 msgstr "Odloži u direktotijum odloženo i pošalji kasnije"
 
-#: src/compose.c:4716
+#: src/compose.c:4735
 msgid "Draft"
 msgstr "Nedovršeno"
 
-#: src/compose.c:4717
+#: src/compose.c:4736
 msgid "Save to draft folder"
 msgstr "Sačuvaj u direktorijum nedovršeno"
 
-#: src/compose.c:4727
+#: src/compose.c:4746
 msgid "Insert"
 msgstr "Unesi"
 
-#: src/compose.c:4728
+#: src/compose.c:4747
 msgid "Insert file"
 msgstr "Unesi datoteku"
 
-#: src/compose.c:4736
+#: src/compose.c:4755
 msgid "Attach"
 msgstr "Prikači"
 
-#: src/compose.c:4737
+#: src/compose.c:4756
 msgid "Attach file"
 msgstr "Prikači datoteku"
 
 #. signature
-#: src/compose.c:4747 src/prefs_account_dialog.c:1208
+#: src/compose.c:4766 src/prefs_account_dialog.c:1208
 #: src/prefs_common_dialog.c:953
 msgid "Signature"
 msgstr "Potpis"
 
-#: src/compose.c:4748
+#: src/compose.c:4767
 #, fuzzy
 msgid "Append signature"
 msgstr "LOŠ potpis"
 
 #. editor
-#: src/compose.c:4757 src/prefs_common_dialog.c:991
+#: src/compose.c:4776 src/prefs_common_dialog.c:991
 #: src/prefs_common_dialog.c:2315
 msgid "Editor"
 msgstr "Editor"
 
-#: src/compose.c:4758
+#: src/compose.c:4777
 msgid "Edit with external editor"
 msgstr "Izmeni sa nezavisnim ediorom"
 
-#: src/compose.c:4766
+#: src/compose.c:4785
 msgid "Linewrap"
 msgstr "Sažimanje"
 
-#: src/compose.c:4767
+#: src/compose.c:4786
 msgid "Wrap all long lines"
 msgstr "Sažmi sve duge linije"
 
-#: src/compose.c:5228
+#: src/compose.c:5247
 msgid "Invalid MIME type."
 msgstr "Pogrešan MIME tip"
 
-#: src/compose.c:5246
+#: src/compose.c:5265
 msgid "File doesn't exist or is empty."
 msgstr "Datoteka ne postoji ili je prazna."
 
-#: src/compose.c:5314
+#: src/compose.c:5333
 #, fuzzy
 msgid "Properties"
 msgstr "Svojstva"
 
-#: src/compose.c:5334 src/prefs_common_dialog.c:1444
+#: src/compose.c:5353 src/prefs_common_dialog.c:1444
 msgid "Encoding"
 msgstr "Kodiranje"
 
-#: src/compose.c:5357 src/prefs_folder_item.c:202
+#: src/compose.c:5376 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Putanja"
 
-#: src/compose.c:5358
+#: src/compose.c:5377
 msgid "File name"
 msgstr "Ime datoteke"
 
-#: src/compose.c:5449
+#: src/compose.c:5466
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Naredba za nezavisni editor je pogrešna: `%s'\n"
 
-#: src/compose.c:5497
+#: src/compose.c:5514
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1839,48 +1840,48 @@ msgstr ""
 "Nasilno prekinuti proces?\n"
 "grupa procesa: %d"
 
-#: src/compose.c:5872 src/compose.c:5877 src/compose.c:5883
+#: src/compose.c:5889 src/compose.c:5894 src/compose.c:5900
 msgid "Can't queue the message."
 msgstr "Ne mogu odložiti poruku."
 
-#: src/compose.c:5974
+#: src/compose.c:5991
 #, fuzzy
 msgid "Select files"
 msgstr "Odaberite datoteku"
 
-#: src/compose.c:5997
+#: src/compose.c:6014
 msgid "Select file"
 msgstr "Odaberite datoteku"
 
-#: src/compose.c:6032
+#: src/compose.c:6049
 #, fuzzy
 msgid "Save message"
 msgstr "Pošalji poruku"
 
-#: src/compose.c:6033
+#: src/compose.c:6050
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Ova poruka je promenjena, odbaciti?"
 
-#: src/compose.c:6035
+#: src/compose.c:6052
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:6077
+#: src/compose.c:6094
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Želite li primeniti šablon `%s'?"
 
-#: src/compose.c:6079
+#: src/compose.c:6096
 msgid "Apply template"
 msgstr "Primeni šablon"
 
-#: src/compose.c:6080
+#: src/compose.c:6097
 #, fuzzy
 msgid "_Replace"
 msgstr "Zameni"
 
-#: src/compose.c:6080
+#: src/compose.c:6097
 #, fuzzy
 msgid "_Insert"
 msgstr "Unesi"
@@ -2002,52 +2003,52 @@ msgstr "Ime grupe mora biti navedeno."
 msgid "Edit Group Data"
 msgstr "Izmeni podatke za grupu"
 
-#: src/editgroup.c:300
+#: src/editgroup.c:299
 msgid "Group Name"
 msgstr "Ime grupe"
 
-#: src/editgroup.c:319
+#: src/editgroup.c:318
 msgid "Addresses in Group"
 msgstr "Adrese u grupi"
 
-#: src/editgroup.c:321
+#: src/editgroup.c:320
 msgid " -> "
 msgstr " -> "
 
-#: src/editgroup.c:348
+#: src/editgroup.c:347
 msgid " <- "
 msgstr " <- "
 
-#: src/editgroup.c:350
+#: src/editgroup.c:349
 msgid "Available Addresses"
 msgstr "Dostupne adrese"
 
-#: src/editgroup.c:416
+#: src/editgroup.c:415
 msgid "Move E-Mail Addresses to or from Group with arrow buttons"
 msgstr "Pomerite adrese e-pošte u ili iz grupe sa strelicama"
 
-#: src/editgroup.c:468
+#: src/editgroup.c:467
 msgid "Edit Group Details"
 msgstr "Izmeni detalje grupe"
 
-#: src/editgroup.c:471
+#: src/editgroup.c:470
 msgid "Add New Group"
 msgstr "Dodaj novu grupu"
 
-#: src/editgroup.c:522
+#: src/editgroup.c:521
 msgid "Edit folder"
 msgstr "Izmeni direktorijum"
 
-#: src/editgroup.c:522
+#: src/editgroup.c:521
 msgid "Input the new name of folder:"
 msgstr "Unesite ime novog direktorijuma:"
 
-#: src/editgroup.c:525 src/foldersel.c:541 src/folderview.c:2121
+#: src/editgroup.c:524 src/foldersel.c:541 src/folderview.c:2121
 #: src/folderview.c:2127
 msgid "New folder"
 msgstr "Novi direktorijum"
 
-#: src/editgroup.c:526 src/foldersel.c:542 src/folderview.c:2128
+#: src/editgroup.c:525 src/foldersel.c:542 src/folderview.c:2128
 msgid "Input the name of new folder:"
 msgstr "Unesite ime novog direktorijuma:"
 
@@ -2245,7 +2246,7 @@ msgid "`%c' can't be included in folder name."
 msgstr "`%c' ne može biti uvršten u ime direktorijuma."
 
 #: src/foldersel.c:561 src/folderview.c:2147 src/folderview.c:2206
-#: src/query_search.c:995
+#: src/query_search.c:1031
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Direktorijum `%s' već postoji."
@@ -2507,7 +2508,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:2127
+#: src/headerview.c:180 src/query_search.c:667 src/summaryview.c:2127
 msgid "(No From)"
 msgstr "(Bez pošiljaoca)"
 
@@ -2637,190 +2638,190 @@ msgstr "Gotovo"
 msgid "Sylpheed: %d new messages"
 msgstr "Završeno (%d novih poruka)"
 
-#: src/inc.c:372
+#: src/inc.c:371
 msgid "Retrieving new messages"
 msgstr "Primam nove poruke"
 
-#: src/inc.c:415
+#: src/inc.c:414
 msgid "Standby"
 msgstr "Standby"
 
-#: src/inc.c:544 src/inc.c:593
+#: src/inc.c:543 src/inc.c:592
 msgid "Cancelled"
 msgstr "Otkazano"
 
-#: src/inc.c:555
+#: src/inc.c:554
 msgid "Retrieving"
 msgstr "Primam"
 
-#: src/inc.c:564
+#: src/inc.c:563
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "Gotovo (%d poruke/a (%s) primljeno)"
 
-#: src/inc.c:568
+#: src/inc.c:567
 msgid "Done (no new messages)"
 msgstr "Nema nepročitanih poruka"
 
-#: src/inc.c:574
+#: src/inc.c:573
 msgid "Connection failed"
 msgstr "Veza nije ostvarena"
 
-#: src/inc.c:577
+#: src/inc.c:576
 msgid "Auth failed"
 msgstr "Identifikacija nije uspela"
 
-#: src/inc.c:580
+#: src/inc.c:579
 msgid "Locked"
 msgstr "Zaključano"
 
-#: src/inc.c:590
+#: src/inc.c:589
 #, fuzzy
 msgid "Timeout"
 msgstr "Timeout (sek)"
 
-#: src/inc.c:640
+#: src/inc.c:639
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Završeno (%d novih poruka)"
 
-#: src/inc.c:643
+#: src/inc.c:642
 msgid "Finished (no new messages)"
 msgstr "Nema nepročitanih poruka"
 
-#: src/inc.c:652
+#: src/inc.c:651
 msgid "Some errors occurred while getting mail."
 msgstr "Došlo je do grešaka prilikom primanja pošte."
 
-#: src/inc.c:688
+#: src/inc.c:687
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "primam nove poruke za nalog %s...\n"
 
-#: src/inc.c:691
+#: src/inc.c:690
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Primam nove poruke"
 
-#: src/inc.c:710
+#: src/inc.c:709
 #, fuzzy, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Povezujem se na POP3 server: %s ..."
 
-#: src/inc.c:719
+#: src/inc.c:718
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Ne mogu se povezati na POP3 server: %s:%d\n"
 
-#: src/inc.c:798 src/send_message.c:631
+#: src/inc.c:797 src/send_message.c:631
 msgid "Authenticating..."
 msgstr "Prijavljujem se..."
 
-#: src/inc.c:799
+#: src/inc.c:798
 #, fuzzy, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Primam poruke sa %s u %s...\n"
 
-#: src/inc.c:804
+#: src/inc.c:803
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Preuzimam broj novih poruka (STAT)..."
 
-#: src/inc.c:808
+#: src/inc.c:807
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Preuzimam broj novih poruka (LAST)..."
 
-#: src/inc.c:812
+#: src/inc.c:811
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Preuzimam broj novih poruka (UIDL)..."
 
-#: src/inc.c:816
+#: src/inc.c:815
 msgid "Getting the size of messages (LIST)..."
 msgstr "Preuzimam veličinu poruka (LIST)..."
 
-#: src/inc.c:826
+#: src/inc.c:825
 #, c-format
 msgid "Deleting message %d"
 msgstr "Brišem poruke %d"
 
-#: src/inc.c:833 src/send_message.c:649
+#: src/inc.c:832 src/send_message.c:649
 msgid "Quitting"
 msgstr "Izlazim"
 
-#: src/inc.c:858
+#: src/inc.c:857
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Primam poruke (%d / %d) (%s / %s)"
 
-#: src/inc.c:879
+#: src/inc.c:878
 #, fuzzy, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Gotovo (%d poruke/a (%s) primljeno)"
 
-#: src/inc.c:1107
+#: src/inc.c:1106
 #, fuzzy
 msgid "Connection failed."
 msgstr "Veza nije ostvarena"
 
-#: src/inc.c:1113
+#: src/inc.c:1112
 msgid "Error occurred while processing mail."
 msgstr "Došlo je do greške pri radu s poštom."
 
-#: src/inc.c:1118
+#: src/inc.c:1117
 #, fuzzy, c-format
 msgid ""
 "Error occurred while processing mail:\n"
 "%s"
 msgstr "Došlo je do greške pri radu s poštom."
 
-#: src/inc.c:1124
+#: src/inc.c:1123
 msgid "No disk space left."
 msgstr "Nema više mesta na disku."
 
-#: src/inc.c:1129
+#: src/inc.c:1128
 msgid "Can't write file."
 msgstr "Ne mogu pisati u datoteku."
 
-#: src/inc.c:1134
+#: src/inc.c:1133
 msgid "Socket error."
 msgstr "Protokol greška."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1140 src/send_message.c:584 src/send_message.c:772
+#: src/inc.c:1139 src/send_message.c:584 src/send_message.c:772
 msgid "Connection closed by the remote host."
 msgstr ""
 
-#: src/inc.c:1146
+#: src/inc.c:1145
 msgid "Mailbox is locked."
 msgstr "Sanduče je zaključano."
 
-#: src/inc.c:1150
+#: src/inc.c:1149
 #, fuzzy, c-format
 msgid ""
 "Mailbox is locked:\n"
 "%s"
 msgstr "Sanduče je zaključano."
 
-#: src/inc.c:1156 src/send_message.c:757
+#: src/inc.c:1155 src/send_message.c:757
 #, fuzzy
 msgid "Authentication failed."
 msgstr "Način provere identieta"
 
-#: src/inc.c:1161 src/send_message.c:760
+#: src/inc.c:1160 src/send_message.c:760
 #, fuzzy, c-format
 msgid ""
 "Authentication failed:\n"
 "%s"
 msgstr "Način provere identieta"
 
-#: src/inc.c:1166 src/send_message.c:776
+#: src/inc.c:1165 src/send_message.c:776
 msgid "Session timed out."
 msgstr ""
 
-#: src/inc.c:1202
+#: src/inc.c:1201
 msgid "Incorporation cancelled\n"
 msgstr "Incorporation otkazano\n"
 
-#: src/inc.c:1285
+#: src/inc.c:1284
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Primam nove poruke od %s u %s...\n"
@@ -3306,14 +3307,15 @@ msgid "/_View/Mess_age source"
 msgstr "/_Pregled/Iz_vor poruke"
 
 #: src/mainwindow.c:708 src/messageview.c:245
-msgid "/_View/Show all _header"
+#, fuzzy
+msgid "/_View/Show all _headers"
 msgstr "/_Pregled/Prikaži kompletno _zaglavlje"
 
 #: src/mainwindow.c:710
 msgid "/_View/_Update summary"
 msgstr "/_Pregled/_Osveži rezime"
 
-#: src/mainwindow.c:712 src/messageview.c:247
+#: src/mainwindow.c:712 src/messageview.c:248
 msgid "/_Message"
 msgstr "/_Poruka"
 
@@ -3348,16 +3350,16 @@ msgstr "/_Poruka/Pošalji _odložene poruke"
 
 #: src/mainwindow.c:722 src/mainwindow.c:724 src/mainwindow.c:731
 #: src/mainwindow.c:736 src/mainwindow.c:739 src/mainwindow.c:750
-#: src/mainwindow.c:752 src/mainwindow.c:755 src/messageview.c:250
-#: src/messageview.c:258 src/messageview.c:263
+#: src/mainwindow.c:752 src/mainwindow.c:755 src/messageview.c:251
+#: src/messageview.c:259 src/messageview.c:264
 msgid "/_Message/---"
 msgstr "/_Poruka/---"
 
-#: src/mainwindow.c:723 src/messageview.c:248
+#: src/mainwindow.c:723 src/messageview.c:249
 msgid "/_Message/Compose _new message"
 msgstr "/_Poruka/Sastavi _novu poruku"
 
-#: src/mainwindow.c:725 src/messageview.c:251
+#: src/mainwindow.c:725 src/messageview.c:252
 msgid "/_Message/_Reply"
 msgstr "/_Poruka/O_dgovor"
 
@@ -3365,27 +3367,27 @@ msgstr "/_Poruka/O_dgovor"
 msgid "/_Message/Repl_y to"
 msgstr "/_Poruka/O_dgovori"
 
-#: src/mainwindow.c:727 src/messageview.c:252
+#: src/mainwindow.c:727 src/messageview.c:253
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Poruka/Odgovori/svim_a"
 
-#: src/mainwindow.c:728 src/messageview.c:254
+#: src/mainwindow.c:728 src/messageview.c:255
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Poruka/Odgovori/pošil_jaocu"
 
-#: src/mainwindow.c:729 src/messageview.c:256
+#: src/mainwindow.c:729 src/messageview.c:257
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Poruka/Odgovori/li_sti"
 
-#: src/mainwindow.c:732 src/messageview.c:259
+#: src/mainwindow.c:732 src/messageview.c:260
 msgid "/_Message/_Forward"
 msgstr "/_Poruka/_Prosledi"
 
-#: src/mainwindow.c:733 src/messageview.c:260
+#: src/mainwindow.c:733 src/messageview.c:261
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Poruka/P_rosledi kao spajalicu"
 
-#: src/mainwindow.c:735 src/messageview.c:262
+#: src/mainwindow.c:735 src/messageview.c:263
 msgid "/_Message/Redirec_t"
 msgstr "/_Poruka/Preus_meri"
 
@@ -3444,7 +3446,7 @@ msgstr "/_Poruka/Prover_i novu poštu"
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/_Poruka/Prover_i novu poštu"
 
-#: src/mainwindow.c:756 src/messageview.c:264
+#: src/mainwindow.c:756 src/messageview.c:265
 msgid "/_Message/Re-_edit"
 msgstr "/_Poruka/I_zmeni/"
 
@@ -3463,23 +3465,23 @@ msgstr "/_Alati/_Filtriraj poruke"
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Alati/_Filtriraj poruke"
 
-#: src/mainwindow.c:767 src/messageview.c:271
+#: src/mainwindow.c:767 src/messageview.c:272
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Alati/_Napravi pravilo za filtriranje"
 
-#: src/mainwindow.c:768 src/messageview.c:273
+#: src/mainwindow.c:768 src/messageview.c:274
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Alati/_Napravi pravilo za filtriranje/_Automatski"
 
-#: src/mainwindow.c:770 src/messageview.c:275
+#: src/mainwindow.c:770 src/messageview.c:276
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Alati/_Napravi pravilo za filtriranje/Po _Od"
 
-#: src/mainwindow.c:772 src/messageview.c:277
+#: src/mainwindow.c:772 src/messageview.c:278
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Alati/_Napravi pravilo za filtriranje/Po _Za"
 
-#: src/mainwindow.c:774 src/messageview.c:279
+#: src/mainwindow.c:774 src/messageview.c:280
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Alati/_Napravi pravilo za filtriranje/Po _temi"
 
@@ -3600,7 +3602,7 @@ msgid "MainWindow: color allocation %d failed\n"
 msgstr "Glavni Prozor: prikaz boje %d nije uspeo\n"
 
 #: src/mainwindow.c:1139 src/summaryview.c:2275 src/summaryview.c:2360
-#: src/summaryview.c:3907 src/summaryview.c:4036 src/summaryview.c:4394
+#: src/summaryview.c:3908 src/summaryview.c:4037 src/summaryview.c:4395
 msgid "done.\n"
 msgstr "gotovo.\n"
 
@@ -3865,7 +3867,7 @@ msgid "Find text:"
 msgstr "Pronađi tekst:"
 
 #: src/message_search.c:153 src/prefs_search_folder.c:253
-#: src/query_search.c:326
+#: src/query_search.c:343
 msgid "Case sensitive"
 msgstr "Osjetljiv na velika/mala slova"
 
@@ -3889,27 +3891,27 @@ msgstr "Kraj liste dosegnut; nastaviti od početka?"
 msgid "Search finished"
 msgstr "Pretraga završena"
 
-#: src/messageview.c:268
+#: src/messageview.c:269
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/_Alati/Dodaj pošiljaoca u adresar"
 
-#: src/messageview.c:300
+#: src/messageview.c:301
 msgid "Creating message view...\n"
 msgstr "Pravljenje pregleda poruka...\n"
 
-#: src/messageview.c:325
+#: src/messageview.c:326
 msgid "Text"
 msgstr "Tekst"
 
-#: src/messageview.c:330
+#: src/messageview.c:331
 msgid "Attachments"
 msgstr "Dodatak"
 
-#: src/messageview.c:380
+#: src/messageview.c:381
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:699 src/summaryview.c:3436
+#: src/messageview.c:700 src/summaryview.c:3436
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Ne mogu sačuvati datoteku `%s'."
@@ -3927,7 +3929,7 @@ msgstr "Izvrši"
 msgid "Print"
 msgstr "Štampaj"
 
-#: src/messageview.c:770 src/summaryview.c:3471
+#: src/messageview.c:769 src/summaryview.c:3470
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -4027,11 +4029,11 @@ msgstr ""
 "Unesite naredbu za otvaranje datoteke:\n"
 "(`%s' je sinonim za ime datoteke)"
 
-#: src/mimeview.c:1147
+#: src/mimeview.c:1140
 msgid "Opening executable file"
 msgstr ""
 
-#: src/mimeview.c:1148
+#: src/mimeview.c:1141
 msgid ""
 "This is an executable file. Opening executable file is restricted for "
 "security.\n"
@@ -4039,11 +4041,6 @@ msgid ""
 "virus or something like a malicious program."
 msgstr ""
 
-#: src/mimeview.c:1184
-#, c-format
-msgid "MIME viewer command line is invalid: `%s'"
-msgstr "Naredba MIME nije ispravna: `%s'"
-
 #: src/passphrase.c:96
 msgid "Passphrase"
 msgstr "Lozinka"
@@ -5847,21 +5844,21 @@ msgstr "Odvovori-Na:"
 msgid "%s - Edit search condition"
 msgstr ""
 
-#: src/prefs_search_folder.c:209 src/query_search.c:257
+#: src/prefs_search_folder.c:209 src/query_search.c:274
 msgid "Match any of the following"
 msgstr ""
 
-#: src/prefs_search_folder.c:211 src/query_search.c:259
+#: src/prefs_search_folder.c:211 src/query_search.c:276
 #, fuzzy
 msgid "Match all of the following"
 msgstr "Automatski postavi sledeće adrese"
 
-#: src/prefs_search_folder.c:231 src/query_search.c:303
+#: src/prefs_search_folder.c:231 src/query_search.c:320
 #, fuzzy
 msgid "Folder:"
 msgstr "Direktorijum"
 
-#: src/prefs_search_folder.c:248 src/query_search.c:321
+#: src/prefs_search_folder.c:248 src/query_search.c:338
 #, fuzzy
 msgid "Search subfolders"
 msgstr "Traži direktorijum"
@@ -5876,17 +5873,17 @@ msgid "Attachment"
 msgstr "Dodatak"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73 src/query_search.c:371 src/summaryview.c:4901
+#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4902
 msgid "Subject"
 msgstr "Tema"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/query_search.c:372 src/summaryview.c:4904
+#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4905
 msgid "From"
 msgstr "Od"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/query_search.c:373 src/summaryview.c:4906
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:4907
 msgid "Date"
 msgstr "Datum"
 
@@ -5979,44 +5976,44 @@ msgstr "Stvaranje dijaloga napretka...\n"
 msgid "Status"
 msgstr "Status"
 
-#: src/query_search.c:234
+#: src/query_search.c:251
 msgid "Search messages"
 msgstr "Pretraži poruke"
 
-#: src/query_search.c:395
+#: src/query_search.c:423
 #, fuzzy
 msgid "_Save as search folder"
 msgstr "Traži direktorijum"
 
-#: src/query_search.c:512 src/subscribedialog.c:526 src/summaryview.c:842
+#: src/query_search.c:542 src/subscribedialog.c:526 src/summaryview.c:842
 msgid "Done."
 msgstr "Gotovo."
 
-#: src/query_search.c:536
+#: src/query_search.c:566
 #, fuzzy, c-format
 msgid "Searching %s ..."
 msgstr "Pretražujem direktorijum %s ..."
 
-#: src/query_search.c:564
+#: src/query_search.c:594
 #, fuzzy, c-format
 msgid "Searching %s (%d / %d)..."
 msgstr "Filtriranje..."
 
-#: src/query_search.c:645 src/summaryview.c:2051
+#: src/query_search.c:675 src/summaryview.c:2051
 msgid "(No Date)"
 msgstr "(Nema Datuma)"
 
-#: src/query_search.c:833
+#: src/query_search.c:869
 #, fuzzy
 msgid "Save as search folder"
 msgstr "Traži direktorijum"
 
-#: src/query_search.c:854
+#: src/query_search.c:890
 #, fuzzy
 msgid "Location:"
 msgstr "Citat"
 
-#: src/query_search.c:869
+#: src/query_search.c:905
 #, fuzzy
 msgid "Folder name:"
 msgstr "Ime datoteke"
@@ -6649,38 +6646,38 @@ msgstr "Poruka %d je označena za kopiranje u %s\n"
 msgid "Destination for copy is same as current folder."
 msgstr "ODredište za kopiranje je isto kao i trenutni direktorijum."
 
-#: src/summaryview.c:3506
+#: src/summaryview.c:3507
 #, fuzzy
 msgid "Error occurred while processing messages."
 msgstr "Došlo je do greške pri radu s poštom."
 
-#: src/summaryview.c:3814 src/summaryview.c:3815
+#: src/summaryview.c:3815 src/summaryview.c:3816
 msgid "Building threads..."
 msgstr "Izgrađivanje stabla..."
 
-#: src/summaryview.c:3965 src/summaryview.c:3966
+#: src/summaryview.c:3966 src/summaryview.c:3967
 msgid "Unthreading..."
 msgstr "Rasipanje..."
 
-#: src/summaryview.c:4259 src/summaryview.c:4315
+#: src/summaryview.c:4260 src/summaryview.c:4316
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtriranje..."
 
-#: src/summaryview.c:4364
+#: src/summaryview.c:4365
 msgid "filtering..."
 msgstr "filtriranje..."
 
-#: src/summaryview.c:4365
+#: src/summaryview.c:4366
 msgid "Filtering..."
 msgstr "Filtriranje..."
 
-#: src/summaryview.c:4401
+#: src/summaryview.c:4402
 #, fuzzy, c-format
 msgid "%d message(s) have been filtered."
 msgstr "poruka %d već je prihvaćena.\n"
 
-#: src/summaryview.c:4910
+#: src/summaryview.c:4911
 msgid "No."
 msgstr "Ne."
 
@@ -6770,6 +6767,9 @@ msgstr "Izlaz"
 msgid "Sylpheed"
 msgstr "Stari Sylpheed"
 
+#~ msgid "MIME viewer command line is invalid: `%s'"
+#~ msgstr "Naredba MIME nije ispravna: `%s'"
+
 #~ msgid "Wrap before sending"
 #~ msgstr "Sažmi pre slanja"
 
diff --git a/po/sv.po b/po/sv.po
index 174681d6..22439dbf 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-03-02 19:03+0900\n"
+"POT-Creation-Date: 2006-03-10 16:06+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:491
+#: libsylph/prefs_common.c:496
 msgid "Junk mail filter"
 msgstr "Skräppostfilter"
 
@@ -523,7 +523,7 @@ msgstr "kan inte öppna markeringsfil\n"
 msgid "can't fetch message %d\n"
 msgstr "kan inte hämta meddelande %d\n"
 
-#: libsylph/procmsg.c:1375
+#: libsylph/procmsg.c:1378
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Utskriftskommando är felaktigt: \"%s\"\n"
@@ -601,12 +601,12 @@ msgstr "  Ärende:  %s\n"
 msgid "  Issuer: %s\n"
 msgstr "  Utfärdare: %s\n"
 
-#: libsylph/utils.c:2411 src/compose.c:2869 src/compose.c:3132
-#: src/compose.c:3195 src/compose.c:3315
+#: libsylph/utils.c:2430 src/compose.c:2888 src/compose.c:3151
+#: src/compose.c:3214 src/compose.c:3334
 msgid "can't change file mode\n"
 msgstr "kan inte ändra filrättigheter\n"
 
-#: libsylph/utils.c:2418 libsylph/utils.c:2542
+#: libsylph/utils.c:2437 libsylph/utils.c:2561
 #, c-format
 msgid "writing to %s failed.\n"
 msgstr "skrivning till %s misslyckades.\n"
@@ -690,8 +690,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:493
-#: src/compose.c:4273 src/editaddress.c:200 src/editaddress.c:942
+#: src/account_dialog.c:366 src/addressadd.c:192 src/addressbook.c:491
+#: src/compose.c:4292 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
@@ -827,12 +827,12 @@ msgstr "Åtgärdens användarargument"
 msgid "Add Address to Book"
 msgstr "Lägg till i adressbok"
 
-#: src/addressadd.c:202 src/compose.c:4777 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4796 src/editaddress.c:201
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "Adress"
 
-#: src/addressadd.c:212 src/addressbook.c:495 src/editaddress.c:202
+#: src/addressadd.c:212 src/addressbook.c:493 src/editaddress.c:202
 #: src/editaddress.c:795 src/editaddress.c:860 src/editgroup.c:267
 msgid "Remarks"
 msgstr "Kommentarer"
@@ -841,110 +841,111 @@ msgstr "Kommentarer"
 msgid "Select Address Book Folder"
 msgstr "Välj adressboksmapp"
 
-#: src/addressbook.c:338 src/compose.c:515 src/mainwindow.c:489
+#: src/addressbook.c:337 src/compose.c:515 src/mainwindow.c:489
 #: src/messageview.c:140
 msgid "/_File"
 msgstr "/_Arkiv"
 
-#: src/addressbook.c:339
+#: src/addressbook.c:338
 msgid "/_File/New _Book"
 msgstr "/_Arkiv/Ny _bok"
 
-#: src/addressbook.c:340
+#: src/addressbook.c:339
 msgid "/_File/New _vCard"
 msgstr "/_Arkiv/Nytt _vCard"
 
-#: src/addressbook.c:342
+#: src/addressbook.c:341
 msgid "/_File/New _JPilot"
 msgstr "/_Arkiv/Ny _JPilot"
 
-#: src/addressbook.c:345
-msgid "/_File/New _Server"
+#: src/addressbook.c:344
+#, fuzzy
+msgid "/_File/New _LDAP Server"
 msgstr "/_Arkiv/Ny _Server"
 
-#: src/addressbook.c:347 src/addressbook.c:350 src/compose.c:520
+#: src/addressbook.c:346 src/addressbook.c:349 src/compose.c:520
 #: src/compose.c:525 src/compose.c:528 src/compose.c:531 src/mainwindow.c:507
 #: src/mainwindow.c:510 src/mainwindow.c:512 src/mainwindow.c:515
 #: src/mainwindow.c:517 src/messageview.c:143
 msgid "/_File/---"
 msgstr "/_Arkiv/---"
 
-#: src/addressbook.c:348
+#: src/addressbook.c:347
 msgid "/_File/_Edit"
 msgstr "/_Arkiv/_Redigera"
 
-#: src/addressbook.c:349
+#: src/addressbook.c:348
 msgid "/_File/_Delete"
 msgstr "/_Arkiv/_Ta bort"
 
-#: src/addressbook.c:351
+#: src/addressbook.c:350
 msgid "/_File/_Save"
 msgstr "/_Arkiv/_Spara"
 
-#: src/addressbook.c:352 src/compose.c:532 src/messageview.c:144
+#: src/addressbook.c:351 src/compose.c:532 src/messageview.c:144
 msgid "/_File/_Close"
 msgstr "/_Arkiv/St_äng"
 
-#: src/addressbook.c:353
+#: src/addressbook.c:352
 msgid "/_Address"
 msgstr "/A_dress"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:353
 msgid "/_Address/New _Address"
 msgstr "/A_dress/Ny _adress"
 
-#: src/addressbook.c:355
+#: src/addressbook.c:354
 msgid "/_Address/New _Group"
 msgstr "/A_dress/Ny _grupp"
 
-#: src/addressbook.c:356
+#: src/addressbook.c:355
 msgid "/_Address/New _Folder"
 msgstr "/A_dress/Ny _mapp"
 
-#: src/addressbook.c:357
+#: src/addressbook.c:356
 msgid "/_Address/---"
 msgstr "/A_dress/---"
 
-#: src/addressbook.c:358
+#: src/addressbook.c:357
 msgid "/_Address/_Edit"
 msgstr "/A_dress/_Redigera"
 
-#: src/addressbook.c:359
+#: src/addressbook.c:358
 msgid "/_Address/_Delete"
 msgstr "/_A_dress/_Ta bort"
 
-#: src/addressbook.c:360 src/compose.c:645 src/mainwindow.c:758
-#: src/messageview.c:266
+#: src/addressbook.c:359 src/compose.c:645 src/mainwindow.c:758
+#: src/messageview.c:267
 msgid "/_Tools"
 msgstr "/V_erktyg"
 
-#: src/addressbook.c:361
+#: src/addressbook.c:360
 msgid "/_Tools/Import _LDIF file"
 msgstr "/V_erktyg/Importera _LDIF-fil"
 
-#: src/addressbook.c:362 src/compose.c:666 src/mainwindow.c:812
-#: src/messageview.c:286
+#: src/addressbook.c:361 src/compose.c:666 src/mainwindow.c:812
+#: src/messageview.c:287
 msgid "/_Help"
 msgstr "/_Hjälp"
 
-#: src/addressbook.c:363 src/compose.c:667 src/mainwindow.c:824
-#: src/messageview.c:287
+#: src/addressbook.c:362 src/compose.c:667 src/mainwindow.c:824
+#: src/messageview.c:288
 msgid "/_Help/_About"
 msgstr "/_Hjälp/_Om"
 
-#: src/addressbook.c:382 src/addressbook.c:392
+#: src/addressbook.c:381 src/addressbook.c:391
 msgid "/New _Address"
 msgstr "/Ny _adress"
 
-#: src/addressbook.c:383 src/addressbook.c:393
+#: src/addressbook.c:382 src/addressbook.c:392
 msgid "/New _Group"
 msgstr "/Ny _grupp"
 
-#: src/addressbook.c:384 src/addressbook.c:394
+#: src/addressbook.c:383 src/addressbook.c:393
 msgid "/New _Folder"
 msgstr "/Ny _mapp"
 
-#: src/addressbook.c:385 src/addressbook.c:395 src/compose.c:509
+#: src/addressbook.c:384 src/addressbook.c:394 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
@@ -954,70 +955,70 @@ msgstr "/Ny _mapp"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:386 src/addressbook.c:396 src/compose.c:534
+#: src/addressbook.c:385 src/addressbook.c:395 src/compose.c:534
 #: src/mainwindow.c:521 src/messageview.c:146
 msgid "/_Edit"
 msgstr "/_Redigera"
 
-#: src/addressbook.c:387 src/addressbook.c:397 src/summaryview.c:434
+#: src/addressbook.c:386 src/addressbook.c:396 src/summaryview.c:434
 msgid "/_Delete"
 msgstr "/_Ta bort"
 
-#: src/addressbook.c:494
+#: src/addressbook.c:492
 msgid "E-Mail address"
 msgstr "E-postadress"
 
-#: src/addressbook.c:498 src/compose.c:4778 src/prefs_common_dialog.c:2183
+#: src/addressbook.c:496 src/compose.c:4797 src/prefs_common_dialog.c:2183
 msgid "Address book"
 msgstr "Adressbok"
 
-#: src/addressbook.c:600 src/prefs_filter_edit.c:249
+#: src/addressbook.c:603 src/prefs_filter_edit.c:249
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "Namn:"
 
 #. Buttons
-#: src/addressbook.c:632 src/addressbook.c:1684 src/editaddress.c:884
+#: src/addressbook.c:636 src/addressbook.c:1678 src/editaddress.c:884
 #: src/editaddress.c:1017 src/mainwindow.c:2426 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:635 src/editaddress.c:890 src/editaddress.c:1023
+#: src/addressbook.c:639 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:1552
 msgid "Add"
 msgstr "Lägg till"
 
-#: src/addressbook.c:638
+#: src/addressbook.c:642
 msgid "Lookup"
 msgstr "Slå upp"
 
-#: src/addressbook.c:650 src/headerview.c:55 src/prefs_folder_item.c:339
+#: src/addressbook.c:654 src/headerview.c:55 src/prefs_folder_item.c:339
 #: src/prefs_template.c:176
 msgid "To:"
 msgstr "Till:"
 
-#: src/addressbook.c:654 src/prefs_folder_item.c:356 src/prefs_template.c:178
+#: src/addressbook.c:658 src/prefs_folder_item.c:356 src/prefs_template.c:178
 msgid "Cc:"
 msgstr "Kopia:"
 
-#: src/addressbook.c:658 src/prefs_folder_item.c:367
+#: src/addressbook.c:662 src/prefs_folder_item.c:367
 msgid "Bcc:"
 msgstr "Dold kopia:"
 
 #. Confirm deletion
-#: src/addressbook.c:845
+#: src/addressbook.c:832
 msgid "Delete address(es)"
 msgstr "Ta bort adress(er)"
 
-#: src/addressbook.c:846
+#: src/addressbook.c:833
 msgid "Really delete the address(es)?"
 msgstr "Vill du verkligen ta bort adress(erna)?"
 
-#: src/addressbook.c:1675
+#: src/addressbook.c:1669
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1027,36 +1028,36 @@ msgstr ""
 "Tar du bara bort mappen, kommer adresserna att flyttas\n"
 "en mapp uppåt i hierarkin."
 
-#: src/addressbook.c:1678 src/folderview.c:2372
+#: src/addressbook.c:1672 src/folderview.c:2372
 msgid "Delete folder"
 msgstr "Ta bort mapp"
 
-#: src/addressbook.c:1678
+#: src/addressbook.c:1672
 msgid "_Folder only"
 msgstr "_Endast mapp"
 
-#: src/addressbook.c:1678
+#: src/addressbook.c:1672
 msgid "Folder and _addresses"
 msgstr "Mapp och _adresser"
 
-#: src/addressbook.c:1683
+#: src/addressbook.c:1677
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Vill du verkligen ta bort \"%s\" ?"
 
-#: src/addressbook.c:2369 src/addressbook.c:2502
+#: src/addressbook.c:2363 src/addressbook.c:2496
 msgid "New user, could not save index file."
 msgstr "Ny användare, kunde inte spara indexfil."
 
-#: src/addressbook.c:2373 src/addressbook.c:2506
+#: src/addressbook.c:2367 src/addressbook.c:2500
 msgid "New user, could not save address book files."
 msgstr "Ny användare, kunde inte spara adressboksfiler."
 
-#: src/addressbook.c:2383 src/addressbook.c:2516
+#: src/addressbook.c:2377 src/addressbook.c:2510
 msgid "Old address book converted successfully."
 msgstr "Den gamla adressboken är konverterad."
 
-#: src/addressbook.c:2388
+#: src/addressbook.c:2382
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1064,7 +1065,7 @@ msgstr ""
 "Gammal adressbok konverterad,\n"
 "kunde inte spara ny adressindexfil"
 
-#: src/addressbook.c:2401
+#: src/addressbook.c:2395
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1072,7 +1073,7 @@ msgstr ""
 "Kunde inte konvertera adressbok,\n"
 "men skapade nya tomma adressboksfiler."
 
-#: src/addressbook.c:2407
+#: src/addressbook.c:2401
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1080,7 +1081,7 @@ msgstr ""
 "Kunde inte konvertera adressbok,\n"
 "kunde inte skapa nya adressboksfiler."
 
-#: src/addressbook.c:2412
+#: src/addressbook.c:2406
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1088,86 +1089,86 @@ msgstr ""
 "Kunde inte konvertera adressbok,\n"
 "och kunde inte skapa nya adressboksfiler."
 
-#: src/addressbook.c:2419
+#: src/addressbook.c:2413
 msgid "Addressbook conversion error"
 msgstr "Fel vid konvertering av adressbok"
 
-#: src/addressbook.c:2423
+#: src/addressbook.c:2417
 msgid "Addressbook conversion"
 msgstr "Adressbokskonvertering"
 
-#: src/addressbook.c:2458
+#: src/addressbook.c:2452
 msgid "Addressbook Error"
 msgstr "Adressboksfel"
 
-#: src/addressbook.c:2459 src/addressbook.c:2559
+#: src/addressbook.c:2453 src/addressbook.c:2553
 msgid "Could not read address index"
 msgstr "Kunde inte läsa adressindex"
 
-#: src/addressbook.c:2521
+#: src/addressbook.c:2515
 msgid "Old address book converted, could not save new address index file"
 msgstr "Gammal adressbok konverterad, kunde inte skapa ny adressindexfil"
 
-#: src/addressbook.c:2535
+#: src/addressbook.c:2529
 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:2541
+#: src/addressbook.c:2535
 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:2547
+#: src/addressbook.c:2541
 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:2565
+#: src/addressbook.c:2559
 msgid "Addressbook Conversion Error"
 msgstr "Fel vid konvertering av adressbok"
 
-#: src/addressbook.c:2571
+#: src/addressbook.c:2565
 msgid "Addressbook Conversion"
 msgstr "Adressbokskonvertering"
 
-#: src/addressbook.c:3086 src/prefs_common_dialog.c:2033
+#: src/addressbook.c:3080 src/prefs_common_dialog.c:2033
 msgid "Interface"
 msgstr "Gränssnitt"
 
-#: src/addressbook.c:3102 src/importldif.c:514
+#: src/addressbook.c:3096 src/importldif.c:514
 msgid "Address Book"
 msgstr "Adressbok"
 
-#: src/addressbook.c:3118
+#: src/addressbook.c:3112
 msgid "Person"
 msgstr "Person"
 
-#: src/addressbook.c:3134
+#: src/addressbook.c:3128
 msgid "EMail Address"
 msgstr "E-postadress"
 
-#: src/addressbook.c:3150
+#: src/addressbook.c:3144
 msgid "Group"
 msgstr "Grupp"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3166 src/folderview.c:367 src/prefs_account_dialog.c:1694
-#: src/query_search.c:370
+#: src/addressbook.c:3160 src/folderview.c:367 src/prefs_account_dialog.c:1694
+#: src/query_search.c:398
 msgid "Folder"
 msgstr "Mapp"
 
-#: src/addressbook.c:3182
+#: src/addressbook.c:3176
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3198 src/addressbook.c:3214
+#: src/addressbook.c:3192 src/addressbook.c:3208
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3230
+#: src/addressbook.c:3224
 msgid "LDAP Server"
 msgstr "LDAP-server"
 
@@ -1179,7 +1180,7 @@ msgstr "Vanlig adress"
 msgid "Personal address"
 msgstr "Privat adress"
 
-#: src/alertpanel.c:142 src/compose.c:5500 src/main.c:621
+#: src/alertpanel.c:142 src/compose.c:5517 src/main.c:621
 msgid "Notice"
 msgstr "Notera"
 
@@ -1187,7 +1188,7 @@ msgstr "Notera"
 msgid "Warning"
 msgstr "Varning"
 
-#: src/alertpanel.c:168 src/inc.c:587
+#: src/alertpanel.c:168 src/inc.c:586
 msgid "Error"
 msgstr "Fel"
 
@@ -1230,7 +1231,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:4761
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4762
 msgid "None"
 msgstr "Ingen"
 
@@ -1479,7 +1480,7 @@ msgstr "/_Visa/_Teckenkodning/Thai (TIS-620)"
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Visa/_Teckenkodning/Thai (Windows-874)"
 
-#: src/compose.c:646 src/mainwindow.c:759 src/messageview.c:267
+#: src/compose.c:646 src/mainwindow.c:759 src/messageview.c:268
 msgid "/_Tools/_Address book"
 msgstr "/V_erktyg/_Adressbok"
 
@@ -1487,14 +1488,14 @@ msgstr "/V_erktyg/_Adressbok"
 msgid "/_Tools/_Template"
 msgstr "/V_erktyg/_Mall"
 
-#: src/compose.c:649 src/mainwindow.c:783 src/messageview.c:283
+#: src/compose.c:649 src/mainwindow.c:783 src/messageview.c:284
 msgid "/_Tools/Actio_ns"
 msgstr "/V_erktyg/_Åtgärder"
 
 #: src/compose.c:651 src/compose.c:655 src/compose.c:661 src/mainwindow.c:762
 #: src/mainwindow.c:776 src/mainwindow.c:781 src/mainwindow.c:784
-#: src/mainwindow.c:788 src/mainwindow.c:790 src/messageview.c:270
-#: src/messageview.c:282
+#: src/mainwindow.c:788 src/mainwindow.c:790 src/messageview.c:271
+#: src/messageview.c:283
 msgid "/_Tools/---"
 msgstr "/V_erktyg/---"
 
@@ -1520,79 +1521,79 @@ msgstr "/V_erktyg/Utför _köade åtgärder"
 msgid "/_Tools/_Set spell language"
 msgstr "/V_erktyg/_Mall"
 
-#: src/compose.c:910
+#: src/compose.c:912
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: filen finns inte\n"
 
-#: src/compose.c:1014 src/compose.c:1085
+#: src/compose.c:1016 src/compose.c:1087
 msgid "Can't get text part\n"
 msgstr "Kan inte läsa textdel\n"
 
-#: src/compose.c:1486
+#: src/compose.c:1488
 msgid "Quote mark format error."
 msgstr "Citationsteckensformatfel."
 
-#: src/compose.c:1498
+#: src/compose.c:1500
 msgid "Message reply/forward format error."
 msgstr "Formatfel vid meddelandesvar eller -vidarebefordran"
 
-#: src/compose.c:1918
+#: src/compose.c:1935
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Filen %s finns inte\n"
 
-#: src/compose.c:1922
+#: src/compose.c:1939
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Kan inte läsa filstorlek på %s\n"
 
-#: src/compose.c:1926
+#: src/compose.c:1943
 #, c-format
 msgid "File %s is empty."
 msgstr "Filen %s är tom."
 
-#: src/compose.c:1930
+#: src/compose.c:1947
 #, c-format
 msgid "Can't read %s."
 msgstr "kan inte läsa %s"
 
-#: src/compose.c:1963
+#: src/compose.c:1980
 #, c-format
 msgid "Message: %s"
 msgstr "Meddelande: %s"
 
-#: src/compose.c:2023 src/mimeview.c:565
+#: src/compose.c:2040 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:2507 src/headerview.c:195 src/query_search.c:636
+#: src/compose.c:2524 src/headerview.c:195 src/query_search.c:666
 #: src/summaryview.c:2124
 msgid "(No Subject)"
 msgstr "(Inget Ämne)"
 
-#: src/compose.c:2510
+#: src/compose.c:2527
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Skriv%s"
 
-#: src/compose.c:2623
+#: src/compose.c:2642
 msgid "Recipient is not specified."
 msgstr "Mottagare är inte angiven."
 
-#: src/compose.c:2631
+#: src/compose.c:2650
 msgid "Empty subject"
 msgstr "Tomt ämne"
 
-#: src/compose.c:2632
+#: src/compose.c:2651
 msgid "Subject is empty. Send it anyway?"
 msgstr "Ämnesraden är tom. Skicka ändå?"
 
-#: src/compose.c:2691
+#: src/compose.c:2710
 msgid "can't get recipient list."
 msgstr "kan inte läsa mottagarlista"
 
-#: src/compose.c:2711
+#: src/compose.c:2730
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1600,22 +1601,22 @@ msgstr ""
 "Konto för att skicka post är inte specificerat.\n"
 "Välj ett e-postkonto innan du skickar."
 
-#: src/compose.c:2725 src/send_message.c:299
+#: src/compose.c:2744 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:2767
+#: src/compose.c:2786
 msgid "Can't save the message to outbox."
 msgstr "Kan inte spara meddelande i kö-mappen."
 
-#: src/compose.c:2805
+#: src/compose.c:2824
 #, 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:2902
+#: src/compose.c:2921
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1626,11 +1627,11 @@ msgstr ""
 "\n"
 "Skicka det som %s ändå?"
 
-#: src/compose.c:2908
+#: src/compose.c:2927
 msgid "Code conversion error"
 msgstr "Fel vid konvertering av kod"
 
-#: src/compose.c:2981
+#: src/compose.c:3000
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1643,157 +1644,157 @@ msgstr ""
 "\n"
 "Sänd det ändå?"
 
-#: src/compose.c:2985
+#: src/compose.c:3004
 msgid "Line length limit"
 msgstr "Radlängdsbegränsning"
 
-#: src/compose.c:3275
+#: src/compose.c:3294
 msgid "can't remove the old message\n"
 msgstr "kan inte ta bort det gamla meddelandet\n"
 
-#: src/compose.c:3293
+#: src/compose.c:3312
 msgid "queueing message...\n"
 msgstr "lägger meddelandet i kö...\n"
 
-#: src/compose.c:3375
+#: src/compose.c:3394
 msgid "can't find queue folder\n"
 msgstr "kan inte hitta kömapp\n"
 
-#: src/compose.c:3382
+#: src/compose.c:3401
 msgid "can't queue the message\n"
 msgstr "kan inte lägga meddelandet i kö\n"
 
-#: src/compose.c:3975
+#: src/compose.c:3994
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "skapat Meddelande-ID: %s\n"
 
-#: src/compose.c:4088
+#: src/compose.c:4107
 msgid "Creating compose window...\n"
 msgstr "Skapar skrivfönster...\n"
 
-#: src/compose.c:4139 src/headerview.c:54
+#: src/compose.c:4158 src/headerview.c:54
 msgid "From:"
 msgstr "Från:"
 
-#: src/compose.c:4213
+#: src/compose.c:4232
 msgid "PGP Sign"
 msgstr "PGP Tecken"
 
-#: src/compose.c:4216
+#: src/compose.c:4235
 msgid "PGP Encrypt"
 msgstr "PGP Kryptera"
 
-#: src/compose.c:4254 src/compose.c:5332
+#: src/compose.c:4273 src/compose.c:5351
 msgid "MIME type"
 msgstr "MIME-typ"
 
 #. S_COL_DATE
-#: src/compose.c:4263 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4908
+#: src/compose.c:4282 src/mimeview.c:197 src/prefs_filter_edit.c:496
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4909
 msgid "Size"
 msgstr "Storlek"
 
-#: src/compose.c:4698 src/mainwindow.c:2359 src/prefs_account_dialog.c:528
+#: src/compose.c:4717 src/mainwindow.c:2359 src/prefs_account_dialog.c:528
 #: src/prefs_common_dialog.c:661
 msgid "Send"
 msgstr "Skicka"
 
-#: src/compose.c:4699
+#: src/compose.c:4718
 msgid "Send message"
 msgstr "Skicka meddelande"
 
-#: src/compose.c:4707
+#: src/compose.c:4726
 msgid "Send later"
 msgstr "Skicka senare"
 
-#: src/compose.c:4708
+#: src/compose.c:4727
 msgid "Put into queue folder and send later"
 msgstr "Placera i kömapp och skicka senare"
 
-#: src/compose.c:4716
+#: src/compose.c:4735
 msgid "Draft"
 msgstr "Utkast"
 
-#: src/compose.c:4717
+#: src/compose.c:4736
 msgid "Save to draft folder"
 msgstr "Spara i utkastsmapp"
 
-#: src/compose.c:4727
+#: src/compose.c:4746
 msgid "Insert"
 msgstr "Infoga"
 
-#: src/compose.c:4728
+#: src/compose.c:4747
 msgid "Insert file"
 msgstr "Infoga fil"
 
-#: src/compose.c:4736
+#: src/compose.c:4755
 msgid "Attach"
 msgstr "Bifoga"
 
-#: src/compose.c:4737
+#: src/compose.c:4756
 msgid "Attach file"
 msgstr "Bifoga fil"
 
 #. signature
-#: src/compose.c:4747 src/prefs_account_dialog.c:1208
+#: src/compose.c:4766 src/prefs_account_dialog.c:1208
 #: src/prefs_common_dialog.c:953
 msgid "Signature"
 msgstr "Signatur"
 
-#: src/compose.c:4748
+#: src/compose.c:4767
 #, fuzzy
 msgid "Append signature"
 msgstr "FELAKTIG signatur"
 
 #. editor
-#: src/compose.c:4757 src/prefs_common_dialog.c:991
+#: src/compose.c:4776 src/prefs_common_dialog.c:991
 #: src/prefs_common_dialog.c:2315
 msgid "Editor"
 msgstr "Redigerare"
 
-#: src/compose.c:4758
+#: src/compose.c:4777
 msgid "Edit with external editor"
 msgstr "Redigera med extern redigerare"
 
-#: src/compose.c:4766
+#: src/compose.c:4785
 msgid "Linewrap"
 msgstr "Radbrytning"
 
-#: src/compose.c:4767
+#: src/compose.c:4786
 msgid "Wrap all long lines"
 msgstr "Radbryt långa rader"
 
-#: src/compose.c:5228
+#: src/compose.c:5247
 msgid "Invalid MIME type."
 msgstr "Ogiltig MIME-typ"
 
-#: src/compose.c:5246
+#: src/compose.c:5265
 msgid "File doesn't exist or is empty."
 msgstr "Filen finns inte eller är tom."
 
-#: src/compose.c:5314
+#: src/compose.c:5333
 msgid "Properties"
 msgstr "Egenskaper"
 
-#: src/compose.c:5334 src/prefs_common_dialog.c:1444
+#: src/compose.c:5353 src/prefs_common_dialog.c:1444
 msgid "Encoding"
 msgstr "Kodning"
 
-#: src/compose.c:5357 src/prefs_folder_item.c:202
+#: src/compose.c:5376 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Sökväg"
 
-#: src/compose.c:5358
+#: src/compose.c:5377
 msgid "File name"
 msgstr "Filnamn"
 
-#: src/compose.c:5449
+#: src/compose.c:5466
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Ogiltig kommandorad för extern redigerare: \"%s\"\n"
 
-#: src/compose.c:5497
+#: src/compose.c:5514
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1803,44 +1804,44 @@ msgstr ""
 "Framtvinga avslutning av processen?\n"
 "processgrupps-id: %d"
 
-#: src/compose.c:5872 src/compose.c:5877 src/compose.c:5883
+#: src/compose.c:5889 src/compose.c:5894 src/compose.c:5900
 msgid "Can't queue the message."
 msgstr "Kan inte lägga meddelandet i kö."
 
-#: src/compose.c:5974
+#: src/compose.c:5991
 msgid "Select files"
 msgstr "Välj filer"
 
-#: src/compose.c:5997
+#: src/compose.c:6014
 msgid "Select file"
 msgstr "Välj fil"
 
-#: src/compose.c:6032
+#: src/compose.c:6049
 msgid "Save message"
 msgstr "Spara meddelande"
 
-#: src/compose.c:6033
+#: src/compose.c:6050
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Detta meddelande har ändrats. Spara det till utkastmappen?"
 
-#: src/compose.c:6035
+#: src/compose.c:6052
 msgid "Close _without saving"
 msgstr "Stäng _utan att spara"
 
-#: src/compose.c:6077
+#: src/compose.c:6094
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Vill du använda mallen \"%s\" ?"
 
-#: src/compose.c:6079
+#: src/compose.c:6096
 msgid "Apply template"
 msgstr "Använd mall"
 
-#: src/compose.c:6080
+#: src/compose.c:6097
 msgid "_Replace"
 msgstr "_Ersätt"
 
-#: src/compose.c:6080
+#: src/compose.c:6097
 msgid "_Insert"
 msgstr "_Infoga"
 
@@ -1961,52 +1962,52 @@ msgstr "Ett gruppnamn måste anges."
 msgid "Edit Group Data"
 msgstr "Redigera gruppdata"
 
-#: src/editgroup.c:300
+#: src/editgroup.c:299
 msgid "Group Name"
 msgstr "Gruppnamn"
 
-#: src/editgroup.c:319
+#: src/editgroup.c:318
 msgid "Addresses in Group"
 msgstr "Adresser i grupp"
 
-#: src/editgroup.c:321
+#: src/editgroup.c:320
 msgid " -> "
 msgstr " -> "
 
-#: src/editgroup.c:348
+#: src/editgroup.c:347
 msgid " <- "
 msgstr " <- "
 
-#: src/editgroup.c:350
+#: src/editgroup.c:349
 msgid "Available Addresses"
 msgstr "Tillgängliga adresser"
 
-#: src/editgroup.c:416
+#: src/editgroup.c:415
 msgid "Move E-Mail Addresses to or from Group with arrow buttons"
 msgstr "Flytta e-postadresser till eller från grupp med pilknapparna"
 
-#: src/editgroup.c:468
+#: src/editgroup.c:467
 msgid "Edit Group Details"
 msgstr "Redigera gruppdetaljer"
 
-#: src/editgroup.c:471
+#: src/editgroup.c:470
 msgid "Add New Group"
 msgstr "Lägg till ny grupp"
 
-#: src/editgroup.c:522
+#: src/editgroup.c:521
 msgid "Edit folder"
 msgstr "Redigera mapp"
 
-#: src/editgroup.c:522
+#: src/editgroup.c:521
 msgid "Input the new name of folder:"
 msgstr "Skriv in det nya namnet på mappen:"
 
-#: src/editgroup.c:525 src/foldersel.c:541 src/folderview.c:2121
+#: src/editgroup.c:524 src/foldersel.c:541 src/folderview.c:2121
 #: src/folderview.c:2127
 msgid "New folder"
 msgstr "Ny mapp"
 
-#: src/editgroup.c:526 src/foldersel.c:542 src/folderview.c:2128
+#: src/editgroup.c:525 src/foldersel.c:542 src/folderview.c:2128
 msgid "Input the name of new folder:"
 msgstr "Skriv in namnet på den nya mappen:"
 
@@ -2203,7 +2204,7 @@ msgid "`%c' can't be included in folder name."
 msgstr "\"%c\" får inte finnas i mappnamn."
 
 #: src/foldersel.c:561 src/folderview.c:2147 src/folderview.c:2206
-#: src/query_search.c:995
+#: src/query_search.c:1031
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Mappen \"%s\" finns redan."
@@ -2462,7 +2463,7 @@ msgstr "Ämne:"
 msgid "Creating header view...\n"
 msgstr "Skapar brevhuvudvy...\n"
 
-#: src/headerview.c:180 src/query_search.c:637 src/summaryview.c:2127
+#: src/headerview.c:180 src/query_search.c:667 src/summaryview.c:2127
 msgid "(No From)"
 msgstr "(Inget Från)"
 
@@ -2592,133 +2593,133 @@ msgstr "Avsluta"
 msgid "Sylpheed: %d new messages"
 msgstr "Sylpheed: %d nya meddelanden"
 
-#: src/inc.c:372
+#: src/inc.c:371
 msgid "Retrieving new messages"
 msgstr "Hämtar nya meddelanden"
 
-#: src/inc.c:415
+#: src/inc.c:414
 msgid "Standby"
 msgstr "Vänta"
 
-#: src/inc.c:544 src/inc.c:593
+#: src/inc.c:543 src/inc.c:592
 msgid "Cancelled"
 msgstr "Avbruten"
 
-#: src/inc.c:555
+#: src/inc.c:554
 msgid "Retrieving"
 msgstr "Hämtar"
 
-#: src/inc.c:564
+#: src/inc.c:563
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "Färdig (%d meddelande(n) (%s) mottagna)"
 
-#: src/inc.c:568
+#: src/inc.c:567
 msgid "Done (no new messages)"
 msgstr "Färdig (inga nya meddelanden)"
 
-#: src/inc.c:574
+#: src/inc.c:573
 msgid "Connection failed"
 msgstr "Förbindelse misslyckades"
 
-#: src/inc.c:577
+#: src/inc.c:576
 msgid "Auth failed"
 msgstr "Autentisering misslyckades"
 
-#: src/inc.c:580
+#: src/inc.c:579
 msgid "Locked"
 msgstr "Låst"
 
-#: src/inc.c:590
+#: src/inc.c:589
 msgid "Timeout"
 msgstr "Slut på väntetid"
 
-#: src/inc.c:640
+#: src/inc.c:639
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Avslutad (%d nya meddelanden)"
 
-#: src/inc.c:643
+#: src/inc.c:642
 msgid "Finished (no new messages)"
 msgstr "Avslutad (inga nya meddelanden)"
 
-#: src/inc.c:652
+#: src/inc.c:651
 msgid "Some errors occurred while getting mail."
 msgstr "Fel uppstod vid hämtning av post."
 
-#: src/inc.c:688
+#: src/inc.c:687
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "hämtar nya meddelanden från kontot %s...\n"
 
-#: src/inc.c:691
+#: src/inc.c:690
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Hämtar nya meddelanden"
 
-#: src/inc.c:710
+#: src/inc.c:709
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Ansluter till POP3-server: %s ..."
 
-#: src/inc.c:719
+#: src/inc.c:718
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Kan inte ansluta till POP3-server: %s:%d\n"
 
-#: src/inc.c:798 src/send_message.c:631
+#: src/inc.c:797 src/send_message.c:631
 msgid "Authenticating..."
 msgstr "Autentiserar..."
 
-#: src/inc.c:799
+#: src/inc.c:798
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Hämtar meddelanden från %s..."
 
-#: src/inc.c:804
+#: src/inc.c:803
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Tar emot meddelandenas antal (STAT)..."
 
-#: src/inc.c:808
+#: src/inc.c:807
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Tar emot meddelandenas antal (LAST)..."
 
-#: src/inc.c:812
+#: src/inc.c:811
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Tar emot meddelandenas antal (UIDL)..."
 
-#: src/inc.c:816
+#: src/inc.c:815
 msgid "Getting the size of messages (LIST)..."
 msgstr "Tar emot meddelandenas storlek (LIST)..."
 
-#: src/inc.c:826
+#: src/inc.c:825
 #, c-format
 msgid "Deleting message %d"
 msgstr "Tar bort meddelande %d"
 
-#: src/inc.c:833 src/send_message.c:649
+#: src/inc.c:832 src/send_message.c:649
 msgid "Quitting"
 msgstr "Avslutar"
 
-#: src/inc.c:858
+#: src/inc.c:857
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Tar emot meddelande (%d / %d) (%s / %s)"
 
-#: src/inc.c:879
+#: src/inc.c:878
 #, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Hämtar (%d meddelande(n) (%s) mottagna)"
 
-#: src/inc.c:1107
+#: src/inc.c:1106
 msgid "Connection failed."
 msgstr "Förbindelse misslyckades."
 
-#: src/inc.c:1113
+#: src/inc.c:1112
 msgid "Error occurred while processing mail."
 msgstr "Fel uppstod när e-posten behandlades."
 
-#: src/inc.c:1118
+#: src/inc.c:1117
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2727,28 +2728,28 @@ msgstr ""
 "Fel uppstod när e-posten behandlades:\n"
 "%s"
 
-#: src/inc.c:1124
+#: src/inc.c:1123
 msgid "No disk space left."
 msgstr "Inget diskutrymme kvar."
 
-#: src/inc.c:1129
+#: src/inc.c:1128
 msgid "Can't write file."
 msgstr "Kan inte skriva fil."
 
-#: src/inc.c:1134
+#: src/inc.c:1133
 msgid "Socket error."
 msgstr "Fel på uttag (socket)."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1140 src/send_message.c:584 src/send_message.c:772
+#: src/inc.c:1139 src/send_message.c:584 src/send_message.c:772
 msgid "Connection closed by the remote host."
 msgstr "Anslutningen stängdes av fjärrvärden."
 
-#: src/inc.c:1146
+#: src/inc.c:1145
 msgid "Mailbox is locked."
 msgstr "Brevlådan är låst."
 
-#: src/inc.c:1150
+#: src/inc.c:1149
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2757,11 +2758,11 @@ msgstr ""
 "Brevlådan är låst:\n"
 "%s"
 
-#: src/inc.c:1156 src/send_message.c:757
+#: src/inc.c:1155 src/send_message.c:757
 msgid "Authentication failed."
 msgstr "Autentisering misslyckades."
 
-#: src/inc.c:1161 src/send_message.c:760
+#: src/inc.c:1160 src/send_message.c:760
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2770,15 +2771,15 @@ msgstr ""
 "Autentisering misslyckades:\n"
 "%s"
 
-#: src/inc.c:1166 src/send_message.c:776
+#: src/inc.c:1165 src/send_message.c:776
 msgid "Session timed out."
 msgstr "Sessionens väntetid tog slut."
 
-#: src/inc.c:1202
+#: src/inc.c:1201
 msgid "Incorporation cancelled\n"
 msgstr "Inkorporering avbruten\n"
 
-#: src/inc.c:1285
+#: src/inc.c:1284
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Hämtar nya meddelanden från %s till %s...\n"
@@ -3254,14 +3255,15 @@ msgid "/_View/Mess_age source"
 msgstr "/_Visa/_Meddelandekällkod"
 
 #: src/mainwindow.c:708 src/messageview.c:245
-msgid "/_View/Show all _header"
+#, fuzzy
+msgid "/_View/Show all _headers"
 msgstr "/_Visa/_Hela brevhuvudet"
 
 #: src/mainwindow.c:710
 msgid "/_View/_Update summary"
 msgstr "/_Visa/_Uppdatera summering"
 
-#: src/mainwindow.c:712 src/messageview.c:247
+#: src/mainwindow.c:712 src/messageview.c:248
 msgid "/_Message"
 msgstr "/_Meddelande"
 
@@ -3291,16 +3293,16 @@ msgstr "/_Meddelande/Skicka _köade meddelanden"
 
 #: src/mainwindow.c:722 src/mainwindow.c:724 src/mainwindow.c:731
 #: src/mainwindow.c:736 src/mainwindow.c:739 src/mainwindow.c:750
-#: src/mainwindow.c:752 src/mainwindow.c:755 src/messageview.c:250
-#: src/messageview.c:258 src/messageview.c:263
+#: src/mainwindow.c:752 src/mainwindow.c:755 src/messageview.c:251
+#: src/messageview.c:259 src/messageview.c:264
 msgid "/_Message/---"
 msgstr "/_Meddelande/---"
 
-#: src/mainwindow.c:723 src/messageview.c:248
+#: src/mainwindow.c:723 src/messageview.c:249
 msgid "/_Message/Compose _new message"
 msgstr "/_Meddelande/Skriv _nytt meddelande"
 
-#: src/mainwindow.c:725 src/messageview.c:251
+#: src/mainwindow.c:725 src/messageview.c:252
 msgid "/_Message/_Reply"
 msgstr "/_Meddelande/Sva_ra"
 
@@ -3308,27 +3310,27 @@ msgstr "/_Meddelande/Sva_ra"
 msgid "/_Message/Repl_y to"
 msgstr "/_Meddelande/_Svara till"
 
-#: src/mainwindow.c:727 src/messageview.c:252
+#: src/mainwindow.c:727 src/messageview.c:253
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Meddelande/_Svara till/a_lla"
 
-#: src/mainwindow.c:728 src/messageview.c:254
+#: src/mainwindow.c:728 src/messageview.c:255
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Meddelande/_Svara till/_avsändaren"
 
-#: src/mainwindow.c:729 src/messageview.c:256
+#: src/mainwindow.c:729 src/messageview.c:257
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Meddelande/_Svara till/_e-postlista"
 
-#: src/mainwindow.c:732 src/messageview.c:259
+#: src/mainwindow.c:732 src/messageview.c:260
 msgid "/_Message/_Forward"
 msgstr "/_Meddelande/Vi_darebefordra"
 
-#: src/mainwindow.c:733 src/messageview.c:260
+#: src/mainwindow.c:733 src/messageview.c:261
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Meddelande/Vidarebefordra som bil_aga"
 
-#: src/mainwindow.c:735 src/messageview.c:262
+#: src/mainwindow.c:735 src/messageview.c:263
 msgid "/_Message/Redirec_t"
 msgstr "/_Meddelande/_Omdirigera"
 
@@ -3385,7 +3387,7 @@ msgstr "/_Meddelande/Sätt som _skräppost"
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/_Meddelande/Sätt som inte skr_äppost"
 
-#: src/mainwindow.c:756 src/messageview.c:264
+#: src/mainwindow.c:756 src/messageview.c:265
 msgid "/_Message/Re-_edit"
 msgstr "/_Meddelande/Redigera _om"
 
@@ -3401,23 +3403,23 @@ msgstr "/V_erktyg/_Filtrera alla meddelanden i mappen"
 msgid "/_Tools/Filter _selected messages"
 msgstr "/V_erktyg/Filtrera _valda meddelanden"
 
-#: src/mainwindow.c:767 src/messageview.c:271
+#: src/mainwindow.c:767 src/messageview.c:272
 msgid "/_Tools/_Create filter rule"
 msgstr "/V_erktyg/_Skapa filterregel"
 
-#: src/mainwindow.c:768 src/messageview.c:273
+#: src/mainwindow.c:768 src/messageview.c:274
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/V_erktyg/_Skapa filterregel/_Automatiskt"
 
-#: src/mainwindow.c:770 src/messageview.c:275
+#: src/mainwindow.c:770 src/messageview.c:276
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/V_erktyg/_Skapa filterregel/genom _Från"
 
-#: src/mainwindow.c:772 src/messageview.c:277
+#: src/mainwindow.c:772 src/messageview.c:278
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/V_erktyg/_Skapa filterregel/genom _Till"
 
-#: src/mainwindow.c:774 src/messageview.c:279
+#: src/mainwindow.c:774 src/messageview.c:280
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/V_erktyg/_Skapa filterregel/genom _Ämne"
 
@@ -3536,7 +3538,7 @@ msgid "MainWindow: color allocation %d failed\n"
 msgstr "Huvudfönster: färgtilldelning %d misslyckades\n"
 
 #: src/mainwindow.c:1139 src/summaryview.c:2275 src/summaryview.c:2360
-#: src/summaryview.c:3907 src/summaryview.c:4036 src/summaryview.c:4394
+#: src/summaryview.c:3908 src/summaryview.c:4037 src/summaryview.c:4395
 msgid "done.\n"
 msgstr "färdigt.\n"
 
@@ -3794,7 +3796,7 @@ msgid "Find text:"
 msgstr "Söktext:"
 
 #: src/message_search.c:153 src/prefs_search_folder.c:253
-#: src/query_search.c:326
+#: src/query_search.c:343
 msgid "Case sensitive"
 msgstr "Skiftlägeskänslig"
 
@@ -3818,27 +3820,27 @@ msgstr "Slutet av meddelandet nått; fortsätta från början?"
 msgid "Search finished"
 msgstr "Sökning klar"
 
-#: src/messageview.c:268
+#: src/messageview.c:269
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/V_erktyg/Lägg till avsändaren i adressbo_ken"
 
-#: src/messageview.c:300
+#: src/messageview.c:301
 msgid "Creating message view...\n"
 msgstr "Skapar meddelandevy...\n"
 
-#: src/messageview.c:325
+#: src/messageview.c:326
 msgid "Text"
 msgstr "Text"
 
-#: src/messageview.c:330
+#: src/messageview.c:331
 msgid "Attachments"
 msgstr "Bilagor"
 
-#: src/messageview.c:380
+#: src/messageview.c:381
 msgid "Message View - Sylpheed"
 msgstr "Meddelandevy - Sylpheed"
 
-#: src/messageview.c:699 src/summaryview.c:3436
+#: src/messageview.c:700 src/summaryview.c:3436
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Kan inte spara filen \"%s\"."
@@ -3855,7 +3857,7 @@ msgstr "(Förvalt utskriftkommando)"
 msgid "Print"
 msgstr "Skriv ut"
 
-#: src/messageview.c:770 src/summaryview.c:3471
+#: src/messageview.c:769 src/summaryview.c:3470
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -3950,11 +3952,11 @@ msgstr ""
 "Skriv in kommandot för att öppna filen:\n"
 "(\"%s\" kommer att ersättas med filnamnet)"
 
-#: src/mimeview.c:1147
+#: src/mimeview.c:1140
 msgid "Opening executable file"
 msgstr "Öppnande av körbar fil"
 
-#: src/mimeview.c:1148
+#: src/mimeview.c:1141
 msgid ""
 "This is an executable file. Opening executable file is restricted for "
 "security.\n"
@@ -3966,11 +3968,6 @@ msgstr ""
 "Om du vil köra den, spara den någonstans och kolla att det inte är ett virus "
 "eller något illasinnat program."
 
-#: src/mimeview.c:1184
-#, c-format
-msgid "MIME viewer command line is invalid: `%s'"
-msgstr "MIME-visningskommandot är felaktigt:\"%s\""
-
 #: src/passphrase.c:96
 msgid "Passphrase"
 msgstr "Lösenfras"
@@ -5721,20 +5718,20 @@ msgstr "Svara till:"
 msgid "%s - Edit search condition"
 msgstr ""
 
-#: src/prefs_search_folder.c:209 src/query_search.c:257
+#: src/prefs_search_folder.c:209 src/query_search.c:274
 msgid "Match any of the following"
 msgstr "Matcha någon av följande"
 
-#: src/prefs_search_folder.c:211 src/query_search.c:259
+#: src/prefs_search_folder.c:211 src/query_search.c:276
 msgid "Match all of the following"
 msgstr "Matcha alla av följande"
 
-#: src/prefs_search_folder.c:231 src/query_search.c:303
+#: src/prefs_search_folder.c:231 src/query_search.c:320
 #, fuzzy
 msgid "Folder:"
 msgstr "Mapp"
 
-#: src/prefs_search_folder.c:248 src/query_search.c:321
+#: src/prefs_search_folder.c:248 src/query_search.c:338
 #, fuzzy
 msgid "Search subfolders"
 msgstr "Sökning misslyckades"
@@ -5749,17 +5746,17 @@ msgid "Attachment"
 msgstr "Bilaga"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73 src/query_search.c:371 src/summaryview.c:4901
+#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4902
 msgid "Subject"
 msgstr "Ärende"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/query_search.c:372 src/summaryview.c:4904
+#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4905
 msgid "From"
 msgstr "Från"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/query_search.c:373 src/summaryview.c:4906
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:4907
 msgid "Date"
 msgstr "Datum"
 
@@ -5853,43 +5850,43 @@ msgstr "Skapar förloppsdialog...\n"
 msgid "Status"
 msgstr "Status"
 
-#: src/query_search.c:234
+#: src/query_search.c:251
 msgid "Search messages"
 msgstr "Sök meddelanden"
 
-#: src/query_search.c:395
+#: src/query_search.c:423
 #, fuzzy
 msgid "_Save as search folder"
 msgstr "Spara i utkastsmapp"
 
-#: src/query_search.c:512 src/subscribedialog.c:526 src/summaryview.c:842
+#: src/query_search.c:542 src/subscribedialog.c:526 src/summaryview.c:842
 msgid "Done."
 msgstr "Färdig."
 
-#: src/query_search.c:536
+#: src/query_search.c:566
 #, fuzzy, c-format
 msgid "Searching %s ..."
 msgstr "Söker igenom mapp %s ..."
 
-#: src/query_search.c:564
+#: src/query_search.c:594
 #, fuzzy, c-format
 msgid "Searching %s (%d / %d)..."
 msgstr "Filtrerar..."
 
-#: src/query_search.c:645 src/summaryview.c:2051
+#: src/query_search.c:675 src/summaryview.c:2051
 msgid "(No Date)"
 msgstr "(Inget datum)"
 
-#: src/query_search.c:833
+#: src/query_search.c:869
 #, fuzzy
 msgid "Save as search folder"
 msgstr "Spara i utkastsmapp"
 
-#: src/query_search.c:854
+#: src/query_search.c:890
 msgid "Location:"
 msgstr ""
 
-#: src/query_search.c:869
+#: src/query_search.c:905
 #, fuzzy
 msgid "Folder name:"
 msgstr "Filnamn"
@@ -6517,37 +6514,37 @@ msgstr "Meddelandet %d är valt för att kopieras till %s\n"
 msgid "Destination for copy is same as current folder."
 msgstr "Destinationen att kopiera till är samma som aktuell mapp."
 
-#: src/summaryview.c:3506
+#: src/summaryview.c:3507
 msgid "Error occurred while processing messages."
 msgstr "Fel uppstod när meddelanden behandlades."
 
-#: src/summaryview.c:3814 src/summaryview.c:3815
+#: src/summaryview.c:3815 src/summaryview.c:3816
 msgid "Building threads..."
 msgstr "Skapar trådar..."
 
-#: src/summaryview.c:3965 src/summaryview.c:3966
+#: src/summaryview.c:3966 src/summaryview.c:3967
 msgid "Unthreading..."
 msgstr "Avtrådar..."
 
-#: src/summaryview.c:4259 src/summaryview.c:4315
+#: src/summaryview.c:4260 src/summaryview.c:4316
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtrerar..."
 
-#: src/summaryview.c:4364
+#: src/summaryview.c:4365
 msgid "filtering..."
 msgstr "filtrerar..."
 
-#: src/summaryview.c:4365
+#: src/summaryview.c:4366
 msgid "Filtering..."
 msgstr "Filtrerar..."
 
-#: src/summaryview.c:4401
+#: src/summaryview.c:4402
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "%d meddelande(n) har filtrerats."
 
-#: src/summaryview.c:4910
+#: src/summaryview.c:4911
 msgid "No."
 msgstr "Nr."
 
@@ -6634,6 +6631,9 @@ msgstr "Avsluta"
 msgid "Sylpheed"
 msgstr "Sylpheed"
 
+#~ msgid "MIME viewer command line is invalid: `%s'"
+#~ msgstr "MIME-visningskommandot är felaktigt:\"%s\""
+
 #~ msgid "%dB"
 #~ msgstr "%dB"
 
diff --git a/po/tr.po b/po/tr.po
index 0bf90de8..2098ce39 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-03-02 19:03+0900\n"
+"POT-Creation-Date: 2006-03-10 16:06+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:491
+#: libsylph/prefs_common.c:496
 #, fuzzy
 msgid "Junk mail filter"
 msgstr "dizin:"
@@ -525,7 +525,7 @@ msgstr "işaret dosyası açılamadı\n"
 msgid "can't fetch message %d\n"
 msgstr "%d. ileti alınamadı\n"
 
-#: libsylph/procmsg.c:1375
+#: libsylph/procmsg.c:1378
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Yazdırma komutu geçersiz: `%s'\n"
@@ -603,12 +603,12 @@ msgstr "  Konu: %s\n"
 msgid "  Issuer: %s\n"
 msgstr "  Veren: %s\n"
 
-#: libsylph/utils.c:2411 src/compose.c:2869 src/compose.c:3132
-#: src/compose.c:3195 src/compose.c:3315
+#: libsylph/utils.c:2430 src/compose.c:2888 src/compose.c:3151
+#: src/compose.c:3214 src/compose.c:3334
 msgid "can't change file mode\n"
 msgstr "dosya modu değiştirilemedi\n"
 
-#: libsylph/utils.c:2418 libsylph/utils.c:2542
+#: libsylph/utils.c:2437 libsylph/utils.c:2561
 #, c-format
 msgid "writing to %s failed.\n"
 msgstr "yazarken hata oluştu: %s\n"
@@ -688,8 +688,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:493
-#: src/compose.c:4273 src/editaddress.c:200 src/editaddress.c:942
+#: src/account_dialog.c:366 src/addressadd.c:192 src/addressbook.c:491
+#: src/compose.c:4292 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
@@ -827,12 +827,12 @@ msgstr "Eylemin kullanıcı argümanı"
 msgid "Add Address to Book"
 msgstr "Adres Defterine Ekle"
 
-#: src/addressadd.c:202 src/compose.c:4777 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4796 src/editaddress.c:201
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "Adres"
 
-#: src/addressadd.c:212 src/addressbook.c:495 src/editaddress.c:202
+#: src/addressadd.c:212 src/addressbook.c:493 src/editaddress.c:202
 #: src/editaddress.c:795 src/editaddress.c:860 src/editgroup.c:267
 msgid "Remarks"
 msgstr "Notlar"
@@ -841,110 +841,111 @@ msgstr "Notlar"
 msgid "Select Address Book Folder"
 msgstr "Adres Defteri Dizinini Seç"
 
-#: src/addressbook.c:338 src/compose.c:515 src/mainwindow.c:489
+#: src/addressbook.c:337 src/compose.c:515 src/mainwindow.c:489
 #: src/messageview.c:140
 msgid "/_File"
 msgstr "/_Dosya"
 
-#: src/addressbook.c:339
+#: src/addressbook.c:338
 msgid "/_File/New _Book"
 msgstr "/_Dosya/Yeni _Defter"
 
-#: src/addressbook.c:340
+#: src/addressbook.c:339
 msgid "/_File/New _vCard"
 msgstr "/_Dosya/Yeni _vCard"
 
-#: src/addressbook.c:342
+#: src/addressbook.c:341
 msgid "/_File/New _JPilot"
 msgstr "/_Dosya/Yeni _JPilot"
 
-#: src/addressbook.c:345
-msgid "/_File/New _Server"
+#: src/addressbook.c:344
+#, fuzzy
+msgid "/_File/New _LDAP Server"
 msgstr "/_Dosya/Yeni _Sunucu"
 
-#: src/addressbook.c:347 src/addressbook.c:350 src/compose.c:520
+#: src/addressbook.c:346 src/addressbook.c:349 src/compose.c:520
 #: src/compose.c:525 src/compose.c:528 src/compose.c:531 src/mainwindow.c:507
 #: src/mainwindow.c:510 src/mainwindow.c:512 src/mainwindow.c:515
 #: src/mainwindow.c:517 src/messageview.c:143
 msgid "/_File/---"
 msgstr "/_Dosya/---"
 
-#: src/addressbook.c:348
+#: src/addressbook.c:347
 msgid "/_File/_Edit"
 msgstr "/_Dosya/_Düzenle"
 
-#: src/addressbook.c:349
+#: src/addressbook.c:348
 msgid "/_File/_Delete"
 msgstr "/_Dosya/_Sil"
 
-#: src/addressbook.c:351
+#: src/addressbook.c:350
 msgid "/_File/_Save"
 msgstr "/_Dosya/_Kaydet"
 
-#: src/addressbook.c:352 src/compose.c:532 src/messageview.c:144
+#: src/addressbook.c:351 src/compose.c:532 src/messageview.c:144
 msgid "/_File/_Close"
 msgstr "/_Dosya/K_apat"
 
-#: src/addressbook.c:353
+#: src/addressbook.c:352
 msgid "/_Address"
 msgstr "/_Adres"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:353
 msgid "/_Address/New _Address"
 msgstr "/_Adres/Yeni _Adres"
 
-#: src/addressbook.c:355
+#: src/addressbook.c:354
 msgid "/_Address/New _Group"
 msgstr "/_Adres/Yeni _Grup"
 
-#: src/addressbook.c:356
+#: src/addressbook.c:355
 msgid "/_Address/New _Folder"
 msgstr "/_Adres/Yeni _Dizin"
 
-#: src/addressbook.c:357
+#: src/addressbook.c:356
 msgid "/_Address/---"
 msgstr "/_Adres/---"
 
-#: src/addressbook.c:358
+#: src/addressbook.c:357
 msgid "/_Address/_Edit"
 msgstr "/_Adres/Dü_zenle"
 
-#: src/addressbook.c:359
+#: src/addressbook.c:358
 msgid "/_Address/_Delete"
 msgstr "/_Adres/_Sil"
 
-#: src/addressbook.c:360 src/compose.c:645 src/mainwindow.c:758
-#: src/messageview.c:266
+#: src/addressbook.c:359 src/compose.c:645 src/mainwindow.c:758
+#: src/messageview.c:267
 msgid "/_Tools"
 msgstr "/A_raçlar"
 
-#: src/addressbook.c:361
+#: src/addressbook.c:360
 msgid "/_Tools/Import _LDIF file"
 msgstr "/A_raçlar/_LDIF dosyasını ekle"
 
-#: src/addressbook.c:362 src/compose.c:666 src/mainwindow.c:812
-#: src/messageview.c:286
+#: src/addressbook.c:361 src/compose.c:666 src/mainwindow.c:812
+#: src/messageview.c:287
 msgid "/_Help"
 msgstr "/_Yardım"
 
-#: src/addressbook.c:363 src/compose.c:667 src/mainwindow.c:824
-#: src/messageview.c:287
+#: src/addressbook.c:362 src/compose.c:667 src/mainwindow.c:824
+#: src/messageview.c:288
 msgid "/_Help/_About"
 msgstr "/_Yardım/_Hakkında"
 
-#: src/addressbook.c:382 src/addressbook.c:392
+#: src/addressbook.c:381 src/addressbook.c:391
 msgid "/New _Address"
 msgstr "/Yeni _Adres"
 
-#: src/addressbook.c:383 src/addressbook.c:393
+#: src/addressbook.c:382 src/addressbook.c:392
 msgid "/New _Group"
 msgstr "/Yeni _Grup"
 
-#: src/addressbook.c:384 src/addressbook.c:394
+#: src/addressbook.c:383 src/addressbook.c:393
 msgid "/New _Folder"
 msgstr "/Yeni _Dizin"
 
-#: src/addressbook.c:385 src/addressbook.c:395 src/compose.c:509
+#: src/addressbook.c:384 src/addressbook.c:394 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
@@ -954,70 +955,70 @@ msgstr "/Yeni _Dizin"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:386 src/addressbook.c:396 src/compose.c:534
+#: src/addressbook.c:385 src/addressbook.c:395 src/compose.c:534
 #: src/mainwindow.c:521 src/messageview.c:146
 msgid "/_Edit"
 msgstr "/Dü_zenle"
 
-#: src/addressbook.c:387 src/addressbook.c:397 src/summaryview.c:434
+#: src/addressbook.c:386 src/addressbook.c:396 src/summaryview.c:434
 msgid "/_Delete"
 msgstr "/_Sil"
 
-#: src/addressbook.c:494
+#: src/addressbook.c:492
 msgid "E-Mail address"
 msgstr "İleti adresi"
 
-#: src/addressbook.c:498 src/compose.c:4778 src/prefs_common_dialog.c:2183
+#: src/addressbook.c:496 src/compose.c:4797 src/prefs_common_dialog.c:2183
 msgid "Address book"
 msgstr "Adres defteri"
 
-#: src/addressbook.c:600 src/prefs_filter_edit.c:249
+#: src/addressbook.c:603 src/prefs_filter_edit.c:249
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "İsim:"
 
 #. Buttons
-#: src/addressbook.c:632 src/addressbook.c:1684 src/editaddress.c:884
+#: src/addressbook.c:636 src/addressbook.c:1678 src/editaddress.c:884
 #: src/editaddress.c:1017 src/mainwindow.c:2426 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:635 src/editaddress.c:890 src/editaddress.c:1023
+#: src/addressbook.c:639 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:1552
 msgid "Add"
 msgstr "Ekle"
 
-#: src/addressbook.c:638
+#: src/addressbook.c:642
 msgid "Lookup"
 msgstr "Ara"
 
-#: src/addressbook.c:650 src/headerview.c:55 src/prefs_folder_item.c:339
+#: src/addressbook.c:654 src/headerview.c:55 src/prefs_folder_item.c:339
 #: src/prefs_template.c:176
 msgid "To:"
 msgstr "Kime:"
 
-#: src/addressbook.c:654 src/prefs_folder_item.c:356 src/prefs_template.c:178
+#: src/addressbook.c:658 src/prefs_folder_item.c:356 src/prefs_template.c:178
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:658 src/prefs_folder_item.c:367
+#: src/addressbook.c:662 src/prefs_folder_item.c:367
 msgid "Bcc:"
 msgstr "Bcc:"
 
 #. Confirm deletion
-#: src/addressbook.c:845
+#: src/addressbook.c:832
 msgid "Delete address(es)"
 msgstr "Adres(ler)i sil"
 
-#: src/addressbook.c:846
+#: src/addressbook.c:833
 msgid "Really delete the address(es)?"
 msgstr "Adres(ler) silinsin mi?"
 
-#: src/addressbook.c:1675
+#: src/addressbook.c:1669
 #, fuzzy, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1027,38 +1028,38 @@ msgstr ""
 "misiniz?\n"
 "Eğer sadece dizini silerseniz, içindeki adresler ana dizine taşınacaktır."
 
-#: src/addressbook.c:1678 src/folderview.c:2372
+#: src/addressbook.c:1672 src/folderview.c:2372
 msgid "Delete folder"
 msgstr "Dizini sil"
 
-#: src/addressbook.c:1678
+#: src/addressbook.c:1672
 #, fuzzy
 msgid "_Folder only"
 msgstr "Sadece dizin"
 
-#: src/addressbook.c:1678
+#: src/addressbook.c:1672
 #, fuzzy
 msgid "Folder and _addresses"
 msgstr "Dizin ve Adresler"
 
-#: src/addressbook.c:1683
+#: src/addressbook.c:1677
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "`%s' silinsin mi?"
 
-#: src/addressbook.c:2369 src/addressbook.c:2502
+#: src/addressbook.c:2363 src/addressbook.c:2496
 msgid "New user, could not save index file."
 msgstr "Yeni kullanıcı, indeks dosyası kaydedilemedi."
 
-#: src/addressbook.c:2373 src/addressbook.c:2506
+#: src/addressbook.c:2367 src/addressbook.c:2500
 msgid "New user, could not save address book files."
 msgstr "Yeni kullanıcı, adres defteri dosyaları kaydedilemedi."
 
-#: src/addressbook.c:2383 src/addressbook.c:2516
+#: src/addressbook.c:2377 src/addressbook.c:2510
 msgid "Old address book converted successfully."
 msgstr "Eski adres defteri başarıyla çevrildi."
 
-#: src/addressbook.c:2388
+#: src/addressbook.c:2382
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1066,7 +1067,7 @@ msgstr ""
 "Eski adres defteri çevrildi,\n"
 "yeni adres indeks dosyası kaydedilemedi"
 
-#: src/addressbook.c:2401
+#: src/addressbook.c:2395
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1074,7 +1075,7 @@ msgstr ""
 "Adres defteri çevrilemedi,\n"
 "ancak boş bir adres defteri dosyası oluşturuldu."
 
-#: src/addressbook.c:2407
+#: src/addressbook.c:2401
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1082,7 +1083,7 @@ msgstr ""
 "Adres defteri ve yeni adres defteri \n"
 "dosyası oluşturulamadı."
 
-#: src/addressbook.c:2412
+#: src/addressbook.c:2406
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1090,89 +1091,89 @@ msgstr ""
 "Adres defteri ve yeni adres defteri \n"
 "dosyası oluşturulamadı."
 
-#: src/addressbook.c:2419
+#: src/addressbook.c:2413
 msgid "Addressbook conversion error"
 msgstr "Adres defteri çevrim hatası"
 
-#: src/addressbook.c:2423
+#: src/addressbook.c:2417
 msgid "Addressbook conversion"
 msgstr "Adres defteri çevrimi"
 
-#: src/addressbook.c:2458
+#: src/addressbook.c:2452
 msgid "Addressbook Error"
 msgstr "Adres Defteri Hatası"
 
-#: src/addressbook.c:2459 src/addressbook.c:2559
+#: src/addressbook.c:2453 src/addressbook.c:2553
 msgid "Could not read address index"
 msgstr "Adres indeksi okunamadı"
 
-#: src/addressbook.c:2521
+#: src/addressbook.c:2515
 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:2535
+#: src/addressbook.c:2529
 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:2541
+#: src/addressbook.c:2535
 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:2547
+#: src/addressbook.c:2541
 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:2565
+#: src/addressbook.c:2559
 msgid "Addressbook Conversion Error"
 msgstr "Adres Defteri Çevrim Hatası"
 
-#: src/addressbook.c:2571
+#: src/addressbook.c:2565
 msgid "Addressbook Conversion"
 msgstr "Adres Defteri Çevrimi"
 
-#: src/addressbook.c:3086 src/prefs_common_dialog.c:2033
+#: src/addressbook.c:3080 src/prefs_common_dialog.c:2033
 msgid "Interface"
 msgstr "Arayüz"
 
-#: src/addressbook.c:3102 src/importldif.c:514
+#: src/addressbook.c:3096 src/importldif.c:514
 msgid "Address Book"
 msgstr "Adres Defteri"
 
-#: src/addressbook.c:3118
+#: src/addressbook.c:3112
 msgid "Person"
 msgstr "Kişi"
 
-#: src/addressbook.c:3134
+#: src/addressbook.c:3128
 msgid "EMail Address"
 msgstr "İleti Adresi"
 
-#: src/addressbook.c:3150
+#: src/addressbook.c:3144
 msgid "Group"
 msgstr "Grup"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3166 src/folderview.c:367 src/prefs_account_dialog.c:1694
-#: src/query_search.c:370
+#: src/addressbook.c:3160 src/folderview.c:367 src/prefs_account_dialog.c:1694
+#: src/query_search.c:398
 msgid "Folder"
 msgstr "Dizin"
 
-#: src/addressbook.c:3182
+#: src/addressbook.c:3176
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3198 src/addressbook.c:3214
+#: src/addressbook.c:3192 src/addressbook.c:3208
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3230
+#: src/addressbook.c:3224
 msgid "LDAP Server"
 msgstr "LDAP Sunucu"
 
@@ -1184,7 +1185,7 @@ msgstr "Ortak adres"
 msgid "Personal address"
 msgstr "Kişisel adres"
 
-#: src/alertpanel.c:142 src/compose.c:5500 src/main.c:621
+#: src/alertpanel.c:142 src/compose.c:5517 src/main.c:621
 msgid "Notice"
 msgstr "Not"
 
@@ -1192,7 +1193,7 @@ msgstr "Not"
 msgid "Warning"
 msgstr "Uyarı"
 
-#: src/alertpanel.c:168 src/inc.c:587
+#: src/alertpanel.c:168 src/inc.c:586
 msgid "Error"
 msgstr "Hata"
 
@@ -1235,7 +1236,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:4761
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4762
 msgid "None"
 msgstr "Hiçbiri"
 
@@ -1508,7 +1509,7 @@ msgstr "/_Görünüm/_Kodlama/Tayca (TIS-620)"
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Görünüm/_Kodlama/Tayca (Windows-874)"
 
-#: src/compose.c:646 src/mainwindow.c:759 src/messageview.c:267
+#: src/compose.c:646 src/mainwindow.c:759 src/messageview.c:268
 msgid "/_Tools/_Address book"
 msgstr "/A_raçlar/_Adres defteri"
 
@@ -1516,14 +1517,14 @@ msgstr "/A_raçlar/_Adres defteri"
 msgid "/_Tools/_Template"
 msgstr "/A_raçlar/Ş_ablon"
 
-#: src/compose.c:649 src/mainwindow.c:783 src/messageview.c:283
+#: src/compose.c:649 src/mainwindow.c:783 src/messageview.c:284
 msgid "/_Tools/Actio_ns"
 msgstr "/A_raçlar/E_ylemler"
 
 #: src/compose.c:651 src/compose.c:655 src/compose.c:661 src/mainwindow.c:762
 #: src/mainwindow.c:776 src/mainwindow.c:781 src/mainwindow.c:784
-#: src/mainwindow.c:788 src/mainwindow.c:790 src/messageview.c:270
-#: src/messageview.c:282
+#: src/mainwindow.c:788 src/mainwindow.c:790 src/messageview.c:271
+#: src/messageview.c:283
 msgid "/_Tools/---"
 msgstr "/A_raçlar/---"
 
@@ -1549,80 +1550,80 @@ msgstr "/A_raçlar/Ç_alıştır"
 msgid "/_Tools/_Set spell language"
 msgstr "/A_raçlar/Ş_ablon"
 
-#: src/compose.c:910
+#: src/compose.c:912
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: dosya bulunamadı\n"
 
-#: src/compose.c:1014 src/compose.c:1085
+#: src/compose.c:1016 src/compose.c:1087
 msgid "Can't get text part\n"
 msgstr "Metin bölümü alınamadı\n"
 
-#: src/compose.c:1486
+#: src/compose.c:1488
 msgid "Quote mark format error."
 msgstr "Alıntı formatı hatası."
 
-#: src/compose.c:1498
+#: src/compose.c:1500
 msgid "Message reply/forward format error."
 msgstr "Posta cevapla/ilet formatı hatası"
 
-#: src/compose.c:1918
+#: src/compose.c:1935
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "%s dosyası bulunamadı\n"
 
-#: src/compose.c:1922
+#: src/compose.c:1939
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "%s dosyasının boyu bulunamadı\n"
 
-#: src/compose.c:1926
+#: src/compose.c:1943
 #, c-format
 msgid "File %s is empty."
 msgstr "%s dosyası boş."
 
-#: src/compose.c:1930
+#: src/compose.c:1947
 #, c-format
 msgid "Can't read %s."
 msgstr "%s okunamadı."
 
-#: src/compose.c:1963
+#: src/compose.c:1980
 #, c-format
 msgid "Message: %s"
 msgstr "İleti: %s"
 
-#: src/compose.c:2023 src/mimeview.c:565
+#: src/compose.c:2040 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:2507 src/headerview.c:195 src/query_search.c:636
+#: src/compose.c:2524 src/headerview.c:195 src/query_search.c:666
 #: src/summaryview.c:2124
 msgid "(No Subject)"
 msgstr "(Konu yok)"
 
-#: src/compose.c:2510
+#: src/compose.c:2527
 #, fuzzy, c-format
 msgid "%s - Compose%s"
 msgstr "%s - İleti düzenle (%s)"
 
-#: src/compose.c:2623
+#: src/compose.c:2642
 msgid "Recipient is not specified."
 msgstr "Alıcı belirtilmedi."
 
-#: src/compose.c:2631
+#: src/compose.c:2650
 #, fuzzy
 msgid "Empty subject"
 msgstr "Konu"
 
-#: src/compose.c:2632
+#: src/compose.c:2651
 msgid "Subject is empty. Send it anyway?"
 msgstr "Konuyu boş bıraktınız. Yine de göndermek istiyor musunuz?"
 
-#: src/compose.c:2691
+#: src/compose.c:2710
 msgid "can't get recipient list."
 msgstr "alıcı listesi alınamadı."
 
-#: src/compose.c:2711
+#: src/compose.c:2730
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1630,21 +1631,21 @@ msgstr ""
 "İletinin gönderileceği hesap belirtilmedi.\n"
 "Lütfen göndermeden önce bir e-posta hesabı girin."
 
-#: src/compose.c:2725 src/send_message.c:299
+#: src/compose.c:2744 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:2767
+#: src/compose.c:2786
 msgid "Can't save the message to outbox."
 msgstr "İleti, giden kutusuna kaydedilemiyor."
 
-#: src/compose.c:2805
+#: src/compose.c:2824
 #, 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:2902
+#: src/compose.c:2921
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1655,12 +1656,12 @@ msgstr ""
 "%s / %s\n"
 "Yine de gönderilsin mi?"
 
-#: src/compose.c:2908
+#: src/compose.c:2927
 #, fuzzy
 msgid "Code conversion error"
 msgstr "Adres defteri çevrim hatası"
 
-#: src/compose.c:2981
+#: src/compose.c:3000
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1669,159 +1670,159 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:2985
+#: src/compose.c:3004
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3275
+#: src/compose.c:3294
 msgid "can't remove the old message\n"
 msgstr "eski ileti silinemedi\n"
 
-#: src/compose.c:3293
+#: src/compose.c:3312
 msgid "queueing message...\n"
 msgstr "ileti kuyruğa gönderiliyor...\n"
 
-#: src/compose.c:3375
+#: src/compose.c:3394
 msgid "can't find queue folder\n"
 msgstr "kuyruk dizini bulunamadı\n"
 
-#: src/compose.c:3382
+#: src/compose.c:3401
 msgid "can't queue the message\n"
 msgstr "ileti kuyruğa gönderilemedi\n"
 
-#: src/compose.c:3975
+#: src/compose.c:3994
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "İleti numarası oluşturuldu: %s\n"
 
-#: src/compose.c:4088
+#: src/compose.c:4107
 msgid "Creating compose window...\n"
 msgstr "Düzenleme penceresi oluşturuluyor...\n"
 
-#: src/compose.c:4139 src/headerview.c:54
+#: src/compose.c:4158 src/headerview.c:54
 msgid "From:"
 msgstr "Kimden:"
 
-#: src/compose.c:4213
+#: src/compose.c:4232
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/A_raçlar/PGP İ_mza"
 
-#: src/compose.c:4216
+#: src/compose.c:4235
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/A_raçlar/PGP ile Ş_ifrele"
 
-#: src/compose.c:4254 src/compose.c:5332
+#: src/compose.c:4273 src/compose.c:5351
 msgid "MIME type"
 msgstr "MIME türü"
 
 #. S_COL_DATE
-#: src/compose.c:4263 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4908
+#: src/compose.c:4282 src/mimeview.c:197 src/prefs_filter_edit.c:496
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4909
 msgid "Size"
 msgstr "Boyut"
 
-#: src/compose.c:4698 src/mainwindow.c:2359 src/prefs_account_dialog.c:528
+#: src/compose.c:4717 src/mainwindow.c:2359 src/prefs_account_dialog.c:528
 #: src/prefs_common_dialog.c:661
 msgid "Send"
 msgstr "Gönder"
 
-#: src/compose.c:4699
+#: src/compose.c:4718
 msgid "Send message"
 msgstr "İletiyi gönder"
 
-#: src/compose.c:4707
+#: src/compose.c:4726
 msgid "Send later"
 msgstr "Sonra gönder"
 
-#: src/compose.c:4708
+#: src/compose.c:4727
 msgid "Put into queue folder and send later"
 msgstr "İletiyi kuyruğa aktar ve sonra gönder"
 
-#: src/compose.c:4716
+#: src/compose.c:4735
 msgid "Draft"
 msgstr "Taslak"
 
-#: src/compose.c:4717
+#: src/compose.c:4736
 msgid "Save to draft folder"
 msgstr "Taslak dizinine kaydet"
 
-#: src/compose.c:4727
+#: src/compose.c:4746
 msgid "Insert"
 msgstr "İçer"
 
-#: src/compose.c:4728
+#: src/compose.c:4747
 msgid "Insert file"
 msgstr "Dosya içer"
 
-#: src/compose.c:4736
+#: src/compose.c:4755
 msgid "Attach"
 msgstr "Ekle"
 
-#: src/compose.c:4737
+#: src/compose.c:4756
 msgid "Attach file"
 msgstr "Dosya ekle"
 
 #. signature
-#: src/compose.c:4747 src/prefs_account_dialog.c:1208
+#: src/compose.c:4766 src/prefs_account_dialog.c:1208
 #: src/prefs_common_dialog.c:953
 msgid "Signature"
 msgstr "İmza"
 
-#: src/compose.c:4748
+#: src/compose.c:4767
 #, fuzzy
 msgid "Append signature"
 msgstr "KÖTÜ imza"
 
 #. editor
-#: src/compose.c:4757 src/prefs_common_dialog.c:991
+#: src/compose.c:4776 src/prefs_common_dialog.c:991
 #: src/prefs_common_dialog.c:2315
 msgid "Editor"
 msgstr "Düzenleyici"
 
-#: src/compose.c:4758
+#: src/compose.c:4777
 msgid "Edit with external editor"
 msgstr "Harici bir düzenleyici kullan"
 
-#: src/compose.c:4766
+#: src/compose.c:4785
 msgid "Linewrap"
 msgstr "Satır kaydır"
 
-#: src/compose.c:4767
+#: src/compose.c:4786
 msgid "Wrap all long lines"
 msgstr "Tüm uzun satırları kaydır"
 
-#: src/compose.c:5228
+#: src/compose.c:5247
 msgid "Invalid MIME type."
 msgstr "Geçersiz MIME türü."
 
-#: src/compose.c:5246
+#: src/compose.c:5265
 msgid "File doesn't exist or is empty."
 msgstr "Dosya yok, ya da boş."
 
-#: src/compose.c:5314
+#: src/compose.c:5333
 msgid "Properties"
 msgstr "Özellikler"
 
-#: src/compose.c:5334 src/prefs_common_dialog.c:1444
+#: src/compose.c:5353 src/prefs_common_dialog.c:1444
 msgid "Encoding"
 msgstr "Kodlama"
 
-#: src/compose.c:5357 src/prefs_folder_item.c:202
+#: src/compose.c:5376 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Yol"
 
-#: src/compose.c:5358
+#: src/compose.c:5377
 msgid "File name"
 msgstr "Dosya adı"
 
-#: src/compose.c:5449
+#: src/compose.c:5466
 #, 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:5497
+#: src/compose.c:5514
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1831,48 +1832,48 @@ msgstr ""
 "Bu süreci sonlandırayım mı?\n"
 "Programın grup numarası (GID): %d"
 
-#: src/compose.c:5872 src/compose.c:5877 src/compose.c:5883
+#: src/compose.c:5889 src/compose.c:5894 src/compose.c:5900
 msgid "Can't queue the message."
 msgstr "İleti kuyruğa gönderilemedi."
 
-#: src/compose.c:5974
+#: src/compose.c:5991
 #, fuzzy
 msgid "Select files"
 msgstr "Dosya seç"
 
-#: src/compose.c:5997
+#: src/compose.c:6014
 msgid "Select file"
 msgstr "Dosya seç"
 
-#: src/compose.c:6032
+#: src/compose.c:6049
 #, fuzzy
 msgid "Save message"
 msgstr "İletiyi gönder"
 
-#: src/compose.c:6033
+#: src/compose.c:6050
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Bu ileti değiştirildi. Silinsin mi?"
 
-#: src/compose.c:6035
+#: src/compose.c:6052
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:6077
+#: src/compose.c:6094
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "%s şablonunu uygulamak istiyor musunuz?"
 
-#: src/compose.c:6079
+#: src/compose.c:6096
 msgid "Apply template"
 msgstr "Şablonu uygula"
 
-#: src/compose.c:6080
+#: src/compose.c:6097
 #, fuzzy
 msgid "_Replace"
 msgstr "Değiştir"
 
-#: src/compose.c:6080
+#: src/compose.c:6097
 #, fuzzy
 msgid "_Insert"
 msgstr "İçer"
@@ -1994,53 +1995,53 @@ msgstr "Bir Grup Adı verilmelidir."
 msgid "Edit Group Data"
 msgstr "Grup Bilgisini Düzenle"
 
-#: src/editgroup.c:300
+#: src/editgroup.c:299
 msgid "Group Name"
 msgstr "Grup Adı"
 
-#: src/editgroup.c:319
+#: src/editgroup.c:318
 msgid "Addresses in Group"
 msgstr "Gruptaki Adresler"
 
-#: src/editgroup.c:321
+#: src/editgroup.c:320
 msgid " -> "
 msgstr " -> "
 
-#: src/editgroup.c:348
+#: src/editgroup.c:347
 msgid " <- "
 msgstr " <- "
 
-#: src/editgroup.c:350
+#: src/editgroup.c:349
 msgid "Available Addresses"
 msgstr "Kullanılabilir Adresler"
 
-#: src/editgroup.c:416
+#: src/editgroup.c:415
 msgid "Move E-Mail Addresses to or from Group with arrow buttons"
 msgstr ""
 "E-posta adresini yön tuşlarını kullanarak gruba yerleştirin veya kaldırın"
 
-#: src/editgroup.c:468
+#: src/editgroup.c:467
 msgid "Edit Group Details"
 msgstr "Grup Ayrıntılarını Düzenle"
 
-#: src/editgroup.c:471
+#: src/editgroup.c:470
 msgid "Add New Group"
 msgstr "Yeni Grup Ekle"
 
-#: src/editgroup.c:522
+#: src/editgroup.c:521
 msgid "Edit folder"
 msgstr "Dizini düzenle"
 
-#: src/editgroup.c:522
+#: src/editgroup.c:521
 msgid "Input the new name of folder:"
 msgstr "Dizinin yeni adıni girin:"
 
-#: src/editgroup.c:525 src/foldersel.c:541 src/folderview.c:2121
+#: src/editgroup.c:524 src/foldersel.c:541 src/folderview.c:2121
 #: src/folderview.c:2127
 msgid "New folder"
 msgstr "Yeni dizin"
 
-#: src/editgroup.c:526 src/foldersel.c:542 src/folderview.c:2128
+#: src/editgroup.c:525 src/foldersel.c:542 src/folderview.c:2128
 msgid "Input the name of new folder:"
 msgstr "Yeni dizinin adını verin:"
 
@@ -2238,7 +2239,7 @@ msgid "`%c' can't be included in folder name."
 msgstr "`%c' bir dizin adı içinde olamaz."
 
 #: src/foldersel.c:561 src/folderview.c:2147 src/folderview.c:2206
-#: src/query_search.c:995
+#: src/query_search.c:1031
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "`%s' dizini zaten var."
@@ -2497,7 +2498,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:2127
+#: src/headerview.c:180 src/query_search.c:667 src/summaryview.c:2127
 msgid "(No From)"
 msgstr "(Kimden satırı yok)"
 
@@ -2627,133 +2628,133 @@ msgstr "Bitir"
 msgid "Sylpheed: %d new messages"
 msgstr "Tamamlandı (%d yeni mesaj)"
 
-#: src/inc.c:372
+#: src/inc.c:371
 msgid "Retrieving new messages"
 msgstr "Yeni iletiler alınıyor"
 
-#: src/inc.c:415
+#: src/inc.c:414
 msgid "Standby"
 msgstr "Bekle"
 
-#: src/inc.c:544 src/inc.c:593
+#: src/inc.c:543 src/inc.c:592
 msgid "Cancelled"
 msgstr "İptal edildi"
 
-#: src/inc.c:555
+#: src/inc.c:554
 msgid "Retrieving"
 msgstr "Alınıyor"
 
-#: src/inc.c:564
+#: src/inc.c:563
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "Tamamlandı (%d mesaj, (%s) alındı)"
 
-#: src/inc.c:568
+#: src/inc.c:567
 msgid "Done (no new messages)"
 msgstr "Tamamlandı (Yeni ileti yok)"
 
-#: src/inc.c:574
+#: src/inc.c:573
 msgid "Connection failed"
 msgstr "Bağlantıda hata"
 
-#: src/inc.c:577
+#: src/inc.c:576
 msgid "Auth failed"
 msgstr "Kimlik denetiminde hata"
 
-#: src/inc.c:580
+#: src/inc.c:579
 msgid "Locked"
 msgstr "Kilitli"
 
-#: src/inc.c:590
+#: src/inc.c:589
 msgid "Timeout"
 msgstr "Zaman aşımı"
 
-#: src/inc.c:640
+#: src/inc.c:639
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Tamamlandı (%d yeni mesaj)"
 
-#: src/inc.c:643
+#: src/inc.c:642
 msgid "Finished (no new messages)"
 msgstr "Tamamlandı (yeni mesaj yok)"
 
-#: src/inc.c:652
+#: src/inc.c:651
 msgid "Some errors occurred while getting mail."
 msgstr " İletiler alınırken bazı hatalar oluştu."
 
-#: src/inc.c:688
+#: src/inc.c:687
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "%s hesabındaki yeni iletiler alınıyor...\n"
 
-#: src/inc.c:691
+#: src/inc.c:690
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Yeni iletiler alınıyor"
 
-#: src/inc.c:710
+#: src/inc.c:709
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "POP3 sunucusuna bağlantı kuruluyor: %s ..."
 
-#: src/inc.c:719
+#: src/inc.c:718
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "POP3 sunucuya bağlantı kurulamadı: %s:%d\n"
 
-#: src/inc.c:798 src/send_message.c:631
+#: src/inc.c:797 src/send_message.c:631
 msgid "Authenticating..."
 msgstr "Kimlik denetimi yapılıyor..."
 
-#: src/inc.c:799
+#: src/inc.c:798
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "%s konumundan iletiler alınıyor..."
 
-#: src/inc.c:804
+#: src/inc.c:803
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Yeni ileti numaraları alınıyor (STAT)..."
 
-#: src/inc.c:808
+#: src/inc.c:807
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Yeni ileti numaraları alınıyor (LAST)..."
 
-#: src/inc.c:812
+#: src/inc.c:811
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Yeni ileti numaraları alınıyor (UIDL)..."
 
-#: src/inc.c:816
+#: src/inc.c:815
 msgid "Getting the size of messages (LIST)..."
 msgstr "İletilerin boyutları alınıyor (LIST)..."
 
-#: src/inc.c:826
+#: src/inc.c:825
 #, c-format
 msgid "Deleting message %d"
 msgstr "%d. ileti siliniyor"
 
-#: src/inc.c:833 src/send_message.c:649
+#: src/inc.c:832 src/send_message.c:649
 msgid "Quitting"
 msgstr "Çıkılıyor"
 
-#: src/inc.c:858
+#: src/inc.c:857
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "İletiler alınıyor (%d / %d) (%s / %s)"
 
-#: src/inc.c:879
+#: src/inc.c:878
 #, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Alınıyor (%d mesaj, (%s) alındı)"
 
-#: src/inc.c:1107
+#: src/inc.c:1106
 msgid "Connection failed."
 msgstr "Bağlantıda hata oluştu."
 
-#: src/inc.c:1113
+#: src/inc.c:1112
 msgid "Error occurred while processing mail."
 msgstr "İletiler işlenirken bir hata oluştu."
 
-#: src/inc.c:1118
+#: src/inc.c:1117
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2762,28 +2763,28 @@ msgstr ""
 "E-posta işlenirken hata oluştu:\n"
 "%s"
 
-#: src/inc.c:1124
+#: src/inc.c:1123
 msgid "No disk space left."
 msgstr "Yeterli disk alanı kalmadı."
 
-#: src/inc.c:1129
+#: src/inc.c:1128
 msgid "Can't write file."
 msgstr "Dosyaya yazılamadı."
 
-#: src/inc.c:1134
+#: src/inc.c:1133
 msgid "Socket error."
 msgstr "protokol hatası"
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1140 src/send_message.c:584 src/send_message.c:772
+#: src/inc.c:1139 src/send_message.c:584 src/send_message.c:772
 msgid "Connection closed by the remote host."
 msgstr "Bağlantı karşı taraftan kesildi."
 
-#: src/inc.c:1146
+#: src/inc.c:1145
 msgid "Mailbox is locked."
 msgstr "Posta kutusu kilitli"
 
-#: src/inc.c:1150
+#: src/inc.c:1149
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2792,11 +2793,11 @@ msgstr ""
 "Posta kutusu kilitli:\n"
 "%s"
 
-#: src/inc.c:1156 src/send_message.c:757
+#: src/inc.c:1155 src/send_message.c:757
 msgid "Authentication failed."
 msgstr "Yetkilendirmede hata oluştu."
 
-#: src/inc.c:1161 src/send_message.c:760
+#: src/inc.c:1160 src/send_message.c:760
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2805,15 +2806,15 @@ msgstr ""
 "Yetkilendirme başarısız:\n"
 "%s"
 
-#: src/inc.c:1166 src/send_message.c:776
+#: src/inc.c:1165 src/send_message.c:776
 msgid "Session timed out."
 msgstr "Oturum zaman aşımına uğradı."
 
-#: src/inc.c:1202
+#: src/inc.c:1201
 msgid "Incorporation cancelled\n"
 msgstr "İptal edildi\n"
 
-#: src/inc.c:1285
+#: src/inc.c:1284
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "%s'den yeni mesajlar %s e alınıyor...\n"
@@ -3290,14 +3291,15 @@ msgid "/_View/Mess_age source"
 msgstr "/_Görünüm/İ_leti kaynağı"
 
 #: src/mainwindow.c:708 src/messageview.c:245
-msgid "/_View/Show all _header"
+#, fuzzy
+msgid "/_View/Show all _headers"
 msgstr "/_Görünüm/Tüm _başlıkları görüntüle"
 
 #: src/mainwindow.c:710
 msgid "/_View/_Update summary"
 msgstr "/_Görünüm/_Görünümü güncelle"
 
-#: src/mainwindow.c:712 src/messageview.c:247
+#: src/mainwindow.c:712 src/messageview.c:248
 msgid "/_Message"
 msgstr "/İ_leti"
 
@@ -3327,16 +3329,16 @@ msgstr "/İ_leti/_Kuyruktaki iletileri gönder"
 
 #: src/mainwindow.c:722 src/mainwindow.c:724 src/mainwindow.c:731
 #: src/mainwindow.c:736 src/mainwindow.c:739 src/mainwindow.c:750
-#: src/mainwindow.c:752 src/mainwindow.c:755 src/messageview.c:250
-#: src/messageview.c:258 src/messageview.c:263
+#: src/mainwindow.c:752 src/mainwindow.c:755 src/messageview.c:251
+#: src/messageview.c:259 src/messageview.c:264
 msgid "/_Message/---"
 msgstr "/İ_leti/---"
 
-#: src/mainwindow.c:723 src/messageview.c:248
+#: src/mainwindow.c:723 src/messageview.c:249
 msgid "/_Message/Compose _new message"
 msgstr "/İ_leti/Yeni _ileti gönder"
 
-#: src/mainwindow.c:725 src/messageview.c:251
+#: src/mainwindow.c:725 src/messageview.c:252
 msgid "/_Message/_Reply"
 msgstr "/İ_leti/Yanıtl_a"
 
@@ -3344,27 +3346,27 @@ msgstr "/İ_leti/Yanıtl_a"
 msgid "/_Message/Repl_y to"
 msgstr "/İ_leti/B_aşkasına yanıtla"
 
-#: src/mainwindow.c:727 src/messageview.c:252
+#: src/mainwindow.c:727 src/messageview.c:253
 msgid "/_Message/Repl_y to/_all"
 msgstr "/İ_leti/B_aşkasına yanıtla/_herkese"
 
-#: src/mainwindow.c:728 src/messageview.c:254
+#: src/mainwindow.c:728 src/messageview.c:255
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/İ_leti/B_aşkasına yanıtla/_gönderene"
 
-#: src/mainwindow.c:729 src/messageview.c:256
+#: src/mainwindow.c:729 src/messageview.c:257
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/İ_leti/B_aşkasına yanıtla/eposta l_istesine"
 
-#: src/mainwindow.c:732 src/messageview.c:259
+#: src/mainwindow.c:732 src/messageview.c:260
 msgid "/_Message/_Forward"
 msgstr "/İ_leti/Yö_nlendir"
 
-#: src/mainwindow.c:733 src/messageview.c:260
+#: src/mainwindow.c:733 src/messageview.c:261
 msgid "/_Message/For_ward as attachment"
 msgstr "/İ_leti/E_k olarak yönlendir"
 
-#: src/mainwindow.c:735 src/messageview.c:262
+#: src/mainwindow.c:735 src/messageview.c:263
 msgid "/_Message/Redirec_t"
 msgstr "/İ_leti/Yö_nlendir"
 
@@ -3422,7 +3424,7 @@ msgstr "/İ_leti/İş_aretle/İşareti _kaldır"
 msgid "/_Message/Set as not j_unk mail"
 msgstr ""
 
-#: src/mainwindow.c:756 src/messageview.c:264
+#: src/mainwindow.c:756 src/messageview.c:265
 msgid "/_Message/Re-_edit"
 msgstr "/İ_leti/Ye_niden düzenle"
 
@@ -3439,23 +3441,23 @@ msgstr "/A_raçlar/_Dizin içindeki tüm iletileri filtrele"
 msgid "/_Tools/Filter _selected messages"
 msgstr "/A_raçlar/S_eçilen tüm mesajları filtrele"
 
-#: src/mainwindow.c:767 src/messageview.c:271
+#: src/mainwindow.c:767 src/messageview.c:272
 msgid "/_Tools/_Create filter rule"
 msgstr "/A_raçlar/Filtre _kuralı oluştur"
 
-#: src/mainwindow.c:768 src/messageview.c:273
+#: src/mainwindow.c:768 src/messageview.c:274
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/A_raçlar/Filtre _kuralı oluştur/_Otomatik oluştur"
 
-#: src/mainwindow.c:770 src/messageview.c:275
+#: src/mainwindow.c:770 src/messageview.c:276
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/A_raçlar/Filtre _kuralı oluştur/_Gönderene göre oluştur"
 
-#: src/mainwindow.c:772 src/messageview.c:277
+#: src/mainwindow.c:772 src/messageview.c:278
 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:774 src/messageview.c:279
+#: src/mainwindow.c:774 src/messageview.c:280
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/A_raçlar/Filtre _kuralı oluştur/_Konuya göre oluştur"
 
@@ -3576,7 +3578,7 @@ 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:1139 src/summaryview.c:2275 src/summaryview.c:2360
-#: src/summaryview.c:3907 src/summaryview.c:4036 src/summaryview.c:4394
+#: src/summaryview.c:3908 src/summaryview.c:4037 src/summaryview.c:4395
 msgid "done.\n"
 msgstr "bitti.\n"
 
@@ -3837,7 +3839,7 @@ msgid "Find text:"
 msgstr "Metni bul:"
 
 #: src/message_search.c:153 src/prefs_search_folder.c:253
-#: src/query_search.c:326
+#: src/query_search.c:343
 msgid "Case sensitive"
 msgstr "Durum duyarlılığı"
 
@@ -3861,27 +3863,27 @@ msgstr "İletinin sonuna ulaşıldı, başından başlansın mı?"
 msgid "Search finished"
 msgstr "Arama tamamlandı"
 
-#: src/messageview.c:268
+#: src/messageview.c:269
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/A_raçlar/Göndereni adres defterine ekle"
 
-#: src/messageview.c:300
+#: src/messageview.c:301
 msgid "Creating message view...\n"
 msgstr "İleti görüntüsü oluşturuluyor...\n"
 
-#: src/messageview.c:325
+#: src/messageview.c:326
 msgid "Text"
 msgstr "Metin"
 
-#: src/messageview.c:330
+#: src/messageview.c:331
 msgid "Attachments"
 msgstr "Ekler"
 
-#: src/messageview.c:380
+#: src/messageview.c:381
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:699 src/summaryview.c:3436
+#: src/messageview.c:700 src/summaryview.c:3436
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "`%s' dosyası kaydedilemedi."
@@ -3899,7 +3901,7 @@ msgstr "Komut çalıştır"
 msgid "Print"
 msgstr "Yazdır"
 
-#: src/messageview.c:770 src/summaryview.c:3471
+#: src/messageview.c:769 src/summaryview.c:3470
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -3999,11 +4001,11 @@ msgstr ""
 "Dosyayı açmak için komut satırını açın:\n"
 "(%s dosya ismi ile yer değiştirecek)"
 
-#: src/mimeview.c:1147
+#: src/mimeview.c:1140
 msgid "Opening executable file"
 msgstr ""
 
-#: src/mimeview.c:1148
+#: src/mimeview.c:1141
 msgid ""
 "This is an executable file. Opening executable file is restricted for "
 "security.\n"
@@ -4011,11 +4013,6 @@ msgid ""
 "virus or something like a malicious program."
 msgstr ""
 
-#: src/mimeview.c:1184
-#, c-format
-msgid "MIME viewer command line is invalid: `%s'"
-msgstr "MIME görüntüleyici komutu geçersiz: `%s'"
-
 #: src/passphrase.c:96
 msgid "Passphrase"
 msgstr "Parola"
@@ -5797,20 +5794,20 @@ msgstr "Yanıtla:"
 msgid "%s - Edit search condition"
 msgstr ""
 
-#: src/prefs_search_folder.c:209 src/query_search.c:257
+#: src/prefs_search_folder.c:209 src/query_search.c:274
 msgid "Match any of the following"
 msgstr "Aşağıdaki herhangi bir kural eşleşirse"
 
-#: src/prefs_search_folder.c:211 src/query_search.c:259
+#: src/prefs_search_folder.c:211 src/query_search.c:276
 msgid "Match all of the following"
 msgstr "Aşağıdaki tüm koşullar eşleşirse"
 
-#: src/prefs_search_folder.c:231 src/query_search.c:303
+#: src/prefs_search_folder.c:231 src/query_search.c:320
 #, fuzzy
 msgid "Folder:"
 msgstr "Dizin"
 
-#: src/prefs_search_folder.c:248 src/query_search.c:321
+#: src/prefs_search_folder.c:248 src/query_search.c:338
 #, fuzzy
 msgid "Search subfolders"
 msgstr "Aramada hata oluştu"
@@ -5825,17 +5822,17 @@ msgid "Attachment"
 msgstr "Ek"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73 src/query_search.c:371 src/summaryview.c:4901
+#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4902
 msgid "Subject"
 msgstr "Konu"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/query_search.c:372 src/summaryview.c:4904
+#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4905
 msgid "From"
 msgstr "Kimden"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/query_search.c:373 src/summaryview.c:4906
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:4907
 msgid "Date"
 msgstr "Tarih"
 
@@ -5928,43 +5925,43 @@ msgstr "İşlem durum penceresi oluşturuluyor...\n"
 msgid "Status"
 msgstr "Durum"
 
-#: src/query_search.c:234
+#: src/query_search.c:251
 msgid "Search messages"
 msgstr "İletilerde ara"
 
-#: src/query_search.c:395
+#: src/query_search.c:423
 #, fuzzy
 msgid "_Save as search folder"
 msgstr "Taslak dizinine kaydet"
 
-#: src/query_search.c:512 src/subscribedialog.c:526 src/summaryview.c:842
+#: src/query_search.c:542 src/subscribedialog.c:526 src/summaryview.c:842
 msgid "Done."
 msgstr "Tamamlandı."
 
-#: src/query_search.c:536
+#: src/query_search.c:566
 #, fuzzy, c-format
 msgid "Searching %s ..."
 msgstr "%s dizini taranıyor..."
 
-#: src/query_search.c:564
+#: src/query_search.c:594
 #, fuzzy, c-format
 msgid "Searching %s (%d / %d)..."
 msgstr "Filtreleniyor..."
 
-#: src/query_search.c:645 src/summaryview.c:2051
+#: src/query_search.c:675 src/summaryview.c:2051
 msgid "(No Date)"
 msgstr "(Tarih Yok)"
 
-#: src/query_search.c:833
+#: src/query_search.c:869
 #, fuzzy
 msgid "Save as search folder"
 msgstr "Taslak dizinine kaydet"
 
-#: src/query_search.c:854
+#: src/query_search.c:890
 msgid "Location:"
 msgstr ""
 
-#: src/query_search.c:869
+#: src/query_search.c:905
 #, fuzzy
 msgid "Folder name:"
 msgstr "Dosya adı"
@@ -6599,37 +6596,37 @@ msgstr "%d iletisi %s e kopyalanadı\n"
 msgid "Destination for copy is same as current folder."
 msgstr "Kopya için hedef dizin geçerli dizin ile aynı."
 
-#: src/summaryview.c:3506
+#: src/summaryview.c:3507
 msgid "Error occurred while processing messages."
 msgstr "İletiler işlenirken hata oluştu."
 
-#: src/summaryview.c:3814 src/summaryview.c:3815
+#: src/summaryview.c:3815 src/summaryview.c:3816
 msgid "Building threads..."
 msgstr "Konumlar oluşturuluyor..."
 
-#: src/summaryview.c:3965 src/summaryview.c:3966
+#: src/summaryview.c:3966 src/summaryview.c:3967
 msgid "Unthreading..."
 msgstr "Konumlar ayrılıyor..."
 
-#: src/summaryview.c:4259 src/summaryview.c:4315
+#: src/summaryview.c:4260 src/summaryview.c:4316
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtreleniyor..."
 
-#: src/summaryview.c:4364
+#: src/summaryview.c:4365
 msgid "filtering..."
 msgstr "filtreleniyor..."
 
-#: src/summaryview.c:4365
+#: src/summaryview.c:4366
 msgid "Filtering..."
 msgstr "Filtreleniyor..."
 
-#: src/summaryview.c:4401
+#: src/summaryview.c:4402
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "%d mesaj filtrelenedi."
 
-#: src/summaryview.c:4910
+#: src/summaryview.c:4911
 msgid "No."
 msgstr "Hayır."
 
@@ -6721,6 +6718,9 @@ msgstr "Çık"
 msgid "Sylpheed"
 msgstr "Eski Sylpheed"
 
+#~ msgid "MIME viewer command line is invalid: `%s'"
+#~ msgstr "MIME görüntüleyici komutu geçersiz: `%s'"
+
 #~ msgid "%dB"
 #~ msgstr "%dB"
 
diff --git a/po/uk.po b/po/uk.po
index 8dab223a..63cafca8 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed 2.1.8\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-03-02 19:03+0900\n"
+"POT-Creation-Date: 2006-03-10 16:06+0900\n"
 "PO-Revision-Date: 2006-02-02 23:48+0300\n"
 "Last-Translator: O.R. Nykyforchyn <nick@pu.if.ua>\n"
 "Language-Team: Ukrainian\n"
@@ -513,7 +513,7 @@ msgstr "Знайдено %s\n"
 msgid "Configuration is saved.\n"
 msgstr "Конфігурацію збережено.\n"
 
-#: libsylph/prefs_common.c:491
+#: libsylph/prefs_common.c:496
 msgid "Junk mail filter"
 msgstr "фільтр мотлоху"
 
@@ -530,7 +530,7 @@ msgstr "не вдалось відкрити файл позначок\n"
 msgid "can't fetch message %d\n"
 msgstr "не вдалось стягти лист %d\n"
 
-#: libsylph/procmsg.c:1375
+#: libsylph/procmsg.c:1378
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Невірна команда друку: `%s'\n"
@@ -608,12 +608,12 @@ msgstr "  Суб'єкт  %s\n"
 msgid "  Issuer: %s\n"
 msgstr "  Видав: %s\n"
 
-#: libsylph/utils.c:2411 src/compose.c:2869 src/compose.c:3132
-#: src/compose.c:3195 src/compose.c:3315
+#: libsylph/utils.c:2430 src/compose.c:2888 src/compose.c:3151
+#: src/compose.c:3214 src/compose.c:3334
 msgid "can't change file mode\n"
 msgstr "не вдалось змінити права доступу файла\n"
 
-#: libsylph/utils.c:2418 libsylph/utils.c:2542
+#: libsylph/utils.c:2437 libsylph/utils.c:2561
 #, c-format
 msgid "writing to %s failed.\n"
 msgstr "Невдача запису в %s.\n"
@@ -695,8 +695,8 @@ msgstr ""
 "Порядок перевірки нових листів. Позначте в колонці `G'\n"
 "account'и, які поповнюються через `Отримати всі'."
 
-#: src/account_dialog.c:366 src/addressadd.c:192 src/addressbook.c:493
-#: src/compose.c:4273 src/editaddress.c:200 src/editaddress.c:942
+#: src/account_dialog.c:366 src/addressadd.c:192 src/addressbook.c:491
+#: src/compose.c:4292 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
@@ -832,12 +832,12 @@ msgstr "Аргумент користувача"
 msgid "Add Address to Book"
 msgstr "Додати адресу до книги"
 
-#: src/addressadd.c:202 src/compose.c:4777 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4796 src/editaddress.c:201
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "Адреса"
 
-#: src/addressadd.c:212 src/addressbook.c:495 src/editaddress.c:202
+#: src/addressadd.c:212 src/addressbook.c:493 src/editaddress.c:202
 #: src/editaddress.c:795 src/editaddress.c:860 src/editgroup.c:267
 msgid "Remarks"
 msgstr "Нотатки"
@@ -846,110 +846,111 @@ msgstr "Нотатки"
 msgid "Select Address Book Folder"
 msgstr "Обрати папку адресної книги"
 
-#: src/addressbook.c:338 src/compose.c:515 src/mainwindow.c:489
+#: src/addressbook.c:337 src/compose.c:515 src/mainwindow.c:489
 #: src/messageview.c:140
 msgid "/_File"
 msgstr "/Файл"
 
-#: src/addressbook.c:339
+#: src/addressbook.c:338
 msgid "/_File/New _Book"
 msgstr "/Файл/Нова книга"
 
-#: src/addressbook.c:340
+#: src/addressbook.c:339
 msgid "/_File/New _vCard"
 msgstr "/Файл/Нова vCard"
 
-#: src/addressbook.c:342
+#: src/addressbook.c:341
 msgid "/_File/New _JPilot"
 msgstr "/Файл/Новий JPilot"
 
-#: src/addressbook.c:345
-msgid "/_File/New _Server"
+#: src/addressbook.c:344
+#, fuzzy
+msgid "/_File/New _LDAP Server"
 msgstr "/Файл/Новий сервер"
 
-#: src/addressbook.c:347 src/addressbook.c:350 src/compose.c:520
+#: src/addressbook.c:346 src/addressbook.c:349 src/compose.c:520
 #: src/compose.c:525 src/compose.c:528 src/compose.c:531 src/mainwindow.c:507
 #: src/mainwindow.c:510 src/mainwindow.c:512 src/mainwindow.c:515
 #: src/mainwindow.c:517 src/messageview.c:143
 msgid "/_File/---"
 msgstr "/Файл/---"
 
-#: src/addressbook.c:348
+#: src/addressbook.c:347
 msgid "/_File/_Edit"
 msgstr "/Файл/Редагувати"
 
-#: src/addressbook.c:349
+#: src/addressbook.c:348
 msgid "/_File/_Delete"
 msgstr "/Файл/Видалити"
 
-#: src/addressbook.c:351
+#: src/addressbook.c:350
 msgid "/_File/_Save"
 msgstr "/Файл/Зберегти"
 
-#: src/addressbook.c:352 src/compose.c:532 src/messageview.c:144
+#: src/addressbook.c:351 src/compose.c:532 src/messageview.c:144
 msgid "/_File/_Close"
 msgstr "/Файл/Закрити"
 
-#: src/addressbook.c:353
+#: src/addressbook.c:352
 msgid "/_Address"
 msgstr "/Адреса"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:353
 msgid "/_Address/New _Address"
 msgstr "/Адреса/Нова адреса"
 
-#: src/addressbook.c:355
+#: src/addressbook.c:354
 msgid "/_Address/New _Group"
 msgstr "/Адреса/Нова група"
 
-#: src/addressbook.c:356
+#: src/addressbook.c:355
 msgid "/_Address/New _Folder"
 msgstr "/Адреса/Нова папка"
 
-#: src/addressbook.c:357
+#: src/addressbook.c:356
 msgid "/_Address/---"
 msgstr "/Адреса/---"
 
-#: src/addressbook.c:358
+#: src/addressbook.c:357
 msgid "/_Address/_Edit"
 msgstr "/Адреса/Редагувати"
 
-#: src/addressbook.c:359
+#: src/addressbook.c:358
 msgid "/_Address/_Delete"
 msgstr "/Адреса/Видалити"
 
-#: src/addressbook.c:360 src/compose.c:645 src/mainwindow.c:758
-#: src/messageview.c:266
+#: src/addressbook.c:359 src/compose.c:645 src/mainwindow.c:758
+#: src/messageview.c:267
 msgid "/_Tools"
 msgstr "/Інструменти"
 
-#: src/addressbook.c:361
+#: src/addressbook.c:360
 msgid "/_Tools/Import _LDIF file"
 msgstr "/Інструменти/Імпортувати файл LDIF"
 
-#: src/addressbook.c:362 src/compose.c:666 src/mainwindow.c:812
-#: src/messageview.c:286
+#: src/addressbook.c:361 src/compose.c:666 src/mainwindow.c:812
+#: src/messageview.c:287
 msgid "/_Help"
 msgstr "/Допомога"
 
-#: src/addressbook.c:363 src/compose.c:667 src/mainwindow.c:824
-#: src/messageview.c:287
+#: src/addressbook.c:362 src/compose.c:667 src/mainwindow.c:824
+#: src/messageview.c:288
 msgid "/_Help/_About"
 msgstr "/Допомога/Про програму"
 
-#: src/addressbook.c:382 src/addressbook.c:392
+#: src/addressbook.c:381 src/addressbook.c:391
 msgid "/New _Address"
 msgstr "/Нова адреса"
 
-#: src/addressbook.c:383 src/addressbook.c:393
+#: src/addressbook.c:382 src/addressbook.c:392
 msgid "/New _Group"
 msgstr "/Нова група"
 
-#: src/addressbook.c:384 src/addressbook.c:394
+#: src/addressbook.c:383 src/addressbook.c:393
 msgid "/New _Folder"
 msgstr "/Нова папка"
 
-#: src/addressbook.c:385 src/addressbook.c:395 src/compose.c:509
+#: src/addressbook.c:384 src/addressbook.c:394 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
@@ -959,70 +960,70 @@ msgstr "/Нова папка"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:386 src/addressbook.c:396 src/compose.c:534
+#: src/addressbook.c:385 src/addressbook.c:395 src/compose.c:534
 #: src/mainwindow.c:521 src/messageview.c:146
 msgid "/_Edit"
 msgstr "/Редагувати"
 
-#: src/addressbook.c:387 src/addressbook.c:397 src/summaryview.c:434
+#: src/addressbook.c:386 src/addressbook.c:396 src/summaryview.c:434
 msgid "/_Delete"
 msgstr "/Видалити"
 
-#: src/addressbook.c:494
+#: src/addressbook.c:492
 msgid "E-Mail address"
 msgstr "Адреса e-mail"
 
-#: src/addressbook.c:498 src/compose.c:4778 src/prefs_common_dialog.c:2183
+#: src/addressbook.c:496 src/compose.c:4797 src/prefs_common_dialog.c:2183
 msgid "Address book"
 msgstr "Адресна книга"
 
-#: src/addressbook.c:600 src/prefs_filter_edit.c:249
+#: src/addressbook.c:603 src/prefs_filter_edit.c:249
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "Ім'я:"
 
 #. Buttons
-#: src/addressbook.c:632 src/addressbook.c:1684 src/editaddress.c:884
+#: src/addressbook.c:636 src/addressbook.c:1678 src/editaddress.c:884
 #: src/editaddress.c:1017 src/mainwindow.c:2426 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:635 src/editaddress.c:890 src/editaddress.c:1023
+#: src/addressbook.c:639 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:1552
 msgid "Add"
 msgstr "Додати"
 
-#: src/addressbook.c:638
+#: src/addressbook.c:642
 msgid "Lookup"
 msgstr "Пошук"
 
-#: src/addressbook.c:650 src/headerview.c:55 src/prefs_folder_item.c:339
+#: src/addressbook.c:654 src/headerview.c:55 src/prefs_folder_item.c:339
 #: src/prefs_template.c:176
 msgid "To:"
 msgstr "Кому:"
 
-#: src/addressbook.c:654 src/prefs_folder_item.c:356 src/prefs_template.c:178
+#: src/addressbook.c:658 src/prefs_folder_item.c:356 src/prefs_template.c:178
 msgid "Cc:"
 msgstr "Копія:"
 
-#: src/addressbook.c:658 src/prefs_folder_item.c:367
+#: src/addressbook.c:662 src/prefs_folder_item.c:367
 msgid "Bcc:"
 msgstr "Приховано:"
 
 #. Confirm deletion
-#: src/addressbook.c:845
+#: src/addressbook.c:832
 msgid "Delete address(es)"
 msgstr "Видалити адресу(и)"
 
-#: src/addressbook.c:846
+#: src/addressbook.c:833
 msgid "Really delete the address(es)?"
 msgstr "Дійсно видалити адресу(и)?"
 
-#: src/addressbook.c:1675
+#: src/addressbook.c:1669
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1031,36 +1032,36 @@ msgstr ""
 "Чи бажаєте Ви видалити папку ТА всі адреси в `%s' ? \n"
 "Якщо видалити тільки папку, адреси буде перенесено в охоплюючу папку."
 
-#: src/addressbook.c:1678 src/folderview.c:2372
+#: src/addressbook.c:1672 src/folderview.c:2372
 msgid "Delete folder"
 msgstr "Видалити папку"
 
-#: src/addressbook.c:1678
+#: src/addressbook.c:1672
 msgid "_Folder only"
 msgstr "Тільки папку"
 
-#: src/addressbook.c:1678
+#: src/addressbook.c:1672
 msgid "Folder and _addresses"
 msgstr "Папку та адреси"
 
-#: src/addressbook.c:1683
+#: src/addressbook.c:1677
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Дійсно видалити `%s' ?"
 
-#: src/addressbook.c:2369 src/addressbook.c:2502
+#: src/addressbook.c:2363 src/addressbook.c:2496
 msgid "New user, could not save index file."
 msgstr "Новий користувач, не вдалось зберегти покажчик."
 
-#: src/addressbook.c:2373 src/addressbook.c:2506
+#: src/addressbook.c:2367 src/addressbook.c:2500
 msgid "New user, could not save address book files."
 msgstr "Новий користувач, не вдалось зберегти адресну книгу."
 
-#: src/addressbook.c:2383 src/addressbook.c:2516
+#: src/addressbook.c:2377 src/addressbook.c:2510
 msgid "Old address book converted successfully."
 msgstr "Стару адресну книгу успішно конвертовано."
 
-#: src/addressbook.c:2388
+#: src/addressbook.c:2382
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1068,7 +1069,7 @@ msgstr ""
 "Стару адресну книгу конвертовано,\n"
 "не вдалось зберегти новий покажчик адрес"
 
-#: src/addressbook.c:2401
+#: src/addressbook.c:2395
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1076,7 +1077,7 @@ msgstr ""
 "Не вдалось конвертувати адресну книгу,\n"
 "але створено нову (порожню)."
 
-#: src/addressbook.c:2407
+#: src/addressbook.c:2401
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1084,7 +1085,7 @@ msgstr ""
 "Не вдалось ні конвертувати адресну книгу,\n"
 "ні створити нові файли адресної книги."
 
-#: src/addressbook.c:2412
+#: src/addressbook.c:2406
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1092,85 +1093,85 @@ msgstr ""
 "Не вдалось ні конвертувати адресну книгу,\n"
 "ні створити нові файли адресної книги."
 
-#: src/addressbook.c:2419
+#: src/addressbook.c:2413
 msgid "Addressbook conversion error"
 msgstr "Помилка при конвертуванні адресної книги"
 
-#: src/addressbook.c:2423
+#: src/addressbook.c:2417
 msgid "Addressbook conversion"
 msgstr "Конвертування адресної книги"
 
-#: src/addressbook.c:2458
+#: src/addressbook.c:2452
 msgid "Addressbook Error"
 msgstr "Помилка в адресній книзі"
 
-#: src/addressbook.c:2459 src/addressbook.c:2559
+#: src/addressbook.c:2453 src/addressbook.c:2553
 msgid "Could not read address index"
 msgstr "Не вдалось прочитати покажчик адрес"
 
-#: src/addressbook.c:2521
+#: src/addressbook.c:2515
 msgid "Old address book converted, could not save new address index file"
 msgstr ""
 "Стару адресну книгу конвертовано, не вдалось зберегти новий покажчик адрес"
 
-#: src/addressbook.c:2535
+#: src/addressbook.c:2529
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr "Не вдалось конвертувати адресну книгу, але створено нову (порожню)."
 
-#: src/addressbook.c:2541
+#: src/addressbook.c:2535
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr "Не вдалось ні конвертувати адресну книгу, ні створити нову."
 
-#: src/addressbook.c:2547
+#: src/addressbook.c:2541
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr "Не вдалось ні конвертувати адресну книгу, ні створити нову."
 
-#: src/addressbook.c:2565
+#: src/addressbook.c:2559
 msgid "Addressbook Conversion Error"
 msgstr "Помилка при конвертуванні адресної книги"
 
-#: src/addressbook.c:2571
+#: src/addressbook.c:2565
 msgid "Addressbook Conversion"
 msgstr "Конвертування адресної книги"
 
-#: src/addressbook.c:3086 src/prefs_common_dialog.c:2033
+#: src/addressbook.c:3080 src/prefs_common_dialog.c:2033
 msgid "Interface"
 msgstr "Інтерфейс"
 
-#: src/addressbook.c:3102 src/importldif.c:514
+#: src/addressbook.c:3096 src/importldif.c:514
 msgid "Address Book"
 msgstr "Адресна книга"
 
-#: src/addressbook.c:3118
+#: src/addressbook.c:3112
 msgid "Person"
 msgstr "Особа"
 
-#: src/addressbook.c:3134
+#: src/addressbook.c:3128
 msgid "EMail Address"
 msgstr "Адреса e-mail"
 
-#: src/addressbook.c:3150
+#: src/addressbook.c:3144
 msgid "Group"
 msgstr "Група"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3166 src/folderview.c:367 src/prefs_account_dialog.c:1694
-#: src/query_search.c:370
+#: src/addressbook.c:3160 src/folderview.c:367 src/prefs_account_dialog.c:1694
+#: src/query_search.c:398
 msgid "Folder"
 msgstr "Папка"
 
-#: src/addressbook.c:3182
+#: src/addressbook.c:3176
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3198 src/addressbook.c:3214
+#: src/addressbook.c:3192 src/addressbook.c:3208
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3230
+#: src/addressbook.c:3224
 msgid "LDAP Server"
 msgstr "Сервер LDAP"
 
@@ -1182,7 +1183,7 @@ msgstr "Адреса організації"
 msgid "Personal address"
 msgstr "Особиста адреса"
 
-#: src/alertpanel.c:142 src/compose.c:5500 src/main.c:621
+#: src/alertpanel.c:142 src/compose.c:5517 src/main.c:621
 msgid "Notice"
 msgstr "Примітка"
 
@@ -1190,7 +1191,7 @@ msgstr "Примітка"
 msgid "Warning"
 msgstr "Попередження"
 
-#: src/alertpanel.c:168 src/inc.c:587
+#: src/alertpanel.c:168 src/inc.c:586
 msgid "Error"
 msgstr "Помилка"
 
@@ -1233,7 +1234,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:4761
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4762
 msgid "None"
 msgstr "Ніякий"
 
@@ -1482,7 +1483,7 @@ msgstr "/Вигляд/Кодова таблиця/Тайська (TIS-620)"
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/Вигляд/Кодова таблиця/Тайська (Windows-874)"
 
-#: src/compose.c:646 src/mainwindow.c:759 src/messageview.c:267
+#: src/compose.c:646 src/mainwindow.c:759 src/messageview.c:268
 msgid "/_Tools/_Address book"
 msgstr "/Інструменти/Адресна книга"
 
@@ -1490,14 +1491,14 @@ msgstr "/Інструменти/Адресна книга"
 msgid "/_Tools/_Template"
 msgstr "/Інструменти/Шаблон"
 
-#: src/compose.c:649 src/mainwindow.c:783 src/messageview.c:283
+#: src/compose.c:649 src/mainwindow.c:783 src/messageview.c:284
 msgid "/_Tools/Actio_ns"
 msgstr "/Інструменти/Дії"
 
 #: src/compose.c:651 src/compose.c:655 src/compose.c:661 src/mainwindow.c:762
 #: src/mainwindow.c:776 src/mainwindow.c:781 src/mainwindow.c:784
-#: src/mainwindow.c:788 src/mainwindow.c:790 src/messageview.c:270
-#: src/messageview.c:282
+#: src/mainwindow.c:788 src/mainwindow.c:790 src/messageview.c:271
+#: src/messageview.c:283
 msgid "/_Tools/---"
 msgstr "/Інструменти/---"
 
@@ -1521,79 +1522,79 @@ msgstr "/Інструменти/Перевірка правопису"
 msgid "/_Tools/_Set spell language"
 msgstr "/Інструменти/Обрати мову для перевірки правопису"
 
-#: src/compose.c:910
+#: src/compose.c:912
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: файл не існує\n"
 
-#: src/compose.c:1014 src/compose.c:1085
+#: src/compose.c:1016 src/compose.c:1087
 msgid "Can't get text part\n"
 msgstr "Не вдалось отримати текстову частину\n"
 
-#: src/compose.c:1486
+#: src/compose.c:1488
 msgid "Quote mark format error."
 msgstr "Помилка у форматі цитування."
 
-#: src/compose.c:1498
+#: src/compose.c:1500
 msgid "Message reply/forward format error."
 msgstr "Помилка у форматі message reply/forward."
 
-#: src/compose.c:1918
+#: src/compose.c:1935
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Файл %s не існує\n"
 
-#: src/compose.c:1922
+#: src/compose.c:1939
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Не вдалось отримати розмір %s\n"
 
-#: src/compose.c:1926
+#: src/compose.c:1943
 #, c-format
 msgid "File %s is empty."
 msgstr "Файл %s порожній."
 
-#: src/compose.c:1930
+#: src/compose.c:1947
 #, c-format
 msgid "Can't read %s."
 msgstr "Не вдалось прочитати %s."
 
-#: src/compose.c:1963
+#: src/compose.c:1980
 #, c-format
 msgid "Message: %s"
 msgstr "Лист: %s"
 
-#: src/compose.c:2023 src/mimeview.c:565
+#: src/compose.c:2040 src/mimeview.c:565
 msgid "Can't get the part of multipart message."
 msgstr "Не вдалось отримати одну з частин листа."
 
-#: src/compose.c:2507 src/headerview.c:195 src/query_search.c:636
+#: src/compose.c:2524 src/headerview.c:195 src/query_search.c:666
 #: src/summaryview.c:2124
 msgid "(No Subject)"
 msgstr "(Без теми)"
 
-#: src/compose.c:2510
+#: src/compose.c:2527
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Створити лист%s"
 
-#: src/compose.c:2623
+#: src/compose.c:2642
 msgid "Recipient is not specified."
 msgstr "Не вказано отримувача."
 
-#: src/compose.c:2631
+#: src/compose.c:2650
 msgid "Empty subject"
 msgstr "Порожня тема"
 
-#: src/compose.c:2632
+#: src/compose.c:2651
 msgid "Subject is empty. Send it anyway?"
 msgstr "Поле Subject порожнє. Все ж послати?"
 
-#: src/compose.c:2691
+#: src/compose.c:2710
 msgid "can't get recipient list."
 msgstr "не вдалось отримати список отримувачів."
 
-#: src/compose.c:2711
+#: src/compose.c:2730
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1601,21 +1602,21 @@ msgstr ""
 "Обліковий запис для відсилання пошти не вказано.\n"
 "Оберіть, будь-ласка, запис перед відправкою."
 
-#: src/compose.c:2725 src/send_message.c:299
+#: src/compose.c:2744 src/send_message.c:299
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Трапилась помилка при відсиланні листа до %s ."
 
-#: src/compose.c:2767
+#: src/compose.c:2786
 msgid "Can't save the message to outbox."
 msgstr "Не вдалось зберегти лист в outbox."
 
-#: src/compose.c:2805
+#: src/compose.c:2824
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "Не вдалось знайти ключа, відповідного обраному ідентифікатору `%s'."
 
-#: src/compose.c:2902
+#: src/compose.c:2921
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1626,11 +1627,11 @@ msgstr ""
 "%s на %s.\n"
 "Все ж послати як %s?"
 
-#: src/compose.c:2908
+#: src/compose.c:2927
 msgid "Code conversion error"
 msgstr "Помилка при перетворенні кодування"
 
-#: src/compose.c:2981
+#: src/compose.c:3000
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1643,157 +1644,157 @@ msgstr ""
 "\n"
 "Все ж відіслати?"
 
-#: src/compose.c:2985
+#: src/compose.c:3004
 msgid "Line length limit"
 msgstr "Максимальна довжина рядка"
 
-#: src/compose.c:3275
+#: src/compose.c:3294
 msgid "can't remove the old message\n"
 msgstr "не вдалось видалити старий лист\n"
 
-#: src/compose.c:3293
+#: src/compose.c:3312
 msgid "queueing message...\n"
 msgstr "лист в чергу...\n"
 
-#: src/compose.c:3375
+#: src/compose.c:3394
 msgid "can't find queue folder\n"
 msgstr "не вдалось знайти папку черги\n"
 
-#: src/compose.c:3382
+#: src/compose.c:3401
 msgid "can't queue the message\n"
 msgstr "не вдалось поставити лист в чергу\n"
 
-#: src/compose.c:3975
+#: src/compose.c:3994
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "генерований Message-ID: %s\n"
 
-#: src/compose.c:4088
+#: src/compose.c:4107
 msgid "Creating compose window...\n"
 msgstr "Відкриваємо вікно створення листа...\n"
 
-#: src/compose.c:4139 src/headerview.c:54
+#: src/compose.c:4158 src/headerview.c:54
 msgid "From:"
 msgstr "Від:"
 
-#: src/compose.c:4213
+#: src/compose.c:4232
 msgid "PGP Sign"
 msgstr "Підпис PGP"
 
-#: src/compose.c:4216
+#: src/compose.c:4235
 msgid "PGP Encrypt"
 msgstr "Шифрування PGP"
 
-#: src/compose.c:4254 src/compose.c:5332
+#: src/compose.c:4273 src/compose.c:5351
 msgid "MIME type"
 msgstr "тип MIME"
 
 #. S_COL_DATE
-#: src/compose.c:4263 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4908
+#: src/compose.c:4282 src/mimeview.c:197 src/prefs_filter_edit.c:496
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4909
 msgid "Size"
 msgstr "Розмір"
 
-#: src/compose.c:4698 src/mainwindow.c:2359 src/prefs_account_dialog.c:528
+#: src/compose.c:4717 src/mainwindow.c:2359 src/prefs_account_dialog.c:528
 #: src/prefs_common_dialog.c:661
 msgid "Send"
 msgstr "Послати"
 
-#: src/compose.c:4699
+#: src/compose.c:4718
 msgid "Send message"
 msgstr "Послати лист"
 
-#: src/compose.c:4707
+#: src/compose.c:4726
 msgid "Send later"
 msgstr "Послати пізніше"
 
-#: src/compose.c:4708
+#: src/compose.c:4727
 msgid "Put into queue folder and send later"
 msgstr "Покласти в папку черги і послати пізніше"
 
-#: src/compose.c:4716
+#: src/compose.c:4735
 msgid "Draft"
 msgstr "Чернетка"
 
-#: src/compose.c:4717
+#: src/compose.c:4736
 msgid "Save to draft folder"
 msgstr "Зберегти в папці чернеток"
 
-#: src/compose.c:4727
+#: src/compose.c:4746
 msgid "Insert"
 msgstr "Вставити"
 
-#: src/compose.c:4728
+#: src/compose.c:4747
 msgid "Insert file"
 msgstr "Вставити файл"
 
-#: src/compose.c:4736
+#: src/compose.c:4755
 msgid "Attach"
 msgstr "Приєднати"
 
-#: src/compose.c:4737
+#: src/compose.c:4756
 msgid "Attach file"
 msgstr "Приєднати файл"
 
 #. signature
-#: src/compose.c:4747 src/prefs_account_dialog.c:1208
+#: src/compose.c:4766 src/prefs_account_dialog.c:1208
 #: src/prefs_common_dialog.c:953
 msgid "Signature"
 msgstr "Підпис"
 
-#: src/compose.c:4748
+#: src/compose.c:4767
 #, fuzzy
 msgid "Append signature"
 msgstr "ПОГАНИЙ підпис"
 
 #. editor
-#: src/compose.c:4757 src/prefs_common_dialog.c:991
+#: src/compose.c:4776 src/prefs_common_dialog.c:991
 #: src/prefs_common_dialog.c:2315
 msgid "Editor"
 msgstr "Редактор"
 
-#: src/compose.c:4758
+#: src/compose.c:4777
 msgid "Edit with external editor"
 msgstr "Редагувати зовнішнім редактором"
 
-#: src/compose.c:4766
+#: src/compose.c:4785
 msgid "Linewrap"
 msgstr "Згортання рядків"
 
-#: src/compose.c:4767
+#: src/compose.c:4786
 msgid "Wrap all long lines"
 msgstr "Згорнути всі довгі рядки"
 
-#: src/compose.c:5228
+#: src/compose.c:5247
 msgid "Invalid MIME type."
 msgstr "Неправильний тип MIME."
 
-#: src/compose.c:5246
+#: src/compose.c:5265
 msgid "File doesn't exist or is empty."
 msgstr "Файл не існує або порожній."
 
-#: src/compose.c:5314
+#: src/compose.c:5333
 msgid "Properties"
 msgstr "Властивості"
 
-#: src/compose.c:5334 src/prefs_common_dialog.c:1444
+#: src/compose.c:5353 src/prefs_common_dialog.c:1444
 msgid "Encoding"
 msgstr "Кодування"
 
-#: src/compose.c:5357 src/prefs_folder_item.c:202
+#: src/compose.c:5376 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Шлях"
 
-#: src/compose.c:5358
+#: src/compose.c:5377
 msgid "File name"
 msgstr "Ім'я файлу"
 
-#: src/compose.c:5449
+#: src/compose.c:5466
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Командний рядок зовнішнього редактора неправильний: `%s'\n"
 
-#: src/compose.c:5497
+#: src/compose.c:5514
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1802,44 +1803,44 @@ msgstr ""
 "Зовнішній редактор досі працює.\n"
 "Примусово обірвати процес (pid: %d)?\n"
 
-#: src/compose.c:5872 src/compose.c:5877 src/compose.c:5883
+#: src/compose.c:5889 src/compose.c:5894 src/compose.c:5900
 msgid "Can't queue the message."
 msgstr "Не вдалось поставити лист в чергу."
 
-#: src/compose.c:5974
+#: src/compose.c:5991
 msgid "Select files"
 msgstr "Обрати файли"
 
-#: src/compose.c:5997
+#: src/compose.c:6014
 msgid "Select file"
 msgstr "Обрати файл"
 
-#: src/compose.c:6032
+#: src/compose.c:6049
 msgid "Save message"
 msgstr "Зберегти лист"
 
-#: src/compose.c:6033
+#: src/compose.c:6050
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Цей лист було змінено. Зберегти в папці чернеток?"
 
-#: src/compose.c:6035
+#: src/compose.c:6052
 msgid "Close _without saving"
 msgstr "Закрити без збереження"
 
-#: src/compose.c:6077
+#: src/compose.c:6094
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Чи бажаєте Ви застосувати шаблон `%s' ?"
 
-#: src/compose.c:6079
+#: src/compose.c:6096
 msgid "Apply template"
 msgstr "Застосувати шаблон"
 
-#: src/compose.c:6080
+#: src/compose.c:6097
 msgid "_Replace"
 msgstr "Замінити"
 
-#: src/compose.c:6080
+#: src/compose.c:6097
 msgid "_Insert"
 msgstr "Вставити"
 
@@ -1960,52 +1961,52 @@ msgstr "Потрібно вказати назву групи."
 msgid "Edit Group Data"
 msgstr "Редагувати дані групи"
 
-#: src/editgroup.c:300
+#: src/editgroup.c:299
 msgid "Group Name"
 msgstr "Назва групи"
 
-#: src/editgroup.c:319
+#: src/editgroup.c:318
 msgid "Addresses in Group"
 msgstr "Адреси в групі"
 
-#: src/editgroup.c:321
+#: src/editgroup.c:320
 msgid " -> "
 msgstr " -> "
 
-#: src/editgroup.c:348
+#: src/editgroup.c:347
 msgid " <- "
 msgstr " <- "
 
-#: src/editgroup.c:350
+#: src/editgroup.c:349
 msgid "Available Addresses"
 msgstr "Наявні адреси"
 
-#: src/editgroup.c:416
+#: src/editgroup.c:415
 msgid "Move E-Mail Addresses to or from Group with arrow buttons"
 msgstr "Перемістити адреси e-mail з чи в групу кнопкою з стрілкою"
 
-#: src/editgroup.c:468
+#: src/editgroup.c:467
 msgid "Edit Group Details"
 msgstr "Редагувати подробиці про групу"
 
-#: src/editgroup.c:471
+#: src/editgroup.c:470
 msgid "Add New Group"
 msgstr "Додати нову групу"
 
-#: src/editgroup.c:522
+#: src/editgroup.c:521
 msgid "Edit folder"
 msgstr "Редагувати папку"
 
-#: src/editgroup.c:522
+#: src/editgroup.c:521
 msgid "Input the new name of folder:"
 msgstr "Введіть нову назву папки:"
 
-#: src/editgroup.c:525 src/foldersel.c:541 src/folderview.c:2121
+#: src/editgroup.c:524 src/foldersel.c:541 src/folderview.c:2121
 #: src/folderview.c:2127
 msgid "New folder"
 msgstr "Нова папка"
 
-#: src/editgroup.c:526 src/foldersel.c:542 src/folderview.c:2128
+#: src/editgroup.c:525 src/foldersel.c:542 src/folderview.c:2128
 msgid "Input the name of new folder:"
 msgstr "Введіть назву нової папки:"
 
@@ -2202,7 +2203,7 @@ msgid "`%c' can't be included in folder name."
 msgstr "`%c' не може міститись в назві папки."
 
 #: src/foldersel.c:561 src/folderview.c:2147 src/folderview.c:2206
-#: src/query_search.c:995
+#: src/query_search.c:1031
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Папка `%s' вже існує."
@@ -2461,7 +2462,7 @@ msgstr "Тема:"
 msgid "Creating header view...\n"
 msgstr "Створюємо область перегляду заголовка...\n"
 
-#: src/headerview.c:180 src/query_search.c:637 src/summaryview.c:2127
+#: src/headerview.c:180 src/query_search.c:667 src/summaryview.c:2127
 msgid "(No From)"
 msgstr "(Без відправника)"
 
@@ -2591,133 +2592,133 @@ msgstr "Закінчити"
 msgid "Sylpheed: %d new messages"
 msgstr "Sylpheed: %d нових листів"
 
-#: src/inc.c:372
+#: src/inc.c:371
 msgid "Retrieving new messages"
 msgstr "Отримання нових листів"
 
-#: src/inc.c:415
+#: src/inc.c:414
 msgid "Standby"
 msgstr "Очікування"
 
-#: src/inc.c:544 src/inc.c:593
+#: src/inc.c:543 src/inc.c:592
 msgid "Cancelled"
 msgstr "Скасовано"
 
-#: src/inc.c:555
+#: src/inc.c:554
 msgid "Retrieving"
 msgstr "Отримання"
 
-#: src/inc.c:564
+#: src/inc.c:563
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "Виконано (%d лист(ів) (%s) отримано)"
 
-#: src/inc.c:568
+#: src/inc.c:567
 msgid "Done (no new messages)"
 msgstr "Виконано (немає нових листів)"
 
-#: src/inc.c:574
+#: src/inc.c:573
 msgid "Connection failed"
 msgstr "Невдача з'єднання"
 
-#: src/inc.c:577
+#: src/inc.c:576
 msgid "Auth failed"
 msgstr "Невдача автентифікації"
 
-#: src/inc.c:580
+#: src/inc.c:579
 msgid "Locked"
 msgstr "Заблоковано"
 
-#: src/inc.c:590
+#: src/inc.c:589
 msgid "Timeout"
 msgstr "Таймаут"
 
-#: src/inc.c:640
+#: src/inc.c:639
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Закінчено (%d нових листів)"
 
-#: src/inc.c:643
+#: src/inc.c:642
 msgid "Finished (no new messages)"
 msgstr "Закінчено (немає нових листів)"
 
-#: src/inc.c:652
+#: src/inc.c:651
 msgid "Some errors occurred while getting mail."
 msgstr "При отриманні пошти трапились деякі помилки."
 
-#: src/inc.c:688
+#: src/inc.c:687
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "отримання нової пошти для запису %s...\n"
 
-#: src/inc.c:691
+#: src/inc.c:690
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Отримання нових листів"
 
-#: src/inc.c:710
+#: src/inc.c:709
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "З'єднуємось з сервером POP3: %s ..."
 
-#: src/inc.c:719
+#: src/inc.c:718
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Не вдалось з'єднатись з сервером POP3: %s:%d\n"
 
-#: src/inc.c:798 src/send_message.c:631
+#: src/inc.c:797 src/send_message.c:631
 msgid "Authenticating..."
 msgstr "Автентифікація..."
 
-#: src/inc.c:799
+#: src/inc.c:798
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Отримуємо листи від %s..."
 
-#: src/inc.c:804
+#: src/inc.c:803
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Отримуємо кількість нових листів (STAT)..."
 
-#: src/inc.c:808
+#: src/inc.c:807
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Отримуємо кількість нових листів (LAST)..."
 
-#: src/inc.c:812
+#: src/inc.c:811
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Отримуємо кількість нових листів (UIDL)..."
 
-#: src/inc.c:816
+#: src/inc.c:815
 msgid "Getting the size of messages (LIST)..."
 msgstr "Отримуємо розмір листів (LIST)..."
 
-#: src/inc.c:826
+#: src/inc.c:825
 #, c-format
 msgid "Deleting message %d"
 msgstr "Видаляємо лист %d"
 
-#: src/inc.c:833 src/send_message.c:649
+#: src/inc.c:832 src/send_message.c:649
 msgid "Quitting"
 msgstr "Виходимо"
 
-#: src/inc.c:858
+#: src/inc.c:857
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Отримуємо лист (%d / %d) (%s / %s)"
 
-#: src/inc.c:879
+#: src/inc.c:878
 #, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Отримуємо лист (%d лист(ів) (%s) отримано)"
 
-#: src/inc.c:1107
+#: src/inc.c:1106
 msgid "Connection failed."
 msgstr "Невдача з'єднання."
 
-#: src/inc.c:1113
+#: src/inc.c:1112
 msgid "Error occurred while processing mail."
 msgstr "При обробці пошти трапилась помилка."
 
-#: src/inc.c:1118
+#: src/inc.c:1117
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2726,28 +2727,28 @@ msgstr ""
 "При обробці пошти трапилась помилка:\n"
 "%s"
 
-#: src/inc.c:1124
+#: src/inc.c:1123
 msgid "No disk space left."
 msgstr "Немає вільного місця на диску."
 
-#: src/inc.c:1129
+#: src/inc.c:1128
 msgid "Can't write file."
 msgstr "Не вдалось писати в файл."
 
-#: src/inc.c:1134
+#: src/inc.c:1133
 msgid "Socket error."
 msgstr "Помилка сокета."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1140 src/send_message.c:584 src/send_message.c:772
+#: src/inc.c:1139 src/send_message.c:584 src/send_message.c:772
 msgid "Connection closed by the remote host."
 msgstr "З'єднання закрито віддаленим хостом."
 
-#: src/inc.c:1146
+#: src/inc.c:1145
 msgid "Mailbox is locked."
 msgstr "Скриньку заблоковано."
 
-#: src/inc.c:1150
+#: src/inc.c:1149
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2756,11 +2757,11 @@ msgstr ""
 "Скриньку заблоковано:\n"
 "%s"
 
-#: src/inc.c:1156 src/send_message.c:757
+#: src/inc.c:1155 src/send_message.c:757
 msgid "Authentication failed."
 msgstr "Невдача аутентифікації."
 
-#: src/inc.c:1161 src/send_message.c:760
+#: src/inc.c:1160 src/send_message.c:760
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2769,15 +2770,15 @@ msgstr ""
 "Невдача аутентифікації:\n"
 "%s"
 
-#: src/inc.c:1166 src/send_message.c:776
+#: src/inc.c:1165 src/send_message.c:776
 msgid "Session timed out."
 msgstr "Таймаут сесії."
 
-#: src/inc.c:1202
+#: src/inc.c:1201
 msgid "Incorporation cancelled\n"
 msgstr "Включення скасовано\n"
 
-#: src/inc.c:1285
+#: src/inc.c:1284
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Отримуємо нові листи від %s в %s...\n"
@@ -3249,14 +3250,15 @@ msgid "/_View/Mess_age source"
 msgstr "/Вигляд/Вихідний текст листа"
 
 #: src/mainwindow.c:708 src/messageview.c:245
-msgid "/_View/Show all _header"
+#, fuzzy
+msgid "/_View/Show all _headers"
 msgstr "/Вигляд/Показати весь заголовок"
 
 #: src/mainwindow.c:710
 msgid "/_View/_Update summary"
 msgstr "/Вигляд/Оновити список"
 
-#: src/mainwindow.c:712 src/messageview.c:247
+#: src/mainwindow.c:712 src/messageview.c:248
 msgid "/_Message"
 msgstr "/Лист"
 
@@ -3286,16 +3288,16 @@ msgstr "/Лист/Відіслати відкладені листи"
 
 #: src/mainwindow.c:722 src/mainwindow.c:724 src/mainwindow.c:731
 #: src/mainwindow.c:736 src/mainwindow.c:739 src/mainwindow.c:750
-#: src/mainwindow.c:752 src/mainwindow.c:755 src/messageview.c:250
-#: src/messageview.c:258 src/messageview.c:263
+#: src/mainwindow.c:752 src/mainwindow.c:755 src/messageview.c:251
+#: src/messageview.c:259 src/messageview.c:264
 msgid "/_Message/---"
 msgstr "/Лист/---"
 
-#: src/mainwindow.c:723 src/messageview.c:248
+#: src/mainwindow.c:723 src/messageview.c:249
 msgid "/_Message/Compose _new message"
 msgstr "/Лист/Написати новий лист"
 
-#: src/mainwindow.c:725 src/messageview.c:251
+#: src/mainwindow.c:725 src/messageview.c:252
 msgid "/_Message/_Reply"
 msgstr "/Лист/Відповісти"
 
@@ -3303,27 +3305,27 @@ msgstr "/Лист/Відповісти"
 msgid "/_Message/Repl_y to"
 msgstr "/Лист/Відповісти"
 
-#: src/mainwindow.c:727 src/messageview.c:252
+#: src/mainwindow.c:727 src/messageview.c:253
 msgid "/_Message/Repl_y to/_all"
 msgstr "/Лист/Відповісти/всім"
 
-#: src/mainwindow.c:728 src/messageview.c:254
+#: src/mainwindow.c:728 src/messageview.c:255
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/Лист/Відповісти/відправнику"
 
-#: src/mainwindow.c:729 src/messageview.c:256
+#: src/mainwindow.c:729 src/messageview.c:257
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/Лист/Відповісти/конференції"
 
-#: src/mainwindow.c:732 src/messageview.c:259
+#: src/mainwindow.c:732 src/messageview.c:260
 msgid "/_Message/_Forward"
 msgstr "/Лист/Переслати"
 
-#: src/mainwindow.c:733 src/messageview.c:260
+#: src/mainwindow.c:733 src/messageview.c:261
 msgid "/_Message/For_ward as attachment"
 msgstr "/Лист/Переслати як вкладення"
 
-#: src/mainwindow.c:735 src/messageview.c:262
+#: src/mainwindow.c:735 src/messageview.c:263
 msgid "/_Message/Redirec_t"
 msgstr "/Лист/Переспрямувати"
 
@@ -3380,7 +3382,7 @@ msgstr "/Лист/Вважати мотлохом"
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/Лист/Не вважати мотлохом"
 
-#: src/mainwindow.c:756 src/messageview.c:264
+#: src/mainwindow.c:756 src/messageview.c:265
 msgid "/_Message/Re-_edit"
 msgstr "/Лист/Змінити"
 
@@ -3396,23 +3398,23 @@ msgstr "/Інструменти/Фільтрувати всі листи в па
 msgid "/_Tools/Filter _selected messages"
 msgstr "/Інструменти/Фільтрувати виділені листи"
 
-#: src/mainwindow.c:767 src/messageview.c:271
+#: src/mainwindow.c:767 src/messageview.c:272
 msgid "/_Tools/_Create filter rule"
 msgstr "/Інструменти/Створити правило фільтрування"
 
-#: src/mainwindow.c:768 src/messageview.c:273
+#: src/mainwindow.c:768 src/messageview.c:274
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/Інструменти/Створити правило фільтрування/Автоматично"
 
-#: src/mainwindow.c:770 src/messageview.c:275
+#: src/mainwindow.c:770 src/messageview.c:276
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/Інструменти/Створити правило фільтрування/За полем `Від'"
 
-#: src/mainwindow.c:772 src/messageview.c:277
+#: src/mainwindow.c:772 src/messageview.c:278
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/Інструменти/Створити правило фільтрування/За полем `Кому'"
 
-#: src/mainwindow.c:774 src/messageview.c:279
+#: src/mainwindow.c:774 src/messageview.c:280
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/Інструменти/Створити правило фільтрування/За полем `Тема'"
 
@@ -3531,7 +3533,7 @@ msgid "MainWindow: color allocation %d failed\n"
 msgstr "Головне Вікно: невдача розміщення кольору %d\n"
 
 #: src/mainwindow.c:1139 src/summaryview.c:2275 src/summaryview.c:2360
-#: src/summaryview.c:3907 src/summaryview.c:4036 src/summaryview.c:4394
+#: src/summaryview.c:3908 src/summaryview.c:4037 src/summaryview.c:4395
 msgid "done.\n"
 msgstr "виконано.\n"
 
@@ -3790,7 +3792,7 @@ msgid "Find text:"
 msgstr "Знайти текст:"
 
 #: src/message_search.c:153 src/prefs_search_folder.c:253
-#: src/query_search.c:326
+#: src/query_search.c:343
 msgid "Case sensitive"
 msgstr "Враховувати регістр"
 
@@ -3814,27 +3816,27 @@ msgstr "Досягнуто кінця листа; продовжити з поч
 msgid "Search finished"
 msgstr "Пошук закінчено"
 
-#: src/messageview.c:268
+#: src/messageview.c:269
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/Інструменти/Додати відправника до адресної книги"
 
-#: src/messageview.c:300
+#: src/messageview.c:301
 msgid "Creating message view...\n"
 msgstr "Створюємо область перегляду листа...\n"
 
-#: src/messageview.c:325
+#: src/messageview.c:326
 msgid "Text"
 msgstr "Текст"
 
-#: src/messageview.c:330
+#: src/messageview.c:331
 msgid "Attachments"
 msgstr "Вкладення"
 
-#: src/messageview.c:380
+#: src/messageview.c:381
 msgid "Message View - Sylpheed"
 msgstr "Зміст листа - Sylpheed"
 
-#: src/messageview.c:699 src/summaryview.c:3436
+#: src/messageview.c:700 src/summaryview.c:3436
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Не вдалось зберегти файл `%s'."
@@ -3851,7 +3853,7 @@ msgstr "(Команда друку за замовчуванням)"
 msgid "Print"
 msgstr "Друк"
 
-#: src/messageview.c:770 src/summaryview.c:3471
+#: src/messageview.c:769 src/summaryview.c:3470
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -3946,11 +3948,11 @@ msgstr ""
 "Введіть команду для відкриття файла:\n"
 "(`%s' буде замінено на його ім'я)"
 
-#: src/mimeview.c:1147
+#: src/mimeview.c:1140
 msgid "Opening executable file"
 msgstr "Відкриваємо виконуваний файл"
 
-#: src/mimeview.c:1148
+#: src/mimeview.c:1141
 msgid ""
 "This is an executable file. Opening executable file is restricted for "
 "security.\n"
@@ -3962,11 +3964,6 @@ msgstr ""
 "Якщо бажаєте запустити цей файл, збережіть його і переконайтесь, що це не "
 "вірус чи щось шкідливе."
 
-#: src/mimeview.c:1184
-#, c-format
-msgid "MIME viewer command line is invalid: `%s'"
-msgstr "Командний рядок переглядача MIME невірний: `%s'"
-
 #: src/passphrase.c:96
 msgid "Passphrase"
 msgstr "Пароль"
@@ -5707,20 +5704,20 @@ msgstr "Зворотня:"
 msgid "%s - Edit search condition"
 msgstr ""
 
-#: src/prefs_search_folder.c:209 src/query_search.c:257
+#: src/prefs_search_folder.c:209 src/query_search.c:274
 msgid "Match any of the following"
 msgstr "Якщо виконано будь-яку з умов"
 
-#: src/prefs_search_folder.c:211 src/query_search.c:259
+#: src/prefs_search_folder.c:211 src/query_search.c:276
 msgid "Match all of the following"
 msgstr "Якщо виконано всі умови"
 
-#: src/prefs_search_folder.c:231 src/query_search.c:303
+#: src/prefs_search_folder.c:231 src/query_search.c:320
 #, fuzzy
 msgid "Folder:"
 msgstr "Папка"
 
-#: src/prefs_search_folder.c:248 src/query_search.c:321
+#: src/prefs_search_folder.c:248 src/query_search.c:338
 #, fuzzy
 msgid "Search subfolders"
 msgstr "Невдача пошуку"
@@ -5735,17 +5732,17 @@ msgid "Attachment"
 msgstr "Вкладення"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73 src/query_search.c:371 src/summaryview.c:4901
+#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4902
 msgid "Subject"
 msgstr "Тема"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/query_search.c:372 src/summaryview.c:4904
+#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4905
 msgid "From"
 msgstr "Від"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/query_search.c:373 src/summaryview.c:4906
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:4907
 msgid "Date"
 msgstr "Дата"
 
@@ -5838,43 +5835,43 @@ msgstr "Створюємо діалогове вікно прогресу...\n"
 msgid "Status"
 msgstr "Стан"
 
-#: src/query_search.c:234
+#: src/query_search.c:251
 msgid "Search messages"
 msgstr "Шукати повідомлення"
 
-#: src/query_search.c:395
+#: src/query_search.c:423
 #, fuzzy
 msgid "_Save as search folder"
 msgstr "Зберегти в папці чернеток"
 
-#: src/query_search.c:512 src/subscribedialog.c:526 src/summaryview.c:842
+#: src/query_search.c:542 src/subscribedialog.c:526 src/summaryview.c:842
 msgid "Done."
 msgstr "Виконано."
 
-#: src/query_search.c:536
+#: src/query_search.c:566
 #, fuzzy, c-format
 msgid "Searching %s ..."
 msgstr "Перечитуємо папку %s ..."
 
-#: src/query_search.c:564
+#: src/query_search.c:594
 #, fuzzy, c-format
 msgid "Searching %s (%d / %d)..."
 msgstr "Посилаємо лист (%d / %d байтів)"
 
-#: src/query_search.c:645 src/summaryview.c:2051
+#: src/query_search.c:675 src/summaryview.c:2051
 msgid "(No Date)"
 msgstr "(Без дати)"
 
-#: src/query_search.c:833
+#: src/query_search.c:869
 #, fuzzy
 msgid "Save as search folder"
 msgstr "Зберегти в папці чернеток"
 
-#: src/query_search.c:854
+#: src/query_search.c:890
 msgid "Location:"
 msgstr ""
 
-#: src/query_search.c:869
+#: src/query_search.c:905
 #, fuzzy
 msgid "Folder name:"
 msgstr "Ім'я файлу"
@@ -6502,37 +6499,37 @@ msgstr "Лист %d призначено до копіювання в %s\n"
 msgid "Destination for copy is same as current folder."
 msgstr "Пропонується копіювання з папки в неї ж."
 
-#: src/summaryview.c:3506
+#: src/summaryview.c:3507
 msgid "Error occurred while processing messages."
 msgstr "При обробці пошти трапилась помилка."
 
-#: src/summaryview.c:3814 src/summaryview.c:3815
+#: src/summaryview.c:3815 src/summaryview.c:3816
 msgid "Building threads..."
 msgstr "Будуємо нитки обговорення..."
 
-#: src/summaryview.c:3965 src/summaryview.c:3966
+#: src/summaryview.c:3966 src/summaryview.c:3967
 msgid "Unthreading..."
 msgstr "Скасування ниток обговорення..."
 
-#: src/summaryview.c:4259 src/summaryview.c:4315
+#: src/summaryview.c:4260 src/summaryview.c:4316
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Фільтрування..."
 
-#: src/summaryview.c:4364
+#: src/summaryview.c:4365
 msgid "filtering..."
 msgstr "фільтрування..."
 
-#: src/summaryview.c:4365
+#: src/summaryview.c:4366
 msgid "Filtering..."
 msgstr "Фільтрування..."
 
-#: src/summaryview.c:4401
+#: src/summaryview.c:4402
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "%d листів відфільтровано."
 
-#: src/summaryview.c:4910
+#: src/summaryview.c:4911
 msgid "No."
 msgstr "Номер"
 
@@ -6619,6 +6616,9 @@ msgstr "Вихід"
 msgid "Sylpheed"
 msgstr "Sylpheed"
 
+#~ msgid "MIME viewer command line is invalid: `%s'"
+#~ msgstr "Командний рядок переглядача MIME невірний: `%s'"
+
 #~ msgid "%dB"
 #~ msgstr "%dB"
 
diff --git a/po/vi.po b/po/vi.po
index 3d225b4a..5c81cbae 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-03-02 19:03+0900\n"
+"POT-Creation-Date: 2006-03-10 16:06+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:491
+#: libsylph/prefs_common.c:496
 msgid "Junk mail filter"
 msgstr "Lọc thư rác"
 
@@ -522,7 +522,7 @@ msgstr "không thể mở tập tin đánh dấu\n"
 msgid "can't fetch message %d\n"
 msgstr "không thể lấy thư %d\n"
 
-#: libsylph/procmsg.c:1375
+#: libsylph/procmsg.c:1378
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Lệnh in không hợp lệ: `%s'\n"
@@ -600,12 +600,12 @@ msgstr "  Tiêu đề: %s\n"
 msgid "  Issuer: %s\n"
 msgstr "  Người phát hành: %s\n"
 
-#: libsylph/utils.c:2411 src/compose.c:2869 src/compose.c:3132
-#: src/compose.c:3195 src/compose.c:3315
+#: libsylph/utils.c:2430 src/compose.c:2888 src/compose.c:3151
+#: src/compose.c:3214 src/compose.c:3334
 msgid "can't change file mode\n"
 msgstr "không thể đổi chế độ tập tin\n"
 
-#: libsylph/utils.c:2418 libsylph/utils.c:2542
+#: libsylph/utils.c:2437 libsylph/utils.c:2561
 #, c-format
 msgid "writing to %s failed.\n"
 msgstr "thất bại khi ghi vào %s.\n"
@@ -673,8 +673,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:493
-#: src/compose.c:4273 src/editaddress.c:200 src/editaddress.c:942
+#: src/account_dialog.c:366 src/addressadd.c:192 src/addressbook.c:491
+#: src/compose.c:4292 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
@@ -810,12 +810,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:4777 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4796 src/editaddress.c:201
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "Địa chỉ"
 
-#: src/addressadd.c:212 src/addressbook.c:495 src/editaddress.c:202
+#: src/addressadd.c:212 src/addressbook.c:493 src/editaddress.c:202
 #: src/editaddress.c:795 src/editaddress.c:860 src/editgroup.c:267
 msgid "Remarks"
 msgstr "Ghi chú"
@@ -824,110 +824,111 @@ msgstr "Ghi chú"
 msgid "Select Address Book Folder"
 msgstr "Chọn thư mục sổ địa chỉ"
 
-#: src/addressbook.c:338 src/compose.c:515 src/mainwindow.c:489
+#: src/addressbook.c:337 src/compose.c:515 src/mainwindow.c:489
 #: src/messageview.c:140
 msgid "/_File"
 msgstr "/_Tập tin"
 
-#: src/addressbook.c:339
+#: src/addressbook.c:338
 msgid "/_File/New _Book"
 msgstr "/_Tập tin/_Sổ mới"
 
-#: src/addressbook.c:340
+#: src/addressbook.c:339
 msgid "/_File/New _vCard"
 msgstr "/_Tập tin/_vCard mới"
 
-#: src/addressbook.c:342
+#: src/addressbook.c:341
 msgid "/_File/New _JPilot"
 msgstr "/_Tập tin/_JPilot mới"
 
-#: src/addressbook.c:345
-msgid "/_File/New _Server"
+#: src/addressbook.c:344
+#, fuzzy
+msgid "/_File/New _LDAP Server"
 msgstr "/_Tập tin/_Máy chủ mới"
 
-#: src/addressbook.c:347 src/addressbook.c:350 src/compose.c:520
+#: src/addressbook.c:346 src/addressbook.c:349 src/compose.c:520
 #: src/compose.c:525 src/compose.c:528 src/compose.c:531 src/mainwindow.c:507
 #: src/mainwindow.c:510 src/mainwindow.c:512 src/mainwindow.c:515
 #: src/mainwindow.c:517 src/messageview.c:143
 msgid "/_File/---"
 msgstr "/_Tập tin/---"
 
-#: src/addressbook.c:348
+#: src/addressbook.c:347
 msgid "/_File/_Edit"
 msgstr "/_Tập tin/Soạ_n"
 
-#: src/addressbook.c:349
+#: src/addressbook.c:348
 msgid "/_File/_Delete"
 msgstr "/_Tập tin/_Xoá"
 
-#: src/addressbook.c:351
+#: src/addressbook.c:350
 msgid "/_File/_Save"
 msgstr "/_Tập tin/_Lưu"
 
-#: src/addressbook.c:352 src/compose.c:532 src/messageview.c:144
+#: src/addressbook.c:351 src/compose.c:532 src/messageview.c:144
 msgid "/_File/_Close"
 msgstr "/_Tập tin/Đón_g"
 
-#: src/addressbook.c:353
+#: src/addressbook.c:352
 msgid "/_Address"
 msgstr "/Đị_a chỉ"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:353
 msgid "/_Address/New _Address"
 msgstr "/Đị_a chỉ/Địa chỉ _mới"
 
-#: src/addressbook.c:355
+#: src/addressbook.c:354
 msgid "/_Address/New _Group"
 msgstr "/Đị_a chỉ/_Nhóm mới"
 
-#: src/addressbook.c:356
+#: src/addressbook.c:355
 msgid "/_Address/New _Folder"
 msgstr "/Đị_a chỉ/_Thư mục mới"
 
-#: src/addressbook.c:357
+#: src/addressbook.c:356
 msgid "/_Address/---"
 msgstr "/Đị_a chỉ/---"
 
-#: src/addressbook.c:358
+#: src/addressbook.c:357
 msgid "/_Address/_Edit"
 msgstr "/Đị_a chỉ/_Soạn"
 
-#: src/addressbook.c:359
+#: src/addressbook.c:358
 msgid "/_Address/_Delete"
 msgstr "/Đị_a chỉ/_Xoá"
 
-#: src/addressbook.c:360 src/compose.c:645 src/mainwindow.c:758
-#: src/messageview.c:266
+#: src/addressbook.c:359 src/compose.c:645 src/mainwindow.c:758
+#: src/messageview.c:267
 msgid "/_Tools"
 msgstr "/_Công cụ"
 
-#: src/addressbook.c:361
+#: src/addressbook.c:360
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Công cụ/_Nhập tập tin LDIF"
 
-#: src/addressbook.c:362 src/compose.c:666 src/mainwindow.c:812
-#: src/messageview.c:286
+#: src/addressbook.c:361 src/compose.c:666 src/mainwindow.c:812
+#: src/messageview.c:287
 msgid "/_Help"
 msgstr "/_Hỗ trợ"
 
-#: src/addressbook.c:363 src/compose.c:667 src/mainwindow.c:824
-#: src/messageview.c:287
+#: src/addressbook.c:362 src/compose.c:667 src/mainwindow.c:824
+#: src/messageview.c:288
 msgid "/_Help/_About"
 msgstr "/_Hỗ trợ/_Giới thiệu"
 
-#: src/addressbook.c:382 src/addressbook.c:392
+#: src/addressbook.c:381 src/addressbook.c:391
 msgid "/New _Address"
 msgstr "/Địa chỉ _mới"
 
-#: src/addressbook.c:383 src/addressbook.c:393
+#: src/addressbook.c:382 src/addressbook.c:392
 msgid "/New _Group"
 msgstr "/_Nhóm mới"
 
-#: src/addressbook.c:384 src/addressbook.c:394
+#: src/addressbook.c:383 src/addressbook.c:393
 msgid "/New _Folder"
 msgstr "/Thư _mục mới"
 
-#: src/addressbook.c:385 src/addressbook.c:395 src/compose.c:509
+#: src/addressbook.c:384 src/addressbook.c:394 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
@@ -937,70 +938,70 @@ msgstr "/Thư _mục mới"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:386 src/addressbook.c:396 src/compose.c:534
+#: src/addressbook.c:385 src/addressbook.c:395 src/compose.c:534
 #: src/mainwindow.c:521 src/messageview.c:146
 msgid "/_Edit"
 msgstr "/_Soạn"
 
-#: src/addressbook.c:387 src/addressbook.c:397 src/summaryview.c:434
+#: src/addressbook.c:386 src/addressbook.c:396 src/summaryview.c:434
 msgid "/_Delete"
 msgstr "/_Xoá"
 
-#: src/addressbook.c:494
+#: src/addressbook.c:492
 msgid "E-Mail address"
 msgstr "Địa chỉ email"
 
-#: src/addressbook.c:498 src/compose.c:4778 src/prefs_common_dialog.c:2183
+#: src/addressbook.c:496 src/compose.c:4797 src/prefs_common_dialog.c:2183
 msgid "Address book"
 msgstr "Sổ địa chỉ"
 
-#: src/addressbook.c:600 src/prefs_filter_edit.c:249
+#: src/addressbook.c:603 src/prefs_filter_edit.c:249
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "Tên:"
 
 #. Buttons
-#: src/addressbook.c:632 src/addressbook.c:1684 src/editaddress.c:884
+#: src/addressbook.c:636 src/addressbook.c:1678 src/editaddress.c:884
 #: src/editaddress.c:1017 src/mainwindow.c:2426 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:635 src/editaddress.c:890 src/editaddress.c:1023
+#: src/addressbook.c:639 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:1552
 msgid "Add"
 msgstr "Thêm"
 
-#: src/addressbook.c:638
+#: src/addressbook.c:642
 msgid "Lookup"
 msgstr "Tra cứu"
 
-#: src/addressbook.c:650 src/headerview.c:55 src/prefs_folder_item.c:339
+#: src/addressbook.c:654 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:654 src/prefs_folder_item.c:356 src/prefs_template.c:178
+#: src/addressbook.c:658 src/prefs_folder_item.c:356 src/prefs_template.c:178
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:658 src/prefs_folder_item.c:367
+#: src/addressbook.c:662 src/prefs_folder_item.c:367
 msgid "Bcc:"
 msgstr "Bcc:"
 
 #. Confirm deletion
-#: src/addressbook.c:845
+#: src/addressbook.c:832
 msgid "Delete address(es)"
 msgstr "Xoá địa chỉ"
 
-#: src/addressbook.c:846
+#: src/addressbook.c:833
 msgid "Really delete the address(es)?"
 msgstr "Thực sự muốn xoá (các) địa chỉ này?"
 
-#: src/addressbook.c:1675
+#: src/addressbook.c:1669
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1009,36 +1010,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:1678 src/folderview.c:2372
+#: src/addressbook.c:1672 src/folderview.c:2372
 msgid "Delete folder"
 msgstr "Xoá thư mục"
 
-#: src/addressbook.c:1678
+#: src/addressbook.c:1672
 msgid "_Folder only"
 msgstr "_Chỉ thư mục"
 
-#: src/addressbook.c:1678
+#: src/addressbook.c:1672
 msgid "Folder and _addresses"
 msgstr "Thư mục và địa c_hỉ"
 
-#: src/addressbook.c:1683
+#: src/addressbook.c:1677
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Thực sự muốn xoá `%s' ?"
 
-#: src/addressbook.c:2369 src/addressbook.c:2502
+#: src/addressbook.c:2363 src/addressbook.c:2496
 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:2373 src/addressbook.c:2506
+#: src/addressbook.c:2367 src/addressbook.c:2500
 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:2383 src/addressbook.c:2516
+#: src/addressbook.c:2377 src/addressbook.c:2510
 msgid "Old address book converted successfully."
 msgstr "Sổ địa chỉ cũ đã được chuyển đổi thành công."
 
-#: src/addressbook.c:2388
+#: src/addressbook.c:2382
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1046,7 +1047,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:2401
+#: src/addressbook.c:2395
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1054,7 +1055,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:2407
+#: src/addressbook.c:2401
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1062,7 +1063,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:2412
+#: src/addressbook.c:2406
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1070,89 +1071,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:2419
+#: src/addressbook.c:2413
 msgid "Addressbook conversion error"
 msgstr "Lỗi chuyển đổi sổ địa chỉ"
 
-#: src/addressbook.c:2423
+#: src/addressbook.c:2417
 msgid "Addressbook conversion"
 msgstr "Chuyển đổi sổ địa chỉ"
 
-#: src/addressbook.c:2458
+#: src/addressbook.c:2452
 msgid "Addressbook Error"
 msgstr "Lỗi sổ địa chỉ"
 
-#: src/addressbook.c:2459 src/addressbook.c:2559
+#: src/addressbook.c:2453 src/addressbook.c:2553
 msgid "Could not read address index"
 msgstr "Không thể đọc mục lục địa chỉ"
 
-#: src/addressbook.c:2521
+#: src/addressbook.c:2515
 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:2535
+#: src/addressbook.c:2529
 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:2541
+#: src/addressbook.c:2535
 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:2547
+#: src/addressbook.c:2541
 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:2565
+#: src/addressbook.c:2559
 msgid "Addressbook Conversion Error"
 msgstr "Lỗi chuyển đổi sổ địa chỉ"
 
-#: src/addressbook.c:2571
+#: src/addressbook.c:2565
 msgid "Addressbook Conversion"
 msgstr "Chuyển đổi sổ địa chỉ"
 
-#: src/addressbook.c:3086 src/prefs_common_dialog.c:2033
+#: src/addressbook.c:3080 src/prefs_common_dialog.c:2033
 msgid "Interface"
 msgstr "Giao diện"
 
-#: src/addressbook.c:3102 src/importldif.c:514
+#: src/addressbook.c:3096 src/importldif.c:514
 msgid "Address Book"
 msgstr "Sổ địa chỉ"
 
-#: src/addressbook.c:3118
+#: src/addressbook.c:3112
 msgid "Person"
 msgstr "Cá nhân"
 
-#: src/addressbook.c:3134
+#: src/addressbook.c:3128
 msgid "EMail Address"
 msgstr "Địa chỉ email"
 
-#: src/addressbook.c:3150
+#: src/addressbook.c:3144
 msgid "Group"
 msgstr "Nhóm"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3166 src/folderview.c:367 src/prefs_account_dialog.c:1694
-#: src/query_search.c:370
+#: src/addressbook.c:3160 src/folderview.c:367 src/prefs_account_dialog.c:1694
+#: src/query_search.c:398
 msgid "Folder"
 msgstr "Thư mục"
 
-#: src/addressbook.c:3182
+#: src/addressbook.c:3176
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3198 src/addressbook.c:3214
+#: src/addressbook.c:3192 src/addressbook.c:3208
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3230
+#: src/addressbook.c:3224
 msgid "LDAP Server"
 msgstr "Máy chủ LDAP"
 
@@ -1164,7 +1165,7 @@ msgstr "Địa chỉ chung"
 msgid "Personal address"
 msgstr "Địa chỉ cá nhân"
 
-#: src/alertpanel.c:142 src/compose.c:5500 src/main.c:621
+#: src/alertpanel.c:142 src/compose.c:5517 src/main.c:621
 msgid "Notice"
 msgstr "Chú ý"
 
@@ -1172,7 +1173,7 @@ msgstr "Chú ý"
 msgid "Warning"
 msgstr "Cảnh báo"
 
-#: src/alertpanel.c:168 src/inc.c:587
+#: src/alertpanel.c:168 src/inc.c:586
 msgid "Error"
 msgstr "Lỗi"
 
@@ -1215,7 +1216,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:4761
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4762
 msgid "None"
 msgstr "Không"
 
@@ -1464,7 +1465,7 @@ msgstr "/_Xem/Mã _kí tự/Thái (TIS-620)"
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Xem/Mã _kí tự/Thái (Windows-874)"
 
-#: src/compose.c:646 src/mainwindow.c:759 src/messageview.c:267
+#: src/compose.c:646 src/mainwindow.c:759 src/messageview.c:268
 msgid "/_Tools/_Address book"
 msgstr "/_Công cụ/_Sổ địa chỉ"
 
@@ -1472,14 +1473,14 @@ msgstr "/_Công cụ/_Sổ địa chỉ"
 msgid "/_Tools/_Template"
 msgstr "/_Công cụ/_Mẫu"
 
-#: src/compose.c:649 src/mainwindow.c:783 src/messageview.c:283
+#: src/compose.c:649 src/mainwindow.c:783 src/messageview.c:284
 msgid "/_Tools/Actio_ns"
 msgstr "/_Công cụ/_Hành động"
 
 #: src/compose.c:651 src/compose.c:655 src/compose.c:661 src/mainwindow.c:762
 #: src/mainwindow.c:776 src/mainwindow.c:781 src/mainwindow.c:784
-#: src/mainwindow.c:788 src/mainwindow.c:790 src/messageview.c:270
-#: src/messageview.c:282
+#: src/mainwindow.c:788 src/mainwindow.c:790 src/messageview.c:271
+#: src/messageview.c:283
 msgid "/_Tools/---"
 msgstr "/_Công cụ/---"
 
@@ -1505,79 +1506,79 @@ msgstr "/_Công cụ/Chạ_y"
 msgid "/_Tools/_Set spell language"
 msgstr "/_Công cụ/_Mẫu"
 
-#: src/compose.c:910
+#: src/compose.c:912
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: tập tin không tồn tại\n"
 
-#: src/compose.c:1014 src/compose.c:1085
+#: src/compose.c:1016 src/compose.c:1087
 msgid "Can't get text part\n"
 msgstr "Không thể lấy phần văn bản\n"
 
-#: src/compose.c:1486
+#: src/compose.c:1488
 msgid "Quote mark format error."
 msgstr "Lỗi định dạng đánh dấu trích dẫn."
 
-#: src/compose.c:1498
+#: src/compose.c:1500
 msgid "Message reply/forward format error."
 msgstr "Lỗi định dạng trả lời/chuyển tiếp thư."
 
-#: src/compose.c:1918
+#: src/compose.c:1935
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Tập tin %s không tồn tại\n"
 
-#: src/compose.c:1922
+#: src/compose.c:1939
 #, 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:1926
+#: src/compose.c:1943
 #, c-format
 msgid "File %s is empty."
 msgstr "%s là tập tin trống."
 
-#: src/compose.c:1930
+#: src/compose.c:1947
 #, c-format
 msgid "Can't read %s."
 msgstr "Không thể đọc %s."
 
-#: src/compose.c:1963
+#: src/compose.c:1980
 #, c-format
 msgid "Message: %s"
 msgstr "Thư: %s"
 
-#: src/compose.c:2023 src/mimeview.c:565
+#: src/compose.c:2040 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:2507 src/headerview.c:195 src/query_search.c:636
+#: src/compose.c:2524 src/headerview.c:195 src/query_search.c:666
 #: src/summaryview.c:2124
 msgid "(No Subject)"
 msgstr "(Không tiêu đề)"
 
-#: src/compose.c:2510
+#: src/compose.c:2527
 #, fuzzy, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Viết thư%s"
 
-#: src/compose.c:2623
+#: src/compose.c:2642
 msgid "Recipient is not specified."
 msgstr "Chưa chỉ định người nhận."
 
-#: src/compose.c:2631
+#: src/compose.c:2650
 msgid "Empty subject"
 msgstr "Tiêu đề bị bỏ trống"
 
-#: src/compose.c:2632
+#: src/compose.c:2651
 msgid "Subject is empty. Send it anyway?"
 msgstr "Tiêu đề bị bỏ trống. Vẫn gửi đi?"
 
-#: src/compose.c:2691
+#: src/compose.c:2710
 msgid "can't get recipient list."
 msgstr "không lấy được danh sách người nhận."
 
-#: src/compose.c:2711
+#: src/compose.c:2730
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1585,21 +1586,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:2725 src/send_message.c:299
+#: src/compose.c:2744 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:2767
+#: src/compose.c:2786
 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:2805
+#: src/compose.c:2824
 #, 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:2902
+#: src/compose.c:2921
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1610,11 +1611,11 @@ msgstr ""
 "\n"
 "Vẫn gửi ở dạng %s?"
 
-#: src/compose.c:2908
+#: src/compose.c:2927
 msgid "Code conversion error"
 msgstr "Lỗi chuyển mã"
 
-#: src/compose.c:2981
+#: src/compose.c:3000
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1627,157 +1628,157 @@ msgstr ""
 "\n"
 "Vẫn gửi đi?"
 
-#: src/compose.c:2985
+#: src/compose.c:3004
 msgid "Line length limit"
 msgstr "Giới hạn độ dài của dòng"
 
-#: src/compose.c:3275
+#: src/compose.c:3294
 msgid "can't remove the old message\n"
 msgstr "không thể xoá thư cũ\n"
 
-#: src/compose.c:3293
+#: src/compose.c:3312
 msgid "queueing message...\n"
 msgstr "đang xếp hàng thư...\n"
 
-#: src/compose.c:3375
+#: src/compose.c:3394
 msgid "can't find queue folder\n"
 msgstr "không thấy thư mục đợi\n"
 
-#: src/compose.c:3382
+#: src/compose.c:3401
 msgid "can't queue the message\n"
 msgstr "không thể xếp hàng thư\n"
 
-#: src/compose.c:3975
+#: src/compose.c:3994
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "đã tạo ID của thư: %s\n"
 
-#: src/compose.c:4088
+#: src/compose.c:4107
 msgid "Creating compose window...\n"
 msgstr "Đang tạo cửa sổ soạn thảo...\n"
 
-#: src/compose.c:4139 src/headerview.c:54
+#: src/compose.c:4158 src/headerview.c:54
 msgid "From:"
 msgstr "Người gửi:"
 
-#: src/compose.c:4213
+#: src/compose.c:4232
 msgid "PGP Sign"
 msgstr "Chữ kí PGP"
 
-#: src/compose.c:4216
+#: src/compose.c:4235
 msgid "PGP Encrypt"
 msgstr "Mã hoá PGP"
 
-#: src/compose.c:4254 src/compose.c:5332
+#: src/compose.c:4273 src/compose.c:5351
 msgid "MIME type"
 msgstr "Kiểu MIME"
 
 #. S_COL_DATE
-#: src/compose.c:4263 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4908
+#: src/compose.c:4282 src/mimeview.c:197 src/prefs_filter_edit.c:496
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4909
 msgid "Size"
 msgstr "Kích thước"
 
-#: src/compose.c:4698 src/mainwindow.c:2359 src/prefs_account_dialog.c:528
+#: src/compose.c:4717 src/mainwindow.c:2359 src/prefs_account_dialog.c:528
 #: src/prefs_common_dialog.c:661
 msgid "Send"
 msgstr "Gửi"
 
-#: src/compose.c:4699
+#: src/compose.c:4718
 msgid "Send message"
 msgstr "Gửi thư"
 
-#: src/compose.c:4707
+#: src/compose.c:4726
 msgid "Send later"
 msgstr "Gửi sau"
 
-#: src/compose.c:4708
+#: src/compose.c:4727
 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:4716
+#: src/compose.c:4735
 msgid "Draft"
 msgstr "Bản nháp"
 
-#: src/compose.c:4717
+#: src/compose.c:4736
 msgid "Save to draft folder"
 msgstr "Gửi vào thư mục nháp"
 
-#: src/compose.c:4727
+#: src/compose.c:4746
 msgid "Insert"
 msgstr "Chèn"
 
-#: src/compose.c:4728
+#: src/compose.c:4747
 msgid "Insert file"
 msgstr "Chèn tập tin"
 
-#: src/compose.c:4736
+#: src/compose.c:4755
 msgid "Attach"
 msgstr "Đính kèm"
 
-#: src/compose.c:4737
+#: src/compose.c:4756
 msgid "Attach file"
 msgstr "Đính kèm tập tin"
 
 #. signature
-#: src/compose.c:4747 src/prefs_account_dialog.c:1208
+#: src/compose.c:4766 src/prefs_account_dialog.c:1208
 #: src/prefs_common_dialog.c:953
 msgid "Signature"
 msgstr "Chữ kí"
 
-#: src/compose.c:4748
+#: src/compose.c:4767
 #, fuzzy
 msgid "Append signature"
 msgstr "Chữ kí GIẢ"
 
 #. editor
-#: src/compose.c:4757 src/prefs_common_dialog.c:991
+#: src/compose.c:4776 src/prefs_common_dialog.c:991
 #: src/prefs_common_dialog.c:2315
 msgid "Editor"
 msgstr "Trình soạn thảo"
 
-#: src/compose.c:4758
+#: src/compose.c:4777
 msgid "Edit with external editor"
 msgstr "Soạn với trình soạn thảo ngoài"
 
-#: src/compose.c:4766
+#: src/compose.c:4785
 msgid "Linewrap"
 msgstr "Khuôn dòng"
 
-#: src/compose.c:4767
+#: src/compose.c:4786
 msgid "Wrap all long lines"
 msgstr "Khuôn mọi dòng dài"
 
-#: src/compose.c:5228
+#: src/compose.c:5247
 msgid "Invalid MIME type."
 msgstr "Kiểu MIME không hợp lệ"
 
-#: src/compose.c:5246
+#: src/compose.c:5265
 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:5314
+#: src/compose.c:5333
 msgid "Properties"
 msgstr "Thuộc tính"
 
-#: src/compose.c:5334 src/prefs_common_dialog.c:1444
+#: src/compose.c:5353 src/prefs_common_dialog.c:1444
 msgid "Encoding"
 msgstr "Mã hoá"
 
-#: src/compose.c:5357 src/prefs_folder_item.c:202
+#: src/compose.c:5376 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Đường dẫn"
 
-#: src/compose.c:5358
+#: src/compose.c:5377
 msgid "File name"
 msgstr "Tên tập tin"
 
-#: src/compose.c:5449
+#: src/compose.c:5466
 #, 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:5497
+#: src/compose.c:5514
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1787,44 +1788,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:5872 src/compose.c:5877 src/compose.c:5883
+#: src/compose.c:5889 src/compose.c:5894 src/compose.c:5900
 msgid "Can't queue the message."
 msgstr "Không thể xếp hàng thông điệp"
 
-#: src/compose.c:5974
+#: src/compose.c:5991
 msgid "Select files"
 msgstr "Chọn tập tin"
 
-#: src/compose.c:5997
+#: src/compose.c:6014
 msgid "Select file"
 msgstr "Chọn tập tin"
 
-#: src/compose.c:6032
+#: src/compose.c:6049
 msgid "Save message"
 msgstr "Lưu thư"
 
-#: src/compose.c:6033
+#: src/compose.c:6050
 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:6035
+#: src/compose.c:6052
 msgid "Close _without saving"
 msgstr "_Không lưu"
 
-#: src/compose.c:6077
+#: src/compose.c:6094
 #, 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:6079
+#: src/compose.c:6096
 msgid "Apply template"
 msgstr "Dùng mẫu"
 
-#: src/compose.c:6080
+#: src/compose.c:6097
 msgid "_Replace"
 msgstr "_Thay thế"
 
-#: src/compose.c:6080
+#: src/compose.c:6097
 msgid "_Insert"
 msgstr "_Chèn"
 
@@ -1945,52 +1946,52 @@ msgstr "Phải cung cấp một tên nhóm"
 msgid "Edit Group Data"
 msgstr "Soạn dữ liệu cho nhóm"
 
-#: src/editgroup.c:300
+#: src/editgroup.c:299
 msgid "Group Name"
 msgstr "Tên nhóm"
 
-#: src/editgroup.c:319
+#: src/editgroup.c:318
 msgid "Addresses in Group"
 msgstr "Các địa chỉ trong nhóm"
 
-#: src/editgroup.c:321
+#: src/editgroup.c:320
 msgid " -> "
 msgstr " -> "
 
-#: src/editgroup.c:348
+#: src/editgroup.c:347
 msgid " <- "
 msgstr " <- "
 
-#: src/editgroup.c:350
+#: src/editgroup.c:349
 msgid "Available Addresses"
 msgstr "Các địa chỉ hiện có"
 
-#: src/editgroup.c:416
+#: src/editgroup.c:415
 msgid "Move E-Mail Addresses to or from Group with arrow buttons"
 msgstr "Chuyển địa chỉ email tới hoặc từ nhóm với nút mũi tên"
 
-#: src/editgroup.c:468
+#: src/editgroup.c:467
 msgid "Edit Group Details"
 msgstr "Soạn thông tin về nhóm"
 
-#: src/editgroup.c:471
+#: src/editgroup.c:470
 msgid "Add New Group"
 msgstr "Thêm nhóm mới"
 
-#: src/editgroup.c:522
+#: src/editgroup.c:521
 msgid "Edit folder"
 msgstr "Sửa thư mục"
 
-#: src/editgroup.c:522
+#: src/editgroup.c:521
 msgid "Input the new name of folder:"
 msgstr "Đặt tên mới cho thư mục:"
 
-#: src/editgroup.c:525 src/foldersel.c:541 src/folderview.c:2121
+#: src/editgroup.c:524 src/foldersel.c:541 src/folderview.c:2121
 #: src/folderview.c:2127
 msgid "New folder"
 msgstr "Thư mục mới"
 
-#: src/editgroup.c:526 src/foldersel.c:542 src/folderview.c:2128
+#: src/editgroup.c:525 src/foldersel.c:542 src/folderview.c:2128
 msgid "Input the name of new folder:"
 msgstr "Đặt tên cho thư mục mới:"
 
@@ -2188,7 +2189,7 @@ msgid "`%c' can't be included in folder name."
 msgstr "`%c' không được có trong tên thư mục."
 
 #: src/foldersel.c:561 src/folderview.c:2147 src/folderview.c:2206
-#: src/query_search.c:995
+#: src/query_search.c:1031
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Thư mục `%s' đã có trước."
@@ -2448,7 +2449,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:2127
+#: src/headerview.c:180 src/query_search.c:667 src/summaryview.c:2127
 msgid "(No From)"
 msgstr "(Không rõ người gửi)"
 
@@ -2578,133 +2579,133 @@ msgstr "Hoàn thành"
 msgid "Sylpheed: %d new messages"
 msgstr "Hoàn tất (%d thư mới)"
 
-#: src/inc.c:372
+#: src/inc.c:371
 msgid "Retrieving new messages"
 msgstr "Đang tải về thư mới"
 
-#: src/inc.c:415
+#: src/inc.c:414
 msgid "Standby"
 msgstr "Đợi"
 
-#: src/inc.c:544 src/inc.c:593
+#: src/inc.c:543 src/inc.c:592
 msgid "Cancelled"
 msgstr "Đã bị huỷ bỏ"
 
-#: src/inc.c:555
+#: src/inc.c:554
 msgid "Retrieving"
 msgstr "Đang tải về"
 
-#: src/inc.c:564
+#: src/inc.c:563
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "Xong (%d thư (%s) nhận được)"
 
-#: src/inc.c:568
+#: src/inc.c:567
 msgid "Done (no new messages)"
 msgstr "Xong (không có thư mới)"
 
-#: src/inc.c:574
+#: src/inc.c:573
 msgid "Connection failed"
 msgstr "Kết nối thất bại"
 
-#: src/inc.c:577
+#: src/inc.c:576
 msgid "Auth failed"
 msgstr "Xác thực thất bại"
 
-#: src/inc.c:580
+#: src/inc.c:579
 msgid "Locked"
 msgstr "Đã khoá"
 
-#: src/inc.c:590
+#: src/inc.c:589
 msgid "Timeout"
 msgstr "Hết giờ"
 
-#: src/inc.c:640
+#: src/inc.c:639
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Hoàn tất (%d thư mới)"
 
-#: src/inc.c:643
+#: src/inc.c:642
 msgid "Finished (no new messages)"
 msgstr "Hoàn tất (không có thư mới)"
 
-#: src/inc.c:652
+#: src/inc.c:651
 msgid "Some errors occurred while getting mail."
 msgstr "Xảy ra một số lỗi khi nhận thư."
 
-#: src/inc.c:688
+#: src/inc.c:687
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "đang nhận thư mới của tài khoản %s...\n"
 
-#: src/inc.c:691
+#: src/inc.c:690
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Đang nhận thư mới"
 
-#: src/inc.c:710
+#: src/inc.c:709
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Đang kết nối tới máy chủ POP3: %s..."
 
-#: src/inc.c:719
+#: src/inc.c:718
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Không thể kết nối tới máy thủ POP3: %s:%d\n"
 
-#: src/inc.c:798 src/send_message.c:631
+#: src/inc.c:797 src/send_message.c:631
 msgid "Authenticating..."
 msgstr "Đang xác thực..."
 
-#: src/inc.c:799
+#: src/inc.c:798
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Đang lấy thư trên %s..."
 
-#: src/inc.c:804
+#: src/inc.c:803
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Đang xác định số lượng thư mới (STAT)..."
 
-#: src/inc.c:808
+#: src/inc.c:807
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Đang xác định số lượng thư mới (LAST)..."
 
-#: src/inc.c:812
+#: src/inc.c:811
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Đang xác định số lượng thư mới (UIDL)..."
 
-#: src/inc.c:816
+#: src/inc.c:815
 msgid "Getting the size of messages (LIST)..."
 msgstr "Đang xác định kích thước thư (LIST)..."
 
-#: src/inc.c:826
+#: src/inc.c:825
 #, c-format
 msgid "Deleting message %d"
 msgstr "Đang xoá thư %d"
 
-#: src/inc.c:833 src/send_message.c:649
+#: src/inc.c:832 src/send_message.c:649
 msgid "Quitting"
 msgstr "Đang thoát"
 
-#: src/inc.c:858
+#: src/inc.c:857
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Đang lấy thư (%d / %d) (%s / %s)"
 
-#: src/inc.c:879
+#: src/inc.c:878
 #, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Đang lấy (%d thư (%s) đã nhận)"
 
-#: src/inc.c:1107
+#: src/inc.c:1106
 msgid "Connection failed."
 msgstr "Kết nối thất bại."
 
-#: src/inc.c:1113
+#: src/inc.c:1112
 msgid "Error occurred while processing mail."
 msgstr "Có lỗi khi xử lí thư."
 
-#: src/inc.c:1118
+#: src/inc.c:1117
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2713,28 +2714,28 @@ msgstr ""
 "Có lỗi khi xử lí thư:\n"
 "%s"
 
-#: src/inc.c:1124
+#: src/inc.c:1123
 msgid "No disk space left."
 msgstr "Ổ cứng bị đầy."
 
-#: src/inc.c:1129
+#: src/inc.c:1128
 msgid "Can't write file."
 msgstr "Không thể ghi lên tập tin"
 
-#: src/inc.c:1134
+#: src/inc.c:1133
 msgid "Socket error."
 msgstr "Lỗi socket."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1140 src/send_message.c:584 src/send_message.c:772
+#: src/inc.c:1139 src/send_message.c:584 src/send_message.c:772
 msgid "Connection closed by the remote host."
 msgstr "Kết nối bị ngắt bởi máy từ xa."
 
-#: src/inc.c:1146
+#: src/inc.c:1145
 msgid "Mailbox is locked."
 msgstr "Hộp thư bị khoá."
 
-#: src/inc.c:1150
+#: src/inc.c:1149
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2743,11 +2744,11 @@ msgstr ""
 "Hộp thư bị khoá:\n"
 "%s"
 
-#: src/inc.c:1156 src/send_message.c:757
+#: src/inc.c:1155 src/send_message.c:757
 msgid "Authentication failed."
 msgstr "Xác thực thất bại."
 
-#: src/inc.c:1161 src/send_message.c:760
+#: src/inc.c:1160 src/send_message.c:760
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2756,15 +2757,15 @@ msgstr ""
 "Xác thực thất bại:\n"
 "%s"
 
-#: src/inc.c:1166 src/send_message.c:776
+#: src/inc.c:1165 src/send_message.c:776
 msgid "Session timed out."
 msgstr "Phiên làm việc hết giờ."
 
-#: src/inc.c:1202
+#: src/inc.c:1201
 msgid "Incorporation cancelled\n"
 msgstr "Sáp nhập bị huỷ bỏ\n"
 
-#: src/inc.c:1285
+#: src/inc.c:1284
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Đang lấy thư từ %s vào %s...\n"
@@ -3238,14 +3239,15 @@ msgid "/_View/Mess_age source"
 msgstr "/_Xem/_Nguồn thư"
 
 #: src/mainwindow.c:708 src/messageview.c:245
-msgid "/_View/Show all _header"
+#, fuzzy
+msgid "/_View/Show all _headers"
 msgstr "/_Xem/_Hiện mọi header"
 
 #: src/mainwindow.c:710
 msgid "/_View/_Update summary"
 msgstr "/_Xem/_Cập nhật tóm tắt"
 
-#: src/mainwindow.c:712 src/messageview.c:247
+#: src/mainwindow.c:712 src/messageview.c:248
 msgid "/_Message"
 msgstr "/_Thư"
 
@@ -3275,16 +3277,16 @@ msgstr "/_Thư/_Nhận/_Gửi thư đang xếp hàng"
 
 #: src/mainwindow.c:722 src/mainwindow.c:724 src/mainwindow.c:731
 #: src/mainwindow.c:736 src/mainwindow.c:739 src/mainwindow.c:750
-#: src/mainwindow.c:752 src/mainwindow.c:755 src/messageview.c:250
-#: src/messageview.c:258 src/messageview.c:263
+#: src/mainwindow.c:752 src/mainwindow.c:755 src/messageview.c:251
+#: src/messageview.c:259 src/messageview.c:264
 msgid "/_Message/---"
 msgstr "/_Thư/---"
 
-#: src/mainwindow.c:723 src/messageview.c:248
+#: src/mainwindow.c:723 src/messageview.c:249
 msgid "/_Message/Compose _new message"
 msgstr "/_Thư/_Viết thư mới"
 
-#: src/mainwindow.c:725 src/messageview.c:251
+#: src/mainwindow.c:725 src/messageview.c:252
 msgid "/_Message/_Reply"
 msgstr "/_Thư/_Hồi âm"
 
@@ -3292,27 +3294,27 @@ msgstr "/_Thư/_Hồi âm"
 msgid "/_Message/Repl_y to"
 msgstr "/_Thư/Hồi â_m tới"
 
-#: src/mainwindow.c:727 src/messageview.c:252
+#: src/mainwindow.c:727 src/messageview.c:253
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Thư/Hồi â_m tới/_tất cả"
 
-#: src/mainwindow.c:728 src/messageview.c:254
+#: src/mainwindow.c:728 src/messageview.c:255
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Thư/Hồi â_m tới/_người gửi"
 
-#: src/mainwindow.c:729 src/messageview.c:256
+#: src/mainwindow.c:729 src/messageview.c:257
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Thư/Hồi â_m tới/_hộp thư chung"
 
-#: src/mainwindow.c:732 src/messageview.c:259
+#: src/mainwindow.c:732 src/messageview.c:260
 msgid "/_Message/_Forward"
 msgstr "/_Thư/_Chuyển tiếp"
 
-#: src/mainwindow.c:733 src/messageview.c:260
+#: src/mainwindow.c:733 src/messageview.c:261
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Thư/Ch_uyển tiếp ở dạng đính kèm"
 
-#: src/mainwindow.c:735 src/messageview.c:262
+#: src/mainwindow.c:735 src/messageview.c:263
 msgid "/_Message/Redirec_t"
 msgstr "/_Thư/Chu_yển hướng"
 
@@ -3369,7 +3371,7 @@ msgstr "/_Thư/Đánh dấu là thư _rác"
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/_Thư/Đánh dấu _không là thư rác"
 
-#: src/mainwindow.c:756 src/messageview.c:264
+#: src/mainwindow.c:756 src/messageview.c:265
 msgid "/_Message/Re-_edit"
 msgstr "/_Thư/S_oạn lại"
 
@@ -3385,23 +3387,23 @@ msgstr "/_Công cụ/_Lọc mọi thư trong thư mục"
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Công cụ/Lọ_c các thư đã chọn"
 
-#: src/mainwindow.c:767 src/messageview.c:271
+#: src/mainwindow.c:767 src/messageview.c:272
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Công cụ/Tạo _quy tắc lọc"
 
-#: src/mainwindow.c:768 src/messageview.c:273
+#: src/mainwindow.c:768 src/messageview.c:274
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Công cụ/Tạo _quy tắc lọc/_Tự động"
 
-#: src/mainwindow.c:770 src/messageview.c:275
+#: src/mainwindow.c:770 src/messageview.c:276
 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:772 src/messageview.c:277
+#: src/mainwindow.c:772 src/messageview.c:278
 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:774 src/messageview.c:279
+#: src/mainwindow.c:774 src/messageview.c:280
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Công cụ/Tạo _quy tắc lọc/theo Tiê_u đề"
 
@@ -3520,7 +3522,7 @@ 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:1139 src/summaryview.c:2275 src/summaryview.c:2360
-#: src/summaryview.c:3907 src/summaryview.c:4036 src/summaryview.c:4394
+#: src/summaryview.c:3908 src/summaryview.c:4037 src/summaryview.c:4395
 msgid "done.\n"
 msgstr "xong.\n"
 
@@ -3780,7 +3782,7 @@ msgid "Find text:"
 msgstr "Tìm văn bản:"
 
 #: src/message_search.c:153 src/prefs_search_folder.c:253
-#: src/query_search.c:326
+#: src/query_search.c:343
 msgid "Case sensitive"
 msgstr "Phân biệt chữ hoa/thường"
 
@@ -3804,27 +3806,27 @@ msgstr "Đã đến cuối thư; tiếp tục từ đầu thư?"
 msgid "Search finished"
 msgstr "Đã tìm xong"
 
-#: src/messageview.c:268
+#: src/messageview.c:269
 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:300
+#: src/messageview.c:301
 msgid "Creating message view...\n"
 msgstr "Đang tạo khung xem thư...\n"
 
-#: src/messageview.c:325
+#: src/messageview.c:326
 msgid "Text"
 msgstr "Văn bản"
 
-#: src/messageview.c:330
+#: src/messageview.c:331
 msgid "Attachments"
 msgstr "Đính kèm"
 
-#: src/messageview.c:380
+#: src/messageview.c:381
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:699 src/summaryview.c:3436
+#: src/messageview.c:700 src/summaryview.c:3436
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Không thể lưu tập tin `%s'."
@@ -3842,7 +3844,7 @@ msgstr "Lệnh thu thập:"
 msgid "Print"
 msgstr "In ấn"
 
-#: src/messageview.c:770 src/summaryview.c:3471
+#: src/messageview.c:769 src/summaryview.c:3470
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -3939,11 +3941,11 @@ msgstr ""
 "Nhập lệnh để mở tập tin:\n"
 "(`%s' sẽ được thay thế bằng tên tập tin)"
 
-#: src/mimeview.c:1147
+#: src/mimeview.c:1140
 msgid "Opening executable file"
 msgstr ""
 
-#: src/mimeview.c:1148
+#: src/mimeview.c:1141
 msgid ""
 "This is an executable file. Opening executable file is restricted for "
 "security.\n"
@@ -3951,11 +3953,6 @@ msgid ""
 "virus or something like a malicious program."
 msgstr ""
 
-#: src/mimeview.c:1184
-#, c-format
-msgid "MIME viewer command line is invalid: `%s'"
-msgstr "Lệnh xem MIME không hợp lệ: `%s'"
-
 #: src/passphrase.c:96
 msgid "Passphrase"
 msgstr "Mật khẩu"
@@ -5709,20 +5706,20 @@ msgstr "Reply-To:"
 msgid "%s - Edit search condition"
 msgstr ""
 
-#: src/prefs_search_folder.c:209 src/query_search.c:257
+#: src/prefs_search_folder.c:209 src/query_search.c:274
 msgid "Match any of the following"
 msgstr "Khớp với bất kì phần nào dưới đây"
 
-#: src/prefs_search_folder.c:211 src/query_search.c:259
+#: src/prefs_search_folder.c:211 src/query_search.c:276
 msgid "Match all of the following"
 msgstr "Khớp với tất cả các phần dưới đây"
 
-#: src/prefs_search_folder.c:231 src/query_search.c:303
+#: src/prefs_search_folder.c:231 src/query_search.c:320
 #, fuzzy
 msgid "Folder:"
 msgstr "Thư mục"
 
-#: src/prefs_search_folder.c:248 src/query_search.c:321
+#: src/prefs_search_folder.c:248 src/query_search.c:338
 #, fuzzy
 msgid "Search subfolders"
 msgstr "Tìm kiếm thất bại"
@@ -5737,17 +5734,17 @@ msgid "Attachment"
 msgstr "Đính kèm"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73 src/query_search.c:371 src/summaryview.c:4901
+#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4902
 msgid "Subject"
 msgstr "Tiêu đề"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/query_search.c:372 src/summaryview.c:4904
+#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4905
 msgid "From"
 msgstr "Người gửi"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/query_search.c:373 src/summaryview.c:4906
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:4907
 msgid "Date"
 msgstr "Thời gian"
 
@@ -5840,43 +5837,43 @@ msgstr "Đang tạo hộp thoại tiến trình...\n"
 msgid "Status"
 msgstr "Trạng thái"
 
-#: src/query_search.c:234
+#: src/query_search.c:251
 msgid "Search messages"
 msgstr "Tìm thư"
 
-#: src/query_search.c:395
+#: src/query_search.c:423
 #, fuzzy
 msgid "_Save as search folder"
 msgstr "Gửi vào thư mục nháp"
 
-#: src/query_search.c:512 src/subscribedialog.c:526 src/summaryview.c:842
+#: src/query_search.c:542 src/subscribedialog.c:526 src/summaryview.c:842
 msgid "Done."
 msgstr "Xong."
 
-#: src/query_search.c:536
+#: src/query_search.c:566
 #, fuzzy, c-format
 msgid "Searching %s ..."
 msgstr "Đang quét thư mục %s ..."
 
-#: src/query_search.c:564
+#: src/query_search.c:594
 #, fuzzy, c-format
 msgid "Searching %s (%d / %d)..."
 msgstr "Đang lọc..."
 
-#: src/query_search.c:645 src/summaryview.c:2051
+#: src/query_search.c:675 src/summaryview.c:2051
 msgid "(No Date)"
 msgstr "(Không ngày tháng)"
 
-#: src/query_search.c:833
+#: src/query_search.c:869
 #, fuzzy
 msgid "Save as search folder"
 msgstr "Gửi vào thư mục nháp"
 
-#: src/query_search.c:854
+#: src/query_search.c:890
 msgid "Location:"
 msgstr ""
 
-#: src/query_search.c:869
+#: src/query_search.c:905
 #, fuzzy
 msgid "Folder name:"
 msgstr "Tên tập tin"
@@ -6507,37 +6504,37 @@ msgstr "Bức thư %d được chọn để chép đến %s\n"
 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:3506
+#: src/summaryview.c:3507
 msgid "Error occurred while processing messages."
 msgstr "Có lỗi khi xử lí thư."
 
-#: src/summaryview.c:3814 src/summaryview.c:3815
+#: src/summaryview.c:3815 src/summaryview.c:3816
 msgid "Building threads..."
 msgstr "Đang tạo luồng..."
 
-#: src/summaryview.c:3965 src/summaryview.c:3966
+#: src/summaryview.c:3966 src/summaryview.c:3967
 msgid "Unthreading..."
 msgstr "Đang rời luồng..."
 
-#: src/summaryview.c:4259 src/summaryview.c:4315
+#: src/summaryview.c:4260 src/summaryview.c:4316
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Đang lọc..."
 
-#: src/summaryview.c:4364
+#: src/summaryview.c:4365
 msgid "filtering..."
 msgstr "đang lọc..."
 
-#: src/summaryview.c:4365
+#: src/summaryview.c:4366
 msgid "Filtering..."
 msgstr "Đang lọc..."
 
-#: src/summaryview.c:4401
+#: src/summaryview.c:4402
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "%d thư đã được lọc."
 
-#: src/summaryview.c:4910
+#: src/summaryview.c:4911
 msgid "No."
 msgstr "Số "
 
@@ -6625,6 +6622,9 @@ msgstr "Thoát"
 msgid "Sylpheed"
 msgstr "Sylpheed cũ"
 
+#~ msgid "MIME viewer command line is invalid: `%s'"
+#~ msgstr "Lệnh xem MIME không hợp lệ: `%s'"
+
 #~ msgid "%dB"
 #~ msgstr "%dB"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index f099d0b8..530ae1ec 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-03-02 19:03+0900\n"
+"POT-Creation-Date: 2006-03-10 16:06+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:491
+#: libsylph/prefs_common.c:496
 #, fuzzy
 msgid "Junk mail filter"
 msgstr "文件夹："
@@ -520,7 +520,7 @@ msgstr "无法打开标记文件\n"
 msgid "can't fetch message %d\n"
 msgstr "无法获取邮件 %d\n"
 
-#: libsylph/procmsg.c:1375
+#: libsylph/procmsg.c:1378
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "打印命令行无效：“%s”\n"
@@ -598,12 +598,12 @@ msgstr "  标题：%s\n"
 msgid "  Issuer: %s\n"
 msgstr "  签发者：%s\n"
 
-#: libsylph/utils.c:2411 src/compose.c:2869 src/compose.c:3132
-#: src/compose.c:3195 src/compose.c:3315
+#: libsylph/utils.c:2430 src/compose.c:2888 src/compose.c:3151
+#: src/compose.c:3214 src/compose.c:3334
 msgid "can't change file mode\n"
 msgstr "无法改变文件属性\n"
 
-#: libsylph/utils.c:2418 libsylph/utils.c:2542
+#: libsylph/utils.c:2437 libsylph/utils.c:2561
 #, c-format
 msgid "writing to %s failed.\n"
 msgstr "写入 %s 时失败。\n"
@@ -682,8 +682,8 @@ msgstr ""
 "按照该顺序检查新邮件。选中“G”列的复选框，在“全部接收”\n"
 "时会检查新邮件。"
 
-#: src/account_dialog.c:366 src/addressadd.c:192 src/addressbook.c:493
-#: src/compose.c:4273 src/editaddress.c:200 src/editaddress.c:942
+#: src/account_dialog.c:366 src/addressadd.c:192 src/addressbook.c:491
+#: src/compose.c:4292 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
@@ -821,12 +821,12 @@ msgstr "动作的用户参数"
 msgid "Add Address to Book"
 msgstr "将地址添加到地址簿"
 
-#: src/addressadd.c:202 src/compose.c:4777 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4796 src/editaddress.c:201
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "地址"
 
-#: src/addressadd.c:212 src/addressbook.c:495 src/editaddress.c:202
+#: src/addressadd.c:212 src/addressbook.c:493 src/editaddress.c:202
 #: src/editaddress.c:795 src/editaddress.c:860 src/editgroup.c:267
 msgid "Remarks"
 msgstr "注释"
@@ -835,110 +835,111 @@ msgstr "注释"
 msgid "Select Address Book Folder"
 msgstr "选择地址簿文件夹"
 
-#: src/addressbook.c:338 src/compose.c:515 src/mainwindow.c:489
+#: src/addressbook.c:337 src/compose.c:515 src/mainwindow.c:489
 #: src/messageview.c:140
 msgid "/_File"
 msgstr "/文件(_F)"
 
-#: src/addressbook.c:339
+#: src/addressbook.c:338
 msgid "/_File/New _Book"
 msgstr "/文件(_F)/新建地址簿(_B)"
 
-#: src/addressbook.c:340
+#: src/addressbook.c:339
 msgid "/_File/New _vCard"
 msgstr "/文件(_F)/新建 vCard(_V)"
 
-#: src/addressbook.c:342
+#: src/addressbook.c:341
 msgid "/_File/New _JPilot"
 msgstr "/文件(_F)/新建 JPilot(_J)"
 
-#: src/addressbook.c:345
-msgid "/_File/New _Server"
+#: src/addressbook.c:344
+#, fuzzy
+msgid "/_File/New _LDAP Server"
 msgstr "/文件(_F)/新建服务器(_S)"
 
-#: src/addressbook.c:347 src/addressbook.c:350 src/compose.c:520
+#: src/addressbook.c:346 src/addressbook.c:349 src/compose.c:520
 #: src/compose.c:525 src/compose.c:528 src/compose.c:531 src/mainwindow.c:507
 #: src/mainwindow.c:510 src/mainwindow.c:512 src/mainwindow.c:515
 #: src/mainwindow.c:517 src/messageview.c:143
 msgid "/_File/---"
 msgstr "/文件(_F)/---"
 
-#: src/addressbook.c:348
+#: src/addressbook.c:347
 msgid "/_File/_Edit"
 msgstr "/文件(_F)/编辑(_E)"
 
-#: src/addressbook.c:349
+#: src/addressbook.c:348
 msgid "/_File/_Delete"
 msgstr "/文件(_F)/删除(_D)"
 
-#: src/addressbook.c:351
+#: src/addressbook.c:350
 msgid "/_File/_Save"
 msgstr "/文件(_F)/保存(_S)"
 
-#: src/addressbook.c:352 src/compose.c:532 src/messageview.c:144
+#: src/addressbook.c:351 src/compose.c:532 src/messageview.c:144
 msgid "/_File/_Close"
 msgstr "/文件(_F)/关闭(_C)"
 
-#: src/addressbook.c:353
+#: src/addressbook.c:352
 msgid "/_Address"
 msgstr "/地址(_A)"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:353
 msgid "/_Address/New _Address"
 msgstr "/地址(_A)/新建地址(_A)"
 
-#: src/addressbook.c:355
+#: src/addressbook.c:354
 msgid "/_Address/New _Group"
 msgstr "/地址(_A)/新建组(_G)"
 
-#: src/addressbook.c:356
+#: src/addressbook.c:355
 msgid "/_Address/New _Folder"
 msgstr "/地址(_A)/新建文件夹(_F)"
 
-#: src/addressbook.c:357
+#: src/addressbook.c:356
 msgid "/_Address/---"
 msgstr "/地址(_A)/---"
 
-#: src/addressbook.c:358
+#: src/addressbook.c:357
 msgid "/_Address/_Edit"
 msgstr "/地址(_A)/编辑(_E)"
 
-#: src/addressbook.c:359
+#: src/addressbook.c:358
 msgid "/_Address/_Delete"
 msgstr "/地址(_A)/删除(_D)"
 
-#: src/addressbook.c:360 src/compose.c:645 src/mainwindow.c:758
-#: src/messageview.c:266
+#: src/addressbook.c:359 src/compose.c:645 src/mainwindow.c:758
+#: src/messageview.c:267
 msgid "/_Tools"
 msgstr "/工具(_T)"
 
-#: src/addressbook.c:361
+#: src/addressbook.c:360
 msgid "/_Tools/Import _LDIF file"
 msgstr "/工具(_T)/导入LDIF文件(_L)"
 
-#: src/addressbook.c:362 src/compose.c:666 src/mainwindow.c:812
-#: src/messageview.c:286
+#: src/addressbook.c:361 src/compose.c:666 src/mainwindow.c:812
+#: src/messageview.c:287
 msgid "/_Help"
 msgstr "/帮助(_H)"
 
-#: src/addressbook.c:363 src/compose.c:667 src/mainwindow.c:824
-#: src/messageview.c:287
+#: src/addressbook.c:362 src/compose.c:667 src/mainwindow.c:824
+#: src/messageview.c:288
 msgid "/_Help/_About"
 msgstr "/帮助(_H)/关于(_A)"
 
-#: src/addressbook.c:382 src/addressbook.c:392
+#: src/addressbook.c:381 src/addressbook.c:391
 msgid "/New _Address"
 msgstr "/新建地址(_A)"
 
-#: src/addressbook.c:383 src/addressbook.c:393
+#: src/addressbook.c:382 src/addressbook.c:392
 msgid "/New _Group"
 msgstr "/新建组(_G)"
 
-#: src/addressbook.c:384 src/addressbook.c:394
+#: src/addressbook.c:383 src/addressbook.c:393
 msgid "/New _Folder"
 msgstr "/新建文件夹(_F)"
 
-#: src/addressbook.c:385 src/addressbook.c:395 src/compose.c:509
+#: src/addressbook.c:384 src/addressbook.c:394 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
@@ -948,70 +949,70 @@ msgstr "/新建文件夹(_F)"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:386 src/addressbook.c:396 src/compose.c:534
+#: src/addressbook.c:385 src/addressbook.c:395 src/compose.c:534
 #: src/mainwindow.c:521 src/messageview.c:146
 msgid "/_Edit"
 msgstr "/编辑(_E)"
 
-#: src/addressbook.c:387 src/addressbook.c:397 src/summaryview.c:434
+#: src/addressbook.c:386 src/addressbook.c:396 src/summaryview.c:434
 msgid "/_Delete"
 msgstr "/删除(_D)"
 
-#: src/addressbook.c:494
+#: src/addressbook.c:492
 msgid "E-Mail address"
 msgstr "电子邮件地址"
 
-#: src/addressbook.c:498 src/compose.c:4778 src/prefs_common_dialog.c:2183
+#: src/addressbook.c:496 src/compose.c:4797 src/prefs_common_dialog.c:2183
 msgid "Address book"
 msgstr "地址簿"
 
-#: src/addressbook.c:600 src/prefs_filter_edit.c:249
+#: src/addressbook.c:603 src/prefs_filter_edit.c:249
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "姓名："
 
 #. Buttons
-#: src/addressbook.c:632 src/addressbook.c:1684 src/editaddress.c:884
+#: src/addressbook.c:636 src/addressbook.c:1678 src/editaddress.c:884
 #: src/editaddress.c:1017 src/mainwindow.c:2426 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:635 src/editaddress.c:890 src/editaddress.c:1023
+#: src/addressbook.c:639 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:1552
 msgid "Add"
 msgstr "添加"
 
-#: src/addressbook.c:638
+#: src/addressbook.c:642
 msgid "Lookup"
 msgstr "查找"
 
-#: src/addressbook.c:650 src/headerview.c:55 src/prefs_folder_item.c:339
+#: src/addressbook.c:654 src/headerview.c:55 src/prefs_folder_item.c:339
 #: src/prefs_template.c:176
 msgid "To:"
 msgstr "收件人："
 
-#: src/addressbook.c:654 src/prefs_folder_item.c:356 src/prefs_template.c:178
+#: src/addressbook.c:658 src/prefs_folder_item.c:356 src/prefs_template.c:178
 msgid "Cc:"
 msgstr "抄送："
 
-#: src/addressbook.c:658 src/prefs_folder_item.c:367
+#: src/addressbook.c:662 src/prefs_folder_item.c:367
 msgid "Bcc:"
 msgstr "密件抄送："
 
 #. Confirm deletion
-#: src/addressbook.c:845
+#: src/addressbook.c:832
 msgid "Delete address(es)"
 msgstr "删除地址"
 
-#: src/addressbook.c:846
+#: src/addressbook.c:833
 msgid "Really delete the address(es)?"
 msgstr "真的要删除地址？"
 
-#: src/addressbook.c:1675
+#: src/addressbook.c:1669
 #, fuzzy, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1020,38 +1021,38 @@ msgstr ""
 "您要删除“%s”中的文件夹和所有地址吗？\n"
 "如果仅删除文件夹，地址将被移到上一级文件夹中。"
 
-#: src/addressbook.c:1678 src/folderview.c:2372
+#: src/addressbook.c:1672 src/folderview.c:2372
 msgid "Delete folder"
 msgstr "删除文件夹"
 
-#: src/addressbook.c:1678
+#: src/addressbook.c:1672
 #, fuzzy
 msgid "_Folder only"
 msgstr "仅文件夹"
 
-#: src/addressbook.c:1678
+#: src/addressbook.c:1672
 #, fuzzy
 msgid "Folder and _addresses"
 msgstr "文件夹和地址"
 
-#: src/addressbook.c:1683
+#: src/addressbook.c:1677
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "真的要删除“%s”？"
 
-#: src/addressbook.c:2369 src/addressbook.c:2502
+#: src/addressbook.c:2363 src/addressbook.c:2496
 msgid "New user, could not save index file."
 msgstr "新建用户，无法保存索引文件。"
 
-#: src/addressbook.c:2373 src/addressbook.c:2506
+#: src/addressbook.c:2367 src/addressbook.c:2500
 msgid "New user, could not save address book files."
 msgstr "新建用户，无法保存地址簿文件。"
 
-#: src/addressbook.c:2383 src/addressbook.c:2516
+#: src/addressbook.c:2377 src/addressbook.c:2510
 msgid "Old address book converted successfully."
 msgstr "成功转换旧的地址簿。"
 
-#: src/addressbook.c:2388
+#: src/addressbook.c:2382
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1059,7 +1060,7 @@ msgstr ""
 "已经转换旧的地址簿，\n"
 "无法保存新的地址索引文件"
 
-#: src/addressbook.c:2401
+#: src/addressbook.c:2395
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1067,7 +1068,7 @@ msgstr ""
 "无法转换地址簿，\n"
 "但创建了空的新地址簿文件。"
 
-#: src/addressbook.c:2407
+#: src/addressbook.c:2401
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1075,90 +1076,90 @@ msgstr ""
 "无法转换地址簿，\n"
 "无法创建新的地址簿文件。"
 
-#: src/addressbook.c:2412
+#: src/addressbook.c:2406
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
 msgstr "无法转换地址簿且无法创建新的地址簿文件。"
 
-#: src/addressbook.c:2419
+#: src/addressbook.c:2413
 msgid "Addressbook conversion error"
 msgstr "地址簿转换错误"
 
-#: src/addressbook.c:2423
+#: src/addressbook.c:2417
 msgid "Addressbook conversion"
 msgstr "地址簿转换"
 
-#: src/addressbook.c:2458
+#: src/addressbook.c:2452
 msgid "Addressbook Error"
 msgstr "地址簿错误"
 
-#: src/addressbook.c:2459 src/addressbook.c:2559
+#: src/addressbook.c:2453 src/addressbook.c:2553
 msgid "Could not read address index"
 msgstr "无法读取地址索引"
 
-#: src/addressbook.c:2521
+#: src/addressbook.c:2515
 msgid "Old address book converted, could not save new address index file"
 msgstr "已经转换旧的地址簿，无法保存新的地址索引文件"
 
-#: src/addressbook.c:2535
+#: src/addressbook.c:2529
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr "无法转换地址簿，但创建了空的新地址簿文件。"
 
-#: src/addressbook.c:2541
+#: src/addressbook.c:2535
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr "无法转换地址簿，无法创建新的地址簿文件。"
 
-#: src/addressbook.c:2547
+#: src/addressbook.c:2541
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr "无法转换地址簿且无法创建新的地址簿文件。"
 
-#: src/addressbook.c:2565
+#: src/addressbook.c:2559
 msgid "Addressbook Conversion Error"
 msgstr "地址簿转换错误"
 
-#: src/addressbook.c:2571
+#: src/addressbook.c:2565
 msgid "Addressbook Conversion"
 msgstr "地址簿转换"
 
-#: src/addressbook.c:3086 src/prefs_common_dialog.c:2033
+#: src/addressbook.c:3080 src/prefs_common_dialog.c:2033
 msgid "Interface"
 msgstr "界面"
 
-#: src/addressbook.c:3102 src/importldif.c:514
+#: src/addressbook.c:3096 src/importldif.c:514
 msgid "Address Book"
 msgstr "地址簿"
 
-#: src/addressbook.c:3118
+#: src/addressbook.c:3112
 msgid "Person"
 msgstr "个人"
 
-#: src/addressbook.c:3134
+#: src/addressbook.c:3128
 msgid "EMail Address"
 msgstr "电子邮件地址"
 
-#: src/addressbook.c:3150
+#: src/addressbook.c:3144
 msgid "Group"
 msgstr "群组"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3166 src/folderview.c:367 src/prefs_account_dialog.c:1694
-#: src/query_search.c:370
+#: src/addressbook.c:3160 src/folderview.c:367 src/prefs_account_dialog.c:1694
+#: src/query_search.c:398
 msgid "Folder"
 msgstr "文件夹"
 
-#: src/addressbook.c:3182
+#: src/addressbook.c:3176
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3198 src/addressbook.c:3214
+#: src/addressbook.c:3192 src/addressbook.c:3208
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3230
+#: src/addressbook.c:3224
 msgid "LDAP Server"
 msgstr "LDAP 服务器"
 
@@ -1170,7 +1171,7 @@ msgstr "公用地址"
 msgid "Personal address"
 msgstr "个人地址"
 
-#: src/alertpanel.c:142 src/compose.c:5500 src/main.c:621
+#: src/alertpanel.c:142 src/compose.c:5517 src/main.c:621
 msgid "Notice"
 msgstr "注意"
 
@@ -1178,7 +1179,7 @@ msgstr "注意"
 msgid "Warning"
 msgstr "警告"
 
-#: src/alertpanel.c:168 src/inc.c:587
+#: src/alertpanel.c:168 src/inc.c:586
 msgid "Error"
 msgstr "错误"
 
@@ -1221,7 +1222,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:4761
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4762
 msgid "None"
 msgstr "没有"
 
@@ -1473,7 +1474,7 @@ msgstr "/查看(_V)/字符编码(_E)/泰国语 (TIS-620)"
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/查看(_V)/字符编码(_E)/泰国语 (Windows-874)"
 
-#: src/compose.c:646 src/mainwindow.c:759 src/messageview.c:267
+#: src/compose.c:646 src/mainwindow.c:759 src/messageview.c:268
 msgid "/_Tools/_Address book"
 msgstr "/工具(_T)/地址簿(_A)"
 
@@ -1481,14 +1482,14 @@ msgstr "/工具(_T)/地址簿(_A)"
 msgid "/_Tools/_Template"
 msgstr "/工具(_T)/模板(_T)"
 
-#: src/compose.c:649 src/mainwindow.c:783 src/messageview.c:283
+#: src/compose.c:649 src/mainwindow.c:783 src/messageview.c:284
 msgid "/_Tools/Actio_ns"
 msgstr "/工具(_T)/动作(_N)"
 
 #: src/compose.c:651 src/compose.c:655 src/compose.c:661 src/mainwindow.c:762
 #: src/mainwindow.c:776 src/mainwindow.c:781 src/mainwindow.c:784
-#: src/mainwindow.c:788 src/mainwindow.c:790 src/messageview.c:270
-#: src/messageview.c:282
+#: src/mainwindow.c:788 src/mainwindow.c:790 src/messageview.c:271
+#: src/messageview.c:283
 msgid "/_Tools/---"
 msgstr "/工具(_T)/---"
 
@@ -1514,80 +1515,80 @@ msgstr "/工具(_T)/执行(_X)"
 msgid "/_Tools/_Set spell language"
 msgstr "/工具(_T)/模板(_T)"
 
-#: src/compose.c:910
+#: src/compose.c:912
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s：文件不存在\n"
 
-#: src/compose.c:1014 src/compose.c:1085
+#: src/compose.c:1016 src/compose.c:1087
 msgid "Can't get text part\n"
 msgstr "无法得到文本分块\n"
 
-#: src/compose.c:1486
+#: src/compose.c:1488
 msgid "Quote mark format error."
 msgstr "引文标记格式错误。"
 
-#: src/compose.c:1498
+#: src/compose.c:1500
 msgid "Message reply/forward format error."
 msgstr "邮件回复/转发格式错误。"
 
-#: src/compose.c:1918
+#: src/compose.c:1935
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "文件 %s 不存在\n"
 
-#: src/compose.c:1922
+#: src/compose.c:1939
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "无法获得文件 %s 的大小\n"
 
-#: src/compose.c:1926
+#: src/compose.c:1943
 #, c-format
 msgid "File %s is empty."
 msgstr "文件 %s 是空的。"
 
-#: src/compose.c:1930
+#: src/compose.c:1947
 #, c-format
 msgid "Can't read %s."
 msgstr "无法读取 %s。"
 
-#: src/compose.c:1963
+#: src/compose.c:1980
 #, c-format
 msgid "Message: %s"
 msgstr "邮件：%s"
 
-#: src/compose.c:2023 src/mimeview.c:565
+#: src/compose.c:2040 src/mimeview.c:565
 msgid "Can't get the part of multipart message."
 msgstr "无法获得分块邮件的分块。"
 
-#: src/compose.c:2507 src/headerview.c:195 src/query_search.c:636
+#: src/compose.c:2524 src/headerview.c:195 src/query_search.c:666
 #: src/summaryview.c:2124
 msgid "(No Subject)"
 msgstr "(没有主题)"
 
-#: src/compose.c:2510
+#: src/compose.c:2527
 #, fuzzy, c-format
 msgid "%s - Compose%s"
 msgstr "%s - 撰写邮件%s"
 
-#: src/compose.c:2623
+#: src/compose.c:2642
 msgid "Recipient is not specified."
 msgstr "没有指定收件人。"
 
-#: src/compose.c:2631
+#: src/compose.c:2650
 #, fuzzy
 msgid "Empty subject"
 msgstr "主题"
 
-#: src/compose.c:2632
+#: src/compose.c:2651
 msgid "Subject is empty. Send it anyway?"
 msgstr "主题是空的。还要发送吗？"
 
-#: src/compose.c:2691
+#: src/compose.c:2710
 msgid "can't get recipient list."
 msgstr "无法获得收件人列表。"
 
-#: src/compose.c:2711
+#: src/compose.c:2730
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1595,21 +1596,21 @@ msgstr ""
 "没有指定发送邮件要用的帐号。\n"
 "请在发送前选择一个邮件帐号。"
 
-#: src/compose.c:2725 src/send_message.c:299
+#: src/compose.c:2744 src/send_message.c:299
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "发送邮件到 %s 时发生错误。"
 
-#: src/compose.c:2767
+#: src/compose.c:2786
 msgid "Can't save the message to outbox."
 msgstr "无法将该邮件保存到发件箱。"
 
-#: src/compose.c:2805
+#: src/compose.c:2824
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "无法找到和当前选中的密钥标识“%s”相联系的钥匙。"
 
-#: src/compose.c:2902
+#: src/compose.c:2921
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1619,12 +1620,12 @@ msgstr ""
 "无法将邮件的字符编码从 %s 转换到 %s。\n"
 "仍然用 %s 发送吗？"
 
-#: src/compose.c:2908
+#: src/compose.c:2927
 #, fuzzy
 msgid "Code conversion error"
 msgstr "地址簿转换错误"
 
-#: src/compose.c:2981
+#: src/compose.c:3000
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1633,159 +1634,159 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:2985
+#: src/compose.c:3004
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3275
+#: src/compose.c:3294
 msgid "can't remove the old message\n"
 msgstr "无法删除旧邮件\n"
 
-#: src/compose.c:3293
+#: src/compose.c:3312
 msgid "queueing message...\n"
 msgstr "正在排队邮件...\n"
 
-#: src/compose.c:3375
+#: src/compose.c:3394
 msgid "can't find queue folder\n"
 msgstr "无法找到队列文件夹：%s\n"
 
-#: src/compose.c:3382
+#: src/compose.c:3401
 msgid "can't queue the message\n"
 msgstr "无法排队该邮件\n"
 
-#: src/compose.c:3975
+#: src/compose.c:3994
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "生成邮件标识号：%s\n"
 
-#: src/compose.c:4088
+#: src/compose.c:4107
 msgid "Creating compose window...\n"
 msgstr "正在创建撰写窗口...\n"
 
-#: src/compose.c:4139 src/headerview.c:54
+#: src/compose.c:4158 src/headerview.c:54
 msgid "From:"
 msgstr "发件人："
 
-#: src/compose.c:4213
+#: src/compose.c:4232
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/工具(_T)/PGP 签名(_G)"
 
-#: src/compose.c:4216
+#: src/compose.c:4235
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/工具(_T)/PGP 加密(_E)"
 
-#: src/compose.c:4254 src/compose.c:5332
+#: src/compose.c:4273 src/compose.c:5351
 msgid "MIME type"
 msgstr "MIME 类型"
 
 #. S_COL_DATE
-#: src/compose.c:4263 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4908
+#: src/compose.c:4282 src/mimeview.c:197 src/prefs_filter_edit.c:496
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4909
 msgid "Size"
 msgstr "大小"
 
-#: src/compose.c:4698 src/mainwindow.c:2359 src/prefs_account_dialog.c:528
+#: src/compose.c:4717 src/mainwindow.c:2359 src/prefs_account_dialog.c:528
 #: src/prefs_common_dialog.c:661
 msgid "Send"
 msgstr "发送"
 
-#: src/compose.c:4699
+#: src/compose.c:4718
 msgid "Send message"
 msgstr "立即发送邮件"
 
-#: src/compose.c:4707
+#: src/compose.c:4726
 msgid "Send later"
 msgstr "以后发送"
 
-#: src/compose.c:4708
+#: src/compose.c:4727
 msgid "Put into queue folder and send later"
 msgstr "放入队列文件夹，在以后发送"
 
-#: src/compose.c:4716
+#: src/compose.c:4735
 msgid "Draft"
 msgstr "草稿"
 
-#: src/compose.c:4717
+#: src/compose.c:4736
 msgid "Save to draft folder"
 msgstr "保存到草稿文件夹"
 
-#: src/compose.c:4727
+#: src/compose.c:4746
 msgid "Insert"
 msgstr "插入"
 
-#: src/compose.c:4728
+#: src/compose.c:4747
 msgid "Insert file"
 msgstr "插入文件内容"
 
-#: src/compose.c:4736
+#: src/compose.c:4755
 msgid "Attach"
 msgstr "附件"
 
-#: src/compose.c:4737
+#: src/compose.c:4756
 msgid "Attach file"
 msgstr "加入附件"
 
 #. signature
-#: src/compose.c:4747 src/prefs_account_dialog.c:1208
+#: src/compose.c:4766 src/prefs_account_dialog.c:1208
 #: src/prefs_common_dialog.c:953
 msgid "Signature"
 msgstr "签名"
 
-#: src/compose.c:4748
+#: src/compose.c:4767
 #, fuzzy
 msgid "Append signature"
 msgstr "签名错误"
 
 #. editor
-#: src/compose.c:4757 src/prefs_common_dialog.c:991
+#: src/compose.c:4776 src/prefs_common_dialog.c:991
 #: src/prefs_common_dialog.c:2315
 msgid "Editor"
 msgstr "编辑器"
 
-#: src/compose.c:4758
+#: src/compose.c:4777
 msgid "Edit with external editor"
 msgstr "使用外部编辑器编辑"
 
-#: src/compose.c:4766
+#: src/compose.c:4785
 msgid "Linewrap"
 msgstr "换行"
 
-#: src/compose.c:4767
+#: src/compose.c:4786
 msgid "Wrap all long lines"
 msgstr "长行换行"
 
-#: src/compose.c:5228
+#: src/compose.c:5247
 msgid "Invalid MIME type."
 msgstr "无效的MIME类型。"
 
-#: src/compose.c:5246
+#: src/compose.c:5265
 msgid "File doesn't exist or is empty."
 msgstr "文件不存在或为空。"
 
-#: src/compose.c:5314
+#: src/compose.c:5333
 msgid "Properties"
 msgstr "属性"
 
-#: src/compose.c:5334 src/prefs_common_dialog.c:1444
+#: src/compose.c:5353 src/prefs_common_dialog.c:1444
 msgid "Encoding"
 msgstr "编码方式"
 
-#: src/compose.c:5357 src/prefs_folder_item.c:202
+#: src/compose.c:5376 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "路径"
 
-#: src/compose.c:5358
+#: src/compose.c:5377
 msgid "File name"
 msgstr "文件名"
 
-#: src/compose.c:5449
+#: src/compose.c:5466
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "外部编辑器命令行无效：“%s”\n"
 
-#: src/compose.c:5497
+#: src/compose.c:5514
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1795,47 +1796,47 @@ msgstr ""
 "强制结束程序？\n"
 "程序组标识号：%d"
 
-#: src/compose.c:5872 src/compose.c:5877 src/compose.c:5883
+#: src/compose.c:5889 src/compose.c:5894 src/compose.c:5900
 msgid "Can't queue the message."
 msgstr "无法将该邮件排队。"
 
-#: src/compose.c:5974
+#: src/compose.c:5991
 msgid "Select files"
 msgstr "选择文件"
 
-#: src/compose.c:5997
+#: src/compose.c:6014
 msgid "Select file"
 msgstr "选择文件"
 
-#: src/compose.c:6032
+#: src/compose.c:6049
 #, fuzzy
 msgid "Save message"
 msgstr "立即发送邮件"
 
-#: src/compose.c:6033
+#: src/compose.c:6050
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "该邮件已修改。丢弃它？"
 
-#: src/compose.c:6035
+#: src/compose.c:6052
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:6077
+#: src/compose.c:6094
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "您要使用模板“%s”吗？"
 
-#: src/compose.c:6079
+#: src/compose.c:6096
 msgid "Apply template"
 msgstr "使用模板"
 
-#: src/compose.c:6080
+#: src/compose.c:6097
 #, fuzzy
 msgid "_Replace"
 msgstr "替换"
 
-#: src/compose.c:6080
+#: src/compose.c:6097
 #, fuzzy
 msgid "_Insert"
 msgstr "插入"
@@ -1957,52 +1958,52 @@ msgstr "必须提供群组名。"
 msgid "Edit Group Data"
 msgstr "编辑群组信息"
 
-#: src/editgroup.c:300
+#: src/editgroup.c:299
 msgid "Group Name"
 msgstr "群组名"
 
-#: src/editgroup.c:319
+#: src/editgroup.c:318
 msgid "Addresses in Group"
 msgstr "群组中的地址"
 
-#: src/editgroup.c:321
+#: src/editgroup.c:320
 msgid " -> "
 msgstr " -> "
 
-#: src/editgroup.c:348
+#: src/editgroup.c:347
 msgid " <- "
 msgstr " <- "
 
-#: src/editgroup.c:350
+#: src/editgroup.c:349
 msgid "Available Addresses"
 msgstr "可用邮件地址"
 
-#: src/editgroup.c:416
+#: src/editgroup.c:415
 msgid "Move E-Mail Addresses to or from Group with arrow buttons"
 msgstr "用箭头按钮将电子邮件地址移入和移出群组"
 
-#: src/editgroup.c:468
+#: src/editgroup.c:467
 msgid "Edit Group Details"
 msgstr "编辑群组细节"
 
-#: src/editgroup.c:471
+#: src/editgroup.c:470
 msgid "Add New Group"
 msgstr "添加新群组"
 
-#: src/editgroup.c:522
+#: src/editgroup.c:521
 msgid "Edit folder"
 msgstr "编辑文件夹"
 
-#: src/editgroup.c:522
+#: src/editgroup.c:521
 msgid "Input the new name of folder:"
 msgstr "输入文件夹的新名字："
 
-#: src/editgroup.c:525 src/foldersel.c:541 src/folderview.c:2121
+#: src/editgroup.c:524 src/foldersel.c:541 src/folderview.c:2121
 #: src/folderview.c:2127
 msgid "New folder"
 msgstr "新建文件夹"
 
-#: src/editgroup.c:526 src/foldersel.c:542 src/folderview.c:2128
+#: src/editgroup.c:525 src/foldersel.c:542 src/folderview.c:2128
 msgid "Input the name of new folder:"
 msgstr "输入新建文件夹的名字："
 
@@ -2200,7 +2201,7 @@ msgid "`%c' can't be included in folder name."
 msgstr "字符“%c”不能包含在文件夹名字中。"
 
 #: src/foldersel.c:561 src/folderview.c:2147 src/folderview.c:2206
-#: src/query_search.c:995
+#: src/query_search.c:1031
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "文件夹“%s”已存在。"
@@ -2459,7 +2460,7 @@ msgstr "标题："
 msgid "Creating header view...\n"
 msgstr "正在创建标题视图...\n"
 
-#: src/headerview.c:180 src/query_search.c:637 src/summaryview.c:2127
+#: src/headerview.c:180 src/query_search.c:667 src/summaryview.c:2127
 msgid "(No From)"
 msgstr "(没有发件人)"
 
@@ -2589,133 +2590,133 @@ msgstr "完成"
 msgid "Sylpheed: %d new messages"
 msgstr "完成 (%d 个新邮件)"
 
-#: src/inc.c:372
+#: src/inc.c:371
 msgid "Retrieving new messages"
 msgstr "正在获取新邮件"
 
-#: src/inc.c:415
+#: src/inc.c:414
 msgid "Standby"
 msgstr "请等待"
 
-#: src/inc.c:544 src/inc.c:593
+#: src/inc.c:543 src/inc.c:592
 msgid "Cancelled"
 msgstr "取消"
 
-#: src/inc.c:555
+#: src/inc.c:554
 msgid "Retrieving"
 msgstr "正在获取"
 
-#: src/inc.c:564
+#: src/inc.c:563
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "完成 (收到 %d 个邮件 (%s))"
 
-#: src/inc.c:568
+#: src/inc.c:567
 msgid "Done (no new messages)"
 msgstr "完成 (没有新邮件)"
 
-#: src/inc.c:574
+#: src/inc.c:573
 msgid "Connection failed"
 msgstr "连接失败"
 
-#: src/inc.c:577
+#: src/inc.c:576
 msgid "Auth failed"
 msgstr "验证失败"
 
-#: src/inc.c:580
+#: src/inc.c:579
 msgid "Locked"
 msgstr "锁住"
 
-#: src/inc.c:590
+#: src/inc.c:589
 msgid "Timeout"
 msgstr "超时"
 
-#: src/inc.c:640
+#: src/inc.c:639
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "完成 (%d 个新邮件)"
 
-#: src/inc.c:643
+#: src/inc.c:642
 msgid "Finished (no new messages)"
 msgstr "完成 (没有新邮件)"
 
-#: src/inc.c:652
+#: src/inc.c:651
 msgid "Some errors occurred while getting mail."
 msgstr "获取邮件时发生错误。"
 
-#: src/inc.c:688
+#: src/inc.c:687
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "正在获取帐号 %s 的新邮件...\n"
 
-#: src/inc.c:691
+#: src/inc.c:690
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s：正在获取新邮件"
 
-#: src/inc.c:710
+#: src/inc.c:709
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "正在连接POP3服务器：%s..."
 
-#: src/inc.c:719
+#: src/inc.c:718
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "无法连接POP3服务器：%s:%d\n"
 
-#: src/inc.c:798 src/send_message.c:631
+#: src/inc.c:797 src/send_message.c:631
 msgid "Authenticating..."
 msgstr "正在验证..."
 
-#: src/inc.c:799
+#: src/inc.c:798
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "正在从 %s 获取邮件..."
 
-#: src/inc.c:804
+#: src/inc.c:803
 msgid "Getting the number of new messages (STAT)..."
 msgstr "正在获取新邮件数量(STAT)..."
 
-#: src/inc.c:808
+#: src/inc.c:807
 msgid "Getting the number of new messages (LAST)..."
 msgstr "正在获取新邮件数量(LAST)..."
 
-#: src/inc.c:812
+#: src/inc.c:811
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "正在获取新邮件数量(UIDL)..."
 
-#: src/inc.c:816
+#: src/inc.c:815
 msgid "Getting the size of messages (LIST)..."
 msgstr "正在获取新邮件的大小(LIST)..."
 
-#: src/inc.c:826
+#: src/inc.c:825
 #, c-format
 msgid "Deleting message %d"
 msgstr "正在删除邮件 %d"
 
-#: src/inc.c:833 src/send_message.c:649
+#: src/inc.c:832 src/send_message.c:649
 msgid "Quitting"
 msgstr "正在退出"
 
-#: src/inc.c:858
+#: src/inc.c:857
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "正在获取邮件 (%d / %d) (%s / %s)"
 
-#: src/inc.c:879
+#: src/inc.c:878
 #, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "正在获取 (收到 %d 个邮件 (%s))"
 
-#: src/inc.c:1107
+#: src/inc.c:1106
 msgid "Connection failed."
 msgstr "连接失败"
 
-#: src/inc.c:1113
+#: src/inc.c:1112
 msgid "Error occurred while processing mail."
 msgstr "处理邮件时发生错误。"
 
-#: src/inc.c:1118
+#: src/inc.c:1117
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2724,28 +2725,28 @@ msgstr ""
 "处理邮件时发生错误：\n"
 "%s"
 
-#: src/inc.c:1124
+#: src/inc.c:1123
 msgid "No disk space left."
 msgstr "没有剩余磁盘空间。"
 
-#: src/inc.c:1129
+#: src/inc.c:1128
 msgid "Can't write file."
 msgstr "无法写入文件。"
 
-#: src/inc.c:1134
+#: src/inc.c:1133
 msgid "Socket error."
 msgstr "Socket错误。"
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1140 src/send_message.c:584 src/send_message.c:772
+#: src/inc.c:1139 src/send_message.c:584 src/send_message.c:772
 msgid "Connection closed by the remote host."
 msgstr "远程主机关闭了连接。"
 
-#: src/inc.c:1146
+#: src/inc.c:1145
 msgid "Mailbox is locked."
 msgstr "信箱被锁住。"
 
-#: src/inc.c:1150
+#: src/inc.c:1149
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2754,11 +2755,11 @@ msgstr ""
 "信箱被锁住：\n"
 "%s"
 
-#: src/inc.c:1156 src/send_message.c:757
+#: src/inc.c:1155 src/send_message.c:757
 msgid "Authentication failed."
 msgstr "验证失败。"
 
-#: src/inc.c:1161 src/send_message.c:760
+#: src/inc.c:1160 src/send_message.c:760
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2767,15 +2768,15 @@ msgstr ""
 "验证失败：\n"
 "%s"
 
-#: src/inc.c:1166 src/send_message.c:776
+#: src/inc.c:1165 src/send_message.c:776
 msgid "Session timed out."
 msgstr "会话超时。"
 
-#: src/inc.c:1202
+#: src/inc.c:1201
 msgid "Incorporation cancelled\n"
 msgstr "合并新邮件被取消\n"
 
-#: src/inc.c:1285
+#: src/inc.c:1284
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "正在从 %s 获取新邮件到 %s...\n"
@@ -3243,14 +3244,15 @@ msgid "/_View/Mess_age source"
 msgstr "/查看(_V)/邮件源文件(_A)"
 
 #: src/mainwindow.c:708 src/messageview.c:245
-msgid "/_View/Show all _header"
+#, fuzzy
+msgid "/_View/Show all _headers"
 msgstr "/查看(_V)/显示所有邮件头(_H)"
 
 #: src/mainwindow.c:710
 msgid "/_View/_Update summary"
 msgstr "/查看(_V)/更新摘要(_U)"
 
-#: src/mainwindow.c:712 src/messageview.c:247
+#: src/mainwindow.c:712 src/messageview.c:248
 msgid "/_Message"
 msgstr "/邮件(_M)"
 
@@ -3280,16 +3282,16 @@ msgstr "/邮件(_M)/发送队列中的邮件(_S)"
 
 #: src/mainwindow.c:722 src/mainwindow.c:724 src/mainwindow.c:731
 #: src/mainwindow.c:736 src/mainwindow.c:739 src/mainwindow.c:750
-#: src/mainwindow.c:752 src/mainwindow.c:755 src/messageview.c:250
-#: src/messageview.c:258 src/messageview.c:263
+#: src/mainwindow.c:752 src/mainwindow.c:755 src/messageview.c:251
+#: src/messageview.c:259 src/messageview.c:264
 msgid "/_Message/---"
 msgstr "/邮件(_M)/---"
 
-#: src/mainwindow.c:723 src/messageview.c:248
+#: src/mainwindow.c:723 src/messageview.c:249
 msgid "/_Message/Compose _new message"
 msgstr "/邮件(_M)/撰写新邮件(_N)"
 
-#: src/mainwindow.c:725 src/messageview.c:251
+#: src/mainwindow.c:725 src/messageview.c:252
 msgid "/_Message/_Reply"
 msgstr "/邮件(_M)/回复(_R)"
 
@@ -3297,27 +3299,27 @@ msgstr "/邮件(_M)/回复(_R)"
 msgid "/_Message/Repl_y to"
 msgstr "/邮件(_M)/回复到(_Y)"
 
-#: src/mainwindow.c:727 src/messageview.c:252
+#: src/mainwindow.c:727 src/messageview.c:253
 msgid "/_Message/Repl_y to/_all"
 msgstr "/邮件(_M)/回复到(_Y)/所有人(_AL)"
 
-#: src/mainwindow.c:728 src/messageview.c:254
+#: src/mainwindow.c:728 src/messageview.c:255
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/邮件(_M)/回复到(_Y)/发件人(_S)"
 
-#: src/mainwindow.c:729 src/messageview.c:256
+#: src/mainwindow.c:729 src/messageview.c:257
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/邮件(_M)/回复到(_Y)/邮件列表(_L)"
 
-#: src/mainwindow.c:732 src/messageview.c:259
+#: src/mainwindow.c:732 src/messageview.c:260
 msgid "/_Message/_Forward"
 msgstr "/邮件(_M)/转发(_F)"
 
-#: src/mainwindow.c:733 src/messageview.c:260
+#: src/mainwindow.c:733 src/messageview.c:261
 msgid "/_Message/For_ward as attachment"
 msgstr "/邮件(_M)/作为附件转发(_W)"
 
-#: src/mainwindow.c:735 src/messageview.c:262
+#: src/mainwindow.c:735 src/messageview.c:263
 msgid "/_Message/Redirec_t"
 msgstr "/邮件(_M)/重定向(_T)"
 
@@ -3376,7 +3378,7 @@ msgstr "/邮件(_M)/接收新邮件(_i)"
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/邮件(_M)/接收新邮件(_i)"
 
-#: src/mainwindow.c:756 src/messageview.c:264
+#: src/mainwindow.c:756 src/messageview.c:265
 msgid "/_Message/Re-_edit"
 msgstr "/邮件(_M)/重新编辑(_E)"
 
@@ -3393,23 +3395,23 @@ msgstr "/工具(_T)/过滤文件夹中所有的邮件(_F)"
 msgid "/_Tools/Filter _selected messages"
 msgstr "/工具(_T)/过滤选中的邮件(_S)"
 
-#: src/mainwindow.c:767 src/messageview.c:271
+#: src/mainwindow.c:767 src/messageview.c:272
 msgid "/_Tools/_Create filter rule"
 msgstr "/工具(_T)/创建过滤规则(_C)"
 
-#: src/mainwindow.c:768 src/messageview.c:273
+#: src/mainwindow.c:768 src/messageview.c:274
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/工具(_T)/创建过滤规则(_C)/自动(_A)"
 
-#: src/mainwindow.c:770 src/messageview.c:275
+#: src/mainwindow.c:770 src/messageview.c:276
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/工具(_T)/创建过滤规则(_C)/按发件人(_F)"
 
-#: src/mainwindow.c:772 src/messageview.c:277
+#: src/mainwindow.c:772 src/messageview.c:278
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/工具(_T)/创建过滤规则(_C)/按收件人(_T)"
 
-#: src/mainwindow.c:774 src/messageview.c:279
+#: src/mainwindow.c:774 src/messageview.c:280
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/工具(_T)/创建过滤规则(_C)/按主题(_S)"
 
@@ -3530,7 +3532,7 @@ msgid "MainWindow: color allocation %d failed\n"
 msgstr "主窗口：分配颜色 %d 失败\n"
 
 #: src/mainwindow.c:1139 src/summaryview.c:2275 src/summaryview.c:2360
-#: src/summaryview.c:3907 src/summaryview.c:4036 src/summaryview.c:4394
+#: src/summaryview.c:3908 src/summaryview.c:4037 src/summaryview.c:4395
 msgid "done.\n"
 msgstr "完成。\n"
 
@@ -3790,7 +3792,7 @@ msgid "Find text:"
 msgstr "查找文字："
 
 #: src/message_search.c:153 src/prefs_search_folder.c:253
-#: src/query_search.c:326
+#: src/query_search.c:343
 msgid "Case sensitive"
 msgstr "区分大小写"
 
@@ -3814,27 +3816,27 @@ msgstr "已查找到邮件结尾；从开头继续？"
 msgid "Search finished"
 msgstr "搜索结束"
 
-#: src/messageview.c:268
+#: src/messageview.c:269
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/工具(_T)/将发件人添加到地址簿中(_K)"
 
-#: src/messageview.c:300
+#: src/messageview.c:301
 msgid "Creating message view...\n"
 msgstr "正在创建邮件视图...\n"
 
-#: src/messageview.c:325
+#: src/messageview.c:326
 msgid "Text"
 msgstr "文本"
 
-#: src/messageview.c:330
+#: src/messageview.c:331
 msgid "Attachments"
 msgstr "附件"
 
-#: src/messageview.c:380
+#: src/messageview.c:381
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:699 src/summaryview.c:3436
+#: src/messageview.c:700 src/summaryview.c:3436
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "无法保存文件“%s”'。"
@@ -3852,7 +3854,7 @@ msgstr "执行命令"
 msgid "Print"
 msgstr "打印"
 
-#: src/messageview.c:770 src/summaryview.c:3471
+#: src/messageview.c:769 src/summaryview.c:3470
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -3949,11 +3951,11 @@ msgstr ""
 "输入打开文件的命令行：\n"
 "(“%s”将被替换为文件名)"
 
-#: src/mimeview.c:1147
+#: src/mimeview.c:1140
 msgid "Opening executable file"
 msgstr ""
 
-#: src/mimeview.c:1148
+#: src/mimeview.c:1141
 msgid ""
 "This is an executable file. Opening executable file is restricted for "
 "security.\n"
@@ -3961,11 +3963,6 @@ msgid ""
 "virus or something like a malicious program."
 msgstr ""
 
-#: src/mimeview.c:1184
-#, c-format
-msgid "MIME viewer command line is invalid: `%s'"
-msgstr "MIME察看器命令行无效：“%s”"
-
 #: src/passphrase.c:96
 msgid "Passphrase"
 msgstr "口令串"
@@ -5730,20 +5727,20 @@ msgstr "回复至："
 msgid "%s - Edit search condition"
 msgstr ""
 
-#: src/prefs_search_folder.c:209 src/query_search.c:257
+#: src/prefs_search_folder.c:209 src/query_search.c:274
 msgid "Match any of the following"
 msgstr "匹配以下任何"
 
-#: src/prefs_search_folder.c:211 src/query_search.c:259
+#: src/prefs_search_folder.c:211 src/query_search.c:276
 msgid "Match all of the following"
 msgstr "匹配以下所有"
 
-#: src/prefs_search_folder.c:231 src/query_search.c:303
+#: src/prefs_search_folder.c:231 src/query_search.c:320
 #, fuzzy
 msgid "Folder:"
 msgstr "文件夹"
 
-#: src/prefs_search_folder.c:248 src/query_search.c:321
+#: src/prefs_search_folder.c:248 src/query_search.c:338
 #, fuzzy
 msgid "Search subfolders"
 msgstr "搜索失败"
@@ -5758,17 +5755,17 @@ msgid "Attachment"
 msgstr "附件"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73 src/query_search.c:371 src/summaryview.c:4901
+#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4902
 msgid "Subject"
 msgstr "主题"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/query_search.c:372 src/summaryview.c:4904
+#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4905
 msgid "From"
 msgstr "发件人"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/query_search.c:373 src/summaryview.c:4906
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:4907
 msgid "Date"
 msgstr "日期"
 
@@ -5861,43 +5858,43 @@ msgstr "正在创建进度对话框...\n"
 msgid "Status"
 msgstr "状态"
 
-#: src/query_search.c:234
+#: src/query_search.c:251
 msgid "Search messages"
 msgstr "查找邮件"
 
-#: src/query_search.c:395
+#: src/query_search.c:423
 #, fuzzy
 msgid "_Save as search folder"
 msgstr "保存到草稿文件夹"
 
-#: src/query_search.c:512 src/subscribedialog.c:526 src/summaryview.c:842
+#: src/query_search.c:542 src/subscribedialog.c:526 src/summaryview.c:842
 msgid "Done."
 msgstr "完成。"
 
-#: src/query_search.c:536
+#: src/query_search.c:566
 #, fuzzy, c-format
 msgid "Searching %s ..."
 msgstr "正在扫描文件夹 %s ..."
 
-#: src/query_search.c:564
+#: src/query_search.c:594
 #, fuzzy, c-format
 msgid "Searching %s (%d / %d)..."
 msgstr "正在过滤..."
 
-#: src/query_search.c:645 src/summaryview.c:2051
+#: src/query_search.c:675 src/summaryview.c:2051
 msgid "(No Date)"
 msgstr "(没有日期)"
 
-#: src/query_search.c:833
+#: src/query_search.c:869
 #, fuzzy
 msgid "Save as search folder"
 msgstr "保存到草稿文件夹"
 
-#: src/query_search.c:854
+#: src/query_search.c:890
 msgid "Location:"
 msgstr ""
 
-#: src/query_search.c:869
+#: src/query_search.c:905
 #, fuzzy
 msgid "Folder name:"
 msgstr "文件名"
@@ -6528,37 +6525,37 @@ msgstr "邮件 %d 被设置为复制到 %s\n"
 msgid "Destination for copy is same as current folder."
 msgstr "复制目标与当前文件夹相同。"
 
-#: src/summaryview.c:3506
+#: src/summaryview.c:3507
 msgid "Error occurred while processing messages."
 msgstr "处理邮件时发生错误。"
 
-#: src/summaryview.c:3814 src/summaryview.c:3815
+#: src/summaryview.c:3815 src/summaryview.c:3816
 msgid "Building threads..."
 msgstr "正在创建线索..."
 
-#: src/summaryview.c:3965 src/summaryview.c:3966
+#: src/summaryview.c:3966 src/summaryview.c:3967
 msgid "Unthreading..."
 msgstr "正在取消线索..."
 
-#: src/summaryview.c:4259 src/summaryview.c:4315
+#: src/summaryview.c:4260 src/summaryview.c:4316
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "正在过滤..."
 
-#: src/summaryview.c:4364
+#: src/summaryview.c:4365
 msgid "filtering..."
 msgstr "正在过滤..."
 
-#: src/summaryview.c:4365
+#: src/summaryview.c:4366
 msgid "Filtering..."
 msgstr "正在过滤..."
 
-#: src/summaryview.c:4401
+#: src/summaryview.c:4402
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "已经过滤 %d 个邮件。"
 
-#: src/summaryview.c:4910
+#: src/summaryview.c:4911
 msgid "No."
 msgstr "No."
 
@@ -6649,6 +6646,9 @@ msgstr "退出"
 msgid "Sylpheed"
 msgstr "旧式的Sylpheed"
 
+#~ msgid "MIME viewer command line is invalid: `%s'"
+#~ msgstr "MIME察看器命令行无效：“%s”"
+
 #~ msgid "%dB"
 #~ msgstr "%dB"
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 32096452..796db41f 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-03-02 19:03+0900\n"
+"POT-Creation-Date: 2006-03-10 16:06+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:491
+#: libsylph/prefs_common.c:496
 msgid "Junk mail filter"
 msgstr "垃圾郵件資料夾"
 
@@ -524,7 +524,7 @@ msgstr "無法開啟標示的檔案 \n"
 msgid "can't fetch message %d\n"
 msgstr "無法擷取郵件 %d\n"
 
-#: libsylph/procmsg.c:1375
+#: libsylph/procmsg.c:1378
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "列印命令錯誤：「%s」\n"
@@ -602,12 +602,12 @@ msgstr "  主旨: %s\n"
 msgid "  Issuer: %s\n"
 msgstr "  發信人: %s\n"
 
-#: libsylph/utils.c:2411 src/compose.c:2869 src/compose.c:3132
-#: src/compose.c:3195 src/compose.c:3315
+#: libsylph/utils.c:2430 src/compose.c:2888 src/compose.c:3151
+#: src/compose.c:3214 src/compose.c:3334
 msgid "can't change file mode\n"
 msgstr "無法改變檔案型態\n"
 
-#: libsylph/utils.c:2418 libsylph/utils.c:2542
+#: libsylph/utils.c:2437 libsylph/utils.c:2561
 #, c-format
 msgid "writing to %s failed.\n"
 msgstr "寫入到 %s 的動作失敗。\n"
@@ -687,8 +687,8 @@ msgstr ""
 "檢查新郵件時將會依照下面的順序。您可以勾選 G 欄位中的方塊，\n"
 "來決定是否在「全部檢查」時要檢查該帳號的郵件。"
 
-#: src/account_dialog.c:366 src/addressadd.c:192 src/addressbook.c:493
-#: src/compose.c:4273 src/editaddress.c:200 src/editaddress.c:942
+#: src/account_dialog.c:366 src/addressadd.c:192 src/addressbook.c:491
+#: src/compose.c:4292 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
@@ -824,12 +824,12 @@ msgstr "使用者設定之命令參數"
 msgid "Add Address to Book"
 msgstr "將地址加入通訊錄"
 
-#: src/addressadd.c:202 src/compose.c:4777 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4796 src/editaddress.c:201
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "地址"
 
-#: src/addressadd.c:212 src/addressbook.c:495 src/editaddress.c:202
+#: src/addressadd.c:212 src/addressbook.c:493 src/editaddress.c:202
 #: src/editaddress.c:795 src/editaddress.c:860 src/editgroup.c:267
 msgid "Remarks"
 msgstr "備註"
@@ -838,110 +838,111 @@ msgstr "備註"
 msgid "Select Address Book Folder"
 msgstr "選擇通訊錄資料夾"
 
-#: src/addressbook.c:338 src/compose.c:515 src/mainwindow.c:489
+#: src/addressbook.c:337 src/compose.c:515 src/mainwindow.c:489
 #: src/messageview.c:140
 msgid "/_File"
 msgstr "/檔案(_F)"
 
-#: src/addressbook.c:339
+#: src/addressbook.c:338
 msgid "/_File/New _Book"
 msgstr "/檔案(_F)/新增通訊錄(_B)"
 
-#: src/addressbook.c:340
+#: src/addressbook.c:339
 msgid "/_File/New _vCard"
 msgstr "/檔案(_F)/新增vCard(_V)"
 
-#: src/addressbook.c:342
+#: src/addressbook.c:341
 msgid "/_File/New _JPilot"
 msgstr "/檔案(_F)/新增J-Pilot(_J)"
 
-#: src/addressbook.c:345
-msgid "/_File/New _Server"
+#: src/addressbook.c:344
+#, fuzzy
+msgid "/_File/New _LDAP Server"
 msgstr "/檔案(_F)/新增伺服器(_S)"
 
-#: src/addressbook.c:347 src/addressbook.c:350 src/compose.c:520
+#: src/addressbook.c:346 src/addressbook.c:349 src/compose.c:520
 #: src/compose.c:525 src/compose.c:528 src/compose.c:531 src/mainwindow.c:507
 #: src/mainwindow.c:510 src/mainwindow.c:512 src/mainwindow.c:515
 #: src/mainwindow.c:517 src/messageview.c:143
 msgid "/_File/---"
 msgstr "/檔案(_F)/---"
 
-#: src/addressbook.c:348
+#: src/addressbook.c:347
 msgid "/_File/_Edit"
 msgstr "/檔案(_F)/編輯(_E)"
 
-#: src/addressbook.c:349
+#: src/addressbook.c:348
 msgid "/_File/_Delete"
 msgstr "/檔案(_F)/刪除(_D)"
 
-#: src/addressbook.c:351
+#: src/addressbook.c:350
 msgid "/_File/_Save"
 msgstr "/檔案(_F)/儲存(_S)"
 
-#: src/addressbook.c:352 src/compose.c:532 src/messageview.c:144
+#: src/addressbook.c:351 src/compose.c:532 src/messageview.c:144
 msgid "/_File/_Close"
 msgstr "/檔案(_F)/關閉(_C)"
 
-#: src/addressbook.c:353
+#: src/addressbook.c:352
 msgid "/_Address"
 msgstr "/地址(_A)"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:353
 msgid "/_Address/New _Address"
 msgstr "/地址(_A)/新增地址(_A)"
 
-#: src/addressbook.c:355
+#: src/addressbook.c:354
 msgid "/_Address/New _Group"
 msgstr "/地址(_A)/新增群組(_G)"
 
-#: src/addressbook.c:356
+#: src/addressbook.c:355
 msgid "/_Address/New _Folder"
 msgstr "/地址(_A)/新增資料夾(_F)"
 
-#: src/addressbook.c:357
+#: src/addressbook.c:356
 msgid "/_Address/---"
 msgstr "/地址(_A)/---"
 
-#: src/addressbook.c:358
+#: src/addressbook.c:357
 msgid "/_Address/_Edit"
 msgstr "/地址(_A)/編輯(_E)"
 
-#: src/addressbook.c:359
+#: src/addressbook.c:358
 msgid "/_Address/_Delete"
 msgstr "/地址(_A)/刪除(_D)"
 
-#: src/addressbook.c:360 src/compose.c:645 src/mainwindow.c:758
-#: src/messageview.c:266
+#: src/addressbook.c:359 src/compose.c:645 src/mainwindow.c:758
+#: src/messageview.c:267
 msgid "/_Tools"
 msgstr "/工具(_T)"
 
-#: src/addressbook.c:361
+#: src/addressbook.c:360
 msgid "/_Tools/Import _LDIF file"
 msgstr "/工具(_T)/匯入 LDIF 檔(_L)"
 
-#: src/addressbook.c:362 src/compose.c:666 src/mainwindow.c:812
-#: src/messageview.c:286
+#: src/addressbook.c:361 src/compose.c:666 src/mainwindow.c:812
+#: src/messageview.c:287
 msgid "/_Help"
 msgstr "/說明(_H)"
 
-#: src/addressbook.c:363 src/compose.c:667 src/mainwindow.c:824
-#: src/messageview.c:287
+#: src/addressbook.c:362 src/compose.c:667 src/mainwindow.c:824
+#: src/messageview.c:288
 msgid "/_Help/_About"
 msgstr "/說明(_H)/關於(_A)"
 
-#: src/addressbook.c:382 src/addressbook.c:392
+#: src/addressbook.c:381 src/addressbook.c:391
 msgid "/New _Address"
 msgstr "/新增地址(_A)"
 
-#: src/addressbook.c:383 src/addressbook.c:393
+#: src/addressbook.c:382 src/addressbook.c:392
 msgid "/New _Group"
 msgstr "/新增群組(_G)"
 
-#: src/addressbook.c:384 src/addressbook.c:394
+#: src/addressbook.c:383 src/addressbook.c:393
 msgid "/New _Folder"
 msgstr "/新增資料夾(_F)"
 
-#: src/addressbook.c:385 src/addressbook.c:395 src/compose.c:509
+#: src/addressbook.c:384 src/addressbook.c:394 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
@@ -951,70 +952,70 @@ msgstr "/新增資料夾(_F)"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:386 src/addressbook.c:396 src/compose.c:534
+#: src/addressbook.c:385 src/addressbook.c:395 src/compose.c:534
 #: src/mainwindow.c:521 src/messageview.c:146
 msgid "/_Edit"
 msgstr "/編輯(_E)"
 
-#: src/addressbook.c:387 src/addressbook.c:397 src/summaryview.c:434
+#: src/addressbook.c:386 src/addressbook.c:396 src/summaryview.c:434
 msgid "/_Delete"
 msgstr "/刪除(_D)"
 
-#: src/addressbook.c:494
+#: src/addressbook.c:492
 msgid "E-Mail address"
 msgstr "E-Mail 地址"
 
-#: src/addressbook.c:498 src/compose.c:4778 src/prefs_common_dialog.c:2183
+#: src/addressbook.c:496 src/compose.c:4797 src/prefs_common_dialog.c:2183
 msgid "Address book"
 msgstr "通訊錄"
 
-#: src/addressbook.c:600 src/prefs_filter_edit.c:249
+#: src/addressbook.c:603 src/prefs_filter_edit.c:249
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "姓名："
 
 #. Buttons
-#: src/addressbook.c:632 src/addressbook.c:1684 src/editaddress.c:884
+#: src/addressbook.c:636 src/addressbook.c:1678 src/editaddress.c:884
 #: src/editaddress.c:1017 src/mainwindow.c:2426 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:635 src/editaddress.c:890 src/editaddress.c:1023
+#: src/addressbook.c:639 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:1552
 msgid "Add"
 msgstr "新增"
 
-#: src/addressbook.c:638
+#: src/addressbook.c:642
 msgid "Lookup"
 msgstr "尋找"
 
-#: src/addressbook.c:650 src/headerview.c:55 src/prefs_folder_item.c:339
+#: src/addressbook.c:654 src/headerview.c:55 src/prefs_folder_item.c:339
 #: src/prefs_template.c:176
 msgid "To:"
 msgstr "收件人"
 
-#: src/addressbook.c:654 src/prefs_folder_item.c:356 src/prefs_template.c:178
+#: src/addressbook.c:658 src/prefs_folder_item.c:356 src/prefs_template.c:178
 msgid "Cc:"
 msgstr "副本"
 
-#: src/addressbook.c:658 src/prefs_folder_item.c:367
+#: src/addressbook.c:662 src/prefs_folder_item.c:367
 msgid "Bcc:"
 msgstr "密件副本"
 
 #. Confirm deletion
-#: src/addressbook.c:845
+#: src/addressbook.c:832
 msgid "Delete address(es)"
 msgstr "刪除通訊紀錄"
 
-#: src/addressbook.c:846
+#: src/addressbook.c:833
 msgid "Really delete the address(es)?"
 msgstr "您確定要刪除這些紀錄嗎？"
 
-#: src/addressbook.c:1675
+#: src/addressbook.c:1669
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1023,38 +1024,38 @@ msgstr ""
 "您確定要刪除「%s」資料夾以及裡面所有的地址嗎？\n"
 "如果您選擇只刪除資料夾，裡面的通訊紀錄將移到上一層資料夾中。"
 
-#: src/addressbook.c:1678 src/folderview.c:2372
+#: src/addressbook.c:1672 src/folderview.c:2372
 msgid "Delete folder"
 msgstr "刪除資料夾"
 
-#: src/addressbook.c:1678
+#: src/addressbook.c:1672
 msgid "_Folder only"
 msgstr "只刪除資料夾(_F)"
 
-#: src/addressbook.c:1678
+#: src/addressbook.c:1672
 msgid "Folder and _addresses"
 msgstr "全部刪除(_A)"
 
-#: src/addressbook.c:1683
+#: src/addressbook.c:1677
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "您確定要刪除「%s」? "
 
-#: src/addressbook.c:2369 src/addressbook.c:2502
+#: src/addressbook.c:2363 src/addressbook.c:2496
 msgid "New user, could not save index file."
 msgstr "無法儲存索引檔案。"
 
-#: src/addressbook.c:2373 src/addressbook.c:2506
+#: src/addressbook.c:2367 src/addressbook.c:2500
 msgid "New user, could not save address book files."
 msgstr "無法儲存通訊錄檔案。"
 
-#: src/addressbook.c:2383 src/addressbook.c:2516
+#: src/addressbook.c:2377 src/addressbook.c:2510
 msgid "Old address book converted successfully."
 msgstr ""
 "轉換舊通訊錄格式完成。\n"
 "您可以開始使用新的通訊錄。"
 
-#: src/addressbook.c:2388
+#: src/addressbook.c:2382
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1062,7 +1063,7 @@ msgstr ""
 "舊通訊錄格式已轉換，\n"
 "但無法儲存新的索引檔。"
 
-#: src/addressbook.c:2401
+#: src/addressbook.c:2395
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1070,7 +1071,7 @@ msgstr ""
 "無法轉換通訊錄格式，\n"
 "但已產生空的新通訊錄。"
 
-#: src/addressbook.c:2407
+#: src/addressbook.c:2401
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1078,7 +1079,7 @@ msgstr ""
 "無法轉換通訊錄格式，\n"
 "亦無法產生新的通訊錄。"
 
-#: src/addressbook.c:2412
+#: src/addressbook.c:2406
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1086,84 +1087,84 @@ msgstr ""
 "無法轉換通訊錄格式，\n"
 "亦無法產生新的通訊錄。"
 
-#: src/addressbook.c:2419
+#: src/addressbook.c:2413
 msgid "Addressbook conversion error"
 msgstr "轉換通訊錄格式時發生錯誤"
 
-#: src/addressbook.c:2423
+#: src/addressbook.c:2417
 msgid "Addressbook conversion"
 msgstr "通訊錄格式轉換"
 
-#: src/addressbook.c:2458
+#: src/addressbook.c:2452
 msgid "Addressbook Error"
 msgstr "通訊錄發生錯誤"
 
-#: src/addressbook.c:2459 src/addressbook.c:2559
+#: src/addressbook.c:2453 src/addressbook.c:2553
 msgid "Could not read address index"
 msgstr "無法讀取通訊錄索引"
 
-#: src/addressbook.c:2521
+#: src/addressbook.c:2515
 msgid "Old address book converted, could not save new address index file"
 msgstr "舊通訊錄格式已轉換，但無法儲存新的索引檔。"
 
-#: src/addressbook.c:2535
+#: src/addressbook.c:2529
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr "無法轉換通訊錄格式，但已產生空的新通訊錄。"
 
-#: src/addressbook.c:2541
+#: src/addressbook.c:2535
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr "無法轉換通訊錄格式，亦無法產生新的通訊錄。"
 
-#: src/addressbook.c:2547
+#: src/addressbook.c:2541
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr "無法轉換通訊錄格式，亦無法產生新的通訊錄。"
 
-#: src/addressbook.c:2565
+#: src/addressbook.c:2559
 msgid "Addressbook Conversion Error"
 msgstr "轉換通訊錄格式時發生錯誤"
 
-#: src/addressbook.c:2571
+#: src/addressbook.c:2565
 msgid "Addressbook Conversion"
 msgstr "通訊錄格式轉換"
 
-#: src/addressbook.c:3086 src/prefs_common_dialog.c:2033
+#: src/addressbook.c:3080 src/prefs_common_dialog.c:2033
 msgid "Interface"
 msgstr "介面"
 
-#: src/addressbook.c:3102 src/importldif.c:514
+#: src/addressbook.c:3096 src/importldif.c:514
 msgid "Address Book"
 msgstr "通訊錄"
 
-#: src/addressbook.c:3118
+#: src/addressbook.c:3112
 msgid "Person"
 msgstr "人名"
 
-#: src/addressbook.c:3134
+#: src/addressbook.c:3128
 msgid "EMail Address"
 msgstr "電子郵件信箱"
 
-#: src/addressbook.c:3150
+#: src/addressbook.c:3144
 msgid "Group"
 msgstr "群組"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3166 src/folderview.c:367 src/prefs_account_dialog.c:1694
-#: src/query_search.c:370
+#: src/addressbook.c:3160 src/folderview.c:367 src/prefs_account_dialog.c:1694
+#: src/query_search.c:398
 msgid "Folder"
 msgstr "資料夾"
 
-#: src/addressbook.c:3182
+#: src/addressbook.c:3176
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3198 src/addressbook.c:3214
+#: src/addressbook.c:3192 src/addressbook.c:3208
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3230
+#: src/addressbook.c:3224
 msgid "LDAP Server"
 msgstr "LDAP 伺服器"
 
@@ -1175,7 +1176,7 @@ msgstr "共用通訊紀錄"
 msgid "Personal address"
 msgstr "私人通訊紀錄"
 
-#: src/alertpanel.c:142 src/compose.c:5500 src/main.c:621
+#: src/alertpanel.c:142 src/compose.c:5517 src/main.c:621
 msgid "Notice"
 msgstr "注意"
 
@@ -1183,7 +1184,7 @@ msgstr "注意"
 msgid "Warning"
 msgstr "警告"
 
-#: src/alertpanel.c:168 src/inc.c:587
+#: src/alertpanel.c:168 src/inc.c:586
 msgid "Error"
 msgstr "錯誤"
 
@@ -1226,7 +1227,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:4761
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4762
 msgid "None"
 msgstr "無"
 
@@ -1475,7 +1476,7 @@ msgstr "/顯示(_V)/字元編碼(_E)/泰文 (TIS-620)"
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/顯示(_V)/字元編碼(_E)/泰文 (Windows-874)"
 
-#: src/compose.c:646 src/mainwindow.c:759 src/messageview.c:267
+#: src/compose.c:646 src/mainwindow.c:759 src/messageview.c:268
 msgid "/_Tools/_Address book"
 msgstr "/工具(_T)/通訊錄(_A)"
 
@@ -1483,14 +1484,14 @@ msgstr "/工具(_T)/通訊錄(_A)"
 msgid "/_Tools/_Template"
 msgstr "/工具(_T)/套用郵件樣板(_T)"
 
-#: src/compose.c:649 src/mainwindow.c:783 src/messageview.c:283
+#: src/compose.c:649 src/mainwindow.c:783 src/messageview.c:284
 msgid "/_Tools/Actio_ns"
 msgstr "/工具(_T)/執行外部指令(_N)"
 
 #: src/compose.c:651 src/compose.c:655 src/compose.c:661 src/mainwindow.c:762
 #: src/mainwindow.c:776 src/mainwindow.c:781 src/mainwindow.c:784
-#: src/mainwindow.c:788 src/mainwindow.c:790 src/messageview.c:270
-#: src/messageview.c:282
+#: src/mainwindow.c:788 src/mainwindow.c:790 src/messageview.c:271
+#: src/messageview.c:283
 msgid "/_Tools/---"
 msgstr "/工具(_T)"
 
@@ -1516,79 +1517,79 @@ msgstr "/工具(_T)/執行(_X)"
 msgid "/_Tools/_Set spell language"
 msgstr "/工具(_T)/套用郵件樣板(_T)"
 
-#: src/compose.c:910
+#: src/compose.c:912
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: 檔案不存在\n"
 
-#: src/compose.c:1014 src/compose.c:1085
+#: src/compose.c:1016 src/compose.c:1087
 msgid "Can't get text part\n"
 msgstr "沒有文字部份\n"
 
-#: src/compose.c:1486
+#: src/compose.c:1488
 msgid "Quote mark format error."
 msgstr "引言格式錯誤。"
 
-#: src/compose.c:1498
+#: src/compose.c:1500
 msgid "Message reply/forward format error."
 msgstr "回覆/轉寄郵件格式錯誤。"
 
-#: src/compose.c:1918
+#: src/compose.c:1935
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "檔案 %s 不存在\n"
 
-#: src/compose.c:1922
+#: src/compose.c:1939
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "無法取得檔案 %s 的大小\n"
 
-#: src/compose.c:1926
+#: src/compose.c:1943
 #, c-format
 msgid "File %s is empty."
 msgstr "檔案 %s 是空的。"
 
-#: src/compose.c:1930
+#: src/compose.c:1947
 #, c-format
 msgid "Can't read %s."
 msgstr "無法讀取 %s。"
 
-#: src/compose.c:1963
+#: src/compose.c:1980
 #, c-format
 msgid "Message: %s"
 msgstr "郵件：%s"
 
-#: src/compose.c:2023 src/mimeview.c:565
+#: src/compose.c:2040 src/mimeview.c:565
 msgid "Can't get the part of multipart message."
 msgstr "無法取得這個附加檔。"
 
-#: src/compose.c:2507 src/headerview.c:195 src/query_search.c:636
+#: src/compose.c:2524 src/headerview.c:195 src/query_search.c:666
 #: src/summaryview.c:2124
 msgid "(No Subject)"
 msgstr "（沒有主旨）"
 
-#: src/compose.c:2510
+#: src/compose.c:2527
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - 編寫郵件%s"
 
-#: src/compose.c:2623
+#: src/compose.c:2642
 msgid "Recipient is not specified."
 msgstr "沒有指定收件人。"
 
-#: src/compose.c:2631
+#: src/compose.c:2650
 msgid "Empty subject"
 msgstr "主旨空白"
 
-#: src/compose.c:2632
+#: src/compose.c:2651
 msgid "Subject is empty. Send it anyway?"
 msgstr "沒有主旨。確定要送出？"
 
-#: src/compose.c:2691
+#: src/compose.c:2710
 msgid "can't get recipient list."
 msgstr "無法取得收件人或收件新聞群組名單。"
 
-#: src/compose.c:2711
+#: src/compose.c:2730
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1596,21 +1597,21 @@ msgstr ""
 "您選用的帳號並非一個電子郵件帳號，可能是用來在新聞群組上發表文章用的。\n"
 "要發送郵件請選擇電子郵件帳號。"
 
-#: src/compose.c:2725 src/send_message.c:299
+#: src/compose.c:2744 src/send_message.c:299
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "向 %s 發出文章時出現錯誤。"
 
-#: src/compose.c:2767
+#: src/compose.c:2786
 msgid "Can't save the message to outbox."
 msgstr "無法將郵件送至寄件夾中。"
 
-#: src/compose.c:2805
+#: src/compose.c:2824
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "無法找到任何與目前選取之金鑰「%s」相關的金鑰。"
 
-#: src/compose.c:2902
+#: src/compose.c:2921
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1620,11 +1621,11 @@ msgstr ""
 "無法將郵件內文的編碼設定由 %s 轉換為 %s。\n"
 "仍舊要以 %s 傳送嗎？"
 
-#: src/compose.c:2908
+#: src/compose.c:2927
 msgid "Code conversion error"
 msgstr "轉換編碼時發生錯誤"
 
-#: src/compose.c:2981
+#: src/compose.c:3000
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1637,157 +1638,157 @@ msgstr ""
 "\n"
 "無論如何都要傳送嗎？"
 
-#: src/compose.c:2985
+#: src/compose.c:3004
 msgid "Line length limit"
 msgstr "列長度限制"
 
-#: src/compose.c:3275
+#: src/compose.c:3294
 msgid "can't remove the old message\n"
 msgstr "無法移除原有的舊郵件\n"
 
-#: src/compose.c:3293
+#: src/compose.c:3312
 msgid "queueing message...\n"
 msgstr "送進暫存資料夾中...\n"
 
-#: src/compose.c:3375
+#: src/compose.c:3394
 msgid "can't find queue folder\n"
 msgstr "找不到暫存資料夾\n"
 
-#: src/compose.c:3382
+#: src/compose.c:3401
 msgid "can't queue the message\n"
 msgstr "無法放進暫存資料夾\n"
 
-#: src/compose.c:3975
+#: src/compose.c:3994
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "產生郵件的編號：%s\n"
 
-#: src/compose.c:4088
+#: src/compose.c:4107
 msgid "Creating compose window...\n"
 msgstr "正在建立編寫視窗...\n"
 
-#: src/compose.c:4139 src/headerview.c:54
+#: src/compose.c:4158 src/headerview.c:54
 msgid "From:"
 msgstr "來源："
 
-#: src/compose.c:4213
+#: src/compose.c:4232
 msgid "PGP Sign"
 msgstr "PGP 簽章"
 
-#: src/compose.c:4216
+#: src/compose.c:4235
 msgid "PGP Encrypt"
 msgstr "PGP 加密"
 
-#: src/compose.c:4254 src/compose.c:5332
+#: src/compose.c:4273 src/compose.c:5351
 msgid "MIME type"
 msgstr "MIME 型態"
 
 #. S_COL_DATE
-#: src/compose.c:4263 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4908
+#: src/compose.c:4282 src/mimeview.c:197 src/prefs_filter_edit.c:496
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4909
 msgid "Size"
 msgstr "大小"
 
-#: src/compose.c:4698 src/mainwindow.c:2359 src/prefs_account_dialog.c:528
+#: src/compose.c:4717 src/mainwindow.c:2359 src/prefs_account_dialog.c:528
 #: src/prefs_common_dialog.c:661
 msgid "Send"
 msgstr "送出"
 
-#: src/compose.c:4699
+#: src/compose.c:4718
 msgid "Send message"
 msgstr "送出郵件"
 
-#: src/compose.c:4707
+#: src/compose.c:4726
 msgid "Send later"
 msgstr "稍後再送出"
 
-#: src/compose.c:4708
+#: src/compose.c:4727
 msgid "Put into queue folder and send later"
 msgstr "放到寄件夾中稍後再送出"
 
-#: src/compose.c:4716
+#: src/compose.c:4735
 msgid "Draft"
 msgstr "草稿"
 
-#: src/compose.c:4717
+#: src/compose.c:4736
 msgid "Save to draft folder"
 msgstr "儲存至草稿資料夾"
 
-#: src/compose.c:4727
+#: src/compose.c:4746
 msgid "Insert"
 msgstr "插入"
 
-#: src/compose.c:4728
+#: src/compose.c:4747
 msgid "Insert file"
 msgstr "插入檔案"
 
-#: src/compose.c:4736
+#: src/compose.c:4755
 msgid "Attach"
 msgstr "附加"
 
-#: src/compose.c:4737
+#: src/compose.c:4756
 msgid "Attach file"
 msgstr "附加檔案"
 
 #. signature
-#: src/compose.c:4747 src/prefs_account_dialog.c:1208
+#: src/compose.c:4766 src/prefs_account_dialog.c:1208
 #: src/prefs_common_dialog.c:953
 msgid "Signature"
 msgstr "簽章"
 
-#: src/compose.c:4748
+#: src/compose.c:4767
 #, fuzzy
 msgid "Append signature"
 msgstr "簽章檢查錯誤"
 
 #. editor
-#: src/compose.c:4757 src/prefs_common_dialog.c:991
+#: src/compose.c:4776 src/prefs_common_dialog.c:991
 #: src/prefs_common_dialog.c:2315
 msgid "Editor"
 msgstr "編輯器"
 
-#: src/compose.c:4758
+#: src/compose.c:4777
 msgid "Edit with external editor"
 msgstr "使用其他的編輯器"
 
-#: src/compose.c:4766
+#: src/compose.c:4785
 msgid "Linewrap"
 msgstr "折列"
 
-#: src/compose.c:4767
+#: src/compose.c:4786
 msgid "Wrap all long lines"
 msgstr "折換所有過長的文字列"
 
-#: src/compose.c:5228
+#: src/compose.c:5247
 msgid "Invalid MIME type."
 msgstr "不合法的 MIME 型態。"
 
-#: src/compose.c:5246
+#: src/compose.c:5265
 msgid "File doesn't exist or is empty."
 msgstr "檔案不存在或者是空的。"
 
-#: src/compose.c:5314
+#: src/compose.c:5333
 msgid "Properties"
 msgstr "內容"
 
-#: src/compose.c:5334 src/prefs_common_dialog.c:1444
+#: src/compose.c:5353 src/prefs_common_dialog.c:1444
 msgid "Encoding"
 msgstr "編碼"
 
-#: src/compose.c:5357 src/prefs_folder_item.c:202
+#: src/compose.c:5376 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "路徑"
 
-#: src/compose.c:5358
+#: src/compose.c:5377
 msgid "File name"
 msgstr "檔名"
 
-#: src/compose.c:5449
+#: src/compose.c:5466
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "外部編輯器的命令是錯誤的：「%s」\n"
 
-#: src/compose.c:5497
+#: src/compose.c:5514
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1797,44 +1798,44 @@ msgstr ""
 "要強迫結束該行程嗎？\n"
 "行程的群組代碼是：%d"
 
-#: src/compose.c:5872 src/compose.c:5877 src/compose.c:5883
+#: src/compose.c:5889 src/compose.c:5894 src/compose.c:5900
 msgid "Can't queue the message."
 msgstr "無法放進暫存資料夾。"
 
-#: src/compose.c:5974
+#: src/compose.c:5991
 msgid "Select files"
 msgstr "選擇檔案"
 
-#: src/compose.c:5997
+#: src/compose.c:6014
 msgid "Select file"
 msgstr "選擇檔案"
 
-#: src/compose.c:6032
+#: src/compose.c:6049
 msgid "Save message"
 msgstr "儲存郵件"
 
-#: src/compose.c:6033
+#: src/compose.c:6050
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "郵件已被修改過。將它儲存到草稿資料夾嗎？"
 
-#: src/compose.c:6035
+#: src/compose.c:6052
 msgid "Close _without saving"
 msgstr "關閉但不儲存(_W)"
 
-#: src/compose.c:6077
+#: src/compose.c:6094
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "您確定要套用「%s」這個郵件樣板嗎？"
 
-#: src/compose.c:6079
+#: src/compose.c:6096
 msgid "Apply template"
 msgstr "套用郵件樣板"
 
-#: src/compose.c:6080
+#: src/compose.c:6097
 msgid "_Replace"
 msgstr "置換(_R)"
 
-#: src/compose.c:6080
+#: src/compose.c:6097
 msgid "_Insert"
 msgstr "插入(_I)"
 
@@ -1955,52 +1956,52 @@ msgstr "未指定群組名稱"
 msgid "Edit Group Data"
 msgstr "編輯群組資料"
 
-#: src/editgroup.c:300
+#: src/editgroup.c:299
 msgid "Group Name"
 msgstr "群組名稱"
 
-#: src/editgroup.c:319
+#: src/editgroup.c:318
 msgid "Addresses in Group"
 msgstr "群組內地址"
 
-#: src/editgroup.c:321
+#: src/editgroup.c:320
 msgid " -> "
 msgstr " → "
 
-#: src/editgroup.c:348
+#: src/editgroup.c:347
 msgid " <- "
 msgstr " ← "
 
-#: src/editgroup.c:350
+#: src/editgroup.c:349
 msgid "Available Addresses"
 msgstr "可使用之電子郵件地址"
 
-#: src/editgroup.c:416
+#: src/editgroup.c:415
 msgid "Move E-Mail Addresses to or from Group with arrow buttons"
 msgstr "請使用箭頭指標將電子郵件地址加入或移除該群組"
 
-#: src/editgroup.c:468
+#: src/editgroup.c:467
 msgid "Edit Group Details"
 msgstr "編輯群組詳細資料"
 
-#: src/editgroup.c:471
+#: src/editgroup.c:470
 msgid "Add New Group"
 msgstr "新增群組"
 
-#: src/editgroup.c:522
+#: src/editgroup.c:521
 msgid "Edit folder"
 msgstr "編輯資料夾"
 
-#: src/editgroup.c:522
+#: src/editgroup.c:521
 msgid "Input the new name of folder:"
 msgstr "請輸入新的資料夾名稱："
 
-#: src/editgroup.c:525 src/foldersel.c:541 src/folderview.c:2121
+#: src/editgroup.c:524 src/foldersel.c:541 src/folderview.c:2121
 #: src/folderview.c:2127
 msgid "New folder"
 msgstr "新資料夾"
 
-#: src/editgroup.c:526 src/foldersel.c:542 src/folderview.c:2128
+#: src/editgroup.c:525 src/foldersel.c:542 src/folderview.c:2128
 msgid "Input the name of new folder:"
 msgstr "請輸入新資料夾的名稱："
 
@@ -2197,7 +2198,7 @@ msgid "`%c' can't be included in folder name."
 msgstr "資料夾名稱中不應含有「%c」這個字元。"
 
 #: src/foldersel.c:561 src/folderview.c:2147 src/folderview.c:2206
-#: src/query_search.c:995
+#: src/query_search.c:1031
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "資料夾「%s」已存在。"
@@ -2456,7 +2457,7 @@ msgstr "主旨："
 msgid "Creating header view...\n"
 msgstr "產生標頭視窗...\n"
 
-#: src/headerview.c:180 src/query_search.c:637 src/summaryview.c:2127
+#: src/headerview.c:180 src/query_search.c:667 src/summaryview.c:2127
 msgid "(No From)"
 msgstr "（沒有來源）"
 
@@ -2586,133 +2587,133 @@ msgstr "完成"
 msgid "Sylpheed: %d new messages"
 msgstr "Sylpheed: %d 封新郵件"
 
-#: src/inc.c:372
+#: src/inc.c:371
 msgid "Retrieving new messages"
 msgstr "取得新郵件中"
 
-#: src/inc.c:415
+#: src/inc.c:414
 msgid "Standby"
 msgstr "等待處理中"
 
-#: src/inc.c:544 src/inc.c:593
+#: src/inc.c:543 src/inc.c:592
 msgid "Cancelled"
 msgstr "取消"
 
-#: src/inc.c:555
+#: src/inc.c:554
 msgid "Retrieving"
 msgstr "讀取中"
 
-#: src/inc.c:564
+#: src/inc.c:563
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "完成 （已接收 %d 封郵件 (%s)）"
 
-#: src/inc.c:568
+#: src/inc.c:567
 msgid "Done (no new messages)"
 msgstr "完成（無新郵件）"
 
-#: src/inc.c:574
+#: src/inc.c:573
 msgid "Connection failed"
 msgstr "連線失敗。"
 
-#: src/inc.c:577
+#: src/inc.c:576
 msgid "Auth failed"
 msgstr "認證失敗"
 
-#: src/inc.c:580
+#: src/inc.c:579
 msgid "Locked"
 msgstr "已鎖定"
 
-#: src/inc.c:590
+#: src/inc.c:589
 msgid "Timeout"
 msgstr "逾時"
 
-#: src/inc.c:640
+#: src/inc.c:639
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "完成（%d 封新郵件）"
 
-#: src/inc.c:643
+#: src/inc.c:642
 msgid "Finished (no new messages)"
 msgstr "完成（無新郵件）"
 
-#: src/inc.c:652
+#: src/inc.c:651
 msgid "Some errors occurred while getting mail."
 msgstr "取得郵件時發生錯誤。"
 
-#: src/inc.c:688
+#: src/inc.c:687
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "取得 %s 的新郵件中, 請稍候...\n"
 
-#: src/inc.c:691
+#: src/inc.c:690
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: 取得新郵件中, 請稍候..."
 
-#: src/inc.c:710
+#: src/inc.c:709
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "連線到 POP3 伺服器 %s 中..."
 
-#: src/inc.c:719
+#: src/inc.c:718
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "無法連線到 POP3 伺服器：%s:%d\n"
 
-#: src/inc.c:798 src/send_message.c:631
+#: src/inc.c:797 src/send_message.c:631
 msgid "Authenticating..."
 msgstr "認證"
 
-#: src/inc.c:799
+#: src/inc.c:798
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "從 %s 中取得郵件中..."
 
-#: src/inc.c:804
+#: src/inc.c:803
 msgid "Getting the number of new messages (STAT)..."
 msgstr "取得新郵件的數量中"
 
-#: src/inc.c:808
+#: src/inc.c:807
 msgid "Getting the number of new messages (LAST)..."
 msgstr "取得新郵件的數量中"
 
-#: src/inc.c:812
+#: src/inc.c:811
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "取得新郵件的數量中"
 
-#: src/inc.c:816
+#: src/inc.c:815
 msgid "Getting the size of messages (LIST)..."
 msgstr "取得新郵件的數量中"
 
-#: src/inc.c:826
+#: src/inc.c:825
 #, c-format
 msgid "Deleting message %d"
 msgstr "刪除第 %d 號郵件"
 
-#: src/inc.c:833 src/send_message.c:649
+#: src/inc.c:832 src/send_message.c:649
 msgid "Quitting"
 msgstr "離開"
 
-#: src/inc.c:858
+#: src/inc.c:857
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "取得新郵件 (%d / %d) (%s / %s)"
 
-#: src/inc.c:879
+#: src/inc.c:878
 #, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "取得新郵件 (共 %d 封新郵件, %s 已接收）"
 
-#: src/inc.c:1107
+#: src/inc.c:1106
 msgid "Connection failed."
 msgstr "連線失敗。"
 
-#: src/inc.c:1113
+#: src/inc.c:1112
 msgid "Error occurred while processing mail."
 msgstr "處理郵件時發生錯誤。"
 
-#: src/inc.c:1118
+#: src/inc.c:1117
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2721,39 +2722,39 @@ msgstr ""
 "處理郵件時發生錯誤：\n"
 "%s"
 
-#: src/inc.c:1124
+#: src/inc.c:1123
 msgid "No disk space left."
 msgstr "磁碟空間已滿。"
 
-#: src/inc.c:1129
+#: src/inc.c:1128
 msgid "Can't write file."
 msgstr "無法寫入檔案。"
 
-#: src/inc.c:1134
+#: src/inc.c:1133
 msgid "Socket error."
 msgstr "Socket 有錯誤"
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1140 src/send_message.c:584 src/send_message.c:772
+#: src/inc.c:1139 src/send_message.c:584 src/send_message.c:772
 msgid "Connection closed by the remote host."
 msgstr "遠端主機關閉連線。"
 
-#: src/inc.c:1146
+#: src/inc.c:1145
 msgid "Mailbox is locked."
 msgstr "信箱已被鎖定，可能前一次擷取未完成。"
 
-#: src/inc.c:1150
+#: src/inc.c:1149
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
 "%s"
 msgstr "信箱已被鎖定：%s"
 
-#: src/inc.c:1156 src/send_message.c:757
+#: src/inc.c:1155 src/send_message.c:757
 msgid "Authentication failed."
 msgstr "認證失敗"
 
-#: src/inc.c:1161 src/send_message.c:760
+#: src/inc.c:1160 src/send_message.c:760
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2762,15 +2763,15 @@ msgstr ""
 "認證失敗：\n"
 "%s"
 
-#: src/inc.c:1166 src/send_message.c:776
+#: src/inc.c:1165 src/send_message.c:776
 msgid "Session timed out."
 msgstr "作業逾時"
 
-#: src/inc.c:1202
+#: src/inc.c:1201
 msgid "Incorporation cancelled\n"
 msgstr "動作已取消\n"
 
-#: src/inc.c:1285
+#: src/inc.c:1284
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "從 %s 中取得郵件放入 %s...\n"
@@ -3237,14 +3238,15 @@ msgid "/_View/Mess_age source"
 msgstr "/顯示(_V)/觀看郵件原始碼(_A)"
 
 #: src/mainwindow.c:708 src/messageview.c:245
-msgid "/_View/Show all _header"
+#, fuzzy
+msgid "/_View/Show all _headers"
 msgstr "/顯示(_V)/顯示所有的標頭(_H)"
 
 #: src/mainwindow.c:710
 msgid "/_View/_Update summary"
 msgstr "/顯示(_V)/更新郵件列表(_U)"
 
-#: src/mainwindow.c:712 src/messageview.c:247
+#: src/mainwindow.c:712 src/messageview.c:248
 msgid "/_Message"
 msgstr "/郵件(_M)"
 
@@ -3274,16 +3276,16 @@ msgstr "/郵件(_M)/將暫存資料夾中的郵件送出(_S)"
 
 #: src/mainwindow.c:722 src/mainwindow.c:724 src/mainwindow.c:731
 #: src/mainwindow.c:736 src/mainwindow.c:739 src/mainwindow.c:750
-#: src/mainwindow.c:752 src/mainwindow.c:755 src/messageview.c:250
-#: src/messageview.c:258 src/messageview.c:263
+#: src/mainwindow.c:752 src/mainwindow.c:755 src/messageview.c:251
+#: src/messageview.c:259 src/messageview.c:264
 msgid "/_Message/---"
 msgstr "/郵件(_M)/---"
 
-#: src/mainwindow.c:723 src/messageview.c:248
+#: src/mainwindow.c:723 src/messageview.c:249
 msgid "/_Message/Compose _new message"
 msgstr "/郵件(_M)/撰寫郵件(_N)"
 
-#: src/mainwindow.c:725 src/messageview.c:251
+#: src/mainwindow.c:725 src/messageview.c:252
 msgid "/_Message/_Reply"
 msgstr "/郵件(_M)/直接回覆(_R)"
 
@@ -3291,27 +3293,27 @@ msgstr "/郵件(_M)/直接回覆(_R)"
 msgid "/_Message/Repl_y to"
 msgstr "/郵件(_M)/回覆給(_Y)"
 
-#: src/mainwindow.c:727 src/messageview.c:252
+#: src/mainwindow.c:727 src/messageview.c:253
 msgid "/_Message/Repl_y to/_all"
 msgstr "/郵件(_M)/回覆給(_Y)/所有收件人(_A)"
 
-#: src/mainwindow.c:728 src/messageview.c:254
+#: src/mainwindow.c:728 src/messageview.c:255
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/郵件(_M)/回覆給(_Y)/原作者(_S)"
 
-#: src/mainwindow.c:729 src/messageview.c:256
+#: src/mainwindow.c:729 src/messageview.c:257
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/郵件(_M)/回覆給(_Y)/郵遞論壇(_L)"
 
-#: src/mainwindow.c:732 src/messageview.c:259
+#: src/mainwindow.c:732 src/messageview.c:260
 msgid "/_Message/_Forward"
 msgstr "/郵件(_M)/轉寄(_F)"
 
-#: src/mainwindow.c:733 src/messageview.c:260
+#: src/mainwindow.c:733 src/messageview.c:261
 msgid "/_Message/For_ward as attachment"
 msgstr "/郵件(_M)/將郵件當成附加檔轉寄(_W)"
 
-#: src/mainwindow.c:735 src/messageview.c:262
+#: src/mainwindow.c:735 src/messageview.c:263
 msgid "/_Message/Redirec_t"
 msgstr "/郵件(_M)/郵件導向(_T)"
 
@@ -3368,7 +3370,7 @@ msgstr "/郵件(_M)/歸類為垃圾郵件(_J)"
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/郵件(_M)/歸類為非垃圾郵件(_U)"
 
-#: src/mainwindow.c:756 src/messageview.c:264
+#: src/mainwindow.c:756 src/messageview.c:265
 msgid "/_Message/Re-_edit"
 msgstr "/郵件(_M)/重新編輯(_E)"
 
@@ -3384,23 +3386,23 @@ msgstr "/工具(_T)/過濾資料夾中所有郵件(_F)"
 msgid "/_Tools/Filter _selected messages"
 msgstr "/工具(_T)/過濾選擇的郵件(_F)"
 
-#: src/mainwindow.c:767 src/messageview.c:271
+#: src/mainwindow.c:767 src/messageview.c:272
 msgid "/_Tools/_Create filter rule"
 msgstr "/工具(_T)/產生郵件過濾規則(_C)"
 
-#: src/mainwindow.c:768 src/messageview.c:273
+#: src/mainwindow.c:768 src/messageview.c:274
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/工具(_T)/產生郵件過濾規則(_C)/自動產生"
 
-#: src/mainwindow.c:770 src/messageview.c:275
+#: src/mainwindow.c:770 src/messageview.c:276
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/工具(_T)/產生郵件過濾規則(_C)/依來源(_F)"
 
-#: src/mainwindow.c:772 src/messageview.c:277
+#: src/mainwindow.c:772 src/messageview.c:278
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/工具(_T)/產生郵件過濾規則(_C)/依收信人(_T)"
 
-#: src/mainwindow.c:774 src/messageview.c:279
+#: src/mainwindow.c:774 src/messageview.c:280
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/工具(_T)/產生郵件過濾規則(_C)/依主旨(_S)"
 
@@ -3519,7 +3521,7 @@ msgid "MainWindow: color allocation %d failed\n"
 msgstr "主視窗：顏色 %d 配置失敗。\n"
 
 #: src/mainwindow.c:1139 src/summaryview.c:2275 src/summaryview.c:2360
-#: src/summaryview.c:3907 src/summaryview.c:4036 src/summaryview.c:4394
+#: src/summaryview.c:3908 src/summaryview.c:4037 src/summaryview.c:4395
 msgid "done.\n"
 msgstr "完成。\n"
 
@@ -3777,7 +3779,7 @@ msgid "Find text:"
 msgstr "尋找文字："
 
 #: src/message_search.c:153 src/prefs_search_folder.c:253
-#: src/query_search.c:326
+#: src/query_search.c:343
 msgid "Case sensitive"
 msgstr "區分大小寫"
 
@@ -3801,27 +3803,27 @@ msgstr "搜尋已到尾端。要從頂端繼續搜尋嗎？"
 msgid "Search finished"
 msgstr "搜尋結束"
 
-#: src/messageview.c:268
+#: src/messageview.c:269
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/工具(_T)/將寄信人加入通訊錄(_K)"
 
-#: src/messageview.c:300
+#: src/messageview.c:301
 msgid "Creating message view...\n"
 msgstr "產生郵件視窗...\n"
 
-#: src/messageview.c:325
+#: src/messageview.c:326
 msgid "Text"
 msgstr "文字"
 
-#: src/messageview.c:330
+#: src/messageview.c:331
 msgid "Attachments"
 msgstr "附加檔"
 
-#: src/messageview.c:380
+#: src/messageview.c:381
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:699 src/summaryview.c:3436
+#: src/messageview.c:700 src/summaryview.c:3436
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "無法儲存檔案「%s」。"
@@ -3839,7 +3841,7 @@ msgstr "正在學習命令:"
 msgid "Print"
 msgstr "列印"
 
-#: src/messageview.c:770 src/summaryview.c:3471
+#: src/messageview.c:769 src/summaryview.c:3470
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -3934,11 +3936,11 @@ msgstr ""
 "請輸入開啟指令：\n"
 "（「%s」將會被置換為檔名）"
 
-#: src/mimeview.c:1147
+#: src/mimeview.c:1140
 msgid "Opening executable file"
 msgstr "正在開啟可執行的檔案"
 
-#: src/mimeview.c:1148
+#: src/mimeview.c:1141
 msgid ""
 "This is an executable file. Opening executable file is restricted for "
 "security.\n"
@@ -3949,11 +3951,6 @@ msgstr ""
 "如果您要執行它，請將它存於其他地方並且確定它並非是病毒或者某種心懷不軌的程"
 "式。"
 
-#: src/mimeview.c:1184
-#, c-format
-msgid "MIME viewer command line is invalid: `%s'"
-msgstr "開啟此 MIME 型態的命令是錯誤的：「%s」"
-
 #: src/passphrase.c:96
 msgid "Passphrase"
 msgstr "密碼片語"
@@ -5691,20 +5688,20 @@ msgstr "回信地址："
 msgid "%s - Edit search condition"
 msgstr ""
 
-#: src/prefs_search_folder.c:209 src/query_search.c:257
+#: src/prefs_search_folder.c:209 src/query_search.c:274
 msgid "Match any of the following"
 msgstr "下列任一條件符合"
 
-#: src/prefs_search_folder.c:211 src/query_search.c:259
+#: src/prefs_search_folder.c:211 src/query_search.c:276
 msgid "Match all of the following"
 msgstr "下列所有條件均符合"
 
-#: src/prefs_search_folder.c:231 src/query_search.c:303
+#: src/prefs_search_folder.c:231 src/query_search.c:320
 #, fuzzy
 msgid "Folder:"
 msgstr "資料夾"
 
-#: src/prefs_search_folder.c:248 src/query_search.c:321
+#: src/prefs_search_folder.c:248 src/query_search.c:338
 #, fuzzy
 msgid "Search subfolders"
 msgstr "搜尋失敗"
@@ -5719,17 +5716,17 @@ msgid "Attachment"
 msgstr "附加檔案"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73 src/query_search.c:371 src/summaryview.c:4901
+#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4902
 msgid "Subject"
 msgstr "主旨"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/query_search.c:372 src/summaryview.c:4904
+#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4905
 msgid "From"
 msgstr "來源"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/query_search.c:373 src/summaryview.c:4906
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:4907
 msgid "Date"
 msgstr "日期"
 
@@ -5822,43 +5819,43 @@ msgstr "正在建立進度對話框...\n"
 msgid "Status"
 msgstr "狀態"
 
-#: src/query_search.c:234
+#: src/query_search.c:251
 msgid "Search messages"
 msgstr "尋找郵件(_S)"
 
-#: src/query_search.c:395
+#: src/query_search.c:423
 #, fuzzy
 msgid "_Save as search folder"
 msgstr "儲存至草稿資料夾"
 
-#: src/query_search.c:512 src/subscribedialog.c:526 src/summaryview.c:842
+#: src/query_search.c:542 src/subscribedialog.c:526 src/summaryview.c:842
 msgid "Done."
 msgstr "完成"
 
-#: src/query_search.c:536
+#: src/query_search.c:566
 #, fuzzy, c-format
 msgid "Searching %s ..."
 msgstr "掃描資料夾 %s ..."
 
-#: src/query_search.c:564
+#: src/query_search.c:594
 #, fuzzy, c-format
 msgid "Searching %s (%d / %d)..."
 msgstr "過濾中..."
 
-#: src/query_search.c:645 src/summaryview.c:2051
+#: src/query_search.c:675 src/summaryview.c:2051
 msgid "(No Date)"
 msgstr "(沒有日期)"
 
-#: src/query_search.c:833
+#: src/query_search.c:869
 #, fuzzy
 msgid "Save as search folder"
 msgstr "儲存至草稿資料夾"
 
-#: src/query_search.c:854
+#: src/query_search.c:890
 msgid "Location:"
 msgstr ""
 
-#: src/query_search.c:869
+#: src/query_search.c:905
 #, fuzzy
 msgid "Folder name:"
 msgstr "檔名"
@@ -6486,37 +6483,37 @@ msgstr "郵件 %d 已設定複製到 %s\n"
 msgid "Destination for copy is same as current folder."
 msgstr "郵件無法複製到同一個資料夾內。"
 
-#: src/summaryview.c:3506
+#: src/summaryview.c:3507
 msgid "Error occurred while processing messages."
 msgstr "處理郵件時發生錯誤。"
 
-#: src/summaryview.c:3814 src/summaryview.c:3815
+#: src/summaryview.c:3815 src/summaryview.c:3816
 msgid "Building threads..."
 msgstr "產生郵件串列中..."
 
-#: src/summaryview.c:3965 src/summaryview.c:3966
+#: src/summaryview.c:3966 src/summaryview.c:3967
 msgid "Unthreading..."
 msgstr "解除郵件串列中..."
 
-#: src/summaryview.c:4259 src/summaryview.c:4315
+#: src/summaryview.c:4260 src/summaryview.c:4316
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "過濾中..."
 
-#: src/summaryview.c:4364
+#: src/summaryview.c:4365
 msgid "filtering..."
 msgstr "過濾中..."
 
-#: src/summaryview.c:4365
+#: src/summaryview.c:4366
 msgid "Filtering..."
 msgstr "過濾中..."
 
-#: src/summaryview.c:4401
+#: src/summaryview.c:4402
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "已過濾 %d 封郵件"
 
-#: src/summaryview.c:4910
+#: src/summaryview.c:4911
 msgid "No."
 msgstr "No."
 
@@ -6602,6 +6599,9 @@ msgstr "離開"
 msgid "Sylpheed"
 msgstr "Sylpheed"
 
+#~ msgid "MIME viewer command line is invalid: `%s'"
+#~ msgstr "開啟此 MIME 型態的命令是錯誤的：「%s」"
+
 #~ msgid "%dB"
 #~ msgstr "%dB"
author	hiro <hiro@ee746299-78ed-0310-b773-934348b2243d>	2006-03-10 07:09:44 +0000
committer	hiro <hiro@ee746299-78ed-0310-b773-934348b2243d>	2006-03-10 07:09:44 +0000
commit	c00e8b05eaed1cc8bd3c330bad3b6db28851f65d (patch)
tree	ee64d26cc5ca3da1e782e6a784a2d93505fc7429
parent	dcae2789d1ffdd2bc4f1fc32a34789d64f4631f2 (diff)